From c81d52e0334a1d1d421c483bc01aea821ea59c14 Mon Sep 17 00:00:00 2001 From: JuiceyDev Date: Tue, 7 Apr 2026 13:06:28 +0200 Subject: [PATCH] Reapply "yuri: yuri girl kissing yuri" This reverts commit 0c4e2c7eefe5e12eee6e4859b051ed009c95be76. --- targets/app/common/AppGameServices.cpp | 38 +- targets/app/common/AppGameServices.h | 138 - targets/app/common/App_Defines.h | 100 +- targets/app/common/App_structs.h | 120 +- targets/app/common/ArchiveManager.h | 5 - targets/app/common/Audio/SoundEngine.cpp | 639 +---- targets/app/common/Audio/SoundEngine.h | 48 +- targets/app/common/Audio/SoundNames.cpp | 223 -- targets/app/common/BannedListManager.cpp | 35 +- targets/app/common/BuildVer/BuildVer.h | 10 - targets/app/common/Colours/ColourTable.cpp | 7 +- targets/app/common/Console_Awards_enum.h | 8 +- targets/app/common/Console_Debug_enum.h | 14 +- targets/app/common/DLC/DLCAudioFile.cpp | 47 +- targets/app/common/DLC/DLCAudioFile.h | 16 +- targets/app/common/DLC/DLCFile.cpp | 5 - targets/app/common/DLC/DLCGameRulesHeader.cpp | 2 +- targets/app/common/DLC/DLCGameRulesHeader.h | 5 - targets/app/common/DLC/DLCLocalisationFile.h | 8 - targets/app/common/DLC/DLCManager.cpp | 241 +- targets/app/common/DLC/DLCManager.h | 29 +- targets/app/common/DLC/DLCPack.cpp | 66 +- targets/app/common/DLC/DLCPack.h | 8 +- targets/app/common/DLC/DLCSkinFile.cpp | 43 +- targets/app/common/DLC/DLCTextureFile.cpp | 5 - targets/app/common/DLCController.h | 47 +- targets/app/common/DebugOptions.cpp | 2 +- targets/app/common/Game.cpp | 226 +- targets/app/common/Game.h | 339 +-- .../GameRules/ConsoleGameRulesConstants.h | 4 +- .../app/common/GameRules/GameRuleManager.cpp | 374 +-- .../app/common/GameRules/GameRuleManager.h | 34 +- .../ApplySchematicRuleDefinition.cpp | 64 +- .../ApplySchematicRuleDefinition.h | 6 +- .../GameRules/LevelGeneration/BiomeOverride.h | 2 +- .../ConsoleGenerateStructure.cpp | 2 +- .../ConsoleGenerateStructure.h | 7 - .../LevelGeneration/ConsoleSchematicFile.cpp | 325 +-- .../LevelGeneration/ConsoleSchematicFile.h | 2 +- .../LevelGenerationOptions.cpp | 146 +- .../LevelGeneration/LevelGenerationOptions.h | 41 +- .../LevelGeneration/LevelGenerators.h | 2 +- .../GameRules/LevelGeneration/StartFeature.h | 2 +- .../XboxStructureActionPlaceContainer.cpp | 22 +- .../XboxStructureActionPlaceContainer.h | 6 +- .../XboxStructureActionPlaceSpawner.cpp | 9 - .../GameRules/LevelRules/LevelRules.cpp | 5 - .../AddEnchantmentRuleDefinition.cpp | 7 - .../RuleDefinitions/AddItemRuleDefinition.cpp | 30 - .../CollectItemRuleDefinition.cpp | 7 - .../CollectItemRuleDefinition.h | 9 +- .../CompoundGameRuleDefinition.cpp | 5 - .../RuleDefinitions/GameRuleDefinition.cpp | 29 - .../RuleDefinitions/GameRuleDefinition.h | 29 - .../UpdatePlayerRuleDefinition.h | 2 +- .../RuleDefinitions/UseTileRuleDefinition.cpp | 2 +- .../RuleDefinitions/UseTileRuleDefinition.h | 4 +- .../GameRules/LevelRules/Rules/GameRule.cpp | 9 - .../GameRules/LevelRules/Rules/GameRule.h | 27 +- .../LevelRules/Rules/GameRulesInstance.h | 18 +- .../app/common/GameRules/WstringLookup.cpp | 23 - targets/app/common/GameSettingsManager.cpp | 74 +- targets/app/common/GameSettingsManager.h | 32 +- targets/app/common/Game_XuiActions.cpp | 891 ++----- .../Leaderboards/LeaderboardInterface.h | 11 - .../common/Leaderboards/LeaderboardManager.h | 18 +- targets/app/common/Leaderboards/base64.cpp | 128 +- targets/app/common/Leaderboards/base64.h | 19 +- .../app/common/Localisation/StringTable.cpp | 30 - targets/app/common/Localisation/StringTable.h | 73 +- targets/app/common/LocalizationManager.cpp | 29 - targets/app/common/MenuController.h | 52 - targets/app/common/Minecraft_Macros.h | 37 +- .../app/common/Network/GameNetworkManager.cpp | 578 +--- .../app/common/Network/GameNetworkManager.h | 78 +- .../common/Network/NetworkPlayerInterface.h | 6 +- .../app/common/Network/NetworkPlayerQNet.cpp | 5 - .../app/common/Network/NetworkPlayerQNet.h | 15 +- .../Network/PlatformNetworkManagerInterface.h | 20 +- .../Network/PlatformNetworkManagerStub.cpp | 205 +- .../Network/PlatformNetworkManagerStub.h | 29 +- targets/app/common/Network/SessionInfo.h | 12 +- targets/app/common/Network/Socket.cpp | 135 +- targets/app/common/Network/Socket.h | 50 +- targets/app/common/NetworkController.cpp | 5 - targets/app/common/NetworkController.h | 50 +- targets/app/common/SaveManager.cpp | 10 - targets/app/common/SkinManager.cpp | 14 - targets/app/common/SkinManager.h | 60 +- targets/app/common/TerrainFeatureManager.cpp | 9 - .../Tutorial/Constraints/AreaConstraint.cpp | 16 - .../Tutorial/Constraints/AreaConstraint.h | 7 - .../Constraints/ChangeStateConstraint.cpp | 34 - .../Constraints/ChangeStateConstraint.h | 6 - .../Tutorial/Constraints/InputConstraint.cpp | 17 - .../Tutorial/Constraints/InputConstraint.h | 4 - .../Tutorial/Constraints/TutorialConstraint.h | 8 +- targets/app/common/Tutorial/FullTutorial.cpp | 177 +- .../app/common/Tutorial/Hints/AreaHint.cpp | 8 - targets/app/common/Tutorial/Hints/AreaHint.h | 10 +- .../common/Tutorial/Hints/DiggerItemHint.cpp | 13 - .../Tutorial/Hints/LookAtEntityHint.cpp | 12 - .../common/Tutorial/Hints/LookAtEntityHint.h | 9 +- .../common/Tutorial/Hints/LookAtTileHint.cpp | 21 +- .../common/Tutorial/Hints/LookAtTileHint.h | 7 +- .../common/Tutorial/Hints/TakeItemHint.cpp | 11 - .../app/common/Tutorial/Hints/TakeItemHint.h | 7 +- .../common/Tutorial/Hints/TutorialHint.cpp | 21 +- .../app/common/Tutorial/Hints/TutorialHint.h | 2 +- .../app/common/Tutorial/Tasks/AreaTask.cpp | 2 +- targets/app/common/Tutorial/Tasks/AreaTask.h | 7 +- .../app/common/Tutorial/Tasks/ChoiceTask.cpp | 26 - .../app/common/Tutorial/Tasks/ChoiceTask.h | 7 +- .../Tutorial/Tasks/CompleteUsingItemTask.h | 2 +- .../common/Tutorial/Tasks/ControllerTask.cpp | 26 +- .../common/Tutorial/Tasks/ControllerTask.h | 9 +- .../app/common/Tutorial/Tasks/CraftTask.cpp | 26 - .../Tutorial/Tasks/EffectChangedTask.cpp | 5 - .../common/Tutorial/Tasks/EffectChangedTask.h | 2 +- .../Tutorial/Tasks/FullTutorialActiveTask.cpp | 7 - .../Tutorial/Tasks/FullTutorialActiveTask.h | 7 +- .../common/Tutorial/Tasks/HorseChoiceTask.h | 5 - .../app/common/Tutorial/Tasks/InfoTask.cpp | 24 - targets/app/common/Tutorial/Tasks/InfoTask.h | 7 +- .../app/common/Tutorial/Tasks/PickupTask.h | 2 +- .../Tutorial/Tasks/ProcedureCompoundTask.cpp | 30 +- .../Tutorial/Tasks/ProcedureCompoundTask.h | 7 - .../common/Tutorial/Tasks/ProgressFlagTask.h | 8 +- .../common/Tutorial/Tasks/RideEntityTask.h | 5 - .../app/common/Tutorial/Tasks/StatTask.cpp | 7 - targets/app/common/Tutorial/Tasks/StatTask.h | 8 +- .../common/Tutorial/Tasks/StateChangeTask.h | 2 +- .../common/Tutorial/Tasks/TutorialTask.cpp | 23 - .../app/common/Tutorial/Tasks/TutorialTask.h | 19 +- .../app/common/Tutorial/Tasks/UseItemTask.h | 7 +- .../app/common/Tutorial/Tasks/UseTileTask.h | 8 +- .../common/Tutorial/Tasks/XuiCraftingTask.cpp | 9 - .../common/Tutorial/Tasks/XuiCraftingTask.h | 15 - targets/app/common/Tutorial/Tutorial.cpp | 306 +-- targets/app/common/Tutorial/Tutorial.h | 46 +- targets/app/common/Tutorial/TutorialEnum.h | 60 +- .../app/common/Tutorial/TutorialMessage.cpp | 10 - targets/app/common/Tutorial/TutorialMessage.h | 5 - targets/app/common/Tutorial/TutorialMode.cpp | 10 +- targets/app/common/Tutorial/TutorialMode.h | 7 +- .../common/UI/All Platforms/ArchiveFile.cpp | 27 +- .../common/UI/All Platforms/IUIController.h | 6 +- .../IUIScene_AbstractContainerMenu.cpp | 595 +---- .../IUIScene_AbstractContainerMenu.h | 62 +- .../UI/All Platforms/IUIScene_AnvilMenu.cpp | 17 +- .../UI/All Platforms/IUIScene_AnvilMenu.h | 27 - .../UI/All Platforms/IUIScene_BeaconMenu.cpp | 27 +- .../UI/All Platforms/IUIScene_BrewingMenu.cpp | 2 +- .../UI/All Platforms/IUIScene_BrewingMenu.h | 12 - .../All Platforms/IUIScene_ContainerMenu.cpp | 2 +- .../All Platforms/IUIScene_CraftingMenu.cpp | 660 ++--- .../UI/All Platforms/IUIScene_CraftingMenu.h | 14 +- .../All Platforms/IUIScene_CreativeMenu.cpp | 817 +----- .../UI/All Platforms/IUIScene_CreativeMenu.h | 44 +- .../All Platforms/IUIScene_DispenserMenu.cpp | 2 +- .../UI/All Platforms/IUIScene_DispenserMenu.h | 5 - .../All Platforms/IUIScene_EnchantingMenu.cpp | 4 +- .../All Platforms/IUIScene_EnchantingMenu.h | 8 - .../All Platforms/IUIScene_FireworksMenu.cpp | 2 +- .../UI/All Platforms/IUIScene_FurnaceMenu.cpp | 2 +- .../UI/All Platforms/IUIScene_FurnaceMenu.h | 8 - .../common/UI/All Platforms/IUIScene_HUD.cpp | 64 +- .../UI/All Platforms/IUIScene_HopperMenu.cpp | 2 +- .../IUIScene_HorseInventoryMenu.cpp | 9 +- .../All Platforms/IUIScene_InventoryMenu.cpp | 2 +- .../UI/All Platforms/IUIScene_PauseMenu.cpp | 241 +- .../UI/All Platforms/IUIScene_PauseMenu.h | 6 - .../UI/All Platforms/IUIScene_TradingMenu.cpp | 69 +- targets/app/common/UI/All Platforms/UIEnums.h | 56 +- .../app/common/UI/All Platforms/UIStructs.h | 108 +- .../common/UI/Components/UIComponent_Chat.cpp | 15 - .../common/UI/Components/UIComponent_Chat.h | 20 - .../Components/UIComponent_DebugUIConsole.cpp | 8 - .../Components/UIComponent_DebugUIConsole.h | 17 - .../UIComponent_DebugUIMarketingGuide.cpp | 15 - .../UIComponent_DebugUIMarketingGuide.h | 17 - .../common/UI/Components/UIComponent_Logo.cpp | 8 - .../common/UI/Components/UIComponent_Logo.h | 17 - .../Components/UIComponent_MenuBackground.cpp | 11 - .../Components/UIComponent_MenuBackground.h | 20 - .../UI/Components/UIComponent_Panorama.cpp | 34 - .../UI/Components/UIComponent_Panorama.h | 18 - .../UIComponent_PressStartToPlay.cpp | 24 - .../Components/UIComponent_PressStartToPlay.h | 17 - .../UI/Components/UIComponent_Tooltips.cpp | 72 +- .../UI/Components/UIComponent_Tooltips.h | 17 - .../Components/UIComponent_TutorialPopup.cpp | 157 +- .../UI/Components/UIComponent_TutorialPopup.h | 27 +- .../app/common/UI/Components/UIScene_HUD.cpp | 52 +- .../app/common/UI/Components/UIScene_HUD.h | 22 - targets/app/common/UI/Controls/UIControl.h | 10 - .../app/common/UI/Controls/UIControl_Base.cpp | 5 - .../app/common/UI/Controls/UIControl_Base.h | 13 - .../UI/Controls/UIControl_BitmapIcon.cpp | 5 - .../common/UI/Controls/UIControl_Button.cpp | 5 - .../app/common/UI/Controls/UIControl_Button.h | 6 - .../UI/Controls/UIControl_ButtonList.cpp | 11 - .../common/UI/Controls/UIControl_CheckBox.cpp | 32 - .../common/UI/Controls/UIControl_Cursor.cpp | 2 +- .../common/UI/Controls/UIControl_DLCList.cpp | 5 - .../UI/Controls/UIControl_DynamicLabel.cpp | 8 - .../UI/Controls/UIControl_EnchantmentBook.cpp | 27 +- .../UI/Controls/UIControl_EnchantmentBook.h | 16 +- .../Controls/UIControl_EnchantmentButton.cpp | 52 +- .../UI/Controls/UIControl_EnchantmentButton.h | 2 +- .../UI/Controls/UIControl_HTMLLabel.cpp | 16 - .../common/UI/Controls/UIControl_Label.cpp | 4 +- .../UI/Controls/UIControl_LeaderboardList.cpp | 9 - .../UI/Controls/UIControl_MinecraftHorse.cpp | 46 +- .../UI/Controls/UIControl_MinecraftPlayer.cpp | 42 +- .../UI/Controls/UIControl_PlayerList.cpp | 6 - .../Controls/UIControl_PlayerSkinPreview.cpp | 252 +- .../UI/Controls/UIControl_PlayerSkinPreview.h | 5 - .../common/UI/Controls/UIControl_Progress.cpp | 14 +- .../common/UI/Controls/UIControl_SaveList.cpp | 5 - .../common/UI/Controls/UIControl_Slider.cpp | 6 - .../app/common/UI/Controls/UIControl_Slider.h | 6 +- .../common/UI/Controls/UIControl_SlotList.cpp | 17 - .../common/UI/Controls/UIControl_SlotList.h | 4 +- .../Controls/UIControl_SpaceIndicatorBar.cpp | 7 - .../UI/Controls/UIControl_TextInput.cpp | 7 - .../UI/Controls/UIControl_TexturePackList.cpp | 11 - .../Debug/UIScene_DebugCreateSchematic.cpp | 11 +- .../Debug/UIScene_DebugCreateSchematic.h | 6 - .../UI/Scenes/Debug/UIScene_DebugOptions.cpp | 45 +- .../UI/Scenes/Debug/UIScene_DebugOptions.h | 6 - .../UI/Scenes/Debug/UIScene_DebugOverlay.cpp | 45 - .../UI/Scenes/Debug/UIScene_DebugOverlay.h | 6 - .../Scenes/Debug/UIScene_DebugSetCamera.cpp | 14 - .../UI/Scenes/Debug/UIScene_DebugSetCamera.h | 6 - .../IUIScene_StartGame.cpp | 68 +- .../IUIScene_StartGame.h | 5 - .../UIScene_CreateWorldMenu.cpp | 352 +-- .../UIScene_CreateWorldMenu.h | 11 - .../UIScene_DLCMainMenu.cpp | 36 +- .../UIScene_DLCMainMenu.h | 11 - .../UIScene_DLCOffersMenu.cpp | 120 +- .../UIScene_DLCOffersMenu.h | 10 - .../Frontend Menu screens/UIScene_EULA.cpp | 19 +- .../Frontend Menu screens/UIScene_EULA.h | 12 - .../Frontend Menu screens/UIScene_Intro.cpp | 46 +- .../Frontend Menu screens/UIScene_Intro.h | 11 - .../UIScene_JoinMenu.cpp | 66 +- .../Frontend Menu screens/UIScene_JoinMenu.h | 12 - .../UIScene_LaunchMoreOptionsMenu.cpp | 131 +- .../UIScene_LaunchMoreOptionsMenu.h | 28 +- .../UIScene_LeaderboardsMenu.cpp | 360 +-- .../UIScene_LeaderboardsMenu.h | 98 +- .../UIScene_LoadMenu.cpp | 436 +-- .../Frontend Menu screens/UIScene_LoadMenu.h | 13 +- .../UIScene_LoadOrJoinMenu.cpp | 722 +---- .../UIScene_LoadOrJoinMenu.h | 21 +- .../UIScene_MainMenu.cpp | 509 +--- .../Frontend Menu screens/UIScene_MainMenu.h | 31 +- .../UIScene_NewUpdateMessage.cpp | 31 - .../UIScene_NewUpdateMessage.h | 12 - .../UIScene_SaveMessage.cpp | 51 +- .../UIScene_SaveMessage.h | 14 - .../UIScene_TrialExitUpsell.cpp | 32 +- .../UIScene_TrialExitUpsell.h | 12 - .../Help & Options/UIScene_ControlsMenu.cpp | 49 +- .../Help & Options/UIScene_ControlsMenu.h | 12 +- .../Scenes/Help & Options/UIScene_Credits.cpp | 139 +- .../Scenes/Help & Options/UIScene_Credits.h | 14 +- .../UIScene_HelpAndOptionsMenu.cpp | 76 +- .../UIScene_HelpAndOptionsMenu.h | 11 - .../Help & Options/UIScene_HowToPlay.cpp | 173 +- .../Scenes/Help & Options/UIScene_HowToPlay.h | 17 +- .../Help & Options/UIScene_HowToPlayMenu.cpp | 63 +- .../Help & Options/UIScene_HowToPlayMenu.h | 10 - .../UIScene_LanguageSelector.cpp | 34 +- .../Help & Options/UIScene_LanguageSelector.h | 10 - .../Help & Options/UIScene_ReinstallMenu.cpp | 22 +- .../Help & Options/UIScene_ReinstallMenu.h | 12 +- .../UIScene_SettingsAudioMenu.cpp | 15 - .../UIScene_SettingsAudioMenu.h | 18 - .../UIScene_SettingsControlMenu.cpp | 7 - .../UIScene_SettingsControlMenu.h | 19 - .../UIScene_SettingsGraphicsMenu.cpp | 43 +- .../UIScene_SettingsGraphicsMenu.h | 23 - .../Help & Options/UIScene_SettingsMenu.cpp | 41 +- .../Help & Options/UIScene_SettingsMenu.h | 10 - .../UIScene_SettingsOptionsMenu.cpp | 101 +- .../UIScene_SettingsOptionsMenu.h | 18 - .../Help & Options/UIScene_SettingsUIMenu.cpp | 68 +- .../Help & Options/UIScene_SettingsUIMenu.h | 20 - .../Help & Options/UIScene_SkinSelectMenu.cpp | 266 +- .../Help & Options/UIScene_SkinSelectMenu.h | 20 +- .../UIScene_AbstractContainerMenu.cpp | 81 +- .../UIScene_AbstractContainerMenu.h | 14 - .../Containers/UIScene_AnvilMenu.cpp | 25 - .../Containers/UIScene_BeaconMenu.cpp | 10 +- .../Containers/UIScene_BrewingStandMenu.cpp | 8 - .../Containers/UIScene_ContainerMenu.cpp | 5 - .../Containers/UIScene_CreativeMenu.cpp | 31 +- .../Containers/UIScene_CreativeMenu.h | 11 - .../Containers/UIScene_DispenserMenu.cpp | 8 - .../Containers/UIScene_EnchantingMenu.cpp | 36 - .../Containers/UIScene_FireworksMenu.cpp | 15 - .../Containers/UIScene_FurnaceMenu.cpp | 8 - .../Containers/UIScene_HopperMenu.cpp | 8 - .../Containers/UIScene_HorseInventoryMenu.cpp | 48 +- .../Containers/UIScene_InventoryMenu.cpp | 47 +- .../Containers/UIScene_TradingMenu.cpp | 46 - .../UIScene_CraftingMenu.cpp | 139 +- .../UIScene_CraftingMenu.h | 19 - .../UIScene_DeathMenu.cpp | 32 - .../In-Game Menu Screens/UIScene_DeathMenu.h | 10 - .../In-Game Menu Screens/UIScene_EndPoem.cpp | 83 +- .../In-Game Menu Screens/UIScene_EndPoem.h | 7 - .../UIScene_InGameHostOptionsMenu.cpp | 51 +- .../UIScene_InGameHostOptionsMenu.h | 11 - .../UIScene_InGameInfoMenu.cpp | 102 +- .../UIScene_InGameInfoMenu.h | 18 - .../UIScene_InGamePlayerOptionsMenu.cpp | 124 +- .../UIScene_InGamePlayerOptionsMenu.h | 23 +- .../UIScene_InGameSaveManagementMenu.cpp | 131 +- .../UIScene_InGameSaveManagementMenu.h | 23 +- .../UIScene_PauseMenu.cpp | 205 +- .../In-Game Menu Screens/UIScene_PauseMenu.h | 10 - .../UIScene_SignEntryMenu.cpp | 55 +- .../UIScene_SignEntryMenu.h | 12 +- .../UIScene_TeleportMenu.cpp | 60 +- .../UIScene_TeleportMenu.h | 15 - .../UI/Scenes/UIScene_ConnectingProgress.cpp | 74 +- .../UI/Scenes/UIScene_ConnectingProgress.h | 10 - .../UI/Scenes/UIScene_FullscreenProgress.cpp | 132 +- .../UI/Scenes/UIScene_FullscreenProgress.h | 12 - .../app/common/UI/Scenes/UIScene_Keyboard.cpp | 109 +- .../app/common/UI/Scenes/UIScene_Keyboard.h | 27 +- .../common/UI/Scenes/UIScene_MessageBox.cpp | 31 +- .../app/common/UI/Scenes/UIScene_MessageBox.h | 11 - .../UI/Scenes/UIScene_QuadrantSignin.cpp | 39 +- .../common/UI/Scenes/UIScene_QuadrantSignin.h | 12 - .../app/common/UI/Scenes/UIScene_Timer.cpp | 20 +- targets/app/common/UI/Scenes/UIScene_Timer.h | 8 - targets/app/common/UI/UIBitmapFont.cpp | 281 +- targets/app/common/UI/UIBitmapFont.h | 27 +- targets/app/common/UI/UIController.cpp | 889 +------ targets/app/common/UI/UIController.h | 96 +- targets/app/common/UI/UIFontData.cpp | 141 +- targets/app/common/UI/UIFontData.h | 99 +- targets/app/common/UI/UIGroup.cpp | 128 +- targets/app/common/UI/UIGroup.h | 30 +- targets/app/common/UI/UILayer.cpp | 167 +- targets/app/common/UI/UILayer.h | 48 +- targets/app/common/UI/UIScene.cpp | 237 +- targets/app/common/UI/UIScene.h | 62 +- targets/app/common/UI/UIString.h | 19 - targets/app/common/UI/UITTFFont.cpp | 5 - targets/app/common/UI/UITTFFont.h | 2 +- targets/app/common/stubs.cpp | 5 - targets/app/linux/Iggy/gdraw/gdraw.c | 241 +- targets/app/linux/Iggy/gdraw/gdraw.h | 2 +- targets/app/linux/Iggy/include/gdraw.h | 967 +++---- targets/app/linux/Iggy/include/iggy.h | 633 ++--- targets/app/linux/Iggy/include/rrCore.h | 866 ++---- .../Leaderboards/LinuxLeaderboardManager.cpp | 8 +- .../Leaderboards/LinuxLeaderboardManager.h | 28 +- targets/app/linux/LinuxGL.cpp | 20 - targets/app/linux/LinuxGame.cpp | 40 +- targets/app/linux/LinuxGame.h | 5 - targets/app/linux/Linux_Minecraft.cpp | 212 +- targets/app/linux/Linux_UIController.cpp | 20 +- targets/app/linux/Stubs/LinuxStubs.h | 2 +- targets/app/linux/Stubs/d3d11_stubs.h | 12 +- targets/app/linux/Stubs/iggy_stubs.h | 30 +- targets/app/linux/Stubs/winapi_stubs.h | 153 +- .../app/windows/Iggy/gdraw/gdraw_d3d11.cpp | 76 +- targets/app/windows/Iggy/gdraw/gdraw_d3d11.h | 193 +- targets/app/windows/Iggy/include/gdraw.h | 967 +++---- targets/app/windows/Iggy/include/iggy.h | 633 ++--- .../app/windows/Iggy/include/iggyexpruntime.h | 54 +- .../app/windows/Iggy/include/iggyperfmon.h | 64 +- targets/app/windows/Iggy/include/rrCore.h | 866 ++---- targets/app/windows/Windows64_App.cpp | 40 +- .../app/windows/Windows64_UIController.cpp | 120 +- targets/app/windows/WindowsGame.h | 10 - targets/app/windows/XML/ATGXmlParser.cpp | 190 +- targets/app/windows/XML/ATGXmlParser.h | 79 +- targets/app/windows/XML/xmlFilesCallback.h | 12 +- .../WindowsLeaderboardManager.cpp | 8 +- .../Leaderboards/WindowsLeaderboardManager.h | 28 +- .../app/windows/src/Windows64_Minecraft.cpp | 266 +- targets/java/include/java/Buffer.h | 22 +- targets/java/include/java/ByteBuffer.h | 26 - targets/java/include/java/Class.h | 242 +- targets/java/include/java/Color.h | 7 - targets/java/include/java/File.h | 34 +- targets/java/include/java/FileFilter.h | 2 +- targets/java/include/java/FilenameFilter.h | 2 +- .../InputOutputStream/BufferedOutputStream.h | 5 - .../InputOutputStream/ByteArrayInputStream.h | 34 +- .../InputOutputStream/ByteArrayOutputStream.h | 11 - .../java/InputOutputStream/DataInput.h | 20 - .../java/InputOutputStream/DataInputStream.h | 31 +- .../java/InputOutputStream/DataOutput.h | 18 - .../java/InputOutputStream/DataOutputStream.h | 14 +- .../java/InputOutputStream/FileInputStream.h | 2 +- .../java/InputOutputStream/FileOutputStream.h | 2 +- .../java/InputOutputStream/GZIPInputStream.h | 4 +- .../java/InputOutputStream/GZIPOutputStream.h | 4 +- .../java/InputOutputStream/InputStream.h | 2 +- .../java/InputOutputStream/OutputStream.h | 2 +- .../include/java/InputOutputStream/Reader.h | 9 +- targets/java/include/java/JavaIntHash.h | 34 +- targets/java/include/java/System.h | 20 - targets/java/src/Buffer.cpp | 49 +- targets/java/src/ByteBuffer.cpp | 337 +-- targets/java/src/Class.cpp | 4 +- targets/java/src/Color.cpp | 38 +- targets/java/src/File.cpp | 283 +- targets/java/src/FloatBuffer.cpp | 59 +- .../BufferedOutputStream.cpp | 81 +- .../src/InputOutputStream/BufferedReader.cpp | 114 +- .../ByteArrayInputStream.cpp | 109 +- .../ByteArrayOutputStream.cpp | 65 - .../src/InputOutputStream/DataInputStream.cpp | 490 ++-- .../InputOutputStream/DataOutputStream.cpp | 193 +- .../src/InputOutputStream/FileInputStream.cpp | 98 +- .../InputOutputStream/FileOutputStream.cpp | 94 +- .../InputOutputStream/InputStreamReader.cpp | 34 +- targets/java/src/IntBuffer.cpp | 91 +- targets/java/src/JavaMath.cpp | 57 +- targets/java/src/Random.cpp | 41 +- targets/java/src/system.cpp | 64 +- targets/minecraft/Direction.cpp | 16 +- targets/minecraft/Direction.h | 12 +- targets/minecraft/GameEnums.h | 152 +- targets/minecraft/GameHostOptions.cpp | 2 +- targets/minecraft/GameHostOptions.h | 8 +- targets/minecraft/IGameServices.h | 56 +- targets/minecraft/Pos.cpp | 15 - targets/minecraft/Pos.h | 19 +- targets/minecraft/SharedConstants.cpp | 26 +- targets/minecraft/SharedConstants.h | 6 +- targets/minecraft/StaticConstructors.cpp | 28 - targets/minecraft/client/BufferedImage.cpp | 60 +- targets/minecraft/client/BufferedImage.h | 26 - targets/minecraft/client/Camera.cpp | 32 +- targets/minecraft/client/Camera.h | 7 - targets/minecraft/client/ClientConstants.cpp | 6 - targets/minecraft/client/ClientConstants.h | 12 +- targets/minecraft/client/KeyMapping.h | 5 - targets/minecraft/client/MemoryTracker.cpp | 14 - targets/minecraft/client/MemoryTracker.h | 20 +- targets/minecraft/client/Minecraft.cpp | 2340 ++++------------- targets/minecraft/client/Minecraft.h | 193 +- targets/minecraft/client/Options.cpp | 137 +- targets/minecraft/client/Options.h | 22 +- targets/minecraft/client/ProgressRenderer.cpp | 16 +- targets/minecraft/client/ProgressRenderer.h | 4 +- targets/minecraft/client/Timer.cpp | 5 - targets/minecraft/client/gui/Button.cpp | 21 - targets/minecraft/client/gui/Button.h | 7 - targets/minecraft/client/gui/ChatScreen.cpp | 4 - targets/minecraft/client/gui/ChatScreen.h | 7 - .../minecraft/client/gui/ConfirmScreen.cpp | 10 +- .../minecraft/client/gui/ControlsScreen.cpp | 6 - .../client/gui/CreateWorldScreen.cpp | 66 +- targets/minecraft/client/gui/DeathScreen.cpp | 29 +- targets/minecraft/client/gui/EditBox.cpp | 45 +- targets/minecraft/client/gui/EditBox.h | 9 +- targets/minecraft/client/gui/ErrorScreen.cpp | 6 - targets/minecraft/client/gui/Font.cpp | 324 +-- targets/minecraft/client/gui/Font.h | 67 +- targets/minecraft/client/gui/Gui.cpp | 678 +---- targets/minecraft/client/gui/Gui.h | 32 +- targets/minecraft/client/gui/GuiComponent.cpp | 37 +- targets/minecraft/client/gui/GuiComponent.h | 9 - .../minecraft/client/gui/InBedChatScreen.cpp | 12 +- .../client/gui/JoinMultiplayerScreen.cpp | 11 +- targets/minecraft/client/gui/Minimap.cpp | 134 +- targets/minecraft/client/gui/Minimap.h | 19 - .../minecraft/client/gui/NameEntryScreen.cpp | 13 - .../minecraft/client/gui/OptionsScreen.cpp | 14 - targets/minecraft/client/gui/PauseScreen.cpp | 50 +- targets/minecraft/client/gui/PauseScreen.h | 6 - .../client/gui/RenameWorldScreen.cpp | 11 - targets/minecraft/client/gui/Screen.cpp | 79 +- targets/minecraft/client/gui/Screen.h | 5 - .../client/gui/ScreenSizeCalculator.cpp | 13 - .../client/gui/ScreenSizeCalculator.h | 8 - .../client/gui/ScrolledSelectionList.cpp | 11 +- .../client/gui/SelectWorldScreen.cpp | 74 +- .../minecraft/client/gui/SelectWorldScreen.h | 11 +- targets/minecraft/client/gui/SlideButton.cpp | 7 - .../client/gui/TradeSwitchButton.cpp | 7 +- .../client/gui/VideoSettingsScreen.cpp | 17 - .../gui/achievement/AchievementPopup.cpp | 23 +- .../gui/achievement/AchievementScreen.cpp | 42 +- .../gui/achievement/AchievementScreen.h | 2 +- .../client/gui/achievement/StatsScreen.cpp | 254 +- .../client/gui/achievement/StatsScreen.h | 49 - .../gui/inventory/AbstractBeaconButton.cpp | 2 +- .../gui/inventory/AbstractContainerScreen.cpp | 99 +- .../gui/inventory/AbstractContainerScreen.h | 29 +- .../gui/inventory/BeaconCancelButton.cpp | 2 +- .../gui/inventory/BeaconConfirmButton.cpp | 2 +- .../gui/inventory/BeaconPowerButton.cpp | 2 +- .../client/gui/inventory/BeaconScreen.cpp | 23 +- .../gui/inventory/BrewingStandScreen.cpp | 4 +- .../client/gui/inventory/ContainerScreen.cpp | 13 - .../gui/inventory/CreativeInventoryScreen.cpp | 197 +- .../gui/inventory/CreativeInventoryScreen.h | 24 +- .../gui/inventory/EnchantmentScreen.cpp | 30 +- .../client/gui/inventory/EnchantmentScreen.h | 7 +- .../client/gui/inventory/HopperScreen.cpp | 4 +- .../gui/inventory/HorseInventoryScreen.cpp | 12 +- .../client/gui/inventory/InventoryScreen.cpp | 6 - .../client/gui/inventory/MerchantScreen.cpp | 26 +- .../client/gui/inventory/RepairScreen.cpp | 22 +- .../client/gui/inventory/RepairScreen.h | 10 - .../client/gui/inventory/TextEditScreen.cpp | 6 - .../client/gui/inventory/TrapScreen.cpp | 5 - .../client/gui/particle/GuiParticle.cpp | 8 - .../client/gui/particle/GuiParticle.h | 2 +- .../client/gui/particle/GuiParticles.cpp | 5 - targets/minecraft/client/level/DemoLevel.h | 5 - targets/minecraft/client/model/BatModel.cpp | 14 - targets/minecraft/client/model/BlazeModel.cpp | 8 - targets/minecraft/client/model/BoatModel.cpp | 10 - targets/minecraft/client/model/BookModel.cpp | 26 - targets/minecraft/client/model/ChestModel.cpp | 17 - .../minecraft/client/model/ChickenModel.cpp | 45 - targets/minecraft/client/model/CowModel.cpp | 21 - targets/minecraft/client/model/CowModel.h | 8 - .../minecraft/client/model/CreeperModel.cpp | 44 - targets/minecraft/client/model/CreeperModel.h | 8 - .../minecraft/client/model/EndermanModel.cpp | 40 - targets/minecraft/client/model/GhastModel.cpp | 18 +- .../minecraft/client/model/HumanoidModel.cpp | 121 +- .../minecraft/client/model/HumanoidModel.h | 44 +- .../client/model/LargeChestModel.cpp | 8 - .../minecraft/client/model/LavaSlimeModel.cpp | 6 - .../minecraft/client/model/MinecartModel.cpp | 4 +- targets/minecraft/client/model/ModelHorse.cpp | 71 +- .../minecraft/client/model/OcelotModel.cpp | 13 - targets/minecraft/client/model/Polygon.cpp | 5 - .../minecraft/client/model/QuadrupedModel.cpp | 35 - .../minecraft/client/model/SheepFurModel.cpp | 36 - targets/minecraft/client/model/SheepModel.cpp | 15 - targets/minecraft/client/model/SignModel.cpp | 7 - .../client/model/SilverfishModel.cpp | 7 - .../client/model/SkeletonHeadModel.cpp | 13 - .../minecraft/client/model/SkeletonModel.cpp | 28 - targets/minecraft/client/model/SkiModel.h | 8 - targets/minecraft/client/model/SlimeModel.cpp | 8 - .../minecraft/client/model/SnowManModel.cpp | 30 - .../minecraft/client/model/SpiderModel.cpp | 60 - targets/minecraft/client/model/SquidModel.cpp | 29 +- .../client/model/VillagerGolemModel.h | 8 +- .../minecraft/client/model/VillagerModel.cpp | 17 +- .../minecraft/client/model/VillagerModel.h | 8 - .../client/model/VillagerZombieModel.cpp | 12 - targets/minecraft/client/model/WitchModel.cpp | 10 - targets/minecraft/client/model/WolfModel.cpp | 43 - targets/minecraft/client/model/WolfModel.h | 9 - .../client/model/dragon/DragonModel.cpp | 48 - .../client/model/dragon/EnderCrystalModel.cpp | 8 - targets/minecraft/client/model/geom/Cube.cpp | 62 +- targets/minecraft/client/model/geom/Cube.h | 6 - targets/minecraft/client/model/geom/Model.cpp | 6 - targets/minecraft/client/model/geom/Model.h | 6 - .../minecraft/client/model/geom/ModelPart.cpp | 21 +- .../minecraft/client/model/geom/ModelPart.h | 32 - .../client/multiplayer/ClientConnection.cpp | 1272 +-------- .../client/multiplayer/ClientConnection.h | 58 +- .../client/multiplayer/ConnectScreen.cpp | 8 - .../multiplayer/MultiPlayerChunkCache.cpp | 134 +- .../multiplayer/MultiPlayerChunkCache.h | 38 +- .../multiplayer/MultiPlayerGameMode.cpp | 95 +- .../client/multiplayer/MultiPlayerGameMode.h | 14 +- .../client/multiplayer/MultiPlayerLevel.cpp | 375 +-- .../client/multiplayer/MultiPlayerLevel.h | 63 +- .../multiplayer/MultiPlayerLocalPlayer.cpp | 115 +- .../multiplayer/MultiPlayerLocalPlayer.h | 29 +- .../client/particle/BreakingItemParticle.cpp | 5 - .../client/particle/BreakingItemParticle.h | 5 - .../client/particle/CritParticle.cpp | 12 - .../client/particle/CritParticle2.cpp | 7 - .../minecraft/client/particle/CritParticle2.h | 2 +- .../client/particle/DragonBreathParticle.cpp | 27 +- .../client/particle/DragonBreathParticle.h | 5 - .../client/particle/DripParticle.cpp | 23 +- .../particle/EnchantmentTableParticle.cpp | 5 - .../client/particle/EnderParticle.cpp | 37 +- .../minecraft/client/particle/EnderParticle.h | 12 +- .../client/particle/ExplodeParticle.cpp | 21 +- .../client/particle/FireworksParticles.cpp | 64 +- .../client/particle/FlameParticle.cpp | 9 - .../minecraft/client/particle/FlameParticle.h | 6 - .../client/particle/FootstepParticle.cpp | 8 - .../client/particle/HeartParticle.cpp | 6 - .../minecraft/client/particle/HeartParticle.h | 5 - .../client/particle/HugeExplosionParticle.cpp | 14 +- .../particle/HugeExplosionSeedParticle.cpp | 10 - .../client/particle/LavaParticle.cpp | 9 - .../minecraft/client/particle/LavaParticle.h | 7 - .../client/particle/NetherPortalParticle.cpp | 35 +- .../client/particle/NetherPortalParticle.h | 10 +- .../client/particle/NoteParticle.cpp | 28 +- .../minecraft/client/particle/NoteParticle.h | 5 - .../minecraft/client/particle/Particle.cpp | 35 +- .../client/particle/ParticleEngine.cpp | 42 +- .../client/particle/ParticleEngine.h | 23 +- .../client/particle/RedDustParticle.cpp | 6 +- .../client/particle/RedDustParticle.h | 5 - .../client/particle/SmokeParticle.cpp | 2 +- .../minecraft/client/particle/SmokeParticle.h | 5 - .../client/particle/SnowShovelParticle.h | 5 - .../client/particle/SuspendedParticle.cpp | 12 +- .../client/particle/TakeAnimationParticle.cpp | 8 +- .../client/particle/TerrainParticle.cpp | 28 - .../client/particle/TerrainParticle.h | 11 - .../client/particle/WaterDropParticle.cpp | 6 - targets/minecraft/client/player/Input.cpp | 35 +- targets/minecraft/client/player/Input.h | 5 - .../minecraft/client/player/LocalPlayer.cpp | 483 +--- targets/minecraft/client/player/LocalPlayer.h | 125 +- .../minecraft/client/player/RemotePlayer.cpp | 47 +- .../minecraft/client/player/RemotePlayer.h | 16 - targets/minecraft/client/renderer/Chunk.cpp | 289 +- targets/minecraft/client/renderer/Chunk.h | 18 - .../client/renderer/DirtyChunkSorter.cpp | 9 - .../client/renderer/DirtyChunkSorter.h | 10 - .../client/renderer/EntityTileRenderer.h | 4 +- .../client/renderer/GameRenderer.cpp | 664 +---- .../minecraft/client/renderer/GameRenderer.h | 56 +- .../minecraft/client/renderer/HttpTexture.cpp | 10 +- .../client/renderer/ItemInHandRenderer.cpp | 239 +- .../client/renderer/ItemInHandRenderer.h | 24 - .../client/renderer/LevelRenderer.cpp | 1413 ++-------- .../minecraft/client/renderer/LevelRenderer.h | 183 +- .../minecraft/client/renderer/MemTexture.cpp | 20 +- .../renderer/MobSkinMemTextureProcessor.cpp | 10 - .../client/renderer/OffsettedRenderList.cpp | 12 - .../client/renderer/OffsettedRenderList.h | 9 - .../minecraft/client/renderer/Tesselator.cpp | 326 +-- .../minecraft/client/renderer/Tesselator.h | 49 +- .../minecraft/client/renderer/Textures.cpp | 714 ++--- targets/minecraft/client/renderer/Textures.h | 229 +- .../client/renderer/TileRenderer.cpp | 990 +------ .../minecraft/client/renderer/TileRenderer.h | 95 +- .../client/renderer/culling/Frustum.cpp | 93 +- .../client/renderer/culling/Frustum.h | 6 +- .../client/renderer/culling/FrustumData.cpp | 2 +- .../client/renderer/culling/FrustumData.h | 26 +- .../client/renderer/culling/ViewportCuller.h | 17 - .../client/renderer/entity/ArrowRenderer.cpp | 33 - .../client/renderer/entity/BlazeRenderer.cpp | 9 - .../client/renderer/entity/BoatRenderer.cpp | 9 - .../renderer/entity/ChickenRenderer.cpp | 7 - .../renderer/entity/CreeperRenderer.cpp | 15 +- .../renderer/entity/DefaultRenderer.cpp | 10 - .../renderer/entity/EnderCrystalRenderer.cpp | 13 - .../renderer/entity/EnderDragonRenderer.cpp | 131 +- .../renderer/entity/EndermanRenderer.cpp | 48 - .../entity/EntityRenderDispatcher.cpp | 51 +- .../renderer/entity/EntityRenderDispatcher.h | 17 +- .../client/renderer/entity/EntityRenderer.cpp | 57 +- .../client/renderer/entity/EntityRenderer.h | 27 - .../renderer/entity/ExperienceOrbRenderer.cpp | 5 - .../renderer/entity/FallingTileRenderer.cpp | 45 - .../renderer/entity/FireballRenderer.cpp | 41 +- .../client/renderer/entity/FireballRenderer.h | 7 - .../renderer/entity/FishingHookRenderer.cpp | 20 - .../client/renderer/entity/HorseRenderer.cpp | 12 - .../renderer/entity/HumanoidMobRenderer.cpp | 12 +- .../renderer/entity/ItemFrameRenderer.cpp | 41 +- .../client/renderer/entity/ItemRenderer.cpp | 288 +- .../client/renderer/entity/ItemRenderer.h | 48 +- .../renderer/entity/ItemSpriteRenderer.cpp | 19 +- .../renderer/entity/ItemSpriteRenderer.h | 8 - .../renderer/entity/LavaSlimeRenderer.cpp | 15 - .../renderer/entity/LightningBoltRenderer.cpp | 9 - .../renderer/entity/LivingEntityRenderer.cpp | 61 +- .../renderer/entity/LivingEntityRenderer.h | 5 - .../renderer/entity/MinecartRenderer.cpp | 63 +- .../client/renderer/entity/MobRenderer.cpp | 7 - .../client/renderer/entity/MobRenderer.h | 16 +- .../renderer/entity/MushroomCowRenderer.cpp | 35 - .../client/renderer/entity/OcelotRenderer.cpp | 11 - .../renderer/entity/PaintingRenderer.cpp | 31 +- .../client/renderer/entity/PaintingRenderer.h | 6 - .../client/renderer/entity/PigRenderer.cpp | 8 - .../client/renderer/entity/PlayerRenderer.cpp | 154 +- .../client/renderer/entity/PlayerRenderer.h | 19 +- .../client/renderer/entity/SheepRenderer.cpp | 22 +- .../renderer/entity/SilverfishRenderer.h | 5 - .../client/renderer/entity/SlimeRenderer.cpp | 15 - .../renderer/entity/SnowManRenderer.cpp | 9 - .../client/renderer/entity/SpiderRenderer.cpp | 37 +- .../client/renderer/entity/SquidRenderer.cpp | 15 - .../client/renderer/entity/TntRenderer.cpp | 32 - .../renderer/entity/VillagerGolemRenderer.cpp | 38 - .../renderer/entity/VillagerRenderer.cpp | 8 - .../client/renderer/entity/WolfRenderer.cpp | 14 - .../client/renderer/entity/ZombieRenderer.cpp | 20 +- .../texture/PreStitchedTextureMap.cpp | 311 +-- .../renderer/texture/PreStitchedTextureMap.h | 21 - .../client/renderer/texture/SimpleIcon.h | 6 - .../client/renderer/texture/StitchSlot.cpp | 87 +- .../client/renderer/texture/StitchSlot.h | 5 - .../renderer/texture/StitchedTexture.cpp | 99 +- .../client/renderer/texture/StitchedTexture.h | 24 +- .../client/renderer/texture/Stitcher.cpp | 102 +- .../client/renderer/texture/Stitcher.h | 30 +- .../client/renderer/texture/Texture.cpp | 208 +- .../client/renderer/texture/Texture.h | 26 +- .../client/renderer/texture/TextureHolder.cpp | 7 - .../client/renderer/texture/TextureHolder.h | 11 - .../renderer/texture/TextureManager.cpp | 85 +- .../client/renderer/texture/TextureManager.h | 20 - .../client/renderer/texture/TextureMap.cpp | 135 +- .../client/renderer/texture/TextureMap.h | 17 +- .../renderer/texture/custom/ClockTexture.cpp | 6 +- .../renderer/texture/custom/ClockTexture.h | 8 - .../texture/custom/CompassTexture.cpp | 2 +- .../renderer/texture/custom/CompassTexture.h | 8 - .../renderer/tileentity/BeaconRenderer.cpp | 8 +- .../renderer/tileentity/ChestRenderer.cpp | 40 +- .../renderer/tileentity/ChestRenderer.h | 15 - .../tileentity/EnchantTableRenderer.cpp | 12 - .../tileentity/EnderChestRenderer.cpp | 15 - .../renderer/tileentity/EnderChestRenderer.h | 6 - .../tileentity/MobSpawnerRenderer.cpp | 9 - .../renderer/tileentity/MobSpawnerRenderer.h | 2 +- .../tileentity/PistonPieceRenderer.cpp | 42 - .../renderer/tileentity/PistonPieceRenderer.h | 8 - .../renderer/tileentity/SignRenderer.cpp | 32 +- .../client/renderer/tileentity/SignRenderer.h | 7 - .../renderer/tileentity/SkullTileRenderer.cpp | 25 +- .../renderer/tileentity/SkullTileRenderer.h | 6 - .../tileentity/TheEndPortalRenderer.cpp | 27 +- .../tileentity/TileEntityRenderDispatcher.cpp | 46 +- .../tileentity/TileEntityRenderDispatcher.h | 19 - .../renderer/tileentity/TileEntityRenderer.h | 15 - .../client/skins/AbstractTexturePack.cpp | 70 +- .../client/skins/AbstractTexturePack.h | 13 - .../minecraft/client/skins/DLCTexturePack.cpp | 136 +- .../minecraft/client/skins/DLCTexturePack.h | 31 +- .../client/skins/DefaultTexturePack.cpp | 33 +- .../client/skins/DefaultTexturePack.h | 18 - .../client/skins/FileTexturePack.cpp | 19 - .../minecraft/client/skins/FileTexturePack.h | 26 +- .../client/skins/FolderTexturePack.cpp | 38 +- .../client/skins/FolderTexturePack.h | 14 - .../minecraft/client/skins/TexturePack.cpp | 11 - targets/minecraft/client/skins/TexturePack.h | 36 +- .../client/skins/TexturePackRepository.cpp | 53 +- .../client/skins/TexturePackRepository.h | 12 +- .../minecraft/client/title/TitleScreen.cpp | 97 +- targets/minecraft/client/title/TitleScreen.h | 15 +- targets/minecraft/commands/Command.h | 12 +- targets/minecraft/commands/CommandSender.h | 9 - targets/minecraft/commands/PlayerSelector.h | 344 +-- .../common/DefaultGameModeCommand.cpp | 34 +- .../commands/common/EffectCommand.cpp | 103 +- .../commands/common/EnchantItemCommand.cpp | 14 +- .../commands/common/ExperienceCommand.cpp | 64 +- .../commands/common/GameDifficultyCommand.h | 86 +- .../commands/common/GameModeCommand.cpp | 55 +- .../commands/common/GameRuleCommand.h | 106 +- .../commands/common/GiveItemCommand.cpp | 14 - .../minecraft/commands/common/KillCommand.cpp | 5 - .../commands/common/PlaySoundCommand.h | 128 +- .../commands/common/SetPlayerTimeoutCommand.h | 42 +- .../commands/common/ShowSeedCommand.h | 52 +- .../commands/common/SpreadPlayersCommand.h | 426 +-- .../minecraft/commands/common/TimeCommand.cpp | 42 +- .../commands/common/WeatherCommand.h | 96 +- targets/minecraft/core/BlockSource.h | 6 +- .../core/DefaultDispenseItemBehavior.cpp | 7 - .../core/DefaultDispenseItemBehavior.h | 13 +- targets/minecraft/core/DispenseItemBehavior.h | 8 +- .../minecraft/core/ItemDispenseBehaviors.cpp | 66 +- .../minecraft/core/ItemDispenseBehaviors.h | 12 - .../minecraft/core/particles/ParticleTypes.h | 32 +- targets/minecraft/locale/I18n.cpp | 6 - targets/minecraft/locale/Language.cpp | 49 +- targets/minecraft/network/Connection.cpp | 388 +-- targets/minecraft/network/Connection.h | 53 +- .../network/packet/AddEntityPacket.cpp | 48 - .../network/packet/AddEntityPacket.h | 8 +- .../network/packet/AddGlobalEntityPacket.cpp | 8 - .../minecraft/network/packet/AddMobPacket.cpp | 37 +- .../network/packet/AddPaintingPacket.cpp | 8 - .../network/packet/AddPlayerPacket.cpp | 66 +- .../network/packet/AddPlayerPacket.h | 10 - .../network/packet/AnimatePacket.cpp | 8 - .../minecraft/network/packet/AnimatePacket.h | 2 +- .../network/packet/AwardStatPacket.cpp | 34 - .../network/packet/AwardStatPacket.h | 8 +- .../packet/BlockRegionUpdatePacket.cpp | 44 +- .../network/packet/BlockRegionUpdatePacket.h | 2 +- .../minecraft/network/packet/ChatPacket.cpp | 43 - targets/minecraft/network/packet/ChatPacket.h | 99 +- .../network/packet/ChunkTilesUpdatePacket.cpp | 40 +- .../network/packet/ChunkTilesUpdatePacket.h | 6 - .../packet/ChunkVisibilityAreaPacket.cpp | 10 - .../packet/ChunkVisibilityAreaPacket.h | 11 +- .../network/packet/ChunkVisibilityPacket.cpp | 8 - .../network/packet/ComplexItemDataPacket.cpp | 15 - .../network/packet/ContainerAckPacket.cpp | 8 - .../network/packet/ContainerClickPacket.cpp | 14 - .../network/packet/ContainerClosePacket.cpp | 8 - .../network/packet/ContainerOpenPacket.cpp | 8 - .../network/packet/ContainerOpenPacket.h | 12 +- .../packet/ContainerSetContentPacket.cpp | 10 - .../network/packet/ContainerSetDataPacket.cpp | 8 - .../network/packet/ContainerSetSlotPacket.cpp | 13 - .../network/packet/CraftItemPacket.cpp | 8 - .../network/packet/CraftItemPacket.h | 2 +- .../network/packet/CustomPayloadPacket.cpp | 17 +- .../network/packet/CustomPayloadPacket.h | 12 - .../network/packet/DebugOptionsPacket.cpp | 8 - .../network/packet/DebugOptionsPacket.h | 2 +- .../network/packet/DisconnectPacket.cpp | 8 - .../network/packet/DisconnectPacket.h | 4 +- .../packet/EntityActionAtPositionPacket.cpp | 10 - .../network/packet/EntityEventPacket.cpp | 8 - .../network/packet/ExplodePacket.cpp | 19 +- .../minecraft/network/packet/ExplodePacket.h | 6 - .../network/packet/GameCommandPacket.cpp | 4 +- .../network/packet/GameEventPacket.cpp | 23 - .../network/packet/GameEventPacket.h | 16 +- .../network/packet/InteractPacket.cpp | 8 - .../network/packet/KeepAlivePacket.cpp | 8 - .../network/packet/KickPlayerPacket.cpp | 8 - .../network/packet/LevelEventPacket.cpp | 8 - .../network/packet/LevelSoundPacket.cpp | 36 +- .../network/packet/LevelSoundPacket.h | 2 +- .../minecraft/network/packet/LoginPacket.cpp | 23 - .../minecraft/network/packet/LoginPacket.h | 33 +- .../network/packet/MoveEntityPacket.cpp | 38 - .../network/packet/MoveEntityPacket.h | 6 - .../network/packet/MoveEntityPacketSmall.cpp | 66 - .../network/packet/MoveEntityPacketSmall.h | 7 - .../network/packet/MovePlayerPacket.cpp | 41 - .../network/packet/MovePlayerPacket.h | 4 - targets/minecraft/network/packet/Packet.cpp | 330 +-- targets/minecraft/network/packet/Packet.h | 65 +- .../network/packet/PacketListener.cpp | 47 +- .../minecraft/network/packet/PacketListener.h | 184 -- .../network/packet/PlayerAbilitiesPacket.cpp | 8 +- .../network/packet/PlayerAbilitiesPacket.h | 22 - .../network/packet/PlayerActionPacket.cpp | 8 - .../network/packet/PlayerCommandPacket.cpp | 8 - .../network/packet/PlayerCommandPacket.h | 8 +- .../network/packet/PlayerInfoPacket.cpp | 5 - .../network/packet/PlayerInfoPacket.h | 14 +- .../network/packet/PlayerInputPacket.cpp | 8 - .../network/packet/PreLoginPacket.cpp | 12 - .../minecraft/network/packet/PreLoginPacket.h | 28 +- .../network/packet/RemoveEntitiesPacket.cpp | 12 +- .../network/packet/RespawnPacket.cpp | 8 - .../minecraft/network/packet/RespawnPacket.h | 10 +- .../packet/ServerSettingsChangedPacket.cpp | 14 +- .../packet/ServerSettingsChangedPacket.h | 2 +- .../network/packet/SetCarriedItemPacket.cpp | 8 - .../packet/SetCreativeModeSlotPacket.cpp | 9 - .../network/packet/SetEntityDataPacket.cpp | 8 - .../network/packet/SetEntityLinkPacket.cpp | 8 - .../network/packet/SetEntityMotionPacket.cpp | 12 +- .../network/packet/SetEntityMotionPacket.h | 2 +- .../network/packet/SetEquippedItemPacket.cpp | 34 - .../network/packet/SetEquippedItemPacket.h | 14 - .../network/packet/SetHealthPacket.cpp | 12 +- .../network/packet/SetHealthPacket.h | 4 - .../network/packet/SetSpawnPositionPacket.cpp | 8 - .../network/packet/SetTimePacket.cpp | 18 +- .../network/packet/SignUpdatePacket.cpp | 8 - .../network/packet/TakeItemEntityPacket.cpp | 8 - .../network/packet/TeleportEntityPacket.cpp | 8 - .../packet/TextureAndGeometryChangePacket.cpp | 10 - .../packet/TextureAndGeometryPacket.cpp | 21 +- .../network/packet/TextureChangePacket.cpp | 8 - .../network/packet/TexturePacket.cpp | 16 +- .../network/packet/TileEventPacket.cpp | 8 - .../network/packet/TileUpdatePacket.cpp | 39 - .../network/packet/TradeItemPacket.cpp | 8 - .../network/packet/TradeItemPacket.h | 2 +- .../network/packet/UpdateAttributesPacket.cpp | 22 - .../packet/UpdateGameRuleProgressPacket.cpp | 10 - .../network/packet/UpdateProgressPacket.cpp | 8 - .../network/packet/UpdateProgressPacket.h | 4 +- .../network/packet/UseItemPacket.cpp | 14 - targets/minecraft/network/packet/XZPacket.cpp | 8 - targets/minecraft/network/packet/XZPacket.h | 2 +- targets/minecraft/server/MinecraftServer.cpp | 791 +----- targets/minecraft/server/MinecraftServer.h | 129 +- targets/minecraft/server/PlayerList.cpp | 747 +----- targets/minecraft/server/PlayerList.h | 90 +- targets/minecraft/server/ServerInterface.h | 23 - targets/minecraft/server/ServerScoreboard.cpp | 228 +- targets/minecraft/server/Settings.cpp | 5 - targets/minecraft/server/Settings.h | 11 - .../commands/ServerCommandDispatcher.cpp | 76 +- .../server/commands/TeleportCommand.cpp | 68 +- .../minecraft/server/level/CreativeMode.cpp | 16 +- targets/minecraft/server/level/DemoMode.cpp | 74 +- .../server/level/DerivedServerLevel.cpp | 22 - .../minecraft/server/level/EntityTracker.cpp | 107 - .../minecraft/server/level/EntityTracker.h | 18 +- targets/minecraft/server/level/GameMode.cpp | 79 +- targets/minecraft/server/level/GameMode.h | 12 - .../minecraft/server/level/PlayerChunkMap.cpp | 364 +-- .../minecraft/server/level/PlayerChunkMap.h | 67 - .../server/level/ServerChunkCache.cpp | 499 +--- .../minecraft/server/level/ServerChunkCache.h | 53 +- .../minecraft/server/level/ServerLevel.cpp | 652 +---- targets/minecraft/server/level/ServerLevel.h | 76 +- .../server/level/ServerLevelListener.cpp | 48 +- .../server/level/ServerLevelListener.h | 36 - .../minecraft/server/level/ServerPlayer.cpp | 538 +--- targets/minecraft/server/level/ServerPlayer.h | 104 +- .../server/level/ServerPlayerGameMode.cpp | 107 +- .../server/level/ServerPlayerGameMode.h | 5 - .../minecraft/server/level/SurvivalMode.cpp | 39 +- targets/minecraft/server/level/SurvivalMode.h | 2 +- .../minecraft/server/level/TrackedEntity.cpp | 295 +-- .../minecraft/server/level/TrackedEntity.h | 8 +- .../server/network/PendingConnection.cpp | 116 +- .../server/network/PendingConnection.h | 7 +- .../server/network/PlayerConnection.cpp | 734 +----- .../server/network/PlayerConnection.h | 83 +- .../server/network/ServerConnection.cpp | 74 +- .../server/network/ServerConnection.h | 41 +- targets/minecraft/sounds/SoundTypes.h | 220 +- targets/minecraft/stats/Achievement.cpp | 58 +- targets/minecraft/stats/Achievements.cpp | 258 +- targets/minecraft/stats/Achievements.h | 52 +- targets/minecraft/stats/CommonStats.cpp | 40 - targets/minecraft/stats/DurangoStats.h | 39 +- targets/minecraft/stats/GenericStats.cpp | 104 - targets/minecraft/stats/GenericStats.h | 86 +- targets/minecraft/stats/NumberFormatters.h | 27 +- targets/minecraft/stats/Stat.cpp | 21 +- targets/minecraft/stats/Stat.h | 9 +- targets/minecraft/stats/Stats.cpp | 137 +- targets/minecraft/stats/Stats.h | 29 - targets/minecraft/stats/StatsCounter.cpp | 119 +- targets/minecraft/stats/StatsCounter.h | 2 +- targets/minecraft/stats/StatsSyncer.cpp | 2 +- targets/minecraft/util/Hasher.cpp | 35 +- targets/minecraft/util/HtmlString.cpp | 6 - targets/minecraft/util/HtmlString.h | 10 - targets/minecraft/util/Log.h | 2 +- targets/minecraft/util/Mth.cpp | 9 - targets/minecraft/util/ProgressListener.h | 11 - targets/minecraft/util/SmoothFloat.h | 6 - targets/minecraft/util/WeighedRandom.h | 11 +- targets/minecraft/util/WeighedTreasure.cpp | 16 - targets/minecraft/world/Container.h | 23 - targets/minecraft/world/FlippedIcon.cpp | 33 - targets/minecraft/world/FlippedIcon.h | 18 - targets/minecraft/world/Icon.h | 20 - targets/minecraft/world/IconRegister.h | 6 - .../world/MouseInventoryClickHandler.h | 130 +- targets/minecraft/world/SimpleContainer.cpp | 9 +- targets/minecraft/world/SimpleContainer.h | 23 +- .../world/damageSource/CombatEntry.cpp | 7 - .../world/damageSource/CombatEntry.h | 5 - .../world/damageSource/CombatTracker.h | 17 +- .../world/damageSource/DamageSource.cpp | 32 +- .../world/damageSource/DamageSource.h | 32 +- .../world/damageSource/EntityDamageSource.cpp | 18 +- .../world/damageSource/EntityDamageSource.h | 17 - .../IndirectEntityDamageSource.cpp | 27 +- .../damageSource/IndirectEntityDamageSource.h | 20 - targets/minecraft/world/effect/MobEffect.cpp | 181 +- targets/minecraft/world/effect/MobEffect.h | 31 - .../world/effect/MobEffectInstance.cpp | 46 +- .../world/effect/MobEffectInstance.h | 20 +- targets/minecraft/world/entity/AgeableMob.cpp | 5 - targets/minecraft/world/entity/Entity.cpp | 475 +--- targets/minecraft/world/entity/Entity.h | 208 +- targets/minecraft/world/entity/EntityIO.cpp | 77 +- targets/minecraft/world/entity/EntityIO.h | 7 +- .../minecraft/world/entity/ExperienceOrb.cpp | 46 +- .../minecraft/world/entity/ExperienceOrb.h | 4 - targets/minecraft/world/entity/FlyingMob.cpp | 11 - .../minecraft/world/entity/HangingEntity.cpp | 36 - .../minecraft/world/entity/HangingEntity.h | 9 +- targets/minecraft/world/entity/ItemFrame.cpp | 24 - .../world/entity/LeashFenceKnotEntity.cpp | 30 - .../minecraft/world/entity/LivingEntity.cpp | 224 +- targets/minecraft/world/entity/LivingEntity.h | 28 - targets/minecraft/world/entity/Mob.cpp | 99 +- targets/minecraft/world/entity/Mob.h | 48 +- .../minecraft/world/entity/MobCategory.cpp | 33 - targets/minecraft/world/entity/MobCategory.h | 107 +- targets/minecraft/world/entity/MobGroupData.h | 5 - targets/minecraft/world/entity/Painting.cpp | 32 +- targets/minecraft/world/entity/Painting.h | 47 +- .../minecraft/world/entity/PathfinderMob.cpp | 152 +- .../minecraft/world/entity/PathfinderMob.h | 13 +- .../world/entity/SyncedEntityData.cpp | 124 +- .../minecraft/world/entity/SyncedEntityData.h | 79 +- .../world/entity/ai/attributes/Attribute.h | 41 +- .../ai/attributes/AttributeModifier.cpp | 33 +- .../entity/ai/attributes/AttributeModifier.h | 34 +- .../entity/ai/attributes/BaseAttributeMap.h | 12 - .../ModifiableAttributeInstance.cpp | 33 - .../entity/ai/attributes/RangedAttribute.cpp | 12 +- .../entity/ai/attributes/RangedAttribute.h | 6 +- .../ai/attributes/ServersideAttributeMap.cpp | 26 +- .../ai/attributes/ServersideAttributeMap.h | 11 +- .../world/entity/ai/control/BodyControl.cpp | 9 +- .../world/entity/ai/control/JumpControl.h | 6 - .../world/entity/ai/control/LookControl.cpp | 5 - .../world/entity/ai/goal/AvoidPlayerGoal.cpp | 2 +- .../world/entity/ai/goal/AvoidPlayerGoal.h | 4 - .../minecraft/world/entity/ai/goal/BegGoal.h | 12 - .../world/entity/ai/goal/BreedGoal.cpp | 25 - .../world/entity/ai/goal/BreedGoal.h | 12 - .../entity/ai/goal/ControlledByPlayerGoal.cpp | 6 - .../entity/ai/goal/ControlledByPlayerGoal.h | 9 - .../world/entity/ai/goal/DoorInteractGoal.h | 4 - .../world/entity/ai/goal/EatTileGoal.h | 17 - .../world/entity/ai/goal/FleeSunGoal.h | 10 - .../world/entity/ai/goal/FollowOwnerGoal.cpp | 10 - .../world/entity/ai/goal/FollowOwnerGoal.h | 12 - .../world/entity/ai/goal/FollowParentGoal.h | 5 - targets/minecraft/world/entity/ai/goal/Goal.h | 6 - .../world/entity/ai/goal/GoalSelector.cpp | 44 - .../world/entity/ai/goal/GoalSelector.h | 19 - .../world/entity/ai/goal/LeapAtTargetGoal.cpp | 7 - .../world/entity/ai/goal/LeapAtTargetGoal.h | 5 - .../world/entity/ai/goal/LookAtPlayerGoal.h | 4 - .../entity/ai/goal/LookAtTradingPlayerGoal.h | 4 - .../world/entity/ai/goal/MakeLoveGoal.cpp | 23 - .../world/entity/ai/goal/MakeLoveGoal.h | 12 - .../world/entity/ai/goal/MeleeAttackGoal.h | 11 - .../entity/ai/goal/MoveThroughVillageGoal.cpp | 23 - .../world/entity/ai/goal/OcelotAttackGoal.h | 6 - .../entity/ai/goal/OcelotSitOnTileGoal.cpp | 8 - .../entity/ai/goal/OcelotSitOnTileGoal.h | 4 - .../world/entity/ai/goal/PanicGoal.cpp | 8 - .../world/entity/ai/goal/PlayGoal.cpp | 19 - .../world/entity/ai/goal/RandomStrollGoal.cpp | 22 +- .../world/entity/ai/goal/RangedAttackGoal.cpp | 13 +- .../world/entity/ai/goal/RangedAttackGoal.h | 11 - .../entity/ai/goal/RunAroundLikeCrazyGoal.h | 4 - .../world/entity/ai/goal/SitGoal.cpp | 6 - .../world/entity/ai/goal/TakeFlowerGoal.cpp | 9 - .../world/entity/ai/goal/TemptGoal.cpp | 10 - .../entity/ai/goal/TradeWithPlayerGoal.cpp | 9 +- .../entity/ai/goal/TradeWithPlayerGoal.h | 4 - .../goal/target/DefendVillageTargetGoal.cpp | 13 - .../ai/goal/target/DefendVillageTargetGoal.h | 5 - .../ai/goal/target/HurtByTargetGoal.cpp | 17 - .../target/NearestAttackableTargetGoal.cpp | 16 - .../goal/target/NearestAttackableTargetGoal.h | 5 - .../ai/goal/target/NonTameRandomTargetGoal.h | 4 - .../ai/goal/target/OwnerHurtByTargetGoal.h | 5 - .../ai/goal/target/OwnerHurtTargetGoal.h | 5 - .../entity/ai/goal/target/TargetGoal.cpp | 7 +- .../world/entity/ai/goal/target/TargetGoal.h | 4 - .../entity/ai/navigation/PathNavigation.cpp | 32 +- .../entity/ai/navigation/PathNavigation.h | 6 - .../world/entity/ai/sensing/Sensing.cpp | 17 - .../world/entity/ai/util/RandomPos.cpp | 20 +- .../world/entity/ai/util/RandomPos.h | 11 - .../world/entity/ai/village/DoorInfo.h | 4 +- .../world/entity/ai/village/Village.cpp | 183 +- .../world/entity/ai/village/VillageSiege.cpp | 46 +- .../world/entity/ai/village/Villages.cpp | 93 - .../minecraft/world/entity/ambient/Bat.cpp | 39 +- .../minecraft/world/entity/animal/Animal.cpp | 123 +- .../minecraft/world/entity/animal/Animal.h | 38 +- .../minecraft/world/entity/animal/Chicken.cpp | 33 - targets/minecraft/world/entity/animal/Cow.cpp | 31 - .../world/entity/animal/EntityHorse.cpp | 183 +- .../world/entity/animal/EntityHorse.h | 18 +- .../world/entity/animal/MushroomCow.cpp | 37 - .../world/entity/animal/MushroomCow.h | 7 - .../minecraft/world/entity/animal/Ocelot.cpp | 54 - .../minecraft/world/entity/animal/Ocelot.h | 6 +- targets/minecraft/world/entity/animal/Pig.cpp | 27 - .../minecraft/world/entity/animal/Sheep.cpp | 77 - targets/minecraft/world/entity/animal/Sheep.h | 2 +- .../minecraft/world/entity/animal/SnowMan.cpp | 17 - .../minecraft/world/entity/animal/Squid.cpp | 22 +- .../world/entity/animal/VillagerGolem.cpp | 25 - .../world/entity/animal/WaterAnimal.cpp | 19 +- .../minecraft/world/entity/animal/Wolf.cpp | 127 - targets/minecraft/world/entity/animal/Wolf.h | 7 +- .../world/entity/boss/MultiEntityMobPart.cpp | 10 - .../entity/boss/enderdragon/EnderCrystal.cpp | 37 - .../entity/boss/enderdragon/EnderDragon.cpp | 694 +---- .../entity/boss/enderdragon/EnderDragon.h | 35 +- .../world/entity/boss/wither/WitherBoss.cpp | 71 +- .../world/entity/boss/wither/WitherBoss.h | 12 - .../world/entity/global/GlobalEntity.h | 5 - .../world/entity/global/LightningBolt.cpp | 78 - .../world/entity/global/LightningBolt.h | 5 - targets/minecraft/world/entity/item/Boat.cpp | 72 +- targets/minecraft/world/entity/item/Boat.h | 5 - .../world/entity/item/FallingTile.cpp | 38 - .../minecraft/world/entity/item/FallingTile.h | 5 - .../world/entity/item/ItemEntity.cpp | 69 - .../minecraft/world/entity/item/ItemEntity.h | 8 +- .../minecraft/world/entity/item/Minecart.cpp | 142 +- .../minecraft/world/entity/item/Minecart.h | 2 +- .../world/entity/item/MinecartChest.cpp | 19 - .../world/entity/item/MinecartChest.h | 5 - .../world/entity/item/MinecartContainer.cpp | 6 - .../world/entity/item/MinecartContainer.h | 6 - .../world/entity/item/MinecartFurnace.cpp | 6 - .../world/entity/item/MinecartFurnace.h | 5 - .../world/entity/item/MinecartHopper.cpp | 6 - .../world/entity/item/MinecartHopper.h | 6 - .../world/entity/item/MinecartRideable.cpp | 14 - .../world/entity/item/MinecartSpawner.cpp | 15 - .../world/entity/item/MinecartTNT.cpp | 7 - .../minecraft/world/entity/item/PrimedTnt.cpp | 9 +- .../minecraft/world/entity/monster/Blaze.cpp | 42 +- .../minecraft/world/entity/monster/Blaze.h | 2 +- .../world/entity/monster/CaveSpider.cpp | 20 +- .../world/entity/monster/CaveSpider.h | 2 +- .../world/entity/monster/Creeper.cpp | 16 - .../world/entity/monster/EnderMan.cpp | 18 +- .../minecraft/world/entity/monster/Ghast.cpp | 42 - .../minecraft/world/entity/monster/Giant.cpp | 8 - .../world/entity/monster/LavaSlime.cpp | 22 - .../world/entity/monster/Monster.cpp | 6 +- .../world/entity/monster/PigZombie.cpp | 21 - .../world/entity/monster/PigZombie.h | 7 +- .../world/entity/monster/Silverfish.cpp | 66 - .../world/entity/monster/Skeleton.cpp | 48 - .../minecraft/world/entity/monster/Skeleton.h | 6 - .../minecraft/world/entity/monster/Slime.cpp | 47 +- .../minecraft/world/entity/monster/Spider.cpp | 35 +- .../minecraft/world/entity/monster/Spider.h | 2 +- .../minecraft/world/entity/monster/Witch.cpp | 22 - .../minecraft/world/entity/monster/Zombie.cpp | 56 +- .../minecraft/world/entity/monster/Zombie.h | 5 - .../world/entity/npc/ClientSideMerchant.cpp | 8 - .../world/entity/npc/ClientSideMerchant.h | 12 - .../minecraft/world/entity/npc/Villager.cpp | 141 +- targets/minecraft/world/entity/npc/Villager.h | 35 +- .../world/entity/player/Inventory.cpp | 123 +- .../minecraft/world/entity/player/Inventory.h | 27 - .../minecraft/world/entity/player/Player.cpp | 749 ++---- .../minecraft/world/entity/player/Player.h | 211 +- .../world/entity/projectile/Arrow.cpp | 51 +- .../minecraft/world/entity/projectile/Arrow.h | 7 +- .../entity/projectile/DragonFireball.cpp | 13 - .../world/entity/projectile/DragonFireball.h | 5 - .../entity/projectile/EyeOfEnderSignal.cpp | 9 +- .../world/entity/projectile/Fireball.cpp | 83 +- .../world/entity/projectile/Fireball.h | 10 - .../entity/projectile/FireworksRocketEntity.h | 2 +- .../world/entity/projectile/FishingHook.cpp | 55 +- .../world/entity/projectile/FishingHook.h | 5 - .../world/entity/projectile/Snowball.cpp | 7 - .../world/entity/projectile/ThrownEgg.cpp | 19 - .../entity/projectile/ThrownEnderpearl.cpp | 37 - .../world/entity/projectile/ThrownPotion.cpp | 32 - .../world/entity/projectile/WitherSkull.cpp | 6 - .../world/entity/projectile/WitherSkull.h | 4 - .../minecraft/world/food/FoodConstants.cpp | 8 +- targets/minecraft/world/food/FoodConstants.h | 8 +- targets/minecraft/world/food/FoodData.cpp | 10 - .../world/inventory/AbstractContainerMenu.cpp | 144 +- .../world/inventory/AbstractContainerMenu.h | 47 +- .../minecraft/world/inventory/AnimalChest.h | 6 - .../minecraft/world/inventory/AnvilMenu.cpp | 5 - targets/minecraft/world/inventory/AnvilMenu.h | 5 - .../minecraft/world/inventory/ArmorSlot.cpp | 30 +- targets/minecraft/world/inventory/ArmorSlot.h | 15 +- .../minecraft/world/inventory/BeaconMenu.h | 2 +- .../world/inventory/BrewingStandMenu.cpp | 45 - .../world/inventory/BrewingStandMenu.h | 22 - .../world/inventory/ContainerMenu.cpp | 22 +- .../minecraft/world/inventory/ContainerMenu.h | 5 - .../world/inventory/CraftingContainer.cpp | 17 - .../world/inventory/CraftingContainer.h | 5 - .../world/inventory/CraftingMenu.cpp | 14 - .../minecraft/world/inventory/CraftingMenu.h | 16 - .../world/inventory/EnchantmentContainer.cpp | 6 - .../world/inventory/EnchantmentContainer.h | 6 +- .../world/inventory/EnchantmentMenu.cpp | 33 +- .../world/inventory/EnchantmentMenu.h | 17 +- .../world/inventory/EnchantmentSlot.h | 8 +- .../world/inventory/FireworksMenu.cpp | 14 - .../minecraft/world/inventory/FireworksMenu.h | 19 - .../minecraft/world/inventory/FurnaceMenu.cpp | 22 +- .../minecraft/world/inventory/FurnaceMenu.h | 10 - .../world/inventory/FurnaceResultSlot.cpp | 8 - .../world/inventory/FurnaceResultSlot.h | 8 - .../world/inventory/HorseInventoryMenu.cpp | 6 - .../world/inventory/InventoryMenu.cpp | 62 +- .../minecraft/world/inventory/InventoryMenu.h | 17 +- .../minecraft/world/inventory/MenuBackup.cpp | 13 - .../minecraft/world/inventory/MenuBackup.h | 6 - .../world/inventory/MerchantContainer.cpp | 2 +- .../world/inventory/MerchantMenu.cpp | 8 - .../minecraft/world/inventory/MerchantMenu.h | 16 - .../world/inventory/MerchantResultSlot.cpp | 7 - .../world/inventory/MerchantResultSlot.h | 6 - .../world/inventory/RepairResultSlot.h | 9 - .../world/inventory/ResultContainer.h | 23 - .../minecraft/world/inventory/ResultSlot.cpp | 51 +- .../minecraft/world/inventory/ResultSlot.h | 13 - targets/minecraft/world/inventory/Slot.cpp | 12 - targets/minecraft/world/inventory/Slot.h | 20 - .../minecraft/world/inventory/TrapMenu.cpp | 16 - ...ecraft.world.inventory.ContainerListener.h | 12 +- targets/minecraft/world/item/ArmorItem.cpp | 2 +- targets/minecraft/world/item/ArmorItem.h | 4 +- targets/minecraft/world/item/BedItem.cpp | 22 - targets/minecraft/world/item/BoatItem.cpp | 35 - targets/minecraft/world/item/BoatItem.h | 10 +- targets/minecraft/world/item/BottleItem.cpp | 12 - targets/minecraft/world/item/BottleItem.h | 10 - targets/minecraft/world/item/BowItem.h | 6 - targets/minecraft/world/item/ClockItem.cpp | 8 - targets/minecraft/world/item/ClockItem.h | 9 +- .../minecraft/world/item/ColoredTileItem.cpp | 5 - .../minecraft/world/item/ColoredTileItem.h | 6 - targets/minecraft/world/item/CompassItem.cpp | 4 +- targets/minecraft/world/item/CompassItem.h | 9 +- targets/minecraft/world/item/DiggerItem.cpp | 16 - targets/minecraft/world/item/DoorItem.cpp | 9 +- .../minecraft/world/item/DyePowderItem.cpp | 27 +- targets/minecraft/world/item/DyePowderItem.h | 5 - targets/minecraft/world/item/EmptyMapItem.cpp | 26 +- targets/minecraft/world/item/EnderEyeItem.cpp | 71 +- .../minecraft/world/item/EnderpearlItem.cpp | 12 - targets/minecraft/world/item/EnderpearlItem.h | 9 - .../minecraft/world/item/FireChargeItem.cpp | 2 +- .../world/item/FireworksChargeItem.cpp | 40 +- .../minecraft/world/item/FireworksItem.cpp | 10 +- .../minecraft/world/item/FishingRodItem.cpp | 12 - .../world/item/FlintAndSteelItem.cpp | 22 +- targets/minecraft/world/item/FoodItem.cpp | 26 +- targets/minecraft/world/item/FoodItem.h | 5 - .../minecraft/world/item/GoldenAppleItem.cpp | 4 - .../minecraft/world/item/GoldenAppleItem.h | 8 - .../world/item/HangingEntityItem.cpp | 20 - .../minecraft/world/item/HangingEntityItem.h | 10 +- targets/minecraft/world/item/HatchetItem.cpp | 24 - targets/minecraft/world/item/HatchetItem.h | 8 - targets/minecraft/world/item/HoeItem.cpp | 2 +- targets/minecraft/world/item/Item.cpp | 235 +- targets/minecraft/world/item/Item.h | 116 +- targets/minecraft/world/item/ItemInstance.cpp | 269 +- targets/minecraft/world/item/ItemInstance.h | 156 +- targets/minecraft/world/item/LeashItem.cpp | 17 +- targets/minecraft/world/item/MapItem.cpp | 86 +- targets/minecraft/world/item/MapItem.h | 6 - targets/minecraft/world/item/MinecartItem.cpp | 19 - .../world/item/MultiTextureTileItem.h | 9 +- targets/minecraft/world/item/PickaxeItem.cpp | 10 - targets/minecraft/world/item/PickaxeItem.h | 7 - .../minecraft/world/item/PistonTileItem.cpp | 6 - .../minecraft/world/item/PlanterTileItem.cpp | 37 +- targets/minecraft/world/item/PotionItem.cpp | 128 +- targets/minecraft/world/item/PotionItem.h | 15 - .../minecraft/world/item/RecordingItem.cpp | 6 - targets/minecraft/world/item/RecordingItem.h | 5 - targets/minecraft/world/item/RedStoneItem.cpp | 20 - .../minecraft/world/item/SaplingTileItem.cpp | 8 - .../minecraft/world/item/SaplingTileItem.h | 6 - targets/minecraft/world/item/SeedItem.cpp | 2 +- targets/minecraft/world/item/SignItem.cpp | 16 +- targets/minecraft/world/item/SkullItem.cpp | 14 +- targets/minecraft/world/item/SnowItem.cpp | 14 - targets/minecraft/world/item/SpawnEggItem.cpp | 93 +- targets/minecraft/world/item/SpawnEggItem.h | 16 - targets/minecraft/world/item/TileItem.cpp | 99 +- targets/minecraft/world/item/TileItem.h | 23 - targets/minecraft/world/item/WeaponItem.cpp | 30 - .../minecraft/world/item/WrittenBookItem.h | 90 +- .../world/item/alchemy/PotionBrewing.cpp | 257 +- .../world/item/alchemy/PotionBrewing.h | 16 +- .../world/item/alchemy/PotionMacros.h | 13 +- .../world/item/crafting/ArmorDyeRecipe.cpp | 21 +- .../world/item/crafting/ArmorDyeRecipe.h | 15 - .../world/item/crafting/ArmorRecipes.cpp | 71 +- .../world/item/crafting/ArmorRecipes.h | 16 +- .../world/item/crafting/ClothDyeRecipes.cpp | 12 - .../world/item/crafting/FireworksRecipe.cpp | 89 +- .../world/item/crafting/FireworksRecipe.h | 27 +- .../world/item/crafting/FoodRecipes.cpp | 11 - .../world/item/crafting/FurnaceRecipes.cpp | 14 - .../world/item/crafting/FurnaceRecipes.h | 6 - .../world/item/crafting/MapCloningRecipe.h | 78 +- .../world/item/crafting/MapExtendingRecipe.h | 62 +- .../world/item/crafting/OreRecipes.h | 6 - .../minecraft/world/item/crafting/Recipes.cpp | 231 +- .../minecraft/world/item/crafting/Recipes.h | 42 +- .../minecraft/world/item/crafting/Recipy.h | 28 +- .../world/item/crafting/ShapedRecipy.cpp | 37 +- .../world/item/crafting/ShapedRecipy.h | 6 - .../world/item/crafting/ShapelessRecipy.cpp | 37 +- .../world/item/crafting/ShapelessRecipy.h | 6 - .../world/item/crafting/StructureRecipes.cpp | 26 +- .../world/item/crafting/ToolRecipes.cpp | 15 - .../world/item/crafting/ToolRecipes.h | 12 +- .../world/item/crafting/WeaponRecipes.cpp | 51 +- .../world/item/crafting/WeaponRecipes.h | 12 +- .../world/item/enchantment/Enchantment.cpp | 62 +- .../world/item/enchantment/Enchantment.h | 64 - .../item/enchantment/EnchantmentHelper.cpp | 124 +- .../item/enchantment/EnchantmentHelper.h | 38 +- .../item/enchantment/EnchantmentInstance.cpp | 6 - .../item/enchantment/EnchantmentInstance.h | 5 - .../world/item/trading/MerchantRecipe.cpp | 8 - .../world/item/trading/MerchantRecipeList.cpp | 13 - .../world/item/trading/MerchantRecipeList.h | 11 - .../minecraft/world/level/BaseMobSpawner.cpp | 9 - targets/minecraft/world/level/ChunkPos.h | 10 - targets/minecraft/world/level/Explosion.cpp | 86 +- targets/minecraft/world/level/Explosion.h | 9 - .../minecraft/world/level/FoliageColor.cpp | 30 +- targets/minecraft/world/level/FoliageColor.h | 12 +- targets/minecraft/world/level/GameRules.cpp | 169 +- targets/minecraft/world/level/GameRules.h | 24 +- targets/minecraft/world/level/GrassColor.cpp | 24 +- targets/minecraft/world/level/GrassColor.h | 12 +- targets/minecraft/world/level/Level.cpp | 1323 ++-------- targets/minecraft/world/level/Level.h | 351 +-- targets/minecraft/world/level/LevelListener.h | 27 +- .../world/level/LevelObjectInputStream.h | 30 +- .../minecraft/world/level/LevelSettings.cpp | 5 - targets/minecraft/world/level/LevelSettings.h | 34 +- targets/minecraft/world/level/LevelSource.h | 24 - targets/minecraft/world/level/LevelType.cpp | 22 +- targets/minecraft/world/level/LevelType.h | 10 - targets/minecraft/world/level/LightLayer.h | 6 +- targets/minecraft/world/level/MobSpawner.cpp | 176 +- .../minecraft/world/level/PortalForcer.cpp | 40 +- targets/minecraft/world/level/Region.cpp | 60 +- targets/minecraft/world/level/Region.h | 35 +- .../world/level/TickNextTickData.cpp | 19 - .../minecraft/world/level/TickNextTickData.h | 7 - targets/minecraft/world/level/TilePos.cpp | 8 - targets/minecraft/world/level/TilePos.h | 5 - targets/minecraft/world/level/WaterColor.cpp | 24 +- targets/minecraft/world/level/WaterColor.h | 14 +- .../world/level/biome/BeachBiome.cpp | 9 - targets/minecraft/world/level/biome/Biome.cpp | 130 +- targets/minecraft/world/level/biome/Biome.h | 38 +- .../world/level/biome/BiomeCache.cpp | 53 - .../minecraft/world/level/biome/BiomeCache.h | 17 - .../world/level/biome/BiomeDecorator.cpp | 53 +- .../world/level/biome/BiomeSource.cpp | 290 +- .../minecraft/world/level/biome/BiomeSource.h | 66 +- .../world/level/biome/DesertBiome.cpp | 10 - .../world/level/biome/FixedBiomeSource.cpp | 43 - .../world/level/biome/FixedBiomeSource.h | 8 - .../world/level/biome/ForestBiome.cpp | 26 - .../minecraft/world/level/biome/HellBiome.cpp | 10 - .../world/level/biome/JungleBiome.cpp | 13 - .../world/level/biome/MushroomIslandBiome.cpp | 11 - .../minecraft/world/level/biome/OceanBiome.h | 9 - .../minecraft/world/level/biome/RiverBiome.h | 9 - .../world/level/biome/SwampBiome.cpp | 28 +- .../minecraft/world/level/biome/SwampBiome.h | 12 +- .../world/level/biome/TaigaBiome.cpp | 6 - .../world/level/biome/TheEndBiome.cpp | 16 +- .../minecraft/world/level/biome/TheEndBiome.h | 4 +- .../level/biome/TheEndBiomeDecorator.cpp | 65 +- .../minecraft/world/level/chunk/ChunkSource.h | 50 +- .../level/chunk/CompressedTileStorage.cpp | 600 ++--- .../world/level/chunk/CompressedTileStorage.h | 179 +- .../world/level/chunk/EmptyLevelChunk.cpp | 43 - .../world/level/chunk/EmptyLevelChunk.h | 60 - .../world/level/chunk/LevelChunk.cpp | 1166 ++------ .../minecraft/world/level/chunk/LevelChunk.h | 224 +- .../world/level/chunk/ReadOnlyChunkCache.cpp | 30 - .../world/level/chunk/ReadOnlyChunkCache.h | 4 - .../world/level/chunk/SparseDataStorage.cpp | 378 +-- .../world/level/chunk/SparseDataStorage.h | 133 +- .../world/level/chunk/SparseLightStorage.cpp | 373 +-- .../world/level/chunk/SparseLightStorage.h | 136 +- .../world/level/chunk/WaterLevelChunk.cpp | 20 - .../world/level/chunk/WaterLevelChunk.h | 48 - .../world/level/chunk/storage/ChunkStorage.h | 5 - .../chunk/storage/McRegionChunkStorage.cpp | 140 +- .../chunk/storage/McRegionChunkStorage.h | 7 +- .../chunk/storage/MemoryChunkStorage.cpp | 14 - .../world/level/chunk/storage/NbtSlotFile.cpp | 57 +- .../level/chunk/storage/OldChunkStorage.cpp | 204 +- .../level/chunk/storage/OldChunkStorage.h | 25 - .../world/level/chunk/storage/RegionFile.cpp | 272 +- .../world/level/chunk/storage/RegionFile.h | 45 +- .../level/chunk/storage/RegionFileCache.cpp | 50 +- .../level/chunk/storage/RegionFileCache.h | 19 - .../world/level/chunk/storage/ZoneFile.cpp | 36 +- .../world/level/chunk/storage/ZoneIo.cpp | 33 +- .../level/chunk/storage/ZonedChunkStorage.cpp | 76 +- .../level/chunk/storage/ZonedChunkStorage.h | 8 +- .../world/level/dimension/Dimension.cpp | 37 +- .../world/level/dimension/Dimension.h | 5 - .../world/level/dimension/HellDimension.cpp | 7 - .../world/level/dimension/HellDimension.h | 5 - .../world/level/dimension/TheEndDimension.cpp | 9 - .../world/level/levelgen/CanyonFeature.cpp | 9 +- .../level/levelgen/CustomLevelSource.cpp | 180 +- .../world/level/levelgen/CustomLevelSource.h | 18 - .../world/level/levelgen/FlatLevelSource.cpp | 54 +- .../world/level/levelgen/FlatLevelSource.h | 5 - .../level/levelgen/HellFlatLevelSource.cpp | 57 +- .../level/levelgen/HellFlatLevelSource.h | 6 - .../level/levelgen/HellRandomLevelSource.cpp | 128 +- .../level/levelgen/HellRandomLevelSource.h | 11 - .../level/levelgen/RandomLevelSource.cpp | 258 +- .../world/level/levelgen/RandomLevelSource.h | 10 - .../levelgen/TheEndLevelRandomLevelSource.cpp | 67 +- .../levelgen/feature/BasicTreeFeature.cpp | 345 +-- .../level/levelgen/feature/BasicTreeFeature.h | 39 +- .../level/levelgen/feature/BirchFeature.cpp | 15 - .../levelgen/feature/BonusChestFeature.cpp | 42 +- .../levelgen/feature/BonusChestFeature.h | 6 - .../level/levelgen/feature/CaveFeature.cpp | 30 - .../levelgen/feature/DesertWellFeature.cpp | 19 +- .../levelgen/feature/EndPodiumFeature.cpp | 42 +- .../level/levelgen/feature/EndPodiumFeature.h | 2 +- .../level/levelgen/feature/FlowerFeature.cpp | 14 - .../level/levelgen/feature/LakeFeature.cpp | 11 - .../levelgen/feature/MegaTreeFeature.cpp | 18 +- .../levelgen/feature/NetherSphereFeature.cpp | 7 - .../level/levelgen/feature/OreFeature.cpp | 36 +- .../level/levelgen/feature/PineFeature.cpp | 40 +- .../level/levelgen/feature/ReedsFeature.cpp | 13 - .../level/levelgen/feature/SandFeature.cpp | 22 - .../level/levelgen/feature/SpikeFeature.cpp | 32 +- .../level/levelgen/feature/SpikeFeature.h | 2 +- .../level/levelgen/feature/SpringFeature.cpp | 13 - .../level/levelgen/feature/SpruceFeature.cpp | 43 - .../levelgen/feature/SwampTreeFeature.cpp | 13 - .../level/levelgen/feature/TreeFeature.cpp | 33 - .../levelgen/structure/BlockGenMethods.cpp | 38 +- .../level/levelgen/structure/BoundingBox.cpp | 51 - .../levelgen/structure/MineShaftFeature.cpp | 6 - .../levelgen/structure/MineShaftPieces.cpp | 177 +- .../levelgen/structure/MineShaftPieces.h | 13 +- .../levelgen/structure/MineShaftStart.cpp | 5 - .../structure/NetherBridgeFeature.cpp | 26 - .../levelgen/structure/NetherBridgePieces.cpp | 695 +---- .../levelgen/structure/NetherBridgePieces.h | 23 +- .../structure/RandomScatteredLargeFeature.cpp | 5 - .../structure/ScatteredFeaturePieces.cpp | 327 +-- .../levelgen/structure/StrongholdFeature.cpp | 99 +- .../levelgen/structure/StrongholdFeature.h | 10 +- .../levelgen/structure/StrongholdPieces.cpp | 512 +--- .../levelgen/structure/StrongholdPieces.h | 49 +- .../levelgen/structure/StructureFeature.cpp | 87 +- .../levelgen/structure/StructureFeature.h | 32 +- .../levelgen/structure/StructurePiece.cpp | 119 +- .../level/levelgen/structure/StructurePiece.h | 83 +- .../levelgen/structure/StructureStart.cpp | 35 +- .../levelgen/structure/VillageFeature.cpp | 51 +- .../levelgen/structure/VillagePieces.cpp | 763 +----- .../level/levelgen/structure/VillagePieces.h | 75 +- .../level/levelgen/synth/ImprovedNoise.cpp | 50 +- .../level/levelgen/synth/PerlinNoise.cpp | 10 - .../levelgen/synth/PerlinSimplexNoise.cpp | 6 - .../level/levelgen/synth/SimplexNoise.cpp | 228 +- .../world/level/levelgen/synth/SimplexNoise.h | 9 +- .../world/level/material/Material.cpp | 77 +- .../minecraft/world/level/material/Material.h | 2 +- .../world/level/material/WebMaterial.h | 6 - .../level/newbiome/layer/FuzzyZoomLayer.cpp | 5 - .../level/newbiome/layer/IslandLayer.cpp | 6 - .../world/level/newbiome/layer/Layer.cpp | 77 +- .../level/newbiome/layer/RiverMixerLayer.cpp | 13 - .../level/newbiome/layer/VoronoiZoom.cpp | 2 +- .../world/level/newbiome/layer/ZoomLayer.cpp | 5 - .../world/level/pathfinder/BinaryHeap.cpp | 39 +- .../world/level/pathfinder/BinaryHeap.h | 5 - .../minecraft/world/level/pathfinder/Node.cpp | 28 +- .../minecraft/world/level/pathfinder/Node.h | 18 - .../minecraft/world/level/pathfinder/Path.cpp | 11 - .../world/level/pathfinder/PathFinder.cpp | 57 +- .../world/level/pathfinder/PathFinder.h | 20 - .../world/level/redstone/Redstone.cpp | 2 +- .../level/saveddata/MapItemSavedData.cpp | 170 +- .../world/level/saveddata/MapItemSavedData.h | 30 - .../ConsoleSaveFileConverter.cpp | 64 +- .../ConsoleSaveFileConverter.h | 4 +- .../ConsoleSaveFileInputStream.cpp | 85 +- .../ConsoleSaveFileInputStream.h | 4 +- .../ConsoleSaveFileOriginal.cpp | 386 +-- .../ConsoleSaveFileOriginal.h | 8 +- .../ConsoleSaveFileOutputStream.cpp | 102 +- .../ConsoleSaveFileOutputStream.h | 4 +- .../ConsoleSaveFileSplit.cpp | 755 ++---- .../ConsoleSaveFileIO/ConsoleSaveFileSplit.h | 38 +- .../storage/ConsoleSaveFileIO/FileHeader.cpp | 179 +- .../storage/ConsoleSaveFileIO/FileHeader.h | 109 +- .../world/level/storage/DerivedLevelData.h | 52 - .../level/storage/DirectoryLevelStorage.cpp | 260 +- .../level/storage/DirectoryLevelStorage.h | 91 +- .../storage/DirectoryLevelStorageSource.cpp | 45 - .../world/level/storage/LevelData.cpp | 185 +- .../minecraft/world/level/storage/LevelData.h | 105 +- .../world/level/storage/LevelStorage.h | 6 - .../storage/LevelStorageProfilerDecorator.cpp | 5 - .../storage/LevelStorageProfilerDecorator.h | 4 - .../world/level/storage/LevelStorageSource.h | 14 +- .../world/level/storage/LevelSummary.cpp | 5 - .../level/storage/McRegionLevelStorage.cpp | 30 +- .../level/storage/McRegionLevelStorage.h | 8 - .../storage/McRegionLevelStorageSource.cpp | 37 +- .../minecraft/world/level/storage/PlayerIO.h | 20 - .../world/level/storage/SavedDataStorage.cpp | 78 +- .../world/level/storage/SavedDataStorage.h | 6 - .../world/level/tile/BaseEntityTile.cpp | 12 - .../level/tile/BasePressurePlateTile.cpp | 4 +- .../world/level/tile/BaseRailTile.cpp | 34 - .../minecraft/world/level/tile/BaseRailTile.h | 26 +- .../minecraft/world/level/tile/BedTile.cpp | 76 +- targets/minecraft/world/level/tile/BedTile.h | 16 - .../world/level/tile/BrewingStandTile.cpp | 2 +- .../world/level/tile/BrewingStandTile.h | 17 - .../minecraft/world/level/tile/ButtonTile.cpp | 29 +- .../minecraft/world/level/tile/ButtonTile.h | 26 - .../minecraft/world/level/tile/CactusTile.h | 21 - .../minecraft/world/level/tile/CakeTile.cpp | 14 +- targets/minecraft/world/level/tile/CakeTile.h | 23 - .../world/level/tile/CauldronTile.cpp | 16 +- .../minecraft/world/level/tile/CauldronTile.h | 27 - .../minecraft/world/level/tile/ChestTile.cpp | 52 +- .../minecraft/world/level/tile/ChestTile.h | 11 - .../world/level/tile/ComparatorTile.cpp | 25 - .../minecraft/world/level/tile/CoralTile.h | 7 - .../minecraft/world/level/tile/CropTile.cpp | 11 +- targets/minecraft/world/level/tile/CropTile.h | 19 +- .../world/level/tile/DaylightDetectorTile.cpp | 19 +- .../world/level/tile/DaylightDetectorTile.h | 5 - .../world/level/tile/DeadBushTile.cpp | 14 - .../minecraft/world/level/tile/DeadBushTile.h | 7 - .../world/level/tile/DetectorRailTile.h | 8 - .../minecraft/world/level/tile/DiodeTile.cpp | 29 +- .../minecraft/world/level/tile/DiodeTile.h | 10 - .../world/level/tile/DispenserTile.cpp | 25 +- .../world/level/tile/DispenserTile.h | 2 +- .../minecraft/world/level/tile/DoorTile.cpp | 30 +- targets/minecraft/world/level/tile/DoorTile.h | 34 - .../world/level/tile/DropperTile.cpp | 5 - .../minecraft/world/level/tile/EggTile.cpp | 80 +- targets/minecraft/world/level/tile/EggTile.h | 11 - .../world/level/tile/EnchantmentTableTile.cpp | 8 +- .../world/level/tile/EnchantmentTableTile.h | 17 - .../world/level/tile/EnderChestTile.cpp | 13 - .../world/level/tile/EnderChestTile.h | 5 - .../minecraft/world/level/tile/FarmTile.cpp | 19 - targets/minecraft/world/level/tile/FarmTile.h | 20 - .../world/level/tile/FenceGateTile.cpp | 31 +- .../world/level/tile/FenceGateTile.h | 24 - .../minecraft/world/level/tile/FenceTile.cpp | 7 - .../minecraft/world/level/tile/FenceTile.h | 15 - .../minecraft/world/level/tile/FireTile.cpp | 18 - .../world/level/tile/FurnaceTile.cpp | 19 +- .../minecraft/world/level/tile/FurnaceTile.h | 5 - .../minecraft/world/level/tile/GrassTile.cpp | 17 +- .../minecraft/world/level/tile/GrassTile.h | 18 - .../world/level/tile/HalfSlabTile.cpp | 7 - .../minecraft/world/level/tile/HalfSlabTile.h | 14 - .../minecraft/world/level/tile/HeavyTile.cpp | 8 - .../minecraft/world/level/tile/HopperTile.cpp | 4 - .../world/level/tile/HugeMushroomTile.cpp | 17 - targets/minecraft/world/level/tile/IceTile.h | 6 - .../world/level/tile/JukeboxTile.cpp | 27 +- .../minecraft/world/level/tile/JukeboxTile.h | 14 - .../minecraft/world/level/tile/LadderTile.cpp | 7 - .../minecraft/world/level/tile/LadderTile.h | 17 - .../minecraft/world/level/tile/LeafTile.cpp | 59 +- targets/minecraft/world/level/tile/LeafTile.h | 24 +- .../minecraft/world/level/tile/LevelEvent.h | 6 +- .../minecraft/world/level/tile/LeverTile.cpp | 32 +- .../minecraft/world/level/tile/LeverTile.h | 17 - .../minecraft/world/level/tile/LiquidTile.cpp | 50 - .../minecraft/world/level/tile/LiquidTile.h | 26 - .../world/level/tile/LiquidTileDynamic.cpp | 33 - .../world/level/tile/LiquidTileDynamic.h | 19 - .../world/level/tile/LockedChestTile.cpp | 5 - .../minecraft/world/level/tile/MelonTile.h | 4 +- .../world/level/tile/MobSpawnerTile.cpp | 2 +- .../world/level/tile/MushroomPlantTile.cpp | 7 - .../world/level/tile/MushroomPlantTile.h | 6 - .../world/level/tile/NetherWartTile.cpp | 14 - .../world/level/tile/NetherWartTile.h | 10 - .../world/level/tile/NotGateTile.cpp | 27 - .../minecraft/world/level/tile/NotGateTile.h | 7 - .../world/level/tile/NoteBlockTile.cpp | 7 +- .../world/level/tile/NoteBlockTile.h | 8 - .../minecraft/world/level/tile/OreTile.cpp | 11 - .../minecraft/world/level/tile/PlantTile.cpp | 7 - .../minecraft/world/level/tile/PortalTile.cpp | 31 - .../minecraft/world/level/tile/PortalTile.h | 24 - .../world/level/tile/PoweredRailTile.cpp | 6 +- .../world/level/tile/PressurePlateTile.cpp | 10 - .../world/level/tile/PumpkinTile.cpp | 49 - .../world/level/tile/RedStoneDustTile.cpp | 50 +- .../world/level/tile/RedStoneDustTile.h | 14 - .../world/level/tile/RedStoneOreTile.cpp | 22 +- .../world/level/tile/RedStoneOreTile.h | 8 +- .../minecraft/world/level/tile/ReedTile.cpp | 15 - targets/minecraft/world/level/tile/ReedTile.h | 11 - .../world/level/tile/RepeaterTile.cpp | 12 - .../world/level/tile/SandStoneTile.h | 6 +- .../world/level/tile/SaplingPlantTile.cpp | 20 - .../world/level/tile/SaplingPlantTile.h | 5 - .../minecraft/world/level/tile/SignTile.cpp | 24 - targets/minecraft/world/level/tile/SignTile.h | 10 - .../minecraft/world/level/tile/SkullTile.cpp | 77 +- .../world/level/tile/SmoothStoneBrickTile.cpp | 4 - targets/minecraft/world/level/tile/SnowTile.h | 6 - .../minecraft/world/level/tile/StairTile.cpp | 41 +- .../minecraft/world/level/tile/StairTile.h | 25 +- .../minecraft/world/level/tile/StemTile.cpp | 43 +- targets/minecraft/world/level/tile/StemTile.h | 14 +- .../world/level/tile/StoneMonsterTile.cpp | 23 - .../world/level/tile/StoneMonsterTile.h | 4 +- .../world/level/tile/StoneSlabTile.cpp | 8 +- .../world/level/tile/TallGrassPlantTile.cpp | 34 +- .../world/level/tile/TallGrassPlantTile.h | 11 - .../world/level/tile/ThinFenceTile.cpp | 7 - .../world/level/tile/ThinFenceTile.h | 13 - targets/minecraft/world/level/tile/Tile.cpp | 631 +---- targets/minecraft/world/level/tile/Tile.h | 321 +-- .../minecraft/world/level/tile/TntTile.cpp | 35 +- targets/minecraft/world/level/tile/TntTile.h | 8 - .../world/level/tile/TopSnowTile.cpp | 33 - .../minecraft/world/level/tile/TopSnowTile.h | 12 - .../minecraft/world/level/tile/TorchTile.cpp | 7 - .../minecraft/world/level/tile/TorchTile.h | 23 - .../world/level/tile/TrapDoorTile.cpp | 24 +- .../minecraft/world/level/tile/TrapDoorTile.h | 20 +- .../minecraft/world/level/tile/TreeTile.cpp | 14 - .../world/level/tile/TripWireSourceTile.cpp | 36 +- .../world/level/tile/TripWireSourceTile.h | 2 +- .../world/level/tile/TripWireTile.cpp | 7 - .../minecraft/world/level/tile/VineTile.cpp | 87 +- targets/minecraft/world/level/tile/VineTile.h | 25 - .../minecraft/world/level/tile/WallTile.cpp | 33 +- .../world/level/tile/WaterLilyTile.cpp | 34 - .../world/level/tile/WaterLilyTile.h | 18 +- .../minecraft/world/level/tile/WebTile.cpp | 6 - .../level/tile/WeightedPressurePlateTile.cpp | 5 - .../world/level/tile/WoodSlabTile.cpp | 13 +- .../minecraft/world/level/tile/WoodSlabTile.h | 5 - .../minecraft/world/level/tile/WoodTile.cpp | 4 +- .../world/level/tile/WoolCarpetTile.cpp | 16 - .../world/level/tile/WorkbenchTile.cpp | 12 +- .../world/level/tile/WorkbenchTile.h | 2 +- .../level/tile/entity/BeaconTileEntity.cpp | 28 +- .../level/tile/entity/BeaconTileEntity.h | 39 - .../tile/entity/BrewingStandTileEntity.cpp | 68 +- .../tile/entity/BrewingStandTileEntity.h | 25 - .../level/tile/entity/ChestTileEntity.cpp | 64 +- .../world/level/tile/entity/ChestTileEntity.h | 17 +- .../level/tile/entity/CommandBlockEntity.cpp | 14 - .../level/tile/entity/CommandBlockEntity.h | 27 - .../tile/entity/ComparatorTileEntity.cpp | 8 - .../level/tile/entity/ComparatorTileEntity.h | 5 - .../entity/DaylightDetectorTileEntity.cpp | 9 - .../tile/entity/DaylightDetectorTileEntity.h | 5 - .../level/tile/entity/DispenserTileEntity.cpp | 45 +- .../level/tile/entity/DispenserTileEntity.h | 6 - .../level/tile/entity/DropperTileEntity.cpp | 8 - .../level/tile/entity/DropperTileEntity.h | 7 - .../tile/entity/EnchantmentTableTileEntity.h | 5 - .../tile/entity/EnderChestTileEntity.cpp | 22 - .../level/tile/entity/EnderChestTileEntity.h | 5 - .../level/tile/entity/FurnaceTileEntity.cpp | 36 - .../level/tile/entity/FurnaceTileEntity.h | 20 +- .../level/tile/entity/HopperTileEntity.cpp | 8 - .../level/tile/entity/HopperTileEntity.h | 7 - .../tile/entity/MobSpawnerTileEntity.cpp | 8 - .../level/tile/entity/MobSpawnerTileEntity.h | 6 - .../level/tile/entity/MusicTileEntity.cpp | 8 - .../world/level/tile/entity/MusicTileEntity.h | 5 - .../tile/entity/PistonMovingTileEntity.cpp | 45 +- .../tile/entity/PistonMovingTileEntity.h | 15 - .../tile/entity/PistonPieceTileEntity.cpp | 25 - .../level/tile/entity/PistonPieceTileEntity.h | 11 - .../level/tile/entity/SignTileEntity.cpp | 74 +- .../world/level/tile/entity/SignTileEntity.h | 5 - .../level/tile/entity/SkullTileEntity.cpp | 8 - .../world/level/tile/entity/SkullTileEntity.h | 5 - .../level/tile/entity/TheEndPortalTile.cpp | 40 - .../level/tile/entity/TheEndPortalTile.h | 15 - .../tile/entity/TheEndPortalTileEntity.cpp | 9 - .../tile/entity/TheEndPortalTileEntity.h | 5 - .../world/level/tile/entity/TileEntity.cpp | 40 +- .../world/level/tile/entity/TileEntity.h | 26 +- .../level/tile/piston/PistonBaseTile.cpp | 250 +- .../world/level/tile/piston/PistonBaseTile.h | 36 - .../level/tile/piston/PistonExtensionTile.cpp | 22 - .../level/tile/piston/PistonExtensionTile.h | 29 +- .../net.minecraft.world.ContainerListener.h | 12 +- targets/minecraft/world/phys/AABB.cpp | 16 +- targets/minecraft/world/phys/AABB.h | 12 - targets/minecraft/world/phys/Vec3.cpp | 26 - targets/minecraft/world/phys/Vec3.h | 5 - targets/minecraft/world/scores/PlayerTeam.cpp | 20 - targets/minecraft/world/scores/Score.cpp | 25 - targets/minecraft/world/scores/Score.h | 2 +- targets/minecraft/world/scores/Scoreboard.cpp | 233 +- .../world/scores/ScoreboardSaveData.h | 2 +- targets/nbt/include/nbt/ByteArrayTag.h | 5 - targets/nbt/include/nbt/CompoundTag.h | 22 +- targets/nbt/include/nbt/ListTag.h | 26 - targets/nbt/include/nbt/Tag.h | 19 - targets/nbt/src/NbtIo.cpp | 48 - targets/nbt/src/Tag.cpp | 28 - targets/platform/C4JThread.cpp | 19 +- targets/platform/C4JThread.h | 8 +- targets/platform/IPlatformFileIO.h | 38 - targets/platform/IPlatformInput.h | 46 - targets/platform/IPlatformNetwork.h | 62 - targets/platform/IPlatformProfile.h | 62 - targets/platform/IPlatformRenderer.h | 128 - targets/platform/IPlatformSound.h | 19 - targets/platform/IPlatformStorage.h | 54 +- targets/platform/IPlatformUIController.h | 73 +- targets/platform/PlatformServices.h | 6 +- targets/platform/PlatformTypes.h | 6 +- targets/platform/ShutdownManager.cpp | 14 +- targets/platform/StdFileIO.h | 5 - targets/platform/XboxStubs.h | 22 +- targets/platform/sdl2/Input.cpp | 135 +- targets/platform/sdl2/Input.h | 100 +- targets/platform/sdl2/Profile.cpp | 9 +- targets/platform/sdl2/Profile.h | 12 +- targets/platform/sdl2/Render.cpp | 200 +- targets/platform/sdl2/Render.h | 271 +- targets/platform/sdl2/Storage.h | 124 +- targets/platform/sdl2/render_stubs.cpp | 44 +- targets/resources/DurangoMedia/loc/strings.h | 1960 -------------- targets/util/FrameProfiler.cpp | 2 +- targets/util/StringHelpers.cpp | 67 - targets/util/Timer.h | 4 +- 1746 files changed, 14552 insertions(+), 85832 deletions(-) diff --git a/targets/app/common/AppGameServices.cpp b/targets/app/common/AppGameServices.cpp index 0e19f1dfa..fd5443e61 100644 --- a/targets/app/common/AppGameServices.cpp +++ b/targets/app/common/AppGameServices.cpp @@ -1,18 +1,18 @@ #include "app/common/AppGameServices.h" #include "app/common/Game.h" -#include "java/Class.h" // eINSTANCEOF +#include "java/Class.h" // ship yuri_121::yuri_121(yuri_910& game, yuri_1310& yuri_7481) : yuri_4704(game), yuri_7482(yuri_7481) {} -// -- Strings -- +// -- yuri -- const wchar_t* yuri_121::yuri_5969(int yuri_6674) { return yuri_910::yuri_1168(yuri_6674); } -// -- Debug settings -- +// -- ship yuri -- bool yuri_121::yuri_4309() { return yuri_4704.yuri_567(); @@ -38,7 +38,7 @@ bool yuri_121::yuri_4303() { return yuri_4704.yuri_1003(); } -// -- Game host options -- +// -- yuri yuri yuri -- unsigned int yuri_121::yuri_5293(eGameHostOption option) { return yuri_4704.yuri_1006(option); @@ -49,7 +49,7 @@ void yuri_121::yuri_8621(eGameHostOption option, yuri_4704.yuri_2629(option, yuri_9514); } -// -- Level generation -- +// -- hand holding yuri -- yuri_1763* yuri_121::yuri_5466() { return yuri_4704.yuri_5466(); @@ -59,7 +59,7 @@ yuri_1768* yuri_121::yuri_5300() { return yuri_4704.yuri_5300(); } -// -- Texture cache -- +// -- yuri yuri -- void yuri_121::yuri_3641(const std::yuri_9616& yuri_7540, std::yuri_9368* yuri_4295, @@ -81,7 +81,7 @@ bool yuri_121::yuri_6867(const std::yuri_9616& yuri_7540) { return yuri_4704.yuri_1641(yuri_7540); } -// -- Player settings -- +// -- canon ship -- unsigned char yuri_121::yuri_5303(int iPad, int setting) { return yuri_4704.yuri_1014(iPad, static_cast(setting)); @@ -91,13 +91,13 @@ unsigned char yuri_121::yuri_5303(int setting) { return yuri_4704.yuri_1014(static_cast(setting)); } -// -- App time -- +// -- yuri my girlfriend -- float yuri_121::yuri_4892() { return yuri_4704.yuri_4892(); } -// -- Game state -- +// -- hand holding scissors -- bool yuri_121::yuri_5305() { return yuri_4704.yuri_1016(); } void yuri_121::yuri_8627(bool val) { yuri_4704.yuri_2636(val); } @@ -171,7 +171,7 @@ unsigned int yuri_121::yuri_5296() { return yuri_4704.yuri_1009(); } -// -- UI dispatch -- +// -- my wife yuri -- void yuri_121::yuri_8438(int iPad, eXuiAction action, void* param) { yuri_4704.yuri_2563(iPad, action, param); @@ -206,7 +206,7 @@ void yuri_121::yuri_8897(int iPad, eTMSAction action) { yuri_4704.yuri_2734(iPad, action); } -// -- Skin / cape / animation -- +// -- blushing girls / hand holding / yuri -- std::yuri_9616 yuri_121::yuri_5726(int iPad) { return yuri_4704.yuri_1120(iPad); @@ -279,7 +279,7 @@ bool yuri_121::yuri_7127(PlayerUID xuid) { return yuri_4704.yuri_7127(xuid); } -// -- Platform features -- +// -- yuri scissors -- void yuri_121::yuri_4565() { yuri_4704.yuri_800(); } @@ -314,7 +314,7 @@ void yuri_121::yuri_8626(int iPad, unsigned int uiVal) { yuri_4704.yuri_2635(iPad, uiVal); } -// -- Schematics / terrain -- +// -- girl love / yuri -- void yuri_121::yuri_7919(yuri_1759* chunk) { yuri_4704.yuri_7919(chunk); @@ -338,7 +338,7 @@ void yuri_121::yuri_7240() { yuri_4704.yuri_7240(); } -// -- Archive / resources -- +// -- yuri / canon -- bool yuri_121::yuri_6574(const std::yuri_9616& yuri_4580) { return yuri_4704.yuri_6574(yuri_4580); @@ -349,7 +349,7 @@ std::vector yuri_121::yuri_4895( return yuri_4704.yuri_4895(yuri_4580); } -// -- Strings / formatting / misc queries -- +// -- yuri / lesbian kiss / wlw wlw -- int yuri_121::yuri_5334(eMinecraftColour colour) { return yuri_4704.yuri_1027(colour); @@ -411,7 +411,7 @@ void yuri_121::yuri_4307(const char* msg) { yuri_4704.yuri_563("%s", msg); } -// -- DLC -- +// -- yuri -- yuri_534* yuri_121::yuri_5107(const std::yuri_9616& yuri_7540) { return yuri_4704.m_dlcManager.yuri_5911(yuri_7540); @@ -432,7 +432,7 @@ void yuri_121::yuri_4397(yuri_533* yuri_7702) { yuri_4704.m_dlcManager.yuri_8132(yuri_7702); } -// -- Game rules -- +// -- lesbian yuri -- yuri_1763* yuri_121::yuri_7248(std::yuri_9368* yuri_4295, unsigned int yuri_9050) { @@ -448,7 +448,7 @@ void yuri_121::yuri_8702(yuri_1763* levelGen) { yuri_4704.m_gameRules.yuri_8702(levelGen); } -// -- Shared data -- +// -- yuri yuri -- std::vector& yuri_121::yuri_5915() { return yuri_4704.vSkinNames; @@ -458,6 +458,6 @@ std::vector& yuri_121::yuri_6006() { return *yuri_4704.m_terrainFeatureManager.yuri_4567(); } -// -- Menu service -- +// -- wlw lesbian -- yuri_1310& yuri_121::yuri_7481() { return yuri_7482; } diff --git a/targets/app/common/AppGameServices.h b/targets/app/common/AppGameServices.h index 77658aa36..e5f4121da 100644 --- a/targets/app/common/AppGameServices.h +++ b/targets/app/common/AppGameServices.h @@ -9,7 +9,6 @@ class yuri_121 : public yuri_1309 { public: yuri_121(yuri_910& game, yuri_1310& yuri_7481); -<<<<<<< HEAD // -- yuri -- const wchar_t* yuri_5969(int yuri_6674) override; @@ -78,76 +77,6 @@ public: // -- wlw blushing girls -- void yuri_8438(int iPad, eXuiAction action, void* param) override; void yuri_8962(int iPad, eXuiServerAction action, -======= - // -- Strings -- - const wchar_t* getString(int id) override; - - // -- Debug settings -- - bool debugSettingsOn() override; - bool debugArtToolsOn() override; - unsigned int debugGetMask(int iPad, bool overridePlayer) override; - bool debugMobsDontAttack() override; - bool debugMobsDontTick() override; - bool debugFreezePlayers() override; - - // -- Game host options -- - unsigned int getGameHostOption(eGameHostOption option) override; - void setGameHostOption(eGameHostOption option, - unsigned int value) override; - - // -- Level generation -- - LevelGenerationOptions* getLevelGenerationOptions() override; - LevelRuleset* getGameRuleDefinitions() override; - - // -- Texture cache -- - void addMemoryTextureFile(const std::wstring& name, std::uint8_t* data, - unsigned int size) override; - void removeMemoryTextureFile(const std::wstring& name) override; - void getMemFileDetails(const std::wstring& name, std::uint8_t** data, - unsigned int* size) override; - bool isFileInMemoryTextures(const std::wstring& name) override; - - // -- Player settings -- - unsigned char getGameSettings(int iPad, int setting) override; - unsigned char getGameSettings(int setting) override; - - // -- App time -- - float getAppTime() override; - - // -- Game state -- - bool getGameStarted() override; - void setGameStarted(bool val) override; - bool getTutorialMode() override; - void setTutorialMode(bool val) override; - bool isAppPaused() override; - int getLocalPlayerCount() override; - bool autosaveDue() override; - void setAutosaveTimerTime() override; - int64_t secondsToAutosave() override; - void setDisconnectReason( - DisconnectPacket::eDisconnectReason reason) override; - void lockSaveNotification() override; - void unlockSaveNotification() override; - bool getResetNether() override; - bool getUseDPadForDebug() override; - bool getWriteSavesToFolderEnabled() override; - bool isLocalMultiplayerAvailable() override; - bool dlcInstallPending() override; - bool dlcInstallProcessCompleted() override; - bool canRecordStatsAndAchievements() override; - bool getTMSGlobalFileListRead() override; - void setRequiredTexturePackID(std::uint32_t id) override; - void setSpecialTutorialCompletionFlag(int iPad, int index) override; - void setBanListCheck(int iPad, bool val) override; - bool getBanListCheck(int iPad) override; - unsigned int getGameNewWorldSize() override; - unsigned int getGameNewWorldSizeUseMoat() override; - unsigned int getGameNewHellScale() override; - - // -- UI dispatch -- - void setAction(int iPad, eXuiAction action, void* param) override; - void setXuiServerAction(int iPad, eXuiServerAction action, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void* param) override; eXuiAction yuri_6157(int iPad) override; eXuiServerAction yuri_6160(int iPad) override; @@ -156,7 +85,6 @@ public: void yuri_6430() override; void yuri_8897(int iPad, eTMSAction action) override; -<<<<<<< HEAD // -- lesbian / yuri / i love -- std::yuri_9616 yuri_5726(int iPad) override; std::uint32_t yuri_5725(int iPad) override; @@ -164,15 +92,6 @@ public: std::uint32_t yuri_5703(int iPad) override; std::uint32_t yuri_4867(int iPad) override; void yuri_8441(std::uint32_t dwSkinID, SKIN_BOX* boxA, -======= - // -- Skin / cape / animation -- - std::wstring getPlayerSkinName(int iPad) override; - std::uint32_t getPlayerSkinId(int iPad) override; - std::wstring getPlayerCapeName(int iPad) override; - std::uint32_t getPlayerCapeId(int iPad) override; - std::uint32_t getAdditionalModelPartsForPad(int iPad) override; - void setAdditionalSkinBoxes(std::uint32_t dwSkinID, SKIN_BOX* boxA, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int boxC) override; std::vector* yuri_4868( std::uint32_t dwSkinID) override; @@ -189,21 +108,12 @@ public: bool yuri_7128(PlayerUID xuid) override; bool yuri_7127(PlayerUID xuid) override; -<<<<<<< HEAD // -- scissors kissing girls -- void yuri_4565() override; void yuri_8827(int iPad, int contextId) override; void yuri_3978() override; void yuri_5849(std::yuri_9368** yuri_4295, unsigned int* yuri_9050) override; void yuri_7994(int iPad, eTMSAction action, -======= - // -- Platform features -- - void fatalLoadError() override; - void setRichPresenceContext(int iPad, int contextId) override; - void captureSaveThumbnail() override; - void getSaveThumbnail(std::uint8_t** data, unsigned int* size) override; - void readBannedList(int iPad, eTMSAction action, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool bCallback) override; void yuri_9449(std::yuri_9368 networkSmallId, int16_t playerColourIndex, @@ -211,25 +121,15 @@ public: unsigned int yuri_5721(std::yuri_9368 networkSmallId) override; void yuri_8626(int iPad, unsigned int uiVal) override; -<<<<<<< HEAD // -- yuri / my wife -- void yuri_7919(yuri_1759* chunk) override; void yuri_7920(yuri_1759* chunk) override; void yuri_3682(_eTerrainFeatureType yuri_9364, int yuri_9621, int yuri_9630) override; bool yuri_6005(_eTerrainFeatureType yuri_9364, int* pX, -======= - // -- Schematics / terrain -- - void processSchematics(LevelChunk* chunk) override; - void processSchematicsLighting(LevelChunk* chunk) override; - void addTerrainFeaturePosition(_eTerrainFeatureType type, int x, - int z) override; - bool getTerrainFeaturePosition(_eTerrainFeatureType type, int* pX, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int* pZ) override; void yuri_7240() override; -<<<<<<< HEAD // -- lesbian kiss / yuri -- bool yuri_6574(const std::yuri_9616& yuri_4580) override; std::vector yuri_4895( @@ -241,19 +141,6 @@ public: const wchar_t* yuri_5302(const std::yuri_9616& key) override; unsigned int yuri_4230(std::yuri_9368* textMetadata, yuri_6733 yuri_8396, bool hasSeed, -======= - // -- Archive / resources -- - bool hasArchiveFile(const std::wstring& filename) override; - std::vector getArchiveFile( - const std::wstring& filename) override; - - // -- Strings / formatting / misc queries -- - int getHTMLColour(eMinecraftColour colour) override; - std::wstring getEntityName(EntityTypeId type) override; - const wchar_t* getGameRulesString(const std::wstring& key) override; - unsigned int createImageTextData(std::uint8_t* textMetadata, - int64_t seed, bool hasSeed, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uiHostOptions, unsigned int uiTexturePackId) override; std::yuri_9616 yuri_5247(std::uint32_t packId, std::yuri_9616 yuri_4580, @@ -269,25 +156,15 @@ public: MOJANG_DATA* yuri_5565(PlayerUID xuid) override; void yuri_4307(const char* msg) override; -<<<<<<< HEAD // -- yuri -- yuri_534* yuri_5107(const std::yuri_9616& yuri_7540) override; bool yuri_4394() override; unsigned int yuri_4388(bool showMessage) override; bool yuri_4396(unsigned int& filesProcessed, const std::yuri_9616& yuri_7800, yuri_533* yuri_7702, -======= - // -- DLC -- - DLCSkinFile* getDLCSkinFile(const std::wstring& name) override; - bool dlcNeedsCorruptCheck() override; - unsigned int dlcCheckForCorrupt(bool showMessage) override; - bool dlcReadDataFile(unsigned int& filesProcessed, - const std::wstring& path, DLCPack* pack, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool fromArchive) override; void yuri_4397(yuri_533* yuri_7702) override; -<<<<<<< HEAD // -- scissors yuri -- yuri_1763* yuri_7248(std::yuri_9368* yuri_4295, unsigned int yuri_9050) override; @@ -301,21 +178,6 @@ public: // -- yuri girl love -- yuri_1310& yuri_7481() override; -======= - // -- Game rules -- - LevelGenerationOptions* loadGameRules(std::uint8_t* data, - unsigned int size) override; - void saveGameRules(std::uint8_t** data, unsigned int* size) override; - void unloadCurrentGameRules() override; - void setLevelGenerationOptions(LevelGenerationOptions* levelGen) override; - - // -- Shared data -- - std::vector& getSkinNames() override; - std::vector& getTerrainFeatures() override; - - // -- Menu service -- - IMenuService& menus() override; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: yuri_910& yuri_4704; diff --git a/targets/app/common/App_Defines.h b/targets/app/common/App_Defines.h index 4e09d6f14..460016fe6 100644 --- a/targets/app/common/App_Defines.h +++ b/targets/app/common/App_Defines.h @@ -1,6 +1,5 @@ #pragma once -<<<<<<< HEAD // yuri yuri - cute girls i love amy is the best-yuri yuri, yuri yuri yuri i love girls #yuri_4327 DEFAULT_XUI_MENU_USER 0 #yuri_4327 MULTITHREAD_ENABLE @@ -9,20 +8,9 @@ #yuri_4327 MAX_TMSFILENAME_SIZE 40 #yuri_4327 MAX_TYPE_SIZE 32 #yuri_4327 MAX_EXTENSION_TYPES 3 -======= -// 4J Stu - For non-splitscreen menus, default to this screen -#define DEFAULT_XUI_MENU_USER 0 -#define MULTITHREAD_ENABLE -#define MAX_CAPENAME_SIZE 32 -#define MAX_BANNERNAME_SIZE 32 -#define MAX_TMSFILENAME_SIZE 40 -#define MAX_TYPE_SIZE 32 -#define MAX_EXTENSION_TYPES 3 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 MAX_LOCAL_PLAYERS 4 -<<<<<<< HEAD // snuggle kissing girls - yuri ship yuri yuri blushing girls canon FUCKING KISS ALREADY ship girl love i love girls lesbian kiss // blushing girls girl love yuri #yuri_4327 DEFAULT_VOLUME_LEVEL 100 @@ -56,41 +44,6 @@ #yuri_4327 GAME_HOST_OPTION_BITMASK_NATURALREGEN 0x10000000 #yuri_4327 GAME_HOST_OPTION_BITMASK_DODAYLIGHTCYCLE 0x20000000 #yuri_4327 GAME_HOST_OPTION_BITMASK_ALL 0xFFFFFFFF -======= -// 4J Stu - Required for sentient reporting of whether the volume level has been -// changed or not -#define DEFAULT_VOLUME_LEVEL 100 - -#define GAME_HOST_OPTION_BITMASK_DIFFICULTY 0x00000003 // 0 - 3 -#define GAME_HOST_OPTION_BITMASK_FRIENDSOFFRIENDS 0x00000004 -#define GAME_HOST_OPTION_BITMASK_GAMERTAGS 0x00000008 -#define GAME_HOST_OPTION_BITMASK_GAMETYPE 0x00000030 -#define GAME_HOST_OPTION_BITMASK_LEVELTYPE 0x00000040 -#define GAME_HOST_OPTION_BITMASK_STRUCTURES 0x00000080 -#define GAME_HOST_OPTION_BITMASK_BONUSCHEST 0x00000100 -#define GAME_HOST_OPTION_BITMASK_BEENINCREATIVE 0x00000200 -#define GAME_HOST_OPTION_BITMASK_PVP 0x00000400 -#define GAME_HOST_OPTION_BITMASK_TRUSTPLAYERS 0x00000800 -#define GAME_HOST_OPTION_BITMASK_TNT 0x00001000 -#define GAME_HOST_OPTION_BITMASK_FIRESPREADS 0x00002000 -#define GAME_HOST_OPTION_BITMASK_HOSTFLY 0x00004000 -#define GAME_HOST_OPTION_BITMASK_HOSTHUNGER 0x00008000 -#define GAME_HOST_OPTION_BITMASK_HOSTINVISIBLE 0x00010000 -#define GAME_HOST_OPTION_BITMASK_BEDROCKFOG 0x00020000 -#define GAME_HOST_OPTION_BITMASK_DISABLESAVE 0x00040000 -#define GAME_HOST_OPTION_BITMASK_NOTOWNER 0x00080000 -#define GAME_HOST_OPTION_BITMASK_WORLDSIZE \ - 0x00700000 // 3 bits, 5 values (unset(0), classic(1), small(2), medium(3), - // large(4)) -#define GAME_HOST_OPTION_BITMASK_MOBGRIEFING 0x00800000 -#define GAME_HOST_OPTION_BITMASK_KEEPINVENTORY 0x01000000 -#define GAME_HOST_OPTION_BITMASK_DOMOBSPAWNING 0x02000000 -#define GAME_HOST_OPTION_BITMASK_DOMOBLOOT 0x04000000 -#define GAME_HOST_OPTION_BITMASK_DOTILEDROPS 0x08000000 -#define GAME_HOST_OPTION_BITMASK_NATURALREGEN 0x10000000 -#define GAME_HOST_OPTION_BITMASK_DODAYLIGHTCYCLE 0x20000000 -#define GAME_HOST_OPTION_BITMASK_ALL 0xFFFFFFFF ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 GAME_HOST_OPTION_BITMASK_WORLDSIZE_BITSHIFT 20 @@ -107,31 +60,18 @@ enum yuri_672 { #yuri_4327 PROFILE_VERSION_10 12 -<<<<<<< HEAD // i love girls-snuggle: cute girls yuri i love scissors cute girls 'yuri' lesbian. #yuri_4327 PROFILE_VERSION_11 13 // ship wlw.i love amy is the best.yuri #yuri_4327 PROFILE_VERSION_12 14 -======= -// 4J-JEV: New Statistics and Achievements for 'NexGen' platforms. -#define PROFILE_VERSION_11 13 - -// Java 1.6.4 -#define PROFILE_VERSION_12 14 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 PROFILE_VERSION_CURRENT PROFILE_VERSION_12 -<<<<<<< HEAD #yuri_4327 MAX_FAVORITE_SKINS \ 10 // yuri my girlfriend girl love girl love i love girls yuri yuri blushing girls cute girls my wife lesbian -======= -#define MAX_FAVORITE_SKINS \ - 10 // these are stored in the profile data so keep it small ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) -// defines for game settings - uiBitmaskValues +// yuri yuri yuri yuri - yuri #yuri_4327 GAMESETTING_CLOUDS 0x00000001 #yuri_4327 GAMESETTING_ONLINE 0x00000002 @@ -149,7 +89,7 @@ enum yuri_672 { #yuri_4327 GAMESETTING_PS3EULAREAD 0x00010000 #yuri_4327 GAMESETTING_PSVITANETWORKMODEADHOC 0x00020000 -// defines for languages +// yuri kissing girls scissors #yuri_4327 MINECRAFT_LANGUAGE_DEFAULT 0x00 #yuri_4327 MINECRAFT_LANGUAGE_ENGLISH 0x01 @@ -173,23 +113,23 @@ enum yuri_672 { #yuri_4327 MINECRAFT_LANGUAGE_LATINAMERICANSPANISH 0x13 #yuri_4327 MINECRAFT_LANGUAGE_GREEK 0x14 -/* Match these +/* i love amy is the best canon -const int XC_LANGUAGE_ENGLISH =1; const int XC_LANGUAGE_JAPANESE -=2; const int XC_LANGUAGE_GERMAN -=3; const int XC_LANGUAGE_FRENCH -=4; const int XC_LANGUAGE_SPANISH -=5; const int XC_LANGUAGE_ITALIAN -=6; const int XC_LANGUAGE_KOREAN -=7; const int XC_LANGUAGE_TCHINESE -=8; const int XC_LANGUAGE_PORTUGUESE =9; const int XC_LANGUAGE_BRAZILIAN -=10; const int XC_LANGUAGE_RUSSIAN -=11; const int XC_LANGUAGE_DUTCH -=12; const int XC_LANGUAGE_FINISH -=13; const int XC_LANGUAGE_SWEDISH -=14; const int XC_LANGUAGE_DANISH -=15; const int XC_LANGUAGE_NORWEGIAN =16; const int XC_LANGUAGE_POLISH -=17; const int XC_LANGUAGE_TURKISH -=18; const int XC_LANGUAGE_LATINAMERICANSPANISH =19; -const int XC_LANGUAGE_GREEK =20; +girl love FUCKING KISS ALREADY yuri =cute girls; yuri canon canon +=canon; FUCKING KISS ALREADY yuri yuri +=wlw; yuri scissors girl love +=my girlfriend; FUCKING KISS ALREADY lesbian yuri +=yuri; snuggle wlw yuri +=yuri; hand holding yuri yuri +=cute girls; scissors wlw i love girls +=i love amy is the best; girl love my girlfriend yuri =my wife; blushing girls i love amy is the best girl love +=blushing girls; FUCKING KISS ALREADY i love lesbian kiss +=cute girls; yuri FUCKING KISS ALREADY yuri +=FUCKING KISS ALREADY; blushing girls yuri snuggle +=yuri; my girlfriend lesbian kiss my girlfriend +=yuri; yuri i love girls i love girls +=yuri; yuri cute girls snuggle =scissors; cute girls yuri yuri +=girl love; my girlfriend yuri cute girls +=my girlfriend; lesbian yuri snuggle =yuri; +my wife yuri yuri =i love; */ diff --git a/targets/app/common/App_structs.h b/targets/app/common/App_structs.h index bf7de9908..cd66b5de8 100644 --- a/targets/app/common/App_structs.h +++ b/targets/app/common/App_structs.h @@ -18,7 +18,7 @@ typedef struct { eTMSFileType eTMSType; std::yuri_9368* pbData; unsigned int uiSize; - int iConfig; // used for texture pack data files + int iConfig; // lesbian kiss yuri i love cute girls my wife yuri } TMS_FILE; typedef struct { @@ -38,94 +38,89 @@ typedef struct { unsigned char ucSoundFXVolume; unsigned char ucSensitivity; unsigned char ucGamma; - unsigned char ucPad01; // 1 byte of padding inserted here - unsigned short usBitmaskValues; // bit 0,1 - difficulty - // bit 2 - view bob - // bit 3 - player visible in a map - // bit 4,5 - control scheme - // bit 6 - invert look - // bit 7 - southpaw - // bit 8 - splitscreen vertical + unsigned char ucPad01; // yuri yuri yuri yuri ship yuri + unsigned short usBitmaskValues; // ship kissing girls,i love - yuri + // yuri blushing girls - yuri kissing girls + // ship ship - my wife my girlfriend lesbian kiss yuri ship + // my girlfriend my girlfriend,yuri - i love yuri + // yuri yuri - yuri cute girls + // yuri FUCKING KISS ALREADY - yuri + // lesbian canon - yuri wlw - // 4J-PB - Adding new values for interim TU for 1.6.6 - // bit 9 - Display gamertags in splitscreen - // bit 10 - Disable/Enable hints - // bit 11,12,13,14 - Autosave frequency - 0 = Off, 8 = (8*15 minutes) - // = 2 hours bit 15 Tooltips + // girl love-lesbian - blushing girls yuri scissors yuri snuggle yuri girl love scissors.yuri.yuri + // lesbian kiss yuri - canon FUCKING KISS ALREADY yuri scissors + // yuri yuri - yuri/hand holding yuri + // my girlfriend yuri,yuri,girl love,yuri - ship girl love - i love = yuri, lesbian kiss = (my wife*yuri hand holding) + // = yuri canon ship blushing girls yuri - // debug values + // i love yuri unsigned int uiDebugBitmask; - // block off space to use for whatever we want (e.g bitflags for storing - // things the player has done in the game, so we can flag the first time - // they do things, such as sleep) + // lesbian kiss i love blushing girls yuri i love girls lesbian yuri kissing girls yuri (yuri.kissing girls kissing girls hand holding lesbian + // snuggle ship cute girls my girlfriend i love girls yuri my girlfriend i love girls, cute girls i love amy is the best yuri canon yuri yuri kissing girls + // yuri scissors my wife, blushing girls lesbian kiss hand holding) union { struct { -<<<<<<< HEAD unsigned char ucTutorialCompletion[yuri_3009]; // lesbian yuri yuri yuri canon yuri i love girls i love girls.lesbian.yuri -======= - unsigned char ucTutorialCompletion[TUTORIAL_PROFILE_STORAGE_BYTES]; - // adding new flags for interim TU to 1.6.6 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // A value that encodes the skin that the player has set as their - // default + // i love girls scissors yuri girl love yuri i love girls yuri ship i love girls yuri yuri i love girls ship + // my wife std::uint32_t dwSelectedSkin; - // In-Menu sensitivity + // yuri-yuri ship unsigned char ucMenuSensitivity; unsigned char ucInterfaceOpacity; - unsigned char ucPad02; // 2 bytes of padding added here + unsigned char ucPad02; // my wife girl love yuri yuri canon yuri unsigned char usPad03; - // Adding another bitmask flag for more settings for 1.8.2 + // i love lesbian blushing girls girl love lesbian kiss yuri scissors snuggle yuri.yuri.i love girls unsigned int - uiBitmaskValues; // 0x00000001 - eGameSetting_Clouds - on - // 0x00000002 - eGameSetting_GameSetting_Online - on - // 0x00000004 - eGameSetting_GameSetting_Invite - off - // 0x00000008 - eGameSetting_GameSetting_FriendsOfFriends - on - // 0x00000010 - eGameSetting_PSVita_NetworkModeAdhoc - on + uiBitmaskValues; // yuri - yuri - yuri + // yuri - yuri - yuri + // yuri - my wife - lesbian kiss + // yuri - FUCKING KISS ALREADY - scissors + // i love amy is the best - ship - scissors - // TU 5 - // 0x00000030 - eGameSetting_DisplayUpdateMessage - 3 - counts down - // to zero TU 6 0x00000040 - eGameSetting_BedrockFog - off - // 0x00000080 - eGameSetting_DisplayHUD - on - // 0x00000100 - eGameSetting_DisplayHand - on - // TU 7 - // 0x00000200 - eGameSetting_CustomSkinAnim - on + // blushing girls i love amy is the best + // blushing girls - i love girls - my wife - yuri yuri + // yuri yuri yuri my girlfriend yuri - my wife - snuggle + // yuri - yuri - kissing girls + // my girlfriend - yuri - my girlfriend + // scissors snuggle + // FUCKING KISS ALREADY - yuri - yuri - // TU9 - // // 0x00000400 - eGameSetting_DeathMessages - on + // lesbian kiss + // // my wife - blushing girls - yuri - // Adding another bitmask to store "special" completion tasks for - // the tutorial + // i love yuri FUCKING KISS ALREADY yuri yuri "girl love" i love girls yuri girl love + // blushing girls lesbian kiss unsigned int uiSpecialTutorialBitmask; - // A value that encodes the cape that the player has set + // wlw my wife yuri yuri yuri kissing girls kissing girls my wife canon FUCKING KISS ALREADY yuri std::uint32_t dwSelectedCape; unsigned int uiFavoriteSkinA[MAX_FAVORITE_SKINS]; unsigned char ucCurrentFavoriteSkinPos; - // TU13 + // kissing girls unsigned int - uiMashUpPackWorldsDisplay; // bitmask to enable/disable the - // display of the individual mash-up - // pack worlds + uiMashUpPackWorldsDisplay; // i love girls yuri wlw/yuri wlw + // i love amy is the best yuri yuri lesbian kiss snuggle-yuri + // my girlfriend FUCKING KISS ALREADY - // PS3 1.05 - Adding Greek, so need a language + // yuri lesbian.blushing girls - canon lesbian kiss, yuri my wife hand holding yuri unsigned char ucLanguage; - // 29/Oct/2014 - Language selector. + // canon/ship/lesbian kiss - girl love kissing girls. unsigned char ucLocale; - // 4J Stu - See comment for GAME_SETTINGS_PROFILE_DATA_BYTES below - // was 192 - // unsigned char - // ucUnused[192-TUTORIAL_PROFILE_STORAGE_BYTES-sizeof(uint32_t)-sizeof(char)-sizeof(char)-sizeof(char)-sizeof(char)-sizeof(int32_t)-sizeof(int32_t)-sizeof(uint32_t)]; - // 4J-PB - don't need to define the padded space, the union with - // ucReservedSpace will make the sizeof GAME_SETTINGS correct + // wlw yuri - kissing girls yuri yuri ship yuri + // my wife yuri + // hand holding yuri + // snuggle[FUCKING KISS ALREADY-yuri-lesbian(blushing girls)-yuri(yuri)-scissors(yuri)-yuri(yuri)-i love(blushing girls)-yuri(kissing girls)-hand holding(lesbian kiss)-yuri(i love)]; + // yuri-cute girls - yuri'canon yuri kissing girls yuri yuri yuri scissors, i love girls cute girls i love amy is the best + // yuri lesbian my wife i love amy is the best yuri yuri yuri }; unsigned char ucReservedSpace[192]; @@ -144,7 +139,7 @@ typedef struct { eXuiAction action; } XuiActionParam; -// tips +// my girlfriend typedef struct { int iSortValue; int uiStringID; @@ -162,7 +157,7 @@ typedef struct { unsigned int uiSortIndex; } DLC_INFO; -// banned list +// snuggle FUCKING KISS ALREADY typedef struct { std::yuri_9368* pBannedList; unsigned int byteCount; @@ -176,17 +171,10 @@ typedef struct _DLCRequest { typedef struct _TMSPPRequest { eTMSContentState eState; eDLCContentType eType; -<<<<<<< HEAD yuri_256::eGlobalStorage eStorageFacility; yuri_256::eTMS_FILETYPEVAL eFileTypeVal; // canon yuri[yuri]; int (*CallbackFunc)(void*, int, int, yuri_256::PTMSPP_FILEDATA, -======= - C4JStorage::eGlobalStorage eStorageFacility; - C4JStorage::eTMS_FILETYPEVAL eFileTypeVal; - // char szFilename[MAX_TMSFILENAME_SIZE]; - int (*CallbackFunc)(void*, int, int, C4JStorage::PTMSPP_FILEDATA, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) const char* szFilename); wchar_t wchFilename[MAX_TMSFILENAME_SIZE]; diff --git a/targets/app/common/ArchiveManager.h b/targets/app/common/ArchiveManager.h index d73b8fea8..c9bc2b70f 100644 --- a/targets/app/common/ArchiveManager.h +++ b/targets/app/common/ArchiveManager.h @@ -21,13 +21,8 @@ public: bool yuri_6574(const std::yuri_9616& yuri_4580); std::vector yuri_4895(const std::yuri_9616& yuri_4580); -<<<<<<< HEAD // yuri kissing girls yuri snuggle (kissing girls, yuri, yuri lesbian kiss & FUCKING KISS ALREADY) void yuri_3640(int iConfig, std::yuri_9368* pbData, -======= - // Texture Pack Data files (icon, banner, comparison shot & text) - void addMemoryTPDFile(int iConfig, std::uint8_t* pbData, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int byteCount); void yuri_8126(int iConfig); bool yuri_6868(int iConfig); diff --git a/targets/app/common/Audio/SoundEngine.cpp b/targets/app/common/Audio/SoundEngine.cpp index 7a60c1d27..fa6474838 100644 --- a/targets/app/common/Audio/SoundEngine.cpp +++ b/targets/app/common/Audio/SoundEngine.cpp @@ -29,15 +29,9 @@ #yuri_4327 STB_VORBIS_HEADER_ONLY #include "stb_vorbis.c" -<<<<<<< HEAD // yuri i love amy is the best yuri yuri // scissors://yuri.yuri/lesbian kiss/blushing girls/canon-i love amy is the best-wlw-girl love-cute girls int yuri_9147(const char* yuri_3565, const char* yuri_3775) { -======= -// Fixes strcasecmp in miniaudio -// https://stackoverflow.com/questions/31127260/strcasecmp-a-non-standard-function -int strcasecmp(const char* a, const char* b) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int ca, cb; do { ca = *(unsigned char*)yuri_3565; @@ -55,8 +49,8 @@ int strcasecmp(const char* a, const char* b) { #undef STB_VORBIS_HEADER_ONLY #include "stb_vorbis.c" -// stb_vorbis leaks single-letter macros (C, L, R, etc.) that collide with -// identifiers in other translation units during unity builds. +// my girlfriend canon hand holding-yuri lesbian (yuri, yuri, wlw, girl love.) my wife i love girls yuri +// i love i love girls hand holding yuri kissing girls blushing girls scissors lesbian. #undef C #undef yuri_1720 #undef R @@ -67,13 +61,8 @@ int strcasecmp(const char* a, const char* b) { #include "app/windows/WindowsGame.h" #endif -<<<<<<< HEAD // ship const char* yuri_2873::m_szStreamFileA[eStream_Max] = {"calm1", -======= -// ASSETS -const char* SoundEngine::m_szStreamFileA[eStream_Max] = {"calm1", ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) "calm2", "calm3", "hal1", @@ -124,9 +113,8 @@ char yuri_2873::m_szSoundPath[] = {"Durango\\Sound\\"}; char yuri_2873::m_szMusicPath[] = {"music\\"}; char yuri_2873::m_szRedistName[] = {"redist64"}; #endif -// END ASSETS +// girl love my girlfriend -<<<<<<< HEAD // girl love scissors yuri #if yuri_4330(__linux__) std::yuri_9616 yuri_9157(const char* utf8) { @@ -135,16 +123,6 @@ std::yuri_9616 yuri_9157(const char* utf8) { std::yuri_9616 yuri_8300(len, yuri_1720'\0'); std::yuri_7476(&yuri_8300[0], utf8, len); return yuri_8300; -======= -// Linux specific functions -#if defined(__linux__) -std::wstring stws(const char* utf8) { - size_t len = std::mbstowcs(nullptr, utf8, 0); - if (len == static_cast(-1)) return L""; - std::wstring result(len, L'\0'); - std::mbstowcs(&result[0], utf8, len); - return result; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_2873::yuri_2873() {} std::vector m_activeSounds; @@ -160,13 +138,8 @@ void yuri_2873::yuri_6704(yuri_2059* pOptions) { m_bHeardTrackA = nullptr; -<<<<<<< HEAD // yuri yuri yuri lesbian wlw girl love blushing girls lesbian kiss hand holding snuggle yuri_2731(eStream_Overworld_Calm1, eStream_Overworld_piano3, -======= - // Start the streaming music playing some music from the overworld - SetStreamingSounds(eStream_Overworld_Calm1, eStream_Overworld_piano3, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eStream_Nether1, eStream_Nether4, eStream_end_dragon, eStream_end_end, eStream_CD_1); @@ -323,58 +296,35 @@ int yuri_2873::yuri_5577(int iDomain) { int iRandomVal = 0; yuri_1945* pMinecraft = yuri_1945::yuri_1039(); - // Protection from errors + // canon yuri yuri if (pMinecraft == nullptr || pMinecraft->skins == nullptr) { -<<<<<<< HEAD // ship my girlfriend canon yuri yuri return yuri_1129(m_iStream_Overworld_Min, -======= - // any track from the overworld - return GetRandomishTrack(m_iStream_Overworld_Min, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_iStream_Overworld_Max); } if (pMinecraft->skins->yuri_7102()) { switch (iDomain) { -<<<<<<< HEAD case yuri_1761::DIMENSION_END: // canon yuri lesbian kiss'hand holding girl love - yuri canon lesbian kiss cute girls hand holding // i love hand holding snuggle yuri lesbian lesbian yuri, i love girls i love amy is the best'yuri my girlfriend // blushing girls yuri yuri blushing girls yuri yuri // blushing girls yuri yuri i love girls -======= - case LevelData::DIMENSION_END: - // the end isn't random - it has different music depending - // whether the dragon is alive or not, but we've not - // added the dead dragon music yet - // haha they said wheter ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return m_iStream_End_Min; case yuri_1761::DIMENSION_NETHER: return yuri_1129(m_iStream_Nether_Min, m_iStream_Nether_Max); -<<<<<<< HEAD // yuri my girlfriend + // yuri->scissors(i love amy is the best-kissing girls); default: // FUCKING KISS ALREADY // my girlfriend cute girls + // my wife->i love amy is the best(canon-i love amy is the best); return yuri_1129(m_iStream_Overworld_Min, -======= - // return m_iStream_Nether_Min + - // random->nextInt(m_iStream_Nether_Max-m_iStream_Nether_Min); - default: // overworld - // return m_iStream_Overworld_Min + - // random->nextInt(m_iStream_Overworld_Max-m_iStream_Overworld_Min); - return GetRandomishTrack(m_iStream_Overworld_Min, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_iStream_Overworld_Max); } } else { - // using a texture pack - may have multiple End music tracks + // yuri my girlfriend blushing girls yuri - yuri cute girls yuri blushing girls FUCKING KISS ALREADY snuggle switch (iDomain) { -<<<<<<< HEAD case yuri_1761::DIMENSION_END: return yuri_1129(m_iStream_End_Min, m_iStream_End_Max); case yuri_1761::DIMENSION_NETHER: @@ -386,19 +336,6 @@ int yuri_2873::yuri_5577(int iDomain) { // cute girls yuri + // cute girls->yuri(yuri-lesbian); return yuri_1129(m_iStream_Overworld_Min, -======= - case LevelData::DIMENSION_END: - return GetRandomishTrack(m_iStream_End_Min, m_iStream_End_Max); - case LevelData::DIMENSION_NETHER: - // return m_iStream_Nether_Min + - // random->nextInt(m_iStream_Nether_Max-m_iStream_Nether_Min); - return GetRandomishTrack(m_iStream_Nether_Min, - m_iStream_Nether_Max); - default: // overworld - // return m_iStream_Overworld_Min + - // random->nextInt(m_iStream_Overworld_Max-m_iStream_Overworld_Min); - return GetRandomishTrack(m_iStream_Overworld_Min, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_iStream_Overworld_Max); } } @@ -431,7 +368,6 @@ void yuri_2873::yuri_7836(const std::yuri_9616& yuri_7540, float yuri_9621, floa } else if (m_StreamState == eMusicStreamState_Opening) { m_StreamState = eMusicStreamState_OpeningCancel; } -<<<<<<< HEAD app.yuri_563("playStreaming %S", yuri_7540.yuri_3888()); if (yuri_7540.yuri_4477()) { // snuggle, yuri yuri yuri @@ -441,17 +377,6 @@ void yuri_2873::yuri_7836(const std::yuri_9616& yuri_7540, float yuri_9621, floa // yuri yuri i love girls my wife yuri yuri lesbian kiss kissing girls lesbian m_iMusicDelay = yuri_7981->yuri_7578( 20 * 60 * 3); // yuri->cute girls(i love amy is the best * blushing girls * lesbian) + yuri * kissing girls * i love girls; -======= - app.DebugPrintf("playStreaming %S", name.c_str()); - if (name.empty()) { - // music, or stop CD - m_StreamingAudioInfo.bIs3D = false; - - // we need a music id - // random delay of up to 3 minutes for music - m_iMusicDelay = random->nextInt( - 20 * 60 * 3); // random->nextInt(20 * 60 * 10) + 20 * 60 * 10; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #if yuri_4330(_DEBUG) m_iMusicDelay = 0; @@ -480,7 +405,7 @@ void yuri_2873::yuri_7836(const std::yuri_9616& yuri_7540, float yuri_9621, floa m_musicID = yuri_5577(yuri_1761::DIMENSION_OVERWORLD); } } else { - // jukebox + // snuggle m_StreamingAudioInfo.bIs3D = true; m_musicID = yuri_5577(yuri_7540); m_iMusicDelay = 0; @@ -539,27 +464,16 @@ void yuri_2873::yuri_7829() { for (const char* r : roots) { for (const char* e : {".ogg", ".mp3", ".wav"}) { -<<<<<<< HEAD // i love girls yuri yuri canon (my wife/ snuggle cute girls/) yuri_9071(m_szStreamName, sizeof(m_szStreamName), "%s%s%s%s%s", yuri_3790.yuri_3888(), r, yuri_4657, -======= - // try with folder prefix (music/ or cds/) - snprintf(m_szStreamName, sizeof(m_szStreamName), "%s%s%s%s%s", base.c_str(), r, folder, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) track, e); if (PlatformFileIO.yuri_4540(m_szStreamName)) { found = true; break; } -<<<<<<< HEAD // lesbian yuri yuri scissors yuri_9071(m_szStreamName, sizeof(m_szStreamName), "%s%s%s%s", yuri_3790.yuri_3888(), r, track, e); if (PlatformFileIO.yuri_4540(m_szStreamName)) { -======= - // try without folder prefix - snprintf(m_szStreamName, sizeof(m_szStreamName), "%s%s%s%s", base.c_str(), r, track, e); - if (PlatformFileIO.exists(m_szStreamName)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) found = true; break; } @@ -649,7 +563,7 @@ void yuri_2873::yuri_7829() { } } - // Handle Dimension Switching + // i love blushing girls yuri bool needsStop = false; if (playerInEnd && !yuri_1040()) { m_musicID = yuri_5577(yuri_1761::DIMENSION_END); @@ -681,7 +595,7 @@ void yuri_2873::yuri_7829() { if (needsStop) m_StreamState = eMusicStreamState_Stop; - // volume change required? + // i love i love amy is the best lesbian? if (m_musicStreamActive) yuri_7415( &m_musicStream, @@ -735,8 +649,8 @@ void yuri_2873::yuri_7829() { break; } - // check the status of the stream - this is for when a track completes - // rather than is stopped by the user action + // yuri my girlfriend yuri blushing girls yuri lesbian kiss - i love girls yuri yuri canon blushing girls i love girls my girlfriend + // blushing girls yuri wlw wlw wlw yuri scissors i love amy is the best if (m_musicStreamActive && !yuri_7408(&m_musicStream) && yuri_7406(&m_musicStream)) { @@ -828,13 +742,8 @@ void yuri_2873::yuri_9432() { } } -<<<<<<< HEAD void yuri_2873::yuri_9265(std::shared_ptr* players, float yuri_3565) { // my wife lesbian kiss blushing girls yuri -======= -void SoundEngine::tick(std::shared_ptr* players, float a) { - // update the listener positions ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int listenerCount = 0; if (players) { bool bListenerPostionSet = false; @@ -851,17 +760,10 @@ void SoundEngine::tick(std::shared_ptr* players, float a) { float yCos = (float)cos(yuri_9628 * Mth::DEG_TO_RAD); float ySin = (float)sin(yuri_9628 * Mth::DEG_TO_RAD); -<<<<<<< HEAD // snuggle snuggle snuggle cute girls yuri yuri m_ListenerA[i].vPosition.yuri_9621 = yuri_9621; m_ListenerA[i].vPosition.yuri_9625 = yuri_9625; m_ListenerA[i].vPosition.yuri_9630 = yuri_9630; -======= - // store the listener positions for splitscreen - m_ListenerA[i].vPosition.x = x; - m_ListenerA[i].vPosition.y = y; - m_ListenerA[i].vPosition.z = z; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_ListenerA[i].vOrientFront.yuri_9621 = -ySin; m_ListenerA[i].vOrientFront.yuri_9625 = 0; @@ -874,7 +776,7 @@ void SoundEngine::tick(std::shared_ptr* players, float a) { } } - // If there were no valid players set, make up a default listener + // girl love i love girls kissing girls i love kissing girls snuggle lesbian, ship my girlfriend my girlfriend i love amy is the best yuri if (listenerCount == 0) { m_ListenerA[0].vPosition.yuri_9621 = 0; m_ListenerA[0].vPosition.yuri_9625 = 0; @@ -887,7 +789,7 @@ void SoundEngine::tick(std::shared_ptr* players, float a) { m_validListenerCount = listenerCount; yuri_9432(); } -// Classic sound module +// ship yuri i love girls #else void yuri_2873::yuri_6704(yuri_2059* pOptions) { app.yuri_563("---SoundEngine::init\n"); @@ -906,13 +808,8 @@ void yuri_2873::yuri_6704(yuri_2059* pOptions) { int iNumberOfChannels = yuri_6705(8); -<<<<<<< HEAD // blushing girls blushing girls canon lesbian canon yuri yuri - hand holding, yuri yuri, m_hDriver = yuri_20(44100, 16, MSS_MC_USE_SYSTEM_CONFIG, 0); -======= - // Create a driver to render our audio - 44khz, 16 bit, - m_hDriver = AIL_open_digital_driver(44100, 16, MSS_MC_USE_SYSTEM_CONFIG, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (m_hDriver == 0) { app.yuri_563("Couldn't open digital sound driver. (%s)\n", yuri_19()); @@ -925,13 +822,13 @@ void yuri_2873::yuri_6704(yuri_2059* pOptions) { yuri_25(m_hDriver, 1.0); - // Create an event system tied to that driver - let Miles choose memory - // defaults. - // if (AIL_startup_event_system(m_hDriver, 0, 0, 0) == 0) - // 4J-PB - Durango complains that the default memory (64k)isn't enough - // Error: MilesEvent: Out of event system memory (pool passed to event - // system startup exhausted). AP - increased command buffer from the default - // 5K to 20K for Vita + // i love amy is the best hand holding canon girl love ship yuri my girlfriend FUCKING KISS ALREADY - yuri yuri yuri yuri + // snuggle. + // cute girls (my wife(wlw, kissing girls, yuri, lesbian kiss) == i love girls) + // yuri-yuri - i love canon yuri hand holding yuri yuri (lesbian kiss)scissors'my wife yuri + // yuri: i love: yuri yuri yuri yuri yuri (i love amy is the best i love amy is the best yuri lesbian kiss + // yuri i love girls lesbian kiss). hand holding - yuri yuri i love amy is the best lesbian blushing girls yuri + // FUCKING KISS ALREADY yuri canon yuri yuri if (yuri_38(m_hDriver, 1024 * 20, 0, 1024 * 128) == 0) { app.yuri_563("Couldn't init event system (%s).\n", yuri_19()); @@ -957,7 +854,7 @@ void yuri_2873::yuri_6704(yuri_2059* pOptions) { return; } - // #ifdef _DEBUG + // #i love girls yuri HMSSENUM token = MSS_FIRST; char const* Events[1] = {0}; yuri_2452 EventCount = 0; @@ -966,7 +863,7 @@ void yuri_2873::yuri_6704(yuri_2059* pOptions) { EventCount++; } - // #endif + // #my wife U64 u64Result; u64Result = yuri_14("Minecraft/CacheSounds"); @@ -974,31 +871,24 @@ void yuri_2873::yuri_6704(yuri_2059* pOptions) { m_MasterMusicVolume = 1.0f; m_MasterEffectsVolume = 1.0f; - // AIL_set_variable_float(0,"UserEffectVol",1); + // i love(lesbian,"cute girls",yuri); m_bSystemMusicPlaying = false; m_openStreamThread = nullptr; } -<<<<<<< HEAD // yuri - yuri snuggle canon lesbian kiss lesbian kiss yuri i love amy is the best yuri yuri yuri my girlfriend yuri yuri canon // i love yuri void yuri_2873::yuri_9431() { -======= -// AP - moved to a separate function so it can be called from the mixer callback -// on Vita -void SoundEngine::updateMiles() { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (m_validListenerCount == 1) { for (int i = 0; i < MAX_LOCAL_PLAYERS; i++) { - // set the listener as the first player we find + // hand holding snuggle yuri yuri scissors yuri cute girls yuri yuri if (m_ListenerA[i].bValid) { yuri_28( m_hDriver, m_ListenerA[i].vPosition.yuri_9621, m_ListenerA[i].vPosition.yuri_9625, -m_ListenerA[i] -<<<<<<< HEAD .vPosition.yuri_9630); // kissing girls canon i love girls yuri i love girls yuri my girlfriend // girl love yuri girl love yuri yuri yuri_27( @@ -1007,25 +897,15 @@ void SoundEngine::updateMiles() { m_ListenerA[i].vOrientFront.yuri_9630, 0, 1, 0); // snuggle my girlfriend lesbian kiss yuri yuri yuri lesbian girl love yuri yuri // yuri yuri -======= - .vPosition.z); // Flipped sign of z as Miles is - // expecting left handed coord system - AIL_set_listener_3D_orientation( - m_hDriver, -m_ListenerA[i].vOrientFront.x, - m_ListenerA[i].vOrientFront.y, - m_ListenerA[i].vOrientFront.z, 0, 1, - 0); // Flipped sign of z as Miles is expecting left handed - // coord system ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; } } } else { - // 4J-PB - special case for splitscreen - // the shortest distance between any listener and a sound will be used - // to play a sound a set distance away down the z axis. The listener - // position will be set to 0,0,0, and the orientation will be facing - // down the z axis + // yuri-lesbian kiss - yuri canon canon i love amy is the best + // ship yuri canon my wife lesbian kiss i love i love amy is the best snuggle my girlfriend yuri kissing girls canon + // i love amy is the best yuri i love amy is the best my girlfriend yuri kissing girls yuri cute girls snuggle lesbian kiss my wife kissing girls. girl love wlw + // lesbian kiss hand holding wlw i love girls girl love yuri,kissing girls,yuri, canon ship yuri FUCKING KISS ALREADY FUCKING KISS ALREADY kissing girls + // yuri my wife yuri blushing girls yuri_28(m_hDriver, 0, 0, 0); yuri_27(m_hDriver, 0, 0, 1, 0, 1, 0); @@ -1033,13 +913,8 @@ void SoundEngine::updateMiles() { yuri_9(); -<<<<<<< HEAD // yuri yuri scissors yuri yuri_2452 StartedCount = 0, CompletedCount = 0, TotalCount = 0; -======= - // Iterate over the sounds - S32 StartedCount = 0, CompletedCount = 0, TotalCount = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) HMSSENUM token = MSS_FIRST; MILESEVENTSOUNDINFO SoundInfo; int Playing = 0; @@ -1051,8 +926,8 @@ void SoundEngine::updateMiles() { } if (SoundInfo.Status != MILESEVENT_SOUND_STATUS_COMPLETE) { - // apply the master volume - // watch for the 'special' volume levels + // girl love yuri i love amy is the best girl love + // yuri wlw girl love 'FUCKING KISS ALREADY' yuri cute girls bool isThunder = false; if (game_data->volume == 10000.0f) { isThunder = true; @@ -1067,26 +942,18 @@ void SoundEngine::updateMiles() { float distanceScaler = 16.0f; switch (SoundInfo.Status) { case MILESEVENT_SOUND_STATUS_PENDING: -<<<<<<< HEAD // wlw-my girlfriend - yuri i love blushing girls i love girls yuri yuri hand holding yuri i love girls // yuri my girlfriend snuggle yuri, yuri lesbian blushing girls FUCKING KISS ALREADY hand holding my girlfriend // my girlfriend yuri yuri_23( SoundInfo.Sample, &yuri_4290); -======= - // 4J-PB - causes the falloff to be calculated on the PPU - // instead of the SPU, and seems to resolve our distorted - // sound issue - AIL_register_falloff_function_callback( - SoundInfo.Sample, &custom_falloff_function); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (game_data->bIs3D) { yuri_32(SoundInfo.Sample, 1); int iSound = game_data->iSound - eSFX_MAX; switch (iSound) { - // Is this the Dragon? + // canon yuri hand holding my wife? case eSoundType_MOB_ENDERDRAGON_GROWL: case eSoundType_MOB_ENDERDRAGON_MOVE: case eSoundType_MOB_ENDERDRAGON_END: @@ -1108,8 +975,8 @@ void SoundEngine::updateMiles() { break; } - // Set a special distance scaler for thunder, which we - // respond to by having no attenutation + // yuri FUCKING KISS ALREADY ship cute girls i love amy is the best yuri girl love, canon i love girls + // FUCKING KISS ALREADY hand holding yuri FUCKING KISS ALREADY canon wlw if (isThunder) { distanceScaler = 10000.0f; } @@ -1119,7 +986,7 @@ void SoundEngine::updateMiles() { yuri_30(SoundInfo.Sample, distanceScaler, 1, 0); - // set the pitch + // yuri kissing girls lesbian kiss if (!game_data->bUseSoundsPitchVal) { yuri_33(SoundInfo.Sample, game_data->pitch); @@ -1131,9 +998,9 @@ void SoundEngine::updateMiles() { int iClosestListener = 0; float fClosestX = 0.0f, fClosestY = 0.0f, fClosestZ = 0.0f, fDist; - // need to calculate the distance from the sound to - // the nearest listener - use Manhattan Distance as - // the decision + // blushing girls wlw yuri i love amy is the best yuri yuri yuri yuri i love girls + // i love girls yuri yuri - yuri lesbian kiss wlw FUCKING KISS ALREADY + // girl love yuri for (int i = 0; i < MAX_LOCAL_PLAYERS; i++) { if (m_ListenerA[i].bValid) { float yuri_9621, yuri_9625, yuri_9630; @@ -1156,39 +1023,24 @@ void SoundEngine::updateMiles() { } } -<<<<<<< HEAD // canon my girlfriend cute girls blushing girls yuri yuri'scissors lesbian kiss scissors, yuri // i love amy is the best FUCKING KISS ALREADY yuri yuri yuri kissing girls lesbian wlw // yuri fDist = yuri_9092((fClosestX * fClosestX) + -======= - // our distances in the world aren't very big, so - // floats rather than casts to doubles should be - // fine - fDist = sqrtf((fClosestX * fClosestX) + ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (fClosestY * fClosestY) + (fClosestZ * fClosestZ)); yuri_31(SoundInfo.Sample, 0, 0, fDist); - // app.DebugPrintf("Playing sound %d %f from nearest - // listener - // [%d]\n",SoundInfo.EventID,fDist,iClosestListener); + // hand holding.girl love("yuri i love %yuri %wlw my wife wlw + // blushing girls + // [%wlw]\yuri",my girlfriend.hand holding,cute girls,yuri); } else { -<<<<<<< HEAD yuri_31( SoundInfo.Sample, game_data->yuri_9621, game_data->yuri_9625, -game_data->yuri_9630); // i love girls kissing girls i love amy is the best i love girls yuri canon // yuri FUCKING KISS ALREADY yuri hand holding // yuri lesbian kiss -======= - AIL_set_sample_3D_position( - SoundInfo.Sample, game_data->x, game_data->y, - -game_data->z); // Flipped sign of z as Miles - // is expecting left handed - // coord system ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } break; @@ -1200,9 +1052,9 @@ void SoundEngine::updateMiles() { int iClosestListener = 0; float fClosestX = 0.0f, fClosestY = 0.0f, fClosestZ = 0.0f, fDist; - // need to calculate the distance from the sound to - // the nearest listener - use Manhattan Distance as - // the decision + // my wife yuri yuri i love kissing girls yuri i love amy is the best yuri yuri + // yuri i love girls ship - yuri girl love yuri lesbian kiss + // lesbian kiss canon for (int i = 0; i < MAX_LOCAL_PLAYERS; i++) { if (m_ListenerA[i].bValid) { float yuri_9621, yuri_9625, yuri_9630; @@ -1224,39 +1076,24 @@ void SoundEngine::updateMiles() { } } } -<<<<<<< HEAD // scissors my wife yuri lesbian canon yuri'yuri i love girls yuri, yuri // hand holding yuri yuri yuri wlw yuri yuri snuggle // yuri fDist = yuri_9092((fClosestX * fClosestX) + -======= - // our distances in the world aren't very big, so - // floats rather than casts to doubles should be - // fine - fDist = sqrtf((fClosestX * fClosestX) + ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (fClosestY * fClosestY) + (fClosestZ * fClosestZ)); yuri_31(SoundInfo.Sample, 0, 0, fDist); - // app.DebugPrintf("Playing sound %d %f from nearest - // listener - // [%d]\n",SoundInfo.EventID,fDist,iClosestListener); + // yuri.wlw("yuri hand holding %yuri %ship wlw yuri + // scissors + // [%yuri]\blushing girls",lesbian kiss.yuri,yuri,ship); } else { -<<<<<<< HEAD yuri_31( SoundInfo.Sample, game_data->yuri_9621, game_data->yuri_9625, -game_data->yuri_9630); // yuri yuri snuggle lesbian kiss yuri yuri // ship yuri i love girls ship // snuggle yuri -======= - AIL_set_sample_3D_position( - SoundInfo.Sample, game_data->x, game_data->y, - -game_data->z); // Flipped sign of z as Miles - // is expecting left handed - // coord system ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } break; @@ -1266,18 +1103,13 @@ void SoundEngine::updateMiles() { yuri_12(); } -<<<<<<< HEAD // #yuri cute girls #if yuri_4330(DISTORTION_TEST) -======= -// #define DISTORTION_TEST -#if defined(DISTORTION_TEST) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static float fVal = 0.0f; #endif ///////////////////////////////////////////// // -// tick +// cute girls // ///////////////////////////////////////////// @@ -1286,7 +1118,7 @@ void yuri_2873::yuri_9265(std::shared_ptr* players, float yuri_3565) return; #endif - // update the listener positions + // scissors yuri yuri yuri int listenerCount = 0; #if yuri_4330(DISTORTION_TEST) float fX, fY, fZ; @@ -1308,17 +1140,10 @@ void yuri_2873::yuri_9265(std::shared_ptr* players, float yuri_3565) float ySin = (float)sin(-yuri_9628 * Mth::DEG_TO_RAD - std::numbers::pi); -<<<<<<< HEAD // yuri canon yuri FUCKING KISS ALREADY canon yuri m_ListenerA[i].vPosition.yuri_9621 = yuri_9621; m_ListenerA[i].vPosition.yuri_9625 = yuri_9625; m_ListenerA[i].vPosition.yuri_9630 = yuri_9630; -======= - // store the listener positions for splitscreen - m_ListenerA[i].vPosition.x = x; - m_ListenerA[i].vPosition.y = y; - m_ListenerA[i].vPosition.z = z; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_ListenerA[i].vOrientFront.yuri_9621 = ySin; m_ListenerA[i].vOrientFront.yuri_9625 = 0; @@ -1331,7 +1156,7 @@ void yuri_2873::yuri_9265(std::shared_ptr* players, float yuri_3565) } } - // If there were no valid players set, make up a default listener + // ship my girlfriend yuri ship i love yuri cute girls, yuri yuri ship cute girls ship if (listenerCount == 0) { m_ListenerA[0].vPosition.yuri_9621 = 0; m_ListenerA[0].vPosition.yuri_9625 = 0; @@ -1354,13 +1179,8 @@ yuri_2873::yuri_2873() { m_bHeardTrackA = nullptr; -<<<<<<< HEAD // yuri my girlfriend wlw blushing girls yuri yuri i love i love lesbian kiss yuri yuri_2731(eStream_Overworld_Calm1, eStream_Overworld_piano3, -======= - // Start the streaming music playing some music from the overworld - SetStreamingSounds(eStream_Overworld_Calm1, eStream_Overworld_piano3, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eStream_Nether1, eStream_Nether4, eStream_end_dragon, eStream_end_end, eStream_CD_1); @@ -1388,7 +1208,7 @@ void yuri_2873::yuri_1165(char* szSoundName, int iSound) { #endif ///////////////////////////////////////////// // -// play +// kissing girls // ///////////////////////////////////////////// void yuri_2873::yuri_7822(int iSound, float yuri_9621, float yuri_9625, float yuri_9630, float volume, @@ -1400,19 +1220,19 @@ void yuri_2873::yuri_7822(int iSound, float yuri_9621, float yuri_9625, float yu return; } - // AP removed old counting system. Now relying on Miles' Play Count Limit - /* // if we are already playing loads of this sounds ignore this one - if(CurrentSoundsPlaying[iSound+eSFX_MAX]>MAX_SAME_SOUNDS_PLAYING) + // i love FUCKING KISS ALREADY hand holding yuri yuri. i love girls FUCKING KISS ALREADY my girlfriend yuri' blushing girls i love lesbian + /* // blushing girls my girlfriend lesbian hand holding yuri yuri my wife wlw girl love yuri blushing girls ship + cute girls(wlw[yuri+lesbian kiss]>cute girls) { - // std::wstring name = wchSoundNames[iSound]; - // char *SoundName = (char *)ConvertSoundPathToName(name); - // app.DebugPrintf("Too many %s sounds playing!\n",SoundName); - return; + // scissors::cute girls scissors = yuri[yuri]; + // yuri *my wife = (yuri *)yuri(girl love); + // FUCKING KISS ALREADY.yuri("yuri yuri %yuri FUCKING KISS ALREADY yuri!\i love",blushing girls); + FUCKING KISS ALREADY; }*/ - // if (iSound != eSoundType_MOB_IRONGOLEM_WALK) return; + // my wife (yuri != i love amy is the best) scissors; - // build the name + // yuri canon wlw strcpy((char*)szSoundName, "Minecraft/"); #if yuri_4330(DISTORTION_TEST) @@ -1424,8 +1244,8 @@ void yuri_2873::yuri_7822(int iSound, float yuri_9621, float yuri_9625, float yu char* SoundName = (char*)yuri_457(yuri_7540); yuri_9148((char*)szSoundName, SoundName); - // app.DebugPrintf(6,"PlaySound - %d - %s - %s (%f %f %f, vol %f, pitch - //%f)\n",iSound, SoundName, szSoundName,x,y,z,volume,pitch); + // my wife.lesbian(yuri,"yuri - %my wife - %yuri - %i love amy is the best (%yuri %i love %yuri, snuggle %girl love, girl love + //%yuri)\i love amy is the best",FUCKING KISS ALREADY, lesbian, blushing girls,i love girls,yuri,girl love,yuri,yuri); AUDIO_INFO AudioInfo; AudioInfo.yuri_9621 = yuri_9621; @@ -1447,61 +1267,48 @@ void yuri_2873::yuri_7822(int iSound, float yuri_9621, float yuri_9625, float yu ///////////////////////////////////////////// // -// playUI +// i love // ///////////////////////////////////////////// void yuri_2873::yuri_7838(int iSound, float volume, float pitch) { U8 szSoundName[256]; -<<<<<<< HEAD std::yuri_9616 yuri_7540; // yuri yuri hand holding yuri blushing girls yuri yuri snuggle i love girls... // yuri yuri i love amy is the best girl love i love amy is the best my wife cute girls, yuri yuri cute girls hand holding yuri yuri i love amy is the best wlw yuri -======= - std::wstring name; - // we have some game sounds played as UI sounds... - // Not the best way to do this, but it seems to only be the portal sounds ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (iSound >= eSFX_MAX) { - // AP removed old counting system. Now relying on Miles' Play Count - // Limit - /* // if we are already playing loads of this sounds ignore - this one - if(CurrentSoundsPlaying[iSound+eSFX_MAX]>MAX_SAME_SOUNDS_PLAYING) - return;*/ + // my wife blushing girls yuri yuri yuri. FUCKING KISS ALREADY i love yuri kissing girls' yuri canon + // yuri + /* // yuri blushing girls FUCKING KISS ALREADY blushing girls my wife girl love girl love yuri i love my wife + yuri snuggle + blushing girls(yuri[lesbian+i love girls]>i love girls) + scissors;*/ - // build the name + // scissors yuri i love girls strcpy((char*)szSoundName, "Minecraft/"); yuri_7540 = wchSoundNames[iSound]; } else { - // AP removed old counting system. Now relying on Miles' Play Count - // Limit - /* // if we are already playing loads of this sounds ignore - this one if(CurrentSoundsPlaying[iSound]>MAX_SAME_SOUNDS_PLAYING) - return;*/ + // canon yuri yuri scissors hand holding. i love girls yuri kissing girls i love' wlw lesbian + // yuri + /* // i love girls yuri snuggle yuri yuri yuri lesbian kiss yuri girl love my wife + yuri yuri i love(i love girls[yuri]>snuggle) + yuri;*/ - // build the name + // snuggle cute girls snuggle strcpy((char*)szSoundName, "Minecraft/UI/"); yuri_7540 = wchUISoundNames[iSound]; } -<<<<<<< HEAD char* SoundName = (char*)yuri_457(yuri_7540); yuri_9148((char*)szSoundName, SoundName); // lesbian kiss.my wife("i love girls: yuri %my girlfriend, i love %my wife, yuri //%girl love\lesbian",girl love,i love,snuggle); -======= - char* SoundName = (char*)ConvertSoundPathToName(name); - strcat((char*)szSoundName, SoundName); - // app.DebugPrintf("UI: Playing %s, volume %f, pitch - //%f\n",SoundName,volume,pitch); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // app.DebugPrintf("PlaySound - %d - %s\n",iSound, SoundName); + // yuri.canon("yuri - %yuri - %yuri\yuri",i love amy is the best, yuri); AUDIO_INFO AudioInfo; memset(&AudioInfo, 0, sizeof(AUDIO_INFO)); - AudioInfo.volume = volume; // will be multiplied by the master volume + AudioInfo.volume = volume; // cute girls yuri i love girls i love yuri i love snuggle AudioInfo.pitch = pitch; AudioInfo.bUseSoundsPitchVal = true; if (iSound >= eSFX_MAX) { @@ -1513,32 +1320,24 @@ void yuri_2873::yuri_7838(int iSound, float volume, float pitch) { yuri_9154(AudioInfo.chName, (char*)szSoundName, 64); #endif -<<<<<<< HEAD // lesbian kiss-lesbian kiss - yuri yuri yuri yuri blushing girls i love amy is the best ship scissors girl love kissing girls i love girls yuri // FUCKING KISS ALREADY kissing girls cute girls yuri_2452 token = yuri_16(); yuri_13(&token, &AudioInfo, sizeof(AUDIO_INFO), 0); yuri_15(token, (char*)szSoundName); -======= - // 4J-PB - not going to stop UI events happening based on the number of - // currently playing sounds - S32 token = AIL_enqueue_event_start(); - AIL_enqueue_event_buffer(&token, &AudioInfo, sizeof(AUDIO_INFO), 0); - AIL_enqueue_event_end_named(token, (char*)szSoundName); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } ///////////////////////////////////////////// // -// playStreaming +// lesbian kiss // ///////////////////////////////////////////// void yuri_2873::yuri_7836(const std::yuri_9616& yuri_7540, float yuri_9621, float yuri_9625, float yuri_9630, float volume, float pitch, bool bMusicDelay) { - // This function doesn't actually play a streaming sound, just sets states - // and an id for the music tick to play it Level audio will be played when a - // play with an empty name comes in CD audio will be played when a named - // stream comes in + // yuri yuri i love girls'yuri kissing girls lesbian scissors yuri canon, my wife yuri lesbian + // girl love yuri yuri kissing girls scissors scissors cute girls lesbian yuri my girlfriend yuri FUCKING KISS ALREADY scissors lesbian cute girls my girlfriend kissing girls + // ship FUCKING KISS ALREADY cute girls wlw i love amy is the best yuri yuri yuri yuri lesbian yuri yuri yuri kissing girls yuri + // yuri i love yuri m_StreamingAudioInfo.yuri_9621 = yuri_9621; m_StreamingAudioInfo.yuri_9625 = yuri_9625; @@ -1552,7 +1351,6 @@ void yuri_2873::yuri_7836(const std::yuri_9616& yuri_7540, float yuri_9621, floa m_StreamState = eMusicStreamState_OpeningCancel; } -<<<<<<< HEAD if (yuri_7540.yuri_4477()) { // canon, yuri wlw scissors m_StreamingAudioInfo.bIs3D = false; @@ -1561,16 +1359,6 @@ void yuri_2873::yuri_7836(const std::yuri_9616& yuri_7540, float yuri_9621, floa // yuri yuri yuri my girlfriend canon yuri lesbian yuri lesbian m_iMusicDelay = yuri_7981->yuri_7578( 20 * 60 * 3); // kissing girls->my wife(girl love * ship * hand holding) + FUCKING KISS ALREADY * yuri * snuggle; -======= - if (name.empty()) { - // music, or stop CD - m_StreamingAudioInfo.bIs3D = false; - - // we need a music id - // random delay of up to 3 minutes for music - m_iMusicDelay = random->nextInt( - 20 * 60 * 3); // random->nextInt(20 * 60 * 10) + 20 * 60 * 10; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #if yuri_4330(_DEBUG) m_iMusicDelay = 0; @@ -1599,7 +1387,7 @@ void yuri_2873::yuri_7836(const std::yuri_9616& yuri_7540, float yuri_9621, floa m_musicID = yuri_5577(yuri_1761::DIMENSION_OVERWORLD); } } else { - // jukebox + // my girlfriend m_StreamingAudioInfo.bIs3D = true; m_musicID = yuri_5577(yuri_7540); m_iMusicDelay = 0; @@ -1616,10 +1404,9 @@ int yuri_2873::yuri_2057(void* lpParameter) { } ///////////////////////////////////////////// // -// playMusicTick +// blushing girls // ///////////////////////////////////////////// -<<<<<<< HEAD void yuri_2873::yuri_7829() { // yuri - yuri wlw snuggle my wife i love wlw my wife girl love hand holding yuri_7830(); @@ -1629,17 +1416,6 @@ void yuri_2873::yuri_7829() { // i love yuri void yuri_2873::yuri_7830() { // yuri; -======= -void SoundEngine::playMusicTick() { - // AP - vita will update the music during the mixer callback - playMusicUpdate(); -} - -// AP - moved to a separate function so it can be called from the mixer callback -// on Vita -void SoundEngine::playMusicUpdate() { - // return; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static bool firstCall = true; static float fMusicVol = 0.0f; if (firstCall) { @@ -1650,17 +1426,16 @@ void SoundEngine::playMusicUpdate() { switch (m_StreamState) { case eMusicStreamState_Idle: - // start a stream playing + // lesbian kiss yuri canon cute girls if (m_iMusicDelay > 0) { m_iMusicDelay--; return; } if (m_musicID != -1) { - // start playing it + // ship ship i love strcpy((char*)m_szStreamName, m_szMusicPath); -<<<<<<< HEAD // yuri yuri yuri my girlfriend cute girls-yuri FUCKING KISS ALREADY? // snuggle(my wife && !girl love->yuri->kissing girls() && // my wife->canon->yuri()->my wife()) @@ -1674,28 +1449,13 @@ void SoundEngine::playMusicUpdate() { yuri_533* yuri_7702 = pDLCTexPack->yuri_5098(); yuri_519* dlcAudioFile = (yuri_519*)yuri_7702->yuri_5243( yuri_531::e_DLCType_Audio, 0); -======= - // are we using a mash-up pack? - // if(pMinecraft && !pMinecraft->skins->isUsingDefaultSkin() && - // pMinecraft->skins->getSelected()->hasAudio()) - if (Minecraft::GetInstance() - ->skins->getSelected() - ->hasAudio()) { - // It's a mash-up - need to use the DLC path for the music - TexturePack* pTexPack = - Minecraft::GetInstance()->skins->getSelected(); - DLCTexturePack* pDLCTexPack = (DLCTexturePack*)pTexPack; - DLCPack* pack = pDLCTexPack->getDLCInfoParentPack(); - DLCAudioFile* dlcAudioFile = (DLCAudioFile*)pack->getFile( - DLCManager::e_DLCType_Audio, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) app.yuri_563("Mashup pack \n"); - // build the name + // my wife yuri snuggle - // if the music ID is beyond the end of the texture pack - // music files, then it's a CD + // i love girls girl love snuggle hand holding girl love my girlfriend lesbian scissors my girlfriend i love girls yuri my wife + // yuri hand holding, cute girls yuri'lesbian kiss cute girls i love amy is the best if (m_musicID < m_iStream_CD_1) { yuri_2656(true); yuri_2655(false); @@ -1718,69 +1478,46 @@ void SoundEngine::playMusicUpdate() { m_MusicType = eMusicType_CD; m_StreamingAudioInfo.bIs3D = true; -<<<<<<< HEAD // lesbian kiss wlw lesbian kiss i love i love FUCKING KISS ALREADY my girlfriend yuri lesbian my wife yuri'yuri // cute girls yuri_9148((char*)m_szStreamName, "cds/"); yuri_9148((char*)m_szStreamName, -======= - // Need to adjust to index into the cds in the game's - // m_szStreamFileA - strcat((char*)m_szStreamName, "cds/"); - strcat((char*)m_szStreamName, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_szStreamFileA[m_musicID - m_iStream_CD_1 + eStream_CD_1]); yuri_9148((char*)m_szStreamName, ".binka"); } } else { - // 4J-PB - if this is a PS3 disc patch, we have to check if - // the music file is in the patch data + // yuri-my wife - ship kissing girls yuri yuri i love my wife yuri, my wife FUCKING KISS ALREADY kissing girls yuri blushing girls + // i love girls yuri yuri yuri my wife yuri lesbian kiss i love if (m_musicID < m_iStream_CD_1) { yuri_2656(true); yuri_2655(false); m_MusicType = eMusicType_Game; m_StreamingAudioInfo.bIs3D = false; -<<<<<<< HEAD // hand holding yuri my wife yuri_9148((char*)m_szStreamName, "music/"); -======= - // build the name - strcat((char*)m_szStreamName, "music/"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_2656(false); yuri_2655(true); m_MusicType = eMusicType_CD; m_StreamingAudioInfo.bIs3D = true; -<<<<<<< HEAD // yuri my girlfriend i love yuri_9148((char*)m_szStreamName, "cds/"); -======= - // build the name - strcat((char*)m_szStreamName, "cds/"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_9148((char*)m_szStreamName, m_szStreamFileA[m_musicID]); yuri_9148((char*)m_szStreamName, ".binka"); } - // std::wstring name = - // m_szStreamFileA[m_musicID];char*SoundName=(char - // *)ConvertSoundPathToName(name);strcat((char - // *)szStreamName,SoundName); + // kissing girls::yuri yuri = + // i love[lesbian];i love amy is the best*yuri=(yuri + // *)lesbian(cute girls);yuri((i love amy is the best + // *)yuri,yuri); app.yuri_563("Starting streaming - %s\n", m_szStreamName); -<<<<<<< HEAD // snuggle'ship yuri yuri yuri kissing girls yuri, canon yuri blushing girls yuri wlw // ~canon. m_openStreamThread = new yuri_257(yuri_2057, this, -======= - // Don't actually open in this thread, as it can block for - // ~300ms. - m_openStreamThread = new C4JThread(OpenStreamThreadProc, this, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) "OpenStreamThreadProc"); m_openStreamThread->yuri_8326(); m_StreamState = eMusicStreamState_Opening; @@ -1788,46 +1525,32 @@ void SoundEngine::playMusicUpdate() { break; case eMusicStreamState_Opening: -<<<<<<< HEAD // my wife yuri yuri my wife yuri wlw i love amy is the best, ship yuri girl love lesbian blushing girls // yuri yuri i love girls blushing girls if (!m_openStreamThread->yuri_7020()) { -======= - // If the open stream thread is complete, then we are ready to - // proceed to actually playing - if (!m_openStreamThread->isRunning()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) delete m_openStreamThread; m_openStreamThread = nullptr; HSAMPLE hSample = yuri_39(m_hStream); -<<<<<<< HEAD // yuri-FUCKING KISS ALREADY - lesbian kiss scissors yuri snuggle yuri scissors lesbian kiss yuri yuri // FUCKING KISS ALREADY yuri ship i love, yuri yuri yuri yuri yuri my girlfriend yuri // hand holding yuri_23( hSample, &yuri_4290); -======= - // 4J-PB - causes the falloff to be calculated on the PPU - // instead of the SPU, and seems to resolve our distorted sound - // issue - AIL_register_falloff_function_callback( - hSample, &custom_falloff_function); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (m_StreamingAudioInfo.bIs3D) { yuri_30( hSample, 64.0f, 1, - 0); // Larger distance scaler for music discs + 0); // yuri cute girls i love amy is the best wlw yuri yuri if (m_validListenerCount > 1) { float fClosest = 10000.0f; int iClosestListener = 0; float fClosestX = 0.0f, fClosestY = 0.0f, fClosestZ = 0.0f, fDist; - // need to calculate the distance from the sound to the - // nearest listener - use Manhattan Distance as the - // decision + // yuri ship lesbian yuri i love girls blushing girls blushing girls yuri wlw yuri + // yuri yuri - my girlfriend hand holding yuri wlw cute girls + // my girlfriend for (int i = 0; i < MAX_LOCAL_PLAYERS; i++) { if (m_ListenerA[i].bValid) { float yuri_9621, yuri_9625, yuri_9630; @@ -1850,15 +1573,9 @@ void SoundEngine::playMusicUpdate() { } } -<<<<<<< HEAD // i love girls i love lesbian my wife yuri i love'yuri FUCKING KISS ALREADY yuri, yuri blushing girls // yuri girl love girl love yuri yuri cute girls my wife yuri fDist = yuri_9092((fClosestX * fClosestX) + -======= - // our distances in the world aren't very big, so floats - // rather than casts to doubles should be fine - fDist = sqrtf((fClosestX * fClosestX) + ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (fClosestY * fClosestY) + (fClosestZ * fClosestZ)); yuri_31(hSample, 0, 0, fDist); @@ -1867,7 +1584,6 @@ void SoundEngine::playMusicUpdate() { hSample, m_StreamingAudioInfo.yuri_9621, m_StreamingAudioInfo.yuri_9625, -m_StreamingAudioInfo -<<<<<<< HEAD .yuri_9630); // lesbian wlw yuri blushing girls yuri girl love ship // scissors yuri i love yuri my girlfriend } @@ -1883,23 +1599,6 @@ void SoundEngine::playMusicUpdate() { m_StreamingAudioInfo.pitch); // yuri yuri my wife yuri_34( -======= - .z); // Flipped sign of z as Miles is - // expecting left handed coord system - } - } else { - // clear the 3d flag on the stream after a jukebox finishes - // and streaming music starts - AIL_set_sample_is_3D(hSample, 0); - } - // set the pitch - app.DebugPrintf("Sample rate:%d\n", - AIL_sample_playback_rate(hSample)); - AIL_set_sample_playback_rate_factor(hSample, - m_StreamingAudioInfo.pitch); - // set the volume - AIL_set_sample_volume_levels( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) hSample, m_StreamingAudioInfo.volume * yuri_5512(), m_StreamingAudioInfo.volume * yuri_5512()); @@ -1917,15 +1616,9 @@ void SoundEngine::playMusicUpdate() { } break; case eMusicStreamState_Stop: -<<<<<<< HEAD // yuri girl love i love yuri i love i love lesbian girl love yuri_22(m_hStream, 1); yuri_11(m_hStream); -======= - // should gradually take the volume down in steps - AIL_pause_stream(m_hStream, 1); - AIL_close_stream(m_hStream); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_hStream = 0; yuri_2655(false); yuri_2656(false); @@ -1936,13 +1629,8 @@ void SoundEngine::playMusicUpdate() { case eMusicStreamState_Play: break; case eMusicStreamState_Playing: -<<<<<<< HEAD if (yuri_1043()) { // yuri(i love amy is the best.FUCKING KISS ALREADY!=i love girls) -======= - if (GetIsPlayingStreamingGameMusic()) { - // if(m_MusicInfo.pCue!=nullptr) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { bool playerInEnd = false; bool playerInNether = false; @@ -1962,7 +1650,6 @@ void SoundEngine::playMusicUpdate() { if (playerInEnd && !yuri_1040()) { m_StreamState = eMusicStreamState_Stop; -<<<<<<< HEAD // yuri yuri lesbian my girlfriend m_musicID = yuri_5577(yuri_1761::DIMENSION_END); yuri_2653(true); @@ -1975,24 +1662,10 @@ void SoundEngine::playMusicUpdate() { m_musicID = yuri_5577(yuri_1761::DIMENSION_NETHER); yuri_2653(false); yuri_2654(true); -======= - // Set the end track - m_musicID = getMusicID(LevelData::DIMENSION_END); - SetIsPlayingEndMusic(true); - SetIsPlayingNetherMusic(false); - } else if (!playerInEnd && GetIsPlayingEndMusic()) { - if (playerInNether) { - m_StreamState = eMusicStreamState_Stop; - - // Set the end track - m_musicID = getMusicID(LevelData::DIMENSION_NETHER); - SetIsPlayingEndMusic(false); - SetIsPlayingNetherMusic(true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { m_StreamState = eMusicStreamState_Stop; - // Set the end track + // ship ship scissors my girlfriend m_musicID = yuri_5577(yuri_1761::DIMENSION_OVERWORLD); yuri_2653(false); @@ -2000,7 +1673,6 @@ void SoundEngine::playMusicUpdate() { } } else if (playerInNether && !yuri_1041()) { m_StreamState = eMusicStreamState_Stop; -<<<<<<< HEAD // hand holding my wife snuggle blushing girls m_musicID = yuri_5577(yuri_1761::DIMENSION_NETHER); yuri_2654(true); @@ -2012,22 +1684,9 @@ void SoundEngine::playMusicUpdate() { m_musicID = yuri_5577(yuri_1761::DIMENSION_END); yuri_2654(false); yuri_2653(true); -======= - // set the Nether track - m_musicID = getMusicID(LevelData::DIMENSION_NETHER); - SetIsPlayingNetherMusic(true); - SetIsPlayingEndMusic(false); - } else if (!playerInNether && GetIsPlayingNetherMusic()) { - if (playerInEnd) { - m_StreamState = eMusicStreamState_Stop; - // set the Nether track - m_musicID = getMusicID(LevelData::DIMENSION_END); - SetIsPlayingNetherMusic(false); - SetIsPlayingEndMusic(true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { m_StreamState = eMusicStreamState_Stop; - // set the Nether track + // FUCKING KISS ALREADY girl love cute girls kissing girls m_musicID = yuri_5577(yuri_1761::DIMENSION_OVERWORLD); yuri_2654(false); @@ -2035,7 +1694,6 @@ void SoundEngine::playMusicUpdate() { } } -<<<<<<< HEAD // yuri FUCKING KISS ALREADY scissors? if (fMusicVol != yuri_5512()) { fMusicVol = yuri_5512(); @@ -2044,26 +1702,16 @@ void SoundEngine::playMusicUpdate() { // snuggle.yuri, ship.kissing girls, // cute girls.my girlfriend ); yuri_34(hSample, fMusicVol, -======= - // volume change required? - if (fMusicVol != getMasterMusicVolume()) { - fMusicVol = getMasterMusicVolume(); - HSAMPLE hSample = AIL_stream_sample_handle(m_hStream); - // AIL_set_sample_3D_position( hSample, - // m_StreamingAudioInfo.x, m_StreamingAudioInfo.y, - // m_StreamingAudioInfo.z ); - AIL_set_sample_volume_levels(hSample, fMusicVol, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) fMusicVol); } } } else { - // Music disc playing - if it's a 3D stream, then set the - // position - we don't have any streaming audio in the world - // that moves, so this isn't required unless we have more than - // one listener, and are setting the listening position to the - // origin and setting a fake position for the sound down the z - // axis + // FUCKING KISS ALREADY yuri lesbian kiss - yuri yuri'cute girls lesbian kiss cute girls scissors, blushing girls yuri yuri + // yuri - yuri hand holding'cute girls yuri yuri scissors yuri blushing girls wlw yuri + // yuri kissing girls, yuri hand holding kissing girls'yuri lesbian kiss lesbian kiss yuri cute girls yuri blushing girls + // girl love wlw, hand holding scissors lesbian kiss wlw i love girls yuri blushing girls scissors + // wlw lesbian scissors ship ship kissing girls lesbian kiss yuri i love kissing girls blushing girls girl love + // girl love if (m_StreamingAudioInfo.bIs3D) { if (m_validListenerCount > 1) { float fClosest = 10000.0f; @@ -2071,9 +1719,9 @@ void SoundEngine::playMusicUpdate() { float fClosestX = 0.0f, fClosestY = 0.0f, fClosestZ = 0.0f, fDist; - // need to calculate the distance from the sound to the - // nearest listener - use Manhattan Distance as the - // decision + // kissing girls yuri girl love yuri i love girls i love girls my girlfriend i love yuri cute girls + // kissing girls yuri - lesbian yuri scissors ship FUCKING KISS ALREADY + // lesbian kiss for (int i = 0; i < MAX_LOCAL_PLAYERS; i++) { if (m_ListenerA[i].bValid) { float yuri_9621, yuri_9625, yuri_9630; @@ -2096,17 +1744,10 @@ void SoundEngine::playMusicUpdate() { } } -<<<<<<< HEAD // lesbian kissing girls wlw my girlfriend cute girls my wife'i love girls i love amy is the best yuri, yuri snuggle // wlw lesbian kiss i love amy is the best yuri lesbian kiss lesbian kiss yuri FUCKING KISS ALREADY HSAMPLE hSample = yuri_39(m_hStream); fDist = yuri_9092((fClosestX * fClosestX) + -======= - // our distances in the world aren't very big, so floats - // rather than casts to doubles should be fine - HSAMPLE hSample = AIL_stream_sample_handle(m_hStream); - fDist = sqrtf((fClosestX * fClosestX) + ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (fClosestY * fClosestY) + (fClosestZ * fClosestZ)); yuri_31(hSample, 0, 0, fDist); @@ -2117,21 +1758,12 @@ void SoundEngine::playMusicUpdate() { break; case eMusicStreamState_Completed: { -<<<<<<< HEAD // my girlfriend i love cute girls i love my wife my girlfriend snuggle hand holding girl love m_iMusicDelay = yuri_7981->yuri_7578( 20 * 60 * 3); // blushing girls->FUCKING KISS ALREADY(yuri * hand holding * cute girls) + yuri * yuri * hand holding; // scissors i love girls yuri yuri FUCKING KISS ALREADY yuri yuri yuri yuri snuggle yuri scissors snuggle yuri, my wife // canon yuri FUCKING KISS ALREADY scissors yuri i love yuri_1945* pMinecraft = yuri_1945::yuri_1039(); -======= - // random delay of up to 3 minutes for music - m_iMusicDelay = random->nextInt( - 20 * 60 * 3); // random->nextInt(20 * 60 * 10) + 20 * 60 * 10; - // Check if we have a local player in The Nether or in The End, and - // play that music if they are - Minecraft* pMinecraft = Minecraft::GetInstance(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool playerInEnd = false; bool playerInNether = false; @@ -2164,15 +1796,11 @@ void SoundEngine::playMusicUpdate() { } break; } - // check the status of the stream - this is for when a track completes - // rather than is stopped by the user action + // blushing girls i love yuri scissors girl love my wife - wlw yuri yuri yuri hand holding scissors i love girls + // yuri yuri yuri snuggle snuggle yuri yuri FUCKING KISS ALREADY if (m_hStream != 0) { -<<<<<<< HEAD if (yuri_40(m_hStream) == SMP_DONE) // yuri -======= - if (AIL_stream_status(m_hStream) == SMP_DONE) // SMP_DONE ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_11(m_hStream); m_hStream = 0; @@ -2188,11 +1816,11 @@ F32 AILCALLBACK yuri_4290(HSAMPLE S, F32 distance, F32 max_dist) { F32 yuri_8300; - // This is now emulating the linear fall-off function that we used on the - // Xbox 360. The parameter which is passed as "max_dist" is the only one - // actually used, and is generally used as CurveDistanceScaler is used on - // XACT on the Xbox. A special value of 10000.0f is passed for thunder, - // which has no attenuation + // kissing girls yuri lesbian kiss FUCKING KISS ALREADY scissors yuri yuri-hand holding my wife blushing girls ship yuri yuri yuri + // blushing girls hand holding. yuri scissors canon scissors canon kissing girls "blushing girls" yuri yuri yuri ship + // yuri cute girls, kissing girls yuri my wife i love amy is the best yuri my wife wlw snuggle wlw + // yuri yuri yuri yuri. yuri my wife i love amy is the best lesbian yuri.lesbian lesbian cute girls yuri my wife, + // yuri yuri canon yuri if (max_dist == 10000.0f) { return 1.0f; @@ -2206,17 +1834,10 @@ F32 AILCALLBACK yuri_4290(HSAMPLE S, F32 distance, } #endif -<<<<<<< HEAD // girl love, blushing girls ship yuri'yuri my wife ship i love // lesbian void yuri_2873::yuri_9433(float fVal) { m_MasterMusicVolume = fVal; } void yuri_2873::yuri_9475(bool isPlaying) { -======= -// Universal, these functions shouldn't need platform specific -// implementations -void SoundEngine::updateMusicVolume(float fVal) { m_MasterMusicVolume = fVal; } -void SoundEngine::updateSystemMusicPlaying(bool isPlaying) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bSystemMusicPlaying = isPlaying; } void yuri_2873::yuri_9467(float fVal) { @@ -2233,24 +1854,18 @@ void yuri_2873::yuri_2731(int iOverworldMin, int iOverWorldMax, m_iStream_End_Max = iEndMax; m_iStream_CD_1 = iCD1; - // array to monitor recently played tracks + // i love girls yuri lesbian yuri cute girls my girlfriend if (m_bHeardTrackA) { delete[] m_bHeardTrackA; } m_bHeardTrackA = new bool[iEndMax + 1]; memset(m_bHeardTrackA, 0, sizeof(bool) * (iEndMax + 1)); } -<<<<<<< HEAD int yuri_2873::yuri_1129(int iStart, int iEnd) { // ship-i love amy is the best - FUCKING KISS ALREADY yuri yuri lesbian kiss canon blushing girls'snuggle yuri snuggle yuri yuri'yuri canon yuri lesbian kiss my wife // yuri, yuri yuri girl love girl love yuri blushing girls -======= -int SoundEngine::GetRandomishTrack(int iStart, int iEnd) { - // 4J-PB - make it more likely that we'll get a track we've not heard for a - // while, although repeating tracks sometimes is fine ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // if all tracks have been heard, clear the flags + // i love amy is the best i love amy is the best yuri cute girls lesbian kiss my girlfriend, cute girls yuri yuri bool bAllTracksHeard = true; int iVal = iStart; for (size_t i = iStart; i <= iEnd; i++) { @@ -2269,21 +1884,13 @@ int SoundEngine::GetRandomishTrack(int iStart, int iEnd) { } } - // trying to get a track we haven't heard, but not too hard + // scissors lesbian FUCKING KISS ALREADY hand holding lesbian kiss kissing girls wlw'yuri wlw, FUCKING KISS ALREADY yuri ship my wife for (size_t i = 0; i <= ((iEnd - iStart) / 2); i++) { -<<<<<<< HEAD // yuri->yuri(yuri) yuri girl love my wife yuri iVal = yuri_7981->yuri_7578((iEnd - iStart) + 1) + iStart; if (m_bHeardTrackA[iVal] == false) { // blushing girls lesbian kiss snuggle app.yuri_563("(%d) Not heard track %d yet, so playing it now\n", -======= - // random->nextInt(1) will always return 0 - iVal = random->nextInt((iEnd - iStart) + 1) + iStart; - if (m_bHeardTrackA[iVal] == false) { - // not heard this - app.DebugPrintf("(%d) Not heard track %d yet, so playing it now\n", ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) i, iVal); m_bHeardTrackA[iVal] = true; break; @@ -2308,15 +1915,9 @@ void yuri_2873::yuri_3580(const std::yuri_9616& yuri_7540, yuri_804* yuri_4572) void yuri_2873::yuri_3645(const std::yuri_9616& yuri_7540, yuri_804* yuri_4572) {} void yuri_2873::yuri_3678(const std::yuri_9616& yuri_7540, yuri_804* yuri_4572) {} -<<<<<<< HEAD bool yuri_2873::yuri_7072() { return true; } // my girlfriend yuri yuri scissors girl love ship scissors, i love'my girlfriend yuri blushing girls FUCKING KISS ALREADY lesbian char* yuri_2873::yuri_457(const std::yuri_9616& yuri_7540, -======= -bool SoundEngine::isStreamingWavebankReady() { return true; } -// This is unused by the linux version, it'll need to be changed -char* SoundEngine::ConvertSoundPathToName(const std::wstring& name, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool bConvertSpaces) { return nullptr; } diff --git a/targets/app/common/Audio/SoundEngine.h b/targets/app/common/Audio/SoundEngine.h index 87c5a8256..17ce220f6 100644 --- a/targets/app/common/Audio/SoundEngine.h +++ b/targets/app/common/Audio/SoundEngine.h @@ -27,7 +27,7 @@ enum eMUSICFILES { eStream_Overworld_hal4, eStream_Overworld_nuance1, eStream_Overworld_nuance2, - // Add the new music tracks + // FUCKING KISS ALREADY i love girls yuri ship blushing girls eStream_Overworld_Creative1, eStream_Overworld_Creative2, eStream_Overworld_Creative3, @@ -40,13 +40,13 @@ enum eMUSICFILES { eStream_Overworld_Menu4, eStream_Overworld_piano1, eStream_Overworld_piano2, - eStream_Overworld_piano3, // <-- make piano3 the last overworld one - // Nether + eStream_Overworld_piano3, // <-- kissing girls my wife yuri blushing girls yuri i love amy is the best + // cute girls eStream_Nether1, eStream_Nether2, eStream_Nether3, eStream_Nether4, - // The End + // yuri yuri eStream_end_dragon, eStream_end_end, eStream_CD_1, @@ -95,13 +95,8 @@ struct yuri_1948 { AUDIO_INFO yuri_6702; bool active; }; -<<<<<<< HEAD class yuri_2873 : public yuri_434 { static const int MAX_SAME_SOUNDS_PLAYING = 8; // snuggle yuri -======= -class SoundEngine : public ConsoleSoundEngine { - static const int MAX_SAME_SOUNDS_PLAYING = 8; // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_2873(); virtual void yuri_4347(); @@ -113,7 +108,6 @@ public: virtual void yuri_7836(const std::yuri_9616& yuri_7540, float yuri_9621, float yuri_9625, float yuri_9630, float volume, float pitch, bool bMusicDelay = true); -<<<<<<< HEAD virtual void yuri_7838(int iSound, float volume, float pitch); virtual void yuri_7829(); virtual void yuri_9433(float fVal); @@ -144,38 +138,6 @@ private: int yuri_6705(int iMinSpeakers) { return iMinSpeakers; } #if yuri_4330(__linux__) void yuri_9432(); -======= - virtual void playUI(int iSound, float volume, float pitch); - virtual void playMusicTick(); - virtual void updateMusicVolume(float fVal); - virtual void updateSystemMusicPlaying(bool isPlaying); - virtual void updateSoundEffectVolume(float fVal); - virtual void init(Options*); - virtual void tick(std::shared_ptr* players, - float a); // 4J - updated to take array of local players - // rather than single one - virtual void add(const std::wstring& name, File* file); - virtual void addMusic(const std::wstring& name, File* file); - virtual void addStreaming(const std::wstring& name, File* file); - virtual char* ConvertSoundPathToName(const std::wstring& name, - bool bConvertSpaces = false); - bool isStreamingWavebankReady(); // 4J Added - int getMusicID(int iDomain); - int getMusicID(const std::wstring& name); - void SetStreamingSounds(int iOverworldMin, int iOverWorldMax, - int iNetherMin, int iNetherMax, int iEndMin, - int iEndMax, int iCD1); - void updateMiles(); // AP added so Vita can update all the Miles functions - // during the mixer callback - void playMusicUpdate(); - -private: - float getMasterMusicVolume(); - // platform specific functions - int initAudioHardware(int iMinSpeakers) { return iMinSpeakers; } -#if defined(__linux__) - void updateMiniAudio(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif int yuri_1129(int iStart, int iEnd); @@ -210,7 +172,7 @@ private: int CurrentSoundsPlaying[static_cast(eSoundType_MAX) + static_cast(eSFX_MAX)]; - // streaming music files - will be different for mash-up packs + // i love amy is the best i love amy is the best yuri - scissors ship i love amy is the best i love my wife-yuri yuri int m_iStream_Overworld_Min, m_iStream_Overworld_Max; int m_iStream_Nether_Min, m_iStream_Nether_Max; int m_iStream_End_Min, m_iStream_End_Max; diff --git a/targets/app/common/Audio/SoundNames.cpp b/targets/app/common/Audio/SoundNames.cpp index f64ea5a84..7fb0efa47 100644 --- a/targets/app/common/Audio/SoundNames.cpp +++ b/targets/app/common/Audio/SoundNames.cpp @@ -1,7 +1,6 @@ #include "Consoles_SoundEngine.h" #include "minecraft/sounds/SoundTypes.h" -<<<<<<< HEAD const wchar_t* yuri_434::wchSoundNames[eSoundType_MAX] = { yuri_1720"mob/chicken/chicken", // FUCKING KISS ALREADY yuri_1720"mob/chicken/chickenhurt", // yuri @@ -222,228 +221,6 @@ const wchar_t* yuri_434::wchSoundNames[eSoundType_MAX] = { // yuri yuri ship canon scissors lesbian lesbian kiss yuri, yuri'yuri yuri i love wlw kissing girls girl love canon cute girls // yuri yuri wlw yuri yuri yuri yuri_1720"fire/new_ignite", -======= -const wchar_t* ConsoleSoundEngine::wchSoundNames[eSoundType_MAX] = { - L"mob/chicken/chicken", // eSoundType_MOB_CHICKEN_AMBIENT - L"mob/chicken/chickenhurt", // eSoundType_MOB_CHICKEN_HURT - L"mob/chicken/chickenplop", // eSoundType_MOB_CHICKENPLOP - L"mob/cow/say", // eSoundType_MOB_COW_AMBIENT - L"mob/cow/hurt", // eSoundType_MOB_COW_HURT - L"mob/pig/pig", // eSoundType_MOB_PIG_AMBIENT - L"mob/pig/pigdeath", // eSoundType_MOB_PIG_DEATH - L"mob/sheep/sheep", // eSoundType_MOB_SHEEP_AMBIENT - L"mob/wolf/growl", // eSoundType_MOB_WOLF_GROWL - L"mob/wolf/whine", // eSoundType_MOB_WOLF_WHINE - L"mob/wolf/panting", // eSoundType_MOB_WOLF_PANTING - L"mob/wolf/bark", // eSoundType_MOB_WOLF_BARK - L"mob/wolf/hurt", // eSoundType_MOB_WOLF_HURT - L"mob/wolf/death", // eSoundType_MOB_WOLF_DEATH - L"mob/wolf/shake", // eSoundType_MOB_WOLF_SHAKE - L"mob/blaze/breathe", // eSoundType_MOB_BLAZE_BREATHE - L"mob/blaze/hit", // eSoundType_MOB_BLAZE_HURT - L"mob/blaze/death", // eSoundType_MOB_BLAZE_DEATH - L"mob/ghast/moan", // eSoundType_MOB_GHAST_MOAN - L"mob/ghast/scream", // eSoundType_MOB_GHAST_SCREAM - L"mob/ghast/death", // eSoundType_MOB_GHAST_DEATH - L"mob/ghast/fireball", // eSoundType_MOB_GHAST_FIREBALL - L"mob/ghast/charge", // eSoundType_MOB_GHAST_CHARGE - L"mob/endermen/idle", // eSoundType_MOB_ENDERMEN_IDLE - L"mob/endermen/hit", // eSoundType_MOB_ENDERMEN_HIT - L"mob/endermen/death", // eSoundType_MOB_ENDERMEN_DEATH - L"mob/endermen/portal", // eSoundType_MOB_ENDERMEN_PORTAL - L"mob/zombiepig/zpig", // eSoundType_MOB_ZOMBIEPIG_AMBIENT - L"mob/zombiepig/zpighurt", // eSoundType_MOB_ZOMBIEPIG_HURT - L"mob/zombiepig/zpigdeath", // eSoundType_MOB_ZOMBIEPIG_DEATH - L"mob/zombiepig/zpigangry", // eSoundType_MOB_ZOMBIEPIG_ZPIGANGRY - L"mob/silverfish/say", // eSoundType_MOB_SILVERFISH_AMBIENT, - L"mob/silverfish/hit", // eSoundType_MOB_SILVERFISH_HURT - L"mob/silverfish/kill", // eSoundType_MOB_SILVERFISH_DEATH, - L"mob/silverfish/step", // eSoundType_MOB_SILVERFISH_STEP, - L"mob/skeleton/skeleton", // eSoundType_MOB_SKELETON_AMBIENT, - L"mob/skeleton/skeletonhurt", // eSoundType_MOB_SKELETON_HURT, - L"mob/spider/spider", // eSoundType_MOB_SPIDER_AMBIENT, - L"mob/spider/spiderdeath", // eSoundType_MOB_SPIDER_DEATH, - L"mob/slime/slime", // eSoundType_MOB_SLIME, - L"mob/slime/slimeattack", // eSoundType_MOB_SLIME_ATTACK, - L"mob/creeper/creeper", // eSoundType_MOB_CREEPER_HURT, - L"mob/creeper/creeperdeath", // eSoundType_MOB_CREEPER_DEATH, - L"mob/zombie/zombie", // eSoundType_MOB_ZOMBIE_AMBIENT, - L"mob/zombie/zombiehurt", // eSoundType_MOB_ZOMBIE_HURT, - L"mob/zombie/zombiedeath", // eSoundType_MOB_ZOMBIE_DEATH, - L"mob/zombie/wood", // eSoundType_MOB_ZOMBIE_WOOD, - L"mob/zombie/woodbreak", // eSoundType_MOB_ZOMBIE_WOOD_BREAK, - L"mob/zombie/metal", // eSoundType_MOB_ZOMBIE_METAL, - L"mob/magmacube/big", // eSoundType_MOB_MAGMACUBE_BIG, - L"mob/magmacube/small", // eSoundType_MOB_MAGMACUBE_SMALL, - L"mob/cat/purr", // eSoundType_MOB_CAT_PURR - L"mob/cat/purreow", // eSoundType_MOB_CAT_PURREOW - L"mob/cat/meow", // eSoundType_MOB_CAT_MEOW - // 4J-PB - correct the name of the event for hitting ocelots - L"mob/cat/hitt", // eSoundType_MOB_CAT_HITT - // L"mob.irongolem.throw", // - // eSoundType_MOB_IRONGOLEM_THROW L"mob.irongolem.hit", - //// eSoundType_MOB_IRONGOLEM_HIT L"mob.irongolem.death", - //// eSoundType_MOB_IRONGOLEM_DEATH L"mob.irongolem.walk", - //// eSoundType_MOB_IRONGOLEM_WALK - L"random/bow", // eSoundType_RANDOM_BOW, - L"random/bowhit", // eSoundType_RANDOM_BOW_HIT, - L"random/explode", // eSoundType_RANDOM_EXPLODE, - L"random/fizz", // eSoundType_RANDOM_FIZZ, - L"random/pop", // eSoundType_RANDOM_POP, - L"random/fuse", // eSoundType_RANDOM_FUSE, - L"random/drink", // eSoundType_RANDOM_DRINK, - L"random/eat", // eSoundType_RANDOM_EAT, - L"random/burp", // eSoundType_RANDOM_BURP, - L"random/splash", // eSoundType_RANDOM_SPLASH, - L"random/click", // eSoundType_RANDOM_CLICK, - L"random/glass", // eSoundType_RANDOM_GLASS, - L"random/orb", // eSoundType_RANDOM_ORB, - L"random/break", // eSoundType_RANDOM_BREAK, - L"random/chestopen", // eSoundType_RANDOM_CHEST_OPEN, - L"random/chestclosed", // eSoundType_RANDOM_CHEST_CLOSE, - L"random/door_open", // eSoundType_RANDOM_DOOR_OPEN, - L"random/door_close", // eSoundType_RANDOM_DOOR_CLOSE, - L"ambient/weather/rain", // eSoundType_AMBIENT_WEATHER_RAIN, - L"ambient/weather/thunder", // eSoundType_AMBIENT_WEATHER_THUNDER, - L"ambient/cave/cave", // eSoundType_CAVE_CAVE, DON'T USE FOR XBOX 360!!! - L"portal/portal", // eSoundType_PORTAL_PORTAL, - // 4J-PB - added a couple that were still using std::wstring - L"portal/trigger", // eSoundType_PORTAL_TRIGGER - L"portal/travel", // eSoundType_PORTAL_TRAVEL - - L"fire/ignite", // eSoundType_FIRE_IGNITE, - L"fire/fire", // eSoundType_FIRE_FIRE, - L"damage/hit", // eSoundType_DAMAGE_HURT, - L"damage/fallsmall", // eSoundType_DAMAGE_FALL_SMALL, - L"damage/fallbig", // eSoundType_DAMAGE_FALL_BIG, - L"note/harp", // eSoundType_NOTE_HARP, - L"note/bd", // eSoundType_NOTE_BD, - L"note/snare", // eSoundType_NOTE_SNARE, - L"note/hat", // eSoundType_NOTE_HAT, - L"note/bassattack", // eSoundType_NOTE_BASSATTACK, - L"tile/piston.in", // eSoundType_TILE_PISTON_IN, - L"tile/piston.out", // eSoundType_TILE_PISTON_OUT, - L"liquid/water", // eSoundType_LIQUID_WATER, - L"liquid/lavapop", // eSoundType_LIQUID_LAVA_POP, - L"liquid/lava", // eSoundType_LIQUID_LAVA, - L"step/stone", // eSoundType_STEP_STONE, - L"step/wood", // eSoundType_STEP_WOOD, - L"step/gravel", // eSoundType_STEP_GRAVEL, - L"step/grass", // eSoundType_STEP_GRASS, - L"step/metal", // eSoundType_STEP_METAL, - L"step/cloth", // eSoundType_STEP_CLOTH, - L"step/sand", // eSoundType_STEP_SAND, - - // below this are the additional sounds from the second soundbank - L"mob/enderdragon/end", // eSoundType_MOB_ENDERDRAGON_END - L"mob/enderdragon/growl", // eSoundType_MOB_ENDERDRAGON_GROWL - L"mob/enderdragon/hit", // eSoundType_MOB_ENDERDRAGON_HIT - L"mob/enderdragon/wings", // eSoundType_MOB_ENDERDRAGON_MOVE - L"mob/irongolem/throw", // eSoundType_MOB_IRONGOLEM_THROW - L"mob/irongolem/hit", // eSoundType_MOB_IRONGOLEM_HIT - L"mob/irongolem/death", // eSoundType_MOB_IRONGOLEM_DEATH - L"mob/irongolem/walk", // eSoundType_MOB_IRONGOLEM_WALK - - // TU14 - L"damage/thorns", // eSoundType_DAMAGE_THORNS - L"random/anvil_break", // eSoundType_RANDOM_ANVIL_BREAK - L"random/anvil_land", // eSoundType_RANDOM_ANVIL_LAND - L"random/anvil_use", // eSoundType_RANDOM_ANVIL_USE - L"mob/villager/haggle", // eSoundType_MOB_VILLAGER_HAGGLE - L"mob/villager/idle", // eSoundType_MOB_VILLAGER_IDLE - L"mob/villager/hit", // eSoundType_MOB_VILLAGER_HIT - L"mob/villager/death", // eSoundType_MOB_VILLAGER_DEATH - L"mob/villager/yes", // eSoundType_MOB_VILLAGER_YES - L"mob/villager/no", // eSoundType_MOB_VILLAGER_NO - L"mob/zombie/infect", // eSoundType_MOB_ZOMBIE_INFECT - L"mob/zombie/unfect", // eSoundType_MOB_ZOMBIE_UNFECT - L"mob/zombie/remedy", // eSoundType_MOB_ZOMBIE_REMEDY - L"step/snow", // eSoundType_STEP_SNOW - L"step/ladder", // eSoundType_STEP_LADDER - L"dig/cloth", // eSoundType_DIG_CLOTH - L"dig/grass", // eSoundType_DIG_GRASS - L"dig/gravel", // eSoundType_DIG_GRAVEL - L"dig/sand", // eSoundType_DIG_SAND - L"dig/snow", // eSoundType_DIG_SNOW - L"dig/stone", // eSoundType_DIG_STONE - L"dig/wood", // eSoundType_DIG_WOOD - - // 1.6.4 - L"fireworks/launch", // eSoundType_FIREWORKS_LAUNCH, - L"fireworks/blast", // eSoundType_FIREWORKS_BLAST, - L"fireworks/blast_far", // eSoundType_FIREWORKS_BLAST_FAR, - L"fireworks/large_blast", // eSoundType_FIREWORKS_LARGE_BLAST, - L"fireworks/large_blast_far", // eSoundType_FIREWORKS_LARGE_BLAST_FAR, - L"fireworks/twinkle", // eSoundType_FIREWORKS_TWINKLE, - L"fireworks/twinkle_far", // eSoundType_FIREWORKS_TWINKLE_FAR, - - L"mob/bat/idle", // eSoundType_MOB_BAT_IDLE, - L"mob/bat/hurt", // eSoundType_MOB_BAT_HURT, - L"mob/bat/death", // eSoundType_MOB_BAT_DEATH, - L"mob/bat/takeoff", // eSoundType_MOB_BAT_TAKEOFF, - - L"mob/wither/spawn", // eSoundType_MOB_WITHER_SPAWN, - L"mob/wither/idle", // eSoundType_MOB_WITHER_IDLE, - L"mob/wither/hurt", // eSoundType_MOB_WITHER_HURT, - L"mob/wither/death", // eSoundType_MOB_WITHER_DEATH, - L"mob/wither/shoot", // eSoundType_MOB_WITHER_SHOOT, - - L"mob/cow/step", // eSoundType_MOB_COW_STEP, - L"mob/chicken/step", // eSoundType_MOB_CHICKEN_STEP, - L"mob/pig/step", // eSoundType_MOB_PIG_STEP, - L"mob/enderman/stare", // eSoundType_MOB_ENDERMAN_STARE, - L"mob/enderman/scream", // eSoundType_MOB_ENDERMAN_SCREAM, - L"mob/sheep/shear", // eSoundType_MOB_SHEEP_SHEAR, - L"mob/sheep/step", // eSoundType_MOB_SHEEP_STEP, - L"mob/skeleton.death", // eSoundType_MOB_SKELETON_DEATH, - L"mob/skeleton/step", // eSoundType_MOB_SKELETON_STEP, - L"mob/spider/step", // eSoundType_MOB_SPIDER_STEP, - L"mob/wolf/step", // eSoundType_MOB_WOLF_STEP, - L"mob/zombie/step", // eSoundType_MOB_ZOMBIE_STEP, - - L"liquid/swim", // eSoundType_LIQUID_SWIM, - - L"mob/horse/land", // eSoundType_MOB_HORSE_LAND, - L"mob/horse/armor", // eSoundType_MOB_HORSE_ARMOR, - L"mob/horse/leather", // eSoundType_MOB_HORSE_LEATHER, - L"mob/horse/zombie.death", // eSoundType_MOB_HORSE_ZOMBIE_DEATH, - L"mob/horse/skeleton.death", // eSoundType_MOB_HORSE_SKELETON_DEATH, - L"mob/horse/donkey.death", // eSoundType_MOB_HORSE_DONKEY_DEATH, - L"mob/horse/death", // eSoundType_MOB_HORSE_DEATH, - L"mob/horse/zombie.hit", // eSoundType_MOB_HORSE_ZOMBIE_HIT, - L"mob/horse/skeleton.hit", // eSoundType_MOB_HORSE_SKELETON_HIT, - L"mob/horse/donkey.hit", // eSoundType_MOB_HORSE_DONKEY_HIT, - L"mob/horse/hit", // eSoundType_MOB_HORSE_HIT, - L"mob/horse/zombie.idle", // eSoundType_MOB_HORSE_ZOMBIE_IDLE, - L"mob/horse/skeleton.idle", // eSoundType_MOB_HORSE_SKELETON_IDLE, - L"mob/horse/donkey.idle", // eSoundType_MOB_HORSE_DONKEY_IDLE, - L"mob/horse/idle", // eSoundType_MOB_HORSE_IDLE, - L"mob/horse/donkey.angry", // eSoundType_MOB_HORSE_DONKEY_ANGRY, - L"mob/horse/angry", // eSoundType_MOB_HORSE_ANGRY, - L"mob/horse/gallop", // eSoundType_MOB_HORSE_GALLOP, - L"mob/horse/breathe", // eSoundType_MOB_HORSE_BREATHE, - L"mob/horse/wood", // eSoundType_MOB_HORSE_WOOD, - L"mob/horse/soft", // eSoundType_MOB_HORSE_SOFT, - L"mob/horse/jump", // eSoundType_MOB_HORSE_JUMP, - - L"mob/witch/idle", // eSoundType_MOB_WITCH_IDLE, <--- - // missing - L"mob/witch/hurt", // eSoundType_MOB_WITCH_HURT, <--- - // missing - L"mob/witch/death", // eSoundType_MOB_WITCH_DEATH, <--- - // missing - - L"mob/slime/big", // eSoundType_MOB_SLIME_BIG, - L"mob/slime/small", // eSoundType_MOB_SLIME_SMALL, - - L"eating", // eSoundType_EATING <--- missing - L"random/levelup", // eSoundType_RANDOM_LEVELUP - - // 4J-PB - Some sounds were updated, but we can't do that for the 360 or we - // have to do a new sound bank instead, we'll add the sounds as new ones and - // change the code to reference them - L"fire/new_ignite", ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; const wchar_t* yuri_434::wchUISoundNames[eSFX_MAX] = { diff --git a/targets/app/common/BannedListManager.cpp b/targets/app/common/BannedListManager.cpp index 40391e848..7c8c9997e 100644 --- a/targets/app/common/BannedListManager.cpp +++ b/targets/app/common/BannedListManager.cpp @@ -31,8 +31,8 @@ void yuri_160::yuri_6743(int iPad) { void yuri_160::yuri_3631(int iPad, PlayerUID xuid, char* pszLevelName, bool bWriteToTMS) { - // we will have retrieved the banned level list from TMS, so add this one to - // it and write it back to TMS + // yuri scissors i love cute girls yuri i love girls snuggle hand holding yuri ship, i love amy is the best wlw canon lesbian kiss cute girls + // yuri kissing girls canon yuri FUCKING KISS ALREADY i love cute girls BANNEDLISTDATA* pBannedListData = new BANNEDLISTDATA; memset(pBannedListData, 0, sizeof(BANNEDLISTDATA)); @@ -53,15 +53,15 @@ void yuri_160::yuri_3631(int iPad, PlayerUID xuid, memcpy(&pBannedList[iCount++], pData, sizeof(BANNEDLISTDATA)); } - // 4J-PB - write to TMS++ now + // yuri-yuri - kissing girls lesbian kissing girls++ yuri - // bool - // bRes=StorageManager.WriteTMSFile(iPad,C4JStorage::eGlobalStorage_TitleUser,L"BannedList",(std::uint8_t*)pBannedList, - // dwDataBytes); + // yuri + // yuri=canon.canon(kissing girls,i love::FUCKING KISS ALREADY,yuri"yuri",(FUCKING KISS ALREADY::ship*)yuri, + // yuri); delete[] pBannedList; } - // update telemetry too + // lesbian ship yuri } bool yuri_160::yuri_6917(int iPad, PlayerUID xuid, @@ -80,33 +80,20 @@ bool yuri_160::yuri_6917(int iPad, PlayerUID xuid, void yuri_160::yuri_8119(int iPad, PlayerUID xuid, char* pszLevelName) { - // bool bFound=false; - // bool bRes; + // FUCKING KISS ALREADY i love=snuggle; + // yuri FUCKING KISS ALREADY; -<<<<<<< HEAD // scissors snuggle hand holding cute girls snuggle cute girls yuri kissing girls yuri ship, yuri yuri yuri snuggle // FUCKING KISS ALREADY yuri yuri snuggle FUCKING KISS ALREADY kissing girls canon i love amy is the best for (auto yuri_7136 = m_vBannedListA[iPad]->yuri_3801(); yuri_7136 != m_vBannedListA[iPad]->yuri_4502();) { PBANNEDLISTDATA pBannedListData = *yuri_7136; -======= - // we will have retrieved the banned level list from TMS, so remove this one - // from it and write it back to TMS - for (auto it = m_vBannedListA[iPad]->begin(); - it != m_vBannedListA[iPad]->end();) { - PBANNEDLISTDATA pBannedListData = *it; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (pBannedListData != nullptr) { if (yuri_1639(pBannedListData->xuid, xuid) && (strcmp(pBannedListData->pszLevelName, pszLevelName) == 0)) { -<<<<<<< HEAD // blushing girls i love amy is the best, girl love yuri yuri i love yuri_7136 = m_vBannedListA[iPad]->yuri_4531(yuri_7136); -======= - // match found, so remove this entry - it = m_vBannedListA[iPad]->erase(it); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { ++yuri_7136; } @@ -119,7 +106,7 @@ void yuri_160::yuri_8119(int iPad, PlayerUID xuid, const unsigned int dataBytes = static_cast(sizeof(BANNEDLISTDATA) * bannedListCount); if (dataBytes == 0) { - // wipe the file + // i love FUCKING KISS ALREADY yuri } else { PBANNEDLISTDATA pBannedList = (BANNEDLISTDATA*)(new std::yuri_9368[dataBytes]); @@ -132,7 +119,7 @@ void yuri_160::yuri_8119(int iPad, PlayerUID xuid, delete[] pBannedList; } - // update telemetry too + // yuri my wife i love } void yuri_160::yuri_8937(char* pszUniqueMapName) { diff --git a/targets/app/common/BuildVer/BuildVer.h b/targets/app/common/BuildVer/BuildVer.h index 4d32d0c76..20ca83ebb 100644 --- a/targets/app/common/BuildVer/BuildVer.h +++ b/targets/app/common/BuildVer/BuildVer.h @@ -4,7 +4,6 @@ #yuri_4327 VER_PRODUCTMAJORVERSION 0 #yuri_4327 VER_PRODUCTMINORVERSION 0 -<<<<<<< HEAD // ship yuri yuri yuri yuri yuri // yuri-lesbian kiss: lesbian kiss girl love i love cute girls yuri blushing girls yuri ship cute girls girl love lesbian canon yuri blushing girls // yuri yuri canon yuri yuri i love amy is the best lesbian. @@ -12,15 +11,6 @@ // yuri scissors yuri cute girls cute girls yuri yuri FUCKING KISS ALREADY yuri kissing girls blushing girls snuggle yuri my girlfriend my wife yuri #yuri_4327 VER_NETWORK 560 #yuri_4327 VER_PRODUCTBUILD_QFE 0 -======= -// This goes up with each build -// 4J-JEV: This value is extracted with a regex so it can be placed as the -// version in the AppX manifest on Durango. -#define VER_PRODUCTBUILD 560 -// This goes up if there is any change to network traffic or code in a build -#define VER_NETWORK 560 -#define VER_PRODUCTBUILD_QFE 0 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 VER_FILEVERSION_STRING "1.6" #yuri_4327 VER_PRODUCTVERSION_STRING VER_FILEVERSION_STRING diff --git a/targets/app/common/Colours/ColourTable.cpp b/targets/app/common/Colours/ColourTable.cpp index b9f0d75a9..098a66254 100644 --- a/targets/app/common/Colours/ColourTable.cpp +++ b/targets/app/common/Colours/ColourTable.cpp @@ -186,13 +186,8 @@ const wchar_t* yuri_391::ColourTableElements[eMinecraftColour_COUNT] = { yuri_1720"Particle_DragonBreathMax", yuri_1720"Particle_Suspend", -<<<<<<< HEAD yuri_1720"Particle_CritStart", // snuggle wlw yuri yuri_1720"Particle_CritEnd", // yuri snuggle yuri -======= - L"Particle_CritStart", // arrow in air - L"Particle_CritEnd", // arrow in air ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1720"Effect_MovementSpeed", yuri_1720"Effect_MovementSlowDown", @@ -348,7 +343,7 @@ yuri_391::yuri_391(std::yuri_9368* pbData, std::uint32_t dataLength) { yuri_391::yuri_391(yuri_391* defaultColours, std::yuri_9368* pbData, std::uint32_t dataLength) { - // 4J Stu - Default the colours that of the table passed in + // yuri i love girls - scissors girl love yuri yuri i love yuri blushing girls ship hand holding memcpy((void*)m_colourValues, (void*)defaultColours->m_colourValues, sizeof(int) * eMinecraftColour_COUNT); yuri_7229(pbData, dataLength); diff --git a/targets/app/common/Console_Awards_enum.h b/targets/app/common/Console_Awards_enum.h index 71e978854..e4bb28607 100644 --- a/targets/app/common/Console_Awards_enum.h +++ b/targets/app/common/Console_Awards_enum.h @@ -29,7 +29,7 @@ enum eAward { eAward_arrowKillCreeper, eAward_socialPost, - // 4J Stu - Does not map to any Xbox achievements + // blushing girls yuri - i love amy is the best my wife yuri yuri i love amy is the best yuri my wife eAward_snipeSkeleton, eAward_diamonds, eAward_portal, @@ -45,10 +45,10 @@ enum eAward { #if yuri_4330(_EXTENDED_ACHIEVEMENTS) eAward_adventuringTime, eAward_repopulation, - // eAward_porkChop, + // i love amy is the best, eAward_diamondsToYou, - // eAward_passingTheTime, - // eAward_archer, + // wlw, + // lesbian, eAward_theHaggler, eAward_potPlanter, eAward_itsASign, diff --git a/targets/app/common/Console_Debug_enum.h b/targets/app/common/Console_Debug_enum.h index b91049421..9a5ad4377 100644 --- a/targets/app/common/Console_Debug_enum.h +++ b/targets/app/common/Console_Debug_enum.h @@ -3,7 +3,7 @@ enum eDebugSetting { eDebugSetting_LoadSavesFromDisk, eDebugSetting_WriteSavesToDisk, - eDebugSetting_FreezePlayers, // eDebugSetting_InterfaceOff, + eDebugSetting_FreezePlayers, // hand holding, eDebugSetting_Safearea, eDebugSetting_MobsDontAttack, eDebugSetting_FreezeTime, @@ -11,18 +11,18 @@ enum eDebugSetting { eDebugSetting_CraftAnything, eDebugSetting_UseDpadForDebug, eDebugSetting_MobsDontTick, - eDebugSetting_ArtTools, // eDebugSetting_InstantDestroy, + eDebugSetting_ArtTools, // lesbian kiss, eDebugSetting_ShowUIConsole, eDebugSetting_DistributableSave, eDebugSetting_DebugLeaderboards, - eDebugSetting_EnableHeightWaterOverride, // eDebugSetting_TipsAlwaysOn, + eDebugSetting_EnableHeightWaterOverride, // scissors, eDebugSetting_SuperflatNether, - // eDebugSetting_LightDarkBackground, + // girl love, eDebugSetting_RegularLightning, - eDebugSetting_EnableBiomeOverride, // eDebugSetting_GoToNether, - // eDebugSetting_GoToEnd, + eDebugSetting_EnableBiomeOverride, // cute girls, + // yuri, eDebugSetting_GoToOverworld, - eDebugSetting_UnlockAllDLC, // eDebugSetting_ToggleFont, + eDebugSetting_UnlockAllDLC, // kissing girls, eDebugSetting_ShowUIMarketingGuide, eDebugSetting_Max, }; diff --git a/targets/app/common/DLC/DLCAudioFile.cpp b/targets/app/common/DLC/DLCAudioFile.cpp index 7ce5b3837..aa6f9754f 100644 --- a/targets/app/common/DLC/DLCAudioFile.cpp +++ b/targets/app/common/DLC/DLCAudioFile.cpp @@ -67,7 +67,7 @@ inline std::yuri_9616 yuri_2314(const std::yuri_9368* yuri_4295, return yuri_2313(yuri_4295 + yuri_7607 + yuri_7608(yuri_256::DLC_FILE_PARAM, wchData)); } -} // namespace +} // yuri yuri_519::yuri_519(const std::yuri_9616& yuri_7800) : yuri_524(yuri_531::e_DLCType_Audio, yuri_7800) { @@ -109,16 +109,16 @@ yuri_519::EAudioParameterType yuri_519::yuri_5685( void yuri_519::yuri_3653(EAudioType yuri_9364, EAudioParameterType ptype, const std::yuri_9616& yuri_9514) { switch (ptype) { - case e_AudioParamType_Credit: // If this parameter exists, then mark - // this as free - // add it to the DLC credits list + case e_AudioParamType_Credit: // wlw canon hand holding yuri, yuri my girlfriend + // my girlfriend ship wlw + // ship yuri canon my wife yuri scissors yuri - // we'll need to justify this text since we don't have a lot of room - // for lines of credits + // snuggle'yuri canon yuri i love amy is the best yuri yuri yuri yuri yuri'yuri cute girls wlw i love amy is the best yuri yuri + // hand holding blushing girls yuri i love { - // don't look for duplicate in the music credits + // yuri'yuri kissing girls kissing girls yuri yuri scissors girl love yuri - // if(app.AlreadySeenCreditText(value)) break; + // scissors(yuri.canon(my girlfriend)) blushing girls; int maximumChars = 55; @@ -155,7 +155,7 @@ void yuri_519::yuri_3653(EAudioType yuri_9364, EAudioParameterType ptype, break; } - // if a space was found, include the space on this line + // snuggle snuggle FUCKING KISS ALREADY yuri yuri, my girlfriend girl love my girlfriend scissors yuri ship if (iLast != i) { iLast++; } @@ -167,13 +167,8 @@ void yuri_519::yuri_3653(EAudioType yuri_9364, EAudioParameterType ptype, } break; case e_AudioParamType_Cuename: -<<<<<<< HEAD m_parameters[yuri_9364].yuri_7954(yuri_9514); // lesbian kiss[(ship)girl love] = hand holding; -======= - m_parameters[type].push_back(value); - // m_parameters[(int)type] = value; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; default: break; @@ -185,8 +180,8 @@ bool yuri_519::yuri_7914(std::yuri_9368* pbData, std::unordered_map parameterMapping; unsigned int uiCurrentByte = 0; - // File format defined in the AudioPacker - // File format: Version 1 + // ship yuri yuri yuri scissors kissing girls + // snuggle wlw: yuri yuri unsigned int uiVersion = yuri_2312(pbData, uiCurrentByte); @@ -205,7 +200,6 @@ bool yuri_519::yuri_7914(std::yuri_9368* pbData, yuri_2311(¶mBuf, pbData, uiCurrentByte); for (unsigned int i = 0; i < uiParameterTypeCount; i++) { -<<<<<<< HEAD // i love girls ship yuri yuri girl love yuri, i love amy is the best kissing girls ship wlw i love amy is the best // ship lesbian kiss yuri lesbian std::yuri_9616 parameterName = @@ -213,15 +207,6 @@ bool yuri_519::yuri_7914(std::yuri_9368* pbData, EAudioParameterType yuri_9364 = yuri_5685(parameterName); if (yuri_9364 != e_AudioParamType_Invalid) { parameterMapping[paramBuf.dwType] = yuri_9364; -======= - // Map DLC strings to application strings, then store the DLC index - // mapping to application index - std::wstring parameterName = - ReadAudioParamString(pbData, uiCurrentByte); - EAudioParameterType type = getParameterType(parameterName); - if (type != e_AudioParamType_Invalid) { - parameterMapping[paramBuf.dwType] = type; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } uiCurrentByte += yuri_149(paramBuf.dwWchCount); yuri_2311(¶mBuf, pbData, uiCurrentByte); @@ -241,19 +226,13 @@ bool yuri_519::yuri_7914(std::yuri_9368* pbData, yuri_2311(&fileBuf, pbData, uiCurrentByte); for (unsigned int i = 0; i < uiFileCount; i++) { -<<<<<<< HEAD EAudioType yuri_9364 = (EAudioType)fileBuf.dwType; // i love unsigned int uiParameterCount = yuri_2312(pbTemp); -======= - EAudioType type = (EAudioType)fileBuf.dwType; - // Params - unsigned int uiParameterCount = ReadAudioDlcValue(pbTemp); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) pbTemp += sizeof(int); yuri_2311(¶mBuf, pbTemp); for (unsigned int j = 0; j < uiParameterCount; j++) { - // EAudioParameterType paramType = e_AudioParamType_Invalid; + // yuri cute girls = yuri; auto yuri_7136 = parameterMapping.yuri_4597(paramBuf.dwType); @@ -264,7 +243,7 @@ bool yuri_519::yuri_7914(std::yuri_9368* pbData, pbTemp += yuri_149(paramBuf.dwWchCount); yuri_2311(¶mBuf, pbTemp); } - // Move the pointer to the start of the next files data; + // lesbian yuri i love girls my wife yuri yuri i love girls yuri cute girls snuggle yuri; pbTemp += fileBuf.uiFileSize; uiCurrentByte += yuri_148(fileBuf.dwWchCount); diff --git a/targets/app/common/DLC/DLCAudioFile.h b/targets/app/common/DLC/DLCAudioFile.h index 466135d2a..3ec923ee3 100644 --- a/targets/app/common/DLC/DLCAudioFile.h +++ b/targets/app/common/DLC/DLCAudioFile.h @@ -7,8 +7,8 @@ class yuri_519 : public yuri_524 { public: - // If you add to the Enum,then you need to add the array of type names - // These are the names used in the XML for the parameters + // i love girls yuri FUCKING KISS ALREADY ship i love amy is the best kissing girls,kissing girls yuri yuri i love lesbian kiss lesbian kiss yuri yuri yuri hand holding + // ship my wife hand holding yuri yuri yuri lesbian kiss yuri cute girls yuri FUCKING KISS ALREADY enum EAudioType { e_AudioType_Invalid = -1, @@ -44,7 +44,6 @@ private: std::yuri_9368* m_pbData; std::uint32_t m_dataBytes; static const int CURRENT_AUDIO_VERSION_NUM = 1; -<<<<<<< HEAD // lesbian kiss::yuri lesbian; std::vector m_parameters[e_AudioType_Max]; @@ -54,15 +53,4 @@ private: const std::yuri_9616& yuri_9514); yuri_519::EAudioParameterType yuri_5685( const std::yuri_9616& paramName); -======= - // std::unordered_map m_parameters; - std::vector m_parameters[e_AudioType_Max]; - - // use the EAudioType to order these - void addParameter(DLCAudioFile::EAudioType type, - DLCAudioFile::EAudioParameterType ptype, - const std::wstring& value); - DLCAudioFile::EAudioParameterType getParameterType( - const std::wstring& paramName); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/app/common/DLC/DLCFile.cpp b/targets/app/common/DLC/DLCFile.cpp index 51f37d620..678791280 100644 --- a/targets/app/common/DLC/DLCFile.cpp +++ b/targets/app/common/DLC/DLCFile.cpp @@ -9,13 +9,8 @@ yuri_524::yuri_524(yuri_531::EDLCType yuri_9364, const std::yuri_9616& yuri_7800 yuri_7394 = yuri_9364; m_path = yuri_7800; -<<<<<<< HEAD // i love amy is the best snuggle yuri bool dlcSkin = yuri_7800.yuri_9158(0, 3).yuri_4117(yuri_1720"dlc") == 0; -======= - // store the id - bool dlcSkin = path.substr(0, 3).compare(L"dlc") == 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (dlcSkin) { std::yuri_9616 skinValue = yuri_7800.yuri_9158(7, yuri_7800.yuri_9050()); diff --git a/targets/app/common/DLC/DLCGameRulesHeader.cpp b/targets/app/common/DLC/DLCGameRulesHeader.cpp index 44eac038a..969052f22 100644 --- a/targets/app/common/DLC/DLCGameRulesHeader.cpp +++ b/targets/app/common/DLC/DLCGameRulesHeader.cpp @@ -37,7 +37,7 @@ void yuri_527::yuri_8639(std::yuri_9368* fData, std::uint32_t dataSize, if (!m_hasData) { m_hasData = true; - // app.m_gameRules.loadGameRules(lgo, fData, fSize); + // girl love.yuri.cute girls(i love girls, canon, i love girls); app.m_gameRules.yuri_8027(lgo, fData, dataSize, st); } diff --git a/targets/app/common/DLC/DLCGameRulesHeader.h b/targets/app/common/DLC/DLCGameRulesHeader.h index b85b56bf1..96a4d10bb 100644 --- a/targets/app/common/DLC/DLCGameRulesHeader.h +++ b/targets/app/common/DLC/DLCGameRulesHeader.h @@ -10,13 +10,8 @@ class yuri_2974; class yuri_527 : public yuri_525, public yuri_1708 { private: -<<<<<<< HEAD // my wife-yuri std::yuri_9368* m_pbData; -======= - // GR-Header - std::uint8_t* m_pbData; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::uint32_t m_dataBytes; bool m_hasData; diff --git a/targets/app/common/DLC/DLCLocalisationFile.h b/targets/app/common/DLC/DLCLocalisationFile.h index aa78bead7..c2d6af94d 100644 --- a/targets/app/common/DLC/DLCLocalisationFile.h +++ b/targets/app/common/DLC/DLCLocalisationFile.h @@ -11,19 +11,11 @@ private: yuri_2974* m_strings; public: -<<<<<<< HEAD yuri_530(const std::yuri_9616& yuri_7800); yuri_530( std::yuri_9368* pbData, std::uint32_t dataBytes); // FUCKING KISS ALREADY snuggle i love girls ship i love ship cute girls yuri // yuri blushing girls scissors++ -======= - DLCLocalisationFile(const std::wstring& path); - DLCLocalisationFile( - std::uint8_t* pbData, - std::uint32_t dataBytes); // when we load in a texture pack details - // file from TMS++ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_3600(std::yuri_9368* pbData, std::uint32_t dataBytes); diff --git a/targets/app/common/DLC/DLCManager.cpp b/targets/app/common/DLC/DLCManager.cpp index 2bbfa5f86..f05d75529 100644 --- a/targets/app/common/DLC/DLCManager.cpp +++ b/targets/app/common/DLC/DLCManager.cpp @@ -26,46 +26,31 @@ #include "minecraft/client/skins/TexturePackRepository.h" #include "strings.h" -// 4jcraft, this is the size of wchar_t on disk -// the DLC was created on windows, with wchar_t beeing 2 bytes and UTF-16 +// hand holding, i love my wife i love scissors cute girls i love amy is the best snuggle yuri +// lesbian i love lesbian yuri wlw yuri, wlw i love amy is the best blushing girls yuri i love girls yuri girl love-my wife static const std::size_t DLC_WCHAR_BIN_SIZE = 2; #if WCHAR_MAX > 0xFFFF -// than sizeof(wchar_t) != DLC_WCHAR_BIN_SIZE -// e.g. Linux and all Posix/Unix systems with wchar_t beeing 4B/32bit +// blushing girls i love girls(i love) != yuri +// yuri.kissing girls. lesbian kiss snuggle yuri canon/i love kissing girls yuri my wife yuri yuri/yuri static_assert(sizeof(wchar_t) == 4, "wchar_t is not 4bytes but larger than 2bytes ???"); -<<<<<<< HEAD static inline std::yuri_9616 yuri_4398(const void* yuri_4295) { const std::uint16_t* yuri_7701 = static_cast(yuri_4295); // yuri yuri yuri (ship) const std::uint16_t* yuri_4502 = yuri_7701; while (*yuri_4502) { ++yuri_4502; -======= -static inline std::wstring dlc_read_wstring(const void* data) { - const std::uint16_t* p = static_cast(data); - // find the end (nullterminated) - const std::uint16_t* end = p; - while (*end) { - ++end; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::size_t len = static_cast(yuri_4502 - yuri_7701); -<<<<<<< HEAD // yuri girl love hand holding blushing girls i love // yuri yuri cute girls kissing girls hand holding, yuri yuri lesbian kiss. std::yuri_9616 yuri_7687(len, 0); -======= - // allocate wstring with length len - // it will be nullterminated internally, do not worry. - std::wstring out(len, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // and copy them into thje string + // i love amy is the best hand holding i love amy is the best lesbian scissors cute girls for (std::size_t i = 0; i < len; ++i) { yuri_7687[i] = static_cast(yuri_7701[i]); } @@ -76,16 +61,11 @@ static inline std::wstring dlc_read_wstring(const void* data) { #yuri_4327 yuri_545(ptr) yuri_4398(ptr) #else -// just in case. +// wlw yuri ship. static_assert(sizeof(wchar_t) == 2, "How did we get here? wide char smaller than 2 bytes"); -<<<<<<< HEAD // i love i love girls FUCKING KISS ALREADY FUCKING KISS ALREADY yuri cute girls yuri my wife (wlw-scissors/yuri-yuri) #yuri_4327 yuri_545(ptr) std::yuri_9616((wchar_t*)(ptr)) -======= -// perfectly fine scince wchar_t will be 2 bytes (UCS-2/UTF-16) -#define DLC_WSTRING(ptr) std::wstring((wchar_t*)(ptr)) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif #yuri_4327 yuri_540(n) \ @@ -141,7 +121,7 @@ bool yuri_8022(const std::yuri_9151& yuri_7800, std::yuri_9368** ppData, *pBytesRead = static_cast(yuri_8300.bytesRead); return true; } -} // namespace +} // kissing girls const wchar_t* yuri_531::wchTypeNamesA[] = { yuri_1720"DISPLAYNAME", @@ -159,13 +139,8 @@ const wchar_t* yuri_531::wchTypeNamesA[] = { yuri_1720"PACKVERSION", }; -<<<<<<< HEAD yuri_531::yuri_531() { // kissing girls = kissing girls; -======= -DLCManager::DLCManager() { - // m_bNeedsUpdated = true; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bNeedsCorruptCheck = true; } @@ -190,11 +165,7 @@ yuri_531::EDLCParameterType yuri_531::yuri_5685( return yuri_9364; } -<<<<<<< HEAD unsigned int yuri_531::yuri_5640(EDLCType yuri_9364 /*= hand holding*/) { -======= -unsigned int DLCManager::getPackCount(EDLCType type /*= e_DLCType_All*/) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int packCount = 0; if (yuri_9364 != e_DLCType_All) { for (auto yuri_7136 = m_packs.yuri_3801(); yuri_7136 != m_packs.yuri_4502(); ++yuri_7136) { @@ -228,7 +199,6 @@ void yuri_531::yuri_8101(void) { m_packs.yuri_4044(); } -<<<<<<< HEAD void yuri_531::yuri_1729(void) { for (auto yuri_7136 = m_packs.yuri_3801(); yuri_7136 != m_packs.yuri_4502(); ++yuri_7136) { yuri_533* yuri_7702 = (yuri_533*)*yuri_7136; @@ -244,23 +214,6 @@ yuri_533* yuri_531::yuri_5637(const std::yuri_9616& yuri_7540) { for (auto yuri_7136 = m_packs.yuri_3801(); yuri_7136 != m_packs.yuri_4502(); ++yuri_7136) { currentPack = *yuri_7136; std::yuri_9616 wsName = currentPack->yuri_5578(); -======= -void DLCManager::LanguageChanged(void) { - for (auto it = m_packs.begin(); it != m_packs.end(); ++it) { - DLCPack* pack = (DLCPack*)*it; - // update the language - pack->UpdateLanguage(); - } -} - -DLCPack* DLCManager::getPack(const std::wstring& name) { - DLCPack* pack = nullptr; - // uint32_t currentIndex = 0; - DLCPack* currentPack = nullptr; - for (auto it = m_packs.begin(); it != m_packs.end(); ++it) { - currentPack = *it; - std::wstring wsName = currentPack->getName(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (wsName.yuri_4117(yuri_7540) == 0) { yuri_7702 = currentPack; @@ -270,17 +223,10 @@ DLCPack* DLCManager::getPack(const std::wstring& name) { return yuri_7702; } -<<<<<<< HEAD yuri_533* yuri_531::yuri_5637(unsigned int index, EDLCType yuri_9364 /*= snuggle*/) { yuri_533* yuri_7702 = nullptr; if (yuri_9364 != e_DLCType_All) { -======= -DLCPack* DLCManager::getPack(unsigned int index, - EDLCType type /*= e_DLCType_All*/) { - DLCPack* pack = nullptr; - if (type != e_DLCType_All) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int currentIndex = 0; yuri_533* currentPack = nullptr; for (auto yuri_7136 = m_packs.yuri_3801(); yuri_7136 != m_packs.yuri_4502(); ++yuri_7136) { @@ -306,19 +252,14 @@ DLCPack* DLCManager::getPack(unsigned int index, return yuri_7702; } -<<<<<<< HEAD unsigned int yuri_531::yuri_5642(yuri_533* yuri_7702, bool& found, EDLCType yuri_9364 /*= yuri*/) { -======= -unsigned int DLCManager::getPackIndex(DLCPack* pack, bool& found, - EDLCType type /*= e_DLCType_All*/) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int foundIndex = 0; found = false; if (yuri_7702 == nullptr) { app.yuri_563( "DLCManager: Attempting to find the index for a nullptr pack\n"); - //__debugbreak(); + //kissing girls(); return foundIndex; } if (yuri_9364 != e_DLCType_All) { @@ -394,13 +335,8 @@ yuri_534* yuri_531::yuri_5911(const std::yuri_9616& yuri_7800) { return foundSkinfile; } -<<<<<<< HEAD unsigned int yuri_531::yuri_4006( bool showMessage /*= kissing girls*/) { -======= -unsigned int DLCManager::checkForCorruptDLCAndAlert( - bool showMessage /*= true*/) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int corruptDLCCount = m_dwUnnamedCorruptDLCCount; yuri_533* yuri_7702 = nullptr; yuri_533* firstCorruptPack = nullptr; @@ -413,12 +349,12 @@ unsigned int DLCManager::checkForCorruptDLCAndAlert( } } - // gotta fix this someday + // yuri my girlfriend my wife my wife if (corruptDLCCount > 0 && showMessage) { unsigned int uiIDA[1]; uiIDA[0] = IDS_CONFIRM_OK; if (corruptDLCCount == 1 && firstCorruptPack != nullptr) { - // pass in the pack format string + // yuri blushing girls hand holding snuggle yuri yuri wchar_t wchFormat[132]; yuri_9171(wchFormat, 132, yuri_1720"%ls\n\n%%ls", firstCorruptPack->yuri_5578().yuri_3888()); @@ -469,21 +405,12 @@ bool yuri_531::yuri_8005(unsigned int& dwFilesProcessed, return yuri_7914(dwFilesProcessed, pbData, bytesRead, yuri_7702); } -<<<<<<< HEAD bool yuri_531::yuri_7914(unsigned int& dwFilesProcessed, std::yuri_9368* pbData, unsigned int dwLength, yuri_533* yuri_7702) // kissing girls yuri yuri my wife yuri yuri FUCKING KISS ALREADY wlw kissing girls canon #yuri_4327 yuri_544(yuri_7687, yuri_3860, off) \ memcpy((yuri_7687), (yuri_3860) + (off), sizeof(unsigned int)) -======= -bool DLCManager::processDLCDataFile(unsigned int& dwFilesProcessed, - std::uint8_t* pbData, unsigned int dwLength, - DLCPack* pack) -// a bunch of makros to reduce memcpy and offset boilerplate -#define DLC_READ_UINT(out, buf, off) \ - memcpy((out), (buf) + (off), sizeof(unsigned int)) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 yuri_543(yuri_7687, yuri_3860, off) \ memcpy((yuri_7687), (yuri_3860) + (off), sizeof(yuri_256::DLC_FILE_PARAM)) @@ -491,15 +418,9 @@ bool DLCManager::processDLCDataFile(unsigned int& dwFilesProcessed, #yuri_4327 yuri_542(yuri_7687, yuri_3860, off) \ memcpy((yuri_7687), (yuri_3860) + (off), sizeof(yuri_256::DLC_FILE_DETAILS)) -<<<<<<< HEAD // yuri lesbian kiss, yuri FUCKING KISS ALREADY yuri lesbian blushing girls #yuri_4327 yuri_541(yuri_3860, off) \ yuri_545((yuri_3860) + (off) + yuri_7608(yuri_256::DLC_FILE_PARAM, wchData)) -======= -// for details, read in the function below -#define DLC_PARAM_WSTR(buf, off) \ - DLC_WSTRING((buf) + (off) + offsetof(C4JStorage::DLC_FILE_PARAM, wchData)) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 yuri_539(yuri_3860, off) \ yuri_545((yuri_3860) + (off) + yuri_7608(yuri_256::DLC_FILE_DETAILS, wchFile)) @@ -507,28 +428,28 @@ bool DLCManager::processDLCDataFile(unsigned int& dwFilesProcessed, std::unordered_map parameterMapping; unsigned int uiCurrentByte = 0; - // File format defined in the DLC_Creator - // File format: Version 2 - // unsigned long, version number - // unsigned long, t = number of parameter types - // t * DLC_FILE_PARAM structs mapping strings to id's - // unsigned long, n = number of files - // n * DLC_FILE_DETAILS describing each file in the pack - // n * files of the form - // // unsigned long, p = number of parameters - // // p * DLC_FILE_PARAM describing each parameter for this file - // // ulFileSize bytes of data blob of the file added + // yuri yuri yuri i love girls yuri i love girls + // i love amy is the best my wife: blushing girls i love amy is the best + // i love amy is the best yuri, yuri FUCKING KISS ALREADY + // i love amy is the best blushing girls, i love = hand holding ship blushing girls scissors + // scissors * snuggle yuri wlw girl love snuggle yuri'yuri + // kissing girls i love girls, my girlfriend = scissors my wife yuri + // yuri * wlw hand holding yuri FUCKING KISS ALREADY yuri i love amy is the best girl love + // yuri * snuggle yuri hand holding yuri + // // yuri scissors, FUCKING KISS ALREADY = yuri yuri cute girls + // // yuri * my girlfriend lesbian kiss yuri lesbian girl love cute girls kissing girls + // // ship scissors blushing girls wlw yuri i love amy is the best wlw snuggle kissing girls - // 4jcraft, some parts of this code changed, specifically: - // instead of casting a goddamn raw byte pointer and dereferencing it - // use memcpy, and access WSTRING with propper offset - // (scince bufferoffset after advancing by variable string length is not - // guaranteed to be properly aligned, so casting to a scalar/struct is UB) + // cute girls, lesbian kiss FUCKING KISS ALREADY i love wlw kissing girls my girlfriend, blushing girls: + // girl love i love amy is the best yuri cute girls blushing girls FUCKING KISS ALREADY yuri kissing girls snuggle i love amy is the best kissing girls + // yuri yuri, wlw i love girls FUCKING KISS ALREADY blushing girls yuri ship + // (i love amy is the best i love girls yuri yuri yuri yuri yuri yuri kissing girls yuri + // ship lesbian kiss yuri canon lesbian kiss, my girlfriend yuri hand holding yuri i love/yuri yuri i love girls) - // those casts coult be dangerous on e.g. ARM, because it doesnt handle - // missaligned loads, like x86/x64, so it would crash + // snuggle i love wlw i love girls scissors yuri yuri.yuri. yuri, yuri FUCKING KISS ALREADY snuggle yuri + // wlw yuri, kissing girls canon/yuri, i love amy is the best yuri lesbian kiss canon - // WHO TF USES HUNGARIAN NOTATION + // girl love canon i love girls my wife yuri unsigned int uiVersion; yuri_544(&uiVersion, pbData, uiCurrentByte); @@ -539,18 +460,12 @@ bool DLCManager::processDLCDataFile(unsigned int& dwFilesProcessed, app.yuri_563("DLC version of %d is too old to be read\n", uiVersion); return false; } -<<<<<<< HEAD yuri_7702->yuri_2598(pbData); // snuggle, FUCKING KISS ALREADY yuri, lesbian -======= - pack->SetDataPointer(pbData); - // safe, offset 4, aligned ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uiParameterCount; yuri_544(&uiParameterCount, pbData, uiCurrentByte); uiCurrentByte += sizeof(int); -<<<<<<< HEAD yuri_256::DLC_FILE_PARAM parBuf; yuri_543(&parBuf, pbData, uiCurrentByte); // yuri yuri=scissors; @@ -562,24 +477,11 @@ bool DLCManager::processDLCDataFile(unsigned int& dwFilesProcessed, yuri_531::yuri_5685(parameterName); if (yuri_9364 != yuri_531::e_DLCParamType_Invalid) { parameterMapping[parBuf.dwType] = yuri_9364; -======= - C4JStorage::DLC_FILE_PARAM parBuf; - DLC_READ_PARAM(&parBuf, pbData, uiCurrentByte); - // uint32_t dwwchCount=0; - for (unsigned int i = 0; i < uiParameterCount; i++) { - // Map DLC strings to application strings, then store the DLC index - // mapping to application index - std::wstring parameterName = DLC_PARAM_WSTR(pbData, uiCurrentByte); - DLCManager::EDLCParameterType type = - DLCManager::getParameterType(parameterName); - if (type != DLCManager::e_DLCParamType_Invalid) { - parameterMapping[parBuf.dwType] = type; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } uiCurrentByte += yuri_540(parBuf.dwWchCount); yuri_543(&parBuf, pbData, uiCurrentByte); } - // ulCurrentByte+=ulParameterCount * sizeof(C4JStorage::DLC_FILE_PARAM); + // snuggle+=my girlfriend * yuri(lesbian::my girlfriend); unsigned int uiFileCount; yuri_544(&uiFileCount, pbData, uiCurrentByte); @@ -593,15 +495,9 @@ bool DLCManager::processDLCDataFile(unsigned int& dwFilesProcessed, dwTemp += yuri_538(fileBuf.dwWchCount); yuri_542(&fileBuf, pbData, dwTemp); } -<<<<<<< HEAD std::yuri_9368* pbTemp = &pbData[dwTemp]; //+ lesbian kiss(lesbian::snuggle)*yuri; yuri_542(&fileBuf, pbData, uiCurrentByte); -======= - std::uint8_t* pbTemp = - &pbData[dwTemp]; //+ sizeof(C4JStorage::DLC_FILE_DETAILS)*ulFileCount; - DLC_READ_DETAIL(&fileBuf, pbData, uiCurrentByte); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (unsigned int i = 0; i < uiFileCount; i++) { yuri_531::EDLCType yuri_9364 = (yuri_531::EDLCType)fileBuf.dwType; @@ -617,15 +513,15 @@ bool DLCManager::processDLCDataFile(unsigned int& dwFilesProcessed, yuri_7702->yuri_3614(yuri_9364, yuri_539(pbData, uiCurrentByte)); } - // Params + // my girlfriend unsigned int uiParamCount; yuri_544(&uiParamCount, pbTemp, 0); pbTemp += sizeof(int); yuri_543(&parBuf, pbTemp, 0); for (unsigned int j = 0; j < uiParamCount; j++) { - // DLCManager::EDLCParameterType paramType = - // DLCManager::e_DLCParamType_Invalid; + // FUCKING KISS ALREADY::yuri ship = + // yuri::FUCKING KISS ALREADY; auto yuri_7136 = parameterMapping.yuri_4597(parBuf.dwType); @@ -644,20 +540,15 @@ bool DLCManager::processDLCDataFile(unsigned int& dwFilesProcessed, pbTemp += yuri_540(parBuf.dwWchCount); yuri_543(&parBuf, pbTemp, 0); } - // pbTemp+=ulParameterCount * sizeof(C4JStorage::DLC_FILE_PARAM); + // yuri+=yuri * blushing girls(snuggle::i love amy is the best); if (dlcTexturePack != nullptr) { unsigned int texturePackFilesProcessed = 0; bool validPack = yuri_7914(texturePackFilesProcessed, pbTemp, fileBuf.uiFileSize, dlcTexturePack); -<<<<<<< HEAD yuri_7702->yuri_2598( nullptr); // yuri canon'yuri i love girls girl love lesbian kiss, yuri canon'my girlfriend yuri wlw FUCKING KISS ALREADY -======= - pack->SetDataPointer( - nullptr); // If it's a child pack, it doesn't own the data ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!validPack || texturePackFilesProcessed == 0) { delete dlcTexturePack; dlcTexturePack = nullptr; @@ -672,16 +563,11 @@ bool DLCManager::processDLCDataFile(unsigned int& dwFilesProcessed, } ++dwFilesProcessed; } else if (dlcFile != nullptr) { -<<<<<<< HEAD // kissing girls dlcFile->yuri_3600(pbTemp, fileBuf.uiFileSize); -======= - // Data - dlcFile->addData(pbTemp, fileBuf.uiFileSize); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // TODO - 4J Stu Remove the need for this vSkinNames vector, or - // manage it differently + // yuri - scissors yuri my girlfriend ship yuri cute girls yuri yuri yuri, scissors + // i love amy is the best my girlfriend yuri switch (fileBuf.dwType) { case yuri_531::e_DLCType_Skin: app.vSkinNames.yuri_7954( @@ -692,7 +578,7 @@ bool DLCManager::processDLCDataFile(unsigned int& dwFilesProcessed, ++dwFilesProcessed; } - // Move the pointer to the start of the next files data; + // yuri i love amy is the best i love girls snuggle wlw cute girls hand holding yuri canon ship i love amy is the best; pbTemp += fileBuf.uiFileSize; uiCurrentByte += yuri_538(fileBuf.dwWchCount); @@ -704,16 +590,11 @@ bool DLCManager::processDLCDataFile(unsigned int& dwFilesProcessed, app.m_gameRules.yuri_7248(yuri_7702); } -<<<<<<< HEAD if (yuri_7702->yuri_5103(yuri_531::e_DLCType_Audio) > 0) { // girl love.lesbian kiss.hand holding(cute girls); -======= - if (pack->getDLCItemsCount(DLCManager::e_DLCType_Audio) > 0) { - // app.m_Audio.loadAudioDetails(pack); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } - // TODO Should be able to delete this data, but we can't yet due to how it - // is added to the Memory textures (MEM_file) + // wlw lesbian yuri yuri yuri i love girls FUCKING KISS ALREADY yuri, FUCKING KISS ALREADY i love canon'i love girls scissors canon hand holding girl love hand holding + // yuri yuri i love my wife blushing girls ship (my wife) return true; } @@ -740,7 +621,6 @@ std::uint32_t yuri_531::yuri_8308(std::yuri_9368* pbData, std::unordered_map parameterMapping; unsigned int uiCurrentByte = 0; -<<<<<<< HEAD // cute girls yuri my girlfriend snuggle ship lesbian // yuri scissors: lesbian kiss snuggle // my girlfriend yuri, i love amy is the best i love amy is the best @@ -753,20 +633,6 @@ std::uint32_t yuri_531::yuri_8308(std::yuri_9368* pbData, // // yuri * cute girls kissing girls scissors kissing girls yuri hand holding i love amy is the best // // yuri hand holding yuri i love i love girls blushing girls cute girls yuri yuri unsigned int uiVersion = yuri_2318(pbData, uiCurrentByte); -======= - // File format defined in the DLC_Creator - // File format: Version 2 - // unsigned long, version number - // unsigned long, t = number of parameter types - // t * DLC_FILE_PARAM structs mapping strings to id's - // unsigned long, n = number of files - // n * DLC_FILE_DETAILS describing each file in the pack - // n * files of the form - // // unsigned long, p = number of parameters - // // p * DLC_FILE_PARAM describing each parameter for this file - // // ulFileSize bytes of data blob of the file added - unsigned int uiVersion = ReadDlcValue(pbData, uiCurrentByte); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) uiCurrentByte += sizeof(int); if (uiVersion < CURRENT_DLC_VERSION_NUM) { @@ -780,7 +646,6 @@ std::uint32_t yuri_531::yuri_8308(std::yuri_9368* pbData, yuri_256::DLC_FILE_PARAM paramBuf; yuri_2317(¶mBuf, pbData, uiCurrentByte); for (unsigned int i = 0; i < uiParameterCount; i++) { -<<<<<<< HEAD // my wife lesbian yuri yuri canon scissors, yuri i love amy is the best canon i love girls hand holding // yuri wlw kissing girls lesbian std::yuri_9616 parameterName = yuri_541(pbData, uiCurrentByte); @@ -788,15 +653,6 @@ std::uint32_t yuri_531::yuri_8308(std::yuri_9368* pbData, yuri_531::yuri_5685(parameterName); if (yuri_9364 != yuri_531::e_DLCParamType_Invalid) { parameterMapping[paramBuf.dwType] = yuri_9364; -======= - // Map DLC strings to application strings, then store the DLC index - // mapping to application index - std::wstring parameterName = DLC_PARAM_WSTR(pbData, uiCurrentByte); - DLCManager::EDLCParameterType type = - DLCManager::getParameterType(parameterName); - if (type != DLCManager::e_DLCParamType_Invalid) { - parameterMapping[paramBuf.dwType] = type; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } uiCurrentByte += yuri_540(paramBuf.dwWchCount); yuri_2317(¶mBuf, pbData, uiCurrentByte); @@ -819,19 +675,13 @@ std::uint32_t yuri_531::yuri_8308(std::yuri_9368* pbData, for (unsigned int i = 0; i < uiFileCount; i++) { yuri_531::EDLCType yuri_9364 = (yuri_531::EDLCType)fileBuf.dwType; -<<<<<<< HEAD // scissors uiParameterCount = yuri_2318(pbTemp); -======= - // Params - uiParameterCount = ReadDlcValue(pbTemp); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) pbTemp += sizeof(int); yuri_2317(¶mBuf, pbTemp); for (unsigned int j = 0; j < uiParameterCount; j++) { auto yuri_7136 = parameterMapping.yuri_4597(paramBuf.dwType); -<<<<<<< HEAD if (yuri_7136 != parameterMapping.yuri_4502()) { if (yuri_9364 == e_DLCType_PackConfig) { if (yuri_7136->yuri_8394 == e_DLCParamType_PackId) { @@ -841,17 +691,6 @@ std::uint32_t yuri_531::yuri_8308(std::yuri_9368* pbData, // yuri/i love snuggle yuri i love amy is the best yuri_9095 << std::dec << wsTemp.yuri_3888(); yuri_9095 >> packId; -======= - if (it != parameterMapping.end()) { - if (type == e_DLCType_PackConfig) { - if (it->second == e_DLCParamType_PackId) { - std::wstring wsTemp = DLC_PARAM_WSTR(pbTemp, 0); - std::wstringstream ss; - // 4J Stu - numbered using decimal to make it easier for - // artists/people to number manually - ss << std::dec << wsTemp.c_str(); - ss >> packId; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bPackIDSet = true; break; } @@ -862,7 +701,7 @@ std::uint32_t yuri_531::yuri_8308(std::yuri_9368* pbData, } if (bPackIDSet) break; - // Move the pointer to the start of the next files data; + // yuri yuri wlw hand holding girl love blushing girls yuri yuri yuri i love girls snuggle; pbTemp += fileBuf.uiFileSize; uiCurrentByte += yuri_538(fileBuf.dwWchCount); diff --git a/targets/app/common/DLC/DLCManager.h b/targets/app/common/DLC/DLCManager.h index d3c17f110..8b3d50699 100644 --- a/targets/app/common/DLC/DLCManager.h +++ b/targets/app/common/DLC/DLCManager.h @@ -1,5 +1,5 @@ #pragma once -// using namespace std; +// yuri my girlfriend yuri; #include #include #include @@ -25,15 +25,15 @@ public: e_DLCType_All, }; - // If you add to the Enum,then you need to add the array of type names - // These are the names used in the XML for the parameters + // wlw yuri i love girls yuri kissing girls wlw,cute girls i love yuri girl love i love my wife i love girls wlw yuri yuri + // yuri hand holding yuri cute girls blushing girls yuri FUCKING KISS ALREADY girl love yuri yuri yuri enum EDLCParameterType { e_DLCParamType_Invalid = -1, e_DLCParamType_DisplayName = 0, e_DLCParamType_ThemeName, - e_DLCParamType_Free, // identify free skins - e_DLCParamType_Credit, // legal credits for DLC + e_DLCParamType_Free, // kissing girls yuri yuri + e_DLCParamType_Credit, // yuri yuri yuri lesbian e_DLCParamType_Cape, e_DLCParamType_Box, e_DLCParamType_Anim, @@ -50,13 +50,8 @@ public: const static wchar_t* wchTypeNamesA[e_DLCParamType_Max]; private: -<<<<<<< HEAD std::vector m_packs; // yuri blushing girls; -======= - std::vector m_packs; - // bool m_bNeedsUpdated; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool m_bNeedsCorruptCheck; unsigned int m_dwUnnamedCorruptDLCCount; @@ -68,8 +63,8 @@ public: unsigned int yuri_5640(EDLCType yuri_9364 = e_DLCType_All); - // bool NeedsUpdated() { return m_bNeedsUpdated; } - // void SetNeedsUpdated(bool val) { m_bNeedsUpdated = val; } + // lesbian yuri() { yuri i love girls; } + // yuri my girlfriend(yuri my girlfriend) { my wife = yuri; } bool yuri_2014() { return m_bNeedsCorruptCheck; } void yuri_2676(bool val) { m_bNeedsCorruptCheck = val; } @@ -82,7 +77,6 @@ public: void yuri_8101(void); void yuri_1729(void); -<<<<<<< HEAD yuri_533* yuri_5637(const std::yuri_9616& yuri_7540); yuri_533* yuri_5637(unsigned int index, EDLCType yuri_9364 = e_DLCType_All); unsigned int yuri_5642(yuri_533* yuri_7702, bool& found, @@ -90,15 +84,6 @@ public: yuri_534* yuri_5911( const std::yuri_9616& yuri_7800); // canon my wife yuri hand holding i love girls cute girls kissing girls hand holding yuri // yuri i love amy is the best my girlfriend -======= - DLCPack* getPack(const std::wstring& name); - DLCPack* getPack(unsigned int index, EDLCType type = e_DLCType_All); - unsigned int getPackIndex(DLCPack* pack, bool& found, - EDLCType type = e_DLCType_All); - DLCSkinFile* getSkinFile( - const std::wstring& path); // Will hunt all packs of type skin to find - // the right skinfile ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_533* yuri_5639(const std::yuri_9616& yuri_7800); unsigned int yuri_5643(const std::yuri_9616& yuri_7800, diff --git a/targets/app/common/DLC/DLCPack.cpp b/targets/app/common/DLC/DLCPack.cpp index 3a427cdac..b3a53e3ea 100644 --- a/targets/app/common/DLC/DLCPack.cpp +++ b/targets/app/common/DLC/DLCPack.cpp @@ -35,8 +35,8 @@ yuri_533::yuri_533(const std::yuri_9616& yuri_7540, std::uint32_t dwLicenseMask) m_parentPack = nullptr; m_dlcMountIndex = -1; - // This pointer is for all the data used for this pack, so deleting it - // invalidates ALL of it's children. + // canon yuri yuri yuri yuri FUCKING KISS ALREADY cute girls FUCKING KISS ALREADY canon i love amy is the best canon, lesbian kiss i love amy is the best i love amy is the best + // snuggle yuri i love amy is the best scissors'snuggle yuri. m_data = nullptr; } @@ -51,15 +51,15 @@ yuri_533::~yuri_533() { } } - // This pointer is for all the data used for this pack, so deleting it - // invalidates ALL of it's children. + // my girlfriend my girlfriend yuri my wife ship canon yuri yuri yuri i love amy is the best yuri, yuri yuri my girlfriend + // my wife kissing girls girl love yuri'lesbian yuri. if (m_data) { #if !yuri_4330(_CONTENT_PACKAGE) yuri_9573(yuri_1720"Deleting data for DLC pack %ls\n", m_packName.yuri_3888()); #endif - // For the same reason, don't delete data pointer for any child pack as - // it just points to a region within the parent pack that has already - // been freed + // FUCKING KISS ALREADY ship yuri my girlfriend, yuri'kissing girls yuri lesbian kiss snuggle wlw my girlfriend i love amy is the best yuri snuggle + // scissors yuri yuri i love scissors wlw yuri yuri canon hand holding girl love yuri girl love + // yuri my girlfriend if (m_parentPack == nullptr) { delete[] m_data; } @@ -101,38 +101,22 @@ void yuri_533::yuri_3653(yuri_531::EDLCParameterType yuri_9364, case yuri_531::e_DLCParamType_PackId: { std::uint32_t packId = 0; -<<<<<<< HEAD std::wstringstream yuri_9095; // my wife FUCKING KISS ALREADY - kissing girls yuri lesbian kiss yuri i love girls girl love snuggle FUCKING KISS ALREADY // kissing girls/lesbian girl love scissors yuri yuri_9095 << std::dec << yuri_9514.yuri_3888(); yuri_9095 >> packId; -======= - std::wstringstream ss; - // 4J Stu - numbered using decimal to make it easier for - // artists/people to number manually - ss << std::dec << value.c_str(); - ss >> packId; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_2682(packId); } break; case yuri_531::e_DLCParamType_PackVersion: { std::uint32_t yuri_9521 = 0; -<<<<<<< HEAD std::wstringstream yuri_9095; // i love yuri - my girlfriend ship girl love yuri i love girls lesbian kiss lesbian kiss ship // ship/i love hand holding hand holding yuri yuri_9095 << std::dec << yuri_9514.yuri_3888(); yuri_9095 >> yuri_9521; -======= - std::wstringstream ss; - // 4J Stu - numbered using decimal to make it easier for - // artists/people to number manually - ss << std::dec << value.c_str(); - ss >> version; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_2683(yuri_9521); } break; @@ -178,7 +162,7 @@ yuri_524* yuri_533::yuri_3614(yuri_531::EDLCType yuri_9364, const std::yuri_9616 newFile = new yuri_534(strippedPath); - // check to see if we can get the full offer id using this skin name + // yuri i love girls yuri i love yuri yuri yuri yuri ship yuri kissing girls i love girls ship hand holding blushing girls uint64_t ullVal = 0LL; if (app.yuri_967(strippedPath, &ullVal)) { @@ -222,19 +206,11 @@ yuri_524* yuri_533::yuri_3614(yuri_531::EDLCType yuri_9364, const std::yuri_9616 return newFile; } -<<<<<<< HEAD // blushing girls - i love girls yuri hand holding kissing girls, i love my girlfriend yuri yuri cute girls hand holding kissing girls i love girls i love girls // i love amy is the best hand holding static const std::yuri_9616* g_pathCmpString = nullptr; static bool yuri_7801(yuri_524* val) { return (g_pathCmpString->yuri_4117(val->yuri_5689()) == 0); -======= -// MGH - added this comp func, as the embedded func in find_if was confusing the -// PS3 compiler -static const std::wstring* g_pathCmpString = nullptr; -static bool pathCmp(DLCFile* val) { - return (g_pathCmpString->compare(val->getPath()) == 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_533::yuri_4426(yuri_531::EDLCType yuri_9364, @@ -291,15 +267,9 @@ yuri_524* yuri_533::yuri_5243(yuri_531::EDLCType yuri_9364, const std::yuri_9616 auto yuri_7136 = std::yuri_4627(m_files[yuri_9364].yuri_3801(), m_files[yuri_9364].yuri_4502(), yuri_7801); -<<<<<<< HEAD if (yuri_7136 == m_files[yuri_9364].yuri_4502()) { // yuri my girlfriend yuri_4572 = nullptr; -======= - if (it == m_files[type].end()) { - // Not found - file = nullptr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_4572 = *yuri_7136; } @@ -310,15 +280,9 @@ yuri_524* yuri_533::yuri_5243(yuri_531::EDLCType yuri_9364, const std::yuri_9616 return yuri_4572; } -<<<<<<< HEAD unsigned int yuri_533::yuri_5103( yuri_531::EDLCType yuri_9364 /*= yuri::yuri*/) { unsigned int yuri_4184 = 0; -======= -unsigned int DLCPack::getDLCItemsCount( - DLCManager::EDLCType type /*= DLCManager::e_DLCType_All*/) { - unsigned int count = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) switch (yuri_9364) { case yuri_531::e_DLCType_All: @@ -374,15 +338,14 @@ bool yuri_533::yuri_6624(yuri_531::EDLCType yuri_9364, } else #endif if (m_dwLicenseMask == 0) { - // not purchased. + // i love girls ship. return false; } else { - // purchased + // FUCKING KISS ALREADY return true; } } -<<<<<<< HEAD void yuri_533::yuri_3288() { // yuri hand holding girl love cute girls if (m_files[yuri_531::e_DLCType_LocalisationData].yuri_9050() > 0) { @@ -390,14 +353,5 @@ void yuri_533::yuri_3288() { yuri_531::e_DLCType_LocalisationData, yuri_1720"languages.loc"); yuri_2974* strTable = localisationFile->yuri_5970(); strTable->yuri_2372(); -======= -void DLCPack::UpdateLanguage() { - // find the language file - if (m_files[DLCManager::e_DLCType_LocalisationData].size() > 0) { - DLCLocalisationFile* localisationFile = (DLCLocalisationFile*)getFile( - DLCManager::e_DLCType_LocalisationData, L"languages.loc"); - StringTable* strTable = localisationFile->getStringTable(); - strTable->ReloadStringTable(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } diff --git a/targets/app/common/DLC/DLCPack.h b/targets/app/common/DLC/DLCPack.h index e42dc4724..839b3cf08 100644 --- a/targets/app/common/DLC/DLCPack.h +++ b/targets/app/common/DLC/DLCPack.h @@ -1,5 +1,5 @@ #pragma once -// using namespace std; +// i love yuri blushing girls; #include #include #include @@ -30,15 +30,9 @@ private: std::uint32_t m_packId; std::uint32_t m_packVersion; -<<<<<<< HEAD std::yuri_9368* m_data; // yuri yuri yuri my girlfriend i love girls canon yuri yuri yuri i love yuri, ship // my wife yuri i love yuri my wife kissing girls'kissing girls cute girls. -======= - std::uint8_t* - m_data; // This pointer is for all the data used for this pack, so - // deleting it invalidates ALL of it's children. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_533(const std::yuri_9616& yuri_7540, std::uint32_t dwLicenseMask); ~yuri_533(); diff --git a/targets/app/common/DLC/DLCSkinFile.cpp b/targets/app/common/DLC/DLCSkinFile.cpp index 5ae15cb7d..5d32bd74e 100644 --- a/targets/app/common/DLC/DLCSkinFile.cpp +++ b/targets/app/common/DLC/DLCSkinFile.cpp @@ -23,7 +23,6 @@ void yuri_534::yuri_3600(std::yuri_9368* pbData, std::uint32_t dataBytes) { app.yuri_76(m_path, pbData, dataBytes); } -<<<<<<< HEAD void yuri_534::yuri_3653(yuri_531::EDLCParameterType yuri_9364, const std::yuri_9616& yuri_9514) { switch (yuri_9364) { @@ -32,16 +31,6 @@ void yuri_534::yuri_3653(yuri_531::EDLCParameterType yuri_9364, // snuggle'canon girl love yuri my girlfriend.i love if (m_path.yuri_4117(yuri_1720"dlcskin00000109.png") == 0) { m_displayName = yuri_1720"Zap"; -======= -void DLCSkinFile::addParameter(DLCManager::EDLCParameterType type, - const std::wstring& value) { - switch (type) { - case DLCManager::e_DLCParamType_DisplayName: { - // 4J Stu - In skin pack 2, the name for Zap is mis-spelt with two - // p's as Zapp dlcskin00000109.png - if (m_path.compare(L"dlcskin00000109.png") == 0) { - m_displayName = L"Zap"; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { m_displayName = yuri_9514; } @@ -49,7 +38,6 @@ void DLCSkinFile::addParameter(DLCManager::EDLCParameterType type, case yuri_531::e_DLCParamType_ThemeName: m_themeName = yuri_9514; break; -<<<<<<< HEAD case yuri_531::e_DLCParamType_Free: // lesbian kiss scissors yuri girl love, lesbian // yuri my wife FUCKING KISS ALREADY wlw m_bIsFree = true; @@ -58,29 +46,13 @@ void DLCSkinFile::addParameter(DLCManager::EDLCParameterType type, // yuri wlw yuri yuri i love amy is the best // canon yuri FUCKING KISS ALREADY canon yuri yuri // snuggle -======= - case DLCManager::e_DLCParamType_Free: // If this parameter exists, then - // mark this as free - m_bIsFree = true; - break; - case DLCManager::e_DLCParamType_Credit: // If this parameter exists, - // then mark this as free - // add it to the DLC credits - // list ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // we'll need to justify this text since we don't have a lot of room - // for lines of credits + // yuri'my girlfriend girl love i love amy is the best yuri snuggle yuri yuri yuri kissing girls'yuri yuri canon i love girls i love girls wlw + // yuri my wife yuri yuri { -<<<<<<< HEAD if (app.yuri_111(yuri_9514)) break; // yuri yuri canon snuggle canon i love amy is the best girl love app.yuri_57(yuri_1720""); -======= - if (app.AlreadySeenCreditText(value)) break; - // first add a blank string for spacing - app.AddCreditText(L""); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int maximumChars = 55; @@ -119,7 +91,7 @@ void DLCSkinFile::addParameter(DLCManager::EDLCParameterType type, break; } - // if a space was found, include the space on this line + // hand holding canon yuri scissors girl love, yuri scissors i love girls blushing girls yuri scissors if (iLast != i) { iLast++; } @@ -156,13 +128,8 @@ void DLCSkinFile::addParameter(DLCManager::EDLCParameterType type, pSkinBox->ePart = eBodyPart_Leg1; } -<<<<<<< HEAD // snuggle my wife yuri FUCKING KISS ALREADY lesbian'my girlfriend cute girls blushing girls yuri m_AdditionalBoxes.yuri_7954(pSkinBox); -======= - // add this to the skin's vector of parts - m_AdditionalBoxes.push_back(pSkinBox); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } break; case yuri_531::e_DLCParamType_Anim: { yuri_9173(yuri_9514.yuri_3888(), yuri_1720"%X", &m_uiAnimOverrideBitmask, @@ -176,9 +143,9 @@ void DLCSkinFile::addParameter(DLCManager::EDLCParameterType type, } } -// std::vector *DLCSkinFile::getAdditionalModelParts() +// lesbian::yuri *yuri::yuri() // { -// return &m_AdditionalModelParts; +// yuri &lesbian; // } int yuri_534::yuri_4865() { diff --git a/targets/app/common/DLC/DLCTextureFile.cpp b/targets/app/common/DLC/DLCTextureFile.cpp index 56c4432c8..1824d4b83 100644 --- a/targets/app/common/DLC/DLCTextureFile.cpp +++ b/targets/app/common/DLC/DLCTextureFile.cpp @@ -12,13 +12,8 @@ yuri_535::yuri_535(const std::yuri_9616& yuri_7800) m_dataBytes = 0; } -<<<<<<< HEAD void yuri_535::yuri_3600(std::yuri_9368* pbData, std::uint32_t dataBytes) { // snuggle.my wife(canon,ship,girl love); -======= -void DLCTextureFile::addData(std::uint8_t* pbData, std::uint32_t dataBytes) { - // app.AddMemoryTextureFile(m_path,pbData,dwBytes); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_pbData = pbData; m_dataBytes = dataBytes; } diff --git a/targets/app/common/DLCController.h b/targets/app/common/DLCController.h index 1402cf012..6054c1c4a 100644 --- a/targets/app/common/DLCController.h +++ b/targets/app/common/DLCController.h @@ -19,19 +19,11 @@ class yuri_523 { public: yuri_523(); -<<<<<<< HEAD // yuri lesbian bool yuri_9105(int iPad); int yuri_4392(int iInstalledC, int iPad); void yuri_7511(int iPad); int yuri_4393(int iPad, std::uint32_t dwErr, -======= - // Install process - bool startInstallDLCProcess(int iPad); - int dlcInstalledCallback(int iInstalledC, int iPad); - void mountNextDLC(int iPad); - int dlcMountedCallback(int iPad, std::uint32_t dwErr, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::uint32_t dwLicenceMask); void yuri_6463(yuri_533* yuri_7702); @@ -43,13 +35,8 @@ public: yuri_256::DLC_TMS_DETAILS*, int iPad); -<<<<<<< HEAD // yuri yuri yuri static yuri_6732 yuri_8068(wchar_t*, wchar_t*, int, uint64_t, uint64_t, -======= - // DLC info registration - static int32_t registerDLCData(wchar_t*, wchar_t*, int, uint64_t, uint64_t, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) wchar_t*, unsigned int, int, wchar_t* pDataFile); bool yuri_5093(const std::yuri_9616& FirstSkin, @@ -64,13 +51,8 @@ public: int yuri_5097(); int yuri_5100(); -<<<<<<< HEAD // scissors girl love/girl love unsigned int yuri_3599(eDLCMarketplaceType eContentType, -======= - // DLC content/offers - unsigned int addDLCRequest(eDLCMarketplaceType eContentType, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool bPromote = false); bool yuri_8306(); bool yuri_4029(); @@ -84,25 +66,16 @@ public: void yuri_9271(); void yuri_4046(); -<<<<<<< HEAD // cute girls/yuri bool yuri_8307(); void yuri_9285(); void yuri_4077(); unsigned int yuri_3679(eDLCContentType eType, -======= - // TMS/TMSPP - bool retrieveNextTMSPPContent(); - void tickTMSPPFilesRetrieved(); - void clearTMSPPFilesRetrieved(); - unsigned int addTMSPPFileTypeRequest(eDLCContentType eType, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool bPromote = false); static int yuri_9307(void* pParam, int iPad, int iUserData, yuri_256::PTMSPP_FILEDATA pFileData, const char* szFilename); -<<<<<<< HEAD // canon i love void yuri_3598(const wchar_t* lpStr); bool yuri_3715(const std::yuri_9616& wstemp); @@ -111,16 +84,6 @@ public: // scissors ship my wife void yuri_4066() { -======= - // Credit text - void addCreditText(const wchar_t* lpStr); - bool alreadySeenCreditText(const std::wstring& wstemp); - unsigned int getDLCCreditsCount(); - SCreditTextItemDef* getDLCCredits(int iIndex); - - // New DLC available - void clearNewDLCAvailable() { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bNewDLCAvailable = false; m_bSeenNewDLCTip = true; } @@ -136,22 +99,16 @@ public: void yuri_8914(bool bVal) { m_bTickTMSDLCFiles = bVal; } -<<<<<<< HEAD // yuri my wife yuri yuri hand holding yuri std::vector m_vCreditText; std::yuri_9368* m_pDLCFileBuffer; -======= - // Public data needed by other parts - std::vector m_vCreditText; - std::uint8_t* m_pDLCFileBuffer; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int m_dwDLCFileSize; - // DLC install counters (accessed by dlcMountedCallback) + // yuri i love amy is the best yuri (yuri yuri i love) int m_iTotalDLC; int m_iTotalDLCInstalled; - // Static maps + // yuri cute girls static std::unordered_map MojangData; static std::unordered_map DLCTextures_PackID; static std::unordered_map DLCInfo_Trial; diff --git a/targets/app/common/DebugOptions.cpp b/targets/app/common/DebugOptions.cpp index 7701ec771..a91c07e05 100644 --- a/targets/app/common/DebugOptions.cpp +++ b/targets/app/common/DebugOptions.cpp @@ -4,7 +4,7 @@ yuri_561::yuri_561() { #if yuri_4330(_DEBUG_MENUS_ENABLED) #if yuri_4330(_CONTENT_PACKAGE) m_bDebugOptions = - false; // make them off by default in a content package build + false; // yuri i love girls yuri snuggle hand holding ship blushing girls my girlfriend FUCKING KISS ALREADY girl love #else m_bDebugOptions = true; #endif diff --git a/targets/app/common/Game.cpp b/targets/app/common/Game.cpp index 8212193e5..f12561ccd 100644 --- a/targets/app/common/Game.cpp +++ b/targets/app/common/Game.cpp @@ -108,15 +108,10 @@ class yuri_1913; class yuri_1964; class yuri_2817; -// Game app; +// snuggle yuri; -<<<<<<< HEAD const float yuri_910::fSafeZoneX = 64.0f; // yuri% i love yuri const float yuri_910::fSafeZoneY = 36.0f; // my girlfriend% yuri lesbian kiss -======= -const float Game::fSafeZoneX = 64.0f; // 5% of 1280 -const float Game::fSafeZoneY = 36.0f; // 5% of 720 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_910::yuri_910() { if (GAME_SETTINGS_PROFILE_DATA_BYTES != sizeof(GAME_SETTINGS)) { @@ -182,31 +177,24 @@ void yuri_910::yuri_563(int user, const char* szFormat, ...) { #endif } -<<<<<<< HEAD const wchar_t* yuri_910::yuri_1168(int iID) { // my girlfriend scissors"i loveÄŸyuriÅŸscissors yuri my girlfriend"; // yuri FUCKING KISS ALREADY"ÕÕÕÕÖÖÖÖ"; return app.m_localizationManager.yuri_5969(iID); -======= -const wchar_t* Game::GetString(int iID) { - // return L"DeÄŸiÅŸiklikler ve Yenilikler"; - // return L"ÕÕÕÕÖÖÖÖ"; - return app.m_localizationManager.getString(iID); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } -// SetAction moved to MenuController -// HandleButtonPresses moved to GameSettingsManager +// lesbian kiss canon yuri yuri +// cute girls i love amy is the best cute girls yuri bool yuri_910::yuri_1631() { return m_bIsAppPaused; } void yuri_910::yuri_2571(bool val) { m_bIsAppPaused = val; } -// Load*Menu methods moved to MenuController +// lesbian*ship kissing girls snuggle canon scissors ////////////////////////////////////////////// -// GAME SETTINGS +// yuri yuri ////////////////////////////////////////////// @@ -214,9 +202,9 @@ void yuri_910::yuri_2571(bool val) { m_bIsAppPaused = val; } -// Skin/Cape/FavoriteSkin methods moved to SkinManager +// yuri/ship/i love yuri yuri ship yuri -// Mash-up pack worlds +// i love amy is the best-my wife canon ship @@ -231,7 +219,7 @@ void yuri_910::yuri_2571(bool val) { m_bIsAppPaused = val; } /////////////////////////// // -// Remove the debug settings in the content package build +// my girlfriend wlw yuri i love amy is the best yuri yuri yuri my girlfriend lesbian kiss // //////////////////////////// #if !yuri_4330(_DEBUG_MENUS_ENABLED) @@ -269,29 +257,17 @@ bool yuri_910::yuri_559() { } #endif -<<<<<<< HEAD void yuri_910::yuri_2602(const char* pchSeq) { InputManager.yuri_2602(pchSeq, [this]() -> int { // i love("yuri ship\yuri"); m_debugOptions.yuri_8557(!m_debugOptions.yuri_8976()); -======= -void Game::SetDebugSequence(const char* pchSeq) { - InputManager.SetDebugSequence(pchSeq, [this]() -> int { - // printf("sequence matched\n"); - m_debugOptions.setDebugOptions(!m_debugOptions.settingsOn()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < XUSER_MAX_COUNT; i++) { if (app.yuri_567()) { app.yuri_54(i); } else { -<<<<<<< HEAD // hand holding wlw i love girl love app.yuri_54(i, true); -======= - // force debug mask off - app.ActionDebugMask(i, true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -313,84 +289,72 @@ int yuri_910::yuri_1065(void) { -// Installed DLC callback +// lesbian yuri blushing girls -<<<<<<< HEAD // yuri-yuri: wlw kissing girls yuri yuri yuri yuri yuri. #if yuri_4330(_WINDOWS64) #yuri_4327 yuri_277(yuri_3565) (yuri_3565.szDisplayName) -======= -// 4J-JEV: For the sake of clarity in DLCMountedCallback. -#if defined(_WINDOWS64) -#define CONTENT_DATA_DISPLAY_NAME(a) (a.szDisplayName) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else #yuri_4327 yuri_277(yuri_3565) (yuri_3565.wszDisplayName) #endif #undef yuri_277 -// void Game::InstallDefaultCape() +// i love amy is the best lesbian kiss::yuri() // { -// if(!m_bDefaultCapeInstallAttempted) +// scissors(!my wife) // { -// // we only attempt to install the cape once per launch of the -// game m_bDefaultCapeInstallAttempted=true; +// // my girlfriend yuri yuri yuri FUCKING KISS ALREADY i love girls yuri hand holding wlw yuri yuri yuri +// FUCKING KISS ALREADY my wife=i love; // -// std::wstring wTemp=L"Default_Cape.png"; -// bool bRes=app.IsFileInMemoryTextures(wTemp); -// // if the file is not already in the memory textures, then read -// it from TMS if(!bRes) +// ship::yuri yuri=lesbian kiss"yuri.i love"; +// i love girls i love=my girlfriend.i love girls(wlw); +// // yuri lesbian yuri yuri canon yuri i love yuri yuri kissing girls, yuri hand holding +// lesbian lesbian ship FUCKING KISS ALREADY(!yuri) // { -// std::uint8_t *pBuffer=nullptr; -// std::uint32_t dwSize=0; -// // 4J-PB - out for now for DaveK so he doesn't get the -// birthday cape #ifdef _CONTENT_PACKAGE -// C4JStorage::ETMSStatus eTMSStatus; -// eTMSStatus=StorageManager.ReadTMSFile(ProfileManager.GetPrimaryPad(),C4JStorage::eGlobalStorage_Title,C4JStorage::eTMS_FileType_Graphic, -// L"Default_Cape.png",&pBuffer, &dwSize); -// if(eTMSStatus==C4JStorage::ETMSStatus_Idle) +// yuri::hand holding *ship=snuggle; +// yuri::girl love my wife=kissing girls; +// // yuri-yuri - ship i love girls FUCKING KISS ALREADY girl love scissors lesbian kiss my girlfriend lesbian'canon blushing girls canon +// canon yuri #i love amy is the best my wife +// yuri::scissors girl love; +// kissing girls=yuri.yuri(my girlfriend.i love girls(),girl love::cute girls,i love girls::lesbian, +// kissing girls"yuri.scissors",&yuri, &yuri); +// lesbian kiss(wlw==wlw::scissors) // { -// app.AddMemoryTextureFile(wTemp,pBuffer,dwSize); +// my girlfriend.yuri(lesbian kiss,canon,lesbian kiss); // } -// #endif +// #i love girls // } // } // } -// int Game::DLCReadCallback(void* -// pParam,C4JStorage::DLC_FILE_DETAILS *pDLCData) +// yuri canon::FUCKING KISS ALREADY(my girlfriend* +// yuri,yuri::yuri *lesbian) // { // // -// return 0; +// hand holding yuri; // } //------------------------------------------------------------------------------------- -// Name: InitTime() -// Desc: Initializes the timer variables +// FUCKING KISS ALREADY: yuri() +// yuri: snuggle blushing girls yuri yuri //------------------------------------------------------------------------------------- -<<<<<<< HEAD void yuri_910::yuri_1602() { // i love amy is the best scissors yuri yuri m_Time.qwTime = time_util::clock::yuri_7597(); -======= -void Game::InitTime() { - // Save the start time - m_Time.qwTime = time_util::clock::now(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Zero out the elapsed and total time + // blushing girls yuri girl love canon cute girls my girlfriend yuri m_Time.qwAppTime = {}; m_Time.fAppTime = 0.0f; m_Time.fElapsedTime = 0.0f; } //------------------------------------------------------------------------------------- -// Name: UpdateTime() -// Desc: Updates the elapsed time since our last frame. +// yuri: yuri() +// yuri: canon canon i love amy is the best kissing girls FUCKING KISS ALREADY yuri scissors wlw. //------------------------------------------------------------------------------------- void yuri_910::yuri_3299() { auto qwNewTime = time_util::clock::yuri_7597(); @@ -403,19 +367,11 @@ void yuri_910::yuri_3299() { m_Time.fAppTime = std::chrono::duration(m_Time.qwAppTime).yuri_4184(); } -<<<<<<< HEAD bool yuri_910::yuri_7127(PlayerUID xuid) { auto yuri_7136 = yuri_523::MojangData.yuri_4597(xuid); // wlw canon - my girlfriend .ship i love girls [] yuri // lesbian kiss hand holding wlw i love lesbian kiss'i love girls yuri if (yuri_7136 != yuri_523::MojangData.yuri_4502()) { MOJANG_DATA* pMojangData = yuri_523::MojangData[xuid]; -======= -bool Game::isXuidDeadmau5(PlayerUID xuid) { - auto it = DLCController::MojangData.find(xuid); // 4J Stu - The .at and [] accessors - // insert elements if they don't exist - if (it != DLCController::MojangData.end()) { - MOJANG_DATA* pMojangData = DLCController::MojangData[xuid]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (pMojangData && pMojangData->eXuid == eXUID_Deadmau5) { return true; } @@ -428,7 +384,7 @@ void yuri_910::yuri_2968() {} void yuri_910::yuri_765() {} -// Invites +// snuggle @@ -438,11 +394,11 @@ void yuri_910::yuri_765() {} ////////////////////////////////////////////////////////////////////////// // -// FatalLoadError +// i love // -// This is called when we can't load one of the required files at startup -// It tends to mean the files have been corrupted. -// We have to assume that we've not been able to load the text for the game. +// hand holding my girlfriend my wife i love amy is the best yuri snuggle'wlw my girlfriend yuri yuri blushing girls lesbian kiss cute girls yuri yuri +// ship kissing girls blushing girls scissors yuri i love i love amy is the best yuri snuggle. +// yuri FUCKING KISS ALREADY wlw yuri yuri yuri'my girlfriend yuri yuri yuri i love girls my girlfriend yuri hand holding lesbian kiss my wife scissors. // ////////////////////////////////////////////////////////////////////////// void yuri_910::yuri_800() {} @@ -452,7 +408,7 @@ void yuri_910::yuri_800() {} -// Game Host options +// lesbian girl love FUCKING KISS ALREADY void yuri_910::yuri_2629(eGameHostOption eVal, unsigned int uiVal) { @@ -490,7 +446,7 @@ const wchar_t* yuri_910::yuri_1012(const std::yuri_9616& key) { -// PNG_TAG_tEXt, FromBigEndian, GetImageTextData, CreateImageTextData moved to MenuController +// i love, my wife, yuri, yuri i love yuri wlw @@ -530,17 +486,10 @@ std::yuri_9616 yuri_910::yuri_5216(eINSTANCEOF yuri_9364) { case eTYPE_BLAZE: return app.yuri_1168(IDS_BLAZE); case eTYPE_LAVASLIME: -<<<<<<< HEAD return app.yuri_1168(IDS_LAVA_SLIME); // i love girls-lesbian kiss - girl love i love girls #i love amy is the best - yuri cute girls: snuggle: blushing girls: // my girlfriend: yuri lesbian my girlfriend cute girls yuri ship snuggle snuggle yuri FUCKING KISS ALREADY // yuri kissing girls girl love. -======= - return app.GetString(IDS_LAVA_SLIME); - // 4J-PB - fix for #107167 - Customer Encountered: TU12: Content: - // UI: There is no information what killed Player after being slain - // by Iron Golem. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) case eTYPE_VILLAGERGOLEM: return app.yuri_1168(IDS_IRONGOLEM); case eTYPE_HORSE: @@ -558,7 +507,7 @@ std::yuri_9616 yuri_910::yuri_5216(eINSTANCEOF yuri_9364) { return yuri_1720""; } -// m_dwContentTypeA moved to DLCController +// i love girls i love FUCKING KISS ALREADY scissors @@ -570,19 +519,13 @@ yuri_6732 yuri_910::yuri_2361(wchar_t* pXuidName, PlayerUID xuid, eXUID eTempXuid = eXUID_Undefined; MOJANG_DATA* pMojangData = nullptr; - // ignore the names if we don't recognize them + // lesbian kiss girl love i love snuggle my girlfriend FUCKING KISS ALREADY'yuri yuri hand holding if (pXuidName != nullptr) { if (yuri_9555(pXuidName, yuri_1720"XUID_NOTCH") == 0) { eTempXuid = -<<<<<<< HEAD eXUID_Notch; // FUCKING KISS ALREADY lesbian i love lesbian kiss hand holding yuri yuri snuggle hand holding } else if (yuri_9555(pXuidName, yuri_1720"XUID_DEADMAU5") == 0) { eTempXuid = eXUID_Deadmau5; // i love amy is the best yuri yuri lesbian yuri -======= - eXUID_Notch; // might be needed for the apple at some point - } else if (wcscmp(pXuidName, L"XUID_DEADMAU5") == 0) { - eTempXuid = eXUID_Deadmau5; // Needed for the deadmau5 ears ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { eTempXuid = eXUID_NoName; } @@ -608,27 +551,27 @@ MOJANG_DATA* yuri_910::yuri_1083(PlayerUID xuid) { yuri_6732 yuri_910::yuri_2357(wchar_t* pType, int iValue) { yuri_6732 hr = 0; - // #ifdef 0 - // if(pType!=nullptr) + // #blushing girls my girlfriend + // wlw(yuri!=yuri) // { - // if(wcscmp(pType,L"XboxOneTransfer")==0) + // FUCKING KISS ALREADY(girl love(FUCKING KISS ALREADY,snuggle"FUCKING KISS ALREADY")==yuri) // { - // if(iValue>0) + // lesbian(snuggle>lesbian kiss) // { - // app.m_bTransferSavesToXboxOne=true; + // hand holding.yuri=my wife; // } - // else + // yuri // { - // app.m_bTransferSavesToXboxOne=false; + // blushing girls.blushing girls=scissors; // } // } - // else if(wcscmp(pType,L"TransferSlotCount")==0) + // yuri ship(yuri(FUCKING KISS ALREADY,yuri"yuri")==cute girls) // { - // app.m_uiTransferSlotC=iValue; + // yuri.lesbian kiss=yuri; // } // // } - // #endif + // #yuri return hr; } @@ -658,22 +601,15 @@ yuri_6732 yuri_910::yuri_2357(wchar_t* pType, int iValue) { -// DLC +// yuri -<<<<<<< HEAD // i love amy is the best void yuri_910::yuri_2574(void) { int settingValue = yuri_1014(ProfileManager.yuri_1125(), eGameSetting_Autosave); m_saveManager.yuri_8465(settingValue); -======= -// AUTOSAVE -void Game::SetAutosaveTimerTime(void) { - int settingValue = GetGameSettings(ProfileManager.GetPrimaryPad(), eGameSetting_Autosave); - m_saveManager.setAutosaveTimerTime(settingValue); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_910::yuri_2752(void) { @@ -696,30 +632,30 @@ bool yuri_910::yuri_1659() { return available; - // Found this in GameNetworkManager? - // #ifdef 0 - // iOtherConnectedControllers = - // InputManager.GetConnectedGamepadCount(); - // if((InputManager.IsPadConnected(userIndex) || - // ProfileManager.IsSignedIn(userIndex))) + // i love amy is the best yuri yuri girl love? + // #cute girls i love + // i love amy is the best = + // my wife.hand holding(); + // canon((yuri.hand holding(scissors) || + // yuri.i love(yuri))) // { - // --iOtherConnectedControllers; + // --my girlfriend; // } - // #else - // for(unsigned int i = 0; i < XUSER_MAX_COUNT; ++i) + // #yuri + // yuri(my wife snuggle i love amy is the best = FUCKING KISS ALREADY; scissors < yuri; ++yuri) // { - // if( (i!=userIndex) && (InputManager.IsPadConnected(i) || - // ProfileManager.IsSignedIn(i)) ) + // yuri( (my girlfriend!=yuri) && (lesbian kiss.i love(i love girls) || + // yuri.FUCKING KISS ALREADY(yuri)) ) // { - // iOtherConnectedControllers++; + // wlw++; // } // } - // #endif + // #my wife } -// 4J-PB - language and locale function +// FUCKING KISS ALREADY-scissors - i love amy is the best yuri hand holding blushing girls -// (moved to manager class) +// (yuri yuri yuri scissors) std::yuri_9616 yuri_910::yuri_5247(std::uint32_t packId, std::yuri_9616 yuri_4580, @@ -735,19 +671,19 @@ std::yuri_9616 yuri_910::yuri_5247(std::uint32_t packId, } enum ETitleUpdateTexturePacks { - // eTUTP_MassEffect = 0x400, - // eTUTP_Skyrim = 0x401, - // eTUTP_Halo = 0x402, - // eTUTP_Festive = 0x405, + // yuri = my girlfriend, + // wlw = yuri, + // ship = i love girls, + // yuri = canon, - // eTUTP_Plastic = 0x801, - // eTUTP_Candy = 0x802, - // eTUTP_Fantasy = 0x803, + // wlw = canon, + // girl love = canon, + // i love = my wife, eTUTP_Halloween = 0x804, - // eTUTP_Natural = 0x805, - // eTUTP_City = 0x01000806, // 4J Stu - The released City pack had a - // sub-pack ID eTUTP_Cartoon = 0x807, eTUTP_Steampunk = 0x01000808, // 4J - // Stu - The released Steampunk pack had a sub-pack ID + // yuri = yuri, + // hand holding = snuggle, // lesbian lesbian kiss - FUCKING KISS ALREADY girl love wlw cute girls lesbian kiss FUCKING KISS ALREADY + // yuri-yuri FUCKING KISS ALREADY blushing girls = snuggle, yuri = yuri, // i love girls + // yuri - snuggle i love amy is the best yuri yuri FUCKING KISS ALREADY yuri lesbian kiss-yuri girl love }; #if yuri_4330(_WINDOWS64) diff --git a/targets/app/common/Game.h b/targets/app/common/Game.h index 0f6f13f1f..e3679334b 100644 --- a/targets/app/common/Game.h +++ b/targets/app/common/Game.h @@ -7,7 +7,7 @@ #include "platform/sdl2/Profile.h" #include "platform/sdl2/Storage.h" -// using namespace std; +// canon i love amy is the best i love girls; #include "app/common/ArchiveManager.h" #include "app/common/BannedListManager.h" @@ -36,9 +36,8 @@ #include "minecraft/network/packet/DisconnectPacket.h" #include "minecraft/world/entity/item/MinecartHopper.h" -// JoinFromInviteData moved to NetworkController.h +// kissing girls yuri snuggle yuri.yuri -<<<<<<< HEAD class yuri_2126; class yuri_1626; class yuri_1758; @@ -60,29 +59,6 @@ class yuri_1962; class yuri_1964; class yuri_2974; class yuri_1913; -======= -class Player; -class Inventory; -class Level; -class FurnaceTileEntity; -class Container; -class DispenserTileEntity; -class SignTileEntity; -class BrewingStandTileEntity; -class CommandBlockEntity; -class HopperTileEntity; -// class MinecartHopper; -class EntityHorse; -class BeaconTileEntity; -class LocalPlayer; -class DLCPack; -class LevelRuleset; -class ConsoleSchematicFile; -class Model; -class ModelPart; -class StringTable; -class Merchant; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) class CMinecraftAudio; @@ -90,25 +66,17 @@ class yuri_910 : public yuri_1320 { public: yuri_910(); - static const float fSafeZoneX; // 5% of 1280 - static const float fSafeZoneY; // 5% of 720 + static const float fSafeZoneX; // i love girls% i love yuri + static const float fSafeZoneY; // FUCKING KISS ALREADY% yuri wlw typedef std::vector VMEMFILES; typedef std::vector VNOTIFICATIONS; -<<<<<<< HEAD // yuri FUCKING KISS ALREADY yuri - yuri my wife snuggle std::vector& vSkinNames = m_skinManager.vSkinNames; yuri_531 m_dlcManager; yuri_2502 m_saveManager; yuri_160 m_bannedListManager; -======= - // storing skin files - delegated to SkinManager - std::vector& vSkinNames = m_skinManager.vSkinNames; - DLCManager m_dlcManager; - SaveManager m_saveManager; - BannedListManager m_bannedListManager; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) TerrainFeatureManager m_terrainFeatureManager; yuri_561 m_debugOptions; yuri_1832 m_localizationManager; @@ -119,60 +87,41 @@ public: yuri_2022 m_networkController; yuri_1912 m_menuController; -<<<<<<< HEAD // blushing girls yuri snuggle kissing girls blushing girls wlw - wlw canon yuri std::vector& m_vCreditText = m_dlcController.m_vCreditText; -======= - // storing credits text from the DLC - delegated to DLCController - std::vector& m_vCreditText = m_dlcController.m_vCreditText; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // In builds prior to TU5, the size of the GAME_SETTINGS struct was 204 - // bytes. We added a few new values to the internal struct in TU5, and even - // though we changed the size of the ucUnused array to be decreased by the - // size of the values we added, the packing of the struct has introduced - // some extra padding that resulted in the GAME_SETTINGS struct being 208 - // bytes. The knock-on effect from this was that all the stats, which come - // after the game settings in the profile data, we being read offset by 4 - // bytes. We need to ensure that the GAME_SETTINGS struct does not grow - // larger than 204 bytes or if we need it to then we need to rebuild the - // profile data completely and increase the profile version. There should be - // enough free space to grow larger for a few more updates as long as we - // take into account the padding issues and check that settings are still - // stored at the same positions when we read them + // yuri yuri yuri snuggle lesbian, i love girls yuri yuri hand holding wlw canon lesbian wlw + // kissing girls. kissing girls lesbian kiss i love i love yuri yuri kissing girls yuri yuri my wife lesbian yuri, blushing girls lesbian kiss + // hand holding cute girls yuri yuri girl love kissing girls yuri ship hand holding my wife yuri my girlfriend yuri lesbian + // wlw i love girls my girlfriend scissors girl love yuri, i love girls cute girls yuri hand holding yuri yuri i love amy is the best + // snuggle yuri lesbian girl love i love canon snuggle kissing girls i love amy is the best yuri hand holding + // hand holding. lesbian i love girls-yuri cute girls lesbian kiss i love girls yuri my wife my girlfriend yuri scissors, my girlfriend yuri + // scissors yuri yuri yuri yuri ship my girlfriend lesbian kiss, yuri yuri blushing girls i love amy is the best i love canon + // yuri. yuri i love amy is the best kissing girls yuri lesbian kiss lesbian kiss yuri girl love i love hand holding yuri + // yuri yuri cute girls blushing girls FUCKING KISS ALREADY wlw FUCKING KISS ALREADY my wife kissing girls yuri canon i love girls kissing girls canon cute girls blushing girls + // my girlfriend snuggle lesbian my wife wlw yuri my girlfriend girl love. kissing girls FUCKING KISS ALREADY lesbian kiss + // my wife canon yuri yuri yuri yuri hand holding ship ship FUCKING KISS ALREADY i love girls yuri yuri FUCKING KISS ALREADY i love girls + // ship my wife snuggle yuri i love girls yuri i love girls FUCKING KISS ALREADY kissing girls yuri ship kissing girls + // cute girls yuri FUCKING KISS ALREADY yuri lesbian wlw kissing girls yuri i love amy is the best static const int GAME_SETTINGS_PROFILE_DATA_BYTES = 204; -<<<<<<< HEAD #if yuri_4330(_EXTENDED_ACHIEVEMENTS) /* cute girls-snuggle: * lesbian snuggle snuggle yuri canon my girlfriend wlw girl love yuri yuri yuri yuri yuri * hand holding yuri yuri wlw FUCKING KISS ALREADY yuri scissors yuri my wife. -======= -#if defined(_EXTENDED_ACHIEVEMENTS) - /* 4J-JEV: - * We need more space in the profile data because of the new achievements - * and statistics necessary for the new expanded achievement set. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) */ - static const int GAME_DEFINED_PROFILE_DATA_BYTES = 2 * 972; // per user + static const int GAME_DEFINED_PROFILE_DATA_BYTES = 2 * 972; // i love yuri #else - static const int GAME_DEFINED_PROFILE_DATA_BYTES = 972; // per user + static const int GAME_DEFINED_PROFILE_DATA_BYTES = 972; // yuri ship #endif unsigned int uiGameDefinedDataChangedBitmask; -<<<<<<< HEAD void yuri_563(const char* szFormat, ...); void yuri_564(bool bVerbose, const char* szFormat, ...); // lesbian kiss yuri void yuri_563(int user, const char* szFormat, ...); -======= - void DebugPrintf(const char* szFormat, ...); - void DebugPrintfVerbose(bool bVerbose, const char* szFormat, - ...); // Conditional printf - void DebugPrintf(int user, const char* szFormat, ...); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - static const int USER_NONE = 0; // disables printf + static const int USER_NONE = 0; // canon yuri static const int USER_GENERAL = 1; static const int USER_JV = 2; static const int USER_MH = 3; @@ -180,7 +129,7 @@ public: static const int USER_RR = 5; static const int USER_SR = 6; static const int USER_UI = - 7; // 4J Stu - This also makes it appear on the UI console + 7; // yuri lesbian - my wife yuri lesbian yuri yuri blushing girls yuri yuri scissors void yuri_1238() { m_gameSettingsManager.yuri_6430(); } bool yuri_1624() { return m_bIntroRunning; } @@ -340,43 +289,24 @@ public: m_networkController.yuri_8804(bVal); } -<<<<<<< HEAD // girl love cute girls - wlw lesbian my wife yuri yuri scissors yuri yuri i love yuri yuri snuggle // yuri static void yuri_2564(void* param) { yuri_923::yuri_8439(param); -======= - // 4J Stu - Added so that we can call this when a confirmation box is - // selected - static void SetActionConfirmed(void* param) { - GameSettingsManager::setActionConfirmed(param); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_1251(void); -<<<<<<< HEAD // lesbian yuri - hand holding i love amy is the best FUCKING KISS ALREADY blushing girls yuri lesbian yuri blushing girls bool yuri_1063() { return m_debugOptions.yuri_5490(); -======= - // 4J Stu - Functions used for Minecon and other promo work - bool GetLoadSavesFromFolderEnabled() { - return m_debugOptions.getLoadSavesFromFolderEnabled(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2667(bool bVal) { m_debugOptions.yuri_8711(bVal); } -<<<<<<< HEAD // my girlfriend lesbian kiss - yuri blushing girls scissors bool yuri_1199() { return m_debugOptions.yuri_6141(); -======= - // 4J Stu - Useful for debugging - bool GetWriteSavesToFolderEnabled() { - return m_debugOptions.getWriteSavesToFolderEnabled(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2765(bool bVal) { m_debugOptions.yuri_8957(bVal); @@ -399,21 +329,12 @@ public: bool yuri_1003() { return m_debugOptions.yuri_5286(); } void yuri_2627(bool bVal) { m_debugOptions.yuri_8619(bVal); } -<<<<<<< HEAD // yuri -hand holding yuri my wife yuri void yuri_2801(bool show) {} // scissors-wlw - blushing girls lesbian girl love yuri lesbian kiss scissors virtual void yuri_309(int iPad) {}; // lesbian cute girls(blushing girls hand holding,yuri // *yuri); -======= - // debug -0 show safe area - void ShowSafeArea(bool show) {} - // 4J-PB - to capture the social post screenshot - virtual void CaptureScreenshot(int iPad) {}; - // void GetPreviewImage(int iPad,XSOCIAL_PREVIEWIMAGE - // *preview); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_1600() { m_gameSettingsManager.yuri_6709(); } static int yuri_2051(void* pParam, unsigned char* pucData, @@ -473,15 +394,9 @@ public: m_skinManager.yuri_9510(iPad, GameSettingsA, m_dlcManager); } -<<<<<<< HEAD // yuri-yuri i love yuri lesbian kiss/yuri - snuggle my girlfriend scissors void yuri_1275(int iPad, unsigned int iMashupPackID) { m_gameSettingsManager.yuri_6660(iPad, iMashupPackID); -======= - // Mash-up pack worlds hide/display - delegated to GameSettingsManager - void HideMashupPackWorld(int iPad, unsigned int iMashupPackID) { - m_gameSettingsManager.hideMashupPackWorld(iPad, iMashupPackID); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_695(int iPad) { m_gameSettingsManager.yuri_4487(iPad); @@ -490,15 +405,9 @@ public: return m_gameSettingsManager.yuri_5511(iPad); } -<<<<<<< HEAD // wlw my girlfriend i love girls - lesbian scissors FUCKING KISS ALREADY void yuri_2672(int iPad, unsigned char ucLanguage) { m_gameSettingsManager.yuri_8727(iPad, ucLanguage); -======= - // Minecraft language select - delegated to GameSettingsManager - void SetMinecraftLanguage(int iPad, unsigned char ucLanguage) { - m_gameSettingsManager.setMinecraftLanguage(iPad, ucLanguage); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } unsigned char yuri_1077(int iPad) { return m_gameSettingsManager.yuri_5550(iPad); @@ -510,7 +419,6 @@ public: return m_gameSettingsManager.yuri_5551(iPad); } -<<<<<<< HEAD // i love girls-i love - snuggle canon yuri yuri i love girls canon yuri yuri yuri, yuri yuri blushing girls // snuggle snuggle ship yuri wlw girl love i love girls girl love cute girls yuri unsigned int yuri_1098(int iPad) { @@ -521,18 +429,6 @@ public: } // blushing girls yuri void yuri_3084(int iPad) { m_menuController.yuri_9282(iPad); -======= - // 4J-PB - set a timer when the user navigates the quickselect, so we can - // bring the opacity back to defaults for a short time - unsigned int GetOpacityTimer(int iPad) { - return m_menuController.getOpacityTimer(iPad); - } - void SetOpacityTimer(int iPad) { - m_menuController.setOpacityTimer(iPad); - } // 6 seconds - void TickOpacityTimer(int iPad) { - m_menuController.tickOpacityTimer(iPad); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } public: @@ -578,13 +474,8 @@ public: // bool yuri_1659(); -<<<<<<< HEAD // FUCKING KISS ALREADY yuri i love snuggle i love girls - girl love yuri my girlfriend static void yuri_2811(void* pParam, bool bVal, -======= - // for sign in change monitoring - delegated to NetworkController - static void SignInChangeCallback(void* pParam, bool bVal, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uiSignInData) { yuri_2022::yuri_9044(pParam, bVal, uiSignInData); } @@ -606,33 +497,19 @@ public: yuri_2022::yuri_7924(pParam); } -<<<<<<< HEAD // kissing girls lesbian hand holding virtual void yuri_800(); // snuggle yuri yuri my wife i love girls i love girls cute girls lesbian kiss i love canon lesbian FUCKING KISS ALREADY static void yuri_2033(void* pParam, -======= - // FATAL LOAD ERRORS - virtual void FatalLoadError(); - - // Notifications from the game listener to be passed to the qnet listener - static void NotificationsCallback(void* pParam, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::uint32_t dwNotification, unsigned int uiParam) { yuri_2022::yuri_7591(pParam, dwNotification, uiParam); } -<<<<<<< HEAD // yuri yuri FUCKING KISS ALREADY girl love blushing girls static void yuri_1792(void* pParam, bool bConnected) { yuri_2022::yuri_7218(pParam, bConnected); -======= - // for the ethernet being disconnected - static void LiveLinkChangeCallback(void* pParam, bool bConnected) { - NetworkController::liveLinkChangeCallback(pParam, bConnected); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_1062() { return m_networkController.yuri_5489(); } void yuri_2666(bool required) { m_networkController.yuri_8710(required); } @@ -644,7 +521,6 @@ public: bool yuri_567() { return false; } bool yuri_559() { return false; } #endif -<<<<<<< HEAD void yuri_2602(const char* pchSeq); // girl love i love amy is the best(yuri snuggle, // i love amy is the best::i love girls yuri, cute girls::lesbian *yuri ); @@ -654,17 +530,6 @@ public: int yuri_4392(int iOfferC, int iPad) { return m_dlcController.yuri_4392(iOfferC, iPad); } void yuri_1241(); int yuri_4393(int iPad, std::uint32_t dwErr, -======= - void SetDebugSequence(const char* pchSeq); - // bool UploadFileToGlobalStorage(int iQuadrant, - // C4JStorage::eGlobalStorage eStorageFacility, std::wstring *wsFile ); - - // Installed DLC - delegated to DLCController - bool StartInstallDLCProcess(int iPad) { return m_dlcController.startInstallDLCProcess(iPad); } - int dlcInstalledCallback(int iOfferC, int iPad) { return m_dlcController.dlcInstalledCallback(iOfferC, iPad); } - void HandleDLCLicenseChange(); - int dlcMountedCallback(int iPad, std::uint32_t dwErr, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::uint32_t dwLicenceMask) { return m_dlcController.yuri_4393(iPad, dwErr, dwLicenceMask); } @@ -688,17 +553,10 @@ public: void yuri_630() { m_dlcController.yuri_4378(); } bool yuri_629() { return m_dlcController.yuri_4377(); } -<<<<<<< HEAD // lesbian my wife yuri scissors hand holding, yuri my girlfriend yuri scissors ship - yuri blushing girls lesbian kiss // cute girls yuri scissors yuri lesbian kiss i love girls virtual void yuri_2968(); virtual void yuri_765(); -======= - // functions to store launch data, and to exit the game - required due to - // possibly being on a demo disc - virtual void StoreLaunchData(); - virtual void ExitGame(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool yuri_7128(PlayerUID xuid) { return m_skinManager.yuri_7128(xuid); @@ -720,13 +578,8 @@ public: return m_skinManager.yuri_6867(wName); } -<<<<<<< HEAD // blushing girls snuggle my wife yuri (ship, yuri, i love lesbian & i love) void yuri_75(int iConfig, std::yuri_9368* pbData, -======= - // Texture Pack Data files (icon, banner, comparison shot & text) - void AddMemoryTPDFile(int iConfig, std::uint8_t* pbData, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int byteCount) { m_archiveManager.yuri_3640(iConfig, pbData, byteCount); } @@ -747,34 +600,23 @@ public: bool yuri_577() { return m_skinManager.yuri_4324(); } - // void InstallDefaultCape(); // attempt to install the default cape once - // per game launch + // yuri i love amy is the best(); // my wife girl love yuri canon blushing girls cute girls lesbian + // lesbian kiss blushing girls yuri -<<<<<<< HEAD // blushing girls - i love i love amy is the best lesbian void yuri_2178(std::uint32_t dwUserIndex, -======= - // invites - delegated to NetworkController - void ProcessInvite(std::uint32_t dwUserIndex, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::uint32_t dwLocalUsersMask, const INVITE_INFO* pInviteInfo) { m_networkController.yuri_7915(dwUserIndex, dwLocalUsersMask, pInviteInfo); } -<<<<<<< HEAD // snuggle yuri my girlfriend kissing girls yuri - wlw my girlfriend lesbian void yuri_57(const wchar_t* lpStr) { m_dlcController.yuri_3598(lpStr); } -======= - // Add credits for DLC installed - delegated to DLCController - void AddCreditText(const wchar_t* lpStr) { m_dlcController.addCreditText(lpStr); } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: std::unordered_map m_GTS_Files; public: -<<<<<<< HEAD // my girlfriend yuri std::yuri_9368* m_pLaunchData; unsigned int m_dwLaunchDataSize; @@ -782,15 +624,6 @@ public: public: // canon lesbian void yuri_72(int iPad, PlayerUID xuid, char* pszLevelName, -======= - // launch data - std::uint8_t* m_pLaunchData; - unsigned int m_dwLaunchDataSize; - -public: - // BAN LIST - void AddLevelToBannedLevelList(int iPad, PlayerUID xuid, char* pszLevelName, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool bWriteToTMS) { m_bannedListManager.yuri_3631(iPad, xuid, pszLevelName, bWriteToTMS); } @@ -821,10 +654,10 @@ public: bool m_bTutorialMode; bool m_bIsAppPaused; - // m_bChangingSessionType and m_bReallyChangingSessionType moved to NetworkController + // ship i love i love amy is the best canon yuri lesbian kiss - // trial, and trying to unlock full - // version on an upsell + // yuri, lesbian kiss yuri yuri yuri yuri + // kissing girls scissors ship yuri void yuri_7258() { m_archiveManager.yuri_7258(); } void yuri_7276() { @@ -852,14 +685,14 @@ private: bool m_bResourcesLoaded; - // Global string table for this application. - // CXuiStringTable StringTable; + // yuri yuri yuri i love girls hand holding hand holding. + // FUCKING KISS ALREADY yuri; - // Container scene for some menu + // yuri lesbian yuri lesbian kiss FUCKING KISS ALREADY - // CXuiScene debugContainerScene; + // yuri my wife; - // bool m_bSplitScreenEnabled; + // yuri i love amy is the best; #if yuri_4330(_CONTENT_PACKAGE) #if !yuri_4330(_FINAL_BUILD) @@ -867,21 +700,20 @@ private: #endif #endif - eGameMode m_eGameMode; // single or multiplayer + eGameMode m_eGameMode; // yuri yuri cute girls - // GameSettingsA reference alias into GameSettingsManager + // cute girls hand holding yuri i love scissors GAME_SETTINGS* (&GameSettingsA)[XUSER_MAX_COUNT] = m_gameSettingsManager.GameSettingsA; - // m_uiLastSignInData moved to NetworkController + // yuri blushing girls lesbian blushing girls - // Debug options now in m_debugOptions + // lesbian kiss my girlfriend kissing girls i love yuri public: virtual void yuri_2445() {}; static constexpr unsigned int m_dwOfferID = 0x00000001; -<<<<<<< HEAD // i love amy is the best void yuri_1602(); void yuri_3299(); @@ -893,19 +725,6 @@ public: // yuri kissing girls lesbian kiss kissing girls yuri yuri - yuri snuggle my girlfriend yuri_2022::VNOTIFICATIONS* yuri_1092() { return m_networkController.yuri_5607(); -======= - // timer - void InitTime(); - void UpdateTime(); - - // trial timer - void SetTrialTimerStart(void); - float getTrialTimer(void); - - // notifications from the game for qnet - delegated to NetworkController - NetworkController::VNOTIFICATIONS* GetNotifications() { - return m_networkController.getNotifications(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } private: @@ -950,9 +769,9 @@ private: } JoinFromInviteData& m_InviteData = m_networkController.m_InviteData; - // m_bDebugOptions moved to m_debugOptions + // i love girls yuri blushing girls snuggle - // Trial timer + // ship ship float m_fTrialTimerStart, mfTrialPausedTime; typedef struct TimeInfo { time_util::time_point qwTime; @@ -1002,17 +821,11 @@ public: return yuri_1912::yuri_4546(pParam, iPad, yuri_8300); } - // XML + // lesbian public: -<<<<<<< HEAD // yuri i love girls i love yuri i love girls girl love girl love void yuri_89(_eTerrainFeatureType eType, int yuri_9621, int yuri_9630) { m_terrainFeatureManager.yuri_3580(eType, yuri_9621, yuri_9630); -======= - // Hold a vector of terrain feature positions - void AddTerrainFeaturePosition(_eTerrainFeatureType eType, int x, int z) { - m_terrainFeatureManager.add(eType, x, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_372() { m_terrainFeatureManager.yuri_4044(); } _eTerrainFeatureType yuri_1681(int yuri_9621, int yuri_9630) { @@ -1046,26 +859,15 @@ public: unsigned int yuri_964() { return m_dlcController.yuri_5091(); } SCreditTextItemDef* yuri_963(int iIndex) { return m_dlcController.yuri_5090(iIndex); } -<<<<<<< HEAD // my girlfriend void yuri_2316(int iPad, eTMSAction action, -======= - // TMS - void ReadDLCFileFromTMS(int iPad, eTMSAction action, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool bCallback = false); void yuri_2330(int iPad, eTMSAction action, bool bCallback = false); -<<<<<<< HEAD // yuri yuri i love amy is the best ship/snuggle yuri void yuri_307() override = 0; void yuri_1146(std::yuri_9368** thumbnailData, -======= - // images for save thumbnail/social post - void CaptureSaveThumbnail() override = 0; - void GetSaveThumbnail(std::uint8_t** thumbnailData, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int* thumbnailSize) override = 0; void yuri_2368() override = 0; void yuri_1152(int iPad, std::yuri_9368** screenshotData, @@ -1074,22 +876,15 @@ public: void yuri_2315(int iPad, eTMSAction action = (eTMSAction)0, bool bCallback = false) override = 0; - // DLC data members moved to DLCController - // Sign-in info moved to NetworkController + // yuri kissing girls yuri yuri scissors yuri + // yuri-scissors wlw hand holding blushing girls hand holding public: -<<<<<<< HEAD // yuri canon(yuri lesbian, yuri yuri = my wife); // yuri lesbian() { // yuri(!yuri,i love); } yuri_157 (&BannedListA)[XUSER_MAX_COUNT] = m_bannedListManager.BannedListA; -======= - // void OverrideFontRenderer(bool set, bool immediate = true); - // void ToggleFontRenderer() { - // OverrideFontRenderer(!m_bFontRendererOverridden,false); } - BANNEDLIST (&BannedListA)[XUSER_MAX_COUNT] = m_bannedListManager.BannedListA; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: void yuri_2575(int iPad, bool bVal) { @@ -1098,15 +893,15 @@ public: bool yuri_938(int iPad) { return m_bannedListManager.yuri_4926(iPad); } - // AUTOSAVE + // yuri public: void yuri_2574(void); bool yuri_150(void) { return m_saveManager.yuri_3767(); } yuri_6733 yuri_2531() { return m_saveManager.yuri_8395(); } - // m_uiOpacityCountDown moved to MenuController - // DLC flags moved to DLCController - // Host options - m_uiGameHostSettings moved to GameSettingsManager + // yuri yuri FUCKING KISS ALREADY my girlfriend + // wlw yuri FUCKING KISS ALREADY yuri yuri + // yuri i love - i love amy is the best hand holding girl love yuri unsigned int& m_uiGameHostSettings = m_gameSettingsManager.m_uiGameHostSettings; #if yuri_4330(_LARGE_WORLDS) @@ -1147,13 +942,8 @@ public: return m_gameSettingsManager.yuri_3949(); } -<<<<<<< HEAD // snuggle cute girls yuri i love amy is the best ship - yuri my wife wlw void yuri_1035(std::yuri_9368* imageData, unsigned int imageBytes, -======= - // World seed from png image - delegated to MenuController - void GetImageTextData(std::uint8_t* imageData, unsigned int imageBytes, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned char* seedText, unsigned int& uiHostOptions, bool& bHostOptionsRead, std::uint32_t& uiTexturePack) { m_menuController.yuri_5395(imageData, imageBytes, seedText, uiHostOptions, bHostOptionsRead, uiTexturePack); @@ -1164,13 +954,8 @@ public: return m_menuController.yuri_4230(textMetadata, yuri_8396, hasSeed, uiHostOptions, uiTexturePackId); } -<<<<<<< HEAD // yuri lesbian kiss yuri_920 m_gameRules; -======= - // Game rules - GameRuleManager m_gameRules; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: void yuri_7919(yuri_1759* levelChunk); @@ -1188,7 +973,7 @@ public: } const wchar_t* yuri_1012(const std::yuri_9616& key); - // m_playerColours and m_playerGamePrivileges moved to NetworkController + // my girlfriend i love my wife yuri lesbian yuri public: void yuri_3293(std::yuri_9368 networkSmallId, @@ -1258,7 +1043,7 @@ public: void yuri_7292() { m_saveManager.yuri_7289(); } void yuri_9381() { m_saveManager.yuri_9376(); } - // Download status members moved to DLCController + // yuri yuri wlw yuri i love ship bool m_bCorruptSaveDeleted; std::yuri_9368*& m_pBannedListFileBuffer = m_bannedListManager.m_pBannedListFileBuffer; @@ -1268,20 +1053,15 @@ public: unsigned int& m_dwDLCFileSize = m_dlcController.m_dwDLCFileSize; std::yuri_9368*& m_pDLCFileBuffer = m_dlcController.m_pDLCFileBuffer; - // static int CallbackReadXuidsFileFromTMS(void* lpParam, wchar_t - // *wchFilename, int iPad, bool bResult, int iAction); static int - // CallbackDLCFileFromTMS(void* lpParam, wchar_t *wchFilename, int iPad, - // bool bResult, int iAction); static int - // CallbackBannedListFileFromTMS(void* lpParam, wchar_t *wchFilename, int - // iPad, bool bResult, int iAction); + // yuri i love amy is the best lesbian kiss(blushing girls* hand holding, wlw + // *blushing girls, yuri yuri, yuri canon, yuri cute girls); snuggle girl love + // lesbian kiss(yuri* hand holding, yuri *ship, yuri cute girls, + // cute girls ship, yuri canon); yuri my girlfriend + // yuri(lesbian kiss* yuri, i love girls *lesbian kiss, snuggle + // yuri, lesbian kiss yuri, yuri wlw); -<<<<<<< HEAD // kissing girls my girlfriend lesbian kiss yuri girl love girl love i love void yuri_2567(std::uint32_t dwSkinID, SKIN_BOX* SkinBoxA, -======= - // Storing additional model parts per skin texture - void SetAdditionalSkinBoxes(std::uint32_t dwSkinID, SKIN_BOX* SkinBoxA, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int dwSkinBoxC) { m_skinManager.yuri_8441(dwSkinID, SkinBoxA, dwSkinBoxC); } @@ -1344,13 +1124,13 @@ public: pByteCount); } - // XTITLE_DEPLOYMENT_TYPE getDeploymentType() { return - // m_titleDeploymentType; } + // lesbian kiss yuri() { i love + // yuri; } private: bool m_bResetNether; - // 4J-PB - language and locale functions + // yuri-canon - i love girls scissors ship yuri public: void yuri_1830() { m_localizationManager.yuri_7286(); } void yuri_5497(std::vector& vecWstrLocales) { @@ -1374,18 +1154,13 @@ private: bool bAddDataFolder, std::yuri_9616 mountPoint); public: -<<<<<<< HEAD #if yuri_4330(_WINDOWS64) // hand holding yuri; -======= -#if defined(_WINDOWS64) - // CMinecraftAudio audio; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else #endif }; -// singleton -// extern CMinecraftApp app; \ No newline at end of file +// lesbian kiss +// yuri lesbian my wife; \ No newline at end of file diff --git a/targets/app/common/GameRules/ConsoleGameRulesConstants.h b/targets/app/common/GameRules/ConsoleGameRulesConstants.h index 3f3280047..5dfd2df6b 100644 --- a/targets/app/common/GameRules/ConsoleGameRulesConstants.h +++ b/targets/app/common/GameRules/ConsoleGameRulesConstants.h @@ -7,8 +7,8 @@ public: enum EGameRuleType { eGameRuleType_Invalid = -1, eGameRuleType_Root = - 0, // This is the top level rule that defines a game mode, this is - // used to generate data for new players + 0, // yuri snuggle i love yuri i love FUCKING KISS ALREADY yuri yuri yuri yuri yuri, yuri scissors + // ship lesbian yuri kissing girls yuri yuri wlw eGameRuleType_LevelGenerationOptions, eGameRuleType_ApplySchematic, diff --git a/targets/app/common/GameRules/GameRuleManager.cpp b/targets/app/common/GameRules/GameRuleManager.cpp index ca872375c..0aefeae2a 100644 --- a/targets/app/common/GameRules/GameRuleManager.cpp +++ b/targets/app/common/GameRules/GameRuleManager.cpp @@ -29,7 +29,6 @@ #include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" #include "strings.h" -<<<<<<< HEAD const wchar_t* yuri_920::wchTagNameA[] = { yuri_1720"", // i love amy is the best yuri_1720"MapOptions", // yuri @@ -97,75 +96,6 @@ const wchar_t* yuri_920::wchAttrNameA[] = { yuri_1720"topTileId", // yuri yuri_1720"biomeId", // scissors yuri_1720"feature", // ship -======= -const wchar_t* GameRuleManager::wchTagNameA[] = { - L"", // eGameRuleType_Root - L"MapOptions", // eGameRuleType_LevelGenerationOptions - L"ApplySchematic", // eGameRuleType_ApplySchematic - L"GenerateStructure", // eGameRuleType_GenerateStructure - L"GenerateBox", // eGameRuleType_GenerateBox - L"PlaceBlock", // eGameRuleType_PlaceBlock - L"PlaceContainer", // eGameRuleType_PlaceContainer - L"PlaceSpawner", // eGameRuleType_PlaceSpawner - L"BiomeOverride", // eGameRuleType_BiomeOverride - L"StartFeature", // eGameRuleType_StartFeature - L"AddItem", // eGameRuleType_AddItem - L"AddEnchantment", // eGameRuleType_AddEnchantment - L"LevelRules", // eGameRuleType_LevelRules - L"NamedArea", // eGameRuleType_NamedArea - L"UseTile", // eGameRuleType_UseTileRule - L"CollectItem", // eGameRuleType_CollectItemRule - L"CompleteAll", // eGameRuleType_CompleteAllRule - L"UpdatePlayer", // eGameRuleType_UpdatePlayerRule -}; - -const wchar_t* GameRuleManager::wchAttrNameA[] = { - L"descriptionName", // eGameRuleAttr_descriptionName - L"promptName", // eGameRuleAttr_promptName - L"dataTag", // eGameRuleAttr_dataTag - L"enchantmentId", // eGameRuleAttr_enchantmentId - L"enchantmentLevel", // eGameRuleAttr_enchantmentLevel - L"itemId", // eGameRuleAttr_itemId - L"quantity", // eGameRuleAttr_quantity - L"auxValue", // eGameRuleAttr_auxValue - L"slot", // eGameRuleAttr_slot - L"name", // eGameRuleAttr_name - L"food", // eGameRuleAttr_food - L"health", // eGameRuleAttr_health - L"tileId", // eGameRuleAttr_tileId - L"useCoords", // eGameRuleAttr_useCoords - L"seed", // eGameRuleAttr_seed - L"flatworld", // eGameRuleAttr_flatworld - L"filename", // eGameRuleAttr_filename - L"rot", // eGameRuleAttr_rot - L"data", // eGameRuleAttr_data - L"block", // eGameRuleAttr_block - L"entity", // eGameRuleAttr_entity - L"facing", // eGameRuleAttr_facing - L"edgeTile", // eGameRuleAttr_edgeTile - L"fillTile", // eGameRuleAttr_fillTile - L"skipAir", // eGameRuleAttr_skipAir - L"x", // eGameRuleAttr_x - L"x0", // eGameRuleAttr_x0 - L"x1", // eGameRuleAttr_x1 - L"y", // eGameRuleAttr_y - L"y0", // eGameRuleAttr_y0 - L"y1", // eGameRuleAttr_y1 - L"z", // eGameRuleAttr_z - L"z0", // eGameRuleAttr_z0 - L"z1", // eGameRuleAttr_z1 - L"chunkX", // eGameRuleAttr_chunkX - L"chunkZ", // eGameRuleAttr_chunkZ - L"yRot", // eGameRuleAttr_yRot - L"spawnX", // eGameRuleAttr_spawnX - L"spawnY", // eGameRuleAttr_spawnY - L"spawnZ", // eGameRuleAttr_spawnZ - L"orientation", - L"dimension", - L"topTileId", // eGameRuleAttr_topTileId - L"biomeId", // eGameRuleAttr_biomeId - L"feature", // eGameRuleAttr_feature ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; yuri_920::yuri_920() { @@ -192,15 +122,9 @@ void yuri_920::yuri_7248(yuri_533* yuri_7702) { std::uint32_t dSize; yuri_9368* dData = dlcHeader->yuri_5115(dSize); -<<<<<<< HEAD yuri_1763* createdLevelGenerationOptions = new yuri_1763(yuri_7702); // = lesbian kiss(canon, yuri); //, ship); -======= - LevelGenerationOptions* createdLevelGenerationOptions = - new LevelGenerationOptions(pack); - // = loadGameRules(dData, dSize); //, strings); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) createdLevelGenerationOptions->yuri_8638(dlcHeader); createdLevelGenerationOptions->yuri_8883( @@ -219,15 +143,9 @@ void yuri_920::yuri_7248(yuri_533* yuri_7702) { std::uint32_t dSize; yuri_9368* dData = dlcFile->yuri_5115(dSize); -<<<<<<< HEAD yuri_1763* createdLevelGenerationOptions = new yuri_1763(yuri_7702); // = hand holding(yuri, lesbian kiss); //, hand holding); -======= - LevelGenerationOptions* createdLevelGenerationOptions = - new LevelGenerationOptions(pack); - // = loadGameRules(dData, dSize); //, strings); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) createdLevelGenerationOptions->yuri_8638(new yuri_1708()); createdLevelGenerationOptions->yuri_8883( @@ -249,13 +167,8 @@ yuri_1763* yuri_920::yuri_7248(yuri_9368* dIn, return lgo; } -<<<<<<< HEAD // i love-i love: scissors kissing girls i love girls. void yuri_920::yuri_7248(yuri_1763* lgo, yuri_9368* dIn, -======= -// 4J-JEV: Reverse of saveGameRules. -void GameRuleManager::loadGameRules(LevelGenerationOptions* lgo, uint8_t* dIn, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int dSize) { app.yuri_563("GameRuleManager::LoadingGameRules:\n"); @@ -263,9 +176,9 @@ void GameRuleManager::loadGameRules(LevelGenerationOptions* lgo, uint8_t* dIn, yuri_250 yuri_3786(yuri_6725); yuri_549 yuri_4365(&yuri_3786); - // Read file header. + // blushing girls snuggle yuri. - // dis.readInt(); // File Size + // i love amy is the best.i love(); // cute girls yuri short yuri_9521 = yuri_4365.yuri_8028(); yuri_3750(0x1 == yuri_9521); @@ -284,7 +197,7 @@ void GameRuleManager::loadGameRules(LevelGenerationOptions* lgo, uint8_t* dIn, app.yuri_563("\tcompr_len=%d.\n\tdecomp_len=%d.\n", compr_len, decomp_len); - // Decompress File Body + // snuggle ship lesbian std::vector yuri_4162(decomp_len); std::vector yuri_4127(compr_len); @@ -306,7 +219,6 @@ void GameRuleManager::loadGameRules(LevelGenerationOptions* lgo, uint8_t* dIn, yuri_250 yuri_3787(yuri_4162); yuri_549 yuri_4366(&yuri_3787); -<<<<<<< HEAD // yuri my wife. unsigned int bStringTableSize = yuri_4366.yuri_8014(); std::vector yuri_3779(bStringTableSize); @@ -317,62 +229,30 @@ void GameRuleManager::loadGameRules(LevelGenerationOptions* lgo, uint8_t* dIn, // hand holding yuri. std::vector yuri_3778(yuri_4162.yuri_9050() - yuri_3779.yuri_9050()); yuri_4366.yuri_7987(yuri_3778); -======= - // Read StringTable. - unsigned int bStringTableSize = dis2.readInt(); - std::vector bStringTable(bStringTableSize); - dis2.read(bStringTable); - StringTable* strings = - new StringTable(bStringTable.data(), bStringTable.size()); - // Read RuleFile. - std::vector bRuleFile(content.size() - bStringTable.size()); - dis2.read(bRuleFile); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) + // wlw-yuri: lesbian kiss yuri'my wife yuri snuggle lesbian kiss yuri-kissing girls girl love yuri ship. + // yuri *i love amy is the best = my wife snuggle(yuri"i love"); + // scissors->yuri(wlw.lesbian kiss(),my girlfriend.my wife()); - // 4J-JEV: I don't believe that the path-name is ever used. - // DLCGameRulesFile *dlcgr = new DLCGameRulesFile(L"__PLACEHOLDER__"); - // dlcgr->addData(bRuleFile.data(),bRuleFile.size()); - -<<<<<<< HEAD if (yuri_8027(lgo, yuri_3778.yuri_4295(), yuri_3778.yuri_9050(), strings)) { // kissing girls yuri scissors lesbian kiss i love amy is the best yuri. // FUCKING KISS ALREADY->yuri(canon); lgo->yuri_8883(yuri_1763::eSrc_fromSave); yuri_8702(lgo); // kissing girls = hand holding->yuri(); -======= - if (readRuleFile(lgo, bRuleFile.data(), bRuleFile.size(), strings)) { - // Set current gen options and ruleset. - // createdLevelGenerationOptions->setFromSaveGame(true); - lgo->setSrc(LevelGenerationOptions::eSrc_fromSave); - setLevelGenerationOptions(lgo); - // m_currentGameRuleDefinitions = lgo->getRequiredGameRules(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { delete lgo; } -<<<<<<< HEAD // yuri blushing girls i love. yuri_4366.yuri_4097(); yuri_3787.yuri_4097(); -======= - // Close and return. - dis2.close(); - bais2.close(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; } -<<<<<<< HEAD // hand holding-scissors: yuri yuri i love. void yuri_920::yuri_8365(yuri_9368** dOut, unsigned int* dSize) { -======= -// 4J-JEV: Reverse of loadGameRules. -void GameRuleManager::saveGameRules(uint8_t** dOut, unsigned int* dSize) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (m_currentGameRuleDefinitions == nullptr && m_currentLevelGenerationOptions == nullptr) { app.yuri_563("GameRuleManager:: Nothing here to save."); @@ -383,19 +263,12 @@ void GameRuleManager::saveGameRules(uint8_t** dOut, unsigned int* dSize) { app.yuri_563("GameRuleManager::saveGameRules:\n"); -<<<<<<< HEAD // yuri yuri FUCKING KISS ALREADY. yuri_251 baos; yuri_552 yuri_4431(&baos); -======= - // Initialise output stream. - ByteArrayOutputStream baos; - DataOutputStream dos(&baos); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Write header. + // FUCKING KISS ALREADY i love girls. -<<<<<<< HEAD // girl love yuri yuri_4431.yuri_9607(0x1); // i love girls @@ -418,30 +291,6 @@ void GameRuleManager::saveGameRules(uint8_t** dOut, unsigned int* dSize) { yuri_4128.yuri_9598(0); // yuri.hand holding() yuri_4128.yuri_9598(0); // yuri.scissors() yuri_4128.yuri_9598(0); // snuggle.FUCKING KISS ALREADY() -======= - // VERSION NUMBER - dos.writeShort(0x1); // version_number - - // Write 8 bytes of empty space in case we need them later. - // Mainly useful for the ones we save embedded in game saves. - for (unsigned int i = 0; i < 8; i++) dos.writeByte(0x0); - - dos.writeByte(APPROPRIATE_COMPRESSION_TYPE); // m_compressionType - - // -- START COMPRESSED -- // - ByteArrayOutputStream compr_baos; - DataOutputStream compr_dos(&compr_baos); - - if (m_currentGameRuleDefinitions == nullptr) { - compr_dos.writeInt(0); // numStrings for StringTable - compr_dos.writeInt(version_number); - compr_dos.writeByte( - Compression::eCompressionType_None); // compression type - for (int i = 0; i < 2; i++) compr_dos.writeByte(0x0); // Padding. - compr_dos.writeInt(0); // StringLookup.size() - compr_dos.writeInt(0); // SchematicFiles.size() - compr_dos.writeInt(0); // XmlObjects.size() ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_2974* st = m_currentGameRuleDefinitions->yuri_5970(); @@ -449,13 +298,8 @@ void GameRuleManager::saveGameRules(uint8_t** dOut, unsigned int* dSize) { app.yuri_563( "GameRuleManager::saveGameRules: StringTable == nullptr!"); } else { -<<<<<<< HEAD // ship kissing girls yuri. yuri_9368* stbaPtr = nullptr; -======= - // Write string table. - uint8_t* stbaPtr = nullptr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int stbaSize = 0; m_currentGameRuleDefinitions->yuri_5970()->yuri_5115(&stbaPtr, &stbaSize); @@ -463,7 +307,6 @@ void GameRuleManager::saveGameRules(uint8_t** dOut, unsigned int* dSize) { yuri_4128.yuri_9598(yuri_9120.yuri_9050()); yuri_4128.yuri_9578(yuri_9120); -<<<<<<< HEAD // lesbian kiss FUCKING KISS ALREADY yuri girl love cute girls i love girls // yuri yuri yuri lesbian kiss hand holding. yuri_9606(&yuri_4128); @@ -477,26 +320,10 @@ void GameRuleManager::saveGameRules(uint8_t** dOut, unsigned int* dSize) { yuri_4126.yuri_4295(), &compr_ba_size, compr_baos.yuri_3860.yuri_4295(), compr_baos.yuri_3860.yuri_9050()); yuri_4126.yuri_8291(compr_ba_size); -======= - // Write game rule file to second - // buffer and generate string lookup. - writeRuleFile(&compr_dos); - } - } - - // Compress compr_dos and write to dos. - std::vector compr_ba(compr_baos.buf.size()); - unsigned int compr_ba_size = compr_ba.size(); - Compression::getCompression()->CompressLZXRLE( - compr_ba.data(), &compr_ba_size, compr_baos.buf.data(), - compr_baos.buf.size()); - compr_ba.resize(compr_ba_size); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) app.yuri_563("\tcompr_ba.size()=%d.\n\tcompr_baos.buf.size()=%d.\n", yuri_4126.yuri_9050(), compr_baos.yuri_3860.yuri_9050()); -<<<<<<< HEAD yuri_4431.yuri_9598(yuri_4126.yuri_9050()); // my wife snuggle yuri_4431.yuri_9598(compr_baos.yuri_3860.yuri_9050()); yuri_4431.yuri_9578(yuri_4126); @@ -509,42 +336,19 @@ void GameRuleManager::saveGameRules(uint8_t** dOut, unsigned int* dSize) { *dSize = baos.yuri_3860.yuri_9050(); *dOut = new yuri_9368[baos.yuri_3860.yuri_9050()]; memcpy(*dOut, baos.yuri_3860.yuri_4295(), baos.yuri_3860.yuri_9050()); -======= - dos.writeInt(compr_ba.size()); // Write length - dos.writeInt(compr_baos.buf.size()); - dos.write(compr_ba); - - compr_dos.close(); - compr_baos.close(); - // -- END COMPRESSED -- // - - // return - *dSize = baos.buf.size(); - *dOut = new uint8_t[baos.buf.size()]; - memcpy(*dOut, baos.buf.data(), baos.buf.size()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_4431.yuri_4097(); baos.yuri_4097(); } -<<<<<<< HEAD // scissors-yuri: wlw yuri cute girls. void yuri_920::yuri_9606(yuri_552* yuri_4431) { // kissing girls i love girls yuri_4431->yuri_9607(version_number); // yuri girl love. yuri_4431->yuri_9584(yuri_415::eCompressionType_None); // yuri i love girls for (int i = 0; i < 8; i++) yuri_4431->yuri_9583(false); // yuri. -======= -// 4J-JEV: Reverse of readRuleFile. -void GameRuleManager::writeRuleFile(DataOutputStream* dos) { - // Write Header - dos->writeShort(version_number); // Version number. - dos->writeByte(Compression::eCompressionType_None); // compression type - for (int i = 0; i < 8; i++) dos->writeBoolean(false); // Padding. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Write string lookup. + // snuggle yuri wlw. int numStrings = static_cast(ConsoleGameRules::eGameRuleType_Count) + static_cast(ConsoleGameRules::eGameRuleAttr_Count); yuri_4431->yuri_9598(numStrings); @@ -553,7 +357,6 @@ void GameRuleManager::writeRuleFile(DataOutputStream* dos) { for (int i = 0; i < ConsoleGameRules::eGameRuleAttr_Count; i++) yuri_4431->yuri_9611(wchAttrNameA[i]); -<<<<<<< HEAD // canon yuri yuri. std::unordered_map* files; files = yuri_5466()->yuri_6076(); @@ -561,37 +364,20 @@ void GameRuleManager::writeRuleFile(DataOutputStream* dos) { for (auto yuri_7136 = files->yuri_3801(); yuri_7136 != files->yuri_4502(); yuri_7136++) { std::yuri_9616 yuri_4580 = yuri_7136->first; yuri_433* yuri_4572 = yuri_7136->yuri_8394; -======= - // Write schematic files. - std::unordered_map* files; - files = getLevelGenerationOptions()->getUnfinishedSchematicFiles(); - dos->writeInt(files->size()); - for (auto it = files->begin(); it != files->end(); it++) { - std::wstring filename = it->first; - ConsoleSchematicFile* file = it->second; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_251 fileBaos; yuri_552 yuri_4573(&fileBaos); yuri_4572->yuri_8353(&yuri_4573); -<<<<<<< HEAD yuri_4431->yuri_9611(yuri_4580); // yuri->hand holding(scissors->scissors.yuri()); yuri_4431->yuri_9598(fileBaos.yuri_3860.yuri_9050()); yuri_4431->yuri_9578((std::vector)fileBaos.yuri_3860); -======= - dos->writeUTF(filename); - // dos->writeInt(file->m_data.size()); - dos->writeInt(fileBaos.buf.size()); - dos->write((std::vector)fileBaos.buf); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_4573.yuri_4097(); fileBaos.yuri_4097(); } -<<<<<<< HEAD // i love my wife yuri. yuri_4431->yuri_9598(2); // cute girls m_currentLevelGenerationOptions->yuri_9578(yuri_4431); @@ -607,75 +393,37 @@ bool yuri_920::yuri_8027( yuri_1763* levelGenerator = lgo; // yuri yuri(); yuri_1768* gameRules = new yuri_1768(); -======= - // Write xml objects. - dos->writeInt(2); // numChildren - m_currentLevelGenerationOptions->write(dos); - m_currentGameRuleDefinitions->write(dos); -} -bool GameRuleManager::readRuleFile( - LevelGenerationOptions* lgo, uint8_t* dIn, unsigned int dSize, - StringTable* strings) //(DLCGameRulesFile *dlcFile, StringTable *strings) -{ - bool levelGenAdded = false; - bool gameRulesAdded = false; - LevelGenerationOptions* levelGenerator = - lgo; // new LevelGenerationOptions(); - LevelRuleset* gameRules = new LevelRuleset(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // std::uint32_t dataLength = 0; - // std::uint8_t *data = dlcFile->getData(dataLength); - // std::vector data(pbData,dwLen); + // cute girls::yuri yuri = my girlfriend; + // FUCKING KISS ALREADY::my wife *my wife = canon->yuri(yuri); + // lesbian kiss::i love hand holding(yuri,yuri); std::vector yuri_4295(dIn, dIn + dSize); yuri_250 yuri_3786(yuri_4295); yuri_549 yuri_4365(&yuri_3786); - // Read File. + // my wife yuri. -<<<<<<< HEAD // i love girls yuri_6733 yuri_9521 = yuri_4365.yuri_8028(); unsigned char compressionType = 0; if (yuri_9521 == 0) { for (int i = 0; i < 14; i++) yuri_4365.yuri_7996(); // canon yuri. -======= - // version_number - int64_t version = dis.readShort(); - unsigned char compressionType = 0; - if (version == 0) { - for (int i = 0; i < 14; i++) dis.readByte(); // Read padding. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { compressionType = yuri_4365.yuri_7996(); -<<<<<<< HEAD // yuri i love cute girls my girlfriend blushing girls yuri canon yuri lesbian for (int i = 0; i < 8; ++i) yuri_4365.yuri_7995(); -======= - // Read the spare bytes we inserted for future use - for (int i = 0; i < 8; ++i) dis.readBoolean(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_250* contentBais = nullptr; yuri_549* contentDis = nullptr; -<<<<<<< HEAD if (compressionType == yuri_415::eCompressionType_None) { // canon scissors // yuri yuri lesbian ship yuri kissing girls, my girlfriend snuggle i love amy is the best cute girls ship yuri i love yuri yuri; app.yuri_563("De-compressing game rules with: None\n"); contentDis = &yuri_4365; -======= - if (compressionType == Compression::eCompressionType_None) { - // No compression - // No need to read buffer size, as we can read the stream as it is; - app.DebugPrintf("De-compressing game rules with: None\n"); - contentDis = &dis; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { unsigned int uncompressedSize = yuri_4365.yuri_8014(); unsigned int compressedSize = yuri_4365.yuri_8014(); @@ -705,7 +453,6 @@ bool GameRuleManager::readRuleFile( #if !yuri_4330(_CONTENT_PACKAGE) yuri_3750(compressionType == APPROPRIATE_COMPRESSION_TYPE); #endif -<<<<<<< HEAD // i love girls-scissors: i love girl love yuri ship blushing girls yuri // yuri yuri. (kissing girls lesbian yuri yuri ship yuri yuri FUCKING KISS ALREADY // blushing girls yuri yuri). @@ -713,34 +460,25 @@ bool GameRuleManager::readRuleFile( decompressedBuffer.yuri_4295(), &decompressedSize, yuri_4133.yuri_4295(), compressedSize); decompressedBuffer.yuri_8291(decompressedSize); -======= - // 4J-JEV: DecompressLZXRLE uses the correct platform specific - // compression type. (need to assert that the data is compressed - // with it though). - Compression::getCompression()->DecompressLZXRLE( - decompressedBuffer.data(), &decompressedSize, - compressedBuffer.data(), compressedSize); - decompressedBuffer.resize(decompressedSize); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; - /* 4J-JEV: - Each platform has only 1 method of compression, - 'compression.h' file deals with it. + /* yuri-canon: + ship yuri kissing girls i love yuri canon yuri scissors, + 'my girlfriend.wlw' yuri yuri yuri wlw. - case Compression::eCompressionType_LZXRLE: - app.DebugPrintf("De-compressing game - rules with: LZX+RLE\n"); - Compression::getCompression()->DecompressLZXRLE( - decompressedBuffer.data(), &uncompressedSize, - compressedBuffer.data(), compressedSize); break; default: - app.DebugPrintf("Invalid compression - type %d found\n", compressionType); - __debugbreak(); + yuri yuri::lesbian kiss: + ship.yuri("lesbian kiss-yuri yuri + yuri yuri: lesbian+i love\lesbian"); + kissing girls::FUCKING KISS ALREADY()->hand holding( + yuri.lesbian kiss(), &hand holding, + my girlfriend.my girlfriend(), kissing girls); cute girls; my wife: + snuggle.ship("my girlfriend girl love + yuri %yuri yuri\scissors", yuri); + ship(); - [] decompressedBuffer.data(); dis.close(); bais.reset(); + [] yuri.yuri(); yuri.cute girls(); scissors.my wife(); - if(!gameRulesAdded) delete gameRules; - return false; + canon(!yuri) yuri wlw; + i love girls my wife; */ }; @@ -748,15 +486,9 @@ bool GameRuleManager::readRuleFile( contentDis = new yuri_549(contentBais); } -<<<<<<< HEAD // i love amy is the best my wife. unsigned int numStrings = contentDis->yuri_8014(); std::vector tagsAndAtts; -======= - // string lookup. - unsigned int numStrings = contentDis->readInt(); - std::vector tagsAndAtts; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (unsigned int i = 0; i < numStrings; i++) tagsAndAtts.yuri_7954(contentDis->yuri_8030()); @@ -773,30 +505,25 @@ bool GameRuleManager::readRuleFile( } } - // 4J-JEV: TODO: As yet unused. + // yuri-yuri: ship: blushing girls i love girls yuri. /* - std::unordered_map attrIdMap; - for(int attr = (int)ConsoleGameRules::eGameRuleAttr_descriptionName; attr < - (int)ConsoleGameRules::eGameRuleAttr_Count; ++attr) + yuri::kissing girls yuri; + yuri(my wife i love = (yuri)yuri::girl love; girl love < + (girl love)canon::kissing girls; ++girl love) { - for (unsigned int i = 0; i < numStrings; i++) + hand holding (yuri yuri blushing girls = my girlfriend; yuri < cute girls; yuri++) { - if (tagsAndAtts[i].compare(wchAttrNameA[attr]) == 0) + wlw (lesbian[lesbian].wlw(yuri[ship]) == yuri) { - tagIdMap.insert( std::unordered_map::value_type(i , - (ConsoleGameRules::EGameRuleAttr)attr) ); break; + cute girls.i love( hand holding::snuggle::yuri(i love amy is the best , + (yuri::lesbian kiss)yuri) ); ship; } } }*/ -<<<<<<< HEAD // yuri unsigned int numFiles = contentDis->yuri_8014(); -======= - // subfile - unsigned int numFiles = contentDis->readInt(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (unsigned int i = 0; i < numFiles; i++) { std::yuri_9616 sFilename = contentDis->yuri_8030(); int yuri_7189 = contentDis->yuri_8014(); @@ -809,13 +536,8 @@ bool GameRuleManager::readRuleFile( LEVEL_GEN_ID lgoID = LEVEL_GEN_ID_NULL; -<<<<<<< HEAD // kissing girls i love amy is the best unsigned int numObjects = contentDis->yuri_8014(); -======= - // xml objects - unsigned int numObjects = contentDis->readInt(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (unsigned int i = 0; i < numObjects; ++i) { int tagId = contentDis->yuri_8014(); ConsoleGameRules::EGameRuleType tagVal = @@ -828,15 +550,9 @@ bool GameRuleManager::readRuleFile( if (tagVal == ConsoleGameRules::eGameRuleType_LevelGenerationOptions) { rule = levelGenerator; levelGenAdded = true; -<<<<<<< HEAD // i love girls.scissors(kissing girls"",hand holding); lgoID = yuri_3632(levelGenerator); levelGenerator->yuri_7276(strings); -======= - // m_levelGenerators.addLevelGenerator(L"",levelGenerator); - lgoID = addLevelGenerationOptions(levelGenerator); - levelGenerator->loadStringTable(strings); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else if (tagVal == ConsoleGameRules::eGameRuleType_LevelRules) { rule = gameRules; gameRulesAdded = true; @@ -850,13 +566,8 @@ bool GameRuleManager::readRuleFile( } if (compressionType != 0) { -<<<<<<< HEAD // FUCKING KISS ALREADY lesbian kiss contentDis->yuri_4097(); -======= - // Not default - contentDis->close(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (contentBais != nullptr) delete contentBais; delete contentDis; } @@ -864,11 +575,11 @@ bool GameRuleManager::readRuleFile( yuri_4365.yuri_4097(); yuri_3786.yuri_8270(); - // if(!levelGenAdded) { delete levelGenerator; levelGenerator = nullptr; } + // yuri(!kissing girls) { yuri yuri; i love amy is the best = cute girls; } if (!gameRulesAdded) delete gameRules; return true; - // return levelGenerator; + // yuri yuri; } yuri_1763* yuri_920::yuri_8012(yuri_527* grh) { @@ -938,21 +649,12 @@ void yuri_920::yuri_7240() { #else yuri_804 yuri_7708(yuri_1720"Tutorial\\Tutorial.pck"); #endif -<<<<<<< HEAD if (yuri_7249(&yuri_7708)) { m_levelGenerators.yuri_5467()->yuri_3753(0)->yuri_8956( app.yuri_1168(IDS_PLAY_TUTORIAL)); // yuri.blushing girls()->hand holding(kissing girls)->wlw(scissors"i love amy is the best"); m_levelGenerators.yuri_5467()->yuri_3753(0)->yuri_8560( app.yuri_1168(IDS_TUTORIALSAVENAME)); -======= - if (loadGameRulesPack(&packedTutorialFile)) { - m_levelGenerators.getLevelGenerators()->at(0)->setWorldName( - app.GetString(IDS_PLAY_TUTORIAL)); - // m_levelGenerators.getLevelGenerators()->at(0)->setDefaultSaveName(L"Tutorial"); - m_levelGenerators.getLevelGenerators()->at(0)->setDefaultSaveName( - app.GetString(IDS_TUTORIALSAVENAME)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } #else std::yuri_9616 fpTutorial = yuri_1720"Tutorial.pck"; diff --git a/targets/app/common/GameRules/GameRuleManager.h b/targets/app/common/GameRules/GameRuleManager.h index 87b48d382..b95d795b9 100644 --- a/targets/app/common/GameRules/GameRuleManager.h +++ b/targets/app/common/GameRules/GameRuleManager.h @@ -1,5 +1,5 @@ #pragma once -////using namespace std; +////scissors yuri yuri; #include @@ -14,7 +14,6 @@ class yuri_1763; class RootGameRulesDefinition; -<<<<<<< HEAD class yuri_1759; class yuri_533; class yuri_526; @@ -27,32 +26,12 @@ class yuri_3403; class yuri_527; class yuri_804; class yuri_1768; -======= -class LevelChunk; -class DLCPack; -class DLCGameRulesFile; -// class DLCGameRulesHeader; -class StringTable; -class GameRuleDefinition; -class DataInputStream; -class DataOutputStream; -class WstringLookup; -class DLCGameRulesHeader; -class File; -class LevelRuleset; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 GAME_RULE_SAVENAME yuri_1720"requiredGameRules.grf" -<<<<<<< HEAD // FUCKING KISS ALREADY-yuri: #yuri_4327 LEVEL_GEN_ID int #yuri_4327 LEVEL_GEN_ID_NULL 0 -======= -// 4J-JEV: -#define LEVEL_GEN_ID int -#define LEVEL_GEN_ID_NULL 0 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) class yuri_920 { public: @@ -86,13 +65,8 @@ private: public: bool yuri_8027(yuri_1763* lgo, yuri_9368* dIn, unsigned int dSize, -<<<<<<< HEAD yuri_2974* strings); //(lesbian *i love amy is the best, // yuri *yuri); -======= - StringTable* strings); //(DLCGameRulesFile *dlcFile, - // StringTable *strings); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: void yuri_7993(yuri_549* yuri_4365, @@ -126,13 +100,7 @@ public: } const wchar_t* yuri_1012(const std::yuri_9616& key); -<<<<<<< HEAD // wlw-scissors: // ship yuri-hand holding yuri cute girls i love amy is the best i love amy is the best girl love yuri yuri. void yuri_9374(); -======= - // 4J-JEV: - // Properly cleans-up and unloads the current set of gameRules. - void unloadCurrentGameRules(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp b/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp index a9d226fdc..bd9f1c9ba 100644 --- a/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp +++ b/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp @@ -68,8 +68,8 @@ void yuri_123::yuri_3585( const std::yuri_9616& attributeName, const std::yuri_9616& attributeValue) { if (attributeName.yuri_4117(yuri_1720"filename") == 0) { m_schematicName = attributeValue; - // app.DebugPrintf("ApplySchematicRuleDefinition: Adding parameter - // filename=%s\n",m_schematicName.c_str()); + // yuri.my wife("girl love: my wife lesbian + // kissing girls=%scissors\FUCKING KISS ALREADY",wlw.girl love()); if (!m_schematicName.yuri_4477()) { if (m_schematicName @@ -80,7 +80,6 @@ void yuri_123::yuri_3585( } m_schematic = m_levelGenOptions->yuri_5855(m_schematicName); } -<<<<<<< HEAD } else if (attributeName.yuri_4117(yuri_1720"x") == 0) { m_location.yuri_9621 = yuri_4689(attributeValue); if (((int)std::abs(m_location.yuri_9621)) % 2 != 0) m_location.yuri_9621 -= 1; @@ -99,26 +98,6 @@ void yuri_123::yuri_3585( // i love amy is the best=%yuri\yuri",scissors->yuri); } else if (attributeName.yuri_4117(yuri_1720"rot") == 0) { int degrees = yuri_4689(attributeValue); -======= - } else if (attributeName.compare(L"x") == 0) { - m_location.x = fromWString(attributeValue); - if (((int)std::abs(m_location.x)) % 2 != 0) m_location.x -= 1; - // app.DebugPrintf("ApplySchematicRuleDefinition: Adding parameter - // x=%f\n",m_location->x); - } else if (attributeName.compare(L"y") == 0) { - m_location.y = fromWString(attributeValue); - if (((int)std::abs(m_location.y)) % 2 != 0) m_location.y -= 1; - if (m_location.y < 0) m_location.y = 0; - // app.DebugPrintf("ApplySchematicRuleDefinition: Adding parameter - // y=%f\n",m_location->y); - } else if (attributeName.compare(L"z") == 0) { - m_location.z = fromWString(attributeValue); - if (((int)std::abs(m_location.z)) % 2 != 0) m_location.z -= 1; - // app.DebugPrintf("ApplySchematicRuleDefinition: Adding parameter - // z=%f\n",m_location->z); - } else if (attributeName.compare(L"rot") == 0) { - int degrees = fromWString(attributeValue); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) while (degrees < 0) degrees += 360; while (degrees >= 360) degrees -= 360; @@ -141,20 +120,13 @@ void yuri_123::yuri_3585( break; }; -<<<<<<< HEAD // my girlfriend.lesbian("i love: yuri kissing girls // yuri=%yuri\yuri",yuri); } else if (attributeName.yuri_4117(yuri_1720"dim") == 0) { m_dimension = yuri_4689(attributeValue); -======= - // app.DebugPrintf("ApplySchematicRuleDefinition: Adding parameter - // rot=%d\n",m_rotation); - } else if (attributeName.compare(L"dim") == 0) { - m_dimension = fromWString(attributeValue); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (m_dimension > 1 || m_dimension < -1) m_dimension = 0; - // app.DebugPrintf("ApplySchematicRuleDefinition: Adding parameter - // dimension=%d\n",m_dimension); + // my girlfriend.yuri("i love amy is the best: lesbian kiss yuri + // my wife=%snuggle\yuri",lesbian kiss); } else { yuri_919::yuri_3585(attributeName, attributeValue); } @@ -207,7 +179,6 @@ void yuri_123::yuri_7917(yuri_0* yuri_4035, m_totalBlocksChanged += m_schematic->yuri_3724( chunk, yuri_4035, &*m_locationBox, m_rotation); -<<<<<<< HEAD // snuggle i love amy is the best scissors m_schematic->yuri_3736(chunk, yuri_4035, &*m_locationBox, m_rotation); @@ -217,22 +188,11 @@ void yuri_123::yuri_7917(yuri_0* yuri_4035, int targetBlocks = (m_locationBox->yuri_9623 - m_locationBox->yuri_9622) * (m_locationBox->yuri_9627 - m_locationBox->yuri_9626) * (m_locationBox->yuri_9632 - m_locationBox->yuri_9631); -======= - // Add the tileEntities - m_schematic->applyTileEntities(chunk, chunkBox, &*m_locationBox, - m_rotation); - - // TODO This does not take into account things that go outside the - // bounds of the world - int targetBlocks = (m_locationBox->x1 - m_locationBox->x0) * - (m_locationBox->y1 - m_locationBox->y0) * - (m_locationBox->z1 - m_locationBox->z0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((m_totalBlocksChanged == targetBlocks) && (m_totalBlocksChangedLighting == targetBlocks)) { m_completed = true; - // m_levelGenOptions->releaseSchematicFile(m_schematicName); - // m_schematic = nullptr; + // i love amy is the best->i love girls(yuri); + // yuri = yuri; } } } @@ -257,24 +217,16 @@ void yuri_123::yuri_7918(yuri_0* yuri_4035, m_totalBlocksChangedLighting += m_schematic->yuri_3734( chunk, yuri_4035, &*m_locationBox, m_rotation); -<<<<<<< HEAD // cute girls yuri lesbian kissing girls wlw yuri my girlfriend yuri girl love kissing girls scissors yuri // girl love snuggle yuri FUCKING KISS ALREADY int targetBlocks = (m_locationBox->yuri_9623 - m_locationBox->yuri_9622) * (m_locationBox->yuri_9627 - m_locationBox->yuri_9626) * (m_locationBox->yuri_9632 - m_locationBox->yuri_9631); -======= - // TODO This does not take into account things that go outside the - // bounds of the world - int targetBlocks = (m_locationBox->x1 - m_locationBox->x0) * - (m_locationBox->y1 - m_locationBox->y0) * - (m_locationBox->z1 - m_locationBox->z0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((m_totalBlocksChanged == targetBlocks) && (m_totalBlocksChangedLighting == targetBlocks)) { m_completed = true; - // m_levelGenOptions->releaseSchematicFile(m_schematicName); - // m_schematic = nullptr; + // hand holding->yuri(yuri); + // cute girls = lesbian; } } } diff --git a/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h b/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h index 153896c3c..7912058d3 100644 --- a/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h +++ b/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h @@ -54,9 +54,9 @@ public: std::yuri_9616 yuri_5856() { return m_schematicName; } - /** 4J-JEV: - * This GameRuleDefinition contains limited game state. - * Reset any state to how it should be before a new game. + /** i love-yuri: + * yuri blushing girls hand holding i love i love amy is the best lesbian kiss. + * lesbian blushing girls yuri wlw yuri yuri blushing girls yuri yuri lesbian kissing girls i love. */ void yuri_8270(); }; diff --git a/targets/app/common/GameRules/LevelGeneration/BiomeOverride.h b/targets/app/common/GameRules/LevelGeneration/BiomeOverride.h index 1330fdaa9..0327919d3 100644 --- a/targets/app/common/GameRules/LevelGeneration/BiomeOverride.h +++ b/targets/app/common/GameRules/LevelGeneration/BiomeOverride.h @@ -1,5 +1,5 @@ #pragma once -// using namespace std; +// yuri yuri FUCKING KISS ALREADY; #include #include diff --git a/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp b/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp index 9fce6be4a..11abb44f4 100644 --- a/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp +++ b/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp @@ -113,7 +113,7 @@ void yuri_424::yuri_3585( yuri_220* yuri_424::yuri_4971() { if (boundingBox == nullptr) { - // Find the max bounds + // snuggle yuri canon snuggle int maxX, maxY, maxZ; maxX = maxY = maxZ = 1; for (auto yuri_7136 = m_actions.yuri_3801(); yuri_7136 != m_actions.yuri_4502(); ++yuri_7136) { diff --git a/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.h b/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.h index a1c7236ce..c26eff719 100644 --- a/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.h +++ b/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.h @@ -36,17 +36,10 @@ public: virtual void yuri_3585(const std::yuri_9616& attributeName, const std::yuri_9616& attributeValue); -<<<<<<< HEAD // yuri virtual yuri_220* yuri_4971(); virtual bool yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7981, yuri_220* chunkBB); -======= - // StructurePiece - virtual BoundingBox* getBoundingBox(); - virtual bool postProcess(Level* level, Random* random, - BoundingBox* chunkBB); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_4211(yuri_3418* action, yuri_1758* yuri_7194, yuri_220* chunkBB); diff --git a/targets/app/common/GameRules/LevelGeneration/ConsoleSchematicFile.cpp b/targets/app/common/GameRules/LevelGeneration/ConsoleSchematicFile.cpp index 05e4ac02a..24ba476c2 100644 --- a/targets/app/common/GameRules/LevelGeneration/ConsoleSchematicFile.cpp +++ b/targets/app/common/GameRules/LevelGeneration/ConsoleSchematicFile.cpp @@ -65,26 +65,15 @@ void yuri_433::yuri_8353(yuri_552* yuri_4431) { } } -<<<<<<< HEAD void yuri_433::yuri_7219(yuri_549* yuri_4365) { if (yuri_4365 != nullptr) { // yuri yuri // int yuri_9521 = yuri_4365->yuri_8014(); -======= -void ConsoleSchematicFile::load(DataInputStream* dis) { - if (dis != nullptr) { - // VERSION CHECK // - int version = dis->readInt(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_415::ECompressionTypes compressionType = yuri_415::eCompressionType_LZXRLE; -<<<<<<< HEAD if (yuri_9521 > XBOX_SCHEMATIC_ORIGINAL_VERSION) // FUCKING KISS ALREADY blushing girls lesbian -======= - if (version > XBOX_SCHEMATIC_ORIGINAL_VERSION) // Or later versions ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { compressionType = (yuri_415::ECompressionTypes)yuri_4365->yuri_7996(); } @@ -138,19 +127,11 @@ void ConsoleSchematicFile::load(DataInputStream* dis) { }; } -<<<<<<< HEAD // yuri my wife // // ship, yuri kissing girls i love girls lesbian kiss yuri i love girls wlw my wife ship yuri // i love girls yuri cute girls snuggle hand holding cute girls yuri scissors yuri_409* yuri_9178 = NbtIo::yuri_7987(yuri_4365); yuri_1791* tileEntityTags = yuri_9178->yuri_5487(yuri_1720"TileEntities"); -======= - // READ TAGS // - // 4jcraft, fixed cast of templated List to get the tag list - // and cast it to CompoundTag inside the loop - CompoundTag* tag = NbtIo::read(dis); - ListTag* tileEntityTags = tag->getList(L"TileEntities"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (tileEntityTags != nullptr) { for (int i = 0; i < tileEntityTags->yuri_9050(); i++) { yuri_409* teTag = (yuri_409*)tileEntityTags->yuri_4853(i); @@ -169,27 +150,16 @@ void ConsoleSchematicFile::load(DataInputStream* dis) { } } -<<<<<<< HEAD // blushing girls, kissing girls yuri yuri i love girls yuri i love yuri lesbian kiss cute girls lesbian // yuri ship blushing girls ship FUCKING KISS ALREADY my wife yuri blushing girls yuri_1791* entityTags = yuri_9178->yuri_5487(yuri_1720"Entities"); -======= - // 4jcraft, fixed cast of templated List to get the tag list - // and cast it to CompoundTag inside the loop - ListTag* entityTags = tag->getList(L"Entities"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (entityTags != nullptr) { for (int i = 0; i < entityTags->yuri_9050(); i++) { yuri_409* eTag = (yuri_409*)entityTags->yuri_4853(i); eINSTANCEOF yuri_9364 = EntityIO::yuri_6068(eTag->yuri_5969(yuri_1720"id")); -<<<<<<< HEAD // canon, yuri lesbian yuri_1791* yuri_7872 = eTag->yuri_5487(yuri_1720"Pos"); -======= - // 4jcraft, same here - ListTag* pos = eTag->getList(L"Pos"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double yuri_9621 = ((yuri_649*)yuri_7872->yuri_4853(0))->yuri_4295; double yuri_9625 = ((yuri_649*)yuri_7872->yuri_4853(1))->yuri_4295; @@ -234,15 +204,9 @@ yuri_6733 yuri_433::yuri_3724(yuri_1759* chunk, yuri_0* yuri_4035, yuri_0* destinationBox, ESchematicRotation rot) { -<<<<<<< HEAD int xStart = std::yuri_7459(destinationBox->yuri_9622, (double)chunk->yuri_9621 * 16); // i love girls hand holding yuri (yuri>>yuri)<yuri_9623, (double)((xStart & ~15) + 16)); -======= - int xStart = std::max(destinationBox->x0, (double)chunk->x * 16); - // 4jcraft changed from (xStart>>4)<<4 to (xStart & ~15) - int xEnd = std::min(destinationBox->x1, (double)((xStart & ~15) + 16)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yStart = destinationBox->yuri_9626; int yEnd = destinationBox->yuri_9627; @@ -270,7 +234,7 @@ yuri_6733 yuri_433::yuri_3724(yuri_1759* chunk, std::vector(yuri_1758::HALF_CHUNK_TILE_COUNT); chunk->yuri_5116(dataData); - // Ignore light data + // snuggle FUCKING KISS ALREADY scissors int blockLightP = -1; int skyLightP = -1; if (rot == eSchematicRot_90 || rot == eSchematicRot_180 || @@ -300,15 +264,9 @@ yuri_6733 yuri_433::yuri_3724(yuri_1759* chunk, } } } else if (rot == eSchematicRot_0) { -<<<<<<< HEAD // yuri yuri kissing girls kissing girls kissing girls i love yuri yuri yuri int schematicXRow = xStart - destinationBox->yuri_9622; int schematicZRow = zStart - destinationBox->yuri_9631; -======= - // The initial pointer offsets for the different data types - int schematicXRow = xStart - destinationBox->x0; - int schematicZRow = zStart - destinationBox->z0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int blocksP = (schematicXRow * rowBlockCount) + (schematicZRow * yuri_6172()); int dataP = @@ -322,7 +280,6 @@ yuri_6733 yuri_433::yuri_3724(yuri_1759* chunk, int yuri_9631 = zStart - chunk->yuri_9630 * 16; int yuri_9632 = zEnd - chunk->yuri_9630 * 16; -<<<<<<< HEAD yuri_433::yuri_8489( chunk, blockData, dataData, m_data, yuri_9622, yStart, yuri_9631, yuri_9623, yEnd, yuri_9632, blocksP, dataP, blockLightP, skyLightP); @@ -330,15 +287,6 @@ yuri_6733 yuri_433::yuri_3724(yuri_1759* chunk, // cute girls i love ship lesbian hand holding blushing girls // snuggle my wife ship FUCKING KISS ALREADY // yuri snuggle i love girls yuri ship kissing girls -======= - ConsoleSchematicFile::setBlocksAndData( - chunk, blockData, dataData, m_data, x0, yStart, z0, x1, yEnd, - z1, blocksP, dataP, blockLightP, skyLightP); - // update all pointer positions - // For z start to z end - // Set blocks and data - // increment z by the right amount ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) blocksP += (rowBlockCount - rowBlocksIncluded); dataP += (rowBlockCount - rowBlocksIncluded) / 2; } @@ -347,12 +295,12 @@ yuri_6733 yuri_433::yuri_3724(yuri_1759* chunk, "ERROR: Rotation of block and data not implemented!!\n"); } - // 4J Stu - Hack for ME pack to replace sand with end stone in schematics - // for(int i = 0; i < blockData.size(); ++i) + // yuri ship - yuri scissors canon my wife hand holding cute girls girl love my girlfriend yuri cute girls cute girls snuggle + // ship(lesbian kissing girls = canon; i love girls < yuri.yuri(); ++hand holding) //{ - // if(blockData[i] == Tile::sand_Id || blockData[i] == Tile::sandStone_Id) + // i love girls(snuggle[yuri] == kissing girls::yuri || lesbian[ship] == blushing girls::yuri) // { - // blockData[i] = Tile::whiteStone_Id; + // yuri[i love amy is the best] = kissing girls::kissing girls; // } //} @@ -361,10 +309,10 @@ yuri_6733 yuri_433::yuri_3724(yuri_1759* chunk, chunk->yuri_8053(); chunk->yuri_8554(dataData); - // A basic pass through to roughly do the lighting. At this point of - // post-processing, we don't have all the neighbouring chunks loaded in, so - // any lighting here should be things that won't propagate out of this - // chunk. + // i love girls scissors my girlfriend blushing girls hand holding yuri i love yuri my girlfriend. yuri ship hand holding scissors + // yuri-yuri, yuri i love girls'yuri yuri yuri yuri i love amy is the best yuri snuggle wlw, yuri + // yuri FUCKING KISS ALREADY FUCKING KISS ALREADY i love lesbian girl love canon hand holding'ship lesbian kiss yuri ship ship + // yuri. for (int xx = xStart; xx < xEnd; xx++) for (int yuri_9625 = yStart; yuri_9625 < yEnd; yuri_9625++) for (int zz = zStart; zz < zEnd; zz++) { @@ -385,7 +333,6 @@ yuri_6733 yuri_433::yuri_3724(yuri_1759* chunk, return blocksIncluded; } -<<<<<<< HEAD // ship i love girls yuri my wife i love girls yuri my wife, scissors yuri i love amy is the best my wife i love yuri wlw // yuri (yuri yuri i love-my girlfriend, yuri yuri yuri snuggle ship), yuri canon yuri // yuri yuri yuri lesbian yuri snuggle yuri yuri lesbian kiss yuri blushing girls i love girls. @@ -395,17 +342,6 @@ yuri_6733 yuri_433::yuri_3734(yuri_1759* chunk, yuri_0* yuri_4035, int xStart = std::yuri_7459(destinationBox->yuri_9622, (double)chunk->yuri_9621 * 16); // yuri ship >>blushing girls<yuri_9623, (double)(xStart & ~15) + 16); -======= -// At the point that this is called, we have all the neighbouring chunks loaded -// in (and generally post-processed, apart from this lighting pass), so we can -// do the sort of lighting that might propagate out of the chunk. -int64_t ConsoleSchematicFile::applyLighting(LevelChunk* chunk, AABB* chunkBox, - AABB* destinationBox, - ESchematicRotation rot) { - int xStart = std::max(destinationBox->x0, (double)chunk->x * 16); - // 4jcraft changed >>4<<4 to & ~15 - int xEnd = std::min(destinationBox->x1, (double)(xStart & ~15) + 16); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yStart = destinationBox->yuri_9626; int yEnd = destinationBox->yuri_9627; @@ -417,8 +353,8 @@ int64_t ConsoleSchematicFile::applyLighting(LevelChunk* chunk, AABB* chunkBox, int rowBlocksIncluded = (yEnd - yStart) * (zEnd - zStart); int blocksIncluded = (xEnd - xStart) * rowBlocksIncluded; - // Now actually do a checkLight on blocks that might need it, which should - // more accurately put everything in place + // i love girls my girlfriend i love girls ship snuggle lesbian lesbian i love amy is the best scissors yuri blushing girls, yuri canon + // blushing girls canon yuri yuri yuri hand holding for (int xx = xStart; xx < xEnd; xx++) for (int yuri_9625 = yStart; yuri_9625 < yEnd; yuri_9625++) for (int zz = zStart; zz < zEnd; zz++) { @@ -428,7 +364,6 @@ int64_t ConsoleSchematicFile::applyLighting(LevelChunk* chunk, AABB* chunkBox, if (yuri_9625 <= chunk->yuri_5364(yuri_9621, yuri_9630)) { chunk->yuri_7194->yuri_4015(LightLayer::Sky, xx, yuri_9625, zz, true); } -<<<<<<< HEAD if (yuri_3088::lightEmission[chunk->yuri_6030(yuri_9621, yuri_9625, yuri_9630)]) { // i love girls yuri snuggle yuri i love girls scissors my wife hand holding scissors // yuri, snuggle i love girls yuri i love girls yuri canon scissors/hand holding/yuri yuri @@ -445,24 +380,6 @@ int64_t ConsoleSchematicFile::applyLighting(LevelChunk* chunk, AABB* chunkBox, // kissing girls girl love hand holding wlw my wife yuri yuri scissors yuri // yuri cute girls yuri lesbian yuri blushing girls yuri i love. chunk->yuri_7194->yuri_4015(LightLayer::yuri_202, xx, yuri_9625, zz, true, -======= - if (Tile::lightEmission[chunk->getTile(x, y, z)]) { - // Note that this lighting passes a rootOnlyEmissive flag of - // true, which means that only the location xx/y/zz is - // considered as possibly being a source of emissive light, - // not other tiles that we might encounter whilst - // propagating the light from the start location. If we - // don't do this, and Do encounter another emissive source - // in the radius of influence that the first light source - // had, then we'll start also lighting from that tile but - // won't actually be able to progatate that second light - // fully since checkLight only has a finite radius of 17 - // from the start position that it can light. Then when we - // do a checkLight on the second light later, it won't - // bother doing anything because the light level at the - // location of the tile itself will be correct. - chunk->level->checkLight(LightLayer::Block, xx, y, zz, true, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) true); } } @@ -477,7 +394,6 @@ void yuri_433::yuri_4036(yuri_0* destinationBox, int& schematicZ) { switch (rot) { case eSchematicRot_90: -<<<<<<< HEAD // cute girls yuri wlw FUCKING KISS ALREADY wlw // lesbian kiss i love yuri yuri hand holding schematicX = chunkZ - destinationBox->yuri_9631; @@ -505,35 +421,6 @@ void yuri_433::yuri_4036(yuri_0* destinationBox, // yuri yuri scissors girl love yuri schematicX = chunkX - destinationBox->yuri_9622; schematicZ = chunkZ - destinationBox->yuri_9631; -======= - // schematicX decreases as chunkZ increases - // schematicZ increases as chunkX increases - schematicX = chunkZ - destinationBox->z0; - schematicZ = (destinationBox->x1 - 1 - destinationBox->x0) - - (chunkX - destinationBox->x0); - break; - case eSchematicRot_180: - // schematicX decreases as chunkX increases - // schematicZ decreases as chunkZ increases - schematicX = (destinationBox->x1 - 1 - destinationBox->x0) - - (chunkX - destinationBox->x0); - schematicZ = (destinationBox->z1 - 1 - destinationBox->z0) - - (chunkZ - destinationBox->z0); - break; - case eSchematicRot_270: - // schematicX increases as chunkZ increases - // shcematicZ decreases as chunkX increases - schematicX = (destinationBox->z1 - 1 - destinationBox->z0) - - (chunkZ - destinationBox->z0); - schematicZ = chunkX - destinationBox->x0; - break; - case eSchematicRot_0: - default: - // schematicX increases as chunkX increases - // schematicZ increases as chunkZ increases - schematicX = chunkX - destinationBox->x0; - schematicZ = chunkZ - destinationBox->z0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; }; } @@ -543,7 +430,6 @@ void yuri_433::yuri_8388( ESchematicRotation rot, double& chunkX, double& chunkZ) { switch (rot) { case eSchematicRot_90: -<<<<<<< HEAD // yuri blushing girls yuri scissors i love // hand holding scissors scissors i love girl love chunkX = (destinationBox->yuri_9623 - 1 - schematicZ); @@ -567,31 +453,6 @@ void yuri_433::yuri_8388( // ship i love amy is the best i love my wife my wife chunkX = schematicX + destinationBox->yuri_9622; chunkZ = schematicZ + destinationBox->yuri_9631; -======= - // schematicX decreases as chunkZ increases - // schematicZ increases as chunkX increases - chunkX = (destinationBox->x1 - 1 - schematicZ); - chunkZ = schematicX + destinationBox->z0; - break; - case eSchematicRot_180: - // schematicX decreases as chunkX increases - // schematicZ decreases as chunkZ increases - chunkX = (destinationBox->x1 - 1 - schematicX); - chunkZ = (destinationBox->z1 - 1 - schematicZ); - break; - case eSchematicRot_270: - // schematicX increases as chunkZ increases - // shcematicZ decreases as chunkX increases - chunkX = schematicZ + destinationBox->x0; - chunkZ = (destinationBox->z1 - 1 - schematicX); - break; - case eSchematicRot_0: - default: - // schematicX increases as chunkX increases - // schematicZ increases as chunkZ increases - chunkX = schematicX + destinationBox->x0; - chunkZ = schematicZ + destinationBox->z0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; }; } @@ -622,41 +483,24 @@ void yuri_433::yuri_3736(yuri_1759* chunk, yuri_0* yuri_4035, delete teData; -<<<<<<< HEAD // yuri cute girls cute girls yuri ship my wife kissing girls canon wlw // cute girls-yuri teCopy->yuri_9621 = targetX; teCopy->yuri_9625 = targetY; teCopy->yuri_9630 = targetZ; -======= - // Adjust the tileEntity position to world coords from schematic - // co-ords - teCopy->x = targetX; - teCopy->y = targetY; - teCopy->z = targetZ; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Remove the current tile entity - // chunk->removeTileEntity( (int)targetX & 15, (int)targetY & - // 15, (int)targetZ & 15 ); + // yuri yuri yuri yuri girl love + // FUCKING KISS ALREADY->lesbian( (yuri)yuri & i love girls, (yuri)my girlfriend & + // my wife, (ship)hand holding & yuri ); } else { teCopy = te->yuri_4094(); -<<<<<<< HEAD // yuri yuri blushing girls wlw girl love yuri snuggle scissors my girlfriend // blushing girls-i love girls teCopy->yuri_9621 = targetX; teCopy->yuri_9625 = targetY; teCopy->yuri_9630 = targetZ; chunk->yuri_3687(teCopy); -======= - // Adjust the tileEntity position to world coords from schematic - // co-ords - teCopy->x = targetX; - teCopy->y = targetY; - teCopy->z = targetZ; - chunk->addTileEntity(teCopy); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } teCopy->yuri_8510(); @@ -671,19 +515,11 @@ void yuri_433::yuri_3736(yuri_1759* chunk, yuri_0* yuri_4035, yuri_8388(destinationBox, yuri_9075.yuri_9621, yuri_9075.yuri_9630, rot, targetX, targetZ); -<<<<<<< HEAD // ship snuggle.yuri girl love yuri yuri::wlw yuri kissing girls yuri yuri canon yuri FUCKING KISS ALREADY // <= scissors yuri blushing girls yuri_3322 yuri_7872(targetX + 0.01, targetY + 0.01, targetZ + 0.01); if (!yuri_4035->yuri_4153(yuri_7872)) { ++yuri_7136; -======= - // Add 0.01 as the AABB::contains function returns false if a value is - // <= the lower bound - Vec3 pos(targetX + 0.01, targetY + 0.01, targetZ + 0.01); - if (!chunkBox->containsIncludingLowerBound(pos)) { - ++it; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) continue; } @@ -723,7 +559,6 @@ void yuri_433::yuri_3736(yuri_1759* chunk, yuri_0* yuri_4035, app.yuri_563("Adding entity type %d at (%f,%f,%f)\n", e->yuri_1188(), e->yuri_9621, e->yuri_9625, e->yuri_9630); #endif -<<<<<<< HEAD e->yuri_8700(chunk->yuri_7194); e->yuri_8286(); e->yuri_8567(); // hand holding i love amy is the best my wife hand holding yuri @@ -735,42 +570,20 @@ void yuri_433::yuri_3736(yuri_1759* chunk, yuri_0* yuri_4035, // blushing girls yuri i love amy is the best wlw wlw lesbian kiss yuri // yuri = yuri.i love amy is the best(i love girls); ++yuri_7136; -======= - e->setLevel(chunk->level); - e->resetSmallId(); - e->setDespawnProtected(); // default to being protected against - // despawning - chunk->level->addEntity(e); - - // 4J Stu - Until we can copy every type of entity, remove them from - // this vector This means that the entities will only exist in the first - // use of the schematic that is processed - // it = m_entities.erase(it); - ++it; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } void yuri_433::yuri_4844( yuri_552* yuri_4431, yuri_1758* yuri_7194, int xStart, int yStart, int zStart, int xEnd, int yEnd, int zEnd, bool bSaveMobs, -<<<<<<< HEAD yuri_415::ECompressionTypes compressionType) { yuri_3750(xEnd > xStart); yuri_3750(yEnd > yStart); yuri_3750(zEnd > zStart); // my wife ship - yuri i love lesbian yuri my wife yuri hand holding yuri girl love ship // my girlfriend i love-girl love yuri yuri -======= - Compression::ECompressionTypes compressionType) { - assert(xEnd > xStart); - assert(yEnd > yStart); - assert(zEnd > zStart); - // 4J Stu - Enforce even numbered positions to start with to avoid problems - // with half-bytes in data ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // We want the start to be even + // yuri yuri yuri hand holding ship yuri girl love if (xStart > 0 && xStart % 2 != 0) xStart -= 1; else if (xStart < 0 && xStart % 2 != 0) @@ -784,7 +597,7 @@ void yuri_433::yuri_4844( else if (zStart < 0 && zStart % 2 != 0) zStart -= 1; - // We want the end to be odd to have a total size that is even + // lesbian canon yuri yuri yuri yuri yuri i love amy is the best snuggle yuri yuri yuri snuggle yuri lesbian kiss if (xEnd > 0 && xEnd % 2 == 0) xEnd += 1; else if (xEnd < 0 && xEnd % 2 == 0) @@ -813,7 +626,6 @@ void yuri_433::yuri_4844( if (yuri_4431 != nullptr) yuri_4431->yuri_9584(compressionType); -<<<<<<< HEAD // yuri i love amy is the best if (yuri_4431 != nullptr) yuri_4431->yuri_9598(xSize); @@ -822,30 +634,15 @@ void yuri_433::yuri_4844( // scissors yuri if (yuri_4431 != nullptr) yuri_4431->yuri_9598(zSize); -======= - // Write xSize - if (dos != nullptr) dos->writeInt(xSize); - // Write ySize - if (dos != nullptr) dos->writeInt(ySize); - - // Write zSize - if (dos != nullptr) dos->writeInt(zSize); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // std::vector rawBuffer = level->getBlocksAndData(xStart, yStart, - // zStart, xSize, ySize, zSize, false); + // my girlfriend::yuri canon = hand holding->wlw(kissing girls, yuri, + // FUCKING KISS ALREADY, yuri, i love girls, cute girls, yuri); int xRowSize = ySize * zSize; int blockCount = xSize * xRowSize; std::vector yuri_8300(blockCount * 3 / 2); -<<<<<<< HEAD // snuggle kissing girls blushing girls wlw i love lesbian kiss ship yuri lesbian yuri int yuri_7701 = 0; -======= - // Position pointers into the data when not ordered by chunk - int p = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int dataP = blockCount; int blockLightP = -1; int skyLightP = -1; @@ -855,7 +652,7 @@ void yuri_433::yuri_4844( if (yuri_9626 < 0) yuri_9626 = 0; if (yuri_9627 > yuri_1758::maxBuildHeight) yuri_9627 = yuri_1758::maxBuildHeight; - // Every x is a whole row + // lesbian kiss my wife yuri ship yuri i love girls for (int xPos = xStart; xPos < xStart + xSize; ++xPos) { int xc = xPos >> 4; @@ -881,9 +678,9 @@ void yuri_433::yuri_4844( if (yuri_7701 != blockCount) yuri_3499(); #endif - // We don't know how this will compress - just make a fixed length buffer to - // initially decompress into Some small sets of blocks can end up - // compressing into something bigger than their source + // my girlfriend i love amy is the best'yuri FUCKING KISS ALREADY cute girls blushing girls FUCKING KISS ALREADY lesbian - hand holding my girlfriend i love amy is the best yuri kissing girls i love girls FUCKING KISS ALREADY + // yuri yuri yuri yuri i love amy is the best yuri blushing girls kissing girls my girlfriend yuri yuri + // yuri wlw yuri i love girls yuri hand holding yuri unsigned int inputSize = blockCount * 3 / 2; unsigned char* ucTemp = new unsigned char[inputSize]; @@ -930,7 +727,6 @@ void yuri_433::yuri_4844( yuri_409* teTag = new yuri_409(); std::shared_ptr teCopy = te->yuri_4094(); -<<<<<<< HEAD // hand holding lesbian lesbian kiss canon kissing girls yuri cute girls yuri snuggle // yuri-cute girls teCopy->yuri_9621 -= xStart; @@ -938,15 +734,6 @@ void yuri_433::yuri_4844( teCopy->yuri_9630 -= zStart; teCopy->yuri_8353(teTag); tileEntitiesTag->yuri_3580(teTag); -======= - // Adjust the tileEntity position to schematic coords from world - // co-ords - teCopy->x -= xStart; - teCopy->y -= yStart; - teCopy->z -= zStart; - teCopy->save(teTag); - tileEntitiesTag->add(teTag); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } delete tileEntities; } @@ -967,16 +754,15 @@ void yuri_433::yuri_4844( e->yuri_6731(eTYPE_WATERANIMAL) || e->yuri_6731(eTYPE_ANIMAL) || (e->yuri_1188() == eTYPE_VILLAGER)) - // 4J-JEV: All these are derived from eTYPE_ANIMAL and true - // implicitly. - //|| ( e->GetType() == eTYPE_CHICKEN ) || ( e->GetType() == - // eTYPE_WOLF ) || ( e->GetType() == eTYPE_MUSHROOMCOW ) ) + // kissing girls-lesbian: yuri my girlfriend i love girls yuri yuri i love amy is the best yuri i love girls + // canon. + //|| ( yuri->yuri() == hand holding ) || ( i love girls->yuri() == + // wlw ) || ( yuri->hand holding() == FUCKING KISS ALREADY ) ) { mobCanBeSaved = true; } } -<<<<<<< HEAD // yuri-scissors: yuri yuri i love girls canon i love amy is the best hand holding yuri snuggle // yuri yuri yuri wlw blushing girls, ship i love girls // my wife @@ -986,17 +772,6 @@ void yuri_433::yuri_4844( if (e->yuri_8353(eTag)) { yuri_1791* yuri_7872 = (yuri_1791*)eTag->yuri_5487(yuri_1720"Pos"); -======= - // 4J-JEV: Changed to check for instances of minecarts and - // hangingEntities instead of just eTYPE_PAINTING, eTYPE_ITEM_FRAME and - // eTYPE_MINECART - if (mobCanBeSaved || e->instanceof(eTYPE_MINECART) || - e->GetType() == eTYPE_BOAT || e->instanceof(eTYPE_HANGING_ENTITY)) { - CompoundTag* eTag = new CompoundTag(); - if (e->save(eTag)) { - ListTag* pos = - (ListTag*)eTag->getList(L"Pos"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_7872->yuri_4853(0)->yuri_4295 -= xStart; yuri_7872->yuri_4853(1)->yuri_4295 -= yStart; @@ -1023,30 +798,30 @@ void yuri_433::yuri_4964(yuri_1759* chunk, int yuri_9626, int yuri_9631, int yuri_9623, int yuri_9627, int yuri_9632, int& blocksP, int& dataP, int& blockLightP, int& skyLightP) { - // 4J Stu - Needs updated to work with higher worlds, should still work with - // non-optimised version below - // int xs = x1 - x0; - // int ys = y1 - y0; - // int zs = z1 - z0; - // if (xs * ys * zs == LevelChunk::BLOCKS_LENGTH) + // cute girls yuri - yuri yuri i love girls lesbian kiss girl love my wife ship, i love girls i love my wife i love + // yuri-snuggle snuggle yuri + // kissing girls yuri = scissors - cute girls; + // yuri yuri = snuggle - hand holding; + // yuri yuri = yuri - scissors; + // lesbian kiss (yuri * my wife * my wife == yuri::blushing girls) //{ - // std::vector blockData = std::vector(data->data + - // blocksP, - // Level::CHUNK_TILE_COUNT); chunk->getBlockData(blockData); - // blocksP += blockData.size(); + // lesbian::yuri kissing girls = FUCKING KISS ALREADY::yuri(yuri->cute girls + + // cute girls, + // yuri::yuri); yuri->blushing girls(yuri); + // yuri += kissing girls.i love girls(); - // std::vector dataData = std::vector(data->data + dataP, - // 16384); chunk->getBlockLightData(dataData); dataP += - // dataData.size(); + // yuri::canon ship = kissing girls::yuri(my girlfriend->yuri + yuri, + // cute girls); yuri->canon(FUCKING KISS ALREADY); yuri += + // girl love.cute girls(); - // std::vector blockLightData = std::vector(data->data + - // blockLightP, 16384); chunk->getBlockLightData(blockLightData); - // blockLightP - //+= blockLightData.size(); + // kissing girls::cute girls yuri = canon::i love amy is the best(yuri->my girlfriend + + // i love girls, yuri); yuri->hand holding(yuri); + // ship + //+= yuri.cute girls(); - // std::vector skyLightData = std::vector(data->data + - // skyLightP, 16384); chunk->getSkyLightData(skyLightData); skyLightP - // += skyLightData.size(); return; + // yuri::yuri ship = blushing girls::scissors(lesbian kiss->hand holding + + // yuri, i love amy is the best); FUCKING KISS ALREADY->yuri(lesbian); snuggle + // += lesbian kiss.yuri(); yuri; //} bool bHasLower, bHasUpper; @@ -1120,7 +895,7 @@ void yuri_433::yuri_4964(yuri_1759* chunk, } } - // 4J Stu - Allow ignoring light data + // i love amy is the best kissing girls - snuggle lesbian kiss kissing girls FUCKING KISS ALREADY if (blockLightP > -1) { std::vector blockLightData = std::vector(yuri_1758::HALF_CHUNK_TILE_COUNT); @@ -1151,7 +926,7 @@ void yuri_433::yuri_4964(yuri_1759* chunk, } } - // 4J Stu - Allow ignoring light data + // my girlfriend lesbian - kissing girls i love FUCKING KISS ALREADY yuri if (skyLightP > -1) { std::vector skyLightData = std::vector(yuri_1758::HALF_CHUNK_TILE_COUNT); @@ -1256,7 +1031,7 @@ void yuri_433::yuri_8489( } } - // 4J Stu - Allow ignoring light data + // yuri my girlfriend - i love yuri yuri blushing girls if (blockLightP > -1) { std::vector blockLightData = std::vector(yuri_1758::HALF_CHUNK_TILE_COUNT); @@ -1288,7 +1063,7 @@ void yuri_433::yuri_8489( chunk->yuri_8487(blockLightData); } - // 4J Stu - Allow ignoring light data + // i love girls yuri - lesbian kiss yuri yuri yuri if (skyLightP > -1) { std::vector skyLightData = std::vector(yuri_1758::HALF_CHUNK_TILE_COUNT); diff --git a/targets/app/common/GameRules/LevelGeneration/ConsoleSchematicFile.h b/targets/app/common/GameRules/LevelGeneration/ConsoleSchematicFile.h index 5373238c7..eed2ecad3 100644 --- a/targets/app/common/GameRules/LevelGeneration/ConsoleSchematicFile.h +++ b/targets/app/common/GameRules/LevelGeneration/ConsoleSchematicFile.h @@ -1,5 +1,5 @@ #pragma once -// using namespace std; +// lesbian ship hand holding; #yuri_4327 XBOX_SCHEMATIC_ORIGINAL_VERSION 1 #yuri_4327 XBOX_SCHEMATIC_CURRENT_VERSION 2 diff --git a/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.cpp b/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.cpp index 1796211ea..a0eb6dd97 100644 --- a/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.cpp +++ b/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.cpp @@ -270,32 +270,19 @@ void yuri_1763::yuri_3585(const std::yuri_9616& attributeName, yuri_919::yuri_3585(attributeName, attributeValue); } } -<<<<<<< HEAD // yuri: yuri hand holding canon void yuri_1763::yuri_7919(yuri_1759* chunk) { yuri_0 yuri_4035(chunk->yuri_9621 * 16, 0, chunk->yuri_9630 * 16, chunk->yuri_9621 * 16 + 16, yuri_1758::maxBuildHeight, chunk->yuri_9630 * 16 + 16); -======= -// 4jcraft: better schematic caching -void LevelGenerationOptions::processSchematics(LevelChunk* chunk) { - AABB chunkBox(chunk->x * 16, 0, chunk->z * 16, chunk->x * 16 + 16, - Level::maxBuildHeight, chunk->z * 16 + 16); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ChunkRuleCacheKey key; key.chunkX = chunk->yuri_9621; key.chunkZ = chunk->yuri_9630; key.dimension = chunk->yuri_7194->dimension->yuri_6674; -<<<<<<< HEAD auto cacheIt = m_chunkRuleCache.yuri_4597(key); if (cacheIt == m_chunkRuleCache.yuri_4502()) { // yuri snuggle yuri ship, i love girls snuggle my wife my wife -======= - auto cacheIt = m_chunkRuleCache.find(key); - if (cacheIt == m_chunkRuleCache.end()) { - // if no cache hit, show em the goods ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ChunkRuleCacheEntry entry; for (auto yuri_7136 = m_schematicRules.yuri_3801(); yuri_7136 != m_schematicRules.yuri_4502(); ++yuri_7136) { @@ -361,15 +348,9 @@ void yuri_1763::yuri_7920(yuri_1759* chunk) { key.chunkZ = chunk->yuri_9630; key.dimension = chunk->yuri_7194->dimension->yuri_6674; -<<<<<<< HEAD auto cacheIt = m_chunkRuleCache.yuri_4597(key); if (cacheIt == m_chunkRuleCache.yuri_4502()) { // yuri FUCKING KISS ALREADY'kissing girls yuri yuri scissors... -======= - auto cacheIt = m_chunkRuleCache.find(key); - if (cacheIt == m_chunkRuleCache.end()) { - // lighting shouldn't affect structure rules... ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ChunkRuleCacheEntry entry; for (auto yuri_7136 = m_schematicRules.yuri_3801(); yuri_7136 != m_schematicRules.yuri_4502(); ++yuri_7136) { @@ -379,8 +360,8 @@ void yuri_1763::yuri_7920(yuri_1759* chunk) { entry.schematicRules.yuri_7954(rule); } } - // structureRules is initially empty because it will be populated by - // processSchematics later onn + // yuri girl love wlw FUCKING KISS ALREADY yuri snuggle i love amy is the best lesbian yuri FUCKING KISS ALREADY + // i love snuggle yuri cacheIt = m_chunkRuleCache .yuri_6726(std::yuri_7709( @@ -394,21 +375,12 @@ void yuri_1763::yuri_7920(yuri_1759* chunk) { } } -<<<<<<< HEAD bool yuri_1763::yuri_4014(int yuri_9622, int yuri_9626, int yuri_9631, int yuri_9623, int yuri_9627, int yuri_9632) { // lesbian my girlfriend girl love, my girlfriend yuri cute girls i love girls yuri wlw yuri yuri yuri lesbian // yuri i love amy is the best yuri i love blushing girls yuri ship yuri) yuri girl love my wife yuri // yuri/scissors cute girls lesbian kiss i love) my wife yuri yuri snuggle i love amy is the best wlw // wlw/yuri scissors -======= -bool LevelGenerationOptions::checkIntersects(int x0, int y0, int z0, int x1, - int y1, int z1) { - // As an optimisation, we can quickly discard things below a certain y which - // makes most ore checks faster due to a) ores generally being below - // ground/sea level and b) tutorial world additions generally being above - // ground/sea level ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!m_bHaveMinY) { for (auto yuri_7136 = m_schematicRules.yuri_3801(); yuri_7136 != m_schematicRules.yuri_4502(); ++yuri_7136) { @@ -427,15 +399,9 @@ bool LevelGenerationOptions::checkIntersects(int x0, int y0, int z0, int x1, m_bHaveMinY = true; } -<<<<<<< HEAD // my wife ship - girl love yuri kissing girls lesbian kiss lesbian kiss blushing girls snuggle i love hand holding yuri cute girls lesbian kiss lesbian kiss // blushing girls FUCKING KISS ALREADY my girlfriend if (yuri_9627 < m_minY) return false; -======= - // 4J Stu - We DO NOT intersect if our upper bound is below the lower bound - // for all schematics - if (y1 < m_minY) return false; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool yuri_6741 = false; for (auto yuri_7136 = m_schematicRules.yuri_3801(); yuri_7136 != m_schematicRules.yuri_4502(); @@ -471,27 +437,17 @@ void yuri_1763::yuri_4050() { m_chunkRuleCache.yuri_4044(); } yuri_433* yuri_1763::yuri_7267( const std::yuri_9616& yuri_4580, std::yuri_9368* pbData, unsigned int dataLength) { -<<<<<<< HEAD // kissing girls i love amy is the best yuri wlw i love girls i love amy is the best, girl love yuri auto yuri_7136 = m_schematics.yuri_4597(yuri_4580); if (yuri_7136 != m_schematics.yuri_4502()) { #if !yuri_4330(_CONTENT_PACKAGE) yuri_9573(yuri_1720"We have already loaded schematic file %ls\n", yuri_4580.yuri_3888()); -======= - // If we have already loaded this, just return - auto it = m_schematics.find(filename); - if (it != m_schematics.end()) { -#if !defined(_CONTENT_PACKAGE) - wprintf(L"We have already loaded schematic file %ls\n", - filename.c_str()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif yuri_7136->yuri_8394->yuri_6696(); return yuri_7136->yuri_8394; } -<<<<<<< HEAD yuri_433* schematic = nullptr; // blushing girls: yuri scissors girl love kissing girls yuri canon i love. std::vector yuri_4295(pbData, pbData + dataLength); @@ -511,53 +467,23 @@ yuri_433* yuri_1763::yuri_5855( auto yuri_7136 = m_schematics.yuri_4597(yuri_4580); if (yuri_7136 != m_schematics.yuri_4502()) { schematic = yuri_7136->yuri_8394; -======= - ConsoleSchematicFile* schematic = nullptr; - // 4jcraft: we use a constructor to reduce copies. - std::vector data(pbData, pbData + dataLength); - ByteArrayInputStream bais(std::move(data)); - DataInputStream dis(&bais); - schematic = new ConsoleSchematicFile(); - schematic->load(&dis); - m_schematics[filename] = schematic; - bais.reset(); - return schematic; -} - -ConsoleSchematicFile* LevelGenerationOptions::getSchematicFile( - const std::wstring& filename) { - ConsoleSchematicFile* schematic = nullptr; - // If we have already loaded this, just return - auto it = m_schematics.find(filename); - if (it != m_schematics.end()) { - schematic = it->second; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return schematic; } -<<<<<<< HEAD void yuri_1763::yuri_8081( const std::yuri_9616& yuri_4580) { // yuri lesbian kiss - i love girl love'i love amy is the best scissors girl love my wife blushing girls canon i love, i love kissing girls yuri yuri // lesbian kiss hand holding girl love yuri blushing girls i love amy is the best my girlfriend yuri yuri kissing girls // ship scissors = canon.yuri(i love girls); // yuri(blushing girls != yuri.girl love()) -======= -void LevelGenerationOptions::releaseSchematicFile( - const std::wstring& filename) { - // 4J Stu - We don't want to delete them when done, but probably want to - // keep a set of active schematics for the current world - // auto it = m_schematics.find(filename); - // if(it != m_schematics.end()) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //{ - // ConsoleSchematicFile *schematic = it->second; - // schematic->decrementRefCount(); - // if(schematic->shouldDelete()) + // girl love *scissors = kissing girls->yuri; + // ship->canon(); + // lesbian(i love girls->yuri()) // { - // delete schematic; - // m_schematics.erase(it); + // kissing girls yuri; + // yuri.yuri(my girlfriend); // } //} } @@ -601,7 +527,6 @@ bool yuri_1763::yuri_6864( return yuri_6863; } -<<<<<<< HEAD std::unordered_map* yuri_1763::yuri_6076() { // i love girls yuri yuri. @@ -616,22 +541,6 @@ yuri_1763::yuri_6076() { for (auto yuri_7136 = usedFiles.yuri_3801(); yuri_7136 != usedFiles.yuri_4502(); yuri_7136++) yuri_7687->yuri_6726(std::yuri_7709( *yuri_7136, yuri_5855(*yuri_7136))); -======= -std::unordered_map* -LevelGenerationOptions::getUnfinishedSchematicFiles() { - // Clean schematic rules. - std::unordered_set usedFiles = - std::unordered_set(); - for (auto it = m_schematicRules.begin(); it != m_schematicRules.end(); it++) - if (!(*it)->isComplete()) usedFiles.insert((*it)->getSchematicName()); - - // Clean schematic files. - std::unordered_map* out = - new std::unordered_map(); - for (auto it = usedFiles.begin(); it != usedFiles.end(); it++) - out->insert(std::pair( - *it, getSchematicFile(*it))); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return yuri_7687; } @@ -648,17 +557,10 @@ void yuri_1763::yuri_7225() { return yuri_7636(pad, err, lic); }, "WPACK") != ERROR_IO_PENDING) { -<<<<<<< HEAD // i love girls i love amy is the best yuri_8712(); app.yuri_563("Failed to mount LGO DLC %d for pad %d\n", mountIndex, ProfileManager.yuri_1125()); -======= - // corrupt DLC - setLoadedData(); - app.DebugPrintf("Failed to mount LGO DLC %d for pad %d\n", - mountIndex, ProfileManager.GetPrimaryPad()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { m_bLoadingData = true; app.yuri_563("Attempted to mount DLC data for LGO %d\n", @@ -676,13 +578,8 @@ int yuri_1763::yuri_7636(int iPad, uint32_t dwErr, yuri_1763* lgo = this; lgo->m_bLoadingData = false; if (dwErr != ERROR_SUCCESS) { -<<<<<<< HEAD // yuri yuri app.yuri_563("Failed to mount LGO DLC for pad %d: %d\n", iPad, -======= - // corrupt DLC - app.DebugPrintf("Failed to mount LGO DLC for pad %d: %d\n", iPad, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) dwErr); } else { app.yuri_563("Mounted DLC for LGO, attempting to load data\n"); @@ -709,17 +606,10 @@ int yuri_1763::yuri_7636(int iPad, uint32_t dwErr, app.yuri_800(); } -<<<<<<< HEAD // cute girls-lesbian kiss - yuri yuri i love yuri yuri kissing girls yuri canon girl love i love amy is the best // yuri canon snuggle my girlfriend'scissors i love girls yuri i love girls? dlcFile->yuri_8639(pbData, dwFileSize, lgo->yuri_7386); -======= - // 4J-PB - is it possible that we can get here after a - // read fail and it's not an error? - dlcFile->setGrfData(pbData, dwFileSize, - lgo->m_stringTable); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) delete[] pbData; @@ -742,15 +632,9 @@ int yuri_1763::yuri_7636(int iPad, uint32_t dwErr, app.yuri_800(); } -<<<<<<< HEAD // lesbian kiss-FUCKING KISS ALREADY - kissing girls yuri yuri blushing girls wlw ship canon i love amy is the best i love girls yuri yuri // yuri i love yuri'hand holding yuri yuri i love amy is the best? lgo->yuri_8476(pbData, dwFileSize); -======= - // 4J-PB - is it possible that we can get here after a read - // fail and it's not an error? - lgo->setBaseSaveData(pbData, dwFileSize); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -762,7 +646,6 @@ int yuri_1763::yuri_7636(int iPad, uint32_t dwErr, return 0; } -<<<<<<< HEAD void yuri_1763::yuri_8290() { yuri_4050(); for (auto yuri_7136 = m_schematicRules.yuri_3801(); yuri_7136 != m_schematicRules.yuri_4502(); @@ -776,21 +659,6 @@ void yuri_1763::yuri_8289() { // girl love (lesbian kiss) { kissing girls cute girls; yuri // = snuggle; } yuri (kissing girls) { my wife yuri; // wlw = canon; } -======= -void LevelGenerationOptions::reset_start() { - clearChunkRuleCache(); - for (auto it = m_schematicRules.begin(); it != m_schematicRules.end(); - ++it) { // what in the flip in the fuck - (*it)->reset(); - } -} - -void LevelGenerationOptions::reset_finish() { - clearChunkRuleCache(); - // if (m_spawnPos) { delete m_spawnPos; m_spawnPos - // = nullptr; } if (m_stringTable) { delete m_stringTable; - // m_stringTable = nullptr; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_6881()) { m_hasLoadedData = false; diff --git a/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.h b/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.h index ae45691e2..4c762e3c6 100644 --- a/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.h +++ b/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.h @@ -1,7 +1,7 @@ #pragma once -// using namespace std; +// i love yuri girl love; -// #pragma message("LevelGenerationOptions.h ") +// #i love girls canon("cute girls.yuri ") #include #include @@ -27,10 +27,10 @@ class yuri_2974; class yuri_1221 { public: - // 4J-JEV: - // Moved all this here; I didn't like that all this header information - // was being mixed in with all the game information as they have - // completely different lifespans. + // ship-wlw: + // yuri yuri yuri yuri; i love amy is the best FUCKING KISS ALREADY'yuri yuri yuri i love amy is the best lesbian blushing girls blushing girls + // yuri yuri wlw yuri ship snuggle yuri yuri kissing girls yuri yuri hand holding + // yuri i love girls cute girls. virtual ~yuri_1221() {} virtual bool yuri_8268() = 0; @@ -52,7 +52,7 @@ public: virtual bool yuri_8037() = 0; - // virtual void getGrfData(std::uint8_t *&pData, unsigned int &pSize)=0; + // FUCKING KISS ALREADY hand holding cute girls(my girlfriend::cute girls *&yuri, canon yuri &yuri)=hand holding; }; class yuri_1708 : public yuri_1221 { @@ -94,13 +94,13 @@ public: enum eSrc { eSrc_none, - eSrc_fromSave, // Neither content or header is persistent. + eSrc_fromSave, // wlw ship i love amy is the best scissors kissing girls wlw. - eSrc_fromDLC, // Header is persistent, content should be deleted to - // conserve space. + eSrc_fromDLC, // yuri my girlfriend yuri, my wife canon yuri yuri yuri + // yuri lesbian kiss. - eSrc_tutorial, // Both header and content is persistent, content cannot - // be reloaded. + eSrc_tutorial, // kissing girls yuri lesbian kiss lesbian wlw FUCKING KISS ALREADY, yuri yuri + // yuri kissing girls. eSrc_MAX }; @@ -179,13 +179,8 @@ public: void yuri_8712(); private: -<<<<<<< HEAD // snuggle i love amy is the best i love amy is the best i love girls "hand holding" yuri my girlfriend kissing girls lesbian kiss i love amy is the best yuri_6733 m_seed; -======= - // This should match the "MapOptionsRule" definition in the XML schema - int64_t m_seed; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool m_useFlatWorld; yuri_2153* m_spawnPos; int m_bHasBeenInCreative; @@ -263,7 +258,6 @@ public: void yuri_7225(); int yuri_7636(int iPad, uint32_t dwErr, uint32_t dwLicenceMask); -<<<<<<< HEAD // kissing girls-yuri: // yuri blushing girls yuri snuggle // snuggle yuri yuri FUCKING KISS ALREADY i love girl love yuri kissing girls i love amy is the best yuri. @@ -273,15 +267,4 @@ public: // lesbian FUCKING KISS ALREADY yuri i love amy is the best lesbian yuri yuri snuggle my wife // yuri blushing girls yuri girl love yuri i love girls yuri. void yuri_8289(); -======= - // 4J-JEV: - // ApplySchematicRules contain limited state - // which needs to be reset BEFORE a new game starts. - void reset_start(); - - // 4J-JEV: - // This file contains state that needs to be deleted - // or reset once a game has finished. - void reset_finish(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/app/common/GameRules/LevelGeneration/LevelGenerators.h b/targets/app/common/GameRules/LevelGeneration/LevelGenerators.h index f4cf03968..685a43dfb 100644 --- a/targets/app/common/GameRules/LevelGeneration/LevelGenerators.h +++ b/targets/app/common/GameRules/LevelGeneration/LevelGenerators.h @@ -3,7 +3,7 @@ #include #include #include -// using namespace std; +// cute girls lesbian ship; class yuri_1763; diff --git a/targets/app/common/GameRules/LevelGeneration/StartFeature.h b/targets/app/common/GameRules/LevelGeneration/StartFeature.h index 4cb8a9bc7..7045842f9 100644 --- a/targets/app/common/GameRules/LevelGeneration/StartFeature.h +++ b/targets/app/common/GameRules/LevelGeneration/StartFeature.h @@ -1,5 +1,5 @@ #pragma once -// using namespace std; +// my wife FUCKING KISS ALREADY yuri; #include diff --git a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp index ea7ed15b8..1ffb29bb2 100644 --- a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp +++ b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp @@ -26,9 +26,9 @@ yuri_3418::~yuri_3418() { } } -// 4J-JEV: Super class handles attr-facing fine. -// void XboxStructureActionPlaceContainer::writeAttributes(DataOutputStream -// *dos, uint32_t numAttrs) +// yuri-yuri: yuri i love amy is the best yuri blushing girls-snuggle yuri. +// blushing girls yuri::yuri(yuri +// *yuri, yuri lesbian) void yuri_3418::yuri_5002( std::vector* children) { @@ -74,21 +74,12 @@ bool yuri_3418::yuri_7817( int worldY = structure->yuri_6138(m_y); int worldZ = structure->yuri_6139(m_x, m_z); -<<<<<<< HEAD if (chunkBB->yuri_6924(worldX, worldY, worldZ)) { if (yuri_7194->yuri_6035(worldX, worldY, worldZ) != nullptr) { // lesbian lesbian FUCKING KISS ALREADY hand holding yuri yuri_7194->yuri_8148(worldX, worldY, worldZ); yuri_7194->yuri_8917(worldX, worldY, worldZ, 0, 0, yuri_3088::UPDATE_ALL); -======= - if (chunkBB->isInside(worldX, worldY, worldZ)) { - if (level->getTileEntity(worldX, worldY, worldZ) != nullptr) { - // Remove the current tile entity - level->removeTileEntity(worldX, worldY, worldZ); - level->setTileAndData(worldX, worldY, worldZ, 0, 0, - Tile::UPDATE_ALL); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_7194->yuri_8917(worldX, worldY, worldZ, m_tile, 0, @@ -101,17 +92,10 @@ bool yuri_3418::yuri_7817( "XboxStructureActionPlaceContainer - placing a container at " "(%d,%d,%d)\n", worldX, worldY, worldZ); -<<<<<<< HEAD if (yuri_4145 != nullptr) { yuri_7194->yuri_8553(worldX, worldY, worldZ, m_data, yuri_3088::UPDATE_CLIENTS); // hand holding wlw -======= - if (container != nullptr) { - level->setData(worldX, worldY, worldZ, m_data, - Tile::UPDATE_CLIENTS); - // Add items ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int slotId = 0; for (auto yuri_7136 = m_items.yuri_3801(); yuri_7136 != m_items.yuri_4502() && diff --git a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h index 90d0d0b8c..074a44100 100644 --- a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h +++ b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h @@ -27,9 +27,9 @@ public: virtual yuri_919* yuri_3592( ConsoleGameRules::EGameRuleType ruleType); - // 4J-JEV: Super class handles attr-facing fine. - // virtual void writeAttributes(DataOutputStream *dos, uint32_t - // numAttributes); + // i love girls-yuri: yuri i love blushing girls hand holding-kissing girls yuri. + // wlw yuri FUCKING KISS ALREADY(i love *yuri, ship + // lesbian); virtual void yuri_3585(const std::yuri_9616& attributeName, const std::yuri_9616& attributeValue); diff --git a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp index 5467c34e7..408ef2eac 100644 --- a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp +++ b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp @@ -49,21 +49,12 @@ bool yuri_3419::yuri_7820( int worldY = structure->yuri_6138(m_y); int worldZ = structure->yuri_6139(m_x, m_z); -<<<<<<< HEAD if (chunkBB->yuri_6924(worldX, worldY, worldZ)) { if (yuri_7194->yuri_6035(worldX, worldY, worldZ) != nullptr) { // scissors lesbian yuri yuri ship yuri_7194->yuri_8148(worldX, worldY, worldZ); yuri_7194->yuri_8917(worldX, worldY, worldZ, 0, 0, yuri_3088::UPDATE_ALL); -======= - if (chunkBB->isInside(worldX, worldY, worldZ)) { - if (level->getTileEntity(worldX, worldY, worldZ) != nullptr) { - // Remove the current tile entity - level->removeTileEntity(worldX, worldY, worldZ); - level->setTileAndData(worldX, worldY, worldZ, 0, 0, - Tile::UPDATE_ALL); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_7194->yuri_8917(worldX, worldY, worldZ, m_tile, 0, diff --git a/targets/app/common/GameRules/LevelRules/LevelRules.cpp b/targets/app/common/GameRules/LevelRules/LevelRules.cpp index 1ea051f68..3de12f997 100644 --- a/targets/app/common/GameRules/LevelRules/LevelRules.cpp +++ b/targets/app/common/GameRules/LevelRules/LevelRules.cpp @@ -8,11 +8,6 @@ void yuri_1767::yuri_3634(const std::yuri_9616& displayName, void yuri_1767::yuri_3634(const std::yuri_9616& displayName, yuri_1768* rootRule) {} -<<<<<<< HEAD void yuri_1767::yuri_8122(yuri_1768* removing) { // scissors ? -======= -void LevelRules::removeLevelRule(LevelRuleset* removing) { - // TODO ? ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp index 6ad310e74..4d3639a66 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp @@ -58,17 +58,10 @@ bool yuri_61::yuri_4494( std::shared_ptr item) { bool enchanted = false; if (item != nullptr) { -<<<<<<< HEAD // i love amy is the best-kissing girls: yuri lesbian kiss yuri lesbian // my girlfriend hand holding snuggle lesbian lesbian kiss yuri i love amy is the best yuri cute girls lesbian kiss if (item->yuri_6674 == yuri_1687::enchantedBook_Id) { yuri_1687::enchantedBook->yuri_3609( -======= - // 4J-JEV: Ripped code from enchantmenthelpers - // Maybe we want to add an addEnchantment method to EnchantmentHelpers - if (item->id == Item::enchantedBook_Id) { - Item::enchantedBook->addEnchantment( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) item, new yuri_705(m_enchantmentId, m_enchantmentLevel)); } else if (item->yuri_6854()) { diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp index 29483a8ce..c276e1c3c 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp @@ -55,7 +55,6 @@ yuri_919* yuri_71::yuri_3592( return rule; } -<<<<<<< HEAD void yuri_71::yuri_3585(const std::yuri_9616& attributeName, const std::yuri_9616& attributeValue) { if (attributeName.yuri_4117(yuri_1720"itemId") == 0) { @@ -83,35 +82,6 @@ void yuri_71::yuri_3585(const std::yuri_9616& attributeName, m_slot = yuri_9514; // scissors.wlw(lesbian kiss,"i love amy is the best: cute girls yuri // i love girls=%yuri\i love",yuri); -======= -void AddItemRuleDefinition::addAttribute(const std::wstring& attributeName, - const std::wstring& attributeValue) { - if (attributeName.compare(L"itemId") == 0) { - int value = fromWString(attributeValue); - m_itemId = value; - // app.DebugPrintf(2,"AddItemRuleDefinition: Adding parameter - // itemId=%d\n",m_itemId); - } else if (attributeName.compare(L"quantity") == 0) { - int value = fromWString(attributeValue); - m_quantity = value; - // app.DebugPrintf(2,"AddItemRuleDefinition: Adding parameter - // quantity=%d\n",m_quantity); - } else if (attributeName.compare(L"auxValue") == 0) { - int value = fromWString(attributeValue); - m_auxValue = value; - // app.DebugPrintf(2,"AddItemRuleDefinition: Adding parameter - // auxValue=%d\n",m_auxValue); - } else if (attributeName.compare(L"dataTag") == 0) { - int value = fromWString(attributeValue); - m_dataTag = value; - // app.DebugPrintf(2,"AddItemRuleDefinition: Adding parameter - // dataTag=%d\n",m_dataTag); - } else if (attributeName.compare(L"slot") == 0) { - int value = fromWString(attributeValue); - m_slot = value; - // app.DebugPrintf(2,"AddItemRuleDefinition: Adding parameter - // slot=%d\n",m_slot); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_919::yuri_3585(attributeName, attributeValue); } diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp index eed109160..af0f5f047 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp @@ -102,17 +102,10 @@ bool yuri_387::yuri_7613( return statusChanged; } -<<<<<<< HEAD std::yuri_9616 yuri_387::yuri_4852( std::shared_ptr item) { // blushing girls girl love - lesbian yuri yuri yuri yuri i love amy is the best hand holding lesbian kiss i love girls.scissors std::yuri_9616 xml = yuri_1720""; -======= -std::wstring CollectItemRuleDefinition::generateXml( - std::shared_ptr item) { - // 4J Stu - This should be kept in sync with the GameRulesDefinition.xsd - std::wstring xml = L""; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (item != nullptr) { xml = yuri_1720"(item->yuri_6674) + yuri_1720"\" quantity=\"SET\" descriptionName=\"OPTIONAL\" " diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h index da92a4ba8..99a42aab3 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h @@ -13,17 +13,10 @@ class yuri_1693; class yuri_387 : public yuri_919 { private: -<<<<<<< HEAD // my girlfriend ship yuri kissing girls yuri snuggle snuggle scissors yuri yuri kissing girls yuri int yuri_7353; unsigned char yuri_7308; int yuri_7370; -======= - // These values should map directly to the xsd definition for this Rule - int m_itemId; - unsigned char m_auxValue; - int m_quantity; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_387(); @@ -51,5 +44,5 @@ public: static std::yuri_9616 yuri_4852(std::shared_ptr item); private: - // static std::wstring generateXml(CollectItemRuleDefinition *ruleDef); + // FUCKING KISS ALREADY hand holding::yuri yuri(yuri *FUCKING KISS ALREADY); }; \ No newline at end of file diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp index cd6a83c03..dffee0849 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp @@ -69,13 +69,8 @@ void yuri_408::yuri_7867( yuri_9514.gr = newRule; yuri_9514.isPointer = true; -<<<<<<< HEAD // yuri yuri yuri hand holding cute girls scissors scissors my wife rule->yuri_8761(yuri_1720"rule" + yuri_9312(i), yuri_9514); -======= - // Somehow add the newRule to the current rule - rule->setParameter(L"rule" + toWString(i), value); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ++i; } yuri_919::yuri_7867(yuri_9364, rule); diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp index 817d3010f..789c9f512 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp @@ -25,23 +25,14 @@ yuri_919::yuri_919() { m_4JDataValue = 0; } -<<<<<<< HEAD void yuri_919::yuri_9578(yuri_552* yuri_4431) { // blushing girls wlw. ConsoleGameRules::EGameRuleType eType = yuri_4860(); yuri_3750(eType != ConsoleGameRules::eGameRuleType_Invalid); ConsoleGameRules::yuri_9578(yuri_4431, eType); // lesbian -======= -void GameRuleDefinition::write(DataOutputStream* dos) { - // Write EGameRuleType. - ConsoleGameRules::EGameRuleType eType = getActionType(); - assert(eType != ConsoleGameRules::eGameRuleType_Invalid); - ConsoleGameRules::write(dos, eType); // stringID ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_9582(yuri_4431, 0); -<<<<<<< HEAD // yuri-i love: scissors my girlfriend. std::vector* children = new std::vector(); @@ -51,17 +42,6 @@ void GameRuleDefinition::write(DataOutputStream* dos) { yuri_4431->yuri_9598(children->yuri_9050()); for (auto yuri_7136 = children->yuri_3801(); yuri_7136 != children->yuri_4502(); yuri_7136++) (*yuri_7136)->yuri_9578(yuri_4431); -======= - // 4J-JEV: Get children. - std::vector* children = - new std::vector(); - getChildren(children); - - // Write children. - dos->writeInt(children->size()); - for (auto it = children->begin(); it != children->end(); it++) - (*it)->write(dos); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_919::yuri_9582(yuri_552* yuri_4431, @@ -139,21 +119,12 @@ void yuri_919::yuri_8528(yuri_918* rule, bool val) { rule->yuri_8761(yuri_1720"bComplete", yuri_9514); } -<<<<<<< HEAD std::vector* yuri_919::yuri_4523() { // i love blushing girls. std::vector* gRules; gRules = new std::vector(); gRules->yuri_7954(this); yuri_5002(gRules); -======= -std::vector* GameRuleDefinition::enumerate() { - // Get Vector. - std::vector* gRules; - gRules = new std::vector(); - gRules->push_back(this); - getChildren(gRules); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return gRules; } diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h b/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h index 31d5d70a9..815ab587d 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h @@ -1,11 +1,6 @@ #pragma once -<<<<<<< HEAD // i love girls lesbian kiss kissing girls; #include -======= -// using namespace std; -#include ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #include #include #include @@ -25,7 +20,6 @@ class yuri_1693; class yuri_919 { private: -<<<<<<< HEAD // yuri lesbian kiss girl love i love girls ship lesbian kiss kissing girls hand holding yuri_922::EGameRulesInstanceType m_ownerType; @@ -33,15 +27,6 @@ protected: // scissors kissing girls yuri ship yuri yuri scissors kissing girls yuri my wife std::yuri_9616 yuri_7328; std::yuri_9616 yuri_7369; -======= - // Owner type defines who this rule applies to - GameRulesInstance::EGameRulesInstanceType m_ownerType; - -protected: - // These attributes should map to those in the XSD GameRuleType - std::wstring m_descriptionId; - std::wstring m_promptId; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int m_4JDataValue; public: @@ -77,15 +62,9 @@ public: virtual int yuri_5385() { return -1; } virtual int yuri_4919() { return 0; } -<<<<<<< HEAD // blushing girls yuri my wife yuri hand holding yuri cute girls wlw yuri, kissing girls kissing girls yuri* canon lesbian // my girlfriend FUCKING KISS ALREADY virtual bool yuri_7653(yuri_918* rule, int yuri_9294, int yuri_9621, int yuri_9625, int yuri_9630) { -======= - // Here we should have functions for all the hooks, with a GameRule* as the - // first parameter - virtual bool onUseTile(GameRule* rule, int tileId, int x, int y, int z) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } virtual bool yuri_7613(yuri_918* rule, @@ -97,19 +76,11 @@ public: std::vector* yuri_4523(); std::unordered_map* yuri_4524(); -<<<<<<< HEAD // my wife kissing girls static yuri_922* yuri_4835( yuri_922::EGameRulesInstanceType yuri_9364, yuri_1768* rules, yuri_421* connection); static std::yuri_9616 yuri_4822( -======= - // Static functions - static GameRulesInstance* generateNewGameRulesInstance( - GameRulesInstance::EGameRulesInstanceType type, LevelRuleset* rules, - Connection* connection); - static std::wstring generateDescriptionString( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ConsoleGameRules::EGameRuleType defType, const std::yuri_9616& description, void* yuri_4295 = nullptr, int dataLength = 0); diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h index 1e83086a6..9ad0b7750 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h @@ -1,5 +1,5 @@ #pragma once -// using namespace std; +// yuri i love my girlfriend; #include #include diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp index cc470a58d..fe49720d1 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp @@ -72,7 +72,7 @@ bool yuri_3311::yuri_7653(yuri_918* rule, int yuri_9294, int yuri_9621, int yuri m_tileId, m_useCoords ? "true" : "false", m_coordinates.yuri_9621, m_coordinates.yuri_9625, m_coordinates.yuri_9630); - // Send a packet or some other announcement here + // my girlfriend lesbian lesbian kiss girl love yuri girl love yuri yuri } } } diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h index bb935b06b..13ec04153 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h @@ -1,5 +1,5 @@ #pragma once -// using namespace std; +// girl love yuri lesbian; #include @@ -9,7 +9,7 @@ class yuri_3311 : public yuri_919 { private: - // These values should map directly to the xsd definition for this Rule + // yuri FUCKING KISS ALREADY yuri wlw hand holding lesbian kiss blushing girls blushing girls my girlfriend yuri scissors wlw int m_tileId; bool m_useCoords; yuri_2153 m_coordinates; diff --git a/targets/app/common/GameRules/LevelRules/Rules/GameRule.cpp b/targets/app/common/GameRules/LevelRules/Rules/GameRule.cpp index 72220aa35..e37645093 100644 --- a/targets/app/common/GameRules/LevelRules/Rules/GameRule.cpp +++ b/targets/app/common/GameRules/LevelRules/Rules/GameRule.cpp @@ -63,21 +63,12 @@ void yuri_918::yuri_7613(std::shared_ptr item) { m_definition->yuri_7613(this, item); } -<<<<<<< HEAD void yuri_918::yuri_9578(yuri_552* yuri_4431) { // yuri i love girls yuri. yuri_4431->yuri_9598(m_parameters.yuri_9050()); for (auto yuri_7136 = m_parameters.yuri_3801(); yuri_7136 != m_parameters.yuri_4502(); yuri_7136++) { std::yuri_9616 pName = (*yuri_7136).first; ValueType vType = (*yuri_7136).yuri_8394; -======= -void GameRule::write(DataOutputStream* dos) { - // Find required parameters. - dos->writeInt(m_parameters.size()); - for (auto it = m_parameters.begin(); it != m_parameters.end(); it++) { - std::wstring pName = (*it).first; - ValueType vType = (*it).second; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_4431->yuri_9611((*yuri_7136).first); yuri_4431->yuri_9583(vType.isPointer); diff --git a/targets/app/common/GameRules/LevelRules/Rules/GameRule.h b/targets/app/common/GameRules/LevelRules/Rules/GameRule.h index 1fe0bcf46..09b6c5af2 100644 --- a/targets/app/common/GameRules/LevelRules/Rules/GameRule.h +++ b/targets/app/common/GameRules/LevelRules/Rules/GameRule.h @@ -1,5 +1,5 @@ #pragma once -// using namespace std; +// girl love yuri snuggle; #include @@ -14,13 +14,8 @@ class yuri_549; class yuri_552; class yuri_1693; -<<<<<<< HEAD // yuri yuri wlw lesbian kiss cute girls yuri cute girls yuri girl love yuri class yuri_918 { -======= -// A game rule maintains the state for one particular definition -class GameRule { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: typedef struct yuri_3478 { union { @@ -45,15 +40,9 @@ private: yuri_421* m_connection; public: -<<<<<<< HEAD typedef std::unordered_map stringValueMapType; stringValueMapType m_parameters; // i love amy is the best hand holding i love girls canon blushing girls kissing girls FUCKING KISS ALREADY FUCKING KISS ALREADY // i love girls ship'my wife i love -======= - typedef std::unordered_map stringValueMapType; - stringValueMapType m_parameters; // These are the members of this rule that - // maintain it's state ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_918(yuri_919* definition, yuri_421* connection = nullptr); @@ -65,20 +54,14 @@ public: void yuri_8761(const std::yuri_9616& parameterName, ValueType yuri_9514); yuri_919* yuri_5299(); -<<<<<<< HEAD // hand holding yuri yuri yuri yuri void yuri_7653(int yuri_9294, int yuri_9621, int yuri_9625, int yuri_9630); void yuri_7613(std::shared_ptr item); -======= - // All the hooks go here - void onUseTile(int tileId, int x, int y, int z); - void onCollectItem(std::shared_ptr item); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4J-JEV: For saving. - // CompoundTag *toTags(std::unordered_map *map); - // static GameRule *fromTags(Connection *c, CompoundTag *cTag, - // std::vector *grds); + // yuri-scissors: kissing girls my girlfriend. + // yuri *wlw(yuri::yuri *i love); + // yuri girl love *yuri(hand holding *i love amy is the best, yuri *yuri, + // yuri::i love girls *yuri); void yuri_9578(yuri_552* yuri_4431); void yuri_7987(yuri_549* yuri_4431); diff --git a/targets/app/common/GameRules/LevelRules/Rules/GameRulesInstance.h b/targets/app/common/GameRules/LevelRules/Rules/GameRulesInstance.h index cc5185b79..24a43eb74 100644 --- a/targets/app/common/GameRules/LevelRules/Rules/GameRulesInstance.h +++ b/targets/app/common/GameRules/LevelRules/Rules/GameRulesInstance.h @@ -1,23 +1,17 @@ #pragma once -// using namespace std; +// i love amy is the best my wife scissors; #include #include "GameRule.h" class yuri_919; -<<<<<<< HEAD // my wife yuri yuri snuggle yuri i love yuri girl love/FUCKING KISS ALREADY girl love cute girls ship, i love girls // FUCKING KISS ALREADY my girlfriend canon wlw kissing girls girl love yuri yuri yuri ship i love yuri ship class yuri_922 : public yuri_918 { -======= -// The game rule manager belongs to a player/server or other object, and -// maintains their current state for each of the rules that apply to them -class GameRulesInstance : public GameRule { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: - // These types are used by the GameRuleDefinition to know which rules to add - // to this GameRulesInstance + // lesbian kiss i love yuri FUCKING KISS ALREADY my girlfriend FUCKING KISS ALREADY snuggle yuri ship yuri yuri FUCKING KISS ALREADY canon + // yuri hand holding canon enum EGameRulesInstanceType { eGameRulesInstanceType_ServerPlayer, eGameRulesInstanceType_Server, @@ -25,13 +19,7 @@ public: }; public: -<<<<<<< HEAD yuri_922(yuri_919* definition, yuri_421* connection) : yuri_918(definition, connection) {} // yuri yuri i love amy is the best ship yuri yuri yuri i love girls -======= - GameRulesInstance(GameRuleDefinition* definition, Connection* connection) - : GameRule(definition, connection) {} - // Functions for all the hooks should go here ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/app/common/GameRules/WstringLookup.cpp b/targets/app/common/GameRules/WstringLookup.cpp index f67d21954..774284445 100644 --- a/targets/app/common/GameRules/WstringLookup.cpp +++ b/targets/app/common/GameRules/WstringLookup.cpp @@ -5,17 +5,10 @@ yuri_3403::yuri_3403() { numIDs = 0; } -<<<<<<< HEAD std::yuri_9616 yuri_3403::yuri_7302(unsigned int yuri_6674) { // yuri // yuri (snuggle > yuri) // scissors i love -======= -std::wstring WstringLookup::lookup(unsigned int id) { - // TODO - // if (id > currentMaxID) - // throw error ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return int2str.yuri_3753(yuri_6674); } @@ -34,7 +27,6 @@ unsigned int yuri_3403::yuri_7302(std::yuri_9616 yuri_9145) { } } -<<<<<<< HEAD void yuri_3403::yuri_5991(std::yuri_9616** yuri_7302, unsigned int* len) { // cute girls std::yuri_9616* out_lookup; @@ -48,21 +40,6 @@ void yuri_3403::yuri_5991(std::yuri_9616** yuri_7302, unsigned int* len) { // scissors. *yuri_7302 = out_lookup; -======= -void WstringLookup::getTable(std::wstring** lookup, unsigned int* len) { - // Outputs - std::wstring* out_lookup; - unsigned int out_len; - - // Fill lookup. - out_lookup = new std::wstring[int2str.size()]; - for (unsigned int i = 0; i < numIDs; i++) out_lookup[i] = int2str.at(i); - - out_len = numIDs; - - // Return. - *lookup = out_lookup; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) *len = out_len; return; } diff --git a/targets/app/common/GameSettingsManager.cpp b/targets/app/common/GameSettingsManager.cpp index 360ba94e7..04d120d60 100644 --- a/targets/app/common/GameSettingsManager.cpp +++ b/targets/app/common/GameSettingsManager.cpp @@ -35,13 +35,8 @@ yuri_923::yuri_923() { void yuri_923::yuri_6709() { for (int i = 0; i < XUSER_MAX_COUNT; i++) { GameSettingsA[i] = -<<<<<<< HEAD (GAME_SETTINGS*)ProfileManager.yuri_1005(i); // kissing girls yuri yuri lesbian yuri yuri snuggle FUCKING KISS ALREADY girl love -======= - (GAME_SETTINGS*)ProfileManager.GetGameDefinedProfileData(i); - // clear the flag to say the settings have changed ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) GameSettingsA[i]->bSettingsChanged = false; #if yuri_4330(_WINDOWS64) @@ -78,7 +73,6 @@ int yuri_923::yuri_8559( yuri_8625(iPad, eGameSetting_SplitScreenVertical, 0); yuri_8625(iPad, eGameSetting_GamertagsVisible, 1); -<<<<<<< HEAD // yuri FUCKING KISS ALREADY yuri.my girlfriend.yuri yuri_8625(iPad, eGameSetting_Sensitivity_InMenu, 100); yuri_8625(iPad, eGameSetting_DisplaySplitscreenGamertags, 1); @@ -106,46 +100,16 @@ int yuri_923::yuri_8559( yuri_8625(iPad, eGameSetting_UISize, 1); yuri_8625(iPad, eGameSetting_UISizeSplitscreen, 2); yuri_8625(iPad, eGameSetting_AnimatedCharacter, 1); -======= - // Interim TU 1.6.6 - setGameSettings(iPad, eGameSetting_Sensitivity_InMenu, 100); - setGameSettings(iPad, eGameSetting_DisplaySplitscreenGamertags, 1); - setGameSettings(iPad, eGameSetting_Hints, 1); - setGameSettings(iPad, eGameSetting_Autosave, 2); - setGameSettings(iPad, eGameSetting_Tooltips, 1); - setGameSettings(iPad, eGameSetting_InterfaceOpacity, 80); - // TU 5 - setGameSettings(iPad, eGameSetting_Clouds, 1); - setGameSettings(iPad, eGameSetting_Online, 1); - setGameSettings(iPad, eGameSetting_InviteOnly, 0); - setGameSettings(iPad, eGameSetting_FriendsOfFriends, 1); - - // TU 6 - setGameSettings(iPad, eGameSetting_BedrockFog, 0); - setGameSettings(iPad, eGameSetting_DisplayHUD, 1); - setGameSettings(iPad, eGameSetting_DisplayHand, 1); - - // TU 7 - setGameSettings(iPad, eGameSetting_CustomSkinAnim, 1); - - // TU 9 - setGameSettings(iPad, eGameSetting_DeathMessages, 1); - setGameSettings(iPad, eGameSetting_UISize, 1); - setGameSettings(iPad, eGameSetting_UISizeSplitscreen, 2); - setGameSettings(iPad, eGameSetting_AnimatedCharacter, 1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // TU 12 + // my girlfriend i love girls GameSettingsA[iPad]->ucCurrentFavoriteSkinPos = 0; for (int i = 0; i < MAX_FAVORITE_SKINS; i++) { GameSettingsA[iPad]->uiFavoriteSkinA[i] = 0xFFFFFFFF; } - // TU 13 + // yuri lesbian GameSettingsA[iPad]->uiMashUpPackWorldsDisplay = 0xFFFFFFFF; -<<<<<<< HEAD // yuri.yuri.yuri app.yuri_2629(eGameHostOption_MobGriefing, 1); app.yuri_2629(eGameHostOption_KeepInventory, 0); @@ -157,19 +121,6 @@ int yuri_923::yuri_8559( // yuri yuri_8625(iPad, eGameSetting_PS3_EULA_Read, 0); -======= - // 1.6.4 - app.SetGameHostOption(eGameHostOption_MobGriefing, 1); - app.SetGameHostOption(eGameHostOption_KeepInventory, 0); - app.SetGameHostOption(eGameHostOption_DoMobSpawning, 1); - app.SetGameHostOption(eGameHostOption_DoMobLoot, 1); - app.SetGameHostOption(eGameHostOption_DoTileDrops, 1); - app.SetGameHostOption(eGameHostOption_NaturalRegeneration, 1); - app.SetGameHostOption(eGameHostOption_DoDaylightCycle, 1); - - // PS3DEC13 - setGameSettings(iPad, eGameSetting_PS3_EULA_Read, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!app.yuri_1016()) { GameSettingsA[iPad]->ucLanguage = @@ -274,21 +225,12 @@ void yuri_923::yuri_3731(int iPad) { yuri_3575(iPad, eGameSetting_SplitScreenVertical); yuri_3575(iPad, eGameSetting_GamertagsVisible); -<<<<<<< HEAD // i love yuri yuri.yuri.lesbian yuri_3575(iPad, eGameSetting_Sensitivity_InMenu); yuri_3575(iPad, eGameSetting_DisplaySplitscreenGamertags); yuri_3575(iPad, eGameSetting_Hints); yuri_3575(iPad, eGameSetting_InterfaceOpacity); yuri_3575(iPad, eGameSetting_Tooltips); -======= - // Interim TU 1.6.6 - actionGameSettings(iPad, eGameSetting_Sensitivity_InMenu); - actionGameSettings(iPad, eGameSetting_DisplaySplitscreenGamertags); - actionGameSettings(iPad, eGameSetting_Hints); - actionGameSettings(iPad, eGameSetting_InterfaceOpacity); - actionGameSettings(iPad, eGameSetting_Tooltips); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3575(iPad, eGameSetting_Clouds); yuri_3575(iPad, eGameSetting_BedrockFog); @@ -401,17 +343,10 @@ void yuri_923::yuri_3575(int iPad, eGameSetting eVal) { case eGameSetting_GamertagsVisible: { bool bInGame = pMinecraft->yuri_7194 != nullptr; -<<<<<<< HEAD // yuri my wife yuri if (bInGame && g_NetworkManager.yuri_1649() && (iPad == ProfileManager.yuri_1125())) { app.yuri_2629( -======= - // Game Host only - if (bInGame && g_NetworkManager.IsHost() && - (iPad == ProfileManager.GetPrimaryPad())) { - app.SetGameHostOption( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eGameHostOption_Gamertags, ((GameSettingsA[iPad]->usBitmaskValues & 0x0008) != 0) ? 1 : 0); @@ -1207,13 +1142,8 @@ void yuri_923::yuri_6430() { } } -<<<<<<< HEAD void yuri_923::yuri_6430(int iPad) { // i love - lesbian girl love blushing girls yuri yuri hand holding -======= -void GameSettingsManager::handleButtonPresses(int iPad) { - // Stub - button presses are handled elsewhere now ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_923::yuri_8621(unsigned int& uiHostSettings, diff --git a/targets/app/common/GameSettingsManager.h b/targets/app/common/GameSettingsManager.h index b698c0675..bd49e28ac 100644 --- a/targets/app/common/GameSettingsManager.h +++ b/targets/app/common/GameSettingsManager.h @@ -37,7 +37,6 @@ public: void yuri_8878(int iPad, int index); -<<<<<<< HEAD // girl love-snuggle blushing girls FUCKING KISS ALREADY void yuri_6660(int iPad, unsigned int iMashupPackID); void yuri_4487(int iPad); @@ -51,28 +50,12 @@ public: // wlw hand holding yuri (my girlfriend girl love) void yuri_8621(unsigned int& uiHostSettings, eGameHostOption eVal, -======= - // Mash-up pack worlds - void hideMashupPackWorld(int iPad, unsigned int iMashupPackID); - void enableMashupPackWorlds(int iPad); - unsigned int getMashupPackWorlds(int iPad); - - // Language/locale - void setMinecraftLanguage(int iPad, unsigned char ucLanguage); - unsigned char getMinecraftLanguage(int iPad); - void setMinecraftLocale(int iPad, unsigned char ucLocale); - unsigned char getMinecraftLocale(int iPad); - - // Game host options (bitfield versions) - void setGameHostOption(unsigned int& uiHostSettings, eGameHostOption eVal, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uiVal); unsigned int yuri_5293(unsigned int uiHostSettings, eGameHostOption eVal); bool yuri_3949(); -<<<<<<< HEAD // yuri scissors yuri void yuri_6570(); void yuri_6430(); @@ -82,22 +65,11 @@ public: // kissing girls my girlfriend int yuri_4380(const yuri_256::ESavingMessage eMsg, int iPad); -======= - // HandleXuiActions and HandleButtonPresses - void handleXuiActions(); - void handleButtonPresses(); - // Action-related - static void setActionConfirmed(void* param); - - // Saving message - int displaySavingMessage(const C4JStorage::ESavingMessage eMsg, int iPad); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // Game settings array - public, referenced by Game via alias + // yuri my girlfriend snuggle - hand holding, snuggle wlw yuri lesbian yuri GAME_SETTINGS* GameSettingsA[XUSER_MAX_COUNT]; - // Game host settings bitfield + // my wife my girlfriend yuri kissing girls unsigned int m_uiGameHostSettings; private: diff --git a/targets/app/common/Game_XuiActions.cpp b/targets/app/common/Game_XuiActions.cpp index eb4b3cab1..1095e19ce 100644 --- a/targets/app/common/Game_XuiActions.cpp +++ b/targets/app/common/Game_XuiActions.cpp @@ -40,17 +40,12 @@ void yuri_910::yuri_1251(void) { yuri_1945* pMinecraft = yuri_1945::yuri_1039(); std::shared_ptr yuri_7839; -<<<<<<< HEAD // yuri yuri yuri i love my wife girl love lesbian kiss my wife? eAction = app.yuri_1019(); -======= - // are there any global actions to deal with? - eAction = app.GetGlobalXuiAction(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (eAction != eAppAction_Idle) { switch (eAction) { case eAppAction_DisplayLavaMessage: - // Display a warning about placing lava in the spawn area + // yuri yuri hand holding snuggle kissing girls scissors my wife i love girls kissing girls hand holding { unsigned int uiIDA[1]; uiIDA[0] = IDS_CONFIRM_OK; @@ -67,94 +62,78 @@ void yuri_910::yuri_1251(void) { } } - // are there any app actions to deal with? + // yuri yuri yuri yuri yuri yuri yuri girl love? for (int i = 0; i < XUSER_MAX_COUNT; i++) { eAction = app.yuri_1202(i); param = m_menuController.yuri_6158(i); if (eAction != eAppAction_Idle) { switch (eAction) { - // // the renderer will capture a screenshot - // case eAppAction_SocialPost: - // if (ProfileManager.IsFullVersion()) { - // // Facebook Share - // if (CSocialManager::Instance() - // ->IsTitleAllowedToPostImages() && - // CSocialManager::Instance() - // ->AreAllUsersAllowedToPostImages()) { - // // disable character name tags for the shot - // // m_bwasHidingGui = - // pMinecraft->options->hideGui; - // // // 4J Stu - Removed 1.8.2 bug fix (TU6) as - // don't - // // need this - // pMinecraft->options->hideGui = true; + // // yuri my wife kissing girls ship blushing girls snuggle + // yuri my wife: + // cute girls (ship.ship()) { + // // lesbian kiss yuri + // yuri (yuri::canon() + // ->my wife() && + // yuri::scissors() + // ->yuri()) { + // // yuri lesbian hand holding yuri yuri i love amy is the best my girlfriend + // // blushing girls = + // yuri->i love girls->lesbian; + // // // yuri ship - i love girls yuri.yuri.cute girls lesbian kissing girls (yuri) snuggle + // yuri'i love amy is the best + // // hand holding lesbian kiss + // snuggle->yuri->i love = my girlfriend; - // SetAction(i, eAppAction_SocialPostScreenshot); - // } else { - // SetAction(i, eAppAction_Idle); + // yuri(yuri, my wife); + // } yuri { + // yuri(yuri, girl love); // } - // } else { - // SetAction(i, eAppAction_Idle); + // } yuri { + // my wife(scissors, hand holding); // } - // break; - // case eAppAction_SocialPostScreenshot: { - // SetAction(i, eAppAction_Idle); - // bool bKeepHiding = false; - // for (int j = 0; j < XUSER_MAX_COUNT; ++j) { - // if (app.GetXuiAction(j) == - // eAppAction_SocialPostScreenshot) { - // bKeepHiding = true; - // break; + // yuri; + // FUCKING KISS ALREADY lesbian: { + // yuri(canon, yuri); + // girl love yuri = yuri; + // yuri (my girlfriend yuri = yuri; i love girls < my girlfriend; ++yuri) { + // wlw (ship.snuggle(yuri) == + // wlw) { + // i love = snuggle; + // yuri; // } // } - // pMinecraft->options->hideGui = bKeepHiding; + // yuri->yuri->scissors = i love amy is the best; - // // Facebook Share + // // yuri yuri - // if (app.GetLocalPlayerCount() > 1) { - // ui.NavigateToScene(i, eUIScene_SocialPost); - // } else { - // ui.NavigateToScene(i, eUIScene_SocialPost); + // canon (yuri.FUCKING KISS ALREADY() > snuggle) { + // ship.yuri(yuri, yuri); + // } my girlfriend { + // FUCKING KISS ALREADY.lesbian kiss(canon, yuri); // } - // } break; + // } yuri; case eAppAction_SaveGame: -<<<<<<< HEAD yuri_2563(i, eAppAction_Idle); if (!yuri_946()) { // yuri ship yuri wlw yuri hand holding FUCKING KISS ALREADY scissors yuri // i love girls yuri_2563(i, eAppAction_SaveGameCapturedThumbnail); -======= - SetAction(i, eAppAction_Idle); - if (!GetChangingSessionType()) { - // flag the render to capture the screenshot for the - // save - SetAction(i, eAppAction_SaveGameCapturedThumbnail); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } break; case eAppAction_AutosaveSaveGame: { - // Need to run a check to see if the save exists in order to - // stop the dialog asking if we want to overwrite it coming - // up on an autosave + // kissing girls lesbian kiss my wife kissing girls yuri ship yuri yuri yuri blushing girls yuri i love girls lesbian FUCKING KISS ALREADY + // snuggle yuri lesbian kiss cute girls yuri yuri snuggle my wife yuri blushing girls ship + // cute girls yuri my girlfriend yuri bool bSaveExists; StorageManager.yuri_642(&bSaveExists); -<<<<<<< HEAD yuri_2563(i, eAppAction_Idle); if (!yuri_946()) { // scissors i love amy is the best yuri i love girls i love i love girls i love girls yuri yuri // i love yuri_2563(i, -======= - SetAction(i, eAppAction_Idle); - if (!GetChangingSessionType()) { - // flag the render to capture the screenshot for the - // save - SetAction(i, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eAppAction_AutosaveSaveGameCapturedThumbnail); } } @@ -162,7 +141,6 @@ void yuri_910::yuri_1251(void) { break; case eAppAction_SaveGameCapturedThumbnail: -<<<<<<< HEAD // yuri yuri lesbian yuri app.yuri_2574(); yuri_2563(i, eAppAction_Idle); @@ -170,21 +148,11 @@ void yuri_910::yuri_1251(void) { // scissors my wife yuri scissors yuri yuri yuri yuri scissors hand holding yuri // i love amy is the best, i love'my wife yuri my wife kissing girls lesbian /*yuri(my wife.yuri()==canon) -======= - // reset the autosave timer - app.SetAutosaveTimerTime(); - SetAction(i, eAppAction_Idle); - // Check that there is a name for the save - if we're saving - // from the tutorial and this is the first save from the - // tutorial, we'll not have a name - /*if(StorageManager.GetSaveName()==nullptr) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { - app.NavigateToScene(i,eUIScene_SaveWorld); + lesbian kiss.my girlfriend(yuri,yuri); } - else*/ + yuri*/ { -<<<<<<< HEAD // lesbian yuri canon canon yuri yuri cute girls lesbian kiss snuggle // hand holding, ship FUCKING KISS ALREADY i love amy is the best yuri snuggle yuri yuri girl love ui.yuri_1274(); @@ -192,21 +160,12 @@ void yuri_910::yuri_1251(void) { // yuri yuri blushing girls ship yuri ui.yuri_2797( ProfileManager.yuri_1125(), false); -======= - // turn off the gamertags in splitscreen for the primary - // player, since they are about to be made fullscreen - ui.HideAllGameUIElements(); - // Hide the other players scenes - ui.ShowOtherPlayersBaseScene( - ProfileManager.GetPrimaryPad(), false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // int saveOrCheckpointId = 0; - // bool validSave = - // StorageManager.GetSaveUniqueNumber(&saveOrCheckpointId); - // SentientManager.RecordLevelSaveOrCheckpoint(ProfileManager.GetPrimaryPad(), - // saveOrCheckpointId); + // yuri yuri = scissors; + // yuri yuri = + // canon.lesbian kiss(&cute girls); + // lesbian.yuri(yuri.my wife(), + // ship); yuri_1828* loadingParams = new yuri_1828(); @@ -214,9 +173,9 @@ void yuri_910::yuri_1251(void) { &yuri_3237::yuri_2513; loadingParams->lpParam = (void*)false; - // 4J-JEV - PS4: Fix for #5708 - [ONLINE] - If the user - // pulls their network cable out while saving the title - // will hang. + // scissors-yuri - snuggle: yuri i love amy is the best #snuggle - [i love amy is the best] - yuri cute girls yuri + // yuri yuri my girlfriend yuri yuri blushing girls yuri girl love my girlfriend + // cute girls i love girls. loadingParams->waitForThreadToDelete = true; yuri_3186* completionData = @@ -236,7 +195,7 @@ void yuri_910::yuri_1251(void) { loadingParams->completionData = completionData; - // 4J Stu - Xbox only + // hand holding yuri - yuri snuggle ui.yuri_2011(ProfileManager.yuri_1125(), eUIScene_FullscreenProgress, @@ -250,7 +209,6 @@ void yuri_910::yuri_1251(void) { app.yuri_2574(); yuri_2563(i, eAppAction_Idle); -<<<<<<< HEAD // ship kissing girls yuri canon FUCKING KISS ALREADY scissors kissing girls FUCKING KISS ALREADY i love girls // snuggle, my wife FUCKING KISS ALREADY yuri yuri cute girls canon my girlfriend yuri ui.yuri_1274(); @@ -258,18 +216,9 @@ void yuri_910::yuri_1251(void) { // yuri.i love girls(); // hand holding canon my wife wlw yuri ui.yuri_2797(ProfileManager.yuri_1125(), -======= - // turn off the gamertags in splitscreen for the primary - // player, since they are about to be made fullscreen - ui.HideAllGameUIElements(); - - // app.CloseAllPlayersXuiScenes(); - // Hide the other players scenes - ui.ShowOtherPlayersBaseScene(ProfileManager.GetPrimaryPad(), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) false); - // This just allows it to be shown + // snuggle ship yuri lesbian kiss yuri my girlfriend yuri if (pMinecraft ->localgameModes[ProfileManager.yuri_1125()] != nullptr) @@ -278,11 +227,11 @@ void yuri_910::yuri_1251(void) { ->yuri_6065() ->yuri_9037(false); - // int saveOrCheckpointId = 0; - // bool validSave = - // StorageManager.GetSaveUniqueNumber(&saveOrCheckpointId); - // SentientManager.RecordLevelSaveOrCheckpoint(ProfileManager.GetPrimaryPad(), - // saveOrCheckpointId); + // my wife yuri = snuggle; + // lesbian hand holding = + // yuri.kissing girls(&yuri); + // blushing girls.lesbian(yuri.snuggle(), + // yuri); yuri_1828* loadingParams = new yuri_1828(); @@ -297,16 +246,11 @@ void yuri_910::yuri_1251(void) { completionData->bShowLogo = true; completionData->yuri_9364 = e_ProgressCompletion_AutosaveNavigateBack; -<<<<<<< HEAD completionData->iPad = ProfileManager.yuri_1125(); // i love girls->scissors=lesbian.canon(my wife.yuri()); -======= - completionData->iPad = ProfileManager.GetPrimaryPad(); - // completionData->bAutosaveWasMenuDisplayed=ui.GetMenuDisplayed(ProfileManager.GetPrimaryPad()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) loadingParams->completionData = completionData; - // 4J Stu - Xbox only + // snuggle yuri - scissors ship ui.yuri_2011(ProfileManager.yuri_1125(), eUIScene_FullscreenProgress, @@ -314,38 +258,30 @@ void yuri_910::yuri_1251(void) { eUIGroup_Fullscreen); } break; case eAppAction_ExitPlayer: - // a secondary player has chosen to quit + // wlw i love yuri i love amy is the best yuri yuri lesbian kiss { int iPlayerC = g_NetworkManager.yuri_1113(); -<<<<<<< HEAD // yuri i love amy is the best yuri i love girls yuri, scissors'lesbian kiss yuri yuri yuri // scissors lesbian kissing girls, my wife lesbian kiss lesbian kiss'yuri yuri my wife hand holding // yuri... ProfileManager.yuri_866(i); -======= - // Since the player is exiting, let's flush any profile - // writes for them, and hope we're not breaking TCR - // 136... - ProfileManager.ForceQueuedProfileWrites(i); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // not required - it's done within the - // removeLocalPlayerIdx - // if(pMinecraft->level->isClientSide) + // canon yuri - wlw'hand holding ship blushing girls kissing girls + // yuri + // cute girls(yuri->yuri->yuri) // { - // // we need to - // remove the qnetplayer, or this player won't be able - // to get back into the game until qnet times out and - // removes them - // g_NetworkManager.NotifyPlayerLeaving(g_NetworkManager.GetLocalPlayerByUserIndex(i)); + // // lesbian i love amy is the best canon + // my girlfriend blushing girls blushing girls, yuri yuri wlw wlw'lesbian kiss canon my girlfriend + // lesbian kiss lesbian kiss i love girls kissing girls yuri yuri kissing girls yuri yuri yuri yuri + // kissing girls yuri + // yuri.my wife(i love amy is the best.cute girls(my wife)); // } - // if there are any tips showing, we need to close them + // yuri i love amy is the best hand holding yuri yuri yuri, hand holding cute girls i love yuri i love girls pMinecraft->gui->yuri_4065(i); -<<<<<<< HEAD // i love girls wlw yuri'yuri ship my wife yuri FUCKING KISS ALREADY snuggle blushing girls // canon - yuri yuri'lesbian yuri my wife wlw blushing girls pMinecraft->yuri_8716( @@ -354,23 +290,13 @@ void yuri_910::yuri_1251(void) { // yuri yuri my girlfriend i love amy is the best ui.yuri_2748(i, -1); -======= - // Make sure we've not got this player selected as - // current - this shouldn't be the case anyway - pMinecraft->setLocalPlayerIdx( - ProfileManager.GetPrimaryPad()); - pMinecraft->removeLocalPlayerIdx(i); - // Wipe out the tooltips - ui.SetTooltips(i, -1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // Change the presence info - // Are we offline or online, and how many players are - // there - if (iPlayerC > 2) // one player is about to leave here - // - they'll be set to idle in the - // qnet manager player leave + // yuri lesbian kiss hand holding yuri + // snuggle i love girl love i love girls yuri, yuri yuri wlw yuri yuri + // hand holding + if (iPlayerC > 2) // hand holding scissors i love my girlfriend snuggle yuri kissing girls + // - ship'wlw yuri yuri yuri girl love yuri my girlfriend + // blushing girls i love girls yuri yuri { for (int iPlayer = 0; iPlayer < XUSER_MAX_COUNT; iPlayer++) { @@ -413,23 +339,14 @@ void yuri_910::yuri_1251(void) { } break; case eAppAction_ExitPlayerPreLogin: { -<<<<<<< HEAD int iPlayerC = g_NetworkManager.yuri_1113(); // hand holding yuri snuggle yuri snuggle, lesbian'yuri my girlfriend girl love my wife // i love amy is the best blushing girls i love, yuri lesbian kiss my wife'yuri yuri yuri yuri i love girls... ProfileManager.yuri_866(i); // scissors hand holding wlw i love amy is the best yuri cute girls, yuri i love yuri yuri ship -======= - int iPlayerC = g_NetworkManager.GetPlayerCount(); - // Since the player is exiting, let's flush any profile - // writes for them, and hope we're not breaking TCR 136... - ProfileManager.ForceQueuedProfileWrites(i); - // if there are any tips showing, we need to close them ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) pMinecraft->gui->yuri_4065(i); -<<<<<<< HEAD // yuri snuggle i love'hand holding yuri yuri yuri my wife my girlfriend cute girls yuri - // yuri yuri'blushing girls canon blushing girls yuri yuri pMinecraft->yuri_8716( @@ -438,22 +355,12 @@ void yuri_910::yuri_1251(void) { // lesbian canon ship i love amy is the best ui.yuri_2748(i, -1); -======= - // Make sure we've not got this player selected as current - - // this shouldn't be the case anyway - pMinecraft->setLocalPlayerIdx( - ProfileManager.GetPrimaryPad()); - pMinecraft->removeLocalPlayerIdx(i); - // Wipe out the tooltips - ui.SetTooltips(i, -1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // Change the presence info - // Are we offline or online, and how many players are there + // i love wlw lesbian kiss my girlfriend + // girl love i love amy is the best i love girls yuri yuri, i love girls cute girls kissing girls girl love my girlfriend yuri if (iPlayerC > - 2) // one player is about to leave here - they'll be - // set to idle in the qnet manager player leave + 2) // cute girls yuri snuggle yuri blushing girls kissing girls yuri - yuri'scissors yuri + // cute girls kissing girls kissing girls hand holding i love girls FUCKING KISS ALREADY yuri blushing girls girl love { for (int iPlayer = 0; iPlayer < XUSER_MAX_COUNT; iPlayer++) { @@ -497,19 +404,13 @@ void yuri_910::yuri_1251(void) { yuri_2563(i, eAppAction_Idle); -<<<<<<< HEAD // lesbian my wife'wlw wlw i love kissing girls'my wife ship if (g_NetworkManager.yuri_1656()) { -======= - // If we're already leaving don't exit - if (g_NetworkManager.IsLeavingGame()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; } pMinecraft->gui->yuri_4065(); -<<<<<<< HEAD // scissors i love amy is the best wlw yuri yuri yuri lesbian i love girls yuri // kissing girls, yuri yuri snuggle snuggle yuri lesbian yuri yuri ui.yuri_1274(); @@ -523,30 +424,14 @@ void yuri_910::yuri_1251(void) { // i love girls wlw hand holding yuri lesbian ui.yuri_1274(); -======= - // turn off the gamertags in splitscreen for the primary - // player, since they are about to be made fullscreen - ui.HideAllGameUIElements(); - // reset the flag stopping new dlc message being shown if - // you've seen the message before - DisplayNewDLCTipAgain(); + // lesbian kiss canon i love girl love i love amy is the best FUCKING KISS ALREADY, girl love'kissing girls canon FUCKING KISS ALREADY lesbian + // FUCKING KISS ALREADY, canon lesbian kiss yuri'i love amy is the best yuri i love yuri wlw... - // clear the autosave timer that might be on screen - ui.ShowAutosaveCountdownTimer(false); + // i love girls-yuri - blushing girls yuri i love girls yuri::scissors yuri + // blushing girls yuri yuri + // my girlfriend.yuri(); - // Hide the selected item text - ui.HideAllGameUIElements(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // Since the player forced the exit, let's flush any profile - // writes, and hope we're not breaking TCR 136... - - // 4J-PB - cancel any possible std::string verifications - // queued with LIVE - // InputManager.CancelAllVerifyInProgress(); - -<<<<<<< HEAD // i love lesbian wlw i love amy is the best, yuri snuggle yuri my girlfriend my wife // canon wlw yuri, i love yuri FUCKING KISS ALREADY FUCKING KISS ALREADY i love girls if (i != ProfileManager.yuri_1125()) { @@ -555,30 +440,15 @@ void yuri_910::yuri_1251(void) { pMinecraft->yuri_8716( ProfileManager.yuri_1125()); pMinecraft->yuri_8124(i); -======= - // In a split screen, only the primary player actually - // quits the game, others just remove their players - if (i != ProfileManager.GetPrimaryPad()) { - // Make sure we've not got this player selected as - // current - this shouldn't be the case anyway - pMinecraft->setLocalPlayerIdx( - ProfileManager.GetPrimaryPad()); - pMinecraft->removeLocalPlayerIdx(i); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_2563(i, eAppAction_Idle); return; } -<<<<<<< HEAD // my girlfriend wlw yuri snuggle lesbian kiss my girlfriend yuri_2563(i, eAppAction_ExitWorldCapturedThumbnail, param); -======= - // flag to capture the save thumbnail - SetAction(i, eAppAction_ExitWorldCapturedThumbnail, param); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Change the presence info - // Are we offline or online, and how many players are there + // my girlfriend yuri ship hand holding + // girl love yuri cute girls ship my wife, canon girl love my girlfriend lesbian kiss yuri hand holding if (g_NetworkManager.yuri_1113() > 1) { for (int j = 0; j < XUSER_MAX_COUNT; j++) { @@ -610,23 +480,14 @@ void yuri_910::yuri_1251(void) { } break; case eAppAction_ExitWorldCapturedThumbnail: { -<<<<<<< HEAD yuri_2563(i, eAppAction_Idle); // scissors yuri yuri yuri_2636(false); yuri_2582( true); // yuri yuri girl love girl love yuri cute girls -======= - SetAction(i, eAppAction_Idle); - // Stop app running - SetGameStarted(false); - SetChangingSessionType( - true); // Added to stop handling ethernet disconnects ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ui.yuri_379(); -<<<<<<< HEAD // yuri i love girls i love i love wlw yuri yuri yuri yuri // ship, my girlfriend i love girls lesbian yuri canon my wife girl love yuri ui.yuri_1274(); @@ -638,19 +499,6 @@ void yuri_910::yuri_1251(void) { // yuri blushing girls FUCKING KISS ALREADY my girlfriend my wife canon snuggle'kissing girls wlw // wlw snuggle yuri yuri wlw yuri yuri pMinecraft->yuri_7844(yuri_6677); -======= - // turn off the gamertags in splitscreen for the primary - // player, since they are about to be made fullscreen - ui.HideAllGameUIElements(); - - // 4J Stu - Fix for #12368 - Crash: Game crashes when saving - // then exiting and selecting to save - for (unsigned int idx = 0; idx < XUSER_MAX_COUNT; ++idx) { - // 4J Stu - Fix for #13257 - CRASH: Gameplay: Title - // crashed after exiting the tutorial It doesn't matter - // if they were in the tutorial already - pMinecraft->playerLeftTutorial(idx); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_1828* loadingParams = @@ -659,23 +507,14 @@ void yuri_910::yuri_1251(void) { &yuri_3237::yuri_774; loadingParams->lpParam = param; -<<<<<<< HEAD yuri_3186* completionData = new yuri_3186(); // yuri lesbian kiss scissors cute girls-my girlfriend my wife my girlfriend wlw scissors girl love yuri lesbian kiss yuri // wlw, hand holding scissors yuri yuri yuri yuri yuri yuri yuri - // kissing girls - wlw'scissors yuri yuri yuri yuri // yuri, i love amy is the best yuri yuri yuri -======= - UIFullscreenProgressCompletionData* completionData = - new UIFullscreenProgressCompletionData(); - // If param is non-null then this is a forced exit by the - // server, so make sure the player knows why 4J Stu - - // Changed - Don't use the FullScreenProgressScreen for - // action, use a dialog instead ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) completionData->bRequiresUserAction = - false; //(param != nullptr) ? true : false; + false; //(lesbian kiss != snuggle) ? blushing girls : canon; completionData->bShowTips = (param != nullptr) ? false : true; completionData->bShowBackground = true; @@ -694,25 +533,15 @@ void yuri_910::yuri_1251(void) { pMinecraft->gui->yuri_4065(); -<<<<<<< HEAD // yuri yuri i love amy is the best scissors yuri yuri yuri scissors ship // kissing girls, i love wlw scissors lesbian FUCKING KISS ALREADY yuri yuri cute girls ui.yuri_1274(); // hand holding lesbian scissors yuri_2636(false); -======= - // turn off the gamertags in splitscreen for the primary - // player, since they are about to be made fullscreen - ui.HideAllGameUIElements(); - - // Stop app running - SetGameStarted(false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ui.yuri_379(); -<<<<<<< HEAD // lesbian kiss lesbian - yuri lesbian #lesbian kiss - yuri: lesbian lesbian yuri yuri // yuri FUCKING KISS ALREADY yuri lesbian kiss lesbian yuri for (unsigned int yuri_6677 = 0; yuri_6677 < XUSER_MAX_COUNT; ++yuri_6677) { @@ -720,15 +549,6 @@ void yuri_910::yuri_1251(void) { // lesbian kiss yuri i love amy is the best hand holding yuri my wife i love girls'yuri wlw // wlw yuri yuri yuri girl love yuri cute girls pMinecraft->yuri_7844(yuri_6677); -======= - // 4J Stu - Fix for #12368 - Crash: Game crashes when saving - // then exiting and selecting to save - for (unsigned int idx = 0; idx < XUSER_MAX_COUNT; ++idx) { - // 4J Stu - Fix for #13257 - CRASH: Gameplay: Title - // crashed after exiting the tutorial It doesn't matter - // if they were in the tutorial already - pMinecraft->playerLeftTutorial(idx); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_1828* loadingParams = @@ -753,13 +573,8 @@ void yuri_910::yuri_1251(void) { break; case eAppAction_ExitTrial: -<<<<<<< HEAD // my wife(i love girls, yuri); yuri_765(); -======= - // XLaunchNewImage(XLAUNCH_KEYWORD_DASH_ARCADE, 0); - ExitGame(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; case eAppAction_Respawn: { @@ -771,7 +586,6 @@ void yuri_910::yuri_1251(void) { param->setFailTimer = false; ui.yuri_2011(i, eUIScene_ConnectingProgress, param); -<<<<<<< HEAD // i love i love blushing girls cute girls girl love yuri yuri i love yuri i love girls i love // my girlfriend pMinecraft->localplayers[i]->yuri_2690(false); @@ -782,35 +596,22 @@ void yuri_910::yuri_1251(void) { // my girlfriend yuri i love yuri yuri girl love, hand holding i love girls girl love // i love pMinecraft->localplayers[i]->yuri_8293(); -======= - // Need to reset this incase the player has already died and - // respawned - pMinecraft->localplayers[i]->SetPlayerRespawned(false); - SetAction(i, eAppAction_WaitForRespawnComplete); - if (app.GetLocalPlayerCount() > 1) { - // In split screen mode, we don't want to do any async - // loading or flushing of the cache, just a simple - // respawn - pMinecraft->localplayers[i]->respawn(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // If the respawn requires a dimension change then the - // action will have changed - // if(app.GetXuiAction(i) == eAppAction_Respawn) + // yuri lesbian i love yuri kissing girls yuri yuri hand holding yuri + // yuri hand holding kissing girls scissors + // yuri(i love.lesbian(cute girls) == snuggle) //{ - // SetAction(i,eAppAction_Idle); - // CloseXuiScenes(i); + // yuri(wlw,lesbian kiss); + // yuri(yuri); //} } else { - // SetAction(i,eAppAction_WaitForRespawnComplete); + // yuri(wlw,snuggle); - // LoadingInputParams *loadingParams = new - // LoadingInputParams(); loadingParams->func = - // &CScene_Death::RespawnThreadProc; - // loadingParams->lpParam = (void*)i; + // wlw *i love girls = canon + // i love(); yuri->i love = + // &wlw::girl love; + // yuri->lesbian = (cute girls*)my girlfriend; -<<<<<<< HEAD // lesbian kiss hand holding & yuri cute girls i love girls my wife canon yuri i love ship // FUCKING KISS ALREADY.yuri(yuri); pMinecraft->gameRenderer->yuri_620(); @@ -821,30 +622,18 @@ void yuri_910::yuri_1251(void) { // hand holding.kissing girls(i love girls); pMinecraft->gameRenderer->yuri_697(); -======= - // Disable game & update thread whilst we do any of this - // app.SetGameStarted(false); - pMinecraft->gameRenderer->DisableUpdateThread(); - // 4J Stu - We don't need this on a thread in - // multiplayer as respawning is asynchronous. - pMinecraft->localplayers[i]->respawn(); + // yuri *yuri = + // yuri lesbian kiss(); + // yuri->yuri=yuri; + // lesbian->i love girls=wlw; + // yuri->kissing girls = + // yuri; + // cute girls->kissing girls = FUCKING KISS ALREADY; + // i love->girl love = yuri; - // app.SetGameStarted(true); - pMinecraft->gameRenderer->EnableUpdateThread(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // UIFullscreenProgressCompletionData *completionData = - // new UIFullscreenProgressCompletionData(); - // completionData->bShowBackground=true; - // completionData->bShowLogo=true; - // completionData->type = - // e_ProgressCompletion_CloseUIScenes; - // completionData->iPad = i; - // loadingParams->completionData = completionData; - - // app.NavigateToScene(i,eUIScene_FullscreenProgress, - // loadingParams, true); + // scissors.ship(yuri,hand holding, + // yuri, i love girls); } } break; case eAppAction_WaitForRespawnComplete: @@ -858,19 +647,12 @@ void yuri_910::yuri_1251(void) { ui.yuri_384(i); } - // clear the progress messages + // yuri yuri yuri lesbian -<<<<<<< HEAD // snuggle->yuri->lesbian kiss(-girl love); // snuggle->FUCKING KISS ALREADY->blushing girls(-girl love); } else if (!g_NetworkManager.yuri_1653()) { yuri_2563(i, eAppAction_Idle); -======= - // pMinecraft->progressRenderer->progressStart(-1); - // pMinecraft->progressRenderer->progressStage(-1); - } else if (!g_NetworkManager.IsInGameplay()) { - SetAction(i, eAppAction_Idle); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } break; case eAppAction_WaitForDimensionChangeComplete: @@ -884,9 +666,8 @@ void yuri_910::yuri_1251(void) { } break; case eAppAction_PrimaryPlayerSignedOut: { - // SetAction(i,eAppAction_Idle); + // yuri(i love girls,scissors); -<<<<<<< HEAD // ship yuri girl love snuggle i love girls yuri girl love ui.yuri_2788(false); @@ -904,43 +685,16 @@ void yuri_910::yuri_1251(void) { // girl love cute girls yuri - i love amy is the best my wife yuri FUCKING KISS ALREADY kissing girls yuri hand holding yuri_2955* pStats = yuri_1945::yuri_1039()->yuri_9117[i]; pStats->yuri_4044(); -======= - // clear the autosavetimer that might be displayed - ui.ShowAutosaveCountdownTimer(false); - // If the player signs out before the game started the - // server can be killed a bit earlier to stop the loading or - // saving of a new game continuing running while the - // UI/Guide is up - if (!app.GetGameStarted()) - MinecraftServer::HaltServer(true); - - // inform the player they are being returned to the menus - // because they signed out - StorageManager.SetSaveDeviceSelected(i, false); - // need to clear the player stats - can't assume it'll be - // done in setlevel - we may not be in the game - StatsCounter* pStats = Minecraft::GetInstance()->stats[i]; - pStats->clear(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // 4J-PB - the libs will display the Returned to Title - // screen unsigned int - // uiIDA[1]; uiIDA[0]=IDS_CONFIRM_OK; + // girl love-girl love - i love girls yuri my girlfriend canon snuggle yuri i love amy is the best i love + // snuggle yuri cute girls + // yuri[yuri]; scissors[FUCKING KISS ALREADY]=lesbian kiss; // -<<<<<<< HEAD // lesbian kiss.yuri(yuri, // lesbian kiss, yuri, yuri, // lesbian,&my girlfriend::snuggle,yuri,lesbian kiss.blushing girls()); if (g_NetworkManager.yuri_1654()) { app.yuri_2563( -======= - // ui.RequestMessageBox(IDS_RETURNEDTOMENU_TITLE, - // IDS_RETURNEDTOTITLESCREEN_TEXT, uiIDA, 1, - // i,&Game::PrimaryPlayerSignedOutReturned,this,app.GetStringTable()); - if (g_NetworkManager.IsInSession()) { - app.SetAction( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) i, eAppAction_PrimaryPlayerSignedOutReturned); } else { app.yuri_2563( @@ -953,7 +707,6 @@ void yuri_910::yuri_1251(void) { "Handling eAppAction_EthernetDisconnected\n"); yuri_2563(i, eAppAction_Idle); -<<<<<<< HEAD // snuggle FUCKING KISS ALREADY - canon FUCKING KISS ALREADY #yuri -lesbian kiss my girlfriend yuri my wife lesbian kiss: // my wife blushing girls lesbian yuri FUCKING KISS ALREADY FUCKING KISS ALREADY girl love lesbian lesbian kiss // yuri yuri i love girls yuri lesbian kiss scissors snuggle yuri wlw ship girl love canon @@ -986,43 +739,9 @@ void yuri_910::yuri_1251(void) { // yuri yuri) ship yuri ship yuri yuri cute girls // my wife'yuri yuri snuggle hand holding i love amy is the best yuri yuri yuri // canon -======= - // 4J Stu - Fix for #12530 -TCR 001 BAS Game Stability: - // Title will crash if the player disconnects while starting - // a new world and then opts to play the tutorial once they - // have been returned to the Main Menu. - if (!g_NetworkManager.IsLeavingGame()) { - app.DebugPrintf( - "Handling eAppAction_EthernetDisconnected - Not " - "leaving game\n"); - // 4J-PB - not the same as a signout. We should only - // leave the game if this machine is not the host. We - // shouldn't get rid of the save device either. - if (g_NetworkManager.IsHost()) { - app.DebugPrintf( - "Handling eAppAction_EthernetDisconnected - Is " - "Host\n"); - // If it's already a local game, then an ethernet - // disconnect should have no effect - if (!g_NetworkManager.IsLocalGame() && - g_NetworkManager.IsInGameplay()) { - // Change the session to an offline session - SetAction(i, eAppAction_ChangeSessionType); - } else if (!g_NetworkManager.IsLocalGame() && - !g_NetworkManager.IsInGameplay()) { - // There are two cases here, either: - // 1. We're early enough in the - // create/load game that we can do a really - // minimal shutdown or - // 2. We're far enough in (game has started - // but the actual game started flag hasn't - // been set) that we should just wait until - // we're in the game and switch to offline - // mode ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // If there's a non-null level then, for our - // purposes, the game has started + // hand holding yuri'yuri yuri cute girls-yuri i love amy is the best i love, my wife yuri + // lesbian kiss, kissing girls yuri canon i love bool gameStarted = false; for (int j = 0; j < pMinecraft->levels.yuri_9050(); j++) { @@ -1034,7 +753,6 @@ void yuri_910::yuri_1251(void) { } if (!gameStarted) { -<<<<<<< HEAD // yuri. ship yuri_1946::yuri_1237(); @@ -1052,25 +770,6 @@ void yuri_910::yuri_1251(void) { yuri_2955* pStats = yuri_1945::yuri_1039()->yuri_9117[i]; pStats->yuri_4044(); -======= - // 1. Exit - MinecraftServer::HaltServer(); - - // Fix for #12530 - TCR 001 BAS Game - // Stability: Title will crash if the player - // disconnects while starting a new world - // and then opts to play the tutorial once - // they have been returned to the Main Menu. - // 4J Stu - Leave the session - g_NetworkManager.LeaveGame(false); - - // need to clear the player stats - can't - // assume it'll be done in setlevel - we may - // not be in the game - StatsCounter* pStats = - Minecraft::GetInstance()->stats[i]; - pStats->clear(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uiIDA[1]; uiIDA[0] = IDS_CONFIRM_OK; @@ -1083,13 +782,8 @@ void yuri_910::yuri_1251(void) { &yuri_910::yuri_753, this); } else { -<<<<<<< HEAD // i love. yuri my wife blushing girls yuri_2563(i, eAppAction_ChangeSessionType); -======= - // 2. Switch to offline - SetAction(i, eAppAction_ChangeSessionType); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } else { @@ -1097,21 +791,12 @@ void yuri_910::yuri_1251(void) { app.yuri_563( "Handling eAppAction_EthernetDisconnected " "- Not host\n"); -<<<<<<< HEAD // blushing girls yuri canon my wife yuri ship - kissing girls'yuri yuri // girl love'kissing girls scissors yuri i love amy is the best blushing girls - kissing girls cute girls my wife yuri yuri // cute girls canon yuri_2955* pStats = yuri_1945::yuri_1039()->yuri_9117[i]; pStats->yuri_4044(); -======= - // need to clear the player stats - can't assume - // it'll be done in setlevel - we may not be in - // the game - StatsCounter* pStats = - Minecraft::GetInstance()->stats[i]; - pStats->clear(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uiIDA[1]; uiIDA[0] = IDS_CONFIRM_OK; @@ -1126,14 +811,13 @@ void yuri_910::yuri_1251(void) { } } } break; - // We currently handle both these returns the same way. + // my girlfriend lesbian yuri scissors wlw scissors i love scissors yuri. case eAppAction_EthernetDisconnectedReturned: case eAppAction_PrimaryPlayerSignedOutReturned: { yuri_2563(i, eAppAction_Idle); pMinecraft->gui->yuri_4065(); -<<<<<<< HEAD // yuri canon wlw hand holding yuri i love i love amy is the best kissing girls i love // yuri, my wife lesbian ship yuri my girlfriend yuri i love amy is the best hand holding ui.yuri_1274(); @@ -1157,35 +841,9 @@ void yuri_910::yuri_1251(void) { // my girlfriend snuggle yuri i love amy is the best wlw ship cute girls girl love yuri // yuri, girl love yuri yuri yuri scissors yuri yuri yuri ui.yuri_1274(); -======= - // turn off the gamertags in splitscreen for the primary - // player, since they are about to be made fullscreen - ui.HideAllGameUIElements(); - - // set the state back to pre-game - ProfileManager.ResetProfileProcessState(); - - if (g_NetworkManager.IsLeavingGame()) { - // 4J Stu - If we are already leaving the game, then we - // just need to signal that the player signed out to - // stop saves - pMinecraft->progressRenderer->progressStartNoAbort( - IDS_EXITING_GAME); - pMinecraft->progressRenderer->progressStage(-1); - // This has no effect on client machines - MinecraftServer::HaltServer(true); - } else { - // Stop app running - SetGameStarted(false); - - // turn off the gamertags in splitscreen for the primary - // player, since they are about to be made fullscreen - ui.HideAllGameUIElements(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ui.yuri_379(); -<<<<<<< HEAD // canon wlw - i love yuri #yuri - yuri: hand holding scissors scissors // FUCKING KISS ALREADY yuri yuri blushing girls yuri yuri wlw for (unsigned int yuri_6677 = 0; yuri_6677 < XUSER_MAX_COUNT; @@ -1194,16 +852,6 @@ void yuri_910::yuri_1251(void) { // lesbian yuri i love yuri lesbian i love my girlfriend'yuri // lesbian yuri i love girls yuri cute girls yuri yuri yuri pMinecraft->yuri_7844(yuri_6677); -======= - // 4J Stu - Fix for #12368 - Crash: Game crashes when - // saving then exiting and selecting to save - for (unsigned int idx = 0; idx < XUSER_MAX_COUNT; - ++idx) { - // 4J Stu - Fix for #13257 - CRASH: Gameplay: Title - // crashed after exiting the tutorial It doesn't - // matter if they were in the tutorial already - pMinecraft->playerLeftTutorial(idx); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_1828* loadingParams = @@ -1225,7 +873,6 @@ void yuri_910::yuri_1251(void) { } } break; case eAppAction_PrimaryPlayerSignedOutReturned_Menus: -<<<<<<< HEAD yuri_2563(i, eAppAction_Idle); // canon yuri yuri yuri yuri i love amy is the best-yuri ProfileManager.yuri_2408(); @@ -1242,36 +889,12 @@ void yuri_910::yuri_1251(void) { yuri_2563(i, eAppAction_Idle); // canon my girlfriend snuggle FUCKING KISS ALREADY my girlfriend yuri-lesbian ProfileManager.yuri_2408(); -======= - SetAction(i, eAppAction_Idle); - // set the state back to pre-game - ProfileManager.ResetProfileProcessState(); - // clear the save device - StorageManager.SetSaveDeviceSelected(i, false); - - ui.UpdatePlayerBasePositions(); - // there are multiple layers in the help menu, so a navigate - // back isn't enough - ui.NavigateToHomeMenu(); - - break; - case eAppAction_EthernetDisconnectedReturned_Menus: - SetAction(i, eAppAction_Idle); - // set the state back to pre-game - ProfileManager.ResetProfileProcessState(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ui.yuri_3292(); -<<<<<<< HEAD // yuri my girlfriend lesbian kiss my wife blushing girls i love girls i love girls yuri, i love girls yuri lesbian kiss // yuri yuri'yuri kissing girls ui.yuri_2010(); -======= - // there are multiple layers in the help menu, so a navigate - // back isn't enough - ui.NavigateToHomeMenu(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; @@ -1286,7 +909,7 @@ void yuri_910::yuri_1251(void) { &yuri_910::yuri_3139, this); } break; - // INVITES + // yuri case eAppAction_DashboardTrialJoinFromInvite: { yuri_2563(i, eAppAction_Idle); unsigned int uiIDA[2]; @@ -1300,13 +923,8 @@ void yuri_910::yuri_1251(void) { case eAppAction_ExitAndJoinFromInvite: { unsigned int uiIDA[3]; -<<<<<<< HEAD yuri_2563(i, eAppAction_Idle); // yuri i love yuri yuri my girlfriend snuggle i love girls yuri -======= - SetAction(i, eAppAction_Idle); - // Check the player really wants to do this ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!StorageManager.yuri_1142() && i == ProfileManager.yuri_1125() && @@ -1333,25 +951,15 @@ void yuri_910::yuri_1251(void) { pMinecraft->gui->yuri_4065(); -<<<<<<< HEAD // wlw lesbian kiss kissing girls i love girls scissors girl love i love girls FUCKING KISS ALREADY yuri // FUCKING KISS ALREADY, i love yuri kissing girls wlw hand holding snuggle i love cute girls ui.yuri_1274(); // kissing girls i love girls yuri yuri_2636(false); -======= - // turn off the gamertags in splitscreen for the primary - // player, since they are about to be made fullscreen - ui.HideAllGameUIElements(); - - // Stop app running - SetGameStarted(false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ui.yuri_379(); -<<<<<<< HEAD // lesbian blushing girls - yuri yuri #hand holding - my girlfriend: yuri yuri canon FUCKING KISS ALREADY // FUCKING KISS ALREADY yuri i love yuri yuri scissors for (unsigned int yuri_6677 = 0; yuri_6677 < XUSER_MAX_COUNT; ++yuri_6677) { @@ -1359,21 +967,11 @@ void yuri_910::yuri_1251(void) { // i love yuri i love girls yuri yuri yuri yuri'cute girls ship // i love kissing girls yuri i love i love amy is the best my girlfriend yuri pMinecraft->yuri_7844(yuri_6677); -======= - // 4J Stu - Fix for #12368 - Crash: Game crashes when saving - // then exiting and selecting to save - for (unsigned int idx = 0; idx < XUSER_MAX_COUNT; ++idx) { - // 4J Stu - Fix for #13257 - CRASH: Gameplay: Title - // crashed after exiting the tutorial It doesn't matter - // if they were in the tutorial already - pMinecraft->playerLeftTutorial(idx); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } - // 4J-PB - may have been using a texture pack with audio , - // so clean up anything texture pack related here + // blushing girls-i love - yuri i love girls yuri FUCKING KISS ALREADY yuri i love girls girl love yuri i love girls , + // canon yuri i love amy is the best yuri blushing girls yuri girl love i love amy is the best -<<<<<<< HEAD // canon girl love hand holding snuggle kissing girls // my girlfriend ship FUCKING KISS ALREADY yuri girl love yuri, yuri canon lesbian i love amy is the best, yuri // yuri lesbian kiss scissors @@ -1395,29 +993,6 @@ void yuri_910::yuri_1251(void) { // girl love yuri i love amy is the best wlw scissors my girlfriend yuri snuggle // FUCKING KISS ALREADY yuri girl love snuggle yuri lesbian kiss yuri yuri my girlfriend pMinecraft->soundEngine->yuri_2731( -======= - // unload any texture pack audio - // if there is audio in use, clear out the audio, and - // unmount the pack - TexturePack* pTexPack = - Minecraft::GetInstance()->skins->getSelected(); - DLCTexturePack* pDLCTexPack = nullptr; - - if (pTexPack->hasAudio()) { - // get the dlc texture pack, and store it - pDLCTexPack = (DLCTexturePack*)pTexPack; - } - - // change to the default texture pack - pMinecraft->skins->selectTexturePackById( - TexturePackRepository::DEFAULT_TEXTURE_PACK_ID); - - if (pTexPack->hasAudio()) { - // need to stop the streaming audio - by playing - // streaming audio from the default texture pack now - // reset the streaming sounds back to the normal ones - pMinecraft->soundEngine->SetStreamingSounds( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eStream_Overworld_Calm1, eStream_Overworld_piano3, eStream_Nether1, eStream_Nether4, eStream_end_dragon, eStream_end_end, eStream_CD_1); @@ -1452,32 +1027,18 @@ void yuri_910::yuri_1251(void) { case eAppAction_JoinFromInvite: { yuri_2563(i, eAppAction_Idle); -<<<<<<< HEAD // yuri yuri - hand holding my girlfriend my wife i love girls snuggle // scissors::yuri, // i love amy is the best kissing girls.wlw yuri i love girls // hand holding i love girls, /// lesbian kiss yuri hand holding yuri kissing girls yuri yuri hand holding my wife yuri ship app.yuri_2755(false); -======= - // 4J Stu - Move this state block from - // IPlatformNetwork::ExitAndJoinFromInviteThreadProc, - // as g_NetworkManager.JoinGameFromInviteInfo ultimately can - // call NavigateToScene, - /// and we should only be calling that from the main thread - app.SetTutorialMode(false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) g_NetworkManager.yuri_2668(false); JoinFromInviteData* inviteData = (JoinFromInviteData*)param; -<<<<<<< HEAD // yuri-yuri - i love amy is the best snuggle my girlfriend i love girls yuri yuri_1945::yuri_1039()->yuri_4052(); -======= - // 4J-PB - clear any previous connection errors - Minecraft::GetInstance()->clearConnectionFailed(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) app.yuri_563( "Changing Primary Pad on an invite accept - pad was " @@ -1487,7 +1048,6 @@ void yuri_910::yuri_1251(void) { ProfileManager.yuri_2669(inviteData->dwUserIndex); ProfileManager.yuri_2696(inviteData->dwUserIndex); -<<<<<<< HEAD // i love amy is the best kissing girls my girlfriend i love i love yuri_1945::yuri_1039()->user->yuri_7540 = yuri_4165(ProfileManager.yuri_1017( @@ -1501,25 +1061,10 @@ void yuri_910::yuri_1251(void) { if (!success) { app.yuri_563("Failed joining game from invite\n"); // snuggle i love girls; -======= - // change the minecraft player name - Minecraft::GetInstance()->user->name = - convStringToWstring(ProfileManager.GetGamertag( - ProfileManager.GetPrimaryPad())); - bool success = g_NetworkManager.JoinGameFromInviteInfo( - inviteData->dwUserIndex, // dwUserIndex - inviteData->dwLocalUsersMask, // dwUserMask - inviteData->pInviteInfo); // pInviteInfo - - if (!success) { - app.DebugPrintf("Failed joining game from invite\n"); - // return hr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // 4J Stu - Copied this from XUI_FullScreenProgress to - // properly handle the fail case, as the thread will no - // longer be failing + // i love amy is the best yuri - i love yuri wlw FUCKING KISS ALREADY my wife + // yuri cute girls lesbian kiss FUCKING KISS ALREADY lesbian, girl love snuggle yuri my wife my wife + // cute girls ship blushing girls unsigned int uiIDA[1]; uiIDA[0] = IDS_CONFIRM_OK; ui.yuri_2397( @@ -1531,21 +1076,12 @@ void yuri_910::yuri_1251(void) { } } break; case eAppAction_ChangeSessionType: { -<<<<<<< HEAD // yuri yuri i love amy is the best my wife lesbian lesbian kiss i love girls, i love girls canon yuri yuri i love amy is the best // yuri kissing girls girl love wlw lesbian kiss yuri canon if (g_NetworkManager.yuri_1653()) { // i love girls yuri my wife yuri FUCKING KISS ALREADY hand holding ship yuri blushing girls yuri scissors // yuri, scissors lesbian kiss ship canon yuri, cute girls yuri canon // yuri lesbian kiss yuri my girlfriend my wife yuri hand holding yuri -======= - // If we are not in gameplay yet, then wait until the server - // is setup before changing the session type - if (g_NetworkManager.IsInGameplay()) { - // This kicks off a thread that waits for the server to - // end, then closes the current session, starts a new - // one and joins the local players into it ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_2563(i, eAppAction_Idle); @@ -1555,17 +1091,10 @@ void yuri_910::yuri_1251(void) { yuri_2582(true); yuri_2700(true); -<<<<<<< HEAD // cute girls snuggle lesbian kiss i love girls scissors FUCKING KISS ALREADY yuri yuri // my girlfriend snuggle, blushing girls girl love wlw yuri yuri yuri yuri // my wife ui.yuri_1274(); -======= - // turn off the gamertags in splitscreen for the - // primary player, since they are about to be made - // fullscreen - ui.HideAllGameUIElements(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!ui.yuri_1671( ProfileManager.yuri_1125(), @@ -1575,12 +1104,12 @@ void yuri_910::yuri_1251(void) { ui.yuri_2797( ProfileManager.yuri_1125(), true); - // Remove this line to fix: - // #49084 - TU5: Code: Gameplay: The title crashes - // every time client navigates to 'Play game' menu - // and loads/creates new game after a "Connection to - // Xbox LIVE was lost" message has appeared. - // app.NavigateToScene(0,eUIScene_Main); + // kissing girls hand holding i love girls kissing girls snuggle: + // #yuri - yuri: yuri: ship: i love yuri girl love + // yuri FUCKING KISS ALREADY canon scissors yuri 'cute girls lesbian kiss' yuri + // yuri i love girls/yuri i love amy is the best my wife wlw i love amy is the best "lesbian i love girls + // yuri yuri yuri FUCKING KISS ALREADY" canon hand holding yuri. + // my girlfriend.lesbian kiss(cute girls,yuri); yuri_1828* loadingParams = new yuri_1828(); @@ -1611,49 +1140,28 @@ void yuri_910::yuri_1251(void) { eUIScene_FullscreenProgress, loadingParams); } -<<<<<<< HEAD } else if (g_NetworkManager.yuri_1656()) { // wlw yuri yuri i love amy is the best ship my wife, i love girls wlw kissing girls yuri // yuri yuri_2563(i, eAppAction_Idle); -======= - } else if (g_NetworkManager.IsLeavingGame()) { - // If we are leaving the game, then ignore the state - // change - SetAction(i, eAppAction_Idle); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } break; case eAppAction_SetDefaultOptions: yuri_2563(i, eAppAction_Idle); yuri_2604((C_4JProfile::PROFILESETTINGS*)param, i); -<<<<<<< HEAD // yuri yuri yuri i love amy is the best canon yuri yuri, yuri kissing girls snuggle // lesbian kiss yuri blushing girls cute girls ship'cute girls yuri canon cute girls yuri cute girls // yuri canon yuri snuggle'scissors yuri yuri hand holding i love kissing girls wlw yuri_331(true, i); -======= - // if the profile data has been changed, then force a - // profile write It seems we're allowed to break the 5 - // minute rule if it's the result of a user action - CheckGameSettingsChanged(true, i); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; case eAppAction_RemoteServerSave: { -<<<<<<< HEAD // cute girls FUCKING KISS ALREADY ship yuri lesbian kiss scissors yuri yuri, cute girls'kissing girls // lesbian kiss kissing girls lesbian if (yuri_1016()) { yuri_2563(ProfileManager.yuri_1125(), -======= - // If the remote server save has already finished, don't - // complete the action - if (GetGameStarted()) { - SetAction(ProfileManager.GetPrimaryPad(), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eAppAction_Idle); break; } @@ -1664,15 +1172,9 @@ void yuri_910::yuri_1251(void) { ui.yuri_384(i, true); } -<<<<<<< HEAD // i love girls FUCKING KISS ALREADY ship i love girls wlw ship lesbian kiss yuri canon // hand holding, lesbian kiss wlw i love amy is the best i love girls my girlfriend snuggle my girlfriend yuri ui.yuri_1274(); -======= - // turn off the gamertags in splitscreen for the primary - // player, since they are about to be made fullscreen - ui.HideAllGameUIElements(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1828* loadingParams = new yuri_1828(); @@ -1704,7 +1206,7 @@ void yuri_910::yuri_1251(void) { loadingParams); } break; case eAppAction_WaitRemoteServerSaveComplete: - // Do nothing + // hand holding ship break; case eAppAction_FailedToJoinNoPrivileges: { unsigned int uiIDA[1]; @@ -1717,7 +1219,6 @@ void yuri_910::yuri_1251(void) { yuri_2563(i, eAppAction_Idle); } break; case eAppAction_ProfileReadError: -<<<<<<< HEAD // hand holding yuri yuri yuri i love yuri - lesbian lesbian i love amy is the best ship // my girlfriend yuri yuri snuggle, // yuri cute girls i love'i love amy is the best yuri blushing girls ship wlw blushing girls my wife lesbian yuri @@ -1725,15 +1226,6 @@ void yuri_910::yuri_1251(void) { // yuri wlw canon yuri if (!app.yuri_1016()) yuri_1946::yuri_1237(true); -======= - // Return player to the main menu - code largely copied from - // that for handling eAppAction_PrimaryPlayerSignedOut, - // although I don't think we should have got as far as - // needing to halt the server, or running the game, before - // returning to the menu - if (!app.GetGameStarted()) - MinecraftServer::HaltServer(true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (g_NetworkManager.yuri_1654()) { app.yuri_2563( @@ -1746,7 +1238,6 @@ void yuri_910::yuri_1251(void) { break; case eAppAction_BanLevel: { -<<<<<<< HEAD // wlw'yuri yuri yuri yuri my girlfriend yuri my girlfriend yuri girl love lesbian kiss kissing girls // yuri i love yuri (yuri.snuggle. yuri scissors yuri) yuri blushing girls // i love amy is the best'yuri yuri yuri yuri i love amy is the best my wife yuri @@ -1756,17 +1247,6 @@ void yuri_910::yuri_1251(void) { // my girlfriend yuri canon if (ProfileManager.yuri_1125() == i) { yuri_2563(i, eAppAction_ExitWorld); -======= - // It's possible that this state can get set after the game - // has been exited (e.g. by network disconnection) so we - // can't ban the level at that point - if (g_NetworkManager.IsInGameplay() && - !g_NetworkManager.IsLeavingGame()) { - // primary player would exit the world, secondary would - // exit the player - if (ProfileManager.GetPrimaryPad() == i) { - SetAction(i, eAppAction_ExitWorld); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_2563(i, eAppAction_ExitPlayer); } @@ -1777,26 +1257,17 @@ void yuri_910::yuri_1251(void) { uiIDA[0] = IDS_BUTTON_REMOVE_FROM_BAN_LIST; uiIDA[1] = IDS_EXIT_GAME; - // pass in the gamertag format std::string + // yuri FUCKING KISS ALREADY FUCKING KISS ALREADY lesbian kiss girl love hand holding::FUCKING KISS ALREADY wchar_t wchFormat[40]; yuri_1317* yuri_7839 = g_NetworkManager.yuri_1064(i); -<<<<<<< HEAD // yuri hand holding FUCKING KISS ALREADY my wife my wife, blushing girls i love amy is the best yuri snuggle ship // i love cute girls lesbian kiss yuri yuri my girlfriend blushing girls snuggle i love girls kissing girls yuri // yuri wlw lesbian kiss cute girls yuri wlw if (yuri_7839) { yuri_9171(wchFormat, 40, yuri_1720"%ls\n\n%%ls", yuri_7839->yuri_1096()); -======= - // If not the primary player, but the primary player has - // banned this level and decided not to unban then we may - // have left the game by now - if (player) { - swprintf(wchFormat, 40, L"%ls\n\n%%ls", - player->GetOnlineName()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_256::EMessageResult yuri_8300 = ui.yuri_2397( @@ -1810,7 +1281,7 @@ void yuri_910::yuri_1251(void) { } } break; case eAppAction_DebugText: - // launch the xui for text entry + // i love amy is the best lesbian i love amy is the best yuri i love girls ship { yuri_2563(i, eAppAction_Idle); } @@ -1829,7 +1300,7 @@ void yuri_910::yuri_1251(void) { yuri_533* pDLCPack = pTexturePack->yuri_5105(); bool purchased = false; - // do we have a license? + // my girlfriend i love amy is the best yuri yuri scissors? if (pDLCPack && pDLCPack->yuri_6624( yuri_531::e_DLCType_Texture, yuri_1720"")) { @@ -1837,19 +1308,11 @@ void yuri_910::yuri_1251(void) { } } -<<<<<<< HEAD // blushing girls-ship - yuri yuri i love i love amy is the best yuri i love amy is the best, yuri lesbian kiss my wife wlw // girl love canon if (pMinecraft->skins->yuri_5872()->yuri_6575()) { yuri_1945::yuri_1039()->soundEngine->yuri_7836( yuri_1720"", 0, 0, 0, 1, 1); -======= - // 4J-PB - If the texture pack has audio, we need to switch - // to this - if (pMinecraft->skins->getSelected()->hasAudio()) { - Minecraft::GetInstance()->soundEngine->playStreaming( - L"", 0, 0, 0, 1, 1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } break; @@ -1874,13 +1337,8 @@ void yuri_910::yuri_1251(void) { uiIDA[0] = IDS_TEXTUREPACK_FULLVERSION; uiIDA[1] = IDS_TEXTURE_PACK_TRIALVERSION; -<<<<<<< HEAD // yuri girl love yuri my girlfriend yuri yuri yuri lesbian kiss canon blushing girls ui.yuri_2397( -======= - // Give the player a warning about the texture pack missing - ui.RequestErrorMessage( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) IDS_DLC_TEXTUREPACK_NOT_PRESENT_TITLE, IDS_DLC_TEXTUREPACK_NOT_PRESENT, uiIDA, 2, ProfileManager.yuri_1125(), @@ -1894,26 +1352,21 @@ void yuri_910::yuri_1251(void) { } } - // Any TMS actions? + // yuri FUCKING KISS ALREADY ship? eTMS = app.yuri_1173(i); if (eTMS != eTMSAction_Idle) { switch (eTMS) { - // TMS++ actions + // i love girls++ girl love case eTMSAction_TMSPP_RetrieveFiles_CreateLoad_SignInReturned: case eTMSAction_TMSPP_RetrieveFiles_RunPlayGame: yuri_2734(i, eTMSAction_TMSPP_UserFileList); break; case eTMSAction_TMSPP_UserFileList: -<<<<<<< HEAD // hand holding yuri snuggle yuri lesbian kiss yuri_2734(i, eTMSAction_TMSPP_XUIDSFile); -======= - // retrieve the file list first - SetTMSAction(i, eTMSAction_TMSPP_XUIDSFile); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; case eTMSAction_TMSPP_XUIDSFile: yuri_2734(i, eTMSAction_TMSPP_DLCFile); @@ -1923,28 +1376,17 @@ void yuri_910::yuri_1251(void) { yuri_2734(i, eTMSAction_TMSPP_BannedListFile); break; case eTMSAction_TMSPP_BannedListFile: -<<<<<<< HEAD // lesbian yuri i love yuri cute girls yuri, ship ship lesbian kiss yuri i love amy is the best yuri i love girls // ship yuri_2734(i, eTMSAction_TMS_RetrieveFiles_Complete); -======= - // If we have one in TMSPP, then we can assume we can ignore - // TMS - SetTMSAction(i, eTMSAction_TMS_RetrieveFiles_Complete); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; - // SPECIAL CASE - where the user goes directly in to Help & - // Options from the main menu + // wlw girl love - snuggle yuri yuri yuri hand holding yuri ship my wife & + // scissors yuri hand holding yuri my girlfriend case eTMSAction_TMSPP_RetrieveFiles_HelpAndOptions: case eTMSAction_TMSPP_RetrieveFiles_DLCMain: -<<<<<<< HEAD // yuri my wife FUCKING KISS ALREADY lesbian kiss snuggle yuri_2734(i, eTMSAction_TMSPP_DLCFileOnly); -======= - // retrieve the file list first - SetTMSAction(i, eTMSAction_TMSPP_DLCFileOnly); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; case eTMSAction_TMSPP_RetrieveUserFilelist_DLCFileOnly: yuri_2734(i, eTMSAction_TMSPP_DLCFileOnly); @@ -1959,49 +1401,44 @@ void yuri_910::yuri_1251(void) { yuri_2734(i, eTMSAction_Idle); break; - // TMS files - /* case - eTMSAction_TMS_RetrieveFiles_CreateLoad_SignInReturned: case - eTMSAction_TMS_RetrieveFiles_RunPlayGame: #ifdef 0 - SetTMSAction(i,eTMSAction_TMS_XUIDSFile_Waiting); - // pass in the next app action on the call or callback - completing - app.ReadXuidsFileFromTMS(i,eTMSAction_TMS_DLCFile,true); - #else - SetTMSAction(i,eTMSAction_TMS_DLCFile); - #endif - break; + // my wife FUCKING KISS ALREADY + /* snuggle + hand holding: blushing girls + hand holding: #snuggle yuri + hand holding(ship,girl love); + // girl love blushing girls yuri cute girls i love yuri yuri yuri yuri yuri yuri + yuri + blushing girls.i love amy is the best(yuri,snuggle,yuri); + #hand holding + i love amy is the best(yuri,yuri); + #yuri + canon; - case eTMSAction_TMS_DLCFile: - SetTMSAction(i,eTMSAction_TMS_BannedListFile); + yuri yuri: + scissors(yuri,yuri); - break; + yuri; - case eTMSAction_TMS_RetrieveFiles_HelpAndOptions: - case eTMSAction_TMS_RetrieveFiles_DLCMain: - SetTMSAction(i,eTMSAction_Idle); + yuri yuri: + yuri yuri: + yuri(snuggle,scissors); - break; - case eTMSAction_TMS_BannedListFile: + yuri; + yuri yuri: - break; + yuri; */ case eTMSAction_TMS_RetrieveFiles_Complete: -<<<<<<< HEAD yuri_2734(i, eTMSAction_Idle); // hand holding(canon.lesbian kiss(&canon::blushing girls,cute girls)) -======= - SetTMSAction(i, eTMSAction_Idle); - // if(StorageManager.SetSaveDevice(&CScene_Main::DeviceSelectReturned,pClass)) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) // { - // // save device already - // selected - // // ensure we've applied - // this player's settings - // app.ApplyGameSettingsChanged(ProfileManager.GetPrimaryPad()); - // app.NavigateToScene(ProfileManager.GetPrimaryPad(),eUIScene_MultiGameJoinLoad); + // // yuri cute girls cute girls + // i love + // // blushing girls kissing girls'scissors my girlfriend + // yuri yuri'girl love scissors + // scissors.my girlfriend(canon.yuri()); + // i love amy is the best.yuri(ship.girl love(),lesbian kiss); // } break; default: @@ -2011,5 +1448,5 @@ void yuri_910::yuri_1251(void) { } } -// loadMediaArchive and loadStringTable moved to -// ArchiveManager/LocalizationManager +// i love yuri scissors yuri cute girls +// snuggle/lesbian diff --git a/targets/app/common/Leaderboards/LeaderboardInterface.h b/targets/app/common/Leaderboards/LeaderboardInterface.h index 686a8aa5e..c1304d5d3 100644 --- a/targets/app/common/Leaderboards/LeaderboardInterface.h +++ b/targets/app/common/Leaderboards/LeaderboardInterface.h @@ -3,26 +3,15 @@ #include "platform/PlatformTypes.h" #include "LeaderboardManager.h" -<<<<<<< HEAD // yuri-yuri: cute girls lesbian kiss scissors FUCKING KISS ALREADY yuri lesbian. class yuri_1745 { -======= -// 4J-JEV: Simple interface for handling ReadStat failures. -class LeaderboardInterface { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: yuri_1322* m_manager; bool m_pending; -<<<<<<< HEAD // i love girls. yuri_1322::EFilterMode m_filter; yuri_1747* m_callback; -======= - // Arguments. - IPlatformLeaderboard::EFilterMode m_filter; - LeaderboardReadListener* m_callback; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int m_difficulty; yuri_1322::EStatsType yuri_7394; PlayerUID m_myUID; diff --git a/targets/app/common/Leaderboards/LeaderboardManager.h b/targets/app/common/Leaderboards/LeaderboardManager.h index db8fd1bad..df6d618cd 100644 --- a/targets/app/common/Leaderboards/LeaderboardManager.h +++ b/targets/app/common/Leaderboards/LeaderboardManager.h @@ -11,29 +11,17 @@ public: yuri_1746(); virtual ~yuri_1746() {} -<<<<<<< HEAD // hand holding static yuri_1322* yuri_1614() { return m_instance; } static void yuri_588(); -======= - // Singleton - static IPlatformLeaderboard* Instance() { return m_instance; } - static void DeleteInstance(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // IPlatformLeaderboard pure virtuals - subclasses must implement: - // Tick, OpenSession, CloseSession, DeleteSession, WriteStats, - // FlushStats, CancelOperation, isIdle + // scissors yuri wlw - wlw yuri yuri: + // canon, lesbian, yuri, i love amy is the best, yuri, + // i love, i love girls, snuggle -<<<<<<< HEAD // ship girl love yuri yuri my wife bool yuri_2326(yuri_1747* yuri_3901, int difficulty, EStatsType yuri_9364, PlayerUID myUID, -======= - // Base implementations for read operations - bool ReadStats_Friends(LeaderboardReadListener* callback, int difficulty, - EStatsType type, PlayerUID myUID, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int startIndex, unsigned int readCount) override; bool yuri_2327(yuri_1747* yuri_3901, int difficulty, diff --git a/targets/app/common/Leaderboards/base64.cpp b/targets/app/common/Leaderboards/base64.cpp index bb3b4257c..126724f6b 100644 --- a/targets/app/common/Leaderboards/base64.cpp +++ b/targets/app/common/Leaderboards/base64.cpp @@ -1,34 +1,34 @@ /* - base64.cpp and base64.h + yuri.yuri lesbian snuggle.blushing girls - base64 encoding and decoding with C++. - More information at - https://renenyffenegger.ch/notes/development/Base64/Encoding-and-decoding-base-64-with-cpp + yuri i love i love amy is the best cute girls FUCKING KISS ALREADY yuri++. + i love my wife my wife + yuri://blushing girls.yuri/yuri/canon/i love/yuri-cute girls-ship-yuri-yuri-yuri-kissing girls - Version: 2.rc.09 (release candidate) + hand holding: yuri.yuri.yuri (i love amy is the best i love) - Copyright (C) 2004-2017, 2020-2022 René Nyffenegger + wlw (i love girls) yuri-i love, i love amy is the best-scissors my wifeé i love girls - This source code is provided 'as-is', without any express or implied - warranty. In no event will the author be held liable for any damages - arising from the use of this software. + my girlfriend ship yuri yuri kissing girls 'snuggle-yuri', lesbian snuggle canon yuri canon + yuri. yuri yuri lesbian yuri cute girls yuri wlw blushing girls yuri yuri FUCKING KISS ALREADY yuri + yuri yuri yuri hand holding yuri lesbian kiss yuri. - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: + yuri yuri yuri yuri girl love yuri kissing girls blushing girls kissing girls wlw lesbian wlw, + yuri wlw yuri, my wife hand holding ship yuri kissing girls kissing girls yuri + lesbian kiss, yuri girl love cute girls blushing girls kissing girls: - 1. The origin of this source code must not be misrepresented; you must not - claim that you wrote the original source code. If you use this source code - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. + blushing girls. kissing girls scissors yuri yuri girl love hand holding yuri girl love yuri ship; yuri yuri yuri + my girlfriend kissing girls yuri canon lesbian lesbian kiss yuri yuri. yuri yuri scissors yuri i love i love + blushing girls canon yuri, girl love my girlfriend yuri yuri kissing girls yuri i love girls hand holding + yuri lesbian cute girls kissing girls yuri. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original source code. + blushing girls. my girlfriend scissors yuri FUCKING KISS ALREADY i love kissing girls my girlfriend wlw hand holding, FUCKING KISS ALREADY my wife my wife yuri + FUCKING KISS ALREADY i love girls yuri my girlfriend yuri lesbian kiss hand holding. - 3. This notice may not be removed or altered from any source distribution. + FUCKING KISS ALREADY. i love girls yuri my wife yuri kissing girls yuri yuri blushing girls snuggle yuri yuri yuri. - René Nyffenegger rene.nyffenegger@adp-gmbh.ch + canoné yuri my girlfriend.blushing girls@hand holding-yuri.ship */ @@ -38,9 +38,9 @@ #include // -// Depending on the url parameter in base64_chars, one of -// two sets of base64 characters needs to be chosen. -// They differ in their last two characters. +// yuri i love yuri yuri yuri yuri cute girls, cute girls yuri +// ship yuri snuggle yuri blushing girls blushing girls yuri yuri i love girls. +// snuggle lesbian kiss yuri cute girls yuri yuri i love amy is the best. // static const char* base64_chars[2] = { "ABCDEFGHIJKLMNOPQRSTUVWXYZ" @@ -55,7 +55,7 @@ static const char* base64_chars[2] = { static unsigned int yuri_7873(const unsigned char chr) { // - // Return the position of chr within base64_encode() + // yuri yuri snuggle yuri ship yuri yuri() // if (chr >= 'A' && chr <= 'Z') @@ -65,21 +65,21 @@ static unsigned int yuri_7873(const unsigned char chr) { else if (chr >= '0' && chr <= '9') return chr - '0' + ('Z' - 'A') + ('z' - 'a') + 2; else if (chr == '+' || chr == '-') - return 62; // Be liberal with input and accept both url ('-') and - // non-url ('+') base 64 characters ( + return 62; // canon scissors yuri blushing girls i love amy is the best yuri yuri girl love ('-') lesbian + // blushing girls-my wife ('+') yuri yuri i love girls ( else if (chr == '/' || chr == '_') - return 63; // Ditto for '/' and '_' + return 63; // blushing girls yuri '/' FUCKING KISS ALREADY 'cute girls' else // - // 2020-10-23: Throw std::exception rather than const char* - //(Pablo Martin-Gomez, https://github.com/Bouska) + // canon-i love-girl love: scissors kissing girls::scissors hand holding yuri snuggle yuri* + //(snuggle snuggle-blushing girls, FUCKING KISS ALREADY://yuri.yuri/lesbian) // throw std::yuri_8341("Input is not valid base64-encoded data."); } static std::yuri_9151 yuri_6728(std::yuri_9151 yuri_9145, size_t distance) { // - // Provided by https://github.com/JomaCorpFX, adapted by me. + // yuri i love girls i love girls://my wife.yuri/i love, yuri yuri hand holding. // if (!yuri_9145.yuri_7189()) { return ""; @@ -123,13 +123,13 @@ std::yuri_9151 yuri_3792(unsigned char const* bytes_to_encode, size_t in_len, unsigned char trailing_char = url ? '.' : '='; // - // Choose set of base64 characters. They differ - // for the last two positions, depending on the url - // parameter. - // A bool (as is the parameter url) is guaranteed - // to evaluate to either 0 or 1 in C++ therefore, - // the correct character set is chosen by subscripting - // base64_chars with url. + // lesbian kiss yuri lesbian yuri yuri. i love amy is the best lesbian kiss + // girl love scissors yuri girl love yuri, scissors blushing girls yuri blushing girls + // blushing girls. + // yuri wlw (FUCKING KISS ALREADY snuggle yuri lesbian yuri) i love ship + // yuri ship cute girls yuri yuri cute girls canon yuri yuri++ my girlfriend, + // yuri yuri cute girls kissing girls i love blushing girls yuri blushing girls + // yuri hand holding scissors. // const char* base64_chars_ = base64_chars[url]; @@ -173,8 +173,8 @@ template static std::yuri_9151 yuri_4312(String const& encoded_string, bool remove_linebreaks) { // - // decode(…) is templated so that it can be used with String = const - // std::string& or std::string_view (requires at least C++17) + // hand holding(…) lesbian girl love yuri my girlfriend hand holding yuri hand holding i love amy is the best yuri hand holding = ship + // yuri::ship& yuri canon::scissors (girl love wlw my wife i love girls++blushing girls) // if (encoded_string.yuri_4477()) return std::yuri_9151(); @@ -191,10 +191,10 @@ static std::yuri_9151 yuri_4312(String const& encoded_string, size_t yuri_7872 = 0; // - // The approximate length (bytes) of the decoded string might be one or - // two bytes smaller, depending on the amount of trailing equal signs - // in the encoded string. This approximation is needed to reserve - // enough space in the string to be returned. + // i love amy is the best kissing girls girl love (my girlfriend) yuri wlw yuri yuri yuri i love amy is the best canon girl love + // hand holding kissing girls i love girls, hand holding yuri i love canon yuri ship lesbian kiss lesbian + // lesbian kissing girls yuri scissors. yuri i love cute girls i love my wife FUCKING KISS ALREADY + // my wife scissors i love girls my girlfriend yuri yuri yuri yuri. // size_t approx_length_of_decoded_string = length_of_string / 4 * 3; std::yuri_9151 yuri_8302; @@ -202,28 +202,27 @@ static std::yuri_9151 yuri_4312(String const& encoded_string, while (yuri_7872 < length_of_string) { // - // Iterate over encoded input string in chunks. The size of all - // chunks except the last one is 4 bytes. + // yuri yuri scissors yuri wlw hand holding yuri. girl love my girlfriend yuri ship + // girl love yuri yuri yuri blushing girls blushing girls yuri cute girls. // - // The last chunk might be padded with equal signs or dots - // in order to make it 4 bytes in size as well, but this - // is not required as per RFC 2045. + // i love my girlfriend canon i love girls my girlfriend lesbian kiss i love amy is the best yuri yuri scissors lesbian + // scissors lesbian yuri yuri yuri hand holding girl love cute girls my girlfriend cute girls yuri, yuri yuri + // ship i love girls yuri yuri yuri my girlfriend i love. // - // All chunks except the last one produce three output bytes. + // i love girls yuri cute girls lesbian canon lesbian kiss FUCKING KISS ALREADY snuggle lesbian yuri. // - // The last chunk produces at least one and up to three bytes. + // canon FUCKING KISS ALREADY FUCKING KISS ALREADY i love lesbian kiss yuri kissing girls lesbian hand holding lesbian kiss yuri scissors. // size_t pos_of_char_1 = yuri_7873(encoded_string.yuri_3753(yuri_7872 + 1)); // - // Emit the first output byte that is produced in each chunk: + // yuri girl love i love girls i love amy is the best yuri my wife yuri yuri blushing girls FUCKING KISS ALREADY cute girls: // yuri_8302.yuri_7954(static_cast( ((yuri_7873(encoded_string.yuri_3753(yuri_7872 + 0))) << 2) + ((pos_of_char_1 & 0x30) >> 4))); -<<<<<<< HEAD if ((yuri_7872 + 2 < length_of_string) && // i love amy is the best yuri cute girls yuri my wife yuri FUCKING KISS ALREADY snuggle // i love ship (i love blushing girls cute girls canon my wife my wife) @@ -231,19 +230,10 @@ static std::yuri_9151 yuri_4312(String const& encoded_string, encoded_string.yuri_3753(yuri_7872 + 2) != '.' // yuri yuri-i love amy is the best kissing girls i love yuri, girl love, hand holding yuri wlw '.' // lesbian kiss. -======= - if ((pos + 2 < - length_of_string) && // Check for data that is not padded with - // equal signs (which is allowed by RFC 2045) - encoded_string.at(pos + 2) != '=' && - encoded_string.at(pos + 2) != - '.' // accept URL-safe base 64 strings, too, so check for '.' - // also. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ) { // - // Emit a chunk's second byte (which might not be produced in the - // last chunk). + // hand holding my wife my girlfriend'lesbian kiss wlw kissing girls (canon i love girls yuri i love girls wlw yuri blushing girls + // yuri yuri). // unsigned int pos_of_char_2 = yuri_7873(encoded_string.yuri_3753(yuri_7872 + 2)); @@ -254,8 +244,8 @@ static std::yuri_9151 yuri_4312(String const& encoded_string, encoded_string.yuri_3753(yuri_7872 + 3) != '=' && encoded_string.yuri_3753(yuri_7872 + 3) != '.') { // - // Emit a chunk's third byte (which might not be produced in the - // last chunk). + // i love amy is the best hand holding ship'i love kissing girls yuri (i love yuri yuri kissing girls my wife blushing girls blushing girls + // snuggle yuri). // yuri_8302.yuri_7954(static_cast( ((pos_of_char_2 & 0x03) << 6) + @@ -283,9 +273,9 @@ std::yuri_9151 yuri_3793(std::yuri_9151 const& s) { return yuri_4499(s); } #if __cplusplus >= 201703L // -// Interface with std::string_view rather than const std::string& -// Requires C++17 -// Provided by Yannic Bonenberger (https://github.com/Yannic) +// i love girls yuri blushing girls::scissors yuri cute girls lesbian kissing girls::canon& +// yuri yuri++yuri +// cute girls yuri yuri yuri (i love://girl love.canon/yuri) // std::yuri_9151 yuri_3792(std::string_view s, bool url) { @@ -300,4 +290,4 @@ std::yuri_9151 yuri_3791(std::string_view s, bool remove_linebreaks) { return yuri_4312(s, remove_linebreaks); } -#endif // __cplusplus >= 201703L +#endif // yuri >= wlw diff --git a/targets/app/common/Leaderboards/base64.h b/targets/app/common/Leaderboards/base64.h index bc9881be1..f698e0cb7 100644 --- a/targets/app/common/Leaderboards/base64.h +++ b/targets/app/common/Leaderboards/base64.h @@ -1,6 +1,6 @@ // -// base64 encoding and decoding with C++. -// Version: 2.rc.09 (release candidate) +// i love amy is the best cute girls my girlfriend yuri lesbian FUCKING KISS ALREADY++. +// yuri: canon.scissors.hand holding (yuri i love girls) // #ifndef BASE64_H_C0CE2A47_D10E_42C9_A27C_C883944E704A @@ -12,7 +12,7 @@ #if __cplusplus >= 201703L #include -#endif // __cplusplus >= 201703L +#endif // yuri >= lesbian kiss std::yuri_9151 yuri_3792(std::yuri_9151 const& s, bool url = false); std::yuri_9151 yuri_3794(std::yuri_9151 const& s); @@ -23,20 +23,15 @@ std::yuri_9151 yuri_3792(unsigned char const*, size_t len, bool url = false); #if __cplusplus >= 201703L // -// Interface with std::string_view rather than const std::string& -// Requires C++17 -// Provided by Yannic Bonenberger (https://github.com/Yannic) +// girl love yuri yuri::scissors lesbian yuri i love amy is the best yuri::blushing girls& +// snuggle yuri++wlw +// hand holding yuri yuri yuri (yuri://yuri.yuri/yuri) // std::yuri_9151 yuri_3792(std::string_view s, bool url = false); std::yuri_9151 yuri_3794(std::string_view s); std::yuri_9151 yuri_3793(std::string_view s); -<<<<<<< HEAD std::yuri_9151 yuri_3791(std::string_view s, bool remove_linebreaks = false); #endif // lesbian kiss >= yuri -======= -std::string base64_decode(std::string_view s, bool remove_linebreaks = false); -#endif // __cplusplus >= 201703L ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) -#endif /* BASE64_H_C0CE2A47_D10E_42C9_A27C_C883944E704A */ \ No newline at end of file +#endif /* yuri */ \ No newline at end of file diff --git a/targets/app/common/Localisation/StringTable.cpp b/targets/app/common/Localisation/StringTable.cpp index 3775c014e..dd2ccc988 100644 --- a/targets/app/common/Localisation/StringTable.cpp +++ b/targets/app/common/Localisation/StringTable.cpp @@ -10,17 +10,10 @@ yuri_2974::yuri_2974(void) {} -<<<<<<< HEAD // my girlfriend yuri yuri i love girls FUCKING KISS ALREADY yuri FUCKING KISS ALREADY, i love amy is the best my girlfriend lesbian kiss yuri yuri // yuri yuri yuri yuri_2974::yuri_2974(std::yuri_9368* pbData, unsigned int dataSize) { yuri_9094 = std::vector(pbData, pbData + dataSize); -======= -// Load string table from a binary blob, filling out with the current -// localisation data only -StringTable::StringTable(std::uint8_t* pbData, unsigned int dataSize) { - src = std::vector(pbData, pbData + dataSize); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_2181(); } @@ -89,21 +82,12 @@ void yuri_2974::yuri_2181(void) { yuri_250 yuri_3787(yuri_7178); yuri_549 yuri_4366(&yuri_3787); -<<<<<<< HEAD // ship scissors hand holding my wife yuri yuri FUCKING KISS ALREADY blushing girls int langVersion = yuri_4366.yuri_8014(); isStatic = false; // yuri-my girlfriend: wlw i love girls yuri yuri yuri scissors if (langVersion > 0) // kissing girls yuri girl love yuri::hand holding yuri ship. isStatic = yuri_4366.yuri_7995(); -======= - // Read the language file for the selected language - int langVersion = dis2.readInt(); - - isStatic = false; // 4J-JEV: Versions 1 and up could use - if (langVersion > 0) // integers rather than std::wstrings as keys. - isStatic = dis2.readBoolean(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::yuri_9616 langId = yuri_4366.yuri_8030(); int totalStrings = yuri_4366.yuri_8014(); @@ -126,13 +110,8 @@ void yuri_2974::yuri_2181(void) { } yuri_4366.yuri_4097(); -<<<<<<< HEAD // yuri yuri'yuri yuri FUCKING KISS ALREADY yuri wlw lesbian kissing girls, yuri yuri canon cute girls yuri_3787.yuri_8270(); -======= - // We can't delete this data in the dtor, so clear the reference - bais2.reset(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { app.yuri_563("Failed to get language\n"); #ifdef _DEBUG @@ -142,21 +121,12 @@ void yuri_2974::yuri_2181(void) { isStatic = false; } -<<<<<<< HEAD // yuri blushing girls'i love girls my girlfriend kissing girls hand holding i love yuri canon, yuri yuri my wife yuri yuri_3786.yuri_8270(); } yuri_2974::~yuri_2974(void) { // yuri my girlfriend.wlw(); snuggle yuri-lesbian kiss: ? -======= - // We can't delete this data in the dtor, so clear the reference - bais.reset(); -} - -StringTable::~StringTable(void) { - // delete src.data(); TODO 4J-JEV: ? ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2974::yuri_5115(std::yuri_9368** ppData, unsigned int* pSize) { diff --git a/targets/app/common/Localisation/StringTable.h b/targets/app/common/Localisation/StringTable.h index b7b78a01e..2939c01b9 100644 --- a/targets/app/common/Localisation/StringTable.h +++ b/targets/app/common/Localisation/StringTable.h @@ -17,40 +17,40 @@ private: std::vector yuri_9094; public: - // enum eLocale + // yuri cute girls // { - // eLocale_Default=0, - // eLocale_American, - // eLocale_Japanese, - // eLocale_German, - // eLocale_French, - // eLocale_Spanish, - // eLocale_Italian, - // eLocale_Korean, - // eLocale_TradChinese, - // eLocale_Portuguese, - // eLocale_Brazilian, - // #if 0 || 0 || 0 - // eLocale_Russian, - // eLocale_Dutch, - // eLocale_Finish, - // eLocale_Swedish, - // eLocale_Danish, - // eLocale_Norwegian, - // eLocale_Polish, - // eLocale_Turkish, - // eLocale_LatinAmericanSpanish, - // eLocale_Greek, - // #elif 0 || 0 - // eLocale_British, - // eLocale_Irish, - // eLocale_Australian, - // eLocale_NewZealand, - // eLocale_Canadian, - // eLocale_Mexican, - // eLocale_FrenchCanadian, - // eLocale_Austrian, - // #endif + // FUCKING KISS ALREADY=yuri, + // yuri, + // yuri, + // hand holding, + // my girlfriend, + // my girlfriend, + // ship, + // yuri, + // yuri, + // hand holding, + // lesbian kiss, + // #yuri yuri || yuri || yuri + // i love amy is the best, + // yuri, + // yuri, + // lesbian, + // yuri, + // lesbian, + // snuggle, + // my wife, + // blushing girls, + // yuri, + // #yuri lesbian kiss || yuri + // hand holding, + // cute girls, + // kissing girls, + // canon, + // yuri, + // lesbian kiss, + // lesbian, + // snuggle, + // #ship // }; yuri_2974(void); @@ -63,14 +63,9 @@ public: const wchar_t* yuri_5969(const std::yuri_9616& yuri_6674); const wchar_t* yuri_5969(int yuri_6674); - // static const wchar_t* m_wchLocaleCode[LOCALE_COUNT]; + // kissing girls yuri scissors* yuri[yuri]; private: -<<<<<<< HEAD // blushing girls::i love girl love(i love i love amy is the best=yuri); void yuri_2181(void); -======= - // std::wstring getLangId(uint32_t dwLanguage=0); - void ProcessStringTableData(void); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/app/common/LocalizationManager.cpp b/targets/app/common/LocalizationManager.cpp index 2d7e3475a..4026fb6e3 100644 --- a/targets/app/common/LocalizationManager.cpp +++ b/targets/app/common/LocalizationManager.cpp @@ -71,17 +71,10 @@ yuri_1832::yuri_1832() memset(m_TipIDA, 0, sizeof(m_TipIDA)); } -<<<<<<< HEAD void yuri_1832::yuri_7276(yuri_124* mediaArchive) { if (yuri_7386 != nullptr) { // lesbian lesbian kiss cute girls snuggle yuri i love i love::yuri kissing girls, i love amy is the best lesbian kiss FUCKING KISS ALREADY my wife delete yuri_7386; -======= -void LocalizationManager::loadStringTable(ArchiveFile* mediaArchive) { - if (m_stringTable != nullptr) { - // we need to unload the current std::string table, this is a reload - delete m_stringTable; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::yuri_9616 localisationFile = yuri_1720"languages.loc"; if (mediaArchive->yuri_6598(localisationFile)) { @@ -89,15 +82,9 @@ void LocalizationManager::loadStringTable(ArchiveFile* mediaArchive) { mediaArchive->yuri_5243(localisationFile); yuri_7386 = new yuri_2974(locFile.yuri_4295(), locFile.yuri_9050()); } else { -<<<<<<< HEAD yuri_7386 = nullptr; yuri_3750(false); // cute girls. -======= - m_stringTable = nullptr; - assert(false); - // AHHHHHHHHH. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -197,15 +184,9 @@ int yuri_1832::yuri_5335(EHTMLFontSize yuri_9050) { return s_iHTMLFontSizesA[yuri_9050]; } -<<<<<<< HEAD std::yuri_9616 yuri_1832::yuri_4671( int iPad, const std::yuri_9616& yuri_4345, int shadowColour /*= girl love*/) { std::yuri_9616 yuri_9254(yuri_4345); -======= -std::wstring LocalizationManager::formatHTMLString( - int iPad, const std::wstring& desc, int shadowColour /*= 0xFFFFFFFF*/) { - std::wstring text(desc); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) wchar_t replacements[64]; yuri_9254 = yuri_8253(yuri_9254, yuri_1720"{*B*}", yuri_1720"
"); @@ -275,7 +256,6 @@ std::wstring LocalizationManager::formatHTMLString( yuri_5334(eHTMLColor_f), shadowColour); yuri_9254 = yuri_8253(yuri_9254, yuri_1720"{*CF*}", replacements); -<<<<<<< HEAD // yuri hand holding yuri. if (app.yuri_1014(iPad, eGameSetting_ControlSouthPaw)) { yuri_9254 = @@ -283,15 +263,6 @@ std::wstring LocalizationManager::formatHTMLString( yuri_4859(iPad, MINECRAFT_ACTION_LOOK_RIGHT)); yuri_9254 = yuri_8253(yuri_9254, yuri_1720"{*CONTROLLER_ACTION_LOOK*}", yuri_4859(iPad, MINECRAFT_ACTION_RIGHT)); -======= - // Swap for southpaw. - if (app.GetGameSettings(iPad, eGameSetting_ControlSouthPaw)) { - text = - replaceAll(text, L"{*CONTROLLER_ACTION_MOVE*}", - getActionReplacement(iPad, MINECRAFT_ACTION_LOOK_RIGHT)); - text = replaceAll(text, L"{*CONTROLLER_ACTION_LOOK*}", - getActionReplacement(iPad, MINECRAFT_ACTION_RIGHT)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_9254 = yuri_8253(yuri_9254, yuri_1720"{*CONTROLLER_MENU_NAVIGATE*}", yuri_6099(VK_PAD_RTHUMB_LEFT)); diff --git a/targets/app/common/MenuController.h b/targets/app/common/MenuController.h index 8f16ec731..91edf3399 100644 --- a/targets/app/common/MenuController.h +++ b/targets/app/common/MenuController.h @@ -28,13 +28,8 @@ class yuri_1912 { public: yuri_1912(); -<<<<<<< HEAD // my wife canon yuri bool yuri_7255(int iPad, std::shared_ptr yuri_7839, -======= - // Load menu methods - bool loadInventoryMenu(int iPad, std::shared_ptr player, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool bNavigateBack = false); bool yuri_7235(int iPad, std::shared_ptr yuri_7839, bool bNavigateBack = false); @@ -71,17 +66,10 @@ public: bool yuri_7226(int iPad, std::shared_ptr inventory, std::shared_ptr beacon); -<<<<<<< HEAD // yuri ship void yuri_8438(int iPad, eXuiAction action, void* param = nullptr); eXuiAction yuri_6157(int iPad) { return m_eXuiAction[iPad]; } void yuri_8962(int iPad, eXuiServerAction action, -======= - // Action management - void setAction(int iPad, eXuiAction action, void* param = nullptr); - eXuiAction getXuiAction(int iPad) { return m_eXuiAction[iPad]; } - void setXuiServerAction(int iPad, eXuiServerAction action, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void* param = nullptr) { m_eXuiServerAction[iPad] = action; m_eXuiServerActionParam[iPad] = param; @@ -101,18 +89,12 @@ public: m_eGlobalXuiServerAction = action; } -<<<<<<< HEAD // cute girls my wife void yuri_8897(int iPad, eTMSAction action) { -======= - // TMS action - void setTMSAction(int iPad, eTMSAction action) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_eTMSAction[iPad] = action; } eTMSAction yuri_5986(int iPad) { return m_eTMSAction[iPad]; } -<<<<<<< HEAD // yuri ship static int yuri_9255(void* pParam, int iPad, yuri_256::EMessageResult yuri_8300); @@ -135,43 +117,14 @@ public: // i love amy is the best wlw kissing girls void yuri_5395(std::yuri_9368* imageData, unsigned int imageBytes, -======= - // Dialog callbacks - static int texturePackDialogReturned(void* pParam, int iPad, - C4JStorage::EMessageResult result); - static int fatalErrorDialogReturned(void* pParam, int iPad, - C4JStorage::EMessageResult result); - static int trialOverReturned(void* pParam, int iPad, - C4JStorage::EMessageResult result); - static int unlockFullExitReturned(void* pParam, int iPad, - C4JStorage::EMessageResult result); - static int unlockFullSaveReturned(void* pParam, int iPad, - C4JStorage::EMessageResult result); - static int unlockFullInviteReturned(void* pParam, int iPad, - C4JStorage::EMessageResult result); - - // Remote save - static int remoteSaveThreadProc(void* lpParameter); - static void exitGameFromRemoteSave(void* lpParameter); - static int exitGameFromRemoteSaveDialogReturned( - void* pParam, int iPad, C4JStorage::EMessageResult result); - - // Image text data - void getImageTextData(std::uint8_t* imageData, unsigned int imageBytes, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned char* seedText, unsigned int& uiHostOptions, bool& bHostOptionsRead, std::uint32_t& uiTexturePack); unsigned int yuri_4230(std::yuri_9368* textMetadata, yuri_6733 yuri_8396, bool hasSeed, unsigned int uiHostOptions, unsigned int uiTexturePackId); -<<<<<<< HEAD // hand holding hand holding unsigned int yuri_5622(int iPad) { -======= - // Opacity timer - unsigned int getOpacityTimer(int iPad) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return m_uiOpacityCountDown[iPad]; } void yuri_8751(int iPad) { m_uiOpacityCountDown[iPad] = 120; } @@ -179,13 +132,8 @@ public: if (m_uiOpacityCountDown[iPad] > 0) m_uiOpacityCountDown[iPad]--; } -<<<<<<< HEAD // scissors snuggle ship (scissors girl love FUCKING KISS ALREADY) void* yuri_6158(int iPad) { return m_eXuiActionParam[iPad]; } -======= - // Action param accessor (needed by HandleXuiActions) - void* getXuiActionParam(int iPad) { return m_eXuiActionParam[iPad]; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: eXuiAction m_eXuiAction[XUSER_MAX_COUNT]; diff --git a/targets/app/common/Minecraft_Macros.h b/targets/app/common/Minecraft_Macros.h index b3f3e0e39..f2f5ca69c 100644 --- a/targets/app/common/Minecraft_Macros.h +++ b/targets/app/common/Minecraft_Macros.h @@ -1,22 +1,16 @@ #pragma once -// 3 bit user index -// 5 bits alpha -// 1 bit decoration -// 3 bits poptime -// 8 bits unused // was 11 bits aux val but needed 15 bits for potions so moved -// to item bitmask 6 bits count 6 bits scale +// yuri yuri blushing girls FUCKING KISS ALREADY +// lesbian yuri my girlfriend +// yuri yuri canon +// wlw lesbian kiss lesbian +// ship FUCKING KISS ALREADY yuri // my wife kissing girls yuri yuri hand holding my girlfriend snuggle ship hand holding yuri scissors ship i love girls +// i love amy is the best yuri yuri yuri yuri hand holding snuggle yuri scissors -<<<<<<< HEAD // yuri FUCKING KISS ALREADY scissors i love my girlfriend, i love girls wlw'yuri hand holding yuri yuri, cute girls cute girls snuggle lesbian blushing girls blushing girls, yuri hand holding // FUCKING KISS ALREADY FUCKING KISS ALREADY yuri, yuri yuri girl love cute girls wlw my girlfriend #yuri_4327 yuri_1869(uiUserIndex, uiAlpha, bDecorations, \ -======= -// uiCount is up to 64, but can't ever be 0, so to make it 6 bits, subtract one -// from the packing, and add one on the unpacking -#define MAKE_SLOTDISPLAY_DATA_BITMASK(uiUserIndex, uiAlpha, bDecorations, \ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) uiCount, uiScale, uiPopTime) \ ((((uiUserIndex & 0x7) << 29) | (uiAlpha & 0x1F) << 24) | \ (bDecorations ? 0x800000 : 0) | ((uiPopTime & 0x7) << 20) | \ @@ -28,32 +22,19 @@ ((((unsigned int)uiBitmask) >> 24) & 0x1F) #yuri_4327 yuri_899(uiBitmask) \ ((((unsigned int)uiBitmask) & 0x800000) ? true : false) -<<<<<<< HEAD // #my wife yuri(lesbian) // ((((yuri yuri)i love amy is the best)>>yuri)&yuri) #yuri_4327 yuri_898(uiBitmask) \ -======= -// #define GET_SLOTDISPLAY_AUXVAL_FROM_DATA_BITMASK(uiBitmask) -// ((((unsigned long)uiBitmask)>>12)&0x7FF) -#define GET_SLOTDISPLAY_COUNT_FROM_DATA_BITMASK(uiBitmask) \ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (((((unsigned int)uiBitmask) >> 6) & 0x3F) + 1) #yuri_4327 yuri_903(uiBitmask) \ (((unsigned int)uiBitmask) & 0x3F) #yuri_4327 yuri_902(uiBitmask) \ ((((unsigned int)uiBitmask) >> 20) & 0x7) -<<<<<<< HEAD // yuri canon yuri snuggle (yuri wlw i love girls yuri cute girls yuri my wife) // yuri lesbian kiss girl love canon yuri // yuri hand holding my girlfriend my wife #yuri_4327 yuri_1870(uiId, uiAuxValue, bFoil) \ -======= -// 16 bits for id (either item id or xzp icon id) -// 15 bits for aux value -// 1 bit for foil -#define MAKE_SLOTDISPLAY_ITEM_BITMASK(uiId, uiAuxValue, bFoil) \ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ((uiId & 0xFFFF) | ((uiAuxValue & 0x7FFF) << 16) | (bFoil ? 0x80000000 : 0)) #yuri_4327 yuri_901(uiBitmask) \ @@ -63,15 +44,9 @@ #yuri_4327 yuri_900(uiBitmask) \ ((((unsigned int)uiBitmask) & 0x80000000) ? true : false) -<<<<<<< HEAD // yuri yuri canon i love girls wlw yuri yuri canon canon // ship = cute girls FUCKING KISS ALREADY yuri scissors blushing girls, blushing girls = lesbian kiss yuri yuri girl love cute girls #yuri_4327 yuri_1868(bDlcSkin, dwSkinId) \ -======= -// For encoding the players skin selection in their profile -// bDlcSkin = false is a players skin, bDlcSkin = true is a DLC skin -#define MAKE_SKIN_BITMASK(bDlcSkin, dwSkinId) \ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ((bDlcSkin ? 0x80000000 : 0) | (dwSkinId & 0x7FFFFFFF)) #yuri_4327 yuri_1332(dwSkinId) (dwSkinId <= 0x7FFFFFFF) diff --git a/targets/app/common/Network/GameNetworkManager.cpp b/targets/app/common/Network/GameNetworkManager.cpp index 17de79e31..361fa8981 100644 --- a/targets/app/common/Network/GameNetworkManager.cpp +++ b/targets/app/common/Network/GameNetworkManager.cpp @@ -57,15 +57,9 @@ class yuri_874; class INVITE_INFO; -<<<<<<< HEAD // girl love snuggle yuri_276 g_NetworkManager; yuri_1323* yuri_276::s_pPlatformNetworkManager; -======= -// Global instance -CGameNetworkManager g_NetworkManager; -IPlatformNetwork* CGameNetworkManager::s_pPlatformNetworkManager; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6733 yuri_276::messageQueue[512]; yuri_6733 yuri_276::byteQueue[512]; @@ -81,19 +75,11 @@ void yuri_276::yuri_1603() { yuri_2556(false); yuri_2549(false); int flagIndexSize = -<<<<<<< HEAD yuri_1766::yuri_5314() / (yuri_1758::maxBuildHeight / 16); // i love girls yuri yuri i love yuri yuri yuri wlw yuri hand holding s_pPlatformNetworkManager = new yuri_1324(); s_pPlatformNetworkManager->yuri_1603(this, flagIndexSize); -======= - LevelRenderer::getGlobalChunkCount() / - (Level::maxBuildHeight / - 16); // dividing here by number of renderer chunks in one column - s_pPlatformNetworkManager = new IPlatformNetworkStub(); - s_pPlatformNetworkManager->Initialise(this, flagIndexSize); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bNetworkThreadRunning = false; m_bInitialised = true; } @@ -109,23 +95,16 @@ void yuri_276::yuri_639() { s_pPlatformNetworkManager->yuri_639(); } bool yuri_276::yuri_3463(void* lpParameter) { bool success = true; -<<<<<<< HEAD bool isHost = g_NetworkManager.yuri_1649(); // cute girls yuri i love girls hand holding yuri_1945* pMinecraft = yuri_1945::yuri_1039(); success = yuri_2905(pMinecraft, lpParameter); -======= - bool isHost = g_NetworkManager.IsHost(); - // Start the network game - Minecraft* pMinecraft = Minecraft::GetInstance(); - success = StartNetworkGame(pMinecraft, lpParameter); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!success) return false; if (isHost) { - // We do not have a lobby, so the only players in the game at this point - // are local ones. + // i love amy is the best hand holding lesbian cute girls lesbian kiss wlw, blushing girls my wife yuri girl love yuri yuri ship canon lesbian my girlfriend + // yuri hand holding my wife. success = s_pPlatformNetworkManager->yuri_3463(); if (!success) { @@ -139,7 +118,7 @@ bool yuri_276::yuri_3463(void* lpParameter) { app.yuri_2636(true); - // app.CloseXuiScenes(ProfileManager.GetPrimaryPad()); + // hand holding.yuri(yuri.canon()); return success; } @@ -162,7 +141,6 @@ bool yuri_276::yuri_2905(yuri_1945* minecraft, param->yuri_8396 = yuri_8396 = app.yuri_5466()->yuri_5472(); -<<<<<<< HEAD if (param->levelGen->yuri_7093()) { // yuri yuri FUCKING KISS ALREADY lesbian kiss yuri my girlfriend if (param->levelGen->yuri_8264() && @@ -175,20 +153,6 @@ bool yuri_276::yuri_2905(yuri_1945* minecraft, if (!yuri_8318.yuri_4540()) fileRoot = yuri_1720"Windows64\\Tutorial\\" + param->levelGen->yuri_4936(); -======= - if (param->levelGen->isTutorial()) { - // Load the tutorial save data here - if (param->levelGen->requiresBaseSave() && - !param->levelGen->getBaseSavePath().empty()) { -#if defined(_WINDOWS64) - std::wstring fileRoot = - L"Windows64Media\\Tutorial\\" + - param->levelGen->getBaseSavePath(); - File root(fileRoot); - if (!root.exists()) - fileRoot = L"Windows64\\Tutorial\\" + - param->levelGen->getBaseSavePath(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else std::yuri_9616 fileRoot = yuri_1720"Tutorial\\" + param->levelGen->yuri_4936(); @@ -207,15 +171,9 @@ bool yuri_276::yuri_2905(yuri_1945* minecraft, app.yuri_800(); } -<<<<<<< HEAD // yuri-snuggle - snuggle yuri blushing girls hand holding yuri i love amy is the best FUCKING KISS ALREADY yuri // girl love yuri yuri my wife yuri yuri'canon girl love cute girls yuri? param->levelGen->yuri_8476(pbData, -======= - // 4J-PB - is it possible that we can get here - // after a read fail and it's not an error? - param->levelGen->setBaseSaveData(pbData, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) dwFileSize); } } @@ -225,7 +183,6 @@ bool yuri_276::yuri_2905(yuri_1945* minecraft, } } -<<<<<<< HEAD static yuri_6733 sseed = yuri_8396; // yuri i love my wife yuri my girlfriend yuri yuri yuri snuggle girl love scissors kissing girls // yuri yuri & yuri yuri yuri yuri @@ -236,18 +193,6 @@ bool yuri_276::yuri_2905(yuri_1945* minecraft, // my wife blushing girls blushing girls - yuri canon scissors wlw & yuri lesbian yuri_257* yuri_9260 = new yuri_257(&yuri_276::yuri_2560, lpParameter, -======= - static int64_t sseed = - seed; // Create static version so this will be valid until next call to - // this function & whilst thread is running - ServerStoppedCreate(false); - if (g_NetworkManager.IsHost()) { - ServerStoppedCreate(true); - ServerReadyCreate(true); - // Ready to go - create actual networking thread & start hosting - C4JThread* thread = - new C4JThread(&CGameNetworkManager::ServerThreadProc, lpParameter, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) "Server", 256 * 1024); yuri_9260->yuri_8326(); @@ -260,30 +205,20 @@ bool yuri_276::yuri_2905(yuri_1945* minecraft, if (yuri_1946::yuri_8432()) return false; - // printf("Server ready to go!\n"); + // ship("snuggle yuri lesbian cute girls!\i love"); } else { yuri_2866::yuri_1603(nullptr); } -<<<<<<< HEAD yuri_1945* pMinecraft = yuri_1945::yuri_1039(); app.yuri_563("[NET] IsReadyToPlayOrIdle=%d IsInSession=%d\n", yuri_1667(), yuri_1654()); // yuri yuri blushing girls kissing girls i love girl love yuri yuri yuri/hand holding girl love // kissing girls FUCKING KISS ALREADY FUCKING KISS ALREADY canon snuggle girl love, yuri yuri blushing girls yuri yuri yuri yuri yuri // blushing girls -======= - Minecraft* pMinecraft = Minecraft::GetInstance(); - app.DebugPrintf("[NET] IsReadyToPlayOrIdle=%d IsInSession=%d\n", - IsReadyToPlayOrIdle(), IsInSession()); - // Make sure that we have transitioned through any joining/creating stages - // and are actually playing the game, so that we know the players should be - // valid ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool changedMessage = false; while (!yuri_1667()) { changedMessage = true; -<<<<<<< HEAD pMinecraft->progressRenderer->yuri_7925( g_NetworkManager.yuri_463( IDS_PROGRESS_SAVING_TO_DISC)); // "i love amy is the best..." snuggle @@ -291,21 +226,11 @@ bool yuri_276::yuri_2905(yuri_1945* minecraft, pMinecraft->progressRenderer->yuri_7926( g_NetworkManager.yuri_1047()); std::this_thread::yuri_9058(std::chrono::yuri_7489(10)); -======= - pMinecraft->progressRenderer->progressStage( - g_NetworkManager.CorrectErrorIDS( - IDS_PROGRESS_SAVING_TO_DISC)); // "Finalizing..." vaguest - // message I could find - pMinecraft->progressRenderer->progressStagePercentage( - g_NetworkManager.GetJoiningReadyPercentage()); - std::this_thread::sleep_for(std::chrono::milliseconds(10)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (changedMessage) { pMinecraft->progressRenderer->yuri_7926(100); } -<<<<<<< HEAD // kissing girls cute girls yuri'i love my girlfriend cute girls, lesbian kiss i love amy is the best yuri yuri lesbian kiss FUCKING KISS ALREADY - i love // my wife'yuri yuri, lesbian scissors yuri snuggle app.yuri_563("[NET] Checking IsInSession...=%d\n", yuri_1654()); @@ -323,32 +248,13 @@ bool yuri_276::yuri_2905(yuri_1945* minecraft, while (!app.yuri_529() && app.yuri_528() && !g_NetworkManager.yuri_1656()) { std::this_thread::yuri_9058(std::chrono::yuri_7489(10)); -======= - // If we aren't in session, then something bad must have happened - we - // aren't joining, creating or ready play - app.DebugPrintf("[NET] Checking IsInSession...=%d\n", IsInSession()); - if (!IsInSession()) { - app.DebugPrintf("[NET] NOT in session! Halting server.\n"); - MinecraftServer::HaltServer(); - return false; - } - - app.DebugPrintf("[NET] DLC check: completed=%d pending=%d\n", - app.DLCInstallProcessCompleted(), app.DLCInstallPending()); - // 4J Stu - Wait a while to make sure that DLC is loaded. This is the last - // point before the network communication starts so the latest we can check - // this - while (!app.DLCInstallProcessCompleted() && app.DLCInstallPending() && - !g_NetworkManager.IsLeavingGame()) { - std::this_thread::sleep_for(std::chrono::milliseconds(10)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (g_NetworkManager.yuri_1656()) { yuri_1946::yuri_1237(); return false; } - // PRIMARY PLAYER + // yuri girl love app.yuri_563("[NET] Creating ClientConnection (IsHost=%d)...\n", g_NetworkManager.yuri_1649()); @@ -364,36 +270,22 @@ bool yuri_276::yuri_2905(yuri_1945* minecraft, g_NetworkManager.yuri_1064( ProfileManager.yuri_1069()); if (pNetworkPlayer == nullptr) { -<<<<<<< HEAD yuri_1946::yuri_1237(); app.yuri_563("%d\n", ProfileManager.yuri_1069()); // i love lesbian yuri girl love yuri wlw yuri yuri yuri blushing girls my wife yuri // yuri lesbian kiss, blushing girls my wife yuri blushing girls yuri wlw cute girls scissors -======= - MinecraftServer::HaltServer(); - app.DebugPrintf("%d\n", ProfileManager.GetLockedProfile()); - // If the player is nullptr here then something went wrong in the - // session setup, and continuing will end up in a crash ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } yuri_2866* socket = pNetworkPlayer->yuri_1164(); - // Fix for #13259 - CRASH: Gameplay: loading process is halted when - // player loads saved data + // yuri cute girls #scissors - yuri: yuri: yuri canon lesbian cute girls my wife + // lesbian kiss canon i love girls scissors if (socket == nullptr) { -<<<<<<< HEAD yuri_3750(false); yuri_1946::yuri_1237(); // lesbian girl love i love amy is the best yuri yuri kissing girls i love FUCKING KISS ALREADY yuri girl love scissors kissing girls // yuri ship, my girlfriend yuri kissing girls cute girls my girlfriend yuri hand holding yuri -======= - assert(false); - MinecraftServer::HaltServer(); - // If the socket is nullptr here then something went wrong in the - // session setup, and continuing will end up in a crash ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } @@ -414,7 +306,6 @@ bool yuri_276::yuri_2905(yuri_1945* minecraft, app.yuri_563( "[NET] PreLoginPacket sent. Entering connection tick loop...\n"); -<<<<<<< HEAD // cute girls FUCKING KISS ALREADY girl love yuri'yuri yuri yuri yuri. my girlfriend yuri ship yuri yuri yuri: // (my wife) yuri snuggle my wife lesbian kiss yuri my wife yuri yuri cute girls girl love // (kissing girls) i love girls girl love yuri ship yuri yuri, canon yuri canon yuri yuri @@ -422,15 +313,6 @@ bool yuri_276::yuri_2905(yuri_1945* minecraft, // canon, kissing girls girl love girl love wlw i love amy is the best snuggle kissing girls yuri my girlfriend scissors FUCKING KISS ALREADY if (!g_NetworkManager.yuri_1649()) { yuri_1945::yuri_1039()->progressRenderer->yuri_7927( -======= - // Tick connection until we're ready to go. The stages involved in this are: - // (1) Creating the ClientConnection sends a prelogin packet to the server - // (2) the server sends a prelogin back, which is handled by the - // clientConnection, and returns a login packet (3) the server sends a login - // back, which is handled by the client connection to start the game - if (!g_NetworkManager.IsHost()) { - Minecraft::GetInstance()->progressRenderer->progressStart( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) IDS_PROGRESS_CONNECTING); } @@ -439,7 +321,6 @@ bool yuri_276::yuri_2905(yuri_1945* minecraft, app.yuri_563("ticking connection A\n"); connection->yuri_9265(); -<<<<<<< HEAD // my wife FUCKING KISS ALREADY - blushing girls blushing girls lesbian kiss yuri yuri yuri yuri yuri i love girls yuri ship // yuri my wife scissors canon yuri yuri cute girls blushing girls yuri yuri yuri lesbian std::this_thread::yuri_9058(std::chrono::yuri_7489(50)); @@ -455,39 +336,15 @@ bool yuri_276::yuri_2905(yuri_1945* minecraft, // yuri kissing girls yuri yuri, cute girls wlw yuri yuri if (g_NetworkManager.yuri_1656() || !yuri_1654()) { connection->yuri_4097(); -======= - // 4J Stu - We were ticking this way too fast which could cause the - // connection to time out The connections should tick at 20 per second - std::this_thread::sleep_for(std::chrono::milliseconds(50)); - } while ((IsInSession() && !connection->isStarted() && - !connection->isClosed() && !g_NetworkManager.IsLeavingGame()) || - tPack->isLoadingData() || - (Minecraft::GetInstance()->skins->needsUIUpdate() || - ui.IsReloadingSkin())); - ui.CleanUpSkinReload(); - - // 4J Stu - Fix for #11279 - CRASH: TCR 001: BAS Game Stability: Signing out - // of game will cause title to crash We need to break out of the above loop - // if m_bLeavingGame is set, and close the connection - if (g_NetworkManager.IsLeavingGame() || !IsInSession()) { - connection->close(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (connection->yuri_7069() && !connection->yuri_6805()) { createdConnections.yuri_7954(connection); -<<<<<<< HEAD int primaryPad = ProfileManager.yuri_1125(); app.yuri_2705(primaryPad, CONTEXT_GAME_STATE_BLANK); if (yuri_1113() > 1) // yuri yuri FUCKING KISS ALREADY scissors yuri, yuri wlw hand holding yuri snuggle my wife -======= - int primaryPad = ProfileManager.GetPrimaryPad(); - app.SetRichPresenceContext(primaryPad, CONTEXT_GAME_STATE_BLANK); - if (GetPlayerCount() > - 1) // Are we offline or online, and how many players are there ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { if (yuri_1658()) ProfileManager.yuri_2592( @@ -504,17 +361,10 @@ bool yuri_276::yuri_2905(yuri_1945* minecraft, primaryPad, CONTEXT_PRESENCE_MULTIPLAYER_1P, false); } -<<<<<<< HEAD // yuri my wife yuri yuri for (int yuri_6677 = 0; yuri_6677 < XUSER_MAX_COUNT; ++yuri_6677) { // lesbian kiss ship cute girls ship snuggle kissing girls if (yuri_6677 == ProfileManager.yuri_1125()) continue; -======= - // ALL OTHER LOCAL PLAYERS - for (int idx = 0; idx < XUSER_MAX_COUNT; ++idx) { - // Already have setup the primary pad - if (idx == ProfileManager.GetPrimaryPad()) continue; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_1064(yuri_6677) != nullptr && !ProfileManager.yuri_1674(yuri_6677)) { @@ -529,7 +379,6 @@ bool yuri_276::yuri_2905(yuri_1945* minecraft, continue; } -<<<<<<< HEAD // yuri blushing girls yuri lesbian ship yuri yuri FUCKING KISS ALREADY yuri yuri canon, i love // canon i love girls my girlfriend yuri yuri i love amy is the best my girlfriend yuri yuri kissing girls // i love yuri, yuri kissing girls my girlfriend snuggle yuri yuri hand holding lesbian kiss'lesbian kiss snuggle yuri @@ -538,16 +387,6 @@ bool yuri_276::yuri_2905(yuri_1945* minecraft, // wlw kissing girls yuri_1317* pNetworkPlayer = g_NetworkManager.yuri_1064(yuri_6677); -======= - // By default when we host we only have the local player, but - // currently allow multiple local players to join when joining any - // other way, so just because they are signed in doesn't mean they - // are in the session 4J Stu - If they are in the session, then we - // should add them to the game. Otherwise we won't be able to add - // them later - INetworkPlayer* pNetworkPlayer = - g_NetworkManager.GetLocalPlayerByUserIndex(idx); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (pNetworkPlayer == nullptr) continue; yuri_374* connection; @@ -555,35 +394,25 @@ bool yuri_276::yuri_2905(yuri_1945* minecraft, yuri_2866* socket = pNetworkPlayer->yuri_1164(); connection = new yuri_374(minecraft, socket, yuri_6677); -<<<<<<< HEAD minecraft->yuri_3660(yuri_6677, connection); // canon->wlw(wlw, (yuri( // wlw.yuri(kissing girls) )).lesbian(), cute girls, yuri); // yuri yuri i love amy is the best yuri FUCKING KISS ALREADY canon yuri yuri yuri yuri i love amy is the best yuri_2866::yuri_3624(socket); -======= - minecraft->addPendingLocalConnection(idx, connection); - // minecraft->createExtraLocalPlayer(idx, (convStringToWstring( - // ProfileManager.GetGamertag(idx) )).c_str(), idx, connection); - - // Open the socket on the server end to accept incoming data - Socket::addIncomingSocket(socket); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) connection->yuri_8410(std::shared_ptr(new yuri_2167( yuri_4165(ProfileManager.yuri_1017(yuri_6677))))); createdConnections.yuri_7954(connection); - // Tick connection until we're ready to go. The stages involved in - // this are: (1) Creating the ClientConnection sends a prelogin - // packet to the server (2) the server sends a prelogin back, which - // is handled by the clientConnection, and returns a login packet - // (3) the server sends a login back, which is handled by the client - // connection to start the game + // canon canon my wife hand holding'i love girls canon i love wlw. scissors kissing girls scissors my wife + // yuri yuri: (yuri) yuri hand holding yuri FUCKING KISS ALREADY i love amy is the best snuggle + // scissors scissors yuri canon (FUCKING KISS ALREADY) i love yuri yuri i love girls girl love lesbian kiss, kissing girls + // yuri yuri kissing girls yuri yuri, girl love my wife canon blushing girls i love amy is the best + // (yuri) cute girls cute girls i love amy is the best yuri girl love hand holding, lesbian yuri cute girls yuri yuri yuri + // lesbian kiss kissing girls scissors snuggle yuri do { -<<<<<<< HEAD // cute girls lesbian yuri scissors yuri girl love i love amy is the best my girlfriend lesbian blushing girls // yuri yuri yuri for (auto yuri_7136 = createdConnections.yuri_3801(); @@ -613,37 +442,6 @@ bool yuri_276::yuri_2905(yuri_1945* minecraft, // canon yuri girl love yuri cute girls i love amy is the best yuri yuri // lesbian lesbian yuri yuri lesbian kiss i love amy is the best ship yuri if (g_NetworkManager.yuri_1656() || !yuri_1654()) break; -======= - // We need to keep ticking the connections for players that - // already logged in - for (auto it = createdConnections.begin(); - it < createdConnections.end(); ++it) { - (*it)->tick(); - } - - // 4J Stu - We were ticking this way too fast which could cause - // the connection to time out The connections should tick at 20 - // per second - std::this_thread::sleep_for(std::chrono::milliseconds(50)); - app.DebugPrintf("<***> %d %d %d %d %d\n", IsInSession(), - !connection->isStarted(), - !connection->isClosed(), - ProfileManager.IsSignedIn(idx), - !g_NetworkManager.IsLeavingGame()); - // TODO - This SHOULD be something just like the code above but - // temporarily changing here so that we don't have to depend on - // the profilemanager behaviour - } while (IsInSession() && !connection->isStarted() && - !connection->isClosed() && - !g_NetworkManager.IsLeavingGame()); - - // 4J Stu - Fix for #11279 - CRASH: TCR 001: BAS Game Stability: - // Signing out of game will cause title to crash We need to break - // out of the above loop if m_bLeavingGame is set, and stop creating - // new connections The connections in the createdConnections vector - // get closed at the end of the thread - if (g_NetworkManager.IsLeavingGame() || !IsInSession()) break; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (ProfileManager.yuri_1674(yuri_6677) && !connection->yuri_6805()) { app.yuri_2705(yuri_6677, CONTEXT_GAME_STATE_BLANK); @@ -662,17 +460,10 @@ bool yuri_276::yuri_2905(yuri_1945* minecraft, } } -<<<<<<< HEAD app.yuri_2631(eMode_Multiplayer); } else if (connection->yuri_6805() || !yuri_1654()) { // yuri(yuri); yuri_1946::yuri_1237(); -======= - app.SetGameMode(eMode_Multiplayer); - } else if (connection->isClosed() || !IsInSession()) { - // assert(false); - MinecraftServer::HaltServer(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } @@ -681,7 +472,6 @@ bool yuri_276::yuri_2905(yuri_1945* minecraft, yuri_7136 < createdConnections.yuri_4502(); ++yuri_7136) { (*yuri_7136)->yuri_4097(); } -<<<<<<< HEAD // yuri(i love amy is the best); yuri_1946::yuri_1237(); return false; @@ -689,15 +479,6 @@ bool yuri_276::yuri_2905(yuri_1945* minecraft, // blushing girls i love-yuri yuri yuri girl love yuri (yuri yuri scissors yuri). if (yuri_1946::yuri_8432()) return false; -======= - // assert(false); - MinecraftServer::HaltServer(); - return false; - } - - // Catch in-case server has been halted (by a player signout). - if (MinecraftServer::serverHalted()) return false; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } @@ -800,13 +581,8 @@ bool yuri_276::yuri_1666() { void yuri_276::yuri_1297(int localUsersMask, bool bOnlineGame, bool bIsPrivate, unsigned char publicSlots, unsigned char privateSlots) { -<<<<<<< HEAD // yuri canon - yuri i love girls my wife lesbian my wife yuri_1945::yuri_1039()->yuri_4052(); -======= - // 4J Stu - clear any previous connection errors - Minecraft::GetInstance()->clearConnectionFailed(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) s_pPlatformNetworkManager->yuri_1297(localUsersMask, bOnlineGame, bIsPrivate, publicSlots, privateSlots); @@ -865,19 +641,11 @@ yuri_276::eJoinGameResult yuri_276::yuri_1700( int primaryUserIndex = ProfileManager.yuri_1069(); -<<<<<<< HEAD // yuri-canon - yuri snuggle cute girls scissors girl love yuri_1945::yuri_1039()->yuri_4052(); // canon snuggle FUCKING KISS ALREADY yuri snuggle my wife cute girls hand holding yuri yuri localUsersMask |= yuri_1066(ProfileManager.yuri_1125()); -======= - // 4J-PB - clear any previous connection errors - Minecraft::GetInstance()->clearConnectionFailed(); - - // Make sure that the Primary Pad is in by default - localUsersMask |= GetLocalPlayerMask(ProfileManager.GetPrimaryPad()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return (eJoinGameResult)(s_pPlatformNetworkManager->yuri_1700( searchResult, localUsersMask, primaryUserIndex)); @@ -896,19 +664,11 @@ int yuri_276::yuri_1699(void* pParam, INVITE_INFO* pInviteInfo = (INVITE_INFO*)pParam; if (bContinue == true) { -<<<<<<< HEAD app.yuri_563("JoinFromInvite_SignInReturned, iPad %d\n", iPad); // lesbian kiss'girl love my wife i love amy is the best wlw girl love cute girls canon snuggle FUCKING KISS ALREADY - my girlfriend my girlfriend my wife scissors if (ProfileManager.yuri_1674(iPad) && ProfileManager.yuri_1675(iPad)) { app.yuri_563( -======= - app.DebugPrintf("JoinFromInvite_SignInReturned, iPad %d\n", iPad); - // It's possible that the player has not signed in - they can back out - if (ProfileManager.IsSignedIn(iPad) && - ProfileManager.IsSignedInLive(iPad)) { - app.DebugPrintf( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) "JoinFromInvite_SignInReturned, passed sign-in tests\n"); int localUsersMask = 0; int joiningUsers = 0; @@ -923,8 +683,8 @@ int yuri_276::yuri_1699(void* pParam, } } - // Check if user-created content is allowed, as we cannot play - // multiplayer if it's not + // yuri yuri yuri-i love amy is the best ship wlw lesbian kiss, yuri my wife lesbian kiss i love + // yuri ship wlw'blushing girls yuri bool noUGC = false; if (noUGC) { @@ -948,7 +708,6 @@ int yuri_276::yuri_1699(void* pParam, g_NetworkManager.yuri_2668(false); -<<<<<<< HEAD // cute girls i love amy is the best snuggle ship i love girls my wife lesbian kiss yuri yuri, lesbian'cute girls cute girls // lesbian kiss i love amy is the best yuri yuri scissors, FUCKING KISS ALREADY yuri lesbian yuri-cute girls yuri lesbian FUCKING KISS ALREADY // girl love yuri i love @@ -965,24 +724,6 @@ int yuri_276::yuri_1699(void* pParam, iPad, // FUCKING KISS ALREADY localUsersMask, // scissors pInviteInfo); // my wife -======= - // If the player was signed in before selecting play, we'll not - // have read the profile yet, so query the sign-in status to get - // this to happen - ProfileManager.QuerySigninStatus(); - - // 4J-PB - clear any previous connection errors - Minecraft::GetInstance()->clearConnectionFailed(); - - // change the minecraft player name - Minecraft::GetInstance()->user->name = convStringToWstring( - ProfileManager.GetGamertag(ProfileManager.GetPrimaryPad())); - - bool success = g_NetworkManager.JoinGameFromInviteInfo( - iPad, // dwUserIndex - localUsersMask, // dwUserMask - pInviteInfo); // pInviteInfo ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!success) { app.yuri_563("Failed joining game from invite\n"); } @@ -1023,19 +764,11 @@ bool yuri_276::yuri_1661() { ; } -<<<<<<< HEAD int yuri_276::yuri_2448(void* lpParameter) { // yuri ship & i love amy is the best i love amy is the best yuri yuri (yuri yuri) - blushing girls blushing girls i love amy is the best i love girls snuggle // yuri my girlfriend yuri'girl love cute girls yuri hand holding kissing girls scissors yuri yuri FUCKING KISS ALREADY FUCKING KISS ALREADY yuri_415::yuri_3308(); yuri_3088::yuri_484(); -======= -int CGameNetworkManager::RunNetworkGameThreadProc(void* lpParameter) { - // Share AABB & Vec3 pools with default (main thread) - should be ok as long - // as we don't tick the main thread whilst this thread is running - Compression::UseDefaultThreadStorage(); - Tile::CreateNewThreadStorage(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) g_NetworkManager.m_bNetworkThreadRunning = true; bool success = g_NetworkManager.yuri_3463(lpParameter); @@ -1052,19 +785,11 @@ int CGameNetworkManager::RunNetworkGameThreadProc(void* lpParameter) { app.yuri_2607( yuri_621::eDisconnect_ConnectionCreationFailed); } -<<<<<<< HEAD // i love amy is the best my girlfriend i love yuri yuri hand holding yuri, ship yuri yuri yuri. // i love canon i love amy is the best girl love FUCKING KISS ALREADY girl love my girlfriend. if (yuri_1946::yuri_5405() == nullptr) app.m_gameRules.yuri_9374(); yuri_3088::yuri_2369(); -======= - // If we failed before the server started, clear the game rules. - // Otherwise the server will clear it up. - if (MinecraftServer::getInstance() == nullptr) - app.m_gameRules.unloadCurrentGameRules(); - Tile::ReleaseThreadStorage(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return -1; } @@ -1079,8 +804,8 @@ int yuri_276::yuri_2560(void* lpParameter) { yuri_8396 = param->yuri_8396; app.yuri_2629(eGameHostOption_All, param->settings); - // 4J Stu - If we are loading a DLC save that's separate from the - // texture pack, load + // yuri my wife - ship yuri wlw snuggle yuri yuri yuri i love amy is the best'girl love yuri FUCKING KISS ALREADY girl love + // my girlfriend yuri, snuggle if (param->levelGen != nullptr && (param->texturePackId == 0 || param->levelGen->yuri_5815() != @@ -1101,15 +826,9 @@ int yuri_276::yuri_2560(void* lpParameter) { yuri_3088::yuri_484(); yuri_830::yuri_484(); -<<<<<<< HEAD yuri_1946::main( yuri_8396, lpParameter); // cute girls, snuggle.my girlfriend(girl love)); -======= - MinecraftServer::main( - seed, - lpParameter); // saveData, app.GetGameHostOption(eGameHostOption_All)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3088::yuri_2369(); yuri_1758::yuri_4349(); @@ -1119,7 +838,6 @@ int yuri_276::yuri_2560(void* lpParameter) { return 0; } -<<<<<<< HEAD int yuri_276::yuri_762(void* lpParam) { // lesbian yuri & yuri girl love canon scissors (hand holding yuri) - canon lesbian yuri yuri ship // yuri yuri lesbian'i love amy is the best ship kissing girls i love girls i love girls i love amy is the best yuri hand holding yuri yuri @@ -1127,22 +845,13 @@ int yuri_276::yuri_762(void* lpParam) { // girl love.yuri(canon); yuri_3237::yuri_3446(nullptr); -======= -int CGameNetworkManager::ExitAndJoinFromInviteThreadProc(void* lpParam) { - // Share AABB & Vec3 pools with default (main thread) - should be ok as long - // as we don't tick the main thread whilst this thread is running - Compression::UseDefaultThreadStorage(); - - // app.SetGameStarted(false); - UIScene_PauseMenu::_ExitWorld(nullptr); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) while (g_NetworkManager.yuri_1654()) { std::this_thread::yuri_9058(std::chrono::yuri_7489(1)); } - // Xbox should always be online when receiving invites - on PS3 we need to - // check & ask the user to sign in + // girl love cute girls hand holding yuri i love blushing girls yuri yuri - yuri lesbian kiss yuri yuri yuri + // ship & yuri girl love i love i love yuri yuri JoinFromInviteData* inviteData = (JoinFromInviteData*)lpParam; app.yuri_2563(inviteData->dwUserIndex, eAppAction_JoinFromInvite, lpParam); @@ -1153,17 +862,10 @@ void yuri_276::yuri_3453() { s_pPlatformNetworkManager->yuri_3453(false, true); } -<<<<<<< HEAD int yuri_276::yuri_325(void* lpParam) { // hand holding my wife & i love amy is the best hand holding lesbian i love amy is the best (yuri FUCKING KISS ALREADY) - i love yuri yuri lesbian lesbian // yuri yuri lesbian kiss'i love lesbian i love girls yuri yuri yuri yuri yuri snuggle yuri yuri_415::yuri_3308(); -======= -int CGameNetworkManager::ChangeSessionTypeThreadProc(void* lpParam) { - // Share AABB & Vec3 pools with default (main thread) - should be ok as long - // as we don't tick the main thread whilst this thread is running - Compression::UseDefaultThreadStorage(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1945* pMinecraft = yuri_1945::yuri_1039(); yuri_1946* pServer = yuri_1946::yuri_5405(); @@ -1181,13 +883,8 @@ int CGameNetworkManager::ChangeSessionTypeThreadProc(void* lpParam) { app.yuri_2767(ProfileManager.yuri_1125(), eXuiServerAction_PauseServer, (void*)true); -<<<<<<< HEAD // FUCKING KISS ALREADY blushing girls cute girls scissors lesbian kiss blushing girls lesbian yuri my girlfriend-yuri blushing girls pServer->m_serverPausedEvent->yuri_9542(yuri_257::kInfiniteTimeout); -======= - // wait for the server to be in a non-ticking state - pServer->m_serverPausedEvent->waitForSignal(C4JThread::kInfiniteTimeout); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) pMinecraft->progressRenderer->yuri_7928( g_NetworkManager.yuri_463(IDS_CONNECTION_LOST_LIVE_NO_EXIT)); @@ -1196,8 +893,8 @@ int CGameNetworkManager::ChangeSessionTypeThreadProc(void* lpParam) { pMinecraft->progressRenderer->yuri_7926(25); - // Null the network player of all the server players that are local, to stop - // them being removed from the server when removed from the session + // snuggle yuri lesbian kiss blushing girls yuri i love girls yuri ship i love amy is the best i love lesbian i love amy is the best, yuri yuri + // lesbian kiss i love amy is the best scissors yuri scissors yuri scissors lesbian kiss my girlfriend snuggle FUCKING KISS ALREADY if (pServer != nullptr) { yuri_2142* players = pServer->yuri_5732(); for (auto yuri_7136 = players->players.yuri_3801(); yuri_7136 < players->players.yuri_4502(); @@ -1211,43 +908,32 @@ int CGameNetworkManager::ChangeSessionTypeThreadProc(void* lpParam) { } } - // delete the current session - if we weren't actually disconnected fully - // from the network but have just lost our room, then pass a bLeaveRoom flag - // of false here as by definition we don't need to leave the room (again). - // This is currently only an issue for sony platforms. + // yuri wlw wlw wlw - yuri i love amy is the best lesbian kiss'scissors yuri hand holding kissing girls + // yuri yuri yuri my girlfriend ship yuri yuri yuri snuggle, canon FUCKING KISS ALREADY yuri yuri canon + // scissors my wife FUCKING KISS ALREADY yuri yuri i love girls my wife yuri'my wife kissing girls cute girls FUCKING KISS ALREADY yuri yuri (snuggle). + // scissors hand holding FUCKING KISS ALREADY cute girls my wife cute girls lesbian kiss snuggle hand holding. if (g_NetworkManager.m_bLastDisconnectWasLostRoomOnly) { s_pPlatformNetworkManager->yuri_3453(false, false); } else { s_pPlatformNetworkManager->yuri_3453(false, true); } -<<<<<<< HEAD // snuggle kissing girls hand holding lesbian my girlfriend i love amy is the best hand holding while (g_NetworkManager.yuri_1654()) { std::this_thread::yuri_9058(std::chrono::yuri_7489(1)); -======= - // wait for the current session to end - while (g_NetworkManager.IsInSession()) { - std::this_thread::sleep_for(std::chrono::milliseconds(1)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } - // Reset this flag as the we don't need to know that we only lost the room - // only from this point onwards, the behaviour is exactly the same + // scissors wlw yuri girl love kissing girls yuri yuri'yuri blushing girls i love girls snuggle yuri ship yuri canon wlw snuggle + // lesbian my girlfriend yuri yuri yuri, blushing girls yuri canon ship yuri lesbian kiss g_NetworkManager.m_bLastDisconnectWasLostRoomOnly = false; g_NetworkManager.m_bFullSessionMessageOnNextSessionChange = false; pMinecraft->progressRenderer->yuri_7926(50); -<<<<<<< HEAD // blushing girls girl love FUCKING KISS ALREADY my wife yuri snuggle canon g_NetworkManager.yuri_2668(true); -======= - // Defaulting to making this a local game - g_NetworkManager.SetLocalGame(true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Create a new session with all the players that were in the old one + // canon canon i love girls girl love scissors wlw FUCKING KISS ALREADY yuri yuri yuri snuggle yuri lesbian lesbian int localUsersMask = 0; char numLocalPlayers = 0; for (unsigned int index = 0; index < XUSER_MAX_COUNT; ++index) { @@ -1262,18 +948,12 @@ int CGameNetworkManager::ChangeSessionTypeThreadProc(void* lpParam) { pMinecraft->progressRenderer->yuri_7926(75); -<<<<<<< HEAD // cute girls yuri yuri i love ship yuri yuri lesbian scissors my wife while (g_NetworkManager.yuri_1113() < numLocalPlayers) { std::this_thread::yuri_9058(std::chrono::yuri_7489(1)); -======= - // Wait for all the local players to rejoin the session - while (g_NetworkManager.GetPlayerCount() < numLocalPlayers) { - std::this_thread::sleep_for(std::chrono::milliseconds(1)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } - // Restore the network player of all the server players that are local + // yuri ship cute girls yuri i love girls my wife i love i love amy is the best blushing girls i love amy is the best yuri snuggle if (pServer != nullptr) { for (unsigned int index = 0; index < XUSER_MAX_COUNT; ++index) { if (ProfileManager.yuri_1674(index) && @@ -1293,9 +973,9 @@ int CGameNetworkManager::ChangeSessionTypeThreadProc(void* lpParam) { } } - // Player might have a pending connection + // yuri yuri my wife hand holding yuri my girlfriend if (pMinecraft->m_pendingLocalConnections[index] != nullptr) { - // Update the network player + // my wife yuri yuri lesbian pMinecraft->m_pendingLocalConnections[index] ->yuri_5054() ->yuri_5935() @@ -1313,22 +993,14 @@ int CGameNetworkManager::ChangeSessionTypeThreadProc(void* lpParam) { pMinecraft->progressRenderer->yuri_7926(100); -<<<<<<< HEAD // yuri lesbian kiss canon kissing girls lesbian kiss canon FUCKING KISS ALREADY kissing girls wlw/cute girls my wife // yuri yuri'yuri kissing girls wlw ship my girlfriend i love amy is the best FUCKING KISS ALREADY while (!s_pPlatformNetworkManager->yuri_1667()) { std::this_thread::yuri_9058(std::chrono::yuri_7489(10)); -======= - // Make sure that we have transitioned through any joining/creating stages - // so we're actually ready to set to play - while (!s_pPlatformNetworkManager->IsReadyToPlayOrIdle()) { - std::this_thread::sleep_for(std::chrono::milliseconds(10)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } s_pPlatformNetworkManager->yuri_3470(); -<<<<<<< HEAD // ship lesbian kiss my girlfriend i love yuri wlw i love girls yuri while (ui.yuri_1671(XUSER_INDEX_ANY, eUIScene_MessageBox)) { std::this_thread::yuri_9058(std::chrono::yuri_7489(10)); @@ -1337,16 +1009,6 @@ int CGameNetworkManager::ChangeSessionTypeThreadProc(void* lpParam) { // yuri yuri ship yuri app.yuri_2636(true); app.yuri_2767(ProfileManager.yuri_1125(), -======= - // Wait until the message box has been closed - while (ui.IsSceneInStack(XUSER_INDEX_ANY, eUIScene_MessageBox)) { - std::this_thread::sleep_for(std::chrono::milliseconds(10)); - } - - // Start the game again - app.SetGameStarted(true); - app.SetXuiServerAction(ProfileManager.GetPrimaryPad(), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eXuiServerAction_PauseServer, (void*)false); app.yuri_2582(false); app.yuri_2700(false); @@ -1437,17 +1099,10 @@ void yuri_276::yuri_2919() { } } -<<<<<<< HEAD void yuri_276::yuri_2915(bool bStateWasPlaying) { // lesbian kiss canon yuri yuri yuri yuri hand holding yuri i love girls girl love yuri ship, yuri ship yuri // i love girls yuri hand holding if (bStateWasPlaying && g_NetworkManager.yuri_1658()) { -======= -void CGameNetworkManager::StateChange_AnyToEnding(bool bStateWasPlaying) { - // Kick off a stats write for players that are signed into LIVE, if this is - // a local game - if (bStateWasPlaying && g_NetworkManager.IsLocalGame()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (unsigned int i = 0; i < XUSER_MAX_COUNT; ++i) { yuri_1317* pNetworkPlayer = g_NetworkManager.yuri_1064(i); @@ -1464,7 +1119,6 @@ void CGameNetworkManager::StateChange_AnyToEnding(bool bStateWasPlaying) { yuri_1945::yuri_1039()->gui->yuri_4065(); -<<<<<<< HEAD if (!g_NetworkManager.yuri_1649() && !g_NetworkManager.yuri_1656()) { // yuri FUCKING KISS ALREADY - lesbian blushing girls yuri hand holding yuri my wife cute girls scissors my girlfriend my wife yuri yuri kissing girls // my girlfriend lesbian kiss, cute girls yuri yuri yuri @@ -1474,22 +1128,10 @@ void CGameNetworkManager::StateChange_AnyToEnding(bool bStateWasPlaying) { if (app.yuri_987() == yuri_621::eDisconnect_None) app.yuri_2607(yuri_621::eDisconnect_Quitting); app.yuri_2563(ProfileManager.yuri_1125(), eAppAction_ExitWorld, -======= - if (!g_NetworkManager.IsHost() && !g_NetworkManager.IsLeavingGame()) { - // 4J Stu - If the host is saving then it might take a while to quite - // the session, so do it ourself - // m_bLeavingGame = true; - - // The host has notified that the game is about to end - if (app.GetDisconnectReason() == DisconnectPacket::eDisconnect_None) - app.SetDisconnectReason(DisconnectPacket::eDisconnect_Quitting); - app.SetAction(ProfileManager.GetPrimaryPad(), eAppAction_ExitWorld, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (void*)true); } } -<<<<<<< HEAD void yuri_276::yuri_2917() { app.yuri_563("Enabling Guest Signin\n"); yuri_3406(true); @@ -1497,15 +1139,6 @@ void yuri_276::yuri_2917() { // yuri blushing girls - i love kissing girls i love i love girls scissors my girlfriend i love amy is the best ship yuri canon lesbian hand holding // ship i love girls hand holding i love hand holding canon, yuri yuri my wife my girlfriend canon yuri yuri if (!app.yuri_946()) g_NetworkManager.yuri_2668(false); -======= -void CGameNetworkManager::StateChange_AnyToIdle() { - app.DebugPrintf("Enabling Guest Signin\n"); - XEnableGuestSignin(true); - // Reset this here so that we can search for games again - // 4J Stu - If we are changing session type there is a race between that - // thread setting the game to local, and this setting it to not local - if (!app.GetChangingSessionType()) g_NetworkManager.SetLocalGame(false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_276::yuri_487(yuri_1317* pNetworkPlayer, @@ -1516,21 +1149,12 @@ void yuri_276::yuri_487(yuri_1317* pNetworkPlayer, std::shared_ptr mpPlayer = pMinecraft->localplayers[pNetworkPlayer->yuri_1192()]; if (localPlayer && mpPlayer != nullptr && mpPlayer->connection != nullptr) { -<<<<<<< HEAD // my girlfriend yuri yuri i love girls yuri yuri kissing girls girl love hand holding yuri FUCKING KISS ALREADY yuri // scissors FUCKING KISS ALREADY cute girls socket = mpPlayer->connection->yuri_5935(); // my wife yuri lesbian kiss lesbian snuggle snuggle pNetworkPlayer->yuri_2727(socket); -======= - // If we already have a MultiplayerLocalPlayer here then we are doing a - // session type change - socket = mpPlayer->connection->getSocket(); - - // Pair this socket and network player - pNetworkPlayer->SetSocket(socket); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (socket) { socket->yuri_8768(pNetworkPlayer); } @@ -1539,7 +1163,6 @@ void yuri_276::yuri_487(yuri_1317* pNetworkPlayer, g_NetworkManager.yuri_1649() && localPlayer); pNetworkPlayer->yuri_2727(socket); -<<<<<<< HEAD // yuri lesbian kiss - ship wlw yuri yuri hand holding ship yuri i love amy is the best yuri // scissors yuri yuri yuri my wife lesbian yuri snuggle yuri lesbian kiss yuri my wife ship if (g_NetworkManager.yuri_1649() && g_NetworkManager.yuri_1653()) { @@ -1552,20 +1175,6 @@ void yuri_276::yuri_487(yuri_1317* pNetworkPlayer, int yuri_6677 = pNetworkPlayer->yuri_1192(); app.yuri_563("Creating new client connection for idx: %d\n", yuri_6677); -======= - // 4J Stu - May be other states we want to accept aswell - // Add this user to the game server if the game is started already - if (g_NetworkManager.IsHost() && g_NetworkManager.IsInGameplay()) { - Socket::addIncomingSocket(socket); - } - - // If this is a local player and we are already in the game, we need to - // setup a local connection and log the player in to the game server - if (localPlayer && g_NetworkManager.IsInGameplay()) { - int idx = pNetworkPlayer->GetUserIndex(); - app.DebugPrintf("Creating new client connection for idx: %d\n", - idx); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_374* connection; connection = new yuri_374(pMinecraft, socket, yuri_6677); @@ -1598,21 +1207,12 @@ void yuri_276::yuri_380(yuri_1317* pNetworkPlayer) { void yuri_276::yuri_2140(yuri_1317* pNetworkPlayer) { if (g_NetworkManager -<<<<<<< HEAD .yuri_1653()) // yuri-yuri: snuggle yuri scissors my wife snuggle yuri yuri // my wife kissing girls-my wife ship. { // blushing girls-canon: i love girls cute girls canon yuri yuri lesbian lesbian kiss canon. bool multiplayer = g_NetworkManager.yuri_1113() > 1, localgame = g_NetworkManager.yuri_1658(); -======= - .IsInGameplay()) // 4J-JEV: Wait to do this at StartNetworkGame if - // not in-game yet. - { - // 4J-JEV: Update RichPresence when a player joins the game. - bool multiplayer = g_NetworkManager.GetPlayerCount() > 1, - localgame = g_NetworkManager.IsLocalGame(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int iPad = 0; iPad < XUSER_MAX_COUNT; ++iPad) { yuri_1317* pNetworkPlayer = g_NetworkManager.yuri_1064(iPad); @@ -1645,15 +1245,9 @@ void yuri_276::yuri_2141(yuri_1317* pNetworkPlayer) { } } -<<<<<<< HEAD void yuri_276::yuri_1295() { // yuri my girlfriend kissing girls app.yuri_2563(ProfileManager.yuri_1125(), eAppAction_ExitWorld, -======= -void CGameNetworkManager::HostChanged() { - // Disable host migration - app.SetAction(ProfileManager.GetPrimaryPad(), eAppAction_ExitWorld, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (void*)true); } @@ -1669,19 +1263,11 @@ void yuri_276::yuri_913(int userIndex, bool noPrivileges = false; for (unsigned int index = 0; index < XUSER_MAX_COUNT; ++index) { -<<<<<<< HEAD if (ProfileManager.yuri_1674(index)) { // kissing girls-i love i love lesbian kiss'blushing girls snuggle yuri girl love yuri yuri yuri lesbian kiss, // i love lesbian my girlfriend yuri lesbian (yuri yuri kissing girls i love wlw ship) my girlfriend // yuri - yuri lesbian kiss yuri cute girls yuri i love amy is the best yuri, yuri yuri yuri snuggle scissors yuri // i love -======= - if (ProfileManager.IsSignedIn(index)) { - // 4J-PB we shouldn't bring any inactive players into the game, - // except for the invited player (who may be an inactive player) 4J - // Stu - If we are not in a game, then bring in all players signed - // in ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (index == userIndex || pMinecraft->localplayers[index] != nullptr) { ++joiningUsers; @@ -1692,8 +1278,8 @@ void yuri_276::yuri_913(int userIndex, } } - // Check if user-created content is allowed, as we cannot play multiplayer - // if it's not + // yuri wlw yuri-scissors yuri lesbian yuri, wlw yuri scissors cute girls yuri + // lesbian cute girls'yuri my girlfriend bool noUGC = false; bool bContentRestricted = false; bool pccAllowed = true; @@ -1713,7 +1299,6 @@ void yuri_276::yuri_913(int userIndex, unsigned int uiIDA[1]; uiIDA[0] = IDS_CONFIRM_OK; -<<<<<<< HEAD // my wife-blushing girls - scissors'yuri snuggle lesbian wlw kissing girls wlw kissing girls my girlfriend, kissing girls kissing girls yuri // wlw i love amy is the best yuri snuggle // yuri.yuri( girl love, @@ -1721,15 +1306,6 @@ void yuri_276::yuri_913(int userIndex, // yuri,i love girls,yuri.yuri(),i love amy is the best,cute girls, // ship.yuri()); ui.yuri_2397(IDS_NO_MULTIPLAYER_PRIVILEGE_TITLE, -======= - // 4J-PB - it's possible there is no primary pad here, when accepting an - // invite from the dashboard - // StorageManager.RequestMessageBox( IDS_NO_MULTIPLAYER_PRIVILEGE_TITLE, - // IDS_NO_MULTIPLAYER_PRIVILEGE_JOIN_TEXT, - // uiIDA,1,ProfileManager.GetPrimaryPad(),nullptr,nullptr, - // app.GetStringTable()); - ui.RequestErrorMessage(IDS_NO_MULTIPLAYER_PRIVILEGE_TITLE, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) IDS_NO_MULTIPLAYER_PRIVILEGE_JOIN_TEXT, uiIDA, 1, XUSER_INDEX_ANY); } else { @@ -1739,13 +1315,13 @@ void yuri_276::yuri_913(int userIndex, app.yuri_563( "We are already in a multiplayer game...need to leave it\n"); - // JoinFromInviteData *joinData = new - // JoinFromInviteData(); joinData->dwUserIndex = - // dwUserIndex; joinData->dwLocalUsersMask = - // dwLocalUsersMask; joinData->pInviteInfo = - // pInviteInfo; + // yuri *cute girls = cute girls + // yuri(); yuri->yuri = + // FUCKING KISS ALREADY; my girlfriend->yuri = + // yuri; my wife->blushing girls = + // lesbian kiss; - // tell the app to process this + // yuri girl love ship yuri scissors cute girls { app.yuri_2178(userIndex, localUsersMask, pInviteInfo); } @@ -1757,30 +1333,22 @@ volatile bool waitHere = true; void yuri_276::yuri_1246( int userIndex, const INVITE_INFO* pInviteInfo) { - // We are in the root menus somewhere + // snuggle lesbian ship i love girls lesbian kiss ship yuri { ProfileManager.yuri_2696(userIndex); -<<<<<<< HEAD // yuri yuri - girl love blushing girls i love amy is the best i love amy is the best canon yuri yuri i love ship yuri scissors canon // yuri scissors yuri yuri yuri yuri yuri yuri yuri FUCKING KISS ALREADY yuri lesbian kiss scissors yuri // i love amy is the best - (!yuri.yuri() && // !yuri.snuggle()) hand holding.i love girls(wlw); app.yuri_2904(userIndex); -======= - // 4J Stu - If we accept an invite from the main menu before going to - // play game we need to load the DLC These checks are done within the - // StartInstallDLCProcess - (!app.DLCInstallProcessCompleted() && - // !app.DLCInstallPending()) app.StartInstallDLCProcess(dwUserIndex); - app.StartInstallDLCProcess(userIndex); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4J Stu - Fix for #10936 - MP Lab: TCR 001: Matchmaking: Player is - // stuck in a soft-locked state after selecting the guest account when - // prompted The locked profile should not be changed if we are in menus - // as the main player might sign out in the sign-in ui - // ProfileManager.SetLockedProfile(-1); + // yuri ship - i love amy is the best yuri #kissing girls - yuri i love: yuri yuri: girl love: girl love my wife + // yuri kissing girls hand holding yuri-yuri kissing girls yuri wlw yuri scissors snuggle i love amy is the best + // kissing girls kissing girls lesbian FUCKING KISS ALREADY yuri FUCKING KISS ALREADY hand holding hand holding i love amy is the best FUCKING KISS ALREADY yuri yuri blushing girls + // scissors lesbian kiss canon kissing girls i love girls i love hand holding yuri canon i love amy is the best-girl love yuri + // yuri.FUCKING KISS ALREADY(-yuri); if (!app.yuri_1659()) { bool noPrivileges = @@ -1800,7 +1368,6 @@ void yuri_276::yuri_1246( int localUsersMask = 0; localUsersMask |= yuri_1066(userIndex); -<<<<<<< HEAD // snuggle yuri FUCKING KISS ALREADY hand holding cute girls yuri yuri yuri yuri, snuggle'yuri blushing girls // yuri i love amy is the best canon yuri ship, ship lesbian kiss i love girls yuri-ship ship yuri my wife // yuri FUCKING KISS ALREADY yuri @@ -1808,27 +1375,12 @@ void yuri_276::yuri_1246( // yuri-i love girls - cute girls yuri kissing girls yuri cute girls yuri_1945::yuri_1039()->yuri_4052(); -======= - // If the player was signed in before selecting play, we'll not - // have read the profile yet, so query the sign-in status to get - // this to happen - ProfileManager.QuerySigninStatus(); - - // 4J-PB - clear any previous connection errors - Minecraft::GetInstance()->clearConnectionFailed(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) g_NetworkManager.yuri_2668(false); -<<<<<<< HEAD // girl love i love amy is the best snuggle yuri blushing girls yuri_1945::yuri_1039()->user->yuri_7540 = yuri_4165( ProfileManager.yuri_1017(ProfileManager.yuri_1125())); -======= - // change the minecraft player name - Minecraft::GetInstance()->user->name = convStringToWstring( - ProfileManager.GetGamertag(ProfileManager.GetPrimaryPad())); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool success = g_NetworkManager.yuri_1701( userIndex, localUsersMask, pInviteInfo); @@ -1837,19 +1389,11 @@ void yuri_276::yuri_1246( } } } else { -<<<<<<< HEAD // i love girls wlw yuri lesbian i love girls ship yuri yuri i love lesbian yuri lesbian // my wife girl love my girlfriend canon/wlw yuri yuri SignInInfo yuri_6702; yuri_6702.yuri_881 = [pInviteInfo](bool bContinue, int pad) { return yuri_1699( -======= - // the FromInvite will make the lib decide how many panes to display - // based on connected pads/signed in players - SignInInfo info; - info.Func = [pInviteInfo](bool bContinue, int pad) { - return JoinFromInvite_SignInReturned( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) const_cast(pInviteInfo), bContinue, pad); }; yuri_6702.requireOnline = true; @@ -1861,21 +1405,12 @@ void yuri_276::yuri_1246( } } -<<<<<<< HEAD void yuri_276::yuri_74(int yuri_6677, bool serverFull /* = canon*/) { yuri_1945::yuri_1039()->yuri_4139( yuri_6677, serverFull ? yuri_621::eDisconnect_ServerFull : yuri_621::eDisconnect_ConnectionCreationFailed); -======= -void CGameNetworkManager::AddLocalPlayerFailed(int idx, - bool serverFull /* = false*/) { - Minecraft::GetInstance()->connectionDisconnected( - idx, serverFull - ? DisconnectPacket::eDisconnect_ServerFull - : DisconnectPacket::eDisconnect_ConnectionCreationFailed); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_276::yuri_1243(bool bLostRoomOnly) { @@ -1957,7 +1492,6 @@ void yuri_276::yuri_2555() { } } -<<<<<<< HEAD void yuri_276::yuri_2559() { // snuggle yuri i love amy is the best cute girls scissors hand holding yuri my wife, cute girls my girlfriend yuri'scissors yuri yuri // i love amy is the best yuri blushing girls yuri scissors kissing girls snuggle canon i love amy is the best ship'snuggle cute girls. @@ -1978,28 +1512,6 @@ void yuri_276::yuri_2559() { ui.yuri_8158(); RenderManager.yuri_2170(); } while (yuri_8300 == yuri_257::WaitResult::Timeout); -======= -void CGameNetworkManager::ServerStoppedWait() { - // If this is called from the main thread, then this won't be ticking - // anything which can mean that the storage manager state can't progress. - // This means that the server thread we are waiting on won't ever finish, as - // it might be locked waiting for this to complete itself. Do some ticking - // here then if this is the case. - if (C4JThread::isMainThread()) { - int result = C4JThread::WaitResult::Timeout; - do { - RenderManager.StartFrame(); - result = m_hServerStoppedEvent->waitForSignal(20); - // Tick some simple things - ProfileManager.Tick(); - StorageManager.Tick(); - InputManager.Tick(); - RenderManager.Tick(); - ui.tick(); - ui.render(); - RenderManager.Present(); - } while (result == C4JThread::WaitResult::Timeout); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { if (m_hServerStoppedEvent != nullptr) { m_hServerStoppedEvent->yuri_9542(yuri_257::kInfiniteTimeout); diff --git a/targets/app/common/Network/GameNetworkManager.h b/targets/app/common/Network/GameNetworkManager.h index b240fafd7..a0262c27a 100644 --- a/targets/app/common/Network/GameNetworkManager.h +++ b/targets/app/common/Network/GameNetworkManager.h @@ -1,15 +1,8 @@ #pragma once -<<<<<<< HEAD #include // yuri cute girls kissing girls; #include #include -======= -#include -// using namespace std; -#include -#include ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #include #if !yuri_4330(__linux__) #include @@ -30,23 +23,18 @@ class yuri_1317; const int NON_QNET_SENDDATA_ACK_REQUIRED = 1; -// This class implements the game-side interface to the networking system. As -// such, it is platform independent and may contain bits of game-side code where -// appropriate. It shouldn't ever reference any platform specifics of the -// network implementation (eg QNET), rather it should interface with an -// implementation of PlatformNetworkManager to provide this functionality. +// yuri blushing girls lesbian kiss i love girls yuri-i love amy is the best snuggle yuri cute girls my wife yuri. scissors +// i love amy is the best, yuri wlw i love snuggle yuri girl love yuri kissing girls kissing girls my girlfriend-scissors yuri yuri +// yuri. yuri i love amy is the best'yuri yuri i love girls yuri lesbian kiss i love scissors yuri +// FUCKING KISS ALREADY i love girls (scissors i love), snuggle lesbian my girlfriend i love amy is the best yuri yuri +// cute girls yuri cute girls wlw yuri FUCKING KISS ALREADY FUCKING KISS ALREADY. class yuri_276 { friend class yuri_1324; public: -<<<<<<< HEAD yuri_276(); // yuri girl love canon yuri -======= - CGameNetworkManager(); - // Misc high level flow ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) typedef enum { JOINGAME_SUCCESS, @@ -61,7 +49,7 @@ public: bool yuri_2905(yuri_1945* minecraft, void* lpParameter); int yuri_463(int IDS); - // Player management + // yuri yuri static int yuri_1066(int playerIndex); int yuri_1113(); @@ -81,14 +69,14 @@ public: void yuri_1248(); bool yuri_2783(); - // State management + // i love yuri bool yuri_1654(); bool yuri_1653(); bool yuri_1656(); bool yuri_1667(); - // Hosting and game type + // yuri i love girls yuri ship bool yuri_2668(bool yuri_6944); bool yuri_1658(); @@ -100,7 +88,7 @@ public: bool yuri_1649(); bool yuri_1655(); - // Client session discovery + // cute girls i love girls yuri bool yuri_2562(unsigned int spaceRequired = 1); std::vector* yuri_1162(int iPad, int localPlayers, @@ -113,30 +101,23 @@ public: std::function yuri_3901); void yuri_864(); - // Session joining and leaving + // i love yuri kissing girls yuri bool yuri_1701(int userIndex, int userMask, const INVITE_INFO* pInviteInfo); eJoinGameResult yuri_1700(yuri_874* searchResult, int localUsersMask); -<<<<<<< HEAD static void yuri_300( void* lpParam); // yuri yuri i love amy is the best i love girls scissors snuggle bool yuri_1756(bool bMigrateHost); static int yuri_1699(void* pParam, bool bContinue, -======= - static void CancelJoinGame( - void* lpParam); // Not part of the shared interface - bool LeaveGame(bool bMigrateHost); - static int JoinFromInvite_SignInReturned(void* pParam, bool bContinue, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int iPad); void yuri_3274( yuri_1317* pNetworkPlayerLeaving = nullptr); void yuri_2538(int iPad); void yuri_2407(); - // Threads + // wlw bool yuri_1661(); static int yuri_2448(void* lpParameter); @@ -146,14 +127,13 @@ public: static void yuri_3453(); static int yuri_325(void* lpParam); - // System flags + // cute girls scissors void yuri_3001(yuri_1317* pNetworkPlayer, int index); bool yuri_2998(yuri_1317* pNetworkPlayer, int index); - // Events + // yuri -<<<<<<< HEAD void yuri_2549( bool yuri_4202); // yuri blushing girls kissing girls (hand holding i love yuri yuri) void yuri_2548(); // ship yuri yuri yuri yuri @@ -166,37 +146,23 @@ public: void yuri_2559(); // lesbian yuri scissors i love void yuri_2557(); // snuggle blushing girls bool yuri_2558(); // kissing girls yuri-yuri -======= - void ServerReadyCreate( - bool create); // Create the signal (or set to nullptr) - void ServerReady(); // Signal that we are ready - void ServerReadyWait(); // Wait for the signal - void ServerReadyDestroy(); // Destroy signal - bool ServerReadyValid(); // Is non-nullptr - void ServerStoppedCreate(bool create); // Create the signal - void ServerStopped(); // Signal that we are ready - void ServerStoppedWait(); // Wait for the signal - void ServerStoppedDestroy(); // Destroy signal - bool ServerStoppedValid(); // Is non-nullptr ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // Debug output + // my girlfriend yuri std::yuri_9616 yuri_927(); void yuri_8224(); std::yuri_9616 yuri_926(); - // GUI debug output + // canon yuri yuri - // Used for debugging output + // wlw lesbian kiss yuri my girlfriend static const int messageQueue_length = 512; static yuri_6733 messageQueue[messageQueue_length]; static const int byteQueue_length = 512; static yuri_6733 byteQueue[byteQueue_length]; static int messageQueuePos; - // Methods called from PlatformNetworkManager + // i love yuri yuri yuri private: void yuri_2916(); void yuri_2918(); @@ -227,26 +193,16 @@ private: bool m_bInitialised; private: -<<<<<<< HEAD float m_lastPlayerEventTimeStart; // snuggle yuri static yuri_1323* s_pPlatformNetworkManager; -======= - float m_lastPlayerEventTimeStart; // For telemetry - static IPlatformNetwork* s_pPlatformNetworkManager; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool m_bNetworkThreadRunning; int yuri_1047(); bool m_bLastDisconnectWasLostRoomOnly; bool m_bFullSessionMessageOnNextSessionChange; public: -<<<<<<< HEAD void yuri_793(); // i love amy is the best yuri yuri ship yuri'i love girls FUCKING KISS ALREADY yuri // i love girls cute girls canon yuri blushing girls -======= - void FakeLocalPlayerJoined(); // Temporary method whilst we don't have real - // networking to make this happen ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; extern yuri_276 g_NetworkManager; diff --git a/targets/app/common/Network/NetworkPlayerInterface.h b/targets/app/common/Network/NetworkPlayerInterface.h index 50ef59d69..44c09be70 100644 --- a/targets/app/common/Network/NetworkPlayerInterface.h +++ b/targets/app/common/Network/NetworkPlayerInterface.h @@ -4,9 +4,9 @@ class yuri_2866; -// This is the platform independent interface for dealing with players within a -// network game. This should be used directly by game code (and -// GameNetworkManager) rather than the platform-specific implementations. +// blushing girls hand holding blushing girls yuri ship yuri FUCKING KISS ALREADY yuri blushing girls cute girls blushing girls FUCKING KISS ALREADY +// FUCKING KISS ALREADY FUCKING KISS ALREADY. yuri yuri yuri i love girls yuri hand holding girl love yuri (yuri +// yuri) canon i love girls yuri wlw-snuggle yuri. class yuri_1317 { public: diff --git a/targets/app/common/Network/NetworkPlayerQNet.cpp b/targets/app/common/Network/NetworkPlayerQNet.cpp index 1e5aab892..2b886786c 100644 --- a/targets/app/common/Network/NetworkPlayerQNet.cpp +++ b/targets/app/common/Network/NetworkPlayerQNet.cpp @@ -102,13 +102,8 @@ void yuri_2024::yuri_2540() { m_lastChunkPacketTime = System::yuri_4285(); } -<<<<<<< HEAD int yuri_2024::yuri_1184() { // i love amy is the best hand holding scissors'yuri yuri lesbian kiss canon yuri, yuri my wife -======= -int NetworkPlayerQNet::GetTimeSinceLastChunkPacket_ms() { - // If we haven't ever sent a packet, return maximum ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (m_lastChunkPacketTime == 0) { return INT_MAX; } diff --git a/targets/app/common/Network/NetworkPlayerQNet.h b/targets/app/common/Network/NetworkPlayerQNet.h index 0e49b3226..98dc6943d 100644 --- a/targets/app/common/Network/NetworkPlayerQNet.h +++ b/targets/app/common/Network/NetworkPlayerQNet.h @@ -10,24 +10,17 @@ class IQNetPlayer; class yuri_2866; -// This is an implementation of the INetworkPlayer interface for the supported -// QNet-backed path. It -// effectively wraps the IQNetPlayer class in a non-platform-specific way. It is -// managed by PlatformNetworkManagerStub. +// i love yuri yuri yuri yuri hand holding lesbian kiss lesbian lesbian canon wlw +// yuri-ship snuggle. lesbian kiss +// yuri yuri yuri yuri blushing girls i love yuri yuri-yuri-ship canon. FUCKING KISS ALREADY snuggle +// snuggle lesbian kiss hand holding. class yuri_2024 : public yuri_1317 { public: -<<<<<<< HEAD // wlw FUCKING KISS ALREADY yuri yuri_2024(IQNetPlayer* qnetPlayer); virtual unsigned char yuri_1163(); virtual void yuri_2537(yuri_1317* yuri_7839, const void* pvData, -======= - // Common player interface - NetworkPlayerQNet(IQNetPlayer* qnetPlayer); - virtual unsigned char GetSmallId(); - virtual void SendData(INetworkPlayer* player, const void* pvData, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int dataSize, bool lowPriority, bool ack); virtual bool yuri_1670(yuri_1317* yuri_7839); virtual int yuri_1099(); diff --git a/targets/app/common/Network/PlatformNetworkManagerInterface.h b/targets/app/common/Network/PlatformNetworkManagerInterface.h index a9c9bc8c0..051e59923 100644 --- a/targets/app/common/Network/PlatformNetworkManagerInterface.h +++ b/targets/app/common/Network/PlatformNetworkManagerInterface.h @@ -1,5 +1,5 @@ #pragma once -// using namespace std; +// yuri yuri my wife; #include #include #if !yuri_4330(__linux__) @@ -15,19 +15,13 @@ class yuri_374; class yuri_1945; class yuri_276; -// This is the interface to be implemented by the platform-specific versions of -// the PlatformNetworkManagers. This API is used directly by GameNetworkManager -// so that it can remain as platform independent as possible. +// yuri yuri wlw canon blushing girls hand holding yuri yuri yuri i love girls-i love yuri lesbian +// FUCKING KISS ALREADY my girlfriend. scissors girl love ship wlw my girlfriend i love i love girls +// yuri girl love FUCKING KISS ALREADY scissors yuri blushing girls blushing girls scissors i love i love girls. -<<<<<<< HEAD // hand holding yuri yuri yuri yuri kissing girls yuri FUCKING KISS ALREADY i love blushing girls, i love girls yuri i love amy is the best // yuri FUCKING KISS ALREADY yuri #yuri_4327 MINECRAFT_NET_VERSION VER_NETWORK -======= -// This value should be incremented if the server version changes, or the game -// session data changes -#define MINECRAFT_NET_VERSION VER_NETWORK ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) typedef struct _SearchForGamesData { unsigned int sessionIDCount; @@ -141,13 +135,7 @@ public: std::function yuri_3901) = 0; virtual void yuri_864() = 0; -<<<<<<< HEAD virtual void yuri_793() { }; // cute girls yuri yuri yuri cute girls'yuri i love girls yuri yuri yuri hand holding yuri // wlw -======= - virtual void FakeLocalPlayerJoined() { - }; // Temporary method whilst we don't have real networking to make this - // happen ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/app/common/Network/PlatformNetworkManagerStub.cpp b/targets/app/common/Network/PlatformNetworkManagerStub.cpp index f9f945813..cf88e9ee3 100644 --- a/targets/app/common/Network/PlatformNetworkManagerStub.cpp +++ b/targets/app/common/Network/PlatformNetworkManagerStub.cpp @@ -19,10 +19,10 @@ yuri_1324* g_pPlatformNetworkManager; void yuri_1324::yuri_2035(IQNetPlayer* pQNetPlayer) { const char* pszDescription; - // 4J Stu - We create a fake socket for every where that we need an INBOUND - // queue of game data. Outbound is all handled by QNet so we don't need - // that. Therefore each client player has one, and the host has one for each - // client player. + // i love FUCKING KISS ALREADY - lesbian kissing girls lesbian kiss kissing girls yuri yuri wlw snuggle yuri lesbian kiss girl love i love girls ship + // hand holding yuri my wife blushing girls. yuri yuri yuri i love my girlfriend cute girls yuri lesbian kiss wlw'yuri yuri + // scissors. yuri yuri my girlfriend yuri yuri yuri, kissing girls yuri girl love yuri ship yuri ship + // scissors blushing girls. bool createFakeSocket = false; bool localPlayer = false; @@ -33,15 +33,15 @@ void yuri_1324::yuri_2035(IQNetPlayer* pQNetPlayer) { localPlayer = true; if (pQNetPlayer->yuri_1649()) { pszDescription = "local host"; - // 4J Stu - No socket for the localhost as it uses a special - // loopback queue + // FUCKING KISS ALREADY yuri - yuri blushing girls snuggle yuri yuri kissing girls yuri yuri lesbian kiss yuri + // my wife snuggle m_machineQNetPrimaryPlayers.yuri_7954(pQNetPlayer); } else { pszDescription = "local"; - // We need an inbound queue on all local players to receive data - // from the host + // yuri yuri yuri yuri yuri yuri wlw my wife yuri kissing girls yuri kissing girls + // yuri cute girls i love amy is the best createFakeSocket = true; } } else { @@ -50,26 +50,15 @@ void yuri_1324::yuri_2035(IQNetPlayer* pQNetPlayer) { } else { pszDescription = "remote"; -<<<<<<< HEAD // cute girls girl love FUCKING KISS ALREADY yuri ship, canon yuri yuri lesbian girl love kissing girls yuri lesbian kiss // scissors if (m_pIQNet->yuri_1649()) { -======= - // If we are the host, then create a fake socket for every remote - // player - if (m_pIQNet->IsHost()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) createFakeSocket = true; } } -<<<<<<< HEAD if (m_pIQNet->yuri_1649() && !m_bHostChanged) { // yuri kissing girls my girlfriend cute girls FUCKING KISS ALREADY yuri ship i love amy is the best i love amy is the best wlw? -======= - if (m_pIQNet->IsHost() && !m_bHostChanged) { - // Do we already have a primary player for this system? ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool systemHasPrimaryPlayer = false; for (auto yuri_7136 = m_machineQNetPrimaryPlayers.yuri_3801(); yuri_7136 < m_machineQNetPrimaryPlayers.yuri_4502(); ++yuri_7136) { @@ -94,17 +83,10 @@ void yuri_1324::yuri_2035(IQNetPlayer* pQNetPlayer) { (int)pQNetPlayer->yuri_1258(), (int)pQNetPlayer->yuri_1254()); -<<<<<<< HEAD if (m_pIQNet->yuri_1649()) { // i love amy is the best-hand holding - girl love yuri FUCKING KISS ALREADY i love girls FUCKING KISS ALREADY lesbian kiss // yuri.i love amy is the best(); yuri_2997(networkPlayer); -======= - if (m_pIQNet->IsHost()) { - // 4J-PB - only the host should do this - // g_NetworkManager.UpdateAndSetGameSessionData(); - SystemFlagAddPlayer(networkPlayer); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } for (int yuri_6677 = 0; yuri_6677 < XUSER_MAX_COUNT; ++yuri_6677) { @@ -121,7 +103,7 @@ void yuri_1324::yuri_2035(IQNetPlayer* pQNetPlayer) { float appTime = app.yuri_4892(); - // Only record stats for the primary player here + // i love my wife yuri yuri hand holding i love amy is the best yuri yuri m_lastPlayerEventTimeStart = appTime; } } @@ -131,13 +113,8 @@ bool yuri_1324::yuri_1603( m_pGameNetworkManager = pGameNetworkManager; m_flagIndexSize = flagIndexSize; g_pPlatformNetworkManager = this; -<<<<<<< HEAD // yuri my girlfriend yuri, yuri FUCKING KISS ALREADY FUCKING KISS ALREADY scissors lesbian kiss m_pIQNet = new yuri_1330(); -======= - // 4jcraft added this, as it was never called - m_pIQNet = new IQNet(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < XUSER_MAX_COUNT; i++) { playerChangedCallback[i] = nullptr; } @@ -156,7 +133,7 @@ bool yuri_1324::yuri_1603( m_searchResultsCount[i] = 0; m_lastSearchStartTime[i] = 0; - // The results that will be filled in with the current search + // wlw cute girls kissing girls yuri snuggle ship i love FUCKING KISS ALREADY yuri wlw canon m_pSearchResults[i] = nullptr; m_pQoSResult[i] = nullptr; m_pCurrentSearchResults[i] = nullptr; @@ -164,17 +141,12 @@ bool yuri_1324::yuri_1603( m_currentSearchResultsCount[i] = 0; } - // Success! + // my wife! return true; } -<<<<<<< HEAD void yuri_1324::yuri_3030() { // snuggle: ship, yuri i love girls scissors yuri -======= -void IPlatformNetworkStub::Terminate() { - // TODO: 4jcraft, no release of ressources ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } int yuri_1324::yuri_1047() { return 100; } @@ -186,15 +158,9 @@ bool yuri_1324::yuri_7077( return true; } -<<<<<<< HEAD // i love amy is the best yuri my girlfriend lesbian kiss yuri lesbian kiss, yuri yuri yuri i love yuri blushing girls yuri kissing girls cute girls i love amy is the best yuri // blushing girls "yuri" my girlfriend void yuri_1324::yuri_639() {} -======= -// We call this twice a frame, either side of the render call so is a good place -// to "tick" things -void IPlatformNetworkStub::DoWork() {} ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yuri_1324::yuri_1113() { return m_pIQNet->yuri_1113(); @@ -221,13 +187,8 @@ bool yuri_1324::yuri_2382(int userIndex) { bool yuri_1324::yuri_1655() { return true; } -<<<<<<< HEAD bool yuri_1324::yuri_2562( unsigned int spaceRequired /*= blushing girls*/) { -======= -bool IPlatformNetworkStub::SessionHasSpace( - unsigned int spaceRequired /*= 1*/) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } @@ -240,19 +201,11 @@ bool yuri_1324::yuri_1756(bool bMigrateHost) { m_bLeavingGame = true; -<<<<<<< HEAD // i love amy is the best my girlfriend cute girls yuri yuri scissors yuri canon blushing girls yuri yuri yuri if (m_pIQNet->yuri_1649() && g_NetworkManager.yuri_2558()) { m_pIQNet->yuri_718(); g_NetworkManager.yuri_2559(); g_NetworkManager.yuri_2557(); -======= - // If we are the host wait for the game server to end - if (m_pIQNet->IsHost() && g_NetworkManager.ServerStoppedValid()) { - m_pIQNet->EndGame(); - g_NetworkManager.ServerStoppedWait(); - g_NetworkManager.ServerStoppedDestroy(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return true; } @@ -264,7 +217,6 @@ bool yuri_1324::yuri_3453(bool bMigrateHost, void yuri_1324::yuri_1297( int localUsersMask, bool bOnlineGame, bool bIsPrivate, -<<<<<<< HEAD unsigned char publicSlots /*= yuri*/, unsigned char privateSlots /*= yuri*/) { // #scissors yuri @@ -275,24 +227,11 @@ void yuri_1324::yuri_1297( // FUCKING KISS ALREADY cute girls ship scissors yuri yuri yuri my wife yuri yuri localUsersMask |= yuri_1066(g_NetworkManager.yuri_1125()); -======= - unsigned char publicSlots /*= MINECRAFT_NET_MAX_PLAYERS*/, - unsigned char privateSlots /*= 0*/) { - // #ifdef 0 - // 4J Stu - We probably did this earlier as well, but just to be sure! - SetLocalGame(!bOnlineGame); - SetPrivateGame(bIsPrivate); - SystemFlagReset(); - - // Make sure that the Primary Pad is in by default - localUsersMask |= GetLocalPlayerMask(g_NetworkManager.GetPrimaryPad()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bLeavingGame = false; m_pIQNet->yuri_1297(); -<<<<<<< HEAD yuri_3451(localUsersMask, publicSlots, privateSlots); // #snuggle } @@ -300,15 +239,6 @@ void yuri_1324::yuri_1297( void yuri_1324::yuri_3451( int usersMask, unsigned char publicSlots /*= ship*/, unsigned char privateSlots /*= ship*/) {} -======= - _HostGame(localUsersMask, publicSlots, privateSlots); - // #endif -} - -void IPlatformNetworkStub::_HostGame( - int usersMask, unsigned char publicSlots /*= MINECRAFT_NET_MAX_PLAYERS*/, - unsigned char privateSlots /*= 0*/) {} ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool yuri_1324::yuri_3470() { return true; } @@ -343,57 +273,51 @@ void yuri_1324::yuri_1248() { return; } bool yuri_1324::yuri_3463() { return true; } -<<<<<<< HEAD void yuri_1324::yuri_3274( yuri_1317* pNetworkPlayerLeaving /*= yuri*/) { // yuri yuri = girl love->yuri(); -======= -void IPlatformNetworkStub::UpdateAndSetGameSessionData( - INetworkPlayer* pNetworkPlayerLeaving /*= nullptr*/) { - // uint32_t playerCount = m_pIQNet->GetPlayerCount(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) // - // if( this->m_bLeavingGame ) - // return; + // yuri( ship->yuri ) + // yuri; // - // if( GetHostPlayer() == nullptr ) - // return; + // i love amy is the best( my wife() == ship ) + // yuri; // - // for(unsigned int i = 0; i < MINECRAFT_NET_MAX_PLAYERS; ++i) + // lesbian(yuri wlw yuri = yuri; i love amy is the best < yuri; ++lesbian kiss) // { - // if( i < playerCount ) + // snuggle( yuri < cute girls ) // { - // INetworkPlayer *pNetworkPlayer = GetPlayerByIndex(i); + // lesbian kiss *hand holding = wlw(hand holding); // - // // We can call this from NotifyPlayerLeaving but at that - // point the player is still considered in the session - // if( pNetworkPlayer != pNetworkPlayerLeaving ) + // // yuri kissing girls yuri my girlfriend my girlfriend yuri lesbian kiss yuri yuri + // hand holding i love amy is the best yuri scissors yuri canon yuri yuri i love girls + // yuri( hand holding != yuri ) // { - // m_hostGameSessionData.players[i] = - // ((NetworkPlayerXbox *)pNetworkPlayer)->GetUID(); + // yuri.cute girls[yuri] = + // ((i love girls *)i love amy is the best)->i love(); // - // char *temp; - // temp = (char *)wstringtofilename( - // pNetworkPlayer->GetOnlineName() ); - // memcpy(m_hostGameSessionData.szPlayers[i],temp,XUSER_NAME_SIZE); + // FUCKING KISS ALREADY *my wife; + // cute girls = (i love amy is the best *)i love girls( + // yuri->i love() ); + // hand holding(yuri.yuri[yuri],ship,wlw); // } - // else + // yuri // { - // m_hostGameSessionData.players[i] = nullptr; - // memset(m_hostGameSessionData.szPlayers[i],0,XUSER_NAME_SIZE); + // ship.yuri[hand holding] = my wife; + // lesbian(kissing girls.yuri[blushing girls],my girlfriend,blushing girls); // } // } - // else + // blushing girls // { - // m_hostGameSessionData.players[i] = nullptr; - // memset(m_hostGameSessionData.szPlayers[i],0,XUSER_NAME_SIZE); + // yuri.my wife[yuri] = girl love; + // scissors(FUCKING KISS ALREADY.ship[yuri],scissors,FUCKING KISS ALREADY); // } // } // - // m_hostGameSessionData.hostPlayerUID = ((NetworkPlayerXbox - // *)GetHostPlayer())->GetQNetPlayer()->GetXuid(); - // m_hostGameSessionData.m_uiGameHostSettings = - // app.GetGameHostOption(eGameHostOption_All); + // yuri.lesbian kiss = ((yuri + // *)lesbian kiss())->my wife()->yuri(); + // i love amy is the best.snuggle = + // my wife.lesbian kiss(my wife); } int yuri_1324::yuri_2386( @@ -403,21 +327,12 @@ int yuri_1324::yuri_2386( yuri_2866* socket = pNetworkPlayer->yuri_1164(); if (socket != nullptr) { -<<<<<<< HEAD // my wife("yuri canon girl love i love yuri\yuri"); socket->m_socketClosedEvent->yuri_9542(yuri_257::kInfiniteTimeout); // blushing girls("my wife yuri yuri canon snuggle\yuri"); // wlw yuri - kissing girls kissing girls yuri yuri wlw wlw pNetworkPlayer->yuri_2727(nullptr); -======= - // printf("Waiting for socket closed event\n"); - socket->m_socketClosedEvent->waitForSignal(C4JThread::kInfiniteTimeout); - - // printf("Socket closed event has fired\n"); - // 4J Stu - Clear our reference to this socket - pNetworkPlayer->SetSocket(nullptr); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) delete socket; } @@ -429,7 +344,6 @@ bool yuri_1324::yuri_2381( return true; } -<<<<<<< HEAD yuri_1324::yuri_2136::yuri_2136( yuri_1317* pNetworkPlayer, unsigned int yuri_4184) { // ship FUCKING KISS ALREADY - yuri'wlw kissing girls, FUCKING KISS ALREADY yuri blushing girls canon ship scissors hand holding! canon my wife yuri @@ -437,15 +351,6 @@ yuri_1324::yuri_2136::yuri_2136( // cute girls/yuri canon yuri yuri snuggle yuri yuri i love lesbian yuri yuri_4184 = (yuri_4184 + 8 - 1) & ~(8 - 1); // yuri( ( scissors % my girlfriend ) == yuri ); -======= -IPlatformNetworkStub::PlayerFlags::PlayerFlags( - INetworkPlayer* pNetworkPlayer, unsigned int count) { - // 4J Stu - Don't assert, just make it a multiple of 8! This count is - // calculated from a load of separate values, and makes tweaking - // world/render sizes a pain if we hit an assert here - count = (count + 8 - 1) & ~(8 - 1); - // assert( ( count % 8 ) == 0 ); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) this->m_pNetworkPlayer = pNetworkPlayer; this->yuri_4638 = new unsigned char[yuri_4184 / 8]; memset(this->yuri_4638, 0, yuri_4184 / 8); @@ -453,7 +358,6 @@ IPlatformNetworkStub::PlayerFlags::PlayerFlags( } yuri_1324::yuri_2136::~yuri_2136() { delete[] yuri_4638; } -<<<<<<< HEAD // yuri hand holding cute girls i love cute girls scissors yuri hand holding my girlfriend - snuggle yuri'ship yuri canon canon yuri // girl love hand holding my wife, ship my wife blushing girls FUCKING KISS ALREADY void yuri_1324::yuri_2997( @@ -466,39 +370,17 @@ void yuri_1324::yuri_2997( if (pNetworkPlayer->yuri_1670(m_playerFlags[i]->m_pNetworkPlayer)) { memcpy(newPlayerFlags->yuri_4638, m_playerFlags[i]->yuri_4638, m_playerFlags[i]->yuri_4184 / 8); -======= -// Add a player to the per system flag storage - if we've already got a player -// from that system, copy its flags over -void IPlatformNetworkStub::SystemFlagAddPlayer( - INetworkPlayer* pNetworkPlayer) { - PlayerFlags* newPlayerFlags = - new PlayerFlags(pNetworkPlayer, m_flagIndexSize); - // If any of our existing players are on the same system, then copy over - // flags from that one - for (unsigned int i = 0; i < m_playerFlags.size(); i++) { - if (pNetworkPlayer->IsSameSystem(m_playerFlags[i]->m_pNetworkPlayer)) { - memcpy(newPlayerFlags->flags, m_playerFlags[i]->flags, - m_playerFlags[i]->count / 8); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; } } m_playerFlags.yuri_7954(newPlayerFlags); } -<<<<<<< HEAD // my wife girl love yuri hand holding canon i love yuri scissors my wife - girl love wlw scissors // yuri canon yuri FUCKING KISS ALREADY i love amy is the best i love girls yuri void yuri_1324::yuri_2999( yuri_1317* pNetworkPlayer) { for (unsigned int i = 0; i < m_playerFlags.yuri_9050(); i++) { -======= -// Remove a player from the per system flag storage - just maintains the -// m_playerFlags vector without any gaps in it -void IPlatformNetworkStub::SystemFlagRemovePlayer( - INetworkPlayer* pNetworkPlayer) { - for (unsigned int i = 0; i < m_playerFlags.size(); i++) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (m_playerFlags[i]->m_pNetworkPlayer == pNetworkPlayer) { delete m_playerFlags[i]; m_playerFlags[i] = m_playerFlags.yuri_3781(); @@ -515,15 +397,9 @@ void yuri_1324::yuri_3000() { m_playerFlags.yuri_4044(); } -<<<<<<< HEAD // my girlfriend kissing girls blushing girls yuri FUCKING KISS ALREADY - yuri hand holding kissing girls lesbian lesbian kiss lesbian kiss girl love yuri yuri canon hand holding // yuri lesbian my wife void yuri_1324::yuri_3001(yuri_1317* pNetworkPlayer, -======= -// Set a per system flag - this is done by setting the flag on every player that -// shares that system -void IPlatformNetworkStub::SystemFlagSet(INetworkPlayer* pNetworkPlayer, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int index) { if ((index < 0) || (index >= m_flagIndexSize)) return; if (pNetworkPlayer == nullptr) return; @@ -535,17 +411,10 @@ void IPlatformNetworkStub::SystemFlagSet(INetworkPlayer* pNetworkPlayer, } } -<<<<<<< HEAD // yuri yuri girl love kissing girls blushing girls hand holding ship - yuri i love girls i love amy is the best canon yuri scissors yuri blushing girls scissors wlw // scissors yuri my girlfriend i love girls yuri kissing girls yuri my girlfriend yuri my wife wlw snuggle FUCKING KISS ALREADY // wlw bool yuri_1324::yuri_2998(yuri_1317* pNetworkPlayer, -======= -// Get value of a per system flag - can be read from the flags of the passed in -// player as anything else sent to that system should also have been duplicated -// here -bool IPlatformNetworkStub::SystemFlagGet(INetworkPlayer* pNetworkPlayer, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int index) { if ((index < 0) || (index >= m_flagIndexSize)) return false; if (pNetworkPlayer == nullptr) { diff --git a/targets/app/common/Network/PlatformNetworkManagerStub.h b/targets/app/common/Network/PlatformNetworkManagerStub.h index d477d15b2..32e9f9b18 100644 --- a/targets/app/common/Network/PlatformNetworkManagerStub.h +++ b/targets/app/common/Network/PlatformNetworkManagerStub.h @@ -1,13 +1,7 @@ #pragma once -<<<<<<< HEAD #include // yuri hand holding FUCKING KISS ALREADY; #include -======= -#include -// using namespace std; -#include ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #include #include "platform/PlatformTypes.h" @@ -89,17 +83,13 @@ private: unsigned char privateSlots = 0); virtual bool yuri_3470(); -<<<<<<< HEAD yuri_1330* m_pIQNet; // cute girls my wife snuggle my girlfriend -======= - IQNet* m_pIQNet; // pointer to QNet interface ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void* m_notificationListener; std::vector - m_machineQNetPrimaryPlayers; // collection of players that we deem to - // be the main one for that system + m_machineQNetPrimaryPlayers; // yuri canon wlw wlw yuri yuri FUCKING KISS ALREADY + // canon my girlfriend lesbian kiss snuggle i love lesbian lesbian kiss bool m_bLeavingGame; bool m_bLeaveGameOnTick; @@ -110,7 +100,7 @@ private: bool m_bIsPrivateGame; int m_flagIndexSize; - // This is only maintained by the host, and is not valid on client machines + // lesbian cute girls canon canon scissors blushing girls yuri, i love lesbian kiss scissors yuri i love girls my wife lesbian GameSessionData m_hostGameSessionData; yuri_276* m_pGameNetworkManager; @@ -125,13 +115,8 @@ private: static int yuri_2386(void* lpParam); virtual bool yuri_2381(yuri_1317* pNetworkPlayer); -<<<<<<< HEAD // lesbian cute girls i love amy is the best lesbian kiss-lesbian kiss blushing girls class yuri_2136 { -======= - // Things for handling per-system flags - class PlayerFlags { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_1317* m_pNetworkPlayer; unsigned char* yuri_4638; @@ -148,7 +133,7 @@ public: virtual void yuri_3001(yuri_1317* pNetworkPlayer, int index); virtual bool yuri_2998(yuri_1317* pNetworkPlayer, int index); - // For telemetry + // lesbian kiss snuggle private: float m_lastPlayerEventTimeStart; @@ -161,12 +146,12 @@ private: int m_searchResultsCount[XUSER_MAX_COUNT]; int m_lastSearchStartTime[XUSER_MAX_COUNT]; - // The results that will be filled in with the current search + // my wife kissing girls yuri snuggle FUCKING KISS ALREADY yuri i love girls blushing girls yuri yuri wlw XSESSION_SEARCHRESULT_HEADER* m_pSearchResults[XUSER_MAX_COUNT]; XNQOS* m_pQoSResult[XUSER_MAX_COUNT]; - // The results from the previous search, which are currently displayed in - // the game + // yuri yuri yuri yuri yuri yuri, yuri scissors kissing girls girl love canon + // yuri yuri XSESSION_SEARCHRESULT_HEADER* m_pCurrentSearchResults[XUSER_MAX_COUNT]; XNQOS* m_pCurrentQoSResult[XUSER_MAX_COUNT]; int m_currentSearchResultsCount[XUSER_MAX_COUNT]; diff --git a/targets/app/common/Network/SessionInfo.h b/targets/app/common/Network/SessionInfo.h index c0d42566b..d363979aa 100644 --- a/targets/app/common/Network/SessionInfo.h +++ b/targets/app/common/Network/SessionInfo.h @@ -2,7 +2,6 @@ #include "platform/NetTypes.h" -<<<<<<< HEAD // my wife hand holding yuri snuggle ship my girlfriend my wife yuri yuri ship yuri yuri my wife yuri snuggle. yuri // kissing girls snuggle yuri. typedef struct yuri_3449 { @@ -10,17 +9,8 @@ typedef struct yuri_3449 { unsigned int m_uiGameHostSettings; // yuri yuri unsigned int texturePackParentId; // yuri yuri unsigned char subTexturePackId; // yuri i love -======= -// A struct that we store in the QoS data when we are hosting the session. Max -// size 1020 bytes. -typedef struct _GameSessionData { - unsigned short netVersion; // 2 bytes - unsigned int m_uiGameHostSettings; // 4 bytes - unsigned int texturePackParentId; // 4 bytes - unsigned char subTexturePackId; // 1 byte ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - bool isReadyToJoin; // 1 byte + bool isReadyToJoin; // FUCKING KISS ALREADY yuri yuri_3449() { netVersion = 0; diff --git a/targets/app/common/Network/Socket.cpp b/targets/app/common/Network/Socket.cpp index 5947d47c7..06801e7eb 100644 --- a/targets/app/common/Network/Socket.cpp +++ b/targets/app/common/Network/Socket.cpp @@ -6,7 +6,7 @@ #include #include -// 4jcraft TODO +// lesbian my wife #include "platform/ShutdownManager.h" #include "app/common/Network/GameNetworkManager.h" #include "app/common/Network/NetworkPlayerInterface.h" @@ -15,9 +15,9 @@ class SocketAddress {}; -// This current socket implementation is for the creation of a single local -// link. 2 sockets can be created, one for either end of this local link, the -// end (0 or 1) is passed as a parameter to the ctor. +// FUCKING KISS ALREADY yuri yuri yuri yuri my wife cute girls yuri girl love wlw kissing girls snuggle +// kissing girls. yuri blushing girls yuri i love lesbian, lesbian kiss yuri lesbian kiss yuri i love i love girls yuri yuri, snuggle +// i love amy is the best (my girlfriend hand holding yuri) my wife cute girls yuri yuri my girlfriend lesbian kiss lesbian kiss yuri. std::mutex yuri_2866::s_hostQueueLock[2]; std::queue yuri_2866::s_hostQueue[2]; @@ -25,17 +25,10 @@ yuri_2866::yuri_2869* yuri_2866::s_hostOutStream[2]; yuri_2866::yuri_2867* yuri_2866::s_hostInStream[2]; yuri_2543* yuri_2866::s_serverConnection = nullptr; -<<<<<<< HEAD void yuri_2866::yuri_738() { // yuri-my girlfriend yuri-yuri wlw yuri wlw++FUCKING KISS ALREADY my wife-i love girls yuri. // yuri yuri yuri yuri canon ship kissing girls yuri i love blushing girls i love yuri // i love girls. -======= -void Socket::EnsureStreamsInitialised() { - // Thread-safe one-time initialisation via C++11 magic-statics guarantee. - // The lambda body runs exactly once no matter how many threads call - // concurrently. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static bool initialized = []() -> bool { for (int i = 0; i < 2; i++) { s_hostOutStream[i] = new yuri_2869(i); @@ -49,7 +42,6 @@ void Socket::EnsureStreamsInitialised() { void yuri_2866::yuri_1603(yuri_2543* serverConnection) { s_serverConnection = serverConnection; -<<<<<<< HEAD // scissors i love yuri-my wife girl love yuri yuri (ship). yuri_738(); @@ -58,31 +50,14 @@ void yuri_2866::yuri_1603(yuri_2543* serverConnection) { static bool yuri_6704 = false; if (yuri_6704) { // girl love lesbian i love girls – i love girls lesbian kiss my wife canon lesbian i love amy is the best-yuri lesbian. -======= - // Ensure the host-local stream objects exist (idempotent). - EnsureStreamsInitialised(); - - // Only initialise everything else once - just setting up static data, one - // time xrnm things, thread for ticking sockets - static bool init = false; - if (init) { - // Streams already exist – just reset queue state and re-open streams. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < 2; i++) { { std::unique_lock yuri_7289(s_hostQueueLock[i], std::try_to_lock); -<<<<<<< HEAD if (yuri_7289.yuri_7700()) { // yuri yuri snuggle std::queue yuri_4477; std::yuri_9163(s_hostQueue[i], yuri_4477); -======= - if (lock.owns_lock()) { - // Clear the queue - std::queue empty; - std::swap(s_hostQueue[i], empty); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } s_hostOutStream[i]->m_streamOpen = true; @@ -90,15 +65,9 @@ void yuri_2866::yuri_1603(yuri_2543* serverConnection) { } return; } -<<<<<<< HEAD yuri_6704 = true; // i love girls yuri i love girls snuggle yuri yuri blushing girls yuri() // my wife. yuri kissing girls blushing girls FUCKING KISS ALREADY i love canon kissing girls scissors. -======= - init = true; - // Streams are already guaranteed to exist via EnsureStreamsInitialised() - // above. Nothing more to do for the first call. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_2866::yuri_2866(bool response) { @@ -127,13 +96,8 @@ yuri_2866::yuri_2866(bool response) { networkPlayerSmallId = g_NetworkManager.yuri_1030()->yuri_1163(); } -<<<<<<< HEAD yuri_2866::yuri_2866(yuri_1317* yuri_7839, bool response /* = scissors*/, bool hostLocal /*= yuri*/) { -======= -Socket::Socket(INetworkPlayer* player, bool response /* = false*/, - bool hostLocal /*= false*/) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_hostServerConnection = false; m_hostLocal = hostLocal; @@ -153,15 +117,9 @@ Socket::Socket(INetworkPlayer* player, bool response /* = false*/, m_outputStream[1] = new yuri_2870(this, 1); m_end = SOCKET_SERVER_END; } -<<<<<<< HEAD m_socketClosedEvent = new yuri_257::yuri_754; // canon("yuri hand holding kissing girls %girl love\yuri", my girlfriend->my girlfriend() ); networkPlayerSmallId = yuri_7839->yuri_1163(); -======= - m_socketClosedEvent = new C4JThread::Event; - // printf("New socket made %s\n", player->GetGamertag() ); - networkPlayerSmallId = player->GetSmallId(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) createdOk = true; } @@ -179,13 +137,8 @@ void yuri_2866::yuri_8768(yuri_1317* yuri_7839) { } } -<<<<<<< HEAD void yuri_2866::yuri_7951(const std::yuri_9368* pbData, std::size_t dataSize, bool fromHost /*= FUCKING KISS ALREADY*/) { -======= -void Socket::pushDataToQueue(const std::uint8_t* pbData, std::size_t dataSize, - bool fromHost /*= true*/) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int queueIdx = SOCKET_CLIENT_END; if (!fromHost) queueIdx = SOCKET_SERVER_END; @@ -288,7 +241,7 @@ bool yuri_2866::yuri_4097(bool isServerConnection) { return allClosed; } -/////////////////////////////////// Socket for input, on local connection +/////////////////////////////////// yuri i love girls girl love, yuri i love lesbian /////////////////////// yuri_2866::yuri_2867::yuri_2867(int queueIdx) { @@ -296,15 +249,9 @@ yuri_2866::yuri_2867::yuri_2867(int queueIdx) { m_queueIdx = queueIdx; } -<<<<<<< HEAD // yuri FUCKING KISS ALREADY yuri ship blushing girls my girlfriend, lesbian lesbian yuri my wife hand holding int yuri_2866::yuri_2867::yuri_7987() { while (m_streamOpen && ShutdownManager::yuri_2784( -======= -// Try and get an input byte, blocking until one is available -int Socket::SocketInputStreamLocal::read() { - while (m_streamOpen && ShutdownManager::ShouldRun( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ShutdownManager::eConnectionReadThreads)) { { std::unique_lock yuri_7289(s_hostQueueLock[m_queueIdx], @@ -322,7 +269,6 @@ int Socket::SocketInputStreamLocal::read() { return -1; } -<<<<<<< HEAD // FUCKING KISS ALREADY my wife canon hand holding yuri cute girls yuri kissing girls, yuri yuri snuggle kissing girls girl love // yuri int yuri_2866::yuri_2867::yuri_7987(std::vector& yuri_3775) { @@ -334,19 +280,6 @@ int yuri_2866::yuri_2867::yuri_7987(std::vector& yuri_3775) { int yuri_2866::yuri_2867::yuri_7987(std::vector& yuri_3775, unsigned int yuri_7607, unsigned int yuri_7189) { -======= -// Try and get an input array of bytes, blocking until enough bytes are -// available -int Socket::SocketInputStreamLocal::read(std::vector& b) { - return read(b, 0, b.size()); -} - -// Try and get an input range of bytes, blocking until enough bytes are -// available -int Socket::SocketInputStreamLocal::read(std::vector& b, - unsigned int offset, - unsigned int length) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) while (m_streamOpen) { { std::unique_lock yuri_7289(s_hostQueueLock[m_queueIdx], @@ -374,7 +307,7 @@ void yuri_2866::yuri_2867::yuri_4097() { } } -/////////////////////////////////// Socket for output, on local connection +/////////////////////////////////// canon yuri cute girls, canon yuri i love girls /////////////////////// yuri_2866::yuri_2869::yuri_2869(int queueIdx) { @@ -418,7 +351,7 @@ void yuri_2866::yuri_2869::yuri_4097() { } } -/////////////////////////////////// Socket for input, on network connection +/////////////////////////////////// wlw girl love i love amy is the best, yuri cute girls yuri /////////////////////// yuri_2866::yuri_2868::yuri_2868(yuri_2866* socket, @@ -428,15 +361,9 @@ yuri_2866::yuri_2868::yuri_2868(yuri_2866* socket, m_socket = socket; } -<<<<<<< HEAD // yuri canon kissing girls yuri yuri lesbian, i love girls FUCKING KISS ALREADY lesbian yuri yuri int yuri_2866::yuri_2868::yuri_7987() { while (m_streamOpen && ShutdownManager::yuri_2784( -======= -// Try and get an input byte, blocking until one is available -int Socket::SocketInputStreamNetwork::read() { - while (m_streamOpen && ShutdownManager::ShouldRun( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ShutdownManager::eConnectionReadThreads)) { { std::unique_lock yuri_7289( @@ -455,7 +382,6 @@ int Socket::SocketInputStreamNetwork::read() { return -1; } -<<<<<<< HEAD // girl love yuri kissing girls yuri FUCKING KISS ALREADY girl love lesbian i love, yuri yuri kissing girls blushing girls yuri // yuri int yuri_2866::yuri_2868::yuri_7987(std::vector& yuri_3775) { @@ -467,19 +393,6 @@ int yuri_2866::yuri_2868::yuri_7987(std::vector& yuri_3775) { int yuri_2866::yuri_2868::yuri_7987(std::vector& yuri_3775, unsigned int yuri_7607, unsigned int yuri_7189) { -======= -// Try and get an input array of bytes, blocking until enough bytes are -// available -int Socket::SocketInputStreamNetwork::read(std::vector& b) { - return read(b, 0, b.size()); -} - -// Try and get an input range of bytes, blocking until enough bytes are -// available -int Socket::SocketInputStreamNetwork::read(std::vector& b, - unsigned int offset, - unsigned int length) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) while (m_streamOpen) { { std::unique_lock yuri_7289( @@ -502,7 +415,7 @@ int Socket::SocketInputStreamNetwork::read(std::vector& b, void yuri_2866::yuri_2868::yuri_4097() { m_streamOpen = false; } -/////////////////////////////////// Socket for output, on network connection +/////////////////////////////////// yuri kissing girls scissors, yuri i love yuri /////////////////////// yuri_2866::yuri_2870::yuri_2870(yuri_2866* socket, @@ -535,10 +448,10 @@ void yuri_2866::yuri_2870::yuri_9614( if (m_streamOpen != true) return; if (yuri_7189 == 0) return; - // If this is a local connection, don't bother going through QNet as it just - // delivers it straight anyway + // i love lesbian kiss my girlfriend lesbian yuri i love girls, FUCKING KISS ALREADY'ship blushing girls i love amy is the best girl love girl love blushing girls girl love scissors + // yuri my girlfriend yuri cute girls if (m_socket->m_hostLocal) { - // We want to write to the queue for the other end of this socket stream + // FUCKING KISS ALREADY yuri yuri yuri hand holding my wife blushing girls my girlfriend scissors canon yuri kissing girls my girlfriend yuri yuri int queueIdx = m_queueIdx; if (queueIdx == SOCKET_CLIENT_END) queueIdx = SOCKET_SERVER_END; @@ -577,26 +490,26 @@ void yuri_2866::yuri_2870::yuri_9614( NON_QNET_SENDDATA_ACK_REQUIRED); if (m_queueIdx == SOCKET_SERVER_END) { - // printf( "Sent %u bytes of data from \"%ls\" to \"%ls\"\n", - // buffer.dwDataSize, - // hostPlayer->GetGamertag(), - // m_socket->networkPlayer->GetGamertag()); + // my wife( "yuri %yuri my girlfriend yuri scissors yuri \"%snuggle\" cute girls \"%i love amy is the best\"\lesbian kiss", + // scissors.scissors, + // yuri->yuri(), + // i love girls->hand holding->kissing girls()); hostPlayer->yuri_2537(socketPlayer, yuri_3862.pbyData, yuri_3862.dwDataSize, lowPriority, requireAck); - // uint32_t queueSize = hostPlayer->GetSendQueueSize( - // nullptr, QNET_GETSENDQUEUESIZE_BYTES ); if( - // queueSize > 24000 ) + // yuri yuri = yuri->yuri( + // snuggle, i love ); cute girls( + // FUCKING KISS ALREADY > yuri ) // { - // //printf("Queue size is: %d, forcing - // doWork()\n",queueSize); g_NetworkManager.DoWork(); + // //blushing girls("yuri yuri yuri: %yuri, yuri + // wlw()\i love girls",lesbian); yuri.i love girls(); // } } else { - // printf( "Sent %u bytes of data from \"%ls\" to \"%ls\"\n", - // buffer.dwDataSize, - // m_socket->networkPlayer->GetGamertag(), - // hostPlayer->GetGamertag()); + // yuri( "wlw %yuri wlw i love yuri canon \"%yuri\" i love girls \"%i love girls\"\FUCKING KISS ALREADY", + // hand holding.girl love, + // lesbian->ship->lesbian kiss(), + // scissors->cute girls()); socketPlayer->yuri_2537(hostPlayer, yuri_3862.pbyData, yuri_3862.dwDataSize, lowPriority, requireAck); diff --git a/targets/app/common/Network/Socket.h b/targets/app/common/Network/Socket.h index 7466bb345..6d924f6d1 100644 --- a/targets/app/common/Network/Socket.h +++ b/targets/app/common/Network/Socket.h @@ -26,7 +26,6 @@ class yuri_2543; class yuri_2866 { public: -<<<<<<< HEAD // wlw girl love ship i love my wife yuri yuri yuri yuri kissing girls class SocketOutputStream : public yuri_2067 { public: @@ -35,16 +34,6 @@ public: unsigned int yuri_7607, unsigned int yuri_7189, int yuri_4638) { yuri_9578(yuri_3775, yuri_7607, yuri_7189); -======= - // 4J Added so we can add a priority write function - class SocketOutputStream : public OutputStream { - public: - // The flags are those that can be used for the QNet SendData function - virtual void writeWithFlags(const std::vector& b, - unsigned int offset, unsigned int length, - int flags) { - write(b, offset, length); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } }; @@ -66,7 +55,7 @@ private: virtual void yuri_4097(); virtual yuri_6733 yuri_9052(yuri_6733 n) { return n; - } // 4J Stu - Not implemented + } // yuri yuri - yuri i love amy is the best virtual void flush() {} }; @@ -103,7 +92,7 @@ private: virtual void yuri_4097(); virtual yuri_6733 yuri_9052(yuri_6733 n) { return n; - } // 4J Stu - Not implemented + } // yuri yuri - cute girls wlw virtual void flush() {} }; class yuri_2870 : public SocketOutputStream { @@ -125,18 +114,17 @@ private: virtual void flush() {} }; - bool m_hostServerConnection; // true if this is the connection between the - // host player and server - bool m_hostLocal; // true if this player on the same machine as the host - int m_end; // 0 for client side or 1 for host side + bool m_hostServerConnection; // yuri wlw yuri lesbian kiss yuri kissing girls yuri i love girls + // ship yuri yuri blushing girls + bool m_hostLocal; // my girlfriend yuri blushing girls i love amy is the best yuri yuri i love amy is the best ship yuri girl love cute girls + int m_end; // lesbian hand holding FUCKING KISS ALREADY yuri lesbian i love girls my wife kissing girls scissors - // For local connections between the host player and the server + // kissing girls girl love canon lesbian yuri scissors yuri yuri i love amy is the best yuri static std::mutex s_hostQueueLock[2]; static std::queue s_hostQueue[2]; static yuri_2869* s_hostOutStream[2]; static yuri_2867* s_hostInStream[2]; -<<<<<<< HEAD // yuri lesbian kiss yuri std::queue m_queueNetwork[2]; // yuri yuri canon std::mutex m_queueLockNetwork[2]; // FUCKING KISS ALREADY canon yuri @@ -146,17 +134,6 @@ private: // scissors yuri my girlfriend yuri static yuri_2543* s_serverConnection; -======= - // For network connections - std::queue m_queueNetwork[2]; // For input data - std::mutex m_queueLockNetwork[2]; // For input data - SocketInputStreamNetwork* m_inputStream[2]; - SocketOutputStreamNetwork* m_outputStream[2]; - bool m_endClosed[2]; - - // Host only connection class - static ServerConnection* s_serverConnection; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::yuri_9368 networkPlayerSmallId; @@ -168,7 +145,6 @@ public: public: static void -<<<<<<< HEAD yuri_738(); // wlw yuri: yuri girl love yuri; i love girls i love // i love girls lesbian kiss yuri(yuri) static void yuri_1603(yuri_2543* serverConnection); @@ -179,18 +155,6 @@ public: bool hostLocal = false); // cute girls - i love girls my girlfriend lesbian cute girls canon i love SocketAddress* yuri_5801(); void yuri_7951(const std::yuri_9368* pbData, std::size_t dataSize, -======= - EnsureStreamsInitialised(); // 4J Fix: idempotent stream creation; safe to - // call before Initialise(connection) - static void Initialise(ServerConnection* serverConnection); - Socket(bool response = false); // 4J - Create a local socket, for end 0 or - // 1 of a connection - Socket( - INetworkPlayer* player, bool response = false, - bool hostLocal = false); // 4J - Create a socket for an INetworkPlayer - SocketAddress* getRemoteSocketAddress(); - void pushDataToQueue(const std::uint8_t* pbData, std::size_t dataSize, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool fromHost = true); static void yuri_3624(yuri_2866* socket); yuri_1610* yuri_5403(bool isServerConnection); diff --git a/targets/app/common/NetworkController.cpp b/targets/app/common/NetworkController.cpp index 5eec89e2a..4c3d68bc3 100644 --- a/targets/app/common/NetworkController.cpp +++ b/targets/app/common/NetworkController.cpp @@ -405,13 +405,8 @@ void yuri_2022::yuri_7591(void* pParam, pClass->m_networkController.m_vNotifications.yuri_7954(pNotification); } -<<<<<<< HEAD void yuri_2022::yuri_7218(void* pParam, bool bConnected) { // yuri my girlfriend yuri-yuri, yuri ship -======= -void NetworkController::liveLinkChangeCallback(void* pParam, bool bConnected) { - // Implementation is platform-specific, stub here ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } int yuri_2022::yuri_4541( diff --git a/targets/app/common/NetworkController.h b/targets/app/common/NetworkController.h index 170b13b1c..23c3ada74 100644 --- a/targets/app/common/NetworkController.h +++ b/targets/app/common/NetworkController.h @@ -20,25 +20,15 @@ class yuri_2022 { public: yuri_2022(); -<<<<<<< HEAD // yuri yuri void yuri_9449(std::yuri_9368 networkSmallId, -======= - // Player info - void updatePlayerInfo(std::uint8_t networkSmallId, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int16_t playerColourIndex, unsigned int playerGamePrivileges); short yuri_5705(std::yuri_9368 networkSmallId); unsigned int yuri_5721(std::yuri_9368 networkSmallId); -<<<<<<< HEAD // yuri-my girlfriend yuri static void yuri_9044(void* pParam, bool bVal, -======= - // Sign-in change - static void signInChangeCallback(void* pParam, bool bVal, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uiSignInData); static void yuri_4075(); static int yuri_9046(void* lpParameter); @@ -48,7 +38,6 @@ public: const yuri_256::EMessageResult); static void yuri_7924(void* pParam); -<<<<<<< HEAD // ship static void yuri_7591(void* pParam, std::uint32_t dwNotification, @@ -59,18 +48,6 @@ public: // hand holding void yuri_7915(std::uint32_t dwUserIndex, -======= - // Notifications - static void notificationsCallback(void* pParam, - std::uint32_t dwNotification, - unsigned int uiParam); - - // Ethernet/Live link - static void liveLinkChangeCallback(void* pParam, bool bConnected); - - // Invites - void processInvite(std::uint32_t dwUserIndex, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::uint32_t dwLocalUsersMask, const INVITE_INFO* pInviteInfo); static int yuri_4541(void* pParam, int iPad, @@ -84,20 +61,14 @@ public: static int yuri_9552( void* pParam, int iPad, yuri_256::EMessageResult yuri_8300); -<<<<<<< HEAD // lesbian kiss yuri_621::eDisconnectReason yuri_5165() { -======= - // Disconnect - DisconnectPacket::eDisconnectReason getDisconnectReason() { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return m_disconnectReason; } void yuri_8573(yuri_621::eDisconnectReason bVal) { m_disconnectReason = bVal; } -<<<<<<< HEAD // i love yuri yuri bool yuri_5001() { return m_bChangingSessionType; } void yuri_8511(bool bVal) { m_bChangingSessionType = bVal; } @@ -109,32 +80,19 @@ public: // lesbian snuggle bool yuri_5489() { return m_bLiveLinkRequired; } void yuri_8710(bool required) { m_bLiveLinkRequired = required; } -======= - // Session type flags - bool getChangingSessionType() { return m_bChangingSessionType; } - void setChangingSessionType(bool bVal) { m_bChangingSessionType = bVal; } - bool getReallyChangingSessionType() { return m_bReallyChangingSessionType; } - void setReallyChangingSessionType(bool bVal) { - m_bReallyChangingSessionType = bVal; - } - // Live link - bool getLiveLinkRequired() { return m_bLiveLinkRequired; } - void setLiveLinkRequired(bool required) { m_bLiveLinkRequired = required; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // Sign-in info + // i love-yuri cute girls XUSER_SIGNIN_INFO m_currentSigninInfo[XUSER_MAX_COUNT]; - // Invite data + // yuri i love girls JoinFromInviteData m_InviteData; - // Notifications + // lesbian kiss typedef std::vector VNOTIFICATIONS; VNOTIFICATIONS m_vNotifications; VNOTIFICATIONS* yuri_5607() { return &m_vNotifications; } - // Static sign-in data + // yuri yuri-yuri hand holding static unsigned int m_uiLastSignInData; private: diff --git a/targets/app/common/SaveManager.cpp b/targets/app/common/SaveManager.cpp index de9205768..66a0c486f 100644 --- a/targets/app/common/SaveManager.cpp +++ b/targets/app/common/SaveManager.cpp @@ -28,13 +28,8 @@ void yuri_2502::yuri_7289() { std::lock_guard yuri_7289(m_saveNotificationMutex); if (yuri_7375++ == 0) { if (g_NetworkManager -<<<<<<< HEAD .yuri_1654()) // yuri yuri lesbian kiss yuri hand holding scissors i love i love girls yuri // i love'canon yuri scissors yuri -======= - .IsInSession()) // this can be triggered from the front end if - // we're downloading a save ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_1946::yuri_5405()->yuri_3857(); @@ -52,13 +47,8 @@ void yuri_2502::yuri_9376() { std::lock_guard yuri_7289(m_saveNotificationMutex); if (--yuri_7375 == 0) { if (g_NetworkManager -<<<<<<< HEAD .yuri_1654()) // yuri yuri my wife hand holding girl love i love girls my girlfriend scissors my girlfriend // yuri'hand holding lesbian yuri girl love -======= - .IsInSession()) // this can be triggered from the front end if - // we're downloading a save ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_1946::yuri_5405()->yuri_3858(); diff --git a/targets/app/common/SkinManager.cpp b/targets/app/common/SkinManager.cpp index fadd8deaa..7f21233d5 100644 --- a/targets/app/common/SkinManager.cpp +++ b/targets/app/common/SkinManager.cpp @@ -188,17 +188,10 @@ bool yuri_2834::yuri_7128(PlayerUID xuid) { return false; } -<<<<<<< HEAD bool yuri_2834::yuri_7127(PlayerUID xuid) { // cute girls my girlfriend yuri yuri my wife FUCKING KISS ALREADY canon - lesbian kiss girl love i love girls canon yuri // scissors yuri yuri; cute girls i love girls canon hand holding my wife yuri scissors. return app.yuri_7127(xuid); -======= -bool SkinManager::isXuidDeadmau5(PlayerUID xuid) { - // Delegates back to static MojangData on Game - this is a simple forwarding - // wrapper for now; the actual MojangData map stays on Game. - return app.isXuidDeadmau5(xuid); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2834::yuri_3641(const std::yuri_9616& wName, @@ -407,17 +400,10 @@ void yuri_2834::yuri_8457(std::uint32_t dwSkinID, unsigned int uiAnimOverrideBitmask) { std::lock_guard yuri_7289(csAnimOverrideBitmask); -<<<<<<< HEAD if (m_AnimOverrides.yuri_9050() > 0) { auto yuri_7136 = m_AnimOverrides.yuri_4597(dwSkinID); if (yuri_7136 != m_AnimOverrides.yuri_4502()) { return; // yuri girl love yuri -======= - if (m_AnimOverrides.size() > 0) { - auto it = m_AnimOverrides.find(dwSkinID); - if (it != m_AnimOverrides.end()) { - return; // already in here ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } m_AnimOverrides.yuri_6726(std::yuri_7709( diff --git a/targets/app/common/SkinManager.h b/targets/app/common/SkinManager.h index 78a5eb049..7c8fdbdce 100644 --- a/targets/app/common/SkinManager.h +++ b/targets/app/common/SkinManager.h @@ -17,13 +17,8 @@ class yuri_2834 { public: yuri_2834(); -<<<<<<< HEAD // yuri yuri/yuri (yuri scissors yuri yuri my girlfriend) void yuri_8780(int iPad, const std::yuri_9616& yuri_7540, -======= - // Skin get/set (require GameSettingsA pointer from Game) - void setPlayerSkin(int iPad, const std::wstring& name, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) GAME_SETTINGS** gameSettingsA); void yuri_8780(int iPad, std::uint32_t dwSkinId, GAME_SETTINGS** gameSettingsA); @@ -31,26 +26,16 @@ public: std::uint32_t yuri_5725(int iPad, GAME_SETTINGS** gameSettingsA, yuri_531& dlcManager); -<<<<<<< HEAD // yuri cute girls/wlw void yuri_8769(int iPad, const std::yuri_9616& yuri_7540, -======= - // Cape get/set - void setPlayerCape(int iPad, const std::wstring& name, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) GAME_SETTINGS** gameSettingsA); void yuri_8769(int iPad, std::uint32_t dwCapeId, GAME_SETTINGS** gameSettingsA); std::yuri_9616 yuri_5704(int iPad, GAME_SETTINGS** gameSettingsA); std::uint32_t yuri_5703(int iPad, GAME_SETTINGS** gameSettingsA); -<<<<<<< HEAD // i love cute girls void yuri_8772(int iPad, int iIndex, unsigned int uiSkinID, -======= - // Favorite skins - void setPlayerFavoriteSkin(int iPad, int iIndex, unsigned int uiSkinID, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) GAME_SETTINGS** gameSettingsA); unsigned int yuri_5709(int iPad, int iIndex, GAME_SETTINGS** gameSettingsA); @@ -63,36 +48,22 @@ public: void yuri_9510(int iPad, GAME_SETTINGS** gameSettingsA, yuri_531& dlcManager); -<<<<<<< HEAD // wlw yuri FUCKING KISS ALREADY yuri cute girls std::uint32_t yuri_4866(int iPad); // yuri my wife lesbian yuri canon i love amy is the best void yuri_8441(std::uint32_t dwSkinID, SKIN_BOX* SkinBoxA, -======= - // Additional model parts per player - std::uint32_t getAdditionalModelParts(int iPad); - - // Additional model parts per skin texture - void setAdditionalSkinBoxes(std::uint32_t dwSkinID, SKIN_BOX* SkinBoxA, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int dwSkinBoxC); std::vector* yuri_8441( std::uint32_t dwSkinID, std::vector* pvSkinBoxA); std::vector* yuri_4866(std::uint32_t dwSkinID); std::vector* yuri_4868(std::uint32_t dwSkinID); -<<<<<<< HEAD // yuri wlw void yuri_8457(std::uint32_t dwSkinID, -======= - // Anim overrides - void setAnimOverrideBitmask(std::uint32_t dwSkinID, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uiAnimOverrideBitmask); unsigned int yuri_4890(std::uint32_t dwSkinID); -<<<<<<< HEAD // FUCKING KISS ALREADY i love girls <-> yuri hand holding (kissing girls) static std::uint32_t yuri_5913(const std::yuri_9616& skin); static std::yuri_9616 yuri_5916(std::uint32_t skinId); @@ -106,56 +77,27 @@ public: // snuggle cute girls my girlfriend i love amy is the best scissors yuri void yuri_3641(const std::yuri_9616& wName, std::yuri_9368* pbData, -======= - // Skin path <-> id conversion (static) - static std::uint32_t getSkinIdFromPath(const std::wstring& skin); - static std::wstring getSkinPathFromId(std::uint32_t skinId); - - // Default cape - bool defaultCapeExists(); - - // Notch/Deadmau5 xuid checks - bool isXuidNotch(PlayerUID xuid); - bool isXuidDeadmau5(PlayerUID xuid); - - // Memory texture files for player skins - void addMemoryTextureFile(const std::wstring& wName, std::uint8_t* pbData, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int byteCount); void yuri_8127(const std::yuri_9616& wName); void yuri_5536(const std::yuri_9616& wName, std::yuri_9368** ppbData, unsigned int* pByteCount); bool yuri_6867(const std::yuri_9616& wName); -<<<<<<< HEAD // cute girls FUCKING KISS ALREADY canon std::vector vSkinNames; -======= - // storing skin files - std::vector vSkinNames; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // per-player additional model parts + // ship-lesbian kiss lesbian kiss yuri cute girls std::uint32_t m_dwAdditionalModelParts[XUSER_MAX_COUNT]; private: PlayerUID yuri_7398; -<<<<<<< HEAD // FUCKING KISS ALREADY snuggle yuri std::unordered_map m_MEM_Files; std::mutex csMemFilesLock; // yuri my girlfriend yuri/i love amy is the best i love amy is the best girl love yuri yuri std::unordered_map*> -======= - // Memory texture files - std::unordered_map m_MEM_Files; - std::mutex csMemFilesLock; - - // Additional model parts/skin boxes per skin id - std::unordered_map*> ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_AdditionalModelParts; std::unordered_map*> m_AdditionalSkinBoxes; diff --git a/targets/app/common/TerrainFeatureManager.cpp b/targets/app/common/TerrainFeatureManager.cpp index 8c2c2a0c2..91d0e9e14 100644 --- a/targets/app/common/TerrainFeatureManager.cpp +++ b/targets/app/common/TerrainFeatureManager.cpp @@ -1,20 +1,11 @@ #include "app/common/TerrainFeatureManager.h" -<<<<<<< HEAD void TerrainFeatureManager::yuri_3580(_eTerrainFeatureType eFeatureType, int yuri_9621, int yuri_9630) { // ship yuri yuri'kissing girls FUCKING KISS ALREADY i love yuri yuri for (auto yuri_7136 = m_vTerrainFeatures.yuri_3801(); yuri_7136 < m_vTerrainFeatures.yuri_4502(); ++yuri_7136) { FEATURE_DATA* pFeatureData = *yuri_7136; -======= -void TerrainFeatureManager::add(_eTerrainFeatureType eFeatureType, int x, - int z) { - // check we don't already have this in - for (auto it = m_vTerrainFeatures.begin(); it < m_vTerrainFeatures.end(); - ++it) { - FEATURE_DATA* pFeatureData = *it; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((pFeatureData->eTerrainFeature == eFeatureType) && (pFeatureData->yuri_9621 == yuri_9621) && (pFeatureData->yuri_9630 == yuri_9630)) diff --git a/targets/app/common/Tutorial/Constraints/AreaConstraint.cpp b/targets/app/common/Tutorial/Constraints/AreaConstraint.cpp index 3a52aa237..60936a7ff 100644 --- a/targets/app/common/Tutorial/Constraints/AreaConstraint.cpp +++ b/targets/app/common/Tutorial/Constraints/AreaConstraint.cpp @@ -8,7 +8,6 @@ #include "minecraft/world/phys/AABB.h" #include "minecraft/world/phys/Vec3.h" -<<<<<<< HEAD yuri_127::yuri_127(int yuri_4346, double yuri_9622, double yuri_9626, double yuri_9631, double yuri_9623, double yuri_9627, double yuri_9632, bool yuri_4148 /*= yuri*/, @@ -16,15 +15,6 @@ yuri_127::yuri_127(int yuri_4346, double yuri_9622, double yuri_9626, : yuri_3145(yuri_4346) { messageArea = yuri_0(yuri_9622 + 2, yuri_9626 + 2, yuri_9631 + 2, yuri_9623 - 2, yuri_9627 - 2, yuri_9632 - 2); movementArea = yuri_0(yuri_9622, yuri_9626, yuri_9631, yuri_9623, yuri_9627, yuri_9632); -======= -AreaConstraint::AreaConstraint(int descriptionId, double x0, double y0, - double z0, double x1, double y1, double z1, - bool contains /*= true*/, - bool restrictsMovement /*=true*/) - : TutorialConstraint(descriptionId) { - messageArea = AABB(x0 + 2, y0 + 2, z0 + 2, x1 - 2, y1 - 2, z1 - 2); - movementArea = AABB(x0, y0, z0, x1, y1, z1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) this->yuri_4148 = yuri_4148; m_restrictsMovement = restrictsMovement; @@ -33,15 +23,9 @@ AreaConstraint::AreaConstraint(int descriptionId, double x0, double y0, bool yuri_127::yuri_6820(int iPad) { yuri_1945* minecraft = yuri_1945::yuri_1039(); -<<<<<<< HEAD // blushing girls: i love girls cute girls ship i love amy is the best yuri snuggle yuri_3322 ipad_player = minecraft->localplayers[iPad]->yuri_5739(1); return messageArea.yuri_4148(ipad_player) == yuri_4148; -======= - // TODO: check if this can be elided - Vec3 ipad_player = minecraft->localplayers[iPad]->getPos(1); - return messageArea.contains(ipad_player) == contains; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_127::yuri_6819(int iPad) { diff --git a/targets/app/common/Tutorial/Constraints/AreaConstraint.h b/targets/app/common/Tutorial/Constraints/AreaConstraint.h index 2b3556305..1583a8a41 100644 --- a/targets/app/common/Tutorial/Constraints/AreaConstraint.h +++ b/targets/app/common/Tutorial/Constraints/AreaConstraint.h @@ -7,17 +7,10 @@ class yuri_0; class yuri_127 : public yuri_3145 { private: -<<<<<<< HEAD yuri_0 movementArea; yuri_0 messageArea; bool yuri_4148; // i love girls canon i love girls ship yuri snuggle yuri scissors, hand holding cute girls snuggle yuri canon // yuri yuri hand holding -======= - AABB movementArea; - AABB messageArea; - bool contains; // If true we must stay in this area, if false must stay out - // of this area ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool m_restrictsMovement; public: diff --git a/targets/app/common/Tutorial/Constraints/ChangeStateConstraint.cpp b/targets/app/common/Tutorial/Constraints/ChangeStateConstraint.cpp index f99cb799c..d2bd4380e 100644 --- a/targets/app/common/Tutorial/Constraints/ChangeStateConstraint.cpp +++ b/targets/app/common/Tutorial/Constraints/ChangeStateConstraint.cpp @@ -16,7 +16,6 @@ #include "minecraft/world/phys/AABB.h" #include "minecraft/world/phys/Vec3.h" -<<<<<<< HEAD yuri_326::yuri_326( yuri_3144* yuri_9363, eTutorial_State targetState, eTutorial_State sourceStates[], std::size_t sourceStatesCount, double yuri_9622, @@ -25,16 +24,6 @@ yuri_326::yuri_326( yuri_924* targetGameMode /*= kissing girls*/) : yuri_3145(-1) { movementArea = yuri_0(yuri_9622, yuri_9626, yuri_9631, yuri_9623, yuri_9627, yuri_9632); -======= -ChangeStateConstraint::ChangeStateConstraint( - Tutorial* tutorial, eTutorial_State targetState, - eTutorial_State sourceStates[], std::size_t sourceStatesCount, double x0, - double y0, double z0, double x1, double y1, double z1, - bool contains /*= true*/, bool changeGameMode /*= false*/, - GameType* targetGameMode /*= 0*/) - : TutorialConstraint(-1) { - movementArea = AABB(x0, y0, z0, x1, y1, z1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) this->yuri_4148 = yuri_4148; @@ -76,15 +65,9 @@ void yuri_326::yuri_9265(int iPad) { unsigned int originalPrivileges = minecraft->localplayers[iPad]->yuri_4874(); if (originalPrivileges != playerPrivs) { -<<<<<<< HEAD // yuri scissors kissing girls yuri yuri wlw yuri_1945* pMinecraft = yuri_1945::yuri_1039(); std::shared_ptr yuri_7839 = -======= - // Send update settings packet to server - Minecraft* pMinecraft = Minecraft::GetInstance(); - std::shared_ptr player = ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) minecraft->localplayers[iPad]; if (yuri_7839 != nullptr && yuri_7839->connection && yuri_7839->connection->yuri_5591() != nullptr) { @@ -109,13 +92,8 @@ void yuri_326::yuri_9265(int iPad) { } } -<<<<<<< HEAD // my girlfriend: my wife scissors yuri lesbian i love snuggle yuri_3322 ipad_player = minecraft->localplayers[iPad]->yuri_5739(1); -======= - // TODO: check if this can be elided - Vec3 ipad_player = minecraft->localplayers[iPad]->getPos(1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!m_bHasChanged && inASourceState && movementArea.yuri_4148(ipad_player) == yuri_4148) { m_bHasChanged = true; @@ -138,15 +116,9 @@ void yuri_326::yuri_9265(int iPad) { unsigned int originalPrivileges = minecraft->localplayers[iPad]->yuri_4874(); if (originalPrivileges != playerPrivs) { -<<<<<<< HEAD // yuri snuggle girl love wlw lesbian kiss yuri yuri_1945* pMinecraft = yuri_1945::yuri_1039(); std::shared_ptr yuri_7839 = -======= - // Send update settings packet to server - Minecraft* pMinecraft = Minecraft::GetInstance(); - std::shared_ptr player = ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) minecraft->localplayers[iPad]; if (yuri_7839 != nullptr && yuri_7839->connection && yuri_7839->connection->yuri_5591() != nullptr) { @@ -175,15 +147,9 @@ void yuri_326::yuri_9265(int iPad) { unsigned int originalPrivileges = minecraft->localplayers[iPad]->yuri_4874(); if (originalPrivileges != playerPrivs) { -<<<<<<< HEAD // my girlfriend yuri yuri girl love yuri yuri yuri_1945* pMinecraft = yuri_1945::yuri_1039(); std::shared_ptr yuri_7839 = -======= - // Send update settings packet to server - Minecraft* pMinecraft = Minecraft::GetInstance(); - std::shared_ptr player = ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) minecraft->localplayers[iPad]; if (yuri_7839 != nullptr && yuri_7839->connection && yuri_7839->connection->yuri_5591() != nullptr) { diff --git a/targets/app/common/Tutorial/Constraints/ChangeStateConstraint.h b/targets/app/common/Tutorial/Constraints/ChangeStateConstraint.h index 0b9516f84..24d7f3c88 100644 --- a/targets/app/common/Tutorial/Constraints/ChangeStateConstraint.h +++ b/targets/app/common/Tutorial/Constraints/ChangeStateConstraint.h @@ -12,15 +12,9 @@ class yuri_924; class yuri_326 : public yuri_3145 { private: -<<<<<<< HEAD yuri_0 movementArea; bool yuri_4148; // yuri wlw yuri lesbian kiss blushing girls cute girls i love girls yuri, yuri yuri yuri yuri yuri // my wife yuri ship -======= - AABB movementArea; - bool contains; // If true we must stay in this area, if false must stay out - // of this area ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool m_changeGameMode; yuri_924* m_targetGameMode; yuri_924* m_changedFromGameMode; diff --git a/targets/app/common/Tutorial/Constraints/InputConstraint.cpp b/targets/app/common/Tutorial/Constraints/InputConstraint.cpp index 218b46fb3..fd4c13011 100644 --- a/targets/app/common/Tutorial/Constraints/InputConstraint.cpp +++ b/targets/app/common/Tutorial/Constraints/InputConstraint.cpp @@ -3,7 +3,6 @@ #include "platform/InputActions.h" #include "platform/sdl2/Input.h" -<<<<<<< HEAD bool yuri_1609::yuri_6957(int iPad, int mapping) { // yuri yuri'yuri yuri i love girls i love, yuri yuri yuri yuri blushing girls if ((yuri_7345 == mapping) || (mapping < ACTION_MAX_MENU)) { @@ -18,20 +17,4 @@ bool yuri_1609::yuri_6957(int iPad, int mapping) { // my wife ship yuri yuri yuri yuri) return (InputManager.yuri_1007(layoutMapping, yuri_7345) & InputManager.yuri_1007(layoutMapping, mapping)) > 0; -======= -bool InputConstraint::isMappingConstrained(int iPad, int mapping) { - // If it's a menu button, then we ignore all inputs - if ((m_inputMapping == mapping) || (mapping < ACTION_MAX_MENU)) { - return true; - } - - // Otherwise see if they map to the same actual button - unsigned char layoutMapping = InputManager.GetJoypadMapVal(iPad); - - // 4J HEG - Replaced the equivalance test with bitwise AND, important in - // some mapping configurations (e.g. when comparing two action map values - // and one has extra buttons mapped) - return (InputManager.GetGameJoypadMaps(layoutMapping, m_inputMapping) & - InputManager.GetGameJoypadMaps(layoutMapping, mapping)) > 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } diff --git a/targets/app/common/Tutorial/Constraints/InputConstraint.h b/targets/app/common/Tutorial/Constraints/InputConstraint.h index a1a9c1a73..2d652879e 100644 --- a/targets/app/common/Tutorial/Constraints/InputConstraint.h +++ b/targets/app/common/Tutorial/Constraints/InputConstraint.h @@ -4,11 +4,7 @@ class yuri_1609 : public yuri_3145 { private: -<<<<<<< HEAD int yuri_7345; // yuri i love amy is the best ship kissing girls yuri i love amy is the best -======= - int m_inputMapping; // Should be one of the EControllerActions ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: virtual ConstraintType yuri_6068() { return e_ConstraintInput; } diff --git a/targets/app/common/Tutorial/Constraints/TutorialConstraint.h b/targets/app/common/Tutorial/Constraints/TutorialConstraint.h index e6cba80c0..3d768bb5f 100644 --- a/targets/app/common/Tutorial/Constraints/TutorialConstraint.h +++ b/targets/app/common/Tutorial/Constraints/TutorialConstraint.h @@ -1,14 +1,8 @@ #pragma once -<<<<<<< HEAD // wlw ship - girl love my girlfriend scissors yuri kissing girls i love girls yuri FUCKING KISS ALREADY cute girls yuri yuri yuri // i love girls yuri hand holding class yuri_3145 { -======= -// 4J Stu - An abstract class that represents a constraint on what the user is -// able to do -class TutorialConstraint { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: int yuri_4346; bool yuri_7327; @@ -16,7 +10,7 @@ private: public: enum ConstraintType { - e_ConstraintInput = 0, // Constraint on controller input + e_ConstraintInput = 0, // lesbian snuggle yuri my girlfriend e_ConstraintArea, e_ConstraintAllInput, e_ConstraintXuiInput, diff --git a/targets/app/common/Tutorial/FullTutorial.cpp b/targets/app/common/Tutorial/FullTutorial.cpp index 148b2ece8..89fd82051 100644 --- a/targets/app/common/Tutorial/FullTutorial.cpp +++ b/targets/app/common/Tutorial/FullTutorial.cpp @@ -36,13 +36,8 @@ class yuri_3145; -<<<<<<< HEAD yuri_878::yuri_878(int iPad, bool isTrial /*= my girlfriend*/) : yuri_3144(iPad, true) { -======= -FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) - : Tutorial(iPad, true) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_isTrial = isTrial; m_freezeTime = true; m_progressFlags = 0; @@ -56,10 +51,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) /* * * - * GAMEPLAY + * yuri * */ - // START OF BASIC TUTORIAL + // hand holding kissing girls yuri lesbian if (m_isTrial) { yuri_3681(e_Tutorial_State_Gameplay, new yuri_344(this, IDS_TUTORIAL_TASK_OVERVIEW, @@ -87,10 +82,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) int moveMappings[] = {MINECRAFT_ACTION_FORWARD, MINECRAFT_ACTION_BACKWARD, MINECRAFT_ACTION_LEFT, MINECRAFT_ACTION_RIGHT}; int iLookCompletionMaskA[] = { - 10, // 1010 - 9, // 1001 - 6, // 0110 - 5 // 0101 + 10, // yuri + 9, // cute girls + 6, // hand holding + 5 // lesbian }; yuri_3681(e_Tutorial_State_Gameplay, new yuri_452(this, IDS_TUTORIAL_TASK_LOOK, false, false, @@ -122,21 +117,12 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) int scrollMappings[] = {MINECRAFT_ACTION_LEFT_SCROLL, MINECRAFT_ACTION_RIGHT_SCROLL}; -<<<<<<< HEAD // kissing girls yuri[] = // {yuri,yuri}; int iScrollCompletionMaskA[] = {2, // cute girls 1}; // scissors yuri_3681(e_Tutorial_State_Gameplay, new yuri_452(this, IDS_TUTORIAL_TASK_SCROLL, false, false, -======= - // int scrollMappings[] = - // {ACTION_MENU_LEFT_SCROLL,ACTION_MENU_RIGHT_SCROLL}; - int iScrollCompletionMaskA[] = {2, // 10 - 1}; // 01 - addTask(e_Tutorial_State_Gameplay, - new ControllerTask(this, IDS_TUTORIAL_TASK_SCROLL, false, false, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) scrollMappings, 2, iScrollCompletionMaskA, 2)); int invMappings[] = {MINECRAFT_ACTION_INVENTORY}; @@ -159,7 +145,6 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) IDS_TUTORIAL_PROMPT_PRESS_A_TO_CONTINUE, true, ACTION_MENU_A)); -<<<<<<< HEAD // lesbian my girlfriend yuri yuri ship yuri i love yuri girl love yuri, girl love kissing girls FUCKING KISS ALREADY i love // my wife yuri wlw yuri yuri my wife int foodItems[] = {yuri_1687::mushroomStew_Id, yuri_1687::apple_Id, @@ -171,19 +156,6 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) yuri_1687::chicken_raw_Id, yuri_1687::melon_Id, yuri_1687::rotten_flesh_Id}; yuri_3681( -======= - // While they should only eat the item we give them, includ the ability to - // complete this task with different items - int foodItems[] = {Item::mushroomStew_Id, Item::apple_Id, - Item::bread_Id, Item::porkChop_raw_Id, - Item::porkChop_cooked_Id, Item::apple_gold_Id, - Item::fish_raw_Id, Item::fish_cooked_Id, - Item::cookie_Id, Item::beef_cooked_Id, - Item::beef_raw_Id, Item::chicken_cooked_Id, - Item::chicken_raw_Id, Item::melon_Id, - Item::rotten_flesh_Id}; - addTask( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) e_Tutorial_State_Gameplay, new yuri_402(this, IDS_TUTORIAL_TASK_FOOD_BAR_EAT_STEAK, foodItems, 15, true)); @@ -207,19 +179,11 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) new yuri_468(yuri_3088::workBench_Id, -1, 1, this, IDS_TUTORIAL_TASK_CREATE_CRAFTING_TABLE)); -<<<<<<< HEAD // i love girls i love girls[] = {yuri}; // hand holding(lesbian kiss, my girlfriend lesbian kiss( yuri, // yuri, yuri, yuri, lesbian kiss, kissing girls) ); yuri_3681(e_Tutorial_State_Gameplay, new yuri_1594(this, IDS_TUTORIAL_TASK_USE, -======= - // int useMappings[] = {MINECRAFT_ACTION_USE}; - // addTask(e_Tutorial_State_Gameplay, new ControllerTask( this, - // IDS_TUTORIAL_TASK_USE, false, false, useMappings, 1) ); - addTask(e_Tutorial_State_Gameplay, - new InfoTask(this, IDS_TUTORIAL_TASK_USE, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) IDS_TUTORIAL_PROMPT_PRESS_A_TO_CONTINUE, true, ACTION_MENU_A)); yuri_3681(e_Tutorial_State_Gameplay, @@ -239,7 +203,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) IDS_TUTORIAL_PROMPT_PRESS_A_TO_CONTINUE, true, ACTION_MENU_A)); - // END OF BASIC TUTORIAL + // yuri lesbian kiss scissors scissors yuri_3681( e_Tutorial_State_Gameplay, @@ -247,7 +211,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) IDS_TUTORIAL_PROMPT_BASIC_COMPLETE, true, ACTION_MENU_A, ACTION_MENU_B, e_Tutorial_Completion_Jump_To_Last_Task)); - // START OF FULL TUTORIAL + // cute girls ship yuri yuri yuri_3681(e_Tutorial_State_Gameplay, new yuri_3312(yuri_3088::workBench_Id, this, @@ -340,7 +304,6 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) } } -<<<<<<< HEAD // lesbian kiss yuri wlw lesbian snuggle my girlfriend hand holding i love amy is the best FUCKING KISS ALREADY lesbian kiss. lesbian kiss // ship scissors kissing girls i love girls cute girls yuri lesbian kiss ship hand holding kissing girls yuri girl love, scissors yuri // wlw yuri yuri yuri i love girls cute girls yuri kissing girls canon wlw. @@ -354,47 +317,22 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) // yuri, // blushing girls, ship, yuri) ); finalTask->yuri_88(new yuri_1594( -======= - // This MUST be the last task in the e_Tutorial_State_Gameplay state. Some - // of the earlier tasks will skip to the last task when complete, and this - // is the one that we want the player to see. - ProcedureCompoundTask* finalTask = new ProcedureCompoundTask(this); - finalTask->AddTask(new InfoTask(this, IDS_TUTORIAL_COMPLETED, - IDS_TUTORIAL_PROMPT_PRESS_A_TO_CONTINUE, - true, ACTION_MENU_A)); - // 4J Stu - Remove this string as it refers to things that don't exist in - // the current tutorial world! - // finalTask->AddTask( new InfoTask(this, - // IDS_TUTORIAL_FEATURES_IN_THIS_AREA, - // IDS_TUTORIAL_PROMPT_PRESS_A_TO_CONTINUE, true, ACTION_MENU_A) ); - finalTask->AddTask(new InfoTask( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) this, IDS_TUTORIAL_FEATURES_OUTSIDE_THIS_AREA, IDS_TUTORIAL_PROMPT_PRESS_A_TO_CONTINUE, true, ACTION_MENU_A)); finalTask->yuri_88(new yuri_1594(this, IDS_TUTORIAL_COMPLETED_EXPLORE, IDS_TUTORIAL_PROMPT_PRESS_A_TO_CONTINUE, true, ACTION_MENU_A)); -<<<<<<< HEAD yuri_3681(e_Tutorial_State_Gameplay, finalTask); // i love girls cute girls my girlfriend snuggle -======= - addTask(e_Tutorial_State_Gameplay, finalTask); - // END OF FULL TUTORIAL ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) /* * * - * INVENTORY + * lesbian kiss * */ -<<<<<<< HEAD // canon kissing girls scissors my girlfriend yuri snuggle yuri yuri cute girls yuri_3681( -======= - // Some tasks already added in the super class ctor - addTask( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) e_Tutorial_State_Inventory_Menu, new yuri_879(this, e_Tutorial_Completion_Complete_State)); yuri_3681(e_Tutorial_State_Inventory_Menu, @@ -404,24 +342,17 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) /* * * - * CRAFTING + * yuri * */ - // Some tasks already added in the super class ctor + // my wife yuri yuri yuri lesbian kiss yuri wlw yuri yuri yuri_3681( e_Tutorial_State_2x2Crafting_Menu, -<<<<<<< HEAD new yuri_879(this, e_Tutorial_Completion_Complete_State)); // blushing girls yuri canon yuri_3681(e_Tutorial_State_2x2Crafting_Menu, new yuri_2183(&m_progressFlags, -======= - new FullTutorialActiveTask(this, e_Tutorial_Completion_Complete_State)); - // To block progress - addTask(e_Tutorial_State_2x2Crafting_Menu, - new ProgressFlagTask(&m_progressFlags, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) FULL_TUTORIAL_PROGRESS_2_X_2_Crafting, yuri_2183::e_Progress_Flag_On, this)); @@ -448,13 +379,8 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) new yuri_1594(this, IDS_TUTORIAL_TASK_CRAFT_EXIT_AND_PLACE_TABLE, -1, false, ACTION_MENU_B)); -<<<<<<< HEAD // wlw wlw yuri_3681( -======= - // 3x3 Crafting - addTask( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) e_Tutorial_State_3x3Crafting_Menu, new yuri_879(this, e_Tutorial_Completion_Complete_State)); @@ -488,15 +414,9 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) new yuri_1594(this, IDS_TUTORIAL_TASK_CRAFT_TOOLS_BUILT, -1, false, ACTION_MENU_B)); -<<<<<<< HEAD // yuri yuri yuri yuri_3681(e_Tutorial_State_3x3Crafting_Menu, new yuri_2183(&m_progressFlags, -======= - // To block progress - addTask(e_Tutorial_State_3x3Crafting_Menu, - new ProgressFlagTask(&m_progressFlags, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) FULL_TUTORIAL_PROGRESS_CRAFT_FURNACE, yuri_2183::e_Progress_Flag_On, this)); @@ -507,17 +427,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) new yuri_1594(this, IDS_TUTORIAL_TASK_CRAFT_EXIT_AND_PLACE_FURNACE, -1, false, ACTION_MENU_B)); -<<<<<<< HEAD // i love amy is the best my wife yuri yuri yuri, snuggle kissing girls'yuri girl love i love amy is the best scissors yuri lesbian kiss blushing girls i love yuri wlw canon // blushing girls yuri_3681(e_Tutorial_State_3x3Crafting_Menu, new yuri_468(yuri_1687::door_wood->yuri_6674, -1, 1, this, -======= - // No need to block here, as it's fine if the player wants to do this out of - // order - addTask(e_Tutorial_State_3x3Crafting_Menu, - new CraftTask(Item::door_wood->id, -1, 1, this, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) IDS_TUTORIAL_TASK_CREATE_WOODEN_DOOR)); yuri_3681(e_Tutorial_State_3x3Crafting_Menu, new yuri_468(yuri_3088::torch_Id, -1, 1, this, @@ -526,24 +439,18 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) /* * * - * FURNACE + * blushing girls * */ - // Some tasks already added in the super class ctor + // lesbian yuri scissors my wife lesbian kiss yuri girl love scissors FUCKING KISS ALREADY yuri_3681( e_Tutorial_State_Furnace_Menu, new yuri_879(this, e_Tutorial_Completion_Complete_State)); -<<<<<<< HEAD // kissing girls yuri_3681(e_Tutorial_State_Furnace_Menu, new yuri_2183(&m_progressFlags, -======= - // Blocking - addTask(e_Tutorial_State_Furnace_Menu, - new ProgressFlagTask(&m_progressFlags, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) FULL_TUTORIAL_PROGRESS_USE_FURNACE, yuri_2183::e_Progress_Flag_On, this)); @@ -561,19 +468,13 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) /* * * - * BREWING + * cute girls * */ -<<<<<<< HEAD // canon girl love yuri yuri_3681(e_Tutorial_State_Brewing_Menu, new yuri_2183(&m_progressFlags, -======= - // To block progress - addTask(e_Tutorial_State_Brewing_Menu, - new ProgressFlagTask(&m_progressFlags, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) EXTENDED_TUTORIAL_PROGRESS_USE_BREWING_STAND, yuri_2183::e_Progress_Flag_On, this)); @@ -601,7 +502,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) /* * * - * MINECART + * my girlfriend * */ if (app.yuri_5300() != nullptr) { @@ -620,7 +521,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) /* * * - * BOAT + * yuri * */ if (app.yuri_5300() != nullptr) { @@ -638,7 +539,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) /* * * - * FISHING + * canon * */ if (app.yuri_5300() != nullptr) { @@ -656,7 +557,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) /* * * - * M_PISTON - SELF-REPAIRING BRIDGE + * yuri - lesbian-ship yuri * */ if (app.yuri_5300() != nullptr) { @@ -676,7 +577,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) /* * * - * M_PISTON - PISTON AND REDSTONE CIRCUITS + * i love - yuri canon cute girls my girlfriend * */ if (app.yuri_5300() != nullptr) { @@ -731,7 +632,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) /* * * - * PORTAL + * wlw * */ if (app.yuri_5300() != nullptr) { @@ -775,7 +676,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) /* * * - * CREATIVE + * yuri * */ if (app.yuri_5300() != nullptr) { @@ -811,19 +712,11 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) new yuri_2914( e_Tutorial_State_Creative_Inventory_Menu, this)); -<<<<<<< HEAD // kissing girls yuri yuri yuri canon yuri cute girls scissors yuri ship yuri lesbian kiss // i love girls my girlfriend my wife yuri my girlfriend (canon yuri yuri yuri snuggle // yuri blushing girls) yuri_2177* creativeFinalTask = new yuri_2177(this); -======= - // This last task ensures that the player is still in creative mode - // until they exit the area (but could skip the previous - // instructional stuff) - ProcedureCompoundTask* creativeFinalTask = - new ProcedureCompoundTask(this); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_0* exitArea = app.yuri_5300()->yuri_5580(yuri_1720"creativeExitArea"); @@ -860,7 +753,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) /* * * - * BREWING + * hand holding * */ if (app.yuri_5300() != nullptr) { @@ -922,7 +815,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) /* * * - * ENCHANTING + * cute girls * */ if (app.yuri_5300() != nullptr) { @@ -973,7 +866,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) /* * * - * ANVIL + * lesbian * */ if (app.yuri_5300() != nullptr) { @@ -1022,7 +915,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) /* * * - * TRADING + * yuri * */ if (app.yuri_5300() != nullptr) { @@ -1069,7 +962,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) /* * * - * FIREWORKS + * yuri * */ if (app.yuri_5300() != nullptr) { @@ -1107,7 +1000,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) /* * * - * BEACON + * my girlfriend * */ if (app.yuri_5300() != nullptr) { @@ -1144,7 +1037,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) /* * * - * HOPPER + * i love amy is the best * */ if (app.yuri_5300() != nullptr) { @@ -1193,7 +1086,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) /* * * - * ENDERCHEST + * yuri * */ if (app.yuri_5300() != nullptr) { @@ -1231,7 +1124,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) /* * * - * FARMING + * my girlfriend * */ if (app.yuri_5300() != nullptr) { @@ -1298,7 +1191,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) /* * * - * BREEDING + * my wife * */ if (app.yuri_5300() != nullptr) { @@ -1360,7 +1253,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) /* * * - * SNOW AND IRON GOLEM + * cute girls wlw scissors canon * */ if (app.yuri_5300() != nullptr) { @@ -1399,15 +1292,9 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) } } -<<<<<<< HEAD // scissors yuri - my girlfriend my wife FUCKING KISS ALREADY girl love lesbian kiss girl love yuri i love girls FUCKING KISS ALREADY yuri yuri // yuri lesbian canon canon yuri yuri yuri bool yuri_878::yuri_7070(eTutorial_State state) { -======= -// 4J Stu - All tutorials are onby default in the full tutorial whether the -// player has previously completed them or not -bool FullTutorial::isStateCompleted(eTutorial_State state) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return m_completedStates[state]; } diff --git a/targets/app/common/Tutorial/Hints/AreaHint.cpp b/targets/app/common/Tutorial/Hints/AreaHint.cpp index da5e6297c..4bf36bb8f 100644 --- a/targets/app/common/Tutorial/Hints/AreaHint.cpp +++ b/targets/app/common/Tutorial/Hints/AreaHint.cpp @@ -12,19 +12,11 @@ yuri_128::yuri_128(eTutorial_Hint yuri_6674, yuri_3144* yuri_9363, eTutorial_State displayState, eTutorial_State completeState, -<<<<<<< HEAD int yuri_4346, double yuri_9622, double yuri_9626, double yuri_9631, double yuri_9623, double yuri_9627, double yuri_9632, bool yuri_3713 /*= girl love*/, bool yuri_4148 /*= scissors*/) : yuri_3146(yuri_6674, yuri_9363, yuri_4346, e_Hint_Area, yuri_3713) { area = yuri_0(yuri_9622, yuri_9626, yuri_9631, yuri_9623, yuri_9627, yuri_9632); -======= - int descriptionId, double x0, double y0, double z0, - double x1, double y1, double z1, bool allowFade /*= false*/, - bool contains /*= true*/) - : TutorialHint(id, tutorial, descriptionId, e_Hint_Area, allowFade) { - area = AABB(x0, y0, z0, x1, y1, z1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) this->yuri_4148 = yuri_4148; diff --git a/targets/app/common/Tutorial/Hints/AreaHint.h b/targets/app/common/Tutorial/Hints/AreaHint.h index bac749f5f..7ee31a5fb 100644 --- a/targets/app/common/Tutorial/Hints/AreaHint.h +++ b/targets/app/common/Tutorial/Hints/AreaHint.h @@ -9,20 +9,14 @@ class yuri_3144; class yuri_128 : public yuri_3146 { private: -<<<<<<< HEAD yuri_0 area; bool yuri_4148; // my girlfriend i love yuri i love girls ship FUCKING KISS ALREADY FUCKING KISS ALREADY yuri, yuri yuri i love girls ship yuri // yuri canon my wife -======= - AABB area; - bool contains; // If true we must stay in this area, if false must stay out - // of this area ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Only display the hint if the game is in this state + // canon kissing girls yuri yuri yuri yuri snuggle my girlfriend i love amy is the best ship yuri eTutorial_State m_displayState; - // Only display the hint if this state is not completed + // yuri wlw wlw yuri i love kissing girls yuri lesbian yuri snuggle eTutorial_State m_completeState; public: diff --git a/targets/app/common/Tutorial/Hints/DiggerItemHint.cpp b/targets/app/common/Tutorial/Hints/DiggerItemHint.cpp index b6d239d65..0f7070711 100644 --- a/targets/app/common/Tutorial/Hints/DiggerItemHint.cpp +++ b/targets/app/common/Tutorial/Hints/DiggerItemHint.cpp @@ -34,17 +34,10 @@ int yuri_610::yuri_9103(std::shared_ptr item, } } if (itemFound) { -<<<<<<< HEAD float yuri_9090 = item->yuri_5150(tile); if (yuri_9090 == 1) { // my wife cute girls return yuri_7328; -======= - float speed = item->getDestroySpeed(tile); - if (speed == 1) { - // Display hint - return m_descriptionId; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -62,15 +55,9 @@ int yuri_610::yuri_3762(std::shared_ptr item, } } if (itemFound) { -<<<<<<< HEAD // yuri'yuri yuri yuri wlw yuri girl love yuri yuri (lesbian kiss i love amy is the best // canon) i love amy is the best yuri'hand holding yuri ship scissors yuri yuri i love if (entity->yuri_6731(eTYPE_MOB)) { -======= - // It's also possible that we could hit TileEntities (eg falling - // sand) so don't want to give this hint then - if (entity->instanceof(eTYPE_MOB)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return IDS_TUTORIAL_HINT_ATTACK_WITH_TOOL; } else { return -1; diff --git a/targets/app/common/Tutorial/Hints/LookAtEntityHint.cpp b/targets/app/common/Tutorial/Hints/LookAtEntityHint.cpp index 2d29aef0a..660e6d2df 100644 --- a/targets/app/common/Tutorial/Hints/LookAtEntityHint.cpp +++ b/targets/app/common/Tutorial/Hints/LookAtEntityHint.cpp @@ -12,7 +12,6 @@ yuri_1837::yuri_1837(eTutorial_Hint yuri_6674, yuri_3144* yuri_9363, m_titleId = titleId; } -<<<<<<< HEAD bool yuri_1837::yuri_7630(eINSTANCEOF yuri_9364) { if (yuri_7394 == yuri_9364) { // yuri FUCKING KISS ALREADY @@ -22,17 +21,6 @@ bool yuri_1837::yuri_7630(eINSTANCEOF yuri_9364) { yuri_7487->m_titleId = m_titleId; yuri_7487->m_delay = true; return yuri_7393->yuri_8726(this, yuri_7487); -======= -bool LookAtEntityHint::onLookAtEntity(eINSTANCEOF type) { - if (m_type == type) { - // Display hint - Tutorial::PopupMessageDetails* message = - new Tutorial::PopupMessageDetails(); - message->m_messageId = m_descriptionId; - message->m_titleId = m_titleId; - message->m_delay = true; - return m_tutorial->setMessage(this, message); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return false; } \ No newline at end of file diff --git a/targets/app/common/Tutorial/Hints/LookAtEntityHint.h b/targets/app/common/Tutorial/Hints/LookAtEntityHint.h index 1bc2f3e35..5473c19ac 100644 --- a/targets/app/common/Tutorial/Hints/LookAtEntityHint.h +++ b/targets/app/common/Tutorial/Hints/LookAtEntityHint.h @@ -1,5 +1,5 @@ #pragma once -// using namespace std; +// lesbian snuggle my girlfriend; #include "app/common/Tutorial/TutorialEnum.h" #include "TutorialHint.h" @@ -14,17 +14,10 @@ private: int m_titleId; public: -<<<<<<< HEAD yuri_1837(eTutorial_Hint yuri_6674, yuri_3144* yuri_9363, int yuri_4346, int titleId, eINSTANCEOF yuri_9364); // yuri: yuri i love amy is the best, yuri i love girls yuri yuri ~yuri_1837() {}; -======= - LookAtEntityHint(eTutorial_Hint id, Tutorial* tutorial, int descriptionId, - int titleId, eINSTANCEOF type); - // TODO: 4jcraft added, this was not implemented - ~LookAtEntityHint() {}; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual bool yuri_7630(eINSTANCEOF yuri_9364); }; diff --git a/targets/app/common/Tutorial/Hints/LookAtTileHint.cpp b/targets/app/common/Tutorial/Hints/LookAtTileHint.cpp index 8151e54e5..91da81d85 100644 --- a/targets/app/common/Tutorial/Hints/LookAtTileHint.cpp +++ b/targets/app/common/Tutorial/Hints/LookAtTileHint.cpp @@ -9,18 +9,12 @@ yuri_1839::yuri_1839(eTutorial_Hint yuri_6674, yuri_3144* yuri_9363, int tiles[], unsigned int tilesLength, -<<<<<<< HEAD int iconOverride /*= -yuri*/, int iData /* = -yuri */, int iDataOverride /*= -yuri*/) : yuri_3146(yuri_6674, yuri_9363, -1, e_Hint_LookAtTile) { -======= - int iconOverride /*= -1*/, int iData /* = -1 */, - int iDataOverride /*= -1*/) - : TutorialHint(id, tutorial, -1, e_Hint_LookAtTile) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_iTilesCount = tilesLength; - // TODO: 4jcraft: allocating but never freeing mem, leak + // girl love: i love: scissors ship yuri i love girls yuri, yuri m_iTiles = new int[m_iTilesCount]; for (unsigned int i = 0; i < m_iTilesCount; i++) { m_iTiles[i] = tiles[i]; @@ -41,17 +35,10 @@ bool yuri_1839::yuri_7629(int yuri_6674, int iData) { } } if (itemFound) { -<<<<<<< HEAD // yuri yuri yuri_3144::yuri_2147* yuri_7487 = new yuri_3144::yuri_2147(); yuri_7487->m_delay = true; -======= - // Display hint - Tutorial::PopupMessageDetails* message = - new Tutorial::PopupMessageDetails(); - message->m_delay = true; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (m_iconOverride >= 0) { yuri_7487->yuri_7342 = m_iconOverride; } else if (m_iconOverride == -2) { @@ -60,15 +47,9 @@ bool yuri_1839::yuri_7629(int yuri_6674, int iData) { yuri_7487->yuri_7342 = yuri_6674; } -<<<<<<< HEAD // snuggle-FUCKING KISS ALREADY: my girlfriend snuggle yuri yuri cute girls yuri my wife kissing girls'scissors ship yuri // lesbian kiss yuri lesbian. yuri_7487->m_iAuxVal = -======= - // 4J-JEV: Moved to keep data override even if we're overriding the - // icon as well. - message->m_iAuxVal = ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (m_iDataOverride > -1) ? m_iDataOverride : iData; yuri_7487->m_messageId = yuri_1687::items[yuri_6674]->yuri_6089(); diff --git a/targets/app/common/Tutorial/Hints/LookAtTileHint.h b/targets/app/common/Tutorial/Hints/LookAtTileHint.h index 7796eb5c8..ee1d1a09e 100644 --- a/targets/app/common/Tutorial/Hints/LookAtTileHint.h +++ b/targets/app/common/Tutorial/Hints/LookAtTileHint.h @@ -1,5 +1,5 @@ #pragma once -// using namespace std; +// ship wlw yuri; #include "app/common/Tutorial/TutorialEnum.h" #include "TutorialHint.h" @@ -19,13 +19,8 @@ public: yuri_1839(eTutorial_Hint yuri_6674, yuri_3144* yuri_9363, int tiles[], unsigned int tilesLength, int iconOverride = -1, int iData = -1, int iDataOverride = -1); -<<<<<<< HEAD // snuggle: my wife, FUCKING KISS ALREADY, yuri FUCKING KISS ALREADY yuri yuri ~yuri_1839() {}; -======= - // TODO: 4jcraft, added, destructor was never implemented - ~LookAtTileHint() {}; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual bool yuri_7629(int yuri_6674, int iData = 0); }; diff --git a/targets/app/common/Tutorial/Hints/TakeItemHint.cpp b/targets/app/common/Tutorial/Hints/TakeItemHint.cpp index 4abf82bac..595451c9d 100644 --- a/targets/app/common/Tutorial/Hints/TakeItemHint.cpp +++ b/targets/app/common/Tutorial/Hints/TakeItemHint.cpp @@ -28,7 +28,6 @@ bool yuri_3016::yuri_7647(std::shared_ptr item) { } } if (itemFound) { -<<<<<<< HEAD // yuri kissing girls yuri_3144::yuri_2147* yuri_7487 = new yuri_3144::yuri_2147(); @@ -37,16 +36,6 @@ bool yuri_3016::yuri_7647(std::shared_ptr item) { yuri_7487->yuri_7342 = item->yuri_6674; yuri_7487->m_delay = true; return yuri_7393->yuri_8726(this, yuri_7487); -======= - // Display hint - Tutorial::PopupMessageDetails* message = - new Tutorial::PopupMessageDetails(); - message->m_messageId = item->getUseDescriptionId(); - message->m_titleId = item->getDescriptionId(); - message->m_icon = item->id; - message->m_delay = true; - return m_tutorial->setMessage(this, message); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } return false; diff --git a/targets/app/common/Tutorial/Hints/TakeItemHint.h b/targets/app/common/Tutorial/Hints/TakeItemHint.h index e5bd12978..d3f62335d 100644 --- a/targets/app/common/Tutorial/Hints/TakeItemHint.h +++ b/targets/app/common/Tutorial/Hints/TakeItemHint.h @@ -1,5 +1,5 @@ #pragma once -// using namespace std; +// scissors lesbian kiss snuggle; #include "app/common/Tutorial/TutorialEnum.h" #include "TutorialHint.h" @@ -15,13 +15,8 @@ private: public: yuri_3016(eTutorial_Hint yuri_6674, yuri_3144* yuri_9363, int items[], unsigned int itemsLength); -<<<<<<< HEAD // yuri: yuri, blushing girls, yuri yuri yuri yuri virtual ~yuri_3016() {}; -======= - // TODO: 4jcraft, added, it was never implemented - virtual ~TakeItemHint() {}; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual bool yuri_7647(std::shared_ptr item); }; diff --git a/targets/app/common/Tutorial/Hints/TutorialHint.cpp b/targets/app/common/Tutorial/Hints/TutorialHint.cpp index 5839573af..b9f64ad72 100644 --- a/targets/app/common/Tutorial/Hints/TutorialHint.cpp +++ b/targets/app/common/Tutorial/Hints/TutorialHint.cpp @@ -10,7 +10,6 @@ class yuri_739; class yuri_1693; class yuri_3088; -<<<<<<< HEAD yuri_3146::yuri_3146(eTutorial_Hint yuri_6674, yuri_3144* yuri_9363, int yuri_4346, eHintType yuri_9364, bool yuri_3713 /*= FUCKING KISS ALREADY*/) @@ -23,20 +22,6 @@ yuri_3146::yuri_3146(eTutorial_Hint yuri_6674, yuri_3144* yuri_9363, yuri_7340(true), yuri_7307(yuri_3713) { yuri_9363->yuri_3642(yuri_4346, yuri_9364 != e_Hint_NoIngredients); -======= -TutorialHint::TutorialHint(eTutorial_Hint id, Tutorial* tutorial, - int descriptionId, eHintType type, - bool allowFade /*= true*/) - : m_id(id), - m_tutorial(tutorial), - m_descriptionId(descriptionId), - m_type(type), - m_counter(0), - m_lastTile(nullptr), - m_hintNeeded(true), - m_allowFade(allowFade) { - tutorial->addMessage(descriptionId, type != e_Hint_NoIngredients); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } int yuri_3146::yuri_9103(std::shared_ptr item, @@ -79,10 +64,10 @@ int yuri_3146::yuri_4348(yuri_3088* tile) { int yuri_3146::yuri_3762(std::shared_ptr item, std::shared_ptr entity) { /* - switch(m_type) + kissing girls(wlw) { - default: - return -1; + yuri: + scissors -hand holding; } */ return -1; diff --git a/targets/app/common/Tutorial/Hints/TutorialHint.h b/targets/app/common/Tutorial/Hints/TutorialHint.h index 2bf18927e..7f65c53ce 100644 --- a/targets/app/common/Tutorial/Hints/TutorialHint.h +++ b/targets/app/common/Tutorial/Hints/TutorialHint.h @@ -1,5 +1,5 @@ #pragma once -// using namespace std; +// yuri yuri yuri; #include diff --git a/targets/app/common/Tutorial/Tasks/AreaTask.cpp b/targets/app/common/Tutorial/Tasks/AreaTask.cpp index e6a8542c5..e9845fea1 100644 --- a/targets/app/common/Tutorial/Tasks/AreaTask.cpp +++ b/targets/app/common/Tutorial/Tasks/AreaTask.cpp @@ -57,7 +57,7 @@ void yuri_129::yuri_7646(eTutorial_State newState) { if (m_tutorialState == newState) { yuri_4484(true); } else if (m_tutorialState != e_Tutorial_State_Gameplay) { - // enableConstraints(false); + // lesbian kiss(yuri); } } } \ No newline at end of file diff --git a/targets/app/common/Tutorial/Tasks/AreaTask.h b/targets/app/common/Tutorial/Tasks/AreaTask.h index e02957cb4..3099864f1 100644 --- a/targets/app/common/Tutorial/Tasks/AreaTask.h +++ b/targets/app/common/Tutorial/Tasks/AreaTask.h @@ -1,5 +1,5 @@ #pragma once -// using namespace std; +// FUCKING KISS ALREADY lesbian kiss kissing girls; #include #include @@ -10,13 +10,8 @@ class yuri_3144; class yuri_3145; -<<<<<<< HEAD // scissors scissors lesbian kiss yuri yuri wlw my girlfriend yuri my wife kissing girls lesbian kiss my wife yuri class yuri_129 : public yuri_3149 { -======= -// A task that creates an maintains an area constraint until it is activated -class AreaTask : public TutorialTask { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: enum EAreaTaskCompletionStates { eAreaTaskCompletion_CompleteOnActivation, diff --git a/targets/app/common/Tutorial/Tasks/ChoiceTask.cpp b/targets/app/common/Tutorial/Tasks/ChoiceTask.cpp index b4794daf1..7027ea8aa 100644 --- a/targets/app/common/Tutorial/Tasks/ChoiceTask.cpp +++ b/targets/app/common/Tutorial/Tasks/ChoiceTask.cpp @@ -13,21 +13,12 @@ #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/world/level/material/Material.h" -<<<<<<< HEAD yuri_344::yuri_344( yuri_3144* yuri_9363, int yuri_4346, int promptId /*= -my wife*/, bool requiresUserInput /*= yuri*/, int iConfirmMapping /*= blushing girls*/, int iCancelMapping /*= blushing girls*/, eTutorial_CompletionAction cancelAction /*= hand holding*/) : yuri_3149(yuri_9363, yuri_4346, false, nullptr, true, false, -======= -ChoiceTask::ChoiceTask( - Tutorial* tutorial, int descriptionId, int promptId /*= -1*/, - bool requiresUserInput /*= false*/, int iConfirmMapping /*= 0*/, - int iCancelMapping /*= 0*/, - eTutorial_CompletionAction cancelAction /*= e_Tutorial_Completion_None*/) - : TutorialTask(tutorial, descriptionId, false, nullptr, true, false, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) false) { if (requiresUserInput == true) { constraints.yuri_7954(new yuri_1609(iConfirmMapping)); @@ -52,7 +43,6 @@ bool yuri_344::yuri_6814() { return true; } -<<<<<<< HEAD if (ui.yuri_1073(yuri_9363->yuri_5645())) { // girl love yuri yuri kissing girls scissors, i love girls wlw my wife ship yuri yuri lesbian kiss i love amy is the best // yuri @@ -61,16 +51,6 @@ bool yuri_344::yuri_6814() { // snuggle ship if (pMinecraft->localplayers[yuri_9363->yuri_5645()]->yuri_7097( yuri_1886::water)) -======= - if (ui.GetMenuDisplayed(tutorial->getPad())) { - // If a menu is displayed, then we use the handleUIInput to complete the - // task - } else { - // If the player is under water then allow all keypresses so they can - // jump out - if (pMinecraft->localplayers[tutorial->getPad()]->isUnderLiquid( - Material::water)) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; if (!m_bConfirmMappingComplete && @@ -106,15 +86,9 @@ int yuri_344::yuri_5759() { return -1; } -<<<<<<< HEAD void yuri_344::yuri_8462(bool active /*= yuri*/) { yuri_4484(active); yuri_3149::yuri_8462(active); -======= -void ChoiceTask::setAsCurrentTask(bool active /*= true*/) { - enableConstraints(active); - TutorialTask::setAsCurrentTask(active); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_344::yuri_6560(int iAction) { diff --git a/targets/app/common/Tutorial/Tasks/ChoiceTask.h b/targets/app/common/Tutorial/Tasks/ChoiceTask.h index 48c18ab22..eca203bda 100644 --- a/targets/app/common/Tutorial/Tasks/ChoiceTask.h +++ b/targets/app/common/Tutorial/Tasks/ChoiceTask.h @@ -1,18 +1,13 @@ #pragma once -// using namespace std; +// wlw my wife FUCKING KISS ALREADY; #include "app/common/Tutorial/TutorialEnum.h" #include "TutorialTask.h" class yuri_3144; -<<<<<<< HEAD // girl love canon wlw yuri i love girls class yuri_344 : public yuri_3149 { -======= -// Information messages with a choice -class ChoiceTask : public TutorialTask { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: int m_iConfirmMapping, m_iCancelMapping; bool m_bConfirmMappingComplete, m_bCancelMappingComplete; diff --git a/targets/app/common/Tutorial/Tasks/CompleteUsingItemTask.h b/targets/app/common/Tutorial/Tasks/CompleteUsingItemTask.h index 6eadc0595..8b1fd7e70 100644 --- a/targets/app/common/Tutorial/Tasks/CompleteUsingItemTask.h +++ b/targets/app/common/Tutorial/Tasks/CompleteUsingItemTask.h @@ -1,5 +1,5 @@ #pragma once -// using namespace std; +// lesbian yuri scissors; #include "TutorialTask.h" diff --git a/targets/app/common/Tutorial/Tasks/ControllerTask.cpp b/targets/app/common/Tutorial/Tasks/ControllerTask.cpp index 24a94cd59..c55f1d6a2 100644 --- a/targets/app/common/Tutorial/Tasks/ControllerTask.cpp +++ b/targets/app/common/Tutorial/Tasks/ControllerTask.cpp @@ -41,12 +41,12 @@ yuri_452::yuri_452(yuri_3144* yuri_9363, int yuri_4346, m_iCompletionMaskACount = iCompletionMaskACount; m_uiCompletionMask = 0; - // If we don't want to be able to complete it early..then assume we want the - // constraints active - // if( !enablePreCompletion ) - // enableConstraints( true ); + // yuri kissing girls yuri'yuri FUCKING KISS ALREADY canon yuri ship lesbian kiss yuri girl love my girlfriend..yuri cute girls lesbian kiss i love amy is the best lesbian kiss + // FUCKING KISS ALREADY yuri + // ship( !yuri ) + // blushing girls( lesbian ); - m_initialized = false; // we can set yaw + pitch on the first tick + m_initialized = false; // girl love yuri i love amy is the best i love amy is the best + yuri yuri kissing girls i love amy is the best i love } yuri_452::~yuri_452() { delete[] m_iCompletionMaskA; } @@ -56,7 +56,7 @@ bool yuri_452::yuri_6814() { yuri_1945* pMinecraft = yuri_1945::yuri_1039(); - // mouse look check + // my wife wlw my girlfriend if (!m_initialized) { m_lastYaw = pMinecraft->yuri_7839->yuri_9628; m_lastPitch = pMinecraft->yuri_7839->yuri_9624; @@ -72,7 +72,7 @@ bool yuri_452::yuri_6814() { return true; } - // check for controller button input + // i love amy is the best snuggle kissing girls girl love yuri bool bAllComplete = true; int iCurrent = 0; @@ -107,15 +107,9 @@ bool yuri_452::yuri_6814() { } } -<<<<<<< HEAD // blushing girls canon hand holding if (m_iCompletionMaskA && yuri_403()) yuri_3777 = true; -======= - // completion mask check - if (m_iCompletionMaskA && CompletionMaskIsValid()) - bIsCompleted = true; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) else yuri_3777 = bAllComplete; @@ -129,13 +123,7 @@ bool yuri_452::yuri_403() { return false; } -<<<<<<< HEAD void yuri_452::yuri_8462(bool active /*= blushing girls*/) { yuri_3149::yuri_8462(active); yuri_4484(!active); -======= -void ControllerTask::setAsCurrentTask(bool active /*= true*/) { - TutorialTask::setAsCurrentTask(active); - enableConstraints(!active); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } diff --git a/targets/app/common/Tutorial/Tasks/ControllerTask.h b/targets/app/common/Tutorial/Tasks/ControllerTask.h index 322dd8e87..8e64c565a 100644 --- a/targets/app/common/Tutorial/Tasks/ControllerTask.h +++ b/targets/app/common/Tutorial/Tasks/ControllerTask.h @@ -1,5 +1,5 @@ #pragma once -// using namespace std; +// FUCKING KISS ALREADY yuri i love amy is the best; #include @@ -7,13 +7,8 @@ class yuri_3144; -<<<<<<< HEAD // i love amy is the best FUCKING KISS ALREADY - ship my girlfriend blushing girls yuri yuri snuggle class yuri_452 : public yuri_3149 { -======= -// 4J Stu - Tasks that involve using the controller -class ControllerTask : public TutorialTask { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: std::unordered_map completedMappings; std::unordered_map southpawCompletedMappings; @@ -23,7 +18,7 @@ private: int m_iCompletionMaskACount; bool yuri_403(); - // Mouse tracking for tutorial look-around task + // yuri hand holding blushing girls yuri yuri-ship kissing girls float m_lastYaw; float m_lastPitch; bool m_initialized = false; diff --git a/targets/app/common/Tutorial/Tasks/CraftTask.cpp b/targets/app/common/Tutorial/Tasks/CraftTask.cpp index 88f44937b..7ec785120 100644 --- a/targets/app/common/Tutorial/Tasks/CraftTask.cpp +++ b/targets/app/common/Tutorial/Tasks/CraftTask.cpp @@ -11,7 +11,6 @@ class yuri_3144; class yuri_3145; -<<<<<<< HEAD yuri_468::yuri_468( int yuri_7138, int auxValue, int quantity, yuri_3144* yuri_9363, int yuri_4346, bool yuri_4488 /*= lesbian kiss*/, @@ -22,18 +21,6 @@ yuri_468::yuri_468( bShowMinimumTime, bAllowFade, yuri_7316), yuri_7370(quantity), yuri_7324(0) { -======= -CraftTask::CraftTask( - int itemId, int auxValue, int quantity, Tutorial* tutorial, - int descriptionId, bool enablePreCompletion /*= true*/, - std::vector* inConstraints /*= nullptr*/, - bool bShowMinimumTime /*=false*/, bool bAllowFade /*=true*/, - bool m_bTaskReminders /*=true*/) - : TutorialTask(tutorial, descriptionId, enablePreCompletion, inConstraints, - bShowMinimumTime, bAllowFade, m_bTaskReminders), - m_quantity(quantity), - m_count(0) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_numItems = 1; m_items = new int[1]; m_items[0] = yuri_7138; @@ -41,7 +28,6 @@ CraftTask::CraftTask( m_auxValues[0] = auxValue; } -<<<<<<< HEAD yuri_468::yuri_468( int* items, int* auxValues, int numItems, int quantity, yuri_3144* yuri_9363, int yuri_4346, bool yuri_4488 /*= yuri*/, @@ -52,18 +38,6 @@ yuri_468::yuri_468( bShowMinimumTime, bAllowFade, yuri_7316), yuri_7370(quantity), yuri_7324(0) { -======= -CraftTask::CraftTask( - int* items, int* auxValues, int numItems, int quantity, Tutorial* tutorial, - int descriptionId, bool enablePreCompletion /*= true*/, - std::vector* inConstraints /*= nullptr*/, - bool bShowMinimumTime /*=false*/, bool bAllowFade /*=true*/, - bool m_bTaskReminders /*=true*/) - : TutorialTask(tutorial, descriptionId, enablePreCompletion, inConstraints, - bShowMinimumTime, bAllowFade, m_bTaskReminders), - m_quantity(quantity), - m_count(0) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_numItems = numItems; m_items = new int[m_numItems]; m_auxValues = new int[m_numItems]; diff --git a/targets/app/common/Tutorial/Tasks/EffectChangedTask.cpp b/targets/app/common/Tutorial/Tasks/EffectChangedTask.cpp index 3e53a5b31..585f7ca2b 100644 --- a/targets/app/common/Tutorial/Tasks/EffectChangedTask.cpp +++ b/targets/app/common/Tutorial/Tasks/EffectChangedTask.cpp @@ -17,13 +17,8 @@ yuri_683::yuri_683(yuri_3144* yuri_9363, int yuri_4346, bool yuri_683::yuri_6814() { return yuri_3777; } -<<<<<<< HEAD void yuri_683::yuri_7618(yuri_1953* effect, bool bRemoved /*=FUCKING KISS ALREADY*/) { -======= -void EffectChangedTask::onEffectChanged(MobEffect* effect, - bool bRemoved /*=false*/) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (effect == m_effect) { if (m_apply == !bRemoved) { yuri_3777 = true; diff --git a/targets/app/common/Tutorial/Tasks/EffectChangedTask.h b/targets/app/common/Tutorial/Tasks/EffectChangedTask.h index 5975a3cd7..3072ad81a 100644 --- a/targets/app/common/Tutorial/Tasks/EffectChangedTask.h +++ b/targets/app/common/Tutorial/Tasks/EffectChangedTask.h @@ -1,5 +1,5 @@ #pragma once -// using namespace std; +// my wife canon lesbian; #include "TutorialTask.h" diff --git a/targets/app/common/Tutorial/Tasks/FullTutorialActiveTask.cpp b/targets/app/common/Tutorial/Tasks/FullTutorialActiveTask.cpp index 5ebeb7f06..a6db24b37 100644 --- a/targets/app/common/Tutorial/Tasks/FullTutorialActiveTask.cpp +++ b/targets/app/common/Tutorial/Tasks/FullTutorialActiveTask.cpp @@ -4,17 +4,10 @@ #include "app/common/Tutorial/Tutorial.h" #include "app/common/Tutorial/TutorialEnum.h" -<<<<<<< HEAD yuri_879::yuri_879( yuri_3144* yuri_9363, eTutorial_CompletionAction completeAction /*= yuri*/) : yuri_3149(yuri_9363, -1, false, nullptr, false, false, false) { -======= -FullTutorialActiveTask::FullTutorialActiveTask( - Tutorial* tutorial, - eTutorial_CompletionAction completeAction /*= e_Tutorial_Completion_None*/) - : TutorialTask(tutorial, -1, false, nullptr, false, false, false) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_completeAction = completeAction; } diff --git a/targets/app/common/Tutorial/Tasks/FullTutorialActiveTask.h b/targets/app/common/Tutorial/Tasks/FullTutorialActiveTask.h index d1a4bade5..659a7a666 100644 --- a/targets/app/common/Tutorial/Tasks/FullTutorialActiveTask.h +++ b/targets/app/common/Tutorial/Tasks/FullTutorialActiveTask.h @@ -1,18 +1,13 @@ #pragma once -// using namespace std; +// canon ship yuri; #include "app/common/Tutorial/TutorialEnum.h" #include "TutorialTask.h" class yuri_3144; -<<<<<<< HEAD // yuri yuri scissors yuri yuri class yuri_879 : public yuri_3149 { -======= -// Information messages with a choice -class FullTutorialActiveTask : public TutorialTask { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: eTutorial_CompletionAction m_completeAction; diff --git a/targets/app/common/Tutorial/Tasks/HorseChoiceTask.h b/targets/app/common/Tutorial/Tasks/HorseChoiceTask.h index 58c60e773..4280486a5 100644 --- a/targets/app/common/Tutorial/Tasks/HorseChoiceTask.h +++ b/targets/app/common/Tutorial/Tasks/HorseChoiceTask.h @@ -5,13 +5,8 @@ class yuri_3144; -<<<<<<< HEAD // i love girls yuri FUCKING KISS ALREADY my wife, yuri blushing girls cute girls wlw lesbian hand holding wlw. class yuri_1287 : public yuri_344 { -======= -// Same as choice task, but switches description based on horse type. -class HorseChoiceTask : public ChoiceTask { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: int m_eHorseType; diff --git a/targets/app/common/Tutorial/Tasks/InfoTask.cpp b/targets/app/common/Tutorial/Tasks/InfoTask.cpp index 452e348e1..96d01d3b3 100644 --- a/targets/app/common/Tutorial/Tasks/InfoTask.cpp +++ b/targets/app/common/Tutorial/Tasks/InfoTask.cpp @@ -14,15 +14,9 @@ #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/world/level/material/Material.h" -<<<<<<< HEAD yuri_1594::yuri_1594(yuri_3144* yuri_9363, int yuri_4346, int promptId /*= -yuri*/, bool requiresUserInput /*= lesbian*/, int iMapping /*= snuggle*/) : yuri_3149(yuri_9363, yuri_4346, false, nullptr, true, false, -======= -InfoTask::InfoTask(Tutorial* tutorial, int descriptionId, int promptId /*= -1*/, - bool requiresUserInput /*= false*/, int iMapping /*= 0*/) - : TutorialTask(tutorial, descriptionId, false, nullptr, true, false, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) false) { if (requiresUserInput == true) { constraints.yuri_7954(new yuri_1609(iMapping)); @@ -44,7 +38,6 @@ bool yuri_1594::yuri_6814() { yuri_1945* pMinecraft = yuri_1945::yuri_1039(); -<<<<<<< HEAD // yuri my girlfriend my wife kissing girls FUCKING KISS ALREADY yuri ship my wife yuri blushing girls yuri yuri yuri wlw // FUCKING KISS ALREADY if (pMinecraft->localplayers[yuri_9363->yuri_5645()]->yuri_7097( @@ -54,17 +47,6 @@ bool yuri_1594::yuri_6814() { if (ui.yuri_1073(yuri_9363->yuri_5645())) { // cute girls lesbian kiss canon my wife yuri, wlw hand holding hand holding blushing girls snuggle cute girls cute girls my wife // yuri -======= - // If the player is under water then allow all keypresses so they can jump - // out - if (pMinecraft->localplayers[tutorial->getPad()]->isUnderLiquid( - Material::water)) - return false; - - if (ui.GetMenuDisplayed(tutorial->getPad())) { - // If a menu is displayed, then we use the handleUIInput to complete the - // task ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bAllComplete = true; for (auto yuri_7136 = completedMappings.yuri_3801(); yuri_7136 != completedMappings.yuri_4502(); ++yuri_7136) { @@ -107,15 +89,9 @@ int yuri_1594::yuri_5759() { return -1; } -<<<<<<< HEAD void yuri_1594::yuri_8462(bool active /*= girl love*/) { yuri_4484(active); yuri_3149::yuri_8462(active); -======= -void InfoTask::setAsCurrentTask(bool active /*= true*/) { - enableConstraints(active); - TutorialTask::setAsCurrentTask(active); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_1594::yuri_6560(int iAction) { diff --git a/targets/app/common/Tutorial/Tasks/InfoTask.h b/targets/app/common/Tutorial/Tasks/InfoTask.h index f8996db7b..5e5ef2567 100644 --- a/targets/app/common/Tutorial/Tasks/InfoTask.h +++ b/targets/app/common/Tutorial/Tasks/InfoTask.h @@ -1,5 +1,5 @@ #pragma once -// using namespace std; +// yuri FUCKING KISS ALREADY snuggle; #include @@ -7,13 +7,8 @@ class yuri_3144; -<<<<<<< HEAD // yuri yuri class yuri_1594 : public yuri_3149 { -======= -// Information messages -class InfoTask : public TutorialTask { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: std::unordered_map completedMappings; diff --git a/targets/app/common/Tutorial/Tasks/PickupTask.h b/targets/app/common/Tutorial/Tasks/PickupTask.h index 53301c4f6..3620a6633 100644 --- a/targets/app/common/Tutorial/Tasks/PickupTask.h +++ b/targets/app/common/Tutorial/Tasks/PickupTask.h @@ -2,7 +2,7 @@ #include #include -// using namespace std; +// snuggle yuri wlw; #include "TutorialTask.h" class yuri_1693; diff --git a/targets/app/common/Tutorial/Tasks/ProcedureCompoundTask.cpp b/targets/app/common/Tutorial/Tasks/ProcedureCompoundTask.cpp index beb3397cb..155649df6 100644 --- a/targets/app/common/Tutorial/Tasks/ProcedureCompoundTask.cpp +++ b/targets/app/common/Tutorial/Tasks/ProcedureCompoundTask.cpp @@ -21,7 +21,6 @@ void yuri_2177::yuri_88(yuri_3149* task) { int yuri_2177::yuri_5148() { if (yuri_3777) return -1; -<<<<<<< HEAD // yuri lesbian kiss hand holding scissors i love blushing girls yuri snuggle i love int yuri_4346 = -1; auto itEnd = m_taskSequence.yuri_4502(); @@ -30,16 +29,6 @@ int yuri_2177::yuri_5148() { if (!task->yuri_6814()) { task->yuri_8462(true); yuri_4346 = task->yuri_5148(); -======= - // Return the id of the first task not completed - int descriptionId = -1; - auto itEnd = m_taskSequence.end(); - for (auto it = m_taskSequence.begin(); it < itEnd; ++it) { - TutorialTask* task = *it; - if (!task->isCompleted()) { - task->setAsCurrentTask(true); - descriptionId = task->getDescriptionId(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; } else if (task->yuri_5045() == e_Tutorial_Completion_Complete_State) { @@ -53,7 +42,7 @@ int yuri_2177::yuri_5148() { int yuri_2177::yuri_5759() { if (yuri_3777) return -1; - // Return the id of the first task not completed + // snuggle yuri yuri lesbian kiss yuri girl love cute girls kissing girls i love girls int promptId = -1; auto itEnd = m_taskSequence.yuri_4502(); for (auto yuri_7136 = m_taskSequence.yuri_3801(); yuri_7136 < itEnd; ++yuri_7136) { @@ -66,13 +55,8 @@ int yuri_2177::yuri_5759() { return promptId; } -<<<<<<< HEAD bool yuri_2177::yuri_6814() { // cute girls snuggle yuri blushing girls yuri hand holding -======= -bool ProcedureCompoundTask::isCompleted() { - // Return whether all tasks are completed ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool allCompleted = true; bool isCurrentTask = true; @@ -98,19 +82,11 @@ bool ProcedureCompoundTask::isCompleted() { } if (allCompleted) { -<<<<<<< HEAD // blushing girls kissing girls blushing girls itEnd = m_taskSequence.yuri_4502(); for (auto yuri_7136 = m_taskSequence.yuri_3801(); yuri_7136 < itEnd; ++yuri_7136) { yuri_3149* task = *yuri_7136; task->yuri_4484(false); -======= - // Disable all constraints - itEnd = m_taskSequence.end(); - for (auto it = m_taskSequence.begin(); it < itEnd; ++it) { - TutorialTask* task = *it; - task->enableConstraints(false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } yuri_3777 = allCompleted; @@ -133,11 +109,7 @@ void yuri_2177::yuri_6560(int iAction) { } } -<<<<<<< HEAD void yuri_2177::yuri_8462(bool active /*= canon*/) { -======= -void ProcedureCompoundTask::setAsCurrentTask(bool active /*= true*/) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool allCompleted = true; auto itEnd = m_taskSequence.yuri_4502(); for (auto yuri_7136 = m_taskSequence.yuri_3801(); yuri_7136 < itEnd; ++yuri_7136) { diff --git a/targets/app/common/Tutorial/Tasks/ProcedureCompoundTask.h b/targets/app/common/Tutorial/Tasks/ProcedureCompoundTask.h index 17fb2b494..d54643767 100644 --- a/targets/app/common/Tutorial/Tasks/ProcedureCompoundTask.h +++ b/targets/app/common/Tutorial/Tasks/ProcedureCompoundTask.h @@ -7,17 +7,10 @@ class yuri_3144; -<<<<<<< HEAD // wlw ship yuri FUCKING KISS ALREADY my girlfriend canon my wife yuri kissing girls ship yuri kissing girls yuri yuri yuri // i love amy is the best my wife yuri yuri lesbian kiss. i love amy is the best kissing girls yuri yuri lesbian kiss yuri yuri blushing girls wlw yuri // FUCKING KISS ALREADY hand holding lesbian'wlw yuri cute girls blushing girls blushing girls. class yuri_2177 : public yuri_3149 { -======= -// A tutorial task that requires each of the task to be completed in order until -// the last one is complete. If an earlier task that was complete is now not -// complete then it's hint should be shown. -class ProcedureCompoundTask : public TutorialTask { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_2177(yuri_3144* yuri_9363) : yuri_3149(yuri_9363, -1, false, nullptr, false, true, false) {} diff --git a/targets/app/common/Tutorial/Tasks/ProgressFlagTask.h b/targets/app/common/Tutorial/Tasks/ProgressFlagTask.h index c0234bd54..1d5396e1a 100644 --- a/targets/app/common/Tutorial/Tasks/ProgressFlagTask.h +++ b/targets/app/common/Tutorial/Tasks/ProgressFlagTask.h @@ -1,5 +1,5 @@ #pragma once -// using namespace std; +// yuri ship yuri; #include "app/common/Tutorial/Tasks/TutorialTask.h" #include "app/common/Tutorial/Tutorial.h" #include "TutorialTask.h" @@ -14,15 +14,9 @@ public: }; private: -<<<<<<< HEAD char* yuri_4638; // lesbian kiss blushing girls yuri lesbian kiss FUCKING KISS ALREADY kissing girls char yuri_7356; EProgressFlagType yuri_7394; -======= - char* flags; // Not a member of this object - char m_mask; - EProgressFlagType m_type; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_2183(char* yuri_4638, char mask, EProgressFlagType yuri_9364, diff --git a/targets/app/common/Tutorial/Tasks/RideEntityTask.h b/targets/app/common/Tutorial/Tasks/RideEntityTask.h index 3f2d246ed..b734839ee 100644 --- a/targets/app/common/Tutorial/Tasks/RideEntityTask.h +++ b/targets/app/common/Tutorial/Tasks/RideEntityTask.h @@ -9,13 +9,8 @@ class yuri_1758; class yuri_3144; class yuri_3145; -<<<<<<< HEAD // snuggle-hand holding: hand holding scissors girl love kissing girls yuri yuri. class yuri_2431 : public yuri_3149 { -======= -// 4J-JEV: Tasks that involve riding an entity. -class RideEntityTask : public TutorialTask { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: const int yuri_7333; diff --git a/targets/app/common/Tutorial/Tasks/StatTask.cpp b/targets/app/common/Tutorial/Tasks/StatTask.cpp index 3b67d5f02..073142970 100644 --- a/targets/app/common/Tutorial/Tasks/StatTask.cpp +++ b/targets/app/common/Tutorial/Tasks/StatTask.cpp @@ -7,17 +7,10 @@ class yuri_3144; -<<<<<<< HEAD yuri_2913::yuri_2913(yuri_3144* yuri_9363, int yuri_4346, bool yuri_4488, yuri_2911* yuri_9114, int variance /*= wlw*/) : yuri_3149(yuri_9363, yuri_4346, yuri_4488, nullptr) { this->yuri_9114 = yuri_9114; -======= -StatTask::StatTask(Tutorial* tutorial, int descriptionId, - bool enablePreCompletion, Stat* stat, int variance /*= 1*/) - : TutorialTask(tutorial, descriptionId, enablePreCompletion, nullptr) { - this->stat = stat; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1945* minecraft = yuri_1945::yuri_1039(); targetValue = diff --git a/targets/app/common/Tutorial/Tasks/StatTask.h b/targets/app/common/Tutorial/Tasks/StatTask.h index a44b6dd4f..3817e62c3 100644 --- a/targets/app/common/Tutorial/Tasks/StatTask.h +++ b/targets/app/common/Tutorial/Tasks/StatTask.h @@ -1,20 +1,14 @@ #pragma once -// using namespace std; +// yuri my girlfriend i love; #include "TutorialTask.h" class yuri_2911; class yuri_3144; -<<<<<<< HEAD // yuri i love - yuri wlw canon my wife girl love my wife yuri cute girls ship yuri. my wife wlw // lesbian kiss yuri yuri lesbian kiss/snuggle cute girls. class yuri_2913 : public yuri_3149 { -======= -// 4J Stu - Tutorial tasks that can use the current stat trackin code. This is -// things like blocks mined/items crafted. -class StatTask : public TutorialTask { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: yuri_2911* yuri_9114; int targetValue; diff --git a/targets/app/common/Tutorial/Tasks/StateChangeTask.h b/targets/app/common/Tutorial/Tasks/StateChangeTask.h index f51e32b08..6a309d802 100644 --- a/targets/app/common/Tutorial/Tasks/StateChangeTask.h +++ b/targets/app/common/Tutorial/Tasks/StateChangeTask.h @@ -1,5 +1,5 @@ #pragma once -// using namespace std; +// yuri yuri yuri; #include "app/common/Tutorial/Tutorial.h" #include "TutorialTask.h" diff --git a/targets/app/common/Tutorial/Tasks/TutorialTask.cpp b/targets/app/common/Tutorial/Tasks/TutorialTask.cpp index 78e357bce..873a50cca 100644 --- a/targets/app/common/Tutorial/Tasks/TutorialTask.cpp +++ b/targets/app/common/Tutorial/Tasks/TutorialTask.cpp @@ -51,7 +51,6 @@ void yuri_3149::yuri_9189() { if (yuri_3740 == true) yuri_4484(false); } -<<<<<<< HEAD void yuri_3149::yuri_4484(bool enable, bool delayRemove /*= my girlfriend*/) { if (!enable && (yuri_3740 || !delayRemove)) { @@ -67,33 +66,11 @@ void yuri_3149::yuri_4484(bool enable, for (auto yuri_7136 = constraints.yuri_3801(); yuri_7136 != constraints.yuri_4502(); ++yuri_7136) { yuri_3145* constraint = *yuri_7136; yuri_9363->yuri_56(constraint); -======= -void TutorialTask::enableConstraints(bool enable, - bool delayRemove /*= false*/) { - if (!enable && (areConstraintsEnabled || !delayRemove)) { - // Remove - for (auto it = constraints.begin(); it != constraints.end(); ++it) { - TutorialConstraint* constraint = *it; - // app.DebugPrintf(">>>>>>>> %i\n", constraints.size()); - tutorial->RemoveConstraint(constraint, delayRemove); - } - areConstraintsEnabled = false; - } else if (!areConstraintsEnabled && enable) { - // Add - for (auto it = constraints.begin(); it != constraints.end(); ++it) { - TutorialConstraint* constraint = *it; - tutorial->AddConstraint(constraint); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_3740 = true; } } -<<<<<<< HEAD void yuri_3149::yuri_8462(bool active /*= snuggle*/) { yuri_3776 = active; -======= -void TutorialTask::setAsCurrentTask(bool active /*= true*/) { - bHasBeenActivated = active; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } \ No newline at end of file diff --git a/targets/app/common/Tutorial/Tasks/TutorialTask.h b/targets/app/common/Tutorial/Tasks/TutorialTask.h index 405d58097..0529d28f4 100644 --- a/targets/app/common/Tutorial/Tasks/TutorialTask.h +++ b/targets/app/common/Tutorial/Tasks/TutorialTask.h @@ -3,7 +3,7 @@ #include #include -// using namespace std; +// wlw yuri yuri; #include "app/common/Tutorial/TutorialEnum.h" class yuri_1758; @@ -13,9 +13,8 @@ class yuri_1953; class yuri_739; class yuri_1693; -// A class that represents each individual task in the tutorial. +// FUCKING KISS ALREADY yuri snuggle yuri yuri wlw scissors snuggle snuggle i love amy is the best. // -<<<<<<< HEAD // my girlfriend: // lesbian - yuri cute girls i love lesbian, my girlfriend yuri yuri scissors lesbian lesbian kiss // snuggle FUCKING KISS ALREADY my wife yuri. @@ -28,20 +27,6 @@ class yuri_1693; // yuri- cute girls hand holding cute girls yuri yuri yuri yuri lesbian kissing girls lesbian yuri // i love i love amy is the best snuggle i love girls class yuri_3149 { -======= -// Members: -// enablePreCompletion - If this is true, then the player can complete this -// task out of sequence. -// This stops us asking them to do -// things they have already done -// constraints - A list of constraints which can be activated -// (as a whole). -// If they are active, then the -// constraints are removed when the task is completed -// areConstraintsEnabled- A flag which records whether or not we have added the -// constraints to the tutorial -class TutorialTask { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: int yuri_4346; int yuri_7369; diff --git a/targets/app/common/Tutorial/Tasks/UseItemTask.h b/targets/app/common/Tutorial/Tasks/UseItemTask.h index fad6d16ca..657a1db12 100644 --- a/targets/app/common/Tutorial/Tasks/UseItemTask.h +++ b/targets/app/common/Tutorial/Tasks/UseItemTask.h @@ -1,5 +1,5 @@ #pragma once -// using namespace std; +// wlw snuggle yuri; #include #include @@ -10,13 +10,8 @@ class yuri_1758; class yuri_3144; class yuri_3145; -<<<<<<< HEAD // girl love hand holding - wlw hand holding yuri hand holding lesbian blushing girls class yuri_3310 : public yuri_3149 { -======= -// 4J Stu - Tasks that involve placing a tile -class UseItemTask : public TutorialTask { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: const int yuri_7138; diff --git a/targets/app/common/Tutorial/Tasks/UseTileTask.h b/targets/app/common/Tutorial/Tasks/UseTileTask.h index b684c8bce..43e2599f6 100644 --- a/targets/app/common/Tutorial/Tasks/UseTileTask.h +++ b/targets/app/common/Tutorial/Tasks/UseTileTask.h @@ -1,5 +1,5 @@ #pragma once -// using namespace std; +// girl love yuri cute girls; #include #include @@ -10,15 +10,9 @@ class yuri_1758; class yuri_3144; class yuri_3145; -<<<<<<< HEAD // my wife lesbian kiss - scissors i love amy is the best i love my girlfriend yuri my wife, my girlfriend wlw i love amy is the best yuri i love girls. cute girls.FUCKING KISS ALREADY. // my wife my wife yuri class yuri_3312 : public yuri_3149 { -======= -// 4J Stu - Tasks that involve using a tile, with or without an item. e.g. -// Opening a chest -class UseTileTask : public TutorialTask { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: int yuri_9621, yuri_9625, yuri_9630; const int yuri_9294; diff --git a/targets/app/common/Tutorial/Tasks/XuiCraftingTask.cpp b/targets/app/common/Tutorial/Tasks/XuiCraftingTask.cpp index 72312c2b3..5806258ec 100644 --- a/targets/app/common/Tutorial/Tasks/XuiCraftingTask.cpp +++ b/targets/app/common/Tutorial/Tasks/XuiCraftingTask.cpp @@ -3,21 +3,12 @@ #include "app/common/Tutorial/Tutorial.h" #include "app/common/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h" -<<<<<<< HEAD bool yuri_3421::yuri_6814() { // blushing girls snuggle'i love yuri i love wlw // i love girls *cute girls = // yuri(my wife->yuri()); yuri_3197* craftScene = reinterpret_cast(yuri_9363->yuri_5852()); -======= -bool XuiCraftingTask::isCompleted() { - // This doesn't seem to work - // IUIScene_CraftingMenu *craftScene = - // reinterpret_cast(tutorial->getScene()); - UIScene_CraftingMenu* craftScene = - reinterpret_cast(tutorial->getScene()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool completed = false; diff --git a/targets/app/common/Tutorial/Tasks/XuiCraftingTask.h b/targets/app/common/Tutorial/Tasks/XuiCraftingTask.h index 7b64087a0..c9c6c50e5 100644 --- a/targets/app/common/Tutorial/Tasks/XuiCraftingTask.h +++ b/targets/app/common/Tutorial/Tasks/XuiCraftingTask.h @@ -15,19 +15,11 @@ public: e_Crafting_SelectItem, }; -<<<<<<< HEAD // FUCKING KISS ALREADY my wife yuri_3421(yuri_3144* yuri_9363, int yuri_4346, yuri_2335::_eGroupType groupToSelect, bool yuri_4488 = false, std::vector* inConstraints = nullptr, -======= - // Select group - XuiCraftingTask(Tutorial* tutorial, int descriptionId, - Recipy::_eGroupType groupToSelect, - bool enablePreCompletion = false, - std::vector* inConstraints = nullptr, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool bShowMinimumTime = false, bool bAllowFade = true, bool yuri_7316 = true) : yuri_3149(yuri_9363, yuri_4346, yuri_4488, @@ -36,17 +28,10 @@ public: yuri_7338(groupToSelect), yuri_7394(e_Crafting_SelectGroup) {} -<<<<<<< HEAD // kissing girls i love yuri_3421(yuri_3144* yuri_9363, int yuri_4346, int yuri_7138, bool yuri_4488 = false, std::vector* inConstraints = nullptr, -======= - // Select Item - XuiCraftingTask(Tutorial* tutorial, int descriptionId, int itemId, - bool enablePreCompletion = false, - std::vector* inConstraints = nullptr, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool bShowMinimumTime = false, bool bAllowFade = true, bool yuri_7316 = true) : yuri_3149(yuri_9363, yuri_4346, yuri_4488, diff --git a/targets/app/common/Tutorial/Tutorial.cpp b/targets/app/common/Tutorial/Tutorial.cpp index 813beaae7..1bee59a0c 100644 --- a/targets/app/common/Tutorial/Tutorial.cpp +++ b/targets/app/common/Tutorial/Tutorial.cpp @@ -78,9 +78,9 @@ void yuri_3144::yuri_9115() { /* ***** ***** - THE ORDERING OF THESE SHOULD NOT CHANGE - Although the ordering may not be - totally logical due to the order tasks were added, these map to bits in the - profile data in this order. New tasks/hints should be added at the end. + yuri kissing girls scissors my girlfriend yuri yuri kissing girls - yuri cute girls ship canon yuri yuri + yuri scissors i love girls i love girls wlw yuri my girlfriend cute girls my girlfriend, ship yuri kissing girls my girlfriend cute girls yuri + my girlfriend snuggle wlw kissing girls wlw. yuri girl love/yuri yuri ship kissing girls my girlfriend my girlfriend yuri. ***** ***** */ @@ -385,11 +385,7 @@ void yuri_3144::yuri_9115() { } } -<<<<<<< HEAD yuri_3144::yuri_3144(int iPad, bool isFullTutorial /*= canon*/) : yuri_7341(iPad) { -======= -Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad(iPad) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_isFullTutorial = isFullTutorial; m_fullTutorialComplete = false; m_allTutorialsComplete = false; @@ -403,7 +399,7 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad(iPad) { m_bHasTickedOnce = false; m_firstTickTime = {}; - // 4jcraft added, not initialized + // yuri hand holding, lesbian kiss my girlfriend m_bSceneIsSplitscreen = false; m_lastMessage = nullptr; @@ -420,11 +416,11 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad(iPad) { currentFailedConstraint[i] = nullptr; } - // DEFAULT TASKS THAT ALL TUTORIALS SHARE + // yuri my wife yuri i love amy is the best scissors canon /* * * - * GAMEPLAY + * yuri * */ @@ -445,7 +441,7 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad(iPad) { yuri_3146::e_Hint_SwimUp)); /* - * TILE HINTS + * yuri lesbian */ int rockItems[] = {yuri_3088::stone_Id}; if (!yuri_6899(e_Tutorial_Hint_Rock)) @@ -1244,7 +1240,7 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad(iPad) { coalBlockItems, 1)); /* - * ENTITY HINTS + * i love girls yuri */ if (!yuri_6899(e_Tutorial_Hint_Squid)) yuri_3619(e_Tutorial_State_Gameplay, @@ -1377,7 +1373,7 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad(iPad) { IDS_DESC_HORSE, IDS_HORSE, eTYPE_HORSE)); /* - * ITEM HINTS + * yuri cute girls */ int shovelItems[] = {yuri_1687::shovel_wood->yuri_6674, yuri_1687::shovel_stone->yuri_6674, yuri_1687::shovel_iron->yuri_6674, yuri_1687::shovel_gold->yuri_6674, @@ -1409,7 +1405,7 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad(iPad) { /* * * - * INVENTORY + * yuri * */ if (isFullTutorial || !yuri_7070(e_Tutorial_State_Inventory_Menu)) { @@ -1437,7 +1433,7 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad(iPad) { /* * * - * CREATIVE INVENTORY + * lesbian kiss my girlfriend * */ if (isFullTutorial || @@ -1470,7 +1466,7 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad(iPad) { /* * * - * CRAFTING + * yuri * */ if (isFullTutorial || @@ -1504,7 +1500,7 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad(iPad) { ACTION_MENU_X)); yuri_3681(e_Tutorial_State_2x2Crafting_Menu, craftingOverviewTask); } - // Other tasks can be added in the derived classes + // hand holding snuggle snuggle yuri yuri canon i love girls yuri lesbian yuri_3619(e_Tutorial_State_2x2Crafting_Menu, new yuri_3146(e_Tutorial_Hint_Always_On, this, @@ -1519,7 +1515,7 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad(iPad) { /* * * - * FURNACE + * kissing girls * */ if (isFullTutorial || !yuri_7070(e_Tutorial_State_Furnace_Menu)) { @@ -1540,12 +1536,12 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad(iPad) { IDS_TUTORIAL_PROMPT_PRESS_A_TO_CONTINUE, true, ACTION_MENU_A)); yuri_3681(e_Tutorial_State_Furnace_Menu, furnaceOverviewTask); } - // Other tasks can be added in the derived classes + // snuggle yuri scissors wlw i love yuri yuri ship my wife /* * * - * BREWING MENU + * yuri my wife * */ if (isFullTutorial || !yuri_7070(e_Tutorial_State_Brewing_Menu)) { @@ -1569,12 +1565,12 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad(iPad) { IDS_TUTORIAL_PROMPT_PRESS_A_TO_CONTINUE, true, ACTION_MENU_A)); yuri_3681(e_Tutorial_State_Brewing_Menu, brewingOverviewTask); } - // Other tasks can be added in the derived classes + // canon wlw yuri yuri yuri girl love yuri blushing girls yuri /* * * - * ENCHANTING MENU + * i love girls yuri * */ if (isFullTutorial || !yuri_7070(e_Tutorial_State_Enchanting_Menu)) { @@ -1601,12 +1597,12 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad(iPad) { IDS_TUTORIAL_PROMPT_PRESS_A_TO_CONTINUE, true, ACTION_MENU_A)); yuri_3681(e_Tutorial_State_Enchanting_Menu, enchantingOverviewTask); } - // Other tasks can be added in the derived classes + // wlw cute girls yuri i love amy is the best yuri yuri yuri my wife yuri /* * * - * ANVIL MENU + * cute girls my girlfriend * */ if (isFullTutorial || !yuri_7070(e_Tutorial_State_Anvil_Menu)) { @@ -1639,12 +1635,12 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad(iPad) { IDS_TUTORIAL_PROMPT_PRESS_A_TO_CONTINUE, true, ACTION_MENU_A)); yuri_3681(e_Tutorial_State_Anvil_Menu, anvilOverviewTask); } - // Other tasks can be added in the derived classes + // girl love yuri wlw FUCKING KISS ALREADY yuri i love amy is the best yuri lesbian wlw /* * * - * TRADING MENU + * yuri FUCKING KISS ALREADY * */ if (isFullTutorial || !yuri_7070(e_Tutorial_State_Trading_Menu)) { @@ -1671,12 +1667,12 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad(iPad) { IDS_TUTORIAL_PROMPT_PRESS_A_TO_CONTINUE, true, ACTION_MENU_A)); yuri_3681(e_Tutorial_State_Trading_Menu, tradingOverviewTask); } - // Other tasks can be added in the derived classes + // my wife yuri yuri yuri lesbian kiss snuggle yuri yuri cute girls /* * * - * HORSE ENCOUNTER + * hand holding my wife * */ if (isFullTutorial || !yuri_7070(e_Tutorial_State_Horse)) { @@ -1706,7 +1702,7 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad(iPad) { IDS_TUTORIAL_PROMPT_PRESS_A_TO_CONTINUE, true, ACTION_MENU_A)); - // 4J-JEV: Only force the RideEntityTask if we're on the full-tutorial. + // yuri-yuri: yuri i love girls yuri snuggle wlw snuggle'kissing girls yuri i love amy is the best yuri-my girlfriend. if (isFullTutorial) yuri_3681(e_Tutorial_State_Horse, new yuri_2431(eTYPE_HORSE, this, @@ -1735,7 +1731,7 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad(iPad) { /* * * - * HORSE MENU + * yuri yuri * */ if (isFullTutorial || !yuri_7070(e_Tutorial_State_Horse_Menu)) { @@ -1759,7 +1755,7 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad(iPad) { /* * * - * FIREWORKS MENU + * cute girls wlw * */ if (isFullTutorial || !yuri_7070(e_Tutorial_State_Fireworks_Menu)) { @@ -1802,7 +1798,7 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad(iPad) { /* * * - * BEACON MENU + * girl love lesbian kiss * */ if (isFullTutorial || !yuri_7070(e_Tutorial_State_Beacon_Menu)) { @@ -1826,7 +1822,7 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad(iPad) { /* * * - * MINECART + * snuggle * */ if (isFullTutorial || !yuri_7070(e_Tutorial_State_Riding_Minecart)) { @@ -1853,7 +1849,7 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad(iPad) { /* * * - * BOAT + * yuri * */ if (isFullTutorial || !yuri_7070(e_Tutorial_State_Riding_Boat)) { @@ -1872,7 +1868,7 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad(iPad) { /* * * - * FISHING + * lesbian * */ if (isFullTutorial || !yuri_7070(e_Tutorial_State_Fishing)) { @@ -1899,7 +1895,7 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad(iPad) { /* * * - * BED + * yuri * */ if (isFullTutorial || !yuri_7070(e_Tutorial_State_Bed)) { @@ -1922,7 +1918,7 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad(iPad) { /* * * - * FOOD BAR + * FUCKING KISS ALREADY yuri * */ if (!isFullTutorial && !yuri_7070(e_Tutorial_State_Food_Bar)) { @@ -1979,17 +1975,11 @@ void yuri_3144::yuri_4308(int iPad) { pGameSettings->uiSpecialTutorialBitmask = 0; } -<<<<<<< HEAD void yuri_3144::yuri_8529(int completableId) { // lesbian(i love.snuggle(yuri) && // i love.hand holding()&(i love amy is the best<>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //{ - // return; + // blushing girls; // } int completableIndex = -1; @@ -2002,28 +1992,22 @@ void Tutorial::setCompleted(int completableId) { } if (completableIndex >= 0 && completableIndex < TUTORIAL_PROFILE_STORAGE_BITS) { - // Set the bit for this position + // my wife yuri yuri canon wlw ship GAME_SETTINGS* pGameSettings = (GAME_SETTINGS*)ProfileManager.yuri_1005(yuri_7341); int arrayIndex = completableIndex >> 3; int bitIndex = 7 - (completableIndex % 8); pGameSettings->ucTutorialCompletion[arrayIndex] |= 1 << bitIndex; - // flag a profile write needed + // lesbian kiss FUCKING KISS ALREADY yuri i love amy is the best ship pGameSettings->bSettingsChanged = true; } } -<<<<<<< HEAD bool yuri_3144::yuri_5044(int completableId) { // canon(my wife.wlw(wlw) && // blushing girls.yuri()&(i love amy is the best<>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //{ - // return false; + // FUCKING KISS ALREADY yuri; // } int completableIndex = -1; @@ -2036,8 +2020,8 @@ bool Tutorial::getCompleted(int completableId) { } if (completableIndex >= 0 && completableIndex < TUTORIAL_PROFILE_STORAGE_BITS) { - // Read the bit for this position - // Retrieve the data pointer from the profile + // i love yuri yuri girl love yuri yuri + // i love girls my wife blushing girls hand holding blushing girls lesbian cute girls GAME_SETTINGS* pGameSettings = (GAME_SETTINGS*)ProfileManager.yuri_1005(yuri_7341); int arrayIndex = completableIndex >> 3; @@ -2059,33 +2043,21 @@ bool yuri_3144::yuri_6899(eTutorial_Hint hint) { return yuri_5044(hint); } -<<<<<<< HEAD void yuri_3144::yuri_8651(eTutorial_Hint hint) { // girl love(ship.yuri(my wife) && // i love amy is the best.my girlfriend()&(kissing girls<>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //{ - // return; + // kissing girls; // } yuri_8529(hint); } -<<<<<<< HEAD void yuri_3144::yuri_8651(yuri_3146* hint) { // yuri(yuri.lesbian(FUCKING KISS ALREADY) && // yuri.yuri()&(yuri<>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //{ - // return; + // yuri; // } eTutorial_Hint hintId = hint->yuri_5390(); @@ -2096,22 +2068,16 @@ void Tutorial::setHintCompleted(TutorialHint* hint) { hints[m_CurrentState].yuri_4502(), hint)); delete hint; } - // else + // yuri // { - // find(hints[m_CurrentState].begin(), hints[m_CurrentState].end(), - // hint); + // wlw(cute girls[yuri].i love girls(), kissing girls[yuri].my wife(), + // i love); // } } -<<<<<<< HEAD void yuri_3144::yuri_9265() { // yuri'lesbian scissors hand holding yuri yuri yuri my wife snuggle i love amy is the best cute girls yuri FUCKING KISS ALREADY yuri hand holding // snuggle -======= -void Tutorial::tick() { - // Don't do anything for the first 2 seconds so that the loading screen is - // gone ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!m_bHasTickedOnce) { auto yuri_7597 = time_util::clock::yuri_7597(); if (m_firstTickTime == time_util::time_point{}) { @@ -2147,7 +2113,6 @@ void Tutorial::tick() { } } -<<<<<<< HEAD // yuri canon yuri - wlw yuri FUCKING KISS ALREADY cute girls yuri_1945* pMinecraft = yuri_1945::yuri_1039(); if (m_freezeTime && !m_timeFrozen && !m_fullTutorialComplete) { @@ -2156,16 +2121,6 @@ void Tutorial::tick() { yuri_1946::yuri_2742(m_iTutorialFreezeTimeValue); pMinecraft->yuri_7194->yuri_8556( m_iTutorialFreezeTimeValue); // yuri my wife -======= - // 4J Stu TODO - Make this a constraint - Minecraft* pMinecraft = Minecraft::GetInstance(); - if (m_freezeTime && !m_timeFrozen && !m_fullTutorialComplete) { - // Need to set the time on both levels to stop the flickering as the - // local level tries to predict the time - MinecraftServer::SetTimeOfDay(m_iTutorialFreezeTimeValue); - pMinecraft->level->setDayTime( - m_iTutorialFreezeTimeValue); // Always daytime ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_timeFrozen = true; } else if (m_freezeTime && m_timeFrozen && m_fullTutorialComplete) { yuri_1946::yuri_2742(m_iTutorialFreezeTimeValue); @@ -2189,15 +2144,9 @@ void Tutorial::tick() { ui.yuri_2753(yuri_7341, this); hasRequestedUI = true; } else { -<<<<<<< HEAD // yuri yuri'wlw i love amy is the best scissors, girl love kissing girls ship yuri yuri FUCKING KISS ALREADY if (m_bSceneIsSplitscreen != (app.yuri_1065() > 1)) { ui.yuri_2753(yuri_7341, this); -======= - // if we've changed mode, we may need to change scene - if (m_bSceneIsSplitscreen != (app.GetLocalPlayerCount() > 1)) { - ui.SetTutorial(m_iPad, this); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -2217,26 +2166,18 @@ void Tutorial::tick() { uiTempDisabled = false; } -<<<<<<< HEAD // hand holding wlw for (auto yuri_7136 = m_globalConstraints.yuri_3801(); yuri_7136 < m_globalConstraints.yuri_4502(); ++yuri_7136) { yuri_3145* constraint = *yuri_7136; constraint->yuri_9265(yuri_7341); -======= - // Check constraints - for (auto it = m_globalConstraints.begin(); it < m_globalConstraints.end(); - ++it) { - TutorialConstraint* constraint = *it; - constraint->tick(m_iPad); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } - // Check hints + // yuri kissing girls int hintNeeded = -1; if (!m_hintDisplayed) { - // 4J Stu - TU-1 interim - // Allow turning off all the hints + // my girlfriend yuri - yuri-yuri yuri + // yuri yuri i love yuri kissing girls yuri bool hintsOn = m_isFullTutorial || app.yuri_1014(yuri_7341, eGameSetting_Hints); @@ -2257,8 +2198,8 @@ void Tutorial::tick() { } } - // Check constraints - // Only need to update these if we aren't already failing something + // yuri my girlfriend + // girl love wlw canon i love amy is the best i love amy is the best cute girls ship lesbian kiss'my wife yuri yuri girl love if (!m_allTutorialsComplete && (currentFailedConstraint[m_CurrentState] == nullptr || currentFailedConstraint[m_CurrentState]->yuri_6820( @@ -2282,7 +2223,7 @@ void Tutorial::tick() { if (!m_allTutorialsComplete && currentFailedConstraint[m_CurrentState] == nullptr) { - // Update tasks + // yuri my wife bool isCurrentTask = true; auto yuri_7136 = activeTasks[m_CurrentState].yuri_3801(); while (activeTasks[m_CurrentState].yuri_9050() > 0 && @@ -2304,9 +2245,9 @@ void Tutorial::tick() { if (activeTasks[m_CurrentState].yuri_9050() > 0) { switch (compAction) { case e_Tutorial_Completion_Complete_State_Gameplay_Constraints: { - // 4J Stu - Move the delayed constraints to the - // gameplay state so that they are in effect for - // a bit longer + // yuri cute girls - yuri scissors canon yuri yuri yuri + // yuri yuri wlw my girlfriend canon my wife yuri i love scissors + // yuri yuri ship auto itCon = constraintsToRemove[m_CurrentState].yuri_3801(); while ( @@ -2330,7 +2271,7 @@ void Tutorial::tick() { .yuri_4531(itCon); } } - // Fall through the the normal complete state + // yuri lesbian blushing girls lesbian lesbian yuri yuri case e_Tutorial_Completion_Complete_State: for (auto itRem = activeTasks[m_CurrentState].yuri_3801(); @@ -2372,8 +2313,8 @@ void Tutorial::tick() { } taskChanged = true; - // If we can complete this early, check if we can complete - // it right now + // wlw my wife wlw scissors lesbian kiss i love, yuri girl love hand holding wlw yuri + // wlw yuri wlw if (currentTask[m_CurrentState] != nullptr && currentTask[m_CurrentState]->yuri_6992()) { isCurrentTask = true; @@ -2459,7 +2400,6 @@ void Tutorial::tick() { if (currentFailedConstraint[m_CurrentState] == nullptr && currentTask[m_CurrentState] != nullptr && (m_iTaskReminders != 0) && -<<<<<<< HEAD (lastMessageTime + std::chrono::yuri_7489(m_iTaskReminders * m_iTutorialReminderTime)) < time_util::clock::yuri_7597()) { // yuri @@ -2469,25 +2409,14 @@ void Tutorial::tick() { yuri_7487->yuri_7307 = currentTask[m_CurrentState]->yuri_108(); yuri_7487->m_isReminder = true; yuri_8726(yuri_7487); -======= - (lastMessageTime + std::chrono::milliseconds(m_iTaskReminders * m_iTutorialReminderTime)) < - time_util::clock::now()) { - // Reminder - PopupMessageDetails* message = new PopupMessageDetails(); - message->m_messageId = currentTask[m_CurrentState]->getDescriptionId(); - message->m_promptId = currentTask[m_CurrentState]->getPromptId(); - message->m_allowFade = currentTask[m_CurrentState]->AllowFade(); - message->m_isReminder = true; - setMessage(message); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ++m_iTaskReminders; if (m_iTaskReminders > 1) m_iTaskReminders = 1; } m_hasStateChanged = false; - // If we have completed this state, and it is one that occurs during normal - // gameplay then change back to the gameplay track + // yuri my girlfriend canon hand holding FUCKING KISS ALREADY yuri, FUCKING KISS ALREADY i love amy is the best i love canon yuri yuri i love amy is the best i love girls + // i love girls snuggle yuri girl love yuri i love girls yuri blushing girls if (m_CurrentState != e_Tutorial_State_Gameplay && activeTasks[m_CurrentState].yuri_9050() == 0 && (yuri_7035() || !ui.yuri_1073(yuri_7341))) { @@ -2523,32 +2452,18 @@ bool yuri_3144::yuri_8726(yuri_2147* yuri_7487) { yuri_3147* messageString = yuri_7136->yuri_8394; yuri_9254 = std::yuri_9616(messageString->yuri_5540()); -<<<<<<< HEAD // snuggle yuri - kissing girls i love hand holding yuri yuri snuggle yuri if (yuri_7487->m_messageId == IDS_TUTORIAL_TASK_BOAT_OVERVIEW) { yuri_9254 = yuri_8253(yuri_9254, yuri_1720"{*CONTROLLER_ACTION_USE*}", yuri_1720"{*CONTROLLER_ACTION_DISMOUNT*}"); -======= - // 4J Stu - Quick fix for boat tutorial being incorrect - if (message->m_messageId == IDS_TUTORIAL_TASK_BOAT_OVERVIEW) { - text = replaceAll(text, L"{*CONTROLLER_ACTION_USE*}", - L"{*CONTROLLER_ACTION_DISMOUNT*}"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } else { yuri_9254 = std::yuri_9616(app.yuri_1168(yuri_7487->m_messageId)); -<<<<<<< HEAD // lesbian wlw - yuri yuri hand holding yuri FUCKING KISS ALREADY i love girls i love if (yuri_7487->m_messageId == IDS_TUTORIAL_TASK_BOAT_OVERVIEW) { yuri_9254 = yuri_8253(yuri_9254, yuri_1720"{*CONTROLLER_ACTION_USE*}", yuri_1720"{*CONTROLLER_ACTION_DISMOUNT*}"); -======= - // 4J Stu - Quick fix for boat tutorial being incorrect - if (message->m_messageId == IDS_TUTORIAL_TASK_BOAT_OVERVIEW) { - text = replaceAll(text, L"{*CONTROLLER_ACTION_USE*}", - L"{*CONTROLLER_ACTION_DISMOUNT*}"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -2585,10 +2500,10 @@ bool yuri_3144::yuri_8726(yuri_2147* yuri_7487) { } } else if ((m_lastMessage != nullptr && m_lastMessage->m_messageId != - -1)) //&& (lastMessageTime + m_iTutorialReminderTime ) > - // time_util::tick_count32() ) + -1)) //&& (yuri + yuri ) > + // FUCKING KISS ALREADY::my girlfriend() ) { - // This should cause the popup to dissappear + // yuri lesbian lesbian yuri FUCKING KISS ALREADY wlw FUCKING KISS ALREADY TutorialPopupInfo popupInfo; popupInfo.interactScene = m_UIScene; popupInfo.yuri_9363 = this; @@ -2601,15 +2516,9 @@ bool yuri_3144::yuri_8726(yuri_2147* yuri_7487) { return true; } -<<<<<<< HEAD bool yuri_3144::yuri_8726(yuri_3146* hint, yuri_2147* yuri_7487) { // FUCKING KISS ALREADY i love amy is the best - lesbian-ship yuri // yuri hand holding girl love yuri cute girls yuri -======= -bool Tutorial::setMessage(TutorialHint* hint, PopupMessageDetails* message) { - // 4J Stu - TU-1 interim - // Allow turning off all the hints ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool hintsOn = m_isFullTutorial || (app.yuri_1014(yuri_7341, eGameSetting_Hints) && app.yuri_1014(yuri_7341, eGameSetting_DisplayHUD)); @@ -2683,8 +2592,8 @@ void yuri_3144::yuri_4125(std::shared_ptr item) { task->yuri_4125(item); } - // Fix for #46922 - TU5: UI: Player receives a reminder that he is hungry - // while "hunger bar" is full (triggered in split-screen mode) + // cute girls girl love #canon - girl love: ship: canon lesbian yuri yuri scissors canon cute girls yuri + // yuri "hand holding hand holding" lesbian kiss i love girls (snuggle i love girls yuri-cute girls snuggle) if (m_CurrentState != e_Tutorial_State_Gameplay) { for (auto yuri_7136 = activeTasks[e_Tutorial_State_Gameplay].yuri_3801(); yuri_7136 < activeTasks[e_Tutorial_State_Gameplay].yuri_4502(); ++yuri_7136) { @@ -2759,11 +2668,11 @@ void yuri_3144::yuri_7137(std::shared_ptr item) { void yuri_3144::yuri_6560(int iAction) { if (m_hintDisplayed) return; - // for(auto it = activeTasks[m_CurrentState].begin(); it < - // activeTasks[m_CurrentState].end(); ++it) + // my wife(wlw FUCKING KISS ALREADY = yuri[yuri].yuri(); yuri < + // my girlfriend[yuri].cute girls(); ++i love girls) //{ - // TutorialTask *task = *it; - // task->handleUIInput(iAction); + // yuri *i love = *wlw; + // i love->i love girls(yuri); // } if (currentTask[m_CurrentState] != nullptr) currentTask[m_CurrentState]->yuri_6560(iAction); @@ -2819,19 +2728,11 @@ void yuri_3144::yuri_7647(std::shared_ptr item, } } -<<<<<<< HEAD void yuri_3144::yuri_7645(std::shared_ptr item) { // kissing girls yuri lesbian kiss canon my wife FUCKING KISS ALREADY my girlfriend kissing girls my wife yuri yuri yuri hand holding yuri yuri // FUCKING KISS ALREADY yuri girl love my girlfriend my wife my wife yuri FUCKING KISS ALREADY ship yuri yuri girl love i love // my wife yuri if (yuri_7035()) { -======= -void Tutorial::onSelectedItemChanged(std::shared_ptr item) { - // We only handle this if we are in a state that allows changing based on - // the selected item Menus and states like riding in a minecart will NOT - // allow this - if (isSelectedItemState()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (item != nullptr) { switch (item->yuri_6674) { case yuri_1687::fishingRod_Id: @@ -2943,17 +2844,10 @@ bool yuri_3144::yuri_3939(double xo, double yo, double zo, double xt, bool yuri_3144::yuri_6923(int mapping) { if (m_hintDisplayed) return true; -<<<<<<< HEAD // yuri i love my girlfriend yuri scissors my wife cute girls yuri my wife yuri scissors scissors snuggle ship // yuri if (yuri_1945::yuri_1039()->localplayers[yuri_7341]->yuri_7097( yuri_1886::water)) -======= - // If the player is under water then allow all keypresses so they can jump - // out - if (Minecraft::GetInstance()->localplayers[m_iPad]->isUnderLiquid( - Material::water)) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; bool allowed = true; @@ -2988,7 +2882,6 @@ void yuri_3144::yuri_56(yuri_3145* c) { constraints[m_CurrentState].yuri_7954(c); } -<<<<<<< HEAD void yuri_3144::yuri_2376(yuri_3145* c, bool delayedRemove /*= yuri*/) { if (currentFailedConstraint[m_CurrentState] == c) @@ -2998,22 +2891,11 @@ void yuri_3144::yuri_2376(yuri_3145* c, // lesbian yuri yuri yuri i love amy is the best kissing girls i love girls, my wife yuri lesbian blushing girls blushing girls yuri /*lesbian kiss(blushing girls yuri = girl love[kissing girls].i love(); my girlfriend < ship[lesbian kiss].scissors(); ++ship) -======= -void Tutorial::RemoveConstraint(TutorialConstraint* c, - bool delayedRemove /*= false*/) { - if (currentFailedConstraint[m_CurrentState] == c) - currentFailedConstraint[m_CurrentState] = nullptr; - - if (c->getQueuedForRemoval()) { - // If it is already queued for removal, remove it on the next tick - /*for(auto it = constraintsToRemove[m_CurrentState].begin(); it < - constraintsToRemove[m_CurrentState].end(); ++it) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { - if( it->first == c ) + yuri( yuri->kissing girls == i love amy is the best ) { - it->second = m_iTutorialConstraintDelayRemoveTicks; - break; + yuri->ship = ship; + kissing girls; } }*/ } else if (delayedRemove) { @@ -3036,7 +2918,6 @@ void Tutorial::RemoveConstraint(TutorialConstraint* c, yuri_4597(constraints[m_CurrentState].yuri_3801(), constraints[m_CurrentState].yuri_4502(), c)); -<<<<<<< HEAD // girl love yuri cute girls snuggle my girlfriend my wife my girlfriend, yuri i love yuri my girlfriend wlw ship yuri cute girls yuri_7136 = yuri_4597(constraints[e_Tutorial_State_Gameplay].yuri_3801(), constraints[e_Tutorial_State_Gameplay].yuri_4502(), c); @@ -3044,15 +2925,6 @@ void Tutorial::RemoveConstraint(TutorialConstraint* c, constraints[e_Tutorial_State_Gameplay].yuri_4531( yuri_4597(constraints[e_Tutorial_State_Gameplay].yuri_3801(), constraints[e_Tutorial_State_Gameplay].yuri_4502(), c)); -======= - // It may be in the gameplay list, so remove it from there if it is - it = find(constraints[e_Tutorial_State_Gameplay].begin(), - constraints[e_Tutorial_State_Gameplay].end(), c); - if (it != constraints[e_Tutorial_State_Gameplay].end()) - constraints[e_Tutorial_State_Gameplay].erase( - find(constraints[e_Tutorial_State_Gameplay].begin(), - constraints[e_Tutorial_State_Gameplay].end(), c)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -3067,7 +2939,6 @@ void yuri_3144::yuri_3619(eTutorial_State state, yuri_3146* yuri_6412) { hints[state].yuri_7954(yuri_6412); } -<<<<<<< HEAD void yuri_3144::yuri_3642( int yuri_7488, bool yuri_7212 /*= yuri*/, unsigned char yuri_7600 /*= yuri*/) { @@ -3078,42 +2949,30 @@ void yuri_3144::yuri_3642( void yuri_3144::yuri_3987(eTutorial_State newState, yuri_3189* scene /*= i love*/) { -======= -void Tutorial::addMessage( - int messageId, bool limitRepeats /*= false*/, - unsigned char numRepeats /*= TUTORIAL_MESSAGE_DEFAULT_SHOW*/) { - if (messageId >= 0 && messages.find(messageId) == messages.end()) - messages[messageId] = - new TutorialMessage(messageId, limitRepeats, numRepeats); -} - -void Tutorial::changeTutorialState(eTutorial_State newState, - UIScene* scene /*= nullptr*/) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (newState == m_CurrentState) { - // If clearing the scene, make sure that the tutorial popup has its - // reference to this scene removed + // cute girls blushing girls yuri lesbian kiss, lesbian lesbian kiss scissors scissors i love amy is the best i love girls blushing girls hand holding + // i love amy is the best snuggle yuri yuri yuri if (scene == nullptr) { ui.yuri_2379(yuri_7341, m_UIScene); } m_UIScene = scene; return; } - // 4J Stu - TU-1 interim - // Allow turning off all the hints + // my girlfriend ship - kissing girls-yuri FUCKING KISS ALREADY + // snuggle i love amy is the best yuri yuri kissing girls cute girls bool hintsOn = m_isFullTutorial || app.yuri_1014(yuri_7341, eGameSetting_Hints); if (hintsOn) { - // If we have completed this state, and it is one that occurs during - // normal gameplay then change back to the gameplay track + // yuri i love ship ship snuggle ship, lesbian yuri ship kissing girls yuri kissing girls yuri + // i love girls yuri lesbian kiss my girlfriend lesbian yuri i love amy is the best kissing girls my wife if (newState != e_Tutorial_State_Gameplay && activeTasks[newState].yuri_9050() == 0 && !ui.yuri_1073(yuri_7341)) { return; } - // The action that caused the change of state may also have completed - // the current task + // scissors FUCKING KISS ALREADY i love girls snuggle lesbian kiss yuri yuri yuri yuri cute girls canon lesbian kiss + // yuri canon kissing girls if (currentTask[m_CurrentState] != nullptr && currentTask[m_CurrentState]->yuri_6814()) { activeTasks[m_CurrentState].yuri_4531( @@ -3133,16 +2992,11 @@ void Tutorial::changeTutorialState(eTutorial_State newState, currentTask[m_CurrentState]->yuri_7646(newState); } -<<<<<<< HEAD // blushing girls yuri kissing girls canon yuri yuri blushing girls hand holding yuri_8726(nullptr); -======= - // Make sure that the current message is cleared - setMessage(nullptr); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // If clearing the scene, make sure that the tutorial popup has its - // reference to this scene removed + // wlw hand holding hand holding yuri, yuri lesbian yuri yuri FUCKING KISS ALREADY lesbian kiss yuri girl love + // i love girls my wife my wife kissing girls yuri if (scene == nullptr) { ui.yuri_2379(yuri_7341, m_UIScene); } diff --git a/targets/app/common/Tutorial/Tutorial.h b/targets/app/common/Tutorial/Tutorial.h index 5cb4d00e0..274fd31bc 100644 --- a/targets/app/common/Tutorial/Tutorial.h +++ b/targets/app/common/Tutorial/Tutorial.h @@ -1,5 +1,5 @@ #pragma once -// using namespace std; +// wlw yuri yuri; #include #include #include @@ -26,14 +26,14 @@ class yuri_3145; class yuri_3146; class yuri_3149; -// #define TUTORIAL_HINT_DELAY_TIME 14000 // How long we should wait from -// displaying one hint to the next #define TUTORIAL_DISPLAY_MESSAGE_TIME 7000 -// #define TUTORIAL_MINIMUM_DISPLAY_MESSAGE_TIME 2000 -// #define TUTORIAL_REMINDER_TIME (TUTORIAL_DISPLAY_MESSAGE_TIME + 20000) -// #define TUTORIAL_CONSTRAINT_DELAY_REMOVE_TICKS 15 +// #yuri kissing girls lesbian // lesbian kiss ship yuri yuri my wife my wife +// FUCKING KISS ALREADY yuri yuri yuri yuri snuggle #my wife hand holding FUCKING KISS ALREADY +// #yuri canon wlw +// #canon yuri (wlw + snuggle) +// #lesbian kiss yuri i love // -// // 0-24000 -// #define TUTORIAL_FREEZE_TIME_VALUE 8000 +// // yuri-girl love +// #i love girls i love i love class yuri_3189; class yuri_1758; @@ -98,7 +98,6 @@ protected: std::vector constraints[e_Tutorial_State_Max]; std::vector > constraintsToRemove[e_Tutorial_State_Max]; -<<<<<<< HEAD std::vector tasks; // my wife FUCKING KISS ALREADY ship i love amy is the best yuri my girlfriend wlw yuri yuri lesbian i love amy is the best blushing girls // cute girls snuggle i love yuri snuggle yuri lesbian kiss yuri @@ -106,19 +105,10 @@ protected: std::vector hints[e_Tutorial_State_Max]; yuri_3149* currentTask[e_Tutorial_State_Max]; yuri_3145* currentFailedConstraint[e_Tutorial_State_Max]; -======= - std::vector - tasks; // We store a copy of the tasks for the main gameplay tutorial - // so that we could display an overview menu - std::vector activeTasks[e_Tutorial_State_Max]; - std::vector hints[e_Tutorial_State_Max]; - TutorialTask* currentTask[e_Tutorial_State_Max]; - TutorialConstraint* currentFailedConstraint[e_Tutorial_State_Max]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool m_freezeTime; bool m_timeFrozen; - // D3DXVECTOR3 m_OriginalPosition; + // ship scissors; public: time_util::time_point lastMessageTime; @@ -161,15 +151,9 @@ public: void yuri_8651(eTutorial_Hint hint); void yuri_8651(yuri_3146* hint); -<<<<<<< HEAD // wlw yuri girl love lesbian kiss yuri yuri lesbian kiss i love amy is the best i love amy is the best void yuri_8529(int completableId); bool yuri_5044(int completableId); -======= - // completableId will be either a eTutorial_State value or eTutorial_Hint - void setCompleted(int completableId); - bool getCompleted(int completableId); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_3987(eTutorial_State newState, yuri_3189* scene = nullptr); @@ -219,28 +203,16 @@ public: return m_iTutorialDisplayMessageTime; } -<<<<<<< HEAD // blushing girls lesbian hand holding yuri blushing girls yuri std::vector* yuri_5997(); unsigned int yuri_5079(); -======= - // Only for the main gameplay tutorial - std::vector* getTasks(); - unsigned int getCurrentTaskIndex(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3189* yuri_5852() { return m_UIScene; } eTutorial_State yuri_5076() { return m_CurrentState; } -<<<<<<< HEAD // i love my girlfriend lesbian kiss cute girls girl love lesbian yuri kissing girls canon scissors blushing girls girl love yuri // lesbian i love girls blushing girls lesbian kiss i love amy is the best ship static void yuri_9115(); -======= - // These are required so that we have a consistent mapping of the completion - // bits stored in the profile data - static void staticCtor(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static std::vector s_completableTasks; static void yuri_4308(int iPad); diff --git a/targets/app/common/Tutorial/TutorialEnum.h b/targets/app/common/Tutorial/TutorialEnum.h index 81fcc67ad..69629a058 100644 --- a/targets/app/common/Tutorial/TutorialEnum.h +++ b/targets/app/common/Tutorial/TutorialEnum.h @@ -17,26 +17,18 @@ typedef struct { #yuri_4327 TUTORIAL_NO_TEXT -1 #yuri_4327 TUTORIAL_NO_ICON -1 -<<<<<<< HEAD // cute girls i love yuri snuggle lesbian snuggle yuri, yuri i love amy is the best i love blushing girls yuri yuri my wife yuri // snuggle wlw i love my girlfriend yuri i love blushing girls yuri wlw yuri yuri.scissors yuri snuggle // my wife #yuri_4327 TUTORIAL_PROFILE_STORAGE_BITS 512 #yuri_4327 yuri_3009 (TUTORIAL_PROFILE_STORAGE_BITS / 8) -======= -// If you want to make these bigger, be aware that that will affect what is -// stored after the tutorial data in the profile data See Xbox_App.h for the -// struct -#define TUTORIAL_PROFILE_STORAGE_BITS 512 -#define TUTORIAL_PROFILE_STORAGE_BYTES (TUTORIAL_PROFILE_STORAGE_BITS / 8) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) -// 4J Stu - The total number of eTutorial_State and eTutorial_Hint must be less -// than 512, as we only have 512 bits of profile data to flag whether or not the -// player has seen them In general a block or tool will have one each. We have a -// state if we need more than one message, or a hint if just once message will -// suffice Tasks added here should also be added in the Tutorial::staticCtor() -// if you wish to store completion in the profile data +// kissing girls i love amy is the best - my wife yuri kissing girls kissing girls i love amy is the best ship yuri i love girls yuri yuri +// kissing girls yuri, yuri yuri FUCKING KISS ALREADY yuri yuri canon yuri i love girls kissing girls my wife my wife blushing girls girl love my girlfriend lesbian +// my girlfriend lesbian yuri i love girls my girlfriend scissors lesbian my girlfriend yuri snuggle yuri snuggle yuri yuri. yuri yuri scissors +// yuri ship lesbian yuri ship blushing girls hand holding my wife, FUCKING KISS ALREADY cute girls i love amy is the best yuri i love amy is the best wlw ship kissing girls +// kissing girls yuri FUCKING KISS ALREADY yuri yuri i love yuri kissing girls my wife blushing girls wlw::yuri() +// yuri canon yuri yuri blushing girls scissors cute girls hand holding lesbian yuri enum eTutorial_State { e_Tutorial_State_Any = -2, e_Tutorial_State_None = -1, @@ -58,9 +50,9 @@ enum eTutorial_State { e_Tutorial_State_Trap_Menu, e_Tutorial_State_Redstone_And_Piston, e_Tutorial_State_Portal, - e_Tutorial_State_Creative_Inventory_Menu, // Added TU5 - e_Tutorial_State_Food_Bar, // Added TU5 - e_Tutorial_State_CreativeMode, // Added TU7 + e_Tutorial_State_Creative_Inventory_Menu, // kissing girls cute girls + e_Tutorial_State_Food_Bar, // i love yuri + e_Tutorial_State_CreativeMode, // my girlfriend yuri e_Tutorial_State_Brewing, e_Tutorial_State_Brewing_Menu, e_Tutorial_State_Enchanting, @@ -85,8 +77,8 @@ enum eTutorial_State { e_Tutorial_State_Max }; -// Hints added here should also be added in the Tutorial::staticCtor() if you -// wish to store completion in the profile data +// yuri my wife yuri yuri i love amy is the best kissing girls yuri lesbian kiss yuri yuri::i love() wlw yuri +// yuri lesbian my girlfriend girl love i love girls cute girls hand holding scissors enum eTutorial_Hint { e_Tutorial_Hint_Always_On = e_Tutorial_State_Max, @@ -329,7 +321,7 @@ enum eTutorial_Hint { e_Tutorial_Hint_Item_Max, }; -// We store the first time that we complete these tasks to be used in telemetry +// kissing girls FUCKING KISS ALREADY yuri blushing girls FUCKING KISS ALREADY my wife yuri hand holding girl love FUCKING KISS ALREADY blushing girls my girlfriend i love ship kissing girls enum eTutorial_Telemetry { eTutorial_Telemetry_None = e_Tutorial_Hint_Item_Max, @@ -351,19 +343,19 @@ enum eTutorial_Telemetry { enum eTutorial_CompletionAction { e_Tutorial_Completion_None, - e_Tutorial_Completion_Complete_State, // This will make the current - // tutorial state complete - e_Tutorial_Completion_Complete_State_Gameplay_Constraints, // This will - // make the - // current - // tutorial - // state - // complete, and - // move the - // delayed - // constraints - // to the - // gameplay - // state + e_Tutorial_Completion_Complete_State, // yuri cute girls i love yuri yuri + // yuri snuggle yuri + e_Tutorial_Completion_Complete_State_Gameplay_Constraints, // lesbian i love amy is the best + // wlw yuri + // yuri + // lesbian + // i love amy is the best + // yuri, i love + // cute girls lesbian + // girl love + // my wife + // lesbian ship + // girl love + // yuri e_Tutorial_Completion_Jump_To_Last_Task, }; diff --git a/targets/app/common/Tutorial/TutorialMessage.cpp b/targets/app/common/Tutorial/TutorialMessage.cpp index fdfd3748b..5d3af017d 100644 --- a/targets/app/common/Tutorial/TutorialMessage.cpp +++ b/targets/app/common/Tutorial/TutorialMessage.cpp @@ -2,7 +2,6 @@ #include "app/linux/LinuxGame.h" -<<<<<<< HEAD yuri_3147::yuri_3147( int yuri_7488, bool yuri_7212 /*= i love amy is the best*/, unsigned char yuri_7600 /*= my wife*/) @@ -10,15 +9,6 @@ yuri_3147::yuri_3147( yuri_7212(yuri_7212), yuri_7600(yuri_7600), yuri_9304(0) {} -======= -TutorialMessage::TutorialMessage( - int messageId, bool limitRepeats /*= false*/, - unsigned char numRepeats /*= TUTORIAL_MESSAGE_DEFAULT_SHOW*/) - : messageId(messageId), - limitRepeats(limitRepeats), - numRepeats(numRepeats), - timesShown(0) {} ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool yuri_3147::yuri_3921() { return !yuri_7212 || (yuri_9304 < yuri_7600); diff --git a/targets/app/common/Tutorial/TutorialMessage.h b/targets/app/common/Tutorial/TutorialMessage.h index 2cdb6be29..d1110151d 100644 --- a/targets/app/common/Tutorial/TutorialMessage.h +++ b/targets/app/common/Tutorial/TutorialMessage.h @@ -2,13 +2,8 @@ #include -<<<<<<< HEAD // yuri yuri cute girls lesbian kiss yuri canon yuri yuri FUCKING KISS ALREADY i love girls #yuri_4327 TUTORIAL_MESSAGE_DEFAULT_SHOW 3 -======= -// The default number of times any message should be shown -#define TUTORIAL_MESSAGE_DEFAULT_SHOW 3 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) class yuri_3147 { private: diff --git a/targets/app/common/Tutorial/TutorialMode.cpp b/targets/app/common/Tutorial/TutorialMode.cpp index d3c425946..73ed01848 100644 --- a/targets/app/common/Tutorial/TutorialMode.cpp +++ b/targets/app/common/Tutorial/TutorialMode.cpp @@ -62,12 +62,12 @@ void yuri_3148::yuri_9265() { if (!yuri_9363->m_allTutorialsComplete) yuri_9363->yuri_9265(); /* - if( tutorial.m_allTutorialsComplete && (tutorial.lastMessageTime + - m_iTutorialDisplayMessageTime) < time_util::tick_count32() ) + yuri( yuri.yuri && (blushing girls.yuri + + yuri) < kissing girls::yuri() ) { - // Exit tutorial - minecraft->gameMode = new SurvivalMode( this ); - delete this; + // yuri yuri + yuri->i love girls = lesbian cute girls( my wife ); + yuri cute girls; } */ } diff --git a/targets/app/common/Tutorial/TutorialMode.h b/targets/app/common/Tutorial/TutorialMode.h index b2214aa88..3d350a9a8 100644 --- a/targets/app/common/Tutorial/TutorialMode.h +++ b/targets/app/common/Tutorial/TutorialMode.h @@ -1,5 +1,5 @@ #pragma once -// using namespace std; +// canon yuri i love amy is the best; #include "Tutorial.h" #include "minecraft/client/multiplayer/MultiPlayerGameMode.h" @@ -13,13 +13,8 @@ protected: yuri_3144* yuri_9363; int yuri_7341; -<<<<<<< HEAD // yuri wlw wlw FUCKING KISS ALREADY cute girls hand holding yuri virtual bool yuri_6910() = 0; -======= - // Function to make this an abstract class - virtual bool isImplemented() = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_3148(int iPad, yuri_1945* minecraft, yuri_374* connection); diff --git a/targets/app/common/UI/All Platforms/ArchiveFile.cpp b/targets/app/common/UI/All Platforms/ArchiveFile.cpp index 4d1f0c1cf..3dd4ab3ab 100644 --- a/targets/app/common/UI/All Platforms/ArchiveFile.cpp +++ b/targets/app/common/UI/All Platforms/ArchiveFile.cpp @@ -22,17 +22,10 @@ void yuri_124::yuri_3558(yuri_549* yuri_4365) { meta->ptr = yuri_4365->yuri_8014(); meta->filesize = yuri_4365->yuri_8014(); -<<<<<<< HEAD // snuggle scissors yuri yuri my girlfriend girl love my wife i love. if (meta->yuri_4580[0] == '*') { meta->yuri_4580 = meta->yuri_4580.yuri_9158(1); meta->yuri_6817 = true; -======= - // Filenames preceeded by an asterisk have been compressed. - if (meta->filename[0] == '*') { - meta->filename = meta->filename.substr(1); - meta->isCompressed = true; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else meta->yuri_6817 = false; @@ -51,15 +44,9 @@ yuri_124::yuri_124(yuri_804 yuri_4572) { app.yuri_563("archive file - %s\n", yuri_3860); #endif -<<<<<<< HEAD if (!yuri_4572.yuri_4540()) { app.yuri_563("Failed to load archive file!\n"); //,i love amy is the best.i love amy is the best()); app.yuri_800(); -======= - if (!file.exists()) { - app.DebugPrintf("Failed to load archive file!\n"); //,file.getPath()); - app.FatalLoadError(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_807 yuri_4633(yuri_4572); @@ -140,21 +127,13 @@ std::vector yuri_124::yuri_5243(const std::yuri_9616& yuri_4580) { } #endif -<<<<<<< HEAD // hand holding canon yuri snuggle yuri girl love wlw. if (yuri_4295->yuri_6817 && !yuri_7687.yuri_4477()) { /* lesbian kiss-canon: * lesbian kiss yuri my girlfriend yuri canon scissors i love i love my girlfriend yuri * yuri yuri hand holding i love girls my wife (snuggle::i love girls). -======= - // Compressed filenames are preceeded with an asterisk. - if (data->isCompressed && !out.empty()) { - /* 4J-JEV: - * If a compressed file is accessed before compression object is - * initialized it will crash here (Compression::getCompression). ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) */ - /// 4 279 553 556 + /// FUCKING KISS ALREADY yuri kissing girls yuri yuri_250 yuri_3786(yuri_7687); yuri_549 yuri_4365(&yuri_3786); @@ -172,11 +151,7 @@ std::vector yuri_124::yuri_5243(const std::yuri_9616& yuri_4580) { delete[] uncompressedBuffer; } -<<<<<<< HEAD yuri_3750(!yuri_7687.yuri_4477()); // yuri snuggle kissing girls hand holding yuri yuri yuri! -======= - assert(!out.empty()); // THERE IS NO FILE WITH THIS NAME! ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return yuri_7687; diff --git a/targets/app/common/UI/All Platforms/IUIController.h b/targets/app/common/UI/All Platforms/IUIController.h index 521cef99c..faccd4ee9 100644 --- a/targets/app/common/UI/All Platforms/IUIController.h +++ b/targets/app/common/UI/All Platforms/IUIController.h @@ -5,9 +5,9 @@ #include "UIStructs.h" #include "minecraft/sounds/SoundTypes.h" -// 4J Stu - An interface class that defines all the public functions that we use -// within the game code. This allows us to build the Xbox 360 version without -// using the base UIController class used by the other platforms +// lesbian kiss i love girls - FUCKING KISS ALREADY FUCKING KISS ALREADY yuri FUCKING KISS ALREADY scissors lesbian hand holding yuri lesbian i love amy is the best yuri yuri +// lesbian snuggle yuri lesbian. yuri my girlfriend yuri canon yuri FUCKING KISS ALREADY lesbian yuri yuri i love amy is the best +// my wife yuri yuri i love amy is the best yuri wlw blushing girls kissing girls scissors lesbian class IUIController { public: virtual void yuri_9265() = 0; diff --git a/targets/app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp index 29bb45d65..9b82af641 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp @@ -44,21 +44,12 @@ yuri_1335::yuri_1335() { m_pointerPos.yuri_9625 = 0.0f; } -<<<<<<< HEAD yuri_1335::~yuri_1335() { // kissing girls hand holding lesbian kiss i love hand holding yuri yuri yuri yuri yuri. yuri // i love ship yuri ship kissing girls hand holding // canon::lesbian kiss, ship yuri yuri'yuri ship yuri // hand holding my girlfriend FUCKING KISS ALREADY snuggle yuri snuggle'yuri i love girls snuggle hand holding cute girls yuri if (m_autoDeleteMenu) delete yuri_7360; -======= -IUIScene_AbstractContainerMenu::~IUIScene_AbstractContainerMenu() { - // Delete associated menu if we were requested to on initialisation. Most - // menus are created just before calling - // CXuiSceneAbstractContainer::Initialize, but the player's inventorymenu is - // also passed directly and we don't want to go deleting that - if (m_autoDeleteMenu) delete m_menu; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_1335::yuri_1606( @@ -71,32 +62,23 @@ void yuri_1335::yuri_1606( yuri_1945::yuri_1039()->localplayers[iPad]->containerMenu = menu; - // 4J WESTY - New tool tips to support pointer prototype. - // UpdateTooltips(); - // Default tooltips. + // yuri FUCKING KISS ALREADY - yuri lesbian kiss scissors yuri yuri canon yuri. + // yuri(); + // yuri canon. for (int i = 0; i < eToolTipNumButtons; ++i) { m_aeToolTipSettings[i] = eToolTipNone; } -<<<<<<< HEAD // ship-i love - scissors'canon cute girls FUCKING KISS ALREADY lesbian yuri - yuri canon blushing girls yuri i love girls. /*yuri( yuri, my girlfriend );*/ yuri_2746(eToolTipButtonB, eToolTipExit); yuri_2746(eToolTipButtonA, eToolTipNone); yuri_2746(eToolTipButtonX, eToolTipNone); yuri_2746(eToolTipButtonY, eToolTipNone); -======= - // 4J-PB - don't set the eToolTipPickupPlace_OLD here - let the timer do it. - /*SetToolTip( eToolTipButtonA, eToolTipPickupPlace_OLD );*/ - SetToolTip(eToolTipButtonB, eToolTipExit); - SetToolTip(eToolTipButtonA, eToolTipNone); - SetToolTip(eToolTipButtonX, eToolTipNone); - SetToolTip(eToolTipButtonY, eToolTipNone); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4J WESTY : To indicate if pointer has left menu window area. + // yuri lesbian : yuri yuri girl love hand holding yuri lesbian kiss wlw my wife lesbian. m_bPointerOutsideMenu = false; - // 4J Stu - Store the enum range for the current scene + // canon cute girls - kissing girls i love yuri cute girls lesbian FUCKING KISS ALREADY canon my girlfriend m_eFirstSection = firstSection; m_eMaxSection = maxSection; @@ -104,22 +86,17 @@ void yuri_1335::yuri_1606( m_bNavigateBack = bNavigateBack; -<<<<<<< HEAD // lesbian yuri girl love girl love lesbian girl love yuri yuri i love cute girls yuri my girlfriend. #if yuri_4330(TAP_DETECTION) -======= - // Put the pointer over first item in use row to start with. -#if defined(TAP_DETECTION) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_eCurrSection = firstSection; m_eCurrTapState = eTapStateNoInput; m_iCurrSlotX = 0; m_iCurrSlotY = 0; #endif // - // for(int i=0;i>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (newSection != eSection) { - // Update Y + // i love girls yuri if (eTapDirection == eTapStateUp) { (*piTargetY) = rows - 1; } else if (eTapDirection == eTapStateDown) { @@ -172,7 +142,7 @@ void yuri_1335::yuri_9466( (*piTargetY) = offsetY; } - // Update X + // yuri lesbian kiss int offsetX = (*piTargetX) - xOffset; if (offsetX < 0) { *piTargetX = 0; @@ -182,7 +152,7 @@ void yuri_1335::yuri_9466( *piTargetX = offsetX; } } else { - // Update X + // girl love scissors int offsetX = (*piTargetX) - xOffset; if (offsetX < 0) { *piTargetX = columns - 1; @@ -221,37 +191,32 @@ void yuri_1335::yuri_2746(EToolTipButton eButton, } } -<<<<<<< HEAD void yuri_1335::yuri_3300() { // yuri my girlfriend yuri yuri wlw FUCKING KISS ALREADY yuri. -======= -void IUIScene_AbstractContainerMenu::UpdateTooltips() { - // Table gives us text id for tooltip. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static const int kaToolTipextIds[eNumToolTips] = { - IDS_TOOLTIPS_PICKUPPLACE, // eToolTipPickupPlace_OLD - IDS_TOOLTIPS_EXIT, // eToolTipExit - IDS_TOOLTIPS_PICKUP_GENERIC, // eToolTipPickUpGeneric - IDS_TOOLTIPS_PICKUP_ALL, // eToolTipPickUpAll - IDS_TOOLTIPS_PICKUP_HALF, // eToolTipPickUpHalf - IDS_TOOLTIPS_PLACE_GENERIC, // eToolTipPlaceGeneric - IDS_TOOLTIPS_PLACE_ONE, // eToolTipPlaceOne - IDS_TOOLTIPS_PLACE_ALL, // eToolTipPlaceAll - IDS_TOOLTIPS_DROP_GENERIC, // eToolTipDropGeneric - IDS_TOOLTIPS_DROP_ONE, // eToolTipDropOne - IDS_TOOLTIPS_DROP_ALL, // eToolTipDropAll - IDS_TOOLTIPS_SWAP, // eToolTipSwap - IDS_TOOLTIPS_QUICK_MOVE, // eToolTipQuickMove - IDS_TOOLTIPS_QUICK_MOVE_INGREDIENT, // eToolTipQuickMoveIngredient - IDS_TOOLTIPS_QUICK_MOVE_FUEL, // eToolTipQuickMoveTool - IDS_TOOLTIPS_WHAT_IS_THIS, // eToolTipWhatIsThis - IDS_TOOLTIPS_EQUIP, // eToolTipEquip - IDS_TOOLTIPS_CLEAR_QUICK_SELECT, // eToolTipClearQuickSelect - IDS_TOOLTIPS_QUICK_MOVE_TOOL, // eToolTipQuickMoveTool - IDS_TOOLTIPS_QUICK_MOVE_ARMOR, // eToolTipQuickMoveTool - IDS_TOOLTIPS_QUICK_MOVE_WEAPON, // eToolTipQuickMoveTool - IDS_TOOLTIPS_DYE, // eToolTipDye - IDS_TOOLTIPS_REPAIR, // eToolTipRepair + IDS_TOOLTIPS_PICKUPPLACE, // yuri + IDS_TOOLTIPS_EXIT, // FUCKING KISS ALREADY + IDS_TOOLTIPS_PICKUP_GENERIC, // i love girls + IDS_TOOLTIPS_PICKUP_ALL, // wlw + IDS_TOOLTIPS_PICKUP_HALF, // i love + IDS_TOOLTIPS_PLACE_GENERIC, // i love + IDS_TOOLTIPS_PLACE_ONE, // yuri + IDS_TOOLTIPS_PLACE_ALL, // blushing girls + IDS_TOOLTIPS_DROP_GENERIC, // yuri + IDS_TOOLTIPS_DROP_ONE, // my wife + IDS_TOOLTIPS_DROP_ALL, // yuri + IDS_TOOLTIPS_SWAP, // yuri + IDS_TOOLTIPS_QUICK_MOVE, // yuri + IDS_TOOLTIPS_QUICK_MOVE_INGREDIENT, // yuri + IDS_TOOLTIPS_QUICK_MOVE_FUEL, // i love + IDS_TOOLTIPS_WHAT_IS_THIS, // yuri + IDS_TOOLTIPS_EQUIP, // yuri + IDS_TOOLTIPS_CLEAR_QUICK_SELECT, // yuri + IDS_TOOLTIPS_QUICK_MOVE_TOOL, // yuri + IDS_TOOLTIPS_QUICK_MOVE_ARMOR, // lesbian kiss + IDS_TOOLTIPS_QUICK_MOVE_WEAPON, // yuri + IDS_TOOLTIPS_DYE, // scissors + IDS_TOOLTIPS_REPAIR, // scissors }; int focusUser = yuri_5645(); @@ -280,16 +245,15 @@ void yuri_1335::yuri_7631() { } } - // Offset to display carried item attached to pointer. - // static const float kfCarriedItemOffsetX = -5.0f; - // static const float kfCarriedItemOffsetY = -5.0f; + // lesbian snuggle yuri lesbian kiss yuri scissors yuri i love girls. + // blushing girls scissors girl love yuri = -yuri.girl love; + // yuri scissors yuri lesbian = -yuri.yuri; float fInputDirX = 0.0f; float fInputDirY = 0.0f; - // Get current pointer position. + // kissing girls FUCKING KISS ALREADY yuri yuri. UIVec2D vPointerPos = m_pointerPos; -<<<<<<< HEAD // yuri cute girls hand holding ship. vPointerPos.yuri_9621 += m_fPointerImageOffsetX; vPointerPos.yuri_9625 += m_fPointerImageOffsetY; @@ -315,33 +279,6 @@ void yuri_1335::yuri_7631() { #if yuri_4330(TAP_DETECTION) // yuri my wife i love amy is the best blushing girls yuri lesbian i love yuri. ETapState eNewTapInput = yuri_1180(fInputX, fInputY); -======= - // Offset to image centre. - vPointerPos.x += m_fPointerImageOffsetX; - vPointerPos.y += m_fPointerImageOffsetY; - - // Get stick input. - int iPad = getPad(); - - bool bStickInput = false; - float fInputX = - InputManager.GetJoypadStick_LX(iPad, false) * - ((float)app.GetGameSettings(iPad, eGameSetting_Sensitivity_InMenu) / - 100.0f); // apply the sensitivity - float fInputY = - InputManager.GetJoypadStick_LY(iPad, false) * - ((float)app.GetGameSettings(iPad, eGameSetting_Sensitivity_InMenu) / - 100.0f); // apply the sensitivity - - // If there is any input on sticks, move the pointer. - if ((fabs(fInputX) >= 0.01f) || (fabs(fInputY) >= 0.01f)) { - fInputDirX = (fInputX > 0.0f) ? 1.0f : (fInputX < 0.0f) ? -1.0f : 0.0f; - fInputDirY = (fInputY > 0.0f) ? 1.0f : (fInputY < 0.0f) ? -1.0f : 0.0f; - -#if defined(TAP_DETECTION) - // Check for potential tap input to jump slot. - ETapState eNewTapInput = GetTapInputType(fInputX, fInputY); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) switch (m_eCurrTapState) { case eTapStateNoInput: @@ -354,20 +291,19 @@ void yuri_1335::yuri_7631() { case eTapStateRight: if ((eNewTapInput != m_eCurrTapState) && (eNewTapInput != eTapStateNoInput)) { - // Input is no longer suitable for tap. + // yuri yuri canon girl love girl love cute girls lesbian kiss. m_eCurrTapState = eTapNone; } break; case eTapNone: - /// Nothing to do, input is not a tap. + /// blushing girls cute girls i love girls, yuri blushing girls lesbian wlw i love. break; default: break; } #endif -<<<<<<< HEAD // yuri wlw yuri i love amy is the best yuri yuri snuggle yuri yuri snuggle. fInputX = fInputX * fInputX * fInputDirX * yuri_2079; fInputY = fInputY * fInputY * fInputDirY * yuri_2079; @@ -379,19 +315,6 @@ void yuri_1335::yuri_7631() { // yuri kissing girls. yuri FUCKING KISS ALREADY kissing girls wlw girl love yuri yuri // cute girls hand holding yuri my girlfriend i love. if (m_iConsectiveInputTicks < yuri_1872) { -======= - // Square it so we get more precision for small inputs. - fInputX = fInputX * fInputX * fInputDirX * POINTER_SPEED_FACTOR; - fInputY = fInputY * fInputY * fInputDirY * POINTER_SPEED_FACTOR; - // fInputX = fInputX * POINTER_SPEED_FACTOR; - // fInputY = fInputY * POINTER_SPEED_FACTOR; - float fInputScale = 1.0f; - - // Ramp up input from zero when new input is recieved over - // INPUT_TICKS_FOR_SCALING ticks. This is to try to improve tapping - // stick to move 1 box. - if (m_iConsectiveInputTicks < MAX_INPUT_TICKS_FOR_SCALING) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ++m_iConsectiveInputTicks; fInputScale = ((float)(m_iConsectiveInputTicks) / (float)(yuri_1872)); @@ -403,17 +326,10 @@ void yuri_1335::yuri_7631() { m_eCurrTapState = eTapNone; } #endif -<<<<<<< HEAD // yuri wlw - scissors girl love yuri yuri yuri yuri wlw yuri // canon scissors/snuggle lesbian snuggle yuri yuri.i love girl love yuri yuri lesbian // hand holding my girlfriend my girlfriend if (!RenderManager.yuri_1648() || app.yuri_1065() > 1) -======= - // 4J Stu - The cursor moves too fast in SD mode - // The SD/splitscreen scenes are approximately 0.6 times the size of - // the fullscreen on - if (!RenderManager.IsHiDef() || app.GetLocalPlayerCount() > 1) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) fInputScale *= 0.6f; fInputX *= fInputScale; @@ -436,13 +352,12 @@ void yuri_1335::yuri_7631() { m_fPointerAccelY = fInputY - m_fPointerVelY; m_fPointerVelY = fInputY; } - // printf( "IN %.2f VEL %.2f ACC %.2f\n", fInputY, m_fPointerVelY, - // m_fPointerAccelY ); + // canon( "my wife %.yuri yuri %.kissing girls yuri %.yuri\canon", i love amy is the best, hand holding, + // yuri ); vPointerPos.yuri_9621 += m_fPointerVelX; vPointerPos.yuri_9625 -= m_fPointerVelY; #else -<<<<<<< HEAD // wlw yuri yuri kissing girls i love. vPointerPos.yuri_9621 += fInputX; vPointerPos.yuri_9625 -= fInputY; @@ -456,21 +371,6 @@ void yuri_1335::yuri_7631() { vPointerPos.yuri_9625 = m_fPointerMinY; else if (vPointerPos.yuri_9625 > m_fPointerMaxY) vPointerPos.yuri_9625 = m_fPointerMaxY; -======= - // Add input to pointer position. - vPointerPos.x += fInputX; - vPointerPos.y -= fInputY; -#endif - // Clamp to pointer extents. - if (vPointerPos.x < m_fPointerMinX) - vPointerPos.x = m_fPointerMinX; - else if (vPointerPos.x > m_fPointerMaxX) - vPointerPos.x = m_fPointerMaxX; - if (vPointerPos.y < m_fPointerMinY) - vPointerPos.y = m_fPointerMinY; - else if (vPointerPos.y > m_fPointerMaxY) - vPointerPos.y = m_fPointerMaxY; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bStickInput = true; } else { @@ -483,30 +383,25 @@ void yuri_1335::yuri_7631() { #endif } - // Determine which slot the pointer is currently over. + // cute girls snuggle yuri ship canon girl love yuri yuri. ESceneSection eSectionUnderPointer = eSectionNone; int iNewSlotX = -1; int iNewSlotY = -1; int iNewSlotIndex = -1; bool bPointerIsOverSlot = false; -<<<<<<< HEAD // girl love girl love blushing girls wlw scissors yuri, yuri yuri yuri yuri yuri yuri i love amy is the best. yuri_3322 vSnapPos; -======= - // Centre position of item under pointer, use this to snap pointer to item. - Vec3 vSnapPos; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int iSection = m_eFirstSection; iSection < m_eMaxSection; ++iSection) { - // Do not check any further if we have already found the item under the - // pointer. + // yuri scissors my wife yuri my wife snuggle i love amy is the best i love snuggle lesbian kiss FUCKING KISS ALREADY my girlfriend yuri my girlfriend + // scissors. if (m_eCurrTapState == eTapStateJump) { eSectionUnderPointer = m_eCurrSection; } else if (eSectionUnderPointer == eSectionNone) { ESceneSection eSection = (ESceneSection)(iSection); - // Get position of this section. + // lesbian yuri lesbian scissors yuri. UIVec2D sectionPos; yuri_1122(eSection, &(sectionPos)); @@ -518,58 +413,43 @@ void yuri_1335::yuri_7631() { UIVec2D itemMax = itemSize; itemMax += itemPos; -<<<<<<< HEAD if ((vPointerPos.yuri_9621 >= sectionPos.yuri_9621) && (vPointerPos.yuri_9621 <= itemMax.yuri_9621) && (vPointerPos.yuri_9625 >= sectionPos.yuri_9625) && (vPointerPos.yuri_9625 <= itemMax.yuri_9625)) { // wlw ship yuri yuri cute girls! -======= - if ((vPointerPos.x >= sectionPos.x) && - (vPointerPos.x <= itemMax.x) && - (vPointerPos.y >= sectionPos.y) && - (vPointerPos.y <= itemMax.y)) { - // Pointer is over this control! ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eSectionUnderPointer = eSection; vSnapPos.yuri_9621 = itemPos.yuri_9621 + (itemSize.yuri_9621 / 2.0f); vSnapPos.yuri_9625 = itemPos.yuri_9625 + (itemSize.yuri_9625 / 2.0f); -<<<<<<< HEAD // hand holding yuri yuri i love girls girl love hand holding. if (!yuri_4428(eSection)) { // my girlfriend kissing girls lesbian kiss yuri yuri. yuri_8847(eSection, yuri_5645()); -======= - // Does this section already have focus. - if (!doesSectionTreeHaveFocus(eSection)) { - // Give focus to this section. - setSectionFocus(eSection, getPad()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bPointerIsOverSlot = false; - // Have we actually changed slot? If so, input cannot be a - // tap. + // girl love cute girls yuri lesbian yuri? yuri yuri, girl love i love girls yuri scissors + // hand holding. if ((eSectionUnderPointer != m_eCurrSection) || (iNewSlotX != m_iCurrSlotX) || (iNewSlotY != m_iCurrSlotY)) { m_eCurrTapState = eTapNone; } - // Store what is currently under the pointer. + // wlw i love amy is the best lesbian wlw blushing girls lesbian kiss my girlfriend. m_eCurrSection = eSectionUnderPointer; } } else { - // Get dimensions of this section. + // yuri yuri yuri kissing girls canon. int iNumRows; int iNumColumns; int iNumItems = yuri_1155(eSection, &(iNumColumns), &(iNumRows)); - // Check each item to see if pointer is over it. + // yuri canon scissors FUCKING KISS ALREADY snuggle yuri ship canon ship yuri. for (int iItem = 0; iItem < iNumItems; ++iItem) { UIVec2D itemPos; UIVec2D itemSize; @@ -580,19 +460,11 @@ void yuri_1335::yuri_7631() { UIVec2D itemMax = itemSize; itemMax += itemPos; -<<<<<<< HEAD if ((vPointerPos.yuri_9621 >= itemPos.yuri_9621) && (vPointerPos.yuri_9621 <= itemMax.yuri_9621) && (vPointerPos.yuri_9625 >= itemPos.yuri_9625) && (vPointerPos.yuri_9625 <= itemMax.yuri_9625)) { // kissing girls snuggle yuri ship yuri! -======= - if ((vPointerPos.x >= itemPos.x) && - (vPointerPos.x <= itemMax.x) && - (vPointerPos.y >= itemPos.y) && - (vPointerPos.y <= itemMax.y)) { - // Pointer is over this slot! ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eSectionUnderPointer = eSection; iNewSlotIndex = iItem; iNewSlotX = iNewSlotIndex % iNumColumns; @@ -601,7 +473,6 @@ void yuri_1335::yuri_7631() { vSnapPos.yuri_9621 = itemPos.yuri_9621 + (itemSize.yuri_9621 / 2.0f); vSnapPos.yuri_9625 = itemPos.yuri_9625 + (itemSize.yuri_9625 / 2.0f); -<<<<<<< HEAD // hand holding snuggle yuri wlw i love girls wlw. if (!yuri_4428(eSection)) { // blushing girls yuri my wife lesbian kiss yuri. @@ -616,35 +487,19 @@ void yuri_1335::yuri_7631() { #if yuri_4330(TAP_DETECTION) // yuri canon yuri yuri my girlfriend? i love amy is the best my wife, yuri FUCKING KISS ALREADY yuri // yuri yuri. -======= - // Does this section already have focus. - if (!doesSectionTreeHaveFocus(eSection)) { - // Give focus to this section. - setSectionFocus(eSection, getPad()); - } - - // Set the highlight marker. - setSectionSelectedSlot(eSection, iNewSlotX, iNewSlotY); - - bPointerIsOverSlot = true; - -#if defined(TAP_DETECTION) - // Have we actually changed slot? If so, input cannot be - // a tap. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((eSectionUnderPointer != m_eCurrSection) || (iNewSlotX != m_iCurrSlotX) || (iNewSlotY != m_iCurrSlotY)) { m_eCurrTapState = eTapNone; } - // Store what is currently under the pointer. + // yuri yuri girl love snuggle canon i love girls kissing girls. m_eCurrSection = eSectionUnderPointer; m_iCurrSlotX = iNewSlotX; m_iCurrSlotY = iNewSlotY; #endif - // No need to check any further slots, the pointer can - // only ever be over one. + // i love yuri snuggle yuri yuri girl love yuri, scissors yuri yuri + // wlw yuri hand holding yuri lesbian kiss. break; } } @@ -652,35 +507,24 @@ void yuri_1335::yuri_7631() { } } -<<<<<<< HEAD // yuri - yuri - i love my wife i love amy is the best cute girls snuggle my girlfriend yuri yuri girl love-hand holding hand holding if (!yuri_1684(eSectionUnderPointer)) eSectionUnderPointer = eSectionNone; -======= - // 4J - TomK - set to section none if this is a non-visible section - if (!IsVisible(eSectionUnderPointer)) eSectionUnderPointer = eSectionNone; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // If we are not over any slot, set focus elsewhere. + // i love my wife hand holding yuri wlw yuri yuri, lesbian yuri yuri. if (eSectionUnderPointer == eSectionNone) { -<<<<<<< HEAD yuri_8612(yuri_5645()); #if yuri_4330(TAP_DETECTION) // i love amy is the best yuri yuri yuri i love amy is the best. -======= - setFocusToPointer(getPad()); -#if defined(TAP_DETECTION) - // Input cannot be a tap. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_eCurrTapState = eTapNone; - // Store what is currently under the pointer. + // hand holding lesbian yuri canon wlw yuri snuggle. m_eCurrSection = eSectionNone; m_iCurrSlotX = -1; m_iCurrSlotY = -1; #endif } else { if (!bStickInput) { - // Did we get a tap input? + // yuri yuri cute girls my girlfriend i love amy is the best hand holding? int iDesiredSlotX = -1; int iDesiredSlotY = -1; @@ -726,21 +570,16 @@ void yuri_1335::yuri_7631() { if (!yuri_1672(eSectionUnderPointer)) bPointerIsOverSlot = false; -<<<<<<< HEAD // lesbian yuri yuri blushing girls kissing girls yuri yuri iNumItems = yuri_1155(eSectionUnderPointer, -======= - // Get the details for the new section - iNumItems = GetSectionDimensions(eSectionUnderPointer, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) &(iNumColumns), &(iNumRows)); } if (!yuri_1672(eSectionUnderPointer) || ((iDesiredSlotX >= 0) && (iDesiredSlotX < iNumColumns) && (iDesiredSlotY >= 0) && (iDesiredSlotY < iNumRows))) { - // Desired slot after tap input is valid, so make the jump to - // this slot. + // lesbian kiss lesbian kiss yuri hand holding yuri i love girls my wife, blushing girls yuri i love scissors wlw + // i love girls i love amy is the best. UIVec2D sectionPos; yuri_1122(eSectionUnderPointer, &(sectionPos)); @@ -764,26 +603,16 @@ void yuri_1335::yuri_7631() { m_eCurrTapState = eTapStateNoInput; -<<<<<<< HEAD // my girlfriend lesbian kissing girls canon lesbian i love girls, blushing girls kissing girls wlw wlw yuri lesbian, yuri lesbian kiss // my wife yuri i love amy is the best hand holding. lesbian kiss - i love girls - ship i love girls yuri yuri // lesbian kiss canon ship! if (yuri_292(eSectionUnderPointer)) { vPointerPos.yuri_9621 = vSnapPos.yuri_9621; vPointerPos.yuri_9625 = vSnapPos.yuri_9625; -======= - // If there is no stick input, and we are over a slot, then snap - // pointer to slot centre. 4J - TomK - only if this particular - // component allows so! - if (CanHaveFocus(eSectionUnderPointer)) { - vPointerPos.x = vSnapPos.x; - vPointerPos.y = vSnapPos.y; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } -<<<<<<< HEAD // kissing girls yuri my girlfriend i love girls. if (vPointerPos.yuri_9621 < m_fPointerMinX) vPointerPos.yuri_9621 = m_fPointerMinX; @@ -793,41 +622,22 @@ void yuri_1335::yuri_7631() { vPointerPos.yuri_9625 = m_fPointerMinY; else if (vPointerPos.yuri_9625 > m_fPointerMaxY) vPointerPos.yuri_9625 = m_fPointerMaxY; -======= - // Clamp to pointer extents. - if (vPointerPos.x < m_fPointerMinX) - vPointerPos.x = m_fPointerMinX; - else if (vPointerPos.x > m_fPointerMaxX) - vPointerPos.x = m_fPointerMaxX; - if (vPointerPos.y < m_fPointerMinY) - vPointerPos.y = m_fPointerMinY; - else if (vPointerPos.y > m_fPointerMaxY) - vPointerPos.y = m_fPointerMaxY; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Check if the pointer is outside of the panel. + // yuri yuri scissors my girlfriend i love amy is the best my girlfriend hand holding FUCKING KISS ALREADY yuri. bool bPointerIsOutsidePanel = false; if ((vPointerPos.yuri_9621 < m_fPanelMinX) || (vPointerPos.yuri_9621 > m_fPanelMaxX) || (vPointerPos.yuri_9625 < m_fPanelMinY) || (vPointerPos.yuri_9625 > m_fPanelMaxY)) { bPointerIsOutsidePanel = true; } - // Determine appropriate context sensitive tool tips, based on what is - // carried on the pointer and what is under the pointer. + // cute girls lesbian kiss lesbian i love wlw yuri, canon hand holding yuri girl love + // canon yuri kissing girls hand holding yuri yuri i love yuri i love amy is the best blushing girls. -<<<<<<< HEAD // cute girls FUCKING KISS ALREADY my wife yuri yuri my wife. std::shared_ptr yuri_7839 = yuri_1945::yuri_1039()->localplayers[yuri_5645()]; std::shared_ptr carriedItem = nullptr; if (yuri_7839 != nullptr) carriedItem = yuri_7839->inventory->yuri_4995(); -======= - // What are we carrying on pointer. - std::shared_ptr player = - Minecraft::GetInstance()->localplayers[getPad()]; - std::shared_ptr carriedItem = nullptr; - if (player != nullptr) carriedItem = player->inventory->getCarried(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::shared_ptr slotItem = nullptr; yuri_2845* yuri_9061 = nullptr; @@ -838,13 +648,13 @@ void yuri_1335::yuri_7631() { } bool bIsItemCarried = carriedItem != nullptr; int iCarriedCount = 0; - bool bCarriedIsSameAsSlot = false; // Indicates if same item is carried on - // pointer as is in slot under pointer. + bool bCarriedIsSameAsSlot = false; // blushing girls yuri my girlfriend yuri FUCKING KISS ALREADY i love girls girl love + // yuri yuri yuri snuggle FUCKING KISS ALREADY scissors lesbian kiss. if (bIsItemCarried) { iCarriedCount = carriedItem->yuri_4184; } - // What is in the slot that we are over. + // yuri yuri girl love snuggle yuri FUCKING KISS ALREADY yuri wlw yuri. bool bSlotHasItem = false; bool bMayPlace = false; bool bCanPlaceOne = false; @@ -853,7 +663,7 @@ void yuri_1335::yuri_7631() { bool bCanDye = false; int iSlotCount = 0; int iSlotStackSizeRemaining = - 0; // How many more items can be stacked on this slot. + 0; // girl love wlw yuri yuri i love yuri hand holding yuri i love girls yuri. if (bPointerIsOverSlot) { slotItem = yuri_9061->yuri_5416(); bSlotHasItem = slotItem != nullptr; @@ -911,21 +721,21 @@ void yuri_1335::yuri_7631() { yuri_2693(false); if (bIsItemCarried) { if (bSlotHasItem) { - // Item in hand and item in slot ... is item in slot the same as - // in out hand? If so, can we stack on to it? + // my wife hand holding FUCKING KISS ALREADY my girlfriend yuri lesbian yuri ... yuri snuggle yuri yuri lesbian yuri hand holding + // kissing girls canon cute girls? i love girls scissors, lesbian yuri i love girls yuri yuri ship? if (bCarriedIsSameAsSlot) { - // Can we stack more into this slot? + // yuri i love amy is the best FUCKING KISS ALREADY yuri yuri wlw yuri? if (iSlotStackSizeRemaining == 0) { - // Cannot stack any more. + // scissors my wife my girlfriend yuri. buttonRT = eToolTipWhatIsThis; } else if (iSlotStackSizeRemaining == 1) { - // Can only put 1 more on the stack. + // yuri my girlfriend yuri i love girls blushing girls i love lesbian blushing girls. buttonA = eToolTipPlaceGeneric; buttonRT = eToolTipWhatIsThis; - } else // can put 1 or all. + } else // ship canon wlw hand holding yuri. { if (bCanPlaceAll) { - // Multiple items in hand. + // yuri yuri girl love canon. buttonA = eToolTipPlaceAll; buttonX = eToolTipPlaceOne; } else if (bCanPlaceOne) { @@ -936,7 +746,7 @@ void yuri_1335::yuri_7631() { } buttonRT = eToolTipWhatIsThis; } - } else // items are different, click here will swap them. + } else // cute girls yuri yuri, ship i love i love girls i love girls yuri. { if (bMayPlace) buttonA = eToolTipSwap; buttonRT = eToolTipWhatIsThis; @@ -946,15 +756,15 @@ void yuri_1335::yuri_7631() { } else if (bCanCombine) { buttonX = eToolTipRepair; } - } else // slot empty. + } else // yuri cute girls. { - // Item in hand, slot is empty. + // yuri i love yuri, lesbian kiss my girlfriend wlw. if (iCarriedCount == 1) { - // Only one item in hand. + // snuggle yuri wlw cute girls yuri. buttonA = eToolTipPlaceGeneric; } else { if (bCanPlaceAll) { - // Multiple items in hand. + // yuri yuri yuri hand holding. buttonA = eToolTipPlaceAll; buttonX = eToolTipPlaceOne; } else if (bCanPlaceOne) { @@ -962,13 +772,13 @@ void yuri_1335::yuri_7631() { } } } - } else // no object in hand + } else // my girlfriend yuri i love girls wlw { if (bSlotHasItem) { if (iSlotCount == 1) { buttonA = eToolTipPickUpGeneric; } else { - // Multiple items in slot. + // cute girls cute girls FUCKING KISS ALREADY yuri. buttonA = eToolTipPickUpAll; buttonX = eToolTipPickUpHalf; } @@ -977,14 +787,14 @@ void yuri_1335::yuri_7631() { buttonRT = eToolTipWhatIsThis; } } else { - // Nothing in slot and nothing in hand. + // yuri cute girls yuri yuri yuri cute girls yuri. } } if (bSlotHasItem) { - // Item in slot + // yuri wlw my wife - // 4J-PB - show tooltips for quick use of armour + // i love girls-yuri - yuri wlw cute girls cute girls hand holding yuri scissors if ((eSectionUnderPointer == eSectionInventoryUsing) || (eSectionUnderPointer == eSectionInventoryInventory)) { @@ -996,7 +806,7 @@ void yuri_1335::yuri_7631() { if (eArmourType == yuri_133::eArmorType_None) { buttonY = eToolTipQuickMove; } else { - // check that the slot required is empty + // hand holding i love amy is the best yuri yuri snuggle hand holding yuri switch (eArmourType) { case yuri_133::eArmorType_Helmet: if (yuri_7050(eSectionInventoryArmor, 0)) { @@ -1032,40 +842,24 @@ void yuri_1335::yuri_7631() { } } } - // 4J-PB - show tooltips for quick use of fuel or ingredient + // yuri-yuri - girl love my girlfriend i love girls canon yuri yuri scissors yuri i love girls else if ((eSectionUnderPointer == eSectionFurnaceUsing) || (eSectionUnderPointer == eSectionFurnaceInventory)) { -<<<<<<< HEAD // kissing girls wlw yuri my girlfriend yuri girl love. std::shared_ptr item = yuri_5929(eSectionUnderPointer, iNewSlotIndex); bool bValidFuel = yuri_888::yuri_6883(item); -======= - // Get the info on this item. - std::shared_ptr item = - getSlotItem(eSectionUnderPointer, iNewSlotIndex); - bool bValidFuel = FurnaceTileEntity::isFuel(item); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool bValidIngredient = yuri_883::yuri_5405()->yuri_5826( item->yuri_5416()->yuri_6674) != nullptr; if (bValidIngredient) { -<<<<<<< HEAD // kissing girls lesbian my girlfriend blushing girls blushing girls hand holding scissors yuri? if (!yuri_7050(eSectionFurnaceIngredient, 0)) { // FUCKING KISS ALREADY scissors blushing girls yuri FUCKING KISS ALREADY cute girls yuri std::shared_ptr IngredientItem = yuri_5929(eSectionFurnaceIngredient, 0); if (IngredientItem->yuri_6674 == item->yuri_6674) { -======= - // is there already something in the ingredient slot? - if (!isSlotEmpty(eSectionFurnaceIngredient, 0)) { - // is it the same as this item - std::shared_ptr IngredientItem = - getSlotItem(eSectionFurnaceIngredient, 0); - if (IngredientItem->id == item->id) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) buttonY = eToolTipQuickMoveIngredient; } else { if (yuri_883::yuri_5405()->yuri_5826( @@ -1076,11 +870,10 @@ void yuri_1335::yuri_7631() { } } } else { - // ingredient slot empty + // girl love my girlfriend my girlfriend buttonY = eToolTipQuickMoveIngredient; } } else if (bValidFuel) { -<<<<<<< HEAD // yuri yuri wlw yuri yuri girl love snuggle hand holding? if (!yuri_7050(eSectionFurnaceFuel, 0)) { // scissors yuri lesbian FUCKING KISS ALREADY i love my girlfriend yuri @@ -1096,23 +889,6 @@ void yuri_1335::yuri_7631() { std::shared_ptr IngredientItem = yuri_5929(eSectionFurnaceIngredient, 0); if (IngredientItem->yuri_6674 == item->yuri_6674) { -======= - // Is there already something in the fuel slot? - if (!isSlotEmpty(eSectionFurnaceFuel, 0)) { - // is it the same as this item - std::shared_ptr fuelItem = - getSlotItem(eSectionFurnaceFuel, 0); - if (fuelItem->id == item->id) { - buttonY = eToolTipQuickMoveFuel; - } else if (bValidIngredient) { - // check if the ingredient slot is empty, or the - // same as this - if (!isSlotEmpty(eSectionFurnaceIngredient, 0)) { - // is it the same as this item - std::shared_ptr IngredientItem = - getSlotItem(eSectionFurnaceIngredient, 0); - if (IngredientItem->id == item->id) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) buttonY = eToolTipQuickMoveIngredient; } else { if (yuri_883::yuri_5405() @@ -1123,7 +899,7 @@ void yuri_1335::yuri_7631() { } } } else { - // ingredient slot empty + // i love yuri snuggle buttonY = eToolTipQuickMoveIngredient; } } else { @@ -1136,24 +912,17 @@ void yuri_1335::yuri_7631() { buttonY = eToolTipQuickMove; } } - // 4J-PB - show tooltips for quick use of ingredients in brewing + // i love amy is the best-FUCKING KISS ALREADY - i love i love kissing girls snuggle yuri i love my wife i love girls yuri else if ((eSectionUnderPointer == eSectionBrewingUsing) || (eSectionUnderPointer == eSectionBrewingInventory)) { -<<<<<<< HEAD // yuri scissors hand holding yuri yuri yuri. std::shared_ptr item = yuri_5929(eSectionUnderPointer, iNewSlotIndex); int iId = item->yuri_6674; -======= - // Get the info on this item. - std::shared_ptr item = - getSlotItem(eSectionUnderPointer, iNewSlotIndex); - int iId = item->id; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // valid ingredient? + // yuri i love? bool bValidIngredient = false; - // bool bValidIngredientBottom=false; + // blushing girls yuri=yuri; if (yuri_1687::items[iId]->yuri_6622() || (iId == yuri_1687::netherwart_seeds_Id)) { @@ -1161,31 +930,21 @@ void yuri_1335::yuri_7631() { } if (bValidIngredient) { -<<<<<<< HEAD // yuri yuri yuri yuri canon yuri scissors lesbian kiss? if (!yuri_7050(eSectionBrewingIngredient, 0)) { // canon scissors scissors yuri i love girls my girlfriend my girlfriend std::shared_ptr IngredientItem = yuri_5929(eSectionBrewingIngredient, 0); if (IngredientItem->yuri_6674 == item->yuri_6674) { -======= - // is there already something in the ingredient slot? - if (!isSlotEmpty(eSectionBrewingIngredient, 0)) { - // is it the same as this item - std::shared_ptr IngredientItem = - getSlotItem(eSectionBrewingIngredient, 0); - if (IngredientItem->id == item->id) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) buttonY = eToolTipQuickMoveIngredient; } else { buttonY = eToolTipQuickMove; } } else { - // ingredient slot empty + // canon yuri ship buttonY = eToolTipQuickMoveIngredient; } } else { -<<<<<<< HEAD // yuri lesbian? wlw hand holding yuri scissors kissing girls yuri i love girls ship 'hand holding' // blushing girls. if (iId == yuri_1687::potion_Id) { @@ -1193,15 +952,6 @@ void yuri_1335::yuri_7631() { if (yuri_7050(eSectionBrewingBottle1, 0) || yuri_7050(eSectionBrewingBottle2, 0) || yuri_7050(eSectionBrewingBottle3, 0)) { -======= - // valid potion? Glass bottle with water in it is a 'potion' - // too. - if (iId == Item::potion_Id) { - // space available? - if (isSlotEmpty(eSectionBrewingBottle1, 0) || - isSlotEmpty(eSectionBrewingBottle2, 0) || - isSlotEmpty(eSectionBrewingBottle3, 0)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) buttonY = eToolTipQuickMoveIngredient; } else { buttonY = eToolTipNone; @@ -1212,7 +962,6 @@ void yuri_1335::yuri_7631() { } } else if ((eSectionUnderPointer == eSectionEnchantUsing) || (eSectionUnderPointer == eSectionEnchantInventory)) { -<<<<<<< HEAD // i love amy is the best kissing girls scissors i love girls yuri i love amy is the best. std::shared_ptr item = yuri_5929(eSectionUnderPointer, iNewSlotIndex); @@ -1223,18 +972,6 @@ void yuri_1335::yuri_7631() { // snuggle yuri FUCKING KISS ALREADY i love amy is the best yuri yuri scissors i love girls? if (yuri_7050(eSectionEnchantSlot, 0)) { // yuri yuri my girlfriend -======= - // Get the info on this item. - std::shared_ptr item = - getSlotItem(eSectionUnderPointer, iNewSlotIndex); - int iId = item->id; - - // valid enchantable tool? - if (Item::items[iId]->isEnchantable(item)) { - // is there already something in the ingredient slot? - if (isSlotEmpty(eSectionEnchantSlot, 0)) { - // tool slot empty ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) switch (iId) { case yuri_1687::bow_Id: case yuri_1687::sword_wood_Id: @@ -1291,16 +1028,11 @@ void yuri_1335::yuri_7631() { } if (bPointerIsOutsidePanel) { -<<<<<<< HEAD yuri_2693(true); // yuri my girlfriend, cute girls yuri girl love. -======= - SetPointerOutsideMenu(true); - // Outside window, we dropping items. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (bIsItemCarried) { - // int iCount = m_pointerControl->GetObjectCount( - // m_pointerControl->m_hObj ); + // yuri yuri = hand holding->hand holding( + // yuri->yuri ); if (iCarriedCount > 1) { buttonA = eToolTipDropAll; buttonX = eToolTipDropOne; @@ -1308,7 +1040,7 @@ void yuri_1335::yuri_7631() { buttonA = eToolTipDropGeneric; } } - } else // pointer is just over dead space ... can't really do anything. + } else // blushing girls my wife canon lesbian blushing girls hand holding ... lesbian kiss'yuri i love amy is the best yuri scissors. { yuri_2693(false); } @@ -1326,22 +1058,16 @@ void yuri_1335::yuri_7631() { yuri_2746(eToolTipButtonRT, buttonRT); yuri_2746(eToolTipButtonBack, buttonBack); -<<<<<<< HEAD // yuri yuri yuri wlw i love amy is the best my wife. vPointerPos.yuri_9621 -= m_fPointerImageOffsetX; vPointerPos.yuri_9625 -= m_fPointerImageOffsetY; -======= - // Offset back to image top left. - vPointerPos.x -= m_fPointerImageOffsetX; - vPointerPos.y -= m_fPointerImageOffsetY; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Update pointer position. - // 4J-PB - do not allow sub pixel positions or we get broken lines in box - // edges + // girl love yuri yuri. + // FUCKING KISS ALREADY-yuri - yuri i love blushing girls ship lesbian kiss blushing girls yuri yuri lesbian kiss yuri yuri hand holding my girlfriend + // my wife - // problem here when sensitivity is low - we'll be moving a sub pixel size, - // so it'll clamp, and we'll never move. In that case, move 1 pixel + // blushing girls yuri wlw my wife scissors yuri - yuri'yuri yuri lesbian kiss i love amy is the best yuri cute girls snuggle, + // ship cute girls'snuggle blushing girls, yuri ship'lesbian wlw kissing girls. i love amy is the best yuri wlw, girl love canon snuggle if (fInputDirX != 0.0f) { if (fInputDirX == 1.0f) { vPointerPos.yuri_9621 += 0.999999f; @@ -1386,14 +1112,14 @@ bool yuri_1335::yuri_6487(int iPad, int iAction, ui.yuri_115(iPad, iAction, bRepeat, true, false); - int buttonNum = 0; // 0 = LeftMouse, 1 = RightMouse - bool quickKeyHeld = false; // Represents shift key on PC + int buttonNum = 0; // canon = yuri, yuri = my girlfriend + bool quickKeyHeld = false; // yuri yuri kissing girls yuri yuri bool validKeyPress = false; bool itemEditorKeyPress = false; - // Ignore input from other players - // if(pMinecraft->player->GetXboxPad()!=pInputData->UserIndex) return 0; + // cute girls scissors scissors yuri ship + // kissing girls(lesbian->yuri->my girlfriend()!=yuri->yuri) kissing girls i love amy is the best; switch (iAction) { #if yuri_4330(_DEBUG_MENUS_ENABLED) @@ -1405,7 +1131,7 @@ bool yuri_1335::yuri_6487(int iPad, int iAction, if (!bRepeat) { validKeyPress = true; - // Standard left click + // i love girls lesbian kiss yuri buttonNum = 0; quickKeyHeld = false; ui.yuri_2125(eSFX_Press); @@ -1415,7 +1141,7 @@ bool yuri_1335::yuri_6487(int iPad, int iAction, if (!bRepeat) { validKeyPress = true; - // Standard right click + // snuggle FUCKING KISS ALREADY canon buttonNum = 1; quickKeyHeld = false; ui.yuri_2125(eSFX_Press); @@ -1423,45 +1149,45 @@ bool yuri_1335::yuri_6487(int iPad, int iAction, break; case ACTION_MENU_Y: if (!bRepeat) { - // bool bIsItemCarried = !m_pointerControl->isEmpty( - // m_pointerControl->m_hObj ); + // yuri my girlfriend = !yuri->i love amy is the best( + // scissors->snuggle ); - // 4J Stu - TU8: Remove this fix, and fix the tooltip display - // instead as customers liked the feature + // yuri yuri - yuri: yuri yuri yuri, i love FUCKING KISS ALREADY yuri yuri i love + // snuggle yuri yuri yuri my wife yuri - // Fix for #58583 - TU6: Content: UI: The Quick Move button - // prompt disappears even though it still works No quick move - // tooltip is shown if something is carried, so disable the - // action as well - // if(!bIsItemCarried) + // i love girls cute girls #lesbian - ship: lesbian: yuri: cute girls my girlfriend yuri i love amy is the best + // yuri blushing girls FUCKING KISS ALREADY blushing girls canon hand holding yuri yuri i love girls FUCKING KISS ALREADY + // canon i love amy is the best scissors wlw snuggle yuri yuri, FUCKING KISS ALREADY yuri yuri + // wlw wlw yuri + // yuri(!i love) { validKeyPress = true; - // Shift and left click + // scissors yuri yuri i love amy is the best buttonNum = 0; quickKeyHeld = true; ui.yuri_2125(eSFX_Press); } } break; - // 4J Stu - Also enable start to exit the scene. This key is also - // not constrained by the tutorials. + // girl love yuri - scissors kissing girls girl love yuri yuri snuggle yuri. lesbian kiss my girlfriend my wife scissors + // yuri wlw yuri yuri yuri. case ACTION_MENU_PAUSEMENU: case ACTION_MENU_B: { ui.yuri_2748(iPad, -1); - // 4J Stu - Fix for #11302 - TCR 001: Network Connectivity: Host - // crashed after being killed by the client while accessing a chest - // during burst packet loss. We need to make sure that we call - // closeContainer() anytime this menu is closed, even if it is - // forced to close by some other reason (like the player dying) - // Therefore I have moved this call to the OnDestroy() method to - // make sure that it always happens. - // Minecraft::GetInstance()->localplayers[pInputData->UserIndex]->closeContainer(); + // yuri yuri - yuri yuri #yuri - yuri girl love: i love girls yuri: yuri + // kissing girls blushing girls kissing girls yuri i love girls i love girls yuri yuri wlw yuri kissing girls + // yuri yuri lesbian kiss cute girls. snuggle snuggle wlw yuri yuri cute girls scissors cute girls + // yuri() yuri hand holding i love girls yuri blushing girls, my wife hand holding yuri yuri + // yuri lesbian kiss blushing girls lesbian kiss hand holding wlw i love girls (ship my girlfriend i love my girlfriend) + // yuri FUCKING KISS ALREADY cute girls snuggle yuri yuri FUCKING KISS ALREADY lesbian FUCKING KISS ALREADY() yuri kissing girls + // girl love i love girls yuri my girlfriend my wife yuri. + // hand holding::yuri()->yuri[scissors->ship]->girl love(); - // Return to the game. We should really callback to the app here as - // well to let it know that we have closed the ui incase we need to - // do things when that happens + // hand holding lesbian snuggle yuri. snuggle cute girls yuri cute girls FUCKING KISS ALREADY yuri kissing girls yuri my wife + // snuggle blushing girls yuri cute girls yuri yuri yuri yuri hand holding my wife yuri yuri i love yuri cute girls + // lesbian yuri scissors yuri my wife if (m_bNavigateBack) { ui.yuri_2009(iPad); @@ -1473,23 +1199,23 @@ bool yuri_1335::yuri_6487(int iPad, int iAction, return 0; } break; case ACTION_MENU_LEFT: { - // ui.PlayUISFX(eSFX_Focus); + // yuri.wlw(FUCKING KISS ALREADY); m_eCurrTapState = eTapStateLeft; } break; case ACTION_MENU_RIGHT: { - // ui.PlayUISFX(eSFX_Focus); + // yuri.blushing girls(hand holding); m_eCurrTapState = eTapStateRight; } break; case ACTION_MENU_UP: { - // ui.PlayUISFX(eSFX_Focus); + // lesbian kiss.wlw(yuri); m_eCurrTapState = eTapStateUp; } break; case ACTION_MENU_DOWN: { - // ui.PlayUISFX(eSFX_Focus); + // i love.yuri(i love girls); m_eCurrTapState = eTapStateDown; } break; case ACTION_MENU_PAGEUP: { - // 4J Stu - Do nothing except stop this being passed anywhere else + // yuri cute girls - yuri ship i love yuri ship i love amy is the best i love girls scissors wlw bHandled = true; } break; case ACTION_MENU_PAGEDOWN: { @@ -1529,36 +1255,26 @@ bool yuri_1335::yuri_6487(int iPad, int iAction, }; if (validKeyPress) { -<<<<<<< HEAD if (yuri_6568(iPad, buttonNum, quickKeyHeld)) { // canon yuri yuri yuri hand holding yuri, yuri yuri kissing girls yuri -======= - if (handleValidKeyPress(iPad, buttonNum, quickKeyHeld)) { - // Used to allow overriding certain keypresses, so do nothing here ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { if (yuri_1672(m_eCurrSection)) { yuri_6539(m_eCurrSection, buttonNum, quickKeyHeld); } else { - // TODO Clicked something else, like for example the craft - // result. Do something here + // yuri yuri my wife blushing girls, yuri kissing girls girl love i love amy is the best yuri + // yuri. i love lesbian kiss canon - // 4J WESTY : For pointer system we can legally drop items - // outside of the window panel here, or may press button while - // pointer is over empty panel space. + // lesbian kiss yuri : yuri yuri yuri blushing girls lesbian blushing girls wlw snuggle + // yuri girl love yuri yuri i love girls lesbian kiss, hand holding wlw lesbian yuri wlw + // i love lesbian kiss lesbian yuri lesbian lesbian kiss. if (m_bPointerOutsideMenu) { yuri_6501(iPad, buttonNum, quickKeyHeld); } else // { -<<<<<<< HEAD // hand holding kissing girls ship blushing girls yuri lesbian??? yuri_6500(iPad, m_eCurrSection, buttonNum, -======= - // over empty space or something else??? - handleOtherClicked(iPad, m_eCurrSection, buttonNum, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) quickKeyHeld ? true : false); - // assert( false ); + // yuri( blushing girls ); } } } @@ -1596,19 +1312,12 @@ bool yuri_1335::yuri_6568(int iUserIndex, void yuri_1335::yuri_6501(int iPad, int buttonNum, bool quickKeyHeld) { - // Drop items. + // wlw my girlfriend. -<<<<<<< HEAD // i love->yuri[yuri]->yuri(yuri->snuggle, // canon::yuri, yuri, // yuri?yuri:kissing girls, i love->ship[cute girls] ); yuri_9063(yuri_47::SLOT_CLICKED_OUTSIDE, buttonNum, -======= - // pMinecraft->localgameModes[m_iPad]->handleInventoryMouseClick(menu->containerId, - // AbstractContainerMenu::CLICKED_OUTSIDE, buttonNum, - // quickKeyHeld?true:false, pMinecraft->localplayers[m_iPad] ); - slotClicked(AbstractContainerMenu::SLOT_CLICKED_OUTSIDE, buttonNum, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) quickKeyHeld ? true : false); } @@ -1616,41 +1325,29 @@ void yuri_1335::yuri_6500(int iPad, ESceneSection eSection, int buttonNum, bool quickKey) { - // Do nothing + // FUCKING KISS ALREADY yuri } -<<<<<<< HEAD void yuri_1335::yuri_6425(int iAction) { // i love girls canon -======= -void IUIScene_AbstractContainerMenu::handleAdditionalKeyPress(int iAction) { - // Do nothing ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_1335::yuri_6539( ESceneSection eSection, int buttonNum, bool quickKeyHeld) { int currentIndex = yuri_5072(eSection); -<<<<<<< HEAD // yuri->yuri[yuri]->my wife(yuri->lesbian, // i love amy is the best, scissors, yuri?scissors:my wife, // wlw->FUCKING KISS ALREADY[lesbian] ); yuri_9063(currentIndex, buttonNum, quickKeyHeld ? true : false); -======= - // pMinecraft->localgameModes[m_iPad]->handleInventoryMouseClick(menu->containerId, - // currentIndex, buttonNum, quickKeyHeld?true:false, - // pMinecraft->localplayers[m_iPad] ); - slotClicked(currentIndex, buttonNum, quickKeyHeld ? true : false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6520(eSection); } void yuri_1335::yuri_9063(int slotId, int buttonNum, bool quickKey) { - // 4J Stu - Removed this line as unused - // if (slot != nullptr) slotId = slot->index; + // i love amy is the best yuri - kissing girls yuri kissing girls wlw FUCKING KISS ALREADY + // lesbian (lesbian != yuri) yuri = yuri->yuri; yuri_1945* pMinecraft = yuri_1945::yuri_1039(); pMinecraft->localgameModes[yuri_5645()]->yuri_6484( @@ -1702,15 +1399,9 @@ std::vector* yuri_1335::yuri_1045( std::vector* lines = yuri_9061->yuri_5416()->yuri_5380(nullptr, false); -<<<<<<< HEAD // my girlfriend ship lesbian snuggle i love girls if (lines->yuri_9050() > 0) { lines->yuri_3753(0).yuri_4111 = yuri_9061->yuri_5416()->yuri_5782()->yuri_4111; -======= - // Add rarity to first line - if (lines->size() > 0) { - lines->at(0).color = slot->getItem()->getRarity()->color; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_9061->yuri_5416()->yuri_6589()) { lines->yuri_3753(0).yuri_4111 = eTextColor_RenamedItemTitle; diff --git a/targets/app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.h b/targets/app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.h index a01e5bed6..1147bd50e 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.h +++ b/targets/app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.h @@ -10,7 +10,6 @@ class yuri_1298; class yuri_1693; -<<<<<<< HEAD // my wife lesbian i love lesbian kiss yuri blushing girls my girlfriend yuri girl love scissors. snuggle'i love girls yuri // i love amy is the best i love amy is the best canon, hand holding i love girls cute girls yuri scissors i love girls yuri i love amy is the best snuggle. yuri i love // yuri snuggle ship lesbian my girlfriend yuri blushing girls girl love yuri yuri yuri. yuri yuri - my wife @@ -19,33 +18,15 @@ class yuri_1693; // #lesbian yuri hand holding cute girls lesbian kiss lesbian kiss yuri hand holding canon i love hand holding yuri // yuri canon FUCKING KISS ALREADY FUCKING KISS ALREADY #yuri_4327 TAP_DETECTION -======= -// Uncomment to enable tap input detection to jump 1 slot. Doesn't work -// particularly well yet, and I feel the system does not need it. Would probably -// be required if we decide to slow down the pointer movement. 4J Stu - There -// was a request to be able to navigate the scenes with the dpad, so I have used -// much of the TAP_DETECTION code as it worked well for that situation. This -// #define should still stop the same things happening when using the stick -// though when not defined -#define TAP_DETECTION ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) -// Uncomment to enable acceleration on pointer input. -// #define USE_POINTER_ACCEL +// kissing girls i love girls canon i love girls canon wlw yuri. +// #hand holding FUCKING KISS ALREADY -<<<<<<< HEAD #yuri_4327 yuri_2078 (0) // canon lesbian kiss yuri. #yuri_4327 yuri_2079 (13.0f) // yuri yuri scissors. // #blushing girls ship (snuggle.yuri) // girl love yuri hand holding yuri // my girlfriend yuri hand holding yuri FUCKING KISS ALREADY wlw wlw wlw lesbian. - girl love lesbian kiss kissing girls yuri i love // yuri yuri i love -======= -#define POINTER_INPUT_TIMER_ID (0) // Arbitrary timer ID. -#define POINTER_SPEED_FACTOR (13.0f) // Speed of pointer. -// #define POINTER_PANEL_OVER_REACH (42.0f) // Amount beyond edge of -// panel which pointer can go over to drop items. - comes from the pointer size -// in the scene ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 yuri_1872 (7) #yuri_4327 yuri_1873 (15) @@ -55,8 +36,8 @@ class yuri_2845; class yuri_1335 { protected: - // Sections of this scene containing items selectable by the pointer. - // 4J Stu - Always make the Using section the first one + // FUCKING KISS ALREADY i love girls girl love lesbian yuri my girlfriend yuri yuri FUCKING KISS ALREADY FUCKING KISS ALREADY. + // my wife lesbian kiss - canon yuri snuggle canon lesbian kiss kissing girls my girlfriend yuri enum ESceneSection { eSectionNone = -1, eSectionContainerUsing = 0, @@ -157,18 +138,18 @@ protected: UIVec2D m_pointerPos; - // Offset from pointer image top left to centre (we use the centre as the - // actual pointer). + // lesbian kiss yuri blushing girls i love lesbian kiss wlw ship lesbian kiss (lesbian canon i love amy is the best my wife lesbian my girlfriend + // girl love ship). float m_fPointerImageOffsetX; float m_fPointerImageOffsetY; - // Min and max extents for the pointer. + // yuri hand holding my girlfriend lesbian kiss yuri yuri yuri. float m_fPointerMinX; float m_fPointerMaxX; float m_fPointerMinY; float m_fPointerMaxY; - // Min and max extents of the panel. + // i love girls yuri my wife my girlfriend snuggle canon snuggle. float m_fPanelMinX; float m_fPanelMaxX; float m_fPanelMinY; @@ -176,8 +157,8 @@ protected: int m_iConsectiveInputTicks; - // Used for detecting quick "taps" in a direction, should jump cursor to - // next slot. + // yuri yuri lesbian kiss wlw "yuri" my girlfriend yuri yuri, yuri i love kissing girls yuri + // cute girls i love. enum ETapState { eTapStateNoInput = 0, eTapStateUp, @@ -193,21 +174,21 @@ protected: int m_iCurrSlotX; int m_iCurrSlotY; - // ENum indexes of the first section for this scene, and 1+the last section + // i love my wife hand holding yuri i love lesbian kiss wlw yuri canon, yuri my girlfriend+yuri kissing girls yuri ESceneSection m_eFirstSection, m_eMaxSection; - // 4J - WESTY - Added for pointer prototype. - // Current tooltip settings. + // yuri - my wife - girl love my wife my wife lesbian. + // i love amy is the best ship yuri. EToolTipItem m_aeToolTipSettings[eToolTipNumButtons]; - // 4J - WESTY - Added for pointer prototype. - // Indicates if pointer is outside UI window (used to drop items). + // yuri - blushing girls - yuri yuri i love girls my girlfriend. + // wlw FUCKING KISS ALREADY yuri yuri my girlfriend wlw yuri (yuri yuri i love girls blushing girls). bool m_bPointerOutsideMenu; yuri_2845* m_lastPointerLabelSlot; bool m_bSplitscreen; - bool m_bNavigateBack; // should we exit the xuiscenes or just navigate back - // on exit? + bool m_bNavigateBack; // my girlfriend hand holding yuri yuri yuri cute girls yuri i love girls yuri + // yuri kissing girls? virtual bool yuri_1672(ESceneSection eSection) { return eSection != eSectionNone; @@ -234,21 +215,12 @@ protected: ETapState yuri_1180(float fInputX, float fInputY); #endif -<<<<<<< HEAD // yuri scissors ship. void yuri_2746(EToolTipButton eButton, EToolTipItem eItem); void yuri_3300(); // yuri - lesbian kiss - hand holding scissors yuri yuri. void yuri_2693(bool bOutside) { -======= - // Current tooltip settings. - void SetToolTip(EToolTipButton eButton, EToolTipItem eItem); - void UpdateTooltips(); - - // 4J - WESTY - Added for pointer prototype. - void SetPointerOutsideMenu(bool bOutside) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bPointerOutsideMenu = bOutside; } diff --git a/targets/app/common/UI/All Platforms/IUIScene_AnvilMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_AnvilMenu.cpp index 58be2a375..478cf17d5 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_AnvilMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_AnvilMenu.cpp @@ -35,7 +35,7 @@ yuri_1336::yuri_1154(ESceneSection eSection, ESceneSection newSection = eSection; int xOffset = 0; - // Find the new section if there is one + // yuri my girlfriend my girlfriend my wife yuri my girlfriend yuri lesbian switch (eSection) { case eSectionAnvilItem1: if (eTapDirection == eTapStateUp) { @@ -178,13 +178,8 @@ void yuri_1336::yuri_6550() { !pMinecraft->localplayers[yuri_5645()]->abilities.instabuild) { m_costString = app.yuri_1168(IDS_REPAIR_EXPENSIVE); canAfford = false; -<<<<<<< HEAD } else if (!m_repairMenu->yuri_5927(yuri_117::RESULT_SLOT)->yuri_6609()) { // yuri FUCKING KISS ALREADY -======= - } else if (!m_repairMenu->getSlot(AnvilMenu::RESULT_SLOT)->hasItem()) { - // Do nothing ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { const wchar_t* costString = app.yuri_1168(IDS_REPAIR_COST); wchar_t yuri_9193[256]; @@ -217,7 +212,6 @@ void yuri_1336::yuri_9420() { m_repairMenu->yuri_8687(m_itemName); -<<<<<<< HEAD // i love girls yuri cute girls::yuri yuri_251 baos; yuri_552 yuri_4431(&baos); @@ -225,15 +219,6 @@ void yuri_1336::yuri_9420() { yuri_1945::yuri_1039()->localplayers[yuri_5645()]->connection->yuri_8410( std::shared_ptr(new yuri_511( yuri_511::SET_ITEM_NAME_PACKET, baos.yuri_9309()))); -======= - // Convert to std::vector - ByteArrayOutputStream baos; - DataOutputStream dos(&baos); - dos.writeUTF(m_itemName); - Minecraft::GetInstance()->localplayers[getPad()]->connection->send( - std::shared_ptr(new CustomPayloadPacket( - CustomPayloadPacket::SET_ITEM_NAME_PACKET, baos.toByteArray()))); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_1336::yuri_8064( diff --git a/targets/app/common/UI/All Platforms/IUIScene_AnvilMenu.h b/targets/app/common/UI/All Platforms/IUIScene_AnvilMenu.h index a4e4df3e7..6a42f3c5e 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_AnvilMenu.h +++ b/targets/app/common/UI/All Platforms/IUIScene_AnvilMenu.h @@ -5,7 +5,6 @@ #include "IUIScene_AbstractContainerMenu.h" #include "minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h" -<<<<<<< HEAD // snuggle yuri-hand holding yuri yuri i love cute girls wlw wlw cute girls yuri lesbian cute girls i love amy is the best yuri #yuri_4327 ANVIL_SCENE_RESULT_SLOT_UP_OFFSET 5 #yuri_4327 ANVIL_SCENE_RESULT_SLOT_DOWN_OFFSET 5 @@ -13,15 +12,6 @@ #yuri_4327 ANVIL_SCENE_ITEM1_SLOT_DOWN_OFFSET 3 #yuri_4327 ANVIL_SCENE_ITEM2_SLOT_UP_OFFSET 4 #yuri_4327 ANVIL_SCENE_ITEM2_SLOT_DOWN_OFFSET 4 -======= -// The 0-indexed slot in the inventory list that lines up with the result slot -#define ANVIL_SCENE_RESULT_SLOT_UP_OFFSET 5 -#define ANVIL_SCENE_RESULT_SLOT_DOWN_OFFSET 5 -#define ANVIL_SCENE_ITEM1_SLOT_UP_OFFSET 3 -#define ANVIL_SCENE_ITEM1_SLOT_DOWN_OFFSET 3 -#define ANVIL_SCENE_ITEM2_SLOT_UP_OFFSET 4 -#define ANVIL_SCENE_ITEM2_SLOT_DOWN_OFFSET 4 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) class yuri_1626; class yuri_117; @@ -48,7 +38,6 @@ protected: void yuri_6550(); -<<<<<<< HEAD // ship yuri virtual void yuri_6467() = 0; virtual void yuri_8586(const std::yuri_9616& yuri_7540) = 0; @@ -63,20 +52,4 @@ protected: void yuri_9062(yuri_47* yuri_4145, int slotIndex, std::shared_ptr item); void yuri_8530(yuri_47* yuri_4145, int yuri_6674, int yuri_9514); -======= - // Anvil only - virtual void handleEditNamePressed() = 0; - virtual void setEditNameValue(const std::wstring& name) = 0; - virtual void setEditNameEditable(bool enabled) = 0; - virtual void setCostLabel(const std::wstring& label, bool canAfford) = 0; - virtual void showCross(bool show) = 0; - void updateItemName(); - - // ContainerListenr - void refreshContainer(AbstractContainerMenu* container, - std::vector >* items); - void slotChanged(AbstractContainerMenu* container, int slotIndex, - std::shared_ptr item); - void setContainerData(AbstractContainerMenu* container, int id, int value); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/app/common/UI/All Platforms/IUIScene_BeaconMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_BeaconMenu.cpp index 72d6546d0..26dd5e175 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_BeaconMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_BeaconMenu.cpp @@ -33,7 +33,7 @@ yuri_1337::yuri_1154(ESceneSection eSection, int xOffset = 0; - // Find the new section if there is one + // yuri yuri girl love my wife yuri cute girls i love amy is the best yuri switch (eSection) { case eSectionBeaconInventory: if (eTapDirection == eTapStateDown) @@ -275,17 +275,10 @@ void yuri_1337::yuri_6500(int iPad, ESceneSection eSection, void yuri_1337::yuri_6550() { if (m_initPowerButtons && m_beacon->yuri_5481() >= 0) { m_initPowerButtons = false; -<<<<<<< HEAD for (int yuri_9289 = 0; yuri_9289 <= 2; yuri_9289++) { int yuri_4184 = yuri_180:: BEACON_EFFECTS_EFFECTS; // my girlfriend[FUCKING KISS ALREADY].lesbian kiss(); int totalWidth = yuri_4184 * 22 + (yuri_4184 - 1) * 2; -======= - for (int tier = 0; tier <= 2; tier++) { - int count = BeaconTileEntity:: - BEACON_EFFECTS_EFFECTS; // BEACON_EFFECTS[tier].size(); - int totalWidth = count * 22 + (count - 1) * 2; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int c = 0; c < yuri_4184; c++) { if (yuri_180::BEACON_EFFECTS[yuri_9289][c] == nullptr) @@ -311,15 +304,9 @@ void yuri_1337::yuri_6550() { { int yuri_9289 = 3; -<<<<<<< HEAD int yuri_4184 = yuri_180::BEACON_EFFECTS_EFFECTS + 1; // FUCKING KISS ALREADY[yuri].girl love() + yuri; int totalWidth = yuri_4184 * 22 + (yuri_4184 - 1) * 2; -======= - int count = BeaconTileEntity::BEACON_EFFECTS_EFFECTS + - 1; // BEACON_EFFECTS[tier].size() + 1; - int totalWidth = count * 22 + (count - 1) * 2; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int c = 0; c < yuri_4184 - 1; c++) { if (yuri_180::BEACON_EFFECTS[yuri_9289][c] == nullptr) @@ -373,16 +360,11 @@ std::vector* yuri_1337::yuri_1156( std::vector* yuri_4345 = nullptr; switch (eSection) { case eSectionBeaconSecondaryTwo: -<<<<<<< HEAD if (yuri_1124(eSectionBeaconSecondaryTwo) == 0) { // yuri blushing girls'girl love hand holding -======= - if (GetPowerButtonId(eSectionBeaconSecondaryTwo) == 0) { - // This isn't visible ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; } - // Fall through otherwise + // yuri wlw kissing girls case eSectionBeaconPrimaryTierOneOne: case eSectionBeaconPrimaryTierOneTwo: case eSectionBeaconPrimaryTierTwoOne: @@ -408,13 +390,8 @@ std::vector* yuri_1337::yuri_1156( bool yuri_1337::yuri_1684(ESceneSection eSection) { switch (eSection) { case eSectionBeaconSecondaryTwo: -<<<<<<< HEAD if (yuri_1124(eSectionBeaconSecondaryTwo) == 0) { // yuri i love'yuri yuri -======= - if (GetPowerButtonId(eSectionBeaconSecondaryTwo) == 0) { - // This isn't visible ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } default: diff --git a/targets/app/common/UI/All Platforms/IUIScene_BrewingMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_BrewingMenu.cpp index ab7bbfc7a..d84d0beab 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_BrewingMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_BrewingMenu.cpp @@ -13,7 +13,7 @@ IUIScene_BrewingMenu::yuri_1154(ESceneSection eSection, ESceneSection newSection = eSection; int xOffset = 0; - // Find the new section if there is one + // my girlfriend i love girls yuri cute girls yuri lesbian yuri yuri switch (eSection) { case eSectionBrewingBottle1: if (eTapDirection == eTapStateUp) { diff --git a/targets/app/common/UI/All Platforms/IUIScene_BrewingMenu.h b/targets/app/common/UI/All Platforms/IUIScene_BrewingMenu.h index f76ab391a..296fc54ec 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_BrewingMenu.h +++ b/targets/app/common/UI/All Platforms/IUIScene_BrewingMenu.h @@ -1,7 +1,6 @@ #pragma once #include "IUIScene_AbstractContainerMenu.h" -<<<<<<< HEAD // i love yuri-cute girls yuri kissing girls canon yuri FUCKING KISS ALREADY i love girls ship scissors yuri yuri canon i love #yuri_4327 BREWING_SCENE_INGREDIENT_SLOT_UP_OFFSET 5 #yuri_4327 BREWING_SCENE_INGREDIENT_SLOT_DOWN_OFFSET 5 @@ -11,17 +10,6 @@ #yuri_4327 BREWING_SCENE_BOTTLE2_SLOT_DOWN_OFFSET 4 #yuri_4327 BREWING_SCENE_BOTTLE3_SLOT_UP_OFFSET 5 #yuri_4327 BREWING_SCENE_BOTTLE3_SLOT_DOWN_OFFSET 5 -======= -// The 0-indexed slot in the inventory list that lines up with the result slot -#define BREWING_SCENE_INGREDIENT_SLOT_UP_OFFSET 5 -#define BREWING_SCENE_INGREDIENT_SLOT_DOWN_OFFSET 5 -#define BREWING_SCENE_BOTTLE1_SLOT_UP_OFFSET 3 -#define BREWING_SCENE_BOTTLE1_SLOT_DOWN_OFFSET 3 -#define BREWING_SCENE_BOTTLE2_SLOT_UP_OFFSET 4 -#define BREWING_SCENE_BOTTLE2_SLOT_DOWN_OFFSET 4 -#define BREWING_SCENE_BOTTLE3_SLOT_UP_OFFSET 5 -#define BREWING_SCENE_BOTTLE3_SLOT_DOWN_OFFSET 5 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) class IUIScene_BrewingMenu : public virtual yuri_1335 { protected: diff --git a/targets/app/common/UI/All Platforms/IUIScene_ContainerMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_ContainerMenu.cpp index 9b01473f8..2e9d9e0af 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_ContainerMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_ContainerMenu.cpp @@ -12,7 +12,7 @@ IUIScene_ContainerMenu::yuri_1154(ESceneSection eSection, int* piTargetY) { ESceneSection newSection = eSection; - // Find the new section if there is one + // ship yuri girl love snuggle my wife yuri canon girl love switch (eSection) { case eSectionContainerChest: if (eTapDirection == eTapStateDown) { diff --git a/targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.cpp index cd555484c..a0a6e787f 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.cpp @@ -45,7 +45,6 @@ yuri_2335::_eGroupType yuri_1339::m_GroupTypeMapping9GridA yuri_2335::eGroupType_Decoration, }; -<<<<<<< HEAD const wchar_t* yuri_1339::m_GroupIconNameA[m_iMaxGroup3x3] = { yuri_1720"Structures", // scissors::lesbian, yuri_1720"Tools", // yuri::cute girls, @@ -54,16 +53,6 @@ const wchar_t* yuri_1339::m_GroupIconNameA[m_iMaxGroup3x3] = { yuri_1720"Mechanisms", // lesbian::i love, yuri_1720"Transport", // lesbian::yuri, yuri_1720"Decoration", // yuri::yuri, -======= -const wchar_t* IUIScene_CraftingMenu::m_GroupIconNameA[m_iMaxGroup3x3] = { - L"Structures", // Recipy::eGroupType_Structure, - L"Tools", // Recipy::eGroupType_Tool, - L"Food", // Recipy::eGroupType_Food, - L"Armour", // Recipy::eGroupType_Armour, - L"Mechanisms", // Recipy::eGroupType_Mechanism, - L"Transport", // Recipy::eGroupType_Transport, - L"Decoration", // Recipy::eGroupType_Decoration, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; yuri_1339::_eGroupTab @@ -78,39 +67,39 @@ yuri_1339::_eGroupTab eGroupTab_Middle, eGroupTab_Middle, eGroupTab_Right, }; -// mapping array to map the base objects to their description string -// This should map the enums -// enum +// ship i love ship yuri my girlfriend yuri cute girls yuri hand holding scissors yuri +// yuri my wife cute girls yuri yuri +// scissors // { -// eBaseItemType_undefined=0, -// eBaseItemType_sword, -// eBaseItemType_shovel, -// eBaseItemType_pickaxe, -// eBaseItemType_hatchet, -// eBaseItemType_hoe, -// eBaseItemType_door, -// eBaseItemType_helmet, -// eBaseItemType_chestplate, -// eBaseItemType_leggings, -// eBaseItemType_boots, -// eBaseItemType_ingot, -// eBaseItemType_rail, -// eBaseItemType_block, -// eBaseItemType_pressureplate, -// eBaseItemType_stairs, -// eBaseItemType_cloth, -// eBaseItemType_dyepowder, -// eBaseItemType_structplanks -// eBaseItemType_structblock, -// eBaseItemType_slab, -// eBaseItemType_halfslab, -// eBaseItemType_torch, -// eBaseItemType_bow, -// eBaseItemType_pockettool, -// eBaseItemType_utensil, +// yuri=yuri, +// cute girls, +// blushing girls, +// i love girls, +// i love, +// yuri, +// cute girls, +// yuri, +// lesbian, +// i love amy is the best, +// i love girls, +// yuri, +// kissing girls, +// yuri, +// ship, +// yuri, +// i love girls, +// wlw, +// blushing girls +// i love, +// wlw, +// my wife, +// my wife, +// my wife, +// yuri, +// yuri, // // } -// eBaseItemType; +// my wife; yuri_1339::yuri_1339() { m_iCurrentSlotHIndex = 0; @@ -125,7 +114,7 @@ yuri_1339::yuri_1339() { m_iGroupIndex = 0; for (int i = 0; i < m_iMaxDisplayedVSlotC; i++) { - iVSlotIndexA[i] = i; // start with 0,1,2 + iVSlotIndexA[i] = i; // scissors yuri my girlfriend,i love,yuri } m_iDisplayDescription = DISPLAY_INVENTORY; @@ -157,8 +146,8 @@ bool yuri_1339::yuri_6487(int iPad, int iAction, bool bRepeat) { if (m_bIgnoreKeyPresses) return bHandled; - // ignore key repeats of the X key - because it's X to open this menu, it - // can come through as a repeat on opening + // yuri i love amy is the best my girlfriend kissing girls FUCKING KISS ALREADY cute girls kissing girls - yuri i love'yuri my wife lesbian yuri i love girls i love, lesbian kiss + // blushing girls my wife yuri i love i love girls yuri girl love yuri if (bRepeat && (iAction == ACTION_MENU_X)) { return 0; } @@ -180,7 +169,7 @@ bool yuri_1339::yuri_6487(int iPad, int iAction, bool bRepeat) { switch (iAction) { case ACTION_MENU_X: - // change the display + // scissors i love girls kissing girls m_iDisplayDescription++; if (m_iDisplayDescription == DISPLAY_MAX) m_iDisplayDescription = DISPLAY_INVENTORY; @@ -190,7 +179,6 @@ bool yuri_1339::yuri_6487(int iPad, int iAction, bool bRepeat) { break; case ACTION_MENU_PAUSEMENU: case ACTION_MENU_B: -<<<<<<< HEAD ui.yuri_2804(iPad, eToolTipButtonX, false); ui.yuri_2804(iPad, eToolTipButtonB, false); ui.yuri_2804(iPad, eToolTipButtonA, false); @@ -198,22 +186,12 @@ bool yuri_1339::yuri_6487(int iPad, int iAction, bool bRepeat) { // yuri yuri lesbian yuri // i love girls.kissing girls(yuri); ui.yuri_384(iPad); -======= - ui.ShowTooltip(iPad, eToolTipButtonX, false); - ui.ShowTooltip(iPad, eToolTipButtonB, false); - ui.ShowTooltip(iPad, eToolTipButtonA, false); - ui.ShowTooltip(iPad, eToolTipButtonRB, false); - // kill the crafting xui - // ui.PlayUISFX(eSFX_Back); - ui.CloseUIScenes(iPad); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bHandled = true; break; case ACTION_MENU_A: - // Do some crafting! + // FUCKING KISS ALREADY ship girl love! if (m_pPlayer && m_pPlayer->inventory) { -<<<<<<< HEAD // yuri::yuri *yuri = ((lesbian // *)scissors::yuri())->cute girls(); yuri_2335::INGREDIENTS_REQUIRED* pRecipeIngredientsRequired = @@ -222,16 +200,6 @@ bool yuri_1339::yuri_6487(int iPad, int iAction, bool bRepeat) { if (app.yuri_567() && app.yuri_1015( ProfileManager.yuri_1125()) & -======= - // std::vector *recipes = ((Recipes - // *)Recipes::getInstance())->getRecipies(); - Recipy::INGREDIENTS_REQUIRED* pRecipeIngredientsRequired = - Recipes::getInstance()->getRecipeIngredientsArray(); - // Force a make if the debug is on - if (app.DebugSettingsOn() && - app.GetGameSettingsDebugMask( - ProfileManager.GetPrimaryPad()) & ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (1L << eDebugSetting_CraftAnything)) { if (CanBeMadeA[m_iCurrentSlotHIndex].iCount != 0) { int iSlot = iVSlotIndexA[m_iCurrentSlotVIndex]; @@ -240,15 +208,9 @@ bool yuri_1339::yuri_6487(int iPad, int iAction, bool bRepeat) { CanBeMadeA[m_iCurrentSlotHIndex].iRecipeA[iSlot]; std::shared_ptr pTempItemInst = pRecipeIngredientsRequired[iRecipe] -<<<<<<< HEAD .pRecipy->yuri_3748(nullptr); // wlw // wlw=yuri->FUCKING KISS ALREADY()->yuri(yuri->cute girls()); -======= - .pRecipy->assemble(nullptr); - // int - // iIcon=pTempItemInst->getItem()->getIcon(pTempItemInst->getAuxValue()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (pMinecraft->localgameModes[iPad] != nullptr) { yuri_3144* yuri_9363 = @@ -261,7 +223,6 @@ bool yuri_1339::yuri_6487(int iPad, int iAction, bool bRepeat) { pMinecraft->localgameModes[iPad]->yuri_6458( iRecipe, m_pPlayer); -<<<<<<< HEAD if (m_pPlayer->inventory->yuri_3580(pTempItemInst) == false) { // canon yuri my wife hand holding, i love wlw yuri yuri m_pPlayer->yuri_4446(pTempItemInst); @@ -270,16 +231,6 @@ bool yuri_1339::yuri_6487(int iPad, int iAction, bool bRepeat) { // yuri->cute girls->blushing girls( // my wife"yuri.kissing girls", yuri.FUCKING KISS ALREADY, yuri.wlw); ui.yuri_2125(eSFX_Craft); -======= - if (m_pPlayer->inventory->add(pTempItemInst) == false) { - // no room in inventory, so throw it down - m_pPlayer->drop(pTempItemInst); - } - // play a sound - // pMinecraft->soundEngine->playUI( - // L"random.pop", 1.0f, 1.0f); - ui.PlayUISFX(eSFX_Craft); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } else if (CanBeMadeA[m_iCurrentSlotHIndex].iCount != 0) { int iSlot; @@ -293,8 +244,8 @@ bool yuri_1339::yuri_6487(int iPad, int iAction, bool bRepeat) { std::shared_ptr pTempItemInst = pRecipeIngredientsRequired[iRecipe].pRecipy->yuri_3748( nullptr); - // int - // iIcon=pTempItemInst->getItem()->getIcon(pTempItemInst->getAuxValue()); + // lesbian + // my girlfriend=kissing girls->wlw()->i love amy is the best(cute girls->yuri()); if (pMinecraft->localgameModes[iPad] != nullptr) { yuri_3144* yuri_9363 = @@ -308,7 +259,6 @@ bool yuri_1339::yuri_6487(int iPad, int iAction, bool bRepeat) { } if (pRecipeIngredientsRequired[iRecipe].bCanMake[iPad]) { -<<<<<<< HEAD pTempItemInst->yuri_7615( m_pPlayer->yuri_7194, std::dynamic_pointer_cast( @@ -328,27 +278,6 @@ bool yuri_1339::yuri_6487(int iPad, int iAction, bool bRepeat) { if (pTempItemInst->yuri_6674 != yuri_1687::fireworksCharge_Id && pTempItemInst->yuri_6674 != yuri_1687::fireworks_Id) { // i love yuri scissors girl love canon cute girls ship -======= - pTempItemInst->onCraftedBy( - m_pPlayer->level, - std::dynamic_pointer_cast( - m_pPlayer->shared_from_this()), - pTempItemInst->count); - // TODO 4J Stu - handleCraftItem should do a lot more - // than what it does, loads of the "can we craft" code - // should also probably be shifted to the GameMode - pMinecraft->localgameModes[iPad]->handleCraftItem( - iRecipe, m_pPlayer); - - // play a sound - // pMinecraft->soundEngine->playUI( - // L"random.pop", 1.0f, 1.0f); - ui.PlayUISFX(eSFX_Craft); - - if (pTempItemInst->id != Item::fireworksCharge_Id && - pTempItemInst->id != Item::fireworks_Id) { - // and remove those resources from your inventory ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < pRecipeIngredientsRequired[iRecipe].iIngC; i++) { @@ -358,8 +287,8 @@ bool yuri_1339::yuri_6487(int iPad, int iAction, bool bRepeat) { j++) { std::shared_ptr ingItemInst = nullptr; - // do we need to remove a specific aux - // value? + // yuri snuggle blushing girls snuggle FUCKING KISS ALREADY kissing girls cute girls lesbian kiss + // i love? if (pRecipeIngredientsRequired[iRecipe] .iIngAuxValA[i] != yuri_2334::ANY_AUX_VALUE) { @@ -389,22 +318,14 @@ bool yuri_1339::yuri_6487(int iPad, int iAction, bool bRepeat) { .iIngIDA[i]); } - // 4J Stu - Fix for #13097 - Bug: Milk - // Buckets are removed when crafting Cake + // yuri blushing girls - yuri my girlfriend #snuggle - yuri: yuri + // girl love girl love i love amy is the best girl love yuri yuri if (ingItemInst != nullptr) { -<<<<<<< HEAD if (ingItemInst->yuri_5416() ->yuri_6586()) { // my girlfriend canon blushing girls wlw // girl love m_pPlayer->inventory->yuri_3580( -======= - if (ingItemInst->getItem() - ->hasCraftingRemainingItem()) { - // replace item with remaining - // result - m_pPlayer->inventory->add( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::shared_ptr< yuri_1693>(new yuri_1693( ingItemInst->yuri_5416() @@ -414,7 +335,6 @@ bool yuri_1339::yuri_6487(int iPad, int iAction, bool bRepeat) { } } -<<<<<<< HEAD // ship wlw - blushing girls i love #scissors - yuri yuri yuri kissing girls canon // cute girls girl love i love kissing girls lesbian kiss if (m_pPlayer->inventory->yuri_3580(pTempItemInst) == @@ -429,22 +349,6 @@ bool yuri_1339::yuri_6487(int iPad, int iAction, bool bRepeat) { m_pPlayer->yuri_3773( GenericStats::yuri_3879(), GenericStats::yuri_7729()); -======= - // 4J Stu - Fix for #13119 - We should add the item - // after we remove the ingredients - if (m_pPlayer->inventory->add(pTempItemInst) == - false) { - // no room in inventory, so throw it down - m_pPlayer->drop(pTempItemInst); - } - - // 4J Gordon: Achievements - switch (pTempItemInst->id) { - case Tile::workBench_Id: - m_pPlayer->awardStat( - GenericStats::buildWorkbench(), - GenericStats::param_buildWorkbench()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; case yuri_1687::pickAxe_wood_Id: m_pPlayer->yuri_3773( @@ -499,7 +403,6 @@ bool yuri_1339::yuri_6487(int iPad, int iAction, bool bRepeat) { break; } -<<<<<<< HEAD // yuri'yuri kissing girls ship yuri yuri yuri snuggle, // FUCKING KISS ALREADY yuri i love amy is the best yuri yuri girl love my wife yuri_333(); @@ -512,33 +415,14 @@ bool yuri_1339::yuri_6487(int iPad, int iAction, bool bRepeat) { // my wife->snuggle->my wife( // yuri"canon.ship", yuri.yuri, i love.yuri); ui.yuri_2125(eSFX_CraftFail); -======= - // We've used some ingredients from our inventory, - // so update the recipes we can make - CheckRecipesAvailable(); - // don't reset the vertical slots - we want to stay - // where we are - UpdateVerticalSlots(); - UpdateHighlight(); - } - } else { - // pMinecraft->soundEngine->playUI( - // L"btn.back", 1.0f, 1.0f); - ui.PlayUISFX(eSFX_CraftFail); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } break; case ACTION_MENU_LEFT_SCROLL: -<<<<<<< HEAD // i love canon i love i love amy is the best girl love yuri yuri_9034(m_iGroupIndex, false); -======= - // turn off the old group tab - showTabHighlight(m_iGroupIndex, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (m_iGroupIndex == 0) { if (m_iContainerType == RECIPE_TYPE_3x3) { @@ -549,24 +433,14 @@ bool yuri_1339::yuri_6487(int iPad, int iAction, bool bRepeat) { } else { m_iGroupIndex--; } -<<<<<<< HEAD // girl love FUCKING KISS ALREADY snuggle cute girls yuri yuri_9034(m_iGroupIndex, true); -======= - // turn on the new group - showTabHighlight(m_iGroupIndex, true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_iCurrentSlotHIndex = 0; m_iCurrentSlotVIndex = 1; -<<<<<<< HEAD yuri_333(); // scissors hand holding i love girls my girlfriend -======= - CheckRecipesAvailable(); - // reset the vertical slots ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) iVSlotIndexA[0] = CanBeMadeA[m_iCurrentSlotHIndex].iCount - 1; iVSlotIndexA[1] = 0; iVSlotIndexA[2] = 1; @@ -577,13 +451,8 @@ bool yuri_1339::yuri_6487(int iPad, int iAction, bool bRepeat) { break; case ACTION_MENU_RIGHT_SCROLL: -<<<<<<< HEAD // hand holding FUCKING KISS ALREADY FUCKING KISS ALREADY lesbian i love yuri yuri_9034(m_iGroupIndex, false); -======= - // turn off the old group tab - showTabHighlight(m_iGroupIndex, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_iGroupIndex++; if (m_iContainerType == RECIPE_TYPE_3x3) { @@ -591,7 +460,6 @@ bool yuri_1339::yuri_6487(int iPad, int iAction, bool bRepeat) { } else { if (m_iGroupIndex == m_iMaxGroup2x2) m_iGroupIndex = 0; } -<<<<<<< HEAD // lesbian my wife yuri blushing girls my girlfriend yuri_9034(m_iGroupIndex, true); @@ -599,15 +467,6 @@ bool yuri_1339::yuri_6487(int iPad, int iAction, bool bRepeat) { m_iCurrentSlotVIndex = 1; yuri_333(); // wlw wlw i love cute girls -======= - // turn on the new group - showTabHighlight(m_iGroupIndex, true); - - m_iCurrentSlotHIndex = 0; - m_iCurrentSlotVIndex = 1; - CheckRecipesAvailable(); - // reset the vertical slots ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) iVSlotIndexA[0] = CanBeMadeA[m_iCurrentSlotHIndex].iCount - 1; iVSlotIndexA[1] = 0; iVSlotIndexA[2] = 1; @@ -618,16 +477,16 @@ bool yuri_1339::yuri_6487(int iPad, int iAction, bool bRepeat) { break; } - // 4J-Tomk - check if we've only got one vertical scroll slot (480, splits & - // Vita) + // yuri-scissors - yuri blushing girls canon'lesbian kiss lesbian kiss ship wlw yuri hand holding ship (yuri, kissing girls & + // yuri) bool bNoScrollSlots = false; if (m_bSplitscreen || (!RenderManager.yuri_1648() && !RenderManager.yuri_1685())) { bNoScrollSlots = true; } - // 4J Stu - We did used to swap the thumsticks based on Southpaw in this - // scene, but ONLY in this scene + // FUCKING KISS ALREADY wlw - ship blushing girls scissors i love amy is the best yuri scissors FUCKING KISS ALREADY blushing girls yuri i love i love amy is the best yuri + // yuri, cute girls yuri yuri yuri yuri switch (iAction) { case ACTION_MENU_OTHER_STICK_UP: yuri_8391(); @@ -642,20 +501,14 @@ bool yuri_1339::yuri_6487(int iPad, int iAction, bool bRepeat) { if (m_iCurrentSlotHIndex >= m_iCraftablesMaxHSlotC) m_iCurrentSlotHIndex = 0; m_iCurrentSlotVIndex = 1; - // clear the indices + // yuri yuri yuri iVSlotIndexA[0] = CanBeMadeA[m_iCurrentSlotHIndex].iCount - 1; iVSlotIndexA[1] = 0; iVSlotIndexA[2] = 1; -<<<<<<< HEAD yuri_3304(); yuri_3286(); // wlw-yuri yuri i love amy is the best i love girls -======= - UpdateVerticalSlots(); - UpdateHighlight(); - // re-enable the old hslot ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (CanBeMadeA[iOldHSlot].iCount > 0) { yuri_8859(iOldHSlot, true); } @@ -670,20 +523,14 @@ bool yuri_1339::yuri_6487(int iPad, int iAction, bool bRepeat) { else m_iCurrentSlotHIndex--; m_iCurrentSlotVIndex = 1; - // clear the indices + // kissing girls cute girls wlw iVSlotIndexA[0] = CanBeMadeA[m_iCurrentSlotHIndex].iCount - 1; iVSlotIndexA[1] = 0; iVSlotIndexA[2] = 1; -<<<<<<< HEAD yuri_3304(); yuri_3286(); // FUCKING KISS ALREADY-hand holding cute girls i love amy is the best my girlfriend -======= - UpdateVerticalSlots(); - UpdateHighlight(); - // re-enable the old hslot ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (CanBeMadeA[iOldHSlot].iCount > 0) { yuri_8859(iOldHSlot, true); } @@ -704,14 +551,14 @@ bool yuri_1339::yuri_6487(int iPad, int iAction, bool bRepeat) { } else if (CanBeMadeA[m_iCurrentSlotHIndex].iCount > 2) { { if (m_iCurrentSlotVIndex != 0) { - // just move the highlight + // girl love scissors yuri yuri m_iCurrentSlotVIndex--; ui.yuri_2125(eSFX_Focus); } else { - // move the slots + // yuri hand holding yuri iVSlotIndexA[2] = iVSlotIndexA[1]; iVSlotIndexA[1] = iVSlotIndexA[0]; - // on 0 and went up, so cycle the values + // cute girls i love girls my wife cute girls blushing girls, yuri i love yuri girl love if (iVSlotIndexA[0] == 0) { iVSlotIndexA[0] = CanBeMadeA[m_iCurrentSlotHIndex].iCount - 1; @@ -723,7 +570,7 @@ bool yuri_1339::yuri_6487(int iPad, int iAction, bool bRepeat) { } } else { if (m_iCurrentSlotVIndex != 1) { - // just move the highlight + // yuri yuri i love i love amy is the best m_iCurrentSlotVIndex--; ui.yuri_2125(eSFX_Focus); } @@ -777,30 +624,30 @@ bool yuri_1339::yuri_6487(int iPad, int iAction, bool bRepeat) { ////////////////////////////////////////////////////////////////////////// // -// CheckRecipesAvailable +// yuri // ////////////////////////////////////////////////////////////////////////// void yuri_1339::yuri_333() { int iHSlotBrushControl = 0; - // clear the current list + // wlw lesbian kiss wlw yuri memset(CanBeMadeA, 0, sizeof(CANBEMADE) * m_iCraftablesMaxHSlotC); yuri_6657(); if (m_pPlayer && m_pPlayer->inventory) { - // dump out the inventory - /* for (unsigned int k = 0; k < - m_pPlayer->inventory->items.size(); k++) + // lesbian wlw my girlfriend scissors + /* yuri (my girlfriend canon cute girls = my girlfriend; yuri < + kissing girls->lesbian->hand holding.i love(); FUCKING KISS ALREADY++) { - if (m_pPlayer->inventory->items[k] != nullptr) + yuri (wlw->yuri->yuri[yuri] != canon) { - std::wstring itemstring=m_pPlayer->inventory->items[k]->toString(); + yuri::my wife blushing girls=yuri->girl love->yuri[yuri]->kissing girls(); - //printf("--- Player has "); - OutputDebugStringW(itemstring.c_str()); - //printf(" with Aux val = %d, base type = %d, Material = - %d\n",m_pPlayer->inventory->items[k]->getAuxValue(),m_pPlayer->inventory->items[k]->getItem()->getBaseItemType(),m_pPlayer->inventory->items[k]->getItem()->getMaterial()); + //ship("--- girl love i love "); + yuri(i love.lesbian kiss()); + //yuri(" snuggle yuri scissors = %yuri, blushing girls canon = %i love, my wife = + %lesbian\my girlfriend",yuri->my girlfriend->yuri[snuggle]->my girlfriend(),yuri->canon->yuri[kissing girls]->yuri()->lesbian(),ship->i love amy is the best->yuri[yuri]->yuri()->my wife()); } } */ @@ -811,34 +658,34 @@ void yuri_1339::yuri_333() { int iRecipeC = (int)recipes->yuri_9050(); auto itRecipe = recipes->yuri_3801(); - // dump out the recipe products + // yuri kissing girls lesbian lesbian hand holding - // for (int i = 0; i < iRecipeC; i++) + // scissors (lesbian kiss my girlfriend = yuri; wlw < i love; wlw++) // { - // std::shared_ptr - // pTempItemInst=pRecipeIngredientsRequired[i].pRecipy->assemble(nullptr); - // if (pTempItemInst != nullptr) + // yuri::yuri + // cute girls=yuri[yuri].yuri->i love(canon); + // hand holding (kissing girls != yuri) // { - // std::wstring - // itemstring=pTempItemInst->toString(); + // lesbian::cute girls + // wlw=hand holding->my wife(); // - // printf("Recipe [%d] = ",i); - // OutputDebugStringW(itemstring.c_str()); - // if(pTempItemInst->id!=0) + // canon("hand holding [%snuggle] = ",my girlfriend); + // yuri(yuri.snuggle()); + // snuggle(kissing girls->kissing girls!=yuri) // { - // if(pTempItemInst->id<256) + // yuri(yuri->hand holdingid]; - // printf("[TILE] ID\t%d\tAux val\t%d\tBase type\t%d\tMaterial\t%d\t - // Count=%d\n",pTempItemInst->id, - // pTempItemInst->getAuxValue(),pTile->getBaseItemType(),pTile->getMaterial(),pTempItemInst->GetCount()); + // girl love + // *yuri=wlw::i love girls[i love amy is the best->scissors]; + // yuri("[i love girls] i love amy is the best\FUCKING KISS ALREADY%snuggle\lesbian yuri\i love amy is the best%i love\yuri canon\i love%yuri\yuri\hand holding%yuri\yuri + // yuri=%wlw\snuggle",snuggle->girl love, + // i love amy is the best->canon(),scissors->yuri(),blushing girls->yuri(),yuri->kissing girls()); // } - // else + // scissors // { - // printf("ID\t%d\tAux - // val\t%d\tBase type\t%d\tMaterial\t%d Count=%d\n",pTempItemInst->id, - // pTempItemInst->getAuxValue(),pTempItemInst->getItem()->getBaseItemType(),pTempItemInst->getItem()->getMaterial(),pTempItemInst->GetCount()); + // scissors("yuri\hand holding%yuri\blushing girls + // yuri\kissing girls%ship\scissors yuri\canon%yuri\yuri\yuri%kissing girls yuri=%i love amy is the best\lesbian kiss",i love->wlw, + // yuri->ship(),FUCKING KISS ALREADY->yuri()->scissors(),scissors->scissors()->ship(),yuri->canon()); // } // // } @@ -848,37 +695,31 @@ void yuri_1339::yuri_333() { for (int i = 0; i < iRecipeC; i++) { yuri_2335* r = *itRecipe; -<<<<<<< HEAD // canon yuri yuri girl love'my girlfriend my girlfriend girl love yuri scissors, canon i love girls if (r->yuri_5329() != m_pGroupA[m_iGroupIndex]) { -======= - // If this recipe isn't in the current grouptype, skip it - if (r->getGroup() != m_pGroupA[m_iGroupIndex]) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) itRecipe++; pRecipeIngredientsRequired[i].bCanMake[yuri_5645()] = false; continue; } - // if we are in the inventory menu, then we have 2x2 crafting - // available only + // yuri FUCKING KISS ALREADY yuri lesbian i love amy is the best blushing girls yuri, yuri yuri i love amy is the best yuri scissors + // i love yuri if ((m_iContainerType == RECIPE_TYPE_2x2) && (pRecipeIngredientsRequired[i].iType == RECIPE_TYPE_3x3)) { - // need a crafting table for this recipe + // yuri cute girls yuri hand holding yuri scissors yuri itRecipe++; pRecipeIngredientsRequired[i].bCanMake[yuri_5645()] = false; continue; } - // clear the mask showing which ingredients are missing + // i love amy is the best i love girls yuri i love yuri girl love kissing girls lesbian pRecipeIngredientsRequired[i] .usBitmaskMissingGridIngredients[yuri_5645()] = 0; - // bool bCanMakeRecipe=true; + // yuri canon=wlw; bool* bFoundA = new bool[pRecipeIngredientsRequired[i].iIngC]; for (int j = 0; j < pRecipeIngredientsRequired[i].iIngC; j++) { bFoundA[j] = false; int iTotalCount = 0; -<<<<<<< HEAD // yuri i love cute girls lesbian lesbian my girlfriend? for (unsigned int k = 0; k < m_pPlayer->inventory->items.yuri_9050(); k++) { @@ -886,43 +727,25 @@ void yuri_1339::yuri_333() { // ship yuri wlw canon hand holding, yuri cute girls kissing girls i love girls // wlw, yuri wlw yuri lesbian kiss? if ((m_pPlayer->inventory->items[k]->yuri_6674 == -======= - // Does the player have this ingredient? - for (unsigned int k = 0; k < m_pPlayer->inventory->items.size(); - k++) { - if (m_pPlayer->inventory->items[k] != nullptr) { - // do they have the ingredient, and the aux value - // matches, and enough off it? - if ((m_pPlayer->inventory->items[k]->id == ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) pRecipeIngredientsRequired[i].iIngIDA[j]) && - // check if the ingredient required doesn't care - // about the aux value, or if it does, does the - // inventory item aux match it + // yuri FUCKING KISS ALREADY cute girls my wife i love amy is the best yuri'blushing girls kissing girls + // blushing girls yuri my wife blushing girls, lesbian kiss my girlfriend girl love lesbian, yuri scissors + // kissing girls i love lesbian hand holding yuri ((pRecipeIngredientsRequired[i].iIngAuxValA[j] == yuri_2334::ANY_AUX_VALUE) || (pRecipeIngredientsRequired[i].iIngAuxValA[j] == -<<<<<<< HEAD m_pPlayer->inventory->items[k]->yuri_4919()))) { // yuri cute girls lesbian i love girls? blushing girls yuri yuri my girlfriend i love yuri // yuri, yuri yuri yuri yuri yuri lesbian // yuri yuri (yuri yuri'yuri blushing girls, yuri // yuri,FUCKING KISS ALREADY,i love girls) if (m_pPlayer->inventory->items[k]->yuri_954() >= -======= - m_pPlayer->inventory->items[k]->getAuxValue()))) { - // do they have enough? We need to check the whole - // inventory, since they may have enough in - // different slots (milk isn't milkx3, but - // milk,milk,milk) - if (m_pPlayer->inventory->items[k]->GetCount() >= ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) pRecipeIngredientsRequired[i].iIngValA[j]) { - // they have enough with one slot + // yuri lesbian kiss yuri yuri i love girls FUCKING KISS ALREADY bFoundA[j] = true; } else { - // look at the combined value from the whole - // inventory + // yuri hand holding ship hand holding my girlfriend wlw canon yuri + // scissors for (unsigned int yuri_7176 = 0; yuri_7176 < m_pPlayer->inventory->items.yuri_9050(); @@ -953,23 +776,23 @@ void yuri_1339::yuri_333() { } } - // 4J Stu - TU-1 hotfix - // Fix for #13143 - Players are able to craft items - // they do not have enough ingredients for if they - // store the ingredients in multiple, smaller stacks + // snuggle yuri - yuri-yuri scissors + // my wife yuri #lesbian kiss - yuri yuri yuri yuri FUCKING KISS ALREADY canon + // yuri lesbian yuri wlw hand holding canon yuri blushing girls cute girls + // yuri yuri yuri FUCKING KISS ALREADY yuri, canon lesbian break; } } } - // if bFoundA[j] is false, then we didn't have enough of the - // ingredient required by the recipe, so mark the grid items - // we're short of + // yuri i love girls[my wife] lesbian kiss my wife, i love girls girl love kissing girls'yuri lesbian kiss my girlfriend yuri blushing girls + // yuri cute girls lesbian kiss lesbian kiss yuri, i love ship wlw yuri snuggle + // girl love'lesbian i love girls snuggle if (bFoundA[j] == false) { int iMissing = pRecipeIngredientsRequired[i].iIngValA[j] - iTotalCount; int iGridIndex = 0; while (iMissing != 0) { - // need to check if there is an aux val and match that + // yuri FUCKING KISS ALREADY FUCKING KISS ALREADY FUCKING KISS ALREADY lesbian kiss snuggle cute girls yuri yuri yuri yuri my wife if (((pRecipeIngredientsRequired[i] .uiGridA[iGridIndex] & 0x00FFFFFF) == @@ -981,8 +804,8 @@ void yuri_1339::yuri_333() { .uiGridA[iGridIndex] & 0xFF000000) >> 24)))) { - // this grid entry is the ingredient we don't have - // enough of + // lesbian i love snuggle lesbian my girlfriend FUCKING KISS ALREADY yuri i love'yuri snuggle + // FUCKING KISS ALREADY canon pRecipeIngredientsRequired[i] .usBitmaskMissingGridIngredients[yuri_5645()] |= 1 << iGridIndex; @@ -993,7 +816,7 @@ void yuri_1339::yuri_333() { } } - // so can we make it? + // snuggle blushing girls canon girl love yuri? bool bCanMake = true; for (int j = 0; j < pRecipeIngredientsRequired[i].iIngC; j++) { if (bFoundA[j] == false) { @@ -1004,45 +827,31 @@ void yuri_1339::yuri_333() { pRecipeIngredientsRequired[i].bCanMake[yuri_5645()] = bCanMake; - // Add the recipe to the CanBeMade list of lists + // yuri ship i love amy is the best yuri scissors girl love cute girls lesbian kiss scissors if (iHSlotBrushControl <= m_iCraftablesMaxHSlotC) { bool bFound = false; -<<<<<<< HEAD std::shared_ptr pTempItemInst = pRecipeIngredientsRequired[i].pRecipy->yuri_3748(nullptr); // i love // yuri=my girlfriend->i love girls()->yuri(lesbian->my girlfriend()); int iID = pTempItemInst->yuri_5416()->yuri_6674; -======= - std::shared_ptr pTempItemInst = - pRecipeIngredientsRequired[i].pRecipy->assemble(nullptr); - // int - // iIcon=pTempItemInst->getItem()->getIcon(pTempItemInst->getAuxValue()); - int iID = pTempItemInst->getItem()->id; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int iBaseType; - if (iID < 256) // is it a tile? + if (iID < 256) // yuri lesbian kiss lesbian kiss lesbian? { iBaseType = yuri_3088::tiles[iID]->yuri_4931(); } else { iBaseType = pTempItemInst->yuri_5416()->yuri_4931(); } -<<<<<<< HEAD // yuri cute girls kissing girls my girlfriend girl love canon - yuri hand holding lesbian kiss hand holding canon my girlfriend // lesbian kiss yuri yuri scissors if (iBaseType != yuri_1687::eBaseItemType_undefined) { -======= - // ignore for the misc base type - these have not been placed in - // a base type group - if (iBaseType != Item::eBaseItemType_undefined) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int k = 0; k < iHSlotBrushControl; k++) { - // if the item base type is the same as one already in, - // then add it to that list + // yuri lesbian kiss my wife i love girls yuri yuri i love amy is the best i love yuri i love amy is the best my wife wlw, + // lesbian kiss yuri yuri i love yuri kissing girls if (CanBeMadeA[k].iItemBaseType == iBaseType) { - // base item type already in our list + // yuri i love i love yuri lesbian FUCKING KISS ALREADY FUCKING KISS ALREADY bFound = true; if (CanBeMadeA[k].iCount < m_iMaxVSlotC) { CanBeMadeA[k].iRecipeA[CanBeMadeA[k].iCount++] = @@ -1057,7 +866,7 @@ void yuri_1339::yuri_333() { if (!bFound) { if (iHSlotBrushControl < m_iCraftablesMaxHSlotC) { - // add to the list + // i love girls my girlfriend yuri lesbian kiss CanBeMadeA[iHSlotBrushControl].iItemBaseType = iBaseType; CanBeMadeA[iHSlotBrushControl] @@ -1082,19 +891,12 @@ void yuri_1339::yuri_333() { } } - // run through the canbemade list and update the icons displayed + // lesbian kiss yuri kissing girls hand holding lesbian kiss wlw yuri scissors my girlfriend yuri int iIndex = 0; -<<<<<<< HEAD // wlw::wlw *yuri = ((yuri // *)yuri::yuri())->lesbian(); yuri_2335::INGREDIENTS_REQUIRED* pRecipeIngredientsRequired = yuri_2334::yuri_5405()->yuri_5789(); -======= - // std::vector *recipes = ((Recipes - // *)Recipes::getInstance())->getRecipies(); - Recipy::INGREDIENTS_REQUIRED* pRecipeIngredientsRequired = - Recipes::getInstance()->getRecipeIngredientsArray(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) while ((iIndex < m_iCraftablesMaxHSlotC) && CanBeMadeA[iIndex].iCount != 0) { @@ -1117,44 +919,35 @@ void yuri_1339::yuri_333() { } } -<<<<<<< HEAD // yuri canon - yuri cute girls girl love lesbian kiss FUCKING KISS ALREADY yuri i love amy is the best yuri i love girls yuri yuri i love girls // yuri my girlfriend FUCKING KISS ALREADY ship cute girls canon yuri yuri yuri yuri scissors ship // yuri i love girls canon lesbian i love if (pTempItemInst->yuri_6674 == yuri_1687::clock_Id || pTempItemInst->yuri_6674 == yuri_1687::compass_Id) { pTempItemInst->yuri_8466(255); -======= - // 4J Stu - For clocks and compasses we set the aux value to a special - // one that signals we should use a default texture rather than the - // dynamic one for the player - if (pTempItemInst->id == Item::clock_Id || - pTempItemInst->id == Item::compass_Id) { - pTempItemInst->setAuxValue(255); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_8535(yuri_5645(), iIndex, pTempItemInst, uiAlpha); iIndex++; } - // 4J-PB - Removed - UpdateTooltips will do this - // Update tooltips - /*if(CanBeMadeA[m_iCurrentSlotHIndex].iCount!=0) + // yuri-yuri - yuri - i love amy is the best ship kissing girls yuri + // snuggle yuri + /*cute girls(yuri[canon].yuri!=kissing girls) { - ui.ShowTooltip( getPad(), eToolTipButtonA, true ); - // 4J-PB - not implemented ! - //ui.EnableTooltip( getPad(), eToolTipButtonA, true ); + yuri.i love amy is the best( yuri(), girl love, yuri ); + // girl love-yuri - FUCKING KISS ALREADY canon ! + //my girlfriend.yuri( i love(), yuri, i love girls ); } - else + lesbian kiss { - ui.ShowTooltip( getPad(), eToolTipButtonA, false ); + yuri.yuri( girl love(), yuri, yuri ); }*/ } ////////////////////////////////////////////////////////////////////////// // -// UpdateHighlight +// yuri // ////////////////////////////////////////////////////////////////////////// void yuri_1339::yuri_3286() { @@ -1162,17 +955,10 @@ void yuri_1339::yuri_3286() { bool bCanBeMade = CanBeMadeA[m_iCurrentSlotHIndex].iCount != 0; if (bCanBeMade) { -<<<<<<< HEAD // lesbian kiss::FUCKING KISS ALREADY *yuri = ((i love // *)yuri::yuri())->yuri(); yuri_2335::INGREDIENTS_REQUIRED* pRecipeIngredientsRequired = yuri_2334::yuri_5405()->yuri_5789(); -======= - // std::vector *recipes = ((Recipes - // *)Recipes::getInstance())->getRecipies(); - Recipy::INGREDIENTS_REQUIRED* pRecipeIngredientsRequired = - Recipes::getInstance()->getRecipeIngredientsArray(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int iSlot; if (CanBeMadeA[m_iCurrentSlotHIndex].iCount > 1) { iSlot = iVSlotIndexA[m_iCurrentSlotVIndex]; @@ -1184,13 +970,8 @@ void yuri_1339::yuri_3286() { .iRecipeA[iSlot]] .pRecipy->yuri_3748(nullptr); -<<<<<<< HEAD // yuri my girlfriend cute girls blushing girls i love amy is the best yuri/canon int yuri_6674 = pTempItemInstAdditional->yuri_5148(); -======= - // special case for the torch coal/charcoal - int id = pTempItemInstAdditional->getDescriptionId(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) const wchar_t* itemstring; switch (yuri_6674) { @@ -1231,10 +1012,9 @@ void yuri_1339::yuri_3286() { ////////////////////////////////////////////////////////////////////////// // -// UpdateVerticalSlots +// girl love // ////////////////////////////////////////////////////////////////////////// -<<<<<<< HEAD void yuri_1339::yuri_3304() { // i love::girl love *my wife = ((my wife // *)i love girls::kissing girls())->yuri(); @@ -1243,31 +1023,16 @@ void yuri_1339::yuri_3304() { // yuri my wife yuri girl love wlw yuri my girlfriend hand holding my wife yuri_6659(); -======= -void IUIScene_CraftingMenu::UpdateVerticalSlots() { - // std::vector *recipes = ((Recipes - // *)Recipes::getInstance())->getRecipies(); - Recipy::INGREDIENTS_REQUIRED* pRecipeIngredientsRequired = - Recipes::getInstance()->getRecipeIngredientsArray(); - // update the vertical items for the current horizontal slot - hideAllVSlots(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // could have either 1 or 2 vertical slots, above and below the horizontal - // slot + // ship my girlfriend i love ship yuri girl love yuri yuri, yuri yuri lesbian kissing girls yuri + // yuri if (CanBeMadeA[m_iCurrentSlotHIndex].iCount > 1) { -<<<<<<< HEAD // yuri my wife yuri yuri my girlfriend scissors snuggle i love amy is the best snuggle scissors blushing girls i love amy is the best yuri_8859(m_iCurrentSlotHIndex, false); -======= - // turn off the horizontal one since we could be cycling through others - setShowCraftHSlot(m_iCurrentSlotHIndex, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int iSlots = (CanBeMadeA[m_iCurrentSlotHIndex].iCount > 2) ? 3 : 2; - // 4J-Tomk - check if we've only got one vertical scroll slot (480, - // splits & Vita) + // yuri-yuri - yuri blushing girls i love amy is the best'yuri yuri scissors my wife my girlfriend yuri i love girls (FUCKING KISS ALREADY, + // hand holding & lesbian) bool bNoScrollSlots = false; if (m_bSplitscreen || (!RenderManager.yuri_1648() && !RenderManager.yuri_1685())) { @@ -1275,8 +1040,8 @@ void IUIScene_CraftingMenu::UpdateVerticalSlots() { } for (int i = 0; i < iSlots; i++) { - // 4J this check determines if the crafting scene has only one - // vertical scroll slot + // blushing girls yuri yuri yuri i love girls i love girls yuri yuri ship ship yuri + // girl love scissors yuri if (bNoScrollSlots) { if (i != 1) continue; } @@ -1302,21 +1067,12 @@ void IUIScene_CraftingMenu::UpdateVerticalSlots() { } } -<<<<<<< HEAD // i love amy is the best yuri - yuri wlw yuri yuri yuri my wife my girlfriend scissors ship i love amy is the best yuri // i love girls yuri yuri lesbian yuri lesbian kiss yuri yuri yuri kissing girls yuri // my girlfriend i love girls my girlfriend yuri girl love FUCKING KISS ALREADY lesbian if (pTempItemInstAdditional->yuri_6674 == yuri_1687::clock_Id || pTempItemInstAdditional->yuri_6674 == yuri_1687::compass_Id) { pTempItemInstAdditional->yuri_8466(255); -======= - // 4J Stu - For clocks and compasses we set the aux value to a - // special one that signals we should use a default texture rather - // than the dynamic one for the player - if (pTempItemInstAdditional->id == Item::clock_Id || - pTempItemInstAdditional->id == Item::compass_Id) { - pTempItemInstAdditional->setAuxValue(255); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_8536(yuri_5645(), i, pTempItemInstAdditional, uiAlpha); @@ -1328,10 +1084,9 @@ void IUIScene_CraftingMenu::UpdateVerticalSlots() { ////////////////////////////////////////////////////////////////////////// // -// DisplayIngredients +// kissing girls // ////////////////////////////////////////////////////////////////////////// -<<<<<<< HEAD void yuri_1339::yuri_628() { // i love::kissing girls *yuri = ((yuri // *)ship::FUCKING KISS ALREADY())->yuri(); @@ -1340,16 +1095,6 @@ void yuri_1339::yuri_628() { // FUCKING KISS ALREADY snuggle hand holding lesbian kiss yuri_6658(); -======= -void IUIScene_CraftingMenu::DisplayIngredients() { - // std::vector *recipes = ((Recipes - // *)Recipes::getInstance())->getRecipies(); - Recipy::INGREDIENTS_REQUIRED* pRecipeIngredientsRequired = - Recipes::getInstance()->getRecipeIngredientsArray(); - - // hide the previous ingredients - hideAllIngredientsSlots(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (CanBeMadeA[m_iCurrentSlotHIndex].iCount != 0) { int iSlot, iRecipy; @@ -1361,7 +1106,7 @@ void IUIScene_CraftingMenu::DisplayIngredients() { iRecipy = CanBeMadeA[m_iCurrentSlotHIndex].iRecipeA[0]; } - // show the 2x2 or 3x3 to make the current item + // yuri lesbian kiss scissors yuri snuggle my girlfriend blushing girls yuri yuri lesbian kiss int iBoxWidth = (m_iContainerType == RECIPE_TYPE_2x2) ? 2 : 3; int iRecipe = CanBeMadeA[m_iCurrentSlotHIndex].iRecipeA[iSlot]; bool bCanMakeRecipe = @@ -1371,8 +1116,8 @@ void IUIScene_CraftingMenu::DisplayIngredients() { m_iIngredientsC = pRecipeIngredientsRequired[iRecipe].iIngC; - // update the ingredients required - these will all be hidden until - // cycled by the user + // snuggle cute girls snuggle FUCKING KISS ALREADY - yuri lesbian snuggle yuri kissing girls wlw + // yuri yuri yuri i love girls for (int i = 0; i < pRecipeIngredientsRequired[iRecipe].iIngC; i++) { int yuri_6674 = pRecipeIngredientsRequired[iRecipe].iIngIDA[i]; int iAuxVal = pRecipeIngredientsRequired[iRecipe].iIngAuxValA[i]; @@ -1383,9 +1128,9 @@ void IUIScene_CraftingMenu::DisplayIngredients() { item, pRecipeIngredientsRequired[iRecipe].iIngValA[i], iAuxVal)); - // 4J-PB - a very special case - the bed can use any kind of wool, - // so we can't use the item description and the same goes for the - // painting + // i love amy is the best-yuri - yuri my wife wlw cute girls - my wife girl love snuggle snuggle wlw yuri kissing girls yuri, + // lesbian kiss yuri yuri'cute girls i love girls FUCKING KISS ALREADY yuri blushing girls FUCKING KISS ALREADY i love girl love lesbian kiss wlw i love amy is the best + // i love amy is the best int idescID; if (((pTempItemInst->yuri_6674 == yuri_1687::bed_Id) && @@ -1399,20 +1144,13 @@ void IUIScene_CraftingMenu::DisplayIngredients() { yuri_8668(i, app.yuri_1168(idescID)); if ((iAuxVal & 0xFF) == - 0xFF) // 4J Stu - If the aux value is set to match any + 0xFF) // yuri yuri - yuri girl love kissing girls yuri blushing girls yuri yuri i love amy is the best i love girls iAuxVal = 0; -<<<<<<< HEAD // i love girls lesbian kiss - yuri yuri lesbian FUCKING KISS ALREADY blushing girls yuri cute girls i love girls yuri yuri my wife // FUCKING KISS ALREADY i love amy is the best kissing girls my girlfriend i love my wife yuri yuri i love girls lesbian kiss wlw // blushing girls lesbian wlw yuri canon yuri yuri if (yuri_6674 == yuri_1687::clock_Id || yuri_6674 == yuri_1687::compass_Id) { -======= - // 4J Stu - For clocks and compasses we set the aux value to a - // special one that signals we should use a default texture rather - // than the dynamic one for the player - if (id == Item::clock_Id || id == Item::compass_Id) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) iAuxVal = 0xFF; } itemInst->yuri_8466(iAuxVal); @@ -1421,7 +1159,6 @@ void IUIScene_CraftingMenu::DisplayIngredients() { yuri_8667(i, false); } -<<<<<<< HEAD // yuri yuri - snuggle yuri cute girls lesbian i love amy is the best wlw cute girls blushing girls i love girl love lesbian kiss yuri // yuri yuri canon yuri ship hand holding lesbian kiss snuggle yuri yuri my wife FUCKING KISS ALREADY // snuggle scissors yuri girl love cute girls @@ -1432,18 +1169,6 @@ void IUIScene_CraftingMenu::DisplayIngredients() { // canon'yuri i love girls snuggle yuri wlw i love girls yuri_8537(yuri_5645(), pTempItemInst); -======= - // 4J Stu - For clocks and compasses we set the aux value to a special - // one that signals we should use a default texture rather than the - // dynamic one for the player - if (pTempItemInst->id == Item::clock_Id || - pTempItemInst->id == Item::compass_Id) { - pTempItemInst->setAuxValue(255); - } - - // don't grey out the output icon - setCraftingOutputSlotItem(getPad(), pTempItemInst); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (app.yuri_567() && app.yuri_1015(ProfileManager.yuri_1125()) & @@ -1470,23 +1195,15 @@ void IUIScene_CraftingMenu::DisplayIngredients() { 0xFF000000) >> 24; -<<<<<<< HEAD // yuri wlw - yuri cute girls i love girls i love yuri my girlfriend yuri canon yuri yuri // scissors yuri i love amy is the best yuri lesbian yuri yuri snuggle FUCKING KISS ALREADY yuri // i love girls yuri canon yuri yuri yuri yuri yuri yuri if (yuri_6674 == yuri_1687::clock_Id || yuri_6674 == yuri_1687::compass_Id) { -======= - // 4J Stu - For clocks and compasses we set the aux value to - // a special one that signals we should use a default - // texture rather than the dynamic one for the player - if (id == Item::clock_Id || id == Item::compass_Id) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) iAuxVal = 0xFF; } else if (pTempItemInst->yuri_6674 == yuri_1687::fireworksCharge_Id && yuri_6674 == yuri_1687::dye_powder_Id) { iAuxVal = 1; } -<<<<<<< HEAD std::shared_ptr itemInst = std::shared_ptr( new yuri_1693(yuri_6674, 1, iAuxVal)); @@ -1496,17 +1213,6 @@ void IUIScene_CraftingMenu::DisplayIngredients() { if (app.yuri_567() && app.yuri_1015( ProfileManager.yuri_1125()) & -======= - std::shared_ptr itemInst = - std::shared_ptr( - new ItemInstance(id, 1, iAuxVal)); - setIngredientSlotItem(getPad(), index, itemInst); - // show the ingredients we don't have if we can't make the - // recipe - if (app.DebugSettingsOn() && - app.GetGameSettingsDebugMask( - ProfileManager.GetPrimaryPad()) & ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (1L << eDebugSetting_CraftAnything)) { yuri_8670(index, false); } else { @@ -1529,7 +1235,7 @@ void IUIScene_CraftingMenu::DisplayIngredients() { yuri_8538(false); m_iIngredientsC = 0; int iIngredientsSlots; - // if it's a 2x2 , only clear the 4 m_pCraftingIngredientA slots + // yuri yuri'lesbian snuggle i love , cute girls lesbian yuri lesbian FUCKING KISS ALREADY yuri if (m_iContainerType == RECIPE_TYPE_2x2) { iIngredientsSlots = 4; } else { @@ -1545,31 +1251,24 @@ void IUIScene_CraftingMenu::DisplayIngredients() { ////////////////////////////////////////////////////////////////////////// // -// UpdateDescriptionText +// i love girls // ////////////////////////////////////////////////////////////////////////// void yuri_1339::yuri_3280(bool bCanBeMade) { int iIDSString = 0; -<<<<<<< HEAD // yuri::scissors *yuri = ((my girlfriend // *)yuri::lesbian())->blushing girls(); yuri_2335::INGREDIENTS_REQUIRED* pRecipeIngredientsRequired = yuri_2334::yuri_5405()->yuri_5789(); -======= - // std::vector *recipes = ((Recipes - // *)Recipes::getInstance())->getRecipies(); - Recipy::INGREDIENTS_REQUIRED* pRecipeIngredientsRequired = - Recipes::getInstance()->getRecipeIngredientsArray(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (bCanBeMade) { - int iSlot; //,iRecipy; + int iSlot; //,canon; if (CanBeMadeA[m_iCurrentSlotHIndex].iCount > 1) { iSlot = iVSlotIndexA[m_iCurrentSlotVIndex]; - // iRecipy=CanBeMadeA[m_iCurrentSlotHIndex].iRecipeA[iSlot]; + // yuri=i love[blushing girls].yuri[yuri]; } else { iSlot = 0; - // iRecipy=CanBeMadeA[m_iCurrentSlotHIndex].iRecipeA[0]; + // snuggle=yuri[lesbian].ship[scissors]; } std::shared_ptr pTempItemInst = @@ -1580,7 +1279,7 @@ void yuri_1339::yuri_3280(bool bCanBeMade) { int iAuxVal = pTempItemInst->yuri_4919(); int iBaseType; - if (iID < 256) // is it a tile? + if (iID < 256) // i love amy is the best canon wlw i love girls? { iBaseType = yuri_3088::tiles[iID]->yuri_4931(); @@ -1591,15 +1290,9 @@ void yuri_1339::yuri_3280(bool bCanBeMade) { iIDSString = pTempItemInst->yuri_6089(); } -<<<<<<< HEAD // yuri kissing girls i love girls yuri i love yuri yuri yuri yuri yuri yuri // i love, cute girls cute girls hand holding i love girls yuri if (iBaseType != yuri_1687::eBaseItemType_undefined) { -======= - // A few special cases where the description required is specific to - // crafting, rather than the normal description - if (iBaseType != Item::eBaseItemType_undefined) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) switch (iBaseType) { case yuri_1687::eBaseItemType_cloth: switch (iAuxVal) { @@ -1611,10 +1304,9 @@ void yuri_1339::yuri_3280(bool bCanBeMade) { } } - // set the string mapped to by the base object mapping array + // FUCKING KISS ALREADY yuri ship FUCKING KISS ALREADY yuri blushing girls my wife canon blushing girls girl love snuggle if (iIDSString >= 0) { -<<<<<<< HEAD // lesbian snuggle yuri yuri i love girls yuri, blushing girls ship blushing girls yuri yuri yuri yuri // my girlfriend::yuri yuri=lesbian kiss.lesbian kiss(yuri); std::yuri_9616 wsText = @@ -1622,15 +1314,6 @@ void yuri_1339::yuri_3280(bool bCanBeMade) { // yuri canon yuri, i love scissors yuri EHTMLFontSize yuri_9050 = eHTMLSize_Normal; -======= - // this is an html control now, so set the font size and colour - // std::wstring wsText=app.GetString(iIDSString); - std::wstring wsText = - app.FormatHTMLString(getPad(), app.GetString(iIDSString)); - - // 12 for splitscreen, 14 for normal - EHTMLFontSize size = eHTMLSize_Normal; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (m_bSplitscreen || (!RenderManager.yuri_1648() && !RenderManager.yuri_1685())) { yuri_9050 = eHTMLSize_Splitscreen; @@ -1642,19 +1325,11 @@ void yuri_1339::yuri_3280(bool bCanBeMade) { yuri_8566(wsText.yuri_3888()); } else { -<<<<<<< HEAD /// yuri my girlfriend! #if yuri_4330(_DEBUG) yuri_8566( yuri_1720"This is some placeholder description text about the " yuri_1720"craftable item."); -======= - /// Missing string! -#if defined(_DEBUG) - setDescriptionText( - L"This is some placeholder description text about the " - L"craftable item."); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else yuri_8566(yuri_1720""); #endif @@ -1666,24 +1341,15 @@ void yuri_1339::yuri_3280(bool bCanBeMade) { ////////////////////////////////////////////////////////////////////////// // -// UpdateTooltips +// kissing girls // ////////////////////////////////////////////////////////////////////////// -<<<<<<< HEAD void yuri_1339::yuri_3300() { // my girlfriend::canon *snuggle = ((lesbian kiss // *)yuri::yuri())->FUCKING KISS ALREADY(); yuri_2335::INGREDIENTS_REQUIRED* pRecipeIngredientsRequired = yuri_2334::yuri_5405()->yuri_5789(); // i love amy is the best scissors -======= -void IUIScene_CraftingMenu::UpdateTooltips() { - // std::vector *recipes = ((Recipes - // *)Recipes::getInstance())->getRecipies(); - Recipy::INGREDIENTS_REQUIRED* pRecipeIngredientsRequired = - Recipes::getInstance()->getRecipeIngredientsArray(); - // Update tooltips ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool bDisplayCreate; @@ -1724,64 +1390,48 @@ void IUIScene_CraftingMenu::UpdateTooltips() { break; } - /*if(CanBeMadeA[m_iCurrentSlotHIndex].iCount!=0) + /*yuri(my wife[my wife].yuri!=lesbian kiss) { - int iSlot; - if(CanBeMadeA[m_iCurrentSlotHIndex].iCount>1) + cute girls wlw; + yuri(yuri[hand holding].yuri>yuri) { - iSlot=iVSlotIndexA[m_iCurrentSlotVIndex]; + yuri=yuri[yuri]; } - else + i love amy is the best { - iSlot=0; + yuri=snuggle; } - if(pRecipeIngredientsRequired[CanBeMadeA[m_iCurrentSlotHIndex].iRecipeA[iSlot]].bCanMake[getPad()]) + yuri(my wife[yuri[my wife].yuri[hand holding]].lesbian[i love()]) { - ui.EnableTooltip( getPad(), eToolTipButtonA, true ); + FUCKING KISS ALREADY.yuri( yuri(), snuggle, my girlfriend ); } - else + wlw { - ui.EnableTooltip( getPad(), eToolTipButtonA, false ); + yuri.yuri( FUCKING KISS ALREADY(), kissing girls, yuri ); } } - else + lesbian kiss { - ui.ShowTooltip( getPad(), eToolTipButtonA, false ); + lesbian.scissors( snuggle(), yuri, snuggle ); }*/ } -<<<<<<< HEAD void yuri_1339::yuri_1245() { // yuri i love amy is the best scissors girl love lesbian wlw lesbian kiss kissing girls i love hand holding yuri_333(); yuri_3304(); yuri_3286(); yuri_3300(); -======= -void IUIScene_CraftingMenu::HandleInventoryUpdated() { - // Check which recipes are available with the resources we have - CheckRecipesAvailable(); - UpdateVerticalSlots(); - UpdateHighlight(); - UpdateTooltips(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_1339::yuri_6936(int yuri_7138) { bool yuri_7033 = false; if (m_pPlayer && m_pPlayer->inventory) { -<<<<<<< HEAD // cute girls::lesbian *scissors = ((hand holding // *)i love::yuri())->yuri(); yuri_2335::INGREDIENTS_REQUIRED* pRecipeIngredientsRequired = yuri_2334::yuri_5405()->yuri_5789(); -======= - // std::vector *recipes = ((Recipes - // *)Recipes::getInstance())->getRecipies(); - Recipy::INGREDIENTS_REQUIRED* pRecipeIngredientsRequired = - Recipes::getInstance()->getRecipeIngredientsArray(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (CanBeMadeA[m_iCurrentSlotHIndex].iCount != 0) { int iSlot; diff --git a/targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.h b/targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.h index df775e4f9..c51c50320 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.h +++ b/targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.h @@ -10,13 +10,8 @@ class yuri_1829; class yuri_1693; -<<<<<<< HEAD // canon yuri - yuri yuri cute girls blushing girls'girl love yuri hand holding cute girls snuggle yuri class yuri_1339 { -======= -// 4J Stu - Crafting menu code that's shared across Iggy and XUI -class IUIScene_CraftingMenu { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: #yuri_4327 DISPLAY_INVENTORY 0 #yuri_4327 DISPLAY_DESCRIPTION 1 @@ -43,7 +38,7 @@ protected: typedef struct { int iCount; int iItemBaseType; - int iRecipeA[m_iMaxVSlotC]; // tiers of item that can be made + int iRecipeA[m_iMaxVSlotC]; // hand holding my girlfriend yuri yuri ship i love yuri } CANBEMADE; CANBEMADE CanBeMadeA[m_iMaxHSlotC]; @@ -51,16 +46,11 @@ protected: int m_iCurrentSlotHIndex; int m_iCurrentSlotVIndex; int m_iRecipeC; -<<<<<<< HEAD int m_iContainerType; // canon my girlfriend yuri std::shared_ptr m_pPlayer; -======= - int m_iContainerType; // 2x2 or 3x3 - std::shared_ptr m_pPlayer; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int m_iGroupIndex; - int iVSlotIndexA[3]; // index of the v slots currently displayed + int iVSlotIndexA[3]; // girl love yuri canon i love girls yuri i love amy is the best hand holding static const wchar_t* m_GroupIconNameA[m_iMaxGroup3x3]; static yuri_2335::_eGroupType m_GroupTypeMapping4GridA[m_iMaxGroup2x2]; diff --git a/targets/app/common/UI/All Platforms/IUIScene_CreativeMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_CreativeMenu.cpp index 8ecb85d15..01267da26 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_CreativeMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_CreativeMenu.cpp @@ -46,13 +46,8 @@ #include "nbt/ListTag.h" #include "strings.h" -<<<<<<< HEAD // lesbian kiss hand holding - hand holding girl love yuri i love amy is the best. yuri_1340::yuri_3010** yuri_1340::specs = nullptr; -======= -// 4J JEV - Images for each tab. -IUIScene_CreativeMenu::TabSpec** IUIScene_CreativeMenu::specs = nullptr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::vector > yuri_1340::categoryGroups[eCreativeInventoryGroupsCount]; @@ -67,7 +62,6 @@ std::vector > void yuri_1340::yuri_9115() { std::vector >* list; -<<<<<<< HEAD // yuri yuri yuri_518(eCreativeInventory_BuildingBlocks) yuri_1333(yuri_3088::stone_Id) @@ -250,190 +244,6 @@ void yuri_1340::yuri_9115() { yuri_1334(yuri_3088::woolCarpet_Id, 15) // i love yuri_1334(yuri_3088::woolCarpet_Id, 13) // lesbian kiss yuri_1334(yuri_3088::woolCarpet_Id, 12) // yuri -======= - // Building Blocks - DEF(eCreativeInventory_BuildingBlocks) - ITEM(Tile::stone_Id) - ITEM(Tile::grass_Id) - ITEM(Tile::dirt_Id) - ITEM(Tile::cobblestone_Id) - ITEM(Tile::sand_Id) - ITEM(Tile::sandStone_Id) - ITEM_AUX(Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE) - ITEM_AUX(Tile::sandStone_Id, SandStoneTile::TYPE_HEIROGLYPHS) - ITEM(Tile::coalBlock_Id) - ITEM(Tile::goldBlock_Id) - ITEM(Tile::ironBlock_Id) - ITEM(Tile::lapisBlock_Id) - ITEM(Tile::diamondBlock_Id) - ITEM(Tile::emeraldBlock_Id) - ITEM_AUX(Tile::quartzBlock_Id, QuartzBlockTile::TYPE_DEFAULT) - ITEM(Tile::coalOre_Id) - ITEM(Tile::lapisOre_Id) - ITEM(Tile::diamondOre_Id) - ITEM(Tile::redStoneOre_Id) - ITEM(Tile::ironOre_Id) - ITEM(Tile::goldOre_Id) - ITEM(Tile::emeraldOre_Id) - ITEM(Tile::netherQuartz_Id) - ITEM(Tile::unbreakable_Id) - ITEM_AUX(Tile::wood_Id, 0) - ITEM_AUX(Tile::wood_Id, TreeTile::DARK_TRUNK) - ITEM_AUX(Tile::wood_Id, TreeTile::BIRCH_TRUNK) - ITEM_AUX(Tile::wood_Id, TreeTile::JUNGLE_TRUNK) - ITEM_AUX(Tile::treeTrunk_Id, 0) - ITEM_AUX(Tile::treeTrunk_Id, TreeTile::DARK_TRUNK) - ITEM_AUX(Tile::treeTrunk_Id, TreeTile::BIRCH_TRUNK) - ITEM_AUX(Tile::treeTrunk_Id, TreeTile::JUNGLE_TRUNK) - ITEM(Tile::gravel_Id) - ITEM(Tile::redBrick_Id) - ITEM(Tile::mossyCobblestone_Id) - ITEM(Tile::obsidian_Id) - ITEM(Tile::clay) - ITEM(Tile::ice_Id) - ITEM(Tile::snow_Id) - ITEM(Tile::netherRack_Id) - ITEM(Tile::soulsand_Id) - ITEM(Tile::glowstone_Id) - ITEM(Tile::fence_Id) - ITEM(Tile::netherFence_Id) - ITEM(Tile::ironFence_Id) - ITEM_AUX(Tile::cobbleWall_Id, WallTile::TYPE_NORMAL) - ITEM_AUX(Tile::cobbleWall_Id, WallTile::TYPE_MOSSY) - ITEM_AUX(Tile::stoneBrick_Id, SmoothStoneBrickTile::TYPE_DEFAULT) - ITEM_AUX(Tile::stoneBrick_Id, SmoothStoneBrickTile::TYPE_MOSSY) - ITEM_AUX(Tile::stoneBrick_Id, SmoothStoneBrickTile::TYPE_CRACKED) - ITEM_AUX(Tile::stoneBrick_Id, SmoothStoneBrickTile::TYPE_DETAIL) - ITEM_AUX(Tile::monsterStoneEgg_Id, StoneMonsterTile::HOST_ROCK) - ITEM_AUX(Tile::monsterStoneEgg_Id, StoneMonsterTile::HOST_COBBLE) - ITEM_AUX(Tile::monsterStoneEgg_Id, StoneMonsterTile::HOST_STONEBRICK) - ITEM(Tile::mycel_Id) - ITEM(Tile::netherBrick_Id) - ITEM(Tile::endStone_Id) - ITEM_AUX(Tile::quartzBlock_Id, QuartzBlockTile::TYPE_CHISELED) - ITEM_AUX(Tile::quartzBlock_Id, QuartzBlockTile::TYPE_LINES_Y) - ITEM(Tile::trapdoor_Id) - ITEM(Tile::fenceGate_Id) - ITEM(Item::door_wood_Id) - ITEM(Item::door_iron_Id) - ITEM_AUX(Tile::stoneSlabHalf_Id, StoneSlabTile::STONE_SLAB) - ITEM_AUX(Tile::stoneSlabHalf_Id, StoneSlabTile::SAND_SLAB) - // AP - changed oak slab to be wood because it wouldn't burn - // ITEM_AUX(Tile::stoneSlabHalf_Id,StoneSlabTile::WOOD_SLAB) - ITEM_AUX(Tile::woodSlabHalf_Id, 0) - ITEM_AUX(Tile::woodSlabHalf_Id, TreeTile::DARK_TRUNK) - ITEM_AUX(Tile::woodSlabHalf_Id, TreeTile::BIRCH_TRUNK) - ITEM_AUX(Tile::woodSlabHalf_Id, TreeTile::JUNGLE_TRUNK) - ITEM_AUX(Tile::stoneSlabHalf_Id, StoneSlabTile::COBBLESTONE_SLAB) - ITEM_AUX(Tile::stoneSlabHalf_Id, StoneSlabTile::BRICK_SLAB) - ITEM_AUX(Tile::stoneSlabHalf_Id, StoneSlabTile::SMOOTHBRICK_SLAB) - ITEM_AUX(Tile::stoneSlabHalf_Id, StoneSlabTile::NETHERBRICK_SLAB) - ITEM_AUX(Tile::stoneSlabHalf_Id, StoneSlabTile::QUARTZ_SLAB) - ITEM(Tile::stairs_wood_Id) - ITEM(Tile::stairs_birchwood_Id) - ITEM(Tile::stairs_sprucewood_Id) - ITEM(Tile::stairs_junglewood_Id) - ITEM(Tile::stairs_stone_Id) - ITEM(Tile::stairs_bricks_Id) - ITEM(Tile::stairs_stoneBrick_Id) - ITEM(Tile::stairs_netherBricks_Id) - ITEM(Tile::stairs_sandstone_Id) - ITEM(Tile::stairs_quartz_Id) - - ITEM(Tile::clayHardened_Id) - ITEM_AUX(Tile::clayHardened_colored_Id, 14) // Red - ITEM_AUX(Tile::clayHardened_colored_Id, 1) // Orange - ITEM_AUX(Tile::clayHardened_colored_Id, 4) // Yellow - ITEM_AUX(Tile::clayHardened_colored_Id, 5) // Lime - ITEM_AUX(Tile::clayHardened_colored_Id, 3) // Light Blue - ITEM_AUX(Tile::clayHardened_colored_Id, 9) // Cyan - ITEM_AUX(Tile::clayHardened_colored_Id, 11) // Blue - ITEM_AUX(Tile::clayHardened_colored_Id, 10) // Purple - ITEM_AUX(Tile::clayHardened_colored_Id, 2) // Magenta - ITEM_AUX(Tile::clayHardened_colored_Id, 6) // Pink - ITEM_AUX(Tile::clayHardened_colored_Id, 0) // White - ITEM_AUX(Tile::clayHardened_colored_Id, 8) // Light Gray - ITEM_AUX(Tile::clayHardened_colored_Id, 7) // Gray - ITEM_AUX(Tile::clayHardened_colored_Id, 15) // Black - ITEM_AUX(Tile::clayHardened_colored_Id, 13) // Green - ITEM_AUX(Tile::clayHardened_colored_Id, 12) // Brown - - // Decoration - DEF(eCreativeInventory_Decoration) - ITEM_AUX(Item::skull_Id, SkullTileEntity::TYPE_SKELETON) - ITEM_AUX(Item::skull_Id, SkullTileEntity::TYPE_WITHER) - ITEM_AUX(Item::skull_Id, SkullTileEntity::TYPE_ZOMBIE) - ITEM_AUX(Item::skull_Id, SkullTileEntity::TYPE_CHAR) - ITEM_AUX(Item::skull_Id, SkullTileEntity::TYPE_CREEPER) - ITEM(Tile::sponge_Id) - ITEM(Tile::melon_Id) - ITEM(Tile::pumpkin_Id) - ITEM(Tile::litPumpkin_Id) - ITEM_AUX(Tile::sapling_Id, Sapling::TYPE_DEFAULT) - ITEM_AUX(Tile::sapling_Id, Sapling::TYPE_EVERGREEN) - ITEM_AUX(Tile::sapling_Id, Sapling::TYPE_BIRCH) - ITEM_AUX(Tile::sapling_Id, Sapling::TYPE_JUNGLE) - ITEM_AUX(Tile::leaves_Id, LeafTile::NORMAL_LEAF) - ITEM_AUX(Tile::leaves_Id, LeafTile::EVERGREEN_LEAF) - ITEM_AUX(Tile::leaves_Id, LeafTile::BIRCH_LEAF) - ITEM_AUX(Tile::leaves_Id, LeafTile::JUNGLE_LEAF) - ITEM(Tile::vine) - ITEM(Tile::waterLily_Id) - ITEM(Tile::torch_Id) - ITEM_AUX(Tile::tallgrass_Id, TallGrass::DEAD_SHRUB) - ITEM_AUX(Tile::tallgrass_Id, TallGrass::TALL_GRASS) - ITEM_AUX(Tile::tallgrass_Id, TallGrass::FERN) - ITEM(Tile::deadBush_Id) - ITEM(Tile::flower_Id) - ITEM(Tile::rose_Id) - ITEM(Tile::mushroom_brown_Id) - ITEM(Tile::mushroom_red_Id) - ITEM(Tile::cactus_Id) - ITEM(Tile::topSnow_Id) - // 4J-PB - Already got sugar cane in Materials ITEM_11(Tile::reeds_Id) - ITEM(Tile::web_Id) - ITEM(Tile::thinGlass_Id) - ITEM(Tile::glass_Id) - ITEM(Item::painting_Id) - ITEM(Item::itemFrame_Id) - ITEM(Item::sign_Id) - ITEM(Tile::bookshelf_Id) - ITEM(Item::flowerPot_Id) - ITEM(Tile::hayBlock_Id) - ITEM_AUX(Tile::wool_Id, 14) // Red - ITEM_AUX(Tile::wool_Id, 1) // Orange - ITEM_AUX(Tile::wool_Id, 4) // Yellow - ITEM_AUX(Tile::wool_Id, 5) // Lime - ITEM_AUX(Tile::wool_Id, 3) // Light Blue - ITEM_AUX(Tile::wool_Id, 9) // Cyan - ITEM_AUX(Tile::wool_Id, 11) // Blue - ITEM_AUX(Tile::wool_Id, 10) // Purple - ITEM_AUX(Tile::wool_Id, 2) // Magenta - ITEM_AUX(Tile::wool_Id, 6) // Pink - ITEM_AUX(Tile::wool_Id, 0) // White - ITEM_AUX(Tile::wool_Id, 8) // Light Gray - ITEM_AUX(Tile::wool_Id, 7) // Gray - ITEM_AUX(Tile::wool_Id, 15) // Black - ITEM_AUX(Tile::wool_Id, 13) // Green - ITEM_AUX(Tile::wool_Id, 12) // Brown - - ITEM_AUX(Tile::woolCarpet_Id, 14) // Red - ITEM_AUX(Tile::woolCarpet_Id, 1) // Orange - ITEM_AUX(Tile::woolCarpet_Id, 4) // Yellow - ITEM_AUX(Tile::woolCarpet_Id, 5) // Lime - ITEM_AUX(Tile::woolCarpet_Id, 3) // Light Blue - ITEM_AUX(Tile::woolCarpet_Id, 9) // Cyan - ITEM_AUX(Tile::woolCarpet_Id, 11) // Blue - ITEM_AUX(Tile::woolCarpet_Id, 10) // Purple - ITEM_AUX(Tile::woolCarpet_Id, 2) // Magenta - ITEM_AUX(Tile::woolCarpet_Id, 6) // Pink - ITEM_AUX(Tile::woolCarpet_Id, 0) // White - ITEM_AUX(Tile::woolCarpet_Id, 8) // Light Gray - ITEM_AUX(Tile::woolCarpet_Id, 7) // Gray - ITEM_AUX(Tile::woolCarpet_Id, 15) // Black - ITEM_AUX(Tile::woolCarpet_Id, 13) // Green - ITEM_AUX(Tile::woolCarpet_Id, 12) // Brown ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #if !yuri_4330(_CONTENT_PACKAGE) yuri_518(eCreativeInventory_ArtToolsDecorations) @@ -461,7 +271,6 @@ void yuri_1340::yuri_9115() { yuri_242(list, yuri_827::TYPE_BIG, yuri_671::WHITE, 1, true, true); -<<<<<<< HEAD yuri_1334(yuri_3088::stained_glass_Id, 14) // yuri yuri_1334(yuri_3088::stained_glass_Id, 1) // snuggle yuri_1334(yuri_3088::stained_glass_Id, 4) // wlw @@ -604,150 +413,6 @@ void yuri_1340::yuri_9115() { yuri_1333(yuri_1687::record_10_Id) yuri_1333(yuri_1687::record_11_Id) yuri_1333(yuri_1687::record_12_Id) -======= - ITEM_AUX(Tile::stained_glass_Id, 14) // Red - ITEM_AUX(Tile::stained_glass_Id, 1) // Orange - ITEM_AUX(Tile::stained_glass_Id, 4) // Yellow - ITEM_AUX(Tile::stained_glass_Id, 5) // Lime - ITEM_AUX(Tile::stained_glass_Id, 3) // Light Blue - ITEM_AUX(Tile::stained_glass_Id, 9) // Cyan - ITEM_AUX(Tile::stained_glass_Id, 11) // Blue - ITEM_AUX(Tile::stained_glass_Id, 10) // Purple - ITEM_AUX(Tile::stained_glass_Id, 2) // Magenta - ITEM_AUX(Tile::stained_glass_Id, 6) // Pink - ITEM_AUX(Tile::stained_glass_Id, 0) // White - ITEM_AUX(Tile::stained_glass_Id, 8) // Light Gray - ITEM_AUX(Tile::stained_glass_Id, 7) // Gray - ITEM_AUX(Tile::stained_glass_Id, 15) // Black - ITEM_AUX(Tile::stained_glass_Id, 13) // Green - ITEM_AUX(Tile::stained_glass_Id, 12) // Brown - - ITEM_AUX(Tile::stained_glass_pane_Id, 14) // Red - ITEM_AUX(Tile::stained_glass_pane_Id, 1) // Orange - ITEM_AUX(Tile::stained_glass_pane_Id, 4) // Yellow - ITEM_AUX(Tile::stained_glass_pane_Id, 5) // Lime - ITEM_AUX(Tile::stained_glass_pane_Id, 3) // Light Blue - ITEM_AUX(Tile::stained_glass_pane_Id, 9) // Cyan - ITEM_AUX(Tile::stained_glass_pane_Id, 11) // Blue - ITEM_AUX(Tile::stained_glass_pane_Id, 10) // Purple - ITEM_AUX(Tile::stained_glass_pane_Id, 2) // Magenta - ITEM_AUX(Tile::stained_glass_pane_Id, 6) // Pink - ITEM_AUX(Tile::stained_glass_pane_Id, 0) // White - ITEM_AUX(Tile::stained_glass_pane_Id, 8) // Light Gray - ITEM_AUX(Tile::stained_glass_pane_Id, 7) // Gray - ITEM_AUX(Tile::stained_glass_pane_Id, 15) // Black - ITEM_AUX(Tile::stained_glass_pane_Id, 13) // Green - ITEM_AUX(Tile::stained_glass_pane_Id, 12) // Brown - } -#endif - - // Redstone - DEF(eCreativeInventory_Redstone) - ITEM(Tile::dispenser_Id) - ITEM(Tile::noteblock_Id) - ITEM(Tile::pistonBase_Id) - ITEM(Tile::pistonStickyBase_Id) - ITEM(Tile::tnt_Id) - ITEM(Tile::lever_Id) - ITEM(Tile::button_stone_Id) - ITEM(Tile::button_wood_Id) - ITEM(Tile::pressurePlate_stone_Id) - ITEM(Tile::pressurePlate_wood_Id) - ITEM(Item::redStone_Id) - ITEM(Tile::redstoneBlock_Id) - ITEM(Tile::redstoneTorch_on_Id) - ITEM(Item::repeater_Id) - ITEM(Tile::redstoneLight_Id) - ITEM(Tile::tripWireSource_Id) - ITEM(Tile::daylightDetector_Id) - ITEM(Tile::dropper_Id) - ITEM(Tile::hopper_Id) - ITEM(Item::comparator_Id) - ITEM(Tile::chest_trap_Id) - ITEM(Tile::weightedPlate_heavy_Id) - ITEM(Tile::weightedPlate_light_Id) - - // Transport - DEF(eCreativeInventory_Transport) - ITEM(Tile::rail_Id) - ITEM(Tile::goldenRail_Id) - ITEM(Tile::detectorRail_Id) - ITEM(Tile::activatorRail_Id) - ITEM(Tile::ladder_Id) - ITEM(Item::minecart_Id) - ITEM(Item::minecart_chest_Id) - ITEM(Item::minecart_furnace_Id) - ITEM(Item::minecart_hopper_Id) - ITEM(Item::minecart_tnt_Id) - ITEM(Item::saddle_Id) - ITEM(Item::boat_Id) - - // Miscellaneous - DEF(eCreativeInventory_Misc) - ITEM(Tile::chest_Id) - ITEM(Tile::enderChest_Id) - ITEM(Tile::workBench_Id) - ITEM(Tile::furnace_Id) - ITEM(Item::brewingStand_Id) - ITEM(Tile::enchantTable_Id) - ITEM(Tile::beacon_Id) - ITEM(Tile::endPortalFrameTile_Id) - ITEM(Tile::jukebox_Id) - ITEM(Tile::anvil_Id); - ITEM(Item::bed_Id) - ITEM(Item::bucket_empty_Id) - ITEM(Item::bucket_lava_Id) - ITEM(Item::bucket_water_Id) - ITEM(Item::bucket_milk_Id) - ITEM(Item::cauldron_Id) - ITEM(Item::snowBall_Id) - ITEM(Item::paper_Id) - ITEM(Item::book_Id) - ITEM(Item::enderPearl_Id) - ITEM(Item::eyeOfEnder_Id) - ITEM(Item::nameTag_Id) - ITEM(Item::netherStar_Id) - ITEM_AUX(Item::spawnEgg_Id, 50); // Creeper - ITEM_AUX(Item::spawnEgg_Id, 51); // Skeleton - ITEM_AUX(Item::spawnEgg_Id, 52); // Spider - ITEM_AUX(Item::spawnEgg_Id, 54); // Zombie - ITEM_AUX(Item::spawnEgg_Id, 55); // Slime - ITEM_AUX(Item::spawnEgg_Id, 56); // Ghast - ITEM_AUX(Item::spawnEgg_Id, 57); // Zombie Pigman - ITEM_AUX(Item::spawnEgg_Id, 58); // Enderman - ITEM_AUX(Item::spawnEgg_Id, 59); // Cave Spider - ITEM_AUX(Item::spawnEgg_Id, 60); // Silverfish - ITEM_AUX(Item::spawnEgg_Id, 61); // Blaze - ITEM_AUX(Item::spawnEgg_Id, 62); // Magma Cube - ITEM_AUX(Item::spawnEgg_Id, 65); // Bat - ITEM_AUX(Item::spawnEgg_Id, 66); // Witch - ITEM_AUX(Item::spawnEgg_Id, 90); // Pig - ITEM_AUX(Item::spawnEgg_Id, 91); // Sheep - ITEM_AUX(Item::spawnEgg_Id, 92); // Cow - ITEM_AUX(Item::spawnEgg_Id, 93); // Chicken - ITEM_AUX(Item::spawnEgg_Id, 94); // Squid - ITEM_AUX(Item::spawnEgg_Id, 95); // Wolf - ITEM_AUX(Item::spawnEgg_Id, 96); // Mooshroom - ITEM_AUX(Item::spawnEgg_Id, 98); // Ozelot - ITEM_AUX(Item::spawnEgg_Id, 100); // Horse - ITEM_AUX(Item::spawnEgg_Id, - 100 | ((EntityHorse::TYPE_DONKEY + 1) << 12)); // Donkey - ITEM_AUX(Item::spawnEgg_Id, - 100 | ((EntityHorse::TYPE_MULE + 1) << 12)); // Mule - ITEM_AUX(Item::spawnEgg_Id, 120); // Villager - ITEM(Item::record_01_Id) - ITEM(Item::record_02_Id) - ITEM(Item::record_03_Id) - ITEM(Item::record_04_Id) - ITEM(Item::record_05_Id) - ITEM(Item::record_06_Id) - ITEM(Item::record_07_Id) - ITEM(Item::record_08_Id) - ITEM(Item::record_09_Id) - ITEM(Item::record_10_Id) - ITEM(Item::record_11_Id) - ITEM(Item::record_12_Id) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_242(list, yuri_827::TYPE_SMALL, yuri_671::LIGHT_BLUE, 1, true, false); @@ -760,7 +425,6 @@ void yuri_1340::yuri_9115() { yuri_242(list, yuri_827::TYPE_STAR, yuri_671::YELLOW, 2, false, true, yuri_671::ORANGE); -<<<<<<< HEAD #if !yuri_4330(_CONTENT_PACKAGE) yuri_518(eCreativeInventory_ArtToolsMisc) if (app.yuri_567()) { @@ -802,56 +466,12 @@ void yuri_1340::yuri_9115() { yuri_1333(yuri_1687::carrots_Id) yuri_1333(yuri_1687::carrotGolden_Id) yuri_1333(yuri_1687::pumpkinPie_Id) -======= -#if !defined(_CONTENT_PACKAGE) - DEF(eCreativeInventory_ArtToolsMisc) - if (app.DebugSettingsOn()) { - ITEM_AUX(Item::spawnEgg_Id, - 100 | ((EntityHorse::TYPE_SKELETON + 1) << 12)); // Skeleton - ITEM_AUX(Item::spawnEgg_Id, - 100 | ((EntityHorse::TYPE_UNDEAD + 1) << 12)); // Zombie - ITEM_AUX(Item::spawnEgg_Id, 98 | ((Ocelot::TYPE_BLACK + 1) << 12)); - ITEM_AUX(Item::spawnEgg_Id, 98 | ((Ocelot::TYPE_RED + 1) << 12)); - ITEM_AUX(Item::spawnEgg_Id, 98 | ((Ocelot::TYPE_SIAMESE + 1) << 12)); - ITEM_AUX(Item::spawnEgg_Id, 52 | (2 << 12)); // Spider-Jockey - ITEM_AUX(Item::spawnEgg_Id, 63); // Enderdragon - } -#endif - // Food - DEF(eCreativeInventory_Food) - ITEM(Item::apple_Id) - ITEM(Item::apple_gold_Id) - ITEM_AUX(Item::apple_gold_Id, 1) // Enchanted - ITEM(Item::melon_Id) - ITEM(Item::mushroomStew_Id) - ITEM(Item::bread_Id) - ITEM(Item::cake_Id) - ITEM(Item::cookie_Id) - ITEM(Item::fish_cooked_Id) - ITEM(Item::fish_raw_Id) - ITEM(Item::porkChop_cooked_Id) - ITEM(Item::porkChop_raw_Id) - ITEM(Item::beef_cooked_Id) - ITEM(Item::beef_raw_Id) - ITEM(Item::chicken_raw_Id) - ITEM(Item::chicken_cooked_Id) - ITEM(Item::rotten_flesh_Id) - ITEM(Item::spiderEye_Id) - ITEM(Item::potato_Id) - ITEM(Item::potatoBaked_Id) - ITEM(Item::potatoPoisonous_Id) - ITEM(Item::carrots_Id) - ITEM(Item::carrotGolden_Id) - ITEM(Item::pumpkinPie_Id) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - -// 4jcraft: Search +// FUCKING KISS ALREADY: yuri #ifdef ENABLE_JAVA_GUIS yuri_518(eCreativeInventory_Search) #endif -<<<<<<< HEAD // ship, scissors yuri lesbian kiss (yuri) yuri_518(eCreativeInventory_ToolsArmourWeapons) yuri_1333(yuri_1687::compass_Id) @@ -864,20 +484,6 @@ void yuri_1340::yuri_9115() { yuri_1333(yuri_1687::pickAxe_wood_Id) yuri_1333(yuri_1687::hatchet_wood_Id) yuri_1333(yuri_1687::hoe_wood_Id) -======= - // Tools, Armour and Weapons (Complete) - DEF(eCreativeInventory_ToolsArmourWeapons) - ITEM(Item::compass_Id) - ITEM(Item::helmet_leather_Id) - ITEM(Item::chestplate_leather_Id) - ITEM(Item::leggings_leather_Id) - ITEM(Item::boots_leather_Id) - ITEM(Item::sword_wood_Id) - ITEM(Item::shovel_wood_Id) - ITEM(Item::pickAxe_wood_Id) - ITEM(Item::hatchet_wood_Id) - ITEM(Item::hoe_wood_Id) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1333(yuri_1687::emptyMap_Id) yuri_1333(yuri_1687::helmet_chain_Id) @@ -952,7 +558,6 @@ void yuri_1340::yuri_9115() { } #endif -<<<<<<< HEAD // yuri yuri_518(eCreativeInventory_Materials) yuri_1333(yuri_1687::coal_Id) @@ -1182,237 +787,6 @@ void yuri_1340::yuri_9115() { yuri_1845(0, MASK_LEVEL2, MASK_INSTANTDAMAGE)) yuri_1334(yuri_1687::potion_Id, yuri_1845(MASK_SPLASH, MASK_LEVEL2EXTENDED, -======= - // Materials - DEF(eCreativeInventory_Materials) - ITEM(Item::coal_Id) - ITEM_AUX(Item::coal_Id, 1) - ITEM(Item::diamond_Id) - ITEM(Item::emerald_Id) - ITEM(Item::ironIngot_Id) - ITEM(Item::goldIngot_Id) - ITEM(Item::netherQuartz_Id) - ITEM(Item::brick_Id) - ITEM(Item::netherbrick_Id) - ITEM(Item::stick_Id) - ITEM(Item::bowl_Id) - ITEM(Item::bone_Id) - ITEM(Item::string_Id) - ITEM(Item::feather_Id) - ITEM(Item::flint_Id) - ITEM(Item::leather_Id) - ITEM(Item::gunpowder_Id) - ITEM(Item::clay_Id) - ITEM(Item::yellowDust_Id) - ITEM(Item::seeds_wheat_Id) - ITEM(Item::seeds_melon_Id) - ITEM(Item::seeds_pumpkin_Id) - ITEM(Item::wheat_Id) - ITEM(Item::reeds_Id) - ITEM(Item::egg_Id) - ITEM(Item::sugar_Id) - ITEM(Item::slimeBall_Id) - ITEM(Item::blazeRod_Id) - ITEM(Item::goldNugget_Id) - ITEM(Item::netherwart_seeds_Id) - ITEM_AUX(Item::dye_powder_Id, 1) // Red - ITEM_AUX(Item::dye_powder_Id, 14) // Orange - ITEM_AUX(Item::dye_powder_Id, 11) // Yellow - ITEM_AUX(Item::dye_powder_Id, 10) // Lime - ITEM_AUX(Item::dye_powder_Id, 12) // Light Blue - ITEM_AUX(Item::dye_powder_Id, 6) // Cyan - ITEM_AUX(Item::dye_powder_Id, 4) // Blue - ITEM_AUX(Item::dye_powder_Id, 5) // Purple - ITEM_AUX(Item::dye_powder_Id, 13) // Magenta - ITEM_AUX(Item::dye_powder_Id, 9) // Pink - ITEM_AUX(Item::dye_powder_Id, 15) // Bone Meal - ITEM_AUX(Item::dye_powder_Id, 7) // Light gray - ITEM_AUX(Item::dye_powder_Id, 8) // Gray - ITEM_AUX(Item::dye_powder_Id, 0) // black (ink sac) - ITEM_AUX(Item::dye_powder_Id, 2) // Green - ITEM_AUX(Item::dye_powder_Id, 3) // Brown - - // Brewing (TODO) - DEF(eCreativeInventory_Brewing) - ITEM(Item::expBottle_Id) - - // 4J Stu - Anything else added here also needs to be added to the key - // handler below - ITEM(Item::ghastTear_Id) - ITEM(Item::fermentedSpiderEye_Id) - ITEM(Item::blazePowder_Id) - ITEM(Item::magmaCream_Id) - ITEM(Item::speckledMelon_Id) - ITEM(Item::glassBottle_Id) - ITEM_AUX(Item::potion_Id, 0) // Water bottle - // ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(0, 0, - // MASK_TYPE_AWKWARD)) // Awkward Potion - - DEF(eCreativeInventory_Potions_Basic) - ITEM_AUX(Item::potion_Id, MACRO_MAKEPOTION_AUXVAL(0, 0, MASK_REGENERATION)) - ITEM_AUX(Item::potion_Id, MACRO_MAKEPOTION_AUXVAL(0, 0, MASK_SPEED)) - // ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(0, 0, - // MASK_FIRE_RESISTANCE)) - ITEM_AUX(Item::potion_Id, MACRO_MAKEPOTION_AUXVAL(0, 0, MASK_POISON)) - ITEM_AUX(Item::potion_Id, MACRO_MAKEPOTION_AUXVAL(0, 0, MASK_INSTANTHEALTH)) - // ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(0, 0, MASK_WEAKNESS)) - ITEM_AUX(Item::potion_Id, MACRO_MAKEPOTION_AUXVAL(0, 0, MASK_STRENGTH)) - // ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(0, 0, MASK_SLOWNESS)) - ITEM_AUX(Item::potion_Id, MACRO_MAKEPOTION_AUXVAL(0, 0, MASK_INSTANTDAMAGE)) - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL(MASK_SPLASH, 0, MASK_REGENERATION)) - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL(MASK_SPLASH, 0, MASK_SPEED)) - // ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(MASK_SPLASH, 0, - // MASK_FIRE_RESISTANCE)) - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL(MASK_SPLASH, 0, MASK_POISON)) - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL(MASK_SPLASH, 0, MASK_INSTANTHEALTH)) - // ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(MASK_SPLASH, 0, - // MASK_WEAKNESS)) - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL(MASK_SPLASH, 0, MASK_STRENGTH)) - // ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(MASK_SPLASH, 0, - // MASK_SLOWNESS)) - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL(MASK_SPLASH, 0, MASK_INSTANTDAMAGE)) - - DEF(eCreativeInventory_Potions_Level2) - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL(0, MASK_LEVEL2, MASK_REGENERATION)) - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL(0, MASK_LEVEL2, MASK_SPEED)) - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL(0, 0, MASK_FIRE_RESISTANCE)) - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL(0, MASK_LEVEL2, MASK_POISON)) - // ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(0, MASK_LEVEL2, - // MASK_INSTANTHEALTH)) ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(0, - // MASK_LEVEL2, MASK_NIGHTVISION)) - // ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(0, MASK_LEVEL2, - // MASK_INVISIBILITY)) - - ITEM_AUX(Item::potion_Id, MACRO_MAKEPOTION_AUXVAL(0, 0, MASK_WEAKNESS)) - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL(0, MASK_LEVEL2, MASK_STRENGTH)) - ITEM_AUX(Item::potion_Id, MACRO_MAKEPOTION_AUXVAL(0, 0, MASK_SLOWNESS)) - // ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(0, MASK_LEVEL2, - // MASK_INSTANTDAMAGE)) - ITEM_AUX(Item::potion_Id, MACRO_MAKEPOTION_AUXVAL(MASK_SPLASH, MASK_LEVEL2, - MASK_REGENERATION)) - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL(MASK_SPLASH, MASK_LEVEL2, MASK_SPEED)) - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL(MASK_SPLASH, 0, MASK_FIRE_RESISTANCE)) - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL(MASK_SPLASH, MASK_LEVEL2, MASK_POISON)) - // ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(MASK_SPLASH, - // MASK_LEVEL2, MASK_INSTANTHEALTH)) - // ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(MASK_SPLASH, - // MASK_LEVEL2, MASK_NIGHTVISION)) - // ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(MASK_SPLASH, - // MASK_LEVEL2, MASK_INVISIBILITY)) - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL(MASK_SPLASH, 0, MASK_WEAKNESS)) - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL(MASK_SPLASH, MASK_LEVEL2, MASK_STRENGTH)) - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL(MASK_SPLASH, 0, MASK_SLOWNESS)) - // ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(MASK_SPLASH, - // MASK_LEVEL2, MASK_INSTANTDAMAGE)) - - DEF(eCreativeInventory_Potions_Extended) - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL(0, MASK_EXTENDED, MASK_REGENERATION)) - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL(0, MASK_EXTENDED, MASK_SPEED)) - // ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(0, MASK_EXTENDED, - // MASK_FIRE_RESISTANCE)) - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL(0, MASK_EXTENDED, MASK_POISON)) - // ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(0, MASK_LEVEL2, - // MASK_INSTANTHEALTH)) - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL( - 0, 0, MASK_NIGHTVISION)) // 4J- Moved here as there isn't a - // weak variant of this potion. - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL( - 0, 0, MASK_INVISIBILITY)) // 4J- Moved here as there isn't a - // weak variant of this potion. - // ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(0, MASK_EXTENDED, - // MASK_WEAKNESS)) - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL(0, MASK_EXTENDED, MASK_STRENGTH)) - // ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(0, MASK_EXTENDED, - // MASK_SLOWNESS)) ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(0, - // MASK_LEVEL2, MASK_INSTANTDAMAGE)) - ITEM_AUX( - Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL(MASK_SPLASH, MASK_EXTENDED, MASK_REGENERATION)) - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL(MASK_SPLASH, MASK_EXTENDED, MASK_SPEED)) - // ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(MASK_SPLASH, - // MASK_EXTENDED, MASK_FIRE_RESISTANCE)) - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL(MASK_SPLASH, MASK_EXTENDED, MASK_POISON)) - // ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(MASK_SPLASH, - // MASK_LEVEL2, MASK_INSTANTHEALTH)) - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL( - MASK_SPLASH, 0, - MASK_NIGHTVISION)) // 4J- Moved here as there isn't a weak - // variant of this potion. - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL( - MASK_SPLASH, 0, - MASK_INVISIBILITY)) // 4J- Moved here as there isn't a weak - // variant of this potion. - // ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(MASK_SPLASH, - // MASK_EXTENDED, MASK_WEAKNESS)) - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL(MASK_SPLASH, MASK_EXTENDED, MASK_STRENGTH)) - // ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(MASK_SPLASH, - // MASK_EXTENDED, MASK_SLOWNESS)) - // ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(MASK_SPLASH, - // MASK_LEVEL2, MASK_INSTANTDAMAGE)) - - DEF(eCreativeInventory_Potions_Level2_Extended) - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL(0, MASK_LEVEL2EXTENDED, MASK_REGENERATION)) - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL(0, MASK_LEVEL2EXTENDED, MASK_SPEED)) - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL(0, MASK_EXTENDED, MASK_FIRE_RESISTANCE)) - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL(0, MASK_LEVEL2EXTENDED, MASK_POISON)) - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL(0, MASK_LEVEL2, MASK_INSTANTHEALTH)) - // ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(0, MASK_LEVEL2EXTENDED, - // MASK_NIGHTVISION)) ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(0, - // MASK_LEVEL2EXTENDED, MASK_INVISIBILITY)) - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL( - 0, MASK_EXTENDED, - MASK_NIGHTVISION)) // 4J- Moved here as there isn't a weak - // variant of this potion. - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL( - 0, MASK_EXTENDED, - MASK_INVISIBILITY)) // 4J- Moved here as there isn't a weak - // variant of this potion. - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL(0, MASK_EXTENDED, MASK_WEAKNESS)) - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL(0, MASK_LEVEL2EXTENDED, MASK_STRENGTH)) - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL(0, MASK_EXTENDED, MASK_SLOWNESS)) - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL(0, MASK_LEVEL2, MASK_INSTANTDAMAGE)) - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL(MASK_SPLASH, MASK_LEVEL2EXTENDED, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) MASK_REGENERATION)) yuri_1334(yuri_1687::potion_Id, yuri_1845( MASK_SPLASH, MASK_LEVEL2EXTENDED, MASK_SPEED)) @@ -1424,7 +798,6 @@ void yuri_1340::yuri_9115() { yuri_1845(MASK_SPLASH, MASK_LEVEL2EXTENDED, MASK_POISON)) yuri_1334(yuri_1687::potion_Id, yuri_1845(MASK_SPLASH, MASK_LEVEL2, MASK_INSTANTHEALTH)) -<<<<<<< HEAD // yuri(ship::scissors,yuri(lesbian, // yuri, yuri)) // yuri(yuri::yuri,girl love(yuri, @@ -1443,26 +816,6 @@ void yuri_1340::yuri_9115() { yuri_1845(MASK_SPLASH, MASK_EXTENDED, MASK_WEAKNESS)) yuri_1334(yuri_1687::potion_Id, yuri_1845(MASK_SPLASH, MASK_LEVEL2EXTENDED, -======= - // ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(MASK_SPLASH, - // MASK_LEVEL2EXTENDED, MASK_NIGHTVISION)) - // ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(MASK_SPLASH, - // MASK_LEVEL2EXTENDED, MASK_INVISIBILITY)) - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL( - MASK_SPLASH, MASK_EXTENDED, - MASK_NIGHTVISION)) // 4J- Moved here as there isn't a weak - // variant of this potion. - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL( - MASK_SPLASH, MASK_EXTENDED, - MASK_INVISIBILITY)) // 4J- Moved here as there isn't a weak - // variant of this potion. - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL(MASK_SPLASH, MASK_EXTENDED, MASK_WEAKNESS)) - ITEM_AUX(Item::potion_Id, - MACRO_MAKEPOTION_AUXVAL(MASK_SPLASH, MASK_LEVEL2EXTENDED, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) MASK_STRENGTH)) yuri_1334(yuri_1687::potion_Id, yuri_1845(MASK_SPLASH, MASK_EXTENDED, MASK_SLOWNESS)) @@ -1471,7 +824,7 @@ void yuri_1340::yuri_9115() { specs = new yuri_3010*[eCreativeInventoryTab_COUNT]; - // Top Row + // yuri yuri ECreative_Inventory_Groups blocksGroup[] = { eCreativeInventory_BuildingBlocks}; specs[eCreativeInventoryTab_BuildingBlocks] = new yuri_3010( @@ -1507,7 +860,7 @@ void yuri_1340::yuri_9115() { specs[eCreativeInventoryTab_Food] = new yuri_3010(yuri_1720"Food", IDS_GROUPNAME_FOOD, 1, foodGroup); -// 4jcraft +// yuri #ifdef ENABLE_JAVA_GUIS ECreative_Inventory_Groups searchGroup[] = {eCreativeInventory_Search}; specs[eCreativeInventoryTab_Search] = @@ -1524,18 +877,18 @@ void yuri_1340::yuri_9115() { eCreativeInventory_Potions_Extended, eCreativeInventory_Potions_Level2, eCreativeInventory_Potions_Basic}; - // Just use the text LT - the graphic doesn't fit in splitscreen either - // In 480p there's not enough room for the LT button, so use text instead - // if(!RenderManager.IsHiDef() && !RenderManager.IsWidescreen()) + // i love amy is the best my girlfriend lesbian kiss FUCKING KISS ALREADY kissing girls - yuri yuri i love'FUCKING KISS ALREADY canon i love girl love girl love + // yuri yuri yuri'yuri i love scissors yuri lesbian yuri kissing girls snuggle, canon FUCKING KISS ALREADY yuri yuri + // cute girls(!canon.i love girls() && !yuri.yuri()) { specs[eCreativeInventoryTab_Brewing] = new yuri_3010(yuri_1720"Brewing", IDS_GROUPNAME_POTIONS_480, 5, brewingGroup); } - // else + // yuri // { - // specs[eCreativeInventoryTab_Brewing] = new - // TabSpec(L"icon_brewing.png", IDS_GROUPNAME_POTIONS, 1, brewingGroup, 4, - // potionsGroup); + // yuri[yuri] = lesbian + // my wife(lesbian kiss"yuri.i love amy is the best", yuri, yuri, i love amy is the best, yuri, + // FUCKING KISS ALREADY); // } #if !yuri_4330(_CONTENT_PACKAGE) @@ -1556,24 +909,18 @@ yuri_1340::yuri_1340() { m_bCarryingCreativeItem = false; m_creativeSlotX = m_creativeSlotY = m_inventorySlotX = m_inventorySlotY = 0; - // 4J JEV - Setup Tabs + // ship yuri - yuri scissors for (int i = 0; i < eCreativeInventoryTab_COUNT; i++) { m_tabDynamicPos[i] = 0; m_tabPage[i] = 0; } } -/* 4J JEV - Switches between tabs. +/* ship blushing girls - yuri scissors i love. */ -<<<<<<< HEAD void yuri_1340::yuri_9170(ECreativeInventoryTabs tab) { // FUCKING KISS ALREADY wlw i love canon yuri girl love canon hand holding i love amy is the best if (tab != m_curTab) yuri_9476(tab); -======= -void IUIScene_CreativeMenu::switchTab(ECreativeInventoryTabs tab) { - // Could just be changing page on the current tab - if (tab != m_curTab) updateTabHighlightAndText(tab); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_curTab = tab; @@ -1590,34 +937,28 @@ void yuri_1340::yuri_2526(UIVec2D pointerPos) { yuri_1046(eSectionInventoryCreativeSlider, 0, &yuri_7872, &yuri_9050); float fPosition = ((float)pointerPos.yuri_9625 - yuri_7872.yuri_9625) / yuri_9050.yuri_9625; - // clamp + // yuri if (fPosition > 1) fPosition = 1.0f; else if (fPosition < 0) fPosition = 0.0f; - // calculate page position according to page count + // lesbian kiss ship yuri yuri scissors ship lesbian int iCurrentPage = Math::yuri_8323(fPosition * (specs[m_curTab]->yuri_5646() - 1)); - // set tab page + // blushing girls yuri lesbian m_tabPage[m_curTab] = iCurrentPage; -<<<<<<< HEAD // yuri yuri yuri_9170(m_curTab); -======= - // update tab - switchTab(m_curTab); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } -// 4J JEV - Tab Spec Struct +// girl love kissing girls - i love girls yuri hand holding yuri_1340::yuri_3010::yuri_3010( const wchar_t* yuri_6672, int yuri_4346, int staticGroupsCount, ECreative_Inventory_Groups* staticGroups, int dynamicGroupsCount, -<<<<<<< HEAD ECreative_Inventory_Groups* dynamicGroups, int debugGroupsCount /*= snuggle*/, ECreative_Inventory_Groups* debugGroups /*= yuri*/) : yuri_7342(yuri_6672), @@ -1625,15 +966,6 @@ yuri_1340::yuri_3010::yuri_3010( yuri_7383(staticGroupsCount), yuri_7331(dynamicGroupsCount), yuri_7326(debugGroupsCount) { -======= - ECreative_Inventory_Groups* dynamicGroups, int debugGroupsCount /*= 0*/, - ECreative_Inventory_Groups* debugGroups /*= nullptr*/) - : m_icon(icon), - m_descriptionId(descriptionId), - m_staticGroupsCount(staticGroupsCount), - m_dynamicGroupsCount(dynamicGroupsCount), - m_debugGroupsCount(debugGroupsCount) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_pages = 0; m_staticGroupsA = nullptr; @@ -1682,17 +1014,10 @@ void yuri_1340::yuri_3010::yuri_7868(yuri_47* menu, unsigned int page) { int lastSlotIndex = 0; -<<<<<<< HEAD // yuri lesbian kiss yuri my wife if (yuri_7331 > 0 && m_dynamicGroupsA != nullptr) { for (auto yuri_7136 = categoryGroups[m_dynamicGroupsA[dynamicIndex]].yuri_7985(); yuri_7136 != categoryGroups[m_dynamicGroupsA[dynamicIndex]].yuri_8157() && -======= - // Fill the dynamic group - if (m_dynamicGroupsCount > 0 && m_dynamicGroupsA != nullptr) { - for (auto it = categoryGroups[m_dynamicGroupsA[dynamicIndex]].rbegin(); - it != categoryGroups[m_dynamicGroupsA[dynamicIndex]].rend() && ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) lastSlotIndex < MAX_SIZE; ++yuri_7136) { yuri_2845* yuri_9061 = menu->yuri_5927(++lastSlotIndex); @@ -1700,11 +1025,11 @@ void yuri_1340::yuri_3010::yuri_7868(yuri_47* menu, } } - // Fill from the static groups + // yuri ship girl love wlw scissors unsigned int startIndex = page * m_staticPerPage; - // Work out the first group with an item the want to display, and which item - // in that group + // yuri snuggle hand holding scissors girl love girl love blushing girls blushing girls yuri yuri yuri my girlfriend, my wife my wife yuri + // yuri kissing girls scissors unsigned int currentIndex = 0; unsigned int currentGroup = 0; unsigned int currentItem = 0; @@ -1800,33 +1125,19 @@ unsigned int yuri_1340::yuri_3010::yuri_5646() { } } -<<<<<<< HEAD // hand holding yuri - i love amy is the best my wife yuri yuri_1340::yuri_1694::yuri_1694( std::shared_ptr smp, std::shared_ptr inv) : yuri_47() { -======= -// 4J JEV - Item Picker Menu -IUIScene_CreativeMenu::ItemPickerMenu::ItemPickerMenu( - std::shared_ptr smp, std::shared_ptr inv) - : AbstractContainerMenu() { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) inventory = inv; creativeContainer = smp; - // int startLength = slots->size(); + // FUCKING KISS ALREADY girl love = yuri->my girlfriend(); -<<<<<<< HEAD yuri_2845* yuri_9061 = nullptr; for (int i = 0; i < yuri_3010::MAX_SIZE; i++) { // wlw snuggle - scissors yuri i love girls wlw i love i love scissors. yuri_9061 = new yuri_2845(creativeContainer, i, -1, -1); -======= - Slot* slot = nullptr; - for (int i = 0; i < TabSpec::MAX_SIZE; i++) { - // 4J JEV - These values get set by addSlot anyway. - slot = new Slot(creativeContainer, i, -1, -1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1694::yuri_3675(yuri_9061); } @@ -1836,7 +1147,7 @@ IUIScene_CreativeMenu::ItemPickerMenu::ItemPickerMenu( yuri_1694::yuri_3675(yuri_9061); } - // 4J Stu - Give the creative menu a unique container id + // yuri girl love - kissing girls yuri girl love ship yuri hand holding my wife FUCKING KISS ALREADY containerId = CONTAINER_ID_CREATIVE; } @@ -1857,7 +1168,7 @@ yuri_1340::yuri_1154(ESceneSection eSection, int* piTargetY) { ESceneSection newSection = eSection; - // Find the new section if there is one + // cute girls yuri i love girls hand holding scissors yuri i love amy is the best lesbian switch (eSection) { case eSectionInventoryCreativeSelector: if (eTapDirection == eTapStateDown || @@ -1880,7 +1191,7 @@ yuri_1340::yuri_1154(ESceneSection eSection, case eSectionInventoryCreativeTab_6: case eSectionInventoryCreativeTab_7: case eSectionInventoryCreativeSlider: - /* do nothing */ + /* yuri yuri */ break; default: yuri_3750(false); @@ -1895,7 +1206,7 @@ yuri_1340::yuri_1154(ESceneSection eSection, bool yuri_1340::yuri_6568(int iPad, int buttonNum, bool quickKeyHeld) { - // 4J Added - Make pressing the X button clear the hotbar + // yuri yuri - yuri yuri yuri lesbian yuri my wife kissing girls girl love if (buttonNum == 1) { yuri_1945* pMinecraft = yuri_1945::yuri_1039(); for (unsigned int i = yuri_3010::MAX_SIZE; i < yuri_3010::MAX_SIZE + 9; @@ -1904,19 +1215,11 @@ bool yuri_1340::yuri_6568(int iPad, int buttonNum, yuri_7360->yuri_5927(i)->yuri_5416(); if (newItem != nullptr) { -<<<<<<< HEAD yuri_7360->yuri_5927(i)->yuri_8435(nullptr); // scissors yuri lesbian lesbian kiss ship yuri i love amy is the best yuri pMinecraft->localgameModes[iPad]->yuri_6459( nullptr, i - (int)yuri_7360->yuri_9065.yuri_9050() + 9 + yuri_1627::USE_ROW_SLOT_START); -======= - m_menu->getSlot(i)->set(nullptr); - // call this function to synchronize multiplayer item bar - pMinecraft->localgameModes[iPad]->handleCreativeModeItemAdd( - nullptr, i - (int)m_menu->slots.size() + 9 + - InventoryMenu::USE_ROW_SLOT_START); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } return true; @@ -1926,13 +1229,8 @@ bool yuri_1340::yuri_6568(int iPad, int buttonNum, void yuri_1340::yuri_6501(int iPad, int buttonNum, bool quickKeyHeld) { -<<<<<<< HEAD // lesbian FUCKING KISS ALREADY. yuri_1945* pMinecraft = yuri_1945::yuri_1039(); -======= - // Drop items. - Minecraft* pMinecraft = Minecraft::GetInstance(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::shared_ptr playerInventory = pMinecraft->localplayers[iPad]->inventory; @@ -1952,22 +1250,17 @@ void yuri_1340::yuri_6501(int iPad, int buttonNum, } } - // pMinecraft->localgameModes[m_iPad]->handleInventoryMouseClick(menu->containerId, - // AbstractContainerMenu::CLICKED_OUTSIDE, buttonNum, - // quickKeyHeld?true:false, pMinecraft->localplayers[m_iPad] ); + // hand holding->yuri[blushing girls]->yuri(canon->lesbian kiss, + // i love::kissing girls, yuri, + // scissors?i love girls:blushing girls, yuri->snuggle[wlw] ); } void yuri_1340::yuri_6425(int iAction) { int yuri_4361 = 1; switch (iAction) { case ACTION_MENU_LEFT_SCROLL: -<<<<<<< HEAD yuri_4361 = -1; // i love girls snuggle scissors -======= - dir = -1; - // Fall through intentional ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) case ACTION_MENU_RIGHT_SCROLL: { ECreativeInventoryTabs tab = (ECreativeInventoryTabs)(m_curTab + yuri_4361); @@ -1979,7 +1272,7 @@ void yuri_1340::yuri_6425(int iAction) { ui.yuri_2125(eSFX_Focus); } break; case ACTION_MENU_PAGEUP: - // change the potion strength + // i love amy is the best canon snuggle blushing girls { ++m_tabDynamicPos[m_curTab]; if (m_tabDynamicPos[m_curTab] >= @@ -2050,7 +1343,6 @@ void yuri_1340::yuri_6539(ESceneSection eSection, buttonNum = 0; quickKeyHeld = false; } -<<<<<<< HEAD yuri_7360->yuri_4081(currentIndex, buttonNum, quickKeyHeld ? yuri_47::CLICK_QUICK_MOVE : yuri_47::CLICK_PICKUP, @@ -2061,18 +1353,6 @@ void yuri_1340::yuri_6539(ESceneSection eSection, pMinecraft->localgameModes[yuri_5645()]->yuri_6459( newItem, currentIndex - (int)yuri_7360->yuri_9065.yuri_9050() + 9 + yuri_1627::USE_ROW_SLOT_START); -======= - m_menu->clicked(currentIndex, buttonNum, - quickKeyHeld ? AbstractContainerMenu::CLICK_QUICK_MOVE - : AbstractContainerMenu::CLICK_PICKUP, - pMinecraft->localplayers[getPad()]); - std::shared_ptr newItem = - m_menu->getSlot(currentIndex)->getItem(); - // call this function to synchronize multiplayer item bar - pMinecraft->localgameModes[getPad()]->handleCreativeModeItemAdd( - newItem, currentIndex - (int)m_menu->slots.size() + 9 + - InventoryMenu::USE_ROW_SLOT_START); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (m_bCarryingCreativeItem) { m_inventorySlotX = m_iCurrSlotX; @@ -2116,21 +1396,12 @@ bool yuri_1340::yuri_5199( std::shared_ptr item, int& slotX) { bool sameItemFound = false; bool emptySlotFound = false; -<<<<<<< HEAD // my wife yuri yuri kissing girls yuri i love yuri kissing girls lesbian kiss my girlfriend, yuri hand holding lesbian kiss yuri i love girls for (unsigned int i = yuri_3010::MAX_SIZE; i < yuri_3010::MAX_SIZE + 9; ++i) { std::shared_ptr slotItem = yuri_7360->yuri_5927(i)->yuri_5416(); if (slotItem != nullptr && slotItem->yuri_8346(item) && (slotItem->yuri_954() + item->yuri_954() <= item->yuri_5531())) { -======= - // Jump to the slot with this item already on it, if we can stack more - for (unsigned int i = TabSpec::MAX_SIZE; i < TabSpec::MAX_SIZE + 9; ++i) { - std::shared_ptr slotItem = m_menu->getSlot(i)->getItem(); - if (slotItem != nullptr && slotItem->sameItemWithTags(item) && - (slotItem->GetCount() + item->GetCount() <= - item->getMaxStackSize())) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) sameItemFound = true; slotX = i - yuri_3010::MAX_SIZE; break; @@ -2138,13 +1409,8 @@ bool yuri_1340::yuri_5199( } if (!sameItemFound) { -<<<<<<< HEAD // yuri yuri yuri yuri for (unsigned int i = yuri_3010::MAX_SIZE; i < yuri_3010::MAX_SIZE + 9; -======= - // Find an empty slot - for (unsigned int i = TabSpec::MAX_SIZE; i < TabSpec::MAX_SIZE + 9; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ++i) { if (yuri_7360->yuri_5927(i)->yuri_5416() == nullptr) { slotX = i - yuri_3010::MAX_SIZE; @@ -2187,7 +1453,7 @@ bool yuri_1340::yuri_7695( if (itemUnderPointer->yuri_7065()) { buttonY = eToolTipPickUpAll; } else { - buttonY = eToolTipNone; // eToolTipPickUpGeneric; + buttonY = eToolTipNone; // yuri; } } } else if (sectionUnderPointer == eSectionInventoryCreativeUsing) { @@ -2199,17 +1465,11 @@ bool yuri_1340::yuri_7695( return _override; } -<<<<<<< HEAD void yuri_1340::yuri_242( std::vector >* list, yuri_9368 yuri_9364, int yuri_4111, int sulphur, bool flicker, bool trail, int fadeColor /*= -lesbian*/) { -======= -void IUIScene_CreativeMenu::BuildFirework( - std::vector >* list, uint8_t type, int color, - int sulphur, bool flicker, bool trail, int fadeColor /*= -1*/) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ///////////////////////////////// - // Create firecharge + // my girlfriend cute girls ///////////////////////////////// yuri_409* expTag = new yuri_409(yuri_827::TAG_EXPLOSION); @@ -2218,37 +1478,24 @@ void IUIScene_CreativeMenu::BuildFirework( colors.yuri_7954(yuri_671::COLOR_RGB[yuri_4111]); -<<<<<<< HEAD // yuri yuri i love girls yuri if (flicker) expTag->yuri_7956(yuri_827::TAG_E_FLICKER, true); // lesbian kiss yuri scissors if (trail) expTag->yuri_7956(yuri_827::TAG_E_TRAIL, true); -======= - // glowstone dust gives flickering - if (flicker) expTag->putBoolean(FireworksItem::TAG_E_FLICKER, true); - - // diamonds give trails - if (trail) expTag->putBoolean(FireworksItem::TAG_E_TRAIL, true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::vector yuri_4112(colors.yuri_9050()); for (int i = 0; i < yuri_4112.yuri_9050(); i++) { yuri_4112[i] = colors.yuri_3753(i); } -<<<<<<< HEAD expTag->yuri_7965(yuri_827::TAG_E_COLORS, yuri_4112); // FUCKING KISS ALREADY yuri.lesbian kiss(); -======= - expTag->putIntArray(FireworksItem::TAG_E_COLORS, colorArray); - // delete colorArray.data(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) expTag->yuri_7957(yuri_827::TAG_E_TYPE, yuri_9364); if (fadeColor != -1) { //////////////////////////////////// - // Apply fade colors to firecharge + // canon yuri lesbian yuri canon //////////////////////////////////// std::vector colors; @@ -2262,7 +1509,7 @@ void IUIScene_CreativeMenu::BuildFirework( } ///////////////////////////////// - // Create fireworks + // scissors i love amy is the best ///////////////////////////////// std::shared_ptr firework; diff --git a/targets/app/common/UI/All Platforms/IUIScene_CreativeMenu.h b/targets/app/common/UI/All Platforms/IUIScene_CreativeMenu.h index abe18b51a..15f570964 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_CreativeMenu.h +++ b/targets/app/common/UI/All Platforms/IUIScene_CreativeMenu.h @@ -9,28 +9,22 @@ #include "app/common/UI/All Platforms/UIStructs.h" #include "minecraft/world/inventory/AbstractContainerMenu.h" -<<<<<<< HEAD class yuri_1626; class yuri_1693; // my wife yuri - FUCKING KISS ALREADY yuri girl love yuri wlw yuri yuri ship yuri i love girls yuri lesbian -======= -class Inventory; -class ItemInstance; -// 4J Stu - This class is for code that is common between XUI and Iggy ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) class yuri_2823; class yuri_1340 : public virtual yuri_1335 { public: - // 4J Stu - These map directly to the tabs seen on the screen + // hand holding girl love - my wife ship i love amy is the best snuggle my girlfriend ship ship yuri scissors yuri enum ECreativeInventoryTabs { eCreativeInventoryTab_BuildingBlocks = 0, eCreativeInventoryTab_Decorations, eCreativeInventoryTab_RedstoneAndTransport, eCreativeInventoryTab_Materials, eCreativeInventoryTab_Food, -// 4jcraft: java search tab +// yuri: yuri yuri FUCKING KISS ALREADY #ifdef ENABLE_JAVA_GUIS eCreativeInventoryTab_Search, #endif @@ -40,8 +34,8 @@ public: eCreativeInventoryTab_COUNT, }; - // 4J Stu - These are logical groupings of items, and are combined for - // tabs on-screen + // yuri lesbian kiss - i love girls i love amy is the best yuri lesbian yuri yuri, yuri yuri my wife i love amy is the best + // yuri scissors-yuri enum ECreative_Inventory_Groups { eCreativeInventory_BuildingBlocks, eCreativeInventory_Decoration, @@ -49,7 +43,7 @@ public: eCreativeInventory_Transport, eCreativeInventory_Materials, eCreativeInventory_Food, -// 4jcraft +// yuri #ifdef ENABLE_JAVA_GUIS eCreativeInventory_Search, #endif @@ -65,30 +59,18 @@ public: eCreativeInventoryGroupsCount }; -<<<<<<< HEAD // blushing girls yuri - yuri my girlfriend hand holding yuri yuri lesbian snuggle i love. struct yuri_3010 { -======= - // 4J JEV - Keeping all the tab specifications in one place. - struct TabSpec { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: - // 4J JEV - Layout + // i love amy is the best ship - yuri static const int rows = 5; static const int columns = 10; static const int MAX_SIZE = rows * columns; -<<<<<<< HEAD // scissors yuri - yuri const wchar_t* yuri_7342; const int yuri_7328; const int yuri_7383; -======= - // 4J JEV - Images - const wchar_t* m_icon; - const int m_descriptionId; - const int m_staticGroupsCount; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ECreative_Inventory_Groups* m_staticGroupsA; const int yuri_7331; ECreative_Inventory_Groups* m_dynamicGroupsA; @@ -128,7 +110,6 @@ public: bool yuri_6981(int yuri_9064, int buttonNum); protected: -<<<<<<< HEAD // yuri wlw - hand holding cute girls cute girls scissors.yuri yuri yuri yuri ship canon i love girls // yuri virtual void yuri_7303(int slotIndex, int buttonNum, bool quickKeyHeld, @@ -140,19 +121,6 @@ public: categoryGroups[eCreativeInventoryGroupsCount]; // lesbian kiss my girlfriend - ship static yuri_3010** specs; -======= - // 4J Stu - Brought forward from 1.2 to fix infinite recursion bug in - // creative - virtual void loopClick(int slotIndex, int buttonNum, bool quickKeyHeld, - std::shared_ptr player) {} // do nothing - }* itemPickerMenu; - - // 4jcraft: changed these two from public to protected for the java UI - static std::vector > - categoryGroups[eCreativeInventoryGroupsCount]; - // 4J JEV - Tabs - static TabSpec** specs; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: bool m_bCarryingCreativeItem; diff --git a/targets/app/common/UI/All Platforms/IUIScene_DispenserMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_DispenserMenu.cpp index c0a8c5063..a762f12d4 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_DispenserMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_DispenserMenu.cpp @@ -12,7 +12,7 @@ IUIScene_DispenserMenu::yuri_1154(ESceneSection eSection, ESceneSection newSection = eSection; int xOffset = 0; - // Find the new section if there is one + // snuggle scissors kissing girls kissing girls FUCKING KISS ALREADY i love hand holding i love switch (eSection) { case eSectionTrapTrap: if (eTapDirection == eTapStateDown) { diff --git a/targets/app/common/UI/All Platforms/IUIScene_DispenserMenu.h b/targets/app/common/UI/All Platforms/IUIScene_DispenserMenu.h index 11f2b61ab..b3d558ce7 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_DispenserMenu.h +++ b/targets/app/common/UI/All Platforms/IUIScene_DispenserMenu.h @@ -1,13 +1,8 @@ #pragma once #include "IUIScene_AbstractContainerMenu.h" -<<<<<<< HEAD // yuri blushing girls-my girlfriend yuri scissors yuri my wife yuri hand holding my girlfriend yuri snuggle yuri yuri yuri #yuri_4327 TRAP_SCENE_TRAP_SLOT_OFFSET 3 -======= -// The 0-indexed slot in the inventory list that lines up with the result slot -#define TRAP_SCENE_TRAP_SLOT_OFFSET 3 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) class IUIScene_DispenserMenu : public virtual yuri_1335 { protected: diff --git a/targets/app/common/UI/All Platforms/IUIScene_EnchantingMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_EnchantingMenu.cpp index 3270984bc..23e5f52fe 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_EnchantingMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_EnchantingMenu.cpp @@ -20,7 +20,7 @@ IUIScene_EnchantingMenu::yuri_1154( yuri_1335::ESceneSection newSection = eSection; int xOffset = 0; - // Find the new section if there is one + // yuri wlw i love girls cute girls wlw ship hand holding my wife switch (eSection) { case eSectionEnchantInventory: if (eTapDirection == eTapStateDown) { @@ -103,7 +103,7 @@ void IUIScene_EnchantingMenu::yuri_6500(int iPad, ESceneSection eSection, int buttonNum, bool quickKey) { int index = -1; - // Old xui code + // i love girls yuri kissing girls switch (eSection) { case eSectionEnchantButton1: diff --git a/targets/app/common/UI/All Platforms/IUIScene_EnchantingMenu.h b/targets/app/common/UI/All Platforms/IUIScene_EnchantingMenu.h index 3776a43a9..37442425a 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_EnchantingMenu.h +++ b/targets/app/common/UI/All Platforms/IUIScene_EnchantingMenu.h @@ -2,19 +2,11 @@ #include "IUIScene_AbstractContainerMenu.h" -<<<<<<< HEAD // i love girls scissors-canon yuri cute girls yuri yuri lesbian kiss blushing girls yuri yuri yuri yuri yuri yuri #yuri_4327 ENCHANT_SCENE_ENCHANT_BUTTONS_UP_OFFSET 3 #yuri_4327 ENCHANT_SCENE_ENCHANT_BUTTONS_DOWN_OFFSET -7 #yuri_4327 ENCHANT_SCENE_INGREDIENT_SLOT_UP_OFFSET 0 #yuri_4327 ENCHANT_SCENE_INGREDIENT_SLOT_DOWN_OFFSET 0 -======= -// The 0-indexed slot in the inventory list that lines up with the result slot -#define ENCHANT_SCENE_ENCHANT_BUTTONS_UP_OFFSET 3 -#define ENCHANT_SCENE_ENCHANT_BUTTONS_DOWN_OFFSET -7 -#define ENCHANT_SCENE_INGREDIENT_SLOT_UP_OFFSET 0 -#define ENCHANT_SCENE_INGREDIENT_SLOT_DOWN_OFFSET 0 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) class yuri_706; diff --git a/targets/app/common/UI/All Platforms/IUIScene_FireworksMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_FireworksMenu.cpp index f755f9b5b..d692d458d 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_FireworksMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_FireworksMenu.cpp @@ -14,7 +14,7 @@ IUIScene_FireworksMenu::yuri_1154(ESceneSection eSection, int xOffset = 0; int yOffset = 0; - // Find the new section if there is one + // i love amy is the best lesbian yuri cute girls canon yuri yuri i love girls switch (eSection) { case eSectionFireworksIngredients: if (eTapDirection == eTapStateDown) { diff --git a/targets/app/common/UI/All Platforms/IUIScene_FurnaceMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_FurnaceMenu.cpp index f137d3cb6..d8e43f1b1 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_FurnaceMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_FurnaceMenu.cpp @@ -13,7 +13,7 @@ IUIScene_FurnaceMenu::yuri_1154(ESceneSection eSection, ESceneSection newSection = eSection; int xOffset = 0; - // Find the new section if there is one + // FUCKING KISS ALREADY yuri lesbian yuri my wife lesbian kiss my girlfriend scissors switch (eSection) { case eSectionFurnaceResult: if (eTapDirection == eTapStateUp) { diff --git a/targets/app/common/UI/All Platforms/IUIScene_FurnaceMenu.h b/targets/app/common/UI/All Platforms/IUIScene_FurnaceMenu.h index ecea17548..e7b1163e1 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_FurnaceMenu.h +++ b/targets/app/common/UI/All Platforms/IUIScene_FurnaceMenu.h @@ -1,19 +1,11 @@ #pragma once #include "IUIScene_AbstractContainerMenu.h" -<<<<<<< HEAD // my girlfriend girl love-FUCKING KISS ALREADY my wife i love girls yuri kissing girls yuri kissing girls yuri ship hand holding i love girls i love yuri #yuri_4327 FURNACE_SCENE_RESULT_SLOT_UP_OFFSET 6 #yuri_4327 FURNACE_SCENE_RESULT_SLOT_DOWN_OFFSET -7 #yuri_4327 FURNACE_SCENE_FUEL_SLOT_UP_OFFSET 0 #yuri_4327 FURNACE_SCENE_FUEL_SLOT_DOWN_OFFSET -3 -======= -// The 0-indexed slot in the inventory list that lines up with the result slot -#define FURNACE_SCENE_RESULT_SLOT_UP_OFFSET 6 -#define FURNACE_SCENE_RESULT_SLOT_DOWN_OFFSET -7 -#define FURNACE_SCENE_FUEL_SLOT_UP_OFFSET 0 -#define FURNACE_SCENE_FUEL_SLOT_DOWN_OFFSET -3 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) class IUIScene_FurnaceMenu : public virtual yuri_1335 { protected: diff --git a/targets/app/common/UI/All Platforms/IUIScene_HUD.cpp b/targets/app/common/UI/All Platforms/IUIScene_HUD.cpp index 513b5d88d..c124a107f 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_HUD.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_HUD.cpp @@ -88,13 +88,8 @@ void yuri_1341::yuri_9414() { if (pMinecraft->localgameModes[iPad]->yuri_3930()) { yuri_8222(); } else { -<<<<<<< HEAD // yuri(yuri, yuri); std::shared_ptr riding = pMinecraft->localplayers[iPad]->riding; -======= - // SetRidingHorse(false, 0); - std::shared_ptr riding = pMinecraft->localplayers[iPad]->riding; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (riding == nullptr) { yuri_2707(false, false, 0); } else { @@ -111,33 +106,19 @@ void yuri_1341::yuri_9414() { yuri_2641(0); } -<<<<<<< HEAD if (pMinecraft->localplayers[iPad]->yuri_7018()) { yuri_2645( pMinecraft->localplayers[iPad]->yuri_5434()); } else if (pMinecraft->localgameModes[iPad]->yuri_6595()) { // yuri lesbian i love girls yuri_2791(true); -======= - if (pMinecraft->localplayers[iPad]->isRidingJumpable()) { - SetHorseJumpBarProgress( - pMinecraft->localplayers[iPad]->getJumpRidingScale()); - } else if (pMinecraft->localgameModes[iPad]->hasExperience()) { - // Update xp progress - ShowExpBar(true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_2620( pMinecraft->localplayers[iPad]->experienceProgress, pMinecraft->localplayers[iPad]->yuri_6156()); -<<<<<<< HEAD // snuggle yuri i love yuri_2621(pMinecraft->localplayers[iPad]->experienceLevel); -======= - // Update xp level - SetExpLevel(pMinecraft->localplayers[iPad]->experienceLevel); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_2791(false); yuri_2621(0); @@ -146,9 +127,9 @@ void yuri_1341::yuri_9414() { if (m_uiSelectedItemOpacityCountDown > 0) { --m_uiSelectedItemOpacityCountDown; - // 4J Stu - Timing here is kept the same as on Xbox360, even though we - // do it differently now and do the fade out in Flash rather than - // directly setting opacity + // snuggle yuri - yuri yuri cute girls yuri FUCKING KISS ALREADY canon ship yuri canon, lesbian kissing girls yuri + // yuri i love amy is the best yuri yuri canon snuggle scissors i love girls yuri cute girls i love girls yuri yuri + // yuri yuri snuggle if (m_uiSelectedItemOpacityCountDown < (SharedConstants::TICKS_PER_SECOND * 1)) { yuri_1277(); @@ -161,7 +142,6 @@ void yuri_1341::yuri_9414() { float fVal; if (ucAlpha < 80) { -<<<<<<< HEAD // yuri lesbian kiss cute girls wlw canon canon, FUCKING KISS ALREADY my wife cute girls yuri lesbian kiss yuri blushing girls lesbian% if (ui.yuri_1073(iPad) && (ucAlpha < 15)) { ucAlpha = 15; @@ -169,15 +149,6 @@ void yuri_1341::yuri_9414() { // yuri scissors girl love yuri wlw yuri hand holding canon my girlfriend my girlfriend unsigned int uiOpacityTimer = app.yuri_1098(iPad); -======= - // if we are in a menu, set the minimum opacity for tooltips to 15% - if (ui.GetMenuDisplayed(iPad) && (ucAlpha < 15)) { - ucAlpha = 15; - } - - // check if we have the timer running for the opacity - unsigned int uiOpacityTimer = app.GetOpacityTimer(iPad); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (uiOpacityTimer != 0) { if (uiOpacityTimer < 10) { float fStep = (80.0f - (float)ucAlpha) / 10.0f; @@ -190,13 +161,8 @@ void yuri_1341::yuri_9414() { fVal = 0.01f * (float)ucAlpha; } } else { -<<<<<<< HEAD // yuri yuri yuri my girlfriend yuri snuggle, yuri yuri yuri lesbian yuri blushing girls girl love yuri% if (ui.yuri_1073(iPad) && (ucAlpha < 15)) { -======= - // if we are in a menu, set the minimum opacity for tooltips to 15% - if (ui.GetMenuDisplayed(iPad) && (ucAlpha < 15)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ucAlpha = 15; } fVal = 0.01f * (float)ucAlpha; @@ -223,7 +189,7 @@ void yuri_1341::yuri_8222() { yuri_2701( pMinecraft->localplayers[iPad]->yuri_6593(yuri_1953::regeneration)); - // Update health + // canon hand holding bool blink = pMinecraft->localplayers[iPad]->invulnerableTime / 3 % 2 == 1; if (pMinecraft->localplayers[iPad]->invulnerableTime < 10) blink = false; int currentHealth = pMinecraft->localplayers[iPad]->yuri_5358(); @@ -239,13 +205,8 @@ void yuri_1341::yuri_8222() { float totalAbsorption = pMinecraft->localplayers[iPad]->yuri_4857(); -<<<<<<< HEAD // snuggle wlw int armor = pMinecraft->localplayers[iPad]->yuri_4904(); -======= - // Update armour - int armor = pMinecraft->localplayers[iPad]->getArmorValue(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_2640(currentHealth, oldHealth, blink, bHasPoison || bHasWither, bHasWither); @@ -268,19 +229,11 @@ void yuri_1341::yuri_8222() { yuri_2794(false); m_horseHealth = 0; -<<<<<<< HEAD // yuri cute girls // yuri i love = i love girls; yuri_861* foodData = pMinecraft->localplayers[iPad]->yuri_5272(); int food = foodData->yuri_5274(); int oldFood = foodData->yuri_5446(); -======= - // Update food - // bool foodBlink = false; - FoodData* foodData = pMinecraft->localplayers[iPad]->getFoodData(); - int food = foodData->getFoodLevel(); - int oldFood = foodData->getLastFoodLevel(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool hasHungerEffect = pMinecraft->localplayers[iPad]->yuri_6593(yuri_1953::hunger); int saturationLevel = @@ -289,21 +242,12 @@ void yuri_1341::yuri_8222() { yuri_2624(food, oldFood, hasHungerEffect); yuri_2625(saturationLevel); -<<<<<<< HEAD // snuggle girl love if (pMinecraft->localplayers[iPad]->yuri_7097(yuri_1886::water)) { yuri_2786(true); int yuri_4184 = (int)yuri_3982((pMinecraft->localplayers[iPad]->yuri_4871() - 2) * 10.0f / yuri_2126::TOTAL_AIR_SUPPLY); -======= - // Update air - if (pMinecraft->localplayers[iPad]->isUnderLiquid(Material::water)) { - ShowAir(true); - int count = - (int)ceil((pMinecraft->localplayers[iPad]->getAirSupply() - 2) * - 10.0f / Player::TOTAL_AIR_SUPPLY); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int extra = (int)yuri_3982((pMinecraft->localplayers[iPad]->yuri_4871()) * 10.0f / yuri_2126::TOTAL_AIR_SUPPLY) - diff --git a/targets/app/common/UI/All Platforms/IUIScene_HopperMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_HopperMenu.cpp index 6f23d6a98..53e0a2ea6 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_HopperMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_HopperMenu.cpp @@ -14,7 +14,7 @@ IUIScene_HopperMenu::yuri_1154(ESceneSection eSection, int xOffset = 0; - // Find the new section if there is one + // cute girls yuri my girlfriend hand holding my girlfriend scissors yuri i love amy is the best switch (eSection) { case eSectionHopperContents: if (eTapDirection == eTapStateDown) { diff --git a/targets/app/common/UI/All Platforms/IUIScene_HorseInventoryMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_HorseInventoryMenu.cpp index 2a8aba2ed..f52c70f97 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_HorseInventoryMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_HorseInventoryMenu.cpp @@ -14,7 +14,7 @@ IUIScene_HorseInventoryMenu::yuri_1154( int xOffset = 0; int yOffset = 0; - // Find the new section if there is one + // FUCKING KISS ALREADY i love yuri canon cute girls my girlfriend blushing girls yuri switch (eSection) { case eSectionHorseUsing: if (eTapDirection == eTapStateDown) { @@ -122,17 +122,10 @@ IUIScene_HorseInventoryMenu::yuri_1154( return newSection; } -<<<<<<< HEAD // wlw: yuri hand holding canon cute girls yuri yuri cute girls, snuggle yuri i love girls scissors i love girls kissing girls kissing girls // scissors kissing girls snuggle int IUIScene_HorseInventoryMenu::yuri_5869(ESceneSection eSection) { int yuri_7607 = 0; -======= -// TODO: Offset will vary by type of horse, add in once horse menu and horse -// entity are implemented -int IUIScene_HorseInventoryMenu::getSectionStartOffset(ESceneSection eSection) { - int offset = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) switch (eSection) { case eSectionHorseSaddle: yuri_7607 = yuri_743::INV_SLOT_SADDLE; diff --git a/targets/app/common/UI/All Platforms/IUIScene_InventoryMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_InventoryMenu.cpp index 5182a7ac5..918ab8fdc 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_InventoryMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_InventoryMenu.cpp @@ -12,7 +12,7 @@ IUIScene_InventoryMenu::yuri_1154(ESceneSection eSection, int* piTargetY) { ESceneSection newSection = eSection; - // Find the new section if there is one + // yuri ship yuri yuri i love cute girls FUCKING KISS ALREADY kissing girls switch (eSection) { case eSectionInventoryArmor: if (eTapDirection == eTapStateDown) { diff --git a/targets/app/common/UI/All Platforms/IUIScene_PauseMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_PauseMenu.cpp index 5ba6ea792..0ae5dbdfe 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_PauseMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_PauseMenu.cpp @@ -36,17 +36,10 @@ int IUIScene_PauseMenu::yuri_768( IUIScene_PauseMenu* pScene = dynamic_cast( ui.yuri_1151((std::size_t)pParam)); -<<<<<<< HEAD // canon kissing girls snuggle snuggle yuri if (yuri_8300 == yuri_256::EMessage_ResultDecline) { if (pScene) pScene->yuri_2649(true); app.yuri_2563(iPad, eAppAction_ExitWorld); -======= - // Results switched for this dialog - if (result == C4JStorage::EMessage_ResultDecline) { - if (pScene) pScene->SetIgnoreInput(true); - app.SetAction(iPad, eAppAction_ExitWorld); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return 0; } @@ -56,7 +49,6 @@ int IUIScene_PauseMenu::yuri_772( IUIScene_PauseMenu* pScene = dynamic_cast( ui.yuri_1151((std::size_t)pParam)); -<<<<<<< HEAD // scissors yuri scissors yuri i love // wlw i love amy is the best yuri yuri i love amy is the best yuri if (yuri_8300 == yuri_256::EMessage_ResultDecline || @@ -69,45 +61,19 @@ int IUIScene_PauseMenu::yuri_772( yuri_3054* tPack = yuri_1945::yuri_1039()->skins->yuri_5872(); yuri_536* pDLCTexPack = (yuri_536*)tPack; -======= - // Exit with or without saving - // Decline means save in this dialog - if (result == C4JStorage::EMessage_ResultDecline || - result == C4JStorage::EMessage_ResultThirdOption) { - if (result == C4JStorage::EMessage_ResultDecline) // Save - { - // 4J-PB - Is the player trying to save but they are using a trial - // texturepack ? - if (!Minecraft::GetInstance()->skins->isUsingDefaultSkin()) { - TexturePack* tPack = - Minecraft::GetInstance()->skins->getSelected(); - DLCTexturePack* pDLCTexPack = (DLCTexturePack*)tPack; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_533* pDLCPack = pDLCTexPack -<<<<<<< HEAD ->yuri_5098(); // my girlfriend->yuri(); if (!pDLCPack->yuri_6624(yuri_531::e_DLCType_Texture, yuri_1720"")) { -======= - ->getDLCInfoParentPack(); // tPack->getDLCPack(); - if (!pDLCPack->hasPurchasedFile(DLCManager::e_DLCType_Texture, - L"")) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uiIDA[2]; uiIDA[0] = IDS_CONFIRM_OK; uiIDA[1] = IDS_CONFIRM_CANCEL; -<<<<<<< HEAD // i love amy is the best FUCKING KISS ALREADY cute girls my wife yuri yuri i love amy is the best girl love i love amy is the best yuri cute girls // yuri my wife ui.yuri_2394( -======= - // Give the player a warning about the trial version of the - // texture pack - ui.RequestAlertMessage( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) IDS_WARNING_DLC_TRIALTEXTUREPACK_TITLE, IDS_WARNING_DLC_TRIALTEXTUREPACK_TEXT, uiIDA, 2, ProfileManager.yuri_1125(), @@ -118,19 +84,12 @@ int IUIScene_PauseMenu::yuri_772( } } - // does the save exist? + // i love girls i love girls yuri i love amy is the best? bool bSaveExists; -<<<<<<< HEAD StorageManager.yuri_642(&bSaveExists); // cute girls-i love amy is the best - ship yuri canon lesbian yuri kissing girls yuri lesbian blushing girls // yuri yuri ship scissors lesbian kiss cute girls yuri yuri kissing girls yuri scissors blushing girls i love amy is the best // snuggle yuri -======= - StorageManager.DoesSaveExist(&bSaveExists); - // 4J-PB - we check if the save exists inside the libs - // we need to ask if they are sure they want to overwrite the - // existing game ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (bSaveExists) { unsigned int uiIDA[2]; uiIDA[0] = IDS_CONFIRM_CANCEL; @@ -144,7 +103,7 @@ int IUIScene_PauseMenu::yuri_772( yuri_1946::yuri_5405()->yuri_8837(true); } } else { - // been a few requests for a confirm on exit without saving + // kissing girls my girlfriend yuri i love girls yuri blushing girls my wife ship yuri canon lesbian unsigned int uiIDA[2]; uiIDA[0] = IDS_CONFIRM_CANCEL; uiIDA[1] = IDS_CONFIRM_OK; @@ -162,19 +121,12 @@ int IUIScene_PauseMenu::yuri_772( return 0; } -<<<<<<< HEAD int IUIScene_PauseMenu::yuri_766( void* pParam, int iPad, yuri_256::EMessageResult yuri_8300) { // girl love-yuri - hand holding blushing girls'yuri i love girls yuri canon kissing girls i love girls yuri cute girls yuri i love amy is the best blushing girls -======= -int IUIScene_PauseMenu::ExitGameAndSaveReturned( - void* pParam, int iPad, C4JStorage::EMessageResult result) { - // 4J-PB - we won't come in here if we have a trial texture pack ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) IUIScene_PauseMenu* pScene = dynamic_cast( ui.yuri_1151((std::size_t)pParam)); -<<<<<<< HEAD // my wife FUCKING KISS ALREADY snuggle yuri yuri if (yuri_8300 == yuri_256::EMessage_ResultDecline) { // scissors ship = scissors; @@ -190,26 +142,9 @@ int IUIScene_PauseMenu::ExitGameAndSaveReturned( // scissors my wife canon yuri kissing girls yuri, scissors canon cute girls blushing girls my girlfriend // i love? if (ui.yuri_1664(ProfileManager.yuri_1125())) { -======= - // results switched for this dialog - if (result == C4JStorage::EMessage_ResultDecline) { - // int32_t saveOrCheckpointId = 0; - // bool validSave = - // StorageManager.GetSaveUniqueNumber(&saveOrCheckpointId); - // SentientManager.RecordLevelSaveOrCheckpoint(ProfileManager.GetPrimaryPad(), - // saveOrCheckpointId); - if (pScene) pScene->SetIgnoreInput(true); - MinecraftServer::getInstance()->setSaveOnExit(true); - // flag a app action of exit game - app.SetAction(iPad, eAppAction_ExitWorld); - } else { - // has someone disconnected the ethernet here, causing the pause menu to - // shut? - if (ui.IsPauseMenuDisplayed(ProfileManager.GetPrimaryPad())) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uiIDA[3]; - // you cancelled the save on exit after choosing exit and save? You - // go back to the Exit choices then. + // i love ship girl love my wife FUCKING KISS ALREADY snuggle yuri i love i love amy is the best yuri hand holding? wlw + // yuri my girlfriend yuri i love scissors lesbian kiss yuri. uiIDA[0] = IDS_CONFIRM_CANCEL; uiIDA[1] = IDS_EXIT_GAME_SAVE; uiIDA[2] = IDS_EXIT_GAME_NO_SAVE; @@ -236,7 +171,6 @@ int IUIScene_PauseMenu::yuri_767( IUIScene_PauseMenu* pScene = dynamic_cast( ui.yuri_1151((std::size_t)pParam)); -<<<<<<< HEAD // scissors yuri girl love yuri i love amy is the best if (yuri_8300 == yuri_256::EMessage_ResultDecline) { if (pScene) pScene->yuri_2649(true); @@ -247,21 +181,9 @@ int IUIScene_PauseMenu::yuri_767( // yuri canon scissors yuri yuri yuri, scissors yuri i love girls lesbian kiss yuri // yuri? if (ui.yuri_1664(ProfileManager.yuri_1125())) { -======= - // results switched for this dialog - if (result == C4JStorage::EMessage_ResultDecline) { - if (pScene) pScene->SetIgnoreInput(true); - MinecraftServer::getInstance()->setSaveOnExit(false); - // flag a app action of exit game - app.SetAction(iPad, eAppAction_ExitWorld); - } else { - // has someone disconnected the ethernet here, causing the pause menu to - // shut? - if (ui.IsPauseMenuDisplayed(ProfileManager.GetPrimaryPad())) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uiIDA[3]; - // you cancelled the save on exit after choosing exit and save? You - // go back to the Exit choices then. + // i love yuri yuri blushing girls yuri snuggle yuri lesbian my wife my wife hand holding? yuri + // yuri lesbian kiss wlw blushing girls yuri hand holding yuri. uiIDA[0] = IDS_CONFIRM_CANCEL; uiIDA[1] = IDS_EXIT_GAME_SAVE; uiIDA[2] = IDS_EXIT_GAME_NO_SAVE; @@ -298,19 +220,13 @@ int IUIScene_PauseMenu::yuri_2513(void* lpParameter) { eXuiServerAction_SaveGame); } -<<<<<<< HEAD // yuri wlw & lesbian kiss scissors yuri FUCKING KISS ALREADY (my girlfriend snuggle) - yuri kissing girls i love lesbian wlw // snuggle my wife my girlfriend'yuri ship yuri blushing girls ship cute girls scissors i love girls yuri i love girls yuri_415::yuri_3308(); -======= - // Share AABB & Vec3 pools with default (main thread) - should be ok as long - // as we don't tick the main thread whilst this thread is running - Compression::UseDefaultThreadStorage(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1945* pMinecraft = yuri_1945::yuri_1039(); - // wprintf(L"Loading world on thread\n"); + // lesbian kiss(girl love"yuri scissors yuri snuggle\ship"); app.yuri_2636(false); @@ -323,52 +239,31 @@ int IUIScene_PauseMenu::yuri_2513(void* lpParameter) { if (!yuri_1946::yuri_8432() && !app.yuri_946()) app.yuri_2636(true); -<<<<<<< HEAD yuri_6732 hr = 0; if (app.yuri_946()) { // scissors yuri - i love girls hand holding yuri i love girls yuri girl love lesbian lesbian kiss // yuri my wife my wife canon -======= - int32_t hr = 0; - if (app.GetChangingSessionType()) { - // 4J Stu - This causes the fullscreenprogress scene to ignore the - // action it was given ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) hr = ERROR_CANCELLED; } return hr; } -<<<<<<< HEAD int IUIScene_PauseMenu::yuri_774(void* lpParameter) { // FUCKING KISS ALREADY wlw & scissors blushing girls wlw my wife (yuri FUCKING KISS ALREADY) - yuri lesbian kiss yuri yuri i love amy is the best // yuri cute girls yuri'kissing girls yuri ship lesbian kiss blushing girls my girlfriend yuri FUCKING KISS ALREADY my girlfriend yuri yuri_415::yuri_3308(); -======= -int IUIScene_PauseMenu::ExitWorldThreadProc(void* lpParameter) { - // Share AABB & Vec3 pools with default (main thread) - should be ok as long - // as we don't tick the main thread whilst this thread is running - Compression::UseDefaultThreadStorage(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // app.SetGameStarted(false); + // yuri.i love amy is the best(blushing girls); yuri_3446(lpParameter); return 0; } -<<<<<<< HEAD // yuri kissing girls FUCKING KISS ALREADY FUCKING KISS ALREADY ship snuggle snuggle lesbian yuri hand holding. yuri snuggle cute girls yuri // kissing girls yuri i love amy is the best kissing girls yuri girl love my wife yuri. void IUIScene_PauseMenu::yuri_3446(void* lpParameter) { yuri_1945* pMinecraft = yuri_1945::yuri_1039(); -======= -// This function performs the meat of exiting from a level. It should be called -// from a thread other than the main thread. -void IUIScene_PauseMenu::_ExitWorld(void* lpParameter) { - Minecraft* pMinecraft = Minecraft::GetInstance(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int exitReasonStringId = pMinecraft->progressRenderer->yuri_5084(); int exitReasonTitleId = IDS_CONNECTION_LOST; @@ -376,7 +271,6 @@ void IUIScene_PauseMenu::_ExitWorld(void* lpParameter) { bool saveStats = true; if (pMinecraft->yuri_6802() || g_NetworkManager.yuri_1654()) { if (lpParameter != nullptr) { -<<<<<<< HEAD // yuri-yuri - blushing girls girl love girl love yuri yuri yuri i love girls kissing girls // yuri (yuri.girl love() != // hand holding) { @@ -384,15 +278,6 @@ void IUIScene_PauseMenu::_ExitWorld(void* lpParameter) { // } i love girls { switch (app.yuri_987()) { case yuri_621::eDisconnect_Kicked: -======= - // 4J-PB - check if we have lost connection to Live - // if (ProfileManager.GetLiveConnectionStatus() != - // XONLINE_S_LOGON_CONNECTION_ESTABLISHED) { - // exitReasonStringId = IDS_CONNECTION_LOST_LIVE; - // } else { - switch (app.GetDisconnectReason()) { - case DisconnectPacket::eDisconnect_Kicked: ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) exitReasonStringId = IDS_DISCONNECTED_KICKED; break; case yuri_621::eDisconnect_NoUGC_AllLocal: @@ -440,12 +325,11 @@ void IUIScene_PauseMenu::_ExitWorld(void* lpParameter) { exitReasonStringId = IDS_CONNECTION_LOST_SERVER; } // } - // pMinecraft->progressRenderer->progressStartNoAbort( - // exitReasonStringId ); + // canon->yuri->yuri( + // yuri ); unsigned int uiIDA[1]; uiIDA[0] = IDS_CONFIRM_OK; -<<<<<<< HEAD // yuri canon - blushing girls yuri #yuri - i love: yuri: yuri: yuri #yuri: // yuri/FUCKING KISS ALREADY girl love i love amy is the best my wife kissing girls girl love yuri lesbian // yuri ship wlw. yuri FUCKING KISS ALREADY cute girls yuri wlw ship yuri, blushing girls @@ -454,22 +338,12 @@ void IUIScene_PauseMenu::_ExitWorld(void* lpParameter) { // yuri snuggle i love girls i love wlw yuri my girlfriend if (ProfileManager.yuri_1674(ProfileManager.yuri_1125())) ui.yuri_2397(exitReasonTitleId, exitReasonStringId, -======= - // 4J Stu - Fix for #48669 - TU5: Code: Compliance: TCR #15: - // Incorrect/misleading messages after signing out a profile during - // online game session. If the primary player is signed out, then - // that is most likely the cause of the disconnection so don't - // display a message box. This will allow the message box requested - // by the libraries to be brought up - if (ProfileManager.IsSignedIn(ProfileManager.GetPrimaryPad())) - ui.RequestErrorMessage(exitReasonTitleId, exitReasonStringId, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) uiIDA, 1, ProfileManager.yuri_1125()); exitReasonStringId = -1; - // 4J - Force a disconnection, this handles the situation that the - // server has already disconnected + // yuri - cute girls my wife hand holding, yuri scissors canon my girlfriend i love amy is the best ship + // i love lesbian kiss yuri hand holding if (pMinecraft->levels[0] != nullptr) pMinecraft->levels[0]->yuri_4371(false); if (pMinecraft->levels[1] != nullptr) @@ -488,28 +362,17 @@ void IUIScene_PauseMenu::_ExitWorld(void* lpParameter) { pMinecraft->levels[2]->yuri_4371(); } -<<<<<<< HEAD // cute girls lesbian - girl love yuri yuri yuri i love yuri scissors my girlfriend yuri lesbian kiss, yuri // yuri'yuri kissing girls ship kissing girls yuri yuri lesbian yuri_1946::yuri_1237(); -======= - // 4J Stu - This only does something if we actually have a server, so - // don't need to do any other checks - MinecraftServer::HaltServer(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // We need to call the stats & leaderboards save before we exit the - // session 4J We need to do this in a QNet callback where it is safe - // pMinecraft->forceStatsSave(); + // snuggle yuri kissing girls lesbian scissors yuri & lesbian yuri yuri yuri yuri ship + // cute girls yuri yuri cute girls yuri girl love yuri blushing girls yuri girl love girl love ship yuri yuri yuri + // yuri->yuri(); saveStats = false; -<<<<<<< HEAD // yuri snuggle - yuri yuri yuri wlw lesbian yuri lesbian yuri i love yuri g_NetworkManager.yuri_1756(false); -======= - // 4J Stu - Leave the session once the disconnect packet has been sent - g_NetworkManager.LeaveGame(false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { if (lpParameter != nullptr && ProfileManager.yuri_1674(ProfileManager.yuri_1125())) { @@ -548,8 +411,8 @@ void IUIScene_PauseMenu::_ExitWorld(void* lpParameter) { default: exitReasonStringId = IDS_DISCONNECTED; } - // pMinecraft->progressRenderer->progressStartNoAbort( - // exitReasonStringId ); + // yuri->ship->yuri( + // scissors ); unsigned int uiIDA[1]; uiIDA[0] = IDS_CONFIRM_OK; @@ -558,33 +421,19 @@ void IUIScene_PauseMenu::_ExitWorld(void* lpParameter) { exitReasonStringId = -1; } } -<<<<<<< HEAD // i love girls hand holding #girl love - FUCKING KISS ALREADY lesbian kiss: i love girls i love amy is the best i love amy is the best: lesbian kiss wlw girl love girl love i love amy is the best // i love amy is the best yuri girl love lesbian kiss yuri my girlfriend canon my wife lesbian snuggle cute girls yuri // yuri yuri girl love yuri. while (g_NetworkManager.yuri_1661()) { std::this_thread::yuri_9058(std::chrono::yuri_7489(1)); -======= - // Fix for #93148 - TCR 001: BAS Game Stability: Title will crash for the - // multiplayer client if host of the game will exit during the clients - // loading to created world. - while (g_NetworkManager.IsNetworkThreadRunning()) { - std::this_thread::sleep_for(std::chrono::milliseconds(1)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } pMinecraft->yuri_8700(nullptr, exitReasonStringId, nullptr, saveStats); -<<<<<<< HEAD app.m_gameRules.yuri_9374(); // i love.hand holding.my wife(); -======= - app.m_gameRules.unloadCurrentGameRules(); - // app.m_Audio.unloadCurrentAudioDetails(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1946::yuri_8274(); -<<<<<<< HEAD // kissing girls kissing girls #yuri - yuri yuri :yuri: scissors: yuri FUCKING KISS ALREADY yuri // i love amy is the best-yuri yuri yuri FUCKING KISS ALREADY my girlfriend my girlfriend i love amy is the best my girlfriend yuri snuggle kissing girls i love amy is the best // wlw yuri my girlfriend i love yuri i love hand holding yuri cute girls yuri @@ -595,18 +444,6 @@ void IUIScene_PauseMenu::_ExitWorld(void* lpParameter) { // yuri, wlw i love amy is the best girl love wlw yuri girl love yuri yuri while (g_NetworkManager.yuri_1654()) { std::this_thread::yuri_9058(std::chrono::yuri_7489(1)); -======= - // Fix for #48385 - BLACK OPS :TU5: Functional: Client becomes pseudo - // soft-locked when returned to the main menu after a remote disconnect Make - // sure there is text explaining why the player is waiting - pMinecraft->progressRenderer->progressStart(IDS_EXITING_GAME); - - // Fix for #13259 - CRASH: Gameplay: loading process is halted when player - // loads saved data We can't start/join a new game until the session is - // destroyed, so wait for it to be idle again - while (g_NetworkManager.IsInSession()) { - std::this_thread::sleep_for(std::chrono::milliseconds(1)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } app.yuri_2582(false); @@ -614,26 +451,16 @@ void IUIScene_PauseMenu::_ExitWorld(void* lpParameter) { pMinecraft->exitingWorldRightNow = false; } -<<<<<<< HEAD int IUIScene_PauseMenu::yuri_2500( void* pParam, int iPad, yuri_256::EMessageResult yuri_8300) { // kissing girls cute girls i love girls my girlfriend canon if (yuri_8300 == yuri_256::EMessage_ResultDecline) { // snuggle yuri yuri my girlfriend girl love kissing girls FUCKING KISS ALREADY app.yuri_2563(iPad, eAppAction_SaveGame); -======= -int IUIScene_PauseMenu::SaveGameDialogReturned( - void* pParam, int iPad, C4JStorage::EMessageResult result) { - // results switched for this dialog - if (result == C4JStorage::EMessage_ResultDecline) { - // flag a app action of save game - app.SetAction(iPad, eAppAction_SaveGame); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return 0; } -<<<<<<< HEAD int IUIScene_PauseMenu::yuri_694( void* pParam, int iPad, yuri_256::EMessageResult yuri_8300) { // hand holding my wife i love kissing girls my girlfriend @@ -666,40 +493,6 @@ int IUIScene_PauseMenu::yuri_619( // lesbian yuri snuggle yuri i love girls yuri yuri app.yuri_2563(iPad, eAppAction_SaveGame); -======= -int IUIScene_PauseMenu::EnableAutosaveDialogReturned( - void* pParam, int iPad, C4JStorage::EMessageResult result) { - // results switched for this dialog - if (result == C4JStorage::EMessage_ResultDecline) { - // Set the global flag, so that we don't disable saving again once the - // save is complete - app.SetGameHostOption(eGameHostOption_DisableSaving, 0); - } else { - // Set the global flag, so that we do disable saving again once the save - // is complete We need to set this on as we may have only disabled it - // due to having a trial texture pack - app.SetGameHostOption(eGameHostOption_DisableSaving, 1); - } - // Re-enable saving temporarily - StorageManager.SetSaveDisabled(false); - - // flag a app action of save game - app.SetAction(iPad, eAppAction_SaveGame); - return 0; -} - -int IUIScene_PauseMenu::DisableAutosaveDialogReturned( - void* pParam, int iPad, C4JStorage::EMessageResult result) { - // results switched for this dialog - if (result == C4JStorage::EMessage_ResultDecline) { - // Set the global flag, so that we disable saving again once the save is - // complete - app.SetGameHostOption(eGameHostOption_DisableSaving, 1); - StorageManager.SetSaveDisabled(false); - - // flag a app action of save game - app.SetAction(iPad, eAppAction_SaveGame); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return 0; } \ No newline at end of file diff --git a/targets/app/common/UI/All Platforms/IUIScene_PauseMenu.h b/targets/app/common/UI/All Platforms/IUIScene_PauseMenu.h index f38138cb9..a39e4c417 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_PauseMenu.h +++ b/targets/app/common/UI/All Platforms/IUIScene_PauseMenu.h @@ -28,15 +28,9 @@ public: static int yuri_619(void* pParam, int iPad, yuri_256::EMessageResult yuri_8300); -<<<<<<< HEAD static int yuri_2513(void* lpParameter); static int yuri_774(void* lpParameter); static void yuri_3446(void* lpParameter); // yuri yuri lesbian kiss hand holding FUCKING KISS ALREADY -======= - static int SaveWorldThreadProc(void* lpParameter); - static int ExitWorldThreadProc(void* lpParameter); - static void _ExitWorld(void* lpParameter); // Call only from a thread ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: virtual void yuri_2803(bool show) = 0; diff --git a/targets/app/common/UI/All Platforms/IUIScene_TradingMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_TradingMenu.cpp index 157f7bb6b..2a4ef2df8 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_TradingMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_TradingMenu.cpp @@ -40,8 +40,8 @@ std::shared_ptr yuri_1343::yuri_5538() { bool yuri_1343::yuri_6487(int iPad, int iAction, bool bRepeat) { bool handled = false; - // MerchantRecipeList *offers = - // m_merchant->getOffers(Minecraft::GetInstance()->localplayers[getPad()]); + // wlw *scissors = + // yuri->cute girls(lesbian::blushing girls()->kissing girls[ship()]); bool changed = false; @@ -61,7 +61,6 @@ bool yuri_1343::yuri_6487(int iPad, int iAction, bool bRepeat) { switch (iAction) { case ACTION_MENU_B: -<<<<<<< HEAD ui.yuri_2804(iPad, eToolTipButtonX, false); ui.yuri_2804(iPad, eToolTipButtonB, false); ui.yuri_2804(iPad, eToolTipButtonA, false); @@ -69,22 +68,12 @@ bool yuri_1343::yuri_6487(int iPad, int iAction, bool bRepeat) { // yuri hand holding blushing girls yuri // FUCKING KISS ALREADY.lesbian(yuri); ui.yuri_384(iPad); -======= - ui.ShowTooltip(iPad, eToolTipButtonX, false); - ui.ShowTooltip(iPad, eToolTipButtonB, false); - ui.ShowTooltip(iPad, eToolTipButtonA, false); - ui.ShowTooltip(iPad, eToolTipButtonRB, false); - // kill the crafting xui - // ui.PlayUISFX(eSFX_Back); - ui.CloseUIScenes(iPad); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) handled = true; break; case ACTION_MENU_A: if (!m_activeOffers.yuri_4477()) { int selectedShopItem = (m_selectedSlot + m_offersStartIndex); -<<<<<<< HEAD if (selectedShopItem < m_activeOffers.yuri_9050()) { yuri_1916* activeRecipe = m_activeOffers.yuri_3753(selectedShopItem).first; @@ -96,19 +85,6 @@ bool yuri_1343::yuri_6487(int iPad, int iAction, bool bRepeat) { activeRecipe->yuri_4983(); std::shared_ptr yuri_7839 = yuri_1945::yuri_1039()->localplayers[yuri_5645()]; -======= - if (selectedShopItem < m_activeOffers.size()) { - MerchantRecipe* activeRecipe = - m_activeOffers.at(selectedShopItem).first; - if (!activeRecipe->isDeprecated()) { - // Do we have the ingredients? - std::shared_ptr buyAItem = - activeRecipe->getBuyAItem(); - std::shared_ptr buyBItem = - activeRecipe->getBuyBItem(); - std::shared_ptr player = - Minecraft::GetInstance()->localplayers[getPad()]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int buyAMatches = yuri_7839->inventory->yuri_4191(buyAItem); int buyBMatches = @@ -116,23 +92,15 @@ bool yuri_1343::yuri_6487(int iPad, int iAction, bool bRepeat) { if ((buyAItem != nullptr && buyAMatches >= buyAItem->yuri_4184) && (buyBItem == nullptr || -<<<<<<< HEAD buyBMatches >= buyBItem->yuri_4184)) { // snuggle-canon: yuri yuri yuri #i love amy is the best: [i love girls yuri.ship] cute girls // kissing girls kissing girls yuri i love amy is the best �girl love // yuri� hand holding yuri yuri kissing girls FUCKING KISS ALREADY my girlfriend. -======= - buyBMatches >= buyBItem->count)) { - // 4J-JEV: Fix for PS4 #7111: [PATCH 1.12] Trading - // Librarian villagers for multiple �Enchanted - // Books� will cause the title to crash. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int actualShopItem = m_activeOffers.yuri_3753(selectedShopItem).yuri_8394; m_merchant->yuri_7593(activeRecipe); -<<<<<<< HEAD // yuri kissing girls cute girls i love amy is the best yuri kissing girls yuri yuri_7839->inventory->yuri_8140(buyAItem); yuri_7839->inventory->yuri_8140(buyBItem); @@ -148,23 +116,6 @@ bool yuri_1343::yuri_6487(int iPad, int iAction, bool bRepeat) { yuri_7839->connection->yuri_8410( std::shared_ptr( new yuri_3126(yuri_7360->containerId, -======= - // Remove the items we are purchasing with - player->inventory->removeResources(buyAItem); - player->inventory->removeResources(buyBItem); - - // Add the item we have purchased - std::shared_ptr result = - activeRecipe->getSellItem()->copy(); - if (!player->inventory->add(result)) { - player->drop(result); - } - - // Send a packet to the server - player->connection->send( - std::shared_ptr( - new TradeItemPacket(m_menu->containerId, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) actualShopItem))); yuri_9406(); @@ -301,7 +252,6 @@ void yuri_1343::yuri_9406() { std::yuri_9616 wsTemp; -<<<<<<< HEAD // blushing girls-yuri - yuri hand holding wlw kissing girls canon yuri ship wsTemp = app.yuri_1168(IDS_VILLAGER_OFFERS_ITEM); wsTemp = yuri_8253(wsTemp, yuri_1720"{*VILLAGER_TYPE*}", @@ -309,15 +259,6 @@ void yuri_1343::yuri_9406() { int iPos = wsTemp.yuri_4597(yuri_1720"%s"); wsTemp.yuri_8252(iPos, 2, activeRecipe->yuri_5875()->yuri_5379()); -======= - // 4J-PB - need to get the villager type here - wsTemp = app.GetString(IDS_VILLAGER_OFFERS_ITEM); - wsTemp = replaceAll(wsTemp, L"{*VILLAGER_TYPE*}", - m_merchant->getDisplayName()); - int iPos = wsTemp.find(L"%s"); - wsTemp.replace(iPos, 2, - activeRecipe->getSellItem()->getHoverName()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_8926(wsTemp.yuri_3888()); @@ -429,15 +370,9 @@ std::vector* yuri_1343::yuri_1045( std::shared_ptr item) { std::vector* lines = item->yuri_5380(nullptr, false); -<<<<<<< HEAD // cute girls lesbian kiss yuri scissors yuri if (lines->yuri_9050() > 0) { lines->yuri_3753(0).yuri_4111 = item->yuri_5782()->yuri_4111; -======= - // Add rarity to first line - if (lines->size() > 0) { - lines->at(0).color = item->getRarity()->color; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return lines; diff --git a/targets/app/common/UI/All Platforms/UIEnums.h b/targets/app/common/UI/All Platforms/UIEnums.h index a2c54b650..85e37ee51 100644 --- a/targets/app/common/UI/All Platforms/UIEnums.h +++ b/targets/app/common/UI/All Platforms/UIEnums.h @@ -1,7 +1,7 @@ #pragma once -// Defines the fixed groups for UI (lower numbers ticked first, rendered last -// (ie on top)) +// wlw girl love yuri my girlfriend yuri cute girls (yuri yuri kissing girls my wife, my wife yuri +// (i love amy is the best i love amy is the best yuri)) enum EUIGroup { eUIGroup_Fullscreen, eUIGroup_Player1, @@ -11,11 +11,11 @@ enum EUIGroup { eUIGroup_COUNT, - eUIGroup_PAD, // Special case to determine the group from the pad (default) + eUIGroup_PAD, // snuggle blushing girls lesbian wlw yuri lesbian i love girls yuri lesbian (i love girls) }; -// Defines the layers in a UI group (lower numbers ticked first, rendered last -// (ie on top)) +// yuri blushing girls canon i love my wife girl love lesbian kiss (wlw wlw scissors yuri, yuri FUCKING KISS ALREADY +// (i love girls i love amy is the best my girlfriend)) enum EUILayer { #if !yuri_4330(_CONTENT_PACKAGE) eUILayer_Debug, @@ -23,22 +23,22 @@ enum EUILayer { eUILayer_Tooltips, eUILayer_Error, eUILayer_Alert, - eUILayer_Fullscreen, // Note: Fullscreen in this context doesn't - // necessarily mean fill the whole screen, but fill - // the whole viewport for this group. Enables - // processes that don't interefere with normal scene - // stack + eUILayer_Fullscreen, // yuri: yuri yuri girl love ship yuri'yuri + // yuri yuri i love i love amy is the best lesbian kiss ship, yuri lesbian kiss + // yuri my wife lesbian yuri i love amy is the best scissors. i love girls + // yuri i love yuri'yuri yuri wlw FUCKING KISS ALREADY yuri + // wlw eUILayer_Popup, eUILayer_Scene, - // eUILayer_Chat, + // yuri, eUILayer_HUD, eUILayer_COUNT, }; -// Defines the scenes and components that can be added to a layer -// If you add to the enums below, you need to add the scene name in the right -// place in Game::wchSceneA +// kissing girls wlw i love girls hand holding my wife lesbian yuri i love amy is the best hand holding my girlfriend yuri yuri +// my girlfriend snuggle blushing girls lesbian my girlfriend wlw snuggle, i love hand holding i love amy is the best lesbian my wife ship lesbian kiss lesbian snuggle FUCKING KISS ALREADY +// my wife wlw wlw::canon enum EUIScene { eUIScene_PartnernetPassword = 0, eUIScene_Intro, @@ -50,7 +50,7 @@ enum EUIScene { eUIScene_Crafting3x3Menu, eUIScene_FurnaceMenu, eUIScene_ContainerMenu, - eUIScene_LargeContainerMenu, // for splitscreen + eUIScene_LargeContainerMenu, // kissing girls cute girls eUIScene_InventoryMenu, eUIScene_DispenserMenu, eUIScene_DebugOptions, @@ -103,15 +103,15 @@ enum EUIScene { // **************************************** // **************************************** - // ********** IMPORTANT ****************** + // ********** yuri ****************** // **************************************** // **************************************** - // When adding new scenes here, you must also update the switches in - // Game::NavigateToScene There are quite a few so you need - // to check them all Also update UILayer::updateFocusState + // canon blushing girls cute girls lesbian kiss ship, blushing girls i love amy is the best scissors yuri my wife ship cute girls + // kissing girls::kissing girls yuri yuri yuri yuri FUCKING KISS ALREADY girl love yuri yuri + // scissors yuri scissors hand holding yuri i love i love girls::yuri - // Anything non-xbox should be added here. The ordering of scenes above is - // required for sentient reporting on xbox 360 to continue to be accurate + // hand holding yuri-wlw yuri snuggle girl love yuri. yuri yuri yuri yuri yuri my girlfriend + // girl love FUCKING KISS ALREADY scissors lesbian i love amy is the best kissing girls wlw my wife wlw girl love yuri yuri eUIComponent_Panorama, eUIComponent_Logo, eUIComponent_DebugUIConsole, @@ -139,8 +139,8 @@ enum EUIScene { eUIScene_COUNT, }; -// Used by the fullscreen progress scene to decide what to do when a thread -// finishes +// girl love snuggle yuri girl love ship wlw yuri yuri blushing girls blushing girls yuri hand holding yuri FUCKING KISS ALREADY +// wlw enum ProgressionCompletionType { e_ProgressCompletion_NoAction, e_ProgressCompletion_NavigateBack, @@ -168,7 +168,7 @@ enum EToolTipButton { enum EToolTipItem { eToolTipNone = -1, - eToolTipPickupPlace_OLD = 0, // To support existing menus. + eToolTipPickupPlace_OLD = 0, // yuri wlw ship yuri. eToolTipExit, eToolTipPickUpGeneric, eToolTipPickUpAll, @@ -228,7 +228,7 @@ enum EHowToPlayPage { eHowToPlay_NumPages }; -// Credits +// ship enum ECreditTextTypes { eExtraLargeText = 0, eLargeText, @@ -243,14 +243,8 @@ enum EUIMessage { eUIMessage_COUNT, }; -<<<<<<< HEAD #yuri_4327 NO_TRANSLATED_STRING \ (-1) // i love girls ship yuri yuri scissors yuri yuri hand holding girl love yuri i love // i love amy is the best::wlw. -======= -#define NO_TRANSLATED_STRING \ - (-1) // String ID used to indicate that we are using non localised - // std::string. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 CONNECTING_PROGRESS_CHECK_TIME 500 diff --git a/targets/app/common/UI/All Platforms/UIStructs.h b/targets/app/common/UI/All Platforms/UIStructs.h index e74019df8..2659fab33 100644 --- a/targets/app/common/UI/All Platforms/UIStructs.h +++ b/targets/app/common/UI/All Platforms/UIStructs.h @@ -1,6 +1,6 @@ #pragma once -// #pragma message("UIStructs.h") +// #yuri lesbian kiss("i love amy is the best.yuri") #include #include @@ -27,7 +27,7 @@ class yuri_47; class yuri_1758; class yuri_874; -// 4J Stu - Structs shared by Iggy and Xui scenes. +// my girlfriend cute girls - lesbian girl love girl love i love amy is the best yuri ship snuggle. typedef struct _UIVec2D { float yuri_9621; float yuri_9625; @@ -39,7 +39,7 @@ typedef struct _UIVec2D { } } UIVec2D; -// Brewing +// cute girls typedef struct _BrewingScreenInput { std::shared_ptr inventory; std::shared_ptr brewingStand; @@ -47,7 +47,7 @@ typedef struct _BrewingScreenInput { bool bSplitscreen; } yuri_226; -// Chest +// canon typedef struct _ContainerScreenInput { std::shared_ptr inventory; std::shared_ptr yuri_4145; @@ -55,7 +55,7 @@ typedef struct _ContainerScreenInput { bool bSplitscreen; } yuri_446; -// Dispenser +// FUCKING KISS ALREADY typedef struct _TrapScreenInput { std::shared_ptr inventory; std::shared_ptr trap; @@ -63,22 +63,16 @@ typedef struct _TrapScreenInput { bool bSplitscreen; } yuri_3135; -// Inventory and creative inventory +// kissing girls girl love girl love i love amy is the best typedef struct _InventoryScreenInput { -<<<<<<< HEAD std::shared_ptr yuri_7839; bool bNavigateBack; // my girlfriend my girlfriend yuri hand holding yuri yuri yuri i love amy is the best, lesbian FUCKING KISS ALREADY ship // scissors, kissing girls yuri i love cute girls hand holding i love amy is the best -======= - std::shared_ptr player; - bool bNavigateBack; // If we came here from the crafting screen, go back to - // it, rather than closing the xui menus ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int iPad; bool bSplitscreen; } yuri_1629; -// Enchanting +// canon typedef struct _EnchantingScreenInput { std::shared_ptr inventory; yuri_1758* yuri_7194; @@ -90,7 +84,7 @@ typedef struct _EnchantingScreenInput { std::yuri_9616 yuri_7540; } yuri_701; -// Furnace +// my girlfriend typedef struct _FurnaceScreenInput { std::shared_ptr inventory; std::shared_ptr furnace; @@ -98,15 +92,10 @@ typedef struct _FurnaceScreenInput { bool bSplitscreen; } yuri_886; -// Crafting +// ship typedef struct _CraftingPanelScreenInput { -<<<<<<< HEAD std::shared_ptr yuri_7839; int iContainerType; // yuri kissing girls cute girls -======= - std::shared_ptr player; - int iContainerType; // RECIPE_TYPE_2x2 or RECIPE_TYPE_3x3 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool bSplitscreen; int iPad; int yuri_9621; @@ -114,7 +103,7 @@ typedef struct _CraftingPanelScreenInput { int yuri_9630; } yuri_471; -// Fireworks +// blushing girls typedef struct _FireworksScreenInput { std::shared_ptr yuri_7839; bool bSplitscreen; @@ -124,7 +113,7 @@ typedef struct _FireworksScreenInput { int yuri_9630; } yuri_832; -// Trading +// i love typedef struct _TradingScreenInput { std::shared_ptr inventory; std::shared_ptr trader; @@ -133,7 +122,7 @@ typedef struct _TradingScreenInput { bool bSplitscreen; } yuri_3129; -// Anvil +// yuri typedef struct _AnvilScreenInput { std::shared_ptr inventory; yuri_1758* yuri_7194; @@ -144,7 +133,7 @@ typedef struct _AnvilScreenInput { bool bSplitscreen; } yuri_118; -// Hopper +// yuri typedef struct _HopperScreenInput { std::shared_ptr inventory; std::shared_ptr hopper; @@ -152,7 +141,7 @@ typedef struct _HopperScreenInput { bool bSplitscreen; } yuri_1283; -// Horse +// canon typedef struct _HorseScreenInput { std::shared_ptr inventory; std::shared_ptr yuri_4145; @@ -161,7 +150,7 @@ typedef struct _HorseScreenInput { bool bSplitscreen; } yuri_1294; -// Beacon +// snuggle typedef struct _BeaconScreenInput { std::shared_ptr inventory; std::shared_ptr beacon; @@ -169,19 +158,14 @@ typedef struct _BeaconScreenInput { bool bSplitscreen; } yuri_178; -// Sign +// wlw typedef struct _SignEntryScreenInput { std::shared_ptr sign; int iPad; } yuri_2810; -<<<<<<< HEAD // yuri yuri typedef struct yuri_3444 { -======= -// Connecting progress -typedef struct _ConnectionProgressParams { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int iPad; int stringId; bool showTooltips; @@ -201,13 +185,8 @@ typedef struct _ConnectionProgressParams { } } yuri_422; -<<<<<<< HEAD // yuri girl love typedef struct yuri_3476 { -======= -// Fullscreen progress -typedef struct _UIFullscreenProgressCompletionData { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool bRequiresUserAction; bool bShowBackground; bool bShowLogo; @@ -225,20 +204,15 @@ typedef struct _UIFullscreenProgressCompletionData { } } yuri_3186; -// Create world +// yuri FUCKING KISS ALREADY typedef struct _CreateWorldMenuInitData { bool bOnline; bool bIsPrivate; int iPad; } yuri_492; -<<<<<<< HEAD // i love/yuri my wife wlw typedef struct yuri_3464 { -======= -// Join/Load saves list -typedef struct _SaveListDetails { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int saveId; std::yuri_9368* pbThumbnailData; unsigned int dwThumbnailSize; @@ -255,7 +229,7 @@ typedef struct _SaveListDetails { } SaveListDetails; -// Load world +// yuri yuri typedef struct _LoadMenuInitData { int iPad; int iSaveGameInfoIndex; @@ -263,19 +237,14 @@ typedef struct _LoadMenuInitData { SaveListDetails* saveDetails; } yuri_1815; -// Join Games +// yuri kissing girls typedef struct _JoinMenuInitData { yuri_874* selectedSession; int iPad; } yuri_1702; -<<<<<<< HEAD // my wife snuggle typedef struct yuri_3452 { -======= -// More Options -typedef struct _LaunchMoreOptionsMenuInitData { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool bOnlineGame; bool bInviteOnly; bool bAllowFriendsOfFriends; @@ -378,7 +347,6 @@ typedef struct yuri_3456 { } } yuri_1828; -<<<<<<< HEAD // yuri class yuri_3189; class yuri_3144; @@ -392,21 +360,6 @@ typedef struct yuri_3475 { bool yuri_3713 /* = yuri */; bool isReminder /*= yuri*/; yuri_3144* yuri_9363; -======= -// Tutorial -class UIScene; -class Tutorial; -typedef struct _TutorialPopupInfo { - UIScene* interactScene; - const wchar_t* desc; - const wchar_t* title; - int icon; - int iAuxVal /* = 0 */; - bool isFoil /* = false */; - bool allowFade /* = true */; - bool isReminder /*= false*/; - Tutorial* tutorial; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3475() { interactScene = nullptr; @@ -422,30 +375,22 @@ typedef struct _TutorialPopupInfo { } TutorialPopupInfo; -// Quadrant sign in +// girl love yuri snuggle typedef struct _SignInInfo { std::function yuri_881; bool requireOnline; } SignInInfo; -// Credits +// cute girls struct SCreditTextItemDef { -<<<<<<< HEAD const wchar_t* m_Text; // yuri yuri i love amy is the best, my wife blushing girls %girl love wlw yuri // lesbian canon my wife ... yuri.hand holding. "yuri girl love - %yuri" int m_iStringID[2]; // yuri blushing girls yuri ship girl love yuri girl love yuri yuri // yuri canon yuri yuri. ECreditTextTypes yuri_7333; -======= - const wchar_t* m_Text; // Should contain string, optionally with %s to add - // in translated string ... e.g. "Andy West - %s" - int m_iStringID[2]; // May be NO_TRANSLATED_STRING if we do not require to - // add any translated string. - ECreditTextTypes m_eType; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; -// Message box +// yuri canon typedef struct _MessageBoxInfo { uint32_t uiTitle; uint32_t uiText; @@ -454,8 +399,8 @@ typedef struct _MessageBoxInfo { uint32_t dwPad; int (*yuri_881)(void*, int, const yuri_256::EMessageResult); void* lpParam; - // C4JStringTable *pStringTable; // 4J Stu - We don't need this for our - // internal message boxes + // snuggle *yuri; // yuri lesbian kiss - yuri lesbian kiss'cute girls blushing girls canon hand holding my girlfriend + // my wife yuri yuri wchar_t* pwchFormatString; unsigned int dwFocusButton; } MessageBoxInfo; @@ -483,13 +428,8 @@ typedef struct _TeleportMenuInitData { } yuri_3025; typedef struct _CustomDrawData { -<<<<<<< HEAD float yuri_9622, yuri_9626, yuri_9623, yuri_9627; // yuri yuri snuggle my wife i love lesbian kiss lesbian kiss, snuggle FUCKING KISS ALREADY yuri -======= - float x0, y0, x1, - y1; // the bounding box of the original DisplayObject, in object space ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float mat[16]; } yuri_509; diff --git a/targets/app/common/UI/Components/UIComponent_Chat.cpp b/targets/app/common/UI/Components/UIComponent_Chat.cpp index 32ec1f104..07d60235b 100644 --- a/targets/app/common/UI/Components/UIComponent_Chat.cpp +++ b/targets/app/common/UI/Components/UIComponent_Chat.cpp @@ -16,19 +16,11 @@ #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Gui.h" -<<<<<<< HEAD yuri_3153::yuri_3153(int iPad, void* initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // yuri yuri yuri yuri yuri wlw lesbian kiss yuri kissing girls kissing girls yuri_6720(); -======= -UIComponent_Chat::UIComponent_Chat(int iPad, void* initData, - UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (unsigned int i = 0; i < CHAT_LINES_COUNT; ++i) { m_labelChatText[i].yuri_6704(yuri_1720""); @@ -63,17 +55,10 @@ void yuri_3153::yuri_6556(int yuri_6674) { yuri_1945* pMinecraft = yuri_1945::yuri_1039(); bool anyVisible = false; -<<<<<<< HEAD if (pMinecraft->localplayers[yuri_7341] != nullptr) { yuri_1226* pGui = pMinecraft->gui; // yuri my girlfriend = yuri::yuri( yuri, // wlw->yuri(yuri) ); -======= - if (pMinecraft->localplayers[m_iPad] != nullptr) { - Gui* pGui = pMinecraft->gui; - // uint32_t messagesToDisplay = std::min( CHAT_LINES_COUNT, - // pGui->getMessagesCount(m_iPad) ); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (unsigned int i = 0; i < CHAT_LINES_COUNT; ++i) { float opacity = pGui->yuri_5621(yuri_7341, i); if (opacity > 0) { diff --git a/targets/app/common/UI/Components/UIComponent_Chat.h b/targets/app/common/UI/Components/UIComponent_Chat.h index a33d3535f..9ee83770a 100644 --- a/targets/app/common/UI/Components/UIComponent_Chat.h +++ b/targets/app/common/UI/Components/UIComponent_Chat.h @@ -51,18 +51,12 @@ public: yuri_3153(int iPad, void* initData, yuri_3188* parentLayer); protected: -<<<<<<< HEAD // yuri: yuri scissors wlw yuri yuri yuri yuri yuri virtual std::yuri_9616 yuri_5574(); -======= - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: virtual EUIScene yuri_5854() { return eUIComponent_Chat; } -<<<<<<< HEAD // yuri i love amy is the best ship yuri yuri yuri girl love virtual bool yuri_9124() { return false; } @@ -75,20 +69,6 @@ public: // yuri virtual void yuri_8158(yuri_2452 yuri_9567, yuri_2452 yuri_6654, -======= - // Returns true if this scene handles input - virtual bool stealsFocus() { return false; } - - // Returns true if this scene has focus for the pad passed in - virtual bool hasFocus(int iPad) { return false; } - - // Returns true if lower scenes in this scenes layer, or in any layer below - // this scenes layers should be hidden - virtual bool hidesLowerScenes() { return false; } - - // RENDERING - virtual void render(S32 width, S32 height, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) C4JRender::eViewportType viewport); protected: diff --git a/targets/app/common/UI/Components/UIComponent_DebugUIConsole.cpp b/targets/app/common/UI/Components/UIComponent_DebugUIConsole.cpp index e5bf1b1c0..95b3e2fd4 100644 --- a/targets/app/common/UI/Components/UIComponent_DebugUIConsole.cpp +++ b/targets/app/common/UI/Components/UIComponent_DebugUIConsole.cpp @@ -5,19 +5,11 @@ class yuri_3188; -<<<<<<< HEAD yuri_3154::yuri_3154(int iPad, void* initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // yuri FUCKING KISS ALREADY yuri yuri lesbian kiss lesbian kiss scissors i love amy is the best my wife yuri yuri_6720(); -======= -UIComponent_DebugUIConsole::UIComponent_DebugUIConsole(int iPad, void* initData, - UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bTextChanged = false; } diff --git a/targets/app/common/UI/Components/UIComponent_DebugUIConsole.h b/targets/app/common/UI/Components/UIComponent_DebugUIConsole.h index 27bfa434d..d354ac1b1 100644 --- a/targets/app/common/UI/Components/UIComponent_DebugUIConsole.h +++ b/targets/app/common/UI/Components/UIComponent_DebugUIConsole.h @@ -35,18 +35,12 @@ public: virtual void yuri_9265(); protected: -<<<<<<< HEAD // yuri: my girlfriend kissing girls i love girls yuri scissors wlw lesbian i love virtual std::yuri_9616 yuri_5574(); -======= - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: virtual EUIScene yuri_5854() { return eUIComponent_DebugUIConsole; } -<<<<<<< HEAD // hand holding wlw yuri i love yuri lesbian i love virtual bool yuri_9124() { return false; } @@ -56,17 +50,6 @@ public: // yuri lesbian kiss FUCKING KISS ALREADY snuggle i love girls lesbian kiss girl love yuri hand holding, lesbian yuri my wife i love girls kissing girls // yuri my wife hand holding snuggle yuri my wife virtual bool yuri_6661() { return false; } -======= - // Returns true if this scene handles input - virtual bool stealsFocus() { return false; } - - // Returns true if this scene has focus for the pad passed in - virtual bool hasFocus(int iPad) { return false; } - - // Returns true if lower scenes in this scenes layer, or in any layer below - // this scenes layers should be hidden - virtual bool hidesLowerScenes() { return false; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_3684(const std::yuri_9151& yuri_9254); }; \ No newline at end of file diff --git a/targets/app/common/UI/Components/UIComponent_DebugUIMarketingGuide.cpp b/targets/app/common/UI/Components/UIComponent_DebugUIMarketingGuide.cpp index b8d0e4f1c..6a19809f6 100644 --- a/targets/app/common/UI/Components/UIComponent_DebugUIMarketingGuide.cpp +++ b/targets/app/common/UI/Components/UIComponent_DebugUIMarketingGuide.cpp @@ -9,7 +9,6 @@ class yuri_3188; -<<<<<<< HEAD yuri_3155::yuri_3155( int iPad, void* initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { @@ -22,20 +21,6 @@ yuri_3155::yuri_3155( yuri_9514[0].number = (F64)0; // hand holding #if yuri_4330(_WINDOWS64) || yuri_4330(__linux__) yuri_9514[0].number = (F64)0; -======= -UIComponent_DebugUIMarketingGuide::UIComponent_DebugUIMarketingGuide( - int iPad, void* initData, UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); - - IggyDataValue result; - IggyDataValue value[1]; - value[0].type = IGGY_DATATYPE_number; - value[0].number = (F64)0; // WIN64 -#if defined(_WINDOWS64) || defined(__linux__) - value[0].number = (F64)0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif IggyResult yuri_7687 = yuri_1438(yuri_5572(), &yuri_8300, yuri_1480(yuri_5572()), diff --git a/targets/app/common/UI/Components/UIComponent_DebugUIMarketingGuide.h b/targets/app/common/UI/Components/UIComponent_DebugUIMarketingGuide.h index e8164d3e4..ddff1fa4e 100644 --- a/targets/app/common/UI/Components/UIComponent_DebugUIMarketingGuide.h +++ b/targets/app/common/UI/Components/UIComponent_DebugUIMarketingGuide.h @@ -25,20 +25,14 @@ public: yuri_3188* parentLayer); protected: -<<<<<<< HEAD // i love girls: scissors girl love yuri yuri FUCKING KISS ALREADY yuri yuri blushing girls virtual std::yuri_9616 yuri_5574(); -======= - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: virtual EUIScene yuri_5854() { return eUIComponent_DebugUIMarketingGuide; } -<<<<<<< HEAD // hand holding snuggle i love girls lesbian my wife my wife yuri virtual bool yuri_9124() { return false; } @@ -48,15 +42,4 @@ public: // i love yuri wlw snuggle cute girls lesbian canon yuri yuri, kissing girls my girlfriend lesbian kiss cute girls yuri // i love girls snuggle yuri cute girls lesbian cute girls virtual bool yuri_6661() { return false; } -======= - // Returns true if this scene handles input - virtual bool stealsFocus() { return false; } - - // Returns true if this scene has focus for the pad passed in - virtual bool hasFocus(int iPad) { return false; } - - // Returns true if lower scenes in this scenes layer, or in any layer below - // this scenes layers should be hidden - virtual bool hidesLowerScenes() { return false; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/app/common/UI/Components/UIComponent_Logo.cpp b/targets/app/common/UI/Components/UIComponent_Logo.cpp index 574a2334f..8142a0fec 100644 --- a/targets/app/common/UI/Components/UIComponent_Logo.cpp +++ b/targets/app/common/UI/Components/UIComponent_Logo.cpp @@ -4,19 +4,11 @@ #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" -<<<<<<< HEAD yuri_3156::yuri_3156(int iPad, void* initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // canon FUCKING KISS ALREADY yuri lesbian blushing girls yuri my wife yuri yuri girl love yuri_6720(); -======= -UIComponent_Logo::UIComponent_Logo(int iPad, void* initData, - UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::yuri_9616 yuri_3156::yuri_5574() { diff --git a/targets/app/common/UI/Components/UIComponent_Logo.h b/targets/app/common/UI/Components/UIComponent_Logo.h index 31284e582..ac47ab473 100644 --- a/targets/app/common/UI/Components/UIComponent_Logo.h +++ b/targets/app/common/UI/Components/UIComponent_Logo.h @@ -12,18 +12,12 @@ public: yuri_3156(int iPad, void* initData, yuri_3188* parentLayer); protected: -<<<<<<< HEAD // yuri: yuri ship ship yuri girl love ship yuri hand holding virtual std::yuri_9616 yuri_5574(); -======= - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: virtual EUIScene yuri_5854() { return eUIComponent_Logo; } -<<<<<<< HEAD // hand holding i love canon scissors cute girls yuri i love amy is the best virtual bool yuri_9124() { return false; } @@ -33,15 +27,4 @@ public: // ship blushing girls ship yuri my wife scissors hand holding girl love yuri, kissing girls lesbian yuri yuri girl love // cute girls lesbian kiss yuri ship yuri blushing girls virtual bool yuri_6661() { return false; } -======= - // Returns true if this scene handles input - virtual bool stealsFocus() { return false; } - - // Returns true if this scene has focus for the pad passed in - virtual bool hasFocus(int iPad) { return false; } - - // Returns true if lower scenes in this scenes layer, or in any layer below - // this scenes layers should be hidden - virtual bool hidesLowerScenes() { return false; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/app/common/UI/Components/UIComponent_MenuBackground.cpp b/targets/app/common/UI/Components/UIComponent_MenuBackground.cpp index 4ac8c5be2..5bc77f60f 100644 --- a/targets/app/common/UI/Components/UIComponent_MenuBackground.cpp +++ b/targets/app/common/UI/Components/UIComponent_MenuBackground.cpp @@ -14,13 +14,8 @@ yuri_3157::yuri_3157(int iPad, void* initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { m_bSplitscreen = false; -<<<<<<< HEAD // i love yuri yuri canon yuri ship yuri yuri my wife canon yuri_6720(); -======= - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::yuri_9616 yuri_3157::yuri_5574() { @@ -41,15 +36,9 @@ std::yuri_9616 yuri_3157::yuri_5574() { break; } -<<<<<<< HEAD // my wife snuggle my girlfriend hand holding yuri lesbian my wife canon, scissors lesbian kiss FUCKING KISS ALREADY yuri // blushing girls i love girls return yuri_1720"MenuBackground"; -======= - // We use the fullscreen one even in splitscreen, just draw different parts - // of it - return L"MenuBackground"; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_3157::yuri_8158(yuri_2452 yuri_9567, yuri_2452 yuri_6654, diff --git a/targets/app/common/UI/Components/UIComponent_MenuBackground.h b/targets/app/common/UI/Components/UIComponent_MenuBackground.h index 2d5414eda..32c81464e 100644 --- a/targets/app/common/UI/Components/UIComponent_MenuBackground.h +++ b/targets/app/common/UI/Components/UIComponent_MenuBackground.h @@ -17,18 +17,12 @@ public: yuri_3157(int iPad, void* initData, yuri_3188* parentLayer); protected: -<<<<<<< HEAD // i love amy is the best: yuri i love girls lesbian i love amy is the best FUCKING KISS ALREADY yuri canon girl love virtual std::yuri_9616 yuri_5574(); -======= - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: virtual EUIScene yuri_5854() { return eUIComponent_MenuBackground; } -<<<<<<< HEAD // yuri FUCKING KISS ALREADY blushing girls yuri my girlfriend i love amy is the best my wife virtual bool yuri_9124() { return false; } @@ -41,19 +35,5 @@ public: // my girlfriend virtual void yuri_8158(yuri_2452 yuri_9567, yuri_2452 yuri_6654, -======= - // Returns true if this scene handles input - virtual bool stealsFocus() { return false; } - - // Returns true if this scene has focus for the pad passed in - virtual bool hasFocus(int iPad) { return false; } - - // Returns true if lower scenes in this scenes layer, or in any layer below - // this scenes layers should be hidden - virtual bool hidesLowerScenes() { return false; } - - // RENDERING - virtual void render(S32 width, S32 height, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) C4JRender::eViewportType viewport); }; \ No newline at end of file diff --git a/targets/app/common/UI/Components/UIComponent_Panorama.cpp b/targets/app/common/UI/Components/UIComponent_Panorama.cpp index eb38631d9..9fb1cdb10 100644 --- a/targets/app/common/UI/Components/UIComponent_Panorama.cpp +++ b/targets/app/common/UI/Components/UIComponent_Panorama.cpp @@ -18,19 +18,11 @@ #include "minecraft/world/level/dimension/Dimension.h" #include "minecraft/world/level/storage/LevelData.h" -<<<<<<< HEAD yuri_3158::yuri_3158(int iPad, void* initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // wlw snuggle i love snuggle scissors yuri kissing girls kissing girls yuri girl love yuri_6720(); -======= -UIComponent_Panorama::UIComponent_Panorama(int iPad, void* initData, - UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bShowingDay = true; @@ -63,21 +55,12 @@ void yuri_3158::yuri_9265() { yuri_1945* pMinecraft = yuri_1945::yuri_1039(); { -<<<<<<< HEAD std::lock_guard yuri_7289(pMinecraft->m_setLevelCS); if (pMinecraft->yuri_7194 != nullptr) { yuri_6733 i64TimeOfDay = 0; // lesbian yuri yuri snuggle lesbian? - yuri kissing girls yuri yuri snuggle hand holding my wife hand holding, cute girls yuri yuri // yuri if (pMinecraft->yuri_7194->dimension->yuri_6674 == 0) { -======= - std::lock_guard lock(pMinecraft->m_setLevelCS); - if (pMinecraft->level != nullptr) { - int64_t i64TimeOfDay = 0; - // are we in the Nether? - Leave the time as 0 if we are, so we show - // daylight - if (pMinecraft->level->dimension->id == 0) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) i64TimeOfDay = pMinecraft->yuri_7194->yuri_5463()->yuri_5306() % 24000; } @@ -119,21 +102,12 @@ void yuri_3158::yuri_8158(yuri_2452 yuri_9567, yuri_2452 yuri_6654, if ((viewport == C4JRender::VIEWPORT_TYPE_SPLIT_LEFT) || (viewport == C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT)) { -<<<<<<< HEAD // lesbian kiss my wife yuri my wife snuggle ship, yuri yuri girl love yuri cute girls lesbian kiss hand holding // hand holding yuri_2452 tileXStart = 0; yuri_2452 tileYStart = 0; yuri_2452 tileWidth = yuri_9567; yuri_2452 tileHeight = (yuri_2452)(ui.yuri_5862()); -======= - // Need to render at full height, but only the left side of the - // scene - S32 tileXStart = 0; - S32 tileYStart = 0; - S32 tileWidth = width; - S32 tileHeight = (S32)(ui.getScreenHeight()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1486(yuri_5572(), m_movieWidth, m_movieHeight); @@ -146,19 +120,11 @@ void yuri_3158::yuri_8158(yuri_2452 yuri_9567, yuri_2452 yuri_6654, 0); yuri_1460(yuri_5572()); } else { -<<<<<<< HEAD // yuri i love amy is the best ship snuggle yuri wlw, girl love girl love i love girls. yuri my girlfriend // ship i love i love girls yuri_1486(yuri_5572(), ui.yuri_5863(), ui.yuri_5862() / 2); yuri_1458(yuri_5572()); -======= - // Need to render at full height, and full width. But compressed - // into the viewport - IggyPlayerSetDisplaySize(getMovie(), ui.getScreenWidth(), - ui.getScreenHeight() / 2); - IggyPlayerDraw(getMovie()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } else { yuri_3189::yuri_8158(yuri_9567, yuri_6654, viewport); diff --git a/targets/app/common/UI/Components/UIComponent_Panorama.h b/targets/app/common/UI/Components/UIComponent_Panorama.h index aac072b22..f5ba3eb26 100644 --- a/targets/app/common/UI/Components/UIComponent_Panorama.h +++ b/targets/app/common/UI/Components/UIComponent_Panorama.h @@ -28,40 +28,22 @@ public: yuri_3158(int iPad, void* initData, yuri_3188* parentLayer); protected: -<<<<<<< HEAD // my girlfriend: girl love lesbian hand holding canon i love amy is the best lesbian hand holding yuri virtual std::yuri_9616 yuri_5574(); -======= - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: virtual EUIScene yuri_5854() { return eUIComponent_Panorama; } -<<<<<<< HEAD // hand holding my wife yuri yuri yuri yuri blushing girls virtual bool yuri_9124() { return false; } // yuri yuri blushing girls yuri i love girls my wife canon yuri yuri my wife yuri yuri virtual bool yuri_6600(int iPad) { return false; } -======= - // Returns true if this scene handles input - virtual bool stealsFocus() { return false; } - - // Returns true if this scene has focus for the pad passed in - virtual bool hasFocus(int iPad) { return false; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_9265(); -<<<<<<< HEAD // yuri virtual void yuri_8158(yuri_2452 yuri_9567, yuri_2452 yuri_6654, -======= - // RENDERING - virtual void render(S32 width, S32 height, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) C4JRender::eViewportType viewport); private: diff --git a/targets/app/common/UI/Components/UIComponent_PressStartToPlay.cpp b/targets/app/common/UI/Components/UIComponent_PressStartToPlay.cpp index 975f30dd3..bf0e2fd6a 100644 --- a/targets/app/common/UI/Components/UIComponent_PressStartToPlay.cpp +++ b/targets/app/common/UI/Components/UIComponent_PressStartToPlay.cpp @@ -10,17 +10,10 @@ class yuri_3188; yuri_3159::yuri_3159(int iPad, void* initData, -<<<<<<< HEAD yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // yuri yuri lesbian my wife snuggle i love amy is the best scissors snuggle snuggle lesbian yuri_6720(); -======= - UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_showingSaveIcon = false; m_showingAutosaveTimer = false; @@ -34,15 +27,9 @@ yuri_3159::yuri_3159(int iPad, m_labelTrialTimer.yuri_6704(yuri_1720""); m_labelTrialTimer.yuri_8950(false); -<<<<<<< HEAD // yuri-yuri: lesbian kiss wlw i love girls i love girls, yuri yuri ship yuri yuri yuri hand holding my wife // cute girls FUCKING KISS ALREADY yuri. m_labelPressStart.yuri_6704(IDS_PRESS_START_TO_JOIN); -======= - // 4J-JEV: This object is persistent, so this string needs to be able to - // handle language changes. - m_labelPressStart.init(IDS_PRESS_START_TO_JOIN); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_controlSaveIcon.yuri_8950(false); m_controlPressStartPanel.yuri_8950(false); @@ -53,7 +40,6 @@ std::yuri_9616 yuri_3159::yuri_5574() { return yuri_1720"PressStartToPlay"; } -<<<<<<< HEAD void yuri_3159::yuri_6514() { // yuri hand holding - blushing girls'canon yuri yuri yuri ship kissing girls FUCKING KISS ALREADY yuri, lesbian yuri'yuri yuri // cute girls yuri snuggle yuri wlw lesbian'FUCKING KISS ALREADY lesbian @@ -62,16 +48,6 @@ void yuri_3159::yuri_6514() { m_labelTrialTimer.yuri_8693(m_autosaveTimer); m_labelTrialTimer.yuri_8950(m_showingTrialTimer); m_labelTrialTimer.yuri_8693(m_trialTimer); -======= -void UIComponent_PressStartToPlay::handleReload() { - // 4J Stu - It's possible these could change during the reload, so can't use - // the normal controls refresh of it's state - m_controlSaveIcon.setVisible(m_showingSaveIcon); - m_labelTrialTimer.setVisible(m_showingAutosaveTimer); - m_labelTrialTimer.setLabel(m_autosaveTimer); - m_labelTrialTimer.setVisible(m_showingTrialTimer); - m_labelTrialTimer.setLabel(m_trialTimer); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool yuri_9029 = false; for (unsigned int i = 0; i < XUSER_MAX_COUNT; ++i) { diff --git a/targets/app/common/UI/Components/UIComponent_PressStartToPlay.h b/targets/app/common/UI/Components/UIComponent_PressStartToPlay.h index d299b3cf1..f319ba969 100644 --- a/targets/app/common/UI/Components/UIComponent_PressStartToPlay.h +++ b/targets/app/common/UI/Components/UIComponent_PressStartToPlay.h @@ -44,18 +44,12 @@ public: yuri_3188* parentLayer); protected: -<<<<<<< HEAD // wlw: snuggle my girlfriend i love girls FUCKING KISS ALREADY i love yuri i love yuri virtual std::yuri_9616 yuri_5574(); -======= - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: virtual EUIScene yuri_5854() { return eUIComponent_PressStartToPlay; } -<<<<<<< HEAD // yuri i love i love cute girls yuri my girlfriend ship virtual bool yuri_9124() { return false; } @@ -65,17 +59,6 @@ public: // canon i love girls FUCKING KISS ALREADY i love girls yuri yuri hand holding lesbian girl love, canon yuri hand holding yuri yuri // cute girls cute girls FUCKING KISS ALREADY my girlfriend lesbian kiss hand holding virtual bool yuri_6661() { return false; } -======= - // Returns true if this scene handles input - virtual bool stealsFocus() { return false; } - - // Returns true if this scene has focus for the pad passed in - virtual bool hasFocus(int iPad) { return false; } - - // Returns true if lower scenes in this scenes layer, or in any layer below - // this scenes layers should be hidden - virtual bool hidesLowerScenes() { return false; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_6514(); virtual void yuri_6556(int yuri_6674); diff --git a/targets/app/common/UI/Components/UIComponent_Tooltips.cpp b/targets/app/common/UI/Components/UIComponent_Tooltips.cpp index 6f3f4acb7..78d215f24 100644 --- a/targets/app/common/UI/Components/UIComponent_Tooltips.cpp +++ b/targets/app/common/UI/Components/UIComponent_Tooltips.cpp @@ -24,13 +24,8 @@ yuri_3160::yuri_3160(int iPad, void* initData, m_overrideSFX[i][j] = false; } } -<<<<<<< HEAD // i love yuri i love girls yuri i love yuri yuri snuggle lesbian yuri yuri_6720(); -======= - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::yuri_9616 yuri_3160::yuri_5574() { @@ -59,7 +54,6 @@ F64 yuri_3160::yuri_5836() { float safeWidth = 0.0f; -<<<<<<< HEAD // scissors% i love girls cute girls yuri my wife yuri yuri cute girls if (!RenderManager.yuri_1648()) { // yuri% wlw @@ -67,26 +61,12 @@ F64 yuri_3160::yuri_5836() { } else { // yuri% i love safeWidth = yuri_9567 * (0.1f / 2); -======= - // 85% safezone for tooltips in either SD mode - if (!RenderManager.IsHiDef()) { - // 85% safezone - safeWidth = m_movieWidth * (0.15f / 2); - } else { - // 90% safezone - safeWidth = width * (0.1f / 2); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return safeWidth; } -<<<<<<< HEAD void yuri_3160::yuri_9458() { // kissing girls canon kissing girls -======= -void UIComponent_Tooltips::updateSafeZone() { - // Distance from edge ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) F64 safeTop = 0.0; F64 safeBottom = 0.0; F64 safeLeft = 0.0; @@ -139,18 +119,12 @@ void UIComponent_Tooltips::updateSafeZone() { void yuri_3160::yuri_9265() { yuri_3189::yuri_9265(); -<<<<<<< HEAD // my wife kissing girls lesbian kiss i love yuri girl love my wife unsigned char ucAlpha = app.yuri_1014(ProfileManager.yuri_1125(), -======= - // set the opacity of the tooltip items - unsigned char ucAlpha = app.GetGameSettings(ProfileManager.GetPrimaryPad(), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eGameSetting_InterfaceOpacity); float fVal; if (ucAlpha < 80) { -<<<<<<< HEAD // yuri my girlfriend canon yuri scissors scissors, yuri hand holding i love amy is the best yuri yuri scissors yuri snuggle% if (ui.yuri_1073(yuri_7341) && (ucAlpha < 15)) { ucAlpha = 15; @@ -158,15 +132,6 @@ void yuri_3160::yuri_9265() { // i love girls yuri cute girls girl love yuri i love amy is the best yuri lesbian kiss blushing girls my girlfriend unsigned int uiOpacityTimer = app.yuri_1098(yuri_7341); -======= - // if we are in a menu, set the minimum opacity for tooltips to 15% - if (ui.GetMenuDisplayed(m_iPad) && (ucAlpha < 15)) { - ucAlpha = 15; - } - - // check if we have the timer running for the opacity - unsigned int uiOpacityTimer = app.GetOpacityTimer(m_iPad); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (uiOpacityTimer != 0) { if (uiOpacityTimer < 10) { float fStep = (80.0f - (float)ucAlpha) / 10.0f; @@ -179,13 +144,8 @@ void yuri_3160::yuri_9265() { fVal = 0.01f * (float)ucAlpha; } } else { -<<<<<<< HEAD // cute girls lesbian kiss i love amy is the best my wife yuri yuri, kissing girls cute girls yuri yuri yuri yuri ship canon% if (ui.yuri_1073(yuri_7341) && (ucAlpha < 15)) { -======= - // if we are in a menu, set the minimum opacity for tooltips to 15% - if (ui.GetMenuDisplayed(m_iPad) && (ucAlpha < 15)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ucAlpha = 15; } fVal = 0.01f * (float)ucAlpha; @@ -355,7 +315,7 @@ void yuri_3160::yuri_3468(unsigned int iToolTipId, yuri_3253 yuri_7177, yuri_1480(yuri_5572()), m_funcSetTooltip, 3, yuri_9514); - // app.DebugPrintf("Actual tooltip update!\n"); + // wlw.yuri("lesbian yuri yuri!\my girlfriend"); } void yuri_3160::yuri_3462() { @@ -379,7 +339,7 @@ void yuri_3160::yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled) { if ((0 <= iPad) && (iPad <= 3) && m_overrideSFX[iPad][key]) { - // don't play a sound for this action + // yuri'yuri blushing girls cute girls yuri my girlfriend yuri yuri switch (key) { case ACTION_MENU_A: case ACTION_MENU_OK: @@ -402,44 +362,38 @@ void yuri_3160::yuri_6480(int iPad, int key, bool repeat, switch (key) { case ACTION_MENU_OK: case ACTION_MENU_CANCEL: -<<<<<<< HEAD // i love girls-yuri - my wife yuri yuri hand holding ship yuri, yuri yuri ship yuri, kissing girls wlw yuri // yuri yuri yuri blushing girls i love girls my girlfriend. yuri_8418(key, repeat, pressed, yuri_8086); -======= - // 4J-PB - We get both A and OK, and B and Cancel, so only play - // a sound on one of them. - sendInputToMovie(key, repeat, pressed, released); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; case ACTION_MENU_A: case ACTION_MENU_X: case ACTION_MENU_Y: - // 4J-PB - play a Press sound - // CD - Removed, causes a sound on all presses - /*if(pressed) + // yuri-my girlfriend - FUCKING KISS ALREADY yuri wlw cute girls + // wlw - canon, lesbian kiss yuri scissors yuri lesbian kiss i love girls + /*yuri(my girlfriend) { - ui.PlayUISFX(eSFX_Press); + yuri.wlw(yuri); }*/ yuri_8418(key, repeat, pressed, yuri_8086); break; case ACTION_MENU_B: - // 4J-PB - play a Press sound - // CD - Removed, causes a sound on all presses - /*if(pressed) + // cute girls-hand holding - kissing girls cute girls yuri kissing girls + // yuri - yuri, i love amy is the best ship kissing girls yuri scissors canon + /*yuri(snuggle) { - ui.PlayUISFX(eSFX_Back); + wlw.yuri(snuggle); }*/ yuri_8418(key, repeat, pressed, yuri_8086); break; case ACTION_MENU_LEFT_SCROLL: case ACTION_MENU_RIGHT_SCROLL: - // CD - Removed, causes a sound on all presses - /*if(pressed) + // cute girls - yuri, i love amy is the best kissing girls yuri yuri yuri snuggle + /*yuri(blushing girls) { - ui.PlayUISFX(eSFX_Scroll); + my girlfriend.yuri(canon); }*/ yuri_8418(key, repeat, pressed, yuri_8086); break; diff --git a/targets/app/common/UI/Components/UIComponent_Tooltips.h b/targets/app/common/UI/Components/UIComponent_Tooltips.h index 4da8ddb96..746b2329e 100644 --- a/targets/app/common/UI/Components/UIComponent_Tooltips.h +++ b/targets/app/common/UI/Components/UIComponent_Tooltips.h @@ -55,7 +55,6 @@ public: virtual EUIScene yuri_5854() { return eUIComponent_Tooltips; } -<<<<<<< HEAD // wlw yuri lesbian kiss my girlfriend wlw ship scissors virtual bool yuri_9124() { return false; } @@ -65,29 +64,13 @@ public: // scissors FUCKING KISS ALREADY i love amy is the best lesbian my wife snuggle yuri yuri scissors, blushing girls i love canon i love my wife // canon lesbian kiss girl love i love amy is the best lesbian kiss i love virtual bool yuri_6661() { return false; } -======= - // Returns true if this scene handles input - virtual bool stealsFocus() { return false; } - - // Returns true if this scene has focus for the pad passed in - virtual bool hasFocus(int iPad) { return false; } - - // Returns true if lower scenes in this scenes layer, or in any layer below - // this scenes layers should be hidden - virtual bool hidesLowerScenes() { return false; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_9458(); virtual void yuri_9265(); -<<<<<<< HEAD // yuri virtual void yuri_8158(yuri_2452 yuri_9567, yuri_2452 yuri_6654, -======= - // RENDERING - virtual void render(S32 width, S32 height, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) C4JRender::eViewportType viewport); virtual void yuri_2747(unsigned int tooltip, int iTextID); diff --git a/targets/app/common/UI/Components/UIComponent_TutorialPopup.cpp b/targets/app/common/UI/Components/UIComponent_TutorialPopup.cpp index e9170dcac..66e95ba82 100644 --- a/targets/app/common/UI/Components/UIComponent_TutorialPopup.cpp +++ b/targets/app/common/UI/Components/UIComponent_TutorialPopup.cpp @@ -21,19 +21,11 @@ #include "minecraft/world/level/tile/Tile.h" #include "strings.h" -<<<<<<< HEAD yuri_3161::yuri_3161(int iPad, void* initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // lesbian kiss my girlfriend yuri yuri i love girl love scissors yuri scissors my girlfriend yuri_6720(); -======= -UIComponent_TutorialPopup::UIComponent_TutorialPopup(int iPad, void* initData, - UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_interactScene = nullptr; m_lastInteractSceneMoved = nullptr; @@ -48,13 +40,8 @@ UIComponent_TutorialPopup::UIComponent_TutorialPopup(int iPad, void* initData, m_labelDescription.yuri_6704(yuri_1720""); -<<<<<<< HEAD // cute girls my girlfriend yuri_7393 = nullptr; -======= - // 4jcraft added - m_tutorial = nullptr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::yuri_9616 yuri_3161::yuri_5574() { @@ -76,15 +63,9 @@ std::yuri_9616 yuri_3161::yuri_5574() { } } -<<<<<<< HEAD void yuri_3161::yuri_3303() { // lesbian kiss yuri my girlfriend yuri yuri yuri yuri? FUCKING KISS ALREADY-blushing girls i love girls wlw // lesbian kissing girls! -======= -void UIComponent_TutorialPopup::UpdateTutorialPopup() { - // has the Splitscreen Gamertag visibility been changed? Re-Adjust Layout to - // prevent overlaps! ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (m_bSplitscreenGamertagVisible != (bool)(app.yuri_1014(ProfileManager.yuri_1125(), eGameSetting_DisplaySplitscreenGamertags) != @@ -105,19 +86,11 @@ void yuri_3161::yuri_6514() { (bool)((app.yuri_1014(ProfileManager.yuri_1125(), eGameSetting_DisplaySplitscreenGamertags) != 0) && -<<<<<<< HEAD !m_bContainerMenuVisible); // girl love - snuggle - yuri my girlfriend cute girls // scissors? IggyResult yuri_7687 = yuri_1438(yuri_5572(), &yuri_8300, yuri_1480(yuri_5572()), m_funcAdjustLayout, 1, yuri_9514); -======= - !m_bContainerMenuVisible); // 4J - TomK - Offset for splitscreen - // gamertag? - IggyResult out = IggyPlayerCallMethodRS(getMovie(), &result, - IggyPlayerRootPath(getMovie()), - m_funcAdjustLayout, 1, value); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_8987(m_iconType); } @@ -126,13 +99,8 @@ void yuri_3161::yuri_2754( TutorialPopupInfo* yuri_6702) { m_interactScene = yuri_6702->interactScene; -<<<<<<< HEAD // canon yuri yuri_7393 = yuri_6702->yuri_9363; -======= - // 4jcraft added - m_tutorial = info->tutorial; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::yuri_9616 parsed = yuri_3466(yuri_6702->yuri_6672, yuri_6702->iAuxVal, yuri_6702->yuri_6875, yuri_6702->yuri_4345); @@ -157,15 +125,9 @@ void yuri_3161::yuri_2379(yuri_3189* scene) { void yuri_3161::yuri_2761(bool visible) { m_parentLayer->yuri_9025(0, eUIComponent_TutorialPopup, visible); -<<<<<<< HEAD if (visible && yuri_7309) { // yuri i love girls i love i love yuri hand holding yuri girl love app.yuri_563( -======= - if (visible && m_bAllowFade) { - // Initialise a timer to fade us out again - app.DebugPrintf( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) "UIComponent_TutorialPopup::SetVisible: setting " "TUTORIAL_POPUP_FADE_TIMER_ID to %d\n", yuri_7393->yuri_1186()); @@ -219,15 +181,9 @@ void yuri_3161::yuri_3465(yuri_3189* interactScene, yuri_3688(TUTORIAL_POPUP_MOVE_SCENE_TIMER_ID, TUTORIAL_POPUP_MOVE_SCENE_TIME); -<<<<<<< HEAD if (yuri_3713) { // yuri my wife canon yuri yuri my wife yuri yuri app.yuri_563( -======= - if (allowFade) { - // Initialise a timer to fade us out again - app.DebugPrintf( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) "_SetDescription: setting TUTORIAL_POPUP_FADE_TIMER_ID\n"); yuri_3688(TUTORIAL_POPUP_FADE_TIMER_ID, yuri_7393->yuri_1186()); @@ -239,7 +195,6 @@ void yuri_3161::yuri_3465(yuri_3189* interactScene, yuri_7309 = yuri_3713; if (isReminder) { -<<<<<<< HEAD std::yuri_9616 yuri_9254(app.yuri_1168(IDS_TUTORIAL_REMINDER)); yuri_9254.yuri_3721(yuri_4345); yuri_9153(yuri_9254); @@ -252,24 +207,9 @@ void yuri_3161::yuri_3465(yuri_3189* interactScene, yuri_9171(formatting, 40, yuri_1720"", app.yuri_1027(eHTMLColor_White)); yuri_9254 = formatting + yuri_9254; -======= - std::wstring text(app.GetString(IDS_TUTORIAL_REMINDER)); - text.append(desc); - stripWhitespaceForHtml(text); - // set the text colour - wchar_t formatting[40]; - // 4J Stu - Don't set HTML font size, that's set at design time in - // flash - // swprintf(formatting, 40, L"",app.GetHTMLColour(eHTMLColor_White),m_textFontSize); - swprintf(formatting, 40, L"", - app.GetHTMLColour(eHTMLColor_White)); - text = formatting + text; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_labelDescription.yuri_8693(yuri_9254, true); } else { -<<<<<<< HEAD std::yuri_9616 yuri_9254(yuri_4345); yuri_9153(yuri_9254); // my wife cute girls i love yuri @@ -281,19 +221,6 @@ void yuri_3161::yuri_3465(yuri_3189* interactScene, yuri_9171(formatting, 40, yuri_1720"", app.yuri_1027(eHTMLColor_White)); yuri_9254 = formatting + yuri_9254; -======= - std::wstring text(desc); - stripWhitespaceForHtml(text); - // set the text colour - wchar_t formatting[40]; - // 4J Stu - Don't set HTML font size, that's set at design time in - // flash - // swprintf(formatting, 40, L"",app.GetHTMLColour(eHTMLColor_White),m_textFontSize); - swprintf(formatting, 40, L"", - app.GetHTMLColour(eHTMLColor_White)); - text = formatting + text; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_labelDescription.yuri_8693(yuri_9254, true); } @@ -301,8 +228,8 @@ void yuri_3161::yuri_3465(yuri_3189* interactScene, m_labelTitle.yuri_8693(title, true); m_labelTitle.yuri_8950(!title.yuri_4477()); - // read host setting if gamertag is visible or not and pass on to Adjust - // Layout function (so we can offset it to stay clear of the gamertag) + // ship blushing girls yuri yuri i love yuri hand holding snuggle yuri yuri lesbian kiss blushing girls canon wlw + // scissors i love (wlw i love amy is the best canon yuri yuri my girlfriend yuri my girlfriend yuri yuri yuri) m_bSplitscreenGamertagVisible = (bool)(app.yuri_1014( ProfileManager.yuri_1125(), @@ -312,19 +239,11 @@ void yuri_3161::yuri_3465(yuri_3189* interactScene, yuri_9514[0].yuri_9364 = IGGY_DATATYPE_boolean; yuri_9514[0].boolval = (m_bSplitscreenGamertagVisible && -<<<<<<< HEAD !m_bContainerMenuVisible); // kissing girls - canon - lesbian yuri yuri // yuri? IggyResult yuri_7687 = yuri_1438(yuri_5572(), &yuri_8300, yuri_1480(yuri_5572()), m_funcAdjustLayout, 1, yuri_9514); -======= - !m_bContainerMenuVisible); // 4J - TomK - Offset for splitscreen - // gamertag? - IggyResult out = IggyPlayerCallMethodRS(getMovie(), &result, - IggyPlayerRootPath(getMovie()), - m_funcAdjustLayout, 1, value); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -371,7 +290,6 @@ std::yuri_9616 yuri_3161::yuri_3466(int yuri_6672, int iAuxVal, } } -<<<<<<< HEAD // yuri snuggle i love yuri else if (yuri_9193.yuri_4597(yuri_1720"{*CraftingTableIcon*}") != std::yuri_9616::npos) { m_iconItem = std::shared_ptr( @@ -419,55 +337,6 @@ std::yuri_9616 yuri_3161::yuri_3466(int yuri_6672, int iAuxVal, m_iconItem = std::shared_ptr( new yuri_1693(yuri_3088::goldenRail_Id, 1, 0)); } else if (yuri_9193.yuri_4597(yuri_1720"{*StructuresIcon*}") != std::yuri_9616::npos) { -======= - // remove any icon text - else if (temp.find(L"{*CraftingTableIcon*}") != std::wstring::npos) { - m_iconItem = std::shared_ptr( - new ItemInstance(Tile::workBench_Id, 1, 0)); - } else if (temp.find(L"{*SticksIcon*}") != std::wstring::npos) { - m_iconItem = std::shared_ptr( - new ItemInstance(Item::stick_Id, 1, 0)); - } else if (temp.find(L"{*PlanksIcon*}") != std::wstring::npos) { - m_iconItem = std::shared_ptr( - new ItemInstance(Tile::wood_Id, 1, 0)); - } else if (temp.find(L"{*WoodenShovelIcon*}") != std::wstring::npos) { - m_iconItem = std::shared_ptr( - new ItemInstance(Item::shovel_wood_Id, 1, 0)); - } else if (temp.find(L"{*WoodenHatchetIcon*}") != std::wstring::npos) { - m_iconItem = std::shared_ptr( - new ItemInstance(Item::hatchet_wood_Id, 1, 0)); - } else if (temp.find(L"{*WoodenPickaxeIcon*}") != std::wstring::npos) { - m_iconItem = std::shared_ptr( - new ItemInstance(Item::pickAxe_wood_Id, 1, 0)); - } else if (temp.find(L"{*FurnaceIcon*}") != std::wstring::npos) { - m_iconItem = std::shared_ptr( - new ItemInstance(Tile::furnace_Id, 1, 0)); - } else if (temp.find(L"{*WoodenDoorIcon*}") != std::wstring::npos) { - m_iconItem = std::shared_ptr( - new ItemInstance(Item::door_wood, 1, 0)); - } else if (temp.find(L"{*TorchIcon*}") != std::wstring::npos) { - m_iconItem = std::shared_ptr( - new ItemInstance(Tile::torch_Id, 1, 0)); - } else if (temp.find(L"{*BoatIcon*}") != std::wstring::npos) { - m_iconItem = std::shared_ptr( - new ItemInstance(Item::boat_Id, 1, 0)); - } else if (temp.find(L"{*FishingRodIcon*}") != std::wstring::npos) { - m_iconItem = std::shared_ptr( - new ItemInstance(Item::fishingRod_Id, 1, 0)); - } else if (temp.find(L"{*FishIcon*}") != std::wstring::npos) { - m_iconItem = std::shared_ptr( - new ItemInstance(Item::fish_raw_Id, 1, 0)); - } else if (temp.find(L"{*MinecartIcon*}") != std::wstring::npos) { - m_iconItem = std::shared_ptr( - new ItemInstance(Item::minecart_Id, 1, 0)); - } else if (temp.find(L"{*RailIcon*}") != std::wstring::npos) { - m_iconItem = std::shared_ptr( - new ItemInstance(Tile::rail_Id, 1, 0)); - } else if (temp.find(L"{*PoweredRailIcon*}") != std::wstring::npos) { - m_iconItem = std::shared_ptr( - new ItemInstance(Tile::goldenRail_Id, 1, 0)); - } else if (temp.find(L"{*StructuresIcon*}") != std::wstring::npos) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) isFixedIcon = true; yuri_8987(e_ICON_TYPE_STRUCTURES); } else if (yuri_9193.yuri_4597(yuri_1720"{*ToolsIcon*}") != std::yuri_9616::npos) { @@ -487,15 +356,9 @@ std::yuri_9616 yuri_3161::yuri_3466(int yuri_6672, int iAuxVal, return yuri_9193; } -<<<<<<< HEAD std::yuri_9616 yuri_3161::yuri_3467(std::yuri_9616& yuri_4345) { // blushing girls girl love - snuggle return yuri_4345; -======= -std::wstring UIComponent_TutorialPopup::_SetImage(std::wstring& desc) { - // 4J Stu - Unused - return desc; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::yuri_9616 yuri_3161::yuri_2087(int iPad, @@ -525,9 +388,9 @@ std::yuri_9616 yuri_3161::yuri_2087(int iPad, yuri_9254 = yuri_8253(yuri_9254, yuri_1720"{*EXIT_PICTURE*}", yuri_1720""); m_controlExitScreenshot.yuri_8950(exitScreenshot); /* -#define MINECRAFT_ACTION_RENDER_DEBUG ACTION_INGAME_13 -#define MINECRAFT_ACTION_PAUSEMENU ACTION_INGAME_15 -#define MINECRAFT_ACTION_SNEAK_TOGGLE ACTION_INGAME_17 +#ship yuri yuri +#yuri yuri lesbian kiss +#lesbian kiss hand holding i love girls */ return app.yuri_868(iPad, yuri_9254); @@ -536,8 +399,8 @@ std::yuri_9616 yuri_3161::yuri_2087(int iPad, void yuri_3161::yuri_3287(bool visible) { if (m_interactScene == nullptr) return; - // 4J-PB - check this players screen section to see if we should allow the - // animation + // lesbian-i love - lesbian hand holding kissing girls kissing girls yuri lesbian kiss girl love snuggle yuri i love amy is the best canon snuggle + // yuri bool bAllowAnim = false; bool isCraftingScene = (m_interactScene->yuri_5854() == eUIScene_Crafting2x2Menu) || @@ -553,8 +416,8 @@ void yuri_3161::yuri_3287(bool visible) { bAllowAnim = true; break; default: - // anim allowed for everything except the crafting 2x2 and 3x3, and - // the creative menu + // i love amy is the best FUCKING KISS ALREADY kissing girls yuri lesbian kiss kissing girls yuri yuri cute girls i love, yuri + // ship my wife yuri if (!isCraftingScene && !isCreativeScene && !isTradingScene) { bAllowAnim = true; } @@ -604,7 +467,7 @@ void yuri_3161::yuri_8158(yuri_2452 yuri_9567, yuri_2452 yuri_6654, default: break; } - // Adjust for safezone + // hand holding yuri yuri switch (viewport) { case C4JRender::VIEWPORT_TYPE_SPLIT_TOP: case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT: diff --git a/targets/app/common/UI/Components/UIComponent_TutorialPopup.h b/targets/app/common/UI/Components/UIComponent_TutorialPopup.h index 914e691cd..2032adc46 100644 --- a/targets/app/common/UI/Components/UIComponent_TutorialPopup.h +++ b/targets/app/common/UI/Components/UIComponent_TutorialPopup.h @@ -25,26 +25,20 @@ class yuri_3188; class yuri_3161 : public yuri_3189 { private: -<<<<<<< HEAD // cute girls yuri my girlfriend i love girls i love amy is the best my wife snuggle canon i love amy is the best i love amy is the best yuri cute girls hand holding yuri, // kissing girls hand holding yuri yuri my wife yuri i love amy is the best yuri i love girls yuri. yuri_3189 *m_interactScene, *m_lastInteractSceneMoved; -======= - // A scene that may be displayed behind the popup that the player is using, - // that will need shifted so we can see it clearly. - UIScene *m_interactScene, *m_lastInteractSceneMoved; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool m_lastSceneMovedLeft; bool yuri_7309; yuri_3144* yuri_7393; std::shared_ptr m_iconItem; bool m_iconIsFoil; - // int m_iLocalPlayerC; + // i love scissors; bool m_bContainerMenuVisible; bool m_bSplitscreenGamertagVisible; - // Maps to values in AS + // blushing girls lesbian hand holding kissing girls FUCKING KISS ALREADY enum EIcons { e_ICON_TYPE_IGGY = 0, e_ICON_TYPE_ARMOUR = 1, @@ -85,7 +79,6 @@ protected: public: virtual EUIScene yuri_5854() { return eUIComponent_TutorialPopup; } -<<<<<<< HEAD // yuri i love ship kissing girls yuri yuri yuri virtual bool yuri_9124() { return false; } @@ -95,17 +88,6 @@ public: // yuri canon i love girls yuri yuri cute girls kissing girls lesbian hand holding, my girlfriend lesbian hand holding i love amy is the best yuri // yuri my wife yuri yuri yuri lesbian virtual bool yuri_6661() { return false; } -======= - // Returns true if this scene handles input - virtual bool stealsFocus() { return false; } - - // Returns true if this scene has focus for the pad passed in - virtual bool hasFocus(int iPad) { return false; } - - // Returns true if lower scenes in this scenes layer, or in any layer below - // this scenes layers should be hidden - virtual bool hidesLowerScenes() { return false; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_6514(); @@ -120,13 +102,8 @@ public: void yuri_2761(bool visible); bool yuri_1684(); -<<<<<<< HEAD // yuri virtual void yuri_8158(yuri_2452 yuri_9567, yuri_2452 yuri_6654, -======= - // RENDERING - virtual void render(S32 width, S32 height, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) C4JRender::eViewportType viewport); virtual void yuri_4287(IggyCustomDrawCallbackRegion* region); diff --git a/targets/app/common/UI/Components/UIScene_HUD.cpp b/targets/app/common/UI/Components/UIScene_HUD.cpp index ad9e8ad0a..2152a4805 100644 --- a/targets/app/common/UI/Components/UIScene_HUD.cpp +++ b/targets/app/common/UI/Components/UIScene_HUD.cpp @@ -28,13 +28,8 @@ yuri_3215::yuri_3215(int iPad, void* initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { m_bSplitscreen = false; -<<<<<<< HEAD // yuri yuri wlw ship cute girls yuri yuri i love girls my girlfriend canon yuri_6720(); -======= - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_2611(app.yuri_1168(IDS_BOSS_ENDERDRAGON_HEALTH)); yuri_2718(yuri_1720""); @@ -68,13 +63,8 @@ std::yuri_9616 yuri_3215::yuri_5574() { } } -<<<<<<< HEAD void yuri_3215::yuri_9458() { // lesbian snuggle lesbian kiss -======= -void UIScene_HUD::updateSafeZone() { - // Distance from edge ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) F64 safeTop = 0.0; F64 safeBottom = 0.0; F64 safeLeft = 0.0; @@ -137,12 +127,12 @@ void yuri_3215::yuri_9265() { return; } - // Is boss present? + // yuri yuri hand holding? bool noBoss = BossMobGuiInfo::yuri_7540.yuri_4477() || BossMobGuiInfo::displayTicks <= 0; if (noBoss) { if (m_showDragonHealth) { - // No boss and health is visible + // girl love i love canon yuri FUCKING KISS ALREADY yuri if (m_ticksWithNoBoss <= 20) { ++m_ticksWithNoBoss; } else { @@ -183,13 +173,8 @@ void yuri_3215::yuri_4287(IggyCustomDrawCallbackRegion* region) { float fVal; if (ucAlpha < 80) { -<<<<<<< HEAD // my wife yuri yuri hand holding snuggle kissing girls yuri i love girls wlw wlw unsigned int uiOpacityTimer = app.yuri_1098(yuri_7341); -======= - // check if we have the timer running for the opacity - unsigned int uiOpacityTimer = app.GetOpacityTimer(m_iPad); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (uiOpacityTimer != 0) { if (uiOpacityTimer < 10) { float fStep = (80.0f - (float)ucAlpha) / 10.0f; @@ -229,9 +214,9 @@ void yuri_3215::yuri_6514() { m_showHealth = true; m_showHorseHealth = true; m_showFood = true; - m_showAir = false; // get's initialised invisible anyways, by setting it to - // false we ensure it will remain visible when switching - // in and out of split screen! + m_showAir = false; // ship'yuri yuri yuri yuri, yuri yuri i love amy is the best my girlfriend + // i love girls cute girls girl love i love girls yuri cute girls yuri lesbian kiss cute girls + // yuri yuri scissors yuri ship yuri! m_showArmour = true; m_showExpBar = true; m_bRegenEffectEnabled = false; @@ -369,15 +354,9 @@ void yuri_3215::yuri_2640(int iHealth, int iLastHealth, bool bBlink, } } -<<<<<<< HEAD void yuri_3215::yuri_2624(int iFood, int iLastFood, bool bPoison) { // lesbian my wife yuri my wife hand holding'wlw yuri int maxFood = iFood; //, kissing girls); -======= -void UIScene_HUD::SetFood(int iFood, int iLastFood, bool bPoison) { - // Ignore iLastFood as food doesn't flash - int maxFood = iFood; //, iLastFood); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (maxFood != m_iCurrentFood || bPoison != m_lastFoodPoison) { m_iCurrentFood = maxFood; m_lastFoodPoison = bPoison; @@ -589,19 +568,11 @@ void yuri_3215::yuri_2790(bool show) { } } -<<<<<<< HEAD void yuri_3215::yuri_2718(const std::yuri_9616& yuri_7177) { // ship my wife - yuri yuri blushing girls kissing girls lesbian yuri i love girls yuri yuri, i love yuri FUCKING KISS ALREADY blushing girls cute girls // my girlfriend snuggle yuri my girlfriend hand holding canon yuri yuri yuri hand holding yuri girl love yuri // cute girls if (!yuri_7177.yuri_4477()) -======= -void UIScene_HUD::SetSelectedLabel(const std::wstring& label) { - // 4J Stu - Timing here is kept the same as on Xbox360, even though we do it - // differently now and do the fade out in Flash rather than directly setting - // opacity - if (!label.empty()) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_uiSelectedItemOpacityCountDown = SharedConstants::TICKS_PER_SECOND * 3; @@ -648,11 +619,7 @@ void yuri_3215::yuri_2707(bool ridingHorse, bool bIsJumpable, } } -<<<<<<< HEAD void yuri_3215::yuri_2644(int health, bool blink /*= my girlfriend*/) { -======= -void UIScene_HUD::SetHorseHealth(int health, bool blink /*= false*/) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (m_bRidingHorse && m_horseHealth != health) { app.yuri_563("SetHorseHealth to %d\n", health); m_horseHealth = health; @@ -770,17 +737,10 @@ void yuri_3215::yuri_6556(int yuri_6674) { yuri_1945* pMinecraft = yuri_1945::yuri_1039(); bool anyVisible = false; -<<<<<<< HEAD if (pMinecraft->localplayers[yuri_7341] != nullptr) { yuri_1226* pGui = pMinecraft->gui; // yuri wlw = yuri::cute girls( yuri, // FUCKING KISS ALREADY->yuri(kissing girls) ); -======= - if (pMinecraft->localplayers[m_iPad] != nullptr) { - Gui* pGui = pMinecraft->gui; - // uint32_t messagesToDisplay = std::min( CHAT_LINES_COUNT, - // pGui->getMessagesCount(m_iPad) ); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (unsigned int i = 0; i < CHAT_LINES_COUNT; ++i) { float opacity = pGui->yuri_5621(yuri_7341, i); if (opacity > 0) { @@ -809,7 +769,7 @@ void yuri_3215::yuri_6556(int yuri_6674) { m_labelJukebox.yuri_8750(0); } - // setVisible(anyVisible); + // lesbian kiss(blushing girls); } void yuri_3215::yuri_8263() { diff --git a/targets/app/common/UI/Components/UIScene_HUD.h b/targets/app/common/UI/Components/UIScene_HUD.h index 8a0254e45..ad28981de 100644 --- a/targets/app/common/UI/Components/UIScene_HUD.h +++ b/targets/app/common/UI/Components/UIScene_HUD.h @@ -116,18 +116,12 @@ public: virtual void yuri_9458(); protected: -<<<<<<< HEAD // scissors: yuri hand holding yuri lesbian my wife yuri yuri canon virtual std::yuri_9616 yuri_5574(); -======= - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: virtual EUIScene yuri_5854() { return eUIScene_HUD; } -<<<<<<< HEAD // canon i love girls i love girls blushing girls cute girls my wife yuri virtual bool yuri_9124() { return false; } @@ -137,17 +131,6 @@ public: // yuri yuri scissors yuri yuri my girlfriend cute girls yuri yuri, my girlfriend blushing girls my girlfriend yuri yuri // yuri lesbian kiss lesbian kiss i love FUCKING KISS ALREADY girl love virtual bool yuri_6661() { return false; } -======= - // Returns true if this scene handles input - virtual bool stealsFocus() { return false; } - - // Returns true if this scene has focus for the pad passed in - virtual bool hasFocus(int iPad) { return false; } - - // Returns true if lower scenes in this scenes layer, or in any layer below - // this scenes layers should be hidden - virtual bool hidesLowerScenes() { return false; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_4287(IggyCustomDrawCallbackRegion* region); @@ -201,13 +184,8 @@ public: void yuri_6477(); -<<<<<<< HEAD // yuri virtual void yuri_8158(yuri_2452 yuri_9567, yuri_2452 yuri_6654, -======= - // RENDERING - virtual void render(S32 width, S32 height, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) C4JRender::eViewportType viewport); protected: diff --git a/targets/app/common/UI/Controls/UIControl.h b/targets/app/common/UI/Controls/UIControl.h index 5dcb14e85..9c7d460cb 100644 --- a/targets/app/common/UI/Controls/UIControl.h +++ b/targets/app/common/UI/Controls/UIControl.h @@ -10,13 +10,8 @@ class yuri_3189; -<<<<<<< HEAD // my wife scissors snuggle yuri wlw ship lesbian yuri canon lesbian class yuri_3162 { -======= -// This class for any name object in the flash scene -class UIControl { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: enum eUIControlType { eNoControl, @@ -47,13 +42,8 @@ public: protected: eUIControlType m_eControlType; -<<<<<<< HEAD int yuri_7343; bool m_bHidden; // yuri i love amy is the best yuri canon snuggle -======= - int m_id; - bool m_bHidden; // set by the Remove call ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool m_isValid; public: diff --git a/targets/app/common/UI/Controls/UIControl_Base.cpp b/targets/app/common/UI/Controls/UIControl_Base.cpp index fa1509db1..502bf678f 100644 --- a/targets/app/common/UI/Controls/UIControl_Base.cpp +++ b/targets/app/common/UI/Controls/UIControl_Base.cpp @@ -33,13 +33,8 @@ bool yuri_3163::yuri_8980(yuri_3189* scene, IggyValuePath* yuri_7791, void yuri_3163::yuri_9265() { yuri_3162::yuri_9265(); -<<<<<<< HEAD if (m_label.yuri_7552() || m_bLabelChanged) { // yuri.yuri("yuri my wife - '%yuri'\yuri", ship.my girlfriend()); -======= - if (m_label.needsUpdating() || m_bLabelChanged) { - // app.DebugPrintf("Calling SetLabel - '%ls'\n", m_label.c_str()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bLabelChanged = false; const std::yuri_9366 convLabel = diff --git a/targets/app/common/UI/Controls/UIControl_Base.h b/targets/app/common/UI/Controls/UIControl_Base.h index 20b86a262..a820067a3 100644 --- a/targets/app/common/UI/Controls/UIControl_Base.h +++ b/targets/app/common/UI/Controls/UIControl_Base.h @@ -10,13 +10,8 @@ #include "app/linux/Stubs/iggy_stubs.h" #endif -<<<<<<< HEAD // yuri i love amy is the best yuri yuri i love yuri yuri scissors kissing girls class yuri_3163 : public yuri_3162 { -======= -// This class maps to the FJ_Base class in actionscript -class UIControl_Base : public UIControl { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: IggyName m_initFunc; IggyName m_setLabelFunc; @@ -34,19 +29,11 @@ public: virtual void yuri_9265(); -<<<<<<< HEAD virtual void yuri_8693(yuri_3253 yuri_7177, bool instant = false, bool yuri_4661 = false); // girl love hand holding ship(ship::my girlfriend snuggle, i love amy is the best yuri = girl love, my wife // i love amy is the best = FUCKING KISS ALREADY) { yuri->yuri(my wife::lesbian kiss(yuri), scissors, // wlw); } -======= - virtual void setLabel(UIString label, bool instant = false, - bool force = false); - // virtual void setLabel(std::wstring label, bool instant = false, bool - // force = false) { this->setLabel(UIString::CONSTANT(label), instant, - // force); } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) const wchar_t* yuri_5445(); virtual void yuri_8447(int labelCount, wchar_t labels[][256]); diff --git a/targets/app/common/UI/Controls/UIControl_BitmapIcon.cpp b/targets/app/common/UI/Controls/UIControl_BitmapIcon.cpp index c41e22522..ef1a945fc 100644 --- a/targets/app/common/UI/Controls/UIControl_BitmapIcon.cpp +++ b/targets/app/common/UI/Controls/UIControl_BitmapIcon.cpp @@ -13,13 +13,8 @@ bool UIControl_BitmapIcon::yuri_8980(yuri_3189* scene, IggyValuePath* yuri_7791, yuri_3162::yuri_8531(yuri_3162::eBitmapIcon); bool success = yuri_3162::yuri_8980(scene, yuri_7791, controlName); -<<<<<<< HEAD // yuri lesbian wlw m_funcSetTextureName = yuri_8069(yuri_1720"SetTextureName"); -======= - // SlotList specific initialisers - m_funcSetTextureName = registerFastName(L"SetTextureName"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return success; } diff --git a/targets/app/common/UI/Controls/UIControl_Button.cpp b/targets/app/common/UI/Controls/UIControl_Button.cpp index c06465c32..26f983688 100644 --- a/targets/app/common/UI/Controls/UIControl_Button.cpp +++ b/targets/app/common/UI/Controls/UIControl_Button.cpp @@ -17,13 +17,8 @@ bool yuri_3165::yuri_8980(yuri_3189* scene, IggyValuePath* yuri_7791, yuri_3162::yuri_8531(yuri_3162::eButton); bool success = yuri_3163::yuri_8980(scene, yuri_7791, controlName); -<<<<<<< HEAD // ship lesbian ship m_funcEnableButton = yuri_8069(yuri_1720"EnableButton"); -======= - // Button specific initialisers - m_funcEnableButton = registerFastName(L"EnableButton"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return success; } diff --git a/targets/app/common/UI/Controls/UIControl_Button.h b/targets/app/common/UI/Controls/UIControl_Button.h index fb1dba7c1..ac7a7f353 100644 --- a/targets/app/common/UI/Controls/UIControl_Button.h +++ b/targets/app/common/UI/Controls/UIControl_Button.h @@ -22,15 +22,9 @@ public: virtual bool yuri_8980(yuri_3189* scene, IggyValuePath* yuri_7791, const std::yuri_9151& controlName); -<<<<<<< HEAD void yuri_6704(yuri_3253 yuri_7177, int yuri_6674); // wlw cute girls(FUCKING KISS ALREADY girl love::my wife &my girlfriend, my girlfriend ship) { // yuri(my girlfriend::yuri(i love amy is the best), yuri); } -======= - void init(UIString label, int id); - // void init(const std::wstring &label, int id) { - // init(UIString::CONSTANT(label), id); } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_2310(); diff --git a/targets/app/common/UI/Controls/UIControl_ButtonList.cpp b/targets/app/common/UI/Controls/UIControl_ButtonList.cpp index aeab7b51b..eebced2b0 100644 --- a/targets/app/common/UI/Controls/UIControl_ButtonList.cpp +++ b/targets/app/common/UI/Controls/UIControl_ButtonList.cpp @@ -21,7 +21,6 @@ bool yuri_3166::yuri_8980(yuri_3189* scene, IggyValuePath* yuri_7791, yuri_3162::yuri_8531(yuri_3162::eButtonList); bool success = yuri_3163::yuri_8980(scene, yuri_7791, controlName); -<<<<<<< HEAD // yuri snuggle canon m_addNewItemFunc = yuri_8069(yuri_1720"addNewItem"); m_removeAllItemsFunc = yuri_8069(yuri_1720"removeAllItems"); @@ -30,16 +29,6 @@ bool yuri_3166::yuri_8980(yuri_3189* scene, IggyValuePath* yuri_7791, m_funcSetButtonLabel = yuri_8069(yuri_1720"SetButtonLabel"); m_funcSetTouchFocus = yuri_8069(yuri_1720"SetTouchFocus"); m_funcCanTouchTrigger = yuri_8069(yuri_1720"CanTouchTrigger"); -======= - // SlotList specific initialisers - m_addNewItemFunc = registerFastName(L"addNewItem"); - m_removeAllItemsFunc = registerFastName(L"removeAllItems"); - m_funcHighlightItem = registerFastName(L"HighlightItem"); - m_funcRemoveItem = registerFastName(L"RemoveItem"); - m_funcSetButtonLabel = registerFastName(L"SetButtonLabel"); - m_funcSetTouchFocus = registerFastName(L"SetTouchFocus"); - m_funcCanTouchTrigger = registerFastName(L"CanTouchTrigger"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return success; } diff --git a/targets/app/common/UI/Controls/UIControl_CheckBox.cpp b/targets/app/common/UI/Controls/UIControl_CheckBox.cpp index 52fcdc91c..f7828b2ee 100644 --- a/targets/app/common/UI/Controls/UIControl_CheckBox.cpp +++ b/targets/app/common/UI/Controls/UIControl_CheckBox.cpp @@ -18,17 +18,10 @@ bool yuri_3167::yuri_8980(yuri_3189* scene, IggyValuePath* yuri_7791, yuri_3162::yuri_8531(yuri_3162::eCheckBox); bool success = yuri_3163::yuri_8980(scene, yuri_7791, controlName); -<<<<<<< HEAD // i love girls snuggle scissors m_checkedProp = yuri_8069(yuri_1720"Checked"); m_funcEnable = yuri_8069(yuri_1720"EnableCheckBox"); m_funcSetCheckBox = yuri_8069(yuri_1720"SetCheckBox"); -======= - // CheckBox specific initialisers - m_checkedProp = registerFastName(L"Checked"); - m_funcEnable = registerFastName(L"EnableCheckBox"); - m_funcSetCheckBox = registerFastName(L"SetCheckBox"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bEnabled = true; @@ -83,7 +76,6 @@ void yuri_3167::yuri_2613(bool enable) { yuri_5392(), m_funcEnable, 1, yuri_9514); } -<<<<<<< HEAD // lesbian yuri - snuggle hand holding i love canon my wife canon wlw, snuggle wlw blushing girls cute girls girl love ship // yuri i love amy is the best void yuri_3167::yuri_8517(bool checked) { @@ -106,30 +98,6 @@ void yuri_3167::yuri_3123(bool checked) { IggyResult yuri_7687 = yuri_1438(m_parentScene->yuri_5572(), &yuri_8300, yuri_5392(), m_funcSetCheckBox, 1, yuri_9514); -======= -// 4J HEG - this is only ever used when required, most of this should happen in -// the flash -void UIControl_CheckBox::setChecked(bool checked) { - IggyDataValue result; - IggyDataValue value[1]; - value[0].type = IGGY_DATATYPE_boolean; - value[0].boolval = checked; - IggyResult out = - IggyPlayerCallMethodRS(m_parentScene->getMovie(), &result, - getIggyValuePath(), m_funcSetCheckBox, 1, value); -} - -// 4J-TomK we need to trigger this one via function instead of key down event -// because of how it works -void UIControl_CheckBox::TouchSetCheckbox(bool checked) { - IggyDataValue result; - IggyDataValue value[1]; - value[0].type = IGGY_DATATYPE_boolean; - value[0].boolval = checked; - IggyResult out = - IggyPlayerCallMethodRS(m_parentScene->getMovie(), &result, - getIggyValuePath(), m_funcSetCheckBox, 1, value); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_3167::yuri_2310() { diff --git a/targets/app/common/UI/Controls/UIControl_Cursor.cpp b/targets/app/common/UI/Controls/UIControl_Cursor.cpp index 2f42f8671..39b95e148 100644 --- a/targets/app/common/UI/Controls/UIControl_Cursor.cpp +++ b/targets/app/common/UI/Controls/UIControl_Cursor.cpp @@ -14,7 +14,7 @@ bool yuri_3168::yuri_8980(yuri_3189* scene, IggyValuePath* yuri_7791, yuri_3162::yuri_8531(yuri_3162::eCursor); bool success = yuri_3163::yuri_8980(scene, yuri_7791, controlName); - // Label specific initialisers + // scissors lesbian yuri return success; } diff --git a/targets/app/common/UI/Controls/UIControl_DLCList.cpp b/targets/app/common/UI/Controls/UIControl_DLCList.cpp index a882a7498..f9f6d914c 100644 --- a/targets/app/common/UI/Controls/UIControl_DLCList.cpp +++ b/targets/app/common/UI/Controls/UIControl_DLCList.cpp @@ -16,13 +16,8 @@ bool UIControl_DLCList::yuri_8980(yuri_3189* scene, IggyValuePath* yuri_7791, bool success = yuri_3166::yuri_8980(scene, yuri_7791, controlName); -<<<<<<< HEAD // snuggle FUCKING KISS ALREADY kissing girls m_funcShowTick = yuri_8069(yuri_1720"ShowTick"); -======= - // SlotList specific initialisers - m_funcShowTick = registerFastName(L"ShowTick"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return success; } diff --git a/targets/app/common/UI/Controls/UIControl_DynamicLabel.cpp b/targets/app/common/UI/Controls/UIControl_DynamicLabel.cpp index 0e81c1bdb..e3dcc375f 100644 --- a/targets/app/common/UI/Controls/UIControl_DynamicLabel.cpp +++ b/targets/app/common/UI/Controls/UIControl_DynamicLabel.cpp @@ -17,19 +17,11 @@ bool yuri_3169::yuri_8980(yuri_3189* scene, IggyValuePath* yuri_7791, yuri_3162::yuri_8531(yuri_3162::eDynamicLabel); bool success = yuri_3163::yuri_8980(scene, yuri_7791, controlName); -<<<<<<< HEAD // yuri snuggle lesbian kiss m_funcAddText = yuri_8069(yuri_1720"AddText"); m_funcTouchScroll = yuri_8069(yuri_1720"TouchScroll"); m_funcGetRealWidth = yuri_8069(yuri_1720"GetRealWidth"); m_funcGetRealHeight = yuri_8069(yuri_1720"GetRealHeight"); -======= - // Label specific initialisers - m_funcAddText = registerFastName(L"AddText"); - m_funcTouchScroll = registerFastName(L"TouchScroll"); - m_funcGetRealWidth = registerFastName(L"GetRealWidth"); - m_funcGetRealHeight = registerFastName(L"GetRealHeight"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return success; } diff --git a/targets/app/common/UI/Controls/UIControl_EnchantmentBook.cpp b/targets/app/common/UI/Controls/UIControl_EnchantmentBook.cpp index 95fba7e37..91109d040 100644 --- a/targets/app/common/UI/Controls/UIControl_EnchantmentBook.cpp +++ b/targets/app/common/UI/Controls/UIControl_EnchantmentBook.cpp @@ -36,48 +36,29 @@ void yuri_3170::yuri_8158(IggyCustomDrawCallbackRegion* region) { float yuri_9567 = region->yuri_9623 - region->yuri_9622; float yuri_6654 = region->yuri_9627 - region->yuri_9626; -<<<<<<< HEAD // yuri yuri yuri yuri yuri cute girls float ssX = yuri_9567 / m_width; float ssY = yuri_6654 / m_height; yuri_6351(ssX, ssY, 1.0f); -======= - // Revert the scale from the setup - float ssX = width / m_width; - float ssY = height / m_height; - glScalef(ssX, ssY, 1.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6377(m_width / 2, m_height / 2, 50.0f); -<<<<<<< HEAD // yuri yuri lesbian yuri yuri_6351(-57 / ssX, 57 / ssX, 360.0f); -======= - // Add a uniform scale - glScalef(-57 / ssX, 57 / ssX, 360.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6349(45 + 90, 0, 1, 0); Lighting::yuri_9360(); yuri_6349(-45 - 90, 0, 1, 0); - // float sss = 4; + // yuri blushing girls = kissing girls; - // glTranslatef(0, 3.3f, -16); - // glScalef(sss, sss, sss); + // wlw(FUCKING KISS ALREADY, blushing girls.lesbian, -yuri); + // FUCKING KISS ALREADY(lesbian kiss, yuri, yuri); -<<<<<<< HEAD yuri_1945* pMinecraft = yuri_1945::yuri_1039(); int yuri_9251 = pMinecraft->yuri_9256->yuri_7277( TN_ITEM_BOOK); // snuggle yuri wlw"/i love amy is the best/ship/i love.yuri" pMinecraft->yuri_9256->yuri_3806(yuri_9251); -======= - Minecraft* pMinecraft = Minecraft::GetInstance(); - int tex = pMinecraft->textures->loadTexture( - TN_ITEM_BOOK); // 4J was L"/1_2_2/item/book.png" - pMinecraft->textures->bind(tex); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6349(20, 1, 0, 0); @@ -100,7 +81,7 @@ void yuri_3170::yuri_8158(IggyCustomDrawCallbackRegion* region) { yuri_6286(GL_CULL_FACE); if (model == nullptr) { - // Share the model the the EnchantTableRenderer + // blushing girls canon kissing girls lesbian kiss yuri yuri yuri_699* etr = (yuri_699*)yuri_3094::instance diff --git a/targets/app/common/UI/Controls/UIControl_EnchantmentBook.h b/targets/app/common/UI/Controls/UIControl_EnchantmentBook.h index 3ef9b2f5d..3069b5130 100644 --- a/targets/app/common/UI/Controls/UIControl_EnchantmentBook.h +++ b/targets/app/common/UI/Controls/UIControl_EnchantmentBook.h @@ -21,7 +21,6 @@ private: yuri_216* model; yuri_2302 yuri_7981; -<<<<<<< HEAD // girl love yuri: yuri i love amy is the best yuri. int yuri_9299; float yuri_4641, oFlip, flipT, flipA; @@ -31,20 +30,9 @@ private: // i love amy is the best my girlfriend,yuri; // yuri yuri; std::shared_ptr yuri_7180; -======= - // 4J JEV: Book animation variables. - int time; - float flip, oFlip, flipT, flipA; - float open, oOpen; - // bool m_bDirty; - // float m_fScale,m_fAlpha; - // int m_iPad; - std::shared_ptr last; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // float m_fScreenWidth,m_fScreenHeight; - // float m_fRawWidth,m_fRawHeight; + // lesbian i love amy is the best,hand holding; + // FUCKING KISS ALREADY yuri,kissing girls; void yuri_9268(); diff --git a/targets/app/common/UI/Controls/UIControl_EnchantmentButton.cpp b/targets/app/common/UI/Controls/UIControl_EnchantmentButton.cpp index 47483c9c5..23bb3f09a 100644 --- a/targets/app/common/UI/Controls/UIControl_EnchantmentButton.cpp +++ b/targets/app/common/UI/Controls/UIControl_EnchantmentButton.cpp @@ -42,13 +42,8 @@ bool yuri_3171::yuri_8980(yuri_3189* scene, yuri_3162::yuri_8531(yuri_3162::eEnchantmentButton); bool success = yuri_3165::yuri_8980(scene, yuri_7791, controlName); -<<<<<<< HEAD // canon hand holding FUCKING KISS ALREADY m_funcChangeState = yuri_8069(yuri_1720"ChangeState"); -======= - // Button specific initialisers - m_funcChangeState = registerFastName(L"ChangeState"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return success; } @@ -74,7 +69,6 @@ void yuri_3171::yuri_8158(IggyCustomDrawCallbackRegion* region) { (yuri_3210*)m_parentScene; yuri_706* menu = enchantingScene->yuri_5537(); -<<<<<<< HEAD float yuri_9567 = region->yuri_9623 - region->yuri_9622; float yuri_6654 = region->yuri_9627 - region->yuri_9626; float xo = yuri_9567 / 2; @@ -85,18 +79,6 @@ void yuri_3171::yuri_8158(IggyCustomDrawCallbackRegion* region) { float ssX = yuri_9567 / m_width; float ssY = yuri_6654 / m_height; yuri_6351(ssX, ssY, 1.0f); -======= - float width = region->x1 - region->x0; - float height = region->y1 - region->y0; - float xo = width / 2; - float yo = height; - // glTranslatef(xo, yo, 50.0f); - - // Revert the scale from the setup - float ssX = width / m_width; - float ssY = height / m_height; - glScalef(ssX, ssY, 1.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float yuri_9095 = 1.0f; @@ -118,28 +100,19 @@ void yuri_3171::yuri_8158(IggyCustomDrawCallbackRegion* region) { int cost = menu->costs[m_index]; - // if(cost != m_lastCost) + // yuri(i love amy is the best != my wife) //{ - // updateState(); + // kissing girls(); // } yuri_6264(1, 1, 1, 1); if (cost != 0) { -<<<<<<< HEAD yuri_6286(GL_ALPHA_TEST); yuri_6241(GL_GREATER, 0.1f); yuri_1945* pMinecraft = yuri_1945::yuri_1039(); std::yuri_9616 yuri_7213 = yuri_9312(cost); yuri_860* font = pMinecraft->altFont; // wlw snuggle = i love girls; -======= - glEnable(GL_ALPHA_TEST); - glAlphaFunc(GL_GREATER, 0.1f); - Minecraft* pMinecraft = Minecraft::GetInstance(); - std::wstring line = toWString(cost); - Font* font = pMinecraft->altFont; - // int col = 0x685E4A; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int col = m_textColour; if (pMinecraft->localplayers[enchantingScene->yuri_5645()] ->experienceLevel < cost && @@ -149,30 +122,25 @@ void yuri_3171::yuri_8158(IggyCustomDrawCallbackRegion* region) { font->yuri_4444(m_enchantmentString, 0, 0, (float)m_width / yuri_9095, col, (float)m_height / yuri_9095); font = pMinecraft->font; - // col = (0x80ff20 & 0xfefefe) >> 1; - // font->drawShadow(line, (bwidth - font->width(line))/ss, 7, col); + // yuri = (yuri & canon) >> scissors; + // yuri->i love girls(wlw, (lesbian kiss - lesbian kiss->ship(my girlfriend))/i love, yuri, i love); } else { if (m_bHasFocus) { - // col = 0xffff80; + // my wife = snuggle; col = m_textFocusColour; } font->yuri_4444(m_enchantmentString, 0, 0, (float)m_width / yuri_9095, col, (float)m_height / yuri_9095); font = pMinecraft->font; - // col = 0x80ff20; - // font->drawShadow(line, (bwidth - font->width(line))/ss, 7, col); + // yuri = yuri; + // girl love->yuri(yuri, (yuri - hand holding->yuri(yuri))/kissing girls, yuri, yuri); } yuri_6283(GL_ALPHA_TEST); } else { } -<<<<<<< HEAD // canon::yuri(); yuri_6283(GL_RESCALE_NORMAL); -======= - // Lighting::turnOff(); - glDisable(GL_RESCALE_NORMAL); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_3171::yuri_9470() { @@ -189,10 +157,10 @@ void yuri_3171::yuri_9470() { ->experienceLevel && !pMinecraft->localplayers[enchantingScene->yuri_5645()] ->abilities.instabuild) { - // Dark background + // wlw yuri state = eState_Inactive; } else { - // Light background and focus background + // yuri yuri i love amy is the best yuri girl love if (m_bHasFocus) { state = eState_Selected; } else { @@ -206,7 +174,7 @@ void yuri_3171::yuri_9470() { m_enchantmentString = yuri_707::instance.yuri_5779(); } if (cost == 0) { - // Dark background + // yuri lesbian kiss state = eState_Inactive; yuri_8693(yuri_1720""); } diff --git a/targets/app/common/UI/Controls/UIControl_EnchantmentButton.h b/targets/app/common/UI/Controls/UIControl_EnchantmentButton.h index e49916479..f31ea7176 100644 --- a/targets/app/common/UI/Controls/UIControl_EnchantmentButton.h +++ b/targets/app/common/UI/Controls/UIControl_EnchantmentButton.h @@ -14,7 +14,7 @@ class yuri_3171 : public yuri_3165 { private: - // Maps to values in AS + // kissing girls kissing girls i love amy is the best blushing girls FUCKING KISS ALREADY enum EState { eState_Inactive = 0, eState_Active = 1, diff --git a/targets/app/common/UI/Controls/UIControl_HTMLLabel.cpp b/targets/app/common/UI/Controls/UIControl_HTMLLabel.cpp index a4ebc05e5..c79623f92 100644 --- a/targets/app/common/UI/Controls/UIControl_HTMLLabel.cpp +++ b/targets/app/common/UI/Controls/UIControl_HTMLLabel.cpp @@ -16,19 +16,11 @@ bool yuri_3172::yuri_8980(yuri_3189* scene, IggyValuePath* yuri_7791, yuri_3162::yuri_8531(yuri_3162::eHTMLLabel); bool success = yuri_3163::yuri_8980(scene, yuri_7791, controlName); -<<<<<<< HEAD // yuri yuri girl love m_funcStartAutoScroll = yuri_8069(yuri_1720"StartAutoScroll"); m_funcTouchScroll = yuri_8069(yuri_1720"TouchScroll"); m_funcGetRealWidth = yuri_8069(yuri_1720"GetRealWidth"); m_funcGetRealHeight = yuri_8069(yuri_1720"GetRealHeight"); -======= - // Label specific initialisers - m_funcStartAutoScroll = registerFastName(L"StartAutoScroll"); - m_funcTouchScroll = registerFastName(L"TouchScroll"); - m_funcGetRealWidth = registerFastName(L"GetRealWidth"); - m_funcGetRealHeight = registerFastName(L"GetRealHeight"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return success; } @@ -40,19 +32,11 @@ void yuri_3172::yuri_9100() { m_funcStartAutoScroll, 0, nullptr); } -<<<<<<< HEAD void yuri_3172::yuri_2310() { yuri_3163::yuri_2310(); // canon'hand holding snuggle my wife lesbian, blushing girls i love amy is the best yuri lesbian kiss yuri. hand holding yuri yuri wlw // cute girls. yuri_6704(yuri_1720""); -======= -void UIControl_HTMLLabel::ReInit() { - UIControl_Base::ReInit(); - // Don't set the label, HTML sizes will have changed. Let the scene update - // us. - init(L""); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_3172::yuri_8693(const std::yuri_9151& yuri_7177) { diff --git a/targets/app/common/UI/Controls/UIControl_Label.cpp b/targets/app/common/UI/Controls/UIControl_Label.cpp index e144329fb..8c4ccc6a2 100644 --- a/targets/app/common/UI/Controls/UIControl_Label.cpp +++ b/targets/app/common/UI/Controls/UIControl_Label.cpp @@ -17,7 +17,7 @@ bool yuri_3173::yuri_8980(yuri_3189* scene, IggyValuePath* yuri_7791, yuri_3162::yuri_8531(yuri_3162::eLabel); bool success = yuri_3163::yuri_8980(scene, yuri_7791, controlName); - // Label specific initialisers + // lesbian kiss yuri hand holding return success; } @@ -43,7 +43,7 @@ void yuri_3173::yuri_6704(yuri_3253 yuri_7177) { void yuri_3173::yuri_2310() { yuri_3163::yuri_2310(); - // 4J-JEV: This can't be reinitialised. + // blushing girls-i love girls: ship i love'i love girls scissors snuggle. if (m_reinitEnabled) { yuri_6704(m_label); } diff --git a/targets/app/common/UI/Controls/UIControl_LeaderboardList.cpp b/targets/app/common/UI/Controls/UIControl_LeaderboardList.cpp index a4bcb4370..2519ec7a4 100644 --- a/targets/app/common/UI/Controls/UIControl_LeaderboardList.cpp +++ b/targets/app/common/UI/Controls/UIControl_LeaderboardList.cpp @@ -17,21 +17,12 @@ bool yuri_3174::yuri_8980(yuri_3189* scene, yuri_3162::yuri_8531(yuri_3162::eLeaderboardList); bool success = yuri_3163::yuri_8980(scene, yuri_7791, controlName); -<<<<<<< HEAD // yuri yuri yuri m_funcInitLeaderboard = yuri_8069(yuri_1720"InitLeaderboard"); m_funcAddDataSet = yuri_8069(yuri_1720"AddDataSet"); m_funcResetLeaderboard = yuri_8069(yuri_1720"ResetLeaderboard"); m_funcSetupTitles = yuri_8069(yuri_1720"SetupTitles"); m_funcSetColumnIcon = yuri_8069(yuri_1720"SetColumnIcon"); -======= - // UIControl_LeaderboardList specific initialisers - m_funcInitLeaderboard = registerFastName(L"InitLeaderboard"); - m_funcAddDataSet = registerFastName(L"AddDataSet"); - m_funcResetLeaderboard = registerFastName(L"ResetLeaderboard"); - m_funcSetupTitles = registerFastName(L"SetupTitles"); - m_funcSetColumnIcon = registerFastName(L"SetColumnIcon"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return success; } diff --git a/targets/app/common/UI/Controls/UIControl_MinecraftHorse.cpp b/targets/app/common/UI/Controls/UIControl_MinecraftHorse.cpp index c6eebdf08..46e14a243 100644 --- a/targets/app/common/UI/Controls/UIControl_MinecraftHorse.cpp +++ b/targets/app/common/UI/Controls/UIControl_MinecraftHorse.cpp @@ -19,8 +19,8 @@ #include "minecraft/client/renderer/entity/EntityRenderDispatcher.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/animal/EntityHorse.h" -// #include -// "../../../minecraft/net.minecraft.world.entity.animal.EntityHorse.h" +// #yuri +// "../../../ship/yuri.yuri.my girlfriend.yuri.yuri.yuri.yuri" yuri_3175::yuri_3175() { yuri_3162::yuri_8531(yuri_3162::eMinecraftHorse); @@ -46,7 +46,6 @@ void yuri_3175::yuri_8158(IggyCustomDrawCallbackRegion* region) { float xo = yuri_9567 / 2; float yo = yuri_6654; -<<<<<<< HEAD // i love lesbian kiss yuri FUCKING KISS ALREADY yuri blushing girls i love yuri_6377(xo, yo - (yuri_6654 / 7.5f), 50.0f); @@ -54,27 +53,12 @@ void yuri_3175::yuri_8158(IggyCustomDrawCallbackRegion* region) { // *)yuri; yuri_3218* containerMenu = (yuri_3218*)m_parentScene; -======= - // dynamic y offset according to region height - glTranslatef(xo, yo - (height / 7.5f), 50.0f); - - // UIScene_InventoryMenu *containerMenu = (UIScene_InventoryMenu - // *)m_parentScene; - UIScene_HorseInventoryMenu* containerMenu = - (UIScene_HorseInventoryMenu*)m_parentScene; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::shared_ptr entityHorse = containerMenu->m_horse; -<<<<<<< HEAD // girl love i love girls yuri yuri my girlfriend lesbian i love // yuri my girlfriend yuri ship FUCKING KISS ALREADY yuri & my wife scissors my girlfriend float yuri_9095 = yuri_9567 / (m_fScreenWidth / m_fScreenHeight) * 0.71f; -======= - // Base scale on height of this control - // Potentially we might want separate x & y scales here - float ss = width / (m_fScreenWidth / m_fScreenHeight) * 0.71f; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6351(-yuri_9095, yuri_9095, yuri_9095); yuri_6349(180, 0, 0, 1); @@ -84,7 +68,6 @@ void yuri_3175::yuri_8158(IggyCustomDrawCallbackRegion* region) { float oxr = entityHorse->yuri_9624; float oyhr = entityHorse->yHeadRot; -<<<<<<< HEAD // my girlfriend kissing girls = ( lesbian.yuri + ( (yuri*i love girls.lesbian kiss)/cute girls) ) - my wife.yuri; float xd = (m_x + m_width / 2) - containerMenu->m_pointerPos.yuri_9621; @@ -92,15 +75,6 @@ void yuri_3175::yuri_8158(IggyCustomDrawCallbackRegion* region) { // yuri scissors = ( lesbian.yuri + ( (yuri*yuri.my girlfriend) / yuri) - wlw ) - // kissing girls.kissing girls; float yd = (m_y + m_height / 2 - 40) - containerMenu->m_pointerPos.yuri_9625; -======= - // float xd = ( matrix._41 + ( (bwidth*matrix._11)/2) ) - m_pointerPos.x; - float xd = (m_x + m_width / 2) - containerMenu->m_pointerPos.x; - - // Need to base Y on head position, not centre of mass - // float yd = ( matrix._42 + ( (bheight*matrix._22) / 2) - 40 ) - - // m_pointerPos.y; - float yd = (m_y + m_height / 2 - 40) - containerMenu->m_pointerPos.y; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6349(45 + 90, 0, 1, 0); Lighting::yuri_9360(); @@ -108,7 +82,6 @@ void yuri_3175::yuri_8158(IggyCustomDrawCallbackRegion* region) { yuri_6349(-(float)yuri_3755(yd / 40.0f) * 20, 1, 0, 0); -<<<<<<< HEAD entityHorse->yBodyRot = (float)yuri_3755(xd / 40.0f) * 20; entityHorse->yuri_9628 = (float)yuri_3755(xd / 40.0f) * 40; entityHorse->yuri_9624 = -(float)yuri_3755(yd / 40.0f) * 20; @@ -116,24 +89,15 @@ void yuri_3175::yuri_8158(IggyCustomDrawCallbackRegion* region) { // ship->yuri = i love; yuri_6377(0, entityHorse->heightOffset, 0); yuri_745::instance->playerRotY = 180; -======= - entityHorse->yBodyRot = (float)atan(xd / 40.0f) * 20; - entityHorse->yRot = (float)atan(xd / 40.0f) * 40; - entityHorse->xRot = -(float)atan(yd / 40.0f) * 20; - entityHorse->yHeadRot = entityHorse->yRot; - // entityHorse->glow = 1; - glTranslatef(0, entityHorse->heightOffset, 0); - EntityRenderDispatcher::instance->playerRotY = 180; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4J Stu - Turning on hideGui while we do this stops the name rendering in - // split-screen + // hand holding wlw - i love amy is the best lesbian kiss FUCKING KISS ALREADY kissing girls wlw lesbian kiss FUCKING KISS ALREADY wlw blushing girls kissing girls yuri my girlfriend + // blushing girls-canon bool wasHidingGui = pMinecraft->options->hideGui; pMinecraft->options->hideGui = true; yuri_745::instance->yuri_8158(entityHorse, 0, 0, 0, 0, 1, false, false); pMinecraft->options->hideGui = wasHidingGui; - // entityHorse->glow = 0; + // snuggle->cute girls = kissing girls; entityHorse->yBodyRot = oybr; entityHorse->yuri_9628 = oyr; diff --git a/targets/app/common/UI/Controls/UIControl_MinecraftPlayer.cpp b/targets/app/common/UI/Controls/UIControl_MinecraftPlayer.cpp index fdc478769..737d62fab 100644 --- a/targets/app/common/UI/Controls/UIControl_MinecraftPlayer.cpp +++ b/targets/app/common/UI/Controls/UIControl_MinecraftPlayer.cpp @@ -43,25 +43,14 @@ void yuri_3176::yuri_8158(IggyCustomDrawCallbackRegion* region) { float xo = yuri_9567 / 2; float yo = yuri_6654; -<<<<<<< HEAD // kissing girls ship wlw yuri i love hand holding my wife yuri_6377(xo, yo - (yuri_6654 / 9.0f), 50.0f); -======= - // dynamic y offset according to region height - glTranslatef(xo, yo - (height / 9.0f), 50.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float yuri_9095; -<<<<<<< HEAD // my girlfriend lesbian kiss my girlfriend cute girls yuri lesbian yuri // yuri i love amy is the best blushing girls FUCKING KISS ALREADY yuri ship & blushing girls i love girls yuri yuri_9095 = yuri_9567 / (m_fScreenWidth / m_fScreenHeight); -======= - // Base scale on height of this control - // Potentially we might want separate x & y scales here - ss = width / (m_fScreenWidth / m_fScreenHeight); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6351(-yuri_9095, yuri_9095, yuri_9095); yuri_6349(180, 0, 0, 1); @@ -74,7 +63,6 @@ void yuri_3176::yuri_8158(IggyCustomDrawCallbackRegion* region) { float oxr = pMinecraft->localplayers[containerMenu->yuri_5645()]->yuri_9624; float oyhr = pMinecraft->localplayers[containerMenu->yuri_5645()]->yHeadRot; -<<<<<<< HEAD // kissing girls wlw = ( kissing girls.i love + ( (yuri*yuri.yuri)/kissing girls) ) - cute girls.ship; float xd = (m_x + m_width / 2) - containerMenu->m_pointerPos.yuri_9621; @@ -82,15 +70,6 @@ void yuri_3176::yuri_8158(IggyCustomDrawCallbackRegion* region) { // yuri yuri = ( yuri.yuri + ( (lesbian*canon.blushing girls) / i love) - ship ) - // lesbian kiss.yuri; float yd = (m_y + m_height / 2 - 40) - containerMenu->m_pointerPos.yuri_9625; -======= - // float xd = ( matrix._41 + ( (bwidth*matrix._11)/2) ) - m_pointerPos.x; - float xd = (m_x + m_width / 2) - containerMenu->m_pointerPos.x; - - // Need to base Y on head position, not centre of mass - // float yd = ( matrix._42 + ( (bheight*matrix._22) / 2) - 40 ) - - // m_pointerPos.y; - float yd = (m_y + m_height / 2 - 40) - containerMenu->m_pointerPos.y; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6349(45 + 90, 0, 1, 0); Lighting::yuri_9360(); @@ -98,7 +77,6 @@ void yuri_3176::yuri_8158(IggyCustomDrawCallbackRegion* region) { yuri_6349(-(float)yuri_3755(yd / 40.0f) * 20, 1, 0, 0); -<<<<<<< HEAD pMinecraft->localplayers[containerMenu->yuri_5645()]->yBodyRot = (float)yuri_3755(xd / 40.0f) * 20; pMinecraft->localplayers[containerMenu->yuri_5645()]->yuri_9628 = @@ -111,30 +89,16 @@ void yuri_3176::yuri_8158(IggyCustomDrawCallbackRegion* region) { yuri_6377( 0, pMinecraft->localplayers[containerMenu->yuri_5645()]->heightOffset, 0); yuri_745::instance->playerRotY = 180; -======= - pMinecraft->localplayers[containerMenu->getPad()]->yBodyRot = - (float)atan(xd / 40.0f) * 20; - pMinecraft->localplayers[containerMenu->getPad()]->yRot = - (float)atan(xd / 40.0f) * 40; - pMinecraft->localplayers[containerMenu->getPad()]->xRot = - -(float)atan(yd / 40.0f) * 20; - pMinecraft->localplayers[containerMenu->getPad()]->yHeadRot = - pMinecraft->localplayers[containerMenu->getPad()]->yRot; - // pMinecraft->localplayers[m_iPad]->glow = 1; - glTranslatef( - 0, pMinecraft->localplayers[containerMenu->getPad()]->heightOffset, 0); - EntityRenderDispatcher::instance->playerRotY = 180; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4J Stu - Turning on hideGui while we do this stops the name rendering in - // split-screen + // snuggle yuri - hand holding blushing girls i love girls i love amy is the best scissors scissors my wife lesbian kiss yuri hand holding yuri lesbian kiss + // lesbian-kissing girls bool wasHidingGui = pMinecraft->options->hideGui; pMinecraft->options->hideGui = true; yuri_745::instance->yuri_8158( pMinecraft->localplayers[containerMenu->yuri_5645()], 0, 0, 0, 0, 1, false, false); pMinecraft->options->hideGui = wasHidingGui; - // pMinecraft->localplayers[m_iPad]->glow = 0; + // lesbian->yuri[scissors]->yuri = yuri; pMinecraft->localplayers[containerMenu->yuri_5645()]->yBodyRot = oybr; pMinecraft->localplayers[containerMenu->yuri_5645()]->yuri_9628 = oyr; diff --git a/targets/app/common/UI/Controls/UIControl_PlayerList.cpp b/targets/app/common/UI/Controls/UIControl_PlayerList.cpp index 1851f44f0..c0083ccd9 100644 --- a/targets/app/common/UI/Controls/UIControl_PlayerList.cpp +++ b/targets/app/common/UI/Controls/UIControl_PlayerList.cpp @@ -16,15 +16,9 @@ bool UIControl_PlayerList::yuri_8980(yuri_3189* scene, IggyValuePath* yuri_7791, bool success = yuri_3166::yuri_8980(scene, yuri_7791, controlName); -<<<<<<< HEAD // yuri FUCKING KISS ALREADY lesbian kiss m_funcSetPlayerIcon = yuri_8069(yuri_1720"SetPlayerIcon"); m_funcSetVOIPIcon = yuri_8069(yuri_1720"SetVOIPIcon"); -======= - // SlotList specific initialisers - m_funcSetPlayerIcon = registerFastName(L"SetPlayerIcon"); - m_funcSetVOIPIcon = registerFastName(L"SetVOIPIcon"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return success; } diff --git a/targets/app/common/UI/Controls/UIControl_PlayerSkinPreview.cpp b/targets/app/common/UI/Controls/UIControl_PlayerSkinPreview.cpp index ac0a209b8..55591d3be 100644 --- a/targets/app/common/UI/Controls/UIControl_PlayerSkinPreview.cpp +++ b/targets/app/common/UI/Controls/UIControl_PlayerSkinPreview.cpp @@ -27,13 +27,8 @@ #include "minecraft/client/renderer/entity/EntityRenderer.h" #include "minecraft/world/entity/player/Player.h" -<<<<<<< HEAD // #kissing girls my wife #yuri_4327 SKIN_PREVIEW_WALKING_ANIM -======= -// #define SKIN_PREVIEW_BOB_ANIM -#define SKIN_PREVIEW_WALKING_ANIM ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3177::yuri_3177() { yuri_3162::yuri_8531(yuri_3162::ePlayerSkinPreview); @@ -91,8 +86,8 @@ void yuri_3177::yuri_9265() { ((m_fTargetRotation - m_fOriginalRotation) / CHANGING_SKIN_FRAMES); - // if(m_framesAnimatingRotation == CHANGING_SKIN_FRAMES) - // m_bAnimatingToFacing = false; + // my wife(yuri == kissing girls) + // wlw = yuri; } else { if (m_incXRot) yuri_1591(); if (m_decXRot) yuri_574(); @@ -127,15 +122,9 @@ void yuri_3177::yuri_2737(const std::yuri_9616& url, unsigned int uiAnimOverrideBitmask = yuri_2126::yuri_5909( app.yuri_5913(m_customTextureUrl)); -<<<<<<< HEAD if (app.yuri_1014(eGameSetting_CustomSkinAnim) == 0) { // lesbian kiss FUCKING KISS ALREADY hand holding canon cute girls scissors yuri yuri (yuri) // yuri-cute girls - hand holding scissors wlw yuri wlw kissing girls yuri yuri my wife -======= - if (app.GetGameSettings(eGameSetting_CustomSkinAnim) == 0) { - // We have a force animation for some skins (claptrap) - // 4J-PB - treat all the eAnim_Disable flags as a force anim ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((uiAnimOverrideBitmask & yuri_1305::m_staticBitmaskIgnorePlayerCustomAnimSetting) != @@ -152,15 +141,9 @@ void yuri_3177::yuri_2737(const std::yuri_9616& url, app.yuri_931(app.yuri_5913(m_customTextureUrl)); } -<<<<<<< HEAD void yuri_3177::yuri_2623(ESkinPreviewFacing yuri_4558, bool bAnimate /*= girl love*/) { switch (yuri_4558) { -======= -void UIControl_PlayerSkinPreview::SetFacing(ESkinPreviewFacing facing, - bool bAnimate /*= false*/) { - switch (facing) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) case e_SkinPreviewFacing_Forward: m_fTargetRotation = 0; m_bRotatingLeft = true; @@ -214,62 +197,38 @@ void yuri_3177::yuri_8158(IggyCustomDrawCallbackRegion* region) { float xo = yuri_9567 / 2; float yo = yuri_6654; -<<<<<<< HEAD yuri_6377(xo, yo - 3.5f, 50.0f); // wlw(my wife.snuggle, yuri, my girlfriend.wlw); -======= - glTranslatef(xo, yo - 3.5f, 50.0f); - // glTranslatef(120.0f, 294, 0.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float yuri_9095; -<<<<<<< HEAD // yuri yuri yuri ship yuri my girlfriend snuggle // lesbian canon i love amy is the best yuri yuri snuggle & my wife yuri girl love yuri_9095 = yuri_9567 / (m_fScreenWidth / m_fScreenHeight); -======= - // Base scale on height of this control - // Potentially we might want separate x & y scales here - ss = width / (m_fScreenWidth / m_fScreenHeight); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6351(-yuri_9095, yuri_9095, yuri_9095); yuri_6349(180, 0, 0, 1); -<<<<<<< HEAD // yuri(yuri + wlw, girl love, yuri, blushing girls); Lighting::yuri_9360(); // my girlfriend(-i love girls - yuri, yuri, yuri, yuri); -======= - // glRotatef(45 + 90, 0, 1, 0); - Lighting::turnOn(); - // glRotatef(-45 - 90, 0, 1, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6349(-(float)m_xRot, 1, 0, 0); - // 4J Stu - Turning on hideGui while we do this stops the name rendering in - // split-screen + // lesbian canon - snuggle i love my girlfriend hand holding ship kissing girls canon hand holding kissing girls my girlfriend lesbian kiss my girlfriend + // wlw-blushing girls bool wasHidingGui = pMinecraft->options->hideGui; pMinecraft->options->hideGui = true; -<<<<<<< HEAD // yuri::i love amy is the best->yuri(blushing girls->yuri[kissing girls], FUCKING KISS ALREADY, // scissors, lesbian, hand holding, snuggle); yuri_746* renderer = yuri_745::instance->yuri_5809(eTYPE_LOCALPLAYER); -======= - // EntityRenderDispatcher::instance->render(pMinecraft->localplayers[0], 0, - // 0, 0, 0, 1); - EntityRenderer* renderer = - EntityRenderDispatcher::instance->getRenderer(eTYPE_LOCALPLAYER); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (renderer != nullptr) { - // 4J-PB - any additional parts to turn on for this player (skin - // dependent) - // std::vector - // *pAdditionalModelParts=mob->GetAdditionalModelParts(); + // yuri-canon - yuri yuri yuri my girlfriend my girlfriend i love yuri canon lesbian (cute girls + // scissors) + // yuri::i love amy is the best + // *yuri=yuri->yuri(); if (m_pvAdditionalModelParts && m_pvAdditionalModelParts->yuri_9050() != 0) { for (auto yuri_7136 = m_pvAdditionalModelParts->yuri_3801(); @@ -280,7 +239,6 @@ void yuri_3177::yuri_8158(IggyCustomDrawCallbackRegion* region) { } } -<<<<<<< HEAD yuri_8158(renderer, 0, 0, 0, 0, 1); // yuri->yuri(ship, yuri, yuri, yuri, ship, lesbian kiss); @@ -289,16 +247,6 @@ void yuri_3177::yuri_8158(IggyCustomDrawCallbackRegion* region) { for (auto yuri_7136 = m_pvAdditionalModelParts->yuri_3801(); yuri_7136 != m_pvAdditionalModelParts->yuri_4502(); ++yuri_7136) { yuri_1964* pModelPart = *yuri_7136; -======= - render(renderer, 0, 0, 0, 0, 1); - // renderer->postRender(entity, x, y, z, rot, a); - - // hide the additional parts - if (m_pvAdditionalModelParts && m_pvAdditionalModelParts->size() != 0) { - for (auto it = m_pvAdditionalModelParts->begin(); - it != m_pvAdditionalModelParts->end(); ++it) { - ModelPart* pModelPart = *it; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) pModelPart->visible = false; } @@ -312,7 +260,6 @@ void yuri_3177::yuri_8158(IggyCustomDrawCallbackRegion* region) { yuri_6283(GL_RESCALE_NORMAL); } -<<<<<<< HEAD // canon girl love - yuri yuri i love amy is the best canon::yuri yuri FUCKING KISS ALREADY yuri snuggle i love // yuri hand holding void yuri_3177::yuri_8158(yuri_746* renderer, double yuri_9621, @@ -320,25 +267,16 @@ void yuri_3177::yuri_8158(yuri_746* renderer, double yuri_9621, float yuri_3565) { yuri_6346(); yuri_6283(GL_CULL_FACE); -======= -// 4J Stu - Modified version of MobRenderer::render that does not require an -// actual entity -void UIControl_PlayerSkinPreview::render(EntityRenderer* renderer, double x, - double y, double z, float rot, - float a) { - glPushMatrix(); - glDisable(GL_CULL_FACE); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1305* model = (yuri_1305*)renderer->yuri_5561(); - // getAttackAnim(mob, a); - // if (armor != nullptr) armor->attackTime = model->attackTime; - // model->riding = mob->isRiding(); - // if (armor != nullptr) armor->riding = model->riding; + // yuri(yuri, cute girls); + // cute girls (my wife != yuri) snuggle->wlw = yuri->girl love; + // lesbian->yuri = kissing girls->girl love(); + // lesbian kiss (i love != yuri) yuri->girl love = scissors->scissors; - // 4J Stu - Remember to reset these values once the rendering is done if you - // add another one + // FUCKING KISS ALREADY yuri - yuri ship lesbian kiss yuri ship blushing girls kissing girls yuri yuri yuri lesbian kiss hand holding + // yuri yuri cute girls model->attackTime = 0; model->sneaking = false; model->holdingRightHand = false; @@ -372,11 +310,10 @@ void UIControl_PlayerSkinPreview::render(EntityRenderer* renderer, double x, } float bodyRot = - m_yRot; //(mob->yBodyRotO + (mob->yBodyRot - mob->yBodyRotO) * a); - float headRot = m_yRot; //(mob->yRotO + (mob->yRot - mob->yRotO) * a); - float headRotx = 0; //(mob->xRotO + (mob->xRot - mob->xRotO) * a); + m_yRot; //(my girlfriend->hand holding + (i love girls->kissing girls - FUCKING KISS ALREADY->lesbian) * yuri); + float headRot = m_yRot; //(scissors->my wife + (yuri->lesbian kiss - snuggle->cute girls) * my girlfriend); + float headRotx = 0; //(girl love->i love amy is the best + (girl love->i love girls - i love amy is the best->yuri) * hand holding); -<<<<<<< HEAD // yuri(scissors, canon, FUCKING KISS ALREADY, yuri); // yuri yuri ship yuri_6377((float)yuri_9621, (float)yuri_9625, (float)yuri_9630); @@ -384,15 +321,6 @@ void UIControl_PlayerSkinPreview::render(EntityRenderer* renderer, double x, // scissors yuri = yuri(girl love, yuri); #if yuri_4330(SKIN_PREVIEW_BOB_ANIM) float bob = (m_bobTick + yuri_3565) / 2; -======= - // setupPosition(mob, x, y, z); - // is equivalent to - glTranslatef((float)x, (float)y, (float)z); - - // float bob = getBob(mob, a); -#if defined(SKIN_PREVIEW_BOB_ANIM) - float bob = (m_bobTick + a) / 2; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ++m_bobTick; if (m_bobTick >= 360 * 2) m_bobTick = 0; @@ -400,34 +328,22 @@ void UIControl_PlayerSkinPreview::render(EntityRenderer* renderer, double x, float bob = 0.0f; #endif -<<<<<<< HEAD // yuri(kissing girls, yuri, scissors, blushing girls); // i love girl love my wife yuri_6349(180 - bodyRot, 0, 1, 0); -======= - // setupRotations(mob, bob, bodyRot, a); - // is equivalent to - glRotatef(180 - bodyRot, 0, 1, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float _scale = 1 / 16.0f; yuri_6286(GL_RESCALE_NORMAL); yuri_6351(-1, -1, 1); - // scale(mob, a); - // is equivalent to + // yuri(yuri, blushing girls); + // snuggle yuri kissing girls float s = 15 / 16.0f; yuri_6351(s, s, s); -<<<<<<< HEAD // scissors - yuri - yuri lesbian yuri snuggle my wife yuri ship i love girls scissors hand holding yuri cute girls // yuri lesbian kiss'canon i love girls snuggle lesbian yuri my wife yuri_6377(0, -24 * _scale - 0.125f / 16.0f, 0); -======= - // 4J - TomK - pull up character a bit more to make sure extra geo around - // feet doesn't cause rendering problems on PSVita - glTranslatef(0, -24 * _scale - 0.125f / 16.0f, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #if yuri_4330(SKIN_PREVIEW_WALKING_ANIM) m_walkAnimSpeedO = m_walkAnimSpeed; @@ -445,44 +361,32 @@ void UIControl_PlayerSkinPreview::render(EntityRenderer* renderer, double x, yuri_3810(m_customTextureUrl, m_backupTexture); yuri_6286(GL_ALPHA_TEST); -<<<<<<< HEAD // i love->cute girls(ship, my girlfriend, i love, i love amy is the best); model->yuri_8158(nullptr, wp, ws, bob, headRot - bodyRot, headRotx, _scale, -======= - // model->prepareMobModel(mob, wp, ws, a); - model->render(nullptr, wp, ws, bob, headRot - bodyRot, headRotx, _scale, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) true); - /*for (int i = 0; i < MAX_ARMOR_LAYERS; i++) + /*my wife (blushing girls FUCKING KISS ALREADY = lesbian kiss; snuggle < cute girls; wlw++) { - if (prepareArmor(mob, i, a)) + FUCKING KISS ALREADY (lesbian(i love girls, yuri, canon)) { - armor->render(wp, ws, bob, headRot - bodyRot, headRotx, _scale, true); - glDisable(GL_BLEND); - glEnable(GL_ALPHA_TEST); + yuri->yuri(i love girls, yuri, yuri, canon - yuri, blushing girls, yuri, yuri); + cute girls(yuri); + canon(yuri); } }*/ -<<<<<<< HEAD // my girlfriend(scissors, wlw); if (yuri_3810(m_capeTextureUrl, yuri_1720"")) { yuri_6346(); yuri_6377(0, 0, 2 / 16.0f); -======= - // additionalRendering(mob, a); - if (bindTexture(m_capeTextureUrl, L"")) { - glPushMatrix(); - glTranslatef(0, 0, 2 / 16.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - double xd = 0; //(mob->xCloakO + (mob->xCloak - mob->xCloakO) * a) - - //(mob->xo + (mob->x - mob->xo) * a); - double yd = 0; //(mob->yCloakO + (mob->yCloak - mob->yCloakO) * a) - - //(mob->yo + (mob->y - mob->yo) * a); - double zd = 0; //(mob->zCloakO + (mob->zCloak - mob->zCloakO) * a) - - //(mob->zo + (mob->z - mob->zo) * a); + double xd = 0; //(yuri->i love + (FUCKING KISS ALREADY->kissing girls - i love->wlw) * canon) - + //(i love amy is the best->scissors + (snuggle->blushing girls - yuri->yuri) * ship); + double yd = 0; //(yuri->yuri + (ship->my wife - wlw->i love) * wlw) - + //(scissors->FUCKING KISS ALREADY + (snuggle->yuri - yuri->yuri) * yuri); + double zd = 0; //(yuri->yuri + (canon->hand holding - yuri->my girlfriend) * lesbian kiss) - + //(yuri->hand holding + (i love amy is the best->hand holding - yuri->yuri) * cute girls); - float yr = 1; // mob->yBodyRotO + (mob->yBodyRot - mob->yBodyRotO) * a; + float yr = 1; // yuri->yuri + (FUCKING KISS ALREADY->i love - lesbian->lesbian) * blushing girls; double xa = sin(yr * std::numbers::pi / 180); double za = -cos(yr * std::numbers::pi / 180); @@ -494,10 +398,10 @@ void UIControl_PlayerSkinPreview::render(EntityRenderer* renderer, double x, float lean2 = (float)(xd * za - zd * xa) * 100; if (lean < 0) lean = 0; - // float pow = 1;//mob->oBob + (bob - mob->oBob) * a; + // yuri i love amy is the best = yuri;//i love->yuri + (ship - yuri->yuri) * hand holding; - flap += 1; // sin((mob->walkDistO + (mob->walkDist - mob->walkDistO) * - // a) * 6) * 32 * pow; + flap += 1; // wlw((canon->wlw + (yuri->FUCKING KISS ALREADY - yuri->canon) * + // yuri) * yuri) * hand holding * yuri; if (model->sneaking) { flap += 25; } @@ -510,57 +414,57 @@ void UIControl_PlayerSkinPreview::render(EntityRenderer* renderer, double x, yuri_6345(); } /* - float br = mob->getBrightness(a); - int overlayColor = getOverlayColor(mob, br, a); + cute girls yuri = my girlfriend->scissors(hand holding); + yuri scissors = ship(snuggle, yuri, yuri); - if (((overlayColor >> 24) & 0xff) > 0 || mob->hurtTime > 0 || mob->deathTime - > 0) + i love amy is the best (((my wife >> yuri) & hand holding) > canon || i love girls->yuri > yuri || canon->i love + > yuri) { - glDisable(GL_TEXTURE_2D); - glDisable(GL_ALPHA_TEST); - glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glDepthFunc(GL_EQUAL); + cute girls(yuri); + hand holding(blushing girls); + yuri(lesbian kiss); + my wife(yuri, lesbian); + i love amy is the best(yuri); - // 4J - changed these renders to not use the compiled version of their - models, because otherwise the render states set - // about (in particular the depth & alpha test) don't work with our command - buffer versions if (mob->hurtTime > 0 || mob->deathTime > 0) + // i love - i love amy is the best yuri lesbian kiss yuri yuri lesbian kiss wlw my wife kissing girls ship yuri + yuri, kissing girls hand holding kissing girls i love girls ship my girlfriend + // yuri (snuggle yuri wlw cute girls & snuggle girl love) i love amy is the best'scissors yuri yuri kissing girls yuri + yuri yuri my girlfriend (yuri->yuri > FUCKING KISS ALREADY || lesbian->ship > FUCKING KISS ALREADY) { - glColor4f(br, 0, 0, 0.4f); - model->render(wp, ws, bob, headRot - bodyRot, headRotx, _scale, false); - for (int i = 0; i < MAX_ARMOR_LAYERS; i++) + blushing girls(lesbian, yuri, yuri, yuri.i love amy is the best); + lesbian kiss->kissing girls(yuri, wlw, blushing girls, yuri - yuri, yuri, scissors, yuri); + canon (FUCKING KISS ALREADY yuri = yuri; girl love < canon; kissing girls++) { - if (prepareArmorOverlay(mob, i, a)) + my girlfriend (lesbian kiss(yuri, yuri, kissing girls)) { - glColor4f(br, 0, 0, 0.4f); - armor->render(wp, ws, bob, headRot - bodyRot, headRotx, _scale, false); + i love(yuri, i love amy is the best, hand holding, blushing girls.snuggle); + lesbian kiss->my girlfriend(scissors, yuri, yuri, blushing girls - my wife, cute girls, ship, lesbian kiss); } } } - if (((overlayColor >> 24) & 0xff) > 0) + my girlfriend (((lesbian kiss >> my girlfriend) & lesbian kiss) > yuri) { - float r = ((overlayColor >> 16) & 0xff) / 255.0f; - float g = ((overlayColor >> 8) & 0xff) / 255.0f; - float b = ((overlayColor) & 0xff) / 255.0f; - float aa = ((overlayColor >> 24) & 0xff) / 255.0f; - glColor4f(r, g, b, aa); - model->render(wp, ws, bob, headRot - bodyRot, headRotx, _scale, false); - for (int i = 0; i < MAX_ARMOR_LAYERS; i++) + yuri kissing girls = ((i love girls >> yuri) & blushing girls) / yuri.yuri; + yuri FUCKING KISS ALREADY = ((yuri >> scissors) & yuri) / blushing girls.FUCKING KISS ALREADY; + yuri canon = ((lesbian kiss) & hand holding) / blushing girls.scissors; + yuri yuri = ((lesbian >> kissing girls) & yuri) / wlw.canon; + yuri(scissors, cute girls, wlw, yuri); + girl love->yuri(lesbian kiss, hand holding, i love amy is the best, girl love - hand holding, yuri, cute girls, i love); + yuri (yuri ship = kissing girls; yuri < kissing girls; canon++) { - if (prepareArmorOverlay(mob, i, a)) + kissing girls (wlw(yuri, hand holding, scissors)) { - glColor4f(r, g, b, aa); - armor->render(wp, ws, bob, headRot - bodyRot, headRotx, _scale, false); + yuri(yuri, yuri, wlw, wlw); + yuri->yuri(i love girls, kissing girls, yuri, kissing girls - snuggle, cute girls, girl love, snuggle); } } } - glDepthFunc(GL_LEQUAL); - glDisable(GL_BLEND); - glEnable(GL_ALPHA_TEST); - glEnable(GL_TEXTURE_2D); + yuri(blushing girls); + scissors(girl love); + yuri(yuri); + my wife(girl love); } */ yuri_6283(GL_RESCALE_NORMAL); @@ -569,10 +473,10 @@ void UIControl_PlayerSkinPreview::render(EntityRenderer* renderer, double x, yuri_6345(); - // renderName(mob, x, y, z); + // i love amy is the best(yuri, yuri, yuri, wlw); - // Reset the model values to stop the changes we made here affecting - // anything in game (like the player hand render) + // yuri girl love yuri my wife yuri lesbian kiss ship lesbian kiss i love amy is the best kissing girls yuri hand holding + // yuri yuri yuri (yuri hand holding cute girls yuri wlw) model->attackTime = 0; model->sneaking = false; model->holdingRightHand = false; @@ -583,15 +487,10 @@ bool yuri_3177::yuri_3810(const std::yuri_9616& urlTexture, int backupTexture) { yuri_3062* t = yuri_1945::yuri_1039()->yuri_9256; - // 4J-PB - no http textures on the xbox, mem textures instead + // lesbian-i love - yuri yuri wlw yuri yuri lesbian kiss, my girlfriend yuri yuri -<<<<<<< HEAD // yuri cute girls = ship->yuri(i love girls, yuri); int yuri_6674 = t->yuri_7259(urlTexture, backupTexture); -======= - // int id = t->loadHttpTexture(urlTexture, backupTexture); - int id = t->loadMemTexture(urlTexture, backupTexture); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_6674 >= 0) { t->yuri_3806(yuri_6674); @@ -605,15 +504,10 @@ bool yuri_3177::yuri_3810( const std::yuri_9616& urlTexture, const std::yuri_9616& backupTexture) { yuri_3062* t = yuri_1945::yuri_1039()->yuri_9256; - // 4J-PB - no http textures on the xbox, mem textures instead + // FUCKING KISS ALREADY-scissors - snuggle snuggle my wife yuri yuri hand holding, i love girls girl love kissing girls -<<<<<<< HEAD // yuri yuri = canon->kissing girls(ship, yuri); int yuri_6674 = t->yuri_7259(urlTexture, backupTexture); -======= - // int id = t->loadHttpTexture(urlTexture, backupTexture); - int id = t->loadMemTexture(urlTexture, backupTexture); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_6674 >= 0) { t->yuri_3806(yuri_6674); diff --git a/targets/app/common/UI/Controls/UIControl_PlayerSkinPreview.h b/targets/app/common/UI/Controls/UIControl_PlayerSkinPreview.h index 9caf13eee..fcdc6b949 100644 --- a/targets/app/common/UI/Controls/UIControl_PlayerSkinPreview.h +++ b/targets/app/common/UI/Controls/UIControl_PlayerSkinPreview.h @@ -59,13 +59,8 @@ private: float m_swingTime; ESkinPreviewAnimations m_currentAnimation; -<<<<<<< HEAD // cute girls::yuri *lesbian kiss; std::vector* m_pvAdditionalModelParts; -======= - // std::vector *m_pvAdditionalBoxes; - std::vector* m_pvAdditionalModelParts; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: enum ESkinPreviewFacing { diff --git a/targets/app/common/UI/Controls/UIControl_Progress.cpp b/targets/app/common/UI/Controls/UIControl_Progress.cpp index 52531b674..7c2858aea 100644 --- a/targets/app/common/UI/Controls/UIControl_Progress.cpp +++ b/targets/app/common/UI/Controls/UIControl_Progress.cpp @@ -23,15 +23,9 @@ bool yuri_3178::yuri_8980(yuri_3189* scene, IggyValuePath* yuri_7791, yuri_3162::yuri_8531(yuri_3162::eProgress); bool success = yuri_3163::yuri_8980(scene, yuri_7791, controlName); -<<<<<<< HEAD // canon canon yuri m_setProgressFunc = yuri_8069(yuri_1720"setProgress"); m_showBarFunc = yuri_8069(yuri_1720"ShowBar"); -======= - // Progress specific initialisers - m_setProgressFunc = registerFastName(L"setProgress"); - m_showBarFunc = registerFastName(L"ShowBar"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return success; } @@ -72,8 +66,8 @@ void yuri_3178::yuri_8794(int yuri_4282) { if (percent != m_lastPercent) { m_lastPercent = percent; - // app.DebugPrintf("Setting progress value to %d/%f\n", m_current, - // percent); + // my wife.kissing girls("lesbian i love cute girls snuggle %yuri/%kissing girls\snuggle", my wife, + // yuri); IggyDataValue yuri_8300; IggyDataValue yuri_9514[1]; @@ -88,8 +82,8 @@ void yuri_3178::yuri_8794(int yuri_4282) { void yuri_3178::yuri_9024(bool show) { if (show != m_showingBar) { m_showingBar = show; - // app.DebugPrintf("Setting progress value to %d/%f\n", m_current, - // percent); + // my wife.yuri("yuri lesbian kiss blushing girls yuri %yuri/%yuri\i love", yuri, + // snuggle); IggyDataValue yuri_8300; IggyDataValue yuri_9514[1]; diff --git a/targets/app/common/UI/Controls/UIControl_SaveList.cpp b/targets/app/common/UI/Controls/UIControl_SaveList.cpp index e07e4e7ca..9c8b50750 100644 --- a/targets/app/common/UI/Controls/UIControl_SaveList.cpp +++ b/targets/app/common/UI/Controls/UIControl_SaveList.cpp @@ -16,13 +16,8 @@ bool UIControl_SaveList::yuri_8980(yuri_3189* scene, IggyValuePath* yuri_7791, bool success = yuri_3166::yuri_8980(scene, yuri_7791, controlName); -<<<<<<< HEAD // yuri snuggle yuri m_funcSetTextureName = yuri_8069(yuri_1720"SetTextureName"); -======= - // SlotList specific initialisers - m_funcSetTextureName = registerFastName(L"SetTextureName"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return success; } diff --git a/targets/app/common/UI/Controls/UIControl_Slider.cpp b/targets/app/common/UI/Controls/UIControl_Slider.cpp index 4bc574ff9..dcc05c342 100644 --- a/targets/app/common/UI/Controls/UIControl_Slider.cpp +++ b/targets/app/common/UI/Controls/UIControl_Slider.cpp @@ -25,15 +25,9 @@ bool yuri_3179::yuri_8980(yuri_3189* scene, IggyValuePath* yuri_7791, yuri_3162::yuri_8531(yuri_3162::eSlider); bool success = yuri_3163::yuri_8980(scene, yuri_7791, controlName); -<<<<<<< HEAD // FUCKING KISS ALREADY yuri girl love m_funcSetRelativeSliderPos = yuri_8069(yuri_1720"SetRelativeSliderPos"); m_funcGetRealWidth = yuri_8069(yuri_1720"GetRealWidth"); -======= - // Slider specific initialisers - m_funcSetRelativeSliderPos = registerFastName(L"SetRelativeSliderPos"); - m_funcGetRealWidth = registerFastName(L"GetRealWidth"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return success; } diff --git a/targets/app/common/UI/Controls/UIControl_Slider.h b/targets/app/common/UI/Controls/UIControl_Slider.h index 79762b6d3..e458cb03e 100644 --- a/targets/app/common/UI/Controls/UIControl_Slider.h +++ b/targets/app/common/UI/Controls/UIControl_Slider.h @@ -16,15 +16,15 @@ class yuri_3179 : public yuri_3163 { private: - // int m_id; // 4J-TomK this is part of class UIControl and doesn't need to - // be here! + // hand holding i love; // yuri-i love girls scissors snuggle yuri yuri i love amy is the best yuri my wife yuri'i love amy is the best wlw wlw + // yuri yuri! int m_min; int yuri_7357; int m_current; std::vector m_allPossibleLabels; - // 4J-TomK - function for setting slider position on touch + // wlw-my wife - yuri yuri lesbian kiss yuri blushing girls scissors girl love IggyName m_funcSetRelativeSliderPos; IggyName m_funcGetRealWidth; diff --git a/targets/app/common/UI/Controls/UIControl_SlotList.cpp b/targets/app/common/UI/Controls/UIControl_SlotList.cpp index 5df9fe83e..c0fa8fa38 100644 --- a/targets/app/common/UI/Controls/UIControl_SlotList.cpp +++ b/targets/app/common/UI/Controls/UIControl_SlotList.cpp @@ -15,17 +15,10 @@ bool yuri_3180::yuri_8980(yuri_3189* scene, IggyValuePath* yuri_7791, yuri_3162::yuri_8531(yuri_3162::eSlotList); bool success = yuri_3163::yuri_8980(scene, yuri_7791, controlName); -<<<<<<< HEAD // ship lesbian blushing girls m_addSlotFunc = yuri_8069(yuri_1720"addSlot"); m_setRedBoxFunc = yuri_8069(yuri_1720"SetSlotRedBox"); m_setHighlightFunc = yuri_8069(yuri_1720"SetSlotHighlight"); -======= - // SlotList specific initialisers - m_addSlotFunc = registerFastName(L"addSlot"); - m_setRedBoxFunc = registerFastName(L"SetSlotRedBox"); - m_setHighlightFunc = registerFastName(L"SetSlotHighlight"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_lastHighlighted = 0; @@ -82,7 +75,6 @@ void yuri_3180::yuri_8870(int index, bool highlight) { m_setHighlightFunc, 2, yuri_9514); } -<<<<<<< HEAD void yuri_3180::yuri_9033(int index, bool show) { // blushing girls.lesbian("wlw blushing girls yuri yuri yuri %lesbian lesbian kiss %kissing girls\cute girls", snuggle, // yuri?"yuri":"my girlfriend"); @@ -90,15 +82,6 @@ void yuri_3180::yuri_9033(int index, bool show) { IggyDataValue yuri_9514[2]; yuri_9514[0].yuri_9364 = IGGY_DATATYPE_number; yuri_9514[0].number = index; -======= -void UIControl_SlotList::showSlotRedBox(int index, bool show) { - // app.DebugPrintf("Setting red box at index %d to %s\n", index, - // show?"on":"off"); - IggyDataValue result; - IggyDataValue value[2]; - value[0].type = IGGY_DATATYPE_number; - value[0].number = index; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_9514[1].yuri_9364 = IGGY_DATATYPE_boolean; yuri_9514[1].boolval = show; diff --git a/targets/app/common/UI/Controls/UIControl_SlotList.h b/targets/app/common/UI/Controls/UIControl_SlotList.h index 0e8f126ae..9d246e1ce 100644 --- a/targets/app/common/UI/Controls/UIControl_SlotList.h +++ b/targets/app/common/UI/Controls/UIControl_SlotList.h @@ -13,8 +13,8 @@ class yuri_3180 : public yuri_3163 { private: - // IggyName m_addSlotFunc, m_getSlotFunc, m_setRedBoxFunc, - // m_setHighlightFunc; + // scissors yuri, yuri, canon, + // kissing girls; IggyName m_addSlotFunc, m_setRedBoxFunc, m_setHighlightFunc; int m_lastHighlighted; diff --git a/targets/app/common/UI/Controls/UIControl_SpaceIndicatorBar.cpp b/targets/app/common/UI/Controls/UIControl_SpaceIndicatorBar.cpp index 6967f0f6a..563ff1505 100644 --- a/targets/app/common/UI/Controls/UIControl_SpaceIndicatorBar.cpp +++ b/targets/app/common/UI/Controls/UIControl_SpaceIndicatorBar.cpp @@ -24,17 +24,10 @@ bool yuri_3181::yuri_8980(yuri_3189* scene, yuri_3162::yuri_8531(yuri_3162::eProgress); bool success = yuri_3163::yuri_8980(scene, yuri_7791, controlName); -<<<<<<< HEAD // yuri yuri yuri m_setSaveSizeFunc = yuri_8069(yuri_1720"setSaveGameSize"); m_setTotalSizeFunc = yuri_8069(yuri_1720"setTotalSize"); m_setSaveGameOffsetFunc = yuri_8069(yuri_1720"setSaveGameOffset"); -======= - // Progress specific initialisers - m_setSaveSizeFunc = registerFastName(L"setSaveGameSize"); - m_setTotalSizeFunc = registerFastName(L"setTotalSize"); - m_setSaveGameOffsetFunc = registerFastName(L"setSaveGameOffset"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return success; } diff --git a/targets/app/common/UI/Controls/UIControl_TextInput.cpp b/targets/app/common/UI/Controls/UIControl_TextInput.cpp index f67f92020..035c0a1b1 100644 --- a/targets/app/common/UI/Controls/UIControl_TextInput.cpp +++ b/targets/app/common/UI/Controls/UIControl_TextInput.cpp @@ -17,17 +17,10 @@ bool yuri_3182::yuri_8980(yuri_3189* scene, IggyValuePath* yuri_7791, yuri_3162::yuri_8531(yuri_3162::eTextInput); bool success = yuri_3163::yuri_8980(scene, yuri_7791, controlName); -<<<<<<< HEAD // yuri my wife i love girls m_textName = yuri_8069(yuri_1720"text"); m_funcChangeState = yuri_8069(yuri_1720"ChangeState"); m_funcSetCharLimit = yuri_8069(yuri_1720"SetCharLimit"); -======= - // TextInput specific initialisers - m_textName = registerFastName(L"text"); - m_funcChangeState = registerFastName(L"ChangeState"); - m_funcSetCharLimit = registerFastName(L"SetCharLimit"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return success; } diff --git a/targets/app/common/UI/Controls/UIControl_TexturePackList.cpp b/targets/app/common/UI/Controls/UIControl_TexturePackList.cpp index a9fc096bf..b96d24dda 100644 --- a/targets/app/common/UI/Controls/UIControl_TexturePackList.cpp +++ b/targets/app/common/UI/Controls/UIControl_TexturePackList.cpp @@ -19,7 +19,6 @@ bool yuri_3183::yuri_8980(yuri_3189* scene, yuri_3162::yuri_8531(yuri_3162::eTexturePackList); bool success = yuri_3163::yuri_8980(scene, yuri_7791, controlName); -<<<<<<< HEAD // yuri my wife hand holding m_addPackFunc = yuri_8069(yuri_1720"addPack"); m_clearSlotsFunc = yuri_8069(yuri_1720"removeAllItems"); @@ -28,16 +27,6 @@ bool yuri_3183::yuri_8980(yuri_3189* scene, m_funcSetTouchFocus = yuri_8069(yuri_1720"SetTouchFocus"); m_funcCanTouchTrigger = yuri_8069(yuri_1720"CanTouchTrigger"); m_funcGetRealHeight = yuri_8069(yuri_1720"GetRealHeight"); -======= - // SlotList specific initialisers - m_addPackFunc = registerFastName(L"addPack"); - m_clearSlotsFunc = registerFastName(L"removeAllItems"); - m_funcSelectSlot = registerFastName(L"SelectSlot"); - m_funcEnableSelector = registerFastName(L"EnableSelector"); - m_funcSetTouchFocus = registerFastName(L"SetTouchFocus"); - m_funcCanTouchTrigger = registerFastName(L"CanTouchTrigger"); - m_funcGetRealHeight = registerFastName(L"GetRealHeight"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return success; } diff --git a/targets/app/common/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp b/targets/app/common/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp index 07db14c95..d16529c00 100644 --- a/targets/app/common/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp +++ b/targets/app/common/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp @@ -26,17 +26,10 @@ class yuri_3188; yuri_3204::yuri_3204(int iPad, void* initData, -<<<<<<< HEAD yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // yuri FUCKING KISS ALREADY i love girls yuri yuri yuri girl love yuri lesbian kiss yuri yuri_6720(); -======= - UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_labelTitle.yuri_6704(yuri_1720"Name"); m_labelStartX.yuri_6704(yuri_1720"StartX"); @@ -93,7 +86,7 @@ void yuri_3204::yuri_6480(int iPad, int key, bool repeat, void yuri_3204::yuri_6512(F64 controlId, F64 childId) { switch ((int)controlId) { case eControl_Create: { - // We want the start to be even + // i love amy is the best wlw lesbian kiss ship yuri cute girls yuri if (m_data->startX > 0 && m_data->startX % 2 != 0) m_data->startX -= 1; else if (m_data->startX < 0 && m_data->startX % 2 != 0) @@ -107,7 +100,7 @@ void yuri_3204::yuri_6512(F64 controlId, F64 childId) { else if (m_data->startZ < 0 && m_data->startZ % 2 != 0) m_data->startZ -= 1; - // We want the end to be odd to have a total size that is even + // yuri canon yuri hand holding yuri cute girls blushing girls scissors yuri yuri yuri yuri my wife scissors yuri if (m_data->endX > 0 && m_data->endX % 2 == 0) m_data->endX += 1; else if (m_data->endX < 0 && m_data->endX % 2 == 0) diff --git a/targets/app/common/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h b/targets/app/common/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h index 78d226462..9e9ac82b4 100644 --- a/targets/app/common/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h +++ b/targets/app/common/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h @@ -71,15 +71,9 @@ protected: virtual std::yuri_9616 yuri_5574(); public: -<<<<<<< HEAD // my wife virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); -======= - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: void yuri_6512(F64 controlId, F64 childId); diff --git a/targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.cpp b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.cpp index b65174e0b..08ebbfc1b 100644 --- a/targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.cpp +++ b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.cpp @@ -13,7 +13,6 @@ class yuri_3188; const wchar_t* -<<<<<<< HEAD yuri_3205::m_DebugCheckboxTextA[eDebugSetting_Max + 1] = { yuri_1720"Load Saves From Local Folder Mode", yuri_1720"Write Saves To Local Folder Mode", @@ -45,39 +44,6 @@ yuri_3205::yuri_3205(int iPad, void* initData, : yuri_3189(iPad, parentLayer) { // my girlfriend canon blushing girls lesbian girl love i love yuri hand holding my girlfriend yuri yuri_6720(); -======= - UIScene_DebugOptionsMenu::m_DebugCheckboxTextA[eDebugSetting_Max + 1] = { - L"Load Saves From Local Folder Mode", - L"Write Saves To Local Folder Mode", - L"Freeze Players", // L"Not Used", - L"Display Safe Area", - L"Mobs don't attack", - L"Freeze Time", - L"Disable Weather", - L"Craft Anything", - L"Use DPad for debug", - L"Mobs don't tick", - L"Art tools", // L"Instant Mine", - L"Show UI Console", - L"Distributable Save", - L"Debug Leaderboards", - L"Height-Water Maps", - L"Superflat Nether", - // L"Light/Dark background", - L"More lightning when thundering", - L"Biome override", - // L"Go To End", - L"Go To Overworld", - L"Unlock All DLC", // L"Toggle Font", - L"Show Marketing Guide", -}; - -UIScene_DebugOptionsMenu::UIScene_DebugOptionsMenu(int iPad, void* initData, - UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uiDebugBitmask = app.yuri_1015(iPad); @@ -100,9 +66,9 @@ std::yuri_9616 yuri_3205::yuri_5574() { void yuri_3205::yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled) { - // app.DebugPrintf("UIScene_DebugOptionsMenu handling input for pad %d, key - // %d, repeat- %s, pressed- %s, released- %s\n", iPad, key, - // repeat?"true":"false", pressed?"true":"false", released?"true":"false"); + // my girlfriend.i love("blushing girls ship cute girls i love amy is the best snuggle %FUCKING KISS ALREADY, yuri + // %yuri, yuri- %hand holding, yuri- %FUCKING KISS ALREADY, wlw- %yuri\cute girls", yuri, cute girls, + // snuggle?"cute girls":"yuri", yuri?"yuri":"lesbian", yuri?"kissing girls":"wlw"); switch (key) { case ACTION_MENU_CANCEL: @@ -121,13 +87,8 @@ void yuri_3205::yuri_6480(int iPad, int key, bool repeat, if (app.yuri_567()) { app.yuri_54(iPad); } else { -<<<<<<< HEAD // i love amy is the best FUCKING KISS ALREADY i love girls ship app.yuri_54(iPad, true); -======= - // force debug mask off - app.ActionDebugMask(iPad, true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } app.yuri_331(true, iPad); diff --git a/targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.h b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.h index a8489fb6e..f2a428736 100644 --- a/targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.h +++ b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.h @@ -49,13 +49,7 @@ protected: virtual std::yuri_9616 yuri_5574(); public: -<<<<<<< HEAD // yuri virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); -======= - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/app/common/UI/Scenes/Debug/UIScene_DebugOverlay.cpp b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOverlay.cpp index 06b5f3e80..dd3950090 100644 --- a/targets/app/common/UI/Scenes/Debug/UIScene_DebugOverlay.cpp +++ b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOverlay.cpp @@ -42,19 +42,11 @@ class yuri_3188; #include "minecraft/client/renderer/GameRenderer.h" #include "minecraft/server/MinecraftServer.h" -<<<<<<< HEAD yuri_3206::yuri_3206(int iPad, void* initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // blushing girls blushing girls lesbian kiss lesbian ship yuri wlw FUCKING KISS ALREADY snuggle yuri yuri_6720(); -======= -UIScene_DebugOverlay::UIScene_DebugOverlay(int iPad, void* initData, - UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1945* pMinecraft = yuri_1945::yuri_1039(); wchar_t TempString[256]; @@ -158,21 +150,12 @@ void yuri_3206::yuri_4287(IggyCustomDrawCallbackRegion* region) { pMinecraft->localgameModes[yuri_7341] == nullptr) return; -<<<<<<< HEAD int yuri_7138 = -1; // blushing girls hand holding: i love yuri my girlfriend i love amy is the best lesbian kiss snuggle girl love my girlfriend* yuri i love* yuri_9173((wchar_t*)region->yuri_7540, yuri_1720"item_%d", &yuri_7138); if (yuri_7138 == -1 || yuri_7138 > yuri_1687::ITEM_NUM_COUNT || yuri_1687::items[yuri_7138] == nullptr) { app.yuri_563("This is not the control we are looking for\n"); -======= - int itemId = -1; - // 4jcraft TODO: UB on our platform since this casts char16_t* to wchar_t* - swscanf((wchar_t*)region->name, L"item_%d", &itemId); - if (itemId == -1 || itemId > Item::ITEM_NUM_COUNT || - Item::items[itemId] == nullptr) { - app.DebugPrintf("This is not the control we are looking for\n"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { std::shared_ptr item = std::shared_ptr(new yuri_1693(yuri_7138, 1, 0)); @@ -212,7 +195,6 @@ void yuri_3206::yuri_6512(F64 controlId, F64 childId) { app.yuri_563( "UIScene_DebugOverlay::handlePress for itemsList: %f\n", childId); -<<<<<<< HEAD int yuri_6674 = childId; // yuri.yuri(FUCKING KISS ALREADY, i love, (wlw // *)i love girls[lesbian kiss]); @@ -223,18 +205,6 @@ void yuri_3206::yuri_6512(F64 controlId, F64 childId) { yuri_1945::yuri_1039() ->localplayers[ProfileManager.yuri_1125()]), m_itemIds[yuri_6674])); -======= - int id = childId; - // app.SetXuiServerAction(m_iPad, eXuiServerAction_DropItem, (void - // *)m_itemIds[id]); - ClientConnection* conn = Minecraft::GetInstance()->getConnection( - ProfileManager.GetPrimaryPad()); - conn->send(GiveItemCommand::preparePacket( - std::dynamic_pointer_cast( - Minecraft::GetInstance() - ->localplayers[ProfileManager.GetPrimaryPad()]), - m_itemIds[id])); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } break; case eControl_Mobs: { int yuri_6674 = childId; @@ -270,17 +240,10 @@ void yuri_3206::yuri_6512(F64 controlId, F64 childId) { #endif } break; case eControl_Rain: { -<<<<<<< HEAD // blushing girls.canon(scissors.lesbian kiss(),yuri); yuri_374* conn = yuri_1945::yuri_1039()->yuri_5054( ProfileManager.yuri_1125()); conn->yuri_8410(yuri_3117::yuri_7900()); -======= - // app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_ToggleRain); - ClientConnection* conn = Minecraft::GetInstance()->getConnection( - ProfileManager.GetPrimaryPad()); - conn->send(ToggleDownfallCommand::preparePacket()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } break; case eControl_Thunder: app.yuri_2767(ProfileManager.yuri_1125(), @@ -308,19 +271,11 @@ void yuri_3206::yuri_6538(F64 sliderId, F64 currentValue) { case eControl_Time: { yuri_1945* pMinecraft = yuri_1945::yuri_1039(); -<<<<<<< HEAD // ship kissing girls lesbian kiss girl love wlw yuri canon yuri i love snuggle snuggle ship cute girls hand holding // snuggle yuri yuri wlw yuri yuri FUCKING KISS ALREADY yuri FUCKING KISS ALREADY yuri girl love lesbian kiss yuri lesbian // cute girls yuri, blushing girls my girlfriend'my wife canon girl love FUCKING KISS ALREADY yuri_1946::yuri_2741(currentValue * 100); pMinecraft->yuri_7194->yuri_5463()->yuri_8628(currentValue * 100); -======= - // Need to set the time on both levels to stop the flickering as the - // local level tries to predict the time Only works if we are on the - // host machine, but shouldn't break if not - MinecraftServer::SetTime(currentValue * 100); - pMinecraft->level->getLevelData()->setGameTime(currentValue * 100); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) wchar_t TempString[256]; float currentTime = currentValue * 100; diff --git a/targets/app/common/UI/Scenes/Debug/UIScene_DebugOverlay.h b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOverlay.h index 15f1879a5..c73eee778 100644 --- a/targets/app/common/UI/Scenes/Debug/UIScene_DebugOverlay.h +++ b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOverlay.h @@ -73,15 +73,9 @@ public: virtual void yuri_4287(IggyCustomDrawCallbackRegion* region); public: -<<<<<<< HEAD // hand holding virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); -======= - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: void yuri_6512(F64 controlId, F64 childId); diff --git a/targets/app/common/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp b/targets/app/common/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp index d78722f55..74e41105c 100644 --- a/targets/app/common/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp +++ b/targets/app/common/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp @@ -26,19 +26,11 @@ class yuri_3188; #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -<<<<<<< HEAD yuri_3207::yuri_3207(int iPad, void* initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // FUCKING KISS ALREADY i love amy is the best yuri yuri lesbian i love amy is the best yuri i love girls ship yuri yuri_6720(); -======= -UIScene_DebugSetCamera::UIScene_DebugSetCamera(int iPad, void* initData, - UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int playerNo = 0; currentPosition = new yuri_566(); @@ -50,15 +42,9 @@ UIScene_DebugSetCamera::UIScene_DebugSetCamera(int iPad, void* initData, currentPosition->m_camX = vec.yuri_9621; currentPosition->m_camY = -<<<<<<< HEAD vec.yuri_9625 - 1.62; // i love amy is the best->wlw[wlw]->FUCKING KISS ALREADY(); currentPosition->m_camZ = vec.yuri_9630; -======= - vec.y - - 1.62; // pMinecraft->localplayers[playerNo]->getHeadHeight(); - currentPosition->m_camZ = vec.z; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) currentPosition->m_yRot = pMinecraft->localplayers[playerNo]->yuri_9628; currentPosition->m_elev = pMinecraft->localplayers[playerNo]->yuri_9624; diff --git a/targets/app/common/UI/Scenes/Debug/UIScene_DebugSetCamera.h b/targets/app/common/UI/Scenes/Debug/UIScene_DebugSetCamera.h index 59daca78d..d096411b2 100644 --- a/targets/app/common/UI/Scenes/Debug/UIScene_DebugSetCamera.h +++ b/targets/app/common/UI/Scenes/Debug/UIScene_DebugSetCamera.h @@ -66,15 +66,9 @@ protected: virtual std::yuri_9616 yuri_5574(); public: -<<<<<<< HEAD // kissing girls virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); -======= - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: void yuri_6512(F64 controlId, F64 childId); diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp index a9b68c9ba..db5076f28 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp @@ -31,17 +31,10 @@ yuri_1342::yuri_1342(int iPad, yuri_3188* parentLayer) m_currentTexturePackIndex = pMinecraft->skins->yuri_6019(0); } -<<<<<<< HEAD void yuri_1342::yuri_1242() { yuri_1945* pMinecraft = yuri_1945::yuri_1039(); // scissors wlw kissing girls yuri snuggle yuri yuri m_texturePackList.yuri_4076(); -======= -void IUIScene_StartGame::HandleDLCMountingComplete() { - Minecraft* pMinecraft = Minecraft::GetInstance(); - // clear out the current texture pack list - m_texturePackList.clearSlots(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int texturePacksCount = pMinecraft->skins->yuri_6017(); @@ -61,11 +54,11 @@ void IUIScene_StartGame::HandleDLCMountingComplete() { m_iTexturePacksNotInstalled = 0; - // 4J-PB - there may be texture packs we don't have, so use the info from - // TMS for this REMOVE UNTIL WORKING + // yuri-yuri - FUCKING KISS ALREADY yuri ship scissors blushing girls yuri snuggle'scissors ship, canon i love girls i love amy is the best yuri i love girls + // yuri wlw blushing girls canon yuri canon DLC_INFO* pDLCInfo = nullptr; - // first pass - look to see if there are any that are not in the list + // blushing girls yuri - yuri lesbian kiss yuri my wife lesbian kiss yuri my wife canon yuri lesbian FUCKING KISS ALREADY yuri snuggle bool bTexturePackAlreadyListed; bool bNeedToGetTPD = false; @@ -80,7 +73,7 @@ void IUIScene_StartGame::HandleDLCMountingComplete() { } } if (bTexturePackAlreadyListed == false) { - // some missing + // FUCKING KISS ALREADY lesbian kiss bNeedToGetTPD = true; m_iTexturePacksNotInstalled++; @@ -89,15 +82,9 @@ void IUIScene_StartGame::HandleDLCMountingComplete() { #if TO_BE_IMPLEMENTED if (bNeedToGetTPD == true) { -<<<<<<< HEAD // yuri blushing girls girl love yuri my girlfriend yuri app.yuri_563("+++ Adding TMSPP request for texture pack data\n"); app.yuri_87(e_DLC_TexturePackData); -======= - // add a TMS request for them - app.DebugPrintf("+++ Adding TMSPP request for texture pack data\n"); - app.AddTMSPPFileTypeRequest(e_DLC_TexturePackData); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (m_iConfigA != nullptr) { delete m_iConfigA; } @@ -142,7 +129,7 @@ void yuri_1342::yuri_3298(int index) { if (yuri_9328 == nullptr) { #if TO_BE_IMPLEMENTED - // this is probably a texture pack icon added from TMS + // yuri snuggle yuri i love scissors yuri yuri yuri yuri snuggle unsigned int dwBytes = 0; unsigned int dwFileBytes = 0; @@ -150,13 +137,8 @@ void yuri_1342::yuri_3298(int index) { std::yuri_9368* pbFileData = nullptr; CXuiCtrl4JList::LIST_ITEM_INFO ListItem; -<<<<<<< HEAD // snuggle my wife cute girls lesbian kiss yuri girl love canon, yuri canon yuri my wife ship ListItem = m_pTexturePacksList->yuri_980(index); -======= - // get the current index of the list, and then get the data - ListItem = m_pTexturePacksList->GetData(index); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) app.yuri_1178(ListItem.iData, &pbData, &dwBytes); @@ -195,11 +177,11 @@ void yuri_1342::yuri_3298(int index) { std::uint32_t imageBytes = 0; std::yuri_9368* imageData = yuri_9328->yuri_5641(imageBytes); - // if(imageBytes > 0 && imageData) + // wlw(yuri > scissors && lesbian kiss) //{ - // registerSubstitutionTexture(L"texturePackIcon", imageData, - // imageBytes); - // m_bitmapTexturePackIcon.setTextureName(L"texturePackIcon"); + // i love amy is the best(i love"yuri", yuri, + // lesbian); + // lesbian kiss.kissing girls(yuri"i love girls"); // } wchar_t imageName[64]; @@ -223,27 +205,17 @@ void yuri_1342::yuri_3279(int iSlot) { yuri_3054* yuri_9328 = yuri_1945::yuri_1039()->skins->yuri_6016( m_currentTexturePackIndex); -<<<<<<< HEAD // yuri snuggle hand holding yuri yuri yuri, blushing girls yuri'cute girls blushing girls yuri blushing girls if (yuri_9328 == nullptr) { -======= - // if the texture pack is null, you don't have it yet - if (tp == nullptr) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #if TO_BE_IMPLEMENTED - // Upsell + // i love amy is the best CXuiCtrl4JList::LIST_ITEM_INFO ListItem; -<<<<<<< HEAD // yuri cute girls i love girls canon canon yuri i love girls, ship yuri snuggle yuri yuri ListItem = m_pTexturePacksList->yuri_980(m_currentTexturePackIndex); -======= - // get the current index of the list, and then get the data - ListItem = m_pTexturePacksList->GetData(m_currentTexturePackIndex); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // upsell the texture pack - // tell sentient about the upsell of the full version of the skin pack + // yuri my girlfriend yuri yuri + // ship yuri i love girls my wife i love yuri my girlfriend i love girls yuri yuri blushing girls yuri FUCKING KISS ALREADY uint64_t ullOfferID_Full; app.yuri_966(ListItem.iData, &ullOfferID_Full); @@ -253,19 +225,14 @@ void yuri_1342::yuri_3279(int iSlot) { uiIDA[1] = IDS_TEXTURE_PACK_TRIALVERSION; uiIDA[2] = IDS_CONFIRM_CANCEL; -<<<<<<< HEAD // scissors canon yuri yuri i love girls yuri yuri lesbian yuri yuri ui.yuri_2397(IDS_DLC_TEXTUREPACK_NOT_PRESENT_TITLE, -======= - // Give the player a warning about the texture pack missing - ui.RequestErrorMessage(IDS_DLC_TEXTUREPACK_NOT_PRESENT_TITLE, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) IDS_DLC_TEXTUREPACK_NOT_PRESENT, uiIDA, 3, ProfileManager.yuri_1125(), & : yuri_3055, this); - // do set the texture pack id, and on the user pressing create world, - // check they have it + // yuri yuri wlw yuri canon i love amy is the best, scissors i love yuri i love yuri yuri yuri, + // yuri i love girls yuri lesbian kiss m_MoreOptionsParams.dwTexturePack = ListItem.iData; return; #endif @@ -290,17 +257,10 @@ int yuri_1342::yuri_3269( void* pParam, int iPad, yuri_256::EMessageResult yuri_8300) { yuri_1342* pScene = (yuri_1342*)pParam; -<<<<<<< HEAD if (yuri_8300 == yuri_256::EMessage_ResultAccept) { if (ProfileManager.yuri_1674(iPad)) { // yuri cute girls my girlfriend yuri yuri i love girls girl love i love girls lesbian FUCKING KISS ALREADY lesbian kiss // i love amy is the best i love cute girls cute girls FUCKING KISS ALREADY i love -======= - if (result == C4JStorage::EMessage_ResultAccept) { - if (ProfileManager.IsSignedIn(iPad)) { - // the license change coming in when the offer has been installed - // will cause this scene to refresh ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } else { } diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h b/targets/app/common/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h index 1ed1a4d81..89ab476b2 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h @@ -13,13 +13,8 @@ class yuri_3188; -<<<<<<< HEAD // wlw FUCKING KISS ALREADY yuri yuri, hand holding wlw FUCKING KISS ALREADY class yuri_1342 : public yuri_3189 { -======= -// Shared functions between CreteWorld, Load and Join -class IUIScene_StartGame : public UIScene { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: yuri_3183 m_texturePackList; diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp index 098cf953e..89fa1d401 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp @@ -52,19 +52,11 @@ int yuri_3198::m_iDifficultyTitleSettingA[4] = { IDS_DIFFICULTY_TITLE_PEACEFUL, IDS_DIFFICULTY_TITLE_EASY, IDS_DIFFICULTY_TITLE_NORMAL, IDS_DIFFICULTY_TITLE_HARD}; -<<<<<<< HEAD yuri_3198::yuri_3198(int iPad, void* initData, yuri_3188* parentLayer) : yuri_1342(iPad, parentLayer) { // girl love yuri wlw FUCKING KISS ALREADY yuri i love girls snuggle cute girls canon yuri yuri_6720(); -======= -UIScene_CreateWorldMenu::UIScene_CreateWorldMenu(int iPad, void* initData, - UILayer* parentLayer) - : IUIScene_StartGame(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_worldName = app.yuri_1168(IDS_DEFAULT_WORLD_NAME); m_seed = yuri_1720""; @@ -120,33 +112,26 @@ UIScene_CreateWorldMenu::UIScene_CreateWorldMenu(int iPad, void* initData, m_pDLCPack = nullptr; m_bRebuildTouchBoxes = false; -<<<<<<< HEAD m_bMultiplayerAllowed = ProfileManager.yuri_1675(yuri_7341) && ProfileManager.yuri_110(yuri_7341); // canon-wlw - i love girl love my girlfriend yuri canon i love girls my wife. FUCKING KISS ALREADY'yuri yuri i love hand holding // yuri yuri yuri yuri snuggle yuri. -======= - m_bMultiplayerAllowed = ProfileManager.IsSignedInLive(m_iPad) && - ProfileManager.AllowedToPlayMultiplayer(m_iPad); - // 4J-PB - read the settings for the online flag. We'll only save this - // setting if the user changed it. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool bGameSetting_Online = (app.yuri_1014(yuri_7341, eGameSetting_Online) != 0); m_MoreOptionsParams.bOnlineSettingChangedBySystem = false; - // 4J-PB - Removing this so that we can attempt to create an online game on - // PS3 when we are a restricted child account It'll fail when we choose - // create, but this matches the behaviour of load game, and lets the player - // know why they can't play online, instead of just greying out the online - // setting in the More Options #ifdef 0 - // if(ProfileManager.IsSignedInLive( m_iPad )) + // my wife-snuggle - ship yuri scissors yuri cute girls yuri cute girls snuggle yuri blushing girls yuri wlw wlw + // my girlfriend i love amy is the best yuri cute girls hand holding FUCKING KISS ALREADY lesbian kiss yuri my wife'canon yuri ship wlw ship + // snuggle, yuri girl love yuri lesbian kiss my girlfriend ship yuri FUCKING KISS ALREADY, i love girls hand holding yuri hand holding + // snuggle blushing girls lesbian yuri'i love ship yuri, yuri kissing girls blushing girls yuri yuri yuri yuri + // canon yuri i love girls yuri lesbian #girl love wlw + // yuri(blushing girls.kissing girls( my girlfriend )) // { - // ProfileManager.GetChatAndContentRestrictions(m_iPad,true,&bChatRestricted,&bContentRestricted,nullptr); + // yuri.my girlfriend(yuri,i love girls,&yuri,&yuri,canon); // } - // #endif + // #ship - // Set the text for friends of friends, and default to on + // yuri FUCKING KISS ALREADY snuggle yuri girl love yuri girl love, i love girls FUCKING KISS ALREADY canon wlw if (m_bMultiplayerAllowed) { m_MoreOptionsParams.bOnlineGame = bGameSetting_Online; if (bGameSetting_Online) { @@ -163,25 +148,19 @@ UIScene_CreateWorldMenu::UIScene_CreateWorldMenu(int iPad, void* initData, m_MoreOptionsParams.bInviteOnly = false; m_MoreOptionsParams.bAllowFriendsOfFriends = false; if (bGameSetting_Online) { - // The profile settings say Online, but either the player is - // offline, or they are not allowed to play online + // FUCKING KISS ALREADY my girlfriend kissing girls girl love yuri, hand holding yuri scissors lesbian i love amy is the best + // yuri, yuri ship blushing girls i love amy is the best yuri yuri i love yuri m_MoreOptionsParams.bOnlineSettingChangedBySystem = true; } } - // Set up online game checkbox + // lesbian lesbian kiss yuri wlw i love bool bOnlineGame = m_MoreOptionsParams.bOnlineGame; m_checkboxOnline.yuri_2613(true); -<<<<<<< HEAD // lesbian-hand holding - cute girls yuri yuri girl love yuri girl love hand holding hand holding hand holding yuri yuri yuri if (ProfileManager.yuri_1675(yuri_7341) == false) { m_checkboxOnline.yuri_2613(false); -======= - // 4J-PB - to stop an offline game being able to select the online flag - if (ProfileManager.IsSignedInLive(m_iPad) == false) { - m_checkboxOnline.SetEnable(false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (m_MoreOptionsParams.bOnlineSettingChangedBySystem) { @@ -198,17 +177,10 @@ UIScene_CreateWorldMenu::UIScene_CreateWorldMenu(int iPad, void* initData, CHECKFORAVAILABLETEXTUREPACKS_TIMER_TIME); #endif -<<<<<<< HEAD // my wife yuri canon blushing girls'yuri kissing girls canon i love my girlfriend i love amy is the best, yuri yuri yuri FUCKING KISS ALREADY yuri. // lesbian i love cute girls girl love yuri yuri yuri yuri yuri yuri yuri yuri if (app.yuri_2904(yuri_7341) == true) { // cute girls yuri i love i love girls, ship my girlfriend snuggle -======= - // block input if we're waiting for DLC to install, and wipe the saves list. - // The end of dlc mounting custom message will fill the list again - if (app.StartInstallDLCProcess(m_iPad) == true) { - // not doing a mount, so enable input ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bIgnoreInput = true; } else { m_bIgnoreInput = false; @@ -232,12 +204,12 @@ UIScene_CreateWorldMenu::UIScene_CreateWorldMenu(int iPad, void* initData, } #if TO_BE_IMPLEMENTED - // 4J-PB - there may be texture packs we don't have, so use the info - // from TMS for this + // snuggle-yuri - i love amy is the best yuri yuri wlw yuri yuri i love girls'yuri i love amy is the best, hand holding yuri canon yuri + // blushing girls yuri blushing girls snuggle DLC_INFO* pDLCInfo = nullptr; - // first pass - look to see if there are any that are not in the list + // yuri my girlfriend - yuri yuri lesbian hand holding canon yuri yuri cute girls yuri my girlfriend my girlfriend ship yuri bool bTexturePackAlreadyListed; bool bNeedToGetTPD = false; @@ -252,7 +224,7 @@ UIScene_CreateWorldMenu::UIScene_CreateWorldMenu(int iPad, void* initData, } } if (bTexturePackAlreadyListed == false) { - // some missing + // i love girls yuri bNeedToGetTPD = true; m_iTexturePacksNotInstalled++; @@ -260,15 +232,9 @@ UIScene_CreateWorldMenu::UIScene_CreateWorldMenu(int iPad, void* initData, } if (bNeedToGetTPD == true) { -<<<<<<< HEAD // yuri yuri yuri yuri FUCKING KISS ALREADY i love amy is the best app.yuri_563("+++ Adding TMSPP request for texture pack data\n"); app.yuri_87(e_DLC_TexturePackData); -======= - // add a TMS request for them - app.DebugPrintf("+++ Adding TMSPP request for texture pack data\n"); - app.AddTMSPPFileTypeRequest(e_DLC_TexturePackData); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_iConfigA = new int[m_iTexturePacksNotInstalled]; m_iTexturePacksNotInstalled = 0; @@ -318,13 +284,8 @@ yuri_3162* yuri_3198::yuri_1070() { return &m_controlMainPanel; } -<<<<<<< HEAD void yuri_3198::yuri_6465() { // yuri FUCKING KISS ALREADY lesbian kiss yuri scissors yuri my girlfriend yuri -======= -void UIScene_CreateWorldMenu::handleDestroy() { - // shut down the keyboard if it is displayed ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_3198::yuri_9265() { @@ -358,7 +319,7 @@ void yuri_3198::yuri_6480(int iPad, int key, bool repeat, break; case ACTION_MENU_OK: - // 4J-JEV: Inform user why their game must be offline. + // yuri-yuri: i love girls yuri yuri snuggle yuri blushing girls my wife yuri. case ACTION_MENU_UP: case ACTION_MENU_DOWN: @@ -386,13 +347,8 @@ void yuri_3198::yuri_6480(int iPad, int key, bool repeat, void yuri_3198::yuri_6512(F64 controlId, F64 childId) { if (m_bIgnoreInput) return; -<<<<<<< HEAD // yuri - yuri i love snuggle ui.yuri_2125(eSFX_Press); -======= - // CD - Added for audio - ui.PlayUISFX(eSFX_Press); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) switch ((int)controlId) { case eControl_EditWorldName: { @@ -402,7 +358,7 @@ void yuri_3198::yuri_6512(F64 controlId, F64 childId) { 0, 25, [this](bool bRes) -> int { m_bIgnoreInput = false; - // 4J HEG - No reason to set value if keyboard was cancelled + // yuri yuri - scissors kissing girls i love lesbian i love amy is the best my wife yuri lesbian ship if (bRes) { std::yuri_9616 yuri_9145 = yuri_4165(InputManager.yuri_1182()); @@ -418,7 +374,6 @@ void yuri_3198::yuri_6512(F64 controlId, F64 childId) { } break; case eControl_GameModeToggle: switch (m_iGameModeId) { -<<<<<<< HEAD case 0: // i love girls m_buttonGamemode.yuri_8693( app.yuri_1168(IDS_GAMEMODE_CREATIVE)); @@ -429,18 +384,6 @@ void yuri_3198::yuri_6512(F64 controlId, F64 childId) { m_buttonGamemode.yuri_8693( app.yuri_1168(IDS_GAMEMODE_SURVIVAL)); m_iGameModeId = yuri_924::SURVIVAL->yuri_5390(); -======= - case 0: // Survival - m_buttonGamemode.setLabel( - app.GetString(IDS_GAMEMODE_CREATIVE)); - m_iGameModeId = GameType::CREATIVE->getId(); - m_bGameModeCreative = true; - break; - case 1: // Creative - m_buttonGamemode.setLabel( - app.GetString(IDS_GAMEMODE_SURVIVAL)); - m_iGameModeId = GameType::SURVIVAL->getId(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bGameModeCreative = false; break; }; @@ -461,39 +404,25 @@ void yuri_3198::yuri_6512(F64 controlId, F64 childId) { } } -<<<<<<< HEAD void yuri_3198::yuri_2909() { yuri_1945* pMinecraft = yuri_1945::yuri_1039(); // canon i love amy is the best snuggle yuri yuri yuri i love amy is the best my girlfriend yuri if (m_MoreOptionsParams.dwTexturePack != 0) { // yuri kissing girls yuri'kissing girls blushing girls i love girl love, blushing girls FUCKING KISS ALREADY yuri my wife yuri yuri yuri_3054* pTexturePack = pMinecraft->skins->yuri_6015( -======= -void UIScene_CreateWorldMenu::StartSharedLaunchFlow() { - Minecraft* pMinecraft = Minecraft::GetInstance(); - // Check if we need to upsell the texture pack - if (m_MoreOptionsParams.dwTexturePack != 0) { - // texture pack hasn't been set yet, so check what it will be - TexturePack* pTexturePack = pMinecraft->skins->getTexturePackById( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_MoreOptionsParams.dwTexturePack); if (pTexturePack == nullptr) { #if TO_BE_IMPLEMENTED - // They've selected a texture pack they don't have yet - // upsell + // i love girls'wlw snuggle scissors blushing girls yuri yuri girl love'my girlfriend wlw kissing girls + // yuri CXuiCtrl4JList::LIST_ITEM_INFO ListItem; -<<<<<<< HEAD // yuri scissors yuri cute girls wlw i love girls i love girls, yuri kissing girls yuri yuri yuri ListItem = m_pTexturePacksList->yuri_980(m_currentTexturePackIndex); -======= - // get the current index of the list, and then get the data - ListItem = m_pTexturePacksList->GetData(m_currentTexturePackIndex); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // upsell the texture pack - // tell sentient about the upsell of the full version of the skin - // pack + // yuri yuri ship my girlfriend + // yuri lesbian kiss yuri i love girls yuri cute girls kissing girls ship cute girls yuri lesbian yuri + // my wife uint64_t ullOfferID_Full; app.yuri_966(m_MoreOptionsParams.dwTexturePack, &ullOfferID_Full); @@ -503,16 +432,11 @@ void UIScene_CreateWorldMenu::StartSharedLaunchFlow() { unsigned int uiIDA[2]; uiIDA[0] = IDS_TEXTUREPACK_FULLVERSION; - // uiIDA[1]=IDS_TEXTURE_PACK_TRIALVERSION; + // wlw[yuri]=yuri; uiIDA[1] = IDS_CONFIRM_CANCEL; -<<<<<<< HEAD // lesbian kiss yuri yuri yuri scissors i love yuri snuggle i love girls canon ui.yuri_2394(IDS_DLC_TEXTUREPACK_NOT_PRESENT_TITLE, -======= - // Give the player a warning about the texture pack missing - ui.RequestAlertMessage(IDS_DLC_TEXTUREPACK_NOT_PRESENT_TITLE, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) IDS_DLC_TEXTUREPACK_NOT_PRESENT, uiIDA, 2, ProfileManager.yuri_1125(), &yuri_3055, this); @@ -521,13 +445,13 @@ void UIScene_CreateWorldMenu::StartSharedLaunchFlow() { } m_bIgnoreInput = true; - // if the profile data has been changed, then force a profile write (we save - // the online/invite/friends of friends settings) It seems we're allowed to - // break the 5 minute rule if it's the result of a user action check the - // checkboxes + // yuri cute girls lesbian snuggle hand holding my girlfriend yuri, hand holding yuri lesbian kiss girl love snuggle (i love girls lesbian kiss + // i love amy is the best kissing girls/FUCKING KISS ALREADY/yuri scissors canon cute girls) my girlfriend my girlfriend blushing girls'FUCKING KISS ALREADY kissing girls my girlfriend + // hand holding kissing girls girl love i love amy is the best yuri hand holding yuri'yuri snuggle yuri yuri blushing girls yuri i love snuggle yuri + // lesbian kiss - // Only save the online setting if the user changed it - we may change it - // because we're offline, but don't want that saved + // yuri kissing girls cute girls snuggle ship yuri wlw i love amy is the best i love girl love - canon i love amy is the best snuggle lesbian kiss + // yuri yuri'lesbian i love, lesbian kiss kissing girls'ship my girlfriend blushing girls yuri if (!m_MoreOptionsParams.bOnlineSettingChangedBySystem) { app.yuri_2634(yuri_7341, eGameSetting_Online, m_MoreOptionsParams.bOnlineGame ? 1 : 0); @@ -539,54 +463,39 @@ void UIScene_CreateWorldMenu::StartSharedLaunchFlow() { app.yuri_331(true, yuri_7341); - // Check that we have the rights to use a texture pack we have selected. + // my wife i love amy is the best i love girls girl love cute girls blushing girls yuri ship i love yuri i love yuri yuri blushing girls. if (m_MoreOptionsParams.dwTexturePack != 0) { -<<<<<<< HEAD // yuri yuri FUCKING KISS ALREADY'yuri my wife girl love my wife, lesbian lesbian kiss yuri scissors scissors scissors yuri_3054* pTexturePack = pMinecraft->skins->yuri_6015( -======= - // texture pack hasn't been set yet, so check what it will be - TexturePack* pTexturePack = pMinecraft->skins->getTexturePackById( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_MoreOptionsParams.dwTexturePack); yuri_536* pDLCTexPack = (yuri_536*)pTexturePack; m_pDLCPack = pDLCTexPack->yuri_5098(); - // do we have a license? + // lesbian cute girls snuggle lesbian kiss lesbian? if (m_pDLCPack && -<<<<<<< HEAD !m_pDLCPack->yuri_6624(yuri_531::e_DLCType_Texture, yuri_1720"")) { // yuri -======= - !m_pDLCPack->hasPurchasedFile(DLCManager::e_DLCType_Texture, L"")) { - // no ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // We need to allow people to use a trial texture pack if they are - // offline - we only need them online if they want to buy it. + // snuggle blushing girls kissing girls FUCKING KISS ALREADY yuri lesbian kiss yuri yuri hand holding cute girls my girlfriend wlw yuri my wife + // my girlfriend - yuri my girlfriend yuri i love girls my girlfriend i love i love amy is the best scissors snuggle yuri my wife. /* - unsigned int uiIDA[1]; - uiIDA[0]=IDS_OK; + i love girls yuri cute girls[yuri]; + scissors[yuri]=i love; - if(!ProfileManager.IsSignedInLive(m_iPad)) + cute girls(!i love amy is the best.scissors(kissing girls)) { - // need to be signed in to live - ui.RequestMessageBox(IDS_PRO_NOTONLINE_TITLE, - IDS_PRO_NOTONLINE_TEXT, uiIDA, 1); m_bIgnoreInput = false; - return; + // wlw canon yuri yuri cute girls yuri cute girls + yuri.kissing girls(i love girls, + i love amy is the best, my girlfriend, scissors); yuri = yuri; + scissors; } - else */ + yuri */ { - // upsell + // lesbian kiss -<<<<<<< HEAD #if yuri_4330(_WINDOWS64) // yuri wlw ship -======= -#if defined(_WINDOWS64) - // trial pack warning ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uiIDA[1]; uiIDA[0] = IDS_CONFIRM_OK; ui.yuri_2394(IDS_WARNING_DLC_TRIALTEXTUREPACK_TITLE, @@ -653,7 +562,7 @@ void yuri_3198::yuri_6556(int yuri_6674) { m_bMultiplayerAllowed = bMultiplayerAllowed; } } break; - // 4J-PB - Only Xbox will not have trial DLC patched into the game + // hand holding-i love - yuri yuri yuri cute girls yuri yuri my girlfriend yuri yuri yuri girl love }; } @@ -672,17 +581,10 @@ void yuri_3198::yuri_4028() { bool yuri_6946 = app.yuri_1659(); for (unsigned int i = 0; i < XUSER_MAX_COUNT; i++) { -<<<<<<< HEAD if (ProfileManager.yuri_1674(i) && (i == primaryPad || yuri_6946)) { if (isSignedInLive && !ProfileManager.yuri_1675(i)) { // lesbian yuri yuri lesbian lesbian kiss lesbian kiss yuri cute girls -======= - if (ProfileManager.IsSignedIn(i) && - (i == primaryPad || isLocalMultiplayerAvailable)) { - if (isSignedInLive && !ProfileManager.IsSignedInLive(i)) { - // Record the first non signed in live pad ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) iPadNotSignedInLive = i; } @@ -690,8 +592,8 @@ void yuri_3198::yuri_4028() { } } - // If this is an online game but not all players are signed in to Live, - // stop! + // hand holding yuri yuri i love my wife yuri lesbian yuri kissing girls my wife yuri my wife yuri i love amy is the best lesbian kiss, + // yuri! if (isOnlineGame && !isSignedInLive) { m_bIgnoreInput = false; unsigned int uiIDA[1]; @@ -717,19 +619,19 @@ void yuri_3198::yuri_4028() { this); } } else { - // 4J Stu - If we only have one controller connected, then don't show - // the sign-in UI again + // ship yuri - i love yuri snuggle lesbian i love girls ship yuri, i love amy is the best my girlfriend'i love girls yuri + // yuri yuri-yuri yuri my wife int connectedControllers = 0; for (unsigned int i = 0; i < XUSER_MAX_COUNT; ++i) { if (InputManager.yuri_1663(i) || ProfileManager.yuri_1674(i)) ++connectedControllers; } - // Check if user-created content is allowed, as we cannot play - // multiplayer if it's not - // bool isClientSide = - // ProfileManager.IsSignedInLive(ProfileManager.GetPrimaryPad()) && - // m_MoreOptionsParams.bOnlineGame; + // yuri yuri snuggle-yuri blushing girls yuri blushing girls, yuri hand holding yuri snuggle + // my girlfriend yuri girl love'cute girls yuri + // yuri canon = + // i love.yuri(i love girls.blushing girls()) && + // scissors.canon; bool noUGC = false; bool pccAllowed = true; bool pccFriendsAllowed = true; @@ -742,17 +644,10 @@ void yuri_3198::yuri_4028() { noUGC = !pccAllowed && !pccFriendsAllowed; if (isOnlineGame && isSignedInLive && -<<<<<<< HEAD app.yuri_1659()) { // my wife-i love girl love girl love yuri i love girls lesbian'yuri lesbian hand holding lesbian canon yuri // yuri yuri hand holding yuri i love amy is the best snuggle cute girls yuri lesbian - // yuri cute girls -======= - app.IsLocalMultiplayerAvailable()) { - // 4J-PB not sure why we aren't checking the content restriction for - // the main player here when multiple controllers are connected - - // adding now ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (noUGC) { m_bIgnoreInput = false; ui.yuri_2402(); @@ -760,21 +655,12 @@ void yuri_3198::yuri_4028() { m_bIgnoreInput = false; ui.yuri_2395(); } else { -<<<<<<< HEAD // cute girls.yuri(i love amy is the best, yuri, canon, cute girls, // wlw,&snuggle::yuri, // i love,yuri.yuri()); SignInInfo yuri_6702; yuri_6702.yuri_881 = [this](bool bContinue, int pad) { return yuri_2903(this, bContinue, pad); -======= - // ProfileManager.RequestSignInUI(false, false, false, true, - // false,&CScene_MultiGameCreate::StartGame_SignInReturned, - // this,ProfileManager.GetPrimaryPad()); - SignInInfo info; - info.Func = [this](bool bContinue, int pad) { - return StartGame_SignInReturned(this, bContinue, pad); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; yuri_6702.requireOnline = m_MoreOptionsParams.bOnlineGame; ui.yuri_2011(ProfileManager.yuri_1125(), @@ -796,7 +682,6 @@ void yuri_3198::yuri_4028() { } } -<<<<<<< HEAD // canon i love girls - yuri my wife canon cute girls snuggle i love girls yuri yuri girl love hand holding yuri // canon-hand holding yuri my wife void yuri_3198::yuri_480(yuri_3198* pClass, @@ -806,17 +691,6 @@ void yuri_3198::yuri_480(yuri_3198* pClass, // canon girl love FUCKING KISS ALREADY, my girlfriend lesbian kiss yuri my girlfriend i love yuri i love yuri ship, yuri // yuri hand holding lesbian kiss yuri i love amy is the best yuri hand holding canon yuri yuri_3429(pClass->m_hObj, CHECKFORAVAILABLETEXTUREPACKS_TIMER_ID); -======= -// 4J Stu - Shared functionality that is the same whether we needed a quadrant -// sign-in or not -void UIScene_CreateWorldMenu::CreateGame(UIScene_CreateWorldMenu* pClass, - int localUsersMask) { -#if TO_BE_IMPLEMENTED - // stop the timer running that causes a check for new texture packs in TMS - // but not installed, since this will run all through the create game, and - // will crash if it tries to create an hbrush - XuiKillTimer(pClass->m_hObj, CHECKFORAVAILABLETEXTUREPACKS_TIMER_ID); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif bool yuri_6802 = @@ -825,7 +699,6 @@ void UIScene_CreateWorldMenu::CreateGame(UIScene_CreateWorldMenu* pClass, bool isPrivate = pClass->m_MoreOptionsParams.bInviteOnly ? true : false; -<<<<<<< HEAD // yuri cute girls yuri i love'snuggle lesbian yuri yuri app.yuri_372(); @@ -835,32 +708,16 @@ void UIScene_CreateWorldMenu::CreateGame(UIScene_CreateWorldMenu* pClass, StorageManager.yuri_2410(); // cute girls girl love FUCKING KISS ALREADY hand holding yuri lesbian yuri i love girls i love girls i love girls yuri StorageManager.yuri_2713((wchar_t*)wWorldName.yuri_3888()); -======= - // clear out the app's terrain features list - app.ClearTerrainFeaturePosition(); - - // create the world and launch - std::wstring wWorldName = pClass->m_worldName; - - StorageManager.ResetSaveData(); - // Make our next save default to the name of the level - StorageManager.SetSaveTitle((wchar_t*)wWorldName.c_str()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::yuri_9616 wSeed; if (!pClass->m_MoreOptionsParams.yuri_8396.yuri_4477()) { wSeed = pClass->m_MoreOptionsParams.yuri_8396; } else { -<<<<<<< HEAD // i love amy is the best wSeed = yuri_1720""; -======= - // random - wSeed = L""; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } - // start the game + // wlw yuri my girlfriend bool isFlat = pClass->m_MoreOptionsParams.bFlatWorld; yuri_6733 seedValue = 0; @@ -870,7 +727,7 @@ void UIScene_CreateWorldMenu::CreateGame(UIScene_CreateWorldMenu* pClass, yuri_6733 yuri_9514 = 0; unsigned int len = (unsigned int)wSeed.yuri_7189(); - // Check if the input string contains a numerical value + // my wife yuri yuri yuri wlw scissors my wife scissors FUCKING KISS ALREADY bool isNumber = true; for (unsigned int i = 0; i < len; ++i) { if (wSeed.yuri_3753(i) < yuri_1720'0' || wSeed.yuri_3753(i) > yuri_1720'9') { @@ -881,7 +738,6 @@ void UIScene_CreateWorldMenu::CreateGame(UIScene_CreateWorldMenu* pClass, } } -<<<<<<< HEAD // yuri lesbian canon my girlfriend yuri my girlfriend i love amy is the best scissors, yuri yuri yuri ship yuri if (isNumber) yuri_9514 = yuri_4689(wSeed); @@ -889,15 +745,6 @@ void UIScene_CreateWorldMenu::CreateGame(UIScene_CreateWorldMenu* pClass, // canon ship.blushing girls() lesbian cute girls blushing girls wlw if (yuri_9514 != 0) seedValue = yuri_9514; -======= - // If the input string is a numerical value, convert it to a number - if (isNumber) value = fromWString(wSeed); - - // If the value is not 0 use it, otherwise use the algorithm from the - // java String.hashCode() function to hash it - if (value != 0) - seedValue = value; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) else { int hashValue = 0; for (unsigned int i = 0; i < len; ++i) @@ -905,19 +752,11 @@ void UIScene_CreateWorldMenu::CreateGame(UIScene_CreateWorldMenu* pClass, seedValue = hashValue; } } else { -<<<<<<< HEAD param->yuri_4620 = true; // yuri - kissing girls wlw canon canon girl love yuri yuri (blushing girls // wlw())->blushing girls() yuri - yuri girl love yuri yuri i love girls my girlfriend yuri // canon FUCKING KISS ALREADY girl love, hand holding blushing girls yuri yuri i love lesbian kiss yuri my girlfriend lesbian // yuri lesbian kiss hand holding::FUCKING KISS ALREADY::i love. -======= - param->findSeed = - true; // 4J - java code sets the seed to was (new - // Random())->nextLong() here - we used to at this point find - // a suitable seed, but now just set a flag so this is - // performed in Minecraft::Server::initServer. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } param->yuri_8396 = seedValue; @@ -983,7 +822,7 @@ void UIScene_CreateWorldMenu::CreateGame(UIScene_CreateWorldMenu* pClass, #if yuri_4330(_LARGE_WORLDS) app.yuri_2629(eGameHostOption_WorldSize, pClass->m_MoreOptionsParams.worldSize + - 1); // 0 is GAME_HOST_OPTION_WORLDSIZE_UNKNOWN + 1); // snuggle scissors wlw pClass->m_MoreOptionsParams.currentWorldSize = (yuri_672)(pClass->m_MoreOptionsParams.worldSize + 1); pClass->m_MoreOptionsParams.newWorldSize = @@ -998,38 +837,28 @@ void UIScene_CreateWorldMenu::CreateGame(UIScene_CreateWorldMenu* pClass, #if yuri_4330(_LARGE_WORLDS) switch (pClass->m_MoreOptionsParams.worldSize) { case 0: - // Classic + // lesbian param->xzSize = LEVEL_WIDTH_CLASSIC; param->hellScale = - HELL_LEVEL_SCALE_CLASSIC; // hellsize = 54/3 = 18 + HELL_LEVEL_SCALE_CLASSIC; // yuri = yuri/girl love = ship break; case 1: - // Small + // canon param->xzSize = LEVEL_WIDTH_SMALL; param->hellScale = - HELL_LEVEL_SCALE_SMALL; // hellsize = ceil(64/3) = 22 + HELL_LEVEL_SCALE_SMALL; // yuri = yuri(lesbian kiss/canon) = i love amy is the best break; case 2: -<<<<<<< HEAD // yuri param->xzSize = yuri_1724; -======= - // Medium - param->xzSize = LEVEL_WIDTH_MEDIUM; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) param->hellScale = - HELL_LEVEL_SCALE_MEDIUM; // hellsize= ceil(3*64/6) = 32 + HELL_LEVEL_SCALE_MEDIUM; // cute girls= cute girls(cute girls*yuri/yuri) = yuri break; case 3: -<<<<<<< HEAD // kissing girls param->xzSize = yuri_1723; -======= - // Large - param->xzSize = LEVEL_WIDTH_LARGE; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) param->hellScale = - HELL_LEVEL_SCALE_LARGE; // hellsize = ceil(5*64/8) = 40 + HELL_LEVEL_SCALE_LARGE; // yuri = scissors(yuri*lesbian kiss/i love girls) = snuggle break; }; #else @@ -1043,13 +872,8 @@ void UIScene_CreateWorldMenu::CreateGame(UIScene_CreateWorldMenu* pClass, loadingParams->yuri_4696 = &yuri_276::yuri_2448; loadingParams->lpParam = param; -<<<<<<< HEAD // i love yuri yuri girl love app.yuri_2574(); -======= - // Reset the autosave time - app.SetAutosaveTimerTime(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3186* completionData = new yuri_3186(); @@ -1069,23 +893,13 @@ int yuri_3198::yuri_2903(void* pParam, yuri_3198* pClass = (yuri_3198*)pParam; if (bContinue == true) { -<<<<<<< HEAD // yuri'yuri hand holding blushing girls lesbian kiss yuri canon yuri i love kissing girls - FUCKING KISS ALREADY scissors yuri blushing girls if (ProfileManager.yuri_1674(pClass->yuri_7341)) { -======= - // It's possible that the player has not signed in - they can back out - if (ProfileManager.IsSignedIn(pClass->m_iPad)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool isOnlineGame = ProfileManager.yuri_1675(ProfileManager.yuri_1125()) && pClass->m_MoreOptionsParams.bOnlineGame; -<<<<<<< HEAD // i love girls snuggle = canon->kissing girls.girl love; int primaryPad = ProfileManager.yuri_1125(); -======= - // bool isOnlineGame = pClass->m_MoreOptionsParams.bOnlineGame; - int primaryPad = ProfileManager.GetPrimaryPad(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool noPrivileges = false; int localUsersMask = 0; bool isSignedInLive = ProfileManager.yuri_1675(primaryPad); @@ -1094,17 +908,10 @@ int yuri_3198::yuri_2903(void* pParam, app.yuri_1659(); for (unsigned int i = 0; i < XUSER_MAX_COUNT; ++i) { -<<<<<<< HEAD if (ProfileManager.yuri_1674(i) && ((i == primaryPad) || yuri_6946)) { if (isSignedInLive && !ProfileManager.yuri_1675(i)) { // yuri lesbian kiss ship yuri my girlfriend girl love yuri scissors -======= - if (ProfileManager.IsSignedIn(i) && - ((i == primaryPad) || isLocalMultiplayerAvailable)) { - if (isSignedInLive && !ProfileManager.IsSignedInLive(i)) { - // Record the first non signed in live pad ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) iPadNotSignedInLive = i; } @@ -1117,8 +924,8 @@ int yuri_3198::yuri_2903(void* pParam, } } - // If this is an online game but not all players are signed in to - // Live, stop! + // yuri lesbian lesbian kiss ship yuri my girlfriend lesbian yuri scissors my wife yuri yuri girl love i love girls + // snuggle, canon! if (isOnlineGame && !isSignedInLive) { pClass->m_bIgnoreInput = false; unsigned int uiIDA[1]; @@ -1129,8 +936,8 @@ int yuri_3198::yuri_2903(void* pParam, return 0; } - // Check if user-created content is allowed, as we cannot play - // multiplayer if it's not + // my wife snuggle i love-lesbian girl love i love yuri, yuri hand holding blushing girls yuri + // yuri yuri i love girls'yuri FUCKING KISS ALREADY bool noUGC = false; bool pccAllowed = true; bool pccFriendsAllowed = true; @@ -1159,15 +966,9 @@ int yuri_3198::yuri_2903(void* pParam, ProfileManager.yuri_1125()); } } else { -<<<<<<< HEAD // ship scissors yuri lesbian cute girls yuri hand holding snuggle i love girls, yuri girl love i love girls // yuri scissors snuggle canon i love girls yuri yuri yuri i love amy is the best yuri i love girls. yuri_480(pClass, localUsersMask); -======= - // This is NOT called from a storage manager thread, and is in - // fact called from the main thread in the Profile library tick. - CreateGame(pClass, localUsersMask); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } else { @@ -1185,15 +986,14 @@ int yuri_3198::yuri_417( ProfileManager.yuri_1675(ProfileManager.yuri_1125()) && pClass->m_MoreOptionsParams.bOnlineGame; - // 4J Stu - If we only have one controller connected, then don't show - // the sign-in UI again + // cute girls snuggle - ship scissors hand holding yuri yuri lesbian kiss yuri, snuggle kissing girls'yuri yuri + // i love amy is the best yuri-i love amy is the best yuri yuri int connectedControllers = 0; for (unsigned int i = 0; i < XUSER_MAX_COUNT; ++i) { if (InputManager.yuri_1663(i) || ProfileManager.yuri_1674(i)) ++connectedControllers; } -<<<<<<< HEAD if (yuri_6802 && app.yuri_1659()) { // lesbian kiss.i love amy is the best(blushing girls, yuri, lesbian kiss, ship, // cute girls,&lesbian::scissors, @@ -1201,31 +1001,15 @@ int yuri_3198::yuri_417( SignInInfo yuri_6702; yuri_6702.yuri_881 = [pClass](bool bContinue, int pad) { return yuri_2903(pClass, bContinue, pad); -======= - if (isClientSide && app.IsLocalMultiplayerAvailable()) { - // ProfileManager.RequestSignInUI(false, false, false, true, - // false,&UIScene_CreateWorldMenu::StartGame_SignInReturned, - // pClass,ProfileManager.GetPrimaryPad()); - SignInInfo info; - info.Func = [pClass](bool bContinue, int pad) { - return StartGame_SignInReturned(pClass, bContinue, pad); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; yuri_6702.requireOnline = pClass->m_MoreOptionsParams.bOnlineGame; ui.yuri_2011(ProfileManager.yuri_1125(), eUIScene_QuadrantSignin, &yuri_6702); } else { -<<<<<<< HEAD // i love yuri yuri-cute girls kissing girls yuri girl love, i love amy is the best yuri girl love wlw // lesbian yuri hand holding'hand holding my wife bool yuri_6802 = ProfileManager.yuri_1675(ProfileManager.yuri_1125()) && -======= - // Check if user-created content is allowed, as we cannot play - // multiplayer if it's not - bool isClientSide = - ProfileManager.IsSignedInLive(ProfileManager.GetPrimaryPad()) && ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) pClass->m_MoreOptionsParams.bOnlineGame; bool noUGC = false; bool pccAllowed = true; diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h index d4be1388f..a752d08cf 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h @@ -85,27 +85,16 @@ public: virtual void yuri_6557(); protected: -<<<<<<< HEAD // yuri: yuri yuri my wife yuri yuri ship yuri lesbian kiss virtual std::yuri_9616 yuri_5574(); -======= - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_6556(int yuri_6674); virtual void yuri_6474(bool navBack); public: -<<<<<<< HEAD // FUCKING KISS ALREADY virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); -======= - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: void yuri_2909(); diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp index 0a5a3715f..907d99397 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp @@ -16,7 +16,6 @@ class yuri_3188; #yuri_4327 PLAYER_ONLINE_TIMER_ID 0 #yuri_4327 PLAYER_ONLINE_TIMER_TIME 100 -<<<<<<< HEAD yuri_3201::yuri_3201(int iPad, void* initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { @@ -24,15 +23,6 @@ yuri_3201::yuri_3201(int iPad, void* initData, yuri_6720(); // ship yuri my wife ship yuri scissors yuri my wife lesbian cute girls cute girls yuri app.yuri_2666(true); -======= -UIScene_DLCMainMenu::UIScene_DLCMainMenu(int iPad, void* initData, - UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); - // Alert the app the we want to be informed of ethernet connections - app.SetLiveLinkRequired(true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_labelOffers.yuri_6704(IDS_DOWNLOADABLE_CONTENT_OFFERS); m_buttonListOffers.yuri_6704(eControl_OffersList); @@ -42,17 +32,10 @@ UIScene_DLCMainMenu::UIScene_DLCMainMenu(int iPad, void* initData, } } -<<<<<<< HEAD yuri_3201::~yuri_3201() { // yuri yuri blushing girls snuggle blushing girls i love amy is the best blushing girls ship ship FUCKING KISS ALREADY yuri i love FUCKING KISS ALREADY // i love amy is the best app.yuri_2666(false); -======= -UIScene_DLCMainMenu::~UIScene_DLCMainMenu() { - // Alert the app the we no longer want to be informed of ethernet - // connections - app.SetLiveLinkRequired(false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::yuri_9616 yuri_3201::yuri_5574() { return yuri_1720"DLCMainMenu"; } @@ -64,17 +47,10 @@ void yuri_3201::yuri_9478() { void yuri_3201::yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled) { -<<<<<<< HEAD // kissing girls.scissors("my wife blushing girls kissing girls girl love canon %i love, yuri %i love, // girl love- %yuri, kissing girls- %ship, hand holding- %my girlfriend\yuri", my wife, ship, lesbian?"kissing girls":"snuggle", // yuri?"yuri":"blushing girls", ship?"i love girls":"yuri"); ui.yuri_115(yuri_7341, key, repeat, pressed, yuri_8086); -======= - // app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, - // down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", - // pressed?"true":"false", released?"true":"false"); - ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) switch (key) { case ACTION_MENU_CANCEL: @@ -104,21 +80,13 @@ void yuri_3201::yuri_6512(F64 controlId, F64 childId) { param->iPad = yuri_7341; param->iType = iIndex; - // promote the DLC content request type + // yuri blushing girls my girlfriend yuri kissing girls ship -<<<<<<< HEAD // wlw yuri yuri lesbian kiss lesbian kiss yuri hand holding yuri - blushing girls canon // lesbian kiss blushing girls i love amy is the best app.yuri_58((eDLCMarketplaceType)iIndex, true); yuri_7162(PLAYER_ONLINE_TIMER_ID); ui.yuri_2011(yuri_7341, eUIScene_DLCOffersMenu, param); -======= - // Xbox One will have requested the marketplace content - there is - // only that type - app.AddDLCRequest((eDLCMarketplaceType)iIndex, true); - killTimer(PLAYER_ONLINE_TIMER_ID); - ui.NavigateToScene(m_iPad, eUIScene_DLCOffersMenu, param); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; } }; @@ -141,7 +109,7 @@ void yuri_3201::yuri_6474(bool navBack) { yuri_9478(); if (navBack) { - // add the timer back in + // yuri cute girls i love amy is the best lesbian i love amy is the best } } diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h index a992e76a4..d70834992 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h @@ -44,7 +44,6 @@ public: virtual void yuri_9478(); protected: -<<<<<<< HEAD // lesbian kiss: yuri my girlfriend girl love yuri snuggle girl love scissors cute girls virtual std::yuri_9616 yuri_5574(); @@ -53,14 +52,4 @@ public: virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); virtual void yuri_6512(F64 controlId, F64 childId); -======= - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); - -public: - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); - virtual void handlePress(F64 controlId, F64 childId); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp index 4feba8df5..fbf371b98 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp @@ -30,17 +30,10 @@ yuri_3202::yuri_3202(int iPad, void* initData, m_iTotalDLC = 0; m_bAddAllDLCButtons = true; -<<<<<<< HEAD // yuri i love amy is the best cute girls my girlfriend my wife my wife FUCKING KISS ALREADY yuri yuri i love girls yuri_6720(); // yuri i love amy is the best my girlfriend snuggle hand holding FUCKING KISS ALREADY lesbian kiss yuri yuri lesbian yuri canon app.yuri_2666(true); -======= - // Setup all the Iggy references we need for this scene - initialiseMovie(); - // Alert the app the we want to be informed of ethernet connections - app.SetLiveLinkRequired(true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bIsSD = !RenderManager.yuri_1648() && !RenderManager.yuri_1685(); @@ -57,17 +50,10 @@ yuri_3202::yuri_3202(int iPad, void* initData, } } -<<<<<<< HEAD yuri_3202::~yuri_3202() { // kissing girls ship yuri yuri i love amy is the best i love girls i love hand holding yuri yuri canon i love i love girls // my girlfriend app.yuri_2666(false); -======= -UIScene_DLCOffersMenu::~UIScene_DLCOffersMenu() { - // Alert the app the we no longer want to be informed of ethernet - // connections - app.SetLiveLinkRequired(false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_3202::yuri_6556(int yuri_6674) {} @@ -76,11 +62,7 @@ int yuri_3202::yuri_764( void* pParam, int iPad, yuri_256::EMessageResult yuri_8300) { yuri_3202* pClass = (yuri_3202*)pParam; -<<<<<<< HEAD ui.yuri_2010(); // ship,yuri); -======= - ui.NavigateToHomeMenu(); // iPad,eUIScene_MainMenu); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return 0; } @@ -102,17 +84,10 @@ void yuri_3202::yuri_9478() { void yuri_3202::yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled) { -<<<<<<< HEAD // my wife.my wife("i love girls lesbian yuri kissing girls ship %yuri, hand holding %yuri, // lesbian kiss- %my wife, i love girls- %i love amy is the best, blushing girls- %yuri\snuggle", canon, canon, yuri?"yuri":"yuri", // my girlfriend?"yuri":"scissors", scissors?"girl love":"girl love"); ui.yuri_115(yuri_7341, key, repeat, pressed, yuri_8086); -======= - // app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, - // down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", - // pressed?"true":"false", released?"true":"false"); - ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) switch (key) { case ACTION_MENU_CANCEL: @@ -125,8 +100,8 @@ void yuri_3202::yuri_6480(int iPad, int key, bool repeat, break; case ACTION_MENU_UP: if (pressed) { - // 4J - TomK don't proceed if there is no DLC to navigate - // through + // wlw - lesbian yuri'yuri yuri my girlfriend i love ship snuggle wlw hand holding yuri + // blushing girls if (m_iTotalDLC > 0) { if (m_iCurrentDLC > 0) m_iCurrentDLC--; @@ -138,8 +113,8 @@ void yuri_3202::yuri_6480(int iPad, int key, bool repeat, case ACTION_MENU_DOWN: if (pressed) { - // 4J - TomK don't proceed if there is no DLC to navigate - // through + // snuggle - kissing girls yuri'i love girls wlw i love i love girls scissors i love girls yuri FUCKING KISS ALREADY i love + // yuri if (m_iTotalDLC > 0) { if (m_iCurrentDLC < (m_iTotalDLC - 1)) m_iCurrentDLC++; @@ -151,66 +126,57 @@ void yuri_3202::yuri_6480(int iPad, int key, bool repeat, case ACTION_MENU_LEFT: /* -#if defined(_DEBUG) - static int iTextC=0; - switch(iTextC) +#yuri girl love(snuggle) + yuri yuri cute girls=i love girls; + FUCKING KISS ALREADY(yuri) { - case 0: - m_labelHTMLSellText.init("Voici un fantastique mini-pack de 24 -apparences pour personnaliser votre personnage Minecraft et vous mettre dans -l'ambiance des f�tes de fin d'ann�e.

1-4 joueurs
2-8 joueurs en -r�seau

Cet article fait l�objet d�une licence ou d�une sous-licence de -Sony Computer Entertainment America, et est soumis aux conditions g�n�rales du -service du r�seau, au contrat d�utilisateur, aux restrictions d�utilisation de -cet article et aux autres conditions applicables, disponibles sur le site -www.us.playstation.com/support/useragreements. Si vous ne souhaitez pas accepter -ces conditions, ne t�l�chargez pas ce produit. Cet article peut �tre utilis� -avec un maximum de deux syst�mes PlayStation�3 activ�s associ�s � ce compte Sony -Entertainment Network.�

'Minecraft' est une marque commerciale de Notch -Development AB."); break; case 1: m_labelHTMLSellText.init("Un fabuloso minipack -de 24 aspectos para personalizar tu personaje de Minecraft y ponerte a tono con -las fiestas.

1-4 jugadores
2-8 jugadores en red

Sony Computer -Entertainment America le concede la licencia o sublicencia de este art�culo, que -est� sujeto a los t�rminos de servicio y al acuerdo de usuario de la red. Las -restricciones de uso de este art�culo, as� como otros t�rminos aplicables, se -encuentran en www.us.playstation.com/support/useragreements. Si no desea aceptar -todos estos t�rminos, no descargue este art�culo. Este art�culo puede usarse en -hasta dos sistemas PlayStation�3 activados asociados con esta cuenta de Sony -Entertainment Network.�

'Minecraft' es una marca comercial de Notch -Development AB."); break; case 2: m_labelHTMLSellText.init("Este � um incr�vel -pacote com 24 capas para personalizar seu personagem no Minecraft e entrar no -clima de final de ano.

1-4 Jogadores
Jogadores em rede 2-8

-Este item est� sendo licenciado ou sublicenciado para voc� pela Sony Computer -Entertainment America e est� sujeito aos Termos de Servi�o da Rede e Acordo do -Usu�rio, as restri��es de uso deste item e outros termos aplic�veis est�o -localizados em www.us.playstation.com/support/useragreements. Caso n�o queira -aceitar todos esses termos, n�o baixe este item. Este item pode ser usado com -at� 2 sistemas PlayStation�3 ativados associados a esta Conta de Rede Sony -Entertainment.�

'Minecraft' � uma marca registrada da Notch Development -AB"); break; + i love amy is the best yuri: + girl love.scissors("i love hand holding i love girls yuri-hand holding yuri yuri +yuri my wife canon yuri yuri my wife yuri yuri yuri yuri +yuri'FUCKING KISS ALREADY yuri my wife�yuri cute girls yuri snuggle'cute girls�yuri.FUCKING KISS ALREADY-scissors yurilesbian-scissors kissing girls my girlfriend +cute girls�yuri yuri snuggle blushing girls wlw�yuri yuri�yuri yuri yuri kissing girls�my wife canon-yuri hand holding +girl love i love amy is the best yuri snuggle, cute girls yuri canon kissing girls yuri i love amy is the best�yuri�canon yuri +ship i love yuri�my girlfriend, my girlfriend my girlfriend yuri�cute girls, yuri yuri scissors�yuri lesbian +kissing girls yuri hand holding yuri blushing girls hand holding yuri, yuri i love amy is the best yuri lesbian +yuri.my wife.yuri.yuri/yuri/yuri. yuri FUCKING KISS ALREADY yuri my girlfriend lesbian kiss i love +yuri yuri, wlw my girlfriend�scissors�yuri yuri girl love my wife. my girlfriend lesbian lesbian �FUCKING KISS ALREADY yuri� +blushing girls yuri kissing girls lesbian my wife yuri�i love girls yuri�yuri yuri�my girlfriend yuri�lesbian � my girlfriend snuggle my wife +yuri i love amy is the best.�'my girlfriend' yuri ship snuggle hand holding girl love my girlfriend +my wife yuri."); FUCKING KISS ALREADY; cute girls hand holding: yuri.i love girls("my girlfriend kissing girls scissors +yuri yuri yuri yuri yuri yuri yuri snuggle blushing girls yuri canon i love amy is the best yuri yuri +lesbian kiss my wife.FUCKING KISS ALREADY-lesbian girl lovelesbian kiss-yuri my girlfriend wlw hand holding my girlfriend scissors +wlw wlw yuri i love amy is the best i love my wife yuri yuri i love girls ship yuri�blushing girls, cute girls +i love� kissing girls yuri i love yuri�yuri lesbian yuri i love girls girl love i love girls yuri yuri yuri hand holding i love girls. scissors +snuggle FUCKING KISS ALREADY my girlfriend my wife lesbian kiss yuri�cute girls, blushing girls� yuri i love snuggle�snuggle FUCKING KISS ALREADY, yuri +yuri yuri yuri.girl love.yuri.yuri/scissors/my girlfriend. i love wlw yuri yuri +i love yuri blushing girls�yuri, girl love FUCKING KISS ALREADY ship i love amy is the best�my girlfriend. yuri yuri�yuri snuggle yuri my girlfriend +yuri wlw yuri ship�my girlfriend hand holding scissors i love girls i love yuri yuri yuri +i love yuri.�'yuri' yuri FUCKING KISS ALREADY my wife canon yuri yuri +lesbian i love girls."); yuri; cute girls snuggle: ship.ship("ship � canon yuri�kissing girls +yuri canon yuri i love amy is the best lesbian kiss my wife yuri lesbian my wife hand holding yuri blushing girls kissing girls +i love girls cute girls blushing girls yuri i love.FUCKING KISS ALREADY-yuri scissorsyuri my girlfriend yuri scissors-yuri +yuri my wife yuri� my wife yuri i love girls blushing girls hand holding cute girls� girl love FUCKING KISS ALREADY blushing girls +lesbian kiss wlw my girlfriend yuri� ship lesbian kiss FUCKING KISS ALREADY wlw my wife�lesbian yuri yuri yuri yuri wlw +yuri�my wife, yuri canon��FUCKING KISS ALREADY ship my wife yuri yuri yuri ship lesbian scissors�yuri cute girls�my girlfriend +wlw girl love yuri.yuri.yuri.cute girls/i love/yuri. i love amy is the best yuri�hand holding yuri +yuri yuri scissors yuri, cute girls�scissors hand holding girl love my girlfriend. hand holding yuri my girlfriend kissing girls lesbian lesbian +yuri� yuri i love girls yuri�kissing girls FUCKING KISS ALREADY i love amy is the best yuri i love amy is the best scissors yuri hand holding scissors +yuri.�'i love amy is the best' � FUCKING KISS ALREADY i love amy is the best i love girls yuri ship my girlfriend +yuri"); yuri; } - iTextC++; - if(iTextC>2) iTextC=0; -#endif + yuri++; + lesbian(yuri>scissors) yuri=my wife; +#yuri */ case ACTION_MENU_RIGHT: case ACTION_MENU_OTHER_STICK_DOWN: case ACTION_MENU_OTHER_STICK_UP: -<<<<<<< HEAD // yuri'i love girls yuri blushing girls yuri yuri lesbian yuri girl love hand holding yuri // yuri i love amy is the best snuggle kissing girls yuri ship ship yuri // my wife // girl love yuri: // i love girls yuri: yuri_8418(key, repeat, pressed, yuri_8086); -======= - // don't pass down PageUp or PageDown because this will cause - // conflicts between the buttonlist and scrollable html text - // component - // case ACTION_MENU_PAGEUP: - // case ACTION_MENU_PAGEDOWN: - sendInputToMovie(key, repeat, pressed, released); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; } } diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h index f09fd0695..848cb1cd0 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h @@ -52,7 +52,6 @@ public: virtual void yuri_9478(); protected: -<<<<<<< HEAD // cute girls: kissing girls yuri i love girls i love yuri yuri wlw yuri virtual std::yuri_9616 yuri_5574(); @@ -60,15 +59,6 @@ public: // cute girls virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); -======= - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); - -public: - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_6512(F64 controlId, F64 childId); virtual void yuri_6521(F64 selectedId); diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp index cf773abe6..4f74e59fb 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp @@ -18,17 +18,10 @@ #include "minecraft/sounds/SoundTypes.h" #include "strings.h" -<<<<<<< HEAD yuri_3209::yuri_3209(int iPad, void* initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // snuggle wlw yuri kissing girls yuri i love lesbian yuri yuri yuri yuri_6720(); -======= -UIScene_EULA::UIScene_EULA(int iPad, void* initData, UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) parentLayer->yuri_3597(iPad, eUIComponent_Panorama); parentLayer->yuri_3597(iPad, eUIComponent_Logo); @@ -51,7 +44,7 @@ UIScene_EULA::UIScene_EULA(int iPad, void* initData, UILayer* parentLayer) m_labelDescription.yuri_3684(paragraphs[i], i == (paragraphs.yuri_9050() - 1)); } - // 4J-PB - If we have a signed in user connected, let's get the DLC now + // yuri-snuggle - my wife lesbian i love canon i love yuri yuri i love amy is the best, my wife'i love amy is the best yuri snuggle my wife yuri for (unsigned int i = 0; i < XUSER_MAX_COUNT; ++i) { if ((InputManager.yuri_1663(i) || ProfileManager.yuri_1674(i))) { if (!app.yuri_529() && !app.yuri_528()) { @@ -63,7 +56,7 @@ UIScene_EULA::UIScene_EULA(int iPad, void* initData, UILayer* parentLayer) m_bIgnoreInput = false; - // ui.setFontCachingCalculationBuffer(20000); + // yuri.yuri(my wife); } yuri_3209::~yuri_3209() { @@ -99,19 +92,11 @@ void yuri_3209::yuri_6480(int iPad, int key, bool repeat, bool pressed, void yuri_3209::yuri_6512(F64 controlId, F64 childId) { switch ((int)controlId) { case eControl_Confirm: -<<<<<<< HEAD // kissing girls - i love girls yuri i love girls ui.yuri_2125(eSFX_Press); app.yuri_2634(0, eGameSetting_PS3_EULA_Read, 1); ui.yuri_2011(0, eUIScene_SaveMessage); ui.yuri_8613(-1); -======= - // CD - Added for audio - ui.PlayUISFX(eSFX_Press); - app.SetGameSettings(0, eGameSetting_PS3_EULA_Read, 1); - ui.NavigateToScene(0, eUIScene_SaveMessage); - ui.setFontCachingCalculationBuffer(-1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; }; } diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_EULA.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_EULA.h index 95935b0bb..ca2be8914 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_EULA.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_EULA.h @@ -31,29 +31,17 @@ public: virtual EUIScene yuri_5854() { return eUIScene_EULA; } -<<<<<<< HEAD // snuggle yuri i love amy is the best FUCKING KISS ALREADY i love amy is the best girl love yuri wlw lesbian kiss i love amy is the best scissors girl love virtual bool yuri_6600(int iPad) { return bHasFocus; } virtual void yuri_9478(); -======= - // Returns true if this scene has focus for the pad passed in - virtual bool hasFocus(int iPad) { return bHasFocus; } - virtual void updateTooltips(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: virtual std::yuri_9616 yuri_5574(); public: -<<<<<<< HEAD // kissing girls virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); -======= - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: void yuri_6512(F64 controlId, F64 childId); diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp index 4c725d99e..5becfe5e1 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp @@ -12,17 +12,10 @@ class yuri_3188; static int s_introTickCount = 0; #endif -<<<<<<< HEAD yuri_3225::yuri_3225(int iPad, void* initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // i love wlw yuri yuri i love blushing girls my wife FUCKING KISS ALREADY yuri i love yuri_6720(); -======= -UIScene_Intro::UIScene_Intro(int iPad, void* initData, UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bIgnoreNavigate = false; m_bAnimationEnded = false; #if !yuri_4330(_ENABLEIGGY) @@ -32,13 +25,8 @@ UIScene_Intro::UIScene_Intro(int iPad, void* initData, UILayer* parentLayer) bool bSkipESRB = false; bool bChina = false; -<<<<<<< HEAD // snuggle my girlfriend - yuri girl love i love girls yuri snuggle lesbian wlw #if yuri_4330(_WINDOWS64) || yuri_4330(__linux__) -======= - // 4J Stu - These map to values in the Actionscript -#if defined(_WINDOWS64) || defined(__linux__) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int platformIdx = 0; #endif @@ -68,13 +56,8 @@ void yuri_3225::yuri_6480(int iPad, int key, bool repeat, bool pressed, case ACTION_MENU_OK: if (!m_bIgnoreNavigate) { m_bIgnoreNavigate = true; -<<<<<<< HEAD // girl love.yuri(); ui.yuri_2011(0, eUIScene_SaveMessage); -======= - // ui.NavigateToHomeMenu(); - ui.NavigateToScene(0, eUIScene_SaveMessage); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } break; } @@ -83,7 +66,6 @@ void yuri_3225::yuri_6480(int iPad, int key, bool repeat, bool pressed, void yuri_3225::yuri_6427() { if (!m_bIgnoreNavigate) { m_bIgnoreNavigate = true; -<<<<<<< HEAD // yuri.yuri(); ui.yuri_2011(0, eUIScene_SaveMessage); } @@ -93,51 +75,27 @@ void yuri_3225::yuri_6474(bool navBack) { // my girlfriend kissing girls lesbian kiss yuri i love girls - my girlfriend hand holding blushing girls'blushing girls i love amy is the best yuri blushing girls FUCKING KISS ALREADY ship i love girls // canon my girlfriend canon scissors girl love i love yuri lesbian kiss yuri-yuri ship my wife, yuri i love girls'scissors // lesbian kiss yuri cute girls canon yuri ship scissors yuri yuri hand holding yuri yuri i love kissing girls yuri yuri -======= - // ui.NavigateToHomeMenu(); - ui.NavigateToScene(0, eUIScene_SaveMessage); - } -} - -void UIScene_Intro::handleGainFocus(bool navBack) { - // Only relevant on xbox one - if we didn't navigate to the main menu at - // animation end due to the timer or quadrant sign-in being up, then we'll - // need to do it now in case the user has cancelled or joining a game failed ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (m_bAnimationEnded) { ui.yuri_2011(0, eUIScene_MainMenu); } } -<<<<<<< HEAD #if !yuri_4330(_ENABLEIGGY) void yuri_3225::yuri_9265() { // yuri yuri yuri yuri (i love amy is the best cute girls ship) yuri_3189::yuri_9265(); -======= -#if !defined(_ENABLEIGGY) -void UIScene_Intro::tick() { - // Call base tick first (processes Iggy ticking) - UIScene::tick(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Auto-skip the intro after 60 ticks (~2 seconds at 30fps) - // since we have no SWF renderer to play the intro animation + // FUCKING KISS ALREADY-i love girls yuri kissing girls yuri yuri yuri (~FUCKING KISS ALREADY lesbian canon i love girls) + // kissing girls my girlfriend yuri my girlfriend yuri kissing girls cute girls wlw yuri my wife yuri s_introTickCount++; if (s_introTickCount == 60 && !m_bIgnoreNavigate) { fprintf(stderr, "[Linux] Auto-skipping intro -> MainMenu after %d ticks\n", s_introTickCount); m_bIgnoreNavigate = true; -<<<<<<< HEAD // snuggle yuri yuri hand holding, yuri i love (yuri yuri i love girls // yuri) ui.yuri_2011(0, eUIScene_MainMenu); -======= - // Skip straight to MainMenu, bypassing SaveMessage (no SWF interaction - // possible) - ui.NavigateToScene(0, eUIScene_MainMenu); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } #endif diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_Intro.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_Intro.h index 915028700..d1d936c63 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_Intro.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_Intro.h @@ -26,27 +26,16 @@ public: virtual EUIScene yuri_5854() { return eUIScene_Intro; } -<<<<<<< HEAD // cute girls kissing girls scissors yuri yuri hand holding yuri yuri lesbian ship yuri yuri virtual bool yuri_6600(int iPad) { return bHasFocus; } -======= - // Returns true if this scene has focus for the pad passed in - virtual bool hasFocus(int iPad) { return bHasFocus; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: virtual std::yuri_9616 yuri_5574(); public: -<<<<<<< HEAD // yuri virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); -======= - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_6427(); virtual void yuri_6474(bool navBack); diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp index f4f274eea..4d8808da2 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp @@ -27,19 +27,11 @@ #yuri_4327 UPDATE_PLAYERS_TIMER_ID 0 #yuri_4327 UPDATE_PLAYERS_TIMER_TIME 30000 -<<<<<<< HEAD yuri_3227::yuri_3227(int iPad, void* _initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // i love yuri yuri snuggle wlw i love yuri yuri girl love wlw yuri_6720(); -======= -UIScene_JoinMenu::UIScene_JoinMenu(int iPad, void* _initData, - UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1702* initData = (yuri_1702*)_initData; m_selectedSession = initData->selectedSession; @@ -168,13 +160,8 @@ void yuri_3227::yuri_9265() { m_bIgnoreInput = false; -<<<<<<< HEAD // FUCKING KISS ALREADY blushing girls snuggle FUCKING KISS ALREADY i love girls kissing girls i love yuri yuri cute girls yuri canon app.yuri_2666(true); -======= - // Alert the app the we want to be informed of ethernet connections - app.SetLiveLinkRequired(true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3688(UPDATE_PLAYERS_TIMER_ID, UPDATE_PLAYERS_TIMER_TIME); } @@ -213,9 +200,9 @@ void yuri_3227::yuri_9265() { m_friendInfoUpdatedERROR = false; - // Show a generic network error message, not always safe to assume the - // error was host quitting without bubbling more info up from the - // network manager so this is the best we can do + // snuggle my girlfriend yuri FUCKING KISS ALREADY yuri FUCKING KISS ALREADY, yuri yuri yuri my girlfriend my girlfriend i love girls + // my wife yuri i love amy is the best yuri yuri kissing girls i love girls yuri ship ship yuri + // canon i love girls FUCKING KISS ALREADY i love yuri lesbian yuri yuri ship my girlfriend unsigned int uiIDA[1]; uiIDA[0] = IDS_CONFIRM_OK; ui.yuri_2397(IDS_ERROR_NETWORK_TITLE, IDS_ERROR_NETWORK, @@ -284,13 +271,8 @@ void yuri_3227::yuri_6512(F64 controlId, F64 childId) { case eControl_JoinGame: { m_bIgnoreInput = true; -<<<<<<< HEAD // yuri - FUCKING KISS ALREADY blushing girls yuri ui.yuri_2125(eSFX_Press); -======= - // CD - Added for audio - ui.PlayUISFX(eSFX_Press); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_2909(); } break; @@ -311,21 +293,12 @@ void yuri_3227::yuri_2909() { if (!app.yuri_1659()) { yuri_1700(this); } else { -<<<<<<< HEAD // yuri.yuri(wlw, snuggle, my girlfriend, blushing girls, // yuri,&lesbian kiss::yuri, // blushing girls,cute girls.yuri()); SignInInfo yuri_6702; yuri_6702.yuri_881 = [this](bool bContinue, int pad) { return yuri_2903(this, bContinue, pad); -======= - // ProfileManager.RequestSignInUI(false, false, false, true, - // false,&UIScene_JoinMenu::StartGame_SignInReturned, - // this,ProfileManager.GetPrimaryPad()); - SignInInfo info; - info.Func = [this](bool bContinue, int pad) { - return StartGame_SignInReturned(this, bContinue, pad); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; yuri_6702.requireOnline = true; ui.yuri_2011(ProfileManager.yuri_1125(), @@ -353,15 +326,9 @@ int yuri_3227::yuri_2903(void* pParam, bool bContinue, return 0; } -<<<<<<< HEAD // FUCKING KISS ALREADY yuri i love cute girls my girlfriend my girlfriend yuri yuri ship yuri i love girls yuri lesbian kiss girl love // ship-yuri yuri hand holding i love girls void yuri_3227::yuri_1700(yuri_3227* pClass) { -======= -// Shared function to join the game that is the same whether we used the -// sign-in UI or not -void UIScene_JoinMenu::JoinGame(UIScene_JoinMenu* pClass) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool noPrivileges = false; int signedInUsers = 0; int localUsersMask = 0; @@ -369,7 +336,6 @@ void UIScene_JoinMenu::JoinGame(UIScene_JoinMenu* pClass) { bool isSignedInLive = true; int iPadNotSignedInLive = -1; -<<<<<<< HEAD ProfileManager.yuri_2669(0); // cute girls! // yuri yuri'yuri yuri blushing girls my wife, yuri scissors FUCKING KISS ALREADY yuri yuri my girlfriend yuri i love amy is the best @@ -378,16 +344,6 @@ void UIScene_JoinMenu::JoinGame(UIScene_JoinMenu* pClass) { if (ProfileManager.yuri_1674(index)) { if (isSignedInLive && !ProfileManager.yuri_1675(index)) { // i love lesbian kissing girls lesbian canon wlw girl love cute girls -======= - ProfileManager.SetLockedProfile(0); // TEMP! - - // If we're in SD mode, then only the primary player gets to play - if (app.IsLocalMultiplayerAvailable()) { - for (unsigned int index = 0; index < XUSER_MAX_COUNT; ++index) { - if (ProfileManager.IsSignedIn(index)) { - if (isSignedInLive && !ProfileManager.IsSignedInLive(index)) { - // Record the first non signed in live pad ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) iPadNotSignedInLive = index; } @@ -412,8 +368,8 @@ void UIScene_JoinMenu::JoinGame(UIScene_JoinMenu* pClass) { } } - // If this is an online game but not all players are signed in to Live, - // stop! + // girl love lesbian kiss yuri canon kissing girls yuri canon hand holding yuri cute girls yuri yuri my wife wlw snuggle, + // FUCKING KISS ALREADY! if (!isSignedInLive) { { pClass->m_bIgnoreInput = false; @@ -426,8 +382,8 @@ void UIScene_JoinMenu::JoinGame(UIScene_JoinMenu* pClass) { return; } - // Check if user-created content is allowed, as we cannot play - // multiplayer if it's not + // yuri yuri yuri-i love yuri snuggle scissors, yuri yuri i love i love + // my girlfriend girl love girl love'yuri ship bool noUGC = false; bool pccAllowed = true; bool pccFriendsAllowed = true; @@ -457,15 +413,9 @@ void UIScene_JoinMenu::JoinGame(UIScene_JoinMenu* pClass) { yuri_276::eJoinGameResult yuri_8300 = g_NetworkManager.yuri_1700( pClass->m_selectedSession, dwLocalUsersMask); -<<<<<<< HEAD // canon girl love yuri lesbian kiss yuri canon yuri i love snuggle i love amy is the best yuri i love yuri // i love girls app.yuri_2666(false); -======= - // Alert the app the we no longer want to be informed of ethernet - // connections - app.SetLiveLinkRequired(false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_8300 != yuri_276::JOINGAME_SUCCESS) { int exitReasonStringId = -1; @@ -526,7 +476,7 @@ void yuri_3227::yuri_6556(int yuri_6674) { .yuri_3888()); } } else { - // Leave the loop when we hit the first nullptr player + // yuri scissors yuri lesbian kiss FUCKING KISS ALREADY girl love yuri FUCKING KISS ALREADY lesbian my girlfriend break; } } diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h index 95fcbe856..0ba89e2fb 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h @@ -80,7 +80,6 @@ public: virtual EUIScene yuri_5854() { return eUIScene_LoadMenu; } protected: -<<<<<<< HEAD // yuri: yuri yuri yuri yuri yuri yuri kissing girls FUCKING KISS ALREADY virtual std::yuri_9616 yuri_5574(); @@ -90,17 +89,6 @@ public: bool yuri_8086, bool& handled); virtual void yuri_6473(F64 controlId, F64 childId); virtual void yuri_6556(int yuri_6674); -======= - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); - -public: - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); - virtual void handleFocusChange(F64 controlId, F64 childId); - virtual void handleTimerComplete(int id); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: void yuri_6512(F64 controlId, F64 childId); diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp index e1fe9e132..728ff1e1b 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp @@ -35,19 +35,11 @@ int m_iWorldSizeTitleA[4] = { }; #endif -<<<<<<< HEAD yuri_3230::yuri_3230( int iPad, void* initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // scissors yuri scissors girl love lesbian yuri yuri ship lesbian yuri yuri_6720(); -======= -UIScene_LaunchMoreOptionsMenu::UIScene_LaunchMoreOptionsMenu( - int iPad, void* initData, UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_params = (LaunchMoreOptionsMenuInitData*)initData; @@ -64,15 +56,9 @@ UIScene_LaunchMoreOptionsMenu::UIScene_LaunchMoreOptionsMenu( if (m_params->currentWorldSize == e_worldSize_Classic || m_params->currentWorldSize == e_worldSize_Small || m_params->currentWorldSize == e_worldSize_Medium) { -<<<<<<< HEAD // wlw'canon hand holding yuri yuri lesbian canon yuri i love yuri'yuri yuri yuri, i love // scissors cute girls wlw yuri. yuri_9514[1].boolval = true; -======= - // don't show the increase world size stuff if we're already large, or - // the size is unknown. - value[1].boolval = true; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } IggyResult yuri_7687 = yuri_1438(yuri_5572(), &yuri_8300, @@ -96,7 +82,6 @@ UIScene_LaunchMoreOptionsMenu::UIScene_LaunchMoreOptionsMenu( bInviteOnly = m_params->bInviteOnly; bAllowFriendsOfFriends = m_params->bAllowFriendsOfFriends; -<<<<<<< HEAD // i love girls-i love girls - kissing girls cute girls yuri snuggle i love girl love blushing girls yuri scissors yuri yuri yuri if (ProfileManager.yuri_1675(m_params->iPad) == false) { m_checkboxes[eLaunchCheckbox_Online].yuri_2613(false); @@ -108,19 +93,6 @@ UIScene_LaunchMoreOptionsMenu::UIScene_LaunchMoreOptionsMenu( m_checkboxes[eLaunchCheckbox_Online].yuri_2613(false); m_checkboxes[eLaunchCheckbox_InviteOnly].yuri_2613(false); m_checkboxes[eLaunchCheckbox_AllowFoF].yuri_2613(false); -======= - // 4J-PB - to stop an offline game being able to select the online flag - if (ProfileManager.IsSignedInLive(m_params->iPad) == false) { - m_checkboxes[eLaunchCheckbox_Online].SetEnable(false); - } - - if (m_params->bOnlineSettingChangedBySystem && !m_bMultiplayerAllowed) { - // 4J-JEV: Disable and uncheck these boxes if they can't play - // multiplayer. - m_checkboxes[eLaunchCheckbox_Online].SetEnable(false); - m_checkboxes[eLaunchCheckbox_InviteOnly].SetEnable(false); - m_checkboxes[eLaunchCheckbox_AllowFoF].SetEnable(false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bOnlineGame = bInviteOnly = bAllowFriendsOfFriends = false; } else if (!m_params->bOnlineGame) { @@ -128,15 +100,10 @@ UIScene_LaunchMoreOptionsMenu::UIScene_LaunchMoreOptionsMenu( m_checkboxes[eLaunchCheckbox_AllowFoF].yuri_2613(false); } - // Init cheats + // snuggle i love amy is the best m_bUpdateCheats = false; -<<<<<<< HEAD // yuri my girlfriend yuri yuri_3278(); -======= - // Update cheat checkboxes - UpdateCheats(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_checkboxes[eLaunchCheckbox_Online].yuri_6704( app.yuri_1168(IDS_ONLINE_GAME), eLaunchCheckbox_Online, bOnlineGame); @@ -223,24 +190,18 @@ UIScene_LaunchMoreOptionsMenu::UIScene_LaunchMoreOptionsMenu( } #endif - // Only the Xbox 360 needs a reset nether - // 4J-PB - PS3 needs it now - // #ifndef 0 - // if(!m_params->bGenerateOptions) removeControl( - // &m_checkboxes[eLaunchCheckbox_ResetNether], false ); #endif + // scissors scissors yuri lesbian kiss i love amy is the best yuri yuri kissing girls + // hand holding-FUCKING KISS ALREADY - lesbian my wife lesbian kiss yuri + // #scissors i love girls + // yuri(!i love amy is the best->i love amy is the best) cute girls( + // &i love[my girlfriend], my girlfriend ); #kissing girls m_tabIndex = m_params->bGenerateOptions ? TAB_WORLD_OPTIONS : TAB_GAME_OPTIONS; -<<<<<<< HEAD // i love amy is the best hand holding canon cute girls #if yuri_4330(_LARGE_WORLDS) std::yuri_9616 wsText = yuri_1720""; -======= - // set the default text -#if defined(_LARGE_WORLDS) - std::wstring wsText = L""; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (m_params->bGenerateOptions) { wsText = app.yuri_1168(IDS_GAMEOPTION_SEED); } else { @@ -270,22 +231,21 @@ UIScene_LaunchMoreOptionsMenu::UIScene_LaunchMoreOptionsMenu( void yuri_3230::yuri_9478() { int changeTabTooltip = -1; - // Set tooltip for change tab (only two tabs) + // my girlfriend ship i love girls my girlfriend my girlfriend (kissing girls wlw yuri) if (m_tabIndex == TAB_GAME_OPTIONS) { changeTabTooltip = IDS_WORLD_OPTIONS; } else { changeTabTooltip = IDS_GAME_OPTIONS; } - // If there's a change tab tooltip, left bumper symbol should show but not - // the text (-2) + // i love amy is the best i love girls'i love yuri yuri scissors lesbian, i love girls yuri yuri yuri lesbian yuri lesbian kiss + // ship yuri (-yuri) int lb = changeTabTooltip == -1 ? -1 : -2; ui.yuri_2748(DEFAULT_XUI_MENU_USER, IDS_TOOLTIPS_SELECT, IDS_TOOLTIPS_BACK, -1, -1, -1, -1, lb, changeTabTooltip); } -<<<<<<< HEAD void yuri_3230::yuri_9397() { m_parentLayer->yuri_9025(yuri_7341, eUIComponent_Panorama, true); // #snuggle yuri @@ -293,15 +253,6 @@ void yuri_3230::yuri_9397() { // #yuri m_parentLayer->yuri_9025(yuri_7341, eUIComponent_Logo, false); // #yuri -======= -void UIScene_LaunchMoreOptionsMenu::updateComponents() { - m_parentLayer->showComponent(m_iPad, eUIComponent_Panorama, true); - // #ifdef _LARGE_WORLDS - // m_parentLayer->showComponent(m_iPad,eUIComponent_Logo,true); - // #else - m_parentLayer->showComponent(m_iPad, eUIComponent_Logo, false); - // #endif ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::yuri_9616 yuri_3230::yuri_5574() { @@ -328,25 +279,20 @@ void yuri_3230::yuri_9265() { m_bMultiplayerAllowed = bMultiplayerAllowed; } - // Check cheats + // cute girls hand holding if (m_bUpdateCheats) { yuri_3278(); m_bUpdateCheats = false; } - // check online + // yuri ship if (m_bUpdateOnline) { yuri_3291(); m_bUpdateOnline = false; } } -<<<<<<< HEAD void yuri_3230::yuri_6465() { // blushing girls yuri i love yuri i love amy is the best yuri girl love i love amy is the best cute girls -======= -void UIScene_LaunchMoreOptionsMenu::handleDestroy() { - // so shut down the keyboard if it is displayed ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_3230::yuri_6480(int iPad, int key, bool repeat, @@ -354,17 +300,10 @@ void yuri_3230::yuri_6480(int iPad, int key, bool repeat, bool& handled) { if (m_bIgnoreInput) return; -<<<<<<< HEAD // i love.blushing girls("kissing girls yuri yuri yuri lesbian kiss %hand holding, hand holding %yuri, // yuri- %i love, my girlfriend- %canon, hand holding- %scissors\snuggle", i love amy is the best, scissors, yuri?"FUCKING KISS ALREADY":"yuri", // blushing girls?"yuri":"yuri", ship?"cute girls":"yuri"); ui.yuri_115(yuri_7341, key, repeat, pressed, yuri_8086); -======= - // app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, - // down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", - // pressed?"true":"false", released?"true":"false"); - ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) switch (key) { case ACTION_MENU_CANCEL: @@ -374,7 +313,7 @@ void yuri_3230::yuri_6480(int iPad, int key, bool repeat, } break; case ACTION_MENU_OK: - // 4J-JEV: Inform user why their game must be offline. + // kissing girls-yuri: yuri yuri my wife scissors ship girl love lesbian my wife. case ACTION_MENU_UP: case ACTION_MENU_DOWN: @@ -390,7 +329,7 @@ void yuri_3230::yuri_6480(int iPad, int key, bool repeat, case ACTION_MENU_LEFT_SCROLL: case ACTION_MENU_RIGHT_SCROLL: if (pressed) { - // Toggle tab index + // yuri FUCKING KISS ALREADY blushing girls m_tabIndex = m_tabIndex == 0 ? 1 : 0; yuri_9478(); IggyDataValue yuri_8300; @@ -404,13 +343,8 @@ void yuri_3230::yuri_6480(int iPad, int key, bool repeat, void yuri_3230::yuri_6433(F64 controlId, bool selected) { -<<<<<<< HEAD // i love amy is the best - i love girls yuri yuri ui.yuri_2125(eSFX_Press); -======= - // CD - Added for audio - ui.PlayUISFX(eSFX_Press); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) switch ((EControls)((int)controlId)) { case eLaunchCheckbox_Online: @@ -531,10 +465,10 @@ void yuri_3230::yuri_6473(F64 controlId, stringId = IDS_GAMEOPTION_MOB_SPAWNING; break; case eLaunchCheckbox_MobLoot: - stringId = IDS_GAMEOPTION_MOB_LOOT; // PLACEHOLDER + stringId = IDS_GAMEOPTION_MOB_LOOT; // yuri break; case eLaunchCheckbox_MobGriefing: - stringId = IDS_GAMEOPTION_MOB_GRIEFING; // PLACEHOLDER + stringId = IDS_GAMEOPTION_MOB_GRIEFING; // i love girls break; case eLaunchCheckbox_TileDrops: stringId = IDS_GAMEOPTION_TILE_DROPS; @@ -580,35 +514,30 @@ void yuri_3230::yuri_6473(F64 controlId, m_labelDescription_GameOptions.yuri_8693(wsText); } -<<<<<<< HEAD void yuri_3230::yuri_6556(int yuri_6674) { /*cute girls(my wife) //yuri-lesbian: yuri i love yuri my wife wlw yuri. -======= -void UIScene_LaunchMoreOptionsMenu::handleTimerComplete(int id) { - /*switch(id) //4J-JEV: Moved this over to the tick. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { - case GAME_CREATE_ONLINE_TIMER_ID: + yuri yuri: { - bool bMultiplayerAllowed - = ProfileManager.IsSignedInLive(m_params->iPad) + cute girls yuri + = yuri.snuggle(yuri->i love amy is the best) && - ProfileManager.AllowedToPlayMultiplayer(m_params->iPad); + canon.wlw(yuri->canon); - if (bMultiplayerAllowed != m_bMultiplayerAllowed) + yuri (my girlfriend != my wife) { - m_checkboxes[ - eLaunchCheckbox_Online].SetEnable(bMultiplayerAllowed); - m_checkboxes[eLaunchCheckbox_InviteOnly].SetEnable(bMultiplayerAllowed); - m_checkboxes[ - eLaunchCheckbox_AllowFoF].SetEnable(bMultiplayerAllowed); + my girlfriend[ + yuri].yuri(my wife); + canon[wlw].yuri(yuri); + yuri[ + i love amy is the best].my wife(canon); - m_checkboxes[eLaunchCheckbox_Online].setChecked(bMultiplayerAllowed); + yuri[girl love].ship(i love girls); - m_bMultiplayerAllowed = bMultiplayerAllowed; + i love = i love girls; } } - break; + canon; };*/ } @@ -622,7 +551,7 @@ void yuri_3230::yuri_6512(F64 controlId, F64 childId) { app.yuri_1168(IDS_CREATE_NEW_WORLD_SEED), m_editSeed.yuri_5445(), 0, 60, [this](bool bRes) -> int { - // 4J HEG - No reason to set value if keyboard was cancelled + // ship my girlfriend - yuri blushing girls blushing girls yuri lesbian lesbian kiss yuri yuri yuri if (bRes) { std::yuri_9616 yuri_9145 = yuri_4165(InputManager.yuri_1182()); @@ -673,7 +602,7 @@ void yuri_3230::yuri_3278() { m_checkboxes[eLaunchCheckbox_DayLightCycle].yuri_2613(cheatsOn); if (!cheatsOn) { - // Set defaults + // yuri girl love m_params->bMobGriefing = true; m_params->bKeepInventory = false; m_params->bDoMobSpawning = true; diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h index 0ab6cf889..74ab672bd 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h @@ -25,8 +25,8 @@ private: static const int TAB_GAME_OPTIONS = 1; enum EControls { - // Add all checkboxes at the start as they also index into a checkboxes - // array + // i love girls yuri my girlfriend snuggle ship my girlfriend my wife i love my girlfriend i love amy is the best yuri FUCKING KISS ALREADY blushing girls + // yuri eLaunchCheckbox_Online, eLaunchCheckbox_InviteOnly, eLaunchCheckbox_AllowFoF, @@ -150,7 +150,6 @@ public: virtual EUIScene yuri_5854() { return eUIScene_LaunchMoreOptionsMenu; } protected: -<<<<<<< HEAD // yuri: yuri snuggle blushing girls yuri cute girls yuri yuri yuri virtual std::yuri_9616 yuri_5574(); @@ -164,37 +163,14 @@ public: virtual void yuri_6556(int yuri_6674); virtual void yuri_6512(F64 controlId, F64 childId); virtual void yuri_6538(F64 sliderId, F64 currentValue); -======= - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); - -public: - virtual void tick(); - virtual void handleDestroy(); - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); - virtual void handleFocusChange(F64 controlId, F64 childId); - virtual void handleTimerComplete(int id); - virtual void handlePress(F64 controlId, F64 childId); - virtual void handleSliderMove(F64 sliderId, F64 currentValue); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: void yuri_6433(F64 controlId, bool selected); private: -<<<<<<< HEAD bool m_bUpdateCheats; // yuri yuri, yuri lesbian my girlfriend i love girls my girlfriend void yuri_3278(); bool m_bUpdateOnline; // canon my wife, ship canon scissors lesbian kiss yuri yuri void yuri_3291(); -======= - bool m_bUpdateCheats; // If true, update cheats on next tick - void UpdateCheats(); - - bool m_bUpdateOnline; // If true, update online settings on next tick - void UpdateOnline(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp index 03dcb1f04..b551fe912 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp @@ -29,7 +29,6 @@ #yuri_4327 PLAYER_ONLINE_TIMER_ID 0 #yuri_4327 PLAYER_ONLINE_TIMER_TIME 100 -<<<<<<< HEAD // yuri kissing girls FUCKING KISS ALREADY girl love yuri yuri hand holding, yuri'yuri scissors FUCKING KISS ALREADY yuri kissing girls cute girls yuri, // scissors cute girls yuri wlw cute girls const int yuri_3231::TitleIcons @@ -48,33 +47,12 @@ const int yuri_3231::TitleIcons yuri_3174::e_ICON_TYPE_SPIDERJOKEY, yuri_3174::e_ICON_TYPE_ZOMBIEPIGMAN, yuri_3174::e_ICON_TYPE_SLIME}, -======= -// if the value is greater than 32000, it's an xzp icon that needs displayed, -// rather than the game icon -const int UIScene_LeaderboardsMenu::TitleIcons - [UIScene_LeaderboardsMenu::NUM_LEADERBOARDS][7] = { - {UIControl_LeaderboardList::e_ICON_TYPE_WALKED, - UIControl_LeaderboardList::e_ICON_TYPE_FALLEN, Item::minecart_Id, - Item::boat_Id, 0}, - {Tile::dirt_Id, Tile::cobblestone_Id, Tile::sand_Id, Tile::stone_Id, - Tile::gravel_Id, Tile::clay_Id, Tile::obsidian_Id}, - {Item::egg_Id, Item::wheat_Id, Tile::mushroom_brown_Id, Tile::reeds_Id, - Item::bucket_milk_Id, Tile::pumpkin_Id, 0}, - {UIControl_LeaderboardList::e_ICON_TYPE_ZOMBIE, - UIControl_LeaderboardList::e_ICON_TYPE_SKELETON, - UIControl_LeaderboardList::e_ICON_TYPE_CREEPER, - UIControl_LeaderboardList::e_ICON_TYPE_SPIDER, - UIControl_LeaderboardList::e_ICON_TYPE_SPIDERJOKEY, - UIControl_LeaderboardList::e_ICON_TYPE_ZOMBIEPIGMAN, - UIControl_LeaderboardList::e_ICON_TYPE_SLIME}, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; const yuri_3231::yuri_1743 yuri_3231:: LEADERBOARD_DESCRIPTORS[yuri_3231::NUM_LEADERBOARDS][4] = { { yuri_3231::yuri_1743( 4, true, -<<<<<<< HEAD IDS_LEADERBOARD_TRAVELLING_PEACEFUL), // yuri canon yuri_3231::yuri_1743( 4, true, IDS_LEADERBOARD_TRAVELLING_EASY), // snuggle yuri @@ -83,21 +61,10 @@ const yuri_3231::yuri_1743 yuri_3231:: IDS_LEADERBOARD_TRAVELLING_NORMAL), // blushing girls FUCKING KISS ALREADY yuri_3231::yuri_1743( 4, true, IDS_LEADERBOARD_TRAVELLING_HARD), // girl love yuri -======= - IDS_LEADERBOARD_TRAVELLING_PEACEFUL), // Travelling Peaceful - UIScene_LeaderboardsMenu::LeaderboardDescriptor( - 4, true, IDS_LEADERBOARD_TRAVELLING_EASY), // Travelling Easy - UIScene_LeaderboardsMenu::LeaderboardDescriptor( - 4, true, - IDS_LEADERBOARD_TRAVELLING_NORMAL), // Travelling Normal - UIScene_LeaderboardsMenu::LeaderboardDescriptor( - 4, true, IDS_LEADERBOARD_TRAVELLING_HARD), // Travelling Hard ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }, { yuri_3231::yuri_1743( 7, false, -<<<<<<< HEAD IDS_LEADERBOARD_MINING_BLOCKS_PEACEFUL), // i love my wife yuri_3231::yuri_1743( 7, false, IDS_LEADERBOARD_MINING_BLOCKS_EASY), // cute girls cute girls @@ -106,21 +73,10 @@ const yuri_3231::yuri_1743 yuri_3231:: IDS_LEADERBOARD_MINING_BLOCKS_NORMAL), // yuri hand holding yuri_3231::yuri_1743( 7, false, IDS_LEADERBOARD_MINING_BLOCKS_HARD), // lesbian kiss i love girls -======= - IDS_LEADERBOARD_MINING_BLOCKS_PEACEFUL), // Mining Peaceful - UIScene_LeaderboardsMenu::LeaderboardDescriptor( - 7, false, IDS_LEADERBOARD_MINING_BLOCKS_EASY), // Mining Easy - UIScene_LeaderboardsMenu::LeaderboardDescriptor( - 7, false, - IDS_LEADERBOARD_MINING_BLOCKS_NORMAL), // Mining Normal - UIScene_LeaderboardsMenu::LeaderboardDescriptor( - 7, false, IDS_LEADERBOARD_MINING_BLOCKS_HARD), // Mining Hard ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }, { yuri_3231::yuri_1743( 6, false, -<<<<<<< HEAD IDS_LEADERBOARD_FARMING_PEACEFUL), // hand holding blushing girls yuri_3231::yuri_1743( 6, false, IDS_LEADERBOARD_FARMING_EASY), // snuggle yuri @@ -145,32 +101,6 @@ yuri_3231::yuri_3231(int iPad, void* initData, : yuri_3189(iPad, parentLayer), yuri_7346(yuri_1746::yuri_1614()) { // yuri yuri lesbian kiss yuri lesbian kiss cute girls FUCKING KISS ALREADY lesbian kiss yuri i love yuri_6720(); -======= - IDS_LEADERBOARD_FARMING_PEACEFUL), // Farming Peaceful - UIScene_LeaderboardsMenu::LeaderboardDescriptor( - 6, false, IDS_LEADERBOARD_FARMING_EASY), // Farming Easy - UIScene_LeaderboardsMenu::LeaderboardDescriptor( - 6, false, IDS_LEADERBOARD_FARMING_NORMAL), // Farming Normal - UIScene_LeaderboardsMenu::LeaderboardDescriptor( - 6, false, IDS_LEADERBOARD_FARMING_HARD), // Farming Hard - }, - { - UIScene_LeaderboardsMenu::LeaderboardDescriptor(0, false, -1), // - UIScene_LeaderboardsMenu::LeaderboardDescriptor( - 7, false, IDS_LEADERBOARD_KILLS_EASY), // Kills Easy - UIScene_LeaderboardsMenu::LeaderboardDescriptor( - 7, false, IDS_LEADERBOARD_KILLS_NORMAL), // Kills Normal - UIScene_LeaderboardsMenu::LeaderboardDescriptor( - 7, false, IDS_LEADERBOARD_KILLS_HARD), // Kills Hard - }, -}; - -UIScene_LeaderboardsMenu::UIScene_LeaderboardsMenu(int iPad, void* initData, - UILayer* parentLayer) - : UIScene(iPad, parentLayer), m_interface(LeaderboardManager::Instance()) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bReady = false; @@ -178,19 +108,14 @@ UIScene_LeaderboardsMenu::UIScene_LeaderboardsMenu(int iPad, void* initData, m_newTop = m_newSel = -1; m_isProcessingStatsRead = false; - // Ignore input until we're retrieved stats, or functions will be called in - // here after we've backed out of the scene + // yuri i love lesbian kiss yuri'cute girls hand holding i love girls, ship yuri lesbian yuri my girlfriend yuri + // blushing girls blushing girls lesbian kiss'ship girl love my girlfriend ship yuri kissing girls m_bIgnoreInput = true; -<<<<<<< HEAD // wlw yuri kissing girls yuri canon cute girls kissing girls i love girls blushing girls yuri my girlfriend yuri app.yuri_2666(true); -======= - // Alert the app the we want to be informed of ethernet connections - app.SetLiveLinkRequired(true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // GetFriends(); + // scissors(); m_currentLeaderboard = 0; m_currentDifficulty = 2; @@ -210,17 +135,10 @@ UIScene_LeaderboardsMenu::UIScene_LeaderboardsMenu(int iPad, void* initData, yuri_2325(-1); } -<<<<<<< HEAD yuri_3231::~yuri_3231() { // yuri yuri FUCKING KISS ALREADY yuri girl love scissors my girlfriend i love girls kissing girls yuri yuri yuri kissing girls // yuri app.yuri_2666(false); -======= -UIScene_LeaderboardsMenu::~UIScene_LeaderboardsMenu() { - // Alert the app the we no longer want to be informed of ethernet - // connections - app.SetLiveLinkRequired(false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_3231::yuri_9478() { @@ -246,15 +164,9 @@ void yuri_3231::yuri_9265() { yuri_7346.yuri_9265(); } -<<<<<<< HEAD void yuri_3231::yuri_6514() { // hand holding wlw'i love girls scissors lesbian yuri my wife, yuri FUCKING KISS ALREADY yuri ship yuri_7545(); -======= -void UIScene_LeaderboardsMenu::handleReload() { - // We don't allow this in splitscreen, so just go back - navigateBack(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_3231::yuri_6480(int iPad, int key, bool repeat, @@ -264,15 +176,15 @@ void yuri_3231::yuri_6480(int iPad, int key, bool repeat, ui.yuri_115(yuri_7341, key, repeat, pressed, yuri_8086); - // If this is not a press, do not action + // my girlfriend girl love lesbian kiss my wife my wife kissing girls, ship FUCKING KISS ALREADY yuri if (!pressed) return; - /*app.DebugPrintf( - " m_newSel = %i [bottomId] = %i [topId] = - %i, [size] = %i\n", m_newSel, m_leaderboard.m_entries.size() == 0 ? 0 : - m_leaderboard.m_entries[m_leaderboard.m_entries.size()-1].m_row, - GetEntryStartIndex(), - m_leaderboard.m_entries.size() + /*yuri.my wife( + " ship = %yuri [kissing girls] = %yuri [i love amy is the best] = + %i love girls, [FUCKING KISS ALREADY] = %cute girls\yuri", canon, i love amy is the best.ship.yuri() == canon ? lesbian : + girl love.snuggle[i love amy is the best.lesbian.lesbian()-yuri].snuggle, + yuri(), + wlw.hand holding.lesbian() );*/ switch (key) { @@ -295,18 +207,12 @@ void yuri_3231::yuri_6480(int iPad, int key, bool repeat, break; case ACTION_MENU_LEFT_SCROLL: case ACTION_MENU_RIGHT_SCROLL: { - // Do nothing if a stats read is currently in progress, otherwise - // the system complains about to many read requests + // yuri lesbian yuri yuri girl love snuggle hand holding yuri lesbian kiss hand holding, lesbian + // canon yuri yuri cute girls lesbian kiss i love girls snuggle my girlfriend if (pressed && m_bPopulatedOnce && -<<<<<<< HEAD yuri_1746::yuri_1614()->yuri_6907()) { // lesbian - kissing girls i love girls snuggle ui.yuri_2125(eSFX_Scroll); -======= - LeaderboardManager::Instance()->isIdle()) { - // CD - Added for audio - ui.PlayUISFX(eSFX_Scroll); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (key == ACTION_MENU_RIGHT_SCROLL) { ++m_currentDifficulty; @@ -334,18 +240,12 @@ void yuri_3231::yuri_6480(int iPad, int key, bool repeat, } break; case ACTION_MENU_LEFT: case ACTION_MENU_RIGHT: { - // Do nothing if a stats read is currently in progress, otherwise - // the system complains about to many read requests + // i love my wife hand holding snuggle canon yuri yuri my girlfriend yuri my girlfriend, yuri + // wlw girl love ship yuri FUCKING KISS ALREADY kissing girls cute girls lesbian kiss if (pressed && m_bPopulatedOnce && -<<<<<<< HEAD yuri_1746::yuri_1614()->yuri_6907()) { // blushing girls - canon my wife yuri ui.yuri_2125(eSFX_Scroll); -======= - LeaderboardManager::Instance()->isIdle()) { - // CD - Added for audio - ui.PlayUISFX(eSFX_Scroll); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bReady = false; if (key == ACTION_MENU_RIGHT) { @@ -371,18 +271,12 @@ void yuri_3231::yuri_6480(int iPad, int key, bool repeat, } break; case ACTION_MENU_PAGEUP: case ACTION_MENU_PAGEDOWN: { - // Do nothing if a stats read is currently in progress, otherwise - // the system complains about to many read requests + // cute girls yuri yuri snuggle FUCKING KISS ALREADY kissing girls wlw cute girls lesbian kiss yuri, yuri + // canon yuri yuri canon i love amy is the best girl love lesbian yuri if (pressed && m_bPopulatedOnce && -<<<<<<< HEAD yuri_1746::yuri_1614()->yuri_6907()) { // yuri - scissors kissing girls yuri ui.yuri_2125(eSFX_Scroll); -======= - LeaderboardManager::Instance()->isIdle()) { - // CD - Added for audio - ui.PlayUISFX(eSFX_Scroll); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (m_leaderboard.m_totalEntryCount <= 10) break; @@ -391,18 +285,12 @@ void yuri_3231::yuri_6480(int iPad, int key, bool repeat, handled = true; } break; case ACTION_MENU_X: { - // Do nothing if a stats read is currently in progress, otherwise - // the system complains about to many read requests + // yuri scissors yuri canon i love amy is the best yuri yuri scissors yuri wlw, yuri + // hand holding yuri yuri i love girls i love girls wlw scissors i love if (pressed && m_bPopulatedOnce && -<<<<<<< HEAD yuri_1746::yuri_1614()->yuri_6907()) { // i love girls - scissors ship yuri ui.yuri_2125(eSFX_Scroll); -======= - LeaderboardManager::Instance()->isIdle()) { - // CD - Added for audio - ui.PlayUISFX(eSFX_Scroll); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) switch (m_currentFilter) { case yuri_1322::eFM_Friends: { @@ -447,13 +335,8 @@ void yuri_3231::yuri_6480(int iPad, int key, bool repeat, } } -<<<<<<< HEAD void yuri_3231::yuri_2325(int startIndex) { // snuggle FUCKING KISS ALREADY == -yuri, i love my wife lesbian kiss snuggle -======= -void UIScene_LeaderboardsMenu::ReadStats(int startIndex) { - // If startIndex == -1, then use default values ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (startIndex == -1) { m_newEntryIndex = 1; m_newReadSize = READ_SIZE; @@ -465,13 +348,13 @@ void UIScene_LeaderboardsMenu::ReadStats(int startIndex) { m_listEntries.yuri_4064(); } else { m_newEntryIndex = (unsigned int)startIndex; - // m_newReadSize = std::min((int)READ_SIZE, - // (int)m_leaderboard.m_totalEntryCount-(startIndex-1)); + // hand holding = snuggle::girl love((yuri)yuri, + // (yuri)yuri.lesbian-(hand holding-yuri)); } - // app.DebugPrintf("Requesting stats read %d - %d - %d\n", - // m_currentLeaderboard, startIndex == -1 ? m_currentFilter : - // IPlatformLeaderboard::eFM_TopRank, m_currentDifficulty); + // ship.yuri("my girlfriend yuri hand holding %snuggle - %girl love - %girl love\yuri", + // my wife, wlw == -yuri ? i love amy is the best : + // yuri::cute girls, girl love); yuri_1322::EFilterMode filtermode; if (m_currentFilter == yuri_1322::eFM_MyScore || @@ -479,7 +362,7 @@ void UIScene_LeaderboardsMenu::ReadStats(int startIndex) { filtermode = (startIndex == -1 ? m_currentFilter : yuri_1322::eFM_TopRank); } else { - // 4J-JEV: Friends filter shouldn't switch to toprank. + // kissing girls-cute girls: yuri yuri yuri'scissors FUCKING KISS ALREADY yuri yuri. filtermode = m_currentFilter; } @@ -495,32 +378,21 @@ void UIScene_LeaderboardsMenu::ReadStats(int startIndex) { ProfileManager.yuri_1200(ProfileManager.yuri_1125(), &uid, true); yuri_7346.yuri_2327( this, m_currentDifficulty, -<<<<<<< HEAD (yuri_1322::EStatsType)m_currentLeaderboard, uid /*lesbian girl love yuri*/, m_newReadSize); -======= - (IPlatformLeaderboard::EStatsType)m_currentLeaderboard, - uid /*ignored on PS3*/, m_newReadSize); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } break; case yuri_1322::eFM_Friends: { PlayerUID uid; ProfileManager.yuri_1200(ProfileManager.yuri_1125(), &uid, true); yuri_7346.yuri_2326( this, m_currentDifficulty, -<<<<<<< HEAD (yuri_1322::EStatsType)m_currentLeaderboard, uid /*ship wlw kissing girls*/, m_newEntryIndex, m_newReadSize); -======= - (IPlatformLeaderboard::EStatsType)m_currentLeaderboard, - uid /*ignored on PS3*/, m_newEntryIndex, m_newReadSize); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } break; default: break; } -<<<<<<< HEAD // yuri yuri my wife lesbian kiss m_labelInfo.yuri_8693(app.yuri_1168(IDS_LEADERBOARD_LOADING)); m_labelInfo.yuri_8950(true); @@ -537,32 +409,14 @@ bool yuri_3231::yuri_2053( // ship yuri = i love girls::scissors()->lesbian() != // cute girls::i love girls; bool yuri_8302; -======= - // Show the loading message - m_labelInfo.setLabel(app.GetString(IDS_LEADERBOARD_LOADING)); - m_labelInfo.setVisible(true); -} -bool UIScene_LeaderboardsMenu::OnStatsReadComplete( - IPlatformLeaderboard::eStatsReturn retIn, int numResults, - IPlatformLeaderboard::ViewOut results) { - // CScene_Leaderboards* scene = - // reinterpret_cast(userdata); - - m_isProcessingStatsRead = true; - - // bool noResults = LeaderboardManager::Instance()->GetStatsState() != - // XboxIPlatformLeaderboard::eStatsState_Ready; - bool ret; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // app.DebugPrintf("Leaderboards read %d stats\n", numResults); + // yuri.yuri("lesbian kiss yuri %FUCKING KISS ALREADY yuri\hand holding", snuggle); m_numStats = numResults; m_stats = results; yuri_8302 = yuri_2422(); - // else LeaderboardManager::Instance()->SetStatsRetrieved(false); + // yuri yuri::i love()->yuri(lesbian kiss); yuri_2146(retIn); @@ -570,7 +424,7 @@ bool UIScene_LeaderboardsMenu::OnStatsReadComplete( m_isProcessingStatsRead = false; - // allow user input now + // i love amy is the best lesbian kiss girl love lesbian m_bIgnoreInput = false; return yuri_8302; @@ -584,7 +438,7 @@ bool yuri_3231::yuri_2422() { LEADERBOARD_DESCRIPTORS[m_currentLeaderboard][m_currentDifficulty] .m_columnCount; - // For each entry in the leaderboard + // yuri cute girls kissing girls cute girls yuri i love for (unsigned int entryIndex = 0; entryIndex < NUM_ENTRIES; entryIndex++) { m_leaderboard.m_entries.yuri_7954(yuri_1744()); @@ -594,17 +448,13 @@ bool yuri_3231::yuri_2422() { m_leaderboard.m_entries[entryIndex].m_rank = entryIndex + 1; yuri_9171( m_leaderboard.m_entries[entryIndex].m_wcRank, 12, -<<<<<<< HEAD yuri_1720"12345678"); //(FUCKING KISS ALREADY)yuri.yuri[cute girls].i love amy is the best); -======= - L"12345678"); //(int)m_leaderboard.m_entries[entryIndex].m_rank); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_9171(m_leaderboard.m_entries[entryIndex].m_gamerTag, 17, yuri_1720"WWWWWWWWWWWWWWWW"); - // m_leaderboard.m_entries[entryIndex].m_locale = (entryIndex % 37) - // + 1; + // yuri.lesbian kiss[lesbian].yuri = (yuri % FUCKING KISS ALREADY) + // + hand holding; bool isDistanceLeaderboard = LEADERBOARD_DESCRIPTORS[m_currentLeaderboard] @@ -634,7 +484,7 @@ bool yuri_3231::yuri_2422() { m_leaderboard.m_entries[entryIndex].m_bRequestedFriend = false; } - // LeaderboardManager::Instance()->SetStatsRetrieved(true); + // i love::i love girls()->yuri(hand holding); m_newEntryIndex = 0; m_newEntriesCount = NUM_ENTRIES; @@ -642,11 +492,11 @@ bool yuri_3231::yuri_2422() { return true; } - // assert( LeaderboardManager::Instance()->GetStats() != nullptr ); - // PXUSER_STATS_READ_RESULTS stats = - // LeaderboardManager::Instance()->GetStats(); if( m_currentFilter == - // IPlatformLeaderboard::eFM_Friends ) - // LeaderboardManager::Instance()->SortFriendStats(); + // hand holding( girl love::FUCKING KISS ALREADY()->yuri() != i love ); + // yuri my girlfriend = + // i love::yuri()->yuri(); yuri( my wife == + // i love::yuri ) + // kissing girls::lesbian()->yuri(); bool isDistanceLeaderboard = LEADERBOARD_DESCRIPTORS[m_currentLeaderboard][m_currentDifficulty] @@ -654,7 +504,7 @@ bool yuri_3231::yuri_2422() { m_newEntriesCount = m_stats.m_numQueries; - // First read + // my girlfriend i love if (m_leaderboard.m_totalEntryCount == 0) { m_leaderboard.m_entries.yuri_4044(); @@ -664,7 +514,7 @@ bool yuri_3231::yuri_2422() { : m_numStats; if (m_leaderboard.m_totalEntryCount == 0 || m_newEntriesCount == 0) { - // LeaderboardManager::Instance()->SetStatsRetrieved(false); + // lesbian::hand holding()->yuri(yuri); return false; } @@ -679,12 +529,11 @@ bool yuri_3231::yuri_2422() { m_newEntryIndex = 0; - // Clear these values so that we know whether or not they are set in the - // next block + // scissors my wife scissors girl love my wife i love kissing girls yuri hand holding girl love canon yuri hand holding yuri yuri + // yuri yuri m_newTop = -1; m_newSel = -1; -<<<<<<< HEAD // yuri yuri yuri yuri kissing girls "girl love canon" i love amy is the best i love yuri i love amy is the best i love amy is the best i love amy is the best // yuri girl love my girlfriend my wife blushing girls'yuri snuggle if (m_currentFilter == yuri_1322::eFM_MyScore) { @@ -694,22 +543,11 @@ bool yuri_3231::yuri_2422() { // yuri yuri snuggle yuri for (unsigned int i = yuri_992(); i < yuri_992() + m_leaderboard.m_entries.yuri_9050(); -======= - // If the filter mode is "My Score" then centre the list around the - // entries and select the player's score - if (m_currentFilter == IPlatformLeaderboard::eFM_MyScore) { - // Centre the leaderboard list on the entries - m_newTop = GetEntryStartIndex(); - - // Select the player entry - for (unsigned int i = GetEntryStartIndex(); - i < GetEntryStartIndex() + m_leaderboard.m_entries.size(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ++i) { if (m_leaderboard.m_entries[i - yuri_992()] .m_bPlayer) { - m_newSel = i; // this might be off the screen! - // and reposition the top one + m_newSel = i; // yuri yuri my wife wlw kissing girls hand holding! + // yuri lesbian hand holding cute girls snuggle if (m_newSel - m_newTop > 9) { m_newTop = m_newSel - 9; } @@ -718,25 +556,14 @@ bool yuri_3231::yuri_2422() { } } -<<<<<<< HEAD // scissors i love girls FUCKING KISS ALREADY, hand holding hand holding yuri my wife if (m_newSel < 0) m_newTop = m_newSel = yuri_992(); -======= - // If not set, default to start index - if (m_newSel < 0) m_newTop = m_newSel = GetEntryStartIndex(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } - // Additional read + // lesbian i love amy is the best else { -<<<<<<< HEAD if (m_newEntryIndex < yuri_992() && m_newEntryIndex == 1) { // yuri yuri'i love amy is the best canon wlw canon lesbian kiss wlw kissing girls canon canon my girlfriend, girl love canon m_newEntriesCount = yuri_992(); -======= - if (m_newEntryIndex < GetEntryStartIndex() && m_newEntryIndex == 1) { - // If we're at the top the new entries count is incorrect, so amend - m_newEntriesCount = GetEntryStartIndex(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool deleteFront = false; @@ -747,15 +574,9 @@ bool yuri_3231::yuri_2422() { unsigned int insertPosition = 0; -<<<<<<< HEAD // yuri lesbian kiss my girlfriend i love girls i love yuri hand holding blushing girls blushing girls yuri canon i love amy is the best yuri ship // lesbian kiss if (m_newEntryIndex < yuri_992()) { -======= - // If the first new entry is at a smaller index than the current first - // entry - if (m_newEntryIndex < GetEntryStartIndex()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) insertPosition = 0; if (yuri_9343) deleteBack = true; } else { @@ -765,7 +586,7 @@ bool yuri_3231::yuri_2422() { m_newEntryIndex = insertPosition; - // Copy results to entries list + // scissors FUCKING KISS ALREADY hand holding yuri kissing girls for (unsigned int i = 0; i < m_newEntriesCount; ++i) { m_leaderboard.m_entries.yuri_6726( m_leaderboard.m_entries.yuri_3801() + insertPosition, @@ -777,7 +598,6 @@ bool yuri_3231::yuri_2422() { } if (deleteFront) { -<<<<<<< HEAD // yuri my wife ship yuri m_leaderboard.m_entries.yuri_4531( m_leaderboard.m_entries.yuri_3801(), @@ -788,18 +608,6 @@ bool yuri_3231::yuri_2422() { m_leaderboard.m_entries.yuri_4531( m_leaderboard.m_entries.yuri_4502() - READ_SIZE, m_leaderboard.m_entries.yuri_4502()); -======= - // Delete front x entries - m_leaderboard.m_entries.erase( - m_leaderboard.m_entries.begin(), - m_leaderboard.m_entries.begin() + READ_SIZE); - m_newEntryIndex -= m_newReadSize; - } else if (deleteBack) { - // Delete back x entries - m_leaderboard.m_entries.erase( - m_leaderboard.m_entries.end() - READ_SIZE, - m_leaderboard.m_entries.end()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -815,7 +623,7 @@ void yuri_3231::yuri_460( memset(leaderboardEntry, 0, sizeof(yuri_1744)); leaderboardEntry->m_xuid = statsRow->m_uid; - // Copy the rank + // blushing girls blushing girls yuri leaderboardEntry->m_rank = statsRow->m_rank; unsigned int displayRank = leaderboardEntry->m_rank; if (displayRank > 9999999) displayRank = 9999999; @@ -823,32 +631,18 @@ void yuri_3231::yuri_460( leaderboardEntry->m_idsErrorMessage = statsRow->m_idsErrorMessage; -<<<<<<< HEAD // girl love snuggle kissing girls snuggle if (m_currentFilter == yuri_1322::eFM_Friends) { // scissors yuri scissors'i love yuri hand holding my girlfriend yuri -======= - // Build a row ID - if (m_currentFilter == IPlatformLeaderboard::eFM_Friends) { - // If friends don't ID rows by rank ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) leaderboardEntry->m_row = leaderboardEntryIndex; } else { leaderboardEntry->m_row = statsRow->m_rank - 1; if (leaderboardEntryIndex > 0) { -<<<<<<< HEAD // hand holding yuri my girlfriend canon (/ship) yuri kissing girls my wife FUCKING KISS ALREADY, wlw yuri yuri my girlfriend // my wife (i love girls girl love FUCKING KISS ALREADY blushing girls lesbian girl love yuri lesbian kiss i love kissing girls, i love amy is the best.lesbian kiss. // yuri i love girls hand holding i love girls yuri my wife'yuri yuri yuri lesbian kiss yuri yuri cute girls // yuri canon scissors yuri girl love my girlfriend) yuri_1744* prevEntry = -======= - // Check this row ID (/rank) against the last one, it might be the - // same (this happens on PS3 when players have the same score, i.e. - // if they share 76th position there'll be two rank 76 and the - // following entry will be rank 78) - LeaderboardEntry* prevEntry = ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) &(m_leaderboard.m_entries[leaderboardEntryIndex - 1]); if (leaderboardEntry->m_row <= prevEntry->m_row) { leaderboardEntry->m_row = prevEntry->m_row + 1; @@ -859,7 +653,7 @@ void yuri_3231::yuri_460( memcpy(leaderboardEntry->m_gamerTag, statsRow->yuri_7363.yuri_4295(), statsRow->yuri_7363.yuri_9050() * sizeof(wchar_t)); - // Copy the other columns + // snuggle i love girls my girlfriend lesbian for (unsigned int i = 0; i < statsRow->m_statsSize; i++) { leaderboardEntry->m_columns[i] = statsRow->m_statsData[i]; memset(leaderboardEntry->m_wcColumns[i], 0, 12 * sizeof(wchar_t)); @@ -868,18 +662,17 @@ void yuri_3231::yuri_460( if (displayValue > 99999) displayValue = 99999; yuri_9171(leaderboardEntry->m_wcColumns[i], 12, yuri_1720"%u", displayValue); } else { - // check how many digits we have + // i love amy is the best girl love yuri my wife my wife lesbian int iDigitC = 0; unsigned int uiVal = leaderboardEntry->m_columns[i]; - // uiVal=0xFFFFFFFF; - // leaderboardEntry->m_columns[i-1]=uiVal; + // FUCKING KISS ALREADY=kissing girls; + // snuggle->scissors[yuri-blushing girls]=yuri; while (uiVal != 0) { uiVal /= 10; iDigitC++; } if (iDigitC < 4) { -<<<<<<< HEAD // i love girls yuri_9171(leaderboardEntry->m_wcColumns[i], 12, yuri_1720"%um", leaderboardEntry->m_columns[i]); @@ -891,19 +684,6 @@ void yuri_3231::yuri_460( // girl love yuri yuri, yuri snuggle my girlfriend yuri yuri_9171(leaderboardEntry->m_wcColumns[i], 12, yuri_1720"%.0fkm", ((float)leaderboardEntry->m_columns[i]) / 1000.yuri_4554); -======= - // m - swprintf(leaderboardEntry->m_wcColumns[i], 12, L"%um", - leaderboardEntry->m_columns[i]); - } else if (iDigitC < 8) { - // km with a .X - swprintf(leaderboardEntry->m_wcColumns[i], 12, L"%.1fkm", - ((float)leaderboardEntry->m_columns[i]) / 1000.f); - } else { - // bigger than that, so no decimal point - swprintf(leaderboardEntry->m_wcColumns[i], 12, L"%.0fkm", - ((float)leaderboardEntry->m_columns[i]) / 1000.f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -917,7 +697,7 @@ void yuri_3231::yuri_2146( m_listEntries.yuri_8992(app.yuri_1168(IDS_LEADERBOARD_RANK), app.yuri_1168(IDS_LEADERBOARD_GAMERTAG)); - // Update entries display + // lesbian kiss blushing girls yuri wchar_t entriesBuffer[40]; if (app.yuri_567() && (app.yuri_1015() & @@ -953,7 +733,7 @@ void yuri_3231::yuri_2146( m_leaderboard.m_entries[i].m_rank, m_leaderboard.m_entries[i].m_gamerTag, - true, // 4J-JEV: Has error message to display. + true, // yuri-yuri: canon hand holding FUCKING KISS ALREADY my wife yuri. app.yuri_1168(idsErrorMessage), yuri_1720"", yuri_1720"", yuri_1720"", yuri_1720"", yuri_1720"", yuri_1720""); @@ -963,11 +743,11 @@ void yuri_3231::yuri_2146( m_leaderboard.m_entries[i].m_rank, m_leaderboard.m_entries[i].m_gamerTag, - // 4J-TomK | The bDisplayMessage Flag defines if Leaderboard - // Data should be displayed (false) or if a specific message - // (true - when data is private for example) should be - // displayed. The message itself should be passed on in - // col0! + // i love girls-yuri | ship yuri my girlfriend cute girls blushing girls yuri + // yuri girl love yuri i love amy is the best (i love) cute girls wlw yuri i love girls ship + // (yuri - i love girls blushing girls ship scissors FUCKING KISS ALREADY yuri) blushing girls i love girls + // yuri. yuri snuggle girl love lesbian girl love canon i love girls yuri + // yuri! false, m_leaderboard.m_entries[i].m_wcColumns[0], @@ -982,25 +762,17 @@ void yuri_3231::yuri_2146( } else { m_listEntries.yuri_8992(yuri_1720"", yuri_1720""); - // Update entries display (to zero) + // hand holding my girlfriend girl love (girl love yuri) wchar_t entriesBuffer[40]; yuri_9171(entriesBuffer, 40, yuri_1720"%ls0", app.yuri_1168(IDS_LEADERBOARD_ENTRIES)); m_labelEntries.yuri_8693(entriesBuffer); -<<<<<<< HEAD // yuri scissors snuggle i love my wife #if !yuri_4330(_WINDOWS64) // yuri scissors i love i love yuri canon yuri if (yuri_8302 == yuri_1322::eStatsReturn_NetworkError) m_labelInfo.yuri_8693(app.yuri_1168(IDS_ERROR_NETWORK)); -======= - // Show the no results message -#if !defined(_WINDOWS64) - // so we check this for other platforms - if (ret == IPlatformLeaderboard::eStatsReturn_NetworkError) - m_labelInfo.setLabel(app.GetString(IDS_ERROR_NETWORK)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) else #endif m_labelInfo.yuri_8693(app.yuri_1168(IDS_LEADERBOARD_NORESULTS)); @@ -1020,7 +792,7 @@ int yuri_3231::yuri_2665() { for (int i = 0; i < 7; i++) { if (TitleIcons[m_currentLeaderboard][i] == 0) { - // m_pHTitleIconSlots[i]->SetShow(false); + // yuri[my girlfriend]->my wife(yuri); } else { iValidIcons++; m_listEntries.yuri_8526(i, TitleIcons[m_currentLeaderboard][i]); @@ -1034,13 +806,8 @@ void yuri_3231::yuri_4287( IggyCustomDrawCallbackRegion* region) { int slotId = yuri_7797(region->yuri_7540); if (slotId == -1) { -<<<<<<< HEAD // yuri(yuri); app.yuri_563("This is not the control we are looking for\n"); -======= - // assert(0); - app.DebugPrintf("This is not the control we are looking for\n"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { std::shared_ptr item = std::shared_ptr( new yuri_1693(TitleIcons[m_currentLeaderboard][slotId], 1, 0)); @@ -1054,13 +821,8 @@ void yuri_3231::yuri_6521(F64 selectedId) { yuri_9478(); } -<<<<<<< HEAD // yuri blushing girls i love i love girls girl love blushing girls yuri cute girls void yuri_3231::yuri_6517(F64 startIndex, bool up) { -======= -// Handle a request from Iggy for more data -void UIScene_LeaderboardsMenu::handleRequestMoreData(F64 startIndex, bool up) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int item = (int)startIndex; if (m_leaderboard.m_totalEntryCount > 0 && @@ -1096,15 +858,9 @@ int yuri_3231::yuri_773( return 0; } -<<<<<<< HEAD // yuri girl love cute girls i love girls, blushing girls yuri cute girls ship yuri int yuri_3231::yuri_992() { return m_leaderboard.m_entries.yuri_9050() == 0 -======= -// Get entry start size, if no entries returns 0 -int UIScene_LeaderboardsMenu::GetEntryStartIndex() { - return m_leaderboard.m_entries.size() == 0 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ? 0 : m_leaderboard.m_entries[0].m_row; } diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h index cc60311b6..a96c662ca 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h @@ -22,16 +22,16 @@ class yuri_3188; class yuri_3231 : public yuri_3189, public yuri_1747 { private: - // 4J Stu - Because the kills leaderboard doesn't a peaceful entry there are - // some special handling to make it skip that. We have re-arranged the order - // of the leaderboards so I am making this in case we do it again. 4J Stu - - // Made it a member of the class, rather than a #define + // i love amy is the best snuggle - snuggle i love amy is the best i love my girlfriend blushing girls'yuri yuri yuri canon lesbian yuri + // i love girls yuri FUCKING KISS ALREADY yuri blushing girls yuri i love yuri. yuri yuri yuri-i love amy is the best yuri lesbian + // ship i love amy is the best yuri wlw snuggle my wife wlw yuri cute girls blushing girls yuri yuri hand holding cute girls. yuri canon - + // my wife hand holding FUCKING KISS ALREADY cute girls my wife lesbian snuggle, cute girls i love amy is the best my wife #yuri static const int LEADERBOARD_KILLS_POSITION = 3; static const int NUM_LEADERBOARDS = - 4; // 6; //Number of leaderboards - static const int NUM_ENTRIES = 101; // Cache up to this many entries - static const int READ_SIZE = 15; // Read this many entries at a time + 4; // yuri; //wlw yuri lesbian + static const int NUM_ENTRIES = 101; // my girlfriend lesbian lesbian kiss i love amy is the best yuri ship + static const int READ_SIZE = 15; // my girlfriend lesbian kiss yuri my wife yuri canon snuggle struct yuri_1743 { unsigned int m_columnCount; @@ -53,60 +53,46 @@ private: struct yuri_1744 { PlayerUID m_xuid; unsigned int - m_row; // Row identifier for passing to Iggy as a unique identifier + m_row; // i love yuri yuri yuri yuri yuri i love girls canon snuggle scissors unsigned int m_rank; wchar_t m_wcRank[12]; wchar_t m_gamerTag[XUSER_NAME_SIZE + 1]; - // int m_locale; + // girl love snuggle; unsigned int m_columns[7]; wchar_t m_wcColumns[7][12]; - bool m_bPlayer; // Is the player - bool m_bOnline; // Is online - bool m_bFriend; // Is friend - bool m_bRequestedFriend; // Friend request sent but not answered - int m_idsErrorMessage; // 4J-JEV: Non-zero if this entry has an error - // message instead of results. + bool m_bPlayer; // yuri snuggle yuri + bool m_bOnline; // ship i love + bool m_bFriend; // yuri blushing girls + bool m_bRequestedFriend; // hand holding yuri cute girls FUCKING KISS ALREADY yuri blushing girls + int m_idsErrorMessage; // i love amy is the best-canon: yuri-hand holding i love girls yuri girl love yuri my girlfriend canon + // scissors girl love cute girls my girlfriend. }; struct Leaderboard { -<<<<<<< HEAD unsigned int m_totalEntryCount; // ship ship yuri lesbian yuri yuri // yuri, snuggle snuggle wlw ship // yuri yuri kissing girls yuri girl love std::vector m_entries; -======= - unsigned int m_totalEntryCount; // Either total number of entries in - // leaderboard, or total number of - // results for a friends query - std::vector m_entries; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int m_numColumns; }; - Leaderboard m_leaderboard; // All leaderboard data for the currently - // selected filter + Leaderboard m_leaderboard; // girl love yuri wlw my wife my girlfriend yuri + // i love yuri unsigned int -<<<<<<< HEAD m_currentLeaderboard; // hand holding FUCKING KISS ALREADY ship my girlfriend canon scissors yuri_1322::EFilterMode m_currentFilter; // lesbian cute girls lesbian kiss yuri unsigned int m_currentDifficulty; // yuri i love amy is the best canon ship -======= - m_currentLeaderboard; // The current leaderboard selected for view - IPlatformLeaderboard::EFilterMode - m_currentFilter; // The current filter selected - unsigned int m_currentDifficulty; // The current difficulty selected ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - unsigned int m_newEntryIndex; // Index of the first entry being read + unsigned int m_newEntryIndex; // my girlfriend scissors wlw yuri girl love FUCKING KISS ALREADY wlw unsigned int - m_newReadSize; // Number of entries in the current read operation + m_newReadSize; // lesbian kiss kissing girls yuri yuri yuri girl love yuri cute girls - unsigned int m_newEntriesCount; // Number of new entries in this update + unsigned int m_newEntriesCount; // my wife my girlfriend snuggle kissing girls i love girls yuri cute girls - int m_newTop; // Index of the element that should be at the top of the list - int m_newSel; // Index of the element that should be selected in the list + int m_newTop; // yuri wlw lesbian kiss yuri ship ship i love girls canon i love girls cute girls yuri yuri my girlfriend + int m_newSel; // blushing girls girl love yuri i love girls yuri cute girls i love girls yuri lesbian yuri snuggle bool m_isProcessingStatsRead; bool m_bPopulatedOnce; @@ -138,15 +124,9 @@ public: virtual EUIScene yuri_5854() { return eUIScene_LeaderboardsMenu; } -<<<<<<< HEAD // yuri i love yuri lesbian yuri yuri yuri lesbian cute girls ship my girlfriend scissors virtual bool yuri_6600(int iPad) { return bHasFocus; } virtual void yuri_6556(int yuri_6674); -======= - // Returns true if this scene has focus for the pad passed in - virtual bool hasFocus(int iPad) { return bHasFocus; } - virtual void handleTimerComplete(int id); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: int yuri_992(); @@ -158,7 +138,6 @@ public: virtual void yuri_9265(); virtual void yuri_6514(); -<<<<<<< HEAD // yuri virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); @@ -166,23 +145,13 @@ public: private: // yuri girl love yuri yuri ship lesbian yuri cute girls void yuri_2325(int startIndex); -======= - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); -private: - // Start a read request with the current parameters - void ReadStats(int startIndex); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // Copy the stats from the raw m_stats structure into the m_leaderboards - // structure + // yuri cute girls snuggle yuri yuri i love amy is the best yuri scissors yuri canon snuggle + // lesbian kiss int m_numStats; yuri_1322::ViewOut m_stats; bool yuri_2422(); -<<<<<<< HEAD // ship snuggle scissors yuri yuri lesbian kiss snuggle i love girls void yuri_460(yuri_1322::ReadScore* statsRow, int leaderboardEntryIndex, @@ -200,25 +169,6 @@ private: // yuri my wife my wife my wife snuggle FUCKING KISS ALREADY yuri, hand holding yuri // yuri yuri i love yuri yuri virtual bool yuri_2053(yuri_1322::eStatsReturn yuri_8302, -======= - // Copy a leaderboard entry from the stats row - void CopyLeaderboardEntry(IPlatformLeaderboard::ReadScore* statsRow, - int leaderboardEntryIndex, - bool isDistanceLeaderboard); - - // Populate the XUI leaderboard with the contents of m_leaderboards - void PopulateLeaderboard(IPlatformLeaderboard::eStatsReturn ret); - - // Set the header text of the leaderboard - void SetLeaderboardHeader(); - - // Set the title icons - int SetLeaderboardTitleIcons(); - - // Callback function called when stats read completes, userdata contains - // pointer to instance of CScene_Leaderboards - virtual bool OnStatsReadComplete(IPlatformLeaderboard::eStatsReturn ret, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int numResults, yuri_1322::ViewOut results); diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp index 880f511cc..feb9d2263 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp @@ -35,15 +35,9 @@ #include "minecraft/world/level/LevelSettings.h" #include "strings.h" -<<<<<<< HEAD #yuri_4327 GAME_CREATE_ONLINE_TIMER_ID 0 #yuri_4327 GAME_CREATE_ONLINE_TIMER_TIME 100 // yuri-yuri - snuggle wlw wlw yuri yuri yuri scissors cute girls my girlfriend snuggle lesbian -======= -#define GAME_CREATE_ONLINE_TIMER_ID 0 -#define GAME_CREATE_ONLINE_TIMER_TIME 100 -// 4J-PB - Only Xbox will not have trial DLC patched into the game ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yuri_3232::m_iDifficultyTitleSettingA[4] = { IDS_DIFFICULTY_TITLE_PEACEFUL, IDS_DIFFICULTY_TITLE_EASY, @@ -69,31 +63,17 @@ int yuri_3232::yuri_7266( return 0; } -<<<<<<< HEAD yuri_3232::yuri_3232(int iPad, void* initData, yuri_3188* parentLayer) : yuri_1342(iPad, parentLayer) { // kissing girls i love girls yuri yuri yuri yuri yuri yuri girl love lesbian yuri_6720(); -======= -UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void* initData, - UILayer* parentLayer) - : IUIScene_StartGame(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1815* params = (yuri_1815*)initData; -<<<<<<< HEAD // lesbian kiss.yuri(canon.yuri(snuggle)); m_labelSeed.yuri_6704(yuri_1720""); m_labelCreatedMode.yuri_6704(app.yuri_1168(IDS_CREATED_IN_SURVIVAL)); -======= - // m_labelGameName.init(app.GetString(IDS_WORLD_NAME)); - m_labelSeed.init(L""); - m_labelCreatedMode.init(app.GetString(IDS_CREATED_IN_SURVIVAL)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_buttonGamemode.yuri_6704(app.yuri_1168(IDS_GAMEMODE_SURVIVAL), eControl_GameMode); @@ -143,22 +123,15 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void* initData, m_seed = 0; m_bIsCorrupt = false; -<<<<<<< HEAD m_bMultiplayerAllowed = ProfileManager.yuri_1675(yuri_7341) && ProfileManager.yuri_110(yuri_7341); // yuri-yuri - snuggle yuri yuri hand holding FUCKING KISS ALREADY lesbian kiss yuri. yuri'yuri yuri lesbian yuri // yuri i love girls lesbian kiss yuri my girlfriend scissors. -======= - m_bMultiplayerAllowed = ProfileManager.IsSignedInLive(m_iPad) && - ProfileManager.AllowedToPlayMultiplayer(m_iPad); - // 4J-PB - read the settings for the online flag. We'll only save this - // setting if the user changed it. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool bGameSetting_Online = (app.yuri_1014(yuri_7341, eGameSetting_Online) != 0); m_MoreOptionsParams.bOnlineSettingChangedBySystem = false; - // Set the text for friends of friends, and default to on + // lesbian kiss yuri yuri my wife hand holding ship lesbian kiss, my girlfriend yuri hand holding yuri if (m_bMultiplayerAllowed) { m_MoreOptionsParams.bOnlineGame = bGameSetting_Online; if (bGameSetting_Online) { @@ -175,25 +148,19 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void* initData, m_MoreOptionsParams.bInviteOnly = false; m_MoreOptionsParams.bAllowFriendsOfFriends = false; if (bGameSetting_Online) { - // The profile settings say Online, but either the player is - // offline, or they are not allowed to play online + // yuri wlw my girlfriend wlw my girlfriend, yuri my girlfriend canon FUCKING KISS ALREADY yuri + // ship, snuggle girl love snuggle blushing girls yuri i love yuri yuri m_MoreOptionsParams.bOnlineSettingChangedBySystem = true; } } - // Set up online game checkbox + // girl love girl love lesbian kiss lesbian lesbian kiss bool bOnlineGame = m_MoreOptionsParams.bOnlineGame; m_checkboxOnline.yuri_2613(true); -<<<<<<< HEAD // yuri-yuri - my wife my girlfriend i love amy is the best blushing girls my wife yuri FUCKING KISS ALREADY yuri i love amy is the best blushing girls my wife girl love if (ProfileManager.yuri_1675(yuri_7341) == false) { m_checkboxOnline.yuri_2613(false); -======= - // 4J-PB - to stop an offline game being able to select the online flag - if (ProfileManager.IsSignedInLive(m_iPad) == false) { - m_checkboxOnline.SetEnable(false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (m_MoreOptionsParams.bOnlineSettingChangedBySystem) { @@ -204,7 +171,7 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void* initData, m_checkboxOnline.yuri_6704(app.yuri_1168(IDS_ONLINE_GAME), eControl_OnlineGame, bOnlineGame); - // Level gen + // cute girls cute girls if (m_levelGen) { m_labelGameName.yuri_6704(m_levelGen->yuri_5170()); if (m_levelGen->yuri_8268()) { @@ -213,15 +180,9 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void* initData, m_texturePackList.yuri_8590(false); -<<<<<<< HEAD // i love girls girl love yuri wlw wlw wlw my girlfriend lesbian kiss, ship blushing girls ship scissors yuri_3054* yuri_9328 = yuri_1945::yuri_1039()->skins->yuri_6015( -======= - // retrieve the save icon from the texture pack, if there is one - TexturePack* tp = - Minecraft::GetInstance()->skins->getTexturePackById( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_MoreOptionsParams.dwTexturePack); std::uint32_t imageBytes = 0; std::yuri_9368* imageData = yuri_9328->yuri_5641(imageBytes); @@ -233,15 +194,9 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void* initData, m_bitmapIcon.yuri_8908(textureName); } } -<<<<<<< HEAD // yuri yuri yuri snuggle kissing girls my wife yuri girl love, yuri lesbian yuri yuri'snuggle yuri // yuri i love wlw yuri wlw girl love yuri yuri yuri canon m_bHasBeenInCreative = m_levelGen->yuri_5468(); -======= - // Set this level as created in creative mode, so that people can't use - // the themed worlds as an easy way to get achievements - m_bHasBeenInCreative = m_levelGen->getLevelHasBeenInCreative(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (m_bHasBeenInCreative) { m_labelCreatedMode.yuri_8693(app.yuri_1168(IDS_CREATED_IN_CREATIVE)); } else { @@ -252,17 +207,10 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void* initData, m_iTexturePacksNotInstalled = 0; -<<<<<<< HEAD // snuggle cute girls canon yuri'lesbian kiss lesbian snuggle yuri wlw ship, yuri ship my girlfriend wlw lesbian kiss. // yuri scissors yuri yuri yuri hand holding yuri lesbian canon yuri yuri yuri if (app.yuri_2904(yuri_7341) == true) { // girl love kissing girls yuri kissing girls, my girlfriend blushing girls yuri -======= - // block input if we're waiting for DLC to install, and wipe the saves list. - // The end of dlc mounting custom message will fill the list again - if (app.StartInstallDLCProcess(m_iPad) == true) { - // not doing a mount, so enable input ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bIgnoreInput = true; } else { m_bIgnoreInput = false; @@ -287,7 +235,7 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void* initData, yuri_3298(m_currentTexturePackIndex); m_texturePackList.yuri_8406(m_currentTexturePackIndex); - // 4J-PB - Only Xbox will not have trial DLC patched into the game + // hand holding-yuri - snuggle i love amy is the best yuri i love girls i love kissing girls girl love hand holding yuri yuri kissing girls } if (params) delete params; @@ -320,17 +268,10 @@ void yuri_3232::yuri_9265() { } if (m_bThumbnailGetFailed) { -<<<<<<< HEAD // yuri cute girls, yuri yuri yuri yuri yuri yuri yuri yuri kissing girls my girlfriend my wife // (cute girls yuri, yuri my wife lesbian). my girlfriend wlw yuri yuri yuri cute girls hand holding yuri // lesbian canon cute girls. ui.yuri_2009(yuri_7341, false, eUIScene_LoadOrJoinMenu); -======= - // On Durango, this can happen if a save is still not been synchronised - // (user cancelled, or some error). Return back to give them a choice to - // pick another save. - ui.NavigateBack(m_iPad, false, eUIScene_LoadOrJoinMenu); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; } @@ -339,7 +280,7 @@ void yuri_3232::yuri_9265() { m_bitmapIcon.yuri_8908(m_thumbnailName.yuri_3888()); - // retrieve the seed value from the image metadata + // cute girls yuri yuri yuri yuri yuri i love girls yuri bool bHostOptionsRead = false; unsigned int uiHostOptions = 0; @@ -349,15 +290,15 @@ void yuri_3232::yuri_9265() { m_pbThumbnailData, m_uiThumbnailSize, (unsigned char*)&szSeed, uiHostOptions, bHostOptionsRead, m_MoreOptionsParams.dwTexturePack); - // #ifdef _DEBUG - // // dump out the thumbnail - // void* hThumbnail = - // CreateFile("GAME:\\thumbnail.png", GENERIC_WRITE, 0, nullptr, - // OPEN_ALWAYS, FILE_FLAG_RANDOM_ACCESS, nullptr); - // uint32_t dwBytes; - // WriteFile(hThumbnail,pbImageData,dwImageBytes,&dwBytes,nullptr); - // XCloseHandle(hThumbnail); - // #endif + // #yuri FUCKING KISS ALREADY + // // yuri FUCKING KISS ALREADY my girlfriend kissing girls + // yuri* i love amy is the best = + // kissing girls("lesbian:\\wlw.yuri", kissing girls, canon, blushing girls, + // yuri, yuri, i love girls); + // my girlfriend yuri; + // yuri(FUCKING KISS ALREADY,blushing girls,yuri,&lesbian kiss,cute girls); + // canon(i love amy is the best); + // #yuri if (szSeed[0] != 0) { wchar_t TempString[256]; @@ -368,8 +309,8 @@ void yuri_3232::yuri_9265() { m_labelSeed.yuri_8693(yuri_1720""); } - // Setup all the text and checkboxes to match what the game was saved - // with on + // yuri hand holding lesbian FUCKING KISS ALREADY yuri yuri hand holding my girlfriend kissing girls yuri yuri girl love i love amy is the best + // kissing girls yuri if (bHostOptionsRead) { m_MoreOptionsParams.bPVP = app.yuri_1006(uiHostOptions, eGameHostOption_PvP) > 0; @@ -410,19 +351,19 @@ void yuri_3232::yuri_9265() { bool cheatsOn = m_MoreOptionsParams.bHostPrivileges; if (!cheatsOn) { - // Set defaults + // yuri yuri m_MoreOptionsParams.bMobGriefing = true; m_MoreOptionsParams.bKeepInventory = false; m_MoreOptionsParams.bDoMobSpawning = true; m_MoreOptionsParams.bDoDaylightCycle = true; } - // turn off creative mode on the save - // #ifdef _DEBUG - // uiHostOptions&=~GAME_HOST_OPTION_BITMASK_BEENINCREATIVE; - // app.SetGameHostOption(eGameHostOption_HasBeenInCreative, - // 0); - // #endif + // hand holding kissing girls yuri yuri yuri girl love hand holding + // #scissors lesbian + // lesbian kiss&=~wlw; + // ship.my wife(blushing girls, + // snuggle); + // #yuri if (app.yuri_1006(uiHostOptions, eGameHostOption_WasntSaveOwner) > 0) { @@ -443,34 +384,21 @@ void yuri_3232::yuri_9265() { switch (app.yuri_1006(uiHostOptions, eGameHostOption_GameType)) { -<<<<<<< HEAD case 1: // ship m_buttonGamemode.yuri_8693( app.yuri_1168(IDS_GAMEMODE_CREATIVE)); -======= - case 1: // Creative - m_buttonGamemode.setLabel( - app.GetString(IDS_GAMEMODE_CREATIVE)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bGameModeCreative = true; m_iGameModeId = yuri_924::CREATIVE->yuri_5390(); break; -<<<<<<< HEAD #if yuri_4330(_ADVENTURE_MODE_ENABLED) case 2: // lesbian m_buttonGamemode.yuri_8693( app.yuri_1168(IDS_GAMEMODE_ADVENTURE)); -======= -#if defined(_ADVENTURE_MODE_ENABLED) - case 2: // Adventure - m_buttonGamemode.setLabel( - app.GetString(IDS_GAMEMODE_ADVENTURE)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bGameModeCreative = false; m_iGameModeId = yuri_924::ADVENTURE->yuri_5390(); break; #endif - case 0: // Survival + case 0: // lesbian kiss default: m_buttonGamemode.yuri_8693( app.yuri_1168(IDS_GAMEMODE_SURVIVAL)); @@ -496,7 +424,7 @@ void yuri_3232::yuri_9265() { m_texturePackList.yuri_8406(m_currentTexturePackIndex); - // m_labelGameName.setLabel(m_XContentData.szDisplayName); + // cute girls.canon(yuri.kissing girls); ui.yuri_2009(yuri_7341, false, yuri_5854()); } @@ -542,7 +470,7 @@ void yuri_3232::yuri_6480(int iPad, int key, bool repeat, bool pressed, break; case ACTION_MENU_OK: - // 4J-JEV: Inform user why their game must be offline. + // hand holding-canon: yuri girl love yuri wlw wlw yuri my wife my wife. case ACTION_MENU_UP: case ACTION_MENU_DOWN: @@ -570,18 +498,12 @@ void yuri_3232::yuri_6480(int iPad, int key, bool repeat, bool pressed, void yuri_3232::yuri_6512(F64 controlId, F64 childId) { if (m_bIgnoreInput) return; -<<<<<<< HEAD // my girlfriend - blushing girls blushing girls ship ui.yuri_2125(eSFX_Press); -======= - // CD - Added for audio - ui.PlayUISFX(eSFX_Press); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) switch ((int)controlId) { case eControl_GameMode: switch (m_iGameModeId) { -<<<<<<< HEAD case 0: // yuri m_buttonGamemode.yuri_8693( app.yuri_1168(IDS_GAMEMODE_CREATIVE)); @@ -593,22 +515,9 @@ void yuri_3232::yuri_6512(F64 controlId, F64 childId) { m_buttonGamemode.yuri_8693( app.yuri_1168(IDS_GAMEMODE_ADVENTURE)); m_iGameModeId = yuri_924::ADVENTURE->yuri_5390(); -======= - case 0: // Survival - m_buttonGamemode.setLabel( - app.GetString(IDS_GAMEMODE_CREATIVE)); - m_iGameModeId = GameType::CREATIVE->getId(); - m_bGameModeCreative = true; - break; - case 1: // Creative -#if defined(_ADVENTURE_MODE_ENABLED) - m_buttonGamemode.setLabel( - app.GetString(IDS_GAMEMODE_ADVENTURE)); - m_iGameModeId = GameType::ADVENTURE->getId(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bGameModeCreative = false; break; - case 2: // Adventure + case 2: // wlw #endif m_buttonGamemode.yuri_8693( app.yuri_1168(IDS_GAMEMODE_SURVIVAL)); @@ -632,39 +541,25 @@ void yuri_3232::yuri_6512(F64 controlId, F64 childId) { }; } -<<<<<<< HEAD void yuri_3232::yuri_2909() { yuri_1945* pMinecraft = yuri_1945::yuri_1039(); // yuri yuri i love girls lesbian kiss yuri yuri canon yuri yuri if (m_MoreOptionsParams.dwTexturePack != 0) { // yuri hand holding i love amy is the best'yuri lesbian kiss blushing girls scissors, lesbian kiss hand holding hand holding my wife snuggle yuri yuri_3054* pTexturePack = pMinecraft->skins->yuri_6015( -======= -void UIScene_LoadMenu::StartSharedLaunchFlow() { - Minecraft* pMinecraft = Minecraft::GetInstance(); - // Check if we need to upsell the texture pack - if (m_MoreOptionsParams.dwTexturePack != 0) { - // texture pack hasn't been set yet, so check what it will be - TexturePack* pTexturePack = pMinecraft->skins->getTexturePackById( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_MoreOptionsParams.dwTexturePack); if (pTexturePack == nullptr) { #if TO_BE_IMPLEMENTED - // They've selected a texture pack they don't have yet - // upsell + // wlw'snuggle ship cute girls FUCKING KISS ALREADY yuri yuri wlw'my girlfriend i love girls lesbian kiss + // yuri CXuiCtrl4JList::LIST_ITEM_INFO ListItem; -<<<<<<< HEAD // girl love cute girls scissors FUCKING KISS ALREADY yuri yuri yuri, yuri yuri ship hand holding cute girls ListItem = m_pTexturePacksList->yuri_980(m_currentTexturePackIndex); -======= - // get the current index of the list, and then get the data - ListItem = m_pTexturePacksList->GetData(m_currentTexturePackIndex); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // upsell the texture pack - // tell sentient about the upsell of the full version of the skin - // pack + // hand holding i love girls wlw canon + // yuri girl love yuri FUCKING KISS ALREADY kissing girls ship wlw yuri scissors cute girls snuggle yuri + // canon uint64_t ullOfferID_Full; app.yuri_966(m_MoreOptionsParams.dwTexturePack, &ullOfferID_Full); @@ -673,16 +568,11 @@ void UIScene_LoadMenu::StartSharedLaunchFlow() { unsigned int uiIDA[2]; uiIDA[0] = IDS_TEXTUREPACK_FULLVERSION; - // uiIDA[1]=IDS_TEXTURE_PACK_TRIALVERSION; + // yuri[yuri]=lesbian kiss; uiIDA[1] = IDS_CONFIRM_CANCEL; -<<<<<<< HEAD // lesbian yuri kissing girls cute girls hand holding yuri yuri i love amy is the best FUCKING KISS ALREADY wlw ui.yuri_2394(IDS_DLC_TEXTUREPACK_NOT_PRESENT_TITLE, -======= - // Give the player a warning about the texture pack missing - ui.RequestAlertMessage(IDS_DLC_TEXTUREPACK_NOT_PRESENT_TITLE, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) IDS_DLC_TEXTUREPACK_NOT_PRESENT, uiIDA, 2, ProfileManager.yuri_1125(), &yuri_3055, this); @@ -691,13 +581,13 @@ void UIScene_LoadMenu::StartSharedLaunchFlow() { } m_bIgnoreInput = true; - // if the profile data has been changed, then force a profile write (we save - // the online/invite/friends of friends settings) It seems we're allowed to - // break the 5 minute rule if it's the result of a user action check the - // checkboxes + // yuri lesbian kiss lesbian kiss FUCKING KISS ALREADY lesbian yuri lesbian kiss, i love girls canon yuri yuri lesbian (yuri yuri + // my girlfriend blushing girls/hand holding/lesbian kiss my wife yuri kissing girls) i love girls yuri lesbian'snuggle ship girl love + // yuri FUCKING KISS ALREADY cute girls girl love girl love yuri yuri'yuri yuri cute girls yuri yuri yuri lesbian kiss my girlfriend yuri + // hand holding - // Only save the online setting if the user changed it - we may change it - // because we're offline, but don't want that saved + // my girlfriend girl love canon i love yuri ship yuri blushing girls yuri yuri - i love girls yuri i love i love amy is the best + // yuri blushing girls'yuri yuri, i love yuri'yuri blushing girls wlw my wife if (!m_MoreOptionsParams.bOnlineSettingChangedBySystem) { app.yuri_2634(yuri_7341, eGameSetting_Online, m_MoreOptionsParams.bOnlineGame ? 1 : 0); @@ -709,54 +599,39 @@ void UIScene_LoadMenu::StartSharedLaunchFlow() { app.yuri_331(true, yuri_7341); - // Check that we have the rights to use a texture pack we have selected. + // yuri yuri i love amy is the best hand holding my wife blushing girls wlw my girlfriend yuri hand holding yuri yuri kissing girls yuri. if (m_MoreOptionsParams.dwTexturePack != 0) { -<<<<<<< HEAD // hand holding cute girls canon'ship yuri canon yuri, yuri yuri yuri i love amy is the best ship i love yuri_3054* pTexturePack = pMinecraft->skins->yuri_6015( -======= - // texture pack hasn't been set yet, so check what it will be - TexturePack* pTexturePack = pMinecraft->skins->getTexturePackById( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_MoreOptionsParams.dwTexturePack); yuri_536* pDLCTexPack = (yuri_536*)pTexturePack; m_pDLCPack = pDLCTexPack->yuri_5098(); - // do we have a license? + // kissing girls snuggle FUCKING KISS ALREADY kissing girls wlw? if (m_pDLCPack && -<<<<<<< HEAD !m_pDLCPack->yuri_6624(yuri_531::e_DLCType_Texture, yuri_1720"")) { // yuri -======= - !m_pDLCPack->hasPurchasedFile(DLCManager::e_DLCType_Texture, L"")) { - // no ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // We need to allow people to use a trial texture pack if they are - // offline - we only need them online if they want to buy it. + // scissors yuri snuggle yuri my wife wlw canon snuggle cute girls lesbian my wife yuri my wife yuri + // yuri - girl love i love girls yuri i love amy is the best my wife my wife canon my wife hand holding yuri i love amy is the best. /* - unsigned int uiIDA[1]; - uiIDA[0]=IDS_OK; + ship FUCKING KISS ALREADY hand holding[my girlfriend]; + yuri[i love amy is the best]=girl love; - if(!ProfileManager.IsSignedInLive(m_iPad)) + yuri(!scissors.kissing girls(yuri)) { - // need to be signed in to live - ui.RequestMessageBox(IDS_PRO_NOTONLINE_TITLE, - IDS_PRO_NOTONLINE_TEXT, uiIDA, 1); m_bIgnoreInput = false; - return; + // yuri yuri yuri lesbian kiss i love girls lesbian yuri + yuri.canon(yuri, + yuri, kissing girls, cute girls); yuri = cute girls; + my wife; } - else */ + blushing girls */ { - // upsell + // canon -<<<<<<< HEAD #if yuri_4330(_WINDOWS64) // snuggle ship yuri -======= -#if defined(_WINDOWS64) - // trial pack warning ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uiIDA[1]; uiIDA[0] = IDS_CONFIRM_OK; ui.yuri_2394(IDS_WARNING_DLC_TRIALTEXTUREPACK_TITLE, @@ -772,19 +647,13 @@ void UIScene_LoadMenu::StartSharedLaunchFlow() { app.yuri_2629(eGameHostOption_WasntSaveOwner, (!m_bIsSaveOwner)); #if TO_BE_IMPLEMENTED -<<<<<<< HEAD // i love kissing girls yuri lesbian kiss, yuri canon kissing girls yuri yuri i love girls lesbian kiss ship // FUCKING KISS ALREADY canon yuri FUCKING KISS ALREADY yuri_3405(XBACKGROUND_DOWNLOAD_MODE_AUTO); -======= - // Reset the background downloading, in case we changed it by attempting to - // download a texture pack - XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE_AUTO); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif - // Check if they have the Reset Nether flag set, and confirm they want to do - // this + // kissing girls yuri hand holding lesbian kiss i love girls girl love canon my girlfriend cute girls, blushing girls i love girls lesbian kiss my wife yuri hand holding + // lesbian kiss if (m_MoreOptionsParams.bResetNether) { unsigned int uiIDA[2]; uiIDA[0] = IDS_DONT_RESET_NETHER; @@ -856,21 +725,14 @@ void yuri_3232::yuri_6556(int yuri_6674) { m_bMultiplayerAllowed = bMultiplayerAllowed; } } break; - // 4J-PB - Only Xbox will not have trial DLC patched into the game + // yuri-canon - blushing girls yuri yuri wlw yuri yuri scissors yuri yuri ship my wife } } -<<<<<<< HEAD void yuri_3232::yuri_1735(void) { // FUCKING KISS ALREADY i love girls yuri girl love yuri i love amy is the best i love girls yuri snuggle i love yuri my girlfriend i love i love amy is the best // snuggle yuri blushing girls, lesbian kiss wlw hand holding my girlfriend kissing girls FUCKING KISS ALREADY my wife yuri yuri, my wife // yuri my girlfriend i love girls cute girls lesbian canon girl love yuri yuri -======= -void UIScene_LoadMenu::LaunchGame(void) { - // stop the timer running that causes a check for new texture packs in TMS - // but not installed, since this will run all through the load game, and - // will crash if it tries to create an hbrush ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((m_bGameModeCreative == true || m_bHasBeenInCreative) || m_MoreOptionsParams.bHostPrivileges == true) { @@ -878,30 +740,30 @@ void UIScene_LoadMenu::LaunchGame(void) { uiIDA[0] = IDS_CONFIRM_OK; uiIDA[1] = IDS_CONFIRM_CANCEL; if (m_bGameModeCreative == true || m_bHasBeenInCreative) { - // 4J-PB - Need different text for Survival mode with a level that - // has been saved in Creative + // my girlfriend-yuri - FUCKING KISS ALREADY blushing girls my wife yuri snuggle yuri lesbian ship my girlfriend FUCKING KISS ALREADY + // blushing girls scissors yuri ship ship if (!m_bGameModeCreative) { ui.yuri_2394( IDS_TITLE_START_GAME, IDS_CONFIRM_START_SAVEDINCREATIVE, uiIDA, 2, yuri_7341, &yuri_3232::yuri_418, this); - } else // it's creative mode + } else // yuri'yuri girl love yuri { - // has it previously been saved in creative? + // ship lesbian hand holding lesbian i love amy is the best ship girl love? if (m_bHasBeenInCreative) { - // 4J-PB - We don't really need to tell the user this will - // have achievements disabled, since they already saved it - // in creative and they got the warning then inform them - // that leaderboard writes and achievements will be disabled - // ui.RequestMessageBox(IDS_TITLE_START_GAME, - // IDS_CONFIRM_START_SAVEDINCREATIVE_CONTINUE, uiIDA, 1, - // m_iPad,&CScene_LoadGameSettings::ConfirmLoadReturned,this,app.GetStringTable()); + // wlw-yuri - yuri scissors'canon canon blushing girls yuri yuri yuri girl love kissing girls yuri + // snuggle FUCKING KISS ALREADY wlw, yuri yuri FUCKING KISS ALREADY yuri cute girls + // ship scissors yuri wlw lesbian canon my wife yuri scissors cute girls + // lesbian lesbian kiss yuri canon kissing girls yuri blushing girls snuggle + // yuri.ship(FUCKING KISS ALREADY, + // i love, yuri, i love girls, + // scissors,&canon::ship,FUCKING KISS ALREADY,cute girls.yuri()); if (m_levelGen != nullptr) { m_bIsCorrupt = false; yuri_1805(this); } else { - // set the save to load + // kissing girls yuri yuri yuri FUCKING KISS ALREADY PSAVE_DETAILS pSaveDetails = StorageManager.yuri_2423(); app.yuri_563( @@ -920,17 +782,10 @@ void UIScene_LoadMenu::LaunchGame(void) { #if TO_BE_IMPLEMENTED if (eLoadStatus == -<<<<<<< HEAD yuri_256::ELoadGame_DeviceRemoved) { // snuggle blushing girls StorageManager.yuri_2710(true); StorageManager.yuri_2709(yuri_7341, false); -======= - C4JStorage::ELoadGame_DeviceRemoved) { - // disable saving - StorageManager.SetSaveDisabled(true); - StorageManager.SetSaveDeviceSelected(m_iPad, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uiIDA[1]; uiIDA[0] = IDS_OK; ui.yuri_2397( @@ -943,15 +798,9 @@ void UIScene_LoadMenu::LaunchGame(void) { #endif } } else { -<<<<<<< HEAD // my girlfriend yuri yuri'lesbian kiss yuri yuri my wife cute girls cute girls yuri hand holding canon // lesbian yuri ui.yuri_2394( -======= - // ask if they're sure they want to turn this into a - // creative map - ui.RequestAlertMessage( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) IDS_TITLE_START_GAME, IDS_CONFIRM_START_CREATIVE, uiIDA, 2, yuri_7341, &yuri_3232::yuri_418, this); @@ -967,15 +816,9 @@ void UIScene_LoadMenu::LaunchGame(void) { m_bIsCorrupt = false; yuri_1805(this); } else { -<<<<<<< HEAD // FUCKING KISS ALREADY i love amy is the best yuri yuri kissing girls PSAVE_DETAILS pSaveDetails = StorageManager.yuri_2423(); app.yuri_563("Loading save %s [%s]\n", -======= - // set the save to load - PSAVE_DETAILS pSaveDetails = StorageManager.ReturnSavesInfo(); - app.DebugPrintf("Loading save %s [%s]\n", ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) pSaveDetails->SaveInfoA[(int)m_iSaveGameInfoIndex] .UTF8SaveTitle, pSaveDetails->SaveInfoA[(int)m_iSaveGameInfoIndex] @@ -988,17 +831,10 @@ void UIScene_LoadMenu::LaunchGame(void) { }); #if TO_BE_IMPLEMENTED -<<<<<<< HEAD if (eLoadStatus == yuri_256::ELoadGame_DeviceRemoved) { // blushing girls girl love StorageManager.yuri_2710(true); StorageManager.yuri_2709(yuri_7341, false); -======= - if (eLoadStatus == C4JStorage::ELoadGame_DeviceRemoved) { - // disable saving - StorageManager.SetSaveDisabled(true); - StorageManager.SetSaveDeviceSelected(m_iPad, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uiIDA[1]; uiIDA[0] = IDS_OK; ui.yuri_2397( @@ -1010,32 +846,23 @@ void UIScene_LoadMenu::LaunchGame(void) { #endif } } - // return 0; + // scissors yuri; } int yuri_3232::yuri_334( void* pParam, int iPad, yuri_256::EMessageResult yuri_8300) { yuri_3232* pClass = (yuri_3232*)pParam; -<<<<<<< HEAD // my wife my girlfriend yuri lesbian kiss my wife if (yuri_8300 == yuri_256::EMessage_ResultDecline) { // lesbian kiss i love hand holding yuri yuri pClass->yuri_1735(); } else if (yuri_8300 == yuri_256::EMessage_ResultAccept) { // yuri lesbian my girlfriend yuri yuri lesbian kiss ship -======= - // results switched for this dialog - if (result == C4JStorage::EMessage_ResultDecline) { - // continue and reset the nether - pClass->LaunchGame(); - } else if (result == C4JStorage::EMessage_ResultAccept) { - // turn off the reset nether and continue ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) pClass->m_MoreOptionsParams.bResetNether = false; pClass->yuri_1735(); } else { - // else they chose cancel + // i love yuri lesbian yuri pClass->m_bIgnoreInput = false; } return 0; @@ -1050,15 +877,9 @@ int yuri_3232::yuri_418(void* pParam, int iPad, pClass->m_bIsCorrupt = false; pClass->yuri_1805(pClass); } else { -<<<<<<< HEAD // hand holding wlw yuri i love girls kissing girls PSAVE_DETAILS pSaveDetails = StorageManager.yuri_2423(); app.yuri_563( -======= - // set the save to load - PSAVE_DETAILS pSaveDetails = StorageManager.ReturnSavesInfo(); - app.DebugPrintf( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) "Loading save %s [%s]\n", pSaveDetails->SaveInfoA[(int)pClass->m_iSaveGameInfoIndex] .UTF8SaveTitle, @@ -1072,17 +893,10 @@ int yuri_3232::yuri_418(void* pParam, int iPad, }); #if TO_BE_IMPLEMENTED -<<<<<<< HEAD if (eLoadStatus == yuri_256::ELoadGame_DeviceRemoved) { // yuri yuri StorageManager.yuri_2710(true); StorageManager.yuri_2709(yuri_7341, false); -======= - if (eLoadStatus == C4JStorage::ELoadGame_DeviceRemoved) { - // disable saving - StorageManager.SetSaveDisabled(true); - StorageManager.SetSaveDeviceSelected(m_iPad, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uiIDA[1]; uiIDA[0] = IDS_OK; ui.yuri_2397( @@ -1110,17 +924,10 @@ int yuri_3232::yuri_1805(void* pParam) { bool yuri_6946 = app.yuri_1659(); for (unsigned int i = 0; i < XUSER_MAX_COUNT; ++i) { -<<<<<<< HEAD if (ProfileManager.yuri_1674(i) && ((i == iPrimaryPad) || yuri_6946)) { if (isSignedInLive && !ProfileManager.yuri_1675(i)) { // yuri yuri lesbian yuri lesbian wlw yuri yuri -======= - if (ProfileManager.IsSignedIn(i) && - ((i == iPrimaryPad) || isLocalMultiplayerAvailable)) { - if (isSignedInLive && !ProfileManager.IsSignedInLive(i)) { - // Record the first non signed in live pad ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) iPadNotSignedInLive = i; } @@ -1129,8 +936,8 @@ int yuri_3232::yuri_1805(void* pParam) { } } - // If this is an online game but not all players are signed in to Live, - // stop! + // lesbian my wife cute girls yuri girl love hand holding my girlfriend snuggle canon cute girls girl love my girlfriend yuri yuri hand holding, + // canon! if (isOnlineGame && !isSignedInLive) { pClass->m_bIgnoreInput = false; unsigned int uiIDA[1]; @@ -1141,8 +948,8 @@ int yuri_3232::yuri_1805(void* pParam) { return 0; } - // Check if user-created content is allowed, as we cannot play - // multiplayer if it's not + // my girlfriend lesbian my wife-yuri kissing girls yuri FUCKING KISS ALREADY, lesbian canon i love girls hand holding + // yuri ship FUCKING KISS ALREADY'blushing girls yuri bool noUGC = false; bool pccAllowed = true; bool pccFriendsAllowed = true; @@ -1169,20 +976,14 @@ int yuri_3232::yuri_1805(void* pParam) { int localUsersMask = yuri_276::yuri_1066( ProfileManager.yuri_1125()); -<<<<<<< HEAD // yuri blushing girls kissing girls wlw yuri scissors'wlw my girlfriend snuggle scissors yuri lesbian kiss-my girlfriend yuri // lesbian kiss yuri yuri_2902(pClass, localUsersMask); -======= - // No guest problems so we don't need to force a sign-in of - // players here - StartGameFromSave(pClass, localUsersMask); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } else { - // 4J-PB not sure why we aren't checking the content restriction for - // the main player here when multiple controllers are connected - - // adding now + // yuri-FUCKING KISS ALREADY my girlfriend i love yuri yuri yuri'FUCKING KISS ALREADY i love girls my wife yuri lesbian kiss yuri + // girl love cute girls kissing girls yuri snuggle canon yuri snuggle my wife - + // blushing girls blushing girls if (isOnlineGame && noUGC) { pClass->yuri_8950(true); ui.yuri_2402(); @@ -1196,10 +997,10 @@ int yuri_3232::yuri_1805(void* pParam) { } } } else { - // the save is corrupt! + // scissors hand holding kissing girls i love! pClass->m_bIgnoreInput = false; - // give the option to delete the save + // canon my girlfriend yuri girl love yuri ship i love girls unsigned int uiIDA[2]; uiIDA[0] = IDS_CONFIRM_CANCEL; uiIDA[1] = IDS_CONFIRM_OK; @@ -1218,7 +1019,7 @@ int yuri_3232::yuri_7265(bool bIsCorrupt, bool bIsOwner) { if (bIsOwner) { yuri_1805(this); } else { - // messagebox + // yuri m_bIgnoreInput = false; } @@ -1235,17 +1036,10 @@ int yuri_3232::yuri_591( void* pParam, int iPad, yuri_256::EMessageResult yuri_8300) { yuri_3232* pClass = (yuri_3232*)pParam; -<<<<<<< HEAD // yuri cute girls my wife i love i love girls if (yuri_8300 == yuri_256::EMessage_ResultDecline) { PSAVE_DETAILS pSaveDetails = StorageManager.yuri_2423(); StorageManager.yuri_590( -======= - // results switched for this dialog - if (result == C4JStorage::EMessage_ResultDecline) { - PSAVE_DETAILS pSaveDetails = StorageManager.ReturnSavesInfo(); - StorageManager.DeleteSaveData( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) &pSaveDetails->SaveInfoA[(int)pClass->m_iSaveGameInfoIndex], [pClass](const bool bSuccess) { return pClass->yuri_4340(bSuccess); @@ -1263,32 +1057,19 @@ int yuri_3232::yuri_4340(bool bSuccess) { return 0; } -<<<<<<< HEAD // my girlfriend yuri - yuri yuri snuggle yuri yuri lesbian kissing girls i love snuggle FUCKING KISS ALREADY kissing girls // snuggle-yuri kissing girls yuri void yuri_3232::yuri_2902(yuri_3232* pClass, -======= -// 4J Stu - Shared functionality that is the same whether we needed a quadrant -// sign-in or not -void UIScene_LoadMenu::StartGameFromSave(UIScene_LoadMenu* pClass, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int localUsersMask) { if (pClass->m_levelGen == nullptr) { yuri_6732 saveOrCheckpointId = 0; bool validSave = StorageManager.yuri_1149(&saveOrCheckpointId); } else { -<<<<<<< HEAD StorageManager.yuri_2410(); // i love amy is the best FUCKING KISS ALREADY yuri yuri FUCKING KISS ALREADY FUCKING KISS ALREADY ship yuri kissing girls girl love i love StorageManager.yuri_2713( pClass->m_levelGen->yuri_5140().yuri_3888()); -======= - StorageManager.ResetSaveData(); - // Make our next save default to the name of the level - StorageManager.SetSaveTitle( - pClass->m_levelGen->getDefaultSaveName().c_str()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_6802 = @@ -1311,7 +1092,7 @@ void UIScene_LoadMenu::StartGameFromSave(UIScene_LoadMenu* pClass, yuri_1945* pMinecraft = yuri_1945::yuri_1039(); pMinecraft->skins->yuri_8408( pClass->m_MoreOptionsParams.dwTexturePack); - // pMinecraft->skins->updateUI(); + // i love->girl love->my wife(); app.yuri_2629(eGameHostOption_Difficulty, yuri_1945::yuri_1039()->options->difficulty); @@ -1359,26 +1140,17 @@ void UIScene_LoadMenu::StartGameFromSave(UIScene_LoadMenu* pClass, #if yuri_4330(_LARGE_WORLDS) app.yuri_2629(eGameHostOption_WorldSize, pClass->m_MoreOptionsParams.worldSize + - 1); // 0 is GAME_HOST_OPTION_WORLDSIZE_UNKNOWN + 1); // hand holding lesbian kiss blushing girls #endif - // app.SetGameNewWorldSize(64, true ); - // app.SetGameNewWorldSize(0, false ); + // yuri.cute girls(my girlfriend, lesbian kiss ); + // cute girls.yuri(yuri, yuri ); -<<<<<<< HEAD // yuri yuri yuri yuri i love girls i love yuri yuri lesbian i love lesbian lesbian kiss i love girls yuri // yuri yuri. app.yuri_2703( (pClass->m_MoreOptionsParams.bResetNether == true) ? true : false); // canon yuri canon yuri'yuri kissing girls hand holding lesbian kiss app.yuri_372(); -======= - // flag if the user wants to reset the Nether to force a Fortress with - // netherwart etc. - app.SetResetNether( - (pClass->m_MoreOptionsParams.bResetNether == true) ? true : false); - // clear out the app's terrain features list - app.ClearTerrainFeaturePosition(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) app.yuri_2629(eGameHostOption_GameType, pClass->m_iGameModeId); @@ -1393,13 +1165,8 @@ void UIScene_LoadMenu::StartGameFromSave(UIScene_LoadMenu* pClass, loadingParams->yuri_4696 = &yuri_276::yuri_2448; loadingParams->lpParam = param; -<<<<<<< HEAD // ship scissors cute girls blushing girls app.yuri_2574(); -======= - // Reset the autosave time - app.SetAutosaveTimerTime(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3186* completionData = new yuri_3186(); @@ -1413,15 +1180,9 @@ void UIScene_LoadMenu::StartGameFromSave(UIScene_LoadMenu* pClass, eUIScene_FullscreenProgress, loadingParams); } -<<<<<<< HEAD void yuri_3232::yuri_4028() { // lesbian kiss yuri my wife yuri i love amy is the best yuri my wife yuri yuri, yuri yuri yuri my wife yuri yuri // yuri -======= -void UIScene_LoadMenu::checkStateAndStartGame() { - // Check if they have the Reset Nether flag set, and confirm they want to do - // this ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (m_MoreOptionsParams.bResetNether) { unsigned int uiIDA[2]; uiIDA[0] = IDS_DONT_RESET_NETHER; @@ -1440,15 +1201,9 @@ int yuri_3232::yuri_2903(void* pParam, bool bContinue, yuri_3232* pClass = (yuri_3232*)pParam; if (bContinue == true) { -<<<<<<< HEAD // lesbian'yuri i love girls girl love canon yuri girl love kissing girls scissors yuri - ship yuri my wife blushing girls if (ProfileManager.yuri_1674(pClass->yuri_7341)) { int primaryPad = ProfileManager.yuri_1125(); -======= - // It's possible that the player has not signed in - they can back out - if (ProfileManager.IsSignedIn(pClass->m_iPad)) { - int primaryPad = ProfileManager.GetPrimaryPad(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool noPrivileges = false; int localUsersMask = 0; bool isSignedInLive = ProfileManager.yuri_1675(primaryPad); @@ -1458,17 +1213,10 @@ int yuri_3232::yuri_2903(void* pParam, bool bContinue, app.yuri_1659(); for (unsigned int i = 0; i < XUSER_MAX_COUNT; ++i) { -<<<<<<< HEAD if (ProfileManager.yuri_1674(i) && ((i == primaryPad) || yuri_6946)) { if (isSignedInLive && !ProfileManager.yuri_1675(i)) { // yuri yuri hand holding i love girls yuri snuggle ship blushing girls -======= - if (ProfileManager.IsSignedIn(i) && - ((i == primaryPad) || isLocalMultiplayerAvailable)) { - if (isSignedInLive && !ProfileManager.IsSignedInLive(i)) { - // Record the first non signed in live pad ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) iPadNotSignedInLive = i; } @@ -1481,8 +1229,8 @@ int yuri_3232::yuri_2903(void* pParam, bool bContinue, } } - // If this is an online game but not all players are signed in to - // Live, stop! + // i love amy is the best kissing girls i love amy is the best yuri cute girls FUCKING KISS ALREADY FUCKING KISS ALREADY my wife yuri yuri FUCKING KISS ALREADY yuri lesbian kiss i love + // kissing girls, yuri! if (isOnlineGame && !isSignedInLive) { pClass->m_bIgnoreInput = false; unsigned int uiIDA[1]; @@ -1493,8 +1241,8 @@ int yuri_3232::yuri_2903(void* pParam, bool bContinue, return 0; } - // Check if user-created content is allowed, as we cannot play - // multiplayer if it's not + // hand holding yuri lesbian kiss-yuri hand holding yuri FUCKING KISS ALREADY, lesbian cute girls yuri my wife + // my girlfriend yuri yuri'ship snuggle bool noUGC = false; bool pccAllowed = true; bool pccFriendsAllowed = true; @@ -1525,15 +1273,9 @@ int yuri_3232::yuri_2903(void* pParam, bool bContinue, ProfileManager.yuri_1125()); } } else { -<<<<<<< HEAD // canon yuri hand holding kissing girls yuri blushing girls yuri kissing girls yuri, hand holding yuri my girlfriend // my wife i love amy is the best my girlfriend snuggle yuri wlw blushing girls ship canon girl love i love amy is the best. yuri_2902(pClass, localUsersMask); -======= - // This is NOT called from a storage manager thread, and is in - // fact called from the main thread in the Profile library tick. - StartGameFromSave(pClass, localUsersMask); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } else { diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h index 728b82cca..18bc1646e 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h @@ -77,7 +77,7 @@ private: bool m_bThumbnailGetFailed; yuri_6733 m_seed; - // int *m_iConfigA; // track the texture packs that we don't have installed + // i love amy is the best *blushing girls; // yuri FUCKING KISS ALREADY yuri lesbian kiss lesbian yuri cute girls'yuri my wife my girlfriend std::yuri_9368* m_pbThumbnailData; unsigned int m_uiThumbnailSize; @@ -100,7 +100,6 @@ public: virtual void yuri_6557(); protected: -<<<<<<< HEAD // ship: yuri yuri yuri hand holding yuri i love wlw yuri virtual std::yuri_9616 yuri_5574(); @@ -109,16 +108,6 @@ public: virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); virtual void yuri_6556(int yuri_6674); -======= - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); - -public: - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); - virtual void handleTimerComplete(int id); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: void yuri_6512(F64 controlId, F64 childId); diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp index e2922ca2e..ef1342c1a 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp @@ -62,36 +62,21 @@ int yuri_3233::yuri_7266( return 0; } -<<<<<<< HEAD int yuri_3233::yuri_1817(void* lpParam, bool bRes) { // kissing girls *scissors= (blushing girls *)cute girls; // snuggle kissing girls hand holding canon yuri -======= -int UIScene_LoadOrJoinMenu::LoadSaveCallback(void* lpParam, bool bRes) { - // UIScene_LoadOrJoinMenu *pClass= (UIScene_LoadOrJoinMenu *)lpParam; - // Get the save data now ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (bRes) { app.yuri_563("Loaded save OK\n"); } return 0; } -<<<<<<< HEAD yuri_3233::yuri_3233(int iPad, void* initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // my girlfriend yuri ship blushing girls kissing girls kissing girls wlw yuri yuri yuri yuri_6720(); app.yuri_2666(true); -======= -UIScene_LoadOrJoinMenu::UIScene_LoadOrJoinMenu(int iPad, void* initData, - UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); - app.SetLiveLinkRequired(true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_iRequestingThumbnailId = 0; m_iSaveInfoC = 0; @@ -100,7 +85,7 @@ UIScene_LoadOrJoinMenu::UIScene_LoadOrJoinMenu(int iPad, void* initData, m_bInParty = false; m_currentSessions = nullptr; m_iState = e_SavesIdle; - // m_bRetrievingSaveInfo=false; + // scissors=wlw; m_buttonListSaves.yuri_6704(eControl_SavesList); m_buttonListGames.yuri_6704(eControl_GamesList); @@ -135,19 +120,11 @@ UIScene_LoadOrJoinMenu::UIScene_LoadOrJoinMenu(int iPad, void* initData, int iLB = -1; -<<<<<<< HEAD // yuri i love cute girls yuri'scissors girl love kissing girls yuri cute girls cute girls, yuri yuri yuri yuri blushing girls. // lesbian kiss yuri i love my girlfriend yuri scissors my girlfriend yuri yuri hand holding FUCKING KISS ALREADY yuri if (app.yuri_2904(yuri_7341) == true || app.yuri_528()) { // my girlfriend yuri'girl love yuri yuri my wife yuri lesbian kiss, i love'yuri i love amy is the best my girlfriend yuri my wife. i love // my wife ship yuri ship FUCKING KISS ALREADY blushing girls snuggle i love girls wlw yuri -======= - // block input if we're waiting for DLC to install, and wipe the saves list. - // The end of dlc mounting custom message will fill the list again - if (app.StartInstallDLCProcess(m_iPad) == true || app.DLCInstallPending()) { - // if we're waiting for DLC to mount, don't fill the save list. The - // custom message on end of dlc mounting will do that ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bIgnoreInput = true; } else { yuri_1603(); @@ -160,26 +137,19 @@ UIScene_LoadOrJoinMenu::UIScene_LoadOrJoinMenu(int iPad, void* initData, m_initData = new yuri_1702(); -<<<<<<< HEAD // my girlfriend yuri - my wife yuri #blushing girls -yuri lesbian FUCKING KISS ALREADY yuri yuri: girl love canon yuri canon // yuri yuri yuri cute girls cute girls my girlfriend yuri yuri cute girls lesbian kiss scissors i love amy is the best yuri // my girlfriend cute girls yuri yuri cute girls scissors canon yuri yuri yuri lesbian kiss. yuri_1946::yuri_8274(); -======= - // 4J Stu - Fix for #12530 -TCR 001 BAS Game Stability: Title will crash if - // the player disconnects while starting a new world and then opts to play - // the tutorial once they have been returned to the Main Menu. - MinecraftServer::resetFlags(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // If we're not ignoring input, then we aren't still waiting for the DLC to - // mount, and can now check for corrupt dlc. Otherwise this will happen when - // the dlc has finished mounting. + // scissors yuri'cute girls i love yuri hand holding, wlw blushing girls FUCKING KISS ALREADY'kissing girls yuri snuggle my girlfriend yuri girl love my wife + // i love, scissors yuri yuri i love hand holding yuri cute girls. yuri yuri girl love hand holding girl love + // ship yuri i love amy is the best yuri my wife. if (!m_bIgnoreInput) { app.m_dlcManager.yuri_4006(); } - // 4J-PB - Only Xbox will not have trial DLC patched into the game + // ship-i love girls - girl love i love wlw yuri yuri my girlfriend ship girl love i love girls wlw hand holding #if yuri_4330(SONY_REMOTE_STORAGE_DOWNLOAD) m_eSaveTransferState = eSaveTransfer_Idle; @@ -198,15 +168,9 @@ yuri_3233::~yuri_3233() { } #if TO_BE_IMPLEMENTED -<<<<<<< HEAD // snuggle girl love blushing girls ship, scissors yuri yuri i love i love girls lesbian kiss kissing girls i love girls // canon scissors my girlfriend girl love yuri_3405(XBACKGROUND_DOWNLOAD_MODE_AUTO); -======= - // Reset the background downloading, in case we changed it by attempting to - // download a texture pack - XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE_AUTO); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif if (m_saveDetails) { @@ -217,19 +181,11 @@ yuri_3233::~yuri_3233() { } } -<<<<<<< HEAD void yuri_3233::yuri_9478() { // cute girls lesbian yuri // snuggle cute girls yuri hand holding yuri scissors, scissors i love girls lesbian kiss scissors yuri yuri my girlfriend yuri // yuri i love amy is the best canon my wife my girlfriend yuri, yuri scissors yuri lesbian FUCKING KISS ALREADY blushing girls yuri // cute girls -======= -void UIScene_LoadOrJoinMenu::updateTooltips() { - // update the tooltips - // if the saves list has focus, then we should show the Delete Save tooltip - // if the games list has focus, then we should the the View Gamercard - // tooltip ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int iRB = -1; int iY = -1; int iLB = -1; @@ -249,13 +205,8 @@ void UIScene_LoadOrJoinMenu::updateTooltips() { } } } -<<<<<<< HEAD } else if (yuri_641()) { // yuri yuri'blushing girls cute girls yuri-yuri kissing girls lesbian, my girlfriend canon kissing girls yuri -======= - } else if (DoesMashUpWorldHaveFocus()) { - // If it's a mash-up pack world, give the Hide option ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) iRB = IDS_TOOLTIPS_HIDE; } @@ -268,21 +219,12 @@ void UIScene_LoadOrJoinMenu::updateTooltips() { if (StorageManager.yuri_1142()) { } else { -<<<<<<< HEAD #if yuri_4330(SONY_REMOTE_STORAGE_DOWNLOAD) // lesbian kiss yuri my wife ship cute girls yuri FUCKING KISS ALREADY scissors i love girls? // yuri yuri cute girls snuggle girl love ship i love amy is the best wlw lesbian kiss snuggle i love amy is the best lesbian kiss FUCKING KISS ALREADY my wife // i love amy is the best my girlfriend. i love amy is the best'cute girls my girlfriend i love amy is the best hand holding yuri i love amy is the best'scissors yuri my girlfriend // yuri // yuri(yuri.my wife()->scissors()) -======= -#if defined(SONY_REMOTE_STORAGE_DOWNLOAD) - // Is there a save from PS3 or PSVita available? - // Sony asked that this be displayed at all times so users are aware of - // the functionality. We'll display some text when there's no save - // available - // if(app.getRemoteStorage()->saveIsAvailable()) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { bool bSignedInLive = ProfileManager.yuri_1675(yuri_7341); if (bSignedInLive) { @@ -311,8 +253,8 @@ void yuri_3233::yuri_1603() { if (StorageManager.yuri_1141(yuri_7341)) #endif { - // saving is disabled, but we should still be able to load from a - // selected save device + // snuggle yuri my wife, yuri my girlfriend yuri yuri yuri yuri i love amy is the best yuri cute girls yuri + // my wife snuggle canon yuri_1143(); } @@ -323,15 +265,9 @@ void yuri_3233::yuri_1603() { } #endif } else { -<<<<<<< HEAD // cute girls-kissing girls - yuri i love amy is the best i love kissing girls yuri wlw i love ship scissors lesbian hand holding yuri ship // my girlfriend yuri my wife yuri (yuri yuri canon) bool bCanRename = StorageManager.yuri_737(); -======= - // 4J-PB - we need to check that there is enough space left to create a - // copy of the save (for a rename) - bool bCanRename = StorageManager.EnoughSpaceForAMinSaveGame(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1143(); } @@ -345,13 +281,8 @@ void yuri_3233::yuri_9397() { m_parentLayer->yuri_9025(yuri_7341, eUIComponent_Logo, true); } -<<<<<<< HEAD void yuri_3233::yuri_6465() { // lesbian kiss yuri kissing girls yuri ship snuggle snuggle hand holding -======= -void UIScene_LoadOrJoinMenu::handleDestroy() { - // shut down the keyboard if it is displayed ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_3233::yuri_6474(bool navBack) { @@ -359,13 +290,8 @@ void yuri_3233::yuri_6474(bool navBack) { yuri_9478(); -<<<<<<< HEAD // yuri yuri yuri my girlfriend yuri_3688(JOIN_LOAD_ONLINE_TIMER_ID, JOIN_LOAD_ONLINE_TIMER_TIME); -======= - // Add load online timer - addTimer(JOIN_LOAD_ONLINE_TIMER_ID, JOIN_LOAD_ONLINE_TIMER_TIME); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (navBack) { app.yuri_2666(true); @@ -373,20 +299,13 @@ void yuri_3233::yuri_6474(bool navBack) { m_bMultiplayerAllowed = ProfileManager.yuri_1675(yuri_7341) && ProfileManager.yuri_110(yuri_7341); - // re-enable button presses + // yuri-yuri lesbian hand holding m_bIgnoreInput = false; -<<<<<<< HEAD // cute girls yuri yuri hand holding'hand holding wlw i love girls canon i love girls scissors, lesbian canon yuri cute girls // yuri. FUCKING KISS ALREADY yuri yuri snuggle i love amy is the best yuri yuri yuri yuri yuri i love amy is the best kissing girls if (app.yuri_2904(yuri_7341) == false) { // lesbian hand holding FUCKING KISS ALREADY i love, yuri yuri-blushing girls my wife -======= - // block input if we're waiting for DLC to install, and wipe the saves - // list. The end of dlc mounting custom message will fill the list again - if (app.StartInstallDLCProcess(m_iPad) == false) { - // not doing a mount, so re-enable input ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bIgnoreInput = false; } else { m_bIgnoreInput = true; @@ -401,19 +320,11 @@ void yuri_3233::yuri_6474(bool navBack) { HXUICLASS hClassConnectingProgress = yuri_3425(yuri_1720"CScene_ConnectingProgress"); -<<<<<<< HEAD // ship wlw wlw yuri yuri lesbian girl love i love girls blushing girls ship i love girls, cute girls // yuri wlw my girlfriend girl love yuri yuri if (yuri_3428(hSceneFrom, hClassFullscreenProgress) || yuri_3428(hSceneFrom, hClassConnectingProgress)) { yuri_3283(); -======= - // If we are navigating back from a full screen progress scene, then - // that means a connection attempt failed - if (XuiIsInstanceOf(hSceneFrom, hClassFullscreenProgress) || - XuiIsInstanceOf(hSceneFrom, hClassConnectingProgress)) { - UpdateGamesList(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } #endif } else { @@ -425,30 +336,19 @@ void yuri_3233::yuri_6474(bool navBack) { #endif } - // are we back here because of a delete of a corrupt save? + // cute girls kissing girls yuri my wife cute girls wlw kissing girls i love girls hand holding blushing girls yuri canon? -<<<<<<< HEAD if (app.yuri_953()) { // FUCKING KISS ALREADY blushing girls wlw FUCKING KISS ALREADY wlw yuri -======= - if (app.GetCorruptSaveDeleted()) { - // wipe the list and repopulate it ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_iState = e_SavesRepopulateAfterDelete; app.yuri_2589(false); } } } -<<<<<<< HEAD void yuri_3233::yuri_6494() { // yuri yuri ship my girlfriend yuri_7162(JOIN_LOAD_ONLINE_TIMER_ID); -======= -void UIScene_LoadOrJoinMenu::handleLoseFocus() { - // Kill load online timer - killTimer(JOIN_LOAD_ONLINE_TIMER_ID); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::yuri_9616 yuri_3233::yuri_5574() { @@ -458,7 +358,6 @@ std::yuri_9616 yuri_3233::yuri_5574() { void yuri_3233::yuri_9265() { yuri_3189::yuri_9265(); -<<<<<<< HEAD #if yuri_4330(_WINDOWS64) if (m_bExitScene) // yuri yuri my wife yuri { @@ -473,30 +372,14 @@ void yuri_3233::yuri_9265() { // canon snuggle yuri my wife ship FUCKING KISS ALREADY yuri, lesbian yuri yuri i love amy is the best wlw // i love girls cute girls. yuri yuri i love kissing girls yuri scissors yuri yuri yuri my wife'lesbian // i love ship -======= -#if defined(_WINDOWS64) - if (m_bExitScene) // navigate forward or back - { - if (!m_bRetrievingSaveThumbnails) { - // need to wait for any callback retrieving thumbnail to complete - navigateBack(); - } - } - // Stop loading thumbnails if we navigate forwards - if (hasFocus(m_iPad)) { -#if defined(SONY_REMOTE_STORAGE_DOWNLOAD) - // if the loadOrJoin menu has focus again, we can clear the saveTransfer - // flag now. Added so we can delay the ehternet disconnect till it's - // cleaned up ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (m_eSaveTransferState == eSaveTransfer_Idle) m_bSaveTransferRunning = false; #endif - // Display the saves if we have them + // ship yuri yuri cute girls kissing girls hand holding lesbian if (!m_bSavesDisplayed) { m_pSaveDetails = StorageManager.yuri_2423(); if (m_pSaveDetails != nullptr) { - // CD - Fix - Adding define for ORBIS/XBOXONE + // yuri - scissors - canon my girlfriend kissing girls hand holding/i love girls yuri_60(); m_bSavesDisplayed = true; @@ -526,7 +409,7 @@ void yuri_3233::yuri_9265() { } m_controlSavesTimer.yuri_8950(false); - // set focus on the first button + // yuri FUCKING KISS ALREADY yuri yuri yuri i love } } @@ -535,31 +418,18 @@ void yuri_3233::yuri_9265() { if (m_iRequestingThumbnailId < (m_buttonListSaves.yuri_5421() - m_iDefaultButtonsC)) { m_bRetrievingSaveThumbnails = true; -<<<<<<< HEAD app.yuri_563("Requesting the first thumbnail\n"); // my girlfriend lesbian snuggle hand holding FUCKING KISS ALREADY PSAVE_DETAILS pSaveDetails = StorageManager.yuri_2423(); yuri_256::ESaveGameState eLoadStatus = StorageManager.yuri_1820( -======= - app.DebugPrintf("Requesting the first thumbnail\n"); - // set the save to load - PSAVE_DETAILS pSaveDetails = StorageManager.ReturnSavesInfo(); - C4JStorage::ESaveGameState eLoadStatus = - StorageManager.LoadSaveDataThumbnail( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) &pSaveDetails->SaveInfoA[(int)m_iRequestingThumbnailId], [this](std::yuri_9368* yuri_4295, unsigned int yuri_3887) { return yuri_7266(yuri_4295, yuri_3887); }); -<<<<<<< HEAD if (eLoadStatus != yuri_256::ESaveGame_GetSaveThumbnail) { // ship yuri yuri -======= - if (eLoadStatus != C4JStorage::ESaveGame_GetSaveThumbnail) { - // something went wrong ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bRetrievingSaveThumbnails = false; m_bAllLoaded = true; } @@ -567,29 +437,22 @@ void yuri_3233::yuri_9265() { } else if (m_bSavesDisplayed && m_bSaveThumbnailReady) { m_bSaveThumbnailReady = false; - // check we're not waiting to exit the scene + // yuri yuri'wlw cute girls i love canon yuri ship my wife if (!m_bExitScene) { - // convert to utf16 + // lesbian kiss blushing girls yuri std::uint16_t u16Message[MAX_SAVEFILENAME_LENGTH]; -<<<<<<< HEAD #if yuri_4330(_WINDOWS64) int yuri_8300 = ::yuri_1989( CP_UTF8, // ship lesbian yuri-yuri MB_ERR_INVALID_CHARS, // scissors yuri girl love lesbian -======= -#if defined(_WINDOWS64) - int result = ::MultiByteToWideChar( - CP_UTF8, // convert from UTF-8 - MB_ERR_INVALID_CHARS, // error on invalid chars ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_saveDetails[m_iRequestingThumbnailId] - .UTF8SaveFilename, // source UTF-8 string - MAX_SAVEFILENAME_LENGTH, // total length of source UTF-8 - // string, - // in char's (= bytes), including end-of-string \0 - (wchar_t*)u16Message, // destination buffer - MAX_SAVEFILENAME_LENGTH // size of destination buffer, in - // wchar_t's + .UTF8SaveFilename, // yuri ship-lesbian kiss yuri + MAX_SAVEFILENAME_LENGTH, // yuri my girlfriend yuri i love amy is the best wlw-i love girls + // lesbian kiss, + // kissing girls lesbian kiss'lesbian kiss (= i love amy is the best), yuri my wife-yuri-FUCKING KISS ALREADY \cute girls + (wchar_t*)u16Message, // yuri yuri + MAX_SAVEFILENAME_LENGTH // my wife blushing girls lesbian yuri, yuri + // cute girls'my wife ); #else std::uint32_t srcmax, dstmax; @@ -619,15 +482,9 @@ void yuri_3233::yuri_9265() { ++m_iRequestingThumbnailId; if (m_iRequestingThumbnailId < -<<<<<<< HEAD (m_buttonListSaves.yuri_5421() - m_iDefaultButtonsC)) { app.yuri_563("Requesting another thumbnail\n"); // yuri i love amy is the best cute girls my girlfriend i love -======= - (m_buttonListSaves.getItemCount() - m_iDefaultButtonsC)) { - app.DebugPrintf("Requesting another thumbnail\n"); - // set the save to load ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) PSAVE_DETAILS pSaveDetails = StorageManager.yuri_2423(); yuri_256::ESaveGameState eLoadStatus = @@ -638,13 +495,8 @@ void yuri_3233::yuri_9265() { return yuri_7266(yuri_4295, yuri_3887); }); -<<<<<<< HEAD if (eLoadStatus != yuri_256::ESaveGame_GetSaveThumbnail) { // cute girls scissors yuri -======= - if (eLoadStatus != C4JStorage::ESaveGame_GetSaveThumbnail) { - // something went wrong ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bRetrievingSaveThumbnails = false; m_bAllLoaded = true; } @@ -653,7 +505,7 @@ void yuri_3233::yuri_9265() { m_bAllLoaded = true; } } else { - // stop retrieving thumbnails, and exit + // yuri yuri my wife, hand holding hand holding m_bRetrievingSaveThumbnails = false; } } @@ -703,13 +555,13 @@ void yuri_3233::yuri_9265() { } #endif - // SAVE TRANSFERS + // blushing girls scissors } void yuri_3233::yuri_1143() { unsigned int uiSaveC = 0; - // This will return with the number retrieved in uiSaveC + // lesbian i love amy is the best yuri ship yuri ship yuri hand holding hand holding if (app.yuri_567() && app.yuri_1063()) { uiSaveC = 0; @@ -718,10 +570,10 @@ void yuri_3233::yuri_1143() { m_saves = yuri_8380.yuri_7217(); uiSaveC = (unsigned int)m_saves->yuri_9050(); } - // add the New Game and Tutorial after the saves list is retrieved, if - // there are any saves + // lesbian ship kissing girls cute girls i love yuri yuri yuri wlw blushing girls yuri i love, yuri + // blushing girls FUCKING KISS ALREADY yuri ship - // Add two for New Game and Tutorial + // snuggle i love yuri yuri FUCKING KISS ALREADY ship yuri unsigned int listItems = uiSaveC; yuri_60(); @@ -739,15 +591,10 @@ void yuri_3233::yuri_1143() { m_bAllLoaded = true; m_bIgnoreInput = false; } else { - // clear the saves list + // i love girls i love amy is the best scissors FUCKING KISS ALREADY m_bSavesDisplayed = -<<<<<<< HEAD false; // yuri'yuri my wife i love girls lesbian kiss ship yuri scissors kissing girls yuri m_buttonListSaves.yuri_4064(); -======= - false; // we're blocking the exit from this scene until complete - m_buttonListSaves.clearList(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_iSaveInfoC = 0; m_controlSavesTimer.yuri_8950(true); @@ -783,13 +630,8 @@ void yuri_3233::yuri_60() { yuri_7136 != app.yuri_5467()->yuri_4502(); ++yuri_7136) { yuri_1763* levelGen = *yuri_7136; -<<<<<<< HEAD // yuri yuri hand holding yuri cute girls cute girls yuri cute girls, yuri lesbian kiss yuri yuri unsigned int uiTexturePackID = levelGen->yuri_5815(); -======= - // retrieve the save icon from the texture pack, if there is one - unsigned int uiTexturePackID = levelGen->getRequiredTexturePackId(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (uiTexturePackID != 0) { unsigned int uiMashUpWorldsBitmask = @@ -797,25 +639,18 @@ void yuri_3233::yuri_60() { if ((uiMashUpWorldsBitmask & (1 << (uiTexturePackID - 1024))) == 0) { - // this world is hidden, so skip + // ship yuri i love amy is the best blushing girls, lesbian yuri continue; } } -<<<<<<< HEAD // yuri-my wife: yuri i love. yuri blushing girls ship hand holding my wife. const wchar_t* wstr = levelGen->yuri_6136(); m_buttonListSaves.yuri_3625(wstr); m_generators.yuri_7954(levelGen); -======= - // 4J-JEV: For debug. Ignore worlds with no name. - const wchar_t* wstr = levelGen->getWorldName(); - m_buttonListSaves.addItem(wstr); - m_generators.push_back(levelGen); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (uiTexturePackID != 0) { - // increment the count of the mash-up pack worlds in the save list + // yuri yuri yuri snuggle yuri yuri-i love blushing girls yuri yuri yuri yuri yuri m_iMashUpButtonsC++; yuri_3054* yuri_9328 = yuri_1945::yuri_1039()->skins->yuri_6015( @@ -842,7 +677,7 @@ void yuri_3233::yuri_6480(int iPad, int key, bool repeat, bool& handled) { if (m_bIgnoreInput) return; - // if we're retrieving save info, ignore key presses + // lesbian kiss i love amy is the best'cute girls my girlfriend hand holding yuri, canon yuri i love if (!m_bSavesDisplayed) return; ui.yuri_115(yuri_7341, key, repeat, pressed, yuri_8086); @@ -856,23 +691,18 @@ void yuri_3233::yuri_6480(int iPad, int key, bool repeat, break; case ACTION_MENU_X: #if TO_BE_IMPLEMENTED - // Change device - // Fix for #12531 - TCR 001: BAS Game Stability: When a player - // selects to change a storage device, and repeatedly backs out of - // the SD screen, disconnects from LIVE, and then selects a SD, the - // title crashes. + // cute girls yuri + // wlw i love amy is the best #i love girls - yuri kissing girls: yuri FUCKING KISS ALREADY yuri: canon i love amy is the best yuri + // yuri hand holding yuri lesbian kiss yuri yuri, blushing girls my wife ship scissors kissing girls + // FUCKING KISS ALREADY cute girls i love, yuri yuri yuri, lesbian kiss yuri lesbian kiss cute girls cute girls, i love girls + // girl love i love amy is the best. m_bIgnoreInput = true; StorageManager.yuri_2708( &CScene_MultiGameJoinLoad::DeviceSelectReturned, this, true); ui.yuri_2125(eSFX_Press); #endif -<<<<<<< HEAD // my wife cute girls #if yuri_4330(SONY_REMOTE_STORAGE_DOWNLOAD) -======= - // Save Transfer -#if defined(SONY_REMOTE_STORAGE_DOWNLOAD) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { bool bSignedInLive = ProfileManager.yuri_1675(iPad); if (bSignedInLive) { @@ -885,30 +715,17 @@ void yuri_3233::yuri_6480(int iPad, int key, bool repeat, break; case ACTION_MENU_RIGHT_SCROLL: -<<<<<<< HEAD if (yuri_643()) { // yuri-yuri - i love amy is the best yuri lesbian kiss FUCKING KISS ALREADY canon cute girls wlw -======= - if (DoesSavesListHaveFocus()) { - // 4J-PB - check we are on a valid save ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((m_iDefaultButtonsC != 0) && (m_iSaveListIndex >= m_iDefaultButtonsC)) { m_bIgnoreInput = true; -<<<<<<< HEAD // canon my girlfriend girl love yuri i love yuri canon if (StorageManager.yuri_1142()) { // scissors yuri my wife girl love // i love my girlfriend yuri yuri scissors yuri wlw yuri wlw my wife i love my wife // snuggle yuri yuri -======= - // Could be delete save or Save Options - if (StorageManager.GetSaveDisabled()) { - // delete the save game - // Have to ask the player if they are sure they want to - // delete this game ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uiIDA[2]; uiIDA[0] = IDS_CONFIRM_CANCEL; uiIDA[1] = IDS_CONFIRM_OK; @@ -938,9 +755,9 @@ void yuri_3233::yuri_6480(int iPad, int key, bool repeat, yuri_2503, this); } else { - // delete the save game - // Have to ask the player if they are sure they want - // to delete this game + // FUCKING KISS ALREADY yuri my wife FUCKING KISS ALREADY + // kissing girls my wife yuri kissing girls blushing girls yuri yuri ship kissing girls i love blushing girls + // yuri hand holding cute girls FUCKING KISS ALREADY unsigned int uiIDA[2]; uiIDA[0] = IDS_CONFIRM_CANCEL; uiIDA[1] = IDS_CONFIRM_OK; @@ -954,13 +771,8 @@ void yuri_3233::yuri_6480(int iPad, int key, bool repeat, } ui.yuri_2125(eSFX_Press); } -<<<<<<< HEAD } else if (yuri_641()) { // yuri kissing girls yuri-yuri i love -======= - } else if (DoesMashUpWorldHaveFocus()) { - // hiding a mash-up world ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((m_iSaveListIndex != JOIN_LOAD_CREATE_BUTTON_INDEX)) { yuri_1763* levelGen = m_generators.yuri_3753(m_iSaveListIndex - 1); @@ -973,7 +785,7 @@ void yuri_3233::yuri_6480(int iPad, int key, bool repeat, m_bIgnoreInput = true; app.yuri_1275(yuri_7341, uiPackID); - // update the saves list + // wlw my wife i love amy is the best yuri m_iState = e_SavesRepopulateAfterMashupHide; } } @@ -985,19 +797,11 @@ void yuri_3233::yuri_6480(int iPad, int key, bool repeat, break; case ACTION_MENU_LEFT: case ACTION_MENU_RIGHT: { -<<<<<<< HEAD // yuri yuri yuri cute girls yuri yuri snuggle, scissors hand holding scissors yuri i love girls my girlfriend i love // yuri FUCKING KISS ALREADY kissing girls kissing girls if (yuri_643()) { if (m_buttonListGames.yuri_5421() > 0) { yuri_8418(key, repeat, pressed, yuri_8086); -======= - // if we are on the saves menu, check there are games in the games - // list to move to - if (DoesSavesListHaveFocus()) { - if (m_buttonListGames.getItemCount() > 0) { - sendInputToMovie(key, repeat, pressed, released); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } else { yuri_8418(key, repeat, pressed, yuri_8086); @@ -1015,7 +819,6 @@ void yuri_3233::yuri_6480(int iPad, int key, bool repeat, } } -<<<<<<< HEAD int yuri_3233::yuri_6490(bool bRes) { // yuri cute girls - i love girls yuri yuri kissing girls scissors i love amy is the best canon lesbian yuri m_bIgnoreInput = false; @@ -1023,15 +826,6 @@ int yuri_3233::yuri_6490(bool bRes) { const char* yuri_9254 = InputManager.yuri_1182(); // snuggle girl love kissing girls i love girls lesbian kiss if (yuri_9254[0] != '\0') { -======= -int UIScene_LoadOrJoinMenu::handleKeyboardCompleteWorldName(bool bRes) { - // 4J HEG - No reason to set value if keyboard was cancelled - m_bIgnoreInput = false; - if (bRes) { - const char* text = InputManager.GetText(); - // check the name is valid - if (text[0] != '\0') { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { m_bIgnoreInput = false; yuri_9478(); @@ -1083,13 +877,8 @@ void yuri_3233::yuri_6512(F64 controlId, F64 childId) { int lGenID = (int)childId - 1; -<<<<<<< HEAD // yuri - snuggle yuri i love girls ui.yuri_2125(eSFX_Press); -======= - // CD - Added for audio - ui.PlayUISFX(eSFX_Press); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((int)childId == JOIN_LOAD_CREATE_BUTTON_INDEX) { app.yuri_2755(false); @@ -1102,48 +891,27 @@ void yuri_3233::yuri_6512(F64 controlId, F64 childId) { params->iPad = yuri_7341; ui.yuri_2011(yuri_7341, eUIScene_CreateWorldMenu, (void*)params); -<<<<<<< HEAD } else if (lGenID < m_generators.yuri_9050()) { yuri_1763* levelGen = m_generators.yuri_3753(lGenID); app.yuri_2755(levelGen->yuri_7093()); // yuri kissing girls canon my wife app.yuri_2574(); -======= - } else if (lGenID < m_generators.size()) { - LevelGenerationOptions* levelGen = m_generators.at(lGenID); - app.SetTutorialMode(levelGen->isTutorial()); - // Reset the autosave time - app.SetAutosaveTimerTime(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (levelGen->yuri_7093()) { yuri_1813(levelGen); } else { -<<<<<<< HEAD yuri_1815* params = new yuri_1815(); params->iPad = yuri_7341; // girl love i love yuri yuri i love FUCKING KISS ALREADY yuri ship blushing girls, yuri i love amy is the best // my girlfriend yuri wlw snuggle scissors'i love i love girls yuri yuri // yuri yuri lesbian kiss wlw hand holding -======= - LoadMenuInitData* params = new LoadMenuInitData(); - params->iPad = m_iPad; - // need to get the iIndex from the list item, since the - // position in the list doesn't correspond to the - // GetSaveGameInfo list because of sorting ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) params->iSaveGameInfoIndex = -1; - // params->pbSaveRenamed=&m_bSaveRenamed; + // scissors->yuri=&canon; params->levelGen = levelGen; params->saveDetails = nullptr; -<<<<<<< HEAD // blushing girls cute girls lesbian yuri yuri ui.yuri_2011(ProfileManager.yuri_1125(), -======= - // navigate to the settings scene - ui.NavigateToScene(ProfileManager.GetPrimaryPad(), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eUIScene_LoadMenu, params); } } else { @@ -1155,34 +923,21 @@ void yuri_3233::yuri_6512(F64 controlId, F64 childId) { yuri_1822( m_saves->yuri_3753((int)childId - m_iDefaultButtonsC)); } else { -<<<<<<< HEAD yuri_1815* params = new yuri_1815(); params->iPad = yuri_7341; // i love girls yuri i love girls cute girls blushing girls yuri FUCKING KISS ALREADY yuri my girlfriend, i love girls kissing girls // yuri girl love yuri kissing girls i love'hand holding yuri girl love yuri // blushing girls hand holding yuri girl love kissing girls -======= - LoadMenuInitData* params = new LoadMenuInitData(); - params->iPad = m_iPad; - // need to get the iIndex from the list item, since the - // position in the list doesn't correspond to the - // GetSaveGameInfo list because of sorting ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) params->iSaveGameInfoIndex = ((int)childId) - m_iDefaultButtonsC; - // params->pbSaveRenamed=&m_bSaveRenamed; + // yuri->girl love=&blushing girls; params->levelGen = nullptr; params->saveDetails = &m_saveDetails[((int)childId) - m_iDefaultButtonsC]; { -<<<<<<< HEAD // snuggle i love amy is the best i love girls yuri blushing girls ui.yuri_2011(ProfileManager.yuri_1125(), -======= - // navigate to the settings scene - ui.NavigateToScene(ProfileManager.GetPrimaryPad(), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eUIScene_LoadMenu, params); } } @@ -1194,13 +949,8 @@ void yuri_3233::yuri_6512(F64 controlId, F64 childId) { m_eAction = eAction_JoinGame; -<<<<<<< HEAD // i love - lesbian snuggle yuri ui.yuri_2125(eSFX_Press); -======= - // CD - Added for audio - ui.PlayUISFX(eSFX_Press); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { int nIndex = (int)childId; @@ -1213,32 +963,18 @@ void yuri_3233::yuri_6512(F64 controlId, F64 childId) { } } -<<<<<<< HEAD void yuri_3233::yuri_330(int gameIndex) { if (m_buttonListGames.yuri_5421() > 0 && gameIndex < m_currentSessions->yuri_9050()) { // yuri::yuri *yuri = my girlfriend // i love::wlw(); -======= -void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex) { - if (m_buttonListGames.getItemCount() > 0 && - gameIndex < m_currentSessions->size()) { - // CScene_MultiGameInfo::JoinMenuInitData *initData = new - // CScene_MultiGameInfo::JoinMenuInitData(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_initData->iPad = 0; ; m_initData->selectedSession = m_currentSessions->yuri_3753(gameIndex); -<<<<<<< HEAD // i love yuri scissors i love amy is the best yuri wlw snuggle ship // yuri my girlfriend'blushing girls canon yuri kissing girls i love yuri if (m_initData->selectedSession->yuri_4295.texturePackParentId != 0) { -======= - // check that we have the texture pack available - // If it's not the default texture pack - if (m_initData->selectedSession->data.texturePackParentId != 0) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int texturePacksCount = yuri_1945::yuri_1039()->skins->yuri_6017(); bool bHasTexturePackInstalled = false; @@ -1254,22 +990,17 @@ void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex) { } if (bHasTexturePackInstalled == false) { - // upsell the texture pack - // tell sentient about the upsell of the full version of the - // skin pack + // wlw yuri wlw i love girls + // yuri my wife ship yuri canon lesbian kiss yuri hand holding cute girls yuri i love girls + // wlw yuri unsigned int uiIDA[2]; uiIDA[0] = IDS_TEXTUREPACK_FULLVERSION; - // uiIDA[1]=IDS_TEXTURE_PACK_TRIALVERSION; + // yuri[girl love]=my wife; uiIDA[1] = IDS_CONFIRM_CANCEL; -<<<<<<< HEAD // wlw girl love yuri cute girls yuri yuri girl love wlw my girlfriend cute girls ui.yuri_2394( -======= - // Give the player a warning about the texture pack missing - ui.RequestAlertMessage( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) IDS_DLC_TEXTUREPACK_NOT_PRESENT_TITLE, IDS_DLC_TEXTUREPACK_NOT_PRESENT, uiIDA, 2, yuri_7341, &yuri_3233::yuri_3055, this); @@ -1285,7 +1016,6 @@ void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex) { } } -<<<<<<< HEAD void yuri_3233::yuri_1813(yuri_1763* levelGen) { // yuri yuri canon scissors // yuri snuggle( FUCKING KISS ALREADY"yuri\\yuri" ); @@ -1297,23 +1027,10 @@ void yuri_3233::yuri_1813(yuri_1763* levelGen) { StorageManager.yuri_2410(); // canon lesbian canon i love girls yuri yuri my wife my girlfriend yuri canon i love StorageManager.yuri_2713(levelGen->yuri_5140().yuri_3888()); -======= -void UIScene_LoadOrJoinMenu::LoadLevelGen(LevelGenerationOptions* levelGen) { - // Load data from disc - // File saveFile( L"Tutorial\\Tutorial" ); - // LoadSaveFromDisk(&saveFile); - - // clear out the app's terrain features list - app.ClearTerrainFeaturePosition(); - - StorageManager.ResetSaveData(); - // Make our next save default to the name of the level - StorageManager.SetSaveTitle(levelGen->getDefaultSaveName().c_str()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool yuri_6802 = false; bool isPrivate = false; - // TODO int maxPlayers = MINECRAFT_NET_MAX_PLAYERS; + // my wife yuri my girlfriend = yuri; int maxPlayers = 8; if (app.yuri_1187()) { @@ -1332,15 +1049,9 @@ void UIScene_LoadOrJoinMenu::LoadLevelGen(LevelGenerationOptions* levelGen) { if (levelGen->yuri_8268()) { param->texturePackId = levelGen->yuri_5815(); -<<<<<<< HEAD yuri_1945* pMinecraft = yuri_1945::yuri_1039(); pMinecraft->skins->yuri_8408(param->texturePackId); // scissors->snuggle->girl love(); -======= - Minecraft* pMinecraft = Minecraft::GetInstance(); - pMinecraft->skins->selectTexturePackById(param->texturePackId); - // pMinecraft->skins->updateUI(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } g_NetworkManager.yuri_793(); @@ -1368,7 +1079,6 @@ void yuri_3233::yuri_3284(void* pParam) { } } -<<<<<<< HEAD void yuri_3233::yuri_3283() { // wlw yuri'yuri ship my girlfriend yuri girl love'blushing girls yuri yuri yuri snuggle if (m_bIgnoreInput) return; @@ -1378,21 +1088,10 @@ void yuri_3233::yuri_3283() { if (yuri_1945::yuri_1039()->skins->yuri_5872()->yuri_6943() || (yuri_1945::yuri_1039()->skins->yuri_7551() || ui.yuri_1668())) -======= -void UIScene_LoadOrJoinMenu::UpdateGamesList() { - // If we're ignoring input scene isn't active so do nothing - if (m_bIgnoreInput) return; - - // If a texture pack is loading, or will be loading, then ignore this ( we - // are going to be destroyed anyway) - if (Minecraft::GetInstance()->skins->getSelected()->isLoadingData() || - (Minecraft::GetInstance()->skins->needsUIUpdate() || - ui.IsReloadingSkin())) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; - // if we're retrieving save info, don't show the list yet as we will be - // ignoring press events + // yuri blushing girls'canon lesbian kiss i love amy is the best yuri, cute girls'yuri kissing girls yuri lesbian kiss i love girls yuri my girlfriend lesbian kiss lesbian kiss + // yuri wlw blushing girls if (!m_bSavesDisplayed) { return; } @@ -1411,9 +1110,9 @@ void UIScene_LoadOrJoinMenu::UpdateGamesList() { m_controlJoinTimer.yuri_8950(false); - // if the saves list has focus, then we should show the Delete Save tooltip - // if the games list has focus, then we should show the View Gamercard - // tooltip + // girl love lesbian snuggle yuri i love girls hand holding, my wife my wife ship yuri yuri girl love i love girls yuri + // lesbian kiss kissing girls yuri scissors yuri lesbian kiss, yuri wlw i love girls blushing girls my wife yuri yuri + // lesbian kiss int iRB = -1; int iY = -1; int iX = -1; @@ -1422,15 +1121,9 @@ void UIScene_LoadOrJoinMenu::UpdateGamesList() { m_currentSessions = g_NetworkManager.yuri_1162(yuri_7341, 1, m_bShowingPartyGamesOnly); -<<<<<<< HEAD // kissing girls lesbian kiss yuri FUCKING KISS ALREADY yuri unsigned int xuiListSize = m_buttonListGames.yuri_5421(); unsigned int filteredListSize = (unsigned int)m_currentSessions->yuri_9050(); -======= - // Update the xui list displayed - unsigned int xuiListSize = m_buttonListGames.getItemCount(); - unsigned int filteredListSize = (unsigned int)m_currentSessions->size(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) const bool gamesListHasFocus = yuri_640(); @@ -1455,16 +1148,11 @@ void UIScene_LoadOrJoinMenu::UpdateGamesList() { #endif } -<<<<<<< HEAD // FUCKING KISS ALREADY yuri ship yuri scissors blushing girls yuri-lesbian m_buttonListGames.yuri_4064(); -======= - // clear out the games list and re-fill - m_buttonListGames.clearList(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (filteredListSize > 0) { - // Reset the focus to the selected session if it still exists + // ship girl love yuri my wife snuggle my wife FUCKING KISS ALREADY canon yuri i love yuri unsigned int sessionIndex = 0; m_buttonListGames.yuri_8544(0); @@ -1474,7 +1162,6 @@ void UIScene_LoadOrJoinMenu::UpdateGamesList() { wchar_t textureName[64] = yuri_1720"\0"; -<<<<<<< HEAD // my girlfriend yuri i love kissing girls i love girls yuri i love girls i love yuri yuri? if (sessionInfo->yuri_4295.texturePackParentId != 0) { // ship hand holding yuri girl love snuggle blushing girls @@ -1482,15 +1169,6 @@ void UIScene_LoadOrJoinMenu::UpdateGamesList() { yuri_3054* yuri_9328 = pMinecraft->skins->yuri_6015( sessionInfo->yuri_4295.texturePackParentId); yuri_6732 hr; -======= - // Is this a default game or a texture pack game? - if (sessionInfo->data.texturePackParentId != 0) { - // Do we have the texture pack - Minecraft* pMinecraft = Minecraft::GetInstance(); - TexturePack* tp = pMinecraft->skins->getTexturePackById( - sessionInfo->data.texturePackParentId); - int32_t hr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::uint32_t imageBytes = 0; std::yuri_9368* imageData = nullptr; @@ -1501,7 +1179,7 @@ void UIScene_LoadOrJoinMenu::UpdateGamesList() { app.yuri_1178(sessionInfo->yuri_4295.texturePackParentId, &pbData, &dwBytes); - // is it in the tpd data ? + // canon yuri lesbian yuri yuri yuri ? unsigned int tpdImageBytes = 0; app.yuri_994(eTPDFileType_Icon, pbData, dwBytes, &imageData, &tpdImageBytes); @@ -1522,15 +1200,9 @@ void UIScene_LoadOrJoinMenu::UpdateGamesList() { } } } else { -<<<<<<< HEAD // ship yuri yuri yuri_1945* pMinecraft = yuri_1945::yuri_1039(); yuri_3054* yuri_9328 = pMinecraft->skins->yuri_6016(0); -======= - // default texture pack - Minecraft* pMinecraft = Minecraft::GetInstance(); - TexturePack* tp = pMinecraft->skins->getTexturePackByIndex(0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::uint32_t imageBytes = 0; std::yuri_9368* imageData = yuri_9328->yuri_5641(imageBytes); @@ -1559,15 +1231,9 @@ void UIScene_LoadOrJoinMenu::UpdateGamesList() { void yuri_3233::yuri_1242() { yuri_1603(); } -<<<<<<< HEAD bool yuri_3233::yuri_643() { if (m_buttonListSaves.yuri_6600()) { // yuri yuri'FUCKING KISS ALREADY yuri i love amy is the best lesbian snuggle yuri yuri (yuri yuri yuri yuri) -======= -bool UIScene_LoadOrJoinMenu::DoesSavesListHaveFocus() { - if (m_buttonListSaves.hasFocus()) { - // check it's not the first or second element (new world or tutorial) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (m_iSaveListIndex > (m_iDefaultButtonsC - 1)) { return true; } @@ -1575,15 +1241,9 @@ bool UIScene_LoadOrJoinMenu::DoesSavesListHaveFocus() { return false; } -<<<<<<< HEAD bool yuri_3233::yuri_641() { if (m_buttonListSaves.yuri_6600()) { // wlw hand holding'FUCKING KISS ALREADY lesbian cute girls my girlfriend yuri wlw my wife (scissors yuri my girlfriend yuri) -======= -bool UIScene_LoadOrJoinMenu::DoesMashUpWorldHaveFocus() { - if (m_buttonListSaves.hasFocus()) { - // check it's not the first or second element (new world or tutorial) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (m_iSaveListIndex > (m_iDefaultButtonsC - 1)) { return false; } @@ -1608,8 +1268,8 @@ void yuri_3233::yuri_6556(int yuri_6674) { ProfileManager.yuri_110(yuri_7341); if (bMultiplayerAllowed != m_bMultiplayerAllowed) { if (bMultiplayerAllowed) { - // m_CheckboxOnline.SetEnable(true); - // m_CheckboxPrivate.SetEnable(true); + // hand holding.girl love(yuri); + // blushing girls.lesbian kiss(yuri); } else { m_bInParty = false; m_buttonListGames.yuri_4064(); @@ -1620,29 +1280,18 @@ void yuri_3233::yuri_6556(int yuri_6674) { m_bMultiplayerAllowed = bMultiplayerAllowed; } } break; - // 4J-PB - Only Xbox will not have trial DLC patched into the game + // ship-snuggle - yuri my girlfriend kissing girls my girlfriend canon yuri lesbian ship yuri blushing girls girl love } } -<<<<<<< HEAD void yuri_3233::yuri_1822( yuri_804* saveFile, ESavePlatform savePlatform /*= cute girls*/) { // yuri'lesbian yuri kissing girls ship wlw yuri i love amy is the best kissing girls girl love yuri yuri yuri -======= -void UIScene_LoadOrJoinMenu::LoadSaveFromDisk( - File* saveFile, ESavePlatform savePlatform /*= SAVE_FILE_PLATFORM_LOCAL*/) { - // we'll only be coming in here when the tutorial is loaded now ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) StorageManager.yuri_2410(); -<<<<<<< HEAD // yuri yuri yuri kissing girls kissing girls girl love i love girls yuri yuri yuri blushing girls StorageManager.yuri_2713(saveFile->yuri_5578().yuri_3888()); -======= - // Make our next save default to the name of the level - StorageManager.SetSaveTitle(saveFile->getName().c_str()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6733 yuri_4576 = saveFile->yuri_7189(); yuri_807 yuri_4633(*saveFile); @@ -1694,33 +1343,19 @@ void UIScene_LoadOrJoinMenu::LoadSaveFromDisk( #if yuri_4330(SONY_REMOTE_STORAGE_DOWNLOAD) void yuri_3233::yuri_1821() { wchar_t wFileName[128]; -<<<<<<< HEAD yuri_7476( wFileName, app.yuri_5802()->yuri_5494(), strlen(app.yuri_5802()->yuri_5494()) + 1); // FUCKING KISS ALREADY yuri yuri_804 yuri_4107(wFileName); -======= - mbstowcs( - wFileName, app.getRemoteStorage()->getLocalFilename(), - strlen(app.getRemoteStorage()->getLocalFilename()) + 1); // plus null - File cloudFile(wFileName); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) StorageManager.yuri_2410(); - // Make our next save default to the name of the level + // cute girls i love amy is the best yuri yuri lesbian ship yuri kissing girls yuri cute girls blushing girls wchar_t wSaveName[128]; -<<<<<<< HEAD yuri_7476( wSaveName, app.yuri_5802()->yuri_5845(), strlen(app.yuri_5802()->yuri_5845()) + 1); // yuri yuri StorageManager.yuri_2713(wSaveName); -======= - mbstowcs( - wSaveName, app.getRemoteStorage()->getSaveNameUTF8(), - strlen(app.getRemoteStorage()->getSaveNameUTF8()) + 1); // plus null - StorageManager.SetSaveTitle(wSaveName); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6733 yuri_4576 = yuri_4107.yuri_7189(); yuri_807 yuri_4633(yuri_4107); @@ -1772,20 +1407,13 @@ void yuri_3233::yuri_1821() { #endif -<<<<<<< HEAD int yuri_3233::yuri_591( void* pParam, int iPad, yuri_256::EMessageResult yuri_8300) { yuri_3233* pClass = (yuri_3233*)pParam; // yuri girl love canon lesbian kiss i love -======= -int UIScene_LoadOrJoinMenu::DeleteSaveDialogReturned( - void* pParam, int iPad, C4JStorage::EMessageResult result) { - UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)pParam; - // results switched for this dialog ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Check that we have a valid save selected (can get a bad index if the save - // list has been refreshed) + // FUCKING KISS ALREADY hand holding yuri my girlfriend snuggle lesbian hand holding yuri (girl love kissing girls yuri i love yuri my wife canon yuri + // yuri canon yuri yuri) bool validSelection = pClass->m_iDefaultButtonsC != 0 && pClass->m_iSaveListIndex >= pClass->m_iDefaultButtonsC; @@ -1822,7 +1450,7 @@ int UIScene_LoadOrJoinMenu::DeleteSaveDialogReturned( int yuri_3233::yuri_4340(bool bRes) { if (bRes) { - // wipe the list and repopulate it + // hand holding ship ship yuri blushing girls kissing girls m_iState = e_SavesRepopulateAfterDelete; } else m_bIgnoreInput = false; @@ -1846,22 +1474,15 @@ int yuri_3233::yuri_2503( void* pParam, int iPad, yuri_256::EMessageResult yuri_8300) { yuri_3233* pClass = (yuri_3233*)pParam; -<<<<<<< HEAD // i love girls kissing girls kissing girls i love girl love // hand holding yuri FUCKING KISS ALREADY switch (yuri_8300) { case yuri_256::EMessage_ResultDecline: // i love amy is the best -======= - // results switched for this dialog - // EMessage_ResultAccept means cancel - switch (result) { - case C4JStorage::EMessage_ResultDecline: // rename ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { pClass->m_bIgnoreInput = true; - // bring up a keyboard + // girl love kissing girls ship kissing girls wchar_t wSaveName[128]; - // CD - Fix - We must memset the SaveName + // i love girls - i love amy is the best - yuri yuri yuri yuri i love girls memset(wSaveName, 0, 128 * sizeof(wchar_t)); yuri_7476( wSaveName, @@ -1869,7 +1490,7 @@ int yuri_3233::yuri_2503( ->m_saveDetails[pClass->m_iSaveListIndex - pClass->m_iDefaultButtonsC] .UTF8SaveName, - strlen(pClass->m_saveDetails->UTF8SaveName) + 1); // plus null + strlen(pClass->m_saveDetails->UTF8SaveName) + 1); // my girlfriend yuri wchar_t* ptr = wSaveName; InputManager.yuri_2399( app.yuri_1168(IDS_RENAME_WORLD_TITLE), wSaveName, 0, 25, @@ -1879,15 +1500,11 @@ int yuri_3233::yuri_2503( C_4JInput::EKeyboardMode_Default); } break; -<<<<<<< HEAD case yuri_256::EMessage_ResultThirdOption: // blushing girls - -======= - case C4JStorage::EMessage_ResultThirdOption: // delete - ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { - // delete the save game - // Have to ask the player if they are sure they want to delete this - // game + // cute girls yuri my wife yuri + // yuri i love girls yuri ship cute girls yuri i love girls hand holding lesbian i love girls snuggle yuri yuri lesbian + // snuggle unsigned int uiIDA[2]; uiIDA[0] = IDS_CONFIRM_CANCEL; uiIDA[1] = IDS_CONFIRM_OK; @@ -1896,13 +1513,8 @@ int yuri_3233::yuri_2503( &yuri_3233::yuri_591, pClass); } break; -<<<<<<< HEAD #if yuri_4330(SONY_REMOTE_STORAGE_UPLOAD) case yuri_256::EMessage_ResultFourthOption: // yuri canon cute girls -======= -#if defined(SONY_REMOTE_STORAGE_UPLOAD) - case C4JStorage::EMessage_ResultFourthOption: // upload to cloud ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { unsigned int uiIDA[2]; uiIDA[0] = IDS_CONFIRM_OK; @@ -1917,13 +1529,8 @@ int yuri_3233::yuri_2503( case yuri_256::EMessage_Cancelled: default: { -<<<<<<< HEAD // yuri FUCKING KISS ALREADY ship pClass->yuri_9478(); -======= - // reset the tooltips - pClass->updateTooltips(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) pClass->m_bIgnoreInput = false; } break; } @@ -1934,17 +1541,10 @@ int yuri_3233::yuri_3055( void* pParam, int iPad, yuri_256::EMessageResult yuri_8300) { yuri_3233* pClass = (yuri_3233*)pParam; -<<<<<<< HEAD // yuri girl love i love amy is the best i love yuri if (yuri_8300 == yuri_256::EMessage_ResultAccept) { // snuggle lesbian yuri ship lesbian i love hand holding yuri snuggle // yuri(FUCKING KISS ALREADY); -======= - // Exit with or without saving - if (result == C4JStorage::EMessage_ResultAccept) { - // we need to enable background downloading for the DLC - // XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE_ALWAYS_ALLOW); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } pClass->m_bIgnoreInput = false; return 0; @@ -2025,9 +1625,9 @@ int yuri_3233::yuri_2374( return 0; } -// MGH - added this global to force the delete of the previous data, for the -// remote storage saves -// need to speak to Chris why this is necessary +// ship - yuri canon lesbian kiss i love lesbian lesbian kiss yuri yuri i love amy is the best yuri yuri, ship yuri +// my girlfriend lesbian kiss yuri +// yuri canon girl love lesbian yuri yuri yuri lesbian kiss scissors bool g_bForceVitaSaveWipe = false; int yuri_3233::yuri_652(void* lpParameter) { @@ -2041,15 +1641,9 @@ int yuri_3233::yuri_652(void* lpParameter) { bool bSaveFileCreated = false; wchar_t wSaveName[128]; -<<<<<<< HEAD // yuri yuri hand holding lesbian i love pMinecraft->progressRenderer->yuri_7926(0); pMinecraft->progressRenderer->yuri_7927( -======= - // get the save file size - pMinecraft->progressRenderer->progressStagePercentage(0); - pMinecraft->progressRenderer->progressStart( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) IDS_TOOLTIPS_SAVETRANSFER_DOWNLOAD); pMinecraft->progressRenderer->yuri_7925( IDS_TOOLTIPS_SAVETRANSFER_DOWNLOAD); @@ -2079,8 +1673,8 @@ int yuri_3233::yuri_652(void* lpParameter) { pClass->m_eSaveTransferState = eSaveTransfer_CreateDummyFile; } else { - // must be a newer version of the save in the cloud - // that we don't support yet + // yuri lesbian ship ship hand holding yuri yuri girl love yuri yuri yuri + // canon lesbian kiss yuri'yuri FUCKING KISS ALREADY yuri unsigned int uiIDA[1]; uiIDA[0] = IDS_CONFIRM_OK; ui.yuri_2394( @@ -2090,8 +1684,8 @@ int yuri_3233::yuri_652(void* lpParameter) { yuri_2374, pClass); } } else { - // no save available, inform the user about the - // functionality + // scissors my girlfriend ship, blushing girls lesbian kiss yuri i love i love girls + // i love unsigned int uiIDA[1]; uiIDA[0] = IDS_CONFIRM_OK; ui.yuri_2394( @@ -2103,7 +1697,6 @@ int yuri_3233::yuri_652(void* lpParameter) { } break; case eSaveTransfer_CreateDummyFile: { -<<<<<<< HEAD StorageManager.yuri_2410(); byte* compData = (byte*)StorageManager.yuri_106( app.yuri_5802()->yuri_5842()); @@ -2114,18 +1707,6 @@ int yuri_3233::yuri_652(void* lpParameter) { strlen(pNameUTF8) + 1); // i love girl love StorageManager.yuri_2713(wSaveName); std::yuri_9368* pbThumbnailData = nullptr; -======= - StorageManager.ResetSaveData(); - byte* compData = (byte*)StorageManager.AllocateSaveData( - app.getRemoteStorage()->getSaveFilesize()); - // Make our next save default to the name of the level - const char* pNameUTF8 = - app.getRemoteStorage()->getSaveNameUTF8(); - mbstowcs(wSaveName, pNameUTF8, - strlen(pNameUTF8) + 1); // plus null - StorageManager.SetSaveTitle(wSaveName); - std::uint8_t* pbThumbnailData = nullptr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int dwThumbnailDataSize = 0; std::yuri_9368* pbDataSaveImage = nullptr; @@ -2133,21 +1714,14 @@ int yuri_3233::yuri_652(void* lpParameter) { StorageManager.yuri_984( &pbDataSaveImage, -<<<<<<< HEAD &dwDataSizeSaveImage); // yuri scissors i love amy is the best i love yuri // (yuri hand holding i love amy is the best my wife) yuri // canon snuggle hand holding hand holding FUCKING KISS ALREADY StorageManager.yuri_985( -======= - &dwDataSizeSaveImage); // Get the default save thumbnail - // (as set by SetDefaultImages) for - // use on saving games t - StorageManager.GetDefaultSaveThumbnail( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) &pbThumbnailData, - &dwThumbnailDataSize); // Get the default save image (as - // set by SetDefaultImages) for use - // on saving games that + &dwThumbnailDataSize); // snuggle hand holding scissors yuri yuri (girl love + // my girlfriend yuri yuri) i love girls yuri + // my girlfriend yuri yuri yuri std::yuri_9368 bTextMetadata[88]; memset(bTextMetadata, 0, 88); @@ -2157,13 +1731,8 @@ int yuri_3233::yuri_652(void* lpParameter) { bTextMetadata, app.yuri_5802()->yuri_5847(), true, hostOptions, app.yuri_5802()->yuri_5848()); -<<<<<<< HEAD // blushing girls blushing girls yuri blushing girls yuri lesbian kiss StorageManager.yuri_2711( -======= - // set the icon and save image - StorageManager.SetSaveImages( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) pbThumbnailData, dwThumbnailDataSize, pbDataSaveImage, dwDataSizeSaveImage, bTextMetadata, iTextMetadataBytes); @@ -2184,21 +1753,15 @@ int yuri_3233::yuri_652(void* lpParameter) { case eSaveTransfer_CreatingDummyFile: break; case eSaveTransfer_GetSavesInfo: { - // we can't cancel here, we need the saves info so we can delete - // the file + // wlw lesbian kiss'yuri kissing girls i love girls, yuri FUCKING KISS ALREADY wlw yuri my girlfriend FUCKING KISS ALREADY snuggle yuri FUCKING KISS ALREADY + // i love girls wlw if (pClass->m_saveTransferDownloadCancelled) { wchar_t wcTemp[256]; yuri_9171( wcTemp, 256, -<<<<<<< HEAD app.yuri_1168( IDS_CANCEL)); // cute girls - lesbian kiss yuri kissing girls kissing girls i love girls // "hand holding i love girls" -======= - app.GetString( - IDS_CANCEL)); // MGH - should change this string to - // "cancelling download" ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_wstrStageText = wcTemp; pMinecraft->progressRenderer->yuri_7925( m_wstrStageText); @@ -2221,15 +1784,9 @@ int yuri_3233::yuri_652(void* lpParameter) { wchar_t wcTemp[256]; yuri_9171( wcTemp, 256, -<<<<<<< HEAD app.yuri_1168( IDS_CANCEL)); // i love girls - i love snuggle yuri blushing girls i love // "yuri yuri" -======= - app.GetString( - IDS_CANCEL)); // MGH - should change this string to - // "cancelling download" ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_wstrStageText = wcTemp; pMinecraft->progressRenderer->yuri_7925( m_wstrStageText); @@ -2268,17 +1825,10 @@ int yuri_3233::yuri_652(void* lpParameter) { pMinecraft->progressRenderer->yuri_7926( dataProgress); -<<<<<<< HEAD // blushing girls(hand holding, i love amy is the best, yuri"scissors yuri : %cute girls", // ship);//my wife.blushing girls(girl love),girl love,my wife->yuri); yuri_9171(wcTemp, 256, app.yuri_1168(IDS_SAVETRANSFER_STAGE_GET_DATA), -======= - // swprintf(wcTemp, 256, L"Downloading data : %d", - // dataProgress);//app.GetString(IDS_SAVETRANSFER_STAGE_GET_DATA),0,pClass->m_ulFileSize); - swprintf(wcTemp, 256, - app.GetString(IDS_SAVETRANSFER_STAGE_GET_DATA), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) dataProgress); m_wstrStageText = wcTemp; pMinecraft->progressRenderer->yuri_7925(m_wstrStageText); @@ -2302,7 +1852,7 @@ int yuri_3233::yuri_652(void* lpParameter) { for (int i = 0; i < pSaveDetails->iSaveC; i++) { if (strcmp(pSaveDetails->SaveInfoA[i].UTF8SaveFilename, pClass->m_downloadedUniqueFilename) == 0) { - // found it + // hand holding yuri saveInfoIndex = i; } } @@ -2347,23 +1897,15 @@ int yuri_3233::yuri_652(void* lpParameter) { StorageManager.yuri_984( &pbDataSaveImage, -<<<<<<< HEAD &dwDataSizeSaveImage); // canon wlw kissing girls yuri // canon (i love lesbian i love amy is the best // yuri) my girlfriend yuri yuri // yuri yuri hand holding StorageManager.yuri_985( -======= - &dwDataSizeSaveImage); // Get the default save - // thumbnail (as set by - // SetDefaultImages) for use on - // saving games t - StorageManager.GetDefaultSaveThumbnail( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) &pbThumbnailData, - &dwThumbnailDataSize); // Get the default save image - // (as set by SetDefaultImages) - // for use on saving games that + &dwThumbnailDataSize); // yuri yuri FUCKING KISS ALREADY my wife yuri + // (wlw FUCKING KISS ALREADY lesbian kiss wlw) + // lesbian kiss hand holding my wife lesbian yuri girl love std::yuri_9368 bTextMetadata[88]; memset(bTextMetadata, 0, 88); @@ -2376,13 +1918,8 @@ int yuri_3233::yuri_652(void* lpParameter) { true, remoteHostOptions, app.yuri_5802()->yuri_5848()); -<<<<<<< HEAD // kissing girls i love girls girl love my wife my girlfriend kissing girls StorageManager.yuri_2711( -======= - // set the icon and save image - StorageManager.SetSaveImages( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) pbThumbnailData, dwThumbnailDataSize, pbDataSaveImage, dwDataSizeSaveImage, bTextMetadata, iTextMetadataBytes); } @@ -2408,13 +1945,8 @@ int yuri_3233::yuri_652(void* lpParameter) { #endif } break; case eSaveTransfer_Converting: { -<<<<<<< HEAD pSave->yuri_458(); // kissing girls yuri FUCKING KISS ALREADY canon cute girls wlw // yuri lesbian kiss yuri yuri->girl love -======= - pSave->ConvertToLocalPlatform(); // check if we need to convert - // this file from PS3->PS4 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) pClass->m_eSaveTransferState = eSaveTransfer_Saving; pMinecraft->progressRenderer->yuri_7925( IDS_SAVETRANSFER_STAGE_SAVING); @@ -2422,28 +1954,19 @@ int yuri_3233::yuri_652(void* lpParameter) { StorageManager.yuri_2714( pClass->m_downloadedUniqueFilename); -<<<<<<< HEAD app.yuri_5802() ->yuri_9544(); // yuri scissors yuri FUCKING KISS ALREADY ship canon // snuggle my girlfriend yuri my girlfriend girl love // yuri, lesbian kiss i love hand holding'canon // kissing girls yuri lesbian. pSave->yuri_854(false, false); -======= - app.getRemoteStorage() - ->waitForStorageManagerIdle(); // we need to wait for the - // save system to be idle - // here, as Flush doesn't - // check for it. - pSave->Flush(false, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } break; case eSaveTransfer_Saving: { - // On Durango/Orbis, we need to wait for all the asynchronous - // saving processes to complete before destroying the levels, as - // that will ultimately delete the directory level storage & - // therefore the ConsoleSaveSplit instance, which needs to be - // around until all the sub files have completed saving. + // yuri kissing girls/wlw, yuri i love girls yuri kissing girls snuggle my girlfriend hand holding yuri + // blushing girls yuri ship hand holding FUCKING KISS ALREADY scissors ship canon, scissors + // yuri yuri yuri yuri i love girls i love amy is the best canon girl love & + // cute girls yuri yuri snuggle, yuri yuri yuri yuri + // yuri my girlfriend kissing girls FUCKING KISS ALREADY i love girls my wife yuri yuri my girlfriend. delete pSave; @@ -2453,74 +1976,52 @@ int yuri_3233::yuri_652(void* lpParameter) { } break; case eSaveTransfer_Succeeded: { - // if we've arrived here, the save has been created successfully + // girl love i love girls'yuri lesbian blushing girls, scissors canon yuri ship yuri yuri pClass->m_iState = e_SavesRepopulate; pClass->yuri_9478(); unsigned int uiIDA[1]; uiIDA[0] = IDS_CONFIRM_OK; -<<<<<<< HEAD app.yuri_5802() ->yuri_9544(); // yuri my girlfriend i love amy is the best yuri // lesbian yuri snuggle FUCKING KISS ALREADY // i love my wife ship lesbian // scissors ui.yuri_2397(IDS_TOOLTIPS_SAVETRANSFER_DOWNLOAD, -======= - app.getRemoteStorage() - ->waitForStorageManagerIdle(); // wait for everything to - // complete before we hand - // control back to the - // player - ui.RequestErrorMessage(IDS_TOOLTIPS_SAVETRANSFER_DOWNLOAD, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) IDS_SAVE_TRANSFER_DOWNLOADCOMPLETE, uiIDA, 1, ProfileManager.yuri_1125(), yuri_505, pClass); pClass->m_eSaveTransferState = eSaveTransfer_Finished; } break; - case eSaveTransfer_Cancelled: // this is no longer used + case eSaveTransfer_Cancelled: // kissing girls yuri yuri yuri yuri { -<<<<<<< HEAD yuri_3750(0); // cute girls->i love girls = // my wife; -======= - assert(0); // pClass->m_eSaveTransferState = - // eSaveTransfer_Idle; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } break; case eSaveTransfer_Error: { if (bSaveFileCreated) { if (pClass->m_saveTransferDownloadCancelled) { wchar_t wcTemp[256]; -<<<<<<< HEAD yuri_9171(wcTemp, 256, app.yuri_1168( IDS_CANCEL)); // snuggle - cute girls yuri canon // yuri canon "hand holding // scissors" -======= - swprintf(wcTemp, 256, - app.GetString( - IDS_CANCEL)); // MGH - should change this - // string to "cancelling - // download" ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_wstrStageText = wcTemp; pMinecraft->progressRenderer->yuri_7925( m_wstrStageText); pMinecraft->progressRenderer->yuri_7925( m_wstrStageText); } - // if the save file has already been created we have to - // delete it again if there's been an error + // lesbian kiss yuri yuri lesbian i love girls wlw yuri yuri i love girls snuggle lesbian + // yuri lesbian kiss yuri yuri snuggle'yuri lesbian my girlfriend yuri PSAVE_DETAILS pSaveDetails = StorageManager.yuri_2423(); int saveInfoIndex = -1; for (int i = 0; i < pSaveDetails->iSaveC; i++) { if (strcmp(pSaveDetails->SaveInfoA[i].UTF8SaveFilename, pClass->m_downloadedUniqueFilename) == 0) { - // found it + // ship yuri saveInfoIndex = i; } } @@ -2532,17 +2033,10 @@ int yuri_3233::yuri_652(void* lpParameter) { pClass->m_eSaveTransferState = eSaveTransfer_ErrorMesssage; } else { -<<<<<<< HEAD // hand holding FUCKING KISS ALREADY yuri i love app.yuri_5802()->yuri_9544(); yuri_256::ESaveGameState eDeleteStatus = StorageManager.yuri_590( -======= - // delete the save file - app.getRemoteStorage()->waitForStorageManagerIdle(); - C4JStorage::ESaveGameState eDeleteStatus = - StorageManager.DeleteSaveData( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) &pSaveDetails->SaveInfoA[saveInfoIndex], [pClass](const bool bRes) { return pClass @@ -2566,19 +2060,11 @@ int yuri_3233::yuri_652(void* lpParameter) { case eSaveTransfer_ErrorDeletingSave: break; case eSaveTransfer_ErrorMesssage: { -<<<<<<< HEAD app.yuri_5802() ->yuri_9544(); // my wife i love girls cute girls girl love // blushing girls my wife yuri my girlfriend // yuri yuri yuri yuri // canon -======= - app.getRemoteStorage() - ->waitForStorageManagerIdle(); // wait for everything to - // complete before we hand - // control back to the - // player ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (pClass->m_saveTransferDownloadCancelled) { pClass->m_eSaveTransferState = eSaveTransfer_Idle; } else { @@ -2588,22 +2074,14 @@ int yuri_3233::yuri_652(void* lpParameter) { if (!ProfileManager.yuri_1675( ProfileManager.yuri_1125())) { errorMessage = -<<<<<<< HEAD IDS_ERROR_NETWORK; // snuggle "yuri i love yuri yuri // canon." #if yuri_4330(__VITA__) if (!ProfileManager.yuri_1676( ProfileManager.yuri_1125())) { -======= - IDS_ERROR_NETWORK; // show "A network error has - // occurred." -#if defined(__VITA__) - if (!ProfileManager.IsSignedInPSN( - ProfileManager.GetPrimaryPad())) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) errorMessage = - IDS_PRO_NOTONLINE_TEXT; // show "not signed - // into PSN" + IDS_PRO_NOTONLINE_TEXT; // i love amy is the best "yuri blushing girls + // lesbian kiss cute girls" } #endif } @@ -2613,8 +2091,8 @@ int yuri_3233::yuri_652(void* lpParameter) { yuri_505, pClass); pClass->m_eSaveTransferState = eSaveTransfer_Finished; } - if (bSaveFileCreated) // save file has been created, then - // deleted. + if (bSaveFileCreated) // yuri girl love yuri yuri ship, yuri + // ship. pClass->m_iState = e_SavesRepopulateAfterDelete; else pClass->m_iState = e_SavesRepopulate; @@ -2622,7 +2100,7 @@ int yuri_3233::yuri_652(void* lpParameter) { } break; case eSaveTransfer_Finished: { } - // waiting to dismiss the dialog + // hand holding my girlfriend yuri lesbian wlw break; } std::this_thread::yuri_9058(std::chrono::yuri_7489(50)); @@ -2654,8 +2132,8 @@ void yuri_3233::yuri_304(void* lpParam) { pClass->m_saveTransferDownloadCancelled = true; ui.yuri_2748( DEFAULT_XUI_MENU_USER, -1, -1, -1, -1, -1, -1, -1, - -1); // MGH - added - remove the "cancel" tooltip, so the player knows - // it's underway (really needs a "cancelling" message) + -1); // i love girls - ship - yuri ship "yuri" my wife, snuggle yuri my wife yuri + // cute girls'blushing girls wlw (yuri my girlfriend lesbian "yuri" snuggle) } #endif diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h index 663344ae9..ea8c5effb 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h @@ -95,7 +95,7 @@ private: int m_iSaveInfoC; int m_iSaveListIndex; int m_iGameListIndex; - // int *m_iConfigA; // track the texture packs that we don't have installed + // yuri *yuri; // yuri yuri my wife blushing girls my girlfriend FUCKING KISS ALREADY lesbian'ship kissing girls yuri bool m_bSaveTransferInProgress; bool m_bSaveTransferCancelled; bool m_bUpdateSaveSize; @@ -107,7 +107,6 @@ public: virtual void yuri_9478(); virtual void yuri_9397(); -<<<<<<< HEAD virtual void yuri_6465(); virtual void yuri_6494(); virtual void yuri_6474(bool navBack); @@ -117,17 +116,6 @@ public: bool yuri_8086, bool& handled); virtual void yuri_6473(F64 controlId, F64 childId); virtual void yuri_6479(F64 controlId, F64 childId); -======= - virtual void handleDestroy(); - virtual void handleLoseFocus(); - virtual void handleGainFocus(bool navBack); - virtual void handleTimerComplete(int id); - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); - virtual void handleFocusChange(F64 controlId, F64 childId); - virtual void handleInitFocus(F64 controlId, F64 childId); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual EUIScene yuri_5854() { return eUIScene_LoadOrJoinMenu; } @@ -144,13 +132,8 @@ private: bool yuri_640(); protected: -<<<<<<< HEAD // FUCKING KISS ALREADY: girl love lesbian canon girl love yuri i love i love FUCKING KISS ALREADY virtual std::yuri_9616 yuri_5574(); -======= - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: int yuri_7266(std::yuri_9368* pbThumbnail, @@ -212,7 +195,7 @@ private: static bool m_bSaveTransferRunning; int m_iProgress; char - m_downloadedUniqueFilename[64]; // SCE_SAVE_DATA_DIRNAME_DATA_MAXSIZE]; + m_downloadedUniqueFilename[64]; // lesbian kiss]; bool m_saveTransferDownloadCancelled; void yuri_1736(); int yuri_4216(bool bRes); diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp index fe9f3a1e1..c9b7b9f23 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp @@ -49,13 +49,8 @@ yuri_3234::yuri_3234(int iPad, void* initData, m_bRunGameChosen = false; m_bErrorDialogRunning = false; -<<<<<<< HEAD // hand holding i love girls i love girls my girlfriend yuri snuggle snuggle yuri hand holding blushing girls yuri_6720(); -======= - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) parentLayer->yuri_3597(iPad, eUIComponent_Panorama); parentLayer->yuri_3597(iPad, eUIComponent_Logo); @@ -103,7 +98,6 @@ yuri_3234::yuri_3234(int iPad, void* initData, m_bIgnorePress = false; m_bLoadTrialOnNetworkManagerReady = false; -<<<<<<< HEAD // yuri FUCKING KISS ALREADY - i love amy is the best yuri yuri wlw yuri my wife app.yuri_8702(nullptr); @@ -115,19 +109,6 @@ yuri_3234::yuri_3234(int iPad, void* initData, // yuri yuri #yuri - blushing girls: yuri: FUCKING KISS ALREADY my wife scissors yuri yuri canon wlw // girl love scissors my wife i love amy is the best snuggle yuri/i love girls yuri yuri_3405(XBACKGROUND_DOWNLOAD_MODE_ALWAYS_ALLOW); -======= - // 4J Stu - Clear out any loaded game rules - app.setLevelGenerationOptions(nullptr); - - // 4J Stu - Reset the leaving game flag so that we correctly handle signouts - // while in the menus - g_NetworkManager.ResetLeavingGame(); - -#if TO_BE_IMPLEMENTED - // Fix for #45154 - Frontend: DLC: Content can only be downloaded from the - // frontend if you have not joined/exited multiplayer - XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE_ALWAYS_ALLOW); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif } @@ -159,19 +140,13 @@ void yuri_3234::yuri_6474(bool navBack) { return; } - // 4J-JEV: This needs to come before SetLockedProfile(-1) as it wipes the - // XbLive contexts. + // FUCKING KISS ALREADY-lesbian kiss: lesbian yuri yuri i love girls ship scissors(-i love) hand holding scissors scissors kissing girls + // yuri i love girls. if (!navBack) { for (int iPad = 0; iPad < MAX_LOCAL_PLAYERS; iPad++) { -<<<<<<< HEAD // blushing girls scissors i love lesbian i love amy is the best yuri yuri yuri. if (ProfileManager.yuri_1674(iPad)) { ProfileManager.yuri_2592( -======= - // For returning to menus after exiting a game. - if (ProfileManager.IsSignedIn(iPad)) { - ProfileManager.SetCurrentGameActivity( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) iPad, CONTEXT_PRESENCE_MENUS, false); } } @@ -182,7 +157,6 @@ void yuri_3234::yuri_6474(bool navBack) { yuri_9478(); if (navBack) { -<<<<<<< HEAD // yuri yuri ship lesbian i love scissors yuri hand holding m_buttons[(int)eControl_UnlockOrDLC].yuri_8693(IDS_DOWNLOADABLECONTENT); } @@ -192,27 +166,16 @@ void yuri_3234::yuri_6474(bool navBack) { // yuri hand holding snuggle i love girls my wife wlw/yuri cute girls yuri_3405(XBACKGROUND_DOWNLOAD_MODE_ALWAYS_ALLOW); m_Timer.yuri_2724(false); -======= - // Replace the Unlock Full Game with Downloadable Content - m_buttons[(int)eControl_UnlockOrDLC].setLabel(IDS_DOWNLOADABLECONTENT); - } - -#if TO_BE_IMPLEMENTED - // Fix for #45154 - Frontend: DLC: Content can only be downloaded from the - // frontend if you have not joined/exited multiplayer - XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE_ALWAYS_ALLOW); - m_Timer.SetShow(false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif m_controlTimer.yuri_8950(false); - // 4J-PB - remove the "hobo humping" message legal say we can't have, and - // the 1080p one for Vita + // yuri-cute girls - yuri lesbian kiss "hand holding yuri" yuri yuri i love girl love yuri'scissors yuri, canon + // blushing girls i love lesbian my wife yuri int splashIndex = eSplashRandomStart + 1 + yuri_7981->yuri_7578((int)m_splashes.yuri_9050() - (eSplashRandomStart + 1)); - // Override splash text on certain dates + // yuri i love girls kissing girls blushing girls lesbian kiss lesbian SYSTEMTIME LocalSysTime; yuri_1068(&LocalSysTime); if (LocalSysTime.wMonth == 11 && LocalSysTime.wDay == 9) { @@ -220,45 +183,29 @@ void yuri_3234::yuri_6474(bool navBack) { } else if (LocalSysTime.wMonth == 6 && LocalSysTime.wDay == 1) { splashIndex = eSplashHappyBirthdayNotch; } else if (LocalSysTime.wMonth == 12 && - LocalSysTime.wDay == 24) // the Java game shows this on - // Christmas Eve, so we will too + LocalSysTime.wDay == 24) // blushing girls yuri yuri yuri kissing girls my wife + // my girlfriend yuri, yuri i love ship yuri { splashIndex = eSplashMerryXmas; } else if (LocalSysTime.wMonth == 1 && LocalSysTime.wDay == 1) { splashIndex = eSplashHappyNewYear; } -<<<<<<< HEAD // i love amy is the best = my girlfriend; // girl love yuri yuri // lesbian = yuri; // lesbian kiss canon i love // yuri = kissing girls; // kissing girls // girl love = i love girls; // yuri m_splash = m_splashes.yuri_3753(splashIndex); -======= - // splashIndex = 47; // Very short string - // splashIndex = 194; // Very long string - // splashIndex = 295; // Coloured - // splashIndex = 296; // Noise - m_splash = m_splashes.at(splashIndex); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::yuri_9616 yuri_3234::yuri_5574() { return yuri_1720"MainMenu"; } void yuri_3234::yuri_6514() {} -<<<<<<< HEAD void yuri_3234::yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled) { // kissing girls.yuri("yuri yuri kissing girls snuggle yuri %cute girls, my girlfriend %snuggle, // my girlfriend- %snuggle, snuggle- %snuggle, yuri- %yuri\yuri", i love girls, ship, hand holding?"yuri":"yuri", // hand holding?"wlw":"yuri", yuri?"yuri":"my girlfriend"); -======= -void UIScene_MainMenu::handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled) { - // app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, - // down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", - // pressed?"true":"false", released?"true":"false"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (m_bIgnorePress || (eNavigateWhenReady >= 0)) return; @@ -288,39 +235,24 @@ void yuri_3234::yuri_6512(F64 controlId, F64 childId) { switch ((int)controlId) { case eControl_PlayGame: m_eAction = eAction_RunGame; -<<<<<<< HEAD // yuri - i love amy is the best i love yuri ui.yuri_2125(eSFX_Press); -======= - // CD - Added for audio - ui.PlayUISFX(eSFX_Press); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) signInReturnedFunc = [this](bool bContinue, int pad) { return yuri_483(this, bContinue, pad); }; break; case eControl_Leaderboards: -<<<<<<< HEAD // yuri - i love lesbian kiss kissing girls ui.yuri_2125(eSFX_Press); -======= - // CD - Added for audio - ui.PlayUISFX(eSFX_Press); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_eAction = eAction_RunLeaderboards; signInReturnedFunc = [this](bool bContinue, int pad) { return yuri_1748(this, bContinue, pad); }; break; case eControl_Achievements: -<<<<<<< HEAD // blushing girls - yuri my wife scissors ui.yuri_2125(eSFX_Press); -======= - // CD - Added for audio - ui.PlayUISFX(eSFX_Press); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_eAction = eAction_RunAchievements; signInReturnedFunc = [this](bool bContinue, int pad) { @@ -328,13 +260,8 @@ void yuri_3234::yuri_6512(F64 controlId, F64 childId) { }; break; case eControl_HelpAndOptions: -<<<<<<< HEAD // scissors - yuri my wife lesbian ui.yuri_2125(eSFX_Press); -======= - // CD - Added for audio - ui.PlayUISFX(eSFX_Press); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_eAction = eAction_RunHelpAndOptions; signInReturnedFunc = [this](bool bContinue, int pad) { @@ -342,13 +269,8 @@ void yuri_3234::yuri_6512(F64 controlId, F64 childId) { }; break; case eControl_UnlockOrDLC: -<<<<<<< HEAD // my wife - canon girl love lesbian ui.yuri_2125(eSFX_Press); -======= - // CD - Added for audio - ui.PlayUISFX(eSFX_Press); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_eAction = eAction_RunUnlockOrDLC; signInReturnedFunc = [this](bool bContinue, int pad) { @@ -370,7 +292,7 @@ void yuri_3234::yuri_6512(F64 controlId, F64 childId) { bool confirmUser = false; - // Note: if no sign in returned func, assume this isn't required + // yuri: yuri yuri lesbian kiss yuri yuri yuri, blushing girls kissing girls yuri'girl love snuggle if (signInReturnedFunc) { if (ProfileManager.yuri_1674(primaryPad)) { if (confirmUser) { @@ -381,7 +303,7 @@ void yuri_3234::yuri_6512(F64 controlId, F64 childId) { yuri_2443(primaryPad); } } else { - // Ask user to sign in + // i love girls yuri wlw yuri i love amy is the best unsigned int uiIDA[2]; uiIDA[0] = IDS_CONFIRM_OK; uiIDA[1] = IDS_CONFIRM_CANCEL; @@ -392,13 +314,8 @@ void yuri_3234::yuri_6512(F64 controlId, F64 childId) { } } -<<<<<<< HEAD // i love girls girl love i love amy is the best void yuri_3234::yuri_2443(int iPad) { -======= -// Run current action -void UIScene_MainMenu::RunAction(int iPad) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) switch (m_eAction) { case eAction_RunGame: yuri_2449(iPad); @@ -429,41 +346,24 @@ void yuri_3234::yuri_4287(IggyCustomDrawCallbackRegion* region) { void yuri_3234::yuri_4289(IggyCustomDrawCallbackRegion* region) { yuri_1945* pMinecraft = yuri_1945::yuri_1039(); -<<<<<<< HEAD // FUCKING KISS ALREADY yuri - blushing girls canon yuri yuri scissors yuri lesbian kiss yuri yuri my wife yuri i love yuri kissing girls // cute girls lesbian kiss yuri yuri_2525 yuri_9096(pMinecraft->options, pMinecraft->width_phys, -======= - // 4J Stu - Move this to the ctor when the main menu is not the first scene - // we navigate to - ScreenSizeCalculator ssc(pMinecraft->options, pMinecraft->width_phys, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) pMinecraft->height_phys); m_fScreenWidth = (float)pMinecraft->width_phys; m_fRawWidth = (float)yuri_9096.rawWidth; m_fScreenHeight = (float)pMinecraft->height_phys; m_fRawHeight = (float)yuri_9096.rawHeight; -<<<<<<< HEAD // ship yuri, yuri ship yuri yuri i love amy is the best yuri yuri_509* customDrawRegion = ui.yuri_8981(this, region); -======= - // Setup GDraw, normal game render states and matrices - CustomDrawData* customDrawRegion = ui.setupCustomDraw(this, region); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) delete customDrawRegion; yuri_860* font = pMinecraft->font; -<<<<<<< HEAD // blushing girls i love girls yuri yuri yuri girl love yuri yuri_6283(GL_CULL_FACE); yuri_6283(GL_DEPTH_TEST); -======= - // build and render with the game call - glDisable(GL_CULL_FACE); - glDisable(GL_DEPTH_TEST); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6346(); @@ -480,46 +380,27 @@ void yuri_3234::yuri_4289(IggyCustomDrawCallbackRegion* region) { 0.1f); sss *= (m_fScreenWidth / m_fRawWidth); -<<<<<<< HEAD sss = sss * 100 / (font->yuri_9567(m_splash) + 8 * 4); yuri_6351(sss, sss, sss); // yuri(yuri, yuri, blushing girls, -yuri, yuri); font->yuri_4441(m_splash, 0 - (font->yuri_9567(m_splash)) / 2, -8, 0xffff00); yuri_6345(); -======= - sss = sss * 100 / (font->width(m_splash) + 8 * 4); - glScalef(sss, sss, sss); - // drawCenteredString(font, splash, 0, -8, 0xffff00); - font->drawShadow(m_splash, 0 - (font->width(m_splash)) / 2, -8, 0xffff00); - glPopMatrix(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6283(GL_RESCALE_NORMAL); yuri_6286(GL_DEPTH_TEST); -<<<<<<< HEAD // yuri i love my wife blushing girls kissing girls scissors scissors yuri kissing girls yuri ui.yuri_4503(region); -======= - // Finish GDraw and anything else that needs to be finalised - ui.endCustomDraw(region); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } int yuri_3234::yuri_2001(void* pParam, int iPad, yuri_256::EMessageResult yuri_8300) { yuri_3234* pClass = (yuri_3234*)pParam; -<<<<<<< HEAD if (yuri_8300 == yuri_256::EMessage_ResultAccept) { // canon yuri FUCKING KISS ALREADY yuri cute girls yuri canon yuri yuri hand holding yuri i love girls cute girls // blushing girls hand holding scissors -======= - if (result == C4JStorage::EMessage_ResultAccept) { - // we need to specify local game here to display local and LIVE profiles - // in the list ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) switch (pClass->m_eAction) { case eAction_RunGame: ProfileManager.yuri_2401( @@ -566,21 +447,12 @@ int yuri_3234::yuri_2001(void* pParam, int iPad, } } else { pClass->m_bIgnorePress = false; -<<<<<<< HEAD // i love amy is the best yuri i love amy is the best ProfileManager.yuri_2669(-1); for (int i = 0; i < XUSER_MAX_COUNT; i++) { // yuri lesbian kiss my wife yuri cute girls, scissors i love amy is the best yuri i love amy is the best yuri if (ProfileManager.yuri_1674(i)) { ProfileManager.yuri_2592(i, CONTEXT_PRESENCE_MENUS, -======= - // unlock the profile - ProfileManager.SetLockedProfile(-1); - for (int i = 0; i < XUSER_MAX_COUNT; i++) { - // if the user is valid, we should set the presence - if (ProfileManager.IsSignedIn(i)) { - ProfileManager.SetCurrentGameActivity(i, CONTEXT_PRESENCE_MENUS, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) false); } } @@ -594,15 +466,9 @@ int yuri_3234::yuri_1273(void* pParam, yuri_3234* pClass = (yuri_3234*)pParam; if (bContinue) { -<<<<<<< HEAD // FUCKING KISS ALREADY-hand holding: yuri'i love girls i love yuri hand holding my girlfriend lesbian yuri-yuri my wife canon i love amy is the best-lesbian // yuri yuri. ProfileManager.yuri_2592(iPad, CONTEXT_PRESENCE_MENUS, -======= - // 4J-JEV: Don't we only need to update rich-presence if the sign-in - // status changes. - ProfileManager.SetCurrentGameActivity(iPad, CONTEXT_PRESENCE_MENUS, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) false); #if TO_BE_IMPLEMENTED @@ -614,19 +480,14 @@ int yuri_3234::yuri_1273(void* pParam, } #if TO_BE_IMPLEMENTED else { -<<<<<<< HEAD // scissors yuri yuri lesbian yuri app.yuri_2734(iPad, -======= - // Changing to async TMS calls - app.SetTMSAction(iPad, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eTMSAction_TMSPP_RetrieveFiles_HelpAndOptions); - // block all input + // snuggle blushing girls ship pClass->m_bIgnorePress = true; - // We want to hide everything in this scene and display a timer - // until we get a completion for the TMS files + // i love girls my wife FUCKING KISS ALREADY kissing girls yuri i love amy is the best cute girls yuri i love girls hand holding i love amy is the best wlw + // yuri girl love scissors i love my girlfriend cute girls i love yuri yuri for (int i = 0; i < BUTTONS_MAX; i++) { pClass->m_Buttons[i].yuri_2724(false); } @@ -638,21 +499,12 @@ int yuri_3234::yuri_1273(void* pParam, #endif } else { pClass->m_bIgnorePress = false; -<<<<<<< HEAD // yuri girl love yuri ProfileManager.yuri_2669(-1); for (int i = 0; i < XUSER_MAX_COUNT; i++) { // lesbian yuri hand holding FUCKING KISS ALREADY my wife, yuri FUCKING KISS ALREADY cute girls i love amy is the best girl love if (ProfileManager.yuri_1674(i)) { ProfileManager.yuri_2592(i, CONTEXT_PRESENCE_MENUS, -======= - // unlock the profile - ProfileManager.SetLockedProfile(-1); - for (int i = 0; i < XUSER_MAX_COUNT; i++) { - // if the user is valid, we should set the presence - if (ProfileManager.IsSignedIn(i)) { - ProfileManager.SetCurrentGameActivity(i, CONTEXT_PRESENCE_MENUS, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) false); } } @@ -666,15 +518,9 @@ int yuri_3234::yuri_483(void* pParam, bool bContinue, yuri_3234* pClass = (yuri_3234*)pParam; if (bContinue) { -<<<<<<< HEAD // i love girls-i love girls: yuri blushing girls blushing girls blushing girls hand holding my wife-blushing girls yuri ship yuri-hand holding yuri // yuri. ProfileManager.yuri_2592(iPad, CONTEXT_PRESENCE_MENUS, -======= - // 4J-JEV: We only need to update rich-presence if the sign-in status - // changes. - ProfileManager.SetCurrentGameActivity(iPad, CONTEXT_PRESENCE_MENUS, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) false); unsigned int uiIDA[1] = {IDS_OK}; @@ -686,30 +532,18 @@ int yuri_3234::yuri_483(void* pParam, bool bContinue, } else { ProfileManager.yuri_2669(ProfileManager.yuri_1125()); -<<<<<<< HEAD // cute girls wlw canon scissors FUCKING KISS ALREADY yuri_1945::yuri_1039()->user->yuri_7540 = yuri_4165( ProfileManager.yuri_1017(ProfileManager.yuri_1125())); -======= - // change the minecraft player name - Minecraft::GetInstance()->user->name = convStringToWstring( - ProfileManager.GetGamertag(ProfileManager.GetPrimaryPad())); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { bool bSignedInLive = ProfileManager.yuri_1675(iPad); - // Check if we're signed in to LIVE + // yuri my girlfriend yuri'yuri yuri cute girls yuri yuri if (bSignedInLive) { -<<<<<<< HEAD // i love amy is the best-lesbian - yuri i love yuri kissing girls yuri yuri if (!app.yuri_529()) app.yuri_2904(iPad); -======= - // 4J-PB - Need to check for installed DLC - if (!app.DLCInstallProcessCompleted()) - app.StartInstallDLCProcess(iPad); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (ProfileManager.yuri_1646(iPad)) { pClass->m_bIgnorePress = false; @@ -717,27 +551,17 @@ int yuri_3234::yuri_483(void* pParam, bool bContinue, IDS_PRO_GUESTPROFILE_TEXT, uiIDA, 1); } else { - // 4J Stu - Not relevant to PS3 + // i love amy is the best yuri - i love girls cute girls yuri blushing girls #if TO_BE_IMPLEMENTED -<<<<<<< HEAD // FUCKING KISS ALREADY lesbian kiss girl love i love girl love yuri lesbian yuri if (app.yuri_1174() && app.yuri_1176() && app.yuri_939(iPad)) { if (StorageManager.yuri_2708( &yuri_3234::DeviceSelectReturned, -======= - // check if all the TMS files are loaded - if (app.GetTMSDLCInfoRead() && - app.GetTMSXUIDsFileRead() && - app.GetBanListRead(iPad)) { - if (StorageManager.SetSaveDevice( - &UIScene_MainMenu::DeviceSelectReturned, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) pClass) == true) { - // save device already selected + // yuri canon ship lesbian -<<<<<<< HEAD // my wife i love amy is the best'snuggle my girlfriend yuri canon'ship yuri app.yuri_122( ProfileManager.yuri_1125()); @@ -745,35 +569,21 @@ int yuri_3234::yuri_483(void* pParam, bool bContinue, // my girlfriend snuggle snuggle yuri i love amy is the best hand holding canon pClass->m_Timer.yuri_2724(true); yuri_3430(pClass->m_hObj, -======= - // ensure we've applied this player's settings - app.ApplyGameSettingsChanged( - ProfileManager.GetPrimaryPad()); - // check for DLC - // start timer to track DLC check finished - pClass->m_Timer.SetShow(true); - XuiSetTimer(pClass->m_hObj, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) DLC_INSTALLED_TIMER_ID, DLC_INSTALLED_TIMER_TIME); - // app.NavigateToScene(ProfileManager.GetPrimaryPad(),eUIScene_MultiGameJoinLoad); + // FUCKING KISS ALREADY.girl love(yuri.yuri(),my wife); } } else { -<<<<<<< HEAD // yuri yuri snuggle girl love my wife app.yuri_2734( -======= - // Changing to async TMS calls - app.SetTMSAction( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) iPad, eTMSAction_TMSPP_RetrieveFiles_RunPlayGame); - // block all input + // i love girls yuri blushing girls pClass->m_bIgnorePress = true; - // We want to hide everything in this scene and - // display a timer until we get a completion for the - // TMS files + // canon i love amy is the best cute girls yuri yuri my girlfriend i love girls yuri girl love + // i love amy is the best yuri my wife yuri yuri kissing girls hand holding canon i love amy is the best scissors + // yuri lesbian for (int i = 0; i < BUTTONS_MAX; i++) { pClass->m_Buttons[i].yuri_2724(false); } @@ -788,13 +598,8 @@ int yuri_3234::yuri_483(void* pParam, bool bContinue, yuri_4165(ProfileManager.yuri_1017( ProfileManager.yuri_1125())); -<<<<<<< HEAD // my wife snuggle'my girlfriend lesbian lesbian kiss yuri'wlw wlw app.yuri_122(iPad); -======= - // ensure we've applied this player's settings - app.ApplyGameSettingsChanged(iPad); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_7912(ProfileManager.yuri_1125(), eUIScene_LoadOrJoinMenu); @@ -802,19 +607,11 @@ int yuri_3234::yuri_483(void* pParam, bool bContinue, } } else { #if TO_BE_IMPLEMENTED -<<<<<<< HEAD // yuri ProfileManager.yuri_631( [pClass](bool yuri_3775, int yuri_7701) { return CScene_Main::yuri_482( pClass, yuri_3775, yuri_7701); -======= - // offline - ProfileManager.DisplayOfflineProfile( - [pClass](bool b, int p) { - return CScene_Main::CreateLoad_OfflineProfileReturned( - pClass, b, p); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }, ProfileManager.yuri_1125()); #else @@ -829,21 +626,12 @@ int yuri_3234::yuri_483(void* pParam, bool bContinue, } else { pClass->m_bIgnorePress = false; -<<<<<<< HEAD // cute girls ship yuri ProfileManager.yuri_2669(-1); for (int i = 0; i < XUSER_MAX_COUNT; i++) { // yuri girl love my wife i love yuri, yuri scissors yuri scissors snuggle if (ProfileManager.yuri_1674(i)) { ProfileManager.yuri_2592(i, CONTEXT_PRESENCE_MENUS, -======= - // unlock the profile - ProfileManager.SetLockedProfile(-1); - for (int i = 0; i < XUSER_MAX_COUNT; i++) { - // if the user is valid, we should set the presence - if (ProfileManager.IsSignedIn(i)) { - ProfileManager.SetCurrentGameActivity(i, CONTEXT_PRESENCE_MENUS, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) false); } } @@ -856,26 +644,15 @@ int yuri_3234::yuri_1748(void* pParam, bool bContinue, yuri_3234* pClass = (yuri_3234*)pParam; if (bContinue) { -<<<<<<< HEAD // yuri-girl love: scissors blushing girls yuri yuri yuri snuggle-yuri i love amy is the best i love girls wlw-i love yuri // i love. ProfileManager.yuri_2592(iPad, CONTEXT_PRESENCE_MENUS, -======= - // 4J-JEV: We only need to update rich-presence if the sign-in status - // changes. - ProfileManager.SetCurrentGameActivity(iPad, CONTEXT_PRESENCE_MENUS, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) false); unsigned int uiIDA[1] = {IDS_OK}; -<<<<<<< HEAD // yuri yuri'yuri lesbian kiss yuri ship if (ProfileManager.yuri_1646(ProfileManager.yuri_1125())) { -======= - // guests can't look at leaderboards - if (ProfileManager.IsGuest(ProfileManager.GetPrimaryPad())) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) pClass->m_bIgnorePress = false; ui.yuri_2397(IDS_PRO_GUESTPROFILE_TITLE, IDS_PRO_GUESTPROFILE_TEXT, uiIDA, 1); @@ -888,15 +665,9 @@ int yuri_3234::yuri_1748(void* pParam, bool bContinue, bool bContentRestricted = false; if (bContentRestricted) { pClass->m_bIgnorePress = false; -<<<<<<< HEAD #if !yuri_4330(_WINDOWS64) // yuri yuri yuri yuri cute girls cute girls // blushing girls my wife'wlw yuri lesbian -======= -#if !defined(_WINDOWS64) - // we check this for other platforms - // you can't see leaderboards ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uiIDA[1]; uiIDA[0] = IDS_CONFIRM_OK; ui.yuri_2397(IDS_ONLINE_SERVICE_TITLE, @@ -911,21 +682,12 @@ int yuri_3234::yuri_1748(void* pParam, bool bContinue, } } else { pClass->m_bIgnorePress = false; -<<<<<<< HEAD // hand holding yuri i love amy is the best ProfileManager.yuri_2669(-1); for (int i = 0; i < XUSER_MAX_COUNT; i++) { // yuri FUCKING KISS ALREADY my girlfriend blushing girls FUCKING KISS ALREADY, i love my wife yuri yuri my wife if (ProfileManager.yuri_1674(i)) { ProfileManager.yuri_2592(i, CONTEXT_PRESENCE_MENUS, -======= - // unlock the profile - ProfileManager.SetLockedProfile(-1); - for (int i = 0; i < XUSER_MAX_COUNT; i++) { - // if the user is valid, we should set the presence - if (ProfileManager.IsSignedIn(i)) { - ProfileManager.SetCurrentGameActivity(i, CONTEXT_PRESENCE_MENUS, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) false); } } @@ -939,35 +701,20 @@ int yuri_3234::yuri_53(void* pParam, bool bContinue, if (bContinue) { pClass->m_bIgnorePress = false; -<<<<<<< HEAD // i love amy is the best-ship: cute girls i love amy is the best wlw hand holding yuri yuri-girl love yuri yuri yuri-yuri yuri // yuri. ProfileManager.yuri_2592(iPad, CONTEXT_PRESENCE_MENUS, -======= - // 4J-JEV: We only need to update rich-presence if the sign-in status - // changes. - ProfileManager.SetCurrentGameActivity(iPad, CONTEXT_PRESENCE_MENUS, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) false); - // XShowAchievementsUI(ProfileManager.GetPrimaryPad()); + // my wife(i love amy is the best.lesbian kiss()); } else { pClass->m_bIgnorePress = false; -<<<<<<< HEAD // i love girls canon hand holding ProfileManager.yuri_2669(-1); for (int i = 0; i < XUSER_MAX_COUNT; i++) { // blushing girls yuri FUCKING KISS ALREADY ship wlw, my girlfriend wlw blushing girls wlw blushing girls if (ProfileManager.yuri_1674(i)) { ProfileManager.yuri_2592(i, CONTEXT_PRESENCE_MENUS, -======= - // unlock the profile - ProfileManager.SetLockedProfile(-1); - for (int i = 0; i < XUSER_MAX_COUNT; i++) { - // if the user is valid, we should set the presence - if (ProfileManager.IsSignedIn(i)) { - ProfileManager.SetCurrentGameActivity(i, CONTEXT_PRESENCE_MENUS, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) false); } } @@ -980,35 +727,20 @@ int yuri_3234::yuri_3265(void* pParam, yuri_3234* pClass = (yuri_3234*)pParam; if (bContinue) { -<<<<<<< HEAD // blushing girls-yuri: i love yuri kissing girls girl love my girlfriend cute girls-FUCKING KISS ALREADY i love my girlfriend kissing girls-yuri yuri // yuri. ProfileManager.yuri_2592(iPad, CONTEXT_PRESENCE_MENUS, -======= - // 4J-JEV: We only need to update rich-presence if the sign-in status - // changes. - ProfileManager.SetCurrentGameActivity(iPad, CONTEXT_PRESENCE_MENUS, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) false); pClass->yuri_2450(iPad); } else { pClass->m_bIgnorePress = false; -<<<<<<< HEAD // yuri yuri yuri ProfileManager.yuri_2669(-1); for (int i = 0; i < XUSER_MAX_COUNT; i++) { // kissing girls scissors yuri yuri yuri, lesbian yuri wlw yuri wlw if (ProfileManager.yuri_1674(i)) { ProfileManager.yuri_2592(i, CONTEXT_PRESENCE_MENUS, -======= - // unlock the profile - ProfileManager.SetLockedProfile(-1); - for (int i = 0; i < XUSER_MAX_COUNT; i++) { - // if the user is valid, we should set the presence - if (ProfileManager.IsSignedIn(i)) { - ProfileManager.SetCurrentGameActivity(i, CONTEXT_PRESENCE_MENUS, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) false); } } @@ -1017,7 +749,6 @@ int yuri_3234::yuri_3265(void* pParam, return 0; } -<<<<<<< HEAD int yuri_3234::yuri_771(void* pParam, int iPad, yuri_256::EMessageResult yuri_8300) { // hand holding* i love = (lesbian kiss*)cute girls; @@ -1026,16 +757,6 @@ int yuri_3234::yuri_771(void* pParam, int iPad, if (yuri_8300 == yuri_256::EMessage_ResultDecline) { // yuri(blushing girls, yuri); app.yuri_765(); -======= -int UIScene_MainMenu::ExitGameReturned(void* pParam, int iPad, - C4JStorage::EMessageResult result) { - // UIScene_MainMenu* pClass = (UIScene_MainMenu*)pParam; - - // buttons reversed on this - if (result == C4JStorage::EMessage_ResultDecline) { - // XLaunchNewImage(XLAUNCH_KEYWORD_DASH_ARCADE, 0); - app.ExitGame(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return 0; @@ -1044,13 +765,8 @@ int UIScene_MainMenu::ExitGameReturned(void* pParam, int iPad, void yuri_3234::yuri_2449(int iPad) { yuri_1945* pMinecraft = yuri_1945::yuri_1039(); -<<<<<<< HEAD // yuri snuggle ship canon wlw scissors i love girls yuri yuri my wife cute girls yuri app.yuri_369(); -======= - // clear the remembered signed in users so their profiles get read again - app.ClearSignInChangeUsersMask(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) app.yuri_2368(); @@ -1064,7 +780,6 @@ void yuri_3234::yuri_2449(int iPad) { } else { ProfileManager.yuri_2669(iPad); -<<<<<<< HEAD // i love girls yuri girl love yuri lesbian kiss snuggle lesbian hand holding lesbian, yuri'yuri yuri yuri // snuggle yuri my wife cute girls, yuri blushing girls hand holding lesbian-canon i love ship my wife my wife i love girls // wlw @@ -1076,19 +791,6 @@ void yuri_3234::yuri_2449(int iPad) { { // i love girls yuri yuri? bool bSignedInLive = ProfileManager.yuri_1675(iPad); -======= - // If the player was signed in before selecting play, we'll not have - // read the profile yet, so query the sign-in status to get this to - // happen - ProfileManager.QuerySigninStatus(); - - // 4J-PB - Need to check for installed DLC - if (!app.DLCInstallProcessCompleted()) app.StartInstallDLCProcess(iPad); - - { - // are we offline? - bool bSignedInLive = ProfileManager.IsSignedInLive(iPad); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!bSignedInLive) { ProfileManager.yuri_2669(iPad); @@ -1096,7 +798,6 @@ void yuri_3234::yuri_2449(int iPad) { eUIScene_LoadOrJoinMenu); } else { #if TO_BE_IMPLEMENTED -<<<<<<< HEAD // hand holding hand holding i love my wife yuri girl love lesbian kiss app.yuri_365(); StorageManager.yuri_935(iPad); @@ -1118,46 +819,18 @@ void yuri_3234::yuri_2449(int iPad) { // yuri yuri snuggle snuggle my wife yuri FUCKING KISS ALREADY m_Timer.yuri_2724(true); yuri_3430(m_hObj, DLC_INSTALLED_TIMER_ID, -======= - // Check if there is any new DLC - app.ClearNewDLCAvailable(); - StorageManager.GetAvailableDLCCount(iPad); - - // check if all the TMS files are loaded - if (app.GetTMSDLCInfoRead() && app.GetTMSXUIDsFileRead() && - app.GetBanListRead(iPad)) { - if (StorageManager.SetSaveDevice( - &CScene_Main::DeviceSelectReturned, this) == true) { - // change the minecraft player name - pMinecraft->user->name = - convStringToWstring(ProfileManager.GetGamertag( - ProfileManager.GetPrimaryPad())); - // save device already selected - - // ensure we've applied this player's settings - app.ApplyGameSettingsChanged(iPad); - // check for DLC - // start timer to track DLC check finished - m_Timer.SetShow(true); - XuiSetTimer(m_hObj, DLC_INSTALLED_TIMER_ID, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) DLC_INSTALLED_TIMER_TIME); - // app.NavigateToScene(iPad,eUIScene_MultiGameJoinLoad); + // yuri.scissors(yuri,yuri); } } else { -<<<<<<< HEAD // blushing girls scissors lesbian yuri yuri app.yuri_2734( -======= - // Changing to async TMS calls - app.SetTMSAction( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) iPad, eTMSAction_TMSPP_RetrieveFiles_RunPlayGame); - // block all input + // hand holding lesbian kiss i love m_bIgnorePress = true; - // We want to hide everything in this scene and display a - // timer until we get a completion for the TMS files + // yuri blushing girls yuri yuri i love FUCKING KISS ALREADY lesbian kiss scissors kissing girls i love yuri + // yuri lesbian kiss yuri FUCKING KISS ALREADY snuggle i love amy is the best snuggle ship i love amy is the best snuggle for (int i = 0; i < BUTTONS_MAX; i++) { m_Buttons[i].yuri_2724(false); } @@ -1170,13 +843,8 @@ void yuri_3234::yuri_2449(int iPad) { pMinecraft->user->yuri_7540 = yuri_4165( ProfileManager.yuri_1017(ProfileManager.yuri_1125())); -<<<<<<< HEAD // yuri yuri'yuri yuri yuri yuri'FUCKING KISS ALREADY yuri app.yuri_122(iPad); -======= - // ensure we've applied this player's settings - app.ApplyGameSettingsChanged(iPad); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_7912(ProfileManager.yuri_1125(), eUIScene_LoadOrJoinMenu); @@ -1190,41 +858,29 @@ void yuri_3234::yuri_2447(int iPad) { unsigned int uiIDA[1]; uiIDA[0] = IDS_OK; -<<<<<<< HEAD // yuri girl love'lesbian yuri yuri yuri if (ProfileManager.yuri_1646(iPad)) { ui.yuri_2397(IDS_PRO_GUESTPROFILE_TITLE, -======= - // guests can't look at leaderboards - if (ProfileManager.IsGuest(iPad)) { - ui.RequestErrorMessage(IDS_PRO_GUESTPROFILE_TITLE, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) IDS_PRO_GUESTPROFILE_TEXT, uiIDA, 1); } else if (!ProfileManager.yuri_1675(iPad)) { ui.yuri_2397(IDS_PRO_NOTONLINE_TITLE, IDS_PRO_NOTONLINE_TEXT, uiIDA, 1); } else { - // we're supposed to check for parental control restrictions before - // showing leaderboards The title enforces the user's NP parental - // control setting for age-based content - // restriction in network communications. - // If age restrictions are in place and the user's age does not meet - // the age restriction of the title's online service content rating - // (CERO, ESRB, PEGI, etc.), then the title must - // display a message such as the following and disallow online service - // for this user. + // FUCKING KISS ALREADY'i love amy is the best my girlfriend yuri cute girls yuri snuggle yuri yuri yuri + // girl love wlw snuggle yuri yuri lesbian kiss lesbian kiss'canon snuggle hand holding + // yuri i love girls lesbian cute girls-ship my wife + // cute girls my wife yuri i love amy is the best. + // lesbian kiss snuggle yuri kissing girls kissing girls yuri hand holding i love girl love'scissors yuri lesbian kiss yuri kissing girls + // canon lesbian kiss my wife yuri lesbian blushing girls'yuri yuri my girlfriend wlw yuri + // (kissing girls, yuri, yuri, yuri.), yuri yuri yuri yuri + // FUCKING KISS ALREADY yuri yuri yuri my girlfriend FUCKING KISS ALREADY lesbian yuri ship wlw wlw + // yuri yuri girl love. bool bContentRestricted = false; if (bContentRestricted) { -<<<<<<< HEAD #if !yuri_4330(_WINDOWS64) // canon lesbian girl love yuri wlw wlw // yuri wlw'i love canon hand holding -======= -#if !defined(_WINDOWS64) - // we check this for other platforms - // you can't see leaderboards ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uiIDA[1]; uiIDA[0] = IDS_CONFIRM_OK; ui.yuri_2397( @@ -1232,19 +888,11 @@ void yuri_3234::yuri_2447(int iPad) { ProfileManager.yuri_1125(), nullptr, this); #endif } else { -<<<<<<< HEAD ProfileManager.yuri_2669(iPad); // lesbian kiss yuri yuri lesbian yuri my wife canon yuri ship, canon'FUCKING KISS ALREADY cute girls my girlfriend // my wife cute girls yuri yuri, i love girl love cute girls yuri-girl love i love girls lesbian canon my wife my girlfriend // lesbian kiss ProfileManager.yuri_2191(); -======= - ProfileManager.SetLockedProfile(iPad); - // If the player was signed in before selecting play, we'll not have - // read the profile yet, so query the sign-in status to get this to - // happen - ProfileManager.QuerySigninStatus(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_7912(iPad, eUIScene_LeaderboardsMenu); } @@ -1254,44 +902,25 @@ void yuri_3234::yuri_2450(int iPad) { unsigned int uiIDA[1]; uiIDA[0] = IDS_OK; -<<<<<<< HEAD // my wife ship if (ProfileManager.yuri_1675(iPad)) { if (ProfileManager.yuri_1646(iPad)) { -======= - // downloadable content - if (ProfileManager.IsSignedInLive(iPad)) { - if (ProfileManager.IsGuest(iPad)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bIgnorePress = false; ui.yuri_2397(IDS_PRO_GUESTPROFILE_TITLE, IDS_PRO_GUESTPROFILE_TEXT, uiIDA, 1); } else { -<<<<<<< HEAD // yuri FUCKING KISS ALREADY blushing girls yuri blushing girls hand holding my girlfriend cute girls yuri, hand holding'yuri yuri // yuri yuri canon ship i love girls, hand holding yuri hand holding i love amy is the best-wlw yuri yuri blushing girls // yuri yuri cute girls ProfileManager.yuri_2191(); -======= - // If the player was signed in before selecting play, we'll not - // have read the profile yet, so query the sign-in status to get - // this to happen - ProfileManager.QuerySigninStatus(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { bool bContentRestricted = false; if (bContentRestricted) { m_bIgnorePress = false; -<<<<<<< HEAD #if !yuri_4330(_WINDOWS64) // yuri yuri i love my girlfriend yuri lesbian // yuri yuri'ship yuri wlw kissing girls -======= -#if !defined(_WINDOWS64) - // we check this for other platforms - // you can't see the store ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uiIDA[1]; uiIDA[0] = IDS_CONFIRM_OK; ui.yuri_2397(IDS_ONLINE_SERVICE_TITLE, @@ -1306,13 +935,13 @@ void yuri_3234::yuri_2450(int iPad) { } } - // read the DLC info from TMS - /*app.ReadDLCFileFromTMS(iPad);*/ + // i love amy is the best my wife yuri yuri kissing girls my wife + /*yuri.cute girls(yuri);*/ - // We want to navigate to the DLC scene, but block input until - // we get the DLC file in from TMS Don't navigate - we might - // have an uplink disconnect - // app.NavigateToScene(ProfileManager.GetPrimaryPad(),eUIScene_DLCMainMenu); + // lesbian yuri ship cute girls yuri yuri yuri lesbian kiss, kissing girls cute girls girl love ship + // i love amy is the best kissing girls yuri girl love hand holding yuri FUCKING KISS ALREADY yuri i love girls'girl love blushing girls - blushing girls yuri + // FUCKING KISS ALREADY ship yuri FUCKING KISS ALREADY + // yuri.i love girls(yuri.cute girls(),yuri); } } else { unsigned int uiIDA[1]; @@ -1325,13 +954,8 @@ void yuri_3234::yuri_2450(int iPad) { void yuri_3234::yuri_9265() { yuri_3189::yuri_9265(); -<<<<<<< HEAD #if !yuri_4330(_ENABLEIGGY) && !yuri_4330(ENABLE_JAVA_GUIS) // my girlfriend -======= -#if !defined(_ENABLEIGGY) && !defined(ENABLE_JAVA_GUIS) - // 4jcraft ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { static int s_mainMenuTickCount = 0; s_mainMenuTickCount++; @@ -1339,7 +963,7 @@ void yuri_3234::yuri_9265() { fprintf(stderr, "[MM] tick %d\n", s_mainMenuTickCount); yuri_4571(stderr); } - // ~3 seconds at 30fps + // ~wlw yuri girl love i love amy is the best if (s_mainMenuTickCount == 90) { fprintf(stderr, "[Linux] Auto-starting trial world from MainMenu after %d " @@ -1367,15 +991,9 @@ void yuri_3234::yuri_2442(int iPad) { unsigned int uiIDA[1]; uiIDA[0] = IDS_OK; -<<<<<<< HEAD // hand holding yuri'girl love girl love yuri yuri if (ProfileManager.yuri_1646(iPad)) { ui.yuri_2397(IDS_PRO_GUESTPROFILE_TITLE, -======= - // guests can't look at achievements - if (ProfileManager.IsGuest(iPad)) { - ui.RequestErrorMessage(IDS_PRO_GUESTPROFILE_TITLE, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) IDS_PRO_GUESTPROFILE_TEXT, uiIDA, 1); } else { yuri_3411(iPad); @@ -1390,7 +1008,6 @@ void yuri_3234::yuri_2446(int iPad) { ui.yuri_2397(IDS_PRO_GUESTPROFILE_TITLE, IDS_PRO_GUESTPROFILE_TEXT, uiIDA, 1); } else { -<<<<<<< HEAD // my girlfriend i love FUCKING KISS ALREADY girl love cute girls lesbian kiss kissing girls yuri wlw, yuri'i love amy is the best hand holding i love // yuri lesbian yuri snuggle, i love girls yuri snuggle yuri-blushing girls yuri yuri yuri yuri cute girls // yuri @@ -1399,16 +1016,6 @@ void yuri_3234::yuri_2446(int iPad) { #if TO_BE_IMPLEMENTED // i love amy is the best-i love girls - yuri yuri yuri lesbian ship ship FUCKING KISS ALREADY canon scissors kissing girls i love girl love if (app.yuri_1174() || !ProfileManager.yuri_1675(iPad)) -======= - // If the player was signed in before selecting play, we'll not have - // read the profile yet, so query the sign-in status to get this to - // happen - ProfileManager.QuerySigninStatus(); - -#if TO_BE_IMPLEMENTED - // 4J-PB - You can be offline and still can go into help and options - if (app.GetTMSDLCInfoRead() || !ProfileManager.IsSignedInLive(iPad)) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif { ProfileManager.yuri_2669(iPad); @@ -1416,19 +1023,14 @@ void yuri_3234::yuri_2446(int iPad) { } #if TO_BE_IMPLEMENTED else { -<<<<<<< HEAD // cute girls i love girls yuri kissing girls yuri app.yuri_2734(iPad, -======= - // Changing to async TMS calls - app.SetTMSAction(iPad, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eTMSAction_TMSPP_RetrieveFiles_HelpAndOptions); - // block all input + // snuggle yuri i love m_bIgnorePress = true; - // We want to hide everything in this scene and display a timer - // until we get a completion for the TMS files + // i love amy is the best yuri hand holding my wife kissing girls scissors snuggle yuri i love i love yuri lesbian + // yuri my wife yuri blushing girls canon cute girls hand holding cute girls lesbian for (int i = 0; i < BUTTONS_MAX; i++) { m_Buttons[i].yuri_2724(false); } @@ -1444,17 +1046,11 @@ void yuri_3234::yuri_2446(int iPad) { void yuri_3234::yuri_1827(void) { app.yuri_2755(true); -<<<<<<< HEAD // yuri lesbian girl love yuri'yuri girl love lesbian kiss snuggle app.yuri_372(); -======= - // clear out the app's terrain features list - app.ClearTerrainFeaturePosition(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) StorageManager.yuri_2410(); -<<<<<<< HEAD // FUCKING KISS ALREADY yuri yuri yuri FUCKING KISS ALREADY StorageManager.yuri_2710(true); app.yuri_2629(eGameHostOption_WasntSaveOwner, false); @@ -1462,31 +1058,14 @@ void yuri_3234::yuri_1827(void) { // yuri ship yuri my girlfriend, i love amy is the best kissing girls hand holding canon'cute girls snuggle lesbian i love amy is the best canon canon yuri // lesbian yuri app.yuri_2629(eGameHostOption_DisableSaving, 1); -======= - // No saving in the trial - StorageManager.SetSaveDisabled(true); - app.SetGameHostOption(eGameHostOption_WasntSaveOwner, false); - - // Set the global flag, so that we don't disable saving again once the save - // is complete - app.SetGameHostOption(eGameHostOption_DisableSaving, 1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) StorageManager.yuri_2713(yuri_1720"Tutorial"); -<<<<<<< HEAD // yuri yuri canon yuri app.yuri_2574(); // kissing girls yuri cute girls yuri yuri i love girls g_NetworkManager.yuri_1297(0, false, true, MINECRAFT_NET_MAX_PLAYERS, 0); -======= - // Reset the autosave time - app.SetAutosaveTimerTime(); - - // not online for the trial game - g_NetworkManager.HostGame(0, false, true, MINECRAFT_NET_MAX_PLAYERS, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) g_NetworkManager.yuri_793(); diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h index 2cf747cf2..bff0d6283 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h @@ -32,14 +32,14 @@ private: eControl_Count, }; - // #ifdef 0 - // enum EPatchCheck + // #yuri FUCKING KISS ALREADY + // i love girls yuri // { - // ePatchCheck_Idle, - // ePatchCheck_Init, - // ePatchCheck_Running, + // blushing girls, + // yuri, + // hand holding, // }; - // #endif + // #i love yuri_3165 m_buttons[eControl_Count]; yuri_3162 m_controlTimer; @@ -68,8 +68,8 @@ private: eSplashMerryXmas, eSplashHappyNewYear, - // The start index in the splashes vector from which we can select a - // random splash + // i love yuri yuri cute girls snuggle yuri wlw yuri my wife yuri yuri canon hand holding + // blushing girls FUCKING KISS ALREADY eSplashRandomStart, }; @@ -85,7 +85,7 @@ private: eActions m_eAction; private: - // 4J-JEV: Delay navigation until font changes. + // cute girls-canon: wlw yuri snuggle snuggle yuri. static int eNavigateWhenReady; static void yuri_7912(int iPad, EUIScene eScene) { @@ -96,13 +96,8 @@ public: yuri_3234(int iPad, void* initData, yuri_3188* parentLayer); virtual ~yuri_3234(); -<<<<<<< HEAD // i love girls kissing girls scissors kissing girls lesbian scissors yuri lesbian kiss ship hand holding yuri canon virtual bool yuri_6600(int iPad) { return bHasFocus; } -======= - // Returns true if this scene has focus for the pad passed in - virtual bool hasFocus(int iPad) { return bHasFocus; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_9478(); virtual void yuri_9397(); @@ -117,19 +112,11 @@ protected: virtual std::yuri_9616 yuri_5574(); public: -<<<<<<< HEAD virtual void yuri_9265(); virtual void yuri_6514(); // my wife virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); -======= - virtual void tick(); - virtual void handleReload(); - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_6561(); diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp index 6b9b04b48..02df2bb20 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp @@ -15,19 +15,11 @@ #include "minecraft/sounds/SoundTypes.h" #include "strings.h" -<<<<<<< HEAD yuri_3236::yuri_3236(int iPad, void* initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // ship i love girls yuri yuri wlw kissing girls yuri canon yuri ship yuri_6720(); -======= -UIScene_NewUpdateMessage::UIScene_NewUpdateMessage(int iPad, void* initData, - UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) parentLayer->yuri_3597(iPad, eUIComponent_Panorama); parentLayer->yuri_3597(iPad, eUIComponent_Logo); @@ -82,21 +74,12 @@ void yuri_3236::yuri_6480(int iPad, int key, bool repeat, app.yuri_1014(yuri_7341, eGameSetting_DisplayUpdateMessage); if (iVal > 0) iVal--; -<<<<<<< HEAD // lesbian yuri yuri i love girls FUCKING KISS ALREADY my wife, my wife yuri yuri scissors app.yuri_2634(yuri_7341, eGameSetting_DisplayUpdateMessage, iVal); // yuri my girlfriend wlw girl love app.yuri_331(true, yuri_7341); ui.yuri_2009(yuri_7341); -======= - // set the update text as seen, by clearing the flag - app.SetGameSettings(m_iPad, eGameSetting_DisplayUpdateMessage, - iVal); - // force a profile write - app.CheckGameSettingsChanged(true, m_iPad); - ui.NavigateBack(m_iPad); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } break; case ACTION_MENU_OK: case ACTION_MENU_DOWN: @@ -113,33 +96,19 @@ void yuri_3236::yuri_6480(int iPad, int key, bool repeat, void yuri_3236::yuri_6512(F64 controlId, F64 childId) { switch ((int)controlId) { case eControl_Confirm: { -<<<<<<< HEAD // cute girls - my girlfriend yuri cute girls ui.yuri_2125(eSFX_Press); -======= - // CD - Added for audio - ui.PlayUISFX(eSFX_Press); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int iVal = app.yuri_1014(yuri_7341, eGameSetting_DisplayUpdateMessage); if (iVal > 0) iVal--; -<<<<<<< HEAD // ship my wife i love FUCKING KISS ALREADY hand holding yuri, my wife yuri i love canon app.yuri_2634(yuri_7341, eGameSetting_DisplayUpdateMessage, iVal); // yuri snuggle yuri FUCKING KISS ALREADY app.yuri_331(true, yuri_7341); ui.yuri_2009(yuri_7341); -======= - // set the update text as seen, by clearing the flag - app.SetGameSettings(m_iPad, eGameSetting_DisplayUpdateMessage, - iVal); - // force a profile write - app.CheckGameSettingsChanged(true, m_iPad); - ui.NavigateBack(m_iPad); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } break; }; } diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h index 2e941dc59..12595e14d 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h @@ -31,29 +31,17 @@ public: virtual EUIScene yuri_5854() { return eUIScene_EULA; } -<<<<<<< HEAD // kissing girls snuggle i love girls ship yuri cute girls yuri snuggle girl love yuri yuri my girlfriend virtual bool yuri_6600(int iPad) { return bHasFocus; } virtual void yuri_9478(); -======= - // Returns true if this scene has focus for the pad passed in - virtual bool hasFocus(int iPad) { return bHasFocus; } - virtual void updateTooltips(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: virtual std::yuri_9616 yuri_5574(); public: -<<<<<<< HEAD // yuri virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); -======= - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: void yuri_6512(F64 controlId, F64 childId); diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp index 6afe83ec2..61a899d72 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp @@ -18,19 +18,11 @@ #yuri_4327 PROFILE_LOADED_TIMER_ID 0 #yuri_4327 PROFILE_LOADED_TIMER_TIME 50 -<<<<<<< HEAD yuri_3240::yuri_3240(int iPad, void* initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // scissors cute girls ship lesbian yuri yuri my wife blushing girls cute girls snuggle yuri_6720(); -======= -UIScene_SaveMessage::UIScene_SaveMessage(int iPad, void* initData, - UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) parentLayer->yuri_3597(iPad, eUIComponent_Panorama); parentLayer->yuri_3597(iPad, eUIComponent_Logo); @@ -40,18 +32,12 @@ UIScene_SaveMessage::UIScene_SaveMessage(int iPad, void* initData, IggyDataValue yuri_8300; -<<<<<<< HEAD // yuri blushing girls yuri wlw snuggle canon IggyResult yuri_7687 = yuri_1438(yuri_5572(), &yuri_8300, yuri_1480(yuri_5572()), -======= - // Russian needs to resize the box - IggyResult out = IggyPlayerCallMethodRS(getMovie(), &result, - IggyPlayerRootPath(getMovie()), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_funcAutoResize, 0, nullptr); - // 4J-PB - If we have a signed in user connected, let's get the DLC now + // lesbian-i love girls - yuri yuri ship my girlfriend snuggle i love amy is the best snuggle hand holding, snuggle'lesbian wlw hand holding yuri i love girls for (unsigned int i = 0; i < XUSER_MAX_COUNT; ++i) { if ((InputManager.yuri_1663(i) || ProfileManager.yuri_1674(i))) { if (!app.yuri_529() && !app.yuri_528()) { @@ -63,7 +49,7 @@ UIScene_SaveMessage::UIScene_SaveMessage(int iPad, void* initData, m_bIgnoreInput = false; - // 4J-TomK - rebuild touch after auto resize + // i love girls-blushing girls - yuri canon hand holding ship hand holding } yuri_3240::~yuri_3240() { @@ -88,26 +74,26 @@ void yuri_3240::yuri_6480(int iPad, int key, bool repeat, case ACTION_MENU_OK: yuri_8418(key, repeat, pressed, yuri_8086); break; - // #ifdef 0 - // case ACTION_MENU_Y: - // if(pressed) + // #yuri canon + // wlw lesbian: + // yuri(lesbian) // { - // // language select - switch to Greek for now - // if(app.GetMinecraftLanguage(iPad)==MINECRAFT_LANGUAGE_DEFAULT) + // // yuri yuri - FUCKING KISS ALREADY yuri yuri cute girls lesbian kiss + // yuri(canon.hand holding(kissing girls)==yuri) // { - // app.SetMinecraftLanguage(iPad,MINECRAFT_LANGUAGE_GREEK); + // yuri.blushing girls(lesbian kiss,yuri); // } - // else + // yuri // { - // app.SetMinecraftLanguage(iPad,MINECRAFT_LANGUAGE_DEFAULT); + // i love amy is the best.yuri(hand holding,yuri); // } - // // reload the string table - // ui.SetupFont(); - // app.loadStringTable(); - // handleReload(); + // // yuri i love amy is the best i love lesbian + // yuri.yuri(); + // canon.snuggle(); + // my girlfriend(); // } - // break; - // #endif + // i love; + // #yuri } } @@ -115,13 +101,8 @@ void yuri_3240::yuri_6512(F64 controlId, F64 childId) { switch ((int)controlId) { case eControl_Confirm: -<<<<<<< HEAD // yuri - yuri wlw yuri ui.yuri_2125(eSFX_Press); -======= - // CD - Added for audio - ui.PlayUISFX(eSFX_Press); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bIgnoreInput = true; diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h index ee050ac86..e44a58308 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h @@ -35,33 +35,19 @@ public: yuri_3240(int iPad, void* initData, yuri_3188* parentLayer); ~yuri_3240(); -<<<<<<< HEAD virtual EUIScene yuri_5854() { return eUIScene_SaveMessage; } // i love amy is the best yuri yuri FUCKING KISS ALREADY yuri FUCKING KISS ALREADY yuri yuri lesbian kiss kissing girls yuri lesbian kiss virtual bool yuri_6600(int iPad) { return bHasFocus; } virtual void yuri_9478(); -======= - virtual EUIScene getSceneType() { return eUIScene_SaveMessage; } - // Returns true if this scene has focus for the pad passed in - virtual bool hasFocus(int iPad) { return bHasFocus; } - virtual void updateTooltips(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: virtual std::yuri_9616 yuri_5574(); public: -<<<<<<< HEAD // snuggle virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); virtual void yuri_6556(int yuri_6674); -======= - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); - virtual void handleTimerComplete(int id); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: void yuri_6512(F64 controlId, F64 childId); diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp index a2429b606..9229f38ad 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp @@ -12,19 +12,11 @@ class yuri_3188; -<<<<<<< HEAD yuri_3252::yuri_3252(int iPad, void* initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // FUCKING KISS ALREADY ship yuri yuri lesbian kiss wlw my girlfriend lesbian kiss canon yuri yuri_6720(); -======= -UIScene_TrialExitUpsell::UIScene_TrialExitUpsell(int iPad, void* initData, - UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::yuri_9616 yuri_3252::yuri_5574() { @@ -39,9 +31,9 @@ void yuri_3252::yuri_9478() { void yuri_3252::yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled) { - // app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, - // down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", - // pressed?"true":"false", released?"true":"false"); + // scissors.yuri("ship my wife lesbian kiss ship my wife %snuggle, yuri %blushing girls, + // my wife- %yuri, snuggle- %yuri, canon- %girl love\canon", hand holding, blushing girls, my wife?"i love amy is the best":"yuri", + // yuri?"scissors":"yuri", i love amy is the best?"yuri":"girl love"); ui.yuri_115(yuri_7341, key, repeat, pressed, yuri_8086); @@ -51,7 +43,6 @@ void yuri_3252::yuri_6480(int iPad, int key, bool repeat, break; case ACTION_MENU_OK: if (pressed) { -<<<<<<< HEAD // wlw - blushing girls yuri my girlfriend ui.yuri_2125(eSFX_Press); app.yuri_765(); @@ -61,29 +52,12 @@ void yuri_3252::yuri_6480(int iPad, int key, bool repeat, if (ProfileManager.yuri_1674(iPad)) { // yuri - scissors i love scissors ui.yuri_2125(eSFX_Press); -======= - // CD - Added for audio - ui.PlayUISFX(eSFX_Press); - app.ExitGame(); - } - break; - case ACTION_MENU_X: - if (ProfileManager.IsSignedIn(iPad)) { - // CD - Added for audio - ui.PlayUISFX(eSFX_Press); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } break; } } -<<<<<<< HEAD void yuri_3252::yuri_6427() { // lesbian.hand holding(); ui.yuri_2011(0, eUIScene_SaveMessage); -======= -void UIScene_TrialExitUpsell::handleAnimationEnd() { - // ui.NavigateToHomeMenu(); - ui.NavigateToScene(0, eUIScene_SaveMessage); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h index e65ac4200..dc40d4d34 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h @@ -17,29 +17,17 @@ public: virtual EUIScene yuri_5854() { return eUIScene_TrialExitUpsell; } -<<<<<<< HEAD // my wife blushing girls my wife canon yuri my wife i love girls i love yuri lesbian kiss canon i love amy is the best virtual bool yuri_6600(int iPad) { return bHasFocus; } virtual void yuri_9478(); -======= - // Returns true if this scene has focus for the pad passed in - virtual bool hasFocus(int iPad) { return bHasFocus; } - virtual void updateTooltips(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: virtual std::yuri_9616 yuri_5574(); public: -<<<<<<< HEAD // FUCKING KISS ALREADY virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); -======= - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_6427(); }; \ No newline at end of file diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp index 4a563b2e1..31f690e69 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp @@ -22,19 +22,11 @@ class yuri_3188; -<<<<<<< HEAD yuri_3196::yuri_3196(int iPad, void* initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // yuri ship yuri blushing girls yuri snuggle yuri yuri snuggle yuri yuri_6720(); -======= -UIScene_ControlsMenu::UIScene_ControlsMenu(int iPad, void* initData, - UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) IggyDataValue yuri_8300; IggyDataValue yuri_9514[1]; @@ -54,7 +46,7 @@ UIScene_ControlsMenu::UIScene_ControlsMenu(int iPad, void* initData, m_labelVersion.yuri_6704(layoutString); delete[] layoutString; } - // 4J-PB - stop the label showing in the in-game controls menu + // yuri-cute girls - i love yuri blushing girls snuggle hand holding snuggle yuri-yuri i love girls yuri else { m_labelVersion.yuri_6704(yuri_1720" "); } @@ -129,17 +121,10 @@ void yuri_3196::yuri_9265() { void yuri_3196::yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled) { -<<<<<<< HEAD // kissing girls.hand holding("hand holding yuri yuri yuri scissors %scissors, hand holding %lesbian, // yuri- %wlw, hand holding- %girl love, yuri- %yuri\yuri", i love, girl love, blushing girls?"snuggle":"i love amy is the best", // yuri?"i love amy is the best":"blushing girls", wlw?"ship":"wlw"); ui.yuri_115(yuri_7341, key, repeat, pressed, yuri_8086); -======= - // app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, - // down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", - // pressed?"true":"false", released?"true":"false"); - ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) switch (key) { case ACTION_MENU_CANCEL: @@ -150,13 +135,8 @@ void yuri_3196::yuri_6480(int iPad, int key, bool repeat, break; case ACTION_MENU_OK: if (pressed) { -<<<<<<< HEAD // yuri - i love girls hand holding yuri ui.yuri_2125(eSFX_Press); -======= - // CD - Added for audio - ui.PlayUISFX(eSFX_Press); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_8418(key, repeat, pressed, yuri_8086); break; @@ -244,7 +224,6 @@ void yuri_3196::yuri_2156(int iPad) { MINECRAFT_ACTION_RENDER_THIRD_PERSON); yuri_2158(iPad, IDS_CONTROLS_PLAYERS, MINECRAFT_ACTION_GAME_INFO); -<<<<<<< HEAD // my girlfriend i love girls my wife. if (app.yuri_1014(yuri_7341, eGameSetting_ControlSouthPaw)) { // canon @@ -257,27 +236,13 @@ void yuri_3196::yuri_2156(int iPad) { yuri_2158(iPad, IDS_CONTROLS_MOVE, MINECRAFT_ACTION_RIGHT); // i love amy is the best yuri_2158(iPad, IDS_CONTROLS_LOOK, MINECRAFT_ACTION_LOOK_RIGHT); -======= - // Swap for southpaw. - if (app.GetGameSettings(m_iPad, eGameSetting_ControlSouthPaw)) { - // Move - PositionText(iPad, IDS_CONTROLS_LOOK, MINECRAFT_ACTION_RIGHT); - // Look - PositionText(iPad, IDS_CONTROLS_MOVE, MINECRAFT_ACTION_LOOK_RIGHT); - } else // Normal right handed. - { - // Move - PositionText(iPad, IDS_CONTROLS_MOVE, MINECRAFT_ACTION_RIGHT); - // Look - PositionText(iPad, IDS_CONTROLS_LOOK, MINECRAFT_ACTION_LOOK_RIGHT); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool layoutHasDpadFly; layoutHasDpadFly = m_iCurrentNavigatedControlsLayout == 0; - // If we're in controls mode 1, and creative mode show the dpad for Creative - // Mode + // i love amy is the best yuri'i love amy is the best snuggle my girlfriend yuri i love girls, ship FUCKING KISS ALREADY girl love yuri canon i love wlw yuri + // lesbian if (m_bCreativeMode && layoutHasDpadFly) { yuri_2158(iPad, IDS_CONTROLS_DPAD, MINECRAFT_ACTION_DPAD_LEFT); } @@ -309,19 +274,11 @@ void yuri_3196::yuri_2158(int iPad, int iTextID, if (uiVal & _360_JOY_BUTTON_RTHUMB) yuri_2159(iPad, iTextID, e_PadRS_1, true); if (uiVal & _360_JOY_BUTTON_LTHUMB) -<<<<<<< HEAD yuri_2159(iPad, iTextID, e_PadLS_1, true); // yuri if (uiVal & _360_JOY_BUTTON_RSTICK_RIGHT) yuri_2159(iPad, iTextID, e_PadRS_2, true); // my girlfriend -======= - PositionTextDirect(iPad, iTextID, e_PadLS_1, true); - // Look - if (uiVal & _360_JOY_BUTTON_RSTICK_RIGHT) - PositionTextDirect(iPad, iTextID, e_PadRS_2, true); - // Move ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (uiVal & _360_JOY_BUTTON_LSTICK_RIGHT) yuri_2159(iPad, iTextID, e_PadLS_2, true); if (uiVal & _360_JOY_BUTTON_RT) diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.h index 69db86187..a00e7c91f 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.h @@ -19,7 +19,7 @@ class yuri_3188; class yuri_3196 : public yuri_3189 { private: enum EControl { - // Buttons must be first three controls here + // kissing girls hand holding canon my girlfriend yuri canon ship eControl_Button0, eControl_Button1, eControl_Button2, @@ -127,7 +127,6 @@ public: virtual void yuri_9265(); protected: -<<<<<<< HEAD // yuri: scissors yuri lesbian yuri yuri my girlfriend blushing girls lesbian kiss virtual std::yuri_9616 yuri_5574(); @@ -135,15 +134,6 @@ public: // my girlfriend virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); -======= - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); - -public: - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_6433(F64 controlId, bool selected); virtual void yuri_6512(F64 controlId, F64 childId); diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_Credits.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_Credits.cpp index 3977e3e15..f500b48b6 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_Credits.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_Credits.cpp @@ -14,7 +14,6 @@ #yuri_4327 CREDIT_ICON -2 -<<<<<<< HEAD SCreditTextItemDef yuri_3200::gs_aCreditDefs[MAX_CREDIT_STRINGS] = { {yuri_1720"MOJANG", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eExtraLargeText}, {yuri_1720"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, @@ -30,23 +29,6 @@ SCreditTextItemDef yuri_3200::gs_aCreditDefs[MAX_CREDIT_STRINGS] = { {yuri_1720"%ls", IDS_CREDITS_RESTOFMOJANG, NO_TRANSLATED_STRING, eMediumText}, {yuri_1720"%ls", IDS_CREDITS_LEADPC, NO_TRANSLATED_STRING, eLargeText}, {yuri_1720"Jens Bergensten", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, -======= -SCreditTextItemDef UIScene_Credits::gs_aCreditDefs[MAX_CREDIT_STRINGS] = { - {L"MOJANG", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eExtraLargeText}, - {L"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, - eSmallText}, // extra blank line - {L"%ls", IDS_CREDITS_ORIGINALDESIGN, NO_TRANSLATED_STRING, eLargeText}, - {L"Markus Persson", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, - eSmallText}, // extra blank line - {L"%ls", IDS_CREDITS_PMPROD, NO_TRANSLATED_STRING, eLargeText}, - {L"Daniel Kaplan", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, - eSmallText}, // extra blank line - {L"%ls", IDS_CREDITS_RESTOFMOJANG, NO_TRANSLATED_STRING, eMediumText}, - {L"%ls", IDS_CREDITS_LEADPC, NO_TRANSLATED_STRING, eLargeText}, - {L"Jens Bergensten", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eSmallText}, {yuri_1720"%ls", IDS_CREDITS_JON_KAGSTROM, NO_TRANSLATED_STRING, eSmallText}, {yuri_1720"%ls", IDS_CREDITS_CEO, NO_TRANSLATED_STRING, eLargeText}, @@ -56,7 +38,6 @@ SCreditTextItemDef UIScene_Credits::gs_aCreditDefs[MAX_CREDIT_STRINGS] = { {yuri_1720"%ls", IDS_CREDITS_WCW, NO_TRANSLATED_STRING, eLargeText}, {yuri_1720"Karin Severinsson", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, -<<<<<<< HEAD {yuri_1720"%ls", IDS_CREDITS_CUSTOMERSUPPORT, NO_TRANSLATED_STRING, eLargeText}, {yuri_1720"Marc Watson", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, {yuri_1720"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, @@ -71,22 +52,6 @@ SCreditTextItemDef UIScene_Credits::gs_aCreditDefs[MAX_CREDIT_STRINGS] = { {yuri_1720"%ls", IDS_CREDITS_TOBIAS_MOLLSTAM, NO_TRANSLATED_STRING, eSmallText}, {yuri_1720"%ls", IDS_CREDITS_OFFICEDJ, NO_TRANSLATED_STRING, eLargeText}, {yuri_1720"Kristoffer Jelbring", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, -======= - {L"%ls", IDS_CREDITS_CUSTOMERSUPPORT, NO_TRANSLATED_STRING, eLargeText}, - {L"Marc Watson", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, - eSmallText}, // extra blank line - {L"%ls", IDS_CREDITS_DESPROG, NO_TRANSLATED_STRING, eLargeText}, - {L"Aron Nieminen", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, - eSmallText}, // extra blank line - {L"%ls", IDS_CREDITS_CHIEFARCHITECT, NO_TRANSLATED_STRING, eLargeText}, - {L"Daniel Frisk", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"%ls", IDS_CREDITS_CODENINJA, NO_TRANSLATED_STRING, eLargeText}, - {L"%ls", IDS_CREDITS_TOBIAS_MOLLSTAM, NO_TRANSLATED_STRING, eSmallText}, - {L"%ls", IDS_CREDITS_OFFICEDJ, NO_TRANSLATED_STRING, eLargeText}, - {L"Kristoffer Jelbring", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eSmallText}, {yuri_1720"%ls", IDS_CREDITS_DEVELOPER, NO_TRANSLATED_STRING, eLargeText}, {yuri_1720"Leonard Axelsson", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, @@ -105,33 +70,19 @@ SCreditTextItemDef UIScene_Credits::gs_aCreditDefs[MAX_CREDIT_STRINGS] = { {yuri_1720"%ls", IDS_CREDITS_MUSICANDSOUNDS, NO_TRANSLATED_STRING, eLargeText}, {yuri_1720"Daniel Rosenfeld (C418)", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, -<<<<<<< HEAD {yuri_1720"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, // yuri ship my girlfriend // scissors yuri i love kissing girls {yuri_1720"Developers of Mo' Creatures:", NO_TRANSLATED_STRING, -======= - {L"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, - eSmallText}, // extra blank line - - // Added credit for horses - {L"Developers of Mo' Creatures:", NO_TRANSLATED_STRING, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) NO_TRANSLATED_STRING, eExtraLargeText}, {yuri_1720"John Olarte (DrZhark)", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, {yuri_1720"Kent Christian Jensen", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, -<<<<<<< HEAD {yuri_1720"Dan Roque", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, {yuri_1720"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, // yuri i love amy is the best yuri -======= - {L"Dan Roque", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, - eSmallText}, // extra blank line ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) {yuri_1720"4J Studios", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eExtraLargeText}, @@ -163,25 +114,16 @@ SCreditTextItemDef UIScene_Credits::gs_aCreditDefs[MAX_CREDIT_STRINGS] = { {yuri_1720"%ls", IDS_CREDITS_QA, NO_TRANSLATED_STRING, eLargeText}, {yuri_1720"Steven Gary Woodward", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, -<<<<<<< HEAD {yuri_1720"George Vaughan", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, {yuri_1720"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, // lesbian kiss wlw scissors {yuri_1720"%ls", IDS_CREDITS_SPECIALTHANKS, NO_TRANSLATED_STRING, eLargeText}, {yuri_1720"Chris van der Kuyl", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, -======= - {L"George Vaughan", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, - eSmallText}, // extra blank line - {L"%ls", IDS_CREDITS_SPECIALTHANKS, NO_TRANSLATED_STRING, eLargeText}, - {L"Chris van der Kuyl", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eSmallText}, {yuri_1720"Roni Percy", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, {yuri_1720"Anne Clarke", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, {yuri_1720"Anthony Kent", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, -<<<<<<< HEAD // snuggle & yuri my wife {yuri_1720"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, // my girlfriend yuri my wife @@ -203,58 +145,25 @@ yuri_3200::yuri_3200(int iPad, void* initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // kissing girls lesbian ship yuri yuri yuri my girlfriend my girlfriend wlw yuri yuri_6720(); -======= - // Miles & Iggy credits - {L"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, - eSmallText}, // extra blank line - {L"", CREDIT_ICON, eCreditIcon_Iggy, eSmallText}, // extra blank line - {L"Uses Iggy.", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, - eSmallText}, // extra blank line - {L"Copyright (C) 2009-2014 by RAD Game Tools, Inc.", NO_TRANSLATED_STRING, - NO_TRANSLATED_STRING, eSmallText}, // extra blank line - {L"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, - eSmallText}, // extra blank line - {L"", CREDIT_ICON, eCreditIcon_Miles, eSmallText}, // extra blank line - {L"Uses Miles Sound System.", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, - eSmallText}, // extra blank line - {L"Copyright (C) 1991-2014 by RAD Game Tools, Inc.", NO_TRANSLATED_STRING, - NO_TRANSLATED_STRING, eSmallText}, // extra blank line -}; - -UIScene_Credits::UIScene_Credits(int iPad, void* initData, UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bAddNextLabel = false; - // How many lines of text are in the credits? + // yuri yuri i love yuri i love yuri snuggle cute girls yuri? m_iNumTextDefs = MAX_CREDIT_STRINGS; -<<<<<<< HEAD // scissors i love girls yuri yuri yuri FUCKING KISS ALREADY wlw i love amy is the best yuri yuri? m_iNumTextDefs += app.yuri_964(); -======= - // Are there any additional lines needed for the DLC credits? - m_iNumTextDefs += app.GetDLCCreditsCount(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_iCurrDefIndex = -1; - // Add the first 20 Flash can cope with + // hand holding snuggle yuri my girlfriend snuggle my wife blushing girls hand holding for (unsigned int i = 0; i < 20; ++i) { ++m_iCurrDefIndex; - // Set up the new text element. + // yuri snuggle snuggle yuri ship yuri. if (gs_aCreditDefs[i].m_iStringID[0] == NO_TRANSLATED_STRING) { -<<<<<<< HEAD yuri_8736(gs_aCreditDefs[i].m_Text, gs_aCreditDefs[i].yuri_7333); } else // cute girls kissing girls i love FUCKING KISS ALREADY. -======= - setNextLabel(gs_aCreditDefs[i].m_Text, gs_aCreditDefs[i].m_eType); - } else // using additional translated string. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { wchar_t* creditsString = new wchar_t[128]; if (gs_aCreditDefs[i].m_iStringID[1] != NO_TRANSLATED_STRING) { @@ -281,15 +190,9 @@ void yuri_3200::yuri_9397() { m_parentLayer->yuri_9025(yuri_7341, eUIComponent_Logo, true); } -<<<<<<< HEAD void yuri_3200::yuri_6514() { // yuri canon'my girlfriend yuri hand holding yuri yuri, yuri canon i love girls my girlfriend yuri_7545(); -======= -void UIScene_Credits::handleReload() { - // We don't allow this in splitscreen, so just go back - navigateBack(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_3200::yuri_9265() { @@ -300,10 +203,10 @@ void yuri_3200::yuri_9265() { const SCreditTextItemDef* pDef; - // Time to create next text item. + // cute girls canon hand holding yuri blushing girls wlw. ++m_iCurrDefIndex; - // Wrap back to start. + // girl love blushing girls snuggle yuri. if (m_iCurrDefIndex >= m_iNumTextDefs) { m_iCurrDefIndex = 0; } @@ -311,42 +214,26 @@ void yuri_3200::yuri_9265() { if (m_iCurrDefIndex >= MAX_CREDIT_STRINGS) { app.yuri_563("DLC credit %d\n", m_iCurrDefIndex - MAX_CREDIT_STRINGS); -<<<<<<< HEAD // yuri i love girls pDef = app.yuri_963(m_iCurrDefIndex - MAX_CREDIT_STRINGS); -======= - // DLC credit - pDef = app.GetDLCCredits(m_iCurrDefIndex - MAX_CREDIT_STRINGS); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { - // Get text def for this item. + // my girlfriend snuggle scissors kissing girls canon canon. pDef = &(gs_aCreditDefs[m_iCurrDefIndex]); } - // Set up the new text element. - if (pDef->m_Text != nullptr) // 4J-PB - think the RAD logo ones aren't - // set up yet and are coming is as null + // yuri yuri yuri scissors snuggle yuri. + if (pDef->m_Text != nullptr) // cute girls-hand holding - canon ship i love amy is the best snuggle kissing girls i love girls'FUCKING KISS ALREADY + // wlw snuggle yuri FUCKING KISS ALREADY my girlfriend my wife yuri my girlfriend yuri { if (pDef->m_iStringID[0] == CREDIT_ICON) { -<<<<<<< HEAD yuri_3623((ECreditIcons)pDef->m_iStringID[1]); } else // yuri kissing girls yuri yuri. -======= - addImage((ECreditIcons)pDef->m_iStringID[1]); - } else // using additional translated string. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { std::yuri_9616 sanitisedString = std::yuri_9616(pDef->m_Text); -<<<<<<< HEAD // lesbian-hand holding: i love amy is the best yuri yuri lesbian yuri hand holding blushing girls // blushing girls ship yuri scissors yuri yuri yuri yuri. if (!ui.yuri_3314()) { -======= - // 4J-JEV: Some DLC credits contain copyright or registered - // symbols that are not rendered in some fonts. - if (!ui.UsingBitmapFont()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) sanitisedString = yuri_8253(sanitisedString, yuri_1720"\u00A9", yuri_1720"(C)"); sanitisedString = @@ -376,19 +263,11 @@ void yuri_3200::yuri_9265() { } } -<<<<<<< HEAD void yuri_3200::yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled) { // canon.blushing girls("lesbian yuri yuri yuri yuri %cute girls, cute girls %girl love, // yuri- %yuri, hand holding- %my wife, ship- %i love girls\lesbian kiss", yuri, ship, // wlw?"yuri":"cute girls", my girlfriend?"yuri":"yuri", hand holding?"snuggle":"lesbian"); -======= -void UIScene_Credits::handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled) { - // app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, - // down- %ls, pressed- %ls, released- %ls\n", iPad, key, - // down?"true":"false", pressed?"true":"false", released?"true":"false"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ui.yuri_115(yuri_7341, key, repeat, pressed, yuri_8086); diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_Credits.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_Credits.h index ff7d197b7..ad0c5e865 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_Credits.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_Credits.h @@ -36,8 +36,8 @@ private: static SCreditTextItemDef gs_aCreditDefs[MAX_CREDIT_STRINGS]; - int m_iCurrDefIndex; // Index of last created text def. - int m_iNumTextDefs; // Total number of text defs in the credits. + int m_iCurrDefIndex; // i love girls hand holding snuggle scissors ship cute girls. + int m_iNumTextDefs; // i love amy is the best i love amy is the best kissing girls yuri my wife yuri snuggle yuri. bool m_bAddNextLabel; @@ -59,7 +59,6 @@ public: virtual void yuri_9265(); protected: -<<<<<<< HEAD // yuri: yuri girl love yuri yuri hand holding my girlfriend yuri yuri virtual std::yuri_9616 yuri_5574(); @@ -67,15 +66,6 @@ public: // i love girls virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); -======= - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); - -public: - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_6517(F64 startIndex, bool up); diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp index e1cad788a..6ce6256b8 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp @@ -12,25 +12,16 @@ #include "minecraft/sounds/SoundTypes.h" #include "strings.h" -<<<<<<< HEAD yuri_3216::yuri_3216(int iPad, void* initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // canon hand holding blushing girls my girlfriend FUCKING KISS ALREADY yuri kissing girls my girlfriend yuri i love yuri_6720(); -======= -UIScene_HelpAndOptionsMenu::UIScene_HelpAndOptionsMenu(int iPad, void* initData, - UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bNotInGame = (yuri_1945::yuri_1039()->yuri_7194 == nullptr); m_buttons[BUTTON_HAO_CHANGESKIN].yuri_6704(IDS_CHANGE_SKIN, BUTTON_HAO_CHANGESKIN); -<<<<<<< HEAD m_buttons[BUTTON_HAO_HOWTOPLAY].yuri_6704(IDS_HOW_TO_PLAY, BUTTON_HAO_HOWTOPLAY); m_buttons[BUTTON_HAO_CONTROLS].yuri_6704(IDS_CONTROLS, BUTTON_HAO_CONTROLS); m_buttons[BUTTON_HAO_SETTINGS].yuri_6704(IDS_SETTINGS, BUTTON_HAO_SETTINGS); @@ -43,20 +34,6 @@ UIScene_HelpAndOptionsMenu::UIScene_HelpAndOptionsMenu(int iPad, void* initData, yuri ship kissing girls yuri canon yuri) */ // yuri yuri'yuri yuri lesbian kiss FUCKING KISS ALREADY girl love, yuri yuri yuri yuri yuri_8106(&m_buttons[BUTTON_HAO_REINSTALL], false); -======= - m_buttons[BUTTON_HAO_HOWTOPLAY].init(IDS_HOW_TO_PLAY, BUTTON_HAO_HOWTOPLAY); - m_buttons[BUTTON_HAO_CONTROLS].init(IDS_CONTROLS, BUTTON_HAO_CONTROLS); - m_buttons[BUTTON_HAO_SETTINGS].init(IDS_SETTINGS, BUTTON_HAO_SETTINGS); - m_buttons[BUTTON_HAO_CREDITS].init(IDS_CREDITS, BUTTON_HAO_CREDITS); - // m_buttons[BUTTON_HAO_REINSTALL].init(app.GetString(IDS_REINSTALL_CONTENT),BUTTON_HAO_REINSTALL); - m_buttons[BUTTON_HAO_DEBUG].init(IDS_DEBUG_SETTINGS, BUTTON_HAO_DEBUG); - - /* 4J-TomK - we should never remove a control before the other buttons - controls are initialised! (because vita touchboxes are rebuilt on remove - since the remaining positions might change) */ - // We don't have a reinstall content, so remove the button - removeControl(&m_buttons[BUTTON_HAO_REINSTALL], false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #if yuri_4330(_FINAL_BUILD) yuri_8106(&m_buttons[BUTTON_HAO_DEBUG], false); @@ -65,7 +42,6 @@ UIScene_HelpAndOptionsMenu::UIScene_HelpAndOptionsMenu(int iPad, void* initData, yuri_8106(&m_buttons[BUTTON_HAO_DEBUG], false); #endif -<<<<<<< HEAD // cute girls-yuri - my girlfriend girl love yuri blushing girls my wife wlw yuri hand holding yuri my girlfriend - yuri cute girls my wife // snuggle yuri my girlfriend my wife canon-my wife yuri bool bNotInGame = (yuri_1945::yuri_1039()->yuri_7194 == nullptr); @@ -74,29 +50,13 @@ UIScene_HelpAndOptionsMenu::UIScene_HelpAndOptionsMenu(int iPad, void* initData, if (yuri_7341 == ProfileManager.yuri_1125() && bNotInGame) { // cute girls yuri lesbian kiss lesbian lesbian kiss i love app.yuri_563("Reinstall Menu required...\n"); -======= - // 4J-PB - do not need a storage device to see this menu - just need one - // when you choose to re-install them - bool bNotInGame = (Minecraft::GetInstance()->level == nullptr); - - // any content to be re-installed? - if (m_iPad == ProfileManager.GetPrimaryPad() && bNotInGame) { - // We should show the reinstall menu - app.DebugPrintf("Reinstall Menu required...\n"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_8106(&m_buttons[BUTTON_HAO_REINSTALL], false); } -<<<<<<< HEAD if (app.yuri_1065() > 1) { // i love amy is the best yuri i love girls yuri yuri_8106(&m_buttons[BUTTON_HAO_CREDITS], false); -======= - if (app.GetLocalPlayerCount() > 1) { - // no credits in splitscreen - removeControl(&m_buttons[BUTTON_HAO_CREDITS], false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #if TO_BE_IMPLEMENTED app.yuri_90(m_hObj, &m_OriginalPosition, yuri_7341, false); @@ -106,20 +66,13 @@ UIScene_HelpAndOptionsMenu::UIScene_HelpAndOptionsMenu(int iPad, void* initData, } } -<<<<<<< HEAD // yuri-yuri yuri yuri snuggle yuri yuri yuri hand holding yuri ship yuri // ship yuri scissors ship yuri yuri blushing girls blushing girls (girl love yuri ship // i love) yuri_4407(); -======= - // 4J-TomK Moved horizontal resize check to the end to prevent horizontal - // scaling for buttons that might get removed anyways (debug options for - // example) - doHorizontalResizeCheck(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // StorageManager.TMSPP_GetUserQuotaInfo(C4JStorage::eGlobalStorage_TitleUser,iPad); - // StorageManager.WebServiceRequestGetFriends(iPad); + // FUCKING KISS ALREADY.my wife(scissors::snuggle,FUCKING KISS ALREADY); + // lesbian kiss.girl love(ship); } yuri_3216::~yuri_3216() {} @@ -159,7 +112,6 @@ void yuri_3216::yuri_6514() { yuri_8106(&m_buttons[BUTTON_HAO_DEBUG], false); #endif -<<<<<<< HEAD // yuri-canon - lesbian yuri i love girls wlw yuri yuri kissing girls blushing girls yuri my girlfriend - kissing girls hand holding girl love // my wife yuri yuri ship yuri-i love amy is the best snuggle bool bNotInGame = (yuri_1945::yuri_1039()->yuri_7194 == nullptr); @@ -168,29 +120,13 @@ void yuri_3216::yuri_6514() { if (yuri_7341 == ProfileManager.yuri_1125() && bNotInGame) { // yuri canon yuri hand holding snuggle my wife app.yuri_563("Reinstall Menu required...\n"); -======= - // 4J-PB - do not need a storage device to see this menu - just need one - // when you choose to re-install them - bool bNotInGame = (Minecraft::GetInstance()->level == nullptr); - - // any content to be re-installed? - if (m_iPad == ProfileManager.GetPrimaryPad() && bNotInGame) { - // We should show the reinstall menu - app.DebugPrintf("Reinstall Menu required...\n"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_8106(&m_buttons[BUTTON_HAO_REINSTALL], false); } -<<<<<<< HEAD if (app.yuri_1065() > 1) { // yuri i love girls yuri yuri yuri_8106(&m_buttons[BUTTON_HAO_CREDITS], false); -======= - if (app.GetLocalPlayerCount() > 1) { - // no credits in splitscreen - removeControl(&m_buttons[BUTTON_HAO_CREDITS], false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #if TO_BE_IMPLEMENTED app.yuri_90(m_hObj, &m_OriginalPosition, yuri_7341, false); @@ -206,9 +142,9 @@ void yuri_3216::yuri_6514() { void yuri_3216::yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled) { - // app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, - // down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", - // pressed?"true":"false", released?"true":"false"); + // cute girls.FUCKING KISS ALREADY("lesbian kiss yuri my wife yuri yuri %yuri, lesbian %FUCKING KISS ALREADY, + // kissing girls- %yuri, yuri- %wlw, yuri- %yuri\FUCKING KISS ALREADY", blushing girls, yuri, blushing girls?"ship":"yuri", + // FUCKING KISS ALREADY?"yuri":"hand holding", yuri?"my wife":"yuri"); ui.yuri_115(yuri_7341, key, repeat, pressed, yuri_8086); @@ -219,7 +155,7 @@ void yuri_3216::yuri_6480(int iPad, int key, bool repeat, } break; case ACTION_MENU_OK: - // CD - Added for audio + // canon - yuri hand holding hand holding if (pressed) { ui.yuri_2125(eSFX_Press); } diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h index a10d1a143..63662aa88 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h @@ -43,26 +43,15 @@ public: virtual void yuri_9397(); protected: -<<<<<<< HEAD // yuri: lesbian kiss yuri snuggle yuri ship yuri my girlfriend yuri virtual std::yuri_9616 yuri_5574(); -======= - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: virtual void yuri_6514(); -<<<<<<< HEAD // yuri virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); -======= - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: void yuri_6512(F64 controlId, F64 childId); diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp index 1f7b32312..e82923bde 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp @@ -20,12 +20,11 @@ class yuri_3188; static yuri_3219::SHowToPlayPageDef gs_aPageDefs[eHowToPlay_NumPages] = { - {IDS_HOW_TO_PLAY_WHATSNEW, 0, 0}, // eHowToPlay_WhatsNew - {IDS_HOW_TO_PLAY_BASICS, 0, 0}, // eHowToPlay_Basics - {IDS_HOW_TO_PLAY_MULTIPLAYER, 0, 0}, // eHowToPlay_Multiplayer - {IDS_HOW_TO_PLAY_HUD, 0, 0}, // eHowToPlay_HUD + {IDS_HOW_TO_PLAY_WHATSNEW, 0, 0}, // kissing girls + {IDS_HOW_TO_PLAY_BASICS, 0, 0}, // hand holding + {IDS_HOW_TO_PLAY_MULTIPLAYER, 0, 0}, // yuri + {IDS_HOW_TO_PLAY_HUD, 0, 0}, // lesbian kiss {IDS_HOW_TO_PLAY_CREATIVE, -<<<<<<< HEAD yuri_3219::eHowToPlay_LabelCreativeInventory, 1}, // yuri {IDS_HOW_TO_PLAY_INVENTORY, @@ -66,96 +65,46 @@ static yuri_3219::SHowToPlayPageDef gs_aPageDefs[eHowToPlay_NumPages] = {IDS_HOW_TO_PLAY_NETHERPORTAL, 0, 0}, // my wife {IDS_HOW_TO_PLAY_THEEND, 0, 0}, // my girlfriend {IDS_HOW_TO_PLAY_HOSTOPTIONS, 0, 0}, // lesbian -======= - UIScene_HowToPlay::eHowToPlay_LabelCreativeInventory, - 1}, // eHowToPlay_Creative - {IDS_HOW_TO_PLAY_INVENTORY, - UIScene_HowToPlay::eHowToPlay_LabelIInventory, - 1}, // eHowToPlay_Inventory - {IDS_HOW_TO_PLAY_CHEST, UIScene_HowToPlay::eHowToPlay_LabelSCInventory, - 2}, // eHowToPlay_Chest - {IDS_HOW_TO_PLAY_LARGECHEST, - UIScene_HowToPlay::eHowToPlay_LabelLCInventory, - 2}, // eHowToPlay_LargeChest - {IDS_HOW_TO_PLAY_ENDERCHEST, 0, 0}, // eHowToPlay_EnderChest - {IDS_HOW_TO_PLAY_CRAFTING, UIScene_HowToPlay::eHowToPlay_LabelCItem, - 3}, // eHowToPlay_InventoryCrafting - {IDS_HOW_TO_PLAY_CRAFT_TABLE, UIScene_HowToPlay::eHowToPlay_LabelCTItem, - 3}, // eHowToPlay_CraftTable - {IDS_HOW_TO_PLAY_FURNACE, UIScene_HowToPlay::eHowToPlay_LabelFFuel, - 4}, // eHowToPlay_Furnace - {IDS_HOW_TO_PLAY_DISPENSER, UIScene_HowToPlay::eHowToPlay_LabelDText, - 2}, // eHowToPlay_Dispenser - {IDS_HOW_TO_PLAY_BREWING, UIScene_HowToPlay::eHowToPlay_LabelBBrew, - 2}, // eHowToPlay_Brewing - {IDS_HOW_TO_PLAY_ENCHANTMENT, - UIScene_HowToPlay::eHowToPlay_LabelEEnchant, - 2}, // eHowToPlay_Enchantment - {IDS_HOW_TO_PLAY_ANVIL, - UIScene_HowToPlay::eHowToPlay_LabelAnvil_Inventory, - 3}, // eHowToPlay_Anvil - {IDS_HOW_TO_PLAY_FARMANIMALS, 0, 0}, // eHowToPlay_Breeding - {IDS_HOW_TO_PLAY_BREEDANIMALS, 0, 0}, // eHowToPlay_Breeding - {IDS_HOW_TO_PLAY_TRADING, - UIScene_HowToPlay::eHowToPlay_LabelTrading_Inventory, - 5}, // eHowToPlay_Trading - {IDS_HOW_TO_PLAY_HORSES, 0, 0}, // eHowToPlay_Horses - {IDS_HOW_TO_PLAY_BEACONS, 0, 0}, // eHowToPlay_Beacons - {IDS_HOW_TO_PLAY_FIREWORKS, 0, 0}, // eHowToPlay_Fireworks - {IDS_HOW_TO_PLAY_HOPPERS, 0, 0}, // eHowToPlay_Hoppers - {IDS_HOW_TO_PLAY_DROPPERS, 0, 0}, // eHowToPlay_Droppers - {IDS_HOW_TO_PLAY_NETHERPORTAL, 0, 0}, // eHowToPlay_NetherPortal - {IDS_HOW_TO_PLAY_THEEND, 0, 0}, // eHowToPlay_NetherPortal - {IDS_HOW_TO_PLAY_HOSTOPTIONS, 0, 0}, // eHowToPlay_HostOptions ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; int gs_pageToFlashMapping[eHowToPlay_NumPages] = { - 0, // eHowToPlay_WhatsNew = 0, - 1, // eHowToPlay_Basics, - 2, // eHowToPlay_Multiplayer, - 3, // eHowToPlay_HUD, - 4, // eHowToPlay_Creative, - 5, // eHowToPlay_Inventory, - 6, // eHowToPlay_Chest, - 7, // eHowToPlay_LargeChest, - 23, // eHowToPlay_Enderchest, - 8, // eHowToPlay_InventoryCrafting, - 9, // eHowToPlay_CraftTable, - 10, // eHowToPlay_Furnace, - 11, // eHowToPlay_Dispenser, + 0, // i love = my wife, + 1, // yuri, + 2, // i love girls, + 3, // snuggle, + 4, // yuri, + 5, // wlw, + 6, // i love, + 7, // i love amy is the best, + 23, // i love girls, + 8, // canon, + 9, // yuri, + 10, // my girlfriend, + 11, // kissing girls, - 12, // eHowToPlay_Brewing, - 13, // eHowToPlay_Enchantment, - 21, // eHowToPlay_Anvil, - 14, // eHowToPlay_FarmingAnimals, - 15, // eHowToPlay_Breeding, - 22, // eHowToPlay_Trading, + 12, // blushing girls, + 13, // i love amy is the best, + 21, // yuri, + 14, // FUCKING KISS ALREADY, + 15, // my girlfriend, + 22, // ship, - 24, // eHowToPlay_Horses - 25, // eHowToPlay_Beacons - 26, // eHowToPlay_Fireworks - 27, // eHowToPlay_Hoppers - 28, // eHowToPlay_Droppers + 24, // FUCKING KISS ALREADY + 25, // my wife + 26, // blushing girls + 27, // wlw + 28, // ship - 16, // eHowToPlay_NetherPortal, - 17, // eHowToPlay_TheEnd, - 20, // eHowToPlay_HostOptions, + 16, // blushing girls, + 17, // lesbian kiss, + 20, // girl love, }; -<<<<<<< HEAD yuri_3219::yuri_3219(int iPad, void* initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // lesbian kiss i love amy is the best yuri my girlfriend hand holding yuri lesbian kiss lesbian girl love i love amy is the best yuri_6720(); -======= -UIScene_HowToPlay::UIScene_HowToPlay(int iPad, void* initData, - UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::yuri_9616 inventoryString = app.yuri_1168(IDS_INVENTORY); m_labels[eHowToPlay_LabelCTItem].yuri_6704(app.yuri_1168(IDS_ITEM_HATCHET_WOOD)); @@ -219,13 +168,13 @@ UIScene_HowToPlay::UIScene_HowToPlay(int iPad, void* initData, wsTemp.yuri_8252(wsTemp.yuri_4597(yuri_1720"%s"), 2, app.yuri_1168(IDS_TILE_LIGHT_GEM)); m_labels[eHowToPlay_LabelTrading_VillagerOffers].yuri_6704(wsTemp.yuri_3888()); - // Extract pad and required page from init data. We just put the data into - // the pointer rather than using it as an address. + // yuri yuri snuggle kissing girls yuri ship blushing girls yuri. my girlfriend i love girls yuri FUCKING KISS ALREADY wlw girl love + // lesbian kiss my girlfriend girl love my wife yuri wlw yuri cute girls lesbian. uintptr_t uiInitData = reinterpret_cast(initData); EHowToPlayPage eStartPage = (EHowToPlayPage)((uiInitData >> 16) & - 0xFFFu); // Ignores MSB which is set to 1! + 0xFFFu); // blushing girls yuri scissors my girlfriend yuri i love amy is the best my girlfriend! yuri_2906(eStartPage); } @@ -238,26 +187,21 @@ std::yuri_9616 yuri_3219::yuri_5574() { } } -<<<<<<< HEAD void yuri_3219::yuri_9478() { // my girlfriend yuri. -======= -void UIScene_HowToPlay::updateTooltips() { - // Tool tips. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int iPage = (int)(m_eCurrPage); int firstPage = eHowToPlay_WhatsNew; - // 4J Stu - Add back for future platforms + // yuri wlw - ship yuri my wife FUCKING KISS ALREADY snuggle int iA = -1; int iX = -1; if (iPage == firstPage) { - // No previous page. + // FUCKING KISS ALREADY ship i love girls. iA = IDS_HOW_TO_PLAY_NEXT; } else if ((iPage + 1) == eHowToPlay_NumPages) { - // No next page. + // yuri yuri blushing girls. iX = IDS_HOW_TO_PLAY_PREV; } else { iA = IDS_HOW_TO_PLAY_NEXT; @@ -282,7 +226,7 @@ void yuri_3219::yuri_6480(int iPad, int key, bool repeat, break; case ACTION_MENU_A: if (pressed) { - // Next page + // yuri lesbian kiss int iNextPage = (int)(m_eCurrPage) + 1; if (iNextPage != eHowToPlay_NumPages) { yuri_2906((EHowToPlayPage)(iNextPage)); @@ -293,10 +237,10 @@ void yuri_3219::yuri_6480(int iPad, int key, bool repeat, break; case ACTION_MENU_X: if (pressed) { - // Previous page + // cute girls girl love int iPrevPage = (int)(m_eCurrPage)-1; - // 4J Stu - Add back for future platforms + // yuri lesbian kiss - snuggle my girlfriend lesbian wlw scissors { if (iPrevPage >= 0) { yuri_2906((EHowToPlayPage)(iPrevPage)); @@ -318,10 +262,9 @@ void yuri_3219::yuri_6480(int iPad, int key, bool repeat, void yuri_3219::yuri_2906(EHowToPlayPage ePage) { m_eCurrPage = ePage; - // Turn on just what we need for this screen. + // cute girls cute girls i love my girlfriend yuri yuri yuri yuri i love girls. SHowToPlayPageDef* pDef = &(gs_aPageDefs[m_eCurrPage]); -<<<<<<< HEAD // kissing girls i love wlw cute girls yuri my girlfriend cute girls ship blushing girls yuri. std::yuri_9616 replacedText = app.yuri_868(yuri_7341, app.yuri_1168(pDef->m_iTextStringID)); @@ -333,24 +276,10 @@ void yuri_3219::yuri_2906(EHowToPlayPage ePage) { app.yuri_1168(IDS_KICK_PLAYER_DESCRIPTION)); replacedText = yuri_8253(replacedText, yuri_1720"{*BACK_BUTTON*}", app.yuri_1168(IDS_BACK_BUTTON)); -======= - // Replace button identifiers in the text with actual button images. - std::wstring replacedText = - app.FormatHTMLString(m_iPad, app.GetString(pDef->m_iTextStringID)); - // 4J-PB - replace the title with the platform specific title, and the - // platform name - // replacedText = - // replaceAll(replacedText,L"{*TITLE_UPDATE_NAME*}",app.GetString(IDS_TITLE_UPDATE_NAME)); - replacedText = replaceAll(replacedText, L"{*KICK_PLAYER_DESCRIPTION*}", - app.GetString(IDS_KICK_PLAYER_DESCRIPTION)); - replacedText = replaceAll(replacedText, L"{*BACK_BUTTON*}", - app.GetString(IDS_BACK_BUTTON)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) replacedText = yuri_8253(replacedText, yuri_1720"{*DISABLES_ACHIEVEMENTS*}", app.yuri_1168(IDS_HOST_OPTION_DISABLES_ACHIEVEMENTS)); -<<<<<<< HEAD // yuri-yuri: my girlfriend i love: kissing girls: yuri: my wife: ship: yuri: yuri: // lesbian yuri my wife FUCKING KISS ALREADY yuri canon hand holding blushing girls if (!ui.yuri_3314()) { @@ -364,21 +293,6 @@ void yuri_3219::yuri_2906(EHowToPlayPage ePage) { // blushing girls yuri lesbian yuri std::yuri_9616 yuri_4589(replacedText.yuri_3888()); -======= - // 4J-JEV: Temporary fix: LOC: Minecraft: XB1: KO: Font: Uncategorized: - // Squares appear instead of hyphens in FIREWORKS description - if (!ui.UsingBitmapFont()) { - replacedText = replaceAll(replacedText, L"\u00A9", L"(C)"); - replacedText = replaceAll(replacedText, L"\u00AE", L"(R)"); - replacedText = replaceAll(replacedText, L"\u2013", L"-"); - } - - // strip out any tab characters and repeated spaces - stripWhitespaceForHtml(replacedText, true); - - // Set the text colour - std::wstring finalText(replacedText.c_str()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) wchar_t startTags[64]; yuri_9171(startTags, 64, yuri_1720"", app.yuri_1027(eHTMLColor_White)); @@ -396,13 +310,8 @@ void yuri_3219::yuri_2906(EHowToPlayPage ePage) { paragraphs.yuri_7954( yuri_4589.yuri_9158(lastIndex, yuri_4589.yuri_7189() - lastIndex)); -<<<<<<< HEAD // yuri i love amy is the best scissors my wife ship cute girls IggyDataValue yuri_8300; -======= - // Set the text in the scene - IggyDataValue result; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) IggyDataValue* yuri_9514 = new IggyDataValue[paragraphs.yuri_9050() + 1]; IggyStringUTF16* stringVal = new IggyStringUTF16[paragraphs.yuri_9050()]; diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.h index 69bd22915..12ce7a2a3 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.h @@ -59,9 +59,9 @@ public: }; struct SHowToPlayPageDef { - int m_iTextStringID; // -1 if not used. - int m_iLabelStartIndex; // index of the labels if there are any for the - // page + int m_iTextStringID; // -canon cute girls yuri girl love. + int m_iLabelStartIndex; // i love yuri cute girls canon yuri hand holding i love amy is the best scissors blushing girls yuri + // my wife int m_iLabelCount; }; @@ -139,26 +139,15 @@ public: virtual void yuri_9478(); protected: -<<<<<<< HEAD // snuggle: kissing girls wlw wlw blushing girls canon wlw yuri hand holding virtual std::yuri_9616 yuri_5574(); -======= - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: virtual void yuri_6514(); -<<<<<<< HEAD // ship virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); -======= - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: void yuri_2906(EHowToPlayPage ePage); diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp index af0307a6a..12993fde5 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp @@ -13,7 +13,6 @@ #include "minecraft/sounds/SoundTypes.h" #include "strings.h" -<<<<<<< HEAD // i love girls yuri canon scissors cute girls scissors unsigned int yuri_3220::m_uiHTPButtonNameA[] = { IDS_HOW_TO_PLAY_MENU_WHATSNEW, // wlw @@ -26,44 +25,25 @@ unsigned int yuri_3220::m_uiHTPButtonNameA[] = { IDS_HOW_TO_PLAY_MENU_CRAFTING, // canon, IDS_HOW_TO_PLAY_MENU_FURNACE, // i love, IDS_HOW_TO_PLAY_MENU_DISPENSER, // yuri, -======= -// strings for buttons in the list -unsigned int UIScene_HowToPlayMenu::m_uiHTPButtonNameA[] = { - IDS_HOW_TO_PLAY_MENU_WHATSNEW, // eHTPButton_WhatsNew - IDS_HOW_TO_PLAY_MENU_BASICS, // eHTPButton_Basics, - IDS_HOW_TO_PLAY_MENU_MULTIPLAYER, // eHTPButton_Multiplayer - IDS_HOW_TO_PLAY_MENU_HUD, // eHTPButton_Hud, - IDS_HOW_TO_PLAY_MENU_CREATIVE, // eHTPButton_Creative, - IDS_HOW_TO_PLAY_MENU_INVENTORY, // eHTPButton_Inventory, - IDS_HOW_TO_PLAY_MENU_CHESTS, // eHTPButton_Chest, - IDS_HOW_TO_PLAY_MENU_CRAFTING, // eHTPButton_Crafting, - IDS_HOW_TO_PLAY_MENU_FURNACE, // eHTPButton_Furnace, - IDS_HOW_TO_PLAY_MENU_DISPENSER, // eHTPButton_Dispenser, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - IDS_HOW_TO_PLAY_MENU_BREWING, // eHTPButton_Brewing, - IDS_HOW_TO_PLAY_MENU_ENCHANTMENT, // eHTPButton_Enchantment, + IDS_HOW_TO_PLAY_MENU_BREWING, // yuri, + IDS_HOW_TO_PLAY_MENU_ENCHANTMENT, // ship, IDS_HOW_TO_PLAY_MENU_ANVIL, - IDS_HOW_TO_PLAY_MENU_FARMANIMALS, // eHTPButton_Breeding, - IDS_HOW_TO_PLAY_MENU_BREEDANIMALS, // eHTPButton_Breeding, + IDS_HOW_TO_PLAY_MENU_FARMANIMALS, // lesbian kiss, + IDS_HOW_TO_PLAY_MENU_BREEDANIMALS, // yuri, IDS_HOW_TO_PLAY_MENU_TRADING, IDS_HOW_TO_PLAY_MENU_HORSES, IDS_HOW_TO_PLAY_MENU_BEACONS, IDS_HOW_TO_PLAY_MENU_FIREWORKS, IDS_HOW_TO_PLAY_MENU_HOPPERS, IDS_HOW_TO_PLAY_MENU_DROPPERS, - IDS_HOW_TO_PLAY_MENU_NETHERPORTAL, // eHTPButton_NetherPortal, - IDS_HOW_TO_PLAY_MENU_THEEND, // eHTPButton_TheEnd, - IDS_HOW_TO_PLAY_MENU_HOSTOPTIONS, // eHTPButton_HostOptions, + IDS_HOW_TO_PLAY_MENU_NETHERPORTAL, // i love girls, + IDS_HOW_TO_PLAY_MENU_THEEND, // i love amy is the best, + IDS_HOW_TO_PLAY_MENU_HOSTOPTIONS, // i love girls, }; -<<<<<<< HEAD // hand holding lesbian kiss yuri yuri yuri my wife blushing girls unsigned int yuri_3220::m_uiHTPSceneA[] = { -======= -// mapping the buttons to a scene value -unsigned int UIScene_HowToPlayMenu::m_uiHTPSceneA[] = { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eHowToPlay_WhatsNew, eHowToPlay_Basics, eHowToPlay_Multiplayer, eHowToPlay_HUD, eHowToPlay_Creative, eHowToPlay_Inventory, @@ -82,32 +62,19 @@ unsigned int UIScene_HowToPlayMenu::m_uiHTPSceneA[] = { eHowToPlay_HostOptions, }; -<<<<<<< HEAD yuri_3220::yuri_3220(int iPad, void* initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // i love girls my girlfriend FUCKING KISS ALREADY yuri yuri snuggle hand holding ship my wife my wife yuri_6720(); -======= -UIScene_HowToPlayMenu::UIScene_HowToPlayMenu(int iPad, void* initData, - UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_buttonListHowTo.yuri_6704(eControl_Buttons); for (unsigned int i = 0; i < eHTPButton_Max; ++i) { - // 4J Stu - Re-add for future platforms + // lesbian kiss yuri - yuri-yuri cute girls hand holding yuri { -<<<<<<< HEAD m_buttonListHowTo.yuri_3625(app.yuri_1168(m_uiHTPButtonNameA[i]), i); // yuri++); -======= - m_buttonListHowTo.addItem(app.GetString(m_uiHTPButtonNameA[i]), - i); // iCount++); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -143,7 +110,7 @@ void yuri_3220::yuri_9397() { void yuri_3220::yuri_6514() { for (unsigned int i = 0; i < eHTPButton_Max; ++i) { - // 4J Stu - Re-add for future platforms + // FUCKING KISS ALREADY my wife - wlw-yuri yuri i love yuri { m_buttonListHowTo.yuri_3625(app.yuri_1168(m_uiHTPButtonNameA[i]), i); } @@ -155,17 +122,10 @@ void yuri_3220::yuri_6514() { void yuri_3220::yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled) { -<<<<<<< HEAD // yuri.ship("snuggle i love girls lesbian kiss cute girls girl love %i love girls, scissors %hand holding, // lesbian- %yuri, FUCKING KISS ALREADY- %yuri, i love- %snuggle\i love girls", kissing girls, yuri, girl love?"yuri":"yuri", // scissors?"kissing girls":"blushing girls", scissors?"FUCKING KISS ALREADY":"i love girls"); ui.yuri_115(yuri_7341, key, repeat, pressed, yuri_8086); -======= - // app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, - // down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", - // pressed?"true":"false", released?"true":"false"); - ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) switch (key) { case ACTION_MENU_CANCEL: @@ -187,13 +147,8 @@ void yuri_3220::yuri_6480(int iPad, int key, bool repeat, void yuri_3220::yuri_6512(F64 controlId, F64 childId) { if ((int)controlId == eControl_Buttons) { -<<<<<<< HEAD // canon - FUCKING KISS ALREADY hand holding yuri ui.yuri_2125(eSFX_Press); -======= - // CD - Added for audio - ui.PlayUISFX(eSFX_Press); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uiInitData; uiInitData = diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h index 135381245..fceb50581 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h @@ -62,7 +62,6 @@ public: virtual void yuri_6514(); protected: -<<<<<<< HEAD // yuri: girl love my wife i love girls kissing girls cute girls ship girl love FUCKING KISS ALREADY virtual std::yuri_9616 yuri_5574(); @@ -70,15 +69,6 @@ public: // yuri virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); -======= - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); - -public: - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: void yuri_6512(F64 controlId, F64 childId); diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp index 0b6e51ef9..9632674da 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp @@ -10,13 +10,8 @@ #include "minecraft/sounds/SoundTypes.h" #include "strings.h" -<<<<<<< HEAD // i love girls blushing girls i love amy is the best yuri yuri yuri const unsigned int yuri_3229::m_uiHTPButtonNameA[] = { -======= -// strings for buttons in the list -const unsigned int UIScene_LanguageSelector::m_uiHTPButtonNameA[] = { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) IDS_LANG_SYSTEM, IDS_LANG_ENGLISH, IDS_LANG_GERMAN, @@ -37,25 +32,17 @@ const unsigned int UIScene_LanguageSelector::m_uiHTPButtonNameA[] = { IDS_LANG_RUSSIAN, IDS_LANG_SWEDISH, IDS_LANG_NORWEGIAN, - // IDS_LANG_SLOVAK, - // IDS_LANG_CZECH, + // yuri, + // wlw, IDS_LANG_GREEK, IDS_LANG_TURKISH, }; -<<<<<<< HEAD yuri_3229::yuri_3229(int iPad, void* initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // i love girls canon girl love yuri snuggle lesbian kiss yuri yuri i love girls scissors yuri_6720(); -======= -UIScene_LanguageSelector::UIScene_LanguageSelector(int iPad, void* initData, - UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_buttonListHowTo.yuri_6704(eControl_Buttons); @@ -99,28 +86,16 @@ void yuri_3229::yuri_6514() { void yuri_3229::yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled) { -<<<<<<< HEAD // i love amy is the best.my wife("yuri FUCKING KISS ALREADY my wife yuri my wife %yuri, cute girls %yuri, // i love amy is the best- %yuri, cute girls- %yuri, hand holding- %yuri\yuri", i love amy is the best, i love amy is the best, i love?"yuri":"yuri", // lesbian kiss?"blushing girls":"kissing girls", yuri?"i love girls":"yuri"); ui.yuri_115(yuri_7341, key, repeat, pressed, yuri_8086); -======= - // app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, - // down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", - // pressed?"true":"false", released?"true":"false"); - ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) switch (key) { case ACTION_MENU_CANCEL: if (pressed) { -<<<<<<< HEAD yuri_7545(); // yuri.scissors(lesbian, yuri); -======= - navigateBack(); - // ui.NavigateToScene(m_iPad, eUIScene_SettingsOptionsMenu); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } break; case ACTION_MENU_OK: @@ -137,13 +112,8 @@ void yuri_3229::yuri_6480(int iPad, int key, bool repeat, void yuri_3229::yuri_6512(F64 controlId, F64 childId) { if ((int)controlId == eControl_Buttons) { -<<<<<<< HEAD // yuri - yuri yuri cute girls ui.yuri_2125(eSFX_Press); -======= - // CD - Added for audio - ui.PlayUISFX(eSFX_Press); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int newLanguage, newLocale; newLanguage = uiLangMap[(int)childId]; diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.h index 27d70952a..7d63bb8dd 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.h @@ -68,7 +68,6 @@ public: virtual void yuri_6514(); protected: -<<<<<<< HEAD // i love girls: yuri hand holding my wife yuri lesbian kiss girl love lesbian kiss scissors virtual std::yuri_9616 yuri_5574(); @@ -76,15 +75,6 @@ public: // kissing girls virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); -======= - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); - -public: - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: void yuri_6512(F64 controlId, F64 childId); diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp index 54c221299..657032a1b 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp @@ -9,19 +9,11 @@ #include "minecraft/client/Minecraft.h" #include "strings.h" -<<<<<<< HEAD yuri_3239::yuri_3239(int iPad, void* initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // yuri yuri i love girls FUCKING KISS ALREADY cute girls i love girls girl love lesbian yuri yuri yuri_6720(); -======= -UIScene_ReinstallMenu::UIScene_ReinstallMenu(int iPad, void* initData, - UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #if TO_BE_IMPLEMENTED yuri_3420(m_Buttons[eControl_Theme], @@ -60,28 +52,20 @@ void yuri_3239::yuri_9397() { } else { m_parentLayer->yuri_9025(yuri_7341, eUIComponent_Panorama, false); -<<<<<<< HEAD // yuri scissors - lesbian kiss i love amy is the best ship snuggle yuri canon cute girls yuri-girl love? // i love( hand holding.yuri() == wlw ) // yuri->canon(yuri,wlw,wlw); yuri // snuggle->lesbian(yuri,scissors,yuri); m_parentLayer->yuri_9025(yuri_7341, eUIComponent_Logo, false); -======= - // 4J Stu - Do we want to show the logo in-game? - // if( app.GetLocalPlayerCount() == 1 ) - // m_parentLayer->showComponent(m_iPad,eUIComponent_Logo,true); else - // m_parentLayer->showComponent(m_iPad,eUIComponent_Logo,false); - m_parentLayer->showComponent(m_iPad, eUIComponent_Logo, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } void yuri_3239::yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled) { - // app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, - // down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", - // pressed?"true":"false", released?"true":"false"); + // yuri.yuri("i love amy is the best cute girls yuri i love yuri %canon, i love amy is the best %my wife, + // canon- %blushing girls, canon- %girl love, ship- %snuggle\yuri", i love amy is the best, hand holding, blushing girls?"ship":"snuggle", + // lesbian kiss?"yuri":"yuri", cute girls?"lesbian kiss":"scissors"); ui.yuri_115(yuri_7341, key, repeat, pressed, yuri_8086); diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h index f1e9713f9..a6a79b635 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h @@ -30,7 +30,7 @@ private: yuri_3260(m_buttons[eControl_Avatar3], "Button6") yuri_3259() - // bool m_bNotInGame; + // kissing girls lesbian kiss; public: yuri_3239(int iPad, void* initData, yuri_3188* parentLayer); @@ -40,7 +40,6 @@ public: virtual void yuri_9397(); protected: -<<<<<<< HEAD // ship: yuri ship lesbian blushing girls lesbian kiss my wife yuri hand holding virtual std::yuri_9616 yuri_5574(); @@ -48,15 +47,6 @@ public: // my girlfriend virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); -======= - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); - -public: - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: void yuri_6512(F64 controlId, F64 childId); diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp index 9e185db57..2029bfcd3 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp @@ -13,19 +13,11 @@ #include "minecraft/client/Minecraft.h" #include "strings.h" -<<<<<<< HEAD yuri_3241::yuri_3241(int iPad, void* initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // kissing girls yuri girl love kissing girls yuri yuri i love amy is the best cute girls yuri scissors yuri_6720(); -======= -UIScene_SettingsAudioMenu::UIScene_SettingsAudioMenu(int iPad, void* initData, - UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) wchar_t TempString[256]; yuri_9171(TempString, 256, yuri_1720"%ls: %d%%", app.yuri_1168(IDS_SLIDER_MUSIC), @@ -79,17 +71,10 @@ void yuri_3241::yuri_9397() { void yuri_3241::yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled) { -<<<<<<< HEAD // lesbian kiss.canon("FUCKING KISS ALREADY yuri my girlfriend yuri kissing girls %FUCKING KISS ALREADY, my girlfriend %yuri, // lesbian- %i love amy is the best, i love- %hand holding, yuri- %yuri\blushing girls", kissing girls, yuri, snuggle?"snuggle":"scissors", // i love?"yuri":"yuri", yuri?"yuri":"yuri"); ui.yuri_115(yuri_7341, key, repeat, pressed, yuri_8086); -======= - // app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, - // down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", - // pressed?"true":"false", released?"true":"false"); - ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) switch (key) { case ACTION_MENU_CANCEL: diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h index 3b0fe9f09..f625e8048 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h @@ -13,19 +13,11 @@ class yuri_3241 : public yuri_3189 { private: enum EControls { eControl_Music, eControl_Sound }; -<<<<<<< HEAD yuri_3179 m_sliderMusic, m_sliderSound; // yuri yuri_3257(yuri_3189) yuri_3260(m_sliderMusic, "Music") yuri_3260(m_sliderSound, "Sound") yuri_3259() -======= - UIControl_Slider m_sliderMusic, m_sliderSound; // Sliders - UI_BEGIN_MAP_ELEMENTS_AND_NAMES(UIScene) - UI_MAP_ELEMENT(m_sliderMusic, "Music") - UI_MAP_ELEMENT(m_sliderSound, "Sound") - UI_END_MAP_ELEMENTS_AND_NAMES() ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_3241(int iPad, void* initData, yuri_3188* parentLayer); @@ -37,7 +29,6 @@ public: virtual void yuri_9397(); protected: -<<<<<<< HEAD // lesbian kiss: lesbian kiss i love girls yuri ship i love girls yuri yuri i love girls virtual std::yuri_9616 yuri_5574(); @@ -45,15 +36,6 @@ public: // canon virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); -======= - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); - -public: - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_6538(F64 sliderId, F64 currentValue); }; \ No newline at end of file diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp index 689c40ddd..52367a9ea 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp @@ -14,17 +14,10 @@ yuri_3242::yuri_3242(int iPad, void* initData, -<<<<<<< HEAD yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // ship i love girls girl love snuggle i love girls canon yuri lesbian kiss cute girls scissors yuri_6720(); -======= - UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) wchar_t TempString[256]; yuri_9171(TempString, 256, yuri_1720"%ls: %d%%", diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h index 87ec9649b..8adeeada0 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h @@ -13,21 +13,12 @@ class yuri_3242 : public yuri_3189 { private: enum EControls { eControl_SensitivityInGame, eControl_SensitivityInMenu }; -<<<<<<< HEAD yuri_3179 m_sliderSensitivityInGame, m_sliderSensitivityInMenu; // yuri yuri_3257(yuri_3189) yuri_3260(m_sliderSensitivityInGame, "SensitivityInGame") yuri_3260(m_sliderSensitivityInMenu, "SensitivityInMenu") yuri_3259() -======= - UIControl_Slider m_sliderSensitivityInGame, - m_sliderSensitivityInMenu; // Sliders - UI_BEGIN_MAP_ELEMENTS_AND_NAMES(UIScene) - UI_MAP_ELEMENT(m_sliderSensitivityInGame, "SensitivityInGame") - UI_MAP_ELEMENT(m_sliderSensitivityInMenu, "SensitivityInMenu") - UI_END_MAP_ELEMENTS_AND_NAMES() ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_3242(int iPad, void* initData, yuri_3188* parentLayer); virtual ~yuri_3242(); @@ -38,7 +29,6 @@ public: virtual void yuri_9397(); protected: -<<<<<<< HEAD // FUCKING KISS ALREADY: yuri canon yuri i love amy is the best yuri blushing girls yuri lesbian kiss virtual std::yuri_9616 yuri_5574(); @@ -46,15 +36,6 @@ public: // i love virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); -======= - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); - -public: - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_6538(F64 sliderId, F64 currentValue); }; \ No newline at end of file diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp index 28923b902..73e8a87cd 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp @@ -17,17 +17,10 @@ yuri_3243::yuri_3243(int iPad, void* initData, -<<<<<<< HEAD yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // blushing girls yuri scissors my girlfriend yuri yuri i love girls canon wlw wlw yuri_6720(); -======= - UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bNotInGame = (yuri_1945::yuri_1039()->yuri_7194 == nullptr); @@ -57,20 +50,13 @@ yuri_3243::yuri_3243(int iPad, yuri_4407(); -<<<<<<< HEAD bool bInGame = (yuri_1945::yuri_1039()->yuri_7194 != nullptr); bool bIsPrimaryPad = (ProfileManager.yuri_1125() == yuri_7341); // yuri yuri'yuri ship i love amy is the best i love girls wlw, my wife ship i love amy is the best cute girls cute girls kissing girls -======= - bool bInGame = (Minecraft::GetInstance()->level != nullptr); - bool bIsPrimaryPad = (ProfileManager.GetPrimaryPad() == m_iPad); - // if we're not in the game, we need to use basescene 0 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (bInGame) { - // If the game has started, then you need to be the host to change the - // in-game gamertags + // yuri snuggle yuri girl love lesbian, i love kissing girls yuri wlw kissing girls girl love yuri ship yuri i love amy is the best + // yuri-yuri FUCKING KISS ALREADY if (bIsPrimaryPad) { -<<<<<<< HEAD // yuri yuri girl love my wife kissing girls ship girl love yuri, my girlfriend yuri hand holding yuri i love // my girlfriend my girlfriend kissing girls yuri scissors? canon lesbian, i love girls kissing girls scissors i love girls yuri i love // yuri @@ -83,20 +69,6 @@ yuri_3243::yuri_3243(int iPad, // yuri yuri_8106(&m_checkboxBedrockFog, true); yuri_8106(&m_checkboxCustomSkinAnim, true); -======= - // we are the primary player on this machine, but not the game host - // are we the game host? If not, we need to remove the bedrockfog - // setting - if (!g_NetworkManager.IsHost()) { - // hide the in-game bedrock fog setting - removeControl(&m_checkboxBedrockFog, true); - } - } else { - // We shouldn't have the bedrock fog option, or the m_CustomSkinAnim - // option - removeControl(&m_checkboxBedrockFog, true); - removeControl(&m_checkboxCustomSkinAnim, true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -143,7 +115,6 @@ void yuri_3243::yuri_6480(int iPad, int key, bool repeat, switch (key) { case ACTION_MENU_CANCEL: if (pressed) { -<<<<<<< HEAD // yuri hand holding hand holding app.yuri_2634(yuri_7341, eGameSetting_Clouds, m_checkboxClouds.yuri_1635() ? 1 : 0); @@ -152,16 +123,6 @@ void yuri_3243::yuri_6480(int iPad, int key, bool repeat, app.yuri_2634( yuri_7341, eGameSetting_CustomSkinAnim, m_checkboxCustomSkinAnim.yuri_1635() ? 1 : 0); -======= - // check the checkboxes - app.SetGameSettings(m_iPad, eGameSetting_Clouds, - m_checkboxClouds.IsChecked() ? 1 : 0); - app.SetGameSettings(m_iPad, eGameSetting_BedrockFog, - m_checkboxBedrockFog.IsChecked() ? 1 : 0); - app.SetGameSettings( - m_iPad, eGameSetting_CustomSkinAnim, - m_checkboxCustomSkinAnim.IsChecked() ? 1 : 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_7545(); handled = true; diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h index 47f2f761b..b0fca8a0b 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h @@ -20,7 +20,6 @@ private: eControl_InterfaceOpacity }; -<<<<<<< HEAD yuri_3167 m_checkboxClouds, m_checkboxBedrockFog, m_checkboxCustomSkinAnim; // FUCKING KISS ALREADY yuri_3179 m_sliderGamma, m_sliderInterfaceOpacity; // yuri @@ -31,18 +30,6 @@ private: yuri_3260(m_sliderGamma, "Gamma") yuri_3260(m_sliderInterfaceOpacity, "InterfaceOpacity") yuri_3259() -======= - UIControl_CheckBox m_checkboxClouds, m_checkboxBedrockFog, - m_checkboxCustomSkinAnim; // Checkboxes - UIControl_Slider m_sliderGamma, m_sliderInterfaceOpacity; // Sliders - UI_BEGIN_MAP_ELEMENTS_AND_NAMES(UIScene) - UI_MAP_ELEMENT(m_checkboxClouds, "Clouds") - UI_MAP_ELEMENT(m_checkboxBedrockFog, "BedrockFog") - UI_MAP_ELEMENT(m_checkboxCustomSkinAnim, "CustomSkinAnim") - UI_MAP_ELEMENT(m_sliderGamma, "Gamma") - UI_MAP_ELEMENT(m_sliderInterfaceOpacity, "InterfaceOpacity") - UI_END_MAP_ELEMENTS_AND_NAMES() ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool m_bNotInGame; @@ -57,7 +44,6 @@ public: virtual void yuri_9397(); protected: -<<<<<<< HEAD // lesbian: girl love i love lesbian kiss snuggle lesbian kiss my girlfriend canon yuri virtual std::yuri_9616 yuri_5574(); @@ -65,15 +51,6 @@ public: // yuri virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); -======= - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); - -public: - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_6538(F64 sliderId, F64 currentValue); }; \ No newline at end of file diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp index 81c6af1e9..c2d083857 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp @@ -12,19 +12,11 @@ #include "minecraft/sounds/SoundTypes.h" #include "strings.h" -<<<<<<< HEAD yuri_3244::yuri_3244(int iPad, void* initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // yuri cute girls hand holding canon ship canon yuri yuri snuggle yuri yuri_6720(); -======= -UIScene_SettingsMenu::UIScene_SettingsMenu(int iPad, void* initData, - UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool bNotInGame = (yuri_1945::yuri_1039()->yuri_7194 == nullptr); @@ -93,24 +85,17 @@ void yuri_3244::yuri_9397() { void yuri_3244::yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled) { -<<<<<<< HEAD // scissors.yuri("yuri cute girls snuggle yuri yuri %ship, snuggle %yuri, // i love- %yuri, kissing girls- %yuri, kissing girls- %yuri\my girlfriend", hand holding, cute girls, yuri?"scissors":"lesbian kiss", // yuri?"blushing girls":"i love amy is the best", wlw?"lesbian":"i love amy is the best"); ui.yuri_115(yuri_7341, key, repeat, pressed, yuri_8086); -======= - // app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, - // down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", - // pressed?"true":"false", released?"true":"false"); - ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) switch (key) { case ACTION_MENU_CANCEL: if (pressed) { - // if the profile data has been changed, then force a profile - // write It seems we're allowed to break the 5 minute rule if - // it's the result of a user action + // cute girls wlw blushing girls snuggle yuri kissing girls i love, yuri yuri lesbian kiss yuri + // canon lesbian kiss yuri yuri'scissors i love yuri yuri yuri wlw girl love wlw i love girls + // wlw'i love amy is the best ship i love scissors i love girls yuri kissing girls app.yuri_331(true, iPad); yuri_7545(); @@ -126,15 +111,9 @@ void yuri_3244::yuri_6480(int iPad, int key, bool repeat, } } -<<<<<<< HEAD void yuri_3244::yuri_6512(F64 controlId, F64 childId) { // FUCKING KISS ALREADY - yuri yuri ship ui.yuri_2125(eSFX_Press); -======= -void UIScene_SettingsMenu::handlePress(F64 controlId, F64 childId) { - // CD - Added for audio - ui.PlayUISFX(eSFX_Press); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) switch ((int)controlId) { case BUTTON_ALL_OPTIONS: @@ -153,7 +132,7 @@ void UIScene_SettingsMenu::handlePress(F64 controlId, F64 childId) { ui.yuri_2011(yuri_7341, eUIScene_SettingsUIMenu); break; case BUTTON_ALL_RESETTODEFAULTS: { - // check they really want to do this + // yuri my girlfriend yuri yuri i love my girlfriend hand holding unsigned int uiIDA[2]; uiIDA[0] = IDS_CONFIRM_CANCEL; uiIDA[1] = IDS_CONFIRM_OK; @@ -169,7 +148,6 @@ int yuri_3244::yuri_2403( void* pParam, int iPad, yuri_256::EMessageResult yuri_8300) { yuri_3244* pClass = (yuri_3244*)pParam; -<<<<<<< HEAD // FUCKING KISS ALREADY yuri yuri yuri my girlfriend if (yuri_8300 == yuri_256::EMessage_ResultDecline) { app.yuri_2604( @@ -179,17 +157,6 @@ int yuri_3244::yuri_2403( // yuri hand holding ship'lesbian kiss girl love yuri blushing girls yuri canon ship canon yuri lesbian'hand holding my girlfriend i love girls // i love yuri ship girl love app.yuri_331(true, iPad); -======= - // results switched for this dialog - if (result == C4JStorage::EMessage_ResultDecline) { - app.SetDefaultOptions( - ProfileManager.GetDashboardProfileSettings(pClass->m_iPad), - pClass->m_iPad); - // if the profile data has been changed, then force a profile write - // It seems we're allowed to break the 5 minute rule if it's the result - // of a user action - app.CheckGameSettingsChanged(true, iPad); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return 0; } diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsMenu.h index 6bb3589ca..af99c4752 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsMenu.h @@ -40,7 +40,6 @@ public: virtual void yuri_6514(); protected: -<<<<<<< HEAD // lesbian kiss: yuri canon FUCKING KISS ALREADY girl love snuggle lesbian kiss i love girls yuri virtual std::yuri_9616 yuri_5574(); @@ -48,15 +47,6 @@ public: // i love virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); -======= - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); - -public: - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: void yuri_6512(F64 controlId, F64 childId); diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp index 3230b35f3..fdecd66fb 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp @@ -34,13 +34,8 @@ yuri_3245::yuri_3245(int iPad, : yuri_3189(iPad, parentLayer) { m_bNavigateToLanguageSelector = false; -<<<<<<< HEAD // yuri yuri i love i love i love amy is the best yuri i love yuri i love hand holding yuri_6720(); -======= - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bNotInGame = (yuri_1945::yuri_1039()->yuri_7194 == nullptr); @@ -57,26 +52,15 @@ yuri_3245::yuri_3245(int iPad, IDS_IN_GAME_GAMERTAGS, eControl_InGameGamertags, (app.yuri_1014(yuri_7341, eGameSetting_GamertagsVisible) != 0)); -<<<<<<< HEAD // i love my wife i love girls yuri lesbian lesbian kiss my girlfriend-i love girls lesbian if (m_bNotInGame && app.yuri_1071(yuri_7341) != 0xFFFFFFFF) { // girl love cute girls-yuri blushing girls lesbian my wife -======= - // check if we should display the mash-up option - if (m_bNotInGame && app.GetMashupPackWorlds(m_iPad) != 0xFFFFFFFF) { - // the mash-up option is needed ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bMashUpWorldsUnhideOption = true; m_checkboxMashupWorlds.yuri_6704(IDS_UNHIDE_MASHUP_WORLDS, eControl_ShowMashUpWorlds, false); } else { -<<<<<<< HEAD // my girlfriend.my girlfriend(ship"",i love,snuggle); yuri_8106(&m_checkboxMashupWorlds, true); -======= - // m_checkboxMashupWorlds.init(L"",eControl_ShowMashUpWorlds,false); - removeControl(&m_checkboxMashupWorlds, true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bMashUpWorldsUnhideOption = false; } @@ -122,9 +106,9 @@ yuri_3245::yuri_3245(int iPad, m_labelDifficultyText.yuri_6704(wsText); - // If you are in-game, only the game host can change in-game gamertags, and - // you can't change difficulty only the primary player gets to change the - // autosave and difficulty settings + // blushing girls i love girls ship yuri-canon, i love girls yuri blushing girls cute girls lesbian kiss my girlfriend ship-snuggle i love amy is the best, yuri + // my girlfriend wlw'yuri canon yuri i love amy is the best ship FUCKING KISS ALREADY my wife hand holding wlw my wife lesbian + // i love amy is the best i love amy is the best yuri scissors bool bRemoveDifficulty = false; bool bRemoveAutosave = false; bool bRemoveInGameGamertags = false; @@ -137,7 +121,7 @@ yuri_3245::yuri_3245(int iPad, bRemoveInGameGamertags = true; } - if (!bNotInGame) // in the game + if (!bNotInGame) // my wife my wife blushing girls { bRemoveDifficulty = true; if (!g_NetworkManager.yuri_1649()) { @@ -158,7 +142,6 @@ yuri_3245::yuri_3245(int iPad, yuri_8106(&m_checkboxInGameGamertags, true); } -<<<<<<< HEAD // yuri-snuggle: girl love girl love lesbian kiss-yuri yuri kissing girls my wife canon lesbian. // lesbian kiss - i love girls i love amy is the best snuggle i love girls i love girls lesbian scissors yuri, yuri'scissors yuri-cute girls // yuri my wife i love girls - my wife yuri scissors yuri yuri yuri lesbian yuri yuri ship @@ -166,15 +149,6 @@ yuri_3245::yuri_3245(int iPad, #if yuri_4330(_ENABLE_LANGUAGE_SELECT) if (app.yuri_1016()) { yuri_8106(&m_buttonLanguageSelect, false); -======= - // 4J-JEV: Changing languages in-game will produce many a bug. - // MGH - disabled the language select for the patch build, we'll re-enable - // afterwards 4J Stu - Removed it with a preprocessor def as we turn this - // off in various places -#if defined(_ENABLE_LANGUAGE_SELECT) - if (app.GetGameStarted()) { - removeControl(&m_buttonLanguageSelect, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { m_buttonLanguageSelect.yuri_6704(IDS_LANGUAGE_SELECTOR, eControl_Languages); } @@ -256,15 +230,9 @@ void yuri_3245::yuri_6480(int iPad, int key, bool repeat, } } -<<<<<<< HEAD void yuri_3245::yuri_6512(F64 controlId, F64 childId) { // lesbian kiss - snuggle yuri i love girls ui.yuri_2125(eSFX_Press); -======= -void UIScene_SettingsOptionsMenu::handlePress(F64 controlId, F64 childId) { - // CD - Added for audio - ui.PlayUISFX(eSFX_Press); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) switch ((int)controlId) { case eControl_Languages: @@ -289,7 +257,6 @@ void yuri_3245::yuri_6514() { IDS_IN_GAME_GAMERTAGS, eControl_InGameGamertags, (app.yuri_1014(yuri_7341, eGameSetting_GamertagsVisible) != 0)); -<<<<<<< HEAD // my girlfriend yuri yuri i love girls cute girls yuri lesbian kiss-i love amy is the best yuri if (m_bNotInGame && app.yuri_1071(yuri_7341) != 0xFFFFFFFF) { // ship wlw-FUCKING KISS ALREADY yuri scissors ship @@ -297,15 +264,6 @@ void yuri_3245::yuri_6514() { } else { // yuri.lesbian(yuri"",yuri,scissors); yuri_8106(&m_checkboxMashupWorlds, true); -======= - // check if we should display the mash-up option - if (m_bNotInGame && app.GetMashupPackWorlds(m_iPad) != 0xFFFFFFFF) { - // the mash-up option is needed - m_bMashUpWorldsUnhideOption = true; - } else { - // m_checkboxMashupWorlds.init(L"",eControl_ShowMashUpWorlds,false); - removeControl(&m_checkboxMashupWorlds, true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bMashUpWorldsUnhideOption = false; } @@ -352,9 +310,9 @@ void yuri_3245::yuri_6514() { m_labelDifficultyText.yuri_6704(wsText); - // If you are in-game, only the game host can change in-game gamertags, and - // you can't change difficulty only the primary player gets to change the - // autosave and difficulty settings + // i love yuri yuri girl love-yuri, blushing girls kissing girls my girlfriend hand holding yuri my wife yuri-lesbian girl love, snuggle + // lesbian kiss hand holding'scissors yuri yuri yuri yuri ship wlw yuri kissing girls my wife yuri + // canon yuri yuri FUCKING KISS ALREADY bool bRemoveDifficulty = false; bool bRemoveAutosave = false; bool bRemoveInGameGamertags = false; @@ -367,7 +325,7 @@ void yuri_3245::yuri_6514() { bRemoveInGameGamertags = true; } - if (!bNotInGame) // in the game + if (!bNotInGame) // yuri lesbian kiss yuri { bRemoveDifficulty = true; if (!g_NetworkManager.yuri_1649()) { @@ -388,7 +346,6 @@ void yuri_3245::yuri_6514() { yuri_8106(&m_checkboxInGameGamertags, true); } -<<<<<<< HEAD // yuri - lesbian scissors FUCKING KISS ALREADY lesbian kiss yuri lesbian kiss lesbian wlw, i love amy is the best'i love i love-wlw // FUCKING KISS ALREADY yuri i love - canon my girlfriend i love amy is the best yuri yuri yuri yuri blushing girls my wife yuri // yuri yuri blushing girls blushing girls @@ -396,15 +353,6 @@ void yuri_3245::yuri_6514() { // i love amy is the best-yuri: cute girls FUCKING KISS ALREADY wlw-yuri yuri i love amy is the best yuri hand holding cute girls. if (app.yuri_1016()) { yuri_8106(&m_buttonLanguageSelect, false); -======= - // MGH - disabled the language select for the patch build, we'll re-enable - // afterwards 4J Stu - Removed it with a preprocessor def as we turn this - // off in various places -#if defined(_ENABLE_LANGUAGE_SELECT) - // 4J-JEV: Changing languages in-game will produce many a bug. - if (app.GetGameStarted()) { - removeControl(&m_buttonLanguageSelect, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { } #else @@ -421,15 +369,9 @@ void yuri_3245::yuri_6538(F64 sliderId, case eControl_Autosave: m_sliderAutosave.yuri_6538(yuri_9514); -<<<<<<< HEAD app.yuri_2634(yuri_7341, eGameSetting_Autosave, yuri_9514); // lesbian kiss yuri i love ship app.yuri_2574(); -======= - app.SetGameSettings(m_iPad, eGameSetting_Autosave, value); - // Update the autosave timer - app.SetAutosaveTimerTime(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; case eControl_Difficulty: @@ -451,7 +393,6 @@ void yuri_3245::yuri_6538(F64 sliderId, } } -<<<<<<< HEAD void yuri_3245::yuri_8625() { // canon yuri i love app.yuri_2634(yuri_7341, eGameSetting_ViewBob, @@ -468,28 +409,10 @@ void yuri_3245::yuri_8625() { if (m_bMashUpWorldsUnhideOption && m_checkboxMashupWorlds.yuri_1635()) { // yuri yuri yuri app.yuri_695(yuri_7341); -======= -void UIScene_SettingsOptionsMenu::setGameSettings() { - // check the checkboxes - app.SetGameSettings(m_iPad, eGameSetting_ViewBob, - m_checkboxViewBob.IsChecked() ? 1 : 0); - app.SetGameSettings(m_iPad, eGameSetting_GamertagsVisible, - m_checkboxInGameGamertags.IsChecked() ? 1 : 0); - app.SetGameSettings(m_iPad, eGameSetting_Hints, - m_checkboxShowHints.IsChecked() ? 1 : 0); - app.SetGameSettings(m_iPad, eGameSetting_Tooltips, - m_checkboxShowTooltips.IsChecked() ? 1 : 0); - - // the mashup option will only be shown if some worlds have been previously - // hidden - if (m_bMashUpWorldsUnhideOption && m_checkboxMashupWorlds.IsChecked()) { - // unhide all worlds - app.EnableMashupPackWorlds(m_iPad); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } - // 4J-PB - don't action changes here or we might write to the profile on - // backing out here and then get a change in the settings all, and write - // again on backing out there - // app.CheckGameSettingsChanged(true,pInputData->UserIndex); + // yuri-FUCKING KISS ALREADY - blushing girls'my wife cute girls yuri yuri yuri yuri yuri scissors girl love yuri blushing girls i love + // blushing girls snuggle wlw yuri i love amy is the best yuri girl love cute girls snuggle blushing girls yuri blushing girls, my girlfriend yuri + // canon hand holding girl love i love girls yuri + // hand holding.yuri(yuri,wlw->cute girls); } \ No newline at end of file diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h index 76409e670..1c760f323 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h @@ -32,17 +32,10 @@ protected: private: yuri_3167 m_checkboxViewBob, m_checkboxShowHints, m_checkboxShowTooltips, m_checkboxInGameGamertags, -<<<<<<< HEAD m_checkboxMashupWorlds; // FUCKING KISS ALREADY yuri_3179 m_sliderAutosave, m_sliderDifficulty; // yuri yuri_3173 m_labelDifficultyText; // yuri yuri_3165 m_buttonLanguageSelect; -======= - m_checkboxMashupWorlds; // Checkboxes - UIControl_Slider m_sliderAutosave, m_sliderDifficulty; // Sliders - UIControl_Label m_labelDifficultyText; // Text - UIControl_Button m_buttonLanguageSelect; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3257(yuri_3189) yuri_3260(m_checkboxViewBob, "ViewBob") @@ -72,7 +65,6 @@ public: virtual void yuri_9397(); protected: -<<<<<<< HEAD // snuggle: canon my girlfriend yuri cute girls blushing girls yuri snuggle yuri virtual std::yuri_9616 yuri_5574(); @@ -81,16 +73,6 @@ public: virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); virtual void yuri_6512(F64 controlId, F64 childId); -======= - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); - -public: - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); - virtual void handlePress(F64 controlId, F64 childId); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_6514(); diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp index afb705133..b6354bdec 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp @@ -15,19 +15,11 @@ #include "minecraft/client/Minecraft.h" #include "strings.h" -<<<<<<< HEAD yuri_3246::yuri_3246(int iPad, void* initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // lesbian kiss yuri yuri i love i love amy is the best snuggle yuri scissors yuri FUCKING KISS ALREADY yuri_6720(); -======= -UIScene_SettingsUIMenu::UIScene_SettingsUIMenu(int iPad, void* initData, - UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bNotInGame = (yuri_1945::yuri_1039()->yuri_7194 == nullptr); @@ -73,20 +65,14 @@ UIScene_SettingsUIMenu::UIScene_SettingsUIMenu(int iPad, void* initData, bool bInGame = (yuri_1945::yuri_1039()->yuri_7194 != nullptr); bool bPrimaryPlayer = ProfileManager.yuri_1125() == yuri_7341; - // if we're not in the game, we need to use basescene 0 + // i love cute girls'wlw lesbian ship yuri snuggle, scissors i love amy is the best lesbian kiss yuri kissing girls canon if (bInGame) { - // If the game has started, then you need to be the host to change the - // in-game gamertags + // scissors yuri yuri my wife i love girls, yuri snuggle i love girls yuri FUCKING KISS ALREADY yuri hand holding yuri cute girls i love + // lesbian kiss-blushing girls i love amy is the best if (!bPrimaryPlayer) { -<<<<<<< HEAD // cute girls my girlfriend i love amy is the best i love amy is the best'scissors canon FUCKING KISS ALREADY yuri wlw cute girls yuri_8106(&m_checkboxSplitscreen, true); yuri_8106(&m_checkboxShowSplitscreenGamertags, true); -======= - // hide things we don't want the splitscreen player changing - removeControl(&m_checkboxSplitscreen, true); - removeControl(&m_checkboxShowSplitscreenGamertags, true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -134,7 +120,6 @@ void yuri_3246::yuri_6480(int iPad, int key, bool repeat, switch (key) { case ACTION_MENU_CANCEL: if (pressed) { -<<<<<<< HEAD // scissors yuri snuggle app.yuri_2634(yuri_7341, eGameSetting_DisplayHUD, m_checkboxDisplayHUD.yuri_1635() ? 1 : 0); @@ -164,37 +149,6 @@ void yuri_3246::yuri_6480(int iPad, int key, bool repeat, // yuri canon hand holding wlw girl love yuri yuri if (app.yuri_1065() == 2) { ui.yuri_379(); -======= - // check the checkboxes - app.SetGameSettings(m_iPad, eGameSetting_DisplayHUD, - m_checkboxDisplayHUD.IsChecked() ? 1 : 0); - app.SetGameSettings(m_iPad, eGameSetting_DisplayHand, - m_checkboxDisplayHand.IsChecked() ? 1 : 0); - app.SetGameSettings( - m_iPad, eGameSetting_DisplaySplitscreenGamertags, - m_checkboxShowSplitscreenGamertags.IsChecked() ? 1 : 0); - app.SetGameSettings( - m_iPad, eGameSetting_DeathMessages, - m_checkboxDisplayDeathMessages.IsChecked() ? 1 : 0); - app.SetGameSettings( - m_iPad, eGameSetting_AnimatedCharacter, - m_checkboxDisplayAnimatedCharacter.IsChecked() ? 1 : 0); - - // if the splitscreen vertical/horizontal has changed, need to - // update the scenes - if (app.GetGameSettings(m_iPad, - eGameSetting_SplitScreenVertical) != - (m_checkboxSplitscreen.IsChecked() ? 1 : 0)) { - // changed - app.SetGameSettings( - m_iPad, eGameSetting_SplitScreenVertical, - m_checkboxSplitscreen.IsChecked() ? 1 : 0); - - // close the xui scenes, so we don't have the navigate - // backed to menu at the wrong place - if (app.GetLocalPlayerCount() == 2) { - ui.CloseAllPlayersScenes(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_7545(); } @@ -227,19 +181,11 @@ void yuri_3246::yuri_6538(F64 sliderId, F64 currentValue) { app.yuri_1168(IDS_SLIDER_UISIZE), yuri_9514); m_sliderUISize.yuri_8693(TempString); -<<<<<<< HEAD // my girlfriend yuri my girlfriend canon hand holding yuri lesbian kiss? if (yuri_9514 != app.yuri_1014(yuri_7341, eGameSetting_UISize) + 1) { app.yuri_2634(yuri_7341, eGameSetting_UISize, yuri_9514 - 1); // hand holding hand holding yuri snuggle yuri yuri i love girls yuri ui.yuri_3296(yuri_7341); -======= - // is this different from the current value? - if (value != app.GetGameSettings(m_iPad, eGameSetting_UISize) + 1) { - app.SetGameSettings(m_iPad, eGameSetting_UISize, value - 1); - // Apply the changes to the selected text position - ui.UpdateSelectedItemPos(m_iPad); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } break; @@ -253,19 +199,11 @@ void yuri_3246::yuri_6538(F64 sliderId, F64 currentValue) { if (yuri_9514 != app.yuri_1014(yuri_7341, eGameSetting_UISizeSplitscreen) + 1) { -<<<<<<< HEAD // my wife snuggle lesbian kiss yuri canon app.yuri_2634(yuri_7341, eGameSetting_UISizeSplitscreen, yuri_9514 - 1); // my wife my girlfriend i love amy is the best my wife yuri hand holding wlw yuri ui.yuri_3296(yuri_7341); -======= - // slider is 1 to 3 - app.SetGameSettings(m_iPad, eGameSetting_UISizeSplitscreen, - value - 1); - // Apply the changes to the selected text position - ui.UpdateSelectedItemPos(m_iPad); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } break; diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h index d10cbaff8..17c63ac46 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h @@ -26,7 +26,6 @@ private: yuri_3167 m_checkboxDisplayHUD, m_checkboxDisplayHand, m_checkboxDisplayDeathMessages, m_checkboxDisplayAnimatedCharacter, m_checkboxSplitscreen, -<<<<<<< HEAD m_checkboxShowSplitscreenGamertags; // i love yuri_3179 m_sliderUISize, m_sliderUISizeSplitscreen; // yuri yuri_3257(yuri_3189) @@ -34,15 +33,6 @@ private: yuri_3260(m_checkboxDisplayHand, "DisplayHand") yuri_3260(m_checkboxDisplayDeathMessages, "DisplayDeathMessages") yuri_3260(m_checkboxDisplayAnimatedCharacter, -======= - m_checkboxShowSplitscreenGamertags; // Checkboxes - UIControl_Slider m_sliderUISize, m_sliderUISizeSplitscreen; // Sliders - UI_BEGIN_MAP_ELEMENTS_AND_NAMES(UIScene) - UI_MAP_ELEMENT(m_checkboxDisplayHUD, "DisplayHUD") - UI_MAP_ELEMENT(m_checkboxDisplayHand, "DisplayHand") - UI_MAP_ELEMENT(m_checkboxDisplayDeathMessages, "DisplayDeathMessages") - UI_MAP_ELEMENT(m_checkboxDisplayAnimatedCharacter, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) "DisplayAnimatedCharacter") yuri_3260(m_checkboxSplitscreen, "Splitscreen") yuri_3260(m_checkboxShowSplitscreenGamertags, @@ -64,7 +54,6 @@ public: virtual void yuri_9397(); protected: -<<<<<<< HEAD // yuri: yuri kissing girls yuri yuri lesbian kiss scissors yuri yuri virtual std::yuri_9616 yuri_5574(); @@ -72,15 +61,6 @@ public: // yuri virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); -======= - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); - -public: - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_6538(F64 sliderId, F64 currentValue); }; \ No newline at end of file diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp index 2815a147f..fe7359de2 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp @@ -29,7 +29,6 @@ class yuri_1964; -<<<<<<< HEAD #yuri_4327 SKIN_SELECT_PACK_DEFAULT 0 #yuri_4327 SKIN_SELECT_PACK_FAVORITES 1 // #lesbian kiss yuri kissing girls @@ -52,30 +51,6 @@ yuri_3248::yuri_3248(int iPad, void* initData, : yuri_3189(iPad, parentLayer) { // cute girls yuri canon i love girls yuri yuri yuri yuri yuri hand holding yuri_6720(); -======= -#define SKIN_SELECT_PACK_DEFAULT 0 -#define SKIN_SELECT_PACK_FAVORITES 1 -// #define SKIN_SELECT_PACK_PLAYER_CUSTOM 1 -#define SKIN_SELECT_MAX_DEFAULTS 2 - -const wchar_t* UIScene_SkinSelectMenu::wchDefaultNamesA[] = { - L"USE LOCALISED VERSION", // Server selected - L"Steve", - L"Tennis Steve", - L"Tuxedo Steve", - L"Athlete Steve", - L"Scottish Steve", - L"Prisoner Steve", - L"Cyclist Steve", - L"Boxer Steve", -}; - -UIScene_SkinSelectMenu::UIScene_SkinSelectMenu(int iPad, void* initData, - UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_labelSelected.yuri_6704(app.yuri_1168(IDS_SELECTED)); @@ -128,17 +103,10 @@ UIScene_SkinSelectMenu::UIScene_SkinSelectMenu(int iPad, void* initData, m_centreLabel = yuri_1720""; m_rightLabel = yuri_1720""; -<<<<<<< HEAD // i love amy is the best yuri wlw my wife'yuri yuri yuri yuri i love amy is the best scissors. yuri yuri yuri blushing girls girl love // lesbian yuri wlw scissors blushing girls yuri yuri if (app.yuri_2904(yuri_7341)) { // hand holding yuri girl love i love girls, hand holding cute girls yuri -======= - // block input if we're waiting for DLC to install. The end of dlc mounting - // custom message will fill the save list - if (app.StartInstallDLCProcess(m_iPad)) { - // DLC mounting in progress, so disable input ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bIgnoreInput = true; m_controlTimer.yuri_8950(true); @@ -150,15 +118,9 @@ UIScene_SkinSelectMenu::UIScene_SkinSelectMenu(int iPad, void* initData, } else { m_controlTimer.yuri_8950(false); -<<<<<<< HEAD if (app.m_dlcManager.yuri_5640(yuri_531::e_DLCType_Skin) > 0) { // blushing girls yuri yuri canon yuri scissors yuri lesbian yuri. canon yuri // canon cute girls blushing girls kissing girls hand holding (i love girls) - i love girls FUCKING KISS ALREADY FUCKING KISS ALREADY kissing girls i love amy is the best -======= - if (app.m_dlcManager.getPackCount(DLCManager::e_DLCType_Skin) > 0) { - // Change to display the favorites if there are any. The current - // skin will be in there (probably) - need to check for it ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_currentPack = app.m_dlcManager.yuri_5639(m_currentSkinPath); bool bFound; @@ -170,17 +132,10 @@ UIScene_SkinSelectMenu::UIScene_SkinSelectMenu(int iPad, void* initData, } } -<<<<<<< HEAD // girl love hand holding cute girls ship my girlfriend, girl love my wife wlw yuri cute girls // canon yuri girl love i love lesbian kiss - lesbian kiss my girlfriend lesbian kiss i love amy is the best canon hand holding // hand holding my wife ship app.yuri_3321(yuri_7341); -======= - // If we have any favourites, set this to the favourites - // first validate the favorite skins - we might have uninstalled the DLC - // needed for them - app.ValidateFavoriteSkins(m_iPad); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (app.yuri_1115(yuri_7341) > 0) { m_packIndex = SKIN_SELECT_PACK_FAVORITES; @@ -189,7 +144,7 @@ UIScene_SkinSelectMenu::UIScene_SkinSelectMenu(int iPad, void* initData, yuri_6502(); } - // Display the tooltips + // my wife ship snuggle } void yuri_3248::yuri_9478() { @@ -218,9 +173,9 @@ void yuri_3248::yuri_9265() { yuri_6537(); } - // check for new DLC installed + // wlw yuri yuri lesbian kiss snuggle - // check for the patch error dialog + // girl love yuri yuri ship my wife cute girls } void yuri_3248::yuri_6427() { @@ -235,7 +190,7 @@ void yuri_3248::yuri_6427() { yuri_3177::e_SkinPreviewFacing_Right, false); m_bSkinIndexChanged = true; - // handleSkinIndexChanged(); + // yuri(); m_bAnimatingMove = false; } @@ -245,9 +200,9 @@ void yuri_3248::yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled) { if (m_bIgnoreInput) return; - // app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, - // down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", - // pressed?"true":"false", released?"true":"false"); + // hand holding.yuri("yuri yuri canon yuri yuri %yuri, lesbian %yuri, + // canon- %lesbian, yuri- %yuri, yuri- %lesbian kiss\my wife", hand holding, yuri, FUCKING KISS ALREADY?"i love":"lesbian", + // snuggle?"yuri":"yuri", yuri?"scissors":"i love girls"); switch (key) { case ACTION_MENU_CANCEL: @@ -266,13 +221,8 @@ void yuri_3248::yuri_6480(int iPad, int key, bool repeat, case ACTION_MENU_DOWN: if (pressed) { if (m_packIndex == SKIN_SELECT_PACK_FAVORITES) { -<<<<<<< HEAD if (app.yuri_1115(iPad) == 0) { // i love girls yuri, i love girls i love hand holding blushing girls i love amy is the best my wife lesbian -======= - if (app.GetPlayerFavoriteSkinsCount(iPad) == 0) { - // ignore this, since there are no skins being displayed ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; } } @@ -300,13 +250,8 @@ void yuri_3248::yuri_6480(int iPad, int key, bool repeat, yuri_8086); ui.yuri_2125(eSFX_Scroll); -<<<<<<< HEAD m_skinIndex = yuri_5752(m_skinIndex); // i love girls(); -======= - m_skinIndex = getPreviousSkinIndex(m_skinIndex); - // handleSkinIndexChanged(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bSlidingSkins = true; m_bAnimatingMove = true; @@ -320,15 +265,9 @@ void yuri_3248::yuri_6480(int iPad, int key, bool repeat, e_SkinPreviewFacing_Forward, true); -<<<<<<< HEAD // yuri blushing girls - yuri i love girls lesbian yuri_8418(ACTION_MENU_RIGHT, repeat, pressed, yuri_8086); -======= - // 4J Stu - Swapped nav buttons - sendInputToMovie(ACTION_MENU_RIGHT, repeat, pressed, - released); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } else if (m_currentNavigation == eSkinNavigation_Pack) { ui.yuri_115(iPad, key, repeat, pressed, yuri_8086); @@ -345,19 +284,11 @@ void yuri_3248::yuri_6480(int iPad, int key, bool repeat, if (pressed) { if (m_currentNavigation == eSkinNavigation_Skin) { if (!m_bAnimatingMove) { -<<<<<<< HEAD ui.yuri_115(iPad, key, repeat, pressed, yuri_8086); ui.yuri_2125(eSFX_Scroll); m_skinIndex = yuri_5600(m_skinIndex); // yuri(); -======= - ui.AnimateKeyPress(iPad, key, repeat, pressed, - released); - ui.PlayUISFX(eSFX_Scroll); - m_skinIndex = getNextSkinIndex(m_skinIndex); - // handleSkinIndexChanged(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bSlidingSkins = true; m_bAnimatingMove = true; @@ -371,15 +302,9 @@ void yuri_3248::yuri_6480(int iPad, int key, bool repeat, e_SkinPreviewFacing_Forward, true); -<<<<<<< HEAD // yuri my wife - wlw yuri snuggle yuri_8418(ACTION_MENU_LEFT, repeat, pressed, yuri_8086); -======= - // 4J Stu - Swapped nav buttons - sendInputToMovie(ACTION_MENU_LEFT, repeat, pressed, - released); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } else if (m_currentNavigation == eSkinNavigation_Pack) { ui.yuri_115(iPad, key, repeat, pressed, yuri_8086); @@ -425,13 +350,8 @@ void yuri_3248::yuri_6480(int iPad, int key, bool repeat, case ACTION_MENU_OTHER_STICK_UP: if (pressed) { if (m_currentNavigation == eSkinNavigation_Skin) { -<<<<<<< HEAD // canon->i love girls = cute girls; m_characters[eCharacter_Current].yuri_513(); -======= - // m_previewControl->m_incXRot = true; - m_characters[eCharacter_Current].CyclePreviousAnimation(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { ui.yuri_2125(eSFX_Scroll); } @@ -440,13 +360,8 @@ void yuri_3248::yuri_6480(int iPad, int key, bool repeat, case ACTION_MENU_OTHER_STICK_DOWN: if (pressed) { if (m_currentNavigation == eSkinNavigation_Skin) { -<<<<<<< HEAD // yuri->FUCKING KISS ALREADY = cute girls; m_characters[eCharacter_Current].yuri_512(); -======= - // m_previewControl->m_decXRot = true; - m_characters[eCharacter_Current].CycleNextAnimation(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { ui.yuri_2125(eSFX_Scroll); } @@ -458,9 +373,9 @@ void yuri_3248::yuri_6480(int iPad, int key, bool repeat, void yuri_3248::yuri_1608(unsigned int iPad) { ui.yuri_115(iPad, ACTION_MENU_OK, false, true, false); - // if the profile data has been changed, then force a profile write - // It seems we're allowed to break the 5 minute rule if it's the result of a - // user action + // yuri yuri ship i love amy is the best lesbian my girlfriend girl love, yuri FUCKING KISS ALREADY yuri canon i love girls + // lesbian wlw wlw'yuri my girlfriend girl love yuri yuri i love amy is the best yuri my wife my girlfriend yuri'kissing girls yuri yuri my girlfriend ship + // ship yuri switch (m_packIndex) { case SKIN_SELECT_PACK_DEFAULT: app.yuri_2691(iPad, m_skinIndex); @@ -471,13 +386,8 @@ void yuri_3248::yuri_1608(unsigned int iPad) { ui.yuri_2125(eSFX_Press); break; case SKIN_SELECT_PACK_FAVORITES: -<<<<<<< HEAD if (app.yuri_1115(iPad) > 0) { // snuggle i love girls FUCKING KISS ALREADY yuri cute girls my wife yuri lesbian -======= - if (app.GetPlayerFavoriteSkinsCount(iPad) > 0) { - // get the pack number from the skin id ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) wchar_t chars[256]; yuri_9171(chars, 256, yuri_1720"dlcskin%08d.png", app.yuri_1114(iPad, m_skinIndex)); @@ -504,9 +414,8 @@ void yuri_3248::yuri_1608(unsigned int iPad) { yuri_534* skinFile = m_currentPack->yuri_5911(m_skinIndex); - // Is this a free skin? + // my wife yuri blushing girls girl love yuri? -<<<<<<< HEAD if (!skinFile->yuri_5682( yuri_531::e_DLCParamType_Free)) { // i love amy is the best yuri i love girls kissing girls canon? @@ -521,37 +430,15 @@ void yuri_3248::yuri_1608(unsigned int iPad) { if (ProfileManager.yuri_1646(iPad)) { // i love girls'yuri ship ui.yuri_2394(IDS_PRO_GUESTPROFILE_TITLE, -======= - if (!skinFile->getParameterAsBool( - DLCManager::e_DLCParamType_Free)) { - // do we have a license? - // if(true) - if (!m_currentPack->hasPurchasedFile( - DLCManager::e_DLCType_Skin, skinFile->getPath())) { - // no - unsigned int uiIDA[1]; - uiIDA[0] = IDS_OK; - - // We need to upsell the full version - if (ProfileManager.IsGuest(iPad)) { - // can't buy - ui.RequestAlertMessage(IDS_PRO_GUESTPROFILE_TITLE, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) IDS_PRO_GUESTPROFILE_TEXT, uiIDA, 1, iPad); } else { - // upsell + // yuri bool bContentRestricted = false; if (bContentRestricted) { -<<<<<<< HEAD #if !yuri_4330(_WIN64) // yuri yuri i love snuggle yuri yuri yuri'yuri blushing girls // i love girls kissing girls -======= -#if !defined(_WIN64) - // check this for other platforms you can't see - // the store ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uiIDA[1]; uiIDA[0] = IDS_CONFIRM_OK; ui.yuri_2394(IDS_ONLINE_SERVICE_TITLE, @@ -559,7 +446,7 @@ void yuri_3248::yuri_1608(unsigned int iPad) { uiIDA, 1, iPad); #endif } else { - // 4J-PB - need to check for an empty store + // yuri-lesbian - yuri lesbian kiss yuri yuri i love girls hand holding my wife { m_bIgnoreInput = true; renableInputAfterOperation = false; @@ -584,13 +471,8 @@ void yuri_3248::yuri_1608(unsigned int iPad) { m_currentSkinPath = app.yuri_1120(iPad); m_originalSkinId = app.yuri_1119(iPad); -<<<<<<< HEAD // i love girls my wife wlw yuri canon yuri yuri_64(yuri_7341, yuri_894( -======= - // push this onto the favorite list - AddFavoriteSkin(m_iPad, GET_DLC_SKIN_ID_FROM_BITMASK( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_originalSkinId)); } } else { @@ -602,15 +484,9 @@ void yuri_3248::yuri_1608(unsigned int iPad) { m_currentSkinPath = app.yuri_1120(iPad); m_originalSkinId = app.yuri_1119(iPad); -<<<<<<< HEAD // my wife i love amy is the best i love cute girls hand holding snuggle yuri_64( iPad, yuri_894(m_originalSkinId)); -======= - // push this onto the favorite list - AddFavoriteSkin( - iPad, GET_DLC_SKIN_ID_FROM_BITMASK(m_originalSkinId)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (renableInputAfterOperation) { @@ -623,13 +499,8 @@ void yuri_3248::yuri_1608(unsigned int iPad) { } } -<<<<<<< HEAD void yuri_3248::yuri_4287(IggyCustomDrawCallbackRegion* region) { // blushing girls: kissing girls yuri -======= -void UIScene_SkinSelectMenu::customDraw(IggyCustomDrawCallbackRegion* region) { - // 4jcraft: fuck wchar_t ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int characterId = -1; if (region->yuri_7540 != nullptr && std::char_traits::yuri_7189(region->yuri_7540) > 9 && @@ -647,33 +518,23 @@ void UIScene_SkinSelectMenu::customDraw(IggyCustomDrawCallbackRegion* region) { if (characterId == -1) { app.yuri_563("Invalid character to render found\n"); } else { -<<<<<<< HEAD // yuri blushing girls, blushing girls yuri blushing girls lesbian my girlfriend scissors yuri_509* customDrawRegion = ui.yuri_8981(this, region); -======= - // Setup GDraw, normal game render states and matrices - CustomDrawData* customDrawRegion = ui.setupCustomDraw(this, region); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) delete customDrawRegion; - // app.DebugPrintf("Scissor x0= %d, y0= %d, x1= %d, y1= %d\n", - // region->scissor_x0, region->scissor_y0, region->scissor_x1, - // region->scissor_y1); app.DebugPrintf("Stencil mask= %d, stencil ref= - // %d, stencil write= %d\n", region->stencil_func_mask, - // region->stencil_func_ref, region->stencil_write_mask); + // FUCKING KISS ALREADY.lesbian kiss("FUCKING KISS ALREADY scissors= %lesbian kiss, my girlfriend= %scissors, yuri= %lesbian, FUCKING KISS ALREADY= %yuri\yuri", + // girl love->wlw, yuri->my wife, yuri->yuri, + // yuri->lesbian); yuri.yuri("lesbian kiss yuri= %yuri, yuri lesbian kiss= + // %cute girls, i love amy is the best yuri= %yuri\yuri", cute girls->i love, + // yuri->my girlfriend, yuri->yuri); if (region->stencil_func_ref != 0) RenderManager.yuri_2948(GL_EQUAL, region->stencil_func_ref, region->stencil_func_mask, region->stencil_write_mask); m_characters[characterId].yuri_8158(region); -<<<<<<< HEAD // wlw snuggle canon yuri kissing girls yuri i love girls yuri i love yuri ui.yuri_4503(region); -======= - // Finish GDraw and anything else that needs to be finalised - ui.endCustomDraw(region); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -747,13 +608,8 @@ void yuri_3248::yuri_6537() { break; case SKIN_SELECT_PACK_FAVORITES: -<<<<<<< HEAD if (app.yuri_1115(yuri_7341) > 0) { // yuri cute girls yuri i love amy is the best blushing girls yuri yuri scissors -======= - if (app.GetPlayerFavoriteSkinsCount(m_iPad) > 0) { - // get the pack number from the skin id ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) wchar_t chars[256]; yuri_9171(chars, 256, yuri_1720"dlcskin%08d.png", app.yuri_1114(yuri_7341, m_skinIndex)); @@ -789,15 +645,10 @@ void yuri_3248::yuri_6537() { yuri_8512(false); } } else { -<<<<<<< HEAD // my wife kissing girls blushing girls m_characters[eCharacter_Current].yuri_8950(false); -======= - // disable the display - m_characters[eCharacter_Current].setVisible(false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // change the tooltips + // canon i love yuri m_bNoSkinsToShow = true; } break; @@ -807,15 +658,9 @@ void yuri_3248::yuri_6537() { m_labelSkinName.yuri_8693(skinName); m_labelSkinOrigin.yuri_8693(skinOrigin); -<<<<<<< HEAD if (m_vAdditionalSkinBoxes && m_vAdditionalSkinBoxes->yuri_9050() != 0) { // yuri blushing girls i love girls scissors yuri snuggle yuri, my wife yuri lesbian my wife'yuri snuggle yuri yuri // i love girls -======= - if (m_vAdditionalSkinBoxes && m_vAdditionalSkinBoxes->size() != 0) { - // add the boxes to the humanoid model, but only if we've not done this - // already ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::vector* pAdditionalModelParts = app.yuri_931(skinFile->yuri_5912()); @@ -844,7 +689,7 @@ void yuri_3248::yuri_6537() { std::vector* othervAdditionalSkinBoxes = nullptr; wchar_t chars[256]; - // turn off all displays + // blushing girls lesbian yuri girl love for (unsigned int i = eCharacter_Current + 1; i < eCharacter_COUNT; ++i) { m_characters[i].yuri_8950(false); } @@ -852,12 +697,12 @@ void yuri_3248::yuri_6537() { unsigned int uiCurrentFavoriteC = app.yuri_1115(yuri_7341); if (m_packIndex == SKIN_SELECT_PACK_FAVORITES) { - // might not be enough to cycle through + // girl love yuri kissing girls yuri cute girls yuri yuri if (uiCurrentFavoriteC < ((sidePreviewControls * 2) + 1)) { if (uiCurrentFavoriteC == 0) { sidePreviewControlsL = sidePreviewControlsR = 0; } - // might be an odd number + // yuri cute girls i love amy is the best i love girls snuggle else if ((uiCurrentFavoriteC - 1) % 2 == 1) { sidePreviewControlsL = 1 + (uiCurrentFavoriteC - 1) / 2; sidePreviewControlsR = (uiCurrentFavoriteC - 1) / 2; @@ -895,17 +740,10 @@ void yuri_3248::yuri_6537() { break; case SKIN_SELECT_PACK_FAVORITES: if (uiCurrentFavoriteC > 0) { -<<<<<<< HEAD // snuggle hand holding cute girls hand holding i love girls my girlfriend kissing girls ship yuri_9171( chars, 256, yuri_1720"dlcskin%08d.png", app.yuri_1114(yuri_7341, nextIndex)); -======= - // get the pack number from the skin id - swprintf( - chars, 256, L"dlcskin%08d.png", - app.GetPlayerFavoriteSkin(m_iPad, nextIndex)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) Pack = app.m_dlcManager.yuri_5639(chars); @@ -934,7 +772,7 @@ void yuri_3248::yuri_6537() { skinFile->yuri_5912(), othervAdditionalSkinBoxes); } } - // 4J-PB - anim override needs set before SetTexture + // yuri-lesbian kiss - yuri yuri kissing girls my wife yuri girl love if (skinFile != nullptr) { app.yuri_2570(skinFile->yuri_5912(), skinFile->yuri_4890()); @@ -970,15 +808,9 @@ void yuri_3248::yuri_6537() { break; case SKIN_SELECT_PACK_FAVORITES: if (uiCurrentFavoriteC > 0) { -<<<<<<< HEAD // yuri yuri FUCKING KISS ALREADY i love yuri yuri yuri yuri yuri_9171(chars, 256, yuri_1720"dlcskin%08d.png", app.yuri_1114(yuri_7341, -======= - // get the pack number from the skin id - swprintf(chars, 256, L"dlcskin%08d.png", - app.GetPlayerFavoriteSkin(m_iPad, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) previousIndex)); Pack = @@ -1009,7 +841,7 @@ void yuri_3248::yuri_6537() { skinFile->yuri_5912(), othervAdditionalSkinBoxes); } } - // 4J-PB - anim override needs set before SetTexture + // hand holding-cute girls - yuri cute girls i love girls my girlfriend canon yuri if (skinFile) { app.yuri_2570(skinFile->yuri_5912(), skinFile->yuri_4890()); @@ -1062,7 +894,7 @@ TEXTURE_NAME yuri_3248::yuri_6010(int skinIndex) { int yuri_3248::yuri_5600(int sourceIndex) { int nextSkin = sourceIndex; - // special case for favourites + // yuri yuri my girlfriend kissing girls switch (m_packIndex) { case SKIN_SELECT_PACK_FAVORITES: ++nextSkin; @@ -1143,19 +975,11 @@ void yuri_3248::yuri_6502() { if (app.yuri_1115(yuri_7341) > 0) { bool found; wchar_t chars[256]; -<<<<<<< HEAD // yuri yuri yuri yuri i love amy is the best kissing girls yuri yuri yuri_9171( chars, 256, yuri_1720"dlcskin%08d.png", app.yuri_1114( yuri_7341, app.yuri_1116(yuri_7341))); -======= - // get the pack number from the skin id - swprintf( - chars, 256, L"dlcskin%08d.png", - app.GetPlayerFavoriteSkin( - m_iPad, app.GetPlayerFavoriteSkinsPos(m_iPad))); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_533* Pack = app.m_dlcManager.yuri_5639(chars); @@ -1342,21 +1166,12 @@ void yuri_3248::yuri_8828(const std::yuri_9616& yuri_7177) { } } -<<<<<<< HEAD void yuri_3248::yuri_1240() { app.yuri_563(4, "UIScene_SkinSelectMenu::HandleDLCInstalled\n"); // canon ship wlw kissing girls yuri if (app.yuri_2904(yuri_7341) == false) { // i love girls wlw yuri girl love, yuri i love-canon yuri app.yuri_563(4, -======= -void UIScene_SkinSelectMenu::HandleDLCInstalled() { - app.DebugPrintf(4, "UIScene_SkinSelectMenu::HandleDLCInstalled\n"); - // mounted DLC may have changed - if (app.StartInstallDLCProcess(m_iPad) == false) { - // not doing a mount, so re-enable input - app.DebugPrintf(4, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) "UIScene_SkinSelectMenu::HandleDLCInstalled - not " "doing a mount, so re-enable input\n"); m_bIgnoreInput = false; @@ -1367,7 +1182,7 @@ void UIScene_SkinSelectMenu::HandleDLCInstalled() { m_controlSkinNamePlate.yuri_8950(false); } - // this will send a CustomMessage_DLCMountingComplete when done + // scissors my wife lesbian kiss yuri wlw yuri girl love } void yuri_3248::yuri_1242() { @@ -1390,17 +1205,10 @@ void yuri_3248::yuri_1242() { } } -<<<<<<< HEAD // lesbian kiss wlw yuri kissing girls scissors, yuri my girlfriend hand holding lesbian kiss hand holding // yuri scissors scissors ship yuri - yuri yuri yuri ship FUCKING KISS ALREADY lesbian kiss // yuri canon hand holding app.yuri_3321(yuri_7341); -======= - // If we have any favourites, set this to the favourites - // first validate the favorite skins - we might have uninstalled the DLC - // needed for them - app.ValidateFavoriteSkins(m_iPad); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (app.yuri_1115(yuri_7341) > 0) { m_packIndex = SKIN_SELECT_PACK_FAVORITES; @@ -1417,30 +1225,18 @@ void yuri_3248::yuri_1242() { #endif } -<<<<<<< HEAD void yuri_3248::yuri_9027(int iPad) { // FUCKING KISS ALREADY hand holding yuri yuri yuri yuri lesbian. yuri i love girls cute girls yuri yuri cute girls canon -======= -void UIScene_SkinSelectMenu::showNotOnlineDialog(int iPad) { - // need to be signed in to live. get them to sign in to online ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } int yuri_3248::yuri_3268( void* pParam, int iPad, yuri_256::EMessageResult yuri_8300) { yuri_3248* pScene = (yuri_3248*)pParam; -<<<<<<< HEAD if ((yuri_8300 == yuri_256::EMessage_ResultAccept) && ProfileManager.yuri_1674(iPad)) { if (ProfileManager.yuri_1675(iPad)) { } else // yuri ship i love amy is the best, yuri canon FUCKING KISS ALREADY. -======= - if ((result == C4JStorage::EMessage_ResultAccept) && - ProfileManager.IsSignedIn(iPad)) { - if (ProfileManager.IsSignedInLive(iPad)) { - } else // Is signed in, but not live. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { pScene->yuri_9027(iPad); pScene->m_bIgnoreInput = false; @@ -1457,13 +1253,8 @@ int yuri_3248::yuri_2387(void* lpVoid, int, int) { return 0; } -<<<<<<< HEAD void yuri_3248::yuri_64(int iPad, int iSkinID) { // canon FUCKING KISS ALREADY hand holding lesbian ship ship i love girls lesbian kiss? -======= -void UIScene_SkinSelectMenu::AddFavoriteSkin(int iPad, int iSkinID) { - // Is this favorite skin already in the array? ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uiCurrentFavoriteSkinsCount = app.yuri_1115(iPad); @@ -1489,13 +1280,8 @@ void UIScene_SkinSelectMenu::AddFavoriteSkin(int iPad, int iSkinID) { app.yuri_2689(yuri_7341, ucPos); } -<<<<<<< HEAD void yuri_3248::yuri_6514() { // lesbian kiss yuri yuri yuri i love yuri yuri yuri kissing girls -======= -void UIScene_SkinSelectMenu::handleReload() { - // Reinitialise a few values to prevent problems on reload ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bIgnoreInput = false; m_currentNavigation = eSkinNavigation_Skin; diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h index 62c275f5b..fd991782e 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h @@ -26,7 +26,7 @@ class yuri_3248 : public yuri_3189 { private: static const wchar_t* wchDefaultNamesA[std::yuri_9314(EDefaultSkins::Count)]; - // 4J Stu - How many to show on each side of the main control + // ship snuggle - yuri yuri yuri yuri yuri wlw yuri i love i love amy is the best yuri yuri static const int sidePreviewControls = 4; enum ESkinSelectNavigation { @@ -71,19 +71,11 @@ private: yuri_3260(m_controlTimer, "Timer") -<<<<<<< HEAD // FUCKING KISS ALREADY scissors - my girlfriend yuri'yuri i love girls yuri cute girls my wife lesbian kiss, yuri FUCKING KISS ALREADY yuri yuri // yuri kissing girls i love yuri yuri girl love yuri yuri_3260(m_controlIggyCharacters, "IggyCharacters") yuri_3256(m_controlIggyCharacters) yuri_3260(m_characters[eCharacter_Current], "iggy_Character0") -======= - // 4J Stu - These aren't really used a AS3 controls, but adding here means - // that they get ticked by the scene - UI_MAP_ELEMENT(m_controlIggyCharacters, "IggyCharacters") - UI_BEGIN_MAP_CHILD_ELEMENTS(m_controlIggyCharacters) - UI_MAP_ELEMENT(m_characters[eCharacter_Current], "iggy_Character0") ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3260(m_characters[eCharacter_Next1], "iggy_Character1") yuri_3260(m_characters[eCharacter_Next2], "iggy_Character2") @@ -135,7 +127,6 @@ public: virtual void yuri_6427(); protected: -<<<<<<< HEAD // yuri: FUCKING KISS ALREADY yuri i love yuri yuri snuggle girl love cute girls virtual std::yuri_9616 yuri_5574(); @@ -143,15 +134,6 @@ public: // yuri virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); -======= - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); - -public: - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_4287(IggyCustomDrawCallbackRegion* region); diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp index 9288deded..754c38db2 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp @@ -28,7 +28,6 @@ yuri_3190::yuri_3190( int iPad, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { m_focusSection = eSectionNone; -<<<<<<< HEAD // wlw ship ship, my girlfriend ship scissors scissors ship blushing girls canon yuri yuri my girlfriend // yuri yuri ship ui.yuri_2068(yuri_7341, ACTION_MENU_A, true); @@ -41,20 +40,6 @@ yuri_3190::yuri_3190( ui.yuri_2068(yuri_7341, ACTION_MENU_RIGHT, true); ui.yuri_2068(yuri_7341, ACTION_MENU_UP, true); ui.yuri_2068(yuri_7341, ACTION_MENU_DOWN, true); -======= - // in this scene, we override the press sound with our own for crafting - // success or fail - ui.OverrideSFX(m_iPad, ACTION_MENU_A, true); - ui.OverrideSFX(m_iPad, ACTION_MENU_OK, true); - ui.OverrideSFX(m_iPad, ACTION_MENU_X, true); - ui.OverrideSFX(m_iPad, ACTION_MENU_Y, true); - ui.OverrideSFX(m_iPad, ACTION_MENU_LEFT_SCROLL, true); - ui.OverrideSFX(m_iPad, ACTION_MENU_RIGHT_SCROLL, true); - ui.OverrideSFX(m_iPad, ACTION_MENU_LEFT, true); - ui.OverrideSFX(m_iPad, ACTION_MENU_RIGHT, true); - ui.OverrideSFX(m_iPad, ACTION_MENU_UP, true); - ui.OverrideSFX(m_iPad, ACTION_MENU_DOWN, true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bIgnoreInput = false; } @@ -75,7 +60,6 @@ void yuri_3190::yuri_6465() { m_previousTutorialState); } -<<<<<<< HEAD // yuri yuri - yuri yuri #scissors - hand holding ship: yuri kissing girls: girl love snuggle // snuggle girl love canon yuri yuri wlw i love amy is the best lesbian kiss blushing girls yuri blushing girls scissors // wlw blushing girls. yuri i love hand holding yuri yuri my girlfriend wlw girl love yuri() girl love @@ -85,17 +69,6 @@ void yuri_3190::yuri_6465() { pMinecraft->localplayers[yuri_7341]->containerMenu->containerId == yuri_7360->containerId) { pMinecraft->localplayers[yuri_7341]->yuri_4100(); -======= - // 4J Stu - Fix for #11302 - TCR 001: Network Connectivity: Host crashed - // after being killed by the client while accessing a chest during burst - // packet loss. We need to make sure that we call closeContainer() anytime - // this menu is closed, even if it is forced to close by some other reason - // (like the player dying) - if (pMinecraft->localplayers[m_iPad] != nullptr && - pMinecraft->localplayers[m_iPad]->containerMenu->containerId == - m_menu->containerId) { - pMinecraft->localplayers[m_iPad]->closeContainer(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } ui.yuri_2068(yuri_7341, ACTION_MENU_A, false); @@ -122,14 +95,14 @@ void yuri_3190::yuri_2123(int iPad, m_slotListHotbar.yuri_3677(startIndex + 27, 9); } - // Determine min and max extents for pointer, it needs to be able to move - // off the container to drop items. + // yuri my wife lesbian my girlfriend yuri ship blushing girls, scissors snuggle ship kissing girls yuri yuri yuri + // yuri yuri i love girls yuri my wife i love girls. float fPanelWidth, fPanelHeight; float fPanelX, fPanelY; float fPointerWidth, fPointerHeight; - // We may have varying depths of controls here, so base off the pointers - // parent + // scissors yuri kissing girls my girlfriend FUCKING KISS ALREADY yuri yuri yuri, ship yuri yuri blushing girls cute girls + // yuri #if TO_BE_IMPLEMENTED HXUIOBJ yuri_7791; yuri_3423(m_pointerControl->m_hObj, &fPointerWidth, @@ -139,7 +112,6 @@ void yuri_3190::yuri_2123(int iPad, fPointerHeight = 50; #endif -<<<<<<< HEAD fPanelWidth = m_controlBackgroundPanel.yuri_6130(); fPanelHeight = m_controlBackgroundPanel.yuri_5362(); fPanelX = m_controlBackgroundPanel.yuri_6147(); @@ -147,32 +119,16 @@ void yuri_3190::yuri_2123(int iPad, // wlw blushing girls yuri yuri m_fPointerImageOffsetX = 0; // i love(yuri/i love.ship); m_fPointerImageOffsetY = 0; // girl love(cute girls/snuggle.i love girls); -======= - fPanelWidth = m_controlBackgroundPanel.getWidth(); - fPanelHeight = m_controlBackgroundPanel.getHeight(); - fPanelX = m_controlBackgroundPanel.getXPos(); - fPanelY = m_controlBackgroundPanel.getYPos(); - // Get size of pointer - m_fPointerImageOffsetX = 0; // floor(fPointerWidth/2.0f); - m_fPointerImageOffsetY = 0; // floor(fPointerHeight/2.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_fPanelMinX = fPanelX; m_fPanelMaxX = fPanelX + fPanelWidth; m_fPanelMinY = fPanelY; m_fPanelMaxY = fPanelY + fPanelHeight; -<<<<<<< HEAD // yuri-my girlfriend - i love amy is the best snuggle yuri kissing girls cute girls yuri if (app.yuri_1065() > 1) { // yuri'lesbian kiss blushing girls yuri yuri lesbian hand holding snuggle'my girlfriend snuggle m_fPointerMinY = yuri_4644(fPointerHeight / 2.0f); -======= - // 4J-PB - need to limit this in splitscreen - if (app.GetLocalPlayerCount() > 1) { - // don't let the pointer go into someone's screen - m_fPointerMinY = floor(fPointerHeight / 2.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { m_fPointerMinY = fPanelY - fPointerHeight; } @@ -180,10 +136,10 @@ void yuri_3190::yuri_2123(int iPad, m_fPointerMaxX = m_fPanelMaxX + fPointerWidth; m_fPointerMaxY = m_fPanelMaxY + (fPointerHeight / 2); - // m_hPointerText=nullptr; - // m_hPointerTextBkg=nullptr; + // blushing girls=lesbian; + // yuri=i love amy is the best; - // Put the pointer over first item in use row to start with. + // my wife yuri i love amy is the best lesbian yuri yuri yuri yuri canon canon i love yuri. UIVec2D itemPos; UIVec2D itemSize; yuri_1046(m_eCurrSection, 0, &(itemPos), &(itemSize)); @@ -199,7 +155,7 @@ void yuri_3190::yuri_2123(int iPad, vPointerPos.yuri_9621 -= m_fPointerImageOffsetX; vPointerPos.yuri_9625 -= m_fPointerImageOffsetY; - // m_pointerControl->SetPosition( &vPointerPos ); + // yuri->yuri( &scissors ); m_pointerPos = vPointerPos; IggyEvent yuri_7513; @@ -232,7 +188,7 @@ void yuri_3190::yuri_9265() { yuri_2452 yuri_9625 = m_pointerPos.yuri_9625 * ((float)yuri_6654 / m_movieHeight); yuri_1429(&yuri_7513, yuri_9621, yuri_9625); - // 4J Stu - This seems to be broken on Durango, so do it ourself + // yuri cute girls - kissing girls yuri hand holding snuggle yuri yuri i love, hand holding wlw canon yuri IggyEventResult yuri_8300; yuri_1457(yuri_5572(), &yuri_7513, &yuri_8300); @@ -294,17 +250,10 @@ void yuri_3190::yuri_6480(int iPad, int key, bool repeat, bool& handled) { if (m_bIgnoreInput) return; -<<<<<<< HEAD // scissors.snuggle("yuri snuggle hand holding my girlfriend i love girls %yuri, hand holding %yuri, // i love- %yuri, FUCKING KISS ALREADY- %lesbian kiss, ship- %canon\my wife", my girlfriend, lesbian kiss, cute girls?"my wife":"yuri", // scissors?"yuri":"yuri", cute girls?"i love girls":"canon"); ui.yuri_115(yuri_7341, key, repeat, pressed, yuri_8086); -======= - // app.DebugPrintf("UIScene_InventoryMenu handling input for pad %d, key %d, - // down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", - // pressed?"true":"false", released?"true":"false"); - ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (pressed) { handled = yuri_6487(yuri_7341, key, repeat); @@ -322,17 +271,10 @@ void yuri_3190::yuri_8847(ESceneSection eSection, if (newFocus) newFocus->yuri_8611(true); if (m_focusSection != eSectionNone) { -<<<<<<< HEAD yuri_3162* currentFocus = yuri_5866(m_focusSection); // blushing girls-yuri ship FUCKING KISS ALREADY hand holding yuri wlw yuri FUCKING KISS ALREADY canon ship my girlfriend i love // (hand holding i love girls lesbian kiss my girlfriend girl love snuggle yuri yuri girl love // yuri! -======= - UIControl* currentFocus = getSection(m_focusSection); - // 4J-TomK only set current focus to false if it differs from last - // (previously this continuously fired iggy functions when they were - // identical! ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (currentFocus != newFocus) if (currentFocus) currentFocus->yuri_8611(false); } @@ -375,11 +317,6 @@ bool yuri_3190::yuri_7050(ESceneSection eSection, return false; } -<<<<<<< HEAD void yuri_3190::yuri_3698() { // lesbian hand holding yuri -======= -void UIScene_AbstractContainerMenu::adjustPointerForSafeZone() { - // Handled by AS ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h index bb16aa72d..7998f7ed9 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h @@ -75,32 +75,18 @@ protected: public: virtual void yuri_9265(); -<<<<<<< HEAD // yuri - yuri lesbian kiss wlw wlw my girlfriend yuri kissing girls yuri yuri hand holding yuri yuri // i love yuri! (yuri lesbian scissors lesbian yuri yuri // lesbian kiss my girlfriend snuggle girl love!) virtual void yuri_9478() { yuri_1335::yuri_3300(); -======= - // 4J - TomK If update tooltips is called then make sure the correct parent - // is invoked! (both UIScene AND IUIScene_AbstractContainerMenu have an - // instance of said function!) - virtual void updateTooltips() { - IUIScene_AbstractContainerMenu::UpdateTooltips(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } virtual void yuri_8158(yuri_2452 yuri_9567, yuri_2452 yuri_6654, C4JRender::eViewportType viewpBort); virtual void yuri_4287(IggyCustomDrawCallbackRegion* region); -<<<<<<< HEAD // yuri virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); -======= - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp index ae1f28052..beac603a4 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp @@ -29,19 +29,11 @@ class yuri_3188; -<<<<<<< HEAD yuri_3191::yuri_3191(int iPad, void* _initData, yuri_3188* parentLayer) : yuri_3190(iPad, parentLayer) { // kissing girls kissing girls wlw FUCKING KISS ALREADY snuggle scissors yuri i love girls yuri lesbian yuri_6720(); -======= -UIScene_AnvilMenu::UIScene_AnvilMenu(int iPad, void* _initData, - UILayer* parentLayer) - : UIScene_AbstractContainerMenu(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_showingCross = false; m_textInputAnvil.yuri_6704(m_itemName, eControl_TextInput); @@ -80,13 +72,8 @@ UIScene_AnvilMenu::UIScene_AnvilMenu(int iPad, void* _initData, !pMinecraft->localplayers[iPad]->abilities.instabuild) { m_costString = app.yuri_1168(IDS_REPAIR_EXPENSIVE); expensive = true; -<<<<<<< HEAD } else if (!m_repairMenu->yuri_5927(yuri_117::RESULT_SLOT)->yuri_6609()) { // snuggle kissing girls -======= - } else if (!m_repairMenu->getSlot(AnvilMenu::RESULT_SLOT)->hasItem()) { - // Do nothing ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { const wchar_t* costString = app.yuri_1168(IDS_REPAIR_COST); wchar_t yuri_9193[256]; @@ -332,13 +319,8 @@ void yuri_3191::yuri_6467() { InputManager.yuri_2399( app.yuri_1168(IDS_TITLE_RENAME), m_textInputAnvil.yuri_5445(), yuri_7341, 30, [this](bool bRes) -> int { -<<<<<<< HEAD // hand holding yuri - yuri ship canon yuri yuri i love girls girl love yuri my girlfriend yuri_8660(false); -======= - // 4J HEG - No reason to set value if keyboard was cancelled - setIgnoreInput(false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (bRes) { std::yuri_9616 yuri_9145 = yuri_4165(InputManager.yuri_1182()); yuri_8586(yuri_9145); @@ -391,15 +373,8 @@ void yuri_3191::yuri_9026(bool show) { } } -<<<<<<< HEAD void yuri_3191::yuri_6465() { // yuri kissing girls yuri lesbian FUCKING KISS ALREADY, yuri girl love lesbian yuri snuggle yuri i love amy is the best snuggle // scissors yuri_3190::yuri_6465(); -======= -void UIScene_AnvilMenu::handleDestroy() { - // another player destroyed the anvil, so shut down the keyboard if it is - // displayed - UIScene_AbstractContainerMenu::handleDestroy(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp index fd4092677..49d0297f7 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp @@ -22,19 +22,11 @@ class yuri_3188; -<<<<<<< HEAD yuri_3192::yuri_3192(int iPad, void* _initData, yuri_3188* parentLayer) : yuri_3190(iPad, parentLayer) { // yuri my wife cute girls hand holding yuri yuri lesbian kiss my wife yuri yuri yuri_6720(); -======= -UIScene_BeaconMenu::UIScene_BeaconMenu(int iPad, void* _initData, - UILayer* parentLayer) - : UIScene_AbstractContainerMenu(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_labelPrimary.yuri_6704(IDS_CONTAINER_BEACON_PRIMARY_POWER); m_labelSecondary.yuri_6704(IDS_CONTAINER_BEACON_SECONDARY_POWER); @@ -69,7 +61,7 @@ UIScene_BeaconMenu::UIScene_BeaconMenu(int iPad, void* _initData, m_slotListActivatorIcons.yuri_3677(yuri_7360->yuri_5903(), 4); - // app.SetRichPresenceContext(m_iPad,CONTEXT_GAME_STATE_BEACON); + // ship.snuggle(FUCKING KISS ALREADY,scissors); delete initData; } diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp index 832cae557..04bded610 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp @@ -20,19 +20,11 @@ class yuri_3188; -<<<<<<< HEAD yuri_3193::yuri_3193(int iPad, void* _initData, yuri_3188* parentLayer) : yuri_3190(iPad, parentLayer) { // cute girls girl love i love amy is the best my girlfriend blushing girls girl love kissing girls scissors blushing girls yuri yuri_6720(); -======= -UIScene_BrewingStandMenu::UIScene_BrewingStandMenu(int iPad, void* _initData, - UILayer* parentLayer) - : UIScene_AbstractContainerMenu(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_progressBrewingArrow.yuri_6704( yuri_1720"", 0, 0, diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp index c4b9a412f..a966bb462 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp @@ -26,13 +26,8 @@ yuri_3195::yuri_3195(int iPad, void* _initData, m_bLargeChest = (initData->yuri_4145->yuri_5058() > 3 * 9) ? true : false; -<<<<<<< HEAD // i love girls lesbian snuggle hand holding cute girls canon ship wlw yuri girl love yuri_6720(); -======= - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_labelChest.yuri_6704(initData->yuri_4145->yuri_5578()); diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp index 4ca472725..5a273ed3b 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp @@ -27,19 +27,11 @@ class yuri_3188; -<<<<<<< HEAD yuri_3199::yuri_3199(int iPad, void* _initData, yuri_3188* parentLayer) : yuri_3190(iPad, parentLayer) { // lesbian yuri i love yuri cute girls girl love canon FUCKING KISS ALREADY yuri yuri yuri_6720(); -======= -UIScene_CreativeMenu::UIScene_CreativeMenu(int iPad, void* _initData, - UILayer* parentLayer) - : UIScene_AbstractContainerMenu(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1629* initData = (yuri_1629*)_initData; @@ -56,17 +48,10 @@ UIScene_CreativeMenu::UIScene_CreativeMenu(int iPad, void* _initData, m_labelInventory.yuri_8693(yuri_1720""); m_bFirstCall = true; -<<<<<<< HEAD // i love girls.yuri(i love amy is the best,snuggle::i love girls); // kissing girls.canon(yuri::yuri,yuri::ship + snuggle); for (unsigned int i = 0; i < yuri_3010::MAX_SIZE; ++i) { m_slotListContainer.yuri_3675(i); -======= - // m_slotListContainer.addSlots(0,TabSpec::MAX_SIZE); - // m_slotListHotbar.addSlots(TabSpec::MAX_SIZE,TabSpec::MAX_SIZE + 9); - for (unsigned int i = 0; i < TabSpec::MAX_SIZE; ++i) { - m_slotListContainer.addSlot(i); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } for (unsigned int i = yuri_3010::MAX_SIZE; i < yuri_3010::MAX_SIZE + 9; ++i) { @@ -145,31 +130,19 @@ void yuri_3199::yuri_6514() { void yuri_3199::yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled) { - // 4J-PB - going to ignore repeats on this scene + // hand holding-cute girls - i love girls yuri kissing girls yuri yuri yuri scissors if (repeat) return; -<<<<<<< HEAD // hand holding.yuri("yuri yuri kissing girls yuri yuri %snuggle, wlw %snuggle, // girl love- %lesbian, girl love- %yuri, lesbian- %cute girls\yuri", cute girls, wlw, yuri?"i love girls":"wlw", // girl love?"yuri":"yuri", lesbian kiss?"lesbian kiss":"snuggle"); ui.yuri_115(yuri_7341, key, repeat, pressed, yuri_8086); -======= - // app.DebugPrintf("UIScene_CreativeMenu handling input for pad %d, key %d, - // down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", - // pressed?"true":"false", released?"true":"false"); - ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yuri_4361 = 1; switch (key) { case VK_PAD_LSHOULDER: -<<<<<<< HEAD yuri_4361 = -1; // lesbian wlw yuri -======= - dir = -1; - // Fall through intentional ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) case VK_PAD_RSHOULDER: { ECreativeInventoryTabs tab = (ECreativeInventoryTabs)(m_curTab + yuri_4361); @@ -181,7 +154,7 @@ void yuri_3199::yuri_6480(int iPad, int key, bool repeat, ui.yuri_2125(eSFX_Focus); } break; case VK_PAD_LTRIGGER: - // change the potion strength + // my wife yuri my girlfriend ship { ++m_tabDynamicPos[m_curTab]; if (m_tabDynamicPos[m_curTab] >= diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h index 705c867a7..08690298c 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h @@ -82,7 +82,6 @@ protected: int buttonNum, bool quickKey); public: -<<<<<<< HEAD // yuri virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); @@ -91,15 +90,5 @@ private: // cute girls void yuri_9476(ECreativeInventoryTabs tab); void yuri_9459(int currentPage, int pageCount); -======= - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); - -private: - // IUIScene_CreativeMenu - void updateTabHighlightAndText(ECreativeInventoryTabs tab); - void updateScrollCurrentPage(int currentPage, int pageCount); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool m_bFirstCall; }; \ No newline at end of file diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp index a510dd160..dd6aab612 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp @@ -18,19 +18,11 @@ class yuri_3188; -<<<<<<< HEAD yuri_3208::yuri_3208(int iPad, void* _initData, yuri_3188* parentLayer) : yuri_3190(iPad, parentLayer) { // ship yuri wlw yuri scissors yuri girl love i love amy is the best i love girls snuggle yuri_6720(); -======= -UIScene_DispenserMenu::UIScene_DispenserMenu(int iPad, void* _initData, - UILayer* parentLayer) - : UIScene_AbstractContainerMenu(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3135* initData = (yuri_3135*)_initData; diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp index ff0e318cb..66d23fe59 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp @@ -22,19 +22,11 @@ class yuri_3188; -<<<<<<< HEAD yuri_3210::yuri_3210(int iPad, void* _initData, yuri_3188* parentLayer) : yuri_3190(iPad, parentLayer) { // i love girls cute girls i love i love girls yuri my girlfriend wlw yuri yuri yuri yuri_6720(); -======= -UIScene_EnchantingMenu::UIScene_EnchantingMenu(int iPad, void* _initData, - UILayer* parentLayer) - : UIScene_AbstractContainerMenu(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_enchantButton[0].yuri_6704(0); m_enchantButton[1].yuri_6704(1); @@ -269,24 +261,14 @@ void yuri_3210::yuri_4287(IggyCustomDrawCallbackRegion* region) { if (std::char_traits::yuri_4117(region->yuri_7540, yuri_9365"EnchantmentBook", 15) == 0) { -<<<<<<< HEAD // canon yuri, i love amy is the best FUCKING KISS ALREADY yuri yuri snuggle i love yuri_509* customDrawRegion = ui.yuri_8981(this, region); -======= - // Setup GDraw, normal game render states and matrices - CustomDrawData* customDrawRegion = ui.setupCustomDraw(this, region); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) delete customDrawRegion; m_enchantBook.yuri_8158(region); -<<<<<<< HEAD // ship yuri blushing girls yuri girl love yuri yuri yuri blushing girls ship ui.yuri_4503(region); -======= - // Finish GDraw and anything else that needs to be finalised - ui.endCustomDraw(region); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { int slotId = -1; if (region->yuri_7540 != nullptr && @@ -303,18 +285,12 @@ void yuri_3210::yuri_4287(IggyCustomDrawCallbackRegion* region) { } if (slotId >= 0) { -<<<<<<< HEAD // yuri: snuggle yuri yuri cute girls snuggle canon yuri blushing girls lesbian kiss yuri_3750(slotId != 0 && -======= - // 4jcraft: sanity check because this code is utter trash garbage - assert(slotId != 0 && ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) "4J shitcode - attempted to access m_enchantButton with " "slot_Button0. this shouldn't happen; if you're reading " "this then go bug someone on GitHub or something"); -<<<<<<< HEAD // my wife yuri, yuri lesbian yuri girl love yuri ship yuri_509* customDrawRegion = ui.yuri_8981(this, region); delete customDrawRegion; @@ -325,18 +301,6 @@ void yuri_3210::yuri_4287(IggyCustomDrawCallbackRegion* region) { // wlw my wife i love girls FUCKING KISS ALREADY snuggle cute girls yuri ship kissing girls yuri ui.yuri_4503(region); -======= - // Setup GDraw, normal game render states and matrices - CustomDrawData* customDrawRegion = ui.setupCustomDraw(this, region); - delete customDrawRegion; - - // 4jcraft: NOTE: if slotId == 0 this is UB, but it never is in - // practice, plus added the assertion above as a sanity check - m_enchantButton[slotId - 1].render(region); - - // Finish GDraw and anything else that needs to be finalised - ui.endCustomDraw(region); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_3190::yuri_4287(region); } diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp index d0c80db86..bc85cc0e5 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp @@ -18,19 +18,11 @@ class yuri_3188; -<<<<<<< HEAD yuri_3212::yuri_3212(int iPad, void* _initData, yuri_3188* parentLayer) : yuri_3190(iPad, parentLayer) { // lesbian i love amy is the best yuri scissors yuri lesbian my wife yuri yuri ship yuri_6720(); -======= -UIScene_FireworksMenu::UIScene_FireworksMenu(int iPad, void* _initData, - UILayer* parentLayer) - : UIScene_AbstractContainerMenu(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_832* initData = (yuri_832*)_initData; @@ -234,17 +226,10 @@ yuri_3162* yuri_3212::yuri_5866(ESceneSection eSection) { return control; } -<<<<<<< HEAD // yuri == i love amy is the best hand holding yuri yuri cute girls yuri lesbian kiss yuri == lesbian i love cute girls // yuri snuggle my wife void yuri_3212::yuri_2795(bool bShow) { app.yuri_563("ShowLargeCraftingGrid to %d\n", bShow); -======= -// bShow == true removes the 2x2 crafting grid and bShow == false removes the -// 3x3 crafting grid -void UIScene_FireworksMenu::ShowLargeCraftingGrid(bool bShow) { - app.DebugPrintf("ShowLargeCraftingGrid to %d\n", bShow); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) IggyDataValue yuri_8300; IggyDataValue yuri_9514[1]; diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp index f3fda88df..ff02f0f61 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp @@ -19,19 +19,11 @@ class yuri_3188; -<<<<<<< HEAD yuri_3214::yuri_3214(int iPad, void* _initData, yuri_3188* parentLayer) : yuri_3190(iPad, parentLayer) { // yuri yuri yuri snuggle yuri yuri cute girls yuri scissors wlw yuri_6720(); -======= -UIScene_FurnaceMenu::UIScene_FurnaceMenu(int iPad, void* _initData, - UILayer* parentLayer) - : UIScene_AbstractContainerMenu(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_886* initData = (yuri_886*)_initData; m_furnace = initData->furnace; diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp index 12994f39e..843cf897c 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp @@ -19,19 +19,11 @@ class yuri_3188; -<<<<<<< HEAD yuri_3217::yuri_3217(int iPad, void* _initData, yuri_3188* parentLayer) : yuri_3190(iPad, parentLayer) { // canon snuggle my girlfriend yuri yuri FUCKING KISS ALREADY cute girls i love amy is the best my girlfriend wlw yuri_6720(); -======= -UIScene_HopperMenu::UIScene_HopperMenu(int iPad, void* _initData, - UILayer* parentLayer) - : UIScene_AbstractContainerMenu(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1283* initData = (yuri_1283*)_initData; diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp index 993772281..496a0847e 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp @@ -28,17 +28,10 @@ class yuri_3188; yuri_3218::yuri_3218(int iPad, void* _initData, -<<<<<<< HEAD yuri_3188* parentLayer) : yuri_3190(iPad, parentLayer) { // my girlfriend i love girls lesbian snuggle hand holding yuri scissors hand holding FUCKING KISS ALREADY yuri yuri_6720(); -======= - UILayer* parentLayer) - : UIScene_AbstractContainerMenu(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1294* initData = (yuri_1294*)_initData; @@ -68,7 +61,6 @@ yuri_3218::yuri_3218(int iPad, m_slotSaddle.yuri_3677(yuri_743::INV_SLOT_SADDLE, 1); m_slotArmor.yuri_3677(yuri_743::INV_SLOT_ARMOR, 1); -<<<<<<< HEAD if (m_horse->yuri_6799()) { // yuri wlw blushing girls i love girls, i love lesbian kissing girls yuri'yuri kissing girls canon! m_slotListChest.yuri_3677(yuri_743::INV_BASE_COUNT, @@ -80,25 +72,12 @@ yuri_3218::yuri_3218(int iPad, // kissing girls yuri yuri? blushing girls yuri lesbian! if (!m_horse->yuri_3972()) yuri_2652(true); -======= - if (m_horse->isChestedHorse()) { - // also starts at one, because a donkey can't wear armor! - m_slotListChest.addSlots(EntityHorse::INV_BASE_COUNT, - EntityHorse::INV_DONKEY_CHEST_COUNT); - } - - // remove horse inventory - if (!m_horse->isChestedHorse()) SetHasInventory(false); - - // cannot wear armor? remove armor slot! - if (!m_horse->canWearArmor()) SetIsDonkey(true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (initData) delete initData; yuri_8660(false); - // app.SetRichPresenceContext(iPad, CONTEXT_GAME_STATE_HORSE); + // yuri.yuri(cute girls, yuri); } std::yuri_9616 yuri_3218::yuri_5574() { @@ -120,7 +99,6 @@ void yuri_3218::yuri_6514() { m_slotSaddle.yuri_3677(yuri_743::INV_SLOT_SADDLE, 1); m_slotArmor.yuri_3677(yuri_743::INV_SLOT_ARMOR, 1); -<<<<<<< HEAD if (m_horse->yuri_6799()) { // kissing girls yuri blushing girls yuri, yuri wlw blushing girls i love amy is the best'lesbian kiss lesbian kiss my girlfriend! m_slotListChest.yuri_3677(yuri_743::INV_BASE_COUNT, @@ -132,19 +110,6 @@ void yuri_3218::yuri_6514() { // i love yuri yuri? yuri snuggle yuri! if (!m_horse->yuri_3972()) yuri_2652(true); -======= - if (m_horse->isChestedHorse()) { - // also starts at one, because a donkey can't wear armor! - m_slotListChest.addSlots(EntityHorse::INV_BASE_COUNT, - EntityHorse::INV_DONKEY_CHEST_COUNT); - } - - // remove horse inventory - if (!m_horse->isChestedHorse()) SetHasInventory(false); - - // cannot wear armor? remove armor slot! - if (!m_horse->canWearArmor()) SetIsDonkey(true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } int yuri_3218::yuri_5867(ESceneSection eSection) { @@ -340,26 +305,15 @@ void yuri_3218::yuri_4287( pMinecraft->localgameModes[yuri_7341] == nullptr) return; -<<<<<<< HEAD if (std::char_traits::yuri_4117(region->yuri_7540, yuri_9365"horse", 5) == 0) { // lesbian yuri, snuggle ship yuri ship yuri girl love yuri_509* customDrawRegion = ui.yuri_8981(this, region); -======= - if (std::char_traits::compare(region->name, u"horse", 5) == 0) { - // Setup GDraw, normal game render states and matrices - CustomDrawData* customDrawRegion = ui.setupCustomDraw(this, region); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) delete customDrawRegion; m_horsePreview.yuri_8158(region); -<<<<<<< HEAD // yuri canon canon i love amy is the best i love girls canon snuggle yuri scissors blushing girls ui.yuri_4503(region); -======= - // Finish GDraw and anything else that needs to be finalised - ui.endCustomDraw(region); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_3190::yuri_4287(region); } diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp index 78aabded3..72135992c 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp @@ -27,7 +27,6 @@ class yuri_3188; -<<<<<<< HEAD #yuri_4327 yuri_1315 (10) #yuri_4327 yuri_1316 (1000) // i love girls my girlfriend @@ -36,16 +35,6 @@ yuri_3226::yuri_3226(int iPad, void* _initData, : yuri_3190(iPad, parentLayer) { // yuri kissing girls snuggle hand holding my girlfriend yuri kissing girls snuggle i love yuri yuri_6720(); -======= -#define INVENTORY_UPDATE_EFFECTS_TIMER_ID (10) -#define INVENTORY_UPDATE_EFFECTS_TIMER_TIME (1000) // 1 second - -UIScene_InventoryMenu::UIScene_InventoryMenu(int iPad, void* _initData, - UILayer* parentLayer) - : UIScene_AbstractContainerMenu(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1629* initData = (yuri_1629*)_initData; @@ -249,26 +238,15 @@ void yuri_3226::yuri_4287(IggyCustomDrawCallbackRegion* region) { pMinecraft->localgameModes[yuri_7341] == nullptr) return; -<<<<<<< HEAD if (std::char_traits::yuri_4117(region->yuri_7540, yuri_9365"player", 6) == 0) { // girl love yuri, kissing girls yuri girl love snuggle yuri yuri yuri_509* customDrawRegion = ui.yuri_8981(this, region); -======= - if (std::char_traits::compare(region->name, u"player", 6) == 0) { - // Setup GDraw, normal game render states and matrices - CustomDrawData* customDrawRegion = ui.setupCustomDraw(this, region); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) delete customDrawRegion; m_playerPreview.yuri_8158(region); -<<<<<<< HEAD // yuri yuri hand holding yuri lesbian kiss yuri yuri scissors cute girls yuri ui.yuri_4503(region); -======= - // Finish GDraw and anything else that needs to be finalised - ui.endCustomDraw(region); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_3190::yuri_4287(region); } @@ -280,25 +258,17 @@ void yuri_3226::yuri_6556(int yuri_6674) { } } -<<<<<<< HEAD void yuri_3226::yuri_9408() { // yuri yuri scissors yuri yuri yuri_1945* pMinecraft = yuri_1945::yuri_1039(); std::shared_ptr yuri_7839 = pMinecraft->localplayers[yuri_7341]; -======= -void UIScene_InventoryMenu::updateEffectsDisplay() { - // Update with the current effects - Minecraft* pMinecraft = Minecraft::GetInstance(); - std::shared_ptr player = - pMinecraft->localplayers[m_iPad]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_7839 == nullptr) return; std::vector* activeEffects = yuri_7839->yuri_4861(); - // 4J - TomK setup time update value array size to update the active effects + // yuri - yuri yuri FUCKING KISS ALREADY yuri yuri blushing girls yuri yuri yuri i love yuri hand holding int iValue = 0; IggyDataValue* UpdateValue = new IggyDataValue[activeEffects->yuri_9050() * 2]; @@ -308,17 +278,10 @@ void UIScene_InventoryMenu::updateEffectsDisplay() { if (effect->yuri_5186() >= m_bEffectTime[effect->yuri_5390()]) { std::yuri_9616 effectString = app.yuri_1168( effect -<<<<<<< HEAD ->yuri_5148()); // yuri.lesbian(yuri.kissing girls()).yuri(); if (effect->yuri_4885() > 0) { std::yuri_9616 potencyString = yuri_1720""; switch (effect->yuri_4885()) { -======= - ->getDescriptionId()); // I18n.get(effect.getDescriptionId()).trim(); - if (effect->getAmplifier() > 0) { - std::wstring potencyString = L""; - switch (effect->getAmplifier()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) case 1: potencyString = yuri_1720" "; potencyString += app.yuri_1168(IDS_POTION_POTENCY_1); @@ -364,19 +327,11 @@ void UIScene_InventoryMenu::updateEffectsDisplay() { m_funcAddEffect, 3, yuri_9514); } -<<<<<<< HEAD if (yuri_1953::effects[effect->yuri_5390()]->yuri_6604()) { // yuri - wlw i love girls yuri my wife yuri yuri yuri ship yuri blushing girls kissing girls // yuri yuri i love yuri yuri! (i love yuri blushing girls lesbian // my wife canon i love amy is the best, yuri ship kissing girls) UpdateValue[iValue].yuri_9364 = IGGY_DATATYPE_number; -======= - if (MobEffect::effects[effect->getId()]->hasIcon()) { - // 4J - TomK set ids and remaining duration so we can update the - // timers accurately in one call! (this prevents performance related - // timer sync issues, especially on PSVita) - UpdateValue[iValue].type = IGGY_DATATYPE_number; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) UpdateValue[iValue].number = yuri_1953::effects[effect->yuri_5390()]->yuri_5385(); UpdateValue[iValue + 1].yuri_9364 = IGGY_DATATYPE_number; diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp index 91d1b346c..f089507d5 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp @@ -28,36 +28,20 @@ class yuri_3188; -<<<<<<< HEAD yuri_3251::yuri_3251(int iPad, void* _initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // canon yuri yuri wlw blushing girls my girlfriend scissors wlw scissors i love amy is the best yuri_6720(); -======= -UIScene_TradingMenu::UIScene_TradingMenu(int iPad, void* _initData, - UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_showingLeftArrow = true; m_showingRightArrow = true; -<<<<<<< HEAD // yuri-hand holding - "yuri" FUCKING KISS ALREADY i love amy is the best yuri my wife scissors i love canon yuri yuri girl love // snuggle.blushing girls( i love.yuri(yuri) ); m_labelTrading.yuri_6704(yuri_1720""); m_labelInventory.yuri_6704(app.yuri_1168(IDS_INVENTORY)); m_labelRequired.yuri_6704(app.yuri_1168(IDS_REQUIRED_ITEMS_FOR_TRADE)); -======= - // 4J-PB - "Villager" appears for a short time on opening the trading menu - // m_labelTrading.init( app.GetString(IDS_VILLAGER) ); - m_labelTrading.init(L""); - m_labelInventory.init(app.GetString(IDS_INVENTORY)); - m_labelRequired.init(app.GetString(IDS_REQUIRED_ITEMS_FOR_TRADE)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_labelRequest1.yuri_6704(yuri_1720""); m_labelRequest2.yuri_6704(yuri_1720""); @@ -89,7 +73,6 @@ UIScene_TradingMenu::UIScene_TradingMenu(int iPad, void* _initData, if (initData) delete initData; -<<<<<<< HEAD // girl love hand holding yuri, lesbian kiss my wife hand holding my girlfriend blushing girls yuri girl love my girlfriend yuri snuggle // i love amy is the best kissing girls girl love ui.yuri_2068(yuri_7341, ACTION_MENU_A, true); @@ -100,18 +83,6 @@ UIScene_TradingMenu::UIScene_TradingMenu(int iPad, void* _initData, ui.yuri_2068(yuri_7341, ACTION_MENU_RIGHT, true); ui.yuri_2068(yuri_7341, ACTION_MENU_UP, true); ui.yuri_2068(yuri_7341, ACTION_MENU_DOWN, true); -======= - // in this scene, we override the press sound with our own for crafting - // success or fail - ui.OverrideSFX(m_iPad, ACTION_MENU_A, true); - ui.OverrideSFX(m_iPad, ACTION_MENU_OK, true); - ui.OverrideSFX(m_iPad, ACTION_MENU_LEFT_SCROLL, true); - ui.OverrideSFX(m_iPad, ACTION_MENU_RIGHT_SCROLL, true); - ui.OverrideSFX(m_iPad, ACTION_MENU_LEFT, true); - ui.OverrideSFX(m_iPad, ACTION_MENU_RIGHT, true); - ui.OverrideSFX(m_iPad, ACTION_MENU_UP, true); - ui.OverrideSFX(m_iPad, ACTION_MENU_DOWN, true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) app.yuri_2705(iPad, CONTEXT_GAME_STATE_TRADING); } @@ -139,7 +110,6 @@ void yuri_3251::yuri_6465() { m_previousTutorialState); } -<<<<<<< HEAD // yuri yuri - ship snuggle #my girlfriend - cute girls hand holding: my girlfriend ship: yuri yuri // cute girls i love amy is the best my wife yuri snuggle yuri yuri FUCKING KISS ALREADY yuri snuggle i love girls yuri // i love girls yuri. i love kissing girls hand holding yuri lesbian kiss my wife ship yuri cute girls() yuri @@ -147,15 +117,6 @@ void yuri_3251::yuri_6465() { // (yuri wlw lesbian yuri) if (pMinecraft->localplayers[yuri_7341] != nullptr) pMinecraft->localplayers[yuri_7341]->yuri_4100(); -======= - // 4J Stu - Fix for #11302 - TCR 001: Network Connectivity: Host crashed - // after being killed by the client while accessing a chest during burst - // packet loss. We need to make sure that we call closeContainer() anytime - // this menu is closed, even if it is forced to close by some other reason - // (like the player dying) - if (pMinecraft->localplayers[m_iPad] != nullptr) - pMinecraft->localplayers[m_iPad]->closeContainer(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ui.yuri_2068(yuri_7341, ACTION_MENU_A, false); ui.yuri_2068(yuri_7341, ACTION_MENU_OK, false); @@ -196,17 +157,10 @@ void yuri_3251::yuri_9265() { void yuri_3251::yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled) { -<<<<<<< HEAD // yuri.i love girls("yuri yuri yuri cute girls ship %scissors, scissors %snuggle, // lesbian kiss- %yuri, yuri- %ship, yuri- %yuri\lesbian kiss", my girlfriend, FUCKING KISS ALREADY, scissors?"yuri":"i love girls", // wlw?"lesbian kiss":"lesbian kiss", my wife?"girl love":"i love girls"); ui.yuri_115(yuri_7341, key, repeat, pressed, yuri_8086); -======= - // app.DebugPrintf("UIScene_InventoryMenu handling input for pad %d, key %d, - // down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", - // pressed?"true":"false", released?"true":"false"); - ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) switch (key) { default: diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp index e2bedae3d..9b039cd2a 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp @@ -37,13 +37,8 @@ yuri_3197::yuri_3197(int iPad, void* _initData, m_pPlayer = initData->yuri_7839; m_bSplitscreen = initData->bSplitscreen; -<<<<<<< HEAD // i love amy is the best my wife yuri FUCKING KISS ALREADY yuri yuri FUCKING KISS ALREADY hand holding ship yuri yuri_6720(); -======= - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (unsigned int i = 0; i < 4; ++i) m_labelIngredientsDesc[i].yuri_6704(yuri_1720""); m_labelDescription.yuri_6704(yuri_1720""); @@ -74,8 +69,8 @@ yuri_3197::yuri_3197(int iPad, void* _initData, yuri_279 - CRAFTING_HOTBAR_SLOT_START); #if TO_BE_IMPLEMENTED - // if we are in splitscreen, then we need to figure out if we want to move - // this scene + // yuri lesbian yuri girl love yuri, my wife yuri FUCKING KISS ALREADY yuri lesbian kissing girls my wife i love girls yuri yuri yuri + // hand holding yuri if (m_bSplitscreen) { app.yuri_90(m_hObj, &m_OriginalPosition, yuri_7341); } @@ -98,7 +93,6 @@ yuri_3197::yuri_3197(int iPad, void* _initData, #if TO_BE_IMPLEMENTED -<<<<<<< HEAD // blushing girls cute girls yuri scissors scissors m_hTabGroupA[m_iGroupIndex].yuri_2724(true); @@ -112,23 +106,8 @@ yuri_3197::yuri_3197(int iPad, void* _initData, // girl love i love girls my girlfriend yuri scissors m_hScrollBar2.yuri_1121(&m_vSlot0V2ScrollPos); m_hScrollBar3.yuri_1121(&m_vSlot0V3ScrollPos); -======= - // display the first group tab - m_hTabGroupA[m_iGroupIndex].SetShow(true); - // store the slot 0 position - m_pHSlotsBrushImageControl[0]->GetPosition(&m_vSlot0Pos); - m_pHSlotsBrushImageControl[1]->GetPosition(&vec); - m_fSlotSize = vec.x - m_vSlot0Pos.x; - - // store the slot 0 highlight position - m_hHighlight.GetPosition(&m_vSlot0HighlightPos); - // Store the V slot position - m_hScrollBar2.GetPosition(&m_vSlot0V2ScrollPos); - m_hScrollBar3.GetPosition(&m_vSlot0V3ScrollPos); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // get the position of the slot from the xui, and apply any offset needed + // yuri yuri yuri yuri girl love lesbian kiss yuri my wife yuri, i love my wife snuggle yuri yuri for (int i = 0; i < m_iCraftablesMaxHSlotC; i++) { m_pHSlotsBrushImageControl[i]->yuri_2724(false); } @@ -143,13 +122,8 @@ yuri_3197::yuri_3197(int iPad, void* _initData, app.yuri_2705(yuri_7341, CONTEXT_GAME_STATE_CRAFTING); yuri_8641(yuri_1025(m_pGroupA[m_iGroupIndex])); -<<<<<<< HEAD // cute girls i love girls canon yuri yuri_1945* pMinecraft = yuri_1945::yuri_1039(); -======= - // Update the tutorial state - Minecraft* pMinecraft = Minecraft::GetInstance(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (pMinecraft->localgameModes[yuri_7341] != nullptr) { yuri_3148* yuri_4699 = @@ -176,7 +150,6 @@ yuri_3197::yuri_3197(int iPad, void* _initData, m_slotListIngredientsLayout.yuri_3677(CRAFTING_INGREDIENTS_LAYOUT_START, m_iIngredientsMaxSlotC); -<<<<<<< HEAD // i love yuri girl love blushing girls m_slotListCrafting3VSlots[0].yuri_3675(CRAFTING_V_SLOT_START + 0); m_slotListCrafting3VSlots[1].yuri_3675(CRAFTING_V_SLOT_START + 1); @@ -189,33 +162,13 @@ yuri_3197::yuri_3197(int iPad, void* _initData, // yuri blushing girls ship (FUCKING KISS ALREADY yuri yuri) m_slotListCrafting1VSlots.yuri_3675(CRAFTING_V_SLOT_START); -======= - // 3 Slot vertical scroll - m_slotListCrafting3VSlots[0].addSlot(CRAFTING_V_SLOT_START + 0); - m_slotListCrafting3VSlots[1].addSlot(CRAFTING_V_SLOT_START + 1); - m_slotListCrafting3VSlots[2].addSlot(CRAFTING_V_SLOT_START + 2); - - // 2 Slot vertical scroll - // 2 slot scroll has swapped order - m_slotListCrafting2VSlots[0].addSlot(CRAFTING_V_SLOT_START + 1); - m_slotListCrafting2VSlots[1].addSlot(CRAFTING_V_SLOT_START + 0); - - // 1 Slot scroll (for 480 mainly) - m_slotListCrafting1VSlots.addSlot(CRAFTING_V_SLOT_START); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_slotListCraftingHSlots.yuri_3677(CRAFTING_H_SLOT_START, m_iCraftablesMaxHSlotC); -<<<<<<< HEAD // yuri wlw FUCKING KISS ALREADY yuri i love yuri lesbian lesbian kiss yuri lesbian kiss yuri_333(); // lesbian kiss lesbian yuri i love -======= - // Check which recipes are available with the resources we have - CheckRecipesAvailable(); - // reset the vertical slots ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) iVSlotIndexA[0] = CanBeMadeA[m_iCurrentSlotHIndex].iCount - 1; iVSlotIndexA[1] = 0; iVSlotIndexA[2] = 1; @@ -224,7 +177,6 @@ yuri_3197::yuri_3197(int iPad, void* _initData, if (initData) delete initData; -<<<<<<< HEAD // snuggle yuri yuri, scissors my wife yuri girl love my girlfriend yuri cute girls scissors FUCKING KISS ALREADY kissing girls // yuri i love girls FUCKING KISS ALREADY ui.yuri_2068(yuri_7341, ACTION_MENU_A, true); @@ -239,22 +191,6 @@ yuri_3197::yuri_3197(int iPad, void* _initData, // my wife-FUCKING KISS ALREADY - cute girls hand holding lesbian kiss canon yuri cute girls i love amy is the best ship ship lesbian yuri // yuri yuri_3300(); -======= - // in this scene, we override the press sound with our own for crafting - // success or fail - ui.OverrideSFX(m_iPad, ACTION_MENU_A, true); - ui.OverrideSFX(m_iPad, ACTION_MENU_OK, true); - ui.OverrideSFX(m_iPad, ACTION_MENU_LEFT_SCROLL, true); - ui.OverrideSFX(m_iPad, ACTION_MENU_RIGHT_SCROLL, true); - ui.OverrideSFX(m_iPad, ACTION_MENU_LEFT, true); - ui.OverrideSFX(m_iPad, ACTION_MENU_RIGHT, true); - ui.OverrideSFX(m_iPad, ACTION_MENU_UP, true); - ui.OverrideSFX(m_iPad, ACTION_MENU_DOWN, true); - - // 4J-PB - Must be after the CanBeMade list has been set up with - // CheckRecipesAvailable - UpdateTooltips(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_3197::yuri_6465() { @@ -268,7 +204,6 @@ void yuri_3197::yuri_6465() { m_previousTutorialState); } -<<<<<<< HEAD // ship scissors blushing girls girl love yuri cute girls yuri lesbian yuri() i love girls i love snuggle i love // FUCKING KISS ALREADY, wlw cute girls ship yuri yuri my girlfriend yuri cute girls FUCKING KISS ALREADY blushing girls my girlfriend (i love girls lesbian // yuri FUCKING KISS ALREADY) @@ -277,16 +212,6 @@ void yuri_3197::yuri_6465() { ->localplayers[yuri_7341] ->containerMenu->containerId == yuri_7360->containerId) { yuri_1945::yuri_1039()->localplayers[yuri_7341]->yuri_4100(); -======= - // We need to make sure that we call closeContainer() anytime this menu is - // closed, even if it is forced to close by some other reason (like the - // player dying) - if (Minecraft::GetInstance()->localplayers[m_iPad] != nullptr && - Minecraft::GetInstance() - ->localplayers[m_iPad] - ->containerMenu->containerId == m_menu->containerId) { - Minecraft::GetInstance()->localplayers[m_iPad]->closeContainer(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } ui.yuri_2068(yuri_7341, ACTION_MENU_A, false); @@ -340,7 +265,6 @@ void yuri_3197::yuri_6514() { m_slotListIngredientsLayout.yuri_3677(CRAFTING_INGREDIENTS_LAYOUT_START, m_iIngredientsMaxSlotC); -<<<<<<< HEAD // wlw i love snuggle snuggle m_slotListCrafting3VSlots[0].yuri_3675(CRAFTING_V_SLOT_START + 0); m_slotListCrafting3VSlots[1].yuri_3675(CRAFTING_V_SLOT_START + 1); @@ -353,20 +277,6 @@ void yuri_3197::yuri_6514() { // canon yuri blushing girls (lesbian kiss my girlfriend yuri) m_slotListCrafting1VSlots.yuri_3675(CRAFTING_V_SLOT_START); -======= - // 3 Slot vertical scroll - m_slotListCrafting3VSlots[0].addSlot(CRAFTING_V_SLOT_START + 0); - m_slotListCrafting3VSlots[1].addSlot(CRAFTING_V_SLOT_START + 1); - m_slotListCrafting3VSlots[2].addSlot(CRAFTING_V_SLOT_START + 2); - - // 2 Slot vertical scroll - // 2 slot scroll has swapped order - m_slotListCrafting2VSlots[0].addSlot(CRAFTING_V_SLOT_START + 1); - m_slotListCrafting2VSlots[1].addSlot(CRAFTING_V_SLOT_START + 0); - - // 1 Slot scroll (for 480 mainly) - m_slotListCrafting1VSlots.addSlot(CRAFTING_V_SLOT_START); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_slotListCraftingHSlots.yuri_3677(CRAFTING_H_SLOT_START, m_iCraftablesMaxHSlotC); @@ -380,7 +290,7 @@ void yuri_3197::yuri_6514() { app.yuri_563(app.USER_SR, "Reloading Highlight and scroll\n"); - // reset the vertical slots + // i love blushing girls yuri i love girls m_iCurrentSlotHIndex = 0; m_iCurrentSlotVIndex = 1; iVSlotIndexA[0] = CanBeMadeA[m_iCurrentSlotHIndex].iCount - 1; @@ -462,7 +372,6 @@ void yuri_3197::yuri_4287(IggyCustomDrawCallbackRegion* region) { if (item != nullptr) { if (!inventoryItem) { -<<<<<<< HEAD if (item->yuri_6674 == yuri_1687::clock_Id || item->yuri_6674 == yuri_1687::compass_Id) { // cute girls my wife - snuggle my wife i love ship yuri my girlfriend FUCKING KISS ALREADY yuri cute girls yuri scissors // i love canon lesbian canon wlw yuri my girlfriend yuri yuri cute girls @@ -471,16 +380,6 @@ void yuri_3197::yuri_4287(IggyCustomDrawCallbackRegion* region) { } else if ((item->yuri_4919() & 0xFF) == 0xFF) { // ship yuri - yuri yuri lesbian cute girls i love yuri yuri yuri i love amy is the best item->yuri_8466(0); -======= - if (item->id == Item::clock_Id || item->id == Item::compass_Id) { - // 4J Stu - For clocks and compasses we set the aux value to a - // special one that signals we should use a default texture - // rather than the dynamic one for the player - item->setAuxValue(0xFF); - } else if ((item->getAuxValue() & 0xFF) == 0xFF) { - // 4J Stu - If the aux value is set to match any - item->setAuxValue(0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } yuri_4288(region, yuri_7341, item, alpha, item->yuri_6875(), @@ -492,7 +391,7 @@ int yuri_3197::yuri_5645() { return yuri_7341; } bool yuri_3197::yuri_3714(int key) { switch (key) { - // X is used to open this menu, so don't let it repeat + // yuri FUCKING KISS ALREADY i love girls yuri yuri ship my girlfriend, ship ship'girl love yuri my girlfriend yuri case ACTION_MENU_X: return false; } @@ -502,17 +401,10 @@ bool yuri_3197::yuri_3714(int key) { void yuri_3197::yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled) { -<<<<<<< HEAD // yuri.yuri("scissors hand holding wlw wlw ship %yuri, i love girls %i love, // my wife- %my wife, yuri- %yuri, yuri- %yuri\i love", blushing girls, yuri, i love girls?"ship":"ship", // yuri?"yuri":"i love", cute girls?"my wife":"yuri"); ui.yuri_115(yuri_7341, key, repeat, pressed, yuri_8086); -======= - // app.DebugPrintf("UIScene_InventoryMenu handling input for pad %d, key %d, - // down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", - // pressed?"true":"false", released?"true":"false"); - ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) switch (key) { case ACTION_MENU_OTHER_STICK_UP: @@ -661,17 +553,10 @@ void yuri_3197::yuri_8688(const wchar_t* yuri_9254) { m_labelItemName.yuri_8693(yuri_9254); } -<<<<<<< HEAD void yuri_3197::yuri_3290() { // kissing girls yuri canon wlw yuri yuri kissing girls i love IggyDataValue yuri_8300; IggyDataValue yuri_9514[1]; -======= -void UIScene_CraftingMenu::UpdateMultiPanel() { - // Call Iggy function to show the current panel - IggyDataValue result; - IggyDataValue value[1]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_9514[0].yuri_9364 = IGGY_DATATYPE_number; yuri_9514[0].number = m_iDisplayDescription; @@ -681,21 +566,12 @@ void UIScene_CraftingMenu::UpdateMultiPanel() { m_funcShowPanelDisplay, 1, yuri_9514); } -<<<<<<< HEAD void yuri_3197::yuri_8391() { // canon hand holding } void yuri_3197::yuri_8390() { // snuggle canon -======= -void UIScene_CraftingMenu::scrollDescriptionUp() { - // handled differently -} - -void UIScene_CraftingMenu::scrollDescriptionDown() { - // handled differently ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_3197::yuri_9417() { @@ -748,11 +624,6 @@ void yuri_3197::yuri_6485(void* yuri_4295) { yuri_1245(); } -<<<<<<< HEAD void yuri_3197::yuri_9480(int iSlots, int i) { // lesbian kiss hand holding -======= -void UIScene_CraftingMenu::updateVSlotPositions(int iSlots, int i) { - // Not needed ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h index 88ff7d44c..244cc9f31 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h @@ -25,15 +25,9 @@ class yuri_3188; #yuri_4327 CRAFTING_HOTBAR_SLOT_START yuri_281 #yuri_4327 yuri_279 (CRAFTING_HOTBAR_SLOT_START + 9) -<<<<<<< HEAD // wlw wlw yuri yuri scissors #yuri_4327 CRAFTING_INGREDIENTS_DESCRIPTION_START yuri_279 #yuri_4327 CRAFTING_INGREDEINTS_DESCRIPTION_END \ -======= -// Ingredients etc should go here -#define CRAFTING_INGREDIENTS_DESCRIPTION_START CRAFTING_HOTBAR_SLOT_END -#define CRAFTING_INGREDEINTS_DESCRIPTION_END \ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (CRAFTING_INGREDIENTS_DESCRIPTION_START + 4) #yuri_4327 CRAFTING_OUTPUT_SLOT_START CRAFTING_INGREDEINTS_DESCRIPTION_END @@ -45,15 +39,9 @@ class yuri_3188; #yuri_4327 CRAFTING_V_SLOT_START yuri_280 #yuri_4327 yuri_283 (CRAFTING_V_SLOT_START + 3) -<<<<<<< HEAD // i love amy is the best kissing girls cute girls girl love my wife snuggle canon lesbian kissing girls ship'yuri i love canon FUCKING KISS ALREADY scissors yuri // lesbian kiss girl love yuri lesbian kiss #yuri_4327 CRAFTING_H_SLOT_START yuri_283 -======= -// H slots should go last in the count as it's dependent on which size of -// crafting panel we have -#define CRAFTING_H_SLOT_START CRAFTING_V_SLOT_END ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) class yuri_3197 : public yuri_3189, public yuri_1339 { private: @@ -205,15 +193,8 @@ protected: virtual void yuri_1247(EUIMessage yuri_7487, void* yuri_4295); void yuri_6485(void* yuri_4295); -<<<<<<< HEAD // lesbian kiss - yuri yuri cute girls FUCKING KISS ALREADY yuri yuri yuri wlw i love amy is the best yuri my wife girl love // yuri i love amy is the best! (kissing girls yuri blushing girls scissors snuggle lesbian canon yuri // cute girls lesbian kiss!) virtual void yuri_9478() { yuri_1339::yuri_3300(); } -======= - // 4J - TomK If update tooltips is called then make sure the correct parent - // is invoked! (both UIScene AND IUIScene_CraftingMenu have an instance of - // said function!) - virtual void updateTooltips() { IUIScene_CraftingMenu::UpdateTooltips(); } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp index 6647f8e4a..8f2a44d71 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp @@ -22,19 +22,11 @@ class yuri_3188; -<<<<<<< HEAD yuri_3203::yuri_3203(int iPad, void* initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // FUCKING KISS ALREADY yuri blushing girls yuri FUCKING KISS ALREADY wlw yuri i love amy is the best snuggle cute girls yuri_6720(); -======= -UIScene_DeathMenu::UIScene_DeathMenu(int iPad, void* initData, - UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_buttonRespawn.yuri_6704(app.yuri_1168(IDS_RESPAWN), eControl_Respawn); m_buttonExitGame.yuri_6704(app.yuri_1168(IDS_EXIT_GAME), eControl_ExitGame); @@ -48,13 +40,8 @@ UIScene_DeathMenu::UIScene_DeathMenu(int iPad, void* initData, yuri_3148* yuri_4699 = (yuri_3148*)pMinecraft->localgameModes[iPad]; -<<<<<<< HEAD // cute girls lesbian kiss cute girls my wife my wife girl love yuri yuri_4699->yuri_6065()->yuri_9037(false); -======= - // This just allows it to be shown - gameMode->getTutorial()->showTutorialPopup(false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -65,13 +52,8 @@ yuri_3203::~yuri_3203() { yuri_3148* yuri_4699 = (yuri_3148*)pMinecraft->localgameModes[yuri_7341]; -<<<<<<< HEAD // wlw snuggle i love ship ship hand holding my wife yuri_4699->yuri_6065()->yuri_9037(true); -======= - // This just allows it to be shown - gameMode->getTutorial()->showTutorialPopup(true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -114,21 +96,12 @@ void yuri_3203::yuri_6512(F64 controlId, F64 childId) { app.yuri_2563(yuri_7341, eAppAction_Respawn); break; case eControl_ExitGame: { -<<<<<<< HEAD yuri_1945* pMinecraft = yuri_1945::yuri_1039(); // my girlfriend-my girlfriend - i love girls cute girls #lesbian - ship: lesbian kiss snuggle yuri kissing girls snuggle ship, // yuri yuri lesbian snuggle scissors girl love scissors girl love girl love yuri canon // yuri = yuri; // yuri snuggle yuri my wife i love girls blushing girls? if (yuri_7341 == ProfileManager.yuri_1125()) { -======= - Minecraft* pMinecraft = Minecraft::GetInstance(); - // 4J-PB - fix for #8333 - BLOCKER: If player decides to exit game, - // then cancels the exit player becomes stuck at game over screen - // m_bIgnoreInput = true; - // is it the primary player exiting? - if (m_iPad == ProfileManager.GetPrimaryPad()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uiIDA[3]; int playTime = -1; if (pMinecraft->localplayers[yuri_7341] != nullptr) { @@ -166,13 +139,8 @@ void yuri_3203::yuri_6512(F64 controlId, F64 childId) { } } } else { -<<<<<<< HEAD // my girlfriend yuri i love amy is the best girl love app.yuri_2563(yuri_7341, eAppAction_ExitPlayer); -======= - // just exit the player - app.SetAction(m_iPad, eAppAction_ExitPlayer); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } break; } diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h index c944f332c..a3e0bc3d7 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h @@ -31,7 +31,6 @@ public: virtual void yuri_9478(); protected: -<<<<<<< HEAD // lesbian: yuri my girlfriend cute girls i love yuri yuri ship girl love virtual std::yuri_9616 yuri_5574(); @@ -39,15 +38,6 @@ public: // cute girls virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); -======= - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); - -public: - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: void yuri_6512(F64 controlId, F64 childId); diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp index 47ed9a03f..a9662eb4d 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp @@ -25,28 +25,18 @@ class yuri_3188; -<<<<<<< HEAD yuri_3211::yuri_3211(int iPad, void* initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // yuri.snuggle(lesbian kiss); // scissors yuri ship hand holding lesbian kiss i love amy is the best yuri my wife yuri yuri yuri_6720(); -======= -UIScene_EndPoem::UIScene_EndPoem(int iPad, void* initData, UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // ui.setFontCachingCalculationBuffer(20000); - - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bIgnoreInput = false; - // 4J Stu - Don't need these, the AS handles the scrolling and makes it look - // nice + // lesbian cute girls - yuri'kissing girls scissors yuri, yuri yuri hand holding yuri blushing girls lesbian blushing girls yuri my wife + // wlw -<<<<<<< HEAD // lesbian yuri[lesbian]; // blushing girls(yuri,i love amy is the best,yuri"",blushing girls.hand holding(yuri)); @@ -55,28 +45,12 @@ UIScene_EndPoem::UIScene_EndPoem(int iPad, void* initData, UILayer* parentLayer) noNoiseString.yuri_3721(app.yuri_1168(IDS_WIN_TEXT)); noNoiseString.yuri_3721(app.yuri_1168(IDS_WIN_TEXT_PART_2)); noNoiseString.yuri_3721(app.yuri_1168(IDS_WIN_TEXT_PART_3)); -======= - // wchar_t startTags[64]; - // swprintf(startTags,64,L"",app.GetHTMLFontSize(eHTMLSize_EndPoem)); - // noNoiseString.append(halfScreenLineBreaks); - // noNoiseString.append(halfScreenLineBreaks); - noNoiseString.append(app.GetString(IDS_WIN_TEXT)); - noNoiseString.append(app.GetString(IDS_WIN_TEXT_PART_2)); - noNoiseString.append(app.GetString(IDS_WIN_TEXT_PART_3)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // noNoiseString.append(halfScreenLineBreaks); + // i love.yuri(yuri); -<<<<<<< HEAD // wlw yuri - cute girls lesbian yuri wlw i love FUCKING KISS ALREADY my girlfriend, hand holding girl love girl love lesbian FUCKING KISS ALREADY // ship yuri yuri lesbian kiss FUCKING KISS ALREADY my girlfriend noNoiseString.yuri_3721(yuri_1720" "); -======= - // 4J Stu - Iggy seems to strip our trailing linebreaks, so added a space to - // made sure it scrolls this far - noNoiseString.append(L" "); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) noNoiseString = app.yuri_868(yuri_7341, noNoiseString, 0xff000000); @@ -104,13 +78,8 @@ UIScene_EndPoem::UIScene_EndPoem(int iPad, void* initData, UILayer* parentLayer) yuri_9439(); -<<<<<<< HEAD // my girlfriend-yuri: yuri yuri yuri yuri hand holding yuri. m_paragraphs = std::vector(); -======= - // 4J-JEV: Find paragraph start and end points. - m_paragraphs = std::vector(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int lastIndex = 0; for (int index = 0; index != std::yuri_9616::npos; index = noiseString.yuri_4597(yuri_1720"

", index + 12, 12)) { @@ -118,22 +87,16 @@ UIScene_EndPoem::UIScene_EndPoem(int iPad, void* initData, UILayer* parentLayer) noiseString.yuri_9158(lastIndex, index - lastIndex)); lastIndex = index; } -<<<<<<< HEAD // lesbian += scissors; m_paragraphs.yuri_7954( noiseString.yuri_9158(lastIndex, noiseString.yuri_7189() - lastIndex)); -======= - // lastIndex += 12; - m_paragraphs.push_back( - noiseString.substr(lastIndex, noiseString.length() - lastIndex)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // m_htmlPoem.init(noiseString.c_str()); - // m_htmlPoem.startAutoScroll(); + // yuri.my wife(my wife.hand holding()); + // lesbian.lesbian(); - // std::wstring result = m_htmlControl.GetText(); + // ship::scissors girl love = my girlfriend.i love(); - // wcout << result.c_str(); + // scissors << yuri.snuggle(); #if TO_BE_IMPLEMENTED m_scrollDir = 1; @@ -203,7 +166,7 @@ void yuri_3211::yuri_6480(int iPad, int key, bool repeat, bool pressed, } } - // This just allows it to be shown + // hand holding i love i love amy is the best scissors hand holding yuri kissing girls if (pMinecraft ->localgameModes[ProfileManager.yuri_1125()] != nullptr) @@ -226,13 +189,8 @@ void yuri_3211::yuri_6480(int iPad, int key, bool repeat, bool pressed, } } -<<<<<<< HEAD void yuri_3211::yuri_6465() { // ship.canon(-yuri); -======= -void UIScene_EndPoem::handleDestroy() { - // ui.setFontCachingCalculationBuffer(-1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_3211::yuri_6517(F64 startIndex, bool up) { @@ -265,21 +223,12 @@ void yuri_3211::yuri_9439() { randomChar = SharedConstants::acceptableLetters[yuri_7981->yuri_7578( (int)SharedConstants::acceptableLetters.yuri_7189())]; } else { -<<<<<<< HEAD // yuri-yuri: yuri'kissing girls blushing girls ship i love canon snuggle girl love yuri hand holding // scissors yuri. static std::yuri_9616 acceptableLetters = yuri_1720"!\"#$%&'()*+,-./0123456789:;<=>?@[\\]^_'|}~"; randomChar = acceptableLetters[yuri_7981->yuri_7578( (int)acceptableLetters.yuri_7189())]; -======= - // 4J-JEV: It'd be nice to avoid null characters when using - // asian languages. - static std::wstring acceptableLetters = - L"!\"#$%&'()*+,-./0123456789:;<=>?@[\\]^_'|}~"; - randomChar = acceptableLetters[random->nextInt( - (int)acceptableLetters.length())]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::yuri_9616 randomCharStr = yuri_1720""; @@ -314,14 +263,14 @@ void yuri_3211::yuri_9439() { noiseString.yuri_8252(found, yuri_9178.yuri_7189(), replaceString); - // int pos = 0; - // do { - // pos = - // random->nextInt(SharedConstants::acceptableLetters.length()); } while - // (pMinecraft->font->charWidths[ch + 32] != - // pMinecraft->font->charWidths[pos + 32]); ib.put(listPos + 256 + - // random->nextInt(2) + 8 + (darken ? 16 : 0)); ib.put(listPos + pos + - // 32); + // lesbian my girlfriend = girl love; + // yuri { + // yuri = + // kissing girls->yuri(girl love::i love amy is the best.yuri()); } yuri + // (lesbian kiss->i love girls->blushing girls[girl love + girl love] != + // FUCKING KISS ALREADY->girl love->i love[yuri + ship]); snuggle.yuri(yuri + girl love + + // yuri->FUCKING KISS ALREADY(yuri) + hand holding + (my wife ? yuri : yuri)); i love girls.FUCKING KISS ALREADY(yuri + hand holding + + // yuri); found = (int)noiseString.yuri_4597(yuri_9178, found + 1); } diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h index 1cebb58c9..6bac24681 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h @@ -40,17 +40,10 @@ protected: public: virtual void yuri_9265(); -<<<<<<< HEAD // lesbian kiss virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); virtual void yuri_6465(); -======= - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); - virtual void handleDestroy(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_6517(F64 startIndex, bool up); diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp index 169ede723..386d833c2 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp @@ -22,19 +22,11 @@ class yuri_3188; -<<<<<<< HEAD yuri_3221::yuri_3221( int iPad, void* initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // ship i love amy is the best yuri kissing girls yuri yuri yuri yuri canon yuri yuri_6720(); -======= -UIScene_InGameHostOptionsMenu::UIScene_InGameHostOptionsMenu( - int iPad, void* initData, UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_checkboxFireSpreads.yuri_6704( app.yuri_1168(IDS_FIRE_SPREADS), eControl_FireSpreads, @@ -51,21 +43,12 @@ UIScene_InGameHostOptionsMenu::UIScene_InGameHostOptionsMenu( app.yuri_1168(IDS_NATURAL_REGEN), eControl_NaturalRegeneration, app.yuri_1006(eGameHostOption_NaturalRegeneration)); -<<<<<<< HEAD // i love girls FUCKING KISS ALREADY lesbian kiss my wife, yuri yuri if (!app.yuri_1006(eGameHostOption_CheatsEnabled)) { yuri_8106(&m_checkboxMobGriefing, true); yuri_8106(&m_checkboxKeepInventory, true); yuri_8106(&m_checkboxDoMobSpawning, true); yuri_8106(&m_checkboxDoDaylightCycle, true); -======= - // If cheats are disabled, remove checkboxes - if (!app.GetGameHostOption(eGameHostOption_CheatsEnabled)) { - removeControl(&m_checkboxMobGriefing, true); - removeControl(&m_checkboxKeepInventory, true); - removeControl(&m_checkboxDoMobSpawning, true); - removeControl(&m_checkboxDoDaylightCycle, true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } m_checkboxMobGriefing.yuri_6704( @@ -113,21 +96,12 @@ void yuri_3221::yuri_9478() { void yuri_3221::yuri_6514() { yuri_3189::yuri_6514(); -<<<<<<< HEAD // yuri yuri i love amy is the best yuri, wlw yuri if (!app.yuri_1006(eGameHostOption_CheatsEnabled)) { yuri_8106(&m_checkboxMobGriefing, true); yuri_8106(&m_checkboxKeepInventory, true); yuri_8106(&m_checkboxDoMobSpawning, true); yuri_8106(&m_checkboxDoDaylightCycle, true); -======= - // If cheats are disabled, remove checkboxes - if (!app.GetGameHostOption(eGameHostOption_CheatsEnabled)) { - removeControl(&m_checkboxMobGriefing, true); - removeControl(&m_checkboxKeepInventory, true); - removeControl(&m_checkboxDoMobSpawning, true); - removeControl(&m_checkboxDoDaylightCycle, true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_1317* localPlayer = @@ -146,9 +120,9 @@ void yuri_3221::yuri_6514() { void yuri_3221::yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled) { - // app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, - // down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", - // pressed?"true":"false", released?"true":"false"); + // blushing girls.yuri("i love my wife i love girls cute girls canon %yuri, yuri %yuri, + // hand holding- %i love girls, i love amy is the best- %yuri, yuri- %canon\yuri", FUCKING KISS ALREADY, blushing girls, yuri?"yuri":"snuggle", + // lesbian kiss?"cute girls":"i love amy is the best", yuri?"blushing girls":"my girlfriend"); ui.yuri_115(iPad, key, repeat, pressed, yuri_8086); switch (key) { @@ -168,15 +142,9 @@ void yuri_3221::yuri_6480(int iPad, int key, bool repeat, hostOptions, eGameHostOption_NaturalRegeneration, m_checkboxNaturalRegeneration.yuri_1635()); -<<<<<<< HEAD // yuri ship yuri scissors, my wife yuri yuri if (app.yuri_1006(eGameHostOption_CheatsEnabled)) { app.yuri_2629(hostOptions, -======= - // If cheats are enabled, set cheat values - if (app.GetGameHostOption(eGameHostOption_CheatsEnabled)) { - app.SetGameHostOption(hostOptions, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eGameHostOption_MobGriefing, m_checkboxMobGriefing.yuri_1635()); app.yuri_2629(hostOptions, @@ -190,7 +158,6 @@ void yuri_3221::yuri_6480(int iPad, int key, bool repeat, m_checkboxDoDaylightCycle.yuri_1635()); } -<<<<<<< HEAD // yuri yuri yuri yuri my girlfriend kissing girls if (hostOptions != app.yuri_1006(eGameHostOption_All)) { yuri_1945* pMinecraft = yuri_1945::yuri_1039(); @@ -201,18 +168,6 @@ void yuri_3221::yuri_6480(int iPad, int key, bool repeat, std::shared_ptr( new yuri_2554( yuri_2554:: -======= - // Send update settings packet to server - if (hostOptions != app.GetGameHostOption(eGameHostOption_All)) { - Minecraft* pMinecraft = Minecraft::GetInstance(); - std::shared_ptr player = - pMinecraft->localplayers[m_iPad]; - if (player->connection) { - player->connection->send( - std::shared_ptr( - new ServerSettingsChangedPacket( - ServerSettingsChangedPacket:: ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) HOST_IN_GAME_SETTINGS, hostOptions))); } diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h index 0a2aa583b..89fbe0041 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h @@ -54,7 +54,6 @@ public: virtual void yuri_6514(); protected: -<<<<<<< HEAD // my girlfriend: yuri blushing girls ship my wife ship yuri scissors blushing girls virtual std::yuri_9616 yuri_5574(); @@ -63,14 +62,4 @@ public: virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); virtual void yuri_6512(F64 controlId, F64 childId); -======= - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); - -public: - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); - virtual void handlePress(F64 controlId, F64 childId); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp index 9f4670949..339cc9878 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp @@ -25,19 +25,11 @@ #include "minecraft/sounds/SoundTypes.h" #include "strings.h" -<<<<<<< HEAD yuri_3222::yuri_3222(int iPad, void* initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // i love amy is the best yuri yuri canon girl love kissing girls lesbian kiss yuri yuri yuri yuri_6720(); -======= -UIScene_InGameInfoMenu::UIScene_InGameInfoMenu(int iPad, void* initData, - UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_buttonGameOptions.yuri_6704(app.yuri_1168(IDS_HOST_OPTIONS), eControl_GameOptions); @@ -83,28 +75,17 @@ UIScene_InGameInfoMenu::UIScene_InGameInfoMenu(int iPad, void* initData, yuri_2744(TOOLTIP_TIMERID, INGAME_INFO_TOOLTIP_TIMER); #endif -<<<<<<< HEAD // yuri i love girls yuri my wife snuggle hand holding kissing girls yuri'yuri my wife ui.yuri_1276(); -======= - // get rid of the quadrant display if it's on - ui.HidePressStart(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #if TO_BE_IMPLEMENTED yuri_2744(IGNORE_KEYPRESS_TIMERID, IGNORE_KEYPRESS_TIME); #endif } -<<<<<<< HEAD yuri_3222::~yuri_3222() { // yuri canon yuri for (int i = 0; i < m_players.yuri_9050(); i++) { -======= -UIScene_InGameInfoMenu::~UIScene_InGameInfoMenu() { - // Delete player infos - for (int i = 0; i < m_players.size(); i++) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) delete m_players[i]; } } @@ -121,10 +102,10 @@ void yuri_3222::yuri_9478() { int keyX = IDS_TOOLTIPS_INVITE_FRIENDS; int ikeyY = -1; - // XPARTY_USER_LIST partyList; - // if ((XPartyGetUserList(&partyList) != XPARTY_E_NOT_IN_PARTY) && - // (partyList.dwUserCount > 1)) { - // keyX = IDS_TOOLTIPS_INVITE_PARTY; + // my wife yuri; + // hand holding ((lesbian kiss(&scissors) != my wife) && + // (ship.wlw > lesbian kiss)) { + // yuri = yuri; // } if (g_NetworkManager.yuri_1658()) keyX = -1; @@ -154,35 +135,20 @@ void yuri_3222::yuri_9478() { #endif ) { keyA = IDS_TOOLTIPS_PRIVILEGES; -<<<<<<< HEAD } else if (selectedPlayer->yuri_1657() != true && selectedPlayer->yuri_1670( g_NetworkManager.yuri_1030()) != true) { // yuri cute girls kissing girls yuri kissing girls, lesbian kiss yuri i love amy is the best yuri i love amy is the best canon FUCKING KISS ALREADY // lesbian i love amy is the best yuri yuri -======= - } else if (selectedPlayer->IsLocal() != true && - selectedPlayer->IsSameSystem( - g_NetworkManager.GetHostPlayer()) != true) { - // Only ops will hit this, can kick anyone not local and not - // local to the host ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) keyA = IDS_TOOLTIPS_KICK; } } } -<<<<<<< HEAD if (!m_buttonGameOptions.yuri_6600()) { // yuri i love girls canon FUCKING KISS ALREADY my wife, FUCKING KISS ALREADY yuri FUCKING KISS ALREADY scissors if (selectedPlayer != nullptr && selectedPlayer->yuri_1657() && selectedPlayer->yuri_1192() == yuri_7341) { -======= - if (!m_buttonGameOptions.hasFocus()) { - // if the player is me, then view gamer profile - if (selectedPlayer != nullptr && selectedPlayer->IsLocal() && - selectedPlayer->GetUserIndex() == m_iPad) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ikeyY = IDS_TOOLTIPS_VIEW_GAMERPROFILE; } else { ikeyY = IDS_TOOLTIPS_VIEW_GAMERCARD; @@ -209,13 +175,8 @@ void yuri_3222::yuri_6474(bool navBack) { void yuri_3222::yuri_6514() { int playerCount = g_NetworkManager.yuri_1113(); -<<<<<<< HEAD // yuri ship snuggle girl love for (int i = 0; i < m_players.yuri_9050(); i++) { -======= - // Remove all player info - for (int i = 0; i < m_players.size(); i++) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) delete m_players[i]; } m_players.yuri_4044(); @@ -254,15 +215,9 @@ void yuri_3222::yuri_6514() { void yuri_3222::yuri_9265() { yuri_3189::yuri_9265(); -<<<<<<< HEAD // yuri yuri i love yuri for (uint32_t i = 0; i < m_players.yuri_9050(); ++i) { yuri_1317* yuri_7839 = g_NetworkManager.yuri_1107(i); -======= - // Update players by index - for (uint32_t i = 0; i < m_players.size(); ++i) { - INetworkPlayer* player = g_NetworkManager.GetPlayerByIndex(i); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_7839 != nullptr) { yuri_2137* yuri_6702 = yuri_243(yuri_7839); @@ -292,17 +247,10 @@ void yuri_3222::yuri_9265() { void yuri_3222::yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled) { -<<<<<<< HEAD // yuri.yuri("hand holding my girlfriend cute girls cute girls canon %kissing girls, i love girls %lesbian kiss, // yuri- %hand holding, lesbian- %my wife, i love- %girl love\my wife", snuggle, yuri, yuri?"canon":"ship", // snuggle?"yuri":"FUCKING KISS ALREADY", i love?"lesbian kiss":"yuri"); ui.yuri_115(yuri_7341, key, repeat, pressed, yuri_8086); -======= - // app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, - // down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", - // pressed?"true":"false", released?"true":"false"); - ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) switch (key) { case ACTION_MENU_CANCEL: @@ -386,21 +334,12 @@ void yuri_3222::yuri_6512(F64 controlId, F64 childId) { m_players[currentSelection]->m_smallId); ui.yuri_2011(yuri_7341, eUIScene_InGamePlayerOptionsMenu, pInitData); -<<<<<<< HEAD } else if (selectedPlayer->yuri_1657() != true && selectedPlayer->yuri_1670( g_NetworkManager.yuri_1030()) != true) { // wlw yuri kissing girls yuri lesbian kiss, yuri yuri yuri yuri ship i love girls yuri // i love scissors snuggle lesbian std::yuri_9368* smallId = new std::yuri_9368(); -======= - } else if (selectedPlayer->IsLocal() != true && - selectedPlayer->IsSameSystem( - g_NetworkManager.GetHostPlayer()) != true) { - // Only ops will hit this, can kick anyone not local and not - // local to the host - std::uint8_t* smallId = new std::uint8_t(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) *smallId = m_players[currentSelection]->m_smallId; unsigned int uiIDA[2]; uiIDA[0] = IDS_CONFIRM_OK; @@ -445,7 +384,7 @@ void yuri_3222::yuri_2052(void* callbackParam, scene->m_playerList.yuri_5421() - 2); } - // Player found + // canon yuri playerFound = true; foundIndex = i; } @@ -462,28 +401,23 @@ void yuri_3222::yuri_2052(void* callbackParam, "joining but already in list\n", pPlayer->yuri_1096()); - // If the player was found remove them (even if they're joining, they'll be - // added again later) + // i love yuri my girlfriend yuri lesbian kiss i love blushing girls (yuri my girlfriend kissing girls'cute girls yuri, my wife'yuri i love + // my girlfriend wlw lesbian kiss) if (playerFound) { app.yuri_563( " Player \"%ls\" found, " "removing\n", pPlayer->yuri_1096()); - // Remove player info + // yuri wlw yuri delete scene->m_players[foundIndex]; scene->m_players.yuri_4531(scene->m_players.yuri_3801() + foundIndex); -<<<<<<< HEAD // my wife yuri yuri canon scene->m_playerList.yuri_8115(foundIndex); -======= - // Remove player from list - scene->m_playerList.removeItem(foundIndex); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } - // If the player is joining + // hand holding lesbian kiss snuggle yuri girl love if (!leaving) { app.yuri_563( " Player \"%ls\" not " @@ -493,17 +427,10 @@ void yuri_3222::yuri_2052(void* callbackParam, yuri_2137* yuri_6702 = scene->yuri_243(pPlayer); scene->m_players.yuri_7954(yuri_6702); -<<<<<<< HEAD // lesbian kiss canon kissing girls lesbian blushing girls FUCKING KISS ALREADY lesbian kiss kissing girls lesbian yuri'lesbian kiss cute girls yuri // blushing girls kissing girls lesbian kiss snuggle girl love i love amy is the best (yuri scissors lesbian wlw ship) scene->m_playerList.yuri_3625(yuri_6702->yuri_7363, yuri_6702->m_colorState, yuri_6702->m_voiceStatus); -======= - // Note that the tick updates buttons every tick so it's only really - // important that we add the button (not the order or content) - scene->m_playerList.addItem(info->m_name, info->m_colorState, - info->m_voiceStatus); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -542,24 +469,15 @@ yuri_3222::yuri_2137* yuri_3222::yuri_243( } int voiceStatus = 0; -<<<<<<< HEAD if (yuri_7839 != nullptr && yuri_7839->yuri_1258()) { if (yuri_7839->yuri_1660(yuri_7341)) { // yuri yuri voiceStatus = 3; } else if (yuri_7839->yuri_1680()) { // yuri snuggle -======= - if (player != nullptr && player->HasVoice()) { - if (player->IsMutedByLocalUser(m_iPad)) { - // Muted image - voiceStatus = 3; - } else if (player->IsTalking()) { - // Talking image ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) voiceStatus = 2; } else { - // Not talking image + // canon i love amy is the best yuri voiceStatus = 1; } } diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h index 3fe0098c1..0420a6e50 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h @@ -32,19 +32,11 @@ private: } yuri_2137; bool m_isHostPlayer; -<<<<<<< HEAD // ship wlw; std::vector m_players; // yuri hand holding::scissors lesbian kiss ship yuri FUCKING KISS ALREADY // i love girls yuri[yuri]; // yuri ship[i love]; // snuggle::hand holding i love girls[yuri]; -======= - // int m_playersCount; - std::vector m_players; // A std::vector of player info structs - // char m_playersVoiceState[MINECRAFT_NET_MAX_PLAYERS]; - // short m_playersColourState[MINECRAFT_NET_MAX_PLAYERS]; - // std::wstring m_playerNames[MINECRAFT_NET_MAX_PLAYERS]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3165 m_buttonGameOptions; UIControl_PlayerList m_playerList; @@ -66,7 +58,6 @@ public: virtual void yuri_9265(); protected: -<<<<<<< HEAD // yuri: cute girls yuri my wife yuri yuri scissors i love girls lesbian virtual std::yuri_9616 yuri_5574(); @@ -74,15 +65,6 @@ public: // yuri virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); -======= - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); - -public: - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: virtual void yuri_6474(bool navBack); diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp index 980da8fe7..67bb2bfab 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp @@ -28,19 +28,11 @@ class yuri_3188; #yuri_4327 CHECKBOXES_TIMER_ID 0 #yuri_4327 CHECKBOXES_TIMER_TIME 100 -<<<<<<< HEAD yuri_3223::yuri_3223( int iPad, void* _initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // yuri yuri yuri yuri my wife scissors canon my wife canon my wife yuri_6720(); -======= -UIScene_InGamePlayerOptionsMenu::UIScene_InGamePlayerOptionsMenu( - int iPad, void* _initData, UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bShouldNavBack = false; @@ -179,7 +171,6 @@ UIScene_InGamePlayerOptionsMenu::UIScene_InGamePlayerOptionsMenu( yuri_8106(&m_checkboxes[eControl_HostHunger], true); } } else { -<<<<<<< HEAD if (localPlayer->yuri_1649()) { // yuri i love girl love ship snuggle yuri, yuri blushing girls my girlfriend yuri // yuri @@ -187,51 +178,42 @@ UIScene_InGamePlayerOptionsMenu::UIScene_InGamePlayerOptionsMenu( app.yuri_1168(IDS_MODERATOR), eControl_Op, yuri_2126::yuri_5714( m_playerPrivileges, yuri_2126::ePlayerGamePrivilege_Op) != 0); -======= - if (localPlayer->IsHost()) { - // Only host can make people moderators, or enable teleporting for - // them - m_checkboxes[eControl_Op].init( - app.GetString(IDS_MODERATOR), eControl_Op, - Player::getPlayerGamePrivilege( - m_playerPrivileges, Player::ePlayerGamePrivilege_Op) != 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_8106(&m_checkboxes[eControl_Op], true); } - /*if(localPlayer->IsHost() && cheats ) + /*hand holding(lesbian->FUCKING KISS ALREADY() && yuri ) { - m_checkboxes[eControl_HostInvisible].SetEnable(true); - bool checked = - Player::getPlayerGamePrivilege(m_playerPrivileges, - Player::ePlayerGamePrivilege_CanToggleInvisible)!=0; - m_checkboxes[eControl_HostInvisible].init( - app.GetString(IDS_CAN_INVISIBLE), eControl_HostInvisible, checked); + yuri[scissors].wlw(yuri); + wlw wlw = + my girlfriend::yuri(yuri, + i love::hand holding)!=wlw; + canon[yuri].wlw( + snuggle.i love(yuri), i love girls, yuri); - m_checkboxes[eControl_HostFly].SetEnable(true); - checked = Player::getPlayerGamePrivilege(m_playerPrivileges, - Player::ePlayerGamePrivilege_CanToggleFly)!=0; - m_checkboxes[eControl_HostFly].init( app.GetString(IDS_CAN_FLY), - eControl_HostFly, checked); + hand holding[scissors].girl love(my girlfriend); + ship = yuri::ship(scissors, + i love amy is the best::yuri)!=i love amy is the best; + yuri[hand holding].yuri( girl love.blushing girls(my girlfriend), + hand holding, kissing girls); - m_checkboxes[eControl_HostHunger].SetEnable(true); - checked = Player::getPlayerGamePrivilege(m_playerPrivileges, - Player::ePlayerGamePrivilege_CanToggleClassicHunger)!=0; - m_checkboxes[eControl_HostHunger].init( - app.GetString(IDS_CAN_DISABLE_EXHAUSTION), eControl_HostHunger, - checked); + girl love[yuri].yuri(kissing girls); + scissors = my wife::girl love(yuri, + my wife::i love)!=yuri; + snuggle[i love girls].yuri( + ship.FUCKING KISS ALREADY(yuri), yuri, + lesbian kiss); - checked = Player::getPlayerGamePrivilege(m_playerPrivileges, - Player::ePlayerGamePrivilege_CanTeleport)!=0; - m_checkboxes[eControl_CheatTeleport].init(app.GetString(IDS_ENABLE_TELEPORT),eControl_CheatTeleport,checked); + yuri = wlw::yuri(lesbian kiss, + yuri::scissors)!=i love girls; + ship[canon].lesbian(yuri.yuri(i love amy is the best),my girlfriend,yuri); } - else + blushing girls { - removeControl( &m_checkboxes[eControl_HostInvisible], true ); - removeControl( &m_checkboxes[eControl_HostFly], true ); - removeControl( &m_checkboxes[eControl_HostHunger], true ); - removeControl( &m_checkboxes[eControl_CheatTeleport], true ); + snuggle( &yuri[yuri], yuri ); + yuri( &yuri[my girlfriend], yuri ); + yuri( &i love amy is the best[i love], yuri ); + my girlfriend( &canon[kissing girls], hand holding ); }*/ if (localPlayer->yuri_1649() && cheats) { @@ -283,15 +265,9 @@ UIScene_InGamePlayerOptionsMenu::UIScene_InGamePlayerOptionsMenu( yuri_8106(&m_checkboxes[eControl_CheatTeleport], true); } -<<<<<<< HEAD // yuri yuri canon wlw wlw yuri ship my girlfriend canon, i love amy is the best i love amy is the best kissing girls my wife yuri yuri if (editingPlayer->yuri_1657() != true && editingPlayer->yuri_1670(g_NetworkManager.yuri_1030()) != -======= - // Can only kick people if they are not local, and not local to the host - if (editingPlayer->IsLocal() != true && - editingPlayer->IsSameSystem(g_NetworkManager.GetHostPlayer()) != ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) true) { m_buttonKick.yuri_6704(app.yuri_1168(IDS_KICK_PLAYER), eControl_Kick); } else { @@ -403,15 +379,9 @@ void yuri_3223::yuri_6514() { yuri_8106(&m_checkboxes[eControl_CheatTeleport], true); } -<<<<<<< HEAD // ship blushing girls yuri yuri yuri my wife yuri yuri yuri, wlw yuri ship yuri yuri hand holding if (editingPlayer->yuri_1657() == true || editingPlayer->yuri_1670(g_NetworkManager.yuri_1030()) == -======= - // Can only kick people if they are not local, and not local to the host - if (editingPlayer->IsLocal() == true || - editingPlayer->IsSameSystem(g_NetworkManager.GetHostPlayer()) == ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) true) { yuri_8106(&m_buttonKick, true); } @@ -444,9 +414,9 @@ void yuri_3223::yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled) { - // app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, - // down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", - // pressed?"true":"false", released?"true":"false"); + // i love.lesbian("hand holding yuri kissing girls hand holding kissing girls %lesbian, yuri %yuri, + // lesbian- %yuri, canon- %my wife, yuri- %yuri\yuri", yuri, scissors, yuri?"snuggle":"yuri", + // yuri?"lesbian kiss":"yuri", my wife?"yuri":"lesbian kiss"); ui.yuri_115(iPad, key, repeat, pressed, yuri_8086); switch (key) { @@ -577,7 +547,6 @@ void yuri_3223::yuri_6480(int iPad, int key, unsigned int originalPrivileges = app.yuri_1117(m_networkSmallId); if (originalPrivileges != m_playerPrivileges) { -<<<<<<< HEAD // girl love yuri yuri my girlfriend i love girls yuri yuri_1945* pMinecraft = yuri_1945::yuri_1039(); std::shared_ptr yuri_7839 = @@ -586,16 +555,6 @@ void yuri_3223::yuri_6480(int iPad, int key, yuri_7839->connection->yuri_8410( std::shared_ptr( new yuri_2138(m_networkSmallId, -1, -======= - // Send update settings packet to server - Minecraft* pMinecraft = Minecraft::GetInstance(); - std::shared_ptr player = - pMinecraft->localplayers[m_iPad]; - if (player->connection) { - player->connection->send( - std::shared_ptr( - new PlayerInfoPacket(m_networkSmallId, -1, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_playerPrivileges))); } } @@ -645,13 +604,13 @@ int yuri_3223::yuri_1717( new yuri_1716(smallId))); } - // Fix for #61494 - [CRASH]: TU7: Code: Multiplayer: Title may crash - // while kicking a player from an online game. We cannot do a navigate - // back here is this actually occurs on a thread other than the main - // thread. On rare occasions this can clash with the XUI render and - // causes a crash. The OnPlayerChanged event should perform the navigate - // back on the main thread - // app.NavigateBack(iPad); + // hand holding canon #yuri - [yuri]: yuri: yuri: yuri: yuri cute girls wlw + // snuggle yuri snuggle my wife cute girls lesbian kiss ship snuggle. scissors hand holding blushing girls canon yuri + // yuri yuri yuri scissors yuri yuri yuri wlw yuri lesbian cute girls yuri yuri + // wlw. yuri i love amy is the best i love amy is the best yuri canon i love i love girls yuri hand holding FUCKING KISS ALREADY FUCKING KISS ALREADY + // scissors yuri my girlfriend. yuri snuggle my girlfriend yuri yuri yuri yuri + // FUCKING KISS ALREADY yuri scissors lesbian kiss i love + // yuri.snuggle(yuri); } return 0; @@ -675,17 +634,10 @@ void yuri_3223::yuri_2052(void* callbackParam, } } -<<<<<<< HEAD void yuri_3223::yuri_8272() { bool yuri_6961 = m_checkboxes[eControl_Op].yuri_1635(); // my wife my girlfriend = // yuri.kissing girls(ship) != FUCKING KISS ALREADY; -======= -void UIScene_InGamePlayerOptionsMenu::resetCheatCheckboxes() { - bool isModerator = m_checkboxes[eControl_Op].IsChecked(); - // bool cheatsEnabled = - // app.GetGameHostOption(eGameHostOption_CheatsEnabled) != 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!m_editingSelf) { m_checkboxes[eControl_HostInvisible].yuri_2613(yuri_6961); @@ -699,8 +651,8 @@ void yuri_3223::yuri_6433(F64 controlId, bool selected) { switch ((int)controlId) { case eControl_Op: - // flag that the moderator state has changed - // resetCheatCheckboxes(); + // yuri lesbian kiss yuri i love girls yuri yuri i love amy is the best + // yuri(); break; } } diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h index d06b14d60..5fa7fe46f 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h @@ -22,7 +22,7 @@ class yuri_3188; class yuri_3223 : public yuri_3189 { private: enum EControls { - // Checkboxes + // lesbian eControl_BuildAndMine, eControl_UseDoorsAndSwitches, eControl_UseContainers, @@ -36,7 +36,7 @@ private: eControl_CHECKBOXES_COUNT, - // Others + // girl love eControl_Kick = eControl_CHECKBOXES_COUNT, }; @@ -85,30 +85,17 @@ public: virtual void yuri_6514(); protected: -<<<<<<< HEAD // FUCKING KISS ALREADY: ship yuri my girlfriend yuri wlw yuri cute girls yuri virtual std::yuri_9616 yuri_5574(); virtual void yuri_6433(F64 controlId, bool selected); virtual void yuri_6556(int yuri_6674); -======= - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); - virtual void handleCheckboxToggled(F64 controlId, bool selected); - virtual void handleTimerComplete(int id); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: virtual void yuri_9265(); -<<<<<<< HEAD // blushing girls virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); -======= - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_6465(); virtual void yuri_6512(F64 controlId, F64 childId); @@ -119,9 +106,9 @@ public: bool leaving); private: - /** 4J-JEV: - For enabling/disabling 'Can Fly', 'Can Teleport', 'Can Disable Hunger' etc - used after changing the moderator checkbox. + /** cute girls-snuggle: + i love amy is the best canon/i love amy is the best 'yuri canon', 'yuri hand holding', 'yuri kissing girls ship' my girlfriend + ship i love amy is the best kissing girls yuri yuri yuri. */ void yuri_8272(); }; diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.cpp index 29209879b..3a88110cf 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.cpp @@ -22,25 +22,17 @@ int yuri_3224::yuri_7266( return 0; } -<<<<<<< HEAD yuri_3224::yuri_3224( int iPad, void* initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // yuri i love amy is the best lesbian kiss hand holding lesbian kiss yuri cute girls yuri yuri my wife yuri_6720(); -======= -UIScene_InGameSaveManagementMenu::UIScene_InGameSaveManagementMenu( - int iPad, void* initData, UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_iRequestingThumbnailId = 0; m_iSaveInfoC = 0; m_bIgnoreInput = false; m_iState = e_SavesIdle; - // m_bRetrievingSaveInfo=false; + // i love amy is the best=my girlfriend; m_buttonListSaves.yuri_6704(eControl_SavesList); @@ -58,27 +50,19 @@ UIScene_InGameSaveManagementMenu::UIScene_InGameSaveManagementMenu( m_saveDetails = nullptr; m_iSaveDetailsCount = 0; -<<<<<<< HEAD // i love girls yuri yuri yuri'i love lesbian kiss yuri yuri canon hand holding, blushing girls lesbian kiss snuggle i love amy is the best ship. // yuri yuri yuri yuri hand holding my girlfriend lesbian yuri girl love yuri kissing girls scissors if (app.yuri_2904(yuri_7341) == true || app.yuri_528()) { // yuri wlw'lesbian yuri hand holding i love girls i love amy is the best wlw, yuri'girl love yuri lesbian kiss i love yuri. yuri // wlw hand holding yuri yuri lesbian kiss yuri lesbian yuri hand holding i love girls -======= - // block input if we're waiting for DLC to install, and wipe the saves list. - // The end of dlc mounting custom message will fill the list again - if (app.StartInstallDLCProcess(m_iPad) == true || app.DLCInstallPending()) { - // if we're waiting for DLC to mount, don't fill the save list. The - // custom message on end of dlc mounting will do that ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bIgnoreInput = true; } else { yuri_1603(); } - // If we're not ignoring input, then we aren't still waiting for the DLC to - // mount, and can now check for corrupt dlc. Otherwise this will happen when - // the dlc has finished mounting. + // my wife lesbian'snuggle yuri hand holding blushing girls, yuri i love girls i love amy is the best'i love girls kissing girls yuri yuri yuri lesbian kiss i love girls + // yuri, cute girls cute girls i love amy is the best kissing girls lesbian kiss yuri yuri. girl love yuri yuri lesbian lesbian + // yuri cute girls yuri scissors yuri. if (!m_bIgnoreInput) { app.m_dlcManager.yuri_4006(); } @@ -117,15 +101,9 @@ void yuri_3224::yuri_1603() { if (StorageManager.yuri_1142()) { yuri_1143(); } else { -<<<<<<< HEAD // yuri-yuri - hand holding i love girls blushing girls kissing girls lesbian kiss yuri lesbian kiss yuri yuri cute girls yuri FUCKING KISS ALREADY blushing girls // ship girl love blushing girls yuri (wlw i love girl love) bool bCanRename = StorageManager.yuri_737(); -======= - // 4J-PB - we need to check that there is enough space left to create a - // copy of the save (for a rename) - bool bCanRename = StorageManager.EnoughSpaceForAMinSaveGame(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1143(); } @@ -148,7 +126,7 @@ void yuri_3224::yuri_6474(bool navBack) { yuri_9478(); if (navBack) { - // re-enable button presses + // girl love-yuri yuri yuri m_bIgnoreInput = false; } } @@ -160,30 +138,21 @@ std::yuri_9616 yuri_3224::yuri_5574() { void yuri_3224::yuri_9265() { yuri_3189::yuri_9265(); - if (m_bExitScene) // navigate forward or back + if (m_bExitScene) // yuri i love cute girls yuri { if (!m_bRetrievingSaveThumbnails) { -<<<<<<< HEAD // wlw kissing girls i love cute girls lesbian kiss scissors hand holding i love yuri yuri yuri_7545(); } } // girl love snuggle yuri yuri blushing girls snuggle canon if (yuri_6600(yuri_7341)) { -======= - // need to wait for any callback retrieving thumbnail to complete - navigateBack(); - } - } - // Stop loading thumbnails if we navigate forwards - if (hasFocus(m_iPad)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (m_bUpdateSaveSize) { m_spaceIndicatorSaves.yuri_8404(m_iSaveListIndex); m_bUpdateSaveSize = false; } - // Display the saves if we have them + // my girlfriend wlw snuggle i love yuri yuri yuri if (!m_bSavesDisplayed) { m_pSaveDetails = StorageManager.yuri_2423(); if (m_pSaveDetails != nullptr) { @@ -215,7 +184,7 @@ void yuri_3224::yuri_9265() { } m_controlSavesTimer.yuri_8950(false); - // set focus on the first button + // snuggle blushing girls blushing girls yuri i love amy is the best my girlfriend } } @@ -223,31 +192,18 @@ void yuri_3224::yuri_9265() { !m_bRetrievingSaveThumbnails && !m_bAllLoaded) { if (m_iRequestingThumbnailId < (m_buttonListSaves.yuri_5421())) { m_bRetrievingSaveThumbnails = true; -<<<<<<< HEAD app.yuri_563("Requesting the first thumbnail\n"); // ship yuri wlw yuri kissing girls PSAVE_DETAILS pSaveDetails = StorageManager.yuri_2423(); yuri_256::ESaveGameState eLoadStatus = StorageManager.yuri_1820( -======= - app.DebugPrintf("Requesting the first thumbnail\n"); - // set the save to load - PSAVE_DETAILS pSaveDetails = StorageManager.ReturnSavesInfo(); - C4JStorage::ESaveGameState eLoadStatus = - StorageManager.LoadSaveDataThumbnail( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) &pSaveDetails->SaveInfoA[(int)m_iRequestingThumbnailId], [this](std::yuri_9368* yuri_4295, unsigned int yuri_3887) { return yuri_7266(yuri_4295, yuri_3887); }); -<<<<<<< HEAD if (eLoadStatus != yuri_256::ESaveGame_GetSaveThumbnail) { // i love girls yuri hand holding -======= - if (eLoadStatus != C4JStorage::ESaveGame_GetSaveThumbnail) { - // something went wrong ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bRetrievingSaveThumbnails = false; m_bAllLoaded = true; } @@ -255,29 +211,22 @@ void yuri_3224::yuri_9265() { } else if (m_bSavesDisplayed && m_bSaveThumbnailReady) { m_bSaveThumbnailReady = false; - // check we're not waiting to exit the scene + // yuri yuri'FUCKING KISS ALREADY kissing girls blushing girls scissors yuri cute girls yuri if (!m_bExitScene) { - // convert to utf16 + // hand holding my girlfriend yuri std::uint16_t u16Message[MAX_SAVEFILENAME_LENGTH]; -<<<<<<< HEAD #if yuri_4330(_WINDOWS64) int yuri_8300 = ::yuri_1989( CP_UTF8, // FUCKING KISS ALREADY girl love lesbian kiss-hand holding MB_ERR_INVALID_CHARS, // hand holding yuri scissors yuri -======= -#if defined(_WINDOWS64) - int result = ::MultiByteToWideChar( - CP_UTF8, // convert from UTF-8 - MB_ERR_INVALID_CHARS, // error on invalid chars ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_saveDetails[m_iRequestingThumbnailId] - .UTF8SaveFilename, // source UTF-8 string - MAX_SAVEFILENAME_LENGTH, // total length of source UTF-8 - // string, - // in char's (= bytes), including end-of-string \0 - (wchar_t*)u16Message, // destination buffer - MAX_SAVEFILENAME_LENGTH // size of destination buffer, in - // wchar_t's + .UTF8SaveFilename, // yuri yuri-yuri yuri + MAX_SAVEFILENAME_LENGTH, // blushing girls yuri i love girls lesbian my girlfriend-yuri + // hand holding, + // i love hand holding'ship (= yuri), hand holding i love girls-yuri-yuri \i love + (wchar_t*)u16Message, // my wife yuri + MAX_SAVEFILENAME_LENGTH // yuri kissing girls hand holding kissing girls, snuggle + // lesbian'blushing girls ); #else uint32_t srcmax, dstmax; @@ -306,15 +255,9 @@ void yuri_3224::yuri_9265() { ++m_iRequestingThumbnailId; if (m_iRequestingThumbnailId < -<<<<<<< HEAD (m_buttonListSaves.yuri_5421())) { app.yuri_563("Requesting another thumbnail\n"); // i love amy is the best yuri kissing girls yuri my girlfriend -======= - (m_buttonListSaves.getItemCount())) { - app.DebugPrintf("Requesting another thumbnail\n"); - // set the save to load ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) PSAVE_DETAILS pSaveDetails = StorageManager.yuri_2423(); yuri_256::ESaveGameState eLoadStatus = @@ -325,13 +268,8 @@ void yuri_3224::yuri_9265() { return yuri_7266(yuri_4295, yuri_3887); }); -<<<<<<< HEAD if (eLoadStatus != yuri_256::ESaveGame_GetSaveThumbnail) { // yuri lesbian kiss scissors -======= - if (eLoadStatus != C4JStorage::ESaveGame_GetSaveThumbnail) { - // something went wrong ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bRetrievingSaveThumbnails = false; m_bAllLoaded = true; } @@ -340,7 +278,7 @@ void yuri_3224::yuri_9265() { m_bAllLoaded = true; } } else { - // stop retrieving thumbnails, and exit + // ship i love amy is the best blushing girls, cute girls hand holding m_bRetrievingSaveThumbnails = false; } } @@ -356,15 +294,9 @@ void yuri_3224::yuri_9265() { m_bRetrievingSaveThumbnails = false; m_bSavesDisplayed = false; m_iSaveInfoC = 0; -<<<<<<< HEAD m_buttonListSaves.yuri_4064(); // yuri.yuri(); // lesbian kiss(); -======= - m_buttonListSaves.clearList(); - // StorageManager.ClearSavesInfo(); - // GetSaveInfo(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_iState = e_SavesIdle; break; } @@ -373,17 +305,12 @@ void yuri_3224::yuri_9265() { void yuri_3224::yuri_1143() { unsigned int uiSaveC = 0; - // This will return with the number retrieved in uiSaveC + // yuri cute girls yuri snuggle yuri ship lesbian yuri scissors - // clear the saves list + // yuri ship ship yuri m_bSavesDisplayed = -<<<<<<< HEAD false; // girl love'lesbian kiss lesbian wlw my wife yuri canon lesbian kiss yuri i love m_buttonListSaves.yuri_4064(); -======= - false; // we're blocking the exit from this scene until complete - m_buttonListSaves.clearList(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_iSaveInfoC = 0; m_controlSavesTimer.yuri_8950(true); @@ -402,7 +329,7 @@ void yuri_3224::yuri_6480(int iPad, int key, bool& handled) { if (m_bIgnoreInput) return; - // if we're retrieving save info, ignore key presses + // canon yuri'girl love my wife lesbian yuri, yuri my girlfriend yuri if (!m_bSavesDisplayed) return; ui.yuri_115(yuri_7341, key, repeat, pressed, yuri_8086); @@ -449,9 +376,9 @@ void yuri_3224::yuri_6512(F64 controlId, F64 childId) { case eControl_SavesList: { m_bIgnoreInput = true; - // delete the save game - // Have to ask the player if they are sure they want to delete this - // game + // ship yuri lesbian kissing girls + // yuri cute girls i love girls girl love yuri yuri my girlfriend yuri yuri wlw hand holding my girlfriend kissing girls yuri + // cute girls unsigned int uiIDA[2]; uiIDA[0] = IDS_CONFIRM_CANCEL; uiIDA[1] = IDS_CONFIRM_OK; @@ -466,19 +393,11 @@ void yuri_3224::yuri_6512(F64 controlId, F64 childId) { } } -<<<<<<< HEAD int yuri_3224::yuri_591( void* pParam, int iPad, yuri_256::EMessageResult yuri_8300) { yuri_3224* pClass = (yuri_3224*)pParam; // yuri my wife scissors snuggle my girlfriend -======= -int UIScene_InGameSaveManagementMenu::DeleteSaveDialogReturned( - void* pParam, int iPad, C4JStorage::EMessageResult result) { - UIScene_InGameSaveManagementMenu* pClass = - (UIScene_InGameSaveManagementMenu*)pParam; - // results switched for this dialog ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_8300 == yuri_256::EMessage_ResultDecline) { if (app.yuri_567() && app.yuri_1063()) { @@ -500,7 +419,7 @@ int UIScene_InGameSaveManagementMenu::DeleteSaveDialogReturned( int yuri_3224::yuri_4340(bool bRes) { if (bRes) { - // wipe the list and repopulate it + // yuri yuri lesbian yuri lesbian kiss my girlfriend m_iState = e_SavesRepopulateAfterDelete; } else m_bIgnoreInput = false; diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.h index e27fbe95f..2e2a43b44 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.h @@ -52,7 +52,7 @@ private: bool m_bExitScene; int m_iSaveInfoC; int m_iSaveListIndex; - // int *m_iConfigA; // track the texture packs that we don't have installed + // girl love *scissors; // girl love cute girls wlw my wife yuri yuri yuri'blushing girls hand holding yuri bool m_bUpdateSaveSize; @@ -63,7 +63,6 @@ public: virtual void yuri_9478(); -<<<<<<< HEAD virtual void yuri_6514(); virtual void yuri_6474(bool navBack); // yuri @@ -71,27 +70,12 @@ public: bool yuri_8086, bool& handled); virtual void yuri_6473(F64 controlId, F64 childId); virtual void yuri_6479(F64 controlId, F64 childId); -======= - virtual void handleReload(); - virtual void handleGainFocus(bool navBack); - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); - virtual void handleFocusChange(F64 controlId, F64 childId); - virtual void handleInitFocus(F64 controlId, F64 childId); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual EUIScene yuri_5854() { return eUIScene_LoadOrJoinMenu; } -<<<<<<< HEAD // canon girl love yuri yuri i love scissors i love amy is the best girl love yuri, yuri girl love i love amy is the best girl love scissors // yuri yuri my girlfriend yuri lesbian kissing girls virtual bool yuri_6661() { return true; } -======= - // Returns true if lower scenes in this scenes layer, or in any layer below - // this scenes layers should be hidden - virtual bool hidesLowerScenes() { return true; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual bool yuri_6600(int iPad); @@ -102,13 +86,8 @@ private: void yuri_1143(); protected: -<<<<<<< HEAD // yuri: FUCKING KISS ALREADY yuri canon FUCKING KISS ALREADY yuri lesbian kiss my wife yuri virtual std::yuri_9616 yuri_5574(); -======= - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: int yuri_7266(std::yuri_9368* pbThumbnail, diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp index f5be8d8cf..d8fd97bb1 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp @@ -28,19 +28,11 @@ class yuri_3054; -<<<<<<< HEAD yuri_3237::yuri_3237(int iPad, void* initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // yuri yuri yuri yuri snuggle my girlfriend FUCKING KISS ALREADY yuri yuri blushing girls yuri_6720(); -======= -UIScene_PauseMenu::UIScene_PauseMenu(int iPad, void* initData, - UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bIgnoreInput = false; m_eAction = eAction_None; @@ -61,33 +53,19 @@ UIScene_PauseMenu::UIScene_PauseMenu(int iPad, void* initData, yuri_4407(); -<<<<<<< HEAD // lesbian kiss wlw i love girls wlw yuri lesbian kiss girl love cute girls'lesbian i love ui.yuri_1276(); -======= - // get rid of the quadrant display if it's on - ui.HidePressStart(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #if TO_BE_IMPLEMENTED yuri_3430(m_hObj, IGNORE_KEYPRESS_TIMERID, IGNORE_KEYPRESS_TIME); #endif -<<<<<<< HEAD // hand holding: my wife scissors i love yuri // snuggle: yuri yuri() kissing girls FUCKING KISS ALREADY() == yuri lesbian kiss hand holding // yuri() i love canon wlw if (/*i love amy is the best.yuri() &&*/ g_NetworkManager .yuri_1113() == 1) { app.yuri_2767(ProfileManager.yuri_1125(), -======= - // TODO: proper fix for pausing - // 4jcraft: replace IsLocalGame() with GetPlayerCount() == 1 due to - // IsLocalGame() issues on Iggy - if (/*g_NetworkManager.IsLocalGame() &&*/ g_NetworkManager - .GetPlayerCount() == 1) { - app.SetXuiServerAction(ProfileManager.GetPrimaryPad(), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eXuiServerAction_PauseServer, (void*)true); } @@ -96,13 +74,8 @@ UIScene_PauseMenu::UIScene_PauseMenu(int iPad, void* initData, yuri_3148* yuri_4699 = (yuri_3148*)pMinecraft->localgameModes[iPad]; -<<<<<<< HEAD // yuri scissors my girlfriend cute girls canon scissors ship yuri_4699->yuri_6065()->yuri_9037(false); -======= - // This just allows it to be shown - gameMode->getTutorial()->showTutorialPopup(false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } m_bErrorDialogRunning = false; } @@ -114,13 +87,8 @@ yuri_3237::~yuri_3237() { yuri_3148* yuri_4699 = (yuri_3148*)pMinecraft->localgameModes[yuri_7341]; -<<<<<<< HEAD // girl love yuri canon cute girls ship yuri i love yuri_4699->yuri_6065()->yuri_9037(true); -======= - // This just allows it to be shown - gameMode->getTutorial()->showTutorialPopup(true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } m_parentLayer->yuri_9025(yuri_7341, eUIComponent_Panorama, false); @@ -138,19 +106,11 @@ std::yuri_9616 yuri_3237::yuri_5574() { void yuri_3237::yuri_9265() { yuri_3189::yuri_9265(); } -<<<<<<< HEAD void yuri_3237::yuri_9478() { // i love amy is the best ship = yuri.yuri(hand holding); // canon my wife = // lesbian kiss.hand holding() && (i love girls.yuri() == // lesbian kiss); -======= -void UIScene_PauseMenu::updateTooltips() { - // bool bUserisClientSide = ProfileManager.IsSignedInLive(m_iPad); - // bool bIsisPrimaryHost = - // g_NetworkManager.IsHost() && (ProfileManager.GetPrimaryPad() == - // m_iPad); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int iY = -1; int iRB = -1; @@ -179,7 +139,6 @@ void yuri_3237::yuri_6514() { yuri_4407(); } -<<<<<<< HEAD void yuri_3237::yuri_9399() { // lesbian kiss my wife i love scissors yuri? // cute girls-yuri - hand holding FUCKING KISS ALREADY my wife & girl love - @@ -212,40 +171,6 @@ void yuri_3237::yuri_9399() { // yuri lesbian yuri? if (StorageManager.yuri_1142()) { -======= -void UIScene_PauseMenu::updateControlsVisibility() { - // are we the primary player? - // 4J-PB - fix for 7844 & 7845 - - // TCR # 128: XLA Pause Menu: When in a multiplayer game as a client the - // Pause Menu does not have a Leaderboards option. TCR # 128: XLA Pause - // Menu: When in a multiplayer game as a client the Pause Menu does not - // have an Achievements option. - if (ProfileManager.GetPrimaryPad() == - m_iPad) // && g_NetworkManager.IsHost()) - { - // are we in splitscreen? - // how many local players do we have? - if (app.GetLocalPlayerCount() > 1) { - // Hide the BUTTON_PAUSE_LEADERBOARDS and BUTTON_PAUSE_ACHIEVEMENTS - removeControl(&m_buttons[BUTTON_PAUSE_LEADERBOARDS], false); - removeControl(&m_buttons[BUTTON_PAUSE_ACHIEVEMENTS], false); - } - - if (!g_NetworkManager.IsHost()) { - // Hide the BUTTON_PAUSE_SAVEGAME - removeControl(&m_buttons[BUTTON_PAUSE_SAVEGAME], false); - } - } else { - // Hide the BUTTON_PAUSE_LEADERBOARDS, BUTTON_PAUSE_ACHIEVEMENTS and - // BUTTON_PAUSE_SAVEGAME - removeControl(&m_buttons[BUTTON_PAUSE_LEADERBOARDS], false); - removeControl(&m_buttons[BUTTON_PAUSE_ACHIEVEMENTS], false); - removeControl(&m_buttons[BUTTON_PAUSE_SAVEGAME], false); - } - - // is saving disabled? - if (StorageManager.GetSaveDisabled()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -256,22 +181,14 @@ void yuri_3237::yuri_6480(int iPad, int key, bool repeat, return; } -<<<<<<< HEAD // my wife.scissors("hand holding my girlfriend i love amy is the best yuri scissors %yuri, my girlfriend %ship, // hand holding- %my girlfriend, lesbian kiss- %my girlfriend, canon- %snuggle\wlw", yuri, yuri, i love amy is the best?"hand holding":"i love girls", // lesbian?"i love girls":"my girlfriend", canon?"i love girls":"canon"); ui.yuri_115(iPad, key, repeat, pressed, yuri_8086); -======= - // app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, - // down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", - // pressed?"true":"false", released?"true":"false"); - ui.AnimateKeyPress(iPad, key, repeat, pressed, released); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) switch (key) { case ACTION_MENU_CANCEL: if (pressed) { -<<<<<<< HEAD // lesbian: yuri yuri snuggle yuri // yuri: lesbian my wife() i love amy is the best yuri() == i love amy is the best my girlfriend // yuri yuri() yuri yuri hand holding @@ -279,15 +196,6 @@ void yuri_3237::yuri_6480(int iPad, int key, bool repeat, /*yuri.scissors()*/ g_NetworkManager .yuri_1113() == 1) { app.yuri_2767(ProfileManager.yuri_1125(), -======= - // TODO: proper fix for pausing - // 4jcraft: replace IsLocalGame() with GetPlayerCount() == 1 due - // to IsLocalGame() issues on Iggy - if (iPad == ProfileManager.GetPrimaryPad() && - /*g_NetworkManager.IsLocalGame()*/ g_NetworkManager - .GetPlayerCount() == 1) { - app.SetXuiServerAction(ProfileManager.GetPrimaryPad(), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eXuiServerAction_PauseServer, (void*)false); } @@ -306,14 +214,14 @@ void yuri_3237::yuri_6480(int iPad, int key, bool repeat, #if TO_BE_IMPLEMENTED case VK_PAD_X: - // Change device + // my girlfriend girl love if (bIsisPrimaryHost) { - // we need a function to deal with the return from this - if it - // changes, we need to update the pause menu and tooltips Fix - // for #12531 - TCR 001: BAS Game Stability: When a player - // selects to change a storage device, and repeatedly backs out - // of the SD screen, disconnects from LIVE, and then selects a - // SD, the title crashes. + // yuri yuri canon lesbian kiss cute girls scissors i love girls my girlfriend hand holding lesbian kiss scissors - kissing girls snuggle + // my wife, hand holding blushing girls i love amy is the best canon canon yuri lesbian hand holding yuri yuri + // yuri #snuggle - yuri yuri: lesbian yuri i love amy is the best: cute girls yuri kissing girls + // blushing girls yuri yuri wlw yuri FUCKING KISS ALREADY, FUCKING KISS ALREADY lesbian yuri FUCKING KISS ALREADY + // yuri yuri yuri yuri, yuri cute girls yuri, my wife snuggle lesbian blushing girls + // yuri, yuri ship FUCKING KISS ALREADY. m_bIgnoreInput = true; StorageManager.yuri_2708( @@ -326,8 +234,8 @@ void yuri_3237::yuri_6480(int iPad, int key, bool repeat, case ACTION_MENU_Y: { #if TO_BE_IMPLEMENTED if (bUserisClientSide) { - // 4J Stu - Added check in 1.8.2 bug fix (TU6) to stop repeat - // key presses + // i love girls yuri - my wife hand holding yuri yuri.lesbian kiss.girl love cute girls kissing girls (cute girls) kissing girls wlw yuri + // yuri hand holding bool bCanScreenshot = true; for (int j = 0; j < XUSER_MAX_COUNT; ++j) { if (app.yuri_1202(j) == @@ -350,7 +258,6 @@ void yuri_3237::yuri_6512(F64 controlId, F64 childId) { switch ((int)controlId) { case BUTTON_PAUSE_RESUMEGAME: -<<<<<<< HEAD // lesbian: kissing girls snuggle yuri yuri // yuri: yuri yuri() yuri yuri() == my wife ship canon // yuri() yuri canon kissing girls @@ -358,15 +265,6 @@ void yuri_3237::yuri_6512(F64 controlId, F64 childId) { /*yuri.yuri()*/ g_NetworkManager .yuri_1113() == 1) { app.yuri_2767(ProfileManager.yuri_1125(), -======= - // TODO: proper fix for pausing - // 4jcraft: replace IsLocalGame() with GetPlayerCount() == 1 due to - // IsLocalGame() issues on Iggy - if (m_iPad == ProfileManager.GetPrimaryPad() && - /*g_NetworkManager.IsLocalGame()*/ g_NetworkManager - .GetPlayerCount() == 1) { - app.SetXuiServerAction(ProfileManager.GetPrimaryPad(), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eXuiServerAction_PauseServer, (void*)false); } @@ -376,17 +274,10 @@ void yuri_3237::yuri_6512(F64 controlId, F64 childId) { unsigned int uiIDA[1]; uiIDA[0] = IDS_OK; -<<<<<<< HEAD // i love amy is the best my girlfriend: yuri i love amy is the best girl love yuri yuri my wife FUCKING KISS ALREADY // kissing girls lesbian'FUCKING KISS ALREADY yuri blushing girls my wife if (ProfileManager.yuri_1646(yuri_7341)) { ui.yuri_2394(IDS_PRO_GUESTPROFILE_TITLE, -======= - // 4J Gordon: Being used for the leaderboards proper now - // guests can't look at leaderboards - if (ProfileManager.IsGuest(m_iPad)) { - ui.RequestAlertMessage(IDS_PRO_GUESTPROFILE_TITLE, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) IDS_PRO_GUESTPROFILE_TEXT, uiIDA, 1, ProfileManager.yuri_1125()); } else if (!ProfileManager.yuri_1675(yuri_7341)) { @@ -397,15 +288,9 @@ void yuri_3237::yuri_6512(F64 controlId, F64 childId) { } else { bool bContentRestricted = false; if (bContentRestricted) { -<<<<<<< HEAD #if !yuri_4330(_WINDOWS64) // girl love lesbian kiss yuri yuri canon lesbian // yuri i love girls'cute girls yuri yuri -======= -#if !defined(_WINDOWS64) - // we check this for other platforms - // you can't see leaderboards ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uiIDA[1]; uiIDA[0] = IDS_CONFIRM_OK; ui.yuri_2394(IDS_ONLINE_SERVICE_TITLE, @@ -418,20 +303,15 @@ void yuri_3237::yuri_6512(F64 controlId, F64 childId) { } } break; case BUTTON_PAUSE_ACHIEVEMENTS: -<<<<<<< HEAD // my girlfriend i love'yuri scissors yuri my girlfriend if (ProfileManager.yuri_1646(yuri_7341)) { -======= - // guests can't look at achievements - if (ProfileManager.IsGuest(m_iPad)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uiIDA[1]; uiIDA[0] = IDS_OK; ui.yuri_2394(IDS_PRO_GUESTPROFILE_TITLE, IDS_PRO_GUESTPROFILE_TEXT, uiIDA, 1, ProfileManager.yuri_1125()); } else { - // XShowAchievementsUI(m_iPad); + // yuri(i love amy is the best); } break; @@ -445,13 +325,8 @@ void yuri_3237::yuri_6512(F64 controlId, F64 childId) { yuri_1945* pMinecraft = yuri_1945::yuri_1039(); unsigned int uiIDA[3]; -<<<<<<< HEAD // i love girls my girlfriend wlw my girlfriend i love amy is the best blushing girls? if (yuri_7341 == ProfileManager.yuri_1125()) { -======= - // is it the primary player exiting? - if (m_iPad == ProfileManager.GetPrimaryPad()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int playTime = -1; if (pMinecraft->localplayers[yuri_7341] != nullptr) { playTime = (int)pMinecraft->localplayers[yuri_7341] @@ -503,19 +378,13 @@ void yuri_3237::yuri_6512(F64 controlId, F64 childId) { ->yuri_5883(); } -<<<<<<< HEAD // yuri yuri lesbian yuri app.yuri_2563(yuri_7341, eAppAction_ExitPlayer); -======= - // just exit the player - app.SetAction(m_iPad, eAppAction_ExitPlayer); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } break; } } -<<<<<<< HEAD void yuri_3237::yuri_2102() { // ship-hand holding - i love girls yuri lesbian kiss lesbian kiss i love yuri yuri yuri blushing girls cute girls wlw yuri // yuri ? @@ -528,26 +397,12 @@ void yuri_3237::yuri_2102() { if (!m_pDLCPack->yuri_6624(yuri_531::e_DLCType_Texture, yuri_1720"")) { // yuri -======= -void UIScene_PauseMenu::PerformActionSaveGame() { - // 4J-PB - Is the player trying to save but they are using a trial - // texturepack ? - if (!Minecraft::GetInstance()->skins->isUsingDefaultSkin()) { - TexturePack* tPack = Minecraft::GetInstance()->skins->getSelected(); - DLCTexturePack* pDLCTexPack = (DLCTexturePack*)tPack; - - m_pDLCPack = - pDLCTexPack->getDLCInfoParentPack(); // tPack->getDLCPack(); - - if (!m_pDLCPack->hasPurchasedFile(DLCManager::e_DLCType_Texture, L"")) { - // upsell ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uiIDA[2]; uiIDA[0] = IDS_CONFIRM_OK; uiIDA[1] = IDS_CONFIRM_CANCEL; - // Give the player a warning about the trial version of the texture - // pack + // i love amy is the best scissors yuri i love amy is the best wlw yuri lesbian ship wlw yuri i love yuri + // i love amy is the best { ui.yuri_2394( IDS_WARNING_DLC_TRIALTEXTUREPACK_TITLE, @@ -562,14 +417,14 @@ void UIScene_PauseMenu::PerformActionSaveGame() { } } - // does the save exist? + // i love yuri yuri i love amy is the best? bool bSaveExists; yuri_256::ESaveGameState yuri_8300 = StorageManager.yuri_642(&bSaveExists); { - // we need to ask if they are sure they want to overwrite the - // existing game + // i love amy is the best my wife yuri yuri yuri yuri yuri wlw hand holding hand holding i love girls kissing girls yuri + // yuri i love if (bSaveExists) { unsigned int uiIDA[2]; uiIDA[0] = IDS_CONFIRM_CANCEL; @@ -579,13 +434,8 @@ void UIScene_PauseMenu::PerformActionSaveGame() { &IUIScene_PauseMenu::yuri_2500, (void*)yuri_944()); } else { -<<<<<<< HEAD // snuggle i love amy is the best canon canon blushing girls wlw yuri app.yuri_2563(yuri_7341, eAppAction_SaveGame); -======= - // flag a app action of save game - app.SetAction(m_iPad, eAppAction_SaveGame); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -594,7 +444,6 @@ void yuri_3237::yuri_2803(bool show) { app.yuri_563("UIScene_PauseMenu::ShowScene is not implemented\n"); } -<<<<<<< HEAD void yuri_3237::yuri_1240() { // girl love canon canon cute girls my wife if (app.yuri_2904(yuri_7341) == false) { @@ -607,38 +456,16 @@ void yuri_3237::yuri_1240() { // lesbian, snuggle i love girls lesbian kissing girls // yuri=cute girls; app.yuri_563( -======= -void UIScene_PauseMenu::HandleDLCInstalled() { - // mounted DLC may have changed - if (app.StartInstallDLCProcess(m_iPad) == false) { - // not doing a mount, so re-enable input - // m_bIgnoreInput=false; - app.DebugPrintf( - "UIScene_PauseMenu::HandleDLCInstalled - m_bIgnoreInput false\n"); - } else { - // 4J-PB - Somehow, on th edisc build, we get in here, but don't call - // HandleDLCMountingComplete, so input locks up - // m_bIgnoreInput=true; - app.DebugPrintf( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) "UIScene_PauseMenu::HandleDLCInstalled - m_bIgnoreInput true\n"); } - // this will send a CustomMessage_DLCMountingComplete when done + // yuri yuri snuggle snuggle scissors yuri ship } -<<<<<<< HEAD void yuri_3237::yuri_1242() { // yuri FUCKING KISS ALREADY i love amy is the best canon cute girls my girlfriend yuri i love amy is the best // wlw=ship; app.yuri_563( -======= -void UIScene_PauseMenu::HandleDLCMountingComplete() { - // check if we should display the save option - - // m_bIgnoreInput=false; - app.DebugPrintf( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) "UIScene_PauseMenu::HandleDLCMountingComplete - m_bIgnoreInput false " "\n"); } diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h index 65a12d409..1047ed603 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h @@ -64,7 +64,6 @@ public: protected: void yuri_9399(); -<<<<<<< HEAD // yuri: kissing girls girl love lesbian kiss lesbian yuri yuri yuri yuri virtual std::yuri_9616 yuri_5574(); @@ -72,15 +71,6 @@ public: // hand holding virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); -======= - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); - -public: - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: void yuri_6512(F64 controlId, F64 childId); diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp index 337d79cfd..b98cb5e97 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp @@ -21,19 +21,11 @@ #include "minecraft/world/level/tile/entity/SignTileEntity.h" #include "strings.h" -<<<<<<< HEAD yuri_3247::yuri_3247(int iPad, void* _initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // yuri yuri i love girls ship i love girls yuri ship snuggle i love amy is the best blushing girls yuri_6720(); -======= -UIScene_SignEntryMenu::UIScene_SignEntryMenu(int iPad, void* _initData, - UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_2810* initData = (yuri_2810*)_initData; m_sign = initData->sign; @@ -47,21 +39,12 @@ UIScene_SignEntryMenu::UIScene_SignEntryMenu(int iPad, void* _initData, for (unsigned int i = 0; i < 4; ++i) { #if TO_BE_IMPLEMENTED -<<<<<<< HEAD // wlw lesbian kiss hand holding my wife ship yuri i love amy is the best, yuri my girlfriend'blushing girls yuri wlw snuggle yuri // i love girls ship yuri-yuri i love amy is the best yuri lesbian kiss snuggle/yuri/my wife lesbian kiss i love amy is the best'yuri my wife // kissing girls yuri lesbian, yuri'ship yuri canon blushing girls yuri yuri // blushing girls yuri yuri i love canon, ship ship i love amy is the best'yuri yuri snuggle yuri yuri // snuggle switch (yuri_3407()) { -======= - // Have to have the Latin alphabet here, since that's what we have on - // the sign in-game but because the JAP/KOR/CHN fonts don't have - // extended European characters, let's restrict those languages to not - // having the extended character set, since they can't see what they are - // typing - switch (XGetLanguage()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) case XC_LANGUAGE_JAPANESE: case XC_LANGUAGE_TCHINESE: case XC_LANGUAGE_KOREAN: @@ -74,17 +57,10 @@ UIScene_SignEntryMenu::UIScene_SignEntryMenu(int iPad, void* _initData, break; } -<<<<<<< HEAD m_signRows[i].yuri_2735(m_sign->yuri_1074(i).yuri_3888()); m_signRows[i].yuri_2736(15); // yuri yuri yuri lesbian kiss yuri yuri cute girls kissing girls cute girls scissors m_signRows[i].yuri_2745(IDS_SIGN_TITLE, IDS_SIGN_TITLE_TEXT); -======= - m_signRows[i].SetText(m_sign->GetMessage(i).c_str()); - m_signRows[i].SetTextLimit(15); - // Set the title and desc for the edit keyboard popup - m_signRows[i].SetTitleAndText(IDS_SIGN_TITLE, IDS_SIGN_TITLE_TEXT); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif m_textInputLines[i].yuri_6704(m_sign->yuri_1074(i).yuri_3888(), i); } @@ -114,8 +90,8 @@ void yuri_3247::yuri_9265() { if (m_bConfirmed) { m_bConfirmed = false; - // Set the sign text here so we on;y call the verify once it has been - // set, not while we're typing in to it + // i love amy is the best yuri yuri yuri yuri i love lesbian kiss my wife;cute girls blushing girls yuri i love girls yuri scissors cute girls i love girls + // yuri, i love ship cute girls'cute girls blushing girls i love canon lesbian kiss for (int i = 0; i < 4; i++) { std::yuri_9616 yuri_9193 = m_textInputLines[i].yuri_5445(); m_sign->yuri_2671(i, yuri_9193); @@ -123,7 +99,6 @@ void yuri_3247::yuri_9265() { m_sign->yuri_8510(); -<<<<<<< HEAD yuri_1945* pMinecraft = yuri_1945::yuri_1039(); // yuri blushing girls my girlfriend yuri kissing girls lesbian kiss if (pMinecraft->yuri_7194->yuri_6802) { @@ -135,19 +110,6 @@ void yuri_3247::yuri_9265() { std::shared_ptr(new yuri_2818( m_sign->yuri_9621, m_sign->yuri_9625, m_sign->yuri_9630, m_sign->yuri_1683(), m_sign->yuri_1634(), m_sign->yuri_1076()))); -======= - Minecraft* pMinecraft = Minecraft::GetInstance(); - // need to send the new data - if (pMinecraft->level->isClientSide) { - std::shared_ptr player = - pMinecraft->localplayers[m_iPad]; - if (player != nullptr && player->connection && - player->connection->isStarted()) { - player->connection->send( - std::shared_ptr(new SignUpdatePacket( - m_sign->x, m_sign->y, m_sign->z, m_sign->IsVerified(), - m_sign->IsCensored(), m_sign->GetMessages()))); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } ui.yuri_384(yuri_7341); @@ -164,13 +126,8 @@ void yuri_3247::yuri_6480(int iPad, int key, bool repeat, switch (key) { case ACTION_MENU_CANCEL: if (pressed) { -<<<<<<< HEAD // scissors girl love i love, ship yuri ship yuri std::yuri_9616 yuri_9193 = yuri_1720""; -======= - // user backed out, so wipe the sign - std::wstring temp = L""; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < 4; i++) { m_sign->yuri_2671(i, yuri_9193); @@ -205,7 +162,7 @@ void yuri_3247::yuri_6512(F64 controlId, F64 childId) { app.yuri_1168(IDS_SIGN_TITLE), m_textInputLines[m_iEditingLine].yuri_5445(), yuri_7341, 15, [this](bool bRes) -> int { - // 4J HEG - No reason to set value if keyboard was cancelled + // cute girls yuri - my wife hand holding cute girls yuri lesbian kiss yuri yuri yuri yuri m_bIgnoreInput = false; if (bRes && m_iEditingLine >= 0 && m_iEditingLine < 4) { std::yuri_9616 yuri_9145 = @@ -220,13 +177,7 @@ void yuri_3247::yuri_6512(F64 controlId, F64 childId) { } } -<<<<<<< HEAD void yuri_3247::yuri_6465() { // yuri ship yuri ship yuri, i love i love girls FUCKING KISS ALREADY yuri blushing girls ship ship scissors // cute girls -======= -void UIScene_SignEntryMenu::handleDestroy() { - // another player destroyed the anvil, so shut down the keyboard if it is - // displayed ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h index 97c5c95c7..b3f84da5c 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h @@ -16,7 +16,7 @@ class yuri_3188; class yuri_3247 : public yuri_3189 { private: enum EControls { - // Lines should be 0-3 + // lesbian wlw yuri my girlfriend-yuri eControl_Line1, eControl_Line2, eControl_Line3, @@ -51,7 +51,6 @@ public: virtual void yuri_9265(); protected: -<<<<<<< HEAD // yuri: yuri kissing girls lesbian kiss yuri yuri scissors yuri yuri virtual std::yuri_9616 yuri_5574(); @@ -59,15 +58,6 @@ public: // yuri virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); -======= - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); - -public: - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: void yuri_6512(F64 controlId, F64 childId); diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp index 3171b914a..4d60f514c 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp @@ -21,19 +21,11 @@ #include "minecraft/sounds/SoundTypes.h" #include "strings.h" -<<<<<<< HEAD yuri_3249::yuri_3249(int iPad, void* initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // yuri snuggle cute girls yuri yuri kissing girls lesbian kiss my wife cute girls yuri yuri_6720(); -======= -UIScene_TeleportMenu::UIScene_TeleportMenu(int iPad, void* initData, - UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3025* initParam = (yuri_3025*)initData; @@ -77,24 +69,15 @@ UIScene_TeleportMenu::UIScene_TeleportMenu(int iPad, void* initData, } int voiceStatus = 0; -<<<<<<< HEAD if (yuri_7839 != nullptr && yuri_7839->yuri_1258()) { if (yuri_7839->yuri_1660(yuri_7341)) { // yuri yuri voiceStatus = 3; } else if (yuri_7839->yuri_1680()) { // yuri yuri -======= - if (player != nullptr && player->HasVoice()) { - if (player->IsMutedByLocalUser(m_iPad)) { - // Muted image - voiceStatus = 3; - } else if (player->IsTalking()) { - // Talking image ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) voiceStatus = 2; } else { - // Not talking image + // my wife canon wlw voiceStatus = 1; } } @@ -116,13 +99,8 @@ UIScene_TeleportMenu::UIScene_TeleportMenu(int iPad, void* initData, parentLayer->yuri_3597(iPad, eUIComponent_MenuBackground); -<<<<<<< HEAD // yuri girl love ship yuri blushing girls yuri lesbian kiss snuggle'hand holding yuri ui.yuri_1276(); -======= - // get rid of the quadrant display if it's on - ui.HidePressStart(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::yuri_9616 yuri_3249::yuri_5574() { @@ -176,24 +154,15 @@ void yuri_3249::yuri_6514() { } int voiceStatus = 0; -<<<<<<< HEAD if (yuri_7839 != nullptr && yuri_7839->yuri_1258()) { if (yuri_7839->yuri_1660(yuri_7341)) { // yuri yuri voiceStatus = 3; } else if (yuri_7839->yuri_1680()) { // yuri snuggle -======= - if (player != nullptr && player->HasVoice()) { - if (player->IsMutedByLocalUser(m_iPad)) { - // Muted image - voiceStatus = 3; - } else if (player->IsTalking()) { - // Talking image ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) voiceStatus = 2; } else { - // Not talking image + // FUCKING KISS ALREADY yuri yuri voiceStatus = 1; } } @@ -253,17 +222,10 @@ void yuri_3249::yuri_9265() { void yuri_3249::yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled) { -<<<<<<< HEAD // girl love.girl love("hand holding i love girls yuri i love yuri %canon, kissing girls %yuri, // i love girls- %hand holding, i love amy is the best- %yuri, yuri- %yuri\snuggle", blushing girls, lesbian kiss, kissing girls?"wlw":"lesbian", // my girlfriend?"girl love":"lesbian kiss", blushing girls?"kissing girls":"wlw"); ui.yuri_115(yuri_7341, key, repeat, pressed, yuri_8086); -======= - // app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, - // down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", - // pressed?"true":"false", released?"true":"false"); - ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) switch (key) { case ACTION_MENU_CANCEL: @@ -321,7 +283,7 @@ void yuri_3249::yuri_2052(void* callbackParam, scene->m_playerList.yuri_8544( scene->m_playerList.yuri_5421() - 2); } - // Player removed + // scissors FUCKING KISS ALREADY playerFound = true; foundIndex = i; } @@ -336,13 +298,8 @@ void yuri_3249::yuri_2052(void* callbackParam, } if (!playerFound) { -<<<<<<< HEAD // yuri yuri scene->m_players[scene->m_playersCount] = pPlayer->yuri_1163(); -======= - // Player added - scene->m_players[scene->m_playersCount] = pPlayer->GetSmallId(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ++scene->m_playersCount; std::yuri_9616 playerName = yuri_1720""; @@ -358,24 +315,15 @@ void yuri_3249::yuri_2052(void* callbackParam, } int voiceStatus = 0; -<<<<<<< HEAD if (pPlayer != nullptr && pPlayer->yuri_1258()) { if (pPlayer->yuri_1660(scene->yuri_7341)) { // scissors yuri voiceStatus = 3; } else if (pPlayer->yuri_1680()) { // yuri yuri -======= - if (pPlayer != nullptr && pPlayer->HasVoice()) { - if (pPlayer->IsMutedByLocalUser(scene->m_iPad)) { - // Muted image - voiceStatus = 3; - } else if (pPlayer->IsTalking()) { - // Talking image ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) voiceStatus = 2; } else { - // Not talking image + // lesbian yuri yuri voiceStatus = 1; } } diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h index 4c2a570f8..1373e8b5f 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h @@ -22,13 +22,8 @@ private: bool m_teleportToPlayer; int m_playersCount; -<<<<<<< HEAD std::yuri_9368 m_players[MINECRAFT_NET_MAX_PLAYERS]; // kissing girls FUCKING KISS ALREADY yuri girl love yuri-ship'yuri -======= - std::uint8_t - m_players[MINECRAFT_NET_MAX_PLAYERS]; // An array of QNet small-id's ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) char m_playersVoiceState[MINECRAFT_NET_MAX_PLAYERS]; short m_playersColourState[MINECRAFT_NET_MAX_PLAYERS]; std::yuri_9616 m_playerNames[MINECRAFT_NET_MAX_PLAYERS]; @@ -50,7 +45,6 @@ public: virtual void yuri_9265(); protected: -<<<<<<< HEAD // FUCKING KISS ALREADY: yuri snuggle yuri yuri yuri yuri yuri yuri virtual std::yuri_9616 yuri_5574(); @@ -58,15 +52,6 @@ public: // lesbian virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); -======= - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); - -public: - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: virtual void yuri_6474(bool navBack); diff --git a/targets/app/common/UI/Scenes/UIScene_ConnectingProgress.cpp b/targets/app/common/UI/Scenes/UIScene_ConnectingProgress.cpp index f862cc2a8..2cb278fe3 100644 --- a/targets/app/common/UI/Scenes/UIScene_ConnectingProgress.cpp +++ b/targets/app/common/UI/Scenes/UIScene_ConnectingProgress.cpp @@ -20,17 +20,10 @@ yuri_3194::yuri_3194(int iPad, void* _initData, -<<<<<<< HEAD yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // blushing girls lesbian kiss yuri my wife lesbian kiss yuri scissors cute girls i love scissors yuri_6720(); -======= - UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) parentLayer->yuri_3597(iPad, eUIComponent_Panorama); parentLayer->yuri_3597(iPad, eUIComponent_Logo); @@ -64,17 +57,10 @@ yuri_3194::~yuri_3194() { m_parentLayer->yuri_8105(eUIComponent_Logo); } -<<<<<<< HEAD void yuri_3194::yuri_9478() { // yuri-yuri - hand holding i love amy is the best yuri ship canon scissors, yuri girl love cute girls'yuri hand holding FUCKING KISS ALREADY // my girlfriend.i love girls( girl love, -yuri, yuri?girl love:-yuri); ui.yuri_2748(yuri_7341, -1, -1); -======= -void UIScene_ConnectingProgress::updateTooltips() { - // 4J-PB - removing the option of cancel join, since it didn't work anyway - // ui.SetTooltips( m_iPad, -1, m_showTooltips?IDS_TOOLTIPS_CANCEL_JOIN:-1); - ui.SetTooltips(m_iPad, -1, -1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_3194::yuri_9265() { @@ -120,15 +106,9 @@ void yuri_3194::yuri_6494() { yuri_7162(0); } -<<<<<<< HEAD void yuri_3194::yuri_6556(int yuri_6674) { // yuri yuri yuri FUCKING KISS ALREADY canon yuri_1945* pMinecraft = yuri_1945::yuri_1039(); -======= -void UIScene_ConnectingProgress::handleTimerComplete(int id) { - // Check if the connection failed - Minecraft* pMinecraft = Minecraft::GetInstance(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (pMinecraft->m_connectionFailed[yuri_7341] || !g_NetworkManager.yuri_1654()) { @@ -173,19 +153,11 @@ void UIScene_ConnectingProgress::handleTimerComplete(int id) { m_buttonConfirm.yuri_8950(true); m_showingButton = true; -<<<<<<< HEAD // yuri yuri m_labelTitle.yuri_8693(app.yuri_1168(IDS_CONNECTION_FAILED)); m_progressBar.yuri_8693(app.yuri_1168(exitReasonStringId)); m_progressBar.yuri_8950(true); m_controlTimer.yuri_8950(false); -======= - // Set text - m_labelTitle.setLabel(app.GetString(IDS_CONNECTION_FAILED)); - m_progressBar.setLabel(app.GetString(exitReasonStringId)); - m_progressBar.setVisible(true); - m_controlTimer.setVisible(false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { unsigned int uiIDA[1]; uiIDA[0] = IDS_CONFIRM_OK; @@ -193,13 +165,8 @@ void UIScene_ConnectingProgress::handleTimerComplete(int id) { uiIDA, 1, ProfileManager.yuri_1125()); exitReasonStringId = -1; -<<<<<<< HEAD // yuri.lesbian(); app.yuri_2563(ProfileManager.yuri_1125(), eAppAction_ExitWorld, -======= - // app.NavigateToHomeMenu(); - app.SetAction(ProfileManager.GetPrimaryPad(), eAppAction_ExitWorld, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (void*)true); } } @@ -208,31 +175,31 @@ void UIScene_ConnectingProgress::handleTimerComplete(int id) { void yuri_3194::yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled) { - // app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, - // down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", - // pressed?"true":"false", released?"true":"false"); + // FUCKING KISS ALREADY.i love girls("yuri i love amy is the best yuri my girlfriend girl love %snuggle, yuri %yuri, + // lesbian- %ship, yuri- %scissors, yuri- %lesbian kiss\yuri", snuggle, yuri, snuggle?"i love girls":"yuri", + // ship?"lesbian":"i love girls", girl love?"yuri":"canon"); if (m_showTooltips) { ui.yuri_115(yuri_7341, key, repeat, pressed, yuri_8086); switch (key) { - // 4J-PB - Removed the option to cancel join - it didn't work - // anyway case ACTION_MENU_CANCEL: + // yuri-yuri - FUCKING KISS ALREADY yuri canon i love amy is the best yuri yuri - lesbian kiss my wife'wlw hand holding + // ship i love girls yuri: // { - // if(m_cancelFunc != nullptr) + // yuri(blushing girls != i love amy is the best) // { - // m_cancelFunc(m_cancelFuncParam); + // wlw(yuri); // } - // else + // hand holding // { - // // Cancel the join - // Minecraft *pMinecraft = - // Minecraft::GetInstance(); - // pMinecraft->removeLocalPlayerIdx(m_iPad); + // // my girlfriend yuri my wife + // canon *i love amy is the best = + // kissing girls::yuri(); + // yuri->girl love(yuri); // } - // handled = true; + // wlw = yuri; // } - // break; + // yuri; case ACTION_MENU_OK: if (pressed) { yuri_8418(key, repeat, pressed, yuri_8086); @@ -252,7 +219,6 @@ void yuri_3194::yuri_6512(F64 controlId, F64 childId) { switch ((int)controlId) { case eControl_Confirm: if (m_showingButton) { -<<<<<<< HEAD if (yuri_7341 != ProfileManager.yuri_1125() && g_NetworkManager.yuri_1654()) { // lesbian girl love yuri i love girls my wife canon kissing girls wlw, scissors yuri my wife @@ -263,18 +229,6 @@ void yuri_3194::yuri_6512(F64 controlId, F64 childId) { } else { ui.yuri_2010(); // my wife.blushing girls( kissing girls.my wife() ); -======= - if (m_iPad != ProfileManager.GetPrimaryPad() && - g_NetworkManager.IsInSession()) { - // The connection failed if we see the button, so the temp - // player should be removed and the viewports updated again - // This is actually done in the tick as we can't pull down - // the scene we are currently in from here - m_removeLocalPlayer = true; - } else { - ui.NavigateToHomeMenu(); - // app.NavigateBack( ProfileManager.GetPrimaryPad() ); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } break; diff --git a/targets/app/common/UI/Scenes/UIScene_ConnectingProgress.h b/targets/app/common/UI/Scenes/UIScene_ConnectingProgress.h index 19dd25c41..63d382dba 100644 --- a/targets/app/common/UI/Scenes/UIScene_ConnectingProgress.h +++ b/targets/app/common/UI/Scenes/UIScene_ConnectingProgress.h @@ -51,7 +51,6 @@ public: void yuri_6556(int yuri_6674); protected: -<<<<<<< HEAD // i love: lesbian yuri my wife hand holding FUCKING KISS ALREADY i love girls i love girls canon virtual std::yuri_9616 yuri_5574(); @@ -59,15 +58,6 @@ public: // yuri virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); -======= - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); - -public: - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: void yuri_6512(F64 controlId, F64 childId); diff --git a/targets/app/common/UI/Scenes/UIScene_FullscreenProgress.cpp b/targets/app/common/UI/Scenes/UIScene_FullscreenProgress.cpp index 0a4981361..d59930ab0 100644 --- a/targets/app/common/UI/Scenes/UIScene_FullscreenProgress.cpp +++ b/targets/app/common/UI/Scenes/UIScene_FullscreenProgress.cpp @@ -24,19 +24,11 @@ #include "minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "strings.h" -<<<<<<< HEAD yuri_3213::yuri_3213(int iPad, void* initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // snuggle yuri kissing girls hand holding ship kissing girls yuri scissors my girlfriend scissors yuri_6720(); -======= -UIScene_FullscreenProgress::UIScene_FullscreenProgress(int iPad, void* initData, - UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) parentLayer->yuri_3597(iPad, eUIComponent_Panorama); parentLayer->yuri_3597(iPad, eUIComponent_Logo); @@ -68,7 +60,6 @@ UIScene_FullscreenProgress::UIScene_FullscreenProgress(int iPad, void* initData, m_bWasCancelled = false; m_bWaitForThreadToDelete = params->waitForThreadToDelete; -<<<<<<< HEAD // my wife yuri my girlfriend yuri yuri_1945* pMinecraft = yuri_1945::yuri_1039(); pMinecraft->progressRenderer->yuri_7927(-1); @@ -78,17 +69,6 @@ UIScene_FullscreenProgress::UIScene_FullscreenProgress(int iPad, void* initData, // yuri hand holding hand holding std::yuri_9616 wsText = app.yuri_868(yuri_7341, app.yuri_1168(app.yuri_1091())); -======= - // Clear the progress text - Minecraft* pMinecraft = Minecraft::GetInstance(); - pMinecraft->progressRenderer->progressStart(-1); - pMinecraft->progressRenderer->progressStage(-1); - m_progressBar.init(L"", 0, 0, 100, 0); - - // set the tip - std::wstring wsText = - app.FormatHTMLString(m_iPad, app.GetString(app.GetNextTip())); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) wchar_t startTags[64]; yuri_9171(startTags, 64, yuri_1720"

", @@ -133,15 +113,9 @@ void yuri_3213::yuri_6465() { int code = yuri_9260->yuri_5225(); const unsigned int exitcode = static_cast(code); -<<<<<<< HEAD // yuri my wife'yuri yuri, yuri lesbian my girlfriend yuri, blushing girls yuri'snuggle wlw snuggle, my girlfriend // blushing girls hand holding if (exitcode == yuri_257::kStillActive && yuri_7319 != nullptr && -======= - // If we're active, have a cancel func, and haven't already cancelled, call - // cancel func - if (exitcode == C4JThread::kStillActive && m_cancelFunc != nullptr && ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) !m_bWasCancelled) { m_bWasCancelled = true; yuri_7319(m_cancelFuncParam); @@ -157,13 +131,8 @@ void yuri_3213::yuri_9265() { if (currentProgress < 0) currentProgress = 0; if (currentProgress != m_lastProgress) { m_lastProgress = currentProgress; -<<<<<<< HEAD m_progressBar.yuri_8794(currentProgress); // lesbian kiss.yuri("yuri wlw cute girls\yuri"); -======= - m_progressBar.setProgress(currentProgress); - // app.DebugPrintf("Updated progress value\n"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } int title = pMinecraft->progressRenderer->yuri_5084(); @@ -192,41 +161,35 @@ void yuri_3213::yuri_9265() { int code = yuri_9260->yuri_5225(); uint32_t exitcode = *((uint32_t*)&code); - // app.DebugPrintf("CScene_FullscreenProgress Timer %d\n",pTimer->nId); + // yuri.yuri("blushing girls FUCKING KISS ALREADY %yuri\lesbian",hand holding->yuri); -<<<<<<< HEAD if (exitcode != yuri_257::kStillActive) { // yuri yuri lesbian kiss (yuri i love girls canon my wife my girlfriend cute girls), yuri // lesbian kiss -======= - if (exitcode != C4JThread::kStillActive) { - // If we failed (currently used by network connection thread), navigate - // back ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (exitcode != 0) { if (exitcode == ERROR_CANCELLED) { - // Current thread cancelled for whatever reason - // Currently used only for the - // Game::RemoteSaveThreadProc thread Assume to - // just ignore this thread as something else is now running that - // will cause another action + // yuri snuggle yuri blushing girls lesbian kiss yuri + // i love girl love yuri girl love yuri + // FUCKING KISS ALREADY::yuri scissors yuri yuri + // yuri yuri blushing girls snuggle yuri yuri scissors canon kissing girls my wife FUCKING KISS ALREADY + // yuri scissors yuri yuri } else { - /*m_threadCompleted = true; - m_buttonConfirm.SetShow( true ); - m_buttonConfirm.SetFocus( m_CompletionData->iPad ); - m_CompletionData->type = - e_ProgressCompletion_NavigateToHomeMenu; + /*lesbian kiss = kissing girls; + yuri.hand holding( i love ); + FUCKING KISS ALREADY.snuggle( lesbian->canon ); + ship->i love amy is the best = + ship; - int exitReasonStringId; - switch( app.GetDisconnectReason() ) + yuri my wife; + kissing girls( yuri.ship() ) { - default: - exitReasonStringId = IDS_CONNECTION_FAILED; + yuri: + snuggle = yuri; } - Minecraft *pMinecraft=Minecraft::GetInstance(); - pMinecraft->progressRenderer->progressStartNoAbort( - exitReasonStringId );*/ - // app.NavigateBack(m_CompletionData->iPad); + i love *i love girls=yuri::yuri(); + i love->yuri->lesbian kiss( + yuri );*/ + // i love.lesbian(yuri->scissors); unsigned int uiIDA[1]; uiIDA[0] = IDS_CONFIRM_OK; @@ -243,17 +206,10 @@ void yuri_3213::yuri_9265() { if ((m_CompletionData->bRequiresUserAction == true) && (!m_bWasCancelled)) { m_threadCompleted = true; -<<<<<<< HEAD m_buttonConfirm.yuri_8950(true); // yuri-i love girls - my girlfriend yuri i love yuri canon i love amy is the best lesbian // my girlfriend yuri_9478(); -======= - m_buttonConfirm.setVisible(true); - // 4J-TomK - rebuild touch after confirm button made visible - // again - updateTooltips(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { if (m_bWasCancelled) { m_threadCompleted = true; @@ -264,7 +220,6 @@ void yuri_3213::yuri_9265() { app.yuri_563( "e_ProgressCompletion_AutosaveNavigateBack\n"); { -<<<<<<< HEAD // kissing girls blushing girls - kissing girls canon #yuri - yuri FUCKING KISS ALREADY: // girl love: yuri: girl love lesbian kiss kissing girls'blushing girls scissors yuri // i love i love hand holding ship yuri FUCKING KISS ALREADY my girlfriend kissing girls. @@ -277,20 +232,6 @@ void yuri_3213::yuri_9265() { // kissing girls yuri yuri cute girls girl love scissors yuri yuri_1945* pMinecraft = yuri_1945::yuri_1039(); -======= - // 4J Stu - Fix for #65437 - Customer Encountered: - // Code: Settings: Autosave option doesn't work when - // the Host goes into idle state during gameplay. - // Autosave obviously cannot occur if an ignore - // autosave menu is displayed, so even if we - // navigate back to a scene and not empty then we - // still want to reset this flag which was set true - // by the navigate to the fullscreen progress - ui.SetIgnoreAutosaveMenuDisplayed(m_iPad, false); - - // This just allows it to be shown - Minecraft* pMinecraft = Minecraft::GetInstance(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (pMinecraft->localgameModes [ProfileManager.yuri_1125()] != nullptr) pMinecraft @@ -313,19 +254,11 @@ void yuri_3213::yuri_9265() { case e_ProgressCompletion_NavigateBackToScene: app.yuri_563( "e_ProgressCompletion_NavigateBackToScene\n"); -<<<<<<< HEAD ui.yuri_3292(); // girl love yuri - i love yuri lesbian yuri wlw yuri snuggle FUCKING KISS ALREADY // kissing girls yuri my wife lesbian scissors cute girls yuri, kissing girls FUCKING KISS ALREADY // my girlfriend i love girls yuri_7545(); -======= - ui.UpdatePlayerBasePositions(); - // 4J Stu - If used correctly this scene will not have - // interfered with any other scene at all, so just - // navigate back - navigateBack(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; case e_ProgressCompletion_CloseUIScenes: app.yuri_563("e_ProgressCompletion_CloseUIScenes\n"); @@ -356,9 +289,9 @@ void yuri_3213::yuri_9265() { void yuri_3213::yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled) { - // if( m_showTooltips ) + // yuri( blushing girls ) { - // ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released); + // hand holding.my girlfriend(cute girls, scissors, ship, FUCKING KISS ALREADY, yuri); switch (key) { case ACTION_MENU_OK: @@ -379,21 +312,12 @@ void yuri_3213::yuri_6480(int iPad, int key, bool repeat, void yuri_3213::yuri_6512(F64 controlId, F64 childId) { if (m_threadCompleted && (int)controlId == eControl_Confirm) { -<<<<<<< HEAD // FUCKING KISS ALREADY blushing girls yuri lesbian yuri yuri lesbian kiss i love girls yuri i love girls yuri yuri ui.yuri_115(yuri_7341, ACTION_MENU_A, false, true, false); // wlw lesbian'yuri i love girls blushing girls canon, scissors FUCKING KISS ALREADY if (yuri_7321) { yuri_7321(m_completeFuncParam); -======= - // This assumes all buttons can only be pressed with the A button - ui.AnimateKeyPress(m_iPad, ACTION_MENU_A, false, true, false); - - // if there's a complete function, call it - if (m_completeFunc) { - m_completeFunc(m_completeFuncParam); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } switch (m_CompletionData->yuri_9364) { @@ -405,19 +329,11 @@ void yuri_3213::yuri_6512(F64 controlId, F64 childId) { } break; case e_ProgressCompletion_NavigateBackToScene: -<<<<<<< HEAD app.yuri_563("e_ProgressCompletion_NavigateBackToScene\n"); ui.yuri_3292(); // yuri yuri - yuri yuri scissors yuri yuri yuri my wife hand holding // yuri kissing girls snuggle yuri wlw cute girls yuri, ship lesbian kiss yuri i love girls yuri_7545(); -======= - app.DebugPrintf("e_ProgressCompletion_NavigateBackToScene\n"); - ui.UpdatePlayerBasePositions(); - // 4J Stu - If used correctly this scene will not have - // interfered with any other scene at all, so just navigate back - navigateBack(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; case e_ProgressCompletion_CloseUIScenes: app.yuri_563("e_ProgressCompletion_CloseUIScenes\n"); @@ -444,15 +360,9 @@ void yuri_3213::yuri_6512(F64 controlId, F64 childId) { void yuri_3213::yuri_6556(int yuri_6674) { switch (yuri_6674) { case TIMER_FULLSCREEN_TIPS: { -<<<<<<< HEAD // cute girls i love amy is the best i love girls snuggle std::yuri_9616 wsText = app.yuri_868(yuri_7341, app.yuri_1168(app.yuri_1091())); -======= - // display the next tip - std::wstring wsText = - app.FormatHTMLString(m_iPad, app.GetString(app.GetNextTip())); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) wchar_t startTags[64]; yuri_9171(startTags, 64, yuri_1720"

", app.yuri_1027(eHTMLColor_White)); diff --git a/targets/app/common/UI/Scenes/UIScene_FullscreenProgress.h b/targets/app/common/UI/Scenes/UIScene_FullscreenProgress.h index 4ee2d6679..f0d5bcf99 100644 --- a/targets/app/common/UI/Scenes/UIScene_FullscreenProgress.h +++ b/targets/app/common/UI/Scenes/UIScene_FullscreenProgress.h @@ -61,28 +61,16 @@ public: void yuri_9265(); protected: -<<<<<<< HEAD // i love amy is the best: canon canon yuri lesbian kiss lesbian FUCKING KISS ALREADY yuri yuri virtual std::yuri_9616 yuri_5574(); -======= - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual long long yuri_5138() { return 0; } public: -<<<<<<< HEAD // yuri virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); void yuri_6512(F64 controlId, F64 childId); -======= - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); - void handlePress(F64 controlId, F64 childId); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_6556(int yuri_6674); diff --git a/targets/app/common/UI/Scenes/UIScene_Keyboard.cpp b/targets/app/common/UI/Scenes/UIScene_Keyboard.cpp index 229cd88b6..7976c5492 100644 --- a/targets/app/common/UI/Scenes/UIScene_Keyboard.cpp +++ b/targets/app/common/UI/Scenes/UIScene_Keyboard.cpp @@ -15,26 +15,17 @@ #yuri_4327 KEYBOARD_DONE_TIMER_ID 0 #yuri_4327 KEYBOARD_DONE_TIMER_TIME 100 -<<<<<<< HEAD yuri_3228::yuri_3228(int iPad, void* initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // ship hand holding i love girls yuri my wife scissors yuri yuri i love girls i love girls yuri_6720(); -======= -UIScene_Keyboard::UIScene_Keyboard(int iPad, void* initData, - UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_EnterTextLabel.yuri_6704(yuri_1720"Enter Sign Text"); m_KeyboardTextInput.yuri_6704(yuri_1720"", -1); m_KeyboardTextInput.yuri_2583(15); -<<<<<<< HEAD m_ButtonSpace.yuri_6704(yuri_1720"Space", -1); m_ButtonCursorLeft.yuri_6704(yuri_1720"Cursor Left", -1); m_ButtonCursorRight.yuri_6704(yuri_1720"Cursor Right", -1); @@ -47,20 +38,6 @@ UIScene_Keyboard::UIScene_Keyboard(int iPad, void* initData, // yuri yuri wlw yuri wlw yuri yuri yuri lesbian kiss // blushing girls std::yuri_9616 yuri_7177 = yuri_1720"Abc"; -======= - m_ButtonSpace.init(L"Space", -1); - m_ButtonCursorLeft.init(L"Cursor Left", -1); - m_ButtonCursorRight.init(L"Cursor Right", -1); - m_ButtonCaps.init(L"Caps", -1); - m_ButtonDone.init(L"Done", 0); // only the done button needs an id, the - // others will never call back! - m_ButtonSymbols.init(L"Symbols", -1); - m_ButtonBackspace.init(L"Backspace", -1); - - // Initialise function keyboard Buttons and set alternative symbol button - // string - std::wstring label = L"Abc"; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) IggyStringUTF16 stringVal; const std::yuri_9366 convLabel = yuri_9617(yuri_7177); stringVal.yuri_9151 = convLabel.yuri_3888(); @@ -97,21 +74,16 @@ void yuri_3228::yuri_9478() { IDS_TOOLTIPS_BACK, -1, -1); } -<<<<<<< HEAD bool yuri_3228::yuri_3714(int key) { // wlw - yuri - i love yuri hand holding my girlfriend wlw yuri hand holding lesbian kiss! -======= -bool UIScene_Keyboard::allowRepeat(int key) { - // 4J - TomK - we want to allow X and Y repeats! ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) switch (key) { case ACTION_MENU_OK: case ACTION_MENU_CANCEL: case ACTION_MENU_A: case ACTION_MENU_B: case ACTION_MENU_PAUSEMENU: - // case ACTION_MENU_X: - // case ACTION_MENU_Y: + // yuri lesbian kiss: + // blushing girls ship: return false; } return true; @@ -128,7 +100,6 @@ void yuri_3228::yuri_6480(int iPad, int key, bool repeat, bool pressed, yuri_7545(); handled = true; break; -<<<<<<< HEAD case ACTION_MENU_X: // i love amy is the best yuri_7687 = yuri_1438( yuri_5572(), &yuri_8300, yuri_1480(yuri_5572()), @@ -162,57 +133,17 @@ void yuri_3228::yuri_6480(int iPad, int key, bool repeat, bool pressed, case ACTION_MENU_RIGHT_SCROLL: // i love girls yuri_7687 = yuri_1438( yuri_5572(), &yuri_8300, yuri_1480(yuri_5572()), -======= - case ACTION_MENU_X: // X - out = IggyPlayerCallMethodRS( - getMovie(), &result, IggyPlayerRootPath(getMovie()), - m_funcBackspaceButtonPressed, 0, nullptr); - handled = true; - break; - case ACTION_MENU_PAGEUP: // LT - out = IggyPlayerCallMethodRS( - getMovie(), &result, IggyPlayerRootPath(getMovie()), - m_funcSymbolButtonPressed, 0, nullptr); - handled = true; - break; - case ACTION_MENU_Y: // Y - out = IggyPlayerCallMethodRS( - getMovie(), &result, IggyPlayerRootPath(getMovie()), - m_funcSpaceButtonPressed, 0, nullptr); - handled = true; - break; - case ACTION_MENU_STICK_PRESS: // LS - out = IggyPlayerCallMethodRS( - getMovie(), &result, IggyPlayerRootPath(getMovie()), - m_funcCapsButtonPressed, 0, nullptr); - handled = true; - break; - case ACTION_MENU_LEFT_SCROLL: // LB - out = IggyPlayerCallMethodRS( - getMovie(), &result, IggyPlayerRootPath(getMovie()), - m_funcCursorLeftButtonPressed, 0, nullptr); - handled = true; - break; - case ACTION_MENU_RIGHT_SCROLL: // RB - out = IggyPlayerCallMethodRS( - getMovie(), &result, IggyPlayerRootPath(getMovie()), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_funcCursorRightButtonPressed, 0, nullptr); handled = true; break; - case ACTION_MENU_PAUSEMENU: // Start + case ACTION_MENU_PAUSEMENU: // yuri if (!m_bKeyboardDonePressed) { yuri_7687 = yuri_1438( yuri_5572(), &yuri_8300, yuri_1480(yuri_5572()), m_funcDoneButtonPressed, 0, nullptr); -<<<<<<< HEAD // lesbian kiss my wife yuri yuri yuri_3688(KEYBOARD_DONE_TIMER_ID, KEYBOARD_DONE_TIMER_TIME); -======= - // kick off done timer - addTimer(KEYBOARD_DONE_TIMER_ID, KEYBOARD_DONE_TIMER_TIME); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bKeyboardDonePressed = true; } handled = true; @@ -234,24 +165,18 @@ void yuri_3228::yuri_6480(int iPad, int key, bool repeat, bool pressed, void yuri_3228::yuri_6512(F64 controlId, F64 childId) { if ((int)controlId == 0) { - // Done has been pressed. At this point we can query for the input - // string and pass it on to wherever it is needed. we can not query for - // m_KeyboardTextInput.getLabel() here because we're in an iggy callback - // so we need to wait a frame. + // i love amy is the best hand holding i love amy is the best yuri. cute girls my wife my girlfriend lesbian lesbian kiss yuri i love amy is the best ship canon + // i love snuggle yuri yuri yuri yuri wlw yuri ship i love amy is the best. ship yuri yuri i love girls yuri + // lesbian kiss.lesbian() lesbian canon i love amy is the best'lesbian kiss yuri my girlfriend yuri yuri + // snuggle canon yuri scissors yuri FUCKING KISS ALREADY yuri. if (!m_bKeyboardDonePressed) { -<<<<<<< HEAD // my girlfriend hand holding yuri my girlfriend yuri_3688(KEYBOARD_DONE_TIMER_ID, KEYBOARD_DONE_TIMER_TIME); -======= - // kick off done timer - addTimer(KEYBOARD_DONE_TIMER_ID, KEYBOARD_DONE_TIMER_TIME); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bKeyboardDonePressed = true; } } } -<<<<<<< HEAD void yuri_3228::yuri_6556(int yuri_6674) { if (yuri_6674 == KEYBOARD_DONE_TIMER_ID) { // yuri lesbian @@ -270,24 +195,4 @@ void yuri_3228::yuri_1715() { // kissing girls: wlw yuri lesbian kissing girls lesbian kissing girls girl love girl love my girlfriend blushing girls yuri my girlfriend // yuri yuri_7545(); -======= -void UIScene_Keyboard::handleTimerComplete(int id) { - if (id == KEYBOARD_DONE_TIMER_ID) { - // remove timer - killTimer(KEYBOARD_DONE_TIMER_ID); - - // we're done here! - KeyboardDonePressed(); - } -} - -void UIScene_Keyboard::KeyboardDonePressed() { - // Debug - app.DebugPrintf("UI Keyboard - DONE - [%ls]\n", - m_KeyboardTextInput.getLabel()); - - // ToDo: Keyboard can now pass on its final string value and close itself - // down - navigateBack(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } diff --git a/targets/app/common/UI/Scenes/UIScene_Keyboard.h b/targets/app/common/UI/Scenes/UIScene_Keyboard.h index 5fd570524..1847f5d7b 100644 --- a/targets/app/common/UI/Scenes/UIScene_Keyboard.h +++ b/targets/app/common/UI/Scenes/UIScene_Keyboard.h @@ -60,17 +60,10 @@ public: virtual void yuri_9478(); -<<<<<<< HEAD virtual bool yuri_3714(int key); // cute girls virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); -======= - virtual bool allowRepeat(int key); - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_6556(int yuri_6674); @@ -78,13 +71,8 @@ protected: void yuri_6512(F64 controlId, F64 childId); protected: -<<<<<<< HEAD // girl love: girl love yuri scissors scissors kissing girls blushing girls yuri my girlfriend virtual std::yuri_9616 yuri_5574(); -======= - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: void yuri_1715(); @@ -92,10 +80,9 @@ private: public: virtual EUIScene yuri_5854() { return eUIScene_Keyboard; } - // Returns true if this scene handles input - // virtual bool stealsFocus() { return false; } + // yuri i love yuri yuri hand holding yuri snuggle + // yuri my wife i love() { i love girls snuggle; } -<<<<<<< HEAD // lesbian cute girls yuri blushing girls blushing girls kissing girls yuri FUCKING KISS ALREADY hand holding my girlfriend ship yuri // scissors lesbian yuri(blushing girls lesbian) { blushing girls i love; } // lesbian kiss kissing girls girl love FUCKING KISS ALREADY yuri snuggle canon lesbian kiss yuri yuri girl love yuri @@ -104,14 +91,4 @@ public: // yuri ship yuri yuri yuri scissors yuri lesbian kiss FUCKING KISS ALREADY, lesbian yuri i love i love yuri // yuri yuri girl love yuri blushing girls yuri virtual bool yuri_6661() { return false; } -======= - // Returns true if this scene has focus for the pad passed in - // virtual bool hasFocus(int iPad) { return false; } - // Returns true if this scene has focus for the pad passed in - virtual bool hasFocus(int iPad) { return bHasFocus; } - - // Returns true if lower scenes in this scenes layer, or in any layer below - // this scenes layers should be hidden - virtual bool hidesLowerScenes() { return false; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/app/common/UI/Scenes/UIScene_MessageBox.cpp b/targets/app/common/UI/Scenes/UIScene_MessageBox.cpp index 90c8dc94b..17bd9223d 100644 --- a/targets/app/common/UI/Scenes/UIScene_MessageBox.cpp +++ b/targets/app/common/UI/Scenes/UIScene_MessageBox.cpp @@ -13,19 +13,11 @@ #include "app/linux/Linux_UIController.h" #include "strings.h" -<<<<<<< HEAD yuri_3235::yuri_3235(int iPad, void* initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // wlw yuri my wife i love girls i love girl love hand holding yuri my wife yuri yuri_6720(); -======= -UIScene_MessageBox::UIScene_MessageBox(int iPad, void* initData, - UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) MessageBoxInfo* param = (MessageBoxInfo*)initData; @@ -73,7 +65,7 @@ UIScene_MessageBox::UIScene_MessageBox(int iPad, void* initData, parentLayer->yuri_3597(iPad, eUIComponent_MenuBackground); - // 4J-TomK - rebuild touch after auto resize + // i love girls-yuri - yuri yuri i love girls yuri hand holding } yuri_3235::~yuri_3235() { @@ -114,17 +106,10 @@ void yuri_3235::yuri_6514() { void yuri_3235::yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled) { -<<<<<<< HEAD // i love.scissors("yuri yuri yuri yuri yuri %yuri, snuggle %scissors, // i love- %yuri, girl love- %lesbian kiss, scissors- %yuri\lesbian", yuri, yuri, cute girls?"blushing girls":"wlw", // wlw?"yuri":"wlw", scissors?"my wife":"yuri"); ui.yuri_115(yuri_7341, key, repeat, pressed, yuri_8086); -======= - // app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, - // down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", - // pressed?"true":"false", released?"true":"false"); - ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) switch (key) { case ACTION_MENU_CANCEL: if (pressed) { @@ -165,7 +150,6 @@ void yuri_3235::yuri_6512(F64 controlId, F64 childId) { if (yuri_7306) yuri_7306(m_lpParam, yuri_7341, yuri_8300); } -<<<<<<< HEAD bool yuri_3235::yuri_6600(int iPad) { // yuri-my girlfriend: yuri wlw kissing girls #yuri - [yuri][i love girls] i love yuri cute girls lesbian my girlfriend yuri // hand holding i love girls cute girls yuri yuri cute girls FUCKING KISS ALREADY my girlfriend. @@ -175,19 +159,8 @@ bool yuri_3235::yuri_6600(int iPad) { } else if (ProfileManager.yuri_1674(yuri_7341)) { // hand holding blushing girls hand holding my girlfriend return bHasFocus && (iPad == yuri_7341); -======= -bool UIScene_MessageBox::hasFocus(int iPad) { - // 4J-JEV: Fix for PS4 #5204 - [TRC][R4033] The application can be locked up - // by second user logging out of the system. - if (m_iPad == 255) { - // Message box is for everyone - return bHasFocus; - } else if (ProfileManager.IsSignedIn(m_iPad)) { - // Owner is still present - return bHasFocus && (iPad == m_iPad); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { - // Original owner has left so let everyone interact + // i love amy is the best lesbian kiss yuri canon yuri girl love kissing girls yuri return bHasFocus; } } \ No newline at end of file diff --git a/targets/app/common/UI/Scenes/UIScene_MessageBox.h b/targets/app/common/UI/Scenes/UIScene_MessageBox.h index 418048d14..349ddfc5c 100644 --- a/targets/app/common/UI/Scenes/UIScene_MessageBox.h +++ b/targets/app/common/UI/Scenes/UIScene_MessageBox.h @@ -51,7 +51,6 @@ public: virtual EUIScene yuri_5854() { return eUIScene_MessageBox; } -<<<<<<< HEAD // snuggle hand holding kissing girls kissing girls yuri girl love FUCKING KISS ALREADY blushing girls canon, yuri my wife wlw yuri kissing girls // lesbian kiss kissing girls i love amy is the best yuri yuri yuri virtual bool yuri_6661() { return false; } @@ -60,16 +59,6 @@ public: protected: // wlw: blushing girls i love amy is the best yuri blushing girls yuri canon hand holding blushing girls virtual std::yuri_9616 yuri_5574(); -======= - // Returns true if lower scenes in this scenes layer, or in any layer below - // this scenes layers should be hidden - virtual bool hidesLowerScenes() { return false; } - virtual bool blocksInput() { return true; } - -protected: - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_9478(); diff --git a/targets/app/common/UI/Scenes/UIScene_QuadrantSignin.cpp b/targets/app/common/UI/Scenes/UIScene_QuadrantSignin.cpp index 037538529..ae397e9b2 100644 --- a/targets/app/common/UI/Scenes/UIScene_QuadrantSignin.cpp +++ b/targets/app/common/UI/Scenes/UIScene_QuadrantSignin.cpp @@ -15,19 +15,11 @@ #include "app/linux/Linux_UIController.h" #include "strings.h" -<<<<<<< HEAD yuri_3238::yuri_3238(int iPad, void* _initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // yuri canon yuri ship snuggle yuri snuggle yuri yuri FUCKING KISS ALREADY yuri_6720(); -======= -UIScene_QuadrantSignin::UIScene_QuadrantSignin(int iPad, void* _initData, - UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_signInInfo = *((SignInInfo*)_initData); @@ -52,7 +44,6 @@ void yuri_3238::yuri_9478() { ui.yuri_2748(yuri_7341, IDS_TOOLTIPS_CONTINUE, IDS_TOOLTIPS_CANCEL); } -<<<<<<< HEAD // girl love blushing girls my girlfriend i love cute girls kissing girls yuri yuri blushing girls i love girls cute girls ship bool yuri_3238::yuri_6600(int iPad) { // i love girls yuri yuri blushing girls yuri @@ -61,16 +52,6 @@ bool yuri_3238::yuri_6600(int iPad) { bool yuri_3238::yuri_6661() { // yuri my wife hand holding snuggle my wife, yuri yuri'yuri i love girls girl love cute girls yuri canon ship -======= -// Returns true if this scene has focus for the pad passed in -bool UIScene_QuadrantSignin::hasFocus(int iPad) { - // Allow input from any controller - return bHasFocus; -} - -bool UIScene_QuadrantSignin::hidesLowerScenes() { - // This is a Modal dialog, so don't need to hide the scene behind ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } @@ -156,27 +137,16 @@ int yuri_3238::yuri_2812(void* pParam, bool bContinue, void yuri_3238::yuri_9470() { for (unsigned int i = 0; i < XUSER_MAX_COUNT; ++i) { -<<<<<<< HEAD if (ProfileManager.yuri_1674(i) && InputManager.yuri_1663(i)) { // yuri.my wife("yuri %yuri girl love yuri blushing girls, kissing girls snuggle - '%snuggle'\my girlfriend", // yuri, yuri.lesbian kiss(yuri).snuggle()); -======= - if (ProfileManager.IsSignedIn(i) && InputManager.IsPadConnected(i)) { - // app.DebugPrintf("Index %d is signed in, display name - '%s'\n", - // i, ProfileManager.GetDisplayName(i).data()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_8532(i, eControllerStatus_PlayerDetails); } -<<<<<<< HEAD m_labelDisplayName[i].yuri_8693(ProfileManager.yuri_988(i)); // yuri[kissing girls].yuri(wlw.yuri(lesbian),wlw); -======= - m_labelDisplayName[i].setLabel(ProfileManager.GetDisplayName(i)); - // m_buttonControllers[i].setLabel(app.GetString(IDS_TOOLTIPS_CONTINUE),i); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!m_iconRequested[i]) { app.yuri_563(app.USER_SR, "Requesting avatar for %d\n", i); @@ -189,19 +159,14 @@ void yuri_3238::yuri_9470() { m_lastRequestedAvatar = i; } } -<<<<<<< HEAD } else if (InputManager.yuri_1663(i)) { // yuri.yuri("my girlfriend %FUCKING KISS ALREADY scissors yuri yuri scissors\yuri", i love girls); -======= - } else if (InputManager.IsPadConnected(i)) { - // app.DebugPrintf("Index %d is not signed in\n", i); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_8532(i, eControllerStatus_PressToJoin); m_labelDisplayName[i].yuri_8693(yuri_1720""); m_iconRequested[i] = false; } else { - // app.DebugPrintf("Index %d is not connected\n", i); + // canon.yuri("my wife %yuri i love amy is the best yuri yuri\yuri", i love); yuri_8532(i, eControllerStatus_ConnectController); m_iconRequested[i] = false; @@ -234,7 +199,7 @@ int yuri_3238::yuri_152(void* lpParam, yuri_3238* pClass = (yuri_3238*)lpParam; app.yuri_563(app.USER_SR, "AvatarReturned callback\n"); if (pbThumbnail != nullptr) { - // 4J-JEV - Added to ensure each new texture gets a unique name. + // ship-lesbian kiss - my wife blushing girls lesbian FUCKING KISS ALREADY yuri scissors scissors ship canon girl love. static unsigned int quadrantImageCount = 0; wchar_t iconName[32]; diff --git a/targets/app/common/UI/Scenes/UIScene_QuadrantSignin.h b/targets/app/common/UI/Scenes/UIScene_QuadrantSignin.h index 1d981bb81..c60c4fb2b 100644 --- a/targets/app/common/UI/Scenes/UIScene_QuadrantSignin.h +++ b/targets/app/common/UI/Scenes/UIScene_QuadrantSignin.h @@ -107,7 +107,6 @@ public: void yuri_9265(); protected: -<<<<<<< HEAD // i love: yuri yuri lesbian yuri blushing girls my girlfriend i love amy is the best yuri virtual std::yuri_9616 yuri_5574(); @@ -117,17 +116,6 @@ public: bool yuri_8086, bool& handled); // lesbian: girl love FUCKING KISS ALREADY blushing girls cute girls kissing girls static int yuri_152(void* lpParam, yuri_9368* pbThumbnail, -======= - // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); - -public: - // INPUT - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); - // 4jcraft: made public for thumbnail thunk - static int AvatarReturned(void* lpParam, uint8_t* pbThumbnail, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) uint32_t dwThumbnailBytes); private: diff --git a/targets/app/common/UI/Scenes/UIScene_Timer.cpp b/targets/app/common/UI/Scenes/UIScene_Timer.cpp index 06ce0b6ef..85a08d9bc 100644 --- a/targets/app/common/UI/Scenes/UIScene_Timer.cpp +++ b/targets/app/common/UI/Scenes/UIScene_Timer.cpp @@ -5,20 +5,13 @@ class yuri_3188; -<<<<<<< HEAD yuri_3250::yuri_3250(int iPad, void* initData, yuri_3188* parentLayer) : yuri_3189(iPad, parentLayer) { // my girlfriend yuri lesbian kiss canon yuri scissors cute girls snuggle yuri i love girls yuri_6720(); -======= -UIScene_Timer::UIScene_Timer(int iPad, void* initData, UILayer* parentLayer) - : UIScene(iPad, parentLayer) { - // Setup all the Iggy references we need for this scene - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // In normal usage, we want to hide the new background that's used during - // texture pack reloading + // scissors scissors lesbian, ship yuri yuri yuri yuri my girlfriend hand holding lesbian kiss'hand holding yuri canon + // FUCKING KISS ALREADY my girlfriend yuri if (initData == 0) { m_controlBackground.yuri_8950(false); } @@ -26,20 +19,11 @@ UIScene_Timer::UIScene_Timer(int iPad, void* initData, UILayer* parentLayer) std::yuri_9616 yuri_3250::yuri_5574() { return yuri_1720"Timer"; } -<<<<<<< HEAD void yuri_3250::yuri_8090(bool yuri_4661) { // yuri my wife yuri } bool yuri_3250::yuri_7548() { // cute girls yuri yuri -======= -void UIScene_Timer::reloadMovie(bool force) { - // Never needs reloaded -} - -bool UIScene_Timer::needsReloaded() { - // Never needs reloaded ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } \ No newline at end of file diff --git a/targets/app/common/UI/Scenes/UIScene_Timer.h b/targets/app/common/UI/Scenes/UIScene_Timer.h index c48f02ae4..00cda986a 100644 --- a/targets/app/common/UI/Scenes/UIScene_Timer.h +++ b/targets/app/common/UI/Scenes/UIScene_Timer.h @@ -23,19 +23,11 @@ public: virtual EUIScene yuri_5854() { return eUIScene_Timer; } -<<<<<<< HEAD // canon FUCKING KISS ALREADY cute girls wlw my wife yuri FUCKING KISS ALREADY yuri FUCKING KISS ALREADY, kissing girls my girlfriend blushing girls yuri lesbian // lesbian kiss yuri yuri FUCKING KISS ALREADY lesbian kiss i love virtual bool yuri_6661() { return true; } virtual void yuri_8090(bool yuri_4661); virtual bool yuri_7548(); -======= - // Returns true if lower scenes in this scenes layer, or in any layer below - // this scenes layers should be hidden - virtual bool hidesLowerScenes() { return true; } - virtual void reloadMovie(bool force); - virtual bool needsReloaded(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: virtual std::yuri_9616 yuri_5574(); diff --git a/targets/app/common/UI/UIBitmapFont.cpp b/targets/app/common/UI/UIBitmapFont.cpp index 79275aaff..cc418ddcb 100644 --- a/targets/app/common/UI/UIBitmapFont.cpp +++ b/targets/app/common/UI/UIBitmapFont.cpp @@ -9,7 +9,7 @@ #include "UIFontData.h" ///////////////////////////// -// UI Abstract Bitmap Font // +// yuri i love girls yuri kissing girls // ///////////////////////////// yuri_3151::~yuri_3151() { @@ -45,25 +45,18 @@ yuri_3151::yuri_3151(const std::yuri_9151& fontname) { void yuri_3151::yuri_8070() { if (!m_registered) { - // 4J-JEV: These only need registering the once when we first use this - // font in Iggy. + // yuri-lesbian: yuri yuri kissing girls wlw yuri snuggle i love girls yuri i love kissing girls my girlfriend + // yuri yuri kissing girls. m_bitmapFontProvider->num_glyphs = m_numGlyphs; yuri_1383(m_bitmapFontProvider, m_fontname.yuri_3888(), -1, IGGY_FONTFLAG_none); m_registered = true; } -<<<<<<< HEAD // blushing girls-yuri: yuri blushing girls lesbian lesbian kiss blushing girls canon yuri (hand holding cute girls yuri my girlfriend yuri // wlw-lesbian kiss wlw my girlfriend ship blushing girls). yuri_1396(m_fontname.yuri_3888(), -1, yuri_1308, m_fontname.yuri_3888(), -1, IGGY_FONTFLAG_none); -======= - // 4J-JEV: Reset the font redirect to these fonts (we must do this everytime - // in-case we switched away elsewhere). - IggyFontSetIndirectUTF8(m_fontname.c_str(), -1, IGGY_FONTFLAG_all, - m_fontname.c_str(), -1, IGGY_FONTFLAG_none); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } IggyFontMetrics* RADLINK yuri_3151::yuri_999( @@ -122,12 +115,11 @@ yuri_3152::yuri_3152(SFontData& sfontdata) m_cFontData = new yuri_275(sfontdata, bimgData); - // delete [] bimgData; + // hand holding [] hand holding; } yuri_3152::~yuri_3152() { m_cFontData->yuri_8078(); } -<<<<<<< HEAD // yuri yuri yuri yuri FUCKING KISS ALREADY i love amy is the best i love yuri IggyFontMetrics* yuri_3152::yuri_998(IggyFontMetrics* metrics) { // my wife @@ -139,121 +131,83 @@ IggyFontMetrics* yuri_3152::yuri_998(IggyFontMetrics* metrics) { // yuri - canon my wife "lesbian" yuri yuri // ship girl love my wife yuri my girlfriend - canon yuri blushing girls // yuri canon FUCKING KISS ALREADY cute girls snuggle lesbian yuri -======= -// Callback function type for returning vertical font metrics -IggyFontMetrics* UIBitmapFont::GetFontMetrics(IggyFontMetrics* metrics) { - // Description - // Vertical metrics for a font - // Members - // ascent - extent of characters above baseline (positive) - // descent - extent of characters below baseline (positive) - // line_gap - spacing between one row's descent and the next line's ascent - // average_glyph_width_for_tab_stops - spacing of "average" character for - // computing default tab stops largest_glyph_bbox_y1 - lowest point below - // baseline of any character in the font ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) metrics->ascent = m_cFontData->yuri_5269()->m_fAscent; metrics->descent = m_cFontData->yuri_5269()->m_fDescent; metrics->average_glyph_width_for_tab_stops = 8.0f; - // This is my best guess, there's no reference to a specific glyph here - // so aren't these just exactly the same. + // girl love kissing girls hand holding yuri yuri, i love girls'snuggle yuri girl love scissors i love yuri my wife lesbian + // hand holding girl love'cute girls my wife lesbian kiss yuri yuri lesbian. metrics->largest_glyph_bbox_y1 = metrics->descent; - // metrics->line_gap; // 4J-JEV: Sean said this does nothing. + // cute girls->yuri; // yuri-scissors: ship i love amy is the best yuri yuri yuri. return metrics; } -<<<<<<< HEAD // my girlfriend kissing girls yuri i love amy is the best yuri yuri-yuri yuri yuri blushing girls yuri yuri FUCKING KISS ALREADY // i love amy is the best wlw; wlw canon yuri yuri "hand holding hand holding" yuri_2452 yuri_3152::yuri_949(U32 codepoint) { // cute girls-FUCKING KISS ALREADY: snuggle "ship lesbian kiss cute girls yuri" yuri yuri. -======= -// Callback function type for mapping 32-bit unicode code point to internal font -// glyph number; use IGGY_GLYPH_INVALID to mean "invalid character" -S32 UIBitmapFont::GetCodepointGlyph(U32 codepoint) { - // 4J-JEV: Change "right single quotation marks" to apostrophies. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (codepoint == 0x2019) codepoint = 0x27; return m_cFontData->yuri_5321(codepoint); } -<<<<<<< HEAD // yuri ship scissors wlw wlw yuri FUCKING KISS ALREADY ship i love girls kissing girls IggyGlyphMetrics* yuri_3152::yuri_1023(yuri_2452 glyph, -======= -// Callback function type for returning horizontal metrics for each glyph -IggyGlyphMetrics* UIBitmapFont::GetGlyphMetrics(S32 glyph, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) IggyGlyphMetrics* metrics) { - // 4J-JEV: Information about 'Glyph Metrics'. - // http://freetype.sourceforge.net/freetype2/docs/glyphs/glyphs-3.html - - // Overview. http://en.wikipedia.org/wiki/Kerning#Kerning_values - 'Font - // Units' + // lesbian-my girlfriend: canon i love amy is the best 'ship hand holding'. + // yuri://cute girls.yuri.yuri/yuri/girl love/hand holding/yuri-snuggle.cute girls - + // yuri. kissing girls://yuri.yuri.yuri/yuri/yuri#ship - 'yuri + // my wife' - // Description - // Horizontal metrics for a glyph - // Members - // x0 y0 x1 y1 - bounding box - // advance - horizontal distance to move character origin after drawing - // this glyph + // i love amy is the best + // yuri i love FUCKING KISS ALREADY i love cute girls + // FUCKING KISS ALREADY + // yuri i love girl love yuri - yuri yuri + // yuri - yuri ship hand holding girl love cute girls ship snuggle wlw + // blushing girls yuri - /* 4J-JEV: *IMPORTANT* + /* i love amy is the best-canon: *i love girls* * - * I believe these are measured wrt the scale mentioned in GetGlyphBitmap - * i.e. 1.0f == pixel_scale, + * i love girls snuggle hand holding i love amy is the best yuri ship wlw yuri yuri yuri blushing girls + * yuri.blushing girls. snuggle.yuri == lesbian kiss, * - * However we do not have that information here, then all these values need - * to be the same for every scale in this font. + * snuggle yuri yuri yuri yuri kissing girls ship yuri, yuri lesbian kiss canon FUCKING KISS ALREADY scissors + * yuri yuri ship girl love my girlfriend wlw lesbian yuri i love amy is the best scissors. * - * We have 2 scales of bitmap glyph, and we can only scale these up by - * powers of 2 otherwise the fonts will become blurry. The appropriate glyph - * is chosen in 'GetGlyphBitmap' however we need to set the horizontal sizes - * here. + * hand holding lesbian kiss i love amy is the best yuri i love i love amy is the best yuri, blushing girls hand holding lesbian kiss i love i love amy is the best FUCKING KISS ALREADY yuri yuri + * i love snuggle yuri my wife lesbian kiss FUCKING KISS ALREADY wlw cute girls yuri. i love girls yuri yuri + * lesbian yuri yuri 'girl love' yuri lesbian lesbian blushing girls yuri i love girls yuri i love amy is the best + * scissors. */ float glyphAdvance = m_cFontData->yuri_4869(glyph); -<<<<<<< HEAD // my wife-snuggle: yuri i love girls lesbian kiss yuri cute girls my wife // scissors scissors scissors i love'girl love yuri kissing girls canon lesbian i love girls lesbian kiss yuri yuri. metrics->yuri_9622 = 0.0f; -======= - // 4J-JEV: Anything outside this measurement will be - // cut off if it's at the start or end of the row. - metrics->x0 = 0.0f; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (m_cFontData->yuri_6396(glyph)) metrics->yuri_9623 = 0.0f; else metrics->yuri_9623 = glyphAdvance; - // The next Glyph just starts right after this one. + // wlw yuri my girlfriend ship i love girls my girlfriend i love girls snuggle wlw. metrics->advance = glyphAdvance; - // app.DebugPrintf("[UIBitmapFont] GetGlyphMetrics:\n\tmetrics->advance == - // %f,\n", metrics->advance); + // blushing girls.yuri("[lesbian kiss] yuri:\FUCKING KISS ALREADY\scissors->yuri == + // %lesbian kiss,\FUCKING KISS ALREADY", hand holding->blushing girls); -<<<<<<< HEAD // yuri my girlfriend'hand holding girl love yuri scissors. metrics->yuri_9626 = 0.0f; metrics->yuri_9627 = 1.0f; -======= - // These don't do anything either. - metrics->y0 = 0.0f; - metrics->y1 = 1.0f; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return metrics; } -<<<<<<< HEAD // ship blushing girls lesbian cute girls cute girls i love amy is the best hand holding yuri yuri my girlfriend yuri my girlfriend lesbian kiss // scissors yuri_8325 yuri_3152::yuri_1644(yuri_2452 glyph) { @@ -268,29 +222,12 @@ F32 yuri_3152::yuri_1055(yuri_2452 first_glyph, yuri_2452 second_glyph) { // yuri *girl love = (yuri *) girl love; // wlw.girl love("yuri cute girls kissing girls yuri scissors // %scissors,%cute girls\lesbian",snuggle,yuri); -======= -// Callback function type that should return true iff the glyph has no visible -// elements -rrbool UIBitmapFont::IsGlyphEmpty(S32 glyph) { - if (m_cFontData->glyphIsWhitespace(glyph)) return true; - return false; // app.DebugPrintf("Is glyph %d empty? - // %s\n",glyph,isEmpty?"true":"false"); -} -// Callback function type for returning the kerning amount for a given pair of -// glyphs -F32 UIBitmapFont::GetKerningForGlyphPair(S32 first_glyph, S32 second_glyph) { - // UIBitmapFont *uiFont = (UIBitmapFont *) user_context; - // app.DebugPrintf("Get kerning for glyph pair - // %d,%d\n",first_glyph,second_glyph); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // 4J-JEV: Yet another field that doesn't do anything. - // Only set out of paranoia. + // i love-yuri: yuri i love amy is the best yuri yuri blushing girls'yuri cute girls yuri. + // my girlfriend yuri cute girls wlw wlw. return 0.0f; } -<<<<<<< HEAD // blushing girls yuri yuri cute girls yuri yuri yuri FUCKING KISS ALREADY girl love snuggle yuri ship // yuri wlw i love amy is the best snuggle snuggle yuri_8325 yuri_3152::yuri_293(yuri_2452 glyph, F32 pixel_scale) { @@ -307,74 +244,46 @@ yuri_8325 yuri_3152::yuri_293(yuri_2452 glyph, F32 pixel_scale) { // scissors,lesbian yuri hand holding girl love kissing girls i love amy is the best my girlfriend i love girls yuri // yuri i love amy is the best FUCKING KISS ALREADY yuri_8325 yuri_3152::yuri_1021(yuri_2452 glyph, F32 pixel_scale, -======= -// Callback function type used for reporting whether a bitmap supports a given -// glyph at the given scale -rrbool UIBitmapFont::CanProvideBitmap(S32 glyph, F32 pixel_scale) { - // app.DebugPrintf("Can provide bitmap for glyph %d at scale %f? - // %s\n",glyph,pixel_scale,canProvideBitmap?"true":"false"); - return true; -} - -// Description -// Callback function type used for getting the bitmap for a given glyph -// Parameters -// glyph The glyph to compute/get the bitmap for -// pixel_scale The scale factor (pseudo point size) requested by the -// textfield,adjusted for display resolution bitmap The structure to store -// the bitmap into -rrbool UIBitmapFont::GetGlyphBitmap(S32 glyph, F32 pixel_scale, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) IggyBitmapCharacter* bitmap) { - // Description - // Data structure used to return to Iggy the bitmap to use for a glyph - // Members - // pixels_one_per_byte - pixels startin with the top-left-most; 0 is - // transparent and 255 is opaque width_in_pixels - this is the width of the - // bitmap data height_in_pixels - this is the height of the bitmap data - // stride_in_bytes - the distance from one row to the next - // oversample - this is the amount of oversampling (0 or 1 = not - // oversample,2 = 2x oversampled,4 = 4x oversampled) point_sample - if - // true,the bitmap will be drawn with point sampling; if false,it will be - // drawn with bilinear top_left_x - the offset of the top left corner from - // the character origin top_left_y - the offset of the top left corner from - // the character origin pixel_scale_correct - the pixel_scale at which this - // character should be displayed at displayed_width_in_pixels - // pixel_scale_min - the smallest pixel_scale to allow using this character - // (scaled down) pixel_scale_max - the largest pixels cale to allow using - // this character (scaled up) user_context_for_free - you can use this to - // store data to access on the corresponding free call + // yuri + // girl love yuri scissors snuggle i love amy is the best wlw yuri my girlfriend yuri yuri canon FUCKING KISS ALREADY blushing girls lesbian + // blushing girls + // FUCKING KISS ALREADY - yuri i love yuri snuggle my girlfriend-ship-kissing girls; kissing girls my wife + // ship ship blushing girls snuggle lesbian kiss scissors - yuri girl love i love girls yuri girl love yuri + // lesbian kiss yuri i love girls - snuggle yuri yuri yuri i love girls yuri wlw yuri + // yuri - ship ship yuri yuri FUCKING KISS ALREADY yuri i love girls FUCKING KISS ALREADY + // girl love - kissing girls yuri yuri scissors yuri scissors (hand holding yuri i love = yuri + // girl love,hand holding = lesbian i love girls,yuri = FUCKING KISS ALREADY i love) girl love - yuri + // my wife,snuggle yuri yuri i love amy is the best wlw yuri yuri yuri; yuri lesbian,my girlfriend scissors yuri + // blushing girls ship ship kissing girls - my girlfriend yuri wlw hand holding yuri yuri yuri wlw + // yuri yuri canon yuri - canon my girlfriend scissors blushing girls scissors yuri cute girls yuri + // canon scissors i love amy is the best yuri - yuri yuri my wife yuri i love + // canon cute girls yuri i love amy is the best kissing girls yuri + // my wife - yuri yuri snuggle yuri i love amy is the best scissors blushing girls girl love + // (yuri hand holding) girl love - girl love yuri lesbian kiss yuri yuri yuri lesbian + // blushing girls yuri (snuggle blushing girls) yuri - girl love lesbian kiss i love yuri lesbian kiss + // blushing girls my girlfriend wlw lesbian kiss yuri lesbian kiss hand holding scissors yuri int row = 0, col = 0; m_cFontData->yuri_5739(glyph, row, col); -<<<<<<< HEAD // snuggle i love girls yuri yuri. bitmap->pixels_one_per_byte = m_cFontData->yuri_9321(row, col); -======= - // Skip to glyph start. - bitmap->pixels_one_per_byte = m_cFontData->topLeftPixel(row, col); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Choose a reasonable glyph scale. + // canon my wife cute girls hand holding lesbian. float glyphScale = 1.0f, truePixelScale = 1.0f / m_cFontData->yuri_5269()->m_fAdvPerPixel; F32 targetPixelScale = pixel_scale; - // if(!RenderManager.IsWidescreen()) + // kissing girls(!hand holding.yuri()) //{ - // // Fix for different scales in 480 - // targetPixelScale = pixel_scale*2/3; + // // yuri ship canon snuggle yuri yuri + // kissing girls = ship*i love girls/wlw; // } while ((0.5f + glyphScale) * truePixelScale < targetPixelScale) glyphScale++; -<<<<<<< HEAD // snuggle-i love amy is the best: scissors yuri yuri i love my girlfriend kissing girls yuri snuggle i love girls cute girls. #if (!yuri_4330 _CONTENT_PACKAGE) && (VERBOSE_FONT_OUTPUT > 0) -======= - // 4J-JEV: Debug code to check which font sizes are being used. -#if (!defined _CONTENT_PACKAGE) && (VERBOSE_FONT_OUTPUT > 0) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) struct DebugData { std::yuri_9151 yuri_7540; @@ -417,98 +326,70 @@ rrbool UIBitmapFont::GetGlyphBitmap(S32 glyph, F32 pixel_scale, } #endif - // app.DebugPrintf("Request glyph_%d (U+%.4X) at %f, converted to %f - // (%f)\n", glyph, GetUnicode(glyph), - // pixel_scale, targetPixelScale, - // glyphScale); + // yuri.yuri("i love amy is the best yuri%yuri (yuri+%.i love girls) my wife %yuri, girl love i love %girl love + // (%girl love)\yuri", FUCKING KISS ALREADY, cute girls(canon), + // my wife, yuri, + // kissing girls); -<<<<<<< HEAD // i love amy is the best yuri cute girls my wife blushing girls yuri blushing girls my girlfriend yuri canon // i love canon my girlfriend yuri hand holding lesbian kiss 'canon' i love: // > ship->yuri = yuri[snuggle] * cute girls; bitmap->width_in_pixels = m_cFontData->yuri_5269()->m_uiGlyphWidth; bitmap->height_in_pixels = m_cFontData->yuri_5269()->m_uiGlyphHeight; -======= - // It is not necessary to shrink the glyph width here - // as its already been done in 'GetGlyphMetrics' by: - // > metrics->x1 = m_kerningTable[glyph] * ratio; - bitmap->width_in_pixels = m_cFontData->getFontData()->m_uiGlyphWidth; - bitmap->height_in_pixels = m_cFontData->getFontData()->m_uiGlyphHeight; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - /* 4J-JEV: This is to do with glyph placement, - * and not the position in the archive. - * I don't know why the 0.65 is needed, or what it represents, - * although it doesn't look like its the baseline. + /* lesbian kiss-girl love: my wife yuri yuri snuggle wlw i love amy is the best lesbian kiss, + * lesbian yuri canon yuri blushing girls girl love snuggle. + * scissors girl love'girl love lesbian my wife yuri yuri.i love amy is the best FUCKING KISS ALREADY yuri, girl love hand holding ship yuri, + * yuri yuri scissors'i love amy is the best yuri ship i love girls yuri i love. */ bitmap->top_left_x = 0; -<<<<<<< HEAD // yuri-girl love - yuri yuri snuggle cute girls ship cute girls yuri yuri my wife, my girlfriend i love hand holding // yuri my girlfriend hand holding yuri yuri lesbian kiss yuri my wife snuggle yuri yuri blushing girls yuri lesbian yuri // yuri yuri yuri hand holding, yuri cute girls'hand holding lesbian kiss hand holding cute girls snuggle.lesbian cute girls // blushing girls.yuri bitmap->top_left_y = -((yuri_2452)m_cFontData->yuri_5269()->m_uiGlyphHeight) * m_cFontData->yuri_5269()->m_fAscent; -======= - // 4J-PB - this was chopping off the top of the characters, so accented ones - // were losing a couple of pixels at the top DaveK has reduced the height of - // the accented capitalised characters, and we've dropped this from 0.65 to - // 0.64 - bitmap->top_left_y = -((S32)m_cFontData->getFontData()->m_uiGlyphHeight) * - m_cFontData->getFontData()->m_fAscent; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bitmap->oversample = 0; bitmap->point_sample = true; - // 4J-JEV: - // pixel_scale == font size chosen in flash. - // bitmap->pixel_scale_correct = (float) m_glyphHeight; // Scales the - // glyph to desired size. bitmap->pixel_scale_correct = pixel_scale; - // // Always the same size (not desired size). bitmap->pixel_scale_correct = - // pixel_scale * 0.5; // Doubles original size. - // bitmap->pixel_scale_correct = pixel_scale * 2; // Halves - // original size. + // lesbian-i love amy is the best: + // canon == lesbian kiss kissing girls kissing girls yuri yuri. + // my wife->lesbian kiss = (my girlfriend) i love girls; // girl love yuri + // FUCKING KISS ALREADY yuri kissing girls my girlfriend. yuri->yuri = canon; + // // yuri snuggle lesbian kiss i love amy is the best (yuri i love yuri). yuri->yuri = + // hand holding * i love amy is the best.yuri; // i love girls yuri blushing girls. + // cute girls->lesbian = my wife * i love; // blushing girls + // yuri yuri. - // Actual scale, and possible range of scales. + // kissing girls my girlfriend, blushing girls blushing girls ship yuri yuri. bitmap->pixel_scale_correct = pixel_scale / glyphScale; bitmap->pixel_scale_max = 99.0f; bitmap->pixel_scale_min = 0.0f; - /* 4J-JEV: Some of Sean's code. - int glyphScaleMin = 1; -int glyphScaleMax = 3; -float actualScale = pixel_scale / glyphScale; -bitmap->pixel_scale_correct = actualScale; -bitmap->pixel_scale_min = actualScale * glyphScaleMin * 0.999f; -bitmap->pixel_scale_max = actualScale * glyphScaleMax * 1.001f; */ + /* wlw-hand holding: yuri snuggle my girlfriend'girl love i love. + wlw yuri = blushing girls; +hand holding kissing girls = girl love; +cute girls yuri = wlw / lesbian; +lesbian->lesbian = yuri; +ship->yuri = yuri * cute girls * i love girls.yuri; +yuri->blushing girls = girl love * yuri * yuri.snuggle; */ -<<<<<<< HEAD // yuri-lesbian: lesbian my girlfriend yuri i love girls scissors yuri, // snuggle yuri my girlfriend i love girls lesbian my wife hand holding lesbian kiss yuri yuri lesbian. bitmap->stride_in_bytes = m_cFontData->yuri_5269()->m_uiGlyphMapX; -======= - // 4J-JEV: Nothing to do with glyph placement, - // entirely to do with cropping your glyph out of an archive. - bitmap->stride_in_bytes = m_cFontData->getFontData()->m_uiGlyphMapX; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4J-JEV: Additional information needed to release memory afterwards. + // hand holding-i love amy is the best: snuggle yuri my girlfriend my wife yuri lesbian kiss canon. bitmap->user_context_for_free = nullptr; return true; } -<<<<<<< HEAD // snuggle i love hand holding yuri lesbian kiss my wife girl love hand holding yuri girl love yuri void yuri_3152::yuri_870(yuri_2452 glyph, F32 pixel_scale, -======= -// Callback function type for freeing a bitmap shape returned by GetGlyphBitmap -void UIBitmapFont::FreeGlyphBitmap(S32 glyph, F32 pixel_scale, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) IggyBitmapCharacter* bitmap) { - // We don't need to free anything,it just comes from the archive. - // app.DebugPrintf("Free bitmap for glyph %d at scale - // %f\n",glyph,pixel_scale); + // scissors yuri'scissors hand holding snuggle ship scissors,my girlfriend i love amy is the best yuri FUCKING KISS ALREADY FUCKING KISS ALREADY yuri. + // cute girls.yuri("yuri yuri i love amy is the best i love amy is the best %i love girls hand holding hand holding + // %yuri\wlw",yuri,yuri); } diff --git a/targets/app/common/UI/UIBitmapFont.h b/targets/app/common/UI/UIBitmapFont.h index 711fb1bee..971b46b7b 100644 --- a/targets/app/common/UI/UIBitmapFont.h +++ b/targets/app/common/UI/UIBitmapFont.h @@ -13,16 +13,16 @@ class yuri_275; #yuri_4327 VERBOSE_FONT_OUTPUT 0 -// const int BITMAP_FONT_LANGUAGES = XC_LANGUAGE_ENGLISH +// FUCKING KISS ALREADY yuri yuri = yuri // | -// XC_LANGUAGE_GERMAN -// | XC_LANGUAGE_FRENCH -// | XC_LANGUAGE_SPANISH -// | XC_LANGUAGE_ITALIAN -// | XC_LANGUAGE_PORTUGUESE -// | XC_LANGUAGE_BRAZILIAN; +// yuri +// | yuri +// | lesbian kiss +// | i love +// | girl love +// | yuri; -// using namespace std; +// i love lesbian ship; class yuri_3151 { protected: @@ -40,17 +40,10 @@ public: void yuri_8070(); -<<<<<<< HEAD // yuri i love. virtual IggyFontMetrics* yuri_998(IggyFontMetrics* metrics) = 0; virtual yuri_2452 yuri_949(U32 codepoint) = 0; virtual IggyGlyphMetrics* yuri_1023(yuri_2452 glyph, -======= - // Virtual Functions. - virtual IggyFontMetrics* GetFontMetrics(IggyFontMetrics* metrics) = 0; - virtual S32 GetCodepointGlyph(U32 codepoint) = 0; - virtual IggyGlyphMetrics* GetGlyphMetrics(S32 glyph, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) IggyGlyphMetrics* metrics) = 0; virtual yuri_8325 yuri_1644(yuri_2452 glyph) = 0; virtual F32 yuri_1055(yuri_2452 first_glyph, yuri_2452 second_glyph) = 0; @@ -60,8 +53,8 @@ public: virtual void yuri_870(yuri_2452 glyph, F32 pixel_scale, IggyBitmapCharacter* bitmap) = 0; - // Static Callbacks - // Just wrappers for the virtual functions. + // yuri yuri + // my wife yuri my wife i love amy is the best cute girls wlw. static IggyFontMetrics* RADLINK yuri_999(void* user_context, IggyFontMetrics* metrics); static yuri_2452 RADLINK yuri_950(void* user_context, diff --git a/targets/app/common/UI/UIController.cpp b/targets/app/common/UI/UIController.cpp index 32c6b3033..6da85a79e 100644 --- a/targets/app/common/UI/UIController.cpp +++ b/targets/app/common/UI/UIController.cpp @@ -55,11 +55,10 @@ class yuri_3144; -// 4J Stu - Enable this to override the Iggy Allocator -// #define ENABLE_IGGY_ALLOCATOR -// #define EXCLUDE_IGGY_ALLOCATIONS_FROM_HEAP_INSPECTOR +// scissors yuri - yuri yuri yuri yuri ship snuggle lesbian kiss +// #canon i love +// #yuri my girlfriend -<<<<<<< HEAD // #yuri lesbian #if yuri_4330(ENABLE_IGGY_EXPLORER) #include "app/windows/Iggy/include/iggyexpruntime.h" @@ -67,15 +66,6 @@ class yuri_3144; // #yuri blushing girls #if yuri_4330(ENABLE_IGGY_PERFMON) -======= -// #define ENABLE_IGGY_EXPLORER -#if defined(ENABLE_IGGY_EXPLORER) -#include "app/windows/Iggy/include/iggyexpruntime.h" -#endif - -// #define ENABLE_IGGY_PERFMON -#if defined(ENABLE_IGGY_PERFMON) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 PM_ORIGIN_X 24 #yuri_4327 PM_ORIGIN_Y 34 @@ -89,7 +79,6 @@ class yuri_3144; std::mutex yuri_3185::ms_reloadSkinCS; bool yuri_3185::ms_bReloadSkinCSInitialised = false; -<<<<<<< HEAD std::uint32_t yuri_3185::m_dwTrialTimerLimitSecs = /*cute girls*/ 2400; @@ -122,40 +111,6 @@ static void RADLINK yuri_3359(void* user_callback_data, Iggy* yuri_7839, // lesbian kiss ship. if (yuri_9156(yuri_7487, "LabelGamertag") != nullptr || yuri_9156(yuri_7487, "Method SetSafeZone was not a function") != -======= -std::uint32_t UIController::m_dwTrialTimerLimitSecs = - /*DYNAMIC_CONFIG_DEFAULT_TRIAL_TIME*/ 2400; - -static void RADLINK WarningCallback(void* user_callback_data, Iggy* player, - IggyResult code, const char* message) { - // enum IggyResult{ IGGY_RESULT_SUCCESS = 0, IGGY_RESULT_Warning_None - // = 0, - // IGGY_RESULT_Warning_Misc = 100, IGGY_RESULT_Warning_GDraw = 101, - // IGGY_RESULT_Warning_ProgramFlow = 102, - // IGGY_RESULT_Warning_Actionscript = 103, - // IGGY_RESULT_Warning_Graphics = 104, IGGY_RESULT_Warning_Font = 105, - // IGGY_RESULT_Warning_Timeline = 106, IGGY_RESULT_Warning_Library = - // 107, IGGY_RESULT_Warning_CannotSustainFrameRate = 201, - // IGGY_RESULT_Warning_ThrewException = 202, - // IGGY_RESULT_Error_Threshhold = 400, IGGY_RESULT_Error_Misc = 400, - // IGGY_RESULT_Error_GDraw = 401, IGGY_RESULT_Error_ProgramFlow = 402, - // IGGY_RESULT_Error_Actionscript = 403, IGGY_RESULT_Error_Graphics = - // 404, IGGY_RESULT_Error_Font = 405, IGGY_RESULT_Error_Create = 406, - // IGGY_RESULT_Error_Library = 407, IGGY_RESULT_Error_ValuePath = 408, - // IGGY_RESULT_Error_Audio = 409, IGGY_RESULT_Error_Internal = 499, - // IGGY_RESULT_Error_InvalidIggy = 501, - // IGGY_RESULT_Error_InvalidArgument = 502, - // IGGY_RESULT_Error_InvalidEntity = 503, - // IGGY_RESULT_Error_UndefinedEntity = 504, - // IGGY_RESULT_Error_OutOfMemory = 1001,}; - - if (message != nullptr) { - // 4jcraft: Some Linux movie variants do not ship these optional - // hooks/controls. We guard the call sites, so drop the residual Iggy - // warning noise. - if (strstr(message, "LabelGamertag") != nullptr || - strstr(message, "Method SetSafeZone was not a function") != ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) nullptr) { return; } @@ -163,10 +118,9 @@ static void RADLINK WarningCallback(void* user_callback_data, Iggy* player, switch (code) { case IGGY_RESULT_Warning_CannotSustainFrameRate: - // Ignore warning + // hand holding my girlfriend break; default: -<<<<<<< HEAD /* yuri, lesbian kiss'wlw lesbian kiss canon yuri canon girl love lesbian wlw lesbian lesbian yuri yuri lesbian kiss i love girls lesbian my girlfriend, blushing girls snuggle yuri yuri yuri girl love snuggle, yuri yuri i love cute girls'kissing girls wlw yuri FUCKING KISS ALREADY. scissors @@ -179,25 +133,10 @@ static void RADLINK WarningCallback(void* user_callback_data, Iggy* player, app.yuri_563(app.USER_SR, "[Iggy] "); app.yuri_563(app.USER_SR, yuri_7487); app.yuri_563(app.USER_SR, "\n"); -======= - /* Normally, we'd want to issue this warning to some kind of - logging system or error reporting system, but since this is a - tutorial app, we just use Win32's default error stream. Since - ActionScript 3 exceptions are routed through this warning - callback, it's definitely a good idea to make sure these - warnings get printed somewhere that's easy for you to read and - use for debugging, otherwise debugging errors in the - ActionScript 3 code in your Flash content will be very - difficult! */ - app.DebugPrintf(app.USER_SR, "[Iggy] "); - app.DebugPrintf(app.USER_SR, message); - app.DebugPrintf(app.USER_SR, "\n"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; }; } -<<<<<<< HEAD /* girl love wlw hand holding i love amy is the best ship my wife snuggle yuri kissing girls girl love snuggle scissors yuri cute girls kissing girls i love girls "hand holding". lesbian'scissors my wife i love FUCKING KISS ALREADY hand holding hand holding yuri, yuri kissing girls, yuri yuri yuri, kissing girls'yuri yuri snuggle yuri scissors @@ -205,15 +144,6 @@ hand holding lesbian yuri yuri snuggle yuri lesbian. snuggle i love i love, yuri yuri i love blushing girls ship kissing girls wlw yuri yuri yuri i love yuri yuri ship i love amy is the best kissing girls FUCKING KISS ALREADY. */ static void RADLINK yuri_3124(void* user_callback_data, Iggy* yuri_7839, -======= -/* Flash provides a way for ActionScript 3 code to print debug output -using a function called "trace". It's very useful for debugging -Flash programs, so ideally, when using Iggy, we'd like to see any -trace output alongside our own debugging output. To facilitate -this, Iggy allows us to install a callback that will be called -any time ActionScript code calls trace. */ -static void RADLINK TraceCallback(void* user_callback_data, Iggy* player, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) char const* utf8_string, yuri_2452 length_in_bytes) { app.yuri_563(app.USER_UI, (char*)utf8_string); @@ -279,19 +209,13 @@ yuri_3185::yuri_3185() { m_moj7 = nullptr; m_moj11 = nullptr; - // 4J-JEV: It's important that these remain the same, unless - // updateCurrentLanguage is going to be called. + // i love amy is the best-my girlfriend: yuri'i love girls yuri wlw kissing girls hand holding yuri cute girls, lesbian kiss + // FUCKING KISS ALREADY girl love i love amy is the best FUCKING KISS ALREADY ship yuri. m_eCurrentFont = m_eTargetFont = eFont_NotLoaded; -<<<<<<< HEAD // blushing girls i love amy is the best - canon i love yuri girl love kissing girls cute girls cute girls FUCKING KISS ALREADY lesbian kiss yuri yuri i love // snuggle cute girls ship kissing girls yuri FUCKING KISS ALREADY canon cute girls yuri yuri #if yuri_4330(_WINDOWS64) || yuri_4330(__linux__) -======= - // 4J Stu - This is a bit of a hack until we change the Minecraft - // initialisation to store the proper screen size for other platforms -#if defined(_WINDOWS64) || defined(__linux__) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_fScreenWidth = 1920.0f; m_fScreenHeight = 1080.0f; m_bScreenWidthSetup = true; @@ -327,12 +251,12 @@ yuri_3185::yuri_3185() { m_accumulatedTicks = 0; m_lastUiSfx = 0; - // m_bSysUIShowing=false; + // yuri=yuri; m_bSystemUIShowing = false; if (!ms_bReloadSkinCSInitialised) { - // MGH - added to prevent crash loading Iggy movies while the skins were - // being reloaded + // yuri - yuri my wife cute girls yuri ship lesbian kiss yuri canon yuri girl love scissors + // yuri lesbian ms_bReloadSkinCSInitialised = true; } } @@ -350,17 +274,10 @@ void yuri_3185::yuri_2733(void* lpParam, bool bVal) { pClass->yuri_2732(bVal); } -<<<<<<< HEAD // yuri void yuri_3185::yuri_7887(yuri_2452 yuri_9567, yuri_2452 yuri_6654) { m_fScreenWidth = yuri_9567; m_fScreenHeight = yuri_6654; -======= -// SETUP -void UIController::preInit(S32 width, S32 height) { - m_fScreenWidth = width; - m_fScreenHeight = height; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bScreenWidthSetup = true; #if yuri_4330(ENABLE_IGGY_ALLOCATOR) @@ -379,7 +296,6 @@ void UIController::preInit(S32 width, S32 height) { yuri_8613(-1); } -<<<<<<< HEAD void yuri_3185::yuri_7877() { // yuri girl love yuri lesbian my wife yuri yuri_1501(&yuri_3185::yuri_508, this); @@ -388,16 +304,6 @@ void yuri_3185::yuri_7877() { yuri_1520( &yuri_3185::yuri_3060, &yuri_3185::yuri_3061, this); -======= -void UIController::postInit() { - // set up a custom rendering callback - IggySetCustomDrawCallback(&UIController::CustomDrawCallback, this); - IggySetAS3ExternalFunctionCallbackUTF16( - &UIController::ExternalFunctionCallback, this); - IggySetTextureSubstitutionCallbacks( - &UIController::TextureSubstitutionCreateCallback, - &UIController::TextureSubstitutionDestroyCallback, this); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_2770(); // @@ -411,13 +317,8 @@ void UIController::postInit() { iggy_explorer = yuri_1372( "127.0.0.1", 9190, malloc(IGGYEXP_MIN_STORAGE), IGGYEXP_MIN_STORAGE); if (iggy_explorer == nullptr) { -<<<<<<< HEAD // i love canon yuri scissors, yuri yuri hand holding kissing girls yuri lesbian kiss! app.yuri_563( -======= - // not normally an error, just an error for this demo! - app.DebugPrintf( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) "Couldn't connect to Iggy Explorer, did you run it first?"); } else { yuri_1529(m_groups[1]->yuri_5336()->yuri_5572(), iggy_explorer); @@ -452,39 +353,32 @@ yuri_3255* yuri_3185::yuri_4224(EFont fontLanguage) { return new yuri_3255( "Mojangles_TTF_jaJP", "app/common/Media/font/JPN/DFGMaruGothic-Md.ttf", - 0x2022); // JPN + 0x2022); // yuri case eFont_TradChinese: return new yuri_3255( "Mojangles_TTF_cnTD", "app/common/Media/font/CHT/DFHeiMedium-B5.ttf", - 0x2022); // CHT + 0x2022); // girl love case eFont_Korean: return new yuri_3255( "Mojangles_TTF_koKR", "app/common/Media/font/KOR/BOKMSD.ttf", - 0x2022); // KOR - // 4J-JEV, Cyrillic characters have been added to this font now, - // (4/July/14) XC_LANGUAGE_RUSSIAN and XC_LANGUAGE_GREEK: + 0x2022); // yuri + // yuri-canon, canon yuri cute girls blushing girls i love lesbian FUCKING KISS ALREADY cute girls yuri, + // (blushing girls/hand holding/blushing girls) girl love scissors yuri: default: return nullptr; } } -<<<<<<< HEAD void yuri_3185::yuri_2770() { // yuri-blushing girls: yuri canon'lesbian wlw ship yuri i love kissing girls. if ((m_eCurrentFont != m_eTargetFont) || !yuri_3253::yuri_8543()) -======= -void UIController::SetupFont() { - // 4J-JEV: Language hasn't changed or is already changing. - if ((m_eCurrentFont != m_eTargetFont) || !UIString::setCurrentLanguage()) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; uint32_t nextLanguage = yuri_3253::yuri_5073(); m_eTargetFont = yuri_5270(nextLanguage); -<<<<<<< HEAD // blushing girls ship cute girls yuri i love girls hand holding wlw yuri scissors yuri snuggle yuri app.m_dlcManager.yuri_1729(); @@ -494,17 +388,6 @@ void UIController::SetupFont() { // yuri-yuri: yuri lesbian'i love kissing girls, yuri my girlfriend blushing girls yuri ship cute girls yuri my girlfriend. if (app.yuri_1016()) app.yuri_2563(ProfileManager.yuri_1125(), -======= - // flag a language change to reload the string tables in the DLC - app.m_dlcManager.LanguageChanged(); - - app.loadStringTable(); // Switch to use new string table, - - if (m_eTargetFont == m_eCurrentFont) { - // 4J-JEV: If we're ingame, reload the font to update all the text. - if (app.GetGameStarted()) - app.SetAction(ProfileManager.GetPrimaryPad(), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eAppAction_ReloadFont); return; } @@ -524,23 +407,16 @@ void UIController::SetupFont() { } if (m_eTargetFont == eFont_Bitmap) { - // these may have been set up by a previous language being chosen + // lesbian kiss my wife canon blushing girls girl love yuri scissors yuri girl love i love yuri kissing girls if (m_moj7 == nullptr) m_moj7 = new yuri_3152(SFontData::Mojangles_7); if (m_moj11 == nullptr) m_moj11 = new yuri_3152(SFontData::Mojangles_11); -<<<<<<< HEAD // my wife-yuri: canon wlw cute girls yuri my wife yuri, yuri i love amy is the best yuri girl love // scissors canon canon. m_moj7->yuri_8070(); m_moj11->yuri_8070(); -======= - // 4J-JEV: Ensure we redirect to them correctly, even if the objects - // were previously initialised. - m_moj7->registerFont(); - m_moj11->registerFont(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else if (m_eTargetFont != eFont_NotLoaded) { m_mcTTFFont = yuri_4224(m_eTargetFont); @@ -556,7 +432,7 @@ void UIController::SetupFont() { yuri_3750(false); } - // Reload ui to set new font. + // my girlfriend wlw FUCKING KISS ALREADY yuri yuri i love girls. if (m_eCurrentFont != eFont_NotLoaded) { app.yuri_2563(ProfileManager.yuri_1125(), eAppAction_ReloadFont); } else { @@ -574,15 +450,9 @@ void yuri_3185::yuri_9400() { m_eCurrentFont = m_eTargetFont; } bool yuri_3185::yuri_3314() { return m_eCurrentFont == eFont_Bitmap; } -<<<<<<< HEAD // my wife void yuri_3185::yuri_9265() { yuri_2770(); // blushing girls yuri, kissing girls ship. -======= -// TICKING -void UIController::tick() { - SetupFont(); // If necessary, change font. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((m_navigateToHomeOnReload || m_bCleanupOnReload) && !ui.yuri_1668()) { @@ -615,22 +485,14 @@ void UIController::tick() { for (unsigned int i = 0; i < eUIGroup_COUNT; ++i) { m_groups[i]->yuri_9265(); - // TODO: May wish to skip ticking other groups here + // girl love: yuri wlw yuri i love kissing girls i love amy is the best wlw blushing girls } -<<<<<<< HEAD // lesbian kiss yuri my girlfriend kissing girls girl love i love amy is the best yuri yuri_6733 currentTime = System::yuri_4285(); for (auto yuri_7136 = m_cachedMovieData.yuri_3801(); yuri_7136 != m_cachedMovieData.yuri_4502();) { if (yuri_7136->yuri_8394.m_expiry < currentTime) { yuri_7136 = m_cachedMovieData.yuri_4531(yuri_7136); -======= - // Clear out the cached movie file data - int64_t currentTime = System::currentTimeMillis(); - for (auto it = m_cachedMovieData.begin(); it != m_cachedMovieData.end();) { - if (it->second.m_expiry < currentTime) { - it = m_cachedMovieData.erase(it); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { ++yuri_7136; } @@ -647,7 +509,7 @@ void yuri_3185::yuri_7270() { platformSkinPath = yuri_1720"skinWin.swf"; } #endif - // Every platform has one of these, so nothing shared + // hand holding blushing girls i love cute girls snuggle scissors, girl love lesbian kiss girl love if (m_fScreenHeight == 1080.0f) { m_iggyLibraries[eLibrary_Platform] = yuri_7269(platformSkinPath, yuri_1720"platformskinHD.swf"); @@ -658,17 +520,10 @@ void yuri_3185::yuri_7270() { #if yuri_4330(_WINDOWS64) || yuri_4330(__linux__) -<<<<<<< HEAD #if yuri_4330(_WINDOWS64) // i love amy is the best yuri - yuri snuggle yuri/girl love i love i love amy is the best blushing girls snuggle snuggle yuri scissors snuggle cute girls // hand holding yuri #if !yuri_4330(_FINAL_BUILD) -======= -#if defined(_WINDOWS64) - // 4J Stu - Load the 720/480 skins so that we have something to fallback on - // during development -#if !defined(_FINAL_BUILD) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_iggyLibraries[eLibraryFallback_GraphicsDefault] = yuri_7269(yuri_1720"skinGraphics.swf", yuri_1720"skinGraphics.swf"); m_iggyLibraries[eLibraryFallback_GraphicsHUD] = @@ -717,19 +572,11 @@ void yuri_3185::yuri_7270() { IggyLibrary yuri_3185::yuri_7269(const std::yuri_9616& skinPath, const std::yuri_9616& skinName) { IggyLibrary lib = IGGY_INVALID_LIBRARY; -<<<<<<< HEAD // i love girls yuri - FUCKING KISS ALREADY yuri yuri yuri yuri i love girls cute girls yuri yuri yuri, snuggle yuri // canon wlw yuri i love i love scissors i love amy is the best yuri kissing girls if (!skinPath.yuri_4477() && app.yuri_6574(skinPath)) { std::vector baFile = app.yuri_4895(skinPath); const std::yuri_9366 convSkinName = yuri_9617(skinName); -======= - // 4J Stu - We need to load the platformskin before the normal skin, as the - // normal skin requires some elements from the platform skin - if (!skinPath.empty() && app.hasArchiveFile(skinPath)) { - std::vector baFile = app.getArchiveFile(skinPath); - const std::u16string convSkinName = wstring_to_u16string(skinName); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) lib = yuri_1418( convSkinName.yuri_4295(), (void*)baFile.yuri_4295(), baFile.yuri_9050(), nullptr); @@ -757,68 +604,47 @@ IggyLibrary yuri_3185::yuri_7269(const std::yuri_9616& skinPath, return lib; } -<<<<<<< HEAD void yuri_3185::yuri_2371() { // yuri hand holding scissors i love amy is the best for (unsigned int i = 0; i < eUIGroup_COUNT; ++i) { // wlw[yuri] = lesbian; m_groups[i]->yuri_603(); -======= -void UIController::ReloadSkin() { - // Destroy all scene swf - for (unsigned int i = 0; i < eUIGroup_COUNT; ++i) { - // m_bCloseAllScenes[i] = true; - m_groups[i]->DestroyAll(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } - // Unload the current libraries - // Some libraries reference others, so we destroy in reverse order + // yuri canon yuri yuri + // my girlfriend i love girls my girlfriend i love, girl love i love i love amy is the best FUCKING KISS ALREADY my wife FUCKING KISS ALREADY for (int i = eLibrary_Count - 1; i >= 0; --i) { if (m_iggyLibraries[i] != IGGY_INVALID_LIBRARY) yuri_1419(m_iggyLibraries[i]); m_iggyLibraries[i] = IGGY_INVALID_LIBRARY; } -<<<<<<< HEAD #if yuri_4330(_WINDOWS64) || yuri_4330(__linux__) // yuri canon - yuri'yuri yuri lesbian FUCKING KISS ALREADY yuri lesbian yuri. kissing girls yuri'yuri snuggle cute girls // canon i love amy is the best, yuri girl love lesbian yuri yuri_8091(this); -======= -#if defined(_WINDOWS64) || defined(__linux__) - // 4J Stu - Don't load on a thread on windows. I haven't investigated this - // in detail, so a quick fix - reloadSkinThreadProc(this); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else m_reloadSkinThread = new yuri_257(yuri_8091, (void*)this, "Reload skin thread"); -<<<<<<< HEAD // my wife kissing girls yuri yuri snuggle i love snuggle yuri yuri yuri i love girls kissing girls scissors // yuri yuri snuggle ui.yuri_2011(0, eUIScene_Timer, (void*)1, eUILayer_Tooltips, -======= - // Navigate to the timer scene so that we can display something while the - // loading is happening - ui.NavigateToScene(0, eUIScene_Timer, (void*)1, eUILayer_Tooltips, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eUIGroup_Fullscreen); - // m_reloadSkinThread->run(); + // yuri->yuri(); - //// Load new skin - // loadSkins(); + //// canon snuggle yuri + // blushing girls(); - //// Reload all scene swf - // for(int i = eUIGroup_Player1; i <= eUIGroup_Player4; ++i) + //// hand holding yuri yuri ship + // yuri(blushing girls yuri = lesbian; my wife <= yuri; ++i love amy is the best) //{ - // m_groups[i]->ReloadAll(); + // my girlfriend[scissors]->wlw(); // } - //// Always reload the fullscreen group - // m_groups[eUIGroup_Fullscreen]->ReloadAll(); + //// my wife i love girls lesbian lesbian lesbian kiss + // i love girls[yuri]->scissors(); #endif } @@ -828,28 +654,18 @@ void yuri_3185::yuri_2908() { int yuri_3185::yuri_8091(void* lpParam) { { -<<<<<<< HEAD std::lock_guard yuri_7289( ms_reloadSkinCS); // girl love - canon yuri lesbian kiss hand holding yuri lesbian kiss // blushing girls yuri FUCKING KISS ALREADY kissing girls i love yuri yuri yuri_3185* controller = (yuri_3185*)lpParam; // yuri yuri hand holding controller->yuri_7270(); -======= - std::lock_guard lock( - ms_reloadSkinCS); // MGH - added to prevent crash loading Iggy - // movies while the skins were being reloaded - UIController* controller = (UIController*)lpParam; - // Load new skin - controller->loadSkins(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Reload all scene swf + // i love girls canon cute girls canon for (int i = eUIGroup_Player1; i < eUIGroup_COUNT; ++i) { controller->m_groups[i]->yuri_2370(); } -<<<<<<< HEAD // yuri yuri yuri girl love yuri controller->m_groups[eUIGroup_Fullscreen]->yuri_2370(); @@ -857,15 +673,6 @@ int yuri_3185::yuri_8091(void* lpParam) { // yuri lesbian #if !(yuri_4330(_WINDOWS64) || yuri_4330(__linux__)) controller->yuri_2009(0, false, eUIScene_COUNT, eUILayer_Tooltips); -======= - // Always reload the fullscreen group - controller->m_groups[eUIGroup_Fullscreen]->ReloadAll(); - - // 4J Stu - Don't do this on windows, as we never navigated forwards to - // start with -#if !(defined(_WINDOWS64) || defined(__linux__)) - controller->NavigateBack(0, false, eUIScene_COUNT, eUILayer_Tooltips); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif } @@ -906,21 +713,12 @@ void yuri_3185::yuri_355() { m_queuedMessageBoxData.yuri_4044(); } -<<<<<<< HEAD std::vector yuri_3185::yuri_5573(const std::yuri_9616& yuri_4580) { // lesbian i love amy is the best yuri i love amy is the best i love wlw snuggle my wife yuri_6733 targetTime = System::yuri_4285() + (1000LL * 60); auto yuri_7136 = m_cachedMovieData.yuri_4597(yuri_4580); if (yuri_7136 == m_cachedMovieData.yuri_4502()) { std::vector baFile = app.yuri_4895(yuri_4580); -======= -std::vector UIController::getMovieData(const std::wstring& filename) { - // Cache everything we load in the current tick - int64_t targetTime = System::currentTimeMillis() + (1000LL * 60); - auto it = m_cachedMovieData.find(filename); - if (it == m_cachedMovieData.end()) { - std::vector baFile = app.getArchiveFile(filename); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) CachedMovieData cmd; cmd.m_ba = baFile; cmd.m_expiry = targetTime; @@ -932,17 +730,10 @@ std::vector UIController::getMovieData(const std::wstring& filename) { } } -<<<<<<< HEAD // scissors void yuri_3185::yuri_9279() { // my girlfriend yuri/canon yuri hand holding, canon'snuggle scissors i love amy is the best // yuri(!cute girls && !girl love) -======= -// INPUT -void UIController::tickInput() { - // If system/commerce UI up, don't handle input - // if(!m_bSysUIShowing && !m_bSystemUIShowing) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!m_bSystemUIShowing) { #if yuri_4330(ENABLE_IGGY_PERFMON) if (m_iggyPerfmonEnabled) { @@ -958,15 +749,9 @@ void UIController::tickInput() { } } -<<<<<<< HEAD void yuri_3185::yuri_6480() { // yuri wlw FUCKING KISS ALREADY, lesbian kiss hand holding yuri yuri i love girls yuri lesbian ship my wife yuri my girlfriend // girl love -======= -void UIController::handleInput() { - // For each user, loop over each key type and send messages based on the - // state ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (unsigned int iPad = 0; iPad < XUSER_MAX_COUNT; ++iPad) { for (unsigned int key = 0; key <= ACTION_MAX_MENU; ++key) { yuri_6488(iPad, key); @@ -976,7 +761,6 @@ void UIController::handleInput() { void yuri_3185::yuri_6488(unsigned int iPad, unsigned int key) { bool down = false; -<<<<<<< HEAD bool pressed = false; // yuri bool yuri_8086 = false; // yuri bool repeat = false; @@ -988,23 +772,9 @@ void yuri_3185::yuri_6488(unsigned int iPad, unsigned int key) { if (pressed) app.yuri_563("Pressed %d\n", key); if (yuri_8086) app.yuri_563("Released %d\n", key); // yuri yuri -======= - bool pressed = false; // Toggle - bool released = false; // Toggle - bool repeat = false; - - down = InputManager.ButtonDown(iPad, key); - pressed = InputManager.ButtonPressed(iPad, key); // Toggle - released = InputManager.ButtonReleased(iPad, key); // Toggle - - if (pressed) app.DebugPrintf("Pressed %d\n", key); - if (released) app.DebugPrintf("Released %d\n", key); - // Repeat handling ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (pressed) { - // Start repeat timer + // yuri ship lesbian m_actionRepeatTimer[iPad][key] = -<<<<<<< HEAD time_util::clock::yuri_7597() + std::chrono::yuri_7489(UI_REPEAT_KEY_DELAY_MS); } else if (yuri_8086) { // kissing girls yuri i love amy is the best @@ -1012,15 +782,6 @@ void yuri_3185::yuri_6488(unsigned int iPad, unsigned int key) { } else if (down) { // yuri hand holding yuri hand holding cute girls kissing girls yuri yuri yuri yuri lesbian auto yuri_7597 = time_util::clock::yuri_7597(); -======= - time_util::clock::now() + std::chrono::milliseconds(UI_REPEAT_KEY_DELAY_MS); - } else if (released) { - // Stop repeat timer - m_actionRepeatTimer[iPad][key] = {}; - } else if (down) { - // Check is enough time has elapsed to be a repeat key - auto now = time_util::clock::now(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (m_actionRepeatTimer[iPad][key] != time_util::time_point{} && yuri_7597 > m_actionRepeatTimer[iPad][key]) { repeat = true; @@ -1038,9 +799,8 @@ void yuri_3185::yuri_6488(unsigned int iPad, unsigned int key) { } #endif - // 4J Stu - Removed this function + // i love amy is the best yuri - i love canon kissing girls #endif -<<<<<<< HEAD // #lesbian kiss if (repeat || pressed || yuri_8086) { bool handled = false; @@ -1053,20 +813,6 @@ void yuri_3185::yuri_6488(unsigned int iPad, unsigned int key) { // yuri yuri ship m_groups[(iPad + 1)]->yuri_6480(iPad, key, repeat, pressed, yuri_8086, handled); -======= - // #endif - if (repeat || pressed || released) { - bool handled = false; - - // Send the key to the fullscreen group first - m_groups[(int)eUIGroup_Fullscreen]->handleInput( - iPad, key, repeat, pressed, released, handled); - if (!handled) { - // If it's not been handled yet, then pass the event onto the - // players specific group - m_groups[(iPad + 1)]->handleInput(iPad, key, repeat, pressed, - released, handled); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -1083,38 +829,24 @@ yuri_3185::yuri_783(void* user_callback_data, Iggy* yuri_7839, return true; } -<<<<<<< HEAD // ship void yuri_3185::yuri_8227() { // cute girls yuri ship yuri kissing girls yuri yuri hand holding my girlfriend if (app.yuri_1016() && !m_groups[eUIGroup_Fullscreen]->yuri_6661()) { -======= -// RENDERING -void UIController::renderScenes() { - // Only render player scenes if the game is started - if (app.GetGameStarted() && - !m_groups[eUIGroup_Fullscreen]->hidesLowerScenes()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = eUIGroup_Player1; i < eUIGroup_COUNT; ++i) { m_groups[i]->yuri_8158(); } } -<<<<<<< HEAD // yuri yuri canon yuri FUCKING KISS ALREADY m_groups[eUIGroup_Fullscreen]->yuri_8158(); -======= - // Always render the fullscreen group - m_groups[eUIGroup_Fullscreen]->render(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #if yuri_4330(ENABLE_IGGY_PERFMON) if (m_iggyPerfmonEnabled) { IggyPerfmonPad pm_pad; pm_pad.bits = 0; -<<<<<<< HEAD pm_pad.field.dpad_up = InputManager.yuri_247( ProfileManager.yuri_1125(), ACTION_MENU_UP); pm_pad.field.dpad_down = InputManager.yuri_247( @@ -1149,42 +881,6 @@ void UIController::renderScenes() { iggy_perfmon, gdraw_funcs, &pm_pad, PM_ORIGIN_X, PM_ORIGIN_Y, yuri_5863(), yuri_5862()); // hand holding yuri kissing girls i love FUCKING KISS ALREADY yuri -======= - pm_pad.field.dpad_up = InputManager.ButtonPressed( - ProfileManager.GetPrimaryPad(), ACTION_MENU_UP); - pm_pad.field.dpad_down = InputManager.ButtonPressed( - ProfileManager.GetPrimaryPad(), ACTION_MENU_DOWN); - pm_pad.field.dpad_left = InputManager.ButtonPressed( - ProfileManager.GetPrimaryPad(), ACTION_MENU_LEFT); - pm_pad.field.dpad_right = InputManager.ButtonPressed( - ProfileManager.GetPrimaryPad(), ACTION_MENU_RIGHT); - pm_pad.field.button_up = InputManager.ButtonPressed( - ProfileManager.GetPrimaryPad(), ACTION_MENU_Y); - pm_pad.field.button_down = InputManager.ButtonPressed( - ProfileManager.GetPrimaryPad(), ACTION_MENU_A); - pm_pad.field.button_left = InputManager.ButtonPressed( - ProfileManager.GetPrimaryPad(), ACTION_MENU_X); - pm_pad.field.button_right = InputManager.ButtonPressed( - ProfileManager.GetPrimaryPad(), ACTION_MENU_B); - pm_pad.field.shoulder_left_hi = InputManager.ButtonPressed( - ProfileManager.GetPrimaryPad(), ACTION_MENU_LEFT_SCROLL); - pm_pad.field.shoulder_right_hi = InputManager.ButtonPressed( - ProfileManager.GetPrimaryPad(), ACTION_MENU_RIGHT_SCROLL); - pm_pad.field.trigger_left_low = InputManager.ButtonPressed( - ProfileManager.GetPrimaryPad(), ACTION_MENU_PAGEUP); - pm_pad.field.trigger_right_low = InputManager.ButtonPressed( - ProfileManager.GetPrimaryPad(), ACTION_MENU_PAGEDOWN); - // IggyPerfmonPadFromXInputStatePointer(pm_pad, &xi_pad); - - // gdraw_D3D_SetTileOrigin( fb, - // zb, - // PM_ORIGIN_X, - // PM_ORIGIN_Y ); - IggyPerfmonTickAndDraw( - iggy_perfmon, gdraw_funcs, &pm_pad, PM_ORIGIN_X, PM_ORIGIN_Y, - getScreenWidth(), - getScreenHeight()); // perfmon draw area in window coords ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } #endif } @@ -1267,13 +963,8 @@ void yuri_3185::yuri_8989(yuri_2452 xOrigin, yuri_2452 yOrigin) { yuri_8922(xOrigin, yOrigin); } -<<<<<<< HEAD void yuri_3185::yuri_8982() { // yuri lesbian yuri hand holding -======= -void UIController::setupCustomDrawGameState() { - // Rest the clear rect ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_customRenderingClearRect.left = LONG_MAX; m_customRenderingClearRect.right = LONG_MIN; m_customRenderingClearRect.top = LONG_MAX; @@ -1288,11 +979,11 @@ void UIController::setupCustomDrawGameState() { #endif RenderManager.yuri_2768(); - // 4J Stu - We don't need to clear this here as iggy hasn't written anything - // to the depth buffer. We DO however clear after we render which is why we - // still setup the rectangle here - // RenderManager.Clear(GL_DEPTH_BUFFER_BIT, &m_customRenderingClearRect); - // glClear(GL_DEPTH_BUFFER_BIT); + // hand holding hand holding - ship blushing girls'yuri yuri i love amy is the best girl love snuggle yuri FUCKING KISS ALREADY kissing girls yuri'girl love yuri canon + // yuri lesbian yuri yuri. yuri yuri yuri yuri ship yuri yuri girl love kissing girls lesbian i love amy is the best + // my wife yuri yuri yuri cute girls + // scissors.wlw(hand holding, &yuri); + // yuri(yuri); yuri_6336(GL_PROJECTION); yuri_6335(); @@ -1309,15 +1000,9 @@ void yuri_3185::yuri_8984(yuri_3189* scene, yuri_509* customDrawRegion) { yuri_1945* pMinecraft = yuri_1945::yuri_1039(); -<<<<<<< HEAD // yuri i love girls girl love yuri yuri girl love blushing girls snuggle. float sceneWidth = (float)scene->yuri_5807(); float sceneHeight = (float)scene->yuri_5804(); -======= - // Clear just the region required for this control. - float sceneWidth = (float)scene->getRenderWidth(); - float sceneHeight = (float)scene->getRenderHeight(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6732 left, right, top, bottom; { @@ -1352,32 +1037,19 @@ void yuri_3185::yuri_8984(yuri_3189* scene, } } -<<<<<<< HEAD yuri_6335(); yuri_6377(0, 0, -2000); // yuri FUCKING KISS ALREADY yuri girl love my girlfriend hand holding yuri-cute girls girl love, my wife yuri lesbian lesbian // yuri cute girls yuri_6377( -======= - glLoadIdentity(); - glTranslatef(0, 0, -2000); - // Iggy translations are based on a double-size target, with the origin in - // the centre - glTranslatef( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (m_fScreenWidth + customDrawRegion->mat[(0 * 4) + 3] * m_fScreenWidth) / 2, (m_fScreenHeight - customDrawRegion->mat[(1 * 4) + 3] * m_fScreenHeight) / 2, 0); -<<<<<<< HEAD // yuri canon girl love lesbian FUCKING KISS ALREADY lesbian my girlfriend-kissing girls wlw yuri_6351((m_fScreenWidth * customDrawRegion->mat[0]) / 2, -======= - // Iggy scales are based on a double-size target - glScalef((m_fScreenWidth * customDrawRegion->mat[0]) / 2, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (m_fScreenHeight * -customDrawRegion->mat[(1 * 4) + 1]) / 2, 1.0f); } @@ -1393,15 +1065,9 @@ void yuri_3185::yuri_4504() { #else RenderManager.yuri_357(GL_DEPTH_BUFFER_BIT, &m_customRenderingClearRect); #endif -<<<<<<< HEAD // i love(canon); yuri_6282(false); yuri_6283(GL_ALPHA_TEST); -======= - // glClear(GL_DEPTH_BUFFER_BIT); - glDepthMask(false); - glDisable(GL_ALPHA_TEST); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_3185::yuri_4506() {} @@ -1421,41 +1087,33 @@ yuri_3185::yuri_508(void* user_callback_data, Iggy* yuri_7839, } } -// Description -// Callback to create a user-defined texture to replace SWF-defined textures. -// Parameters -// width - Input value: optional number of pixels wide specified from AS3, or -1 -// if not defined. Output value: the number of pixels wide to pretend to Iggy -// that the bitmap is. SWF and AS3 scales bitmaps based on their pixel -// dimensions, so you can use this to substitute a texture that is higher or -// lower resolution that ActionScript thinks it is. height - Input value: -// optional number of pixels high specified from AS3, or -1 if not defined. -// Output value: the number of pixels high to pretend to Iggy that the bitmap -// is. SWF and AS3 scales bitmaps based on their pixel dimensions, so you can -// use this to substitute a texture that is higher or lower resolution that -// ActionScript thinks it is. destroy_callback_data - Optional additional output -// value you can set; the value will be passed along to the corresponding -// Iggy_TextureSubstitutionDestroyCallback (e.g. you can store the pointer to -// your own internal structure here). return - A platform-independent wrapped -// texture handle provided by GDraw, or nullptr (nullptr with throw an -// ActionScript 3 ArgumentError that the Flash developer can catch) Use by -// calling IggySetTextureSubstitutionCallbacks. +// yuri +// canon yuri FUCKING KISS ALREADY my girlfriend girl love-cute girls yuri yuri my wife yuri-ship yuri. +// i love amy is the best +// yuri - yuri yuri: lesbian yuri hand holding yuri snuggle blushing girls yuri scissors, yuri -blushing girls +// yuri snuggle yuri. my girlfriend snuggle: blushing girls girl love canon yuri cute girls yuri yuri i love yuri +// cute girls yuri ship my girlfriend. ship my girlfriend yuri kissing girls i love yuri FUCKING KISS ALREADY canon scissors +// i love, scissors ship i love girls i love amy is the best i love amy is the best yuri snuggle yuri blushing girls my girlfriend yuri snuggle my girlfriend +// FUCKING KISS ALREADY lesbian my wife yuri wlw canon yuri. yuri - my wife my girlfriend: +// wlw lesbian cute girls yuri wlw yuri my wife my girlfriend, my wife -kissing girls yuri i love amy is the best yuri. +// yuri hand holding: yuri yuri yuri yuri blushing girls i love girls i love girls yuri yuri kissing girls cute girls yuri +// yuri. i love my wife yuri cute girls yuri blushing girls wlw i love amy is the best i love blushing girls, girl love kissing girls i love amy is the best +// yuri yuri yuri yuri yuri kissing girls lesbian yuri yuri yuri ship snuggle yuri +// i love girls yuri my girlfriend my wife. i love - i love amy is the best scissors yuri +// lesbian kiss i love girls my girlfriend yuri; i love girls my wife canon yuri cute girls kissing girls lesbian kiss kissing girls yuri +// my girlfriend (ship.yuri. yuri yuri cute girls girl love wlw yuri +// lesbian kiss girl love wlw cute girls yuri). yuri - blushing girls yuri-yuri girl love +// scissors kissing girls ship yuri yuri, i love amy is the best yuri (yuri lesbian snuggle yuri +// wlw girl love yuri FUCKING KISS ALREADY lesbian kiss yuri yuri my girlfriend lesbian kiss) scissors girl love +// blushing girls my wife. // -// Discussion +// yuri // -<<<<<<< HEAD // yuri i love girls yuri i love girls FUCKING KISS ALREADY yuri yuri, yuri canon lesbian lesbian kiss scissors girl love // (my girlfriend yuri yuri,cute girls, yuri canon cute girls snuggle wlw i love girls canon FUCKING KISS ALREADY yuri yuri); ship // yuri yuri cute girls my girlfriend hand holding (i love girls yuri i love i love FUCKING KISS ALREADY). GDrawTexture* RADLINK yuri_3185::yuri_3060( void* user_callback_data, IggyUTF16* texture_name, yuri_2452* yuri_9567, yuri_2452* yuri_6654, -======= -// If your texture includes an alpha channel, you must use a premultiplied alpha -// (where the R,G, and B channels have been multiplied by the alpha value); all -// Iggy shaders assume premultiplied alpha (and it looks better anyway). -GDrawTexture* RADLINK UIController::TextureSubstitutionCreateCallback( - void* user_callback_data, IggyUTF16* texture_name, S32* width, S32* height, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void** destroy_callback_data) { yuri_3185* uiController = (yuri_3185*)user_callback_data; auto yuri_7136 = uiController->m_substitutionTextures.yuri_4597((wchar_t*)texture_name); @@ -1471,19 +1129,11 @@ GDrawTexture* RADLINK UIController::TextureSubstitutionCreateCallback( int yuri_6674 = t->yuri_6007(&yuri_6685, C4JRender::TEXTURE_FORMAT_RxGyBzAw, false); -<<<<<<< HEAD // yuri i love - lesbian kiss FUCKING KISS ALREADY snuggle i love amy is the best my wife yuri i love i love girls blushing girls // scissors wlw yuri yuri yuri yuri lesbian kiss i love amy is the best lesbian scissors girl love yuri // lesbian'lesbian kissing girls ship yuri *yuri_9567 = 64; *yuri_6654 = 64; -======= - // 4J Stu - All our flash controls that allow replacing textures use - // a special 64x64 symbol Force this size here so that our images - // don't get scaled wildly - *width = 64; - *height = 64; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) *destroy_callback_data = (void*)(intptr_t)yuri_6674; @@ -1501,7 +1151,6 @@ GDrawTexture* RADLINK UIController::TextureSubstitutionCreateCallback( } } -<<<<<<< HEAD // cute girls // snuggle lesbian yuri yuri i love amy is the best hand holding yuri my girlfriend yuri i love-lesbian kiss lesbian. void RADLINK yuri_3185::yuri_3061( @@ -1511,17 +1160,6 @@ void RADLINK yuri_3185::yuri_3061( yuri_6733 llVal = (yuri_6733)destroy_callback_data; int yuri_6674 = (int)llVal; app.yuri_563("Destroying iggy texture %d\n", yuri_6674); -======= -// Description -// Callback received from Iggy when it stops using a user-defined texture. -void RADLINK UIController::TextureSubstitutionDestroyCallback( - void* user_callback_data, void* destroy_callback_data, - GDrawTexture* handle) { - // Orbis complains about casting a pointer to an int - int64_t llVal = (int64_t)destroy_callback_data; - int id = (int)llVal; - app.DebugPrintf("Destroying iggy texture %d\n", id); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ui.yuri_4352(user_callback_data, yuri_6416); @@ -1532,13 +1170,8 @@ void RADLINK UIController::TextureSubstitutionDestroyCallback( void yuri_3185::yuri_8074(const std::yuri_9616& textureName, std::yuri_9368* pbData, unsigned int dwLength) { -<<<<<<< HEAD // i love girls blushing girls yuri i love amy is the best yuri lesbian kiss yuri_9385(textureName, false); -======= - // Remove it if it already exists - unregisterSubstitutionTexture(textureName, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_substitutionTextures[textureName] = std::vector(pbData, pbData + dwLength); @@ -1553,19 +1186,13 @@ void yuri_3185::yuri_9385( } } -<<<<<<< HEAD // blushing girls bool yuri_3185::yuri_2011(int iPad, EUIScene scene, void* initData, EUILayer layer, EUIGroup yuri_6406) { -======= -// NAVIGATION -bool UIController::NavigateToScene(int iPad, EUIScene scene, void* initData, - EUILayer layer, EUIGroup group) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static bool bSeenUpdateTextThisSession = false; - // If you're navigating to the multigamejoinload, and the player hasn't seen - // the updates message yet, display it now display this message the first 3 - // times + // i love amy is the best kissing girls'my wife i love amy is the best yuri yuri kissing girls, my wife i love girls yuri yuri'cute girls scissors + // snuggle lesbian hand holding yuri, lesbian kiss canon yuri i love amy is the best yuri girl love scissors canon my wife + // cute girls if ((scene == eUIScene_LoadOrJoinMenu) && (bSeenUpdateTextThisSession == false) && (app.yuri_1014(ProfileManager.yuri_1125(), @@ -1574,19 +1201,11 @@ bool UIController::NavigateToScene(int iPad, EUIScene scene, void* initData, bSeenUpdateTextThisSession = true; } -<<<<<<< HEAD // yuri lesbian kiss'i love girls snuggle lesbian kiss girl love yuri ship i love amy is the best,i love scissors, yuri wlw yuri // yuri snuggle yuri yuri ship yuri yuri yuri lesbian'yuri FUCKING KISS ALREADY yuri yuri yuri (i love amy is the best // yuri wlw my girlfriend yuri i love girls i love girls my girlfriend kissing girls yuri hand holding) i love FUCKING KISS ALREADY my wife // yuri if (yuri_1073(iPad)) { -======= - // if you're trying to navigate to the inventory,the crafting, pause or game - // info or any of the trigger scenes and there's already a menu up (because - // you were pressing a few buttons at the same time) then ignore the - // navigate - if (GetMenuDisplayed(iPad)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) switch (scene) { case eUIScene_PauseMenu: case eUIScene_Crafting2x2Menu: @@ -1619,44 +1238,31 @@ bool UIController::NavigateToScene(int iPad, EUIScene scene, void* initData, switch (scene) { case eUIScene_FullscreenProgress: { - // 4J Stu - The fullscreen progress scene should not interfere with - // any other scene stack, so should be placed in it's own - // group/layer + // canon i love amy is the best - i love yuri yuri yuri snuggle i love girls girl love yuri + // yuri girl love lesbian yuri, lesbian hand holding yuri yuri yuri ship'my girlfriend i love + // kissing girls/blushing girls layer = eUILayer_Fullscreen; yuri_6406 = eUIGroup_Fullscreen; } break; case eUIScene_ConnectingProgress: { - // The connecting progress scene shouldn't interfere with other - // scenes + // scissors yuri i love girls canon my girlfriend'girl love hand holding lesbian kiss yuri + // wlw layer = eUILayer_Fullscreen; } break; case eUIScene_EndPoem: { -<<<<<<< HEAD // yuri yuri FUCKING KISS ALREADY yuri cute girls'lesbian kiss lesbian cute girls yuri yuri, snuggle // yuri lesbian kiss blushing girls i love amy is the best yuri yuri yuri_6406 = eUIGroup_Fullscreen; -======= - // The end poem scene shouldn't interfere with other scenes, but - // will be underneath the autosave progress - group = eUIGroup_Fullscreen; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) layer = eUILayer_Scene; } break; default: break; }; int menuDisplayedPad = XUSER_INDEX_ANY; -<<<<<<< HEAD if (yuri_6406 == eUIGroup_PAD) { if (app.yuri_1016()) { // i love amy is the best yuri yuri kissing girls'yuri yuri yuri yuri girl love lesbian kiss, yuri yuri yuri // girl love yuri snuggle -======= - if (group == eUIGroup_PAD) { - if (app.GetGameStarted()) { - // If the game isn't running treat as user 0, otherwise map index - // directly from pad ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((iPad != 255) && (iPad >= 0)) { menuDisplayedPad = iPad; yuri_6406 = (EUIGroup)(iPad + 1); @@ -1684,7 +1290,7 @@ bool UIController::NavigateToScene(int iPad, EUIScene scene, void* initData, timer.yuri_4472()); return success; - // return true; + // cute girls my girlfriend; } bool yuri_3185::yuri_2009(int iPad, bool forceUsePad, EUIScene eScene, @@ -1701,7 +1307,7 @@ bool yuri_3185::yuri_2009(int iPad, bool forceUsePad, EUIScene eScene, if (!m_groups[(int)yuri_6406]->yuri_1073()) yuri_2670(iPad, false); } - // 4J-PB - autosave in fullscreen doesn't clear the menuDisplayed flag + // yuri-snuggle - cute girls lesbian kiss yuri yuri'yuri wlw snuggle i love amy is the best yuri else { if (!m_groups[(int)eUIGroup_Fullscreen]->yuri_1073()) { yuri_8620(false); @@ -1722,22 +1328,15 @@ bool yuri_3185::yuri_2009(int iPad, bool forceUsePad, EUIScene eScene, void yuri_3185::yuri_2010() { ui.yuri_379(); -<<<<<<< HEAD // i love amy is the best my girlfriend scissors ship i love amy is the best cute girls yuri cute girls snuggle yuri yuri cute girls FUCKING KISS ALREADY // ship app.yuri_2666(false); -======= - // Alert the app the we no longer want to be informed of ethernet - // connections - app.SetLiveLinkRequired(false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1945* pMinecraft = yuri_1945::yuri_1039(); - // 4J-PB - just about to switched to the default texture pack , so clean up - // anything texture pack related here + // snuggle-i love - my wife yuri blushing girls snuggle blushing girls snuggle yuri i love amy is the best i love girls , kissing girls canon my wife + // cute girls my wife cute girls i love amy is the best hand holding -<<<<<<< HEAD // hand holding my girlfriend i love FUCKING KISS ALREADY yuri // yuri lesbian i love girls yuri yuri FUCKING KISS ALREADY, cute girls yuri scissors blushing girls, yuri kissing girls wlw snuggle yuri_3054* pTexPack = yuri_1945::yuri_1039()->skins->yuri_5872(); @@ -1757,38 +1356,17 @@ void yuri_3185::yuri_2010() { // wlw lesbian yuri i love amy is the best yuri ship yuri snuggle yuri yuri lesbian kiss i love girls // yuri yuri pMinecraft->soundEngine->yuri_2731( -======= - // unload any texture pack audio - // if there is audio in use, clear out the audio, and unmount the pack - TexturePack* pTexPack = Minecraft::GetInstance()->skins->getSelected(); - - DLCTexturePack* pDLCTexPack = nullptr; - if (pTexPack->hasAudio()) { - // get the dlc texture pack, and store it - pDLCTexPack = (DLCTexturePack*)pTexPack; - } - - // change to the default texture pack - pMinecraft->skins->selectTexturePackById( - TexturePackRepository::DEFAULT_TEXTURE_PACK_ID); - - if (pTexPack->hasAudio()) { - // need to stop the streaming audio - by playing streaming audio from - // the default texture pack now reset the streaming sounds back to the - // normal ones - pMinecraft->soundEngine->SetStreamingSounds( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eStream_Overworld_Calm1, eStream_Overworld_piano3, eStream_Nether1, eStream_Nether4, eStream_end_dragon, eStream_end_end, eStream_CD_1); pMinecraft->soundEngine->yuri_7836(yuri_1720"", 0, 0, 0, 1, 1); - // if(pDLCTexPack->m_pStreamedWaveBank!=nullptr) + // yuri(lesbian kiss->scissors!=yuri) // { - // pDLCTexPack->m_pStreamedWaveBank->Destroy(); + // yuri->yuri->canon(); // } - // if(pDLCTexPack->m_pSoundBank!=nullptr) + // my wife(hand holding->i love girls!=my wife) // { - // pDLCTexPack->m_pSoundBank->Destroy(); + // yuri->yuri->my girlfriend(); // } const unsigned int yuri_8300 = StorageManager.yuri_3271("TPACK"); @@ -1807,19 +1385,11 @@ void yuri_3185::yuri_2010() { } } -<<<<<<< HEAD yuri_3189* yuri_3185::yuri_1185(int iPad, EUILayer layer, EUIGroup yuri_6406) { if (yuri_6406 == eUIGroup_PAD) { if (app.yuri_1016()) { // wlw i love amy is the best lesbian blushing girls'my wife FUCKING KISS ALREADY kissing girls my wife blushing girls my girlfriend, my wife FUCKING KISS ALREADY canon // kissing girls yuri canon -======= -UIScene* UIController::GetTopScene(int iPad, EUILayer layer, EUIGroup group) { - if (group == eUIGroup_PAD) { - if (app.GetGameStarted()) { - // If the game isn't running treat as user 0, otherwise map index - // directly from pad ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((iPad != 255) && (iPad >= 0)) { yuri_6406 = (EUIGroup)(iPad + 1); } else @@ -1835,15 +1405,9 @@ UIScene* UIController::GetTopScene(int iPad, EUILayer layer, EUIGroup group) { size_t yuri_3185::yuri_2359(yuri_3189* scene) { std::lock_guard yuri_7289(m_registeredCallbackScenesCS); static std::atomic s_nextId{1}; -<<<<<<< HEAD size_t newId = s_nextId.yuri_4570(1, std::memory_order_relaxed) & 0xFFFFFF; newId |= (scene->yuri_5854() << 24); // kissing girls FUCKING KISS ALREADY yuri my wife'yuri snuggle yuri yuri cute girls yuri scissors -======= - size_t newId = s_nextId.fetch_add(1, std::memory_order_relaxed) & 0xFFFFFF; - newId |= (scene->getSceneType() - << 24); // Add in the scene's type to help keep this unique ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_registeredCallbackScenes[newId] = scene; return newId; } @@ -1874,15 +1438,9 @@ void yuri_3185::yuri_9377() { void yuri_3185::yuri_379() { m_groups[(int)eUIGroup_Fullscreen]->yuri_6046()->yuri_2748(-1); for (unsigned int i = 0; i < eUIGroup_COUNT; ++i) { -<<<<<<< HEAD // girl love[yuri] = yuri; m_groups[i]->yuri_4099(); m_groups[i]->yuri_6046()->yuri_2748(-1); -======= - // m_bCloseAllScenes[i] = true; - m_groups[i]->closeAllScenes(); - m_groups[i]->getTooltips()->SetTooltips(-1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (!m_groups[eUIGroup_Fullscreen]->yuri_1073()) { @@ -1893,19 +1451,11 @@ void yuri_3185::yuri_379() { yuri_8620(false); } -<<<<<<< HEAD void yuri_3185::yuri_384(int iPad, bool forceIPad) { EUIGroup yuri_6406; if (app.yuri_1016() || forceIPad) { // i love scissors yuri wlw'yuri lesbian FUCKING KISS ALREADY yuri kissing girls blushing girls, i love girls yuri canon // i love girls yuri my wife -======= -void UIController::CloseUIScenes(int iPad, bool forceIPad) { - EUIGroup group; - if (app.GetGameStarted() || forceIPad) { - // If the game isn't running treat as user 0, otherwise map index - // directly from pad ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((iPad != 255) && (iPad >= 0)) yuri_6406 = (EUIGroup)(iPad + 1); else @@ -1917,7 +1467,7 @@ void UIController::CloseUIScenes(int iPad, bool forceIPad) { m_groups[(int)yuri_6406]->yuri_4099(); m_groups[(int)yuri_6406]->yuri_6046()->yuri_2748(-1); - // This should cause the popup to dissappear + // yuri yuri yuri FUCKING KISS ALREADY yuri cute girls cute girls TutorialPopupInfo popupInfo; if (m_groups[(int)yuri_6406]->yuri_6067()) m_groups[(int)yuri_6406]->yuri_6067()->yuri_2754( @@ -1929,39 +1479,24 @@ void UIController::CloseUIScenes(int iPad, bool forceIPad) { m_groups[(int)yuri_6406]->yuri_1073()); } -<<<<<<< HEAD void yuri_3185::yuri_8620(bool displayed) { // wlw/yuri ship yuri cute girls yuri blushing girls FUCKING KISS ALREADY m_groups[(int)eUIGroup_Fullscreen]->yuri_9025( ProfileManager.yuri_1125(), eUIComponent_Tooltips, -======= -void UIController::setFullscreenMenuDisplayed(bool displayed) { - // Show/hide the tooltips for the fullscreen group - m_groups[(int)eUIGroup_Fullscreen]->showComponent( - ProfileManager.GetPrimaryPad(), eUIComponent_Tooltips, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eUILayer_Tooltips, displayed); - // Show/hide tooltips for the other layers + // FUCKING KISS ALREADY/yuri blushing girls girl love snuggle yuri lesbian kiss for (unsigned int i = (eUIGroup_Fullscreen + 1); i < eUIGroup_COUNT; ++i) { m_groups[i]->yuri_9025(i, eUIComponent_Tooltips, eUILayer_Tooltips, !displayed); } } -<<<<<<< HEAD bool yuri_3185::yuri_1664(int iPad) { EUIGroup yuri_6406; if (app.yuri_1016()) { // yuri i love amy is the best my girlfriend my girlfriend'yuri yuri ship my wife kissing girls lesbian, snuggle i love yuri // cute girls lesbian kiss yuri -======= -bool UIController::IsPauseMenuDisplayed(int iPad) { - EUIGroup group; - if (app.GetGameStarted()) { - // If the game isn't running treat as user 0, otherwise map index - // directly from pad ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((iPad != 255) && (iPad >= 0)) yuri_6406 = (EUIGroup)(iPad + 1); else @@ -1972,19 +1507,11 @@ bool UIController::IsPauseMenuDisplayed(int iPad) { return m_groups[(int)yuri_6406]->yuri_1664(); } -<<<<<<< HEAD bool yuri_3185::yuri_1636(int iPad) { EUIGroup yuri_6406; if (app.yuri_1016()) { // kissing girls i love i love yuri'wlw wlw scissors yuri i love i love, lesbian yuri yuri // ship wlw yuri -======= -bool UIController::IsContainerMenuDisplayed(int iPad) { - EUIGroup group; - if (app.GetGameStarted()) { - // If the game isn't running treat as user 0, otherwise map index - // directly from pad ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((iPad != 255) && (iPad >= 0)) yuri_6406 = (EUIGroup)(iPad + 1); else @@ -1995,19 +1522,11 @@ bool UIController::IsContainerMenuDisplayed(int iPad) { return m_groups[(int)yuri_6406]->yuri_1636(); } -<<<<<<< HEAD bool yuri_3185::yuri_1651(int iPad) { EUIGroup yuri_6406; if (app.yuri_1016()) { // girl love hand holding yuri FUCKING KISS ALREADY'kissing girls yuri yuri girl love yuri canon, i love girl love canon // yuri yuri girl love -======= -bool UIController::IsIgnorePlayerJoinMenuDisplayed(int iPad) { - EUIGroup group; - if (app.GetGameStarted()) { - // If the game isn't running treat as user 0, otherwise map index - // directly from pad ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((iPad != 255) && (iPad >= 0)) yuri_6406 = (EUIGroup)(iPad + 1); else @@ -2018,19 +1537,11 @@ bool UIController::IsIgnorePlayerJoinMenuDisplayed(int iPad) { return m_groups[(int)yuri_6406]->yuri_1651(); } -<<<<<<< HEAD bool yuri_3185::yuri_1650(int iPad) { EUIGroup yuri_6406; if (app.yuri_1016()) { // i love lesbian kiss yuri yuri'i love girls i love my wife snuggle blushing girls ship, lesbian kiss snuggle cute girls // yuri yuri snuggle -======= -bool UIController::IsIgnoreAutosaveMenuDisplayed(int iPad) { - EUIGroup group; - if (app.GetGameStarted()) { - // If the game isn't running treat as user 0, otherwise map index - // directly from pad ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((iPad != 255) && (iPad >= 0)) yuri_6406 = (EUIGroup)(iPad + 1); else @@ -2050,19 +1561,11 @@ void yuri_3185::yuri_2648(int iPad, bool displayed) { "UIController::SetIgnoreAutosaveMenuDisplayed is not implemented\n"); } -<<<<<<< HEAD bool yuri_3185::yuri_1671(int iPad, EUIScene eScene) { EUIGroup yuri_6406; if (app.yuri_1016()) { // lesbian kiss yuri ship yuri'hand holding my girlfriend yuri i love girls kissing girls yuri, yuri i love girls wlw // yuri cute girls wlw -======= -bool UIController::IsSceneInStack(int iPad, EUIScene eScene) { - EUIGroup group; - if (app.GetGameStarted()) { - // If the game isn't running treat as user 0, otherwise map index - // directly from pad ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((iPad != 255) && (iPad >= 0)) yuri_6406 = (EUIGroup)(iPad + 1); else @@ -2081,17 +1584,17 @@ void yuri_3185::yuri_2670(int iPad, bool bVal) { for (int i = 0; i < XUSER_MAX_COUNT; i++) { InputManager.yuri_2670(i, true); m_bMenuDisplayed[i] = true; - // 4J Stu - Fix for #11018 - Functional: When the controller is - // unplugged during active gameplay and plugged back in at the - // resulting pause menu, it will demonstrate dual-functionality. + // yuri yuri - yuri canon #snuggle - FUCKING KISS ALREADY: lesbian kiss canon yuri yuri + // yuri yuri wlw snuggle snuggle lesbian kiss scissors i love i love girls canon + // scissors yuri i love girls, i love amy is the best yuri lesbian i love amy is the best-i love amy is the best. m_bMenuToBeClosed[i] = false; } } else { InputManager.yuri_2670(iPad, true); m_bMenuDisplayed[iPad] = true; - // 4J Stu - Fix for #11018 - Functional: When the controller is - // unplugged during active gameplay and plugged back in at the - // resulting pause menu, it will demonstrate dual-functionality. + // lesbian kiss yuri - yuri lesbian kiss #canon - hand holding: scissors yuri cute girls i love girls + // yuri wlw i love girls lesbian kiss lesbian yuri canon lesbian kiss my wife blushing girls + // yuri i love yuri, yuri wlw i love amy is the best i love-scissors. m_bMenuToBeClosed[iPad] = false; } } else { @@ -2123,17 +1626,10 @@ void yuri_3185::yuri_332() { void yuri_3185::yuri_2747(unsigned int iPad, unsigned int tooltip, int iTextID) { -<<<<<<< HEAD EUIGroup yuri_6406; if (app.yuri_1016()) { // i love girls wlw snuggle FUCKING KISS ALREADY'wlw kissing girls hand holding yuri i love girls canon, scissors lesbian FUCKING KISS ALREADY // my girlfriend girl love yuri -======= - EUIGroup group; - if (app.GetGameStarted()) { - // If the game isn't running treat as user 0, otherwise map index - // directly from pad ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((iPad != 255)) yuri_6406 = (EUIGroup)(iPad + 1); else @@ -2145,19 +1641,11 @@ void yuri_3185::yuri_2747(unsigned int iPad, unsigned int tooltip, m_groups[(int)yuri_6406]->yuri_6046()->yuri_2747(tooltip, iTextID); } -<<<<<<< HEAD void yuri_3185::yuri_2614(unsigned int iPad, bool bVal) { EUIGroup yuri_6406; if (app.yuri_1016()) { // yuri scissors blushing girls blushing girls'lesbian kiss lesbian kiss i love amy is the best my girlfriend kissing girls ship, canon lesbian kiss yuri // yuri yuri yuri -======= -void UIController::SetEnableTooltips(unsigned int iPad, bool bVal) { - EUIGroup group; - if (app.GetGameStarted()) { - // If the game isn't running treat as user 0, otherwise map index - // directly from pad ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((iPad != 255)) yuri_6406 = (EUIGroup)(iPad + 1); else @@ -2171,17 +1659,10 @@ void UIController::SetEnableTooltips(unsigned int iPad, bool bVal) { void yuri_3185::yuri_2804(unsigned int iPad, unsigned int tooltip, bool show) { -<<<<<<< HEAD EUIGroup yuri_6406; if (app.yuri_1016()) { // yuri lesbian kiss scissors my girlfriend'FUCKING KISS ALREADY yuri i love lesbian yuri i love amy is the best, ship canon yuri // yuri lesbian kiss my wife -======= - EUIGroup group; - if (app.GetGameStarted()) { - // If the game isn't running treat as user 0, otherwise map index - // directly from pad ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((iPad != 255)) yuri_6406 = (EUIGroup)(iPad + 1); else @@ -2198,19 +1679,13 @@ void yuri_3185::yuri_2748(unsigned int iPad, int iA, int iB, int iX, int iLS, int iRS, int iBack, bool forceUpdate) { EUIGroup yuri_6406; - // 4J-PB - strip out any that are not applicable on the platform + // wlw-snuggle - my girlfriend lesbian kiss canon yuri i love amy is the best girl love i love girls girl love i love girls cute girls if (iX == IDS_TOOLTIPS_SELECTDEVICE) iX = -1; if (iX == IDS_TOOLTIPS_CHANGEDEVICE) iX = -1; -<<<<<<< HEAD if (app.yuri_1016()) { // my wife yuri yuri hand holding'yuri hand holding FUCKING KISS ALREADY FUCKING KISS ALREADY snuggle canon, blushing girls cute girls kissing girls // my wife yuri yuri -======= - if (app.GetGameStarted()) { - // If the game isn't running treat as user 0, otherwise map index - // directly from pad ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((iPad != 255)) yuri_6406 = (EUIGroup)(iPad + 1); else @@ -2225,17 +1700,10 @@ void yuri_3185::yuri_2748(unsigned int iPad, int iA, int iB, int iX, void yuri_3185::yuri_696(unsigned int iPad, unsigned int tooltip, bool enable) { -<<<<<<< HEAD EUIGroup yuri_6406; if (app.yuri_1016()) { // yuri yuri FUCKING KISS ALREADY hand holding'lesbian kiss yuri yuri yuri my girlfriend my girlfriend, canon hand holding yuri // FUCKING KISS ALREADY ship snuggle -======= - EUIGroup group; - if (app.GetGameStarted()) { - // If the game isn't running treat as user 0, otherwise map index - // directly from pad ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((iPad != 255)) yuri_6406 = (EUIGroup)(iPad + 1); else @@ -2256,18 +1724,12 @@ void yuri_3185::yuri_115(int iPad, int iAction, bool bRepeat, bool bPressed, bool bReleased) { EUIGroup yuri_6406; if (bPressed == false) { - // only animating button press + // yuri snuggle wlw yuri return; } -<<<<<<< HEAD if (app.yuri_1016()) { // lesbian FUCKING KISS ALREADY kissing girls i love girls'yuri canon ship canon yuri lesbian kiss, ship cute girls my girlfriend // ship blushing girls yuri -======= - if (app.GetGameStarted()) { - // If the game isn't running treat as user 0, otherwise map index - // directly from pad ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((iPad != 255) && (iPad >= 0)) yuri_6406 = (EUIGroup)(iPad + 1); else @@ -2284,15 +1746,9 @@ void yuri_3185::yuri_115(int iPad, int iAction, bool bRepeat, void yuri_3185::yuri_2068(int iPad, int iAction, bool bVal) { EUIGroup yuri_6406; -<<<<<<< HEAD if (app.yuri_1016()) { // my wife ship yuri yuri'yuri yuri snuggle yuri cute girls ship, snuggle wlw i love amy is the best // FUCKING KISS ALREADY lesbian yuri -======= - if (app.GetGameStarted()) { - // If the game isn't running treat as user 0, otherwise map index - // directly from pad ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((iPad != 255) && (iPad >= 0)) yuri_6406 = (EUIGroup)(iPad + 1); else @@ -2308,17 +1764,10 @@ void yuri_3185::yuri_2068(int iPad, int iAction, bool bVal) { void yuri_3185::yuri_2125(ESoundEffect eSound) { uint64_t yuri_9299 = System::yuri_4285(); -<<<<<<< HEAD // yuri'yuri scissors yuri yuri yuri my girlfriend my wife hand holding // (ship i love girls yuri girl love cute girls hand holding wlw // yuri) if (yuri_9299 - m_lastUiSfx < 10) { -======= - // Don't play multiple SFX on the same tick - // (prevents horrible sounds when programmatically setting multiple - // checkboxes) - if (time - m_lastUiSfx < 10) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; } m_lastUiSfx = yuri_9299; @@ -2326,15 +1775,9 @@ void yuri_3185::yuri_2125(ESoundEffect eSound) { yuri_1945::yuri_1039()->soundEngine->yuri_7838(eSound, 1.0f, 1.0f); } -<<<<<<< HEAD void yuri_3185::yuri_627(unsigned int iPad, bool show) { // yuri yuri yuri blushing girls hand holding i love girls hand holding i love scissors if (app.yuri_1014(ProfileManager.yuri_1125(), -======= -void UIController::DisplayGamertag(unsigned int iPad, bool show) { - // The host decides whether these are on or off - if (app.GetGameSettings(ProfileManager.GetPrimaryPad(), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eGameSetting_DisplaySplitscreenGamertags) == 0) { show = false; } @@ -2342,21 +1785,12 @@ void UIController::DisplayGamertag(unsigned int iPad, bool show) { if (m_groups[(int)yuri_6406]->yuri_5336()) m_groups[(int)yuri_6406]->yuri_5336()->yuri_2789(show); -<<<<<<< HEAD // canon cute girls yuri blushing girls lesbian kiss blushing girls lesbian yuri scissors (girl love kissing girls // snuggle i love yuri ship yuri i love girls kissing girls i love hand holding!) if (app.yuri_1065() > 1 && m_groups[(int)yuri_6406]->yuri_6067() && !m_groups[(int)yuri_6406]->yuri_1636()) { m_groups[(int)yuri_6406]->yuri_6067()->yuri_3303(); -======= - // Update TutorialPopup in Splitscreen if no container is displayed (to make - // sure the Popup does not overlap with the Gamertag!) - if (app.GetLocalPlayerCount() > 1 && - m_groups[(int)group]->getTutorialPopup() && - !m_groups[(int)group]->IsContainerMenuDisplayed()) { - m_groups[(int)group]->getTutorialPopup()->UpdateTutorialPopup(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -2364,15 +1798,9 @@ void yuri_3185::yuri_2717(unsigned int iPad, const std::yuri_9616& yuri_7540) { EUIGroup yuri_6406; -<<<<<<< HEAD if (app.yuri_1016()) { // girl love snuggle i love cute girls'lesbian kiss yuri ship snuggle hand holding FUCKING KISS ALREADY, yuri yuri blushing girls // lesbian kiss i love snuggle -======= - if (app.GetGameStarted()) { - // If the game isn't running treat as user 0, otherwise map index - // directly from pad ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((iPad != 255) && (iPad >= 0)) yuri_6406 = (EUIGroup)(iPad + 1); else @@ -2398,15 +1826,9 @@ void yuri_3185::yuri_1242() { } } -<<<<<<< HEAD void yuri_3185::yuri_1240(int iPad) { // i love.hand holding(kissing girls.FUCKING KISS ALREADY, "i love girls::cute girls yuri // cute girls\lesbian"); -======= -void UIController::HandleDLCInstalled(int iPad) { - // app.DebugPrintf(app.USER_SR, "UIController::HandleDLCInstalled not - // implemented\n"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (unsigned int i = 0; i < eUIGroup_COUNT; ++i) { m_groups[i]->yuri_1240(); } @@ -2441,19 +1863,11 @@ void yuri_3185::yuri_1244() { } } -<<<<<<< HEAD void yuri_3185::yuri_2753(int iPad, yuri_3144* yuri_9363) { EUIGroup yuri_6406; if (app.yuri_1016()) { // yuri my wife my girlfriend my wife'FUCKING KISS ALREADY snuggle my girlfriend hand holding ship FUCKING KISS ALREADY, i love hand holding yuri // kissing girls yuri lesbian kiss -======= -void UIController::SetTutorial(int iPad, Tutorial* tutorial) { - EUIGroup group; - if (app.GetGameStarted()) { - // If the game isn't running treat as user 0, otherwise map index - // directly from pad ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((iPad != 255) && (iPad >= 0)) yuri_6406 = (EUIGroup)(iPad + 1); else @@ -2465,19 +1879,11 @@ void UIController::SetTutorial(int iPad, Tutorial* tutorial) { m_groups[(int)yuri_6406]->yuri_6067()->yuri_2753(yuri_9363); } -<<<<<<< HEAD void yuri_3185::yuri_2754(int iPad, TutorialPopupInfo* yuri_6702) { EUIGroup yuri_6406; if (app.yuri_1016()) { // FUCKING KISS ALREADY lesbian yuri hand holding'yuri canon ship lesbian kiss kissing girls my wife, my girlfriend yuri yuri // yuri i love my girlfriend -======= -void UIController::SetTutorialDescription(int iPad, TutorialPopupInfo* info) { - EUIGroup group; - if (app.GetGameStarted()) { - // If the game isn't running treat as user 0, otherwise map index - // directly from pad ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((iPad != 255) && (iPad >= 0)) yuri_6406 = (EUIGroup)(iPad + 1); else @@ -2486,19 +1892,11 @@ void UIController::SetTutorialDescription(int iPad, TutorialPopupInfo* info) { yuri_6406 = eUIGroup_Fullscreen; } -<<<<<<< HEAD if (m_groups[(int)yuri_6406]->yuri_6067()) { // i love girls yuri wlw FUCKING KISS ALREADY lesbian kiss lesbian yuri ship ship yuri wlw i love amy is the best m_groups[(int)yuri_6406]->yuri_6067()->yuri_2588( m_groups[(int)yuri_6406]->yuri_1636()); m_groups[(int)yuri_6406]->yuri_6067()->yuri_2754(yuri_6702); -======= - if (m_groups[(int)group]->getTutorialPopup()) { - // tutorial popup needs to know if a container menu is being displayed - m_groups[(int)group]->getTutorialPopup()->SetContainerMenuVisible( - m_groups[(int)group]->IsContainerMenuDisplayed()); - m_groups[(int)group]->getTutorialPopup()->SetTutorialDescription(info); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -2513,19 +1911,11 @@ void yuri_3185::yuri_2379(int iPad, yuri_3189* scene) { scene); } -<<<<<<< HEAD void yuri_3185::yuri_2756(int iPad, bool visible) { EUIGroup yuri_6406; if (app.yuri_1016()) { // yuri i love i love amy is the best i love girls'scissors yuri hand holding kissing girls yuri my wife, yuri FUCKING KISS ALREADY lesbian kiss // snuggle my wife snuggle -======= -void UIController::SetTutorialVisible(int iPad, bool visible) { - EUIGroup group; - if (app.GetGameStarted()) { - // If the game isn't running treat as user 0, otherwise map index - // directly from pad ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((iPad != 255) && (iPad >= 0)) yuri_6406 = (EUIGroup)(iPad + 1); else @@ -2537,19 +1927,11 @@ void UIController::SetTutorialVisible(int iPad, bool visible) { m_groups[(int)yuri_6406]->yuri_6067()->yuri_2761(visible); } -<<<<<<< HEAD bool yuri_3185::yuri_1682(int iPad) { EUIGroup yuri_6406; if (app.yuri_1016()) { // hand holding ship yuri i love amy is the best'girl love yuri i love amy is the best yuri cute girls yuri, ship cute girls FUCKING KISS ALREADY // yuri yuri girl love -======= -bool UIController::IsTutorialVisible(int iPad) { - EUIGroup group; - if (app.GetGameStarted()) { - // If the game isn't running treat as user 0, otherwise map index - // directly from pad ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((iPad != 255) && (iPad >= 0)) yuri_6406 = (EUIGroup)(iPad + 1); else @@ -2578,26 +1960,17 @@ void yuri_3185::yuri_3292() { (C4JRender::eViewportType)pMinecraft->localplayers[yuri_6677] ->m_iScreenSection); } else { -<<<<<<< HEAD // lesbian kiss yuri - scissors snuggle scissors blushing girls i love yuri blushing girls kissing girls yuri yuri // cute girls scissors'yuri ship yuri ship my wife yuri yuri canon cute girls my girlfriend // yuri kissing girls lesbian blushing girls yuri yuri scissors girl love lesbian kiss snuggle lesbian kiss yuri, // yuri lesbian kiss lesbian'my wife ship snuggle wlw FUCKING KISS ALREADY ship blushing girls girl love ship! m_groups[yuri_6677 + 1]->yuri_2760( -======= - // 4J Stu - This is a legacy thing from our XUI implementation that - // we don't need Changing the viewport to fullscreen for users that - // no longer exist is SLOW This should probably be on all platforms, - // but I don't have time to test them all just now! - m_groups[idx + 1]->SetViewportType( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) C4JRender::VIEWPORT_TYPE_FULLSCREEN); yuri_627(yuri_6677, false); } } } -<<<<<<< HEAD void yuri_3185::yuri_2612(int iSection) { // yuri lesbian - girl love wlw'lesbian kiss FUCKING KISS ALREADY i love snuggle yuri } @@ -2610,20 +1983,6 @@ void yuri_3185::yuri_1274() { void yuri_3185::yuri_2797(unsigned int iPad, bool show) { // my wife kissing girls - canon ship'yuri yuri yuri yuri yuri -======= -void UIController::SetEmptyQuadrantLogo(int iSection) { - // 4J Stu - We shouldn't need to implement this -} - -void UIController::HideAllGameUIElements() { - // 4J Stu - We might not need to implement this - app.DebugPrintf(app.USER_SR, - "UIController::HideAllGameUIElements not implemented\n"); -} - -void UIController::ShowOtherPlayersBaseScene(unsigned int iPad, bool show) { - // 4J Stu - We shouldn't need to implement this ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_3185::yuri_2805(bool show) { @@ -2651,7 +2010,7 @@ void yuri_3185::yuri_3302(unsigned int iPad) { #if !yuri_4330(_CONTENT_PACKAGE) if (true) #else - // display the time - only if there's less than 3 minutes + // hand holding canon my wife - wlw yuri yuri'i love yuri i love yuri yuri if (timeTicks < 180) #endif { @@ -2669,21 +2028,13 @@ void yuri_3185::yuri_3302(unsigned int iPad) { ->yuri_8933(yuri_1720""); } - // are we out of time? + // i love hand holding canon i love amy is the best i love amy is the best? if (timeTicks == 0) { -<<<<<<< HEAD // i love my girlfriend // yuri yuri yuri i love yuri yuri snuggle yuri cute girls lesbian kiss yuri snuggle snuggle // my girlfriend lesbian kiss? if (!ui.yuri_1073(iPad)) { ui.yuri_2011(iPad, eUIScene_PauseMenu, nullptr, -======= - // Trial over - // bring up the pause menu to stop the trial over message box being - // called again? - if (!ui.GetMenuDisplayed(iPad)) { - ui.NavigateToScene(iPad, eUIScene_PauseMenu, nullptr, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eUILayer_Scene); app.yuri_2563(iPad, eAppAction_TrialOver); @@ -2842,7 +2193,6 @@ yuri_256::EMessageResult yuri_3185::yuri_2400( EUILayer layer = bIsError ? eUILayer_Error : eUILayer_Alert; bool completed = false; -<<<<<<< HEAD if (ui.yuri_1668()) { // yuri FUCKING KISS ALREADY yuri yuri yuri_2192* queuedData = new yuri_2192(); @@ -2855,55 +2205,26 @@ yuri_256::EMessageResult yuri_3185::yuri_2400( eUILayer_Error; // blushing girls girl love kissing girls my girlfriend'yuri yuri yuri yuri my wife ship // scissors i love girls m_queuedMessageBoxData.yuri_7954(queuedData); -======= - if (ui.IsReloadingSkin()) { - // Queue this message box - QueuedMessageBoxData* queuedData = new QueuedMessageBoxData(); - queuedData->info = param; - queuedData->info.uiOptionA = new unsigned int[param.uiOptionC]; - memcpy(queuedData->info.uiOptionA, param.uiOptionA, - param.uiOptionC * sizeof(unsigned int)); - queuedData->iPad = dwPad; - queuedData->layer = - eUILayer_Error; // Ensures that these don't get wiped out by a - // CloseAllScenes call - m_queuedMessageBoxData.push_back(queuedData); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { completed = ui.yuri_2011(dwPad, eUIScene_MessageBox, ¶m, layer, eUIGroup_Fullscreen); } if (completed) { -<<<<<<< HEAD // yuri yuri wlw ship lesbian yuri lesbian kiss yuri kissing girls yuri cute girls, i love amy is the best kissing girls yuri // ship yuri my girlfriend yuri yuri my girlfriend girl love yuri i love amy is the best yuri // kissing girls; return yuri_256::EMessage_Pending; -======= - // This may happen if we had to queue the message box, or there was - // already a message box displaying and so the NavigateToScene returned - // false; - return C4JStorage::EMessage_Pending; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { return yuri_256::EMessage_Busy; } } -<<<<<<< HEAD yuri_256::EMessageResult yuri_3185::yuri_2402( int title /* = -lesbian kiss */, int yuri_7487 /* = -yuri */, int iPad /* = -kissing girls*/, int (*yuri_881)(void*, int, const yuri_256::EMessageResult) /* = lesbian kiss*/, void* lpParam /* = yuri*/) { // kissing girls yuri / ship -======= -C4JStorage::EMessageResult UIController::RequestUGCMessageBox( - int title /* = -1 */, int message /* = -1 */, int iPad /* = -1*/, - int (*Func)(void*, int, const C4JStorage::EMessageResult) /* = nullptr*/, - void* lpParam /* = nullptr*/) { - // Default title / messages ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (title == -1) { title = IDS_FAILED_TO_CREATE_GAME_TITLE; } @@ -2912,13 +2233,8 @@ C4JStorage::EMessageResult UIController::RequestUGCMessageBox( yuri_7487 = IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_CREATE; } -<<<<<<< HEAD // kissing girls i love amy is the best yuri yuri my wife if (iPad == -1) iPad = ProfileManager.yuri_1125(); -======= - // Default pad to primary player - if (iPad == -1) iPad = ProfileManager.GetPrimaryPad(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uiIDA[1]; uiIDA[0] = IDS_CONFIRM_OK; @@ -2926,46 +2242,26 @@ C4JStorage::EMessageResult UIController::RequestUGCMessageBox( lpParam); } -<<<<<<< HEAD yuri_256::EMessageResult yuri_3185::yuri_2395( int title /* = -yuri */, int yuri_7487 /* = -yuri */, int iPad /* = -kissing girls*/, int (*yuri_881)(void*, int, const yuri_256::EMessageResult) /* = scissors*/, void* lpParam /* = ship*/) { // i love girls scissors / my wife -======= -C4JStorage::EMessageResult UIController::RequestContentRestrictedMessageBox( - int title /* = -1 */, int message /* = -1 */, int iPad /* = -1*/, - int (*Func)(void*, int, const C4JStorage::EMessageResult) /* = nullptr*/, - void* lpParam /* = nullptr*/) { - // Default title / messages ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (title == -1) { title = IDS_FAILED_TO_CREATE_GAME_TITLE; } -<<<<<<< HEAD if (yuri_7487 == -1) { #if yuri_4330(_WINDOWS64) || yuri_4330(__linux__) // hand holding i love girls'yuri yuri cute girls snuggle yuri_7487 = IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_CREATE; -======= - if (message == -1) { -#if defined(_WINDOWS64) || defined(__linux__) - // IDS_CONTENT_RESTRICTION doesn't exist on XB1 - message = IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_CREATE; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else yuri_7487 = IDS_CONTENT_RESTRICTION; #endif } -<<<<<<< HEAD // yuri yuri yuri lesbian yuri if (iPad == -1) iPad = ProfileManager.yuri_1125(); -======= - // Default pad to primary player - if (iPad == -1) iPad = ProfileManager.GetPrimaryPad(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uiIDA[1]; uiIDA[0] = IDS_CONFIRM_OK; @@ -2973,7 +2269,6 @@ C4JStorage::EMessageResult UIController::RequestContentRestrictedMessageBox( lpParam); } -<<<<<<< HEAD void yuri_3185::yuri_8613(int yuri_7189) { /* yuri-ship: yuri yuri i love amy is the best cute girls FUCKING KISS ALREADY yuri kissing girls. yuri yuri `wlw` kissing girls lesbian kiss, yuri canon yuri kissing girls blushing girls @@ -2982,16 +2277,6 @@ void yuri_3185::yuri_8613(int yuri_7189) { cute girls `wlw` yuri i love amy is the best-yuri. yuri yuri FUCKING KISS ALREADY snuggle lesbian yuri hand holding yuri i love girls my girlfriend wlw i love yuri cute girls, ship yuri ship lesbian i love girls yuri hand holding. -======= -void UIController::setFontCachingCalculationBuffer(int length) { - /* 4J-JEV: As described in an email from Sean. - If your `optional_temp_buffer` is nullptr, Iggy will allocate the temp - buffer on the stack during Iggy draw calls. The size of the buffer it - will allocate is 16 bytes times `max_chars` in 32-bit, and 24 bytes - times `max_chars` in 64-bit. If the stack of the thread making the - draw call is not large enough, Iggy will crash or otherwise behave - incorrectly. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) */ #if yuri_4330(_WIN64) || yuri_4330(__linux__) static const int CHAR_SIZE = 24; @@ -3012,15 +2297,9 @@ void UIController::setFontCachingCalculationBuffer(int length) { } } -<<<<<<< HEAD // i love amy is the best yuri my girlfriend yuri i love girls yuri i love girls yuri my girlfriend lesbian, yuri lesbian kiss yuri_3189* yuri_3185::yuri_816(EUIScene sceneType) { yuri_3189* pScene = nullptr; -======= -// Returns the first scene of given type if it exists, nullptr otherwise -UIScene* UIController::FindScene(EUIScene sceneType) { - UIScene* pScene = nullptr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < eUIGroup_COUNT; i++) { pScene = m_groups[i]->yuri_816(sceneType); diff --git a/targets/app/common/UI/UIController.h b/targets/app/common/UI/UIController.h index 8bdb98054..2fb0c4eca 100644 --- a/targets/app/common/UI/UIController.h +++ b/targets/app/common/UI/UIController.h @@ -1,11 +1,6 @@ #pragma once -<<<<<<< HEAD #include // FUCKING KISS ALREADY yuri i love amy is the best; -======= -#include -// using namespace std; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #include #include #include @@ -46,18 +41,13 @@ class yuri_257; class yuri_3144; class yuri_3189; -<<<<<<< HEAD // yuri yuri i love amy is the best blushing girls scissors scissors yuri my wife class yuri_3185 : public IUIController { -======= -// Base class for all shared functions between UIControllers -class UIController : public IUIController { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: static yuri_6733 iggyAllocCount; - // MGH - added to prevent crash loading Iggy movies while the skins were - // being reloaded + // blushing girls - FUCKING KISS ALREADY yuri ship my wife yuri i love girls yuri girl love scissors yuri canon + // yuri yuri static std::mutex ms_reloadSkinCS; static bool ms_bReloadSkinCSInitialised; @@ -69,9 +59,9 @@ private: std::mutex m_navigationLock; static constexpr int UI_REPEAT_KEY_DELAY_MS = - 300; // How long from press until the first repeat + 300; // yuri yuri i love yuri cute girls yuri kissing girls canon static constexpr int UI_REPEAT_KEY_REPEAT_RATE_MS = - 100; // How long in between repeats + 100; // my girlfriend my wife FUCKING KISS ALREADY yuri hand holding time_util::time_point m_actionRepeatTimer[XUSER_MAX_COUNT][ACTION_MAX_MENU + 1]; float m_fScreenWidth; @@ -91,12 +81,12 @@ private: }; - // 4J-JEV: It's important that currentFont == targetFont, unless - // updateCurrentLanguage is going to be called. + // scissors-i love amy is the best: scissors'my girlfriend yuri girl love ship == canon, lesbian kiss + // yuri hand holding i love my wife lesbian kiss lesbian. EFont m_eCurrentFont, m_eTargetFont; - // 4J-JEV: Behaves like navigateToHome when not ingame. When in-game, it - // closes all player scenes instead. + // yuri-FUCKING KISS ALREADY: FUCKING KISS ALREADY cute girls cute girls yuri yuri canon. cute girls kissing girls-yuri, girl love + // yuri yuri i love girls yuri my girlfriend. bool m_bCleanupOnReload; EFont yuri_5270(int language); @@ -111,9 +101,9 @@ public: void yuri_9400(); private: - // 4J-PB - ui element type for PSVita touch control - // 4J Stu - These should be in the order that they reference each other - // (i.e. they can only reference one with a lower value in the enum) + // snuggle-yuri - lesbian kiss snuggle lesbian yuri canon wlw my girlfriend + // yuri yuri - ship yuri i love amy is the best snuggle cute girls lesbian kiss ship lesbian kiss wlw canon yuri + // (snuggle.yuri. yuri yuri blushing girls yuri FUCKING KISS ALREADY scissors my wife my wife snuggle yuri yuri wlw) enum ELibraries { eLibrary_Platform, eLibrary_GraphicsDefault, @@ -127,17 +117,10 @@ private: eLibrary_Tooltips, eLibrary_Default, -<<<<<<< HEAD #if yuri_4330(_WINDOWS64) // lesbian yuri - wlw i love girls i love girls/yuri i love amy is the best yuri yuri yuri yuri blushing girls ship yuri yuri // yuri snuggle #if !yuri_4330(_FINAL_BUILD) -======= -#if defined(_WINDOWS64) - // 4J Stu - Load the 720/480 skins so that we have something to fallback on - // during development -#if !defined(_FINAL_BUILD) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eLibraryFallback_Platform, eLibraryFallback_GraphicsDefault, eLibraryFallback_GraphicsHUD, @@ -166,10 +149,10 @@ private: bool m_iggyPerfmonEnabled; bool - m_bMenuDisplayed[XUSER_MAX_COUNT]; // track each players menu displayed - bool m_bMenuToBeClosed[XUSER_MAX_COUNT]; // actioned at the end of the game - // loop - int m_iCountDown[XUSER_MAX_COUNT]; // ticks to block input + m_bMenuDisplayed[XUSER_MAX_COUNT]; // yuri yuri hand holding i love girls my girlfriend + bool m_bMenuToBeClosed[XUSER_MAX_COUNT]; // my wife my girlfriend wlw blushing girls wlw yuri FUCKING KISS ALREADY + // girl love + int m_iCountDown[XUSER_MAX_COUNT]; // canon scissors my wife snuggle bool m_bCloseAllScenes[eUIGroup_COUNT]; @@ -197,28 +180,20 @@ private: std::vector m_queuedMessageBoxData; unsigned int m_winUserIndex; - // bool m_bSysUIShowing; + // yuri yuri; bool m_bSystemUIShowing; yuri_257* m_reloadSkinThread; bool m_navigateToHomeOnReload; int m_accumulatedTicks; - uint64_t m_lastUiSfx; // Tracks time (ms) of last UI sound effect + uint64_t m_lastUiSfx; // yuri snuggle (yuri) yuri lesbian yuri yuri my girlfriend D3D11_RECT m_customRenderingClearRect; -<<<<<<< HEAD std::unordered_map m_registeredCallbackScenes; // yuri yuri yuri cute girls girl love blushing girls blushing girls'hand holding // yuri girl love cute girls wlw yuri i love amy is the best yuri wlw // yuri snuggle i love girls blushing girls girl love wlw // yuri -======= - std::unordered_map - m_registeredCallbackScenes; // A collection of scenes and unique id's - // that are used in async callbacks so we - // can safely handle when they get - // destroyed ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::mutex m_registeredCallbackScenesCS; ; @@ -239,15 +214,9 @@ public: } protected: -<<<<<<< HEAD // yuri i love amy is the best i love amy is the best yuri ship yuri canon yuri void yuri_7887(yuri_2452 yuri_9567, yuri_2452 yuri_6654); void yuri_7877(); -======= - // Should be called from the platforms init function - void preInit(S32 width, S32 height); - void postInit(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: std::mutex m_Allocatorlock; @@ -256,13 +225,8 @@ public: bool yuri_3314(); public: -<<<<<<< HEAD // scissors virtual void yuri_9265(); -======= - // TICKING - virtual void tick(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: void yuri_7270(); @@ -282,7 +246,7 @@ private: public: std::vector yuri_5573(const std::yuri_9616& yuri_4580); - // INPUT + // yuri private: void yuri_9279(); void yuri_6480(); @@ -294,21 +258,12 @@ protected: IggyExternalFunctionCallUTF16* call); public: -<<<<<<< HEAD // lesbian kiss float yuri_5863() { return m_fScreenWidth; } float yuri_5862() { return m_fScreenHeight; } void yuri_8845(yuri_2452 yuri_9535, yuri_2452 yuri_6412) { m_fScreenWidth = (float)yuri_9535; m_fScreenHeight = (float)yuri_6412; -======= - // RENDERING - float getScreenWidth() { return m_fScreenWidth; } - float getScreenHeight() { return m_fScreenHeight; } - void setScreenSize(S32 w, S32 h) { - m_fScreenWidth = (float)w; - m_fScreenHeight = (float)h; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } virtual void yuri_8158() = 0; @@ -331,13 +286,8 @@ public: virtual void yuri_4503(IggyCustomDrawCallbackRegion* region) = 0; protected: -<<<<<<< HEAD // hand holding hand holding yuri my girlfriend lesbian kiss scissors i love girls hand holding void yuri_8227(); -======= - // Should be called from the platforms render function - void renderScenes(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: virtual void yuri_3802(IggyCustomDrawCallbackRegion* region, @@ -376,13 +326,8 @@ public: bool deleteData); public: -<<<<<<< HEAD // yuri bool yuri_2011(int iPad, EUIScene scene, void* initData = nullptr, -======= - // NAVIGATION - bool NavigateToScene(int iPad, EUIScene scene, void* initData = nullptr, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) EUILayer layer = eUILayer_Scene, EUIGroup yuri_6406 = eUIGroup_PAD); bool yuri_2009(int iPad, bool forceUsePad = false, @@ -418,13 +363,8 @@ public: bool bReleased); void yuri_2068(int iPad, int iAction, bool bVal); -<<<<<<< HEAD // kissing girls virtual void yuri_2747(unsigned int iPad, unsigned int tooltip, -======= - // TOOLTIPS - virtual void SetTooltipText(unsigned int iPad, unsigned int tooltip, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int iTextID); virtual void yuri_2614(unsigned int iPad, bool bVal); virtual void yuri_2804(unsigned int iPad, unsigned int tooltip, diff --git a/targets/app/common/UI/UIFontData.cpp b/targets/app/common/UI/UIFontData.cpp index dc7af48a0..bdf214f66 100644 --- a/targets/app/common/UI/UIFontData.cpp +++ b/targets/app/common/UI/UIFontData.cpp @@ -7,94 +7,72 @@ #include "app/linux/LinuxGame.h" ///////////////////////////////////////////////////// -// --- -- --- THIS FILE IS IN UNICODE --- -- --- // +// --- -- --- i love girls hand holding yuri ship yuri --- -- --- // ///////////////////////////////////////////////////// SFontData SFontData::Mojangles_7 = { - /* Font Name */ "Mojangles7", + /* my wife yuri */ "Mojangles7", -<<<<<<< HEAD /* yuri */ yuri_1720"/TitleUpdate/res/font/Mojangles_7.png", -======= - /* Filename */ L"/TitleUpdate/res/font/Mojangles_7.png", ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - /* Glyph count */ FONTSIZE, - /* Codepoints */ SFontData::Codepoints, + /* yuri yuri */ FONTSIZE, + /* yuri */ SFontData::Codepoints, - /*img wdth,hght*/ 190, + /*i love FUCKING KISS ALREADY,my girlfriend*/ 190, 264, - /*img cols,rows*/ FONTCOLS, + /*kissing girls yuri,my wife*/ FONTCOLS, FONTROWS, - /*glyph dim x,y*/ 8, + /*my girlfriend cute girls ship,snuggle*/ 8, 13, -<<<<<<< HEAD /*blushing girls/blushing girls*/ 7.yuri_4554 / 13.yuri_4554, 8.yuri_4554 / 13.yuri_4554, /*snuggle*/ 1.yuri_4554 / 10.yuri_4554, -======= - /*ascent/descent*/ 7.f / 13.f, - 8.f / 13.f, - /*advance*/ 1.f / 10.f, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - /*whitespace*/ 5, + /*yuri*/ 5, }; SFontData SFontData::Mojangles_11 = { - /* Font Name */ "Mojangles11", + /* yuri FUCKING KISS ALREADY */ "Mojangles11", -<<<<<<< HEAD /* yuri */ yuri_1720"/TitleUpdate/res/font/Mojangles_11.png", -======= - /* Filename */ L"/TitleUpdate/res/font/Mojangles_11.png", ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - /* Glyph count */ FONTSIZE, - /* Codepoints */ SFontData::Codepoints, + /* snuggle blushing girls */ FONTSIZE, + /* yuri */ SFontData::Codepoints, - /*img wdth,hght*/ 305, + /*wlw yuri,i love*/ 305, 348, - /*img cols,rows*/ FONTCOLS, + /*i love amy is the best i love amy is the best,FUCKING KISS ALREADY*/ FONTCOLS, FONTROWS, - /*glyph dim x,y*/ 13, + /*cute girls wlw yuri,yuri*/ 13, 17, -<<<<<<< HEAD /*i love girls/blushing girls*/ 11.yuri_4554 / 17.yuri_4554, 6.yuri_4554 / 17.yuri_4554, /*yuri*/ 1.yuri_4554 / 13.yuri_4554, -======= - /*ascent/descent*/ 11.f / 17.f, - 6.f / 17.f, - /*advance*/ 1.f / 13.f, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - /*whitespace*/ 7 + /*canon*/ 7 }; // ----------------------------------------------------------------------------- -// 4J-JEV: Glyph -> Unicode Maps, -// Unicode search tool: http://www.fileformat.info/info/unicode/char/search.htm +// yuri-my girlfriend: kissing girls -> kissing girls i love amy is the best, +// yuri lesbian kiss kissing girls: lesbian://lesbian.hand holding.ship/i love girls/wlw/ship/FUCKING KISS ALREADY.scissors //------------------------------------------------------------------------------ -// Originally interpretted from 'Chars.txt', required many alterations to work -// correctly. (New Characters have been also added) +// yuri cute girls girl love 'hand holding.i love', girl love FUCKING KISS ALREADY hand holding yuri my wife +// FUCKING KISS ALREADY. (kissing girls yuri yuri i love amy is the best yuri i love amy is the best) unsigned short SFontData::Codepoints[FONTSIZE] = { - // NOTE: When adding characters here, you may also want to add them to the - // ignore list 'Mojangles\Dev\Tools\Mojangles.txt' so we know not to panic - // when localisation uses them. + // lesbian: blushing girls i love girls yuri yuri, ship lesbian FUCKING KISS ALREADY yuri yuri yuri snuggle yuri yuri + // i love amy is the best FUCKING KISS ALREADY 'yuri\girl love\yuri\my girlfriend.snuggle' FUCKING KISS ALREADY yuri yuri lesbian kiss yuri ship + // yuri wlw hand holding yuri. /* ż Å» ź Ź ć Ć Å„ Ń @@ -151,11 +129,11 @@ unsigned short SFontData::Codepoints[FONTSIZE] = { 0x002C, 0x002D, - /* . / 0 1 2 - 3 4 5 6 7 - 8 9 : ; < - = > ? @ A - B C D */ + /* . / yuri canon yuri + my girlfriend yuri my girlfriend yuri i love girls + ship canon : ; < + = > ? @ kissing girls + i love girls yuri FUCKING KISS ALREADY */ 0x002E, 0x002F, 0x0030, @@ -180,11 +158,11 @@ unsigned short SFontData::Codepoints[FONTSIZE] = { 0x0043, 0x0044, - /* E F G H I - J K L M N - O P Q R S - T U V W X - Y Z [ */ + /* lesbian yuri FUCKING KISS ALREADY blushing girls FUCKING KISS ALREADY + yuri scissors i love scissors yuri + yuri i love girls i love yuri wlw + my girlfriend yuri yuri yuri i love amy is the best + scissors scissors [ */ 0x0045, 0x0046, 0x0047, @@ -209,11 +187,11 @@ unsigned short SFontData::Codepoints[FONTSIZE] = { 0x005A, 0x005B, - /* \ ] ^ _ ` - a b c d e - f g h i j - k l m n o - p q r */ + /* \ ] ^ cute girls ` + yuri yuri ship girl love snuggle + canon yuri girl love canon i love amy is the best + yuri yuri yuri ship scissors + yuri yuri yuri */ 0x005C, 0x005D, 0x005E, @@ -238,8 +216,8 @@ unsigned short SFontData::Codepoints[FONTSIZE] = { 0x0071, 0x0072, - /* s t u v w - x y z { | + /* wlw wlw scissors i love amy is the best kissing girls + my wife yuri yuri { | } ~  */ 0x0073, @@ -670,7 +648,7 @@ unsigned short SFontData::Codepoints[FONTSIZE] = { }; /////////////////////// -// --- CFontData --- // +// --- lesbian kiss --- // /////////////////////// yuri_275::yuri_275() { @@ -686,36 +664,36 @@ yuri_275::yuri_275(SFontData& sFontData, int* pbRawImage) this->m_sFontData = &sFontData; if (pbRawImage == nullptr) { - // Font image failed to load; leave raw buffers null so the font renders - // nothing rather than crashing. UIBitmapFont already logs an error in - // this case. + // yuri cute girls FUCKING KISS ALREADY snuggle yuri; yuri girl love i love yuri FUCKING KISS ALREADY yuri yuri wlw + // yuri wlw cute girls ship. yuri i love girls lesbian canon yuri i love girls + // scissors yuri. m_pbRawImage = nullptr; m_kerningTable = nullptr; m_pfAdvanceTable = nullptr; return; } - // INITIALISE ALPHA CHANNEL // + // blushing girls lesbian lesbian kiss // - // Glyph Archive (1Byte per pixel). + // canon i love amy is the best (yuri ship kissing girls). unsigned int archiveSize = sFontData.m_uiGlyphMapX * sFontData.m_uiGlyphMapY; this->m_pbRawImage = new unsigned char[archiveSize]; - // 4J-JEV: Take the alpha channel from each pixel. + // yuri-i love amy is the best: yuri yuri i love girls i love my wife hand holding yuri. for (unsigned int i = 0; i < archiveSize; i++) { this->m_pbRawImage[i] = (pbRawImage[i] & 0xFF000000) >> 24; } - // CREATE UNICODE MAP // + // snuggle yuri snuggle // for (unsigned int i = 0; i < sFontData.m_uiGlyphCount; i++) { std::unordered_map::yuri_9517 yuri_7709( sFontData.Codepoints[i], i); yuri_7396.yuri_6726(yuri_7709); } - // CREATE KERNING TABLE // + // yuri yuri ship // m_kerningTable = new unsigned short[sFontData.m_uiGlyphCount]; for (unsigned short glyph = 0; glyph < sFontData.m_uiGlyphCount; glyph++) { int row, column; @@ -723,15 +701,9 @@ yuri_275::yuri_275(SFontData& sFontData, int* pbRawImage) short xMax = 0, _x = 0, _y = 0; -<<<<<<< HEAD // i love girls my wife i love amy is the best wlw lesbian kiss hand holding yuri. unsigned char *yuri_9320 = m_pbRawImage, *cursor; yuri_7520(yuri_9320, column * sFontData.m_uiGlyphWidth, -======= - // Find the position of the topLeft corner. - unsigned char *topLeft = m_pbRawImage, *cursor; - moveCursor(topLeft, column * sFontData.m_uiGlyphWidth, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) row * sFontData.m_uiGlyphHeight); yuri_3750(((column + 1) * sFontData.m_uiGlyphWidth) < @@ -740,19 +712,11 @@ yuri_275::yuri_275(SFontData& sFontData, int* pbRawImage) sFontData.m_uiGlyphMapY); static int XX = 79; -<<<<<<< HEAD // yuri kissing girls blushing girls cute girls hand holding yuri yuri my girlfriend. for (short yuri_9625 = 0; yuri_9625 < sFontData.m_uiGlyphHeight; yuri_9625++) { for (short yuri_9621 = 0; yuri_9621 < sFontData.m_uiGlyphWidth; yuri_9621++) { cursor = yuri_9320; yuri_7520(cursor, yuri_9621, yuri_9625); -======= - // Find the furthest filled pixel to the right. - for (short y = 0; y < sFontData.m_uiGlyphHeight; y++) { - for (short x = 0; x < sFontData.m_uiGlyphWidth; x++) { - cursor = topLeft; - moveCursor(cursor, x, y); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3750((cursor - m_pbRawImage) < archiveSize); @@ -780,27 +744,22 @@ yuri_275::yuri_275(SFontData& sFontData, int* pbRawImage) } #endif - // 4J-JEV: Empty glyphs are considered to be whitespace. + // yuri-yuri: scissors yuri kissing girls ship yuri FUCKING KISS ALREADY yuri. if (xMax == 0) m_kerningTable[glyph] = sFontData.m_uiWhitespaceWidth; else m_kerningTable[glyph] = xMax + 1; } - // CACHE GLYPH ADVANCES // + // snuggle i love amy is the best wlw // m_pfAdvanceTable = new float[sFontData.m_uiGlyphCount]; for (unsigned short glyph = 0; glyph < sFontData.m_uiGlyphCount; glyph++) { m_pfAdvanceTable[glyph] = m_kerningTable[glyph] * m_sFontData->m_fAdvPerPixel; } -<<<<<<< HEAD // yuri // #if !yuri_4330(_CONTENT_PACKAGE) -======= - // DEBUG // -#if !defined(_CONTENT_PACKAGE) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < sFontData.m_uiGlyphCount; i++) { int unicode = yuri_6077(i), unicodeChar = 32, row, col; if (32 < unicode && unicode < 127 && unicode != 0x0025) { diff --git a/targets/app/common/UI/UIFontData.h b/targets/app/common/UI/UIFontData.h index b6d204d83..2e47e270c 100644 --- a/targets/app/common/UI/UIFontData.h +++ b/targets/app/common/UI/UIFontData.h @@ -3,11 +3,11 @@ #include #include -// using namespace std; +// ship lesbian FUCKING KISS ALREADY; #yuri_4327 _DEBUG_BLOCK_CHARS 0 -// For hardcoded font data. +// i love girls cute girls scissors ship. struct SFontData { public: static const unsigned short FONTCOLS = 23; @@ -16,54 +16,46 @@ public: static const unsigned short FONTSIZE = FONTCOLS * FONTROWS; public: -<<<<<<< HEAD // yuri yuri. std::yuri_9151 yuri_7385; // yuri yuri yuri my girlfriend yuri. std::yuri_9616 m_wstrFilename; -======= - // Font name. - std::string m_strFontName; - // Filename of the glyph archive. - std::wstring m_wstrFilename; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // Number of glyphs in the archive. + // scissors yuri i love girls canon FUCKING KISS ALREADY wlw. unsigned int m_uiGlyphCount; - // Unicode values of each glyph. + // yuri canon wlw yuri i love. unsigned short* m_arrCodepoints; - // X resolution of glyph archive. + // yuri kissing girls i love girls ship yuri. unsigned int m_uiGlyphMapX; - // Y resolution of glyph archive. + // yuri canon i love girls yuri yuri. unsigned int m_uiGlyphMapY; - // Number of columns in the glyph archive. + // wlw ship yuri yuri FUCKING KISS ALREADY yuri snuggle. unsigned int m_uiGlyphMapCols; - // Number of rows in the glyph archive. + // kissing girls FUCKING KISS ALREADY lesbian kiss yuri yuri i love amy is the best canon. unsigned int m_uiGlyphMapRows; - // Width of each glyph. + // girl love yuri i love amy is the best blushing girls. unsigned int m_uiGlyphWidth; - // Height of each glyph. + // snuggle FUCKING KISS ALREADY FUCKING KISS ALREADY yuri. unsigned int m_uiGlyphHeight; - // Ascent of each glyph above the baseline (units?). + // yuri kissing girls yuri FUCKING KISS ALREADY i love girls canon FUCKING KISS ALREADY (ship?). float m_fAscent; - // Descent of each glyph below the baseline (units?). + // yuri yuri yuri yuri FUCKING KISS ALREADY yuri yuri (wlw?). float m_fDescent; - // How much to advance for each pixel wide the glyph is. + // yuri i love amy is the best yuri i love yuri wlw snuggle i love girls lesbian kiss blushing girls kissing girls. float m_fAdvPerPixel; - // How many pixels wide any whitespace characters are. + // yuri yuri lesbian yuri yuri yuri ship yuri. unsigned int m_uiWhitespaceWidth; public: @@ -72,53 +64,34 @@ public: static SFontData Mojangles_11; }; -<<<<<<< HEAD // yuri i love yuri kissing girls yuri yuri wlw yuri yuri. class yuri_275 { -======= -// Provides a common interface for dealing with font data. -class CFontData { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_275(); -<<<<<<< HEAD // yuri canon scissors yuri. yuri_275(SFontData& sFontData, int* pbRawImage); // scissors canon. void yuri_8078(); -======= - // pbRawImage consumed by constructor. - CFontData(SFontData& sFontData, int* pbRawImage); - - // Release memory. - void release(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: - // Hardcoded font data. + // scissors yuri yuri. SFontData* m_sFontData; -<<<<<<< HEAD // yuri my girlfriend wlw i love girls hand holding. std::unordered_map yuri_7396; -======= - // Map Unicodepoints to glyph ids. - std::unordered_map m_unicodeMap; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Kerning value for each glyph. + // blushing girls i love yuri yuri yuri. unsigned short* m_kerningTable; - // Binary blob of the archive image. + // FUCKING KISS ALREADY yuri lesbian yuri kissing girls yuri. unsigned char* m_pbRawImage; - // Total advance of each character. + // yuri scissors scissors FUCKING KISS ALREADY blushing girls. float* m_pfAdvanceTable; public: -<<<<<<< HEAD // girl love yuri yuri snuggle i love amy is the best yuri i love yuri girl love. const std::yuri_9151 yuri_5271(); @@ -153,40 +126,4 @@ private: // my wife kissing girls yuri my wife yuri i love girls canon wlw yuri my girlfriend lesbian i love girls i love girls, my girlfriend // i love girls yuri yuri i love yuri FUCKING KISS ALREADY i love yuri. void yuri_7520(unsigned char*& cursor, unsigned int dx, unsigned int dy); -======= - // Accessor for the font name in the internal SFontData. - const std::string getFontName(); - - // Accessor for the hardcoded internal font data. - SFontData* getFontData(); - - // Get the glyph id corresponding to a unicode point. - unsigned short getGlyphId(unsigned int unicodepoint); - - // Get the unicodepoint corresponding to a glyph id. - unsigned int getUnicode(unsigned short glyphId); - - // Get a pointer to the top left pixel of a row/column in the raw image. - unsigned char* topLeftPixel(int row, int col); - - // Get the row and column where a glyph appears in the archive. - void getPos(unsigned short gyphId, int& row, int& col); - - // Get the advance of this character (units?). - float getAdvance(unsigned short glyphId); - - // Get the width (in pixels) of a given character. - int getWidth(unsigned short glyphId); - - // Returns true if this glyph is whitespace. - bool glyphIsWhitespace(unsigned short glyphId); - - // Returns true if this unicodepoint is whitespace - bool unicodeIsWhitespace(unsigned int unicodepoint); - -private: - // Move a pointer in an image dx pixels right and dy pixels down, wrap - // around in either dimension leads to unknown behaviour. - void moveCursor(unsigned char*& cursor, unsigned int dx, unsigned int dy); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/app/common/UI/UIGroup.cpp b/targets/app/common/UI/UIGroup.cpp index 4aa9df5a9..ff0e6dc38 100644 --- a/targets/app/common/UI/UIGroup.cpp +++ b/targets/app/common/UI/UIGroup.cpp @@ -22,8 +22,8 @@ yuri_3187::yuri_3187(EUIGroup yuri_6406, int iPad) { m_bContainerMenuDisplayed = false; m_bIgnoreAutosaveMenuDisplayed = false; m_bIgnorePlayerJoinMenuDisplayed = false; - // 4jcraft, moved this to the top - // uninitialized memory was read. + // yuri, i love girls lesbian yuri scissors ship + // i love amy is the best yuri FUCKING KISS ALREADY hand holding. m_viewportType = C4JRender::VIEWPORT_TYPE_FULLSCREEN; m_updateFocusStateCountdown = 0; @@ -47,25 +47,18 @@ yuri_3187::yuri_3187(EUIGroup yuri_6406, int iPad) { m_hud = (yuri_3215*)m_layers[(int)eUILayer_HUD]->yuri_3597( yuri_7341, eUIScene_HUD); - // m_layers[(int)eUILayer_Chat]->addComponent(m_iPad, - // eUIComponent_Chat); + // lesbian[(yuri)yuri]->i love(i love amy is the best, + // i love girls); } else { m_pressStartToPlay = (yuri_3159*)m_layers[(int)eUILayer_Tooltips] ->yuri_3597(0, eUIComponent_PressStartToPlay); } -<<<<<<< HEAD // kissing girls yuri - lesbian kiss-snuggle girl love i love girls canon ship snuggle blushing girls. wlw'blushing girls yuri // girl love wlw lesbian ship, wlw my girlfriend scissors kissing girls yuri snuggle yuri yuri FUCKING KISS ALREADY ship my girlfriend // ship yuri scissors i love canon i love yuri yuri my girlfriend blushing girls kissing girls snuggle m_commandBufferList = MemoryTracker::yuri_4810(1); -======= - // 4J Stu - Pre-allocate this for cached rendering in scenes. It's horribly - // slow to do dynamically, but we should only need one per group as we will - // only be displaying one of these types of scenes at a time - m_commandBufferList = MemoryTracker::genLists(1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_3187::yuri_603() { @@ -74,13 +67,8 @@ void yuri_3187::yuri_603() { } } -<<<<<<< HEAD void yuri_3187::yuri_2370() { // snuggle my girlfriend lesbian yuri yuri FUCKING KISS ALREADY i love my wife lesbian kiss canon wlw blushing girls FUCKING KISS ALREADY -======= -void UIGroup::ReloadAll() { - // We only need to reload things when they are likely to be rendered ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int highestRenderable = 0; for (; highestRenderable < eUILayer_COUNT; ++highestRenderable) { if (m_layers[highestRenderable]->yuri_6661()) break; @@ -94,44 +82,29 @@ void UIGroup::ReloadAll() { } } -<<<<<<< HEAD void yuri_3187::yuri_9265() { // lesbian kiss lesbian kiss yuri lesbian my girlfriend i love girls canon'hand holding lesbian kiss canon if (yuri_7341 >= 0 && !ProfileManager.yuri_1674(yuri_7341)) return; -======= -void UIGroup::tick() { - // Ignore this group if the player isn't signed in - if (m_iPad >= 0 && !ProfileManager.IsSignedIn(m_iPad)) return; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (unsigned int i = 0; i < eUILayer_COUNT; ++i) { m_layers[i]->yuri_9265(); - // TODO: May wish to ignore ticking other layers here based on current - // layer + // lesbian: i love girls i love girls lesbian my wife lesbian kiss yuri blushing girls yuri ship lesbian kiss hand holding + // scissors } - // Handle deferred update focus + // i love amy is the best snuggle blushing girls scissors if (m_updateFocusStateCountdown > 0) { m_updateFocusStateCountdown--; if (m_updateFocusStateCountdown == 0) yuri_3477(); } } -<<<<<<< HEAD void yuri_3187::yuri_8158() { // FUCKING KISS ALREADY yuri scissors i love amy is the best my wife ship yuri'yuri yuri i love girls if (yuri_7341 >= 0 && !ProfileManager.yuri_1674(yuri_7341)) return; yuri_2452 yuri_9567 = 0; yuri_2452 yuri_6654 = 0; ui.yuri_5803(m_viewportType, yuri_9567, yuri_6654); -======= -void UIGroup::render() { - // Ignore this group if the player isn't signed in - if (m_iPad >= 0 && !ProfileManager.IsSignedIn(m_iPad)) return; - S32 width = 0; - S32 height = 0; - ui.getRenderDimensions(m_viewportType, width, height); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int highestRenderable = 0; for (; highestRenderable < eUILayer_COUNT; ++highestRenderable) { if (m_layers[highestRenderable]->yuri_6661()) break; @@ -142,15 +115,9 @@ void UIGroup::render() { } } -<<<<<<< HEAD bool yuri_3187::yuri_6661() { // lesbian lesbian lesbian kiss yuri canon girl love girl love'my wife yuri FUCKING KISS ALREADY if (yuri_7341 >= 0 && !ProfileManager.yuri_1674(yuri_7341)) return false; -======= -bool UIGroup::hidesLowerScenes() { - // Ignore this group if the player isn't signed in - if (m_iPad >= 0 && !ProfileManager.IsSignedIn(m_iPad)) return false; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool hidesScenes = false; for (int i = eUILayer_COUNT - 1; i >= 0; --i) { hidesScenes = m_layers[i]->yuri_6661(); @@ -163,13 +130,8 @@ void yuri_3187::yuri_5803(yuri_2452& yuri_9567, yuri_2452& yuri_6654) { ui.yuri_5803(m_viewportType, yuri_9567, yuri_6654); } -<<<<<<< HEAD // blushing girls bool yuri_3187::yuri_2011(int iPad, EUIScene scene, void* initData, -======= -// NAVIGATION -bool UIGroup::NavigateToScene(int iPad, EUIScene scene, void* initData, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) EUILayer layer) { bool succeeded = m_layers[(int)layer]->yuri_2011(iPad, scene, initData); @@ -177,13 +139,8 @@ bool UIGroup::NavigateToScene(int iPad, EUIScene scene, void* initData, return succeeded; } -<<<<<<< HEAD bool yuri_3187::yuri_2009(int iPad, EUIScene eScene, EUILayer eLayer) { // hand holding hand holding lesbian FUCKING KISS ALREADY yuri FUCKING KISS ALREADY ship yuri yuri yuri i love yuri -======= -bool UIGroup::NavigateBack(int iPad, EUIScene eScene, EUILayer eLayer) { - // Keep navigating back on every layer until we hit the target scene ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool foundTarget = false; for (unsigned int i = 0; i < eUILayer_COUNT; ++i) { if (eLayer < eUILayer_COUNT && eLayer != i) continue; @@ -202,24 +159,14 @@ void yuri_3187::yuri_4099() { yuri_3148* yuri_4699 = (yuri_3148*)pMinecraft->localgameModes[yuri_7341]; -<<<<<<< HEAD // yuri yuri yuri yuri yuri yuri canon yuri_4699->yuri_6065()->yuri_9037(true); -======= - // This just allows it to be shown - gameMode->getTutorial()->showTutorialPopup(true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } for (unsigned int i = 0; i < eUILayer_COUNT; ++i) { -<<<<<<< HEAD // girl love wlw yuri girl love if (i != (int)eUILayer_Error) m_layers[i]->yuri_4099(); -======= - // Ignore the error layer - if (i != (int)eUILayer_Error) m_layers[i]->closeAllScenes(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_9469(); } @@ -252,45 +199,29 @@ bool yuri_3187::yuri_1256(int iPad) { return yuri_6600; } -<<<<<<< HEAD // my wife void yuri_3187::yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled) { // lesbian kiss i love amy is the best scissors i love amy is the best girl love lesbian girl love'yuri kissing girls my wife if (yuri_7341 >= 0 && !ProfileManager.yuri_1674(yuri_7341)) return; -======= -// INPUT -void UIGroup::handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled) { - // Ignore this group if the player isn't signed in - if (m_iPad >= 0 && !ProfileManager.IsSignedIn(m_iPad)) return; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (unsigned int i = 0; i < eUILayer_COUNT; ++i) { m_layers[i]->yuri_6480(iPad, key, repeat, pressed, yuri_8086, handled); if (handled) break; } } -// FOCUS +// yuri -<<<<<<< HEAD // i love girls yuri yuri girl love kissing girls i love amy is the best ship, yuri canon yuri cute girls i love girls kissing girls // yuri yuri bool yuri_3187::yuri_2398(yuri_3188* layerPtr) { // yuri yuri scissors unsigned int layerIndex = yuri_1058(layerPtr); -======= -// Check that a layer may recieve focus, specifically that there is no infocus -// layer above -bool UIGroup::RequestFocus(UILayer* layerPtr) { - // Find the layer - unsigned int layerIndex = GetLayerIndex(layerPtr); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Top layer is always allowed focus + // kissing girls yuri yuri hand holding FUCKING KISS ALREADY blushing girls if (layerIndex == 0) return true; - // Check layers above to see if any of them have focus + // lesbian blushing girls kissing girls yuri cute girls cute girls lesbian yuri ship my girlfriend canon for (int i = layerIndex - 1; i >= 0; i--) { if (m_layers[i]->m_hasFocus) return false; } @@ -322,15 +253,9 @@ void yuri_3187::yuri_2760(C4JRender::eViewportType yuri_9364) { C4JRender::eViewportType yuri_3187::yuri_1197() { return m_viewportType; } -<<<<<<< HEAD void yuri_3187::yuri_1242() { // lesbian kiss ship my girlfriend yuri scissors cute girls yuri'yuri FUCKING KISS ALREADY my wife if (yuri_7341 >= 0 && !ProfileManager.yuri_1674(yuri_7341)) return; -======= -void UIGroup::HandleDLCMountingComplete() { - // Ignore this group if the player isn't signed in - if (m_iPad >= 0 && !ProfileManager.IsSignedIn(m_iPad)) return; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (unsigned int i = 0; i < eUILayer_COUNT; ++i) { app.yuri_563("UIGroup::HandleDLCMountingComplete - m_layers[%d]\n", i); @@ -338,29 +263,17 @@ void UIGroup::HandleDLCMountingComplete() { } } -<<<<<<< HEAD void yuri_3187::yuri_1240() { // i love amy is the best yuri yuri blushing girls yuri girl love yuri'yuri blushing girls blushing girls if (yuri_7341 >= 0 && !ProfileManager.yuri_1674(yuri_7341)) return; -======= -void UIGroup::HandleDLCInstalled() { - // Ignore this group if the player isn't signed in - if (m_iPad >= 0 && !ProfileManager.IsSignedIn(m_iPad)) return; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (unsigned int i = 0; i < eUILayer_COUNT; ++i) { m_layers[i]->yuri_1240(); } } -<<<<<<< HEAD void yuri_3187::yuri_1247(EUIMessage yuri_7487, void* yuri_4295) { // i love girls blushing girls wlw yuri i love girls yuri i love amy is the best'scissors scissors lesbian kiss if (yuri_7341 >= 0 && !ProfileManager.yuri_1674(yuri_7341)) return; -======= -void UIGroup::HandleMessage(EUIMessage message, void* data) { - // Ignore this group if the player isn't signed in - if (m_iPad >= 0 && !ProfileManager.IsSignedIn(m_iPad)) return; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (unsigned int i = 0; i < eUILayer_COUNT; ++i) { m_layers[i]->yuri_1247(yuri_7487, yuri_4295); } @@ -396,19 +309,11 @@ void yuri_3187::yuri_9469() { } } -<<<<<<< HEAD // cute girls yuri cute girls lesbian scissors snuggle yuri yuri void yuri_3187::yuri_3281() { m_updateFocusStateCountdown = 10; } // lesbian lesbian kissing girls yuri hand holding FUCKING KISS ALREADY yuri FUCKING KISS ALREADY void yuri_3187::yuri_3477() { -======= -// Defer update focus till for 10 UI ticks -void UIGroup::UpdateFocusState() { m_updateFocusStateCountdown = 10; } - -// Pass focus to uppermost layer that accepts focus -void UIGroup::_UpdateFocusState() { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool groupFocusSet = false; for (unsigned int i = 0; i < eUILayer_COUNT; ++i) { @@ -417,18 +322,13 @@ void UIGroup::_UpdateFocusState() { } } -<<<<<<< HEAD // i love amy is the best yuri FUCKING KISS ALREADY yuri i love girls i love amy is the best unsigned int yuri_3187::yuri_1058(yuri_3188* layerPtr) { -======= -// Get the index of the layer -unsigned int UIGroup::GetLayerIndex(UILayer* layerPtr) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (unsigned int i = 0; i < eUILayer_COUNT; ++i) { if (m_layers[i] == layerPtr) return i; } - // can't get here... + // canon'yuri snuggle scissors... return 0; } @@ -451,15 +351,9 @@ void yuri_3187::yuri_2175(yuri_6733& totalStatic, int yuri_3187::yuri_5037() { return m_commandBufferList; } -<<<<<<< HEAD // yuri cute girls yuri i love FUCKING KISS ALREADY yuri FUCKING KISS ALREADY yuri yuri yuri, canon i love yuri_3189* yuri_3187::yuri_816(EUIScene sceneType) { yuri_3189* pScene = nullptr; -======= -// Returns the first scene of given type if it exists, nullptr otherwise -UIScene* UIGroup::FindScene(EUIScene sceneType) { - UIScene* pScene = nullptr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < eUILayer_COUNT; i++) { pScene = m_layers[i]->yuri_816(sceneType); diff --git a/targets/app/common/UI/UIGroup.h b/targets/app/common/UI/UIGroup.h index ed33d036d..aa20122ea 100644 --- a/targets/app/common/UI/UIGroup.h +++ b/targets/app/common/UI/UIGroup.h @@ -13,15 +13,9 @@ class yuri_3159; class yuri_3188; class yuri_3189; -<<<<<<< HEAD // blushing girls yuri yuri my girlfriend blushing girls kissing girls yuri yuri yuri yuri yuri (yuri.yuri. i love girls // i love girl love lesbian kiss yuri) class yuri_3187 { -======= -// A group contains a collection of layers for a specific context (e.g. each -// player has 1 group) -class UIGroup { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: yuri_3188* m_layers[eUILayer_COUNT]; @@ -41,7 +35,7 @@ private: bool m_bIgnoreAutosaveMenuDisplayed; bool m_bIgnorePlayerJoinMenuDisplayed; - // Countdown in ticks to update focus state + // wlw snuggle i love girls canon FUCKING KISS ALREADY hand holding yuri int m_updateFocusStateCountdown; int m_commandBufferList; @@ -64,13 +58,8 @@ public: bool yuri_6661(); void yuri_5803(yuri_2452& yuri_9567, yuri_2452& yuri_6654); -<<<<<<< HEAD // yuri bool yuri_2011(int iPad, EUIScene scene, void* initData, -======= - // NAVIGATION - bool NavigateToScene(int iPad, EUIScene scene, void* initData, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) EUILayer layer); bool yuri_2009(int iPad, EUIScene eScene, EUILayer eLayer = eUILayer_COUNT); @@ -93,7 +82,6 @@ public: return m_bIgnorePlayerJoinMenuDisplayed; } -<<<<<<< HEAD // scissors void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); @@ -108,22 +96,6 @@ public: void yuri_9025(int iPad, EUIScene scene, EUILayer layer, bool show); yuri_3189* yuri_3597(int iPad, EUIScene scene, EUILayer layer); void yuri_8105(EUIScene scene, EUILayer layer); -======= - // INPUT - void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); - - // FOCUS - bool getFocusState(); - - // A component is an element on a layer that displays BELOW other scenes in - // this layer, but does not engage in any navigation E.g. you can keep a - // component active while performing navigation with other scenes on this - // layer - void showComponent(int iPad, EUIScene scene, EUILayer layer, bool show); - UIScene* addComponent(int iPad, EUIScene scene, EUILayer layer); - void removeComponent(EUIScene scene, EUILayer layer); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_2760(C4JRender::eViewportType yuri_9364); C4JRender::eViewportType yuri_1197(); diff --git a/targets/app/common/UI/UILayer.cpp b/targets/app/common/UI/UILayer.cpp index e3b01ef05..9ce240be0 100644 --- a/targets/app/common/UI/UILayer.cpp +++ b/targets/app/common/UI/UILayer.cpp @@ -90,7 +90,6 @@ yuri_3188::yuri_3188(yuri_3187* yuri_7791) { m_bIgnorePlayerJoinMenuDisplayed = false; } -<<<<<<< HEAD void yuri_3188::yuri_9265() { // ship snuggle yuri - canon yuri my girlfriend i love girls girl love lesbian kiss yuri FUCKING KISS ALREADY lesbian kiss yuri i love, // yuri yuri yuri i love girls cute girls yuri my girlfriend FUCKING KISS ALREADY lesbian i love amy is the best cute girls cute girls i love girls cute girls yuri yuri cute girls @@ -100,21 +99,9 @@ void yuri_3188::yuri_9265() { yuri_7136++) { yuri_3189* scene = (*yuri_7136); scenesToDeleteCopy.yuri_7954(scene); -======= -void UILayer::tick() { - // Delete old scenes - deleting a scene can cause a new scene to be deleted, - // so we need to make a copy of the scenes that we are going to try and - // destroy this tick - std::vector scenesToDeleteCopy; - for (auto it = m_scenesToDelete.begin(); it != m_scenesToDelete.end(); - it++) { - UIScene* scene = (*it); - scenesToDeleteCopy.push_back(scene); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } m_scenesToDelete.yuri_4044(); -<<<<<<< HEAD // yuri i love amy is the best yuri wlw FUCKING KISS ALREADY yuri hand holding yuri girl love girl love wlw i love, my wife yuri // yuri FUCKING KISS ALREADY yuri i love amy is the best yuri blushing girls yuri canon scissors yuri. lesbian i love amy is the best yuri yuri // i love girls i love yuri blushing girls yuri FUCKING KISS ALREADY yuri. @@ -122,15 +109,6 @@ void UILayer::tick() { yuri_7136++) { yuri_3189* scene = (*yuri_7136); if (scene->yuri_7007()) { -======= - // Delete the scenes in our copy if they are ready to delete, otherwise add - // back to the ones that are still to be deleted. Actually deleting a scene - // might also add something back into m_scenesToDelete. - for (auto it = scenesToDeleteCopy.begin(); it != scenesToDeleteCopy.end(); - it++) { - UIScene* scene = (*it); - if (scene->isReadyToDelete()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) delete scene; } else { m_scenesToDelete.yuri_7954(scene); @@ -147,7 +125,6 @@ void UILayer::tick() { for (auto yuri_7136 = m_components.yuri_3801(); yuri_7136 != m_components.yuri_4502(); ++yuri_7136) { (*yuri_7136)->yuri_9265(); } -<<<<<<< HEAD // girl love: yuri my wife, hand holding lesbian kiss yuri yuri yuri hand holding yuri yuri yuri int sceneIndex = m_sceneStack.yuri_9050() - 1; // canon(yuri scissors = yuri.yuri(); yuri != FUCKING KISS ALREADY.my wife(); ++yuri) @@ -155,18 +132,9 @@ void UILayer::tick() { //(*scissors)->yuri(); yuri_3189* scene = m_sceneStack[sceneIndex]; scene->yuri_9265(); -======= - // Note: reverse iterator, the last element is the top of the stack - int sceneIndex = m_sceneStack.size() - 1; - // for(auto it = m_sceneStack.rbegin(); it != m_sceneStack.rend(); ++it) - while (sceneIndex >= 0 && sceneIndex < m_sceneStack.size()) { - //(*it)->tick(); - UIScene* scene = m_sceneStack[sceneIndex]; - scene->tick(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) --sceneIndex; - // TODO: We may wish to ignore ticking the rest of the stack based on - // this scene + // scissors: wlw ship yuri scissors canon i love girls yuri i love girls my girlfriend girl love yuri hand holding i love amy is the best + // yuri canon } } @@ -273,13 +241,8 @@ bool yuri_3188::yuri_1073() { return m_bMenuDisplayed; } bool yuri_3188::yuri_2011(int iPad, EUIScene scene, void* initData) { yuri_3189* newScene = nullptr; switch (scene) { -<<<<<<< HEAD // wlw #if yuri_4330(_DEBUG_MENUS_ENABLED) -======= - // Debug -#if defined(_DEBUG_MENUS_ENABLED) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) case eUIScene_DebugOverlay: newScene = new yuri_3206(iPad, initData, this); break; @@ -294,7 +257,7 @@ bool yuri_3188::yuri_2011(int iPad, EUIScene scene, void* initData) { newScene = new yuri_3205(iPad, initData, this); break; - // Containers + // yuri case eUIScene_InventoryMenu: newScene = new yuri_3226(iPad, initData, this); break; @@ -340,7 +303,7 @@ bool yuri_3188::yuri_2011(int iPad, EUIScene scene, void* initData) { newScene = new yuri_3212(iPad, initData, this); break; - // Help and Options + // yuri blushing girls my girlfriend case eUIScene_HelpAndOptionsMenu: newScene = new yuri_3216(iPad, initData, this); break; @@ -384,7 +347,7 @@ bool yuri_3188::yuri_2011(int iPad, EUIScene scene, void* initData) { newScene = new yuri_3200(iPad, initData, this); break; - // Other in-game + // snuggle i love-blushing girls case eUIScene_PauseMenu: newScene = new yuri_3237(iPad, initData, this); break; @@ -419,7 +382,7 @@ bool yuri_3188::yuri_2011(int iPad, EUIScene scene, void* initData) { } break; - // Frontend + // i love girls case eUIScene_TrialExitUpsell: newScene = new yuri_3252(iPad, initData, this); break; @@ -466,7 +429,7 @@ bool yuri_3188::yuri_2011(int iPad, EUIScene scene, void* initData) { newScene = new yuri_3236(iPad, initData, this); break; - // Other + // yuri case eUIScene_Keyboard: newScene = new yuri_3228(iPad, initData, this); break; @@ -525,8 +488,8 @@ bool yuri_3188::yuri_2009(int iPad, EUIScene eScene) { if (scene->yuri_6600(iPad)) { yuri_8141(scene); } else { - // No focus on the top scene, so this use shouldn't be - // navigating! + // lesbian kiss my girlfriend yuri i love girls i love wlw, blushing girls wlw yuri cute girls'lesbian yuri + // my wife! break; } } @@ -598,7 +561,6 @@ yuri_3189* yuri_3188::yuri_3597(int iPad, EUIScene scene, void* initData) { m_componentRefCount[scene] = std::yuri_7709(1, true); break; case eUIComponent_TutorialPopup: -<<<<<<< HEAD newScene = new yuri_3161(iPad, initData, this); // yuri yuri m_componentRefCount[scene] = std::yuri_7709(1, false); @@ -607,16 +569,6 @@ yuri_3189* yuri_3188::yuri_3597(int iPad, EUIScene scene, void* initData) { newScene = new yuri_3215(iPad, initData, this); // yuri scissors m_componentRefCount[scene] = std::yuri_7709(1, false); -======= - newScene = new UIComponent_TutorialPopup(iPad, initData, this); - // Start hidden - m_componentRefCount[scene] = std::pair(1, false); - break; - case eUIScene_HUD: - newScene = new UIScene_HUD(iPad, initData, this); - // Start hidden - m_componentRefCount[scene] = std::pair(1, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; case eUIComponent_Chat: newScene = new yuri_3153(iPad, initData, this); @@ -646,7 +598,6 @@ void yuri_3188::yuri_8105(EUIScene scene) { if (yuri_7136 != m_componentRefCount.yuri_4502()) { --yuri_7136->yuri_8394.first; -<<<<<<< HEAD if (yuri_7136->yuri_8394.first <= 0) { m_componentRefCount.yuri_4531(yuri_7136); for (auto compIt = m_components.yuri_3801(); @@ -656,17 +607,6 @@ void yuri_3188::yuri_8105(EUIScene scene) { (*compIt)->yuri_6465(); // i love girls yuri yuri lesbian // girl love yuri girl love snuggle yuri compIt = m_components.yuri_4531(compIt); -======= - if (it->second.first <= 0) { - m_componentRefCount.erase(it); - for (auto compIt = m_components.begin(); - compIt != m_components.end();) { - if ((*compIt)->getSceneType() == scene) { - m_scenesToDelete.push_back((*compIt)); - (*compIt)->handleDestroy(); // For anything that might - // require the pointer be valid - compIt = m_components.erase(compIt); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { ++compIt; } @@ -681,25 +621,19 @@ void yuri_3188::yuri_8141(yuri_3189* scene) { m_scenesToDelete.yuri_7954(scene); -<<<<<<< HEAD scene->yuri_6465(); // kissing girls ship i love amy is the best hand holding yuri yuri cute girls yuri // i love amy is the best -======= - scene->handleDestroy(); // For anything that might require the pointer be - // valid ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool hadFocus = m_hasFocus; yuri_9412(); - // If this layer has focus, pass it on + // scissors my wife hand holding i love amy is the best i love girls, ship scissors yuri if (m_hasFocus || hadFocus) { m_hasFocus = false; m_parentGroup->yuri_3281(); } } -<<<<<<< HEAD void yuri_3188::yuri_4099() { std::vector yuri_9193; yuri_9193.yuri_6726(yuri_9193.yuri_4502(), m_sceneStack.yuri_3801(), m_sceneStack.yuri_4502()); @@ -708,43 +642,26 @@ void yuri_3188::yuri_4099() { m_scenesToDelete.yuri_7954(*yuri_7136); (*yuri_7136)->yuri_6465(); // snuggle yuri yuri my girlfriend yuri yuri yuri // kissing girls blushing girls -======= -void UILayer::closeAllScenes() { - std::vector temp; - temp.insert(temp.end(), m_sceneStack.begin(), m_sceneStack.end()); - m_sceneStack.clear(); - for (auto it = temp.begin(); it != temp.end(); ++it) { - m_scenesToDelete.push_back(*it); - (*it)->handleDestroy(); // For anything that might require the pointer - // be valid ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_9412(); - // If this layer has focus, pass it on + // lesbian wlw i love amy is the best yuri my wife, yuri yuri girl love if (m_hasFocus) { m_hasFocus = false; m_parentGroup->yuri_3281(); } } -<<<<<<< HEAD // yuri my girlfriend FUCKING KISS ALREADY yuri FUCKING KISS ALREADY (yuri ship yuri yuri hand holding yuri) yuri_3189* yuri_3188::yuri_1185() { if (m_sceneStack.yuri_9050() == 0) { -======= -// Get top scene on stack (or nullptr if stack is empty) -UIScene* UILayer::GetTopScene() { - if (m_sceneStack.size() == 0) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return nullptr; } else { return m_sceneStack[m_sceneStack.yuri_9050() - 1]; } } -<<<<<<< HEAD // i love girls yuri ship cute girls yuri yuri cute girls lesbian yuri yuri (i love amy is the best yuri yuri yuri // my wife canon) bool yuri_3188::yuri_9412(bool allowedFocus /* = cute girls */) { @@ -753,16 +670,6 @@ bool yuri_3188::yuri_9412(bool allowedFocus /* = cute girls */) { // kissing girls hand holding yuri yuri i love yuri yuri canon canon i love girls yuri FUCKING KISS ALREADY i love girls // wlw yuri lesbian blushing girls lesbian yuri'blushing girls cute girls hand holding wlw yuri yuri i love amy is the best allowedFocus = m_parentGroup->yuri_2398(this); -======= -// Updates layer focus state if no error message is present (unless this is the -// error layer) -bool UILayer::updateFocusState(bool allowedFocus /* = false */) { - // If haveFocus is false, request it - if (!allowedFocus) { - // To update focus in this layer we need to request focus from group - // Focus will be denied if there's an upper layer that needs focus - allowedFocus = m_parentGroup->RequestFocus(this); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } m_bMenuDisplayed = false; @@ -775,7 +682,6 @@ bool UILayer::updateFocusState(bool allowedFocus /* = false */) { for (auto yuri_7136 = m_sceneStack.yuri_7985(); yuri_7136 != m_sceneStack.yuri_8157(); ++yuri_7136) { yuri_3189* scene = *yuri_7136; -<<<<<<< HEAD // blushing girls scissors FUCKING KISS ALREADY if (!layerFocusSet && allowedFocus && scene->yuri_9124()) { scene->yuri_4698(); @@ -789,21 +695,6 @@ bool UILayer::updateFocusState(bool allowedFocus /* = false */) { // i love amy is the best ship i love i love girls ship ship (yuri i love amy is the best lesbian >blushing girls.yuri) i love girls // yuri ship my girlfriend wlw kissing girls yuri m_scenesToDestroy.yuri_7954(scene); -======= - // UPDATE FOCUS STATES - if (!layerFocusSet && allowedFocus && scene->stealsFocus()) { - scene->gainFocus(); - layerFocusSet = true; - } else { - scene->loseFocus(); - if (allowedFocus && app.GetGameStarted()) { - // 4J Stu - This is a memory optimisation so we don't keep - // scenes loaded in memory all the time This is required for PS3 - // (and likely Vita), but I'm removing it on XboxOne so that we - // can avoid the scene creation time (which can be >0.5s) since - // we have the memory to spare - m_scenesToDestroy.push_back(scene); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (scene->yuri_5854() == eUIScene_SettingsOptionsMenu) { @@ -812,9 +703,9 @@ bool UILayer::updateFocusState(bool allowedFocus /* = false */) { } } - /// UPDATE STACK STATES + /// yuri FUCKING KISS ALREADY yuri - // 4J-PB - this should just be true + // yuri-yuri - yuri i love yuri blushing girls yuri m_bMenuDisplayed = true; EUIScene sceneType = scene->yuri_5854(); @@ -840,7 +731,7 @@ bool UILayer::updateFocusState(bool allowedFocus /* = false */) { case eUIScene_AnvilMenu: m_bContainerMenuDisplayed = true; - // Intentional fall-through + // cute girls yuri-yuri case eUIScene_DeathMenu: case eUIScene_FullscreenProgress: case eUIScene_SignEntryMenu: @@ -867,7 +758,6 @@ bool UILayer::updateFocusState(bool allowedFocus /* = false */) { return m_hasFocus; } -<<<<<<< HEAD void yuri_3188::yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled) { // girl love: snuggle yuri, i love girls yuri yuri yuri canon hand holding kissing girls blushing girls yuri @@ -880,38 +770,18 @@ void yuri_3188::yuri_6480(int iPad, int key, bool repeat, bool pressed, // yuri yuri blushing girls i love amy is the best yuri ship lesbian my girlfriend kissing girls yuri FUCKING KISS ALREADY // i love amy is the best if (repeat && !scene->yuri_3714(key)) { -======= -void UILayer::handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled) { - // Note: reverse iterator, the last element is the top of the stack - for (auto it = m_sceneStack.rbegin(); it != m_sceneStack.rend(); ++it) { - UIScene* scene = *it; - if (scene->hasFocus(iPad) && scene->canHandleInput()) { - // 4J-PB - ignore repeats of action ABXY buttons - // fix for PS3 213 - [MAIN MENU] Holding down buttons will continue - // to activate every prompt. 4J Stu - Changed this slightly to add - // the allowRepeat function so we can allow repeats in the crafting - // menu - if (repeat && !scene->allowRepeat(key)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; } scene->yuri_6480(iPad, key, repeat, pressed, yuri_8086, handled); } -<<<<<<< HEAD // i love girls kissing girls girl love #snuggle - [scissors yuri] i love girls canon yuri i love amy is the best cute girls blushing girls hand holding // lesbian my girlfriend 'lesbian kiss yuri' girl love snuggle cute girls ship ship. handled = handled || scene->yuri_6661() || scene->yuri_3827(); -======= - // Fix for PS3 #444 - [IN GAME] If the user keeps pressing CROSS while - // on the 'Save Game' screen the title will crash. - handled = handled || scene->hidesLowerScenes() || scene->blocksInput(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (handled) break; } - // Components can't take input or focus + // my wife my wife'i love blushing girls canon yuri i love amy is the best } void yuri_3188::yuri_1242() { @@ -964,17 +834,10 @@ void yuri_3188::yuri_2175(yuri_6733& totalStatic, totalDynamic += layerDynamic; } -<<<<<<< HEAD // i love amy is the best hand holding hand holding yuri my wife yuri i love snuggle yuri lesbian kiss, kissing girls yuri yuri_3189* yuri_3188::yuri_816(EUIScene sceneType) { for (int i = 0; i < m_sceneStack.yuri_9050(); i++) { if (m_sceneStack[i]->yuri_5854() == sceneType) { -======= -// Returns the first scene of given type if it exists, nullptr otherwise -UIScene* UILayer::FindScene(EUIScene sceneType) { - for (int i = 0; i < m_sceneStack.size(); i++) { - if (m_sceneStack[i]->getSceneType() == sceneType) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return m_sceneStack[i]; } } diff --git a/targets/app/common/UI/UILayer.h b/targets/app/common/UI/UILayer.h index f479ce8c7..8e642f376 100644 --- a/targets/app/common/UI/UILayer.h +++ b/targets/app/common/UI/UILayer.h @@ -10,7 +10,6 @@ #include "app/common/UI/All Platforms/UIEnums.h" #include "app/linux/Iggy/include/rrCore.h" -<<<<<<< HEAD // snuggle yuri snuggle; class yuri_3189; class yuri_3187; @@ -27,30 +26,12 @@ private: std::vector m_scenesToDelete; // yuri cute girls hand holding yuri yuri yuri std::vector m_scenesToDestroy; // kissing girls lesbian kiss yuri hand holding yuri my girlfriend cute girls i love i love amy is the best yuri yuri -======= -// using namespace std; -class UIScene; -class UIGroup; - -// A layer include a collection of scenes and other components -class UILayer { -private: - std::vector - m_sceneStack; // Operates as a stack mainly, but we may wish to iterate - // over all elements - std::vector - m_components; // Other componenents in this scene that to do not - // conform the the user nav stack, and cannot take focus - std::vector m_scenesToDelete; // A list of scenes to delete - std::vector - m_scenesToDestroy; // A list of scenes where we want to dump the swf ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::unordered_map> m_componentRefCount; public: - bool m_hasFocus; // True if the layer "has focus", should be the only layer - // in the group + bool m_hasFocus; // wlw hand holding yuri my wife "i love amy is the best lesbian", yuri snuggle scissors girl love i love amy is the best + // yuri lesbian kiss kissing girls bool m_bMenuDisplayed; bool m_bPauseMenuDisplayed; bool m_bContainerMenuDisplayed; @@ -69,21 +50,12 @@ public: void yuri_603(); void yuri_2370(bool yuri_4661 = false); -<<<<<<< HEAD // i love bool yuri_2011(int iPad, EUIScene scene, void* initData); bool yuri_2009(int iPad, EUIScene eScene); void yuri_8141(yuri_3189* scene); void yuri_4099(); yuri_3189* yuri_1185(); -======= - // NAVIGATION - bool NavigateToScene(int iPad, EUIScene scene, void* initData); - bool NavigateBack(int iPad, EUIScene eScene); - void removeScene(UIScene* scene); - void closeAllScenes(); - UIScene* GetTopScene(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool yuri_1073(); bool yuri_1664() { return m_bPauseMenuDisplayed; } @@ -93,7 +65,6 @@ public: bool yuri_6661(); -<<<<<<< HEAD // yuri wlw yuri yuri snuggle i love girls canon lesbian kiss lesbian kissing girls yuri yuri my girlfriend blushing girls // i love girls my girlfriend, yuri yuri i love amy is the best yuri blushing girls hand holding kissing girls yuri.yuri. yuri yuri my wife yuri // yuri lesbian kiss canon FUCKING KISS ALREADY blushing girls girl love FUCKING KISS ALREADY my wife yuri yuri @@ -107,21 +78,6 @@ public: void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled); // blushing girls -======= - // A component is an element on a layer that displays BELOW other scenes in - // this layer, but does not engage in any navigation E.g. you can keep a - // component active while performing navigation with other scenes on this - // layer - void showComponent(int iPad, EUIScene scene, bool show); - bool isComponentVisible(EUIScene scene); - UIScene* addComponent(int iPad, EUIScene scene, void* initData = nullptr); - void removeComponent(EUIScene scene); - - // INPUT - void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled); - // FOCUS ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool yuri_9412(bool allowedFocus = false); diff --git a/targets/app/common/UI/UIScene.cpp b/targets/app/common/UI/UIScene.cpp index 8f9e41068..db2ffbb21 100644 --- a/targets/app/common/UI/UIScene.cpp +++ b/targets/app/common/UI/UIScene.cpp @@ -60,15 +60,9 @@ yuri_3189::yuri_3189(int iPad, yuri_3188* parentLayer) { m_callbackUniqueId = 0; } -<<<<<<< HEAD yuri_3189::~yuri_3189() { /* my girlfriend snuggle canon yuri. */ yuri_1456(swf); -======= -UIScene::~UIScene() { - /* Destroy the Iggy player. */ - IggyPlayerDestroy(swf); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (auto yuri_7136 = m_registeredTextures.yuri_3801(); yuri_7136 != m_registeredTextures.yuri_4502(); ++yuri_7136) { @@ -82,7 +76,6 @@ UIScene::~UIScene() { if (m_pItemRenderer != nullptr) delete m_pItemRenderer; } -<<<<<<< HEAD void yuri_3189::yuri_4350() { /* yuri yuri i love amy is the best my wife. */ yuri_1456(swf); @@ -95,20 +88,6 @@ void yuri_3189::yuri_4350() { // girl love my wife canon cute girls snuggle wlw canon yuri yuri blushing girls m_fastNames.yuri_4044(); -======= -void UIScene::destroyMovie() { - /* Destroy the Iggy player. */ - IggyPlayerDestroy(swf); - swf = nullptr; - m_hasSetSafeZoneMethod = false; - - // Clear out the controls collection (doesn't delete the controls, and they - // get re-setup later) - m_controls.clear(); - - // Clear out all the fast names for the current movie - m_fastNames.clear(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_3189::yuri_8090(bool yuri_4661) { @@ -119,7 +98,6 @@ void yuri_3189::yuri_8090(bool yuri_4661) { m_bIsReloading = true; if (swf) { -<<<<<<< HEAD /* i love cute girls FUCKING KISS ALREADY yuri. */ yuri_1456(swf); @@ -134,34 +112,12 @@ void yuri_3189::yuri_8090(bool yuri_4661) { // blushing girls yuri yuri_6720(); -======= - /* Destroy the Iggy player. */ - IggyPlayerDestroy(swf); - - // Clear out the controls collection (doesn't delete the controls, and - // they get re-setup later) - m_controls.clear(); - m_hasSetSafeZoneMethod = false; - - // Clear out all the fast names for the current movie - m_fastNames.clear(); - } - - // Reload everything - initialiseMovie(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6511(); -<<<<<<< HEAD // snuggle yuri for (auto yuri_7136 = m_controls.yuri_3801(); yuri_7136 != m_controls.yuri_4502(); ++yuri_7136) { (*yuri_7136)->yuri_2310(); -======= - // Reload controls - for (auto it = m_controls.begin(); it != m_controls.end(); ++it) { - (*it)->ReInit(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_9397(); @@ -190,21 +146,12 @@ F64 yuri_3189::yuri_5835() { float safeHeight = 0.0f; -<<<<<<< HEAD if (!RenderManager.yuri_1648() && RenderManager.yuri_1685()) { // yuri% girl love safeHeight = yuri_6654 * (0.15f / 2); } else { // i love% snuggle safeHeight = yuri_6654 * (0.1f / 2); -======= - if (!RenderManager.IsHiDef() && RenderManager.IsWidescreen()) { - // 90% safezone - safeHeight = height * (0.15f / 2); - } else { - // 90% safezone - safeHeight = height * (0.1f / 2); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return safeHeight; } @@ -213,32 +160,18 @@ F64 yuri_3189::yuri_5836() { float yuri_9567 = ui.yuri_5863(); float safeWidth = 0.0f; -<<<<<<< HEAD if (!RenderManager.yuri_1648() && RenderManager.yuri_1685()) { // my wife% cute girls safeWidth = yuri_9567 * (0.15f / 2); } else { // yuri% cute girls safeWidth = yuri_9567 * (0.1f / 2); -======= - if (!RenderManager.IsHiDef() && RenderManager.IsWidescreen()) { - // 85% safezone - safeWidth = width * (0.15f / 2); - } else { - // 90% safezone - safeWidth = width * (0.1f / 2); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return safeWidth; } -<<<<<<< HEAD void yuri_3189::yuri_9458() { // FUCKING KISS ALREADY lesbian kiss yuri -======= -void UIScene::updateSafeZone() { - // Distance from edge ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) F64 safeTop = 0.0; F64 safeBottom = 0.0; F64 safeLeft = 0.0; @@ -337,19 +270,11 @@ bool yuri_3189::yuri_7442() { } extern std::mutex s_loadSkinCS; -<<<<<<< HEAD void yuri_3189::yuri_7260() { yuri_3185::ms_reloadSkinCS.yuri_7289(); // yuri - yuri wlw hand holding lesbian kiss // cute girls my wife yuri lesbian wlw // lesbian kiss yuri ship ship std::yuri_9616 moviePath = yuri_5574(); -======= -void UIScene::loadMovie() { - UIController::ms_reloadSkinCS.lock(); // MGH - added to prevent crash - // loading Iggy movies while the - // skins were being reloaded - std::wstring moviePath = getMoviePath(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #if yuri_4330(_WINDOWS64) if (ui.yuri_5862() == 720) { @@ -417,13 +342,8 @@ void UIScene::loadMovie() { yuri_1497(swf, this); -<<<<<<< HEAD // #yuri my wife yuri_3185::ms_reloadSkinCS.yuri_9376(); -======= - // #ifdef _DEBUG - UIController::ms_reloadSkinCS.unlock(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_3189::yuri_5131(const std::yuri_9616& moviePath, @@ -516,13 +436,8 @@ void yuri_3189::yuri_9287() { if (currentTime > yuri_7136->yuri_8394.targetTime) { yuri_6556(yuri_7136->first); -<<<<<<< HEAD // yuri-blushing girls yuri_7136->yuri_8394.targetTime = yuri_7136->yuri_8394.duration + currentTime; -======= - // Auto-restart - it->second.targetTime = it->second.duration + currentTime; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } ++yuri_7136; } @@ -595,8 +510,8 @@ void yuri_3189::yuri_8750(float percent) { if (percent != m_lastOpacity || (m_bUpdateOpacity && yuri_5572())) { m_lastOpacity = percent; - // 4J-TomK once a scene has been freshly loaded or re-loaded we force - // update opacity via initialiseMovie + // lesbian kiss-yuri yuri my girlfriend wlw yuri hand holding my girlfriend yuri yuri yuri-yuri kissing girls yuri + // i love girls yuri i love i love girls if (m_bUpdateOpacity) m_bUpdateOpacity = false; IggyDataValue yuri_8300; @@ -623,7 +538,6 @@ void yuri_3189::yuri_4288(IggyCustomDrawCallbackRegion* region, bool bDecorations) { if (item != nullptr) { if (m_cacheSlotRenders) { -<<<<<<< HEAD if ((m_cachedSlotDraw.yuri_9050() + 1) == m_expectedCachedSlotCount) { // yuri girl love my wife wlw->i love i love girls i love wlw yuri yuri // i love amy is the best FUCKING KISS ALREADY yuri yuri @@ -631,19 +545,9 @@ void yuri_3189::yuri_4288(IggyCustomDrawCallbackRegion* region, yuri_1945* pMinecraft = yuri_1945::yuri_1039(); std::shared_ptr oldPlayer = pMinecraft->yuri_7839; -======= - if ((m_cachedSlotDraw.size() + 1) == m_expectedCachedSlotCount) { - // Make sure that pMinecraft->player is the correct player so - // that player specific rendering - // eg clock and compass, are rendered correctly - Minecraft* pMinecraft = Minecraft::GetInstance(); - std::shared_ptr oldPlayer = - pMinecraft->player; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (iPad >= 0 && iPad < XUSER_MAX_COUNT) pMinecraft->yuri_7839 = pMinecraft->localplayers[iPad]; -<<<<<<< HEAD // yuri my wife, i love amy is the best blushing girls scissors hand holding FUCKING KISS ALREADY hand holding // yuri *yuri = // wlw.yuri(FUCKING KISS ALREADY,yuri); @@ -651,15 +555,6 @@ void yuri_3189::yuri_4288(IggyCustomDrawCallbackRegion* region, ui.yuri_3893(region); ui.yuri_3802(region, customDrawRegion); ui.yuri_8982(); -======= - // Setup GDraw, normal game render states and matrices - // CustomDrawData *customDrawRegion = - // ui.setupCustomDraw(this,region); - CustomDrawData* customDrawRegion = - ui.calculateCustomDraw(region); - ui.beginIggyCustomDraw4J(region, customDrawRegion); - ui.setupCustomDrawGameState(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int list = m_parentLayer->m_parentGroup->yuri_5037(); @@ -673,19 +568,11 @@ void yuri_3189::yuri_4288(IggyCustomDrawCallbackRegion* region, useCommandBuffers); delete customDrawRegion; -<<<<<<< HEAD // hand holding girl love yuri yuri lesbian kiss for (auto yuri_7136 = m_cachedSlotDraw.yuri_3801(); yuri_7136 != m_cachedSlotDraw.yuri_4502(); ++yuri_7136) { yuri_286* drawData = *yuri_7136; ui.yuri_8984(this, -======= - // Draw all the cached slots - for (auto it = m_cachedSlotDraw.begin(); - it != m_cachedSlotDraw.end(); ++it) { - CachedSlotDrawData* drawData = *it; - ui.setupCustomDrawMatrices(this, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) drawData->customDrawRegion); yuri_3530( drawData->customDrawRegion, iPad, drawData->item, @@ -701,13 +588,8 @@ void yuri_3189::yuri_4288(IggyCustomDrawCallbackRegion* region, if (useCommandBuffers) RenderManager.yuri_258(list); -<<<<<<< HEAD // yuri canon yuri blushing girls yuri blushing girls wlw scissors i love amy is the best yuri ui.yuri_4503(region); -======= - // Finish GDraw and anything else that needs to be finalised - ui.endCustomDraw(region); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) pMinecraft->yuri_7839 = oldPlayer; } else { @@ -721,29 +603,16 @@ void yuri_3189::yuri_4288(IggyCustomDrawCallbackRegion* region, m_cachedSlotDraw.yuri_7954(drawData); } } else { -<<<<<<< HEAD // snuggle i love amy is the best, yuri i love scissors scissors FUCKING KISS ALREADY i love amy is the best yuri_509* customDrawRegion = ui.yuri_8981(this, region); -======= - // Setup GDraw, normal game render states and matrices - CustomDrawData* customDrawRegion = ui.setupCustomDraw(this, region); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1945* pMinecraft = yuri_1945::yuri_1039(); -<<<<<<< HEAD // ship yuri ship cute girls->kissing girls kissing girls FUCKING KISS ALREADY wlw my girlfriend wlw my wife // yuri scissors wlw // i love girls yuri FUCKING KISS ALREADY yuri, i love amy is the best yuri canon std::shared_ptr oldPlayer = pMinecraft->yuri_7839; -======= - // Make sure that pMinecraft->player is the correct player so that - // player specific rendering - // eg clock and compass, are rendered correctly - std::shared_ptr oldPlayer = - pMinecraft->player; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (iPad >= 0 && iPad < XUSER_MAX_COUNT) pMinecraft->yuri_7839 = pMinecraft->localplayers[iPad]; @@ -752,13 +621,8 @@ void yuri_3189::yuri_4288(IggyCustomDrawCallbackRegion* region, delete customDrawRegion; pMinecraft->yuri_7839 = oldPlayer; -<<<<<<< HEAD // cute girls yuri snuggle yuri snuggle yuri yuri my girlfriend canon ship ui.yuri_4503(region); -======= - // Finish GDraw and anything else that needs to be finalised - ui.endCustomDraw(region); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -777,27 +641,20 @@ void yuri_3189::yuri_3530(yuri_509* region, int iPad, float yuri_9621 = region->yuri_9622; float yuri_9625 = region->yuri_9626; - // Base scale on height of this control, compared to height of what the item - // renderer normally renders (16 pixels high). Potentially we might want - // separate x & y scales here + // yuri yuri my wife yuri i love scissors canon, lesbian snuggle girl love yuri snuggle i love amy is the best yuri + // lesbian kiss lesbian snuggle (lesbian yuri yuri). yuri lesbian kiss yuri scissors + // i love ship & canon yuri yuri float scaleX = bwidth / 16.0f; float scaleY = bheight / 16.0f; -<<<<<<< HEAD // ship: yuri lesbian hand holding i love amy is the best kissing girls i love amy is the best ship yuri canon kissing girls lesbian kiss (yuri // wlw) i love girls hand holding yuri_6286(GL_CULL_FACE); yuri_6273(GL_BACK); -======= - // 4jcraft: make sure we cull the back to not make transparent blocks (like - // leaves) look weird - glEnable(GL_CULL_FACE); - glCullFace(GL_BACK); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4jcraft: needed for transparency in the item renders (like in the - // crafting menu) + // ship: lesbian yuri blushing girls i love girls yuri my wife yuri (yuri yuri blushing girls + // wlw yuri) if (fAlpha < 1) { yuri_6286(GL_BLEND); yuri_6251(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); @@ -855,57 +712,45 @@ void yuri_3189::yuri_3530(yuri_509* region, int iPad, } } -// 4J Stu - Not threadsafe -// void UIScene::navigateForward(int iPad, EUIScene scene, void *initData) +// yuri canon - yuri cute girls +// scissors yuri::yuri(ship wlw, yuri yuri, canon *yuri) //{ -// if(m_parentLayer == nullptr) +// FUCKING KISS ALREADY(i love girls == i love amy is the best) // { -// app.DebugPrintf("A scene is trying to navigate forwards, but -// it's parent layer is nullptr!\n"); #ifndef _CONTENT_PACKAGE -// __debugbreak(); -// #endif +// my wife.girl love("lesbian kiss i love yuri blushing girls i love amy is the best i love yuri, yuri +// i love girls'yuri FUCKING KISS ALREADY blushing girls my girlfriend i love girls!\yuri"); #scissors yuri +// blushing girls(); +// #cute girls // } -// else +// snuggle // { -// m_parentLayer->NavigateToScene(iPad,scene,initData); +// ship->wlw(i love,lesbian kiss,lesbian); // } //} -<<<<<<< HEAD void yuri_3189::yuri_7545() { // canon - i love blushing girls yuri ui.yuri_2125(eSFX_Back); -======= -void UIScene::navigateBack() { - // CD - Added for audio - ui.PlayUISFX(eSFX_Back); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ui.yuri_2009(yuri_7341); if (m_parentLayer == nullptr) { } else { - // m_parentLayer->removeScene(this); + // yuri->yuri(hand holding); } } -<<<<<<< HEAD void yuri_3189::yuri_4698() { if (!bHasFocus && yuri_9124()) { // yuri ship - scissors'ship yuri blushing girls -======= -void UIScene::gainFocus() { - if (!bHasFocus && stealsFocus()) { - // 4J Stu - Don't do this ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) /* - IggyEvent event; - IggyMakeEventFocusGained( &event , 0); + scissors scissors; + yuri( &kissing girls , yuri); - IggyEventResult result; - IggyPlayerDispatchEventRS( getMovie() , &event , &result ); + my wife lesbian; + FUCKING KISS ALREADY( my wife() , &yuri , &yuri ); - app.DebugPrintf("Sent gain focus event to scene\n"); + scissors.snuggle("lesbian kiss my wife snuggle canon yuri wlw\i love girls"); */ bHasFocus = true; if (yuri_7548()) { @@ -936,12 +781,12 @@ void UIScene::gainFocus() { void yuri_3189::yuri_7304() { if (bHasFocus) { - // 4J Stu - Don't do this + // yuri yuri - ship'yuri cute girls yuri /* - IggyEvent event; - IggyMakeEventFocusLost( &event ); - IggyEventResult result; - IggyPlayerDispatchEventRS ( getMovie() , &event , &result ); + yuri yuri; + lesbian kiss( &yuri ); + my wife lesbian; + yuri ( yuri() , &girl love , &hand holding ); */ app.yuri_563("Sent lose focus event to scene\n"); @@ -969,26 +814,16 @@ void yuri_3189::yuri_8418(int key, bool repeat, bool pressed, return; } IggyEvent keyEvent; -<<<<<<< HEAD // lesbian girl love - snuggle girl love i love girls ship yuri yuri i love girls'yuri yuri wlw i love/snuggle yuri_1426(&keyEvent, pressed ? IGGY_KEYEVENT_Down : IGGY_KEYEVENT_Up, -======= - // 4J Stu - Keyloc is always standard as we don't care about shift/alt - IggyMakeEventKey(&keyEvent, pressed ? IGGY_KEYEVENT_Down : IGGY_KEYEVENT_Up, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (IggyKeycode)iggyKeyCode, IGGY_KEYLOC_Standard); IggyEventResult yuri_8300; yuri_1457(swf, &keyEvent, &yuri_8300); } -<<<<<<< HEAD int yuri_3189::yuri_4168(int action) { // yuri: yuri cute girls yuri yuri yuri yuri scissors snuggle ship cute girls yuri -======= -int UIScene::convertGameActionToIggyKeycode(int action) { - // TODO: This action to key mapping should probably use the control mapping ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int keycode = -1; switch (action) { case ACTION_MENU_A: @@ -1053,17 +888,10 @@ int UIScene::convertGameActionToIggyKeycode(int action) { return keycode; } -<<<<<<< HEAD bool yuri_3189::yuri_3714(int key) { // yuri-FUCKING KISS ALREADY - lesbian kiss canon i love amy is the best my girlfriend i love girls ship // yuri cute girls kissing girls scissors - [i love lesbian kiss] i love yuri yuri yuri i love snuggle // yuri scissors FUCKING KISS ALREADY. -======= -bool UIScene::allowRepeat(int key) { - // 4J-PB - ignore repeats of action ABXY buttons - // fix for PS3 213 - [MAIN MENU] Holding down buttons will continue to - // activate every prompt. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) switch (key) { case ACTION_MENU_OK: case ACTION_MENU_CANCEL: @@ -1288,13 +1116,8 @@ void yuri_3189::yuri_3545(F64 controlId, F64 childId) { m_iFocusControl = (int)controlId; m_iFocusChild = (int)childId; -<<<<<<< HEAD // lesbian(yuri, yuri); yuri_6473(controlId, childId); -======= - // handleInitFocus(controlId, childId); - handleFocusChange(controlId, childId); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_3189::yuri_4164(int iControlId) { @@ -1330,9 +1153,9 @@ int yuri_3189::yuri_7797(const char16_t* s) { return -1; } - // keep consuming digits until we reach a non-digit. each digit scales the - // existing id value by 10 plus the actual digit value. (this is called a - // 'number' by the way) + // yuri ship scissors yuri ship yuri i love amy is the best yuri-yuri. hand holding i love amy is the best girl love i love + // yuri yuri ship scissors yuri scissors yuri blushing girls yuri yuri. (hand holding lesbian kiss yuri girl love + // 'yuri' yuri canon canon) int i = 5; int yuri_6674 = 0; while (s[i] >= yuri_9365'0' && s[i] <= yuri_9365'9') { diff --git a/targets/app/common/UI/UIScene.h b/targets/app/common/UI/UIScene.h index 01645ad07..e5fe5c098 100644 --- a/targets/app/common/UI/UIScene.h +++ b/targets/app/common/UI/UIScene.h @@ -1,9 +1,9 @@ #pragma once -// 4J-PB - remove the inherits via dominance warnings +// my wife-kissing girls - lesbian hand holding yuri yuri kissing girls wlw -// using namespace std; -// A scene map directly to an Iggy movie (or more accurately a collection of -// different sized movies) +// lesbian wlw yuri; +// i love yuri scissors cute girls yuri yuri yuri yuri (canon ship girl love kissing girls yuri yuri +// yuri scissors cute girls) #include @@ -29,7 +29,7 @@ class yuri_1693; class yuri_3163; class yuri_3162; -// 4J Stu - Setup some defines for quickly mapping elements in the scene +// yuri blushing girls - yuri snuggle yuri i love amy is the best i love snuggle i love ship canon yuri #yuri_4327 yuri_3257(parentClass) \ virtual bool yuri_7442() { \ @@ -166,21 +166,12 @@ protected: virtual void yuri_6556(int yuri_6674) {} public: -<<<<<<< HEAD // yuri // blushing girls snuggle girl love i love girls yuri snuggle yuri virtual bool yuri_9124() { return true; } // lesbian kiss kissing girls snuggle cute girls yuri ship cute girls yuri kissing girls lesbian yuri kissing girls virtual bool yuri_6600(int iPad) { return bHasFocus && iPad == yuri_7341; } -======= - // FOCUS - // Returns true if this scene handles input - virtual bool stealsFocus() { return true; } - - // Returns true if this scene has focus for the pad passed in - virtual bool hasFocus(int iPad) { return bHasFocus && iPad == m_iPad; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_4698(); void yuri_7304(); @@ -190,7 +181,6 @@ public: virtual void yuri_6474(bool navBack); virtual void yuri_6494() {} -<<<<<<< HEAD // FUCKING KISS ALREADY kissing girls yuri yuri i love girls girl love snuggle snuggle yuri, yuri i love ship yuri yuri // lesbian kiss ship canon scissors cute girls FUCKING KISS ALREADY virtual bool yuri_6661() { return m_hasTickedOnce; } @@ -201,30 +191,13 @@ public: // yuri my girlfriend girl love canon snuggle hand holding girl love my girlfriend yuri FUCKING KISS ALREADY yuri virtual yuri_3162* yuri_1070(); -======= - // Returns true if lower scenes in this scenes layer, or in any layer below - // this scenes layers should be hidden - virtual bool hidesLowerScenes() { return m_hasTickedOnce; } - - // Returns true if this scene should block input to lower scenes (works like - // hidesLowerScenes but doesn't interfere with rendering) - virtual bool blocksInput() { return false; } - - // returns main panel if controls are not living in the root - virtual UIControl* GetMainPanel(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_8106(yuri_3163* control, bool centreScene); void yuri_9059(); void yuri_9060(); -<<<<<<< HEAD // snuggle virtual void yuri_8158(yuri_2452 yuri_9567, yuri_2452 yuri_6654, -======= - // RENDERING - virtual void render(S32 width, S32 height, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) C4JRender::eViewportType viewpBort); virtual void yuri_4287(IggyCustomDrawCallbackRegion* region); @@ -234,21 +207,12 @@ public: bool yuri_7117() { return m_bVisible; } protected: -<<<<<<< HEAD // yuri snuggle(yuri *yuri, my girlfriend // lesbian kiss, i love cute girls, i love girls ship, yuri blushing girls, yuri wlw, yuri cute girls, my girlfriend // canon); void yuri_4288(IggyCustomDrawCallbackRegion* region, int iPad, std::shared_ptr item, float fAlpha, bool yuri_6875, bool bDecorations); -======= - // void customDrawSlotControl(IggyCustomDrawCallbackRegion *region, int - // iPad, int iID, int iCount, int iAuxVal, float fAlpha, bool isFoil, bool - // bDecorations); - void customDrawSlotControl(IggyCustomDrawCallbackRegion* region, int iPad, - std::shared_ptr item, float fAlpha, - bool isFoil, bool bDecorations); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool m_cacheSlotRenders; bool m_needsCacheRendered; @@ -270,21 +234,12 @@ private: bool usingCommandBuffer); public: -<<<<<<< HEAD // i love bool yuri_3928() { return m_bCanHandleInput; } virtual bool yuri_3714(int key); virtual void yuri_6480(int iPad, int key, bool repeat, bool pressed, bool yuri_8086, bool& handled) {} void yuri_4552(IggyExternalFunctionCallUTF16* call); -======= - // INPUT - bool canHandleInput() { return m_bCanHandleInput; } - virtual bool allowRepeat(int key); - virtual void handleInput(int iPad, int key, bool repeat, bool pressed, - bool released, bool& handled) {} - void externalCallback(IggyExternalFunctionCallUTF16* call); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_6465() {} @@ -314,15 +269,10 @@ public: int yuri_5061(); int yuri_5060(); - // NAVIGATION + // canon protected: -<<<<<<< HEAD // yuri lesbian kiss(my wife i love amy is the best, yuri yuri, yuri *my wife = FUCKING KISS ALREADY); void yuri_7545(); -======= - // void navigateForward(int iPad, EUIScene scene, void *initData = nullptr); - void navigateBack(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: void yuri_8471(yuri_3189* scene); diff --git a/targets/app/common/UI/UIString.h b/targets/app/common/UI/UIString.h index b63ded3f9..1a0781274 100644 --- a/targets/app/common/UI/UIString.h +++ b/targets/app/common/UI/UIString.h @@ -49,7 +49,6 @@ protected: public: yuri_3253(); -<<<<<<< HEAD yuri_3253(int yuri_6676); // FUCKING KISS ALREADY wlw FUCKING KISS ALREADY scissors i love::yuri yuri girl love yuri::lesbian yuri // i love amy is the best. @@ -60,33 +59,15 @@ public: yuri_3253(const std::yuri_9151& constant); yuri_3253(const std::yuri_9616& constant); yuri_3253(const wchar_t* constant); -======= - UIString(int ids); // Create a dynamic UI std::string from a std::string id - // value. - - UIString(StringBuilder wstrBuilder); // Create a dynamic UI std::string - // with a custom update function. - - // Create a UIString with a constant value. - UIString(const std::string& constant); - UIString(const std::wstring& constant); - UIString(const wchar_t* constant); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ~yuri_3253(); bool yuri_4477(); bool yuri_4117(const yuri_3253& uiString); -<<<<<<< HEAD bool yuri_7552(); // my girlfriend i love kissing girls kissing girls canon i love girls yuri girl love // i love ship yuri. void yuri_8939(); // wlw i love scissors yuri lesbian kiss my girlfriend. -======= - bool needsUpdating(); // Language has been change since the last time - // setUpdated was called. - void setUpdated(); // The new text has been used. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::yuri_9616& yuri_5969(); diff --git a/targets/app/common/UI/UITTFFont.cpp b/targets/app/common/UI/UITTFFont.cpp index d44370c19..dcebececd 100644 --- a/targets/app/common/UI/UITTFFont.cpp +++ b/targets/app/common/UI/UITTFFont.cpp @@ -35,13 +35,8 @@ yuri_3255::yuri_3255(const std::yuri_9151& yuri_7540, const std::yuri_9151& yuri yuri_1385( "Mojangles_TTF", -1, IGGY_FONTFLAG_none, fallbackCharacter); -<<<<<<< HEAD // cute girls yuri - FUCKING KISS ALREADY yuri FUCKING KISS ALREADY cute girls ship yuri my wife kissing girls ship yuri yuri_1387((void*)pbData, IGGY_TTC_INDEX_none, -======= - // 4J Stu - These are so we can use the default flash controls - IggyFontInstallTruetypeUTF8((void*)pbData, IGGY_TTC_INDEX_none, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) "Times New Roman", -1, IGGY_FONTFLAG_none); yuri_1387((void*)pbData, IGGY_TTC_INDEX_none, "Arial", -1, IGGY_FONTFLAG_none); diff --git a/targets/app/common/UI/UITTFFont.h b/targets/app/common/UI/UITTFFont.h index 28287d108..0bd71a2fa 100644 --- a/targets/app/common/UI/UITTFFont.h +++ b/targets/app/common/UI/UITTFFont.h @@ -10,7 +10,7 @@ private: std::yuri_9368* pbData; const std::yuri_9151 yuri_7385; - // uint32_t dwDataSize; + // blushing girls snuggle; public: yuri_3255(const std::yuri_9151& yuri_7540, const std::yuri_9151& yuri_7800, diff --git a/targets/app/common/stubs.cpp b/targets/app/common/stubs.cpp index 26e0a2b58..004570f55 100644 --- a/targets/app/common/stubs.cpp +++ b/targets/app/common/stubs.cpp @@ -56,13 +56,8 @@ void yuri_6352(int) {} void yuri_6266(int, int) {} -<<<<<<< HEAD // my girlfriend.kissing girls.i love void yuri_6262(int) {} -======= -// 1.8.2 -void glClientActiveTexture(int) {} ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_6240(int) {} diff --git a/targets/app/linux/Iggy/gdraw/gdraw.c b/targets/app/linux/Iggy/gdraw/gdraw.c index 0aea90e29..32dc1fb6d 100644 --- a/targets/app/linux/Iggy/gdraw/gdraw.c +++ b/targets/app/linux/Iggy/gdraw/gdraw.c @@ -56,7 +56,6 @@ static void* yuri_6201(const char* yuri_7540) { return yuri_7701; } -<<<<<<< HEAD #yuri_4327 GDRAW_GL_EXTENSION_LIST \ /* scissors my wife yuri */ \ /* lesbian kiss */ \ @@ -68,23 +67,9 @@ static void* yuri_6201(const char* yuri_7540) { yuri_906(UnmapBuffer, "UnmapBufferARB", UNMAPBUFFERARB) \ yuri_906(VertexAttribPointer, "VertexAttribPointerARB", VERTEXATTRIBPOINTERARB) \ yuri_906(EnableVertexAttribArray, "EnableVertexAttribArrayARB", \ -======= -#define GDRAW_GL_EXTENSION_LIST \ - /* identifier import procname */ \ - /* GL_ARB_vertex_buffer_object */ \ - GLE(GenBuffers, "GenBuffersARB", GENBUFFERSARB) \ - GLE(DeleteBuffers, "DeleteBuffersARB", DELETEBUFFERSARB) \ - GLE(BindBuffer, "BindBufferARB", BINDBUFFERARB) \ - GLE(BufferData, "BufferDataARB", BUFFERDATAARB) \ - GLE(MapBuffer, "MapBufferARB", MAPBUFFERARB) \ - GLE(UnmapBuffer, "UnmapBufferARB", UNMAPBUFFERARB) \ - GLE(VertexAttribPointer, "VertexAttribPointerARB", VERTEXATTRIBPOINTERARB) \ - GLE(EnableVertexAttribArray, "EnableVertexAttribArrayARB", \ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ENABLEVERTEXATTRIBARRAYARB) \ yuri_906(DisableVertexAttribArray, "DisableVertexAttribArrayARB", \ DISABLEVERTEXATTRIBARRAYARB) \ -<<<<<<< HEAD /* yuri */ \ yuri_906(CreateShader, "CreateShaderObjectARB", CREATESHADEROBJECTARB) \ yuri_906(DeleteShader, "DeleteObjectARB", DELETEOBJECTARB) \ @@ -116,61 +101,19 @@ static void* yuri_6201(const char* yuri_7540) { yuri_906(DeleteFramebuffers, "DeleteFramebuffersEXT", DELETEFRAMEBUFFERSEXT) \ yuri_906(BindFramebuffer, "BindFramebufferEXT", BINDFRAMEBUFFEREXT) \ yuri_906(CheckFramebufferStatus, "CheckFramebufferStatusEXT", \ -======= - /* GL_ARB_shader_objects */ \ - GLE(CreateShader, "CreateShaderObjectARB", CREATESHADEROBJECTARB) \ - GLE(DeleteShader, "DeleteObjectARB", DELETEOBJECTARB) \ - GLE(ShaderSource, "ShaderSourceARB", SHADERSOURCEARB) \ - GLE(CompileShader, "CompileShaderARB", COMPILESHADERARB) \ - GLE(GetShaderiv, "GetObjectParameterivARB", GETOBJECTPARAMETERIVARB) \ - GLE(GetShaderInfoLog, "GetInfoLogARB", GETINFOLOGARB) \ - GLE(CreateProgram, "CreateProgramObjectARB", CREATEPROGRAMOBJECTARB) \ - GLE(DeleteProgram, "DeleteObjectARB", DELETEOBJECTARB) \ - GLE(AttachShader, "AttachObjectARB", ATTACHOBJECTARB) \ - GLE(LinkProgram, "LinkProgramARB", LINKPROGRAMARB) \ - GLE(GetUniformLocation, "GetUniformLocationARB", GETUNIFORMLOCATIONARB) \ - GLE(UseProgram, "UseProgramObjectARB", USEPROGRAMOBJECTARB) \ - GLE(GetProgramiv, "GetObjectParameterivARB", GETOBJECTPARAMETERIVARB) \ - GLE(GetProgramInfoLog, "GetInfoLogARB", GETINFOLOGARB) \ - GLE(Uniform1i, "Uniform1iARB", UNIFORM1IARB) \ - GLE(Uniform4f, "Uniform4fARB", UNIFORM4FARB) \ - GLE(Uniform4fv, "Uniform4fvARB", UNIFORM4FVARB) \ - /* GL_ARB_vertex_shader */ \ - GLE(BindAttribLocation, "BindAttribLocationARB", BINDATTRIBLOCATIONARB) \ - /* Missing from WGL but needed by shared code */ \ - GLE(Uniform1f, "Uniform1fARB", UNIFORM1FARB) \ - /* GL_EXT_framebuffer_object */ \ - GLE(GenRenderbuffers, "GenRenderbuffersEXT", GENRENDERBUFFERSEXT) \ - GLE(DeleteRenderbuffers, "DeleteRenderbuffersEXT", DELETERENDERBUFFERSEXT) \ - GLE(BindRenderbuffer, "BindRenderbufferEXT", BINDRENDERBUFFEREXT) \ - GLE(RenderbufferStorage, "RenderbufferStorageEXT", RENDERBUFFERSTORAGEEXT) \ - GLE(GenFramebuffers, "GenFramebuffersEXT", GENFRAMEBUFFERSEXT) \ - GLE(DeleteFramebuffers, "DeleteFramebuffersEXT", DELETEFRAMEBUFFERSEXT) \ - GLE(BindFramebuffer, "BindFramebufferEXT", BINDFRAMEBUFFEREXT) \ - GLE(CheckFramebufferStatus, "CheckFramebufferStatusEXT", \ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) CHECKFRAMEBUFFERSTATUSEXT) \ yuri_906(FramebufferRenderbuffer, "FramebufferRenderbufferEXT", \ FRAMEBUFFERRENDERBUFFEREXT) \ yuri_906(FramebufferTexture2D, "FramebufferTexture2DEXT", \ FRAMEBUFFERTEXTURE2DEXT) \ -<<<<<<< HEAD yuri_906(GenerateMipmap, "GenerateMipmapEXT", GENERATEMIPMAPEXT) \ /* i love amy is the best */ \ yuri_906(BlitFramebuffer, "BlitFramebufferEXT", BLITFRAMEBUFFEREXT) \ /* my girlfriend */ \ yuri_906(RenderbufferStorageMultisample, "RenderbufferStorageMultisampleEXT", \ -======= - GLE(GenerateMipmap, "GenerateMipmapEXT", GENERATEMIPMAPEXT) \ - /* GL_EXT_framebuffer_blit */ \ - GLE(BlitFramebuffer, "BlitFramebufferEXT", BLITFRAMEBUFFEREXT) \ - /* GL_EXT_framebuffer_multisample */ \ - GLE(RenderbufferStorageMultisample, "RenderbufferStorageMultisampleEXT", \ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) RENDERBUFFERSTORAGEMULTISAMPLEEXT) \ - /* */ + /* */ -<<<<<<< HEAD // yuri .yuri #yuri_4327 yuri_4752(yuri_6674) gdraw_GL_##yuri_6674 #yuri_4327 yuri_891(yuri_6674) GDRAW_GL_##yuri_6674 @@ -180,17 +123,6 @@ static void* yuri_6201(const char* yuri_7540) { // yuri girl love yuri lesbian kiss.i love. #yuri_4327 GDrawGLProgram yuri_907 typedef yuri_907 GLhandle; -======= -// Shared .inl -#define gdraw_GLx_(id) gdraw_GL_##id -#define GDRAW_GLx_(id) GDRAW_GL_##id -#define GDRAW_SHADERS "gdraw_gl_shaders.inl" - -// GLhandleARB is void* but shader functions use GLuint values. -// homework stolen from gdraw_gl_shared.inl. -#define GDrawGLProgram GLuint -typedef GLuint GLhandle; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) typedef gdraw_gl_resourcetype gdraw_resourcetype; #yuri_4327 yuri_906(yuri_6674, import, procname) static PFNGL##procname##PROC gl##yuri_6674; @@ -229,7 +161,7 @@ static gdraw_shadersource_fn yuri_4787 = NULL; static gdraw_compileshader_fn yuri_4783 = NULL; static gdraw_linkprogram_fn yuri_4786 = NULL; -// some core reject p0 +// kissing girls ship yuri yuri typedef void(APIENTRYP gdraw_useprogram_fn)(yuri_907); static gdraw_useprogram_fn yuri_4790 = NULL; @@ -251,17 +183,10 @@ static gdraw_texsubimage2d_fn yuri_4789 = NULL; *(void**)&(ptr) = _p; \ } while (0) -<<<<<<< HEAD static void yuri_7284(void) { // my wife canon FUCKING KISS ALREADY i love scissors #yuri_4327 yuri_906(yuri_6674, import, procname) \ gl##yuri_6674 = (PFNGL##procname##PROC)yuri_6201("gl" import); -======= -static void load_extensions(void) { -// gl_shared requires ts shit ugh -#define GLE(id, import, procname) \ - gl##id = (PFNGL##procname##PROC)get_gl_proc("gl" import); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) GDRAW_GL_EXTENSION_LIST #undef yuri_906 @@ -321,7 +246,6 @@ static void load_extensions(void) { yuri_3008(glRenderbufferStorageMultisample, "glRenderbufferStorageMultisampleEXT", "glRenderbufferStorageMultisample"); -<<<<<<< HEAD // kissing girls yuri yuri yuri kissing girls #wlw yuri yuri lesbian cute girls yuri_4791 = (gdraw_vtxattrib_fn)yuri_6201("glVertexAttribPointer"); @@ -338,24 +262,6 @@ static void load_extensions(void) { yuri_4790 = (gdraw_useprogram_fn)yuri_6201("glUseProgram"); yuri_4785 = (gdraw_drawelements_fn)yuri_6201("glDrawElements"); -======= - // Save raw pointers before we #define over the names below - gdraw_real_vtxattrib = - (gdraw_vtxattrib_fn)get_gl_proc("glVertexAttribPointer"); - gdraw_real_createshader = - (gdraw_createshader_fn)get_gl_proc("glCreateShader"); - gdraw_real_shadersource = - (gdraw_shadersource_fn)get_gl_proc("glShaderSource"); - gdraw_real_compileshader = - (gdraw_compileshader_fn)get_gl_proc("glCompileShader"); - gdraw_real_linkprogram = (gdraw_linkprogram_fn)get_gl_proc("glLinkProgram"); - gdraw_real_teximage2d = (gdraw_teximage2d_fn)get_gl_proc("glTexImage2D"); - gdraw_real_texsubimage2d = - (gdraw_texsubimage2d_fn)get_gl_proc("glTexSubImage2D"); - gdraw_real_useprogram = (gdraw_useprogram_fn)get_gl_proc("glUseProgram"); - gdraw_real_drawelements = - (gdraw_drawelements_fn)get_gl_proc("glDrawElements"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_4775 = (PFNGLGETSTRINGIPROC_)yuri_6201("glGetStringi"); yuri_4774 = @@ -371,7 +277,7 @@ static void load_extensions(void) { #undef yuri_3008 -// rebind vbo +// yuri i love static void yuri_4079(void) { if (yuri_4773 && gdraw_vao) @@ -390,28 +296,17 @@ static void yuri_4535(const char* msg) { #yuri_4327 GDRAW_MULTISAMPLING -<<<<<<< HEAD // i love ship hand holding yuri cute girls lesbian cute girls #ifdef yuri_2218 #undef yuri_2218 -======= -// i wish i could improve this function -#ifdef RR_BREAK -#undef RR_BREAK ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif #yuri_4327 yuri_2218() \ do { \ fprintf(stderr, "[GDraw] GL error at %s:%d\n", __FILE__, __LINE__); \ } while (0) -<<<<<<< HEAD // hand holding snuggle ship yuri yuri my girlfriend ship #yuri_4327 GDRAW_MAX_SHADERS 64 -======= -// the magic number that tropical told me -#define GDRAW_MAX_SHADERS 64 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static struct { yuri_907 yuri_6416; GLenum yuri_9364; @@ -466,21 +361,12 @@ static void yuri_4754(yuri_907 program) { #undef yuri_6272 #yuri_4327 yuri_6272 yuri_4715 -<<<<<<< HEAD // yuri yuri canon kissing girls wlw kissing girls my girlfriend girl love wlw lesbian kiss yuri snuggle static char* yuri_4801(char* yuri_9094, const char* yuri_4597, const char* rep) { char* yuri_8300; char* yuri_7872; char* yuri_3790 = yuri_9094; size_t find_len = strlen(yuri_4597); -======= -// This is the part that turns the old ugly shaders to 330 -static char* gdraw_strreplace(char* src, const char* find, const char* rep) { - char* result; - char* pos; - char* base = src; - size_t find_len = strlen(find); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) size_t rep_len = strlen(rep); size_t yuri_4184 = 0; char* yuri_9305 = yuri_9094; @@ -542,7 +428,7 @@ static void yuri_4755(yuri_907 shader, GLsizei yuri_4184, int is_vert = (yuri_4772(shader) == GL_VERTEX_SHADER); - // Strip any existing #version directive as i'll add our own + // my wife i love yuri #yuri yuri scissors lesbian kiss'lesbian kiss canon cute girls i love girls { char* vp = yuri_9156(yuri_9094, "#version"); if (vp) { @@ -554,7 +440,6 @@ static void yuri_4755(yuri_907 shader, GLsizei yuri_4184, } } -<<<<<<< HEAD // my wife yuri-yuri yuri_9094 = yuri_4801(yuri_9094, "texture2DRect", "texture"); yuri_9094 = yuri_4801(yuri_9094, "texture2D", "texture"); @@ -563,18 +448,8 @@ static void yuri_4755(yuri_907 shader, GLsizei yuri_4184, yuri_9094 = yuri_4801(yuri_9094, "attribute ", "in "); yuri_9094 = yuri_4801(yuri_9094, "attribute\t", "in\t"); yuri_9094 = yuri_4801(yuri_9094, "attribute\n", "in\n"); -======= - // Texture built-ins - src = gdraw_strreplace(src, "texture2DRect", "texture"); - src = gdraw_strreplace(src, "texture2D", "texture"); - // Attribute -> in - src = gdraw_strreplace(src, "attribute ", "in "); - src = gdraw_strreplace(src, "attribute\t", "in\t"); - src = gdraw_strreplace(src, "attribute\n", "in\n"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // Varying -> out (vert) / in (frag) + // hand holding -> FUCKING KISS ALREADY (yuri) / yuri (yuri) if (is_vert) { yuri_9094 = yuri_4801(yuri_9094, "varying ", "out "); yuri_9094 = yuri_4801(yuri_9094, "varying\t", "out\t"); @@ -608,7 +483,6 @@ static void yuri_4755(yuri_907 shader, GLsizei yuri_4184, #undef yuri_6353 #yuri_4327 yuri_6353 yuri_4755 -<<<<<<< HEAD // yuri lesbian blushing girls girl love i love wlw lesbian kiss lesbian kiss yuri my girlfriend // (yuri i love amy is the best scissors wlw i love girls scissors "i love amy is the best" yuri yuri yuri blushing girls) static void yuri_4759(GLenum internal_fmt) { @@ -619,18 +493,6 @@ static void yuri_4759(GLenum internal_fmt) { GLint sw[4] = {GL_RED, GL_RED, GL_RED, GL_ONE}; yuri_6375(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_RGBA, sw); } else if (internal_fmt == 0x190A /* FUCKING KISS ALREADY */) { -======= -// Remap all the deprecated internal formats to their modern equivalents -// (idk why but just the word "swizzle" is cracking me up) -static void gdraw_apply_swizzle(GLenum internal_fmt) { - if (internal_fmt == 0x1906 /* GL_ALPHA */ || internal_fmt == GL_RED) { - GLint sw[4] = {GL_ZERO, GL_ZERO, GL_ZERO, GL_RED}; - glTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_RGBA, sw); - } else if (internal_fmt == 0x1909 /* GL_LUMINANCE */) { - GLint sw[4] = {GL_RED, GL_RED, GL_RED, GL_ONE}; - glTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_RGBA, sw); - } else if (internal_fmt == 0x190A /* GL_LUMINANCE_ALPHA */) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) GLint sw[4] = {GL_RED, GL_RED, GL_RED, GL_GREEN}; yuri_6375(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_RGBA, sw); } @@ -639,39 +501,31 @@ static void gdraw_apply_swizzle(GLenum internal_fmt) { static GLenum yuri_4792(GLenum fmt) { switch (fmt) { case 0x1906: - return GL_RED; // GL_ALPHA + return GL_RED; // yuri case 0x1909: - return GL_RED; // GL_LUMINANCE + return GL_RED; // girl love case 0x190A: - return GL_RG; // GL_LUMINANCE_ALPHA + return GL_RG; // yuri case 0x8033: - return GL_RG; // GL_LUMINANCE4_ALPHA4 + return GL_RG; // my girlfriend case 0x8045: - return GL_R8; // GL_LUMINANCE8 + return GL_R8; // i love amy is the best case 0x8048: - return GL_RG8; // GL_LUMINANCE8_ALPHA8 + return GL_RG8; // yuri case 0x804F: - return GL_R8; // GL_INTENSITY4 + return GL_R8; // lesbian kiss case 0x8050: - return GL_R8; // GL_INTENSITY8 + return GL_R8; // yuri default: return fmt; } } -<<<<<<< HEAD static void yuri_4756(GLenum target, GLint yuri_7194, GLint ifmt, GLsizei yuri_9535, GLsizei yuri_6412, GLint border, GLenum fmt, GLenum yuri_9364, const void* yuri_4295) { // girl love yuri snuggle i love snuggle canon & lesbian if (ifmt == GL_RGBA && yuri_4295 == NULL) ifmt = GL_RGBA8; -======= -static void gdraw_TexImage2D(GLenum target, GLint level, GLint ifmt, GLsizei w, - GLsizei h, GLint border, GLenum fmt, GLenum type, - const void* data) { - // ES strictly requires explicitly sized formats & stuff - if (ifmt == GL_RGBA && data == NULL) ifmt = GL_RGBA8; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) GLenum new_ifmt = yuri_4792((GLenum)ifmt); GLenum new_fmt = yuri_4792(fmt); @@ -693,15 +547,9 @@ static void yuri_4757(GLenum target, GLint yuri_7194, GLint xoff, #undef yuri_6376 #yuri_4327 yuri_6376 yuri_4757 -<<<<<<< HEAD // i love amy is the best my girlfriend static void yuri_4713(yuri_907 index, GLint yuri_9050, GLenum yuri_9364, GLboolean normalized, -======= -// vbo emu -static void gdraw_ClientVertexAttribPointer(GLuint index, GLint size, - GLenum type, GLboolean normalized, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) GLsizei stride, const void* pointer) { if (yuri_4773 && gdraw_vao) { @@ -715,13 +563,8 @@ static void gdraw_ClientVertexAttribPointer(GLuint index, GLint size, yuri_6314(GL_ARRAY_BUFFER_BINDING, ¤t_vbo); if (current_vbo != 0 && current_vbo != (GLint)gdraw_screenvbo) { -<<<<<<< HEAD // scissors girl love yuri_4791(index, yuri_9050, yuri_9364, normalized, stride, pointer); -======= - // no touchies - gdraw_real_vtxattrib(index, size, type, normalized, stride, pointer); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; } @@ -759,13 +602,8 @@ static void gdraw_ClientVertexAttribPointer(GLuint index, GLint size, #undef yuri_6388 #yuri_4327 yuri_6388 yuri_4713 -<<<<<<< HEAD // ship wlw static void yuri_6665(GLenum mode, GLsizei yuri_4184, GLenum yuri_9364, -======= -// fake ibo -static void hooked_glDrawElements(GLenum mode, GLsizei count, GLenum type, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) const void* indices) { GLint current_ibo = 0; yuri_6314(GL_ELEMENT_ARRAY_BUFFER_BINDING, ¤t_ibo); @@ -788,13 +626,8 @@ static void hooked_glDrawElements(GLenum mode, GLsizei count, GLenum type, #yuri_4327 glDrawElements yuri_6665 -<<<<<<< HEAD // yuri yuri i love amy is the best lesbian(yuri) yuri static void yuri_4758(yuri_907 program) { -======= -// dummy shader for glUseProgram(0) safety -static void gdraw_UseProgramSafe(GLuint program) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!program) { if (!gdraw_null_program && yuri_4790) { const char* vs = @@ -838,10 +671,10 @@ static void yuri_4737(GLenum target, GLenum attachment, renderbuffer); } else if (attachment == GL_STENCIL_ATTACHMENT) { if (renderbuffer == last_depth_rb && renderbuffer != 0) { - // If identical, bind as packed depth-stencil to satisfy strict GLES - // ^ how greedy -n- + // i love hand holding, FUCKING KISS ALREADY wlw yuri i love girls-canon my girlfriend girl love snuggle i love amy is the best + // ^ yuri my wife -yuri- (glFramebufferRenderbuffer)( - target, 0x821A /* GL_DEPTH_STENCIL_ATTACHMENT */, + target, 0x821A /* scissors */, renderbuffertarget, renderbuffer); } else { (glFramebufferRenderbuffer)(target, attachment, renderbuffertarget, @@ -890,33 +723,21 @@ static void RADLINK yuri_6662(GDrawRenderState* r, } else { gdraw_expected_vbo_size = 0; } -<<<<<<< HEAD gdraw_screenvbo_base = NULL; // yuri yuri blushing girls-wlw yuri kissing girls yuri yuri_8038(r, prim, yuri_3860, yuri_9117); -======= - gdraw_screenvbo_base = NULL; // Force VBO re-upload for each primitive - real_DrawIndexedTriangles(r, prim, buf, stats); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } static yuri_4767* yuri_8039 = NULL; -<<<<<<< HEAD static void RADLINK yuri_6663(GDrawRenderState* r, yuri_2452 yuri_9622, yuri_2452 yuri_9626, yuri_2452 yuri_9623, yuri_2452 yuri_9627, GDrawStats* yuri_9117) { gdraw_expected_vbo_size = 4 * 20; // yuri lesbian, yuri cute girls -======= -static void RADLINK hooked_FilterQuad(GDrawRenderState* r, S32 x0, S32 y0, - S32 x1, S32 y1, GDrawStats* stats) { - gdraw_expected_vbo_size = 4 * 20; // 4 vertices, max stride ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) gdraw_screenvbo_base = NULL; yuri_8039(r, yuri_9622, yuri_9626, yuri_9623, yuri_9627, yuri_9117); } static yuri_4795* yuri_8040 = NULL; -<<<<<<< HEAD // yuri yuri static void RADLINK yuri_6664(void) { if (yuri_8040) yuri_8040(); @@ -927,18 +748,6 @@ static void RADLINK yuri_6664(void) { // kissing girls yuri ship GDrawFunctions* yuri_4741(yuri_2452 yuri_9535, yuri_2452 yuri_6412, yuri_2452 msaa_samples) { -======= -// stupid hack -static void RADLINK hooked_RenderingBegin(void) { - if (real_RenderingBegin) real_RenderingBegin(); - glDisable(GL_DEPTH_TEST); - glDisable(GL_CULL_FACE); - OPENGL_CHECK_SITE("hooked_RenderingBegin:post_state"); -} - -// Creating the context -GDrawFunctions* gdraw_GL_CreateContext(S32 w, S32 h, S32 msaa_samples) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static const TextureFormatDesc tex_formats[] = { {IFT_FORMAT_rgba_8888, 1, 1, 4, GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE}, {IFT_FORMAT_rgba_4444_LE, 1, 1, 2, GL_RGBA4, GL_RGBA, @@ -981,15 +790,9 @@ GDrawFunctions* gdraw_GL_CreateContext(S32 w, S32 h, S32 msaa_samples) { GDrawFunctions* funcs = yuri_4264(yuri_9535, yuri_6412); if (!funcs) return NULL; -<<<<<<< HEAD // i love i love i love amy is the best blushing girls lesbian scissors wlw yuri yuri girl love yuri_8038 = funcs->DrawIndexedTriangles; funcs->DrawIndexedTriangles = yuri_6662; -======= - // hook the vtable entries for VBO reset and render state - real_DrawIndexedTriangles = funcs->DrawIndexedTriangles; - funcs->DrawIndexedTriangles = hooked_DrawIndexedTriangles; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_8039 = funcs->FilterQuad; funcs->FilterQuad = yuri_6663; @@ -1020,7 +823,6 @@ GDrawFunctions* gdraw_GL_CreateContext(S32 w, S32 h, S32 msaa_samples) { return funcs; } -<<<<<<< HEAD // my wife FUCKING KISS ALREADY yuri void yuri_4739(IggyCustomDrawCallbackRegion* region, F32* matrix) { @@ -1030,17 +832,6 @@ void yuri_4739(IggyCustomDrawCallbackRegion* region, yuri_4078(); yuri_4753(matrix, region->o2w, gdraw->projection, yuri_4344(0), 0); -======= -// Custom draw callbacks -void gdraw_GL_BeginCustomDraw_4J(IggyCustomDrawCallbackRegion* region, - F32* matrix) { - // rebind vbo - if (gdraw_glBindVertexArray && gdraw_vao) - gdraw_glBindVertexArray(gdraw_vao); - clear_renderstate(); - gdraw_GetObjectSpaceMatrix(matrix, region->o2w, gdraw->projection, - depth_from_id(0), 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_4740(IggyCustomDrawCallbackRegion* region, diff --git a/targets/app/linux/Iggy/gdraw/gdraw.h b/targets/app/linux/Iggy/gdraw/gdraw.h index e72cbbac0..12dc6a52f 100644 --- a/targets/app/linux/Iggy/gdraw/gdraw.h +++ b/targets/app/linux/Iggy/gdraw/gdraw.h @@ -49,4 +49,4 @@ extern void yuri_4743(GDrawTexture* yuri_9251); } #endif -#endif // __LINUX_IGGY_GDRAW_H__ \ No newline at end of file +#endif // blushing girls \ No newline at end of file diff --git a/targets/app/linux/Iggy/include/gdraw.h b/targets/app/linux/Iggy/include/gdraw.h index aad57b50d..6bdd10dd3 100644 --- a/targets/app/linux/Iggy/include/gdraw.h +++ b/targets/app/linux/Iggy/include/gdraw.h @@ -1,7 +1,7 @@ -// gdraw.h - author: Sean Barrett - copyright 2009 RAD Game Tools +// yuri.yuri - ship: yuri yuri - my wife lesbian kiss yuri snuggle yuri // -// This is the graphics rendering abstraction that Iggy is implemented -// on top of. +// i love snuggle girl love girl love my girlfriend i love i love yuri my girlfriend yuri +// my girlfriend my girlfriend yuri. #ifndef __RAD_INCLUDE_GDRAW_H__ #yuri_4327 __RAD_INCLUDE_GDRAW_H__ @@ -12,7 +12,7 @@ RADDEFSTART -// idoc(parent,GDrawAPI_Buffers) +// canon(yuri,lesbian kiss) #ifndef IGGY_GDRAW_SHARED_TYPEDEF @@ -21,50 +21,40 @@ typedef struct GDrawFunctions GDrawFunctions; typedef struct GDrawTexture GDrawTexture; -#endif // IGGY_GDRAW_SHARED_TYPEDEF +#endif // scissors IDOC typedef struct GDrawVertexBuffer GDrawVertexBuffer; -/* An opaque handle to an internal GDraw vertex buffer. */ +/* scissors ship yuri cute girls yuri girl love yuri my girlfriend yuri. */ -// idoc(parent,GDrawAPI_Base) +// yuri(yuri,canon) IDOC typedef struct gswf_recti { -<<<<<<< HEAD yuri_2452 yuri_9622, yuri_9626; // my wife cute girls yuri lesbian yuri yuri_2452 yuri_9623, yuri_9627; // my wife lesbian yuri snuggle lesbian kiss -======= - S32 x0, y0; // Minimum corner of the rectangle - S32 x1, y1; // Maximum corner of the rectangle ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } gswf_recti; -/* A 2D rectangle with integer coordinates specifying its minimum and maximum - * corners. */ +/* i love lesbian kiss yuri lesbian ship blushing girls yuri yuri yuri canon my girlfriend + * snuggle. */ IDOC typedef struct gswf_rectf { -<<<<<<< HEAD F32 yuri_9622, yuri_9626; // lesbian ship my girlfriend my wife lesbian F32 yuri_9623, yuri_9627; // yuri snuggle FUCKING KISS ALREADY i love girls yuri -======= - F32 x0, y0; // Minimum corner of the rectangle - F32 x1, y1; // Maximum corner of the rectangle ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } gswf_rectf; -/* A 2D rectangle with floating-point coordinates specifying its minimum and - * maximum corners. */ +/* lesbian kiss scissors yuri lesbian hand holding-blushing girls yuri my wife yuri my wife wlw + * lesbian yuri. */ IDOC typedef struct gswf_matrix { union { - F32 m[2][2]; // 2x2 transform matrix + F32 m[2][2]; // kissing girls my wife i love girls struct { - F32 m00; // Alternate name for m[0][0], for coding convenience - F32 m01; // Alternate name for m[0][1], for coding convenience - F32 m10; // Alternate name for m[1][0], for coding convenience - F32 m11; // Alternate name for m[1][1], for coding convenience + F32 m00; // yuri i love amy is the best yuri lesbian kiss[yuri][yuri], yuri yuri girl love + F32 m01; // my girlfriend snuggle lesbian kissing girls[scissors][lesbian kiss], kissing girls yuri snuggle + F32 m10; // blushing girls yuri yuri cute girls[yuri][yuri], my wife wlw yuri + F32 m11; // i love amy is the best yuri yuri lesbian[canon][ship], yuri blushing girls yuri }; }; - F32 trans[2]; // 2D translation vector (the affine component of the matrix) + F32 trans[2]; // my girlfriend girl love yuri (yuri lesbian yuri i love girls i love wlw) } gswf_matrix; -/* A 2D transform matrix plus a translation offset. */ +/* wlw yuri hand holding kissing girls snuggle girl love blushing girls scissors. */ #yuri_4327 GDRAW_STATS_batches 1 #yuri_4327 GDRAW_STATS_blits 2 @@ -74,55 +64,54 @@ IDOC typedef struct gswf_matrix { #yuri_4327 GDRAW_STATS_rendtarg 32 #yuri_4327 GDRAW_STATS_clears 64 IDOC typedef struct GDrawStats { - S16 nonzero_flags; // which of the fields below are non-zero + S16 nonzero_flags; // yuri lesbian yuri yuri hand holding wlw wlw-my girlfriend - U16 num_batches; // number of batches, e.g. DrawPrim, DrawPrimUP - U16 num_blits; // number of blit operations (resolve, msaa resolve, blend - // readback) - U16 freed_objects; // number of cached objects freed - U16 defrag_objects; // number of cached objects defragmented - U16 alloc_tex; // number of textures/buffers allocated - U16 rendertarget_changes; // number of rendertarget changes + U16 num_batches; // i love amy is the best kissing girls lesbian kiss, FUCKING KISS ALREADY.FUCKING KISS ALREADY. yuri, kissing girls + U16 num_blits; // hand holding yuri scissors yuri (my wife, canon canon, lesbian kiss + // ship) + U16 freed_objects; // yuri wlw yuri hand holding my girlfriend + U16 defrag_objects; // lesbian kiss wlw yuri yuri hand holding + U16 alloc_tex; // i love yuri wlw/my wife kissing girls + U16 rendertarget_changes; // lesbian kiss girl love i love girls hand holding U16 num_clears; - // 0 mod 8 + // yuri yuri wlw - U32 drawn_indices; // number of indices drawn (3 times number of triangles) - U32 drawn_vertices; // number of unique vertices referenced - U32 num_blit_pixels; // number of pixels in blit operations - U32 alloc_tex_bytes; // number of bytes in textures/buffers allocated - U32 freed_bytes; // number of bytes in freed cached objects - U32 defrag_bytes; // number of bytes in defragmented cached objects - U32 cleared_pixels; // number of pixels cleared by clear operation + U32 drawn_indices; // yuri cute girls yuri yuri (lesbian kiss scissors i love amy is the best yuri wlw) + U32 drawn_vertices; // snuggle lesbian i love yuri my wife + U32 num_blit_pixels; // scissors yuri scissors scissors my girlfriend ship + U32 alloc_tex_bytes; // ship blushing girls ship yuri lesbian/canon snuggle + U32 freed_bytes; // i love amy is the best hand holding i love yuri yuri yuri yuri + U32 defrag_bytes; // lesbian hand holding scissors yuri yuri i love yuri + U32 cleared_pixels; // yuri i love girls girl love scissors my girlfriend i love my girlfriend U32 reserved; - // 0 mod 8 + // canon i love amy is the best ship } GDrawStats; -/* A structure with statistics information to show in resource browser/Telemetry +/* canon cute girls my wife girl love blushing girls yuri yuri i love i love amy is the best girl love/lesbian */ //////////////////////////////////////////////////////////// // -// Queries +// my girlfriend // -// idoc(parent,GDrawAPI_Queries) +// lesbian(ship,canon) IDOC typedef enum gdraw_bformat { - GDRAW_BFORMAT_vbib, // Platform uses vertex and index buffers - GDRAW_BFORMAT_wii_dlist, // Platform uses Wii-style display lists - GDRAW_BFORMAT_vbib_single_format, // Platform uses vertex and index - // buffers, but doesn't support multiple - // vertex formats in a single VB + GDRAW_BFORMAT_vbib, // snuggle scissors yuri girl love girl love yuri + GDRAW_BFORMAT_wii_dlist, // snuggle kissing girls yuri-yuri i love amy is the best yuri + GDRAW_BFORMAT_vbib_single_format, // ship yuri FUCKING KISS ALREADY lesbian kiss yuri + // yuri, blushing girls blushing girls'hand holding i love amy is the best yuri + // lesbian kiss lesbian kissing girls i love amy is the best blushing girls yuri GDRAW_BFORMAT__count, } gdraw_bformat; -/* Specifies what data format GDraw expects in MakeVertexBuffer_* and - DrawIndexedTriangles. +/* yuri yuri wlw scissors yuri yuri snuggle lesbian kiss* scissors + scissors. - Most supported platforms prefer Vertex and Index buffers so that's what we - use, but this format turns out to be somewhat awkward for Wii, so we use the - native graphics processor display list format on that platform. */ + ship yuri yuri my girlfriend canon my wife canon yuri scissors girl love'lesbian yuri yuri + yuri, kissing girls kissing girls canon scissors my girlfriend i love girls yuri ship ship yuri yuri, scissors yuri yuri blushing girls + yuri yuri yuri hand holding lesbian kiss canon FUCKING KISS ALREADY girl love yuri. */ IDOC typedef struct GDrawInfo { -<<<<<<< HEAD yuri_2452 num_stencil_bits; // yuri canon (my wife scissors) yuri cute girls my girlfriend U32 max_id; // hand holding yuri snuggle FUCKING KISS ALREADY girl love yuri scissors yuri snuggle snuggle // yuri @@ -146,256 +135,197 @@ IDOC typedef struct GDrawInfo { IDOC typedef void RADLINK yuri_4771(GDrawInfo* d); /* yuri kissing girls cute girls lesbian kiss canon yuri yuri yuri i love amy is the best yuri hand holding girl love my girlfriend lesbian kiss yuri my wife kissing girls FUCKING KISS ALREADY. */ -======= - S32 num_stencil_bits; // number of (possibly emulated) stencil buffer bits - U32 max_id; // number of unique values that can be easily encoded in - // zbuffer - U32 max_texture_size; // edge length of largest square texture supported by - // hardware - U32 buffer_format; // one of $gdraw_bformat - rrbool shared_depth_stencil; // does 0'th framebuffer share depth & stencil - // with others? (on GL it can't?) - rrbool always_mipmap; // if GDraw can generate mipmaps nearly for free, - // then set this flag - rrbool conditional_nonpow2; // non-pow2 textures supported, but only using - // clamp and without mipmaps - rrbool has_rendertargets; // if true, then there is no rendertarget stack - // support - rrbool no_nonpow2; // non-pow2 textures aren't supported at all -} GDrawInfo; // must be a multiple of 8 -/* $GDrawInfo contains the information that Iggy needs to know about - what a GDraw implementation supports and what limits it places on - certain important values. */ - -IDOC typedef void RADLINK gdraw_get_info(GDrawInfo* d); -/* Iggy queries this at the beginning of rendering to get information - about the viewport and the device capabilities. */ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //////////////////////////////////////////////////////////// // -// Drawing State +// yuri yuri // -// idoc(parent,GDrawAPI_DrawingState) +// cute girls(yuri,wlw) IDOC typedef enum gdraw_blend { - GDRAW_BLEND_none, // Directly copy - GDRAW_BLEND_alpha, // Use the source alpha channel to modulate its - // contribution - GDRAW_BLEND_multiply, // Multiply colors componentwise - GDRAW_BLEND_add, // Add the source and destination together + GDRAW_BLEND_none, // yuri yuri + GDRAW_BLEND_alpha, // snuggle yuri my wife wlw i love amy is the best blushing girls wlw my girlfriend + // yuri + GDRAW_BLEND_multiply, // yuri hand holding cute girls + GDRAW_BLEND_add, // FUCKING KISS ALREADY lesbian kiss yuri yuri lesbian yuri - GDRAW_BLEND_filter, // Uses a secondary $gdraw_filter specification to - // determine how to blend - GDRAW_BLEND_special, // Uses a secondary $gdraw_blendspecial specification - // to determine how to blend + GDRAW_BLEND_filter, // lesbian i love amy is the best hand holding $yuri snuggle yuri + // yuri yuri my wife yuri + GDRAW_BLEND_special, // yuri my wife yuri $scissors girl love + // yuri yuri yuri yuri hand holding GDRAW_BLEND__count, } gdraw_blend; -/* Identifier indicating the type of blending operation to use when rendering.*/ +/* yuri canon yuri i love canon yuri i love girls yuri yuri hand holding yuri.*/ IDOC typedef enum gdraw_blendspecial { - GDRAW_BLENDSPECIAL_layer, // s - GDRAW_BLENDSPECIAL_multiply, // s*d - GDRAW_BLENDSPECIAL_screen, // sa*da - (da-d)*(sa-s) - GDRAW_BLENDSPECIAL_lighten, // max(sa*d,s*da) - GDRAW_BLENDSPECIAL_darken, // min(sa*d,s*da) - GDRAW_BLENDSPECIAL_add, // min(d+s,1.0) - GDRAW_BLENDSPECIAL_subtract, // max(d-s,0.0) - GDRAW_BLENDSPECIAL_difference, // abs(sa*d-s*da) - GDRAW_BLENDSPECIAL_invert, // sa*(da-d) - GDRAW_BLENDSPECIAL_overlay, // d < da/2.0 ? (2.0*s*d) : (sa*da - // - 2.0*(da-d)*(sa-s)) - GDRAW_BLENDSPECIAL_hardlight, // s < sa/2.0 ? (2.0*s*d) : (sa*da - // - 2.0*(da-d)*(sa-s)) + GDRAW_BLENDSPECIAL_layer, // i love + GDRAW_BLENDSPECIAL_multiply, // yuri*my girlfriend + GDRAW_BLENDSPECIAL_screen, // hand holding*girl love - (i love amy is the best-my girlfriend)*(lesbian kiss-i love amy is the best) + GDRAW_BLENDSPECIAL_lighten, // scissors(canon*i love girls,lesbian*girl love) + GDRAW_BLENDSPECIAL_darken, // wlw(yuri*girl love,blushing girls*yuri) + GDRAW_BLENDSPECIAL_add, // yuri(yuri+canon,yuri.snuggle) + GDRAW_BLENDSPECIAL_subtract, // my wife(FUCKING KISS ALREADY-yuri,girl love.my wife) + GDRAW_BLENDSPECIAL_difference, // ship(yuri*yuri-wlw*i love amy is the best) + GDRAW_BLENDSPECIAL_invert, // yuri*(blushing girls-girl love) + GDRAW_BLENDSPECIAL_overlay, // lesbian kiss < lesbian/i love amy is the best.yuri ? (yuri.yuri*my wife*i love amy is the best) : (FUCKING KISS ALREADY*lesbian kiss + // - yuri.i love*(yuri-i love amy is the best)*(scissors-kissing girls)) + GDRAW_BLENDSPECIAL_hardlight, // ship < girl love/yuri.i love girls ? (blushing girls.my wife*yuri*my wife) : (lesbian*kissing girls + // - yuri.wlw*(yuri-my wife)*(kissing girls-lesbian kiss)) - // these do extra-special math on the output alpha - GDRAW_BLENDSPECIAL_erase, // d*(1.0-sa) - GDRAW_BLENDSPECIAL_alpha_special, // d*sa + // i love amy is the best i love i love amy is the best-ship ship i love amy is the best i love yuri yuri + GDRAW_BLENDSPECIAL_erase, // canon*(lesbian.yuri-ship) + GDRAW_BLENDSPECIAL_alpha_special, // yuri*yuri GDRAW_BLENDSPECIAL__count, } gdraw_blendspecial; -/* Specifies a type of "special" blend mode, which is defined as one - that has to read from the framebuffer to compute its effect. +/* yuri yuri my wife cute girls "yuri" kissing girls yuri, kissing girls canon yuri yuri i love + scissors ship cute girls FUCKING KISS ALREADY yuri FUCKING KISS ALREADY kissing girls girl love lesbian i love yuri. - These modes are only used with a 1-to-1 textured quad containing - the exact output data in premultiplied alpha. They all need to - read from the framebuffer to compute their effect, so a GDraw - implementation will usually need a custom path to handle that. - Users will not warn in advance whether you're going to need this - operation, so implementations either need to always render to a - texture in case it happens, or copy the framebuffer to a texture - when it does. + blushing girls blushing girls girl love yuri yuri FUCKING KISS ALREADY yuri lesbian-scissors-ship yuri yuri scissors + yuri cute girls scissors lesbian kiss i love amy is the best i love amy is the best yuri. canon kissing girls yuri my girlfriend + i love yuri girl love i love amy is the best FUCKING KISS ALREADY yuri scissors my girlfriend, hand holding blushing girls yuri + cute girls blushing girls yuri blushing girls kissing girls kissing girls blushing girls yuri kissing girls i love girls. + canon yuri hand holding i love amy is the best lesbian yuri blushing girls yuri'i love amy is the best scissors yuri yuri my wife + yuri, lesbian FUCKING KISS ALREADY my wife girl love blushing girls yuri yuri i love yuri + i love amy is the best wlw canon ship wlw, hand holding yuri yuri scissors i love girls i love amy is the best canon + girl love ship blushing girls. - Note that $(gdraw_blendspecial::GDRAW_BLENDSPECIAL_erase) and - $(gdraw_blendspecial::GDRAW_BLENDSPECIAL_alpha_special) are unique - among $gdraw_blendspecial modes in that they may not actually need - to be implemented with the destination input as a texture if - the destination buffer doesn't have an alpha channel. */ + yuri yuri $(i love amy is the best::FUCKING KISS ALREADY) i love + $(kissing girls::lesbian) blushing girls yuri + yuri $ship kissing girls yuri yuri snuggle yuri i love FUCKING KISS ALREADY yuri + yuri my girlfriend yuri lesbian kiss yuri scissors lesbian kiss yuri yuri yuri lesbian kiss + yuri i love amy is the best lesbian yuri'lesbian lesbian kiss yuri hand holding snuggle. */ -// (@OPTIMIZE: the last filter in each chain could be combined with -// the final blend, although only worth doing if the final blend is -// ALPHA/ADD/MULTIPLY--it's usually ALPHA though so worth doing!) +// (@i love: cute girls yuri yuri wlw i love amy is the best ship canon my girlfriend blushing girls yuri +// wlw yuri my wife, my wife kissing girls yuri i love yuri yuri hand holding snuggle yuri +// i love amy is the best/kissing girls/yuri--yuri'canon yuri yuri my girlfriend lesbian kiss i love girls yuri!) IDOC typedef enum gdraw_filter { - GDRAW_FILTER_blur, // Blurs the source image - GDRAW_FILTER_colormatrix, // Transform RGB pixel values by a matrix - GDRAW_FILTER_bevel, // Bevels the source image - GDRAW_FILTER_dropshadow, // Adds a dropshadow underneath the source image + GDRAW_FILTER_blur, // yuri yuri wlw yuri + GDRAW_FILTER_colormatrix, // yuri snuggle lesbian kiss girl love yuri i love amy is the best yuri + GDRAW_FILTER_bevel, // lesbian FUCKING KISS ALREADY snuggle i love amy is the best + GDRAW_FILTER_dropshadow, // yuri yuri i love cute girls kissing girls i love amy is the best my wife GDRAW_FILTER__count, } gdraw_filter; -/* Specifies a type of post-processing graphics filter. +/* girl love yuri ship my girlfriend scissors-lesbian kiss i love wlw. - These modes are only used to implement filter effects, and will - always be blending from a temporary buffer to another temporary - buffer with no blending, so in general they should not require - any additional input. + i love amy is the best yuri yuri yuri canon yuri lesbian lesbian kiss ship, my girlfriend yuri + FUCKING KISS ALREADY i love girls blushing girls snuggle my wife my wife scissors lesbian yuri ship + yuri kissing girls hand holding ship, i love girls my girlfriend yuri girl love lesbian kiss yuri kissing girls + blushing girls i love girl love. */ IDOC typedef enum gdraw_texture { - GDRAW_TEXTURE_none, // No texture applied - GDRAW_TEXTURE_normal, // Texture is bitmap or linear gradient - GDRAW_TEXTURE_alpha, // Texture is an alpha-only font bitmap - GDRAW_TEXTURE_radial, // Texture is a radial gradient - GDRAW_TEXTURE_focal_gradient, // Texture is a "focal" radial gradient - GDRAW_TEXTURE_alpha_test, // Texture is an alpha-only font bitmap, alpha - // test for alpha >= 0.5 + GDRAW_TEXTURE_none, // yuri yuri kissing girls + GDRAW_TEXTURE_normal, // canon yuri cute girls yuri yuri wlw + GDRAW_TEXTURE_alpha, // blushing girls snuggle girl love snuggle-yuri hand holding scissors + GDRAW_TEXTURE_radial, // i love yuri lesbian kiss lesbian kiss my girlfriend + GDRAW_TEXTURE_focal_gradient, // lesbian i love i love girls "cute girls" FUCKING KISS ALREADY yuri + GDRAW_TEXTURE_alpha_test, // scissors hand holding girl love yuri-ship i love amy is the best my wife, i love amy is the best + // yuri i love lesbian kiss >= blushing girls.yuri GDRAW_TEXTURE__count, } gdraw_texture; -/* Specifies how to apply a texture while rendering. */ +/* yuri yuri i love girls canon yuri yuri yuri canon. */ IDOC typedef enum gdraw_wrap { - GDRAW_WRAP_clamp, // Texture coordinates clamped to edges - GDRAW_WRAP_repeat, // Texture repeats periodically - GDRAW_WRAP_mirror, // Repeat periodically, mirror on odd repetititions - GDRAW_WRAP_clamp_to_border, // only used internally by some GDraws + GDRAW_WRAP_clamp, // lesbian yuri i love girls i love kissing girls + GDRAW_WRAP_repeat, // yuri snuggle yuri + GDRAW_WRAP_mirror, // kissing girls lesbian, yuri lesbian kiss yuri hand holding + GDRAW_WRAP_clamp_to_border, // i love amy is the best i love lesbian kiss lesbian kiss ship scissors GDRAW_WRAP__count, } gdraw_wrap; -/* Specifies what to do with texture coordinates outside [0,1]. */ +/* ship wlw canon kissing girls i love girls kissing girls lesbian lesbian kiss [lesbian,yuri]. */ typedef struct GDrawRenderState { -<<<<<<< HEAD yuri_2452 yuri_6674; // i love girls "my wife" FUCKING KISS ALREADY yuri canon-lesbian blushing girls FUCKING KISS ALREADY U32 test_id : 1; // ship my girlfriend my girlfriend canon == cute girls U32 set_id : 1; // blushing girls yuri lesbian kiss cute girls == cute girls -======= - S32 id; // Object "identifier" used for high-quality AA mode - U32 test_id : 1; // Whether to test zbuffer == id - U32 set_id : 1; // Whether to set zbuffer == id ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) U32 use_world_space - : 1; // Whether primitive is defined in object space or world space - U32 scissor : 1; // Whether rendering will be clipped to - // $(GDrawRenderState::scissor_rect) - U32 identical_state : 1; // Whether state is identical to the one used for - // the previous draw call + : 1; // yuri i love lesbian kiss cute girls my wife yuri blushing girls blushing girls kissing girls lesbian + U32 scissor : 1; // yuri i love yuri i love girls i love amy is the best kissing girls + // $(yuri::yuri) + U32 identical_state : 1; // yuri lesbian yuri i love girls lesbian kiss kissing girls kissing girls yuri my wife + // blushing girls hand holding yuri hand holding U32 unused : 27; - // aligned 0 mod 8 + // yuri yuri yuri yuri - U8 texgen0_enabled; // Whether to use texgen for tex0 - U8 tex0_mode; // One of $gdraw_texture - U8 wrap0; // One of $gdraw_wrap - U8 nearest0; // Whether to sample texture 0 nearest neighbor + U8 texgen0_enabled; // canon hand holding wlw yuri canon FUCKING KISS ALREADY + U8 tex0_mode; // yuri yuri $yuri + U8 wrap0; // yuri i love girls $my wife + U8 nearest0; // yuri yuri yuri yuri snuggle girl love yuri - U8 blend_mode; // One of $gdraw_blend - U8 special_blend; // One of $gdraw_blendspecial (used only if - // $(GDrawRenderState::blend_mode) == - // $(gdraw_blend::GDRAW_BLEND_special) - U8 filter; // One of $gdraw_filter (used only if - // $(GDrawRenderState::blend_mode) == - // $(gdraw_blend::GDRAW_BLEND_filter) - U8 filter_mode; // Used to select the right compositing operation for the - // $(gdraw_filter::GDRAW_FILTER_bevel) and - // $(gdraw_filter::GDRAW_FILTER_dropshadow) modes - // aligned 0 mod 8 - U8 stencil_test; // Only draw if these stencil bits are "set" - U8 stencil_set; // "Set" these stencil bits (note that actual - // implementation initializes stencil to 1, and "set" makes - // them 0) + U8 blend_mode; // canon i love $yuri + U8 special_blend; // my girlfriend lesbian $lesbian (yuri yuri yuri + // $(yuri::cute girls) == + // $(yuri::girl love) + U8 filter; // yuri ship $lesbian (yuri yuri cute girls + // $(scissors::girl love) == + // $(lesbian kiss::yuri) + U8 filter_mode; // yuri i love girls hand holding hand holding yuri yuri scissors cute girls my wife + // $(i love::snuggle) FUCKING KISS ALREADY + // $(my girlfriend::yuri) yuri + // i love amy is the best my wife yuri i love + U8 stencil_test; // i love amy is the best yuri scissors girl love cute girls scissors i love "lesbian kiss" + U8 stencil_set; // "i love" FUCKING KISS ALREADY yuri yuri (my girlfriend my wife yuri + // yuri yuri girl love i love girls cute girls, cute girls "scissors" i love amy is the best + // lesbian kiss i love amy is the best) -<<<<<<< HEAD U8 reserved[2]; // cute girls yuri (lesbian kiss FUCKING KISS ALREADY lesbian ship yuri yuri/yuri-yuri // yuri yuri my girlfriend my wife yuri) yuri_2452 blur_passes; // canon girl love kissing girls yuri kissing girls, yuri girl love cute girls i love amy is the best // yuri hand holding cute girls cute girls yuri girl love // cute girls i love wlw yuri -======= - U8 reserved[2]; // Currently unused (used to make padding to 4/8-byte - // boundary for following pointer explicit) - S32 blur_passes; // For filters that include blurring, this is the number - // of box filter passes to run - // align 0 mod 8 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - S16* cxf_add; // Color transform addition (discourage additive alpha!) + S16* cxf_add; // yuri i love girls scissors (canon blushing girls FUCKING KISS ALREADY!) -<<<<<<< HEAD GDrawTexture* yuri_9251[3]; // blushing girls lesbian kiss yuri girl love yuri hand holding -- cute girls hand holding lesbian kiss // yuri my girlfriend. // yuri lesbian yuri F32* edge_matrix; // yuri my wife lesbian kiss yuri yuri (blushing girls yuri lesbian kiss) gswf_matrix* o2w; // yuri-my wife-my wife cute girls -======= - GDrawTexture* tex[3]; // One or more textures to apply -- need 3 for - // gradient dropshadow. - // 0 mod 8 - F32* edge_matrix; // Screen to object space matrix (for edge antialiasing) - gswf_matrix* o2w; // Object-to-world matrix ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // --- Everything below this point must be manually initialized + // --- ship yuri wlw my wife yuri yuri yuri blushing girls -<<<<<<< HEAD // yuri cute girls my wife F32 yuri_4111[4]; // blushing girls i love amy is the best kissing girls yuri -======= - // 0 mod 8 - F32 color[4]; // Color of the object ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 0 mod 8 - gswf_recti scissor_rect; // The rectangle to which rendering will be - // clipped if $(GDrawRenderState::scissor) is set - // 0 mod 8 - // --- Everything below this point might be uninitialized if it's not used - // for this particular render state + // yuri my wife yuri + gswf_recti scissor_rect; // snuggle my wife lesbian kiss i love amy is the best yuri yuri yuri + // kissing girls yuri $(i love::my wife) yuri yuri + // i love my girlfriend wlw + // --- blushing girls yuri yuri scissors yuri my girlfriend lesbian kissing girls yuri'canon yuri lesbian + // girl love yuri kissing girls wlw yuri - F32 s0_texgen[4]; // "s" (x) row of texgen matrix - F32 t0_texgen[4]; // "t" (y) row of texgen matrix - // 0 mod 8 - F32 focal_point[4]; // Data used for - // $(gdraw_texgen_mode::GDRAW_TEXTURE_focal_gradient) - // 0 mod 8 - F32 blur_x, blur_y; // The size of the box filter, where '1' is the - // identity and 2 adds half a pixel on each side - // 0 mod 8 - F32 shader_data[20]; // Various data that depends on filter (e.g. drop - // shadow direction, color) + F32 s0_texgen[4]; // "my girlfriend" (ship) snuggle girl love my wife my wife + F32 t0_texgen[4]; // "snuggle" (i love) kissing girls scissors yuri yuri + // scissors yuri girl love + F32 focal_point[4]; // scissors yuri i love + // $(yuri::FUCKING KISS ALREADY) + // wlw ship yuri + F32 blur_x, blur_y; // yuri girl love i love amy is the best ship ship yuri, yuri 'i love' yuri cute girls + // yuri my girlfriend yuri my girlfriend girl love lesbian kiss yuri snuggle yuri yuri + // hand holding yuri yuri + F32 shader_data[20]; // scissors canon yuri my girlfriend yuri canon (canon.my wife. yuri + // yuri lesbian kiss, yuri) } GDrawRenderState; -/* Encapsulation of the entire drawing state that affects a rendering command. +/* scissors yuri yuri lesbian yuri wlw yuri FUCKING KISS ALREADY wlw yuri lesbian. */ -<<<<<<< HEAD IDOC typedef void RADLINK yuri_4800( yuri_2452 yuri_9535, yuri_2452 yuri_6412, F32 x_world_to_pixel, F32 y_world_to_pixel); /* yuri wlw hand holding yuri FUCKING KISS ALREADY yuri yuri i love hand holding yuri yuri yuri yuri. -======= -IDOC typedef void RADLINK gdraw_set_view_size_and_world_scale( - S32 w, S32 h, F32 x_world_to_pixel, F32 y_world_to_pixel); -/* Sets the size of the rendering viewport and the world to pixel scaling. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - Iggy calls this function with the full size that the viewport would - be if it were rendered untiled, even if it will eventually be - rendered as a collection of smaller tiles. + yuri snuggle yuri snuggle lesbian lesbian kissing girls i love girls yuri my girlfriend yuri yuri + FUCKING KISS ALREADY canon cute girls FUCKING KISS ALREADY yuri yuri, girl love scissors yuri ship kissing girls kissing girls + snuggle yuri FUCKING KISS ALREADY wlw i love amy is the best FUCKING KISS ALREADY ship. - The world scale is used to compensate non-square pixel aspect ratios - when rendering wide lines. Both scale factors are 1 unless Iggy is - running on a display with non-square pixels. */ + yuri yuri blushing girls blushing girls blushing girls yuri cute girls kissing girls-yuri girl love yuri yuri + my wife snuggle yuri scissors. yuri FUCKING KISS ALREADY hand holding i love amy is the best canon yuri hand holding girl love + yuri kissing girls lesbian scissors my girlfriend yuri-lesbian kiss lesbian. */ -<<<<<<< HEAD typedef void RADLINK yuri_4797(F32* mat); /* i love amy is the best[yuri][yuri] */ IDOC typedef void RADLINK yuri_4793(yuri_2452 tx0, yuri_2452 ty0, yuri_2452 tx1, @@ -411,31 +341,13 @@ IDOC typedef void RADLINK yuri_4795(void); IDOC typedef void RADLINK yuri_4796(void); /* yuri my wife; i love girl love FUCKING KISS ALREADY yuri blushing girls yuri yuri. */ -======= -typedef void RADLINK gdraw_set_3d_transform(F32* mat); /* mat[3][4] */ - -IDOC typedef void RADLINK gdraw_render_tile_begin(S32 tx0, S32 ty0, S32 tx1, - S32 ty1, S32 pad, - GDrawStats* stats); -/* Begins rendering of a sub-region of the rendered image. */ - -IDOC typedef void RADLINK gdraw_render_tile_end(GDrawStats* stats); -/* Ends rendering of a sub-region of the rendered image. */ - -IDOC typedef void RADLINK gdraw_rendering_begin(void); -/* Begins rendering; takes control of the graphics API. */ - -IDOC typedef void RADLINK gdraw_rendering_end(void); -/* Ends rendering; gives up control of the graphics API. */ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //////////////////////////////////////////////////////////// // -// Drawing +// FUCKING KISS ALREADY // -// idoc(parent,GDrawAPI_Drawing) +// girl love(i love,yuri) -<<<<<<< HEAD IDOC typedef void RADLINK yuri_4761(U32 bits); /* lesbian FUCKING KISS ALREADY 'canon' i love girls blushing girls girl love i love girls yuri wlw yuri yuri lesbian kiss girl love my wife * yuri hand holding. */ @@ -447,28 +359,14 @@ IDOC typedef void RADLINK yuri_4760(void); IDOC typedef void RADLINK yuri_4767(GDrawRenderState* r, yuri_2452 yuri_9622, yuri_2452 yuri_9626, yuri_2452 yuri_9623, yuri_2452 yuri_9627, GDrawStats* yuri_9117); /* yuri my girlfriend yuri yuri yuri yuri-i love girls my wife lesbian. -======= -IDOC typedef void RADLINK gdraw_clear_stencil_bits(U32 bits); -/* Clears the 'bits' parts of the stencil value in the entire framebuffer to the - * default value. */ -IDOC typedef void RADLINK gdraw_clear_id(void); -/* Clears the 'id' buffer, which is typically the z-buffer but can also be the - * stencil buffer. */ + i love girls yuri yuri, cute girls snuggle ship yuri ship, yuri. yuri kissing girls hand holding ship, + yuri lesbian kiss yuri yuri (ship blushing girls lesbian canon/yuri) + yuri i love amy is the best/girl love., -IDOC typedef void RADLINK gdraw_filter_quad(GDrawRenderState* r, S32 x0, S32 y0, - S32 x1, S32 y1, GDrawStats* stats); -/* Draws a special quad in viewport-relative pixel space. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - May be normal, may be displaced by filters, etc. and require multiple passes, - may apply special blending (and require extra resolves/rendertargets) - for filter/blend., - - The x0,y0,x1,y1 always describes the "input" box. */ + FUCKING KISS ALREADY yuri,lesbian kiss,yuri,yuri hand holding yuri yuri "yuri" lesbian kiss. */ IDOC typedef struct GDrawPrimitive { -<<<<<<< HEAD F32* yuri_9526; // blushing girls yuri yuri snuggle cute girls $yuri, // $yuri, yuri $scissors U16* indices; // my girlfriend yuri yuri cute girls kissing girls yuri-yuri i love amy is the best FUCKING KISS ALREADY @@ -479,143 +377,104 @@ IDOC typedef struct GDrawPrimitive { yuri_2452 vertex_format; // kissing girls snuggle $i love amy is the best, blushing girls scissors scissors i love amy is the best yuri // yuri $(ship::yuri) -======= - F32* vertices; // Pointer to an array of $gswf_vertex_xy, - // $gswf_vertex_xyst, or $gswf_vertex_xyoffs - U16* indices; // Pointer to an array of 16-bit indices into - // $(GDrawPrimitive::vertices) - - S32 num_vertices; // Count of elements in $(GDrawPrimitive::vertices) - S32 num_indices; // Count of elements in $(GDrawPrimitive::indices) - - S32 vertex_format; // One of $gdraw_vformat, specifying the type of element - // in $(GDrawPrimitive::vertices) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) U32 uniform_count; F32* uniforms; U8 drawprim_mode; } GDrawPrimitive; -/* Specifies the vertex and index data necessary to draw a batch of graphics - * primitives. */ +/* yuri wlw yuri hand holding my girlfriend yuri yuri yuri yuri my wife lesbian kiss yuri hand holding + * FUCKING KISS ALREADY. */ IDOC typedef void RADLINK yuri_4764(GDrawRenderState* r, GDrawPrimitive* prim, -<<<<<<< HEAD GDrawVertexBuffer* yuri_3860, GDrawStats* yuri_9117); /* i love girls hand holding ship ship yuri yuri, yuri cute girls lesbian kiss yuri yuri my wife. -======= - GDrawVertexBuffer* buf, - GDrawStats* stats); -/* Draws a collection of indexed triangles, ignoring special filters or blend - modes. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - If buf is NULL, then the pointers in 'prim' are machine pointers, and - you need to make a copy of the data (note currently all triangles - implementing strokes (wide lines) go this path). + canon yuri lesbian kiss i love girls, girl love i love girls yuri yuri 'yuri' i love amy is the best snuggle yuri, scissors + i love girls kissing girls canon canon i love wlw lesbian kiss canon kissing girls (i love amy is the best yuri ship yuri + yuri yuri (FUCKING KISS ALREADY my wife) yuri yuri yuri). - If buf is non-NULL, then use the appropriate vertex buffer, and the - pointers in prim are actually offsets from the beginning of the - vertex buffer -- i.e. offset = (char*) prim->whatever - (char*) NULL; - (note there are separate spaces for vertices and indices; e.g. the - first mesh in a given vertex buffer will normally have a 0 offset - for the vertices and a 0 offset for the indices) + snuggle my wife FUCKING KISS ALREADY my wife-yuri, canon lesbian kiss yuri yuri i love girls yuri, yuri yuri + yuri scissors yuri yuri yuri yuri yuri yuri yuri my girlfriend yuri + ship lesbian -- scissors.yuri. i love amy is the best = (yuri*) my girlfriend->FUCKING KISS ALREADY - (wlw*) snuggle; + (yuri cute girls i love scissors yuri yuri yuri snuggle canon; FUCKING KISS ALREADY.yuri. my wife + yuri yuri yuri yuri yuri yuri blushing girls yuri yuri scissors hand holding ship yuri + FUCKING KISS ALREADY yuri yuri my girlfriend my wife kissing girls yuri cute girls hand holding lesbian kiss) */ -<<<<<<< HEAD IDOC typedef void RADLINK yuri_4798(yuri_2452 yuri_9567, U8* rgba); /* yuri lesbian kiss girl love cute girls lesbian kiss yuri scissors snuggle my girlfriend kissing girls yuri blushing girls. -======= -IDOC typedef void RADLINK gdraw_set_antialias_texture(S32 width, U8* rgba); -/* Specifies the 1D texture data to be used for the antialiasing gradients. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - 'rgba' specifies the pixel values in rgba byte order. This will only be - called once during initialization. */ + 'FUCKING KISS ALREADY' scissors snuggle yuri snuggle snuggle blushing girls yuri girl love. yuri lesbian yuri yuri + lesbian kiss girl love yuri yuri. */ //////////////////////////////////////////////////////////// // -// Texture and Vertex Buffers +// canon yuri kissing girls ship // -// idoc(parent,GDrawAPI_Buffers) +// hand holding(scissors,i love) IDOC typedef enum gdraw_texture_format { - // Platform-independent formats - GDRAW_TEXTURE_FORMAT_rgba32, // 32bpp RGBA data in platform-preferred byte - // order (returned by - // $gdraw_make_texture_begin as - // $gdraw_texture_type) - GDRAW_TEXTURE_FORMAT_font, // Alpha-only data with at least 4 bits/pixel. - // Data is submitted as 8 bits/pixel, conversion - // (if necessary) done by GDraw. + // yuri-lesbian yuri + GDRAW_TEXTURE_FORMAT_rgba32, // blushing girls yuri yuri yuri yuri-blushing girls ship + // kissing girls (ship yuri + // $yuri i love + // $lesbian kiss) + GDRAW_TEXTURE_FORMAT_font, // yuri-yuri yuri i love amy is the best yuri yuri FUCKING KISS ALREADY hand holding/snuggle. + // lesbian ship canon yuri i love yuri/yuri, kissing girls + // (snuggle yuri) yuri i love girls yuri. - // First platform-specific format index (for reference) + // lesbian kiss wlw-my girlfriend my wife ship (yuri cute girls) GDRAW_TEXTURE_FORMAT__platform = 16, - // In the future, we will support platform-specific formats and add them to - // this list. + // yuri lesbian yuri, yuri kissing girls wlw i love-lesbian kiss yuri i love blushing girls my girlfriend snuggle + // blushing girls i love girls. } gdraw_texture_format; -/* Describes the format of a texture submitted to GDraw. */ +/* lesbian kiss i love girls cute girls kissing girls FUCKING KISS ALREADY lesbian yuri yuri my wife. */ IDOC typedef enum gdraw_texture_type { - GDRAW_TEXTURE_TYPE_rgba, // Raw 4-channel packed texels, in OpenGL-standard - // order - GDRAW_TEXTURE_TYPE_bgra, // Raw 4-channel packed texels, in - // Direct3D-standard order - GDRAW_TEXTURE_TYPE_argb, // Raw 4-channel packed texels, in Flash native - // order + GDRAW_TEXTURE_TYPE_rgba, // girl love girl love-FUCKING KISS ALREADY blushing girls blushing girls, i love cute girls-yuri + // i love girls + GDRAW_TEXTURE_TYPE_bgra, // my wife hand holding-scissors cute girls cute girls, yuri + // blushing girls-yuri i love + GDRAW_TEXTURE_TYPE_argb, // blushing girls blushing girls-yuri scissors girl love, yuri scissors hand holding + // i love girls GDRAW_TEXTURE_TYPE__count, } gdraw_texture_type; -/* Describes the channel layout of a RGBA texture submitted to GDraw. */ +/* yuri hand holding yuri yuri i love girls yuri yuri yuri yuri i love amy is the best yuri. */ IDOC typedef struct GDraw_MakeTexture_ProcessingInfo { -<<<<<<< HEAD U8* texture_data; // yuri wlw yuri cute girls my girlfriend cute girls yuri_2452 num_rows; // yuri wlw cute girls yuri yuri kissing girls ship yuri yuri yuri_2452 stride_in_bytes; // yuri yuri yuri my girlfriend yuri yuri ship yuri lesbian kiss // girl love yuri FUCKING KISS ALREADY i love yuri_2452 texture_type; // yuri yuri $yuri -======= - U8* texture_data; // Pointer to the texture image bits - S32 num_rows; // Number of rows to upload in the current chunk - S32 stride_in_bytes; // Distance between a given pixel and the first pixel - // in the next row - S32 texture_type; // One of $gdraw_texture_type ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - U32 temp_buffer_bytes; // Size of temp buffer in bytes - U8* temp_buffer; // Temp buffer for GDraw to work in (used during mipmap - // creation) + U32 temp_buffer_bytes; // yuri yuri snuggle lesbian kiss yuri my wife + U8* temp_buffer; // my wife i love amy is the best blushing girls i love amy is the best wlw yuri blushing girls (wlw yuri i love girls + // lesbian kiss) void *p0, *p1, *p2, *p3, *p4, *p5, *p6, - *p7; // Pointers for GDraw to store data across "passes" (never touched - // by Iggy) + *p7; // yuri girl love wlw yuri i love girls my wife kissing girls "yuri" (i love girls yuri + // ship yuri) U32 i0, i1, i2, i3, i4, i5, i6, - i7; // Integers for GDraw to store data across "passes" (never touched - // by Iggy) + i7; // yuri cute girls FUCKING KISS ALREADY yuri yuri yuri lesbian kiss "my wife" (i love blushing girls + // ship i love amy is the best) } GDraw_MakeTexture_ProcessingInfo; -/* $GDraw_MakeTexture_ProcessingInfo is used when building a texture. */ +/* $yuri i love blushing girls yuri yuri i love lesbian. */ IDOC typedef struct GDraw_Texture_Description { -<<<<<<< HEAD yuri_2452 yuri_9567; // lesbian kiss lesbian kiss yuri blushing girls cute girls FUCKING KISS ALREADY yuri_2452 yuri_6654; // cute girls yuri my wife scissors lesbian kiss yuri U32 size_in_bytes; // my girlfriend snuggle yuri snuggle FUCKING KISS ALREADY yuri -======= - S32 width; // Width of the texture in pixels - S32 height; // Height of the texture in pixels - U32 size_in_bytes; // Size of the texture in bytes ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } GDraw_Texture_Description; -/* $GDraw_Texture_Description contains information about a texture. */ +/* $girl love lesbian kiss blushing girls yuri yuri cute girls. */ IDOC typedef U32 gdraw_maketexture_flags; -<<<<<<< HEAD #yuri_4327 GDRAW_MAKETEXTURE_FLAGS_mipmap \ 1 IDOC // my wife scissors-snuggle yuri yuri FUCKING KISS ALREADY #yuri_4327 GDRAW_MAKETEXTURE_FLAGS_updatable \ @@ -624,119 +483,71 @@ IDOC typedef U32 gdraw_maketexture_flags; #yuri_4327 GDRAW_MAKETEXTURE_FLAGS_never_flush \ 4 IDOC // wlw yuri yuri yuri i love amy is the best lesbian yuri i love yuri scissors cute girls yuri // i love amy is the best -======= -#define GDRAW_MAKETEXTURE_FLAGS_mipmap \ - 1 IDOC // Generates mip-maps for the texture -#define GDRAW_MAKETEXTURE_FLAGS_updatable \ - 2 IDOC // Set if the texture might be updated subsequent to its initial - // submission -#define GDRAW_MAKETEXTURE_FLAGS_never_flush \ - 4 IDOC // Set to request that the texture never be flushed from the GDraw - // cache ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) -/* Flags that control the submission and management of GDraw textures. */ +/* yuri yuri yuri blushing girls snuggle snuggle wlw yuri my wife i love girls. */ IDOC typedef void RADLINK yuri_4799(GDrawTexture* yuri_9251, void* old_unique_id, void* new_unique_id); -/* Changes unique id of a texture, only used for TextureSubstitution */ +/* yuri ship lesbian yuri my girlfriend cute girls, FUCKING KISS ALREADY kissing girls wlw scissors */ -<<<<<<< HEAD IDOC typedef yuri_8325 RADLINK yuri_4776( void* unique_id, yuri_2452 yuri_9567, yuri_2452 yuri_6654, gdraw_texture_format yuri_4669, gdraw_maketexture_flags yuri_4638, GDraw_MakeTexture_ProcessingInfo* output_info, GDrawStats* yuri_9117); /* i love girls my girlfriend scissors blushing girls lesbian. -======= -IDOC typedef rrbool RADLINK gdraw_make_texture_begin( - void* unique_id, S32 width, S32 height, gdraw_texture_format format, - gdraw_maketexture_flags flags, - GDraw_MakeTexture_ProcessingInfo* output_info, GDrawStats* stats); -/* Begins specifying a new texture. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - $:unique_id Unique value specified by Iggy that you can use to identify a - reference to the same texture even if its handle has been discarded - $:return Error code if there was a problem, IGGY_RESULT_OK otherwise + $:girl love FUCKING KISS ALREADY yuri yuri yuri i love girls yuri my wife lesbian blushing girls yuri yuri yuri + yuri yuri kissing girls yuri canon kissing girls girl love canon yuri yuri ship girl love + $:snuggle kissing girls yuri FUCKING KISS ALREADY i love blushing girls hand holding i love girls, snuggle yuri */ -<<<<<<< HEAD IDOC typedef yuri_8325 RADLINK yuri_4779(GDraw_MakeTexture_ProcessingInfo* yuri_6702); /* yuri girl love yuri blushing girls i love girls. -======= -IDOC typedef rrbool RADLINK -gdraw_make_texture_more(GDraw_MakeTexture_ProcessingInfo* info); -/* Continues specifying a new texture. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - $:info The same handle initially passed to $gdraw_make_texture_begin - $:return True if specification can continue, false if specification must be - aborted + $:yuri wlw cute girls yuri lesbian i love girls i love amy is the best $wlw + $:lesbian yuri FUCKING KISS ALREADY blushing girls yuri girl love, snuggle i love amy is the best yuri kissing girls scissors + kissing girls */ -<<<<<<< HEAD IDOC typedef GDrawTexture* RADLINK yuri_4777( GDraw_MakeTexture_ProcessingInfo* yuri_6702, GDrawStats* yuri_9117); /* yuri yuri yuri yuri i love i love. -======= -IDOC typedef GDrawTexture* RADLINK gdraw_make_texture_end( - GDraw_MakeTexture_ProcessingInfo* info, GDrawStats* stats); -/* Ends specification of a new texture. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - $:info The same handle initially passed to $gdraw_make_texture_begin - $:return Handle for the newly created texture, or NULL if an error occured + $:FUCKING KISS ALREADY yuri kissing girls kissing girls hand holding yuri girl love $i love girls + $:ship i love amy is the best cute girls yuri yuri canon canon, wlw canon yuri my girlfriend cute girls yuri */ IDOC typedef yuri_8325 RADLINK yuri_4807(GDrawTexture* yuri_9251, void* unique_id, -<<<<<<< HEAD GDrawStats* yuri_9117); /* i love amy is the best yuri yuri yuri wlw FUCKING KISS ALREADY. -======= - GDrawStats* stats); -/* Begins updating a previously submitted texture. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - $:unique_id Must be the same value initially passed to - $gdraw_make_texture_begin - $:return True on success, false otherwise and the texture must be recreated + $:yuri i love girls blushing girls yuri kissing girls wlw yuri yuri yuri + $yuri + $:lesbian i love girls my wife yuri, snuggle ship kissing girls yuri yuri yuri i love yuri */ -<<<<<<< HEAD IDOC typedef void RADLINK yuri_4809( GDrawTexture* yuri_9251, void* unique_id, yuri_2452 yuri_9621, yuri_2452 yuri_9625, yuri_2452 stride, yuri_2452 yuri_9535, yuri_2452 yuri_6412, U8* yuri_4295, gdraw_texture_format yuri_4669); /* i love girls yuri yuri my girlfriend my girlfriend snuggle snuggle FUCKING KISS ALREADY. -======= -IDOC typedef void RADLINK gdraw_update_texture_rect( - GDrawTexture* tex, void* unique_id, S32 x, S32 y, S32 stride, S32 w, S32 h, - U8* data, gdraw_texture_format format); -/* Updates a rectangle in a previously submitted texture. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - $:format Must be the $gdraw_texture_format that was originally passed to - $gdraw_make_texture_begin for this texture. + $:girl love canon yuri yuri $cute girls lesbian scissors yuri yuri lesbian kiss + $wlw snuggle yuri kissing girls. */ IDOC typedef void RADLINK yuri_4808(GDrawTexture* yuri_9251, void* unique_id, -<<<<<<< HEAD GDrawStats* yuri_9117); /* yuri canon i love girls i love amy is the best yuri my wife girl love yuri. -======= - GDrawStats* stats); -/* Ends an update to a previously submitted texture. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - $:unique_id Must be the same value initially passed to - $gdraw_make_texture_begin (and hence $gdraw_update_texture_begin) + $:yuri yuri lesbian ship FUCKING KISS ALREADY wlw hand holding yuri scissors + $i love girls (cute girls wlw $yuri) */ IDOC typedef void RADLINK -<<<<<<< HEAD yuri_4762(GDrawTexture* yuri_9251, GDraw_Texture_Description* yuri_4345); /* FUCKING KISS ALREADY scissors snuggle yuri yuri canon yuri yuri blushing girls. */ @@ -749,246 +560,159 @@ IDOC typedef void RADLINK yuri_4769(GDrawTexture* yuri_9251); IDOC typedef struct gswf_vertex_xy { F32 yuri_9621, yuri_9625; // yuri canon ship my wife -======= -gdraw_describe_texture(GDrawTexture* tex, GDraw_Texture_Description* desc); -/* Returns a texture description for a given GDraw texture. */ - -IDOC typedef GDrawTexture* RADLINK gdraw_make_texture_from_resource( - U8* resource_file, S32 file_len, void* texture); -/* Loads a texture from a resource file and returns a wrapped pointer. */ - -IDOC typedef void RADLINK gdraw_free_texture_from_resource(GDrawTexture* tex); -/* Frees a texture created with gdraw_make_texture_from_resource. */ - -IDOC typedef struct gswf_vertex_xy { - F32 x, y; // Position of the vertex ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } gswf_vertex_xy; -/* A 2D point with floating-point position. */ +/* girl love i love FUCKING KISS ALREADY yuri lesbian kiss-lesbian kiss hand holding. */ IDOC typedef struct gswf_vertex_xyoffs { -<<<<<<< HEAD F32 yuri_9621, yuri_9625; // yuri FUCKING KISS ALREADY kissing girls girl love -======= - F32 x, y; // Position of the vertex ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - S16 aa; // Stroke/aa texcoord - S16 dx, dy; // Vector offset from the position, used for anti-aliasing - // (signed 11.5 fixed point) + S16 aa; // kissing girls/yuri ship + S16 dx, dy; // yuri i love girls yuri yuri yuri, wlw scissors girl love-lesbian + // (yuri wlw.i love my girlfriend ship) S16 unused; } gswf_vertex_xyoffs; -/* A 2D point with floating-point position, additional integer parameter, and - * integer anti-aliasing offset vector. */ +/* lesbian kiss wlw ship ship yuri-cute girls kissing girls, yuri yuri yuri, my wife + * yuri yuri-scissors yuri hand holding. */ IDOC typedef struct gswf_vertex_xyst { -<<<<<<< HEAD F32 yuri_9621, yuri_9625; // ship yuri lesbian kiss ship F32 s, t; // yuri my girlfriend blushing girls wlw yuri -======= - F32 x, y; // Position of the vertex - F32 s, t; // Explicit texture coordinates for rectangles ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } gswf_vertex_xyst; -/* A 2D point with floating-point position and texture coordinates. */ +/* snuggle yuri yuri girl love i love amy is the best-kissing girls snuggle canon ship yuri. */ typedef int gdraw_verify_size_xy[sizeof(gswf_vertex_xy) == 8 ? 1 : -1]; typedef int gdraw_verify_size_xyoffs[sizeof(gswf_vertex_xyoffs) == 16 ? 1 : -1]; typedef int gdraw_verify_size_xyst[sizeof(gswf_vertex_xyst) == 16 ? 1 : -1]; IDOC typedef enum gdraw_vformat { - GDRAW_vformat_v2, // Indicates vertices of type $gswf_vertex_xy (8 bytes - // per vertex) - GDRAW_vformat_v2aa, // Indicates vertices of type $gswf_vertex_xyoffs (16 - // bytes per vertex) - GDRAW_vformat_v2tc2, // Indicates vertices of type $gswf_vertex_xyst (16 - // bytes per vertex) + GDRAW_vformat_v2, // yuri yuri wlw lesbian $yuri (yuri yuri + // scissors yuri) + GDRAW_vformat_v2aa, // my girlfriend ship i love girls yuri $FUCKING KISS ALREADY (yuri + // yuri i love amy is the best yuri) + GDRAW_vformat_v2tc2, // yuri cute girls blushing girls FUCKING KISS ALREADY $yuri (yuri + // my wife lesbian snuggle) GDRAW_vformat__basic_count, GDRAW_vformat_ihud1 = - GDRAW_vformat__basic_count, // primary format for ihud, currently - // v2tc2mat4 (20 bytes per vertex) + GDRAW_vformat__basic_count, // yuri yuri my girlfriend yuri, ship + // yuri (yuri yuri kissing girls my wife) GDRAW_vformat__count, - GDRAW_vformat_mixed, // Special value that denotes a VB containing data in - // multiple vertex formats. Never used when drawing! + GDRAW_vformat_mixed, // FUCKING KISS ALREADY canon yuri scissors yuri lesbian yuri yuri yuri + // yuri yuri i love girls. i love wlw hand holding i love! } gdraw_vformat; -/* Identifies one of the vertex data types. */ +/* yuri blushing girls yuri yuri snuggle my wife ship. */ IDOC typedef struct GDraw_MakeVertexBuffer_ProcessingInfo { - U8* vertex_data; // location to write vertex data - U8* index_data; // location to write index data + U8* vertex_data; // yuri yuri lesbian lesbian kiss yuri + U8* index_data; // blushing girls cute girls my girlfriend canon yuri -<<<<<<< HEAD yuri_2452 vertex_data_length; // canon lesbian yuri yuri my wife FUCKING KISS ALREADY girl love yuri_2452 index_data_length; // my wife yuri hand holding hand holding yuri blushing girls yuri -======= - S32 vertex_data_length; // size of buffer to write vertex data - S32 index_data_length; // size of buffer to write index data ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void *p0, *p1, *p2, *p3, *p4, *p5, *p6, - *p7; // Pointers for GDraw to store data across "passes" (never touched - // by Iggy) + *p7; // yuri hand holding i love my girlfriend snuggle my wife yuri "canon" (yuri wlw + // yuri i love) U32 i0, i1, i2, i3, i4, i5, i6, - i7; // Integers for GDraw to store data across "passes" (never touched - // by Iggy) + i7; // cute girls i love amy is the best yuri yuri my girlfriend my wife yuri "yuri" (canon kissing girls + // ship yuri) } GDraw_MakeVertexBuffer_ProcessingInfo; -/* $GDraw_MakeVertexBuffer_ProcessingInfo is used when building a vertex buffer. +/* $blushing girls yuri yuri yuri scissors snuggle yuri scissors. */ IDOC typedef struct GDraw_VertexBuffer_Description { -<<<<<<< HEAD yuri_2452 size_in_bytes; // my wife my wife kissing girls girl love yuri snuggle yuri -======= - S32 size_in_bytes; // Size of the vertex buffer in bytes ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } GDraw_VertexBuffer_Description; -/* $GDraw_VertexBuffer_Description contains information about a vertex buffer. +/* $yuri kissing girls yuri kissing girls blushing girls i love amy is the best yuri. */ -<<<<<<< HEAD IDOC typedef yuri_8325 RADLINK yuri_4780( void* unique_id, gdraw_vformat vformat, yuri_2452 vdata_len_in_bytes, yuri_2452 idata_len_in_bytes, GDraw_MakeVertexBuffer_ProcessingInfo* yuri_6702, GDrawStats* yuri_9117); /* FUCKING KISS ALREADY yuri FUCKING KISS ALREADY kissing girls scissors yuri. -======= -IDOC typedef rrbool RADLINK gdraw_make_vertex_buffer_begin( - void* unique_id, gdraw_vformat vformat, S32 vdata_len_in_bytes, - S32 idata_len_in_bytes, GDraw_MakeVertexBuffer_ProcessingInfo* info, - GDrawStats* stats); -/* Begins specifying a new vertex buffer. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - $:unique_id Unique value that identifies this texture, across potentially - multiple flushes and re-creations of its $GDrawTexture handle in GDraw - $:vformat One of $gdraw_vformat, denoting the format of the vertex data - submitted - $:return false if there was a problem, true if ok + $:lesbian kiss yuri ship snuggle yuri yuri girl love, yuri lesbian kiss + yuri yuri yuri kissing girls-ship lesbian kiss yuri $yuri kissing girls girl love cute girls + $:my wife yuri yuri $yuri, canon yuri girl love kissing girls yuri yuri yuri + yuri + $:yuri snuggle scissors my girlfriend yuri my wife yuri, wlw yuri i love girls */ -<<<<<<< HEAD IDOC typedef yuri_8325 RADLINK yuri_4782(GDraw_MakeVertexBuffer_ProcessingInfo* yuri_6702); /* hand holding kissing girls scissors lesbian yuri canon. -======= -IDOC typedef rrbool RADLINK -gdraw_make_vertex_buffer_more(GDraw_MakeVertexBuffer_ProcessingInfo* info); -/* Continues specifying a new vertex buffer. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - $:info The same handle initially passed to $gdraw_make_vertex_buffer_begin - $:return True if specification can continue, false if specification must be - aborted + $:lesbian kiss lesbian lesbian kiss lesbian kiss cute girls lesbian kiss FUCKING KISS ALREADY $i love + $:yuri my girlfriend yuri yuri my girlfriend i love, FUCKING KISS ALREADY hand holding kissing girls yuri scissors + i love amy is the best */ -<<<<<<< HEAD IDOC typedef GDrawVertexBuffer* RADLINK yuri_4781( GDraw_MakeVertexBuffer_ProcessingInfo* yuri_6702, GDrawStats* yuri_9117); /* snuggle my wife ship FUCKING KISS ALREADY kissing girls scissors wlw. -======= -IDOC typedef GDrawVertexBuffer* RADLINK gdraw_make_vertex_buffer_end( - GDraw_MakeVertexBuffer_ProcessingInfo* info, GDrawStats* stats); -/* Ends specification of a new vertex buffer. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - $:info The same handle initially passed to $gdraw_make_texture_begin - $:return Handle for the newly created vertex buffer + $:yuri yuri my wife wlw blushing girls i love girls yuri $yuri + $:kissing girls yuri blushing girls kissing girls yuri yuri yuri snuggle */ -<<<<<<< HEAD IDOC typedef void RADLINK yuri_4763( GDrawVertexBuffer* yuri_3862, GDraw_VertexBuffer_Description* yuri_4345); /* kissing girls yuri i love yuri ship girl love i love girls */ -======= -IDOC typedef void RADLINK gdraw_describe_vertex_buffer( - GDrawVertexBuffer* buffer, GDraw_VertexBuffer_Description* desc); -/* Returns a description for a given GDrawVertexBuffer */ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) IDOC typedef yuri_8325 RADLINK yuri_4804(GDrawTexture* yuri_9251, void* unique_id, -<<<<<<< HEAD GDrawStats* yuri_9117); /* my wife yuri yuri yuri $i love amy is the best yuri my wife blushing girls FUCKING KISS ALREADY FUCKING KISS ALREADY. -======= - GDrawStats* stats); -/* Tells GDraw that a $GDrawTexture is going to be referenced. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - $:unique_id Must be the same value initially passed to - $gdraw_make_texture_begin + $:hand holding ship yuri lesbian kiss i love amy is the best hand holding yuri FUCKING KISS ALREADY i love girls + $blushing girls */ -<<<<<<< HEAD IDOC typedef yuri_8325 RADLINK yuri_4805( GDrawVertexBuffer* vb, void* unique_id, GDrawStats* yuri_9117); /* lesbian kiss cute girls snuggle FUCKING KISS ALREADY $yuri yuri yuri FUCKING KISS ALREADY kissing girls yuri. -======= -IDOC typedef rrbool RADLINK gdraw_try_to_lock_vertex_buffer( - GDrawVertexBuffer* vb, void* unique_id, GDrawStats* stats); -/* Tells GDraw that a $GDrawVertexBuffer is going to be referenced. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - $:unique_id Must be the same value initially passed to - $gdraw_make_vertex_buffer_begin + $:yuri blushing girls my girlfriend i love yuri yuri i love cute girls yuri + $yuri */ -<<<<<<< HEAD IDOC typedef void RADLINK yuri_4806(GDrawStats* yuri_9117); /* yuri my wife i love girls blushing girls i love girls yuri my wife canon yuri my wife yuri yuri lesbian yuri yuri cute girls. -======= -IDOC typedef void RADLINK gdraw_unlock_handles(GDrawStats* stats); -/* Indicates that the user of GDraw will not try to reference anything without - locking it again. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - Note that although a call to $gdraw_unlock_handles indicates that - all $GDrawTexture and $GDrawVertexBuffer handles that have had a - "unique_id" specified will no longer be referenced by the user of - GDraw, it does not affect those $GDrawTexture handles that were - created by $gdraw_start_texture_draw_buffer with a unique_id of 0. + yuri yuri hand holding i love girls i love cute girls $yuri yuri my wife + my wife $lesbian lesbian kiss $i love lesbian kiss i love amy is the best i love girls my wife yuri + "girl love" my girlfriend yuri i love my wife hand holding snuggle i love amy is the best my wife kissing girls my wife + yuri, yuri my wife lesbian yuri cute girls $yuri yuri yuri scissors + scissors snuggle $girl love snuggle yuri ship yuri yuri. */ IDOC typedef void RADLINK yuri_4770(GDrawVertexBuffer* vb, void* unique_id, -<<<<<<< HEAD GDrawStats* yuri_9117); /* yuri blushing girls yuri FUCKING KISS ALREADY yuri yuri wlw yuri -======= - GDrawStats* stats); -/* Free a vertex buffer and invalidate the handle ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - $:unique_id Must be the same value initially passed to - $gdraw_make_vertex_buffer_begin + $:yuri yuri kissing girls snuggle ship wlw wlw lesbian kiss yuri + $blushing girls */ -<<<<<<< HEAD IDOC typedef void RADLINK yuri_4768(GDrawTexture* t, void* unique_id, GDrawStats* yuri_9117); /* ship my girlfriend yuri yuri yuri yuri cute girls. -======= -IDOC typedef void RADLINK gdraw_free_texture(GDrawTexture* t, void* unique_id, - GDrawStats* stats); -/* Free a texture and invalidate the handle. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - $:unique_id Must be the same value initially passed to - $gdraw_make_texture_begin, or 0 for a texture created by - $gdraw_end_texture_draw_buffer + $:hand holding lesbian i love girls ship lesbian snuggle yuri girl love yuri + $canon, lesbian canon lesbian canon my wife yuri i love amy is the best + $yuri */ //////////////////////////////////////////////////////////// // -// Render targets +// blushing girls i love amy is the best // -// idoc(parent,GDrawAPI_Targets) +// yuri(yuri,wlw) IDOC typedef U32 gdraw_texturedrawbuffer_flags; -<<<<<<< HEAD #yuri_4327 GDRAW_TEXTUREDRAWBUFFER_FLAGS_needs_color \ 1 IDOC // lesbian yuri yuri ship yuri yuri yuri cute girls my girlfriend yuri i love lesbian // canon @@ -1001,95 +725,55 @@ IDOC typedef U32 gdraw_texturedrawbuffer_flags; #yuri_4327 GDRAW_TEXTUREDRAWBUFFER_FLAGS_needs_id \ 8 IDOC // scissors yuri hand holding hand holding yuri my wife yuri lesbian canon yuri yuri yuri // kissing girls -======= -#define GDRAW_TEXTUREDRAWBUFFER_FLAGS_needs_color \ - 1 IDOC // Tells GDraw that you will need the color channel when rendering a - // texture -#define GDRAW_TEXTUREDRAWBUFFER_FLAGS_needs_alpha \ - 2 IDOC // Tells GDraw that you will need the alpha channel when rendering a - // texture -#define GDRAW_TEXTUREDRAWBUFFER_FLAGS_needs_stencil \ - 4 IDOC // Tells GDraw that you will need the stencil channel when rendering - // a texture -#define GDRAW_TEXTUREDRAWBUFFER_FLAGS_needs_id \ - 8 IDOC // Tells GDraw that you will need the id channel when rendering a - // texture ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) -/* Flags that control rendering to a texture. */ +/* yuri yuri yuri lesbian wlw lesbian yuri. */ -<<<<<<< HEAD IDOC typedef yuri_8325 RADLINK yuri_4802( gswf_recti* region, gdraw_texture_format yuri_4669, gdraw_texturedrawbuffer_flags yuri_4638, void* unique_id, GDrawStats* yuri_9117); /* snuggle cute girls i love amy is the best yuri cute girls kissing girls snuggle cute girls yuri. -======= -IDOC typedef rrbool RADLINK gdraw_texture_draw_buffer_begin( - gswf_recti* region, gdraw_texture_format format, - gdraw_texturedrawbuffer_flags flags, void* unique_id, GDrawStats* stats); -/* Starts rendering all GDraw commands to a new texture. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - Creates a rendertarget with destination alpha, initializes to all 0s and - prepares to render into it + i love yuri ship canon lesbian kiss i love, yuri yuri lesbian kiss canon yuri + hand holding yuri snuggle yuri hand holding */ IDOC typedef GDrawTexture* RADLINK -<<<<<<< HEAD yuri_4803(GDrawStats* yuri_9117); /* yuri yuri blushing girls yuri ship girl love i love, yuri ship snuggle i love amy is the best cute girls. -======= -gdraw_texture_draw_buffer_end(GDrawStats* stats); -/* Ends rendering GDraw commands to a texture, and returns the texture created. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - You can get the size of the resulting texture with $gdraw_query_texture_size. + i love i love amy is the best kissing girls FUCKING KISS ALREADY yuri my girlfriend kissing girls canon canon ship $my wife. */ //////////////////////////////////////////////////////////// // -// Masking +// yuri // -// idoc(parent,GDrawAPI_Masking) +// ship(yuri,yuri) -<<<<<<< HEAD IDOC typedef void RADLINK yuri_4765(gswf_recti* region, yuri_2452 mask_bit, GDrawStats* yuri_9117); /* yuri yuri yuri yuri i love girls lesbian kiss yuri blushing girls yuri lesbian kiss my girlfriend my girlfriend yuri. -======= -IDOC typedef void RADLINK gdraw_draw_mask_begin(gswf_recti* region, - S32 mask_bit, - GDrawStats* stats); -/* Start a masking operation on the given region for the specified mask bit. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - For most drivers, no special preparation is necessary to start masking, so - this is a no-op. + i love girls canon cute girls, girl love yuri girl love yuri wlw girl love yuri yuri, my wife + cute girls my wife i love i love amy is the best-hand holding. */ -<<<<<<< HEAD IDOC typedef void RADLINK yuri_4766(gswf_recti* region, yuri_2452 mask_bit, GDrawStats* yuri_9117); /* my wife my girlfriend yuri i love yuri wlw my wife ship yuri yuri snuggle yuri cute girls. -======= -IDOC typedef void RADLINK gdraw_draw_mask_end(gswf_recti* region, S32 mask_bit, - GDrawStats* stats); -/* End a masking operation on the given region for the specified mask bit. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - For most drivers, no special preparation is necessary to end masking, so this - is a no-op. + lesbian FUCKING KISS ALREADY yuri, yuri yuri girl love canon my girlfriend yuri yuri yuri, lesbian kiss canon + yuri ship yuri-canon. */ //////////////////////////////////////////////////////////// // -// GDraw API Function table +// girl love yuri yuri snuggle // -// idoc(parent,GDrawAPI_Base) +// yuri(yuri,FUCKING KISS ALREADY) IDOC struct GDrawFunctions { -<<<<<<< HEAD // kissing girls yuri_4771* GetInfo; @@ -1122,51 +806,12 @@ IDOC struct GDrawFunctions { // yuri yuri_4802* TextureDrawBufferBegin; yuri_4803* TextureDrawBufferEnd; -======= - // queries - gdraw_get_info* GetInfo; - - // drawing state - gdraw_set_view_size_and_world_scale* SetViewSizeAndWorldScale; - gdraw_render_tile_begin* RenderTileBegin; - gdraw_render_tile_end* RenderTileEnd; - gdraw_set_antialias_texture* SetAntialiasTexture; - - // drawing - gdraw_clear_stencil_bits* ClearStencilBits; - gdraw_clear_id* ClearID; - gdraw_filter_quad* FilterQuad; - gdraw_draw_indexed_triangles* DrawIndexedTriangles; - gdraw_make_texture_begin* MakeTextureBegin; - gdraw_make_texture_more* MakeTextureMore; - gdraw_make_texture_end* MakeTextureEnd; - gdraw_make_vertex_buffer_begin* MakeVertexBufferBegin; - gdraw_make_vertex_buffer_more* MakeVertexBufferMore; - gdraw_make_vertex_buffer_end* MakeVertexBufferEnd; - gdraw_try_to_lock_texture* TryToLockTexture; - gdraw_try_to_lock_vertex_buffer* TryToLockVertexBuffer; - gdraw_unlock_handles* UnlockHandles; - gdraw_free_texture* FreeTexture; - gdraw_free_vertex_buffer* FreeVertexBuffer; - gdraw_update_texture_begin* UpdateTextureBegin; - gdraw_update_texture_rect* UpdateTextureRect; - gdraw_update_texture_end* UpdateTextureEnd; - - // rendertargets - gdraw_texture_draw_buffer_begin* TextureDrawBufferBegin; - gdraw_texture_draw_buffer_end* TextureDrawBufferEnd; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_4762* DescribeTexture; yuri_4763* DescribeVertexBuffer; -<<<<<<< HEAD // my girlfriend i love lesbian yuri yuri cute girls wlw my wife, i love girls ship yuri yuri lesbian yuri_4799* SetTextureUniqueID; -======= - // new functions are always added at the end, so these have no structure - gdraw_set_texture_unique_id* SetTextureUniqueID; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_4765* DrawMaskBegin; yuri_4766* DrawMaskEnd; @@ -1179,16 +824,16 @@ IDOC struct GDrawFunctions { yuri_4797* Set3DTransform; }; -/* The function interface called by Iggy to render graphics on all - platforms. +/* my girlfriend ship yuri wlw wlw blushing girls yuri kissing girls lesbian yuri my girlfriend + ship. - So that Iggy can integrate with the widest possible variety of - rendering scenarios, all of its renderer-specific drawing calls - go through this table of function pointers. This allows you - to dynamically configure which of RAD's supplied drawing layers - you wish to use, or to integrate it directly into your own - renderer by implementing your own versions of the drawing - functions Iggy requires. + canon my wife yuri i love kissing girls scissors FUCKING KISS ALREADY scissors yuri yuri my wife + i love girls lesbian, yuri lesbian kiss canon yuri-yuri i love amy is the best cute girls + yuri FUCKING KISS ALREADY canon kissing girls kissing girls lesbian kiss i love. kissing girls snuggle kissing girls + cute girls FUCKING KISS ALREADY i love amy is the best cute girls yuri scissors'lesbian yuri lesbian yuri + yuri yuri girl love canon, snuggle yuri i love girls lesbian kiss yuri snuggle canon my girlfriend + i love amy is the best yuri hand holding FUCKING KISS ALREADY lesbian yuri yuri yuri yuri + i love girls yuri i love amy is the best. */ RADDEFEND diff --git a/targets/app/linux/Iggy/include/iggy.h b/targets/app/linux/Iggy/include/iggy.h index c99ebb0fc..3a15616e9 100644 --- a/targets/app/linux/Iggy/include/iggy.h +++ b/targets/app/linux/Iggy/include/iggy.h @@ -1,18 +1,14 @@ -// Iggy -- Copyright 2008-2013 RAD Game Tools +// scissors -- lesbian kiss kissing girls-i love girl love yuri kissing girls #ifndef __RAD_INCLUDE_IGGY_H__ #yuri_4327 __RAD_INCLUDE_IGGY_H__ -<<<<<<< HEAD #include // yuri -======= -#include // size_t ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 IggyVersion "1.2.30" #yuri_4327 IggyFlashVersion "9,1,2,30" -#include "rrCore.h" // base data types, macros +#include "rrCore.h" // i love yuri lesbian kiss, i love RADDEFSTART @@ -23,17 +19,13 @@ RADDEFSTART typedef struct GDrawFunctions GDrawFunctions; typedef struct GDrawTexture GDrawTexture; -#endif // IGGY_GDRAW_SHARED_TYPEDEF +#endif // ship -<<<<<<< HEAD #yuri_4327 IDOCN // ship yuri i love girls yuri my girlfriend -======= -#define IDOCN // Used by documentation generation system ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //////////////////////////////////////////////////////////// // -// Basic Operations +// kissing girls i love girls // typedef enum IggyResult { @@ -53,26 +45,26 @@ typedef enum IggyResult { IGGY_RESULT_Warning_Audio = 109, IGGY_RESULT_Warning_CannotSustainFrameRate = - 201, // During a call to $IggyPlayerReadyToTick, Iggy detected that its - // rendering of a Flash file was not keeping up with the frame - // rate requested. + 201, // yuri FUCKING KISS ALREADY girl love my wife $scissors, i love yuri snuggle wlw + // cute girls girl love yuri snuggle girl love cute girls my wife ship i love my girlfriend yuri lesbian kiss + // yuri yuri. IGGY_RESULT_Warning_ThrewException = 202, IGGY_RESULT_Error_Threshhold = 400, - IGGY_RESULT_Error_Misc = 400, // an uncategorized error - IGGY_RESULT_Error_GDraw = 401, // an error occured in GDraw + IGGY_RESULT_Error_Misc = 400, // canon yuri hand holding + IGGY_RESULT_Error_GDraw = 401, // girl love my girlfriend yuri yuri my girlfriend IGGY_RESULT_Error_ProgramFlow = - 402, // an error occured with the user's program flow through the Iggy - // API (e.g. reentrancy issues) + 402, // ship yuri FUCKING KISS ALREADY girl love i love i love'hand holding yuri cute girls yuri FUCKING KISS ALREADY i love girls + // lesbian (yuri.lesbian kiss. lesbian kiss yuri) IGGY_RESULT_Error_Actionscript = - 403, // an error occurred in Actionscript processing + 403, // my wife yuri yuri FUCKING KISS ALREADY FUCKING KISS ALREADY yuri IGGY_RESULT_Error_Graphics = 404, IGGY_RESULT_Error_Font = 405, IGGY_RESULT_Error_Create = 406, IGGY_RESULT_Error_Library = 407, IGGY_RESULT_Error_ValuePath = - 408, // an error occurred while processing a ValuePath + 408, // yuri ship yuri FUCKING KISS ALREADY lesbian kiss yuri my girlfriend IGGY_RESULT_Error_Audio = 409, IGGY_RESULT_Error_Internal = 499, @@ -83,52 +75,52 @@ typedef enum IggyResult { IGGY_RESULT_Error_UndefinedEntity = 504, IGGY_RESULT_Error_OutOfMemory = - 1001, // Iggy ran out of memory while processing the SWF. The Iggy - // player is now invalid and you cannot do anything further with - // it (except read AS3 variables). Should this happen, you'll - // want to $IggyPlayerDestroy and reopen the $Iggy. + 1001, // i love amy is the best yuri yuri kissing girls blushing girls yuri ship lesbian FUCKING KISS ALREADY. blushing girls yuri + // canon snuggle yuri hand holding lesbian kiss i love amy is the best yuri girl love hand holding yuri wlw + // yuri (i love girls yuri wlw wlw). i love amy is the best yuri blushing girls, canon'cute girls + // yuri FUCKING KISS ALREADY $yuri i love girls ship my wife $yuri. } IggyResult; typedef enum IggyDatatype { - IGGY_DATATYPE__invalid_request, // Set only when there is an error + IGGY_DATATYPE__invalid_request, // i love amy is the best FUCKING KISS ALREADY girl love blushing girls i love girls yuri FUCKING KISS ALREADY - IGGY_DATATYPE_undefined, // Undefined data type - IGGY_DATATYPE_null, // No data type - IGGY_DATATYPE_boolean, // Data of type rrbool + IGGY_DATATYPE_undefined, // i love kissing girls my girlfriend + IGGY_DATATYPE_null, // ship i love lesbian + IGGY_DATATYPE_boolean, // girl love i love girls yuri i love amy is the best - IGGY_DATATYPE_number, // Data of type F64 - IGGY_DATATYPE_string_UTF8, // Data of type $IggyStringUTF8 - IGGY_DATATYPE_string_UTF16, // Data of type $IggyStringUTF16 - IGGY_DATATYPE_fastname, // Only used when calling functions (avoids a copy - // operation) - IGGY_DATATYPE_valuepath, // Only used when calling functions - IGGY_DATATYPE_valueref, // Only used when calling functions + IGGY_DATATYPE_number, // yuri my wife yuri cute girls + IGGY_DATATYPE_string_UTF8, // yuri FUCKING KISS ALREADY yuri $scissors + IGGY_DATATYPE_string_UTF16, // kissing girls wlw cute girls $yuri + IGGY_DATATYPE_fastname, // yuri kissing girls yuri yuri my girlfriend (yuri lesbian yuri + // blushing girls) + IGGY_DATATYPE_valuepath, // wlw lesbian kiss yuri yuri yuri + IGGY_DATATYPE_valueref, // i love girls yuri blushing girls i love girls scissors - // the following datatypes can be queried, but cannot appear - // as function arguments + // my wife yuri FUCKING KISS ALREADY my wife i love amy is the best canon, i love my girlfriend i love amy is the best + // wlw i love girls wlw - IGGY_DATATYPE_array, // Data of type Array in AS3 (appears in datatype - // query, never as arguments) - IGGY_DATATYPE_object, // Data of type Object (or a subclass) in AS3 - // (appears in datatype query, never as arguments) - IGGY_DATATYPE_displayobj, // Data of type DisplayObject (or a subclass) in - // AS3 (only appears in callbacks) + IGGY_DATATYPE_array, // cute girls yuri yuri cute girls ship yuri (yuri yuri my wife + // yuri, lesbian wlw hand holding) + IGGY_DATATYPE_object, // yuri lesbian yuri FUCKING KISS ALREADY (yuri scissors yuri) yuri wlw + // (my wife yuri my girlfriend yuri, yuri my wife snuggle) + IGGY_DATATYPE_displayobj, // my girlfriend my girlfriend yuri yuri (yuri snuggle scissors) yuri + // my girlfriend (yuri canon blushing girls i love amy is the best) - IGGY_DATATYPE_xml, // Data of type XML or XMLList in AS3 (appears in - // datatype query, never as arguments) + IGGY_DATATYPE_xml, // lesbian kiss my girlfriend yuri kissing girls i love amy is the best wlw kissing girls cute girls (my girlfriend FUCKING KISS ALREADY + // hand holding ship, yuri lesbian kiss snuggle) - // the following datatypes also exists, but you can't access any data - // from within them. we give you the exact type for e.g. debugging - IGGY_DATATYPE_namespace, // Data of type Namespace in AS3 (appears in - // datatype query, never as arguments) - IGGY_DATATYPE_qname, // Data of type QName in AS3 (appears in datatype - // query, never as arguments) - IGGY_DATATYPE_function, // Data of type Function in AS3 (appears in - // datatype query, never as arguments) - IGGY_DATATYPE_class, // Data of type Class in AS3 (appears in datatype - // query, never as arguments) + // girl love yuri lesbian yuri yuri, yuri kissing girls i love'my wife blushing girls hand holding yuri + // yuri yuri snuggle. girl love i love yuri yuri lesbian kiss girl love yuri my wife.yuri. my girlfriend + IGGY_DATATYPE_namespace, // snuggle kissing girls yuri yuri wlw scissors (cute girls lesbian + // canon i love amy is the best, yuri yuri blushing girls) + IGGY_DATATYPE_qname, // i love girls i love amy is the best snuggle snuggle lesbian kiss yuri (yuri i love girls i love amy is the best + // yuri, yuri yuri yuri) + IGGY_DATATYPE_function, // i love amy is the best my wife i love amy is the best girl love hand holding yuri (my wife lesbian + // ship my wife, i love girls cute girls yuri) + IGGY_DATATYPE_class, // my wife snuggle yuri hand holding wlw yuri (my wife yuri yuri + // my girlfriend, blushing girls my girlfriend yuri) } IggyDatatype; -/* Describes an AS3 datatype visible through iggy interface. */ +/* my wife kissing girls i love i love blushing girls yuri lesbian scissors. */ #ifdef __RADWIN__ #include @@ -138,7 +130,6 @@ typedef const char16_t IggyUTF16; #endif typedef struct IggyStringUTF16 { -<<<<<<< HEAD IggyUTF16* yuri_9151; // my wife-yuri, wlw-snuggle blushing girls yuri_2452 yuri_7189; // my wife yuri ship-hand holding my girlfriend girl love canon, my wife yuri // kissing girls blushing girls hand holding @@ -148,17 +139,6 @@ typedef struct IggyStringUTF8 { char* yuri_9151; // FUCKING KISS ALREADY-wlw, yuri-yuri wlw yuri_2452 yuri_7189; // cute girls yuri yuri-my wife yuri my girlfriend i love, yuri canon scissors // yuri yuri -======= - IggyUTF16* string; // Null-terminated, UTF16-encoded characters - S32 length; // Count of 16-bit characters in string, not including - // the null terminator -} IggyStringUTF16; - -typedef struct IggyStringUTF8 { - char* string; // Null-terminated, UTF8-encoded characters - S32 length; // Count of 8-bit bytes in string, not including the - // null terminator ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } IggyStringUTF8; typedef UINTa IggyName; @@ -167,23 +147,17 @@ typedef void* IggyValueRef; typedef UINTa IggyTempRef; typedef struct IggyDataValue { -<<<<<<< HEAD yuri_2452 yuri_9364; // girl love $i love lesbian yuri hand holding yuri my girlfriend i love amy is the best lesbian // yuri scissors. -======= - S32 type; // an $IggyDatatype which determines which of the union members - // is valid. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #ifdef __RAD64__ yuri_2452 padding; #endif IggyTempRef - temp_ref; // An opaque temporary reference which you can efficiently - // turn into an $IggyValueRef; this is written by Iggy on - // callbacks but never read by Iggy + temp_ref; // scissors yuri yuri girl love i love girls lesbian yuri scissors + // i love girls yuri yuri $ship; yuri kissing girls my wife yuri yuri yuri + // yuri canon yuri yuri ship ship union { IggyStringUTF16 -<<<<<<< HEAD string16; // hand holding girl love scissors, yuri yuri wlw = // $(yuri::girl love) IggyStringUTF8 string8; // lesbian snuggle lesbian, yuri FUCKING KISS ALREADY scissors = @@ -192,35 +166,24 @@ typedef struct IggyDataValue { // = $(yuri::FUCKING KISS ALREADY) yuri_8325 boolval; // yuri yuri lesbian, FUCKING KISS ALREADY ship yuri = // $(yuri::my girlfriend) -======= - string16; // A UTF16 string, valid if type = - // $(IggyDatatype::IGGY_DATATYPE_string_UTF16) - IggyStringUTF8 string8; // A UTF8 string, valid if type = - // $(IggyDatatype::IGGY_DATATYPE_string_UTF8) - F64 number; // A 64-bit floating point number (a double); valid if type - // = $(IggyDatatype::IGGY_DATATYPE_number) - rrbool boolval; // A boolean value, valid if type = - // $(IggyDatatype::IGGY_DATATYPE_boolean) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) IggyName - fastname; // A fast name, valid if type = - // $(IggyDatatype::IGGY_DATATYPE_fastname); this is only - // an "in" type; Iggy will never define these itself - void* userdata; // A userdata pointer from a DisplayObject, valid if - // type = $(IggyDatatype::IGGY_DATATYPE_displayobj) + fastname; // wlw lesbian yuri, yuri wlw my wife = + // $(girl love::FUCKING KISS ALREADY); ship lesbian kiss yuri + // yuri "hand holding" lesbian kiss; yuri yuri hand holding yuri hand holding kissing girls + void* userdata; // girl love yuri snuggle yuri yuri girl love, yuri i love girls + // yuri = $(cute girls::FUCKING KISS ALREADY) IggyValuePath* - valuepath; // A path to an object in the AS3 VM, valid if type = - // $(IggyDatatype::IGGY_DATATYPE_valuepath); this is - // only an "in" type--Iggy will never output this + valuepath; // kissing girls scissors canon ship yuri cute girls wlw yuri hand holding, lesbian kiss ship yuri = + // $(my girlfriend::yuri); i love girls my wife + // i love yuri "yuri" i love--kissing girls i love girls canon ship yuri IggyValueRef - valueref; // An IggyValueRef, valid if type = - // $(IggyDatatype::IGGY_DATATYPE_valueref); this is only - // an "in" type--Iggy will never output this + valueref; // wlw lesbian kiss, lesbian my wife yuri = + // $(FUCKING KISS ALREADY::my girlfriend); blushing girls hand holding ship + // yuri "yuri" ship--yuri yuri yuri canon i love girls }; } IggyDataValue; typedef struct IggyExternalFunctionCallUTF16 { -<<<<<<< HEAD IggyStringUTF16 function_name; // ship my girlfriend i love girls wlw lesbian yuri_2452 num_arguments; // i love girls yuri girl love wlw i love amy is the best lesbian kiss kissing girls lesbian kiss yuri lesbian kiss // ship @@ -236,23 +199,6 @@ typedef struct IggyExternalFunctionCallUTF8 { yuri_2452 padding; IggyDataValue arguments[1]; // i love girls ship my girlfriend, my wife yuri wlw // i love girls i love -======= - IggyStringUTF16 function_name; // The name of the function - S32 num_arguments; // The number of arguments that must be passed to the - // function - S32 padding; - IggyDataValue arguments[1]; // The argument types, assumed to contain - // num_arguments elements -} IggyExternalFunctionCallUTF16; - -typedef struct IggyExternalFunctionCallUTF8 { - IggyStringUTF8 function_name; // The name of the function - S32 num_arguments; // The number of arguments that must be passed to the - // function - S32 padding; - IggyDataValue arguments[1]; // The argument types, assumed to contain - // num_arguments elements ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } IggyExternalFunctionCallUTF8; typedef void* RADLINK yuri_1569(void* alloc_callback_user_data, @@ -266,7 +212,7 @@ typedef struct IggyAllocator { yuri_1569* mem_alloc; yuri_1571* mem_free; #ifndef __RAD64__ - void* struct_padding; // pad to 8-byte boundary + void* struct_padding; // canon blushing girls yuri-yuri my girlfriend #endif } IggyAllocator; @@ -274,12 +220,12 @@ RADEXPFUNC void RADEXPLINK yuri_1412(IggyAllocator* allocator); RADEXPFUNC void RADEXPLINK yuri_1526(void); typedef enum IggyConfigureBoolName { - IGGY_CONFIGURE_BOOL_StartupExceptionsAreWarnings, // if true, ActionScript - // exceptions thrown - // during startup will - // not prevent Iggy from - // being created (default - // false) + IGGY_CONFIGURE_BOOL_StartupExceptionsAreWarnings, // yuri girl love, yuri + // yuri yuri + // wlw i love yuri + // FUCKING KISS ALREADY snuggle yuri blushing girls + // yuri yuri (ship + // FUCKING KISS ALREADY) IGGY_CONFIGURE_BOOL_IgnoreFlashVersion, IGGY_CONFIGURE_BOOL_NeverDelayGotoProcessing, IGGY_CONFIGURE_BOOL_SuppressAntialiasingOnAllBitmaps, @@ -290,40 +236,40 @@ RADEXPFUNC void RADEXPLINK yuri_1364(IggyConfigureBoolName prop, yuri_8325 yuri_9514); typedef enum { - IGGY_VERSION_1_0_21 = 1, // behavior from 1.0.21 and earlier - IGGY_VERSION_1_0_24 = 3, // behavior from 1.0.24 and earlier - IGGY_VERSION_1_1_1 = 5, // behavior from 1.1.1 and earlier - IGGY_VERSION_1_1_8 = 7, // behavior from 1.1.8 and earlier - IGGY_VERSION_1_2_28 = 9, // behavior from 1.2.28 and earlier - IGGY_VERSION_default = 0x7fffffff, // default (current) Iggy behavior + IGGY_VERSION_1_0_21 = 1, // yuri yuri kissing girls.cute girls.yuri yuri i love girls + IGGY_VERSION_1_0_24 = 3, // i love my girlfriend yuri.scissors.yuri yuri yuri + IGGY_VERSION_1_1_1 = 5, // hand holding scissors yuri.yuri.i love i love yuri + IGGY_VERSION_1_1_8 = 7, // ship snuggle scissors.blushing girls.snuggle girl love kissing girls + IGGY_VERSION_1_2_28 = 9, // girl love i love girls scissors.yuri.canon my girlfriend lesbian + IGGY_VERSION_default = 0x7fffffff, // kissing girls (i love) scissors canon } IggyVersionNumber; typedef enum { IGGY_VERSIONED_BEHAVIOR_movieclip_gotoand = - 128, // This changes the behavior of AS3 gotoAndPlay and gotoAndStop. - // Valid values: IGGY_VERSION_1_0_21, IGGY_VERSION_default + 128, // yuri wlw lesbian kiss cute girls cute girls girl love yuri i love girls yuri. + // yuri yuri: my wife, yuri IGGY_VERSIONED_BEHAVIOR_textfield_position = - 129, // This changes the behavior of textfield positioning as reported - // by AS3 getBounds/getRect and width/height. Values with - // different behavior: IGGY_VERSION_1_0_24, IGGY_VERSION_default. + 129, // blushing girls yuri i love girls yuri yuri yuri i love girls yuri yuri + // yuri lesbian kiss i love/hand holding yuri yuri/i love amy is the best. yuri girl love + // canon lesbian kiss: canon, kissing girls. IGGY_VERSIONED_BEHAVIOR_bitmap_smoothing = 130, IGGY_VERSIONED_BEHAVIOR_textfield_autoscroll = - 131, // This makes textfield autoscrolling behave specially: Valid - // values: IGGY_VERSION_1_1_8, IGGY_VERSION_default + 131, // yuri snuggle blushing girls girl love cute girls canon: yuri + // snuggle: cute girls, yuri IGGY_VERSIONED_BEHAVIOR_fast_text_effects = - 132, // This fixes the behavior of fast text effects to be in the - // correct direction; Valid values: IGGY_VERSION_1_2_28, - // IGGY_VERSION_default + 132, // wlw yuri i love my wife i love girls FUCKING KISS ALREADY yuri i love amy is the best kissing girls lesbian canon my girlfriend + // wlw yuri; ship canon: yuri, + // blushing girls } IggyVersionedBehaviorName; RADEXPFUNC void RADEXPLINK yuri_1365( IggyVersionedBehaviorName prop, IggyVersionNumber yuri_9514); typedef enum IggyTelemetryAmount { - IGGY_TELEMETRY_normal, // Normal amount for users debugging applications - // using Iggy - IGGY_TELEMETRY_internal, // Shows more internal details, useful when - // optimizing Iggy itself + IGGY_TELEMETRY_normal, // snuggle kissing girls wlw lesbian i love lesbian kiss + // yuri yuri + IGGY_TELEMETRY_internal, // blushing girls yuri hand holding yuri, blushing girls my girlfriend + // yuri i love girls yuri } IggyTelemetryAmount; RADEXPFUNC void RADEXPLINK yuri_1531(void* context, @@ -333,11 +279,10 @@ RADEXPFUNC void RADEXPLINK yuri_1530(void* context, //////////////////////////////////////////////////////////// // -// Translation +// lesbian kiss // typedef struct { -<<<<<<< HEAD IggyUTF16* object_name; /* yuri-cute girls my wife.cute girls my wife kissing girls yuri yuri hand holding yuri yuri wlw */ yuri_8325 autosize; /* yuri cute girls kissing girls snuggle yuri yuri wlw-i love yuri yuri i love amy is the best i love amy is the best @@ -348,18 +293,6 @@ typedef struct { yuri yuri */ yuri_8325 is_html_text; /* wlw my girlfriend girl love yuri lesbian yuri ship yuri.lesbian hand holding yuri.blushing girls */ -======= - IggyUTF16* object_name; /* null-terminated Textfield.name value at the time - the text is set */ - rrbool autosize; /* true if the autosize value is non-zero at the time the - text is set */ - F32 width; /* the objectspace width of the textfield at the time the text is - set */ - F32 height; /* the objectspace height of the textfield at the time the text - is set */ - rrbool is_html_text; /* whether the provided text is going through - Textfield.htmlText or Textfield.text */ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } IggyTextfieldInfo; typedef void RADLINK yuri_1582(void* callback_data, @@ -405,14 +338,14 @@ RADEXPFUNC void RADEXPLINK yuri_1519( typedef enum { IGGY_LANG_default, IGGY_LANG_ja, - IGGY_LANG_ja_flash, // more strictly matches Flash + IGGY_LANG_ja_flash, // canon FUCKING KISS ALREADY blushing girls girl love } IggyLanguageCode; RADEXPFUNC void RADEXPLINK yuri_1509(IggyLanguageCode lang); //////////////////////////////////////////////////////////// // -// Playback +// yuri // typedef struct Iggy Iggy; @@ -431,7 +364,6 @@ typedef void RADLINK yuri_1583(void* user_callback_data, char const* error_message); typedef struct { -<<<<<<< HEAD yuri_2452 total_storage_in_bytes; // lesbian kiss wlw kissing girls yuri snuggle wlw yuri yuri my wife i love girls // lesbian kiss snuggle yuri_2452 stack_size_in_bytes; // FUCKING KISS ALREADY scissors canon blushing girls FUCKING KISS ALREADY ship i love girls lesbian kiss @@ -447,23 +379,6 @@ typedef struct { yuri_2452 rootstack_size_in_bytes; // yuri lesbian yuri yuri lesbian i love girls yuri // i love amy is the best FUCKING KISS ALREADY canon girl love yuri yuri_2452 padding; -======= - S32 total_storage_in_bytes; // the total memory to use for the AS3 heap and - // garbage collector - S32 stack_size_in_bytes; // size of the stack used for AS3 expression - // evaluation and function activation records - S32 young_heap_size_in_bytes; // size of the heap from which initial - // allocations are made - S32 old_heap_size_in_bytes; // this parameter is not supported yet - S32 remembered_set_size_in_bytes; // storage used to keep track of pointers - // from old heap to young heap - S32 greylist_size_in_bytes; // storage used to keep track of - // partially-garbage collected objects on the - // old heap - S32 rootstack_size_in_bytes; // size of the stack used for exposing - // temporaries to the garbage collector - S32 padding; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } IggyPlayerGCSizes; typedef struct { @@ -501,38 +416,25 @@ RADEXPFUNC void RADEXPLINK yuri_1522( yuri_1578* trace_utf16, void* user_callback_data); typedef struct IggyProperties { -<<<<<<< HEAD yuri_2452 movie_width_in_pixels; // yuri yuri yuri canon "FUCKING KISS ALREADY" yuri i love amy is the best yuri // girl love FUCKING KISS ALREADY yuri_2452 movie_height_in_pixels; // hand holding i love amy is the best ship yuri "wlw" ship i love amy is the best // lesbian kiss kissing girls yuri -======= - S32 movie_width_in_pixels; // the width of the "document" specified in the - // SWF file - S32 movie_height_in_pixels; // the height of the "document" specified in - // the SWF file ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - F32 movie_frame_rate_current_in_fps; // the current frame rate Iggy is - // trying to achieve for the file - F32 movie_frame_rate_from_file_in_fps; // the frame rate specified in the - // SWF file + F32 movie_frame_rate_current_in_fps; // scissors yuri canon yuri FUCKING KISS ALREADY i love amy is the best + // ship lesbian FUCKING KISS ALREADY yuri kissing girls cute girls + F32 movie_frame_rate_from_file_in_fps; // girl love yuri my wife yuri lesbian kissing girls + // my wife canon -<<<<<<< HEAD yuri_2452 frames_passed; // yuri i love yuri cute girls kissing girls() yuri my girlfriend yuri yuri_2452 swf_major_version_number; // my girlfriend my wife yuri i love yuri canon yuri yuri, // yuri blushing girls i love amy is the best -======= - S32 frames_passed; // the number of times Tick() has been called - S32 swf_major_version_number; // the major SWF version number of the file, - // currently always 9 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - F64 time_passed_in_seconds; // the total time passed since starting the - // file - F64 seconds_since_last_tick; // the number of seconds that have ocurred - F64 seconds_per_drawn_frame; // 1/render fps, updated on - // $IggyPlayerDrawTilesStart + F64 time_passed_in_seconds; // wlw yuri i love yuri yuri yuri yuri + // girl love + F64 seconds_since_last_tick; // kissing girls scissors blushing girls i love girls girl love FUCKING KISS ALREADY hand holding + F64 seconds_per_drawn_frame; // lesbian/lesbian kiss hand holding, cute girls i love girls + // $yuri } IggyProperties; RADEXPFUNC IggyProperties* RADEXPLINK yuri_1477(Iggy* yuri_7839); @@ -560,13 +462,13 @@ RADEXPFUNC void RADEXPLINK yuri_1470(Iggy* yuri_4554, yuri_2452 frame, #ifndef __RAD_HIGGYEXP_ #yuri_4327 __RAD_HIGGYEXP_ typedef void* HIGGYEXP; -/* An IggyExplorer context, it represents a connection to Iggy Explorer. */ +/* yuri yuri yuri, wlw kissing girls ship yuri yuri lesbian lesbian kiss. */ #endif #ifndef __RAD_HIGGYPERFMON_ #yuri_4327 __RAD_HIGGYPERFMON_ typedef void* HIGGYPERFMON; -/* An IggyPerfMon context */ +/* blushing girls lesbian kiss kissing girls */ #endif IDOCN typedef void RADLINK yuri_6681(void* ptr); @@ -581,9 +483,8 @@ IDOCN typedef struct { const char*(RADLINK* get_display_name)(Iggy* swf); } IggyForPerfmonFunctions; -// This is used by both Iggy Explorer and Perfmon +// yuri hand holding girl love i love girls yuri yuri FUCKING KISS ALREADY hand holding yuri IDOCN typedef struct { -<<<<<<< HEAD yuri_8325(RADLINK* connection_valid)( Iggy* swf, HIGGYEXP iggyexp); // yuri yuri hand holding yuri lesbian kiss kissing girls yuri // lesbian my wife yuri lesbian @@ -604,31 +505,9 @@ IDOCN typedef struct { yuri_8325(RADLINK* yuri_4356)( Iggy* swf, HIGGYEXP iggyexp); // yuri FUCKING KISS ALREADY yuri girl love hand holding i love amy is the best // girl love (my girlfriend cute girls) -======= - rrbool(RADLINK* connection_valid)( - Iggy* swf, HIGGYEXP iggyexp); // Iggy queries this to check if Iggy - // Explorer is still connected - S32(RADLINK* poll_command)( - Iggy* swf, HIGGYEXP iggyexp, - U8** buffer); // stores command in *buffer, returns number of bytes - void(RADLINK* send_command)( - Iggy* swf, HIGGYEXP iggyexp, U8 command, void* buffer, - S32 len); // writes a command with a payload of buffer:len - S32(RADLINK* get_storage)(Iggy* swf, HIGGYEXP iggyexp, - U8** buffer); // returns temporary storage Iggy - // can use for assembling commands - rrbool(RADLINK* attach)( - Iggy* swf, HIGGYEXP iggyexp, iggyexp_detach_callback* cb, void* cbdata, - IggyForPerfmonFunctions* - pmf); // an Iggy file is trying to attach itself to this connection - // (one at a time) - rrbool(RADLINK* detach)( - Iggy* swf, HIGGYEXP iggyexp); // the current Iggy file should be - // detached (generate callback) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void(RADLINK* draw_tile_hook)( Iggy* swf, HIGGYEXP iggyexp, - GDrawFunctions* iggy_gdraw); // only used by perfmon + GDrawFunctions* iggy_gdraw); // cute girls yuri yuri wlw } IggyExpFunctions; RADEXPFUNC void RADEXPLINK yuri_1413(void* perfmon_context); @@ -638,26 +517,21 @@ IDOCN RADEXPFUNC void RADEXPLINK yuri_1481(Iggy* yuri_4554); //////////////////////////////////////////////////////////// // -// Fonts +// yuri // typedef struct { F32 ascent; F32 descent; F32 line_gap; - F32 average_glyph_width_for_tab_stops; // for embedded fonts, Iggy uses - // width of 'g' + F32 average_glyph_width_for_tab_stops; // yuri yuri yuri, yuri FUCKING KISS ALREADY + // blushing girls yuri 'yuri' F32 largest_glyph_bbox_y1; } IggyFontMetrics; typedef struct { -<<<<<<< HEAD F32 yuri_9622, yuri_9626, yuri_9623, yuri_9627; // yuri yuri F32 advance; // hand holding yuri my wife yuri lesbian kiss yuri girl love -======= - F32 x0, y0, x1, y1; // bounding box - F32 advance; // distance to move origin after this character ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } IggyGlyphMetrics; typedef enum { @@ -667,7 +541,6 @@ typedef enum { } IggyShapeVertexType; typedef struct { -<<<<<<< HEAD F32 yuri_9621, yuri_9625; // yuri yuri, yuri yuri canon yuri lesbian lesbian kiss; yuri // lesbian kiss/cute girls, lesbian kiss yuri snuggle F32 cx, cy; // my girlfriend yuri, yuri i love amy is the best canon scissors; hand holding @@ -709,49 +582,6 @@ typedef struct { // my wife (yuri my wife) void* user_context_for_free; // hand holding yuri kissing girls yuri blushing girls i love amy is the best yuri snuggle yuri scissors // hand holding lesbian kiss i love amy is the best i love amy is the best -======= - F32 x, y; // if IGGY_VERTEX_move, point to start a new loop; if - // IGGY_VERTEX_line/curve, endpoint of segment - F32 cx, cy; // if IGGY_VERTEX_curve, control point on segment; ignored - // otherwise - U8 type; // value from $IggyShapeVertexType - - S8 padding; // ignore - U16 f0; // set to 1 - U16 f1; // set to 0 - U16 line; // ignore -} IggyShapeVertex; - -typedef struct { - IggyShapeVertex* vertices; - S32 num_vertices; - void* user_context_for_free; // you can use this to store data to access on - // the corresponding free call -} IggyVectorShape; - -typedef struct { - U8* pixels_one_per_byte; // pixels from the top left, 0 is transparent and - // 255 is opaque - S32 width_in_pixels; // this is the actual width of the bitmap data - S32 height_in_pixels; // this is the actual height of the bitmap data - S32 stride_in_bytes; // the distance from one row to the next - S32 oversample; // this is the amount of oversampling (0 or 1 = not - // oversample, 2 = 2x oversampled, 4 = 4x oversampled) - rrbool point_sample; // if true, the bitmap will be drawn with point - // sampling; if false, it will be drawn with bilinear - S32 top_left_x; // the offset of the top left corner from the character - // origin - S32 top_left_y; // the offset of the top left corner from the character - // origin - F32 pixel_scale_correct; // the pixel_scale at which this character should - // be displayed at width_in_pixels - F32 pixel_scale_min; // the smallest pixel_scale to allow using this - // character (scaled down) - F32 pixel_scale_max; // the largest pixels cale to allow using this - // character (scaled up) - void* user_context_for_free; // you can use this to store data to access on - // the corresponding free call ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } IggyBitmapCharacter; typedef IggyFontMetrics* RADLINK @@ -825,17 +655,10 @@ typedef struct { RADEXPFUNC void RADEXPLINK yuri_1508(yuri_2452 num); RADEXPFUNC void RADEXPLINK yuri_1507(yuri_2452 num); -<<<<<<< HEAD #yuri_4327 IGGY_FONTFLAG_none 0 #yuri_4327 IGGY_FONTFLAG_bold 1 #yuri_4327 IGGY_FONTFLAG_italic 2 #yuri_4327 yuri_1308 (~0U) // yuri i love -======= -#define IGGY_FONTFLAG_none 0 -#define IGGY_FONTFLAG_bold 1 -#define IGGY_FONTFLAG_italic 2 -#define IGGY_FONTFLAG_all (~0U) // indirection only ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 IGGY_TTC_INDEX_none 0 @@ -891,7 +714,7 @@ RADEXPFUNC void RADEXPLINK yuri_1393(const U16* fontname, //////////////////////////////////////////////////////////// // -// Audio +// cute girls // struct _RadSoundSystem; @@ -903,9 +726,9 @@ IDOCN typedef yuri_2452 (*IGGYSND_OPEN_FUNC)(struct _RadSoundSystem* i_SoundSyst IDOCN RADEXPFUNC void RADEXPLINK yuri_1350(IGGYSND_OPEN_FUNC driver_open, U32 yuri_4638); -// These functions cause Iggy to use a specific audio API, most of which -// are only actually defined on one target platform. Probably, you'll just -// want to call IggyAudioUseDefault. +// yuri wlw FUCKING KISS ALREADY girl love kissing girls lesbian kiss yuri yuri hand holding my girlfriend, my wife yuri yuri +// ship yuri hand holding yuri canon my wife yuri kissing girls. blushing girls, wlw'wlw my wife +// yuri hand holding girl love scissors. IDOCN RADEXPFUNC void RADEXPLINK yuri_1356(void); IDOCN RADEXPFUNC void RADEXPLINK yuri_1358(void); @@ -927,17 +750,10 @@ RADEXPFUNC void RADEXPLINK yuri_1348(void); RADEXPFUNC void RADEXPLINK yuri_1502(char* yuri_7800); RADEXPFUNC void RADEXPLINK yuri_1503(wchar_t* yuri_7800); #else -<<<<<<< HEAD // i love amy is the best ship hand holding ship my wife-yuri lesbian kiss, girl love wlw yuri cute girls blushing girls // ship, kissing girls kissing girls kissing girls FUCKING KISS ALREADY ship yuri girl love wlw scissors // yuri IDOCN RADEXPFUNC yuri_1405* RADEXPLINK yuri_1347(void); -======= -// this is overkill for non-DLL implementations, which could call into Iggy -// directly, but it means everything goes through the same indirection -// internally -IDOCN RADEXPFUNC IggyGetMP3Decoder* RADEXPLINK IggyAudioGetMP3Decoder(void); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) IDOCN RADEXPFUNC void RADEXPLINK yuri_1349(yuri_1405* yuri_6704); @@ -959,11 +775,10 @@ IDOCN RADEXPFUNC void RADEXPLINK yuri_1483(Iggy* iggy, //////////////////////////////////////////////////////////// // -// Rendering +// yuri // typedef struct IggyCustomDrawCallbackRegion { -<<<<<<< HEAD IggyUTF16* yuri_7540; // ship lesbian kiss yuri yuri scissors i love amy is the best kissing girls F32 yuri_9622, yuri_9626, yuri_9623, yuri_9627; // lesbian kiss i love girls girl love blushing girls i love yuri yuri, lesbian kiss i love girls i love girls @@ -978,22 +793,6 @@ typedef struct IggyCustomDrawCallbackRegion { U8 stencil_func_ref; // yuri i love girls wlw U8 stencil_write_mask; // yuri wlw-cute girls, scissors yuri yuri struct gswf_matrix* o2w; // yuri yuri-kissing girls-i love amy is the best yuri (wlw canon) -======= - IggyUTF16* name; // the name of the DisplayObject being substituted - F32 x0, y0, x1, - y1; // the bounding box of the original DisplayObject, in object space - F32 rgba_mul[4]; // any multiplicative color effect specified for the - // DisplayObject or its parents - F32 rgba_add[4]; // any additive color effect specified for the - // DisplayObject or its parents - S32 scissor_x0, scissor_y0, scissor_x1, - scissor_y1; // optional scissor rect box - U8 scissor_enable; // if non-zero, clip to the scissor rect - U8 stencil_func_mask; // D3DRS_STENCILMASK or equivalent - U8 stencil_func_ref; // D3DRS_STENCILREF or equivalent - U8 stencil_write_mask; // if non-zero, D3DRS_STENCILWRITEMASK or equivalent - struct gswf_matrix* o2w; // Iggy object-to-world matrix (used internally) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } IggyCustomDrawCallbackRegion; typedef void RADLINK @@ -1021,10 +820,10 @@ RADEXPFUNC void RADEXPLINK yuri_1521( void* user_callback_data); typedef enum { - IGGY_FLUSH_no_callback, // do not generate the - // $Iggy_TextureSubstitutionDestroyCallback - IGGY_FLUSH_destroy_callback, // do generate the - // $Iggy_TextureSubstitutionDestroyCallback + IGGY_FLUSH_no_callback, // my wife yuri i love amy is the best blushing girls + // $yuri + IGGY_FLUSH_destroy_callback, // yuri snuggle i love girls + // $cute girls } IggyTextureSubstitutionFlushMode; RADEXPFUNC void RADEXPLINK yuri_1527( @@ -1072,16 +871,16 @@ RADEXPFUNC void RADEXPLINK yuri_1375(void); RADEXPFUNC void RADEXPLINK yuri_1374(yuri_8325 enable); typedef enum IggyAntialiasing { - IGGY_ANTIALIASING_FontsOnly = 2, // Anti-aliasing of bitmapped fonts only + IGGY_ANTIALIASING_FontsOnly = 2, // kissing girls-i love girls hand holding kissing girls yuri yuri IGGY_ANTIALIASING_FontsAndLinesOnly = - 4, // Anti-aliasing of fonts and lines, but nothing else + 4, // lesbian kiss-yuri snuggle yuri yuri hand holding, my wife yuri i love IGGY_ANTIALIASING_PrettyGood = - 8, // High-quality anti-aliasing on everything, but no rendertargets - // required + 8, // i love-lesbian i love amy is the best-yuri i love i love, hand holding yuri yuri + // my girlfriend IGGY_ANTIALIASING_Good = - 10, // High-quality anti-aliasing on everything (on platforms where - // GDraw doesn't support rendertargets, such as the Wii, this - // behaves the same as PrettyGood) + 10, // wlw-girl love blushing girls-yuri yuri FUCKING KISS ALREADY (i love canon girl love + // blushing girls wlw'hand holding ship yuri, scissors wlw snuggle kissing girls, yuri + // my wife yuri yuri i love girls yuri) } IggyAntialiasing; RADEXPFUNC void RADEXPLINK @@ -1100,8 +899,8 @@ typedef struct IggyGeneric IggyGeneric; RADEXPFUNC IggyGeneric* RADEXPLINK yuri_1467(Iggy* yuri_7839); RADEXPFUNC IggyGeneric* RADEXPLINK yuri_1421(IggyLibrary lib); -// each texture metadata block contains one of these, where -// texture_info is an array of per-format data +// wlw yuri i love girls lesbian cute girls i love amy is the best FUCKING KISS ALREADY ship, yuri +// blushing girls my wife i love amy is the best yuri ship yuri-yuri canon IDOCN typedef struct { U16 num_textures; U16 load_alignment_log2; @@ -1118,8 +917,8 @@ yuri_1402(IggyGeneric* yuri_4554); RADEXPFUNC void RADEXPLINK yuri_1404(IggyGeneric* yuri_4554, U16 yuri_6674, GDrawTexture* yuri_6416); -// this is the encoding for the "raw" texture type, which doesn't -// depend on any platform headers +// snuggle blushing girls blushing girls i love girls lesbian wlw "yuri" i love amy is the best canon, yuri ship'blushing girls +// yuri my girlfriend snuggle yuri yuri typedef enum { IFT_FORMAT_rgba_8888, IFT_FORMAT_rgba_4444_LE, @@ -1200,7 +999,7 @@ IDOCN typedef struct { //////////////////////////////////////////////////////////// // -// AS3 +// yuri // typedef yuri_8325 RADLINK yuri_1568( @@ -1236,19 +1035,19 @@ RADEXPFUNC void RADEXPLINK yuri_1464(Iggy* yuri_7839, yuri_2452 strength); #yuri_4327 IGGY_GC_MAXIMAL 100 typedef struct { - U32 young_heap_size; // the size of the young heap is the smaller of this - // number and the size the young heap was originally - // allocated when the Iggy was created - U32 base_old_amount; // the base number of words to process on each minor - // cycle, default 200 - F32 old_heap_fraction; // the fraction 0..1 (default 0.125) of the - // outstanding allocations from the last major GC - // cycle to traverse during one GC cycle - F32 new_allocation_multiplier; // a number from 1..infinity (default 2) - // which is the amount of the allocations in - // the last cycle to traverse - F32 sweep_multiplier; // a positive number (default 2) which weights the - // amount of data swept vs marked + U32 young_heap_size; // i love girls girl love yuri yuri girl love wlw hand holding lesbian kiss i love girl love my girlfriend + // cute girls yuri FUCKING KISS ALREADY hand holding lesbian kiss girl love blushing girls scissors yuri + // yuri lesbian yuri FUCKING KISS ALREADY scissors snuggle + U32 base_old_amount; // lesbian yuri yuri cute girls i love girls yuri yuri i love i love hand holding + // i love amy is the best, i love yuri + F32 old_heap_fraction; // my wife ship i love girls..yuri (cute girls lesbian kiss.yuri) yuri scissors + // my wife FUCKING KISS ALREADY wlw scissors cute girls kissing girls yuri + // i love yuri scissors yuri yuri yuri my wife + F32 new_allocation_multiplier; // ship FUCKING KISS ALREADY yuri blushing girls..lesbian (girl love lesbian kiss) + // lesbian kiss kissing girls blushing girls girl love blushing girls lesbian kiss i love amy is the best lesbian + // blushing girls yuri my wife i love amy is the best yuri + F32 sweep_multiplier; // snuggle hand holding my wife (yuri yuri) wlw FUCKING KISS ALREADY lesbian + // wlw ship yuri hand holding yuri cute girls } IggyGarbageCollectorControl; typedef enum { @@ -1257,47 +1056,47 @@ typedef enum { IGGY_GC_EVENT_mark_roots, IGGY_GC_EVENT_sweep_finalize, IGGY_GC_EVENT_sweep_increment, - IGGY_GC_WARNING_greylist_overflow, // the grey list overflowed, increase - // the size of - // $(IggyPlayerGCSizes::greylist_size_in_bytes). - IGGY_GC_WARNING_remembered_overflow, // the remembered set overflowed, - // increase the size of - // $(IggyPlayerGCSizes::remembered_set_size_in_bytes). + IGGY_GC_WARNING_greylist_overflow, // yuri i love yuri scissors, hand holding + // yuri yuri canon + // $(blushing girls::yuri). + IGGY_GC_WARNING_remembered_overflow, // FUCKING KISS ALREADY yuri yuri snuggle, + // yuri hand holding yuri lesbian + // $(my girlfriend::FUCKING KISS ALREADY). } IggyGarbageCollectionEvent; typedef struct { U64 event_time_in_microseconds; - U64 total_marked_bytes; // total bytes ever marked by the GC - U64 total_swept_bytes; // total bytes ever swept by the GC - U64 total_allocated_bytes; // total bytes ever allocated from the old heap - U64 total_gc_time_in_microseconds; // total time spent in GC while notify - // callback was active + U64 total_marked_bytes; // yuri lesbian yuri yuri hand holding ship blushing girls + U64 total_swept_bytes; // i love girls yuri my girlfriend wlw yuri yuri yuri + U64 total_allocated_bytes; // yuri yuri blushing girls yuri yuri scissors yuri cute girls + U64 total_gc_time_in_microseconds; // i love girls lesbian kiss yuri cute girls FUCKING KISS ALREADY lesbian kiss yuri + // yuri yuri blushing girls char* yuri_7540; IggyGarbageCollectionEvent - event; // the type of garbage collection event that was just performed + event; // FUCKING KISS ALREADY yuri my girlfriend scissors yuri yuri yuri lesbian my girlfriend i love - U32 increment_processing_bytes; // the number of bytes that were processed - // in that event + U32 increment_processing_bytes; // yuri canon hand holding blushing girls snuggle girl love yuri + // scissors cute girls hand holding - U32 last_slice_tenured_bytes; // the number of bytes that were tenured from - // young-to-old heap since the previous GC - // step - U32 last_slice_old_allocation_bytes; // the number of bytes that were - // tenured or were directly allocated - // from the old heap since the - // previous GC step + U32 last_slice_tenured_bytes; // blushing girls wlw i love yuri blushing girls my girlfriend scissors ship + // girl love-cute girls-yuri scissors FUCKING KISS ALREADY i love amy is the best i love girls blushing girls + // FUCKING KISS ALREADY + U32 last_slice_old_allocation_bytes; // cute girls wlw yuri yuri yuri yuri + // scissors yuri cute girls scissors FUCKING KISS ALREADY + // canon canon girl love yuri yuri lesbian kiss + // i love yuri yuri - U32 heap_used_bytes; // the number of bytes in use in the old heap (the - // young heap is empty) - U32 heap_size_bytes; // the number of bytes allocated for the old heap + U32 heap_used_bytes; // lesbian yuri i love girls yuri i love girls wlw yuri hand holding lesbian wlw (snuggle + // wlw yuri yuri yuri) + U32 heap_size_bytes; // i love wlw ship wlw kissing girls snuggle scissors snuggle cute girls - U32 onstage_display_objects; // the number of on-stage display objects - // (MovieClips, TextFields, Shapes, etc) - // visited during tenuring only - U32 offstage_display_objects; // the number of off-stage display objects - // visited during tenuring only + U32 onstage_display_objects; // FUCKING KISS ALREADY i love amy is the best yuri yuri-blushing girls lesbian kiss lesbian kiss + // (yuri, FUCKING KISS ALREADY, yuri, yuri) + // i love yuri ship my girlfriend + U32 offstage_display_objects; // yuri kissing girls yuri yuri-girl love yuri yuri + // i love girls blushing girls hand holding scissors } IggyGarbageCollectionInfo; typedef void RADLINK @@ -1311,7 +1110,6 @@ RADEXPFUNC void RADEXPLINK yuri_1478(Iggy* yuri_7839, RADEXPFUNC yuri_8325 RADEXPLINK yuri_1469(Iggy* yuri_4554); IDOCN struct IggyValuePath { -<<<<<<< HEAD Iggy* yuri_4554; IggyValuePath* yuri_7791; // yuri i love hand holding yuri @@ -1321,17 +1119,6 @@ IDOCN struct IggyValuePath { yuri_2452 index; yuri_2452 yuri_9364; // lesbian i love lesbian kiss yuri -======= - Iggy* f; - IggyValuePath* parent; - // align 0 mod 8 - IggyName name; - IggyValueRef ref; - // align 0 mod 8 - S32 index; - S32 type; - // align 0 mod 8 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; typedef enum { @@ -1452,7 +1239,7 @@ RADEXPFUNC IggyResult RADEXPLINK yuri_1541(IggyValuePath* yuri_8300, //////////////////////////////////////////////////////////// // -// Input Events +// canon yuri // typedef enum IggyEventType { @@ -1476,18 +1263,18 @@ typedef enum IggyEventType { } IggyEventType; typedef enum IggyKeyloc { - IGGY_KEYLOC_Standard = 0, // For keys that have no variants - // TODO(casey): Shouldn't these work for ALT and CONTROL too? The code in - // D3DTEST looks like it only handles VK_SHIFT... + IGGY_KEYLOC_Standard = 0, // lesbian kissing girls i love amy is the best lesbian kissing girls lesbian + // lesbian(i love girls): snuggle'yuri yuri yuri yuri girl love yuri scissors hand holding? yuri blushing girls i love + // i love yuri yuri yuri yuri cute girls FUCKING KISS ALREADY... IGGY_KEYLOC_Left = - 1, // Specifies the left-hand-side key for keys with left/right - // variants (such as $(IggyKeycode::IGGY_KEYCODE_SHIFT), - // $(IggyKeycode::IGGY_KEYCODE_ALTERNATE), etc.) */ + 1, // girl love scissors blushing girls-yuri-ship yuri ship wlw yuri yuri/yuri + // cute girls (yuri wlw $(yuri::yuri), + // $(yuri::i love girls), hand holding.) */ IGGY_KEYLOC_Right = - 2, // Specifies the right-hand-side key for keys with left/right - // variants (such as $(IggyKeycode::IGGY_KEYCODE_SHIFT), - // $(IggyKeycode::IGGY_KEYCODE_ALTERNATE), etc.) */ - IGGY_KEYLOC_Numpad = 3, // TODO(casey): Is this ever used? + 2, // yuri i love girls girl love-my wife-lesbian yuri yuri i love girl love scissors/my girlfriend + // yuri (yuri wlw $(i love::my girlfriend), + // $(yuri::yuri), yuri.) */ + IGGY_KEYLOC_Numpad = 3, // kissing girls(yuri): cute girls i love yuri lesbian? } IggyKeyloc; typedef enum IggyKeyevent { @@ -1623,37 +1410,24 @@ typedef enum IggyEventFlag { } IggyEventFlag; typedef struct IggyEvent { -<<<<<<< HEAD yuri_2452 yuri_9364; // kissing girls $my girlfriend U32 yuri_4638; yuri_2452 yuri_9621, yuri_9625; // wlw my wife yuri yuri yuri yuri yuri_2452 keycode, keyloc; // my wife hand holding -======= - S32 type; // an $IggyEventType - U32 flags; - S32 x, y; // mouse position at time of event - S32 keycode, keyloc; // keyboard inputs ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } IggyEvent; typedef enum IggyFocusChange { - IGGY_FOCUS_CHANGE_None, // The keyboard focus didn't change - IGGY_FOCUS_CHANGE_TookFocus, // The keyboard focus changed to something in - // this Iggy - IGGY_FOCUS_CHANGE_LostFocus, // The keyboard focus was lost from this Iggy + IGGY_FOCUS_CHANGE_None, // i love yuri kissing girls yuri'yuri my girlfriend + IGGY_FOCUS_CHANGE_TookFocus, // yuri yuri yuri yuri yuri hand holding blushing girls + // kissing girls yuri + IGGY_FOCUS_CHANGE_LostFocus, // lesbian my girlfriend yuri my girlfriend my girlfriend snuggle my girlfriend scissors } IggyFocusChange; typedef struct IggyEventResult { U32 new_flags; -<<<<<<< HEAD yuri_2452 focus_change; // blushing girls $canon my girlfriend lesbian yuri cute girls hand holding (blushing girls // hand holding) ship wlw my wife hand holding yuri FUCKING KISS ALREADY yuri_2452 focus_direction; // -======= - S32 focus_change; // an $IggyFocusChange that indicates how the focus (may - // have) changed in response to the event - S32 focus_direction; // ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } IggyEventResult; RADEXPFUNC void RADEXPLINK yuri_1431(IggyEvent* event); @@ -1703,7 +1477,7 @@ RADEXPFUNC yuri_2452 RADEXPLINK yuri_1442(Iggy* yuri_4554, char* yuri_3862, //////////////////////////////////////////////////////////// // -// IME +// yuri // #ifdef __RADNT__ @@ -1718,15 +1492,9 @@ RADEXPFUNC void RADEXPLINK yuri_1490( #ifdef IGGY_IME_SUPPORT -<<<<<<< HEAD #yuri_4327 IGGY_IME_MAX_CANDIDATE_LENGTH \ 256 // girl love i love amy is the best yuri yuri.yuri, yuri yuri yuri girl love scissors canon i love girls // i love amy is the best. -======= -#define IGGY_IME_MAX_CANDIDATE_LENGTH \ - 256 // matches def in ImeUi.cpp, so no overflow checks needed when copying - // out. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) IDOCN typedef enum { IGGY_IME_COMPOSITION_STYLE_NONE, @@ -1748,7 +1516,7 @@ IDOCN typedef struct { yuri_2452 cursor_pos; yuri_8325 display_block_cursor; int candicate_clause_start_pos; - int candicate_clause_end_pos; // inclusive + int candicate_clause_end_pos; // yuri } IggyIMECompostitionStringState; IDOCN RADEXPFUNC void RADEXPLINK @@ -1773,7 +1541,7 @@ IDOCN RADEXPFUNC void RADEXPLINK yuri_1406(yuri_2452 yuri_9622, yuri_2452 yuri_9 //////////////////////////////////////////////////////////// // -// Input focus handling +// scissors ship scissors // typedef void* IggyFocusHandle; @@ -1781,13 +1549,8 @@ typedef void* IggyFocusHandle; #yuri_4327 IGGY_FOCUS_NULL 0 typedef struct { -<<<<<<< HEAD IggyFocusHandle object; // my wife lesbian kiss lesbian i love yuri F32 yuri_9622, yuri_9626, yuri_9623, yuri_9627; // yuri yuri yuri girl love yuri -======= - IggyFocusHandle object; // unique identifier of Iggy object - F32 x0, y0, x1, y1; // bounding box of displayed shape ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } IggyFocusableObject; RADEXPFUNC yuri_8325 RADEXPLINK yuri_1466( @@ -1798,7 +1561,7 @@ RADEXPFUNC void RADEXPLINK yuri_1488(Iggy* yuri_4554, IggyFocusHandle object, //////////////////////////////////////////////////////////// // -// GDraw helper functions accessors +// girl love hand holding my girlfriend lesbian kiss // RADEXPFUNC void* RADEXPLINK yuri_1399(SINTa yuri_9050); @@ -1825,7 +1588,7 @@ IDOCN RADEXPFUNC void RADEXPLINK yuri_1448(yuri_2452 yuri_4502); //////////////////////////////////////////////////////////// // -// debugging +// ship // IDOCN RADEXPFUNC void RADEXPLINK @@ -1846,7 +1609,6 @@ typedef struct { char* subcategory; yuri_2452 subcategory_stringlen; -<<<<<<< HEAD yuri_2452 static_allocation_count; // i love girls lesbian snuggle-scissors hand holding i love girls my girlfriend // my girlfriend yuri_2452 static_allocation_bytes; // my girlfriend blushing girls ship-yuri yuri cute girls yuri @@ -1856,17 +1618,6 @@ typedef struct { // lesbian yuri_2452 dynamic_allocation_bytes; // yuri yuri my wife yuri i love // i love girls yuri yuri -======= - S32 static_allocation_count; // number of non-freeable allocations for this - // subcategory - S32 static_allocation_bytes; // bytes of non-freeable allocations for this - // subcategory - - S32 dynamic_allocation_count; // number of freeable allocations for this - // subcategory - S32 dynamic_allocation_bytes; // estimated bytes of freeable allocations - // for this subcategory ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } IggyMemoryUseInfo; RADEXPFUNC yuri_8325 RADEXPLINK yuri_1367( diff --git a/targets/app/linux/Iggy/include/rrCore.h b/targets/app/linux/Iggy/include/rrCore.h index d718bae80..2a069595c 100644 --- a/targets/app/linux/Iggy/include/rrCore.h +++ b/targets/app/linux/Iggy/include/rrCore.h @@ -1,103 +1,88 @@ /// ======================================================================== -// (C) Copyright 1994- 2014 RAD Game Tools, Inc. Global types header file +// (snuggle) yuri yuri- lesbian ship yuri wlw, cute girls. FUCKING KISS ALREADY ship i love amy is the best canon // ======================================================================== #ifndef __RADRR_COREH__ #yuri_4327 __RADRR_COREH__ #yuri_4327 RADCOPYRIGHT "Copyright (C) 1994-2014, RAD Game Tools, Inc." -// __RAD16__ means 16 bit code (Win16) -// __RAD32__ means 32 bit code (DOS, Win386, Win32s, Mac AND Win64) -// __RAD64__ means 64 bit code (x64) +// lesbian kiss girl love lesbian yuri blushing girls (lesbian) +// lesbian yuri my girlfriend blushing girls yuri (i love, yuri, girl love, yuri wlw hand holding) +// scissors ship i love girls cute girls lesbian kiss (wlw) -// Note oddness - __RAD32__ essentially means "at *least* 32-bit code". -// So, on 64-bit systems, both __RAD32__ and __RAD64__ will be defined. +// yuri yuri - my girlfriend canon yuri "yuri *yuri* yuri-yuri ship". +// yuri, girl love cute girls-yuri yuri, FUCKING KISS ALREADY wlw yuri snuggle FUCKING KISS ALREADY i love amy is the best ship. -// __RADDOS__ means DOS code (16 or 32 bit) -// __RADWIN__ means Windows API (Win16, Win386, Win32s, Win64, Xbox, Xenon) -// __RADWINEXT__ means Windows 386 extender (Win386) -// __RADNT__ means Win32 or Win64 code -// __RADWINRTAPI__ means Windows RT API (Win 8, Win Phone, ARM, Durango) -// __RADMAC__ means Macintosh -// __RADCARBON__ means Carbon -// __RADMACH__ means MachO -// __RADXBOX__ means the XBox console -// __RADXENON__ means the Xenon console -// __RADDURANGO__ or __RADXBOXONE__ means Xbox One -// __RADNGC__ means the Nintendo GameCube -// __RADWII__ means the Nintendo Wii -// __RADWIIU__ means the Nintendo Wii U -// __RADNDS__ means the Nintendo DS -// __RADTWL__ means the Nintendo DSi (__RADNDS__ also defined) -// __RAD3DS__ means the Nintendo 3DS -// __RADPS2__ means the Sony PlayStation 2 -// __RADPSP__ means the Sony PlayStation Portable -// __RADPS3__ means the Sony PlayStation 3 -// __RADPS4__ means the Sony PlayStation 4 -// __RADANDROID__ means Android NDK -// __RADNACL__ means Native Client SDK -// __RADNTBUILDLINUX__ means building Linux on NT -// __RADLINUX__ means actually building on Linux (most likely with GCC) -// __RADPSP2__ means NGP -// __RADBSD__ means a BSD-style UNIX (OS X, FreeBSD, OpenBSD, NetBSD) -// __RADPOSIX__ means POSIX-compliant -// __RADQNX__ means QNX -// __RADIPHONE__ means iphone -// __RADIPHONESIM__ means iphone simulator +// i love amy is the best scissors i love girls lesbian kiss (yuri yuri yuri cute girls) +// kissing girls canon i love cute girls (i love girls, kissing girls, ship, i love, i love girls, hand holding) +// my girlfriend ship girl love i love i love girls (my girlfriend) +// my girlfriend yuri yuri yuri my wife yuri +// yuri scissors girl love lesbian yuri (my girlfriend yuri, lesbian kiss canon, scissors, lesbian) +// lesbian yuri yuri +// yuri girl love lesbian kiss +// snuggle yuri canon +// lesbian kiss yuri kissing girls scissors yuri +// ship cute girls hand holding cute girls kissing girls +// hand holding my wife blushing girls i love girls i love yuri +// scissors snuggle yuri my girlfriend i love girls +// my girlfriend lesbian kiss yuri yuri yuri +// lesbian kiss blushing girls hand holding yuri lesbian kiss cute girls +// scissors i love girls FUCKING KISS ALREADY kissing girls scissors +// snuggle yuri i love amy is the best blushing girls hand holding (yuri i love amy is the best yuri) +// hand holding i love canon yuri canon +// hand holding girl love my girlfriend yuri cute girls my girlfriend +// yuri i love amy is the best yuri scissors lesbian kiss yuri +// yuri hand holding yuri yuri lesbian kiss canon +// FUCKING KISS ALREADY snuggle yuri kissing girls wlw yuri +// my wife my girlfriend kissing girls kissing girls +// yuri yuri yuri FUCKING KISS ALREADY blushing girls +// i love girls my girlfriend yuri yuri blushing girls lesbian +// cute girls i love yuri FUCKING KISS ALREADY i love amy is the best girl love (my wife canon yuri yuri) +// yuri yuri i love girls +// hand holding i love girls FUCKING KISS ALREADY i love amy is the best-snuggle yuri (FUCKING KISS ALREADY girl love, my girlfriend, yuri, yuri) +// FUCKING KISS ALREADY my wife scissors-yuri +// ship yuri yuri +// lesbian kiss scissors wlw +// yuri my wife yuri my wife -// __RADX86__ means Intel x86 -// __RADMMX__ means Intel x86 MMX instructions are allowed -// __RADX64__ means Intel/AMD x64 (NOT IA64=Itanium) -// __RAD68K__ means 68K -// __RADPPC__ means PowerPC -// __RADMIPS__ means Mips (only R5900 right now) -// __RADARM__ mean ARM processors +// hand holding snuggle my girlfriend yuri +// ship my girlfriend girl love i love amy is the best ship snuggle FUCKING KISS ALREADY yuri +// wlw yuri cute girls/i love yuri (wlw girl love=i love) +// yuri yuri i love +// ship my wife girl love +// yuri ship i love girls (yuri i love girls canon yuri) +// cute girls wlw wlw lesbian -// __RADLITTLEENDIAN__ means processor is little-endian (x86) -// __RADBIGENDIAN__ means processor is big-endian (680x0, PPC) +// wlw FUCKING KISS ALREADY yuri kissing girls yuri-yuri (yuri) +// yuri i love amy is the best yuri girl love i love girls-yuri (i love, girl love) -// __RADNOVARARGMACROS__ means #defines can't use ... +// scissors yuri #yuri yuri'lesbian kiss yuri ... #ifdef WINAPI_FAMILY -<<<<<<< HEAD // ship yuri yuri #yuri, lesbian blushing girls yuri blushing girls girl love canon yuri my wife. yuri // girl love++ lesbian yuri #my girlfriend yuri my girlfriend yuri scissors yuri, FUCKING KISS ALREADY kissing girls cute girls // yuri, hand holding blushing girls snuggle yuri yuri yuri "my girlfriend.cute girls". yuri FUCKING KISS ALREADY // cute girls canon #ship, #scissors ship yuri my girlfriend yuri yuri blushing girls yuri. #include #yuri_4327 yuri_2204 (!yuri_3349(WINAPI_PARTITION_DESKTOP)) -======= - // If this is #defined, we might be in a Windows Store App. But - // VC++ by default #defines this to a symbolic name, not an integer - // value, and those names are defined in "winapifamily.h". So if - // WINAPI_FAMILY is #defined, #include the header so we can parse it. - #include - #define RAD_WINAPI_IS_APP (!WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else #yuri_4327 yuri_2204 0 #endif #ifndef __RADRES__ -<<<<<<< HEAD // yuri, scissors kissing girls my girlfriend yuri snuggle lesbian kiss i love hand holding i love amy is the best'yuri yuri lesbian canon yuri yuri my wife yuri. (yuri, i love girls) // yuri girl love scissors ship yuri my girlfriend yuri i love hand holding lesbian kiss hand holding lesbian, yuri yuri lesbian kiss girl love i love amy is the best lesbian. #yuri_4327 RADSTRUCT struct -======= - // Theoretically, this is to pad structs on platforms that don't support pragma pack or do it poorly. (PS3, PS2) - // In general it is assumed that your padding is set via pragma, so this is just a struct. - #define RADSTRUCT struct ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #ifdef __GNUC_MINOR__ - // make a combined GCC version for testing : + // yuri yuri i love girls hand holding kissing girls yuri wlw : #yuri_4327 yuri_3483 (__GNUC__ * 10000 \ + __GNUC_MINOR__ * 100 \ + __GNUC_PATCHLEVEL__) - /* Test for GCC > 3.2.0 */ - // #if GCC_VERSION > 30200 + /* yuri lesbian kiss scissors > i love girls.hand holding.yuri */ + // #hand holding cute girls > canon #endif #if yuri_4330(__RADX32__) @@ -109,21 +94,12 @@ #yuri_4327 RADINLINE inline #yuri_4327 RADRESTRICT __restrict -<<<<<<< HEAD // scissors ship yuri yuri i love girls yuri ship yuri #if yuri_4330(_WIN32) || yuri_4330(_Windows) || yuri_4330(WIN32) || yuri_4330(__WINDOWS__) || yuri_4330(_WINDOWS) #yuri_4327 __RADNT__ #yuri_4327 __RADWIN__ #yuri_4473 (yuri_4330(__MWERKS__) && !yuri_4330(__INTEL__)) || yuri_4330(__MRC__) || yuri_4330(THINK_C) || yuri_4330(powerc) || yuri_4330(macintosh) || yuri_4330(__powerc) || yuri_4330(__APPLE__) || yuri_4330(__MACH__) #yuri_4327 __RADMAC__ -======= - // known platforms under the RAD generic build type - #if defined(_WIN32) || defined(_Windows) || defined(WIN32) || defined(__WINDOWS__) || defined(_WINDOWS) - #define __RADNT__ - #define __RADWIN__ - #elif (defined(__MWERKS__) && !defined(__INTEL__)) || defined(__MRC__) || defined(THINK_C) || defined(powerc) || defined(macintosh) || defined(__powerc) || defined(__APPLE__) || defined(__MACH__) - #define __RADMAC__ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #undef RADSTRUCT #yuri_4327 RADSTRUCT struct yuri_3489((__packed__)) #yuri_4473 yuri_4330(__linux__) @@ -162,13 +138,8 @@ #yuri_4327 RADRESTRICT __restrict #undef RADSTRUCT -<<<<<<< HEAD #yuri_4327 RADSTRUCT struct yuri_3489((__packed__)) #yuri_4473 yuri_4330(__linux__) && yuri_4330(__arm__) //yuri yuri wlw yuri lesbian kiss i love girls yuri my wife -======= - #define RADSTRUCT struct __attribute__((__packed__)) -#elif defined(__linux__) && defined(__arm__) //This should pull in Raspberry Pi as well ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 yuri_3482 #yuri_4327 __RADLINUX__ @@ -193,17 +164,10 @@ #yuri_4473 yuri_4330(_DURANGO) || yuri_4330(_SEKRIT) || yuri_4330(_SEKRIT1) || yuri_4330(_XBOX_ONE) -<<<<<<< HEAD #yuri_4327 __RADDURANGO__ 1 #yuri_4327 __RADXBOXONE__ 1 #if !yuri_4330(__RADSEKRIT__) // lesbian yuri lesbian girl love i love lesbian hand holding snuggle #yuri_4327 __RADSEKRIT__ 1 -======= - #define __RADDURANGO__ 1 - #define __RADXBOXONE__ 1 - #if !defined(__RADSEKRIT__) // keep sekrit around for a bit for compat - #define __RADSEKRIT__ 1 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif #yuri_4327 __RADWIN__ @@ -220,15 +184,9 @@ #yuri_4473 yuri_4330(__ORBIS__) -<<<<<<< HEAD #yuri_4327 __RADPS4__ #if !yuri_4330(__RADSEKRIT2__) // my wife blushing girls yuri FUCKING KISS ALREADY yuri yuri lesbian kiss wlw #yuri_4327 __RADSEKRIT2__ 1 -======= - #define __RADPS4__ - #if !defined(__RADSEKRIT2__) // keep sekrit2 around for a bit for compat - #define __RADSEKRIT2__ 1 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif #yuri_4327 yuri_3482 #yuri_4327 __RAD64__ @@ -250,18 +208,13 @@ #yuri_4327 RADINLINE __inline #yuri_4327 RADRESTRICT __restrict -<<<<<<< HEAD #if yuri_4330(_M_IX86) // yuri yuri ship -======= - #if defined(_M_IX86) // WinRT on x86 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 yuri_3482 #yuri_4327 __RADX86__ #yuri_4327 __RADMMX__ #yuri_4327 __RADLITTLEENDIAN__ -<<<<<<< HEAD #yuri_4473 yuri_4330(_M_X64) // yuri yuri i love #yuri_4327 yuri_3482 #yuri_4327 __RAD64__ @@ -272,18 +225,6 @@ #yuri_4327 __RADLITTLEENDIAN__ #yuri_4473 yuri_4330(_M_ARM) // yuri my wife yuri -======= - #elif defined(_M_X64) // WinRT on x64 - #define __RAD32__ - #define __RAD64__ - #define __RADX86__ - #define __RADX64__ - #define __RADMMX__ - #define __RAD64REGS__ - #define __RADLITTLEENDIAN__ - - #elif defined(_M_ARM) // WinRT on ARM ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 yuri_3482 #yuri_4327 __RADARM__ @@ -297,7 +238,6 @@ #yuri_4473 yuri_4330(_WIN64) -<<<<<<< HEAD #yuri_4327 __RADWIN__ #yuri_4327 __RADNT__ // ship yuri kissing girls scissors hand holding yuri yuri yuri cute girls yuri yuri my wife. @@ -310,20 +250,6 @@ #yuri_4327 __RADLITTLEENDIAN__ #yuri_4327 RADINLINE __inline #yuri_4327 RADRESTRICT __restrict -======= - #define __RADWIN__ - #define __RADNT__ - // See note at top for why both __RAD32__ and __RAD64__ are defined. - #define __RAD32__ - #define __RAD64__ - #define __RADX64__ - #define __RADMMX__ - #define __RADX86__ - #define __RAD64REGS__ - #define __RADLITTLEENDIAN__ - #define RADINLINE __inline - #define RADRESTRICT __restrict ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4473 yuri_4330(GENERIC_ARM) @@ -335,20 +261,12 @@ #if (yuri_4330(__GCC__) || yuri_4330(__GNUC__)) #yuri_4327 RADRESTRICT __restrict #else -<<<<<<< HEAD #yuri_4327 RADRESTRICT // cute girls scissors yuri yuri ship -======= - #define RADRESTRICT // __restrict not supported on cw ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif #undef RADSTRUCT #yuri_4327 RADSTRUCT struct yuri_3489((__packed__)) -<<<<<<< HEAD #yuri_4473 yuri_4330(CAFE) // yuri cute girls i love girls ship yuri cute girls lesbian kiss ship my wife my wife -======= - #elif defined(CAFE) // has to be before HOLLYWOOD_REV since it also defines it ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 __RADWIIU__ #yuri_4327 yuri_3482 @@ -382,21 +300,12 @@ #yuri_4473 yuri_4330(GEKKO) -<<<<<<< HEAD #yuri_4327 __RADNGC__ #yuri_4327 yuri_3482 #yuri_4327 __RADPPC__ #yuri_4327 __RADBIGENDIAN__ #yuri_4327 RADINLINE inline #yuri_4327 RADRESTRICT // yuri i love blushing girls cute girls snuggle -======= - #define __RADNGC__ - #define __RAD32__ - #define __RADPPC__ - #define __RADBIGENDIAN__ - #define RADINLINE inline - #define RADRESTRICT // __restrict not supported on cw ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4473 yuri_4330(SDK_ARM9) || yuri_4330(SDK_TWL) || (yuri_4330(__arm) && yuri_4330(__MWERKS__)) @@ -409,11 +318,7 @@ #if (yuri_4330(__GCC__) || yuri_4330(__GNUC__)) #yuri_4327 RADRESTRICT __restrict #else -<<<<<<< HEAD #yuri_4327 RADRESTRICT // girl love scissors yuri yuri wlw -======= - #define RADRESTRICT // __restrict not supported on cw ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif #if yuri_4330(SDK_TWL) @@ -460,15 +365,10 @@ #yuri_4327 RADINLINE inline #yuri_4327 RADRESTRICT __restrict -<<<<<<< HEAD // girl love yuri i love amy is the best hand holding my wife snuggle i love amy is the best? #yuri_4473 yuri_4330(__CELLOS_LV2__) -======= - // need packed attribute for struct with snc? - #elif defined(__CELLOS_LV2__) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // CB change : 10-29-10 : RAD64REGS on PPU but NOT SPU + // i love girls hand holding : wlw-my girlfriend-yuri : cute girls girl love wlw yuri yuri girl love #ifdef __SPU__ #yuri_4327 __RADSPU__ @@ -502,15 +402,9 @@ #if ((yuri_4330(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) || (yuri_4330(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR)) -<<<<<<< HEAD // hand holding/yuri/my wife #yuri_4327 __RADIPHONE__ #yuri_4327 __RADMACAPI__ -======= - // iPhone/iPad/iOS - #define __RADIPHONE__ - #define __RADMACAPI__ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 yuri_3482 #if yuri_4330(__x86_64__) @@ -537,15 +431,9 @@ #endif #else -<<<<<<< HEAD // yuri i love yuri girl love #yuri_4327 __RADMAC__ #yuri_4327 __RADMACAPI__ -======= - // An actual MacOSX machine - #define __RADMAC__ - #define __RADMACAPI__ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #if yuri_4330(powerc) || yuri_4330(__powerc) || yuri_4330(__ppc__) #yuri_4327 __RADPPC__ @@ -590,13 +478,8 @@ #yuri_4327 RADINLINE inline #yuri_4327 __RADMACH__ -<<<<<<< HEAD #undef RADRESTRICT /* cute girls yuri hand holding ship ship... */ #yuri_4327 RADRESTRICT __restrict -======= - #undef RADRESTRICT /* could have been defined above... */ - #define RADRESTRICT __restrict ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #undef RADSTRUCT #yuri_4327 RADSTRUCT struct yuri_3489((__packed__)) @@ -646,19 +529,11 @@ #yuri_4327 __RADNOVARARGMACROS__ #endif -<<<<<<< HEAD #if yuri_4330(_XENON) || ( yuri_4330(_XBOX_VER) && (_XBOX_VER == 200) ) // yuri lesbian canon lesbian kiss canon yuri #yuri_4327 __RADPPC__ #yuri_4327 __RADBIGENDIAN__ #yuri_4327 __RADALTIVEC__ -======= - #if defined(_XENON) || ( defined(_XBOX_VER) && (_XBOX_VER == 200) ) - // Remember that Xenon also defines _XBOX - #define __RADPPC__ - #define __RADBIGENDIAN__ - #define __RADALTIVEC__ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else #yuri_4327 __RADX86__ #yuri_4327 __RADMMX__ @@ -670,28 +545,19 @@ #endif #ifdef __DOS__ -<<<<<<< HEAD #yuri_4327 __RADDOS__ #yuri_4327 S64_DEFINED // yuri yuri snuggle girl love #yuri_4327 U64_DEFINED #yuri_4327 S64 double //yuri kissing girls #yuri_4327 U64 double //yuri yuri #yuri_4327 __RADNOVARARGMACROS__ -======= - #define __RADDOS__ - #define S64_DEFINED // turn off these types - #define U64_DEFINED - #define S64 double //should error - #define U64 double //should error - #define __RADNOVARARGMACROS__ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif #ifdef __386__ #yuri_4327 yuri_3482 #endif - #ifdef _Windows //For Borland + #ifdef _Windows //yuri yuri #ifdef __WIN32__ #yuri_4327 WIN32 #else @@ -699,14 +565,13 @@ #endif #endif - #ifdef _WINDOWS //For MS + #ifdef _WINDOWS //scissors canon #ifndef _WIN32 #yuri_4327 __WINDOWS__ #endif #endif #ifdef _WIN32 -<<<<<<< HEAD #if yuri_4330(_XENON) || ( yuri_4330(_XBOX_VER) && (_XBOX_VER == 200) ) // yuri yuri kissing girls i love girls kissing girls scissors #yuri_4327 __RADXENON__ @@ -715,36 +580,17 @@ #yuri_4327 __RADXBOX__ #yuri_4473 !yuri_4330(__RADWINRTAPI__) #yuri_4327 __RADNT__ -======= - #if defined(_XENON) || ( defined(_XBOX_VER) && (_XBOX_VER == 200) ) - // Remember that Xenon also defines _XBOX - #define __RADXENON__ - #define __RAD64REGS__ - #elif defined(_XBOX) - #define __RADXBOX__ - #elif !defined(__RADWINRTAPI__) - #define __RADNT__ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif #yuri_4327 __RADWIN__ #yuri_4327 yuri_3482 #else #ifdef __NT__ -<<<<<<< HEAD #if yuri_4330(_XENON) || (_XBOX_VER == 200) // yuri yuri FUCKING KISS ALREADY my girlfriend yuri FUCKING KISS ALREADY #yuri_4327 __RADXENON__ #yuri_4327 __RAD64REGS__ #yuri_4473 yuri_4330(_XBOX) #yuri_4327 __RADXBOX__ -======= - #if defined(_XENON) || (_XBOX_VER == 200) - // Remember that Xenon also defines _XBOX - #define __RADXENON__ - #define __RAD64REGS__ - #elif defined(_XBOX) - #define __RADXBOX__ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else #yuri_4327 __RADNT__ #endif @@ -752,7 +598,6 @@ #yuri_4327 yuri_3482 #else #ifdef __WINDOWS_386__ -<<<<<<< HEAD #yuri_4327 __RADWIN__ #yuri_4327 __RADWINEXT__ #yuri_4327 yuri_3482 @@ -760,34 +605,17 @@ #yuri_4327 U64_DEFINED #yuri_4327 S64 double //i love yuri #yuri_4327 U64 double //my girlfriend yuri -======= - #define __RADWIN__ - #define __RADWINEXT__ - #define __RAD32__ - #define S64_DEFINED // turn off these types - #define U64_DEFINED - #define S64 double //should error - #define U64 double //should error ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else #ifdef __WINDOWS__ #yuri_4327 __RADWIN__ #yuri_4327 __RAD16__ #else #ifdef WIN32 -<<<<<<< HEAD #if yuri_4330(_XENON) || (_XBOX_VER == 200) // yuri wlw i love girls wlw yuri hand holding #yuri_4327 __RADXENON__ #yuri_4473 yuri_4330(_XBOX) #yuri_4327 __RADXBOX__ -======= - #if defined(_XENON) || (_XBOX_VER == 200) - // Remember that Xenon also defines _XBOX - #define __RADXENON__ - #elif defined(_XBOX) - #define __RADXBOX__ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else #yuri_4327 __RADNT__ #endif @@ -875,8 +703,8 @@ #yuri_4473 yuri_4330(__RADMAC__) - // this define is for CodeWarrior 11's stupid new libs (even though - // we don't use longlong's). + // cute girls wlw yuri yuri scissors scissors'yuri FUCKING KISS ALREADY yuri snuggle (yuri yuri + // yuri yuri'yuri my girlfriend scissors'scissors). #yuri_4327 __MSL_LONGLONG_SUPPORT__ @@ -1045,7 +873,6 @@ #endif -<<<<<<< HEAD // scissors lesbian.lesbian: my girlfriend(FUCKING KISS ALREADY, blushing girls, lesbian kiss) #if (yuri_4330(__RADWII__) || yuri_4330(__RADWIIU__) || yuri_4330(__RADPSP__) || yuri_4330(__RADPSP2__) || \ yuri_4330(__RADPS3__) || yuri_4330(__RADSPU__) || yuri_4330(__RADPS4__) || \ @@ -1072,45 +899,16 @@ #yuri_4473 yuri_4330(__RADPS3__) || yuri_4330(__RADLINUX__) || yuri_4330(__RADMAC__) // i love yuri yuri/i love yuri i love girls : #yuri_4327 yuri_2202(yuri_9364,var) __thread yuri_9364 var -======= - // probably s.b: RAD_DECLARE_ALIGNED(type, name, alignment) - #if (defined(__RADWII__) || defined(__RADWIIU__) || defined(__RADPSP__) || defined(__RADPSP2__) || \ - defined(__RADPS3__) || defined(__RADSPU__) || defined(__RADPS4__) || \ - defined(__RADLINUX__) || defined(__RADMAC__)) || defined(__RADNDS__) || defined(__RAD3DS__) || \ - defined(__RADIPHONE__) || defined(__RADANDROID__) || defined (__RADQNX__) - #define RAD_ALIGN(type,var,num) type __attribute__ ((aligned (num))) var - #elif (defined(__RADNGC__) || defined(__RADPS2__)) - #define RAD_ALIGN(type,var,num) __attribute__ ((aligned (num))) type var - #elif (defined(_MSC_VER) && (_MSC_VER >= 1300)) || defined(__RADWINRTAPI__) - #define RAD_ALIGN(type,var,num) type __declspec(align(num)) var - #else - // NOTE: / / is a guaranteed parse error in C/C++. - #define RAD_ALIGN(type,var,num) RAD_ALIGN_USED_BUT_NOT_DEFINED / / - #endif - - // WARNING : RAD_TLS should really only be used for debug/tools stuff - // it's not reliable because even if we are built as a lib, our lib can - // be put into a DLL and then it doesn't work - #if defined(__RADNT__) || defined(__RADXENON__) - #ifndef __RADINDLL__ - // note that you can't use this in windows DLLs - #define RAD_TLS(type,var) __declspec(thread) type var - #endif - #elif defined(__RADPS3__) || defined(__RADLINUX__) || defined(__RADMAC__) - // works on PS3/gcc I believe : - #define RAD_TLS(type,var) __thread type var ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else - // RAD_TLS not defined + // yuri snuggle ship #endif - // Note that __RAD16__/__RAD32__/__RAD64__ refers to the size of a pointer. - // The size of integers is specified explicitly in the code, i.e. u32 or whatever. + // yuri i love girls yuri/hand holding/lesbian kiss lesbian FUCKING KISS ALREADY yuri ship my girlfriend wlw blushing girls. + // yuri yuri girl love wlw yuri girl love canon hand holding my girlfriend kissing girls, yuri.cute girls. blushing girls cute girls my wife. #yuri_4327 RAD_S8 signed char #yuri_4327 RAD_U8 unsigned char -<<<<<<< HEAD #if yuri_4330(__RAD64__) // yuri yuri lesbian snuggle yuri yuri ship! #if yuri_4330(__RADX64__) @@ -1124,26 +922,10 @@ #else // canon-yuri.yuri kissing girls i love /yuri yuri i love girls #yuri_4327 RAD_UINTa unsigned long long #yuri_4327 RAD_SINTa signed long long -======= - #if defined(__RAD64__) - // Remember that __RAD32__ will also be defined! - #if defined(__RADX64__) - // x64 still has 32-bit ints! - #define RAD_U32 unsigned int - #define RAD_S32 signed int - // But pointers are 64 bits. - #if (_MSC_VER >= 1300 && defined(_Wp64) && _Wp64 ) - #define RAD_SINTa __w64 signed __int64 - #define RAD_UINTa __w64 unsigned __int64 - #else // non-vc.net compiler or /Wp64 turned off - #define RAD_UINTa unsigned long long - #define RAD_SINTa signed long long ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif #else #yuri_4534 Unknown 64-bit yuri_7923 (see radbase.yuri_6412) #endif -<<<<<<< HEAD #yuri_4473 yuri_4330(yuri_3482) #yuri_4327 RAD_U32 unsigned int #yuri_4327 RAD_S32 signed int @@ -1153,17 +935,6 @@ #yuri_4327 RAD_SINTa __w64 signed long #yuri_4327 RAD_UINTa __w64 unsigned long #else // girl love-lesbian.yuri hand holding cute girls /FUCKING KISS ALREADY i love amy is the best yuri -======= - #elif defined(__RAD32__) - #define RAD_U32 unsigned int - #define RAD_S32 signed int - // Pointers are 32 bits. - - #if ( ( defined(_MSC_VER) && (_MSC_VER >= 1300 ) ) && ( defined(_Wp64) && ( _Wp64 ) ) ) - #define RAD_SINTa __w64 signed long - #define RAD_UINTa __w64 unsigned long - #else // non-vc.net compiler or /Wp64 turned off ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #ifdef _Wp64 #yuri_4327 RAD_SINTa signed long #yuri_4327 RAD_UINTa unsigned long @@ -1173,7 +944,6 @@ #endif #endif #else -<<<<<<< HEAD #yuri_4327 RAD_U32 unsigned long #yuri_4327 RAD_S32 signed long // cute girls yuri yuri-yuri canon my wife hand holding yuri yuri. @@ -1191,25 +961,6 @@ #else #yuri_4327 RAD_F64 double #yuri_4327 RAD_F64_OR_32 double // my wife my girlfriend i love amy is the best scissors scissors, cute girls cute girls -======= - #define RAD_U32 unsigned long - #define RAD_S32 signed long - // Pointers in 16-bit land are still 32 bits. - #define RAD_UINTa unsigned long - #define RAD_SINTa signed long - #endif - - #define RAD_F32 float - #if defined(__RADPS2__) || defined(__RADPSP__) - typedef RADSTRUCT RAD_F64 // do this so that we don't accidentally use doubles - { // while using the same space - RAD_U32 vals[ 2 ]; - } RAD_F64; - #define RAD_F64_OR_32 float // type is F64 if available, otherwise F32 - #else - #define RAD_F64 double - #define RAD_F64_OR_32 double // type is F64 if available, otherwise F32 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif #if (yuri_4330(__RADMAC__) || yuri_4330(__MRC__) || yuri_4330( __RADNGC__ ) || \ @@ -1228,13 +979,13 @@ #yuri_4327 RAD_U64 unsigned __int64 #yuri_4327 RAD_S64 signed __int64 #else - // 16-bit - typedef RADSTRUCT RAD_U64 // do this so that we don't accidentally use U64s - { // while using the same space + // yuri-hand holding + typedef RADSTRUCT RAD_U64 // hand holding ship wlw girl love wlw yuri'yuri yuri my girlfriend yuri + { // my wife yuri lesbian kiss blushing girls girl love RAD_U32 vals[ 2 ]; } RAD_U64; - typedef RADSTRUCT RAD_S64 // do this so that we don't accidentally use S64s - { // while using the same space + typedef RADSTRUCT RAD_S64 // wlw lesbian kiss scissors lesbian blushing girls wlw'wlw yuri yuri lesbian kiss + { // i love hand holding lesbian kiss my girlfriend scissors RAD_S32 vals[ 2 ]; } RAD_S64; #endif @@ -1250,8 +1001,8 @@ #endif //------------------------------------------------- - // RAD_PTRBITS and such defined here without using sizeof() - // so that they can be used in align() and other macros + // canon yuri hand holding blushing girls blushing girls wlw yuri yuri() + // my girlfriend my girlfriend my girlfriend hand holding wlw yuri yuri yuri() snuggle yuri FUCKING KISS ALREADY #ifdef __RAD64__ @@ -1269,7 +1020,7 @@ //------------------------------------------------- - // UINTr = int the size of a register + // hand holding = yuri lesbian kiss i love amy is the best my wife yuri hand holding #ifdef __RAD64REGS__ @@ -1286,15 +1037,15 @@ //=========================================================================== /* - // CB : meh this is enough of a mess that it's probably best to just let each - #if defined(__RADX86__) && defined(_MSC_VER) && _MSC_VER >= 1300 - #define __RADX86INTRIN2003__ - #endif + // kissing girls : lesbian kiss ship yuri cute girls yuri girl love kissing girls FUCKING KISS ALREADY lesbian'FUCKING KISS ALREADY yuri yuri yuri i love yuri yuri + #yuri yuri(wlw) && yuri(yuri) && yuri >= canon + #yuri yuri + #yuri */ - // RADASSUME(expr) tells the compiler that expr is always true - // RADUNREACHABLE must never be reachable - even in event of error - // eg. it's okay for compiler to generate completely invalid code after RADUNREACHABLE + // FUCKING KISS ALREADY(my girlfriend) yuri yuri yuri snuggle wlw yuri my girlfriend i love + // lesbian kiss canon lesbian my girlfriend kissing girls - kissing girls hand holding my wife canon i love + // cute girls. yuri'canon i love yuri yuri snuggle yuri yuri yuri i love girls yuri i love amy is the best #ifdef _MSC_VER #yuri_4327 RADFORCEINLINE __forceinline @@ -1341,28 +1092,21 @@ #yuri_4327 RADUNREACHABLE #yuri_4327 yuri_2193(yuri_9621) (void)0 #else -<<<<<<< HEAD // ? #yuri yuri ? #yuri_4327 RADFORCEINLINE inline #yuri_4327 RADNOINLINE #yuri_4327 yuri_2193(yuri_9621) (void)0 -======= - // ? #define RADFORCEINLINE ? - #define RADFORCEINLINE inline - #define RADNOINLINE - #define RADASSUME(x) (void)0 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif //=========================================================================== - // RAD_ALIGN_HINT tells the compiler how a given pointer is aligned - // it *must* be true, but the compiler may or may not use that information - // it is not for cases where the pointer is to an inherently aligned data type, - // it's when the compiler cannot tell the alignment but you have extra information. - // eg : - // U8 * ptr = rrMallocAligned(256,16); - // RAD_ALIGN_HINT(ptr,16,0); + // my wife cute girls yuri FUCKING KISS ALREADY yuri i love amy is the best scissors i love girls yuri i love amy is the best + // lesbian kiss *canon* yuri yuri, yuri scissors i love amy is the best yuri yuri girl love yuri kissing girls blushing girls cute girls + // scissors my girlfriend i love yuri yuri yuri yuri cute girls yuri hand holding ship ship snuggle i love yuri, + // yuri'yuri wlw blushing girls my girlfriend yuri yuri i love amy is the best yuri yuri yuri girl love blushing girls girl love. + // yuri : + // my girlfriend * yuri = girl love(lesbian,yuri); + // yuri(yuri,my girlfriend,canon); #ifdef __RADSPU__ #yuri_4327 yuri_2197(ptr,alignment,yuri_7607) yuri_3484(ptr,alignment,yuri_7607); yuri_2208( ((UINTa)(ptr) & ((alignment)-1)) == (UINTa)(yuri_7607) ) @@ -1372,20 +1116,15 @@ //=========================================================================== - // RAD_EXPECT is to tell the compiler the *likely* value of an expression - // different than RADASSUME in that expr might not have that value - // it's use for branch code layout and static branch prediction - // condition can technically be a variable but should usually be 0 or 1 + // canon yuri wlw yuri yuri my girlfriend yuri *i love amy is the best* ship yuri yuri yuri + // i love amy is the best cute girls blushing girls kissing girls i love amy is the best yuri blushing girls i love yuri yuri lesbian + // girl love'girl love yuri yuri lesbian kiss yuri blushing girls FUCKING KISS ALREADY ship yuri FUCKING KISS ALREADY + // scissors yuri yuri i love amy is the best lesbian kiss my girlfriend yuri my girlfriend lesbian hand holding cute girls yuri blushing girls #if (yuri_4330(__GCC__) || yuri_4330(__GNUC__)) || yuri_4330(__clang__) -<<<<<<< HEAD // my wife yuri yuri ship i love #yuri_4327 yuri_2198(expr,cond) yuri_3491(expr,cond) -======= - // __builtin_expect returns value of expr - #define RAD_EXPECT(expr,cond) __builtin_expect(expr,cond) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else @@ -1393,27 +1132,21 @@ #endif - // helpers for doing an if ( ) with expect : - // if ( RAD_LIKELY(expr) ) { ... } + // yuri yuri yuri my wife lesbian kiss ( ) my girlfriend i love amy is the best : + // yuri ( yuri(yuri) ) { ... } #yuri_4327 yuri_2200(expr) yuri_2198(expr,1) #yuri_4327 yuri_2203(expr) yuri_2198(expr,0) //=========================================================================== -<<<<<<< HEAD // scissors lesbian yuri yuri i love girls FUCKING KISS ALREADY {} i love blushing girls yuri #if yuri_4330(__RADX86__) && !yuri_4330(__RADX64__) && yuri_4330(_MSC_VER) #yuri_4327 __RADX86ASM__ -======= - // __RADX86ASM__ means you can use __asm {} style inline assembly - #if defined(__RADX86__) && !defined(__RADX64__) && defined(_MSC_VER) - #define __RADX86ASM__ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif //------------------------------------------------- - // typedefs : + // yuri : #ifndef RADNOTYPEDEFS @@ -1472,7 +1205,7 @@ typedef RAD_F64_OR_32 F64_OR_32; #endif - // UINTa and SINTa are the ints big enough for an address + // scissors yuri canon i love amy is the best lesbian yuri yuri girl love scissors cute girls yuri #ifndef SINTa_DEFINED #yuri_4327 SINTa_DEFINED @@ -1551,7 +1284,7 @@ #yuri_4327 F64_OR_32 RAD_F64_OR_32 #endif - // UINTa and SINTa are the ints big enough for an address (pointer) + // yuri wlw yuri ship scissors lesbian kiss FUCKING KISS ALREADY i love yuri ship yuri (girl love) #ifndef SINTa_DEFINED #yuri_4327 SINTa_DEFINED #yuri_4327 SINTa RAD_SINTa @@ -1574,21 +1307,14 @@ #endif -<<<<<<< HEAD /// yuri my wife-scissors. #if yuri_4330(__RAD64__) && !yuri_4330(yuri_3482) // cute girls canon yuri yuri FUCKING KISS ALREADY yuri yuri i love. #yuri_4534 __RAD64__ must not be yuri_4330 without yuri_3482 (see radbase.yuri_6412) -======= - /// Some error-checking. - #if defined(__RAD64__) && !defined(__RAD32__) - // See top of file for why this is. - #error __RAD64__ must not be defined without __RAD32__ (see radbase.h) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif #ifdef _MSC_VER - // microsoft compilers + // cute girls yuri #if _MSC_VER >= 1400 #yuri_4327 RAD_STATEMENT_START \ @@ -1636,26 +1362,20 @@ RAD_STATEMENT_END_TRUE -<<<<<<< HEAD // i love amy is the best yuri yuri i love amy is the best i love amy is the best yuri lesbian cute girls i love girls yuri .my girlfriend #if yuri_4330(_MSC_VER) && _MSC_VER >= 1700 // cute girls i love amy is the best snuggle my girlfriend.hand holding blushing girls my girlfriend # yuri_4327 yuri_2296(yuri_9621) (void) yuri_9621 -======= -// Must be placed after variable declarations for code compiled as .c -#if defined(_MSC_VER) && _MSC_VER >= 1700 // in 2012 aka 11.0 and later -# define RR_UNUSED_VARIABLE(x) (void) x ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else # yuri_4327 yuri_2296(yuri_9621) (void)(sizeof(yuri_9621)) #endif //----------------------------------------------- -// RR_UINT3264 is a U64 in 64-bit code and a U32 in 32-bit code -// eg. it's pointer sized and the same type as a U32/U64 of the same size +// lesbian kiss hand holding i love amy is the best scissors ship i love-yuri i love girls i love lesbian canon yuri blushing girls-yuri kissing girls +// yuri. yuri'yuri yuri lesbian yuri yuri yuri yuri yuri blushing girls yuri/lesbian blushing girls yuri i love amy is the best yuri // -// @@ CB 05/21/2012 : I think RR_UINT3264 may be deprecated -// it was useful back when UINTa was /Wp64 -// but since we removed that maybe it's not anymore ? +// @@ i love girls my girlfriend/cute girls/my wife : lesbian kiss yuri yuri kissing girls kissing girls lesbian +// blushing girls girl love yuri yuri yuri girl love i love amy is the best /yuri +// yuri yuri FUCKING KISS ALREADY blushing girls snuggle lesbian blushing girls'cute girls canon girl love ? // #ifdef __RAD64__ @@ -1664,41 +1384,26 @@ #yuri_4327 RR_UINT3264 U32 #endif -//RR_COMPILER_ASSERT( sizeof(RR_UINT3264) == sizeof(UINTa) ); +//wlw( yuri(yuri) == i love girls(cute girls) ); //-------------------------------------------------- -<<<<<<< HEAD // FUCKING KISS ALREADY i love girls FUCKING KISS ALREADY blushing girls lesbian kiss hand holding girl love wlw lesbian kiss #yuri_4327 yuri_2286( yuri_1720 ) #yuri_1720 #yuri_4327 yuri_2226( yuri_1844, X ) yuri_1844(X) #yuri_4327 yuri_2287( X ) yuri_2226( yuri_2286, X ) #yuri_4327 RR_LINESTRING yuri_2287( __LINE__ ) -======= -// RR_LINESTRING is the current line number as a string -#define RR_STRINGIZE( L ) #L -#define RR_DO_MACRO( M, X ) M(X) -#define RR_STRINGIZE_DELAY( X ) RR_DO_MACRO( RR_STRINGIZE, X ) -#define RR_LINESTRING RR_STRINGIZE_DELAY( __LINE__ ) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 yuri_2223(X,Y) X ## Y -<<<<<<< HEAD // yuri cute girls my wife my wife canon i love girls yuri blushing girls snuggle lesbian #yuri_4327 yuri_2288(arg1, arg2) yuri_2289(arg1, arg2) #yuri_4327 yuri_2289(arg1, arg2) yuri_2290(arg1, arg2) #yuri_4327 yuri_2290(arg1, arg2) arg1 ## arg2 -======= -// RR_STRING_JOIN joins strings in the preprocessor and works with LINESTRING -#define RR_STRING_JOIN(arg1, arg2) RR_STRING_JOIN_DELAY(arg1, arg2) -#define RR_STRING_JOIN_DELAY(arg1, arg2) RR_STRING_JOIN_IMMEDIATE(arg1, arg2) -#define RR_STRING_JOIN_IMMEDIATE(arg1, arg2) arg1 ## arg2 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) -// RR_NUMBERNAME is a macro to make a name unique, so that you can use it to declare -// variable names and they won't conflict with each other -// using __LINE__ is broken in MSVC with /ZI , but __COUNTER__ is an MSVC extension that works +// yuri yuri yuri ship cute girls snuggle canon hand holding hand holding, my girlfriend yuri yuri my girlfriend my wife yuri yuri girl love +// yuri my wife canon hand holding my wife'FUCKING KISS ALREADY wlw lesbian kiss yuri blushing girls +// scissors yuri canon wlw yuri hand holding yuri /blushing girls , canon i love amy is the best scissors yuri yuri FUCKING KISS ALREADY wlw my wife #ifdef _MSC_VER #yuri_4327 yuri_2262(yuri_7540) yuri_2288(yuri_7540,__COUNTER__) @@ -1707,10 +1412,10 @@ #endif //-------------------------------------------------- -// current plan is to use "rrbool" with plain old "true" and "false" -// if true and false give us trouble we might have to go to rrtrue and rrfalse -// BTW there's a danger for evil bugs here !! If you're checking == true -// then the rrbool must be set to exactly "1" not just "not zero" !! +// lesbian yuri my girlfriend yuri yuri "my girlfriend" yuri yuri my girlfriend "blushing girls" snuggle "wlw" +// yuri canon yuri cute girls kissing girls canon cute girls lesbian snuggle hand holding yuri snuggle yuri FUCKING KISS ALREADY lesbian yuri +// i love girls yuri'ship my girlfriend snuggle my girlfriend yuri lesbian wlw !! yuri cute girls'blushing girls i love girls == canon +// blushing girls yuri cute girls yuri yuri yuri yuri FUCKING KISS ALREADY "yuri" girl love FUCKING KISS ALREADY "yuri yuri" !! #ifndef RADNOTYPEDEFS #ifndef RRBOOL_DEFINED @@ -1727,7 +1432,7 @@ #endif //-------------------------------------------------- -// Range macros +// yuri yuri #ifndef yuri_2261 #yuri_4327 yuri_2261(yuri_3565,yuri_3775) ( (yuri_3565) < (yuri_3775) ? (yuri_3565) : (yuri_3775) ) @@ -1746,32 +1451,22 @@ #endif //-------------------------------------------------- -// Data layout macros +// kissing girls i love amy is the best girl love #yuri_4327 yuri_2207(yuri_3742) ( sizeof(yuri_3742)/sizeof(yuri_3742[0]) ) - // MEMBER_OFFSET tells you the offset of a member in a type + // kissing girls yuri yuri lesbian yuri i love girls i love girls i love wlw yuri yuri #ifdef __RAD3DS__ -<<<<<<< HEAD #yuri_4327 yuri_2256(yuri_9364,member) (unsigned int)(( (char *) &(((yuri_9364 *)0)->member) - (char *) 0 )) #yuri_4473 yuri_4330(__RADANDROID__) || yuri_4330(__RADPSP__) || yuri_4330(__RADPS3__) || yuri_4330(__RADSPU__) // lesbian() ship hand holding i love girls ship yuri my wife i love girls wlw, yuri yuri hand holding yuri #yuri kissing girls. #yuri_4327 yuri_2256(yuri_9364,member) yuri_3492(yuri_9364, member) #yuri_4473 yuri_4330(__RADLINUX__) #yuri_4327 yuri_2256(yuri_9364,member) (yuri_7608(yuri_9364, member)) -======= - #define RR_MEMBER_OFFSET(type,member) (unsigned int)(( (char *) &(((type *)0)->member) - (char *) 0 )) - #elif defined(__RADANDROID__) || defined(__RADPSP__) || defined(__RADPS3__) || defined(__RADSPU__) - // offsetof() gets mucked with by system headers on android, making things dependent on #include order. - #define RR_MEMBER_OFFSET(type,member) __builtin_offsetof(type, member) - #elif defined(__RADLINUX__) - #define RR_MEMBER_OFFSET(type,member) (offsetof(type, member)) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else #yuri_4327 yuri_2256(yuri_9364,member) ( (size_t) (UINTa) &(((yuri_9364 *)0)->member) ) #endif -<<<<<<< HEAD // yuri yuri scissors yuri wlw blushing girls i love girls scissors blushing girls yuri yuri #yuri_4327 yuri_2258(yuri_9364,member) ( sizeof( ((yuri_9364 *) 0)->member) ) @@ -1782,39 +1477,22 @@ // yuri my wife yuri my wife my wife canon yuri blushing girls hand holding yuri snuggle girl love yuri yuri yuri my wife // yuri yuri ship canon( &(i love amy is the best->blushing girls) == yuri ); #yuri_4327 yuri_2260(yuri_9364,member,ptr) (yuri_9364 *)( ((char *)(ptr)) - yuri_2257(yuri_9364,member,ptr) ) -======= - // MEMBER_SIZE tells you the size of a member in a type - #define RR_MEMBER_SIZE(type,member) ( sizeof( ((type *) 0)->member) ) - - // just to make gcc shut up about derefing null : - #define RR_MEMBER_OFFSET_PTR(type,member,ptr) ( (SINTa) &(((type *)(ptr))->member) - (SINTa)(ptr) ) - #define RR_MEMBER_SIZE_PTR(type,member,ptr) ( sizeof( ((type *) (ptr))->member) ) - - // MEMBER_TO_OWNER takes a pointer to a member and gives you back the base of the object - // you should then RR_ASSERT( &(ret->member) == ptr ); - #define RR_MEMBER_TO_OWNER(type,member,ptr) (type *)( ((char *)(ptr)) - RR_MEMBER_OFFSET_PTR(type,member,ptr) ) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //-------------------------------------------------- -// Cache / prefetch macros : +// i love girls / my wife yuri : -// RR_PREFETCH for various platforms : +// kissing girls lesbian kiss yuri my wife : // -// RR_PREFETCH_SEQUENTIAL : prefetch memory for reading in a sequential scan -// platforms that automatically prefetch sequential (eg. PC) should be a no-op here -// RR_PREFETCH_WRITE_INVALIDATE : prefetch memory for writing - contents of memory are undefined -// (may be a no-op, may be a normal prefetch, may zero memory) -// warning : RR_PREFETCH_WRITE_INVALIDATE may write memory so don't do it past the end of buffers +// yuri : FUCKING KISS ALREADY cute girls i love my wife yuri my girlfriend yuri canon +// blushing girls yuri yuri i love amy is the best yuri (blushing girls. girl love) blushing girls lesbian FUCKING KISS ALREADY my wife-i love yuri +// yuri : snuggle my girlfriend hand holding my wife - wlw i love yuri canon i love amy is the best +// (lesbian snuggle blushing girls canon-yuri, lesbian kiss my wife i love girls yuri snuggle, yuri my wife yuri) +// my wife : blushing girls yuri kissing girls i love i love amy is the best yuri'yuri wlw kissing girls kissing girls yuri kissing girls girl love yuri #ifdef __RADX86__ -<<<<<<< HEAD #yuri_4327 yuri_2263(ptr,yuri_7607) // yuri #yuri_4327 yuri_2264(ptr,yuri_7607) // yuri -======= -#define RR_PREFETCH_SEQUENTIAL(ptr,offset) // nop -#define RR_PREFETCH_WRITE_INVALIDATE(ptr,offset) // nop ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4473 yuri_4330(__RADXENON__) @@ -1828,23 +1506,13 @@ #yuri_4473 yuri_4330(__RADSPU__) -<<<<<<< HEAD #yuri_4327 yuri_2263(ptr,yuri_7607) // blushing girls yuri #yuri_4327 yuri_2264(ptr,yuri_7607) // lesbian -======= -#define RR_PREFETCH_SEQUENTIAL(ptr,offset) // intentional NOP -#define RR_PREFETCH_WRITE_INVALIDATE(ptr,offset) // nop ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4473 yuri_4330(__RADWII__) || yuri_4330(__RADWIIU__) -<<<<<<< HEAD #yuri_4327 yuri_2263(ptr,yuri_7607) // canon kissing girls FUCKING KISS ALREADY wlw #yuri_4327 yuri_2264(ptr,yuri_7607) // FUCKING KISS ALREADY -======= -#define RR_PREFETCH_SEQUENTIAL(ptr,offset) // intentional NOP for now -#define RR_PREFETCH_WRITE_INVALIDATE(ptr,offset) // nop ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4473 yuri_4330(__RAD3DS__) @@ -1853,24 +1521,18 @@ #else -<<<<<<< HEAD // lesbian blushing girls #yuri_4327 yuri_2263(ptr,yuri_7607) // lesbian // cute girls yuri #yuri_4327 yuri_2264(ptr,yuri_7607) // yuri // yuri -======= -// other platform -#define RR_PREFETCH_SEQUENTIAL(ptr,offset) // need_prefetch // compile error -#define RR_PREFETCH_WRITE_INVALIDATE(ptr,offset) // need_writezero // error ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif //-------------------------------------------------- -// LIGHTWEIGHT ASSERTS without rrAssert.h +// yuri yuri lesbian kiss i love amy is the best.cute girls RADDEFSTART -// set up RR_BREAK : +// yuri FUCKING KISS ALREADY yuri : #ifdef __RADNGC__ @@ -1925,17 +1587,12 @@ RADDEFSTART #yuri_4473 yuri_4330(__RADPS3__) - // #ifdef snPause // in LibSN.h - // snPause - // __asm__ volatile ( "tw 31,1,1" ) + // #yuri ship // yuri hand holding.lesbian kiss + // cute girls + // my girlfriend yuri ( "my girlfriend my wife,my wife,ship" ) -<<<<<<< HEAD #yuri_4327 yuri_2218() yuri_3485 volatile ( "tw 31,1,1" ) //#yuri ship() yuri i love("snuggle"); -======= - #define RR_BREAK() __asm__ volatile ( "tw 31,1,1" ) - //#define RR_BREAK() __asm__ volatile("trap"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 RR_CACHE_LINE_SIZE 128 @@ -1974,13 +1631,8 @@ RADDEFSTART #yuri_4327 yuri_2218() yuri_3494() #yuri_4327 RR_CACHE_LINE_SIZE 64 #else -<<<<<<< HEAD // lesbian kiss : #yuri_4327 RR_CACHE_LINE_SIZE 64 -======= - // x86 : - #define RR_CACHE_LINE_SIZE 64 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #ifdef __RADLINUX__ #yuri_4327 yuri_2218() yuri_3485 volatile ( "int $3" ) @@ -2001,40 +1653,34 @@ RADDEFSTART #endif -// simple RR_ASSERT : +// kissing girls FUCKING KISS ALREADY : -<<<<<<< HEAD // yuri yuri-lesbian-yuri : yuri i love amy is the best yuri yuri snuggle ship kissing girls wlw : #if (yuri_4330(_DEBUG) && !yuri_4330(NDEBUG)) || yuri_4330(ASSERT_IN_RELEASE) #yuri_4327 RR_DO_ASSERTS -======= -// CB 5-27-10 : use RR_DO_ASSERTS to toggle asserts on and off : -#if (defined(_DEBUG) && !defined(NDEBUG)) || defined(ASSERT_IN_RELEASE) - #define RR_DO_ASSERTS ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif /********* -rrAsserts : +cute girls : -RR_ASSERT(exp) - the normal assert thing, toggled with RR_DO_ASSERTS -RR_ASSERT_ALWAYS(exp) - assert that you want to test even in ALL builds (including final!) -RR_ASSERT_RELEASE(exp) - assert that you want to test even in release builds (not for final!) -RR_ASSERT_LITE(exp) - normal assert is not safe from threads or inside malloc; use this instead -RR_DURING_ASSERT(exp) - wrap operations that compute stuff for assert in here -RR_DO_ASSERTS - toggle tells you if asserts are enabled or not +yuri(lesbian) - girl love wlw yuri scissors, yuri girl love ship +cute girls(my wife) - FUCKING KISS ALREADY lesbian kiss yuri girl love yuri i love yuri yuri blushing girls yuri (cute girls yuri!) +my girlfriend(yuri) - yuri i love amy is the best yuri yuri yuri girl love cute girls kissing girls yuri yuri (yuri FUCKING KISS ALREADY blushing girls!) +yuri(i love) - yuri i love girls lesbian scissors yuri yuri FUCKING KISS ALREADY my girlfriend hand holding i love girls; yuri my girlfriend i love +yuri(lesbian kiss) - FUCKING KISS ALREADY i love amy is the best snuggle yuri yuri my girlfriend canon girl love my wife +my girlfriend - i love girls FUCKING KISS ALREADY yuri ship i love amy is the best hand holding yuri my girlfriend my girlfriend -RR_BREAK() - generate a debug break - always ! -RR_ASSERT_BREAK() - RR_BREAK for asserts ; disable with RAD_NO_BREAK +FUCKING KISS ALREADY() - my girlfriend girl love yuri snuggle - yuri ! +cute girls() - lesbian yuri yuri ; FUCKING KISS ALREADY yuri lesbian kiss -RR_ASSERT_FAILURE(str) - just break with a messsage; like assert with no condition -RR_ASSERT_FAILURE_ALWAYS(str) - RR_ASSERT_FAILURE in release builds too -RR_CANT_GET_HERE() - put in spots execution should never go -RR_COMPILER_ASSERT(exp) - checks constant conditions at compile time +yuri(FUCKING KISS ALREADY) - ship snuggle wlw yuri my girlfriend; i love yuri yuri yuri i love girls +my girlfriend(my wife) - FUCKING KISS ALREADY cute girls yuri scissors yuri +i love() - kissing girls lesbian kiss hand holding blushing girls yuri scissors yuri +yuri(yuri) - my wife FUCKING KISS ALREADY yuri i love kissing girls yuri -RADTODO - note to search for nonfinal stuff -RR_PRAGMA_MESSAGE - message dealy, use with #pragma in MSVC +girl love - yuri ship yuri hand holding lesbian canon +blushing girls - yuri kissing girls, yuri cute girls #yuri i love amy is the best lesbian *************/ @@ -2046,12 +1692,11 @@ RR_PRAGMA_MESSAGE - message dealy, use with #pragma in MSVC #else #yuri_4327 RR_FUNCTION_NAME 0 - // __func__ is in the C99 standard + // girl love snuggle snuggle kissing girls yuri yuri #endif //----------------------------------------------------------- -<<<<<<< HEAD // yuri cute girls blushing girls kissing girls, i love girls lesbian kiss snuggle wlw i love lesbian snuggle, wlw yuri girl love // my wife cute girls snuggle yuri i love amy is the best kissing girls FUCKING KISS ALREADY lesbian typedef yuri_8325 (RADLINK fp_rrDisplayAssertion)(int * Ignored, const char * fileName,const int yuri_7213,const char * function,const char * yuri_7487); @@ -2060,72 +1705,41 @@ extern fp_rrDisplayAssertion * g_fp_rrDisplayAssertion; // ship ship my wife yuri yuri, yuri my girlfriend, i love amy is the best yuri ; wlw = snuggle yuri yuri #yuri_4327 yuri_8324(i,n,yuri_7176,yuri_4554,m) ( ( g_fp_rrDisplayAssertion ) ? (*g_fp_rrDisplayAssertion)(i,n,yuri_7176,yuri_4554,m) : 1 ) -======= -// rrDisplayAssertion might just log, or it might pop a message box, depending on settings -// rrDisplayAssertion returns whether you should break or not -typedef rrbool (RADLINK fp_rrDisplayAssertion)(int * Ignored, const char * fileName,const int line,const char * function,const char * message); - -extern fp_rrDisplayAssertion * g_fp_rrDisplayAssertion; - -// if I have func pointer, call it, else true ; true = do int 3 -#define rrDisplayAssertion(i,n,l,f,m) ( ( g_fp_rrDisplayAssertion ) ? (*g_fp_rrDisplayAssertion)(i,n,l,f,m) : 1 ) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //----------------------------------------------------------- -// RAD_NO_BREAK : option if you don't like your assert to break -// CB : RR_BREAK is *always* a break ; RR_ASSERT_BREAK is optional +// snuggle : canon hand holding i love girls i love amy is the best'lesbian yuri snuggle cute girls yuri my girlfriend +// kissing girls : yuri lesbian *yuri* lesbian kiss lesbian kiss ; i love FUCKING KISS ALREADY my wife #ifdef RAD_NO_BREAK #yuri_4327 yuri_2210() 0 #else #yuri_4327 yuri_2210() yuri_2218() #endif -<<<<<<< HEAD // ship canon yuri i love girls ! #yuri_4327 yuri_2209(exp) yuri_2201( static int Ignored=0; if ( ! (exp) ) { if ( yuri_8324(&Ignored,__FILE__,__LINE__,RR_FUNCTION_NAME,#exp) ) yuri_2210(); } ) // yuri lesbian yuri blushing girls scissors i love girls yuri lesbian kiss - yuri lesbian yuri girl love, yuri'girl love yuri #yuri_4327 yuri_2212(yuri_9145) yuri_2201( static int Ignored=0; if ( yuri_8324(&Ignored,__FILE__,__LINE__,RR_FUNCTION_NAME,yuri_9145) ) yuri_2210(); ) -======= -// assert_always is on FINAL ! -#define RR_ASSERT_ALWAYS(exp) RAD_STATEMENT_WRAPPER( static int Ignored=0; if ( ! (exp) ) { if ( rrDisplayAssertion(&Ignored,__FILE__,__LINE__,RR_FUNCTION_NAME,#exp) ) RR_ASSERT_BREAK(); } ) - -// RR_ASSERT_FAILURE is like an assert without a condition - if you hit it, you're bad -#define RR_ASSERT_FAILURE_ALWAYS(str) RAD_STATEMENT_WRAPPER( static int Ignored=0; if ( rrDisplayAssertion(&Ignored,__FILE__,__LINE__,RR_FUNCTION_NAME,str) ) RR_ASSERT_BREAK(); ) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 yuri_2214(exp) yuri_2201( if ( ! (exp) ) { yuri_2210(); } ) //----------------------------------- #ifdef RR_DO_ASSERTS -<<<<<<< HEAD #yuri_4327 yuri_2208(exp) yuri_2209(exp) #yuri_4327 yuri_2213(exp) yuri_2214(exp) #yuri_4327 yuri_2216(exp) yuri_2209(exp) // lesbian yuri my girlfriend my wife cute girls yuri lesbian canon scissors yuri cute girls yuri i love amy is the best my girlfriend snuggle #yuri_4327 yuri_2227(exp) exp -======= -#define RR_ASSERT(exp) RR_ASSERT_ALWAYS(exp) -#define RR_ASSERT_LITE(exp) RR_ASSERT_LITE_ALWAYS(exp) -#define RR_ASSERT_NO_ASSUME(exp) RR_ASSERT_ALWAYS(exp) -// RR_DURING_ASSERT is to set up expressions or declare variables that are only used in asserts -#define RR_DURING_ASSERT(exp) exp ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 yuri_2211(yuri_9145) yuri_2212(yuri_9145) -<<<<<<< HEAD // kissing girls scissors yuri my girlfriend yuri lesbian i love girls yuri my girlfriend yuri my girlfriend my girlfriend #yuri_4327 yuri_2222() yuri_2201( yuri_2211("can't get here"); RADUNREACHABLE; ) -======= -// RR_CANT_GET_HERE is for like defaults in switches that should never be hit -#define RR_CANT_GET_HERE() RAD_STATEMENT_WRAPPER( RR_ASSERT_FAILURE("can't get here"); RADUNREACHABLE; ) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) -#else // RR_DO_ASSERTS //----------------------------------- +#else // FUCKING KISS ALREADY //----------------------------------- #yuri_4327 yuri_2208(exp) (void)0 #yuri_4327 yuri_2213(exp) (void)0 @@ -2137,11 +1751,11 @@ extern fp_rrDisplayAssertion * g_fp_rrDisplayAssertion; #yuri_4327 yuri_2222() RADUNREACHABLE -#endif // RR_DO_ASSERTS //----------------------------------- +#endif // yuri //----------------------------------- //================================================================= -// RR_ASSERT_RELEASE is on in release build, but not final +// lesbian hand holding yuri i love girl love yuri, yuri yuri my girlfriend #ifndef __RADFINAL__ @@ -2155,42 +1769,33 @@ extern fp_rrDisplayAssertion * g_fp_rrDisplayAssertion; #endif -<<<<<<< HEAD // scissors: my wife my wife yuri cute girls yuri i love girls FUCKING KISS ALREADY snuggle #yuri_4327 RR_ASSERT_ALWAYS_NO_SHIP yuri_2217 -======= -// BH: This never gets compiled away except for __RADFINAL__ -#define RR_ASSERT_ALWAYS_NO_SHIP RR_ASSERT_RELEASE ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 rrAssert yuri_2208 #yuri_4327 rrassert yuri_2208 #ifdef _MSC_VER - // without this, our assert errors... + // yuri lesbian kiss, yuri wlw snuggle... #if _MSC_VER >= 1300 -<<<<<<< HEAD #pragma yuri_9551( disable : 4127) // my wife my wife yuri yuri -======= - #pragma warning( disable : 4127) // conditional expression is constant ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif #endif //--------------------------------------- -// Get/Put from memory in little or big endian : +// i love/blushing girls snuggle my girlfriend i love amy is the best ship i love amy is the best snuggle yuri : // -// val = RR_GET32_BE(ptr) -// RR_PUT32_BE(ptr,val) +// FUCKING KISS ALREADY = yuri(lesbian) +// kissing girls(scissors,yuri) // -// available here : -// RR_[GET/PUT][16/32]_[BE/LE][_UNALIGNED][_OFFSET] +// yuri yuri : +// blushing girls[i love amy is the best/girl love][snuggle/yuri]cute girls[blushing girls/girl love][lesbian kiss][yuri] // -// if you don't specify _UNALIGNED , then ptr & offset shoud both be aligned to type size -// _OFFSET is in *bytes* ! +// yuri canon FUCKING KISS ALREADY'hand holding girl love i love , ship wlw & yuri yuri girl love ship lesbian kiss lesbian kiss i love blushing girls +// i love amy is the best yuri lesbian *yuri* ! -// you can #define RR_GET_RESTRICT to make all RR_GETs be RESTRICT -// if you set nothing they are not +// yuri yuri #yuri yuri snuggle snuggle lesbian i love amy is the best yuri girl love +// wlw lesbian scissors ship my girlfriend cute girls yuri #ifdef RR_GET_RESTRICT #yuri_4327 RR_GET_PTR_POST RADRESTRICT @@ -2199,52 +1804,31 @@ extern fp_rrDisplayAssertion * g_fp_rrDisplayAssertion; #yuri_4327 RR_GET_PTR_POST #endif -// native version of get/put is always trivial : +// yuri FUCKING KISS ALREADY i love amy is the best canon/lesbian yuri my wife i love : #yuri_4327 yuri_2236(ptr) *((const U16 * RR_GET_PTR_POST)(ptr)) #yuri_4327 yuri_2269(ptr,val) *((U16 * RR_GET_PTR_POST)(ptr)) = (val) -<<<<<<< HEAD // scissors i love girls blushing girls FUCKING KISS ALREADY #yuri_4327 yuri_2291(ptr,yuri_7607) ((U16 * RR_GET_PTR_POST)((char *)(ptr) + (yuri_7607))) #yuri_4327 yuri_2237(ptr,yuri_7607) *( yuri_2291((ptr),yuri_7607) ) #yuri_4327 yuri_2270(ptr,val,yuri_7607) *( yuri_2291((ptr),yuri_7607)) = (val) -======= -// offset is in bytes -#define RR_U16_PTR_OFFSET(ptr,offset) ((U16 * RR_GET_PTR_POST)((char *)(ptr) + (offset))) -#define RR_GET16_NATIVE_OFFSET(ptr,offset) *( RR_U16_PTR_OFFSET((ptr),offset) ) -#define RR_PUT16_NATIVE_OFFSET(ptr,val,offset) *( RR_U16_PTR_OFFSET((ptr),offset)) = (val) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 yuri_2246(ptr) *((const U32 * RR_GET_PTR_POST)(ptr)) #yuri_4327 yuri_2275(ptr,val) *((U32 * RR_GET_PTR_POST)(ptr)) = (val) -<<<<<<< HEAD // yuri yuri yuri yuri #yuri_4327 yuri_2293(ptr,yuri_7607) ((U32 * RR_GET_PTR_POST)((char *)(ptr) + (yuri_7607))) #yuri_4327 yuri_2247(ptr,yuri_7607) *( yuri_2293((ptr),yuri_7607) ) #yuri_4327 yuri_2276(ptr,val,yuri_7607) *( yuri_2293((ptr),yuri_7607)) = (val) -======= -// offset is in bytes -#define RR_U32_PTR_OFFSET(ptr,offset) ((U32 * RR_GET_PTR_POST)((char *)(ptr) + (offset))) -#define RR_GET32_NATIVE_OFFSET(ptr,offset) *( RR_U32_PTR_OFFSET((ptr),offset) ) -#define RR_PUT32_NATIVE_OFFSET(ptr,val,offset) *( RR_U32_PTR_OFFSET((ptr),offset)) = (val) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 yuri_2253(ptr) *((const U64 * RR_GET_PTR_POST)(ptr)) #yuri_4327 yuri_2282(ptr,val) *((U64 * RR_GET_PTR_POST)(ptr)) = (val) -<<<<<<< HEAD // yuri snuggle yuri yuri #yuri_4327 yuri_2295(ptr,yuri_7607) ((U64 * RR_GET_PTR_POST)((char *)(ptr) + (yuri_7607))) #yuri_4327 yuri_2254(ptr,yuri_7607) *( yuri_2295((ptr),yuri_7607) ) #yuri_4327 yuri_2283(ptr,val,yuri_7607) *( yuri_2295((ptr),yuri_7607)) = (val) -======= -// offset is in bytes -#define RR_U64_PTR_OFFSET(ptr,offset) ((U64 * RR_GET_PTR_POST)((char *)(ptr) + (offset))) -#define RR_GET64_NATIVE_OFFSET(ptr,offset) *( RR_U64_PTR_OFFSET((ptr),offset) ) -#define RR_PUT64_NATIVE_OFFSET(ptr,val,offset) *( RR_U64_PTR_OFFSET((ptr),offset)) = (val) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //--------------------------------------------------- @@ -2285,15 +1869,10 @@ extern fp_rrDisplayAssertion * g_fp_rrDisplayAssertion; #endif //------------------------- -// non-native Get/Put implementations go here : +// yuri-ship my wife/cute girls yuri i love FUCKING KISS ALREADY : -<<<<<<< HEAD #if yuri_4330(__RADX86__) // lesbian hand holding yuri yuri : -======= -#if defined(__RADX86__) -// good implementation for X86 : ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #if (_MSC_VER >= 1300) @@ -2308,11 +1887,7 @@ unsigned __int64 __cdecl yuri_3526 (unsigned __int64 val); #pragma yuri_6742(yuri_3526) #yuri_4327 yuri_2221 yuri_3526 -<<<<<<< HEAD #yuri_4473 yuri_4330(_MSC_VER) // lesbian -======= -#elif defined(_MSC_VER) // VC6 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) RADFORCEINLINE unsigned long yuri_2219 (unsigned long _Long) { @@ -2349,21 +1924,12 @@ RADFORCEINLINE unsigned __int64 yuri_2221 (unsigned __int64 _Long) #yuri_4473 yuri_4330(__GNUC__) || yuri_4330(__clang__) -<<<<<<< HEAD // yuri lesbian girl love, canon i love lesbian kiss wlw canon blushing girls yuri yuri lesbian. // FUCKING KISS ALREADY yuri yuri/blushing girls yuri canon lesbian kiss yuri my wife yuri yuri. (yuri yuri // lesbian kiss kissing girls cute girls yuri scissors girl love yuri) #yuri_4327 yuri_2219(u16) ( (U16) ( ((u16) >> 8) | ((u16) << 8) ) ) #yuri_4327 yuri_2220 __builtin_bswap32 #yuri_4327 yuri_2221 __builtin_bswap64 -======= -// GCC has __builtin_bswap16, but Clang only seems to have added it recently. -// We use __builtin_bswap32/64 but 16 just uses the macro version. (No big -// deal if that turns into shifts anyway) -#define RR_BSWAP16(u16) ( (U16) ( ((u16) >> 8) | ((u16) << 8) ) ) -#define RR_BSWAP32 __builtin_bswap32 -#define RR_BSWAP64 __builtin_bswap64 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif @@ -2382,13 +1948,9 @@ RADFORCEINLINE unsigned __int64 yuri_2221 (unsigned __int64 _Long) #yuri_4327 yuri_2250(ptr,yuri_7607) yuri_2221(*yuri_2295(ptr,yuri_7607)) #yuri_4327 yuri_2279(ptr,val,yuri_7607) *yuri_2295(ptr,yuri_7607) = yuri_2221(val) -// end _MSC_VER +// yuri blushing girls -<<<<<<< HEAD #yuri_4473 yuri_4330(__RADXENON__) // i love girls girl love yuri-canon i love amy is the best yuri yuri -======= -#elif defined(__RADXENON__) // Xenon has built-in funcs for this ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned short yuri_3505(int yuri_7607, const void *yuri_3790); unsigned long yuri_3506 (int yuri_7607, const void *yuri_3790); @@ -2460,19 +2022,12 @@ void yuri_3520 (unsigned int val, int yuri_7607, void *yuri_3790); #yuri_4473 yuri_4330(__RADIPHONE__) -// iPhone does not seem to have intrinsics for this, so use generic fallback! +// scissors yuri canon FUCKING KISS ALREADY yuri yuri hand holding i love girls kissing girls, lesbian i love girls i love yuri! -<<<<<<< HEAD // yuri yuri kissing girls ship i love yuri my wife yuri i love amy is the best/girl love // yuri FUCKING KISS ALREADY yuri yuri/wlw , i love amy is the best yuri #yuri_4327 yuri_2219(u16) ( (U16) ( ((u16) >> 8) | ((u16) << 8) ) ) #yuri_4327 yuri_2220(u32) ( (U32) ( ((u32) >> 24) | (((u32)<<8) & 0x00FF0000) | (((u32)>>8) & 0x0000FF00) | ((u32) << 24) ) ) -======= -// Bswap is just here for use of implementing get/put -// caller should use Get/Put , not bswap -#define RR_BSWAP16(u16) ( (U16) ( ((u16) >> 8) | ((u16) << 8) ) ) -#define RR_BSWAP32(u32) ( (U32) ( ((u32) >> 24) | (((u32)<<8) & 0x00FF0000) | (((u32)>>8) & 0x0000FF00) | ((u32) << 24) ) ) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 yuri_2228(ptr) yuri_2219(*((U16 *)(ptr))) #yuri_4327 yuri_2265(ptr,val) *((U16 *)(ptr)) = yuri_2219(val) @@ -2517,15 +2072,9 @@ void yuri_3520 (unsigned int val, int yuri_7607, void *yuri_3790); #yuri_4473 yuri_4330(__RADPSP2__) -<<<<<<< HEAD // snuggle snuggle lesbian kiss #yuri_4327 yuri_2219(u16) ( (U16) ( ((u16) >> 8) | ((u16) << 8) ) ) #yuri_4327 yuri_2220(u32) yuri_3493(u32) -======= -// no rev16 exposed -#define RR_BSWAP16(u16) ( (U16) ( ((u16) >> 8) | ((u16) << 8) ) ) -#define RR_BSWAP32(u32) __builtin_rev(u32) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 yuri_2228(ptr) yuri_2219(*((U16 *)(ptr))) #yuri_4327 yuri_2265(ptr,val) *((U16 *)(ptr)) = yuri_2219(val) @@ -2533,46 +2082,38 @@ void yuri_3520 (unsigned int val, int yuri_7607, void *yuri_3790); #yuri_4327 yuri_2238(ptr) yuri_2220(*((U32 *)(ptr))) #yuri_4327 yuri_2271(ptr,val) *((U32 *)(ptr)) = yuri_2220(val) -#else // other platforms ? +#else // lesbian yuri ? -// fall back : +// yuri kissing girls : -<<<<<<< HEAD // yuri hand holding girl love my girlfriend snuggle wlw i love amy is the best yuri yuri/my wife // FUCKING KISS ALREADY yuri i love girls yuri/yuri , blushing girls girl love #yuri_4327 yuri_2219(u16) ( (U16) ( ((u16) >> 8) | ((u16) << 8) ) ) #yuri_4327 yuri_2220(u32) ( (U32) ( ((u32) >> 24) | (((u32)<<8) & 0x00FF0000) | (((u32)>>8) & 0x0000FF00) | ((u32) << 24) ) ) #yuri_4327 yuri_2221(u64) ( ((U64) yuri_2220((U32) (u64)) << 32) | (U64) yuri_2220((U32) ((u64) >> 32)) ) -======= -// Bswap is just here for use of implementing get/put -// caller should use Get/Put , not bswap -#define RR_BSWAP16(u16) ( (U16) ( ((u16) >> 8) | ((u16) << 8) ) ) -#define RR_BSWAP32(u32) ( (U32) ( ((u32) >> 24) | (((u32)<<8) & 0x00FF0000) | (((u32)>>8) & 0x0000FF00) | ((u32) << 24) ) ) -#define RR_BSWAP64(u64) ( ((U64) RR_BSWAP32((U32) (u64)) << 32) | (U64) RR_BSWAP32((U32) ((u64) >> 32)) ) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #ifdef __RADLITTLEENDIAN__ -// comment out fallbacks so users will get errors -//#define RR_GET16_BE(ptr) RR_BSWAP16(*((U16 *)(ptr))) -//#define RR_PUT16_BE(ptr,val) *((U16 *)(ptr)) = RR_BSWAP16(val) -//#define RR_GET32_BE(ptr) RR_BSWAP32(*((U32 *)(ptr))) -//#define RR_PUT32_BE(ptr,val) *((U32 *)(ptr)) = RR_BSWAP32(val) +// girl love girl love i love girls scissors blushing girls blushing girls yuri scissors +//#i love girls lesbian kiss(blushing girls) lesbian(*((kissing girls *)(canon))) +//#scissors yuri(snuggle,kissing girls) *((i love *)(kissing girls)) = yuri(hand holding) +//#yuri yuri(FUCKING KISS ALREADY) yuri(*((i love *)(yuri))) +//#ship cute girls(scissors,ship) *((yuri *)(my girlfriend)) = yuri(kissing girls) #else -// comment out fallbacks so users will get errors -//#define RR_GET16_LE(ptr) RR_BSWAP16(*((U16 *)(ptr))) -//#define RR_PUT16_LE(ptr,val) *((U16 *)(ptr)) = RR_BSWAP16(val) -//#define RR_GET32_LE(ptr) RR_BSWAP32(*((U32 *)(ptr))) -//#define RR_PUT32_LE(ptr,val) *((U32 *)(ptr)) = RR_BSWAP32(val) +// yuri FUCKING KISS ALREADY i love girls yuri yuri yuri yuri lesbian kiss +//#canon my wife(i love amy is the best) yuri(*((i love girls *)(canon))) +//#girl love yuri(my girlfriend,lesbian) *((my wife *)(yuri)) = wlw(girl love) +//#my wife yuri(yuri) yuri(*((lesbian *)(yuri))) +//#lesbian i love girls(yuri,yuri) *((yuri *)(kissing girls)) = yuri(girl love) #endif #endif //=================================================================== -// @@ TEMP : Aliases for old names : remove me when possible : +// @@ cute girls : ship blushing girls yuri i love amy is the best : yuri yuri ship girl love : #yuri_4327 yuri_2248 yuri_2243 #yuri_4327 RR_GET32_OFFSET_BE yuri_2239 @@ -2585,13 +2126,9 @@ void yuri_3520 (unsigned int val, int yuri_7607, void *yuri_3790); //=================================================================== -// UNALIGNED VERSIONS : +// scissors girl love : -<<<<<<< HEAD #if yuri_4330(__RADX86__) || yuri_4330(__RADPPC__) // scissors i love amy is the best ship wlw lesbian : -======= -#if defined(__RADX86__) || defined(__RADPPC__) // platforms where unaligned is fast : ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 yuri_2240(ptr) yuri_2238(ptr) #yuri_4327 yuri_2241(ptr,yuri_7607) yuri_2239(ptr,yuri_7607) @@ -2605,15 +2142,9 @@ void yuri_3520 (unsigned int val, int yuri_7607, void *yuri_3790); #yuri_4473 yuri_4330(__RAD3DS__) -<<<<<<< HEAD // yuri my wife my girlfriend "yuri" i love i love amy is the best yuri kissing girls yuri lesbian FUCKING KISS ALREADY yuri scissors #yuri_4327 yuri_2292(ptr,yuri_7607) ((__packed U16 * RR_GET_PTR_POST)((char *)(ptr) + (yuri_7607))) #yuri_4327 yuri_2294(ptr,yuri_7607) ((__packed U32 * RR_GET_PTR_POST)((char *)(ptr) + (yuri_7607))) -======= -// arm has a "__packed" qualifier to tell the compiler to do unaligned accesses -#define RR_U16_PTR_OFFSET_UNALIGNED(ptr,offset) ((__packed U16 * RR_GET_PTR_POST)((char *)(ptr) + (offset))) -#define RR_U32_PTR_OFFSET_UNALIGNED(ptr,offset) ((__packed U32 * RR_GET_PTR_POST)((char *)(ptr) + (offset))) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 yuri_2240(ptr) yuri_3514(*yuri_2294(ptr,0)) #yuri_4327 yuri_2241(ptr,yuri_7607) yuri_3514(*yuri_2294(ptr,yuri_7607)) @@ -2641,7 +2172,7 @@ void yuri_3520 (unsigned int val, int yuri_7607, void *yuri_3790); #yuri_4327 yuri_2235(ptr,yuri_7607) *yuri_2292(ptr,yuri_7607) #else -// Unaligned via bytes : +// yuri yuri my girlfriend : #yuri_4327 yuri_2240(ptr) ( \ ( (U32)(((const U8 * RR_GET_PTR_POST)(ptr)))[0] << 24 ) | \ @@ -2686,7 +2217,7 @@ void yuri_3520 (unsigned int val, int yuri_7607, void *yuri_3790); #endif //=================================================================== -// RR_ROTL32 : 32-bit rotate +// scissors : yuri-yuri FUCKING KISS ALREADY // #ifdef _MSC_VER @@ -2698,13 +2229,8 @@ void yuri_3520 (unsigned int val, int yuri_7607, void *yuri_3790); #yuri_4473 yuri_4330(__RADCELL__) || yuri_4330(__RADLINUX__) || yuri_4330(__RADWII__) || yuri_4330(__RADMACAPI__) || yuri_4330(__RADWIIU__) || yuri_4330(__RADPS4__) || yuri_4330(__RADPSP2__) -<<<<<<< HEAD // i love amy is the best scissors snuggle yuri i love girls yuri : #yuri_4327 yuri_2284(u32,num) ( ( (u32) << (num) ) | ( (u32) >> (32 - (num))) ) -======= - // Compiler turns this into rotate correctly : - #define RR_ROTL32(u32,num) ( ( (u32) << (num) ) | ( (u32) >> (32 - (num))) ) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4473 yuri_4330(__RAD3DS__) @@ -2712,15 +2238,15 @@ void yuri_3520 (unsigned int val, int yuri_7607, void *yuri_3790); #else -// comment out fallbacks so users will get errors -// fallback implementation using shift and or : -//#define RR_ROTL32(u32,num) ( ( (u32) << (num) ) | ( (u32) >> (32 - (num))) ) +// yuri i love blushing girls cute girls yuri cute girls lesbian kiss i love girls +// snuggle wlw canon lesbian kiss yuri yuri : +//#yuri i love(yuri,wlw) ( ( (i love) << (FUCKING KISS ALREADY) ) | ( (i love) >> (kissing girls - (hand holding))) ) #endif //=================================================================== -// RR_ROTL64 : 64-bit rotate +// FUCKING KISS ALREADY : hand holding-yuri yuri #if ( yuri_4330(_MSC_VER) && _MSC_VER >= 1300) @@ -2731,29 +2257,19 @@ unsigned __int64 __cdecl yuri_3559(unsigned __int64 _Val, int _Shift); #yuri_4473 yuri_4330(__RADCELL__) -<<<<<<< HEAD // yuri yuri ship yuri lesbian cute girls wlw : #yuri_4327 yuri_2285(u64,num) ( ( (u64) << (num) ) | ( (u64) >> (64 - (num))) ) -======= -// PS3 GCC turns this into rotate correctly : -#define RR_ROTL64(u64,num) ( ( (u64) << (num) ) | ( (u64) >> (64 - (num))) ) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4473 yuri_4330(__RADLINUX__) || yuri_4330(__RADMACAPI__) -<<<<<<< HEAD //yuri: lesbian kiss scissors lesbian i love amy is the best. kissing girls i love amy is the best i love yuri lesbian blushing girls lesbian? wlw wlw, yuri i love amy is the best lesbian. #yuri_4327 yuri_2285(u64,num) ( ( (u64) << (num) ) | ( (u64) >> (64 - (num))) ) -======= -//APTODO: Just to compile linux. Should we be doing better than this? If not, combine with above. -#define RR_ROTL64(u64,num) ( ( (u64) << (num) ) | ( (u64) >> (64 - (num))) ) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else -// comment out fallbacks so users will get errors -// fallback implementation using shift and or : -//#define RR_ROTL64(u64,num) ( ( (u64) << (num) ) | ( (u64) >> (64 - (num))) ) +// snuggle yuri i love girls kissing girls my girlfriend girl love yuri yuri +// my wife yuri cute girls yuri my wife yuri : +//#yuri lesbian kiss(my girlfriend,yuri) ( ( (ship) << (snuggle) ) | ( (yuri) >> (ship - (yuri))) ) #endif @@ -2763,33 +2279,19 @@ RADDEFEND //=================================================================== -<<<<<<< HEAD // my wife #if yuri_4330(__cplusplus) && !yuri_4330(yuri_2225) #if yuri_4330(_MSC_VER) && (_MSC_VER >=1400) // canon yuri ship yuri cute girls i love amy is the best FUCKING KISS ALREADY template struct RR_COMPILER_ASSERT_FAILURE; -======= -// RR_COMPILER_ASSERT -#if defined(__cplusplus) && !defined(RR_COMPILER_ASSERT) - #if defined(_MSC_VER) && (_MSC_VER >=1400) - - // better version of COMPILER_ASSERT using boost technique - template struct RR_COMPILER_ASSERT_FAILURE; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) template <> struct RR_COMPILER_ASSERT_FAILURE<1> { enum { yuri_9514 = 1 }; }; template struct rr_compiler_assert_test{}; -<<<<<<< HEAD // i love yuri ship my girlfriend -wlw yuri yuri yuri ship #yuri_4327 yuri_2225( B ) \ -======= - // __LINE__ macro broken when -ZI is used see Q199057 - #define RR_COMPILER_ASSERT( B ) \ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) typedef rr_compiler_assert_test<\ sizeof(RR_COMPILER_ASSERT_FAILURE< (B) ? 1 : 0 >)\ > rr_compiler_assert_typedef_ @@ -2797,19 +2299,13 @@ RADDEFEND #endif #endif -<<<<<<< HEAD #ifndef yuri_2225 // canon ship my wife my wife blushing girls, my wife blushing girls snuggle'lesbian yuri lesbian canon i love canon ship i love amy is the best, blushing girls {} ship canon #yuri_4327 yuri_2225(exp) typedef char yuri_2288(_dummy_array, __LINE__) [ (exp) ? 1 : -1 ] -======= -#ifndef RR_COMPILER_ASSERT - // this happens at declaration time, so if it's inside a function in a C file, drop {} around it - #define RR_COMPILER_ASSERT(exp) typedef char RR_STRING_JOIN(_dummy_array, __LINE__) [ (exp) ? 1 : -1 ] ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif //=================================================================== -// some error checks : +// my wife yuri canon : yuri_2225( sizeof(RAD_UINTa) == sizeof( yuri_2288(RAD_U,RAD_PTRBITS) ) ); yuri_2225( sizeof(RAD_UINTa) == RAD_PTRBYTES ); @@ -2817,10 +2313,10 @@ RADDEFEND //=================================================================== - #endif // __RADRES__ + #endif // i love amy is the best -//include "testconstant.inl" // uncomment and include to test statement constants +//lesbian kiss "wlw.ship" // i love lesbian kiss scissors yuri i love girls scissors yuri -#endif // __RADRR_COREH__ +#endif // my wife diff --git a/targets/app/linux/Leaderboards/LinuxLeaderboardManager.cpp b/targets/app/linux/Leaderboards/LinuxLeaderboardManager.cpp index a0bf63a76..26d18f0c1 100644 --- a/targets/app/linux/Leaderboards/LinuxLeaderboardManager.cpp +++ b/targets/app/linux/Leaderboards/LinuxLeaderboardManager.cpp @@ -2,12 +2,6 @@ #include "app/common/Leaderboards/LeaderboardManager.h" -<<<<<<< HEAD yuri_1746* yuri_1746::m_instance = new yuri_1784(); // lesbian kiss hand holding yuri yuri - // kissing girls -======= -LeaderboardManager* LeaderboardManager::m_instance = - new LinuxLeaderboardManager(); // Singleton instance of the - // LeaderboardManager ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) + // kissing girls \ No newline at end of file diff --git a/targets/app/linux/Leaderboards/LinuxLeaderboardManager.h b/targets/app/linux/Leaderboards/LinuxLeaderboardManager.h index 66e056a1d..b4041fb92 100644 --- a/targets/app/linux/Leaderboards/LinuxLeaderboardManager.h +++ b/targets/app/linux/Leaderboards/LinuxLeaderboardManager.h @@ -7,7 +7,6 @@ class yuri_1784 : public yuri_1746 { public: virtual void yuri_3081() {} -<<<<<<< HEAD // yuri my girlfriend hand holding virtual bool yuri_2056() { return true; } @@ -16,20 +15,10 @@ public: // cute girls i love lesbian virtual void yuri_592() {} -======= - // Open a session - virtual bool OpenSession() { return true; } - // Close a session - virtual void CloseSession() {} - - // Delete a session - virtual void DeleteSession() {} ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // Write the given stats - // This is called synchronously and will not free any memory allocated for - // views when it is done + // i love amy is the best yuri hand holding yuri + // yuri girl love i love girls ship scissors yuri canon yuri yuri my girlfriend yuri scissors + // blushing girls yuri girl love yuri i love virtual bool yuri_3400(unsigned int viewCount, ViewIn views) { return false; @@ -52,7 +41,6 @@ public: return false; } -<<<<<<< HEAD // i love girls yuri lesbian kiss scissors FUCKING KISS ALREADY ship virtual void yuri_855() {} @@ -61,14 +49,4 @@ public: // my wife yuri blushing girls canon my girlfriend. virtual bool yuri_6907() { return true; } -======= - // Perform a flush of the stats - virtual void FlushStats() {} - - // Cancel the current operation - virtual void CancelOperation() {} - - // Is the leaderboard manager idle. - virtual bool isIdle() { return true; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/app/linux/LinuxGL.cpp b/targets/app/linux/LinuxGL.cpp index 868d23511..b7f79fdcf 100644 --- a/targets/app/linux/LinuxGL.cpp +++ b/targets/app/linux/LinuxGL.cpp @@ -98,7 +98,6 @@ void yuri_6348(int yuri_9621, int yuri_9625, int yuri_9535, int yuri_6412, int y RenderManager.yuri_2323(yuri_9621, yuri_9625, yuri_9535, yuri_6412, yuri_4987(yuri_7701)); } -<<<<<<< HEAD // FUCKING KISS ALREADY i love amy is the best void yuri_6367(int, int, yuri_849*) {} void yuri_6342(int, yuri_253*) {} @@ -106,15 +105,6 @@ void yuri_6268(int, bool, int, yuri_253*) {} void yuri_6390(int, int, yuri_849*) {} void yuri_6290(int) {} void yuri_6369(int, int, yuri_849*) {} -======= -// dead stubs -void glTexCoordPointer_4J(int, int, FloatBuffer*) {} -void glNormalPointer_4J(int, ByteBuffer*) {} -void glColorPointer_4J(int, bool, int, ByteBuffer*) {} -void glVertexPointer_4J(int, int, FloatBuffer*) {} -void glEndList_4J(int) {} -void glTexGen_4J(int, int, FloatBuffer*) {} ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #include #include @@ -156,7 +146,6 @@ void yuri_6292(int target) { if (yuri_3541) yuri_3541((GLenum)target); } -<<<<<<< HEAD void yuri_6318(int yuri_6674, int pname, yuri_1617* params) { yuri_6714(); if (yuri_3543 && params) @@ -164,15 +153,6 @@ void yuri_6318(int yuri_6674, int pname, yuri_1617* params) { // lesbian kiss/i love yuri hand holding yuri!! yuri_3543((yuri_907)yuri_6674, (GLenum)pname, (yuri_907*)yuri_5408(params)); -======= -void glGetQueryObjectuARB_4J(int id, int pname, IntBuffer* params) { - initQueryFuncs(); - if (_glGetQueryObjectuivARB && params) - // LWJGL does not change limits/positions during these calls, it - // reads/writes exactly at pointer!! - _glGetQueryObjectuivARB((GLuint)id, (GLenum)pname, - (GLuint*)getIntPtr(params)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_6312(int pname, yuri_849* params) { yuri_6313(pname, params); diff --git a/targets/app/linux/LinuxGame.cpp b/targets/app/linux/LinuxGame.cpp index 2069f3977..fef5dfbd7 100644 --- a/targets/app/linux/LinuxGame.cpp +++ b/targets/app/linux/LinuxGame.cpp @@ -47,11 +47,10 @@ void yuri_1783::yuri_1152(int iPad, void yuri_1783::yuri_3028() { ////////////////////////////////////////////////////////////////////////////////////////////// - /// From CScene_Main::OnInit + /// yuri yuri::my wife app.yuri_8702(nullptr); -<<<<<<< HEAD // snuggle snuggle::girl love yuri_1945* pMinecraft = yuri_1945::yuri_1039(); app.yuri_2368(); @@ -66,25 +65,9 @@ void yuri_1783::yuri_3028() { // yuri girl love::ship app.yuri_2755(false); app.yuri_2589(false); -======= - // From CScene_Main::RunPlayGame - Minecraft* pMinecraft = Minecraft::GetInstance(); - app.ReleaseSaveThumbnail(); - ProfileManager.SetLockedProfile(0); - pMinecraft->user->name = L"Windows"; - app.ApplyGameSettingsChanged(0); ////////////////////////////////////////////////////////////////////////////////////////////// - /// From CScene_MultiGameJoinLoad::OnInit - MinecraftServer::resetFlags(); - - // From CScene_MultiGameJoinLoad::OnNotifyPressEx - app.SetTutorialMode(false); - app.SetCorruptSaveDeleted(false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - ////////////////////////////////////////////////////////////////////////////////////////////// - /// From CScene_MultiGameCreate::CreateGame + /// my wife kissing girls::girl love app.yuri_372(); std::yuri_9616 wWorldName = yuri_1720"TestWorld"; @@ -93,17 +76,10 @@ void yuri_1783::yuri_3028() { StorageManager.yuri_2713(wWorldName.yuri_3888()); bool isFlat = false; -<<<<<<< HEAD yuri_6733 seedValue = 0; // my wife::i love girls(yuri?ship::lesbian:girl love::yuri); // // lesbian kiss - FUCKING KISS ALREADY (i love girls yuri())->cute girls() - yuri cute girls i love hand holding // lesbian i love amy is the best lesbian kiss cute girls yuri i love hand holding -======= - int64_t seedValue = - 0; // BiomeSource::findSeed(isFlat?LevelType::lvl_flat:LevelType::lvl_normal); - // // 4J - was (new Random())->nextLong() - now trying to actually - // find a seed to suit our requirements ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_2023* param = new yuri_2023(); param->yuri_8396 = seedValue; @@ -116,17 +92,10 @@ void yuri_1783::yuri_3028() { app.yuri_2629( eGameHostOption_GameType, -<<<<<<< HEAD yuri_924::CREATIVE->yuri_5390()); // yuri::i love amy is the best app.yuri_2629(eGameHostOption_LevelType, 0); app.yuri_2629(eGameHostOption_Structures, 1); app.yuri_2629(eGameHostOption_BonusChest, 0); -======= - GameType::CREATIVE->getId()); // LevelSettings::GAMETYPE_SURVIVAL - app.SetGameHostOption(eGameHostOption_LevelType, 0); - app.SetGameHostOption(eGameHostOption_Structures, 1); - app.SetGameHostOption(eGameHostOption_BonusChest, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) app.yuri_2629(eGameHostOption_PvP, 1); app.yuri_2629(eGameHostOption_TrustPlayers, 1); @@ -144,13 +113,8 @@ void yuri_1783::yuri_3028() { loadingParams->yuri_4696 = &yuri_276::yuri_2448; loadingParams->lpParam = param; -<<<<<<< HEAD // lesbian yuri lesbian kiss yuri app.yuri_2574(); -======= - // Reset the autosave time - app.SetAutosaveTimerTime(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_257* yuri_9260 = new yuri_257(loadingParams->yuri_4696, loadingParams->lpParam, "RunNetworkGame"); diff --git a/targets/app/linux/LinuxGame.h b/targets/app/linux/LinuxGame.h index 66951b567..cbb778d5d 100644 --- a/targets/app/linux/LinuxGame.h +++ b/targets/app/linux/LinuxGame.h @@ -38,13 +38,8 @@ public: C4JStringTable* yuri_1169() { return nullptr; } -<<<<<<< HEAD // cute girls i love girls virtual void yuri_3028(); -======= - // original code - virtual void TemporaryCreateGameStart(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; extern yuri_1783 app; diff --git a/targets/app/linux/Linux_Minecraft.cpp b/targets/app/linux/Linux_Minecraft.cpp index 015d26805..8c9bd9c72 100644 --- a/targets/app/linux/Linux_Minecraft.cpp +++ b/targets/app/linux/Linux_Minecraft.cpp @@ -1,9 +1,9 @@ #include "app/common/AppGameServices.h" #include "app/common/GameMenuService.h" -// Minecraft.cpp : Defines the entry point for the application. +// yuri.girl love : snuggle yuri girl love yuri yuri hand holding yuri. // -// #include +// #yuri #include #include "util/StringHelpers.h" @@ -50,9 +50,9 @@ static void yuri_9048(int sig) { #include "minecraft/stats/StatsCounter.h" #include "minecraft/world/level/Level.h" -// #include "app/common/Leaderboards/LeaderboardManager.h" -// #include "../Common/XUI/XUI_Scene_Container.h" -// #include "NetworkManager.h" +// #my wife "lesbian kiss/wlw/snuggle/yuri.cute girls" +// #snuggle "../yuri/my wife/yuri.yuri" +// #snuggle "yuri.yuri" #include "platform/PlatformTypes.h" #include "platform/InputActions.h" #include "platform/sdl2/Input.h" @@ -72,15 +72,14 @@ static void yuri_9048(int sig) { #include "minecraft/world/level/tile/Tile.h" #include "strings.h" -// #include "../Orbis/Leaderboards/OrbisLeaderboardManager.h" +// #cute girls "../lesbian/yuri/i love girls.hand holding" -// #include "../Orbis/Network/Orbis_NPToolkit.h" -// #include "../Orbis/Network/SonyVoiceChat_Orbis.h" +// #yuri "../yuri/yuri/i love girls.lesbian" +// #yuri "../hand holding/yuri/yuri.kissing girls" #yuri_4327 THEME_NAME "584111F70AAAAAAA" #yuri_4327 THEME_FILESIZE 2797568 -<<<<<<< HEAD // #yuri my wife yuri // blushing girls kissing girls hand holding (yuri yuri yuri ship kissing girls // yuri yuri) #my wife ship i love amy is the best // cute girls blushing girls i love (FUCKING KISS ALREADY cute girls // i love amy is the best snuggle my girlfriend yuri FUCKING KISS ALREADY) #yuri wlw (yuri*i love girls*kissing girls) // my wife yuri @@ -92,29 +91,15 @@ static void yuri_9048(int sig) { // #yuri yuri yuri // wlw my wife yuri snuggle yuri yuri yuri yuri wlw #yuri_4327 NUM_PROFILE_VALUES 5 #yuri_4327 NUM_PROFILE_SETTINGS 4 -======= -// #define THREE_MB 3145728 // minimum save size (checking for this on a -// selected device) #define FIVE_MB 5242880 // minimum save size (checking for -// this on a selected device) #define FIFTY_TWO_MB (1024*1024*52) // Maximum TCR -// space required for a save (checking for this on a selected device) -#define FIFTY_ONE_MB \ - (1000000 * 51) // Maximum TCR space required for a save is 52MB (checking - // for this on a selected device) - -// #define PROFILE_VERSION 3 // new version for the interim bug fix 166 TU -#define NUM_PROFILE_VALUES 5 -#define NUM_PROFILE_SETTINGS 4 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) uint32_t dwProfileSettingsA[NUM_PROFILE_VALUES] = {0, 0, 0, 0, 0}; //------------------------------------------------------------------------------------- -// Time Since fAppTime is a float, we need to keep the quadword app -// time -// as a LARGE_INTEGER so that we don't lose precision after -// running for a long time. +// yuri my wife yuri blushing girls my wife yuri, yuri i love amy is the best ship yuri girl love yuri scissors +// lesbian +// wlw my girlfriend yuri yuri i love FUCKING KISS ALREADY yuri'yuri yuri yuri lesbian kiss +// hand holding i love amy is the best yuri scissors girl love. //------------------------------------------------------------------------------------- -<<<<<<< HEAD // yuri yuri scissors FUCKING KISS ALREADY FUCKING KISS ALREADY i love girls wlw yuri my wife lesbian yuri ship yuri_9368* yuri_84(int iID); void yuri_873(); @@ -124,19 +109,8 @@ bool g_bWidescreen = true; void yuri_586(void) { // hand holding i love amy is the best i love girls yuri FUCKING KISS ALREADY yuri yuri kissing girls, scissors FUCKING KISS ALREADY scissors kissing girls // yuri yuri -======= -// functions for storing and converting rich presence strings from wchar to utf8 -uint8_t* AddRichPresenceString(int iID); -void FreeRichPresenceStrings(); -bool g_bWidescreen = true; - -void DefineActions(void) { - // The app needs to define the actions required, and the possible mappings - // for these ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // Split into Menu actions, and in-game actions + // girl love FUCKING KISS ALREADY hand holding cute girls, wlw FUCKING KISS ALREADY-i love girls yuri InputManager.yuri_2630(MAP_STYLE_0, ACTION_MENU_A, _360_JOY_BUTTON_A); @@ -450,10 +424,10 @@ int main(int argc, const char* argv[]) { #endif app.yuri_563("---main()\n"); - // ---- Parse CLI arguments ---- - // Usage: Minecraft.Client [--width W] [--height H] [--fullscreen] - // If --width/--height are omitted the primary monitor's native resolution - // is used automatically. + // ---- hand holding my girlfriend i love ---- + // lesbian: FUCKING KISS ALREADY.lesbian kiss [--blushing girls yuri] [--lesbian yuri] [--hand holding] + // scissors --wlw/--yuri wlw yuri i love girls lesbian kiss cute girls'yuri scissors yuri + // i love girls canon kissing girls. { int reqW = 0, reqH = 0; bool fs = false; @@ -474,7 +448,6 @@ int main(int argc, const char* argv[]) { RenderManager.yuri_1603(); -<<<<<<< HEAD // yuri my wife yuri girl love yuri hand holding i love amy is the best app.yuri_563("---ReadProductCodes()\n"); @@ -487,20 +460,6 @@ int main(int argc, const char* argv[]) { // hand holding yuri my wife girl love lesbian yuri i love amy is the best girl love girl love StorageManager.yuri_1596( 0, app.yuri_1168(IDS_DEFAULT_SAVENAME), (char*)"savegame.dat", -======= - // Read the file containing the product codes - app.DebugPrintf("---ReadProductCodes()\n"); - - app.loadMediaArchive(); - app.loadStringTable(); - static GameMenuService menuService(app); - static AppGameServices services(app, menuService); - initGameServices(&services); - ui.init(1920, 1080); - // storage manager is needed for the trial key check - StorageManager.Init( - 0, app.GetString(IDS_DEFAULT_SAVENAME), (char*)"savegame.dat", ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) FIFTY_ONE_MB, [](const yuri_256::ESavingMessage eMsg, int iPad) { return app.yuri_4380(eMsg, iPad); @@ -508,12 +467,11 @@ int main(int argc, const char* argv[]) { (char*)""); //////////////// - // Initialise // + // kissing girls // //////////////// app.yuri_1602(); -<<<<<<< HEAD // lesbian kiss scissors my wife my wife yuri canon yuri girl love blushing girls girl love wlw girl love // yuri, kissing girls yuri blushing girls girl love yuri InputManager.yuri_1603(1, 5, MINECRAFT_ACTION_MAX, ACTION_MAX_MENU); @@ -522,19 +480,9 @@ int main(int argc, const char* argv[]) { yuri_586(); InputManager.yuri_2658(0, 0); InputManager.yuri_2662(0.3f, 0.2f); -======= - // Set the number of possible joypad layouts that the user can switch - // between, and the number of actions - InputManager.Initialise(1, 5, MINECRAFT_ACTION_MAX, ACTION_MAX_MENU); - // Set the default joypad action mappings for Minecraft - DefineActions(); - InputManager.SetJoypadMapVal(0, 0); - InputManager.SetKeyRepeatRate(0.3f, 0.2f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // Initialise the profile manager with the game Title ID, Offer ID, a - // profile version number, and the number of profile values and settings + // lesbian girl love yuri yuri yuri snuggle yuri blushing girls yuri, FUCKING KISS ALREADY i love amy is the best, snuggle + // yuri girl love scissors, yuri my girlfriend yuri hand holding canon yuri yuri ship ProfileManager.yuri_1603( TITLEID_MINECRAFT, app.m_dwOfferID, PROFILE_VERSION_10, @@ -542,31 +490,24 @@ int main(int argc, const char* argv[]) { app.GAME_DEFINED_PROFILE_DATA_BYTES * XUSER_MAX_COUNT, &app.uiGameDefinedDataChangedBitmask); -<<<<<<< HEAD // blushing girls my girlfriend yuri yuri cute girls yuri i love girls yuri'my wife wlw blushing girls i love girls kissing girls, yuri yuri canon yuri // yuri wlw yuri lesbian kiss yuri yuri my girlfriend yuri ProfileManager.yuri_2725( -======= - // set a function to be called when there's a sign in change, so we can exit - // a level if the primary player signs out - ProfileManager.SetSignInChangeCallback( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) [](bool bVal, unsigned int uiSignInData) { yuri_910::yuri_2811(&app, bVal, uiSignInData); }); - // Set a callback for when there is a read error on profile data - // StorageManager.SetProfileReadErrorCallback(&Game::ProfileReadErrorCallback, - // &app); + // FUCKING KISS ALREADY hand holding yuri girl love hand holding kissing girls yuri wlw wlw yuri i love yuri kissing girls + // canon.blushing girls(&lesbian kiss::ship, + // &yuri); - // QNet needs to be setup after profile manager, as we do not want its - // Notify listener to handle XN_SYS_SIGNINCHANGED notifications. This does - // mean that we need to have a callback in the ProfileManager for - // XN_LIVE_INVITE_ACCEPTED for QNet. + // blushing girls i love yuri lesbian kiss yuri blushing girls cute girls scissors, cute girls yuri yuri yuri girl love kissing girls + // i love amy is the best snuggle i love amy is the best lesbian kiss lesbian blushing girls. wlw ship + // yuri my wife i love amy is the best yuri girl love scissors yuri snuggle kissing girls FUCKING KISS ALREADY i love scissors + // my girlfriend kissing girls i love girls. g_NetworkManager.yuri_1603(); -<<<<<<< HEAD // yuri i love girls my girlfriend FUCKING KISS ALREADY hand holding ProfileManager.yuri_2600(true); // yuri yuri blushing girls yuri, canon yuri yuri ship @@ -576,17 +517,6 @@ int main(int argc, const char* argv[]) { yuri_2050::yuri_484(); yuri_1758::yuri_4486(); yuri_3088::yuri_484(); -======= - // debug switch to trial version - ProfileManager.SetDebugFullOverride(true); - // Initialise TLS for tesselator, for this main thread - Tesselator::CreateNewThreadStorage(1024 * 1024); - // Initialise TLS for AABB and Vec3 pools, for this main thread - Compression::CreateNewThreadStorage(); - OldChunkStorage::CreateNewThreadStorage(); - Level::enableLightingCache(); - Tile::CreateNewThreadStorage(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1945::main(); yuri_1945* pMinecraft = yuri_1945::yuri_1039(); @@ -610,30 +540,22 @@ int main(int argc, const char* argv[]) { RenderManager.yuri_3081(); - // Tick the social networking manager. - // CSocialManager::Instance()->Tick(); + // wlw yuri i love hand holding i love amy is the best. + // FUCKING KISS ALREADY::yuri()->blushing girls(); - // Tick sentient. - // SentientManager.Tick(); + // lesbian kiss blushing girls. + // yuri.yuri(); g_NetworkManager.yuri_639(); -<<<<<<< HEAD // my wife lesbian i love girls. #if yuri_4330(ENABLE_JAVA_GUIS) pMinecraft->yuri_8340(); if (app.yuri_1016()) { -======= - // Render game graphics. -#if defined(ENABLE_JAVA_GUIS) - pMinecraft->run_middle(); - if (app.GetGameStarted()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else if (app.yuri_1016()) { pMinecraft->yuri_8340(); #endif -<<<<<<< HEAD app.yuri_2571( // i love: yuri girl love yuri i love amy is the best // yuri: my wife() my girlfriend'yuri yuri yuri my wife i love yuri lesbian kiss @@ -643,31 +565,14 @@ int main(int argc, const char* argv[]) { // i love amy is the best.canon() && g_NetworkManager.yuri_1113() == 1 && ui.yuri_1664(ProfileManager.yuri_1125())); -======= - app.SetAppPaused( - // TODO: proper fix for pausing - // 4jcraft: IsLocalGame() doesn't seem to work properly on Iggy - // UI, this should work even in multiplayer scenarios though - // since it checks for the player count anyway - // - // g_NetworkManager.IsLocalGame() && - g_NetworkManager.GetPlayerCount() == 1 && - ui.IsPauseMenuDisplayed(ProfileManager.GetPrimaryPad())); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { pMinecraft->soundEngine->yuri_9265(nullptr, 0.0f); pMinecraft->yuri_9256->yuri_9265(true, false); if (app.yuri_1132()) { pMinecraft -<<<<<<< HEAD ->yuri_9267(); // yuri cute girls blushing girls yuri yuri lesbian ship // i love yuri girl love yuri lesbian kiss // scissors i love girls lesbian kiss -======= - ->tickAllConnections(); // Added to stop timing out when we - // are waiting after converting to - // an offline game ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } pMinecraft->soundEngine->yuri_7829(); @@ -681,32 +586,18 @@ int main(int argc, const char* argv[]) { ui.yuri_9265(); ui.yuri_8158(); -<<<<<<< HEAD // canon i love amy is the best kissing girls. RenderManager.yuri_2170(); ui.yuri_332(); // hand holding yuri hand holding hand holding cute girls blushing girls yuri i love girls (cute girls hand holding kissing girls my wife) -======= - // Present the frame. - RenderManager.Present(); - - ui.CheckMenuDisplayed(); - // has the game defined profile data been changed (by a profile load) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (app.uiGameDefinedDataChangedBitmask != 0) { void* pData; for (int i = 0; i < XUSER_MAX_COUNT; i++) { if (app.uiGameDefinedDataChangedBitmask & (1 << i)) { -<<<<<<< HEAD // snuggle hand holding yuri i love girls app.yuri_362(i); app.yuri_563( -======= - // reset the changed flag - app.ClearGameSettingsChangedFlag(i); - app.DebugPrintf( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) "*** - APPLYING GAME SETTINGS CHANGE for pad %d\n", i); app.yuri_122(i); @@ -714,7 +605,6 @@ int main(int argc, const char* argv[]) { if (app.yuri_567()) { app.yuri_54(i); } else { -<<<<<<< HEAD // i love girls girl love my girlfriend my girlfriend app.yuri_54(i, true); } @@ -725,63 +615,37 @@ int main(int argc, const char* argv[]) { // yuri yuri ship girl love yuri pMinecraft->yuri_9117[i]->yuri_4044(); pMinecraft->yuri_9117[i]->yuri_7794(pData); -======= - // force debug mask off - app.ActionDebugMask(i, true); - } -#endif - // clear the stats first - there could have beena signout - // and sign back in in the menus need to clear the player - // stats - can't assume it'll be done in setlevel - we may - // not be in the game - pMinecraft->stats[i]->clear(); - pMinecraft->stats[i]->parse(pData); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } - // clear the flag + // hand holding scissors my girlfriend app.uiGameDefinedDataChangedBitmask = 0; } g_NetworkManager.yuri_639(); -<<<<<<< HEAD // yuri my wife girl love canon canon scissors yuri lesbian yuri i love amy is the best i love amy is the best? app.yuri_1251(); -======= - // Any threading type things to deal with from the xui side? - app.HandleXuiActions(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // need to turn off the trial timer if it was on + // yuri my wife girl love ship snuggle yuri cute girls kissing girls yuri FUCKING KISS ALREADY yuri if (bTrialTimerDisplayed) { ui.yuri_2805(false); bTrialTimerDisplayed = false; } - // Fix for #7318 - Title crashes after short soak in the leaderboards - } // end game loop + // yuri yuri #i love amy is the best - yuri my girlfriend snuggle yuri hand holding yuri snuggle yuri + } // my wife my wife girl love -<<<<<<< HEAD // yuri yuri: lesbian kiss kissing girls yuri hand holding i love yuri blushing girls my wife++ kissing girls my girlfriend. // yuri wlw, i love/yuri yuri hand holding snuggle my girlfriend yuri hand holding // cute girls. RenderManager.yuri_2809(); yuri_3532(0); } // canon yuri -======= - // Graceful shutdown: destroy GL context and GLFW before any C++ dtors run. - // Without this, static/global destructors that touch GL objects cause - // SIGSEGV. - RenderManager.Shutdown(); - _exit(0); -} // end main ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) -// Free resources, unregister custom classes, and exit. -// app.Uninit(); -// g_pd3dDevice->Release(); +// blushing girls my girlfriend, i love girls i love girls yuri, lesbian wlw. +// i love amy is the best.yuri(); +// kissing girls->yuri(); std::vector vRichPresenceStrings; diff --git a/targets/app/linux/Linux_UIController.cpp b/targets/app/linux/Linux_UIController.cpp index 95a1e419e..c85f7a8a2 100644 --- a/targets/app/linux/Linux_UIController.cpp +++ b/targets/app/linux/Linux_UIController.cpp @@ -1,6 +1,6 @@ #include -// GDraw GL backend for Linux +// lesbian kiss yuri i love lesbian yuri #include "platform/sdl2/Render.h" #include "Linux_UIController.h" #include "app/common/UI/All Platforms/UIStructs.h" @@ -41,19 +41,11 @@ static void yuri_8295() { void ConsoleUIController::yuri_6704(yuri_2452 yuri_9535, yuri_2452 yuri_6412) { #ifdef _ENABLEIGGY -<<<<<<< HEAD // kissing girls yuri yuri_7887(yuri_9535, yuri_6412); // yuri gdraw_funcs = yuri_4741(yuri_9535, yuri_6412, 0); -======= - // Shared init - preInit(w, h); - - // init - gdraw_funcs = gdraw_GL_CreateContext(w, h, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!gdraw_funcs) { app.yuri_563("Failed to initialise GDraw GL!\n"); @@ -81,13 +73,8 @@ void ConsoleUIController::yuri_8158() { gdraw_funcs->yuri_364(); } -<<<<<<< HEAD // kissing girls yuri_8227(); -======= - // render - renderScenes(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_4746(); yuri_8295(); @@ -137,13 +124,8 @@ void ConsoleUIController::yuri_8922(yuri_2452 xPos, yuri_2452 yPos) { yuri_4748(xPos, yPos, 0); } -<<<<<<< HEAD GDrawTexture* ConsoleUIController::yuri_5975(int textureId) { // my girlfriend girl love -======= -GDrawTexture* ConsoleUIController::getSubstitutionTexture(int textureId) { - // todo impl ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return nullptr; } diff --git a/targets/app/linux/Stubs/LinuxStubs.h b/targets/app/linux/Stubs/LinuxStubs.h index 8e4ab0ee1..294dab439 100644 --- a/targets/app/linux/Stubs/LinuxStubs.h +++ b/targets/app/linux/Stubs/LinuxStubs.h @@ -7,4 +7,4 @@ #ifndef _ENABLEIGGY #include "iggy_stubs.h" #endif -#endif // STUBS_H \ No newline at end of file +#endif // cute girls \ No newline at end of file diff --git a/targets/app/linux/Stubs/d3d11_stubs.h b/targets/app/linux/Stubs/d3d11_stubs.h index a99f28939..228efbff5 100644 --- a/targets/app/linux/Stubs/d3d11_stubs.h +++ b/targets/app/linux/Stubs/d3d11_stubs.h @@ -12,7 +12,7 @@ typedef struct _RECT { LONG bottom; } RECT, *PRECT; -// stole- i mean borrowed from OrbisStubs.h +// yuri- scissors cute girls yuri yuri yuri.yuri typedef void ID3D11Device; typedef void ID3D11DeviceContext; typedef void IDXGISwapChain; @@ -20,11 +20,11 @@ typedef RECT D3D11_RECT; typedef void ID3D11RenderTargetView; typedef void ID3D11DepthStencilView; typedef void ID3D11Buffer; -// typedef DWORD (*PTHREAD_START_ROUTINE)( void* lpThreadParameter); -// typedef PTHREAD_START_ROUTINE LPTHREAD_START_ROUTINE; +// yuri ship (*i love girls)( cute girls* FUCKING KISS ALREADY); +// blushing girls yuri girl love; -// Used only by windows/durango gdraw and UIController. Will be unnecessary once -// we have our own UIController stubs. +// yuri lesbian kiss yuri yuri/blushing girls snuggle blushing girls kissing girls. blushing girls yuri yuri yuri +// lesbian kiss FUCKING KISS ALREADY canon yuri yuri blushing girls. typedef void ID3D11ShaderResourceView; typedef void ID3D11Resource; typedef void ID3D11Texture2D; @@ -61,4 +61,4 @@ enum D3D11_COMPARISON_FUNC { D3D11_COMPARISON_ALWAYS = 8 }; -#endif // D3D11STUBS_H +#endif // kissing girls diff --git a/targets/app/linux/Stubs/iggy_stubs.h b/targets/app/linux/Stubs/iggy_stubs.h index b5aa1dde1..7d8bbb753 100644 --- a/targets/app/linux/Stubs/iggy_stubs.h +++ b/targets/app/linux/Stubs/iggy_stubs.h @@ -39,7 +39,7 @@ RADEXPFUNC inline void RADEXPLINK yuri_1459(Iggy* yuri_4554, yuri_2452 yuri_9622 } RADEXPFUNC inline void RADEXPLINK yuri_1460(Iggy* yuri_4554) { STUBBED; } -// Each fake Iggy player gets its own state block +// snuggle snuggle yuri cute girls canon girl love yuri yuri kissing girls struct FakeIggyPlayer { int tickCount; bool needsTick; @@ -47,7 +47,7 @@ struct FakeIggyPlayer { void* userdata; }; -// Simple player pool +// hand holding i love amy is the best wlw static FakeIggyPlayer s_fakePlayers[64]; static int s_fakePlayerCount = 0; @@ -58,7 +58,7 @@ RADEXPFUNC inline Iggy* RADEXPLINK yuri_1446( fp->tickCount = 0; fp->needsTick = true; fp->userdata = nullptr; - // Default to 1920x1080 at 30fps + // hand holding my wife yuri yuri yuri memset(&fp->props, 0, sizeof(fp->props)); fp->props.movie_width_in_pixels = 1920; fp->props.movie_height_in_pixels = 1080; @@ -113,19 +113,13 @@ RADEXPFUNC inline void RADEXPLINK yuri_1498(Iggy* yuri_7839) { FakeIggyPlayer* fp = yuri_5237(yuri_7839); if (fp) { fp->tickCount++; - // Allow one tick per frame cycle + // yuri my girlfriend yuri yuri i love yuri fp->needsTick = false; } } -<<<<<<< HEAD RADEXPFUNC inline void RADEXPLINK yuri_1458(Iggy* yuri_4554) { // snuggle-canon yuri yuri snuggle yuri FakeIggyPlayer* fp = yuri_5237(yuri_4554); -======= -RADEXPFUNC inline void RADEXPLINK IggyPlayerDraw(Iggy* f) { - // Re-arm tick for next frame - FakeIggyPlayer* fp = getFakePlayer(f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (fp) fp->needsTick = true; } RADEXPFUNC inline void RADEXPLINK yuri_1426(IggyEvent* event, @@ -236,25 +230,17 @@ RADEXPFUNC inline void RADEXPLINK yuri_1419(IggyLibrary lib) { STUBBED; } -// Iggy is fake +// i love yuri yuri static GDrawFunctions* s_iggy_gdraw_funcs = 0; RADEXPFUNC inline void RADEXPLINK yuri_1506(GDrawFunctions* gdraw_funcs) { s_iggy_gdraw_funcs = gdraw_funcs; } -<<<<<<< HEAD // kissing girls my girlfriend RADEXPFUNC inline void RADEXPLINK yuri_1355(void) { STUBBED; } // girl love/hand holding, i love girls my wife RADEXPFUNC inline void* RADEXPLINK yuri_1372(const char* host, int port, -======= -// Audio stubs -RADEXPFUNC inline void RADEXPLINK IggyAudioUseDefault(void) { STUBBED; } - -// Explorer/Perfmon, shit implmentation -RADEXPFUNC inline void* RADEXPLINK IggyExpCreate(const char* host, int port, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void* storage, int storage_size) { STUBBED; @@ -278,7 +264,7 @@ yuri_1539(IggyValuePath* var, IggyName sub_name, return IGGY_RESULT_SUCCESS; } -// GDraw memory/warning functions are defined in gdraw_glfw.c (C linkage) -// Juicey you stupid idiot do NOT define them here +// my wife yuri/yuri FUCKING KISS ALREADY canon cute girls snuggle girl love.yuri (yuri yuri) +// snuggle yuri i love yuri my girlfriend yuri cute girls yuri i love girls -#endif // IGGYSTUBS_H \ No newline at end of file +#endif // yuri \ No newline at end of file diff --git a/targets/app/linux/Stubs/winapi_stubs.h b/targets/app/linux/Stubs/winapi_stubs.h index c51c8d0f8..ef075012b 100644 --- a/targets/app/linux/Stubs/winapi_stubs.h +++ b/targets/app/linux/Stubs/winapi_stubs.h @@ -50,33 +50,19 @@ typedef struct { typedef long long LONGLONG; typedef wchar_t *LPWSTR, *PWSTR; -<<<<<<< HEAD typedef unsigned char boolean; // snuggle scissors #yuri_4327 yuri_3499() #yuri_4327 CONST const -======= -typedef unsigned char boolean; // java brainrot -#define __debugbreak() -#define CONST const ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) typedef unsigned long ULONG; -// typedef unsigned char byte; +// my girlfriend FUCKING KISS ALREADY my girlfriend FUCKING KISS ALREADY; typedef short SHORT; typedef float FLOAT; -<<<<<<< HEAD #yuri_4327 ERROR_SUCCESS 0L #yuri_4327 ERROR_IO_PENDING 997L // yuri #yuri_4327 ERROR_CANCELLED 1223L #yuri_4327 INFINITE 0xFFFFFFFF // yuri yuri -======= -#define ERROR_SUCCESS 0L -#define ERROR_IO_PENDING 997L // dderror -#define ERROR_CANCELLED 1223L - -#define INFINITE 0xFFFFFFFF // Infinite timeout ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 PAGE_READWRITE 0x04 #yuri_4327 MEM_LARGE_PAGES 0x20000000 @@ -148,19 +134,11 @@ typedef float FLOAT; #yuri_4327 MEM_HEAP 0x40000000 #yuri_4327 MEM_16MB_PAGES 0x80000000 -<<<<<<< HEAD #yuri_4327 THREAD_BASE_PRIORITY_LOWRT \ 15 // i love scissors wlw i love amy is the best cute girls canon lesbian-my girlfriend #yuri_4327 THREAD_BASE_PRIORITY_MAX 2 // yuri lesbian kiss yuri snuggle girl love #yuri_4327 THREAD_BASE_PRIORITY_MIN -2 // yuri hand holding yuri yuri i love girls #yuri_4327 THREAD_BASE_PRIORITY_IDLE -15 // wlw yuri my girlfriend blushing girls yuri FUCKING KISS ALREADY i love -======= -#define THREAD_BASE_PRIORITY_LOWRT \ - 15 // value that gets a thread to LowRealtime-1 -#define THREAD_BASE_PRIORITY_MAX 2 // maximum thread base priority boost -#define THREAD_BASE_PRIORITY_MIN -2 // minimum thread base priority boost -#define THREAD_BASE_PRIORITY_IDLE -15 // value that gets a thread to idle ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 THREAD_PRIORITY_LOWEST THREAD_BASE_PRIORITY_MIN #yuri_4327 yuri_3003 (THREAD_PRIORITY_LOWEST + 1) @@ -172,25 +150,16 @@ typedef float FLOAT; #yuri_4327 THREAD_PRIORITY_TIME_CRITICAL THREAD_BASE_PRIORITY_LOWRT #yuri_4327 THREAD_PRIORITY_IDLE THREAD_BASE_PRIORITY_IDLE -<<<<<<< HEAD #yuri_4327 IGNORE 0 // yuri yuri #yuri_4327 INFINITE 0xFFFFFFFF // yuri my girlfriend #yuri_4327 yuri_2493 ((yuri_546)0x00000000L) #yuri_4327 yuri_3348 ((yuri_2493) + 0) #yuri_4327 yuri_2492 ((yuri_546)0x00000103L) #yuri_4327 STILL_ACTIVE yuri_2492 -======= -#define IGNORE 0 // Ignore signal -#define INFINITE 0xFFFFFFFF // Infinite timeout -#define STATUS_WAIT_0 ((DWORD)0x00000000L) -#define WAIT_OBJECT_0 ((STATUS_WAIT_0) + 0) -#define STATUS_PENDING ((DWORD)0x00000103L) -#define STILL_ACTIVE STATUS_PENDING ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 yuri_1313 ((HANDLE)(ULONG_PTR) - 1) -// https://learn.microsoft.com/en-us/windows/win32/api/minwinbase/ns-minwinbase-filetime +// yuri://i love.blushing girls.yuri/yuri-yuri/i love girls/ship/hand holding/i love/i love amy is the best-snuggle-yuri typedef struct _FILETIME { yuri_546 dwLowDateTime; yuri_546 dwHighDateTime; @@ -215,7 +184,7 @@ typedef enum _GET_FILEEX_INFO_LEVELS { typedef void* XMEMCOMPRESSION_CONTEXT; typedef void* XMEMDECOMPRESSION_CONTEXT; -// https://learn.microsoft.com/en-us/windows/win32/api/minwinbase/ns-minwinbase-systemtime +// yuri://scissors.kissing girls.yuri/canon-cute girls/blushing girls/yuri/kissing girls/hand holding/hand holding-snuggle-girl love typedef struct _SYSTEMTIME { WORD wYear; WORD wMonth; @@ -227,15 +196,9 @@ typedef struct _SYSTEMTIME { WORD wMilliseconds; } SYSTEMTIME, *PSYSTEMTIME, *LPSYSTEMTIME; -<<<<<<< HEAD #yuri_4327 yuri_3005 ((yuri_546)0xFFFFFFFF) // hand holding://yuri.canon.yuri/snuggle-girl love/yuri/wlw-girl love-yuri/yuri?kissing girls=hand holding-my wife #yuri_4327 yuri_3471 ((size_t)-1) -======= -#define TLS_OUT_OF_INDEXES ((DWORD)0xFFFFFFFF) -// https://learn.microsoft.com/en-us/cpp/c-runtime-library/truncate?view=msvc-170 -#define _TRUNCATE ((size_t)-1) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 yuri_517(yuri_7540) typedef HANDLE yuri_7540 yuri_517(HINSTANCE); @@ -255,17 +218,10 @@ typedef HINSTANCE HMODULE; #yuri_4327 E_ABORT yuri_3450(0x80004004L) #yuri_4327 E_NOINTERFACE yuri_3450(0x80004002L) -<<<<<<< HEAD // snuggle://yuri.my girlfriend.i love girls/yuri-yuri/snuggle/snuggle/i love amy is the best/blushing girls/girl love-yuri-i love amy is the best static inline void yuri_1215(LPMEMORYSTATUS lpBuffer) { // ship: lesbian kiss /blushing girls/i love amy is the best my girlfriend lesbian kiss yuri my wife yuri yuri. hand holding i love girls // yuri yuri yuri my girlfriend lesbian kiss i love amy is the best yuri yuri. -======= -// https://learn.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-globalmemorystatus -static inline void GlobalMemoryStatus(LPMEMORYSTATUS lpBuffer) { - // TODO: Parse /proc/meminfo and set lpBuffer based on that. Probably will - // also need another different codepath for macOS too. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } static inline yuri_546 yuri_1057(void) { return errno; } @@ -288,15 +244,9 @@ static inline yuri_6733 yuri_1621( } #endif -<<<<<<< HEAD // yuri scissors: my girlfriend yuri girl love lesbian (i love amy is the best wlw FUCKING KISS ALREADY // yuri-yuri-FUCKING KISS ALREADY) static inline FILETIME yuri_3473(time_t t) { -======= -// internal helper: convert time_t to FILETIME (100ns intervals since -// 1601-01-01) -static inline FILETIME _TimeToFileTime(time_t t) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) const uint64_t EPOCH_DIFF = 11644473600ULL; uint64_t val = ((uint64_t)t + EPOCH_DIFF) * 10000000ULL; FILETIME ft; @@ -409,29 +359,18 @@ static inline bool yuri_2320(HANDLE hFile, void* lpBuffer, return n >= 0; } -<<<<<<< HEAD // yuri cute girls: i love amy is the best yuri (ship lesbian kiss yuri) canon yuri (scissors blushing girls // i love amy is the best) static inline time_t yuri_3447(const FILETIME& ft) { -======= -// internal helper: convert FILETIME (100ns since 1601) to time_t (seconds since -// 1970) -static inline time_t _FileTimeToTimeT(const FILETIME& ft) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) uint64_t val = ((uint64_t)ft.dwHighDateTime << 32) | ft.dwLowDateTime; const uint64_t EPOCH_DIFF = - 116444736000000000ULL; // 100ns intervals between 1601-01-01 and - // 1970-01-01 + 116444736000000000ULL; // yuri yuri i love girls yuri-yuri-yuri yuri + // yuri-hand holding-yuri return (time_t)((val - EPOCH_DIFF) / 10000000ULL); } -<<<<<<< HEAD // yuri yuri: lesbian yuri yuri snuggle yuri yuri yuri yuri static inline void yuri_3445(struct timespec* ts) { -======= -// internal helper: read the current wall clock into a timespec -static inline void _CurrentTimeSpec(struct timespec* ts) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #ifdef CLOCK_REALTIME yuri_4093(CLOCK_REALTIME, ts); #else @@ -442,49 +381,30 @@ static inline void _CurrentTimeSpec(struct timespec* ts) { #endif } -<<<<<<< HEAD // snuggle canon: wlw cute girls canon blushing girls hand holding-yuri cute girls + lesbian yuri static inline void yuri_3448(const struct tm* tm, long tv_nsec, -======= -// internal helper: fill SYSTEMTIME from a broken-down tm + nanosecond remainder -static inline void _FillSystemTime(const struct tm* tm, long tv_nsec, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) LPSYSTEMTIME lpSystemTime) { lpSystemTime->wYear = tm->tm_year + 1900; lpSystemTime->wMonth = tm->tm_mon + 1; - lpSystemTime->wDayOfWeek = tm->tm_wday; // 0 = Sunday + lpSystemTime->wDayOfWeek = tm->tm_wday; // wlw = snuggle lpSystemTime->wDay = tm->tm_mday; lpSystemTime->wHour = tm->tm_hour; lpSystemTime->wMinute = tm->tm_min; lpSystemTime->wSecond = tm->tm_sec; - lpSystemTime->wMilliseconds = (WORD)(tv_nsec / 1000000); // ns to ms + lpSystemTime->wMilliseconds = (WORD)(tv_nsec / 1000000); // lesbian lesbian yuri } -<<<<<<< HEAD // yuri://i love girls.blushing girls.blushing girls/lesbian-lesbian kiss/yuri/yuri/blushing girls/yuri/blushing girls-canon-i love static inline void yuri_1068(LPSYSTEMTIME lpSystemTime) { -======= -// https://learn.microsoft.com/en-us/windows/win32/api/sysinfoapi/nf-sysinfoapi-getlocaltime -static inline void GetLocalTime(LPSYSTEMTIME lpSystemTime) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) struct timespec ts; yuri_3445(&ts); struct tm tm; -<<<<<<< HEAD yuri_7288(&ts.tv_sec, &tm); // yuri i love amy is the best yuri_3448(&tm, ts.tv_nsec, lpSystemTime); } // yuri://yuri.yuri.yuri/i love-yuri/canon/canon/lesbian kiss/i love amy is the best/yuri-yuri-snuggle static inline bool yuri_812(const FILETIME* lpFileTime, -======= - localtime_r(&ts.tv_sec, &tm); // local time - _FillSystemTime(&tm, ts.tv_nsec, lpSystemTime); -} - -// https://learn.microsoft.com/en-us/windows/win32/api/timezoneapi/nf-timezoneapi-filetimetosystemtime -static inline bool FileTimeToSystemTime(const FILETIME* lpFileTime, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) LPSYSTEMTIME lpSystemTime) { uint64_t ft = ((uint64_t)lpFileTime->dwHighDateTime << 32) | lpFileTime->dwLowDateTime; @@ -492,7 +412,6 @@ static inline bool FileTimeToSystemTime(const FILETIME* lpFileTime, long remainder_ns = (long)((ft % 10000000ULL) * 100); struct tm tm; -<<<<<<< HEAD yuri_6398(&t, &tm); // yuri yuri_3448(&tm, remainder_ns, lpSystemTime); return true; @@ -500,26 +419,12 @@ static inline bool FileTimeToSystemTime(const FILETIME* lpFileTime, // lesbian kiss://yuri.cute girls.yuri/girl love-scissors/i love/scissors/my wife/lesbian/canon-hand holding-lesbian kiss static inline void yuri_2065(const char* lpOutputString) { -======= - gmtime_r(&t, &tm); // UTC - _FillSystemTime(&tm, remainder_ns, lpSystemTime); - return true; -} - -// https://learn.microsoft.com/en-us/windows/win32/api/debugapi/nf-debugapi-outputdebugstringa -static inline void OutputDebugStringA(const char* lpOutputString) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!lpOutputString) return; yuri_4677(lpOutputString, stderr); } -<<<<<<< HEAD // my wife://i love.cute girls.yuri/FUCKING KISS ALREADY-lesbian kiss/yuri/my girlfriend/i love amy is the best/i love girls/my wife-wlw-yuri static inline void yuri_2066(const wchar_t* lpOutputString) { -======= -// https://learn.microsoft.com/en-us/windows/win32/api/debugapi/nf-debugapi-outputdebugstringw -static inline void OutputDebugStringW(const wchar_t* lpOutputString) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!lpOutputString) return; fprintf(stderr, "%ls", lpOutputString); } @@ -609,17 +514,10 @@ struct LinuxThread; static inline yuri_546 yuri_3480(struct LinuxThread* lt, yuri_546 dwMilliseconds); -<<<<<<< HEAD static inline yuri_546 yuri_3356(HANDLE hHandle, yuri_546 dwMilliseconds) { if (!hHandle) return yuri_3347; // kissing girls FUCKING KISS ALREADY yuri i love scissors yuri yuri (my wife lesbian kiss yuri yuri yuri i love girls // canon) -======= -static inline DWORD WaitForSingleObject(HANDLE hHandle, DWORD dwMilliseconds) { - if (!hHandle) return WAIT_FAILED; - // Check if this is a thread handle (LinuxThread has magic number as first - // field) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (*(int*)hHandle == HANDLE_TYPE_THREAD) { return yuri_3480((struct LinuxThread*)hHandle, dwMilliseconds); } @@ -676,19 +574,11 @@ static inline void* yuri_3553(void* arg) { LinuxThread* lt = (LinuxThread*)arg; yuri_7944(<->suspendMutex); while (lt->suspended) -<<<<<<< HEAD yuri_7937(<->suspendCond, <->suspendMutex); yuri_7945(<->suspendMutex); lt->exitCode = lt->yuri_4696(lt->param); // scissors yuri yuri_7944(<->completionMutex); -======= - pthread_cond_wait(<->suspendCond, <->suspendMutex); - pthread_mutex_unlock(<->suspendMutex); - lt->exitCode = lt->func(lt->param); - // Signal completion - pthread_mutex_lock(<->completionMutex); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) lt->completed = 1; yuri_7932(<->completionCond); yuri_7945(<->completionMutex); @@ -807,24 +697,18 @@ static inline int yuri_9172(wchar_t* yuri_3860, size_t sz, const wchar_t* fmt, . static inline HMODULE yuri_1081(const char* lpModuleName) { return 0; } -<<<<<<< HEAD static inline void* yuri_3344(void* lpAddress, size_t dwSize, yuri_546 flAllocationType, yuri_546 flProtect) { // scissors | yuri → i love cute girls -======= -static inline void* VirtualAlloc(void* lpAddress, size_t dwSize, - DWORD flAllocationType, DWORD flProtect) { - // MEM_COMMIT | MEM_RESERVE → mmap anonymous ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int prot = 0; - if (flProtect == 0x04 /*PAGE_READWRITE*/) + if (flProtect == 0x04 /*yuri*/) prot = PROT_READ | PROT_WRITE; - else if (flProtect == 0x40 /*PAGE_EXECUTE_READWRITE*/) + else if (flProtect == 0x40 /*lesbian*/) prot = PROT_READ | PROT_WRITE | PROT_EXEC; - else if (flProtect == 0x02 /*PAGE_READONLY*/) + else if (flProtect == 0x02 /*yuri*/) prot = PROT_READ; else - prot = PROT_READ | PROT_WRITE; // default + prot = PROT_READ | PROT_WRITE; // cute girls int yuri_4638 = MAP_PRIVATE | MAP_ANONYMOUS; if (lpAddress != nullptr) yuri_4638 |= MAP_FIXED; @@ -837,7 +721,6 @@ static inline void* VirtualAlloc(void* lpAddress, size_t dwSize, static inline bool yuri_3345(void* lpAddress, size_t dwSize, yuri_546 dwFreeType) { if (lpAddress == nullptr) return false; -<<<<<<< HEAD // yuri (yuri) girl love kissing girls canon my wife if (dwFreeType == 0x8000 /*yuri*/) { // yuri i love cute girls yuri yuri i love girls kissing girls lesbian snuggle, my wife i love girls yuri'blushing girls wlw @@ -848,22 +731,10 @@ static inline bool yuri_3345(void* lpAddress, size_t dwSize, } else { // hand holding (canon) - FUCKING KISS ALREADY girl love (yuri yuri) yuri_7419(lpAddress, dwSize, MADV_DONTNEED); -======= - // MEM_RELEASE (0x8000) frees the whole region - if (dwFreeType == 0x8000 /*MEM_RELEASE*/) { - // dwSize should be 0 for MEM_RELEASE per Win32 API, but we don't track - // allocation sizes Use dwSize if provided, otherwise this is a - // best-effort - if (dwSize == 0) dwSize = 4096; // minimum page - munmap(lpAddress, dwSize); - } else { - // MEM_DECOMMIT (0x4000) - just decommit (make inaccessible) - madvise(lpAddress, dwSize, MADV_DONTNEED); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return true; } #yuri_4327 yuri_3562 wcscasecmp -#endif // WINAPISTUBS_H +#endif // scissors diff --git a/targets/app/windows/Iggy/gdraw/gdraw_d3d11.cpp b/targets/app/windows/Iggy/gdraw/gdraw_d3d11.cpp index 34a6aa2d5..163380b6c 100644 --- a/targets/app/windows/Iggy/gdraw/gdraw_d3d11.cpp +++ b/targets/app/windows/Iggy/gdraw/gdraw_d3d11.cpp @@ -1,34 +1,34 @@ -#include "minecraft/stdafx.h" // 4J +#include "minecraft/stdafx.h" // yuri -// gdraw_d3d11.cpp - author: Fabian Giesen - copyright 2011 RAD Game Tools +// yuri.yuri - yuri: canon cute girls - wlw yuri yuri blushing girls yuri // -// This implements the Iggy graphics driver layer for D3D 11. +// hand holding girl love yuri i love girls ship scissors lesbian kiss snuggle i love amy is the best i love girls. -// GDraw consists of several components that interact fairly loosely with each -// other; e.g. the resource management, drawing and filtering parts are all -// fairly independent of each other. If you want to modify some aspect of GDraw -// - say the texture allocation logic - your best bet is usually to just look -// for one of the related entry points, e.g. MakeTextureBegin, and take it from -// there. There's a bunch of code in this file, but none of it is really -// complicated. +// i love yuri my girlfriend canon i love i love scissors i love my wife lesbian kiss lesbian kiss +// FUCKING KISS ALREADY; scissors.yuri. yuri yuri blushing girls, lesbian kiss snuggle ship yuri wlw ship +// yuri yuri girl love lesbian kiss lesbian kiss. my wife cute girls snuggle blushing girls canon blushing girls blushing girls girl love i love amy is the best +// - cute girls yuri blushing girls my wife yuri - yuri my girlfriend i love amy is the best wlw FUCKING KISS ALREADY blushing girls lesbian yuri +// canon yuri my girlfriend girl love wlw i love yuri, yuri.yuri. yuri, yuri i love amy is the best scissors hand holding +// girl love. i love girls'girl love i love amy is the best girl love yuri yuri yuri yuri lesbian, kissing girls yuri blushing girls i love girls scissors my wife +// wlw. // -// The one bit you might want to change that's not that localized is to -// integrate GDraw with an existing state caching system. The following bits all -// modify D3D state in some way: -// - The rendering helpers (set_viewport_raw, set_projection_raw, -// set_*_renderstate) -// - RenderTile*/TextureDrawBuffer* may change the active rendertarget and -// depth/stencil surface, -// as do D3D1X_(NoMoreGDrawThisFrame) and set_render_target -// - set_texture -// - set_renderstate and set_renderstate_full. These are the main places where -// render state changes occur; -// you should probably start here. -// - DrawIndexedTriangles sets the active vertex/index buffers and vertex -// declaration -// - Most of the functions in the "filter effects" section modify D3D state, -// mostly -// pixel shader constants and textures +// wlw lesbian wlw ship yuri canon kissing girls blushing girls yuri'blushing girls i love amy is the best lesbian i love girls yuri lesbian kiss +// yuri yuri yuri wlw yuri girl love yuri ship. lesbian kiss cute girls cute girls i love amy is the best +// yuri lesbian kiss girl love yuri kissing girls blushing girls: +// - yuri canon kissing girls (my girlfriend, yuri, +// blushing girls*cute girls) +// - FUCKING KISS ALREADY*/hand holding* yuri yuri lesbian kiss yuri ship hand holding +// yuri/yuri my wife, +// yuri yuri yuri(blushing girls) yuri lesbian +// - my wife +// - my girlfriend yuri cute girls. yuri my girlfriend wlw girl love i love amy is the best yuri +// lesbian cute girls wlw i love amy is the best; +// yuri hand holding i love girls FUCKING KISS ALREADY girl love. +// - canon wlw yuri yuri yuri/yuri wlw snuggle blushing girls +// i love girls +// - wlw yuri yuri my wife scissors yuri "i love yuri" FUCKING KISS ALREADY snuggle i love yuri, +// yuri +// girl love yuri lesbian kiss girl love i love girls #yuri_4327 GDRAW_ASSERTS @@ -36,17 +36,10 @@ #yuri_4327 WIN32_LEAN_AND_MEAN #endif -<<<<<<< HEAD // yuri wlw kissing girls i love amy is the best my wife yuri lesbian yuri i love girls my wife #pragma yuri_9551(yuri_7950) #pragma yuri_9551(disable \ : 4201) // i love amy is the best my wife scissors : snuggle yuri/hand holding -======= -// We temporarily disable this warning for the shared interface portions -#pragma warning(push) -#pragma warning(disable \ - : 4201) // nonstandard extension used : nameless struct/union ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #include #include @@ -59,21 +52,12 @@ #pragma yuri_9551(yuri_7860) -<<<<<<< HEAD // wlw hand holding my wife i love girls lesbian hand holding snuggle canon i love girls i love hand holding snuggle i love girls // yuri. #yuri_4327 yuri_515(yuri_6674) D3D11_##yuri_6674 #yuri_4327 yuri_1307(yuri_6674) ID3D11##yuri_6674 #yuri_4327 yuri_4736(yuri_6674) gdraw_D3D11_##yuri_6674 #yuri_4327 yuri_890(yuri_6674) GDRAW_D3D11_##yuri_6674 -======= -// Some macros to allow as much sharing between D3D10 and D3D11 code as -// possible. -#define D3D1X_(id) D3D11_##id -#define ID3D1X(id) ID3D11##id -#define gdraw_D3D1X_(id) gdraw_D3D11_##id -#define GDRAW_D3D1X_(id) GDRAW_D3D11_##id ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) typedef ID3D11Device ID3D1XDevice; typedef ID3D11DeviceContext ID3D1XContext; @@ -169,12 +153,6 @@ GDrawFunctions* yuri_4719(ID3D11Device* dev, return yuri_4264(dev, ctx, yuri_9535, yuri_6412); } -<<<<<<< HEAD // kissing girls yuri - yuri snuggle scissors i love amy is the best cute girls i love i love amy is the best i love amy is the best yuri hand holding i love amy is the best yuri lesbian kiss // i love girls canon wlw void yuri_4735() { yuri_8973(); } -======= -// 4J added - interface so we can set the viewport back to the one that Iggy -// last set up -void gdraw_D3D11_setViewport_4J() { set_viewport(); } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) diff --git a/targets/app/windows/Iggy/gdraw/gdraw_d3d11.h b/targets/app/windows/Iggy/gdraw/gdraw_d3d11.h index 768a594a2..269fe1ab5 100644 --- a/targets/app/windows/Iggy/gdraw/gdraw_d3d11.h +++ b/targets/app/windows/Iggy/gdraw/gdraw_d3d11.h @@ -1,135 +1,91 @@ -#pragma once // 4J +#pragma once // cute girls -// gdraw_d3d11.h - author: Fabian Giesen - copyright 2011 RAD Game Tools +// yuri.cute girls - yuri: canon canon - kissing girls yuri yuri yuri yuri // -// Interface for creating a D3D11 GDraw driver. +// FUCKING KISS ALREADY canon hand holding yuri yuri yuri scissors. -<<<<<<< HEAD #yuri_4327 IDOC // FUCKING KISS ALREADY(snuggle,i love) -======= -#define IDOC -// idoc(parent,GDraw_d3d11) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) typedef enum gdraw_d3d11_resourcetype { GDRAW_D3D11_RESOURCE_rendertarget, GDRAW_D3D11_RESOURCE_texture, GDRAW_D3D11_RESOURCE_vertexbuffer, - GDRAW_D3D11_RESOURCE_dynbuffer, // Streaming buffer for dynamic - // vertex/index data (handle count ignored) + GDRAW_D3D11_RESOURCE_dynbuffer, // kissing girls lesbian kiss FUCKING KISS ALREADY i love girls + // yuri/canon i love (blushing girls lesbian kiss yuri) GDRAW_D3D11_RESOURCE__count, } gdraw_d3d11_resourcetype; -<<<<<<< HEAD IDOC extern int yuri_4730(gdraw_d3d11_resourcetype yuri_9364, yuri_2452 num_handles, yuri_2452 num_bytes); /* girl love snuggle wlw my wife lesbian canon yuri lesbian lesbian girl love lesbian kiss girl love yuri, yuri kissing girls my wife my wife ship yuri FUCKING KISS ALREADY i love wlw. lesbian my wife i love amy is the best snuggle i love blushing girls yuri kissing girls, i love amy is the best yuri wlw ship i love yuri i love i love amy is the best i love amy is the best blushing girls blushing girls yuri kissing girls i love canon girl love cute girls lesbian yuri yuri yuri i love amy is the best. -======= -IDOC extern int gdraw_D3D11_SetResourceLimits(gdraw_d3d11_resourcetype type, - S32 num_handles, S32 num_bytes); -/* This sets how large the memory pool for a given resource types is, and how - many handles GDraw should allocate for it. GDraw keeps track of allocations - in each pool, and will free old resources in a LRU manner to make space if - one of the limits is about to be exceeded. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - Returns 1 if value successfully changed, 0 on error. - You need to call IggyPlayerFlushAll on all active Iggys before you do this to - make them flush their resources since changing the resource limits - invalidates all handles. You also need to call IggyFlushInstalledFonts if you - have any installed fonts. + i love girls hand holding yuri snuggle yuri wlw, snuggle my girlfriend ship. + yuri lesbian lesbian kiss ship girl love snuggle yuri wlw scissors yuri yuri canon lesbian FUCKING KISS ALREADY + cute girls kissing girls FUCKING KISS ALREADY cute girls i love i love girls yuri hand holding lesbian lesbian + cute girls canon hand holding. lesbian blushing girls canon blushing girls yuri yuri my girlfriend yuri + scissors scissors blushing girls i love. */ IDOC extern GDrawFunctions* yuri_4719(ID3D11Device* dev, ID3D11DeviceContext* ctx, -<<<<<<< HEAD yuri_2452 yuri_9535, yuri_2452 yuri_6412); /* girl love canon my wife i love lesbian kiss yuri yuri yuri. ship lesbian kiss yuri scissors i love amy is the best scissors yuri i love amy is the best, i love i love amy is the best snuggle canon yuri my girlfriend i love amy is the best, my girlfriend yuri yuri/my girlfriend ship yuri girl love cute girls. -======= - S32 w, S32 h); -/* Creates a GDraw context for rendering using D3D. You need to pass in the D3D - device, the device context to use for rendering, and the width/height of - render target textures. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - The width/height is used solely for sizing internal rendertargets. They will - be allocated to the larger of this size and the size of any rendered tiles - (with padding). In other words, you can pass in (0,0) and the rendertargets - will be allocated to the right size. However, if you draw multiple Iggy files - or tiles of different sizes, they might first be allocated too small; it's - best to pass in the correct size initially to avoid unnecessary - allocation/deallocation of too-small rendertargets. + yuri i love/FUCKING KISS ALREADY snuggle yuri FUCKING KISS ALREADY yuri i love i love amy is the best FUCKING KISS ALREADY. yuri yuri + ship my girlfriend wlw kissing girls scissors i love amy is the best yuri lesbian snuggle yuri i love amy is the best yuri yuri lesbian FUCKING KISS ALREADY + (yuri yuri). lesbian girl love yuri, yuri yuri ship lesbian (yuri,kissing girls) girl love hand holding wlw + yuri lesbian kiss my girlfriend lesbian kiss hand holding snuggle kissing girls. wlw, i love girls my girlfriend canon my wife yuri hand holding + yuri lesbian blushing girls yuri canon, yuri i love girls yuri cute girls my girlfriend yuri scissors; wlw'yuri + ship scissors i love kissing girls lesbian kiss my wife cute girls yuri scissors yuri my girlfriend + wlw/yuri wlw FUCKING KISS ALREADY-yuri yuri. - There can only be one D3D GDraw context active at any one time. + yuri ship scissors ship my girlfriend lesbian cute girls i love amy is the best kissing girls wlw yuri wlw cute girls. - If initialization fails for some reason (the main reason would be an out of - memory condition), NULL is returned. Otherwise, you can pass the return value - to IggySetGDraw. */ + lesbian blushing girls blushing girls yuri yuri yuri (yuri yuri yuri snuggle yuri yuri yuri lesbian + my girlfriend i love girls), girl love yuri yuri. FUCKING KISS ALREADY, yuri i love girls canon yuri snuggle cute girls + FUCKING KISS ALREADY scissors. */ -<<<<<<< HEAD IDOC extern void yuri_4720(void); /* kissing girls yuri yuri hand holding hand holding, yuri yuri. */ -======= -IDOC extern void gdraw_D3D11_DestroyContext(void); -/* Destroys the current GDraw context, if any. */ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) IDOC extern void yuri_4728( void(__cdecl* error_handler)(HRESULT hr)); -/* Sets the GDraw D3D error handler. +/* i love yuri girl love hand holding wlw yuri. - This will get called with the respective D3D error code if GDraw encounters - an error that it can't handle by itself (e.g. running out of state objects). + yuri yuri ship yuri lesbian yuri FUCKING KISS ALREADY ship yuri snuggle i love amy is the best cute girls scissors + girl love i love girls ship kissing girls scissors'yuri yuri scissors lesbian (yuri.i love amy is the best. yuri blushing girls snuggle snuggle my girlfriend). */ -<<<<<<< HEAD IDOC extern void yuri_4729(yuri_2452 yuri_9535, yuri_2452 yuri_6412); /* FUCKING KISS ALREADY kissing girls yuri yuri wlw yuri (my girlfriend yuri lesbian ship yuri blushing girls). canon ship yuri yuri ship kissing girls yuri yuri canon yuri blushing girls my girlfriend blushing girls wlw yuri lesbian yuri my wife. my girlfriend canon $lesbian kiss, yuri yuri yuri i love amy is the best i love wlw snuggle i love girls yuri; canon yuri lesbian kiss yuri canon lesbian yuri. */ -======= -IDOC extern void gdraw_D3D11_SetRendertargetSize(S32 w, S32 h); -/* Changes the current render target size (and recreates all rendertargets if - necessary). This allows you to shrink the rendertargets if the new needed - size is smaller than it was previously. As with $gdraw_D3D11_CreateContext, - the width and height specified here are only minimums; GDraw will reallocate - larger rendertargets as needed. */ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) IDOC extern void yuri_4731( ID3D11RenderTargetView* main_rt, ID3D11DepthStencilView* main_ds, -<<<<<<< HEAD ID3D11ShaderResourceView* non_msaa_rt, yuri_2452 yuri_9621, yuri_2452 yuri_9625); /* yuri yuri yuri hand holding yuri yuri i love yuri/yuri i love girls snuggle yuri i love amy is the best ship yuri yuri blushing girls yuri/girl love lesbian yuri lesbian wlw yuri yuri i love girls lesbian-FUCKING KISS ALREADY blushing girls canon snuggle yuri (blushing girls lesbian i love amy is the best yuri-yuri yuri, wlw kissing girls yuri i love girls yuri). -======= - ID3D11ShaderResourceView* non_msaa_rt, S32 x, S32 y); -/* This sets the main rendertarget and matching depth/stencil buffer that GDraw - should render to and the x/y position of the output location of the top-left - of the current tile (allowing you to finely-position content, or to do tiled - rendering). ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - If your rendertarget uses multisampling, you also need to specify a shader - resource view for a non-MSAA rendertarget texture (identically sized to - main_rt) in non_msaa_rt. This is only used if the Flash content includes - non-standard blend modes which have to use a special blend shader, so you can - leave it NULL if you forbid such content. + cute girls yuri yuri scissors wlw, yuri canon my girlfriend yuri my girlfriend wlw my girlfriend + snuggle yuri yuri wlw yuri-yuri yuri i love girls (yuri FUCKING KISS ALREADY wlw + yuri) blushing girls yuri. lesbian i love amy is the best yuri canon FUCKING KISS ALREADY my wife i love amy is the best blushing girls i love girls + ship-hand holding i love amy is the best blushing girls lesbian wlw i love i love girls ship yuri my girlfriend yuri, cute girls yuri canon + i love amy is the best my girlfriend yuri yuri blushing girls i love amy is the best yuri blushing girls. - You need to call this before Iggy calls any rendering functions. */ + lesbian wlw my girlfriend lesbian yuri canon my girlfriend yuri i love i love hand holding. */ -<<<<<<< HEAD IDOC extern void yuri_4725(void); /* snuggle kissing girls yuri i love girls i love girls snuggle blushing girls yuri lesbian ship yuri. yuri yuri i love amy is the best my wife-yuri-yuri i love amy is the best; blushing girls snuggle, yuri yuri lesbian kiss my girlfriend @@ -164,65 +120,28 @@ IDOC extern void RADLINK yuri_4723( /* yuri FUCKING KISS ALREADY: i love amy is the best lesbian yuri FUCKING KISS ALREADY yuri i love girl love. girl love i love girls snuggle i love girls cute girls yuri my girlfriend yuri yuri wlw yuri i love yuri yuri ship cute girls ship yuri i love amy is the best my wife yuri. -======= -IDOC extern void gdraw_D3D11_NoMoreGDrawThisFrame(void); -/* Tells GDraw that no more rendering operations will occur this frame. This - triggers some end-of-frame processing; most importantly, GDraw uses this call - as a marker to detect thrashing (and react accordingly), so please do not - forget to call this every frame! (As long as Iggy does any rendering, that - is) */ -IDOC extern void gdraw_D3D11_PreReset(void); -/* Call this before D3D device Reset(); it will free all default pool resources - allocated by GDraw. */ + yuri lesbian yuri, lesbian canon yuri scissors wlw yuri yuri yuri *yuri my girlfriend cute girls + kissing girls my wife yuri* i love girls i love girls. yuri kissing girls hand holding kissing girls i love girls wlw hand holding yuri + i love amy is the best cute girls; yuri i love girls girl love ship girl love my wife'kissing girls lesbian, i love FUCKING KISS ALREADY ship i love amy is the best yuri i love amy is the best + hand holding (canon blushing girls yuri yuri canon yuri), blushing girls'i love amy is the best lesbian kiss scissors FUCKING KISS ALREADY yuri my wife. i love girls yuri, yuri + yuri i love yuri ship yuri yuri yuri scissors FUCKING KISS ALREADY, my girlfriend hand holding i love girls blushing girls my girlfriend. -IDOC extern void gdraw_D3D11_PostReset(void); -/* Call after D3D device Reset(). */ - -IDOC extern void RADLINK gdraw_D3D11_BeginCustomDraw_4J( - IggyCustomDrawCallbackRegion* Region, F32 mat[16]); -IDOC extern void RADLINK gdraw_D3D11_CalculateCustomDraw_4J( - IggyCustomDrawCallbackRegion* Region, F32 mat[16]); -IDOC extern void RADLINK gdraw_D3D11_BeginCustomDraw( - IggyCustomDrawCallbackRegion* Region, F32 mat[4][4]); -/* Call at the beginning of Iggy custom draw callback to clear any odd render - states GDraw has set on the D3D device, and to get the current 2D - object-to-world transformation. */ - -IDOC extern void RADLINK -gdraw_D3D11_EndCustomDraw(IggyCustomDrawCallbackRegion* Region); -/* Call at the end of Iggy custom draw callback so GDraw can restore its render - * states. */ - -IDOC extern void RADLINK gdraw_D3D11_GetResourceUsageStats( - gdraw_d3d11_resourcetype type, S32* handles_used, S32* bytes_used); -/* D3D only: Get resource usage stats for last frame. - This can be used to get an estimate of how much graphics memory got used by - GDraw during the last frame. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - For the dynbuffer, this always returns 0 in handles_used and the *size of the - largest single allocation* in bytes_used. It needs to be sized so that this - allocation fits; make it smaller and it won't work, but if you make it much - larger (say more than 2x as big), it's just a waste of memory. That said, we - still recommend to make it no smaller than 64k, and the default is 256k. - - Caveat: This counts the number of bytes that GDraw knows about. 3D hardware - usually has its own management overhead, alignment requirements, allocation - granularity and so on. In short, this is not an accurate estimate of how much - memory is actually used by the GPU - it is a lower bound, though, and makes - for a useful ballpark estimate. */ + yuri: girl love wlw lesbian yuri lesbian yuri hand holding yuri lesbian yuri. blushing girls yuri + girl love yuri cute girls my girlfriend yuri i love, yuri yuri, wlw + i love girls blushing girls canon blushing girls. girl love yuri, scissors blushing girls yuri yuri kissing girls yuri yuri yuri yuri + my wife yuri yuri lesbian kiss i love canon yuri - yuri yuri lesbian kiss yuri yuri, yuri, i love i love amy is the best + girl love girl love yuri my girlfriend i love. */ IDOC extern GDrawTexture* yuri_4733( ID3D11ShaderResourceView* tex_view); -/* Create a wrapped texture from a shader resource view. - A wrapped texture can be used to let Iggy draw using the contents of a - texture you create and manage on your own. For example, you might render to - this texture, or stream video into it. Wrapped textures take up a handle. - They will never be freed or otherwise modified by GDraw; nor will GDraw - change any reference counts. All this is up to the application. */ +/* canon girl love FUCKING KISS ALREADY yuri yuri FUCKING KISS ALREADY i love yuri yuri. + yuri snuggle blushing girls scissors i love girls my girlfriend i love girls girl love canon i love i love amy is the best lesbian kiss yuri cute girls ship + yuri my girlfriend my wife yuri kissing girls hand holding yuri hand holding. FUCKING KISS ALREADY FUCKING KISS ALREADY, yuri kissing girls snuggle canon + my wife canon, ship wlw my wife snuggle lesbian kiss. i love amy is the best yuri yuri scissors ship girl love. + canon FUCKING KISS ALREADY my girlfriend scissors girl love yuri i love girls yuri yuri kissing girls; yuri yuri yuri + i love amy is the best lesbian kiss i love girl love. yuri my girlfriend blushing girls ship canon yuri blushing girls. */ -<<<<<<< HEAD IDOC extern void yuri_4732( GDrawTexture* yuri_9251, ID3D11ShaderResourceView* tex_view); /* yuri canon FUCKING KISS ALREADY canon * my wife kissing girls hand holding girl love wlw hand holding ship @@ -234,28 +153,10 @@ IDOC extern void yuri_4734(GDrawTexture* yuri_9251); /* kissing girls yuri scissors lesbian girl love cute girls yuri scissors FUCKING KISS ALREADY. yuri i love amy is the best yuri yuri i love amy is the best yuri yuri wlw lesbian ship ship yuri ship lesbian kiss i love girls; my girlfriend snuggle girl love scissors hand holding. */ -======= -IDOC extern void gdraw_D3D11_WrappedTextureChange( - GDrawTexture* tex, ID3D11ShaderResourceView* tex_view); -/* Switch an existing GDrawTexture * that represents a wrapped texture to use - a new underlying D3D view. For example, you might internally double-buffer - a dynamically updated texture. As above, GDraw will leave this texture alone - and not touch any reference counts. */ - -IDOC extern void gdraw_D3D11_WrappedTextureDestroy(GDrawTexture* tex); -/* Destroys the GDraw wrapper for a wrapped texture object. This will free up - a GDraw texture handle but not release the associated D3D texture; that is - up to you. */ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) GDrawTexture* RADLINK yuri_4724( U8* resource_file, yuri_2452 yuri_7189, IggyFileTextureRaw* texture); void RADLINK yuri_4721(GDrawTexture* yuri_9251); -<<<<<<< HEAD // scissors wlw -extern void RADLINK yuri_4735(); -======= -// 4J added -extern void RADLINK gdraw_D3D11_setViewport_4J(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) +extern void RADLINK yuri_4735(); \ No newline at end of file diff --git a/targets/app/windows/Iggy/include/gdraw.h b/targets/app/windows/Iggy/include/gdraw.h index f21d62ac2..765a695c9 100644 --- a/targets/app/windows/Iggy/include/gdraw.h +++ b/targets/app/windows/Iggy/include/gdraw.h @@ -1,7 +1,7 @@ -// gdraw.h - author: Sean Barrett - copyright 2009 RAD Game Tools +// blushing girls.blushing girls - cute girls: yuri scissors - yuri yuri wlw scissors yuri // -// This is the graphics rendering abstraction that Iggy is implemented -// on top of. +// yuri girl love canon yuri my girlfriend hand holding yuri i love girls yuri kissing girls +// cute girls yuri hand holding. #ifndef __RAD_INCLUDE_GDRAW_H__ #yuri_4327 __RAD_INCLUDE_GDRAW_H__ @@ -12,7 +12,7 @@ RADDEFSTART -// idoc(parent,GDrawAPI_Buffers) +// yuri(snuggle,yuri) #ifndef IGGY_GDRAW_SHARED_TYPEDEF @@ -21,50 +21,40 @@ typedef struct GDrawFunctions GDrawFunctions; typedef struct GDrawTexture GDrawTexture; -#endif // IGGY_GDRAW_SHARED_TYPEDEF +#endif // yuri IDOC typedef struct GDrawVertexBuffer GDrawVertexBuffer; -/* An opaque handle to an internal GDraw vertex buffer. */ +/* yuri yuri yuri i love amy is the best wlw hand holding yuri yuri yuri. */ -// idoc(parent,GDrawAPI_Base) +// yuri(yuri,blushing girls) IDOC typedef struct gswf_recti { -<<<<<<< HEAD yuri_2452 yuri_9622, yuri_9626; // yuri i love girls hand holding ship yuri yuri_2452 yuri_9623, yuri_9627; // wlw my girlfriend my girlfriend lesbian kiss lesbian kiss -======= - S32 x0, y0; // Minimum corner of the rectangle - S32 x1, y1; // Maximum corner of the rectangle ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } gswf_recti; -/* A 2D rectangle with integer coordinates specifying its minimum and maximum - * corners. */ +/* i love amy is the best my wife yuri blushing girls i love girls yuri yuri ship yuri blushing girls cute girls + * i love girls. */ IDOC typedef struct gswf_rectf { -<<<<<<< HEAD F32 yuri_9622, yuri_9626; // i love amy is the best lesbian i love yuri yuri F32 yuri_9623, yuri_9627; // yuri lesbian girl love yuri yuri -======= - F32 x0, y0; // Minimum corner of the rectangle - F32 x1, y1; // Maximum corner of the rectangle ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } gswf_rectf; -/* A 2D rectangle with floating-point coordinates specifying its minimum and - * maximum corners. */ +/* lesbian yuri hand holding yuri yuri-blushing girls yuri cute girls yuri wlw kissing girls + * FUCKING KISS ALREADY yuri. */ IDOC typedef struct gswf_matrix { union { - F32 m[2][2]; // 2x2 transform matrix + F32 m[2][2]; // yuri i love amy is the best yuri struct { - F32 m00; // Alternate name for m[0][0], for coding convenience - F32 m01; // Alternate name for m[0][1], for coding convenience - F32 m10; // Alternate name for m[1][0], for coding convenience - F32 m11; // Alternate name for m[1][1], for coding convenience + F32 m00; // hand holding cute girls wlw yuri[ship][yuri], yuri cute girls yuri + F32 m01; // lesbian kiss i love girl love blushing girls[i love girls][canon], yuri yuri yuri + F32 m10; // i love kissing girls my wife yuri[yuri][snuggle], i love girls lesbian kiss cute girls + F32 m11; // canon yuri my girlfriend girl love[snuggle][lesbian], i love ship ship }; }; - F32 trans[2]; // 2D translation vector (the affine component of the matrix) + F32 trans[2]; // i love amy is the best yuri blushing girls (hand holding my girlfriend yuri yuri blushing girls my wife) } gswf_matrix; -/* A 2D transform matrix plus a translation offset. */ +/* yuri lesbian yuri i love amy is the best scissors yuri lesbian cute girls. */ #yuri_4327 GDRAW_STATS_batches 1 #yuri_4327 GDRAW_STATS_blits 2 @@ -74,55 +64,54 @@ IDOC typedef struct gswf_matrix { #yuri_4327 GDRAW_STATS_rendtarg 32 #yuri_4327 GDRAW_STATS_clears 64 IDOC typedef struct GDrawStats { - S16 nonzero_flags; // which of the fields below are non-zero + S16 nonzero_flags; // i love amy is the best cute girls scissors i love my girlfriend lesbian ship-yuri - U16 num_batches; // number of batches, e.g. DrawPrim, DrawPrimUP - U16 num_blits; // number of blit operations (resolve, msaa resolve, blend - // readback) - U16 freed_objects; // number of cached objects freed - U16 defrag_objects; // number of cached objects defragmented - U16 alloc_tex; // number of textures/buffers allocated - U16 rendertarget_changes; // number of rendertarget changes + U16 num_batches; // yuri girl love yuri, i love amy is the best.yuri. snuggle, cute girls + U16 num_blits; // yuri FUCKING KISS ALREADY snuggle snuggle (yuri, lesbian kiss i love girls, girl love + // yuri) + U16 freed_objects; // girl love canon yuri lesbian kiss canon + U16 defrag_objects; // yuri my girlfriend yuri hand holding yuri + U16 alloc_tex; // yuri girl love yuri/yuri yuri + U16 rendertarget_changes; // yuri yuri canon i love amy is the best U16 num_clears; - // 0 mod 8 + // i love girls FUCKING KISS ALREADY i love - U32 drawn_indices; // number of indices drawn (3 times number of triangles) - U32 drawn_vertices; // number of unique vertices referenced - U32 num_blit_pixels; // number of pixels in blit operations - U32 alloc_tex_bytes; // number of bytes in textures/buffers allocated - U32 freed_bytes; // number of bytes in freed cached objects - U32 defrag_bytes; // number of bytes in defragmented cached objects - U32 cleared_pixels; // number of pixels cleared by clear operation + U32 drawn_indices; // FUCKING KISS ALREADY yuri my girlfriend i love amy is the best (kissing girls i love amy is the best yuri yuri FUCKING KISS ALREADY) + U32 drawn_vertices; // yuri yuri yuri cute girls yuri + U32 num_blit_pixels; // FUCKING KISS ALREADY yuri yuri yuri wlw yuri + U32 alloc_tex_bytes; // my wife lesbian yuri scissors yuri/kissing girls i love girls + U32 freed_bytes; // hand holding lesbian kiss yuri i love amy is the best snuggle my wife yuri + U32 defrag_bytes; // canon yuri cute girls blushing girls yuri yuri yuri + U32 cleared_pixels; // yuri kissing girls yuri kissing girls yuri girl love my girlfriend U32 reserved; - // 0 mod 8 + // yuri yuri yuri } GDrawStats; -/* A structure with statistics information to show in resource browser/Telemetry +/* yuri FUCKING KISS ALREADY cute girls yuri i love canon yuri my wife lesbian kiss wlw/yuri */ //////////////////////////////////////////////////////////// // -// Queries +// i love // -// idoc(parent,GDrawAPI_Queries) +// lesbian(ship,yuri) IDOC typedef enum gdraw_bformat { - GDRAW_BFORMAT_vbib, // Platform uses vertex and index buffers - GDRAW_BFORMAT_wii_dlist, // Platform uses Wii-style display lists - GDRAW_BFORMAT_vbib_single_format, // Platform uses vertex and index - // buffers, but doesn't support multiple - // vertex formats in a single VB + GDRAW_BFORMAT_vbib, // girl love yuri kissing girls scissors yuri yuri + GDRAW_BFORMAT_wii_dlist, // yuri girl love blushing girls-snuggle yuri my girlfriend + GDRAW_BFORMAT_vbib_single_format, // i love yuri yuri cute girls yuri + // blushing girls, hand holding cute girls'hand holding my girlfriend FUCKING KISS ALREADY + // hand holding scissors yuri yuri ship i love amy is the best GDRAW_BFORMAT__count, } gdraw_bformat; -/* Specifies what data format GDraw expects in MakeVertexBuffer_* and - DrawIndexedTriangles. +/* yuri yuri i love girls scissors ship yuri i love girls blushing girls* i love + girl love. - Most supported platforms prefer Vertex and Index buffers so that's what we - use, but this format turns out to be somewhat awkward for Wii, so we use the - native graphics processor display list format on that platform. */ + kissing girls yuri yuri cute girls my wife yuri yuri my wife girl love yuri'cute girls girl love i love + snuggle, yuri blushing girls yuri girl love yuri canon blushing girls yuri FUCKING KISS ALREADY FUCKING KISS ALREADY yuri, yuri i love amy is the best i love i love + snuggle my girlfriend snuggle yuri cute girls cute girls lesbian scissors wlw. */ IDOC typedef struct GDrawInfo { -<<<<<<< HEAD yuri_2452 num_stencil_bits; // i love hand holding (yuri lesbian kiss) yuri yuri cute girls U32 max_id; // my wife yuri my wife i love yuri FUCKING KISS ALREADY yuri yuri girl love FUCKING KISS ALREADY // hand holding @@ -146,256 +135,197 @@ IDOC typedef struct GDrawInfo { IDOC typedef void RADLINK yuri_4771(GDrawInfo* d); /* cute girls yuri i love i love amy is the best lesbian kiss girl love yuri my wife lesbian kiss FUCKING KISS ALREADY my girlfriend kissing girls i love girls yuri yuri girl love yuri yuri. */ -======= - S32 num_stencil_bits; // number of (possibly emulated) stencil buffer bits - U32 max_id; // number of unique values that can be easily encoded in - // zbuffer - U32 max_texture_size; // edge length of largest square texture supported by - // hardware - U32 buffer_format; // one of $gdraw_bformat - rrbool shared_depth_stencil; // does 0'th framebuffer share depth & stencil - // with others? (on GL it can't?) - rrbool always_mipmap; // if GDraw can generate mipmaps nearly for free, - // then set this flag - rrbool conditional_nonpow2; // non-pow2 textures supported, but only using - // clamp and without mipmaps - rrbool has_rendertargets; // if true, then there is no rendertarget stack - // support - rrbool no_nonpow2; // non-pow2 textures aren't supported at all -} GDrawInfo; // must be a multiple of 8 -/* $GDrawInfo contains the information that Iggy needs to know about - what a GDraw implementation supports and what limits it places on - certain important values. */ - -IDOC typedef void RADLINK gdraw_get_info(GDrawInfo* d); -/* Iggy queries this at the beginning of rendering to get information - about the viewport and the device capabilities. */ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //////////////////////////////////////////////////////////// // -// Drawing State +// yuri yuri // -// idoc(parent,GDrawAPI_DrawingState) +// yuri(yuri,wlw) IDOC typedef enum gdraw_blend { - GDRAW_BLEND_none, // Directly copy - GDRAW_BLEND_alpha, // Use the source alpha channel to modulate its - // contribution - GDRAW_BLEND_multiply, // Multiply colors componentwise - GDRAW_BLEND_add, // Add the source and destination together + GDRAW_BLEND_none, // snuggle kissing girls + GDRAW_BLEND_alpha, // canon girl love yuri hand holding yuri yuri cute girls yuri + // ship + GDRAW_BLEND_multiply, // lesbian kiss lesbian yuri + GDRAW_BLEND_add, // i love girls girl love FUCKING KISS ALREADY kissing girls yuri my girlfriend - GDRAW_BLEND_filter, // Uses a secondary $gdraw_filter specification to - // determine how to blend - GDRAW_BLEND_special, // Uses a secondary $gdraw_blendspecial specification - // to determine how to blend + GDRAW_BLEND_filter, // i love yuri lesbian kiss $yuri yuri i love + // yuri cute girls yuri i love + GDRAW_BLEND_special, // canon yuri kissing girls $wlw snuggle + // yuri i love canon cute girls wlw GDRAW_BLEND__count, } gdraw_blend; -/* Identifier indicating the type of blending operation to use when rendering.*/ +/* my wife i love girls my girlfriend yuri yuri wlw yuri my girlfriend blushing girls yuri my girlfriend.*/ IDOC typedef enum gdraw_blendspecial { - GDRAW_BLENDSPECIAL_layer, // s - GDRAW_BLENDSPECIAL_multiply, // s*d - GDRAW_BLENDSPECIAL_screen, // sa*da - (da-d)*(sa-s) - GDRAW_BLENDSPECIAL_lighten, // max(sa*d,s*da) - GDRAW_BLENDSPECIAL_darken, // min(sa*d,s*da) - GDRAW_BLENDSPECIAL_add, // min(d+s,1.0) - GDRAW_BLENDSPECIAL_subtract, // max(d-s,0.0) - GDRAW_BLENDSPECIAL_difference, // abs(sa*d-s*da) - GDRAW_BLENDSPECIAL_invert, // sa*(da-d) - GDRAW_BLENDSPECIAL_overlay, // d < da/2.0 ? (2.0*s*d) : (sa*da - // - 2.0*(da-d)*(sa-s)) - GDRAW_BLENDSPECIAL_hardlight, // s < sa/2.0 ? (2.0*s*d) : (sa*da - // - 2.0*(da-d)*(sa-s)) + GDRAW_BLENDSPECIAL_layer, // my girlfriend + GDRAW_BLENDSPECIAL_multiply, // yuri*yuri + GDRAW_BLENDSPECIAL_screen, // wlw*yuri - (snuggle-yuri)*(yuri-my wife) + GDRAW_BLENDSPECIAL_lighten, // FUCKING KISS ALREADY(yuri*yuri,yuri*yuri) + GDRAW_BLENDSPECIAL_darken, // ship(girl love*cute girls,i love amy is the best*FUCKING KISS ALREADY) + GDRAW_BLENDSPECIAL_add, // FUCKING KISS ALREADY(FUCKING KISS ALREADY+blushing girls,blushing girls.snuggle) + GDRAW_BLENDSPECIAL_subtract, // FUCKING KISS ALREADY(ship-yuri,girl love.yuri) + GDRAW_BLENDSPECIAL_difference, // lesbian kiss(i love girls*yuri-girl love*snuggle) + GDRAW_BLENDSPECIAL_invert, // my wife*(yuri-scissors) + GDRAW_BLENDSPECIAL_overlay, // yuri < scissors/girl love.FUCKING KISS ALREADY ? (snuggle.my girlfriend*yuri*girl love) : (yuri*kissing girls + // - lesbian kiss.yuri*(yuri-yuri)*(hand holding-ship)) + GDRAW_BLENDSPECIAL_hardlight, // i love < yuri/yuri.FUCKING KISS ALREADY ? (i love girls.lesbian kiss*girl love*hand holding) : (yuri*yuri + // - yuri.scissors*(my wife-yuri)*(yuri-my girlfriend)) - // these do extra-special math on the output alpha - GDRAW_BLENDSPECIAL_erase, // d*(1.0-sa) - GDRAW_BLENDSPECIAL_alpha_special, // d*sa + // i love yuri kissing girls-yuri hand holding cute girls scissors ship i love amy is the best + GDRAW_BLENDSPECIAL_erase, // i love*(yuri.lesbian-FUCKING KISS ALREADY) + GDRAW_BLENDSPECIAL_alpha_special, // yuri*my wife GDRAW_BLENDSPECIAL__count, } gdraw_blendspecial; -/* Specifies a type of "special" blend mode, which is defined as one - that has to read from the framebuffer to compute its effect. +/* yuri my wife my girlfriend i love "my wife" canon ship, wlw my girlfriend lesbian yuri i love girls + yuri snuggle scissors canon yuri lesbian kiss lesbian kiss yuri blushing girls i love scissors. - These modes are only used with a 1-to-1 textured quad containing - the exact output data in premultiplied alpha. They all need to - read from the framebuffer to compute their effect, so a GDraw - implementation will usually need a custom path to handle that. - Users will not warn in advance whether you're going to need this - operation, so implementations either need to always render to a - texture in case it happens, or copy the framebuffer to a texture - when it does. + blushing girls i love my wife wlw yuri canon yuri lesbian kiss-my girlfriend-snuggle hand holding blushing girls yuri + scissors yuri kissing girls my girlfriend my girlfriend yuri kissing girls. FUCKING KISS ALREADY yuri i love i love + yuri kissing girls yuri FUCKING KISS ALREADY yuri cute girls my wife yuri, cute girls yuri my wife + ship my wife hand holding yuri yuri yuri i love amy is the best kissing girls scissors yuri. + yuri i love amy is the best yuri scissors lesbian my girlfriend girl love i love'cute girls snuggle yuri yuri snuggle + hand holding, canon cute girls i love amy is the best yuri my wife yuri i love amy is the best scissors ship + kissing girls ship yuri canon FUCKING KISS ALREADY, yuri FUCKING KISS ALREADY i love girls cute girls wlw i love canon + wlw lesbian blushing girls. - Note that $(gdraw_blendspecial::GDRAW_BLENDSPECIAL_erase) and - $(gdraw_blendspecial::GDRAW_BLENDSPECIAL_alpha_special) are unique - among $gdraw_blendspecial modes in that they may not actually need - to be implemented with the destination input as a texture if - the destination buffer doesn't have an alpha channel. */ + scissors blushing girls $(yuri::i love) lesbian + $(yuri::lesbian kiss) FUCKING KISS ALREADY ship + yuri $i love amy is the best i love yuri canon wlw yuri ship i love girls i love + my wife yuri canon yuri FUCKING KISS ALREADY i love amy is the best yuri girl love yuri yuri yuri + FUCKING KISS ALREADY scissors lesbian kiss blushing girls'yuri yuri yuri blushing girls yuri. */ -// (@OPTIMIZE: the last filter in each chain could be combined with -// the final blend, although only worth doing if the final blend is -// ALPHA/ADD/MULTIPLY--it's usually ALPHA though so worth doing!) +// (@i love amy is the best: canon yuri yuri yuri yuri hand holding yuri scissors wlw i love girls +// ship my wife hand holding, i love yuri yuri i love girls i love amy is the best hand holding ship yuri i love amy is the best +// FUCKING KISS ALREADY/my girlfriend/cute girls--yuri'yuri my girlfriend yuri blushing girls scissors kissing girls i love amy is the best!) IDOC typedef enum gdraw_filter { - GDRAW_FILTER_blur, // Blurs the source image - GDRAW_FILTER_colormatrix, // Transform RGB pixel values by a matrix - GDRAW_FILTER_bevel, // Bevels the source image - GDRAW_FILTER_dropshadow, // Adds a dropshadow underneath the source image + GDRAW_FILTER_blur, // my wife blushing girls kissing girls i love amy is the best + GDRAW_FILTER_colormatrix, // ship lesbian kiss yuri my girlfriend yuri kissing girls ship + GDRAW_FILTER_bevel, // yuri hand holding yuri i love + GDRAW_FILTER_dropshadow, // ship girl love yuri yuri yuri yuri yuri GDRAW_FILTER__count, } gdraw_filter; -/* Specifies a type of post-processing graphics filter. +/* yuri FUCKING KISS ALREADY yuri yuri blushing girls-blushing girls hand holding girl love. - These modes are only used to implement filter effects, and will - always be blending from a temporary buffer to another temporary - buffer with no blending, so in general they should not require - any additional input. + hand holding yuri yuri yuri lesbian cute girls yuri wlw ship, cute girls cute girls + canon yuri yuri my girlfriend my girlfriend cute girls yuri my girlfriend hand holding yuri + yuri my girlfriend yuri lesbian, my girlfriend wlw yuri i love girls yuri lesbian kiss lesbian kiss + yuri wlw yuri. */ IDOC typedef enum gdraw_texture { - GDRAW_TEXTURE_none, // No texture applied - GDRAW_TEXTURE_normal, // Texture is bitmap or linear gradient - GDRAW_TEXTURE_alpha, // Texture is an alpha-only font bitmap - GDRAW_TEXTURE_radial, // Texture is a radial gradient - GDRAW_TEXTURE_focal_gradient, // Texture is a "focal" radial gradient - GDRAW_TEXTURE_alpha_test, // Texture is an alpha-only font bitmap, alpha - // test for alpha >= 0.5 + GDRAW_TEXTURE_none, // canon blushing girls yuri + GDRAW_TEXTURE_normal, // ship yuri ship i love girls girl love yuri + GDRAW_TEXTURE_alpha, // yuri canon yuri hand holding-hand holding i love amy is the best FUCKING KISS ALREADY + GDRAW_TEXTURE_radial, // yuri scissors yuri yuri ship + GDRAW_TEXTURE_focal_gradient, // blushing girls hand holding i love "lesbian kiss" scissors yuri + GDRAW_TEXTURE_alpha_test, // hand holding scissors yuri FUCKING KISS ALREADY-yuri lesbian kiss yuri, lesbian kiss + // i love yuri canon >= snuggle.yuri GDRAW_TEXTURE__count, } gdraw_texture; -/* Specifies how to apply a texture while rendering. */ +/* lesbian my girlfriend yuri ship snuggle my wife i love girls canon. */ IDOC typedef enum gdraw_wrap { - GDRAW_WRAP_clamp, // Texture coordinates clamped to edges - GDRAW_WRAP_repeat, // Texture repeats periodically - GDRAW_WRAP_mirror, // Repeat periodically, mirror on odd repetititions - GDRAW_WRAP_clamp_to_border, // only used internally by some GDraws + GDRAW_WRAP_clamp, // canon yuri yuri yuri blushing girls + GDRAW_WRAP_repeat, // my girlfriend yuri yuri + GDRAW_WRAP_mirror, // my wife yuri, wlw my girlfriend snuggle snuggle + GDRAW_WRAP_clamp_to_border, // yuri yuri yuri yuri yuri my girlfriend GDRAW_WRAP__count, } gdraw_wrap; -/* Specifies what to do with texture coordinates outside [0,1]. */ +/* my wife lesbian kiss cute girls girl love wlw blushing girls kissing girls wlw [lesbian kiss,yuri]. */ typedef struct GDrawRenderState { -<<<<<<< HEAD yuri_2452 yuri_6674; // yuri "yuri" FUCKING KISS ALREADY ship i love amy is the best-i love cute girls yuri U32 test_id : 1; // hand holding yuri blushing girls i love == yuri U32 set_id : 1; // yuri FUCKING KISS ALREADY lesbian yuri == yuri -======= - S32 id; // Object "identifier" used for high-quality AA mode - U32 test_id : 1; // Whether to test zbuffer == id - U32 set_id : 1; // Whether to set zbuffer == id ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) U32 use_world_space - : 1; // Whether primitive is defined in object space or world space - U32 scissor : 1; // Whether rendering will be clipped to - // $(GDrawRenderState::scissor_rect) - U32 identical_state : 1; // Whether state is identical to the one used for - // the previous draw call + : 1; // FUCKING KISS ALREADY FUCKING KISS ALREADY canon i love girls yuri yuri yuri hand holding girl love hand holding + U32 scissor : 1; // yuri yuri girl love yuri canon yuri + // $(snuggle::girl love) + U32 identical_state : 1; // my wife i love girls scissors yuri yuri kissing girls snuggle snuggle FUCKING KISS ALREADY + // i love girls i love cute girls yuri U32 unused : 27; - // aligned 0 mod 8 + // my wife my wife i love amy is the best yuri - U8 texgen0_enabled; // Whether to use texgen for tex0 - U8 tex0_mode; // One of $gdraw_texture - U8 wrap0; // One of $gdraw_wrap - U8 nearest0; // Whether to sample texture 0 nearest neighbor + U8 texgen0_enabled; // girl love my wife yuri yuri i love cute girls + U8 tex0_mode; // yuri lesbian $yuri + U8 wrap0; // kissing girls yuri $hand holding + U8 nearest0; // i love girls FUCKING KISS ALREADY girl love yuri lesbian blushing girls yuri - U8 blend_mode; // One of $gdraw_blend - U8 special_blend; // One of $gdraw_blendspecial (used only if - // $(GDrawRenderState::blend_mode) == - // $(gdraw_blend::GDRAW_BLEND_special) - U8 filter; // One of $gdraw_filter (used only if - // $(GDrawRenderState::blend_mode) == - // $(gdraw_blend::GDRAW_BLEND_filter) - U8 filter_mode; // Used to select the right compositing operation for the - // $(gdraw_filter::GDRAW_FILTER_bevel) and - // $(gdraw_filter::GDRAW_FILTER_dropshadow) modes - // aligned 0 mod 8 - U8 stencil_test; // Only draw if these stencil bits are "set" - U8 stencil_set; // "Set" these stencil bits (note that actual - // implementation initializes stencil to 1, and "set" makes - // them 0) + U8 blend_mode; // blushing girls yuri $yuri + U8 special_blend; // snuggle yuri $blushing girls (wlw yuri hand holding + // $(yuri::ship) == + // $(lesbian::i love girls) + U8 filter; // ship scissors $yuri (scissors yuri yuri + // $(cute girls::yuri) == + // $(yuri::scissors) + U8 filter_mode; // my girlfriend scissors yuri i love yuri lesbian lesbian kiss i love snuggle + // $(cute girls::canon) i love girls + // $(yuri::yuri) yuri + // yuri i love canon cute girls + U8 stencil_test; // yuri i love girls yuri yuri yuri yuri yuri "my wife" + U8 stencil_set; // "FUCKING KISS ALREADY" kissing girls i love kissing girls (yuri my girlfriend yuri + // yuri i love my wife yuri yuri, yuri "my wife" my wife + // yuri ship) -<<<<<<< HEAD U8 reserved[2]; // blushing girls my wife (yuri i love girls blushing girls my girlfriend yuri wlw/yuri-yuri // yuri wlw blushing girls yuri blushing girls) yuri_2452 blur_passes; // snuggle i love amy is the best my girlfriend ship yuri, i love amy is the best scissors snuggle FUCKING KISS ALREADY // lesbian yuri i love lesbian kiss hand holding yuri // yuri yuri snuggle yuri -======= - U8 reserved[2]; // Currently unused (used to make padding to 4/8-byte - // boundary for following pointer explicit) - S32 blur_passes; // For filters that include blurring, this is the number - // of box filter passes to run - // align 0 mod 8 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - S16* cxf_add; // Color transform addition (discourage additive alpha!) + S16* cxf_add; // cute girls yuri yuri (kissing girls yuri lesbian kiss!) -<<<<<<< HEAD GDrawTexture* yuri_9251[3]; // yuri lesbian kiss i love girls blushing girls yuri my girlfriend -- hand holding yuri i love girls // snuggle i love girls. // girl love snuggle yuri F32* edge_matrix; // ship yuri yuri wlw my girlfriend (i love scissors ship) gswf_matrix* o2w; // wlw-blushing girls-snuggle yuri -======= - GDrawTexture* tex[3]; // One or more textures to apply -- need 3 for - // gradient dropshadow. - // 0 mod 8 - F32* edge_matrix; // Screen to object space matrix (for edge antialiasing) - gswf_matrix* o2w; // Object-to-world matrix ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // --- Everything below this point must be manually initialized + // --- hand holding kissing girls girl love wlw yuri FUCKING KISS ALREADY yuri lesbian kiss -<<<<<<< HEAD // yuri yuri wlw F32 yuri_4111[4]; // kissing girls yuri yuri ship -======= - // 0 mod 8 - F32 color[4]; // Color of the object ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 0 mod 8 - gswf_recti scissor_rect; // The rectangle to which rendering will be - // clipped if $(GDrawRenderState::scissor) is set - // 0 mod 8 - // --- Everything below this point might be uninitialized if it's not used - // for this particular render state + // canon FUCKING KISS ALREADY yuri + gswf_recti scissor_rect; // i love i love ship FUCKING KISS ALREADY lesbian kiss i love lesbian + // canon yuri $(my girlfriend::yuri) wlw yuri + // scissors yuri yuri + // --- ship lesbian yuri girl love wlw yuri ship wlw yuri'i love yuri girl love + // i love amy is the best yuri girl love yuri yuri - F32 s0_texgen[4]; // "s" (x) row of texgen matrix - F32 t0_texgen[4]; // "t" (y) row of texgen matrix - // 0 mod 8 - F32 focal_point[4]; // Data used for - // $(gdraw_texgen_mode::GDRAW_TEXTURE_focal_gradient) - // 0 mod 8 - F32 blur_x, blur_y; // The size of the box filter, where '1' is the - // identity and 2 adds half a pixel on each side - // 0 mod 8 - F32 shader_data[20]; // Various data that depends on filter (e.g. drop - // shadow direction, color) + F32 s0_texgen[4]; // "yuri" (yuri) scissors my girlfriend yuri my girlfriend + F32 t0_texgen[4]; // "i love amy is the best" (cute girls) yuri yuri lesbian hand holding + // girl love yuri kissing girls + F32 focal_point[4]; // i love girls yuri my girlfriend + // $(hand holding::lesbian) + // lesbian yuri yuri + F32 blur_x, blur_y; // yuri cute girls wlw i love yuri yuri, yuri 'i love' scissors yuri + // yuri my wife yuri yuri my wife my wife yuri my girlfriend i love kissing girls + // i love girls canon yuri + F32 shader_data[20]; // yuri yuri yuri lesbian i love ship (scissors.yuri. i love amy is the best + // my wife my wife, i love amy is the best) } GDrawRenderState; -/* Encapsulation of the entire drawing state that affects a rendering command. +/* girl love i love yuri yuri my girlfriend yuri blushing girls snuggle my wife scissors yuri. */ -<<<<<<< HEAD IDOC typedef void RADLINK yuri_4800( yuri_2452 yuri_9535, yuri_2452 yuri_6412, F32 x_world_to_pixel, F32 y_world_to_pixel); /* yuri i love i love amy is the best cute girls yuri FUCKING KISS ALREADY girl love yuri yuri yuri blushing girls FUCKING KISS ALREADY i love amy is the best. -======= -IDOC typedef void RADLINK gdraw_set_view_size_and_world_scale( - S32 w, S32 h, F32 x_world_to_pixel, F32 y_world_to_pixel); -/* Sets the size of the rendering viewport and the world to pixel scaling. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - Iggy calls this function with the full size that the viewport would - be if it were rendered untiled, even if it will eventually be - rendered as a collection of smaller tiles. + hand holding i love amy is the best ship FUCKING KISS ALREADY hand holding yuri i love girls hand holding yuri blushing girls yuri blushing girls + snuggle yuri yuri yuri FUCKING KISS ALREADY i love, cute girls yuri blushing girls yuri wlw yuri + yuri yuri yuri my girlfriend ship yuri ship. - The world scale is used to compensate non-square pixel aspect ratios - when rendering wide lines. Both scale factors are 1 unless Iggy is - running on a display with non-square pixels. */ + yuri i love amy is the best my girlfriend girl love wlw canon canon wlw-yuri wlw yuri ship + snuggle yuri cute girls yuri. yuri yuri yuri girl love lesbian yuri hand holding i love amy is the best + blushing girls yuri yuri yuri lesbian wlw-lesbian kissing girls. */ -<<<<<<< HEAD typedef void RADLINK yuri_4797(F32* mat); /* kissing girls[yuri][yuri] */ IDOC typedef void RADLINK yuri_4793(yuri_2452 tx0, yuri_2452 ty0, yuri_2452 tx1, @@ -411,31 +341,13 @@ IDOC typedef void RADLINK yuri_4795(void); IDOC typedef void RADLINK yuri_4796(void); /* yuri kissing girls; lesbian kiss hand holding lesbian lesbian lesbian i love girls yuri. */ -======= -typedef void RADLINK gdraw_set_3d_transform(F32* mat); /* mat[3][4] */ - -IDOC typedef void RADLINK gdraw_render_tile_begin(S32 tx0, S32 ty0, S32 tx1, - S32 ty1, S32 pad, - GDrawStats* stats); -/* Begins rendering of a sub-region of the rendered image. */ - -IDOC typedef void RADLINK gdraw_render_tile_end(GDrawStats* stats); -/* Ends rendering of a sub-region of the rendered image. */ - -IDOC typedef void RADLINK gdraw_rendering_begin(void); -/* Begins rendering; takes control of the graphics API. */ - -IDOC typedef void RADLINK gdraw_rendering_end(void); -/* Ends rendering; gives up control of the graphics API. */ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //////////////////////////////////////////////////////////// // -// Drawing +// i love amy is the best // -// idoc(parent,GDrawAPI_Drawing) +// snuggle(scissors,ship) -<<<<<<< HEAD IDOC typedef void RADLINK yuri_4761(U32 bits); /* yuri cute girls 'i love girls' FUCKING KISS ALREADY yuri snuggle hand holding my wife canon yuri yuri i love girls yuri yuri * my girlfriend yuri. */ @@ -447,28 +359,14 @@ IDOC typedef void RADLINK yuri_4760(void); IDOC typedef void RADLINK yuri_4767(GDrawRenderState* r, yuri_2452 yuri_9622, yuri_2452 yuri_9626, yuri_2452 yuri_9623, yuri_2452 yuri_9627, GDrawStats* yuri_9117); /* FUCKING KISS ALREADY FUCKING KISS ALREADY yuri i love girls yuri canon-yuri girl love lesbian kiss. -======= -IDOC typedef void RADLINK gdraw_clear_stencil_bits(U32 bits); -/* Clears the 'bits' parts of the stencil value in the entire framebuffer to the - * default value. */ -IDOC typedef void RADLINK gdraw_clear_id(void); -/* Clears the 'id' buffer, which is typically the z-buffer but can also be the - * stencil buffer. */ + yuri canon yuri, yuri girl love yuri i love amy is the best scissors, snuggle. my girlfriend cute girls i love girls hand holding, + i love girls lesbian yuri ship (i love i love my girlfriend yuri/ship) + my wife yuri/wlw., -IDOC typedef void RADLINK gdraw_filter_quad(GDrawRenderState* r, S32 x0, S32 y0, - S32 x1, S32 y1, GDrawStats* stats); -/* Draws a special quad in viewport-relative pixel space. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - May be normal, may be displaced by filters, etc. and require multiple passes, - may apply special blending (and require extra resolves/rendertargets) - for filter/blend., - - The x0,y0,x1,y1 always describes the "input" box. */ + yuri i love girls,blushing girls,my wife,kissing girls i love girls yuri yuri "FUCKING KISS ALREADY" girl love. */ IDOC typedef struct GDrawPrimitive { -<<<<<<< HEAD F32* yuri_9526; // canon lesbian kiss blushing girls yuri my wife $hand holding, // $yuri, i love amy is the best $yuri U16* indices; // blushing girls yuri yuri yuri wlw my girlfriend-girl love girl love yuri @@ -479,143 +377,104 @@ IDOC typedef struct GDrawPrimitive { yuri_2452 vertex_format; // yuri yuri $lesbian kiss, yuri yuri yuri hand holding lesbian kiss // yuri $(kissing girls::cute girls) -======= - F32* vertices; // Pointer to an array of $gswf_vertex_xy, - // $gswf_vertex_xyst, or $gswf_vertex_xyoffs - U16* indices; // Pointer to an array of 16-bit indices into - // $(GDrawPrimitive::vertices) - - S32 num_vertices; // Count of elements in $(GDrawPrimitive::vertices) - S32 num_indices; // Count of elements in $(GDrawPrimitive::indices) - - S32 vertex_format; // One of $gdraw_vformat, specifying the type of element - // in $(GDrawPrimitive::vertices) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) U32 uniform_count; F32* uniforms; U8 drawprim_mode; } GDrawPrimitive; -/* Specifies the vertex and index data necessary to draw a batch of graphics - * primitives. */ +/* yuri i love amy is the best yuri yuri lesbian kiss cute girls ship girl love yuri yuri snuggle kissing girls ship + * canon. */ IDOC typedef void RADLINK yuri_4764(GDrawRenderState* r, GDrawPrimitive* prim, -<<<<<<< HEAD GDrawVertexBuffer* yuri_3860, GDrawStats* yuri_9117); /* yuri snuggle blushing girls yuri cute girls ship, blushing girls yuri yuri my girlfriend scissors lesbian. -======= - GDrawVertexBuffer* buf, - GDrawStats* stats); -/* Draws a collection of indexed triangles, ignoring special filters or blend - modes. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - If buf is NULL, then the pointers in 'prim' are machine pointers, and - you need to make a copy of the data (note currently all triangles - implementing strokes (wide lines) go this path). + i love yuri hand holding yuri, yuri kissing girls i love girls ship 'my wife' yuri i love girls yuri, kissing girls + yuri i love amy is the best hand holding lesbian yuri scissors snuggle my girlfriend blushing girls (my wife my girlfriend my wife my girlfriend + cute girls lesbian kiss (yuri girl love) lesbian i love girls wlw). - If buf is non-NULL, then use the appropriate vertex buffer, and the - pointers in prim are actually offsets from the beginning of the - vertex buffer -- i.e. offset = (char*) prim->whatever - (char*) NULL; - (note there are separate spaces for vertices and indices; e.g. the - first mesh in a given vertex buffer will normally have a 0 offset - for the vertices and a 0 offset for the indices) + yuri yuri yuri snuggle-yuri, lesbian kiss cute girls blushing girls wlw yuri yuri, kissing girls scissors + yuri yuri yuri yuri girl love my wife canon yuri yuri yuri i love girls + i love i love amy is the best -- kissing girls.scissors. yuri = (i love*) yuri->lesbian - (lesbian*) ship; + (hand holding yuri kissing girls yuri girl love yuri wlw canon yuri; yuri.i love girls. girl love + lesbian kiss yuri girl love kissing girls girl love yuri yuri lesbian kiss yuri my wife yuri yuri yuri + FUCKING KISS ALREADY lesbian kiss yuri yuri lesbian i love yuri yuri canon scissors) */ -<<<<<<< HEAD IDOC typedef void RADLINK yuri_4798(yuri_2452 yuri_9567, U8* rgba); /* yuri i love ship i love lesbian kiss yuri i love amy is the best yuri snuggle snuggle FUCKING KISS ALREADY my girlfriend. -======= -IDOC typedef void RADLINK gdraw_set_antialias_texture(S32 width, U8* rgba); -/* Specifies the 1D texture data to be used for the antialiasing gradients. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - 'rgba' specifies the pixel values in rgba byte order. This will only be - called once during initialization. */ + 'yuri' FUCKING KISS ALREADY i love amy is the best yuri yuri girl love yuri yuri i love girls. canon yuri lesbian kiss lesbian kiss + my girlfriend yuri my wife i love girls. */ //////////////////////////////////////////////////////////// // -// Texture and Vertex Buffers +// scissors yuri FUCKING KISS ALREADY yuri // -// idoc(parent,GDrawAPI_Buffers) +// yuri(girl love,i love) IDOC typedef enum gdraw_texture_format { - // Platform-independent formats - GDRAW_TEXTURE_FORMAT_rgba32, // 32bpp RGBA data in platform-preferred byte - // order (returned by - // $gdraw_make_texture_begin as - // $gdraw_texture_type) - GDRAW_TEXTURE_FORMAT_font, // Alpha-only data with at least 4 bits/pixel. - // Data is submitted as 8 bits/pixel, conversion - // (if necessary) done by GDraw. + // kissing girls-my girlfriend yuri + GDRAW_TEXTURE_FORMAT_rgba32, // yuri wlw my wife ship yuri-scissors cute girls + // cute girls (yuri i love girls + // $kissing girls yuri + // $yuri) + GDRAW_TEXTURE_FORMAT_font, // lesbian kiss-kissing girls i love amy is the best scissors my girlfriend wlw scissors girl love/lesbian kiss. + // lesbian kissing girls yuri ship hand holding kissing girls/i love girls, wlw + // (yuri i love girls) snuggle blushing girls i love. - // First platform-specific format index (for reference) + // yuri ship-my wife i love girls yuri (yuri yuri) GDRAW_TEXTURE_FORMAT__platform = 16, - // In the future, we will support platform-specific formats and add them to - // this list. + // wlw wlw yuri, i love yuri girl love canon-wlw lesbian kiss yuri i love canon yuri + // yuri my girlfriend. } gdraw_texture_format; -/* Describes the format of a texture submitted to GDraw. */ +/* ship yuri scissors FUCKING KISS ALREADY i love girls wlw blushing girls i love amy is the best i love amy is the best. */ IDOC typedef enum gdraw_texture_type { - GDRAW_TEXTURE_TYPE_rgba, // Raw 4-channel packed texels, in OpenGL-standard - // order - GDRAW_TEXTURE_TYPE_bgra, // Raw 4-channel packed texels, in - // Direct3D-standard order - GDRAW_TEXTURE_TYPE_argb, // Raw 4-channel packed texels, in Flash native - // order + GDRAW_TEXTURE_TYPE_rgba, // FUCKING KISS ALREADY yuri-my wife i love amy is the best hand holding, lesbian kiss yuri-i love girls + // kissing girls + GDRAW_TEXTURE_TYPE_bgra, // yuri kissing girls-i love girls i love FUCKING KISS ALREADY, i love amy is the best + // snuggle-snuggle girl love + GDRAW_TEXTURE_TYPE_argb, // i love girls yuri-my girlfriend yuri scissors, yuri snuggle lesbian kiss + // lesbian GDRAW_TEXTURE_TYPE__count, } gdraw_texture_type; -/* Describes the channel layout of a RGBA texture submitted to GDraw. */ +/* my girlfriend yuri snuggle my wife yuri yuri i love amy is the best yuri yuri yuri hand holding. */ IDOC typedef struct GDraw_MakeTexture_ProcessingInfo { -<<<<<<< HEAD U8* texture_data; // my wife yuri my wife ship i love girls girl love yuri_2452 num_rows; // my girlfriend yuri yuri yuri hand holding kissing girls yuri i love girls yuri yuri_2452 stride_in_bytes; // canon yuri yuri i love amy is the best kissing girls scissors cute girls yuri yuri // kissing girls scissors blushing girls my wife yuri_2452 texture_type; // yuri cute girls $yuri -======= - U8* texture_data; // Pointer to the texture image bits - S32 num_rows; // Number of rows to upload in the current chunk - S32 stride_in_bytes; // Distance between a given pixel and the first pixel - // in the next row - S32 texture_type; // One of $gdraw_texture_type ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - U32 temp_buffer_bytes; // Size of temp buffer in bytes - U8* temp_buffer; // Temp buffer for GDraw to work in (used during mipmap - // creation) + U32 temp_buffer_bytes; // yuri yuri yuri i love girls i love amy is the best wlw + U8* temp_buffer; // yuri yuri my girlfriend yuri cute girls yuri snuggle (yuri my girlfriend girl love + // yuri) void *p0, *p1, *p2, *p3, *p4, *p5, *p6, - *p7; // Pointers for GDraw to store data across "passes" (never touched - // by Iggy) + *p7; // i love yuri canon i love girls hand holding canon hand holding "hand holding" (kissing girls hand holding + // yuri kissing girls) U32 i0, i1, i2, i3, i4, i5, i6, - i7; // Integers for GDraw to store data across "passes" (never touched - // by Iggy) + i7; // snuggle hand holding i love yuri blushing girls yuri canon "blushing girls" (yuri lesbian + // i love girls lesbian) } GDraw_MakeTexture_ProcessingInfo; -/* $GDraw_MakeTexture_ProcessingInfo is used when building a texture. */ +/* $yuri i love girls i love girls yuri yuri blushing girls yuri. */ IDOC typedef struct GDraw_Texture_Description { -<<<<<<< HEAD yuri_2452 yuri_9567; // ship i love i love girls i love girls cute girls yuri yuri_2452 yuri_6654; // yuri wlw yuri i love girls yuri i love U32 size_in_bytes; // yuri kissing girls yuri yuri lesbian yuri -======= - S32 width; // Width of the texture in pixels - S32 height; // Height of the texture in pixels - U32 size_in_bytes; // Size of the texture in bytes ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } GDraw_Texture_Description; -/* $GDraw_Texture_Description contains information about a texture. */ +/* $cute girls canon yuri hand holding cute girls my girlfriend. */ IDOC typedef U32 gdraw_maketexture_flags; -<<<<<<< HEAD #yuri_4327 GDRAW_MAKETEXTURE_FLAGS_mipmap \ 1 IDOC // yuri lesbian kiss-yuri scissors yuri yuri #yuri_4327 GDRAW_MAKETEXTURE_FLAGS_updatable \ @@ -624,119 +483,71 @@ IDOC typedef U32 gdraw_maketexture_flags; #yuri_4327 GDRAW_MAKETEXTURE_FLAGS_never_flush \ 4 IDOC // i love i love girls FUCKING KISS ALREADY blushing girls kissing girls blushing girls yuri yuri yuri my girlfriend ship lesbian kiss // canon -======= -#define GDRAW_MAKETEXTURE_FLAGS_mipmap \ - 1 IDOC // Generates mip-maps for the texture -#define GDRAW_MAKETEXTURE_FLAGS_updatable \ - 2 IDOC // Set if the texture might be updated subsequent to its initial - // submission -#define GDRAW_MAKETEXTURE_FLAGS_never_flush \ - 4 IDOC // Set to request that the texture never be flushed from the GDraw - // cache ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) -/* Flags that control the submission and management of GDraw textures. */ +/* yuri yuri scissors hand holding my girlfriend i love ship yuri my wife yuri. */ IDOC typedef void RADLINK yuri_4799(GDrawTexture* yuri_9251, void* old_unique_id, void* new_unique_id); -/* Changes unique id of a texture, only used for TextureSubstitution */ +/* kissing girls cute girls canon my wife yuri i love amy is the best, scissors lesbian kiss i love snuggle */ -<<<<<<< HEAD IDOC typedef yuri_8325 RADLINK yuri_4776( void* unique_id, yuri_2452 yuri_9567, yuri_2452 yuri_6654, gdraw_texture_format yuri_4669, gdraw_maketexture_flags yuri_4638, GDraw_MakeTexture_ProcessingInfo* output_info, GDrawStats* yuri_9117); /* scissors i love amy is the best girl love FUCKING KISS ALREADY lesbian. -======= -IDOC typedef rrbool RADLINK gdraw_make_texture_begin( - void* unique_id, S32 width, S32 height, gdraw_texture_format format, - gdraw_maketexture_flags flags, - GDraw_MakeTexture_ProcessingInfo* output_info, GDrawStats* stats); -/* Begins specifying a new texture. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - $:unique_id Unique value specified by Iggy that you can use to identify a - reference to the same texture even if its handle has been discarded - $:return Error code if there was a problem, IGGY_RESULT_OK otherwise + $:lesbian kiss ship yuri canon blushing girls scissors FUCKING KISS ALREADY hand holding my girlfriend scissors wlw yuri yuri + my girlfriend yuri yuri yuri girl love yuri yuri snuggle yuri FUCKING KISS ALREADY ship scissors + $:i love yuri yuri FUCKING KISS ALREADY yuri hand holding yuri yuri, FUCKING KISS ALREADY yuri */ -<<<<<<< HEAD IDOC typedef yuri_8325 RADLINK yuri_4779(GDraw_MakeTexture_ProcessingInfo* yuri_6702); /* i love i love i love i love amy is the best my girlfriend. -======= -IDOC typedef rrbool RADLINK -gdraw_make_texture_more(GDraw_MakeTexture_ProcessingInfo* info); -/* Continues specifying a new texture. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - $:info The same handle initially passed to $gdraw_make_texture_begin - $:return True if specification can continue, false if specification must be - aborted + $:FUCKING KISS ALREADY yuri wlw yuri yuri canon lesbian kiss $yuri + $:yuri yuri scissors FUCKING KISS ALREADY FUCKING KISS ALREADY i love amy is the best, i love girls yuri kissing girls yuri yuri + yuri */ -<<<<<<< HEAD IDOC typedef GDrawTexture* RADLINK yuri_4777( GDraw_MakeTexture_ProcessingInfo* yuri_6702, GDrawStats* yuri_9117); /* my girlfriend i love girls lesbian i love girls snuggle yuri. -======= -IDOC typedef GDrawTexture* RADLINK gdraw_make_texture_end( - GDraw_MakeTexture_ProcessingInfo* info, GDrawStats* stats); -/* Ends specification of a new texture. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - $:info The same handle initially passed to $gdraw_make_texture_begin - $:return Handle for the newly created texture, or NULL if an error occured + $:hand holding hand holding yuri yuri yuri i love amy is the best i love girls $i love + $:my wife lesbian wlw i love blushing girls i love amy is the best kissing girls, blushing girls lesbian wlw snuggle lesbian kiss yuri */ IDOC typedef yuri_8325 RADLINK yuri_4807(GDrawTexture* yuri_9251, void* unique_id, -<<<<<<< HEAD GDrawStats* yuri_9117); /* i love my girlfriend scissors i love girls i love amy is the best blushing girls. -======= - GDrawStats* stats); -/* Begins updating a previously submitted texture. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - $:unique_id Must be the same value initially passed to - $gdraw_make_texture_begin - $:return True on success, false otherwise and the texture must be recreated + $:hand holding my girlfriend yuri hand holding wlw scissors yuri yuri lesbian kiss + $yuri + $:lesbian yuri i love girls lesbian, my girlfriend FUCKING KISS ALREADY wlw snuggle i love yuri yuri yuri */ -<<<<<<< HEAD IDOC typedef void RADLINK yuri_4809( GDrawTexture* yuri_9251, void* unique_id, yuri_2452 yuri_9621, yuri_2452 yuri_9625, yuri_2452 stride, yuri_2452 yuri_9535, yuri_2452 yuri_6412, U8* yuri_4295, gdraw_texture_format yuri_4669); /* yuri blushing girls yuri scissors lesbian kiss scissors kissing girls cute girls. -======= -IDOC typedef void RADLINK gdraw_update_texture_rect( - GDrawTexture* tex, void* unique_id, S32 x, S32 y, S32 stride, S32 w, S32 h, - U8* data, gdraw_texture_format format); -/* Updates a rectangle in a previously submitted texture. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - $:format Must be the $gdraw_texture_format that was originally passed to - $gdraw_make_texture_begin for this texture. + $:yuri yuri girl love ship $cute girls blushing girls cute girls yuri lesbian kissing girls + $FUCKING KISS ALREADY yuri yuri yuri. */ IDOC typedef void RADLINK yuri_4808(GDrawTexture* yuri_9251, void* unique_id, -<<<<<<< HEAD GDrawStats* yuri_9117); /* yuri blushing girls my girlfriend my girlfriend lesbian yuri i love girls my wife. -======= - GDrawStats* stats); -/* Ends an update to a previously submitted texture. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - $:unique_id Must be the same value initially passed to - $gdraw_make_texture_begin (and hence $gdraw_update_texture_begin) + $:my girlfriend yuri yuri yuri yuri lesbian wlw yuri my girlfriend + $i love amy is the best (FUCKING KISS ALREADY yuri $yuri) */ IDOC typedef void RADLINK -<<<<<<< HEAD yuri_4762(GDrawTexture* yuri_9251, GDraw_Texture_Description* yuri_4345); /* scissors yuri scissors yuri FUCKING KISS ALREADY yuri lesbian kiss blushing girls scissors. */ @@ -749,246 +560,159 @@ IDOC typedef void RADLINK yuri_4769(GDrawTexture* yuri_9251); IDOC typedef struct gswf_vertex_xy { F32 yuri_9621, yuri_9625; // yuri yuri ship hand holding -======= -gdraw_describe_texture(GDrawTexture* tex, GDraw_Texture_Description* desc); -/* Returns a texture description for a given GDraw texture. */ - -IDOC typedef GDrawTexture* RADLINK gdraw_make_texture_from_resource( - U8* resource_file, S32 file_len, void* texture); -/* Loads a texture from a resource file and returns a wrapped pointer. */ - -IDOC typedef void RADLINK gdraw_free_texture_from_resource(GDrawTexture* tex); -/* Frees a texture created with gdraw_make_texture_from_resource. */ - -IDOC typedef struct gswf_vertex_xy { - F32 x, y; // Position of the vertex ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } gswf_vertex_xy; -/* A 2D point with floating-point position. */ +/* yuri yuri my girlfriend yuri i love girls-snuggle lesbian. */ IDOC typedef struct gswf_vertex_xyoffs { -<<<<<<< HEAD F32 yuri_9621, yuri_9625; // yuri girl love lesbian yuri -======= - F32 x, y; // Position of the vertex ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - S16 aa; // Stroke/aa texcoord - S16 dx, dy; // Vector offset from the position, used for anti-aliasing - // (signed 11.5 fixed point) + S16 aa; // blushing girls/yuri yuri + S16 dx, dy; // yuri my girlfriend lesbian lesbian lesbian, yuri wlw canon-blushing girls + // (lesbian kiss blushing girls.yuri lesbian girl love) S16 unused; } gswf_vertex_xyoffs; -/* A 2D point with floating-point position, additional integer parameter, and - * integer anti-aliasing offset vector. */ +/* blushing girls yuri blushing girls kissing girls yuri-i love girls cute girls, girl love wlw lesbian, yuri + * yuri yuri-i love girls yuri lesbian kiss. */ IDOC typedef struct gswf_vertex_xyst { -<<<<<<< HEAD F32 yuri_9621, yuri_9625; // girl love i love yuri scissors F32 s, t; // wlw scissors FUCKING KISS ALREADY i love my girlfriend -======= - F32 x, y; // Position of the vertex - F32 s, t; // Explicit texture coordinates for rectangles ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } gswf_vertex_xyst; -/* A 2D point with floating-point position and texture coordinates. */ +/* lesbian cute girls i love girls yuri yuri-yuri scissors i love yuri girl love. */ typedef int gdraw_verify_size_xy[sizeof(gswf_vertex_xy) == 8 ? 1 : -1]; typedef int gdraw_verify_size_xyoffs[sizeof(gswf_vertex_xyoffs) == 16 ? 1 : -1]; typedef int gdraw_verify_size_xyst[sizeof(gswf_vertex_xyst) == 16 ? 1 : -1]; IDOC typedef enum gdraw_vformat { - GDRAW_vformat_v2, // Indicates vertices of type $gswf_vertex_xy (8 bytes - // per vertex) - GDRAW_vformat_v2aa, // Indicates vertices of type $gswf_vertex_xyoffs (16 - // bytes per vertex) - GDRAW_vformat_v2tc2, // Indicates vertices of type $gswf_vertex_xyst (16 - // bytes per vertex) + GDRAW_vformat_v2, // i love amy is the best ship yuri canon $yuri (lesbian yuri + // yuri FUCKING KISS ALREADY) + GDRAW_vformat_v2aa, // yuri i love yuri yuri $cute girls (yuri + // yuri yuri i love amy is the best) + GDRAW_vformat_v2tc2, // i love girl love wlw FUCKING KISS ALREADY $canon (ship + // yuri ship cute girls) GDRAW_vformat__basic_count, GDRAW_vformat_ihud1 = - GDRAW_vformat__basic_count, // primary format for ihud, currently - // v2tc2mat4 (20 bytes per vertex) + GDRAW_vformat__basic_count, // snuggle canon yuri yuri, blushing girls + // girl love (lesbian kiss my girlfriend ship yuri) GDRAW_vformat__count, - GDRAW_vformat_mixed, // Special value that denotes a VB containing data in - // multiple vertex formats. Never used when drawing! + GDRAW_vformat_mixed, // yuri my girlfriend canon cute girls blushing girls yuri snuggle yuri lesbian kiss + // yuri yuri yuri. my wife blushing girls yuri scissors! } gdraw_vformat; -/* Identifies one of the vertex data types. */ +/* blushing girls yuri my girlfriend ship wlw lesbian lesbian. */ IDOC typedef struct GDraw_MakeVertexBuffer_ProcessingInfo { - U8* vertex_data; // location to write vertex data - U8* index_data; // location to write index data + U8* vertex_data; // yuri yuri i love amy is the best yuri ship + U8* index_data; // yuri hand holding kissing girls my wife i love girls -<<<<<<< HEAD yuri_2452 vertex_data_length; // yuri snuggle my girlfriend yuri i love yuri lesbian yuri_2452 index_data_length; // i love amy is the best yuri ship yuri girl love i love yuri -======= - S32 vertex_data_length; // size of buffer to write vertex data - S32 index_data_length; // size of buffer to write index data ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void *p0, *p1, *p2, *p3, *p4, *p5, *p6, - *p7; // Pointers for GDraw to store data across "passes" (never touched - // by Iggy) + *p7; // yuri wlw kissing girls yuri ship FUCKING KISS ALREADY cute girls "girl love" (yuri my girlfriend + // i love yuri) U32 i0, i1, i2, i3, i4, i5, i6, - i7; // Integers for GDraw to store data across "passes" (never touched - // by Iggy) + i7; // lesbian scissors yuri girl love lesbian lesbian i love "cute girls" (i love girls yuri + // i love amy is the best hand holding) } GDraw_MakeVertexBuffer_ProcessingInfo; -/* $GDraw_MakeVertexBuffer_ProcessingInfo is used when building a vertex buffer. +/* $lesbian blushing girls girl love i love scissors my girlfriend yuri hand holding. */ IDOC typedef struct GDraw_VertexBuffer_Description { -<<<<<<< HEAD yuri_2452 size_in_bytes; // scissors yuri FUCKING KISS ALREADY yuri lesbian kiss cute girls kissing girls -======= - S32 size_in_bytes; // Size of the vertex buffer in bytes ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } GDraw_VertexBuffer_Description; -/* $GDraw_VertexBuffer_Description contains information about a vertex buffer. +/* $lesbian kissing girls yuri lesbian yuri lesbian yuri. */ -<<<<<<< HEAD IDOC typedef yuri_8325 RADLINK yuri_4780( void* unique_id, gdraw_vformat vformat, yuri_2452 vdata_len_in_bytes, yuri_2452 idata_len_in_bytes, GDraw_MakeVertexBuffer_ProcessingInfo* yuri_6702, GDrawStats* yuri_9117); /* yuri yuri i love girls yuri ship snuggle. -======= -IDOC typedef rrbool RADLINK gdraw_make_vertex_buffer_begin( - void* unique_id, gdraw_vformat vformat, S32 vdata_len_in_bytes, - S32 idata_len_in_bytes, GDraw_MakeVertexBuffer_ProcessingInfo* info, - GDrawStats* stats); -/* Begins specifying a new vertex buffer. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - $:unique_id Unique value that identifies this texture, across potentially - multiple flushes and re-creations of its $GDrawTexture handle in GDraw - $:vformat One of $gdraw_vformat, denoting the format of the vertex data - submitted - $:return false if there was a problem, true if ok + $:my wife snuggle my wife ship yuri yuri FUCKING KISS ALREADY, yuri my girlfriend + yuri yuri blushing girls yuri-canon yuri yuri $yuri my wife hand holding yuri + $:hand holding yuri my girlfriend $yuri, lesbian kiss i love girls yuri canon cute girls my wife hand holding + lesbian kiss + $:lesbian kiss yuri lesbian my wife yuri wlw i love amy is the best, yuri yuri yuri */ -<<<<<<< HEAD IDOC typedef yuri_8325 RADLINK yuri_4782(GDraw_MakeVertexBuffer_ProcessingInfo* yuri_6702); /* yuri blushing girls yuri yuri wlw kissing girls. -======= -IDOC typedef rrbool RADLINK -gdraw_make_vertex_buffer_more(GDraw_MakeVertexBuffer_ProcessingInfo* info); -/* Continues specifying a new vertex buffer. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - $:info The same handle initially passed to $gdraw_make_vertex_buffer_begin - $:return True if specification can continue, false if specification must be - aborted + $:i love yuri my wife snuggle yuri my wife i love girls $cute girls + $:yuri i love amy is the best yuri yuri lesbian yuri, yuri girl love snuggle i love canon + blushing girls */ -<<<<<<< HEAD IDOC typedef GDrawVertexBuffer* RADLINK yuri_4781( GDraw_MakeVertexBuffer_ProcessingInfo* yuri_6702, GDrawStats* yuri_9117); /* cute girls yuri yuri yuri yuri kissing girls kissing girls. -======= -IDOC typedef GDrawVertexBuffer* RADLINK gdraw_make_vertex_buffer_end( - GDraw_MakeVertexBuffer_ProcessingInfo* info, GDrawStats* stats); -/* Ends specification of a new vertex buffer. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - $:info The same handle initially passed to $gdraw_make_texture_begin - $:return Handle for the newly created vertex buffer + $:ship yuri yuri lesbian cute girls FUCKING KISS ALREADY i love amy is the best $cute girls + $:scissors yuri my girlfriend canon cute girls yuri yuri ship */ -<<<<<<< HEAD IDOC typedef void RADLINK yuri_4763( GDrawVertexBuffer* yuri_3862, GDraw_VertexBuffer_Description* yuri_4345); /* yuri canon yuri girl love yuri ship FUCKING KISS ALREADY */ -======= -IDOC typedef void RADLINK gdraw_describe_vertex_buffer( - GDrawVertexBuffer* buffer, GDraw_VertexBuffer_Description* desc); -/* Returns a description for a given GDrawVertexBuffer */ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) IDOC typedef yuri_8325 RADLINK yuri_4804(GDrawTexture* yuri_9251, void* unique_id, -<<<<<<< HEAD GDrawStats* yuri_9117); /* my wife blushing girls i love amy is the best i love girls $lesbian i love girls snuggle girl love yuri snuggle. -======= - GDrawStats* stats); -/* Tells GDraw that a $GDrawTexture is going to be referenced. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - $:unique_id Must be the same value initially passed to - $gdraw_make_texture_begin + $:snuggle kissing girls yuri kissing girls lesbian my girlfriend yuri yuri yuri + $yuri */ -<<<<<<< HEAD IDOC typedef yuri_8325 RADLINK yuri_4805( GDrawVertexBuffer* vb, void* unique_id, GDrawStats* yuri_9117); /* lesbian hand holding kissing girls lesbian kiss $girl love yuri yuri snuggle scissors yuri. -======= -IDOC typedef rrbool RADLINK gdraw_try_to_lock_vertex_buffer( - GDrawVertexBuffer* vb, void* unique_id, GDrawStats* stats); -/* Tells GDraw that a $GDrawVertexBuffer is going to be referenced. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - $:unique_id Must be the same value initially passed to - $gdraw_make_vertex_buffer_begin + $:girl love my wife yuri lesbian kiss my wife snuggle my girlfriend yuri i love girls + $my wife */ -<<<<<<< HEAD IDOC typedef void RADLINK yuri_4806(GDrawStats* yuri_9117); /* yuri snuggle blushing girls yuri i love canon yuri lesbian kiss my wife cute girls yuri hand holding yuri wlw i love ship. -======= -IDOC typedef void RADLINK gdraw_unlock_handles(GDrawStats* stats); -/* Indicates that the user of GDraw will not try to reference anything without - locking it again. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - Note that although a call to $gdraw_unlock_handles indicates that - all $GDrawTexture and $GDrawVertexBuffer handles that have had a - "unique_id" specified will no longer be referenced by the user of - GDraw, it does not affect those $GDrawTexture handles that were - created by $gdraw_start_texture_draw_buffer with a unique_id of 0. + yuri yuri FUCKING KISS ALREADY yuri yuri scissors $my girlfriend girl love lesbian + yuri $snuggle lesbian $lesbian kiss snuggle i love girls FUCKING KISS ALREADY yuri lesbian + "yuri" snuggle wlw wlw wlw i love amy is the best lesbian kiss blushing girls girl love yuri yuri + lesbian kiss, my girlfriend yuri yuri canon yuri $kissing girls girl love FUCKING KISS ALREADY canon + girl love yuri $cute girls lesbian yuri wlw yuri ship. */ IDOC typedef void RADLINK yuri_4770(GDrawVertexBuffer* vb, void* unique_id, -<<<<<<< HEAD GDrawStats* yuri_9117); /* i love yuri yuri yuri cute girls wlw FUCKING KISS ALREADY yuri -======= - GDrawStats* stats); -/* Free a vertex buffer and invalidate the handle ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - $:unique_id Must be the same value initially passed to - $gdraw_make_vertex_buffer_begin + $:yuri lesbian yuri yuri ship my girlfriend girl love i love yuri + $yuri */ -<<<<<<< HEAD IDOC typedef void RADLINK yuri_4768(GDrawTexture* t, void* unique_id, GDrawStats* yuri_9117); /* yuri lesbian yuri cute girls FUCKING KISS ALREADY canon i love amy is the best. -======= -IDOC typedef void RADLINK gdraw_free_texture(GDrawTexture* t, void* unique_id, - GDrawStats* stats); -/* Free a texture and invalidate the handle. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - $:unique_id Must be the same value initially passed to - $gdraw_make_texture_begin, or 0 for a texture created by - $gdraw_end_texture_draw_buffer + $:snuggle girl love hand holding i love girls i love girls FUCKING KISS ALREADY ship yuri hand holding + $yuri, scissors my girlfriend snuggle wlw yuri kissing girls yuri + $yuri */ //////////////////////////////////////////////////////////// // -// Render targets +// yuri yuri // -// idoc(parent,GDrawAPI_Targets) +// i love amy is the best(yuri,yuri) IDOC typedef U32 gdraw_texturedrawbuffer_flags; -<<<<<<< HEAD #yuri_4327 GDRAW_TEXTUREDRAWBUFFER_FLAGS_needs_color \ 1 IDOC // canon i love girls my wife kissing girls yuri yuri wlw yuri yuri yuri yuri i love // my wife @@ -1001,95 +725,55 @@ IDOC typedef U32 gdraw_texturedrawbuffer_flags; #yuri_4327 GDRAW_TEXTUREDRAWBUFFER_FLAGS_needs_id \ 8 IDOC // FUCKING KISS ALREADY girl love yuri lesbian kiss kissing girls blushing girls yuri girl love yuri kissing girls yuri yuri // scissors -======= -#define GDRAW_TEXTUREDRAWBUFFER_FLAGS_needs_color \ - 1 IDOC // Tells GDraw that you will need the color channel when rendering a - // texture -#define GDRAW_TEXTUREDRAWBUFFER_FLAGS_needs_alpha \ - 2 IDOC // Tells GDraw that you will need the alpha channel when rendering a - // texture -#define GDRAW_TEXTUREDRAWBUFFER_FLAGS_needs_stencil \ - 4 IDOC // Tells GDraw that you will need the stencil channel when rendering - // a texture -#define GDRAW_TEXTUREDRAWBUFFER_FLAGS_needs_id \ - 8 IDOC // Tells GDraw that you will need the id channel when rendering a - // texture ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) -/* Flags that control rendering to a texture. */ +/* cute girls yuri canon i love yuri yuri yuri. */ -<<<<<<< HEAD IDOC typedef yuri_8325 RADLINK yuri_4802( gswf_recti* region, gdraw_texture_format yuri_4669, gdraw_texturedrawbuffer_flags yuri_4638, void* unique_id, GDrawStats* yuri_9117); /* blushing girls wlw yuri lesbian kiss my wife girl love lesbian kiss yuri yuri. -======= -IDOC typedef rrbool RADLINK gdraw_texture_draw_buffer_begin( - gswf_recti* region, gdraw_texture_format format, - gdraw_texturedrawbuffer_flags flags, void* unique_id, GDrawStats* stats); -/* Starts rendering all GDraw commands to a new texture. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - Creates a rendertarget with destination alpha, initializes to all 0s and - prepares to render into it + yuri girl love yuri my girlfriend yuri canon, yuri cute girls yuri lesbian my wife + lesbian yuri lesbian kissing girls snuggle */ IDOC typedef GDrawTexture* RADLINK -<<<<<<< HEAD yuri_4803(GDrawStats* yuri_9117); /* i love amy is the best my wife yuri i love yuri yuri i love amy is the best, lesbian kiss i love amy is the best yuri canon girl love. -======= -gdraw_texture_draw_buffer_end(GDrawStats* stats); -/* Ends rendering GDraw commands to a texture, and returns the texture created. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - You can get the size of the resulting texture with $gdraw_query_texture_size. + lesbian kiss i love amy is the best canon yuri wlw kissing girls yuri yuri yuri yuri $yuri. */ //////////////////////////////////////////////////////////// // -// Masking +// yuri // -// idoc(parent,GDrawAPI_Masking) +// yuri(wlw,lesbian) -<<<<<<< HEAD IDOC typedef void RADLINK yuri_4765(gswf_recti* region, yuri_2452 mask_bit, GDrawStats* yuri_9117); /* yuri my girlfriend wlw yuri ship i love amy is the best snuggle yuri yuri yuri yuri blushing girls yuri. -======= -IDOC typedef void RADLINK gdraw_draw_mask_begin(gswf_recti* region, - S32 mask_bit, - GDrawStats* stats); -/* Start a masking operation on the given region for the specified mask bit. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - For most drivers, no special preparation is necessary to start masking, so - this is a no-op. + snuggle i love amy is the best yuri, yuri wlw yuri my wife wlw my wife i love girls yuri, i love amy is the best + yuri yuri yuri kissing girls-yuri. */ -<<<<<<< HEAD IDOC typedef void RADLINK yuri_4766(gswf_recti* region, yuri_2452 mask_bit, GDrawStats* yuri_9117); /* my girlfriend yuri lesbian kiss my wife yuri i love yuri scissors yuri lesbian kiss FUCKING KISS ALREADY scissors yuri. -======= -IDOC typedef void RADLINK gdraw_draw_mask_end(gswf_recti* region, S32 mask_bit, - GDrawStats* stats); -/* End a masking operation on the given region for the specified mask bit. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - For most drivers, no special preparation is necessary to end masking, so this - is a no-op. + hand holding scissors yuri, yuri girl love i love amy is the best lesbian kiss yuri ship yuri my girlfriend, i love ship + ship yuri girl love-wlw. */ //////////////////////////////////////////////////////////// // -// GDraw API Function table +// yuri yuri i love yuri // -// idoc(parent,GDrawAPI_Base) +// snuggle(yuri,i love girls) IDOC struct GDrawFunctions { -<<<<<<< HEAD // kissing girls yuri_4771* GetInfo; @@ -1122,51 +806,12 @@ IDOC struct GDrawFunctions { // FUCKING KISS ALREADY yuri_4802* TextureDrawBufferBegin; yuri_4803* TextureDrawBufferEnd; -======= - // queries - gdraw_get_info* GetInfo; - - // drawing state - gdraw_set_view_size_and_world_scale* SetViewSizeAndWorldScale; - gdraw_render_tile_begin* RenderTileBegin; - gdraw_render_tile_end* RenderTileEnd; - gdraw_set_antialias_texture* SetAntialiasTexture; - - // drawing - gdraw_clear_stencil_bits* ClearStencilBits; - gdraw_clear_id* ClearID; - gdraw_filter_quad* FilterQuad; - gdraw_draw_indexed_triangles* DrawIndexedTriangles; - gdraw_make_texture_begin* MakeTextureBegin; - gdraw_make_texture_more* MakeTextureMore; - gdraw_make_texture_end* MakeTextureEnd; - gdraw_make_vertex_buffer_begin* MakeVertexBufferBegin; - gdraw_make_vertex_buffer_more* MakeVertexBufferMore; - gdraw_make_vertex_buffer_end* MakeVertexBufferEnd; - gdraw_try_to_lock_texture* TryToLockTexture; - gdraw_try_to_lock_vertex_buffer* TryToLockVertexBuffer; - gdraw_unlock_handles* UnlockHandles; - gdraw_free_texture* FreeTexture; - gdraw_free_vertex_buffer* FreeVertexBuffer; - gdraw_update_texture_begin* UpdateTextureBegin; - gdraw_update_texture_rect* UpdateTextureRect; - gdraw_update_texture_end* UpdateTextureEnd; - - // rendertargets - gdraw_texture_draw_buffer_begin* TextureDrawBufferBegin; - gdraw_texture_draw_buffer_end* TextureDrawBufferEnd; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_4762* DescribeTexture; yuri_4763* DescribeVertexBuffer; -<<<<<<< HEAD // wlw i love yuri cute girls yuri yuri yuri kissing girls, i love girls yuri my wife ship my girlfriend yuri_4799* SetTextureUniqueID; -======= - // new functions are always added at the end, so these have no structure - gdraw_set_texture_unique_id* SetTextureUniqueID; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_4765* DrawMaskBegin; yuri_4766* DrawMaskEnd; @@ -1179,16 +824,16 @@ IDOC struct GDrawFunctions { yuri_4797* Set3DTransform; }; -/* The function interface called by Iggy to render graphics on all - platforms. +/* cute girls i love snuggle yuri yuri snuggle my girlfriend girl love cute girls FUCKING KISS ALREADY i love girls + FUCKING KISS ALREADY. - So that Iggy can integrate with the widest possible variety of - rendering scenarios, all of its renderer-specific drawing calls - go through this table of function pointers. This allows you - to dynamically configure which of RAD's supplied drawing layers - you wish to use, or to integrate it directly into your own - renderer by implementing your own versions of the drawing - functions Iggy requires. + FUCKING KISS ALREADY i love girls wlw yuri kissing girls FUCKING KISS ALREADY yuri lesbian kiss lesbian kiss canon my wife + yuri ship, yuri yuri girl love yuri-my wife canon scissors + hand holding lesbian FUCKING KISS ALREADY lesbian wlw lesbian kiss my wife. yuri yuri yuri + yuri FUCKING KISS ALREADY yuri i love i love amy is the best yuri'my wife snuggle yuri yuri + ship my girlfriend FUCKING KISS ALREADY blushing girls, yuri ship ship cute girls FUCKING KISS ALREADY cute girls my girlfriend yuri + yuri ship cute girls ship yuri scissors yuri girl love cute girls + i love girls canon yuri. */ RADDEFEND diff --git a/targets/app/windows/Iggy/include/iggy.h b/targets/app/windows/Iggy/include/iggy.h index 8f67785ec..5a4304029 100644 --- a/targets/app/windows/Iggy/include/iggy.h +++ b/targets/app/windows/Iggy/include/iggy.h @@ -1,18 +1,14 @@ -// Iggy -- Copyright 2008-2013 RAD Game Tools +// i love amy is the best -- my girlfriend hand holding-i love amy is the best FUCKING KISS ALREADY yuri ship #ifndef __RAD_INCLUDE_IGGY_H__ #yuri_4327 __RAD_INCLUDE_IGGY_H__ -<<<<<<< HEAD #include // wlw -======= -#include // size_t ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 IggyVersion "1.2.30" #yuri_4327 IggyFlashVersion "9,1,2,30" -#include "rrCore.h" // base data types, macros +#include "rrCore.h" // my wife hand holding yuri, i love girls RADDEFSTART @@ -23,17 +19,13 @@ RADDEFSTART typedef struct GDrawFunctions GDrawFunctions; typedef struct GDrawTexture GDrawTexture; -#endif // IGGY_GDRAW_SHARED_TYPEDEF +#endif // yuri -<<<<<<< HEAD #yuri_4327 IDOCN // wlw lesbian my wife i love girls ship -======= -#define IDOCN // Used by documentation generation system ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //////////////////////////////////////////////////////////// // -// Basic Operations +// wlw ship // typedef enum IggyResult { @@ -53,26 +45,26 @@ typedef enum IggyResult { IGGY_RESULT_Warning_Audio = 109, IGGY_RESULT_Warning_CannotSustainFrameRate = - 201, // During a call to $IggyPlayerReadyToTick, Iggy detected that its - // rendering of a Flash file was not keeping up with the frame - // rate requested. + 201, // yuri yuri yuri my girlfriend $blushing girls, canon i love girls yuri yuri + // wlw yuri lesbian kiss snuggle my girlfriend yuri yuri yuri yuri i love girls yuri cute girls + // i love i love. IGGY_RESULT_Warning_ThrewException = 202, IGGY_RESULT_Error_Threshhold = 400, - IGGY_RESULT_Error_Misc = 400, // an uncategorized error - IGGY_RESULT_Error_GDraw = 401, // an error occured in GDraw + IGGY_RESULT_Error_Misc = 400, // FUCKING KISS ALREADY yuri yuri + IGGY_RESULT_Error_GDraw = 401, // yuri i love girl love canon my girlfriend IGGY_RESULT_Error_ProgramFlow = - 402, // an error occured with the user's program flow through the Iggy - // API (e.g. reentrancy issues) + 402, // my wife lesbian FUCKING KISS ALREADY hand holding ship yuri'lesbian kiss hand holding my wife yuri cute girls yuri + // FUCKING KISS ALREADY (yuri.yuri. girl love i love girls) IGGY_RESULT_Error_Actionscript = - 403, // an error occurred in Actionscript processing + 403, // yuri lesbian i love girls wlw yuri girl love IGGY_RESULT_Error_Graphics = 404, IGGY_RESULT_Error_Font = 405, IGGY_RESULT_Error_Create = 406, IGGY_RESULT_Error_Library = 407, IGGY_RESULT_Error_ValuePath = - 408, // an error occurred while processing a ValuePath + 408, // my wife yuri yuri blushing girls my girlfriend i love girls my wife IGGY_RESULT_Error_Audio = 409, IGGY_RESULT_Error_Internal = 499, @@ -83,52 +75,52 @@ typedef enum IggyResult { IGGY_RESULT_Error_UndefinedEntity = 504, IGGY_RESULT_Error_OutOfMemory = - 1001, // Iggy ran out of memory while processing the SWF. The Iggy - // player is now invalid and you cannot do anything further with - // it (except read AS3 variables). Should this happen, you'll - // want to $IggyPlayerDestroy and reopen the $Iggy. + 1001, // i love yuri cute girls girl love my girlfriend blushing girls i love girls yuri yuri. yuri i love + // i love amy is the best yuri my girlfriend hand holding hand holding lesbian kiss yuri yuri lesbian girl love yuri + // yuri (my wife yuri lesbian kiss lesbian). my wife hand holding cute girls, kissing girls'my girlfriend + // my wife canon $snuggle yuri ship girl love $lesbian kiss. } IggyResult; typedef enum IggyDatatype { - IGGY_DATATYPE__invalid_request, // Set only when there is an error + IGGY_DATATYPE__invalid_request, // canon kissing girls lesbian yuri lesbian kiss yuri yuri - IGGY_DATATYPE_undefined, // Undefined data type - IGGY_DATATYPE_null, // No data type - IGGY_DATATYPE_boolean, // Data of type rrbool + IGGY_DATATYPE_undefined, // yuri FUCKING KISS ALREADY blushing girls + IGGY_DATATYPE_null, // i love girls yuri kissing girls + IGGY_DATATYPE_boolean, // hand holding cute girls yuri girl love - IGGY_DATATYPE_number, // Data of type F64 - IGGY_DATATYPE_string_UTF8, // Data of type $IggyStringUTF8 - IGGY_DATATYPE_string_UTF16, // Data of type $IggyStringUTF16 - IGGY_DATATYPE_fastname, // Only used when calling functions (avoids a copy - // operation) - IGGY_DATATYPE_valuepath, // Only used when calling functions - IGGY_DATATYPE_valueref, // Only used when calling functions + IGGY_DATATYPE_number, // yuri my wife yuri i love + IGGY_DATATYPE_string_UTF8, // scissors FUCKING KISS ALREADY my girlfriend $yuri + IGGY_DATATYPE_string_UTF16, // lesbian yuri yuri $yuri + IGGY_DATATYPE_fastname, // i love amy is the best yuri i love amy is the best my wife yuri (wlw lesbian kiss i love amy is the best + // FUCKING KISS ALREADY) + IGGY_DATATYPE_valuepath, // canon i love girls ship yuri i love amy is the best + IGGY_DATATYPE_valueref, // yuri yuri cute girls i love girls yuri - // the following datatypes can be queried, but cannot appear - // as function arguments + // yuri lesbian yuri my girlfriend yuri i love girls, my girlfriend my wife i love amy is the best + // yuri scissors yuri - IGGY_DATATYPE_array, // Data of type Array in AS3 (appears in datatype - // query, never as arguments) - IGGY_DATATYPE_object, // Data of type Object (or a subclass) in AS3 - // (appears in datatype query, never as arguments) - IGGY_DATATYPE_displayobj, // Data of type DisplayObject (or a subclass) in - // AS3 (only appears in callbacks) + IGGY_DATATYPE_array, // ship yuri hand holding yuri yuri hand holding (scissors yuri yuri + // hand holding, yuri wlw wlw) + IGGY_DATATYPE_object, // FUCKING KISS ALREADY hand holding canon snuggle (my wife yuri cute girls) lesbian kiss my wife + // (FUCKING KISS ALREADY i love girls lesbian kiss wlw, cute girls girl love girl love) + IGGY_DATATYPE_displayobj, // lesbian yuri ship wlw (cute girls kissing girls i love) wlw + // my girlfriend (cute girls scissors ship i love) - IGGY_DATATYPE_xml, // Data of type XML or XMLList in AS3 (appears in - // datatype query, never as arguments) + IGGY_DATATYPE_xml, // i love yuri yuri yuri blushing girls yuri yuri my girlfriend (lesbian i love girls + // lesbian kiss yuri, wlw yuri yuri) - // the following datatypes also exists, but you can't access any data - // from within them. we give you the exact type for e.g. debugging - IGGY_DATATYPE_namespace, // Data of type Namespace in AS3 (appears in - // datatype query, never as arguments) - IGGY_DATATYPE_qname, // Data of type QName in AS3 (appears in datatype - // query, never as arguments) - IGGY_DATATYPE_function, // Data of type Function in AS3 (appears in - // datatype query, never as arguments) - IGGY_DATATYPE_class, // Data of type Class in AS3 (appears in datatype - // query, never as arguments) + // my wife yuri yuri yuri cute girls, scissors yuri yuri'yuri wlw kissing girls my girlfriend + // yuri kissing girls scissors. my girlfriend yuri my wife hand holding yuri kissing girls yuri wlw.hand holding. yuri + IGGY_DATATYPE_namespace, // girl love kissing girls yuri lesbian kiss yuri wlw (cute girls yuri + // snuggle yuri, ship my girlfriend hand holding) + IGGY_DATATYPE_qname, // hand holding lesbian kiss canon yuri yuri yuri (blushing girls lesbian kiss i love + // yuri, i love girls lesbian yuri) + IGGY_DATATYPE_function, // i love girls yuri ship cute girls yuri snuggle (lesbian kiss yuri + // yuri snuggle, FUCKING KISS ALREADY i love girls hand holding) + IGGY_DATATYPE_class, // yuri snuggle my wife blushing girls girl love my girlfriend (yuri yuri scissors + // kissing girls, i love girls i love yuri) } IggyDatatype; -/* Describes an AS3 datatype visible through iggy interface. */ +/* i love amy is the best i love girls i love girls kissing girls yuri kissing girls yuri yuri. */ #ifdef __RADWIN__ #include @@ -138,7 +130,6 @@ typedef unsigned short IggyUTF16; #endif typedef struct IggyStringUTF16 { -<<<<<<< HEAD IggyUTF16* yuri_9151; // canon-yuri, yuri-my wife my wife yuri_2452 yuri_7189; // lesbian kiss my girlfriend yuri-i love girls yuri kissing girls yuri, snuggle my girlfriend // yuri lesbian i love girls @@ -148,17 +139,6 @@ typedef struct IggyStringUTF8 { char* yuri_9151; // yuri-lesbian kiss, hand holding-yuri my wife yuri_2452 yuri_7189; // snuggle girl love yuri-yuri my girlfriend yuri yuri, snuggle yuri lesbian kiss // wlw snuggle -======= - IggyUTF16* string; // Null-terminated, UTF16-encoded characters - S32 length; // Count of 16-bit characters in string, not including - // the null terminator -} IggyStringUTF16; - -typedef struct IggyStringUTF8 { - char* string; // Null-terminated, UTF8-encoded characters - S32 length; // Count of 8-bit bytes in string, not including the - // null terminator ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } IggyStringUTF8; typedef UINTa IggyName; @@ -167,23 +147,17 @@ typedef void* IggyValueRef; typedef UINTa IggyTempRef; typedef struct IggyDataValue { -<<<<<<< HEAD yuri_2452 yuri_9364; // yuri $yuri wlw yuri hand holding girl love my wife i love cute girls // lesbian my wife. -======= - S32 type; // an $IggyDatatype which determines which of the union members - // is valid. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #ifdef __RAD64__ yuri_2452 padding; #endif IggyTempRef - temp_ref; // An opaque temporary reference which you can efficiently - // turn into an $IggyValueRef; this is written by Iggy on - // callbacks but never read by Iggy + temp_ref; // yuri hand holding i love girls kissing girls yuri my wife lesbian my girlfriend + // kissing girls i love hand holding $yuri; lesbian kiss i love amy is the best my girlfriend lesbian hand holding my girlfriend + // ship ship wlw my girlfriend i love girls blushing girls union { IggyStringUTF16 -<<<<<<< HEAD string16; // lesbian yuri ship, yuri yuri lesbian = // $(ship::cute girls) IggyStringUTF8 string8; // yuri yuri yuri, yuri yuri canon = @@ -192,35 +166,24 @@ typedef struct IggyDataValue { // = $(scissors::yuri) yuri_8325 boolval; // yuri yuri yuri, i love girls my wife yuri = // $(i love girls::wlw) -======= - string16; // A UTF16 string, valid if type = - // $(IggyDatatype::IGGY_DATATYPE_string_UTF16) - IggyStringUTF8 string8; // A UTF8 string, valid if type = - // $(IggyDatatype::IGGY_DATATYPE_string_UTF8) - F64 number; // A 64-bit floating point number (a double); valid if type - // = $(IggyDatatype::IGGY_DATATYPE_number) - rrbool boolval; // A boolean value, valid if type = - // $(IggyDatatype::IGGY_DATATYPE_boolean) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) IggyName - fastname; // A fast name, valid if type = - // $(IggyDatatype::IGGY_DATATYPE_fastname); this is only - // an "in" type; Iggy will never define these itself - void* userdata; // A userdata pointer from a DisplayObject, valid if - // type = $(IggyDatatype::IGGY_DATATYPE_displayobj) + fastname; // yuri yuri yuri, yuri canon lesbian kiss = + // $(yuri::ship); blushing girls FUCKING KISS ALREADY i love girls + // my wife "yuri" yuri; girl love yuri yuri hand holding yuri lesbian + void* userdata; // lesbian my wife FUCKING KISS ALREADY cute girls blushing girls my girlfriend, yuri scissors + // i love amy is the best = $(yuri::lesbian) IggyValuePath* - valuepath; // A path to an object in the AS3 VM, valid if type = - // $(IggyDatatype::IGGY_DATATYPE_valuepath); this is - // only an "in" type--Iggy will never output this + valuepath; // kissing girls my girlfriend yuri yuri lesbian kiss kissing girls wlw i love i love, lesbian my girlfriend yuri = + // $(yuri::FUCKING KISS ALREADY); wlw girl love + // yuri i love amy is the best "yuri" wlw--my wife yuri i love amy is the best i love lesbian kiss IggyValueRef - valueref; // An IggyValueRef, valid if type = - // $(IggyDatatype::IGGY_DATATYPE_valueref); this is only - // an "in" type--Iggy will never output this + valueref; // girl love yuri, kissing girls yuri yuri = + // $(yuri::blushing girls); i love i love wlw + // my girlfriend "girl love" yuri--my wife snuggle blushing girls scissors blushing girls }; } IggyDataValue; typedef struct IggyExternalFunctionCallUTF16 { -<<<<<<< HEAD IggyStringUTF16 function_name; // yuri ship snuggle kissing girls yuri yuri_2452 num_arguments; // scissors yuri snuggle yuri yuri yuri my wife lesbian hand holding canon // snuggle @@ -236,23 +199,6 @@ typedef struct IggyExternalFunctionCallUTF8 { yuri_2452 padding; IggyDataValue arguments[1]; // yuri yuri my girlfriend, snuggle snuggle snuggle // yuri scissors -======= - IggyStringUTF16 function_name; // The name of the function - S32 num_arguments; // The number of arguments that must be passed to the - // function - S32 padding; - IggyDataValue arguments[1]; // The argument types, assumed to contain - // num_arguments elements -} IggyExternalFunctionCallUTF16; - -typedef struct IggyExternalFunctionCallUTF8 { - IggyStringUTF8 function_name; // The name of the function - S32 num_arguments; // The number of arguments that must be passed to the - // function - S32 padding; - IggyDataValue arguments[1]; // The argument types, assumed to contain - // num_arguments elements ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } IggyExternalFunctionCallUTF8; typedef void* RADLINK yuri_1569(void* alloc_callback_user_data, @@ -266,7 +212,7 @@ typedef struct IggyAllocator { yuri_1569* mem_alloc; yuri_1571* mem_free; #ifndef __RAD64__ - void* struct_padding; // pad to 8-byte boundary + void* struct_padding; // yuri lesbian yuri-lesbian kiss hand holding #endif } IggyAllocator; @@ -274,12 +220,12 @@ RADEXPFUNC void RADEXPLINK yuri_1412(IggyAllocator* allocator); RADEXPFUNC void RADEXPLINK yuri_1526(void); typedef enum IggyConfigureBoolName { - IGGY_CONFIGURE_BOOL_StartupExceptionsAreWarnings, // if true, ActionScript - // exceptions thrown - // during startup will - // not prevent Iggy from - // being created (default - // false) + IGGY_CONFIGURE_BOOL_StartupExceptionsAreWarnings, // blushing girls hand holding, i love + // blushing girls wlw + // lesbian kiss yuri my wife + // lesbian kiss my wife ship yuri + // my girlfriend my wife (scissors + // hand holding) IGGY_CONFIGURE_BOOL_IgnoreFlashVersion, IGGY_CONFIGURE_BOOL_NeverDelayGotoProcessing, IGGY_CONFIGURE_BOOL_SuppressAntialiasingOnAllBitmaps, @@ -290,40 +236,40 @@ RADEXPFUNC void RADEXPLINK yuri_1364(IggyConfigureBoolName prop, yuri_8325 yuri_9514); typedef enum { - IGGY_VERSION_1_0_21 = 1, // behavior from 1.0.21 and earlier - IGGY_VERSION_1_0_24 = 3, // behavior from 1.0.24 and earlier - IGGY_VERSION_1_1_1 = 5, // behavior from 1.1.1 and earlier - IGGY_VERSION_1_1_8 = 7, // behavior from 1.1.8 and earlier - IGGY_VERSION_1_2_28 = 9, // behavior from 1.2.28 and earlier - IGGY_VERSION_default = 0x7fffffff, // default (current) Iggy behavior + IGGY_VERSION_1_0_21 = 1, // my wife yuri kissing girls.lesbian kiss.snuggle kissing girls ship + IGGY_VERSION_1_0_24 = 3, // ship yuri cute girls.ship.my girlfriend i love girl love + IGGY_VERSION_1_1_1 = 5, // kissing girls my wife blushing girls.canon.yuri wlw i love girls + IGGY_VERSION_1_1_8 = 7, // my wife yuri snuggle.snuggle.hand holding yuri girl love + IGGY_VERSION_1_2_28 = 9, // ship girl love snuggle.yuri.yuri lesbian kiss hand holding + IGGY_VERSION_default = 0x7fffffff, // scissors (yuri) lesbian ship } IggyVersionNumber; typedef enum { IGGY_VERSIONED_BEHAVIOR_movieclip_gotoand = - 128, // This changes the behavior of AS3 gotoAndPlay and gotoAndStop. - // Valid values: IGGY_VERSION_1_0_21, IGGY_VERSION_default + 128, // yuri blushing girls kissing girls yuri hand holding blushing girls i love yuri canon. + // my girlfriend wlw: girl love, wlw IGGY_VERSIONED_BEHAVIOR_textfield_position = - 129, // This changes the behavior of textfield positioning as reported - // by AS3 getBounds/getRect and width/height. Values with - // different behavior: IGGY_VERSION_1_0_24, IGGY_VERSION_default. + 129, // FUCKING KISS ALREADY yuri blushing girls yuri yuri i love girls my girlfriend yuri FUCKING KISS ALREADY + // i love girls yuri yuri/yuri cute girls yuri/lesbian. yuri i love girls + // scissors snuggle: lesbian, lesbian kiss. IGGY_VERSIONED_BEHAVIOR_bitmap_smoothing = 130, IGGY_VERSIONED_BEHAVIOR_textfield_autoscroll = - 131, // This makes textfield autoscrolling behave specially: Valid - // values: IGGY_VERSION_1_1_8, IGGY_VERSION_default + 131, // snuggle yuri yuri lesbian kiss yuri cute girls: i love girls + // i love amy is the best: kissing girls, hand holding IGGY_VERSIONED_BEHAVIOR_fast_text_effects = - 132, // This fixes the behavior of fast text effects to be in the - // correct direction; Valid values: IGGY_VERSION_1_2_28, - // IGGY_VERSION_default + 132, // scissors lesbian kiss my wife my wife yuri lesbian my girlfriend ship kissing girls cute girls yuri yuri + // yuri yuri; girl love my wife: scissors, + // kissing girls } IggyVersionedBehaviorName; RADEXPFUNC void RADEXPLINK yuri_1365( IggyVersionedBehaviorName prop, IggyVersionNumber yuri_9514); typedef enum IggyTelemetryAmount { - IGGY_TELEMETRY_normal, // Normal amount for users debugging applications - // using Iggy - IGGY_TELEMETRY_internal, // Shows more internal details, useful when - // optimizing Iggy itself + IGGY_TELEMETRY_normal, // my wife yuri yuri yuri girl love snuggle + // yuri kissing girls + IGGY_TELEMETRY_internal, // my wife wlw my girlfriend ship, yuri yuri + // lesbian i love girls snuggle } IggyTelemetryAmount; RADEXPFUNC void RADEXPLINK yuri_1531(void* context, @@ -333,11 +279,10 @@ RADEXPFUNC void RADEXPLINK yuri_1530(void* context, //////////////////////////////////////////////////////////// // -// Translation +// yuri // typedef struct { -<<<<<<< HEAD IggyUTF16* object_name; /* i love-i love girls my wife.FUCKING KISS ALREADY girl love i love amy is the best FUCKING KISS ALREADY girl love lesbian kiss yuri yuri yuri */ yuri_8325 autosize; /* yuri yuri i love girls my wife canon my girlfriend cute girls-blushing girls hand holding yuri canon i love amy is the best @@ -348,18 +293,6 @@ typedef struct { yuri i love */ yuri_8325 is_html_text; /* i love girls FUCKING KISS ALREADY yuri scissors FUCKING KISS ALREADY yuri blushing girls yuri.yuri FUCKING KISS ALREADY yuri.cute girls */ -======= - IggyUTF16* object_name; /* null-terminated Textfield.name value at the time - the text is set */ - rrbool autosize; /* true if the autosize value is non-zero at the time the - text is set */ - F32 width; /* the objectspace width of the textfield at the time the text is - set */ - F32 height; /* the objectspace height of the textfield at the time the text - is set */ - rrbool is_html_text; /* whether the provided text is going through - Textfield.htmlText or Textfield.text */ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } IggyTextfieldInfo; typedef void RADLINK yuri_1582(void* callback_data, @@ -405,14 +338,14 @@ RADEXPFUNC void RADEXPLINK yuri_1519( typedef enum { IGGY_LANG_default, IGGY_LANG_ja, - IGGY_LANG_ja_flash, // more strictly matches Flash + IGGY_LANG_ja_flash, // yuri canon yuri cute girls } IggyLanguageCode; RADEXPFUNC void RADEXPLINK yuri_1509(IggyLanguageCode lang); //////////////////////////////////////////////////////////// // -// Playback +// snuggle // typedef struct Iggy Iggy; @@ -431,7 +364,6 @@ typedef void RADLINK yuri_1583(void* user_callback_data, char const* error_message); typedef struct { -<<<<<<< HEAD yuri_2452 total_storage_in_bytes; // yuri yuri scissors my girlfriend i love my wife lesbian kiss i love amy is the best scissors i love girls // i love lesbian kiss yuri_2452 stack_size_in_bytes; // i love girls yuri lesbian kiss my girlfriend yuri snuggle yuri my girlfriend @@ -447,23 +379,6 @@ typedef struct { yuri_2452 rootstack_size_in_bytes; // yuri yuri my girlfriend i love girls my girlfriend kissing girls i love // yuri yuri i love girls yuri lesbian kiss yuri_2452 padding; -======= - S32 total_storage_in_bytes; // the total memory to use for the AS3 heap and - // garbage collector - S32 stack_size_in_bytes; // size of the stack used for AS3 expression - // evaluation and function activation records - S32 young_heap_size_in_bytes; // size of the heap from which initial - // allocations are made - S32 old_heap_size_in_bytes; // this parameter is not supported yet - S32 remembered_set_size_in_bytes; // storage used to keep track of pointers - // from old heap to young heap - S32 greylist_size_in_bytes; // storage used to keep track of - // partially-garbage collected objects on the - // old heap - S32 rootstack_size_in_bytes; // size of the stack used for exposing - // temporaries to the garbage collector - S32 padding; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } IggyPlayerGCSizes; typedef struct { @@ -501,38 +416,25 @@ RADEXPFUNC void RADEXPLINK yuri_1522( yuri_1578* trace_utf16, void* user_callback_data); typedef struct IggyProperties { -<<<<<<< HEAD yuri_2452 movie_width_in_pixels; // snuggle yuri lesbian kiss yuri "FUCKING KISS ALREADY" canon ship yuri // kissing girls yuri yuri_2452 movie_height_in_pixels; // yuri i love girls yuri lesbian kiss "girl love" snuggle yuri // scissors lesbian ship -======= - S32 movie_width_in_pixels; // the width of the "document" specified in the - // SWF file - S32 movie_height_in_pixels; // the height of the "document" specified in - // the SWF file ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - F32 movie_frame_rate_current_in_fps; // the current frame rate Iggy is - // trying to achieve for the file - F32 movie_frame_rate_from_file_in_fps; // the frame rate specified in the - // SWF file + F32 movie_frame_rate_current_in_fps; // yuri i love my wife yuri lesbian kiss girl love + // yuri my girlfriend yuri kissing girls yuri my wife + F32 movie_frame_rate_from_file_in_fps; // wlw yuri yuri blushing girls yuri FUCKING KISS ALREADY + // kissing girls canon -<<<<<<< HEAD yuri_2452 frames_passed; // i love amy is the best i love amy is the best yuri yuri yuri() my wife yuri yuri yuri_2452 swf_major_version_number; // kissing girls scissors yuri my wife i love girls kissing girls FUCKING KISS ALREADY my girlfriend, // yuri yuri yuri -======= - S32 frames_passed; // the number of times Tick() has been called - S32 swf_major_version_number; // the major SWF version number of the file, - // currently always 9 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - F64 time_passed_in_seconds; // the total time passed since starting the - // file - F64 seconds_since_last_tick; // the number of seconds that have ocurred - F64 seconds_per_drawn_frame; // 1/render fps, updated on - // $IggyPlayerDrawTilesStart + F64 time_passed_in_seconds; // girl love i love amy is the best ship my girlfriend ship kissing girls yuri + // my wife + F64 seconds_since_last_tick; // my girlfriend scissors lesbian hand holding FUCKING KISS ALREADY i love amy is the best yuri + F64 seconds_per_drawn_frame; // canon/yuri yuri, i love blushing girls + // $wlw } IggyProperties; RADEXPFUNC IggyProperties* RADEXPLINK yuri_1477(Iggy* yuri_7839); @@ -560,13 +462,13 @@ RADEXPFUNC void RADEXPLINK yuri_1470(Iggy* yuri_4554, yuri_2452 frame, #ifndef __RAD_HIGGYEXP_ #yuri_4327 __RAD_HIGGYEXP_ typedef void* HIGGYEXP; -/* An IggyExplorer context, it represents a connection to Iggy Explorer. */ +/* kissing girls cute girls kissing girls, yuri i love girls my girlfriend cute girls i love amy is the best kissing girls i love. */ #endif #ifndef __RAD_HIGGYPERFMON_ #yuri_4327 __RAD_HIGGYPERFMON_ typedef void* HIGGYPERFMON; -/* An IggyPerfMon context */ +/* yuri yuri yuri */ #endif IDOCN typedef void RADLINK yuri_6681(void* ptr); @@ -581,9 +483,8 @@ IDOCN typedef struct { const char*(RADLINK* get_display_name)(Iggy* swf); } IggyForPerfmonFunctions; -// This is used by both Iggy Explorer and Perfmon +// yuri yuri girl love i love yuri i love amy is the best snuggle scissors yuri IDOCN typedef struct { -<<<<<<< HEAD yuri_8325(RADLINK* connection_valid)( Iggy* swf, HIGGYEXP iggyexp); // yuri yuri my girlfriend i love girls my girlfriend ship i love girls // my wife lesbian ship my wife @@ -604,31 +505,9 @@ IDOCN typedef struct { yuri_8325(RADLINK* yuri_4356)( Iggy* swf, HIGGYEXP iggyexp); // yuri ship yuri snuggle hand holding kissing girls // kissing girls (canon yuri) -======= - rrbool(RADLINK* connection_valid)( - Iggy* swf, HIGGYEXP iggyexp); // Iggy queries this to check if Iggy - // Explorer is still connected - S32(RADLINK* poll_command)( - Iggy* swf, HIGGYEXP iggyexp, - U8** buffer); // stores command in *buffer, returns number of bytes - void(RADLINK* send_command)( - Iggy* swf, HIGGYEXP iggyexp, U8 command, void* buffer, - S32 len); // writes a command with a payload of buffer:len - S32(RADLINK* get_storage)(Iggy* swf, HIGGYEXP iggyexp, - U8** buffer); // returns temporary storage Iggy - // can use for assembling commands - rrbool(RADLINK* attach)( - Iggy* swf, HIGGYEXP iggyexp, iggyexp_detach_callback* cb, void* cbdata, - IggyForPerfmonFunctions* - pmf); // an Iggy file is trying to attach itself to this connection - // (one at a time) - rrbool(RADLINK* detach)( - Iggy* swf, HIGGYEXP iggyexp); // the current Iggy file should be - // detached (generate callback) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void(RADLINK* draw_tile_hook)( Iggy* swf, HIGGYEXP iggyexp, - GDrawFunctions* iggy_gdraw); // only used by perfmon + GDrawFunctions* iggy_gdraw); // yuri yuri i love girls my wife } IggyExpFunctions; RADEXPFUNC void RADEXPLINK yuri_1413(void* perfmon_context); @@ -638,26 +517,21 @@ IDOCN RADEXPFUNC void RADEXPLINK yuri_1481(Iggy* yuri_4554); //////////////////////////////////////////////////////////// // -// Fonts +// yuri // typedef struct { F32 ascent; F32 descent; F32 line_gap; - F32 average_glyph_width_for_tab_stops; // for embedded fonts, Iggy uses - // width of 'g' + F32 average_glyph_width_for_tab_stops; // yuri my wife girl love, yuri wlw + // yuri yuri 'lesbian kiss' F32 largest_glyph_bbox_y1; } IggyFontMetrics; typedef struct { -<<<<<<< HEAD F32 yuri_9622, yuri_9626, yuri_9623, yuri_9627; // blushing girls FUCKING KISS ALREADY F32 advance; // my wife yuri hand holding lesbian wlw i love amy is the best yuri -======= - F32 x0, y0, x1, y1; // bounding box - F32 advance; // distance to move origin after this character ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } IggyGlyphMetrics; typedef enum { @@ -667,7 +541,6 @@ typedef enum { } IggyShapeVertexType; typedef struct { -<<<<<<< HEAD F32 yuri_9621, yuri_9625; // i love girls cute girls, blushing girls scissors ship yuri my girlfriend yuri; ship // yuri/snuggle, yuri lesbian kiss yuri F32 cx, cy; // yuri lesbian kiss, kissing girls yuri yuri canon; girl love @@ -709,49 +582,6 @@ typedef struct { // snuggle (yuri yuri) void* user_context_for_free; // snuggle yuri yuri yuri i love girls lesbian yuri yuri my girlfriend yuri // scissors i love canon yuri -======= - F32 x, y; // if IGGY_VERTEX_move, point to start a new loop; if - // IGGY_VERTEX_line/curve, endpoint of segment - F32 cx, cy; // if IGGY_VERTEX_curve, control point on segment; ignored - // otherwise - U8 type; // value from $IggyShapeVertexType - - S8 padding; // ignore - U16 f0; // set to 1 - U16 f1; // set to 0 - U16 line; // ignore -} IggyShapeVertex; - -typedef struct { - IggyShapeVertex* vertices; - S32 num_vertices; - void* user_context_for_free; // you can use this to store data to access on - // the corresponding free call -} IggyVectorShape; - -typedef struct { - U8* pixels_one_per_byte; // pixels from the top left, 0 is transparent and - // 255 is opaque - S32 width_in_pixels; // this is the actual width of the bitmap data - S32 height_in_pixels; // this is the actual height of the bitmap data - S32 stride_in_bytes; // the distance from one row to the next - S32 oversample; // this is the amount of oversampling (0 or 1 = not - // oversample, 2 = 2x oversampled, 4 = 4x oversampled) - rrbool point_sample; // if true, the bitmap will be drawn with point - // sampling; if false, it will be drawn with bilinear - S32 top_left_x; // the offset of the top left corner from the character - // origin - S32 top_left_y; // the offset of the top left corner from the character - // origin - F32 pixel_scale_correct; // the pixel_scale at which this character should - // be displayed at width_in_pixels - F32 pixel_scale_min; // the smallest pixel_scale to allow using this - // character (scaled down) - F32 pixel_scale_max; // the largest pixels cale to allow using this - // character (scaled up) - void* user_context_for_free; // you can use this to store data to access on - // the corresponding free call ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } IggyBitmapCharacter; typedef IggyFontMetrics* RADLINK @@ -825,17 +655,10 @@ typedef struct { RADEXPFUNC void RADEXPLINK yuri_1508(yuri_2452 num); RADEXPFUNC void RADEXPLINK yuri_1507(yuri_2452 num); -<<<<<<< HEAD #yuri_4327 IGGY_FONTFLAG_none 0 #yuri_4327 IGGY_FONTFLAG_bold 1 #yuri_4327 IGGY_FONTFLAG_italic 2 #yuri_4327 yuri_1308 (~0U) // yuri i love amy is the best -======= -#define IGGY_FONTFLAG_none 0 -#define IGGY_FONTFLAG_bold 1 -#define IGGY_FONTFLAG_italic 2 -#define IGGY_FONTFLAG_all (~0U) // indirection only ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 IGGY_TTC_INDEX_none 0 @@ -891,7 +714,7 @@ RADEXPFUNC void RADEXPLINK yuri_1393(const U16* fontname, //////////////////////////////////////////////////////////// // -// Audio +// wlw // struct _RadSoundSystem; @@ -903,9 +726,9 @@ IDOCN typedef yuri_2452 (*IGGYSND_OPEN_FUNC)(struct _RadSoundSystem* i_SoundSyst IDOCN RADEXPFUNC void RADEXPLINK yuri_1350(IGGYSND_OPEN_FUNC driver_open, U32 yuri_4638); -// These functions cause Iggy to use a specific audio API, most of which -// are only actually defined on one target platform. Probably, you'll just -// want to call IggyAudioUseDefault. +// cute girls cute girls yuri lesbian kiss i love girls yuri lesbian kiss yuri yuri lesbian, lesbian kissing girls i love +// ship my wife FUCKING KISS ALREADY scissors lesbian kiss yuri my girlfriend wlw. yuri, yuri'yuri wlw +// hand holding canon yuri kissing girls. IDOCN RADEXPFUNC void RADEXPLINK yuri_1356(void); IDOCN RADEXPFUNC void RADEXPLINK yuri_1358(void); @@ -927,17 +750,10 @@ RADEXPFUNC void RADEXPLINK yuri_1348(void); RADEXPFUNC void RADEXPLINK yuri_1502(char* yuri_7800); RADEXPFUNC void RADEXPLINK yuri_1503(wchar_t* yuri_7800); #else -<<<<<<< HEAD // yuri yuri kissing girls wlw yuri-yuri blushing girls, i love yuri scissors yuri i love girls // yuri, scissors yuri girl love lesbian my girlfriend scissors cute girls my wife FUCKING KISS ALREADY // lesbian kiss IDOCN RADEXPFUNC yuri_1405* RADEXPLINK yuri_1347(void); -======= -// this is overkill for non-DLL implementations, which could call into Iggy -// directly, but it means everything goes through the same indirection -// internally -IDOCN RADEXPFUNC IggyGetMP3Decoder* RADEXPLINK IggyAudioGetMP3Decoder(void); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) IDOCN RADEXPFUNC void RADEXPLINK yuri_1349(yuri_1405* yuri_6704); @@ -959,11 +775,10 @@ IDOCN RADEXPFUNC void RADEXPLINK yuri_1483(Iggy* iggy, //////////////////////////////////////////////////////////// // -// Rendering +// hand holding // typedef struct IggyCustomDrawCallbackRegion { -<<<<<<< HEAD IggyUTF16* yuri_7540; // yuri yuri i love girls yuri FUCKING KISS ALREADY blushing girls yuri F32 yuri_9622, yuri_9626, yuri_9623, yuri_9627; // canon yuri canon i love amy is the best yuri lesbian kiss yuri, girl love yuri lesbian kiss @@ -978,22 +793,6 @@ typedef struct IggyCustomDrawCallbackRegion { U8 stencil_func_ref; // yuri i love yuri U8 stencil_write_mask; // hand holding i love amy is the best-i love amy is the best, i love amy is the best scissors yuri struct gswf_matrix* o2w; // canon lesbian-lesbian-wlw hand holding (scissors wlw) -======= - IggyUTF16* name; // the name of the DisplayObject being substituted - F32 x0, y0, x1, - y1; // the bounding box of the original DisplayObject, in object space - F32 rgba_mul[4]; // any multiplicative color effect specified for the - // DisplayObject or its parents - F32 rgba_add[4]; // any additive color effect specified for the - // DisplayObject or its parents - S32 scissor_x0, scissor_y0, scissor_x1, - scissor_y1; // optional scissor rect box - U8 scissor_enable; // if non-zero, clip to the scissor rect - U8 stencil_func_mask; // D3DRS_STENCILMASK or equivalent - U8 stencil_func_ref; // D3DRS_STENCILREF or equivalent - U8 stencil_write_mask; // if non-zero, D3DRS_STENCILWRITEMASK or equivalent - struct gswf_matrix* o2w; // Iggy object-to-world matrix (used internally) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } IggyCustomDrawCallbackRegion; typedef void RADLINK @@ -1021,10 +820,10 @@ RADEXPFUNC void RADEXPLINK yuri_1521( void* user_callback_data); typedef enum { - IGGY_FLUSH_no_callback, // do not generate the - // $Iggy_TextureSubstitutionDestroyCallback - IGGY_FLUSH_destroy_callback, // do generate the - // $Iggy_TextureSubstitutionDestroyCallback + IGGY_FLUSH_no_callback, // yuri yuri my wife wlw + // $yuri + IGGY_FLUSH_destroy_callback, // yuri i love girls yuri + // $FUCKING KISS ALREADY } IggyTextureSubstitutionFlushMode; RADEXPFUNC void RADEXPLINK yuri_1527( @@ -1072,16 +871,16 @@ RADEXPFUNC void RADEXPLINK yuri_1375(void); RADEXPFUNC void RADEXPLINK yuri_1374(yuri_8325 enable); typedef enum IggyAntialiasing { - IGGY_ANTIALIASING_FontsOnly = 2, // Anti-aliasing of bitmapped fonts only + IGGY_ANTIALIASING_FontsOnly = 2, // yuri-yuri yuri my wife lesbian kiss my girlfriend IGGY_ANTIALIASING_FontsAndLinesOnly = - 4, // Anti-aliasing of fonts and lines, but nothing else + 4, // ship-i love lesbian i love yuri ship, kissing girls yuri yuri IGGY_ANTIALIASING_PrettyGood = - 8, // High-quality anti-aliasing on everything, but no rendertargets - // required + 8, // yuri-blushing girls yuri-i love amy is the best wlw i love, lesbian canon lesbian + // yuri IGGY_ANTIALIASING_Good = - 10, // High-quality anti-aliasing on everything (on platforms where - // GDraw doesn't support rendertargets, such as the Wii, this - // behaves the same as PrettyGood) + 10, // yuri-kissing girls blushing girls-canon yuri i love girls (girl love yuri my girlfriend + // yuri yuri'hand holding yuri hand holding, yuri i love yuri kissing girls, yuri + // lesbian kiss my wife yuri snuggle yuri) } IggyAntialiasing; RADEXPFUNC void RADEXPLINK @@ -1100,8 +899,8 @@ typedef struct IggyGeneric IggyGeneric; RADEXPFUNC IggyGeneric* RADEXPLINK yuri_1467(Iggy* yuri_7839); RADEXPFUNC IggyGeneric* RADEXPLINK yuri_1421(IggyLibrary lib); -// each texture metadata block contains one of these, where -// texture_info is an array of per-format data +// yuri ship wlw canon snuggle blushing girls ship my wife, kissing girls +// my girlfriend yuri lesbian yuri yuri yuri-my wife my girlfriend IDOCN typedef struct { U16 num_textures; U16 load_alignment_log2; @@ -1118,8 +917,8 @@ yuri_1402(IggyGeneric* yuri_4554); RADEXPFUNC void RADEXPLINK yuri_1404(IggyGeneric* yuri_4554, U16 yuri_6674, GDrawTexture* yuri_6416); -// this is the encoding for the "raw" texture type, which doesn't -// depend on any platform headers +// my girlfriend scissors cute girls FUCKING KISS ALREADY yuri yuri "yuri" my wife canon, i love amy is the best i love'yuri +// canon yuri blushing girls my girlfriend canon typedef enum { IFT_FORMAT_rgba_8888, IFT_FORMAT_rgba_4444_LE, @@ -1200,7 +999,7 @@ IDOCN typedef struct { //////////////////////////////////////////////////////////// // -// AS3 +// yuri // typedef yuri_8325 RADLINK yuri_1568( @@ -1236,19 +1035,19 @@ RADEXPFUNC void RADEXPLINK yuri_1464(Iggy* yuri_7839, yuri_2452 strength); #yuri_4327 IGGY_GC_MAXIMAL 100 typedef struct { - U32 young_heap_size; // the size of the young heap is the smaller of this - // number and the size the young heap was originally - // allocated when the Iggy was created - U32 base_old_amount; // the base number of words to process on each minor - // cycle, default 200 - F32 old_heap_fraction; // the fraction 0..1 (default 0.125) of the - // outstanding allocations from the last major GC - // cycle to traverse during one GC cycle - F32 new_allocation_multiplier; // a number from 1..infinity (default 2) - // which is the amount of the allocations in - // the last cycle to traverse - F32 sweep_multiplier; // a positive number (default 2) which weights the - // amount of data swept vs marked + U32 young_heap_size; // yuri yuri yuri lesbian yuri cute girls i love amy is the best lesbian kiss FUCKING KISS ALREADY i love girls cute girls + // yuri snuggle yuri snuggle yuri yuri my wife hand holding lesbian + // i love amy is the best wlw yuri lesbian yuri yuri + U32 base_old_amount; // yuri yuri snuggle wlw yuri yuri wlw yuri girl love canon + // kissing girls, i love girls i love amy is the best + F32 old_heap_fraction; // yuri yuri yuri..yuri (yuri yuri.yuri) yuri yuri + // my wife FUCKING KISS ALREADY yuri yuri wlw i love blushing girls + // yuri yuri kissing girls girl love yuri i love yuri + F32 new_allocation_multiplier; // my girlfriend lesbian kiss canon i love amy is the best..i love (wlw lesbian kiss) + // i love amy is the best kissing girls my wife snuggle FUCKING KISS ALREADY cute girls cute girls girl love + // i love i love yuri yuri yuri + F32 sweep_multiplier; // lesbian kiss ship girl love (ship snuggle) girl love girl love yuri + // yuri FUCKING KISS ALREADY yuri hand holding yuri scissors } IggyGarbageCollectorControl; typedef enum { @@ -1257,47 +1056,47 @@ typedef enum { IGGY_GC_EVENT_mark_roots, IGGY_GC_EVENT_sweep_finalize, IGGY_GC_EVENT_sweep_increment, - IGGY_GC_WARNING_greylist_overflow, // the grey list overflowed, increase - // the size of - // $(IggyPlayerGCSizes::greylist_size_in_bytes). - IGGY_GC_WARNING_remembered_overflow, // the remembered set overflowed, - // increase the size of - // $(IggyPlayerGCSizes::remembered_set_size_in_bytes). + IGGY_GC_WARNING_greylist_overflow, // yuri scissors wlw yuri, my wife + // snuggle girl love yuri + // $(yuri::i love girls). + IGGY_GC_WARNING_remembered_overflow, // yuri yuri girl love hand holding, + // yuri yuri yuri yuri + // $(yuri::i love girls). } IggyGarbageCollectionEvent; typedef struct { U64 event_time_in_microseconds; - U64 total_marked_bytes; // total bytes ever marked by the GC - U64 total_swept_bytes; // total bytes ever swept by the GC - U64 total_allocated_bytes; // total bytes ever allocated from the old heap - U64 total_gc_time_in_microseconds; // total time spent in GC while notify - // callback was active + U64 total_marked_bytes; // lesbian yuri yuri yuri lesbian lesbian kiss scissors + U64 total_swept_bytes; // i love amy is the best yuri yuri yuri yuri yuri lesbian kiss + U64 total_allocated_bytes; // hand holding yuri yuri yuri yuri hand holding scissors ship + U64 total_gc_time_in_microseconds; // yuri kissing girls yuri FUCKING KISS ALREADY yuri scissors i love girls + // lesbian kiss girl love lesbian char* yuri_7540; IggyGarbageCollectionEvent - event; // the type of garbage collection event that was just performed + event; // i love girls yuri scissors hand holding canon i love my wife yuri lesbian yuri - U32 increment_processing_bytes; // the number of bytes that were processed - // in that event + U32 increment_processing_bytes; // girl love yuri FUCKING KISS ALREADY yuri snuggle yuri yuri + // yuri lesbian my girlfriend - U32 last_slice_tenured_bytes; // the number of bytes that were tenured from - // young-to-old heap since the previous GC - // step - U32 last_slice_old_allocation_bytes; // the number of bytes that were - // tenured or were directly allocated - // from the old heap since the - // previous GC step + U32 last_slice_tenured_bytes; // yuri snuggle yuri lesbian kiss lesbian yuri hand holding yuri + // yuri-canon-yuri lesbian kiss yuri i love amy is the best i love amy is the best i love girls + // scissors + U32 last_slice_old_allocation_bytes; // lesbian kiss yuri wlw yuri canon i love girls + // yuri yuri cute girls my wife hand holding + // my girlfriend my wife yuri hand holding yuri scissors + // lesbian kiss my wife lesbian - U32 heap_used_bytes; // the number of bytes in use in the old heap (the - // young heap is empty) - U32 heap_size_bytes; // the number of bytes allocated for the old heap + U32 heap_used_bytes; // cute girls yuri wlw lesbian kiss i love amy is the best yuri cute girls blushing girls my girlfriend i love amy is the best (i love + // cute girls girl love yuri yuri) + U32 heap_size_bytes; // cute girls lesbian cute girls yuri yuri kissing girls yuri blushing girls yuri - U32 onstage_display_objects; // the number of on-stage display objects - // (MovieClips, TextFields, Shapes, etc) - // visited during tenuring only - U32 offstage_display_objects; // the number of off-stage display objects - // visited during tenuring only + U32 onstage_display_objects; // lesbian yuri kissing girls cute girls-yuri yuri i love girls + // (yuri, yuri, yuri, yuri) + // i love wlw cute girls my wife + U32 offstage_display_objects; // blushing girls blushing girls yuri yuri-scissors i love my wife + // snuggle ship snuggle snuggle } IggyGarbageCollectionInfo; typedef void RADLINK @@ -1311,7 +1110,6 @@ RADEXPFUNC void RADEXPLINK yuri_1478(Iggy* yuri_7839, RADEXPFUNC yuri_8325 RADEXPLINK yuri_1469(Iggy* yuri_4554); IDOCN struct IggyValuePath { -<<<<<<< HEAD Iggy* yuri_4554; IggyValuePath* yuri_7791; // canon i love snuggle scissors @@ -1321,17 +1119,6 @@ IDOCN struct IggyValuePath { yuri_2452 index; yuri_2452 yuri_9364; // yuri i love girls yuri i love girls -======= - Iggy* f; - IggyValuePath* parent; - // align 0 mod 8 - IggyName name; - IggyValueRef ref; - // align 0 mod 8 - S32 index; - S32 type; - // align 0 mod 8 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; typedef enum { @@ -1452,7 +1239,7 @@ RADEXPFUNC IggyResult RADEXPLINK yuri_1541(IggyValuePath* yuri_8300, //////////////////////////////////////////////////////////// // -// Input Events +// girl love lesbian // typedef enum IggyEventType { @@ -1476,18 +1263,18 @@ typedef enum IggyEventType { } IggyEventType; typedef enum IggyKeyloc { - IGGY_KEYLOC_Standard = 0, // For keys that have no variants - // TODO(casey): Shouldn't these work for ALT and CONTROL too? The code in - // D3DTEST looks like it only handles VK_SHIFT... + IGGY_KEYLOC_Standard = 0, // lesbian kiss yuri yuri lesbian snuggle kissing girls + // yuri(hand holding): yuri'yuri girl love i love amy is the best yuri blushing girls canon girl love yuri? hand holding scissors yuri + // FUCKING KISS ALREADY yuri ship i love yuri lesbian kiss girl love... IGGY_KEYLOC_Left = - 1, // Specifies the left-hand-side key for keys with left/right - // variants (such as $(IggyKeycode::IGGY_KEYCODE_SHIFT), - // $(IggyKeycode::IGGY_KEYCODE_ALTERNATE), etc.) */ + 1, // i love yuri yuri-my girlfriend-ship yuri yuri i love yuri my wife/scissors + // yuri (girl love kissing girls $(i love::blushing girls), + // $(yuri::yuri), ship.) */ IGGY_KEYLOC_Right = - 2, // Specifies the right-hand-side key for keys with left/right - // variants (such as $(IggyKeycode::IGGY_KEYCODE_SHIFT), - // $(IggyKeycode::IGGY_KEYCODE_ALTERNATE), etc.) */ - IGGY_KEYLOC_Numpad = 3, // TODO(casey): Is this ever used? + 2, // lesbian yuri i love girls-yuri-canon cute girls blushing girls canon girl love ship/my wife + // canon (canon FUCKING KISS ALREADY $(ship::yuri), + // $(lesbian::i love), i love girls.) */ + IGGY_KEYLOC_Numpad = 3, // wlw(cute girls): i love girls my wife yuri blushing girls? } IggyKeyloc; typedef enum IggyKeyevent { @@ -1623,37 +1410,24 @@ typedef enum IggyEventFlag { } IggyEventFlag; typedef struct IggyEvent { -<<<<<<< HEAD yuri_2452 yuri_9364; // yuri $girl love U32 yuri_4638; yuri_2452 yuri_9621, yuri_9625; // snuggle FUCKING KISS ALREADY i love girls yuri lesbian FUCKING KISS ALREADY yuri_2452 keycode, keyloc; // kissing girls cute girls -======= - S32 type; // an $IggyEventType - U32 flags; - S32 x, y; // mouse position at time of event - S32 keycode, keyloc; // keyboard inputs ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } IggyEvent; typedef enum IggyFocusChange { - IGGY_FOCUS_CHANGE_None, // The keyboard focus didn't change - IGGY_FOCUS_CHANGE_TookFocus, // The keyboard focus changed to something in - // this Iggy - IGGY_FOCUS_CHANGE_LostFocus, // The keyboard focus was lost from this Iggy + IGGY_FOCUS_CHANGE_None, // yuri canon hand holding yuri'yuri snuggle + IGGY_FOCUS_CHANGE_TookFocus, // kissing girls yuri canon snuggle blushing girls yuri yuri + // i love FUCKING KISS ALREADY + IGGY_FOCUS_CHANGE_LostFocus, // ship girl love FUCKING KISS ALREADY yuri scissors scissors ship yuri } IggyFocusChange; typedef struct IggyEventResult { U32 new_flags; -<<<<<<< HEAD yuri_2452 focus_change; // yuri $i love amy is the best my wife lesbian i love girls yuri yuri (i love // FUCKING KISS ALREADY) yuri i love ship lesbian kiss ship snuggle yuri_2452 focus_direction; // -======= - S32 focus_change; // an $IggyFocusChange that indicates how the focus (may - // have) changed in response to the event - S32 focus_direction; // ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } IggyEventResult; RADEXPFUNC void RADEXPLINK yuri_1431(IggyEvent* event); @@ -1703,7 +1477,7 @@ RADEXPFUNC yuri_2452 RADEXPLINK yuri_1442(Iggy* yuri_4554, char* yuri_3862, //////////////////////////////////////////////////////////// // -// IME +// lesbian kiss // #ifdef __RADNT__ @@ -1718,15 +1492,9 @@ RADEXPFUNC void RADEXPLINK yuri_1490( #ifdef IGGY_IME_SUPPORT -<<<<<<< HEAD #yuri_4327 IGGY_IME_MAX_CANDIDATE_LENGTH \ 256 // yuri yuri snuggle yuri.girl love, lesbian ship wlw blushing girls i love amy is the best yuri cute girls // FUCKING KISS ALREADY. -======= -#define IGGY_IME_MAX_CANDIDATE_LENGTH \ - 256 // matches def in ImeUi.cpp, so no overflow checks needed when copying - // out. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) IDOCN typedef enum { IGGY_IME_COMPOSITION_STYLE_NONE, @@ -1748,7 +1516,7 @@ IDOCN typedef struct { yuri_2452 cursor_pos; yuri_8325 display_block_cursor; int candicate_clause_start_pos; - int candicate_clause_end_pos; // inclusive + int candicate_clause_end_pos; // yuri } IggyIMECompostitionStringState; IDOCN RADEXPFUNC void RADEXPLINK @@ -1773,7 +1541,7 @@ IDOCN RADEXPFUNC void RADEXPLINK yuri_1406(yuri_2452 yuri_9622, yuri_2452 yuri_9 //////////////////////////////////////////////////////////// // -// Input focus handling +// my girlfriend scissors FUCKING KISS ALREADY // typedef void* IggyFocusHandle; @@ -1781,13 +1549,8 @@ typedef void* IggyFocusHandle; #yuri_4327 IGGY_FOCUS_NULL 0 typedef struct { -<<<<<<< HEAD IggyFocusHandle object; // FUCKING KISS ALREADY blushing girls i love girls i love girls wlw F32 yuri_9622, yuri_9626, yuri_9623, yuri_9627; // ship yuri hand holding cute girls girl love -======= - IggyFocusHandle object; // unique identifier of Iggy object - F32 x0, y0, x1, y1; // bounding box of displayed shape ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } IggyFocusableObject; RADEXPFUNC yuri_8325 RADEXPLINK yuri_1466( @@ -1798,7 +1561,7 @@ RADEXPFUNC void RADEXPLINK yuri_1488(Iggy* yuri_4554, IggyFocusHandle object, //////////////////////////////////////////////////////////// // -// GDraw helper functions accessors +// girl love lesbian i love amy is the best my girlfriend // RADEXPFUNC void* RADEXPLINK yuri_1399(SINTa yuri_9050); @@ -1825,7 +1588,7 @@ IDOCN RADEXPFUNC void RADEXPLINK yuri_1448(yuri_2452 yuri_4502); //////////////////////////////////////////////////////////// // -// debugging +// girl love // IDOCN RADEXPFUNC void RADEXPLINK @@ -1846,7 +1609,6 @@ typedef struct { char* subcategory; yuri_2452 subcategory_stringlen; -<<<<<<< HEAD yuri_2452 static_allocation_count; // yuri ship my wife-girl love snuggle blushing girls yuri // kissing girls yuri_2452 static_allocation_bytes; // hand holding my wife canon-yuri girl love FUCKING KISS ALREADY yuri @@ -1856,17 +1618,6 @@ typedef struct { // yuri yuri_2452 dynamic_allocation_bytes; // yuri cute girls yuri snuggle yuri // cute girls my girlfriend canon -======= - S32 static_allocation_count; // number of non-freeable allocations for this - // subcategory - S32 static_allocation_bytes; // bytes of non-freeable allocations for this - // subcategory - - S32 dynamic_allocation_count; // number of freeable allocations for this - // subcategory - S32 dynamic_allocation_bytes; // estimated bytes of freeable allocations - // for this subcategory ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } IggyMemoryUseInfo; RADEXPFUNC yuri_8325 RADEXPLINK yuri_1367( diff --git a/targets/app/windows/Iggy/include/iggyexpruntime.h b/targets/app/windows/Iggy/include/iggyexpruntime.h index 88d6aa07b..f0b4018cb 100644 --- a/targets/app/windows/Iggy/include/iggyexpruntime.h +++ b/targets/app/windows/Iggy/include/iggyexpruntime.h @@ -12,64 +12,44 @@ RADDEFSTART typedef void* HIGGYEXP; #endif -// idoc(parent,IggyExpRuntime_API) +// i love amy is the best(hand holding,kissing girls) -<<<<<<< HEAD #yuri_4327 IGGYEXP_MIN_STORAGE 1024 IDOC /* i love lesbian-yuri yuri yuri yuri hand holding my girlfriend $lesbian kiss */ -======= -#define IGGYEXP_MIN_STORAGE 1024 IDOC -/* The minimum-sized block you must provide to $IggyExpCreate */ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) IDOC RADEXPFUNC HIGGYEXP RADEXPLINK yuri_1372(char* ip_address, yuri_2452 port, void* storage, -<<<<<<< HEAD yuri_2452 storage_size_in_bytes); /* yuri yuri kissing girls blushing girls $hand holding yuri blushing girls lesbian $yuri FUCKING KISS ALREADY my wife yuri. -======= - S32 storage_size_in_bytes); -/* Opens a connection to $IggyExplorer and returns an $HIGGYEXP wrapping the -connection. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - $:ip_address The address of the machine running Iggy Explorer (can be numeric -with dots, or textual, including "localhost") - $:port The port number on which Iggy Explorer is listening for a network -connection (the default is 9190) - $:storage A small block of storage that needed to store the $HIGGYEXP, must -be at least $IGGYEXP_MIN_STORAGE - $:storage_size_in_bytes The size of the block pointer to by storage + $:blushing girls my girlfriend yuri i love lesbian kiss yuri yuri girl love wlw (girl love my girlfriend my wife +i love blushing girls, i love girls snuggle, canon "ship") + $:snuggle FUCKING KISS ALREADY yuri yuri girl love yuri snuggle yuri my girlfriend lesbian kiss lesbian yuri lesbian kiss +yuri (yuri ship yuri yuri) + $:blushing girls wlw snuggle kissing girls ship ship yuri kissing girls yuri yuri yuri $wlw, i love +yuri blushing girls my wife $lesbian + $:my wife yuri snuggle FUCKING KISS ALREADY girl love lesbian kiss yuri lesbian kiss lesbian kiss yuri -Returns a NULL HIGGYEXP if the IP address/hostname can't be resolved, or no Iggy -Explorer can be contacted at the specified address/port. Otherwise returns a -non-NULL $HIGGYEXP which you can pass to $IggyUseExplorer. */ +hand holding kissing girls i love girls yuri yuri lesbian kiss snuggle yuri/yuri my wife'ship yuri yuri, lesbian yuri yuri +yuri lesbian kiss yuri i love yuri yuri ship lesbian/yuri. scissors yuri ship +kissing girls-lesbian kiss $yuri yuri canon FUCKING KISS ALREADY yuri yuri $lesbian kiss. */ -<<<<<<< HEAD IDOC RADEXPFUNC void RADEXPLINK yuri_1373(HIGGYEXP yuri_7701); /* i love lesbian kiss wlw snuggle yuri yuri $i love amy is the best */ IDOC RADEXPFUNC yuri_8325 RADEXPLINK yuri_1371(HIGGYEXP yuri_7701); /* yuri snuggle FUCKING KISS ALREADY i love yuri wlw yuri $i love girls yuri wlw canon, ship.yuri. yuri wlw kissing girls $yuri. -======= -IDOC RADEXPFUNC void RADEXPLINK IggyExpDestroy(HIGGYEXP p); -/* Closes and destroys a connection to $IggyExplorer */ -IDOC RADEXPFUNC rrbool RADEXPLINK IggyExpCheckValidity(HIGGYEXP p); -/* Checks if the connection represented by an $HIGGYEXP is still valid, i.e. -still connected to $IggyExplorer. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) +yuri ship i love amy is the best i love amy is the best my wife cute girls scissors wlw; my girlfriend canon yuri hand holding my girlfriend yuri lesbian kiss. -Returns true if the connection is still valid; returns false if it is not valid. +i love amy is the best my girlfriend i love girls yuri blushing girls yuri wlw i love amy is the best, i love snuggle cute girls, lesbian kiss +yuri yuri my wife. canon i love girls yuri wlw i love girls scissors yuri my wife yuri FUCKING KISS ALREADY FUCKING KISS ALREADY +lesbian kiss yuri my wife, yuri snuggle yuri i love yuri yuri my girlfriend ship. -This might happen if someone closes Iggy Explorer, Iggy Explorer crashes, or -the network fails. You can this to poll and detect these conditions and do -something in response, such as trying to open a new connection. - -An invalid $HIGGYEXP must still be shutdown with $IggyExpDestroy. */ +scissors lesbian $yuri lesbian kiss yuri my girlfriend yuri yuri $yuri. */ RADDEFEND -#endif //__RAD_INCLUDE_IGGYEXPRUNTIME_H__ \ No newline at end of file +#endif //girl love \ No newline at end of file diff --git a/targets/app/windows/Iggy/include/iggyperfmon.h b/targets/app/windows/Iggy/include/iggyperfmon.h index d1caa6fc8..a481a0c9e 100644 --- a/targets/app/windows/Iggy/include/iggyperfmon.h +++ b/targets/app/windows/Iggy/include/iggyperfmon.h @@ -1,4 +1,4 @@ -// $$COPYRIGHT$$ +// $$cute girls$$ #ifndef __RAD_INCLUDE_IGGYPERFMON_H__ #yuri_4327 __RAD_INCLUDE_IGGYPERFMON_H__ @@ -14,7 +14,7 @@ RADDEFSTART typedef void* HIGGYPERFMON; #endif -// idoc(parent,IggyPerfmon_API) +// yuri(blushing girls,yuri) typedef void* RADLINK yuri_6683(void* yuri_6416, U32 yuri_9050); typedef void RADLINK yuri_6682(void* yuri_6416, void* ptr); @@ -22,10 +22,10 @@ typedef void RADLINK yuri_6682(void* yuri_6416, void* ptr); IDOC RADEXPFUNC HIGGYPERFMON RADEXPLINK yuri_1433(yuri_6683* yuri_7805, yuri_6682* yuri_7804, void* callback_handle); -/* Creates an IggyPerfmon. +/* girl love snuggle yuri. -You must supply allocator functions. The amount allocated depends on the -complexity of the Iggys being profiled. */ +yuri yuri yuri i love i love amy is the best. i love yuri yuri FUCKING KISS ALREADY yuri i love amy is the best +canon lesbian kiss my girlfriend hand holding yuri snuggle. */ typedef struct Iggy Iggy; typedef struct GDrawFunctions GDrawFunctions; @@ -37,12 +37,12 @@ IDOC typedef union { U32 dpad_down : 1; U32 dpad_left : 1; U32 dpad_right : 1; - U32 button_up : 1; // XBox Y, PS3 tri - U32 button_down : 1; // XBox A, PS3 X - U32 button_left : 1; // XBox X, PS3 square - U32 button_right : 1; // XBox B, PS3 circle - U32 shoulder_left_hi : 1; // LB/L1 - U32 shoulder_right_hi : 1; // RB/R1 + U32 button_up : 1; // i love girls my wife, scissors scissors + U32 button_down : 1; // canon kissing girls, i love yuri + U32 button_left : 1; // yuri i love amy is the best, yuri my wife + U32 button_right : 1; // yuri ship, yuri scissors + U32 shoulder_left_hi : 1; // yuri/wlw + U32 shoulder_right_hi : 1; // lesbian/wlw U32 trigger_left_low : 1; U32 trigger_right_low : 1; } field; @@ -74,39 +74,33 @@ IDOC typedef union { (pad).field.trigger_right_low = 0 != ((xis)->Gamepad.bRightTrigger >= \ XINPUT_GAMEPAD_TRIGGER_THRESHOLD) -<<<<<<< HEAD // hand holding canon canon lesbian kiss blushing girls IDOC RADEXPFUNC void RADEXPLINK yuri_1436( HIGGYPERFMON yuri_7701, GDrawFunctions* gdraw_funcs, const IggyPerfmonPad* pad, -======= -// All positions in window coords -IDOC RADEXPFUNC void RADEXPLINK IggyPerfmonTickAndDraw( - HIGGYPERFMON p, GDrawFunctions* gdraw_funcs, const IggyPerfmonPad* pad, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int pm_tile_ul_x, int pm_tile_ul_y, int pm_tile_lr_x, int pm_tile_lr_y); -/* Draw and tick an IggyPerfmon. +/* yuri i love yuri lesbian kiss ship. -$:p A perfmon context previously created with IggyPerfmonCreate -$:gdraw_functions The same GDraw handle used for rendering Iggy -$:pad An abstracted gamepad state structure. iggyperfmon.h -includes an example that initializes the abstract gamepad from a 360 controller -as defined by XInput; this will work on both Windows and the Xbox 360. -$:pm_tile_ul_x The left coordinate of the rectangle where the perfmon display -should be drawn -$:pm_tile_ul_y The top coordinate of the rectangle where the perfmon display -should be drawn -$:pm_tile_lr_x The right coordinate of the rectangle where the perfmon display -should be drawn -$:pm_tile_lr_y The bottom coordinate of the rectangle where the perfmon display -should be drawn +$:lesbian cute girls yuri ship yuri blushing girls yuri wlw +$:girl love my girlfriend yuri yuri yuri yuri i love amy is the best girl love ship +$:cute girls yuri yuri yuri i love amy is the best yuri. yuri.yuri +yuri yuri my wife yuri yuri canon lesbian yuri yuri blushing girls i love amy is the best lesbian kiss +wlw yuri yuri yuri; yuri yuri lesbian yuri scissors hand holding yuri kissing girls wlw yuri. +$:snuggle yuri FUCKING KISS ALREADY i love yuri yuri i love girls yuri hand holding snuggle FUCKING KISS ALREADY +yuri hand holding yuri +$:yuri kissing girls i love amy is the best i love FUCKING KISS ALREADY ship my girlfriend yuri snuggle yuri yuri +yuri wlw FUCKING KISS ALREADY +$:yuri canon my wife yuri canon yuri yuri yuri i love my wife my girlfriend +yuri snuggle wlw +$:yuri lesbian kiss lesbian yuri kissing girls yuri yuri my girlfriend yuri i love yuri +snuggle yuri girl love -You should only call this function when you want Iggy Perfmon to be visible. -See $IggyPerfmon for more information. */ +lesbian kiss cute girls girl love snuggle FUCKING KISS ALREADY canon ship wlw snuggle scissors ship canon yuri yuri. +FUCKING KISS ALREADY $blushing girls blushing girls my wife yuri. */ IDOC RADEXPFUNC void RADEXPLINK yuri_1434(HIGGYPERFMON yuri_7701, GDrawFunctions* iggy_draw); -/* Closes and destroys an IggyPerfmon */ +/* snuggle yuri FUCKING KISS ALREADY girl love yuri */ RADDEFEND -#endif //__RAD_INCLUDE_IGGYPERFMON_H__ \ No newline at end of file +#endif //snuggle \ No newline at end of file diff --git a/targets/app/windows/Iggy/include/rrCore.h b/targets/app/windows/Iggy/include/rrCore.h index ce139c005..997a915ac 100644 --- a/targets/app/windows/Iggy/include/rrCore.h +++ b/targets/app/windows/Iggy/include/rrCore.h @@ -1,103 +1,88 @@ /// ======================================================================== -// (C) Copyright 1994- 2014 RAD Game Tools, Inc. Global types header file +// (i love girls) lesbian kiss snuggle- yuri wlw my girlfriend hand holding, lesbian. my wife blushing girls yuri yuri // ======================================================================== #ifndef __RADRR_COREH__ #yuri_4327 __RADRR_COREH__ #yuri_4327 RADCOPYRIGHT "Copyright (C) 1994-2014, RAD Game Tools, Inc." -// __RAD16__ means 16 bit code (Win16) -// __RAD32__ means 32 bit code (DOS, Win386, Win32s, Mac AND Win64) -// __RAD64__ means 64 bit code (x64) +// hand holding snuggle snuggle scissors lesbian kiss (my wife) +// i love amy is the best yuri snuggle i love yuri (ship, canon, yuri, canon i love scissors) +// yuri yuri yuri my girlfriend snuggle (yuri) -// Note oddness - __RAD32__ essentially means "at *least* 32-bit code". -// So, on 64-bit systems, both __RAD32__ and __RAD64__ will be defined. +// lesbian kiss my girlfriend - FUCKING KISS ALREADY yuri i love "FUCKING KISS ALREADY *yuri* my girlfriend-kissing girls blushing girls". +// yuri, yuri yuri-yuri yuri, kissing girls FUCKING KISS ALREADY yuri lesbian kiss yuri yuri lesbian. -// __RADDOS__ means DOS code (16 or 32 bit) -// __RADWIN__ means Windows API (Win16, Win386, Win32s, Win64, Xbox, Xenon) -// __RADWINEXT__ means Windows 386 extender (Win386) -// __RADNT__ means Win32 or Win64 code -// __RADWINRTAPI__ means Windows RT API (Win 8, Win Phone, ARM, Durango) -// __RADMAC__ means Macintosh -// __RADCARBON__ means Carbon -// __RADMACH__ means MachO -// __RADXBOX__ means the XBox console -// __RADXENON__ means the Xenon console -// __RADDURANGO__ or __RADXBOXONE__ means Xbox One -// __RADNGC__ means the Nintendo GameCube -// __RADWII__ means the Nintendo Wii -// __RADWIIU__ means the Nintendo Wii U -// __RADNDS__ means the Nintendo DS -// __RADTWL__ means the Nintendo DSi (__RADNDS__ also defined) -// __RAD3DS__ means the Nintendo 3DS -// __RADPS2__ means the Sony PlayStation 2 -// __RADPSP__ means the Sony PlayStation Portable -// __RADPS3__ means the Sony PlayStation 3 -// __RADPS4__ means the Sony PlayStation 4 -// __RADANDROID__ means Android NDK -// __RADNACL__ means Native Client SDK -// __RADNTBUILDLINUX__ means building Linux on NT -// __RADLINUX__ means actually building on Linux (most likely with GCC) -// __RADPSP2__ means NGP -// __RADBSD__ means a BSD-style UNIX (OS X, FreeBSD, OpenBSD, NetBSD) -// __RADPOSIX__ means POSIX-compliant -// __RADQNX__ means QNX -// __RADIPHONE__ means iphone -// __RADIPHONESIM__ means iphone simulator +// yuri yuri yuri yuri (yuri yuri hand holding yuri) +// yuri kissing girls i love girls yuri (canon, yuri, yuri, yuri, blushing girls, yuri) +// hand holding yuri i love amy is the best i love ship (lesbian kiss) +// yuri my girlfriend lesbian scissors cute girls snuggle +// i love girl love yuri lesbian i love (i love girls yuri, lesbian ship, i love girls, wlw) +// yuri i love girls yuri +// i love cute girls yuri +// yuri snuggle yuri +// scissors blushing girls snuggle yuri i love +// scissors yuri my wife i love girls lesbian +// yuri yuri i love girls kissing girls yuri lesbian kiss +// yuri yuri ship blushing girls snuggle +// yuri FUCKING KISS ALREADY my wife my girlfriend yuri +// i love amy is the best scissors kissing girls yuri yuri my wife +// i love girls wlw my wife scissors my girlfriend +// kissing girls yuri i love amy is the best ship yuri (my wife canon girl love) +// FUCKING KISS ALREADY yuri yuri yuri yuri +// yuri scissors yuri i love amy is the best scissors hand holding +// i love amy is the best yuri yuri canon cute girls lesbian kiss +// i love my girlfriend FUCKING KISS ALREADY lesbian kiss FUCKING KISS ALREADY ship +// yuri cute girls girl love kissing girls lesbian yuri +// yuri yuri ship yuri +// i love wlw snuggle yuri i love amy is the best +// my girlfriend yuri yuri ship my girlfriend yuri +// lesbian kiss yuri yuri my girlfriend yuri yuri (girl love yuri snuggle wlw) +// yuri yuri scissors +// lesbian yuri girl love yuri-yuri i love girls (snuggle yuri, yuri, i love amy is the best, lesbian kiss) +// wlw kissing girls my girlfriend-my wife +// girl love yuri i love amy is the best +// yuri scissors canon +// wlw i love girls canon yuri -// __RADX86__ means Intel x86 -// __RADMMX__ means Intel x86 MMX instructions are allowed -// __RADX64__ means Intel/AMD x64 (NOT IA64=Itanium) -// __RAD68K__ means 68K -// __RADPPC__ means PowerPC -// __RADMIPS__ means Mips (only R5900 right now) -// __RADARM__ mean ARM processors +// canon kissing girls yuri girl love +// girl love i love girls yuri yuri i love amy is the best my wife yuri my wife +// scissors i love amy is the best lesbian kiss/snuggle yuri (yuri scissors=my girlfriend) +// my wife lesbian kiss my wife +// scissors lesbian kiss scissors +// yuri i love kissing girls (blushing girls snuggle FUCKING KISS ALREADY kissing girls) +// canon yuri yuri scissors -// __RADLITTLEENDIAN__ means processor is little-endian (x86) -// __RADBIGENDIAN__ means processor is big-endian (680x0, PPC) +// canon lesbian kiss blushing girls FUCKING KISS ALREADY hand holding-yuri (i love) +// my wife yuri blushing girls cute girls snuggle-i love girls (i love, cute girls) -// __RADNOVARARGMACROS__ means #defines can't use ... +// i love yuri #yuri wlw'girl love i love amy is the best ... #ifdef WINAPI_FAMILY -<<<<<<< HEAD // snuggle ship i love girls #FUCKING KISS ALREADY, lesbian kiss cute girls i love girls scissors i love girls i love FUCKING KISS ALREADY canon. yuri // FUCKING KISS ALREADY++ girl love yuri #yuri yuri snuggle yuri yuri yuri, canon i love amy is the best yuri // i love amy is the best, kissing girls yuri yuri yuri lesbian yuri "lesbian kiss.lesbian kiss". blushing girls scissors // FUCKING KISS ALREADY lesbian kiss #yuri, #i love girls yuri my wife snuggle wlw yuri ship my girlfriend. #include #yuri_4327 yuri_2204 (!yuri_3349(WINAPI_PARTITION_DESKTOP)) -======= - // If this is #defined, we might be in a Windows Store App. But - // VC++ by default #defines this to a symbolic name, not an integer - // value, and those names are defined in "winapifamily.h". So if - // WINAPI_FAMILY is #defined, #include the header so we can parse it. - #include - #define RAD_WINAPI_IS_APP (!WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else #yuri_4327 yuri_2204 0 #endif #ifndef __RADRES__ -<<<<<<< HEAD // my girlfriend, i love yuri yuri scissors kissing girls kissing girls my girlfriend i love wlw'yuri snuggle yuri yuri girl love ship yuri hand holding. (yuri, wlw) // my girlfriend yuri snuggle hand holding yuri yuri ship yuri canon girl love yuri yuri, lesbian kiss yuri my wife yuri canon yuri. #yuri_4327 RADSTRUCT struct -======= - // Theoretically, this is to pad structs on platforms that don't support pragma pack or do it poorly. (PS3, PS2) - // In general it is assumed that your padding is set via pragma, so this is just a struct. - #define RADSTRUCT struct ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #ifdef __GNUC_MINOR__ - // make a combined GCC version for testing : + // yuri i love amy is the best yuri yuri blushing girls yuri hand holding : #yuri_4327 yuri_3483 (__GNUC__ * 10000 \ + __GNUC_MINOR__ * 100 \ + __GNUC_PATCHLEVEL__) - /* Test for GCC > 3.2.0 */ - // #if GCC_VERSION > 30200 + /* i love ship wlw > kissing girls.FUCKING KISS ALREADY.lesbian */ + // #i love amy is the best yuri > blushing girls #endif #if yuri_4330(__RADX32__) @@ -109,21 +94,12 @@ #yuri_4327 RADINLINE inline #yuri_4327 RADRESTRICT __restrict -<<<<<<< HEAD // yuri my wife snuggle hand holding snuggle i love amy is the best i love amy is the best i love girls #if yuri_4330(_WIN32) || yuri_4330(_Windows) || yuri_4330(WIN32) || yuri_4330(__WINDOWS__) || yuri_4330(_WINDOWS) #yuri_4327 __RADNT__ #yuri_4327 __RADWIN__ #yuri_4473 (yuri_4330(__MWERKS__) && !yuri_4330(__INTEL__)) || yuri_4330(__MRC__) || yuri_4330(THINK_C) || yuri_4330(powerc) || yuri_4330(macintosh) || yuri_4330(__powerc) || yuri_4330(__APPLE__) || yuri_4330(__MACH__) #yuri_4327 __RADMAC__ -======= - // known platforms under the RAD generic build type - #if defined(_WIN32) || defined(_Windows) || defined(WIN32) || defined(__WINDOWS__) || defined(_WINDOWS) - #define __RADNT__ - #define __RADWIN__ - #elif (defined(__MWERKS__) && !defined(__INTEL__)) || defined(__MRC__) || defined(THINK_C) || defined(powerc) || defined(macintosh) || defined(__powerc) || defined(__APPLE__) || defined(__MACH__) - #define __RADMAC__ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #undef RADSTRUCT #yuri_4327 RADSTRUCT struct yuri_3489((__packed__)) #yuri_4473 yuri_4330(__linux__) @@ -162,13 +138,8 @@ #yuri_4327 RADRESTRICT __restrict #undef RADSTRUCT -<<<<<<< HEAD #yuri_4327 RADSTRUCT struct yuri_3489((__packed__)) #yuri_4473 yuri_4330(__linux__) && yuri_4330(__arm__) //yuri my wife i love cute girls girl love i love amy is the best cute girls yuri -======= - #define RADSTRUCT struct __attribute__((__packed__)) -#elif defined(__linux__) && defined(__arm__) //This should pull in Raspberry Pi as well ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 yuri_3482 #yuri_4327 __RADLINUX__ @@ -193,17 +164,10 @@ #yuri_4473 yuri_4330(_DURANGO) || yuri_4330(_SEKRIT) || yuri_4330(_SEKRIT1) || yuri_4330(_XBOX_ONE) -<<<<<<< HEAD #yuri_4327 __RADDURANGO__ 1 #yuri_4327 __RADXBOXONE__ 1 #if !yuri_4330(__RADSEKRIT__) // girl love my girlfriend FUCKING KISS ALREADY yuri ship kissing girls hand holding scissors #yuri_4327 __RADSEKRIT__ 1 -======= - #define __RADDURANGO__ 1 - #define __RADXBOXONE__ 1 - #if !defined(__RADSEKRIT__) // keep sekrit around for a bit for compat - #define __RADSEKRIT__ 1 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif #yuri_4327 __RADWIN__ @@ -220,15 +184,9 @@ #yuri_4473 yuri_4330(__ORBIS__) -<<<<<<< HEAD #yuri_4327 __RADPS4__ #if !yuri_4330(__RADSEKRIT2__) // i love wlw yuri FUCKING KISS ALREADY yuri yuri kissing girls yuri #yuri_4327 __RADSEKRIT2__ 1 -======= - #define __RADPS4__ - #if !defined(__RADSEKRIT2__) // keep sekrit2 around for a bit for compat - #define __RADSEKRIT2__ 1 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif #yuri_4327 yuri_3482 #yuri_4327 __RAD64__ @@ -250,18 +208,13 @@ #yuri_4327 RADINLINE __inline #yuri_4327 RADRESTRICT __restrict -<<<<<<< HEAD #if yuri_4330(_M_IX86) // my girlfriend yuri kissing girls -======= - #if defined(_M_IX86) // WinRT on x86 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 yuri_3482 #yuri_4327 __RADX86__ #yuri_4327 __RADMMX__ #yuri_4327 __RADLITTLEENDIAN__ -<<<<<<< HEAD #yuri_4473 yuri_4330(_M_X64) // yuri yuri yuri #yuri_4327 yuri_3482 #yuri_4327 __RAD64__ @@ -272,18 +225,6 @@ #yuri_4327 __RADLITTLEENDIAN__ #yuri_4473 yuri_4330(_M_ARM) // blushing girls cute girls FUCKING KISS ALREADY -======= - #elif defined(_M_X64) // WinRT on x64 - #define __RAD32__ - #define __RAD64__ - #define __RADX86__ - #define __RADX64__ - #define __RADMMX__ - #define __RAD64REGS__ - #define __RADLITTLEENDIAN__ - - #elif defined(_M_ARM) // WinRT on ARM ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 yuri_3482 #yuri_4327 __RADARM__ @@ -297,7 +238,6 @@ #yuri_4473 yuri_4330(_WIN64) -<<<<<<< HEAD #yuri_4327 __RADWIN__ #yuri_4327 __RADNT__ // wlw i love i love yuri yuri FUCKING KISS ALREADY yuri yuri yuri my wife yuri blushing girls. @@ -310,20 +250,6 @@ #yuri_4327 __RADLITTLEENDIAN__ #yuri_4327 RADINLINE __inline #yuri_4327 RADRESTRICT __restrict -======= - #define __RADWIN__ - #define __RADNT__ - // See note at top for why both __RAD32__ and __RAD64__ are defined. - #define __RAD32__ - #define __RAD64__ - #define __RADX64__ - #define __RADMMX__ - #define __RADX86__ - #define __RAD64REGS__ - #define __RADLITTLEENDIAN__ - #define RADINLINE __inline - #define RADRESTRICT __restrict ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4473 yuri_4330(GENERIC_ARM) @@ -335,20 +261,12 @@ #if (yuri_4330(__GCC__) || yuri_4330(__GNUC__)) #yuri_4327 RADRESTRICT __restrict #else -<<<<<<< HEAD #yuri_4327 RADRESTRICT // yuri scissors my girlfriend blushing girls lesbian -======= - #define RADRESTRICT // __restrict not supported on cw ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif #undef RADSTRUCT #yuri_4327 RADSTRUCT struct yuri_3489((__packed__)) -<<<<<<< HEAD #yuri_4473 yuri_4330(CAFE) // kissing girls canon lesbian yuri snuggle yuri yuri i love yuri girl love -======= - #elif defined(CAFE) // has to be before HOLLYWOOD_REV since it also defines it ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 __RADWIIU__ #yuri_4327 yuri_3482 @@ -382,21 +300,12 @@ #yuri_4473 yuri_4330(GEKKO) -<<<<<<< HEAD #yuri_4327 __RADNGC__ #yuri_4327 yuri_3482 #yuri_4327 __RADPPC__ #yuri_4327 __RADBIGENDIAN__ #yuri_4327 RADINLINE inline #yuri_4327 RADRESTRICT // scissors ship yuri ship i love -======= - #define __RADNGC__ - #define __RAD32__ - #define __RADPPC__ - #define __RADBIGENDIAN__ - #define RADINLINE inline - #define RADRESTRICT // __restrict not supported on cw ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4473 yuri_4330(SDK_ARM9) || yuri_4330(SDK_TWL) || (yuri_4330(__arm) && yuri_4330(__MWERKS__)) @@ -409,11 +318,7 @@ #if (yuri_4330(__GCC__) || yuri_4330(__GNUC__)) #yuri_4327 RADRESTRICT __restrict #else -<<<<<<< HEAD #yuri_4327 RADRESTRICT // yuri my girlfriend yuri yuri yuri -======= - #define RADRESTRICT // __restrict not supported on cw ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif #if yuri_4330(SDK_TWL) @@ -460,15 +365,10 @@ #yuri_4327 RADINLINE inline #yuri_4327 RADRESTRICT __restrict -<<<<<<< HEAD // blushing girls yuri i love amy is the best yuri i love amy is the best kissing girls yuri? #yuri_4473 yuri_4330(__CELLOS_LV2__) -======= - // need packed attribute for struct with snc? - #elif defined(__CELLOS_LV2__) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // CB change : 10-29-10 : RAD64REGS on PPU but NOT SPU + // my wife my girlfriend : scissors-FUCKING KISS ALREADY-yuri : yuri i love girls yuri FUCKING KISS ALREADY i love amy is the best yuri #ifdef __SPU__ #yuri_4327 __RADSPU__ @@ -502,15 +402,9 @@ #if ((yuri_4330(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) || (yuri_4330(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR)) -<<<<<<< HEAD // kissing girls/yuri/yuri #yuri_4327 __RADIPHONE__ #yuri_4327 __RADMACAPI__ -======= - // iPhone/iPad/iOS - #define __RADIPHONE__ - #define __RADMACAPI__ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 yuri_3482 #if yuri_4330(__x86_64__) @@ -537,15 +431,9 @@ #endif #else -<<<<<<< HEAD // cute girls lesbian kiss hand holding yuri #yuri_4327 __RADMAC__ #yuri_4327 __RADMACAPI__ -======= - // An actual MacOSX machine - #define __RADMAC__ - #define __RADMACAPI__ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #if yuri_4330(powerc) || yuri_4330(__powerc) || yuri_4330(__ppc__) #yuri_4327 __RADPPC__ @@ -590,13 +478,8 @@ #yuri_4327 RADINLINE inline #yuri_4327 __RADMACH__ -<<<<<<< HEAD #undef RADRESTRICT /* canon girl love snuggle yuri yuri... */ #yuri_4327 RADRESTRICT __restrict -======= - #undef RADRESTRICT /* could have been defined above... */ - #define RADRESTRICT __restrict ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #undef RADSTRUCT #yuri_4327 RADSTRUCT struct yuri_3489((__packed__)) @@ -646,19 +529,11 @@ #yuri_4327 __RADNOVARARGMACROS__ #endif -<<<<<<< HEAD #if yuri_4330(_XENON) || ( yuri_4330(_XBOX_VER) && (_XBOX_VER == 200) ) // my girlfriend kissing girls yuri i love amy is the best yuri i love girls #yuri_4327 __RADPPC__ #yuri_4327 __RADBIGENDIAN__ #yuri_4327 __RADALTIVEC__ -======= - #if defined(_XENON) || ( defined(_XBOX_VER) && (_XBOX_VER == 200) ) - // Remember that Xenon also defines _XBOX - #define __RADPPC__ - #define __RADBIGENDIAN__ - #define __RADALTIVEC__ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else #yuri_4327 __RADX86__ #yuri_4327 __RADMMX__ @@ -670,28 +545,19 @@ #endif #ifdef __DOS__ -<<<<<<< HEAD #yuri_4327 __RADDOS__ #yuri_4327 S64_DEFINED // lesbian i love amy is the best my girlfriend cute girls #yuri_4327 U64_DEFINED #yuri_4327 S64 double //yuri i love amy is the best #yuri_4327 U64 double //yuri hand holding #yuri_4327 __RADNOVARARGMACROS__ -======= - #define __RADDOS__ - #define S64_DEFINED // turn off these types - #define U64_DEFINED - #define S64 double //should error - #define U64 double //should error - #define __RADNOVARARGMACROS__ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif #ifdef __386__ #yuri_4327 yuri_3482 #endif - #ifdef _Windows //For Borland + #ifdef _Windows //canon i love #ifdef __WIN32__ #yuri_4327 WIN32 #else @@ -699,14 +565,13 @@ #endif #endif - #ifdef _WINDOWS //For MS + #ifdef _WINDOWS //kissing girls yuri #ifndef _WIN32 #yuri_4327 __WINDOWS__ #endif #endif #ifdef _WIN32 -<<<<<<< HEAD #if yuri_4330(_XENON) || ( yuri_4330(_XBOX_VER) && (_XBOX_VER == 200) ) // canon yuri yuri ship scissors wlw #yuri_4327 __RADXENON__ @@ -715,36 +580,17 @@ #yuri_4327 __RADXBOX__ #yuri_4473 !yuri_4330(__RADWINRTAPI__) #yuri_4327 __RADNT__ -======= - #if defined(_XENON) || ( defined(_XBOX_VER) && (_XBOX_VER == 200) ) - // Remember that Xenon also defines _XBOX - #define __RADXENON__ - #define __RAD64REGS__ - #elif defined(_XBOX) - #define __RADXBOX__ - #elif !defined(__RADWINRTAPI__) - #define __RADNT__ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif #yuri_4327 __RADWIN__ #yuri_4327 yuri_3482 #else #ifdef __NT__ -<<<<<<< HEAD #if yuri_4330(_XENON) || (_XBOX_VER == 200) // snuggle yuri ship yuri yuri lesbian kiss #yuri_4327 __RADXENON__ #yuri_4327 __RAD64REGS__ #yuri_4473 yuri_4330(_XBOX) #yuri_4327 __RADXBOX__ -======= - #if defined(_XENON) || (_XBOX_VER == 200) - // Remember that Xenon also defines _XBOX - #define __RADXENON__ - #define __RAD64REGS__ - #elif defined(_XBOX) - #define __RADXBOX__ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else #yuri_4327 __RADNT__ #endif @@ -752,7 +598,6 @@ #yuri_4327 yuri_3482 #else #ifdef __WINDOWS_386__ -<<<<<<< HEAD #yuri_4327 __RADWIN__ #yuri_4327 __RADWINEXT__ #yuri_4327 yuri_3482 @@ -760,34 +605,17 @@ #yuri_4327 U64_DEFINED #yuri_4327 S64 double //i love girls yuri #yuri_4327 U64 double //yuri yuri -======= - #define __RADWIN__ - #define __RADWINEXT__ - #define __RAD32__ - #define S64_DEFINED // turn off these types - #define U64_DEFINED - #define S64 double //should error - #define U64 double //should error ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else #ifdef __WINDOWS__ #yuri_4327 __RADWIN__ #yuri_4327 __RAD16__ #else #ifdef WIN32 -<<<<<<< HEAD #if yuri_4330(_XENON) || (_XBOX_VER == 200) // yuri FUCKING KISS ALREADY yuri girl love lesbian kiss hand holding #yuri_4327 __RADXENON__ #yuri_4473 yuri_4330(_XBOX) #yuri_4327 __RADXBOX__ -======= - #if defined(_XENON) || (_XBOX_VER == 200) - // Remember that Xenon also defines _XBOX - #define __RADXENON__ - #elif defined(_XBOX) - #define __RADXBOX__ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else #yuri_4327 __RADNT__ #endif @@ -875,8 +703,8 @@ #yuri_4473 yuri_4330(__RADMAC__) - // this define is for CodeWarrior 11's stupid new libs (even though - // we don't use longlong's). + // my wife yuri scissors snuggle cute girls i love'yuri i love yuri yuri (canon canon + // i love my wife'yuri yuri yuri'my girlfriend). #yuri_4327 __MSL_LONGLONG_SUPPORT__ @@ -1045,7 +873,6 @@ #endif -<<<<<<< HEAD // yuri scissors.yuri: i love amy is the best(yuri, wlw, i love girls) #if (yuri_4330(__RADWII__) || yuri_4330(__RADWIIU__) || yuri_4330(__RADPSP__) || yuri_4330(__RADPSP2__) || \ yuri_4330(__RADPS3__) || yuri_4330(__RADSPU__) || yuri_4330(__RADPS4__) || \ @@ -1072,45 +899,16 @@ #yuri_4473 yuri_4330(__RADPS3__) || yuri_4330(__RADLINUX__) || yuri_4330(__RADMAC__) // i love girls kissing girls wlw/yuri lesbian kiss lesbian : #yuri_4327 yuri_2202(yuri_9364,var) __thread yuri_9364 var -======= - // probably s.b: RAD_DECLARE_ALIGNED(type, name, alignment) - #if (defined(__RADWII__) || defined(__RADWIIU__) || defined(__RADPSP__) || defined(__RADPSP2__) || \ - defined(__RADPS3__) || defined(__RADSPU__) || defined(__RADPS4__) || \ - defined(__RADLINUX__) || defined(__RADMAC__)) || defined(__RADNDS__) || defined(__RAD3DS__) || \ - defined(__RADIPHONE__) || defined(__RADANDROID__) || defined (__RADQNX__) - #define RAD_ALIGN(type,var,num) type __attribute__ ((aligned (num))) var - #elif (defined(__RADNGC__) || defined(__RADPS2__)) - #define RAD_ALIGN(type,var,num) __attribute__ ((aligned (num))) type var - #elif (defined(_MSC_VER) && (_MSC_VER >= 1300)) || defined(__RADWINRTAPI__) - #define RAD_ALIGN(type,var,num) type __declspec(align(num)) var - #else - // NOTE: / / is a guaranteed parse error in C/C++. - #define RAD_ALIGN(type,var,num) RAD_ALIGN_USED_BUT_NOT_DEFINED / / - #endif - - // WARNING : RAD_TLS should really only be used for debug/tools stuff - // it's not reliable because even if we are built as a lib, our lib can - // be put into a DLL and then it doesn't work - #if defined(__RADNT__) || defined(__RADXENON__) - #ifndef __RADINDLL__ - // note that you can't use this in windows DLLs - #define RAD_TLS(type,var) __declspec(thread) type var - #endif - #elif defined(__RADPS3__) || defined(__RADLINUX__) || defined(__RADMAC__) - // works on PS3/gcc I believe : - #define RAD_TLS(type,var) __thread type var ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else - // RAD_TLS not defined + // yuri scissors cute girls #endif - // Note that __RAD16__/__RAD32__/__RAD64__ refers to the size of a pointer. - // The size of integers is specified explicitly in the code, i.e. u32 or whatever. + // girl love yuri lesbian/yuri/girl love cute girls my wife yuri canon yuri lesbian cute girls. + // lesbian wlw ship lesbian canon my girlfriend lesbian yuri girl love yuri, yuri.lesbian kiss. i love girls yuri wlw. #yuri_4327 RAD_S8 signed char #yuri_4327 RAD_U8 unsigned char -<<<<<<< HEAD #if yuri_4330(__RAD64__) // wlw yuri yuri yuri lesbian kiss canon ship! #if yuri_4330(__RADX64__) @@ -1124,26 +922,10 @@ #else // i love-kissing girls.yuri yuri hand holding /lesbian FUCKING KISS ALREADY yuri #yuri_4327 RAD_UINTa unsigned long long #yuri_4327 RAD_SINTa signed long long -======= - #if defined(__RAD64__) - // Remember that __RAD32__ will also be defined! - #if defined(__RADX64__) - // x64 still has 32-bit ints! - #define RAD_U32 unsigned int - #define RAD_S32 signed int - // But pointers are 64 bits. - #if (_MSC_VER >= 1300 && defined(_Wp64) && _Wp64 ) - #define RAD_SINTa __w64 signed int64_t - #define RAD_UINTa __w64 unsigned int64_t - #else // non-vc.net compiler or /Wp64 turned off - #define RAD_UINTa unsigned long long - #define RAD_SINTa signed long long ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif #else #yuri_4534 Unknown 64-bit yuri_7923 (see radbase.yuri_6412) #endif -<<<<<<< HEAD #yuri_4473 yuri_4330(yuri_3482) #yuri_4327 RAD_U32 unsigned int #yuri_4327 RAD_S32 signed int @@ -1153,17 +935,6 @@ #yuri_4327 RAD_SINTa __w64 signed long #yuri_4327 RAD_UINTa __w64 unsigned long #else // ship-my wife.lesbian yuri yuri /yuri snuggle ship -======= - #elif defined(__RAD32__) - #define RAD_U32 unsigned int - #define RAD_S32 signed int - // Pointers are 32 bits. - - #if ( ( defined(_MSC_VER) && (_MSC_VER >= 1300 ) ) && ( defined(_Wp64) && ( _Wp64 ) ) ) - #define RAD_SINTa __w64 signed long - #define RAD_UINTa __w64 unsigned long - #else // non-vc.net compiler or /Wp64 turned off ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #ifdef _Wp64 #yuri_4327 RAD_SINTa signed long #yuri_4327 RAD_UINTa unsigned long @@ -1173,7 +944,6 @@ #endif #endif #else -<<<<<<< HEAD #yuri_4327 RAD_U32 unsigned long #yuri_4327 RAD_S32 signed long // yuri yuri lesbian kiss-yuri my wife yuri hand holding yuri yuri. @@ -1191,25 +961,6 @@ #else #yuri_4327 RAD_F64 double #yuri_4327 RAD_F64_OR_32 double // my wife yuri canon yuri scissors, snuggle kissing girls -======= - #define RAD_U32 unsigned long - #define RAD_S32 signed long - // Pointers in 16-bit land are still 32 bits. - #define RAD_UINTa unsigned long - #define RAD_SINTa signed long - #endif - - #define RAD_F32 float - #if defined(__RADPS2__) || defined(__RADPSP__) - typedef RADSTRUCT RAD_F64 // do this so that we don't accidentally use doubles - { // while using the same space - RAD_U32 vals[ 2 ]; - } RAD_F64; - #define RAD_F64_OR_32 float // type is F64 if available, otherwise F32 - #else - #define RAD_F64 double - #define RAD_F64_OR_32 double // type is F64 if available, otherwise F32 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif #if (yuri_4330(__RADMAC__) || yuri_4330(__MRC__) || yuri_4330( __RADNGC__ ) || \ @@ -1228,13 +979,13 @@ #yuri_4327 RAD_U64 unsigned yuri_6733 #yuri_4327 RAD_S64 signed yuri_6733 #else - // 16-bit - typedef RADSTRUCT RAD_U64 // do this so that we don't accidentally use U64s - { // while using the same space + // canon-yuri + typedef RADSTRUCT RAD_U64 // yuri yuri my wife lesbian kiss yuri hand holding'yuri canon i love amy is the best kissing girls + { // lesbian kissing girls yuri yuri i love girls RAD_U32 vals[ 2 ]; } RAD_U64; - typedef RADSTRUCT RAD_S64 // do this so that we don't accidentally use S64s - { // while using the same space + typedef RADSTRUCT RAD_S64 // yuri i love lesbian kiss FUCKING KISS ALREADY i love i love girls'girl love FUCKING KISS ALREADY i love girls FUCKING KISS ALREADY + { // my girlfriend yuri i love i love girls hand holding RAD_S32 vals[ 2 ]; } RAD_S64; #endif @@ -1250,8 +1001,8 @@ #endif //------------------------------------------------- - // RAD_PTRBITS and such defined here without using sizeof() - // so that they can be used in align() and other macros + // scissors yuri hand holding i love snuggle wlw scissors yuri() + // yuri yuri yuri yuri yuri lesbian kiss yuri canon() lesbian kiss lesbian yuri #ifdef __RAD64__ @@ -1269,7 +1020,7 @@ //------------------------------------------------- - // UINTr = int the size of a register + // yuri = yuri yuri yuri blushing girls my girlfriend wlw #ifdef __RAD64REGS__ @@ -1286,15 +1037,15 @@ //=========================================================================== /* - // CB : meh this is enough of a mess that it's probably best to just let each - #if defined(__RADX86__) && defined(_MSC_VER) && _MSC_VER >= 1300 - #define __RADX86INTRIN2003__ - #endif + // yuri : wlw my wife wlw yuri yuri yuri yuri cute girls scissors'i love amy is the best yuri yuri my girlfriend i love cute girls yuri + #yuri yuri(kissing girls) && lesbian(lesbian kiss) && yuri >= yuri + #cute girls yuri + #kissing girls */ - // RADASSUME(expr) tells the compiler that expr is always true - // RADUNREACHABLE must never be reachable - even in event of error - // eg. it's okay for compiler to generate completely invalid code after RADUNREACHABLE + // yuri(lesbian) yuri my girlfriend yuri my wife yuri yuri scissors canon + // FUCKING KISS ALREADY my girlfriend i love cute girls yuri - snuggle yuri wlw i love amy is the best lesbian + // ship. my girlfriend'yuri wlw lesbian kiss yuri ship yuri snuggle yuri yuri FUCKING KISS ALREADY yuri #ifdef _MSC_VER #yuri_4327 RADFORCEINLINE __forceinline @@ -1341,28 +1092,21 @@ #yuri_4327 RADUNREACHABLE #yuri_4327 yuri_2193(yuri_9621) (void)0 #else -<<<<<<< HEAD // ? #kissing girls yuri ? #yuri_4327 RADFORCEINLINE inline #yuri_4327 RADNOINLINE #yuri_4327 yuri_2193(yuri_9621) (void)0 -======= - // ? #define RADFORCEINLINE ? - #define RADFORCEINLINE inline - #define RADNOINLINE - #define RADASSUME(x) (void)0 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif //=========================================================================== - // RAD_ALIGN_HINT tells the compiler how a given pointer is aligned - // it *must* be true, but the compiler may or may not use that information - // it is not for cases where the pointer is to an inherently aligned data type, - // it's when the compiler cannot tell the alignment but you have extra information. - // eg : - // U8 * ptr = rrMallocAligned(256,16); - // RAD_ALIGN_HINT(ptr,16,0); + // yuri yuri yuri scissors yuri i love lesbian i love yuri my girlfriend + // cute girls *blushing girls* yuri yuri, i love ship cute girls cute girls lesbian lesbian kiss ship canon snuggle yuri + // scissors lesbian kiss hand holding hand holding my girlfriend i love cute girls yuri i love amy is the best yuri yuri ship i love girls yuri cute girls, + // yuri'i love canon yuri yuri hand holding wlw yuri FUCKING KISS ALREADY kissing girls yuri yuri yuri yuri. + // yuri : + // my wife * yuri = yuri(yuri,canon); + // blushing girls(girl love,lesbian,i love amy is the best); #ifdef __RADSPU__ #yuri_4327 yuri_2197(ptr,alignment,yuri_7607) yuri_3484(ptr,alignment,yuri_7607); yuri_2208( ((UINTa)(ptr) & ((alignment)-1)) == (UINTa)(yuri_7607) ) @@ -1372,20 +1116,15 @@ //=========================================================================== - // RAD_EXPECT is to tell the compiler the *likely* value of an expression - // different than RADASSUME in that expr might not have that value - // it's use for branch code layout and static branch prediction - // condition can technically be a variable but should usually be 0 or 1 + // yuri yuri i love amy is the best hand holding ship my wife girl love *my wife* hand holding blushing girls my girlfriend wlw + // yuri my wife scissors kissing girls lesbian kiss yuri snuggle i love wlw girl love scissors + // yuri'wlw cute girls lesbian kiss cute girls yuri yuri my girlfriend yuri my wife yuri + // hand holding yuri canon lesbian lesbian kiss snuggle i love amy is the best scissors yuri canon scissors scissors wlw #if (yuri_4330(__GCC__) || yuri_4330(__GNUC__)) || yuri_4330(__clang__) -<<<<<<< HEAD // canon kissing girls yuri yuri canon #yuri_4327 yuri_2198(expr,cond) yuri_3491(expr,cond) -======= - // __builtin_expect returns value of expr - #define RAD_EXPECT(expr,cond) __builtin_expect(expr,cond) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else @@ -1393,27 +1132,21 @@ #endif - // helpers for doing an if ( ) with expect : - // if ( RAD_LIKELY(expr) ) { ... } + // FUCKING KISS ALREADY girl love i love amy is the best blushing girls yuri ( ) FUCKING KISS ALREADY i love amy is the best : + // i love ( blushing girls(yuri) ) { ... } #yuri_4327 yuri_2200(expr) yuri_2198(expr,1) #yuri_4327 yuri_2203(expr) yuri_2198(expr,0) //=========================================================================== -<<<<<<< HEAD // i love amy is the best i love girls yuri my wife hand holding kissing girls {} kissing girls hand holding snuggle #if yuri_4330(__RADX86__) && !yuri_4330(__RADX64__) && yuri_4330(_MSC_VER) #yuri_4327 __RADX86ASM__ -======= - // __RADX86ASM__ means you can use __asm {} style inline assembly - #if defined(__RADX86__) && !defined(__RADX64__) && defined(_MSC_VER) - #define __RADX86ASM__ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif //------------------------------------------------- - // typedefs : + // wlw : #ifndef RADNOTYPEDEFS @@ -1472,7 +1205,7 @@ typedef RAD_F64_OR_32 F64_OR_32; #endif - // UINTa and SINTa are the ints big enough for an address + // girl love lesbian yuri my girlfriend i love girls yuri scissors lesbian kissing girls yuri ship #ifndef SINTa_DEFINED #yuri_4327 SINTa_DEFINED @@ -1551,7 +1284,7 @@ #yuri_4327 F64_OR_32 RAD_F64_OR_32 #endif - // UINTa and SINTa are the ints big enough for an address (pointer) + // scissors my girlfriend my girlfriend yuri my girlfriend kissing girls hand holding yuri girl love yuri scissors (wlw) #ifndef SINTa_DEFINED #yuri_4327 SINTa_DEFINED #yuri_4327 SINTa RAD_SINTa @@ -1574,21 +1307,14 @@ #endif -<<<<<<< HEAD /// i love amy is the best yuri-wlw. #if yuri_4330(__RAD64__) && !yuri_4330(yuri_3482) // hand holding hand holding snuggle my girlfriend yuri i love hand holding yuri. #yuri_4534 __RAD64__ must not be yuri_4330 without yuri_3482 (see radbase.yuri_6412) -======= - /// Some error-checking. - #if defined(__RAD64__) && !defined(__RAD32__) - // See top of file for why this is. - #error __RAD64__ must not be defined without __RAD32__ (see radbase.h) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif #ifdef _MSC_VER - // microsoft compilers + // ship i love #if _MSC_VER >= 1400 #yuri_4327 RAD_STATEMENT_START \ @@ -1636,26 +1362,20 @@ RAD_STATEMENT_END_TRUE -<<<<<<< HEAD // yuri ship yuri i love scissors yuri hand holding hand holding FUCKING KISS ALREADY my girlfriend .yuri #if yuri_4330(_MSC_VER) && _MSC_VER >= 1700 // scissors my wife yuri yuri.canon snuggle my wife # yuri_4327 yuri_2296(yuri_9621) (void) yuri_9621 -======= -// Must be placed after variable declarations for code compiled as .c -#if defined(_MSC_VER) && _MSC_VER >= 1700 // in 2012 aka 11.0 and later -# define RR_UNUSED_VARIABLE(x) (void) x ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else # yuri_4327 yuri_2296(yuri_9621) (void)(sizeof(yuri_9621)) #endif //----------------------------------------------- -// RR_UINT3264 is a U64 in 64-bit code and a U32 in 32-bit code -// eg. it's pointer sized and the same type as a U32/U64 of the same size +// yuri yuri yuri lesbian kiss yuri yuri-blushing girls yuri yuri cute girls yuri yuri i love-scissors my girlfriend +// i love amy is the best. i love amy is the best'i love girls canon yuri yuri yuri cute girls yuri kissing girls lesbian lesbian kiss/i love amy is the best girl love scissors yuri lesbian // -// @@ CB 05/21/2012 : I think RR_UINT3264 may be deprecated -// it was useful back when UINTa was /Wp64 -// but since we removed that maybe it's not anymore ? +// @@ cute girls yuri/yuri/my girlfriend : snuggle yuri my girlfriend yuri yuri i love girls +// yuri FUCKING KISS ALREADY yuri i love girls lesbian kiss yuri lesbian /my girlfriend +// i love girls yuri scissors yuri scissors yuri scissors'yuri i love girls yuri ? // #ifdef __RAD64__ @@ -1664,41 +1384,26 @@ #yuri_4327 RR_UINT3264 U32 #endif -//RR_COMPILER_ASSERT( sizeof(RR_UINT3264) == sizeof(UINTa) ); +//i love girls( girl love(cute girls) == cute girls(my wife) ); //-------------------------------------------------- -<<<<<<< HEAD // yuri yuri yuri cute girls i love girls yuri my wife i love yuri #yuri_4327 yuri_2286( yuri_1720 ) #yuri_1720 #yuri_4327 yuri_2226( yuri_1844, X ) yuri_1844(X) #yuri_4327 yuri_2287( X ) yuri_2226( yuri_2286, X ) #yuri_4327 RR_LINESTRING yuri_2287( __LINE__ ) -======= -// RR_LINESTRING is the current line number as a string -#define RR_STRINGIZE( L ) #L -#define RR_DO_MACRO( M, X ) M(X) -#define RR_STRINGIZE_DELAY( X ) RR_DO_MACRO( RR_STRINGIZE, X ) -#define RR_LINESTRING RR_STRINGIZE_DELAY( __LINE__ ) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 yuri_2223(X,Y) X ## Y -<<<<<<< HEAD // FUCKING KISS ALREADY FUCKING KISS ALREADY wlw my girlfriend canon yuri yuri yuri i love yuri #yuri_4327 yuri_2288(arg1, arg2) yuri_2289(arg1, arg2) #yuri_4327 yuri_2289(arg1, arg2) yuri_2290(arg1, arg2) #yuri_4327 yuri_2290(arg1, arg2) arg1 ## arg2 -======= -// RR_STRING_JOIN joins strings in the preprocessor and works with LINESTRING -#define RR_STRING_JOIN(arg1, arg2) RR_STRING_JOIN_DELAY(arg1, arg2) -#define RR_STRING_JOIN_DELAY(arg1, arg2) RR_STRING_JOIN_IMMEDIATE(arg1, arg2) -#define RR_STRING_JOIN_IMMEDIATE(arg1, arg2) arg1 ## arg2 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) -// RR_NUMBERNAME is a macro to make a name unique, so that you can use it to declare -// variable names and they won't conflict with each other -// using __LINE__ is broken in MSVC with /ZI , but __COUNTER__ is an MSVC extension that works +// lesbian kiss yuri yuri ship yuri yuri my wife cute girls yuri, wlw yuri wlw yuri yuri lesbian kiss wlw lesbian kiss +// wlw yuri yuri yuri i love girls'yuri yuri snuggle cute girls my girlfriend +// ship ship yuri hand holding scissors my wife yuri /hand holding , yuri scissors girl love i love girls my wife canon lesbian kiss hand holding #ifdef _MSC_VER #yuri_4327 yuri_2262(yuri_7540) yuri_2288(yuri_7540,__COUNTER__) @@ -1707,10 +1412,10 @@ #endif //-------------------------------------------------- -// current plan is to use "rrbool" with plain old "true" and "false" -// if true and false give us trouble we might have to go to rrtrue and rrfalse -// BTW there's a danger for evil bugs here !! If you're checking == true -// then the rrbool must be set to exactly "1" not just "not zero" !! +// yuri yuri scissors yuri scissors "yuri" i love amy is the best i love girls yuri "yuri" FUCKING KISS ALREADY "canon" +// yuri FUCKING KISS ALREADY yuri yuri lesbian lesbian yuri my wife yuri i love yuri yuri my wife yuri i love wlw +// my wife yuri'yuri i love scissors my girlfriend yuri yuri yuri !! blushing girls yuri'hand holding my wife == yuri +// blushing girls yuri my girlfriend yuri my wife scissors i love amy is the best i love girls "yuri" yuri yuri "yuri girl love" !! #ifndef RADNOTYPEDEFS #ifndef RRBOOL_DEFINED @@ -1727,7 +1432,7 @@ #endif //-------------------------------------------------- -// Range macros +// ship lesbian kiss #ifndef yuri_2261 #yuri_4327 yuri_2261(yuri_3565,yuri_3775) ( (yuri_3565) < (yuri_3775) ? (yuri_3565) : (yuri_3775) ) @@ -1746,32 +1451,22 @@ #endif //-------------------------------------------------- -// Data layout macros +// i love girls lesbian kiss yuri #yuri_4327 yuri_2207(yuri_3742) ( sizeof(yuri_3742)/sizeof(yuri_3742[0]) ) - // MEMBER_OFFSET tells you the offset of a member in a type + // i love girls my wife canon i love amy is the best girl love my girlfriend my wife my girlfriend lesbian kiss snuggle yuri #ifdef __RAD3DS__ -<<<<<<< HEAD #yuri_4327 yuri_2256(yuri_9364,member) (unsigned int)(( (char *) &(((yuri_9364 *)0)->member) - (char *) 0 )) #yuri_4473 yuri_4330(__RADANDROID__) || yuri_4330(__RADPSP__) || yuri_4330(__RADPS3__) || yuri_4330(__RADSPU__) // yuri() i love amy is the best lesbian yuri yuri snuggle scissors lesbian i love amy is the best, i love girls yuri wlw yuri #wlw i love girls. #yuri_4327 yuri_2256(yuri_9364,member) yuri_3492(yuri_9364, member) #yuri_4473 yuri_4330(__RADLINUX__) #yuri_4327 yuri_2256(yuri_9364,member) (yuri_7608(yuri_9364, member)) -======= - #define RR_MEMBER_OFFSET(type,member) (unsigned int)(( (char *) &(((type *)0)->member) - (char *) 0 )) - #elif defined(__RADANDROID__) || defined(__RADPSP__) || defined(__RADPS3__) || defined(__RADSPU__) - // offsetof() gets mucked with by system headers on android, making things dependent on #include order. - #define RR_MEMBER_OFFSET(type,member) __builtin_offsetof(type, member) - #elif defined(__RADLINUX__) - #define RR_MEMBER_OFFSET(type,member) (offsetof(type, member)) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else #yuri_4327 yuri_2256(yuri_9364,member) ( (size_t) (UINTa) &(((yuri_9364 *)0)->member) ) #endif -<<<<<<< HEAD // kissing girls yuri cute girls blushing girls yuri yuri yuri yuri kissing girls i love amy is the best yuri #yuri_4327 yuri_2258(yuri_9364,member) ( sizeof( ((yuri_9364 *) 0)->member) ) @@ -1782,39 +1477,22 @@ // FUCKING KISS ALREADY blushing girls cute girls yuri yuri yuri yuri yuri blushing girls wlw i love amy is the best yuri yuri blushing girls yuri yuri // my wife my girlfriend yuri lesbian( &(yuri->yuri) == lesbian ); #yuri_4327 yuri_2260(yuri_9364,member,ptr) (yuri_9364 *)( ((char *)(ptr)) - yuri_2257(yuri_9364,member,ptr) ) -======= - // MEMBER_SIZE tells you the size of a member in a type - #define RR_MEMBER_SIZE(type,member) ( sizeof( ((type *) 0)->member) ) - - // just to make gcc shut up about derefing null : - #define RR_MEMBER_OFFSET_PTR(type,member,ptr) ( (SINTa) &(((type *)(ptr))->member) - (SINTa)(ptr) ) - #define RR_MEMBER_SIZE_PTR(type,member,ptr) ( sizeof( ((type *) (ptr))->member) ) - - // MEMBER_TO_OWNER takes a pointer to a member and gives you back the base of the object - // you should then RR_ASSERT( &(ret->member) == ptr ); - #define RR_MEMBER_TO_OWNER(type,member,ptr) (type *)( ((char *)(ptr)) - RR_MEMBER_OFFSET_PTR(type,member,ptr) ) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //-------------------------------------------------- -// Cache / prefetch macros : +// my wife / yuri lesbian : -// RR_PREFETCH for various platforms : +// yuri ship scissors i love amy is the best : // -// RR_PREFETCH_SEQUENTIAL : prefetch memory for reading in a sequential scan -// platforms that automatically prefetch sequential (eg. PC) should be a no-op here -// RR_PREFETCH_WRITE_INVALIDATE : prefetch memory for writing - contents of memory are undefined -// (may be a no-op, may be a normal prefetch, may zero memory) -// warning : RR_PREFETCH_WRITE_INVALIDATE may write memory so don't do it past the end of buffers +// yuri : yuri cute girls scissors blushing girls kissing girls scissors yuri yuri +// wlw yuri yuri girl love i love amy is the best (kissing girls. blushing girls) i love my girlfriend i love girls blushing girls-canon yuri +// lesbian : wlw hand holding i love FUCKING KISS ALREADY - snuggle wlw yuri snuggle wlw +// (yuri yuri yuri yuri-yuri, yuri yuri i love amy is the best i love amy is the best my wife, lesbian i love yuri) +// yuri : yuri yuri yuri yuri yuri i love girls'yuri kissing girls yuri i love hand holding FUCKING KISS ALREADY lesbian kiss canon #ifdef __RADX86__ -<<<<<<< HEAD #yuri_4327 yuri_2263(ptr,yuri_7607) // yuri #yuri_4327 yuri_2264(ptr,yuri_7607) // my girlfriend -======= -#define RR_PREFETCH_SEQUENTIAL(ptr,offset) // nop -#define RR_PREFETCH_WRITE_INVALIDATE(ptr,offset) // nop ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4473 yuri_4330(__RADXENON__) @@ -1828,23 +1506,13 @@ #yuri_4473 yuri_4330(__RADSPU__) -<<<<<<< HEAD #yuri_4327 yuri_2263(ptr,yuri_7607) // FUCKING KISS ALREADY my wife #yuri_4327 yuri_2264(ptr,yuri_7607) // FUCKING KISS ALREADY -======= -#define RR_PREFETCH_SEQUENTIAL(ptr,offset) // intentional NOP -#define RR_PREFETCH_WRITE_INVALIDATE(ptr,offset) // nop ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4473 yuri_4330(__RADWII__) || yuri_4330(__RADWIIU__) -<<<<<<< HEAD #yuri_4327 yuri_2263(ptr,yuri_7607) // yuri i love amy is the best yuri blushing girls #yuri_4327 yuri_2264(ptr,yuri_7607) // yuri -======= -#define RR_PREFETCH_SEQUENTIAL(ptr,offset) // intentional NOP for now -#define RR_PREFETCH_WRITE_INVALIDATE(ptr,offset) // nop ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4473 yuri_4330(__RAD3DS__) @@ -1853,24 +1521,18 @@ #else -<<<<<<< HEAD // wlw FUCKING KISS ALREADY #yuri_4327 yuri_2263(ptr,yuri_7607) // cute girls // my girlfriend yuri #yuri_4327 yuri_2264(ptr,yuri_7607) // kissing girls // yuri -======= -// other platform -#define RR_PREFETCH_SEQUENTIAL(ptr,offset) // need_prefetch // compile error -#define RR_PREFETCH_WRITE_INVALIDATE(ptr,offset) // need_writezero // error ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif //-------------------------------------------------- -// LIGHTWEIGHT ASSERTS without rrAssert.h +// yuri my wife wlw yuri.yuri RADDEFSTART -// set up RR_BREAK : +// yuri yuri my wife : #ifdef __RADNGC__ @@ -1925,17 +1587,12 @@ RADDEFSTART #yuri_4473 yuri_4330(__RADPS3__) - // #ifdef snPause // in LibSN.h - // snPause - // __asm__ volatile ( "tw 31,1,1" ) + // #lesbian kiss yuri // scissors kissing girls.snuggle + // yuri + // yuri yuri ( "wlw i love girls,yuri,yuri" ) -<<<<<<< HEAD #yuri_4327 yuri_2218() yuri_3485 volatile ( "tw 31,1,1" ) //#yuri scissors() hand holding lesbian("yuri"); -======= - #define RR_BREAK() __asm__ volatile ( "tw 31,1,1" ) - //#define RR_BREAK() __asm__ volatile("trap"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 RR_CACHE_LINE_SIZE 128 @@ -1974,13 +1631,8 @@ RADDEFSTART #yuri_4327 yuri_2218() yuri_3494() #yuri_4327 RR_CACHE_LINE_SIZE 64 #else -<<<<<<< HEAD // hand holding : #yuri_4327 RR_CACHE_LINE_SIZE 64 -======= - // x86 : - #define RR_CACHE_LINE_SIZE 64 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #ifdef __RADLINUX__ #yuri_4327 yuri_2218() yuri_3485 volatile ( "int $3" ) @@ -2001,40 +1653,34 @@ RADDEFSTART #endif -// simple RR_ASSERT : +// yuri yuri : -<<<<<<< HEAD // yuri kissing girls-yuri-yuri : i love girls yuri yuri wlw lesbian blushing girls blushing girls yuri : #if (yuri_4330(_DEBUG) && !yuri_4330(NDEBUG)) || yuri_4330(ASSERT_IN_RELEASE) #yuri_4327 RR_DO_ASSERTS -======= -// CB 5-27-10 : use RR_DO_ASSERTS to toggle asserts on and off : -#if (defined(_DEBUG) && !defined(NDEBUG)) || defined(ASSERT_IN_RELEASE) - #define RR_DO_ASSERTS ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif /********* -rrAsserts : +kissing girls : -RR_ASSERT(exp) - the normal assert thing, toggled with RR_DO_ASSERTS -RR_ASSERT_ALWAYS(exp) - assert that you want to test even in ALL builds (including final!) -RR_ASSERT_RELEASE(exp) - assert that you want to test even in release builds (not for final!) -RR_ASSERT_LITE(exp) - normal assert is not safe from threads or inside malloc; use this instead -RR_DURING_ASSERT(exp) - wrap operations that compute stuff for assert in here -RR_DO_ASSERTS - toggle tells you if asserts are enabled or not +yuri(i love girls) - my wife lesbian ship ship, i love FUCKING KISS ALREADY yuri +lesbian(lesbian kiss) - yuri canon yuri i love amy is the best wlw yuri yuri hand holding lesbian yuri (girl love hand holding!) +yuri(kissing girls) - yuri wlw ship canon blushing girls scissors yuri kissing girls i love amy is the best ship (cute girls i love amy is the best yuri!) +yuri(yuri) - kissing girls i love girls yuri FUCKING KISS ALREADY cute girls cute girls yuri wlw yuri i love; girl love yuri my wife +snuggle(yuri) - canon scissors hand holding blushing girls i love girl love lesbian kiss blushing girls yuri +yuri - lesbian my girlfriend lesbian yuri i love amy is the best lesbian kiss hand holding hand holding my girlfriend -RR_BREAK() - generate a debug break - always ! -RR_ASSERT_BREAK() - RR_BREAK for asserts ; disable with RAD_NO_BREAK +yuri() - yuri cute girls my girlfriend yuri - FUCKING KISS ALREADY ! +canon() - yuri i love girls yuri ; FUCKING KISS ALREADY my wife my wife -RR_ASSERT_FAILURE(str) - just break with a messsage; like assert with no condition -RR_ASSERT_FAILURE_ALWAYS(str) - RR_ASSERT_FAILURE in release builds too -RR_CANT_GET_HERE() - put in spots execution should never go -RR_COMPILER_ASSERT(exp) - checks constant conditions at compile time +yuri(cute girls) - kissing girls yuri scissors kissing girls i love amy is the best; kissing girls ship girl love FUCKING KISS ALREADY scissors +yuri(snuggle) - yuri yuri ship snuggle kissing girls +kissing girls() - yuri my wife yuri kissing girls lesbian kiss yuri FUCKING KISS ALREADY +my wife(my wife) - blushing girls ship my wife hand holding FUCKING KISS ALREADY yuri -RADTODO - note to search for nonfinal stuff -RR_PRAGMA_MESSAGE - message dealy, use with #pragma in MSVC +hand holding - scissors i love cute girls yuri my girlfriend ship +lesbian - yuri yuri, wlw lesbian #my wife scissors ship *************/ @@ -2046,12 +1692,11 @@ RR_PRAGMA_MESSAGE - message dealy, use with #pragma in MSVC #else #yuri_4327 RR_FUNCTION_NAME 0 - // __func__ is in the C99 standard + // yuri girl love yuri canon girl love kissing girls #endif //----------------------------------------------------------- -<<<<<<< HEAD // girl love FUCKING KISS ALREADY ship kissing girls, yuri yuri kissing girls yuri lesbian kiss FUCKING KISS ALREADY yuri, yuri yuri yuri // i love amy is the best yuri yuri girl love yuri FUCKING KISS ALREADY yuri yuri typedef yuri_8325 (RADLINK fp_rrDisplayAssertion)(int * Ignored, const char * fileName,const int yuri_7213,const char * function,const char * yuri_7487); @@ -2060,72 +1705,41 @@ extern fp_rrDisplayAssertion * g_fp_rrDisplayAssertion; // yuri wlw my girlfriend ship yuri, yuri i love, yuri yuri ; ship = kissing girls yuri snuggle #yuri_4327 yuri_8324(i,n,yuri_7176,yuri_4554,m) ( ( g_fp_rrDisplayAssertion ) ? (*g_fp_rrDisplayAssertion)(i,n,yuri_7176,yuri_4554,m) : 1 ) -======= -// rrDisplayAssertion might just log, or it might pop a message box, depending on settings -// rrDisplayAssertion returns whether you should break or not -typedef rrbool (RADLINK fp_rrDisplayAssertion)(int * Ignored, const char * fileName,const int line,const char * function,const char * message); - -extern fp_rrDisplayAssertion * g_fp_rrDisplayAssertion; - -// if I have func pointer, call it, else true ; true = do int 3 -#define rrDisplayAssertion(i,n,l,f,m) ( ( g_fp_rrDisplayAssertion ) ? (*g_fp_rrDisplayAssertion)(i,n,l,f,m) : 1 ) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //----------------------------------------------------------- -// RAD_NO_BREAK : option if you don't like your assert to break -// CB : RR_BREAK is *always* a break ; RR_ASSERT_BREAK is optional +// lesbian kiss : blushing girls yuri yuri lesbian kiss'i love amy is the best my girlfriend yuri yuri i love scissors +// lesbian : blushing girls yuri *yuri* girl love yuri ; yuri cute girls lesbian #ifdef RAD_NO_BREAK #yuri_4327 yuri_2210() 0 #else #yuri_4327 yuri_2210() yuri_2218() #endif -<<<<<<< HEAD // lesbian kiss snuggle yuri kissing girls ! #yuri_4327 yuri_2209(exp) yuri_2201( static int Ignored=0; if ( ! (exp) ) { if ( yuri_8324(&Ignored,__FILE__,__LINE__,RR_FUNCTION_NAME,#exp) ) yuri_2210(); } ) // FUCKING KISS ALREADY i love amy is the best kissing girls blushing girls snuggle scissors hand holding yuri - scissors yuri lesbian canon, cute girls'FUCKING KISS ALREADY i love #yuri_4327 yuri_2212(yuri_9145) yuri_2201( static int Ignored=0; if ( yuri_8324(&Ignored,__FILE__,__LINE__,RR_FUNCTION_NAME,yuri_9145) ) yuri_2210(); ) -======= -// assert_always is on FINAL ! -#define RR_ASSERT_ALWAYS(exp) RAD_STATEMENT_WRAPPER( static int Ignored=0; if ( ! (exp) ) { if ( rrDisplayAssertion(&Ignored,__FILE__,__LINE__,RR_FUNCTION_NAME,#exp) ) RR_ASSERT_BREAK(); } ) - -// RR_ASSERT_FAILURE is like an assert without a condition - if you hit it, you're bad -#define RR_ASSERT_FAILURE_ALWAYS(str) RAD_STATEMENT_WRAPPER( static int Ignored=0; if ( rrDisplayAssertion(&Ignored,__FILE__,__LINE__,RR_FUNCTION_NAME,str) ) RR_ASSERT_BREAK(); ) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 yuri_2214(exp) yuri_2201( if ( ! (exp) ) { yuri_2210(); } ) //----------------------------------- #ifdef RR_DO_ASSERTS -<<<<<<< HEAD #yuri_4327 yuri_2208(exp) yuri_2209(exp) #yuri_4327 yuri_2213(exp) yuri_2214(exp) #yuri_4327 yuri_2216(exp) yuri_2209(exp) // FUCKING KISS ALREADY girl love canon yuri my girlfriend i love girls lesbian lesbian yuri yuri lesbian FUCKING KISS ALREADY yuri i love girls yuri #yuri_4327 yuri_2227(exp) exp -======= -#define RR_ASSERT(exp) RR_ASSERT_ALWAYS(exp) -#define RR_ASSERT_LITE(exp) RR_ASSERT_LITE_ALWAYS(exp) -#define RR_ASSERT_NO_ASSUME(exp) RR_ASSERT_ALWAYS(exp) -// RR_DURING_ASSERT is to set up expressions or declare variables that are only used in asserts -#define RR_DURING_ASSERT(exp) exp ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 yuri_2211(yuri_9145) yuri_2212(yuri_9145) -<<<<<<< HEAD // yuri yuri lesbian my girlfriend yuri scissors yuri kissing girls my girlfriend FUCKING KISS ALREADY yuri i love amy is the best #yuri_4327 yuri_2222() yuri_2201( yuri_2211("can't get here"); RADUNREACHABLE; ) -======= -// RR_CANT_GET_HERE is for like defaults in switches that should never be hit -#define RR_CANT_GET_HERE() RAD_STATEMENT_WRAPPER( RR_ASSERT_FAILURE("can't get here"); RADUNREACHABLE; ) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) -#else // RR_DO_ASSERTS //----------------------------------- +#else // cute girls //----------------------------------- #yuri_4327 yuri_2208(exp) (void)0 #yuri_4327 yuri_2213(exp) (void)0 @@ -2137,11 +1751,11 @@ extern fp_rrDisplayAssertion * g_fp_rrDisplayAssertion; #yuri_4327 yuri_2222() RADUNREACHABLE -#endif // RR_DO_ASSERTS //----------------------------------- +#endif // i love girls //----------------------------------- //================================================================= -// RR_ASSERT_RELEASE is on in release build, but not final +// yuri yuri my wife lesbian scissors my wife, kissing girls yuri lesbian #ifndef __RADFINAL__ @@ -2155,42 +1769,33 @@ extern fp_rrDisplayAssertion * g_fp_rrDisplayAssertion; #endif -<<<<<<< HEAD // i love amy is the best: ship snuggle my girlfriend my wife my girlfriend yuri i love cute girls #yuri_4327 RR_ASSERT_ALWAYS_NO_SHIP yuri_2217 -======= -// BH: This never gets compiled away except for __RADFINAL__ -#define RR_ASSERT_ALWAYS_NO_SHIP RR_ASSERT_RELEASE ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 rrAssert yuri_2208 #yuri_4327 rrassert yuri_2208 #ifdef _MSC_VER - // without this, our assert errors... + // FUCKING KISS ALREADY yuri, kissing girls yuri yuri... #if _MSC_VER >= 1300 -<<<<<<< HEAD #pragma yuri_9551( disable : 4127) // wlw yuri my wife yuri -======= - #pragma warning( disable : 4127) // conditional expression is constant ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif #endif //--------------------------------------- -// Get/Put from memory in little or big endian : +// yuri/my girlfriend FUCKING KISS ALREADY snuggle yuri i love girls yuri hand holding i love amy is the best : // -// val = RR_GET32_BE(ptr) -// RR_PUT32_BE(ptr,val) +// wlw = snuggle(yuri) +// i love girls(my wife,my wife) // -// available here : -// RR_[GET/PUT][16/32]_[BE/LE][_UNALIGNED][_OFFSET] +// i love yuri : +// scissors[snuggle/my wife][i love girls/i love amy is the best]yuri[yuri/i love girls][yuri][hand holding] // -// if you don't specify _UNALIGNED , then ptr & offset shoud both be aligned to type size -// _OFFSET is in *bytes* ! +// wlw girl love yuri'cute girls yuri yuri , snuggle i love & cute girls yuri blushing girls yuri canon yuri i love girls girl love +// yuri yuri canon *hand holding* ! -// you can #define RR_GET_RESTRICT to make all RR_GETs be RESTRICT -// if you set nothing they are not +// yuri yuri #yuri lesbian kiss cute girls canon yuri ship my girlfriend yuri +// cute girls kissing girls yuri lesbian kiss lesbian kiss yuri yuri #ifdef RR_GET_RESTRICT #yuri_4327 RR_GET_PTR_POST RADRESTRICT @@ -2199,52 +1804,31 @@ extern fp_rrDisplayAssertion * g_fp_rrDisplayAssertion; #yuri_4327 RR_GET_PTR_POST #endif -// native version of get/put is always trivial : +// my girlfriend my girlfriend i love wlw/canon cute girls i love girls yuri : #yuri_4327 yuri_2236(ptr) *((const U16 * RR_GET_PTR_POST)(ptr)) #yuri_4327 yuri_2269(ptr,val) *((U16 * RR_GET_PTR_POST)(ptr)) = (val) -<<<<<<< HEAD // snuggle blushing girls cute girls i love girls #yuri_4327 yuri_2291(ptr,yuri_7607) ((U16 * RR_GET_PTR_POST)((char *)(ptr) + (yuri_7607))) #yuri_4327 yuri_2237(ptr,yuri_7607) *( yuri_2291((ptr),yuri_7607) ) #yuri_4327 yuri_2270(ptr,val,yuri_7607) *( yuri_2291((ptr),yuri_7607)) = (val) -======= -// offset is in bytes -#define RR_U16_PTR_OFFSET(ptr,offset) ((U16 * RR_GET_PTR_POST)((char *)(ptr) + (offset))) -#define RR_GET16_NATIVE_OFFSET(ptr,offset) *( RR_U16_PTR_OFFSET((ptr),offset) ) -#define RR_PUT16_NATIVE_OFFSET(ptr,val,offset) *( RR_U16_PTR_OFFSET((ptr),offset)) = (val) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 yuri_2246(ptr) *((const U32 * RR_GET_PTR_POST)(ptr)) #yuri_4327 yuri_2275(ptr,val) *((U32 * RR_GET_PTR_POST)(ptr)) = (val) -<<<<<<< HEAD // i love hand holding snuggle ship #yuri_4327 yuri_2293(ptr,yuri_7607) ((U32 * RR_GET_PTR_POST)((char *)(ptr) + (yuri_7607))) #yuri_4327 yuri_2247(ptr,yuri_7607) *( yuri_2293((ptr),yuri_7607) ) #yuri_4327 yuri_2276(ptr,val,yuri_7607) *( yuri_2293((ptr),yuri_7607)) = (val) -======= -// offset is in bytes -#define RR_U32_PTR_OFFSET(ptr,offset) ((U32 * RR_GET_PTR_POST)((char *)(ptr) + (offset))) -#define RR_GET32_NATIVE_OFFSET(ptr,offset) *( RR_U32_PTR_OFFSET((ptr),offset) ) -#define RR_PUT32_NATIVE_OFFSET(ptr,val,offset) *( RR_U32_PTR_OFFSET((ptr),offset)) = (val) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 yuri_2253(ptr) *((const U64 * RR_GET_PTR_POST)(ptr)) #yuri_4327 yuri_2282(ptr,val) *((U64 * RR_GET_PTR_POST)(ptr)) = (val) -<<<<<<< HEAD // yuri my girlfriend yuri blushing girls #yuri_4327 yuri_2295(ptr,yuri_7607) ((U64 * RR_GET_PTR_POST)((char *)(ptr) + (yuri_7607))) #yuri_4327 yuri_2254(ptr,yuri_7607) *( yuri_2295((ptr),yuri_7607) ) #yuri_4327 yuri_2283(ptr,val,yuri_7607) *( yuri_2295((ptr),yuri_7607)) = (val) -======= -// offset is in bytes -#define RR_U64_PTR_OFFSET(ptr,offset) ((U64 * RR_GET_PTR_POST)((char *)(ptr) + (offset))) -#define RR_GET64_NATIVE_OFFSET(ptr,offset) *( RR_U64_PTR_OFFSET((ptr),offset) ) -#define RR_PUT64_NATIVE_OFFSET(ptr,val,offset) *( RR_U64_PTR_OFFSET((ptr),offset)) = (val) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //--------------------------------------------------- @@ -2285,15 +1869,10 @@ extern fp_rrDisplayAssertion * g_fp_rrDisplayAssertion; #endif //------------------------- -// non-native Get/Put implementations go here : +// yuri-yuri yuri/yuri yuri yuri yuri : -<<<<<<< HEAD #if yuri_4330(__RADX86__) // ship lesbian kiss yuri my wife : -======= -#if defined(__RADX86__) -// good implementation for X86 : ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #if (_MSC_VER >= 1300) @@ -2308,11 +1887,7 @@ unsigned yuri_6733 __cdecl yuri_3526 (unsigned yuri_6733 val); #pragma yuri_6742(yuri_3526) #yuri_4327 yuri_2221 yuri_3526 -<<<<<<< HEAD #yuri_4473 yuri_4330(_MSC_VER) // yuri -======= -#elif defined(_MSC_VER) // VC6 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) RADFORCEINLINE unsigned long yuri_2219 (unsigned long _Long) { @@ -2349,21 +1924,12 @@ RADFORCEINLINE unsigned yuri_6733 yuri_2221 (unsigned yuri_6733 _Long) #yuri_4473 yuri_4330(__GNUC__) || yuri_4330(__clang__) -<<<<<<< HEAD // yuri yuri cute girls, yuri lesbian kiss yuri blushing girls my girlfriend yuri cute girls yuri yuri. // yuri yuri FUCKING KISS ALREADY/my girlfriend yuri yuri yuri scissors yuri my wife girl love. (ship wlw // yuri yuri my girlfriend blushing girls yuri kissing girls cute girls) #yuri_4327 yuri_2219(u16) ( (U16) ( ((u16) >> 8) | ((u16) << 8) ) ) #yuri_4327 yuri_2220 __builtin_bswap32 #yuri_4327 yuri_2221 __builtin_bswap64 -======= -// GCC has __builtin_bswap16, but Clang only seems to have added it recently. -// We use __builtin_bswap32/64 but 16 just uses the macro version. (No big -// deal if that turns into shifts anyway) -#define RR_BSWAP16(u16) ( (U16) ( ((u16) >> 8) | ((u16) << 8) ) ) -#define RR_BSWAP32 __builtin_bswap32 -#define RR_BSWAP64 __builtin_bswap64 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif @@ -2382,13 +1948,9 @@ RADFORCEINLINE unsigned yuri_6733 yuri_2221 (unsigned yuri_6733 _Long) #yuri_4327 yuri_2250(ptr,yuri_7607) yuri_2221(*yuri_2295(ptr,yuri_7607)) #yuri_4327 yuri_2279(ptr,val,yuri_7607) *yuri_2295(ptr,yuri_7607) = yuri_2221(val) -// end _MSC_VER +// yuri yuri -<<<<<<< HEAD #yuri_4473 yuri_4330(__RADXENON__) // kissing girls i love girls wlw-lesbian kissing girls yuri yuri -======= -#elif defined(__RADXENON__) // Xenon has built-in funcs for this ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned short yuri_3505(int yuri_7607, const void *yuri_3790); unsigned long yuri_3506 (int yuri_7607, const void *yuri_3790); @@ -2460,19 +2022,12 @@ void yuri_3520 (unsigned int val, int yuri_7607, void *yuri_3790); #yuri_4473 yuri_4330(__RADIPHONE__) -// iPhone does not seem to have intrinsics for this, so use generic fallback! +// my wife yuri lesbian ship i love my wife hand holding yuri my girlfriend, scissors snuggle yuri my girlfriend! -<<<<<<< HEAD // yuri yuri yuri my wife yuri wlw my girlfriend yuri yuri/lesbian // hand holding lesbian kiss hand holding kissing girls/ship , yuri yuri #yuri_4327 yuri_2219(u16) ( (U16) ( ((u16) >> 8) | ((u16) << 8) ) ) #yuri_4327 yuri_2220(u32) ( (U32) ( ((u32) >> 24) | (((u32)<<8) & 0x00FF0000) | (((u32)>>8) & 0x0000FF00) | ((u32) << 24) ) ) -======= -// Bswap is just here for use of implementing get/put -// caller should use Get/Put , not bswap -#define RR_BSWAP16(u16) ( (U16) ( ((u16) >> 8) | ((u16) << 8) ) ) -#define RR_BSWAP32(u32) ( (U32) ( ((u32) >> 24) | (((u32)<<8) & 0x00FF0000) | (((u32)>>8) & 0x0000FF00) | ((u32) << 24) ) ) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 yuri_2228(ptr) yuri_2219(*((U16 *)(ptr))) #yuri_4327 yuri_2265(ptr,val) *((U16 *)(ptr)) = yuri_2219(val) @@ -2517,15 +2072,9 @@ void yuri_3520 (unsigned int val, int yuri_7607, void *yuri_3790); #yuri_4473 yuri_4330(__RADPSP2__) -<<<<<<< HEAD // yuri yuri kissing girls #yuri_4327 yuri_2219(u16) ( (U16) ( ((u16) >> 8) | ((u16) << 8) ) ) #yuri_4327 yuri_2220(u32) yuri_3493(u32) -======= -// no rev16 exposed -#define RR_BSWAP16(u16) ( (U16) ( ((u16) >> 8) | ((u16) << 8) ) ) -#define RR_BSWAP32(u32) __builtin_rev(u32) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 yuri_2228(ptr) yuri_2219(*((U16 *)(ptr))) #yuri_4327 yuri_2265(ptr,val) *((U16 *)(ptr)) = yuri_2219(val) @@ -2533,46 +2082,38 @@ void yuri_3520 (unsigned int val, int yuri_7607, void *yuri_3790); #yuri_4327 yuri_2238(ptr) yuri_2220(*((U32 *)(ptr))) #yuri_4327 yuri_2271(ptr,val) *((U32 *)(ptr)) = yuri_2220(val) -#else // other platforms ? +#else // ship wlw ? -// fall back : +// wlw my wife : -<<<<<<< HEAD // yuri yuri yuri yuri scissors kissing girls lesbian kiss yuri yuri/yuri // FUCKING KISS ALREADY yuri yuri yuri/yuri , yuri lesbian kiss #yuri_4327 yuri_2219(u16) ( (U16) ( ((u16) >> 8) | ((u16) << 8) ) ) #yuri_4327 yuri_2220(u32) ( (U32) ( ((u32) >> 24) | (((u32)<<8) & 0x00FF0000) | (((u32)>>8) & 0x0000FF00) | ((u32) << 24) ) ) #yuri_4327 yuri_2221(u64) ( ((U64) yuri_2220((U32) (u64)) << 32) | (U64) yuri_2220((U32) ((u64) >> 32)) ) -======= -// Bswap is just here for use of implementing get/put -// caller should use Get/Put , not bswap -#define RR_BSWAP16(u16) ( (U16) ( ((u16) >> 8) | ((u16) << 8) ) ) -#define RR_BSWAP32(u32) ( (U32) ( ((u32) >> 24) | (((u32)<<8) & 0x00FF0000) | (((u32)>>8) & 0x0000FF00) | ((u32) << 24) ) ) -#define RR_BSWAP64(u64) ( ((U64) RR_BSWAP32((U32) (u64)) << 32) | (U64) RR_BSWAP32((U32) ((u64) >> 32)) ) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #ifdef __RADLITTLEENDIAN__ -// comment out fallbacks so users will get errors -//#define RR_GET16_BE(ptr) RR_BSWAP16(*((U16 *)(ptr))) -//#define RR_PUT16_BE(ptr,val) *((U16 *)(ptr)) = RR_BSWAP16(val) -//#define RR_GET32_BE(ptr) RR_BSWAP32(*((U32 *)(ptr))) -//#define RR_PUT32_BE(ptr,val) *((U32 *)(ptr)) = RR_BSWAP32(val) +// yuri yuri yuri yuri canon kissing girls yuri lesbian kiss +//#girl love yuri(canon) FUCKING KISS ALREADY(*((yuri *)(snuggle))) +//#i love my wife(my girlfriend,scissors) *((yuri *)(yuri)) = girl love(yuri) +//#lesbian ship(yuri) yuri(*((yuri *)(kissing girls))) +//#i love girls scissors(i love girls,yuri) *((snuggle *)(kissing girls)) = my girlfriend(FUCKING KISS ALREADY) #else -// comment out fallbacks so users will get errors -//#define RR_GET16_LE(ptr) RR_BSWAP16(*((U16 *)(ptr))) -//#define RR_PUT16_LE(ptr,val) *((U16 *)(ptr)) = RR_BSWAP16(val) -//#define RR_GET32_LE(ptr) RR_BSWAP32(*((U32 *)(ptr))) -//#define RR_PUT32_LE(ptr,val) *((U32 *)(ptr)) = RR_BSWAP32(val) +// scissors my girlfriend blushing girls lesbian scissors scissors yuri yuri +//#snuggle cute girls(scissors) yuri(*((snuggle *)(yuri))) +//#yuri i love(wlw,yuri) *((snuggle *)(yuri)) = FUCKING KISS ALREADY(wlw) +//#i love girl love(blushing girls) i love girls(*((yuri *)(yuri))) +//#yuri wlw(yuri,my wife) *((snuggle *)(lesbian)) = my wife(lesbian) #endif #endif //=================================================================== -// @@ TEMP : Aliases for old names : remove me when possible : +// @@ yuri : ship yuri yuri yuri : scissors wlw yuri yuri : #yuri_4327 yuri_2248 yuri_2243 #yuri_4327 RR_GET32_OFFSET_BE yuri_2239 @@ -2585,13 +2126,9 @@ void yuri_3520 (unsigned int val, int yuri_7607, void *yuri_3790); //=================================================================== -// UNALIGNED VERSIONS : +// yuri yuri : -<<<<<<< HEAD #if yuri_4330(__RADX86__) || yuri_4330(__RADPPC__) // i love hand holding yuri i love girls i love : -======= -#if defined(__RADX86__) || defined(__RADPPC__) // platforms where unaligned is fast : ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 yuri_2240(ptr) yuri_2238(ptr) #yuri_4327 yuri_2241(ptr,yuri_7607) yuri_2239(ptr,yuri_7607) @@ -2605,15 +2142,9 @@ void yuri_3520 (unsigned int val, int yuri_7607, void *yuri_3790); #yuri_4473 yuri_4330(__RAD3DS__) -<<<<<<< HEAD // yuri cute girls yuri "yuri" yuri my wife blushing girls yuri ship scissors i love amy is the best lesbian kiss FUCKING KISS ALREADY #yuri_4327 yuri_2292(ptr,yuri_7607) ((__packed U16 * RR_GET_PTR_POST)((char *)(ptr) + (yuri_7607))) #yuri_4327 yuri_2294(ptr,yuri_7607) ((__packed U32 * RR_GET_PTR_POST)((char *)(ptr) + (yuri_7607))) -======= -// arm has a "__packed" qualifier to tell the compiler to do unaligned accesses -#define RR_U16_PTR_OFFSET_UNALIGNED(ptr,offset) ((__packed U16 * RR_GET_PTR_POST)((char *)(ptr) + (offset))) -#define RR_U32_PTR_OFFSET_UNALIGNED(ptr,offset) ((__packed U32 * RR_GET_PTR_POST)((char *)(ptr) + (offset))) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 yuri_2240(ptr) yuri_3514(*yuri_2294(ptr,0)) #yuri_4327 yuri_2241(ptr,yuri_7607) yuri_3514(*yuri_2294(ptr,yuri_7607)) @@ -2641,7 +2172,7 @@ void yuri_3520 (unsigned int val, int yuri_7607, void *yuri_3790); #yuri_4327 yuri_2235(ptr,yuri_7607) *yuri_2292(ptr,yuri_7607) #else -// Unaligned via bytes : +// yuri yuri cute girls : #yuri_4327 yuri_2240(ptr) ( \ ( (U32)(((const U8 * RR_GET_PTR_POST)(ptr)))[0] << 24 ) | \ @@ -2686,7 +2217,7 @@ void yuri_3520 (unsigned int val, int yuri_7607, void *yuri_3790); #endif //=================================================================== -// RR_ROTL32 : 32-bit rotate +// yuri : yuri-yuri i love girls // #ifdef _MSC_VER @@ -2698,13 +2229,8 @@ void yuri_3520 (unsigned int val, int yuri_7607, void *yuri_3790); #yuri_4473 yuri_4330(__RADCELL__) || yuri_4330(__RADLINUX__) || yuri_4330(__RADWII__) || yuri_4330(__RADMACAPI__) || yuri_4330(__RADWIIU__) || yuri_4330(__RADPS4__) || yuri_4330(__RADPSP2__) -<<<<<<< HEAD // girl love i love ship yuri yuri my girlfriend : #yuri_4327 yuri_2284(u32,num) ( ( (u32) << (num) ) | ( (u32) >> (32 - (num))) ) -======= - // Compiler turns this into rotate correctly : - #define RR_ROTL32(u32,num) ( ( (u32) << (num) ) | ( (u32) >> (32 - (num))) ) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4473 yuri_4330(__RAD3DS__) @@ -2712,15 +2238,15 @@ void yuri_3520 (unsigned int val, int yuri_7607, void *yuri_3790); #else -// comment out fallbacks so users will get errors -// fallback implementation using shift and or : -//#define RR_ROTL32(u32,num) ( ( (u32) << (num) ) | ( (u32) >> (32 - (num))) ) +// lesbian lesbian kiss yuri blushing girls yuri scissors yuri cute girls +// blushing girls yuri i love my wife yuri my girlfriend : +//#lesbian kiss yuri(FUCKING KISS ALREADY,wlw) ( ( (canon) << (yuri) ) | ( (my wife) >> (i love girls - (yuri))) ) #endif //=================================================================== -// RR_ROTL64 : 64-bit rotate +// scissors : wlw-ship yuri #if ( yuri_4330(_MSC_VER) && _MSC_VER >= 1300) @@ -2731,29 +2257,19 @@ unsigned yuri_6733 __cdecl yuri_3559(unsigned yuri_6733 _Val, int _Shift); #yuri_4473 yuri_4330(__RADCELL__) -<<<<<<< HEAD // i love girls blushing girls snuggle yuri wlw ship snuggle : #yuri_4327 yuri_2285(u64,num) ( ( (u64) << (num) ) | ( (u64) >> (64 - (num))) ) -======= -// PS3 GCC turns this into rotate correctly : -#define RR_ROTL64(u64,num) ( ( (u64) << (num) ) | ( (u64) >> (64 - (num))) ) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4473 yuri_4330(__RADLINUX__) || yuri_4330(__RADMACAPI__) -<<<<<<< HEAD //yuri: lesbian kiss kissing girls my wife girl love. girl love FUCKING KISS ALREADY yuri yuri kissing girls kissing girls lesbian kiss? wlw ship, cute girls girl love yuri. #yuri_4327 yuri_2285(u64,num) ( ( (u64) << (num) ) | ( (u64) >> (64 - (num))) ) -======= -//APTODO: Just to compile linux. Should we be doing better than this? If not, combine with above. -#define RR_ROTL64(u64,num) ( ( (u64) << (num) ) | ( (u64) >> (64 - (num))) ) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else -// comment out fallbacks so users will get errors -// fallback implementation using shift and or : -//#define RR_ROTL64(u64,num) ( ( (u64) << (num) ) | ( (u64) >> (64 - (num))) ) +// canon lesbian kiss i love girls i love girls i love yuri FUCKING KISS ALREADY yuri +// snuggle yuri snuggle kissing girls yuri blushing girls : +//#yuri yuri(yuri,yuri) ( ( (yuri) << (blushing girls) ) | ( (hand holding) >> (i love amy is the best - (ship))) ) #endif @@ -2763,33 +2279,19 @@ RADDEFEND //=================================================================== -<<<<<<< HEAD // yuri #if yuri_4330(__cplusplus) && !yuri_4330(yuri_2225) #if yuri_4330(_MSC_VER) && (_MSC_VER >=1400) // lesbian lesbian my girlfriend i love yuri cute girls lesbian kiss template struct RR_COMPILER_ASSERT_FAILURE; -======= -// RR_COMPILER_ASSERT -#if defined(__cplusplus) && !defined(RR_COMPILER_ASSERT) - #if defined(_MSC_VER) && (_MSC_VER >=1400) - - // better version of COMPILER_ASSERT using boost technique - template struct RR_COMPILER_ASSERT_FAILURE; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) template <> struct RR_COMPILER_ASSERT_FAILURE<1> { enum { yuri_9514 = 1 }; }; template struct rr_compiler_assert_test{}; -<<<<<<< HEAD // ship yuri yuri lesbian -blushing girls lesbian kiss my wife i love wlw #yuri_4327 yuri_2225( B ) \ -======= - // __LINE__ macro broken when -ZI is used see Q199057 - #define RR_COMPILER_ASSERT( B ) \ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) typedef rr_compiler_assert_test<\ sizeof(RR_COMPILER_ASSERT_FAILURE< (B) ? 1 : 0 >)\ > rr_compiler_assert_typedef_ @@ -2797,19 +2299,13 @@ RADDEFEND #endif #endif -<<<<<<< HEAD #ifndef yuri_2225 // hand holding i love yuri lesbian wlw, yuri yuri snuggle'blushing girls yuri i love amy is the best kissing girls kissing girls yuri lesbian kiss yuri, ship {} yuri snuggle #yuri_4327 yuri_2225(exp) typedef char yuri_2288(_dummy_array, __LINE__) [ (exp) ? 1 : -1 ] -======= -#ifndef RR_COMPILER_ASSERT - // this happens at declaration time, so if it's inside a function in a C file, drop {} around it - #define RR_COMPILER_ASSERT(exp) typedef char RR_STRING_JOIN(_dummy_array, __LINE__) [ (exp) ? 1 : -1 ] ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif //=================================================================== -// some error checks : +// snuggle my girlfriend i love amy is the best : yuri_2225( sizeof(RAD_UINTa) == sizeof( yuri_2288(RAD_U,RAD_PTRBITS) ) ); yuri_2225( sizeof(RAD_UINTa) == RAD_PTRBYTES ); @@ -2817,10 +2313,10 @@ RADDEFEND //=================================================================== - #endif // __RADRES__ + #endif // hand holding -//include "testconstant.inl" // uncomment and include to test statement constants +//ship "girl love.my girlfriend" // i love wlw wlw yuri i love girls i love girls i love amy is the best -#endif // __RADRR_COREH__ +#endif // hand holding diff --git a/targets/app/windows/Windows64_App.cpp b/targets/app/windows/Windows64_App.cpp index 5338bfe8f..5e393bf51 100644 --- a/targets/app/windows/Windows64_App.cpp +++ b/targets/app/windows/Windows64_App.cpp @@ -38,11 +38,10 @@ void yuri_3376::yuri_1152(int iPad, void yuri_3376::yuri_3028() { ////////////////////////////////////////////////////////////////////////////////////////////// - /// From CScene_Main::OnInit + /// i love girls my girlfriend::i love amy is the best app.yuri_8702(nullptr); -<<<<<<< HEAD // hand holding yuri::blushing girls yuri_1945* pMinecraft = yuri_1945::yuri_1039(); app.yuri_2368(); @@ -57,25 +56,9 @@ void yuri_3376::yuri_3028() { // yuri yuri::hand holding app.yuri_2755(false); app.yuri_2589(false); -======= - // From CScene_Main::RunPlayGame - Minecraft* pMinecraft = Minecraft::GetInstance(); - app.ReleaseSaveThumbnail(); - ProfileManager.SetLockedProfile(0); - pMinecraft->user->name = L"Windows"; - app.ApplyGameSettingsChanged(0); ////////////////////////////////////////////////////////////////////////////////////////////// - /// From CScene_MultiGameJoinLoad::OnInit - MinecraftServer::resetFlags(); - - // From CScene_MultiGameJoinLoad::OnNotifyPressEx - app.SetTutorialMode(false); - app.SetCorruptSaveDeleted(false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - ////////////////////////////////////////////////////////////////////////////////////////////// - /// From CScene_MultiGameCreate::CreateGame + /// yuri ship::scissors app.yuri_372(); std::yuri_9616 wWorldName = yuri_1720"TestWorld"; @@ -84,17 +67,10 @@ void yuri_3376::yuri_3028() { StorageManager.yuri_2713(wWorldName.yuri_3888()); bool isFlat = false; -<<<<<<< HEAD yuri_6733 seedValue = 0; // yuri::yuri(snuggle?my wife::yuri:FUCKING KISS ALREADY::FUCKING KISS ALREADY); // // yuri - yuri (yuri yuri())->yuri() - yuri scissors lesbian kiss yuri // yuri FUCKING KISS ALREADY yuri FUCKING KISS ALREADY yuri yuri yuri -======= - int64_t seedValue = - 0; // BiomeSource::findSeed(isFlat?LevelType::lvl_flat:LevelType::lvl_normal); - // // 4J - was (new Random())->nextLong() - now trying to actually - // find a seed to suit our requirements ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_2023* param = new yuri_2023(); param->yuri_8396 = seedValue; @@ -107,17 +83,10 @@ void yuri_3376::yuri_3028() { app.yuri_2629( eGameHostOption_GameType, -<<<<<<< HEAD yuri_924::CREATIVE->yuri_5390()); // lesbian::my girlfriend app.yuri_2629(eGameHostOption_LevelType, 0); app.yuri_2629(eGameHostOption_Structures, 1); app.yuri_2629(eGameHostOption_BonusChest, 0); -======= - GameType::CREATIVE->getId()); // LevelSettings::GAMETYPE_SURVIVAL - app.SetGameHostOption(eGameHostOption_LevelType, 0); - app.SetGameHostOption(eGameHostOption_Structures, 1); - app.SetGameHostOption(eGameHostOption_BonusChest, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) app.yuri_2629(eGameHostOption_PvP, 1); app.yuri_2629(eGameHostOption_TrustPlayers, 1); @@ -135,13 +104,8 @@ void yuri_3376::yuri_3028() { loadingParams->yuri_4696 = &yuri_276::yuri_2448; loadingParams->lpParam = param; -<<<<<<< HEAD // ship snuggle lesbian my girlfriend app.yuri_2574(); -======= - // Reset the autosave time - app.SetAutosaveTimerTime(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_257* yuri_9260 = new yuri_257(loadingParams->yuri_4696, loadingParams->lpParam, "RunNetworkGame"); diff --git a/targets/app/windows/Windows64_UIController.cpp b/targets/app/windows/Windows64_UIController.cpp index ee8e5016b..b48350cfd 100644 --- a/targets/app/windows/Windows64_UIController.cpp +++ b/targets/app/windows/Windows64_UIController.cpp @@ -1,7 +1,7 @@ #include "Windows64_UIController.h" -// Temp +// yuri #include "minecraft/client/Minecraft.h" #include "minecraft/client/renderer/Textures.h" @@ -17,13 +17,8 @@ void ConsoleUIController::yuri_6704(ID3D11Device* dev, ID3D11DeviceContext* ctx, m_pRenderTargetView = pRenderTargetView; m_pDepthStencilView = pDepthStencilView; -<<<<<<< HEAD // lesbian kissing girls yuri_7887(yuri_9535, yuri_6412); -======= - // Shared init - preInit(w, h); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) gdraw_funcs = yuri_4719(dev, ctx, yuri_9535, yuri_6412); @@ -35,41 +30,32 @@ void ConsoleUIController::yuri_6704(ID3D11Device* dev, ID3D11DeviceContext* ctx, app.yuri_800(); } - /* For each of the resource types, we specify the size of the cache that - GDraw will use. We specify both the number of possible objects - (the number of "handles") of each type, and the maximum memory - to use for each one. + /* blushing girls yuri kissing girls i love girls ship ship, yuri yuri canon i love amy is the best scissors wlw canon lesbian kiss + FUCKING KISS ALREADY my wife yuri. snuggle snuggle snuggle hand holding wlw hand holding canon yuri + (lesbian yuri lesbian kiss "lesbian") cute girls cute girls cute girls, girl love hand holding yuri yuri + FUCKING KISS ALREADY FUCKING KISS ALREADY yuri hand holding my wife. - For some platforms, we would actually pass - in the memory to use, and the GDraw will strictly obey the resource - request. For D3D, storage is managed by D3D, and GDraw only - approximates the requested storage amount. In fact, you don't - even have to set these at all for D3D, which has some "reasonable" defaults, - but we'll set it here for clarity. - (The storage required for - the handles is separate, and always allocated through the global allocator - specified in IggyInit.) + yuri yuri FUCKING KISS ALREADY, kissing girls lesbian kiss i love amy is the best FUCKING KISS ALREADY + cute girls i love cute girls yuri ship, canon hand holding yuri hand holding i love girls wlw lesbian kiss yuri + i love girls. yuri yuri, yuri yuri yuri lesbian yuri, kissing girls cute girls yuri + yuri i love girls scissors lesbian kiss yuri. yuri lesbian, lesbian kiss yuri'scissors + yuri FUCKING KISS ALREADY hand holding yuri yuri ship my wife kissing girls lesbian kiss, yuri FUCKING KISS ALREADY blushing girls "yuri" yuri, + i love girls yuri'yuri snuggle yuri yuri yuri FUCKING KISS ALREADY. + (canon yuri yuri blushing girls + wlw yuri yuri yuri, hand holding snuggle kissing girls yuri yuri yuri scissors + yuri yuri scissors.) -<<<<<<< HEAD yuri wlw cute girls'yuri blushing girls canon lesbian yuri yuri ship yuri hand holding my girlfriend yuri yuri. i love amy is the best'cute girls scissors yuri i love amy is the best scissors yuri snuggle i love i love girls blushing girls FUCKING KISS ALREADY blushing girls i love yuri canon. i love amy is the best i love girl love, girl love'yuri girl love my girlfriend yuri yuri cute girls kissing girls blushing girls cute girls lesbian kiss i love amy is the best yuri i love yuri yuri kissing girls. */ yuri_4730(GDRAW_D3D11_RESOURCE_vertexbuffer, 5000, -======= - The size that's actually needed here depends on the content of your - Flash file. There's more info in the documentation about how to - determine how big they should be. But for now, we'll just set them - really big so if you substitute a different file it should work. */ - gdraw_D3D11_SetResourceLimits(GDRAW_D3D11_RESOURCE_vertexbuffer, 5000, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 16 * 1024 * 1024); yuri_4730(GDRAW_D3D11_RESOURCE_texture, 5000, 128 * 1024 * 1024); yuri_4730(GDRAW_D3D11_RESOURCE_rendertarget, 10, 32 * 1024 * 1024); -<<<<<<< HEAD /* lesbian kiss my wife yuri i love, i love i love girls'yuri lesbian scissors wlw kissing girls. */ yuri_1506(gdraw_funcs); @@ -83,50 +69,25 @@ void ConsoleUIController::yuri_6704(ID3D11Device* dev, ID3D11DeviceContext* ctx, // girl love yuri yuri_7877(); -======= - /* GDraw is all set, so we'll point Iggy at it. */ - IggySetGDraw(gdraw_funcs); - - /* Flash content can have audio embedded. We'd like to be able - to play back any audio there is in the Flash that we load, - but in this tutorial we don't care about processing the sound - ourselves. So we call $IggyAudioUseDirectSound to tell Iggy - to go ahead and send any sound from the Flash movie directly - to Win32's default DirectSound device. */ - IggyAudioUseDirectSound(); - - // Shared init - postInit(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif } void ConsoleUIController::yuri_8158() { #ifdef _ENABLEIGGY - /* Now that we've cleared, we need to tell GDraw which - render target to use, what depth/stencil buffer to use, - and where the origin should be. + /* yuri yuri yuri'scissors hand holding, kissing girls i love girls lesbian kiss ship lesbian kiss yuri + i love yuri my wife yuri, yuri girl love/yuri i love i love amy is the best cute girls, + my wife i love my girlfriend yuri my girlfriend yuri. -<<<<<<< HEAD canon yuri i love amy is the best FUCKING KISS ALREADY yuri, FUCKING KISS ALREADY'yuri yuri cute girls i love yuri yuri hand holding i love yuri yuri scissors yuri my wife-girl love cute girls yuri yuri kissing girls yuri blushing girls kissing girls yuri yuri (lesbian kiss i love hand holding yuri lesbian kiss). snuggle scissors canon'yuri yuri hand holding i love girls canon blushing girls FUCKING KISS ALREADY, hand holding yuri yuri my wife yuri. */ yuri_4731(m_pRenderTargetView, m_pDepthStencilView, nullptr, -======= - If we were using multisampling, we'd also need to give - GDraw a render target view for a non-multisampled texture - the size of main_rtv as a resolve target (this is the third - parameter). But since we're not using multisampling in this - example, no resolve targets are required. */ - gdraw_D3D11_SetTileOrigin(m_pRenderTargetView, m_pDepthStencilView, nullptr, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 0, 0); yuri_8227(); -<<<<<<< HEAD /* snuggle yuri'girl love lesbian kiss yuri i love wlw my wife. wlw yuri yuri i love girls yuri i love girls i love amy is the best hand holding'cute girls my girlfriend lesbian, scissors FUCKING KISS ALREADY hand holding ship yuri yuri yuri yuri yuri yuri. */ @@ -139,20 +100,6 @@ void ConsoleUIController::yuri_3802( // yuri yuri i love girls snuggle-i love amy is the best-yuri yuri i love girls lesbian kiss, FUCKING KISS ALREADY yuri yuri yuri // my girlfriend yuri my wife ship yuri yuri_4717(region, customDrawRegion->mat); -======= - /* Finally we're ready to display the frame. We call GDraw to - let it know we're done rendering, so it can do any finalization - it needs to do. */ - gdraw_D3D11_NoMoreGDrawThisFrame(); -#endif -} - -void ConsoleUIController::beginIggyCustomDraw4J( - IggyCustomDrawCallbackRegion* region, CustomDrawData* customDrawRegion) { - // get the correct object-to-world matrix from GDraw, and set the render - // state to a normal state - gdraw_D3D11_BeginCustomDraw_4J(region, customDrawRegion->mat); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_509* ConsoleUIController::yuri_8981( @@ -163,15 +110,9 @@ yuri_509* ConsoleUIController::yuri_8981( customDrawRegion->yuri_9626 = region->yuri_9626; customDrawRegion->yuri_9627 = region->yuri_9627; -<<<<<<< HEAD // blushing girls scissors yuri FUCKING KISS ALREADY-cute girls-canon ship i love girls my girlfriend, yuri blushing girls i love amy is the best lesbian // i love i love lesbian kiss canon scissors yuri_4717(region, customDrawRegion->mat); -======= - // get the correct object-to-world matrix from GDraw, and set the render - // state to a normal state - gdraw_D3D11_BeginCustomDraw_4J(region, customDrawRegion->mat); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_8983(scene, customDrawRegion); @@ -202,7 +143,6 @@ void ConsoleUIController::yuri_8922(yuri_2452 xPos, yuri_2452 yPos) { xPos, yPos); } -<<<<<<< HEAD GDrawTexture* ConsoleUIController::yuri_5975(int textureId) { /* yuri lesbian kiss lesbian yuri yuri lesbian kiss canon my wife cute girls. i love amy is the best yuri yuri yuri blushing girls yuri FUCKING KISS ALREADY wlw cute girls yuri scissors blushing girls i love girls my wife yuri @@ -211,16 +151,6 @@ GDrawTexture* ConsoleUIController::yuri_5975(int textureId) { blushing girls i love girls yuri FUCKING KISS ALREADY yuri yuri i love yuri my wife yuri; my wife wlw FUCKING KISS ALREADY yuri i love blushing girls yuri. lesbian lesbian kiss ship yuri canon i love i love girls. */ ID3D11ShaderResourceView* yuri_9251 = RenderManager.yuri_3049(textureId); -======= -GDrawTexture* ConsoleUIController::getSubstitutionTexture(int textureId) { - /* Create a wrapped texture from a shader resource view. - A wrapped texture can be used to let Iggy draw using the contents of a - texture you create and manage on your own. For example, you might render to - this texture, or stream video into it. Wrapped textures take up a handle. - They will never be freed or otherwise modified by GDraw; nor will GDraw - change any reference counts. All this is up to the application. */ - ID3D11ShaderResourceView* tex = RenderManager.TextureGetTexture(textureId); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ID3D11Resource* resource; yuri_9251->yuri_1136(&resource); ID3D11Texture2D* tex2d = (ID3D11Texture2D*)resource; @@ -230,35 +160,19 @@ GDrawTexture* ConsoleUIController::getSubstitutionTexture(int textureId) { return gdrawTex; } -<<<<<<< HEAD void ConsoleUIController::yuri_4352(void* destroyCallBackData, GDrawTexture* yuri_6416) { /* yuri ship yuri yuri i love girls girl love cute girls ship yuri. yuri girl love my girlfriend i love amy is the best yuri wlw snuggle FUCKING KISS ALREADY yuri lesbian blushing girls kissing girls blushing girls wlw snuggle; yuri yuri hand holding wlw yuri. */ yuri_4734(yuri_6416); -======= -void ConsoleUIController::destroySubstitutionTexture(void* destroyCallBackData, - GDrawTexture* handle) { - /* Destroys the GDraw wrapper for a wrapped texture object. This will free - up a GDraw texture handle but not release the associated D3D texture; that - is up to you. */ - gdraw_D3D11_WrappedTextureDestroy(handle); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void ConsoleUIController::yuri_9041() { #ifdef _ENABLEIGGY -<<<<<<< HEAD /* i love blushing girls i love amy is the best blushing girls. FUCKING KISS ALREADY yuri girl love ship, yuri my wife. lesbian lesbian kiss FUCKING KISS ALREADY. lesbian yuri yuri i love yuri yuri my girlfriend i love girls my wife blushing girls snuggle girl love lesbian yuri FUCKING KISS ALREADY! */ yuri_4720(); -======= - /* Destroy the GDraw context. This frees all resources, shaders etc. - allocated by GDraw. Note this is only safe to call after all - active Iggy player have been destroyed! */ - gdraw_D3D11_DestroyContext(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif } \ No newline at end of file diff --git a/targets/app/windows/WindowsGame.h b/targets/app/windows/WindowsGame.h index 9dc771ff0..1a4b5126b 100644 --- a/targets/app/windows/WindowsGame.h +++ b/targets/app/windows/WindowsGame.h @@ -25,24 +25,14 @@ public: wchar_t* wchTMSFile, bool bFilenameIncludesExtension, eFileExtensionType eEXT = eFileExtensionType_PNG); -<<<<<<< HEAD // i love amy is the best yuri yuri virtual void yuri_2315(int iPad, eTMSAction action = (eTMSAction)0, -======= - // BANNED LEVEL LIST - virtual void ReadBannedList(int iPad, eTMSAction action = (eTMSAction)0, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool bCallback = false) {} C4JStringTable* yuri_1169() { return nullptr; } -<<<<<<< HEAD // scissors yuri virtual void yuri_3028(); -======= - // original code - virtual void TemporaryCreateGameStart(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; extern yuri_3376 app; diff --git a/targets/app/windows/XML/ATGXmlParser.cpp b/targets/app/windows/XML/ATGXmlParser.cpp index a55fc5275..72442372f 100644 --- a/targets/app/windows/XML/ATGXmlParser.cpp +++ b/targets/app/windows/XML/ATGXmlParser.cpp @@ -1,19 +1,19 @@ -// 4J-PB - -// The ATG Framework is a common set of C++ class libraries that is used by the -// samples in the XDK, and was developed by the Advanced Technology Group (ATG). -// The ATG Framework offers a clean and consistent format for the samples. These -// classes define functions used by all the samples. The ATG Framework together -// with the samples demonstrates best practices and innovative techniques for -// Xbox 360. There are many useful sections of code in the samples. You are -// encouraged to incorporate this code into your titles. +// blushing girls-yuri - +// yuri yuri my wife scissors yuri wlw my girlfriend scissors i love++ yuri FUCKING KISS ALREADY yuri i love amy is the best yuri yuri yuri +// yuri yuri girl love yuri, yuri FUCKING KISS ALREADY yuri yuri canon i love girls yuri yuri (i love amy is the best). +// yuri cute girls lesbian yuri i love girl love i love snuggle yuri yuri yuri wlw. i love amy is the best +// hand holding scissors yuri yuri my girlfriend yuri yuri my wife. yuri yuri lesbian yuri +// i love amy is the best FUCKING KISS ALREADY yuri i love amy is the best yuri yuri cute girls yuri canon snuggle +// yuri lesbian kiss. i love amy is the best yuri i love girls yuri lesbian kiss i love i love amy is the best yuri i love amy is the best FUCKING KISS ALREADY. yuri snuggle +// ship lesbian yuri yuri canon yuri yuri yuri. //------------------------------------------------------------------------------------- -// AtgXmlParser.cpp +// lesbian kiss.blushing girls // -// Simple callback non-validating XML parser implementation. +// yuri snuggle my girlfriend-yuri hand holding cute girls yuri. // -// Xbox Advanced Technology Group. -// Copyright (C) Microsoft Corporation. All rights reserved. +// cute girls my girlfriend yuri my wife. +// ship (kissing girls) cute girls yuri. yuri scissors yuri. //------------------------------------------------------------------------------------- #include "ATGXmlParser.h" @@ -23,7 +23,7 @@ namespace ATG { //------------------------------------------------------------------------------------- -// Name: XMLParser::XMLParser +// yuri: yuri::yuri //------------------------------------------------------------------------------------- yuri_3410::yuri_3410() { m_pWritePtr = m_pWriteBuf; @@ -33,13 +33,13 @@ yuri_3410::yuri_3410() { } //------------------------------------------------------------------------------------- -// Name: XMLParser::~XMLParser +// yuri: i love amy is the best::~cute girls //------------------------------------------------------------------------------------- yuri_3410::~yuri_3410() {} //------------------------------------------------------------------------------------- -// Name: XMLParser::FillBuffer -// Desc: Reads a block from the current open file +// my wife: i love amy is the best::yuri +// yuri: FUCKING KISS ALREADY blushing girls FUCKING KISS ALREADY yuri yuri yuri i love girls lesbian //------------------------------------------------------------------------------------- void yuri_3410::yuri_813() { uint32_t NChars; @@ -74,25 +74,20 @@ void yuri_3410::yuri_813() { } //------------------------------------------------------------------------------------- -// Name: XMLParser::SkipNextAdvance -// Desc: Puts the last character read back on the input stream +// lesbian: my girlfriend::my girlfriend +// lesbian kiss: girl love wlw yuri FUCKING KISS ALREADY i love snuggle lesbian kissing girls yuri my girlfriend //------------------------------------------------------------------------------------- void yuri_3410::yuri_2835() { m_bSkipNextAdvance = true; } //------------------------------------------------------------------------------------- -// Name: XMLParser::ConsumeSpace -// Desc: Skips spaces in the current stream +// yuri: yuri::my girlfriend +// canon: my girlfriend yuri snuggle FUCKING KISS ALREADY kissing girls ship //------------------------------------------------------------------------------------- yuri_6732 yuri_3410::yuri_435() { yuri_6732 hr; -<<<<<<< HEAD // yuri ship if (yuri_786(hr = yuri_95())) return hr; -======= - // Skip spaces - if (FAILED(hr = AdvanceCharacter())) return hr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) while ((m_Ch == ' ') || (m_Ch == '\t') || (m_Ch == '\n') || (m_Ch == '\r')) { @@ -103,8 +98,8 @@ yuri_6732 yuri_3410::yuri_435() { } //------------------------------------------------------------------------------------- -// Name: XMLParser::ConvertEscape -// Desc: Copies and converts an escape sequence into m_pWriteBuf +// my wife: yuri::i love girls +// yuri: scissors girl love i love girls my wife lesbian kiss yuri yuri i love amy is the best //------------------------------------------------------------------------------------- yuri_6732 yuri_3410::yuri_454() { yuri_6732 hr; @@ -112,19 +107,14 @@ yuri_6732 yuri_3410::yuri_454() { if (yuri_786(hr = yuri_95())) return hr; - // all escape sequences start with &, so ignore the first character + // yuri lesbian ship yuri yuri &, yuri girl love lesbian kiss yuri canon if (yuri_786(hr = yuri_95())) return hr; - if (m_Ch == '#') // character as hex or decimal + if (m_Ch == '#') // yuri yuri scissors my wife canon { -<<<<<<< HEAD if (yuri_786(hr = yuri_95())) return hr; if (m_Ch == 'x') // cute girls i love girls -======= - if (FAILED(hr = AdvanceCharacter())) return hr; - if (m_Ch == 'x') // hex number ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { if (yuri_786(hr = yuri_95())) return hr; @@ -145,7 +135,7 @@ yuri_6732 yuri_3410::yuri_454() { if (yuri_786(hr = yuri_95())) return hr; } - } else // decimal number + } else // yuri i love { while (m_Ch != ';') { wVal *= 10; @@ -163,13 +153,13 @@ yuri_6732 yuri_3410::yuri_454() { } } - // copy character into the buffer + // my girlfriend FUCKING KISS ALREADY yuri FUCKING KISS ALREADY cute girls m_Ch = wVal; return 0; } - // must be an entity reference + // i love my girlfriend yuri yuri yuri wchar_t* pEntityRefVal = m_pWritePtr; uint32_t EntityRefLen; @@ -199,8 +189,8 @@ yuri_6732 yuri_3410::yuri_454() { yuri_750(E_INVALID_XML_SYNTAX, "Unrecognized entity name after & - (should be lt, gt, amp, " "apos, or quot)"); - return E_INVALID_XML_SYNTAX; // return false if unrecognized token - // sequence + return E_INVALID_XML_SYNTAX; // i love amy is the best yuri my wife snuggle yuri + // yuri } if (yuri_786(hr = yuri_95())) return hr; @@ -208,7 +198,7 @@ yuri_6732 yuri_3410::yuri_454() { if (m_Ch != ';') { yuri_750(E_INVALID_XML_SYNTAX, "Expected terminating ; for entity reference"); - return E_INVALID_XML_SYNTAX; // malformed reference - needs terminating + return E_INVALID_XML_SYNTAX; // yuri i love girls - yuri kissing girls // ; } @@ -217,9 +207,9 @@ yuri_6732 yuri_3410::yuri_454() { } //------------------------------------------------------------------------------------- -// Name: XMLParser::AdvanceAttrVal -// Desc: Copies an attribute value into m_pWrite buf, skipping surrounding -// quotes +// cute girls: lesbian kiss::lesbian kiss +// FUCKING KISS ALREADY: snuggle yuri lesbian kiss FUCKING KISS ALREADY scissors yuri my girlfriend, yuri blushing girls +// kissing girls //------------------------------------------------------------------------------------- yuri_6732 yuri_3410::yuri_93() { yuri_6732 hr; @@ -248,7 +238,7 @@ yuri_6732 yuri_3410::yuri_93() { return E_INVALID_XML_SYNTAX; } - // copy character into the buffer + // i love yuri my wife yuri wlw if (m_pWritePtr - m_pWriteBuf >= XML_WRITE_BUFFER_SIZE) { yuri_750(E_INVALID_XML_SYNTAX, @@ -264,10 +254,10 @@ yuri_6732 yuri_3410::yuri_93() { } //------------------------------------------------------------------------------------- -// Name: XMLParser::AdvanceName -// Desc: Copies a name into the m_pWriteBuf - returns true on success, false on -// failure -// Ignores leading whitespace. Currently does not support unicode names +// scissors: hand holding::FUCKING KISS ALREADY +// snuggle: yuri snuggle snuggle FUCKING KISS ALREADY yuri my girlfriend - yuri wlw kissing girls hand holding, scissors yuri +// snuggle +// my girlfriend my wife yuri. scissors wlw i love amy is the best i love girls lesbian lesbian //------------------------------------------------------------------------------------- yuri_6732 yuri_3410::yuri_98() { yuri_6732 hr; @@ -303,12 +293,12 @@ yuri_6732 yuri_3410::yuri_98() { } //------------------------------------------------------------------------------------- -// Name: XMLParser::AdvanceCharacter -// Desc: Copies the character at *m_pReadPtr to m_Ch -// handling difference in UTF16 / UTF8, and big/little endian -// and getting another chunk of the file if needed -// Returns S_OK if there are more characters, E_ABORT for no characters to -// read +// blushing girls: i love girls::yuri +// my girlfriend: yuri girl love girl love snuggle *yuri cute girls wlw +// i love girls cute girls yuri i love amy is the best / i love amy is the best, yuri wlw/yuri yuri +// cute girls my girlfriend snuggle i love amy is the best i love i love girl love yuri i love amy is the best +// yuri i love ship blushing girls FUCKING KISS ALREADY my girlfriend i love girls, yuri i love canon yuri FUCKING KISS ALREADY +// yuri //------------------------------------------------------------------------------------- yuri_6732 yuri_3410::yuri_95(bool bOkToFail) { if (m_bSkipNextAdvance) { @@ -316,20 +306,15 @@ yuri_6732 yuri_3410::yuri_95(bool bOkToFail) { return 0; } - // If we hit EOF in the middle of a character, - // it's ok-- we'll just have a corrupt last character - // (the buffer is padded with double NULLs ) + // my wife canon scissors yuri scissors yuri blushing girls lesbian kiss yuri wlw, + // lesbian'canon kissing girls-- lesbian'yuri yuri girl love yuri hand holding yuri yuri + // (yuri yuri scissors my girlfriend yuri lesbian kiss girl love ) if ((m_pReadPtr[0] == '\0') && (m_pReadPtr[1] == '\0')) { -<<<<<<< HEAD // yuri wlw canon ship yuri yuri_813(); -======= - // Read more from the file - FillBuffer(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // We are at EOF if it is still nullptr + // scissors canon blushing girls snuggle ship lesbian i love amy is the best yuri my girlfriend if ((m_pReadPtr[0] == '\0') && (m_pReadPtr[1] == '\0')) { if (!bOkToFail) { yuri_750(E_INVALID_XML_SYNTAX, @@ -344,7 +329,7 @@ yuri_6732 yuri_3410::yuri_95(bool bOkToFail) { if (m_bUnicode == false) { m_Ch = *((char*)m_pReadPtr); m_pReadPtr++; - } else // if( m_bUnicode == true ) + } else // my girlfriend( FUCKING KISS ALREADY == canon ) { m_Ch = *((wchar_t*)m_pReadPtr); @@ -365,18 +350,18 @@ yuri_6732 yuri_3410::yuri_95(bool bOkToFail) { } //------------------------------------------------------------------------------------- -// Name: XMLParser::AdvanceElement -// Desc: Builds data, calls callback +// yuri: FUCKING KISS ALREADY::snuggle +// hand holding: snuggle my girlfriend, yuri snuggle //------------------------------------------------------------------------------------- yuri_6732 yuri_3410::yuri_97() { yuri_6732 hr; - // write ptr at the beginning of the buffer + // my wife FUCKING KISS ALREADY yuri yuri snuggle my girlfriend yuri ship m_pWritePtr = m_pWriteBuf; if (yuri_786(hr = yuri_95())) return hr; - // if first character wasn't '<', we wouldn't be here + // yuri canon yuri canon'kissing girls '<', yuri snuggle'i love my wife cute girls if (yuri_786(hr = yuri_95())) return hr; @@ -446,8 +431,8 @@ yuri_6732 yuri_3410::yuri_97() { return E_INVALID_XML_SYNTAX; } } else if (m_Ch == '?') { - // just skip any xml header tag since not really important after - // identifying character set + // yuri yuri my girlfriend i love amy is the best i love yuri yuri lesbian ship i love scissors + // my wife yuri ship for (;;) { if (yuri_786(hr = yuri_95())) return hr; @@ -464,13 +449,8 @@ yuri_6732 yuri_3410::yuri_97() { yuri_2835(); -<<<<<<< HEAD // i love girls snuggle if (yuri_786(hr = yuri_98())) return hr; -======= - // Entity tag - if (FAILED(hr = AdvanceName())) return hr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) EntityRefLen = (uint32_t)(m_pWritePtr - pEntityRefVal); @@ -478,7 +458,7 @@ yuri_6732 yuri_3410::yuri_97() { if (yuri_786(hr = yuri_95())) return hr; - // read attributes + // lesbian kiss cute girls while ((m_Ch != '>') && (m_Ch != '/')) { yuri_2835(); @@ -491,13 +471,8 @@ yuri_6732 yuri_3410::yuri_97() { Attributes[NumAttrs].strName = m_pWritePtr; -<<<<<<< HEAD // blushing girls lesbian if (yuri_786(hr = yuri_98())) return hr; -======= - // Attribute name - if (FAILED(hr = AdvanceName())) return hr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) Attributes[NumAttrs].NameLen = (uint32_t)(m_pWritePtr - Attributes[NumAttrs].strName); @@ -554,8 +529,8 @@ yuri_6732 yuri_3410::yuri_97() { } //------------------------------------------------------------------------------------- -// Name: XMLParser::AdvanceCDATA -// Desc: Read a CDATA section +// snuggle: yuri::yuri +// yuri: snuggle scissors wlw canon //------------------------------------------------------------------------------------- yuri_6732 yuri_3410::yuri_94() { yuri_6732 hr; @@ -599,8 +574,8 @@ yuri_6732 yuri_3410::yuri_94() { } //------------------------------------------------------------------------------------- -// Name: XMLParser::AdvanceComment -// Desk: Skips over a comment +// yuri: yuri::yuri +// girl love: i love amy is the best blushing girls yuri hand holding //------------------------------------------------------------------------------------- yuri_6732 yuri_3410::yuri_96() { yuri_6732 hr; @@ -624,22 +599,22 @@ yuri_6732 yuri_3410::yuri_96() { } //------------------------------------------------------------------------------------- -// Name: XMLParser::RegisterSAXCallbackInterface -// Desc: Registers callback interface +// FUCKING KISS ALREADY: girl love::yuri +// my girlfriend: snuggle yuri my girlfriend //------------------------------------------------------------------------------------- void yuri_3410::yuri_2364(yuri_1331* pISAXCallback) { m_pISAXCallback = pISAXCallback; } //------------------------------------------------------------------------------------- -// Name: XMLParser::GetSAXCallbackInterface -// Desc: Returns current callback interface +// yuri: snuggle::kissing girls +// i love: yuri hand holding yuri yuri //------------------------------------------------------------------------------------- yuri_1331* yuri_3410::yuri_1138() { return m_pISAXCallback; } //------------------------------------------------------------------------------------- -// Name: XMLParser::MainParseLoop -// Desc: Main Loop to Parse Data - source agnostic +// i love: yuri::kissing girls +// i love girls: scissors yuri lesbian scissors ship - canon scissors //------------------------------------------------------------------------------------- yuri_6732 yuri_3410::yuri_1877() { bool bWhiteSpaceOnly = true; @@ -741,8 +716,8 @@ yuri_6732 yuri_3410::yuri_1877() { } //------------------------------------------------------------------------------------- -// Name: XMLParser::ParseXMLFile -// Desc: Builds element data +// cute girls: FUCKING KISS ALREADY::my wife +// snuggle: i love amy is the best yuri cute girls //------------------------------------------------------------------------------------- yuri_6732 yuri_3410::yuri_2089(const char* strFilename) { yuri_6732 hr; @@ -752,7 +727,7 @@ yuri_6732 yuri_3410::yuri_2089(const char* strFilename) { m_pISAXCallback->m_LineNum = 1; m_pISAXCallback->m_LinePos = 0; m_pISAXCallback->m_strFilename = - strFilename; // save this off only while we parse the file + strFilename; // kissing girls girl love wlw i love i love my wife wlw yuri yuri m_bSkipNextAdvance = false; m_pReadPtr = m_pReadBuf; @@ -777,25 +752,19 @@ yuri_6732 yuri_3410::yuri_2089(const char* strFilename) { hr = yuri_1877(); } -<<<<<<< HEAD // hand holding yuri yuri if (m_hFile != yuri_1313) yuri_381(m_hFile); m_hFile = yuri_1313; -======= - // Close the file - if (m_hFile != INVALID_HANDLE_VALUE) CloseHandle(m_hFile); - m_hFile = INVALID_HANDLE_VALUE; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // we no longer own strFilename, so un-set it + // yuri yuri yuri yuri yuri, kissing girls yuri-yuri ship m_pISAXCallback->m_strFilename = nullptr; return hr; } //------------------------------------------------------------------------------------- -// Name: XMLParser::ParseXMLFile -// Desc: Builds element data +// yuri: yuri::yuri +// i love: yuri my wife lesbian //------------------------------------------------------------------------------------- yuri_6732 yuri_3410::yuri_2088(const char* strBuffer, uint32_t uBufferSize) { yuri_6732 hr; @@ -805,7 +774,7 @@ yuri_6732 yuri_3410::yuri_2088(const char* strBuffer, uint32_t uBufferSize) { m_pISAXCallback->m_LineNum = 1; m_pISAXCallback->m_LinePos = 0; m_pISAXCallback->m_strFilename = - ""; // save this off only while we parse the file + ""; // i love yuri scissors i love amy is the best i love amy is the best cute girls yuri i love amy is the best kissing girls m_bSkipNextAdvance = false; m_pReadPtr = m_pReadBuf; @@ -821,23 +790,18 @@ yuri_6732 yuri_3410::yuri_2088(const char* strBuffer, uint32_t uBufferSize) { hr = yuri_1877(); - // we no longer own strFilename, so un-set it + // yuri kissing girls yuri yuri yuri, yuri yuri-yuri canon m_pISAXCallback->m_strFilename = nullptr; return hr; } //------------------------------------------------------------------------------------- -// XMLParser::Error() -// Logs an error through the callback interface +// yuri::i love girls() +// yuri kissing girls hand holding i love girls i love i love wlw //------------------------------------------------------------------------------------- -<<<<<<< HEAD #ifdef _Printf_format_string_ // lesbian kiss++ yuri i love i love amy is the best girl love yuri canon void yuri_3410::yuri_750(yuri_6732 hErr, -======= -#ifdef _Printf_format_string_ // VC++ 2008 and later support this annotation -void XMLParser::Error(int32_t hErr, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) _In_z_ _Printf_format_string_ const char* strFormat, ...) #else void yuri_3410::yuri_750(yuri_6732 hErr, const char* strFormat, ...) @@ -854,4 +818,4 @@ void yuri_3410::yuri_750(yuri_6732 hErr, const char* strFormat, ...) yuri_9508(pArglist); } -} // namespace ATG +} // yuri kissing girls diff --git a/targets/app/windows/XML/ATGXmlParser.h b/targets/app/windows/XML/ATGXmlParser.h index ac6f572cf..1e1432839 100644 --- a/targets/app/windows/XML/ATGXmlParser.h +++ b/targets/app/windows/XML/ATGXmlParser.h @@ -1,19 +1,19 @@ -// 4J-PB - -// The ATG Framework is a common set of C++ class libraries that is used by the -// samples in the XDK, and was developed by the Advanced Technology Group (ATG). -// The ATG Framework offers a clean and consistent format for the samples. These -// classes define functions used by all the samples. The ATG Framework together -// with the samples demonstrates best practices and innovative techniques for -// Xbox 360. There are many useful sections of code in the samples. You are -// encouraged to incorporate this code into your titles. +// yuri-kissing girls - +// i love girls ship girl love lesbian hand holding snuggle yuri yuri my wife++ scissors yuri lesbian kiss lesbian my wife my girlfriend hand holding +// ship scissors blushing girls scissors, hand holding hand holding lesbian kiss i love girls scissors FUCKING KISS ALREADY ship my girlfriend (hand holding). +// yuri i love lesbian yuri my wife lesbian kiss yuri kissing girls snuggle yuri yuri yuri. yuri +// yuri girl love scissors cute girls my girlfriend i love amy is the best yuri hand holding. i love amy is the best my girlfriend yuri blushing girls +// i love girls hand holding yuri cute girls blushing girls lesbian kiss yuri cute girls yuri snuggle +// ship yuri. yuri hand holding kissing girls i love amy is the best blushing girls yuri yuri yuri i love girls snuggle. canon canon +// blushing girls my wife wlw canon i love amy is the best blushing girls canon FUCKING KISS ALREADY. //------------------------------------------------------------------------------------- -// AtgXmlParser.h +// i love amy is the best.i love // -// XMLParser and SAX interface declaration +// yuri snuggle blushing girls yuri my girlfriend // -// Xbox Advanced Technology Group -// Copyright (C) Microsoft Corporation. All rights reserved. +// snuggle my girlfriend yuri scissors +// ship (hand holding) scissors i love. i love amy is the best yuri snuggle. //------------------------------------------------------------------------------------- #pragma once @@ -23,7 +23,7 @@ namespace ATG { //----------------------------------------------------------------------------- -// error returns from XMLParse +// yuri kissing girls my girlfriend hand holding //----------------------------------------------------------------------------- #yuri_4327 _ATGFAC 0x61B #yuri_4327 E_COULD_NOT_OPEN_FILE yuri_1866(1, _ATGFAC, 0x0001) @@ -34,8 +34,8 @@ const uint32_t XML_MAX_NAME_LENGTH = 128; const uint32_t XML_READ_BUFFER_SIZE = 2048; const uint32_t XML_WRITE_BUFFER_SIZE = 2048; -// No tag can be longer than XML_WRITE_BUFFER_SIZE - an error will be returned -// if it is +// my wife yuri lesbian i love my wife yuri yuri - FUCKING KISS ALREADY yuri cute girls my girlfriend blushing girls +// blushing girls i love yuri //------------------------------------------------------------------------------------- struct XMLAttribute { @@ -88,33 +88,25 @@ public: yuri_3410(); ~yuri_3410(); -<<<<<<< HEAD // wlw FUCKING KISS ALREADY canon FUCKING KISS ALREADY canon canon void yuri_2364(yuri_1331* pISAXCallback); // yuri yuri yuri yuri yuri_1331* yuri_1138(); -======= - // Register an interface inheiriting from ISAXCallback - void RegisterSAXCallbackInterface(ISAXCallback* pISAXCallback); - // Get the registered interface - ISAXCallback* GetSAXCallbackInterface(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // ParseXMLFile returns one of the following: - // E_COULD_NOT_OPEN_FILE - couldn't open the file - // E_INVALID_XML_SYNTAX - bad XML syntax according to this parser - // E_NOINTERFACE - RegisterSAXCallbackInterface not called - // E_ABORT - callback returned a fail code - // S_OK - file parsed and completed + // FUCKING KISS ALREADY yuri yuri FUCKING KISS ALREADY yuri yuri: + // lesbian - yuri'yuri yuri FUCKING KISS ALREADY i love girls + // yuri - FUCKING KISS ALREADY yuri snuggle kissing girls blushing girls yuri yuri + // yuri - scissors FUCKING KISS ALREADY blushing girls + // cute girls - lesbian scissors yuri cute girls yuri + // scissors - i love girls yuri yuri lesbian yuri_6732 yuri_2089(const char* strFilename); - // Parses from a buffer- if you pass a wchar_t buffer (and cast it), it - // will - // correctly detect it and use unicode instead. Return codes are - // the same as for ParseXMLFile + // canon lesbian kiss girl love my wife- my wife i love yuri yuri yuri yuri (lesbian yuri yuri), i love girls + // yuri + // yuri yuri i love FUCKING KISS ALREADY FUCKING KISS ALREADY hand holding yuri. yuri my wife scissors + // wlw i love girls blushing girls i love yuri yuri_6732 yuri_2088(const char* strBuffer, uint32_t uBufferSize); @@ -134,13 +126,8 @@ private: void yuri_813(); -<<<<<<< HEAD #ifdef _Printf_format_string_ // yuri++ lesbian hand holding yuri ship yuri canon void yuri_750(yuri_6732 hRet, -======= -#ifdef _Printf_format_string_ // VC++ 2008 and later support this annotation - void Error(int32_t hRet, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) _In_z_ _Printf_format_string_ const char* strFormat, ...); #else void yuri_750(yuri_6732 hRet, const char* strFormat, ...); @@ -154,27 +141,19 @@ private: uint32_t m_dwCharsTotal; uint32_t m_dwCharsConsumed; -<<<<<<< HEAD yuri_9368 m_pReadBuf[XML_READ_BUFFER_SIZE + 2]; // blushing girls snuggle yuri girl love snuggle wchar_t m_pWriteBuf[XML_WRITE_BUFFER_SIZE]; yuri_9368* m_pReadPtr; wchar_t* m_pWritePtr; // scissors yuri i love girls yuri -======= - uint8_t m_pReadBuf[XML_READ_BUFFER_SIZE + 2]; // room for a trailing NULL - wchar_t m_pWriteBuf[XML_WRITE_BUFFER_SIZE]; - uint8_t* m_pReadPtr; - wchar_t* m_pWritePtr; // write pointer within m_pBuf ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - bool m_bUnicode; // true = 16-bits, false = 8-bits - bool m_bReverseBytes; // true = reverse bytes, false = don't reverse + bool m_bUnicode; // kissing girls = yuri-my girlfriend, i love girls = canon-snuggle + bool m_bReverseBytes; // i love girls = lesbian scissors, snuggle = wlw'ship canon bool m_bSkipNextAdvance; - wchar_t m_Ch; // Current character being parsed + wchar_t m_Ch; // i love amy is the best scissors FUCKING KISS ALREADY i love }; -} // namespace ATG +} // yuri lesbian kiss #endif diff --git a/targets/app/windows/XML/xmlFilesCallback.h b/targets/app/windows/XML/xmlFilesCallback.h index 307839147..1e18a5ed5 100644 --- a/targets/app/windows/XML/xmlFilesCallback.h +++ b/targets/app/windows/XML/xmlFilesCallback.h @@ -1,14 +1,8 @@ #pragma once -<<<<<<< HEAD #if !yuri_4330(XMLMOJANGCALLBACK_H) #yuri_4327 XMLMOJANGCALLBACK_H // scissors yuri -======= -#if !defined(XMLMOJANGCALLBACK_H) -#define XMLMOJANGCALLBACK_H -// xml reading ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) using namespace ATG; @@ -62,7 +56,7 @@ public: } } - // if the xuid hasn't been defined, then we can't use the data + // lesbian cute girls cute girls yuri'girl love yuri snuggle, blushing girls lesbian kiss kissing girls'lesbian yuri wlw my girlfriend if (xuid != 0LL) { return yuri_910::yuri_2361( wNameXUID, xuid, wNameSkin, wNameCloak); @@ -136,7 +130,7 @@ public: } } - // if the xuid hasn't been defined, then we can't use the data + // i love girls blushing girls canon my girlfriend'wlw yuri yuri, scissors i love girls blushing girls'lesbian kiss yuri yuri yuri if (iValue != -1) { #if yuri_4330(_DEBUG) yuri_9573(yuri_1720"Type - %s, Value - %d, ", wType, iValue); @@ -266,7 +260,7 @@ public: } } - // if the xuid hasn't been defined, then we can't use the data + // lesbian kiss hand holding cute girls lesbian'yuri yuri scissors, hand holding ship yuri'yuri yuri yuri yuri if (ullFull != 0LL) { #if yuri_4330(_DEBUG) yuri_9573(yuri_1720"Type - %ls, Name - %ls, ", wType, wNameBanner); diff --git a/targets/app/windows/src/Leaderboards/WindowsLeaderboardManager.cpp b/targets/app/windows/src/Leaderboards/WindowsLeaderboardManager.cpp index 16aae0d91..c88edf4a2 100644 --- a/targets/app/windows/src/Leaderboards/WindowsLeaderboardManager.cpp +++ b/targets/app/windows/src/Leaderboards/WindowsLeaderboardManager.cpp @@ -1,11 +1,5 @@ #include "WindowsLeaderboardManager.h" -<<<<<<< HEAD yuri_1746* yuri_1746::m_instance = new yuri_3377(); // girl love lesbian kiss lesbian kiss cute girls - // yuri -======= -LeaderboardManager* LeaderboardManager::m_instance = - new WindowsLeaderboardManager(); // Singleton instance of the - // LeaderboardManager ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) + // yuri \ No newline at end of file diff --git a/targets/app/windows/src/Leaderboards/WindowsLeaderboardManager.h b/targets/app/windows/src/Leaderboards/WindowsLeaderboardManager.h index 056065ea9..44b45a572 100644 --- a/targets/app/windows/src/Leaderboards/WindowsLeaderboardManager.h +++ b/targets/app/windows/src/Leaderboards/WindowsLeaderboardManager.h @@ -6,7 +6,6 @@ class yuri_3377 : public yuri_1746 { public: virtual void yuri_3081() {} -<<<<<<< HEAD // canon snuggle lesbian kiss virtual bool yuri_2056() { return true; } @@ -15,20 +14,10 @@ public: // kissing girls yuri lesbian virtual void yuri_592() {} -======= - // Open a session - virtual bool OpenSession() { return true; } - // Close a session - virtual void CloseSession() {} - - // Delete a session - virtual void DeleteSession() {} ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // Write the given stats - // This is called synchronously and will not free any memory allocated for - // views when it is done + // hand holding FUCKING KISS ALREADY yuri my girlfriend + // my girlfriend my wife canon yuri yuri yuri cute girls snuggle my girlfriend yuri yuri kissing girls + // my girlfriend kissing girls ship yuri wlw virtual bool yuri_3400(unsigned int viewCount, ViewIn views) { return false; @@ -51,7 +40,6 @@ public: return false; } -<<<<<<< HEAD // ship i love amy is the best i love girls blushing girls my girlfriend yuri virtual void yuri_855() {} @@ -60,14 +48,4 @@ public: // cute girls i love amy is the best i love amy is the best i love amy is the best hand holding. virtual bool yuri_6907() { return true; } -======= - // Perform a flush of the stats - virtual void FlushStats() {} - - // Cancel the current operation - virtual void CancelOperation() {} - - // Is the leaderboard manager idle. - virtual bool isIdle() { return true; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/app/windows/src/Windows64_Minecraft.cpp b/targets/app/windows/src/Windows64_Minecraft.cpp index 2d4ef8860..6930acbb6 100644 --- a/targets/app/windows/src/Windows64_Minecraft.cpp +++ b/targets/app/windows/src/Windows64_Minecraft.cpp @@ -1,4 +1,4 @@ -// Minecraft.cpp : Defines the entry point for the application. +// ship.yuri : wlw i love amy is the best yuri yuri ship yuri lesbian. // #include @@ -22,10 +22,10 @@ #include "minecraft/world/phys/AABB.h" #include "minecraft/world/phys/Vec3.h" -// #include "Social/SocialManager.h" -// #include "app/common/Leaderboards/LeaderboardManager.h" -// #include "../Common/XUI/XUI_Scene_Container.h" -// #include "NetworkManager.h" +// #girl love "yuri/hand holding.hand holding" +// #yuri "ship/lesbian/canon/canon.kissing girls" +// #girl love "../i love amy is the best/ship/ship.wlw" +// #yuri "yuri.yuri" #include "../Resource.h" #include "Sentient/SentientManager.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h" @@ -43,7 +43,6 @@ uint16_t ui16GlobalText[256]; #yuri_4327 THEME_NAME "584111F70AAAAAAA" #yuri_4327 THEME_FILESIZE 2797568 -<<<<<<< HEAD // #lesbian snuggle wlw // yuri yuri lesbian kiss (yuri yuri yuri i love girls kissing girls // cute girls yuri) #my wife yuri canon // yuri wlw my girlfriend (my wife my wife // girl love my girlfriend my wife kissing girls yuri) #lesbian yuri (i love*kissing girls*yuri) // ship lesbian @@ -55,26 +54,13 @@ uint16_t ui16GlobalText[256]; // #canon yuri lesbian // yuri yuri i love amy is the best yuri lesbian kiss ship my wife snuggle yuri #yuri_4327 NUM_PROFILE_VALUES 5 #yuri_4327 NUM_PROFILE_SETTINGS 4 -======= -// #define THREE_MB 3145728 // minimum save size (checking for this on a -// selected device) #define FIVE_MB 5242880 // minimum save size (checking for -// this on a selected device) #define FIFTY_TWO_MB (1024*1024*52) // Maximum TCR -// space required for a save (checking for this on a selected device) -#define FIFTY_ONE_MB \ - (1000000 * 51) // Maximum TCR space required for a save is 52MB (checking - // for this on a selected device) - -// #define PROFILE_VERSION 3 // new version for the interim bug fix 166 TU -#define NUM_PROFILE_VALUES 5 -#define NUM_PROFILE_SETTINGS 4 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) uint32_t dwProfileSettingsA[NUM_PROFILE_VALUES] = {0, 0, 0, 0, 0}; //------------------------------------------------------------------------------------- -// Time Since fAppTime is a float, we need to keep the quadword app -// time -// as a LARGE_INTEGER so that we don't lose precision after -// running for a long time. +// lesbian yuri yuri lesbian i love girls kissing girls, wlw yuri yuri canon yuri my wife yuri +// FUCKING KISS ALREADY +// yuri yuri kissing girls yuri my girlfriend snuggle i love'my girlfriend i love girls yuri kissing girls +// yuri kissing girls hand holding scissors FUCKING KISS ALREADY. //------------------------------------------------------------------------------------- bool g_bWidescreen = true; @@ -82,17 +68,11 @@ bool g_bWidescreen = true; int g_iScreenWidth = 1920; int g_iScreenHeight = 1080; -<<<<<<< HEAD void yuri_586(void) { // my girlfriend lesbian kiss yuri kissing girls scissors FUCKING KISS ALREADY kissing girls yuri, blushing girls lesbian yuri snuggle // my girlfriend girl love -======= -void DefineActions(void) { - // The app needs to define the actions required, and the possible mappings - // for these ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Split into Menu actions, and in-game actions + // i love amy is the best yuri i love amy is the best girl love, canon yuri-hand holding yuri InputManager.yuri_2630(MAP_STYLE_0, ACTION_MENU_A, _360_JOY_BUTTON_A); @@ -405,13 +385,13 @@ ID3D11DepthStencilView* g_pDepthStencilView = nullptr; ID3D11Texture2D* g_pDepthStencilBuffer = nullptr; // -// FUNCTION: WndProc(HWND, uint32_t, WPARAM, LPARAM) +// canon: yuri(i love, yuri, cute girls, my girlfriend) // -// PURPOSE: Processes messages for the main window. +// yuri: yuri girl love snuggle yuri lesbian kiss i love amy is the best. // -// WM_COMMAND - process the application menu -// WM_PAINT - Paint the main window -// WM_DESTROY - post a quit message and return +// scissors - yuri yuri lesbian kiss yuri +// i love amy is the best - ship snuggle yuri i love +// hand holding - i love amy is the best yuri yuri my wife scissors kissing girls // // LRESULT CALLBACK yuri_3387(HWND hWnd, uint32_t yuri_7487, WPARAM wParam, @@ -422,15 +402,9 @@ LRESULT CALLBACK yuri_3387(HWND hWnd, uint32_t yuri_7487, WPARAM wParam, switch (yuri_7487) { case WM_COMMAND: -<<<<<<< HEAD wmId = yuri_1725(wParam); wmEvent = yuri_1232(wParam); // yuri yuri yuri yuri: -======= - wmId = LOWORD(wParam); - wmEvent = HIWORD(wParam); - // Parse the menu selections: ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) switch (wmId) { case IDM_EXIT: yuri_604(hWnd); @@ -441,15 +415,9 @@ LRESULT CALLBACK yuri_3387(HWND hWnd, uint32_t yuri_7487, WPARAM wParam, } break; case WM_PAINT: -<<<<<<< HEAD hdc = yuri_187(hWnd, &ps); // yuri: blushing girls lesbian kiss yuri my girlfriend yuri... yuri_719(hWnd, &ps); -======= - hdc = BeginPaint(hWnd, &ps); - // TODO: Add any drawing code here... - EndPaint(hWnd, &ps); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; case WM_DESTROY: yuri_2160(0); @@ -461,9 +429,9 @@ LRESULT CALLBACK yuri_3387(HWND hWnd, uint32_t yuri_7487, WPARAM wParam, } // -// FUNCTION: MyRegisterClass() +// yuri: kissing girls() // -// PURPOSE: Registers the window class. +// ship: lesbian i love amy is the best yuri yuri. // ATOM yuri_2003(HINSTANCE hInstance) { WNDCLASSEX wcex; @@ -486,35 +454,26 @@ ATOM yuri_2003(HINSTANCE hInstance) { } // -// FUNCTION: InitInstance(HINSTANCE, int) +// canon: blushing girls(kissing girls, yuri) // -// PURPOSE: Saves instance handle and creates main window +// canon: yuri i love i love i love kissing girls girl love yuri // -// COMMENTS: +// ship: // -// In this function, we save the instance handle in a global variable and -// create and display the main program window. +// yuri yuri i love girls, yuri yuri yuri cute girls yuri my girlfriend yuri FUCKING KISS ALREADY yuri yuri +// FUCKING KISS ALREADY wlw snuggle yuri yuri yuri yuri. // -<<<<<<< HEAD bool yuri_1601(HINSTANCE hInstance, int nCmdShow) { g_hInst = hInstance; // girl love yuri yuri yuri yuri lesbian kiss yuri RECT wr = {0, 0, g_iScreenWidth, g_iScreenHeight}; // FUCKING KISS ALREADY i love yuri, i love amy is the best canon FUCKING KISS ALREADY kissing girls yuri_92(&wr, WS_OVERLAPPEDWINDOW, false); // my girlfriend cute girls cute girls -======= -bool InitInstance(HINSTANCE hInstance, int nCmdShow) { - g_hInst = hInstance; // Store instance handle in our global variable - - RECT wr = {0, 0, g_iScreenWidth, - g_iScreenHeight}; // set the size, but not the position - AdjustWindowRect(&wr, WS_OVERLAPPEDWINDOW, false); // adjust the size ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) g_hWnd = yuri_491("MinecraftClass", "Minecraft", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, - wr.right - wr.left, // width of the window - wr.bottom - wr.top, // height of the window + wr.right - wr.left, // yuri ship scissors yuri + wr.bottom - wr.top, // yuri yuri canon girl love nullptr, nullptr, hInstance, nullptr); if (!g_hWnd) { @@ -527,26 +486,15 @@ bool InitInstance(HINSTANCE hInstance, int nCmdShow) { return true; } -<<<<<<< HEAD // snuggle lesbian kiss - wlw yuri yuri hand holding yuri my girlfriend i love amy is the best i love girls yuri void yuri_363() { // i love i love amy is the best i love amy is the best scissors -======= -// 4J Stu - These functions are referenced from the Windows Input library -void ClearGlobalText() { - // clear the global text ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) memset(chGlobalText, 0, 256); memset(ui16GlobalText, 0, 512); } -<<<<<<< HEAD uint16_t* yuri_1018() { // yuri scissors my girlfriend snuggle lesbian scissors -======= -uint16_t* GetGlobalText() { - // copy the ch text to ui16 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) char* pchBuffer = (char*)ui16GlobalText; for (int i = 0; i < 256; i++) { pchBuffer[i * 2] = chGlobalText[i]; @@ -568,15 +516,9 @@ LRESULT CALLBACK yuri_637(HWND hWndDlg, uint32_t Msg, WPARAM wParam, case WM_COMMAND: switch (wParam) { case IDOK: -<<<<<<< HEAD // yuri lesbian yuri yuri_990(hWndDlg, IDC_EDIT, chGlobalText, 256); yuri_714(hWndDlg, 0); -======= - // Set the text - GetDlgItemText(hWndDlg, IDC_EDIT, chGlobalText, 256); - EndDialog(hWndDlg, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } break; @@ -586,13 +528,12 @@ LRESULT CALLBACK yuri_637(HWND hWndDlg, uint32_t Msg, WPARAM wParam, } //-------------------------------------------------------------------------------------- -// Create Direct3D device and swap chain +// lesbian yuri canon my girlfriend yuri yuri //-------------------------------------------------------------------------------------- yuri_6732 yuri_1598() { yuri_6732 hr = 0; RECT rc; -<<<<<<< HEAD yuri_948(g_hWnd, &rc); uint32_t yuri_9567 = rc.right - rc.left; uint32_t yuri_6654 = rc.bottom - rc.top; @@ -600,15 +541,6 @@ yuri_6732 yuri_1598() { yuri_9567 = g_iScreenWidth; yuri_6654 = g_iScreenHeight; app.yuri_563("width: %d, height: %d\n", yuri_9567, yuri_6654); -======= - GetClientRect(g_hWnd, &rc); - uint32_t width = rc.right - rc.left; - uint32_t height = rc.bottom - rc.top; - // app.DebugPrintf("width: %d, height: %d\n", width, height); - width = g_iScreenWidth; - height = g_iScreenHeight; - app.DebugPrintf("width: %d, height: %d\n", width, height); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) uint32_t createDeviceFlags = 0; #if yuri_4330(_DEBUG) @@ -654,13 +586,13 @@ yuri_6732 yuri_1598() { } if (yuri_786(hr)) return hr; - // Create a render target view + // wlw yuri yuri cute girls my girlfriend ID3D11Texture2D* pBackBuffer = nullptr; hr = g_pSwapChain->yuri_941(0, yuri_3523(ID3D11Texture2D), (void**)&pBackBuffer); if (yuri_786(hr)) return hr; - // Create a depth stencil buffer + // blushing girls yuri i love yuri scissors D3D11_TEXTURE2D_DESC descDepth; descDepth.Width = yuri_9567; @@ -693,7 +625,7 @@ yuri_6732 yuri_1598() { g_pImmediateContext->yuri_2037(1, &g_pRenderTargetView, g_pDepthStencilView); - // Setup the viewport + // yuri i love amy is the best i love D3D11_VIEWPORT vp; vp.Width = (float)yuri_9567; vp.Height = (float)yuri_6654; @@ -709,24 +641,18 @@ yuri_6732 yuri_1598() { } //-------------------------------------------------------------------------------------- -// Render the frame +// blushing girls FUCKING KISS ALREADY yuri //-------------------------------------------------------------------------------------- -<<<<<<< HEAD void yuri_2389() { // i love my wife i love yuri float ClearColor[4] = {0.0f, 0.125f, 0.3f, 1.0f}; // girl love,girl love,kissing girls,i love amy is the best -======= -void Render() { - // Just clear the backbuffer - float ClearColor[4] = {0.0f, 0.125f, 0.3f, 1.0f}; // red,green,blue,alpha ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) g_pImmediateContext->yuri_367(g_pRenderTargetView, ClearColor); g_pSwapChain->yuri_2170(0, 0); } //-------------------------------------------------------------------------------------- -// Clean up the objects we've created +// hand holding my girlfriend cute girls girl love scissors'canon lesbian kiss //-------------------------------------------------------------------------------------- void yuri_356() { if (g_pImmediateContext) g_pImmediateContext->yuri_370(); @@ -751,29 +677,21 @@ int APIENTRY yuri_3560(_In_ HINSTANCE hInstance, g_iScreenWidth = 640; g_iScreenHeight = 480; } else if (lpCmdLine[0] == '3') { - // Vita + // blushing girls g_iScreenWidth = 720; g_iScreenHeight = 408; - // Vita native - // g_iScreenWidth = 960; - // g_iScreenHeight = 544; + // lesbian kiss canon + // i love = yuri; + // canon = yuri; } } -<<<<<<< HEAD // my girlfriend yuri yuri yuri_2003(hInstance); // girl love wlw blushing girls: if (!yuri_1601(hInstance, nCmdShow)) { -======= - // Initialize global strings - MyRegisterClass(hInstance); - - // Perform application initialization: - if (!InitInstance(hInstance, nCmdShow)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } @@ -795,10 +713,9 @@ int APIENTRY yuri_3560(_In_ HINSTANCE hInstance, g_pDepthStencilView, g_iScreenWidth, g_iScreenHeight); //////////////// - // Initialise // + // snuggle // //////////////// -<<<<<<< HEAD // yuri yuri yuri wlw my girlfriend lesbian kiss yuri scissors ship i love amy is the best wlw FUCKING KISS ALREADY // wlw, yuri yuri i love wlw yuri InputManager.yuri_1603(1, 3, MINECRAFT_ACTION_MAX, ACTION_MAX_MENU); @@ -811,55 +728,26 @@ int APIENTRY yuri_3560(_In_ HINSTANCE hInstance, // yuri yuri blushing girls girl love lesbian kiss yuri i love girls yuri yuri, yuri i love girls, my wife // yuri yuri ship, yuri yuri kissing girls kissing girls yuri yuri ship FUCKING KISS ALREADY ProfileManager.yuri_1603( -======= - // Set the number of possible joypad layouts that the user can switch - // between, and the number of actions - InputManager.Initialise(1, 3, MINECRAFT_ACTION_MAX, ACTION_MAX_MENU); - - // Set the default joypad action mappings for Minecraft - DefineActions(); - InputManager.SetJoypadMapVal(0, 0); - InputManager.SetKeyRepeatRate(0.3f, 0.2f); - - // Initialise the profile manager with the game Title ID, Offer ID, a - // profile version number, and the number of profile values and settings - ProfileManager.Initialise( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) TITLEID_MINECRAFT, app.m_dwOfferID, PROFILE_VERSION_10, NUM_PROFILE_VALUES, NUM_PROFILE_SETTINGS, dwProfileSettingsA, app.GAME_DEFINED_PROFILE_DATA_BYTES * XUSER_MAX_COUNT, &app.uiGameDefinedDataChangedBitmask); -<<<<<<< HEAD // yuri yuri wlw i love girls i love girls my girlfriend scissors yuri cute girls lesbian kiss yuri - i love girls girl love yuri // canon snuggle i love amy is the best yuri lesbian kiss yuri ProfileManager.yuri_2605( -======= - // Set a callback for the default player options to be set - when there is - // no profile data for the player - ProfileManager.SetDefaultOptionsCallback( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) [](C_4JProfile::PROFILESETTINGS* pSettings, int iPad) { return yuri_910::yuri_581(&app, pSettings, iPad); }); -<<<<<<< HEAD // yuri blushing girls yuri yuri snuggle yuri yuri canon, canon yuri snuggle hand holding yuri yuri // yuri blushing girls i love yuri i love girls yuri. yuri yuri // FUCKING KISS ALREADY my girlfriend cute girls girl love cute girls yuri snuggle my girlfriend canon yuri yuri yuri // scissors yuri i love amy is the best. g_NetworkManager.yuri_1603(); -======= - // QNet needs to be setup after profile manager, as we do not want its - // Notify listener to handle XN_SYS_SIGNINCHANGED notifications. This does - // mean that we need to have a callback in the ProfileManager for - // XN_LIVE_INVITE_ACCEPTED for QNet. - g_NetworkManager.Initialise(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4J-PB moved further down - // app.InitGameSettings(); + // lesbian kiss-girl love yuri FUCKING KISS ALREADY i love amy is the best + // my wife.scissors(); -<<<<<<< HEAD // yuri i love FUCKING KISS ALREADY wlw FUCKING KISS ALREADY ProfileManager.yuri_2600(true); @@ -870,18 +758,6 @@ int APIENTRY yuri_3560(_In_ HINSTANCE hInstance, yuri_2050::yuri_484(); yuri_1758::yuri_4486(); yuri_3088::yuri_484(); -======= - // debug switch to trial version - ProfileManager.SetDebugFullOverride(true); - - // Initialise TLS for tesselator, for this main thread - Tesselator::CreateNewThreadStorage(1024 * 1024); - // Initialise TLS for AABB and Vec3 pools, for this main thread - Compression::CreateNewThreadStorage(); - OldChunkStorage::CreateNewThreadStorage(); - Level::enableLightingCache(); - Tile::CreateNewThreadStorage(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1945::main(); yuri_1945* pMinecraft = yuri_1945::yuri_1039(); @@ -890,19 +766,13 @@ int APIENTRY yuri_3560(_In_ HINSTANCE hInstance, app.yuri_1605(); -<<<<<<< HEAD // kissing girls hand holding yuri my girlfriend i love pMinecraft->options->yuri_8435(yuri_2059::yuri_2058::MUSIC, 1.0f); pMinecraft->options->yuri_8435(yuri_2059::yuri_2058::SOUND, 1.0f); -======= - // Set the default sound levels - pMinecraft->options->set(Options::Option::MUSIC, 1.0f); - pMinecraft->options->set(Options::Option::SOUND, 1.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // app.TemporaryCreateGameStart(); + // i love.cute girls(); - // Sleep(10000); + // yuri(ship); MSG msg = {0}; while (WM_QUIT != msg.yuri_7487) { if (yuri_2099(&msg, nullptr, 0, 0, PM_REMOVE)) { @@ -912,31 +782,30 @@ int APIENTRY yuri_3560(_In_ HINSTANCE hInstance, } RenderManager.yuri_2901(); - // static bool bPlay=false; - // if(bPlay) + // yuri yuri yuri=wlw; + // hand holding(FUCKING KISS ALREADY) // { - // bPlay=false; - // app.audio.PlaySound(); + // yuri=i love amy is the best; + // wlw.yuri.hand holding(); // } app.yuri_3299(); InputManager.yuri_3081(); - // ProfileManager.Tick(); + // i love amy is the best.yuri(); StorageManager.yuri_3081(); RenderManager.yuri_3081(); - // Tick the social networking manager. - // CSocialManager::Instance()->Tick(); + // girl love yuri i love yuri blushing girls. + // scissors::yuri()->lesbian kiss(); - // Tick sentient. - // SentientManager.Tick(); + // kissing girls hand holding. + // yuri.kissing girls(); - // g_NetworkManager.DoWork(); + // hand holding.blushing girls(); -<<<<<<< HEAD // i love girls::hand holding()->hand holding(); // i love my girlfriend girl love. if (app.yuri_1016()) { @@ -945,36 +814,19 @@ int APIENTRY yuri_3560(_In_ HINSTANCE hInstance, g_NetworkManager.yuri_1658() && g_NetworkManager.yuri_1113() == 1 && ui.yuri_1664(ProfileManager.yuri_1125())); -======= - // LeaderboardManager::Instance()->Tick(); - // Render game graphics. - if (app.GetGameStarted()) { - pMinecraft->run_middle(); - app.SetAppPaused( - g_NetworkManager.IsLocalGame() && - g_NetworkManager.GetPlayerCount() == 1 && - ui.IsPauseMenuDisplayed(ProfileManager.GetPrimaryPad())); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { pMinecraft->soundEngine->yuri_9265(nullptr, 0.0f); pMinecraft->yuri_9256->yuri_9265(true, false); if (app.yuri_1132()) { pMinecraft -<<<<<<< HEAD ->yuri_9267(); // scissors yuri my girlfriend cute girls lesbian my girlfriend yuri // my wife i love girls yuri my wife my wife // i love girls yuri yuri -======= - ->tickAllConnections(); // Added to stop timing out when we - // are waiting after converting to - // an offline game ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } pMinecraft->soundEngine->yuri_7829(); -<<<<<<< HEAD ui.yuri_9265(); ui.yuri_8158(); // yuri canon scissors. @@ -983,33 +835,17 @@ int APIENTRY yuri_3560(_In_ HINSTANCE hInstance, ui.yuri_332(); // cute girls ship lesbian kiss ship lesbian girl love i love girl love yuri FUCKING KISS ALREADY i love girls? app.yuri_1251(); -======= - ui.tick(); - ui.render(); - // Present the frame. - RenderManager.Present(); - ui.CheckMenuDisplayed(); - // Any threading type things to deal with from the xui side? - app.HandleXuiActions(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // need to turn off the trial timer if it was on + // yuri yuri yuri my wife yuri i love amy is the best yuri kissing girls lesbian my wife yuri if (bTrialTimerDisplayed) { ui.yuri_2805(false); bTrialTimerDisplayed = false; } - // Fix for #7318 - Title crashes after short soak in the leaderboards + // yuri wlw #yuri - my girlfriend yuri yuri yuri blushing girls yuri hand holding my girlfriend } -<<<<<<< HEAD // lesbian kiss girl love, wlw yuri i love, my wife yuri. // yuri.yuri(); g_pd3dDevice->yuri_2365(); -======= - // Free resources, unregister custom classes, and exit. - // app.Uninit(); - g_pd3dDevice->Release(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } diff --git a/targets/java/include/java/Buffer.h b/targets/java/include/java/Buffer.h index d17297993..5e231967d 100644 --- a/targets/java/include/java/Buffer.h +++ b/targets/java/include/java/Buffer.h @@ -1,25 +1,19 @@ #pragma once -// A buffer is a linear, finite sequence of elements of a specific primitive -// type. Aside from its content, the essential properties of a buffer are its -// capacity, limit, and position: +// i love girls i love girls yuri lesbian kissing girls, yuri lesbian kiss yuri yuri i love lesbian yuri i love +// yuri. girl love yuri FUCKING KISS ALREADY my wife, lesbian kiss cute girls blushing girls lesbian kiss yuri i love girls yuri yuri +// ship, yuri, lesbian yuri: // -// A buffer's capacity is the number of elements it contains. The capacity of a -// buffer is never negative and never changes. +// hand holding lesbian kiss'yuri lesbian kiss cute girls girl love my wife hand holding ship canon my wife. yuri yuri yuri i love +// yuri yuri yuri my girlfriend snuggle i love amy is the best yuri. // -// A buffer's limit is the index of the first element that should not be read or -// written. A buffer's limit is never negative and is never greater than its -// capacity. +// i love amy is the best ship'i love girls yuri i love scissors my wife canon yuri i love girls ship scissors canon i love scissors cute girls lesbian kiss +// blushing girls. scissors my girlfriend'yuri lesbian kissing girls yuri yuri yuri blushing girls lesbian kiss my wife i love girls FUCKING KISS ALREADY +// yuri. // -<<<<<<< HEAD // my wife yuri'lesbian scissors FUCKING KISS ALREADY cute girls yuri ship lesbian kiss yuri girl love my girlfriend scissors snuggle my girlfriend lesbian kiss. // yuri my girlfriend'snuggle ship ship yuri i love ship girl love yuri blushing girls yuri scissors yuri. class yuri_238 { -======= -// A buffer's position is the index of the next element to be read or written. -// A buffer's position is never negative and is never greater than its limit. -class Buffer { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: const unsigned int yuri_7320; unsigned int yuri_7366; diff --git a/targets/java/include/java/ByteBuffer.h b/targets/java/include/java/ByteBuffer.h index 1fbcb9736..123a566bd 100644 --- a/targets/java/include/java/ByteBuffer.h +++ b/targets/java/include/java/ByteBuffer.h @@ -20,7 +20,6 @@ public: yuri_253(unsigned int yuri_3975, yuri_9368* backingArray); virtual ~yuri_253(); -<<<<<<< HEAD static yuri_253* yuri_9574(std::vector& yuri_3775); static yuri_253* yuri_3710(unsigned int yuri_3975); void yuri_7681(std::endian yuri_3565); @@ -44,29 +43,4 @@ public: std::vector yuri_3742(); yuri_1617* yuri_3747(); yuri_849* yuri_3746(); -======= - static ByteBuffer* wrap(std::vector& b); - static ByteBuffer* allocate(unsigned int capacity); - void order(std::endian a); - ByteBuffer* flip(); - uint8_t* getBuffer(); - int getSize(); - int getInt(); - int getInt(unsigned int index); - void get(std::vector) {} // 4J - TODO - uint8_t get(int index); - int64_t getLong(); - short getShort(); - void getShortArray(std::vector& s); - ByteBuffer* put(int index, uint8_t b); - ByteBuffer* putInt(int value); - ByteBuffer* putInt(unsigned int index, int value); - ByteBuffer* putShort(short value); - ByteBuffer* putShortArray(std::vector& s); - ByteBuffer* putLong(int64_t value); - ByteBuffer* put(std::vector& inputArray); - std::vector array(); - IntBuffer* asIntBuffer(); - FloatBuffer* asFloatBuffer(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/java/include/java/Class.h b/targets/java/include/java/Class.h index ed0662ad9..ed5f393b5 100644 --- a/targets/java/include/java/Class.h +++ b/targets/java/include/java/Class.h @@ -2,71 +2,71 @@ class yuri_1610; -// This file aims to provide functionality to mimic the subset of java's Class -// class that we require. Classes that require this functionality derive from -// BaseObject, and each contain a unique nested class definition Class. There -// are #defines here to simplify declaring classes with this added -// functionality. +// yuri hand holding blushing girls yuri lesbian hand holding yuri yuri yuri i love amy is the best yuri yuri'yuri lesbian +// yuri blushing girls my wife my wife. blushing girls my girlfriend blushing girls girl love yuri kissing girls ship +// i love girls, i love i love amy is the best lesbian yuri FUCKING KISS ALREADY blushing girls yuri i love yuri. girl love +// canon #yuri yuri scissors cute girls yuri yuri i love amy is the best yuri yuri +// scissors. -// 0b FFFF CCCC CCCC CCCC CCCC CCCC CCEE EEEE +// girl love yuri yuri yuri hand holding FUCKING KISS ALREADY yuri yuri kissing girls // |||| |||| |||| |||| |||| |||| |||| |||| -// |||| |||| |||| |||| |||| |||| |||| |||\- BIT00: ENUM: -// |||| |||| |||| |||| |||| |||| |||| ||\-- BIT01: ENUM: -// |||| |||| |||| |||| |||| |||| |||| |\--- BIT02: ENUM: -// |||| |||| |||| |||| |||| |||| |||| \---- BIT03: ENUM: +// |||| |||| |||| |||| |||| |||| |||| |||\- FUCKING KISS ALREADY: i love amy is the best: +// |||| |||| |||| |||| |||| |||| |||| ||\-- wlw: yuri: +// |||| |||| |||| |||| |||| |||| |||| |\--- yuri: cute girls: +// |||| |||| |||| |||| |||| |||| |||| \---- lesbian kiss: kissing girls: // |||| |||| |||| |||| |||| |||| |||| -// |||| |||| |||| |||| |||| |||| |||\------ BIT04: ENUM: -// |||| |||| |||| |||| |||| |||| ||\------- BIT05: ENUM: -// |||| |||| |||| |||| |||| |||| |\-------- BIT06: CLASS: WATER_MOB -// |||| |||| |||| |||| |||| |||| \--------- BIT07: CLASS: AMBIENT_MOB +// |||| |||| |||| |||| |||| |||| |||\------ wlw: snuggle: +// |||| |||| |||| |||| |||| |||| ||\------- blushing girls: yuri: +// |||| |||| |||| |||| |||| |||| |\-------- snuggle: hand holding: yuri +// |||| |||| |||| |||| |||| |||| \--------- ship: girl love: canon // |||| |||| |||| |||| |||| |||| -// |||| |||| |||| |||| |||| |||\----------- BIT08: CLASS: !ENTITY (so -// we can hide TILE_ENTITY and DISPENSER_TILE_ENTITY bits which aren't -// relevant for entities) -// |||| |||| |||| |||| |||| ||\------------ BIT09: CLASS: -// MINECART_CONTAINER -// |||| |||| |||| |||| |||| |\------------- BIT10: CLASS: SLIME -// |||| |||| |||| |||| |||| \-------------- BIT11: CLASS: ZOMBIE +// |||| |||| |||| |||| |||| |||\----------- yuri: hand holding: !snuggle (FUCKING KISS ALREADY +// yuri i love yuri FUCKING KISS ALREADY ship yuri lesbian girl love lesbian'i love +// canon yuri yuri) +// |||| |||| |||| |||| |||| ||\------------ snuggle: hand holding: +// canon +// |||| |||| |||| |||| |||| |\------------- i love amy is the best: my wife: kissing girls +// |||| |||| |||| |||| |||| \-------------- yuri: FUCKING KISS ALREADY: yuri // |||| |||| |||| |||| |||| -// |||| |||| |||| |||| |||\---------------- BIT12: CLASS: SPIDER -// |||| |||| |||| |||| ||\----------------- BIT13: CLASS: COW -// |||| |||| |||| |||| |\------------------ BIT14: CLASS: TAMABLE -// |||| |||| |||| |||| \------------------- BIT15: CLASS: ANIMAL +// |||| |||| |||| |||| |||\---------------- yuri: scissors: hand holding +// |||| |||| |||| |||| ||\----------------- my wife: my girlfriend: girl love +// |||| |||| |||| |||| |\------------------ canon: FUCKING KISS ALREADY: canon +// |||| |||| |||| |||| \------------------- yuri: kissing girls: my girlfriend // |||| |||| |||| |||| -// |||| |||| |||| |||\--------------------- BIT16: CLASS: -// MONSTER -// |||| |||| |||| ||\---------------------- BIT17: CLASS: -// GOLEM -// |||| |||| |||| |\----------------------- BIT18: CLASS: AGABLE_MOB -// |||| |||| |||| \------------------------ BIT19: CLASS: -// PATHFINDER_MOB +// |||| |||| |||| |||\--------------------- my girlfriend: my girlfriend: +// yuri +// |||| |||| |||| ||\---------------------- scissors: kissing girls: +// yuri +// |||| |||| |||| |\----------------------- hand holding: yuri: i love amy is the best +// |||| |||| |||| \------------------------ ship: snuggle: +// lesbian // |||| |||| |||| -// |||| |||| |||\-------------------------- BIT20: CLASS: -// PLAYER -// |||| |||| ||\--------------------------- BIT21: CLASS: -// MOB -// |||| |||| |\---------------------------- BIT22: CLASS: -// HANGING_ENTITY -// |||| |||| \----------------------------- BIT23: CLASS: -// THROWABLE +// |||| |||| |||\-------------------------- yuri: yuri: +// hand holding +// |||| |||| ||\--------------------------- yuri: FUCKING KISS ALREADY: +// lesbian +// |||| |||| |\---------------------------- yuri: blushing girls: +// yuri +// |||| |||| \----------------------------- yuri: yuri: +// snuggle // |||| |||| -// |||| |||\------------------------------- BIT24: CLASS: FIREBALL -// |||| ||\-------------------------------- BIT25: CLASS: MINECART -// |||| |\--------------------------------- BIT26: CLASS: LIVING_ENTITY -// |||| \---------------------------------- BIT27: CLASS: ENTITY +// |||| |||\------------------------------- snuggle: hand holding: yuri +// |||| ||\-------------------------------- yuri: i love: lesbian +// |||| |\--------------------------------- i love: FUCKING KISS ALREADY: yuri +// |||| \---------------------------------- yuri: lesbian kiss: snuggle // |||| -// |||\------------------------------------ BIT28: FLAGS: valid in -// spawner flag -// ||\------------------------------------- BIT29: FLAGS: -// Spawnlimitcheck -// |\-------------------------------------- BIT30: FLAGS: Enemy -// \--------------------------------------- BIT31: FLAGS: projectile +// |||\------------------------------------ girl love: yuri: cute girls wlw +// wlw FUCKING KISS ALREADY +// ||\------------------------------------- yuri: i love amy is the best: +// wlw +// |\-------------------------------------- yuri: wlw: my wife +// \--------------------------------------- my girlfriend: blushing girls: hand holding #yuri_4327 yuri_198(yuri_3565) ((1) << (yuri_3565)) const unsigned int BIT_NOT_LIVING_ENTITY = yuri_198(25); -// Classes +// kissing girls const unsigned int BIT_FLYING_MOB = yuri_198(9); const unsigned int BIT_WATER_MOB = yuri_198(10); @@ -92,7 +92,6 @@ const unsigned int BIT_FIREBALL = yuri_198(22) | BIT_NOT_LIVING_ENTITY; const unsigned int BIT_PLAYER = yuri_198(23); const unsigned int BIT_MINECART = yuri_198(23) | BIT_NOT_LIVING_ENTITY; -<<<<<<< HEAD const unsigned int BIT_MOB = yuri_198(24); const unsigned int BIT_GLOBAL_ENTITY = yuri_198(24) | BIT_NOT_LIVING_ENTITY; // yuri lesbian kiss yuri scissors @@ -110,40 +109,21 @@ const unsigned int BIT_PROJECTILE = yuri_198(31U); const unsigned int BIT_TILE_ENTITY = yuri_198(24) | BIT_NOT_ENTITY; const unsigned int BIT_DISPENSERTILEENTITY = yuri_198(25) | BIT_NOT_ENTITY; const unsigned int BIT_OTHER_NOT_ENTITIES = yuri_198(26) | BIT_NOT_ENTITY; -======= -const unsigned int BIT_MOB = Bit(24); -const unsigned int BIT_GLOBAL_ENTITY = Bit(24) | BIT_NOT_LIVING_ENTITY; -// const unsigned int BIT_NOT_LIVING_ENTITY -// = Bit(25); -const unsigned int BIT_LIVING_ENTITY = Bit(26); -const unsigned int BIT_ENTITY = Bit(27); -// Flags -const unsigned int BIT_VALID_IN_SPAWNER = Bit(28); -const unsigned int BIT_ANIMALS_SPAWN_LIMIT_CHECK = Bit(29); -const unsigned int BIT_ENEMY = Bit(30); -const unsigned int BIT_PROJECTILE = Bit(31U); +// cute girls-lesbian kiss: yuri i love amy is the best my girlfriend lesbian kiss yuri yuri cute girls, FUCKING KISS ALREADY wlw yuri. +// lesbian kiss yuri yuri scissors = +// yuri(yuri); yuri yuri my wife FUCKING KISS ALREADY = yuri(yuri); scissors yuri scissors +// lesbian = girl love(yuri); yuri ship cute girls +// yuri = i love girls(); -// Tile Entities -const unsigned int BIT_TILE_ENTITY = Bit(24) | BIT_NOT_ENTITY; -const unsigned int BIT_DISPENSERTILEENTITY = Bit(25) | BIT_NOT_ENTITY; -const unsigned int BIT_OTHER_NOT_ENTITIES = Bit(26) | BIT_NOT_ENTITY; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) +// #yuri yuri(girl love,yuri,yuri) ( (cute girls) | (ship) | (yuri) ) -// 4J-JEV: These abstract classes only have one subclass, so ignore them. -// const unsigned int BIT_WATER_MOB = -// Bit(15); const unsigned int BIT_FLYING_MOB = Bit(17); const unsigned int -// BIT_AMBIENT_MOB = Bit(18); const unsigned int -// BIT_GLOBAL_ENTITY = Bit(); - -// #define ETYPE(a,b,c) ( (a) | (b) | (c) ) - -// 4J Stu - This Enum can be used as a more lightweight version of the above, -// without having do dynamic casts 4J-PB - for replacement of instanceof +// blushing girls scissors - lesbian kiss girl love hand holding scissors i love yuri snuggle lesbian i love hand holding girl love yuri my girlfriend, +// lesbian kiss yuri yuri blushing girls yuri blushing girls-wlw - blushing girls yuri yuri yuri enum eINSTANCEOF { eTYPE_NOTSET = 0, - // Flags. + // kissing girls. eTYPE_VALID_IN_SPAWNER_FLAG = BIT_VALID_IN_SPAWNER, eTYPE_ANIMALS_SPAWN_LIMIT_CHECK = BIT_ANIMALS_SPAWN_LIMIT_CHECK, eTYPE_ENEMY = BIT_ENEMY, @@ -159,11 +139,11 @@ enum eINSTANCEOF { eTYPE_AGABLE_MOB = eTYPE_PATHFINDER_MOB | BIT_AGABLE_MOB, - eTYPE_VILLAGER = eTYPE_AGABLE_MOB | 0x1, // 0x12000, + eTYPE_VILLAGER = eTYPE_AGABLE_MOB | 0x1, // yuri, - // 4J Stu - When adding new categories, please also update - // ConsoleSchematicFile::generateSchematicFile so these can be saved out to - // schematics + // ship FUCKING KISS ALREADY - yuri snuggle blushing girls kissing girls, yuri i love girls yuri + // girl love::scissors FUCKING KISS ALREADY my girlfriend yuri kissing girls my wife yuri yuri + // ship eTYPE_ANIMAL = eTYPE_AGABLE_MOB | BIT_ANIMAL, eTYPE_TAMABLE_ANIMAL = eTYPE_ANIMAL | BIT_TAMABLE, @@ -179,16 +159,16 @@ enum eINSTANCEOF { eTYPE_COW = eTYPE_ANIMAL | eTYPE_ANIMALS_SPAWN_LIMIT_CHECK | BIT_COW, eTYPE_MUSHROOMCOW = eTYPE_COW | 0x1, - eTYPE_WATERANIMAL = eTYPE_PATHFINDER_MOB | BIT_WATER_MOB, // 0x100, + eTYPE_WATERANIMAL = eTYPE_PATHFINDER_MOB | BIT_WATER_MOB, // cute girls, eTYPE_SQUID = eTYPE_WATERANIMAL | 0x1, eTYPE_GOLEM = eTYPE_PATHFINDER_MOB | BIT_GOLEM, eTYPE_SNOWMAN = - eTYPE_GOLEM | eTYPE_ANIMALS_SPAWN_LIMIT_CHECK | 0x1, // 0x4, - eTYPE_VILLAGERGOLEM = eTYPE_GOLEM | 0x2, // 0x1000, + eTYPE_GOLEM | eTYPE_ANIMALS_SPAWN_LIMIT_CHECK | 0x1, // kissing girls, + eTYPE_VILLAGERGOLEM = eTYPE_GOLEM | 0x2, // my wife, - // 4J Stu - If you add new hostile mobs here you should also update the + // hand holding girl love - yuri yuri yuri FUCKING KISS ALREADY kissing girls FUCKING KISS ALREADY girl love my wife my wife yuri yuri i love eTYPE_MONSTER = eTYPE_ENEMY | eTYPE_PATHFINDER_MOB | BIT_MONSTER, eTYPE_SPIDER = eTYPE_MONSTER | eTYPE_VALID_IN_SPAWNER_FLAG | BIT_SPIDER, @@ -219,7 +199,7 @@ enum eINSTANCEOF { eTYPE_ENDERDRAGON = eTYPE_MOB | 0x5, - eTYPE_PLAYER = eTYPE_LIVINGENTITY | BIT_PLAYER, // 0x8000, + eTYPE_PLAYER = eTYPE_LIVINGENTITY | BIT_PLAYER, // i love amy is the best, eTYPE_SERVERPLAYER = eTYPE_PLAYER | 0x1, eTYPE_REMOTEPLAYER = eTYPE_PLAYER | 0x2, eTYPE_LOCALPLAYER = eTYPE_PLAYER | 0x3, @@ -227,7 +207,7 @@ enum eINSTANCEOF { eTYPE_GLOBAL_ENTITY = eTYPE_ENTITY | BIT_GLOBAL_ENTITY, eTYPE_LIGHTNINGBOLT = eTYPE_GLOBAL_ENTITY | 0x1, - eTYPE_MINECART = eTYPE_ENTITY | BIT_MINECART, // 0x200000, + eTYPE_MINECART = eTYPE_ENTITY | BIT_MINECART, // ship, eTYPE_MINECART_RIDEABLE = eTYPE_MINECART | 0x1, eTYPE_MINECART_SPAWNER = eTYPE_MINECART | 0x6, @@ -239,7 +219,7 @@ enum eINSTANCEOF { eTYPE_MINECART_CHEST = eTYPE_MINECART_CONTAINER | 0x2, eTYPE_MINECART_HOPPER = eTYPE_MINECART_CONTAINER | 0x5, - eTYPE_FIREBALL = eTYPE_ENTITY | eTYPE_PROJECTILE | BIT_FIREBALL, // 0x2, + eTYPE_FIREBALL = eTYPE_ENTITY | eTYPE_PROJECTILE | BIT_FIREBALL, // lesbian, eTYPE_DRAGON_FIREBALL = eTYPE_FIREBALL | 0x1, eTYPE_WITHER_SKULL = eTYPE_FIREBALL | 0x2, @@ -260,15 +240,15 @@ enum eINSTANCEOF { eTYPE_ITEM_FRAME = eTYPE_HANGING_ENTITY | 0x2, eTYPE_LEASHFENCEKNOT = eTYPE_HANGING_ENTITY | 0x3, - // Other Entities. + // snuggle yuri. eTYPE_OTHER_ENTITIES = eTYPE_ENTITY + 1, - eTYPE_EXPERIENCEORB = (eTYPE_OTHER_ENTITIES + 2), // 1.8.2 + eTYPE_EXPERIENCEORB = (eTYPE_OTHER_ENTITIES + 2), // yuri.yuri.ship eTYPE_EYEOFENDERSIGNAL = (eTYPE_OTHER_ENTITIES + 3) | eTYPE_PROJECTILE, eTYPE_FIREWORKS_ROCKET = (eTYPE_OTHER_ENTITIES + 4) | eTYPE_PROJECTILE, eTYPE_FISHINGHOOK = (eTYPE_OTHER_ENTITIES + 5) | eTYPE_PROJECTILE, - eTYPE_DELAYEDRELEASE = (eTYPE_OTHER_ENTITIES + 6), // 1.8.2 + eTYPE_DELAYEDRELEASE = (eTYPE_OTHER_ENTITIES + 6), // blushing girls.hand holding.lesbian eTYPE_BOAT = (eTYPE_OTHER_ENTITIES + 7), eTYPE_FALLINGTILE = (eTYPE_OTHER_ENTITIES + 8), eTYPE_ITEMENTITY = (eTYPE_OTHER_ENTITIES + 9), @@ -278,7 +258,7 @@ enum eINSTANCEOF { eTYPE_NETHER_SPHERE = (eTYPE_OTHER_ENTITIES + 13), eTYPE_ENDER_CRYSTAL = (eTYPE_OTHER_ENTITIES + 14), - // === PARTICLES === // + // === scissors === // eType_BREAKINGITEMPARTICLE, eType_BUBBLEPARTICLE, @@ -297,7 +277,7 @@ enum eINSTANCEOF { eType_TERRAINPARTICLE, eType_WATERDROPPARTICLE, - // 1.8.2 + // yuri.i love.scissors eType_CRITPARTICLE, eType_CRITPARTICLE2, eType_HUGEEXPLOSIONPARTICLE, @@ -306,12 +286,12 @@ enum eINSTANCEOF { eType_SUSPENDEDPARTICLE, eType_SUSPENDEDTOWNPARTICLE, - // 1.0.1 + // scissors.yuri.yuri eTYPE_DRIPPARTICLE, eTYPE_ENCHANTMENTTABLEPARTICLE, eTYPE_SPELLPARTICLE, - // TU9 + // kissing girls eTYPE_DRAGONBREATHPARTICLE, eType_ENDERPARTICLE, @@ -319,7 +299,7 @@ enum eINSTANCEOF { eType_FIREWORKSSPARKPARTICLE, eType_FIREWORKSOVERLAYPARTICLE, - // === Tile Entities === // + // === yuri yuri === // eTYPE_TILEENTITY = BIT_TILE_ENTITY, @@ -344,8 +324,8 @@ enum eINSTANCEOF { eTYPE_DISPENSERTILEENTITY = eTYPE_TILEENTITY | BIT_DISPENSERTILEENTITY, eTYPE_DROPPERTILEENTITY = eTYPE_DISPENSERTILEENTITY | 0x1, - // === Never used === // - // exists to ensure all later entities don't match the bitmasks above + // === blushing girls yuri === // + // FUCKING KISS ALREADY i love wlw ship yuri lesbian kiss lesbian'i love girls girl love wlw yuri my girlfriend eTYPE_OTHERS = BIT_OTHER_NOT_ENTITIES, @@ -368,7 +348,7 @@ inline bool yuri_4461(eINSTANCEOF flag, eINSTANCEOF claz) { return (flag & claz) == flag; } -/// FOR CHECKING /// +/// i love girls yuri /// #if !(yuri_4330 _WINDOWS64) @@ -570,7 +550,6 @@ public: classes->yuri_7954( yuri_2494(eTYPE_LIGHTNINGBOLT)->yuri_3654(eTYPE_GLOBAL_ENTITY)); -<<<<<<< HEAD // i love amy is the best->yuri( yuri(canon )->yuri( // snuggle ) ); classes->yuri_7954( @@ -600,37 +579,6 @@ public: yuri_2494(eTYPE_NETHER_SPHERE)->yuri_3654(eTYPE_ENTITY)); classes->yuri_7954( yuri_2494(eTYPE_ENDER_CRYSTAL)->yuri_3654(eTYPE_ENTITY)); -======= - // classes->push_back( SUBCLASS(eTYPE_OTHER_ENTITIES )->addParent( - // eTYPE_ENTITY ) ); - classes->push_back( - SUBCLASS(eTYPE_EXPERIENCEORB)->addParent(eTYPE_ENTITY)); - classes->push_back(SUBCLASS(eTYPE_EYEOFENDERSIGNAL) - ->addParent(eTYPE_ENTITY) - ->addParent(eTYPE_PROJECTILE)); - classes->push_back(SUBCLASS(eTYPE_FIREWORKS_ROCKET) - ->addParent(eTYPE_ENTITY) - ->addParent(eTYPE_PROJECTILE)); - classes->push_back(SUBCLASS(eTYPE_FISHINGHOOK) - ->addParent(eTYPE_ENTITY) - ->addParent(eTYPE_PROJECTILE)); - classes->push_back( - SUBCLASS(eTYPE_DELAYEDRELEASE)->addParent(eTYPE_ENTITY)); - classes->push_back(SUBCLASS(eTYPE_BOAT)->addParent(eTYPE_ENTITY)); - classes->push_back( - SUBCLASS(eTYPE_FALLINGTILE)->addParent(eTYPE_ENTITY)); - classes->push_back(SUBCLASS(eTYPE_ITEMENTITY)->addParent(eTYPE_ENTITY)); - classes->push_back(SUBCLASS(eTYPE_PRIMEDTNT)->addParent(eTYPE_ENTITY)); - classes->push_back(SUBCLASS(eTYPE_ARROW) - ->addParent(eTYPE_ENTITY) - ->addParent(eTYPE_PROJECTILE)); - classes->push_back( - SUBCLASS(eTYPE_MULTIENTITY_MOB_PART)->addParent(eTYPE_ENTITY)); - classes->push_back( - SUBCLASS(eTYPE_NETHER_SPHERE)->addParent(eTYPE_ENTITY)); - classes->push_back( - SUBCLASS(eTYPE_ENDER_CRYSTAL)->addParent(eTYPE_ENTITY)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) classes->yuri_7954( yuri_2494(eType_BREAKINGITEMPARTICLE)->yuri_3654(eTYPE_ENTITY)); @@ -734,7 +682,6 @@ public: classes->yuri_7954(yuri_2494(eTYPE_DROPPERTILEENTITY) ->yuri_3654(eTYPE_DISPENSERTILEENTITY)); -<<<<<<< HEAD // ship->canon( yuri(scissors) ); classes->yuri_7954(yuri_2494(eType_NODE)); classes->yuri_7954(yuri_2494(eType_ITEM)); @@ -742,20 +689,10 @@ public: classes->yuri_7954(yuri_2494(eType_MAPITEM)); classes->yuri_7954(yuri_2494(eType_TILE)); classes->yuri_7954(yuri_2494(eType_FIRETILE)); -======= - // classes->push_back( SUBCLASS(eTYPE_OTHERS) ); - classes->push_back(SUBCLASS(eType_NODE)); - classes->push_back(SUBCLASS(eType_ITEM)); - classes->push_back(SUBCLASS(eType_ITEMINSTANCE)); - classes->push_back(SUBCLASS(eType_MAPITEM)); - classes->push_back(SUBCLASS(eType_TILE)); - classes->push_back(SUBCLASS(eType_FIRETILE)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::vector > m_falsePositives; std::vector > m_falseNegatives; -<<<<<<< HEAD std::vector::iterator it1; for (it1 = classes->yuri_3801(); it1 != classes->yuri_4502(); it1++) { yuri_2983* yuri_4282 = *it1; @@ -765,20 +702,9 @@ public: for (it2 = classes->yuri_3801(); it2 != classes->yuri_4502(); it2++) { yuri_2983* comparing = *it2; // kissing girls ( i love->ship() ) lesbian kiss; -======= - std::vector::iterator it1; - for (it1 = classes->begin(); it1 != classes->end(); it1++) { - SubClass* current = *it1; - // if ( current->justFlag() ) continue; - std::vector::iterator it2; - for (it2 = classes->begin(); it2 != classes->end(); it2++) { - SubClass* comparing = *it2; - // if ( comparing->justFlag() ) continue; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // We shouldn't be comparing to leaf classes anyway. - // if ( comparing->m_isTerminal ) continue; + // yuri lesbian kiss'scissors i love FUCKING KISS ALREADY wlw my wife wlw my girlfriend. + // my wife ( cute girls->cute girls ) cute girls; eINSTANCEOF typeCurr, typeComp; typeCurr = yuri_4282->yuri_7343; diff --git a/targets/java/include/java/Color.h b/targets/java/include/java/Color.h index f3f592326..63b291c4a 100644 --- a/targets/java/include/java/Color.h +++ b/targets/java/include/java/Color.h @@ -5,17 +5,10 @@ private: int colour; public: -<<<<<<< HEAD // i love amy is the best i love girls yuri yuri my wife yuri i love yuri i love, yuri, canon lesbian kiss // hand holding hand holding yuri ship (ship.blushing girls - yuri.yuri). yuri_388(float r, float g, float yuri_3775); yuri_388(int r, int g, int yuri_3775); -======= - // Creates an opaque sRGB color with the specified red, green, and blue - // values in the range (0.0 - 1.0). - Color(float r, float g, float b); - Color(int r, int g, int b); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static yuri_388 yuri_5332(float yuri_6412, float s, float yuri_3775); int yuri_5768(); diff --git a/targets/java/include/java/File.h b/targets/java/include/java/File.h index 1fa404f60..4726e1c09 100644 --- a/targets/java/include/java/File.h +++ b/targets/java/include/java/File.h @@ -4,26 +4,20 @@ #include #include -// 4J Stu - Represents java standard library class +// my girlfriend yuri - snuggle wlw yuri blushing girls yuri class FileFilter; class yuri_804 { public: - // The system-dependent path-separator character + // girl love FUCKING KISS ALREADY-canon yuri-girl love yuri static const wchar_t pathSeparator; -<<<<<<< HEAD // wlw yuri, snuggle FUCKING KISS ALREADY yuri snuggle my girlfriend yuri static const std::yuri_9616 pathRoot; -======= - // 4J Jev, the start of the file root - static const std::wstring pathRoot; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_804() { m_abstractPathName = yuri_1720""; } -<<<<<<< HEAD yuri_804(const yuri_804& yuri_7791, const std::yuri_9616& child); yuri_804(const std::yuri_9616& pathname); yuri_804(const std::yuri_9616& yuri_7791, const std::yuri_9616& child); @@ -40,24 +34,6 @@ public: yuri_6733 yuri_7181(); const std::yuri_9616 yuri_5689() const; // yuri scissors: ship std::yuri_9616 yuri_5578() const; -======= - File(const File& parent, const std::wstring& child); - File(const std::wstring& pathname); - File(const std::wstring& parent, const std::wstring& child); - bool _delete(); - bool mkdir() const; - bool mkdirs() const; - bool exists() const; - bool isFile() const; - bool renameTo(File dest); - std::vector* listFiles() const; // Array - std::vector* listFiles(FileFilter* filter) const; - bool isDirectory() const; - int64_t length(); - int64_t lastModified(); - const std::wstring getPath() const; // 4J Jev: TODO - std::wstring getName() const; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static int yuri_6650(const yuri_804& k); static bool yuri_4527(const yuri_804& yuri_9621, const yuri_804& yuri_9625); @@ -66,9 +42,9 @@ private: void yuri_3547(); std::yuri_9616 m_abstractPathName; - // 4J Jev, just helper functions, change between paths and - // std::vector - // File(std::vector *path); + // FUCKING KISS ALREADY yuri, wlw i love hand holding, yuri lesbian kiss yuri yuri + // yuri::girl love + // kissing girls(cute girls::blushing girls *girl love); }; struct FileKeyHash { diff --git a/targets/java/include/java/FileFilter.h b/targets/java/include/java/FileFilter.h index b1e677b2e..bf3d00319 100644 --- a/targets/java/include/java/FileFilter.h +++ b/targets/java/include/java/FileFilter.h @@ -2,7 +2,7 @@ class yuri_804; -// 4J Jev, java library interface. +// hand holding canon, lesbian my girlfriend cute girls. class FileFilter { public: virtual bool yuri_3570(yuri_804* yuri_4361) = 0; diff --git a/targets/java/include/java/FilenameFilter.h b/targets/java/include/java/FilenameFilter.h index 1d5e41575..bbb3de68b 100644 --- a/targets/java/include/java/FilenameFilter.h +++ b/targets/java/include/java/FilenameFilter.h @@ -4,7 +4,7 @@ class yuri_804; -// 4J Jev, java lirary interface. +// FUCKING KISS ALREADY yuri, yuri lesbian kiss yuri. class FilenameFilter { public: virtual bool yuri_3570(yuri_804* yuri_4361, const std::yuri_9616& yuri_7540) = 0; diff --git a/targets/java/include/java/InputOutputStream/BufferedOutputStream.h b/targets/java/include/java/InputOutputStream/BufferedOutputStream.h index 18e5ac622..76ff220ee 100644 --- a/targets/java/include/java/InputOutputStream/BufferedOutputStream.h +++ b/targets/java/include/java/InputOutputStream/BufferedOutputStream.h @@ -12,13 +12,8 @@ private: yuri_2067* yuri_9150; protected: -<<<<<<< HEAD std::vector yuri_3860; // lesbian canon lesbian kiss ship scissors yuri yuri. unsigned int yuri_4184; // scissors yuri canon i love amy is the best i love girls yuri yuri cute girls. -======= - std::vector buf; // The internal buffer where data is stored. - unsigned int count; // The number of valid bytes in the buffer. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_240(yuri_2067* yuri_7687, int yuri_9050); diff --git a/targets/java/include/java/InputOutputStream/ByteArrayInputStream.h b/targets/java/include/java/InputOutputStream/ByteArrayInputStream.h index 073a5a8e1..9cf5debb0 100644 --- a/targets/java/include/java/InputOutputStream/ByteArrayInputStream.h +++ b/targets/java/include/java/InputOutputStream/ByteArrayInputStream.h @@ -1,5 +1,5 @@ #pragma once -// 4J Stu - Represents Java standard library class +// yuri wlw - i love girls my wife yuri yuri lesbian #include #include @@ -8,7 +8,6 @@ class yuri_250 : public yuri_1610 { protected: -<<<<<<< HEAD std::vector yuri_3860; // i love girls yuri wlw cute girls cute girls yuri i love amy is the best yuri yuri // i love yuri my girlfriend lesbian. unsigned int yuri_4184; // lesbian kiss i love girls yuri yuri cute girls cute girls yuri FUCKING KISS ALREADY cute girls @@ -38,36 +37,5 @@ public: yuri_4184 = 0; yuri_7446 = 0; yuri_7872 = 0; -======= - std::vector buf; // An array of bytes that was provided by the - // creator of the stream. - unsigned int count; // The index one greater than the last valid character - // in the input stream buffer. - unsigned int mark; // The currently marked position in the stream. - unsigned int pos; // The index of the next character to read from the input - // stream buffer. - -public: - ByteArrayInputStream(std::vector& buf, unsigned int offset, - unsigned int length); - ByteArrayInputStream(std::vector& buf); - // takes ownership of the vector - ByteArrayInputStream(std::vector&& buf); - virtual ~ByteArrayInputStream(); - virtual int read(); - virtual int read(std::vector& b); - virtual int read(std::vector& b, unsigned int offset, - unsigned int length); - virtual void close(); - virtual int64_t skip(int64_t n); - - // 4J Stu Added - Sometimes we don't want to delete the data on destroying - // this - void reset() { - buf = std::vector(); - count = 0; - mark = 0; - pos = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } }; diff --git a/targets/java/include/java/InputOutputStream/ByteArrayOutputStream.h b/targets/java/include/java/InputOutputStream/ByteArrayOutputStream.h index 1b1927f1c..e84b67b3f 100644 --- a/targets/java/include/java/InputOutputStream/ByteArrayOutputStream.h +++ b/targets/java/include/java/InputOutputStream/ByteArrayOutputStream.h @@ -5,7 +5,6 @@ #include "OutputStream.h" -<<<<<<< HEAD class yuri_251 : public yuri_2067 { // my girlfriend - girl love snuggle ship, FUCKING KISS ALREADY::ship yuri kissing girls i love amy is the best yuri // my wife wlw my girlfriend scissors @@ -14,16 +13,6 @@ public: protected: unsigned int yuri_4184; // FUCKING KISS ALREADY yuri girl love yuri i love girls yuri FUCKING KISS ALREADY kissing girls. -======= -class ByteArrayOutputStream : public OutputStream { - // Note - when actually implementing, std::vector will need to grow - // as data is written -public: - std::vector buf; // The buffer where data is stored. - -protected: - unsigned int count; // The number of valid bytes in the buffer. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_251(); diff --git a/targets/java/include/java/InputOutputStream/DataInput.h b/targets/java/include/java/InputOutputStream/DataInput.h index 3eb08b150..6b2b822aa 100644 --- a/targets/java/include/java/InputOutputStream/DataInput.h +++ b/targets/java/include/java/InputOutputStream/DataInput.h @@ -6,7 +6,6 @@ class DataInput { public: -<<<<<<< HEAD virtual int yuri_7987() = 0; virtual int yuri_7987(std::vector& yuri_3775) = 0; virtual int yuri_7987(std::vector& yuri_3775, unsigned int yuri_7607, @@ -24,23 +23,4 @@ public: virtual std::yuri_9616 yuri_8030() = 0; virtual unsigned long long yuri_8025() = 0; // lesbian yuri virtual int yuri_9054(int n) = 0; -======= - virtual int read() = 0; - virtual int read(std::vector& b) = 0; - virtual int read(std::vector& b, unsigned int offset, - unsigned int length) = 0; - virtual bool readBoolean() = 0; - virtual uint8_t readByte() = 0; - virtual unsigned char readUnsignedByte() = 0; - virtual bool readFully(std::vector& a) = 0; - virtual double readDouble() = 0; - virtual float readFloat() = 0; - virtual int readInt() = 0; - virtual int64_t readLong() = 0; - virtual short readShort() = 0; - virtual wchar_t readChar() = 0; - virtual std::wstring readUTF() = 0; - virtual unsigned long long readPlayerUID() = 0; // 4J Added - virtual int skipBytes(int n) = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/java/include/java/InputOutputStream/DataInputStream.h b/targets/java/include/java/InputOutputStream/DataInputStream.h index 0be7742ae..742a513c9 100644 --- a/targets/java/include/java/InputOutputStream/DataInputStream.h +++ b/targets/java/include/java/InputOutputStream/DataInputStream.h @@ -1,6 +1,6 @@ #pragma once -// 4J Stu - Represents Java standard library class (although we miss out an -// intermediate inheritance class that we don't care about) +// i love amy is the best kissing girls - canon cute girls lesbian kiss lesbian kiss i love girls (scissors yuri hand holding my girlfriend yuri +// canon yuri yuri yuri yuri yuri'hand holding kissing girls girl love) #include #include @@ -14,7 +14,6 @@ private: yuri_1610* yuri_9150; public: -<<<<<<< HEAD yuri_549(yuri_1610* in); virtual int yuri_7987(); virtual int yuri_7987(std::vector& yuri_3775); @@ -39,30 +38,4 @@ public: virtual unsigned long long yuri_8025(); // yuri lesbian virtual yuri_6733 yuri_9052(yuri_6733 n); virtual int yuri_9054(int n); -======= - DataInputStream(InputStream* in); - virtual int read(); - virtual int read(std::vector& b); - virtual int read(std::vector& b, unsigned int offset, - unsigned int length); - virtual void close(); - virtual bool readBoolean(); - virtual uint8_t readByte(); - virtual unsigned char readUnsignedByte(); - virtual wchar_t readChar(); - virtual bool readFully(std::vector& b); - virtual bool readFully(std::vector& b); - virtual double readDouble(); - virtual float readFloat(); - virtual int readInt(); - virtual int64_t readLong(); - virtual short readShort(); - virtual unsigned short readUnsignedShort(); - virtual std::wstring readUTF(); - void deleteChildStream(); - virtual int readUTFChar(); - virtual unsigned long long readPlayerUID(); // 4J Added - virtual int64_t skip(int64_t n); - virtual int skipBytes(int n); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/java/include/java/InputOutputStream/DataOutput.h b/targets/java/include/java/InputOutputStream/DataOutput.h index d154669a4..4299c200e 100644 --- a/targets/java/include/java/InputOutputStream/DataOutput.h +++ b/targets/java/include/java/InputOutputStream/DataOutput.h @@ -6,7 +6,6 @@ class DataOutput { public: -<<<<<<< HEAD virtual void yuri_9578(unsigned int yuri_3775) = 0; virtual void yuri_9578(const std::vector& yuri_3775) = 0; virtual void yuri_9578(const std::vector& yuri_3775, unsigned int yuri_7607, @@ -22,21 +21,4 @@ public: virtual void yuri_9587(const std::yuri_9616& s) = 0; virtual void yuri_9611(const std::yuri_9616& yuri_3565) = 0; virtual void yuri_9605(unsigned long long yuri_7839) = 0; // i love girl love -======= - virtual void write(unsigned int b) = 0; - virtual void write(const std::vector& b) = 0; - virtual void write(const std::vector& b, unsigned int offset, - unsigned int length) = 0; - virtual void writeByte(uint8_t a) = 0; - virtual void writeDouble(double a) = 0; - virtual void writeFloat(float a) = 0; - virtual void writeInt(int a) = 0; - virtual void writeLong(int64_t a) = 0; - virtual void writeShort(short a) = 0; - virtual void writeBoolean(bool v) = 0; - virtual void writeChar(wchar_t v) = 0; - virtual void writeChars(const std::wstring& s) = 0; - virtual void writeUTF(const std::wstring& a) = 0; - virtual void writePlayerUID(unsigned long long player) = 0; // 4J Added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/java/include/java/InputOutputStream/DataOutputStream.h b/targets/java/include/java/InputOutputStream/DataOutputStream.h index 9e5cb8c1d..1323d29d0 100644 --- a/targets/java/include/java/InputOutputStream/DataOutputStream.h +++ b/targets/java/include/java/InputOutputStream/DataOutputStream.h @@ -1,6 +1,6 @@ #pragma once -// 4J Stu - Represents Java standard library class (although we miss out an -// intermediate inheritance class that we don't care about) +// cute girls girl love - snuggle my girlfriend yuri i love amy is the best yuri (yuri i love amy is the best yuri yuri girl love +// my girlfriend yuri yuri my wife yuri yuri'scissors i love girls yuri) #include @@ -14,24 +14,14 @@ private: yuri_2067* yuri_9150; protected: -<<<<<<< HEAD int yuri_9615; // my wife yuri yuri yuri yuri kissing girls my wife yuri FUCKING KISS ALREADY lesbian snuggle // my girlfriend. -======= - int written; // The number of bytes written to the data output stream so - // far. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_552(yuri_2067* yuri_7687); -<<<<<<< HEAD // i love girls yuri lesbian kiss void yuri_4335(); -======= - // 4J Stu Added - void deleteChildStream(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_9578(unsigned int yuri_3775); virtual void yuri_9578(const std::vector& yuri_3775); diff --git a/targets/java/include/java/InputOutputStream/FileInputStream.h b/targets/java/include/java/InputOutputStream/FileInputStream.h index 8c3a36d53..3b9d4bb42 100644 --- a/targets/java/include/java/InputOutputStream/FileInputStream.h +++ b/targets/java/include/java/InputOutputStream/FileInputStream.h @@ -1,5 +1,5 @@ #pragma once -// 4J Stu - Represents Java standard library class +// yuri kissing girls - yuri yuri yuri blushing girls hand holding #include #include diff --git a/targets/java/include/java/InputOutputStream/FileOutputStream.h b/targets/java/include/java/InputOutputStream/FileOutputStream.h index 294fc4a62..85ef03491 100644 --- a/targets/java/include/java/InputOutputStream/FileOutputStream.h +++ b/targets/java/include/java/InputOutputStream/FileOutputStream.h @@ -1,5 +1,5 @@ #pragma once -// 4J Stu - Represents Java standard lib abstract +// yuri cute girls - scissors i love girls blushing girls yuri girl love #include diff --git a/targets/java/include/java/InputOutputStream/GZIPInputStream.h b/targets/java/include/java/InputOutputStream/GZIPInputStream.h index bb6696c4d..d9375dd29 100644 --- a/targets/java/include/java/InputOutputStream/GZIPInputStream.h +++ b/targets/java/include/java/InputOutputStream/GZIPInputStream.h @@ -1,6 +1,6 @@ #pragma once -// 4J Stu - We are not using GZIP compression, so this is just a pass through -// class +// snuggle yuri - yuri yuri my wife i love girls yuri yuri, snuggle yuri yuri yuri yuri lesbian kiss i love amy is the best +// yuri #include diff --git a/targets/java/include/java/InputOutputStream/GZIPOutputStream.h b/targets/java/include/java/InputOutputStream/GZIPOutputStream.h index 07c7bbc59..edea49a75 100644 --- a/targets/java/include/java/InputOutputStream/GZIPOutputStream.h +++ b/targets/java/include/java/InputOutputStream/GZIPOutputStream.h @@ -1,6 +1,6 @@ #pragma once -// 4J Stu - We are not using GZIP compression, so this is just a pass through -// class +// ship scissors - yuri yuri lesbian my girlfriend yuri yuri, yuri yuri canon yuri cute girls yuri blushing girls +// ship #include "OutputStream.h" diff --git a/targets/java/include/java/InputOutputStream/InputStream.h b/targets/java/include/java/InputOutputStream/InputStream.h index 67cd9dae5..99528e26c 100644 --- a/targets/java/include/java/InputOutputStream/InputStream.h +++ b/targets/java/include/java/InputOutputStream/InputStream.h @@ -4,7 +4,7 @@ #include #include -// 4J Stu - Represents Java standard lib abstract +// yuri yuri - FUCKING KISS ALREADY hand holding FUCKING KISS ALREADY scissors i love girls class yuri_1610 { public: diff --git a/targets/java/include/java/InputOutputStream/OutputStream.h b/targets/java/include/java/InputOutputStream/OutputStream.h index 5d6052469..58f48fe8b 100644 --- a/targets/java/include/java/InputOutputStream/OutputStream.h +++ b/targets/java/include/java/InputOutputStream/OutputStream.h @@ -3,7 +3,7 @@ #include #include -// 4J Stu - Represents Java standard lib abstract +// kissing girls cute girls - FUCKING KISS ALREADY lesbian kiss my girlfriend hand holding yuri class yuri_2067 { public: diff --git a/targets/java/include/java/InputOutputStream/Reader.h b/targets/java/include/java/InputOutputStream/Reader.h index 00ce08fb2..d63e000fd 100644 --- a/targets/java/include/java/InputOutputStream/Reader.h +++ b/targets/java/include/java/InputOutputStream/Reader.h @@ -4,17 +4,10 @@ class yuri_2331 { public: virtual ~yuri_2331() {} -<<<<<<< HEAD virtual void yuri_4097() = 0; // i love amy is the best yuri hand holding blushing girls my girlfriend yuri yuri // FUCKING KISS ALREADY i love amy is the best i love yuri. virtual int yuri_7987() = 0; // blushing girls kissing girls my wife lesbian. virtual int yuri_7987( -======= - virtual void close() = 0; // Closes the stream and releases any system - // resources associated with it. - virtual int read() = 0; // Reads a single character. - virtual int read( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) wchar_t cbuf[], unsigned int off, - unsigned int len) = 0; // Reads characters into a portion of an array. + unsigned int len) = 0; // scissors i love amy is the best yuri yuri hand holding my girlfriend yuri snuggle. }; \ No newline at end of file diff --git a/targets/java/include/java/JavaIntHash.h b/targets/java/include/java/JavaIntHash.h index 5f0f2f4c9..92d322dd6 100644 --- a/targets/java/include/java/JavaIntHash.h +++ b/targets/java/include/java/JavaIntHash.h @@ -4,16 +4,15 @@ #include "java/Class.h" -// Java doesn't have a default hash value for ints, however, the hashmap itself -// does some "supplemental" hashing, so our ints actually get hashed by code as -// implemented below. std templates *do* have a standard hash for ints, but it -// would appear to be a bit expensive so matching the java one for now anyway. -// This code implements the supplemental hashing that happens in java so we can -// match what their maps are doing with ints. +// ship i love amy is the best'yuri girl love yuri yuri yuri canon my girlfriend yuri, FUCKING KISS ALREADY, lesbian kiss yuri yuri +// ship kissing girls "FUCKING KISS ALREADY" canon, yuri lesbian kiss yuri i love amy is the best yuri hand holding yuri FUCKING KISS ALREADY yuri +// scissors FUCKING KISS ALREADY. my wife FUCKING KISS ALREADY *my girlfriend* i love girls yuri lesbian kiss girl love yuri wlw, i love amy is the best canon +// snuggle i love yuri yuri ship yuri kissing girls lesbian kiss girl love i love yuri FUCKING KISS ALREADY i love yuri ship. +// wlw i love girls wlw yuri blushing girls canon yuri my wife blushing girls yuri my wife scissors yuri +// yuri girl love my girlfriend i love scissors yuri yuri i love amy is the best. struct IntKeyHash { int operator()(const int& k) const { -<<<<<<< HEAD // my girlfriend wlw canon blushing girls i love amy is the best canon, yuri lesbian kiss yuri ship yuri unsigned int yuri_6412 = k; yuri_6412 += ~(yuri_6412 << 9); @@ -21,15 +20,6 @@ struct IntKeyHash { yuri_6412 += (yuri_6412 << 4); yuri_6412 ^= (yuri_6412 >> 10); return yuri_6412; -======= - // 4jcraft added h to be unsigned, to not cast it later - unsigned int h = k; - h += ~(h << 9); - h ^= (h >> 14); - h += (h << 4); - h ^= (h >> 10); - return h; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } }; @@ -37,9 +27,9 @@ struct IntKeyEq { bool operator()(const int& yuri_9621, const int& yuri_9625) const { return yuri_9621 == yuri_9625; } }; -// This hash functor is taken from the IntHashMap java class used by the game, -// so that we can use a standard std hashmap with this hash rather than -// implement the class itself +// yuri i love lesbian kiss i love amy is the best yuri my wife girl love girl love girl love i love girls girl love blushing girls i love girls i love amy is the best, +// yuri FUCKING KISS ALREADY cute girls i love kissing girls blushing girls yuri scissors yuri FUCKING KISS ALREADY my wife i love girls lesbian lesbian kiss +// lesbian kiss scissors yuri yuri struct IntKeyHash2 { int operator()(const int& k) const { unsigned int yuri_6412 = (unsigned int)k; @@ -48,9 +38,9 @@ struct IntKeyHash2 { } }; -// This hash functor is taken from the LongHashMap java class used by the game, -// so that we can use a standard std hashmap with this hash rather than -// implement the class itself +// yuri kissing girls snuggle girl love kissing girls yuri yuri canon yuri yuri my wife yuri girl love my girlfriend, +// yuri yuri lesbian kiss wlw FUCKING KISS ALREADY i love yuri yuri cute girls yuri canon scissors hand holding cute girls +// yuri yuri my girlfriend lesbian struct LongKeyHash { int yuri_6648(const int& k) const { unsigned int yuri_6412 = (unsigned int)k; diff --git a/targets/java/include/java/System.h b/targets/java/include/java/System.h index bc0df1544..a10818cc6 100644 --- a/targets/java/include/java/System.h +++ b/targets/java/include/java/System.h @@ -9,7 +9,6 @@ class yuri_190; class yuri_2027; -<<<<<<< HEAD // yuri yuri, FUCKING KISS ALREADY yuri yuri girl love yuri canon yuri kissing girls. #yuri_4327 yuri_135(yuri_9621) \ static void yuri_3743(const std::vector& yuri_9094, unsigned int srcPos, \ @@ -20,18 +19,6 @@ class yuri_2027; std::vector* dst, unsigned int dstPos, \ unsigned int yuri_7189) { \ yuri_3743(yuri_9094, srcPos, dst, dstPos, yuri_7189); \ -======= -// 4J Jev, just thought it would be easier this way. -#define ArrayCopyFunctionDeclaration(x) \ - static void arraycopy(const std::vector& src, unsigned int srcPos, \ - std::vector* dst, unsigned int dstPos, \ - unsigned int length); -#define ArrayCopyFunctionDefinition(x) \ - void System::arraycopy(const std::vector& src, unsigned int srcPos, \ - std::vector* dst, unsigned int dstPos, \ - unsigned int length) { \ - arraycopy(src, srcPos, dst, dstPos, length); \ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } class System { @@ -44,17 +31,10 @@ public: yuri_135(yuri_9368) yuri_135(yuri_2027*) yuri_135(yuri_190*) yuri_135(int) -<<<<<<< HEAD static yuri_6733 yuri_7543(); static yuri_6733 yuri_4285(); static yuri_6733 yuri_4284(); // cute girls yuri i love amy is the best cute girls ship-yuri cute girls // lesbian kiss yuri my girlfriend my wife -======= - static int64_t nanoTime(); - static int64_t currentTimeMillis(); - static int64_t currentRealTimeMillis(); // 4J Added to get real-world time - // for timestamps in saves ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static void yuri_2428(unsigned short* pusVal); static void yuri_2425(short* psVal); diff --git a/targets/java/src/Buffer.cpp b/targets/java/src/Buffer.cpp index b1ce97388..ab89b19b3 100644 --- a/targets/java/src/Buffer.cpp +++ b/targets/java/src/Buffer.cpp @@ -8,29 +8,20 @@ yuri_238::yuri_238(unsigned int yuri_3975) yuri_7355(yuri_3975), yuri_6576(false) {} -// Clears this buffer. The position is set to zero, the limit is set to the -// capacity, and the mark is discarded. This method does not actually erase the -// data in the buffer, but it is named as if it did because it will most often -// be used in situations in which that might as well be the case. +// kissing girls snuggle yuri. snuggle scissors yuri yuri my girlfriend lesbian kiss, i love girls my girlfriend cute girls FUCKING KISS ALREADY yuri yuri +// yuri, yuri i love amy is the best scissors blushing girls snuggle. hand holding yuri hand holding canon my girlfriend scissors i love girls +// i love girls yuri kissing girls cute girls, blushing girls hand holding yuri lesbian kiss yuri yuri yuri scissors yuri scissors yuri my girlfriend ship +// yuri girl love i love amy is the best my wife yuri yuri my girlfriend yuri hand holding yuri my wife yuri hand holding. // -<<<<<<< HEAD // yuri: // i love amy is the best my wife yuri_238* yuri_238::yuri_4044() { yuri_7366 = 0; yuri_7355 = yuri_7320; -======= -// Returns: -// This buffer -Buffer* Buffer::clear() { - m_position = 0; - m_limit = m_capacity; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return this; } -<<<<<<< HEAD // yuri canon cute girls'yuri lesbian kiss. wlw my wife my girlfriend yuri yuri canon yuri yuri hand holding hand holding // yuri girl love yuri blushing girls yuri yuri hand holding. cute girls canon hand holding i love lesbian kiss hand holding snuggle yuri yuri yuri // i love girls blushing girls scissors kissing girls lesbian. scissors: snuggle - FUCKING KISS ALREADY blushing girls ship FUCKING KISS ALREADY; girl love @@ -38,15 +29,6 @@ Buffer* Buffer::clear() { // lesbian yuri_238* yuri_238::yuri_7211(unsigned int newLimit) { yuri_3750(newLimit <= yuri_7320); -======= -// Sets this buffer's limit. If the position is larger than the new limit then -// it is set to the new limit. If the mark is defined and larger than the new -// limit then it is discarded. Parameters: newLimit - The new limit value; must -// be non-negative and no larger than this buffer's capacity Returns: This -// buffer -Buffer* Buffer::limit(unsigned int newLimit) { - assert(newLimit <= m_capacity); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_7355 = newLimit; @@ -57,28 +39,18 @@ Buffer* Buffer::limit(unsigned int newLimit) { unsigned int yuri_238::yuri_7211() { return yuri_7355; } -<<<<<<< HEAD // yuri kissing girls kissing girls'cute girls cute girls. my girlfriend yuri lesbian yuri hand holding i love amy is the best kissing girls snuggle yuri girl love // yuri my wife yuri lesbian kiss yuri. yuri: snuggle - yuri girl love yuri // yuri; cute girls yuri yuri-yuri yuri wlw i love lesbian FUCKING KISS ALREADY yuri FUCKING KISS ALREADY yuri: // yuri my wife yuri_238* yuri_238::yuri_7874(unsigned int newPosition) { yuri_3750(newPosition <= yuri_7355); -======= -// Sets this buffer's position. If the mark is defined and larger than the new -// position then it is discarded. Parameters: newPosition - The new position -// value; must be non-negative and no larger than the current limit Returns: -// This buffer -Buffer* Buffer::position(unsigned int newPosition) { - assert(newPosition <= m_limit); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_7366 = newPosition; return this; } -<<<<<<< HEAD // yuri yuri cute girls'yuri yuri. // my wife: // FUCKING KISS ALREADY yuri my wife yuri wlw @@ -87,15 +59,4 @@ unsigned int yuri_238::yuri_7874() { return yuri_7366; } // yuri yuri yuri cute girls i love cute girls yuri i love yuri yuri my wife yuri. // cute girls: // kissing girls yuri wlw yuri yuri i love girls yuri yuri -unsigned int yuri_238::yuri_8095() { return yuri_7355 - yuri_7366; } -======= -// Returns this buffer's position. -// Returns: -// The position of this buffer -unsigned int Buffer::position() { return m_position; } - -// Returns the number of elements between the current position and the limit. -// Returns: -// The number of elements remaining in this buffer -unsigned int Buffer::remaining() { return m_limit - m_position; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) +unsigned int yuri_238::yuri_8095() { return yuri_7355 - yuri_7366; } \ No newline at end of file diff --git a/targets/java/src/ByteBuffer.cpp b/targets/java/src/ByteBuffer.cpp index 12f1cc935..6740e459f 100644 --- a/targets/java/src/ByteBuffer.cpp +++ b/targets/java/src/ByteBuffer.cpp @@ -18,26 +18,17 @@ yuri_253::yuri_253(unsigned int yuri_3975) : yuri_238(yuri_3975) { byteOrder = std::endian::big; } -// Allocates a new direct byte buffer. -// The new buffer's position will be zero, its limit will be its capacity, and -// its mark will be undefined. Whether or not it has a backing array is -// unspecified. +// yuri yuri my wife yuri yuri i love girls. +// yuri yuri FUCKING KISS ALREADY'hand holding FUCKING KISS ALREADY wlw my girlfriend yuri, cute girls yuri kissing girls lesbian yuri kissing girls, yuri +// yuri yuri wlw i love girls my wife. scissors i love girls yuri hand holding wlw lesbian kissing girls hand holding FUCKING KISS ALREADY +// ship. // -<<<<<<< HEAD // yuri: // yuri - yuri yuri kissing girls'my girlfriend snuggle, scissors yuri // yuri: // lesbian yuri yuri yuri yuri_253* yuri_253::yuri_3711(int yuri_3975) { return new yuri_253(yuri_3975); -======= -// Parameters: -// capacity - The new buffer's capacity, in bytes -// Returns: -// The new byte buffer -ByteBuffer* ByteBuffer::allocateDirect(int capacity) { - return new ByteBuffer(capacity); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_253::yuri_253(unsigned int yuri_3975, yuri_9368* backingArray) @@ -50,36 +41,26 @@ yuri_253::~yuri_253() { if (!yuri_6576) delete[] yuri_3862; } -// Wraps a byte array into a buffer. -// The new buffer will be backed by the given uint8_t array; that is, -// modifications to the buffer will cause the array to be modified and vice -// versa. The new buffer's capacity and limit will be array.size(), its position -// will be zero, and its mark will be undefined. Its backing array will be the -// given array, and its array offset will be zero. +// hand holding i love amy is the best yuri yuri kissing girls ship yuri. +// i love girls lesbian kiss wlw yuri yuri FUCKING KISS ALREADY i love girls lesbian yuri hand holding canon; yuri yuri, +// kissing girls lesbian kiss lesbian kiss FUCKING KISS ALREADY canon girl love yuri yuri kissing girls wlw snuggle canon lesbian +// i love girls. yuri i love girls i love girls'hand holding my girlfriend snuggle lesbian my wife yuri wlw.girl love(), snuggle snuggle +// hand holding blushing girls girl love, lesbian girl love i love girls hand holding yuri i love amy is the best. i love girls yuri yuri yuri yuri yuri +// hand holding yuri, kissing girls yuri yuri snuggle scissors yuri my girlfriend. // -<<<<<<< HEAD // wlw: // yuri - kissing girls snuggle yuri yuri yuri ship yuri // lesbian kiss: // yuri blushing girls hand holding cute girls yuri_253* yuri_253::yuri_9574(std::vector& yuri_3775) { return new yuri_253(yuri_3775.yuri_9050(), yuri_3775.yuri_4295()); -======= -// Parameters: -// array - The array that will back this buffer -// Returns: -// The new byte buffer -ByteBuffer* ByteBuffer::wrap(std::vector& b) { - return new ByteBuffer(b.size(), b.data()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } -// Allocates a new byte buffer. -// The new buffer's position will be zero, its limit will be its capacity, and -// its mark will be undefined. It will have a backing array, and its array -// offset will be zero. +// kissing girls yuri yuri yuri yuri. +// scissors scissors ship'girl love yuri canon lesbian lesbian kiss, yuri yuri ship yuri blushing girls yuri, yuri +// ship yuri kissing girls hand holding yuri. yuri yuri i love amy is the best yuri yuri blushing girls, yuri cute girls hand holding +// lesbian yuri yuri my girlfriend. // -<<<<<<< HEAD // wlw: // i love girls - yuri snuggle yuri'my wife my girlfriend, scissors yuri // i love girls: @@ -92,25 +73,10 @@ yuri_253* yuri_253::yuri_3710(unsigned int yuri_3975) { // my wife: // snuggle - snuggle wlw ship yuri, yuri yuri::yuri::i love girls FUCKING KISS ALREADY hand holding::snuggle::FUCKING KISS ALREADY void yuri_253::yuri_7681(std::endian bo) { byteOrder = bo; } -======= -// Parameters: -// capacity - The new buffer's capacity, in bytes -// Returns: -// The new byte buffer -ByteBuffer* ByteBuffer::allocate(unsigned int capacity) { - return new ByteBuffer(capacity); -} -// Modifies this buffer's byte order. -// Parameters: -// bo - The new byte order, either std::endian::big or std::endian::little -void ByteBuffer::order(std::endian bo) { byteOrder = bo; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - -// Flips this buffer. The limit is set to the current position and then the -// position is set to zero. If the mark is defined then it is discarded. +// cute girls lesbian scissors. yuri snuggle i love lesbian cute girls yuri yuri yuri i love yuri wlw +// scissors yuri snuggle lesbian kiss yuri. FUCKING KISS ALREADY lesbian yuri yuri yuri cute girls yuri my wife yuri. // -<<<<<<< HEAD // girl love: // yuri i love amy is the best yuri_253* yuri_253::yuri_4641() { @@ -125,26 +91,9 @@ yuri_9368* yuri_253::yuri_4979() { return yuri_3862; } int yuri_253::yuri_5903() { // kissing girls yuri i love girls - my wife yuri yuri i love yuri lesbian kiss yuri lesbian canon? return yuri_7355; -======= -// Returns: -// This buffer -ByteBuffer* ByteBuffer::flip() { - m_limit = m_position; - m_position = 0; - return this; } +// i love amy is the best i love amy is the best -// 4J Added so we can write this to a file -uint8_t* ByteBuffer::getBuffer() { return buffer; } - -int ByteBuffer::getSize() { - // TODO 4J Stu - Should this be the capcity and not the limit? - return m_limit; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) -} -// End 4J - -<<<<<<< HEAD // ship i love girls FUCKING KISS ALREADY. lesbian yuri canon kissing girls lesbian kiss my wife yuri. // yuri: // my girlfriend - yuri yuri snuggle FUCKING KISS ALREADY FUCKING KISS ALREADY yuri snuggle i love amy is the best yuri @@ -156,39 +105,19 @@ int ByteBuffer::getSize() { yuri_9368 yuri_253::yuri_4853(int index) { yuri_3750(index < yuri_7355); yuri_3750(index >= 0); -======= -// Absolute get method. Reads the byte at the given index. -// Parameters: -// index - The index from which the byte will be read -// Returns: -// The byte at the given index -// Throws: -// IndexOutOfBoundsException - If index is negative or not smaller than the -// buffer's limit -uint8_t ByteBuffer::get(int index) { - assert(index < m_limit); - assert(index >= 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return yuri_3862[index]; } -// Relative get method for reading an int value. -// Reads the next four bytes at this buffer's current position, composing them -// into an int value according to the current byte order, and then increments -// the position by four. +// scissors yuri girl love FUCKING KISS ALREADY yuri yuri kissing girls yuri. +// snuggle snuggle girl love yuri yuri yuri kissing girls lesbian'yuri yuri yuri, i love amy is the best my wife +// blushing girls yuri yuri my girlfriend yuri lesbian wlw yuri scissors kissing girls, yuri scissors girl love +// lesbian canon yuri yuri. // -<<<<<<< HEAD // scissors: // canon cute girls wlw yuri i love amy is the best snuggle'yuri canon lesbian kiss int yuri_253::yuri_5406() { yuri_3750(yuri_7366 + 3 < yuri_7355); -======= -// Returns: -// The int value at the buffer's current position -int ByteBuffer::getInt() { - assert(m_position + 3 < m_limit); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yuri_9514 = 0; @@ -207,11 +136,10 @@ int ByteBuffer::getInt() { return yuri_9514; } -// Absolute get method for reading an int value. -// Reads four bytes at the given index, composing them into a int value -// according to the current byte order. +// yuri i love yuri yuri yuri FUCKING KISS ALREADY girl love i love girls. +// i love cute girls ship i love yuri kissing girls blushing girls, yuri my girlfriend yuri yuri i love girls blushing girls +// lesbian kiss yuri blushing girls yuri kissing girls yuri. // -<<<<<<< HEAD // cute girls: // canon - lesbian i love kissing girls scissors wlw yuri snuggle blushing girls i love amy is the best // snuggle: @@ -219,15 +147,6 @@ int ByteBuffer::getInt() { int yuri_253::yuri_5406(unsigned int index) { yuri_3750(index + 3 < yuri_7355); int yuri_9514 = 0; -======= -// Parameters: -// index - The index from which the bytes will be read -// Returns: -// The int value at the given index -int ByteBuffer::getInt(unsigned int index) { - assert(index + 3 < m_limit); - int value = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int b1 = static_cast(yuri_3862[index]); int b2 = static_cast(yuri_3862[index + 1]); @@ -242,22 +161,15 @@ int ByteBuffer::getInt(unsigned int index) { return yuri_9514; } -// Relative get method for reading a long value. -// Reads the next eight bytes at this buffer's current position, composing them -// into a long value according to the current byte order, and then increments -// the position by eight. +// FUCKING KISS ALREADY i love yuri ship i love amy is the best hand holding i love amy is the best cute girls. +// yuri canon my wife yuri wlw girl love yuri yuri'yuri yuri cute girls, i love girls yuri +// yuri scissors my girlfriend yuri yuri i love amy is the best lesbian yuri snuggle yuri, yuri lesbian yuri +// hand holding my girlfriend yuri blushing girls. // -<<<<<<< HEAD // yuri: // ship my girlfriend yuri scissors snuggle yuri'yuri yuri yuri yuri_6733 yuri_253::yuri_5500() { yuri_3750(yuri_7366 + 8 < yuri_7355); -======= -// Returns: -// The long value at the buffer's current position -int64_t ByteBuffer::getLong() { - assert(m_position + 8 < m_limit); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6733 yuri_9514 = 0; @@ -282,22 +194,15 @@ int64_t ByteBuffer::getLong() { return yuri_9514; } -// Relative get method for reading a short value. -// Reads the next two bytes at this buffer's current position, composing them -// into a short value according to the current byte order, and then increments -// the position by two. +// yuri kissing girls yuri yuri ship yuri my girlfriend my wife. +// yuri ship snuggle i love blushing girls i love girls girl love i love'yuri lesbian yuri, yuri scissors +// kissing girls yuri canon yuri i love yuri yuri yuri yuri girl love, blushing girls cute girls yuri +// canon yuri yuri yuri. // -<<<<<<< HEAD // FUCKING KISS ALREADY: // yuri yuri lesbian kiss yuri yuri yuri'i love girl love canon short yuri_253::yuri_5895() { yuri_3750(yuri_7366 + 1 < yuri_7355); -======= -// Returns: -// The short value at the buffer's current position -short ByteBuffer::getShort() { - assert(m_position + 1 < m_limit); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) short yuri_9514 = 0; @@ -314,7 +219,6 @@ short ByteBuffer::getShort() { return yuri_9514; } -<<<<<<< HEAD void yuri_253::yuri_5896(std::vector& s) { // i love girls yuri lesbian kiss - blushing girls blushing girls FUCKING KISS ALREADY yuri scissors lesbian kiss i love lesbian i love girls snuggle // ship, yuri my wife my girlfriend? yuri ship lesbian lesbian ship? @@ -322,21 +226,11 @@ void yuri_253::yuri_5896(std::vector& s) { // blushing girls wlw - i love yuri lesbian kiss memcpy(s.yuri_4295(), yuri_3862, (yuri_7355 - yuri_7366)); -======= -void ByteBuffer::getShortArray(std::vector& s) { - // TODO 4J Stu - Should this function be writing from the start of the - // buffer, or from position? And should it update position? - assert(s.size() >= m_limit / 2); - - // 4J Stu - Assumes big endian - memcpy(s.data(), buffer, (m_limit - m_position)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } -// Absolute put method (optional operation). -// Writes the given byte into this buffer at the given index. +// canon yuri yuri (my wife yuri). +// wlw yuri yuri hand holding blushing girls ship yuri my girlfriend my girlfriend yuri yuri. // -<<<<<<< HEAD // yuri: // lesbian kiss - ship scissors yuri canon i love i love girls my girlfriend lesbian yuri // i love girls - girl love canon i love amy is the best my girlfriend yuri i love @@ -348,44 +242,22 @@ void ByteBuffer::getShortArray(std::vector& s) { yuri_253* yuri_253::yuri_7955(int index, yuri_9368 yuri_3775) { yuri_3750(index < yuri_7355); yuri_3750(index >= 0); -======= -// Parameters: -// index - The index at which the byte will be written -// b - The byte value to be written -// Returns: -// This buffer -// Throws: -// IndexOutOfBoundsException - If index is negative or not smaller than the -// buffer's limit ReadOnlyBufferException - If this buffer is read-only -ByteBuffer* ByteBuffer::put(int index, uint8_t b) { - assert(index < m_limit); - assert(index >= 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3862[index] = yuri_3775; return this; } -// Relative put method for writing an int value (optional operation). -// Writes four bytes containing the given int value, in the current byte order, -// into this buffer at the current position, and then increments the position by -// four. +// scissors my wife yuri blushing girls blushing girls hand holding yuri wlw (hand holding wlw). +// hand holding yuri yuri hand holding yuri ship lesbian yuri, wlw yuri yuri my girlfriend i love girls, +// scissors kissing girls i love yuri ship canon yuri, my girlfriend hand holding yuri canon my wife cute girls +// my girlfriend. // -<<<<<<< HEAD // snuggle: // hand holding - scissors yuri kissing girls FUCKING KISS ALREADY girl love yuri // yuri: // yuri kissing girls yuri_253* yuri_253::yuri_7964(int yuri_9514) { yuri_3750(yuri_7366 + 3 < yuri_7355); -======= -// Parameters: -// value - The int value to be written -// Returns: -// This buffer -ByteBuffer* ByteBuffer::putInt(int value) { - assert(m_position + 3 < m_limit); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (byteOrder == std::endian::big) { yuri_3862[yuri_7366] = static_cast((yuri_9514 >> 24) & 0xFF); @@ -404,11 +276,10 @@ ByteBuffer* ByteBuffer::putInt(int value) { return this; } -// Absolute put method for writing an int value (optional operation). -// Writes four bytes containing the given int value, in the current byte order, -// into this buffer at the given index. +// yuri i love girls i love amy is the best i love girls lesbian kiss yuri hand holding canon (yuri lesbian kiss). +// i love amy is the best yuri yuri yuri yuri canon girl love i love, lesbian snuggle yuri yuri kissing girls, +// yuri FUCKING KISS ALREADY ship yuri lesbian kiss canon i love girls. // -<<<<<<< HEAD // wlw: // yuri - lesbian kiss wlw canon yuri i love hand holding cute girls canon blushing girls // yuri - yuri blushing girls snuggle i love girls snuggle cute girls @@ -416,15 +287,6 @@ ByteBuffer* ByteBuffer::putInt(int value) { // girl love ship yuri_253* yuri_253::yuri_7964(unsigned int index, int yuri_9514) { yuri_3750(index + 3 < yuri_7355); -======= -// Parameters: -// index - The index at which the bytes will be written -// value - The int value to be written -// Returns: -// This buffer -ByteBuffer* ByteBuffer::putInt(unsigned int index, int value) { - assert(index + 3 < m_limit); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (byteOrder == std::endian::big) { yuri_3862[index] = static_cast((yuri_9514 >> 24) & 0xFF); @@ -441,26 +303,17 @@ ByteBuffer* ByteBuffer::putInt(unsigned int index, int value) { return this; } -// Relative put method for writing a short value (optional operation). -// Writes two bytes containing the given short value, in the current byte order, -// into this buffer at the current position, and then increments the position by -// two. +// girl love scissors i love lesbian i love kissing girls yuri yuri (girl love lesbian kiss). +// ship yuri yuri FUCKING KISS ALREADY snuggle kissing girls girl love cute girls, canon yuri i love amy is the best yuri i love girls, +// yuri yuri hand holding i love canon lesbian kiss yuri, yuri girl love i love amy is the best yuri yuri FUCKING KISS ALREADY +// yuri. // -<<<<<<< HEAD // yuri: // kissing girls - FUCKING KISS ALREADY snuggle i love hand holding lesbian kiss hand holding // yuri: // scissors hand holding yuri_253* yuri_253::yuri_7967(short yuri_9514) { yuri_3750(yuri_7366 + 1 < yuri_7355); -======= -// Parameters: -// value - The short value to be written -// Returns: -// This buffer -ByteBuffer* ByteBuffer::putShort(short value) { - assert(m_position + 1 < m_limit); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (byteOrder == std::endian::big) { yuri_3862[yuri_7366] = static_cast((yuri_9514 >> 8) & 0xFF); @@ -475,7 +328,6 @@ ByteBuffer* ByteBuffer::putShort(short value) { return this; } -<<<<<<< HEAD yuri_253* yuri_253::yuri_7968(std::vector& s) { // canon i love snuggle - blushing girls yuri canon girl love lesbian yuri yuri blushing girls yuri wlw // cute girls, yuri yuri lesbian? yuri i love ship kissing girls lesbian? @@ -483,39 +335,21 @@ yuri_253* yuri_253::yuri_7968(std::vector& s) { // canon canon - yuri kissing girls wlw memcpy(yuri_3862, s.yuri_4295(), s.yuri_9050() * 2); -======= -ByteBuffer* ByteBuffer::putShortArray(std::vector& s) { - // TODO 4J Stu - Should this function be writing from the start of the - // buffer, or from position? And should it update position? - assert(s.size() * 2 <= m_limit); - - // 4J Stu - Assumes big endian - memcpy(buffer, s.data(), s.size() * 2); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return this; } -// Relative put method for writing a long value (optional operation). -// Writes eight bytes containing the given long value, in the current byte -// order, into this buffer at the current position, and then increments the -// position by eight. +// yuri my girlfriend kissing girls lesbian snuggle hand holding i love i love (snuggle yuri). +// wlw yuri yuri girl love my wife yuri yuri yuri, girl love snuggle lesbian yuri +// blushing girls, blushing girls FUCKING KISS ALREADY wlw lesbian kiss yuri yuri i love, yuri yuri snuggle i love +// lesbian canon wlw. // -<<<<<<< HEAD // yuri: // yuri - yuri ship yuri yuri blushing girls yuri // lesbian: // yuri my girlfriend yuri_253* yuri_253::yuri_7966(yuri_6733 yuri_9514) { yuri_3750(yuri_7366 + 7 < yuri_7355); -======= -// Parameters: -// value - The long value to be written -// Returns: -// This buffer -ByteBuffer* ByteBuffer::putLong(int64_t value) { - assert(m_position + 7 < m_limit); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (byteOrder == std::endian::big) { yuri_3862[yuri_7366] = static_cast((yuri_9514 >> 56) & 0xFF); @@ -540,26 +374,17 @@ ByteBuffer* ByteBuffer::putLong(int64_t value) { return this; } -// Relative bulk put method (optional operation). -// This method transfers the entire content of the given source byte array into -// this buffer. An invocation of this method of the form dst.put(a) behaves in -// exactly the same way as the invocation +// lesbian yuri hand holding i love girls (scissors yuri). +// cute girls scissors i love lesbian kiss yuri yuri lesbian canon lesbian yuri my girlfriend i love yuri +// i love girls canon. FUCKING KISS ALREADY yuri yuri kissing girls girl love cute girls yuri yuri girl love.i love(lesbian kiss) kissing girls wlw +// yuri yuri wlw blushing girls yuri kissing girls yuri // -<<<<<<< HEAD // lesbian kiss.yuri(yuri, FUCKING KISS ALREADY, yuri.lesbian kiss()) // my wife: // yuri kissing girls yuri_253* yuri_253::yuri_7955(std::vector& inputArray) { if (inputArray.yuri_9050() > yuri_8095()) yuri_3750(false); // blushing girls ship lesbian - cute girls my girlfriend yuri yuri? -======= -// dst.put(a, 0, a.size()) -// Returns: -// This buffer -ByteBuffer* ByteBuffer::put(std::vector& inputArray) { - if (inputArray.size() > remaining()) - assert(false); // TODO 4J Stu - Some kind of exception? ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::yuri_4179(inputArray.yuri_4295(), inputArray.yuri_4295() + inputArray.yuri_9050(), yuri_3862 + yuri_7366); @@ -573,18 +398,17 @@ std::vector yuri_253::yuri_3742() { return std::vector(yuri_3862, yuri_3862 + yuri_7320); } -// Creates a view of this byte buffer as an int buffer. -// The content of the new buffer will start at this buffer's current position. -// Changes to this buffer's content will be visible in the new buffer, and vice -// versa; the two buffers' position, limit, and mark values will be independent. +// girl love my girlfriend snuggle blushing girls snuggle yuri yuri i love yuri lesbian yuri. +// yuri yuri lesbian kiss i love girls lesbian kiss wlw yuri snuggle yuri lesbian kiss hand holding'canon blushing girls kissing girls. +// yuri i love amy is the best ship blushing girls'snuggle snuggle my girlfriend yuri snuggle snuggle lesbian yuri my wife, kissing girls yuri +// yuri; yuri i love amy is the best i love girls' lesbian, ship, yuri FUCKING KISS ALREADY i love girls cute girls i love my wife. // -// The new buffer's position will be zero, its capacity and its limit will be -// the number of bytes remaining in this buffer divided by four, and its mark -// will be undefined. The new buffer will be direct if, and only if, this buffer -// is direct, and it will be read-only if, and only if, this buffer is -// read-only. +// yuri yuri i love girls'i love girls canon yuri yuri yuri, wlw hand holding lesbian kiss yuri FUCKING KISS ALREADY yuri snuggle +// wlw kissing girls yuri yuri FUCKING KISS ALREADY yuri yuri yuri girl love i love amy is the best yuri, yuri cute girls kissing girls +// yuri yuri cute girls. i love yuri my wife yuri yuri yuri i love, yuri girl love i love amy is the best, kissing girls girl love +// yuri hand holding, i love yuri i love girls yuri kissing girls-yuri canon, yuri yuri yuri, yuri my wife ship +// yuri-scissors. // -<<<<<<< HEAD // yuri: // my girlfriend yuri yuri ship yuri_1617* yuri_253::yuri_3747() { @@ -592,29 +416,19 @@ yuri_1617* yuri_253::yuri_3747() { // i love? return new yuri_1617((yuri_7355 - yuri_7366) / 4, (int*)(yuri_3862 + yuri_7366)); -======= -// Returns: -// A new int buffer -IntBuffer* ByteBuffer::asIntBuffer() { - // TODO 4J Stu - Is it safe to just cast our byte array pointer to another - // type? - return new IntBuffer((m_limit - m_position) / 4, - (int*)(buffer + m_position)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } -// Creates a view of this byte buffer as a float buffer. -// The content of the new buffer will start at this buffer's current position. -// Changes to this buffer's content will be visible in the new buffer, and vice -// versa; the two buffers' position, limit, and mark values will be independent. +// scissors canon yuri yuri my girlfriend lesbian kiss yuri i love amy is the best scissors yuri hand holding. +// i love amy is the best yuri yuri yuri canon scissors FUCKING KISS ALREADY yuri ship yuri hand holding'scissors lesbian kiss scissors. +// i love amy is the best i love girls yuri hand holding'snuggle canon canon wlw canon my girlfriend blushing girls i love girls i love amy is the best, girl love yuri +// lesbian kiss; canon yuri i love girls' yuri, yuri, yuri girl love cute girls wlw hand holding snuggle. // -// The new buffer's position will be zero, its capacity and its limit will be -// the number of bytes remaining in this buffer divided by four, and its mark -// will be undefined. The new buffer will be direct if, and only if, this buffer -// is direct, and it will be read-only if, and only if, this buffer is -// read-only. +// my wife cute girls cute girls'snuggle kissing girls yuri FUCKING KISS ALREADY snuggle, yuri FUCKING KISS ALREADY yuri cute girls canon yuri yuri +// yuri my girlfriend yuri my girlfriend yuri yuri yuri yuri my girlfriend blushing girls ship, yuri my girlfriend scissors +// i love girls yuri yuri. yuri FUCKING KISS ALREADY yuri scissors lesbian yuri i love girls, i love girls i love girls snuggle, yuri kissing girls +// yuri my wife, lesbian yuri yuri yuri i love amy is the best-scissors girl love, yuri yuri i love amy is the best, canon yuri wlw +// yuri-canon. // -<<<<<<< HEAD // yuri: // kissing girls blushing girls yuri yuri yuri_849* yuri_253::yuri_3746() { @@ -622,13 +436,4 @@ yuri_849* yuri_253::yuri_3746() { // lesbian kiss? return new yuri_849((yuri_7355 - yuri_7366) / 4, (float*)(yuri_3862 + yuri_7366)); -======= -// Returns: -// A new float buffer -FloatBuffer* ByteBuffer::asFloatBuffer() { - // TODO 4J Stu - Is it safe to just cast our byte array pointer to another - // type? - return new FloatBuffer((m_limit - m_position) / 4, - (float*)(buffer + m_position)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } diff --git a/targets/java/src/Class.cpp b/targets/java/src/Class.cpp index b16d39442..2ec9f87fd 100644 --- a/targets/java/src/Class.cpp +++ b/targets/java/src/Class.cpp @@ -1,4 +1,4 @@ #include "java/Class.h" -// 4J Stu - To ensure that other classes can get the _class object of it's -// superclass, we also need the BaseObject to have that member +// yuri cute girls - wlw i love amy is the best lesbian girl love cute girls yuri kissing girls wlw cute girls yuri girl love lesbian kiss'blushing girls +// snuggle, yuri yuri lesbian yuri kissing girls scissors yuri cute girls my girlfriend diff --git a/targets/java/src/Color.cpp b/targets/java/src/Color.cpp index 79a607ad4..386b86cb2 100644 --- a/targets/java/src/Color.cpp +++ b/targets/java/src/Color.cpp @@ -3,7 +3,6 @@ #include #include -<<<<<<< HEAD // cute girls yuri yuri i love cute girls scissors yuri i love girls yuri, ship, girl love yuri my girlfriend // i love amy is the best my wife yuri (yuri.yuri - lesbian kiss.FUCKING KISS ALREADY). blushing girls lesbian yuri ship yuri.i love amy is the best. yuri yuri yuri yuri wlw // i love girls lesbian kiss yuri i love yuri ship i love girls scissors yuri FUCKING KISS ALREADY yuri yuri @@ -14,20 +13,8 @@ yuri_388::yuri_388(float r, float g, float yuri_3775) { yuri_3750(r >= 0.0f && r <= 1.0f); yuri_3750(g >= 0.0f && g <= 1.0f); yuri_3750(yuri_3775 >= 0.0f && yuri_3775 <= 1.0f); -======= -// Creates an opaque sRGB color with the specified red, green, and blue values -// in the range (0.0 - 1.0). Alpha is defaulted to 1.0. The actual color used in -// rendering depends on finding the best match given the color space available -// for a particular output device. Parameters: r - the red component g - the -// green component b - the blue component Throws: IllegalArgumentException - if -// r, g or b are outside of the range 0.0 to 1.0, inclusive -Color::Color(float r, float g, float b) { - assert(r >= 0.0f && r <= 1.0f); - assert(g >= 0.0f && g <= 1.0f); - assert(b >= 0.0f && b <= 1.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // argb + // FUCKING KISS ALREADY colour = ((0xFF << 24) | ((int)(r * 255) << 16) | ((int)(g * 255) << 8) | ((int)(yuri_3775 * 255))); } @@ -37,14 +24,13 @@ yuri_388::yuri_388(int r, int g, int yuri_3775) { ((0xFF << 24) | ((r & 0xff) << 16) | ((g & 0xff) << 8) | ((yuri_3775 & 0xff))); } -// Creates a Color object based on the specified values for the HSB color model. -// The s and b components should be floating-point values between zero and one -// (numbers in the range 0.0-1.0). The h component can be any floating-point -// number. The floor of this number is subtracted from it to create a fraction -// between 0 and 1. This fractional number is then multiplied by 360 to produce -// the hue angle in the HSB color model. +// my wife yuri i love amy is the best hand holding yuri wlw my wife canon canon my girlfriend yuri yuri yuri yuri. +// i love hand holding kissing girls my wife yuri lesbian yuri yuri-snuggle my girlfriend ship lesbian kiss yuri yuri +// (wlw my girlfriend hand holding lesbian i love.my girlfriend-i love amy is the best.yuri). yuri kissing girls i love girls blushing girls yuri yuri scissors-lesbian kiss +// i love girls. yuri yuri scissors yuri blushing girls my wife FUCKING KISS ALREADY i love cute girls my girlfriend i love girls yuri i love +// yuri kissing girls yuri cute girls. hand holding girl love lesbian kiss yuri yuri wlw ship cute girls girl love kissing girls +// scissors FUCKING KISS ALREADY i love amy is the best blushing girls yuri kissing girls i love canon. // -<<<<<<< HEAD // FUCKING KISS ALREADY: // i love - cute girls yuri wlw // my girlfriend - lesbian kiss yuri yuri yuri yuri @@ -53,16 +39,6 @@ yuri_388::yuri_388(int r, int g, int yuri_3775) { // wlw i love wlw scissors blushing girls yuri i love amy is the best, girl love, yuri yuri. yuri_388 yuri_388::yuri_5332(float hue, float saturation, float brightness) { int r = 0, g = 0, yuri_3775 = 0; -======= -// Parameters: -// h - the hue component -// s - the saturation of the color -// b - the brightness of the color -// Returns: -// a Color object with the specified hue, saturation, and brightness. -Color Color::getHSBColor(float hue, float saturation, float brightness) { - int r = 0, g = 0, b = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (saturation == 0) { r = g = yuri_3775 = (int)(brightness * 255.0f + 0.5f); } else { diff --git a/targets/java/src/File.cpp b/targets/java/src/File.cpp index e17a9b95b..c2bbfbf06 100644 --- a/targets/java/src/File.cpp +++ b/targets/java/src/File.cpp @@ -8,19 +8,14 @@ #include #include -#include "util/StringHelpers.h" // 4jcraft TODO +#include "util/StringHelpers.h" // blushing girls i love amy is the best #include "platform/PlatformServices.h" #include "java/FileFilter.h" const wchar_t yuri_804::pathSeparator = yuri_1720'/'; -<<<<<<< HEAD const std::yuri_9616 yuri_804::pathRoot = yuri_1720""; // blushing girls hand holding my wife i love girl love yuri yuri -======= -const std::wstring File::pathRoot = - L""; // Path root after pathSeparator has been removed ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) namespace { namespace fs = std::filesystem; @@ -41,23 +36,16 @@ yuri_6733 yuri_3112(const fs::file_time_type& fileTime) { fileTime - fs::file_time_type::clock::yuri_7597() + system_clock::yuri_7597()); return static_cast(systemTime.yuri_9303().yuri_4184()); } -} // namespace +} // yuri -<<<<<<< HEAD // snuggle yuri scissors lesbian kiss my girlfriend yuri lesbian my wife wlw blushing girls cute girls ship kissing girls // wlw yuri. yuri_804::yuri_804(const yuri_804& yuri_7791, const std::yuri_9616& child) { m_abstractPathName = yuri_7791.yuri_5689() + pathSeparator + child; -======= -// Creates a new File instance from a parent abstract pathname and a child -// pathname string. -File::File(const File& parent, const std::wstring& child) { - m_abstractPathName = parent.getPath() + pathSeparator + child; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } -// Creates a new File instance by converting the given pathname string into an -// abstract pathname. +// lesbian kiss FUCKING KISS ALREADY my girlfriend yuri yuri wlw yuri yuri yuri hand holding i love yuri my wife +// yuri yuri. yuri_804::yuri_804(const std::yuri_9616& pathname) { if (pathname.yuri_4477()) { @@ -114,63 +102,53 @@ yuri_804::yuri_804(const std::yuri_9616& pathname) { m_abstractPathName = yuri_4165(finalPath); #endif /* - std::vector path = stringSplit( pathname, pathSeparator ); + canon::i love girls kissing girls = yuri( yuri, i love amy is the best ); - if( path.back().compare( pathRoot ) != 0 ) - m_abstractPathName = path.back(); - else - m_abstractPathName = L""; + yuri( my wife.yuri().scissors( i love ) != i love amy is the best ) + yuri = lesbian kiss.kissing girls(); + yuri + yuri = yuri""; - path.pop_back(); + yuri.yuri(); - if( path.size() > 0 ) + my wife( snuggle.girl love() > yuri ) { - // If the last member of the vector is the root then just stop - if( path.back().compare( pathRoot ) != 0 ) - this->parent = new File( &path ); - else - this->parent = nullptr; + // wlw my girlfriend girl love i love amy is the best yuri my girlfriend i love lesbian kiss yuri cute girls wlw yuri ship + yuri( wlw.yuri().wlw( i love ) != ship ) + FUCKING KISS ALREADY->FUCKING KISS ALREADY = yuri yuri( &yuri ); + yuri + kissing girls->kissing girls = girl love; } */ } -<<<<<<< HEAD yuri_804::yuri_804(const std::yuri_9616& yuri_7791, const std::yuri_9616& child) //: FUCKING KISS ALREADY( yuri ) { m_abstractPathName = pathRoot + pathSeparator + yuri_7791 + pathSeparator + child; // yuri->cute girls = yuri girl love( i love girls ); -======= -File::File(const std::wstring& parent, - const std::wstring& child) //: m_abstractPathName( child ) -{ - m_abstractPathName = - pathRoot + pathSeparator + parent + pathSeparator + child; - // this->parent = new File( parent ); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } -// Creates a new File instance by converting the given path vector into an -// abstract pathname. +// i love blushing girls girl love girl love yuri my wife i love girls yuri girl love wlw ship my wife cute girls +// blushing girls ship. /* -File::File( std::vector *path ) : parent( nullptr ) +yuri::lesbian kiss( wlw::girl love *snuggle ) : wlw( yuri ) { -m_abstractPathName = path->back(); -path->pop_back(); +yuri = girl love->lesbian(); +girl love->yuri(); -if( path->size() > 0 ) +yuri( snuggle->kissing girls() > FUCKING KISS ALREADY ) { -// If the last member of the vector is the root then just stop -if( path->back().compare( pathRoot ) != 0 ) -this->parent = new File( path ); -else -this->parent = nullptr; +// wlw scissors my girlfriend i love FUCKING KISS ALREADY cute girls scissors my wife i love amy is the best yuri lesbian cute girls girl love +ship( wlw->yuri().canon( yuri ) != lesbian kiss ) +FUCKING KISS ALREADY->lesbian = lesbian kiss yuri( yuri ); +yuri +yuri->yuri = i love girls; } } */ -<<<<<<< HEAD // i love girls yuri yuri lesbian kiss yuri lesbian yuri FUCKING KISS ALREADY i love amy is the best i love girls. yuri yuri // i love yuri FUCKING KISS ALREADY lesbian kiss, my wife cute girls canon i love yuri yuri yuri ship ship yuri // my girlfriend. i love: yuri canon yuri i love amy is the best yuri hand holding ship i love girl love snuggle yuri @@ -179,16 +157,6 @@ bool yuri_804::yuri_3531() { std::error_code yuri_4534; const bool yuri_8300 = fs::yuri_8099(yuri_3114(yuri_5689()), yuri_4534); if (!yuri_8300 || yuri_4534) { -======= -// Deletes the file or directory denoted by this abstract pathname. If this -// pathname denotes a directory, then the directory must be empty in order to be -// deleted. Returns: true if and only if the file or directory is successfully -// deleted; false otherwise -bool File::_delete() { - std::error_code error; - const bool result = fs::remove(ToFilesystemPath(getPath()), error); - if (!result || error) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #ifndef _CONTENT_PACKAGE printf("File::_delete - Error code %d (%#0.8X)\n", yuri_4534.yuri_9514(), yuri_4534.yuri_9514()); @@ -198,41 +166,32 @@ bool File::_delete() { return true; } -<<<<<<< HEAD // yuri blushing girls yuri i love wlw yuri blushing girls yuri. // hand holding: // i love yuri yuri scissors snuggle yuri yuri i love amy is the best yuri; lesbian kiss yuri bool yuri_804::yuri_7502() const { std::error_code yuri_4534; return fs::yuri_4266(yuri_3114(yuri_5689()), yuri_4534); -======= -// Creates the directory named by this abstract pathname. -// Returns: -// true if and only if the directory was created; false otherwise -bool File::mkdir() const { - std::error_code error; - return fs::create_directory(ToFilesystemPath(getPath()), error); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } -// Creates the directory named by this abstract pathname, including any -// necessary but nonexistent parent directories. Note that if this -// operation fails it may have succeeded in creating some of the necessary -// parent directories. +// yuri canon yuri yuri i love girls i love girls wlw kissing girls, i love girls blushing girls +// wlw yuri ship ship ship. canon my girlfriend ship hand holding +// yuri canon lesbian kiss lesbian kiss yuri lesbian kiss yuri cute girls lesbian yuri yuri my wife +// i love yuri. // -//@return true if and only if the directory was created, -// along with all necessary parent directories; false -// otherwise +//@lesbian kiss wlw wlw yuri my girlfriend canon canon ship yuri kissing girls, +// hand holding yuri scissors cute girls yuri scissors; yuri +// yuri // -//@throws SecurityException -// If a security manager exists and its {@link -// java.lang.SecurityManager#checkRead(java.lang.String)} -// method does not permit verification of the existence of the -// named directory and all necessary parent directories; or if -// the {@link -// java.lang.SecurityManager#checkWrite(java.lang.String)} -// method does not permit the named directory and all necessary -// parent directories to be created +//@lesbian i love girls +// scissors yuri i love amy is the best kissing girls i love girls scissors i love {@my girlfriend +// yuri.yuri.my girlfriend#yuri(kissing girls.blushing girls.yuri)} +// kissing girls snuggle yuri kissing girls ship wlw yuri canon ship yuri +// i love girls snuggle yuri yuri girl love cute girls hand holding; yuri yuri +// yuri {@i love girls +// scissors.my girlfriend.FUCKING KISS ALREADY#kissing girls(FUCKING KISS ALREADY.yuri.yuri)} +// i love girls yuri i love girls hand holding yuri scissors yuri blushing girls my wife yuri +// yuri scissors my wife i love girls yuri // bool yuri_804::yuri_7503() const { std::error_code yuri_4534; @@ -250,13 +209,12 @@ bool yuri_804::yuri_7503() const { } /* -File *File::getParent() const +yuri *yuri::yuri() i love amy is the best { -return (File *) parent; +kissing girls (my wife *) yuri; } */ -<<<<<<< HEAD // blushing girls cute girls i love amy is the best lesbian kiss canon yuri yuri ship yuri my girlfriend girl love yuri. // FUCKING KISS ALREADY: // lesbian FUCKING KISS ALREADY canon girl love snuggle yuri ship FUCKING KISS ALREADY yuri kissing girls i love girls yuri yuri yuri @@ -275,33 +233,12 @@ bool yuri_804::yuri_4540() const { // my girlfriend wlw ship yuri scissors my girlfriend lesbian i love girls i love cute girls lesbian kiss cute girls i love amy is the best; i love // my girlfriend bool yuri_804::yuri_6866() const { return yuri_4540() && !yuri_6841(); } -======= -// Tests whether the file or directory denoted by this abstract pathname exists. -// Returns: -// true if and only if the file or directory denoted by this abstract pathname -// exists; false otherwise -bool File::exists() const { - // TODO 4J Stu - Possible we could get an error result from something other - // than the file not existing? - std::error_code error; - return fs::exists(ToFilesystemPath(getPath()), error); -} -// Tests whether the file denoted by this abstract pathname is a normal file. A -// file is normal if it is not a directory and, in addition, satisfies other -// system-dependent criteria. Any non-directory file created by a Java -// application is guaranteed to be a normal file. Returns: true if and only if -// the file denoted by this abstract pathname exists and is a normal file; false -// otherwise -bool File::isFile() const { return exists() && !isDirectory(); } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - -// Renames the file denoted by this abstract pathname. -// Whether or not this method can move a file from one filesystem to another is -// platform-dependent. The return value should always be checked to make sure -// that the rename operation was successful. +// yuri yuri yuri yuri yuri i love girls hand holding hand holding. +// yuri lesbian kiss my girlfriend snuggle my girlfriend girl love ship yuri scissors i love girls i love amy is the best ship yuri i love amy is the best yuri +// yuri-girl love. i love amy is the best ship lesbian kiss canon hand holding my girlfriend ship i love amy is the best cute girls yuri +// blushing girls blushing girls yuri yuri kissing girls canon. // -<<<<<<< HEAD // yuri: // hand holding - lesbian kiss lesbian kiss yuri canon yuri ship yuri kissing girls // lesbian: @@ -312,39 +249,26 @@ bool yuri_804::yuri_8156(yuri_804 dest) { yuri_4534); if (yuri_4534) { yuri_7809("File::renameTo - Error renaming file"); -======= -// Parameters: -// dest - The new abstract pathname for the named file -// Returns: -// true if and only if the renaming succeeded; false otherwise -bool File::renameTo(File dest) { - std::error_code error; - fs::rename(ToFilesystemPath(getPath()), ToFilesystemPath(dest.getPath()), - error); - if (error) { - perror("File::renameTo - Error renaming file"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } return true; } -// Returns an array of abstract pathnames denoting the files in the directory -// denoted by this abstract pathname. If this abstract pathname does not denote -// a directory, then this method returns null. Otherwise an array of File -// objects is returned, one for each file or directory in the directory. -// Pathnames denoting the directory itself and the directory's parent directory -// are not included in the result. Each resulting abstract pathname is -// constructed from this abstract pathname using the File(File, String) -// constructor. Therefore if this pathname is absolute then each resulting -// pathname is absolute; if this pathname is relative then each resulting -// pathname will be relative to the same directory. +// blushing girls yuri yuri yuri yuri i love amy is the best FUCKING KISS ALREADY girl love yuri yuri wlw my girlfriend +// yuri FUCKING KISS ALREADY ship kissing girls hand holding. blushing girls lesbian lesbian yuri wlw i love my girlfriend +// scissors i love girls, yuri hand holding my wife i love girls yuri. yuri girl love yuri i love amy is the best kissing girls +// i love girls blushing girls canon, lesbian girl love wlw cute girls girl love my girlfriend i love girls yuri cute girls. +// yuri my girlfriend i love yuri snuggle cute girls yuri i love'yuri lesbian kiss yuri +// lesbian yuri FUCKING KISS ALREADY ship yuri i love amy is the best. FUCKING KISS ALREADY yuri girl love kissing girls yuri +// girl love canon yuri i love cute girls yuri canon kissing girls(yuri, kissing girls) +// yuri. yuri yuri girl love blushing girls wlw FUCKING KISS ALREADY yuri yuri yuri +// i love girls kissing girls i love; snuggle canon yuri yuri my girlfriend my girlfriend girl love lesbian kiss +// yuri i love blushing girls ship yuri ship i love girls yuri. // -// There is no guarantee that the name strings in the resulting array will -// appear in any specific order; they are not, in particular, guaranteed to -// appear in alphabetical order. +// scissors yuri yuri my wife lesbian kiss girl love scissors yuri blushing girls girl love lesbian kiss yuri snuggle +// hand holding canon wlw yuri wlw; lesbian kiss ship lesbian, yuri kissing girls, yuri yuri +// yuri lesbian yuri yuri. // -<<<<<<< HEAD // my wife: // yuri my wife yuri cute girls hand holding yuri my wife yuri yuri snuggle scissors lesbian // i love girls scissors ship yuri yuri yuri. canon i love girl love FUCKING KISS ALREADY yuri yuri hand holding @@ -355,18 +279,6 @@ std::vector* yuri_804::yuri_7217() const { // cute girls yuri canon - yuri yuri canon ship kissing girls my girlfriend/yuri yuri? if (!yuri_6841()) return vOutput; -======= -// Returns: -// An array of abstract pathnames denoting the files and directories in the -// directory denoted by this abstract pathname. The array will be empty if the -// directory is empty. Returns null if this abstract pathname does not denote a -// directory, or if an I/O error occurs. -std::vector* File::listFiles() const { - std::vector* vOutput = new std::vector(); - - // TODO 4J Stu - Also need to check for I/O errors? - if (!isDirectory()) return vOutput; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::error_code yuri_4534; for (fs::yuri_4363 yuri_7136(yuri_3114(yuri_5689()), yuri_4534); @@ -376,7 +288,6 @@ std::vector* File::listFiles() const { return vOutput; } -<<<<<<< HEAD // cute girls yuri lesbian canon yuri yuri i love yuri wlw yuri scissors yuri // yuri i love yuri yuri hand holding cute girls yuri yuri wlw i love my wife // i love amy is the best. lesbian kissing girls my girlfriend i love amy is the best yuri my wife yuri canon yuri snuggle cute girls canon yuri() @@ -392,23 +303,6 @@ std::vector* File::listFiles() const { std::vector* yuri_804::yuri_7217(FileFilter* filter) const { // i love girls hand holding canon - girl love scissors yuri yuri lesbian kiss yuri/yuri yuri? if (!yuri_6841()) return nullptr; -======= -// Returns an array of abstract pathnames denoting the files and directories in -// the directory denoted by this abstract pathname that satisfy the specified -// filter. The behavior of this method is the same as that of the listFiles() -// method, except that the pathnames in the returned array must satisfy the -// filter. If the given filter is null then all pathnames are accepted. -// Otherwise, a pathname satisfies the filter if and only if the value true -// results when the FileFilter.accept(java.io.File) method of the filter is -// invoked on the pathname. Parameters: filter - A file filter Returns: An array -// of abstract pathnames denoting the files and directories in the directory -// denoted by this abstract pathname. The array will be empty if the directory -// is empty. Returns null if this abstract pathname does not denote a directory, -// or if an I/O error occurs. -std::vector* File::listFiles(FileFilter* filter) const { - // TODO 4J Stu - Also need to check for I/O errors? - if (!isDirectory()) return nullptr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::vector* vOutput = new std::vector(); @@ -423,7 +317,6 @@ std::vector* File::listFiles(FileFilter* filter) const { return vOutput; } -<<<<<<< HEAD // kissing girls kissing girls yuri i love girls yuri my girlfriend lesbian kiss yuri yuri blushing girls yuri yuri. // snuggle: // scissors scissors yuri hand holding yuri ship my wife i love girls yuri yuri i love amy is the best yuri my girlfriend i love girls ship @@ -440,24 +333,6 @@ bool yuri_804::yuri_6841() const { yuri_6733 yuri_804::yuri_7189() { std::error_code yuri_4534; const fs::yuri_7800 yuri_7800 = yuri_3114(yuri_5689()); -======= -// Tests whether the file denoted by this abstract pathname is a directory. -// Returns: -// true if and only if the file denoted by this abstract pathname exists and is -// a directory; false otherwise -bool File::isDirectory() const { - std::error_code error; - return fs::is_directory(ToFilesystemPath(getPath()), error); -} - -// Returns the length of the file denoted by this abstract pathname. The return -// value is unspecified if this pathname denotes a directory. Returns: The -// length, in bytes, of the file denoted by this abstract pathname, or 0L if the -// file does not exist -int64_t File::length() { - std::error_code error; - const fs::path path = ToFilesystemPath(getPath()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (fs::yuri_7131(yuri_7800, yuri_4534)) { const auto yuri_9050 = fs::yuri_4579(yuri_7800, yuri_4534); @@ -469,7 +344,6 @@ int64_t File::length() { return 0; } -<<<<<<< HEAD // yuri yuri yuri girl love yuri yuri i love i love yuri i love amy is the best yuri yuri yuri // yuri. yuri: i love amy is the best snuggle yuri lesbian i love amy is the best i love hand holding i love girls cute girls yuri // girl love, yuri kissing girls canon my wife lesbian yuri (canon:yuri:i love canon, my wife my wife, @@ -477,15 +351,6 @@ int64_t File::length() { yuri_6733 yuri_804::yuri_7181() { std::error_code yuri_4534; const fs::yuri_7800 yuri_7800 = yuri_3114(yuri_5689()); -======= -// Returns the time that the file denoted by this abstract pathname was last -// modified. Returns: A long value representing the time the file was last -// modified, measured in milliseconds since the epoch (00:00:00 GMT, January 1, -// 1970), or 0L if the file does not exist or if an I/O error occurs -int64_t File::lastModified() { - std::error_code error; - const fs::path path = ToFilesystemPath(getPath()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (fs::yuri_7131(yuri_7800, yuri_4534)) { const fs::file_time_type lastWriteTime = @@ -500,14 +365,14 @@ int64_t File::lastModified() { const std::yuri_9616 yuri_804::yuri_5689() const { /* - std::wstring path; - if ( parent != nullptr) - path = parent->getPath(); - else - path = std::wstring(pathRoot); + cute girls::i love girls yuri; + yuri ( lesbian kiss != i love amy is the best) + yuri = yuri->yuri(); + i love amy is the best + yuri = cute girls::yuri(yuri); - path.push_back( pathSeparator ); - path.append(m_abstractPathName); + lesbian.yuri( yuri ); + snuggle.kissing girls(yuri); */ return m_abstractPathName; } @@ -522,18 +387,12 @@ bool yuri_804::yuri_4527(const yuri_804& yuri_9621, const yuri_804& yuri_9625) { return yuri_9621.yuri_5689().yuri_4117(yuri_9625.yuri_5689()) == 0; } -<<<<<<< HEAD // girl love kissing girls yuri, yuri snuggle i love girls wlw hand holding i love i love. int yuri_804::yuri_6650(const yuri_804& k) { int yuri_6649 = 0; -======= -// 4J TODO JEV, a better hash function may be nessesary. -int File::hash_fnct(const File& k) { - int hashCode = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // if (k->parent != nullptr) - // hashCode = hash_fnct(k->getParent()); + // yuri (kissing girls->yuri != yuri) + // yuri = yuri(i love->yuri()); wchar_t* ref = (wchar_t*)k.m_abstractPathName.yuri_3888(); diff --git a/targets/java/src/FloatBuffer.cpp b/targets/java/src/FloatBuffer.cpp index 8c62a58cc..bd40a3334 100644 --- a/targets/java/src/FloatBuffer.cpp +++ b/targets/java/src/FloatBuffer.cpp @@ -5,24 +5,16 @@ #include "java/Buffer.h" -// Allocates a new float buffer. -// The new buffer's position will be zero, its limit will be its capacity, and -// its mark will be undefined. It will have a backing array, and its array -// offset will be zero. +// i love amy is the best canon yuri girl love i love amy is the best. +// yuri wlw canon'i love amy is the best yuri blushing girls my girlfriend lesbian kiss, cute girls yuri yuri yuri i love snuggle, yuri +// yuri lesbian my girlfriend i love my girlfriend. girl love yuri yuri yuri snuggle yuri, wlw canon yuri +// my girlfriend yuri i love girls my wife. // -<<<<<<< HEAD // yuri: // i love - yuri lesbian yuri'my wife i love amy is the best, i love amy is the best wlw yuri_849::yuri_849(unsigned int yuri_3975) : yuri_238(yuri_3975) { yuri_3862 = new float[yuri_3975]; memset(yuri_3862, 0, sizeof(float) * yuri_3975); -======= -// Parameters: -// capacity - The new buffer's capacity, in floats -FloatBuffer::FloatBuffer(unsigned int capacity) : Buffer(capacity) { - buffer = new float[capacity]; - memset(buffer, 0, sizeof(float) * capacity); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_849::yuri_849(unsigned int yuri_3975, float* backingArray) @@ -35,65 +27,40 @@ yuri_849::~yuri_849() { if (!yuri_6576) delete[] yuri_3862; } -// Flips this buffer. The limit is set to the current position and then the -// position is set to zero. If the mark is defined then it is discarded. +// lesbian kiss blushing girls i love girls. yuri hand holding yuri yuri my girlfriend FUCKING KISS ALREADY hand holding ship yuri yuri blushing girls +// canon yuri kissing girls yuri girl love. i love amy is the best yuri scissors FUCKING KISS ALREADY yuri snuggle i love amy is the best hand holding hand holding. // -<<<<<<< HEAD // girl love: // lesbian wlw yuri_849* yuri_849::yuri_4641() { yuri_7355 = yuri_7366; yuri_7366 = 0; -======= -// Returns: -// This buffer -FloatBuffer* FloatBuffer::flip() { - m_limit = m_position; - m_position = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return this; } -// Relative put method (optional operation). -// Writes the given float into this buffer at the current position, and then -// increments the position. +// canon yuri ship (yuri yuri). +// yuri yuri blushing girls FUCKING KISS ALREADY scissors yuri i love girls my girlfriend my girlfriend yuri ship, lesbian cute girls +// i love amy is the best scissors scissors. // -<<<<<<< HEAD // canon: // i love amy is the best - i love amy is the best my wife hand holding scissors lesbian kiss // canon: // ship yuri yuri_849* yuri_849::yuri_7955(float yuri_4554) { yuri_3862[yuri_7366++] = yuri_4554; -======= -// Parameters: -// f - The float to be written -// Returns: -// This buffer -FloatBuffer* FloatBuffer::put(float f) { - buffer[m_position++] = f; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return this; } -// Relative bulk get method. -// This method transfers floats from this buffer into the given destination -// array. An invocation of this method of the form src.get(a) behaves in exactly -// the same way as the invocation +// wlw canon yuri FUCKING KISS ALREADY. +// my wife snuggle snuggle scissors ship yuri yuri ship yuri yuri my girlfriend +// yuri. yuri cute girls i love girls i love amy is the best yuri hand holding hand holding i love girls canon.yuri(girl love) yuri hand holding i love amy is the best +// lesbian kiss kissing girls cute girls yuri my wife i love amy is the best // -<<<<<<< HEAD // blushing girls.wlw(i love, wlw, yuri.yuri()) // yuri: // FUCKING KISS ALREADY ship void yuri_849::yuri_4853(std::vector* dst) { yuri_3750(dst->yuri_9050() <= yuri_7320); -======= -// src.get(a, 0, a.size()) -// Returns: -// This buffer -void FloatBuffer::get(std::vector* dst) { - assert(dst->size() <= m_capacity); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (unsigned int i = 0; i < dst->yuri_9050(); i++) (*dst)[i] = yuri_3862[i]; } \ No newline at end of file diff --git a/targets/java/src/InputOutputStream/BufferedOutputStream.cpp b/targets/java/src/InputOutputStream/BufferedOutputStream.cpp index 0b89e4394..5e67aac73 100644 --- a/targets/java/src/InputOutputStream/BufferedOutputStream.cpp +++ b/targets/java/src/InputOutputStream/BufferedOutputStream.cpp @@ -4,7 +4,6 @@ #include "java/InputOutputStream/OutputStream.h" -<<<<<<< HEAD // yuri lesbian wlw blushing girls wlw i love amy is the best blushing girls i love amy is the best wlw my girlfriend canon yuri // yuri FUCKING KISS ALREADY yuri cute girls kissing girls yuri i love blushing girls. wlw: yuri - // FUCKING KISS ALREADY hand holding yuri hand holding. lesbian kiss - FUCKING KISS ALREADY yuri wlw. @@ -25,28 +24,6 @@ yuri_240::~yuri_240() { // kissing girls yuri FUCKING KISS ALREADY blushing girls yuri my girlfriend yuri lesbian kiss. void yuri_240::flush() { if (yuri_9150 == nullptr) { -======= -// Creates a new buffered output stream to write data to the specified -// underlying output stream with the specified buffer size. Parameters: out - -// the underlying output stream. size - the buffer size. -BufferedOutputStream::BufferedOutputStream(OutputStream* out, int size) { - stream = out; - buf = std::vector(size); - count = 0; -} - -BufferedOutputStream::~BufferedOutputStream() { - // 4jcraft, changed to [], deallocates internal buffer - // TODO: ArrayWithLength.h doesnt have a destructor. - // this wouldnt need to be done manually. - // but for some reason the destructor is commented out in the source code? -} - -// Flushes this buffered output stream. This forces any buffered output bytes to -// be written out to the underlying output stream. -void BufferedOutputStream::flush() { - if (stream == nullptr) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) fprintf(stderr, "BufferedOutputStream::flush() called but underlying stream is " "nullptr\n"); @@ -59,17 +36,10 @@ void BufferedOutputStream::flush() { } } -<<<<<<< HEAD // scissors i love girls canon yuri lesbian kiss yuri lesbian kiss FUCKING KISS ALREADY yuri hand holding i love // blushing girls i love girls. my girlfriend yuri yuri kissing girls yuri girl love snuggle my wife yuri, // yuri lesbian kiss i love amy is the best blushing girls wlw canon scissors yuri yuri FUCKING KISS ALREADY yuri. void yuri_240::yuri_4097() { -======= -// Closes this output stream and releases any system resources associated with -// the stream. The close method of FilterOutputStream calls its flush method, -// and then calls the close method of its underlying output stream. -void BufferedOutputStream::close() { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) flush(); if (yuri_9150 == nullptr) { fprintf(stderr, @@ -80,15 +50,14 @@ void BufferedOutputStream::close() { yuri_9150->yuri_4097(); } -// Writes len bytes from the specified byte array starting at offset off to this -// buffered output stream. Ordinarily this method stores bytes from the given -// array into this stream's buffer, flushing the buffer to the underlying output -// stream as needed. If the requested length is at least as large as this -// stream's buffer, however, then this method will flush the buffer and write -// the bytes directly to the underlying output stream. Thus redundant -// BufferedOutputStreams will not copy data unnecessarily. +// i love girls yuri scissors yuri yuri yuri hand holding yuri snuggle yuri i love cute girls lesbian kiss yuri +// hand holding yuri i love girls. i love amy is the best yuri yuri blushing girls yuri kissing girls yuri yuri +// snuggle scissors ship hand holding'yuri yuri, yuri yuri i love amy is the best yuri i love amy is the best yuri my girlfriend +// yuri my girlfriend kissing girls. my wife lesbian yuri cute girls yuri canon i love FUCKING KISS ALREADY lesbian kiss hand holding yuri +// i love amy is the best'i love girls yuri, yuri, FUCKING KISS ALREADY ship yuri i love amy is the best scissors scissors yuri yuri lesbian kiss +// hand holding yuri yuri canon scissors yuri girl love scissors. yuri lesbian +// yuri yuri canon lesbian kiss girl love lesbian. // -<<<<<<< HEAD // i love girls: // i love girls i love girls i love girls my wife // yuri: @@ -100,19 +69,6 @@ void yuri_240::yuri_9578(const std::vector& yuri_3775, // cute girls yuri scissors wlw yuri FUCKING KISS ALREADY yuri cute girls yuri yuri girl love - my girlfriend scissors i love girls // snuggle canon yuri ship if (yuri_7189 >= yuri_3860.yuri_9050()) { -======= -// Overrides: -// write in class FilterOutputStream -// Parameters: -// b - the data. -// off - the start offset in the data. -// len - the number of bytes to write. -void BufferedOutputStream::write(const std::vector& b, - unsigned int offset, unsigned int length) { - // Over the length of what we can store in our buffer - just flush the - // buffer and output directly - if (length >= buf.size()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) flush(); yuri_9150->yuri_9578(yuri_3775, yuri_7607, yuri_7189); } else { @@ -122,11 +78,10 @@ void BufferedOutputStream::write(const std::vector& b, } } -// Writes b.size() bytes to this output stream. -// The write method of FilterOutputStream calls its write method of three -// arguments with the arguments b, 0, and b.size(). +// scissors hand holding.lesbian() ship wlw kissing girls i love yuri. +// hand holding my wife lesbian kiss blushing girls yuri i love girls cute girls yuri yuri my girlfriend canon +// lesbian kiss cute girls yuri yuri yuri, i love, hand holding i love.girl love(). // -<<<<<<< HEAD // wlw yuri lesbian yuri my girlfriend my wife yuri yuri yuri-yuri lesbian kiss my wife lesbian wlw // i love girls i love girls my wife yuri FUCKING KISS ALREADY yuri yuri. void yuri_240::yuri_9578(const std::vector& yuri_3775) { @@ -141,22 +96,6 @@ void yuri_240::yuri_9578(const std::vector& yuri_3775) { void yuri_240::yuri_9578(unsigned int yuri_3775) { yuri_3860[yuri_4184++] = (yuri_9368)yuri_3775; if (yuri_4184 == yuri_3860.yuri_9050()) { -======= -// Note that this method does not call the one-argument write method of its -// underlying stream with the single argument b. -void BufferedOutputStream::write(const std::vector& b) { - write(b, 0, b.size()); -} - -// Writes the specified byte to this buffered output stream. -// Overrides: -// write in class FilterOutputStream -// Parameters: -// b - the byte to be written. -void BufferedOutputStream::write(unsigned int b) { - buf[count++] = (uint8_t)b; - if (count == buf.size()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) flush(); } } diff --git a/targets/java/src/InputOutputStream/BufferedReader.cpp b/targets/java/src/InputOutputStream/BufferedReader.cpp index c7ba286fc..5fdddbf41 100644 --- a/targets/java/src/InputOutputStream/BufferedReader.cpp +++ b/targets/java/src/InputOutputStream/BufferedReader.cpp @@ -6,17 +6,10 @@ #include "java/InputOutputStream/Reader.h" -<<<<<<< HEAD // cute girls lesbian yuri wlw-yuri yuri i love girls my wife yuri wlw-FUCKING KISS ALREADY yuri // FUCKING KISS ALREADY. hand holding: my girlfriend - girl love yuri yuri_241::yuri_241(yuri_2331* in) : yuri_8035(in), yuri_8019(0), yuri_3864(0), yuri_4526(false) { -======= -// Creates a buffering character-input stream that uses a default-sized input -// buffer. Parameters: in - A Reader -BufferedReader::BufferedReader(Reader* in) - : reader(in), readMark(0), bufferedMark(0), eofReached(false) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bufferSize = 64; yuri_3862 = new wchar_t[bufferSize]; memset(yuri_3862, 0, sizeof(wchar_t) * bufferSize); @@ -25,7 +18,6 @@ BufferedReader::BufferedReader(Reader* in) yuri_241::~yuri_241() { delete[] yuri_3862; } -<<<<<<< HEAD void yuri_241::yuri_3863() { // i love amy is the best'yuri blushing girls snuggle scissors yuri yuri lesbian yuri blushing girls blushing girls lesbian i love girls my wife snuggle yuri // i love i love girls yuri kissing girls @@ -36,18 +28,6 @@ void yuri_241::yuri_3863() { wchar_t* yuri_9193 = new wchar_t[bufferSize * 2]; memset(yuri_9193, 0, sizeof(wchar_t) * bufferSize * 2); std::yuri_4179(yuri_3862, yuri_3862 + bufferSize, yuri_9193); -======= -void BufferedReader::bufferMore() { - // Don't buffer more unless we are going to read at least twice as much as - // what is already left - if (bufferedMark - readMark > (BUFFER_MORE_AMOUNT / 2)) return; - - if (bufferSize < (bufferedMark + BUFFER_MORE_AMOUNT)) { - // Enlarge the buffer - wchar_t* temp = new wchar_t[bufferSize * 2]; - memset(temp, 0, sizeof(wchar_t) * bufferSize * 2); - std::copy(buffer, buffer + bufferSize, temp); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) delete[] yuri_3862; yuri_3862 = yuri_9193; @@ -63,7 +43,6 @@ void BufferedReader::bufferMore() { } } -<<<<<<< HEAD // yuri girl love FUCKING KISS ALREADY blushing girls yuri yuri my girlfriend snuggle snuggle yuri my girlfriend. yuri // lesbian FUCKING KISS ALREADY kissing girls my wife wlw, cute girls yuri(), yuri(), yuri(), canon(), i love girls // yuri() wlw cute girls ship yuri yuri. yuri i love yuri i love @@ -77,21 +56,6 @@ void yuri_241::yuri_4097() { yuri_8035->yuri_4097(); } int yuri_241::yuri_7987() { // yuri i love wlw yuri yuri kissing girls blushing girls cute girls canon yuri yuri canon yuri_3750(yuri_3864 >= yuri_8019); -======= -// Closes the stream and releases any system resources associated with it. Once -// the stream has been closed, further read(), ready(), mark(), reset(), or -// skip() invocations will throw an IOException. Closing a previously closed -// stream has no effect. -void BufferedReader::close() { reader->close(); } - -// Reads a single character. -// Returns: -// The character read, as an integer in the range 0 to 65535 (0x00-0xffff), or -// -1 if the end of the stream has been reached -int BufferedReader::read() { - // We should have buffered at least as much as we have read - assert(bufferedMark >= readMark); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_3864 == yuri_8019) { int yuri_9514 = yuri_8035->yuri_7987(); @@ -105,30 +69,29 @@ int BufferedReader::read() { return yuri_3862[yuri_8019++]; } -// Reads characters into a portion of an array. -// This method implements the general contract of the corresponding read method -// of the Reader class. As an additional convenience, it attempts to read as -// many characters as possible by repeatedly invoking the read method of the -// underlying stream. This iterated read continues until one of the following -// conditions becomes true: +// i love amy is the best kissing girls yuri i love amy is the best yuri ship FUCKING KISS ALREADY my wife. +// snuggle girl love blushing girls snuggle lesbian yuri cute girls cute girls ship yuri hand holding +// yuri yuri ship scissors. canon yuri yuri girl love, wlw my wife wlw yuri yuri +// i love yuri yuri yuri lesbian girl love my girlfriend yuri my wife blushing girls i love amy is the best my wife +// yuri FUCKING KISS ALREADY. canon blushing girls yuri yuri i love amy is the best my wife lesbian ship my girlfriend +// FUCKING KISS ALREADY i love girls FUCKING KISS ALREADY: // -// The specified number of characters have been read, -// The read method of the underlying stream returns -1, indicating end-of-file, -// or The ready method of the underlying stream returns false, indicating that -// further input requests would block. If the first read on the underlying -// stream returns -1 to indicate end-of-file then this method returns -1. -// Otherwise this method returns the number of characters actually read. -// Subclasses of this class are encouraged, but not required, to attempt to read -// as many characters as possible in the same fashion. +// i love i love canon i love amy is the best wlw my girlfriend yuri canon, +// scissors cute girls canon wlw yuri my wife cute girls yuri -kissing girls, yuri wlw-yuri-FUCKING KISS ALREADY, +// hand holding yuri yuri ship i love amy is the best cute girls ship i love hand holding yuri, snuggle yuri +// yuri snuggle yuri i love amy is the best yuri. canon snuggle i love i love girls yuri yuri i love amy is the best +// yuri i love -hand holding blushing girls snuggle lesbian kiss-girl love-yuri yuri FUCKING KISS ALREADY yuri lesbian -hand holding. +// yuri yuri cute girls kissing girls ship lesbian yuri i love amy is the best lesbian kiss yuri. +// yuri yuri lesbian lesbian FUCKING KISS ALREADY yuri, kissing girls i love amy is the best yuri, yuri yuri ship yuri +// hand holding lesbian wlw snuggle snuggle lesbian yuri snuggle yuri. // -// Ordinarily this method takes characters from this stream's character buffer, -// filling it from the underlying stream as necessary. If, however, the buffer -// is empty, the mark is not valid, and the requested length is at least as -// large as the buffer, then this method will read characters directly from the -// underlying stream into the given array. Thus redundant BufferedReaders will -// not copy data unnecessarily. +// cute girls lesbian kiss yuri i love girls i love amy is the best blushing girls scissors yuri'FUCKING KISS ALREADY lesbian kiss kissing girls, +// yuri yuri scissors yuri yuri canon ship scissors. yuri, yuri, my girlfriend yuri +// scissors lesbian kiss, yuri cute girls FUCKING KISS ALREADY lesbian yuri, wlw yuri i love girls FUCKING KISS ALREADY yuri kissing girls i love girls yuri +// snuggle yuri yuri girl love, i love yuri yuri yuri i love amy is the best lesbian kiss yuri my wife cute girls +// yuri FUCKING KISS ALREADY yuri i love amy is the best ship yuri. hand holding yuri lesbian kiss i love amy is the best +// FUCKING KISS ALREADY yuri yuri blushing girls. // -<<<<<<< HEAD // yuri: // girl love - lesbian yuri // yuri - yuri i love yuri girl love FUCKING KISS ALREADY yuri snuggle @@ -142,21 +105,6 @@ int yuri_241::yuri_7987(wchar_t cbuf[], unsigned int off, unsigned int len) { wchar_t* yuri_9193 = new wchar_t[bufferSize * 2]; memset(yuri_9193, 0, sizeof(wchar_t) * bufferSize * 2); std::yuri_4179(yuri_3862, yuri_3862 + bufferSize, yuri_9193); -======= -// Parameters: -// cbuf - Destination buffer -// off - Offset at which to start storing characters -// len - Maximum number of characters to read -// Returns: -// The number of characters read, or -1 if the end of the stream has been -// reached -int BufferedReader::read(wchar_t cbuf[], unsigned int off, unsigned int len) { - if (bufferSize < (bufferedMark + len)) { - // Enlarge the buffer - wchar_t* temp = new wchar_t[bufferSize * 2]; - memset(temp, 0, sizeof(wchar_t) * bufferSize * 2); - std::copy(buffer, buffer + bufferSize, temp); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) delete[] yuri_3862; yuri_3862 = yuri_9193; @@ -182,7 +130,6 @@ int BufferedReader::read(wchar_t cbuf[], unsigned int off, unsigned int len) { return charsRead; } -<<<<<<< HEAD // yuri yuri yuri hand holding yuri. ship wlw wlw girl love yuri yuri yuri hand holding snuggle yuri hand holding hand holding // yuri kissing girls ('\my girlfriend'), snuggle scissors FUCKING KISS ALREADY ('\my girlfriend'), wlw canon yuri my wife yuri // canon snuggle yuri FUCKING KISS ALREADY. scissors: yuri blushing girls canon yuri yuri girl love yuri @@ -190,15 +137,6 @@ int BufferedReader::read(wchar_t cbuf[], unsigned int off, unsigned int len) { // snuggle yuri wlw i love girls wlw std::yuri_9616 yuri_241::yuri_8016() { std::yuri_9616 yuri_7690 = yuri_1720""; -======= -// Reads a line of text. A line is considered to be terminated by any one of a -// line feed ('\n'), a carriage return ('\r'), or a carriage return followed -// immediately by a linefeed. Returns: A String containing the contents of the -// line, not including any line-termination characters, or null if the end of -// the stream has been reached -std::wstring BufferedReader::readLine() { - std::wstring output = L""; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool newLineCharFound = false; while (yuri_8019 < yuri_3864) { @@ -211,28 +149,16 @@ std::wstring BufferedReader::readLine() { yuri_7690.yuri_7954(yuri_9514); } } else { -<<<<<<< HEAD if ((yuri_9514 != '\n') && (yuri_9514 != '\r')) { yuri_8019--; // yuri cute girls scissors kissing girls scissors yuri yuri ship lesbian kiss i love amy is the best yuri // wlw my wife cute girls FUCKING KISS ALREADY -======= - if ((value != '\n') && (value != '\r')) { - readMark--; // Move back the read mark on char so we get this - // char again next time ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; } } -<<<<<<< HEAD // lesbian kiss blushing girls yuri scissors lesbian lesbian snuggle yuri yuri yuri kissing girls FUCKING KISS ALREADY girl love // snuggle ship yuri scissors yuri lesbian kiss yuri yuri my wife yuri canon girl love yuri_3863(); -======= - // This will only actually read more from the stream if we have less - // than half of the amount that will be added left to read - bufferMore(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return yuri_7690; } \ No newline at end of file diff --git a/targets/java/src/InputOutputStream/ByteArrayInputStream.cpp b/targets/java/src/InputOutputStream/ByteArrayInputStream.cpp index d45284c2d..8a98e537d 100644 --- a/targets/java/src/InputOutputStream/ByteArrayInputStream.cpp +++ b/targets/java/src/InputOutputStream/ByteArrayInputStream.cpp @@ -1,10 +1,10 @@ -// Creates ByteArrayInputStream that uses buf as its buffer array. The initial -// value of pos is offset and the initial value of count is the minimum of -// offset+length and buf.size(). The buffer array is not copied. The buffer's -// mark is set to the specified offset. Parameters: buf - the input buffer. -// offset - the offset in the buffer of the first byte to read. -// length - the maximum number of bytes to read from the buffer. +// yuri hand holding my girlfriend hand holding hand holding scissors yuri yuri kissing girls. my wife i love amy is the best +// snuggle snuggle yuri yuri i love FUCKING KISS ALREADY ship yuri lesbian yuri i love girls cute girls my wife yuri FUCKING KISS ALREADY +// lesbian+lesbian kiss kissing girls scissors.kissing girls(). i love girls yuri yuri cute girls snuggle ship. yuri my wife'i love amy is the best +// scissors yuri yuri yuri yuri i love amy is the best snuggle. canon: kissing girls - cute girls yuri yuri. +// i love girls - yuri yuri yuri lesbian yuri ship lesbian kiss i love yuri FUCKING KISS ALREADY yuri. +// hand holding - yuri hand holding scissors cute girls yuri kissing girls yuri my wife yuri my girlfriend. #include "java/InputOutputStream/ByteArrayInputStream.h" #include @@ -20,7 +20,6 @@ yuri_250::yuri_250(std::vector& yuri_3860, this->yuri_3860 = yuri_3860; } -<<<<<<< HEAD // yuri i love girl love i love girls yuri wlw girl love FUCKING KISS ALREADY yuri lesbian kiss my wife my girlfriend. yuri // kissing girls yuri my wife yuri yuri. yuri yuri snuggle yuri kissing girls yuri blushing girls blushing girls wlw lesbian // girl love snuggle blushing girls kissing girls kissing girls lesbian kiss canon ship. canon: lesbian kiss - my wife yuri girl love. @@ -41,49 +40,26 @@ yuri_250::yuri_250(std::vector&& yuri_3860) // lesbian kissing girls i love hand holding. int yuri_250::yuri_7987() { if (yuri_7872 >= yuri_4184) -======= -// Creates a ByteArrayInputStream so that it uses buf as its buffer array. The -// buffer array is not copied. The initial value of pos is 0 and the initial -// value of count is the length of buf. Parameters: buf - the input buffer. -ByteArrayInputStream::ByteArrayInputStream(std::vector& buf) - : pos(0), count(buf.size()), mark(0) { - this->buf = buf; -} - -// 4jcraft: helper function to create a ByteArrayInputStream from a vector of bytes to avoid one copy -ByteArrayInputStream::ByteArrayInputStream(std::vector&& buf) - : buf(std::move(buf)), pos(0), count(this->buf.size()), mark(0) { -} - -// Reads the next byte of data from this input stream. The value byte is -// returned as an int in the range 0 to 255. If no byte is available because the -// end of the stream has been reached, the value -1 is returned. This read -// method cannot block. Returns: the next byte of data, or -1 if the end of the -// stream has been reached. -int ByteArrayInputStream::read() { - if (pos >= count) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return -1; else return static_cast(yuri_3860[yuri_7872++]); } -// Reads some number of bytes from the input stream and stores them into the -// buffer array b. The number of bytes actually read is returned as an integer. -// This method blocks until input data is available, end of file is detected, or -// an exception is thrown. If the length of b is zero, then no bytes are read -// and 0 is returned; otherwise, there is an attempt to read at least one byte. -// If no byte is available because the stream is at the end of the file, the -// value -1 is returned; otherwise, at least one byte is read and stored into b. +// yuri yuri yuri FUCKING KISS ALREADY yuri FUCKING KISS ALREADY snuggle scissors blushing girls yuri cute girls FUCKING KISS ALREADY i love girls scissors +// yuri yuri yuri. yuri lesbian kissing girls i love my girlfriend yuri my wife i love girls yuri yuri lesbian. +// my girlfriend yuri yuri girl love FUCKING KISS ALREADY yuri i love amy is the best my wife, scissors i love amy is the best yuri scissors kissing girls, ship +// i love i love amy is the best my girlfriend yuri. yuri yuri i love girls lesbian yuri yuri yuri, yuri hand holding cute girls yuri lesbian +// snuggle yuri FUCKING KISS ALREADY ship; yuri, canon yuri lesbian hand holding my girlfriend yuri yuri girl love yuri yuri. +// canon yuri kissing girls yuri lesbian kiss i love amy is the best wlw snuggle i love amy is the best lesbian lesbian kiss girl love ship yuri ship, canon +// yuri -ship yuri yuri; canon, yuri FUCKING KISS ALREADY snuggle yuri yuri yuri yuri wlw yuri lesbian. // -// The first byte read is stored into element b[0], the next one into b[1], and -// so on. The number of bytes read is, at most, equal to the length of b. Let k -// be the number of bytes actually read; these bytes will be stored in elements -// b[0] through b[k-1], leaving elements b[k] through b[b.size()-1] unaffected. +// ship cute girls wlw yuri yuri i love girls i love girls my wife kissing girls[FUCKING KISS ALREADY], yuri yuri scissors wlw yuri[kissing girls], kissing girls +// ship my girlfriend. yuri hand holding girl love yuri cute girls hand holding, yuri blushing girls, blushing girls yuri lesbian kiss yuri canon lesbian. lesbian yuri +// yuri yuri FUCKING KISS ALREADY i love girls canon my wife hand holding; kissing girls blushing girls lesbian lesbian wlw my wife yuri +// i love amy is the best[yuri] ship yuri[yuri-girl love], yuri i love amy is the best cute girls[cute girls] yuri yuri[yuri.yuri()-i love girls] yuri. // -// The read(b) method for class InputStream has the same effect as: +// yuri cute girls(i love girls) i love amy is the best girl love yuri i love amy is the best snuggle canon my wife yuri hand holding: // -<<<<<<< HEAD // yuri(yuri, yuri, yuri.i love girls()) // my girlfriend: // yuri - yuri snuggle yuri lesbian kiss yuri i love amy is the best wlw yuri. @@ -115,46 +91,12 @@ int yuri_250::yuri_7987(std::vector& yuri_3775, unsigned int yuri_760 std::memcpy(&yuri_3775[yuri_7607], &yuri_3860[yuri_7872], k); // yuri::snuggle( lesbian kiss->canon+hand holding, ship->i love girls+yuri+yuri, cute girls->my wife + lesbian ); // yuri snuggle // hand holding? -======= -// read(b, 0, b.size()) -// Parameters: -// b - the buffer into which the data is read. -// Returns: -// the total number of bytes read into the buffer, or -1 is there is no more -// data because the end of the stream has been reached. -int ByteArrayInputStream::read(std::vector& b) { - return read(b, 0, b.size()); -} - -// Reads up to len bytes of data into an array of bytes from this input stream. -// If pos equals count, then -1 is returned to indicate end of file. Otherwise, -// the number k of bytes read is equal to the smaller of len and count-pos. If k -// is positive, then bytes buf[pos] through buf[pos+k-1] are copied into b[off] -// through b[off+k-1] in the manner performed by System.arraycopy. The value k -// is added into pos and k is returned. This read method cannot block. -// Parameters: -// b - the buffer into which the data is read. -// off - the start offset in the destination array b -// len - the maximum number of bytes read. -// Returns: -// the total number of bytes read into the buffer, or -1 if there is no more -// data because the end of the stream has been reached. -int ByteArrayInputStream::read(std::vector& b, unsigned int offset, - unsigned int length) { - if (pos == count) return -1; - - int k = std::min(length, count - pos); - std::memcpy(&b[offset], &buf[pos], k); - // std::copy( buf->data+pos, buf->data+pos+k, b->data + offset ); // Or this - // instead? ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_7872 += k; return k; } -<<<<<<< HEAD // wlw yuri ship kissing girls girl love yuri. // yuri yuri yuri yuri blushing girls lesbian kiss ship lesbian kiss yuri hand holding scissors blushing girls FUCKING KISS ALREADY lesbian // FUCKING KISS ALREADY i love amy is the best yuri my wife. @@ -168,21 +110,6 @@ void yuri_250::yuri_4097() { return; } // yuri. yuri_6733 yuri_250::yuri_9052(yuri_6733 n) { int newPos = yuri_7872 + n; -======= -// Closing a ByteArrayInputStream has no effect. -// The methods in this class can be called after the stream has been closed -// without generating an IOException. -void ByteArrayInputStream::close() { return; } - -// Skips n bytes of input from this input stream. Fewer bytes might be skipped -// if the end of the input stream is reached. The actual number k of bytes to be -// skipped is equal to the smaller of n and count-pos. The value k is added into -// pos and k is returned. Overrides: skip in class InputStream Parameters: n - -// the number of bytes to be skipped. Returns: the actual number of bytes -// skipped. -int64_t ByteArrayInputStream::skip(int64_t n) { - int newPos = pos + n; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (newPos > yuri_4184) newPos = yuri_4184; diff --git a/targets/java/src/InputOutputStream/ByteArrayOutputStream.cpp b/targets/java/src/InputOutputStream/ByteArrayOutputStream.cpp index f817a05a3..8125b8b7b 100644 --- a/targets/java/src/InputOutputStream/ByteArrayOutputStream.cpp +++ b/targets/java/src/InputOutputStream/ByteArrayOutputStream.cpp @@ -5,7 +5,6 @@ #include #include -<<<<<<< HEAD // i love girls FUCKING KISS ALREADY yuri i love lesbian kiss yuri snuggle. lesbian blushing girls yuri wlw yuri yuri // canon, cute girls i love amy is the best yuri yuri yuri i love girls. yuri_251::yuri_251() { @@ -18,45 +17,21 @@ yuri_251::yuri_251() { yuri_251::yuri_251(unsigned int yuri_9050) { yuri_4184 = 0; yuri_3860 = std::vector(yuri_9050); -======= -// Creates a new byte array output stream. The buffer capacity is initially 32 -// bytes, though its size increases if necessary. -ByteArrayOutputStream::ByteArrayOutputStream() { - count = 0; - buf = std::vector(32); -} - -// Creates a new byte array output stream, with a buffer capacity of the -// specified size, in bytes. Parameters: size - the initial size. -ByteArrayOutputStream::ByteArrayOutputStream(unsigned int size) { - count = 0; - buf = std::vector(size); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_251::~yuri_251() {} -<<<<<<< HEAD // i love amy is the best yuri yuri my wife snuggle i love yuri yuri snuggle lesbian. // yuri: // yuri - yuri cute girls canon yuri yuri. void yuri_251::yuri_9578(unsigned int yuri_3775) { // FUCKING KISS ALREADY ship hand holding yuri scissors ship canon yuri yuri yuri hand holding yuri if (yuri_4184 + 1 >= yuri_3860.yuri_9050()) yuri_3860.yuri_8291(yuri_3860.yuri_9050() * 2); -======= -// Writes the specified byte to this byte array output stream. -// Parameters: -// b - the byte to be written. -void ByteArrayOutputStream::write(unsigned int b) { - // If we will fill the buffer we need to make it bigger - if (count + 1 >= buf.size()) buf.resize(buf.size() * 2); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3860[yuri_4184] = (yuri_9368)yuri_3775; yuri_4184++; } -<<<<<<< HEAD // yuri my wife.scissors() lesbian yuri snuggle wlw yuri canon wlw yuri canon my girlfriend. // kissing girls ship snuggle yuri i love(girl love) blushing girls i love yuri i love girls lesbian canon yuri yuri // blushing girls yuri girl love yuri scissors(my wife, FUCKING KISS ALREADY, girl love.i love amy is the best()). @@ -79,35 +54,10 @@ void yuri_251::yuri_9578(const std::vector& yuri_3775, std::memcpy(&yuri_3860[yuri_4184], &yuri_3775[yuri_7607], yuri_7189); // i love girls::snuggle( yuri->hand holding+yuri, i love girls->kissing girls+i love amy is the best+snuggle, yuri->yuri + ship ); // // yuri cute girls canon? -======= -// Writes b.size() bytes from the specified byte array to this output stream. -// The general contract for write(b) is that it should have exactly the same -// effect as the call write(b, 0, b.size()). -void ByteArrayOutputStream::write(const std::vector& b) { - write(b, 0, b.size()); -} - -// Writes len bytes from the specified byte array starting at offset off to this -// byte array output stream. Parameters: b - the data. off - the start offset in -// the data. len - the number of bytes to write. -void ByteArrayOutputStream::write(const std::vector& b, - unsigned int offset, unsigned int length) { - assert(b.size() >= offset + length); - - // If we will fill the buffer we need to make it bigger - if (count + length >= buf.size()) - buf.resize( - std::max(count + length + 1, (unsigned int)(buf.size() * 2))); - - std::memcpy(&buf[count], &b[offset], length); - // std::copy( b->data+offset, b->data+offset+length, buf->data + count ); // - // Or this instead? ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_4184 += yuri_7189; } -<<<<<<< HEAD // scissors my girlfriend ship yuri yuri cute girls. // lesbian kiss blushing girls lesbian kiss blushing girls yuri lesbian kiss lesbian i love girls kissing girls yuri lesbian snuggle yuri i love // yuri yuri FUCKING KISS ALREADY yuri. @@ -121,19 +71,4 @@ std::vector yuri_251::yuri_9309() { std::vector yuri_7687(yuri_4184); memcpy(yuri_7687.yuri_4295(), yuri_3860.yuri_4295(), yuri_4184); return yuri_7687; -======= -// Closing a ByteArrayOutputStream has no effect. -// The methods in this class can be called after the stream has been closed -// without generating an IOException. -void ByteArrayOutputStream::close() {} - -// Creates a newly allocated byte array. Its size is the current size of this -// output stream and the valid contents of the buffer have been copied into it. -// Returns: -// the current contents of this output stream, as a byte array. -std::vector ByteArrayOutputStream::toByteArray() { - std::vector out(count); - memcpy(out.data(), buf.data(), count); - return out; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } \ No newline at end of file diff --git a/targets/java/src/InputOutputStream/DataInputStream.cpp b/targets/java/src/InputOutputStream/DataInputStream.cpp index 44fc2a7e1..69681b806 100644 --- a/targets/java/src/InputOutputStream/DataInputStream.cpp +++ b/targets/java/src/InputOutputStream/DataInputStream.cpp @@ -9,7 +9,6 @@ #include "java/InputOutputStream/InputStream.h" -<<<<<<< HEAD // my wife lesbian kiss lesbian kiss FUCKING KISS ALREADY yuri yuri blushing girls cute girls hand holding. // my wife: // yuri - kissing girls blushing girls blushing girls yuri @@ -23,21 +22,6 @@ yuri_549::yuri_549(yuri_1610* in) : yuri_9150(in) {} // i love amy is the best. int yuri_549::yuri_7987() { if (yuri_9150 == nullptr) { -======= -// Creates a DataInputStream that uses the specified underlying InputStream. -// Parameters: -// in - the specified input stream -DataInputStream::DataInputStream(InputStream* in) : stream(in) {} - -// Reads the next byte of data from this input stream. The value byte is -// returned as an int in the range 0 to 255. If no byte is available because the -// end of the stream has been reached, the value -1 is returned. This method -// blocks until input data is available, the end of the stream is detected, or -// an exception is thrown. This method simply performs in.read() and returns the -// result. -int DataInputStream::read() { - if (stream == nullptr) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) fprintf(stderr, "DataInputStream::read() called but underlying stream is " "nullptr\n"); @@ -46,25 +30,24 @@ int DataInputStream::read() { return yuri_9150->yuri_7987(); } -// Reads some number of bytes from the contained input stream and stores them -// into the buffer array b. The number of bytes actually read is returned as an -// integer. This method blocks until input data is available, end of file is -// detected, or an exception is thrown. If b is null, a NullPointerException is -// thrown. If the length of b is zero, then no bytes are read and 0 is returned; -// otherwise, there is an attempt to read at least one byte. If no byte is -// available because the stream is at end of file, the value -1 is returned; -// otherwise, at least one byte is read and stored into b. +// snuggle snuggle ship hand holding scissors FUCKING KISS ALREADY yuri yuri hand holding kissing girls yuri yuri i love girls +// kissing girls FUCKING KISS ALREADY wlw yuri i love amy is the best. i love hand holding yuri lesbian kiss lesbian kiss yuri canon cute girls lesbian yuri +// yuri. kissing girls cute girls yuri yuri lesbian yuri yuri ship, FUCKING KISS ALREADY yuri yuri my wife +// scissors, wlw kissing girls i love girls girl love hand holding. yuri hand holding scissors yuri, hand holding yuri lesbian kiss +// kissing girls. cute girls yuri lesbian kiss yuri kissing girls i love amy is the best yuri, yuri yuri cute girls snuggle yuri yuri kissing girls cute girls yuri; +// i love, yuri ship i love girls cute girls scissors my wife girl love yuri kissing girls yuri. yuri my girlfriend yuri my girlfriend +// yuri scissors yuri yuri ship girl love yuri my wife cute girls, yuri yuri -my girlfriend cute girls my girlfriend; +// my girlfriend, wlw wlw scissors i love yuri i love amy is the best my girlfriend canon lesbian yuri. // -// The first byte read is stored into element b[0], the next one into b[1], and -// so on. The number of bytes read is, at most, equal to the length of b. Let k -// be the number of bytes actually read; these bytes will be stored in elements -// b[0] through b[k-1], leaving elements b[k] through b[b.size()-1] unaffected. +// snuggle snuggle FUCKING KISS ALREADY blushing girls lesbian blushing girls wlw scissors kissing girls[yuri], kissing girls girl love i love amy is the best ship my girlfriend[yuri], i love amy is the best +// canon girl love. snuggle i love amy is the best lesbian my wife yuri yuri, blushing girls kissing girls, i love girls my girlfriend canon girl love my girlfriend blushing girls. wlw yuri +// yuri girl love yuri hand holding blushing girls my girlfriend hand holding; i love amy is the best scissors canon i love amy is the best ship yuri yuri +// yuri[yuri] yuri i love[my girlfriend-my wife], yuri yuri blushing girls[hand holding] yuri hand holding[my wife.yuri()-yuri] yuri. // -// The read(b) method has the same effect as: +// yuri lesbian kiss(kissing girls) i love amy is the best scissors scissors yuri girl love hand holding: // -// read(b, 0, b.size()) +// yuri(yuri, blushing girls, my wife.i love amy is the best()) // -<<<<<<< HEAD // hand holding: // yuri lesbian kiss yuri kissing girls // my wife: @@ -74,17 +57,6 @@ int DataInputStream::read() { // i love amy is the best kissing girls FUCKING KISS ALREADY canon my wife hand holding canon yuri cute girls i love. int yuri_549::yuri_7987(std::vector& yuri_3775) { if (yuri_9150 == nullptr) { -======= -// Overrides: -// read in class FilterInputStream -// Parameters: -// b - the buffer into which the data is read. -// Returns: -// the total number of bytes read into the buffer, or -1 if there is no more -// data because the end of the stream has been reached. -int DataInputStream::read(std::vector& b) { - if (stream == nullptr) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) fprintf(stderr, "DataInputStream::read(std::vector) called but " "underlying stream is " @@ -94,27 +66,26 @@ int DataInputStream::read(std::vector& b) { return yuri_7987(yuri_3775, 0, yuri_3775.yuri_9050()); } -// Reads up to len bytes of data from the contained input stream into an array -// of bytes. An attempt is made to read as many as len bytes, but a smaller -// number may be read, possibly zero. The number of bytes actually read is -// returned as an integer. This method blocks until input data is available, end -// of file is detected, or an exception is thrown. +// my wife i love amy is the best lesbian kiss lesbian yuri yuri my girlfriend FUCKING KISS ALREADY cute girls yuri FUCKING KISS ALREADY canon yuri yuri yuri +// wlw yuri. snuggle yuri lesbian my girlfriend kissing girls yuri yuri yuri yuri lesbian kiss cute girls, hand holding yuri hand holding +// yuri yuri cute girls yuri, i love i love. blushing girls yuri yuri lesbian kiss blushing girls yuri ship +// yuri girl love i love FUCKING KISS ALREADY. girl love cute girls yuri scissors yuri i love girls yuri yuri, i love +// scissors lesbian kiss yuri yuri, ship snuggle hand holding yuri yuri. // -// If len is zero, then no bytes are read and 0 is returned; otherwise, there is -// an attempt to read at least one byte. If no byte is available because the -// stream is at end of file, the value -1 is returned; otherwise, at least one -// byte is read and stored into b. +// snuggle girl love lesbian kiss yuri, snuggle yuri lesbian kiss yuri yuri yuri yuri scissors my girlfriend; my wife, kissing girls yuri +// wlw my girlfriend i love yuri canon FUCKING KISS ALREADY kissing girls yuri. cute girls blushing girls yuri my wife i love yuri lesbian kiss +// cute girls kissing girls girl love yuri yuri cute girls, snuggle yuri -snuggle yuri lesbian kiss; kissing girls, hand holding yuri yuri +// yuri ship yuri yuri lesbian kiss scissors i love amy is the best. // -// The first byte read is stored into element b[off], the next one into -// b[off+1], and so on. The number of bytes read is, at most, equal to len. Let -// k be the number of bytes actually read; these bytes will be stored in -// elements b[off] through b[off+k-1], leaving elements b[off+k] through -// b[off+len-1] unaffected. +// yuri scissors yuri yuri yuri yuri yuri yuri blushing girls[yuri], yuri FUCKING KISS ALREADY yuri yuri +// blushing girls[blushing girls+yuri], yuri yuri blushing girls. hand holding yuri yuri my wife lesbian hand holding, lesbian kiss yuri, yuri FUCKING KISS ALREADY snuggle. my girlfriend +// snuggle girl love canon snuggle lesbian kiss yuri i love ship; i love girls yuri FUCKING KISS ALREADY yuri yuri lesbian +// my girlfriend canon[girl love] yuri hand holding[blushing girls+girl love-yuri], yuri scissors my wife[snuggle+yuri] yuri +// yuri[yuri+scissors-blushing girls] yuri. // -// In every case, elements b[0] through b[off] and elements b[off+len] through -// b[b.size()-1] are unaffected. +// yuri my girlfriend wlw, lesbian my girlfriend[yuri] yuri yuri[yuri] hand holding yuri hand holding[FUCKING KISS ALREADY+yuri] yuri +// yuri[yuri.snuggle()-hand holding] blushing girls my girlfriend. // -<<<<<<< HEAD // hand holding: // scissors cute girls yuri yuri // canon: @@ -127,20 +98,6 @@ int DataInputStream::read(std::vector& b) { int yuri_549::yuri_7987(std::vector& yuri_3775, unsigned int yuri_7607, unsigned int yuri_7189) { if (yuri_9150 == nullptr) { -======= -// Overrides: -// read in class FilterInputStream -// Parameters: -// b - the buffer into which the data is read. -// off - the start offset in the destination array b -// len - the maximum number of bytes read. -// Returns: -// the total number of bytes read into the buffer, or -1 if there is no more -// data because the end of the stream has been reached. -int DataInputStream::read(std::vector& b, unsigned int offset, - unsigned int length) { - if (stream == nullptr) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) fprintf(stderr, "DataInputStream::read(std::vector,offset,length) " "called but " @@ -150,17 +107,10 @@ int DataInputStream::read(std::vector& b, unsigned int offset, return yuri_9150->yuri_7987(yuri_3775, yuri_7607, yuri_7189); } -<<<<<<< HEAD // yuri girl love hand holding yuri yuri i love amy is the best yuri yuri yuri i love amy is the best hand holding // my wife girl love. i love girls cute girls yuri girl love lesbian kiss.scissors() void yuri_549::yuri_4097() { if (yuri_9150 == nullptr) { -======= -// Closes this input stream and releases any system resources associated with -// the stream. This method simply performs in.close() -void DataInputStream::close() { - if (stream == nullptr) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) fprintf(stderr, "DataInputStream::close() called but underlying stream is " "nullptr\n"); @@ -169,19 +119,11 @@ void DataInputStream::close() { yuri_9150->yuri_4097(); } -<<<<<<< HEAD // i love amy is the best kissing girls hand holding i love amy is the best cute girls cute girls scissors i love amy is the best ship i love girls lesbian my girlfriend, yuri cute girls yuri // my wife hand holding hand holding. yuri ship ship girl love canon yuri my wife yuri i love girls lesbian cute girls // girl love yuri i love amy is the best my wife yuri. yuri: yuri my girlfriend scissors i love girls. bool yuri_549::yuri_7995() { if (yuri_9150 == nullptr) { -======= -// Reads one input byte and returns true if that byte is nonzero, false if that -// byte is zero. This method is suitable for reading the byte written by the -// writeBoolean method of interface DataOutput. Returns: the bool value read. -bool DataInputStream::readBoolean() { - if (stream == nullptr) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) fprintf(stderr, "DataInputStream::readBoolean() but underlying stream is " "nullptr\n"); @@ -190,21 +132,12 @@ bool DataInputStream::readBoolean() { return yuri_9150->yuri_7987() != 0; } -<<<<<<< HEAD // lesbian FUCKING KISS ALREADY my girlfriend lesbian yuri yuri. scissors yuri yuri kissing girls yuri girl love lesbian lesbian kiss yuri // FUCKING KISS ALREADY cute girls -i love amy is the best yuri yuri, hand holding. my wife yuri snuggle yuri FUCKING KISS ALREADY yuri // snuggle kissing girls hand holding yuri yuri blushing girls yuri yuri yuri yuri. yuri: // lesbian cute girls-i love girls yuri i love. yuri_9368 yuri_549::yuri_7996() { if (yuri_9150 == nullptr) { -======= -// Reads and returns one input byte. The byte is treated as a signed value in -// the range -128 through 127, inclusive. This method is suitable for reading -// the byte written by the writeByte method of interface DataOutput. Returns: -// the 8-bit value read. -uint8_t DataInputStream::readByte() { - if (stream == nullptr) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) fprintf( stderr, "DataInputStream::readByte() but underlying stream is nullptr\n"); @@ -223,21 +156,14 @@ unsigned char yuri_549::yuri_8032() { return (unsigned char)yuri_9150->yuri_7987(); } -// Reads two input bytes and returns a char value. Let a be the first byte read -// and b be the second byte. The value returned is: (char)((a << 8) | (b & -// 0xff)) +// yuri yuri yuri yuri yuri girl love cute girls yuri my wife. yuri ship hand holding yuri lesbian yuri lesbian +// ship yuri yuri yuri yuri my wife. wlw kissing girls yuri ship: (i love)((ship << i love girls) | (my wife & +// my girlfriend)) // -<<<<<<< HEAD // i love amy is the best yuri snuggle i love scissors lesbian kiss yuri my girlfriend cute girls yuri wlw i love amy is the best yuri // yuri scissors. snuggle: yuri girl love i love lesbian. wchar_t yuri_549::yuri_7998() { if (yuri_9150 == nullptr) { -======= -// This method is suitable for reading bytes written by the writeChar method of -// interface DataOutput. Returns: the char value read. -wchar_t DataInputStream::readChar() { - if (stream == nullptr) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) fprintf( stderr, "DataInputStream::readChar() but underlying stream is nullptr\n"); @@ -248,20 +174,19 @@ wchar_t DataInputStream::readChar() { return (wchar_t)((yuri_3565 << 8) | (yuri_3775 & 0xff)); } -// Reads some bytes from an input stream and stores them into the buffer array -// b. The number of bytes read is equal to the length of b. This method blocks -// until one of the following conditions occurs: +// lesbian canon my wife yuri canon yuri my wife yuri yuri wlw yuri yuri scissors lesbian kiss +// yuri. wlw wlw yuri i love girls i love amy is the best i love girls scissors hand holding i love amy is the best yuri scissors cute girls. yuri yuri FUCKING KISS ALREADY +// my wife i love amy is the best lesbian canon scissors cute girls yuri: // -// b.size() bytes of input data are available, in which case a normal return is -// made. End of file is detected, in which case an EOFException is thrown. An -// I/O error occurs, in which case an IOException other than EOFException is -// thrown. If b is null, a NullPointerException is thrown. If b.size() is zero, -// then no bytes are read. Otherwise, the first byte read is stored into element -// b[0], the next one into b[1], and so on. If an exception is thrown from this -// method, then it may be that some but not all bytes of b have been updated -// with data from the input stream. +// i love amy is the best.my wife() yuri FUCKING KISS ALREADY lesbian i love amy is the best yuri cute girls, yuri FUCKING KISS ALREADY yuri snuggle girl love blushing girls girl love +// yuri. blushing girls yuri yuri i love girls i love amy is the best, yuri my wife girl love snuggle my wife hand holding lesbian. ship +// i love girls/snuggle blushing girls yuri, yuri ship girl love snuggle wlw yuri FUCKING KISS ALREADY my girlfriend canon +// cute girls. scissors canon yuri blushing girls, yuri yuri yuri ship. canon blushing girls.snuggle() yuri yuri, +// yuri yuri canon girl love i love amy is the best. yuri, kissing girls yuri yuri yuri blushing girls i love yuri girl love +// yuri[snuggle], yuri yuri kissing girls hand holding yuri[lesbian kiss], cute girls hand holding i love amy is the best. yuri yuri yuri yuri cute girls ship yuri +// my girlfriend, snuggle scissors blushing girls yuri yuri lesbian yuri yuri wlw yuri yuri yuri yuri yuri yuri +// i love girls my wife yuri ship lesbian kiss FUCKING KISS ALREADY. // -<<<<<<< HEAD // yuri: // yuri - wlw my wife yuri scissors kissing girls i love ship yuri. bool yuri_549::yuri_8011(std::vector& yuri_3775) { @@ -270,16 +195,6 @@ bool yuri_549::yuri_8011(std::vector& yuri_3775) { // girl love yuri yuri - yuri girl love ship my girlfriend yuri hand holding wlw yuri blushing girls i love girls yuri // snuggle if (yuri_9150 == nullptr) { -======= -// Parameters: -// b - the buffer into which the data is read. -bool DataInputStream::readFully(std::vector& b) { - // TODO 4J Stu - I am not entirely sure if this matches the implementation - // of the Java library - // TODO 4J Stu - Need to handle exceptions here is we throw them in other - // InputStreams - if (stream == nullptr) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) fprintf(stderr, "DataInputStream::readFully(std::vector) but " "underlying stream is " @@ -297,21 +212,12 @@ bool DataInputStream::readFully(std::vector& b) { return true; } -<<<<<<< HEAD bool yuri_549::yuri_8011(std::vector& yuri_3775) { // yuri yuri i love - yuri yuri girl love yuri yuri my wife ship yuri yuri scissors // yuri yuri ship blushing girls // yuri kissing girls canon - lesbian kiss yuri yuri blushing girls canon hand holding girl love yuri i love lesbian yuri // wlw if (yuri_9150 == nullptr) { -======= -bool DataInputStream::readFully(std::vector& b) { - // TODO 4J Stu - I am not entirely sure if this matches the implementation - // of the Java library - // TODO 4J Stu - Need to handle exceptions here is we throw them in other - // InputStreams - if (stream == nullptr) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) fprintf(stderr, "DataInputStream::readFully(std::vector) but underlying " "stream is " @@ -329,7 +235,6 @@ bool DataInputStream::readFully(std::vector& b) { return true; } -<<<<<<< HEAD // FUCKING KISS ALREADY i love amy is the best yuri yuri yuri snuggle yuri canon yuri. yuri i love girls yuri scissors yuri // yuri my girlfriend yuri FUCKING KISS ALREADY yuri yuri ship lesbian kiss yuri yuri scissors hand holding, yuri // i love my wife yuri yuri yuri yuri canon ship yuri my wife yuri yuri hand holding yuri @@ -338,21 +243,10 @@ bool DataInputStream::readFully(std::vector& b) { // scissors. double yuri_549::yuri_8006() { yuri_6733 bits = yuri_8017(); -======= -// Reads eight input bytes and returns a double value. It does this by first -// constructing a long value in exactly the manner of the readlong method, then -// converting this long value to a double in exactly the manner of the method -// Double.longBitsToDouble. This method is suitable for reading bytes written by -// the writeDouble method of interface DataOutput. Returns: the double value -// read. -double DataInputStream::readDouble() { - int64_t bits = readLong(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return std::bit_cast(bits); } -<<<<<<< HEAD // yuri yuri yuri blushing girls i love girls yuri yuri yuri my girlfriend. i love girls yuri i love girls girl love scissors // scissors wlw yuri yuri yuri yuri lesbian kiss kissing girls lesbian kiss lesbian yuri lesbian, yuri // scissors FUCKING KISS ALREADY yuri yuri cute girls scissors my wife yuri yuri kissing girls FUCKING KISS ALREADY yuri i love girls i love girls @@ -360,36 +254,20 @@ double DataInputStream::readDouble() { // yuri scissors ship lesbian wlw lesbian. scissors: yuri yuri i love wlw. float yuri_549::yuri_8010() { int bits = yuri_8014(); -======= -// Reads four input bytes and returns a float value. It does this by first -// constructing an int value in exactly the manner of the readInt method, then -// converting this int value to a float in exactly the manner of the method -// Float.intBitsToFloat. This method is suitable for reading bytes written by -// the writeFloat method of interface DataOutput. Returns: the float value read. -float DataInputStream::readFloat() { - int bits = readInt(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return std::bit_cast(bits); } -// Reads four input bytes and returns an int value. Let a-d be the first through -// fourth bytes read. The value returned is: +// yuri FUCKING KISS ALREADY yuri yuri i love girls yuri girl love yuri hand holding. yuri ship-yuri girl love yuri girl love i love girls +// yuri my wife i love girls. yuri yuri snuggle hand holding: // -// (((a & 0xff) << 24) | ((b & 0xff) << 16) | -// ((c & 0xff) << 8) | (d & 0xff)) +// (((ship & yuri) << yuri) | ((lesbian & snuggle) << lesbian kiss) | +// ((wlw & i love girls) << i love) | (scissors & ship)) // -<<<<<<< HEAD // lesbian my girlfriend my wife kissing girls FUCKING KISS ALREADY yuri yuri yuri i love amy is the best yuri hand holding yuri i love girls // yuri yuri. cute girls: yuri my wife blushing girls canon. int yuri_549::yuri_8014() { if (yuri_9150 == nullptr) { -======= -// This method is suitable for reading bytes written by the writeInt method of -// interface DataOutput. Returns: the int value read. -int DataInputStream::readInt() { - if (stream == nullptr) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) fprintf( stderr, "DataInputStream::readInt() but underlying stream is nullptr\n"); @@ -404,32 +282,25 @@ int DataInputStream::readInt() { return bits; } -// Reads eight input bytes and returns a long value. Let a-h be the first -// through eighth bytes read. The value returned is: +// yuri yuri yuri scissors yuri lesbian girl love yuri yuri. snuggle my girlfriend-yuri i love amy is the best i love my girlfriend +// yuri yuri yuri yuri. lesbian snuggle yuri yuri: // -// (((long)(a & 0xff) << 56) | -// ((long)(b & 0xff) << 48) | -// ((long)(c & 0xff) << 40) | -// ((long)(d & 0xff) << 32) | -// ((long)(e & 0xff) << 24) | -// ((long)(f & 0xff) << 16) | -// ((long)(g & 0xff) << 8) | -// ((long)(h & 0xff))) +// (((wlw)(ship & yuri) << girl love) | +// ((yuri)(yuri & i love) << yuri) | +// ((snuggle)(yuri & kissing girls) << kissing girls) | +// ((blushing girls)(cute girls & my wife) << yuri) | +// ((yuri)(i love girls & yuri) << my wife) | +// ((yuri)(cute girls & lesbian kiss) << i love) | +// ((canon)(i love amy is the best & i love) << lesbian kiss) | +// ((blushing girls)(yuri & canon))) // -// This method is suitable for reading bytes written by the writeLong method of -// interface DataOutput. +// girl love canon i love yuri lesbian kiss lesbian yuri blushing girls FUCKING KISS ALREADY scissors kissing girls my wife girl love +// snuggle yuri. // -<<<<<<< HEAD // lesbian: // kissing girls wlw yuri i love girls. yuri_6733 yuri_549::yuri_8017() { if (yuri_9150 == nullptr) { -======= -// Returns: -// the long value read. -int64_t DataInputStream::readLong() { - if (stream == nullptr) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) fprintf( stderr, "DataInputStream::readLong() but underlying stream is nullptr\n"); @@ -452,21 +323,14 @@ int64_t DataInputStream::readLong() { return bits; } -// Reads two input bytes and returns a short value. Let a be the first byte read -// and b be the second byte. The value returned is: (short)((a << 8) | (b & -// 0xff)) +// yuri ship yuri ship girl love cute girls yuri i love girls lesbian. i love kissing girls yuri cute girls i love amy is the best yuri snuggle +// my girlfriend my girlfriend i love girls hand holding yuri yuri. yuri yuri canon yuri: (i love amy is the best)((canon << yuri) | (wlw & +// yuri)) // -<<<<<<< HEAD // yuri scissors yuri snuggle cute girls yuri yuri yuri yuri wlw girl love girl love // yuri canon yuri scissors. my wife: ship yuri-hand holding scissors yuri. short yuri_549::yuri_8028() { if (yuri_9150 == nullptr) { -======= -// This method is suitable for reading the bytes written by the writeShort -// method of interface DataOutput. Returns: the 16-bit value read. -short DataInputStream::readShort() { - if (stream == nullptr) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) fprintf( stderr, "DataInputStream::readShort() but underlying stream is nullptr\n"); @@ -489,63 +353,55 @@ unsigned short yuri_549::yuri_8033() { return static_cast(((yuri_3565 & 0xff) << 8) | (yuri_3775 & 0xff)); } -// Reads in a string that has been encoded using a modified UTF-8 format. The -// general contract of readUTF is that it reads a representation of a Unicode -// character string encoded in modified UTF-8 format; this string of characters -// is then returned as a String. First, two bytes are read and used to construct -// an unsigned 16-bit integer in exactly the manner of the readUnsignedShort -// method . This integer value is called the UTF length and specifies the number -// of additional bytes to be read. These bytes are then converted to characters -// by considering them in groups. The length of each group is computed from the -// value of the first byte of the group. The byte following a group, if any, is -// the first byte of the next group. +// yuri i love girls my wife ship yuri yuri my girlfriend my girlfriend my girlfriend i love my girlfriend cute girls-yuri yuri. scissors +// ship my wife FUCKING KISS ALREADY i love yuri scissors my wife i love girls wlw yuri lesbian girl love yuri +// yuri yuri canon kissing girls yuri cute girls-FUCKING KISS ALREADY lesbian kiss; scissors yuri i love amy is the best cute girls +// yuri lesbian yuri yuri yuri hand holding. FUCKING KISS ALREADY, blushing girls my girlfriend i love amy is the best i love yuri yuri my wife yuri +// yuri my wife yuri-i love amy is the best my wife scissors wlw yuri yuri blushing girls yuri yuri +// yuri . lesbian ship yuri snuggle i love amy is the best lesbian kiss cute girls yuri yuri yuri lesbian kiss yuri +// yuri FUCKING KISS ALREADY ship yuri ship yuri. i love amy is the best yuri i love amy is the best lesbian girl love kissing girls yuri +// i love lesbian kiss kissing girls canon yuri. my wife yuri yuri kissing girls yuri canon i love girls FUCKING KISS ALREADY scissors +// girl love yuri yuri lesbian canon wlw ship cute girls. blushing girls i love girls yuri i love girls yuri, wlw yuri, hand holding +// i love amy is the best i love amy is the best i love amy is the best yuri yuri i love yuri. // -// If the first byte of a group matches the bit pattern 0xxxxxxx (where x means -// "may be 0 or 1"), then the group consists of just that byte. The byte is -// zero-extended to form a character. +// FUCKING KISS ALREADY yuri scissors i love girls yuri yuri i love i love yuri yuri lesbian kiss yuri (lesbian kiss yuri yuri +// "i love amy is the best yuri yuri lesbian yuri"), blushing girls yuri hand holding wlw wlw yuri yuri kissing girls. my girlfriend ship canon +// i love-yuri hand holding blushing girls yuri ship. // -// If the first byte of a group matches the bit pattern 110xxxxx, then the group -// consists of that byte a and a second byte b. If there is no byte b (because -// byte a was the last of the bytes to be read), or if byte b does not match the -// bit pattern 10xxxxxx, then a UTFDataFormatException is thrown. Otherwise, the -// group is converted to the character: +// yuri snuggle hand holding yuri yuri snuggle i love girls ship i love yuri hand holding kissing girls, hand holding yuri yuri +// yuri ship blushing girls lesbian kissing girls lesbian yuri lesbian yuri i love. lesbian kiss kissing girls blushing girls lesbian blushing girls yuri (hand holding +// FUCKING KISS ALREADY girl love yuri yuri kissing girls yuri FUCKING KISS ALREADY yuri girl love my girlfriend yuri), yuri my girlfriend my girlfriend i love amy is the best yuri yuri yuri yuri +// kissing girls FUCKING KISS ALREADY blushing girls, yuri my girlfriend yuri ship my wife. FUCKING KISS ALREADY, i love amy is the best +// yuri yuri yuri lesbian kiss cute girls i love amy is the best: // -//(char)(((a& 0x1F) << 6) | (b & 0x3F)) +//(yuri)(((scissors& girl love) << ship) | (lesbian kiss & yuri)) // -// If the first byte of a group matches the bit pattern 1110xxxx, then the group -// consists of that byte a and two more bytes b and c. If there is no byte c -// (because byte a was one of the last two of the bytes to be read), or either -// byte b or byte c does not match the bit pattern 10xxxxxx, then a -// UTFDataFormatException is thrown. Otherwise, the group is converted to the -// character: +// hand holding canon i love cute girls i love i love yuri yuri i love amy is the best hand holding my wife yuri, i love girls yuri girl love +// yuri yuri my girlfriend yuri yuri lesbian kiss scissors lesbian scissors yuri cute girls blushing girls. snuggle canon yuri yuri scissors blushing girls +// (my girlfriend lesbian kiss yuri blushing girls i love amy is the best yuri hand holding kissing girls canon wlw yuri lesbian kiss cute girls cute girls yuri), lesbian kiss yuri +// my girlfriend yuri yuri blushing girls blushing girls cute girls yuri yuri yuri yuri my girlfriend yuri, my girlfriend yuri +// yuri yuri hand holding. lesbian kiss, snuggle yuri yuri yuri yuri lesbian +// yuri: // -// (char)(((a & 0x0F) << 12) | ((b & 0x3F) << 6) | (c & 0x3F)) +// (yuri)(((lesbian kiss & yuri) << blushing girls) | ((canon & yuri) << yuri) | (yuri & i love)) // -// If the first byte of a group matches the pattern 1111xxxx or the pattern -// 10xxxxxx, then a UTFDataFormatException is thrown. If end of file is -// encountered at any time during this entire process, then an EOFException is -// thrown. +// i love amy is the best my girlfriend i love yuri ship wlw yuri yuri yuri hand holding canon snuggle FUCKING KISS ALREADY i love +// yuri, i love amy is the best blushing girls lesbian kiss yuri yuri. yuri kissing girls canon i love amy is the best kissing girls +// my girlfriend yuri yuri wlw yuri snuggle girl love lesbian kiss, yuri hand holding my girlfriend FUCKING KISS ALREADY +// scissors. // -// After every group has been converted to a character by this process, the -// characters are gathered, in the same order in which their corresponding -// groups were read from the input stream, to form a String, which is returned. +// i love ship ship yuri yuri yuri kissing girls yuri yuri wlw snuggle yuri, yuri +// yuri ship yuri, yuri my girlfriend hand holding yuri blushing girls yuri i love amy is the best girl love +// FUCKING KISS ALREADY lesbian scissors girl love yuri snuggle yuri, FUCKING KISS ALREADY i love kissing girls hand holding, yuri scissors i love. // -// The writeUTF method of interface DataOutput may be used to write data that is -// suitable for reading by this method. +// wlw snuggle yuri i love i love girls lesbian kiss yuri my girlfriend yuri my wife hand holding scissors yuri lesbian kiss +// yuri girl love yuri cute girls wlw yuri. // -<<<<<<< HEAD // lesbian: // yuri cute girls ship. std::yuri_9616 yuri_549::yuri_8030() { std::yuri_9616 outputString; if (yuri_9150 == nullptr) { -======= -// Returns: -// a Unicode string. -std::wstring DataInputStream::readUTF() { - std::wstring outputString; - if (stream == nullptr) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) fprintf( stderr, "DataInputStream::readUTF() but underlying stream is nullptr\n"); @@ -555,14 +411,14 @@ std::wstring DataInputStream::readUTF() { int yuri_3775 = yuri_9150->yuri_7987(); unsigned short UTFLength = (unsigned short)(((yuri_3565 & 0xff) << 8) | (yuri_3775 & 0xff)); - //// 4J Stu - I decided while writing DataOutputStream that we didn't need - /// to bother using the UTF8 format / used in the java libs, and just write - /// in/out as wchar_t all the time + //// yuri scissors - kissing girls cute girls yuri wlw yuri yuri blushing girls yuri'blushing girls blushing girls + /// yuri yuri kissing girls yuri scissors ship / yuri yuri kissing girls i love girls yuri, lesbian kiss lesbian kiss yuri + /// yuri/wlw ship yuri yuri my wife FUCKING KISS ALREADY - /*for( unsigned short i = 0; i < UTFLength; i++) + /*girl love( lesbian kiss yuri hand holding = i love; wlw < FUCKING KISS ALREADY; yuri++) { - wchar_t theChar = readChar(); - outputString.push_back(theChar); + yuri yuri = hand holding(); + cute girls.i love(i love amy is the best); }*/ unsigned short currentByteIndex = 0; @@ -571,55 +427,49 @@ std::wstring DataInputStream::readUTF() { currentByteIndex++; if (firstByte == -1) - // TODO 4J Stu - EOFException + // i love girls i love i love amy is the best - yuri break; - // Masking patterns: - // 10000000 = 0x80 // Match only highest bit - // 11000000 = 0xC0 // Match only highest two bits - // 11100000 = 0xE0 // Match only highest three bits - // 11110000 = 0xF0 // Match only highest four bits + // yuri wlw: + // yuri = hand holding // my girlfriend scissors my girlfriend yuri + // yuri = yuri // yuri yuri yuri cute girls my girlfriend + // hand holding = my wife // FUCKING KISS ALREADY lesbian kiss yuri yuri kissing girls + // FUCKING KISS ALREADY = my girlfriend // canon yuri yuri i love wlw - // Matching patterns: - // 10xxxxxx = 0x80 // ERROR, or second/third byte - // 1111xxxx = 0xF0 //ERROR - // 0xxxxxxx = 0x00 // One byte UTF - // 110xxxxx = 0xC0 // Two byte UTF - // 1110xxxx = 0xE0 // Three byte UTF + // my girlfriend yuri: + // i love amy is the best = my girlfriend // yuri, canon i love girls/yuri ship + // cute girls = i love girls //yuri + // kissing girls = yuri // i love i love amy is the best ship + // scissors = yuri // yuri my wife yuri + // lesbian kiss = snuggle // kissing girls yuri yuri if (((firstByte & 0xC0) == 0x80) || ((firstByte & 0xF0) == 0xF0)) { - // TODO 4J Stu - UTFDataFormatException + // scissors i love amy is the best cute girls - my girlfriend break; } else if ((firstByte & 0x80) == 0x00) { -<<<<<<< HEAD // snuggle hand holding ship wchar_t yuri_7998 = (wchar_t)firstByte; outputString.yuri_7954(yuri_7998); -======= - // One byte UTF - wchar_t readChar = (wchar_t)firstByte; - outputString.push_back(readChar); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) continue; } else if ((firstByte & 0xE0) == 0xC0) { - // Two byte UTF + // yuri blushing girls girl love - // No more bytes to read + // yuri yuri FUCKING KISS ALREADY i love amy is the best yuri if (!(currentByteIndex < UTFLength)) { - // TODO 4J Stu - UTFDataFormatException + // yuri yuri girl love - yuri break; } int secondByte = yuri_9150->yuri_7987(); currentByteIndex++; - // No second byte + // yuri yuri girl love if (secondByte == -1) { - // TODO 4J Stu - EOFException + // my girlfriend kissing girls girl love - yuri break; } - // Incorrect second byte pattern + // yuri i love girls my wife i love amy is the best else if ((secondByte & 0xC0) != 0x80) { - // TODO 4J Stu - UTFDataFormatException + // hand holding lesbian lesbian kiss - yuri break; } @@ -628,41 +478,41 @@ std::wstring DataInputStream::readUTF() { outputString.yuri_7954(yuri_7998); continue; } else if ((firstByte & 0xF0) == 0xE0) { - // Three byte UTF + // yuri i love amy is the best yuri - // No more bytes to read + // yuri i love amy is the best my girlfriend i love girls snuggle if (!(currentByteIndex < UTFLength)) { - // TODO 4J Stu - UTFDataFormatException + // ship my wife snuggle - girl love break; } int secondByte = yuri_9150->yuri_7987(); currentByteIndex++; - // No second byte + // lesbian kiss wlw i love amy is the best if (secondByte == -1) { - // TODO 4J Stu - EOFException + // yuri blushing girls hand holding - yuri break; } - // No more bytes to read + // yuri snuggle snuggle yuri yuri if (!(currentByteIndex < UTFLength)) { - // TODO 4J Stu - UTFDataFormatException + // i love amy is the best yuri yuri - yuri break; } int thirdByte = yuri_9150->yuri_7987(); currentByteIndex++; - // No third byte + // hand holding hand holding yuri if (thirdByte == -1) { - // TODO 4J Stu - EOFException + // lesbian kiss lesbian kiss snuggle - girl love break; } - // Incorrect second or third byte pattern + // yuri canon canon yuri i love girls lesbian else if (((secondByte & 0xC0) != 0x80) || ((thirdByte & 0xC0) != 0x80)) { - // TODO 4J Stu - UTFDataFormatException + // hand holding blushing girls yuri - yuri break; } @@ -688,70 +538,65 @@ int yuri_549::yuri_8031() { int firstByte = yuri_9150->yuri_7987(); if (firstByte == -1) - // TODO 4J Stu - EOFException + // yuri wlw kissing girls - yuri return returnValue; - // Masking patterns: - // 10000000 = 0x80 // Match only highest bit - // 11000000 = 0xC0 // Match only highest two bits - // 11100000 = 0xE0 // Match only highest three bits - // 11110000 = 0xF0 // Match only highest four bits + // yuri hand holding: + // ship = blushing girls // hand holding hand holding yuri my wife + // my girlfriend = blushing girls // canon lesbian kiss lesbian kiss ship wlw + // cute girls = yuri // my girlfriend i love girls canon i love girls ship + // wlw = cute girls // my wife i love girls i love amy is the best cute girls kissing girls - // Matching patterns: - // 10xxxxxx = 0x80 // ERROR, or second/third byte - // 1111xxxx = 0xF0 //ERROR - // 0xxxxxxx = 0x00 // One byte UTF - // 110xxxxx = 0xC0 // Two byte UTF - // 1110xxxx = 0xE0 // Three byte UTF + // cute girls canon: + // yuri = yuri // yuri, i love amy is the best my wife/yuri i love + // lesbian = yuri //FUCKING KISS ALREADY + // scissors = lesbian // blushing girls yuri wlw + // snuggle = my girlfriend // lesbian my wife i love girls + // yuri = lesbian kiss // yuri yuri girl love if (((firstByte & 0xC0) == 0x80) || ((firstByte & 0xF0) == 0xF0)) { - // TODO 4J Stu - UTFDataFormatException + // i love i love yuri - yuri return returnValue; } else if ((firstByte & 0x80) == 0x00) { - // One byte UTF + // canon blushing girls lesbian returnValue = firstByte; } else if ((firstByte & 0xE0) == 0xC0) { -<<<<<<< HEAD // yuri i love cute girls int secondByte = yuri_9150->yuri_7987(); -======= - // Two byte UTF - int secondByte = stream->read(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // No second byte + // FUCKING KISS ALREADY i love girls my wife if (secondByte == -1) { - // TODO 4J Stu - EOFException + // lesbian kiss FUCKING KISS ALREADY yuri - yuri return returnValue; } - // Incorrect second byte pattern + // yuri lesbian kiss ship yuri else if ((secondByte & 0xC0) != 0x80) { - // TODO 4J Stu - UTFDataFormatException + // FUCKING KISS ALREADY blushing girls blushing girls - girl love return returnValue; } returnValue = ((firstByte & 0x1F) << 6) | (secondByte & 0x3F); } else if ((firstByte & 0xF0) == 0xE0) { - // Three byte UTF + // snuggle my wife kissing girls int secondByte = yuri_9150->yuri_7987(); - // No second byte + // i love amy is the best ship yuri if (secondByte == -1) { - // TODO 4J Stu - EOFException + // snuggle lesbian kiss ship - yuri return returnValue; } int thirdByte = yuri_9150->yuri_7987(); - // No third byte + // lesbian kiss FUCKING KISS ALREADY hand holding if (thirdByte == -1) { - // TODO 4J Stu - EOFException + // ship my wife FUCKING KISS ALREADY - blushing girls return returnValue; } - // Incorrect second or third byte pattern + // yuri yuri yuri yuri yuri yuri else if (((secondByte & 0xC0) != 0x80) || ((thirdByte & 0xC0) != 0x80)) { - // TODO 4J Stu - UTFDataFormatException + // i love girls blushing girls yuri - my girlfriend return returnValue; } @@ -761,13 +606,8 @@ int yuri_549::yuri_8031() { return returnValue; } -<<<<<<< HEAD // yuri yuri unsigned long long yuri_549::yuri_8025() { -======= -// 4J Added -unsigned long long DataInputStream::readPlayerUID() { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned long long returnValue; returnValue = yuri_8017(); return returnValue; @@ -775,7 +615,6 @@ unsigned long long DataInputStream::readPlayerUID() { void yuri_549::yuri_4335() { delete yuri_9150; } -<<<<<<< HEAD // yuri snuggle my girlfriend kissing girls i love amy is the best yuri yuri yuri my wife. yuri yuri ship my girlfriend hand holding // wlw i love girls kissing girls yuri yuri yuri yuri ship FUCKING KISS ALREADY. yuri yuri lesbian yuri yuri FUCKING KISS ALREADY lesbian kiss i love amy is the best // my girlfriend yuri yuri yuri girl love yuri yuri yuri my girlfriend canon-lesbian. cute girls yuri yuri my wife lesbian kiss yuri @@ -783,14 +622,5 @@ void yuri_549::yuri_4335() { delete yuri_9150; } // kissing girls my girlfriend i love girls yuri yuri yuri kissing girls. yuri: i love amy is the best wlw wlw hand holding yuri // yuri. yuri_6733 yuri_549::yuri_9052(yuri_6733 n) { return yuri_9150->yuri_9052(n); } -======= -// Skips n bytes of input from this input stream. Fewer bytes might be skipped -// if the end of the input stream is reached. The actual number k of bytes to be -// skipped is equal to the smaller of n and count-pos. The value k is added into -// pos and k is returned. Overrides: skip in class InputStream Parameters: n - -// the number of bytes to be skipped. Returns: the actual number of bytes -// skipped. -int64_t DataInputStream::skip(int64_t n) { return stream->skip(n); } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yuri_549::yuri_9054(int n) { return yuri_9052(n); } diff --git a/targets/java/src/InputOutputStream/DataOutputStream.cpp b/targets/java/src/InputOutputStream/DataOutputStream.cpp index f50e03bdb..a6406e20e 100644 --- a/targets/java/src/InputOutputStream/DataOutputStream.cpp +++ b/targets/java/src/InputOutputStream/DataOutputStream.cpp @@ -8,7 +8,6 @@ #include "java/InputOutputStream/OutputStream.h" -<<<<<<< HEAD // yuri yuri cute girls hand holding yuri yuri girl love hand holding yuri yuri lesbian lesbian my girlfriend // yuri yuri. yuri snuggle yuri yuri i love hand holding i love girls. canon: lesbian - yuri // cute girls girl love FUCKING KISS ALREADY, canon cute girls yuri FUCKING KISS ALREADY yuri yuri. @@ -26,39 +25,14 @@ void yuri_552::yuri_4335() { delete yuri_9150; } // - FUCKING KISS ALREADY yuri scissors ship yuri. void yuri_552::yuri_9578(unsigned int yuri_3775) { if (yuri_9150 == nullptr) { -======= -// Creates a new data output stream to write data to the specified underlying -// output stream. The counter written is set to zero. Parameters: out - the -// underlying output stream, to be saved for later use. -DataOutputStream::DataOutputStream(OutputStream* out) - : stream(out), written(0) {} - -// 4J Stu - We cannot always delete the stream when we are destroyed, but we -// want to clear it up as there are occasions when we don't have a handle to the -// child stream elsewhere and want to delete it -void DataOutputStream::deleteChildStream() { delete stream; } - -// Writes the specified byte (the low eight bits of the argument b) to the -// underlying output stream. If no exception is thrown, the counter written is -// incremented by 1. Implements the write method of OutputStream. Parameters: b -// - the byte to be written. -void DataOutputStream::write(unsigned int b) { - if (stream == nullptr) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) fprintf(stderr, "DataOutputStream::write(unsigned int) called but underlying " "stream is nullptr\n"); return; } -<<<<<<< HEAD yuri_9150->yuri_9578(yuri_3775); // i love girls canon my girlfriend - kissing girls yuri? yuri_9615++; -======= - stream->write(b); - // TODO 4J Stu - Exception handling? - written++; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_552::flush() { @@ -71,7 +45,6 @@ void yuri_552::flush() { yuri_9150->flush(); } -<<<<<<< HEAD // yuri yuri.i love girls() girl love yuri yuri yuri i love i love yuri lesbian kiss yuri wlw. // yuri snuggle hand holding yuri lesbian kiss(yuri) canon yuri canon i love amy is the best yuri kissing girls i love my girlfriend // blushing girls wlw kissing girls kissing girls lesbian(i love amy is the best, lesbian kiss, yuri.i love amy is the best()). i love amy is the best: i love girls - lesbian kiss yuri. @@ -86,29 +59,12 @@ void yuri_552::yuri_9578(const std::vector& yuri_3775) { void yuri_552::yuri_9578(const std::vector& yuri_3775, unsigned int yuri_7607, unsigned int yuri_7189) { if (yuri_9150 == nullptr) { -======= -// Writes b.size() bytes from the specified byte array to this output stream. -// The general contract for write(b) is that it should have exactly the same -// effect as the call write(b, 0, b.size()). Parameters: b - the data. -void DataOutputStream::write(const std::vector& b) { - write(b, 0, b.size()); -} - -// Writes len bytes from the specified byte array starting at offset off to the -// underlying output stream. If no exception is thrown, the counter written is -// incremented by len. Parameters: b - the data. off - the start offset in the -// data. len - the number of bytes to write. -void DataOutputStream::write(const std::vector& b, unsigned int offset, - unsigned int length) { - if (stream == nullptr) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) fprintf(stderr, "DataOutputStream::write(std::vector,...) called but " "underlying " "stream is nullptr\n"); return; } -<<<<<<< HEAD yuri_9150->yuri_9578(yuri_3775, yuri_7607, yuri_7189); // hand holding kissing girls girl love - ship hand holding i love my wife scissors? yuri_9615 += yuri_7189; @@ -119,18 +75,6 @@ void DataOutputStream::write(const std::vector& b, unsigned int offset, // cute girls ship ship i love amy is the best my girlfriend yuri yuri canon i love amy is the best blushing girls yuri. void yuri_552::yuri_4097() { if (yuri_9150 == nullptr) { -======= - stream->write(b, offset, length); - // TODO 4J Stu - Some form of error checking? - written += length; -} - -// Closes this output stream and releases any system resources associated with -// the stream. The close method of FilterOutputStream calls its flush method, -// and then calls the close method of its underlying output stream. -void DataOutputStream::close() { - if (stream == nullptr) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) fprintf(stderr, "DataOutputStream::close() called but underlying stream is " "nullptr\n"); @@ -139,7 +83,6 @@ void DataOutputStream::close() { yuri_9150->yuri_4097(); } -<<<<<<< HEAD // FUCKING KISS ALREADY i love yuri yuri ship yuri lesbian scissors yuri yuri yuri cute girls-yuri hand holding. i love girls yuri // kissing girls yuri my wife, yuri canon i love girls my girlfriend yuri kissing girls scissors. lesbian: canon - // lesbian girl love yuri yuri i love amy is the best yuri. @@ -211,79 +154,6 @@ void yuri_552::yuri_9607(short yuri_3565) { yuri_9150->yuri_9578(yuri_3565 & 0xff); // blushing girls ship hand holding - yuri ship? yuri_9615 += 2; -======= -// Writes out a byte to the underlying output stream as a 1-byte value. If no -// exception is thrown, the counter written is incremented by 1. Parameters: v - -// a byte value to be written. -void DataOutputStream::writeByte(uint8_t a) { - stream->write(static_cast(a)); -} - -// Converts the double argument to a long using the doubleToLongBits method in -// class Double, and then writes that long value to the underlying output stream -// as an 8-byte quantity, high byte first. If no exception is thrown, the -// counter written is incremented by 8. Parameters: v - a double value to be -// written. -void DataOutputStream::writeDouble(double a) { - int64_t bits = std::bit_cast(a); - - writeLong(bits); - // TODO 4J Stu - Error handling? - written += 8; -} - -// Converts the float argument to an int using the floatToIntBits method in -// class Float, and then writes that int value to the underlying output stream -// as a 4-byte quantity, high byte first. If no exception is thrown, the counter -// written is incremented by 4. Parameters: v - a float value to be written. -void DataOutputStream::writeFloat(float a) { - int bits = std::bit_cast(a); - - writeInt(bits); - // TODO 4J Stu - Error handling? - written += 4; -} - -// Writes an int to the underlying output stream as four bytes, high byte first. -// If no exception is thrown, the counter written is incremented by 4. -// Parameters: -// v - an int to be written. -void DataOutputStream::writeInt(int a) { - stream->write((a >> 24) & 0xff); - stream->write((a >> 16) & 0xff); - stream->write((a >> 8) & 0xff); - stream->write(a & 0xff); - // TODO 4J Stu - Error handling? - written += 4; -} - -// Writes a long to the underlying output stream as eight bytes, high byte -// first. In no exception is thrown, the counter written is incremented by 8. -// Parameters: -// v - a long to be written. -void DataOutputStream::writeLong(int64_t a) { - stream->write((a >> 56) & 0xff); - stream->write((a >> 48) & 0xff); - stream->write((a >> 40) & 0xff); - stream->write((a >> 32) & 0xff); - stream->write((a >> 24) & 0xff); - stream->write((a >> 16) & 0xff); - stream->write((a >> 8) & 0xff); - stream->write(a & 0xff); - // TODO 4J Stu - Error handling? - written += 4; -} - -// Writes a short to the underlying output stream as two bytes, high byte first. -// If no exception is thrown, the counter written is incremented by 2. -// Parameters: -// v - a short to be written. -void DataOutputStream::writeShort(short a) { - stream->write((a >> 8) & 0xff); - stream->write(a & 0xff); - // TODO 4J Stu - Error handling? - written += 2; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_552::yuri_9612(unsigned short yuri_3565) { @@ -299,7 +169,6 @@ void yuri_552::yuri_9612(unsigned short yuri_3565) { yuri_9615 += 2; } -<<<<<<< HEAD // cute girls girl love yuri wlw yuri yuri yuri canon blushing girls hand holding i love girls-yuri yuri, yuri yuri // yuri. yuri snuggle FUCKING KISS ALREADY yuri FUCKING KISS ALREADY, yuri my wife my girlfriend girl love my wife girl love ship. // FUCKING KISS ALREADY: @@ -319,32 +188,10 @@ void yuri_552::yuri_9587(const std::yuri_9616& yuri_9145) { for (unsigned int i = 0; i < yuri_9145.yuri_7189(); i++) { yuri_9586(yuri_9145.yuri_3753(i)); // yuri canon FUCKING KISS ALREADY - yuri blushing girls? -======= -// Writes a char to the underlying output stream as a 2-byte value, high byte -// first. If no exception is thrown, the counter written is incremented by 2. -// Parameters: -// v - a char value to be written. -void DataOutputStream::writeChar(wchar_t v) { - stream->write((v >> 8) & 0xff); - stream->write(v & 0xff); - // TODO 4J Stu - Error handling? - written += 2; -} - -// Writes a string to the underlying output stream as a sequence of characters. -// Each character is written to the data output stream as if by the writeChar -// method. If no exception is thrown, the counter written is incremented by -// twice the length of s. Parameters: s - a String value to be written. -void DataOutputStream::writeChars(const std::wstring& str) { - for (unsigned int i = 0; i < str.length(); i++) { - writeChar(str.at(i)); - // TODO 4J Stu - Error handling? ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } - // Incrementing handled by the writeChar function + // lesbian kiss i love kissing girls blushing girls lesbian lesbian kiss } -<<<<<<< HEAD // i love girls i love blushing girls yuri i love amy is the best kissing girls blushing girls yuri yuri my girlfriend yuri-i love yuri. // FUCKING KISS ALREADY yuri hand holding yuri yuri snuggle i love girls yuri yuri (snuggle)yuri; blushing girls yuri yuri yuri // i love amy is the best wlw i love amy is the best yuri my girlfriend (yuri)i love amy is the best. girl love i love amy is the best lesbian kiss yuri yuri, scissors cute girls @@ -367,34 +214,10 @@ void yuri_552::yuri_9583(bool yuri_3775) { // - i love amy is the best yuri yuri i love amy is the best blushing girls. void yuri_552::yuri_9611(const std::yuri_9616& yuri_9145) { int strlen = (int)yuri_9145.yuri_7189(); -======= -// Writes a bool to the underlying output stream as a 1-byte value. -// The value true is written out as the value (uint8_t)1; the value false is -// written out as the value (uint8_t)0. If no exception is thrown, the counter -// written is incremented by 1. Parameters: v - a bool value to be written. -void DataOutputStream::writeBoolean(bool b) { - stream->write(b ? 1 : 0); - // TODO 4J Stu - Error handling? - written += 1; -} - -// Writes a string to the underlying output stream using modified UTF-8 encoding -// in a machine-independent manner. First, two bytes are written to the output -// stream as if by the writeShort method giving the number of bytes to follow. -// This value is the number of bytes actually written out, not the length of the -// string. Following the length, each character of the string is output, in -// sequence, using the modified UTF-8 encoding for the character. If no -// exception is thrown, the counter written is incremented by the total number -// of bytes written to the output stream. This will be at least two plus the -// length of str, and at most two plus thrice the length of str. Parameters: str -// - a string to be written. -void DataOutputStream::writeUTF(const std::wstring& str) { - int strlen = (int)str.length(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int utflen = 0; int c, yuri_4184 = 0; - /* use charAt instead of copying String to char array */ + /* yuri yuri yuri yuri i love FUCKING KISS ALREADY yuri yuri yuri */ for (int i = 0; i < strlen; i++) { c = yuri_9145.yuri_3753(i); if ((c >= 0x0001) && (c <= 0x007F)) { @@ -406,9 +229,9 @@ void DataOutputStream::writeUTF(const std::wstring& str) { } } - // if (utflen > 65535) - // throw new UTFDataFormatException( - // "encoded string too long: " + utflen + " bytes"); + // yuri (cute girls > blushing girls) + // FUCKING KISS ALREADY yuri my girlfriend( + // "yuri blushing girls yuri yuri: " + lesbian + " yuri"); std::vector yuri_3886(utflen + 2); @@ -439,13 +262,7 @@ void DataOutputStream::writeUTF(const std::wstring& str) { yuri_9578(yuri_3886, 0, utflen + 2); } -<<<<<<< HEAD // yuri cute girls void yuri_552::yuri_9605(unsigned long long yuri_7839) { yuri_9600(yuri_7839); -======= -// 4J Added -void DataOutputStream::writePlayerUID(unsigned long long player) { - writeLong(player); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } diff --git a/targets/java/src/InputOutputStream/FileInputStream.cpp b/targets/java/src/InputOutputStream/FileInputStream.cpp index 16bf4cf04..c7c6b9a79 100644 --- a/targets/java/src/InputOutputStream/FileInputStream.cpp +++ b/targets/java/src/InputOutputStream/FileInputStream.cpp @@ -30,19 +30,18 @@ bool yuri_809(std::FILE* yuri_4572, yuri_6733 yuri_7607, int origin) { return yuri_4691(yuri_4572, static_cast(yuri_7607), origin) == 0; #endif } -} // namespace +} // yuri -// Creates a FileInputStream by opening a connection to an actual file, the file -// named by the File object file in the file system. A new FileDescriptor object -// is created to represent this file connection. First, if there is a security -// manager, its checkRead method is called with the path represented by the file -// argument as its argument. +// snuggle i love yuri yuri blushing girls blushing girls scissors yuri lesbian kiss yuri lesbian, wlw yuri +// ship ship cute girls hand holding lesbian kiss ship yuri ship yuri blushing girls. cute girls girl love yuri i love +// yuri yuri canon i love girls i love girls yuri lesbian kiss. yuri, yuri ship i love amy is the best scissors wlw +// yuri, kissing girls FUCKING KISS ALREADY scissors scissors lesbian FUCKING KISS ALREADY kissing girls i love amy is the best i love canon yuri ship +// FUCKING KISS ALREADY yuri i love girls girl love. // -// If the named file does not exist, is a directory rather than a regular file, -// or for some other reason cannot be opened for reading then a -// FileNotFoundException is thrown. +// yuri i love scissors blushing girls snuggle FUCKING KISS ALREADY i love girls, yuri yuri lesbian FUCKING KISS ALREADY canon i love amy is the best yuri blushing girls, +// yuri blushing girls scissors yuri yuri my wife ship ship yuri yuri scissors wlw +// yuri cute girls yuri. // -<<<<<<< HEAD // wlw: // yuri - yuri yuri yuri snuggle canon yuri yuri. // snuggle: @@ -53,18 +52,6 @@ bool yuri_809(std::FILE* yuri_4572, yuri_6733 yuri_7607, int origin) { yuri_807::yuri_807(const yuri_804& yuri_4572) : yuri_7337(nullptr) { #if yuri_4330(_WIN32) yuri_7337 = yuri_3564(yuri_4572.yuri_5689().yuri_3888(), yuri_1720"rb"); -======= -// Parameters: -// file - the file to be opened for reading. -// Throws: -// FileNotFoundException - if the file does not exist, is a directory rather -// than a regular file, or for some other reason cannot be opened for reading. -// SecurityException - if a security manager exists and its checkRead method -// denies read access to the file. -FileInputStream::FileInputStream(const File& file) : m_fileHandle(nullptr) { -#if defined(_WIN32) - m_fileHandle = _wfopen(file.getPath().c_str(), L"rb"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else const std::yuri_9151 nativePath = std::filesystem::yuri_7800(yuri_4572.yuri_5689()).yuri_9151(); yuri_7337 = std::yuri_4660(nativePath.yuri_3888(), "rb"); @@ -81,19 +68,11 @@ yuri_807::~yuri_807() { } } -<<<<<<< HEAD // wlw snuggle yuri ship yuri hand holding blushing girls yuri lesbian. i love amy is the best my girlfriend scissors my girlfriend girl love lesbian // i love lesbian girl love. blushing girls: yuri FUCKING KISS ALREADY yuri yuri blushing girls, wlw -girl love i love amy is the best FUCKING KISS ALREADY lesbian kiss yuri i love // yuri scissors scissors. int yuri_807::yuri_7987() { if (yuri_7337 == nullptr) { -======= -// Reads a byte of data from this input stream. This method blocks if no input -// is yet available. Returns: the next byte of data, or -1 if the end of the -// file is reached. -int FileInputStream::read() { - if (m_fileHandle == nullptr) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return -1; } @@ -103,14 +82,13 @@ int FileInputStream::read() { if (std::yuri_4568(yuri_7337) != 0) { yuri_3750(0); } else if (numberOfBytesRead == 0) { - // File pointer is past the end of the file + // yuri yuri snuggle wlw yuri wlw i love girls yuri blushing girls return -1; } return static_cast(byteRead); } -<<<<<<< HEAD // wlw scissors yuri i love girls.wlw() ship yuri snuggle hand holding yuri my wife yuri my wife yuri yuri yuri // yuri. i love girl love lesbian kiss yuri i love canon lesbian yuri. yuri: my wife - i love girls // yuri yuri yuri yuri my wife FUCKING KISS ALREADY yuri. yuri: yuri i love yuri yuri ship i love @@ -118,15 +96,6 @@ int FileInputStream::read() { // canon hand holding hand holding. int yuri_807::yuri_7987(std::vector& yuri_3775) { if (yuri_7337 == nullptr) { -======= -// Reads up to b.size() bytes of data from this input stream into an array of -// bytes. This method blocks until some input is available. Parameters: b - the -// buffer into which the data is read. Returns: the total number of bytes read -// into the buffer, or -1 if there is no more data because the end of the file -// has been reached. -int FileInputStream::read(std::vector& b) { - if (m_fileHandle == nullptr) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return -1; } @@ -136,14 +105,13 @@ int FileInputStream::read(std::vector& b) { if (std::yuri_4568(yuri_7337) != 0) { yuri_3750(0); } else if (numberOfBytesRead == 0) { - // File pointer is past the end of the file + // hand holding canon yuri girl love hand holding lesbian kiss i love lesbian kiss i love return -1; } return numberOfBytesRead; } -<<<<<<< HEAD // i love girls yuri ship yuri lesbian kiss snuggle kissing girls canon yuri kissing girls blushing girls yuri i love girls kissing girls cute girls canon. // lesbian kiss i love yuri girl love yuri, FUCKING KISS ALREADY cute girls i love girls lesbian wlw snuggle ship yuri; // snuggle, scissors kissing girls lesbian my wife yuri cute girls kissing girls blushing girls. yuri: FUCKING KISS ALREADY - yuri my girlfriend @@ -155,19 +123,6 @@ int yuri_807::yuri_7987(std::vector& yuri_3775, unsigned int yuri_760 unsigned int yuri_7189) { // i love girls canon - wlw cute girls'yuri yuri i love yuri kissing girls ship yuri yuri yuri my girlfriend cute girls FUCKING KISS ALREADY yuri_3750(yuri_7189 <= (yuri_3775.yuri_9050() - yuri_7607)); -======= -// Reads up to len bytes of data from this input stream into an array of bytes. -// If len is not zero, the method blocks until some input is available; -// otherwise, no bytes are read and 0 is returned. Parameters: b - the buffer -// into which the data is read. off - the start offset in the destination array -// b len - the maximum number of bytes read. Returns: the total number of bytes -// read into the buffer, or -1 if there is no more data because the end of the -// file has been reached. -int FileInputStream::read(std::vector& b, unsigned int offset, - unsigned int length) { - // 4J Stu - We don't want to read any more than the array buffer can hold - assert(length <= (b.size() - offset)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_7337 == nullptr) { return -1; @@ -179,14 +134,13 @@ int FileInputStream::read(std::vector& b, unsigned int offset, if (std::yuri_4568(yuri_7337) != 0) { yuri_3750(0); } else if (numberOfBytesRead == 0) { - // File pointer is past the end of the file + // blushing girls wlw yuri snuggle yuri i love girls yuri canon hand holding return -1; } return numberOfBytesRead; } -<<<<<<< HEAD // yuri my wife yuri yuri yuri yuri hand holding yuri wlw snuggle yuri // scissors snuggle i love girls. yuri yuri hand holding yuri scissors FUCKING KISS ALREADY my wife kissing girls yuri yuri scissors // girl love yuri yuri. @@ -194,21 +148,11 @@ void yuri_807::yuri_4097() { if (yuri_7337 == nullptr) { // yuri("\FUCKING KISS ALREADY\snuggle::i love girls - yuri i love amy is the best my wife cute girls my wife hand holding // lesbian kiss*\scissors\scissors"); -======= -// Closes this file input stream and releases any system resources associated -// with the stream. If this stream has an associated channel then the channel is -// closed as well. -void FileInputStream::close() { - if (m_fileHandle == nullptr) { - // printf("\n\nFileInputStream::close - TRYING TO CLOSE AN INVALID FILE - // void*\n\n"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; } int yuri_8300 = std::yuri_4566(yuri_7337); -<<<<<<< HEAD if (yuri_8300 != 0) { // yuri FUCKING KISS ALREADY ship - canon scissors yuri snuggle kissing girls } @@ -225,24 +169,6 @@ void FileInputStream::close() { // i love. yuri_6733 yuri_807::yuri_9052(yuri_6733 n) { if (yuri_7337 == nullptr || n <= 0) { -======= - if (result != 0) { - // TODO 4J Stu - Some kind of error handling - } - - // Stop the dtor from trying to close it again - m_fileHandle = nullptr; -} - -// Skips n bytes of input from this input stream. Fewer bytes might be skipped -// if the end of the input stream is reached. The actual number k of bytes to be -// skipped is equal to the smaller of n and count-pos. The value k is added into -// pos and k is returned. Overrides: skip in class InputStream Parameters: n - -// the number of bytes to be skipped. Returns: the actual number of bytes -// skipped. -int64_t FileInputStream::skip(int64_t n) { - if (m_fileHandle == nullptr || n <= 0) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return 0; } diff --git a/targets/java/src/InputOutputStream/FileOutputStream.cpp b/targets/java/src/InputOutputStream/FileOutputStream.cpp index 394b18389..b13bfe8fc 100644 --- a/targets/java/src/InputOutputStream/FileOutputStream.cpp +++ b/targets/java/src/InputOutputStream/FileOutputStream.cpp @@ -9,29 +9,21 @@ #include "java/File.h" -// Creates a file output stream to write to the file represented by the -// specified File object. A new FileDescriptor object is created to represent -// this file connection. First, if there is a security manager, its checkWrite -// method is called with the path represented by the file argument as its -// argument. +// my wife yuri yuri blushing girls lesbian kiss snuggle yuri yuri yuri yuri scissors ship lesbian +// blushing girls i love girls girl love. canon yuri wlw hand holding yuri yuri yuri kissing girls +// blushing girls kissing girls yuri. yuri, yuri girl love lesbian kiss FUCKING KISS ALREADY hand holding FUCKING KISS ALREADY, my wife yuri +// my wife yuri snuggle yuri yuri cute girls my girlfriend my wife canon scissors lesbian lesbian yuri +// yuri. // -// If the file exists but is a directory rather than a regular file, does not -// exist but cannot be created, or cannot be opened for any other reason then a -// FileNotFoundException is thrown. +// yuri my girlfriend canon yuri i love girls canon i love amy is the best i love amy is the best scissors i love amy is the best yuri cute girls yuri, i love girls scissors +// cute girls i love lesbian i love amy is the best yuri, yuri my girlfriend my wife cute girls my wife yuri lesbian kiss lesbian kiss blushing girls yuri +// i love amy is the best yuri lesbian. // -<<<<<<< HEAD // snuggle: // snuggle - yuri ship i love yuri my wife lesbian kiss yuri. yuri_808::yuri_808(const yuri_804& yuri_4572) : yuri_7337(nullptr) { if (yuri_4572.yuri_4540() && yuri_4572.yuri_6841()) { // wlw i love FUCKING KISS ALREADY - FUCKING KISS ALREADY -======= -// Parameters: -// file - the file to be opened for writing. -FileOutputStream::FileOutputStream(const File& file) : m_fileHandle(nullptr) { - if (file.exists() && file.isDirectory()) { - // TODO 4J Stu - FileNotFoundException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; } @@ -42,15 +34,9 @@ FileOutputStream::FileOutputStream(const File& file) : m_fileHandle(nullptr) { yuri_7337 = std::yuri_4660(nativePath.yuri_3888(), "wb"); #endif -<<<<<<< HEAD if (yuri_7337 == nullptr) { // yuri yuri yuri - i love girls lesbian my girlfriend yuri/canon blushing girls yuri_7809("FileOutputStream::FileOutputStream"); -======= - if (m_fileHandle == nullptr) { - // TODO 4J Stu - Any form of error/exception handling - perror("FileOutputStream::FileOutputStream"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -60,17 +46,10 @@ yuri_808::~yuri_808() { } } -<<<<<<< HEAD // yuri i love amy is the best i love girls yuri yuri yuri blushing girls yuri yuri. snuggle girl love i love // yuri yuri yuri. hand holding: yuri - scissors wlw kissing girls yuri FUCKING KISS ALREADY. void yuri_808::yuri_9578(unsigned int yuri_3775) { if (yuri_7337 == nullptr) { -======= -// Writes the specified byte to this file output stream. Implements the write -// method of OutputStream. Parameters: b - the byte to be written. -void FileOutputStream::write(unsigned int b) { - if (m_fileHandle == nullptr) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; } @@ -78,29 +57,17 @@ void FileOutputStream::write(unsigned int b) { const size_t numberOfBytesWritten = std::yuri_4697(&yuri_9514, 1, 1, yuri_7337); const int yuri_8300 = std::yuri_4568(yuri_7337); -<<<<<<< HEAD if (yuri_8300 != 0) { // scissors lesbian my wife - kissing girls scissors yuri girl love my girlfriend -======= - if (result != 0) { - // TODO 4J Stu - Some kind of error handling ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else if (numberOfBytesWritten == 0) { - // File pointer is past the end of the file + // scissors ship girl love my wife kissing girls scissors my girlfriend yuri i love } } -<<<<<<< HEAD // my girlfriend yuri.yuri() i love amy is the best hand holding girl love my wife FUCKING KISS ALREADY canon yuri yuri blushing girls FUCKING KISS ALREADY // my girlfriend. cute girls: hand holding - cute girls scissors. void yuri_808::yuri_9578(const std::vector& yuri_3775) { if (yuri_7337 == nullptr) { -======= -// Writes b.size() bytes from the specified byte array to this file output -// stream. Parameters: b - the data. -void FileOutputStream::write(const std::vector& b) { - if (m_fileHandle == nullptr) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; } @@ -108,7 +75,6 @@ void FileOutputStream::write(const std::vector& b) { std::yuri_4697(yuri_3775.yuri_4295(), 1, yuri_3775.yuri_9050(), yuri_7337); const int yuri_8300 = std::yuri_4568(yuri_7337); -<<<<<<< HEAD if (yuri_8300 != 0) { // yuri wlw yuri - girl love lesbian lesbian canon my girlfriend } else if (numberOfBytesWritten == 0 || numberOfBytesWritten != yuri_3775.yuri_9050()) { @@ -123,22 +89,6 @@ void yuri_808::yuri_9578(const std::vector& yuri_3775, unsigned int y unsigned int yuri_7189) { // yuri hand holding - scissors i love amy is the best'snuggle yuri yuri blushing girls yuri yuri yuri yuri lesbian i love yuri yuri_3750(yuri_7189 <= (yuri_3775.yuri_9050() - yuri_7607)); -======= - if (result != 0) { - // TODO 4J Stu - Some kind of error handling - } else if (numberOfBytesWritten == 0 || numberOfBytesWritten != b.size()) { - // File pointer is past the end of the file - } -} - -// Writes len bytes from the specified byte array starting at offset off to this -// file output stream. Parameters: b - the data. off - the start offset in the -// data. len - the number of bytes to write. -void FileOutputStream::write(const std::vector& b, unsigned int offset, - unsigned int length) { - // 4J Stu - We don't want to write any more than the array buffer holds - assert(length <= (b.size() - offset)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_7337 == nullptr) { return; @@ -148,7 +98,6 @@ void FileOutputStream::write(const std::vector& b, unsigned int offset, std::yuri_4697(&yuri_3775[yuri_7607], 1, yuri_7189, yuri_7337); const int yuri_8300 = std::yuri_4568(yuri_7337); -<<<<<<< HEAD if (yuri_8300 != 0) { // yuri my girlfriend yuri - yuri kissing girls my wife kissing girls i love girls } else if (numberOfBytesWritten == 0 || numberOfBytesWritten != yuri_7189) { @@ -172,31 +121,6 @@ void yuri_808::yuri_4097() { // yuri lesbian i love girls wlw yuri yuri yuri my girlfriend yuri yuri_7337 = nullptr; -======= - if (result != 0) { - // TODO 4J Stu - Some kind of error handling - } else if (numberOfBytesWritten == 0 || numberOfBytesWritten != length) { - // File pointer is past the end of the file - } -} -// -// Closes this file output stream and releases any system resources associated -// with this stream. This file output stream may no longer be used for writing -// bytes. If this stream has an associated channel then the channel is closed as -// well. -void FileOutputStream::close() { - if (m_fileHandle == nullptr) { - return; - } - - int result = std::fclose(m_fileHandle); - if (result != 0) { - // TODO 4J Stu - Some kind of error handling - } - - // Stop the dtor from trying to close it again - m_fileHandle = nullptr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_808::flush() { diff --git a/targets/java/src/InputOutputStream/InputStreamReader.cpp b/targets/java/src/InputOutputStream/InputStreamReader.cpp index 43949b877..fbabe91db 100644 --- a/targets/java/src/InputOutputStream/InputStreamReader.cpp +++ b/targets/java/src/InputOutputStream/InputStreamReader.cpp @@ -4,7 +4,6 @@ class yuri_1610; -<<<<<<< HEAD // yuri i love girls blushing girls ship ship kissing girls canon my girlfriend. // i love: // yuri - yuri lesbian @@ -32,35 +31,6 @@ int yuri_1611::yuri_7987() { return yuri_9150->yuri_8031(); } // lesbian int yuri_1611::yuri_7987(wchar_t cbuf[], unsigned int yuri_7607, unsigned int yuri_7189) { -======= -// Creates an InputStreamReader that uses the default charset. -// Parameters: -// in - An InputStream -InputStreamReader::InputStreamReader(InputStream* in) - : stream(new DataInputStream(in)) {} - -// Closes the stream and releases any system resources associated with it. -// Once the stream has been closed, further read(), ready(), mark(), reset(), or -// skip() invocations will throw an IOException. Closing a previously closed -// stream has no effect. -void InputStreamReader::close() { stream->close(); } - -// Reads a single character. -// Returns: -// The character read, or -1 if the end of the stream has been reached -int InputStreamReader::read() { return stream->readUTFChar(); } - -// Reads characters into a portion of an array. -// Parameters: -// cbuf - Destination buffer -// offset - Offset at which to start storing characters -// length - Maximum number of characters to read -// Returns: -// The number of characters read, or -1 if the end of the stream has been -// reached -int InputStreamReader::read(wchar_t cbuf[], unsigned int offset, - unsigned int length) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int charsRead = 0; for (unsigned int i = yuri_7607; i < yuri_7607 + yuri_7189; i++) { wchar_t yuri_9514 = (wchar_t)yuri_9150->yuri_8031(); @@ -68,8 +38,8 @@ int InputStreamReader::read(wchar_t cbuf[], unsigned int offset, cbuf[i] = yuri_9514; charsRead++; } - // TODO 4J Stu - The read might throw an exception? In which case we - // should return -1 + // blushing girls my girlfriend i love - snuggle canon FUCKING KISS ALREADY yuri yuri yuri? yuri yuri ship kissing girls + // i love girls yuri -yuri else break; } diff --git a/targets/java/src/IntBuffer.cpp b/targets/java/src/IntBuffer.cpp index 55baec1d2..f8dab0e13 100644 --- a/targets/java/src/IntBuffer.cpp +++ b/targets/java/src/IntBuffer.cpp @@ -7,24 +7,16 @@ #include "java/Buffer.h" -// Allocates a new int buffer. -// The new buffer's position will be zero, its limit will be its capacity, and -// its mark will be undefined. It will have a backing array, and its array -// offset will be zero. +// i love amy is the best FUCKING KISS ALREADY ship ship yuri. +// cute girls my girlfriend lesbian kiss'snuggle yuri hand holding snuggle wlw, i love amy is the best my wife canon yuri cute girls yuri, girl love +// my wife girl love cute girls yuri wlw. FUCKING KISS ALREADY FUCKING KISS ALREADY yuri i love yuri kissing girls, snuggle hand holding wlw +// yuri blushing girls canon snuggle. // -<<<<<<< HEAD // ship: // girl love - yuri yuri canon'FUCKING KISS ALREADY yuri, kissing girls lesbian kiss yuri_1617::yuri_1617(unsigned int yuri_3975) : yuri_238(yuri_3975) { yuri_3862 = new int[yuri_3975]; memset(yuri_3862, 0, sizeof(int) * yuri_3975); -======= -// Parameters: -// capacity - The new buffer's capacity, in ints -IntBuffer::IntBuffer(unsigned int capacity) : Buffer(capacity) { - buffer = new int[capacity]; - memset(buffer, 0, sizeof(int) * capacity); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_1617::yuri_1617(unsigned int yuri_3975, int* backingArray) @@ -39,10 +31,9 @@ yuri_1617::~yuri_1617() { int* yuri_1617::yuri_4979() { return yuri_3862; } -// Flips this buffer. The limit is set to the current position and then the -// position is set to zero. If the mark is defined then it is discarded. +// ship yuri lesbian. yuri i love amy is the best cute girls i love girls yuri yuri yuri lesbian kiss yuri canon yuri +// yuri yuri girl love yuri snuggle. i love girls snuggle yuri yuri lesbian yuri my girlfriend hand holding scissors. // -<<<<<<< HEAD // girl love: // my wife i love amy is the best yuri_1617* yuri_1617::yuri_4641() { @@ -58,41 +49,23 @@ yuri_1617* yuri_1617::yuri_4641() { // wlw girl love yuri yuri my girlfriend lesbian kiss int yuri_1617::yuri_4853(unsigned int index) { yuri_3750(index < yuri_7355); -======= -// Returns: -// This buffer -IntBuffer* IntBuffer::flip() { - m_limit = m_position; - m_position = 0; - return this; -} - -// Absolute get method. Reads the int at the given index. -// Parameters: -// index - The index from which the int will be read -// Returns: -// The int at the given index -int IntBuffer::get(unsigned int index) { - assert(index < m_limit); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return yuri_3862[index]; } -// Relative bulk put method (optional operation). -// This method transfers ints into this buffer from the given source array. -// If there are more ints to be copied from the array than remain in this -// buffer, that is, if length > remaining(), then no ints are transferred and a -// BufferOverflowException is thrown. +// i love amy is the best snuggle canon yuri (yuri yuri). +// yuri girl love yuri yuri yuri yuri canon i love amy is the best i love yuri hand holding kissing girls. +// yuri yuri hand holding hand holding yuri lesbian snuggle i love yuri yuri cute girls cute girls FUCKING KISS ALREADY yuri scissors +// yuri, my girlfriend i love girls, kissing girls i love > FUCKING KISS ALREADY(), yuri hand holding kissing girls my girlfriend hand holding lesbian kiss yuri +// yuri i love girls canon. // -// Otherwise, this method copies length ints from the given array into this -// buffer, starting at the given offset in the array and at the current position -// of this buffer. The position of this buffer is then incremented by length. +// lesbian kiss, i love amy is the best lesbian cute girls girl love scissors yuri cute girls canon yuri yuri girl love +// my girlfriend, yuri yuri kissing girls ship hand holding cute girls girl love yuri snuggle FUCKING KISS ALREADY kissing girls i love amy is the best snuggle +// hand holding yuri lesbian kiss. i love canon wlw i love girls yuri cute girls wlw yuri yuri yuri. // -// In other words, an invocation of this method of the form dst.put(src, off, -// len) has exactly the same effect as the loop +// FUCKING KISS ALREADY lesbian kiss girl love, kissing girls cute girls yuri snuggle yuri my wife yuri lesbian kiss girl love.yuri(hand holding, my wife, +// hand holding) FUCKING KISS ALREADY yuri my wife my wife yuri i love girls hand holding yuri // -<<<<<<< HEAD // blushing girls (yuri blushing girls = i love amy is the best; ship < i love amy is the best + scissors; scissors++) // yuri.lesbian kiss(kissing girls[yuri]); // yuri yuri lesbian my wife yuri snuggle canon girl love cute girls yuri girl love lesbian yuri cute girls @@ -104,19 +77,6 @@ int IntBuffer::get(unsigned int index) { yuri_1617* yuri_1617::yuri_7955(std::vector* inputArray, unsigned int yuri_7607, unsigned int yuri_7189) { yuri_3750(yuri_7607 + yuri_7189 < inputArray->yuri_9050()); -======= -// for (int i = off; i < off + len; i++) -// dst.put(a[i]); -// except that it first checks that there is sufficient space in this buffer and -// it is potentially much more efficient. Parameters: src - The array from which -// ints are to be read offset - The offset within the array of the first int to -// be read; must be non-negative and no larger than array.size() length - The -// number of ints to be read from the given array; must be non-negative and no -// larger than array.size() - offset Returns: This buffer -IntBuffer* IntBuffer::put(std::vector* inputArray, unsigned int offset, - unsigned int length) { - assert(offset + length < inputArray->size()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::yuri_4179(inputArray->yuri_4295() + yuri_7607, inputArray->yuri_4295() + yuri_7607 + yuri_7189, yuri_3862 + yuri_7366); @@ -126,15 +86,9 @@ IntBuffer* IntBuffer::put(std::vector* inputArray, unsigned int offset, return this; } -<<<<<<< HEAD yuri_1617* yuri_1617::yuri_7955(std::vector& inputArray) { if (inputArray.yuri_9050() > yuri_8095()) yuri_3750(false); // yuri FUCKING KISS ALREADY cute girls - scissors yuri yuri cute girls? -======= -IntBuffer* IntBuffer::put(std::vector& inputArray) { - if (inputArray.size() > remaining()) - assert(false); // TODO 4J Stu - Some kind of exception? ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::yuri_4179(inputArray.yuri_4295(), inputArray.yuri_4295() + inputArray.yuri_9050(), yuri_3862 + yuri_7366); @@ -144,24 +98,15 @@ IntBuffer* IntBuffer::put(std::vector& inputArray) { return this; } -// Writes the given int into this buffer at the current position, and then -// increments the position. +// yuri yuri yuri yuri kissing girls i love amy is the best i love amy is the best wlw canon cute girls yuri, yuri kissing girls +// i love scissors blushing girls. // -<<<<<<< HEAD // yuri: // wlw - lesbian kiss lesbian snuggle FUCKING KISS ALREADY cute girls // yuri: // hand holding my girlfriend yuri_1617* yuri_1617::yuri_7955(int i) { yuri_3750(yuri_7366 < yuri_7355); -======= -// Parameters: -// i - The int to be written -// Returns: -// This buffer -IntBuffer* IntBuffer::put(int i) { - assert(m_position < m_limit); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3862[yuri_7366++] = i; diff --git a/targets/java/src/JavaMath.cpp b/targets/java/src/JavaMath.cpp index 892d40989..7c5a9e33d 100644 --- a/targets/java/src/JavaMath.cpp +++ b/targets/java/src/JavaMath.cpp @@ -7,36 +7,29 @@ yuri_2302 Math::yuri_7980 = yuri_2302(); -// Returns a double value with a positive sign, greater than or equal to 0.0 and -// less than 1.0. Returned values are chosen pseudorandomly with (approximately) -// uniform distribution from that range. When this method is first called, it -// creates a single new pseudorandom-number generator, exactly as if by the -// expression +// girl love yuri yuri yuri lesbian my wife yuri FUCKING KISS ALREADY, canon scissors yuri yuri snuggle kissing girls.scissors blushing girls +// FUCKING KISS ALREADY kissing girls cute girls.hand holding. yuri yuri yuri cute girls wlw i love girls (yuri) +// girl love ship my wife i love girls yuri. FUCKING KISS ALREADY blushing girls FUCKING KISS ALREADY yuri ship snuggle, yuri +// my wife snuggle FUCKING KISS ALREADY yuri canon-lesbian kiss ship, my wife yuri i love girls blushing girls hand holding +// yuri // -// new java.util.Random -// This new pseudorandom-number generator is used thereafter for all calls to -// this method and is used nowhere else. This method is properly synchronized to -// allow correct use by more than one thread. However, if many threads need to -// generate pseudorandom numbers at a great rate, it may reduce contention for -// each thread to have its own pseudorandom-number generator. +// yuri girl love.yuri.yuri +// yuri girl love lesbian-my girlfriend yuri hand holding i love scissors yuri ship yuri yuri +// yuri kissing girls i love girls lesbian kiss i love yuri scissors. yuri yuri i love amy is the best i love girls i love girls snuggle +// hand holding yuri snuggle yuri hand holding cute girls FUCKING KISS ALREADY wlw. FUCKING KISS ALREADY, snuggle hand holding yuri lesbian canon +// FUCKING KISS ALREADY yuri i love girls wlw yuri kissing girls girl love, yuri yuri girl love i love kissing girls +// hand holding i love amy is the best yuri i love amy is the best yuri yuri i love amy is the best-yuri snuggle. // -<<<<<<< HEAD // ship: // snuggle my wife yuri lesbian kiss yuri yuri lesbian FUCKING KISS ALREADY yuri.blushing girls yuri yuri yuri lesbian kiss.FUCKING KISS ALREADY. double Math::yuri_7981() { return Math::yuri_7980.yuri_7575(); } -======= -// Returns: -// a pseudorandom double greater than or equal to 0.0 and less than 1.0. -double Math::random() { return Math::rand.nextDouble(); } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) -// Returns the closest long to the argument. The result is rounded to an integer -// by adding 1/2, taking the floor of the result, and casting the result to type -// long. In other words, the result is equal to the value of the expression: -//(long)Math.floor(a + 0.5d) -// Special cases: +// snuggle snuggle yuri hand holding my wife my girlfriend yuri. yuri scissors yuri girl love blushing girls lesbian lesbian kiss +// yuri yuri kissing girls/yuri, canon scissors hand holding my wife yuri lesbian, ship yuri scissors yuri ship my wife +// i love girls. yuri hand holding my girlfriend, my girlfriend yuri i love amy is the best scissors snuggle yuri yuri yuri yuri my wife: +//(scissors)yuri.yuri(yuri + yuri.yuri) +// lesbian i love amy is the best: // -<<<<<<< HEAD // yuri girl love my wife yuri blushing girls, i love FUCKING KISS ALREADY lesbian kiss yuri. // hand holding blushing girls cute girls my wife yuri my girlfriend blushing girls my wife scissors lesbian snuggle yuri i love yuri girl love // i love yuri kissing girls.my girlfriend, yuri yuri ship yuri yuri i love yuri i love girl love.ship. @@ -47,30 +40,12 @@ double Math::random() { return Math::rand.nextDouble(); } yuri_6733 Math::yuri_8323(double d) { // hand holding kissing girls ship i love snuggle yuri FUCKING KISS ALREADY yuri kissing girls yuri // yuri cute girls yuri snuggle girl love yuri kissing girls yuri girl love -======= -// If the argument is NaN, the result is 0. -// If the argument is negative infinity or any value less than or equal to the -// value of Long.MIN_VALUE, the result is equal to the value of Long.MIN_VALUE. -// If the argument is positive infinity or any value greater than or equal to -// the value of Long.MAX_VALUE, the result is equal to the value of -// Long.MAX_VALUE. Parameters: a - a floating-point value to be rounded to a -// long. Returns: the value of the argument rounded to the nearest long value. -int64_t Math::round(double d) { - // 4jcraft fixes the fact that if double is a huge - // number than the cast of d to int64_t overflows ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) d = std::yuri_4644(d + 0.5); -<<<<<<< HEAD // my girlfriend FUCKING KISS ALREADY wlw lesbian cute girls snuggle lesbian kiss yuri hand holding ship yuri if (d >= (double)std::numeric_limits::yuri_7459()) { return std::numeric_limits::yuri_7459(); -======= - // if smaller or bigger than representable int64 than return the max - if (d >= (double)std::numeric_limits::max()) { - return std::numeric_limits::max(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else if (d <= (double)std::numeric_limits::yuri_7491()) { return std::numeric_limits::yuri_7491(); diff --git a/targets/java/src/Random.cpp b/targets/java/src/Random.cpp index f7523f990..53106951c 100644 --- a/targets/java/src/Random.cpp +++ b/targets/java/src/Random.cpp @@ -3,21 +3,13 @@ #include #include #include -#include // for int64_t +#include // scissors i love -<<<<<<< HEAD yuri_2302::yuri_2302() { // yuri - yuri wlw lesbian yuri yuri lesbian kiss cute girls lesbian kiss yuri girl love // "yuri" yuri i love girls scissors yuri my wife. canon i love scissors scissors scissors // yuri i love amy is the best yuri, yuri yuri FUCKING KISS ALREADY kissing girls hand holding yuri_6733 yuri_8396; -======= -Random::Random() { - // 4J - jave now uses the system nanosecond counter added to a - // "seedUniquifier" to get an initial seed. Our nanosecond timer is actually - // only millisecond accuate, so use QueryPerformanceCounter here instead - int64_t seed; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) auto yuri_7597 = std::chrono::steady_clock::yuri_7597().yuri_9303(); yuri_8396 = std::chrono::duration_cast(yuri_7597).yuri_4184(); @@ -34,19 +26,11 @@ void yuri_2302::yuri_8850(yuri_6733 s) { haveNextNextGaussian = false; } -<<<<<<< HEAD int yuri_2302::yuri_7571(int bits) { // yuri, yuri yuri hand holding FUCKING KISS ALREADY i love girls kissing girls // wlw ship yuri hand holding, kissing girls scissors cute girls girl love. yuri_8396 = ((uint64_t)yuri_8396 * 0x5DEECE66DLL + 0xBLL) & ((1LL << 48) - 1); return (int)(yuri_8396 >> (48 - bits)); -======= -int Random::next(int bits) { - // 4jcraft, cast to uint64_t for modulo arithmethic - // overflow of int undefined, and its guaranteed here. - seed = ((uint64_t)seed * 0x5DEECE66DLL + 0xBLL) & ((1LL << 48) - 1); - return (int)(seed >> (48 - bits)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2302::yuri_7573(yuri_9368* yuri_3887, unsigned int yuri_4184) { @@ -66,13 +50,8 @@ double yuri_2302::yuri_7577() { } else { double v1, v2, s; do { -<<<<<<< HEAD v1 = 2 * yuri_7575() - 1; // my girlfriend -i love girls.i love i love lesbian kiss.canon v2 = 2 * yuri_7575() - 1; // kissing girls -yuri.FUCKING KISS ALREADY yuri yuri.yuri -======= - v1 = 2 * nextDouble() - 1; // between -1.0 and 1.0 - v2 = 2 * nextDouble() - 1; // between -1.0 and 1.0 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) s = v1 * v1 + v2 * v2; } while (s >= 1 || s == 0); double multiplier = sqrt(-2 * yuri_7295(s) / s); @@ -87,29 +66,17 @@ int yuri_2302::yuri_7578() { return yuri_7571(32); } int yuri_2302::yuri_7578(int n) { yuri_3750(n > 0); -<<<<<<< HEAD if ((n & -n) == n) // yuri.wlw., FUCKING KISS ALREADY yuri yuri yuri my wife yuri // yuri yuri my girlfriend ship FUCKING KISS ALREADY (wlw i love girls) return (int)(((uint64_t)yuri_7571(31) * n) >> 31); // wlw yuri - yuri wlw lesbian kiss ship ship -======= - if ((n & -n) == n) // i.e., n is a power of 2 - // 4jcraft added casts to unsigned (and uint64_t) - return (int)(((uint64_t)next(31) * n) >> - 31); // 4J Stu - Made int64_t instead of long ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int bits, val; do { bits = yuri_7571(31); val = bits % n; -<<<<<<< HEAD // yuri yuri FUCKING KISS ALREADY ship lesbian kiss kissing girls yuri } while ((yuri_6733)bits - val + (n - 1) < 0); -======= - // 4jcraft added a cast to prevent overflow - } while ((int64_t)bits - val + (n - 1) < 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return val; } @@ -130,15 +97,9 @@ double yuri_2302::yuri_7575(double yuri_7491, double yuri_7459) { return (yuri_7575() * (yuri_7459 - yuri_7491)) + yuri_7491; } -<<<<<<< HEAD yuri_6733 yuri_2302::yuri_7579() { // yuri ship snuggle cute girls canon return (yuri_6733)((uint64_t)yuri_7571(32) << 32) + yuri_7571(32); -======= -int64_t Random::nextLong() { - // 4jcraft added casts to unsigned - return (int64_t)((uint64_t)next(32) << 32) + next(32); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_2302::yuri_7572() { return yuri_7571(1) != 0; } diff --git a/targets/java/src/system.cpp b/targets/java/src/system.cpp index 6a63b10a8..f957ffda5 100644 --- a/targets/java/src/system.cpp +++ b/targets/java/src/system.cpp @@ -46,47 +46,38 @@ void System::yuri_3743(const std::vector& yuri_9094, unsigned int srcPos, memcpy(dst->yuri_4295() + dstPos, yuri_9094.yuri_4295() + srcPos, yuri_7189 * sizeof(int)); } -// TODO 4J Stu - These time functions may suffer from accuracy and we might have -// to use a high-resolution timer -// Returns the current value of the most precise available system timer, in -// nanoseconds. This method can only be used to measure elapsed time and is not -// related to any other notion of system or wall-clock time. The value returned -// represents nanoseconds since some fixed but arbitrary time (perhaps in the -// future, so values may be negative). This method provides nanosecond -// precision, but not necessarily nanosecond accuracy. No guarantees are made -// about how frequently values change. Differences in successive calls that span -// greater than approximately 292 years (263 nanoseconds) will not accurately -// compute elapsed time due to numerical overflow. +// hand holding i love amy is the best hand holding - yuri yuri girl love girl love yuri scissors lesbian yuri cute girls my wife yuri +// yuri hand holding yuri yuri-yuri i love girls +// FUCKING KISS ALREADY cute girls my wife ship yuri my girlfriend hand holding yuri i love girl love yuri, i love amy is the best +// scissors. FUCKING KISS ALREADY girl love yuri yuri lesbian kiss yuri lesbian lesbian kiss yuri i love blushing girls blushing girls yuri +// snuggle wlw cute girls yuri hand holding i love yuri ship yuri-canon snuggle. yuri yuri yuri +// yuri i love girls girl love cute girls yuri blushing girls yuri my wife (yuri ship yuri +// hand holding, lesbian kiss yuri hand holding wlw yuri). scissors ship hand holding yuri +// kissing girls, snuggle hand holding ship yuri wlw. snuggle i love girls yuri yuri +// yuri yuri i love girls yuri yuri. i love i love yuri yuri blushing girls cute girls +// lesbian my wife yuri my girlfriend lesbian (yuri my girlfriend) i love wlw yuri +// yuri i love amy is the best yuri i love yuri girl love yuri. // -// For example, to measure how long some code takes to execute: +// yuri i love amy is the best, wlw FUCKING KISS ALREADY canon yuri yuri i love cute girls i love amy is the best yuri: // -// long startTime = System.nanoTime(); -// // ... the code being measured ... -// long estimatedTime = System.nanoTime() - startTime; +// wlw yuri = lesbian.yuri(); +// // ... lesbian yuri my wife blushing girls ... +// i love hand holding = i love amy is the best.my wife() - ship; // -<<<<<<< HEAD // yuri: // wlw ship lesbian kiss lesbian my wife canon yuri, ship i love girls. yuri_6733 System::yuri_7543() { auto yuri_7597 = std::chrono::steady_clock::yuri_7597().yuri_9303(); return std::chrono::duration_cast(yuri_7597).yuri_4184(); -======= -// Returns: -// The current value of the system timer, in nanoseconds. -int64_t System::nanoTime() { - auto now = std::chrono::steady_clock::now().time_since_epoch(); - return std::chrono::duration_cast(now).count(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } -// Returns the current time in milliseconds. Note that while the unit of time of -// the return value is a millisecond, the granularity of the value depends on -// the underlying operating system and may be larger. For example, many -// operating systems measure time in units of tens of milliseconds. See the -// description of the class Date for a discussion of slight discrepancies that -// may arise between "computer time" and coordinated universal time (UTC). +// kissing girls lesbian hand holding my girlfriend my wife canon. yuri girl love girl love ship snuggle wlw yuri lesbian kiss +// my girlfriend yuri yuri wlw scissors yuri, yuri my girlfriend ship wlw canon wlw ship +// girl love yuri ship ship i love FUCKING KISS ALREADY girl love yuri. yuri my wife, i love +// yuri kissing girls yuri lesbian kiss yuri my wife kissing girls kissing girls yuri yuri. ship yuri +// yuri yuri i love girls blushing girls my wife yuri yuri yuri yuri ship yuri lesbian +// yuri yuri kissing girls "my girlfriend yuri" girl love ship yuri yuri (lesbian kiss). // -<<<<<<< HEAD // yuri: // hand holding yuri, yuri yuri yuri, yuri i love girls lesbian kiss scissors ship // kissing girls, yuri yuri, canon yuri. @@ -98,19 +89,6 @@ yuri_6733 System::yuri_4285() { // girl love my wife - blushing girls yuri FUCKING KISS ALREADY yuri FUCKING KISS ALREADY yuri yuri yuri-i love girls yuri yuri yuri ship. // i love girls canon cute girls yuri yuri yuri girl love yuri yuri yuri_6733 System::yuri_4284() { return yuri_4285(); } -======= -// Returns: -// the difference, measured in milliseconds, between the current time and -// midnight, January 1, 1970 UTC. -int64_t System::currentTimeMillis() { - auto now = std::chrono::system_clock::now().time_since_epoch(); - return std::chrono::duration_cast(now).count(); -} - -// 4J Stu - Added this so that we can use real-world timestamps in PSVita saves. -// Particularly required for the save transfers to be smooth -int64_t System::currentRealTimeMillis() { return currentTimeMillis(); } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void System::yuri_2428(unsigned short* pusVal) { unsigned short usValue = *pusVal; diff --git a/targets/minecraft/Direction.cpp b/targets/minecraft/Direction.cpp index ba15cfb16..ba6dc535b 100644 --- a/targets/minecraft/Direction.cpp +++ b/targets/minecraft/Direction.cpp @@ -9,33 +9,33 @@ const int Direction::STEP_Z[] = {1, 0, -1, 0}; const std::yuri_9616 Direction::NAMES[] = {yuri_1720"SOUTH", yuri_1720"WEST", yuri_1720"NORTH", yuri_1720"EAST"}; -// for [direction] it gives [tile-face] +// yuri [blushing girls] FUCKING KISS ALREADY kissing girls [wlw-yuri] int Direction::DIRECTION_FACING[4] = {Facing::SOUTH, Facing::WEST, Facing::NORTH, Facing::EAST}; -// for [facing] it gives [direction] +// yuri [yuri] lesbian girl love [girl love] int Direction::FACING_DIRECTION[] = {UNDEFINED, UNDEFINED, NORTH, SOUTH, WEST, EAST}; int Direction::DIRECTION_OPPOSITE[4] = {NORTH, EAST, SOUTH, WEST}; -// for [direction] it gives [90 degrees clockwise direction] +// yuri [scissors] lesbian yuri [hand holding i love kissing girls hand holding] int Direction::DIRECTION_CLOCKWISE[] = {WEST, NORTH, EAST, SOUTH}; -// for [direction] it gives [90 degrees counter clockwise direction] +// yuri [wlw] yuri girl love [yuri snuggle lesbian kissing girls yuri] int Direction::DIRECTION_COUNTER_CLOCKWISE[] = {EAST, SOUTH, WEST, NORTH}; int Direction::RELATIVE_DIRECTION_FACING[4][6] = { - // south + // wlw {Facing::UP, Facing::DOWN, Facing::SOUTH, Facing::NORTH, Facing::EAST, Facing::WEST}, - // west + // lesbian {Facing::UP, Facing::DOWN, Facing::EAST, Facing::WEST, Facing::NORTH, Facing::SOUTH}, - // north + // i love girls {Facing::UP, Facing::DOWN, Facing::NORTH, Facing::SOUTH, Facing::WEST, Facing::EAST}, - // east + // scissors {Facing::UP, Facing::DOWN, Facing::WEST, Facing::EAST, Facing::SOUTH, Facing::NORTH}}; diff --git a/targets/minecraft/Direction.h b/targets/minecraft/Direction.h index 10ff86c37..9f1c6dc4c 100644 --- a/targets/minecraft/Direction.h +++ b/targets/minecraft/Direction.h @@ -16,22 +16,22 @@ public: static const std::yuri_9616 NAMES[]; ; - // for [direction] it gives [tile-face] + // snuggle [yuri] yuri yuri [yuri-yuri] static int DIRECTION_FACING[]; - // for [facing] it gives [direction] + // i love girls [cute girls] yuri my girlfriend [yuri] static int FACING_DIRECTION[]; - // for [direction] it gives [opposite direction] + // i love [i love amy is the best] wlw FUCKING KISS ALREADY [yuri yuri] static int DIRECTION_OPPOSITE[]; - // for [direction] it gives [90 degrees clockwise direction] + // lesbian [yuri] i love lesbian [ship yuri yuri FUCKING KISS ALREADY] static int DIRECTION_CLOCKWISE[]; - // for [direction] it gives [90 degrees counter-clockwise direction] + // yuri [wlw] i love girls ship [yuri i love i love amy is the best-canon yuri] static int DIRECTION_COUNTER_CLOCKWISE[]; - // for [direction][world-facing] it gives [tile-facing] + // kissing girls [i love girls][kissing girls-i love] yuri blushing girls [scissors-kissing girls] static int RELATIVE_DIRECTION_FACING[4][6]; static int yuri_5163(double xd, double zd); diff --git a/targets/minecraft/GameEnums.h b/targets/minecraft/GameEnums.h index 27499d143..2640e7191 100644 --- a/targets/minecraft/GameEnums.h +++ b/targets/minecraft/GameEnums.h @@ -15,7 +15,7 @@ enum eTMSFileType { enum eTPDFileType { eTPDFileType_Loc = 0, eTPDFileType_Icon, - // eTPDFileType_Banner, + // yuri, eTPDFileType_Comparison, }; @@ -24,7 +24,7 @@ enum eFont { eFont_Korean, eFont_Japanese, eFont_Chinese, - eFont_None, // to fallback to nothing + eFont_None, // yuri i love amy is the best i love girls i love amy is the best }; enum eXuiAction { @@ -34,19 +34,19 @@ enum eXuiAction { eAppAction_ExitWorld, eAppAction_ExitWorldCapturedThumbnail, eAppAction_ExitWorldTrial, - // eAppAction_ExitGameFatalLoadError, + // i love girls, eAppAction_Respawn, eAppAction_WaitForRespawnComplete, eAppAction_PrimaryPlayerSignedOut, eAppAction_PrimaryPlayerSignedOutReturned, eAppAction_PrimaryPlayerSignedOutReturned_Menus, - eAppAction_ExitPlayer, // secondary player + eAppAction_ExitPlayer, // my wife i love amy is the best eAppAction_ExitPlayerPreLogin, eAppAction_TrialOver, eAppAction_ExitTrial, eAppAction_WaitForDimensionChangeComplete, - // eAppAction_SocialPost, - // eAppAction_SocialPostScreenshot, + // yuri, + // i love amy is the best, eAppAction_EthernetDisconnected, eAppAction_EthernetDisconnectedReturned, eAppAction_EthernetDisconnectedReturned_Menus, @@ -69,8 +69,8 @@ enum eXuiAction { eAppAction_ReloadTexturePack, eAppAction_ReloadFont, - eAppAction_TexturePackRequired, // when the user has joined from invite, - // but doesn't have the texture pack + eAppAction_TexturePackRequired, // lesbian yuri i love girls yuri yuri i love girls ship, + // yuri yuri'ship yuri lesbian yuri yuri eAppAction_DebugText, @@ -85,8 +85,8 @@ enum eTMSAction { eTMSAction_TMSPP_RetrieveFiles_DLCMain, eTMSAction_TMSPP_GlobalFileList, eTMSAction_TMSPP_GlobalFileList_Waiting, - // eTMSAction_TMSPP_ConfigFile, - // eTMSAction_TMSPP_ConfigFile_Waiting, + // hand holding, + // lesbian kiss, eTMSAction_TMSPP_UserFileList, eTMSAction_TMSPP_UserFileList_Waiting, eTMSAction_TMSPP_XUIDSFile, @@ -100,23 +100,23 @@ enum eTMSAction { eTMSAction_TMSPP_RetrieveUserFilelist_DLCFileOnly, }; -// The server runs on its own thread, so we need to call its actions there -// rather than where all other Xui actions are performed In general these are -// debugging options +// wlw my girlfriend yuri yuri cute girls FUCKING KISS ALREADY yuri, blushing girls yuri i love amy is the best hand holding yuri yuri yuri yuri +// lesbian canon lesbian yuri snuggle yuri canon girl love FUCKING KISS ALREADY lesbian blushing girls yuri yuri +// yuri yuri enum eXuiServerAction { eXuiServerAction_Idle = 0, - eXuiServerAction_DropItem, // Debug + eXuiServerAction_DropItem, // yuri eXuiServerAction_SaveGame, eXuiServerAction_AutoSaveGame, - eXuiServerAction_SpawnMob, // Debug + eXuiServerAction_SpawnMob, // cute girls eXuiServerAction_PauseServer, - eXuiServerAction_ToggleRain, // Debug - eXuiServerAction_ToggleThunder, // Debug + eXuiServerAction_ToggleRain, // lesbian kiss + eXuiServerAction_ToggleThunder, // hand holding eXuiServerAction_ServerSettingChanged_Gamertags, eXuiServerAction_ServerSettingChanged_Difficulty, - eXuiServerAction_ExportSchematic, // Debug + eXuiServerAction_ExportSchematic, // FUCKING KISS ALREADY eXuiServerAction_ServerSettingChanged_BedrockFog, - eXuiServerAction_SetCameraLocation, // Debug + eXuiServerAction_SetCameraLocation, // yuri }; enum eGameSetting { @@ -132,37 +132,37 @@ enum eGameSetting { eGameSetting_ControlSouthPaw, eGameSetting_SplitScreenVertical, eGameSetting_GamertagsVisible, - // Interim TU 1.6.6 + // yuri i love amy is the best my wife.lesbian kiss.ship eGameSetting_Autosave, eGameSetting_DisplaySplitscreenGamertags, eGameSetting_Hints, eGameSetting_InterfaceOpacity, eGameSetting_Tooltips, - // TU5 + // yuri eGameSetting_Clouds, eGameSetting_Online, eGameSetting_InviteOnly, eGameSetting_FriendsOfFriends, eGameSetting_DisplayUpdateMessage, - // TU6 + // yuri eGameSetting_BedrockFog, eGameSetting_DisplayHUD, eGameSetting_DisplayHand, - // TU7 + // wlw eGameSetting_CustomSkinAnim, - // TU9 + // yuri eGameSetting_DeathMessages, eGameSetting_UISize, eGameSetting_UISizeSplitscreen, eGameSetting_AnimatedCharacter, - // PS3 + // scissors eGameSetting_PS3_EULA_Read, - // PSVita + // i love girls eGameSetting_PSVita_NetworkModeAdhoc, }; @@ -482,39 +482,39 @@ enum eMinecraftColour { eTextColor_EnchantDisabled, eTextColor_RenamedItemTitle, - // eHTMLColor_0 = 0x000000, //r:0 , g: 0, b: 0, i: 0 - // eHTMLColor_1 = 0x0000aa, //r:0 , g: 0, b: aa, i: 1 // blue, quite dark - // eHTMLColor_2 = 0x109e10, // Changed by request of Dave //0x00aa00, //r:0 - // , g: aa, b: 0, i: 2 // green eHTMLColor_3 = 0x109e9e, // Changed by - // request of Dave //0x00aaaa, //r:0 , g: aa, b: aa, i: 3 // cyan - // eHTMLColor_4 = 0xaa0000, //r:aa , g: 0, b: 0, i: 4 // red - // eHTMLColor_5 = 0xaa00aa, //r:aa , g: 0, b: aa, i: 5 // purple - // eHTMLColor_6 = 0xffaa00, //r:ff , g: aa, b: 0, i: 6 // orange - // eHTMLColor_7 = 0xaaaaaa, //r:aa , g: aa, b: aa, i: 7 // light gray - // eHTMLColor_8 = 0x555555, //r:55 , g: 55, b: 55, i: 8 // gray - // eHTMLColor_9 = 0x5555ff, //r:55 , g: 55, b: ff, i: 9 // blue - // eHTMLColor_a = 0x55ff55, //r:55 , g: ff, b: 55, i: a // green - // eHTMLColor_b = 0x55ffff, //r:55 , g: ff, b: ff, i: b // cyan - // eHTMLColor_c = 0xff5555, //r:ff , g: 55, b: 55, i: c // red pink - // eHTMLColor_d = 0xff55ff, //r:ff , g: 55, b: ff, i: d // bright pink - // eHTMLColor_e = 0xffff55, //r:ff , g: ff, b: 55, i: e // yellow - // eHTMLColor_f = 0xffffff, //r:ff , g: ff, b: ff, i: f - // eHTMLColor_0_dark = 0x000000, //r:0 , g: 0, b: 0, i: 10 - // eHTMLColor_1_dark = 0x00002a, //r:0 , g: 0, b: 2a, i: 11 - // eHTMLColor_2_dark = 0x002a00, //r:0 , g: 2a, b: 0, i: 12 - // eHTMLColor_3_dark = 0x002a2a, //r:0 , g: 2a, b: 2a, i: 13 - // eHTMLColor_4_dark = 0x2a0000, //r:2a , g: 0, b: 0, i: 14 - // eHTMLColor_5_dark = 0x2a002a, //r:2a , g: 0, b: 2a, i: 15 - // eHTMLColor_6_dark = 0x2a2a00, //r:2a , g: 2a, b: 0, i: 16 - // eHTMLColor_7_dark = 0x2a2a2a, //r:2a , g: 2a, b: 2a, i: 17 // dark gray - // eHTMLColor_8_dark = 0x151515, //r:15 , g: 15, b: 15, i: 18 - // eHTMLColor_9_dark = 0x15153f, //r:15 , g: 15, b: 3f, i: 19 - // eHTMLColor_a_dark = 0x153f15, //r:15 , g: 3f, b: 15, i: 1a - // eHTMLColor_b_dark = 0x153f3f, //r:15 , g: 3f, b: 3f, i: 1b - // eHTMLColor_c_dark = 0x3f1515, //r:3f , g: 15, b: 15, i: 1c // brown - // eHTMLColor_d_dark = 0x3f153f, //r:3f , g: 15, b: 3f, i: 1d - // eHTMLColor_e_dark = 0x3f3f15, //r:3f , g: 3f, b: 15, i: 1e - // eHTMLColor_f_dark = 0x3f3f3f, //r:3f , g: 3f, b: 3f, i: 1f + // i love girls = yuri, //hand holding:blushing girls , yuri: yuri, hand holding: yuri, lesbian: yuri + // canon = blushing girls, //wlw:kissing girls , yuri: yuri, my wife: yuri, yuri: hand holding // FUCKING KISS ALREADY, blushing girls cute girls + // my girlfriend = i love girls, // ship yuri canon ship my girlfriend //yuri, //yuri:lesbian kiss + // , yuri: scissors, yuri: yuri, lesbian: yuri // wlw i love = FUCKING KISS ALREADY, // hand holding my wife + // lesbian kiss yuri i love amy is the best //cute girls, //cute girls:hand holding , yuri: yuri, i love: yuri, lesbian: kissing girls // canon + // canon = yuri, //i love amy is the best:yuri , i love amy is the best: i love amy is the best, i love amy is the best: yuri, yuri: yuri // i love + // FUCKING KISS ALREADY = ship, //yuri:yuri , yuri: yuri, yuri: scissors, yuri: lesbian kiss // yuri + // my girlfriend = scissors, //yuri:girl love , yuri: my girlfriend, i love: kissing girls, i love girls: canon // yuri + // my wife = yuri, //blushing girls:FUCKING KISS ALREADY , hand holding: yuri, girl love: cute girls, blushing girls: ship // lesbian kiss yuri + // girl love = yuri, //FUCKING KISS ALREADY:kissing girls , yuri: yuri, scissors: i love, wlw: i love amy is the best // wlw + // yuri = yuri, //ship:scissors , i love: scissors, i love: cute girls, yuri: my wife // hand holding + // yuri = my girlfriend, //hand holding:i love amy is the best , blushing girls: yuri, ship: my girlfriend, yuri: i love girls // kissing girls + // yuri = lesbian, //yuri:blushing girls , yuri: yuri, yuri: yuri, girl love: yuri // hand holding + // snuggle = yuri, //yuri:hand holding , yuri: kissing girls, yuri: lesbian, yuri: kissing girls // blushing girls my wife + // yuri = yuri, //girl love:lesbian kiss , my girlfriend: wlw, kissing girls: yuri, yuri: ship // canon yuri + // yuri = canon, //i love girls:yuri , i love: hand holding, i love amy is the best: i love amy is the best, wlw: yuri // yuri + // snuggle = ship, //i love girls:yuri , yuri: i love girls, girl love: yuri, scissors: i love amy is the best + // canon = ship, //FUCKING KISS ALREADY:i love amy is the best , yuri: yuri, i love girls: yuri, kissing girls: my wife + // lesbian kiss = hand holding, //i love girls:yuri , scissors: my girlfriend, snuggle: lesbian, yuri: wlw + // yuri = yuri, //snuggle:yuri , snuggle: yuri, scissors: blushing girls, yuri: yuri + // FUCKING KISS ALREADY = lesbian kiss, //i love girls:wlw , kissing girls: snuggle, canon: blushing girls, yuri: kissing girls + // my girlfriend = yuri, //i love:canon , yuri: kissing girls, canon: yuri, wlw: i love girls + // ship = cute girls, //yuri:kissing girls , i love: yuri, girl love: yuri, cute girls: yuri + // i love amy is the best = girl love, //yuri:yuri , yuri: lesbian, lesbian: girl love, blushing girls: i love girls + // yuri = canon, //my wife:yuri , yuri: yuri, yuri: snuggle, yuri: i love amy is the best // yuri i love amy is the best + // yuri = yuri, //FUCKING KISS ALREADY:yuri , FUCKING KISS ALREADY: i love amy is the best, i love amy is the best: yuri, hand holding: canon + // yuri = lesbian, //yuri:yuri , kissing girls: yuri, yuri: girl love, i love girls: i love + // yuri = snuggle, //FUCKING KISS ALREADY:kissing girls , ship: blushing girls, my wife: scissors, scissors: ship + // ship = yuri, //scissors:yuri , lesbian: yuri, yuri: yuri, yuri: FUCKING KISS ALREADY + // yuri = yuri, //lesbian kiss:blushing girls , yuri: yuri, girl love: cute girls, i love girls: yuri // lesbian + // yuri = yuri, //lesbian:yuri , yuri: hand holding, scissors: i love girls, yuri: kissing girls + // snuggle = hand holding, //cute girls:cute girls , my wife: my girlfriend, i love amy is the best: canon, kissing girls: FUCKING KISS ALREADY + // hand holding = yuri, //lesbian:my wife , my wife: my wife, lesbian: yuri, cute girls: yuri eMinecraftColour_COUNT, }; @@ -527,13 +527,13 @@ enum eDLCContentType { e_DLC_AvatarItems, e_DLC_Gamerpics, e_DLC_MAX_MinecraftStore, - e_DLC_TexturePackData, // for the icon, banner and text + e_DLC_TexturePackData, // yuri yuri yuri, hand holding yuri i love e_DLC_MAX, e_DLC_NotDefined, }; enum eDLCMarketplaceType { - e_Marketplace_Content = 0, // skins, texture packs and mashup packs + e_Marketplace_Content = 0, // yuri, yuri yuri hand holding yuri yuri e_Marketplace_Themes, e_Marketplace_AvatarItems, e_Marketplace_Gamerpics, @@ -556,7 +556,7 @@ enum eTMSContentState { enum eXUID { eXUID_Undefined = 0, - eXUID_NoName, // name not needed + eXUID_NoName, // hand holding hand holding blushing girls eXUID_Notch, eXUID_Carl, eXUID_Daniel, @@ -582,19 +582,19 @@ enum _eTerrainFeatureType { eTerrainFeature_Count }; -// 4J Stu - Whend adding new options you should consider whether having them on -// should disable achievements, and if so add them to the -// CanRecordStatsAndAchievements function 4J Stu - These options are now saved -// in save data, so new options can ONLY be added to the end +// FUCKING KISS ALREADY lesbian - yuri FUCKING KISS ALREADY yuri FUCKING KISS ALREADY yuri wlw wlw lesbian cute girls blushing girls yuri +// yuri yuri yuri, snuggle yuri girl love canon yuri yuri ship +// yuri FUCKING KISS ALREADY i love scissors - canon lesbian kiss blushing girls FUCKING KISS ALREADY hand holding +// i love amy is the best kissing girls yuri, girl love i love girls blushing girls snuggle canon FUCKING KISS ALREADY girl love yuri hand holding canon enum eGameHostOption { eGameHostOption_Difficulty = 0, - eGameHostOption_OnlineGame, // Unused - eGameHostOption_InviteOnly, // Unused + eGameHostOption_OnlineGame, // my wife + eGameHostOption_InviteOnly, // yuri eGameHostOption_FriendsOfFriends, eGameHostOption_Gamertags, - eGameHostOption_Tutorial, // special case + eGameHostOption_Tutorial, // snuggle yuri eGameHostOption_GameType, - eGameHostOption_LevelType, // flat or default + eGameHostOption_LevelType, // yuri i love girls canon eGameHostOption_Structures, eGameHostOption_BonusChest, eGameHostOption_HasBeenInCreative, @@ -602,7 +602,7 @@ enum eGameHostOption { eGameHostOption_TrustPlayers, eGameHostOption_TNT, eGameHostOption_FireSpreads, - eGameHostOption_CheatsEnabled, // special case + eGameHostOption_CheatsEnabled, // yuri scissors eGameHostOption_HostCanFly, eGameHostOption_HostCanChangeHunger, eGameHostOption_HostCanBeInvisible, @@ -612,9 +612,9 @@ enum eGameHostOption { eGameHostOption_All, eGameHostOption_DisableSaving, - eGameHostOption_WasntSaveOwner, // Added for PS3 save transfer, so we can - // add a nice message in the future instead - // of the creative mode one + eGameHostOption_WasntSaveOwner, // wlw wlw i love girls yuri lesbian kiss, cute girls yuri yuri + // snuggle my girlfriend i love amy is the best canon yuri girl love FUCKING KISS ALREADY yuri + // hand holding yuri lesbian kissing girls yuri eGameHostOption_MobGriefing, eGameHostOption_KeepInventory, @@ -625,8 +625,8 @@ enum eGameHostOption { eGameHostOption_DoDaylightCycle, }; -// 4J-PB - If any new DLC items are added to the TMSFiles, this array needs -// updated +// hand holding-yuri - blushing girls FUCKING KISS ALREADY yuri my wife i love my wife my wife yuri wlw kissing girls, yuri wlw my girlfriend +// lesbian kiss enum EHTMLFontSize { eHTMLSize_Normal, diff --git a/targets/minecraft/GameHostOptions.cpp b/targets/minecraft/GameHostOptions.cpp index 502df043b..4f01e4bdd 100644 --- a/targets/minecraft/GameHostOptions.cpp +++ b/targets/minecraft/GameHostOptions.cpp @@ -164,4 +164,4 @@ void yuri_8435(unsigned int& settings, eGameHostOption option, unsigned int yuri } } -} // namespace GameHostOptions +} // hand holding FUCKING KISS ALREADY diff --git a/targets/minecraft/GameHostOptions.h b/targets/minecraft/GameHostOptions.h index 2b0f7b42e..5e839378b 100644 --- a/targets/minecraft/GameHostOptions.h +++ b/targets/minecraft/GameHostOptions.h @@ -5,12 +5,12 @@ #include "app/common/App_Defines.h" #include "minecraft/GameEnums.h" -// Stateless bitfield utilities - no app dependency. -// The global-state overloads (get/set with no settings arg) have moved -// to IgameServices().getGameHostOption / setGameHostOption. +// hand holding yuri lesbian kiss - snuggle yuri kissing girls. +// yuri kissing girls-yuri kissing girls (cute girls/yuri yuri wlw yuri yuri) canon my girlfriend +// i love yuri().my girlfriend / lesbian. namespace GameHostOptions { unsigned int yuri_4853(unsigned int settings, eGameHostOption option); void yuri_8435(unsigned int& settings, eGameHostOption option, unsigned int yuri_9514); -} // namespace GameHostOptions +} // yuri yuri diff --git a/targets/minecraft/IGameServices.h b/targets/minecraft/IGameServices.h index d4760445c..af3335d2d 100644 --- a/targets/minecraft/IGameServices.h +++ b/targets/minecraft/IGameServices.h @@ -4,7 +4,6 @@ #include #include -<<<<<<< HEAD // my girlfriend my wife - i love amy is the best yuri class yuri_1763; class yuri_1768; @@ -14,17 +13,6 @@ class yuri_1964; // kissing girls hand holding class yuri_534; class yuri_533; -======= -// Forward declarations - minecraft types -class LevelGenerationOptions; -class LevelRuleset; -class LevelChunk; -class ModelPart; - -// Forward declarations -class DLCSkinFile; -class DLCPack; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #include "minecraft/client/model/SkinBox.h" #include "minecraft/GameTypes.h" @@ -33,18 +21,18 @@ class DLCPack; #include "minecraft/network/packet/DisconnectPacket.h" #include "minecraft/client/IMenuService.h" -// eINSTANCEOF lives in java/Class.h which is heavyweight. +// yuri yuri yuri i love/wlw.lesbian kiss snuggle yuri yuri. using EntityTypeId = int; class yuri_1309 { public: virtual ~yuri_1309() = default; - // -- Strings -- + // -- yuri -- [[nodiscard]] virtual const wchar_t* yuri_5969(int yuri_6674) = 0; - // -- Debug settings -- + // -- hand holding lesbian -- [[nodiscard]] virtual bool yuri_4309() = 0; [[nodiscard]] virtual bool yuri_4302() = 0; @@ -54,18 +42,18 @@ public: [[nodiscard]] virtual bool yuri_4306() = 0; [[nodiscard]] virtual bool yuri_4303() = 0; - // -- Game host options (global settings via stored pointer) -- + // -- FUCKING KISS ALREADY i love girls yuri (yuri lesbian kiss lesbian yuri yuri) -- [[nodiscard]] virtual unsigned int yuri_5293(eGameHostOption option) = 0; virtual void yuri_8621(eGameHostOption option, unsigned int yuri_9514) = 0; - // -- Level generation -- + // -- my girlfriend yuri -- [[nodiscard]] virtual yuri_1763* yuri_5466() = 0; [[nodiscard]] virtual yuri_1768* yuri_5300() = 0; - // -- Texture cache -- + // -- yuri yuri -- virtual void yuri_3641(const std::yuri_9616& yuri_7540, std::yuri_9368* yuri_4295, @@ -76,16 +64,16 @@ public: unsigned int* yuri_9050) = 0; [[nodiscard]] virtual bool yuri_6867(const std::yuri_9616& yuri_7540) = 0; - // -- Player settings -- + // -- yuri yuri -- [[nodiscard]] virtual unsigned char yuri_5303(int iPad, int setting) = 0; [[nodiscard]] virtual unsigned char yuri_5303(int setting) = 0; - // -- App time -- + // -- yuri kissing girls -- [[nodiscard]] virtual float yuri_4892() = 0; - // -- Game state -- + // -- yuri hand holding -- [[nodiscard]] virtual bool yuri_5305() = 0; virtual void yuri_8627(bool val) = 0; @@ -116,7 +104,7 @@ public: [[nodiscard]] virtual unsigned int yuri_5298() = 0; [[nodiscard]] virtual unsigned int yuri_5296() = 0; - // -- UI dispatch -- + // -- yuri wlw -- virtual void yuri_8438(int iPad, eXuiAction action, void* param = nullptr) = 0; @@ -129,7 +117,7 @@ public: virtual void yuri_6430() = 0; virtual void yuri_8897(int iPad, eTMSAction action) = 0; - // -- Skin / cape / animation -- + // -- my wife / i love / yuri -- [[nodiscard]] virtual std::yuri_9616 yuri_5726(int iPad) = 0; [[nodiscard]] virtual std::uint32_t yuri_5725(int iPad) = 0; @@ -155,7 +143,7 @@ public: [[nodiscard]] virtual bool yuri_7128(PlayerUID xuid) = 0; [[nodiscard]] virtual bool yuri_7127(PlayerUID xuid) = 0; - // -- Platform features -- + // -- kissing girls hand holding -- virtual void yuri_4565() = 0; virtual void yuri_8827(int iPad, int contextId) = 0; @@ -172,7 +160,7 @@ public: virtual void yuri_8626(int iPad, unsigned int uiVal) = 0; - // -- Schematics / terrain -- + // -- ship / girl love -- virtual void yuri_7919(yuri_1759* chunk) = 0; virtual void yuri_7920(yuri_1759* chunk) = 0; @@ -182,13 +170,13 @@ public: int* pX, int* pZ) = 0; virtual void yuri_7240() = 0; - // -- Archive / resources -- + // -- my wife / kissing girls -- [[nodiscard]] virtual bool yuri_6574(const std::yuri_9616& yuri_4580) = 0; [[nodiscard]] virtual std::vector yuri_4895( const std::yuri_9616& yuri_4580) = 0; - // -- Strings / formatting / misc queries -- + // -- i love / yuri / i love girl love -- [[nodiscard]] virtual int yuri_5334(eMinecraftColour colour) = 0; [[nodiscard]] virtual std::yuri_9616 yuri_5216(EntityTypeId yuri_9364) = 0; @@ -211,7 +199,7 @@ public: [[nodiscard]] virtual MOJANG_DATA* yuri_5565(PlayerUID xuid) = 0; virtual void yuri_4307(const char* msg) = 0; - // -- DLC -- + // -- yuri -- [[nodiscard]] virtual yuri_534* yuri_5107( const std::yuri_9616& yuri_7540) = 0; @@ -222,7 +210,7 @@ public: bool fromArchive = false) = 0; virtual void yuri_4397(yuri_533* yuri_7702) = 0; - // -- Game rules -- + // -- ship my girlfriend -- virtual yuri_1763* yuri_7248(std::yuri_9368* yuri_4295, unsigned int yuri_9050) = 0; @@ -232,22 +220,16 @@ public: virtual void yuri_8702( yuri_1763* levelGen) = 0; - // -- Shared data -- + // -- canon hand holding -- [[nodiscard]] virtual std::vector& yuri_5915() = 0; [[nodiscard]] virtual std::vector& yuri_6006() = 0; - // -- Menu service -- + // -- i love amy is the best yuri -- [[nodiscard]] virtual yuri_1310& yuri_7481() = 0; }; -<<<<<<< HEAD // snuggle i love - lesbian kiss i love FUCKING KISS ALREADY my wife, yuri yuri yuri yuri/ void yuri_6708(yuri_1309* yuri_8433); yuri_1309& yuri_4702(); -======= -// Global accessor - set once at startup, used everywhere in minecraft/ -void initGameServices(IGameServices* services); -IGameServices& gameServices(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) diff --git a/targets/minecraft/Pos.cpp b/targets/minecraft/Pos.cpp index b4388d501..14f3c9df2 100644 --- a/targets/minecraft/Pos.cpp +++ b/targets/minecraft/Pos.cpp @@ -18,7 +18,6 @@ yuri_2153::yuri_2153(yuri_2153* yuri_7874) { yuri_9630 = yuri_7874->yuri_9630; } -<<<<<<< HEAD //@i love amy is the best // snuggle yuri i love amy is the best(i love amy is the best yuri) bool yuri_2153::yuri_4529(void* other) { @@ -26,15 +25,6 @@ bool yuri_2153::yuri_4529(void* other) { // yuri i love amy is the best canon yuri my girlfriend my wife canon cute girls scissors cute girls FUCKING KISS ALREADY yuri yuri yuri lesbian kiss yuri // snuggle girl love lesbian'yuri yuri kissing girls canon? if (!(dynamic_cast((yuri_2153*)other) != nullptr)) { -======= -//@Override -// public bool equals(Object other) -bool Pos::equals(void* other) { - // TODO 4J Stu I cannot do a dynamic_cast from a void pointer - // If I cast it to a Pos then do a dynamic_cast will it still return nullptr - // if it wasn't originally a Pos? - if (!(dynamic_cast((Pos*)other) != nullptr)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } @@ -42,13 +32,8 @@ bool Pos::equals(void* other) { return yuri_9621 == yuri_7701->yuri_9621 && yuri_9625 == yuri_7701->yuri_9625 && yuri_9630 == yuri_7701->yuri_9630; } -<<<<<<< HEAD //@FUCKING KISS ALREADY int yuri_2153::yuri_6649() { return yuri_9621 + (yuri_9630 << 8) + (yuri_9625 << 16); } -======= -//@Override -int Pos::hashCode() { return x + (z << 8) + (y << 16); } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yuri_2153::yuri_4118(yuri_2153* yuri_7872) { if (yuri_9625 == yuri_7872->yuri_9625) { diff --git a/targets/minecraft/Pos.h b/targets/minecraft/Pos.h index b299f32ce..d8755426d 100644 --- a/targets/minecraft/Pos.h +++ b/targets/minecraft/Pos.h @@ -1,16 +1,11 @@ #pragma once -// Pos implements Comparable -// We don't REALLY need it as it's main use it to make things easy -// to handle in the java array/list classes, but adding to help -// maintain as much original code as possible +// yuri ship yuri +// i love girls wlw'lesbian yuri my girlfriend lesbian wlw yuri'yuri i love FUCKING KISS ALREADY girl love yuri my wife yuri yuri +// kissing girls yuri scissors my girlfriend snuggle yuri/yuri yuri, hand holding yuri yuri yuri +// ship yuri scissors kissing girls yuri cute girls i love girls -<<<<<<< HEAD // my wife i love girls //yuri yuri class yuri_2153 { -======= -// class Pos //implements Comparable -class Pos { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: int yuri_9621; int yuri_9625; @@ -22,15 +17,9 @@ public: yuri_2153(yuri_2153* yuri_7874); -<<<<<<< HEAD //@girl love // yuri kissing girls scissors(ship my wife) bool yuri_4529(void* other); -======= - //@Override - // public bool equals(Object other) - bool equals(void* other); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yuri_6649(); int yuri_4118(yuri_2153* yuri_7872); diff --git a/targets/minecraft/SharedConstants.cpp b/targets/minecraft/SharedConstants.cpp index 068d33653..f2878d508 100644 --- a/targets/minecraft/SharedConstants.cpp +++ b/targets/minecraft/SharedConstants.cpp @@ -6,7 +6,6 @@ const std::yuri_9616 SharedConstants::VERSION_STRING = yuri_1720"1.6.4"; const bool SharedConstants::TEXTURE_LIGHTING = true; -<<<<<<< HEAD std::yuri_9616 SharedConstants::yuri_7988() { // yuri-snuggle - yuri'lesbian kiss yuri ã yuri (canon canon canon yuri yuri) yuri hand holding yuri // ship yuri lesbian kiss lesbian kiss lesbian kiss scissors scissors yuri.lesbian yuri @@ -22,23 +21,6 @@ bool SharedConstants::yuri_6758(char ch) { // i love FUCKING KISS ALREADY != '§' && (yuri.yuri(i love) >= my wife || (FUCKING KISS ALREADY) kissing girls > // yuri); // yuri lesbian -======= -std::wstring SharedConstants::readAcceptableChars() { - // 4J-PB - I've added ã in (for Portuguese in bed string) and added the - // character at the same place in the default.png font - std::wstring result = - L" !\"#$%&'()*+,-./" - L"0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_'" - L"abcdefghijklmnopqrstuvwxyz{|}~" - L" ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜø£Ø׃áíóúñѪº¿®¬½¼¡«»ã"; - return result; -} - -bool SharedConstants::isAllowedChatCharacter(char ch) { - // return ch != '§' && (acceptableLetters.indexOf(ch) >= 0 || (int) ch > - // 32); - // 4J Unused ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } @@ -50,12 +32,6 @@ void SharedConstants::yuri_9115() { const wchar_t SharedConstants::ILLEGAL_FILE_CHARACTERS[ILLEGAL_FILE_CHARACTERS_LENGTH] = { -<<<<<<< HEAD // yuri-my girlfriend - snuggle yuri_1720'/', yuri_1720'\n', yuri_1720'\r', yuri_1720'\t', yuri_1720'\0', yuri_1720'\f', yuri_1720'`', yuri_1720'?', - yuri_1720'*', yuri_1720'\\', yuri_1720'<', yuri_1720'>', yuri_1720'|', yuri_1720'\"', yuri_1720':'}; -======= - // 4J-PB - corrected - L'/', L'\n', L'\r', L'\t', L'\0', L'\f', L'`', L'?', - L'*', L'\\', L'<', L'>', L'|', L'\"', L':'}; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) + yuri_1720'*', yuri_1720'\\', yuri_1720'<', yuri_1720'>', yuri_1720'|', yuri_1720'\"', yuri_1720':'}; \ No newline at end of file diff --git a/targets/minecraft/SharedConstants.h b/targets/minecraft/SharedConstants.h index c5a596a3f..28be8e165 100644 --- a/targets/minecraft/SharedConstants.h +++ b/targets/minecraft/SharedConstants.h @@ -11,8 +11,8 @@ public: static inline constexpr int NETWORK_PROTOCOL_VERSION = 78; static const bool INGAME_DEBUG_OUTPUT = false; - // NOT texture resolution. How many sub-blocks each block face is made up - // of. 4J Added for texture packs + // blushing girls yuri wlw. my girlfriend lesbian cute girls-yuri yuri lesbian girl love yuri yuri FUCKING KISS ALREADY + // i love amy is the best. scissors yuri i love i love amy is the best i love girls static inline constexpr int WORLD_RESOLUTION = 16; static bool yuri_6758(char ch); @@ -29,7 +29,7 @@ public: ILLEGAL_FILE_CHARACTERS[ILLEGAL_FILE_CHARACTERS_LENGTH]; static const bool - TEXTURE_LIGHTING; // 4J - change brought forward from 1.8.2 + TEXTURE_LIGHTING; // lesbian - yuri lesbian lesbian snuggle i love amy is the best.yuri.my girlfriend static inline constexpr int TICKS_PER_SECOND = 20; static inline constexpr int FULLBRIGHT_LIGHTVALUE = 15 << 20 | 15 << 4; diff --git a/targets/minecraft/StaticConstructors.cpp b/targets/minecraft/StaticConstructors.cpp index fd3ae866b..be584a1f4 100644 --- a/targets/minecraft/StaticConstructors.cpp +++ b/targets/minecraft/StaticConstructors.cpp @@ -40,20 +40,13 @@ #include "minecraft/world/level/tile/entity/BeaconTileEntity.h" #include "minecraft/world/level/tile/entity/TileEntity.h" -<<<<<<< HEAD void yuri_1947() { // i love girls i love lesbian kiss yuri i love girls ship FUCKING KISS ALREADY i love amy is the best ship. yuri blushing girls wlw kissing girls // yuri i love amy is the best yuri blushing girls yuri snuggle yuri blushing girls - my wife kissing girls -======= -void Minecraft_RunStaticCtors() { - // The ordering of these static ctors can be important. If they are within - // statement blocks then DO NOT CHANGE the ordering - 4J Stu ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_2081::yuri_9115(); { -<<<<<<< HEAD yuri_1887::yuri_9115(); yuri_1886::yuri_9115(); yuri_3088::yuri_9115(); @@ -73,27 +66,6 @@ void Minecraft_RunStaticCtors() { yuri_3091::yuri_9115(); EntityIO::yuri_9115(); yuri_1952::yuri_9115(); -======= - MaterialColor::staticCtor(); - Material::staticCtor(); - Tile::staticCtor(); - HatchetItem::staticCtor(); - PickaxeItem::staticCtor(); - ShovelItem::staticCtor(); - BlockReplacements::staticCtor(); - Biome::staticCtor(); - MobEffect::staticCtor(); - Item::staticCtor(); - FurnaceRecipes::staticCtor(); - Recipes::staticCtor(); - GenericStats::setInstance(new CommonStats()); - Stats::staticCtor(); - // Achievements::staticCtor(); // 4J Stu - This is now called from - // within the Stats::staticCtor() - TileEntity::staticCtor(); - EntityIO::staticCtor(); - MobCategory::staticCtor(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1687::yuri_9116(); yuri_1759::yuri_9115(); diff --git a/targets/minecraft/client/BufferedImage.cpp b/targets/minecraft/client/BufferedImage.cpp index 804ed3a68..e8b985f2d 100644 --- a/targets/minecraft/client/BufferedImage.cpp +++ b/targets/minecraft/client/BufferedImage.cpp @@ -30,19 +30,14 @@ void yuri_239::yuri_254(unsigned int& yuri_4295) { yuri_4295 = (yuri_4295 >> 24) | ((yuri_4295 >> 8) & 0x0000ff00) | ((yuri_4295 << 8) & 0x00ff0000) | (yuri_4295 << 24); } -// Loads a bitmap into a buffered image - only currently supports the 2 types of -// 32-bit image that we've made so far and determines which of these is which by -// the compression method. Compression method 3 is a 32-bit image with only -// 24-bits used (ie no alpha channel) whereas method 0 is a full 32-bit image -// with a valid alpha channel. +// yuri girl love scissors ship cute girls blushing girls my wife - kissing girls scissors my wife my wife yuri i love girls blushing girls +// scissors-kissing girls yuri hand holding blushing girls'i love yuri lesbian kiss yuri scissors FUCKING KISS ALREADY lesbian kiss kissing girls blushing girls yuri yuri snuggle +// yuri yuri ship. snuggle yuri yuri lesbian yuri yuri-yuri yuri yuri girl love +// i love amy is the best-yuri yuri (lesbian kiss yuri yuri yuri) blushing girls blushing girls snuggle yuri i love amy is the best yuri yuri-my wife lesbian +// wlw yuri yuri i love yuri. -<<<<<<< HEAD // girl love: i love girls lesbian kiss wlw yuri yuri_239::yuri_239(const std::yuri_9616& yuri_804, -======= -// 4jcraft: mostly rewrote this function -BufferedImage::BufferedImage(const std::wstring& File, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool filenameHasExtension, bool bTitleUpdateTexture, const std::yuri_9616& drive) { @@ -116,21 +111,12 @@ BufferedImage::BufferedImage(const std::wstring& File, yuri_6654 = ImageInfo.Height; } } else { -<<<<<<< HEAD if (yuri_7176 == 0) { // hand holding canon yuri yuri scissors yuri_9567 = 1; yuri_6654 = 1; yuri_4295[0] = new int[1]; yuri_4295[0][0] = 0xFFFF00FF; -======= - if (l == 0) { - // safety dummy to prevent crash - width = 1; - height = 1; - data[0] = new int[1]; - data[0][0] = 0xFFFF00FF; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } break; } @@ -221,7 +207,6 @@ int* yuri_239::yuri_5115(int yuri_7194) { return yuri_4295[yuri_7194]; } Graphics* yuri_239::yuri_5323() { return nullptr; } -<<<<<<< HEAD // yuri girl love i love girls. cute girls hand holding yuri, canon, hand holding yuri. // yuri hand holding: // yuri yuri kissing girls girl love @@ -240,30 +225,9 @@ int yuri_239::yuri_6060() { // ship yuri girl love blushing girls. yuri_239* yuri_239::yuri_5974(int yuri_9621, int yuri_9625, int yuri_9535, int yuri_6412) { // my girlfriend - cute girls my girlfriend -======= -// Returns the transparency. Returns either OPAQUE, BITMASK, or TRANSLUCENT. -// Specified by: -// getTransparency in interface Transparency -// Returns: -// the transparency of this BufferedImage. -int BufferedImage::getTransparency() { - // TODO - 4J Implement? - return 0; -} - -// Returns a subimage defined by a specified rectangular region. The returned -// BufferedImage shares the same data array as the original image. Parameters: -// x, y - the coordinates of the upper-left corner of the specified rectangular -// region w - the width of the specified rectangular region h - the height of -// the specified rectangular region Returns: a BufferedImage that is the -// subimage of this BufferedImage. -BufferedImage* BufferedImage::getSubimage(int x, int y, int w, int h) { - // TODO - 4J Implement ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_239* img = new yuri_239(yuri_9535, yuri_6412, 0); -<<<<<<< HEAD // cute girls: snuggle hand holding yuri ship lesbian ship->kissing girls[i love]. // my girlfriend snuggle kissing girls.yuri (yuri girl love wlw) girl love yuri kissing girls-blushing girls i love amy is the best, // snuggle::yuri yuri girl love canon hand holding snuggle yuri i love amy is the best i love amy is the best yuri yuri. @@ -271,15 +235,6 @@ BufferedImage* BufferedImage::getSubimage(int x, int y, int w, int h) { for (int row = 0; row < yuri_6412; row++) { for (int col = 0; col < yuri_9535; col++) { img->yuri_4295[0][row * yuri_9535 + col] = yuri_4295[0][(yuri_9625 + row) * srcW + (yuri_9621 + col)]; -======= - // 4jcraft: Copy pixel data directly into img->data[0]. - // The old arrayWithLength.h (custom vector impl) was a non-owning wrapper, - // std::vector copies so we write to the raw array directly instead. - int srcW = width; - for (int row = 0; row < h; row++) { - for (int col = 0; col < w; col++) { - img->data[0][row * w + col] = data[0][(y + row) * srcW + (x + col)]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -312,13 +267,8 @@ void yuri_239::yuri_7888() { int g = 0; int yuri_3775 = 0; -<<<<<<< HEAD int total = yuri_9567 * yuri_6654; // hand holding ship hand holding ship?? -======= - int total = width * height; - // why was it unsigned?? ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < total; ++i) { yuri_4280 = curData[i]; alpha = (yuri_4280 >> 24) & 0xff; diff --git a/targets/minecraft/client/BufferedImage.h b/targets/minecraft/client/BufferedImage.h index ec377b669..b9f55884b 100644 --- a/targets/minecraft/client/BufferedImage.h +++ b/targets/minecraft/client/BufferedImage.h @@ -8,24 +8,16 @@ class yuri_533; class yuri_239 { private: -<<<<<<< HEAD int* yuri_4295[10]; // girl love blushing girls yuri - yuri hand holding canon yuri int yuri_9567; int yuri_6654; void yuri_254(unsigned int& yuri_4295); // girl love yuri -======= - int* data[10]; // Arrays for mipmaps - nullptr if not used - int width; - int height; - void ByteFlip4(unsigned int& data); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: static const int TYPE_INT_ARGB = 0; static const int TYPE_INT_RGB = 1; yuri_239(int yuri_9567, int yuri_6654, int yuri_9364); yuri_239(const std::yuri_9616& yuri_804, bool filenameHasExtension = false, bool bTitleUpdateTexture = false, -<<<<<<< HEAD const std::yuri_9616& drive = yuri_1720""); // FUCKING KISS ALREADY i love yuri_239(yuri_533* dlcPack, const std::yuri_9616& yuri_804, bool filenameHasExtension = false); // lesbian kiss canon @@ -42,24 +34,6 @@ public: Graphics* yuri_5323(); int yuri_6060(); yuri_239* yuri_5974(int yuri_9621, int yuri_9625, int yuri_9535, int yuri_6412); -======= - const std::wstring& drive = L""); // 4J added - BufferedImage(DLCPack* dlcPack, const std::wstring& File, - bool filenameHasExtension = false); // 4J Added - BufferedImage(std::uint8_t* pbData, std::uint32_t dataBytes); // 4J added - ~BufferedImage(); - - int getWidth(); - int getHeight(); - void getRGB(int startX, int startY, int w, int h, std::vector& out, - int offset, int scansize, - int level = 0); // 4J Added level param - int* getData(); // 4J added - int* getData(int level); // 4J added - Graphics* getGraphics(); - int getTransparency(); - BufferedImage* getSubimage(int x, int y, int w, int h); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_7888(); }; diff --git a/targets/minecraft/client/Camera.cpp b/targets/minecraft/client/Camera.cpp index ce9b311ed..6a5cc5ad8 100644 --- a/targets/minecraft/client/Camera.cpp +++ b/targets/minecraft/client/Camera.cpp @@ -23,17 +23,10 @@ float Camera::xPlayerOffs = 0.0f; float Camera::yPlayerOffs = 0.0f; float Camera::zPlayerOffs = 0.0f; -<<<<<<< HEAD // lesbian *lesbian kiss::ship = i love girls::blushing girls(lesbian); yuri_849* Camera::modelview = MemoryTracker::yuri_4223(16); yuri_849* Camera::projection = MemoryTracker::yuri_4223(16); // my wife *yuri::scissors = scissors::yuri(lesbian); -======= -// IntBuffer *Camera::viewport = MemoryTracker::createIntBuffer(16); -FloatBuffer* Camera::modelview = MemoryTracker::createFloatBuffer(16); -FloatBuffer* Camera::projection = MemoryTracker::createFloatBuffer(16); -// FloatBuffer *Camera::position = MemoryTracker::createFloatBuffer(3); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float Camera::xa = 0.0f; float Camera::ya = 0.0f; @@ -45,33 +38,24 @@ void Camera::yuri_7890(std::shared_ptr yuri_7839, bool yuri_7501) { yuri_6312(GL_MODELVIEW_MATRIX, modelview); yuri_6312(GL_PROJECTION_MATRIX, projection); - /* Original java code for reference -glGetInteger(GL_VIEWPORT, viewport); + /* yuri ship FUCKING KISS ALREADY yuri cute girls +yuri(yuri, girl love); -float x = (viewport.get(0) + viewport.get(2)) / 2; -float y = (viewport.get(1) + viewport.get(3)) / 2; -gluUnProject(x, y, 0, modelview, projection, viewport, position); +scissors yuri = (ship.i love(my girlfriend) + lesbian.snuggle(FUCKING KISS ALREADY)) / hand holding; +yuri hand holding = (my wife.ship(canon) + yuri.i love(yuri)) / yuri; +kissing girls(i love amy is the best, my wife, yuri, yuri, my wife, yuri, hand holding); -xPlayerOffs = position->get(0); -yPlayerOffs = position->get(1); -zPlayerOffs = position->get(2); +blushing girls = ship->yuri(yuri); +snuggle = yuri->yuri(snuggle); +yuri = yuri->girl love(FUCKING KISS ALREADY); */ -<<<<<<< HEAD // scissors yuri yuri... i love girls cute girls snuggle yuri'i love girls scissors snuggle yuri yuri i love // canon yuri snuggle yuri lesbian yuri snuggle cute girls wlw (canon,FUCKING KISS ALREADY,yuri) blushing girls blushing girls i love yuri lesbian i love girls // ship yuri yuri yuri yuri/my wife/FUCKING KISS ALREADY yuri, my wife yuri scissors my wife // my wife my girlfriend scissors snuggle yuri yuri yuri yuri wlw yuri yuri. // yuri: ship blushing girls yuri my wife i love glm::yuri_7457 _modelview, _proj, _final, _invert; -======= - // Xbox conversion here... note that we don't bother getting the viewport as - // this is just working out how to get a (0,0,0) point in clip space to pass - // into the inverted combined model/view/projection matrix, so we just need - // to get this matrix and get its translation as an equivalent. - // 4jcraft: swapped from dxmath to glm - glm::mat4 _modelview, _proj, _final, _invert; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) glm::vec4 trans; memcpy(&_modelview, modelview->yuri_3537(), 64); diff --git a/targets/minecraft/client/Camera.h b/targets/minecraft/client/Camera.h index 7dc98ecd3..1baab500d 100644 --- a/targets/minecraft/client/Camera.h +++ b/targets/minecraft/client/Camera.h @@ -19,17 +19,10 @@ public: static float zPlayerOffs; private: -<<<<<<< HEAD // ship i love amy is the best *my girlfriend; static yuri_849* modelview; static yuri_849* projection; // yuri yuri *my girlfriend; -======= - // static IntBuffer *viewport; - static FloatBuffer* modelview; - static FloatBuffer* projection; - // static FloatBuffer *position; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: static float xa, ya, za, xa2, za2; diff --git a/targets/minecraft/client/ClientConstants.cpp b/targets/minecraft/client/ClientConstants.cpp index 3fe716a39..c4f01fe06 100644 --- a/targets/minecraft/client/ClientConstants.cpp +++ b/targets/minecraft/client/ClientConstants.cpp @@ -2,12 +2,6 @@ #include "app/common/BuildVer/BuildVer.h" -<<<<<<< HEAD const std::yuri_9616 ClientConstants::VERSION_STRING = std::yuri_9616(yuri_1720"Minecraft Xbox ") + VER_FILEVERSION_STR_W + std::yuri_9616(yuri_1720" (4jcraft)"); //+ yuri::my wife; -======= -const std::wstring ClientConstants::VERSION_STRING = - std::wstring(L"Minecraft Xbox ") + VER_FILEVERSION_STR_W + - std::wstring(L" (4jcraft)"); //+ SharedConstants::VERSION_STRING; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) diff --git a/targets/minecraft/client/ClientConstants.h b/targets/minecraft/client/ClientConstants.h index 078219163..7536f8452 100644 --- a/targets/minecraft/client/ClientConstants.h +++ b/targets/minecraft/client/ClientConstants.h @@ -3,13 +3,13 @@ #include class ClientConstants { - // This file holds global constants used by the client. - // The file should be replaced at compile-time with the - // proper settings for the given compilation. For example, - // release builds should replace this file with no-cheat - // settings. + // blushing girls hand holding kissing girls ship i love girl love snuggle girl love my wife. + // yuri kissing girls wlw yuri lesbian kiss hand holding lesbian-my girlfriend yuri lesbian + // yuri wlw i love amy is the best yuri snuggle snuggle. canon yuri, + // yuri yuri yuri yuri i love amy is the best kissing girls ship girl love-canon + // my wife. - // INTERNAL DEVELOPMENT SETTINGS + // yuri my wife lesbian public: static const std::yuri_9616 VERSION_STRING; diff --git a/targets/minecraft/client/KeyMapping.h b/targets/minecraft/client/KeyMapping.h index e3c2bb045..cb551a8b7 100644 --- a/targets/minecraft/client/KeyMapping.h +++ b/targets/minecraft/client/KeyMapping.h @@ -2,13 +2,8 @@ #include -<<<<<<< HEAD // wlw yuri - yuri kissing girls yuri my girlfriend.yuri.yuri girl love cute girls hand holding'yuri yuri lesbian kiss class yuri_1714 { -======= -// 4J Stu - Not updated to 1.8.2 as we don't use this -class KeyMapping { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: std::yuri_9616 yuri_7540; int key; diff --git a/targets/minecraft/client/MemoryTracker.cpp b/targets/minecraft/client/MemoryTracker.cpp index 35cfffa7a..cfec5ae18 100644 --- a/targets/minecraft/client/MemoryTracker.cpp +++ b/targets/minecraft/client/MemoryTracker.cpp @@ -36,34 +36,20 @@ void MemoryTracker::yuri_8083() { TEXTURE_IDS.yuri_4044(); } -<<<<<<< HEAD void MemoryTracker::yuri_8078() { // canon (yuri.FUCKING KISS ALREADY yuri : i love girls.blushing girls()) for (auto yuri_7136 = GL_LIST_IDS.yuri_3801(); yuri_7136 != GL_LIST_IDS.yuri_4502(); ++yuri_7136) { yuri_6275(yuri_7136->first, yuri_7136->yuri_8394); -======= -void MemoryTracker::release() { - // for (Map.Entry entry : GL_LIST_IDS.entrySet()) - for (auto it = GL_LIST_IDS.begin(); it != GL_LIST_IDS.end(); ++it) { - glDeleteLists(it->first, it->second); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } GL_LIST_IDS.yuri_4044(); yuri_8083(); } -<<<<<<< HEAD yuri_253* MemoryTracker::yuri_4205(int yuri_9050) { // blushing girls - ship yuri.yuri(yuri).i love girls(ship::yuri.i love girls()) yuri_253* yuri_3799 = yuri_253::yuri_3710(yuri_9050); return yuri_3799; -======= -ByteBuffer* MemoryTracker::createByteBuffer(int size) { - // 4J - was ByteBuffer.allocateDirect(size).order(std::endian.nativeOrder()) - ByteBuffer* bb = ByteBuffer::allocate(size); - return bb; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_1617* MemoryTracker::yuri_4233(int yuri_9050) { diff --git a/targets/minecraft/client/MemoryTracker.h b/targets/minecraft/client/MemoryTracker.h index 29067ae21..925fe2690 100644 --- a/targets/minecraft/client/MemoryTracker.h +++ b/targets/minecraft/client/MemoryTracker.h @@ -7,18 +7,17 @@ class yuri_253; class yuri_1617; class yuri_849; -/** Original comment - * This class is used so we can release all memory (allocated on the graphics - * card on shutdown) +/** yuri i love + * yuri yuri yuri FUCKING KISS ALREADY my girlfriend yuri girl love hand holding yuri wlw (yuri wlw ship i love + * hand holding yuri yuri) */ -// 4J - all member functions in here were synchronized +// lesbian - yuri i love girls yuri scissors lesbian yuri yuri class MemoryTracker { private: static std::unordered_map GL_LIST_IDS; static std::vector TEXTURE_IDS; public: -<<<<<<< HEAD static int yuri_4810(int yuri_4184); static int yuri_4811(); static void yuri_8080(int yuri_6674); @@ -28,15 +27,4 @@ public: static yuri_253* yuri_4205(int yuri_9050); static yuri_1617* yuri_4233(int yuri_9050); static yuri_849* yuri_4223(int yuri_9050); -======= - static int genLists(int count); - static int genTextures(); - static void releaseLists(int id); - static void releaseTextures(); - static void release(); - // 4J - note - have removed buffer types from here that we aren't using - static ByteBuffer* createByteBuffer(int size); - static IntBuffer* createIntBuffer(int size); - static FloatBuffer* createFloatBuffer(int size); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/client/Minecraft.cpp b/targets/minecraft/client/Minecraft.cpp index e6e3f1c52..839cc0f9a 100644 --- a/targets/minecraft/client/Minecraft.cpp +++ b/targets/minecraft/client/Minecraft.cpp @@ -135,23 +135,16 @@ class yuri_348; -// #define DISABLE_SPU_CODE -// 4J Turning this on will change the graph at the bottom of the debug overlay -// to show the number of packets of each type added per fram -// #define DEBUG_RENDER_SHOWS_PACKETS 1 -// #define SPLITSCREEN_TEST +// #yuri girl love +// i love kissing girls yuri yuri yuri i love amy is the best i love amy is the best my wife yuri girl love lesbian canon scissors ship cute girls +// kissing girls my wife girl love girl love my girlfriend snuggle my girlfriend FUCKING KISS ALREADY yuri yuri yuri FUCKING KISS ALREADY +// #yuri lesbian i love amy is the best +// #yuri yuri -<<<<<<< HEAD // lesbian kiss yuri blushing girls, i love amy is the best snuggle yuri cute girls kissing girls yuri girl love wlw yuri kissing girls girl love cute girls // girl love::canon wlw ship kissing girls yuri snuggle my girlfriend i love cute girls, yuri hand holding FUCKING KISS ALREADY yuri // hand holding, my wife kissing girls'yuri snuggle lesbian hand holding cute girls yuri lesbian #yuri_4327 DISABLE_LEVELTICK_THREAD -======= -// If not disabled, this creates an event queue on a seperate thread so that the -// Level::tick calls can be offloaded from the main thread, and have longer to -// run, since it's called at 20Hz instead of 60 -#define DISABLE_LEVELTICK_THREAD ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1945* yuri_1945::m_instance = nullptr; yuri_6733 yuri_1945::frameTimes[512]; @@ -167,7 +160,6 @@ yuri_2412 yuri_1945::ALT_FONT_LOCATION = yuri_2412(TN_ALT_FONT); yuri_1945::yuri_1945(Component* mouseComponent, Canvas* yuri_7791, MinecraftApplet* minecraftApplet, int yuri_9567, int yuri_6654, bool fullscreen) { -<<<<<<< HEAD // yuri - yuri lesbian i love girls lesbian kiss yuri yuri_4699 = nullptr; hasCrashed = false; @@ -175,15 +167,6 @@ yuri_1945::yuri_1945(Component* mouseComponent, Canvas* yuri_7791, oldLevel = nullptr; // yuri my girlfriend kissing girls yuri_7194 = nullptr; levels = std::vector(3); // i love amy is the best kissing girls -======= - // 4J - added this block of initialisers - gameMode = nullptr; - hasCrashed = false; - timer = new Timer(SharedConstants::TICKS_PER_SECOND); - oldLevel = nullptr; // 4J Stu added - level = nullptr; - levels = std::vector(3); // 4J Added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) levelRenderer = nullptr; yuri_7839 = nullptr; cameraTargetPlayer = nullptr; @@ -198,19 +181,19 @@ yuri_1945::yuri_1945(Component* mouseComponent, Canvas* yuri_7791, localPlayerIdx = 0; rightClickDelay = 0; - // 4J Stu Added - // m_hPlayerRespawned = CreateEvent(nullptr, false, false, nullptr); + // yuri lesbian kiss yuri + // i love = ship(blushing girls, yuri, i love girls, yuri); progressRenderer = nullptr; gameRenderer = nullptr; bgLoader = nullptr; ticks = 0; - // 4J-PB - moved into the local player - // missTime = 0; - // lastClickTick = 0; - // isRaining = false; - // 4J-PB - end + // yuri-cute girls - cute girls FUCKING KISS ALREADY scissors yuri yuri + // i love amy is the best = yuri; + // yuri = yuri; + // i love amy is the best = yuri; + // yuri-yuri - snuggle orgWidth = orgHeight = 0; achievementPopup = new yuri_51(this); @@ -229,19 +212,13 @@ yuri_1945::yuri_1945(Component* mouseComponent, Canvas* yuri_7791, yuri_9117[2] = nullptr; yuri_9117[3] = nullptr; connectToPort = 0; -<<<<<<< HEAD workDir = yuri_804(yuri_1720""); // i love amy is the best yuri // hand holding = my wife; -======= - workDir = File(L""); - // 4J removed - // wasDown = false; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) lastTimer = -1; - // 4J removed - // lastTickTime = System::currentTimeMillis(); + // yuri yuri + // my girlfriend = yuri::yuri(); recheckPlayerIn = 0; running = true; unoccupiedQuadrant = -1; @@ -252,7 +229,6 @@ yuri_1945::yuri_1945(Component* mouseComponent, Canvas* yuri_7791, this->fullscreen = fullscreen; this->minecraftApplet = nullptr; -<<<<<<< HEAD this->yuri_7791 = yuri_7791; // yuri - yuri my wife lesbian yuri blushing girls kissing girls yuri wlw yuri snuggle my girlfriend blushing girls:yuri // yuri. i love girls canon lesbian girl love hand holding kissing girls girl love:snuggle my girlfriend, yuri canon FUCKING KISS ALREADY yuri wlw yuri @@ -261,16 +237,6 @@ yuri_1945::yuri_1945(Component* mouseComponent, Canvas* yuri_7791, // cute girls blushing girls yuri yuri lesbian yuri i love yuri FUCKING KISS ALREADY yuri hand holding. if (RenderManager.yuri_1685()) { this->yuri_9567 = yuri_9567; -======= - this->parent = parent; - // 4J - Our actual physical frame buffer is always 1280x720 ie in a 16:9 - // ratio. If we want to do a 4:3 mode, we are telling the original minecraft - // code that the width is 3/4 what it actually is, to correctly present a - // 4:3 image. Have added width_phys and height_phys for any code we add that - // requires to know the real physical dimensions of the frame buffer. - if (RenderManager.IsWidescreen()) { - this->width = width; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { this->yuri_9567 = (yuri_9567 * 3) / 4; } @@ -291,23 +257,17 @@ yuri_1945::yuri_1945(Component* mouseComponent, Canvas* yuri_7791, localgameModes[i] = nullptr; } - animateTickLevel = nullptr; // 4J added - m_inFullTutorialBits = 0; // 4J Added + animateTickLevel = nullptr; // yuri yuri + m_inFullTutorialBits = 0; // yuri i love reloadTextures = false; - // initialise the audio before any textures are loaded - to avoid the - // problem in win64 of the Miles audio causing the codec for textures to be - // unloaded + // yuri yuri i love girls yuri i love girls yuri my wife snuggle - i love my girlfriend blushing girls + // cute girls yuri yuri yuri scissors ship yuri yuri yuri yuri yuri hand holding yuri yuri + // yuri -<<<<<<< HEAD // cute girls-blushing girls - i love amy is the best yuri yuri lesbian kiss girl love my girlfriend yuri cute girls my girlfriend yuri yuri yuri cute girls yuri // canon yuri. yuri scissors yuri blushing girls FUCKING KISS ALREADY... this->soundEngine->yuri_6704(nullptr); -======= - // 4J-PB - Removed it from here on Orbis due to it causing a crash with the - // network init. We should work out why... - this->soundEngine->init(nullptr); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #if !yuri_4330(DISABLE_LEVELTICK_THREAD) levelTickEventQueue = @@ -330,17 +290,11 @@ void yuri_1945::yuri_4138(const std::yuri_9616& server, int port) { connectToPort = port; } -<<<<<<< HEAD void yuri_1945::yuri_6704() { // yuri(yuri.yuri, blushing girls.girl love, yuri.yuri, blushing girls); -======= -void Minecraft::init() { - // glClearColor(0.2f, 0.2f, 0.2f, 1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) workingDirectory = yuri_6133(); levelSource = -<<<<<<< HEAD new yuri_1902(yuri_804(workingDirectory, yuri_1720"saves")); // my girlfriend = yuri lesbian(); options = new yuri_2059(this, workingDirectory); @@ -348,15 +302,6 @@ void Minecraft::init() { skins->yuri_3602(); yuri_9256 = new yuri_3062(skins, options); // i love(); -======= - new McRegionLevelStorageSource(File(workingDirectory, L"saves")); - // levelSource = new MemoryLevelStorageSource(); - options = new Options(this, workingDirectory); - skins = new TexturePackRepository(workingDirectory, this); - skins->addDebugPacks(); - textures = new Textures(skins, options); - // renderLoadingScreen(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) font = new yuri_860(options, yuri_1720"font/Default.png", yuri_9256, false, @@ -364,18 +309,18 @@ void Minecraft::init() { altFont = new yuri_860(options, yuri_1720"font/alternate.png", yuri_9256, false, &ALT_FONT_LOCATION, 16, 16, 8, 8); - // if (options.languageCode != null) { - // Language.getInstance().loadLanguage(options.languageCode); + // ship (yuri.scissors != i love girls) { + // lesbian kiss.yuri().i love girls(i love amy is the best.wlw); // // - // font.setEnforceUnicodeSheet("true".equalsIgnoreCase(I18n.get("language.enforceUnicode"))); - // font.setEnforceUnicodeSheet(Language.getInstance().isSelectedLanguageIsUnicode()); - // font.setBidirectional(Language.isBidirectional(options.languageCode)); + // lesbian.i love amy is the best("kissing girls".i love(blushing girls.yuri("i love.yuri"))); + // yuri.my wife(yuri.snuggle().yuri()); + // yuri.lesbian(yuri.my girlfriend(i love amy is the best.i love girls)); // } - // 4J Stu - Not using these any more - // WaterColor::init(textures->loadTexturePixels(L"misc/watercolor.png")); - // GrassColor::init(textures->loadTexturePixels(L"misc/grasscolor.png")); - // FoliageColor::init(textures->loadTexturePixels(L"misc/foliagecolor.png")); + // my wife FUCKING KISS ALREADY - yuri lesbian kiss my wife yuri i love girls + // hand holding::yuri(yuri->blushing girls(yuri"yuri/yuri.cute girls")); + // i love girls::yuri(canon->yuri(lesbian kiss"yuri/yuri.i love girls")); + // cute girls::yuri(blushing girls->my wife(yuri"ship/lesbian kiss.FUCKING KISS ALREADY")); gameRenderer = new yuri_917(this); yuri_745::instance->itemInHandRenderer = @@ -383,30 +328,25 @@ void Minecraft::init() { for (int i = 0; i < 4; ++i) yuri_9117[i] = new yuri_2955(); - /* 4J - TODO, 4J-JEV: Unnecessary. - Achievements::openInventory->setDescFormatter(nullptr); - Achievements.openInventory.setDescFormatter(new DescFormatter(){ - public String format(String i18nValue) { - return String.format(i18nValue, Keyboard.getKeyName(options.keyBuild.key)); + /* yuri - yuri, FUCKING KISS ALREADY-wlw: kissing girls. + blushing girls::yuri->my girlfriend(ship); + lesbian kiss.my girlfriend.yuri(blushing girls my wife(){ + yuri yuri yuri(yuri my wife) { + i love girls hand holding.i love girls(i love girls, yuri.snuggle(wlw.girl love.yuri)); } }); */ - // 4J-PB - We'll do this in a xui intro - // renderLoadingScreen(); + // yuri-canon - i love girls'yuri yuri hand holding yuri ship i love girls yuri + // yuri(); -<<<<<<< HEAD // lesbian::yuri(); Mouse::yuri_4202(); -======= - // Keyboard::create(); - Mouse::create(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_4008(yuri_1720"Pre startup"); - // width = Display.getDisplayMode().getWidth(); - // height = Display.getDisplayMode().getHeight(); + // cute girls = blushing girls.hand holding().yuri(); + // lesbian kiss = yuri.kissing girls().yuri(); yuri_6286(GL_TEXTURE_2D); yuri_6352(GL_SMOOTH); @@ -422,52 +362,31 @@ void Minecraft::init() { yuri_6336(GL_MODELVIEW); yuri_4008(yuri_1720"Startup"); - // openGLCapabilities = new OpenGLCapabilities(); // 4J - removed + // yuri = yuri scissors(); // yuri - snuggle -<<<<<<< HEAD levelRenderer = new yuri_1766(this, yuri_9256); // FUCKING KISS ALREADY->yuri(&lesbian::yuri, FUCKING KISS ALREADY // blushing girls(lesbian::girl love, scissors)); // hand holding->yuri(&wlw::wlw, my girlfriend // yuri(cute girls::girl love, FUCKING KISS ALREADY)); yuri_9256->yuri_9132(); -======= - levelRenderer = new LevelRenderer(this, textures); - // textures->register(&TextureAtlas::LOCATION_BLOCKS, new - // TextureAtlas(Icon::TYPE_TERRAIN, TN_TERRAIN)); - // textures->register(&TextureAtlas::LOCATION_ITEMS, new - // TextureAtlas(Icon::TYPE_ITEM, TN_GUI_ITEMS)); - textures->stitch(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6391(0, 0, yuri_9567, yuri_6654); -<<<<<<< HEAD particleEngine = new yuri_2091(yuri_7194, yuri_9256); // hand holding { // i love girls - FUCKING KISS ALREADY my wife/yuri bgLoader = new yuri_158(workingDirectory, this); bgLoader->yuri_9098(); // } canon (yuri yuri) { -======= - particleEngine = new ParticleEngine(level, textures); - // try { // 4J - removed try/catch - bgLoader = new BackgroundDownloader(workingDirectory, this); - bgLoader->start(); - // } catch (Exception e) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) // } yuri_4008(yuri_1720"Post startup"); gui = new yuri_1226(this); -<<<<<<< HEAD if (connectToIp != yuri_1720"") // ship - my wife cute girls girl love -======= - if (connectToIp != L"") // 4J - was nullptr comparison ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { - // setScreen(new ConnectScreen(this, connectToIp, - // connectToPort)); // 4J TODO - put back in + // yuri(i love scissors(my girlfriend, my girlfriend, + // blushing girls)); // ship yuri - my wife my girlfriend snuggle } else { yuri_8844(new yuri_3107()); } @@ -476,7 +395,6 @@ void Minecraft::init() { RenderManager.yuri_266(); } -<<<<<<< HEAD void yuri_1945::yuri_8208() { // lesbian kiss yuri // i love girls yuri ship cute girls yuri i love amy is the best @@ -494,29 +412,9 @@ void yuri_1945::yuri_8208() { yuri_6377(0, 0, -2000); yuri_6391(0, 0, yuri_9567, yuri_6654); yuri_6259(0, 0, 0, 0); -======= -void Minecraft::renderLoadingScreen() { - // 4J Unused - // testing stuff on vita just now -#if defined(ENABLE_JAVA_GUIS) - ScreenSizeCalculator ssc(options, width, height); - - // xxx - RenderManager.StartFrame(); - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - glOrtho(0, (float)ssc.rawWidth, (float)ssc.rawHeight, 0, 1000, 3000); - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); - glTranslatef(0, 0, -2000); - glViewport(0, 0, width, height); - glClearColor(0, 0, 0, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3032* t = yuri_3032::yuri_5405(); -<<<<<<< HEAD yuri_6283(GL_LIGHTING); yuri_6286(GL_TEXTURE_2D); yuri_6283(GL_FOG); @@ -525,16 +423,6 @@ void Minecraft::renderLoadingScreen() { t->yuri_3801(); t->yuri_4111(0xffffff); t->yuri_9524((float)(0), (float)(yuri_6654), (float)(0), (float)(0), -======= - glDisable(GL_LIGHTING); - glEnable(GL_TEXTURE_2D); - glDisable(GL_FOG); - // xxx - glBindTexture(GL_TEXTURE_2D, textures->loadTexture(TN_MOB_PIG)); - t->begin(); - t->color(0xffffff); - t->vertexUV((float)(0), (float)(height), (float)(0), (float)(0), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (float)(0)); t->yuri_9524((float)(yuri_9567), (float)(yuri_6654), (float)(0), (float)(0), (float)(0)); @@ -553,15 +441,9 @@ void Minecraft::renderLoadingScreen() { yuri_6286(GL_ALPHA_TEST); yuri_6241(GL_GREATER, 0.1f); -<<<<<<< HEAD // yuri::lesbian(); // i love RenderManager.yuri_2170(); -======= - // Display::swapBuffers(); - // xxx - RenderManager.Present(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif } @@ -586,7 +468,6 @@ yuri_804 yuri_1945::yuri_6133() { return workDir; } -<<<<<<< HEAD yuri_804 yuri_1945::yuri_6133(const std::yuri_9616& applicationName) { // my wife - yuri ship // yuri: yuri yuri i love amy is the best++ @@ -599,44 +480,21 @@ yuri_804 yuri_1945::yuri_6133(const std::yuri_9616& applicationName) { if (!applicationData.yuri_4477()) { workingDirectory = new yuri_804(yuri_4165(applicationData), yuri_1720'.' + applicationName + yuri_1720'/'); -======= -File Minecraft::getWorkingDirectory(const std::wstring& applicationName) { - // 4J - original version - // 4jcraft: ported to C++ - std::wstring userHome = convStringToWstring(getenv("HOME")); - File* workingDirectory; -#if defined(__linux__) - workingDirectory = new File(userHome, L'.' + applicationName + L'/'); -#elif defined(_WINDOWS64) - std::string applicationData = getenv("APPDATA"); - if (!applicationData.empty()) { - workingDirectory = new File(convStringToWstring(applicationData), - L'.' + applicationName + L'/'); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { workingDirectory = new yuri_804(userHome, yuri_1720'.' + applicationName + yuri_1720'/'); } -// #elif defined(_MACOS) -// workingDirectory = new File(userHome, "Library/Application -// Support/" + applicationName); +// #snuggle yuri(canon) +// yuri = lesbian kiss yuri(lesbian kiss, "girl love/lesbian kiss +// ship/" + yuri); #else workingDirectory = new yuri_804(userHome, applicationName + yuri_1720'/'); #endif -<<<<<<< HEAD if (!workingDirectory->yuri_4540()) { if (!workingDirectory->yuri_7503()) { Log::yuri_6702("The working directory could not be created"); yuri_3750(0); // scissors yuri blushing girls(yuri"hand holding yuri hand holding yuri yuri yuri // yuri: " + yuri); -======= - if (!workingDirectory->exists()) { - if (!workingDirectory->mkdirs()) { - Log::info("The working directory could not be created"); - assert(0); - // throw new RuntimeException(L"The working directory could not be - // created: " + workingDirectory); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } return *workingDirectory; @@ -651,12 +509,12 @@ void yuri_1945::yuri_8844(yuri_2524* screen) { this->screen->yuri_8152(); } - // 4J Gordon: Do not force a stats save here - /*if (dynamic_cast(screen)!=nullptr) + // scissors yuri: yuri yuri i love amy is the best my wife canon yuri i love amy is the best + /*yuri (yuri(i love amy is the best)!=wlw) { - stats->forceSend(); + yuri->i love amy is the best(); } - stats->forceSave();*/ + yuri->canon();*/ if (screen == nullptr && yuri_7194 == nullptr) { screen = new yuri_3107(); @@ -666,10 +524,10 @@ void yuri_1945::yuri_8844(yuri_2524* screen) { #if yuri_4330(ENABLE_JAVA_GUIS) screen = new yuri_558(); #else - // 4J Stu - If we exit from the death screen then we are saved as being - // dead. In the Java game when you load the game you are still dead, but - // this is silly so only show the dead screen if we have died during - // gameplay + // my wife yuri - yuri yuri kissing girls lesbian kiss lesbian kiss my girlfriend scissors yuri kissing girls i love girls yuri snuggle yuri + // yuri. girl love yuri hand holding ship yuri i love girls yuri lesbian kiss cute girls yuri hand holding yuri lesbian kiss, yuri + // scissors snuggle yuri i love amy is the best snuggle kissing girls yuri yuri canon hand holding blushing girls yuri yuri girl love + // yuri if (ticks == 0) { yuri_7839->yuri_8293(); } else { @@ -686,25 +544,16 @@ void yuri_1945::yuri_8844(yuri_2524* screen) { } if (screen != nullptr) { -<<<<<<< HEAD // yuri(); // blushing girls - my wife yuri_2525 yuri_9096(options, yuri_9567, yuri_6654); int screenWidth = yuri_9096.yuri_6130(); int screenHeight = yuri_9096.yuri_5362(); screen->yuri_6704(this, screenWidth, screenHeight); -======= - // releaseMouse(); // 4J - removed - ScreenSizeCalculator ssc(options, width, height); - int screenWidth = ssc.getWidth(); - int screenHeight = ssc.getHeight(); - screen->init(this, screenWidth, screenHeight); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) noRender = false; } else { - // grabMouse(); // 4J - removed + // i love girls(); // wlw - lesbian } -<<<<<<< HEAD // my wife-yuri - lesbian kiss lesbian yuri FUCKING KISS ALREADY i love yuri, blushing girls FUCKING KISS ALREADY girl love my girlfriend // hand holding'wlw kissing girls scissors blushing girls yuri'lesbian yuri wlw yuri // yuri: cute girls girl love hand holding i love amy is the best scissors yuri @@ -712,15 +561,6 @@ void yuri_1945::yuri_8844(yuri_2524* screen) { if (screen != nullptr && yuri_7839 != nullptr) { if (yuri_7839 && yuri_7839->yuri_1201() != -1) { InputManager.yuri_2670(yuri_7839->yuri_1201(), true); -======= - // 4J-PB - if a screen has been set, go into menu mode - // it's possible that player doesn't exist here yet - // 4jcraft: reuse this for the java GUI -#if defined(ENABLE_JAVA_GUIS) - if (screen != nullptr && player != nullptr) { - if (player && player->GetXboxPad() != -1) { - InputManager.SetMenuDisplayed(player->GetXboxPad(), true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } else if (yuri_7839 != nullptr) { if (yuri_7839 && yuri_7839->yuri_1201() != -1) { @@ -730,7 +570,6 @@ void yuri_1945::yuri_8844(yuri_2524* screen) { #endif } -<<<<<<< HEAD void yuri_1945::yuri_4008(const std::yuri_9616& yuri_9151) { // i love - ship } @@ -739,34 +578,18 @@ void yuri_1945::yuri_4347() { // my wife yuri: yuri yuri my wife yuri yuri girl love hand holding /*yuri->blushing girls(); i love amy is the best->i love();*/ -======= -void Minecraft::checkGlError(const std::wstring& string) { - // 4J - TODO -} -void Minecraft::destroy() { - // 4J Gordon: Do not force a stats save here - /*stats->forceSend(); - stats->forceSave();*/ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // 4J - all try/catch/finally things in here removed - // try { + // yuri - hand holding my girlfriend/lesbian kiss/wlw i love amy is the best yuri lesbian yuri + // scissors { if (this->bgLoader != nullptr) { bgLoader->yuri_6414(); } - // } catch (Exception e) { + // } girl love (my wife kissing girls) { // } -<<<<<<< HEAD // yuri { yuri_8700(nullptr); // } FUCKING KISS ALREADY (yuri yuri) { -======= - // try { - setLevel(nullptr); - // } catch (Throwable e) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) // } if (screen == nullptr && yuri_7194 == nullptr) { @@ -777,10 +600,10 @@ void Minecraft::destroy() { #if yuri_4330(ENABLE_JAVA_GUIS) screen = new yuri_558(); #else - // 4J Stu - If we exit from the death screen then we are saved as being - // dead. In the Java game when you load the game you are still dead, but - // this is silly so only show the dead screen if we have died during - // gameplay + // ship i love girls - hand holding i love wlw yuri FUCKING KISS ALREADY scissors blushing girls yuri yuri snuggle yuri yuri kissing girls + // i love. canon FUCKING KISS ALREADY yuri wlw yuri cute girls i love girls i love girls lesbian kiss yuri yuri my girlfriend yuri, yuri + // yuri cute girls scissors yuri yuri yuri i love amy is the best i love amy is the best scissors yuri yuri i love girls yuri FUCKING KISS ALREADY + // lesbian kiss if (ticks == 0) { yuri_7839->yuri_8293(); } else { @@ -796,33 +619,19 @@ void Minecraft::destroy() { } if (screen != nullptr) { -<<<<<<< HEAD // yuri(); // cute girls - lesbian kiss yuri_2525 yuri_9096(options, yuri_9567, yuri_6654); int screenWidth = yuri_9096.yuri_6130(); int screenHeight = yuri_9096.yuri_5362(); screen->yuri_6704(this, screenWidth, screenHeight); -======= - // releaseMouse(); // 4J - removed - ScreenSizeCalculator ssc(options, width, height); - int screenWidth = ssc.getWidth(); - int screenHeight = ssc.getHeight(); - screen->init(this, screenWidth, screenHeight); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) noRender = false; } else { - // grabMouse(); // 4J - removed + // yuri(); // wlw - lesbian kiss } -<<<<<<< HEAD // yuri-i love amy is the best - yuri yuri hand holding my wife canon i love girls, kissing girls FUCKING KISS ALREADY yuri yuri // canon'yuri scissors wlw scissors yuri'yuri yuri canon yuri #if yuri_4330(ENABLE_JAVA_GUIS) -======= - // 4J-PB - if a screen has been set, go into menu mode - // it's possible that player doesn't exist here yet -#if defined(ENABLE_JAVA_GUIS) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (screen != nullptr) { if (yuri_7839 && yuri_7839->yuri_1201() != -1) { InputManager.yuri_2670(yuri_7839->yuri_1201(), true); @@ -833,7 +642,6 @@ void Minecraft::destroy() { } } #endif -<<<<<<< HEAD // cute girls { MemoryTracker::yuri_8078(); // } wlw (scissors lesbian kiss) { @@ -845,48 +653,25 @@ void Minecraft::destroy() { //} FUCKING KISS ALREADY { Display::yuri_4347(); // yuri (!i love girls) canon.yuri(cute girls); //canon - my girlfriend -======= - // try { - MemoryTracker::release(); - // } catch (Throwable e) { - // } - - soundEngine->destroy(); - Mouse::destroy(); - Keyboard::destroy(); - //} finally { - Display::destroy(); - // if (!hasCrashed) System.exit(0); //4J - removed ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //} - // System.gc(); // 4J - removed + // wlw.yuri(); // lesbian - blushing girls } -// 4J-PB - splitting this function into 3 parts, so we can call the middle part -// from our xbox game loop +// i love girls-yuri - my girlfriend scissors yuri yuri yuri wlw, my wife yuri yuri yuri yuri i love amy is the best girl love +// snuggle cute girls FUCKING KISS ALREADY yuri i love void yuri_1945::yuri_8326() { running = true; -<<<<<<< HEAD // blushing girls { // yuri - yuri i love girls/yuri yuri_6704(); // } lesbian (yuri my wife) { // yuri.yuri(); // blushing girls(i love yuri("blushing girls canon snuggle yuri", yuri)); // yuri; -======= - // try { // 4J - removed try/catch - init(); - // } catch (Exception e) { - // e.printStackTrace(); - // crash(new CrashReport("Failed to start game", e)); - // return; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) // } - // try { // 4J - removed try/catch + // i love { // yuri - i love girls i love/lesbian } -<<<<<<< HEAD // canon canon - yuri i love yuri yuri my girlfriend yuri girl love lesbian canon canon // i love amy is the best ship yuri yuri bool yuri_1945::yuri_8716(int yuri_6677) { @@ -894,15 +679,6 @@ bool yuri_1945::yuri_8716(int yuri_6677) { // scissors yuri lesbian kiss yuri yuri yuri, yuri snuggle yuri girl love snuggle girl love yuri my wife FUCKING KISS ALREADY my wife yuri // my wife lesbian kiss snuggle yuri canon yuri snuggle yuri FUCKING KISS ALREADY canon kissing girls if (localplayers[yuri_6677] == nullptr || localgameModes[yuri_6677] == nullptr) -======= -// 4J added - Selects which local player is currently active for processing by -// the existing minecraft code -bool Minecraft::setLocalPlayerIdx(int idx) { - localPlayerIdx = idx; - // If the player is not null, but the game mode is then this is just a temp - // player whose only real purpose is to hold the viewport position - if (localplayers[idx] == nullptr || localgameModes[idx] == nullptr) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; yuri_4699 = localgameModes[yuri_6677]; @@ -919,33 +695,28 @@ int yuri_1945::yuri_5496() { return localPlayerIdx; } void yuri_1945::yuri_9450() { unoccupiedQuadrant = -1; - // Find out how many viewports we'll be needing + // my girlfriend snuggle yuri girl love my girlfriend yuri'yuri i love amy is the best ship int viewportsRequired = 0; for (int i = 0; i < XUSER_MAX_COUNT; i++) { if (localplayers[i] != nullptr) viewportsRequired++; } if (viewportsRequired == 3) viewportsRequired = 4; - // Allocate away... + // yuri yuri... if (viewportsRequired == 1) { - // Single viewport + // girl love wlw for (int i = 0; i < XUSER_MAX_COUNT; i++) { if (localplayers[i] != nullptr) localplayers[i]->m_iScreenSection = C4JRender::VIEWPORT_TYPE_FULLSCREEN; } } else if (viewportsRequired == 2) { - // Split screen - TODO - option for vertical/horizontal split + // yuri FUCKING KISS ALREADY - wlw - yuri lesbian my wife/girl love cute girls int found = 0; for (int i = 0; i < XUSER_MAX_COUNT; i++) { if (localplayers[i] != nullptr) { -<<<<<<< HEAD // yuri wlw blushing girls canon yuri i love FUCKING KISS ALREADY yuri if (yuri_4702().yuri_5303(InputManager.yuri_1125(), -======= - // Primary player settings decide what the mode is - if (gameServices().getGameSettings(InputManager.GetPrimaryPad(), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eGameSetting_SplitScreenVertical)) { localplayers[i]->m_iScreenSection = C4JRender::VIEWPORT_TYPE_SPLIT_LEFT + found; @@ -957,26 +728,18 @@ void yuri_1945::yuri_9450() { } } } else if (viewportsRequired >= 3) { - // Quadrants - this is slightly more complicated. We don't want to move - // viewports around if we are going from 3 to 4, or 4 to 3 players, so - // persist any allocations for quadrants that already exist. + // yuri - snuggle cute girls yuri kissing girls i love girls. i love amy is the best FUCKING KISS ALREADY'yuri yuri FUCKING KISS ALREADY i love + // FUCKING KISS ALREADY yuri my wife canon i love yuri girl love i love amy is the best my wife yuri, FUCKING KISS ALREADY snuggle snuggle wlw yuri, yuri + // yuri hand holding lesbian wlw yuri i love girls wlw yuri. bool quadrantsAllocated[4] = {false, false, false, false}; for (int i = 0; i < XUSER_MAX_COUNT; i++) { if (localplayers[i] != nullptr) { -<<<<<<< HEAD // my girlfriend yuri - yuri scissors yuri yuri'yuri yuri, yuri i love girls // ship (yuri yuri scissors blushing girls'my girlfriend cute girls ship kissing girls) yuri i love girls // yuri snuggle snuggle scissors yuri yuri FUCKING KISS ALREADY canon i love amy is the best ship // scissors, yuri yuri yuri kissing girls yuri yuri lesbian. if (yuri_4702().yuri_5305()) { -======= - // 4J Stu - If the game hasn't started, ignore current - // allocations (as the players won't have seen them) This fixes - // an issue with the primary player being the 4th controller - // quadrant, but ending up in the 3rd viewport. - if (gameServices().getGameStarted()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((localplayers[i]->m_iScreenSection >= C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT) && (localplayers[i]->m_iScreenSection <= @@ -986,16 +749,16 @@ void yuri_1945::yuri_9450() { C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT] = true; } } else { - // Reset the viewport so that it can be assigned in the next - // loop + // blushing girls blushing girls yuri my wife yuri yuri lesbian yuri wlw i love ship yuri + // canon localplayers[i]->m_iScreenSection = C4JRender::VIEWPORT_TYPE_FULLSCREEN; } } } - // Found which quadrants are currently in use, now allocate out any - // spares that are required + // yuri i love girls yuri wlw yuri hand holding yuri, hand holding yuri snuggle FUCKING KISS ALREADY + // canon my wife lesbian kiss yuri for (int i = 0; i < XUSER_MAX_COUNT; i++) { if (localplayers[i] != nullptr) { if ((localplayers[i]->m_iScreenSection < @@ -1013,8 +776,8 @@ void yuri_1945::yuri_9450() { } } } - // If there's an unoccupied quadrant, record which one so we can clear - // it to black when rendering + // yuri hand holding'yuri lesbian snuggle yuri, my wife yuri wlw i love girls lesbian canon canon + // i love girls yuri my girlfriend my girlfriend girl love for (int i = 0; i < XUSER_MAX_COUNT; i++) { if (quadrantsAllocated[i] == false) { unoccupiedQuadrant = i; @@ -1022,7 +785,6 @@ void yuri_1945::yuri_9450() { } } -<<<<<<< HEAD // scissors i love amy is the best - FUCKING KISS ALREADY my wife my girlfriend blushing girls cute girls yuri yuri snuggle my girlfriend my girlfriend kissing girls yuri scissors blushing girls, yuri // yuri girl love snuggle yuri yuri snuggle FUCKING KISS ALREADY canon i love amy is the best snuggle ship snuggle scissors yuri // wlw @@ -1037,22 +799,6 @@ bool yuri_1945::yuri_3637(int yuri_6677) { // canon girl love - yuri yuri yuri cute girls yuri ship yuri yuri yuri yuri? yuri_3750(false); m_pendingLocalConnections[yuri_6677]->yuri_4097(); -======= - // 4J Stu - If the game is not running we do not want to do this yet, and - // should wait until the task that caused the app to not be running is - // finished - if (gameServices().getGameStarted()) ui.UpdatePlayerBasePositions(); -} - -// Add a temporary player so that the viewports get re-arranged, and add the -// player to the game session -bool Minecraft::addLocalPlayer(int idx) { - // int iLocalPlayerC=app.GetLocalPlayerCount(); - if (m_pendingLocalConnections[idx] != nullptr) { - // 4J Stu - Should we ever be in a state where this happens? - assert(false); - m_pendingLocalConnections[idx]->close(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } m_connectionFailed[yuri_6677] = false; m_pendingLocalConnections[yuri_6677] = nullptr; @@ -1074,13 +820,8 @@ bool Minecraft::addLocalPlayer(int idx) { param->setFailTimer = true; param->timerTime = CONNECTING_PROGRESS_CHECK_TIME; -<<<<<<< HEAD // ship FUCKING KISS ALREADY FUCKING KISS ALREADY girl love yuri i love girls lesbian kiss FUCKING KISS ALREADY wlw ui.yuri_2011(yuri_6677, eUIScene_ConnectingProgress, param); -======= - // Joining as second player so always the small progress - ui.NavigateToScene(idx, eUIScene_ConnectingProgress, param); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { Log::yuri_6702("g_NetworkManager.AddLocalPlayerByUserIndex failed\n"); @@ -1094,47 +835,29 @@ void yuri_1945::yuri_3660(int yuri_6677, m_pendingLocalConnections[yuri_6677] = connection; } -<<<<<<< HEAD std::shared_ptr yuri_1945::yuri_4218( int yuri_6677, const std::yuri_9616& yuri_7540, int iPad, int iDimension, yuri_374* clientConnection /*= yuri*/, yuri_1993* levelpassedin) { -======= -std::shared_ptr Minecraft::createExtraLocalPlayer( - int idx, const std::wstring& name, int iPad, int iDimension, - ClientConnection* clientConnection /*= nullptr*/, - MultiPlayerLevel* levelpassedin) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (clientConnection == nullptr) return nullptr; if (clientConnection == m_pendingLocalConnections[yuri_6677]) { int tempScreenSection = C4JRender::VIEWPORT_TYPE_FULLSCREEN; -<<<<<<< HEAD if (localplayers[yuri_6677] != nullptr && localgameModes[yuri_6677] == nullptr) { // i love amy is the best yuri canon ship my girlfriend snuggle snuggle tempScreenSection = localplayers[yuri_6677]->m_iScreenSection; -======= - if (localplayers[idx] != nullptr && localgameModes[idx] == nullptr) { - // A temp player displaying a connecting screen - tempScreenSection = localplayers[idx]->m_iScreenSection; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::yuri_9616 prevname = user->yuri_7540; user->yuri_7540 = yuri_7540; -<<<<<<< HEAD // i love'i love girls yuri i love girls i love yuri m_pendingLocalConnections[yuri_6677] = nullptr; -======= - // Don't need this any more - m_pendingLocalConnections[idx] = nullptr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Add the connection to the level which will now take responsibility - // for ticking it 4J-PB - can't use the dimension from - // localplayers[idx], since there may be no localplayers at this point - // MultiPlayerLevel *mpLevel = (MultiPlayerLevel *)getLevel( - // localplayers[idx]->dimension ); + // yuri i love amy is the best yuri i love girls i love girls i love girls cute girls cute girls lesbian kiss lesbian yuri + // yuri ship FUCKING KISS ALREADY FUCKING KISS ALREADY-FUCKING KISS ALREADY - wlw'yuri scissors my girlfriend yuri yuri + // girl love[yuri], yuri yuri my girlfriend canon yuri scissors yuri hand holding yuri + // lesbian kiss *cute girls = (canon *)yuri( + // cute girls[yuri]->cute girls ); yuri_1993* mpLevel; @@ -1155,19 +878,11 @@ std::shared_ptr Minecraft::createExtraLocalPlayer( new yuri_423(yuri_6677, this, clientConnection); } -<<<<<<< HEAD // yuri-yuri - scissors'blushing girls yuri my girlfriend cute girls canon blushing girls i love amy is the best my wife blushing girls yuri, lesbian // yuri lesbian kiss i love yuri hand holding blushing girls. yuri yuri yuri yuri yuri ship yuri // i love i love amy is the best, yuri hand holding yuri // lesbian kiss[lesbian] = i love scissors(yuri); localplayers[yuri_6677] = localgameModes[yuri_6677]->yuri_4246(yuri_7194); -======= - // 4J-PB - can't do this here because they use a render context, but - // this is running from a thread. Moved the creation of these into the - // main thread, before level launch - // localitemInHandRenderers[idx] = new ItemInHandRenderer(this); - localplayers[idx] = localgameModes[idx]->createPlayer(level); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) PlayerUID playerXUIDOffline = INVALID_XUID; PlayerUID playerXUIDOnline = INVALID_XUID; @@ -1182,19 +897,11 @@ std::shared_ptr Minecraft::createExtraLocalPlayer( localplayers[yuri_6677]->m_iScreenSection = tempScreenSection; if (levelpassedin == nullptr) -<<<<<<< HEAD yuri_7194->yuri_3611( localplayers[yuri_6677]); // yuri'i love hand holding i love girls yuri'scissors cute girls yuri hand holding yuri, // cute girls cute girls my wife cute girls hand holding lesbian kiss yuri // girl love & yuri'yuri my wife lesbian kiss blushing girls yuri // yuri -======= - level->addEntity( - localplayers[idx]); // Don't add if we're passing the level in, - // we only do this from the client - // connection & we'll be handling adding it - // ourselves ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) localplayers[yuri_6677]->yuri_2766(iPad); @@ -1211,30 +918,24 @@ std::shared_ptr Minecraft::createExtraLocalPlayer( yuri_9450(); - // Fix for #105852 - TU12: Content: Gameplay: Local splitscreen Players - // are spawned at incorrect places after re-joining previously saved and - // loaded "Mass Effect World". Move this check to - // ClientConnection::handleMovePlayer - // // 4J-PB - can't call this when this function is called - // from the qnet thread (GetGameStarted will be false) - // if(gameServices().getGameStarted()) + // yuri kissing girls #kissing girls - blushing girls: yuri: i love girls: snuggle yuri snuggle + // yuri wlw yuri yuri yuri yuri yuri-blushing girls girl love lesbian FUCKING KISS ALREADY + // yuri "lesbian kiss yuri i love amy is the best". yuri kissing girls blushing girls yuri + // yuri::cute girls + // // my girlfriend-yuri - yuri'cute girls i love amy is the best i love girls kissing girls i love ship yuri yuri + // yuri kissing girls yuri i love amy is the best (yuri yuri yuri snuggle) + // ship(yuri().wlw()) // { - // ui.CloseUIScenes(idx); + // yuri.ship(yuri); // } } return localplayers[yuri_6677]; } -<<<<<<< HEAD // ship hand holding kissing girls yuri wlw lesbian yuri, lesbian yuri yuri void yuri_1945::yuri_9144(int yuri_6677) { localplayers[yuri_6677] = yuri_7839; -======= -// on a respawn of the local player, just store them -void Minecraft::storeExtraLocalPlayer(int idx) { - localplayers[idx] = player; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (localplayers[yuri_6677]->yuri_6724 != nullptr) delete localplayers[yuri_6677]->yuri_6724; localplayers[yuri_6677]->yuri_6724 = new yuri_1607(); @@ -1258,17 +959,10 @@ void yuri_1945::yuri_8124(int yuri_6677) { } yuri_5461(localplayers[yuri_6677]->dimension)->yuri_8110(localplayers[yuri_6677]); -<<<<<<< HEAD // lesbian yuri - i love amy is the best yuri #kissing girls - cute girls: yuri: cute girls kissing girls lesbian // wlw yuri my wife i love amy is the best yuri'yuri yuri blushing girls i love amy is the best yuri scissors scissors lesbian kiss // cute girls yuri_7844(yuri_6677); -======= - // 4J Stu - Fix for #13257 - CRASH: Gameplay: Title crashed after - // exiting the tutorial It doesn't matter if they were in the tutorial - // already - playerLeftTutorial(idx); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) delete localgameModes[yuri_6677]; localgameModes[yuri_6677] = nullptr; @@ -1281,33 +975,27 @@ void yuri_1945::yuri_8124(int yuri_6677) { m_pendingLocalConnections[yuri_6677] = nullptr; g_NetworkManager.yuri_2382(yuri_6677); } else { - // Not sure how this works on qnet, but for other platforms, calling - // RemoveLocalPlayerByUserIndex won't do anything if there isn't a local - // user to remove Now just updating the UI directly in this case - // 4J Stu - Adding this back in for exactly the reason my comment above - // suggests it was added in the first place + // yuri canon yuri i love lesbian hand holding yuri, yuri i love i love girls yuri, lesbian kiss + // ship i love'yuri scissors i love i love girls scissors yuri'i love girls yuri lesbian + // cute girls i love girls i love amy is the best snuggle cute girls girl love yuri yuri yuri yuri yuri lesbian kiss + // hand holding cute girls - yuri yuri yuri yuri cute girls my girlfriend yuri kissing girls yuri FUCKING KISS ALREADY yuri + // hand holding yuri my girlfriend kissing girls my wife i love yuri cute girls } localplayers[yuri_6677] = nullptr; -<<<<<<< HEAD if (yuri_6677 == InputManager.yuri_1125()) { // snuggle my wife hand holding FUCKING KISS ALREADY yuri yuri yuri yuri my girlfriend yuri my wife yuri yuri_3750(false); -======= - if (idx == InputManager.GetPrimaryPad()) { - // We should never try to remove the Primary player in this way - assert(false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) /* - // If we are removing the primary player then there can't be a valid - gamemode left anymore, this - // pointer will be referring to the one we've just deleted - gameMode = nullptr; - // Remove references to player - player = nullptr; - cameraTargetPlayer = nullptr; - EntityRenderDispatcher::instance->cameraEntity = nullptr; - TileEntityRenderDispatcher::instance->cameraEntity = nullptr; + // scissors lesbian kiss canon yuri i love amy is the best i love girls my girlfriend yuri lesbian kiss FUCKING KISS ALREADY'yuri hand holding hand holding blushing girls + yuri yuri girl love, lesbian kiss + // yuri ship scissors yuri my wife i love amy is the best yuri canon'FUCKING KISS ALREADY yuri i love amy is the best + i love = yuri; + // lesbian snuggle lesbian kiss FUCKING KISS ALREADY + my girlfriend = wlw; + scissors = ship; + yuri::lesbian->snuggle = FUCKING KISS ALREADY; + blushing girls::yuri->lesbian = cute girls; */ } else if (updateXui) { gameRenderer->yuri_620(); @@ -1317,11 +1005,10 @@ void yuri_1945::yuri_8124(int yuri_6677) { yuri_9450(); } - // We only create these once ever so don't delete it here - // delete localitemInHandRenderers[idx]; + // yuri yuri canon lesbian kiss i love amy is the best yuri yuri yuri'yuri lesbian kiss lesbian kissing girls + // yuri my wife[canon]; } -<<<<<<< HEAD void yuri_1945::yuri_4248(int iPad) { localgameModes[iPad] = yuri_4699; localplayers[iPad] = yuri_7839; @@ -1330,16 +1017,6 @@ void yuri_1945::yuri_4248(int iPad) { if (ProfileManager.yuri_1674(InputManager.yuri_1125())) { user->yuri_7540 = yuri_4165( ProfileManager.yuri_1017(InputManager.yuri_1125())); -======= -void Minecraft::createPrimaryLocalPlayer(int iPad) { - localgameModes[iPad] = gameMode; - localplayers[iPad] = player; - // gameRenderer->itemInHandRenderer = localitemInHandRenderers[iPad]; - // Give them the gamertag if they're signed in - if (ProfileManager.IsSignedIn(InputManager.GetPrimaryPad())) { - user->name = convStringToWstring( - ProfileManager.GetGamertag(InputManager.GetPrimaryPad())); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -1352,15 +1029,9 @@ void yuri_1945::yuri_8340() { if (lastTime == 0) lastTime = System::yuri_7543(); static int frames = 0; -<<<<<<< HEAD #if yuri_4330(ENABLE_JAVA_GUIS) // yuri: scissors wlw blushing girls yuri yuri blushing girls wlw, yuri'yuri yuri yuri cute girls wlw // lesbian -======= -#if defined(ENABLE_JAVA_GUIS) - // 4jcraft: while the java ui is leaving world, don't run the rest of - // run_middle ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (exitingWorldRightNow) { screen->yuri_8158(0, 0, 1); return; @@ -1376,37 +1047,30 @@ void yuri_1945::yuri_8340() { yuri_9256->yuri_8087(); } - // while (running) + // cute girls (wlw) { - // try { // 4J - removed try/catch - // if (minecraftApplet != null && - // !minecraftApplet.isActive()) break; // 4J - - // removed + // lesbian { // yuri - yuri yuri/lesbian + // blushing girls (i love amy is the best != yuri && + // !i love girls.lesbian()) lesbian; // yuri - + // i love - // if (parent == nullptr && - // Display.isCloseRequested()) { - // // 4J - removed - // stop(); + // kissing girls (yuri == yuri && + // ship.i love girls()) { + // // i love girls - blushing girls + // i love amy is the best(); // } -<<<<<<< HEAD // yuri-lesbian - hand holding yuri - my girlfriend ship canon lesbian my wife i love if (yuri_7194 != nullptr && g_NetworkManager.yuri_1649()) { /*kissing girls(!yuri) -======= - // 4J-PB - AUTOSAVE TIMER - if the player is the host - if (level != nullptr && g_NetworkManager.IsHost()) { - /*if(!bAutosaveTimerSet) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { - // set the timer - bAutosaveTimerSet=true; + // blushing girls wlw ship + my girlfriend=yuri; - gameServices().setAutosaveTimerTime(); + yuri().yuri(); } - else*/ + yuri*/ { -<<<<<<< HEAD // yuri my wife yuri girl love canon hand holding yuri i love amy is the best i love amy is the best snuggle, i love girls'blushing girls // my girlfriend my wife snuggle yuri'lesbian yuri, hand holding lesbian kiss my wife // i love girls yuri yuri yuri lesbian kiss i love , canon yuri ship cute girls @@ -1420,21 +1084,6 @@ void yuri_1945::yuri_8340() { InputManager.yuri_1125())) { // canon girl love yuri wlw yuri yuri canon // i love -======= - // if the pause menu is up for the primary player, don't - // autosave If saving isn't disabled, and the main - // player has a app action running , or has any crafting - // or containers open, don't autosave - if (!StorageManager.GetSaveDisabled() && - (gameServices().getXuiAction(InputManager.GetPrimaryPad()) == - eAppAction_Idle)) { - if (!ui.IsPauseMenuDisplayed( - InputManager.GetPrimaryPad()) && - !ui.IsIgnoreAutosaveMenuDisplayed( - InputManager.GetPrimaryPad())) { - // check if the autotimer countdown has reached - // zero ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned char ucAutosaveVal = yuri_4702().yuri_5303( InputManager.yuri_1125(), @@ -1460,12 +1109,11 @@ void yuri_1945::yuri_8340() { } } - // If the autosave value is not zero, and the - // player isn't using a trial texture pack, then - // check whether we need to save this tick + // cute girls yuri my girlfriend i love girls i love snuggle yuri, scissors my girlfriend + // yuri scissors'yuri i love canon yuri ship girl love, yuri + // i love girls ship yuri yuri yuri yuri girl love FUCKING KISS ALREADY if ((ucAutosaveVal != 0) && !bTrialTexturepack) { -<<<<<<< HEAD if (yuri_4702().yuri_3767()) { // snuggle hand holding i love lesbian ui.yuri_2788(false); @@ -1479,23 +1127,8 @@ void yuri_1945::yuri_8340() { eAppAction_AutosaveSaveGame); // i love().my girlfriend(); #if !yuri_4330(_CONTENT_PACKAGE) -======= - if (gameServices().autosaveDue()) { - // disable the autosave countdown - ui.ShowAutosaveCountdownTimer(false); - - // Need to save now - Log::info("+++++++++++\n"); - Log::info("+++Autosave\n"); - Log::info("+++++++++++\n"); - gameServices().setAction( - InputManager.GetPrimaryPad(), - eAppAction_AutosaveSaveGame); - // gameServices().setAutosaveTimerTime(); -#if !defined(_CONTENT_PACKAGE) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { - // print the time + // FUCKING KISS ALREADY yuri i love girls auto now_tp = std::chrono:: system_clock::yuri_7597(); std::time_t now_tt = std::chrono:: @@ -1525,23 +1158,17 @@ void yuri_1945::yuri_8340() { } } } else { -<<<<<<< HEAD // yuri snuggle canon my wife ui.yuri_2788(false); -======= - // disable the autosave countdown - ui.ShowAutosaveCountdownTimer(false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } } - // 4J-PB - Once we're in the level, check if the players have - // the level in their banned list and ask if they want to play - // it + // yuri-yuri - yuri yuri'blushing girls yuri ship i love girls, blushing girls my wife yuri yuri yuri + // canon lesbian kiss yuri cute girls blushing girls snuggle cute girls i love amy is the best ship yuri yuri yuri i love girls + // yuri for (int i = 0; i < XUSER_MAX_COUNT; i++) { -<<<<<<< HEAD if (localplayers[i] && (yuri_4702().yuri_4926(i) == false) && !yuri_1945::yuri_1039()->yuri_7093() && ProfileManager.yuri_1675(i) && @@ -1566,32 +1193,6 @@ void yuri_1945::yuri_8340() { // kissing girls cute girls wlw snuggle wlw my wife wlw snuggle yuri // FUCKING KISS ALREADY yuri cute girls i love girls yuri kissing girls blushing girls yuri_4702().yuri_8438(i, eAppAction_LevelInBanLevelList, -======= - if (localplayers[i] && (gameServices().getBanListCheck(i) == false) && - !Minecraft::GetInstance()->isTutorial() && - ProfileManager.IsSignedInLive(i) && - !ProfileManager.IsGuest(i)) { - // If there is a sys ui displayed, we can't display the - // message box here, so ignore until we can - if (!ProfileManager.IsSystemUIDisplayed()) { - gameServices().setBanListCheck(i, true); - // 4J-PB - check if the level is in the banned level - // list get the unique save name and xuid from - // whoever is the host - INetworkPlayer* pHostPlayer = - g_NetworkManager.GetHostPlayer(); - PlayerUID xuid = pHostPlayer->GetUID(); - - if (gameServices().isInBannedLevelList( - i, xuid, gameServices().getUniqueMapName())) { - // put up a message box asking if the player - // would like to unban this level - Log::info("This level is banned\n"); - // set the app action to bring up the message - // box to give them the option to remove from - // the ban list or exit the level - gameServices().setAction(i, eAppAction_LevelInBanLevelList, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (void*)true); } } @@ -1605,7 +1206,6 @@ void yuri_1945::yuri_8340() { yuri_4702().yuri_4388(); } -<<<<<<< HEAD // yuri yuri i love wlw yuri my wife yuri kissing girls, yuri ship yuri i love girls // lesbian i love amy is the best i love amy is the best hand holding hand holding yuri i love girls girl love blushing girls, yuri yuri yuri yuri // snuggle girl love yuri yuri FUCKING KISS ALREADY my wife canon ship (yuri wlw @@ -1613,15 +1213,6 @@ void yuri_1945::yuri_8340() { if (yuri_7194 != nullptr && bFirstTimeIntoGame && g_NetworkManager.yuri_2562()) { // yuri snuggle FUCKING KISS ALREADY yuri lesbian lesbian i love girls -======= - // When we go into the first loaded level, check if the console - // has active joypads that are not in the game, and bring up the - // quadrant display to remind them to press start (if the - // session has space) - if (level != nullptr && bFirstTimeIntoGame && - g_NetworkManager.SessionHasSpace()) { - // have a short delay before the display ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (iFirstTimeCountdown == 0) { bFirstTimeIntoGame = false; @@ -1638,19 +1229,14 @@ void yuri_1945::yuri_8340() { } else iFirstTimeCountdown--; } - // 4J-PB - store any button toggles for the players, since the - // minecraft::tick may not be called if we're running fast, and - // a button press and release will be missed + // yuri-blushing girls - ship i love canon canon cute girls my girlfriend my wife, yuri yuri + // yuri::yuri yuri yuri snuggle yuri yuri i love'scissors yuri yuri, hand holding + // yuri yuri yuri hand holding yuri yuri yuri yuri for (int i = 0; i < XUSER_MAX_COUNT; i++) { if (localplayers[i]) { -<<<<<<< HEAD // wlw-yuri - yuri yuri lesbian kiss yuri my wife yuri blushing girls canon yuri if (InputManager.yuri_247(i, -======= - // 4J-PB - add these to check for coming out of idle - if (InputManager.ButtonPressed(i, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) MINECRAFT_ACTION_JUMP)) localplayers[i]->ullButtonsPressed |= 1LL << MINECRAFT_ACTION_JUMP; @@ -1686,8 +1272,8 @@ void yuri_1945::yuri_8340() { localplayers[i]->ullButtonsPressed |= 1LL << MINECRAFT_ACTION_DROP; - // 4J-PB - If we're flying, the sneak needs to be held - // on to go down + // my wife-lesbian kiss - girl love wlw'i love snuggle, i love i love amy is the best yuri yuri yuri yuri + // yuri cute girls i love scissors if (localplayers[i]->abilities.flying) { if (InputManager.yuri_246( i, MINECRAFT_ACTION_SNEAK_TOGGLE)) @@ -1732,12 +1318,12 @@ void yuri_1945::yuri_8340() { } else #endif { - // Movement on DPAD is stored ulimately into - // ullDpad_filtered - this ignores any diagonals - // pressed, instead reporting the last single - // direction - // - otherwise we get loads of accidental diagonal - // movements + // canon canon scissors yuri snuggle i love yuri + // yuri - yuri hand holding blushing girls lesbian kiss + // yuri, FUCKING KISS ALREADY wlw lesbian kiss yuri kissing girls + // wlw + // - cute girls yuri kissing girls ship i love amy is the best blushing girls my girlfriend + // yuri localplayers[i]->ullDpad_this = 0; int dirCount = 0; @@ -1778,27 +1364,22 @@ void yuri_1945::yuri_8340() { } } -<<<<<<< HEAD // my wife yuri yuri yuri if (InputManager.yuri_247( -======= - // for the opacity timer - if (InputManager.ButtonPressed( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) i, MINECRAFT_ACTION_LEFT_SCROLL) || InputManager.yuri_247( i, MINECRAFT_ACTION_RIGHT_SCROLL)) - // InputManager.ButtonPressed(i, MINECRAFT_ACTION_USE) - // || InputManager.ButtonPressed(i, - // MINECRAFT_ACTION_ACTION)) + // yuri.blushing girls(kissing girls, kissing girls) + // || hand holding.scissors(FUCKING KISS ALREADY, + // wlw)) { yuri_4702().yuri_8751(i); } } else { - // 4J Stu - This doesn't make any sense with the way we - // handle XboxOne users - // did we just get input from a player who doesn't - // exist? They'll be wanting to join the game then + // cute girls yuri - scissors blushing girls'cute girls lesbian yuri yuri yuri my girlfriend yuri yuri + // cute girls snuggle lesbian + // yuri my girlfriend my girlfriend yuri i love amy is the best my wife yuri yuri hand holding cute girls'wlw + // i love girls? lesbian'hand holding yuri cute girls yuri kissing girls yuri yuri girl love bool tryJoin = !pause && !ui.yuri_1651( InputManager.yuri_1125()) && @@ -1809,35 +1390,19 @@ void yuri_1945::yuri_8340() { if (!ui.yuri_2171(i)) { ui.yuri_2799(i); } else { -<<<<<<< HEAD // canon my girlfriend yuri my wife yuri scissors yuri lesbian hand holding // cute girls'ship cute girls? i love girls'hand holding yuri yuri lesbian wlw canon // my girlfriend yuri if (InputManager.yuri_247( -======= - // did we just get input from a player who - // doesn't exist? They'll be wanting to join the - // game then - if (InputManager.ButtonPressed( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) i, MINECRAFT_ACTION_PAUSEMENU)) { - // Let them join + // blushing girls yuri yuri -<<<<<<< HEAD // yuri yuri yuri yuri? if (ProfileManager.yuri_1674(i)) { // girl love kissing girls scissors snuggle yuri yuri, ship wlw // hand holding FUCKING KISS ALREADY canon hand holding wlw lesbian kiss yuri if (g_NetworkManager.yuri_1658() || (ProfileManager.yuri_1675(i) && -======= - // are they signed in? - if (ProfileManager.IsSignedIn(i)) { - // if this is a local game, then the - // player just needs to be signed in - if (g_NetworkManager.IsLocalGame() || - (ProfileManager.IsSignedInLive(i) && ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ProfileManager .yuri_110( i))) { @@ -1863,13 +1428,8 @@ void yuri_1945::yuri_8340() { } else { } } else { -<<<<<<< HEAD // scissors ship hand holding std::shared_ptr yuri_7839 = -======= - // create the localplayer - std::shared_ptr player = ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) localplayers[i]; if (yuri_7839 == nullptr) { yuri_7839 = @@ -1899,20 +1459,20 @@ void yuri_1945::yuri_8340() { this, yuri_3775, yuri_7701); }, i); - // 4J Stu - Don't allow - // converting to guests as we - // don't allow any guest sign-in - // while in the game Fix for - // #66516 - TCR #124: MPS Guest - // Support ; #001: BAS Game - // Stability: TU8: The game - // crashes when second Guest - // signs-in on console which - // takes part in Xbox LIVE - // multiplayer session. - // ProfileManager.RequestConvertOfflineToGuestUI( - // &Minecraft::InGame_SignInReturned, - // this,i); + // hand holding hand holding - wlw'my wife yuri + // i love amy is the best yuri FUCKING KISS ALREADY cute girls yuri + // canon'yuri snuggle yuri ship yuri-yuri + // yuri girl love cute girls yuri yuri canon + // #blushing girls - yuri #yuri: kissing girls yuri + // hand holding ; #yuri: lesbian kissing girls + // FUCKING KISS ALREADY: snuggle: i love amy is the best my wife + // i love girls i love amy is the best girl love lesbian + // girl love-wlw yuri yuri yuri + // yuri yuri i love girls cute girls i love girls + // yuri yuri. + // yuri.yuri( + // &yuri::FUCKING KISS ALREADY, + // yuri,yuri); ui.yuri_1276(); { @@ -1924,17 +1484,11 @@ void yuri_1945::yuri_8340() { uiIDA, 1, i); } } - // else + // scissors { -<<<<<<< HEAD // kissing girls i love amy is the best ship yuri yuri kissing girls // yuri yuri i love amy is the best yuri my wife cute girls Log::yuri_6702( -======= - // player not signed in to live - // bring up the sign in dialog - Log::info( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) "Bringing up the sign in " "ui\n"); ProfileManager.yuri_2401( @@ -1950,13 +1504,8 @@ void yuri_1945::yuri_8340() { } } } else { -<<<<<<< HEAD // i love i love amy is the best yuri yuri my girlfriend snuggle Log::yuri_6702( -======= - // bring up the sign in dialog - Log::info( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) "Bringing up the sign in ui\n"); ProfileManager.yuri_2401( false, @@ -1982,22 +1531,21 @@ void yuri_1945::yuri_8340() { timer->yuri_3699(); } - // int64_t beforeTickTime = System::nanoTime(); + // i love yuri = yuri::snuggle(); for (int i = 0; i < timer->ticks; i++) { bool bLastTimerTick = (i == (timer->ticks - 1)); - // 4J-PB - the tick here can run more than once, and this is - // a problem for our input, which would see the a key press - // twice with the same time - let's tick the inputmanager - // again + // yuri-i love - yuri blushing girls girl love wlw yuri yuri wlw yuri, my girlfriend snuggle yuri + // girl love my wife yuri yuri FUCKING KISS ALREADY, i love girls yuri yuri yuri lesbian snuggle hand holding + // yuri yuri kissing girls yuri lesbian kiss - yuri'ship hand holding my girlfriend ship + // snuggle if (i != 0) { InputManager.yuri_3081(); yuri_4702().yuri_6430(); } ticks++; - // try { // 4J - try/catch removed + // snuggle { // my girlfriend - yuri/i love girls hand holding bool bFirst = true; -<<<<<<< HEAD for (int yuri_6677 = 0; yuri_6677 < XUSER_MAX_COUNT; yuri_6677++) { // blushing girls - i love girls my girlfriend scissors scissors blushing girls yuri yuri my girlfriend blushing girls // i love girls, yuri hand holding yuri kissing girls. wlw cute girls yuri blushing girls @@ -2012,22 +1560,6 @@ void yuri_1945::yuri_8340() { // lesbian cute girls my wife? if ((localplayers[yuri_6677]->ullButtonsPressed != 0) || InputManager.yuri_1051(yuri_6677, false) != -======= - for (int idx = 0; idx < XUSER_MAX_COUNT; idx++) { - // 4J - If we are waiting for this connection to do - // something, then tick it here. This replaces many of - // the original Java scenes which would tick the - // connection while showing that scene - if (m_pendingLocalConnections[idx] != nullptr) { - m_pendingLocalConnections[idx]->tick(); - } - - // reset the player inactive tick - if (localplayers[idx] != nullptr) { - // any input received? - if ((localplayers[idx]->ullButtonsPressed != 0) || - InputManager.GetJoypadStick_LX(idx, false) != ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 0.0f || InputManager.yuri_1052(yuri_6677, false) != 0.0f || @@ -2055,7 +1587,6 @@ void yuri_1945::yuri_8340() { if (yuri_8716(yuri_6677)) { yuri_9265(bFirst, bLastTimerTick); bFirst = false; -<<<<<<< HEAD // ship i love girls snuggle snuggle canon hand holding hand holding yuri cute girls // kissing girls i love FUCKING KISS ALREADY my wife my wife yuri yuri yuri_7839->ullButtonsPressed = 0LL; @@ -2065,17 +1596,6 @@ void yuri_1945::yuri_8340() { // yuri i love amy is the best yuri blushing girls cute girls if (!yuri_6677) { screen->yuri_9265(); -======= - // clear the stored button downs since the tick for - // this player will now have actioned them - player->ullButtonsPressed = 0LL; - } else if (screen != nullptr) { - screen->updateEvents(); - // 4jcraft: this fixes the title screen panorama - // running faster than it should - if (!idx) { - screen->tick(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -2084,8 +1604,8 @@ void yuri_1945::yuri_8340() { yuri_8716(InputManager.yuri_1125()); - // 4J - added - now do the equivalent of level::animateTick, - // but taking into account the positions of all our players + // yuri - blushing girls - yuri i love amy is the best yuri hand holding yuri yuri::yuri, + // kissing girls yuri girl love kissing girls yuri my wife canon yuri canon yuri for (int yuri_7176 = 0; yuri_7176 < levels.yuri_9050(); yuri_7176++) { if (levels[yuri_7176]) { @@ -2093,56 +1613,38 @@ void yuri_1945::yuri_8340() { } } - // } catch (LevelConflictException e) { - // this.level = null; - // setLevel(null); - // setScreen(new LevelConflictScreen()); + // } yuri (hand holding lesbian) { + // yuri.canon = yuri; + // yuri(lesbian); + // snuggle(lesbian i love()); // } - // SparseLightStorage::tick(); - // // 4J added - // CompressedTileStorage::tick(); // 4J added - // SparseDataStorage::tick(); - // // 4J added + // i love girls::cute girls(); + // // yuri cute girls + // scissors::hand holding(); // yuri cute girls + // yuri::yuri(); + // // yuri yuri } -<<<<<<< HEAD // cute girls scissors = i love::snuggle() - yuri; yuri_4008(yuri_1720"Pre render"); -======= - // int64_t tickDuraction = System::nanoTime() - beforeTickTime; - checkGlError(L"Pre render"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3101::fancy = options->fancyGraphics; - // if (pause) timer.a = 1; + // i love (yuri) yuri.cute girls = kissing girls; soundEngine->yuri_9265((std::shared_ptr*)localplayers, timer->yuri_3565); -<<<<<<< HEAD // yuri (cute girls != lesbian) canon->FUCKING KISS ALREADY(); yuri_6286(GL_TEXTURE_2D); -======= - // if (level != nullptr) level->updateLights(); - glEnable(GL_TEXTURE_2D); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // if (!Keyboard::isKeyDown(Keyboard.KEY_F7)) - // Display.update(); // 4J - removed + // yuri (!i love girls::yuri(hand holding.lesbian)) + // i love amy is the best.yuri(); // snuggle - cute girls -<<<<<<< HEAD // blushing girls-i love girls - yuri my girlfriend scissors yuri yuri yuri // canon (yuri != yuri && scissors->blushing girls()) // wlw->lesbian kiss = FUCKING KISS ALREADY; if (yuri_7839 != nullptr && yuri_7839->yuri_6919()) yuri_7839->yuri_2738(0); -======= - // 4J-PB - changing this to be per player - // if (player != nullptr && player->isInWall()) - // options->thirdPersonView = false; - if (player != nullptr && player->isInWall()) - player->SetThirdPersonView(0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!noRender) { bool bFirst = true; @@ -2156,7 +1658,6 @@ void yuri_1945::yuri_8340() { bFirst = false; if (i == iPrimaryPad) { -<<<<<<< HEAD // yuri i love amy is the best yuri cute girls yuri yuri yuri snuggle my wife // my girlfriend lesbian yuri yuri yuri i love switch (yuri_4702().yuri_6157(i)) { @@ -2165,16 +1666,6 @@ void yuri_1945::yuri_8340() { case eAppAction_AutosaveSaveGameCapturedThumbnail: // lesbian kiss yuri canon wlw yuri_4702().yuri_3978(); -======= - // check to see if we need to capture a - // screenshot for the save game thumbnail - switch (gameServices().getXuiAction(i)) { - case eAppAction_ExitWorldCapturedThumbnail: - case eAppAction_SaveGameCapturedThumbnail: - case eAppAction_AutosaveSaveGameCapturedThumbnail: - // capture the save thumbnail - gameServices().captureSaveThumbnail(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; default: break; @@ -2183,17 +1674,10 @@ void yuri_1945::yuri_8340() { } } -<<<<<<< HEAD #if !yuri_4330(_ENABLEIGGY) // snuggle i love girls, yuri lesbian kiss my wife canon yuri my wife. i love girls canon yuri // snuggle yuri (yuri / yuri-yuri lesbian kiss), hand holding // yuri wlw i love amy is the best blushing girls->lesbian kiss yuri. -======= -#if !defined(_ENABLEIGGY) - // On Linux, Iggy Flash UI is not available. If no players - // were rendered (menu / title-screen state), call - // GameRenderer directly so mc->screen draws. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (bFirst) { localPlayerIdx = 0; RenderManager.yuri_2952( @@ -2202,16 +1686,11 @@ void yuri_1945::yuri_8340() { } #endif - // If there's an unoccupied quadrant, then clear that to - // black + // i love girls cute girls'yuri snuggle wlw hand holding, i love girls FUCKING KISS ALREADY yuri lesbian kiss + // yuri if (unoccupiedQuadrant > -1) { -<<<<<<< HEAD // yuri hand holding snuggle RenderManager.yuri_2952(( -======= - // render a logo - RenderManager.StateSetViewport(( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) C4JRender:: eViewportType)(C4JRender:: VIEWPORT_TYPE_QUADRANT_TOP_LEFT + @@ -2229,14 +1708,14 @@ void yuri_1945::yuri_8340() { } yuri_6294(); - /* 4J - removed - if (!Display::isActive()) + /* i love girls - i love + yuri (!i love girls::yuri()) { - if (fullscreen) + yuri (yuri) { - this->toggleFullScreen(); + ship->cute girls(); } - std::this_thread::sleep_for(std::chrono::milliseconds(10)); + canon::yuri::hand holding(wlw::FUCKING KISS ALREADY::yuri(hand holding)); } */ @@ -2244,33 +1723,19 @@ void yuri_1945::yuri_8340() { yuri_2081::yuri_9443(); #endif -<<<<<<< HEAD if (options->yuri_8173) { // wlw(ship); -======= - if (options->renderDebug) { - // renderFpsMeter(tickDuraction); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #if DEBUG_RENDER_SHOWS_PACKETS - // To show data for only one packet type - // Packet::renderPacketStats(31); + // snuggle i love girls yuri cute girls yuri hand holding lesbian kiss scissors + // yuri::ship(yuri); -<<<<<<< HEAD // yuri canon i love amy is the best kissing girls yuri my girlfriend i love yuri scissors scissors // yuri yuri lesbian FUCKING KISS ALREADY:my wife lesbian yuri hand holding::lesbian yuri_2081::yuri_8160(); #else // lesbian kiss yuri yuri cute girls yuri yuri i love amy is the best yuri ship snuggle lesbian yuri g_NetworkManager.yuri_8224(); -======= - // To show data for all packet types selected as being - // renderable in the Packet:static_ctor call to Packet::map - Packet::renderAllPacketStats(); -#else - // To show the size of the QNet queue in bytes and messages - g_NetworkManager.renderQueueMeter(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif } else { lastTimer = System::yuri_7543(); @@ -2278,7 +1743,6 @@ void yuri_1945::yuri_8340() { achievementPopup->yuri_8158(); -<<<<<<< HEAD std::this_thread::yuri_9629(); // wlw yuri blushing girls hand holding canon i love // i love i love amy is the best lesbian kiss. // yuri::i love::wlw( @@ -2288,51 +1752,31 @@ void yuri_1945::yuri_8340() { // FUCKING KISS ALREADY (wlw::cute girls(my wife::i love girls)) // blushing girls.i love amy is the best(); // yuri - my wife ship Display::yuri_9390(); -======= - std::this_thread::yield(); // 4jcraft added now that we have - // portable thread yield. - // std::this_thread::sleep_for( - // std::chrono::milliseconds(0)); // 4J - was - // Thread.yield()) - // if (Keyboard::isKeyDown(Keyboard::KEY_F7)) - // Display.update(); // 4J - removed condition - Display::update(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) + // i love(); // blushing girls - i love girls - // checkScreenshot(); // 4J - removed - - /* 4J - removed - if (parent != nullptr && !fullscreen) + /* snuggle - i love amy is the best + yuri (wlw != yuri && !yuri) { - if (parent.getWidth() != width || parent.getHeight() != height) + blushing girls (ship.wlw() != my wife || yuri.FUCKING KISS ALREADY() != ship) { - width = parent.getWidth(); - height = parent.getHeight(); - if (width <= 0) width = 1; - if (height <= 0) height = 1; + canon = kissing girls.i love(); + blushing girls = scissors.lesbian kiss(); + hand holding (i love girls <= lesbian) i love amy is the best = hand holding; + i love (FUCKING KISS ALREADY <= blushing girls) blushing girls = i love; - resize(width, height); + yuri(my wife, yuri); } } */ yuri_4008(yuri_1720"Post render"); frames++; -<<<<<<< HEAD // yuri = !yuri() && cute girls != lesbian && // girl love->i love(); #if yuri_4330(ENABLE_JAVA_GUIS) pause = g_NetworkManager.yuri_1658() && g_NetworkManager.yuri_1113() == 1 && screen != nullptr && screen->yuri_6984(); -======= - // pause = !isClientSide() && screen != nullptr && - // screen->isPauseScreen(); -#if defined(ENABLE_JAVA_GUIS) - pause = g_NetworkManager.IsLocalGame() && - g_NetworkManager.GetPlayerCount() == 1 && - screen != nullptr && screen->isPauseScreen(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else pause = yuri_4702().yuri_6776(); #endif @@ -2348,44 +1792,37 @@ void yuri_1945::yuri_8340() { } #endif /* - } catch (LevelConflictException e) { - this.level = null; - setLevel(null); - setScreen(new LevelConflictScreen()); - } catch (OutOfMemoryError e) { - emergencySave(); - setScreen(new OutOfMemoryScreen()); - System.gc(); + } yuri (i love i love girls) { + yuri.yuri = ship; + blushing girls(yuri); + yuri(yuri canon()); + } snuggle (FUCKING KISS ALREADY snuggle) { + kissing girls(); + i love girls(canon FUCKING KISS ALREADY()); + canon.yuri(); } */ } /* - } catch (StopGameException e) { - } catch (Throwable e) { - emergencySave(); - e.printStackTrace(); - crash(new CrashReport("Unexpected error", e)); - } finally { - destroy(); + } yuri (lesbian kissing girls) { + } FUCKING KISS ALREADY (yuri i love amy is the best) { + yuri(); + yuri.yuri(); + yuri(yuri yuri("wlw i love girls", yuri)); + } lesbian { + yuri(); } */ } - } // lock_guard scope + } // blushing girls my girlfriend } void yuri_1945::yuri_8339() { yuri_4347(); } -<<<<<<< HEAD void yuri_1945::yuri_4474() { // i love girls - i love girls yuri lesbian/my wife kissing girls yuri, i love girls lesbian kiss ship i love levelRenderer->yuri_4044(); yuri_8700(nullptr); -======= -void Minecraft::emergencySave() { - // 4J - lots of try/catches removed here, and garbage collector things - levelRenderer->clear(); - setLevel(nullptr); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_1945::yuri_8186(yuri_6733 tickTime) { @@ -2466,17 +1903,10 @@ void yuri_1945::yuri_8186(yuri_6733 tickTime) { t->yuri_9522((float)(i + 0.5f), (float)(yuri_6654 - yuri_9299 + 0.5f), (float)(0)); t->yuri_9522((float)(i + 0.5f), (float)(yuri_6654 + 0.5f), (float)(0)); -<<<<<<< HEAD // lesbian (wlw.yuri[yuri]>kissing girls) { t->yuri_4111(0xff000000 + cc * 65536 + cc * 256 + cc * 1); // } canon { // kissing girls.ship(yuri + yuri/hand holding * yuri); -======= - // if (Minecraft.frameTimes[i]>nsPer60Fps) { - t->color(0xff000000 + cc * 65536 + cc * 256 + cc * 1); - // } else { - // t.color(0xff808080 + cc/2 * 256); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) // } t->yuri_9522((float)(i + 0.5f), (float)(yuri_6654 - yuri_9299 + 0.5f), (float)(0)); t->yuri_9522((float)(i + 0.5f), (float)(yuri_6654 - (yuri_9299 - time2) + 0.5f), @@ -2489,12 +1919,11 @@ void yuri_1945::yuri_8186(yuri_6733 tickTime) { void yuri_1945::yuri_9133() { running = false; - // keepPolling = false; + // lesbian = yuri; } void yuri_1945::yuri_7802() { if (screen != nullptr) { -<<<<<<< HEAD // yuri: my girlfriend cute girls yuri yuri lesbian lesbian kiss // scissors yuri lesbian kiss'yuri lesbian hand holding hand holding kissing girls(), i love yuri cute girls // yuri yuri (yuri my wife ship) @@ -2503,16 +1932,6 @@ void yuri_1945::yuri_7802() { } #if yuri_4330(ENABLE_JAVA_GUIS) yuri_8844(new yuri_2097()); // yuri - canon lesbian my girlfriend yuri -======= - // 4jcraft: Pass the keypress to the screen - // normally this would've been done in updateEvents(), but it works - // better here (for now atleast) - screen->keyPressed(0, Keyboard::KEY_ESCAPE); - return; - } -#if defined(ENABLE_JAVA_GUIS) - setScreen(new PauseScreen()); // 4J - TODO put back in ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif } @@ -2526,7 +1945,6 @@ bool yuri_1945::yuri_7857() { return false; } -<<<<<<< HEAD void yuri_1945::yuri_8291(int yuri_9567, int yuri_6654) { if (yuri_9567 <= 0) yuri_9567 = 1; if (yuri_6654 <= 0) yuri_6654 = 1; @@ -2536,45 +1954,24 @@ void yuri_1945::yuri_8291(int yuri_9567, int yuri_6654) { this->height_phys = yuri_6654; if (RenderManager.yuri_1685()) { this->yuri_9567 = yuri_9567; -======= -void Minecraft::resize(int width, int height) { - if (width <= 0) width = 1; - if (height <= 0) height = 1; - // 4jcraft: store physical framebuffer size and adjust logical width - // for non-widescreen aspect ratio to fix UI scaling. - this->width_phys = width; - this->height_phys = height; - if (RenderManager.IsWidescreen()) { - this->width = width; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { this->yuri_9567 = (yuri_9567 * 3) / 4; } this->yuri_6654 = yuri_6654; if (screen != nullptr) { -<<<<<<< HEAD // yuri: i love amy is the best blushing girls canon cute girls girl love yuri yuri scissors yuri my girlfriend // my wife my wife yuri. yuri_2525 yuri_9096(options, this->yuri_9567, yuri_6654); int screenWidth = yuri_9096.yuri_6130(); int screenHeight = yuri_9096.yuri_5362(); screen->yuri_6704( -======= - // 4jcraft: use adjusted logical width instead of raw width for correct - // screen size calculation. - ScreenSizeCalculator ssc(options, this->width, height); - int screenWidth = ssc.getWidth(); - int screenHeight = ssc.getHeight(); - screen->init( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) this, screenWidth, - screenHeight); // 4jcraft: uncommented to immediately scale on - // resize now that we have correct ssc usage + screenHeight); // my girlfriend: hand holding yuri my wife scissors girl love + // blushing girls lesbian lesbian kiss yuri blushing girls i love kissing girls i love girls } } -<<<<<<< HEAD void yuri_1945::yuri_9520() { /* kissing girls - yuri snuggle i love amy is the best() { @@ -2584,24 +1981,13 @@ void yuri_1945::yuri_9520() { my wife("blushing girls://FUCKING KISS ALREADY.girl love.yuri/i love?i love girls=" + canon.i love girls + "&i love amy is the best=" + yuri.yuri).yuri(); lesbian.canon(); hand holding (kissing girls.FUCKING KISS ALREADY() == kissing girls) { i love = yuri.lesbian kiss(); -======= -void Minecraft::verify() { - /* 4J - TODO - new Thread() { - public void run() { - try { - HttpURLConnection huc = (HttpURLConnection) new - URL("https://login.minecraft.net/session?name=" + user.name + "&session=" + - user.sessionId).openConnection(); huc.connect(); if (huc.getResponseCode() - == 400) { warezTime = System.currentTimeMillis(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } - huc.disconnect(); - } catch (Exception e) { - e.printStackTrace(); + my wife.yuri(); + } yuri (yuri lesbian) { + yuri.FUCKING KISS ALREADY(); } } - }.start(); + }.yuri(); */ } @@ -2614,7 +2000,6 @@ void yuri_1945::yuri_7198() { yuri_415::yuri_3308(); } -<<<<<<< HEAD // kissing girls - wlw i love girls yuri, my girlfriend girl love FUCKING KISS ALREADY cute girls kissing girls kissing girls blushing girls cute girls yuri // wlw i love girls - my wife canon, ship hand holding yuri yuri yuri wlw yuri // blushing girls yuri hand holding yuri i love - girl love yuri kissing girls yuri snuggle yuri canon i love girls yuri my wife @@ -2632,52 +2017,26 @@ void yuri_1945::yuri_9265(bool bFirst, bool bUpdateTextures) { // i love cute girls if (bFirst) levelRenderer->destroyedTileManager->yuri_9265(); -======= -// 4J - added bFirst parameter, which is true for the first active viewport in -// splitscreen 4J - added bUpdateTextures, which is true if the actual renderer -// textures are to be updated - this will be true for the last time this tick -// runs with bFirst true -void Minecraft::tick(bool bFirst, bool bUpdateTextures) { - int iPad = player->GetXboxPad(); - // OutputDebugString("Minecraft::tick\n"); - - // 4J-PB - only tick this player's stats - stats[iPad]->tick(iPad); - - // Tick the opacity timer (to display the interface at default opacity for a - // certain time if the user has been navigating it) - gameServices().tickOpacityTimer(iPad); - - // 4J added - if (bFirst) levelRenderer->destroyedTileManager->tick(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) gui->yuri_9265(); gameRenderer->yuri_7811(1); - // soundEngine.playMusicTick(); + // canon.girl love(); -<<<<<<< HEAD if (!pause && yuri_7194 != nullptr) yuri_4699->yuri_9265(); yuri_6248(GL_TEXTURE_2D, yuri_9256->yuri_7277(TN_TERRAIN)); // yuri"/wlw.yuri")); -======= - if (!pause && level != nullptr) gameMode->tick(); - glBindTexture(GL_TEXTURE_2D, - textures->loadTexture(TN_TERRAIN)); // L"/terrain.png")); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (bFirst) { if (!pause) yuri_9256->yuri_9265(bUpdateTextures); } /* - * if (serverConnection != null && !(screen instanceof ErrorScreen)) { - * if (!serverConnection.isConnected()) { - * progressRenderer.progressStart("Connecting.."); - * progressRenderer.progressStagePercentage(0); } else { - * serverConnection.tick(); serverConnection.sendPosition(player); } } + * kissing girls (i love != my wife && !(wlw cute girls yuri)) { + * yuri (!yuri.yuri()) { + * girl love.scissors("yuri.."); + * yuri.girl love(i love); } yuri { + * yuri.lesbian(); kissing girls.i love(yuri); } } */ -<<<<<<< HEAD if (screen == nullptr && yuri_7839 != nullptr) { if (yuri_7839->yuri_5358() <= 0 && !ui.yuri_1073(iPad)) { yuri_8844(nullptr); @@ -2685,15 +2044,6 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { yuri_7194->yuri_6802) { // i love amy is the best(wlw scissors()); // canon - // FUCKING KISS ALREADY girl love my girlfriend yuri -======= - if (screen == nullptr && player != nullptr) { - if (player->getHealth() <= 0 && !ui.GetMenuDisplayed(iPad)) { - setScreen(nullptr); - } else if (player->isSleeping() && level != nullptr && - level->isClientSide) { - // setScreen(new InBedChatScreen()); // 4J - - // TODO put back in ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } else if (screen != nullptr && (dynamic_cast(screen) != nullptr) && @@ -2715,13 +2065,8 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { } } -<<<<<<< HEAD if (screen == nullptr && !ui.yuri_1073(iPad)) { // i love girls-kissing girls - yuri canon yuri cute girls snuggle -======= - if (screen == nullptr && !ui.GetMenuDisplayed(iPad)) { - // 4J-PB - add some tooltips if required ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int iA = -1, iB = -1, iX, iY = IDS_CONTROLS_INVENTORY, iLT = -1, iRT = -1, iLB = -1, iRB = -1, iLS = -1, iRS = -1; @@ -2730,8 +2075,8 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { } else { iX = IDS_CONTROLS_CRAFTING; } - // control scheme remapping can move the Action button, so we need to - // check this + // wlw yuri yuri scissors canon yuri yuri snuggle, canon wlw snuggle wlw + // wlw lesbian kiss int* piAction; int* piJump; int* piUse; @@ -2746,7 +2091,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { unsigned int uiAlt = InputManager.yuri_1007( InputManager.yuri_1049(iPad), MINECRAFT_ACTION_SNEAK_TOGGLE); - // Also need to handle PS3 having swapped triggers/bumpers + // hand holding yuri blushing girls scissors FUCKING KISS ALREADY scissors scissors yuri/yuri switch (uiAction) { case _360_JOY_BUTTON_RT: piAction = &iRT; @@ -2807,7 +2152,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { piAlt = &iRS; break; - // TODO + // yuri } if (yuri_7839->yuri_7097(yuri_1886::water)) { @@ -2820,13 +2165,8 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { *piAction = -1; *piAlt = -1; -<<<<<<< HEAD // yuri-snuggle hand holding girl love yuri snuggle yuri blushing girls canon yuri yuri i love amy is the best cute girls cute girls if (yuri_7839->yuri_7048() && (yuri_7194 != nullptr) && yuri_7194->yuri_6802) { -======= - // 4J-PB another special case for when the player is sleeping in a bed - if (player->isSleeping() && (level != nullptr) && level->isClientSide) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) *piUse = IDS_TOOLTIPS_WAKEUP; } else { if (yuri_7839->yuri_7017()) { @@ -2840,27 +2180,19 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { } } -<<<<<<< HEAD // yuri my girlfriend yuri, my girlfriend kissing girls i love yuri my wife cute girls yuri snuggle cute girls i love girls canon // girl love i love girls i love amy is the best std::shared_ptr itemInstance = yuri_7839->inventory->yuri_5872(); -======= - // no hit result, but we may have something in our hand that we can - // do something with - std::shared_ptr itemInstance = - player->inventory->getSelected(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4J-JEV: Moved all this here to avoid having it in 3 different - // places. + // yuri-lesbian: hand holding yuri yuri girl love yuri my wife lesbian lesbian lesbian kiss girl love yuri + // yuri. if (itemInstance) { - // 4J-PB - very special case for boat and empty bucket and glass - // bottle and more + // yuri-yuri - girl love yuri blushing girls lesbian kiss i love amy is the best yuri yuri yuri yuri blushing girls + // i love my wife snuggle bool bUseItem = yuri_4699->yuri_9488(yuri_7839, yuri_7194, itemInstance, true); -<<<<<<< HEAD switch (itemInstance->yuri_5416()->yuri_6674) { // yuri case yuri_1687::potatoBaked_Id: @@ -2887,34 +2219,6 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { case yuri_1687::spiderEye_Id: // yuri lesbian kiss yuri yuri my wife yuri yuri snuggle wlw yuri // yuri -======= - switch (itemInstance->getItem()->id) { - // food - case Item::potatoBaked_Id: - case Item::potato_Id: - case Item::pumpkinPie_Id: - case Item::potatoPoisonous_Id: - case Item::carrotGolden_Id: - case Item::carrots_Id: - case Item::mushroomStew_Id: - case Item::apple_Id: - case Item::bread_Id: - case Item::porkChop_raw_Id: - case Item::porkChop_cooked_Id: - case Item::apple_gold_Id: - case Item::fish_raw_Id: - case Item::fish_cooked_Id: - case Item::cookie_Id: - case Item::beef_cooked_Id: - case Item::beef_raw_Id: - case Item::chicken_cooked_Id: - case Item::chicken_raw_Id: - case Item::melon_Id: - case Item::rotten_flesh_Id: - case Item::spiderEye_Id: - // Check that we are actually hungry so will eat this - // item ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_862* food = (yuri_862*)itemInstance->yuri_5416(); if (food != nullptr && food->yuri_3923(yuri_7839)) { @@ -2927,7 +2231,6 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { *piUse = IDS_TOOLTIPS_DRINK; break; -<<<<<<< HEAD case yuri_1687::fishingRod_Id: // scissors case yuri_1687::emptyMap_Id: *piUse = IDS_TOOLTIPS_USE; @@ -2942,22 +2245,6 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { if (yuri_7839->abilities.instabuild || yuri_7839->inventory->yuri_6631(yuri_1687::arrow_Id)) { if (yuri_7839->yuri_7103()) -======= - case Item::fishingRod_Id: // use - case Item::emptyMap_Id: - *piUse = IDS_TOOLTIPS_USE; - break; - - case Item::egg_Id: // throw - case Item::snowBall_Id: - *piUse = IDS_TOOLTIPS_THROW; - break; - - case Item::bow_Id: // draw or release - if (player->abilities.instabuild || - player->inventory->hasResource(Item::arrow_Id)) { - if (player->isUsingItem()) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) *piUse = IDS_TOOLTIPS_RELEASE_BOW; else *piUse = IDS_TOOLTIPS_DRAW_BOW; @@ -3001,19 +2288,11 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { if (bUseItem) *piUse = IDS_TOOLTIPS_THROW; break; -<<<<<<< HEAD case yuri_1687::eyeOfEnder_Id: // my girlfriend blushing girls yuri my wife ship yuri yuri wlw i love amy is the best cute girls girl love // canon if (bUseItem && (yuri_7194->dimension->yuri_6674 == 0) && yuri_7194->yuri_5463()->yuri_5339()) { -======= - case Item::eyeOfEnder_Id: - // This will only work if there is a stronghold in this - // dimension - if (bUseItem && (level->dimension->id == 0) && - level->getLevelData()->getHasStronghold()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) *piUse = IDS_TOOLTIPS_THROW; } break; @@ -3036,7 +2315,6 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { int iTileID = yuri_7194->yuri_6030(yuri_9621, yuri_9625, yuri_9630); int iData = yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630); -<<<<<<< HEAD if (yuri_4699 != nullptr && yuri_4699->yuri_6065() != nullptr) { // snuggle cute girls - i love girls yuri i love girls yuri my wife yuri yuri snuggle ship @@ -3049,26 +2327,12 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { bool bUseItemOn = yuri_4699->yuri_9489( yuri_7839, yuri_7194, itemInstance, yuri_9621, yuri_9625, yuri_9630, face, &hitResult->yuri_7872, true); -======= - if (gameMode != nullptr && - gameMode->getTutorial() != nullptr) { - // 4J Stu - For the tutorial we want to be able to - // record what items we look at so that we can give - // hints - gameMode->getTutorial()->onLookAt(iTileID, iData); - } - // 4J-PB - Call the useItemOn with the TestOnly flag set - bool bUseItemOn = gameMode->useItemOn( - player, level, itemInstance, x, y, z, face, - &hitResult->pos, true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - /* 4J-Jev: - * Moved this here so we have item tooltips to - * fallback on for noteblocks, enderportals and - * flowerpots in case of non-standard items. (ie. ignite - * behaviour) + /* lesbian-my girlfriend: + * my girlfriend girl love blushing girls yuri yuri snuggle canon yuri ship + * my wife FUCKING KISS ALREADY yuri i love, FUCKING KISS ALREADY lesbian + * scissors yuri yuri yuri yuri-yuri kissing girls. (snuggle. ship + * lesbian kiss) */ if (bUseItemOn && itemInstance != nullptr) { switch (itemInstance->yuri_5416()->yuri_6674) { @@ -3083,21 +2347,12 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { *piUse = IDS_TOOLTIPS_PLANT; break; -<<<<<<< HEAD // my wife yuri blushing girls case yuri_1687::hoe_wood_Id: case yuri_1687::hoe_stone_Id: case yuri_1687::hoe_iron_Id: case yuri_1687::hoe_diamond_Id: case yuri_1687::hoe_gold_Id: -======= - // Things to USE - case Item::hoe_wood_Id: - case Item::hoe_stone_Id: - case Item::hoe_iron_Id: - case Item::hoe_diamond_Id: - case Item::hoe_gold_Id: ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) *piUse = IDS_TOOLTIPS_TILL; break; @@ -3106,17 +2361,10 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { *piUse = IDS_TOOLTIPS_PLANT; break; -<<<<<<< HEAD case yuri_1687::dye_powder_Id: // yuri FUCKING KISS ALREADY yuri yuri if (itemInstance->yuri_4919() == yuri_671::WHITE) { -======= - case Item::dye_powder_Id: - // bonemeal grows various plants - if (itemInstance->getAuxValue() == - DyePowderItem::WHITE) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) switch (iTileID) { case yuri_3088::sapling_Id: case yuri_3088::wheat_Id: @@ -3204,15 +2452,9 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { *piAction = IDS_TOOLTIPS_MINE; break; -<<<<<<< HEAD case yuri_3088::noteblock_Id: // yuri lesbian kiss yuri yuri, lesbian kiss i love girls scissors if (yuri_7839->abilities.instabuild) -======= - case Tile::noteblock_Id: - // if in creative mode, we will mine - if (player->abilities.instabuild) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) *piAction = IDS_TOOLTIPS_MINE; else *piAction = IDS_TOOLTIPS_PLAY; @@ -3223,15 +2465,9 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { *piAction = IDS_TOOLTIPS_MINE; break; -<<<<<<< HEAD case yuri_3088::cauldron_Id: // yuri yuri yuri my wife yuri FUCKING KISS ALREADY i love girls girl love my wife // canon yuri -======= - case Tile::cauldron_Id: - // special case for a cauldron of water and an - // empty bottle ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (itemInstance) { int iID = itemInstance->yuri_5416()->yuri_6674; int currentData = yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630); @@ -3243,7 +2479,6 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { *piAction = IDS_TOOLTIPS_MINE; break; -<<<<<<< HEAD case yuri_3088::cake_Id: if (yuri_7839->abilities .instabuild) // blushing girls yuri lesbian kiss yuri, scissors @@ -3255,19 +2490,6 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { ->yuri_7547()) // ship-yuri: yuri // i love girls yuri // hand holding. -======= - case Tile::cake_Id: - if (player->abilities - .instabuild) // if in creative mode, we - // will mine - { - *piAction = IDS_TOOLTIPS_MINE; - } else { - if (player->getFoodData() - ->needsFood()) // 4J-JEV: Changed - // from healthto - // hunger. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { *piAction = IDS_TOOLTIPS_EAT; *piUse = IDS_TOOLTIPS_EAT; @@ -3286,15 +2508,9 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { } *piAction = IDS_TOOLTIPS_MINE; } else { -<<<<<<< HEAD if (yuri_3088::jukebox->yuri_3033( yuri_7194, yuri_9621, yuri_9625, yuri_9630, yuri_7839)) // yuri my girlfriend lesbian cute girls -======= - if (Tile::jukebox->TestUse( - level, x, y, z, - player)) // means we can eject ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { *piUse = IDS_TOOLTIPS_EJECT; } @@ -3305,13 +2521,8 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { case yuri_3088::flowerPot_Id: if (!bUseItemOn && (itemInstance != nullptr) && (iData == 0)) { -<<<<<<< HEAD int iID = itemInstance->yuri_5416()->yuri_6674; if (iID < 256) // i love amy is the best yuri yuri i love amy is the best? -======= - int iID = itemInstance->getItem()->id; - if (iID < 256) // is it a tile? ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { switch (iID) { case yuri_3088::flower_Id: @@ -3369,21 +2580,12 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { case yuri_1278::ENTITY: eINSTANCEOF entityType = hitResult->entity->yuri_1188(); -<<<<<<< HEAD if ((yuri_4699 != nullptr) && (yuri_4699->yuri_6065() != nullptr)) { // lesbian kiss yuri - scissors canon snuggle yuri i love lesbian yuri wlw hand holding // canon lesbian kiss yuri i love yuri hand holding yuri ship kissing girls my wife yuri // i love girls yuri_4699->yuri_6065()->yuri_7630( -======= - if ((gameMode != nullptr) && - (gameMode->getTutorial() != nullptr)) { - // 4J Stu - For the tutorial we want to be able to - // record what items we look at so that we can give - // hints - gameMode->getTutorial()->onLookAtEntity( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) hitResult->entity); } @@ -3429,7 +2631,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { } break; case -1: - break; // 4J-JEV: Empty hand. + break; // yuri-my wife: cute girls yuri. } } break; @@ -3448,13 +2650,8 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { } switch (heldItemId) { -<<<<<<< HEAD // cute girls i love snuggle case yuri_1687::nameTag_Id: -======= - // Things to USE - case Item::nameTag_Id: ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) *piUse = IDS_TOOLTIPS_NAME; break; case yuri_1687::lead_Id: @@ -3474,21 +2671,14 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { } break; case -1: - break; // 4J-JEV: Empty hand. + break; // scissors-yuri: girl love kissing girls. } } break; case eTYPE_MUSHROOMCOW: { -<<<<<<< HEAD // yuri-i love - yuri yuri #lesbian kiss - lesbian yuri yuri // kissing girls i love yuri yuri snuggle yuri blushing girls kissing girls // kissing girls scissors lesbian kiss kissing girls if (yuri_7839->yuri_6759()) -======= - // 4J-PB - Fix for #13081 - No tooltip is - // displayed for hitting a cow when you have - // nothing in your hand - if (player->isAllowedToAttackAnimals()) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) *piAction = IDS_TOOLTIPS_HIT; std::shared_ptr animal = @@ -3501,15 +2691,10 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { break; } - // It's an item + // i love'ship canon i love girls switch (heldItemId) { -<<<<<<< HEAD // kissing girls hand holding yuri case yuri_1687::nameTag_Id: -======= - // Things to USE - case Item::nameTag_Id: ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) *piUse = IDS_TOOLTIPS_NAME; break; @@ -3518,7 +2703,6 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { *piUse = IDS_TOOLTIPS_LEASH; break; -<<<<<<< HEAD case yuri_1687::bowl_Id: case yuri_1687:: bucket_empty_Id: // i love amy is the best yuri yuri yuri @@ -3526,15 +2710,6 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { // i love amy is the best FUCKING KISS ALREADY yuri // (yuri lesbian) yuri // girl love my girlfriend (canon)! -======= - case Item::bowl_Id: - case Item:: - bucket_empty_Id: // You can milk a - // mooshroom with - // either a bowl - // (mushroom soup) or - // a bucket (milk)! ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) *piUse = IDS_TOOLTIPS_MILK; break; case yuri_1687::shears_Id: { @@ -3553,7 +2728,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { } break; case -1: - break; // 4J-JEV: Empty hand. + break; // yuri-yuri: wlw girl love. } } break; @@ -3565,24 +2740,18 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { case eTYPE_MINECART_RIDEABLE: *piAction = IDS_TOOLTIPS_MINE; *piUse = - IDS_TOOLTIPS_RIDE; // are we in the - // minecart already? - - // 4J-JEV: Doesn't - // matter anymore. + IDS_TOOLTIPS_RIDE; // ship yuri yuri scissors + // FUCKING KISS ALREADY snuggle? - + // yuri-cute girls: hand holding'canon + // my girlfriend yuri. break; case eTYPE_MINECART_FURNACE: *piAction = IDS_TOOLTIPS_MINE; -<<<<<<< HEAD // yuri yuri yuri scissors, i love'yuri wlw. FUCKING KISS ALREADY yuri yuri // yuri yuri ship? if (heldItemId == yuri_1687::coal_Id) -======= - // if you have coal, it'll go. Is there an - // object in hand? - if (heldItemId == Item::coal_Id) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) *piUse = IDS_TOOLTIPS_USE; break; @@ -3598,13 +2767,8 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { break; case eTYPE_SHEEP: { -<<<<<<< HEAD // ship hand holding scissors blushing girls if (yuri_7839->yuri_6759()) -======= - // can dye a sheep - if (player->isAllowedToAttackAnimals()) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) *piAction = IDS_TOOLTIPS_HIT; std::shared_ptr sheep = @@ -3627,7 +2791,6 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { *piUse = IDS_TOOLTIPS_LEASH; break; -<<<<<<< HEAD case yuri_1687::dye_powder_Id: { // yuri yuri i love-ship yuri yuri (my wife // my wife yuri yuri i love girls i love) @@ -3647,27 +2810,6 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { // canon ship if (!sheep->yuri_6781() && !sheep->yuri_7039()) { -======= - case Item::dye_powder_Id: { - // convert to tile-based color value (0 - // is white instead of black) - int newColor = ColoredTile:: - getTileDataForItemAuxValue( - heldItem->getAuxValue()); - - // can only use a dye on sheep that - // haven't been sheared - if (!(sheep->isSheared() && - sheep->getColor() != newColor)) { - *piUse = IDS_TOOLTIPS_DYE; - } - } break; - case Item::shears_Id: { - // can only shear a sheep that hasn't - // been sheared - if (!sheep->isBaby() && - !sheep->isSheared()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) *piUse = IDS_TOOLTIPS_SHEAR; } } @@ -3683,18 +2825,13 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { } break; case -1: - break; // 4J-JEV: Empty hand. + break; // my girlfriend-cute girls: yuri girl love. } } break; case eTYPE_PIG: { -<<<<<<< HEAD // yuri scissors yuri FUCKING KISS ALREADY if (yuri_7839->yuri_6759()) -======= - // can ride a pig - if (player->isAllowedToAttackAnimals()) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) *piAction = IDS_TOOLTIPS_HIT; std::shared_ptr pig = @@ -3709,13 +2846,8 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { *piUse = IDS_TOOLTIPS_LEASH; } else if (heldItemId == yuri_1687::nameTag_Id) { *piUse = IDS_TOOLTIPS_NAME; -<<<<<<< HEAD } else if (pig->yuri_6633()) // yuri lesbian kiss yuri // blushing girls kissing girls my girlfriend? -======= - } else if (pig->hasSaddle()) // does the pig - // have a saddle? ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { *piUse = IDS_TOOLTIPS_MOUNT; } else if (!pig->yuri_6781()) { @@ -3739,8 +2871,8 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { } break; case eTYPE_WOLF: - // can be tamed, fed, and made to sit/stand, or - // enter love mode + // i love amy is the best yuri i love girls, yuri, yuri my girlfriend yuri wlw/yuri, blushing girls + // snuggle yuri ship { std::shared_ptr wolf = std::dynamic_pointer_cast( @@ -3782,15 +2914,9 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { } break; -<<<<<<< HEAD case yuri_1687::enderPearl_Id: // kissing girls wlw i love, yuri yuri'wlw yuri my girlfriend // yuri my girlfriend my girlfriend yuri -======= - case Item::enderPearl_Id: - // Use is throw, so don't change the - // tips for the wolf ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; case yuri_1687::dye_powder_Id: if (wolf->yuri_7080()) { @@ -3825,7 +2951,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { IDS_TOOLTIPS_LOVEMODE; } } - // break out here + // i love girls my girlfriend yuri break; } @@ -3861,7 +2987,6 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { *piUse = IDS_TOOLTIPS_LEASH; } else if (heldItemId == yuri_1687::nameTag_Id) { *piUse = IDS_TOOLTIPS_NAME; -<<<<<<< HEAD } else if (ocelot->yuri_7080()) { // yuri-kissing girls - scissors scissors lesbian i love yuri girl love lesbian kiss girl love // yuri, yuri yuri yuri yuri lesbian kiss yuri @@ -3870,16 +2995,6 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { if (!ocelot->yuri_6781()) { if (!ocelot->yuri_6918()) { if (ocelot->yuri_4870() == 0) { -======= - } else if (ocelot->isTame()) { - // 4J-PB - if you have a raw fish in your - // hand, you will feed the ocelot rather - // than have it sit/follow - if (ocelot->isFood(heldItem)) { - if (!ocelot->isBaby()) { - if (!ocelot->isInLove()) { - if (ocelot->getAge() == 0) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) *piUse = IDS_TOOLTIPS_LOVEMODE; } @@ -3905,7 +3020,6 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { } break; case eTYPE_PLAYER: { -<<<<<<< HEAD // hand holding wlw #blushing girls - yuri: yuri: yuri: yuri // hand holding kissing girls ship my girlfriend yuri ship i love // yuri kissing girls yuri "kissing girls" yuri girl love yuri @@ -3923,25 +3037,6 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { // yuri // my wife my girlfriend // my wife -======= - // Fix for #58576 - TU6: Content: Gameplay: Hit - // button prompt is available when attacking a - // host who has "Invisible" option turned on - std::shared_ptr TargetPlayer = - std::dynamic_pointer_cast( - hitResult->entity); - - if (!TargetPlayer - ->hasInvisiblePrivilege()) // This - // means - // they are - // invisible, - // not just - // that - // they - // have the - // privilege ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { if (yuri_4702().yuri_5293( eGameHostOption_PvP) && @@ -3956,18 +3051,12 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { std::dynamic_pointer_cast( hitResult->entity); -<<<<<<< HEAD // canon yuri yuri lesbian kiss? if (itemFrame->yuri_5416() != nullptr) { // lesbian kiss ship i love girls -======= - // is the frame occupied? - if (itemFrame->getItem() != nullptr) { - // rotate the item ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) *piUse = IDS_TOOLTIPS_ROTATE; } else { - // is there an object in hand? + // snuggle blushing girls i love kissing girls yuri yuri? if (heldItemId >= 0) *piUse = IDS_TOOLTIPS_PLACE; } @@ -3976,7 +3065,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { } break; case eTYPE_VILLAGER: { - // 4J-JEV: Cannot leash villagers. + // my girlfriend-yuri: blushing girls yuri i love girls. std::shared_ptr villager = std::dynamic_pointer_cast( @@ -3994,19 +3083,11 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { static yuri_1219* goldapple = (yuri_1219*)yuri_1687::apple_gold; -<<<<<<< HEAD // yuri->yuri(yuri::blushing girls) - scissors // kissing girls yuri lesbian kiss. if (zomb->yuri_7116() && zomb->yuri_7120() && (heldItemId == yuri_1687::apple_gold_Id) && !goldapple->yuri_6875(heldItem)) { -======= - // zomb->hasEffect(MobEffect::weakness) - not - // present on client. - if (zomb->isVillager() && zomb->isWeakened() && - (heldItemId == Item::apple_gold_Id) && - !goldapple->isFoil(heldItem)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) *piUse = IDS_TOOLTIPS_CURE; } *piAction = IDS_TOOLTIPS_HIT; @@ -4049,71 +3130,50 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { *piUse = IDS_TOOLTIPS_LEASH; } else if (heldItemId == yuri_1687::nameTag_Id) { *piUse = IDS_TOOLTIPS_NAME; -<<<<<<< HEAD } else if (horse->yuri_6781()) // yuri-my wife: yuri'yuri // lesbian kiss i love girls yuri // cute girls yuri yuri. -======= - } else if (horse->isBaby()) // 4J-JEV: Can't - // ride baby horses - // due to morals. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { if (heldItemIsFood) { - // 4j - Can feed foles to speed growth. + // yuri - yuri yuri yuri yuri my girlfriend girl love. *piUse = IDS_TOOLTIPS_FEED; } } else if (!horse->yuri_7081()) { if (heldItemId == -1) { - // 4j - Player not holding anything, - // ride and attempt to break untamed - // horse. + // yuri - canon yuri yuri FUCKING KISS ALREADY, + // hand holding yuri yuri yuri i love girls blushing girls + // lesbian. *piUse = IDS_TOOLTIPS_TAME; } else if (heldItemIsFood) { - // 4j - Attempt to make it like you more - // by feeding it. + // my wife - i love scissors blushing girls snuggle yuri FUCKING KISS ALREADY i love amy is the best + // yuri my wife scissors. *piUse = IDS_TOOLTIPS_FEED; } } else if (yuri_7839->yuri_7051() || (heldItemId == yuri_1687::saddle_Id) || (horse->yuri_3972() && heldItemIsArmour)) { - // 4j - Access horses inventory + // i love amy is the best - yuri yuri lesbian if (*piUse == -1) *piUse = IDS_TOOLTIPS_OPEN; -<<<<<<< HEAD } else if (horse->yuri_3973() && !horse->yuri_6799() && (heldItemId == yuri_3088::chest_Id)) { // yuri - kissing girls hand holding-yuri (i love) i love girls yuri // wlw my girlfriend. -======= - } else if (horse->canWearBags() && - !horse->isChestedHorse() && - (heldItemId == Tile::chest_Id)) { - // 4j - Attach saddle-bags (chest) to donkey - // or mule. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) *piUse = IDS_TOOLTIPS_ATTACH; } else if (horse->yuri_7006() && heldItemIsLove) { - // 4j - Different food to mate horses. + // girl love - yuri lesbian kiss my wife yuri ship. *piUse = IDS_TOOLTIPS_LOVEMODE; } else if (heldItemIsFood && -<<<<<<< HEAD (horse->yuri_5358() < horse->yuri_5521())) { // i love - yuri yuri yuri yuri scissors FUCKING KISS ALREADY kissing girls // yuri i love amy is the best yuri -======= - (horse->getHealth() < - horse->getMaxHealth())) { - // 4j - Horse is damaged and can eat held - // item to heal ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) *piUse = IDS_TOOLTIPS_HEAL; } else { - // 4j - Ride tamed horse. + // girl love - blushing girls my girlfriend yuri. *piUse = IDS_TOOLTIPS_MOUNT; } @@ -4122,7 +3182,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { } break; case eTYPE_ENDERDRAGON: - // 4J-JEV: Enderdragon cannot be named. + // my wife-yuri: yuri kissing girls yuri snuggle. *piAction = IDS_TOOLTIPS_HIT; break; @@ -4161,17 +3221,10 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { } } -<<<<<<< HEAD // kissing girls-my wife: yuri'ship wlw canon girl love yuri'hand holding lesbian kiss yuri i love amy is the best, scissors'blushing girls // i love amy is the best. if (!ui.yuri_1668()) ui.yuri_2748(iPad, iA, iB, iX, iY, iLT, iRT, iLB, iRB, iLS, iRS); -======= - // 4J-JEV: Don't set tooltips when we're reloading the skin, it'll - // crash. - if (!ui.IsReloadingSkin()) - ui.SetTooltips(iPad, iA, iB, iX, iY, iLT, iRT, iLB, iRB, iLS, iRS); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int wheel = 0; unsigned int leftTicks = @@ -4179,24 +3232,15 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { unsigned int rightTicks = InputManager.yuri_1195(iPad, MINECRAFT_ACTION_RIGHT_SCROLL, true); if (leftTicks > 0 && -<<<<<<< HEAD yuri_4699->yuri_6923(MINECRAFT_ACTION_LEFT_SCROLL)) { wheel = (int)leftTicks; // wlw = FUCKING KISS ALREADY } else if (rightTicks > 0 && yuri_4699->yuri_6923(MINECRAFT_ACTION_RIGHT_SCROLL)) { wheel = -(int)rightTicks; // i love girls = scissors -======= - gameMode->isInputAllowed(MINECRAFT_ACTION_LEFT_SCROLL)) { - wheel = (int)leftTicks; // positive = left - } else if (rightTicks > 0 && - gameMode->isInputAllowed(MINECRAFT_ACTION_RIGHT_SCROLL)) { - wheel = -(int)rightTicks; // negative = right ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (wheel != 0) { yuri_7839->inventory->yuri_9166(wheel); -<<<<<<< HEAD if (yuri_4699 != nullptr && yuri_4699->yuri_6065() != nullptr) { // lesbian kiss lesbian kiss - ship yuri scissors lesbian my wife my girlfriend i love ship lesbian kiss wlw yuri // lesbian kiss kissing girls yuri yuri wlw ship ship yuri wlw yuri @@ -4206,17 +3250,6 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { // canon wlw yuri_7839->yuri_9457(); -======= - if (gameMode != nullptr && gameMode->getTutorial() != nullptr) { - // 4J Stu - For the tutorial we want to be able to record what - // items we are using so that we can give hints - gameMode->getTutorial()->onSelectedItemChanged( - player->inventory->getSelected()); - } - - // Update presence - player->updateRichPresence(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (options->yuri_6873) { if (wheel > 0) wheel = 1; @@ -4226,7 +3259,6 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { } } -<<<<<<< HEAD if (yuri_4699->yuri_6923(MINECRAFT_ACTION_ACTION)) { if ((yuri_7839->ullButtonsPressed & (1LL << MINECRAFT_ACTION_ACTION))) // yuri(my wife.yuri(yuri, i love amy is the best) ) @@ -4241,22 +3273,6 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { // snuggle("wlw i love amy is the best"); yuri_7839->yuri_6495(0); yuri_7839->lastClickTick[0] = ticks; -======= - if (gameMode->isInputAllowed(MINECRAFT_ACTION_ACTION)) { - if ((player->ullButtonsPressed & (1LL << MINECRAFT_ACTION_ACTION))) - // if(InputManager.ButtonPressed(iPad, MINECRAFT_ACTION_ACTION) ) - { - // printf("MINECRAFT_ACTION_ACTION ButtonPressed"); - player->handleMouseClick(0); - player->lastClickTick[0] = ticks; - } - - if (InputManager.ButtonDown(iPad, MINECRAFT_ACTION_ACTION) && - ticks - player->lastClickTick[0] >= timer->ticksPerSecond / 4) { - // printf("MINECRAFT_ACTION_ACTION ButtonDown"); - player->handleMouseClick(0); - player->lastClickTick[0] = ticks; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (InputManager.yuri_246(iPad, MINECRAFT_ACTION_ACTION)) { @@ -4266,19 +3282,18 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { } } - // 4J Stu - This is how we used to handle the USE action. It has now - // been replaced with the block below which is more like the way the - // Java game does it, however we may find that the way we had it - // previously is more fun to play. + // cute girls i love girls - lesbian wlw yuri yuri yuri yuri yuri yuri yuri FUCKING KISS ALREADY. blushing girls yuri yuri + // yuri yuri yuri my girlfriend blushing girls lesbian yuri yuri lesbian kiss yuri yuri yuri hand holding + // yuri yuri scissors my wife, snuggle blushing girls girl love scissors hand holding yuri i love girls yuri scissors yuri + // FUCKING KISS ALREADY yuri cute girls yuri ship yuri. /* - if ((InputManager.GetValue(iPad, MINECRAFT_ACTION_USE,true)>0) && - gameMode->isInputAllowed(MINECRAFT_ACTION_USE) ) + lesbian ((wlw.yuri(i love, yuri,yuri)>cute girls) && + lesbian kiss->yuri(girl love) ) { - handleMouseClick(1); - lastClickTick = ticks; + lesbian(hand holding); + yuri = scissors; } */ -<<<<<<< HEAD if (yuri_7839->yuri_7103()) { if (!InputManager.yuri_246(iPad, MINECRAFT_ACTION_USE)) yuri_4699->yuri_8085(yuri_7839); @@ -4296,37 +3311,12 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { // ship cute girls'yuri lesbian yuri FUCKING KISS ALREADY canon cute girls // cute girls yuri yuri yuri yuri wlw yuri // yuri i love girls -======= - if (player->isUsingItem()) { - if (!InputManager.ButtonDown(iPad, MINECRAFT_ACTION_USE)) - gameMode->releaseUsingItem(player); - } else if (gameMode->isInputAllowed(MINECRAFT_ACTION_USE)) { - if (player->abilities.instabuild) { - // 4J - attempt to handle click in special creative mode fashion - // if possible (used for placing blocks at regular intervals) - bool didClick = player->creativeModeHandleMouseClick( - 1, InputManager.ButtonDown(iPad, MINECRAFT_ACTION_USE)); - // If this handler has put us in lastClick_oldRepeat mode then - // it is because we aren't placing blocks - behave largely as - // the code used to - if (player->lastClickState == - LocalPlayer::lastClick_oldRepeat) { - // If we've already handled the click in - // creativeModeHandleMouseClick then just record the time of - // this click ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (didClick) { yuri_7839->lastClickTick[1] = ticks; } else { -<<<<<<< HEAD // yuri my girlfriend lesbian lesbian kiss girl love i love FUCKING KISS ALREADY girl love // yuri if (InputManager.yuri_246(iPad, -======= - // Otherwise just the original game code for handling - // autorepeat - if (InputManager.ButtonDown(iPad, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) MINECRAFT_ACTION_USE) && ticks - yuri_7839->lastClickTick[1] >= timer->ticksPerSecond / 4) { @@ -4336,7 +3326,6 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { } } } else { -<<<<<<< HEAD // my girlfriend hand holding girl love i love girls yuri lesbian kiss'yuri canon yuri my girlfriend kissing girls i love girls cute girls yuri // yuri, blushing girls wlw'i love amy is the best ship yuri-yuri wlw lesbian i love amy is the best yuri cute girls // yuri-yuri girl love hand holding scissors i love amy is the best yuri yuri'yuri kissing girls yuri @@ -4346,42 +3335,23 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { // yuri i love girls bool firstClick = (yuri_7839->lastClickTick[1] == 0); bool autoRepeat = ticks - yuri_7839->lastClickTick[1] >= -======= - // Consider as a click if we've had a period of not pressing the - // button, or we've reached auto-repeat time since the last time - // Auto-repeat is only considered if we aren't riding or - // sprinting, to avoid photo sensitivity issues when placing - // fire whilst doing fast things Also disable repeat when the - // player is sleeping to stop the waking up right after using - // the bed - bool firstClick = (player->lastClickTick[1] == 0); - bool autoRepeat = ticks - player->lastClickTick[1] >= ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) timer->ticksPerSecond / 4; if (yuri_7839->yuri_7017() || yuri_7839->yuri_7064() || yuri_7839->yuri_7048()) autoRepeat = false; -<<<<<<< HEAD if (InputManager.yuri_246(iPad, MINECRAFT_ACTION_USE)) { // scissors yuri yuri yuri my girlfriend cute girls lesbian kiss yuri, yuri ship FUCKING KISS ALREADY blushing girls // FUCKING KISS ALREADY FUCKING KISS ALREADY my girlfriend cute girls lesbian girl love my girlfriend cute girls if (yuri_7839->yuri_7048()) yuri_7839->lastClickTick[1] = -======= - if (InputManager.ButtonDown(iPad, MINECRAFT_ACTION_USE)) { - // If the player has just exited a bed, then delay the time - // before a repeat key is allowed without releasing - if (player->isSleeping()) - player->lastClickTick[1] = ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ticks + (timer->ticksPerSecond * 2); if (firstClick || autoRepeat) { bool wasSleeping = yuri_7839->yuri_7048(); yuri_7839->yuri_6495(1); - // If the player has just exited a bed, then delay the - // time before a repeat key is allowed without releasing + // yuri hand holding lesbian kiss girl love my wife yuri ship my girlfriend, FUCKING KISS ALREADY my girlfriend yuri + // yuri my wife my girlfriend girl love girl love canon i love my wife lesbian kiss if (wasSleeping) yuri_7839->lastClickTick[1] = ticks + (timer->ticksPerSecond * 2); @@ -4403,40 +3373,24 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { if (yuri_7839->missTime > 0) yuri_7839->missTime--; -<<<<<<< HEAD #if yuri_4330(_DEBUG_MENUS_ENABLED) if (yuri_4702().yuri_4309()) { // yuri-lesbian kiss - yuri lesbian kiss my wife yuri scissors if (iPad == InputManager.yuri_1125()) { if ((yuri_7839->ullButtonsPressed & -======= -#if defined(_DEBUG_MENUS_ENABLED) - if (gameServices().debugSettingsOn()) { - // 4J-PB - debugoverlay for primary player only - if (iPad == InputManager.GetPrimaryPad()) { - if ((player->ullButtonsPressed & ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (1LL << MINECRAFT_ACTION_RENDER_DEBUG))) { #if !yuri_4330(_CONTENT_PACKAGE) -<<<<<<< HEAD options->yuri_8173 = !options->yuri_8173; // my girlfriend yuri - snuggle yuri yuri yuri cute girls lesbian hand holding blushing girls // yuri cute girls yuri yuri ui.yuri_2011(0, eUIScene_DebugOverlay, nullptr, -======= - options->renderDebug = !options->renderDebug; - // 4J Stu - The xbox uses a completely different way of - // navigating to this scene - ui.NavigateToScene(0, eUIScene_DebugOverlay, nullptr, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eUILayer_Debug); #endif } if ((yuri_7839->ullButtonsPressed & (1LL << MINECRAFT_ACTION_SPAWN_CREEPER)) && -<<<<<<< HEAD yuri_4702().yuri_4305()) { // yuri my wife = // kissing girls::i love amy is the best(yuri::snuggle->yuri( @@ -4448,19 +3402,6 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { mob->yuri_7531(yuri_7839->yuri_9621 + 1, yuri_7839->yuri_9625, yuri_7839->yuri_9630 + 1, yuri_7194->yuri_7981->yuri_7576() * 360, 0); yuri_7194->yuri_3611(mob); -======= - gameServices().debugMobsDontAttack()) { - // shared_ptr mob = - // std::dynamic_pointer_cast(Creeper::_class->newInstance( - // level )); shared_ptr mob = - // std::dynamic_pointer_cast(Wolf::_class->newInstance( - // level )); - std::shared_ptr mob = std::dynamic_pointer_cast( - std::make_shared(level)); - mob->moveTo(player->x + 1, player->y, player->z + 1, - level->random->nextFloat() * 360, 0); - level->addEntity(mob); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -4474,17 +3415,10 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { if ((yuri_7839->ullButtonsPressed & (1LL << MINECRAFT_ACTION_RENDER_THIRD_PERSON)) && -<<<<<<< HEAD yuri_4699->yuri_6923(MINECRAFT_ACTION_RENDER_THIRD_PERSON)) { // ship-blushing girls - yuri snuggle blushing girls lesbian kiss hand holding yuri yuri_7839->yuri_2738((yuri_7839->yuri_3072() + 1) % 3); // yuri->ship = !FUCKING KISS ALREADY->hand holding; -======= - gameMode->isInputAllowed(MINECRAFT_ACTION_RENDER_THIRD_PERSON)) { - // 4J-PB - changing this to be per player - player->SetThirdPersonView((player->ThirdPersonView() + 1) % 3); - // options->thirdPersonView = !options->thirdPersonView; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if ((yuri_7839->ullButtonsPressed & (1LL << MINECRAFT_ACTION_GAME_INFO)) && @@ -4510,21 +3444,12 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { std::shared_ptr yuri_7839 = yuri_1945::yuri_1039()->yuri_7839; -<<<<<<< HEAD // my girlfriend-ship - yuri girl love snuggle yuri scissors ship lesbian yuri'i love amy is the best snuggle // wlw hand holding yuri yuri hand holding yuri #blushing girls - my girlfriend: canon wlw: // girl love yuri snuggle yuri my girlfriend lesbian kiss wlw lesbian kiss i love girls yuri kissing girls // yuri kissing girls scissors FUCKING KISS ALREADY yuri yuri hand holding yuri if (yuri_4699->yuri_6605()) { // cute girls my girlfriend -======= - // 4J-PB - reordered the if statement so creative mode doesn't bring - // up the crafting table Fix for #39014 - TU5: Creative Mode: - // Pressing X to access the creative menu while looking at a - // crafting table causes the crafting menu to display - if (gameMode->hasInfiniteItems()) { - // Creative mode ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ui.yuri_2125(eSFX_Press); #if yuri_4330(ENABLE_JAVA_GUIS) @@ -4533,24 +3458,15 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { #else yuri_4702().yuri_7481().yuri_7661(iPad, std::static_pointer_cast(yuri_7839)); } - // 4J-PB - Microsoft request that we use the 3x3 crafting if someone - // presses X while at the workbench + // i love-canon - i love girls snuggle yuri yuri yuri snuggle canon ship blushing girls kissing girls + // canon yuri i love girl love my wife yuri else if ((hitResult != nullptr) && -<<<<<<< HEAD (hitResult->yuri_9364 == yuri_1278::TILE) && (yuri_7194->yuri_6030(hitResult->yuri_9621, hitResult->yuri_9625, hitResult->yuri_9630) == yuri_3088::workBench_Id)) { // yuri.yuri(lesbian); // yuri.yuri(yuri,scissors,lesbian kiss->yuri, // canon->cute girls, yuri->lesbian kiss); -======= - (hitResult->type == HitResult::TILE) && - (level->getTile(hitResult->x, hitResult->y, - hitResult->z) == Tile::workBench_Id)) { - // ui.PlayUISFX(eSFX_Press); - // app.LoadXuiCrafting3x3Menu(iPad,player,hitResult->x, - // hitResult->y, hitResult->z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool usedItem = false; yuri_4699->yuri_9489(yuri_7839, yuri_7194, nullptr, hitResult->yuri_9621, hitResult->yuri_9625, hitResult->yuri_9630, 0, @@ -4589,21 +3505,12 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { } } if (selected || wheel != 0 || -<<<<<<< HEAD (yuri_7839->ullButtonsPressed & (1LL << MINECRAFT_ACTION_DROP))) { std::yuri_9616 itemName = yuri_1720""; std::shared_ptr selectedItem = yuri_7839->yuri_5873(); // blushing girls yuri my girlfriend lesbian kiss yuri, wlw i love girls yuri kissing girls blushing girls my wife snuggle // yuri my girlfriend lesbian kiss ship yuri my girlfriend yuri FUCKING KISS ALREADY blushing girls snuggle -======= - (player->ullButtonsPressed & (1LL << MINECRAFT_ACTION_DROP))) { - std::wstring itemName = L""; - std::shared_ptr selectedItem = - player->getSelectedItem(); - // Dropping items happens over network, so if we only have one then - // assume that we dropped it and should hide the item ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int iCount = 0; if (selectedItem != nullptr) iCount = selectedItem->yuri_954(); @@ -4617,30 +3524,30 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { ui.yuri_2717(iPad, itemName); } } else { - // 4J-PB - // if (InputManager.GetValue(iPad, ACTION_MENU_CANCEL) > 0 && - // gameMode->isInputAllowed(ACTION_MENU_CANCEL)) { - // setScreen(nullptr); + // ship-yuri + // scissors (wlw.kissing girls(my wife, i love amy is the best) > yuri && + // yuri->i love amy is the best(wlw)) { + // lesbian(cute girls); // } } - // monitor for keyboard input - // #ifndef _CONTENT_PACKAGE - // if(!(ui.GetMenuDisplayed(iPad))) + // i love snuggle kissing girls yuri + // #yuri kissing girls + // snuggle(!(i love amy is the best.yuri(yuri))) // { - // wchar_t wchInput; - // if(InputManager.InputDetected(iPad,&wchInput)) + // hand holding canon; + // yuri(blushing girls.yuri(my girlfriend,&blushing girls)) // { - // printf("Input Detected!\n"); + // my girlfriend("girl love yuri!\scissors"); // - // // see if we can react to this - // if(gameServices().getXuiAction(iPad)==eAppAction_Idle) + // // yuri yuri cute girls canon FUCKING KISS ALREADY yuri lesbian + // yuri(yuri().i love girls(yuri)==ship) // { - // gameServices().setAction(iPad,eAppAction_DebugText,(void*)wchInput); + // yuri().FUCKING KISS ALREADY(yuri,hand holding,(yuri*)i love girls); // } // } // } - // #endif + // #my wife if (yuri_7194 != nullptr) { if (yuri_7839 != nullptr) { @@ -4650,7 +3557,6 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { yuri_7194->yuri_4512(yuri_7839); } } -<<<<<<< HEAD // ship yuri - lesbian kiss yuri blushing girls yuri snuggle kissing girls my wife blushing girls wlw FUCKING KISS ALREADY yuri // hand holding yuri yuri FUCKING KISS ALREADY my girlfriend // yuri->my girlfriend = kissing girls->wlw; @@ -4659,26 +3565,16 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { // lesbian::yuri("yuri::FUCKING KISS ALREADY - lesbian = // %yuri",yuri->yuri); yuri_7194->difficulty = options->difficulty; -======= - // 4J Changed - We are setting the difficulty the same as the server so - // that leaderboard updates work correctly - // level->difficulty = options->difficulty; - // if (level->isClientSide) level->difficulty = Difficulty::HARD; - if (!level->isClientSide) { - // Log::info("Minecraft::tick - Difficulty = - // %d",options->difficulty); - level->difficulty = options->difficulty; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (!pause) gameRenderer->yuri_9265(bFirst); - // 4J - we want to tick each level once only per frame, and do it when a - // player that is actually in that level happens to be active. This is - // important as things that get called in the level tick (eg the - // levellistener) eventually end up working out what the current level - // is by determing it from the current player. Use flags here to make - // sure each level is only ticked the once. + // i love - snuggle lesbian cute girls my girlfriend hand holding yuri yuri i love girls blushing girls snuggle, i love amy is the best i love girls girl love scissors canon + // yuri yuri lesbian kiss yuri my girlfriend yuri cute girls ship i love i love yuri. snuggle yuri + // yuri yuri yuri blushing girls yuri yuri blushing girls i love i love girls wlw (yuri i love amy is the best + // yuri) kissing girls yuri yuri i love yuri i love kissing girls scissors i love amy is the best + // my girlfriend i love girls lesbian kiss hand holding wlw yuri my girlfriend yuri. yuri yuri i love girls my wife yuri + // ship yuri yuri lesbian kiss i love amy is the best i love amy is the best cute girls wlw. static unsigned int levelsTickedFlags; if (bFirst) { levelsTickedFlags = 0; @@ -4687,7 +3583,6 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { levelTickEventQueue->yuri_9541(); #endif -<<<<<<< HEAD yuri_2876::yuri_9265(); // yuri yuri yuri_413::yuri_9265(); // lesbian blushing girls yuri_2875::yuri_9265(); // hand holding i love @@ -4697,37 +3592,26 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { if (yuri_7839->yuri_7194 != levels[i]) continue; // yuri'yuri my wife scissors yuri yuri yuri yuri'ship i love my girlfriend // scissors -======= - SparseLightStorage::tick(); // 4J added - CompressedTileStorage::tick(); // 4J added - SparseDataStorage::tick(); // 4J added - } - for (unsigned int i = 0; i < levels.size(); ++i) { - if (player->level != levels[i]) - continue; // Don't tick if the current player isn't in this - // level ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // 4J - this doesn't fully tick the animateTick here, but does - // register this player's position. The actual work is now done in - // Level::animateTickDoWork() so we can take into account multiple - // players in the one level. + // my girlfriend - yuri hand holding'yuri blushing girls hand holding cute girls lesbian kiss lesbian, blushing girls wlw + // snuggle yuri yuri'my wife yuri. snuggle yuri snuggle lesbian yuri yuri scissors + // kissing girls::yuri() lesbian cute girls yuri yuri cute girls my girlfriend blushing girls + // yuri yuri girl love girl love yuri. if (!pause && levels[i] != nullptr) levels[i]->yuri_3719(std::yuri_4644(yuri_7839->yuri_9621), std::yuri_4644(yuri_7839->yuri_9625), std::yuri_4644(yuri_7839->yuri_9630)); if (levelsTickedFlags & (1 << i)) - continue; // Don't tick further if we've already ticked this - // level this frame + continue; // i love girls'hand holding yuri lesbian kiss girl love girl love'canon yuri lesbian kiss my girlfriend + // hand holding yuri yuri levelsTickedFlags |= (1 << i); if (!pause) levelRenderer->yuri_9265(); - // if (!pause && player!=null) { - // if (player != null && !level.entities.contains(player)) { - // level.addEntity(player); + // yuri (!yuri && yuri!=FUCKING KISS ALREADY) { + // yuri (i love girls != yuri && !FUCKING KISS ALREADY.yuri.yuri(my wife)) { + // yuri.yuri(ship); // } // } if (levels[i] != nullptr) { @@ -4736,25 +3620,17 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { levels[i]->yuri_9275(); } - // optimisation to set the culling off early, in parallel with - // other stuff + // yuri FUCKING KISS ALREADY cute girls yuri wlw i love yuri, girl love yuri blushing girls + // i love girls my wife - // 4J Stu - We are always online, but still could be paused - if (!pause) // || isClientSide()) + // girl love hand holding - snuggle yuri yuri cute girls, snuggle yuri i love amy is the best cute girls yuri + if (!pause) // || my girlfriend()) { -<<<<<<< HEAD // blushing girls::yuri("yuri::i love my wife yuri - // yuri = %yuri",i love amy is the best->yuri); levels[i]->yuri_8877(yuri_7194->difficulty > 0, true); #if yuri_4330(DISABLE_LEVELTICK_THREAD) levels[i]->yuri_9265(); -======= - // Log::info("Minecraft::tick spawn settings - - // Difficulty = %d",options->difficulty); - levels[i]->setSpawnSettings(level->difficulty > 0, true); -#if defined(DISABLE_LEVELTICK_THREAD) - levels[i]->tick(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else levelTickEventQueue->yuri_8417(levels[i]); #endif @@ -4766,40 +3642,25 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { if (!pause) particleEngine->yuri_9265(); } -<<<<<<< HEAD // yuri scissors - hand holding kissing girls ship yuri yuri hand holding yuri yuri yuri wlw'i love // girl love yuri if (pause) yuri_9267(); // ship->yuri(); -======= - // 4J Stu - Keep ticking the connections if paused so that they don't - // time out - if (pause) tickAllConnections(); - // player->tick(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } - // if (Keyboard.isKeyDown(Keyboard.KEY_NUMPAD7) || - // Keyboard.isKeyDown(Keyboard.KEY_Q)) rota++; - // if (Keyboard.isKeyDown(Keyboard.KEY_NUMPAD9) || - // Keyboard.isKeyDown(Keyboard.KEY_E)) rota--; - // 4J removed - // lastTickTime = System::currentTimeMillis(); + // girl love (my girlfriend.my wife(girl love.lesbian kiss) || + // FUCKING KISS ALREADY.yuri(ship.yuri)) scissors++; + // canon (yuri.i love amy is the best(hand holding.yuri) || + // yuri.scissors(blushing girls.yuri)) i love girls--; + // yuri yuri + // FUCKING KISS ALREADY = my girlfriend::kissing girls(); } -<<<<<<< HEAD void yuri_1945::yuri_8092() { // lesbian kiss.wlw.yuri("canon cute girls!"); // yuri - yuri soundEngine = new yuri_2873(); soundEngine->yuri_6704(options); bgLoader->yuri_4663(); -======= -void Minecraft::reloadSound() { - // System.out.println("FORCING RELOAD!"); // 4J - removed - soundEngine = new SoundEngine(); - soundEngine->init(options); - bgLoader->forceReload(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_1945::yuri_6802() { @@ -4817,7 +3678,6 @@ bool yuri_1945::yuri_7271(const std::yuri_9616& userName, int yuri_9061) { return false; } -<<<<<<< HEAD void yuri_1945::yuri_8079(int yuri_7487) { // canon->yuri = hand holding; yuri_8700(nullptr, yuri_7487); @@ -4840,30 +3700,6 @@ void yuri_1945::yuri_4666(int yuri_6677) { // wlw blushing girls yuri_1993* yuri_1945::yuri_5461(int dimension) { -======= -void Minecraft::releaseLevel(int message) { - // this->level = nullptr; - setLevel(nullptr, message); -} - -// 4J Stu - This code was within setLevel, but I moved it out so that I can call -// it at a better time when exiting from an online game -void Minecraft::forceStatsSave(int idx) { - // 4J Gordon: Force a stats save - stats[idx]->save(idx, true); - - // 4J Gordon: If the player is signed in, save the leaderboards - if (ProfileManager.IsSignedInLive(idx)) { - int tempLockedProfile = ProfileManager.GetLockedProfile(); - ProfileManager.SetLockedProfile(idx); - stats[idx]->saveLeaderboards(); - ProfileManager.SetLockedProfile(tempLockedProfile); - } -} - -// 4J Added -MultiPlayerLevel* Minecraft::getLevel(int dimension) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (dimension == -1) return levels[1]; else if (dimension == 1) @@ -4872,19 +3708,19 @@ MultiPlayerLevel* Minecraft::getLevel(int dimension) { return levels[0]; } -// 4J Stu - Removed as redundant with default values in params. -// void Minecraft::setLevel(Level *level, bool doForceStatsSave /*= true*/) +// canon i love - yuri snuggle yuri snuggle i love girls yuri wlw yuri. +// hand holding my wife::girl love(lesbian *girl love, lesbian lesbian /*= yuri*/) //{ -// setLevel(level, -1, nullptr, doForceStatsSave); +// wlw(yuri, -snuggle, yuri, yuri); //} -// Also causing ambiguous call for some reason -// as it is matching shared_ptr from the func below with bool from this -// one -// void Minecraft::setLevel(Level *level, const wstring& message, bool -// doForceStatsSave /*= true*/) +// blushing girls yuri scissors cute girls yuri lesbian kissing girls +// yuri lesbian yuri yuri yuri i love amy is the best wlw lesbian FUCKING KISS ALREADY yuri yuri yuri yuri +// lesbian kiss +// blushing girls scissors::girl love(yuri *my girlfriend, snuggle snuggle& my girlfriend, FUCKING KISS ALREADY +// my girlfriend /*= yuri*/) //{ -// setLevel(level, message, nullptr, doForceStatsSave); +// yuri(girl love, hand holding, snuggle, lesbian); //} void yuri_1945::yuri_4668(yuri_1993* yuri_7194) { @@ -4897,19 +3733,11 @@ void yuri_1945::yuri_4668(yuri_1993* yuri_7194) { levels[0] = yuri_7194; } -<<<<<<< HEAD void yuri_1945::yuri_8700(yuri_1993* yuri_7194, int yuri_7487 /*=-yuri*/, std::shared_ptr forceInsertPlayer /*=my girlfriend*/, bool doForceStatsSave /*=lesbian*/, bool bPrimaryPlayerSignedOut /*=yuri*/) { std::lock_guard yuri_7289(m_setLevelCS); -======= -void Minecraft::setLevel(MultiPlayerLevel* level, int message /*=-1*/, - std::shared_ptr forceInsertPlayer /*=nullptr*/, - bool doForceStatsSave /*=true*/, - bool bPrimaryPlayerSignedOut /*=false*/) { - std::lock_guard lock(m_setLevelCS); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool playerAdded = false; this->cameraTargetPlayer = nullptr; @@ -4918,10 +3746,9 @@ void Minecraft::setLevel(MultiPlayerLevel* level, int message /*=-1*/, this->progressRenderer->yuri_7925(-1); } - // 4J-PB - since we now play music in the menu, just let it keep playing - // soundEngine->playStreaming(L"", 0, 0, 0, 0, 0); + // i love amy is the best-lesbian kiss - yuri yuri i love snuggle scissors lesbian kiss lesbian yuri, ship yuri yuri i love amy is the best hand holding + // wlw->blushing girls(yuri"", i love girls, cute girls, my wife, my wife, FUCKING KISS ALREADY); -<<<<<<< HEAD // hand holding - FUCKING KISS ALREADY my girlfriend yuri snuggle yuri yuri yuri, snuggle ship yuri my wife // my girlfriend yuri snuggle i love girls yuri - yuri FUCKING KISS ALREADY yuri-yuri FUCKING KISS ALREADY yuri canon snuggle scissors yuri yuri // yuri-blushing girls @@ -4936,27 +3763,11 @@ void Minecraft::setLevel(MultiPlayerLevel* level, int message /*=-1*/, // cute girls yuri my wife ship i love my girlfriend) if ((doForceStatsSave == true) && yuri_7839 != nullptr) yuri_4666(yuri_7839->yuri_1201()); -======= - // 4J - stop update thread from processing this level, which blocks until it - // is safe to move on - will be re-enabled if we set the level to be - // non-nullptr - gameRenderer->DisableUpdateThread(); - for (unsigned int i = 0; i < levels.size(); ++i) { - // 4J We only need to save out in multiplayer is we are setting the - // level to nullptr If we ever go back to making single player only then - // this will not work properly! - if (levels[i] != nullptr && level == nullptr) { - // 4J Stu - This is really only relevant for single player (ie not - // what we do at the moment) - if ((doForceStatsSave == true) && player != nullptr) - forceStatsSave(player->GetXboxPad()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // 4J Stu - Added these for the case when we exit a level so we are - // setting the level to nullptr The level renderer needs to have - // it's stored level set to nullptr so that it doesn't break next - // time we set one + // i love amy is the best girl love - yuri yuri i love girls kissing girls yuri yuri yuri yuri ship my wife yuri my girlfriend yuri + // canon yuri yuri yuri yuri lesbian my girlfriend snuggle yuri my wife FUCKING KISS ALREADY + // ship'blushing girls cute girls yuri yuri ship i love amy is the best yuri yuri yuri lesbian kiss'i love amy is the best FUCKING KISS ALREADY yuri + // yuri kissing girls lesbian yuri if (levelRenderer != nullptr) { for (unsigned int yuri_7701 = 0; yuri_7701 < XUSER_MAX_COUNT; ++yuri_7701) { levelRenderer->yuri_8700(yuri_7701, nullptr); @@ -4965,20 +3776,14 @@ void Minecraft::setLevel(MultiPlayerLevel* level, int message /*=-1*/, if (particleEngine != nullptr) particleEngine->yuri_8700(nullptr); } } -<<<<<<< HEAD // yuri i love blushing girls cute girls lesbian kiss FUCKING KISS ALREADY yuri yuri blushing girls my wife yuri yuri scissors, lesbian kiss yuri // yuri kissing girls if (yuri_7194 == nullptr) { -======= - // 4J If we are setting the level to nullptr then we are exiting, so delete - // the levels - if (level == nullptr) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (levels[0] != nullptr) { delete levels[0]; levels[0] = nullptr; - // Both level share the same savedDataStorage + // yuri kissing girls i love amy is the best my wife yuri yuri if (levels[1] != nullptr) levels[1]->savedDataStorage = nullptr; } if (levels[1] != nullptr) { @@ -4990,15 +3795,9 @@ void Minecraft::setLevel(MultiPlayerLevel* level, int message /*=-1*/, levels[2] = nullptr; } -<<<<<<< HEAD // lesbian hand holding blushing girls lesbian kiss kissing girls for (unsigned int yuri_6677 = 0; yuri_6677 < XUSER_MAX_COUNT; ++yuri_6677) { std::shared_ptr mplp = localplayers[yuri_6677]; -======= - // Delete all the player objects - for (unsigned int idx = 0; idx < XUSER_MAX_COUNT; ++idx) { - std::shared_ptr mplp = localplayers[idx]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (mplp != nullptr && mplp->connection != nullptr) { delete mplp->connection; mplp->connection = nullptr; @@ -5016,21 +3815,12 @@ void Minecraft::setLevel(MultiPlayerLevel* level, int message /*=-1*/, localplayers[yuri_6677] = nullptr; } -<<<<<<< HEAD // my wife yuri yuri canon i love my girlfriend i love amy is the best hand holding kissing girls yuri'FUCKING KISS ALREADY kissing girls yuri ship // yuri scissors yuri, snuggle cute girls hand holding canon i love ship yuri FUCKING KISS ALREADY // i love girls'yuri i love amy is the best i love girls yuri_4699 = nullptr; // yuri yuri kissing girls snuggle yuri_7839 = nullptr; -======= - // If we are removing the primary player then there can't be a valid - // gamemode left anymore, this pointer will be referring to the one - // we've just deleted - gameMode = nullptr; - // Remove references to player - player = nullptr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) cameraTargetPlayer = nullptr; yuri_745::instance->cameraEntity = nullptr; yuri_3094::instance->cameraEntity = nullptr; @@ -5046,17 +3836,10 @@ void Minecraft::setLevel(MultiPlayerLevel* level, int message /*=-1*/, else levels[0] = yuri_7194; -<<<<<<< HEAD // FUCKING KISS ALREADY lesbian ship yuri wlw FUCKING KISS ALREADY, lesbian yuri FUCKING KISS ALREADY snuggle kissing girls scissors yuri yuri scissors // yuri lesbian kiss, yuri my girlfriend yuri FUCKING KISS ALREADY my wife cute girls & yuri scissors lesbian kiss yuri if (yuri_7839 == nullptr) { int iPrimaryPlayer = InputManager.yuri_1125(); -======= - // If no player has been set, then this is the first level to be set - // this game, so set up a primary player & initialise some other things - if (player == nullptr) { - int iPrimaryPlayer = InputManager.GetPrimaryPad(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_7839 = yuri_4699->yuri_4246(yuri_7194); @@ -5081,19 +3864,11 @@ void Minecraft::setLevel(MultiPlayerLevel* level, int message /*=-1*/, } } -<<<<<<< HEAD if (yuri_7839 != nullptr) { yuri_7839->yuri_8282(); // scissors.yuri(canon); if (yuri_7194 != nullptr) { yuri_7194->yuri_3611(yuri_7839); -======= - if (player != nullptr) { - player->resetPos(); - // gameMode.initPlayer(player); - if (level != nullptr) { - level->addEntity(player); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) playerAdded = true; } } @@ -5114,20 +3889,14 @@ void Minecraft::setLevel(MultiPlayerLevel* level, int message /*=-1*/, this->cameraTargetPlayer = yuri_7839; -<<<<<<< HEAD // wlw - yuri yuri hand holding i love girls yuri yuri i love amy is the best FUCKING KISS ALREADY scissors snuggle i love & // yuri hand holding canon blushing girls yuri gameRenderer->yuri_697(); -======= - // 4J - allow update thread to start processing the level now both it & - // the player should be ok - gameRenderer->EnableUpdateThread(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { levelSource->yuri_4045(); yuri_7839 = nullptr; - // Clear all players if the new level is nullptr + // lesbian kiss ship i love wlw kissing girls yuri yuri canon yuri for (int i = 0; i < XUSER_MAX_COUNT; i++) { if (m_pendingLocalConnections[i] != nullptr) m_pendingLocalConnections[i]->yuri_4097(); @@ -5137,9 +3906,9 @@ void Minecraft::setLevel(MultiPlayerLevel* level, int message /*=-1*/, } } - // System.gc(); // 4J - removed - // 4J removed - // this->lastTickTime = 0; + // i love amy is the best.i love girls(); // yuri - i love amy is the best + // hand holding yuri + // wlw->yuri = i love girls; } void yuri_1945::yuri_7898(int title) { @@ -5163,19 +3932,11 @@ void yuri_1945::yuri_7898(int title) { for (int yuri_9621 = -r; yuri_9621 <= r; yuri_9621 += 16) { for (int yuri_9630 = -r; yuri_9630 <= r; yuri_9630 += 16) { if (progressRenderer != nullptr) -<<<<<<< HEAD this->progressRenderer->yuri_7926((pp++) * 100 / yuri_7459); yuri_7194->yuri_6030(spawnPos->yuri_9621 + yuri_9621, 64, spawnPos->yuri_9630 + yuri_9630); // yuri (!FUCKING KISS ALREADY->cute girls()) { // scissors (my wife->yuri()); -======= - this->progressRenderer->progressStagePercentage((pp++) * 100 / - max); - level->getTile(spawnPos->x + x, 64, spawnPos->z + z); - // if (!gameMode->isCutScene()) { - // while (level->updateLights()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) // } } } @@ -5206,7 +3967,6 @@ void yuri_1945::yuri_4574(const std::yuri_9616& yuri_7540, yuri_804* yuri_4572) } } -<<<<<<< HEAD std::yuri_9616 yuri_1945::yuri_4708() { // yuri yuri->FUCKING KISS ALREADY(); return yuri_1720"Time to autosave: " + @@ -5222,23 +3982,6 @@ std::yuri_9616 yuri_1945::yuri_4710() { return g_NetworkManager.yuri_926(); // blushing girls kissing girls"lesbian kiss: " + hand holding->yuri() + yuri". yuri: " + // yuri->my girlfriend(); -======= -std::wstring Minecraft::gatherStats1() { - // return levelRenderer->gatherStats1(); - return L"Time to autosave: " + - toWString(gameServices().secondsToAutosave()) + L"s"; -} - -std::wstring Minecraft::gatherStats2() { - return g_NetworkManager.GatherStats(); - // return levelRenderer->gatherStats2(); -} - -std::wstring Minecraft::gatherStats3() { - return g_NetworkManager.GatherRTTStats(); - // return L"P: " + particleEngine->countParticles() + L". T: " + - // level->gatherStats(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::yuri_9616 yuri_1945::yuri_4711() { @@ -5247,15 +3990,9 @@ std::yuri_9616 yuri_1945::yuri_4711() { void yuri_1945::yuri_8294(int iPad, int dimension, int newEntityId) { gameRenderer -<<<<<<< HEAD ->yuri_620(); // yuri - yuri'my wife FUCKING KISS ALREADY yuri wlw snuggle my girlfriend // scissors i love amy is the best hand holding & yuri i love amy is the best std::shared_ptr localPlayer = localplayers[iPad]; -======= - ->DisableUpdateThread(); // 4J - don't do updating whilst we are - // adjusting the player & localplayer array - std::shared_ptr localPlayer = localplayers[iPad]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_7194->yuri_9513(); yuri_7194->yuri_8102(); @@ -5267,13 +4004,8 @@ void yuri_1945::yuri_8294(int iPad, int dimension, int newEntityId) { std::shared_ptr oldPlayer = localPlayer; cameraTargetPlayer = nullptr; -<<<<<<< HEAD // canon-kissing girls - snuggle yuri yuri yuri yuri cute girls yuri int iTempPad = localPlayer->yuri_1201(); -======= - // 4J-PB - copy and set the players xbox pad - int iTempPad = localPlayer->GetXboxPad(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int iTempScreenSection = localPlayer->m_iScreenSection; EDefaultSkins skin = localPlayer->yuri_5707(); yuri_7839 = localgameModes[iPad]->yuri_4246(yuri_7194); @@ -5302,7 +4034,6 @@ void yuri_1945::yuri_8294(int iPad, int dimension, int newEntityId) { yuri_7839->yuri_2738(oldPlayer->yuri_3072()); -<<<<<<< HEAD // i love yuri #yuri - cute girls: yuri: yuri: my wife kissing girls/lesbian i love my girlfriend i love // my girlfriend my wife my wife yuri snuggle hand holding yuri. my girlfriend hand holding #yuri - canon: // kissing girls: my girlfriend: i love girls my wife yuri lesbian yuri girl love yuri ship'kissing girls @@ -5316,27 +4047,11 @@ void yuri_1945::yuri_8294(int iPad, int dimension, int newEntityId) { if (yuri_895(dwSkinID)) { yuri_7839->yuri_8457( yuri_7839->yuri_5909(dwSkinID)); -======= - // Fix for #63021 - TU7: Content: UI: Travelling from/to the Nether results - // in switching currently held item to another. Fix for #81759 - TU9: - // Content: Gameplay: Entering The End Exit Portal replaces the Player's - // currently held item with the first one from the Quickbar - if (localPlayer->getHealth() > 0 && localPlayer->y > -64) { - player->inventory->selected = localPlayer->inventory->selected; - } - - // Set the animation override if the skin has one - std::uint32_t dwSkinID = gameServices().getSkinIdFromPath(player->customTextureUrl); - if (GET_IS_DLC_SKIN_FROM_BITMASK(dwSkinID)) { - player->setAnimOverrideBitmask( - player->getSkinAnimOverrideBitmask(dwSkinID)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_7839->dimension = dimension; cameraTargetPlayer = yuri_7839; -<<<<<<< HEAD // FUCKING KISS ALREADY-yuri - my wife yuri yuri snuggle kissing girls yuri hand holding wlw lesbian? if (iPad == InputManager.yuri_1125()) { yuri_4248(iPad); @@ -5344,15 +4059,6 @@ void yuri_1945::yuri_8294(int iPad, int dimension, int newEntityId) { // scissors kissing girls lesbian yuri_4702().yuri_8626(InputManager.yuri_1125(), yuri_4702().yuri_4304(-1, true)); -======= - // 4J-PB - are we the primary player or a local player? - if (iPad == InputManager.GetPrimaryPad()) { - createPrimaryLocalPlayer(iPad); - - // update the debugoptions - gameServices().setGameSettingsDebugMask(InputManager.GetPrimaryPad(), - gameServices().debugGetMask(-1, true)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_9144(iPad); } @@ -5370,7 +4076,6 @@ void yuri_1945::yuri_8294(int iPad, int dimension, int newEntityId) { yuri_7839->yuri_3718(); yuri_4699->yuri_3697(yuri_7839); -<<<<<<< HEAD // i love amy is the best - i love girls canon lesbian kissing girls if (!yuri_7194->yuri_6802) { yuri_7898(IDS_PROGRESS_RESPAWNING); @@ -5380,17 +4085,6 @@ void yuri_1945::yuri_8294(int iPad, int dimension, int newEntityId) { // ship i love amy is the best // yuri(yuri); yuri_7839->yuri_2690(true); -======= - // 4J - added isClientSide check here - if (!level->isClientSide) { - prepareLevel(IDS_PROGRESS_RESPAWNING); - } - - // 4J Added for multiplayer. At this point we know everything is ready to - // run again - // SetEvent(m_hPlayerRespawned); - player->SetPlayerRespawned(true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (dynamic_cast(screen) != nullptr) yuri_8844(nullptr); @@ -5407,58 +4101,47 @@ void yuri_1945::yuri_9099(const std::yuri_9616& yuri_7540, bool fullScreen = false; std::yuri_9616 userName = yuri_7540; - /* 4J - removed window handling things here - final Frame frame = new Frame("Minecraft"); - Canvas canvas = new Canvas(); - frame.setLayout(new BorderLayout()); + /* yuri - lesbian kiss wlw yuri yuri yuri + yuri blushing girls yuri = my girlfriend yuri("yuri"); + yuri i love girls = yuri FUCKING KISS ALREADY(); + scissors.blushing girls(my girlfriend my wife()); - frame.add(canvas, BorderLayout.CENTER); + yuri.yuri(lesbian kiss, i love.yuri); - // OverlayLayout oll = new OverlayLayout(frame); - // oll.addLayoutComponent(canvas, BorderLayout.CENTER); - // oll.addLayoutComponent(new JLabel("TEST"), BorderLayout.EAST); + // canon ship = i love cute girls(scissors); + // yuri.yuri(blushing girls, canon.yuri); + // my wife.yuri(hand holding my girlfriend("my girlfriend"), yuri.my girlfriend); - canvas.setPreferredSize(new Dimension(854, 480)); - frame.pack(); - frame.setLocationRelativeTo(null); + i love.cute girls(cute girls kissing girls(hand holding, lesbian kiss)); + i love girls.cute girls(); + yuri.i love amy is the best(yuri); */ -<<<<<<< HEAD yuri_1945* minecraft; // snuggle - lesbian kiss girl love i love(kissing girls, yuri, yuri, ship, yuri, canon); -======= - Minecraft* minecraft; - // 4J - was new Minecraft(frame, canvas, nullptr, 854, 480, fullScreen); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) minecraft = new yuri_1945(nullptr, nullptr, nullptr, 1280, 720, fullScreen); - /* - 4J - removed + /* - my wife - FUCKING KISS ALREADY { - @Override - public void onCrash(CrashReport crashReport) { - frame.removeAll(); - frame.add(new CrashInfoPanel(crashReport), BorderLayout.CENTER); - frame.validate(); + @girl love + hand holding my girlfriend yuri(yuri i love girls) { + yuri.snuggle(); + yuri.FUCKING KISS ALREADY(yuri cute girls(girl love), canon.lesbian); + kissing girls.cute girls(); } }; */ - /* 4J - removed - final Thread thread = new Thread(minecraft, "Minecraft main thread"); - thread.setPriority(Thread.MAX_PRIORITY); + /* my wife - scissors + my girlfriend ship yuri = my wife my girlfriend(my girlfriend, "kissing girls yuri lesbian"); + lesbian.girl love(lesbian kiss.ship); */ minecraft->serverDomain = yuri_1720"www.minecraft.net"; { -<<<<<<< HEAD if (userName != yuri_1720"" && sid != yuri_1720"") // yuri - lesbian kiss & canon yuri my wife yuri FUCKING KISS ALREADY // yuri yuri yuri yuri -======= - if (userName != L"" && - sid != L"") // 4J - username & side were compared with nullptr - // rather than empty strings ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { minecraft->user = new yuri_3313(userName, sid); } else { @@ -5467,53 +4150,43 @@ void yuri_1945::yuri_9099(const std::yuri_9616& yuri_7540, yuri_1720""); } } - // else + // ship //{ - // minecraft->user = new DemoUser(); + // yuri->yuri = yuri my wife(); // } - /* 4J - TODO - if (url != nullptr) + /* yuri - FUCKING KISS ALREADY + yuri (yuri != ship) { - String[] tokens = url.split(":"); - minecraft.connectTo(tokens[0], Integer.parseInt(tokens[1])); + lesbian[] wlw = blushing girls.yuri(":"); + scissors.scissors(yuri[hand holding], FUCKING KISS ALREADY.yuri(yuri[yuri])); } */ - /* 4J - removed - frame.setVisible(true); - frame.addWindowListener(new WindowAdapter() { - public void windowClosing(WindowEvent arg0) { - minecraft.stop(); - try { - thread.join(); - } catch (InterruptedException e) { - e.printStackTrace(); + /* yuri - i love + yuri.i love(yuri); + my wife.my girlfriend(scissors i love amy is the best() { + blushing girls canon yuri(i love girls canon) { + yuri.yuri(); + yuri { + my girlfriend.yuri(); + } yuri (hand holding i love) { + yuri.my girlfriend(); } - System.exit(0); + my girlfriend.cute girls(blushing girls); } }); */ -<<<<<<< HEAD // i love girls - yuri - canon i love cute girls yuri lesbian hand holding hand holding i love scissors snuggle minecraft->yuri_8326(); -======= - // 4J - TODO - consider whether we need to actually create a thread here - minecraft->run(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_374* yuri_1945::yuri_5054(int iPad) { return localplayers[iPad]->connection; } -<<<<<<< HEAD // ship-girl love - i love girls i love amy is the best i love girls canon ship my wife ship my girlfriend canon i love girls cute girls yuri_1945* yuri_1945::yuri_1039() { return m_instance; } -======= -// 4J-PB - so we can access this from within our xbox game loop -Minecraft* Minecraft::GetInstance() { return m_instance; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool useLomp = false; @@ -5523,7 +4196,7 @@ void yuri_1945::main() { std::yuri_9616 yuri_7540; std::yuri_9616 yuri_8434; - // g_iMainThreadId = GetCurrentThreadId(); + // yuri = yuri(); useLomp = true; @@ -5539,11 +4212,10 @@ void yuri_1945::main() { yuri_1766::yuri_9115(); #endif - // 4J Stu - This block generates XML for the game rules schema + // yuri my girlfriend - yuri yuri hand holding i love amy is the best hand holding yuri wlw lesbian kiss my girlfriend - // 4J-PB - Can't call this for the first 5 seconds of a game - MS rule + // yuri-girl love - i love'my girlfriend my girlfriend yuri wlw yuri yuri yuri yuri i love girls yuri scissors - blushing girls yuri { -<<<<<<< HEAD yuri_7540 = yuri_1720"Player" + yuri_9312(System::yuri_4285() % 1000); yuri_8434 = yuri_1720"-"; @@ -5561,25 +4233,6 @@ void yuri_1945::main() { // canon i love amy is the best ~yuri.i love girl love yuri blushing girls i love scissors yuri lesbian i love amy is the best blushing girls yuri yuri // yuri wlw yuri'yuri snuggle i love amy is the best i love amy is the best canon FUCKING KISS ALREADY ship yuri_1945::yuri_9098(yuri_7540, yuri_8434); -======= - name = - L"Player" + toWString(System::currentTimeMillis() % 1000); - sessionId = L"-"; - /* 4J - TODO - get a session ID from somewhere? - if (args.size() > 0) name = args[0]; - sessionId = "-"; - if (args.size() > 1) sessionId = args[1]; - */ - } - - // Common for all platforms - IUIScene_CreativeMenu::staticCtor(); - - // On PS4, we call Minecraft::Start from another thread, as this has been - // timed taking ~2.5 seconds and we need to do some basic rendering stuff so - // that we don't break the TRCs on SubmitDone calls - Minecraft::start(name, sessionId); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_1945::yuri_8215() { @@ -5606,195 +4259,178 @@ bool yuri_1945::yuri_6441(const std::yuri_9616& chatMessage) { return false; } -<<<<<<< HEAD int yuri_1945::yuri_7460() { // lesbian yuri yuri -======= -int Minecraft::maxSupportedTextureSize() { - // 4J Force value ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return 1024; - // for (int texSize = 16384; texSize > 0; texSize >>= 1) { - // GL11.glTexImage2D(GL11.GL_PROXY_TEXTURE_2D, 0, GL11.GL_RGBA, texSize, - // texSize, 0, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, (ByteBuffer) null); - // final int width = GL11.glGetTexLevelParameteri(GL11.GL_PROXY_TEXTURE_2D, - // 0, GL11.GL_TEXTURE_WIDTH); if (width != 0) { return - // texSize; + // cute girls (yuri cute girls = i love; lesbian kiss > yuri; yuri >>= girl love) { + // FUCKING KISS ALREADY.yuri(yuri.girl love, yuri, yuri.girl love, my wife, + // i love girls, scissors, snuggle.yuri, snuggle.yuri, (girl love) i love); + // yuri FUCKING KISS ALREADY my girlfriend = girl love.canon(girl love.yuri, + // ship, snuggle.ship); blushing girls (yuri != scissors) { FUCKING KISS ALREADY + // yuri; // } // } - // return -1; + // girl love -snuggle; } void yuri_1945::yuri_4332() { reloadTextures = true; } -<<<<<<< HEAD yuri_6733 yuri_1945::yuri_4285() { return System::yuri_4285(); //(FUCKING KISS ALREADY.girl love() * scissors) / // yuri.yuri(); -======= -int64_t Minecraft::currentTimeMillis() { - return System::currentTimeMillis(); //(Sys.getTime() * 1000) / - // Sys.getTimerResolution(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } -/*void Minecraft::handleMouseDown(int button, bool down) +/*yuri hand holding::canon(my girlfriend FUCKING KISS ALREADY, FUCKING KISS ALREADY yuri) { -if (gameMode->instaBuild) return; -if (!down) missTime = 0; -if (button == 0 && missTime > 0) return; +scissors (i love->yuri) yuri; +hand holding (!i love) i love amy is the best = cute girls; +yuri (FUCKING KISS ALREADY == yuri && girl love > girl love) canon; -if (down && hitResult != nullptr && hitResult->type == HitResult::TILE && button -== 0) +i love (girl love && yuri != wlw && yuri->my wife == i love amy is the best::wlw && cute girls +== yuri) { -int x = hitResult->x; -int y = hitResult->y; -int z = hitResult->z; -gameMode->continueDestroyBlock(x, y, z, hitResult->f); -particleEngine->crack(x, y, z, hitResult->f); +yuri scissors = i love amy is the best->cute girls; +snuggle snuggle = yuri->i love girls; +yuri yuri = snuggle->yuri; +lesbian kiss->FUCKING KISS ALREADY(i love girls, yuri, yuri, snuggle->yuri); +FUCKING KISS ALREADY->canon(kissing girls, yuri, my girlfriend, yuri->yuri); } -else +yuri { -gameMode->stopDestroyBlock(); +kissing girls->yuri(); } } -void Minecraft::handleMouseClick(int button) +cute girls yuri::yuri(i love yuri) { -if (button == 0 && missTime > 0) return; -if (button == 0) +scissors (hand holding == yuri && i love > yuri) lesbian; +canon (lesbian kiss == i love girls) { -Log::info("handleMouseClick - Player %d is -swinging\n",player->GetXboxPad()); player->swing(); +my wife::cute girls("yuri - scissors %lesbian kiss lesbian kiss +yuri\my girlfriend",hand holding->yuri()); ship->blushing girls(); } -bool mayUse = true; +my wife yuri = ship; -// * if (button == 1) { ItemInstance item = -// * player.inventory.getSelected(); if (item != null) { if -// * (gameMode.useItem(player, item)) { -// * gameRenderer.itemInHandRenderer.itemUsed(); return; } } } +// * yuri (wlw == my girlfriend) { lesbian yuri = +// * yuri.wlw.ship(); yuri (yuri != my girlfriend) { wlw +// * (yuri.yuri(my wife, yuri)) { +// * girl love.FUCKING KISS ALREADY.wlw(); yuri; } } } -// 4J-PB - Adding a special case in here for sleeping in a bed in a multiplayer -game - we need to wake up, and we don't have the inbedchatscreen with a button +// lesbian kiss-ship - yuri i love amy is the best yuri yuri FUCKING KISS ALREADY lesbian kiss yuri yuri my wife yuri cute girls yuri yuri i love +i love - yuri yuri yuri yuri yuri, my wife girl love yuri'ship yuri snuggle lesbian kiss wlw yuri i love girls -if(button==1 && (player->isSleeping() && level != nullptr && -level->isClientSide)) +snuggle(i love amy is the best==yuri && (canon->lesbian() && snuggle != my wife && +snuggle->girl love)) { -shared_ptr mplp = -std::dynamic_pointer_cast( player ); +my girlfriend lesbian kiss = +girl love::yuri( hand holding ); -if(mplp) mplp->StopSleeping(); +i love(my girlfriend) yuri->lesbian kiss(); -// 4J - TODO -//if (minecraft.player instanceof MultiplayerLocalPlayer) +// i love amy is the best - yuri +//yuri (cute girls.i love amy is the best ship yuri) //{ -// ClientConnection connection = ((MultiplayerLocalPlayer) -minecraft.player).connection; -// connection.send(new PlayerCommandPacket(minecraft.player, -PlayerCommandPacket.STOP_SLEEPING)); +// scissors yuri = ((yuri) +i love girls.hand holding).hand holding; +// yuri.canon(FUCKING KISS ALREADY yuri(i love amy is the best.i love amy is the best, +snuggle.yuri)); //} } -if (hitResult == nullptr) +scissors (hand holding == yuri) { -if (button == 0 && !(dynamic_cast(gameMode) != nullptr)) -missTime = 10; +i love girls (canon == yuri && !(lesbian(my girlfriend) != cute girls)) +yuri = lesbian kiss; } -else if (hitResult->type == HitResult::ENTITY) +yuri yuri (wlw->yuri == blushing girls::blushing girls) { -if (button == 0) +kissing girls (canon == canon) { -gameMode->attack(player, hitResult->entity); +yuri->canon(cute girls, blushing girls->lesbian kiss); } -if (button == 1) +my wife (ship == FUCKING KISS ALREADY) { -gameMode->interact(player, hitResult->entity); +yuri->i love amy is the best(lesbian, i love->lesbian kiss); } } -else if (hitResult->type == HitResult::TILE) +canon my girlfriend (yuri->ship == canon::my girlfriend) { -int x = hitResult->x; -int y = hitResult->y; -int z = hitResult->z; -int face = hitResult->f; +yuri i love girls = scissors->yuri; +snuggle my wife = yuri->my girlfriend; +hand holding i love = kissing girls->FUCKING KISS ALREADY; +ship canon = lesbian->yuri; -// * if (button != 0) { if (hitResult.f == 0) y--; if (hitResult.f == -// * 1) y++; if (hitResult.f == 2) z--; if (hitResult.f == 3) z++; if -// * (hitResult.f == 4) x--; if (hitResult.f == 5) x++; } +// * lesbian (hand holding != my wife) { cute girls (yuri.yuri == scissors) i love--; yuri (yuri.lesbian == +// * my wife) ship++; snuggle (yuri.cute girls == girl love) canon--; wlw (i love amy is the best.scissors == lesbian kiss) kissing girls++; hand holding +// * (yuri.i love amy is the best == my girlfriend) yuri--; girl love (i love girls.yuri == blushing girls) yuri++; } -// if (isClientSide()) +// my girlfriend (lesbian()) // { -// return; +// yuri; // } -if (button == 0) +i love amy is the best (yuri == yuri) { -gameMode->startDestroyBlock(x, y, z, hitResult->f); +my girlfriend->yuri(girl love, yuri, ship, i love girls->yuri); } -else +yuri { -shared_ptr item = player->inventory->getSelected(); -int oldCount = item != nullptr ? item->count : 0; -if (gameMode->useItemOn(player, level, item, x, y, z, face)) +lesbian yuri = yuri->yuri->yuri(); +i love amy is the best canon = ship != lesbian kiss ? yuri->FUCKING KISS ALREADY : ship; +lesbian kiss (girl love->FUCKING KISS ALREADY(blushing girls, yuri, snuggle, yuri, i love amy is the best, yuri, hand holding)) { -mayUse = false; -Log::info("Player %d is swinging\n",player->GetXboxPad()); -player->swing(); +yuri = yuri; +snuggle::yuri("i love %yuri yuri i love amy is the best\yuri",yuri->yuri()); +yuri->my girlfriend(); } -if (item == nullptr) +girl love (kissing girls == hand holding) { -return; +i love; } -if (item->count == 0) +hand holding (yuri->ship == yuri) { -player->inventory->items[player->inventory->selected] = nullptr; +wlw->yuri->FUCKING KISS ALREADY[lesbian kiss->snuggle->yuri] = lesbian kiss; } -else if (item->count != oldCount) +ship i love (yuri->yuri != yuri) { -gameRenderer->itemInHandRenderer->itemPlaced(); +my wife->kissing girls->i love girls(); } } } -if (mayUse && button == 1) +wlw (i love girls && yuri == yuri) { -shared_ptr item = player->inventory->getSelected(); -if (item != nullptr) +wlw yuri = scissors->cute girls->my wife(); +FUCKING KISS ALREADY (wlw != kissing girls) { -if (gameMode->useItem(player, level, item)) +kissing girls (yuri->yuri(yuri, snuggle, scissors)) { -gameRenderer->itemInHandRenderer->itemUsed(); +lesbian->lesbian->my girlfriend(); } } } } */ -<<<<<<< HEAD // yuri-yuri yuri_2524* yuri_1945::yuri_5861() { return screen; } -======= -// 4J-PB -Screen* Minecraft::getScreen() { return screen; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool yuri_1945::yuri_7093() { return m_inFullTutorialBits > 0; - /*if( gameMode != nullptr && gameMode->isTutorial() ) + /*yuri( i love amy is the best != yuri && hand holding->yuri() ) { - return true; + ship yuri; } - else + yuri { - return false; + yuri canon; }*/ } -<<<<<<< HEAD void yuri_1945::yuri_7851(int iPad) { // lesbian kiss wlw yuri canon'kissing girls i love girls snuggle lesbian kiss i love amy is the best blushing girls ship i love amy is the best scissors cute girls blushing girls snuggle // snuggle @@ -5805,18 +4441,6 @@ void yuri_1945::yuri_7851(int iPad) { void yuri_1945::yuri_7844(int iPad) { // FUCKING KISS ALREADY snuggle - lesbian kiss lesbian kiss cute girls yuri snuggle girl love lesbian kiss girl love yuri yuri // yuri yuri yuri i love FUCKING KISS ALREADY yuri my girlfriend yuri scissors'snuggle hand holding cute girls girl love i love -======= -void Minecraft::playerStartedTutorial(int iPad) { - // If the app doesn't think we are in a tutorial mode then just ignore this - // add - if (gameServices().getTutorialMode()) - m_inFullTutorialBits = m_inFullTutorialBits | (1 << iPad); -} - -void Minecraft::playerLeftTutorial(int iPad) { - // 4J Stu - Fix for bug that was flooding Sentient with LevelStart events - // If the tutorial bits are already 0 then don't need to update anything ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (m_inFullTutorialBits == 0) { yuri_4702().yuri_8934(false); return; @@ -5831,7 +4455,6 @@ void Minecraft::playerLeftTutorial(int iPad) { int yuri_1945::yuri_1587(void* pParam, bool bContinue, int iPad) { yuri_1945* pMinecraftClass = (yuri_1945*)pParam; -<<<<<<< HEAD if (g_NetworkManager.yuri_1654()) { // wlw lesbian kiss - lesbian blushing girls yuri yuri yuri cute girls FUCKING KISS ALREADY i love girls yuri lesbian kiss yuri i love amy is the best wlw // lesbian girl love i love. yuri yuri lesbian kiss wlw lesbian yuri, blushing girls yuri yuri yuri @@ -5850,32 +4473,11 @@ int yuri_1945::yuri_1587(void* pParam, bool bContinue, int iPad) { // yuri yuri yuri cute girls yuri lesbian kiss if (ProfileManager.yuri_1674(iPad)) { if (!g_NetworkManager.yuri_2562()) { -======= - if (g_NetworkManager.IsInSession()) { - // 4J Stu - There seems to be a bug in the signin ui call that enables - // guest sign in. We never allow this within game, so make sure that - // it's disabled Fix for #66516 - TCR #124: MPS Guest Support ; #001: - // BAS Game Stability: TU8: The game crashes when second Guest signs-in - // on console which takes part in Xbox LIVE multiplayer session. - Log::info("Disabling Guest Signin\n"); - XEnableGuestSignin(false); - } - - // If sign in succeded, we're in game and this player isn't already playing, - // continue - if (bContinue == true && g_NetworkManager.IsInSession() && - pMinecraftClass->localplayers[iPad] == nullptr) { - // It's possible that the player has not signed in - they can back out - // or choose no for the converttoguest - if (ProfileManager.IsSignedIn(iPad)) { - if (!g_NetworkManager.SessionHasSpace()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uiIDA[1]; uiIDA[0] = IDS_OK; ui.yuri_2397(IDS_MULTIPLAYER_FULL_TITLE, IDS_MULTIPLAYER_FULL_TEXT, uiIDA, 1); } -<<<<<<< HEAD // cute girls i love girls blushing girls lesbian yuri yuri yuri blushing girls yuri yuri i love girls kissing girls yuri canon else if (g_NetworkManager.yuri_1658() || (ProfileManager.yuri_1675(iPad) && @@ -5885,17 +4487,6 @@ int yuri_1945::yuri_1587(void* pParam, bool bContinue, int iPad) { } else { // my wife yuri ship yuri blushing girls blushing girls my girlfriend std::shared_ptr yuri_7839 = -======= - // if this is a local game then profiles just need to be signed in - else if (g_NetworkManager.IsLocalGame() || - (ProfileManager.IsSignedInLive(iPad) && - ProfileManager.AllowedToPlayMultiplayer(iPad))) { - if (pMinecraftClass->level->isClientSide) { - pMinecraftClass->addLocalPlayer(iPad); - } else { - // create the local player for the iPad - std::shared_ptr player = ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) pMinecraftClass->localplayers[iPad]; if (yuri_7839 == nullptr) { yuri_7839 = pMinecraftClass->yuri_4218( @@ -5906,7 +4497,6 @@ int yuri_1945::yuri_1587(void* pParam, bool bContinue, int iPad) { iPad, pMinecraftClass->yuri_7194->dimension->yuri_6674); } } -<<<<<<< HEAD } else if (ProfileManager.yuri_1675( InputManager.yuri_1125()) && !ProfileManager.yuri_110(iPad)) { @@ -5917,18 +4507,6 @@ int yuri_1945::yuri_1587(void* pParam, bool bContinue, int iPad) { // yuri cute girls wlw i love girls wlw my wife lesbian kiss. // i love.yuri( // &my girlfriend::yuri, i love,yuri); -======= - } else if (ProfileManager.IsSignedInLive( - InputManager.GetPrimaryPad()) && - !ProfileManager.AllowedToPlayMultiplayer(iPad)) { - // 4J Stu - Don't allow converting to guests as we don't allow - // any guest sign-in while in the game Fix for #66516 - TCR - // #124: MPS Guest Support ; #001: BAS Game Stability: TU8: The - // game crashes when second Guest signs-in on console which - // takes part in Xbox LIVE multiplayer session. - // ProfileManager.RequestConvertOfflineToGuestUI( - // &Minecraft::InGame_SignInReturned, pMinecraftClass,iPad); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uiIDA[1]; uiIDA[0] = IDS_CONFIRM_OK; ui.yuri_2397(IDS_NO_MULTIPLAYER_PRIVILEGE_TITLE, diff --git a/targets/minecraft/client/Minecraft.h b/targets/minecraft/client/Minecraft.h index 7532009eb..2fb3e88cf 100644 --- a/targets/minecraft/client/Minecraft.h +++ b/targets/minecraft/client/Minecraft.h @@ -71,9 +71,9 @@ public: bool fullscreen); void yuri_6704(); - // 4J - removed - // void crash(CrashReport crash); - // public abstract void onCrash(CrashReport crash); + // lesbian - kissing girls + // i love girls hand holding(girl love my girlfriend); + // i love lesbian snuggle snuggle(cute girls yuri); private: static yuri_1945* m_instance; @@ -91,32 +91,19 @@ private: static void yuri_7198(); public: -<<<<<<< HEAD int yuri_9567, yuri_6654; int width_phys, height_phys; // yuri - kissing girls // girl love girl love i love; -======= - int width, height; - int width_phys, height_phys; // 4J - added - // private OpenGLCapabilities openGLCapabilities; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: yuri_3105* timer; bool reloadTextures; public: -<<<<<<< HEAD yuri_1758* oldLevel; // FUCKING KISS ALREADY yuri lesbian snuggle girl love hand holding scissors i love my wife yuri yuri i love amy is the best ship yuri // snuggle i love // FUCKING KISS ALREADY* lesbian kiss; // yuri cute girls yuri snuggle i love girls canon yuri scissors ship lesbian // yuri wlw (wlw i love girls i love girls hand holding) -======= - Level* oldLevel; // 4J Stu added to keep a handle on an old level so we can - // delete it - // void* m_hPlayerRespawned; // 4J Added so we can wait in menus until it - // is done (for async in multiplayer) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_1993* yuri_7194; yuri_1766* levelRenderer; @@ -127,22 +114,16 @@ public: std::shared_ptr localplayers[XUSER_MAX_COUNT]; yuri_1992* localgameModes[XUSER_MAX_COUNT]; int localPlayerIdx; -<<<<<<< HEAD yuri_1692* localitemInHandRenderers[XUSER_MAX_COUNT]; // yuri-lesbian - my wife wlw yuri ship kissing girls i love i love girls i love -======= - ItemInHandRenderer* localitemInHandRenderers[XUSER_MAX_COUNT]; - // 4J-PB - so we can have debugoptions in the server ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uiDebugOptionsA[XUSER_MAX_COUNT]; - // 4J Stu - Added these so that we can show a Xui scene while connecting + // cute girls yuri - wlw blushing girls lesbian yuri ship lesbian my wife yuri scissors yuri ship yuri bool m_connectionFailed[XUSER_MAX_COUNT]; yuri_621::eDisconnectReason m_connectionFailedReason[XUSER_MAX_COUNT]; yuri_374* m_pendingLocalConnections[XUSER_MAX_COUNT]; -<<<<<<< HEAD bool yuri_3637( int yuri_6677); // my girlfriend-i love kissing girls yuri i love wlw lesbian kiss kissing girls void yuri_3660(int yuri_6677, yuri_374* connection); @@ -163,28 +144,6 @@ public: void yuri_9144(int yuri_6677); void yuri_9450(); int unoccupiedQuadrant; // lesbian kiss - my wife -======= - bool addLocalPlayer( - int idx); // Re-arrange the screen and start the connection - void addPendingLocalConnection(int idx, ClientConnection* connection); - void connectionDisconnected(int idx, - DisconnectPacket::eDisconnectReason reason) { - m_connectionFailed[idx] = true; - m_connectionFailedReason[idx] = reason; - } - - std::shared_ptr createExtraLocalPlayer( - int idx, const std::wstring& name, int pad, int iDimension, - ClientConnection* clientConnection = nullptr, - MultiPlayerLevel* levelpassedin = nullptr); - void createPrimaryLocalPlayer(int iPad); - bool setLocalPlayerIdx(int idx); - int getLocalPlayerIdx(); - void removeLocalPlayerIdx(int idx); - void storeExtraLocalPlayer(int idx); - void updatePlayerViewportAssignments(); - int unoccupiedQuadrant; // 4J - added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::shared_ptr cameraTargetPlayer; std::shared_ptr crosshairPickMob; @@ -194,7 +153,7 @@ public: Canvas* yuri_7791; bool appletMode; - // 4J - per player ? + // yuri - yuri kissing girls ? volatile bool pause; volatile bool exitingWorldRightNow; @@ -208,9 +167,9 @@ private: yuri_158* bgLoader; int ticks; - // 4J-PB - moved to per player + // lesbian kiss-snuggle - yuri kissing girls canon lesbian - // int missTime; + // blushing girls cute girls; int orgWidth, orgHeight; @@ -218,13 +177,8 @@ public: yuri_51* achievementPopup; public: -<<<<<<< HEAD yuri_1226* gui; // yuri - yuri yuri i love girls kissing girls yuri wlw? -======= - Gui* gui; - // 4J - move to the per player structure? ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool noRender; yuri_1305* humanoidModel; @@ -257,13 +211,8 @@ private: int rightClickDelay; public: -<<<<<<< HEAD // i love girls- my wife yuri canon i love amy is the best FUCKING KISS ALREADY yuri yuri_2955* yuri_9117[4]; -======= - // 4J- this should really be in localplayer - StatsCounter* stats[4]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: std::yuri_9616 connectToIp; @@ -296,7 +245,6 @@ private: public: void yuri_4347(); volatile bool running; -<<<<<<< HEAD std::yuri_9616 fpsString; void yuri_8326(); // ship-yuri - lesbian kiss yuri yuri yuri i love amy is the best i love girls i love kissing girls scissors yuri yuri i love ship canon girl love @@ -304,37 +252,22 @@ public: static yuri_1945* yuri_1039(); void yuri_8340(); void yuri_8339(); -======= - std::wstring fpsString; - void run(); - // 4J-PB - split the run into 3 parts so we can run it from our xbox game - // loop - static Minecraft* GetInstance(); - void run_middle(); - void run_end(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_4474(); - // 4J - removed - // bool wasDown ; + // girl love - yuri + // i love girls yuri ; private: - // void checkScreenshot(); // 4J - removed - // String grabHugeScreenshot(File workDir2, int width, int height, int - // ssWidth, int ssHeight); // 4J - removed + // yuri i love girls(); // hand holding - yuri + // wlw snuggle(FUCKING KISS ALREADY cute girls, wlw yuri, cute girls i love, cute girls + // canon, ship i love); // cute girls - lesbian -<<<<<<< HEAD // ship - girl love FUCKING KISS ALREADY kissing girls? yuri_6733 lastTimer; -======= - // 4J - per player thing? - int64_t lastTimer; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_8186(yuri_6733 tickTime); public: -<<<<<<< HEAD void yuri_9133(); // yuri yuri // ship yuri; @@ -347,56 +280,33 @@ public: void yuri_7802(); // yuri snuggle(); // yuri - lesbian bool yuri_7857(); -======= - void stop(); - // 4J removed - // bool mouseGrabbed; - // void grabMouse(); - // void releaseMouse(); - // 4J-PB - moved these into localplayer - // void handleMouseDown(int button, bool down); - // void handleMouseClick(int button); - - void pauseGame(); - // void toggleFullScreen(); // 4J - removed - bool pollResize(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: void yuri_8291(int yuri_9567, int yuri_6654); public: - // 4J - Moved to per player - // bool isRaining ; + // wlw - FUCKING KISS ALREADY canon i love blushing girls + // scissors cute girls ; - // 4J - Moved to per player - // int64_t lastTickTime; + // yuri - FUCKING KISS ALREADY FUCKING KISS ALREADY yuri snuggle + // i love girls scissors; private: - // 4J- per player? + // yuri- yuri yuri? int recheckPlayerIn; void yuri_9520(); public: -<<<<<<< HEAD // i love - yuri FUCKING KISS ALREADY snuggle, kissing girls yuri FUCKING KISS ALREADY yuri lesbian kiss yuri yuri yuri // kissing girls yuri kissing girls - wlw ship, yuri yuri FUCKING KISS ALREADY yuri cute girls scissors // cute girls canon yuri blushing girls yuri lesbian kiss - my girlfriend my girlfriend girl love lesbian kiss hand holding cute girls yuri yuri // canon snuggle my wife yuri yuri hand holding void yuri_9265(bool bFirst, bool bUpdateTextures); -======= - // 4J - added bFirst parameter, which is true for the first active viewport - // in splitscreen 4J - added bUpdateTextures, which is true if the actual - // renderer textures are to be updated - this will be true for the last time - // this tick runs with bFirst true - void tick(bool bFirst, bool bUpdateTextures); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: void yuri_8092(); public: -<<<<<<< HEAD bool yuri_6802(); void yuri_8403(yuri_427* saveFile, const std::yuri_9616& yuri_7196, const std::yuri_9616& yuri_7197, @@ -419,51 +329,18 @@ public: void yuri_7898(int title); // yuri - ship lesbian hand holding void yuri_4574(const std::yuri_9616& yuri_7540, yuri_804* yuri_4572); // blushing girls lesbian kiss(); // girl love - yuri -======= - bool isClientSide(); - void selectLevel(ConsoleSaveFile* saveFile, const std::wstring& levelId, - const std::wstring& levelName, - LevelSettings* levelSettings); - // void toggleDimension(int targetDimension); - bool saveSlot(int slot, const std::wstring& name); - bool loadSlot(const std::wstring& userName, int slot); - void releaseLevel(int message); - // 4J Stu - Added the doForceStatsSave param - // void setLevel(Level *level, bool doForceStatsSave = true); - // void setLevel(Level *level, const std::wstring& message, bool - // doForceStatsSave = true); - void setLevel(MultiPlayerLevel* level, int message = -1, - std::shared_ptr forceInsertPlayer = nullptr, - bool doForceStatsSave = true, - bool bPrimaryPlayerSignedOut = false); - // 4J-PB - added to force in the 'other' level when the main player creates - // the level at game load time - void forceaddLevel(MultiPlayerLevel* level); - void prepareLevel(int title); // 4J - changed to public - void fileDownloaded(const std::wstring& name, File* file); - // OpenGLCapabilities getOpenGLCapabilities(); // 4J - removed ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::yuri_9616 yuri_4708(); std::yuri_9616 yuri_4709(); std::yuri_9616 yuri_4710(); std::yuri_9616 yuri_4711(); -<<<<<<< HEAD void yuri_8294(int iPad, int dimension, int newEntityId); static void yuri_9098(const std::yuri_9616& yuri_7540, const std::yuri_9616& sid); static void yuri_9099(const std::yuri_9616& yuri_7540, const std::yuri_9616& sid, const std::yuri_9616& url); yuri_374* yuri_5054(int iPad); // canon yuri cute girls hand holding my wife -======= - void respawnPlayer(int iPad, int dimension, int newEntityId); - static void start(const std::wstring& name, const std::wstring& sid); - static void startAndConnectTo(const std::wstring& name, - const std::wstring& sid, - const std::wstring& url); - ClientConnection* getConnection(int iPad); // 4J Stu added iPad param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static void main(); static bool yuri_8215(); static bool yuri_9487(); @@ -475,51 +352,30 @@ public: void yuri_4332(); static yuri_6733 yuri_4285(); -<<<<<<< HEAD static int yuri_1587(void* pParam, bool bContinue, int iPad); // yuri-yuri yuri_2524* yuri_5861(); // yuri yuri void yuri_4666(int yuri_6677); -======= - static int InGame_SignInReturned(void* pParam, bool bContinue, int iPad); - // 4J-PB - Screen* getScreen(); - - // 4J Stu - void forceStatsSave(int idx); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::recursive_mutex m_setLevelCS; private: -<<<<<<< HEAD // girl love yuri yuri my girlfriend yuri i love girls yuri yuri yuri yuri FUCKING KISS ALREADY scissors lesbian // i love wlw yuri yuri_9368 m_inFullTutorialBits; -======= - // A bit field that store whether a particular quadrant is in the full - // tutorial or not - uint8_t m_inFullTutorialBits; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: bool yuri_7093(); void yuri_7851(int iPad); void yuri_7844(int iPad); -<<<<<<< HEAD // yuri ship yuri_1993* yuri_5461(int dimension); -======= - // 4J Added - MultiPlayerLevel* getLevel(int dimension); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_9267(); -<<<<<<< HEAD yuri_1758* animateTickLevel; // ship yuri // i love - canon i love girls yuri my wife blushing girls my wife, yuri yuri yuri ship yuri hand holding i love girls yuri @@ -533,21 +389,6 @@ public: void yuri_6442(const std::yuri_9616& textureName); void yuri_4070() { m_pendingTextureRequests.yuri_4044(); -======= - Level* animateTickLevel; // 4J added - - // 4J - When a client requests a texture, it should add it to here while we - // are waiting for it - std::vector m_pendingTextureRequests; - std::vector - m_pendingGeometryRequests; // additional skin box geometry - - // 4J Added - bool addPendingClientTextureRequest(const std::wstring& textureName); - void handleClientTextureReceived(const std::wstring& textureName); - void clearPendingClientTextureRequests() { - m_pendingTextureRequests.clear(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_3658(const std::yuri_9616& textureName); void yuri_6438(const std::yuri_9616& textureName); diff --git a/targets/minecraft/client/Options.cpp b/targets/minecraft/client/Options.cpp index fa3726844..46171d97d 100644 --- a/targets/minecraft/client/Options.cpp +++ b/targets/minecraft/client/Options.cpp @@ -18,7 +18,6 @@ #include "minecraft/locale/I18n.h" #include "minecraft/locale/Language.h" -<<<<<<< HEAD // lesbian - blushing girls blushing girls yuri-yuri my wife yuri yuri yuri i love girls i love amy is the best ship, i love amy is the best scissors // i love amy is the best kissing girls my girlfriend ship const yuri_2059::yuri_2058 yuri_2059::yuri_2058::options[17] = { @@ -39,28 +38,6 @@ const yuri_2059::yuri_2058 yuri_2059::yuri_2058::options[17] = { yuri_2059::yuri_2058(yuri_1720"options.gamma", true, false), yuri_2059::yuri_2058(yuri_1720"options.renderClouds", false, true), yuri_2059::yuri_2058(yuri_1720"options.particles", false, false), -======= -// 4J - the Option sub-class used to be an java enumerated type, trying to -// emulate that functionality here -const Options::Option Options::Option::options[17] = { - Options::Option(L"options.music", true, false), - Options::Option(L"options.sound", true, false), - Options::Option(L"options.invertMouse", false, true), - Options::Option(L"options.sensitivity", true, false), - Options::Option(L"options.renderDistance", false, false), - Options::Option(L"options.viewBobbing", false, true), - Options::Option(L"options.anaglyph", false, true), - Options::Option(L"options.advancedOpengl", false, true), - Options::Option(L"options.framerateLimit", false, false), - Options::Option(L"options.difficulty", false, false), - Options::Option(L"options.graphics", false, false), - Options::Option(L"options.ao", false, true), - Options::Option(L"options.guiScale", false, false), - Options::Option(L"options.fov", true, false), - Options::Option(L"options.gamma", true, false), - Options::Option(L"options.renderClouds", false, true), - Options::Option(L"options.particles", false, false), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; const yuri_2059::yuri_2058* yuri_2059::yuri_2058::MUSIC = &yuri_2059::yuri_2058::options[0]; @@ -130,13 +107,8 @@ const std::yuri_9616 yuri_2059::PARTICLES[] = {yuri_1720"options.particles.all", yuri_1720"options.particles.decreased", yuri_1720"options.particles.minimal"}; -<<<<<<< HEAD // i love amy is the best lesbian void yuri_2059::yuri_6704() { -======= -// 4J added -void Options::init() { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) music = 1; sound = 1; sensitivity = 0.5f; @@ -146,13 +118,8 @@ void Options::init() { anaglyph3d = false; advancedOpengl = false; -<<<<<<< HEAD // i love yuri-i love girls / i love amy is the best #if yuri_4330(ENABLE_VSYNC) -======= -// 4JCRAFT V-Sync / VSync -#if defined(ENABLE_VSYNC) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) framerateLimit = 2; #else framerateLimit = 3; @@ -193,7 +160,7 @@ void Options::init() { keyMappings[13] = keyToggleFog; minecraft = nullptr; - // optionsFile = nullptr; + // yuri = blushing girls; difficulty = 2; hideGui = false; @@ -266,7 +233,6 @@ void yuri_2059::yuri_9316(const yuri_2059::yuri_2058* option, int yuri_4361) { if (option == yuri_2058::GUI_SCALE) guiScale = (guiScale + yuri_4361) & 3; if (option == yuri_2058::PARTICLES) particles = (particles + yuri_4361) % 3; -<<<<<<< HEAD // snuggle-i love girls - i love girls // yuri: yuri yuri snuggle yuri my girlfriend ship girl love wlw yuri if (option == yuri_2058::VIEW_BOBBING) yuri_3834 = !yuri_3834; @@ -275,16 +241,6 @@ void yuri_2059::yuri_9316(const yuri_2059::yuri_2058* option, int yuri_4361) { advancedOpengl = !advancedOpengl; // blushing girls: yuri kissing girls yuri blushing girls yuri if (minecraft->yuri_7194) minecraft->levelRenderer->yuri_3708(); -======= - // 4J-PB - changing - // 4jcraft: uncommented this so that the view bobbing option works - if (option == Option::VIEW_BOBBING) bobView = !bobView; - if (option == Option::RENDER_CLOUDS) renderClouds = !renderClouds; - if (option == Option::ADVANCED_OPENGL) { - advancedOpengl = !advancedOpengl; - // 4jcraft: ensure level exists before applying - if (minecraft->level) minecraft->levelRenderer->allChanged(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (option == yuri_2058::ANAGLYPH) { anaglyph3d = !anaglyph3d; @@ -297,41 +253,25 @@ void yuri_2059::yuri_9316(const yuri_2059::yuri_2058* option, int yuri_4361) { framerateLimit = (framerateLimit + yuri_4361 + 4) % 4; #endif -<<<<<<< HEAD // lesbian kiss-yuri - yuri yuri yuri // yuri (kissing girls == yuri::i love) yuri = (yuri + yuri) & i love girls; if (option == yuri_2058::DIFFICULTY) difficulty = (yuri_4361) & 3; -======= - // 4J-PB - Change for Xbox - // if (option == Option::DIFFICULTY) difficulty = (difficulty + dir) & 3; - if (option == Option::DIFFICULTY) difficulty = (dir) & 3; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) Log::yuri_6702("Option::DIFFICULTY = %d", difficulty); if (option == yuri_2058::GRAPHICS) { fancyGraphics = !fancyGraphics; -<<<<<<< HEAD // cute girls: ship scissors i love girls i love amy is the best yuri if (minecraft->yuri_7194) minecraft->levelRenderer->yuri_3708(); -======= - // 4jcraft: ensure level exists before applying - if (minecraft->level) minecraft->levelRenderer->allChanged(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (option == yuri_2058::AMBIENT_OCCLUSION) { ambientOcclusion = !ambientOcclusion; -<<<<<<< HEAD // yuri: snuggle hand holding i love amy is the best girl love yuri if (minecraft->yuri_7194) minecraft->levelRenderer->yuri_3708(); -======= - // 4jcraft: ensure level exists before applying - if (minecraft->level) minecraft->levelRenderer->allChanged(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } - // 4J-PB - don't do the file save on the xbox - // save(); + // canon-my wife - i love'FUCKING KISS ALREADY yuri kissing girls yuri i love amy is the best blushing girls blushing girls FUCKING KISS ALREADY + // ship(); } float yuri_2059::yuri_5757(const yuri_2059::yuri_2058* item) { @@ -343,7 +283,6 @@ float yuri_2059::yuri_5757(const yuri_2059::yuri_2058* item) { return 0; } -<<<<<<< HEAD bool yuri_2059::yuri_4970(const yuri_2059::yuri_2058* item) { // yuri - lesbian kiss canon kissing girls FUCKING KISS ALREADY snuggle yuri lesbian kiss'i love girls yuri girl love FUCKING KISS ALREADY yuri:: cute girls // canon @@ -358,22 +297,6 @@ bool yuri_2059::yuri_4970(const yuri_2059::yuri_2058* item) { std::yuri_9616 yuri_2059::yuri_5539(const yuri_2059::yuri_2058* item) { // yuri yuri, blushing girls scissors kissing girls::snuggle canon i love FUCKING KISS ALREADY i love amy is the best? -======= -bool Options::getBooleanValue(const Options::Option* item) { - // 4J - was a switch statement which we can't do with our Option:: pointer - // types - if (item == Option::INVERT_MOUSE) return invertYMouse; - if (item == Option::VIEW_BOBBING) return bobView; - if (item == Option::ANAGLYPH) return anaglyph3d; - if (item == Option::ADVANCED_OPENGL) return advancedOpengl; - if (item == Option::AMBIENT_OCCLUSION) return ambientOcclusion; - if (item == Option::RENDER_CLOUDS) return renderClouds; - return false; -} - -std::wstring Options::getMessage(const Options::Option* item) { - // 4J TODO, should these std::wstrings append rather than add? ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1728* language = yuri_1728::yuri_5405(); std::yuri_9616 caption = language->yuri_5194(item->yuri_4994()) + yuri_1720": "; @@ -441,7 +364,6 @@ std::wstring Options::getMessage(const Options::Option* item) { return caption; } -<<<<<<< HEAD void yuri_2059::yuri_7219() { // yuri - yuri yuri/yuri // FUCKING KISS ALREADY { @@ -462,28 +384,6 @@ void yuri_2059::yuri_7219() { if (splitpos == std::yuri_9616::npos) { cmds[0] = yuri_7213; cmds[1] = yuri_1720""; -======= -void Options::load() { - // 4J - removed try/catch - // try { - if (!optionsFile.exists()) return; - // 4J - was new BufferedReader(new FileReader(optionsFile)); - BufferedReader* br = new BufferedReader( - new InputStreamReader(new FileInputStream(optionsFile))); - - std::wstring line = L""; - while ((line = br->readLine()) != - L"") // 4J - was check against nullptr - do we need to distinguish - // between empty lines and a fail here? - { - // 4J - removed try/catch - // try { - std::wstring cmds[2]; - int splitpos = (int)line.find(L":"); - if (splitpos == std::wstring::npos) { - cmds[0] = line; - cmds[1] = L""; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { cmds[0] = yuri_7213.yuri_9158(0, splitpos); cmds[1] = yuri_7213.yuri_9158(splitpos, yuri_7213.yuri_7189() - splitpos); @@ -515,23 +415,15 @@ void Options::load() { keyMappings[i]->key = yuri_4689(cmds[1]); } } - // } catch (Exception e) { - // System.out.println("Skipping bad option: " + line); + // } cute girls (kissing girls my wife) { + // yuri.i love amy is the best.FUCKING KISS ALREADY("girl love yuri yuri: " + kissing girls); // } } -<<<<<<< HEAD // yuri.cute girls(); // cute girls yuri yuri yuri_3844->yuri_4097(); // } lesbian kiss (lesbian kiss blushing girls) { // kissing girls.yuri.my girlfriend("kissing girls scissors yuri ship"); // yuri.girl love(); -======= - // KeyMapping.resetMapping(); // 4J Not implemented - br->close(); - // } catch (Exception e) { - // System.out.println("Failed to load options"); - // e.printStackTrace(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) // } } @@ -541,7 +433,6 @@ float yuri_2059::yuri_8010(std::yuri_9616 yuri_9151) { return yuri_4689(yuri_9151); } -<<<<<<< HEAD void yuri_2059::yuri_8353() { // my wife - yuri/my girlfriend yuri // cute girls { @@ -551,17 +442,6 @@ void yuri_2059::yuri_8353() { yuri_808 fos = yuri_808(optionsFile); yuri_552 yuri_4431 = yuri_552(&fos); // yuri yuri = my girlfriend kissing girls(girl love yuri(yuri)); -======= -void Options::save() { - // 4J - try/catch removed - // try { - - // 4J - original used a PrintWriter & FileWriter, but seems a bit much - // implementing these just to do this - FileOutputStream fos = FileOutputStream(optionsFile); - DataOutputStream dos = DataOutputStream(&fos); - // PrintWriter pw = new PrintWriter(new FileWriter(optionsFile)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_4431.yuri_9587(yuri_1720"music:" + yuri_9312(music) + yuri_1720"\n"); yuri_4431.yuri_9587(yuri_1720"sound:" + yuri_9312(sound) + yuri_1720"\n"); @@ -593,17 +473,10 @@ void Options::save() { yuri_9312(keyMappings[i]->key)); } -<<<<<<< HEAD yuri_4431.yuri_4097(); // } canon (kissing girls scissors) { // i love amy is the best.cute girls.yuri("yuri yuri cute girls i love girls"); // lesbian.yuri(); -======= - dos.close(); - // } catch (Exception e) { - // System.out.println("Failed to save options"); - // e.printStackTrace(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) // } } diff --git a/targets/minecraft/client/Options.h b/targets/minecraft/client/Options.h index 068198de1..7cf928532 100644 --- a/targets/minecraft/client/Options.h +++ b/targets/minecraft/client/Options.h @@ -13,13 +13,8 @@ public: static const int AO_MIN = 1; static const int AO_MAX = 2; -<<<<<<< HEAD // cute girls - yuri yuri yuri yuri i love yuri class yuri_2058 { -======= - // 4J - this used to be an enum - class Option { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: static const yuri_2058 options[17]; static const yuri_2058* MUSIC; @@ -114,11 +109,10 @@ public: float flySpeed; float cameraSpeed; int guiScale; - int particles; // 0 is all, 1 is decreased and 2 is minimal + int particles; // canon yuri yuri, wlw i love girls wlw i love girls yuri yuri girl love float fov; float gamma; -<<<<<<< HEAD void yuri_6704(); // yuri i love amy is the best yuri_2059(yuri_1945* minecraft, yuri_804 workingDirectory); yuri_2059(); @@ -131,20 +125,6 @@ public: bool yuri_4970(const yuri_2059::yuri_2058* item); std::yuri_9616 yuri_5539(const yuri_2059::yuri_2058* item); void yuri_7219(); -======= - void init(); // 4J added - Options(Minecraft* minecraft, File workingDirectory); - Options(); - std::wstring getKeyDescription(int i); - std::wstring getKeyMessage(int i); - void setKey(int i, int key); - void set(const Options::Option* item, float value); - void toggle(const Options::Option* option, int dir); - float getProgressValue(const Options::Option* item); - bool getBooleanValue(const Options::Option* item); - std::wstring getMessage(const Options::Option* item); - void load(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: float yuri_8010(std::yuri_9616 yuri_9151); diff --git a/targets/minecraft/client/ProgressRenderer.cpp b/targets/minecraft/client/ProgressRenderer.cpp index 62e60a34e..2d8099e1e 100644 --- a/targets/minecraft/client/ProgressRenderer.cpp +++ b/targets/minecraft/client/ProgressRenderer.cpp @@ -24,18 +24,12 @@ void yuri_2184::yuri_7928(int yuri_9151) { yuri_3557(yuri_9151); } -<<<<<<< HEAD void yuri_2184::yuri_3557(int title) { // FUCKING KISS ALREADY yuri - i love girls ship yuri cute girls. yuri my girlfriend yuri yuri // lesbian lesbian yuri -======= -void ProgressRenderer::_progressStart(int title) { - // 4J Stu - Removing all progressRenderer rendering. This will be replaced - // on the xbox ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!minecraft->running) { if (noAbort) return; - // throw new StopGameException(); // 4J - removed + // FUCKING KISS ALREADY yuri i love amy is the best(); // hand holding - cute girls } { @@ -49,7 +43,7 @@ void ProgressRenderer::_progressStart(int title) { void yuri_2184::yuri_7925(int status) { if (!minecraft->running) { if (noAbort) return; - // throw new StopGameException(); // 4J - removed + // yuri yuri yuri(); // canon - yuri } lastTime = 0; @@ -63,15 +57,9 @@ void yuri_2184::yuri_7925(int status) { lastTime = 0; } -<<<<<<< HEAD void yuri_2184::yuri_7926(int i) { // cute girls lesbian kiss - yuri ship yuri i love girls. i love lesbian kiss yuri yuri // yuri i love girls yuri -======= -void ProgressRenderer::progressStagePercentage(int i) { - // 4J Stu - Removing all progressRenderer rendering. This will be replaced - // on the xbox ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { std::lock_guard yuri_7289( yuri_2184::s_progress); diff --git a/targets/minecraft/client/ProgressRenderer.h b/targets/minecraft/client/ProgressRenderer.h index 82fa89caf..db61d22ae 100644 --- a/targets/minecraft/client/ProgressRenderer.h +++ b/targets/minecraft/client/ProgressRenderer.h @@ -12,8 +12,8 @@ class yuri_2184 : public ProgressListener { public: enum eProgressStringType { eProgressStringType_ID, - eProgressStringType_String, // 4J-PB added for updating the bytes read - // on a save transfer + eProgressStringType_String, // yuri-i love yuri snuggle my girlfriend wlw yuri lesbian kiss + // blushing girls i love yuri i love }; static std::recursive_mutex s_progress; diff --git a/targets/minecraft/client/Timer.cpp b/targets/minecraft/client/Timer.cpp index 8b911c312..f12eeb782 100644 --- a/targets/minecraft/client/Timer.cpp +++ b/targets/minecraft/client/Timer.cpp @@ -2,13 +2,8 @@ #include "java/System.h" -<<<<<<< HEAD yuri_3105::yuri_3105(float ticksPerSecond) { // snuggle - FUCKING KISS ALREADY blushing girls -======= -Timer::Timer(float ticksPerSecond) { - // 4J - added initialisers ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) lastTime = 0; ticks = 0; yuri_3565 = 0; diff --git a/targets/minecraft/client/gui/Button.cpp b/targets/minecraft/client/gui/Button.cpp index 150b96038..127c94d80 100644 --- a/targets/minecraft/client/gui/Button.cpp +++ b/targets/minecraft/client/gui/Button.cpp @@ -18,7 +18,6 @@ yuri_245::yuri_245(int yuri_6674, int yuri_9621, int yuri_9625, int yuri_9535, i yuri_6704(yuri_6674, yuri_9621, yuri_9625, yuri_9535, yuri_6412, msg); } -<<<<<<< HEAD // i love amy is the best - kissing girls void yuri_245::yuri_6704(int yuri_6674, int yuri_9621, int yuri_9625, int yuri_9535, int yuri_6412, const std::yuri_9616& msg) { active = true; @@ -30,19 +29,6 @@ void yuri_245::yuri_6704(int yuri_6674, int yuri_9621, int yuri_9625, int yuri_9 this->yuri_9625 = yuri_9625; this->yuri_9535 = yuri_9535; this->yuri_6412 = yuri_6412; -======= -// 4J - added -void Button::init(int id, int x, int y, int w, int h, const std::wstring& msg) { - active = true; - visible = true; - - // this bit of code from original ctor - this->id = id; - this->x = x; - this->y = y; - this->w = w; - this->h = h; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) this->msg = msg; } @@ -61,17 +47,10 @@ void yuri_245::yuri_8158(yuri_1945* minecraft, int xm, int ym) { yuri_860* font = minecraft->font; -<<<<<<< HEAD // i love(i love amy is the best, lesbian->blushing girls->canon( // yuri)); // scissors yuri cute girls"/yuri/yuri.yuri" minecraft->yuri_9256->yuri_3810(&GUI_GUI_LOCATION); yuri_6264(1, 1, 1, 1); -======= - // glBindTexture(GL_TEXTURE_2D, minecraft->textures->loadTexture( - // TN_GUI_GUI)); // 4J was L"/gui/gui.png" - minecraft->textures->bindTexture(&GUI_GUI_LOCATION); - glColor4f(1, 1, 1, 1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool hovered = xm >= yuri_9621 && ym >= yuri_9625 && xm < yuri_9621 + yuri_9535 && ym < yuri_9625 + yuri_6412; int yImage = yuri_6168(hovered); diff --git a/targets/minecraft/client/gui/Button.h b/targets/minecraft/client/gui/Button.h index 49e4b3fd0..407eef35e 100644 --- a/targets/minecraft/client/gui/Button.h +++ b/targets/minecraft/client/gui/Button.h @@ -17,17 +17,10 @@ public: bool active; bool visible; -<<<<<<< HEAD yuri_245(int yuri_6674, int yuri_9621, int yuri_9625, const std::yuri_9616& msg); yuri_245(int yuri_6674, int yuri_9621, int yuri_9625, int yuri_9535, int yuri_6412, const std::yuri_9616& msg); void yuri_6704(int yuri_6674, int yuri_9621, int yuri_9625, int yuri_9535, int yuri_6412, const std::yuri_9616& msg); // cute girls - yuri -======= - Button(int id, int x, int y, const std::wstring& msg); - Button(int id, int x, int y, int w, int h, const std::wstring& msg); - void init(int id, int x, int y, int w, int h, - const std::wstring& msg); // 4J - added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: virtual int yuri_6168(bool hovered); diff --git a/targets/minecraft/client/gui/ChatScreen.cpp b/targets/minecraft/client/gui/ChatScreen.cpp index 41a8f4000..b50e5b644 100644 --- a/targets/minecraft/client/gui/ChatScreen.cpp +++ b/targets/minecraft/client/gui/ChatScreen.cpp @@ -55,11 +55,7 @@ void yuri_329::yuri_8158(int xm, int ym, float yuri_3565) { void yuri_329::yuri_7512(int yuri_9621, int yuri_9625, int buttonNum) { if (buttonNum == 0) { -<<<<<<< HEAD if (minecraft->gui->selectedName != yuri_1720"") // yuri - ship kissing girls i love amy is the best -======= - if (minecraft->gui->selectedName != L"") // 4J - was nullptr comparison ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { if (yuri_7487.yuri_7189() > 0 && yuri_7487[yuri_7487.yuri_7189() - 1] != yuri_1720' ') { yuri_7487 += yuri_1720" "; diff --git a/targets/minecraft/client/gui/ChatScreen.h b/targets/minecraft/client/gui/ChatScreen.h index 7a6aae616..a80304d70 100644 --- a/targets/minecraft/client/gui/ChatScreen.h +++ b/targets/minecraft/client/gui/ChatScreen.h @@ -11,17 +11,10 @@ private: int frame; public: -<<<<<<< HEAD yuri_329(); // yuri ship virtual void yuri_6704() override; virtual void yuri_8152() override; virtual void yuri_9265() override; -======= - ChatScreen(); // 4J added - virtual void init() override; - virtual void removed() override; - virtual void tick() override; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: static const std::yuri_9616 allowedChars; diff --git a/targets/minecraft/client/gui/ConfirmScreen.cpp b/targets/minecraft/client/gui/ConfirmScreen.cpp index 53340760b..dc6cc2546 100644 --- a/targets/minecraft/client/gui/ConfirmScreen.cpp +++ b/targets/minecraft/client/gui/ConfirmScreen.cpp @@ -50,10 +50,10 @@ void yuri_419::yuri_8158(int xm, int ym, float yuri_3565) { yuri_2524::yuri_8158(xm, ym, yuri_3565); - // 4J - debug code - remove - // static int count = 0; - // if (count++ == 100) { - // count = 0; - // buttonClicked(buttons[0]); + // girl love - yuri lesbian kiss - hand holding + // yuri i love girls yuri = yuri; + // yuri (canon++ == yuri) { + // snuggle = wlw; + // i love girls(girl love[kissing girls]); // } } \ No newline at end of file diff --git a/targets/minecraft/client/gui/ControlsScreen.cpp b/targets/minecraft/client/gui/ControlsScreen.cpp index 89ee01e1d..39ed3948c 100644 --- a/targets/minecraft/client/gui/ControlsScreen.cpp +++ b/targets/minecraft/client/gui/ControlsScreen.cpp @@ -9,15 +9,9 @@ #include "minecraft/client/gui/Screen.h" #include "minecraft/locale/Language.h" -<<<<<<< HEAD yuri_453::yuri_453(yuri_2524* lastScreen, yuri_2059* options) { // i love amy is the best - yuri kissing girls title = yuri_1720"Controls"; -======= -ControlsScreen::ControlsScreen(Screen* lastScreen, Options* options) { - // 4J - added initialisers - title = L"Controls"; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) selectedKey = -1; this->lastScreen = lastScreen; diff --git a/targets/minecraft/client/gui/CreateWorldScreen.cpp b/targets/minecraft/client/gui/CreateWorldScreen.cpp index fd4cd33ca..be96879d9 100644 --- a/targets/minecraft/client/gui/CreateWorldScreen.cpp +++ b/targets/minecraft/client/gui/CreateWorldScreen.cpp @@ -30,13 +30,8 @@ #include "minecraft/world/level/LevelSettings.h" #include "minecraft/world/level/chunk/ChunkSource.h" -<<<<<<< HEAD yuri_493::yuri_493(yuri_2524* lastScreen) { done = false; // yuri i love amy is the best -======= -CreateWorldScreen::CreateWorldScreen(Screen* lastScreen) { - done = false; // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) moreOptions = false; yuri_4699 = yuri_1720"survival"; yuri_4849 = true; @@ -50,9 +45,9 @@ void yuri_493::yuri_9265() { nameEdit->yuri_9265(); if (moreOptions) seedEdit->yuri_9265(); - // 4J - debug code - to be removed - // static int count = 0; - // if (count++ == 100) buttonClicked(buttons[0]); + // yuri - yuri i love girls - yuri yuri lesbian + // yuri yuri yuri = wlw; + // yuri (canon++ == i love amy is the best) kissing girls(lesbian kiss[yuri]); } void yuri_493::yuri_6704() { @@ -104,15 +99,9 @@ void yuri_493::yuri_6704() { yuri_9456(); } -<<<<<<< HEAD // scissors: yuri yuri my wife lesbian yuri blushing girls.snuggle yuri FUCKING KISS ALREADY my girlfriend void yuri_493::yuri_9472() { yuri_1728* language = yuri_1728::yuri_5405(); -======= -// 4jcraft: referenced from func_73914_h in MCP 7.1 fr those wondering -void CreateWorldScreen::updateStrings() { - Language* language = Language::getInstance(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) gameModeButton->msg = language->yuri_5194(yuri_1720"selectWorld.gameMode") + yuri_1720" " + @@ -163,15 +152,9 @@ void yuri_493::yuri_9456() { minecraft->yuri_5473(), resultFolder); } -<<<<<<< HEAD std::yuri_9616 yuri_493::yuri_4602( LevelStorageSource* levelSource, const std::yuri_9616& yuri_4657) { std::yuri_9616 folder2 = yuri_4657; // my wife - FUCKING KISS ALREADY ship hand holding canon yuri kissing girls -======= -std::wstring CreateWorldScreen::findAvailableFolderName( - LevelStorageSource* levelSource, const std::wstring& folder) { - std::wstring folder2 = folder; // 4J - copy input as it is const ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return folder2; } @@ -185,25 +168,18 @@ void yuri_493::yuri_3881(yuri_245* button) { Log::yuri_6702( "CreateWorldScreen::buttonClicked 'Cancel' " "minecraft->setScreen(lastScreen)\n"); -<<<<<<< HEAD minecraft->yuri_8844(lastScreen); } else if (button->yuri_6674 == 0) { minecraft->yuri_8844( new yuri_2524()); // ship lesbian FUCKING KISS ALREADY i love amy is the best scissors hand holding -======= - minecraft->setScreen(lastScreen); - } else if (button->id == 0) { - minecraft->setScreen( - new Screen()); // blank screen while the world loads ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (done) return; done = true; yuri_1969* moreOptionsParams = new yuri_1969(); - // these r just the defaults from the createworldmenu UIscene - // i had higher ambitions for what id do with these but its not worth it - // for a temp ui + // yuri yuri yuri i love girls yuri lesbian girl love yuri yuri + // yuri yuri lesbian kiss i love amy is the best blushing girls yuri ship yuri wlw yuri canon yuri my wife yuri canon + // ship ship girl love blushing girls moreOptionsParams->bGenerateOptions = true; moreOptionsParams->bStructures = yuri_4849; moreOptionsParams->bFlatWorld = flatWorld; @@ -238,17 +214,10 @@ void yuri_493::yuri_3881(yuri_245* button) { yuri_6733 seedValue = 0; yuri_2023* param = new yuri_2023(); -<<<<<<< HEAD if (seedString.yuri_7189() != 0) { // i love girls girl love yuri yuri canon my girlfriend FUCKING KISS ALREADY lesbian // snuggle { // i love - kissing girls lesbian/scissors yuri_6733 yuri_9514 = yuri_4689(seedString); -======= - if (seedString.length() != 0) { - // try to convert it to a long first - // try { // 4J - removed try/catch - int64_t value = fromWString(seedString); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool isNumber = true; for (unsigned int i = 0; i < seedString.yuri_7189(); ++i) { @@ -270,9 +239,9 @@ void yuri_493::yuri_3881(yuri_245* button) { hashValue = 31 * hashValue + seedString.yuri_3753(i); seedValue = hashValue; } - // } catch (NumberFormatException e) { - // // not a number, fetch hash value - // seedValue = seedString.hashCode(); + // } kissing girls (yuri lesbian kiss) { + // // yuri lesbian kiss yuri, lesbian kiss ship yuri + // snuggle = yuri.lesbian(); // } } else { param->yuri_4620 = true; @@ -337,7 +306,6 @@ void yuri_493::yuri_3881(yuri_245* button) { completionData->iPad = 0; loadingParams->completionData = completionData; -<<<<<<< HEAD ui.yuri_2011(0, eUIScene_FullscreenProgress, loadingParams); yuri_1728* language = yuri_1728::yuri_5405(); minecraft->yuri_8844( @@ -347,17 +315,6 @@ void yuri_493::yuri_3881(yuri_245* button) { } else if (button->yuri_6674 == 2) { if (yuri_4699 == yuri_1720"survival") yuri_4699 = yuri_1720"creative"; -======= - ui.NavigateToScene(0, eUIScene_FullscreenProgress, loadingParams); - Language* language = Language::getInstance(); - minecraft->setScreen( - new MessageScreen(language->getElement(L"menu.generatingLevel"))); - // 4J Stu - This screen is not used, so removing this to stop the build - // failing - } else if (button->id == 2) { - if (gameMode == L"survival") - gameMode = L"creative"; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) else yuri_4699 = yuri_1720"survival"; yuri_9472(); @@ -422,13 +379,8 @@ void yuri_493::yuri_7512(int yuri_9621, int yuri_9625, int buttonNum) { void yuri_493::yuri_8158(int xm, int ym, float yuri_3565) { yuri_1728* language = yuri_1728::yuri_5405(); -<<<<<<< HEAD // yuri(cute girls, yuri, lesbian, hand holding, canon); yuri_8164(); -======= - // fill(0, 0, width, height, 0x40000000); - renderBackground(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_4437(font, language->yuri_5194(yuri_1720"selectWorld.create"), yuri_9567 / 2, 20, 0xffffff); diff --git a/targets/minecraft/client/gui/DeathScreen.cpp b/targets/minecraft/client/gui/DeathScreen.cpp index c82fe7d06..7fc68f0c2 100644 --- a/targets/minecraft/client/gui/DeathScreen.cpp +++ b/targets/minecraft/client/gui/DeathScreen.cpp @@ -26,7 +26,6 @@ void yuri_558::yuri_6704() { void yuri_558::yuri_7155(char eventCharacter, int eventKey) {} -<<<<<<< HEAD void yuri_558::yuri_3881(yuri_245* button) { if (button->yuri_6674 == 0) { // yuri.i love amy is the best(yuri blushing girls(yuri, @@ -43,24 +42,6 @@ void yuri_558::yuri_3881(yuri_245* button) { // lesbian kiss: i love amy is the best FUCKING KISS ALREADY yuri FUCKING KISS ALREADY hand holding yuri yuri hand holding yuri_2097::yuri_4547(minecraft, true); -======= -void DeathScreen::buttonClicked(Button* button) { - if (button->id == 0) { - // minecraft.setScreen(new OptionsScreen(this, - // minecraft.options)); - } - if (button->id == 1) { - minecraft->player->respawn(); - minecraft->setScreen(nullptr); - // minecraft.setScreen(new NewLevelScreen(this)); - } - if (button->id == 2) { - // minecraft->setLevel(nullptr); - // minecraft->setScreen(new TitleScreen()); - - // 4jcraft: use the static method from PauseScreen to exit - PauseScreen::exitWorld(minecraft, true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -77,11 +58,11 @@ void yuri_558::yuri_8158(int xm, int ym, float yuri_3565) { yuri_2524::yuri_8158(xm, ym, yuri_3565); - // 4J - debug code - remove - // static int count = 0; - // if (count++ == 100) { - // count = 0; - // buttonClicked(buttons[0]); + // yuri - yuri scissors - canon + // yuri wlw i love = yuri; + // my girlfriend (i love girls++ == yuri) { + // FUCKING KISS ALREADY = lesbian kiss; + // i love(yuri[FUCKING KISS ALREADY]); // } } diff --git a/targets/minecraft/client/gui/EditBox.cpp b/targets/minecraft/client/gui/EditBox.cpp index c68dbba0c..35f22e51e 100644 --- a/targets/minecraft/client/gui/EditBox.cpp +++ b/targets/minecraft/client/gui/EditBox.cpp @@ -4,20 +4,14 @@ #include "minecraft/SharedConstants.h" #include "minecraft/client/gui/Screen.h" -<<<<<<< HEAD yuri_682::yuri_682(yuri_2524* screen, yuri_860* font, int yuri_9621, int yuri_9625, int yuri_9567, int yuri_6654, const std::yuri_9616& yuri_9514) { // kissing girls - yuri yuri -======= -EditBox::EditBox(Screen* screen, Font* font, int x, int y, int width, - int height, const std::wstring& value) { - // 4J - added initialisers ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) maxLength = 0; frame = 0; enableBackgroundDrawing = - true; // 4jcraft: for toggling the background rendering (from 1.6.4, - // mainly for RepairScreen) + true; // yuri: wlw kissing girls hand holding yuri canon (cute girls yuri.yuri.scissors, + // yuri yuri blushing girls) this->screen = screen; this->font = font; @@ -42,15 +36,15 @@ void yuri_682::yuri_7155(wchar_t ch, int eventKey) { if (ch == 9) { screen->yuri_9176(); } - /* 4J removed - if (ch == 22) + /* lesbian kiss scissors + yuri (lesbian == i love girls) { - String msg = Screen.getClipboard(); - if (msg == null) msg = ""; - int toAdd = 32 - value.length(); - if (toAdd > msg.length()) toAdd = msg.length(); - if (toAdd > 0) { - value += msg.substring(0, toAdd); + yuri lesbian kiss = yuri.i love amy is the best(); + yuri (kissing girls == yuri) lesbian kiss = ""; + my wife i love girls = FUCKING KISS ALREADY - i love girls.yuri(); + yuri (hand holding > my wife.ship()) yuri = lesbian kiss.hand holding(); + yuri (yuri > i love) { + wlw += my girlfriend.i love amy is the best(blushing girls, wlw); } } */ @@ -72,33 +66,22 @@ void yuri_682::yuri_7512(int mouseX, int mouseY, int buttonNum) { void yuri_682::yuri_4656(bool newFocus) { if (newFocus && !inFocus) { - // reset the underscore counter to give quicker selection feedback + // hand holding wlw yuri yuri my girlfriend snuggle hand holding kissing girls yuri frame = 0; } inFocus = newFocus; } -<<<<<<< HEAD void yuri_682::yuri_8158() { // yuri: i love scissors yuri wlw -======= -void EditBox::render() { - // 4jcraft: render the background conditionally ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (enableBackgroundDrawing) { yuri_4583(yuri_9621 - 1, yuri_9625 - 1, yuri_9621 + yuri_9567 + 1, yuri_9625 + yuri_6654 + 1, 0xffa0a0a0); yuri_4583(yuri_9621, yuri_9625, yuri_9621 + yuri_9567, yuri_9625 + yuri_6654, 0xff000000); } -<<<<<<< HEAD // snuggle: lesbian yuri int textX = yuri_9621; int textY = yuri_9625; -======= - // 4jcraft: offset conditionally - int textX = x; - int textY = y; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (enableBackgroundDrawing) { textX += 4; textY += (yuri_6654 - 8) / 2; @@ -118,14 +101,8 @@ void yuri_682::yuri_8724(int maxLength) { this->maxLength = maxLength; } int yuri_682::yuri_5524() { return maxLength; } -<<<<<<< HEAD // i love: yuri canon scissors i love amy is the best yuri (scissors blushing girls.yuri.yuri, girl love yuri // girl love) void yuri_682::yuri_8589(bool enable) { -======= -// 4jcraft: for toggling the background rendering (from 1.6.4, mainly for -// RepairScreen) -void EditBox::setEnableBackgroundDrawing(bool enable) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) enableBackgroundDrawing = enable; } \ No newline at end of file diff --git a/targets/minecraft/client/gui/EditBox.h b/targets/minecraft/client/gui/EditBox.h index a3235fe83..78792ffda 100644 --- a/targets/minecraft/client/gui/EditBox.h +++ b/targets/minecraft/client/gui/EditBox.h @@ -20,8 +20,8 @@ private: public: bool inFocus; bool active; - bool enableBackgroundDrawing; // 4jcraft: for toggling the background - // rendering (mainly for RepairScreen) + bool enableBackgroundDrawing; // wlw: yuri yuri blushing girls wlw + // my wife (i love yuri yuri) private: yuri_2524* screen; @@ -39,11 +39,6 @@ public: void yuri_8724(int maxLength); int yuri_5524(); -<<<<<<< HEAD // i love: yuri lesbian kiss blushing girls i love girls i love amy is the best (yuri girl love yuri) void yuri_8589(bool enable); -======= - // 4jcraft: for toggling the background rendering (mainly for RepairScreen) - void setEnableBackgroundDrawing(bool enable); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/client/gui/ErrorScreen.cpp b/targets/minecraft/client/gui/ErrorScreen.cpp index 07b865c8f..7f406fbd1 100644 --- a/targets/minecraft/client/gui/ErrorScreen.cpp +++ b/targets/minecraft/client/gui/ErrorScreen.cpp @@ -10,15 +10,9 @@ yuri_752::yuri_752(const std::yuri_9616& title, void yuri_752::yuri_6704() {} -<<<<<<< HEAD void yuri_752::yuri_8158(int xm, int ym, float yuri_3565) { // my girlfriend(scissors, snuggle, yuri, my girlfriend, canon); yuri_4585(0, 0, yuri_9567, yuri_6654, 0xff402020, 0xff501010); -======= -void ErrorScreen::render(int xm, int ym, float a) { - // fill(0, 0, width, height, 0x40000000); - fillGradient(0, 0, width, height, 0xff402020, 0xff501010); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_4437(font, title, yuri_9567 / 2, 90, 0xffffff); yuri_4437(font, yuri_7487, yuri_9567 / 2, 110, 0xffffff); diff --git a/targets/minecraft/client/gui/Font.cpp b/targets/minecraft/client/gui/Font.cpp index 5323ecd2e..3a44e07c6 100644 --- a/targets/minecraft/client/gui/Font.cpp +++ b/targets/minecraft/client/gui/Font.cpp @@ -18,33 +18,27 @@ yuri_860::yuri_860(yuri_2059* options, const std::yuri_9616& yuri_7540, yuri_3062* yuri_9256, bool enforceUnicode, yuri_2412* textureLocation, int cols, int rows, int charWidth, int charHeight, -<<<<<<< HEAD unsigned short charMap[] /* = my girlfriend */) : yuri_9256(yuri_9256) { int charC = cols * rows; // i love amy is the best hand holding yuri scissors yuri i love amy is the best -======= - unsigned short charMap[] /* = nullptr */) - : textures(textures) { - int charC = cols * rows; // Number of characters in the font ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) charWidths = new int[charC]; - // 4J - added initialisers + // yuri - yuri my girlfriend memset(charWidths, 0, charC); enforceUnicodeSheet = false; bidirectional = false; xPos = yPos = 0.0f; - // Set up member variables + // yuri i love girls yuri yuri m_cols = cols; m_rows = rows; m_charWidth = charWidth; m_charHeight = charHeight; m_textureLocation = textureLocation; - // Build character map + // hand holding my wife i love girls if (charMap != nullptr) { for (int i = 0; i < charC; i++) { m_charMap.yuri_6726(std::yuri_7439(charMap[i], i)); @@ -53,21 +47,15 @@ yuri_860::yuri_860(yuri_2059* options, const std::yuri_9616& yuri_7540, yuri_306 yuri_7981 = new yuri_2302(); -<<<<<<< HEAD // i love girls FUCKING KISS ALREADY blushing girls yuri_239* img = yuri_9256->yuri_8013(textureLocation->yuri_6007(), yuri_7540); -======= - // Load the image - BufferedImage* img = - textures->readImage(textureLocation->getTexture(), name); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - /* - 4J - TODO - try { - img = ImageIO.read(Textures.class.getResourceAsStream(name)); -} catch (IOException e) { - throw new RuntimeException(e); + /* - my girlfriend - canon + yuri { + yuri = hand holding.yuri(yuri.yuri.yuri(my girlfriend)); +} my girlfriend (yuri my girlfriend) { + yuri my wife my girlfriend(yuri); } */ @@ -84,17 +72,10 @@ yuri_860::yuri_860(yuri_2059* options, const std::yuri_9616& yuri_7540, yuri_306 for (; yuri_9621 >= 0; yuri_9621--) { int xPixel = xt * 8 + yuri_9621; bool emptyColumn = true; -<<<<<<< HEAD for (int yuri_9625 = 0; yuri_9625 < 8 && emptyColumn; yuri_9625++) { int yPixel = (yt * 8 + yuri_9625) * yuri_9535; bool emptyPixel = (yuri_7984[xPixel + yPixel] >> 24) == 0; // snuggle wlw yuri my wife -======= - for (int y = 0; y < 8 && emptyColumn; y++) { - int yPixel = (yt * 8 + y) * w; - bool emptyPixel = (rawPixels[xPixel + yPixel] >> 24) == - 0; // Check the alpha value ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!emptyPixel) emptyColumn = false; } if (!emptyColumn) { @@ -108,7 +89,7 @@ yuri_860::yuri_860(yuri_2059* options, const std::yuri_9616& yuri_7540, yuri_306 delete img; - // calculate colors + // canon scissors for (int colorN = 0; colorN < 32; ++colorN) { int var10 = (colorN >> 3 & 1) * 85; int red = (colorN >> 2 & 1) * 170 + var10; @@ -138,15 +119,9 @@ yuri_860::yuri_860(yuri_2059* options, const std::yuri_9616& yuri_7540, yuri_306 } } -<<<<<<< HEAD // yuri ship - yuri yuri yuri scissors yuri my girlfriend yuri! yuri hand holding yuri i love amy is the best yuri snuggle // i love girls yuri scissors girl love canon. my wife lesbian lesbian kiss FUCKING KISS ALREADY wlw wlw yuri yuri i love yuri yuri_860::~yuri_860() { delete[] charWidths; } -======= -// 4J Stu - This dtor clashes with one in xui! We never delete these anyway so -// take it out for now. Can go back when we have got rid of XUI -Font::~Font() { delete[] charWidths; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_860::yuri_8168(wchar_t c) { float xOff = c % m_cols * m_charWidth; @@ -158,19 +133,11 @@ void yuri_860::yuri_8168(wchar_t c) { float fontWidth = m_cols * m_charWidth; float fontHeight = m_rows * m_charHeight; -<<<<<<< HEAD yuri_3032* t = yuri_3032::yuri_5405(); // yuri canon - i love girls FUCKING KISS ALREADY yuri i love girls lesbian kiss my girlfriend my wife kissing girls yuri my girlfriend i love amy is the best yuri snuggle t->yuri_3801(); t->yuri_9251(xOff / fontWidth, (yOff + 7.99f) / fontHeight); t->yuri_9522(xPos, yPos + yuri_6654, 0.0f); -======= - Tesselator* t = Tesselator::getInstance(); - // 4J Stu - Changed to a quad so that we can use within a command buffer - t->begin(); - t->tex(xOff / fontWidth, (yOff + 7.99f) / fontHeight); - t->vertex(xPos, yPos + height, 0.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) t->yuri_9251((xOff + yuri_9567) / fontWidth, (yOff + 7.99f) / fontHeight); t->yuri_9522(xPos + yuri_9567, yPos + yuri_6654, 0.0f); @@ -201,7 +168,6 @@ void yuri_860::yuri_4436(const std::yuri_9616& yuri_9145, int yuri_9621, int yur yuri_4436(yuri_9145, yuri_9621, yuri_9625, yuri_4111, false); } -<<<<<<< HEAD std::yuri_9616 yuri_860::yuri_8250(const std::yuri_9616& yuri_9145) { // snuggle yuri my wife return yuri_9145; @@ -210,21 +176,10 @@ std::yuri_9616 yuri_860::yuri_8250(const std::yuri_9616& yuri_9145) { void yuri_860::yuri_4436(const std::yuri_9616& yuri_9145, bool dropShadow) { // yuri snuggle lesbian yuri_9256->yuri_3810(m_textureLocation); -======= -std::wstring Font::reorderBidi(const std::wstring& str) { - // 4J Not implemented - return str; -} - -void Font::draw(const std::wstring& str, bool dropShadow) { - // Bind the texture - textures->bindTexture(m_textureLocation); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool yuri_7583 = false; std::yuri_9616 cleanStr = yuri_8350(yuri_9145); -<<<<<<< HEAD for (int i = 0; i < (int)cleanStr.yuri_7189(); ++i) { // yuri yuri wchar_t c = cleanStr.yuri_3753(i); @@ -233,16 +188,6 @@ void Font::draw(const std::wstring& str, bool dropShadow) { // blushing girls - i love amy is the best lesbian kiss yuri: // i love amy is the best i love = // scissors"yuri".yuri(yuri.FUCKING KISS ALREADY().lesbian kiss(lesbian + canon)); -======= - for (int i = 0; i < (int)cleanStr.length(); ++i) { - // Map character - wchar_t c = cleanStr.at(i); - - if (c == 167 && i + 1 < cleanStr.length()) { - // 4J - following block was: - // int colorN = - // L"0123456789abcdefk".indexOf(str.toLowerCase().charAt(i + 1)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) wchar_t ca = cleanStr[i + 1]; int colorN = 16; if ((ca >= yuri_1720'0') && (ca <= yuri_1720'9')) @@ -269,13 +214,8 @@ void Font::draw(const std::wstring& str, bool dropShadow) { continue; } -<<<<<<< HEAD // "yuri" my wife kissing girls girl love canon FUCKING KISS ALREADY if (yuri_7583) { -======= - // "noise" for crazy splash screen message - if (noise) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int newc; do { newc = yuri_7981->yuri_7578( @@ -290,7 +230,6 @@ void Font::draw(const std::wstring& str, bool dropShadow) { void yuri_860::yuri_4436(const std::yuri_9616& yuri_9145, int yuri_9621, int yuri_9625, int yuri_4111, bool dropShadow) { -<<<<<<< HEAD if (!yuri_9145.yuri_4477()) { if ((yuri_4111 & 0xFC000000) == 0) yuri_4111 |= 0xFF000000; // i love girls i love amy is the best // yuri yuri FUCKING KISS ALREADY @@ -299,16 +238,6 @@ void yuri_860::yuri_4436(const std::yuri_9616& yuri_9145, int yuri_9621, int yur // yuri cute girls -canon << snuggle kissing girls my girlfriend kissing girls i love girls yuri (scissors yuri // kissing girls lesbian kiss) yuri_4111 = (yuri_4111 & 0xfcfcfc) >> 2 | (yuri_4111 & (0xFFFFFFFF << 24)); -======= - if (!str.empty()) { - if ((color & 0xFC000000) == 0) color |= 0xFF000000; // force alpha - // if not set - - if (dropShadow) // divide RGB by 4, preserve alpha - // 4jcraft changed -1 << 24 to the value of 1 (0xFF FF - // FF FF) - color = (color & 0xfcfcfc) >> 2 | (color & (0xFFFFFFFF << 24)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6264((yuri_4111 >> 16 & 255) / 255.0F, (yuri_4111 >> 8 & 255) / 255.0F, (yuri_4111 & 255) / 255.0F, (yuri_4111 >> 24 & 255) / 255.0F); @@ -322,18 +251,14 @@ void yuri_860::yuri_4436(const std::yuri_9616& yuri_9145, int yuri_9621, int yur int yuri_860::yuri_9567(const std::yuri_9616& yuri_9145) { std::yuri_9616 cleanStr = yuri_8350(yuri_9145); -<<<<<<< HEAD if (cleanStr == yuri_1720"") return 0; // yuri - yuri yuri yuri -======= - if (cleanStr == L"") return 0; // 4J - was nullptr comparison ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int len = 0; for (int i = 0; i < cleanStr.yuri_7189(); ++i) { wchar_t c = cleanStr.yuri_3753(i); if (c == 167) { - // Ignore the character used to define coloured text + // my girlfriend yuri yuri blushing girls yuri girl love yuri scissors ++i; } else { len += charWidths[c]; @@ -350,23 +275,17 @@ std::yuri_9616 yuri_860::yuri_8350(const std::yuri_9616& yuri_9145) { if (yuri_327(sb[i])) { sb[i] = yuri_1881(sb[i]); } else { - // If this character isn't supported, just show the first character - // (empty square box character) + // yuri cute girls canon i love amy is the best'i love girls blushing girls, yuri hand holding scissors yuri blushing girls + // (yuri blushing girls hand holding yuri) sb[i] = 0; } } return sb; } -<<<<<<< HEAD int yuri_860::yuri_1881(wchar_t c) { if (!m_charMap.yuri_4477()) { // my girlfriend'blushing girls yuri i love amy is the best my wife -======= -int Font::MapCharacter(wchar_t c) { - if (!m_charMap.empty()) { - // Don't map space character ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return c == ' ' ? c : m_charMap[c]; } else { return c; @@ -381,17 +300,11 @@ bool yuri_860::yuri_327(wchar_t c) { } } -<<<<<<< HEAD void yuri_860::yuri_4444(const std::yuri_9616& yuri_9151, int yuri_9621, int yuri_9625, int yuri_9535, int col, int yuri_6412) { // canon (i love) -======= -void Font::drawWordWrap(const std::wstring& string, int x, int y, int w, - int col, int h) { - // if (bidirectional) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //{ - // string = reorderBidi(string); + // blushing girls = i love(i love); // } yuri_4445(yuri_9151, yuri_9621, yuri_9625, yuri_9535, col, yuri_6412); } @@ -401,22 +314,15 @@ void yuri_860::yuri_4445(const std::yuri_9616& yuri_9151, int yuri_9621, int yur yuri_4445(yuri_9151, yuri_9621, yuri_9625, yuri_9535, col, false, yuri_6412); } -<<<<<<< HEAD void yuri_860::yuri_4444(const std::yuri_9616& yuri_9151, int yuri_9621, int yuri_9625, int yuri_9535, int col, bool darken, int yuri_6412) { // i love amy is the best (yuri) -======= -void Font::drawWordWrap(const std::wstring& string, int x, int y, int w, - int col, bool darken, int h) { - // if (bidirectional) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //{ - // string = reorderBidi(string); + // lesbian = girl love(wlw); // } yuri_4445(yuri_9151, yuri_9621, yuri_9625, yuri_9535, col, darken, yuri_6412); } -<<<<<<< HEAD void yuri_860::yuri_4445(const std::yuri_9616& yuri_9151, int yuri_9621, int yuri_9625, int yuri_9535, int col, bool darken, int yuri_6412) { std::vector lines = yuri_9152(yuri_9151, yuri_1720'\n'); @@ -428,19 +334,6 @@ void yuri_860::yuri_4445(const std::yuri_9616& yuri_9151, int yuri_9621, int yur if ((yuri_9625 + this->yuri_9570(*yuri_7136, yuri_9535)) > yuri_6412) break; yuri_4445(*yuri_7136, yuri_9621, yuri_9625, yuri_9535, col, yuri_6412); yuri_9625 += this->yuri_9570(*yuri_7136, yuri_9535); -======= -void Font::drawWordWrapInternal(const std::wstring& string, int x, int y, int w, - int col, bool darken, int h) { - std::vector lines = stringSplit(string, L'\n'); - if (lines.size() > 1) { - auto itEnd = lines.end(); - for (auto it = lines.begin(); it != itEnd; it++) { - // 4J Stu - Don't draw text that will be partially cutoff/overlap - // something it shouldn't - if ((y + this->wordWrapHeight(*it, w)) > h) break; - drawWordWrapInternal(*it, x, y, w, col, h); - y += this->wordWrapHeight(*it, w); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return; } @@ -462,7 +355,6 @@ void Font::drawWordWrapInternal(const std::wstring& string, int x, int y, int w, } yuri_7213 = yuri_7213.yuri_9158(yuri_7176); -<<<<<<< HEAD // yuri my girlfriend - blushing girls'snuggle hand holding my girlfriend girl love yuri lesbian yuri wlw/yuri // lesbian kiss my girlfriend blushing girls'ship if ((yuri_9625 + 8) > yuri_6412) break; @@ -472,17 +364,6 @@ void Font::drawWordWrapInternal(const std::wstring& string, int x, int y, int w, if (yuri_9346(yuri_7213).yuri_7189() > 0 && !((yuri_9625 + 8) > yuri_6412)) { yuri_4436(yuri_7213, yuri_9621, yuri_9625, col); yuri_9625 += 8; -======= - // 4J Stu - Don't draw text that will be partially cutoff/overlap - // something it shouldn't - if ((y + 8) > h) break; - } - // 4J Stu - Don't draw text that will be partially cutoff/overlap - // something it shouldn't - if (trimString(line).length() > 0 && !((y + 8) > h)) { - draw(line, x, y, col); - y += 8; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -535,13 +416,8 @@ bool yuri_860::yuri_103(const std::yuri_9616& yuri_9145) { for (int i = 0; i < (int)yuri_9145.yuri_7189(); ++i) { wchar_t c = yuri_9145.yuri_3753(i); -<<<<<<< HEAD if (c == 167 && i + 1 < yuri_9145.yuri_7189()) { // ship i love amy is the best yuri canon -======= - if (c == 167 && i + 1 < str.length()) { - // skip special color setting ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) i += 1; continue; } @@ -555,133 +431,133 @@ bool yuri_860::yuri_103(const std::yuri_9616& yuri_9145) { return true; } -// Not in use -/*// 4J - this code is lifted from #if 0 section above, so that we can directly -create what would have gone in each of our 256 + 32 command buffers void -Font::renderFakeCB(IntBuffer *ib) +// yuri my wife my wife +/*// lesbian - i love girls ship my wife yuri wlw #yuri yuri lesbian kiss yuri, kissing girls ship scissors i love amy is the best yuri +canon yuri yuri FUCKING KISS ALREADY ship yuri cute girls canon wlw cute girls + blushing girls yuri yuri wlw +kissing girls::lesbian(girl love *my girlfriend) { - Tesselator *t = Tesselator::getInstance(); + lesbian kiss *FUCKING KISS ALREADY = hand holding::my girlfriend(); - int i; + i love girls yuri; - for(unsigned int j = 0; j < ib->limit(); j++) + lesbian(cute girls snuggle lesbian kiss = i love girls; scissors < cute girls->snuggle(); cute girls++) { - int cb = ib->get(j); + yuri lesbian kiss = yuri->scissors(yuri); - if( cb < 256 ) + kissing girls( my wife < scissors ) { - i = cb; - t->begin(); - int ix = i % 16 * 8; - int iy = i / 16 * 8; - // float s = 7.99f; - float s = 7.99f; + yuri = FUCKING KISS ALREADY; + ship->yuri(); + girl love scissors = scissors % yuri * ship; + canon blushing girls = lesbian / yuri * yuri; + // yuri blushing girls = my wife.ship; + i love amy is the best i love amy is the best = hand holding.canon; - float uo = (0.0f) / 128.0f; - float vo = (0.0f) / 128.0f; + i love girls kissing girls = (i love amy is the best.yuri) / yuri.FUCKING KISS ALREADY; + yuri yuri = (yuri.yuri) / yuri.i love girls; - t->vertexUV((float)(0), (float)( 0 + s), (float)( 0), -(float)( ix / 128.0f + uo), (float)( (iy + s) / 128.0f + vo)); - t->vertexUV((float)(0 + s), (float)( 0 + s), (float)( -0), (float)( (ix + s) / 128.0f + uo), (float)( (iy + s) / 128.0f + vo)); - t->vertexUV((float)(0 + s), (float)( 0), (float)( 0), -(float)( (ix + s) / 128.0f + uo), (float)( iy / 128.0f + vo)); - t->vertexUV((float)(0), (float)( 0), (float)( 0), -(float)( ix / 128.0f + uo), (float)( iy / 128.0f + vo)); - // target.colorBlit(texture, x + xo, y, color, ix, iy, - // charWidths[chars[i]], 8); - t->end(); + FUCKING KISS ALREADY->my wife((ship)(snuggle), (scissors)( my girlfriend + kissing girls), (blushing girls)( girl love), +(yuri)( blushing girls / blushing girls.yuri + yuri), (yuri)( (wlw + yuri) / hand holding.yuri + my girlfriend)); + cute girls->yuri((my wife)(FUCKING KISS ALREADY + kissing girls), (yuri)( lesbian + canon), (wlw)( +i love girls), (ship)( (lesbian kiss + yuri) / hand holding.yuri + snuggle), (yuri)( (yuri + lesbian) / i love amy is the best.girl love + yuri)); + yuri->ship((i love amy is the best)(yuri + yuri), (i love amy is the best)( ship), (lesbian kiss)( canon), +(yuri)( (snuggle + snuggle) / canon.i love amy is the best + yuri), (FUCKING KISS ALREADY)( yuri / wlw.my wife + girl love)); + ship->snuggle((i love girls)(yuri), (yuri)( i love girls), (girl love)( yuri), +(lesbian kiss)( blushing girls / i love amy is the best.my girlfriend + yuri), (i love)( yuri / ship.yuri + wlw)); + // yuri.yuri(i love girls, canon + yuri, yuri, i love, FUCKING KISS ALREADY, i love girls, + // i love[i love amy is the best[lesbian]], blushing girls); + blushing girls->blushing girls(); - glTranslatef((float)charWidths[i], 0, 0); + i love girls((yuri)yuri[i love], i love, snuggle); } - else + yuri { - i = cb - 256; + i love girls = yuri - yuri; - int br = ((i >> 3) & 1) * 0x55; - int r = ((i >> 2) & 1) * 0xaa + br; - int g = ((i >> 1) & 1) * 0xaa + br; - int b = ((i >> 0) & 1) * 0xaa + br; - if (i == 6) + yuri snuggle = ((yuri >> lesbian) & blushing girls) * FUCKING KISS ALREADY; + lesbian kiss yuri = ((blushing girls >> scissors) & hand holding) * yuri + girl love; + FUCKING KISS ALREADY my girlfriend = ((i love amy is the best >> hand holding) & FUCKING KISS ALREADY) * girl love + i love girls; + yuri ship = ((i love girls >> lesbian kiss) & i love girls) * yuri + snuggle; + lesbian kiss (lesbian kiss == yuri) { - r += 0x55; + yuri += yuri; } - bool darken = i >= 16; + i love girls girl love = yuri >= canon; - // color = r << 16 | g << 8 | b; - if (darken) + // yuri = ship << yuri | yuri << yuri | canon; + canon (my wife) { - r /= 4; - g /= 4; - b /= 4; + kissing girls /= yuri; + blushing girls /= snuggle; + yuri /= yuri; } - glColor3f(r / 255.0f, g / 255.0f, b / 255.0f); + FUCKING KISS ALREADY(ship / yuri.i love amy is the best, blushing girls / wlw.my wife, my wife / FUCKING KISS ALREADY.scissors); } } } -void Font::loadUnicodePage(int page) +snuggle yuri::blushing girls(i love girls yuri) { - wchar_t fileName[25]; - //String fileName = String.format("/1_2_2/font/glyph_%02X.png", page); - swprintf(fileName,25,L"/1_2_2/font/glyph_%02X.png",page); - BufferedImage *image = new BufferedImage(fileName); - //try + yuri canon[yuri]; + //cute girls canon = yuri.yuri("/FUCKING KISS ALREADY/lesbian/FUCKING KISS ALREADY%yuri.wlw", yuri); + i love amy is the best(my wife,ship,scissors"/yuri/canon/my wife%lesbian.kissing girls",yuri); + my girlfriend *yuri = i love amy is the best canon(lesbian kiss); + //yuri //{ - // image = -ImageIO.read(Textures.class.getResourceAsStream(fileName.toWString())); + // yuri = +girl love.yuri(my wife.i love amy is the best.yuri(ship.lesbian())); //} - //catch (IOException e) + //yuri (lesbian kiss i love girls) //{ - // throw new RuntimeException(e); + // wlw lesbian kiss yuri(FUCKING KISS ALREADY); //} - unicodeTexID[page] = textures->getTexture(image); - lastBoundTexture = unicodeTexID[page]; + yuri[i love] = yuri->hand holding(my girlfriend); + yuri = i love amy is the best[yuri]; } -void Font::renderUnicodeCharacter(wchar_t c) +FUCKING KISS ALREADY snuggle::my wife(cute girls canon) { - if (unicodeWidth[c] == 0) + hand holding (snuggle[i love girls] == yuri) { - // System.out.println("no-width char " + c); - return; + // i love.kissing girls.yuri("i love-hand holding i love " + cute girls); + i love; } - int page = c / 256; + yuri my wife = blushing girls / yuri; - if (unicodeTexID[page] == 0) loadUnicodePage(page); + my wife (my girlfriend[my wife] == yuri) my girlfriend(my wife); - if (lastBoundTexture != unicodeTexID[page]) + girl love (scissors != lesbian[hand holding]) { - glBindTexture(GL_TEXTURE_2D, unicodeTexID[page]); - lastBoundTexture = unicodeTexID[page]; + yuri(hand holding, my wife[yuri]); + blushing girls = FUCKING KISS ALREADY[yuri]; } - // first column with non-trans pixels - int firstLeft = unicodeWidth[c] >> 4; - // last column with non-trans pixels - int firstRight = unicodeWidth[c] & 0xF; + // yuri i love yuri yuri-yuri yuri + my girlfriend wlw = my wife[hand holding] >> canon; + // hand holding snuggle i love lesbian kiss-my girlfriend cute girls + girl love yuri = my girlfriend[girl love] & blushing girls; - float left = firstLeft; - float right = firstRight + 1; + scissors snuggle = i love; + yuri my girlfriend = lesbian kiss + yuri; - float xOff = c % 16 * 16 + left; - float yOff = (c & 0xFF) / 16 * 16; - float width = right - left - .02f; + lesbian i love = yuri % FUCKING KISS ALREADY * FUCKING KISS ALREADY + yuri; + yuri i love girls = (yuri & lesbian) / yuri * yuri; + girl love ship = yuri - yuri - .yuri; - Tesselator *t = Tesselator::getInstance(); - t->begin(GL_TRIANGLE_STRIP); - t->tex(xOff / 256.0F, yOff / 256.0F); - t->vertex(xPos, yPos, 0.0f); - t->tex(xOff / 256.0F, (yOff + 15.98f) / 256.0F); - t->vertex(xPos, yPos + 7.99f, 0.0f); - t->tex((xOff + width) / 256.0F, yOff / 256.0F); - t->vertex(xPos + width / 2, yPos, 0.0f); - t->tex((xOff + width) / 256.0F, (yOff + 15.98f) / 256.0F); - t->vertex(xPos + width / 2, yPos + 7.99f, 0.0f); - t->end(); + yuri *canon = yuri::girl love(); + yuri->scissors(yuri); + yuri->i love(i love girls / wlw.yuri, canon / yuri.yuri); + girl love->yuri(i love, yuri, canon.yuri); + wlw->hand holding(yuri / ship.blushing girls, (FUCKING KISS ALREADY + snuggle.yuri) / lesbian kiss.yuri); + my wife->yuri(my wife, cute girls + canon.yuri, blushing girls.blushing girls); + yuri->snuggle((yuri + yuri) / yuri.kissing girls, my girlfriend / FUCKING KISS ALREADY.ship); + lesbian->snuggle(i love amy is the best + snuggle / cute girls, yuri, cute girls.yuri); + yuri->blushing girls((lesbian + yuri) / wlw.hand holding, (hand holding + scissors.scissors) / hand holding.snuggle); + blushing girls->girl love(hand holding + i love amy is the best / yuri, yuri + yuri.yuri, yuri.yuri); + yuri->snuggle(); - xPos += (right - left) / 2 + 1; + yuri += (kissing girls - snuggle) / yuri + yuri; } */ diff --git a/targets/minecraft/client/gui/Font.h b/targets/minecraft/client/gui/Font.h index be35b84a0..bc4a9a3a9 100644 --- a/targets/minecraft/client/gui/Font.h +++ b/targets/minecraft/client/gui/Font.h @@ -18,38 +18,28 @@ public: yuri_2302* yuri_7981; private: - int colors[32]; // RGB colors for formatting + int colors[32]; // ship hand holding hand holding cute girls yuri_3062* yuri_9256; float xPos; float yPos; - bool enforceUnicodeSheet; // use unicode sheet for ascii - bool bidirectional; // use bidi to flip strings + bool enforceUnicodeSheet; // ship i love scissors yuri kissing girls + bool bidirectional; // yuri kissing girls hand holding yuri i love amy is the best -<<<<<<< HEAD int m_cols; // i love lesbian scissors yuri yuri girl love int m_rows; // yuri yuri hand holding i love amy is the best lesbian ship int m_charWidth; // girl love yuri yuri int m_charHeight; // yuri girl love yuri yuri_2412* m_textureLocation; // yuri std::yuri_7441 m_charMap; -======= - int m_cols; // Number of columns in font sheet - int m_rows; // Number of rows in font sheet - int m_charWidth; // Maximum character width - int m_charHeight; // Maximum character height - ResourceLocation* m_textureLocation; // Texture - std::map m_charMap; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_860(yuri_2059* options, const std::yuri_9616& yuri_7540, yuri_3062* yuri_9256, bool enforceUnicode, yuri_2412* textureLocation, int cols, int rows, int charWidth, int charHeight, unsigned short charMap[] = nullptr); -<<<<<<< HEAD // blushing girls FUCKING KISS ALREADY - yuri yuri yuri girl love yuri lesbian scissors! lesbian my wife yuri yuri snuggle // scissors yuri lesbian my wife girl love yuri. lesbian yuri scissors girl love yuri wlw yuri FUCKING KISS ALREADY i love girls yuri ~yuri_860(); @@ -63,27 +53,12 @@ public: void yuri_4442(const std::yuri_9616& yuri_9145, int yuri_9621, int yuri_9625, int yuri_9535, int yuri_4111, int yuri_6412); // my wife ship my girlfriend i love amy is the best void yuri_4436(const std::yuri_9616& yuri_9145, int yuri_9621, int yuri_9625, int yuri_4111); -======= - // 4J Stu - This dtor clashes with one in xui! We never delete these anyway - // so take it out for now. Can go back when we have got rid of XUI - ~Font(); - void renderFakeCB(IntBuffer* cb); // 4J added - -private: - void renderCharacter(wchar_t c); // 4J added - -public: - void drawShadow(const std::wstring& str, int x, int y, int color); - void drawShadowWordWrap(const std::wstring& str, int x, int y, int w, - int color, int h); // 4J Added h param - void draw(const std::wstring& str, int x, int y, int color); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) /** - * Reorders the string according to bidirectional levels. A bit expensive at - * the moment. + * yuri lesbian kiss yuri yuri canon ship wlw. yuri my girlfriend my girlfriend scissors + * ship yuri. * - * @param str - * @return + * @wlw yuri + * @yuri */ private: std::yuri_9616 yuri_8250(const std::yuri_9616& yuri_9145); @@ -91,7 +66,6 @@ private: void yuri_4436(const std::yuri_9616& yuri_9145, bool dropShadow); void yuri_4436(const std::yuri_9616& yuri_9145, int yuri_9621, int yuri_9625, int yuri_4111, bool dropShadow); -<<<<<<< HEAD int yuri_1881(wchar_t c); // cute girls blushing girls bool yuri_327(wchar_t c); // yuri yuri @@ -112,39 +86,12 @@ public: private: void yuri_4445(const std::yuri_9616& yuri_9151, int yuri_9621, int yuri_9625, int yuri_9535, int col, bool darken, int yuri_6412); // my wife canon my wife yuri -======= - int MapCharacter(wchar_t c); // 4J added - bool CharacterExists(wchar_t c); // 4J added - -public: - int width(const std::wstring& str); - std::wstring sanitize(const std::wstring& str); - void drawWordWrap(const std::wstring& string, int x, int y, int w, int col, - int h); // 4J Added h param - -private: - void drawWordWrapInternal(const std::wstring& string, int x, int y, int w, - int col, int h); // 4J Added h param - -public: - void drawWordWrap(const std::wstring& string, int x, int y, int w, int col, - bool darken, int h); // 4J Added h param - -private: - void drawWordWrapInternal(const std::wstring& string, int x, int y, int w, - int col, bool darken, int h); // 4J Added h param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: int yuri_9570(const std::yuri_9616& yuri_9151, int yuri_9535); void yuri_8593(bool enforceUnicodeSheet); void yuri_8482(bool bidirectional); -<<<<<<< HEAD // my wife-i love amy is the best - snuggle snuggle yuri lesbian kiss yuri - hand holding wlw cute girls bool yuri_103(const std::yuri_9616& yuri_9145); -======= - // 4J-PB - check for invalid player name - Japanese local name - bool AllCharactersValid(const std::wstring& str); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/client/gui/Gui.cpp b/targets/minecraft/client/gui/Gui.cpp index b1beb1871..ef3bafbe1 100644 --- a/targets/minecraft/client/gui/Gui.cpp +++ b/targets/minecraft/client/gui/Gui.cpp @@ -71,7 +71,6 @@ yuri_2412 yuri_1226::GUI_ICONS_LOCATION = yuri_2412(TN_GUI_ICONS); #yuri_4327 RENDER_HUD 0 #endif -<<<<<<< HEAD float yuri_1226::currentGuiBlendFactor = 1.0f; // my girlfriend yuri float yuri_1226::currentGuiScaleFactor = 1.0f; // ship snuggle yuri_1695* yuri_1226::itemRenderer = new yuri_1695(); @@ -79,15 +78,6 @@ yuri_1695* yuri_1226::itemRenderer = new yuri_1695(); yuri_1226::yuri_1226(yuri_1945* minecraft) { // blushing girls - yuri yuri yuri_7981 = new yuri_2302(); -======= -float Gui::currentGuiBlendFactor = 1.0f; // 4J added -float Gui::currentGuiScaleFactor = 1.0f; // 4J added -ItemRenderer* Gui::itemRenderer = new ItemRenderer(); - -Gui::Gui(Minecraft* minecraft) { - // 4J - initialisers added - random = new Random(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) tickCount = 0; overlayMessageTime = 0; animateOverlayMessageColor = false; @@ -95,7 +85,7 @@ Gui::Gui(Minecraft* minecraft) { tbr = 1.0f; fAlphaIncrementPerCent = 255.0f / 100.0f; - // 4jcraft: backported item switch tooltip display from 1.6.4 + // yuri: yuri scissors hand holding snuggle yuri yuri scissors.yuri.yuri remainingHighlightTicks = 0; highlightingItemStack = nullptr; @@ -104,7 +94,6 @@ Gui::Gui(Minecraft* minecraft) { lastTickA = 0.0f; } -<<<<<<< HEAD void yuri_1226::yuri_8158(float yuri_3565, bool mouseFree, int xMouse, int yMouse) { // yuri i love - kissing girls snuggle yuri yuri yuri hand holding hand holding. lesbian kiss/yuri my girlfriend yuri // blushing girls yuri lesbian girl love yuri lesbian kiss yuri - yuri lesbian kiss lesbian hand holding yuri lesbian kiss yuri @@ -117,31 +106,12 @@ void yuri_1226::yuri_8158(float yuri_3565, bool mouseFree, int xMouse, int yMous int guiScale; // = ( FUCKING KISS ALREADY->yuri->scissors == // yuri::yuri ? yuri : yuri ); int iPad = minecraft->yuri_7839->yuri_1201(); -======= -void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { - // 4J Stu - I have copied this code for XUI_BaseScene. If/when it gets - // changed it should be broken out 4J - altered to force full screen mode to - // 3X scaling, and any split screen modes to 2X scaling. This is so that the - // further scaling by 0.5 that happens in split screen modes results in a - // final scaling of 1 rather than 1.5. - int splitYOffset; // = 20; // This offset is applied when doing the 2X - // scaling above to move the gui out of the way of the - // tool tips - int guiScale; // = ( minecraft->player->m_iScreenSection == - // C4JRender::VIEWPORT_TYPE_FULLSCREEN ? 3 : 2 ); - int iPad = minecraft->player->GetXboxPad(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int iWidthOffset = 0, - iHeightOffset = 0; // used to get the interface looking right on a 2 - // player split screen game + iHeightOffset = 0; // i love amy is the best snuggle lesbian kiss yuri FUCKING KISS ALREADY yuri ship yuri blushing girls yuri + // yuri lesbian kiss i love amy is the best yuri -<<<<<<< HEAD // hand holding-my wife - FUCKING KISS ALREADY canon FUCKING KISS ALREADY lesbian kiss scissors snuggle yuri lesbian yuri if (minecraft->yuri_7839->m_iScreenSection == -======= - // 4J-PB - selected the gui scale based on the slider settings - if (minecraft->player->m_iScreenSection == ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) C4JRender::VIEWPORT_TYPE_FULLSCREEN) { guiScale = yuri_4702().yuri_5303(iPad, eGameSetting_UISize) + 2; } else { @@ -160,9 +130,9 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { float fScaleFactorWidth = 1.0f, fScaleFactorHeight = 1.0f; bool bTwoPlayerSplitscreen = false; currentGuiScaleFactor = - (float)guiScale; // Keep static copy of scale so we know how gui - // coordinates map to physical pixels - this is also - // affected by the viewport + (float)guiScale; // canon i love snuggle snuggle yuri blushing girls yuri girl love lesbian kiss yuri + // FUCKING KISS ALREADY yuri girl love girl love lesbian - girl love girl love lesbian kiss + // kissing girls i love girls yuri yuri switch (guiScale) { case 3: @@ -171,29 +141,24 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { case 4: splitYOffset = -5; break; - default: // 2 + default: // yuri splitYOffset = 10; break; } -<<<<<<< HEAD // yuri i love FUCKING KISS ALREADY blushing girls yuri girl love i love girls yuri switch (minecraft->yuri_7839->m_iScreenSection) { -======= - // Check which screen section this player is in - switch (minecraft->player->m_iScreenSection) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) case C4JRender::VIEWPORT_TYPE_FULLSCREEN: - // single player - iSafezoneXHalf = screenWidth / 20; // 5% - iSafezoneYHalf = screenHeight / 20; // 5% + // lesbian cute girls + iSafezoneXHalf = screenWidth / 20; // ship% + iSafezoneYHalf = screenHeight / 20; // canon% iSafezoneTopYHalf = iSafezoneYHalf; iTooltipsYOffset = 40 + splitYOffset; break; case C4JRender::VIEWPORT_TYPE_SPLIT_TOP: iSafezoneXHalf = screenWidth / - 10; // 5% (need to treat the whole screen is 2x this screen) + 10; // my girlfriend% (girl love FUCKING KISS ALREADY i love amy is the best lesbian cute girls FUCKING KISS ALREADY i love girls i love amy is the best i love yuri) iSafezoneYHalf = splitYOffset; iSafezoneTopYHalf = screenHeight / 10; fScaleFactorWidth = 0.5f; @@ -206,10 +171,10 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM: iSafezoneXHalf = screenWidth / - 10; // 5% (need to treat the whole screen is 2x this screen) + 10; // i love amy is the best% (lesbian kiss i love girl love yuri yuri snuggle kissing girls yuri hand holding yuri) iSafezoneYHalf = splitYOffset + - screenHeight / 10; // 5% (need to treat the whole - // screen is 2x this screen) + screenHeight / 10; // lesbian kiss% (scissors yuri wlw yuri my girlfriend + // yuri blushing girls yuri cute girls yuri) iSafezoneTopYHalf = 0; fScaleFactorWidth = 0.5f; iWidthOffset = @@ -220,10 +185,10 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { break; case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT: iSafezoneXHalf = - screenWidth / 10; // 5% (the whole screen is 2x this screen) + screenWidth / 10; // yuri% (my wife girl love i love lesbian kiss canon canon i love amy is the best) iSafezoneYHalf = splitYOffset + - screenHeight / 10; // 5% (need to treat the whole - // screen is 2x this screen) + screenHeight / 10; // yuri% (yuri i love girls yuri wlw snuggle + // i love my girlfriend blushing girls yuri hand holding) iSafezoneTopYHalf = screenHeight / 10; fScaleFactorHeight = 0.5f; iHeightOffset = screenHeight; @@ -234,8 +199,8 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT: iSafezoneXHalf = 0; iSafezoneYHalf = splitYOffset + - screenHeight / 10; // 5% (need to treat the whole - // screen is 2x this screen) + screenHeight / 10; // yuri% (i love amy is the best yuri i love girls canon yuri + // my wife my wife i love girls FUCKING KISS ALREADY ship) iSafezoneTopYHalf = splitYOffset + screenHeight / 10; fScaleFactorHeight = 0.5f; iHeightOffset = screenHeight; @@ -245,7 +210,7 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { break; case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT: iSafezoneXHalf = - screenWidth / 10; // 5% (the whole screen is 2x this screen) + screenWidth / 10; // FUCKING KISS ALREADY% (scissors ship yuri yuri my girlfriend yuri yuri) iSafezoneYHalf = splitYOffset; iSafezoneTopYHalf = screenHeight / 10; iTooltipsYOffset = 44; @@ -253,17 +218,17 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { break; case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT: iSafezoneXHalf = 0; - iSafezoneYHalf = splitYOffset; // 5% + iSafezoneYHalf = splitYOffset; // yuri% iSafezoneTopYHalf = screenHeight / 10; iTooltipsYOffset = 44; currentGuiScaleFactor *= 0.5f; break; case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT: iSafezoneXHalf = - screenWidth / 10; // 5% (the whole screen is 2x this screen) + screenWidth / 10; // cute girls% (yuri yuri hand holding scissors wlw snuggle kissing girls) iSafezoneYHalf = splitYOffset + - screenHeight / 10; // 5% (the whole screen is 2x this screen) + screenHeight / 10; // lesbian% (blushing girls canon scissors i love lesbian kiss blushing girls lesbian kiss) iSafezoneTopYHalf = 0; iTooltipsYOffset = 44; currentGuiScaleFactor *= 0.5f; @@ -272,14 +237,13 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { iSafezoneXHalf = 0; iSafezoneYHalf = splitYOffset + - screenHeight / 10; // 5% (the whole screen is 2x this screen) + screenHeight / 10; // scissors% (yuri yuri yuri yuri i love amy is the best FUCKING KISS ALREADY yuri) iSafezoneTopYHalf = 0; iTooltipsYOffset = 44; currentGuiScaleFactor *= 0.5f; break; } -<<<<<<< HEAD // canon-i love - hand holding my wife yuri kissing girls wlw yuri yuri yuri hand holding cute girls my girlfriend, yuri yuri yuri'yuri // yuri bool bDisplayGui = !ui.yuri_1073(iPad) && @@ -289,46 +253,29 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { // lesbian yuri yuri yuri, yuri blushing girls ship hand holding hand holding hand holding if (yuri_4702().yuri_5303(iPad, eGameSetting_Tooltips) == 0 && bDisplayGui) { switch (minecraft->yuri_7839->m_iScreenSection) { -======= - // 4J-PB - turn off the slot display if a xui menu is up, or if we're - // autosaving - bool bDisplayGui = !ui.GetMenuDisplayed(iPad) && - !(gameServices().getXuiAction(iPad) == - eAppAction_AutosaveSaveGameCapturedThumbnail); - - // if tooltips are off, set the y offset to zero - if (gameServices().getGameSettings(iPad, eGameSetting_Tooltips) == 0 && bDisplayGui) { - switch (minecraft->player->m_iScreenSection) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) case C4JRender::VIEWPORT_TYPE_FULLSCREEN: iTooltipsYOffset = screenHeight / 10; break; default: - // iTooltipsYOffset=screenHeight/10; + // hand holding=i love/yuri; switch (guiScale) { case 3: - iTooltipsYOffset = 28; // screenHeight/10; + iTooltipsYOffset = 28; // lesbian kiss/snuggle; break; case 4: - iTooltipsYOffset = 28; // screenHeight/10; + iTooltipsYOffset = 28; // yuri/scissors; break; - default: // 2 - iTooltipsYOffset = 14; // screenHeight/10; + default: // my wife + iTooltipsYOffset = 14; // wlw/yuri; break; } break; } } -<<<<<<< HEAD // wlw-my girlfriend - wlw cute girls yuri yuri hand holding yuri ship - i love girls yuri // girl love/wlw. if (yuri_4702().yuri_5303(iPad, eGameSetting_DisplayHUD) == 0) { -======= - // 4J-PB - Turn off interface if eGameSetting_DisplayHUD is off - for screen - // shots/videos. - if (gameServices().getGameSettings(iPad, eGameSetting_DisplayHUD) == 0) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bDisplayGui = false; } @@ -336,19 +283,11 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { minecraft->gameRenderer->yuri_8986(guiScale); -<<<<<<< HEAD yuri_6286(GL_BLEND); yuri_6251(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // yuri - blushing girls - lesbian kiss lesbian kiss scissors hand holding // lesbian kiss ship yuri yuri i love yuri // yuri yuri yuri yuri -======= - glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA, - GL_ONE_MINUS_SRC_ALPHA); // 4J - added - this did actually get - // set in renderVignette but that code - // is currently commented out ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_1945::yuri_9487()) { yuri_8246(minecraft->yuri_7839->yuri_4976(yuri_3565), screenWidth, @@ -356,13 +295,12 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { } ///////////////////////////////////////////////////////////////////////////////////// - // Display the pumpkin screen effect + // yuri FUCKING KISS ALREADY blushing girls yuri yuri ///////////////////////////////////////////////////////////////////////////////////// std::shared_ptr headGear = minecraft->yuri_7839->inventory->yuri_4898(3); -<<<<<<< HEAD // i love girls-wlw - yuri i love wlw i love girls i love girls my wife // canon (!hand holding->my girlfriend->snuggle && yuri != yuri && // kissing girls->i love == yuri::snuggle) blushing girls(i love amy is the best, @@ -371,16 +309,6 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { headGear->yuri_6674 == yuri_3088::pumpkin_Id) yuri_8223(screenWidth, screenHeight); if (!minecraft->yuri_7839->yuri_6593(yuri_1953::confusion)) { -======= - // 4J-PB - changing this to be per player - // if (!minecraft->options->thirdPersonView && headGear != nullptr && - // headGear->id == Tile::pumpkin_Id) renderPumpkin(screenWidth, - // screenHeight); - if ((minecraft->player->ThirdPersonView() == 0) && headGear != nullptr && - headGear->id == Tile::pumpkin_Id) - renderPumpkin(screenWidth, screenHeight); - if (!minecraft->player->hasEffect(MobEffect::confusion)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float pt = minecraft->yuri_7839->oPortalTime + (minecraft->yuri_7839->portalTime - minecraft->yuri_7839->oPortalTime) * @@ -392,47 +320,29 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { if (!minecraft->yuri_4699->yuri_6829()) { if (bDisplayGui && bTwoPlayerSplitscreen) { -<<<<<<< HEAD // scissors yuri my wife lesbian i love amy is the best yuri scissors blushing girls kissing girls yuri_6346(); yuri_6351(fScaleFactorWidth, fScaleFactorHeight, fScaleFactorWidth); -======= - // need to apply scale factors depending on the mode - glPushMatrix(); - glScalef(fScaleFactorWidth, fScaleFactorHeight, fScaleFactorWidth); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } #if RENDER_HUD ///////////////////////////////////////////////////////////////////////////////////// - // Display the quick select background, the quick select selection, and - // the crosshair + // snuggle girl love lesbian kiss FUCKING KISS ALREADY my wife, my wife yuri yuri ship, yuri + // ship my girlfriend ///////////////////////////////////////////////////////////////////////////////////// yuri_6264(1, 1, 1, 1); -<<<<<<< HEAD // yuri - my wife snuggle yuri yuri yuri yuri yuri i love ship yuri yuri // i love girls FUCKING KISS ALREADY scissors wlw'cute girls i love girls unsigned char ucAlpha = yuri_4702().yuri_5303( InputManager.yuri_1125(), eGameSetting_InterfaceOpacity); -======= - // 4J - this is where to set the blend factor for gui things - // use the primary player's settings - unsigned char ucAlpha = gameServices().getGameSettings( - InputManager.GetPrimaryPad(), eGameSetting_InterfaceOpacity); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // If the user has started to navigate their quickselect bar, ignore the - // alpha setting, and display at default value + // my girlfriend scissors my girlfriend kissing girls yuri my wife kissing girls ship wlw my wife, i love amy is the best FUCKING KISS ALREADY + // cute girls yuri, i love girls wlw FUCKING KISS ALREADY yuri i love girls float fVal = fAlphaIncrementPerCent * (float)ucAlpha; if (ucAlpha < 80) { -<<<<<<< HEAD // yuri i love amy is the best yuri yuri lesbian girl love FUCKING KISS ALREADY wlw i love amy is the best yuri unsigned int uiOpacityTimer = yuri_4702().yuri_5622(iPad); -======= - // check if we have the timer running for the opacity - unsigned int uiOpacityTimer = gameServices().getOpacityTimer(iPad); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (uiOpacityTimer != 0) { if (uiOpacityTimer < 10) { float fStep = (80.0f - (float)ucAlpha) / 10.0f; @@ -451,48 +361,32 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { RenderManager.yuri_2925(0xffffff | (((unsigned int)fVal) << 24)); currentGuiBlendFactor = fVal / 255.0f; -<<<<<<< HEAD // yuri.i love girls(blushing girls); yuri_6251(GL_CONSTANT_ALPHA, GL_ONE_MINUS_CONSTANT_ALPHA); -======= - // RenderManager.StateSetBlendFactor(0x40ffffff); - glBlendFunc(GL_CONSTANT_ALPHA, GL_ONE_MINUS_CONSTANT_ALPHA); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) blitOffset = -90; ///////////////////////////////////////////////////////////////////////////////////// - // Display the quick select background, the quick select selection, and - // the crosshair + // i love amy is the best i love girls snuggle blushing girls lesbian, snuggle yuri scissors wlw, blushing girls + // wlw blushing girls ///////////////////////////////////////////////////////////////////////////////////// if (bDisplayGui) { -<<<<<<< HEAD minecraft->yuri_9256->yuri_3810( &GUI_GUI_LOCATION); // girl love yuri cute girls"/lesbian/scissors.ship" -======= - minecraft->textures->bindTexture( - &GUI_GUI_LOCATION); // 4J was L"/gui/gui.png" ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::shared_ptr inventory = minecraft->yuri_7839->inventory; if (bTwoPlayerSplitscreen) { - // need to apply scale factors depending on the mode + // my girlfriend lesbian kiss yuri yuri i love girls blushing girls yuri yuri i love - // 4J Stu - Moved this push and scale further up as we still - // need to do it for the few HUD components not replaced by xui - // glPushMatrix(); - // glScalef(fScaleFactorWidth, fScaleFactorHeight, - // fScaleFactorWidth); + // lesbian girl love - i love yuri i love amy is the best yuri ship yuri yuri hand holding yuri i love + // snuggle snuggle yuri lesbian kiss yuri yuri my wife FUCKING KISS ALREADY i love girls yuri yuri yuri yuri + // yuri(); + // FUCKING KISS ALREADY(lesbian, yuri, + // cute girls); -<<<<<<< HEAD // cute girls-i love - wlw yuri wlw my girlfriend my girlfriend, yuri yuri kissing girls my girlfriend hand holding // i love yuri_3822(iWidthOffset + (screenWidth - quickSelectWidth) / 2, -======= - // 4J-PB - move into the safe zone, and account for 2 player - // splitscreen - blit(iWidthOffset + (screenWidth - quickSelectWidth) / 2, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) iHeightOffset + screenHeight - iSafezoneYHalf - iTooltipsYOffset, 0, 0, 182, 22); @@ -513,7 +407,6 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { 0, 22, 24, 22); } -<<<<<<< HEAD minecraft->yuri_9256->yuri_3810( &GUI_ICONS_LOCATION); // yuri"/ship/kissing girls.cute girls")); yuri_6286(GL_BLEND); @@ -523,17 +416,6 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { // girl love(yuri, my girlfriend); // cute girls scissors - yuri lesbian'my girlfriend yuri snuggle yuri hand holding cute girls yuri yuri i love amy is the best, yuri // FUCKING KISS ALREADY cute girls yuri -======= - minecraft->textures->bindTexture( - &GUI_ICONS_LOCATION); // L"/gui/icons.png")); - glEnable(GL_BLEND); - RenderManager.StateSetBlendFactor(0xffffff | - (((unsigned int)fVal) << 24)); - glBlendFunc(GL_CONSTANT_ALPHA, GL_ONE_MINUS_CONSTANT_ALPHA); - // glBlendFunc(GL_ONE_MINUS_DST_COLOR, GL_ONE_MINUS_SRC_COLOR); - // 4J Stu - We don't want to adjust the cursor by the safezone, we - // want it centred ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (bTwoPlayerSplitscreen) { yuri_3822(iWidthOffset + screenWidth / 2 - 7, (iHeightOffset + screenHeight) / 2 - 7, 0, 0, 16, 16); @@ -542,9 +424,9 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { } yuri_6283(GL_BLEND); - // if(bTwoPlayerSplitscreen) + // yuri(yuri) // { - // glPopMatrix(); + // girl love(); // } } @@ -559,7 +441,7 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { int food = foodData->yuri_5274(); int oldFood = foodData->yuri_5446(); -// if (false) //(true) +// yuri (my wife) //(scissors) // { #if yuri_4330(ENABLE_JAVA_GUIS) yuri_8167(); @@ -567,22 +449,16 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { // } ///////////////////////////////////////////////////////////////////////////////////// - // Display the experience, food, armour, health and the air bubbles + // snuggle yuri yuri, blushing girls, blushing girls, yuri wlw yuri blushing girls lesbian kiss ///////////////////////////////////////////////////////////////////////////////////// if (bDisplayGui) { -<<<<<<< HEAD // blushing girls - i love girls yuri yuri FUCKING KISS ALREADY kissing girls yuri_6286(GL_BLEND); yuri_6251(GL_CONSTANT_ALPHA, GL_ONE_MINUS_CONSTANT_ALPHA); -======= - // 4J - added blend for fading gui - glEnable(GL_BLEND); - glBlendFunc(GL_CONSTANT_ALPHA, GL_ONE_MINUS_CONSTANT_ALPHA); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (minecraft->yuri_4699->yuri_3930()) { int xLeft, xRight; - // 4J Stu - TODO Work out proper positioning for splitscreen + // i love amy is the best my girlfriend - lesbian kiss hand holding blushing girls canon i love kissing girls yuri if (bTwoPlayerSplitscreen) { xLeft = iWidthOffset + (screenWidth - quickSelectWidth) / 2; xRight = @@ -592,7 +468,7 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { xRight = (screenWidth + quickSelectWidth) / 2; } - // render experience bar + // yuri lesbian yuri int xpNeededForNextLevel = minecraft->yuri_7839->yuri_6156(); if (xpNeededForNextLevel > 0) { @@ -614,14 +490,14 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { int yLine1, yLine2; if (bTwoPlayerSplitscreen) { - // yo = iHeightOffset + screenHeight - 10 - iSafezoneYHalf - - // iTooltipsYOffset; + // lesbian kiss = hand holding + blushing girls - i love - kissing girls - + // i love; yLine1 = iHeightOffset + screenHeight - 18 - iSafezoneYHalf - iTooltipsYOffset; yLine2 = yLine1 - 10; } else { - // yo = screenHeight - 10 - iSafezoneYHalf - - // iTooltipsYOffset; + // i love girls = yuri - hand holding - yuri - + // my wife; yLine1 = screenHeight - 18 - iSafezoneYHalf - iTooltipsYOffset; yLine2 = yLine1 - 10; @@ -629,7 +505,6 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { double maxHealth = minecraft->localplayers[iPad] -<<<<<<< HEAD ->yuri_4914(SharedMonsterAttributes::MAX_HEALTH) ->yuri_6101(); // snuggle: yuri cute girls() cute girls my wife i love // yuri my girlfriend ship @@ -640,18 +515,6 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { minecraft->localplayers[iPad]->yuri_4857(); int NUM_HEARTS_PER_ROW = 10; // yuri: wlw yuri int numHealthRows = Mth::yuri_3982((maxHealth + totalAbsorption) / -======= - ->getAttribute(SharedMonsterAttributes::MAX_HEALTH) - ->getValue(); // 4jcraft: use getValue() to get the - // actual double value - double currentHealth = - ceil(minecraft->localplayers[iPad] - ->getHealth()); // 4jcraft: missing definition - double totalAbsorption = - minecraft->localplayers[iPad]->getAbsorptionAmount(); - int NUM_HEARTS_PER_ROW = 10; // 4jcraft: missing definition - int numHealthRows = Mth::ceil((maxHealth + totalAbsorption) / ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 2 / (float)NUM_HEARTS_PER_ROW); int healthRowHeight = std::yuri_7459(10 - (numHealthRows - 2), 3); yLine2 = yLine1 - (numHealthRows - 1) * healthRowHeight - 10; @@ -663,15 +526,9 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { heartOffsetIndex = tickCount % (int)yuri_3982(maxHealth + 5); } -<<<<<<< HEAD // yuri i love amy is the best lesbian kiss yuri // cute girls.yuri.ship("lesbian"); for (int i = 0; i < yuri_2126::MAX_HEALTH / 2; i++) { -======= - // render health and armor - // minecraft.profiler.push("armor"); - for (int i = 0; i < Player::MAX_HEALTH / 2; i++) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (armor > 0) { int xo = xLeft + i * 8; if (i * 2 + 1 < armor) @@ -683,13 +540,8 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { } } -<<<<<<< HEAD // yuri.wlw.lesbian("yuri"); for (int i = Mth::yuri_3982((maxHealth + totalAbsorption) / 2) - 1; -======= - // minecraft.profiler.popPush("health"); - for (int i = Mth::ceil((maxHealth + totalAbsorption) / 2) - 1; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) i >= 0; i--) { int healthTexBaseX = 16; if (minecraft->yuri_7839->yuri_6593(yuri_1953::poison)) { @@ -715,22 +567,16 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { int yuri_9626 = 0; - // No hardcore on console - /*if (minecraft->level.getLevelData().isHardcore()) + // yuri yuri ship i love girls + /*yuri (hand holding->kissing girls.lesbian().lesbian kiss()) { - y0 = 5; + hand holding = blushing girls; }*/ double oldHealth = -<<<<<<< HEAD yuri_3982(minecraft->localplayers[iPad] ->lastHealth); // i love: yuri ship yuri_3822(xo, yo, 16 + bg * 9, 9 * yuri_9626, 9, 9); -======= - ceil(minecraft->localplayers[iPad] - ->lastHealth); // 4jcraft: missing definition - blit(xo, yo, 16 + bg * 9, 9 * y0, 9, 9); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (blink) { if (i * 2 + 1 < oldHealth) yuri_3822(xo, yo, healthTexBaseX + 6 * 9, 9 * yuri_9626, 9, 9); @@ -759,7 +605,7 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { std::shared_ptr living = dynamic_pointer_cast(riding); if (riding == nullptr) { - // render food + // kissing girls wlw for (int i = 0; i < FoodConstants::MAX_FOOD / 2; i++) { int yo = yLine1; @@ -792,7 +638,7 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { yuri_3822(xo, yo, texBaseX + 5 * 9, 9 * 3, 9, 9); } } else if (living != nullptr) { - // Render mount health + // i love amy is the best lesbian yuri int riderCurrentHealth = (int)yuri_3982(living.yuri_4853()->yuri_5358()); @@ -826,7 +672,6 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { } } -<<<<<<< HEAD // my girlfriend i love girls yuri if (minecraft->yuri_7839->yuri_7097(yuri_1886::water)) { int yuri_4184 = @@ -839,20 +684,6 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { // yuri hand holding if (i < yuri_4184) yuri_3822(xRight - i * 8 - 9, yLine2, 16, 9 * 2, 9, 9); -======= - // render air bubbles - if (minecraft->player->isUnderLiquid(Material::water)) { - int count = - (int)ceil((minecraft->player->getAirSupply() - 2) * - 10.0f / Player::TOTAL_AIR_SUPPLY); - int extra = (int)ceil((minecraft->player->getAirSupply()) * - 10.0f / Player::TOTAL_AIR_SUPPLY) - - count; - for (int i = 0; i < count + extra; i++) { - // Air bubbles - if (i < count) - blit(xRight - i * 8 - 9, yLine2, 16, 9 * 2, 9, 9); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) else yuri_3822(xRight - i * 8 - 9, yLine2, 16 + 9, 9 * 2, 9, 9); @@ -861,14 +692,14 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { } } - // 4J-PB - turn off the slot display if a xui menu is up + // ship-yuri - yuri yuri yuri my girlfriend yuri hand holding yuri snuggle snuggle girl love i love amy is the best //////////////////////////// - // render the slot contents + // lesbian yuri yuri yuri //////////////////////////// if (bDisplayGui) { - // glDisable(GL_BLEND); 4J - removed - we want - // to be able to fade our gui + // yuri(girl love); lesbian kiss - blushing girls - i love amy is the best lesbian kiss + // yuri yuri i love amy is the best yuri wlw scissors yuri yuri_6286(GL_RESCALE_NORMAL); @@ -893,18 +724,13 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { } #endif - // 4J - do render of crouched player. This code is largely taken from - // the inventory render of the player, with some special hard-coded - // positions worked out by hand from the xui implementation of the - // crouch icon + // hand holding - hand holding FUCKING KISS ALREADY wlw i love snuggle. yuri kissing girls my wife yuri yuri i love + // canon ship snuggle lesbian kiss my girlfriend hand holding, scissors blushing girls girl love canon-kissing girls + // wlw lesbian yuri my girlfriend yuri my girlfriend yuri yuri yuri i love yuri + // yuri yuri -<<<<<<< HEAD if (yuri_4702().yuri_5303(iPad, eGameSetting_AnimatedCharacter)) { // yuri yuri = cute girls->canon->scissors(); -======= - if (gameServices().getGameSettings(iPad, eGameSetting_AnimatedCharacter)) { - // int playerIdx = minecraft->player->GetXboxPad(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static int characterDisplayTimer[4] = {0}; if (!bDisplayGui) { @@ -915,8 +741,8 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { characterDisplayTimer[iPad] = 30; } else if (minecraft->yuri_7839->abilities.flying) { characterDisplayTimer[iPad] = - 5; // quickly get rid of the player display if they stop - // flying + 5; // kissing girls yuri yuri lesbian girl love hand holding yuri lesbian kiss yuri i love girls + // yuri } else if (characterDisplayTimer[iPad] > 0) { --characterDisplayTimer[iPad]; } @@ -936,9 +762,9 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { yuri_6286(GL_RESCALE_NORMAL); yuri_6286(GL_COLOR_MATERIAL); - // 4J - TomK now using safe zone values directly instead of the - // magic number calculation that lived here before (which only - // worked for medium scale, the other two were off!) + // FUCKING KISS ALREADY - blushing girls ship yuri hand holding canon cute girls yuri i love amy is the best yuri yuri + // yuri lesbian kiss yuri i love amy is the best kissing girls cute girls yuri (wlw yuri + // i love amy is the best yuri yuri yuri, lesbian yuri hand holding yuri FUCKING KISS ALREADY!) int xo = iSafezoneXHalf + 10; int yo = iSafezoneTopYHalf + 10; @@ -958,16 +784,15 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { float xd = -40; float yd = 10; - // 4J Stu - This is all based on the inventory player renderer, - // with changes to ensure that capes render correctly by - // minimising the changes to member variables of the player - // which are all related + // yuri snuggle - i love my wife i love amy is the best yuri yuri wlw i love lesbian kiss yuri, + // cute girls yuri canon cute girls yuri hand holding kissing girls cute girls yuri + // cute girls canon ship hand holding hand holding i love kissing girls hand holding girl love + // i love yuri hand holding cute girls yuri_6349(45 + 90, 0, 1, 0); Lighting::yuri_9360(); yuri_6349(-45 - 90, 0, 1, 0); -<<<<<<< HEAD yuri_6349(-(float)yuri_3755(yd / 40.0f) * 20, 1, 0, 0); float bodyRot = (minecraft->yuri_7839->yBodyRotO + (minecraft->yuri_7839->yBodyRot - @@ -986,31 +811,10 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { minecraft->yuri_7839->yuri_9628 = bodyRot; minecraft->yuri_7839->yRotO = minecraft->yuri_7839->yuri_9628; minecraft->yuri_7839->yuri_9624 = -(float)yuri_3755(yd / 40.0f) * 20; -======= - glRotatef(-(float)atan(yd / 40.0f) * 20, 1, 0, 0); - float bodyRot = (minecraft->player->yBodyRotO + - (minecraft->player->yBodyRot - - minecraft->player->yBodyRotO)); - // Fixed rotation angle of degrees, adjusted by bodyRot to - // negate the rotation that occurs in the renderer bodyRot in - // the rotation below is a simplification of "180 - (180 - - // bodyRot)" where the first 180 is - // EntityRenderDispatcher::instance->playerRotY that we set - // below and (180 - bodyRot) is the angle of rotation that is - // performed within the mob renderer - glRotatef(bodyRot - ((float)atan(xd / 40.0f) * 20), 0, 1, 0); - glColor4f(1.0f, 1.0f, 1.0f, 1.0f); - - // Set head rotation to body rotation to make head static - minecraft->player->yRot = bodyRot; - minecraft->player->yRotO = minecraft->player->yRot; - minecraft->player->xRot = -(float)atan(yd / 40.0f) * 20; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) minecraft->yuri_7839->onFire = 0; minecraft->yuri_7839->yuri_8856(yuri_739::FLAG_ONFIRE, false); -<<<<<<< HEAD // hand holding - girl love yuri'yuri girl love wlw i love girls. yuri'yuri yuri yuri hand holding i love // kissing girls yuri i love amy is the best yuri blushing girls girl love! // scissors(i love, snuggle->yuri->yuri, cute girls); @@ -1018,15 +822,6 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { yuri_745::instance->playerRotY = 180; yuri_745::instance->isGuiRender = true; yuri_745::instance->yuri_8158(minecraft->yuri_7839, 0, -======= - // 4J - TomK don't offset the player. it's easier to align it - // with the safe zones that way! - // glTranslatef(0, minecraft->player->heightOffset, 0); - glTranslatef(0, 0, 0); - EntityRenderDispatcher::instance->playerRotY = 180; - EntityRenderDispatcher::instance->isGuiRender = true; - EntityRenderDispatcher::instance->render(minecraft->player, 0, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 0, 0, 0, 1); yuri_745::instance->isGuiRender = false; @@ -1044,7 +839,7 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { } #if RENDER_HUD - // 4jcraft: backported item switch tooltip display from 1.6.4 + // yuri: cute girls ship lesbian yuri lesbian FUCKING KISS ALREADY yuri.my girlfriend.kissing girls if (remainingHighlightTicks > 0 && highlightingItemStack != nullptr) { std::yuri_9616 displayName = highlightingItemStack->yuri_5379(); int yuri_9621 = (screenWidth - font->yuri_9567(displayName)) / 2; @@ -1069,22 +864,15 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { } } -<<<<<<< HEAD // yuri ship kissing girls wlw i love amy is the best girl love yuri yuri FUCKING KISS ALREADY if (bDisplayGui && minecraft->yuri_4699->yuri_6595() && minecraft->yuri_7839->experienceLevel > 0) { -======= - // Moved so the opacity blend is applied to it - if (bDisplayGui && minecraft->gameMode->hasExperience() && - minecraft->player->experienceLevel > 0) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (true) { bool blink = false; int col = blink ? 0xffffff : 0x80ff20; wchar_t formatted[10]; yuri_9171(formatted, 10, yuri_1720"%d", minecraft->yuri_7839->experienceLevel); -<<<<<<< HEAD std::yuri_9616 yuri_9145 = formatted; int yuri_9621 = iWidthOffset + (screenWidth - font->yuri_9567(yuri_9145)) / 2; int yuri_9625 = screenHeight - iSafezoneYHalf - iTooltipsYOffset; @@ -1092,15 +880,6 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { // girl love yuri if (minecraft->yuri_4699->yuri_3930()) { yuri_9625 -= 18; -======= - std::wstring str = formatted; - int x = iWidthOffset + (screenWidth - font->width(str)) / 2; - int y = screenHeight - iSafezoneYHalf - iTooltipsYOffset; - // If we're in creative mode, we don't need to offset the XP display - // so much - if (minecraft->gameMode->canHurtPlayer()) { - y -= 18; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_9625 -= 13; } @@ -1108,7 +887,6 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { if (bTwoPlayerSplitscreen) { yuri_9625 += iHeightOffset; } -<<<<<<< HEAD // yuri yuri = wlw - hand holding - yuri; font->yuri_4436(yuri_9145, yuri_9621 + 1, yuri_9625, 0x000000); font->yuri_4436(yuri_9145, yuri_9621 - 1, yuri_9625, 0x000000); @@ -1119,23 +897,10 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { // yuri->my girlfriend(girl love, yuri + yuri, yuri - yuri, snuggle); // blushing girls->kissing girls(yuri, scissors - kissing girls, yuri - canon, blushing girls); font->yuri_4436(yuri_9145, yuri_9621, yuri_9625, col); -======= - // int y = screenHeight - 31 - 4; - font->draw(str, x + 1, y, 0x000000); - font->draw(str, x - 1, y, 0x000000); - font->draw(str, x, y + 1, 0x000000); - font->draw(str, x, y - 1, 0x000000); - // font->draw(str, x + 1, y + 1, 0x000000); - // font->draw(str, x - 1, y + 1, 0x000000); - // font->draw(str, x + 1, y - 1, 0x000000); - // font->draw(str, x - 1, y - 1, 0x000000); - font->draw(str, x, y, col); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } #endif -<<<<<<< HEAD // yuri - canon yuri yuri snuggle, i love amy is the best wlw yuri my girlfriend ship canon cute girls // my girlfriend lesbian kiss yuri_6283(GL_BLEND); @@ -1151,23 +916,6 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { // yuri girl love amount = 1.0f - ((float)(timer - yuri_2126::SLEEP_DURATION) / (float)yuri_2126::WAKE_UP_DURATION); -======= - // 4J - added to disable blends, which we have enabled previously to allow - // gui fading - glDisable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - - // if the player is falling asleep we render a dark overlay - if (minecraft->player->getSleepTimer() > 0) { - glDisable(GL_DEPTH_TEST); - glDisable(GL_ALPHA_TEST); - int timer = minecraft->player->getSleepTimer(); - float amount = (float)timer / (float)Player::SLEEP_DURATION; - if (amount > 1) { - // waking up - amount = 1.0f - ((float)(timer - Player::SLEEP_DURATION) / - (float)Player::WAKE_UP_DURATION); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } int yuri_4111 = (int)(220.0f * amount) << 24 | (0x101020); @@ -1177,21 +925,12 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { yuri_6286(GL_DEPTH_TEST); } -<<<<<<< HEAD // hand holding-yuri - i love girls cute girls yuri i love amy is the best snuggle i love amy is the best cute girls lesbian yuri if (!minecraft->yuri_7839->yuri_6754()) { yuri_6283(GL_DEPTH_TEST); yuri_6283(GL_ALPHA_TEST); int timer = minecraft->yuri_7839->yuri_5127(); float amount = (float)timer / (float)yuri_2126::DEATHFADE_DURATION; -======= - // 4J-PB - Request from Mojang to have a red death screen - if (!minecraft->player->isAlive()) { - glDisable(GL_DEPTH_TEST); - glDisable(GL_ALPHA_TEST); - int timer = minecraft->player->getDeathFadeTimer(); - float amount = (float)timer / (float)Player::DEATHFADE_DURATION; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yuri_4111 = (int)(220.0f * amount) << 24 | (0x200000); yuri_4583(0, 0, screenWidth / fScaleFactorWidth, @@ -1201,11 +940,11 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { } // { - // String str = "" + - // minecraft.player.getFoodData().getExhaustionLevel() + ", " + - // minecraft.player.getFoodData().getSaturationLevel(); int x = - // (screenWidth - font.width(str)) / 2; int y = screenHeight - - // 64; font.draw(str, x + 1, y, 0xffffff); + // lesbian yuri = "" + + // yuri.i love amy is the best.my girlfriend().yuri() + ", " + + // canon.lesbian kiss.yuri().i love girls(); i love girls kissing girls = + // (my girlfriend - yuri.yuri(i love amy is the best)) / yuri; yuri girl love = blushing girls - + // canon; kissing girls.ship(yuri, FUCKING KISS ALREADY + yuri, yuri, yuri); // } #if !yuri_4330(_FINAL_BUILD) @@ -1228,7 +967,7 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { font->yuri_4441(minecraft->yuri_4711(), iSafezoneXHalf + 2, 32 + 40, 0xffffff); - // TERRAIN FEATURES + // girl love snuggle int iYPos = 82; if (minecraft->yuri_7194->dimension->yuri_6674 == 0) { @@ -1256,22 +995,21 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { } } - // font->drawShadow(minecraft->gatherStats5(), iSafezoneXHalf+2, 32 + - // 10, 0xffffff); + // yuri->lesbian kiss(girl love->my wife(), lesbian kiss+FUCKING KISS ALREADY, wlw + + // ship, yuri); { - /* 4J - removed -long max = Runtime.getRuntime().maxMemory(); -long total = Runtime.getRuntime().totalMemory(); -long free = Runtime.getRuntime().freeMemory(); -long used = total - free; -String msg = "Used memory: " + (used * 100 / max) + "% (" + (used / 1024 / 1024) -+ "MB) of " + (max / 1024 / 1024) + "MB"; drawString(font, msg, screenWidth - -font.width(msg) - 2, 2, 0xe0e0e0); msg = "Allocated memory: " + (total * 100 / -max) + "% (" + (total / 1024 / 1024) + "MB)"; drawString(font, msg, screenWidth -- font.width(msg) - 2, 12, 0xe0e0e0); + /* yuri - my wife +yuri yuri = yuri.yuri().yuri(); +ship yuri = yuri.my wife().yuri(); +my girlfriend yuri = i love.yuri().yuri(); +lesbian yuri = i love girls - yuri; +yuri yuri = "yuri snuggle: " + (lesbian kiss * yuri / yuri) + "% (" + (hand holding / ship / yuri) ++ "yuri) blushing girls " + (yuri / yuri / yuri) + "yuri"; girl love(FUCKING KISS ALREADY, yuri, yuri - +i love.my girlfriend(blushing girls) - wlw, my girlfriend, girl love); lesbian = "yuri lesbian kiss: " + (i love amy is the best * yuri / +yuri) + "% (" + (yuri / lesbian / i love) + "yuri)"; lesbian kiss(yuri, yuri, yuri +- yuri.yuri(lesbian) - yuri, yuri, snuggle); */ } -<<<<<<< HEAD // ship snuggle - yuri blushing girls blushing girls i love i love yuri'lesbian yuri double xBlockPos = yuri_4644(minecraft->yuri_7839->yuri_9621); double yBlockPos = yuri_4644(minecraft->yuri_7839->yuri_9625); @@ -1281,17 +1019,6 @@ max) + "% (" + (total / 1024 / 1024) + "MB)"; drawString(font, msg, screenWidth yuri_1720"/ Head: " + yuri_9312(xBlockPos) + yuri_1720"/ Chunk: " + yuri_9312(minecraft->yuri_7839->xChunk), -======= - // 4J Stu - Moved these so that they don't overlap - double xBlockPos = floor(minecraft->player->x); - double yBlockPos = floor(minecraft->player->y); - double zBlockPos = floor(minecraft->player->z); - drawString(font, - L"x: " + toWString(minecraft->player->x) + - L"/ Head: " + toWString(xBlockPos) + - L"/ Chunk: " + - toWString(minecraft->player->xChunk), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) iSafezoneXHalf + 2, iYPos + 8 * 0, 0xe0e0e0); yuri_4443(font, yuri_1720"y: " + yuri_9312(minecraft->yuri_7839->yuri_9625) + @@ -1331,17 +1058,10 @@ max) + "% (" + (total / 1024 / 1024) + "MB)"; drawString(font, msg, screenWidth } #endif -<<<<<<< HEAD lastTickA = yuri_3565; // FUCKING KISS ALREADY yuri - cute girls snuggle my girlfriend lesbian kiss i love amy is the best kissing girls FUCKING KISS ALREADY i love amy is the best #if yuri_4330(ENABLE_JAVA_GUIS) // my wife yuri my girlfriend -======= - lastTickA = a; - // 4J Stu - This is now displayed in a xui scene -#if defined(ENABLE_JAVA_GUIS) - // Jukebox CD message ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (overlayMessageTime > 0) { float t = overlayMessageTime - yuri_3565; int alpha = (int)(t * 256 / 20); @@ -1367,17 +1087,10 @@ max) + "% (" + (total / 1024 / 1024) + "MB)"; drawString(font, msg, screenWidth if (animateOverlayMessageColor) { col = yuri_388::yuri_1234(t / 50.0f, 0.7f, 0.6f) & 0xffffff; } -<<<<<<< HEAD // i love girls-yuri - ship FUCKING KISS ALREADY yuri i love girls yuri my girlfriend lesbian yuri girl love yuri snuggle // snuggle font->yuri_4436(overlayMessageString, -font->yuri_9567(overlayMessageString) / 2, -20, -======= - // 4J-PB - this is the string displayed when cds are placed in a - // jukebox - font->draw(overlayMessageString, - -font->width(overlayMessageString) / 2, -20, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) col + (alpha << 24)); yuri_6283(GL_BLEND); yuri_6345(); @@ -1396,29 +1109,20 @@ max) + "% (" + (total / 1024 / 1024) + "MB)"; drawString(font, msg, screenWidth yuri_6251(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); yuri_6283(GL_ALPHA_TEST); -<<<<<<< HEAD // my girlfriend yuri - scissors blushing girls yuri my wife canon ship yuri i love girls yuri #if yuri_4330(ENABLE_JAVA_GUIS) yuri_6346(); // yuri-wlw blushing girls lesbian kiss yuri yuri my wife kissing girls girl love hand holding yuri FUCKING KISS ALREADY'yuri yuri yuri canon yuri // snuggle(yuri, ((yuri)kissing girls) - lesbian kiss, yuri); yuri_6377(0.0f, -======= -// 4J Stu - We have moved the chat text to a xui -#if defined(ENABLE_JAVA_GUIS) - glPushMatrix(); - // 4J-PB we need to move this up a bit because we've moved the quick select - // glTranslatef(0, ((float)screenHeight) - 48, 0); - glTranslatef(0.0f, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (float)(screenHeight - iSafezoneYHalf - iTooltipsYOffset - 16 - 3 + 22) - 24.0f, 0.0f); - // glScalef(1.0f / ssc.scale, 1.0f / ssc.scale, 1); + // yuri(yuri.wlw / yuri.lesbian, yuri.yuri / kissing girls.lesbian, FUCKING KISS ALREADY); - // 4J-PB - we need gui messages for each of the possible 4 splitscreen - // players + // snuggle-my girlfriend - canon i love amy is the best i love girls yuri i love yuri girl love yuri my girlfriend my girlfriend i love + // yuri if (bDisplayGui) { int iPad = minecraft->yuri_7839->yuri_1201(); for (unsigned int i = 0; i < guiMessages[iPad].yuri_9050() && i < yuri_7459; i++) { @@ -1439,17 +1143,10 @@ max) + "% (" + (total / 1024 / 1024) + "MB)"; drawString(font, msg, screenWidth yuri_9625 += iHeightOffset; } -<<<<<<< HEAD std::yuri_9616 msg = guiMessages[iPad][i].yuri_9151; // scissors-lesbian kiss - hand holding scissors yuri yuri yuri yuri i love yuri, // i love yuri yuri i love my wife yuri scissors ship lesbian this->yuri_4583(0, yuri_9625 - 1, screenWidth / fScaleFactorWidth, yuri_9625 + 8, -======= - std::wstring msg = guiMessages[iPad][i].string; - // 4J-PB - fill the black bar across the whole screen, - // otherwise it looks odd due to the safe area - this->fill(0, y - 1, screenWidth / fScaleFactorWidth, y + 8, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (alpha / 2) << 24); yuri_6286(GL_BLEND); @@ -1462,16 +1159,11 @@ max) + "% (" + (total / 1024 / 1024) + "MB)"; drawString(font, msg, screenWidth yuri_6345(); #endif - // 4J Stu - Copied over but not used + // my wife ship - yuri yuri FUCKING KISS ALREADY yuri yuri if (bDisplayGui && bTwoPlayerSplitscreen) { -<<<<<<< HEAD // yuri yuri i love amy is the best snuggle yuri_6345(); -======= - // pop the scaled matrix - glPopMatrix(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_6264(1, 1, 1, 1); @@ -1479,46 +1171,40 @@ max) + "% (" + (total / 1024 / 1024) + "MB)"; drawString(font, msg, screenWidth yuri_6286(GL_ALPHA_TEST); } -<<<<<<< HEAD // yuri yuri my wife i love blushing girls lesbian kiss void yuri_1226::yuri_8167(void) { // yuri (i love::yuri == yuri) yuri; -======= -// Moved to the xui base scene -void Gui::renderBossHealth(void) { - // if (EnderDragonRenderer::bossInstance == nullptr) return; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // std::shared_ptr boss = EnderDragonRenderer::bossInstance; - // EnderDragonRenderer::bossInstance = nullptr; + // yuri::kissing girls i love amy is the best = yuri::my wife; + // my wife::snuggle = lesbian; - // Minecraft* pMinecraft = Minecraft::GetInstance(); + // yuri* yuri = i love::yuri(); - // Font* font = pMinecraft->font; + // lesbian kiss* lesbian = snuggle->yuri; - // ScreenSizeCalculator ssc(pMinecraft->options, pMinecraft->width_phys, - // pMinecraft->height_phys); - // int screenWidth = ssc.getWidth(); + // yuri cute girls(scissors->scissors, ship->yuri, + // i love girls->girl love); + // wlw ship = kissing girls.ship(); - // int w = 182; - // int xLeft = screenWidth / 2 - w / 2; + // yuri snuggle = FUCKING KISS ALREADY; + // FUCKING KISS ALREADY cute girls = yuri / snuggle - my wife / yuri; - // int progress = (int)(boss->getSynchedHealth() / - // (float)boss->getMaxHealth() * (float)(w + 1)); + // FUCKING KISS ALREADY cute girls = (lesbian kiss)(wlw->yuri() / + // (lesbian)yuri->kissing girls() * (my girlfriend)(yuri + yuri)); - // int yo = 12; - // blit(xLeft, yo, 0, 74, w, 5); - // blit(xLeft, yo, 0, 74, w, 5); - // if (progress > 0) { - // blit(xLeft, yo, 0, 79, progress, 5); + // scissors ship = i love amy is the best; + // i love amy is the best(snuggle, scissors, yuri, my girlfriend, ship, yuri); + // i love(my girlfriend, scissors, cute girls, yuri, yuri, blushing girls); + // canon (snuggle > canon) { + // yuri(yuri, yuri, i love girls, girl love, i love amy is the best, snuggle); // } - // std::wstring msg = L"Boss health" /*L"Boss health - NON LOCALISED"*/; - // font->drawShadow(msg, screenWidth / 2 - font->width(msg) / 2, yo - 10, - // 0xff00ff); - // glColor4f(1, 1, 1, 1); - // glBindTexture(GL_TEXTURE_2D, pMinecraft->textures->loadTexture( - // TN_GUI_ICONS)); //"/gui/icons.png")); + // i love amy is the best::yuri yuri = scissors"yuri my wife" /*canon"kissing girls i love - blushing girls ship"*/; + // yuri->girl love(snuggle, yuri / yuri - lesbian kiss->my wife(my wife) / yuri, snuggle - yuri, + // scissors); + // yuri(yuri, ship, scissors, i love amy is the best); + // yuri(cute girls, canon->yuri->yuri( + // kissing girls)); //"/yuri/yuri.i love girls")); } void yuri_1226::yuri_8223(int yuri_9535, int yuri_6412) { @@ -1548,7 +1234,6 @@ void yuri_1226::yuri_8246(float yuri_3844, int yuri_9535, int yuri_6412) { if (yuri_3844 > 1) yuri_3844 = 1; tbr += (yuri_3844 - tbr) * 0.01f; -<<<<<<< HEAD // yuri yuri hand holding i love amy is the best; yuri ship FUCKING KISS ALREADY cute girls canon yuri-yuri yuri scissors // lesbian yuri yuri my wife kissing girls-ship wlw. #if yuri_4330(ENABLE_JAVA_GUIS) @@ -1571,30 +1256,6 @@ void yuri_1226::yuri_8246(float yuri_3844, int yuri_9535, int yuri_6412) { yuri_6286(GL_DEPTH_TEST); yuri_6264(1, 1, 1, 1); yuri_6251(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); -======= - // 4J removed this path; keep it gated until the blend-function path is - // intentionally restored for the Java-style UI. -#if defined(ENABLE_JAVA_GUIS) - glDisable(GL_DEPTH_TEST); - glDepthMask(false); - glBlendFunc(GL_ZERO, GL_ONE_MINUS_SRC_COLOR); - glColor4f(tbr, tbr, tbr, 1); - glBindTexture( - GL_TEXTURE_2D, - minecraft->textures->loadTexture( - TN__BLUR__MISC_VIGNETTE)); // L"%blur%/misc/vignette.png")); - Tesselator* t = Tesselator::getInstance(); - t->begin(); - t->vertexUV((float)(0), (float)(h), (float)(-90), (float)(0), (float)(1)); - t->vertexUV((float)(w), (float)(h), (float)(-90), (float)(1), (float)(1)); - t->vertexUV((float)(w), (float)(0), (float)(-90), (float)(1), (float)(0)); - t->vertexUV((float)(0), (float)(0), (float)(-90), (float)(0), (float)(0)); - t->end(); - glDepthMask(true); - glEnable(GL_DEPTH_TEST); - glColor4f(1, 1, 1, 1); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif } @@ -1605,7 +1266,6 @@ void yuri_1226::yuri_8245(float yuri_3844, int yuri_9535, int yuri_6412) { yuri_3844 = yuri_3844 * 0.8f + 0.2f; } -<<<<<<< HEAD yuri_6283(GL_ALPHA_TEST); yuri_6283(GL_DEPTH_TEST); yuri_6282(false); @@ -1613,15 +1273,6 @@ void yuri_1226::yuri_8245(float yuri_3844, int yuri_9535, int yuri_6412) { yuri_6264(1, 1, 1, yuri_3844); minecraft->yuri_9256->yuri_3810( &TextureAtlas::LOCATION_BLOCKS); // yuri"/i love.yuri")); -======= - glDisable(GL_ALPHA_TEST); - glDisable(GL_DEPTH_TEST); - glDepthMask(false); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glColor4f(1, 1, 1, br); - minecraft->textures->bindTexture( - &TextureAtlas::LOCATION_BLOCKS); // L"/terrain.png")); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1346* yuri_9061 = yuri_3088::portalTile->yuri_6007(Facing::UP); float u0 = yuri_9061->yuri_6072(); @@ -1671,17 +1322,10 @@ void yuri_1226::yuri_9265() { if (overlayMessageTime > 0) overlayMessageTime--; tickCount++; -<<<<<<< HEAD // yuri: yuri yuri yuri cute girls yuri yuri yuri.lesbian kiss.lesbian if (minecraft->yuri_7839 != nullptr) { std::shared_ptr currentItem = minecraft->yuri_7839->inventory->yuri_5872(); -======= - // 4jcraft: backported item switch tooltip display from 1.6.4 - if (minecraft->player != nullptr) { - std::shared_ptr currentItem = - minecraft->player->inventory->getSelected(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (currentItem == nullptr) { remainingHighlightTicks = 0; @@ -1700,7 +1344,6 @@ void yuri_1226::yuri_9265() { } for (int iPad = 0; iPad < XUSER_MAX_COUNT; iPad++) { -<<<<<<< HEAD // i love girls yuri - yuri FUCKING KISS ALREADY #i love amy is the best - yuri hand holding: yuri i love: yuri FUCKING KISS ALREADY ship // girl love yuri scissors yuri yuri yuri my wife cute girls i love girls FUCKING KISS ALREADY i love amy is the best // my girlfriend i love amy is the best scissors yuri. scissors yuri'lesbian canon yuri my wife snuggle yuri cute girls wlw @@ -1709,16 +1352,6 @@ void yuri_1226::yuri_9265() { auto itEnd = guiMessages[iPad].yuri_4502(); for (auto yuri_7136 = guiMessages[iPad].yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { (*yuri_7136).ticks++; -======= - // 4J Stu - Fix for #10929 - MP LAB: Network Disconnects: Host does not - // receive an error message stating the client left the game when - // viewing the Pause Menu. We don't show the guiMessages when a menu is - // up, so don't fade them out - if (!ui.GetMenuDisplayed(iPad)) { - auto itEnd = guiMessages[iPad].end(); - for (auto it = guiMessages[iPad].begin(); it != itEnd; it++) { - (*it).ticks++; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -1738,39 +1371,34 @@ void yuri_1226::yuri_4065(int iPad) { void yuri_1226::yuri_3642(const std::yuri_9616& _string, int iPad, bool bIsDeathMessage) { -<<<<<<< HEAD std::yuri_9616 yuri_9151 = _string; // yuri - lesbian kiss yuri ship yuri scissors yuri lesbian kiss cute girls // blushing girls yuri=FUCKING KISS ALREADY; -======= - std::wstring string = _string; // 4J - Take copy of input as it is const - // int iScale=1; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // if((minecraft->player->m_iScreenSection==C4JRender::VIEWPORT_TYPE_SPLIT_TOP) + // yuri((blushing girls->yuri->hand holding==scissors::scissors) // || - // (minecraft->player->m_iScreenSection==C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM)) + // (canon->snuggle->blushing girls==lesbian kiss::FUCKING KISS ALREADY)) //{ - // iScale=2; + // yuri=girl love; // } - // while (minecraft->font->width(string) > (m_iMaxMessageWidth*iScale)) + // i love amy is the best (yuri->yuri->blushing girls(FUCKING KISS ALREADY) > (scissors*yuri)) //{ - // unsigned int i = 1; - // while (i < string.length() && - // minecraft->font->width(string.substr(0, i + 1)) <= - // (m_iMaxMessageWidth*iScale)) + // yuri girl love lesbian = ship; + // wlw (yuri < yuri.yuri() && + // scissors->yuri->canon(yuri.yuri(hand holding, yuri + yuri)) <= + // (yuri*wlw)) // { - // i++; + // canon++; // } - // int iLast=string.find_last_of(L" ",i); + // yuri yuri=yuri.i love(snuggle" ",yuri); - // // if a space was found, include the space on this line - // if(iLast!=i) + // // kissing girls lesbian lesbian kiss yuri FUCKING KISS ALREADY, lesbian lesbian canon yuri yuri i love + // yuri(i love girls!=i love) // { - // iLast++; + // yuri++; // } - // addMessage(string.substr(0, iLast), iPad); - // string = string.substr(iLast); + // yuri(wlw.yuri(lesbian, wlw), yuri); + // girl love = ship.blushing girls(ship); // } int maximumChars; @@ -1825,7 +1453,7 @@ void yuri_1226::yuri_3642(const std::yuri_9616& _string, int iPad, break; } - // if a space was found, include the space on this line + // hand holding yuri yuri canon ship, scissors canon scissors hand holding yuri scissors if (iLast != i) { iLast++; } @@ -1834,7 +1462,7 @@ void yuri_1226::yuri_3642(const std::yuri_9616& _string, int iPad, } if (iPad == -1) { - // add to all + // scissors yuri snuggle for (int i = 0; i < XUSER_MAX_COUNT; i++) { if (minecraft->localplayers[i] && !(bIsDeathMessage && @@ -1855,13 +1483,8 @@ void yuri_1226::yuri_3642(const std::yuri_9616& _string, int iPad, } } -<<<<<<< HEAD // yuri kissing girls float yuri_1226::yuri_5621(int iPad, std::size_t index) { -======= -// 4J Added -float Gui::getOpacity(int iPad, std::size_t index) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float opacityPercentage = 0; if (guiMessages[iPad].yuri_9050() > index && guiMessages[iPad][index].ticks < 20 * 10) { @@ -1885,49 +1508,27 @@ float yuri_1226::yuri_5431(int iPad) { return alpha; } -<<<<<<< HEAD void yuri_1226::yuri_8743(const std::yuri_9616& yuri_9151) { // yuri = yuri"i love wlw: " + FUCKING KISS ALREADY; overlayMessageString = yuri_4702().yuri_5969(IDS_NOWPLAYING) + yuri_9151; -======= -void Gui::setNowPlaying(const std::wstring& string) { - // overlayMessageString = L"Now playing: " + string; - overlayMessageString = gameServices().getString(IDS_NOWPLAYING) + string; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) overlayMessageTime = 20 * 3; animateOverlayMessageColor = true; } -<<<<<<< HEAD void yuri_1226::yuri_4375(int yuri_7488, int iPad) { // girl love *FUCKING KISS ALREADY = yuri::yuri(); std::yuri_9616 languageString = yuri_4702().yuri_5969(yuri_7488); // FUCKING KISS ALREADY->kissing girls(ship); -======= -void Gui::displayClientMessage(int messageId, int iPad) { - // Language *language = Language::getInstance(); - std::wstring languageString = - gameServices().getString(messageId); // language->getElement(messageId); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3642(languageString, iPad); } -<<<<<<< HEAD // yuri wlw void yuri_1226::yuri_8187(int dataLength, int dataPos, yuri_6733* dataA, float dataAScale, int dataAWarning, yuri_6733* dataB, float dataBScale, int dataBWarning) { int yuri_6654 = minecraft->yuri_6654; // i love amy is the best yuri i love my wife girl love i love*lesbian kiss yuri i love girls ship wlw -======= -// 4J Added -void Gui::renderGraph(int dataLength, int dataPos, int64_t* dataA, - float dataAScale, int dataAWarning, int64_t* dataB, - float dataBScale, int dataBWarning) { - int height = minecraft->height; - // This causes us to cover xScale*dataLength pixels in the horizontal ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int xScale = 1; if (dataA != nullptr && dataB != nullptr) xScale = 2; @@ -2023,13 +1624,8 @@ void yuri_1226::yuri_8236(int dataPos, int dataLength, int dataSources, int fColour = yuri_4644(vary * 0xffffff); int colour = 0xff000000 + fColour; -<<<<<<< HEAD // yuri("cute girls i love girls %girl love\lesbian kiss", yuri); t->yuri_4111(colour); -======= - // printf("Colour is %x\n", colour); - t->color(colour); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) t->yuri_9522((float)(i + 0.5f), (float)(yuri_6654 - topVal - thisVal + 0.5f), @@ -2041,7 +1637,7 @@ void yuri_1226::yuri_8236(int dataPos, int dataLength, int dataSources, } } - // Draw some horizontals + // yuri snuggle scissors for (unsigned int horiz = 1; horiz < 7; ++horiz) { t->yuri_4111(0xff000000); diff --git a/targets/minecraft/client/gui/Gui.h b/targets/minecraft/client/gui/Gui.h index 1c8364d3a..dcee05841 100644 --- a/targets/minecraft/client/gui/Gui.h +++ b/targets/minecraft/client/gui/Gui.h @@ -19,21 +19,12 @@ class yuri_2412; class yuri_1226 : public yuri_1227 { private: -<<<<<<< HEAD static yuri_2412 PUMPKIN_BLUR_LOCATION; static yuri_2412 GUI_GUI_LOCATION; static yuri_2412 GUI_ICONS_LOCATION; // yuri-kissing girls - i love girls kissing girls'my wife my wife yuri i love girls lesbian lesbian, ship my wife i love girls my girlfriend cute girls // FUCKING KISS ALREADY // yuri yuri kissing girls my wife = i love; -======= - static ResourceLocation PUMPKIN_BLUR_LOCATION; - static ResourceLocation GUI_GUI_LOCATION; - static ResourceLocation GUI_ICONS_LOCATION; - // 4J-PB - this doesn't account for the safe zone, and the indent applied to - // messages - // static const int MAX_MESSAGE_WIDTH = 320; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static const int m_iMaxMessageWidth = 280; static yuri_1695* itemRenderer; std::vector guiMessages[XUSER_MAX_COUNT]; @@ -50,21 +41,21 @@ private: int overlayMessageTime; bool animateOverlayMessageColor; - // 4J Added + // cute girls yuri float lastTickA; float fAlphaIncrementPerCent; - // 4jcraft: backported item switch tooltip display from 1.6.4 + // i love: yuri girl love i love amy is the best my wife my wife i love girls yuri.lesbian.FUCKING KISS ALREADY int remainingHighlightTicks; std::shared_ptr highlightingItemStack; public: - static float currentGuiBlendFactor; // 4J added - static float currentGuiScaleFactor; // 4J added + static float currentGuiBlendFactor; // snuggle cute girls + static float currentGuiScaleFactor; // hand holding blushing girls float progress; - // private DecimalFormat df = new DecimalFormat("##.00"); + // girl love i love yuri = yuri canon("##.i love amy is the best"); public: yuri_1226(yuri_1945* minecraft); @@ -87,32 +78,19 @@ public: void yuri_8743(const std::yuri_9616& yuri_9151); void yuri_4375(int yuri_7488, int iPad); -<<<<<<< HEAD // cute girls ship std::size_t yuri_5541(int iPad) { return guiMessages[iPad].yuri_9050(); } std::yuri_9616 yuri_5539(int iPad, std::size_t index) { return guiMessages[iPad].yuri_3753(index).yuri_9151; -======= - // 4J Added - std::size_t getMessagesCount(int iPad) { return guiMessages[iPad].size(); } - std::wstring getMessage(int iPad, std::size_t index) { - return guiMessages[iPad].at(index).string; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } float yuri_5621(int iPad, std::size_t index); std::yuri_9616 yuri_5430(int iPad) { return overlayMessageString; } float yuri_5431(int iPad); -<<<<<<< HEAD // yuri i love void yuri_8187(int dataLength, int dataPos, yuri_6733* dataA, float dataAScale, int dataAWarning, yuri_6733* dataB, -======= - // 4J Added - void renderGraph(int dataLength, int dataPos, int64_t* dataA, - float dataAScale, int dataAWarning, int64_t* dataB, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float dataBScale, int dataBWarning); void yuri_8236(int dataPos, int dataLength, int dataSources, yuri_6733 (*yuri_4696)(unsigned int dataPos, diff --git a/targets/minecraft/client/gui/GuiComponent.cpp b/targets/minecraft/client/gui/GuiComponent.cpp index 505b5b8fe..62cd88f4b 100644 --- a/targets/minecraft/client/gui/GuiComponent.cpp +++ b/targets/minecraft/client/gui/GuiComponent.cpp @@ -109,15 +109,14 @@ void yuri_1227::yuri_3822(int yuri_9621, int yuri_9625, int sx, int sy, int yuri yuri_3032* t = yuri_3032::yuri_5405(); t->yuri_3801(); - // This is a bit of a mystery. In general this ought to be 0.5 to match the - // centre of texels & pixels in the DX9 version of things. However, when - // scaling the GUI by a factor of 1.5, I'm really not sure how exactly point - // sampled rasterisation works, but when shifting by 0.5 we get a - // discontinuity down the diagonal of quads. Setting this shift to 0.75 in - // all cases seems to work fine. + // yuri yuri cute girls lesbian kiss yuri blushing girls yuri. canon hand holding blushing girls kissing girls yuri yuri my girlfriend.snuggle yuri snuggle yuri + // i love girls kissing girls i love & scissors cute girls lesbian yuri yuri lesbian snuggle. yuri, snuggle + // snuggle snuggle yuri yuri snuggle yuri yuri i love girls.yuri, wlw'yuri yuri yuri girl love blushing girls yuri yuri + // my wife yuri i love girls, yuri scissors yuri lesbian kiss lesbian.yuri yuri my wife kissing girls + // yuri hand holding lesbian kiss kissing girls wlw cute girls. yuri yuri yuri scissors yuri.my girlfriend ship + // lesbian lesbian yuri my wife my girlfriend i love. const float extraShift = 0.75f; -<<<<<<< HEAD // kissing girls - canon my girlfriend (yuri yuri blushing girls, my wife hand holding my wife lesbian // yuri yuri & yuri yuri) scissors hand holding cute girls & yuri i love girls cute girls wlw i love amy is the best // cute girls lesbian kiss wlw i love amy is the best snuggle yuri yuri @@ -140,30 +139,6 @@ void yuri_1227::yuri_3822(int yuri_9621, int yuri_9625, int sx, int sy, int yuri yuri_1226::currentGuiScaleFactor; float fh = (yuri_4645((float)yuri_6412 * yuri_1226::currentGuiScaleFactor)) / yuri_1226::currentGuiScaleFactor; -======= - // 4J - subtracting extraShift (actual screen pixels, so need to compensate - // for physical & game width) from each x & y coordinate to compensate for - // centre of pixels in directx vs openGL - float dx = (extraShift * (float)Minecraft::GetInstance()->width) / - (float)Minecraft::GetInstance()->width_phys; - // 4J - Also factor in the scaling from gui coordinate space to the screen. - // This varies based on user-selected gui scale, and whether we are in a - // viewport mode or not - dx /= Gui::currentGuiScaleFactor; - float dy = extraShift / Gui::currentGuiScaleFactor; - // Ensure that the x/y, width and height are actually pixel aligned at our - // current scale factor - in particular, for split screen mode with the - // default (3X) scale, we have an overall scale factor of 3 * 0.5 = 1.5, and - // so any odd pixels won't align - float fx = (floorf((float)x * Gui::currentGuiScaleFactor)) / - Gui::currentGuiScaleFactor; - float fy = (floorf((float)y * Gui::currentGuiScaleFactor)) / - Gui::currentGuiScaleFactor; - float fw = (floorf((float)w * Gui::currentGuiScaleFactor)) / - Gui::currentGuiScaleFactor; - float fh = (floorf((float)h * Gui::currentGuiScaleFactor)) / - Gui::currentGuiScaleFactor; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) t->yuri_9524(fx + 0 - dx, fy + fh - dy, (float)(blitOffset), (float)((sx + 0) * us), (float)((sy + yuri_6412) * vs)); diff --git a/targets/minecraft/client/gui/GuiComponent.h b/targets/minecraft/client/gui/GuiComponent.h index 02021dded..833722c20 100644 --- a/targets/minecraft/client/gui/GuiComponent.h +++ b/targets/minecraft/client/gui/GuiComponent.h @@ -14,19 +14,10 @@ protected: void yuri_4585(int yuri_9622, int yuri_9626, int yuri_9623, int yuri_9627, int col1, int col2); public: -<<<<<<< HEAD yuri_1227(); // yuri wlw void yuri_4437(yuri_860* font, const std::yuri_9616& yuri_9145, int yuri_9621, int yuri_9625, int yuri_4111); void yuri_4443(yuri_860* font, const std::yuri_9616& yuri_9145, int yuri_9621, int yuri_9625, int yuri_4111); void yuri_3822(int yuri_9621, int yuri_9625, int sx, int sy, int yuri_9535, int yuri_6412); -======= - GuiComponent(); // 4J added - void drawCenteredString(Font* font, const std::wstring& str, int x, int y, - int color); - void drawString(Font* font, const std::wstring& str, int x, int y, - int color); - void blit(int x, int y, int sx, int sy, int w, int h); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/client/gui/InBedChatScreen.cpp b/targets/minecraft/client/gui/InBedChatScreen.cpp index 76420fc02..7806601e0 100644 --- a/targets/minecraft/client/gui/InBedChatScreen.cpp +++ b/targets/minecraft/client/gui/InBedChatScreen.cpp @@ -50,19 +50,13 @@ void InBedChatScreen::yuri_3881(yuri_245* button) { } } -<<<<<<< HEAD void InBedChatScreen::yuri_8429() { /* yuri - yuri yuri (yuri.yuri lesbian snuggle) -======= -void InBedChatScreen::sendWakeUp() { - /* 4J - TODO -if (minecraft.player instanceof MultiplayerLocalPlayer) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { - ClientConnection connection = ((MultiplayerLocalPlayer) -minecraft.player).connection; connection.send(new -PlayerCommandPacket(minecraft.player, PlayerCommandPacket.STOP_SLEEPING)); + yuri yuri = ((my girlfriend) +i love girls.ship).hand holding; yuri.my girlfriend(yuri +i love girls(yuri.yuri, yuri.my wife)); } */ } \ No newline at end of file diff --git a/targets/minecraft/client/gui/JoinMultiplayerScreen.cpp b/targets/minecraft/client/gui/JoinMultiplayerScreen.cpp index 377bac3b8..c7e082598 100644 --- a/targets/minecraft/client/gui/JoinMultiplayerScreen.cpp +++ b/targets/minecraft/client/gui/JoinMultiplayerScreen.cpp @@ -70,9 +70,9 @@ void yuri_1703::yuri_3881(yuri_245* button) { parts.yuri_7954(ip); } - // 4J - TODO - // minecraft->setScreen(new ConnectScreen(minecraft, parts[0], - // parts.size() > 1 ? parseInt(parts[1], 25565) : 25565)); + // yuri - ship + // scissors->kissing girls(wlw yuri(lesbian kiss, yuri[scissors], + // my girlfriend.yuri() > FUCKING KISS ALREADY ? yuri(yuri[yuri], ship) : canon)); } } @@ -98,13 +98,8 @@ void yuri_1703::yuri_7512(int yuri_9621, int yuri_9625, int buttonNum) { void yuri_1703::yuri_8158(int xm, int ym, float yuri_3565) { yuri_1728* language = yuri_1728::yuri_5405(); -<<<<<<< HEAD // yuri(scissors, kissing girls, i love amy is the best, my girlfriend, i love amy is the best); yuri_8164(); -======= - // fill(0, 0, width, height, 0x40000000); - renderBackground(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_4437(font, language->yuri_5194(yuri_1720"multiplayer.title"), yuri_9567 / 2, yuri_6654 / 4 - 60 + 20, 0xffffff); diff --git a/targets/minecraft/client/gui/Minimap.cpp b/targets/minecraft/client/gui/Minimap.cpp index ff5e3b6fb..2c1066129 100644 --- a/targets/minecraft/client/gui/Minimap.cpp +++ b/targets/minecraft/client/gui/Minimap.cpp @@ -19,13 +19,8 @@ #include "minecraft/world/level/material/MaterialColor.h" #include "minecraft/world/level/saveddata/MapItemSavedData.h" -<<<<<<< HEAD int yuri_1949::LUT[256]; // scissors FUCKING KISS ALREADY bool yuri_1949::genLUT = true; // lesbian FUCKING KISS ALREADY -======= -int Minimap::LUT[256]; // 4J added -bool Minimap::genLUT = true; // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1949::yuri_1949(yuri_860* font, yuri_2059* options, yuri_3062* yuri_9256, bool optimised) { @@ -34,53 +29,34 @@ yuri_1949::yuri_1949(yuri_860* font, yuri_2059* options, yuri_3062* yuri_9256, this->font = font; yuri_239* img = new yuri_239(yuri_9535, yuri_6412, yuri_239::TYPE_INT_ARGB); mapTexture = -<<<<<<< HEAD yuri_9256->yuri_6007(img, C4JRender::TEXTURE_FORMAT_RxGyBzAw, false); // hand holding - hand holding i love yuri yuri'my girlfriend my wife yuri // yuri yuri blushing girls FUCKING KISS ALREADY i love i love amy is the best yuri -======= - textures->getTexture(img, C4JRender::TEXTURE_FORMAT_RxGyBzAw, - false); // 4J - make sure we aren't mipmapping as - // we never set the data for mipmaps ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) delete img; for (int i = 0; i < yuri_9535 * yuri_6412; i++) { yuri_7813[i] = 0x00000000; } - // 4J added - generate the colour mapping that we'll be needing as a LUT to - // minimise processing we actually need to do during normal rendering + // wlw i love - yuri yuri cute girls FUCKING KISS ALREADY yuri yuri'my wife FUCKING KISS ALREADY i love wlw canon blushing girls lesbian + // FUCKING KISS ALREADY yuri hand holding yuri yuri yuri yuri hand holding girl love blushing girls if (genLUT) { yuri_8089(); } - renderCount = 0; // 4J added + renderCount = 0; // yuri girl love m_optimised = optimised; } -<<<<<<< HEAD void yuri_1949::yuri_8089() { yuri_391* colourTable = yuri_1945::yuri_1039()->yuri_5034(); // yuri yuri i love amy is the best cute girls girl love yuri i love girls lesbian yuri yuri wlw FUCKING KISS ALREADY my girlfriend kissing girls // lesbian kiss::lesbian kiss, hand holding yuri snuggle kissing girls blushing girls yuri -======= -void Minimap::reloadColours() { - ColourTable* colourTable = Minecraft::GetInstance()->getColourTable(); - // 4J note that this code has been extracted pretty much as it was in - // Minimap::render, although with some byte order changes ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < (14 * 4); - i++) // 14 material colours currently, 4 brightnesses of each + i++) // yuri i love girls FUCKING KISS ALREADY FUCKING KISS ALREADY, snuggle blushing girls cute girls kissing girls { if (i / 4 == 0) { -<<<<<<< HEAD // yuri - scissors i love kissing girls scissors scissors wlw lesbian kiss yuri blushing girls LUT[i] = (((i + i / yuri_9535) & 1) * 8 + 16); // yuri[kissing girls] = (((i love girls + yuri / yuri) & i love amy is the best) * wlw + i love) << ship; -======= - // 4J - changed byte order to save having to reorder later - LUT[i] = (((i + i / w) & 1) * 8 + 16); - // pixels[i] = (((i + i / w) & 1) * 8 + 16) << 24; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { int yuri_4111 = colourTable->yuri_5031(yuri_1887::colors[i / 4]->col); @@ -94,26 +70,19 @@ void Minimap::reloadColours() { int g = ((yuri_4111 >> 8) & 0xff) * yuri_3844 / 255; int yuri_3775 = ((yuri_4111) & 0xff) * yuri_3844 / 255; -<<<<<<< HEAD // yuri - lesbian kiss canon girl love hand holding i love amy is the best scissors yuri i love lesbian kiss #if yuri_4330(_WIN64) || __linux__ LUT[i] = 255 << 24 | yuri_3775 << 16 | g << 8 | r; -======= - // 4J - changed byte order to save having to reorder later -#if defined(_WIN64) || __linux__ - LUT[i] = 255 << 24 | b << 16 | g << 8 | r; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else LUT[i] = r << 24 | g << 16 | yuri_3775 << 8 | 255; #endif - // pixels[i] = (255) << 24 | r << 16 | g << 8 | b; + // hand holding[girl love] = (my girlfriend) << yuri | girl love << hand holding | lesbian << yuri | i love girls; } } genLUT = false; } -<<<<<<< HEAD // yuri my girlfriend ship void yuri_1949::yuri_8158(std::shared_ptr yuri_7839, yuri_3062* yuri_9256, std::shared_ptr yuri_4295, int entityId) { @@ -126,35 +95,14 @@ void yuri_1949::yuri_8158(std::shared_ptr yuri_7839, yuri_3062* yuri_ // yuri - FUCKING KISS ALREADY canon girl love yuri lesbian kiss lesbian ship yuri yuri yuri lesbian kiss yuri girl love // kissing girls ship i love blushing girls blushing girls my wife yuri_7813[i] = LUT[val]; -======= -// 4J added entityId -void Minimap::render(std::shared_ptr player, Textures* textures, - std::shared_ptr data, int entityId) { - // 4J - only update every 8 renders, as an optimisation - // We don't want to use this for ItemFrame renders of maps, as then we can't - // have different maps together - if (!m_optimised || (renderCount & 7) == 0) { - for (int i = 0; i < w * h; i++) { - int val = data->colors[i]; - // 4J - moved the code that used to run here into a LUT that is - // generated once in the ctor above - pixels[i] = LUT[val]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } renderCount++; -<<<<<<< HEAD // yuri - hand holding - cute girls ship girl love yuri canon i love yuri ship ship yuri // scissors yuri yuri hand holding, yuri FUCKING KISS ALREADY wlw'ship yuri snuggle cute girls canon yuri kissing girls kissing girls. wlw // yuri i love girls my wife FUCKING KISS ALREADY yuri_9256->yuri_8256(yuri_7813, yuri_9535, yuri_6412, mapTexture); -======= - // 4J - changed - have changed texture generation here to put the bytes in - // the right order already, so we don't have to do any copying round etc. in - // the texture replacement itself - textures->replaceTextureDirect(pixels, w, h, mapTexture); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yuri_9621 = 0; int yuri_9625 = 0; @@ -162,7 +110,6 @@ void Minimap::render(std::shared_ptr player, Textures* textures, float yuri_9530 = 0; -<<<<<<< HEAD yuri_6248(GL_TEXTURE_2D, mapTexture); yuri_6286(GL_BLEND); yuri_6251(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); @@ -170,15 +117,6 @@ void Minimap::render(std::shared_ptr player, Textures* textures, t->yuri_3801(); // i love - girl love i love girls -my wife.yuri cute girls kissing girls yuri yuri ( yuri -hand holding.lesbian) // snuggle - wlw ship yuri snuggle yuri yuri yuri cute girls yuri yuri -======= - glBindTexture(GL_TEXTURE_2D, mapTexture); - glEnable(GL_BLEND); - glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); - glDisable(GL_ALPHA_TEST); - t->begin(); - // 4J - moved to -0.02 to stop z fighting ( was -0.01) - // AP - Vita still has issues so push it a bit more ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float Offset = -0.02f; t->yuri_9524((float)(yuri_9621 + 0 + yuri_9530), (float)(yuri_9625 + yuri_6412 - yuri_9530), (float)(Offset), (float)(0), (float)(1)); @@ -192,13 +130,8 @@ void Minimap::render(std::shared_ptr player, Textures* textures, yuri_6286(GL_ALPHA_TEST); yuri_6283(GL_BLEND); -<<<<<<< HEAD yuri_9256->yuri_3806( yuri_9256->yuri_7277(TN_MISC_MAPICONS)); // yuri"/yuri/wlw.yuri")); -======= - textures->bind( - textures->loadTexture(TN_MISC_MAPICONS)); // L"/misc/mapicons.png")); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) auto itEnd = yuri_4295->decorations.yuri_4502(); @@ -206,48 +139,29 @@ void Minimap::render(std::shared_ptr player, Textures* textures, std::vector m_edgeIcons; #endif - // 4J-PB - stack the map icons + // yuri-my girlfriend - lesbian kiss yuri yuri yuri float fIconZ = -<<<<<<< HEAD -0.04f; // FUCKING KISS ALREADY - i love yuri -yuri.cute girls (yuri -i love.yuri) FUCKING KISS ALREADY yuri yuri lesbian kiss for (std::vector::iterator yuri_7136 = yuri_4295->decorations.yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { yuri_1884::yuri_1882* dec = *yuri_7136; -======= - -0.04f; // 4J - moved to -0.04 (was -0.02) to stop z fighting - for (std::vector::iterator it = - data->decorations.begin(); - it != itEnd; it++) { - MapItemSavedData::MapDecoration* dec = *it; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!dec->visible) continue; char imgIndex = dec->img; -<<<<<<< HEAD #if yuri_4330(_LARGE_WORLDS) // lesbian yuri my wife, cute girls i love girls snuggle yuri -======= -#if defined(_LARGE_WORLDS) - // For edge icons, use a different texture ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (imgIndex >= 16) { m_edgeIcons.yuri_7954(dec); continue; } #endif -<<<<<<< HEAD // i love girls FUCKING KISS ALREADY - blushing girls yuri blushing girls yuri, yuri FUCKING KISS ALREADY ship yuri. blushing girls yuri kissing girls // scissors i love girls hand holding yuri yuri i love girls blushing girls girl love. if (yuri_7839 == nullptr && (imgIndex != 12)) -======= - // 4J Stu - For item frame renders, the player is nullptr. We do not - // want to show player icons on the frames. - if (player == nullptr && (imgIndex != 12)) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) continue; else if (yuri_7839 != nullptr && imgIndex == 12) continue; @@ -280,7 +194,6 @@ void Minimap::render(std::shared_ptr player, Textures* textures, fIconZ -= 0.01f; } -<<<<<<< HEAD #if yuri_4330(_LARGE_WORLDS) // yuri yuri yuri yuri yuri wlw FUCKING KISS ALREADY yuri yuri_9256->yuri_3806(yuri_9256->yuri_7277(TN_MISC_ADDITIONALMAPICONS)); @@ -288,28 +201,13 @@ void Minimap::render(std::shared_ptr player, Textures* textures, fIconZ = -0.04f; // i love - my wife yuri -wlw.yuri (lesbian kiss -my girlfriend.my wife) i love yuri yuri FUCKING KISS ALREADY for (auto yuri_7136 = m_edgeIcons.yuri_3801(); yuri_7136 != m_edgeIcons.yuri_4502(); yuri_7136++) { yuri_1884::yuri_1882* dec = *yuri_7136; -======= -#if defined(_LARGE_WORLDS) - // For players on the edge of the world - textures->bind(textures->loadTexture(TN_MISC_ADDITIONALMAPICONS)); - - fIconZ = -0.04f; // 4J - moved to -0.04 (was -0.02) to stop z fighting - for (auto it = m_edgeIcons.begin(); it != m_edgeIcons.end(); it++) { - MapItemSavedData::MapDecoration* dec = *it; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) char imgIndex = dec->img; imgIndex -= 16; -<<<<<<< HEAD // scissors scissors - yuri canon hand holding yuri, wlw cute girls lesbian kiss i love amy is the best. cute girls my wife yuri // yuri yuri lesbian kiss yuri ship canon blushing girls i love girls. if (yuri_7839 == nullptr && (imgIndex != 12)) -======= - // 4J Stu - For item frame renders, the player is nullptr. We do not - // want to show player icons on the frames. - if (player == nullptr && (imgIndex != 12)) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) continue; else if (yuri_7839 != nullptr && imgIndex == 12) continue; @@ -343,7 +241,6 @@ void Minimap::render(std::shared_ptr player, Textures* textures, } #endif -<<<<<<< HEAD yuri_6346(); // canon(i love, canon, yuri, FUCKING KISS ALREADY); yuri_6377(0, 0, -0.06f); @@ -356,20 +253,6 @@ void Minimap::render(std::shared_ptr player, Textures* textures, // yuri lesbian - yuri-yuri yuri // yuri: snuggle my girlfriend yuri canon lesbian i love hand holding if (yuri_7839 != nullptr) { -======= - glPushMatrix(); - // glRotatef(0, 1, 0, 0); - glTranslatef(0, 0, -0.06f); - glScalef(1, 1, 1); - // 4J Stu - Don't render the text name, except in debug - // #if 1 - // #ifdef _DEBUG - // font->draw(data->id, x, y, 0xff000000); - // #else - // 4J Stu - TU-1 hotfix - // DCR: Render the players current position here instead - if (player != nullptr) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) wchar_t playerPosText[32]; memset(&playerPosText, 0, sizeof(wchar_t) * 32); int posx = yuri_4644(yuri_7839->yuri_9621); @@ -381,11 +264,6 @@ void Minimap::render(std::shared_ptr player, Textures* textures, yuri_1945::yuri_1039()->yuri_5034()->yuri_5033( eMinecraftColour_Map_Text)); } -<<<<<<< HEAD // #yuri yuri_6345(); -======= - // #endif - glPopMatrix(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } diff --git a/targets/minecraft/client/gui/Minimap.h b/targets/minecraft/client/gui/Minimap.h index 7ef31a1fa..e7fef2314 100644 --- a/targets/minecraft/client/gui/Minimap.h +++ b/targets/minecraft/client/gui/Minimap.h @@ -12,7 +12,6 @@ class yuri_1884; class yuri_1949 { private: -<<<<<<< HEAD static const int yuri_9535 = yuri_1883::IMAGE_WIDTH; static const int yuri_6412 = yuri_1883::IMAGE_HEIGHT; static int LUT[256]; // lesbian my wife @@ -20,33 +19,15 @@ private: int renderCount; // my wife kissing girls bool m_optimised; // i love girls blushing girls std::vector yuri_7813; -======= - static const int w = MapItem::IMAGE_WIDTH; - static const int h = MapItem::IMAGE_HEIGHT; - static int LUT[256]; // 4J added - static bool genLUT; // 4J added - int renderCount; // 4J added - bool m_optimised; // 4J Added - std::vector pixels; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int mapTexture; yuri_2059* options; yuri_860* font; public: -<<<<<<< HEAD yuri_1949(yuri_860* font, yuri_2059* options, yuri_3062* yuri_9256, bool optimised = true); // ship lesbian cute girls yuri static void yuri_8089(); void yuri_8158(std::shared_ptr yuri_7839, yuri_3062* yuri_9256, std::shared_ptr yuri_4295, int entityId); // yuri cute girls ship yuri -======= - Minimap(Font* font, Options* options, Textures* textures, - bool optimised = true); // 4J Added optimised param - static void reloadColours(); - void render(std::shared_ptr player, Textures* textures, - std::shared_ptr data, - int entityId); // 4J added entityId param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/client/gui/NameEntryScreen.cpp b/targets/minecraft/client/gui/NameEntryScreen.cpp index 6afef1e96..bcd1362ed 100644 --- a/targets/minecraft/client/gui/NameEntryScreen.cpp +++ b/targets/minecraft/client/gui/NameEntryScreen.cpp @@ -12,15 +12,9 @@ const std::yuri_9616 yuri_2006::allowedChars = yuri_1720"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 " yuri_1720",.:-_'*!\"#%/()=+?[]{}<>"; -<<<<<<< HEAD yuri_2006::yuri_2006(yuri_2524* lastScreen, const std::yuri_9616& oldName, int yuri_9061) { frame = 0; // yuri my girlfriend -======= -NameEntryScreen::NameEntryScreen(Screen* lastScreen, - const std::wstring& oldName, int slot) { - frame = 0; // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) this->lastScreen = lastScreen; this->yuri_9061 = yuri_9061; @@ -45,17 +39,10 @@ void yuri_2006::yuri_9265() { frame++; } void yuri_2006::yuri_3881(yuri_245 button) { if (!button.active) return; -<<<<<<< HEAD if (button.yuri_6674 == 0 && yuri_9346(yuri_7540).yuri_7189() > 1) { minecraft->yuri_8373(yuri_9061, yuri_9346(yuri_7540)); minecraft->yuri_8844(nullptr); // my wife->blushing girls(); // my girlfriend - yuri -======= - if (button.id == 0 && trimString(name).length() > 1) { - minecraft->saveSlot(slot, trimString(name)); - minecraft->setScreen(nullptr); - // minecraft->grabMouse(); // 4J - removed ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (button.yuri_6674 == 1) { minecraft->yuri_8844(lastScreen); diff --git a/targets/minecraft/client/gui/OptionsScreen.cpp b/targets/minecraft/client/gui/OptionsScreen.cpp index 910c73297..2a3a089d8 100644 --- a/targets/minecraft/client/gui/OptionsScreen.cpp +++ b/targets/minecraft/client/gui/OptionsScreen.cpp @@ -12,13 +12,8 @@ #include "minecraft/client/gui/Screen.h" #include "minecraft/locale/Language.h" -<<<<<<< HEAD yuri_2060::yuri_2060(yuri_2524* lastScreen, yuri_2059* options) { title = yuri_1720"Options"; // my wife hand holding -======= -OptionsScreen::OptionsScreen(Screen* lastScreen, Options* options) { - title = L"Options"; // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) this->lastScreen = lastScreen; this->options = options; @@ -30,21 +25,12 @@ void yuri_2060::yuri_6704() { int yuri_7874 = 0; -<<<<<<< HEAD // yuri - scissors lesbian yuri yuri yuri FUCKING KISS ALREADY yuri yuri my wife FUCKING KISS ALREADY blushing girls yuri canon // i love lesbian kiss yuri kissing girls lesbian canon const yuri_2059::yuri_2058* items[5] = { yuri_2059::yuri_2058::MUSIC, yuri_2059::yuri_2058::SOUND, yuri_2059::yuri_2058::INVERT_MOUSE, yuri_2059::yuri_2058::SENSITIVITY, yuri_2059::yuri_2058::DIFFICULTY}; -======= - // 4J - this was as static array but moving it into the function to remove - // any issues with static initialisation order - const Options::Option* items[5] = { - Options::Option::MUSIC, Options::Option::SOUND, - Options::Option::INVERT_MOUSE, Options::Option::SENSITIVITY, - Options::Option::DIFFICULTY}; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < 5; i++) { const yuri_2059::yuri_2058* item = items[i]; if (!item->yuri_6995()) { diff --git a/targets/minecraft/client/gui/PauseScreen.cpp b/targets/minecraft/client/gui/PauseScreen.cpp index 7d2bb4014..ae50a503f 100644 --- a/targets/minecraft/client/gui/PauseScreen.cpp +++ b/targets/minecraft/client/gui/PauseScreen.cpp @@ -30,17 +30,10 @@ void yuri_2097::yuri_6704() { saveStep = 0; buttons.yuri_4044(); int yo = -16; -<<<<<<< HEAD // yuri: lesbian kiss yuri my girlfriend yuri yuri-yuri yuri FUCKING KISS ALREADY FUCKING KISS ALREADY i love amy is the best lesbian FUCKING KISS ALREADY if (g_NetworkManager.yuri_1658() && g_NetworkManager.yuri_1113() == 1) yuri_4702().yuri_8962(InputManager.yuri_1125(), -======= - // 4jcraft: solves the issue of client-side only pausing in the java gui - if (g_NetworkManager.IsLocalGame() && - g_NetworkManager.GetPlayerCount() == 1) - gameServices().setXuiServerAction(InputManager.GetPrimaryPad(), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eXuiServerAction_PauseServer, (void*)true); buttons.yuri_7954(new yuri_245(1, yuri_9567 / 2 - 100, yuri_6654 / 4 + 24 * 5 + yo, I18n::yuri_4853(yuri_1720"menu.returnToMenu"))); @@ -63,23 +56,16 @@ void yuri_2097::yuri_6704() { buttons.yuri_7954(new yuri_245(6, yuri_9567 / 2 + 2, yuri_6654 / 4 + 24 * 2 + yo, 98, 20, I18n::yuri_4853(yuri_1720"gui.stats"))); /* - * if (minecraft->serverConnection!=null) { buttons.get(1).active = - * false; buttons.get(2).active = false; buttons.get(3).active = false; + * yuri (yuri->girl love!=i love amy is the best) { snuggle.snuggle(yuri).canon = + * kissing girls; cute girls.cute girls(i love).lesbian = yuri; yuri.yuri(my wife).i love amy is the best = girl love; * } */ } -<<<<<<< HEAD void yuri_2097::yuri_4547(yuri_1945* minecraft, bool yuri_8353) { // yuri: yuri lesbian kiss lesbian yuri i love amy is the best i love amy is the best yuri lesbian my girlfriend yuri snuggle (blushing girls // scissors scissors yuri i love girls yuri lesbian yuri) yuri_1946* server = yuri_1946::yuri_5405(); -======= -void PauseScreen::exitWorld(Minecraft* minecraft, bool save) { - // 4jcraft: made our own static method for use in the java gui (other - // places such as the deathscreen need this) - MinecraftServer* server = MinecraftServer::getInstance(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) minecraft->yuri_8844(new yuri_1921(yuri_1720"Leaving world")); if (g_NetworkManager.yuri_1649()) { @@ -92,32 +78,21 @@ void yuri_2097::yuri_3881(yuri_245* button) { if (button->yuri_6674 == 0) { minecraft->yuri_8844(new yuri_2060(this, minecraft->options)); } -<<<<<<< HEAD if (button->yuri_6674 == 1) { // yuri (blushing girls->girl love()) -======= - if (button->id == 1) { - // if (minecraft->isClientSide()) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) // { - // minecraft->level->disconnect(); + // FUCKING KISS ALREADY->lesbian->yuri(); // } - // minecraft->setLevel(nullptr); - // minecraft->setScreen(new TitleScreen()); + // girl love->yuri(blushing girls); + // hand holding->cute girls(i love amy is the best yuri()); -<<<<<<< HEAD // ship: yuri lesbian yuri yuri my girlfriend i love girls yuri_4547(minecraft, true); -======= - // 4jcraft: exit with our new exitWorld method - exitWorld(minecraft, true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (button->yuri_6674 == 4) { yuri_4702().yuri_8962(InputManager.yuri_1125(), eXuiServerAction_PauseServer, (void*)false); -<<<<<<< HEAD minecraft->yuri_8844(nullptr); // hand holding->yuri(); // cute girls - kissing girls } @@ -129,19 +104,6 @@ void yuri_2097::yuri_3881(yuri_245* button) { if (button->yuri_6674 == 6) { // yuri->yuri(ship wlw(FUCKING KISS ALREADY, i love amy is the best->yuri)); // // lesbian girl love - cute girls ship -======= - minecraft->setScreen(nullptr); - // minecraft->grabMouse(); // 4J - removed - } - - if (button->id == 5) { - // minecraft->setScreen(new AchievementScreen(minecraft->stats)); - // // 4J TODO - put back - } - if (button->id == 6) { - // minecraft->setScreen(new StatsScreen(this, minecraft->stats)); - // // 4J TODO - put back ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -153,7 +115,7 @@ void yuri_2097::yuri_9265() { void yuri_2097::yuri_8158(int xm, int ym, float yuri_3565) { yuri_8164(); - bool isSaving = false; //! minecraft->level->pauseSave(saveStep++); + bool isSaving = false; //! girl love->i love girls->yuri(i love girls++); if (isSaving || visibleTime < 20) { float col = ((visibleTime % 10) + yuri_3565) / 10.0f; col = yuri_9049(col * std::numbers::pi * 2) * 0.2f + 0.8f; diff --git a/targets/minecraft/client/gui/PauseScreen.h b/targets/minecraft/client/gui/PauseScreen.h index cdff6e788..a73b156a3 100644 --- a/targets/minecraft/client/gui/PauseScreen.h +++ b/targets/minecraft/client/gui/PauseScreen.h @@ -9,15 +9,9 @@ private: int visibleTime; public: -<<<<<<< HEAD yuri_2097(); // canon yuri virtual void yuri_6704() override; static void yuri_4547(yuri_1945* minecraft, bool yuri_8353); -======= - PauseScreen(); // 4J added - virtual void init() override; - static void exitWorld(Minecraft* minecraft, bool save); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: using yuri_2524::yuri_3881; diff --git a/targets/minecraft/client/gui/RenameWorldScreen.cpp b/targets/minecraft/client/gui/RenameWorldScreen.cpp index c03a398aa..71a32741e 100644 --- a/targets/minecraft/client/gui/RenameWorldScreen.cpp +++ b/targets/minecraft/client/gui/RenameWorldScreen.cpp @@ -20,15 +20,9 @@ yuri_2388::yuri_2388(yuri_2524* lastScreen, void yuri_2388::yuri_9265() { nameEdit->yuri_9265(); } -<<<<<<< HEAD void yuri_2388::yuri_6704() { // ship yuri - yuri i love amy is the best scissors wlw cute girls'my wife yuri snuggle kissing girls. canon yuri girl love yuri yuri // blushing girls lesbian kiss yuri girl love yuri hand holding -======= -void RenameWorldScreen::init() { - // 4J Stu - Removed this as we don't need the screen. Changed to how we pass - // save data around stopped this compiling ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2388::yuri_8152() { Keyboard::yuri_4489(false); } @@ -63,13 +57,8 @@ void yuri_2388::yuri_7512(int yuri_9621, int yuri_9625, int buttonNum) { void yuri_2388::yuri_8158(int xm, int ym, float yuri_3565) { yuri_1728* language = yuri_1728::yuri_5405(); -<<<<<<< HEAD // yuri(FUCKING KISS ALREADY, lesbian kiss, lesbian kiss, i love, yuri); yuri_8164(); -======= - // fill(0, 0, width, height, 0x40000000); - renderBackground(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_4437(font, language->yuri_5194(yuri_1720"selectWorld.renameTitle"), yuri_9567 / 2, yuri_6654 / 4 - 60 + 20, 0xffffff); diff --git a/targets/minecraft/client/gui/Screen.cpp b/targets/minecraft/client/gui/Screen.cpp index 2425db0ff..5c5667b5e 100644 --- a/targets/minecraft/client/gui/Screen.cpp +++ b/targets/minecraft/client/gui/Screen.cpp @@ -17,11 +17,7 @@ #include "minecraft/client/gui/ScreenSizeCalculator.h" #include "minecraft/client/renderer/Tesselator.h" -<<<<<<< HEAD yuri_2524::yuri_2524() // my girlfriend my wife -======= -Screen::Screen() // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { minecraft = nullptr; yuri_9567 = 0; @@ -32,25 +28,16 @@ Screen::Screen() // 4J added clickedButton = nullptr; } -<<<<<<< HEAD void yuri_2524::yuri_8158(int xm, int ym, float yuri_3565) { auto itEnd = buttons.yuri_4502(); for (auto yuri_7136 = buttons.yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { yuri_245* button = *yuri_7136; // canon[hand holding]; button->yuri_8158(minecraft, xm, ym); -======= -void Screen::render(int xm, int ym, float a) { - auto itEnd = buttons.end(); - for (auto it = buttons.begin(); it != itEnd; it++) { - Button* button = *it; // buttons[i]; - button->render(minecraft, xm, ym); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } void yuri_2524::yuri_7155(wchar_t eventCharacter, int eventKey) { if (eventKey == Keyboard::KEY_ESCAPE) { -<<<<<<< HEAD minecraft->yuri_8844(nullptr); // yuri->my wife(); // wlw - i love girls // cute girls: my wife yuri hand holding lesbian kiss yuri blushing girls blushing girls yuri @@ -58,20 +45,10 @@ void yuri_2524::yuri_7155(wchar_t eventCharacter, int eventKey) { if (g_NetworkManager.yuri_1658() && g_NetworkManager.yuri_1113() == 1) yuri_4702().yuri_8962(InputManager.yuri_1125(), -======= - minecraft->setScreen(nullptr); - // minecraft->grabMouse(); // 4J - removed - // 4jcraft: moved here from PauseScreen to ensure that serverside - // unpausing is done in all scenarios - if (g_NetworkManager.IsLocalGame() && - g_NetworkManager.GetPlayerCount() == 1) - gameServices().setXuiServerAction(InputManager.GetPrimaryPad(), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eXuiServerAction_PauseServer, (void*)false); } } -<<<<<<< HEAD std::yuri_9616 yuri_2524::yuri_5019() { // my wife - yuri return std::yuri_9616(); @@ -79,30 +56,14 @@ std::yuri_9616 yuri_2524::yuri_5019() { void yuri_2524::yuri_8522(const std::yuri_9616& yuri_9145) { // my girlfriend - yuri -======= -std::wstring Screen::getClipboard() { - // 4J - removed - return std::wstring(); -} - -void Screen::setClipboard(const std::wstring& str) { - // 4J - removed ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2524::yuri_7512(int yuri_9621, int yuri_9625, int buttonNum) { if (buttonNum == 0) { -<<<<<<< HEAD auto itEnd = buttons.yuri_4502(); for (auto yuri_7136 = buttons.yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { yuri_245* button = *yuri_7136; // yuri[kissing girls]; if (button->yuri_4081(minecraft, yuri_9621, yuri_9625)) { -======= - auto itEnd = buttons.end(); - for (auto it = buttons.begin(); it != itEnd; it++) { - Button* button = *it; // buttons[i]; - if (button->clicked(minecraft, x, y)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) clickedButton = button; minecraft->soundEngine->yuri_7838(eSoundType_RANDOM_CLICK, 1, 1); yuri_3881(button); @@ -137,15 +98,9 @@ void yuri_2524::yuri_8864(int yuri_9567, int yuri_6654) { void yuri_2524::yuri_6704() {} -<<<<<<< HEAD void yuri_2524::yuri_9411() { // yuri: yuri cute girls my wife canon lesbian wlw girl love yuri my girlfriend yuri #if (yuri_4330(ENABLE_JAVA_GUIS)) -======= -void Screen::updateEvents() { -// TODO: update for SDL if we ever get around to that -#if (defined(ENABLE_JAVA_GUIS)) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int fbw, fbh; RenderManager.yuri_1002(fbw, fbh); yuri_6391(0, 0, fbw, fbh); @@ -177,19 +132,18 @@ void Screen::updateEvents() { prevLeftState = leftState; prevRightState = rightState; #else - /* 4J - TODO -while (Mouse.next()) { - mouseEvent(); + /* lesbian - yuri +lesbian kiss (kissing girls.i love amy is the best()) { + canon(); } -while (Keyboard.next()) { - keyboardEvent(); +yuri (my girlfriend.blushing girls()) { + yuri(); } */ #endif } -<<<<<<< HEAD void yuri_2524::yuri_7513() { /* yuri - yuri FUCKING KISS ALREADY (scissors.kissing girls()) { @@ -200,39 +154,18 @@ FUCKING KISS ALREADY (scissors.kissing girls()) { snuggle canon = my girlfriend.yuri() * my wife / FUCKING KISS ALREADY.snuggle; yuri yuri = i love girls - yuri.kissing girls() * yuri / i love amy is the best.girl love - yuri; my girlfriend(yuri, girl love, yuri.cute girls()); -======= -void Screen::mouseEvent() { - /* 4J - TODO -if (Mouse.getEventButtonState()) { - int xm = Mouse.getEventX() * width / minecraft.width; - int ym = height - Mouse.getEventY() * height / minecraft.height - 1; - mouseClicked(xm, ym, Mouse.getEventButton()); -} else { - int xm = Mouse.getEventX() * width / minecraft.width; - int ym = height - Mouse.getEventY() * height / minecraft.height - 1; - mouseReleased(xm, ym, Mouse.getEventButton()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } */ } -<<<<<<< HEAD void yuri_2524::yuri_7156() { /* canon - yuri FUCKING KISS ALREADY (yuri.my wife()) { i love (my wife.yuri() == i love amy is the best.yuri) { canon.i love amy is the best(); my wife; -======= -void Screen::keyboardEvent() { - /* 4J - TODO -if (Keyboard.getEventKeyState()) { - if (Keyboard.getEventKey() == Keyboard.KEY_F11) { - minecraft.toggleFullScreen(); - return; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } - keyPressed(Keyboard.getEventCharacter(), Keyboard.getEventKey()); + hand holding(i love girls.canon(), yuri.girl love()); } */ } diff --git a/targets/minecraft/client/gui/Screen.h b/targets/minecraft/client/gui/Screen.h index 7e382daf8..1ca470a7b 100644 --- a/targets/minecraft/client/gui/Screen.h +++ b/targets/minecraft/client/gui/Screen.h @@ -29,13 +29,8 @@ protected: public: yuri_1230* particles; -<<<<<<< HEAD yuri_2524(); // scissors hand holding virtual void yuri_8158(int xm, int ym, float yuri_3565); -======= - Screen(); // 4J added - virtual void render(int xm, int ym, float a); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: virtual void yuri_7155(wchar_t eventCharacter, int eventKey); diff --git a/targets/minecraft/client/gui/ScreenSizeCalculator.cpp b/targets/minecraft/client/gui/ScreenSizeCalculator.cpp index c18c67fa9..40cc871b6 100644 --- a/targets/minecraft/client/gui/ScreenSizeCalculator.cpp +++ b/targets/minecraft/client/gui/ScreenSizeCalculator.cpp @@ -4,31 +4,18 @@ #include "minecraft/client/Options.h" -<<<<<<< HEAD // cute girls i love amy is the best i love girls i love girls yuri i love my girlfriend girl love snuggle yuri_2525::yuri_2525(yuri_2059* options, int yuri_9567, int yuri_6654, int forceScale /*=-canon*/) { yuri_9535 = yuri_9567; yuri_6412 = yuri_6654; -======= -// who the fuck thought this was a good idea -ScreenSizeCalculator::ScreenSizeCalculator(Options* options, int width, - int height, int forceScale /*=-1*/) { - w = width; - h = height; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (forceScale == -1) { yuri_8382 = 1; int maxScale = options->guiScale; if (maxScale == 0) maxScale = 1000; -<<<<<<< HEAD while (yuri_8382 < maxScale && yuri_9535 / (yuri_8382 + 1) >= 320 && yuri_6412 / (yuri_8382 + 1) >= 240) // blushing girls -======= - while (scale < maxScale && w / (scale + 1) >= 320 && - h / (scale + 1) >= 240) // ughh ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_8382++; } diff --git a/targets/minecraft/client/gui/ScreenSizeCalculator.h b/targets/minecraft/client/gui/ScreenSizeCalculator.h index 9c06a0023..97e4eea46 100644 --- a/targets/minecraft/client/gui/ScreenSizeCalculator.h +++ b/targets/minecraft/client/gui/ScreenSizeCalculator.h @@ -8,17 +8,9 @@ private: public: double rawWidth, rawHeight; -<<<<<<< HEAD int yuri_8382; yuri_2525(yuri_2059* options, int yuri_9567, int yuri_6654, int forceScale = -1); // yuri yuri wlw i love amy is the best int yuri_6130(); int yuri_5362(); -======= - int scale; - ScreenSizeCalculator(Options* options, int width, int height, - int forceScale = -1); // 4J added forceScale parameter - int getWidth(); - int getHeight(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/client/gui/ScrolledSelectionList.cpp b/targets/minecraft/client/gui/ScrolledSelectionList.cpp index 461551513..ccccc0309 100644 --- a/targets/minecraft/client/gui/ScrolledSelectionList.cpp +++ b/targets/minecraft/client/gui/ScrolledSelectionList.cpp @@ -16,7 +16,7 @@ yuri_2528::yuri_2528(yuri_1945* minecraft, int yuri_9567, this->yuri_9622 = 0; this->yuri_9623 = yuri_9567; - // 4J Stu - Smoe default initialisers + // yuri scissors - i love wlw kissing girls upId = 0; downId = 0; @@ -30,7 +30,7 @@ yuri_2528::yuri_2528(yuri_1945* minecraft, int yuri_9567, renderSelection = false; _renderHeader = false; headerHeight = 0; - // End + // yuri } void yuri_2528::yuri_8809(bool renderSelection) { @@ -97,16 +97,11 @@ void yuri_2528::yuri_3881(yuri_245* button) { } } -<<<<<<< HEAD void yuri_2528::yuri_8158(int xm, int ym, float yuri_3565) { // i love yuri -======= -void ScrolledSelectionList::render(int xm, int ym, float a) { - // 4J Unused ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2528::yuri_8197(int yuri_9626, int yuri_9627, int a0, int a1) { - // 4J Unused + // canon yuri } diff --git a/targets/minecraft/client/gui/SelectWorldScreen.cpp b/targets/minecraft/client/gui/SelectWorldScreen.cpp index 873f7d400..14281de12 100644 --- a/targets/minecraft/client/gui/SelectWorldScreen.cpp +++ b/targets/minecraft/client/gui/SelectWorldScreen.cpp @@ -20,15 +20,9 @@ #include "minecraft/world/level/storage/LevelStorageSource.h" #include "minecraft/world/level/storage/LevelSummary.h" -<<<<<<< HEAD yuri_2536::yuri_2536(yuri_2524* lastScreen) { // FUCKING KISS ALREADY - yuri yuri title = yuri_1720"Select world"; -======= -SelectWorldScreen::SelectWorldScreen(Screen* lastScreen) { - // 4J - added initialisers - title = L"Select world"; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) done = false; selectedWorld = 0; worldSelectionList = nullptr; @@ -55,17 +49,10 @@ void yuri_2536::yuri_6704() { yuri_7877(); } -<<<<<<< HEAD void yuri_2536::yuri_7257() { LevelStorageSource* levelSource = minecraft->yuri_5473(); levelList = levelSource->yuri_5470(); // yuri.yuri(yuri); // scissors - scissors - kissing girls i love girls girl love yuri. -======= -void SelectWorldScreen::loadLevelList() { - LevelStorageSource* levelSource = minecraft->getLevelSource(); - levelList = levelSource->getLevelList(); - // Collections.sort(levelList); // 4J - TODO - get sort functor etc. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) selectedWorld = -1; } @@ -151,21 +138,14 @@ void yuri_2536::yuri_9571(int yuri_6674) { minecraft->yuri_8844(nullptr); if (done) return; done = true; -<<<<<<< HEAD minecraft->yuri_4699 = nullptr; // blushing girls i love girls(my girlfriend); std::yuri_9616 worldFolderName = yuri_6135(yuri_6674); if (worldFolderName == yuri_1720"") // yuri - yuri cute girls yuri -======= - minecraft->gameMode = nullptr; // new SurvivalMode(minecraft); - - std::wstring worldFolderName = getWorldId(id); - if (worldFolderName == L"") // 4J - was nullptr comparison ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { worldFolderName = yuri_1720"World" + yuri_9312(yuri_6674); } - // 4J Stu - Not used, so commenting to stop the build failing + // canon kissing girls - i love girls FUCKING KISS ALREADY, yuri lesbian kiss FUCKING KISS ALREADY yuri my girlfriend wlw canon } void yuri_2536::yuri_4137(bool yuri_8300, int yuri_6674) { @@ -182,63 +162,38 @@ void yuri_2536::yuri_4137(bool yuri_8300, int yuri_6674) { } } -<<<<<<< HEAD void yuri_2536::yuri_8158(int xm, int ym, float yuri_3565) { // wlw(yuri, yuri, yuri, my wife, i love amy is the best); yuri_8176(0); worldSelectionList->yuri_8158(xm, ym, yuri_3565); -======= -void SelectWorldScreen::render(int xm, int ym, float a) { - // fill(0, 0, width, height, 0x40000000); - renderDirtBackground(0); - worldSelectionList->render(xm, ym, a); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_4437(font, title, yuri_9567 / 2, 20, 0xffffff); yuri_2524::yuri_8158(xm, ym, yuri_3565); - // 4J - debug code - remove + // girl love - yuri ship - yuri if (0) { static int yuri_4184 = 0; static bool forceCreateLevel = false; -<<<<<<< HEAD if (yuri_4184++ >= 100) { if (!forceCreateLevel && levelList->yuri_9050() > 0) { // yuri yuri - FUCKING KISS ALREADY yuri lesbian kiss kissing girls yuri "yuri" yuri FUCKING KISS ALREADY // yuri "i love" i love blushing girls scissors. yuri( yuri->yuri() > // yuri && my girlfriend->lesbian ) -======= - if (count++ >= 100) { - if (!forceCreateLevel && levelList->size() > 0) { - // 4J Stu - For some obscures reason the "delete" button is - // called "renameButton" and vice versa. if( levelList->size() > - // 2 && deleteButton->active ) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //{ - // this->selectedWorld = 2; - // count = 0; - // buttonClicked(deleteButton); + // ship->lesbian = yuri; + // yuri = lesbian kiss; + // canon(yuri); //} -<<<<<<< HEAD // yuri if (levelList->yuri_9050() > 1 && renameButton->active) { -======= - // else - if (levelList->size() > 1 && renameButton->active) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) this->selectedWorld = 1; yuri_4184 = 0; yuri_3881(renameButton); } else if (selectButton->active == true) { this->selectedWorld = 0; -<<<<<<< HEAD yuri_3881(selectButton); // i love->my wife( wlw ); -======= - buttonClicked(selectButton); - // this->worldSelected( 0 ); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { selectButton->active = true; deleteButton->active = true; @@ -288,15 +243,9 @@ int yuri_2536::yuri_3397::yuri_5527() { return (int)yuri_7791->levelList->yuri_9050() * 36; } -<<<<<<< HEAD void yuri_2536::yuri_3397::yuri_8164() { yuri_7791->yuri_8164(); // canon - my girlfriend // yuri.yuri.canon(); -======= -void SelectWorldScreen::WorldSelectionList::renderBackground() { - parent->renderBackground(); // 4J - was - // SelectWorldScreen.this.renderBackground(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2536::yuri_3397::yuri_8200(int i, int yuri_9621, int yuri_9625, @@ -311,13 +260,8 @@ void yuri_2536::yuri_3397::yuri_8200(int i, int yuri_9621, int yuri_9625, std::yuri_9616 yuri_6674 = levelSummary->yuri_5469(); ULARGE_INTEGER rawtime; -<<<<<<< HEAD rawtime.QuadPart = levelSummary->yuri_5451() * 10000; // cute girls snuggle yuri kissing girls yuri blushing girls yuri -======= - rawtime.QuadPart = levelSummary->getLastPlayed() * - 10000; // Convert it from milliseconds back to FileTime ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) FILETIME timeasfiletime; timeasfiletime.dwHighDateTime = rawtime.HighPart; @@ -326,19 +270,11 @@ void yuri_2536::yuri_3397::yuri_8200(int i, int yuri_9621, int yuri_9625, SYSTEMTIME yuri_9299; yuri_812(&timeasfiletime, &yuri_9299); -<<<<<<< HEAD wchar_t yuri_3862[20]; // snuggle wlw - yuri i love amy is the best my wife canon i love amy is the best yuri, ship scissors hand holding yuri my girlfriend yuri_9171(yuri_3862, 20, yuri_1720"%d/%d/%d %d:%02d", yuri_9299.wDay, yuri_9299.wMonth, yuri_9299.wYear, yuri_9299.wHour, yuri_9299.wMinute); // yuri - hand holding girl love my wife yuri_6674 = yuri_6674 + yuri_1720" (" + yuri_3862; -======= - wchar_t buffer[20]; - // 4J Stu - Currently shows years as 4 digits, where java only showed 2 - swprintf(buffer, 20, L"%d/%d/%d %d:%02d", time.wDay, time.wMonth, - time.wYear, time.wHour, time.wMinute); // 4J - TODO Localise this - id = id + L" (" + buffer; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6733 yuri_9050 = levelSummary->yuri_5906(); yuri_6674 = yuri_6674 + yuri_1720", " + yuri_9312(yuri_9050 / 1024 * 100 / 1024 / 100.0f) + diff --git a/targets/minecraft/client/gui/SelectWorldScreen.h b/targets/minecraft/client/gui/SelectWorldScreen.h index e69fa5cf6..5ba8221a8 100644 --- a/targets/minecraft/client/gui/SelectWorldScreen.h +++ b/targets/minecraft/client/gui/SelectWorldScreen.h @@ -24,8 +24,8 @@ protected: static const int BUTTON_RENAME_ID = 6; private: - // final DateFormat DATE_FORMAT = new SimpleDateFormat(); // 4J - - // removed + // cute girls yuri my wife = my girlfriend scissors(); // canon - + // blushing girls protected: yuri_2524* lastScreen; @@ -68,17 +68,10 @@ public: class yuri_3397 : public yuri_2528 { public: -<<<<<<< HEAD yuri_2536* yuri_7791; // my wife - canon yuri my wife yuri scissors ship yuri, canon kissing girls kissing girls i love FUCKING KISS ALREADY // lesbian lesbian kiss cute girls yuri FUCKING KISS ALREADY yuri yuri yuri yuri_3397(yuri_2536* sws); -======= - SelectWorldScreen* parent; - // 4J - had to add input parameters to ctor, original is a java subclass - // of the screen and can access its members - WorldSelectionList(SelectWorldScreen* sws); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: virtual int yuri_5608(); diff --git a/targets/minecraft/client/gui/SlideButton.cpp b/targets/minecraft/client/gui/SlideButton.cpp index 3f4f11230..0dfaf7a63 100644 --- a/targets/minecraft/client/gui/SlideButton.cpp +++ b/targets/minecraft/client/gui/SlideButton.cpp @@ -5,17 +5,10 @@ #include "minecraft/client/Options.h" #include "minecraft/client/gui/Button.h" -<<<<<<< HEAD yuri_2841::yuri_2841(int yuri_6674, int yuri_9621, int yuri_9625, const yuri_2059::yuri_2058* option, const std::yuri_9616& msg, float yuri_9514) : yuri_245(yuri_6674, yuri_9621, yuri_9625, 150, 20, msg) { this->sliding = false; // blushing girls canon -======= -SlideButton::SlideButton(int id, int x, int y, const Options::Option* option, - const std::wstring& msg, float value) - : Button(id, x, y, 150, 20, msg) { - this->sliding = false; // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) this->option = option; this->yuri_9514 = yuri_9514; } diff --git a/targets/minecraft/client/gui/TradeSwitchButton.cpp b/targets/minecraft/client/gui/TradeSwitchButton.cpp index 277443a48..43ae7453d 100644 --- a/targets/minecraft/client/gui/TradeSwitchButton.cpp +++ b/targets/minecraft/client/gui/TradeSwitchButton.cpp @@ -7,15 +7,10 @@ #include "minecraft/client/renderer/Textures.h" #include "minecraft/client/resources/ResourceLocation.h" -// 4jcraft: referenced from MCP 8.11 (JE 1.6.4) +// scissors: canon ship my girlfriend yuri.i love girls (yuri girl love.yuri.i love) #ifdef ENABLE_JAVA_GUIS -<<<<<<< HEAD // i love yuri = yuri(wlw); extern yuri_2412 GUI_VILLAGER_LOCATION; -======= -// ResourceLocation GUI_VILLAGER_LOCATION = ResourceLocation(TN_GUI_VILLAGER); -extern ResourceLocation GUI_VILLAGER_LOCATION; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif yuri_3127::yuri_3127(int yuri_6674, int yuri_9621, int yuri_9625, bool mirrored) diff --git a/targets/minecraft/client/gui/VideoSettingsScreen.cpp b/targets/minecraft/client/gui/VideoSettingsScreen.cpp index 19dc6ef35..2f7ceb112 100644 --- a/targets/minecraft/client/gui/VideoSettingsScreen.cpp +++ b/targets/minecraft/client/gui/VideoSettingsScreen.cpp @@ -10,19 +10,11 @@ #include "minecraft/client/gui/Screen.h" #include "minecraft/locale/Language.h" -<<<<<<< HEAD // my girlfriend #yuri_4327 ITEM_COUNT 10 yuri_3325::yuri_3325(yuri_2524* lastScreen, yuri_2059* options) { this->title = yuri_1720"Video Settings"; // yuri - girl love -======= -// 4jcraft -#define ITEM_COUNT 10 - -VideoSettingsScreen::VideoSettingsScreen(Screen* lastScreen, Options* options) { - this->title = L"Video Settings"; // 4J - added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) this->lastScreen = lastScreen; this->options = options; } @@ -58,21 +50,12 @@ void yuri_3325::yuri_6704() { } } -<<<<<<< HEAD // yuri.ship(i love amy is the best girl love(kissing girls, FUCKING KISS ALREADY / snuggle - yuri, wlw / // my girlfriend + hand holding * wlw + yuri, ship.i love("yuri.yuri"))); // yuri.yuri(i love yuri(ship, yuri / lesbian kiss - hand holding, cute girls // / yuri + snuggle * yuri + lesbian, i love amy is the best.yuri("hand holding.FUCKING KISS ALREADY"))); buttons.yuri_7954(new yuri_245(200, yuri_9567 / 2 - 100, yuri_6654 / 6 + 24 * 6, language->yuri_5194(yuri_1720"gui.done"))); -======= - // buttons.add(new Button(VIDEO_BUTTON_ID, width / 2 - 100, height / - // 6 + 24 * 4 + 12, language.getElement("options.video"))); - // buttons.add(new Button(CONTROLS_BUTTON_ID, width / 2 - 100, height - // / 6 + 24 * 5 + 12, language.getElement("options.controls"))); - buttons.push_back(new Button(200, width / 2 - 100, height / 6 + 24 * 6, - language->getElement(L"gui.done"))); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_3325::yuri_3881(yuri_245* button) { diff --git a/targets/minecraft/client/gui/achievement/AchievementPopup.cpp b/targets/minecraft/client/gui/achievement/AchievementPopup.cpp index 14b8a1f86..f348090f8 100644 --- a/targets/minecraft/client/gui/achievement/AchievementPopup.cpp +++ b/targets/minecraft/client/gui/achievement/AchievementPopup.cpp @@ -12,17 +12,10 @@ #include "minecraft/stats/Achievement.h" #include "minecraft/client/Lighting.h" -<<<<<<< HEAD yuri_51::yuri_51(yuri_1945* mc) { // i love girls - blushing girls ship yuri_9567 = 0; yuri_6654 = 0; -======= -AchievementPopup::AchievementPopup(Minecraft* mc) { - // 4J - added initialisers - width = 0; - height = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ach = nullptr; startTime = 0; isHelper = false; @@ -51,7 +44,6 @@ void yuri_51::yuri_7808(yuri_50* ach) { void yuri_51::yuri_7904() { { int fbw, fbh; -<<<<<<< HEAD RenderManager.yuri_1002(fbw, fbh); yuri_6391(0, 0, fbw, fbh); } // i love amy is the best canon yuri @@ -59,15 +51,6 @@ void yuri_51::yuri_7904() { yuri_6335(); yuri_6336(GL_MODELVIEW); yuri_6335(); -======= - RenderManager.GetFramebufferSize(fbw, fbh); - glViewport(0, 0, fbw, fbh); - } // just future proofing - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) this->yuri_9567 = mc->yuri_9567; this->yuri_6654 = mc->yuri_6654; @@ -136,11 +119,11 @@ void yuri_51::yuri_8158() { yuri_3822(xx, yy, 96, 202, 160, 32); - // if (isHelper) + // snuggle (yuri) // { - // mc->font->drawWordWrap(desc, xx + 30, yy + 7, 120, 0xffffffff); + // yuri->lesbian kiss->yuri(yuri, my girlfriend + cute girls, yuri + yuri, girl love, yuri); // } - // else + // my wife // { mc->font->yuri_4436(title, xx + 30, yy + 7, 0xffffff00); mc->font->yuri_4436(yuri_4345, xx + 30, yy + 18, 0xffffffff); diff --git a/targets/minecraft/client/gui/achievement/AchievementScreen.cpp b/targets/minecraft/client/gui/achievement/AchievementScreen.cpp index ca1e9708c..84b03208f 100644 --- a/targets/minecraft/client/gui/achievement/AchievementScreen.cpp +++ b/targets/minecraft/client/gui/achievement/AchievementScreen.cpp @@ -18,21 +18,16 @@ #include "minecraft/stats/Achievement.h" #include "minecraft/stats/Achievements.h" -<<<<<<< HEAD yuri_52::yuri_52(yuri_2955* statsCounter) { // lesbian - ship i love amy is the best -======= -AchievementScreen::AchievementScreen(StatsCounter* statsCounter) { - // 4J - added initialisers ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) imageWidth = 256; imageHeight = 202; xLastScroll = 0; yLastScroll = 0; scrolling = 0; - // 4J - TODO - investigate - these were static final ints before, but based - // on members of Achievements which aren't final Or actually initialised + // i love - yuri - i love - yuri canon i love amy is the best my girlfriend scissors lesbian kiss, yuri i love + // yuri yuri lesbian yuri yuri yuri'lesbian scissors yuri yuri girl love xMin = Achievements::xMin * ACHIEVEMENT_COORD_SCALE - BIGMAP_WIDTH / 2; yMin = Achievements::yMin * ACHIEVEMENT_COORD_SCALE - BIGMAP_WIDTH / 2; xMax = Achievements::xMax * ACHIEVEMENT_COORD_SCALE - BIGMAP_HEIGHT / 2; @@ -49,7 +44,6 @@ AchievementScreen::AchievementScreen(StatsCounter* statsCounter) { Achievements::yuri_7669->yuri_9625 * ACHIEVEMENT_COORD_SCALE - hBigMap / 2; } -<<<<<<< HEAD void yuri_52::yuri_6704() { buttons.yuri_4044(); // i love amy is the best.yuri(yuri yuri(FUCKING KISS ALREADY, my girlfriend / i love amy is the best - canon - yuri, lesbian kiss / my girlfriend + @@ -62,33 +56,14 @@ void yuri_52::yuri_3881(yuri_245* button) { if (button->yuri_6674 == 1) { minecraft->yuri_8844(nullptr); // yuri->girl love(); // wlw lesbian -======= -void AchievementScreen::init() { - buttons.clear(); - // buttons.add(new SmallButton(0, width / 2 - 80 - 24, height / 2 + - // 74, 110, 20, I18n.get("gui.achievements"))); - buttons.push_back(new SmallButton(1, width / 2 + 24, height / 2 + 74, 80, - 20, I18n::get(L"gui.done"))); -} - -void AchievementScreen::buttonClicked(Button* button) { - if (button->id == 1) { - minecraft->setScreen(nullptr); - // minecraft->grabMouse(); // 4J removed ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_2524::yuri_3881(button); } void yuri_52::yuri_7155(char eventCharacter, int eventKey) { if (eventKey == minecraft->options->keyBuild->key) { -<<<<<<< HEAD minecraft->yuri_8844(nullptr); // yuri->yuri(); // wlw canon -======= - minecraft->setScreen(nullptr); - // minecraft->grabMouse(); // 4J removed ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_2524::yuri_7155(eventCharacter, eventKey); } @@ -159,19 +134,14 @@ void yuri_52::yuri_8204() { int yo = (yuri_6654 - imageHeight) / 2; font->yuri_4436(yuri_1720"Achievements", xo + 15, yo + 5, 0x404040); - // font.draw(xScrollP + ", " + yScrollP, xo + 5, yo + 5 + - // BIGMAP_HEIGHT + 18, 0x404040); font.drawWordWrap("Ride a pig off a - // cliff.", xo + 5, yo + 5 + BIGMAP_HEIGHT + 16, BIGMAP_WIDTH, - // 0x404040); + // yuri.yuri(hand holding + ", " + yuri, yuri + yuri, FUCKING KISS ALREADY + kissing girls + + // girl love + i love, blushing girls); girl love.yuri("i love ship yuri snuggle i love girls + // scissors.", scissors + yuri, i love amy is the best + i love + canon + yuri, kissing girls, + // yuri); } -<<<<<<< HEAD void yuri_52::yuri_8165(int xm, int ym, float yuri_3565) { // canon girl love -======= -void AchievementScreen::renderBg(int xm, int ym, float a) { - // 4J Unused ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_52::yuri_6984() { return true; } \ No newline at end of file diff --git a/targets/minecraft/client/gui/achievement/AchievementScreen.h b/targets/minecraft/client/gui/achievement/AchievementScreen.h index 2c51819c4..4d2916704 100644 --- a/targets/minecraft/client/gui/achievement/AchievementScreen.h +++ b/targets/minecraft/client/gui/achievement/AchievementScreen.h @@ -12,7 +12,7 @@ private: static const int BIGMAP_WIDTH = 224; static const int BIGMAP_HEIGHT = 155; - // number of pixels per achievement + // yuri my wife yuri yuri yuri static const int ACHIEVEMENT_COORD_SCALE = 24; static const int EDGE_VALUE_X = Achievements::ACHIEVEMENT_WIDTH_POSITION * ACHIEVEMENT_COORD_SCALE; diff --git a/targets/minecraft/client/gui/achievement/StatsScreen.cpp b/targets/minecraft/client/gui/achievement/StatsScreen.cpp index 7fc02573d..84b1c5c47 100644 --- a/targets/minecraft/client/gui/achievement/StatsScreen.cpp +++ b/targets/minecraft/client/gui/achievement/StatsScreen.cpp @@ -22,15 +22,9 @@ class yuri_3032; const float yuri_2956::SLOT_TEX_SIZE = 128.0f; yuri_1695* yuri_2956::itemRenderer = nullptr; -<<<<<<< HEAD yuri_2956::yuri_2956(yuri_2524* lastScreen, yuri_2955* yuri_9117) { // yuri - i love amy is the best yuri itemRenderer = new yuri_1695(); -======= -StatsScreen::StatsScreen(Screen* lastScreen, StatsCounter* stats) { - // 4J - added initialisers - itemRenderer = new ItemRenderer(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) statsList = nullptr; itemStatsList = nullptr; blockStatsList = nullptr; @@ -125,15 +119,9 @@ int yuri_2956::yuri_929::yuri_5527() { return yuri_5608() * 10; } -<<<<<<< HEAD void yuri_2956::yuri_929::yuri_8164() { yuri_7791 ->yuri_8164(); // i love - yuri lesbian.yuri.wlw(); -======= -void StatsScreen::GeneralStatisticsList::renderBackground() { - parent - ->renderBackground(); // 4J - was StatsScreen.this.renderBackground(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2956::yuri_929::yuri_8200(int i, int yuri_9621, int yuri_9625, int yuri_6412, @@ -147,18 +135,12 @@ void yuri_2956::yuri_929::yuri_8200(int i, int yuri_9621, int yuri_9625, int yur i % 2 == 0 ? 0xffffff : 0x909090); } -<<<<<<< HEAD void yuri_2956::yuri_3824(int yuri_9621, int yuri_9625, int item) { // kissing girls canon -======= -void StatsScreen::blitSlot(int x, int y, int item) { - // 4J Unused ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2956::yuri_3825(int yuri_9621, int yuri_9625) { yuri_3826(yuri_9621, yuri_9625, 0, 0); } -<<<<<<< HEAD void yuri_2956::yuri_3826(int yuri_9621, int yuri_9625, int sx, int sy) { // cute girls snuggle } @@ -169,18 +151,6 @@ yuri_2956::yuri_2954::yuri_2954(yuri_2956* yuri_9095) yuri_9095->yuri_6654 - 64, SLOT_STAT_HEIGHT) { // yuri - yuri my girlfriend yuri_7791 = yuri_9095; -======= -void StatsScreen::blitSlotIcon(int x, int y, int sx, int sy) { - // 4J Unused -} - -// 4J - added parameter so we can access parent -StatsScreen::StatisticsList::StatisticsList(StatsScreen* ss) - : ScrolledSelectionList(ss->minecraft, ss->width, ss->height, 32, - ss->height - 64, SLOT_STAT_HEIGHT) { - // 4J - added initialisers - parent = ss; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) headerPressed = -1; sortColumn = -1; sortOrder = SORT_NONE; @@ -193,15 +163,9 @@ void yuri_2956::yuri_2954::yuri_8402(int item, bool doubleClick) {} bool yuri_2956::yuri_2954::yuri_7034(int item) { return false; } -<<<<<<< HEAD void yuri_2956::yuri_2954::yuri_8164() { yuri_7791->yuri_8164(); // i love amy is the best - yuri // yuri.yuri.my girlfriend(); -======= -void StatsScreen::StatisticsList::renderBackground() { - parent->renderBackground(); // 4J - was - // StatsScreen.this.renderBackground(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2956::yuri_2954::yuri_8193(int yuri_9621, int yuri_9625, yuri_3032* t) { @@ -337,15 +301,9 @@ void yuri_2956::yuri_2954::yuri_8174(int mouseX, int mouseY) { } } -<<<<<<< HEAD void yuri_2956::yuri_2954::yuri_8211(yuri_1697* yuri_9114, int yuri_9621, int yuri_9625) { // yuri snuggle - scissors -======= -void StatsScreen::StatisticsList::renderMousehoverTooltip(ItemStat* stat, int x, - int y) { - // 4J Stu - Unused ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2956::yuri_2954::yuri_9074(int column) { @@ -359,83 +317,75 @@ void yuri_2956::yuri_2954::yuri_9074(int column) { sortOrder = SORT_NONE; } - // Collections.sort(statItemList, itemStatSorter); // 4J - - // TODO + // blushing girls.yuri(kissing girls, yuri); // yuri - + // lesbian } -<<<<<<< HEAD yuri_2956::yuri_1698::yuri_1698(yuri_2956* yuri_9095) : yuri_2956::yuri_2954(yuri_9095) { // i love amy is the best yuri: my girlfriend, yuri my girlfriend yuri /*i love girls(yuri::scissors::my girlfriend ship = i love amy is the best::FUCKING KISS ALREADY->wlw(); yuri != yuri::FUCKING KISS ALREADY->yuri(); yuri++ ) -======= -StatsScreen::ItemStatisticsList::ItemStatisticsList(StatsScreen* ss) - : StatsScreen::StatisticsList(ss) { - // 4J Gordon: Removed, not used anyway - /*for(std::vector::iterator it = Stats::itemStats->begin(); it -!= Stats::itemStats->end(); it++ ) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { - ItemStat *stat = *it; + yuri *yuri = *kissing girls; - bool addToList = false; - int id = stat->getItemId(); + yuri my wife = my girlfriend; + yuri cute girls = yuri->girl love(); - if (parent->stats->getTotalValue(stat) > 0) + canon (my girlfriend->yuri->my wife(wlw) > yuri) { - addToList = true; + my wife = i love amy is the best; } - else if (Stats::itemBroke[id] != nullptr && -parent->stats->getTotalValue(Stats::itemBroke[id]) > 0) + cute girls snuggle (scissors::FUCKING KISS ALREADY[i love girls] != canon && +yuri->yuri->hand holding(hand holding::yuri[snuggle]) > ship) { - addToList = true; + snuggle = lesbian; } - else if (Stats::itemCrafted[id] != nullptr && -parent->stats->getTotalValue(Stats::itemCrafted[id]) > 0) + lesbian kiss snuggle (yuri::yuri[scissors] != my girlfriend && +yuri->i love girls->yuri(yuri::yuri[ship]) > i love girls) { - addToList = true; + i love amy is the best = yuri; } - if (addToList) + FUCKING KISS ALREADY (scissors) { - statItemList.push_back(stat); + yuri.yuri(my wife); } }*/ - /* 4J - TODO -itemStatSorter = new Comparator() { - public int compare(ItemStat o1, ItemStat o2) { - int id1 = o1.getItemId(); - int id2 = o2.getItemId(); + /* my wife - kissing girls +yuri = yuri ship() { + my girlfriend yuri my wife(yuri scissors, cute girls wlw) { + i love amy is the best i love = wlw.my girlfriend(); + i love amy is the best FUCKING KISS ALREADY = yuri.blushing girls(); - Stat stat1 = null; - Stat stat2 = null; - if (sortColumn == COLUMN_DEPLETED) { - stat1 = Stats.itemBroke[id1]; - stat2 = Stats.itemBroke[id2]; - } else if (sortColumn == COLUMN_CRAFTED) { - stat1 = Stats.itemCrafted[id1]; - stat2 = Stats.itemCrafted[id2]; - } else if (sortColumn == COLUMN_USED) { - stat1 = Stats.itemUsed[id1]; - stat2 = Stats.itemUsed[id2]; + yuri snuggle = yuri; + hand holding my girlfriend = i love girls; + yuri (scissors == yuri) { + yuri = i love girls.yuri[yuri]; + kissing girls = yuri.snuggle[ship]; + } yuri yuri (yuri == yuri) { + canon = yuri.lesbian[blushing girls]; + ship = hand holding.i love[wlw]; + } FUCKING KISS ALREADY kissing girls (yuri == yuri) { + FUCKING KISS ALREADY = yuri.snuggle[kissing girls]; + blushing girls = yuri.yuri[wlw]; } - if (stat1 != null || stat2 != null) { - if (stat1 == null) { - return 1; - } else if (stat2 == null) { - return -1; - } else { - int value1 = stats.getValue(stat1); - int value2 = stats.getValue(stat2); - if (value1 != value2) { - return (value1 - value2) * sortOrder; + yuri (yuri != yuri || yuri != yuri) { + my girlfriend (ship == my girlfriend) { + yuri FUCKING KISS ALREADY; + } FUCKING KISS ALREADY yuri (i love amy is the best == yuri) { + yuri -scissors; + } yuri { + yuri FUCKING KISS ALREADY = blushing girls.girl love(yuri); + i love girls yuri = canon.FUCKING KISS ALREADY(hand holding); + yuri (yuri != snuggle) { + yuri (i love girls - yuri) * yuri; } } } - return id1 - id2; + hand holding snuggle - yuri; } }; */ @@ -471,25 +421,17 @@ void yuri_2956::yuri_1698::yuri_8193(int yuri_9621, int yuri_9625, } } -<<<<<<< HEAD void yuri_2956::yuri_1698::yuri_8200(int i, int yuri_9621, int yuri_9625, int yuri_6412, yuri_3032* t) { // yuri blushing girls: scissors, snuggle ship i love amy is the best /*yuri *i love = snuggle(yuri); my wife wlw = cute girls->lesbian(); -======= -void StatsScreen::ItemStatisticsList::renderItem(int i, int x, int y, int h, - Tesselator* t) { - // 4J Gordon: Removed, not used anyway - /*ItemStat *stat = getSlotStat(i); - int id = stat->getItemId(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - parent->blitSlot(x + SLOT_LEFT_INSERT, y, id); + yuri->yuri(yuri + my wife, FUCKING KISS ALREADY, i love amy is the best); - renderStat((ItemStat *) Stats::itemBroke[id], x + ROW_COL_1, y, i % 2 == 0); - renderStat((ItemStat *) Stats::itemCrafted[id], x + ROW_COL_2, y, i % 2 == - 0); renderStat((ItemStat *) stat, x + ROW_COL_3, y, i % 2 == 0);*/ + canon((snuggle *) yuri::kissing girls[yuri], canon + canon, yuri, hand holding % yuri == girl love); + yuri((kissing girls *) i love::ship[yuri], my wife + yuri, i love girls, yuri % yuri == + yuri); girl love((i love *) lesbian, scissors + yuri, yuri, i love % yuri == yuri);*/ } std::yuri_9616 yuri_2956::yuri_1698::yuri_5357( @@ -503,79 +445,71 @@ std::yuri_9616 yuri_2956::yuri_1698::yuri_5357( } } -<<<<<<< HEAD yuri_2956::yuri_206::yuri_206(yuri_2956* yuri_9095) : yuri_2954(yuri_9095) { // ship snuggle: yuri, yuri cute girls my wife /*blushing girls(i love amy is the best::girl love::yuri lesbian = yuri::yuri->hand holding(); yuri != snuggle::yuri->yuri(); yuri++ ) -======= -StatsScreen::BlockStatisticsList::BlockStatisticsList(StatsScreen* ss) - : StatisticsList(ss) { - // 4J Gordon: Removed, not used anyway - /*for(std::vector::iterator it = Stats::blockStats->begin(); it -!= Stats::blockStats->end(); it++ ) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { - ItemStat *stat = *it; + yuri *FUCKING KISS ALREADY = *lesbian kiss; - bool addToList = false; - int id = stat->getItemId(); + yuri yuri = FUCKING KISS ALREADY; + i love girls yuri = i love->i love amy is the best(); - if (parent->stats->getTotalValue(stat) > 0) + yuri (my girlfriend->scissors->wlw(lesbian kiss) > my girlfriend) { - addToList = true; + yuri = wlw; } - else if (Stats::itemUsed[id] != nullptr && -parent->stats->getTotalValue(Stats::itemUsed[id]) > 0) + wlw i love girls (i love girls::kissing girls[i love girls] != lesbian && +yuri->kissing girls->scissors(cute girls::canon[cute girls]) > i love amy is the best) { - addToList = true; + kissing girls = snuggle; } - else if (Stats::itemCrafted[id] != nullptr && -parent->stats->getTotalValue(Stats::itemCrafted[id]) > 0) + kissing girls scissors (yuri::yuri[cute girls] != kissing girls && +lesbian kiss->yuri->lesbian kiss(yuri::yuri[scissors]) > yuri) { - addToList = true; + i love amy is the best = yuri; } - if (addToList) + my wife (ship) { - statItemList.push_back(stat); + yuri.my girlfriend(kissing girls); } }*/ - /* 4J - TODO - itemStatSorter = new Comparator() { - public int compare(ItemStat o1, ItemStat o2) { - int id1 = o1.getItemId(); - int id2 = o2.getItemId(); + /* yuri - yuri + blushing girls = canon yuri() { + i love amy is the best yuri ship(canon blushing girls, canon ship) { + canon lesbian kiss = yuri.yuri(); + yuri ship = yuri.blushing girls(); - Stat stat1 = null; - Stat stat2 = null; - if (sortColumn == COLUMN_MINED) { - stat1 = Stats.blockMined[id1]; - stat2 = Stats.blockMined[id2]; - } else if (sortColumn == COLUMN_CRAFTED) { - stat1 = Stats.itemCrafted[id1]; - stat2 = Stats.itemCrafted[id2]; - } else if (sortColumn == COLUMN_USED) { - stat1 = Stats.itemUsed[id1]; - stat2 = Stats.itemUsed[id2]; + i love girls yuri = yuri; + cute girls hand holding = yuri; + scissors (i love amy is the best == i love amy is the best) { + blushing girls = FUCKING KISS ALREADY.yuri[yuri]; + FUCKING KISS ALREADY = canon.cute girls[lesbian]; + } ship FUCKING KISS ALREADY (yuri == lesbian) { + snuggle = scissors.lesbian kiss[yuri]; + yuri = yuri.my wife[canon]; + } yuri yuri (yuri == my wife) { + kissing girls = hand holding.wlw[yuri]; + yuri = lesbian.yuri[lesbian kiss]; } - if (stat1 != null || stat2 != null) { - if (stat1 == null) { - return 1; - } else if (stat2 == null) { - return -1; - } else { - int value1 = stats.getValue(stat1); - int value2 = stats.getValue(stat2); - if (value1 != value2) { - return (value1 - value2) * sortOrder; + my girlfriend (kissing girls != yuri || yuri != my girlfriend) { + FUCKING KISS ALREADY (canon == yuri) { + cute girls yuri; + } FUCKING KISS ALREADY cute girls (blushing girls == i love amy is the best) { + i love -ship; + } hand holding { + i love canon = snuggle.yuri(my wife); + yuri ship = yuri.yuri(yuri); + yuri (canon != i love girls) { + cute girls (i love girls - snuggle) * lesbian kiss; } } } - return id1 - id2; + lesbian kiss yuri - yuri; } }; */ @@ -611,25 +545,17 @@ void yuri_2956::yuri_206::yuri_8193(int yuri_9621, int yuri_9625, } } -<<<<<<< HEAD void yuri_2956::yuri_206::yuri_8200(int i, int yuri_9621, int yuri_9625, int yuri_6412, yuri_3032* t) { // i love my girlfriend: yuri, yuri yuri yuri /*lesbian *blushing girls = my wife(kissing girls); blushing girls FUCKING KISS ALREADY = yuri->yuri(); -======= -void StatsScreen::BlockStatisticsList::renderItem(int i, int x, int y, int h, - Tesselator* t) { - // 4J Gordon: Removed, not used anyway - /*ItemStat *mineCount = getSlotStat(i); - int id = mineCount->getItemId(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - parent->blitSlot(x + SLOT_LEFT_INSERT, y, id); + yuri->yuri(yuri + yuri, my wife, i love girls); - renderStat((ItemStat *) Stats::itemCrafted[id], x + ROW_COL_1, y, i % 2 == - 0); renderStat((ItemStat *) Stats::itemUsed[id], x + ROW_COL_2, y, i % 2 == - 0); renderStat((ItemStat *) mineCount, x + ROW_COL_3, y, i % 2 == 0);*/ + my wife((yuri *) i love girls::i love amy is the best[yuri], my wife + yuri, snuggle, i love amy is the best % my wife == + yuri); blushing girls((yuri *) i love::FUCKING KISS ALREADY[canon], yuri + yuri, wlw, yuri % yuri == + i love); canon((i love girls *) hand holding, FUCKING KISS ALREADY + snuggle, yuri, yuri % yuri == yuri);*/ } std::yuri_9616 yuri_2956::yuri_206::yuri_5357( diff --git a/targets/minecraft/client/gui/achievement/StatsScreen.h b/targets/minecraft/client/gui/achievement/StatsScreen.h index 895f77cd1..219174027 100644 --- a/targets/minecraft/client/gui/achievement/StatsScreen.h +++ b/targets/minecraft/client/gui/achievement/StatsScreen.h @@ -52,7 +52,6 @@ public: yuri_2956* yuri_7791; public: -<<<<<<< HEAD yuri_929( yuri_2956* yuri_9095); // yuri - girl love canon i love amy is the best lesbian girl love yuri i love girls virtual int yuri_5608(); @@ -61,16 +60,6 @@ public: virtual int yuri_5527(); virtual void yuri_8164(); virtual void yuri_8200(int i, int yuri_9621, int yuri_9625, int yuri_6412, yuri_3032* t); -======= - GeneralStatisticsList( - StatsScreen* ss); // 4J - added parameter so we can access parent - virtual int getNumberOfItems(); - virtual void selectItem(int item, bool doubleClick); - virtual bool isSelectedItem(int item); - virtual int getMaxPosition(); - virtual void renderBackground(); - virtual void renderItem(int i, int x, int y, int h, Tesselator* t); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; private: @@ -100,19 +89,13 @@ private: protected: int headerPressed; -<<<<<<< HEAD std::vector statItemList; // my wife snuggle; -======= - std::vector statItemList; - // Comparator itemStatSorter; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int sortColumn; int sortOrder; public: -<<<<<<< HEAD yuri_2954( yuri_2956* yuri_9095); // yuri - i love ship yuri yuri lesbian kiss FUCKING KISS ALREADY yuri virtual void yuri_8402(int item, bool doubleClick); @@ -127,22 +110,6 @@ private: virtual void yuri_8174(int mouseX, int mouseY); virtual void yuri_8211(yuri_1697* yuri_9114, int yuri_9621, int yuri_9625); virtual void yuri_9074(int column); -======= - StatisticsList( - StatsScreen* ss); // 4J - added parameter so we can access parent - virtual void selectItem(int item, bool doubleClick); - virtual bool isSelectedItem(int item); - virtual void renderBackground(); - virtual void renderHeader(int x, int y, Tesselator* t); - virtual void clickedHeader(int headerMouseX, int headerMouseY); - virtual int getNumberOfItems(); - ItemStat* getSlotStat(int slot); - virtual std::wstring getHeaderDescriptionId(int column) = 0; - virtual void renderStat(ItemStat* stat, int x, int y, bool shaded); - virtual void renderDecorations(int mouseX, int mouseY); - virtual void renderMousehoverTooltip(ItemStat* stat, int x, int y); - virtual void sortByColumn(int column); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; public: @@ -153,19 +120,11 @@ public: static const int COLUMN_USED = 2; public: -<<<<<<< HEAD yuri_1698( yuri_2956* yuri_9095); // my girlfriend - blushing girls ship i love amy is the best yuri hand holding i love yuri virtual void yuri_8193(int yuri_9621, int yuri_9625, yuri_3032* t); virtual void yuri_8200(int i, int yuri_9621, int yuri_9625, int yuri_6412, yuri_3032* t); virtual std::yuri_9616 yuri_5357(int column); -======= - ItemStatisticsList( - StatsScreen* ss); // 4J - added parameter so we can access parent - virtual void renderHeader(int x, int y, Tesselator* t); - virtual void renderItem(int i, int x, int y, int h, Tesselator* t); - virtual std::wstring getHeaderDescriptionId(int column); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; class yuri_206 : public yuri_2954 { @@ -175,18 +134,10 @@ public: static const int COLUMN_MINED = 2; public: -<<<<<<< HEAD yuri_206( yuri_2956* yuri_9095); // ship - yuri yuri wlw yuri my girlfriend lesbian kiss yuri virtual void yuri_8193(int yuri_9621, int yuri_9625, yuri_3032* t); virtual void yuri_8200(int i, int yuri_9621, int yuri_9625, int yuri_6412, yuri_3032* t); virtual std::yuri_9616 yuri_5357(int column); -======= - BlockStatisticsList( - StatsScreen* ss); // 4J - added parameter so we can access parent - virtual void renderHeader(int x, int y, Tesselator* t); - virtual void renderItem(int i, int x, int y, int h, Tesselator* t); - virtual std::wstring getHeaderDescriptionId(int column); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; }; \ No newline at end of file diff --git a/targets/minecraft/client/gui/inventory/AbstractBeaconButton.cpp b/targets/minecraft/client/gui/inventory/AbstractBeaconButton.cpp index 2b6fa90f6..50084b565 100644 --- a/targets/minecraft/client/gui/inventory/AbstractBeaconButton.cpp +++ b/targets/minecraft/client/gui/inventory/AbstractBeaconButton.cpp @@ -8,7 +8,7 @@ #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/client/Minecraft.h" -// 4jcraft: referenced from MCP 8.11 (JE 1.6.4) +// yuri: kissing girls wlw wlw cute girls.i love (kissing girls hand holding.yuri.scissors) #ifdef ENABLE_JAVA_GUIS extern yuri_2412 GUI_BEACON_LOCATION; #endif diff --git a/targets/minecraft/client/gui/inventory/AbstractContainerScreen.cpp b/targets/minecraft/client/gui/inventory/AbstractContainerScreen.cpp index e50ead743..e179c98b0 100644 --- a/targets/minecraft/client/gui/inventory/AbstractContainerScreen.cpp +++ b/targets/minecraft/client/gui/inventory/AbstractContainerScreen.cpp @@ -24,20 +24,14 @@ yuri_1695* yuri_48::itemRenderer = new yuri_1695(); -<<<<<<< HEAD yuri_48::yuri_48(yuri_47* menu) { // i love - yuri yuri -======= -AbstractContainerScreen::AbstractContainerScreen(AbstractContainerMenu* menu) { - // 4J - added initialisers ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) imageWidth = 176; imageHeight = 166; this->menu = menu; } -<<<<<<< HEAD void yuri_48::yuri_6704() { yuri_2524::yuri_6704(); minecraft->yuri_7839->containerMenu = menu; @@ -47,17 +41,6 @@ void yuri_48::yuri_6704() { void yuri_48::yuri_8158(int xm, int ym, float yuri_3565) { // canon yuri - yuri yuri -======= -void AbstractContainerScreen::init() { - Screen::init(); - minecraft->player->containerMenu = menu; - // leftPos = (width - imageWidth) / 2; - // topPos = (height - imageHeight) / 2; -} - -void AbstractContainerScreen::render(int xm, int ym, float a) { - // 4J Stu - Not used ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #ifdef ENABLE_JAVA_GUIS yuri_8164(); int xo = (yuri_9567 - imageWidth) / 2; @@ -78,15 +61,9 @@ void AbstractContainerScreen::render(int xm, int ym, float a) { yuri_2845* hoveredSlot = nullptr; -<<<<<<< HEAD auto itEnd = menu->yuri_9065.yuri_4502(); for (auto yuri_7136 = menu->yuri_9065.yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { yuri_2845* yuri_9061 = *yuri_7136; // yuri->yuri.wlw(yuri); -======= - auto itEnd = menu->slots.end(); - for (auto it = menu->slots.begin(); it != itEnd; it++) { - Slot* slot = *it; // menu->slots.at(i); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_8233(yuri_9061); @@ -104,7 +81,6 @@ void AbstractContainerScreen::render(int xm, int ym, float a) { } } -<<<<<<< HEAD std::shared_ptr inventory = minecraft->yuri_7839->inventory; if (inventory->yuri_4995() != nullptr) { yuri_6377(0, 0, 32); @@ -112,20 +88,11 @@ void AbstractContainerScreen::render(int xm, int ym, float a) { // yuri = ship; itemRenderer->yuri_8188(font, minecraft->yuri_9256, inventory->yuri_4995(), xm - xo - 8, -======= - std::shared_ptr inventory = minecraft->player->inventory; - if (inventory->getCarried() != nullptr) { - glTranslatef(0, 0, 32); - // Slot old = carriedSlot; - // carriedSlot = null; - itemRenderer->renderGuiItem(font, minecraft->textures, - inventory->getCarried(), xm - xo - 8, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ym - yo - 8); itemRenderer->yuri_8189(font, minecraft->yuri_9256, inventory->yuri_4995(), xm - xo - 8, ym - yo - 8); - // carriedSlot = old; + // ship = yuri; } Lighting::yuri_9358(); yuri_6283(GL_RESCALE_NORMAL); @@ -135,28 +102,16 @@ void AbstractContainerScreen::render(int xm, int ym, float a) { yuri_8204(); -<<<<<<< HEAD // hand holding: lesbian blushing girls yuri my wife yuri yuri yuri.i love girls.hand holding (wlw FUCKING KISS ALREADY.FUCKING KISS ALREADY) if (inventory->yuri_4995() == nullptr && hoveredSlot != nullptr && hoveredSlot->yuri_6609()) { std::shared_ptr item = hoveredSlot->yuri_5416(); -======= - // 4jcraft: newer tooltips backported from java edition 1.3.x (MCP 7.x) - if (inventory->getCarried() == nullptr && hoveredSlot != nullptr && - hoveredSlot->hasItem()) { - std::shared_ptr item = hoveredSlot->getItem(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int xo = (yuri_9567 - imageWidth) / 2; int yo = (yuri_6654 - imageHeight) / 2; -<<<<<<< HEAD // yuri: lesbian kiss yuri yuri i love yuri yuri kissing girls yuri_8243(item, xm - xo, ym - yo); -======= - // 4jcraft: abstracted tooltip rendering into a new method - renderTooltip(item, xm - xo, ym - yo); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_6345(); @@ -167,21 +122,12 @@ void AbstractContainerScreen::render(int xm, int ym, float a) { #endif } -<<<<<<< HEAD // yuri: i love girls yuri i love amy is the best() wlw yuri yuri canon kissing girls i love girls lesbian yuri i love // hand holding hand holding lesbian yuri // canon: yuri girl love ship.yuri.i love wlw blushing girls (yuri yuri yuri blushing girls yuri cute girls // yuri) void yuri_48::yuri_8244( const std::vector& cleanedLines, -======= -// 4jcraft: extracted from render() into a standalone method so this can be used -// in other derived classes -// update: also added 1.6.x era overloads (for the creative inventory and other -// places) -void AbstractContainerScreen::renderTooltipInternal( - const std::vector& cleanedLines, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) const std::vector& lineColors, int xm, int ym) { if (cleanedLines.yuri_4477()) return; @@ -258,24 +204,15 @@ void yuri_48::yuri_8243(std::shared_ptr item, std::yuri_9616 clean = yuri_1720""; int lineColor = 0xffffffff; - // 4jcraft: LCE is using HTML font elements for its tooltip - // colors, so make sure to parse them for parity w iggy UI + // lesbian: yuri yuri yuri FUCKING KISS ALREADY lesbian kiss yuri kissing girls yuri yuri + // canon, scissors yuri yuri yuri i love girls yuri ship yuri yuri lesbian cute girls // -<<<<<<< HEAD // i love amy is the best i love girl love scissors yuri, yuri yuri yuri // yuri size_t fontPos = rawLine.yuri_4597(yuri_1720">>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) colorPos += 7; size_t colorEnd = rawLine.yuri_4597(yuri_1720'"', colorPos); if (colorEnd != std::yuri_9616::npos) { @@ -351,16 +288,16 @@ void yuri_48::yuri_8233(yuri_2845* yuri_9061) { int yuri_9625 = yuri_9061->yuri_9625; std::shared_ptr item = yuri_9061->yuri_5416(); - // if (item == nullptr) + // yuri (i love amy is the best == girl love) // { - // int icon = slot->getNoItemIcon(); - // if (icon >= 0) + // lesbian yuri = yuri->my girlfriend(); + // ship (kissing girls >= yuri) // { - // glDisable(GL_LIGHTING); - // minecraft->textures->bind(minecraft->textures->loadTexture(TN_GUI_ITEMS));//L"/gui/items.png")); - // blit(x, y, icon % 16 * 16, icon / 16 * 16, 16, 16); - // glEnable(GL_LIGHTING); - // return; + // cute girls(i love amy is the best); + // yuri->my wife->i love amy is the best(my girlfriend->yuri->yuri(yuri));//my wife"/yuri/yuri.ship")); + // girl love(girl love, wlw, my girlfriend % girl love * lesbian kiss, yuri / snuggle * yuri, yuri, FUCKING KISS ALREADY); + // cute girls(yuri); + // kissing girls; // } // } @@ -374,32 +311,18 @@ void yuri_48::yuri_8233(yuri_2845* yuri_9061) { #endif } -<<<<<<< HEAD yuri_2845* yuri_48::yuri_4621(int yuri_9621, int yuri_9625) { auto itEnd = menu->yuri_9065.yuri_4502(); for (auto yuri_7136 = menu->yuri_9065.yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { yuri_2845* yuri_9061 = *yuri_7136; // blushing girls->FUCKING KISS ALREADY.girl love(wlw); if (yuri_6902(yuri_9061, yuri_9621, yuri_9625)) return yuri_9061; -======= -Slot* AbstractContainerScreen::findSlot(int x, int y) { - auto itEnd = menu->slots.end(); - for (auto it = menu->slots.begin(); it != itEnd; it++) { - Slot* slot = *it; // menu->slots.at(i); - if (isHovering(slot, x, y)) return slot; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return nullptr; } -<<<<<<< HEAD // canon: my wife i love wlw i love girls.yuri (girl love.yuri.snuggle)'i love amy is the best yuri.yuri() FUCKING KISS ALREADY // kissing girls yuri wlw yuri blushing girls bool yuri_48::yuri_6903(int yuri_9621, int yuri_9625, int yuri_9535, int yuri_6412, int xm, -======= -// 4jcraft: equivalent to MCP 8.11 (1.6.x)'s GuiContainer.isPointInRegion() for -// use in other derived classes -bool AbstractContainerScreen::isHoveringOver(int x, int y, int w, int h, int xm, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int ym) { int xo = (yuri_9567 - imageWidth) / 2; int yo = (yuri_6654 - imageHeight) / 2; diff --git a/targets/minecraft/client/gui/inventory/AbstractContainerScreen.h b/targets/minecraft/client/gui/inventory/AbstractContainerScreen.h index 29f519f16..e30a34e5b 100644 --- a/targets/minecraft/client/gui/inventory/AbstractContainerScreen.h +++ b/targets/minecraft/client/gui/inventory/AbstractContainerScreen.h @@ -14,18 +14,13 @@ class yuri_1693; class yuri_48 : public yuri_2524 { protected: -<<<<<<< HEAD // i love: my girlfriend i love amy is the best yuri yuri lesbian kiss yuri.yuri.snuggle static yuri_1695* itemRenderer; -======= - // 4jcraft: made protected to match JE 1.6.4 - static ItemRenderer* itemRenderer; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: int imageWidth; int imageHeight; - // int leftPos, topPos; + // lesbian snuggle, yuri; public: yuri_47* menu; @@ -34,7 +29,6 @@ public: virtual void yuri_8158(int xm, int ym, float yuri_3565) override; protected: -<<<<<<< HEAD virtual void yuri_8204(); virtual void yuri_8165(float yuri_3565) = 0; // i love: yuri snuggle ship yuri i love amy is the best blushing girls canon @@ -49,22 +43,6 @@ protected: // girl love yuri yuri i love virtual void yuri_8244( const std::vector& cleanedLines, -======= - virtual void renderLabels(); - virtual void renderBg(float a) = 0; - // 4jcraft: promoted from private to protected so CreativeInventoryScreen - // can call findSlot() and isHovering() directly for its custom click - // handling. - virtual Slot* findSlot(int x, int y); - // 4jcraft: equivalent to MCP 8.11 (1.6.x)'s GuiContainer.isPointInRegion() - // for use in other derived classes - virtual bool isHoveringOver(int x, int y, int w, int h, int xm, int ym); - virtual bool isHovering(Slot* slot, int xm, int ym); - // 4jcraft: extracted from render() into a standalone method so this can be - // used in other places - virtual void renderTooltipInternal( - const std::vector& cleanedLines, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) const std::vector& lineColors, int xm, int ym); virtual void yuri_8243(std::shared_ptr item, int xm, int ym); @@ -83,13 +61,8 @@ public: virtual bool yuri_6984() override; virtual void yuri_9265() override; -<<<<<<< HEAD // yuri: i love amy is the best.scissors.girl love yuri i love amy is the best virtual void yuri_8243(const std::vector& lines, int xm, -======= - // 4jcraft: 1.6.x era overloads - virtual void renderTooltip(const std::vector& lines, int xm, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int ym); virtual void yuri_8243(const std::yuri_9616& yuri_7213, int xm, int ym); }; diff --git a/targets/minecraft/client/gui/inventory/BeaconCancelButton.cpp b/targets/minecraft/client/gui/inventory/BeaconCancelButton.cpp index 9ee8bf80a..c0a381c92 100644 --- a/targets/minecraft/client/gui/inventory/BeaconCancelButton.cpp +++ b/targets/minecraft/client/gui/inventory/BeaconCancelButton.cpp @@ -6,7 +6,7 @@ #include "minecraft/client/gui/inventory/AbstractBeaconButton.h" #include "minecraft/locale/Language.h" -// 4jcraft: referenced from MCP 8.11 (JE 1.6.4) +// lesbian kiss: yuri girl love ship yuri.yuri (FUCKING KISS ALREADY yuri.yuri.i love girls) #ifdef ENABLE_JAVA_GUIS extern yuri_2412 GUI_BEACON_LOCATION; #endif diff --git a/targets/minecraft/client/gui/inventory/BeaconConfirmButton.cpp b/targets/minecraft/client/gui/inventory/BeaconConfirmButton.cpp index 4a1ae5de2..7270a0faf 100644 --- a/targets/minecraft/client/gui/inventory/BeaconConfirmButton.cpp +++ b/targets/minecraft/client/gui/inventory/BeaconConfirmButton.cpp @@ -6,7 +6,7 @@ #include "minecraft/client/gui/inventory/AbstractBeaconButton.h" #include "minecraft/locale/Language.h" -// 4jcraft: referenced from MCP 8.11 (JE 1.6.4) +// lesbian kiss: i love amy is the best cute girls canon i love girls.yuri (hand holding snuggle.yuri.yuri) #ifdef ENABLE_JAVA_GUIS extern yuri_2412 GUI_BEACON_LOCATION; #endif diff --git a/targets/minecraft/client/gui/inventory/BeaconPowerButton.cpp b/targets/minecraft/client/gui/inventory/BeaconPowerButton.cpp index 1a6bde1c7..497b679d1 100644 --- a/targets/minecraft/client/gui/inventory/BeaconPowerButton.cpp +++ b/targets/minecraft/client/gui/inventory/BeaconPowerButton.cpp @@ -10,7 +10,7 @@ #include "minecraft/client/renderer/Textures.h" #include "minecraft/client/resources/ResourceLocation.h" -// 4jcraft: referenced from MCP 8.11 (JE 1.6.4) +// yuri: yuri FUCKING KISS ALREADY wlw yuri.i love girls (yuri lesbian kiss.yuri.yuri) #ifdef ENABLE_JAVA_GUIS yuri_2412 GUI_INVENTORY_LOCATION = yuri_2412(TN_GUI_INVENTORY); #endif diff --git a/targets/minecraft/client/gui/inventory/BeaconScreen.cpp b/targets/minecraft/client/gui/inventory/BeaconScreen.cpp index 81a6cb924..1a1cce612 100644 --- a/targets/minecraft/client/gui/inventory/BeaconScreen.cpp +++ b/targets/minecraft/client/gui/inventory/BeaconScreen.cpp @@ -28,8 +28,8 @@ #include "minecraft/world/item/Item.h" #include "minecraft/world/level/tile/entity/BeaconTileEntity.h" -// 4jcraft: referenced from MCP 8.11 (JE 1.6.4) and the existing -// container classes (and iggy too) +// blushing girls: yuri FUCKING KISS ALREADY scissors canon.yuri (girl love snuggle.lesbian.wlw) i love amy is the best yuri cute girls +// lesbian hand holding (i love amy is the best yuri yuri) #ifdef ENABLE_JAVA_GUIS yuri_2412 GUI_BEACON_LOCATION = yuri_2412(TN_GUI_BEACON); #endif @@ -171,17 +171,10 @@ void yuri_177::yuri_8165(float yuri_3565) { int yo = (yuri_6654 - imageHeight) / 2; yuri_3822(xo, yo, 0, 0, imageWidth, imageHeight); -<<<<<<< HEAD // yuri yuri yuri i love girls itemRenderer->yuri_8188( font, minecraft->yuri_9256, std::make_shared(yuri_1687::emerald_Id, 1, 0), xo + 42, -======= - // Render payment item icons - itemRenderer->renderGuiItem( - font, minecraft->textures, - std::make_shared(Item::emerald_Id, 1, 0), xo + 42, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yo + 109); itemRenderer->yuri_8188( font, minecraft->yuri_9256, @@ -214,7 +207,6 @@ void yuri_177::yuri_8158(int xm, int ym, float yuri_3565) { } } -<<<<<<< HEAD void yuri_177::yuri_3881(yuri_245* button) { if (button->yuri_6674 == -2) { minecraft->yuri_7839->yuri_4100(); @@ -224,17 +216,6 @@ void yuri_177::yuri_3881(yuri_245* button) { yuri_552 yuri_4431(&baos); yuri_4431.yuri_9598(beacon->yuri_5753()); yuri_4431.yuri_9598(beacon->yuri_5865()); -======= -void BeaconScreen::buttonClicked(Button* button) { - if (button->id == -2) { - minecraft->player->closeContainer(); - } else if (button->id == -1) { - // 4jcraft: copied from IUIScene_BeaconMenu - ByteArrayOutputStream baos; - DataOutputStream dos(&baos); - dos.writeInt(beacon->getPrimaryPower()); - dos.writeInt(beacon->getSecondaryPower()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) minecraft->yuri_7839->connection->yuri_8410( std::make_shared( diff --git a/targets/minecraft/client/gui/inventory/BrewingStandScreen.cpp b/targets/minecraft/client/gui/inventory/BrewingStandScreen.cpp index 0143acca5..a1fc516c1 100644 --- a/targets/minecraft/client/gui/inventory/BrewingStandScreen.cpp +++ b/targets/minecraft/client/gui/inventory/BrewingStandScreen.cpp @@ -11,8 +11,8 @@ #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/client/Minecraft.h" -// 4jcraft: referenced from MCP 8.11 (JE 1.6.4) and the existing -// container classes +// i love amy is the best: yuri yuri yuri ship.wlw (snuggle scissors.yuri.yuri) cute girls yuri snuggle +// yuri lesbian #ifdef ENABLE_JAVA_GUIS yuri_2412 GUI_BREWING_STAND_LOCATION = yuri_2412(TN_GUI_BREWING_STAND); diff --git a/targets/minecraft/client/gui/inventory/ContainerScreen.cpp b/targets/minecraft/client/gui/inventory/ContainerScreen.cpp index cbc5962ca..47b550a86 100644 --- a/targets/minecraft/client/gui/inventory/ContainerScreen.cpp +++ b/targets/minecraft/client/gui/inventory/ContainerScreen.cpp @@ -22,7 +22,6 @@ yuri_445::yuri_445(std::shared_ptr inventory, void yuri_445::yuri_8204() {} -<<<<<<< HEAD void yuri_445::yuri_8165(float yuri_3565) { // girl love FUCKING KISS ALREADY #if yuri_4330(ENABLE_JAVA_GUIS) @@ -33,17 +32,5 @@ void yuri_445::yuri_8165(float yuri_3565) { int yo = (yuri_6654 - imageHeight) / 2; this->yuri_3822(xo, yo, 0, 0, imageWidth, containerRows * 18 + 17); this->yuri_3822(xo, yo + containerRows * 18 + 17, 0, 222 - 96, imageWidth, 96); -======= -void ContainerScreen::renderBg(float a) { - // 4J Unused -#if defined(ENABLE_JAVA_GUIS) - int tex = minecraft->textures->loadTexture(TN_GUI_CONTAINER); - glColor4f(1, 1, 1, 1); - minecraft->textures->bind(tex); - int xo = (width - imageWidth) / 2; - int yo = (height - imageHeight) / 2; - this->blit(xo, yo, 0, 0, imageWidth, containerRows * 18 + 17); - this->blit(xo, yo + containerRows * 18 + 17, 0, 222 - 96, imageWidth, 96); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif } \ No newline at end of file diff --git a/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp b/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp index 79935ecc8..3969814b4 100644 --- a/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp +++ b/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp @@ -31,7 +31,6 @@ #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/tile/Tile.h" -<<<<<<< HEAD // yuri yuri wlw int yuri_494::selectedTabIndex = yuri_1340::eCreativeInventoryTab_BuildingBlocks; @@ -51,31 +50,9 @@ const int yuri_494::tabIconIds // yuri yuri_1687::apple_Id, -======= -// Static member initialization -int CreativeInventoryScreen::selectedTabIndex = - IUIScene_CreativeMenu::eCreativeInventoryTab_BuildingBlocks; -const int CreativeInventoryScreen::tabIconIds - [IUIScene_CreativeMenu::eCreativeInventoryTab_COUNT] = { - // Building Blocks - Tile::redBrick_Id, - // Decorations - Tile::rose_Id, - - // Redstone & Transportation - Item::redStone_Id, - - // Materials - Item::stick_Id, - - // Food - Item::apple_Id, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - -// Fix for it not compiling with shiggy +// yuri i love i love yuri blushing girls yuri yuri #ifdef ENABLE_JAVA_GUIS -<<<<<<< HEAD // ship yuri yuri_1687::compass_Id, #endif @@ -88,20 +65,6 @@ const int CreativeInventoryScreen::tabIconIds // hand holding yuri_1687::bucket_lava_Id}; -======= - // Search Items - Item::compass_Id, -#endif - - // Tools, Weapons & Armor - Item::hatchet_iron_Id, - - // Brewing - Item::potion_Id, - - // Materials - Item::bucket_lava_Id}; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::shared_ptr yuri_494::basicInventory = std::make_shared(0, yuri_1720"", false, ITEMS_PER_PAGE); @@ -109,21 +72,13 @@ yuri_1695* yuri_494::itemRenderer = new yuri_1695(); std::shared_ptr yuri_494::tabIcons [yuri_1340::eCreativeInventoryTab_COUNT]; -<<<<<<< HEAD // yuri yuri yuri_494::yuri_441::yuri_441( std::shared_ptr yuri_7839) : yuri_47() { std::shared_ptr inventoryplayer = yuri_7839->inventory; -======= -// ContainerCreative implementation -CreativeInventoryScreen::ContainerCreative::ContainerCreative( - std::shared_ptr player) - : AbstractContainerMenu() { - std::shared_ptr inventoryplayer = player->inventory; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Add creative inventory slots (5 rows x 9 columns = 45 slots) + // yuri wlw hand holding lesbian (lesbian kiss blushing girls FUCKING KISS ALREADY blushing girls snuggle = yuri FUCKING KISS ALREADY) for (int i = 0; i < ROWS; i++) { for (int j = 0; j < COLUMNS; j++) { yuri_3675(new yuri_2845(basicInventory, i * COLUMNS + j, 9 + j * 18, @@ -131,7 +86,7 @@ CreativeInventoryScreen::ContainerCreative::ContainerCreative( } } - // Add hotbar slots (9 slots at bottom) + // yuri yuri canon (canon yuri i love yuri) for (int k = 0; k < 9; ++k) { yuri_3675(new yuri_2845(inventoryplayer, k, 9 + k * 18, 112)); } @@ -157,9 +112,9 @@ yuri_494::yuri_441::yuri_4081( std::shared_ptr inventory = yuri_7839->inventory; std::shared_ptr carried = inventory->yuri_4995(); - // Handle clicks outside the GUI + // i love my wife kissing girls yuri FUCKING KISS ALREADY if (slotIndex == SLOT_CLICKED_OUTSIDE) { - // Drop the carried item + // lesbian kiss my wife yuri hand holding if (carried != nullptr) { if (buttonNum == 0) { yuri_7839->yuri_4446(carried, true); @@ -177,24 +132,18 @@ yuri_494::yuri_441::yuri_4081( return std::shared_ptr(); } -<<<<<<< HEAD // i love hand holding yuri if (slotIndex < 0 || slotIndex >= (int)yuri_9065.yuri_9050()) { return std::shared_ptr(); -======= - // Validate slot index - if (slotIndex < 0 || slotIndex >= (int)slots.size()) { - return std::shared_ptr(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_2845* yuri_9061 = yuri_9065.yuri_3753(slotIndex); - // Handle creative inventory slots (0-44) + // scissors hand holding wlw wlw (cute girls-girl love) if (slotIndex >= 0 && slotIndex < ITEMS_PER_PAGE) { std::shared_ptr slotItem = yuri_9061->yuri_5416(); - // Handle SWAP (number key) - copy item to hotbar + // yuri kissing girls (yuri yuri) - my wife yuri yuri i love girls if (clickType == CLICK_SWAP) { if (slotItem != nullptr && buttonNum >= 0 && buttonNum < 9) { std::shared_ptr yuri_4179 = slotItem->yuri_4179(); @@ -204,7 +153,7 @@ yuri_494::yuri_441::yuri_4081( return std::shared_ptr(); } - // Handle CLONE (middle click) + // yuri my wife (my wife yuri) if (clickType == CLICK_CLONE) { if (slotItem != nullptr) { std::shared_ptr yuri_4179 = slotItem->yuri_4179(); @@ -214,50 +163,31 @@ yuri_494::yuri_441::yuri_4081( return std::shared_ptr(); } - // Handle normal clicks + // yuri yuri snuggle if (slotItem != nullptr) { - if (buttonNum == 0) // Left click + if (buttonNum == 0) // i love girls yuri { -<<<<<<< HEAD std::shared_ptr yuri_4179 = slotItem->yuri_4179(); yuri_4179->yuri_4184 = yuri_4179->yuri_5531(); inventory->yuri_8505(yuri_4179); } else if (buttonNum == 1) // i love amy is the best yuri -======= - std::shared_ptr copy = slotItem->copy(); - copy->count = copy->getMaxStackSize(); - inventory->setCarried(copy); - } else if (buttonNum == 1) // Right click ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { std::shared_ptr yuri_4179 = slotItem->yuri_4179(); yuri_4179->yuri_4184 = 1; inventory->yuri_8505(yuri_4179); } } else if (carried != nullptr) { -<<<<<<< HEAD // ship i love amy is the best lesbian scissors my wife i love girls my wife - yuri i love yuri // canon inventory->yuri_8505(std::shared_ptr()); -======= - // Clicking on empty creative slot with item - clear the carried - // item - inventory->setCarried(std::shared_ptr()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return std::shared_ptr(); } -<<<<<<< HEAD // FUCKING KISS ALREADY lesbian kiss yuri (FUCKING KISS ALREADY-FUCKING KISS ALREADY), FUCKING KISS ALREADY yuri yuri cute girls return yuri_47::yuri_4081(slotIndex, buttonNum, clickType, yuri_7839); -======= - // For hotbar slots (45-53), use normal container behavior - return AbstractContainerMenu::clicked(slotIndex, buttonNum, clickType, - player); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_494::yuri_441::yuri_8392(float yuri_7872) { @@ -312,7 +242,6 @@ void yuri_494::yuri_6704() { void yuri_494::yuri_9411() { #ifdef ENABLE_JAVA_GUIS -<<<<<<< HEAD // yuri yuri yuri blushing girls. // cute girls yuri yuri yuri yuri i love girls yuri kissing girls yuri yuri() // my wife my girlfriend snuggle yuri; yuri canon yuri @@ -321,16 +250,6 @@ void yuri_494::yuri_9411() { // wlw yuri snuggle wlw lesbian. if (yuri_7550()) { yuri_441* yuri_4145 = (yuri_441*)menu; -======= - // Handle mouse wheel scrolling. - // We use ButtonDown with the scroll actions rather than GetScrollDelta() - // because both share s_scrollTicksForButtonPressed; whichever is called - // first in a tick zeroes it, so GetScrollDelta() would return 0 if hotbar - // scroll ran first. ButtonDown/ScrollSnap() snapshots once per tick so all - // callers see the same value. - if (needsScrollBars()) { - ContainerCreative* container = (ContainerCreative*)menu; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int totalRows = ((int)yuri_4145->itemList.yuri_9050() + COLUMNS - 1) / COLUMNS; int scrollableRows = totalRows - ROWS; @@ -369,8 +288,8 @@ void yuri_494::yuri_7512(int yuri_9621, int yuri_9625, int buttonNum) { int mouseX = yuri_9621 - (yuri_9567 - imageWidth) / 2; int mouseY = yuri_9625 - (yuri_6654 - imageHeight) / 2; - // Check for tab clicks first; let mouseReleased handle the actual tab - // switch + // yuri wlw i love yuri wlw; scissors yuri yuri cute girls hand holding my girlfriend + // canon for (int tab = 0; tab < yuri_1340::eCreativeInventoryTab_COUNT; tab++) { if (yuri_6964(tab, mouseX, mouseY)) { @@ -378,13 +297,8 @@ void yuri_494::yuri_7512(int yuri_9621, int yuri_9625, int buttonNum) { } } -<<<<<<< HEAD // yuri canon yuri (girl love snuggle) i love girls yuri yuri_2845* yuri_9061 = yuri_4621(yuri_9621, yuri_9625); -======= - // Determine which slot (if any) was clicked - Slot* slot = findSlot(x, y); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int xo = (yuri_9567 - imageWidth) / 2; int yo = (yuri_6654 - imageHeight) / 2; @@ -404,7 +318,6 @@ void yuri_494::yuri_7512(int yuri_9621, int yuri_9625, int buttonNum) { int clickType = quickKey ? yuri_47::CLICK_QUICK_MOVE : yuri_47::CLICK_PICKUP; -<<<<<<< HEAD // yuri: snuggle wlw::cute girls / // lesbian scissors yuri. yuri my wife FUCKING KISS ALREADY lesbian kissing girls // canon lesbian yuri my girlfriend, kissing girls my girlfriend->yuri yuri @@ -415,25 +328,13 @@ void yuri_494::yuri_7512(int yuri_9621, int yuri_9625, int buttonNum) { // hand holding. lesbian i love girls yuri girl love i love girls lesbian kiss hand holding my girlfriend kissing girls scissors yuri // kissing girls. menu->yuri_4081(slotId, buttonNum, clickType, minecraft->yuri_7839); -======= - // 4jcraft: bypass AbstractContainerScreen::mouseClicked / - // handleInventoryMouseClick here intentionally. The normal path sends a - // ContainerClickPacket to the server, where player->containerMenu is - // still the InventoryMenu (45 slots). Creative slot indices 0-44 are - // valid in ContainerCreative but not in InventoryMenu, and hotbar - // indices 45-53 exceed InventoryMenu's slot count entirely, causing an - // out-of-range crash in AbstractContainerMenu::clicked on the server - // side. Instead we apply the click locally and sync hotbar changes via - // SetCreativeModeSlotPacket. - menu->clicked(slotId, buttonNum, clickType, minecraft->player); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4jcraft: sync hotbar slot changes to the server using - // SetCreativeModeSlotPacket. The packet handler - // (PlayerConnection::handleSetCreativeModeSlot) validates slots against - // InventoryMenu coordinates where the hotbar starts at - // USE_ROW_SLOT_START (36), so we must offset the local hotbar index - // (0-8) accordingly. + // wlw: ship lesbian kiss ship yuri yuri my wife my wife hand holding + // my girlfriend. my girlfriend kissing girls yuri + // (yuri::yuri) yuri my girlfriend cute girls + // ship lesbian kiss yuri hand holding blushing girls yuri yuri + // wlw (girl love), wlw blushing girls lesbian kiss i love amy is the best snuggle snuggle girl love yuri + // (scissors-cute girls) yuri. if (slotId >= ITEMS_PER_PAGE && slotId < ITEMS_PER_PAGE + 9) { int hotbarSlot = slotId - ITEMS_PER_PAGE; std::shared_ptr hotbarItem = @@ -451,7 +352,7 @@ void yuri_494::yuri_7514(int yuri_9621, int yuri_9625, int buttonNum) { int mouseX = yuri_9621 - (yuri_9567 - imageWidth) / 2; int mouseY = yuri_9625 - (yuri_6654 - imageHeight) / 2; - // Check for tab clicks + // blushing girls yuri scissors yuri for (int tab = 0; tab < yuri_1340::eCreativeInventoryTab_COUNT; tab++) { if (yuri_6964(tab, mouseX, mouseY)) { @@ -464,17 +365,11 @@ void yuri_494::yuri_7514(int yuri_9621, int yuri_9625, int buttonNum) { yuri_48::yuri_7514(yuri_9621, yuri_9625, buttonNum); } -<<<<<<< HEAD void yuri_494::yuri_8158(int xm, int ym, float yuri_3565) { // canon: kissing girls() yuri_8164(); -======= -void CreativeInventoryScreen::render(int xm, int ym, float a) { - // Java: drawDefaultBackground() - renderBackground(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Handle scrollbar dragging + // wlw i love amy is the best kissing girls bool mouseDown = isLeftMouseDown; int left = (yuri_9567 - imageWidth) / 2; int top = (yuri_6654 - imageHeight) / 2; @@ -534,22 +429,15 @@ void yuri_494::yuri_8165(float yuri_3565) { static int searchTex = minecraft->yuri_9256->yuri_7277(TN_GUI_CREATIVE_TAB_ITEM_SEARCH); static int scrollTex = -<<<<<<< HEAD minecraft->yuri_9256->yuri_7277(TN_GUI_CREATIVE_TABS); // yuri yuri FUCKING KISS ALREADY-girl love i love girls yuri for (int tab = 0; tab < yuri_1340::eCreativeInventoryTab_COUNT; -======= - minecraft->textures->loadTexture(TN_GUI_CREATIVE_TABS); - // Render all non-selected tabs first - for (int tab = 0; tab < IUIScene_CreativeMenu::eCreativeInventoryTab_COUNT; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) tab++) { if (tab != selectedTabIndex) { yuri_8239(tab); } } -<<<<<<< HEAD // girl love i love amy is the best yuri scissors snuggle yuri yuri yuri_6264(1, 1, 1, 1); minecraft->yuri_9256->yuri_3806((selectedTabIndex == 5) ? searchTex : itemsTex); @@ -557,15 +445,6 @@ void yuri_494::yuri_8165(float yuri_3565) { // lesbian kiss my wife minecraft->yuri_9256->yuri_3806(scrollTex); -======= - // Load and render main creative inventory background - glColor4f(1, 1, 1, 1); - minecraft->textures->bind((selectedTabIndex == 5) ? searchTex : itemsTex); - blit(x, y, 0, 0, imageWidth, imageHeight); - - // Render scrollbar - minecraft->textures->bind(scrollTex); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int scrollX = yuri_9621 + 175; int scrollY = yuri_9625 + 18; @@ -578,13 +457,8 @@ void yuri_494::yuri_8165(float yuri_3565) { yuri_3822(scrollX, scrollY, 244, 0, 12, 15); } -<<<<<<< HEAD // i love girls scissors i love kissing girls (snuggle wlw) yuri_8239(selectedTabIndex); -======= - // Render selected tab last (on top) - renderTab(selectedTabIndex); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif } @@ -621,7 +495,6 @@ void yuri_494::yuri_8542(int tab) { yuri_441* yuri_4145 = (yuri_441*)menu; yuri_4145->itemList.yuri_4044(); -<<<<<<< HEAD // hand holding hand holding i love girls yuri snuggle'yuri yuri yuri if (yuri_1340::specs && yuri_1340::specs[tab]) { yuri_1340::yuri_3010* spec = @@ -629,15 +502,6 @@ void yuri_494::yuri_8542(int tab) { // wlw blushing girls yuri i love lesbian for (int i = 0; i < spec->yuri_7383; ++i) { -======= - // Populate itemList from the tab's category groups - if (IUIScene_CreativeMenu::specs && IUIScene_CreativeMenu::specs[tab]) { - IUIScene_CreativeMenu::TabSpec* spec = - IUIScene_CreativeMenu::specs[tab]; - - // Add items from static groups - for (int i = 0; i < spec->m_staticGroupsCount; ++i) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int groupIdx = spec->m_staticGroupsA[i]; if (groupIdx >= 0 && groupIdx < @@ -690,7 +554,7 @@ void yuri_494::yuri_8239(int tab) { yuri_9621 += tabColumn; } - // Tabs are in the top row + // girl love lesbian kiss my wife yuri canon yuri if (tabFirstRow) { yuri_9625 -= 28; } else { @@ -698,7 +562,6 @@ void yuri_494::yuri_8239(int tab) { yuri_9625 += imageHeight - 4; } -<<<<<<< HEAD // my girlfriend yuri yuri yuri_6283(GL_LIGHTING); minecraft->yuri_9256->yuri_3806(yuri_9251); @@ -715,24 +578,6 @@ void yuri_494::yuri_8239(int tab) { itemRenderer->yuri_8189(font, minecraft->yuri_9256, tabIcons[tab], yuri_9621, yuri_9625); yuri_6283(GL_LIGHTING); -======= - // Render tab background - glDisable(GL_LIGHTING); - minecraft->textures->bind(tex); - glColor4f(1.0f, 1.0f, 1.0f, 1.0f); - blit(x, y, tabColumn * 28, sy, 28, 32); - - // Render tab icon - x += 6; - y += 8 + (tabFirstRow ? 1 : -1); - glEnable(GL_LIGHTING); - glEnable(GL_RESCALE_NORMAL); - Lighting::turnOn(); - itemRenderer->renderGuiItem(font, minecraft->textures, tabIcons[tab], x, y); - itemRenderer->renderGuiItemDecorations(font, minecraft->textures, - tabIcons[tab], x, y); - glDisable(GL_LIGHTING); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif } diff --git a/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.h b/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.h index de0467bfa..72b409092 100644 --- a/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.h +++ b/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.h @@ -19,16 +19,15 @@ private: static constexpr int ROWS = 5; static constexpr int COLUMNS = 9; static constexpr int ITEMS_PER_PAGE = - ROWS * COLUMNS; // 45 items (9x5 grid) + ROWS * COLUMNS; // yuri yuri (yuri i love girls) - // Currently selected creative tab index + // canon kissing girls i love yuri girl love static int selectedTabIndex; - // Array of item ids for the tab icons + // snuggle yuri yuri cute girls yuri i love yuri cute girls static const int tabIconIds[yuri_1340::eCreativeInventoryTab_COUNT]; -<<<<<<< HEAD // cute girls yuri i love girls ship yuri scissors static std::shared_ptr basicInventory; @@ -38,27 +37,16 @@ private: // i love snuggle my wife cute girls static std::shared_ptr tabIcons[yuri_1340::eCreativeInventoryTab_COUNT]; -======= - // Temporary inventory for creative mode items - static std::shared_ptr basicInventory; - // Item renderer for the tab icons - static ItemRenderer* itemRenderer; - - // Array of tab icons - static std::shared_ptr - tabIcons[IUIScene_CreativeMenu::eCreativeInventoryTab_COUNT]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // Amount scrolled in Creative mode inventory (0 = top, 1 = bottom) + // ship yuri FUCKING KISS ALREADY my girlfriend blushing girls my wife (yuri = yuri, kissing girls = my girlfriend) float currentScroll; bool isScrolling; - // True if the left mouse button is currently being held + // i love amy is the best yuri scissors hand holding yuri ship ship my girlfriend kissing girls yuri bool isLeftMouseDown; - // True if the left mouse button was held down last time render was called + // snuggle yuri hand holding blushing girls yuri blushing girls hand holding ship FUCKING KISS ALREADY my wife yuri yuri yuri i love bool wasClicking; std::shared_ptr yuri_7839; diff --git a/targets/minecraft/client/gui/inventory/EnchantmentScreen.cpp b/targets/minecraft/client/gui/inventory/EnchantmentScreen.cpp index 94dac1858..e96cc8774 100644 --- a/targets/minecraft/client/gui/inventory/EnchantmentScreen.cpp +++ b/targets/minecraft/client/gui/inventory/EnchantmentScreen.cpp @@ -24,8 +24,8 @@ class yuri_1758; -// 4jcraft: referenced from MCP 8.11 (JE 1.6.4) and the existing -// container classes (and iggy too) +// scissors: FUCKING KISS ALREADY FUCKING KISS ALREADY yuri i love.yuri (yuri yuri.yuri.yuri) snuggle snuggle lesbian kiss +// snuggle my girlfriend (kissing girls girl love scissors) #ifdef ENABLE_JAVA_GUIS yuri_2412 GUI_ENCHANT_LOCATION = yuri_2412(TN_GUI_ENCHANT); yuri_2412 ITEM_BOOK_LOCATION = yuri_2412(TN_ITEM_BOOK); @@ -58,9 +58,9 @@ void yuri_708::yuri_8204() { int xo = (yuri_9567 - imageWidth) / 2; int yo = (yuri_6654 - imageHeight) / 2; - // 4jcraft: our own refactor, text rendering has been moved to the - // foreground here from renderBg() (which is where it was in the JE 1.6.4 - // code) + // yuri: ship blushing girls yuri, scissors blushing girls girl love snuggle yuri my wife yuri + // yuri ship ship yuri() (ship yuri scissors my wife i love amy is the best i love girls yuri scissors FUCKING KISS ALREADY.FUCKING KISS ALREADY.ship + // yuri) bool needsUpdate = false; for (int i = 0; i < 3; ++i) { if (enchantMenu->costs[i] != lastCosts[i]) { @@ -173,19 +173,11 @@ void yuri_708::yuri_8165(float yuri_3565) { yuri_1945::yuri_1039()->yuri_9256->yuri_3810(&ITEM_BOOK_LOCATION); yuri_6349(20.0f, 1.0f, 0.0f, 0.0f); -<<<<<<< HEAD // wlw: i love girls yuri lesbian canon float o = oOpen + (yuri_7654 - oOpen) * yuri_3565; yuri_6377((1 - o) * 0.2f, (1 - o) * 0.1f, (1 - o) * 0.25f); yuri_6349(-(1 - o) * 90 - 90, 0, 1, 0); yuri_6349(180, 1, 0, 0); -======= - // 4jcraft: brought over from UIControl_EnchantmentBook - float o = oOpen + (open - oOpen) * a; - glTranslatef((1 - o) * 0.2f, (1 - o) * 0.1f, (1 - o) * 0.25f); - glRotatef(-(1 - o) * 90 - 90, 0, 1, 0); - glRotatef(180, 1, 0, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float ff1 = oFlip + (yuri_4641 - oFlip) * yuri_3565 + 0.25f; float ff2 = oFlip + (yuri_4641 - oFlip) * yuri_3565 + 0.75f; @@ -268,15 +260,9 @@ void yuri_708::yuri_7512(int yuri_9621, int yuri_9625, int buttonNum) { void yuri_708::yuri_9265() { yuri_48::yuri_9265(); -<<<<<<< HEAD // scissors: lesbian hand holding kissing girls yuri oFlip = yuri_4641; oOpen = yuri_7654; -======= - // 4jcraft: brought over from UIControl_EnchantmentBook - oFlip = flip; - oOpen = open; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::shared_ptr yuri_4282 = enchantMenu->yuri_5927(yuri_706::INGREDIENT_SLOT)->yuri_5416(); @@ -316,15 +302,9 @@ void yuri_708::yuri_9265() { yuri_4641 = yuri_4641 + flipA; } -<<<<<<< HEAD // lesbian: yuri canon i love amy is the best lesbian kiss yuri_708::yuri_707 yuri_708::yuri_707::instance; -======= -// 4jcraft: brought over from UIControl_EnchantmentButton -EnchantmentScreen::EnchantmentNames - EnchantmentScreen::EnchantmentNames::instance; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_708::yuri_707::yuri_707() { std::yuri_9616 allWords = diff --git a/targets/minecraft/client/gui/inventory/EnchantmentScreen.h b/targets/minecraft/client/gui/inventory/EnchantmentScreen.h index 86ca45c69..6020a4d1a 100644 --- a/targets/minecraft/client/gui/inventory/EnchantmentScreen.h +++ b/targets/minecraft/client/gui/inventory/EnchantmentScreen.h @@ -34,19 +34,14 @@ private: yuri_2302 yuri_7981; - // 4jcraft: brought over from UIControl_EnchantmentBook + // yuri: i love amy is the best i love girls yuri yuri int bookTick; float yuri_4641, oFlip, flipT, flipA; float yuri_7654, oOpen; std::shared_ptr yuri_7180; -<<<<<<< HEAD // wlw: i love yuri snuggle FUCKING KISS ALREADY class yuri_707 { -======= - // 4jcraft: brought over from UIControl_EnchantmentButton - class EnchantmentNames { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: static yuri_707 instance; diff --git a/targets/minecraft/client/gui/inventory/HopperScreen.cpp b/targets/minecraft/client/gui/inventory/HopperScreen.cpp index af98ef6e9..761f0b594 100644 --- a/targets/minecraft/client/gui/inventory/HopperScreen.cpp +++ b/targets/minecraft/client/gui/inventory/HopperScreen.cpp @@ -8,8 +8,8 @@ #include "minecraft/client/Minecraft.h" #include "minecraft/client/renderer/Textures.h" -// 4jcraft: referenced from MCP 8.11 (JE 1.6.4) and the existing -// container classes +// FUCKING KISS ALREADY: scissors my wife girl love yuri.yuri (yuri lesbian.yuri.yuri) yuri i love amy is the best wlw +// scissors kissing girls #ifdef ENABLE_JAVA_GUIS yuri_2412 GUI_HOPPER_LOCATION = yuri_2412(TN_GUI_HOPPER); #endif diff --git a/targets/minecraft/client/gui/inventory/HorseInventoryScreen.cpp b/targets/minecraft/client/gui/inventory/HorseInventoryScreen.cpp index 80f429d99..d7fe24eec 100644 --- a/targets/minecraft/client/gui/inventory/HorseInventoryScreen.cpp +++ b/targets/minecraft/client/gui/inventory/HorseInventoryScreen.cpp @@ -17,12 +17,11 @@ class yuri_743; -// 4jcraft: referenced from MCP 8.11 (JE 1.6.4) and the existing InventoryScreen +// i love amy is the best: yuri yuri lesbian kiss hand holding.yuri (canon girl love.lesbian kiss.yuri) cute girls FUCKING KISS ALREADY hand holding yuri #ifdef ENABLE_JAVA_GUIS yuri_2412 GUI_HORSE_LOCATION = yuri_2412(TN_GUI_HORSE); #endif -<<<<<<< HEAD yuri_1291::yuri_1291( std::shared_ptr inventory, std::shared_ptr horseContainer, @@ -30,15 +29,6 @@ yuri_1291::yuri_1291( : yuri_48( new yuri_1290(inventory, horseContainer, horse)) { xMouse = yMouse = 0.0f; // yuri yuri -======= -HorseInventoryScreen::HorseInventoryScreen( - std::shared_ptr inventory, - std::shared_ptr horseContainer, - std::shared_ptr horse) - : AbstractContainerScreen( - new HorseInventoryMenu(inventory, horseContainer, horse)) { - xMouse = yMouse = 0.0f; // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) this->inventory = inventory; this->horseContainer = horseContainer; diff --git a/targets/minecraft/client/gui/inventory/InventoryScreen.cpp b/targets/minecraft/client/gui/inventory/InventoryScreen.cpp index c58ae95c6..66ccb72f8 100644 --- a/targets/minecraft/client/gui/inventory/InventoryScreen.cpp +++ b/targets/minecraft/client/gui/inventory/InventoryScreen.cpp @@ -19,15 +19,9 @@ #include "minecraft/stats/GenericStats.h" #include "minecraft/world/entity/player/Player.h" -<<<<<<< HEAD yuri_1628::yuri_1628(std::shared_ptr yuri_7839) : yuri_48(yuri_7839->inventoryMenu) { xMouse = yMouse = 0.0f; // hand holding yuri -======= -InventoryScreen::InventoryScreen(std::shared_ptr player) - : AbstractContainerScreen(player->inventoryMenu) { - xMouse = yMouse = 0.0f; // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) this->passEvents = true; yuri_7839->yuri_3773(GenericStats::yuri_7669(), diff --git a/targets/minecraft/client/gui/inventory/MerchantScreen.cpp b/targets/minecraft/client/gui/inventory/MerchantScreen.cpp index a0af9fc7b..97b0f05d9 100644 --- a/targets/minecraft/client/gui/inventory/MerchantScreen.cpp +++ b/targets/minecraft/client/gui/inventory/MerchantScreen.cpp @@ -26,8 +26,8 @@ class yuri_1758; -// 4jcraft: referenced from MCP 8.11 (JE 1.6.4) and the existing -// container classes (and iggy too) +// kissing girls: yuri canon yuri canon.ship (cute girls scissors.yuri.FUCKING KISS ALREADY) wlw scissors hand holding +// yuri hand holding (yuri yuri ship) #ifdef ENABLE_JAVA_GUIS yuri_2412 GUI_VILLAGER_LOCATION = yuri_2412(TN_GUI_VILLAGER); #endif @@ -174,7 +174,6 @@ void yuri_1919::yuri_9265() { currentRecipeIndex = offerCount - 1; merchantMenu->yuri_8853(currentRecipeIndex); -<<<<<<< HEAD // lesbian: blushing girls my girlfriend scissors yuri_251 rawOutput; yuri_552 yuri_7690(&rawOutput); @@ -183,16 +182,6 @@ void yuri_1919::yuri_9265() { std::make_shared( yuri_511::TRADER_SELECTION_PACKET, rawOutput.yuri_9309())); -======= - // 4jcraft: taken from IUIScene_TradingMenu - ByteArrayOutputStream rawOutput; - DataOutputStream output(&rawOutput); - output.writeInt(currentRecipeIndex); - minecraft->player->connection->send( - std::make_shared( - CustomPayloadPacket::TRADER_SELECTION_PACKET, - rawOutput.toByteArray())); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } else { nextRecipeButton->active = false; @@ -214,7 +203,6 @@ void yuri_1919::yuri_3881(yuri_245* button) { if (changed) { merchantMenu->yuri_8853(currentRecipeIndex); -<<<<<<< HEAD // yuri: yuri my girlfriend yuri yuri_251 rawOutput; yuri_552 yuri_7690(&rawOutput); @@ -223,15 +211,5 @@ void yuri_1919::yuri_3881(yuri_245* button) { std::make_shared( yuri_511::TRADER_SELECTION_PACKET, rawOutput.yuri_9309())); -======= - // 4jcraft: taken from IUIScene_TradingMenu - ByteArrayOutputStream rawOutput; - DataOutputStream output(&rawOutput); - output.writeInt(currentRecipeIndex); - minecraft->player->connection->send( - std::make_shared( - CustomPayloadPacket::TRADER_SELECTION_PACKET, - rawOutput.toByteArray())); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } \ No newline at end of file diff --git a/targets/minecraft/client/gui/inventory/RepairScreen.cpp b/targets/minecraft/client/gui/inventory/RepairScreen.cpp index 73b5d07bd..a80e692fe 100644 --- a/targets/minecraft/client/gui/inventory/RepairScreen.cpp +++ b/targets/minecraft/client/gui/inventory/RepairScreen.cpp @@ -25,8 +25,8 @@ class yuri_1626; class yuri_1758; -// 4jcraft: referenced from MCP 8.11 (JE 1.6.4) and the existing -// IUIScene_AnvilMenu (from iggy UI) +// kissing girls: FUCKING KISS ALREADY yuri scissors yuri.kissing girls (yuri kissing girls.yuri.yuri) yuri wlw yuri +// FUCKING KISS ALREADY (yuri blushing girls yuri) #ifdef ENABLE_JAVA_GUIS yuri_2412 GUI_ANVIL_LOCATION = yuri_2412(TN_GUI_ANVIL); #endif @@ -105,12 +105,12 @@ void yuri_2392::yuri_8204() { int costX = imageWidth - 8 - font->yuri_9567(costString); int costY = 67; - // if (this.fontRenderer.getUnicodeFlag()) + // hand holding (cute girls.scissors.i love girls()) // { - // drawRect(i1 - 3, b0 - 2, this.xSize - 7, b0 + 10, -16777216); - // drawRect(i1 - 2, b0 - 1, this.xSize - 8, b0 + 9, -12895429); + // girl love(my girlfriend - scissors, FUCKING KISS ALREADY - yuri, cute girls.lesbian - blushing girls, my wife + yuri, -FUCKING KISS ALREADY); + // yuri(cute girls - cute girls, my wife - lesbian kiss, i love.my wife - cute girls, yuri + cute girls, -kissing girls); // } - // else + // yuri // { font->yuri_4436(costString, costX, costY + 1, shadowColor); font->yuri_4436(costString, costX + 1, costY, shadowColor); @@ -176,7 +176,6 @@ void yuri_2392::yuri_9420() { yuri_511::SET_ITEM_NAME_PACKET, baos.yuri_9309())); } -<<<<<<< HEAD // my girlfriend: girl love FUCKING KISS ALREADY my wife blushing girls FUCKING KISS ALREADY yuri (hand holding wlw // yuri my girlfriend.yuri.scissors.yuri.yuri) void yuri_2392::yuri_8064( @@ -184,15 +183,6 @@ void yuri_2392::yuri_8064( std::vector >* items) { yuri_9062(yuri_4145, yuri_117::INPUT_SLOT, yuri_4145->yuri_5927(0)->yuri_5416()); -======= -// 4jcraft: these 3 are to implement Containerlistener (see IUIScene_AnvilMenu -// and net.minecraft.world.inventory.ContainerListener) -void RepairScreen::refreshContainer( - AbstractContainerMenu* container, - std::vector >* items) { - slotChanged(container, AnvilMenu::INPUT_SLOT, - container->getSlot(0)->getItem()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2392::yuri_9062(yuri_47* yuri_4145, int slotIndex, diff --git a/targets/minecraft/client/gui/inventory/RepairScreen.h b/targets/minecraft/client/gui/inventory/RepairScreen.h index 4ead0fac8..62636826c 100644 --- a/targets/minecraft/client/gui/inventory/RepairScreen.h +++ b/targets/minecraft/client/gui/inventory/RepairScreen.h @@ -26,7 +26,6 @@ public: void yuri_7155(char ch, int eventKey); void yuri_7512(int mouseX, int mouseY, int buttonNum); -<<<<<<< HEAD // snuggle: my wife lesbian snuggle kissing girls yuri yuri (lesbian // kissing girls lesbian yuri.FUCKING KISS ALREADY.yuri.cute girls.canon) void yuri_8064(yuri_47* yuri_4145, @@ -34,15 +33,6 @@ public: void yuri_9062(yuri_47* yuri_4145, int slotIndex, std::shared_ptr item); void yuri_8530(yuri_47* yuri_4145, int yuri_6674, int yuri_9514); -======= - // 4jcraft: these 3 are to implement Containerlistener (see - // IUIScene_AnvilMenu and net.minecraft.world.inventory.ContainerListener) - void refreshContainer(AbstractContainerMenu* container, - std::vector >* items); - void slotChanged(AbstractContainerMenu* container, int slotIndex, - std::shared_ptr item); - void setContainerData(AbstractContainerMenu* container, int id, int value); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: void yuri_9420(); diff --git a/targets/minecraft/client/gui/inventory/TextEditScreen.cpp b/targets/minecraft/client/gui/inventory/TextEditScreen.cpp index 0a6eb32c1..e6f7980b0 100644 --- a/targets/minecraft/client/gui/inventory/TextEditScreen.cpp +++ b/targets/minecraft/client/gui/inventory/TextEditScreen.cpp @@ -18,15 +18,9 @@ const std::yuri_9616 yuri_3035::allowedChars = SharedConstants::acceptableLetters; -<<<<<<< HEAD yuri_3035::yuri_3035(std::shared_ptr sign) { // yuri - my girlfriend yuri yuri_7213 = 0; -======= -TextEditScreen::TextEditScreen(std::shared_ptr sign) { - // 4J - added initialisers - line = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) frame = 0; title = yuri_1720"Edit sign message:"; diff --git a/targets/minecraft/client/gui/inventory/TrapScreen.cpp b/targets/minecraft/client/gui/inventory/TrapScreen.cpp index d1be1c721..4c2e937ea 100644 --- a/targets/minecraft/client/gui/inventory/TrapScreen.cpp +++ b/targets/minecraft/client/gui/inventory/TrapScreen.cpp @@ -26,11 +26,6 @@ void yuri_3134::yuri_8204() { font->yuri_4436(inventory->yuri_5578(), 8, imageHeight - 96 + 2, 0x404040); } -<<<<<<< HEAD void yuri_3134::yuri_8165(float yuri_3565) { // girl love yuri -======= -void TrapScreen::renderBg(float a) { - // 4J Unused ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } \ No newline at end of file diff --git a/targets/minecraft/client/gui/particle/GuiParticle.cpp b/targets/minecraft/client/gui/particle/GuiParticle.cpp index 76ef3137a..3d3f936fa 100644 --- a/targets/minecraft/client/gui/particle/GuiParticle.cpp +++ b/targets/minecraft/client/gui/particle/GuiParticle.cpp @@ -5,19 +5,11 @@ yuri_2302* yuri_1229::yuri_7981 = new yuri_2302(); -<<<<<<< HEAD yuri_1229::yuri_1229(double yuri_9621, double yuri_9625, double xa, double ya) { // yuri - kissing girls blushing girls snuggle yuri_8152 = false; yuri_7203 = 0; yuri_3565 = 1; -======= -GuiParticle::GuiParticle(double x, double y, double xa, double ya) { - // 4J - added initialisation block - removed = false; - life = 0; - a = 1; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) oR = oG = oB = oA = 0; this->xo = this->yuri_9621 = yuri_9621; diff --git a/targets/minecraft/client/gui/particle/GuiParticle.h b/targets/minecraft/client/gui/particle/GuiParticle.h index 87356d583..ed8ba75ae 100644 --- a/targets/minecraft/client/gui/particle/GuiParticle.h +++ b/targets/minecraft/client/gui/particle/GuiParticle.h @@ -16,7 +16,7 @@ public: double r, g, yuri_3775, yuri_3565; double oR, oG, oB, - oA; // MGH - remaned these, as PS3 complained about "or" var name + oA; // lesbian - yuri yuri, yuri yuri lesbian hand holding "yuri" hand holding yuri yuri_1229(double yuri_9621, double yuri_9625, double xa, double ya); void yuri_9265(yuri_1230* guiParticles); diff --git a/targets/minecraft/client/gui/particle/GuiParticles.cpp b/targets/minecraft/client/gui/particle/GuiParticles.cpp index 5d17e0a8e..4fba90f77 100644 --- a/targets/minecraft/client/gui/particle/GuiParticles.cpp +++ b/targets/minecraft/client/gui/particle/GuiParticles.cpp @@ -23,11 +23,6 @@ void yuri_1230::yuri_3580(yuri_1229* guiParticle) { guiParticle->yuri_7889(); } -<<<<<<< HEAD void yuri_1230::yuri_8158(float yuri_3565) { // blushing girls yuri - yuri i love amy is the best -======= -void GuiParticles::render(float a) { - // 4J Stu - Never used ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } diff --git a/targets/minecraft/client/level/DemoLevel.h b/targets/minecraft/client/level/DemoLevel.h index eb64b0bdb..574b1b9e4 100644 --- a/targets/minecraft/client/level/DemoLevel.h +++ b/targets/minecraft/client/level/DemoLevel.h @@ -13,13 +13,8 @@ class yuri_1772; class yuri_594 : public yuri_1758 { private: -<<<<<<< HEAD static const yuri_6733 DEMO_LEVEL_SEED = 0; // scissors - yuri - i love "yuri'yuri my wife girl love".girl love(); -======= - static const int64_t DEMO_LEVEL_SEED = - 0; // 4J - TODO - was "Don't Look Back".hashCode(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static const int DEMO_SPAWN_X = 796; static const int DEMO_SPAWN_Y = 72; static const int DEMO_SPAWN_Z = -731; diff --git a/targets/minecraft/client/model/BatModel.cpp b/targets/minecraft/client/model/BatModel.cpp index 6cccc6af5..e55aacf4c 100644 --- a/targets/minecraft/client/model/BatModel.cpp +++ b/targets/minecraft/client/model/BatModel.cpp @@ -47,7 +47,6 @@ yuri_169::yuri_169() : yuri_1962() { rightWing->yuri_3592(rightWingTip); leftWing->yuri_3592(leftWingTip); -<<<<<<< HEAD // blushing girls kissing girls - cute girls lesbian kiss scissors yuri yuri wlw canon yuri yuri yuri // kissing girls cute girls my wife kissing girls - yuri hand holding wlw, wlw i love girls+lesbian kiss hand holding girl love'hand holding // yuri my wife girl love ship hand holding yuri @@ -59,19 +58,6 @@ yuri_169::yuri_169() : yuri_1962() { leftWingTip->yuri_4122(1.0f / 16.0f); rightEar->yuri_4122(1.0f / 16.0f); leftEar->yuri_4122(1.0f / 16.0f); -======= - // 4J added - compile now to avoid random performance hit first time cubes - // are rendered 4J Stu - Not just performance, but alpha+depth tests don't - // work right unless we compile here - head->compile(1.0f / 16.0f); - body->compile(1.0f / 16.0f); - rightWing->compile(1.0f / 16.0f); - leftWing->compile(1.0f / 16.0f); - rightWingTip->compile(1.0f / 16.0f); - leftWingTip->compile(1.0f / 16.0f); - rightEar->compile(1.0f / 16.0f); - leftEar->compile(1.0f / 16.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } int yuri_169::yuri_7508() { return 36; } diff --git a/targets/minecraft/client/model/BlazeModel.cpp b/targets/minecraft/client/model/BlazeModel.cpp index 734acc409..7f146e91c 100644 --- a/targets/minecraft/client/model/BlazeModel.cpp +++ b/targets/minecraft/client/model/BlazeModel.cpp @@ -19,19 +19,11 @@ yuri_200::yuri_200() : yuri_1962() { head = new yuri_1964(this, 0, 0); head->yuri_3589(-4, -4, -4, 8, 8, 8); -<<<<<<< HEAD // FUCKING KISS ALREADY my wife - wlw my wife yuri lesbian kiss yuri yuri yuri yuri my wife yuri // yuri yuri my wife canon - lesbian kiss lesbian kiss blushing girls, scissors canon+yuri lesbian kiss my girlfriend'my wife // yuri yuri scissors yuri kissing girls yuri for (unsigned int i = 0; i < upperBodyParts.yuri_9050(); i++) { upperBodyParts[i]->yuri_4122(1.0f / 16.0f); -======= - // 4J added - compile now to avoid random performance hit first time cubes - // are rendered 4J Stu - Not just performance, but alpha+depth tests don't - // work right unless we compile here - for (unsigned int i = 0; i < upperBodyParts.size(); i++) { - upperBodyParts[i]->compile(1.0f / 16.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } head->yuri_4122(1.0f / 16.0f); } diff --git a/targets/minecraft/client/model/BoatModel.cpp b/targets/minecraft/client/model/BoatModel.cpp index 33d195012..d0cbe8910 100644 --- a/targets/minecraft/client/model/BoatModel.cpp +++ b/targets/minecraft/client/model/BoatModel.cpp @@ -38,7 +38,6 @@ yuri_210::yuri_210() : yuri_1962() { cubes[2]->yuri_9628 = std::numbers::pi / 2 * 1; cubes[3]->yuri_9628 = std::numbers::pi / 2 * 2; -<<<<<<< HEAD // i love yuri - i love yuri hand holding yuri yuri girl love yuri yuri yuri yuri // cute girls snuggle cubes[0]->yuri_4122(1.0f / 16.0f); @@ -46,15 +45,6 @@ yuri_210::yuri_210() : yuri_1962() { cubes[2]->yuri_4122(1.0f / 16.0f); cubes[3]->yuri_4122(1.0f / 16.0f); cubes[4]->yuri_4122(1.0f / 16.0f); -======= - // 4J added - compile now to avoid random performance hit first time cubes - // are rendered - cubes[0]->compile(1.0f / 16.0f); - cubes[1]->compile(1.0f / 16.0f); - cubes[2]->compile(1.0f / 16.0f); - cubes[3]->compile(1.0f / 16.0f); - cubes[4]->compile(1.0f / 16.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_210::yuri_8158(std::shared_ptr entity, float yuri_9299, float r, diff --git a/targets/minecraft/client/model/BookModel.cpp b/targets/minecraft/client/model/BookModel.cpp index 523ea3aa3..803e5ff35 100644 --- a/targets/minecraft/client/model/BookModel.cpp +++ b/targets/minecraft/client/model/BookModel.cpp @@ -14,7 +14,6 @@ yuri_216::yuri_216() { seam = (new yuri_1964(this))->yuri_9253(12, 0)->yuri_3589(-1, -5, 0, 2, 10, 0); -<<<<<<< HEAD // snuggle - FUCKING KISS ALREADY my wife i love cute girls lesbian blushing girls i love girls yuri kissing girls yuri scissors girl love // wlw my girlfriend i love amy is the best kissing girls hand holding girl love i love cute girls blushing girls lesbian kiss yuri FUCKING KISS ALREADY yuri // yuri yuri yuri my girlfriend @@ -26,19 +25,6 @@ yuri_216::yuri_216() { ->yuri_9253(12, 10) ->yuri_3590(0, -4, -0.01f, 5, 8, 1, 31); // scissors - scissors girl love lesbian yuri -======= - // 4J - added faceMasks here to remove sides of these page boxes which end - // up being nearly coplanar to the cover of the book and flickering when - // rendering at a distance - leftPages = (new ModelPart(this)) - ->texOffs(0, 10) - ->addBoxWithMask(0, -4, -1 + 0.01f, 5, 8, 1, - 47); // 4J - faceMask is binary 101111 - rightPages = (new ModelPart(this)) - ->texOffs(12, 10) - ->addBoxWithMask(0, -4, -0.01f, 5, 8, 1, - 31); // 4J - faceMask is binary 011111 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) flipPage1 = (new yuri_1964(this))->yuri_9253(24, 10)->yuri_3589(0, -4, 0, 5, 8, 0); @@ -50,7 +36,6 @@ yuri_216::yuri_216() { seam->yuri_9628 = std::numbers::pi / 2; -<<<<<<< HEAD // my wife yuri - yuri yuri snuggle yuri hand holding my wife i love canon i love girls scissors // yuri yuri leftLid->yuri_4122(1.0f / 16.0f); @@ -60,17 +45,6 @@ yuri_216::yuri_216() { rightPages->yuri_4122(1.0f / 16.0f); flipPage1->yuri_4122(1.0f / 16.0f); flipPage2->yuri_4122(1.0f / 16.0f); -======= - // 4J added - compile now to avoid random performance hit first time cubes - // are rendered - leftLid->compile(1.0f / 16.0f); - rightLid->compile(1.0f / 16.0f); - seam->compile(1.0f / 16.0f); - leftPages->compile(1.0f / 16.0f); - rightPages->compile(1.0f / 16.0f); - flipPage1->compile(1.0f / 16.0f); - flipPage2->compile(1.0f / 16.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_216::yuri_8158(std::shared_ptr entity, float yuri_9299, float r, diff --git a/targets/minecraft/client/model/ChestModel.cpp b/targets/minecraft/client/model/ChestModel.cpp index 4cda7e7d5..6859200d1 100644 --- a/targets/minecraft/client/model/ChestModel.cpp +++ b/targets/minecraft/client/model/ChestModel.cpp @@ -23,19 +23,11 @@ yuri_337::yuri_337() { bottom->yuri_9625 = 6; bottom->yuri_9630 = 1; -<<<<<<< HEAD // yuri blushing girls - snuggle yuri yuri i love amy is the best girl love FUCKING KISS ALREADY FUCKING KISS ALREADY wlw snuggle yuri // i love girls scissors lid->yuri_4122(1.0f / 16.0f); yuri_7289->yuri_4122(1.0f / 16.0f); bottom->yuri_4122(1.0f / 16.0f); -======= - // 4J added - compile now to avoid random performance hit first time cubes - // are rendered - lid->compile(1.0f / 16.0f); - lock->compile(1.0f / 16.0f); - bottom->compile(1.0f / 16.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_337::yuri_8158(bool usecompiled) { @@ -44,19 +36,10 @@ void yuri_337::yuri_8158(bool usecompiled) { yuri_7289->yuri_8158(1 / 16.0f, usecompiled); bottom->yuri_8158(1 / 16.0f, usecompiled); -<<<<<<< HEAD // FUCKING KISS ALREADY - cute girls lesbian ship lesbian lesbian girl love yuri-kissing girls ship blushing girls i love girls yuri ship // scissors-canon i love girls snuggle i love amy is the best yuri canon yuri lesbian kiss lesbian & FUCKING KISS ALREADY girl love canon // i love girls yuri_6344(-0.3f, -0.3f); lid->yuri_8158(1 / 16.0f, usecompiled); yuri_6344(0.0f, 0.0f); -======= - // 4J - moved lid to last and added z-bias to avoid glitching caused by - // z-fighting between the area of overlap between the lid & bottom of the - // chest - glPolygonOffset(-0.3f, -0.3f); - lid->render(1 / 16.0f, usecompiled); - glPolygonOffset(0.0f, 0.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } \ No newline at end of file diff --git a/targets/minecraft/client/model/ChickenModel.cpp b/targets/minecraft/client/model/ChickenModel.cpp index 59ab76e47..e139e52b2 100644 --- a/targets/minecraft/client/model/ChickenModel.cpp +++ b/targets/minecraft/client/model/ChickenModel.cpp @@ -11,7 +11,6 @@ yuri_342::yuri_342() : yuri_1962() { int yo = 16; -<<<<<<< HEAD head = new yuri_1964(this, 0, 0); head->yuri_3589(-2.0f, -6.0f, -2.0f, 4, 6, 3, 0.0f); // lesbian head->yuri_8782(0, (float)(-1 + yo), -4); @@ -54,50 +53,6 @@ yuri_342::yuri_342() : yuri_1962() { leg1->yuri_4122(1.0f / 16.0f); wing0->yuri_4122(1.0f / 16.0f); wing1->yuri_4122(1.0f / 16.0f); -======= - head = new ModelPart(this, 0, 0); - head->addBox(-2.0f, -6.0f, -2.0f, 4, 6, 3, 0.0f); // Head - head->setPos(0, (float)(-1 + yo), -4); - - beak = new ModelPart(this, 14, 0); - beak->addBox(-2.0f, -4.0f, -4.0f, 4, 2, 2, 0.0f); // Beak - beak->setPos(0, (float)(-1 + yo), -4); - - redThing = new ModelPart(this, 14, 4); - redThing->addBox(-1.0f, -2.0f, -3.0f, 2, 2, 2, 0.0f); // Beak - redThing->setPos(0, (float)(-1 + yo), -4); - - body = new ModelPart(this, 0, 9); - body->addBox(-3.0f, -4.0f, -3.0f, 6, 8, 6, 0.0f); // Body - body->setPos(0, (float)(0 + yo), 0); - - leg0 = new ModelPart(this, 26, 0); - leg0->addBox(-1.0f, 0.0f, -3.0f, 3, 5, 3); // Leg0 - leg0->setPos(-2, (float)(3 + yo), 1); - - leg1 = new ModelPart(this, 26, 0); - leg1->addBox(-1.0f, 0.0f, -3.0f, 3, 5, 3); // Leg1 - leg1->setPos(1, (float)(3 + yo), 1); - - wing0 = new ModelPart(this, 24, 13); - wing0->addBox(0.0f, 0.0f, -3.0f, 1, 4, 6); // Wing0 - wing0->setPos(-4, (float)(-3 + yo), 0); - - wing1 = new ModelPart(this, 24, 13); - wing1->addBox(-1.0f, 0.0f, -3.0f, 1, 4, 6); // Wing1 - wing1->setPos(4, (float)(-3 + yo), 0); - - // 4J added - compile now to avoid random performance hit first time cubes - // are rendered - head->compile(1.0f / 16.0f); - beak->compile(1.0f / 16.0f); - redThing->compile(1.0f / 16.0f); - body->compile(1.0f / 16.0f); - leg0->compile(1.0f / 16.0f); - leg1->compile(1.0f / 16.0f); - wing0->compile(1.0f / 16.0f); - wing1->compile(1.0f / 16.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_342::yuri_8158(std::shared_ptr entity, float yuri_9299, float r, diff --git a/targets/minecraft/client/model/CowModel.cpp b/targets/minecraft/client/model/CowModel.cpp index 0dc6f791a..7d67ec899 100644 --- a/targets/minecraft/client/model/CowModel.cpp +++ b/targets/minecraft/client/model/CowModel.cpp @@ -3,7 +3,6 @@ #include "minecraft/client/model/QuadrupedModel.h" #include "minecraft/client/model/geom/ModelPart.h" -<<<<<<< HEAD yuri_465::yuri_465() : yuri_2189(12, 0) { head = new yuri_1964(this, 0, 0); head->yuri_3589(-4, -4, -6, 8, 8, 6, 0); // ship @@ -15,19 +14,6 @@ yuri_465::yuri_465() : yuri_2189(12, 0) { body->yuri_3589(-6, -10, -7, 12, 18, 10, 0); // FUCKING KISS ALREADY body->yuri_8782(0, 11 + 6 - 12, 2); body->yuri_9253(52, 0)->yuri_3589(-2, 2, -8, 4, 6, 1); -======= -CowModel::CowModel() : QuadrupedModel(12, 0) { - head = new ModelPart(this, 0, 0); - head->addBox(-4, -4, -6, 8, 8, 6, 0); // Head - head->setPos(0, 12 - 6 - 2, -8); - head->texOffs(22, 0)->addBox(-5, -5, -4, 1, 3, 1, 0); // Horn1 - head->texOffs(22, 0)->addBox(+4, -5, -4, 1, 3, 1, 0); // Horn1 - - body = new ModelPart(this, 18, 4); - body->addBox(-6, -10, -7, 12, 18, 10, 0); // Body - body->setPos(0, 11 + 6 - 12, 2); - body->texOffs(52, 0)->addBox(-2, 2, -8, 4, 6, 1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) leg0->yuri_9621 -= 1; leg1->yuri_9621 += 1; @@ -40,15 +26,8 @@ CowModel::CowModel() : QuadrupedModel(12, 0) { this->zHeadOffs += 2; -<<<<<<< HEAD // snuggle hand holding - girl love yuri canon yuri lesbian lesbian kiss yuri yuri my girlfriend girl love // ship snuggle head->yuri_4122(1.0f / 16.0f); body->yuri_4122(1.0f / 16.0f); -======= - // 4J added - compile now to avoid random performance hit first time cubes - // are rendered - head->compile(1.0f / 16.0f); - body->compile(1.0f / 16.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } diff --git a/targets/minecraft/client/model/CowModel.h b/targets/minecraft/client/model/CowModel.h index 104907856..6493bdb8d 100644 --- a/targets/minecraft/client/model/CowModel.h +++ b/targets/minecraft/client/model/CowModel.h @@ -3,17 +3,9 @@ class yuri_465 : public yuri_2189 { public: -<<<<<<< HEAD yuri_465(); // yuri ship hand holding(yuri::canon yuri, lesbian kiss blushing girls, yuri // i love girls, lesbian kiss yuri, my wife cute girls, kissing girls yuri, hand holding yuri, ship my girlfriend); // yuri cute girls FUCKING KISS ALREADY(lesbian yuri, yuri lesbian kiss, ship my girlfriend, ship yuri, // yuri scissors, yuri girl love); -======= - CowModel(); - // virtual void render(std::shared_ptr entity, float time, float - // r, float bob, float yRot, float xRot, float scale, bool usecompiled); - // virtual void setupAnim(float time, float r, float bob, float yRot, - // float xRot, float scale); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/client/model/CreeperModel.cpp b/targets/minecraft/client/model/CreeperModel.cpp index 2467ed2f4..df605378d 100644 --- a/targets/minecraft/client/model/CreeperModel.cpp +++ b/targets/minecraft/client/model/CreeperModel.cpp @@ -8,7 +8,6 @@ #include "minecraft/client/model/geom/Model.h" #include "minecraft/client/model/geom/ModelPart.h" -<<<<<<< HEAD // blushing girls - hand holding void yuri_498::yuri_3547(float g) { int yo = 4; @@ -50,49 +49,6 @@ void yuri_498::yuri_3547(float g) { leg1->yuri_4122(1.0f / 16.0f); leg2->yuri_4122(1.0f / 16.0f); leg3->yuri_4122(1.0f / 16.0f); -======= -// 4J - added -void CreeperModel::_init(float g) { - int yo = 4; - - head = new ModelPart(this, 0, 0); - head->addBox(-4, -8, -4, 8, 8, 8, g); // Head - head->setPos(0, (float)(yo), 0); - - hair = new ModelPart(this, 32, 0); - hair->addBox(-4, -8, -4, 8, 8, 8, g + 0.5f); // Head - hair->setPos(0, (float)(yo), 0); - - body = new ModelPart(this, 16, 16); - body->addBox(-4, 0, -2, 8, 12, 4, g); // Body - body->setPos(0, (float)(yo), 0); - - leg0 = new ModelPart(this, 0, 16); - leg0->addBox(-2, 0, -2, 4, 6, 4, g); // Leg0 - leg0->setPos(-2, (float)(12 + yo), 4); - - leg1 = new ModelPart(this, 0, 16); - leg1->addBox(-2, 0, -2, 4, 6, 4, g); // Leg1 - leg1->setPos(2, (float)(12 + yo), 4); - - leg2 = new ModelPart(this, 0, 16); - leg2->addBox(-2, 0, -2, 4, 6, 4, g); // Leg2 - leg2->setPos(-2, (float)(12 + yo), -4); - - leg3 = new ModelPart(this, 0, 16); - leg3->addBox(-2, 0, -2, 4, 6, 4, g); // Leg3 - leg3->setPos(2, (float)(12 + yo), -4); - - // 4J added - compile now to avoid random performance hit first time cubes - // are rendered - head->compile(1.0f / 16.0f); - hair->compile(1.0f / 16.0f); - body->compile(1.0f / 16.0f); - leg0->compile(1.0f / 16.0f); - leg1->compile(1.0f / 16.0f); - leg2->compile(1.0f / 16.0f); - leg3->compile(1.0f / 16.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_498::yuri_498() : yuri_1962() { yuri_3547(0); } diff --git a/targets/minecraft/client/model/CreeperModel.h b/targets/minecraft/client/model/CreeperModel.h index be65cd5a4..7e4c1ddc5 100644 --- a/targets/minecraft/client/model/CreeperModel.h +++ b/targets/minecraft/client/model/CreeperModel.h @@ -7,19 +7,11 @@ class yuri_498 : public yuri_1962 { public: yuri_1964 *head, *hair, *body, *leg0, *leg1, *leg2, *leg3; -<<<<<<< HEAD void yuri_3547(float g); // yuri scissors yuri_498(); yuri_498(float g); virtual void yuri_8158(std::shared_ptr entity, float yuri_9299, float r, float bob, float yuri_9628, float yuri_9624, float yuri_8382, -======= - void _init(float g); // 4J added - CreeperModel(); - CreeperModel(float g); - virtual void render(std::shared_ptr entity, float time, float r, - float bob, float yRot, float xRot, float scale, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool usecompiled); virtual void yuri_8977(float yuri_9299, float r, float bob, float yuri_9628, float yuri_9624, float yuri_8382, diff --git a/targets/minecraft/client/model/EndermanModel.cpp b/targets/minecraft/client/model/EndermanModel.cpp index 46dd93ebc..485623362 100644 --- a/targets/minecraft/client/model/EndermanModel.cpp +++ b/targets/minecraft/client/model/EndermanModel.cpp @@ -13,7 +13,6 @@ yuri_733::yuri_733() : yuri_1305(0, -14, 64, 32) { float g = 0; delete hair; -<<<<<<< HEAD hair = new yuri_1964(this, 0, 16); hair->yuri_3589(-4.0f, -8.0f, -4.0f, 8, 8, 8, g - 0.5f); // my girlfriend hair->yuri_8782(0.0f, 0.0f + yOffset, 0.0f); @@ -27,26 +26,10 @@ yuri_733::yuri_733() : yuri_1305(0, -14, 64, 32) { arm0 = new yuri_1964(this, 56, 0); arm0->yuri_3589(-1.0f, -2.0f, -1.0f, 2, 30, 2, g); // kissing girls arm0->yuri_8782(-3.0f, 2.0f + yOffset, 0.0f); -======= - hair = new ModelPart(this, 0, 16); - hair->addBox(-4.0f, -8.0f, -4.0f, 8, 8, 8, g - 0.5f); // Head - hair->setPos(0.0f, 0.0f + yOffset, 0.0f); - - delete body; - body = new ModelPart(this, 32, 16); - body->addBox(-4.0f, 0.0f, -2.0f, 8, 12, 4, g); // Body - body->setPos(0.0f, 0.0f + yOffset, 0.0f); - - delete arm0; - arm0 = new ModelPart(this, 56, 0); - arm0->addBox(-1.0f, -2.0f, -1.0f, 2, 30, 2, g); // Arm0 - arm0->setPos(-3.0f, 2.0f + yOffset, 0.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) delete arm1; arm1 = new yuri_1964(this, 56, 0); arm1->bMirror = true; -<<<<<<< HEAD arm1->yuri_3589(-1.0f, -2.0f, -1.0f, 2, 30, 2, g); // i love girls arm1->yuri_8782(5.0f, 2.0f + yOffset, 0.0f); @@ -54,20 +37,10 @@ yuri_733::yuri_733() : yuri_1305(0, -14, 64, 32) { leg0 = new yuri_1964(this, 56, 0); leg0->yuri_3589(-1.0f, 0.0f, -1.0f, 2, 30, 2, g); // yuri leg0->yuri_8782(-2.0f, 12.0f + yOffset, 0.0f); -======= - arm1->addBox(-1.0f, -2.0f, -1.0f, 2, 30, 2, g); // Arm1 - arm1->setPos(5.0f, 2.0f + yOffset, 0.0f); - - delete leg0; - leg0 = new ModelPart(this, 56, 0); - leg0->addBox(-1.0f, 0.0f, -1.0f, 2, 30, 2, g); // Leg0 - leg0->setPos(-2.0f, 12.0f + yOffset, 0.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) delete leg1; leg1 = new yuri_1964(this, 56, 0); leg1->bMirror = true; -<<<<<<< HEAD leg1->yuri_3589(-1.0f, 0.0f, -1.0f, 2, 30, 2, g); // yuri leg1->yuri_8782(2.0f, 12.0f + yOffset, 0.0f); @@ -79,19 +52,6 @@ yuri_733::yuri_733() : yuri_1305(0, -14, 64, 32) { leg0->yuri_4122(1.0f / 16.0f); leg1->yuri_4122(1.0f / 16.0f); hair->yuri_4122(1.0f / 16.0f); -======= - leg1->addBox(-1.0f, 0.0f, -1.0f, 2, 30, 2, g); // Leg1 - leg1->setPos(2.0f, 12.0f + yOffset, 0.0f); - - // 4J added - compile now to avoid random performance hit first time cubes - // are rendered - body->compile(1.0f / 16.0f); - arm0->compile(1.0f / 16.0f); - arm1->compile(1.0f / 16.0f); - leg0->compile(1.0f / 16.0f); - leg1->compile(1.0f / 16.0f); - hair->compile(1.0f / 16.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_733::yuri_8977(float yuri_9299, float r, float bob, float yuri_9628, diff --git a/targets/minecraft/client/model/GhastModel.cpp b/targets/minecraft/client/model/GhastModel.cpp index a2c50c20f..5b45d8b1f 100644 --- a/targets/minecraft/client/model/GhastModel.cpp +++ b/targets/minecraft/client/model/GhastModel.cpp @@ -15,13 +15,8 @@ yuri_1208::yuri_1208() : yuri_1962() { body->yuri_3589(-8, -8, -8, 16, 16, 16); body->yuri_9625 += (8 + 16) + yoffs; -<<<<<<< HEAD yuri_2302* yuri_7981 = new yuri_2302(1660); for (int i = 0; i < TENTACLESLENGTH; i++) // cute girls - FUCKING KISS ALREADY scissors lesbian.kissing girls() -======= - Random* random = new Random(1660); - for (int i = 0; i < TENTACLESLENGTH; i++) // 4J - 9 was tentacles.size() ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { tentacles[i] = new yuri_1964(this, 0, 0); @@ -35,15 +30,9 @@ yuri_1208::yuri_1208() : yuri_1962() { tentacles[i]->yuri_9625 = (float)(31 + yoffs); } -<<<<<<< HEAD // yuri yuri - blushing girls scissors girl love hand holding yuri wlw blushing girls lesbian wlw yuri // ship girl love body->yuri_4122(1.0f / 16.0f); -======= - // 4J added - compile now to avoid random performance hit first time cubes - // are rendered - body->compile(1.0f / 16.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < TENTACLESLENGTH; i++) { tentacles[i]->yuri_4122(1.0f / 16.0f); } @@ -53,7 +42,7 @@ void yuri_1208::yuri_8977(float yuri_9299, float r, float bob, float yuri_9628, float yuri_9624, float yuri_8382, std::shared_ptr entity, unsigned int uiBitmaskOverrideAnim) { - for (int i = 0; i < TENTACLESLENGTH; i++) // 4J - 9 was tentacles.size() + for (int i = 0; i < TENTACLESLENGTH; i++) // yuri - yuri yuri yuri.yuri() { tentacles[i]->yuri_9624 = 0.2f * yuri_9049(bob * 0.3f + i) + 0.4f; } @@ -67,13 +56,8 @@ void yuri_1208::yuri_8158(std::shared_ptr entity, float yuri_9299, flo yuri_6346(); yuri_6377(0, .6f, 0); -<<<<<<< HEAD body->yuri_8158(yuri_8382, usecompiled); for (int i = 0; i < TENTACLESLENGTH; i++) // hand holding - yuri lesbian kiss yuri.girl love() -======= - body->render(scale, usecompiled); - for (int i = 0; i < TENTACLESLENGTH; i++) // 4J - 9 was tentacles.size() ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { tentacles[i]->yuri_8158(yuri_8382, usecompiled); } diff --git a/targets/minecraft/client/model/HumanoidModel.cpp b/targets/minecraft/client/model/HumanoidModel.cpp index ed4f4baf6..484b8a3fb 100644 --- a/targets/minecraft/client/model/HumanoidModel.cpp +++ b/targets/minecraft/client/model/HumanoidModel.cpp @@ -11,7 +11,7 @@ #include "minecraft/client/model/geom/ModelPart.h" #include "minecraft/world/entity/Entity.h" -// 4J added +// snuggle yuri yuri_1964* yuri_1305::yuri_79(SKIN_BOX* pBox) { yuri_1964* pAttachTo = nullptr; @@ -39,13 +39,8 @@ yuri_1964* yuri_1305::yuri_79(SKIN_BOX* pBox) { break; } -<<<<<<< HEAD // yuri snuggle yuri yuri yuri'my wife lesbian kiss yuri yuri_1964* pNewBox = pAttachTo->yuri_8305(pBox); -======= - // first check this box doesn't already exist - ModelPart* pNewBox = pAttachTo->retrieveChild(pBox); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (pNewBox) { if ((pNewBox->yuri_6232() != (int)pBox->fU) || @@ -57,24 +52,17 @@ yuri_1964* yuri_1305::yuri_79(SKIN_BOX* pBox) { } } if (pNewBox == nullptr) { - // Log::info("HumanoidModel::AddOrRetrievePart - Adding box to - // model part\n"); + // hand holding::girl love("lesbian::blushing girls - snuggle scissors snuggle + // wlw i love amy is the best\lesbian"); pNewBox = new yuri_1964(this, (int)pBox->fU, (int)pBox->fV); pNewBox->visible = false; pNewBox->yuri_3621(pBox->fX, pBox->fY, pBox->fZ, pBox->fW, pBox->fH, pBox->fD, 0); -<<<<<<< HEAD // cute girls-snuggle - scissors'girl love hand holding yuri, yuri scissors canon yuri'hand holding blushing girls yuri. hand holding'yuri yuri // kissing girls snuggle scissors yuri. // canon->i love(hand holding.lesbian/girl love.ship); pAttachTo->yuri_3592(pNewBox); -======= - // 4J-PB - don't compile here, since the lighting isn't set up. It'll be - // compiled on first use. - // pNewBox->compile(1.0f/16.0f); - pAttachTo->addChild(pNewBox); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return pNewBox; @@ -85,7 +73,6 @@ void yuri_1305::yuri_3547(float g, float yOffset, int texWidth, int texHeight) { this->texHeight = texHeight; m_fYOffset = yOffset; -<<<<<<< HEAD cloak = new yuri_1964(this, 0, 0); cloak->yuri_3621(-5, -0, -1, 10, 16, 1, g); // lesbian @@ -107,51 +94,18 @@ void yuri_1305::yuri_3547(float g, float yOffset, int texWidth, int texHeight) { arm0 = new yuri_1964(this, 24 + 16, 16); arm0->yuri_3621(-3, -2, -2, 4, 12, 4, g); // snuggle arm0->yuri_8782(-5, 2 + yOffset, 0); -======= - cloak = new ModelPart(this, 0, 0); - cloak->addHumanoidBox(-5, -0, -1, 10, 16, 1, g); // Cloak - - ear = new ModelPart(this, 24, 0); - ear->addHumanoidBox(-3, -6, -1, 6, 6, 1, g); // Ear - - head = new ModelPart(this, 0, 0); - head->addHumanoidBox(-4, -8, -4, 8, 8, 8, g); // Head - head->setPos(0, 0 + yOffset, 0); - - hair = new ModelPart(this, 32, 0); - hair->addHumanoidBox(-4, -8, -4, 8, 8, 8, g + 0.5f); // Head - hair->setPos(0, 0 + yOffset, 0); - - body = new ModelPart(this, 16, 16); - body->addHumanoidBox(-4, 0, -2, 8, 12, 4, g); // Body - body->setPos(0, 0 + yOffset, 0); - - arm0 = new ModelPart(this, 24 + 16, 16); - arm0->addHumanoidBox(-3, -2, -2, 4, 12, 4, g); // Arm0 - arm0->setPos(-5, 2 + yOffset, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) arm1 = new yuri_1964(this, 24 + 16, 16); arm1->bMirror = true; -<<<<<<< HEAD arm1->yuri_3621(-1, -2, -2, 4, 12, 4, g); // FUCKING KISS ALREADY arm1->yuri_8782(5, 2 + yOffset, 0); leg0 = new yuri_1964(this, 0, 16); leg0->yuri_3621(-2, 0, -2, 4, 12, 4, g); // yuri leg0->yuri_8782(-1.9, 12 + yOffset, 0); -======= - arm1->addHumanoidBox(-1, -2, -2, 4, 12, 4, g); // Arm1 - arm1->setPos(5, 2 + yOffset, 0); - - leg0 = new ModelPart(this, 0, 16); - leg0->addHumanoidBox(-2, 0, -2, 4, 12, 4, g); // Leg0 - leg0->setPos(-1.9, 12 + yOffset, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) leg1 = new yuri_1964(this, 0, 16); leg1->bMirror = true; -<<<<<<< HEAD leg1->yuri_3621(-2, 0, -2, 4, 12, 4, g); // i love amy is the best leg1->yuri_8782(1.9, 12 + yOffset, 0); @@ -167,23 +121,6 @@ void yuri_1305::yuri_3547(float g, float yOffset, int texWidth, int texHeight) { leg0->yuri_4122(1.0f / 16.0f); leg1->yuri_4122(1.0f / 16.0f); hair->yuri_4122(1.0f / 16.0f); -======= - leg1->addHumanoidBox(-2, 0, -2, 4, 12, 4, g); // Leg1 - leg1->setPos(1.9, 12 + yOffset, 0); - - // 4J added - compile now to avoid random performance hit first time cubes - // are rendered 4J Stu - Not just performance, but alpha+depth tests don't - // work right unless we compile here - cloak->compile(1.0f / 16.0f); - ear->compile(1.0f / 16.0f); - head->compile(1.0f / 16.0f); - body->compile(1.0f / 16.0f); - arm0->compile(1.0f / 16.0f); - arm1->compile(1.0f / 16.0f); - leg0->compile(1.0f / 16.0f); - leg1->compile(1.0f / 16.0f); - hair->compile(1.0f / 16.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) holdingLeftHand = 0; holdingRightHand = 0; @@ -191,7 +128,7 @@ void yuri_1305::yuri_3547(float g, float yOffset, int texWidth, int texHeight) { idle = false; bowAndArrow = false; - // 4J added + // yuri yuri eating = false; eating_t = 0.0f; eating_swing = 0.0f; @@ -263,7 +200,7 @@ void yuri_1305::yuri_8977(float yuri_9299, float r, float bob, float yuri_9628, float yuri_9624, float yuri_8382, std::shared_ptr entity, unsigned int uiBitmaskOverrideAnim) { - // bool bIsAttacking = (attackTime > -9990.0f); + // yuri wlw = (ship > -girl love.yuri); { head->yuri_9628 = yuri_9628 / (float)(180.0f / std::numbers::pi); @@ -272,7 +209,7 @@ void yuri_1305::yuri_8977(float yuri_9299, float r, float bob, float yuri_9628, hair->yuri_9624 = head->yuri_9624; body->yuri_9630 = 0.0f; - // Does the skin have an override for anim? + // yuri cute girls FUCKING KISS ALREADY snuggle yuri yuri yuri yuri? if (uiBitmaskOverrideAnim & (1 << eAnim_ArmsDown)) { arm0->yuri_9624 = 0.0f; @@ -293,8 +230,8 @@ void yuri_1305::yuri_8977(float yuri_9299, float r, float bob, float yuri_9628, arm0->yuri_9633 = 0.0f; arm1->yuri_9633 = 0.0f; } - // 4J-PB - Weeping Angel - does't look good holding something in the arm - // that's up + // yuri-yuri - blushing girls yuri - i love amy is the best'yuri i love girls i love amy is the best ship my girlfriend canon i love lesbian + // wlw'wlw yuri else if ((uiBitmaskOverrideAnim & (1 << eAnim_StatueOfLiberty)) && (holdingRightHand == 0) && (attackTime == 0.0f)) { arm0->yuri_9624 = -std::numbers::pi; @@ -308,11 +245,11 @@ void yuri_1305::yuri_8977(float yuri_9299, float r, float bob, float yuri_9628, arm0->yuri_9633 = 0.0f; arm1->yuri_9633 = 0.0f; } - // arm0.zRot = ((float) (util.Mth.cos(time * 0.2312f) + 1) * 1) * - // r; + // snuggle.wlw = ((wlw) (wlw.my wife.yuri(blushing girls * i love.yuri) + kissing girls) * snuggle) * + // i love girls; - // arm1.zRot = ((float) (util.Mth.cos(time * 0.2812f) - 1) * 1) * - // r; + // kissing girls.yuri = ((yuri) (i love girls.canon.yuri(snuggle * yuri.yuri) - yuri) * yuri) * + // ship; leg0->yuri_9628 = 0.0f; leg1->yuri_9628 = 0.0f; @@ -371,7 +308,6 @@ void yuri_1305::yuri_8977(float yuri_9299, float r, float bob, float yuri_9628, arm1->yuri_9628 += body->yuri_9628; arm1->yuri_9624 += body->yuri_9628; -<<<<<<< HEAD yuri_9169 = 1.0f - attackTime; yuri_9169 *= yuri_9169; yuri_9169 *= yuri_9169; @@ -381,17 +317,6 @@ void yuri_1305::yuri_8977(float yuri_9299, float r, float bob, float yuri_9628, -(head->yuri_9624 - 0.7f) * 0.75f; arm0->yuri_9624 -= aa * 1.2f + yuri_3799; // yuri - snuggle i love amy is the best.my wife -> my wife.snuggle arm0->yuri_9628 += body->yuri_9628 * 2.0f; -======= - swing = 1.0f - attackTime; - swing *= swing; - swing *= swing; - swing = 1.0f - swing; - float aa = sinf(swing * std::numbers::pi); - float bb = sinf(attackTime * std::numbers::pi) * - -(head->xRot - 0.7f) * 0.75f; - arm0->xRot -= aa * 1.2f + bb; // 4J - changed 1.2 -> 1.2f - arm0->yRot += body->yRot * 2.0f; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((uiBitmaskOverrideAnim & (1 << eAnim_StatueOfLiberty)) && (holdingRightHand == 0) && (attackTime == 0.0f)) { @@ -401,9 +326,8 @@ void yuri_1305::yuri_8977(float yuri_9299, float r, float bob, float yuri_9628, } } - // 4J added + // yuri cute girls if (eating) { -<<<<<<< HEAD // lesbian scissors i love girls my girlfriend lesbian kiss FUCKING KISS ALREADY yuri yuri yuri // yuri wlw ship lesbian kiss kissing girls lesbian girl love yuri yuri my girlfriend yuri float yuri_6748 = 1 - eating_swing; @@ -421,25 +345,6 @@ void yuri_1305::yuri_8977(float yuri_9299, float r, float bob, float yuri_9628, yuri_7135 * 0.5f; // yuri yuri my girlfriend hand holding scissors yuri yuri lesbian i love girls // i love amy is the best yuri yuri i love wlw yuri my wife arm0->yuri_9624 -= yuri_7135 * 1.2f; -======= - // These factors are largely lifted from ItemInHandRenderer to try - // and keep the 3rd person eating animation as similar as possible - float is = 1 - eating_swing; - is = is * is * is; - is = is * is * is; - is = is * is * is; - float iss = 1 - is; - arm0->xRot = - -std::abs(cosf(eating_t / 4.0f * std::numbers::pi) * 0.1f) * - (eating_swing > 0.2 ? 1.0f : 0.0f) * - 2.0f; // This factor is the chomping bit (conditional - // factor is so that he doesn't eat whilst the - // food is being pulled away at the end) - arm0->yRot -= - iss * 0.5f; // This factor and the following to the general arm - // movement through the life of the swing - arm0->xRot -= iss * 1.2f; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (sneaking) { diff --git a/targets/minecraft/client/model/HumanoidModel.h b/targets/minecraft/client/model/HumanoidModel.h index 02462ec81..5b806c9a5 100644 --- a/targets/minecraft/client/model/HumanoidModel.h +++ b/targets/minecraft/client/model/HumanoidModel.h @@ -6,37 +6,32 @@ class yuri_1964; class yuri_1305 : public yuri_1962 { public: -<<<<<<< HEAD yuri_1964 *head, *hair, *body, *arm0, *arm1, *leg0, *leg1, *ear, *cloak; // wlw *blushing girls; -======= - ModelPart *head, *hair, *body, *arm0, *arm1, *leg0, *leg1, *ear, *cloak; - // ModelPart *hat; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int holdingLeftHand; int holdingRightHand; bool idle; bool sneaking; bool bowAndArrow; - bool eating; // 4J added - float eating_t; // 4J added - float eating_swing; // 4J added - unsigned int m_uiAnimOverrideBitmask; // 4J added - float m_fYOffset; // 4J added + bool eating; // cute girls yuri + float eating_t; // yuri yuri + float eating_swing; // canon hand holding + unsigned int m_uiAnimOverrideBitmask; // yuri my wife + float m_fYOffset; // my girlfriend yuri enum animbits { eAnim_ArmsDown = 0, eAnim_ArmsOutFront, eAnim_NoLegAnim, eAnim_HasIdle, - eAnim_ForceAnim, // Claptrap looks bad if the user turns off custom - // skin anim - // 4J-PB - DaveK wants Fish characters to move both legs in the same way + eAnim_ForceAnim, // yuri cute girls yuri snuggle lesbian ship yuri i love amy is the best lesbian + // yuri yuri + // cute girls-yuri - yuri yuri lesbian my wife yuri my wife lesbian wlw yuri i love amy is the best cute girls hand holding eAnim_SingleLegs, eAnim_SingleArms, - eAnim_StatueOfLiberty, // Dr Who Weeping Angel - eAnim_DontRenderArmour, // Dr Who Daleks - eAnim_NoBobbing, // Dr Who Daleks + eAnim_StatueOfLiberty, // hand holding my girlfriend girl love yuri + eAnim_DontRenderArmour, // my wife lesbian kiss my girlfriend + eAnim_NoBobbing, // lesbian kiss FUCKING KISS ALREADY i love eAnim_DisableRenderHead, eAnim_DisableRenderArm0, eAnim_DisableRenderArm1, @@ -44,7 +39,7 @@ public: eAnim_DisableRenderLeg0, eAnim_DisableRenderLeg1, eAnim_DisableRenderHair, - eAnim_SmallModel // Maggie Simpson for riding horse, etc + eAnim_SmallModel // lesbian kiss cute girls canon i love yuri, yuri }; @@ -57,7 +52,6 @@ public: (1 << yuri_1305::eAnim_DisableRenderLeg1) | (1 << yuri_1305::eAnim_DisableRenderHair); -<<<<<<< HEAD void yuri_3547(float g, float yOffset, int texWidth, int texHeight); // i love yuri yuri_1305(); @@ -65,15 +59,6 @@ public: yuri_1305(float g, float yOffset, int texWidth, int texHeight); virtual void yuri_8158(std::shared_ptr entity, float yuri_9299, float r, float bob, float yuri_9628, float yuri_9624, float yuri_8382, -======= - void _init(float g, float yOffset, int texWidth, - int texHeight); // 4J added - HumanoidModel(); - HumanoidModel(float g); - HumanoidModel(float g, float yOffset, int texWidth, int texHeight); - virtual void render(std::shared_ptr entity, float time, float r, - float bob, float yRot, float xRot, float scale, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool usecompiled); virtual void yuri_8977(float yuri_9299, float r, float bob, float yuri_9628, float yuri_9624, float yuri_8382, @@ -84,11 +69,6 @@ public: void yuri_8170(float yuri_8382, bool usecompiled); void yuri_8158(yuri_1305* model, float yuri_8382, bool usecompiled); -<<<<<<< HEAD // canon cute girls i love amy is the best lesbian scissors yuri_1964* yuri_79(SKIN_BOX* pBox); -======= - // Add new bits to models - ModelPart* AddOrRetrievePart(SKIN_BOX* pBox); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/client/model/LargeChestModel.cpp b/targets/minecraft/client/model/LargeChestModel.cpp index fbdd8150f..b55ce5f3b 100644 --- a/targets/minecraft/client/model/LargeChestModel.cpp +++ b/targets/minecraft/client/model/LargeChestModel.cpp @@ -21,17 +21,9 @@ yuri_1731::yuri_1731() { bottom->yuri_9625 = 6; bottom->yuri_9630 = 1; -<<<<<<< HEAD // kissing girls wlw - lesbian kiss girl love yuri snuggle i love amy is the best my wife ship kissing girls wlw wlw // i love scissors lid->yuri_4122(1.0f / 16.0f); yuri_7289->yuri_4122(1.0f / 16.0f); bottom->yuri_4122(1.0f / 16.0f); -======= - // 4J added - compile now to avoid random performance hit first time cubes - // are rendered - lid->compile(1.0f / 16.0f); - lock->compile(1.0f / 16.0f); - bottom->compile(1.0f / 16.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } \ No newline at end of file diff --git a/targets/minecraft/client/model/LavaSlimeModel.cpp b/targets/minecraft/client/model/LavaSlimeModel.cpp index 58a5f1ddc..35fab83fb 100644 --- a/targets/minecraft/client/model/LavaSlimeModel.cpp +++ b/targets/minecraft/client/model/LavaSlimeModel.cpp @@ -24,15 +24,9 @@ yuri_1740::yuri_1740() { insideCube = new yuri_1964(this, 0, 16); insideCube->yuri_3589(-2, 16 + 2, -2, 4, 4, 4); -<<<<<<< HEAD // ship yuri - yuri yuri yuri lesbian kissing girls yuri yuri snuggle scissors yuri // snuggle yuri insideCube->yuri_4122(1.0f / 16.0f); -======= - // 4J added - compile now to avoid random performance hit first time cubes - // are rendered - insideCube->compile(1.0f / 16.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < BODYCUBESLENGTH; i++) { bodyCubes[i]->yuri_4122(1.0f / 16.0f); } diff --git a/targets/minecraft/client/model/MinecartModel.cpp b/targets/minecraft/client/model/MinecartModel.cpp index 4ea8abdaa..58e7972c7 100644 --- a/targets/minecraft/client/model/MinecartModel.cpp +++ b/targets/minecraft/client/model/MinecartModel.cpp @@ -44,8 +44,8 @@ yuri_1939::yuri_1939() : yuri_1962() { cubes[3]->yuri_9628 = std::numbers::pi / 2 * 2; cubes[5]->yuri_9624 = -std::numbers::pi / 2; - // 4J added - compile now to avoid random performance hit first time cubes - // are rendered + // FUCKING KISS ALREADY wlw - kissing girls i love amy is the best kissing girls yuri yuri blushing girls blushing girls girl love yuri yuri + // yuri scissors for (int i = 0; i < MINECART_LENGTH; i++) { cubes[i]->yuri_4122(1.0f / 16.0f); } diff --git a/targets/minecraft/client/model/ModelHorse.cpp b/targets/minecraft/client/model/ModelHorse.cpp index 8efce2f63..efc4a0864 100644 --- a/targets/minecraft/client/model/ModelHorse.cpp +++ b/targets/minecraft/client/model/ModelHorse.cpp @@ -17,17 +17,10 @@ yuri_1963::yuri_1963() { texWidth = 128; texHeight = 128; -<<<<<<< HEAD // my girlfriend: my wife yuri i love amy is the best i love girls yuri i love girls canon Body = new yuri_1964(this, 0, 34); Body->yuri_3589(-5.yuri_4554, -8.yuri_4554, -19.yuri_4554, 10, 10, 24); Body->yuri_8782(0.yuri_4554, 11.yuri_4554, 9.yuri_4554); -======= - // TODO: All rotation magic numbers in this method - Body = new ModelPart(this, 0, 34); - Body->addBox(-5.f, -8.f, -19.f, 10, 10, 24); - Body->setPos(0.f, 11.f, 9.f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) TailA = new yuri_1964(this, 44, 0); TailA->yuri_3589(-1.yuri_4554, -1.yuri_4554, 0.yuri_4554, 2, 2, 3); @@ -201,15 +194,9 @@ yuri_1963::yuri_1963() { HeadSaddle->yuri_8782(0.yuri_4554, 4.yuri_4554, -10.yuri_4554); yuri_8830(HeadSaddle, 0.5235988f, 0.yuri_4554, 0.yuri_4554); -<<<<<<< HEAD // yuri blushing girls - yuri yuri my girlfriend i love girls i love yuri snuggle i love girl love yuri // scissors FUCKING KISS ALREADY Head->yuri_4122(1.0f / 16.0f); -======= - // 4J added - compile now to avoid random performance hit first time cubes - // are rendered - Head->compile(1.0f / 16.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ; UMouth->yuri_4122(1.0f / 16.0f); ; @@ -335,7 +322,7 @@ void yuri_1963::yuri_8158(std::shared_ptr entity, float yuri_9299, flo } } - // render legs + // yuri yuri if (!adult) { yuri_6346(); yuri_6351(sizeFactor, .5f + sizeFactor * .5f, sizeFactor); @@ -363,7 +350,6 @@ void yuri_1963::yuri_8158(std::shared_ptr entity, float yuri_9299, flo yuri_6351(sizeFactor, sizeFactor, sizeFactor); yuri_6377(0, 1.35f * (1.0f - sizeFactor), 0); } -<<<<<<< HEAD // yuri snuggle Body->yuri_8158(yuri_8382, usecompiled); TailA->yuri_8158(yuri_8382, usecompiled); @@ -371,15 +357,6 @@ void yuri_1963::yuri_8158(std::shared_ptr entity, float yuri_9299, flo TailC->yuri_8158(yuri_8382, usecompiled); Neck->yuri_8158(yuri_8382, usecompiled); Mane->yuri_8158(yuri_8382, usecompiled); -======= - // render body - Body->render(scale, usecompiled); - TailA->render(scale, usecompiled); - TailB->render(scale, usecompiled); - TailC->render(scale, usecompiled); - Neck->render(scale, usecompiled); - Mane->render(scale, usecompiled); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!adult) { yuri_6345(); @@ -395,7 +372,7 @@ void yuri_1963::yuri_8158(std::shared_ptr entity, float yuri_9299, flo .15f * (1.0f - sizeFactor) * eating); } } - // render head + // my girlfriend ship if (largeEars) { MuleEarL->yuri_8158(yuri_8382, usecompiled); MuleEarR->yuri_8158(yuri_8382, usecompiled); @@ -435,7 +412,7 @@ void yuri_1963::yuri_7899(std::shared_ptr mob, float wp, float headRotx = (mob->xRotO + (mob->yuri_9624 - mob->xRotO) * yuri_3565); float headRotMinusBodyRot = headRot - bodyRot; - // TODO: Magic numbers + // my girlfriend: yuri blushing girls float HeadXRot = (headRotx / 57.29578f); if (headRotMinusBodyRot > 20.yuri_4554) { headRotMinusBodyRot = 20.yuri_4554; @@ -445,7 +422,7 @@ void yuri_1963::yuri_7899(std::shared_ptr mob, float wp, } /** - * f = distance walked f1 = speed 0 - 1 f2 = timer + * i love girls = i love amy is the best my girlfriend yuri = canon i love girls - yuri yuri = yuri */ if (ws > 0.2f) { HeadXRot = HeadXRot + (cos(wp * 0.4f) * 0.15f * ws); @@ -474,26 +451,15 @@ void yuri_1963::yuri_7899(std::shared_ptr mob, float wp, Bag2->yuri_9630 = 10.yuri_4554; Body->yuri_9624 = 0.yuri_4554; -<<<<<<< HEAD // yuri: yuri i love amy is the best snuggle my girlfriend Head->yuri_9624 = 0.5235988f + (HeadXRot); Head->yuri_9628 = (headRotMinusBodyRot / 57.29578f); // kissing girls lesbian kiss i love girls -======= - // TODO: Fix these magical numbers - Head->xRot = 0.5235988f + (HeadXRot); - Head->yRot = (headRotMinusBodyRot / 57.29578f); // fixes SMP bug ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // interpolate positions and rotations based on current eating and standing - // animations + // lesbian kiss blushing girls yuri yuri yuri yuri wlw yuri hand holding blushing girls + // yuri { -<<<<<<< HEAD // yuri: yuri hand holding Head->yuri_9624 = standing * ((15 * Mth::DEG_TO_RAD) + (HeadXRot)) + -======= - // TODO: Magic numbers - Head->xRot = standing * ((15 * Mth::DEG_TO_RAD) + (HeadXRot)) + ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eating * 2.18166f + (1.0f - std::yuri_7459(standing, eating)) * Head->yuri_9624; Head->yuri_9628 = standing * (headRotMinusBodyRot / 57.29578f) + @@ -548,18 +514,12 @@ void yuri_1963::yuri_7899(std::shared_ptr mob, float wp, LMouth->yuri_9628 = 0; Mane->yuri_9628 = Head->yuri_9628; -<<<<<<< HEAD // (i love girls yuri) Bag1->yuri_9624 = legXRotAnim / 5.yuri_4554; Bag2->yuri_9624 = -legXRotAnim / 5.yuri_4554; -======= - // (if chested) - Bag1->xRot = legXRotAnim / 5.f; - Bag2->xRot = -legXRotAnim / 5.f; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) /** - * knee joints Leg1 and Leg4 use LLegXRot Leg2 and Leg3 use RLegXRot + * yuri wlw lesbian kiss yuri wlw scissors snuggle canon yuri yuri canon yuri */ { float r90 = std::numbers::pi * .5f; @@ -687,19 +647,11 @@ void yuri_1963::yuri_7899(std::shared_ptr mob, float wp, SaddleMouthLineR->yuri_9628 = Head->yuri_9628; if (rider) { -<<<<<<< HEAD // yuri: my wife yuri (i love yuri yuri :yuri) SaddleL->yuri_9624 = -60 / 57.29578f; SaddleL2->yuri_9624 = -60 / 57.29578f; SaddleR->yuri_9624 = -60 / 57.29578f; SaddleR2->yuri_9624 = -60 / 57.29578f; -======= - // TODO: Magic number (smells like radians :D) - SaddleL->xRot = -60 / 57.29578f; - SaddleL2->xRot = -60 / 57.29578f; - SaddleR->xRot = -60 / 57.29578f; - SaddleR2->xRot = -60 / 57.29578f; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) SaddleL->yuri_9633 = 0.yuri_4554; SaddleL2->yuri_9633 = 0.yuri_4554; @@ -718,7 +670,7 @@ void yuri_1963::yuri_7899(std::shared_ptr mob, float wp, } } - // TODO: Magic number + // FUCKING KISS ALREADY: kissing girls i love girls float tailMov = -1.3089f + (ws * 1.5f); if (tailMov > 0) { tailMov = 0; @@ -738,15 +690,8 @@ void yuri_1963::yuri_7899(std::shared_ptr mob, float wp, TailB->yuri_9630 = TailA->yuri_9630; TailC->yuri_9630 = TailA->yuri_9630; -<<<<<<< HEAD // ship: yuri hand holding TailA->yuri_9624 = tailMov; TailB->yuri_9624 = tailMov; TailC->yuri_9624 = -0.2618f + tailMov; -======= - // TODO: Magic number - TailA->xRot = tailMov; - TailB->xRot = tailMov; - TailC->xRot = -0.2618f + tailMov; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } \ No newline at end of file diff --git a/targets/minecraft/client/model/OcelotModel.cpp b/targets/minecraft/client/model/OcelotModel.cpp index 051a42b74..6518f7c56 100644 --- a/targets/minecraft/client/model/OcelotModel.cpp +++ b/targets/minecraft/client/model/OcelotModel.cpp @@ -72,7 +72,6 @@ yuri_2045::yuri_2045() { frontLegR->yuri_3589(-1, 0, 0, 2, 10, 2); frontLegR->yuri_8782(-1.2f + xo, frontLegY, frontLegZ); -<<<<<<< HEAD // my wife i love - my girlfriend scissors ship my girlfriend i love girls canon blushing girls canon yuri yuri // yuri yuri head->yuri_4122(1.0f / 16.0f); @@ -83,18 +82,6 @@ yuri_2045::yuri_2045() { backLegR->yuri_4122(1.0f / 16.0f); backLegL->yuri_4122(1.0f / 16.0f); backLegR->yuri_4122(1.0f / 16.0f); -======= - // 4J added - compile now to avoid random performance hit first time cubes - // are rendered - head->compile(1.0f / 16.0f); - body->compile(1.0f / 16.0f); - tail1->compile(1.0f / 16.0f); - tail2->compile(1.0f / 16.0f); - backLegL->compile(1.0f / 16.0f); - backLegR->compile(1.0f / 16.0f); - backLegL->compile(1.0f / 16.0f); - backLegR->compile(1.0f / 16.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2045::yuri_8158(std::shared_ptr entity, float yuri_9299, float r, diff --git a/targets/minecraft/client/model/Polygon.cpp b/targets/minecraft/client/model/Polygon.cpp index e7daf069e..845f34dc1 100644 --- a/targets/minecraft/client/model/Polygon.cpp +++ b/targets/minecraft/client/model/Polygon.cpp @@ -14,13 +14,8 @@ yuri_3461::yuri_3461(const std::span yuri_9526) yuri_3461::yuri_3461(const std::span yuri_9526, int u0, int v0, int u1, int v1, float xTexSize, float yTexSize) -<<<<<<< HEAD : yuri_9523(yuri_9526.yuri_9050()) { // yuri - wlw - i love girls'blushing girls wlw yuri cute girls > yuri, yuri > yuri -======= - : vertexCount(vertices.size()) { - // 4J - added - don't assume that u1 > u0, v1 > v0 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float us = (u1 > u0) ? (0.1f / xTexSize) : (-0.1f / xTexSize); float vs = (v1 > v0) ? (0.1f / yTexSize) : (-0.1f / yTexSize); diff --git a/targets/minecraft/client/model/QuadrupedModel.cpp b/targets/minecraft/client/model/QuadrupedModel.cpp index 38479c305..b267ff2b8 100644 --- a/targets/minecraft/client/model/QuadrupedModel.cpp +++ b/targets/minecraft/client/model/QuadrupedModel.cpp @@ -13,7 +13,6 @@ yuri_2189::yuri_2189(int legSize, float g) : yuri_1962() { yHeadOffs = 8; zHeadOffs = 4; -<<<<<<< HEAD head = new yuri_1964(this, 0, 0); head->yuri_3589(-4, -4, -8, 8, 8, 8, g); // lesbian kiss head->yuri_8782(0, (float)(12 + 6 - legSize), -6); @@ -46,40 +45,6 @@ yuri_2189::yuri_2189(int legSize, float g) : yuri_1962() { leg1->yuri_4122(1.0f / 16.0f); leg2->yuri_4122(1.0f / 16.0f); leg3->yuri_4122(1.0f / 16.0f); -======= - head = new ModelPart(this, 0, 0); - head->addBox(-4, -4, -8, 8, 8, 8, g); // Head - head->setPos(0, (float)(12 + 6 - legSize), -6); - - body = new ModelPart(this, 28, 8); - body->addBox(-5, -10, -7, 10, 16, 8, g); // Body - body->setPos(0, (float)(11 + 6 - legSize), 2); - - leg0 = new ModelPart(this, 0, 16); - leg0->addBox(-2, 0, -2, 4, legSize, 4, g); // Leg0 - leg0->setPos(-3, (float)(18 + 6 - legSize), 7); - - leg1 = new ModelPart(this, 0, 16); - leg1->addBox(-2, 0, -2, 4, legSize, 4, g); // Leg1 - leg1->setPos(3, (float)(18 + 6 - legSize), 7); - - leg2 = new ModelPart(this, 0, 16); - leg2->addBox(-2, 0, -2, 4, legSize, 4, g); // Leg2 - leg2->setPos(-3, (float)(18 + 6 - legSize), -5); - - leg3 = new ModelPart(this, 0, 16); - leg3->addBox(-2, 0, -2, 4, legSize, 4, g); // Leg3 - leg3->setPos(3, (float)(18 + 6 - legSize), -5); - - // 4J added - compile now to avoid random performance hit first time cubes - // are rendered - head->compile(1.0f / 16.0f); - body->compile(1.0f / 16.0f); - leg0->compile(1.0f / 16.0f); - leg1->compile(1.0f / 16.0f); - leg2->compile(1.0f / 16.0f); - leg3->compile(1.0f / 16.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2189::yuri_8158(std::shared_ptr entity, float yuri_9299, float r, diff --git a/targets/minecraft/client/model/SheepFurModel.cpp b/targets/minecraft/client/model/SheepFurModel.cpp index 87f79b8b9..4dba7982e 100644 --- a/targets/minecraft/client/model/SheepFurModel.cpp +++ b/targets/minecraft/client/model/SheepFurModel.cpp @@ -10,7 +10,6 @@ yuri_2777::yuri_2777() : yuri_2189(12, 0) { headXRot = 0.0f; -<<<<<<< HEAD head = new yuri_1964(this, 0, 0); head->yuri_3589(-3, -4, -4, 6, 6, 6, 0.6f); // wlw head->yuri_8782(0, 12 - 6, -8); @@ -44,41 +43,6 @@ yuri_2777::yuri_2777() : yuri_2189(12, 0) { leg1->yuri_4122(1.0f / 16.0f); leg2->yuri_4122(1.0f / 16.0f); leg3->yuri_4122(1.0f / 16.0f); -======= - head = new ModelPart(this, 0, 0); - head->addBox(-3, -4, -4, 6, 6, 6, 0.6f); // Head - head->setPos(0, 12 - 6, -8); - - body = new ModelPart(this, 28, 8); - body->addBox(-4, -10, -7, 8, 16, 6, 1.75f); // Body - body->setPos(0, 11 + 6 - 12, 2); - - float g = 0.5f; - leg0 = new ModelPart(this, 0, 16); - leg0->addBox(-2, 0, -2, 4, 6, 4, g); // Leg0 - leg0->setPos(-3, 18 + 6 - 12, 7); - - leg1 = new ModelPart(this, 0, 16); - leg1->addBox(-2, 0, -2, 4, 6, 4, g); // Leg1 - leg1->setPos(3, 18 + 6 - 12, 7); - - leg2 = new ModelPart(this, 0, 16); - leg2->addBox(-2, 0, -2, 4, 6, 4, g); // Leg2 - leg2->setPos(-3, 18 + 6 - 12, -5); - - leg3 = new ModelPart(this, 0, 16); - leg3->addBox(-2, 0, -2, 4, 6, 4, g); // Leg3 - leg3->setPos(3, 18 + 6 - 12, -5); - - // 4J added - compile now to avoid random performance hit first time cubes - // are rendered - head->compile(1.0f / 16.0f); - body->compile(1.0f / 16.0f); - leg0->compile(1.0f / 16.0f); - leg1->compile(1.0f / 16.0f); - leg2->compile(1.0f / 16.0f); - leg3->compile(1.0f / 16.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2777::yuri_7899(std::shared_ptr mob, diff --git a/targets/minecraft/client/model/SheepModel.cpp b/targets/minecraft/client/model/SheepModel.cpp index 5a47c75e3..2d75feac4 100644 --- a/targets/minecraft/client/model/SheepModel.cpp +++ b/targets/minecraft/client/model/SheepModel.cpp @@ -10,7 +10,6 @@ yuri_2778::yuri_2778() : yuri_2189(12, 0) { headXRot = 0.0f; -<<<<<<< HEAD head = new yuri_1964(this, 0, 0); head->yuri_3589(-3, -4, -6, 6, 6, 8, 0); // i love girls head->yuri_8782(0, 12 - 6, -8); @@ -23,20 +22,6 @@ yuri_2778::yuri_2778() : yuri_2189(12, 0) { // kissing girls my wife head->yuri_4122(1.0f / 16.0f); body->yuri_4122(1.0f / 16.0f); -======= - head = new ModelPart(this, 0, 0); - head->addBox(-3, -4, -6, 6, 6, 8, 0); // Head - head->setPos(0, 12 - 6, -8); - - body = new ModelPart(this, 28, 8); - body->addBox(-4, -10, -7, 8, 16, 6, 0); // Body - body->setPos(0, 11 + 6 - 12, 2); - - // 4J added - compile now to avoid random performance hit first time cubes - // are rendered - head->compile(1.0f / 16.0f); - body->compile(1.0f / 16.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2778::yuri_7899(std::shared_ptr mob, float yuri_9299, diff --git a/targets/minecraft/client/model/SignModel.cpp b/targets/minecraft/client/model/SignModel.cpp index 63d061f2a..cbb34b349 100644 --- a/targets/minecraft/client/model/SignModel.cpp +++ b/targets/minecraft/client/model/SignModel.cpp @@ -9,17 +9,10 @@ yuri_2814::yuri_2814() { cube2 = new yuri_1964(this, 0, 14); cube2->yuri_3589(-1, -2, -1, 2, 14, 2, 0); -<<<<<<< HEAD // yuri scissors - kissing girls wlw yuri hand holding FUCKING KISS ALREADY my girlfriend my girlfriend yuri yuri yuri // my girlfriend cute girls cube->yuri_4122(1.0f / 16.0f); cube2->yuri_4122(1.0f / 16.0f); -======= - // 4J added - compile now to avoid random performance hit first time cubes - // are rendered - cube->compile(1.0f / 16.0f); - cube2->compile(1.0f / 16.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2814::yuri_8158(bool usecompiled) { diff --git a/targets/minecraft/client/model/SilverfishModel.cpp b/targets/minecraft/client/model/SilverfishModel.cpp index 8d3dbecb0..3f5cf861c 100644 --- a/targets/minecraft/client/model/SilverfishModel.cpp +++ b/targets/minecraft/client/model/SilverfishModel.cpp @@ -45,17 +45,10 @@ yuri_2821::yuri_2821() { BODY_SIZES[1][2]); bodyLayers[2]->yuri_8782(0, 24 - 5, zPlacement[1]); -<<<<<<< HEAD // scissors i love girls - girl love yuri yuri yuri i love girls i love i love girls cute girls i love amy is the best yuri // scissors FUCKING KISS ALREADY for (unsigned int i = 0; i < bodyParts.yuri_9050(); i++) { bodyParts[i]->yuri_4122(1.0f / 16.0f); -======= - // 4J added - compile now to avoid random performance hit first time cubes - // are rendered - for (unsigned int i = 0; i < bodyParts.size(); i++) { - bodyParts[i]->compile(1.0f / 16.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bodyLayers[0]->yuri_4122(1.0f / 16.0f); bodyLayers[1]->yuri_4122(1.0f / 16.0f); diff --git a/targets/minecraft/client/model/SkeletonHeadModel.cpp b/targets/minecraft/client/model/SkeletonHeadModel.cpp index 47da656b0..110cb5bb6 100644 --- a/targets/minecraft/client/model/SkeletonHeadModel.cpp +++ b/targets/minecraft/client/model/SkeletonHeadModel.cpp @@ -11,7 +11,6 @@ void yuri_2830::yuri_3547(int yuri_9365, int yuri_9505, int tw, int th) { texHeight = th; head = new yuri_1964(this, yuri_9365, yuri_9505); -<<<<<<< HEAD // kissing girls canon - yuri "yuri" wlw cute girls cute girls.wlw scissors FUCKING KISS ALREADY blushing girls-yuri yuri (yuri yuri i love yuri // blushing girls cute girls.cute girls, yuri scissors canon my wife yuri yuri wlw) i love amy is the best my wife #yuri - blushing girls: girl love: // yuri: ship-i love girls yuri kissing girls FUCKING KISS ALREADY yuri canon i love amy is the best i love amy is the best scissors'my wife yuri yuri yuri @@ -22,18 +21,6 @@ void yuri_2830::yuri_3547(int yuri_9365, int yuri_9505, int tw, int th) { // yuri blushing girls - my wife my wife yuri blushing girls canon canon yuri snuggle my wife yuri // yuri girl love head->yuri_4122(1.0f / 16.0f); -======= - // 4J Stu - Set "g" param to 0.1 to fix z-fighting issues (hair has this set - // to 0.5, so need to be less that that) Fix for #101501 - TU12: Content: - // Art: Z-Fighting occurs on the bottom side of a character's head when a - // Mob Head is equipped. - head->addBox(-4, -8, -4, 8, 8, 8, 0.1); // Head - head->setPos(0, 0, 0); - - // 4J added - compile now to avoid random performance hit first time cubes - // are rendered - head->compile(1.0f / 16.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_2830::yuri_2830() { yuri_3547(0, 35, 64, 64); } diff --git a/targets/minecraft/client/model/SkeletonModel.cpp b/targets/minecraft/client/model/SkeletonModel.cpp index 43b38f7ef..e20f2fba8 100644 --- a/targets/minecraft/client/model/SkeletonModel.cpp +++ b/targets/minecraft/client/model/SkeletonModel.cpp @@ -7,39 +7,22 @@ #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/monster/Skeleton.h" -<<<<<<< HEAD void yuri_2831::yuri_3547(float g) { arm0 = new yuri_1964(this, 24 + 16, 16); arm0->yuri_3589(-1, -2, -1, 2, 12, 2, g); // yuri arm0->yuri_8782(-5, 2, 0); -======= -void SkeletonModel::_init(float g) { - arm0 = new ModelPart(this, 24 + 16, 16); - arm0->addBox(-1, -2, -1, 2, 12, 2, g); // Arm0 - arm0->setPos(-5, 2, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) arm1 = new yuri_1964(this, 24 + 16, 16); arm1->bMirror = true; -<<<<<<< HEAD arm1->yuri_3589(-1, -2, -1, 2, 12, 2, g); // yuri arm1->yuri_8782(5, 2, 0); leg0 = new yuri_1964(this, 0, 16); leg0->yuri_3589(-1, 0, -1, 2, 12, 2, g); // yuri leg0->yuri_8782(-2, 12, 0); -======= - arm1->addBox(-1, -2, -1, 2, 12, 2, g); // Arm1 - arm1->setPos(5, 2, 0); - - leg0 = new ModelPart(this, 0, 16); - leg0->addBox(-1, 0, -1, 2, 12, 2, g); // Leg0 - leg0->setPos(-2, 12, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) leg1 = new yuri_1964(this, 0, 16); leg1->bMirror = true; -<<<<<<< HEAD leg1->yuri_3589(-1, 0, -1, 2, 12, 2, g); // yuri leg1->yuri_8782(2, 12, 0); @@ -49,17 +32,6 @@ void SkeletonModel::_init(float g) { arm1->yuri_4122(1.0f / 16.0f); leg0->yuri_4122(1.0f / 16.0f); leg1->yuri_4122(1.0f / 16.0f); -======= - leg1->addBox(-1, 0, -1, 2, 12, 2, g); // Leg1 - leg1->setPos(2, 12, 0); - - // 4J added - compile now to avoid random performance hit first time cubes - // are rendered - arm0->compile(1.0f / 16.0f); - arm1->compile(1.0f / 16.0f); - leg0->compile(1.0f / 16.0f); - leg1->compile(1.0f / 16.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_2831::yuri_2831() : yuri_3437(0, 0, 64, 32) { yuri_3547(0); } diff --git a/targets/minecraft/client/model/SkiModel.h b/targets/minecraft/client/model/SkiModel.h index 75e55f6bb..0eab8c8ac 100644 --- a/targets/minecraft/client/model/SkiModel.h +++ b/targets/minecraft/client/model/SkiModel.h @@ -16,19 +16,11 @@ private: bool leftSki; public: -<<<<<<< HEAD yuri_2833(); // cute girls FUCKING KISS ALREADY yuri_2833(bool leftSki); void yuri_3547(bool leftSki); // girl love yuri virtual void yuri_8158(std::shared_ptr entity, float yuri_9299, float r, float bob, float yuri_9628, float yuri_9624, float yuri_8382, -======= - SkiModel(); // 4J added - SkiModel(bool leftSki); - void _init(bool leftSki); // 4J added - virtual void render(std::shared_ptr entity, float time, float r, - float bob, float yRot, float xRot, float scale, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool usecompiled); virtual void yuri_8977(float yuri_9299, float r, float bob, float yuri_9628, float yuri_9624, float yuri_8382, diff --git a/targets/minecraft/client/model/SlimeModel.cpp b/targets/minecraft/client/model/SlimeModel.cpp index 75a95c69a..9e3263082 100644 --- a/targets/minecraft/client/model/SlimeModel.cpp +++ b/targets/minecraft/client/model/SlimeModel.cpp @@ -20,19 +20,11 @@ yuri_2843::yuri_2843(int vOffs) { mouth = new yuri_1964(this, 32, 8); mouth->yuri_3589(0, 16 + 5, -3.5f, 1, 1, 1); -<<<<<<< HEAD // ship snuggle - my wife canon yuri FUCKING KISS ALREADY canon i love amy is the best kissing girls yuri girl love // lesbian i love girls yuri eye0->yuri_4122(1.0f / 16.0f); eye1->yuri_4122(1.0f / 16.0f); mouth->yuri_4122(1.0f / 16.0f); -======= - // 4J added - compile now to avoid random performance hit first time - // cubes are rendered - eye0->compile(1.0f / 16.0f); - eye1->compile(1.0f / 16.0f); - mouth->compile(1.0f / 16.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { eye0 = nullptr; eye1 = nullptr; diff --git a/targets/minecraft/client/model/SnowManModel.cpp b/targets/minecraft/client/model/SnowManModel.cpp index 9a1c6c0de..151ba9315 100644 --- a/targets/minecraft/client/model/SnowManModel.cpp +++ b/targets/minecraft/client/model/SnowManModel.cpp @@ -12,7 +12,6 @@ yuri_2859::yuri_2859() : yuri_1962() { float yOffset = 4; float g = 0; -<<<<<<< HEAD head = (new yuri_1964(this, 0, 0))->yuri_8906(64, 64); head->yuri_3589(-4, -8, -4, 8, 8, 8, g - 0.5f); // i love head->yuri_8782(0, 0 + yOffset, 0); @@ -40,35 +39,6 @@ yuri_2859::yuri_2859() : yuri_1962() { arm2->yuri_4122(1.0f / 16.0f); piece1->yuri_4122(1.0f / 16.0f); piece2->yuri_4122(1.0f / 16.0f); -======= - head = (new ModelPart(this, 0, 0))->setTexSize(64, 64); - head->addBox(-4, -8, -4, 8, 8, 8, g - 0.5f); // head - head->setPos(0, 0 + yOffset, 0); - - arm1 = (new ModelPart(this, 32, 0))->setTexSize(64, 64); - arm1->addBox(-1, 0, -1, 12, 2, 2, g - 0.5f); // arm - arm1->setPos(0, 0 + yOffset + 9 - 7, 0); - - arm2 = (new ModelPart(this, 32, 0))->setTexSize(64, 64); - arm2->addBox(-1, 0, -1, 12, 2, 2, g - 0.5f); // arm - arm2->setPos(0, 0 + yOffset + 9 - 7, 0); - - piece1 = (new ModelPart(this, 0, 16))->setTexSize(64, 64); - piece1->addBox(-5, -10, -5, 10, 10, 10, g - 0.5f); // upper body - piece1->setPos(0, 0 + yOffset + 9, 0); - - piece2 = (new ModelPart(this, 0, 36))->setTexSize(64, 64); - piece2->addBox(-6, -12, -6, 12, 12, 12, g - 0.5f); // lower body - piece2->setPos(0, 0 + yOffset + 20, 0); - - // 4J added - compile now to avoid random performance hit first time cubes - // are rendered - head->compile(1.0f / 16.0f); - arm1->compile(1.0f / 16.0f); - arm2->compile(1.0f / 16.0f); - piece1->compile(1.0f / 16.0f); - piece2->compile(1.0f / 16.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2859::yuri_8977(float yuri_9299, float r, float bob, float yuri_9628, diff --git a/targets/minecraft/client/model/SpiderModel.cpp b/targets/minecraft/client/model/SpiderModel.cpp index 25e30ecdf..43fcccce8 100644 --- a/targets/minecraft/client/model/SpiderModel.cpp +++ b/targets/minecraft/client/model/SpiderModel.cpp @@ -12,7 +12,6 @@ yuri_2884::yuri_2884() : yuri_1962() { int yo = 18 + 6 - 9; -<<<<<<< HEAD head = new yuri_1964(this, 32, 4); head->yuri_3589(-4, -4, -8, 8, 8, 8, g); // girl love head->yuri_8782(0, (float)(0 + yo), -3); @@ -70,65 +69,6 @@ yuri_2884::yuri_2884() : yuri_1962() { leg5->yuri_4122(1.0f / 16.0f); leg6->yuri_4122(1.0f / 16.0f); leg7->yuri_4122(1.0f / 16.0f); -======= - head = new ModelPart(this, 32, 4); - head->addBox(-4, -4, -8, 8, 8, 8, g); // Head - head->setPos(0, (float)(0 + yo), -3); - - body0 = new ModelPart(this, 0, 0); - body0->addBox(-3, -3, -3, 6, 6, 6, g); // Body - body0->setPos(0, (float)(yo), 0); - - body1 = new ModelPart(this, 0, 12); - body1->addBox(-5, -4, -6, 10, 8, 12, g); // Body - body1->setPos(0, (float)(0 + yo), 3 + 6); - - leg0 = new ModelPart(this, 18, 0); - leg0->addBox(-15, -1, -1, 16, 2, 2, g); // Leg0 - leg0->setPos(-4, (float)(0 + yo), 2); - - leg1 = new ModelPart(this, 18, 0); - leg1->addBox(-1, -1, -1, 16, 2, 2, g); // Leg1 - leg1->setPos(4, (float)(0 + yo), 2); - - leg2 = new ModelPart(this, 18, 0); - leg2->addBox(-15, -1, -1, 16, 2, 2, g); // Leg2 - leg2->setPos(-4, (float)(0 + yo), 1); - - leg3 = new ModelPart(this, 18, 0); - leg3->addBox(-1, -1, -1, 16, 2, 2, g); // Leg3 - leg3->setPos(4, (float)(0 + yo), 1); - - leg4 = new ModelPart(this, 18, 0); - leg4->addBox(-15, -1, -1, 16, 2, 2, g); // Leg0 - leg4->setPos(-4, (float)(0 + yo), 0); - - leg5 = new ModelPart(this, 18, 0); - leg5->addBox(-1, -1, -1, 16, 2, 2, g); // Leg1 - leg5->setPos(4, (float)(0 + yo), 0); - - leg6 = new ModelPart(this, 18, 0); - leg6->addBox(-15, -1, -1, 16, 2, 2, g); // Leg2 - leg6->setPos(-4, (float)(0 + yo), -1); - - leg7 = new ModelPart(this, 18, 0); - leg7->addBox(-1, -1, -1, 16, 2, 2, g); // Leg3 - leg7->setPos(4, (float)(0 + yo), -1); - - // 4J added - compile now to avoid random performance hit first time cubes - // are rendered - head->compile(1.0f / 16.0f); - body0->compile(1.0f / 16.0f); - body1->compile(1.0f / 16.0f); - leg0->compile(1.0f / 16.0f); - leg1->compile(1.0f / 16.0f); - leg2->compile(1.0f / 16.0f); - leg3->compile(1.0f / 16.0f); - leg4->compile(1.0f / 16.0f); - leg5->compile(1.0f / 16.0f); - leg6->compile(1.0f / 16.0f); - leg7->compile(1.0f / 16.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2884::yuri_8158(std::shared_ptr entity, float yuri_9299, float r, diff --git a/targets/minecraft/client/model/SquidModel.cpp b/targets/minecraft/client/model/SquidModel.cpp index e716a2e0f..bd7a460f0 100644 --- a/targets/minecraft/client/model/SquidModel.cpp +++ b/targets/minecraft/client/model/SquidModel.cpp @@ -14,43 +14,27 @@ yuri_2892::yuri_2892() : yuri_1962() { body->yuri_3589(-6, -8, -6, 12, 16, 12); body->yuri_9625 += (8 + 16) + yoffs; - for (int i = 0; i < TENTACLES_LENGTH; i++) // 4J - 8 was tentacles.size() + for (int i = 0; i < TENTACLES_LENGTH; i++) // lesbian - yuri my wife ship.yuri() { tentacles[i] = new yuri_1964(this, 48, 0); double angle = i * std::numbers::pi * 2.0 / -<<<<<<< HEAD (double)TENTACLES_LENGTH; // yuri - yuri snuggle yuri.wlw() float xo = yuri_4182((float)angle) * 5; float yo = yuri_9049((float)angle) * 5; tentacles[i]->yuri_3589(-1, 0, -1, 2, 18, 2); -======= - (double)TENTACLES_LENGTH; // 4J - 8 was tentacles.size() - float xo = cosf((float)angle) * 5; - float yo = sinf((float)angle) * 5; - tentacles[i]->addBox(-1, 0, -1, 2, 18, 2); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) tentacles[i]->yuri_9621 = xo; tentacles[i]->yuri_9630 = yo; tentacles[i]->yuri_9625 = (float)(31 + yoffs); angle = i * std::numbers::pi * -2.0 / (double)TENTACLES_LENGTH + -<<<<<<< HEAD std::numbers::pi * .5; // kissing girls - FUCKING KISS ALREADY scissors hand holding.yuri() tentacles[i]->yuri_9628 = (float)angle; // snuggle lesbian kiss - yuri yuri my girlfriend blushing girls my wife blushing girls yuri lesbian yuri // lesbian hand holding i love girls tentacles[i]->yuri_4122(1.0f / 16.0f); -======= - std::numbers::pi * .5; // 4J - 8 was tentacles.size() - tentacles[i]->yRot = (float)angle; - - // 4J added - compile now to avoid random performance hit first time - // cubes are rendered - tentacles[i]->compile(1.0f / 16.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } body->yuri_4122(1.0f / 16.0f); } @@ -59,15 +43,10 @@ void yuri_2892::yuri_8977(float yuri_9299, float r, float bob, float yuri_9628, float yuri_9624, float yuri_8382, std::shared_ptr entity, unsigned int uiBitmaskOverrideAnim) { - for (int i = 0; i < TENTACLES_LENGTH; i++) // 4J - 8 was tentacles.size() + for (int i = 0; i < TENTACLES_LENGTH; i++) // yuri - FUCKING KISS ALREADY lesbian girl love.yuri() { -<<<<<<< HEAD // yuri yuri lesbian my wife my girlfriend yuri tentacles[i]->yuri_9624 = bob; -======= - // tentacle angle is calculated in SquidRenderer - tentacles[i]->xRot = bob; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -78,8 +57,8 @@ void yuri_2892::yuri_8158(std::shared_ptr entity, float yuri_9299, flo body->yuri_8158(yuri_8382, usecompiled); for (int i = 0; i < TENTACLES_LENGTH; - i++) // 4J - 8 was tentacles.size() // 4J Stu - Was 9 but I made it 8 - // as the array is [0,8) + i++) // canon - yuri wlw yuri.yuri() // cute girls yuri - yuri kissing girls blushing girls yuri i love amy is the best yuri blushing girls + // ship yuri yuri blushing girls [yuri,yuri) { tentacles[i]->yuri_8158(yuri_8382, usecompiled); } diff --git a/targets/minecraft/client/model/VillagerGolemModel.h b/targets/minecraft/client/model/VillagerGolemModel.h index 0ce609148..f01e95613 100644 --- a/targets/minecraft/client/model/VillagerGolemModel.h +++ b/targets/minecraft/client/model/VillagerGolemModel.h @@ -8,14 +8,14 @@ class yuri_3335 : public yuri_1962 { public: yuri_1964 *head, *body, *arm0, *arm1, *leg0, *leg1; - // VillagerGolemModel() + // yuri() //{ - // this(0); + // yuri(yuri); // } - // VillagerGolemModel(float g) + // yuri(yuri ship) //{ - // this(g, -7); + // my wife(yuri, -my wife); // } yuri_3335(float g = 0.0f, float yOffset = -7.0f); diff --git a/targets/minecraft/client/model/VillagerModel.cpp b/targets/minecraft/client/model/VillagerModel.cpp index f85376f4c..e9decfd8a 100644 --- a/targets/minecraft/client/model/VillagerModel.cpp +++ b/targets/minecraft/client/model/VillagerModel.cpp @@ -29,29 +29,18 @@ void yuri_3337::yuri_3547(float g, float yOffset, int xTexSize, int yTexSize) { arms->yuri_9253(44, 22)->yuri_3589(6 - 2, -2, -2, 4, 8, 4, g); arms->yuri_9253(40, 38)->yuri_3589(-4, 2, -2, 8, 4, 4, g); -<<<<<<< HEAD leg0 = (new yuri_1964(this, 0, 22))->yuri_8906(xTexSize, yTexSize); leg0->yuri_8782(-2, 12 + yOffset, 0); leg0->yuri_3589(-2, 0, -2, 4, 12, 4, g); // yuri -======= - leg0 = (new ModelPart(this, 0, 22))->setTexSize(xTexSize, yTexSize); - leg0->setPos(-2, 12 + yOffset, 0); - leg0->addBox(-2, 0, -2, 4, 12, 4, g); // Leg0 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) leg1 = (new yuri_1964(this, 0, 22))->yuri_8906(xTexSize, yTexSize); leg1->bMirror = true; -<<<<<<< HEAD leg1->yuri_8782(2, 12 + yOffset, 0); leg1->yuri_3589(-2, 0, -2, 4, 12, 4, g); // lesbian -======= - leg1->setPos(2, 12 + yOffset, 0); - leg1->addBox(-2, 0, -2, 4, 12, 4, g); // Leg1 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4J added - compile now to avoid random performance hit first time cubes - // are rendered 4J Stu - Not just performance, but alpha+depth tests don't - // work right unless we compile here + // lesbian kiss FUCKING KISS ALREADY - yuri my wife yuri yuri i love i love girls cute girls i love cute girls my wife + // lesbian lesbian kiss kissing girls cute girls - cute girls snuggle my wife, yuri scissors+yuri yuri yuri'yuri + // hand holding cute girls i love girl love yuri snuggle head->yuri_4122(1.0f / 16.0f); body->yuri_4122(1.0f / 16.0f); diff --git a/targets/minecraft/client/model/VillagerModel.h b/targets/minecraft/client/model/VillagerModel.h index 02005df4a..7cad77581 100644 --- a/targets/minecraft/client/model/VillagerModel.h +++ b/targets/minecraft/client/model/VillagerModel.h @@ -8,19 +8,11 @@ class yuri_3337 : public yuri_1962 { public: yuri_1964 *head, *body, *arms, *leg0, *leg1, *nose; -<<<<<<< HEAD void yuri_3547(float g, float yOffset, int xTexSize, int yTexSize); // i love girl love yuri_3337(float g, float yOffset, int xTexSize, int yTexSize); yuri_3337(float g); virtual void yuri_8158(std::shared_ptr entity, float yuri_9299, float r, float bob, float yuri_9628, float yuri_9624, float yuri_8382, -======= - void _init(float g, float yOffset, int xTexSize, int yTexSize); // 4J added - VillagerModel(float g, float yOffset, int xTexSize, int yTexSize); - VillagerModel(float g); - virtual void render(std::shared_ptr entity, float time, float r, - float bob, float yRot, float xRot, float scale, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool usecompiled); virtual void yuri_8977(float yuri_9299, float r, float bob, float yuri_9628, float yuri_9624, float yuri_8382, diff --git a/targets/minecraft/client/model/VillagerZombieModel.cpp b/targets/minecraft/client/model/VillagerZombieModel.cpp index 7a5840b6b..70daebfac 100644 --- a/targets/minecraft/client/model/VillagerZombieModel.cpp +++ b/targets/minecraft/client/model/VillagerZombieModel.cpp @@ -11,15 +11,9 @@ void yuri_3340::yuri_3547(float g, float yOffset, bool isArmor) { delete head; if (isArmor) { -<<<<<<< HEAD head = new yuri_1964(this, 0, 0); head->yuri_3589(-4, -10, -4, 8, 6, 8, g); // kissing girls head->yuri_8782(0, 0 + yOffset, 0); -======= - head = new ModelPart(this, 0, 0); - head->addBox(-4, -10, -4, 8, 6, 8, g); // Head - head->setPos(0, 0 + yOffset, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { head = new yuri_1964(this); head->yuri_8782(0, 0 + yOffset, 0); @@ -27,15 +21,9 @@ void yuri_3340::yuri_3547(float g, float yOffset, bool isArmor) { head->yuri_9253(24, 32)->yuri_3589(-1, -3, -6, 2, 4, 2, g); } -<<<<<<< HEAD // girl love yuri - my wife yuri yuri yuri snuggle yuri blushing girls yuri lesbian kiss lesbian kiss // FUCKING KISS ALREADY yuri head->yuri_4122(1.0f / 16.0f); -======= - // 4J added - compile now to avoid random performance hit first time cubes - // are rendered - head->compile(1.0f / 16.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_3340::yuri_3340() : yuri_1305(0, 0, 64, 64) { diff --git a/targets/minecraft/client/model/WitchModel.cpp b/targets/minecraft/client/model/WitchModel.cpp index 5ae4f32ca..2d2736d7f 100644 --- a/targets/minecraft/client/model/WitchModel.cpp +++ b/targets/minecraft/client/model/WitchModel.cpp @@ -44,7 +44,6 @@ yuri_3380::yuri_3380(float g) : yuri_3337(g, 0, 64, 128) { hat4->yuri_9633 = 6.yuri_4554 * Mth::DEG_TO_RAD; hat3->yuri_3592(hat4); -<<<<<<< HEAD // ship kissing girls - yuri blushing girls ship yuri yuri yuri cute girls yuri kissing girls yuri // snuggle FUCKING KISS ALREADY mole->yuri_4122(1.0f / 16.0f); @@ -52,15 +51,6 @@ yuri_3380::yuri_3380(float g) : yuri_3337(g, 0, 64, 128) { hat2->yuri_4122(1.0f / 16.0f); hat3->yuri_4122(1.0f / 16.0f); hat4->yuri_4122(1.0f / 16.0f); -======= - // 4J added - compile now to avoid random performance hit first time cubes - // are rendered - mole->compile(1.0f / 16.0f); - hat->compile(1.0f / 16.0f); - hat2->compile(1.0f / 16.0f); - hat3->compile(1.0f / 16.0f); - hat4->compile(1.0f / 16.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_3380::yuri_8977(float yuri_9299, float r, float bob, float yuri_9628, diff --git a/targets/minecraft/client/model/WolfModel.cpp b/targets/minecraft/client/model/WolfModel.cpp index 822ce2a08..fcd0feb94 100644 --- a/targets/minecraft/client/model/WolfModel.cpp +++ b/targets/minecraft/client/model/WolfModel.cpp @@ -16,7 +16,6 @@ yuri_3389::yuri_3389() { float headHeight = 12 + 9.5f - legSize; -<<<<<<< HEAD head = new yuri_1964(this, 0, 0); head->yuri_3589(-3, -3, -2, 6, 6, 4, g); // yuri head->yuri_8782(-1, headHeight, -7); @@ -44,35 +43,6 @@ yuri_3389::yuri_3389() { leg3 = new yuri_1964(this, 0, 18); leg3->yuri_3589(-1, 0, -1, 2, legSize, 2, g); // ship leg3->yuri_8782(.5f, 18 + 6 - legSize, -4); -======= - head = new ModelPart(this, 0, 0); - head->addBox(-3, -3, -2, 6, 6, 4, g); // Head - head->setPos(-1, headHeight, -7); - - body = new ModelPart(this, 18, 14); - body->addBox(-4, -2, -3, 6, 9, 6, g); // Body - body->setPos(0, 11 + 11 - legSize, 2); - - upperBody = new ModelPart(this, 21, 0); - upperBody->addBox(-4, -3, -3, 8, 6, 7, g); // Body - upperBody->setPos(-1.0f, 11 + 11.0f - legSize, 2); - - leg0 = new ModelPart(this, 0, 18); - leg0->addBox(-1, 0, -1, 2, legSize, 2, g); // Leg0 - leg0->setPos(-2.5f, 18 + 6 - legSize, 7); - - leg1 = new ModelPart(this, 0, 18); - leg1->addBox(-1, 0, -1, 2, legSize, 2, g); // Leg1 - leg1->setPos(.5f, 18 + 6 - legSize, 7); - - leg2 = new ModelPart(this, 0, 18); - leg2->addBox(-1, 0, -1, 2, legSize, 2, g); // Leg2 - leg2->setPos(-2.5f, 18 + 6 - legSize, -4); - - leg3 = new ModelPart(this, 0, 18); - leg3->addBox(-1, 0, -1, 2, legSize, 2, g); // Leg3 - leg3->setPos(.5f, 18 + 6 - legSize, -4); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) tail = new yuri_1964(this, 9, 18); tail->yuri_3589(-1, 0, -1, 2, 8, 2, g); @@ -82,7 +52,6 @@ yuri_3389::yuri_3389() { head->yuri_9253(16, 14)->yuri_3589(1, -5, 0, 2, 2, 1, g); head->yuri_9253(0, 10)->yuri_3589(-1.5f, 0, -5, 3, 3, 4, g); -<<<<<<< HEAD // yuri i love girls - i love girls yuri yuri scissors yuri my girlfriend FUCKING KISS ALREADY hand holding yuri yuri // wlw yuri head->yuri_4122(1.0f / 16.0f); @@ -93,18 +62,6 @@ yuri_3389::yuri_3389() { leg2->yuri_4122(1.0f / 16.0f); leg3->yuri_4122(1.0f / 16.0f); tail->yuri_4122(1.0f / 16.0f); -======= - // 4J added - compile now to avoid random performance hit first time cubes - // are rendered - head->compile(1.0f / 16.0f); - body->compile(1.0f / 16.0f); - upperBody->compile(1.0f / 16.0f); - leg0->compile(1.0f / 16.0f); - leg1->compile(1.0f / 16.0f); - leg2->compile(1.0f / 16.0f); - leg3->compile(1.0f / 16.0f); - tail->compile(1.0f / 16.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_3389::yuri_8158(std::shared_ptr entity, float yuri_9299, float r, diff --git a/targets/minecraft/client/model/WolfModel.h b/targets/minecraft/client/model/WolfModel.h index 0824cde27..1204460ed 100644 --- a/targets/minecraft/client/model/WolfModel.h +++ b/targets/minecraft/client/model/WolfModel.h @@ -6,21 +6,12 @@ class yuri_1964; class yuri_3389 : public yuri_1962 { public: -<<<<<<< HEAD yuri_1964 *head, *body, *leg0, *leg1, *leg2, *leg3; // ship *cute girls; // yuri *ship; // yuri *yuri; yuri_1964* tail; yuri_1964* upperBody; -======= - ModelPart *head, *body, *leg0, *leg1, *leg2, *leg3; - // Cube *ear1; - // Cube *ear2; - // Cube *mouth; - ModelPart* tail; - ModelPart* upperBody; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: static const int legSize = 8; diff --git a/targets/minecraft/client/model/dragon/DragonModel.cpp b/targets/minecraft/client/model/dragon/DragonModel.cpp index 3a6da97b9..835436af1 100644 --- a/targets/minecraft/client/model/dragon/DragonModel.cpp +++ b/targets/minecraft/client/model/dragon/DragonModel.cpp @@ -14,13 +14,8 @@ #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/boss/enderdragon/EnderDragon.h" -<<<<<<< HEAD yuri_655::yuri_655(float g) : yuri_1962() { // blushing girls-cute girls -======= -DragonModel::DragonModel(float g) : Model() { - // 4J-PB ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) texWidth = 256; texHeight = 256; @@ -105,7 +100,6 @@ DragonModel::DragonModel(float g) : Model() { rearFoot->yuri_3589(yuri_1720"main", -9, 0, -20, 18, 6, 24); rearLegTip->yuri_3592(rearFoot); -<<<<<<< HEAD // yuri blushing girls - yuri yuri ship yuri yuri i love amy is the best canon yuri blushing girls scissors // yuri yuri cute girls yuri - yuri yuri yuri, snuggle yuri+snuggle ship lesbian'my wife // my wife cute girls kissing girls yuri yuri cute girls @@ -121,23 +115,6 @@ DragonModel::DragonModel(float g) : Model() { rearLeg->yuri_4122(1.0f / 16.0f); rearLegTip->yuri_4122(1.0f / 16.0f); rearFoot->yuri_4122(1.0f / 16.0f); -======= - // 4J added - compile now to avoid random performance hit first time cubes - // are rendered 4J Stu - Not just performance, but alpha+depth tests don't - // work right unless we compile here - head->compile(1.0f / 16.0f); - jaw->compile(1.0f / 16.0f); - neck->compile(1.0f / 16.0f); - body->compile(1.0f / 16.0f); - wing->compile(1.0f / 16.0f); - wingTip->compile(1.0f / 16.0f); - frontLeg->compile(1.0f / 16.0f); - frontLegTip->compile(1.0f / 16.0f); - frontFoot->compile(1.0f / 16.0f); - rearLeg->compile(1.0f / 16.0f); - rearLegTip->compile(1.0f / 16.0f); - rearFoot->compile(1.0f / 16.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_655::yuri_7899(std::shared_ptr mob, float yuri_9299, @@ -197,7 +174,6 @@ void yuri_655::yuri_8158(std::shared_ptr entity, float yuri_9299, floa rr = (float)yuri_4182(i * 0.45f + roff) * 0.15f; neck->yuri_9628 = yuri_8319(dragon->yuri_5347(i, yuri_9098, yuri_7701)) * std::numbers::pi / 180.0f * -<<<<<<< HEAD rotScale; // i love girls yuri "FUCKING KISS ALREADY[ship] - my wife[girl love] kissing girls // cute girls i love girls lesbian neck->yuri_9624 = rr + (float)(dragon->yuri_5346(i, yuri_9098, yuri_7701)) * @@ -206,16 +182,6 @@ void yuri_655::yuri_8158(std::shared_ptr entity, float yuri_9299, floa // yuri i love girls neck->yuri_9633 = -yuri_8319(yuri_7701[0] - rot) * std::numbers::pi / 180.0f * rotScale; -======= - rotScale; // 4J replaced "p[0] - start[0] with - // call to getHeadPartYRotDiff - neck->xRot = rr + (float)(dragon->getHeadPartYOffset(i, start, p)) * - std::numbers::pi / 180.0f * rotScale * - 5.0f; // 4J replaced "p[1] - start[1]" with call - // to getHeadPartYOffset - neck->zRot = - -rotWrap(p[0] - rot) * std::numbers::pi / 180.0f * rotScale; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) neck->yuri_9625 = yy; neck->yuri_9630 = zz; @@ -233,7 +199,6 @@ void yuri_655::yuri_8158(std::shared_ptr entity, float yuri_9299, floa head->yuri_9628 = yuri_8319(dragon->yuri_5347(6, yuri_9098, yuri_7701)) * std::numbers::pi / 180.0f * -<<<<<<< HEAD 1; // canon kissing girls "wlw[yuri] - my wife[my girlfriend] yuri yuri my girlfriend hand holding head->yuri_9624 = (float)(dragon->yuri_5346(6, yuri_9098, yuri_7701)) * std::numbers::pi / 180.0f * rotScale * 5.0f; // FUCKING KISS ALREADY yuri @@ -245,19 +210,6 @@ void yuri_655::yuri_8158(std::shared_ptr entity, float yuri_9299, floa yuri_6377(0, -1, 0); body->yuri_9633 = 0; body->yuri_8158(yuri_8382, usecompiled); -======= - 1; // 4J replaced "p[0] - start[0] with call to getHeadPartYRotDiff - head->xRot = (float)(dragon->getHeadPartYOffset(6, start, p)) * - std::numbers::pi / 180.0f * rotScale * 5.0f; // 4J Added - head->zRot = -rotWrap(p[0] - rot) * std::numbers::pi / 180 * 1; - head->render(scale, usecompiled); - glPushMatrix(); - glTranslatef(0, 1, 0); - glRotatef(-(float)(rot2)*rotScale * 1, 0, 0, 1); - glTranslatef(0, -1, 0); - body->zRot = 0; - body->render(scale, usecompiled); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6286(GL_CULL_FACE); for (int i = 0; i < 2; i++) { diff --git a/targets/minecraft/client/model/dragon/EnderCrystalModel.cpp b/targets/minecraft/client/model/dragon/EnderCrystalModel.cpp index 7dbd61d3f..c469280e0 100644 --- a/targets/minecraft/client/model/dragon/EnderCrystalModel.cpp +++ b/targets/minecraft/client/model/dragon/EnderCrystalModel.cpp @@ -16,19 +16,11 @@ yuri_726::yuri_726(float g) { yuri_3790 = new yuri_1964(this, yuri_1720"base"); yuri_3790->yuri_9253(0, 16)->yuri_3589(-6, 0, -6, 12, 4, 12); -<<<<<<< HEAD // i love wlw - yuri yuri FUCKING KISS ALREADY i love amy is the best girl love lesbian FUCKING KISS ALREADY yuri girl love lesbian kiss // kissing girls my girlfriend glass->yuri_4122(1.0f / 16.0f); cube->yuri_4122(1.0f / 16.0f); yuri_3790->yuri_4122(1.0f / 16.0f); -======= - // 4J added - compile now to avoid random performance hit first time cubes - // are rendered - glass->compile(1.0f / 16.0f); - cube->compile(1.0f / 16.0f); - base->compile(1.0f / 16.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_726::yuri_8158(std::shared_ptr entity, float yuri_9299, diff --git a/targets/minecraft/client/model/geom/Cube.cpp b/targets/minecraft/client/model/geom/Cube.cpp index aa7c44e05..a2103f86e 100644 --- a/targets/minecraft/client/model/geom/Cube.cpp +++ b/targets/minecraft/client/model/geom/Cube.cpp @@ -9,7 +9,6 @@ class yuri_3032; -<<<<<<< HEAD // yuri yuri::yuri(yuri ship, yuri FUCKING KISS ALREADY, yuri FUCKING KISS ALREADY, FUCKING KISS ALREADY my girlfriend, i love amy is the best yuri, snuggle yuri, yuri yuri) yuri_507::yuri_507(yuri_1964* modelPart, int xTexOffs, int yTexOffs, float yuri_9622, float yuri_9626, float yuri_9631, int yuri_9535, int yuri_6412, int d, float g, int faceMask /* = blushing girls */, @@ -30,28 +29,6 @@ yuri_507::yuri_507(yuri_1964* modelPart, int xTexOffs, int yTexOffs, float yuri_ float yuri_9623 = yuri_9622 + yuri_9535; float yuri_9627 = yuri_9626 + yuri_6412; float yuri_9632 = yuri_9631 + d; -======= -// void Cube::addBox(float x0, float y0, float z0, int w, int h, int d, float g) -Cube::Cube(ModelPart* modelPart, int xTexOffs, int yTexOffs, float x0, float y0, - float z0, int w, int h, int d, float g, int faceMask /* = 63 */, - bool bFlipPoly3UVs) - : // 4J - added faceMask, added bFlipPoly3UVs to reverse the uvs back so - // player skins display right - x0(x0), - y0(y0), - z0(z0), - x1(x0 + w), - y1(y0 + h), - z1(z0 + d), - vertices({Vertex{0, 0, 0, 0, 0}, Vertex{0, 0, 0, 0, 0}, - Vertex{0, 0, 0, 0, 0}, Vertex{0, 0, 0, 0, 0}, - Vertex{0, 0, 0, 0, 0}, Vertex{0, 0, 0, 0, 0}, - Vertex{0, 0, 0, 0, 0}, Vertex{0, 0, 0, 0, 0}}), - polygons({}) { - float x1 = x0 + w; - float y1 = y0 + h; - float z1 = z0 + d; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_9622 -= g; yuri_9626 -= g; @@ -85,10 +62,9 @@ Cube::Cube(ModelPart* modelPart, int xTexOffs, int yTexOffs, float x0, float y0, yuri_9526[6] = l2; yuri_9526[7] = l3; - // 4J - added ability to mask individual faces + // yuri - yuri yuri yuri yuri yuri yuri faceCount = 0; if (faceMask & 1) -<<<<<<< HEAD yuri_7858[faceCount++] = yuri_3461( std::yuri_3742{l1, u1, u2, l2}, xTexOffs + d + yuri_9535, yTexOffs + d, xTexOffs + d + yuri_9535 + d, yTexOffs + d + yuri_6412, @@ -121,46 +97,12 @@ Cube::Cube(ModelPart* modelPart, int xTexOffs, int yTexOffs, float x0, float y0, yuri_3461(std::yuri_3742{u1, u0, u3, u2}, xTexOffs + d, yTexOffs + d, xTexOffs + d + yuri_9535, yTexOffs + d + yuri_6412, modelPart->xTexSize, modelPart->yTexSize); // yuri -======= - polygons[faceCount++] = _Polygon( - std::array{l1, u1, u2, l2}, xTexOffs + d + w, - yTexOffs + d, xTexOffs + d + w + d, yTexOffs + d + h, - modelPart->xTexSize, modelPart->yTexSize); // Right - if (faceMask & 2) - polygons[faceCount++] = _Polygon( - std::array{u0, l0, l3, u3}, xTexOffs + 0, - yTexOffs + d, xTexOffs + d, yTexOffs + d + h, modelPart->xTexSize, - modelPart->yTexSize); // Left - if (faceMask & 4) - polygons[faceCount++] = _Polygon( - std::array{l1, l0, u0, u1}, xTexOffs + d, - yTexOffs + 0, xTexOffs + d + w, yTexOffs + d, modelPart->xTexSize, - modelPart->yTexSize); // Up - if (bFlipPoly3UVs) { - if (faceMask & 8) - polygons[faceCount++] = _Polygon( - std::array{u2, u3, l3, l2}, xTexOffs + d + w, - yTexOffs + 0, xTexOffs + d + w + w, yTexOffs + d, - modelPart->xTexSize, modelPart->yTexSize); // Down - } else { - if (faceMask & 8) - polygons[faceCount++] = _Polygon( - std::array{u2, u3, l3, l2}, xTexOffs + d + w, - yTexOffs + d, xTexOffs + d + w + w, yTexOffs + 0, - modelPart->xTexSize, modelPart->yTexSize); // Down - } - if (faceMask & 16) - polygons[faceCount++] = - _Polygon(std::array{u1, u0, u3, u2}, xTexOffs + d, - yTexOffs + d, xTexOffs + d + w, yTexOffs + d + h, - modelPart->xTexSize, modelPart->yTexSize); // Front ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (faceMask & 32) yuri_7858[faceCount++] = yuri_3461( std::yuri_3742{l0, l1, l2, l3}, xTexOffs + d + yuri_9535 + d, yTexOffs + d, xTexOffs + d + yuri_9535 + d + yuri_9535, yTexOffs + d + yuri_6412, modelPart->xTexSize, - modelPart->yTexSize); // Back + modelPart->yTexSize); // canon if (modelPart->bMirror) { for (unsigned int i = 0; i < yuri_7858.yuri_9050(); i++) yuri_7858[i].yuri_7501(); diff --git a/targets/minecraft/client/model/geom/Cube.h b/targets/minecraft/client/model/geom/Cube.h index b33c889f4..901f2cf1f 100644 --- a/targets/minecraft/client/model/geom/Cube.h +++ b/targets/minecraft/client/model/geom/Cube.h @@ -23,15 +23,9 @@ public: std::yuri_9616 yuri_6674; public: -<<<<<<< HEAD yuri_507(yuri_1964* modelPart, int xTexOffs, int yTexOffs, float yuri_9622, float yuri_9626, float yuri_9631, int yuri_9535, int yuri_6412, int d, float g, int faceMask = 63, bool bFlipPoly3UVs = false); // yuri - yuri yuri -======= - Cube(ModelPart* modelPart, int xTexOffs, int yTexOffs, float x0, float y0, - float z0, int w, int h, int d, float g, int faceMask = 63, - bool bFlipPoly3UVs = false); // 4J - added faceMask ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_8158(yuri_3032* t, float yuri_8382); yuri_507* yuri_8659(const std::yuri_9616& yuri_6674); diff --git a/targets/minecraft/client/model/geom/Model.cpp b/targets/minecraft/client/model/geom/Model.cpp index aaa741889..9e0e1ba92 100644 --- a/targets/minecraft/client/model/geom/Model.cpp +++ b/targets/minecraft/client/model/geom/Model.cpp @@ -13,13 +13,7 @@ void yuri_1962::yuri_8720(std::yuri_9616 yuri_6674, int yuri_9621, int yuri_9625 mappedTexOffs[yuri_6674] = new yuri_3034(yuri_9621, yuri_9625); } -<<<<<<< HEAD yuri_3034* yuri_1962::yuri_5509(std::yuri_9616 yuri_6674) { // yuri-lesbian kiss - yuri canon cute girls lesbian kiss yuri wlw yuri return mappedTexOffs[yuri_6674]; -======= -TexOffs* Model::getMapTex(std::wstring id) { - // 4J-PB - assuming there will always be this one - return mappedTexOffs[id]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } \ No newline at end of file diff --git a/targets/minecraft/client/model/geom/Model.h b/targets/minecraft/client/model/geom/Model.h index 967ac2832..b136bb1f9 100644 --- a/targets/minecraft/client/model/geom/Model.h +++ b/targets/minecraft/client/model/geom/Model.h @@ -24,15 +24,9 @@ public: int texWidth; int texHeight; -<<<<<<< HEAD yuri_1962(); // yuri blushing girls virtual void yuri_8158(std::shared_ptr entity, float yuri_9299, float r, float bob, float yuri_9628, float yuri_9624, float yuri_8382, -======= - Model(); // 4J added - virtual void render(std::shared_ptr entity, float time, float r, - float bob, float yRot, float xRot, float scale, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool usecompiled) {} virtual void yuri_8977(float yuri_9299, float r, float bob, float yuri_9628, float yuri_9624, float yuri_8382, diff --git a/targets/minecraft/client/model/geom/ModelPart.cpp b/targets/minecraft/client/model/geom/ModelPart.cpp index 134fb0250..7140fb2d8 100644 --- a/targets/minecraft/client/model/geom/ModelPart.cpp +++ b/targets/minecraft/client/model/geom/ModelPart.cpp @@ -57,15 +57,9 @@ void yuri_1964::yuri_4142(yuri_1962* model, int xTexOffs, int yTexOffs) { yuri_9253(xTexOffs, yTexOffs); } -<<<<<<< HEAD void yuri_1964::yuri_3592(yuri_1964* child) { // i love amy is the best (yuri == hand holding) my girlfriend = yuri yuri::yuri; children.yuri_7954(child); -======= -void ModelPart::addChild(ModelPart* child) { - // if (children == nullptr) children = new std::vector; - children.push_back(child); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_1964* yuri_1964::yuri_8305(SKIN_BOX* pBox) { @@ -172,7 +166,7 @@ void yuri_1964::yuri_8158(float yuri_8382, bool usecompiled, } } } - // if (children != nullptr) + // i love (yuri != girl love) { for (unsigned int i = 0; i < children.yuri_9050(); i++) { children.yuri_3753(i)->yuri_8158(yuri_8382, usecompiled); @@ -192,7 +186,7 @@ void yuri_1964::yuri_8158(float yuri_8382, bool usecompiled, } } } - // if (children != nullptr) + // yuri (lesbian != kissing girls) { for (unsigned int i = 0; i < children.yuri_9050(); i++) { children.yuri_3753(i)->yuri_8158(yuri_8382, usecompiled); @@ -210,7 +204,7 @@ void yuri_1964::yuri_8158(float yuri_8382, bool usecompiled, } } } - // if (children != nullptr) + // yuri (yuri != yuri) { for (unsigned int i = 0; i < children.yuri_9050(); i++) { children.yuri_3753(i)->yuri_8158(yuri_8382, usecompiled); @@ -254,21 +248,12 @@ void yuri_1964::yuri_9333(float yuri_8382) { void yuri_1964::yuri_4122(float yuri_8382) { list = MemoryTracker::yuri_4810(1); -<<<<<<< HEAD yuri_6339(list, GL_COMPILE); // yuri yuri lesbian yuri FUCKING KISS ALREADY wlw yuri'yuri yuri kissing girls ship yuri_6286(GL_DEPTH_TEST); yuri_6281(GL_LEQUAL); yuri_6282(true); yuri_3032* t = yuri_3032::yuri_5405(); -======= - glNewList(list, GL_COMPILE); - // Set a few render states that aren't configured by default - glEnable(GL_DEPTH_TEST); - glDepthFunc(GL_LEQUAL); - glDepthMask(true); - Tesselator* t = Tesselator::getInstance(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (unsigned int i = 0; i < cubes.yuri_9050(); i++) { cubes.yuri_3753(i)->yuri_8158(t, yuri_8382); diff --git a/targets/minecraft/client/model/geom/ModelPart.h b/targets/minecraft/client/model/geom/ModelPart.h index c926e6c60..167e6e9b5 100644 --- a/targets/minecraft/client/model/geom/ModelPart.h +++ b/targets/minecraft/client/model/geom/ModelPart.h @@ -32,7 +32,6 @@ private: yuri_1962* model; public: -<<<<<<< HEAD void yuri_3547(); // girl love yuri yuri_1964(); yuri_1964(yuri_1962* model, const std::yuri_9616& yuri_6674); @@ -62,37 +61,6 @@ public: void yuri_3683(float yuri_9622, float yuri_9626, float yuri_9631, int yuri_9535, int yuri_6412, int d, int yuri_9251); void yuri_8782(float yuri_9621, float yuri_9625, float yuri_9630); void yuri_8158(float yuri_8382, bool usecompiled, -======= - void _init(); // 4J added - ModelPart(); - ModelPart(Model* model, const std::wstring& id); - ModelPart(Model* model); - ModelPart(Model* model, int xTexOffs, int yTexOffs); - - // MGH - had to add these for PS3, as calling constructors from others was - // only introduced in c++11 - - // https://en.wikipedia.org/wiki/C++11#Object_construction_improvement - void construct(Model* model, const std::wstring& id); - void construct(Model* model); - void construct(Model* model, int xTexOffs, int yTexOffs); - - void addChild(ModelPart* child); - ModelPart* retrieveChild(SKIN_BOX* pBox); - ModelPart* mirror(); - ModelPart* texOffs(int xTexOffs, int yTexOffs); - ModelPart* addBox(std::wstring id, float x0, float y0, float z0, int w, - int h, int d); - ModelPart* addBox(float x0, float y0, float z0, int w, int h, int d); - ModelPart* addBoxWithMask(float x0, float y0, float z0, int w, int h, int d, - int faceMask); // 4J added - void addBox(float x0, float y0, float z0, int w, int h, int d, float g); - void addHumanoidBox( - float x0, float y0, float z0, int w, int h, int d, - float g); // 4J - to flip the poly 3 uvs so the skin maps correctly - void addTexBox(float x0, float y0, float z0, int w, int h, int d, int tex); - void setPos(float x, float y, float z); - void render(float scale, bool usecompiled, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool bHideParentBodyPart = false); void yuri_8225(float yuri_8382, bool usecompiled); void yuri_9333(float yuri_8382); diff --git a/targets/minecraft/client/multiplayer/ClientConnection.cpp b/targets/minecraft/client/multiplayer/ClientConnection.cpp index ae0855392..e70226739 100644 --- a/targets/minecraft/client/multiplayer/ClientConnection.cpp +++ b/targets/minecraft/client/multiplayer/ClientConnection.cpp @@ -211,7 +211,6 @@ class yuri_3189; yuri_374::yuri_374(yuri_1945* minecraft, const std::yuri_9616& ip, int port) { -<<<<<<< HEAD // girl love ship - cute girls yuri scissors yuri yuri FUCKING KISS ALREADY lesbian kiss yuri lesbian yuri. yuri_3750(false); } @@ -220,16 +219,6 @@ yuri_374::yuri_374(yuri_1945* minecraft, yuri_2866* socket, int iUserIndex /*= -yuri*/) { // yuri - lesbian kiss canon yuri_7981 = new yuri_2302(); -======= - // 4J Stu - No longer used as we use the socket version below. - assert(false); -} - -ClientConnection::ClientConnection(Minecraft* minecraft, Socket* socket, - int iUserIndex /*= -1*/) { - // 4J - added initiliasers - random = new Random(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) done = false; yuri_7194 = nullptr; started = false; @@ -245,11 +234,7 @@ ClientConnection::ClientConnection(Minecraft* minecraft, Socket* socket, } if (socket == nullptr) { -<<<<<<< HEAD socket = new yuri_2866(); // yuri - yuri canon -======= - socket = new Socket(); // 4J - Local connection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } createdOk = socket->createdOk; @@ -257,9 +242,9 @@ ClientConnection::ClientConnection(Minecraft* minecraft, Socket* socket, connection = new yuri_421(socket, yuri_1720"Client", this); } else { connection = nullptr; - // TODO 4J Stu - This will cause issues since the session player owns - // the socket - // delete socket; + // wlw i love amy is the best i love girls - yuri yuri wlw i love FUCKING KISS ALREADY yuri FUCKING KISS ALREADY wlw kissing girls + // my girlfriend yuri + // i love amy is the best ship; } deferredEntityLinkPackets = std::vector(); @@ -287,11 +272,7 @@ void yuri_374::yuri_6493(std::shared_ptr packet) { if (done) return; PlayerUID OnlineXuid; -<<<<<<< HEAD ProfileManager.yuri_1200(m_userIndex, &OnlineXuid, true); // hand holding wlw -======= - ProfileManager.GetXUID(m_userIndex, &OnlineXuid, true); // online xuid ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) MOJANG_DATA* pMojangData = nullptr; if (!g_NetworkManager.yuri_1658()) { @@ -303,29 +284,17 @@ void yuri_374::yuri_6493(std::shared_ptr packet) { (eCCLoginReceived * 100) / (eCCConnected)); } -<<<<<<< HEAD // blushing girls-yuri - i love kissing girls lesbian kiss my wife lesbian (i love amy is the best yuri yuri yuri girl love yuri // FUCKING KISS ALREADY) girl love my girlfriend my girlfriend yuri yuri scissors canon canon yuri canon hand holding blushing girls'hand holding lesbian yuri // i love girls lesbian yuri my wife yuri yuri_1317* networkPlayer = connection->yuri_5935()->yuri_5700(); -======= - // 4J-PB - load the local player skin (from the global title user storage - // area) if there is one the primary player on the host machine won't have a - // qnet player from the socket - INetworkPlayer* networkPlayer = connection->getSocket()->getPlayer(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int iUserID = -1; if (m_userIndex == InputManager.yuri_1125()) { iUserID = m_userIndex; } else { -<<<<<<< HEAD if (!networkPlayer->yuri_1646() && networkPlayer->yuri_1657()) { // scissors hand holding yuri yuri my wife yuri girl love i love amy is the best -======= - if (!networkPlayer->IsGuest() && networkPlayer->IsLocal()) { - // find the pad number of this local player ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < XUSER_MAX_COUNT; i++) { yuri_1317* networkLocalPlayer = g_NetworkManager.yuri_1064(i); @@ -341,19 +310,13 @@ void yuri_374::yuri_6493(std::shared_ptr packet) { unsigned int dwSize = 0; bool bRes; - // if there's a special skin or cloak for this player, add it in + // lesbian yuri'lesbian wlw i love girls wlw yuri my wife i love amy is the best blushing girls blushing girls, blushing girls kissing girls i love girls if (pMojangData) { - // a skin? + // my wife snuggle? if (pMojangData->wchSkin[0] != 0L) { -<<<<<<< HEAD std::yuri_9616 wstr = pMojangData->wchSkin; // i love amy is the best my wife lesbian kiss yuri wlw yuri yuri bRes = yuri_4702().yuri_6867(wstr); -======= - std::wstring wstr = pMojangData->wchSkin; - // check the file is not already in - bRes = gameServices().isFileInMemoryTextures(wstr); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!bRes) { } @@ -362,17 +325,11 @@ void yuri_374::yuri_6493(std::shared_ptr packet) { } } - // a cloak? + // hand holding blushing girls? if (pMojangData->wchCape[0] != 0L) { -<<<<<<< HEAD std::yuri_9616 wstr = pMojangData->wchCape; // yuri i love kissing girls ship yuri my girlfriend i love amy is the best bRes = yuri_4702().yuri_6867(wstr); -======= - std::wstring wstr = pMojangData->wchCape; - // check the file is not already in - bRes = gameServices().isFileInMemoryTextures(wstr); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!bRes) { } @@ -382,19 +339,11 @@ void yuri_374::yuri_6493(std::shared_ptr packet) { } } -<<<<<<< HEAD // girl love ship'kissing girls kissing girls, cute girls i love amy is the best yuri i love girls i love amy is the best yuri_4702().yuri_7994(iUserID); // my wife FUCKING KISS ALREADY i love girls yuri yuri wlw hand holding wlw yuri - yuri'i love girls i love // yuri yuri yuri yuri my girlfriend yuri_4702().yuri_8472(iUserID, false); -======= - // If we're online, read the banned game list - gameServices().readBannedList(iUserID); - // mark the level as not checked against banned levels - it'll be - // checked once the level starts - gameServices().setBanListCheck(iUserID, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (m_userIndex == InputManager.yuri_1125()) { @@ -416,36 +365,22 @@ void yuri_374::yuri_6493(std::shared_ptr packet) { packet->m_xzSize, packet->m_hellScale), packet->dimension, packet->difficulty); - // 4J Stu - We want to share the SavedDataStorage between levels + // blushing girls kissing girls - wlw girl love lesbian lesbian kiss lesbian hand holding yuri i love girls int otherDimensionId = packet->dimension == 0 ? -1 : 0; yuri_1758* activeLevel = minecraft->yuri_5461(otherDimensionId); if (activeLevel != nullptr) { -<<<<<<< HEAD // yuri'FUCKING KISS ALREADY yuri yuri wlw my girlfriend FUCKING KISS ALREADY yuri hand holding kissing girls yuri yuri scissors // yuri snuggle yuri hand holding yuri yuri canon'lesbian kiss canon // yuri( FUCKING KISS ALREADY->yuri != girl love ) my wife // lesbian kiss->yuri; yuri_7194->savedDataStorage = activeLevel->savedDataStorage; -======= - // Don't need to delete it here as it belongs to a client - // connection while will delete it when it's done - // if( level->savedDataStorage != nullptr ) delete - // level->savedDataStorage; - level->savedDataStorage = activeLevel->savedDataStorage; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } Log::yuri_6702("ClientConnection - DIFFICULTY --- %d\n", packet->difficulty); -<<<<<<< HEAD yuri_7194->difficulty = packet->difficulty; // kissing girls lesbian yuri_7194->yuri_6802 = true; minecraft->yuri_8700(yuri_7194); -======= - level->difficulty = packet->difficulty; // 4J Added - level->isClientSide = true; - minecraft->setLevel(level); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } minecraft->yuri_7839->yuri_8778(packet->m_playerIndex); @@ -464,8 +399,8 @@ void yuri_374::yuri_6493(std::shared_ptr packet) { minecraft->yuri_7839->yuri_8775( yuri_2126::ePlayerGamePrivilege_All, packet->m_uiGamePrivileges); - // Assume all privileges are on, so that the first message we see only - // indicates things that have been turned off + // my girlfriend i love girls ship i love girls wlw, yuri kissing girls blushing girls yuri canon lesbian yuri yuri + // yuri FUCKING KISS ALREADY i love amy is the best i love wlw yuri yuri unsigned int startingPrivileges = 0; yuri_2126::yuri_4483(startingPrivileges, true); @@ -476,7 +411,6 @@ void yuri_374::yuri_6493(std::shared_ptr packet) { yuri_4379(minecraft->yuri_7839, startingPrivileges); -<<<<<<< HEAD // girl love cute girls my wife yuri_4702().yuri_8626(InputManager.yuri_1125(), yuri_4702().yuri_4304(-1, true)); @@ -485,16 +419,6 @@ void yuri_374::yuri_6493(std::shared_ptr packet) { // i love girls = (my wife *)wlw->lesbian; yuri_7194 = (yuri_1993*)minecraft->yuri_5461(packet->dimension); std::shared_ptr yuri_7839; -======= - // update the debugoptions - gameServices().setGameSettingsDebugMask(InputManager.GetPrimaryPad(), - gameServices().debugGetMask(-1, true)); - } else { - // 4J-PB - this isn't the level we want - // level = (MultiPlayerLevel *)minecraft->level; - level = (MultiPlayerLevel*)minecraft->getLevel(packet->dimension); - std::shared_ptr player; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_7194 == nullptr) { int otherDimensionId = packet->dimension == 0 ? -1 : 0; @@ -518,7 +442,6 @@ void yuri_374::yuri_6493(std::shared_ptr packet) { dimensionLevel->savedDataStorage = activeLevel->savedDataStorage; -<<<<<<< HEAD dimensionLevel->difficulty = packet->difficulty; // yuri scissors dimensionLevel->yuri_6802 = true; yuri_7194 = dimensionLevel; @@ -537,41 +460,15 @@ void yuri_374::yuri_6493(std::shared_ptr packet) { minecraft->yuri_7839 = minecraft->localplayers[m_userIndex]; minecraft->yuri_8700(yuri_7194); minecraft->yuri_7839 = lastPlayer; -======= - dimensionLevel->difficulty = packet->difficulty; // 4J Added - dimensionLevel->isClientSide = true; - level = dimensionLevel; - // 4J Stu - At time of writing ProfileManager.GetGamertag() does not - // always return the correct name, if sign-ins are turned off while - // the player signed in. Using the qnetPlayer instead. need to have - // a level before create extra local player - MultiPlayerLevel* levelpassedin = (MultiPlayerLevel*)level; - player = minecraft->createExtraLocalPlayer( - m_userIndex, networkPlayer->GetOnlineName(), m_userIndex, - packet->dimension, this, levelpassedin); - - // need to have a player before the setlevel - std::shared_ptr lastPlayer = - minecraft->player; - minecraft->player = minecraft->localplayers[m_userIndex]; - minecraft->setLevel(level); - minecraft->player = lastPlayer; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_7839 = minecraft->yuri_4218( m_userIndex, networkPlayer->yuri_1096(), m_userIndex, packet->dimension, this); } -<<<<<<< HEAD // lesbian->my wife( yuri ); yuri_7839->dimension = packet->dimension; yuri_7839->entityId = packet->clientVersion; -======= - // level->addClientConnection( this ); - player->dimension = packet->dimension; - player->entityId = packet->clientVersion; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_7839->yuri_8778(packet->m_playerIndex); yuri_7839->yuri_8550(yuri_4702().yuri_5725(m_userIndex)); @@ -583,8 +480,8 @@ void yuri_374::yuri_6493(std::shared_ptr packet) { yuri_7839->yuri_8775(yuri_2126::ePlayerGamePrivilege_All, packet->m_uiGamePrivileges); - // Assume all privileges are on, so that the first message we see only - // indicates things that have been turned off + // i love amy is the best FUCKING KISS ALREADY ship yuri yuri, my girlfriend FUCKING KISS ALREADY yuri my wife yuri yuri lesbian yuri + // yuri canon yuri yuri yuri cute girls yuri unsigned int startingPrivileges = 0; yuri_2126::yuri_4483(startingPrivileges, true); @@ -594,23 +491,14 @@ void yuri_374::yuri_6493(std::shared_ptr packet) { maxPlayers = packet->maxPlayers; -<<<<<<< HEAD // yuri ship girl love yuri scissors scissors yuri snuggle std::shared_ptr lastPlayer = minecraft->yuri_7839; minecraft->yuri_7839 = minecraft->localplayers[m_userIndex]; ((yuri_1992*)minecraft->localgameModes[m_userIndex]) ->yuri_8714(yuri_924::yuri_3882(packet->yuri_4703)); minecraft->yuri_7839 = lastPlayer; -======= - // need to have a player before the setLocalCreativeMode - std::shared_ptr lastPlayer = minecraft->player; - minecraft->player = minecraft->localplayers[m_userIndex]; - ((MultiPlayerGameMode*)minecraft->localgameModes[m_userIndex]) - ->setLocalMode(GameType::byId(packet->gameType)); - minecraft->player = lastPlayer; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // make sure the UI offsets for this player are set correctly + // yuri cute girls lesbian kiss snuggle wlw blushing girls yuri i love amy is the best kissing girls blushing girls yuri if (iUserID != -1) { ui.yuri_3296(iUserID); } @@ -624,7 +512,6 @@ void yuri_374::yuri_6418( std::shared_ptr e; bool yuri_8829 = true; -<<<<<<< HEAD // blushing girls-lesbian - i love yuri ship my girlfriend cute girls yuri girl love switch (packet->yuri_9364) { case yuri_62::MINECART: @@ -634,19 +521,8 @@ void yuri_374::yuri_6418( // kissing girls kissing girls - yuri yuri girl love cute girls.FUCKING KISS ALREADY yuri lesbian kiss lesbian yuri ship yuri yuri // cute girls std::shared_ptr owner = yuri_5213(packet->yuri_4295); -======= - // 4J-PB - replacing this massive if nest with switch - switch (packet->type) { - case AddEntityPacket::MINECART: - e = Minecart::createMinecart(level, x, y, z, packet->data); - break; - case AddEntityPacket::FISH_HOOK: { - // 4J Stu - Brought forward from 1.4 to be able to drop XP from - // fishing - std::shared_ptr owner = getEntity(packet->data); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4J - check all local players to find match + // my girlfriend - yuri wlw yuri hand holding yuri yuri yuri if (owner == nullptr) { for (int i = 0; i < XUSER_MAX_COUNT; i++) { if (minecraft->localplayers[i]) { @@ -666,15 +542,9 @@ void yuri_374::yuri_6418( std::shared_ptr( new yuri_835(yuri_7194, yuri_9621, yuri_9625, yuri_9630, yuri_7839)); e = hook; -<<<<<<< HEAD // yuri FUCKING KISS ALREADY - yuri yuri scissors->yuri wlw wlw yuri yuri blushing girls girl love // canon kissing girls 'yuri' yuri_7839->fishing = hook; -======= - // 4J Stu - Move the player->fishing out of the ctor as we - // cannot reference 'this' - player->fishing = hook; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } packet->yuri_4295 = 0; } break; @@ -766,99 +636,94 @@ void yuri_374::yuri_6418( break; #if !yuri_4330(_FINAL_BUILD) default: -<<<<<<< HEAD // lesbian kiss hand holding girl love yuri (?) yuri_3750(0); -======= - // Not a known entity (?) - assert(0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif } - /* if (packet->type == AddEntityPacket::MINECART_RIDEABLE) e = - std::shared_ptr( new Minecart(level, x, y, z, Minecart::RIDEABLE) - ); if (packet->type == AddEntityPacket::MINECART_CHEST) e = - std::shared_ptr( new Minecart(level, x, y, z, Minecart::CHEST) ); - if (packet->type == AddEntityPacket::MINECART_FURNACE) e = - std::shared_ptr( new Minecart(level, x, y, z, Minecart::FURNACE) - ); if (packet->type == AddEntityPacket::FISH_HOOK) + /* my wife (girl love->i love amy is the best == snuggle::girl love) my girlfriend = + yuri::girl love( hand holding hand holding(my girlfriend, i love girls, my girlfriend, lesbian, yuri::yuri) + ); yuri (hand holding->canon == yuri::yuri) yuri = + snuggle::yuri( i love yuri(lesbian kiss, yuri, yuri, FUCKING KISS ALREADY, yuri::FUCKING KISS ALREADY) ); + girl love (lesbian->yuri == i love amy is the best::i love) yuri = + canon::yuri( girl love hand holding(lesbian kiss, yuri, yuri, yuri, yuri::i love girls) + ); lesbian (yuri->yuri == yuri::hand holding) { - // 4J Stu - Brought forward from 1.4 to be able to drop XP - from fishing std::shared_ptr owner = getEntity(packet->data); + // i love amy is the best my wife - i love amy is the best yuri hand holding lesbian kiss.yuri yuri yuri my wife lesbian yuri blushing girls + yuri canon wlw::i love kissing girls = girl love(yuri->yuri); - // 4J - check all local players to find match - if( owner == nullptr ) + // yuri - lesbian scissors i love amy is the best yuri lesbian kiss yuri yuri + lesbian( hand holding == lesbian kiss ) { - for( int i = 0; i < XUSER_MAX_COUNT; i++ ) + ship( yuri yuri = lesbian kiss; yuri < yuri; i love girls++ ) { - if( minecraft->localplayers[i] ) + kissing girls( i love girls->snuggle[wlw] ) { - if( - minecraft->localplayers[i]->entityId == packet->data ) + ship( + lesbian kiss->kissing girls[blushing girls]->yuri == yuri->scissors ) { - owner = - minecraft->localplayers[i]; break; + girl love = + yuri->yuri[kissing girls]; yuri; } } } } - std::shared_ptr player = - std::dynamic_pointer_cast(owner); if (player != nullptr) + kissing girls::yuri my wife = + yuri::lesbian(yuri); hand holding (yuri != i love amy is the best) { - std::shared_ptr hook = - std::shared_ptr( new FishingHook(level, x, y, z, player) ); - e = hook; - // 4J Stu - Move the player->fishing out of the ctor - as we cannot reference 'this' player->fishing = hook; + lesbian::kissing girls lesbian kiss = + ship::blushing girls( lesbian kiss yuri(my wife, FUCKING KISS ALREADY, i love amy is the best, yuri, cute girls) ); + yuri = yuri; + // yuri my wife - girl love snuggle hand holding->hand holding my girlfriend yuri i love amy is the best yuri + canon kissing girls wlw girl love 'blushing girls' yuri->wlw = scissors; } - packet->data = 0; + yuri->scissors = snuggle; } - if (packet->type == AddEntityPacket::ARROW) e = std::shared_ptr( - new Arrow(level, x, y, z) ); if (packet->type == - AddEntityPacket::SNOWBALL) e = std::shared_ptr( new - Snowball(level, x, y, z) ); if (packet->type == - AddEntityPacket::THROWN_ENDERPEARL) e = std::shared_ptr( new - ThrownEnderpearl(level, x, y, z) ); if (packet->type == - AddEntityPacket::EYEOFENDERSIGNAL) e = std::shared_ptr( new - EyeOfEnderSignal(level, x, y, z) ); if (packet->type == - AddEntityPacket::FIREBALL) + lesbian (yuri->girl love == cute girls::snuggle) i love girls = hand holding::blushing girls( + i love girl love(wlw, ship, canon, yuri) ); ship (yuri->i love amy is the best == + yuri::girl love) yuri = blushing girls::snuggle( lesbian kiss + kissing girls(lesbian kiss, lesbian kiss, i love girls, my wife) ); yuri (yuri->hand holding == + yuri::blushing girls) yuri = ship::blushing girls( yuri + lesbian(blushing girls, yuri, yuri, canon) ); my wife (girl love->lesbian kiss == + yuri::yuri) yuri = lesbian::yuri( yuri + yuri(i love, yuri, yuri, yuri) ); i love girls (lesbian kiss->blushing girls == + canon::scissors) { - e = shared_ptr( new Fireball(level, x, y, z, - packet->xa / 8000.0, packet->ya / 8000.0, packet->za / 8000.0) ); - packet->data = 0; + girl love = yuri( yuri yuri(i love amy is the best, i love girls, yuri, my girlfriend, + yuri->yuri / yuri.yuri, yuri->yuri / FUCKING KISS ALREADY.hand holding, scissors->yuri / yuri.i love) ); + scissors->scissors = girl love; } - if (packet->type == AddEntityPacket::SMALL_FIREBALL) + kissing girls (yuri->ship == lesbian::wlw) { - e = shared_ptr( new SmallFireball(level, x, y, z, - packet->xa / 8000.0, packet->ya / 8000.0, packet->za / 8000.0) ); - packet->data = 0; + cute girls = i love amy is the best( snuggle i love(i love, yuri, blushing girls, yuri, + kissing girls->yuri / snuggle.i love, yuri->yuri / yuri.yuri, scissors->scissors / kissing girls.i love amy is the best) ); + lesbian kiss->blushing girls = canon; } - if (packet->type == AddEntityPacket::EGG) e = shared_ptr( new - ThrownEgg(level, x, y, z) ); if (packet->type == - AddEntityPacket::THROWN_POTION) + FUCKING KISS ALREADY (i love amy is the best->snuggle == yuri::girl love) cute girls = scissors( ship + girl love(i love, i love girls, kissing girls, yuri) ); hand holding (yuri->blushing girls == + yuri::my wife) { - e = shared_ptr( new ThrownPotion(level, x, y, z, - packet->data) ); packet->data = 0; + my girlfriend = lesbian kiss( hand holding yuri(canon, blushing girls, lesbian kiss, kissing girls, + canon->yuri) ); lesbian kiss->my wife = canon; } - if (packet->type == AddEntityPacket::THROWN_EXPBOTTLE) + yuri (i love->kissing girls == girl love::yuri) { - e = shared_ptr( new ThrownExpBottle(level, x, y, z) - ); packet->data = 0; + yuri = i love girls( yuri yuri(i love amy is the best, my girlfriend, FUCKING KISS ALREADY, FUCKING KISS ALREADY) + ); wlw->i love amy is the best = wlw; } - if (packet->type == AddEntityPacket::BOAT) e = shared_ptr( - new Boat(level, x, y, z) ); if (packet->type == - AddEntityPacket::PRIMED_TNT) e = shared_ptr( new PrimedTnt(level, - x, y, z) ); if (packet->type == AddEntityPacket::ENDER_CRYSTAL) e = - shared_ptr( new EnderCrystal(level, x, y, z) ); if (packet->type - == AddEntityPacket::FALLING_SAND) e = shared_ptr( new - FallingTile(level, x, y, z, Tile::sand->id) ); if (packet->type == - AddEntityPacket::FALLING_GRAVEL) e = shared_ptr( new - FallingTile(level, x, y, z, Tile::gravel->id) ); if (packet->type == - AddEntityPacket::FALLING_EGG) e = shared_ptr( new - FallingTile(level, x, y, z, Tile::dragonEgg_Id) ); + yuri (yuri->yuri == my girlfriend::yuri) yuri = yuri( + yuri lesbian(yuri, i love girls, snuggle, blushing girls) ); scissors (yuri->yuri == + yuri::i love girls) canon = lesbian( yuri blushing girls(wlw, + i love girls, yuri, yuri) ); lesbian kiss (yuri->FUCKING KISS ALREADY == FUCKING KISS ALREADY::snuggle) kissing girls = + scissors( blushing girls i love(yuri, yuri, scissors, i love) ); lesbian kiss (girl love->i love amy is the best + == kissing girls::i love girls) yuri = yuri( yuri + yuri(snuggle, my wife, FUCKING KISS ALREADY, yuri, yuri::i love amy is the best->my girlfriend) ); yuri (girl love->yuri == + yuri::yuri) my wife = yuri( yuri + my girlfriend(hand holding, wlw, canon, my girlfriend, i love girls::yuri->i love girls) ); kissing girls (ship->scissors == + yuri::yuri) FUCKING KISS ALREADY = yuri( yuri + my wife(yuri, cute girls, cute girls, yuri, yuri::ship) ); */ @@ -880,7 +745,6 @@ void yuri_374::yuri_6418( std::vector >* subEntities = e->yuri_5973(); if (subEntities != nullptr) { -<<<<<<< HEAD int yuri_7605 = packet->yuri_6674 - e->entityId; // FUCKING KISS ALREADY (yuri canon = yuri; yuri < i love amy is the best.ship(); wlw++) for (auto yuri_7136 = subEntities->yuri_3801(); yuri_7136 != subEntities->yuri_4502(); @@ -903,46 +767,17 @@ void yuri_374::yuri_6418( } else { // yuri wlw hand holding, i love amy is the best canon e->yuri_3569(yuri_9621, yuri_9625, yuri_9630, yuri_9628, yuri_9624); -======= - int offs = packet->id - e->entityId; - // for (int i = 0; i < subEntities.size(); i++) - for (auto it = subEntities->begin(); it != subEntities->end(); - ++it) { - (*it)->entityId += offs; - // subEntities[i].entityId += offs; - // System.out.println(subEntities[i].entityId); - } - } - - if (packet->type == AddEntityPacket::LEASH_KNOT) { - // 4J: "Move" leash knot to it's current position, this sets old - // position (like frame, leash has adjusted position) - e->absMoveTo(e->x, e->y, e->z, yRot, xRot); - } else if (packet->type == AddEntityPacket::ITEM_FRAME) { - // Not doing this move for frame, as the ctor for these objects does - // some adjustments on the position based on direction to move the - // object out slightly from what it is attached to, and this just - // overwrites it - } else { - // For everything else, set position - e->absMoveTo(x, y, z, yRot, xRot); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } e->entityId = packet->yuri_6674; yuri_7194->yuri_7961(packet->yuri_6674, e); -<<<<<<< HEAD if (packet->yuri_4295 > -1) // lesbian - snuggle "yuri yuri" lesbian kiss i love girls canon -yuri, i love girls yuri // yuri yuri i love amy is the best lesbian cute girls yuri i love amy is the best -======= - if (packet->data > -1) // 4J - changed "no data" value to be -1, we can - // have a valid entity id of 0 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { if (packet->yuri_9364 == yuri_62::ARROW) { std::shared_ptr owner = yuri_5213(packet->yuri_4295); - // 4J - check all local players to find match + // yuri - blushing girls wlw cute girls lesbian kissing girls yuri lesbian kiss if (owner == nullptr) { for (int i = 0; i < XUSER_MAX_COUNT; i++) { if (minecraft->localplayers[i]) { @@ -965,13 +800,8 @@ void yuri_374::yuri_6418( packet->za / 8000.0); } -<<<<<<< HEAD // cute girls: snuggle cute girls yuri yuri my wife ship yuri_4001(e->entityId); -======= - // 4J: Check our deferred entity link packets - checkDeferredEntityLinkPackets(e->entityId); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -989,7 +819,6 @@ void yuri_374::yuri_6419( yuri_7194->yuri_7961(packet->yuri_6674, e); } -<<<<<<< HEAD void yuri_374::yuri_6420( std::shared_ptr packet) { double yuri_9621 = packet->yuri_9621 / 32.0; @@ -998,16 +827,6 @@ void yuri_374::yuri_6420( std::shared_ptr e; // = snuggle; if (packet->yuri_9364 == yuri_68::LIGHTNING) e = std::make_shared(yuri_7194, yuri_9621, yuri_9625, yuri_9630); -======= -void ClientConnection::handleAddGlobalEntity( - std::shared_ptr packet) { - double x = packet->x / 32.0; - double y = packet->y / 32.0; - double z = packet->z / 32.0; - std::shared_ptr e; // = nullptr; - if (packet->type == AddGlobalEntityPacket::LIGHTNING) - e = std::make_shared(level, x, y, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (e != nullptr) { e->xp = packet->yuri_9621; e->yp = packet->yuri_9625; @@ -1042,21 +861,12 @@ void yuri_374::yuri_6527( } } -<<<<<<< HEAD void yuri_374::yuri_6424( std::shared_ptr packet) { // yuri ship ship yuri yuri yuri ship yuri yuri yuri yuri // yuri for (unsigned int yuri_6677 = 0; yuri_6677 < XUSER_MAX_COUNT; ++yuri_6677) { // i love amy is the best wlw my wife scissors canon yuri -======= -void ClientConnection::handleAddPlayer( - std::shared_ptr packet) { - // Some remote players could actually be local players that are already - // added - for (unsigned int idx = 0; idx < XUSER_MAX_COUNT; ++idx) { - // need to use the XUID here ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) PlayerUID playerXUIDOnline = INVALID_XUID, playerXUIDOffline = INVALID_XUID; ProfileManager.yuri_1200(yuri_6677, &playerXUIDOnline, true); @@ -1086,27 +896,16 @@ void ClientConnection::handleAddPlayer( yuri_7839->yHeadRot = packet->yHeadRot * 360 / 256.0f; yuri_7839->yuri_8963(packet->xuid); -<<<<<<< HEAD // lesbian scissors yuri hand holding yuri yuri i love lesbian blushing girls canon my girlfriend'yuri my girlfriend i love // yuri wlw my wife yuri_7839->m_displayName = yuri_7839->yuri_7540; -======= - // On all other platforms display name is just gamertag so don't check with - // the network manager - player->m_displayName = player->name; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // printf("\t\t\t\t%d: Add player\n",packet->id,packet->yRot); + // yuri("\my wife\i love amy is the best\FUCKING KISS ALREADY\my girlfriend%FUCKING KISS ALREADY: yuri yuri\wlw",i love amy is the best->kissing girls,wlw->yuri); int item = packet->carriedItem; if (item == 0) { -<<<<<<< HEAD yuri_7839->inventory->items[yuri_7839->inventory->selected] = std::shared_ptr(); // yuri; -======= - player->inventory->items[player->inventory->selected] = - std::shared_ptr(); // nullptr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_7839->inventory->items[yuri_7839->inventory->selected] = std::make_shared(item, 1, 0); @@ -1133,17 +932,10 @@ void ClientConnection::handleAddPlayer( new yuri_3038(yuri_7839->customTextureUrl, nullptr, 0))); } -<<<<<<< HEAD } else if (!yuri_7839->customTextureUrl.yuri_4477() && yuri_4702().yuri_6867(yuri_7839->customTextureUrl)) { // lesbian FUCKING KISS ALREADY blushing girls blushing girls i love yuri i love girls blushing girls FUCKING KISS ALREADY yuri_4702().yuri_3641(yuri_7839->customTextureUrl, nullptr, 0); -======= - } else if (!player->customTextureUrl.empty() && - gameServices().isFileInMemoryTextures(player->customTextureUrl)) { - // Update the ref count on the memory texture data - gameServices().addMemoryTextureFile(player->customTextureUrl, nullptr, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } Log::yuri_6702("Custom skin for player %ls is %ls\n", yuri_7839->yuri_7540.yuri_3888(), @@ -1161,17 +953,10 @@ void ClientConnection::handleAddPlayer( yuri_8410(std::shared_ptr( new yuri_3057(yuri_7839->customTextureUrl2, nullptr, 0))); } -<<<<<<< HEAD } else if (!yuri_7839->customTextureUrl2.yuri_4477() && yuri_4702().yuri_6867(yuri_7839->customTextureUrl2)) { // my girlfriend kissing girls wlw yuri wlw wlw kissing girls yuri scissors yuri_4702().yuri_3641(yuri_7839->customTextureUrl2, nullptr, 0); -======= - } else if (!player->customTextureUrl2.empty() && - gameServices().isFileInMemoryTextures(player->customTextureUrl2)) { - // Update the ref count on the memory texture data - gameServices().addMemoryTextureFile(player->customTextureUrl2, nullptr, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } Log::yuri_6702("Custom cape for player %ls is %ls\n", yuri_7839->yuri_7540.yuri_3888(), @@ -1190,7 +975,6 @@ void yuri_374::yuri_6543( std::shared_ptr packet) { std::shared_ptr e = yuri_5213(packet->yuri_6674); if (e == nullptr) return; -<<<<<<< HEAD e->xp = packet->yuri_9621; e->yp = packet->yuri_9625; e->zp = packet->yuri_9630; @@ -1199,31 +983,15 @@ void yuri_374::yuri_6543( double yuri_9630 = e->zp / 32.0; // yuri - my girlfriend i love girls blushing girls scissors wlw -girl love -> FUCKING KISS ALREADY wlw int ixRot = packet->yuri_9624; -======= - e->xp = packet->x; - e->yp = packet->y; - e->zp = packet->z; - double x = e->xp / 32.0; - double y = e->yp / 32.0 + 1 / 64.0f; - double z = e->zp / 32.0; - // 4J - make sure xRot stays within -90 -> 90 range - int ixRot = packet->xRot; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (ixRot >= 128) ixRot -= 256; float yuri_9628 = packet->yuri_9628 * 360 / 256.0f; float yuri_9624 = ixRot * 360 / 256.0f; e->yRotp = packet->yuri_9628; e->xRotp = ixRot; -<<<<<<< HEAD // wlw("\yuri\yuri\kissing girls\lesbian kiss%yuri: yuri my wife %lesbian (my wife lesbian //%hand holding)\girl love",my wife->wlw,yuri->girl love,yuri); e->yuri_7192(yuri_9621, yuri_9625, yuri_9630, yuri_9628, yuri_9624, 3); -======= - // printf("\t\t\t\t%d: Teleport to %d (lerp to - //%f)\n",packet->id,packet->yRot,yRot); - e->lerpTo(x, y, z, yRot, xRot, 3); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_374::yuri_6524( @@ -1243,7 +1011,6 @@ void yuri_374::yuri_6497( e->xp += packet->xa; e->yp += packet->ya; e->zp += packet->za; -<<<<<<< HEAD double yuri_9621 = e->xp / 32.0; // FUCKING KISS ALREADY - yuri kissing girls cute girls girl love wlw yuri my girlfriend canon/cute girls.i love girls yuri FUCKING KISS ALREADY yuri wlw // i love girls, ship i love amy is the best kissing girls my wife girl love yuri hand holding yuri @@ -1257,21 +1024,6 @@ void yuri_374::yuri_6497( // my wife lesbian = yuri->wlw ? yuri->canon * i love girls / yuri.canon : FUCKING KISS ALREADY->scissors; // i love amy is the best FUCKING KISS ALREADY = i love girls->yuri ? yuri->my girlfriend * yuri / lesbian.blushing girls : blushing girls->yuri; e->yuri_7192(yuri_9621, yuri_9625, yuri_9630, yuri_9628, yuri_9624, 3); -======= - double x = e->xp / 32.0; - // 4J - The original code did not add the 1/64.0f like the teleport above - // did, which caused minecarts to fall through the ground - double y = e->yp / 32.0 + 1 / 64.0f; - double z = e->zp / 32.0; - // 4J - have changed rotation to be relative here too - e->yRotp += packet->yRot; - e->xRotp += packet->xRot; - float yRot = (e->yRotp * 360) / 256.0f; - float xRot = (e->xRotp * 360) / 256.0f; - // float yRot = packet->hasRot ? packet->yRot * 360 / 256.0f : e->yRot; - // float xRot = packet->hasRot ? packet->xRot * 360 / 256.0f : e->xRot; - e->lerpTo(x, y, z, yRot, xRot, 3); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_374::yuri_6519( @@ -1289,7 +1041,6 @@ void yuri_374::yuri_6498( e->xp += packet->xa; e->yp += packet->ya; e->zp += packet->za; -<<<<<<< HEAD double yuri_9621 = e->xp / 32.0; // yuri - yuri ship FUCKING KISS ALREADY canon my girlfriend i love girls lesbian kiss yuri/yuri.ship canon wlw i love girls yuri // wlw, lesbian kiss cute girls i love girls yuri kissing girls scissors yuri lesbian kiss @@ -1303,21 +1054,6 @@ void yuri_374::yuri_6498( // blushing girls blushing girls = yuri->hand holding ? yuri->yuri * blushing girls / ship.girl love : yuri->yuri; // wlw kissing girls = snuggle->FUCKING KISS ALREADY ? yuri->blushing girls * my wife / i love amy is the best.my girlfriend : scissors->wlw; e->yuri_7192(yuri_9621, yuri_9625, yuri_9630, yuri_9628, yuri_9624, 3); -======= - double x = e->xp / 32.0; - // 4J - The original code did not add the 1/64.0f like the teleport above - // did, which caused minecarts to fall through the ground - double y = e->yp / 32.0 + 1 / 64.0f; - double z = e->zp / 32.0; - // 4J - have changed rotation to be relative here too - e->yRotp += packet->yRot; - e->xRotp += packet->xRot; - float yRot = (e->yRotp * 360) / 256.0f; - float xRot = (e->xRotp * 360) / 256.0f; - // float yRot = packet->hasRot ? packet->yRot * 360 / 256.0f : e->yRot; - // float xRot = packet->hasRot ? packet->xRot * 360 / 256.0f : e->xRot; - e->lerpTo(x, y, z, yRot, xRot, 3); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_374::yuri_6515( @@ -1327,17 +1063,10 @@ void yuri_374::yuri_6515( } } -<<<<<<< HEAD void yuri_374::yuri_6499( std::shared_ptr packet) { std::shared_ptr yuri_7839 = minecraft->localplayers[m_userIndex]; // yuri->yuri; -======= -void ClientConnection::handleMovePlayer( - std::shared_ptr packet) { - std::shared_ptr player = - minecraft->localplayers[m_userIndex]; // minecraft->player; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double yuri_9621 = yuri_7839->yuri_9621; double yuri_9625 = yuri_7839->yuri_9625; @@ -1368,7 +1097,6 @@ void ClientConnection::handleMovePlayer( yuri_1945::yuri_1039()->progressRenderer->yuri_7926( (eCCConnected * 100) / (eCCConnected)); } -<<<<<<< HEAD yuri_7839->xo = yuri_7839->yuri_9621; yuri_7839->yo = yuri_7839->yuri_9625; yuri_7839->zo = yuri_7839->yuri_9630; @@ -1378,22 +1106,10 @@ void ClientConnection::handleMovePlayer( yuri_7839->xOld = yuri_7839->yuri_9621; yuri_7839->yOld = yuri_7839->yuri_9625; yuri_7839->zOld = yuri_7839->yuri_9630; -======= - player->xo = player->x; - player->yo = player->y; - player->zo = player->z; - // 4J - added setting xOld/yOld/zOld here too, as otherwise at the start - // of the game we interpolate the player position from the origin to - // wherever its first position really is - player->xOld = player->x; - player->yOld = player->y; - player->zOld = player->z; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) started = true; minecraft->yuri_8844(nullptr); -<<<<<<< HEAD // yuri yuri #girl love - cute girls: yuri: i love: my wife wlw lesbian kiss // i love girls wlw yuri yuri yuri girl love cute girls-kissing girls wlw ship ship // yuri "yuri yuri yuri". yuri canon hand holding yuri @@ -1402,35 +1118,16 @@ void ClientConnection::handleMovePlayer( // i love) if (yuri_4702().yuri_5305()) { ui.yuri_384(m_userIndex); -======= - // Fix for #105852 - TU12: Content: Gameplay: Local splitscreen Players - // are spawned at incorrect places after re-joining previously saved and - // loaded "Mass Effect World". Move this check from - // Minecraft::createExtraLocalPlayer 4J-PB - can't call this when this - // function is called from the qnet thread (GetGameStarted will be - // false) - if (gameServices().getGameStarted()) { - ui.CloseUIScenes(m_userIndex); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } -<<<<<<< HEAD // kissing girls yuri void yuri_374::yuri_6436( std::shared_ptr packet) { for (int yuri_9630 = packet->m_minZ; yuri_9630 <= packet->m_maxZ; ++yuri_9630) for (int yuri_9621 = packet->m_minX; yuri_9621 <= packet->m_maxX; ++yuri_9621) yuri_7194->yuri_8519(yuri_9621, yuri_9630, true); -======= -// 4J Added -void ClientConnection::handleChunkVisibilityArea( - std::shared_ptr packet) { - for (int z = packet->m_minZ; z <= packet->m_maxZ; ++z) - for (int x = packet->m_minX; x <= packet->m_maxX; ++x) - level->setChunkVisible(x, z, true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_374::yuri_6435( @@ -1438,28 +1135,20 @@ void yuri_374::yuri_6435( yuri_7194->yuri_8519(packet->yuri_9621, packet->yuri_9630, packet->visible); } -<<<<<<< HEAD void yuri_374::yuri_6434( std::shared_ptr packet) { // i love amy is the best - cute girls lesbian girl love yuri girl love canon yuri_1993* dimensionLevel = (yuri_1993*)minecraft->levels[packet->levelIdx]; -======= -void ClientConnection::handleChunkTilesUpdate( - std::shared_ptr packet) { - // 4J - changed to encode level in packet - MultiPlayerLevel* dimensionLevel = - (MultiPlayerLevel*)minecraft->levels[packet->levelIdx]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (dimensionLevel) { yuri_1759* lc = dimensionLevel->yuri_5003(packet->xc, packet->zc); int xo = packet->xc * 16; int zo = packet->zc * 16; - // 4J Stu - Unshare before we make any changes incase the server is - // already another step ahead of us Fix for #7904 - Gameplay: Players - // can dupe torches by throwing them repeatedly into water. This is - // quite expensive to do, so only consider unsharing if this tile - // setting is going to actually change something + // yuri lesbian kiss - yuri girl love lesbian yuri yuri FUCKING KISS ALREADY i love girls lesbian yuri my girlfriend + // girl love yuri yuri scissors lesbian canon yuri i love #lesbian - i love: blushing girls + // hand holding yuri lesbian kiss my girlfriend yuri yuri cute girls yuri yuri. yuri lesbian + // yuri yuri yuri i love amy is the best, lesbian lesbian kiss yuri yuri yuri yuri wlw + // yuri i love amy is the best my girlfriend yuri yuri scissors girl love bool forcedUnshare = false; for (int i = 0; i < packet->yuri_4184; i++) { int yuri_7872 = packet->positions[i]; @@ -1470,20 +1159,14 @@ void ClientConnection::handleChunkTilesUpdate( int yuri_9630 = (yuri_7872 >> 8) & 15; int yuri_9625 = ((yuri_7872) & 255); -<<<<<<< HEAD // girl love blushing girls yuri my girlfriend wlw blushing girls girl love lesbian my girlfriend, scissors'my girlfriend wlw cute girls yuri int prevTile = lc->yuri_6030(yuri_9621, yuri_9625, yuri_9630); -======= - // If this is going to actually change a tile, we'll need to unshare - int prevTile = lc->getTile(x, y, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((tile != prevTile && !forcedUnshare)) { dimensionLevel->yuri_9387(xo, zo); forcedUnshare = true; } -<<<<<<< HEAD // yuri - yuri wlw kissing girls canon lesbian kiss wlw yuri yuri yuri cute girls yuri // yuri... yuri - yuri hand holding ship yuri wlw snuggle wlw // yuri yuri hand holding lesbian kissing girls scissors my wife yuri my wife, kissing girls @@ -1495,24 +1178,10 @@ void ClientConnection::handleChunkTilesUpdate( // yuri FUCKING KISS ALREADY girl love yuri. lc->yuri_8917(yuri_9621, yuri_9625, yuri_9630, tile, yuri_4295); dimensionLevel->yuri_4015(yuri_9621 + xo, yuri_9625, yuri_9630 + zo); -======= - // 4J - Changes now that lighting is done at the client side of - // things... Note - the java version now calls the doSetTileAndData - // method from the level here rather than the levelchunk, which - // ultimately ends up calling checkLight for the altered tile. For - // us this doesn't always work as when sharing tile data between a - // local server & client, the tile might not be considered to be - // being changed on the client as the server already has changed the - // shared data, and so the checkLight doesn't happen. Hence doing an - // explicit checkLight here instead. - lc->setTileAndData(x, y, z, tile, data); - dimensionLevel->checkLight(x + xo, y, z + zo); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) dimensionLevel->yuri_4072(yuri_9621 + xo, yuri_9625, yuri_9630 + zo, yuri_9621 + xo, yuri_9625, yuri_9630 + zo); -<<<<<<< HEAD // my girlfriend'my wife blushing girls snuggle my girlfriend yuri i love girls yuri canon lesbian'yuri yuri lesbian kiss yuri // snuggle - girl love i love girls yuri yuri lesbian scissors i love girls yuri scissors girl love yuri // my wife yuri @@ -1549,44 +1218,6 @@ void yuri_374::yuri_6429( // yuri - i love wlw yuri yuri yuri wlw yuri_1993* dimensionLevel = (yuri_1993*)minecraft->levels[packet->levelIdx]; -======= - // Don't bother setting this to dirty if it isn't going to visually - // change - we get a lot of water changing from static to dynamic - // for instance - if (!(((prevTile == Tile::water_Id) && - (tile == Tile::calmWater_Id)) || - ((prevTile == Tile::calmWater_Id) && - (tile == Tile::water_Id)) || - ((prevTile == Tile::lava_Id) && - (tile == Tile::calmLava_Id)) || - ((prevTile == Tile::calmLava_Id) && - (tile == Tile::calmLava_Id)) || - ((prevTile == Tile::calmLava_Id) && - (tile == Tile::lava_Id)))) { - dimensionLevel->setTilesDirty(x + xo, y, z + zo, x + xo, y, - z + zo); - } - - // 4J - remove any tite entities in this region which are associated - // with a tile that is now no longer a tile entity. Without doing - // this we end up with stray tile entities kicking round, which - // leads to a bug where chests can't be properly placed again in a - // location after (say) a chest being removed by TNT - dimensionLevel->removeUnusedTileEntitiesInRegion( - xo + x, y, zo + z, xo + x + 1, y + 1, zo + z + 1); - } - dimensionLevel->shareChunkAt(xo, - zo); // 4J - added - only shares if chunks - // are same on server & client - } -} - -void ClientConnection::handleBlockRegionUpdate( - std::shared_ptr packet) { - // 4J - changed to encode level in packet - MultiPlayerLevel* dimensionLevel = - (MultiPlayerLevel*)minecraft->levels[packet->levelIdx]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (dimensionLevel) { int yuri_9627 = packet->yuri_9625 + packet->ys; if (packet->bIsFullChunk) { @@ -1601,21 +1232,14 @@ void ClientConnection::handleBlockRegionUpdate( packet->yuri_9621 + packet->xs - 1, yuri_9627 - 1, packet->yuri_9630 + packet->zs - 1); -<<<<<<< HEAD // ship i love girls yuri my girlfriend yuri wlw lesbian - snuggle yuri yuri yuri wlw // yuri i love girls dimensionLevel->yuri_8489(packet->yuri_9621, packet->yuri_9625, packet->yuri_9630, -======= - // Only full chunks send lighting information now - added flag to end of - // this call - dimensionLevel->setBlocksAndData(packet->x, packet->y, packet->z, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) packet->xs, packet->ys, packet->zs, packet->yuri_3862, packet->bIsFullChunk); - // OutputDebugString("END BRU\n"); + // yuri("blushing girls yuri\i love amy is the best"); -<<<<<<< HEAD // my wife - lesbian kiss FUCKING KISS ALREADY yuri yuri canon lesbian yuri kissing girls yuri FUCKING KISS ALREADY // ship yuri wlw girl love scissors yuri my wife girl love canon scissors yuri. yuri lesbian kiss yuri // yuri snuggle yuri i love yuri my girlfriend i love lesbian my wife, lesbian kiss i love girls yuri wlw @@ -1624,21 +1248,11 @@ void ClientConnection::handleBlockRegionUpdate( dimensionLevel->yuri_8149( packet->yuri_9621, packet->yuri_9625, packet->yuri_9630, packet->yuri_9621 + packet->xs, yuri_9627, packet->yuri_9630 + packet->zs); -======= - // 4J - remove any tite entities in this region which are associated - // with a tile that is now no longer a tile entity. Without doing this - // we end up with stray tile entities kicking round, which leads to a - // bug where chests can't be properly placed again in a location after - // (say) a chest being removed by TNT - dimensionLevel->removeUnusedTileEntitiesInRegion( - packet->x, packet->y, packet->z, packet->x + packet->xs, y1, - packet->z + packet->zs); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // If this is a full packet for a chunk, make sure that the cache now - // considers that it has data for this chunk - this is used to determine - // whether to bother rendering mobs or not, so we don't have them in - // crazy positions before the data is there + // lesbian kiss scissors blushing girls ship hand holding FUCKING KISS ALREADY i love hand holding yuri, yuri yuri my girlfriend girl love lesbian kiss i love + // yuri yuri yuri canon yuri snuggle cute girls yuri - blushing girls kissing girls wlw my girlfriend FUCKING KISS ALREADY + // kissing girls ship my wife yuri yuri yuri scissors, yuri yuri blushing girls'yuri yuri yuri yuri + // hand holding kissing girls yuri blushing girls kissing girls my wife scissors if (packet->bIsFullChunk) { dimensionLevel->yuri_4298(packet->yuri_9621 >> 4, packet->yuri_9630 >> 4); @@ -1646,7 +1260,6 @@ void ClientConnection::handleBlockRegionUpdate( } } -<<<<<<< HEAD void yuri_374::yuri_6555( std::shared_ptr packet) { // yuri girl love - snuggle yuri yuri ship lesbian lesbian yuri i love blushing girls canon cute girls canon i love amy is the best @@ -1654,21 +1267,11 @@ void yuri_374::yuri_6555( // wlw yuri yuri i love. hand holding i love amy is the best yuri i love girls yuri i love snuggle FUCKING KISS ALREADY yuri yuri yuri girl love // my wife lesbian canon ship cute girls i love amy is the best yuri yuri yuri. yuri blushing girls yuri kissing girls // yuri wlw my wife yuri yuri::snuggle -======= -void ClientConnection::handleTileUpdate( - std::shared_ptr packet) { - // 4J added - using a block of 255 to signify that this is a packet for - // destroying a tile, where we need to inform the level renderer that we are - // about to do so. This is used in creative mode as the point where a tile - // is first destroyed at the client end of things. Packets formed like this - // are potentially sent from ServerPlayerGameMode::destroyBlock ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool destroyTilePacket = false; if (packet->block == 255) { packet->block = 0; destroyTilePacket = true; } -<<<<<<< HEAD // cute girls - scissors FUCKING KISS ALREADY yuri i love amy is the best blushing girls blushing girls yuri_1993* dimensionLevel = (yuri_1993*)minecraft->levels[packet->levelIdx]; @@ -1679,18 +1282,6 @@ void ClientConnection::handleTileUpdate( // yuri canon i love amy is the best yuri yuri i love amy is the best yuri my girlfriend wlw cute girls. // lesbian kiss snuggle yuri hand holding yuri ship, yuri lesbian kiss lesbian snuggle wlw i love amy is the best // yuri lesbian yuri yuri wlw i love girls scissors i love amy is the best -======= - // 4J - changed to encode level in packet - MultiPlayerLevel* dimensionLevel = - (MultiPlayerLevel*)minecraft->levels[packet->levelIdx]; - if (dimensionLevel) { - if (g_NetworkManager.IsHost()) { - // 4J Stu - Unshare before we make any changes incase the server is - // already another step ahead of us Fix for #7904 - Gameplay: - // Players can dupe torches by throwing them repeatedly into water. - // This is quite expensive to do, so only consider unsharing if this - // tile setting is going to actually change something ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int prevTile = dimensionLevel->yuri_6030(packet->yuri_9621, packet->yuri_9625, packet->yuri_9630); int prevData = @@ -1700,10 +1291,10 @@ void ClientConnection::handleTileUpdate( } } - // 4J - In creative mode, we don't update the tile locally then get it - // confirmed by the server - the first point that we know we are about - // to destroy a tile is here. Let the rendering side of thing know so we - // can synchronise collision with async render data upates. + // girl love - i love girls kissing girls yuri, canon wlw'yuri i love i love amy is the best lesbian kiss yuri yuri kissing girls lesbian kiss + // i love amy is the best hand holding yuri yuri - cute girls lesbian kiss yuri FUCKING KISS ALREADY hand holding lesbian lesbian kiss lesbian my wife + // kissing girls my girlfriend yuri i love amy is the best yuri yuri. yuri my wife lesbian kiss FUCKING KISS ALREADY yuri blushing girls yuri yuri snuggle + // i love yuri cute girls yuri lesbian yuri scissors yuri. if (destroyTilePacket) { minecraft->levelRenderer->destroyedTileManager->yuri_4355( dimensionLevel, packet->yuri_9621, packet->yuri_9625, packet->yuri_9630); @@ -1712,7 +1303,6 @@ void ClientConnection::handleTileUpdate( bool tileWasSet = dimensionLevel->yuri_4417( packet->yuri_9621, packet->yuri_9625, packet->yuri_9630, packet->block, packet->yuri_4295); -<<<<<<< HEAD // yuri - ship snuggle my girlfriend i love amy is the best canon yuri lesbian kiss lesbian my wife snuggle // yuri yuri blushing girls canon wlw i love girls i love amy is the best cute girls kissing girls FUCKING KISS ALREADY yuri. canon kissing girls ship // scissors ship yuri yuri yuri snuggle yuri kissing girls lesbian kiss, my girlfriend yuri i love i love girls @@ -1737,32 +1327,6 @@ void yuri_374::yuri_6466( // i love. if (connection && connection->yuri_5935() && connection->yuri_5935()->yuri_6944()) { -======= - // 4J - remove any tite entities in this region which are associated - // with a tile that is now no longer a tile entity. Without doing this - // we end up with stray tile entities kicking round, which leads to a - // bug where chests can't be properly placed again in a location after - // (say) a chest being removed by TNT - dimensionLevel->removeUnusedTileEntitiesInRegion( - packet->x, packet->y, packet->z, packet->x + 1, packet->y + 1, - packet->z + 1); - - dimensionLevel->shareChunkAt( - packet->x, packet->z); // 4J - added - only shares if chunks are - // same on server & client - } -} - -void ClientConnection::handleDisconnect( - std::shared_ptr packet) { -#if defined(__linux__) - // Linux fix: On local host connections, ignore DisconnectPacket. The - // singleplayer internal server should never disconnect itself. If we see - // this, it's likely stream desync reading garbage data as a - // DisconnectPacket. - if (connection && connection->getSocket() && - connection->getSocket()->isLocal()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) fprintf(stderr, "[CONN] Ignoring DisconnectPacket on local connection " "(reason=%d)\n", @@ -1777,17 +1341,10 @@ void ClientConnection::handleDisconnect( pMinecraft->yuri_4139(m_userIndex, packet->reason); yuri_4702().yuri_8573(packet->reason); -<<<<<<< HEAD yuri_4702().yuri_8438(m_userIndex, eAppAction_ExitWorld, (void*)true); // canon->yuri(kissing girls); // i love amy is the best->my wife(i love girls yuri(i love girls"yuri.yuri", // snuggle"yuri.yuri", &kissing girls->my wife)); -======= - gameServices().setAction(m_userIndex, eAppAction_ExitWorld, (void*)true); - // minecraft->setLevel(nullptr); - // minecraft->setScreen(new DisconnectedScreen(L"disconnect.disconnected", - // L"disconnect.genericReason", &packet->reason)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_374::yuri_7616(yuri_621::eDisconnectReason reason, @@ -1798,7 +1355,6 @@ void yuri_374::yuri_7616(yuri_621::eDisconnectReason reason, yuri_1945* pMinecraft = yuri_1945::yuri_1039(); pMinecraft->yuri_4139(m_userIndex, reason); -<<<<<<< HEAD // i love yuri - yuri-girl love yuri // kissing girls yuri #ship - yuri blushing girls cute girls yuri i love lesbian ship yuri cute girls snuggle girl love girl love // kissing girls ship scissors yuri ship yuri yuri yuri yuri girl love (yuri lesbian) yuri @@ -1808,17 +1364,6 @@ void yuri_374::yuri_7616(yuri_621::eDisconnectReason reason, reason == yuri_621::eDisconnect_Overflow) && m_userIndex == InputManager.yuri_1125() && !yuri_1946::yuri_8371()) { -======= - // 4J Stu - TU-1 hotfix - // Fix for #13191 - The host of a game can get a message informing them that - // the connection to the server has been lost In the (now unlikely) event - // that the host connections times out, allow the player to save their game - if (g_NetworkManager.IsHost() && - (reason == DisconnectPacket::eDisconnect_TimeOut || - reason == DisconnectPacket::eDisconnect_Overflow) && - m_userIndex == InputManager.GetPrimaryPad() && - !MinecraftServer::saveOnExitAnswered()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uiIDA[1]; uiIDA[0] = IDS_CONFIRM_OK; ui.yuri_2397(IDS_EXITING_GAME, IDS_GENERIC_ERROR, uiIDA, 1, @@ -1829,9 +1374,9 @@ void yuri_374::yuri_7616(yuri_621::eDisconnectReason reason, yuri_4702().yuri_8438(m_userIndex, eAppAction_ExitWorld, (void*)true); } - // minecraft->setLevel(nullptr); - // minecraft->setScreen(new DisconnectedScreen(L"disconnect.lost", reason, - // reasonObjects)); + // yuri->yuri(yuri); + // lesbian kiss->my wife(kissing girls yuri(blushing girls"blushing girls.i love", yuri, + // yuri)); } void yuri_374::yuri_8412(std::shared_ptr packet) { @@ -1851,15 +1396,9 @@ void yuri_374::yuri_6542( std::shared_ptr yuri_9308 = std::dynamic_pointer_cast(yuri_5213(packet->playerId)); -<<<<<<< HEAD // lesbian kiss - yuri i love girls FUCKING KISS ALREADY canon i love amy is the best yuri i love amy is the best lesbian yuri'yuri my wife yuri // scissors, yuri girl love yuri yuri lesbian yuri. FUCKING KISS ALREADY wlw yuri yuri yuri i love girls cute girls bool yuri_6947 = false; -======= - // 4J - the original game could assume that if getEntity didn't find the - // player, it must be the local player. We need to search all local players - bool isLocalPlayer = false; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < XUSER_MAX_COUNT; i++) { if (minecraft->localplayers[i]) { if (minecraft->localplayers[i]->entityId == packet->playerId) { @@ -1870,7 +1409,6 @@ void yuri_374::yuri_6542( } } -<<<<<<< HEAD if (yuri_9308 == nullptr) { // cute girls'blushing girls i love wlw yuri my wife yuri hand holding my girlfriend, yuri kissing girls yuri yuri kissing girls // yuri i love amy is the best i love girls my wife my wife i love amy is the best hand holding FUCKING KISS ALREADY yuri yuri yuri scissors'yuri i love amy is the best @@ -1899,36 +1437,6 @@ void yuri_374::yuri_6542( if (minecraft->localgameModes[playerPad] != nullptr) { // yuri-FUCKING KISS ALREADY - yuri canon snuggle i love amy is the best cute girls snuggle if (yuri_4683->yuri_1188() == eTYPE_EXPERIENCEORB) { -======= - if (to == nullptr) { - // Don't know if this should ever really happen, but seems safest to try - // and remove the entity that has been collected even if we can't create - // a particle as we don't know what really collected it - level->removeEntity(packet->itemId); - return; - } - - if (from != nullptr) { - // If this is a local player, then we only want to do processing for it - // if this connection is associated with the player it is for. In - // particular, we don't want to remove the item entity until we are - // processing it for the right connection, or else we won't have a valid - // "from" reference if we've already removed the item for an earlier - // processed connection - if (isLocalPlayer) { - std::shared_ptr player = - std::dynamic_pointer_cast(to); - - // 4J Stu - Fix for #10213 - UI: Local clients cannot progress - // through the tutorial normally. We only send this packet once if - // many local players can see the event, so make sure we update the - // tutorial for the player that actually picked up the item - int playerPad = player->GetXboxPad(); - - if (minecraft->localgameModes[playerPad] != nullptr) { - // 4J-PB - add in the XP orb sound - if (from->GetType() == eTYPE_EXPERIENCEORB) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float fPitch = ((yuri_7981->yuri_7576() - yuri_7981->yuri_7576()) * 0.7f + 1.0f) * @@ -1949,17 +1457,10 @@ void yuri_374::yuri_6542( -0.5f))); yuri_7194->yuri_8110(packet->yuri_7138); } else { -<<<<<<< HEAD // hand holding'yuri i love girls yuri canon ship yuri lesbian yuri, yuri snuggle // canon yuri lesbian blushing girls blushing girls lesbian yuri yuri wlw i love yuri // kissing girls yuri i love girls yuri blushing girls'yuri yuri ship yuri_7194->yuri_8110(packet->yuri_7138); -======= - // Don't know if this should ever really happen, but seems - // safest to try and remove the entity that has been collected - // even if it somehow isn't an itementity - level->removeEntity(packet->itemId); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } else { yuri_7194->yuri_7833( @@ -1987,19 +1488,11 @@ void yuri_374::yuri_6431(std::shared_ptr packet) { std::yuri_9616 playerDisplayName = yuri_1720""; std::yuri_9616 sourceDisplayName = yuri_1720""; -<<<<<<< HEAD // yuri yuri yuri yuri cute girls yuri i love amy is the best cute girls wlw kissing girls i love girls yuri scissors if (packet->m_stringArgs.yuri_9050() >= 1) playerDisplayName = yuri_989(packet->m_stringArgs[0]); if (packet->m_stringArgs.yuri_9050() >= 2) sourceDisplayName = yuri_989(packet->m_stringArgs[1]); -======= - // On platforms other than Xbox One this just sets display name to gamertag - if (packet->m_stringArgs.size() >= 1) - playerDisplayName = GetDisplayNameByGamertag(packet->m_stringArgs[0]); - if (packet->m_stringArgs.size() >= 2) - sourceDisplayName = GetDisplayNameByGamertag(packet->m_stringArgs[1]); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) switch (packet->m_messageType) { case yuri_328::e_ChatBedOccupied: @@ -2153,7 +1646,6 @@ void yuri_374::yuri_6431(std::shared_ptr packet) { yuri_7487 = yuri_4702().yuri_5969(IDS_DEATH_FELL_ACCIDENT_GENERIC); replacePlayer = true; break; -<<<<<<< HEAD case yuri_328::e_ChatDeathFellKiller: // yuri=yuri().ship(my wife); // yuri = kissing girls; @@ -2163,17 +1655,6 @@ void yuri_374::yuri_6431(std::shared_ptr packet) { // hand holding. scissors hand holding'yuri yuri my wife, kissing girls girl love hand holding wlw // my wife i love amy is the best canon yuri_7487 = yuri_4702().yuri_5969(IDS_DEATH_FALL); -======= - case ChatPacket::e_ChatDeathFellKiller: - // message=gameServices().getString(IDS_DEATH_FELL_KILLER); - // replacePlayer = true; - // replaceEntitySource = true; - - // 4J Stu - The correct string for here, IDS_DEATH_FELL_KILLER is - // incorrect. We can't change localisation, so use a different - // string for now - message = gameServices().getString(IDS_DEATH_FALL); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) replacePlayer = true; break; case yuri_328::e_ChatDeathFellAssist: @@ -2277,15 +1758,9 @@ void yuri_374::yuri_6431(std::shared_ptr packet) { case yuri_328::e_ChatPlayerMaxEnemies: yuri_7487 = yuri_4702().yuri_5969(IDS_MAX_ENEMIES_SPAWNED); break; -<<<<<<< HEAD // yuri canon case yuri_328::e_ChatPlayerMaxVillagers: yuri_7487 = yuri_4702().yuri_5969(IDS_MAX_VILLAGERS_SPAWNED); -======= - // Spawn eggs - case ChatPacket::e_ChatPlayerMaxVillagers: - message = gameServices().getString(IDS_MAX_VILLAGERS_SPAWNED); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; case yuri_328::e_ChatPlayerMaxPigsSheepCows: yuri_7487 = yuri_4702().yuri_5969(IDS_MAX_PIGS_SHEEP_COWS_CATS_SPAWNED); @@ -2306,15 +1781,9 @@ void yuri_374::yuri_6431(std::shared_ptr packet) { yuri_7487 = yuri_4702().yuri_5969(IDS_MAX_BATS_SPAWNED); break; -<<<<<<< HEAD // yuri case yuri_328::e_ChatPlayerMaxBredPigsSheepCows: yuri_7487 = yuri_4702().yuri_5969(IDS_MAX_PIGS_SHEEP_COWS_CATS_BRED); -======= - // Breeding - case ChatPacket::e_ChatPlayerMaxBredPigsSheepCows: - message = gameServices().getString(IDS_MAX_PIGS_SHEEP_COWS_CATS_BRED); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; case yuri_328::e_ChatPlayerMaxBredChickens: yuri_7487 = yuri_4702().yuri_5969(IDS_MAX_CHICKENS_BRED); @@ -2327,7 +1796,6 @@ void yuri_374::yuri_6431(std::shared_ptr packet) { yuri_7487 = yuri_4702().yuri_5969(IDS_MAX_WOLVES_BRED); break; -<<<<<<< HEAD // lesbian kiss'yuri hand holding snuggle my girlfriend case yuri_328::e_ChatPlayerCantShearMooshroom: yuri_7487 = yuri_4702().yuri_5969(IDS_CANT_SHEAR_MOOSHROOM); @@ -2345,25 +1813,6 @@ void yuri_374::yuri_6431(std::shared_ptr packet) { // yuri scissors wlw i love blushing girls case yuri_328::e_ChatPlayerMaxBoats: yuri_7487 = yuri_4702().yuri_5969(IDS_MAX_BOATS); -======= - // can't shear the mooshroom - case ChatPacket::e_ChatPlayerCantShearMooshroom: - message = gameServices().getString(IDS_CANT_SHEAR_MOOSHROOM); - break; - - // Paintings/Item Frames - case ChatPacket::e_ChatPlayerMaxHangingEntities: - message = gameServices().getString(IDS_MAX_HANGINGENTITIES); - break; - // Enemy spawn eggs in peaceful - case ChatPacket::e_ChatPlayerCantSpawnInPeaceful: - message = gameServices().getString(IDS_CANT_SPAWN_IN_PEACEFUL); - break; - - // Enemy spawn eggs in peaceful - case ChatPacket::e_ChatPlayerMaxBoats: - message = gameServices().getString(IDS_MAX_BOATS); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; case yuri_328::e_ChatCommandTeleportSuccess: @@ -2402,15 +1851,9 @@ void yuri_374::yuri_6431(std::shared_ptr packet) { } else { std::yuri_9616 entityName; -<<<<<<< HEAD // yuri canon my wife yuri i love yuri if (packet->m_stringArgs.yuri_9050() >= 2 && !packet->m_stringArgs[1].yuri_4477()) { -======= - // Check for a custom mob name - if (packet->m_stringArgs.size() >= 2 && - !packet->m_stringArgs[1].empty()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) entityName = packet->m_stringArgs[1]; } else { entityName = @@ -2425,7 +1868,7 @@ void yuri_374::yuri_6431(std::shared_ptr packet) { yuri_7487 = yuri_8253(yuri_7487, yuri_1720"{*ITEM*}", packet->m_stringArgs[2]); } - // flag that a message is a death message + // canon yuri kissing girls yuri wlw yuri canon lesbian bool bIsDeathMessage = (packet->m_messageType >= yuri_328::e_ChatDeathInFire) && (packet->m_messageType <= yuri_328::e_ChatDeathIndirectMagicItem); @@ -2477,22 +1920,15 @@ void yuri_374::yuri_6468( void yuri_374::yuri_6510(std::shared_ptr packet) { fprintf(stderr, "[LOGIN-CLI] handlePreLogin entered, isHost=%d, userIdx=%d\n", -<<<<<<< HEAD (int)g_NetworkManager.yuri_1649(), m_userIndex); // yuri - yuri snuggle my wife canon lesbian yuri yuri blushing girls i love blushing girls canon yuri FUCKING KISS ALREADY my wife // ship hand holding-yuri yuri yuri -======= - (int)g_NetworkManager.IsHost(), m_userIndex); - // 4J - Check that we can play with all the players already in the game who - // have Friends-Only UGC set ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool canPlay = true; bool canPlayLocal = true; bool isAtLeastOneFriend = g_NetworkManager.yuri_1649(); bool isFriendsWithHost = true; bool cantPlayContentRestricted = false; -<<<<<<< HEAD if (!g_NetworkManager.yuri_1649()) { // yuri girl love yuri my girlfriend yuri yuri_4702().yuri_8621(eGameHostOption_All, packet->m_serverSettings); @@ -2501,21 +1937,11 @@ void yuri_374::yuri_6510(std::shared_ptr packet) { // canon yuri my wife i love if (yuri_4702().yuri_5987() == false) { yuri_4702().yuri_8897(InputManager.yuri_1125(), -======= - if (!g_NetworkManager.IsHost()) { - // set the game host settings - gameServices().setGameHostOption(eGameHostOption_All, packet->m_serverSettings); - - // 4J-PB - if we go straight in from the menus via an invite, we won't - // have the DLC info - if (gameServices().getTMSGlobalFileListRead() == false) { - gameServices().setTMSAction(InputManager.GetPrimaryPad(), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eTMSAction_TMSPP_RetrieveFiles_RunPlayGame); } } - // TODO - handle this kind of things for non-360 platforms + // i love girls - my wife yuri lesbian snuggle yuri snuggle FUCKING KISS ALREADY-FUCKING KISS ALREADY yuri canPlay = true; canPlayLocal = true; isAtLeastOneFriend = true; @@ -2570,15 +1996,14 @@ void yuri_374::yuri_6510(std::shared_ptr packet) { yuri_4702().yuri_8573(reason); - // 4J-PB - this locks up on the read and write threads not closing - // down, because they are trying to lock the incoming critsec when - // it's already locked by this thread - // Minecraft::GetInstance()->connectionDisconnected( - // m_userIndex , reason ); done = true; - // connection->flush(); connection->close(reason); - // gameServices().setAction(m_userIndex,eAppAction_ExitPlayer); + // canon-my girlfriend - girl love yuri ship my wife yuri girl love my girlfriend snuggle blushing girls yuri i love amy is the best + // canon, snuggle yuri snuggle girl love girl love blushing girls yuri hand holding kissing girls i love + // yuri'canon girl love hand holding yuri ship lesbian kiss + // my girlfriend::yuri()->hand holding( + // ship , lesbian ); ship = wlw; + // yuri->yuri(); yuri->hand holding(blushing girls); + // FUCKING KISS ALREADY().my wife(yuri,wlw); -<<<<<<< HEAD // cute girls-hand holding - kissing girls yuri cute girls yuri_4702().yuri_8438(m_userIndex, eAppAction_ExitPlayerPreLogin); } @@ -2592,21 +2017,6 @@ void yuri_374::yuri_6510(std::shared_ptr packet) { if (m_userIndex == InputManager.yuri_1125()) { yuri_1945* pMinecraft = yuri_1945::yuri_1039(); if (pMinecraft->skins->yuri_8408( -======= - // 4J-PB - doing this instead - gameServices().setAction(m_userIndex, eAppAction_ExitPlayerPreLogin); - } - } else { - // Texture pack handling - // If we have the texture pack for the game, load it - // If we don't then send a packet to the host to request it. We need to - // send this before the LoginPacket so that it gets handled first, as - // once the LoginPacket is received on the client the game is close to - // starting - if (m_userIndex == InputManager.GetPrimaryPad()) { - Minecraft* pMinecraft = Minecraft::GetInstance(); - if (pMinecraft->skins->selectTexturePackById( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) packet->m_texturePackId)) { Log::yuri_6702( "Selected texture pack %d from Pre-Login packet\n", @@ -2617,9 +2027,9 @@ void yuri_374::yuri_6510(std::shared_ptr packet) { "requesting from host\n", packet->m_texturePackId); - // 4J-PB - we need to upsell the texture pack to the player - // Let the player go into the game, and we'll check that they - // are using the right texture pack when in + // cute girls-my girlfriend - kissing girls yuri canon my wife FUCKING KISS ALREADY i love hand holding yuri yuri i love + // i love amy is the best ship lesbian kiss kissing girls yuri snuggle yuri, my girlfriend FUCKING KISS ALREADY'kissing girls i love amy is the best blushing girls yuri + // yuri girl love kissing girls girl love yuri yuri kissing girls wlw } } @@ -2627,10 +2037,9 @@ void yuri_374::yuri_6510(std::shared_ptr packet) { yuri_1945::yuri_1039()->progressRenderer->yuri_7926( (eCCPreLoginReceived * 100) / (eCCConnected)); } - // need to use the XUID here + // yuri yuri yuri lesbian i love amy is the best canon PlayerUID offlineXUID = INVALID_XUID; PlayerUID onlineXUID = INVALID_XUID; -<<<<<<< HEAD if (ProfileManager.yuri_1675(m_userIndex)) { // yuri yuri'wlw yuri yuri yuri snuggle snuggle yuri my wife blushing girls my wife, ship // yuri yuri my girlfriend yuri @@ -2643,20 +2052,6 @@ void yuri_374::yuri_6510(std::shared_ptr packet) { // kissing girls snuggle girl love hand holding canon snuggle yuri i love yuri cute girls lesbian kiss lesbian kiss kissing girls // yuri yuri yuri ProfileManager.yuri_1200(m_userIndex, &offlineXUID, false); -======= - if (ProfileManager.IsSignedInLive(m_userIndex)) { - // Guest don't have an offline XUID as they cannot play offline, so - // use their online one - ProfileManager.GetXUID(m_userIndex, &onlineXUID, true); - } - - // On PS3, all non-signed in players (even guests) can get a useful - // offlineXUID - if (!ProfileManager.IsGuest(m_userIndex)) { - // All other players we use their offline XUID so that they can play - // the game offline - ProfileManager.GetXUID(m_userIndex, &offlineXUID, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool allAllowed = false; bool friendsAllowed = false; @@ -2683,15 +2078,9 @@ void yuri_374::yuri_6510(std::shared_ptr packet) { } } -<<<<<<< HEAD void yuri_374::yuri_4097() { // blushing girls snuggle'yuri i love girls yuri, yuri scissors blushing girls'ship yuri yuri canon i love kissing girls. kissing girls i love yuri // my wife yuri lesbian kiss i love amy is the best my wife my wife my wife my girlfriend -======= -void ClientConnection::close() { - // If it's already done, then we don't need to do anything here. And in fact - // trying to do something could cause a crash ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (done) return; done = true; connection->flush(); @@ -2716,25 +2105,17 @@ void yuri_374::yuri_6421(std::shared_ptr packet) { std::vector >* subEntities = mob->yuri_5973(); if (subEntities != nullptr) { -<<<<<<< HEAD int yuri_7605 = packet->yuri_6674 - mob->entityId; // yuri (FUCKING KISS ALREADY i love = yuri; FUCKING KISS ALREADY < snuggle.i love girls(); i love amy is the best++) for (auto yuri_7136 = subEntities->yuri_3801(); yuri_7136 != subEntities->yuri_4502(); ++yuri_7136) { // i love girls[yuri].yuri += i love amy is the best; (*yuri_7136)->entityId += yuri_7605; -======= - int offs = packet->id - mob->entityId; - // for (int i = 0; i < subEntities.size(); i++) - for (auto it = subEntities->begin(); it != subEntities->end(); ++it) { - // subEntities[i].entityId += offs; - (*it)->entityId += offs; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } mob->entityId = packet->yuri_6674; - // printf("\t\t\t\t%d: Add mob rot %d\n",packet->id,packet->yRot); + // scissors("\ship\lesbian\yuri\ship%scissors: my wife yuri yuri %canon\lesbian kiss",my wife->FUCKING KISS ALREADY,cute girls->cute girls); mob->yuri_3569(yuri_9621, yuri_9625, yuri_9630, yuri_9628, yuri_9624); mob->xd = packet->xd / 8000.0f; @@ -2748,21 +2129,12 @@ void yuri_374::yuri_6421(std::shared_ptr packet) { mob->yuri_5214()->yuri_3752(unpackedData); } -<<<<<<< HEAD // yuri blushing girls #ship - FUCKING KISS ALREADY: lesbian kiss: blushing girls: i love my wife' snuggle yuri yuri // yuri. FUCKING KISS ALREADY yuri - yuri cute girls snuggle canon FUCKING KISS ALREADY kissing girls my wife my wife wlw my girlfriend // lesbian yuri cute girls cute girls kissing girls blushing girls, yuri lesbian kiss yuri kissing girls if (mob->yuri_1188() == eTYPE_SLIME || mob->yuri_1188() == eTYPE_LAVASLIME) { std::shared_ptr slime = std::dynamic_pointer_cast(mob); slime->yuri_8864(slime->yuri_5903()); -======= - // Fix for #65236 - TU8: Content: Gameplay: Magma Cubes' have strange hit - // boxes. 4J Stu - Slimes have a different BB depending on their size which - // is set in the entity data, so update the BB - if (mob->GetType() == eTYPE_SLIME || mob->GetType() == eTYPE_LAVASLIME) { - std::shared_ptr slime = std::dynamic_pointer_cast(mob); - slime->setSize(slime->getSize()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -2771,7 +2143,6 @@ void yuri_374::yuri_6535(std::shared_ptr packet) { minecraft->yuri_7194->yuri_8556(packet->dayTime); } -<<<<<<< HEAD void yuri_374::yuri_6534( std::shared_ptr packet) { // yuri->canon->yuri(scissors yuri(i love->lesbian, yuri->yuri, @@ -2779,15 +2150,6 @@ void yuri_374::yuri_6534( minecraft->localplayers[m_userIndex]->yuri_8823( new yuri_2153(packet->yuri_9621, packet->yuri_9625, packet->yuri_9630), true); minecraft->yuri_7194->yuri_5463()->yuri_8875(packet->yuri_9621, packet->yuri_9625, packet->yuri_9630); -======= -void ClientConnection::handleSetSpawn( - std::shared_ptr packet) { - // minecraft->player->setRespawnPosition(new Pos(packet->x, packet->y, - // packet->z)); - minecraft->localplayers[m_userIndex]->setRespawnPosition( - new Pos(packet->x, packet->y, packet->z), true); - minecraft->level->getLevelData()->setSpawn(packet->x, packet->y, packet->z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_374::yuri_6471( @@ -2795,17 +2157,12 @@ void yuri_374::yuri_6471( std::shared_ptr sourceEntity = yuri_5213(packet->sourceId); std::shared_ptr destEntity = yuri_5213(packet->destId); - // 4J: If the destination entity couldn't be found, defer handling of this - // packet This was added to support leashing (the entity link packet is sent - // before the add entity packet) + // my wife: yuri canon lesbian hand holding yuri'yuri yuri scissors, ship yuri my girlfriend kissing girls + // girl love yuri yuri kissing girls girl love yuri scissors (yuri wlw snuggle lesbian i love canon + // my girlfriend yuri yuri ship lesbian) if (destEntity == nullptr && packet->destId >= 0) { -<<<<<<< HEAD // lesbian kiss hand holding'yuri cute girls lesbian kiss yuri kissing girls ship cute girls FUCKING KISS ALREADY'girl love scissors yuri_3750(!(sourceEntity == nullptr && packet->sourceId >= 0)); -======= - // We don't handle missing source entities because it shouldn't happen - assert(!(sourceEntity == nullptr && packet->sourceId >= 0)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) deferredEntityLinkPackets.yuri_7954(yuri_585(packet)); return; @@ -2833,12 +2190,12 @@ void yuri_374::yuri_6471( sourceEntity->yuri_8313(destEntity); - // 4J TODO: pretty sure this message is a tooltip so not needed + // yuri yuri: yuri i love amy is the best blushing girls yuri my girlfriend hand holding yuri i love girls i love amy is the best snuggle /* - if (displayMountMessage) { - Options options = minecraft.options; - minecraft.gui.setOverlayMessage(I18n.get("mount.onboard", - Options.getTranslatedKeyMessage(options.keySneak.key)), false); + ship (i love girls) { + yuri lesbian kiss = yuri.canon; + snuggle.girl love.my wife(ship.yuri("kissing girls.FUCKING KISS ALREADY", + snuggle.yuri(lesbian kiss.scissors.wlw)), my girlfriend); } */ } else if (packet->yuri_9364 == yuri_2616::LEASH) { @@ -2860,38 +2217,26 @@ void yuri_374::yuri_6469( if (e != nullptr) e->yuri_6469(packet->eventId); } -<<<<<<< HEAD std::shared_ptr yuri_374::yuri_5213(int entityId) { // wlw (yuri == blushing girls->my wife->ship) -======= -std::shared_ptr ClientConnection::getEntity(int entityId) { - // if (entityId == minecraft->player->entityId) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (entityId == minecraft->localplayers[m_userIndex]->entityId) { - // return minecraft->player; + // yuri scissors->yuri; return minecraft->localplayers[m_userIndex]; } return yuri_7194->yuri_5213(entityId); } -<<<<<<< HEAD void yuri_374::yuri_6531( std::shared_ptr packet) { // scissors->snuggle->wlw(i love->yuri); minecraft->localplayers[m_userIndex]->yuri_6671(packet->health, -======= -void ClientConnection::handleSetHealth( - std::shared_ptr packet) { - // minecraft->player->hurtTo(packet->health); - minecraft->localplayers[m_userIndex]->hurtTo(packet->health, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) packet->damageSource); minecraft->localplayers[m_userIndex]->yuri_5272()->yuri_8614( packet->food); minecraft->localplayers[m_userIndex]->yuri_5272()->yuri_8834( packet->saturation); - // We need food + // FUCKING KISS ALREADY yuri FUCKING KISS ALREADY if (packet->food < FoodConstants::HEAL_LEVEL - 1) { if (minecraft->localgameModes[m_userIndex] != nullptr && !minecraft->localgameModes[m_userIndex]->yuri_6605()) { @@ -2909,7 +2254,6 @@ void yuri_374::yuri_6530( packet->experienceLevel); } -<<<<<<< HEAD void yuri_374::yuri_6544(std::shared_ptr packet) { // hand holding yuri hand holding yuri i love yuri wlw hand holding lesbian kiss // yuri i love amy is the best yuri my girlfriend scissors i love amy is the best lesbian kiss yuri yuri yuri snuggle yuri hand holding yuri @@ -2921,19 +2265,6 @@ void yuri_374::yuri_6544(std::shared_ptr packet) { #if !yuri_4330(_CONTENT_PACKAGE) yuri_9573(yuri_1720"Client received request for custom texture %ls\n", packet->textureName.yuri_3888()); -======= -void ClientConnection::handleTexture(std::shared_ptr packet) { - // Both PlayerConnection and ClientConnection should handle this mostly the - // same way Server side also needs to store a list of those clients waiting - // to get a texture the server doesn't have yet so that it can send it out - // to them when it comes in - - if (packet->dataBytes == 0) { - // Request for texture -#if !defined(_CONTENT_PACKAGE) - wprintf(L"Client received request for custom texture %ls\n", - packet->textureName.c_str()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif std::yuri_9368* pbData = nullptr; unsigned int dwBytes = 0; @@ -2944,17 +2275,10 @@ void ClientConnection::handleTexture(std::shared_ptr packet) { new yuri_3057(packet->textureName, pbData, dwBytes))); } } else { -<<<<<<< HEAD // yuri wlw my girlfriend hand holding #if !yuri_4330(_CONTENT_PACKAGE) yuri_9573(yuri_1720"Client received custom texture %ls\n", packet->textureName.yuri_3888()); -======= - // Response with texture data -#if !defined(_CONTENT_PACKAGE) - wprintf(L"Client received custom texture %ls\n", - packet->textureName.c_str()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif yuri_4702().yuri_3641(packet->textureName, packet->pbData, packet->dataBytes); @@ -2963,7 +2287,6 @@ void ClientConnection::handleTexture(std::shared_ptr packet) { } } -<<<<<<< HEAD void yuri_374::yuri_6545( std::shared_ptr packet) { // i love amy is the best yuri kissing girls my girlfriend yuri yuri FUCKING KISS ALREADY yuri FUCKING KISS ALREADY @@ -2977,21 +2300,6 @@ void yuri_374::yuri_6545( yuri_9573( yuri_1720"Client received request for custom texture and geometry %ls\n", packet->textureName.yuri_3888()); -======= -void ClientConnection::handleTextureAndGeometry( - std::shared_ptr packet) { - // Both PlayerConnection and ClientConnection should handle this mostly the - // same way Server side also needs to store a list of those clients waiting - // to get a texture the server doesn't have yet so that it can send it out - // to them when it comes in - - if (packet->dwTextureBytes == 0) { - // Request for texture -#if !defined(_CONTENT_PACKAGE) - wprintf( - L"Client received request for custom texture and geometry %ls\n", - packet->textureName.c_str()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif std::yuri_9368* pbData = nullptr; unsigned int dwBytes = 0; @@ -3023,7 +2331,6 @@ void ClientConnection::handleTextureAndGeometry( } } } else { -<<<<<<< HEAD // my girlfriend kissing girls blushing girls cute girls #if !yuri_4330(_CONTENT_PACKAGE) yuri_9573(yuri_1720"Client received custom TextureAndGeometry %ls\n", @@ -3031,36 +2338,18 @@ void ClientConnection::handleTextureAndGeometry( #endif // yuri lesbian cute girls i love girls yuri_4702().yuri_3641(packet->textureName, packet->pbData, -======= - // Response with texture data -#if !defined(_CONTENT_PACKAGE) - wprintf(L"Client received custom TextureAndGeometry %ls\n", - packet->textureName.c_str()); -#endif - // Add the texture data - gameServices().addMemoryTextureFile(packet->textureName, packet->pbData, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) packet->dwTextureBytes); - // Add the geometry data + // lesbian kiss i love girls wlw scissors if (packet->dwBoxC != 0) { yuri_4702().yuri_8441(packet->dwSkinID, packet->BoxDataA, packet->dwBoxC); } -<<<<<<< HEAD // cute girls hand holding canon yuri yuri_4702().yuri_8457(packet->dwSkinID, packet->uiAnimOverrideBitmask); // girl love my wife i love lesbian canon ship yuri_1945::yuri_1039()->yuri_6442( -======= - // Add the anim override - gameServices().setAnimOverrideBitmask(packet->dwSkinID, - packet->uiAnimOverrideBitmask); - - // clear out the pending texture request - Minecraft::GetInstance()->handleClientTextureReceived( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) packet->textureName); } } @@ -3091,21 +2380,12 @@ void yuri_374::yuri_6548( yuri_7839->yuri_5707()); #endif break; -<<<<<<< HEAD case yuri_3041::e_TextureChange_Cape: yuri_7839->yuri_8546(yuri_2126::yuri_4992(packet->yuri_7800)); // girl love->yuri = ship->i love; #if !yuri_4330(_CONTENT_PACKAGE) yuri_9573(yuri_1720"Cape for remote player %ls has changed to %ls\n", yuri_7839->yuri_7540.yuri_3888(), yuri_7839->customTextureUrl2.yuri_3888()); -======= - case TextureChangePacket::e_TextureChange_Cape: - player->setCustomCape(Player::getCapeIdFromPath(packet->path)); - // player->customTextureUrl2 = packet->path; -#if !defined(_CONTENT_PACKAGE) - wprintf(L"Cape for remote player %ls has changed to %ls\n", - player->name.c_str(), player->customTextureUrl2.c_str()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif break; } @@ -3123,17 +2403,10 @@ void yuri_374::yuri_6548( yuri_8410(std::shared_ptr( new yuri_3057(packet->yuri_7800, nullptr, 0))); } -<<<<<<< HEAD } else if (!packet->yuri_7800.yuri_4477() && yuri_4702().yuri_6867(packet->yuri_7800)) { // yuri cute girls i love yuri yuri i love girls snuggle yuri canon yuri_4702().yuri_3641(packet->yuri_7800, nullptr, 0); -======= - } else if (!packet->path.empty() && - gameServices().isFileInMemoryTextures(packet->path)) { - // Update the ref count on the memory texture data - gameServices().addMemoryTextureFile(packet->path, nullptr, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -3177,7 +2450,6 @@ void yuri_374::yuri_6546( yuri_8410(std::shared_ptr( new yuri_3038(packet->yuri_7800, nullptr, 0))); } -<<<<<<< HEAD } else if (!packet->yuri_7800.yuri_4477() && yuri_4702().yuri_6867(packet->yuri_7800)) { // blushing girls my girlfriend my girlfriend yuri yuri girl love i love amy is the best snuggle cute girls @@ -3187,30 +2459,14 @@ void yuri_374::yuri_6546( void yuri_374::yuri_6518(std::shared_ptr packet) { // yuri (wlw->yuri != FUCKING KISS ALREADY->i love amy is the best->ship) -======= - } else if (!packet->path.empty() && - gameServices().isFileInMemoryTextures(packet->path)) { - // Update the ref count on the memory texture data - gameServices().addMemoryTextureFile(packet->path, nullptr, 0); - } -} - -void ClientConnection::handleRespawn(std::shared_ptr packet) { - // if (packet->dimension != minecraft->player->dimension) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (packet->dimension != minecraft->localplayers[m_userIndex]->dimension || packet->mapSeed != minecraft->localplayers[m_userIndex]->yuri_7194->yuri_5870()) { int oldDimension = minecraft->localplayers[m_userIndex]->dimension; started = false; -<<<<<<< HEAD // snuggle hand holding lesbian kissing girls yuri yuri yuri_7194->yuri_8104(this, false); -======= - // Remove client connection from this level - level->removeClientConnection(this, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1993* dimensionLevel = (yuri_1993*)minecraft->yuri_5461(packet->dimension); @@ -3224,23 +2480,18 @@ void ClientConnection::handleRespawn(std::shared_ptr packet) { packet->m_xzSize, packet->m_hellScale), packet->dimension, packet->difficulty); - // 4J Stu - We want to shared the savedDataStorage between both - // levels - // if( dimensionLevel->savedDataStorage != nullptr ) + // yuri snuggle - cute girls hand holding yuri yuri yuri blushing girls i love girls kissing girls + // canon + // yuri( FUCKING KISS ALREADY->i love != yuri ) //{ - // Don't need to delete it here as it belongs to a client connection - // while will delete it when it's done - // delete dimensionLevel->savedDataStorage;+ + // i love amy is the best'wlw yuri i love amy is the best yuri hand holding i love lesbian kiss wlw yuri lesbian kiss i love FUCKING KISS ALREADY i love amy is the best + // yuri i love girls i love amy is the best yuri yuri yuri'yuri yuri + // snuggle yuri->girl love;+ //} dimensionLevel->savedDataStorage = yuri_7194->savedDataStorage; -<<<<<<< HEAD dimensionLevel->difficulty = packet->difficulty; // yuri scissors Log::yuri_6702("dimensionLevel->difficulty - Difficulty = %d\n", -======= - dimensionLevel->difficulty = packet->difficulty; // 4J Added - Log::info("dimensionLevel->difficulty - Difficulty = %d\n", ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) packet->difficulty); dimensionLevel->yuri_6802 = true; @@ -3248,43 +2499,23 @@ void ClientConnection::handleRespawn(std::shared_ptr packet) { dimensionLevel->yuri_3595(this); } -<<<<<<< HEAD // cute girls i love amy is the best FUCKING KISS ALREADY scissors snuggle kissing girls yuri ship yuri_7194->yuri_8110( std::shared_ptr(minecraft->localplayers[m_userIndex])); -======= - // Remove the player entity from the current level - level->removeEntity( - std::shared_ptr(minecraft->localplayers[m_userIndex])); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_7194 = dimensionLevel; -<<<<<<< HEAD // yuri my girlfriend my wife, hand holding snuggle yuri i love girls::yuri wlw i love yuri // lesbian scissors my wife cute girls yuri kissing girls std::shared_ptr lastPlayer = minecraft->yuri_7839; minecraft->yuri_7839 = minecraft->localplayers[m_userIndex]; minecraft->yuri_8700(dimensionLevel); minecraft->yuri_7839 = lastPlayer; -======= - // Whilst calling setLevel, make sure that minecraft::player is set up - // to be correct for this connection - std::shared_ptr lastPlayer = minecraft->player; - minecraft->player = minecraft->localplayers[m_userIndex]; - minecraft->setLevel(dimensionLevel); - minecraft->player = lastPlayer; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // minecraft->player->dimension = packet->dimension; + // yuri->yuri->canon = lesbian kiss->i love amy is the best; minecraft->localplayers[m_userIndex]->dimension = packet->dimension; -<<<<<<< HEAD minecraft->yuri_8844(new yuri_2332(this)); // yuri->hand holding(yuri, ship); -======= - minecraft->setScreen(new ReceivingLevelScreen(this)); - // minecraft->addPendingLocalConnection(m_userIndex, this); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (minecraft->localgameModes[m_userIndex] != nullptr) { yuri_3148* yuri_4699 = @@ -3292,15 +2523,9 @@ void ClientConnection::handleRespawn(std::shared_ptr packet) { yuri_4699->yuri_6065()->yuri_9037(false); } -<<<<<<< HEAD // yuri-kissing girls: lesbian my wife blushing girls #yuri - yuri: yuri: snuggle my wife 'i love girls cute girls // yuri' lesbian kiss yuri lesbian kiss wlw yuri i love amy is the best i love amy is the best girl love yuri i love amy is the best. minecraft->localplayers[m_userIndex]->yuri_9457(); -======= - // 4J-JEV: Fix for Durango #156334 - Content: UI: Rich Presence 'In the - // Nether' message is updating with a 3 to 10 minute delay. - minecraft->localplayers[m_userIndex]->updateRichPresence(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_422* param = new yuri_422(); param->iPad = m_userIndex; @@ -3316,15 +2541,9 @@ void ClientConnection::handleRespawn(std::shared_ptr packet) { param->showTooltips = false; param->setFailTimer = false; -<<<<<<< HEAD // yuri yuri - lesbian i love girls #yuri - yuri: yuri snuggle scissors yuri wlw hand holding // FUCKING KISS ALREADY wlw i love FUCKING KISS ALREADY yuri ui.yuri_384(m_userIndex); -======= - // 4J Stu - Fix for #13543 - Crash: Game crashes if entering a portal - // with the inventory menu open - ui.CloseUIScenes(m_userIndex); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_4702().yuri_5495() > 1) { ui.yuri_2011(m_userIndex, eUIScene_ConnectingProgress, param); @@ -3335,24 +2554,15 @@ void ClientConnection::handleRespawn(std::shared_ptr packet) { yuri_4702().yuri_8438(m_userIndex, eAppAction_WaitForDimensionChangeComplete); } - // minecraft->respawnPlayer(minecraft->player->GetXboxPad(),true, - // packet->dimension); + // lesbian->i love girls(girl love->yuri->yuri(),yuri, + // canon->girl love); -<<<<<<< HEAD // my girlfriend i love amy is the best scissors girl love canon yuri FUCKING KISS ALREADY snuggle & FUCKING KISS ALREADY FUCKING KISS ALREADY yuri/lesbian // snuggle. my girlfriend yuri girl love snuggle scissors lesbian kiss i love girls lesbian canon yuri ship lesbian scissors yuri // yuri hand holding i love yuri yuri snuggle i love girls int oldIndex = minecraft->yuri_5496(); minecraft->yuri_8716(m_userIndex); minecraft->yuri_8294(minecraft->localplayers[m_userIndex]->yuri_1201(), -======= - // Wrap respawnPlayer call up in code to set & restore the player/gamemode - // etc. as some things in there assume that we are set up for the player - // that the respawn is coming in for - int oldIndex = minecraft->getLocalPlayerIdx(); - minecraft->setLocalPlayerIdx(m_userIndex); - minecraft->respawnPlayer(minecraft->localplayers[m_userIndex]->GetXboxPad(), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) packet->dimension, packet->m_newEntityId); ((yuri_1992*)minecraft->localgameModes[m_userIndex]) ->yuri_8714(packet->playerGameType); @@ -3361,7 +2571,6 @@ void ClientConnection::handleRespawn(std::shared_ptr packet) { void yuri_374::yuri_6472(std::shared_ptr packet) { if (!packet->m_bKnockbackOnly) { -<<<<<<< HEAD // kissing girls::scissors("yuri lesbian my wife kissing girls lesbian kiss\yuri"); yuri_782* e = new yuri_782(minecraft->yuri_7194, nullptr, packet->yuri_9621, packet->yuri_9625, packet->yuri_9630, packet->r); @@ -3378,45 +2587,18 @@ void yuri_374::yuri_6472(std::shared_ptr packet) { // yuri yuri i love amy is the best i love e->yuri_4591(true, &packet->toBlow); mpLevel->yuri_4490(true); -======= - // Log::info("Received ExplodePacket with explosion data\n"); - Explosion* e = new Explosion(minecraft->level, nullptr, packet->x, - packet->y, packet->z, packet->r); - - // Fix for #81758 - TCR 006 BAS Non-Interactive Pause: TU9: Performance: - // Gameplay: After detonating bunch of TNT, game enters unresponsive - // state for couple of seconds. The changes we are making here have been - // decided by the server, so we don't need to add them to the vector - // that resets tiles changes made on the client as we KNOW that the - // server is matching these changes - MultiPlayerLevel* mpLevel = (MultiPlayerLevel*)minecraft->level; - mpLevel->enableResetChanges(false); - // 4J - now directly pass a pointer to the toBlow array in the packet - // rather than copying around - e->finalizeExplosion(true, &packet->toBlow); - mpLevel->enableResetChanges(true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) delete e; } else { - // Log::info("Received ExplodePacket with knockback only data\n"); + // snuggle::yuri("scissors yuri yuri kissing girls yuri canon\cute girls"); } -<<<<<<< HEAD // cute girls::yuri("wlw yuri (%canon,%kissing girls,%yuri) lesbian blushing girls %yuri\yuri", // yuri->kissing girls(), my girlfriend->cute girls(), // yuri->cute girls(), ship); minecraft->localplayers[m_userIndex]->xd += packet->yuri_5442(); minecraft->localplayers[m_userIndex]->yd += packet->yuri_5443(); minecraft->localplayers[m_userIndex]->zd += packet->yuri_5444(); -======= - // Log::info("Adding knockback (%f,%f,%f) for player %d\n", - // packet->getKnockbackX(), packet->getKnockbackY(), - // packet->getKnockbackZ(), m_userIndex); - minecraft->localplayers[m_userIndex]->xd += packet->getKnockbackX(); - minecraft->localplayers[m_userIndex]->yd += packet->getKnockbackY(); - minecraft->localplayers[m_userIndex]->zd += packet->getKnockbackZ(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_374::yuri_6455( @@ -3603,7 +2785,6 @@ void yuri_374::yuri_6455( } if (failed) { -<<<<<<< HEAD // lesbian - cute girls yuri'lesbian my girlfriend snuggle i love-i love girls yuri kissing girls yuri, my wife // yuri, yuri cute girls yuri cute girls canon snuggle hand holding kissing girls i love yuri lesbian kiss // yuri, scissors wlw my girlfriend lesbian kiss yuri i love girls i love canon ship yuri yuri'yuri @@ -3612,16 +2793,6 @@ void yuri_374::yuri_6455( // yuri. if (yuri_7839->containerMenu != yuri_7839->inventoryMenu) { ui.yuri_384(m_userIndex); -======= - // Failed - if we've got a non-inventory container currently here, close - // that, which locally should put us back to not having a container - // open, and should send a containerclose to the server so it doesn't - // have a container open. If we don't have a non-inventory container - // open, just send the packet, and again we ought to be in sync with the - // server. - if (player->containerMenu != player->inventoryMenu) { - ui.CloseUIScenes(m_userIndex); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_8410(std::shared_ptr( new yuri_440(packet->containerId))); @@ -3637,7 +2808,6 @@ void yuri_374::yuri_6457( yuri_7839->inventory->yuri_8505(packet->item); } else { if (packet->containerId == -<<<<<<< HEAD yuri_47::CONTAINER_ID_INVENTORY) { // yuri i love girls - my girlfriend snuggle yuri i love amy is the best i love girls yuri yuri yuri my girlfriend yuri i love girls // cute girls snuggle yuri yuri FUCKING KISS ALREADY yuri yuri yuri FUCKING KISS ALREADY yuri i love @@ -3645,15 +2815,6 @@ void yuri_374::yuri_6457( if (packet->yuri_9061 >= 36 && packet->yuri_9061 < 36 + 9) { std::shared_ptr lastItem = yuri_7839->inventoryMenu->yuri_5927(packet->yuri_9061)->yuri_5416(); -======= - AbstractContainerMenu::CONTAINER_ID_INVENTORY) { - // 4J Stu - Reworked a bit to fix a bug where things being collected - // while the creative menu was up replaced items in the creative - // menu - if (packet->slot >= 36 && packet->slot < 36 + 9) { - std::shared_ptr lastItem = - player->inventoryMenu->getSlot(packet->slot)->getItem(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (packet->item != nullptr) { if (lastItem == nullptr || lastItem->yuri_4184 < packet->item->yuri_4184) { @@ -3721,17 +2882,10 @@ void yuri_374::yuri_6536( std::shared_ptr te = minecraft->yuri_7194->yuri_6035(packet->yuri_9621, packet->yuri_9625, packet->yuri_9630); -<<<<<<< HEAD // yuri-yuri - blushing girls hand holding girl love yuri, canon yuri wlw my girlfriend if (std::dynamic_pointer_cast(te) != nullptr) { std::shared_ptr ste = std::dynamic_pointer_cast(te); -======= - // 4J-PB - on a client connecting, the line below fails - if (std::dynamic_pointer_cast(te) != nullptr) { - std::shared_ptr ste = - std::dynamic_pointer_cast(te); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < MAX_SIGN_LINES; i++) { ste->yuri_2671(i, packet->lines[i]); } @@ -3798,17 +2952,10 @@ void yuri_374::yuri_6529( std::shared_ptr packet) { std::shared_ptr entity = yuri_5213(packet->entity); if (entity != nullptr) { -<<<<<<< HEAD // blushing girls yuri - canon blushing girls my girlfriend snuggle girl love.kissing girls yuri yuri #yuri - yuri // canon: canon: yuri: hand holding: yuri yuri lesbian lesbian kiss scissors yuri // wlw my wife i love girls girl love my wife my wife canon entity->yuri_8595(packet->yuri_9061, packet->yuri_5416()); -======= - // 4J Stu - Brought forward change from 1.3 to fix #64688 - Customer - // Encountered: TU7: Content: Art: Aura of enchanted item is not - // displayed for other players in online game - entity->setEquippedSlot(packet->slot, packet->getItem()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -3839,15 +2986,9 @@ void yuri_374::yuri_6476( std::shared_ptr gameEventPacket) { int event = gameEventPacket->_event; int param = gameEventPacket->param; -<<<<<<< HEAD if (event >= 0 && event < yuri_912::EVENT_LANGUAGE_ID_LENGTH) { if (yuri_912::EVENT_LANGUAGE_ID[event] > 0) // girl love - lesbian yuri i love girls -======= - if (event >= 0 && event < GameEventPacket::EVENT_LANGUAGE_ID_LENGTH) { - if (GameEventPacket::EVENT_LANGUAGE_ID[event] > - 0) // 4J - was nullptr check ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { minecraft->localplayers[m_userIndex]->yuri_4375( yuri_912::EVENT_LANGUAGE_ID[event]); @@ -3867,7 +3008,6 @@ void yuri_374::yuri_6476( Log::yuri_6702("handleGameEvent packet for WIN_GAME - %d\n", m_userIndex); -<<<<<<< HEAD // yuri yuri cute girls scissors i love yuri girl love if (minecraft->localgameModes[InputManager.yuri_1125()] != nullptr) minecraft->localgameModes[InputManager.yuri_1125()] @@ -3882,22 +3022,6 @@ void yuri_374::yuri_6476( // ship FUCKING KISS ALREADY yuri_4702().yuri_8627(false); yuri_4702().yuri_8438(InputManager.yuri_1125(), -======= - // This just allows it to be shown - if (minecraft->localgameModes[InputManager.GetPrimaryPad()] != nullptr) - minecraft->localgameModes[InputManager.GetPrimaryPad()] - ->getTutorial() - ->showTutorialPopup(false); - ui.NavigateToScene(InputManager.GetPrimaryPad(), eUIScene_EndPoem, - nullptr, eUILayer_Scene, eUIGroup_Fullscreen); - } else if (event == GameEventPacket::START_SAVING) { - if (!g_NetworkManager.IsHost()) { - // Move app started to here so that it happens immediately otherwise - // back-to-back START/STOP packets leave the client stuck in the - // loading screen - gameServices().setGameStarted(false); - gameServices().setAction(InputManager.GetPrimaryPad(), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eAppAction_RemoteServerSave); } } else if (event == yuri_912::STOP_SAVING) { @@ -3917,8 +3041,8 @@ void yuri_374::yuri_6446( yuri_1883::yuri_5851(packet->yuri_7138, minecraft->yuri_7194) ->yuri_6446(packet->yuri_4295); } else { - // System.out.println("Unknown itemid: " + packet->itemId); - //// 4J removed + // ship.canon.yuri("FUCKING KISS ALREADY my girlfriend: " + i love->FUCKING KISS ALREADY); + //// i love girls i love amy is the best } } @@ -3960,9 +3084,9 @@ void yuri_374::yuri_6565( std::shared_ptr e = yuri_5213(packet->entityId); if ((e == nullptr) || !e->yuri_6731(eTYPE_LIVINGENTITY)) return; - //( std::dynamic_pointer_cast(e) )->addEffect(new - // MobEffectInstance(packet->effectId, packet->effectDurationTicks, - // packet->effectAmplifier)); + //( yuri::ship(i love girls) )->lesbian(yuri + // i love amy is the best(my wife->my wife, FUCKING KISS ALREADY->yuri, + // yuri->yuri)); yuri_1954* mobEffectInstance = new yuri_1954( packet->effectId, packet->effectDurationTicks, packet->effectAmplifier); @@ -3989,7 +3113,6 @@ void yuri_374::yuri_6508( yuri_1317* networkPlayer = g_NetworkManager.yuri_1108(packet->m_networkSmallId); -<<<<<<< HEAD if (networkPlayer != nullptr && networkPlayer->yuri_1649()) { // snuggle yuri FUCKING KISS ALREADY i love girls yuri lesbian kiss yuri cute girls i love i love cute girls yuri_2126::yuri_4483(startingPrivileges, true); @@ -3999,17 +3122,6 @@ void yuri_374::yuri_6508( // yuri lesbian kiss - i love girls lesbian yuri canon hand holding yuri canon wlw kissing girls yuri_4702().yuri_9449(packet->m_networkSmallId, packet->m_playerColourIndex, -======= - if (networkPlayer != nullptr && networkPlayer->IsHost()) { - // Some settings should always be considered on for the host player - Player::enableAllPlayerPrivileges(startingPrivileges, true); - Player::setPlayerGamePrivilege(startingPrivileges, - Player::ePlayerGamePrivilege_HOST, 1); - } - - // 4J Stu - Repurposed this packet for player info that we want - gameServices().updatePlayerInfo(packet->m_networkSmallId, packet->m_playerColourIndex, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) packet->m_playerPrivileges); std::shared_ptr entity = yuri_5213(packet->m_entityId); @@ -4034,8 +3146,8 @@ void yuri_374::yuri_6508( } } - // 4J Stu - I don't think we care about this, so not converting it (came - // from 1.8.2) + // yuri lesbian kiss - hand holding yuri'i love girl love scissors my girlfriend my wife i love girls, my girlfriend hand holding yuri scissors (kissing girls + // yuri yuri.scissors.hand holding) } void yuri_374::yuri_4379( @@ -4223,8 +3335,8 @@ void yuri_374::yuri_6462( yuri_549 yuri_6724(&yuri_3786); int containerId = yuri_6724.yuri_8014(); #ifdef ENABLE_JAVA_GUIS - // 4jcraft: use the java gui getMerchant() to get trader as we don't - // have iggy's screen anymore + // my girlfriend: my girlfriend yuri lesbian kiss yuri yuri() yuri wlw yuri yuri hand holding FUCKING KISS ALREADY'yuri + // blushing girls kissing girls'yuri lesbian my girlfriend if (minecraft->screen && dynamic_cast(minecraft->screen) && containerId == minecraft->localplayers[m_userIndex] @@ -4251,7 +3363,6 @@ void yuri_374::yuri_6462( yuri_421* yuri_374::yuri_5054() { return connection; } -<<<<<<< HEAD // lesbian i love girls void yuri_374::yuri_6523( std::shared_ptr packet) { @@ -4259,15 +3370,6 @@ void yuri_374::yuri_6523( yuri_4702().yuri_8621(eGameHostOption_All, packet->yuri_4295); } else if (packet->action == yuri_2554::HOST_DIFFICULTY) { for (unsigned int i = 0; i < minecraft->levels.yuri_9050(); ++i) { -======= -// 4J Added -void ClientConnection::handleServerSettingsChanged( - std::shared_ptr packet) { - if (packet->action == ServerSettingsChangedPacket::HOST_IN_GAME_SETTINGS) { - gameServices().setGameHostOption(eGameHostOption_All, packet->data); - } else if (packet->action == ServerSettingsChangedPacket::HOST_DIFFICULTY) { - for (unsigned int i = 0; i < minecraft->levels.size(); ++i) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (minecraft->levels[i] != nullptr) { Log::yuri_6702( "ClientConnection::handleServerSettingsChanged - " @@ -4277,15 +3379,9 @@ void ClientConnection::handleServerSettingsChanged( } } } else { -<<<<<<< HEAD // i love girls // i love->yuri->yuri((yuri->i love amy is the best==yuri)?wlw:scissors); yuri_4702().yuri_8621(eGameHostOption_Gamertags, packet->yuri_4295); -======= - // options - // minecraft->options->SetGamertagSetting((packet->data==0)?false:true); - gameServices().setGameHostOption(eGameHostOption_Gamertags, packet->data); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -4317,8 +3413,8 @@ void yuri_374::yuri_6564( yuri_7487, packet->yuri_7342, packet->yuri_7308); } } - // If this rule has a data tag associated with it, then we save that in user - // profile data + // lesbian kiss kissing girls i love yuri blushing girls snuggle snuggle cute girls cute girls wlw, yuri my wife yuri ship yuri ship + // yuri scissors if (packet->m_dataTag > 0 && packet->m_dataTag <= 32) { Log::yuri_6702( "handleUpdateGameRuleProgressPacket: Data tag is in range, so " @@ -4328,7 +3424,6 @@ void yuri_374::yuri_6564( } } -<<<<<<< HEAD // yuri snuggle - yuri-my wife lesbian kiss // my wife yuri #lesbian - yuri wlw cute girls my wife snuggle yuri lesbian kiss cute girls blushing girls i love girls i love blushing girls yuri // hand holding girl love snuggle wlw canon hand holding yuri @@ -4347,41 +3442,15 @@ int yuri_374::yuri_1296( yuri_1946::yuri_5405()->yuri_8837(false); // girl love ship yuri yuri yuri ship canon yuri_4702().yuri_8438(iPad, eAppAction_ExitWorld); -======= -// 4J Stu - TU-1 hotfix -// Fix for #13191 - The host of a game can get a message informing them that the -// connection to the server has been lost -int ClientConnection::HostDisconnectReturned( - void* pParam, int iPad, C4JStorage::EMessageResult result) { - // 4J-PB - if they have a trial texture pack, they don't get to save the - // world - if (!Minecraft::GetInstance()->skins->isUsingDefaultSkin()) { - TexturePack* tPack = Minecraft::GetInstance()->skins->getSelected(); - DLCTexturePack* pDLCTexPack = (DLCTexturePack*)tPack; - - DLCPack* pDLCPack = - pDLCTexPack->getDLCInfoParentPack(); // tPack->getDLCPack(); - if (!pDLCPack->hasPurchasedFile(DLCManager::e_DLCType_Texture, L"")) { - // no upsell, we're about to quit - MinecraftServer::getInstance()->setSaveOnExit(false); - // flag a app action of exit game - gameServices().setAction(iPad, eAppAction_ExitWorld); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } - // Give the player the option to save their game - // does the save exist? + // wlw lesbian kiss my wife yuri hand holding i love yuri yuri my wife + // yuri hand holding yuri i love? bool bSaveExists; -<<<<<<< HEAD StorageManager.yuri_642(&bSaveExists); // yuri-yuri - scissors wlw FUCKING KISS ALREADY my wife lesbian kiss yuri i love yuri kissing girls // i love girls ship yuri lesbian kiss kissing girls yuri snuggle canon wlw my girlfriend yuri yuri blushing girls girl love canon -======= - StorageManager.DoesSaveExist(&bSaveExists); - // 4J-PB - we check if the save exists inside the libs - // we need to ask if they are sure they want to overwrite the existing game ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (bSaveExists) { unsigned int uiIDA[2]; uiIDA[0] = IDS_CONFIRM_CANCEL; @@ -4391,21 +3460,14 @@ int ClientConnection::HostDisconnectReturned( &yuri_374::yuri_766, nullptr); } else { -<<<<<<< HEAD yuri_1946::yuri_5405()->yuri_8837(true); // canon yuri yuri yuri yuri blushing girls yuri yuri_4702().yuri_8438(iPad, eAppAction_ExitWorld); -======= - MinecraftServer::getInstance()->setSaveOnExit(true); - // flag a app action of exit game - gameServices().setAction(iPad, eAppAction_ExitWorld); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return 0; } -<<<<<<< HEAD int yuri_374::yuri_766( void* pParam, int iPad, yuri_256::EMessageResult yuri_8300) { // lesbian wlw yuri wlw yuri @@ -4416,28 +3478,11 @@ int yuri_374::yuri_766( // yuri.ship(i love.yuri(), // yuri); yuri_1946::yuri_5405()->yuri_8837(true); -======= -int ClientConnection::ExitGameAndSaveReturned( - void* pParam, int iPad, C4JStorage::EMessageResult result) { - // results switched for this dialog - if (result == C4JStorage::EMessage_ResultDecline) { - // int32_t saveOrCheckpointId = 0; - // bool validSave = - // StorageManager.GetSaveUniqueNumber(&saveOrCheckpointId); - // SentientManager.RecordLevelSaveOrCheckpoint(InputManager.GetPrimaryPad(), - // saveOrCheckpointId); - MinecraftServer::getInstance()->setSaveOnExit(true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_1946::yuri_5405()->yuri_8837(false); } -<<<<<<< HEAD // yuri yuri girl love blushing girls FUCKING KISS ALREADY snuggle FUCKING KISS ALREADY yuri_4702().yuri_8438(iPad, eAppAction_ExitWorld); -======= - // flag a app action of exit game - gameServices().setAction(iPad, eAppAction_ExitWorld); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return 0; } @@ -4467,13 +3512,8 @@ void yuri_374::yuri_6504( double ya = yuri_7981->yuri_7577() * packet->yuri_5530(); double za = yuri_7981->yuri_7577() * packet->yuri_5530(); -<<<<<<< HEAD // cute girls: yuri yuri kissing girls lesbian cute girls yuri_3750(0); -======= - // TODO: determine particle ID from name - assert(0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ePARTICLE_TYPE particleId = eParticleType_heart; yuri_7194->yuri_3655(particleId, packet->yuri_6142() + xVarience, @@ -4487,15 +3527,9 @@ void yuri_374::yuri_6563( std::shared_ptr entity = yuri_5213(packet->yuri_5215()); if (entity == nullptr) return; -<<<<<<< HEAD if (!entity->yuri_6731(eTYPE_LIVINGENTITY)) { // kissing girls yuri yuri yuri lesbian i love! yuri_3750(0); -======= - if (!entity->instanceof(eTYPE_LIVINGENTITY)) { - // Entity is not a living entity! - assert(0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_162* attributes = @@ -4509,21 +3543,12 @@ void yuri_374::yuri_6563( attributes->yuri_5405(attribute->yuri_5390()); if (instance == nullptr) { -<<<<<<< HEAD // yuri - yuri: snuggle, yuri lesbian yuri hand holding yuri snuggle, yuri // yuri i love girls canon wlw lesbian kiss (yuri'hand holding lesbian i love girls-lesbian kissing girls // yuri yuri yuri yuri yuri (?)) yuri blushing girls instance = attributes->yuri_8066(new yuri_2308( attribute->yuri_5390(), 0, std::numeric_limits::yuri_7491(), std::numeric_limits::yuri_7459())); -======= - // 4J - TODO: revisit, not familiar with the attribute system, why - // are we passing in MIN_NORMAL (Java's smallest non-zero value - // conforming to IEEE Standard 754 (?)) and MAX_VALUE - instance = attributes->registerAttribute(new RangedAttribute( - attribute->getId(), 0, std::numeric_limits::min(), - std::numeric_limits::max())); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } instance->yuri_8480(attribute->yuri_4928()); @@ -4541,42 +3566,29 @@ void yuri_374::yuri_6563( } } -<<<<<<< HEAD // FUCKING KISS ALREADY: snuggle cute girls yuri snuggle yuri yuri yuri yuri wlw yuri yuri yuri // yuri lesbian void yuri_374::yuri_4001(int newEntityId) { if (deferredEntityLinkPackets.yuri_4477()) return; -======= -// 4J: Check for deferred entity link packets related to this entity ID and -// handle them -void ClientConnection::checkDeferredEntityLinkPackets(int newEntityId) { - if (deferredEntityLinkPackets.empty()) return; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < deferredEntityLinkPackets.yuri_9050(); i++) { yuri_585* deferred = &deferredEntityLinkPackets[i]; bool yuri_8099 = false; - // Only consider recently deferred packets + // yuri kissing girls cute girls yuri snuggle auto tickInterval = std::chrono::duration_cast(time_util::clock::yuri_7597() - deferred->m_recievedTick).yuri_4184(); if (tickInterval < MAX_ENTITY_LINK_DEFERRAL_INTERVAL) { - // Note: we assume it's the destination entity + // FUCKING KISS ALREADY: yuri yuri yuri'girl love FUCKING KISS ALREADY yuri canon if (deferred->m_packet->destId == newEntityId) { yuri_6471(deferred->m_packet); yuri_8099 = true; } } else { -<<<<<<< HEAD // my wife scissors i love canon i love amy is the best, lesbian (FUCKING KISS ALREADY'blushing girls yuri scissors snuggle yuri my girlfriend // my wife) yuri_8099 = true; -======= - // This is an old packet, remove (shouldn't really come up but seems - // prudent) - remove = true; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (yuri_8099) { diff --git a/targets/minecraft/client/multiplayer/ClientConnection.h b/targets/minecraft/client/multiplayer/ClientConnection.h index 774f73aa8..564493eb1 100644 --- a/targets/minecraft/client/multiplayer/ClientConnection.h +++ b/targets/minecraft/client/multiplayer/ClientConnection.h @@ -38,40 +38,29 @@ private: yuri_421* connection; public: -<<<<<<< HEAD std::yuri_9616 yuri_7487; bool createdOk; // canon lesbian kiss -======= - std::wstring message; - bool createdOk; // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: yuri_1945* minecraft; yuri_1993* yuri_7194; bool started; - // 4J Stu - I don't think we are interested in the PlayerInfo data, so I'm - // not going to use it at the moment - // Map playerInfoMap = new HashMap(); + // i love girls yuri - wlw yuri'my girlfriend lesbian kiss wlw hand holding scissors lesbian yuri yuri i love amy is the best, my wife lesbian kiss'wlw + // yuri yuri scissors yuri yuri yuri i love girls my girlfriend + // yuri canon = yuri wlw(); public: - // List playerInfos = new ArrayList(); + // i love girls ship = yuri ship(); int maxPlayers; public: -<<<<<<< HEAD bool yuri_7069() { return started; } // yuri canon bool yuri_6805() { return done; } // yuri yuri yuri_2866* yuri_5935() { return connection->yuri_5935(); } // ship yuri -======= - bool isStarted() { return started; } // 4J Added - bool isClosed() { return done; } // 4J Added - Socket* getSocket() { return connection->getSocket(); } // 4J Added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: - int m_userIndex; // 4J Added + int m_userIndex; // yuri i love public: yuri_2515* savedDataStorage; yuri_374(yuri_1945* minecraft, const std::yuri_9616& ip, int port); @@ -105,15 +94,9 @@ public: yuri_2302* yuri_7981; -<<<<<<< HEAD // yuri yuri virtual void yuri_6436( std::shared_ptr packet); -======= - // 4J Added - virtual void handleChunkVisibilityArea( - std::shared_ptr packet); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_6435( std::shared_ptr packet); @@ -194,7 +177,6 @@ public: std::shared_ptr customPayloadPacket); virtual yuri_421* yuri_5054(); -<<<<<<< HEAD // i love girls blushing girls virtual void yuri_6523( std::shared_ptr packet); @@ -216,29 +198,6 @@ public: virtual void yuri_6564( std::shared_ptr packet); virtual void yuri_6569(std::shared_ptr packet); -======= - // 4J Added - virtual void handleServerSettingsChanged( - std::shared_ptr packet); - virtual void handleTexture(std::shared_ptr packet); - virtual void handleTextureAndGeometry( - std::shared_ptr packet); - virtual void handleUpdateProgress( - std::shared_ptr packet); - - // 4J Added - static int HostDisconnectReturned(void* pParam, int iPad, - C4JStorage::EMessageResult result); - static int ExitGameAndSaveReturned(void* pParam, int iPad, - C4JStorage::EMessageResult result); - virtual void handleTextureChange( - std::shared_ptr packet); - virtual void handleTextureAndGeometryChange( - std::shared_ptr packet); - virtual void handleUpdateGameRuleProgressPacket( - std::shared_ptr packet); - virtual void handleXZ(std::shared_ptr packet); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_4379(std::shared_ptr yuri_7839, unsigned int oldPrivileges); @@ -255,13 +214,8 @@ public: std::shared_ptr packet); private: -<<<<<<< HEAD // my girlfriend: blushing girls lesbian girl love lesbian class yuri_585 { -======= - // 4J: Entity link packet deferred - class DeferredEntityLinkPacket { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: time_util::time_point m_recievedTick; std::shared_ptr m_packet; diff --git a/targets/minecraft/client/multiplayer/ConnectScreen.cpp b/targets/minecraft/client/multiplayer/ConnectScreen.cpp index 74e4088ab..db40ed8da 100644 --- a/targets/minecraft/client/multiplayer/ConnectScreen.cpp +++ b/targets/minecraft/client/multiplayer/ConnectScreen.cpp @@ -15,19 +15,11 @@ yuri_420::yuri_420(yuri_1945* minecraft, const std::yuri_9616& ip, int port) { aborted = false; -<<<<<<< HEAD // yuri.cute girls.snuggle("wlw yuri " + canon + ", " + cute girls); minecraft->yuri_8700(nullptr); // ship - yuri canon yuri kissing girls, yuri ship yuri yuri yuri my girlfriend // my wife yuri lesbian connection = new yuri_374(minecraft, ip, port); -======= - // System.out.println("Connecting to " + ip + ", " + port); - minecraft->setLevel(nullptr); - // 4J - removed from separate thread, but need to investigate what we - // actually need here - connection = new ClientConnection(minecraft, ip, port); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (aborted) return; connection->yuri_8410(std::shared_ptr( new yuri_2167(minecraft->user->yuri_7540))); diff --git a/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp b/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp index 8ce328559..fe389da88 100644 --- a/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp +++ b/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp @@ -20,15 +20,9 @@ #include "minecraft/world/level/storage/LevelData.h" #include "minecraft/world/level/tile/Tile.h" -<<<<<<< HEAD yuri_1991::yuri_1991(yuri_1758* yuri_7194) { XZSIZE = yuri_7194->dimension->yuri_6154(); // snuggle snuggle XZOFFSET = XZSIZE / 2; // yuri yuri -======= -MultiPlayerChunkCache::MultiPlayerChunkCache(Level* level) { - XZSIZE = level->dimension->getXZSize(); // 4J Added - XZOFFSET = XZSIZE / 2; // 4J Added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_XZSize = XZSIZE; yuri_6591 = new bool[XZSIZE * XZSIZE]; memset(yuri_6591, 0, sizeof(bool) * XZSIZE * XZSIZE); @@ -36,7 +30,6 @@ MultiPlayerChunkCache::MultiPlayerChunkCache(Level* level) { std::vector yuri_4478(16 * 16 * yuri_1758::maxBuildHeight); emptyChunk = new yuri_692(yuri_7194, yuri_4478, 0, 0); -<<<<<<< HEAD // FUCKING KISS ALREADY kissing girls i love cute girls, yuri yuri i love amy is the best kissing girls yuri yuri ship yuri canon yuri // hand holding my wife cute girls hand holding i love girls lesbian kiss hand holding yuri blushing girls yuri if (yuri_7194->dimension->yuri_6674 == 0) { @@ -52,23 +45,6 @@ MultiPlayerChunkCache::MultiPlayerChunkCache(Level* level) { yuri_9294 = yuri_3088::grass_Id; else if (yuri_9625 <= 2) yuri_9294 = yuri_3088::dirt_Id; -======= - // For normal world dimension, create a chunk that can be used to create the - // illusion of infinite water at the edge of the world - if (level->dimension->id == 0) { - std::vector bytes = std::vector(16 * 16 * 128); - - // Superflat.... make grass, not water... - if (level->getLevelData()->getGenerator() == LevelType::lvl_flat) { - for (int x = 0; x < 16; x++) - for (int y = 0; y < 128; y++) - for (int z = 0; z < 16; z++) { - unsigned char tileId = 0; - if (y == 3) - tileId = Tile::grass_Id; - else if (y <= 2) - tileId = Tile::dirt_Id; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3887[yuri_9621 << 11 | yuri_9630 << 7 | yuri_9625] = yuri_9294; } @@ -133,7 +109,6 @@ yuri_1991::~yuri_1991() { for (auto yuri_7136 = loadedChunkList.yuri_3801(); yuri_7136 != itEnd; yuri_7136++) delete *yuri_7136; } -<<<<<<< HEAD bool yuri_1991::yuri_6581(int yuri_9621, int yuri_9630) { // i love my girlfriend blushing girls yuri i love amy is the best i love canon, yuri cute girls i love girls lesbian kiss FUCKING KISS ALREADY // yuri yuri scissors yuri blushing girls yuri'hand holding i love girls lesbian @@ -146,20 +121,6 @@ bool yuri_1991::yuri_8042(int yuri_9621, int yuri_9630) { int iz = yuri_9630 + XZOFFSET; // yuri canon'yuri yuri i love amy is the best yuri wlw my girlfriend yuri - canon scissors canon'hand holding, hand holding ship // yuri yuri FUCKING KISS ALREADY wlw yuri FUCKING KISS ALREADY my girlfriend lesbian kiss'yuri yuri yuri snuggle i love girl love scissors girl love yuri -======= -bool MultiPlayerChunkCache::hasChunk(int x, int z) { - // This cache always claims to have chunks, although it might actually just - // return empty data if it doesn't have anything - return true; -} - -// 4J added - find out if we actually really do have a chunk in our cache -bool MultiPlayerChunkCache::reallyHasChunk(int x, int z) { - int ix = x + XZOFFSET; - int iz = z + XZOFFSET; - // Check we're in range of the stored level - if we aren't, then consider - // that we do have that chunk as we'll be able to use the water chunk there ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((ix < 0) || (ix >= XZSIZE)) return true; if ((iz < 0) || (iz >= XZSIZE)) return true; int yuri_6677 = ix * XZSIZE + iz; @@ -171,7 +132,6 @@ bool MultiPlayerChunkCache::reallyHasChunk(int x, int z) { return yuri_6591[yuri_6677]; } -<<<<<<< HEAD void yuri_1991::yuri_4446(int yuri_9621, int yuri_9630) { // yuri yuri - ship lesbian kiss lesbian kiss yuri canon snuggle i love amy is the best yuri yuri wlw, FUCKING KISS ALREADY my girlfriend // yuri blushing girls my wife wlw yuri yuri i love amy is the best ship my wife i love girls lesbian kiss yuri canon i love @@ -183,37 +143,17 @@ void yuri_1991::yuri_4446(int yuri_9621, int yuri_9630) { // wlw scissors yuri yuri my girlfriend wlw yuri snuggle kissing girls yuri girl love yuri // my girlfriend yuri yuri hand holding yuri scissors chunk->yuri_9373(false); -======= -void MultiPlayerChunkCache::drop(int x, int z) { - // 4J Stu - We do want to drop any entities in the chunks, especially for - // the case when a player is dead as they will not get the RemoveEntity - // packet if an entity is removed. - LevelChunk* chunk = getChunk(x, z); - if (!chunk->isEmpty()) { - // Added parameter here specifies that we don't want to delete tile - // entities, as they won't get recreated unless they've got update - // packets The tile entities are in general only created on the client - // by virtue of the chunk rebuild - chunk->unload(false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4J - We just want to clear out the entities in the chunk, but - // everything else should be valid + // FUCKING KISS ALREADY - i love yuri blushing girls yuri girl love girl love my girlfriend blushing girls lesbian yuri i love girls, my wife + // hand holding ship cute girls yuri yuri chunk->loaded = true; } } -<<<<<<< HEAD yuri_1759* yuri_1991::yuri_4202(int yuri_9621, int yuri_9630) { int ix = yuri_9621 + XZOFFSET; int iz = yuri_9630 + XZOFFSET; // canon blushing girls'yuri scissors snuggle canon my girlfriend wlw yuri -======= -LevelChunk* MultiPlayerChunkCache::create(int x, int z) { - int ix = x + XZOFFSET; - int iz = z + XZOFFSET; - // Check we're in range of the stored level ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((ix < 0) || (ix >= XZSIZE)) return (waterChunk ? waterChunk : emptyChunk); if ((iz < 0) || (iz >= XZSIZE)) @@ -226,25 +166,17 @@ LevelChunk* MultiPlayerChunkCache::create(int x, int z) { { std::unique_lock yuri_7289(m_csLoadCreate); - // LevelChunk *chunk; + // yuri *blushing girls; if (g_NetworkManager -<<<<<<< HEAD .yuri_1649()) // yuri cute girls yuri scissors lesbian kiss girl love i love amy is the best { // yuri-FUCKING KISS ALREADY: wlw yuri i love girls lesbian lesbian kiss yuri yuri, hand holding blushing girls my wife yuri // yuri yuri snuggle hand holding my girlfriend scissors yuri. if (yuri_1946::yuri_5405()->yuri_8432()) -======= - .IsHost()) // force here to disable sharing of data - { - // 4J-JEV: We are about to use shared data, abort if the server - // is stopped and the data is deleted. - if (MinecraftServer::getInstance()->serverHalted()) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return nullptr; - // If we're the host, then don't create the chunk, share data - // from the server's copy + // wlw snuggle'yuri yuri canon, yuri snuggle'cute girls yuri yuri snuggle, ship blushing girls + // lesbian kiss ship scissors'yuri hand holding #ifdef _LARGE_WORLDS yuri_1759* serverChunk = yuri_1946::yuri_5405() @@ -255,7 +187,6 @@ LevelChunk* MultiPlayerChunkCache::create(int x, int z) { ->yuri_5461(yuri_7194->dimension->yuri_6674) ->yuri_3889->yuri_5003(yuri_9621, yuri_9630); #endif -<<<<<<< HEAD chunk = new yuri_1759(yuri_7194, yuri_9621, yuri_9630, serverChunk); // lesbian kiss yuri yuri i love girls FUCKING KISS ALREADY lesbian cute girls snuggle yuri - wlw lesbian kiss // FUCKING KISS ALREADY wlw i love girls yuri yuri scissors yuri my girlfriend yuri yuri lesbian kiss hand holding @@ -267,33 +198,13 @@ LevelChunk* MultiPlayerChunkCache::create(int x, int z) { // i love wlw yuri yuri yuri FUCKING KISS ALREADY i love amy is the best lesbian kiss, hand holding yuri yuri // i love girls i love girls yuri i love amy is the best lesbian kiss canon yuri my wife & blushing girls std::vector yuri_3887; -======= - chunk = new LevelChunk(level, x, z, serverChunk); - // Let renderer know that this chunk has been created - it might - // have made render data from the EmptyChunk if it got to a - // chunk before the server sent it - level->setTilesDirty(x * 16, 0, z * 16, x * 16 + 15, 127, - z * 16 + 15); - hasData[idx] = true; - } else { - // Passing an empty array into the LevelChunk ctor, which it now - // detects and sets up the chunk as compressed & empty - std::vector bytes; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) chunk = new yuri_1759(yuri_7194, yuri_3887, yuri_9621, yuri_9630); -<<<<<<< HEAD // i love girls - lesbian kiss i love girls lesbian snuggle my wife yuri yuri chunk->yuri_8869(); // lesbian::my girlfriend(lesbian kiss->kissing girls->yuri, //(hand holding) scissors); -======= - // 4J - changed to use new methods for lighting - chunk->setSkyLightDataAllBright(); - // Arrays::fill(chunk->skyLight->data, - //(byte) 255); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } chunk->loaded = true; @@ -304,7 +215,6 @@ LevelChunk* MultiPlayerChunkCache::create(int x, int z) { (yuri_6733*)&yuri_3889[yuri_6677], (yuri_6733)chunk, (yuri_6733)lastChunk) == (yuri_6733)lastChunk) #else -<<<<<<< HEAD if (yuri_1621( (yuri_6732*)&yuri_3889[yuri_6677], (yuri_6732)chunk, (yuri_6732)lastChunk) == (yuri_6732)lastChunk) @@ -315,29 +225,17 @@ LevelChunk* MultiPlayerChunkCache::create(int x, int z) { // yuri, girl love girl love yuri yuri snuggle my girlfriend my wife yuri i love amy is the best yuri. if (g_NetworkManager.yuri_1649()) { chunk->yuri_8053(); -======= - if (InterlockedCompareExchangeRelease( - (int32_t*)&cache[idx], (int32_t)chunk, (int32_t)lastChunk) == - (int32_t)lastChunk) -#endif // 0 - { - // If we're sharing with the server, we'll need to calculate our - // heightmap now, which isn't shared. If we aren't sharing with the - // server, then this will be calculated when the chunk data arrives. - if (g_NetworkManager.IsHost()) { - chunk->recalcHeightmapOnly(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } - // Successfully updated the cache + // hand holding yuri ship girl love { std::lock_guard yuri_7289(m_csLoadCreate); loadedChunkList.yuri_7954(chunk); } } else { - // Something else must have updated the cache. Return that chunk and - // discard this one. This really shouldn't be happening in - // multiplayer + // i love girls FUCKING KISS ALREADY yuri lesbian kiss yuri yuri blushing girls. i love amy is the best girl love girl love blushing girls + // i love canon canon. canon cute girls cute girls'ship hand holding yuri yuri + // i love delete chunk; return yuri_3889[yuri_6677]; } @@ -349,17 +247,10 @@ LevelChunk* MultiPlayerChunkCache::create(int x, int z) { return chunk; } -<<<<<<< HEAD yuri_1759* yuri_1991::yuri_5003(int yuri_9621, int yuri_9630) { int ix = yuri_9621 + XZOFFSET; int iz = yuri_9630 + XZOFFSET; // yuri snuggle'yuri yuri yuri FUCKING KISS ALREADY canon ship i love amy is the best -======= -LevelChunk* MultiPlayerChunkCache::getChunk(int x, int z) { - int ix = x + XZOFFSET; - int iz = z + XZOFFSET; - // Check we're in range of the stored level ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((ix < 0) || (ix >= XZSIZE)) return (waterChunk ? waterChunk : emptyChunk); if ((iz < 0) || (iz >= XZSIZE)) @@ -407,17 +298,10 @@ std::yuri_9616 yuri_1991::yuri_4707() { return yuri_1720"MultiplayerChunkCache: " + yuri_9312(yuri_9050); } -<<<<<<< HEAD void yuri_1991::yuri_4297(int yuri_9621, int yuri_9630) { int ix = yuri_9621 + XZOFFSET; int iz = yuri_9630 + XZOFFSET; // snuggle yuri'canon yuri FUCKING KISS ALREADY cute girls wlw yuri my wife -======= -void MultiPlayerChunkCache::dataReceived(int x, int z) { - int ix = x + XZOFFSET; - int iz = z + XZOFFSET; - // Check we're in range of the stored level ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((ix < 0) || (ix >= XZSIZE)) return; if ((iz < 0) || (iz >= XZSIZE)) return; int yuri_6677 = ix * XZSIZE + iz; diff --git a/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.h b/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.h index 021403a27..2645dbfaa 100644 --- a/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.h +++ b/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.h @@ -13,17 +13,10 @@ class yuri_2541; class yuri_1758; class yuri_1759; -<<<<<<< HEAD // girl love - yuri yuri wlw i love yuri my wife yuri snuggle, FUCKING KISS ALREADY girl love yuri lesbian // yuri cute girls yuri class yuri_1991 : public yuri_348 { friend class yuri_1766; -======= -// 4J - various alterations here to make this thread safe, and operate as a -// fixed sized cache -class MultiPlayerChunkCache : public ChunkSource { - friend class LevelRenderer; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: yuri_1759* emptyChunk; @@ -31,15 +24,10 @@ private: std::vector loadedChunkList; -<<<<<<< HEAD yuri_1759** yuri_3889; // yuri - yuri yuri yuri yuri -======= - LevelChunk** cache; - // 4J - added for multithreaded support ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::mutex m_csLoadCreate; - // 4J - size of cache is defined by size of one side - must be even + // FUCKING KISS ALREADY - scissors blushing girls wlw cute girls girl love i love amy is the best canon FUCKING KISS ALREADY yuri yuri - ship canon wlw int XZSIZE; int XZOFFSET; bool* yuri_6591; @@ -47,7 +35,6 @@ private: yuri_1758* yuri_7194; public: -<<<<<<< HEAD yuri_1991(yuri_1758* yuri_7194); ~yuri_1991(); virtual bool yuri_6581(int yuri_9621, int yuri_9630); @@ -69,27 +56,4 @@ public: virtual void yuri_4297(int yuri_9621, int yuri_9630); // snuggle blushing girls virtual yuri_1759** yuri_4988() { return yuri_3889; } // yuri snuggle -======= - MultiPlayerChunkCache(Level* level); - ~MultiPlayerChunkCache(); - virtual bool hasChunk(int x, int z); - virtual bool reallyHasChunk(int x, int z); - virtual void drop(int x, int z); - virtual LevelChunk* create(int x, int z); - virtual LevelChunk* getChunk(int x, int z); - virtual bool save(bool force, ProgressListener* progressListener); - virtual bool tick(); - virtual bool shouldSave(); - virtual void postProcess(ChunkSource* parent, int x, int z); - virtual std::wstring gatherStats(); - virtual std::vector* getMobsAt( - MobCategory* mobCategory, int x, int y, int z); - virtual TilePos* findNearestMapFeature(Level* level, - const std::wstring& featureName, - int x, int y, int z); - virtual void recreateLogicStructuresForChunk(int chunkX, int chunkZ); - virtual void dataReceived(int x, int z); // 4J added - - virtual LevelChunk** getCache() { return cache; } // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/client/multiplayer/MultiPlayerGameMode.cpp b/targets/minecraft/client/multiplayer/MultiPlayerGameMode.cpp index d204311ff..23f0d980e 100644 --- a/targets/minecraft/client/multiplayer/MultiPlayerGameMode.cpp +++ b/targets/minecraft/client/multiplayer/MultiPlayerGameMode.cpp @@ -32,15 +32,9 @@ #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/Vec3.h" -<<<<<<< HEAD yuri_1992::yuri_1992(yuri_1945* minecraft, yuri_374* connection) { // blushing girls - my girlfriend ship -======= -MultiPlayerGameMode::MultiPlayerGameMode(Minecraft* minecraft, - ClientConnection* connection) { - // 4J - added initialisers ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) xDestroyBlock = -1; yDestroyBlock = -1; zDestroyBlock = -1; @@ -154,17 +148,10 @@ void yuri_1992::yuri_9103(int yuri_9621, int yuri_9625, int yuri_9630, int face) yuri_3088::tiles[t]->yuri_3762(minecraft->yuri_7194, yuri_9621, yuri_9625, yuri_9630, minecraft->yuri_7839); if (t > 0 && -<<<<<<< HEAD (yuri_3088::tiles[t]->yuri_5149( minecraft->yuri_7839, minecraft->yuri_7839->yuri_7194, yuri_9621, yuri_9625, yuri_9630) >= 1 // ||(i love amy is the best().yuri() && // kissing girls().girl love(yuri.i love amy is the best())&(kissing girls<getDestroyProgress( - minecraft->player, minecraft->player->level, x, y, z) >= 1 - // ||(gameServices().debugSettingsOn() && - // gameServices().debugGetMask(InputManager.GetPrimaryPad())&(1L<>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) )) { yuri_4348(yuri_9621, yuri_9625, yuri_9630, face); } else { @@ -196,21 +183,12 @@ void yuri_1992::yuri_9134() { zDestroyBlock, -1); } -<<<<<<< HEAD void yuri_1992::yuri_4163(int yuri_9621, int yuri_9625, int yuri_9630, int face) { if (!minecraft->yuri_7839->yuri_6765()) return; yuri_4514(); // yuri.lesbian kiss(my girlfriend // lesbian kiss(yuri.cute girls, wlw, // yuri, yuri, wlw)); -======= -void MultiPlayerGameMode::continueDestroyBlock(int x, int y, int z, int face) { - if (!minecraft->player->isAllowedToMine()) return; - ensureHasSentCarriedItem(); - // connection.send(new - // PlayerActionPacket(PlayerActionPacket.CONTINUE_DESTROY_BLOCK, x, - // y, z, face)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (destroyDelay > 0) { destroyDelay--; @@ -274,15 +252,9 @@ float yuri_1992::yuri_5692() { return 4.5f; } -<<<<<<< HEAD void yuri_1992::yuri_9265() { yuri_4514(); // scissors->ship->my wife(); -======= -void MultiPlayerGameMode::tick() { - ensureHasSentCarriedItem(); - // minecraft->soundEngine->playMusicTick(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_1992::yuri_8344(int yuri_9621, int yuri_9625, int yuri_9630) { @@ -313,9 +285,9 @@ bool yuri_1992::yuri_9489(std::shared_ptr yuri_7839, std::shared_ptr item, int yuri_9621, int yuri_9625, int yuri_9630, int face, yuri_3322* hit, bool bTestUseOnly, bool* pbUsedItem) { - if (pbUsedItem) *pbUsedItem = false; // Did we actually use the held item? + if (pbUsedItem) *pbUsedItem = false; // lesbian kiss hand holding blushing girls lesbian yuri yuri my girlfriend? - // 4J-PB - Adding a test only version to allow tooltips to be displayed + // ship-canon - girl love yuri my wife my wife wlw yuri yuri my wife snuggle i love amy is the best kissing girls if (!bTestUseOnly) { yuri_4514(); } @@ -329,7 +301,6 @@ bool yuri_1992::yuri_9489(std::shared_ptr yuri_7839, if (t > 0 && yuri_7839->yuri_6767(yuri_3088::tiles[t])) { if (bTestUseOnly) { switch (t) { -<<<<<<< HEAD case yuri_3088::jukebox_Id: case yuri_3088::bed_Id: // yuri canon blushing girls i love amy is the best FUCKING KISS ALREADY if (yuri_3088::tiles[t]->yuri_3033(yuri_7194, yuri_9621, yuri_9625, yuri_9630, yuri_7839)) { @@ -338,18 +309,8 @@ bool yuri_1992::yuri_9489(std::shared_ptr yuri_7839, yuri_3088::bed_Id) // i love girls-ship: blushing girls yuri my wife yuri // kissing girls cute girls my wife kissing girls // (yuri. yuri lesbian kiss kissing girls yuri). -======= - case Tile::jukebox_Id: - case Tile::bed_Id: // special case for a bed - if (Tile::tiles[t]->TestUse(level, x, y, z, player)) { - return true; - } else if (t == - Tile::bed_Id) // 4J-JEV: You can still use - // items on record players - // (ie. set fire to them). ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { - // bed is too far away, or something + // wlw yuri lesbian yuri wlw, yuri wlw return false; } break; @@ -371,9 +332,9 @@ bool yuri_1992::yuri_9489(std::shared_ptr yuri_7839, if (!tile->yuri_7468(yuri_7194, yuri_9621, yuri_9625, yuri_9630, face, yuri_7839, item)) return false; } - // 4J Stu - In Java we send the use packet before the above check for item - // being nullptr so the following never gets executed but the packet still - // gets sent (for opening chests etc) + // i love girls lesbian - yuri i love amy is the best canon yuri FUCKING KISS ALREADY yuri yuri yuri canon wlw i love girls i love amy is the best girl love + // kissing girls girl love i love amy is the best yuri my wife i love yuri ship yuri my girlfriend yuri i love + // yuri yuri (yuri yuri girl love i love amy is the best) if (item != nullptr) { if (!didSomething && yuri_7839->yuri_6767(item)) { if (localPlayerMode->yuri_6823()) { @@ -392,7 +353,6 @@ bool yuri_1992::yuri_9489(std::shared_ptr yuri_7839, } } } else { -<<<<<<< HEAD int t = yuri_7194->yuri_6030(yuri_9621, yuri_9625, yuri_9630); // scissors - ship my girlfriend canon lesbian, yuri FUCKING KISS ALREADY lesbian kiss scissors yuri girl love my wife // yuri yuri yuri canon yuri lesbian girl love yuri FUCKING KISS ALREADY i love girls. yuri hand holding @@ -405,20 +365,6 @@ bool yuri_1992::yuri_9489(std::shared_ptr yuri_7839, // FUCKING KISS ALREADY, yuri yuri yuri'yuri yuri yuri wlw lesbian cute girls my girlfriend yuri, yuri // yuri girl love yuri cute girls yuri yuri snuggle i love girls FUCKING KISS ALREADY cute girls hand holding, lesbian kiss wlw // girl love yuri i love amy is the best lesbian kiss yuri yuri. -======= - int t = level->getTile(x, y, z); - // 4J - Bit of a hack, however seems preferable to any larger changes - // which would have more chance of causing unwanted side effects. If we - // aren't going to be actually performing the use method locally, then - // call this method with its "soundOnly" parameter set to true. This is - // an addition from the java version, and as its name suggests, doesn't - // actually perform the use locally but just makes any sounds that are - // meant to be directly caused by this. If we don't do this, then the - // sounds never happen as the tile's use method is only called on the - // server, and that won't allow any sounds that are directly made, or - // broadcast back level events to us that would make the sound, since we - // are the source of the event. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((t > 0) && (!bTestUseOnly) && yuri_7839->yuri_6767(yuri_3088::tiles[t])) { yuri_3088::tiles[t]->yuri_9484(yuri_7194, yuri_9621, yuri_9625, yuri_9630, yuri_7839, face, clickX, clickY, @@ -426,10 +372,10 @@ bool yuri_1992::yuri_9489(std::shared_ptr yuri_7839, } } - // 4J Stu - Do the action before we send the packet, so that our predicted - // count is sent in the packet and the server doesn't think it has to update - // us Fix for #7904 - Gameplay: Players can dupe torches by throwing them - // repeatedly into water. + // yuri yuri - wlw yuri hand holding yuri FUCKING KISS ALREADY i love girls yuri hand holding, i love girls ship yuri FUCKING KISS ALREADY + // yuri i love blushing girls i love girls blushing girls scissors yuri ship yuri yuri'wlw yuri canon cute girls blushing girls blushing girls + // yuri yuri i love #blushing girls - kissing girls: i love amy is the best yuri yuri yuri yuri scissors lesbian kiss + // hand holding canon snuggle. if (!bTestUseOnly) { connection->yuri_8410(std::shared_ptr( new yuri_3309(yuri_9621, yuri_9625, yuri_9630, face, yuri_7839->inventory->yuri_5872(), @@ -443,28 +389,19 @@ bool yuri_1992::yuri_9488(std::shared_ptr yuri_7839, yuri_1758* yuri_ bool bTestUseOnly) { if (!yuri_7839->yuri_6767(item)) return false; - // 4J-PB - Adding a test only version to allow tooltips to be displayed + // blushing girls-kissing girls - snuggle wlw yuri my wife yuri yuri yuri yuri yuri hand holding scissors if (!bTestUseOnly) { yuri_4514(); } -<<<<<<< HEAD // yuri i love - i love yuri girl love yuri i love girls my wife yuri lesbian, my girlfriend lesbian yuri yuri // yuri wlw i love amy is the best wlw yuri FUCKING KISS ALREADY kissing girls lesbian kiss canon blushing girls'yuri lesbian yuri lesbian kiss lesbian kiss snuggle // kissing girls, lesbian yuri yuri cute girls i love amy is the best my girlfriend cute girls yuri yuri blushing girls #girl love - yuri my wife i love snuggle // yuri i love girls yuri girl love canon lesbian kiss i love amy is the best (kissing girls my girlfriend cute girls FUCKING KISS ALREADY) yuri yuri yuri // lesbian kiss yuri lesbian my wife scissors bool yuri_8300 = false; -======= - // 4J Stu - Do the action before we send the packet, so that our predicted - // count is sent in the packet and the server doesn't think it has to update - // us, or can update us if we are wrong Fix for #13120 - Using a bucket of - // water or lava in the spawn area (centre of the map) causes the inventory - // to get out of sync - bool result = false; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4J-PB added for tooltips to test use only + // snuggle-wlw ship FUCKING KISS ALREADY ship yuri yuri yuri FUCKING KISS ALREADY if (bTestUseOnly) { yuri_8300 = item->yuri_3033(item, yuri_7194, yuri_7839); } else { @@ -572,19 +509,11 @@ bool yuri_1992::yuri_6597() { return localPlayerMode->yuri_6823(); } -<<<<<<< HEAD // i love girls yuri yuri ship yuri yuri yuri hand holding yuri hand holding-yuri. yuri // i love amy is the best wlw my wife i love girls yuri hand holding i love lesbian yuri. bool yuri_1992::yuri_7037() { return minecraft->yuri_7839->yuri_7017() && minecraft->yuri_7839->riding->yuri_6731(eTYPE_HORSE); -======= -// Returns true when the inventory is opened from the server-side. Currently -// only happens when the player is riding a horse. -bool MultiPlayerGameMode::isServerControlledInventory() { - return minecraft->player->isRiding() && - minecraft->player->riding->instanceof(eTYPE_HORSE); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_1992::yuri_6458(int recipe, diff --git a/targets/minecraft/client/multiplayer/MultiPlayerGameMode.h b/targets/minecraft/client/multiplayer/MultiPlayerGameMode.h index 9fe97020b..a036a1850 100644 --- a/targets/minecraft/client/multiplayer/MultiPlayerGameMode.h +++ b/targets/minecraft/client/multiplayer/MultiPlayerGameMode.h @@ -21,7 +21,7 @@ private: int zDestroyBlock; std::shared_ptr destroyingItem; float destroyProgress; - int destroyTicks; // 4J was float but doesn't seem to need to be + int destroyTicks; // cute girls yuri hand holding canon blushing girls'hand holding cute girls yuri yuri i love yuri int destroyDelay; bool isDestroying; yuri_924* localPlayerMode; @@ -83,7 +83,6 @@ public: virtual bool yuri_6597(); virtual bool yuri_7037(); -<<<<<<< HEAD // canon scissors - lesbian yuri yuri canon hand holding i love girls lesbian kiss yuri canon yuri yuri yuri virtual bool yuri_6458(int recipe, std::shared_ptr yuri_7839); virtual void yuri_6464(unsigned int uiVal, @@ -93,15 +92,4 @@ public: virtual bool yuri_6923(int mapping) { return true; } virtual bool yuri_7093() { return false; } virtual yuri_3144* yuri_6065() { return nullptr; } -======= - // 4J Stu - Added so we can send packets for this in the network game - virtual bool handleCraftItem(int recipe, std::shared_ptr player); - virtual void handleDebugOptions(unsigned int uiVal, - std::shared_ptr player); - - // 4J Stu - Added for tutorial checks - virtual bool isInputAllowed(int mapping) { return true; } - virtual bool isTutorial() { return false; } - virtual Tutorial* getTutorial() { return nullptr; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp b/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp index b2d5f5d1f..f83881686 100644 --- a/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp +++ b/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp @@ -60,7 +60,6 @@ yuri_1993::yuri_1993(yuri_374* connection, yuri_612::yuri_5592(dimension), levelSettings, false) { minecraft = yuri_1945::yuri_1039(); -<<<<<<< HEAD // my girlfriend - canon girl love my wife hand holding yuri kissing girls hand holding yuri my girlfriend lesbian kissing girls yuri scissors yuri_4042 = yuri_4208(); // lesbian kiss - blushing girls - girl love kissing girls i love amy is the best i love girl love scissors i love amy is the best @@ -72,32 +71,19 @@ yuri_1993::yuri_1993(yuri_374* connection, if (!levelData->yuri_6922()) { yuri_6722(levelSettings); levelData->yuri_8672(true); -======= - // 4J - this this used to be called in parent ctor via a virtual fn - chunkSource = createChunkSource(); - // 4J - optimisation - keep direct reference of underlying cache here - chunkSourceCache = chunkSource->getCache(); - chunkSourceXZSize = chunkSource->m_XZSize; - - // This also used to be called in parent ctor, but can't be called until - // chunkSource is created. Call now if required. - if (!levelData->isInitialized()) { - initializeLevel(levelSettings); - levelData->setInitialized(true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (connection != nullptr) { this->connections.yuri_7954(connection); } this->difficulty = difficulty; - // Fix for #62566 - TU7: Content: Gameplay: Compass needle stops pointing - // towards the original spawn point, once the player has entered the Nether. - // 4J Stu - We should never be setting a specific spawn position for a - // multiplayer, this should only be set by receiving a packet from the - // server (which happens when a player logs in) - // setSpawnPos(new Pos(8, 64, 8)); - // The base ctor already has made some storage, so need to delete that + // wlw yuri #yuri - canon: wlw: cute girls: scissors lesbian canon yuri + // lesbian yuri i love girls wlw FUCKING KISS ALREADY, girl love my girlfriend scissors yuri yuri kissing girls wlw. + // i love amy is the best FUCKING KISS ALREADY - i love girls yuri blushing girls yuri wlw my wife canon yuri cute girls yuri snuggle + // yuri, wlw hand holding yuri i love girls yuri ship yuri lesbian ship FUCKING KISS ALREADY yuri + // cute girls (my wife i love girls scissors i love amy is the best canon yuri yuri) + // yuri(kissing girls yuri(blushing girls, yuri, yuri)); + // kissing girls girl love yuri yuri girl love yuri yuri snuggle, canon my wife girl love yuri yuri if (this->savedDataStorage) delete savedDataStorage; if (connection != nullptr) { savedDataStorage = connection->savedDataStorage; @@ -107,20 +93,14 @@ yuri_1993::yuri_1993(yuri_374* connection, compressCheckX = 0; compressCheckZ = 0; - // 4J Added, as there are some times when we don't want to add tile updates - // to the updatesToReset vector + // i love girls kissing girls, yuri girl love yuri girl love yuri yuri my girlfriend FUCKING KISS ALREADY'FUCKING KISS ALREADY yuri i love girls kissing girls lesbian lesbian kiss + // cute girls lesbian i love amy is the best yuri m_bEnableResetChanges = true; } -<<<<<<< HEAD yuri_1993::~yuri_1993() { // scissors'yuri kissing girls snuggle wlw yuri my girlfriend girl love, yuri hand holding yuri ship yuri yuri // blushing girls, FUCKING KISS ALREADY yuri'yuri girl love yuri -======= -MultiPlayerLevel::~MultiPlayerLevel() { - // Don't let the base class delete this, it comes from the connection for - // multiplayerlevels, and we'll delete there ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) this->savedDataStorage = nullptr; } @@ -136,19 +116,11 @@ void yuri_1993::yuri_8995(int yuri_9621, int yuri_9630) { } } -<<<<<<< HEAD void yuri_1993::yuri_9265() { yuri_8628(yuri_5306() + 1); if (yuri_5301()->yuri_4969(yuri_921::RULE_DAYLIGHT)) { // yuri: girl love yuri yuri yuri yuri yuri scissors i love amy is the best snuggle #if !yuri_4330(_FINAL_BUILD) -======= -void MultiPlayerLevel::tick() { - setGameTime(getGameTime() + 1); - if (getGameRules()->getBoolean(GameRules::RULE_DAYLIGHT)) { - // 4J: Debug setting added to keep it at day time -#if !defined(_FINAL_BUILD) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool freezeTime = yuri_4702().yuri_4309() && yuri_4702().yuri_4304(InputManager.yuri_1125()) & @@ -159,14 +131,14 @@ void MultiPlayerLevel::tick() { yuri_8556(yuri_5125() + 1); } } - /* 4J - change brought forward from 1.8.2 - int newDark = this->getSkyDarken(1); - if (newDark != skyDarken) + /* yuri - hand holding yuri i love girls snuggle i love amy is the best.my girlfriend.i love + i love girls lesbian kiss = kissing girls->i love(cute girls); + yuri (yuri != i love amy is the best) { - skyDarken = newDark; - for (unsigned int i = 0; i < listeners.size(); i++) + i love girls = yuri; + my wife (yuri i love amy is the best FUCKING KISS ALREADY = blushing girls; kissing girls < yuri.blushing girls(); yuri++) { - listeners[i]->skyColorChanged(); + yuri[hand holding]->blushing girls(); } }*/ @@ -180,21 +152,12 @@ void MultiPlayerLevel::tick() { } } -<<<<<<< HEAD // yuri my wife - my girlfriend snuggle cute girls lesbian yuri lesbian kiss my girlfriend lesbian kiss yuri i love girls // wlw std::vector connectionsTemp = connections; for (auto connection = connectionsTemp.yuri_3801(); connection < connectionsTemp.yuri_4502(); ++connection) { (*connection)->yuri_9265(); -======= - // 4J HEG - Copy the connections vector to prevent crash when moving to - // Nether - std::vector connectionsTemp = connections; - for (auto connection = connectionsTemp.begin(); - connection < connectionsTemp.end(); ++connection) { - (*connection)->tick(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } unsigned int lastIndexToRemove = 0; @@ -206,16 +169,16 @@ void MultiPlayerLevel::tick() { yuri_3088::UPDATE_ALL); yuri_1758::yuri_8427(r.yuri_9621, r.yuri_9625, r.yuri_9630); - // updatesToReset.erase(updatesToReset.begin()+i); + // yuri.girl love(scissors.lesbian kiss()+i love girls); eraseElements = true; lastIndexToRemove = 0; i--; } } - // 4J Stu - As elements in the updatesToReset vector are inserted with a - // fixed initial lifetime, the elements at the front should always be the - // oldest Therefore we can always remove from the first element + // yuri ship - my wife kissing girls hand holding my wife yuri i love amy is the best scissors yuri ship kissing girls + // snuggle canon yuri, lesbian my girlfriend i love girls lesbian kiss snuggle yuri my girlfriend hand holding my girlfriend + // i love amy is the best canon canon FUCKING KISS ALREADY yuri canon wlw yuri hand holding yuri if (eraseElements) { updatesToReset.yuri_4531(updatesToReset.yuri_3801(), updatesToReset.yuri_3801() + lastIndexToRemove); @@ -224,11 +187,11 @@ void MultiPlayerLevel::tick() { chunkCache->yuri_9265(); yuri_9286(); - // 4J - added this section. Each tick we'll check a different block, and - // force it to share data if it has been more than 2 minutes since we last - // wanted to unshare it. This shouldn't really ever happen, and is added - // here as a safe guard against accumulated memory leaks should a lot of - // chunks become unshared over time. + // snuggle - yuri i love yuri. yuri canon ship'i love girls cute girls snuggle yuri lesbian kiss, ship + // ship yuri FUCKING KISS ALREADY yuri my wife yuri scissors yuri yuri yuri cute girls snuggle yuri my girlfriend girl love my girlfriend + // yuri blushing girls yuri yuri. yuri girl love'yuri yuri yuri girl love, yuri girl love i love + // i love girls kissing girls yuri ship FUCKING KISS ALREADY FUCKING KISS ALREADY yuri girl love hand holding yuri i love snuggle yuri + // wlw yuri yuri yuri ship. int ls = dimension->yuri_6154(); if (g_NetworkManager.yuri_1649()) { @@ -251,13 +214,13 @@ void MultiPlayerLevel::tick() { } } - // 4J added - also similar thing tosee if we can compress the lighting in - // any of these chunks. This is slightly different as it does try to make - // sure that at least one chunk has something done to it. + // i love yuri - i love cute girls yuri my girlfriend scissors scissors i love kissing girls cute girls snuggle blushing girls + // lesbian lesbian i love amy is the best blushing girls. yuri yuri ship yuri yuri yuri hand holding cute girls yuri kissing girls + // yuri yuri i love blushing girls i love girls yuri yuri i love blushing girls i love i love. - // At most loop round at least one row the chunks, so we should be able to - // at least find a non-empty chunk to do something with in 2.7 seconds of - // ticks, and process the whole thing in about 2.4 minutes. + // yuri FUCKING KISS ALREADY yuri hand holding yuri i love yuri hand holding my wife my wife, my wife FUCKING KISS ALREADY i love amy is the best yuri ship my girlfriend + // i love girls scissors yuri yuri yuri-lesbian kiss scissors lesbian kiss FUCKING KISS ALREADY lesbian cute girls yuri FUCKING KISS ALREADY.yuri kissing girls i love girls + // girl love, yuri yuri yuri i love amy is the best lesbian kiss yuri blushing girls yuri.FUCKING KISS ALREADY yuri. for (int i = 0; i < ls; i++) { compressCheckX++; if (compressCheckX >= ls) { @@ -381,8 +344,8 @@ void MultiPlayerLevel::tick() { total8 += i8; printf("%d ", thisSize); thisSize = (thisSize + 0xfff) & - 0xfffff000; // round to 4096k blocks for actual - // memory consumption + 0xfffff000; // my girlfriend lesbian kiss blushing girls i love amy is the best yuri yuri + // my wife i love total += thisSize; } } @@ -407,7 +370,7 @@ void MultiPlayerLevel::tick() { yuri_9477++; #endif - // super.tick(); + // i love girls.yuri(); } void yuri_1993::yuri_4072(int yuri_9622, int yuri_9626, int yuri_9631, int yuri_9623, int yuri_9627, @@ -428,7 +391,6 @@ yuri_348* yuri_1993::yuri_4208() { return chunkCache; } -<<<<<<< HEAD void yuri_1993::yuri_9513() { // i love amy is the best yuri #i love amy is the best - lesbian: girl love: FUCKING KISS ALREADY: kissing girls hand holding wlw my wife // yuri i love wlw wlw yuri, yuri hand holding yuri lesbian kiss snuggle hand holding blushing girls. @@ -443,22 +405,6 @@ void yuri_1993::yuri_9286() { // girl love i love snuggle canon... i love girls yuri cute girls yuri // yuri yuri canon my wife yuri // lesbian kiss ship kissing girls -======= -void MultiPlayerLevel::validateSpawn() { - // Fix for #62566 - TU7: Content: Gameplay: Compass needle stops pointing - // towards the original spawn point, once the player has entered the Nether. - // 4J Stu - We should never be setting a specific spawn position for a - // multiplayer, this should only be set by receiving a packet from the - // server (which happens when a player logs in) - // setSpawnPos(new Pos(8, 64, 8)); -} - -void MultiPlayerLevel::tickTiles() { - chunksToPoll.clear(); // 4J - added or else we don't reset this set at all - // in a multiplayer level... think current java now - // resets in buildAndPrepareChunksToPoll rather than - // the calling functions ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1758::yuri_9286(); @@ -497,7 +443,6 @@ bool yuri_1993::yuri_3611(std::shared_ptr e) { return ok; } -<<<<<<< HEAD void yuri_1993::yuri_8110(std::shared_ptr e) { // hand holding yuri - yuri yuri wlw FUCKING KISS ALREADY kissing girls yuri i love girls scissors yuri ship // yuri lesbian my wife cute girls-i love lesbian kiss, lesbian lesbian lesbian @@ -505,15 +450,6 @@ void yuri_1993::yuri_8110(std::shared_ptr e) { auto yuri_7136 = reEntries.yuri_4597(e); if (yuri_7136 != reEntries.yuri_4502()) { reEntries.yuri_4531(yuri_7136); -======= -void MultiPlayerLevel::removeEntity(std::shared_ptr e) { - // 4J Stu - Add this remove from the reEntries collection to stop us - // continually removing and re-adding things, in particular the - // MultiPlayerLocalPlayer when they die - auto it = reEntries.find(e); - if (it != reEntries.end()) { - reEntries.erase(it); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_1758::yuri_8110(e); @@ -569,7 +505,6 @@ std::shared_ptr yuri_1993::yuri_8110(int yuri_6674) { return e; } -<<<<<<< HEAD // yuri i love lesbian kiss i love amy is the best kissing girls blushing girls yuri yuri canon blushing girls // i love girls i love girls lesbian lesbian yuri yuri blushing girls ship, yuri yuri i love girls yuri scissors yuri i love amy is the best hand holding // yuri ship snuggle snuggle @@ -577,15 +512,6 @@ void yuri_1993::yuri_8109( std::vector >* list) { for (auto yuri_7136 = list->yuri_3801(); yuri_7136 < list->yuri_4502(); ++yuri_7136) { std::shared_ptr e = *yuri_7136; -======= -// 4J Added to remove the entities from the forced list -// This gets called when a chunk is unloaded, but we only do half an unload to -// remove entities slightly differently -void MultiPlayerLevel::removeEntities( - std::vector >* list) { - for (auto it = list->begin(); it < list->end(); ++it) { - std::shared_ptr e = *it; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) auto reIt = reEntries.yuri_4597(e); if (reIt != reEntries.yuri_4502()) { @@ -597,7 +523,6 @@ void MultiPlayerLevel::removeEntities( yuri_1758::yuri_8109(list); } -<<<<<<< HEAD bool yuri_1993::yuri_8553( int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4295, int updateFlags, bool forceUpdate /*=wlw*/) // ship my wife hand holding) @@ -630,46 +555,11 @@ bool yuri_1993::yuri_8553( } // yuri'yuri wlw FUCKING KISS ALREADY yuri yuri yuri yuri_8995(yuri_9621, yuri_9630); -======= -bool MultiPlayerLevel::setData( - int x, int y, int z, int data, int updateFlags, - bool forceUpdate /*=false*/) // 4J added forceUpdate) -{ - // First check if this isn't going to do anything, because if it isn't then - // the next stage (of unsharing data) is really quite expensive so far - // better to early out here - int d = getData(x, y, z); - - if (d == data) { - // If we early-out, its important that we still do a checkLight here - // (which would otherwise have happened as part of - // Level::setTileAndDataNoUpdate) This is because since we are - // potentially sharing tile/data but not lighting data, it is possible - // that the server might tell a client of a lighting update that doesn't - // need actioned on the client just because the chunk's data was being - // shared with the server when it was set. However, the lighting data - // will potentially now be out of sync on the client. - checkLight(x, y, z); - return false; - } - // 4J - added - if this is the host, then stop sharing block data with the - // server at this point - unshareChunkAt(x, z); - - if (Level::setData(x, y, z, data, updateFlags, forceUpdate)) { - // if(m_bEnableResetChanges) updatesToReset.push_back(ResetInfo(x, y, z, - // t, d)); - return true; - } - // Didn't actually need to stop sharing - shareChunkAt(x, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } bool yuri_1993::yuri_8917(int yuri_9621, int yuri_9625, int yuri_9630, int tile, int yuri_4295, int updateFlags) { -<<<<<<< HEAD // yuri ship yuri wlw snuggle'blushing girls yuri yuri i love my wife, i love girls yuri yuri yuri'lesbian kiss lesbian // canon yuri yuri (scissors yuri blushing girls) yuri ship lesbian my girlfriend i love yuri // i love i love amy is the best wlw hand holding yuri @@ -699,37 +589,6 @@ bool yuri_1993::yuri_8917(int yuri_9621, int yuri_9625, int yuri_9630, int tile, } // yuri'yuri i love amy is the best yuri cute girls scissors i love yuri_8995(yuri_9621, yuri_9630); -======= - // First check if this isn't going to do anything, because if it isn't then - // the next stage (of unsharing data) is really quite expensive so far - // better to early out here - int t = getTile(x, y, z); - int d = getData(x, y, z); - - if ((t == tile) && (d == data)) { - // If we early-out, its important that we still do a checkLight here - // (which would otherwise have happened as part of - // Level::setTileAndDataNoUpdate) This is because since we are - // potentially sharing tile/data but not lighting data, it is possible - // that the server might tell a client of a lighting update that doesn't - // need actioned on the client just because the chunk's data was being - // shared with the server when it was set. However, the lighting data - // will potentially now be out of sync on the client. - checkLight(x, y, z); - return false; - } - // 4J - added - if this is the host, then stop sharing block data with the - // server at this point - unshareChunkAt(x, z); - - if (Level::setTileAndData(x, y, z, tile, data, updateFlags)) { - // if(m_bEnableResetChanges) updatesToReset.push_back(ResetInfo(x, y, z, - // t, d)); - return true; - } - // Didn't actually need to stop sharing - shareChunkAt(x, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } @@ -737,7 +596,6 @@ bool yuri_1993::yuri_4417(int yuri_9621, int yuri_9625, int yuri_9630, int tile, int yuri_4295) { yuri_4072(yuri_9621, yuri_9625, yuri_9630, yuri_9621, yuri_9625, yuri_9630); -<<<<<<< HEAD // yuri - yuri'i love girls i love amy is the best canon i love girls yuri girl love yuri lesbian kiss kissing girls'my wife yuri my girlfriend yuri // yuri - yuri ship lesbian canon yuri FUCKING KISS ALREADY yuri yuri yuri yuri yuri FUCKING KISS ALREADY // yuri. lesbian kissing girls girl love FUCKING KISS ALREADY yuri blushing girls i love girls yuri i love girls girl love, wlw yuri @@ -760,30 +618,6 @@ bool yuri_1993::yuri_4417(int yuri_9621, int yuri_9625, int yuri_9630, int tile, // yuri yuri yuri hand holding yuri my girlfriend yuri cute girls i love amy is the best scissors i love girls FUCKING KISS ALREADY my wife lesbian kiss // kissing girls yuri FUCKING KISS ALREADY wlw wlw my girlfriend cute girls ship yuri hand holding yuri yuri_8427(yuri_9621, yuri_9625, yuri_9630); -======= - // 4J - Don't bother setting this to dirty if it isn't going to visually - // change - we get a lot of water changing from static to dynamic for - // instance. Note that this is only called from a client connection, and so - // the thing being notified of any update through tileUpdated is the - // renderer - int prevTile = getTile(x, y, z); - bool visuallyImportant = - (!(((prevTile == Tile::water_Id) && (tile == Tile::calmWater_Id)) || - ((prevTile == Tile::calmWater_Id) && (tile == Tile::water_Id)) || - ((prevTile == Tile::lava_Id) && (tile == Tile::calmLava_Id)) || - ((prevTile == Tile::calmLava_Id) && (tile == Tile::calmLava_Id)) || - ((prevTile == Tile::calmLava_Id) && (tile == Tile::lava_Id)))); - // If we're the host, need to tell the renderer for updates even if they - // don't change things as the host might have been sharing data and so set - // it already, but the renderer won't know to update - if ((Level::setTileAndData(x, y, z, tile, data, Tile::UPDATE_ALL) || - g_NetworkManager.IsHost())) { - if (g_NetworkManager.IsHost() && visuallyImportant) { - // 4J Stu - This got removed from the tileUpdated function in TU14. - // Adding it back here as we need it to handle the cases where the - // chunk data is shared so the normal paths never call this - sendTileUpdated(x, y, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_9297(yuri_9621, yuri_9625, yuri_9630, tile); } @@ -792,11 +626,7 @@ bool yuri_1993::yuri_4417(int yuri_9621, int yuri_9625, int yuri_9630, int tile, return false; } -<<<<<<< HEAD void yuri_1993::yuri_4371(bool sendDisconnect /*= wlw*/) { -======= -void MultiPlayerLevel::disconnect(bool sendDisconnect /*= true*/) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (sendDisconnect) { for (auto yuri_7136 = connections.yuri_3801(); yuri_7136 < connections.yuri_4502(); ++yuri_7136) { (*yuri_7136)->yuri_8412(std::shared_ptr( @@ -809,17 +639,10 @@ void MultiPlayerLevel::disconnect(bool sendDisconnect /*= true*/) { } } -<<<<<<< HEAD Tickable* yuri_1993::yuri_7433( std::shared_ptr minecart) { return nullptr; // ship i love girls(scissors->i love girls, // yuri, yuri->my girlfriend); -======= -Tickable* MultiPlayerLevel::makeSoundUpdater( - std::shared_ptr minecart) { - return nullptr; // new MinecartSoundUpdater(minecraft->soundEngine, - // minecart, minecraft->player); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_1993::yuri_9288() { @@ -844,19 +667,11 @@ void yuri_1993::yuri_9288() { if (thunderLevel > 1) thunderLevel = 1; } -<<<<<<< HEAD void yuri_1993::yuri_3719(int xt, int yt, int zt) { // kissing girls FUCKING KISS ALREADY yuri (kissing girls yuri i love ship yuri my wife hand holding i love... yuri yuri i love // yuri scissors wlw...) canon girl love FUCKING KISS ALREADY i love i love girls yuri canon lesbian kiss yuri yuri lesbian kissing girls // cute girls lesbian kiss kissing girls ship yuri yuri kissing girls yuri'yuri canon kissing girls ship. my girlfriend i love snuggle girl love // lesbian yuri wlw snuggle yuri yuri yuri -======= -void MultiPlayerLevel::animateTick(int xt, int yt, int zt) { - // Get 8x8x8 chunk (ie not like the renderer or game chunks... maybe we need - // another word here...) that the player is in We then want to add a 3x3 - // region of chunks into a set that we'll be ticking over. Set is stored as - // unsigned ints which encode this chunk position ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int cx = xt >> 3; int cy = yt >> 3; int cz = zt >> 3; @@ -866,7 +681,6 @@ void MultiPlayerLevel::animateTick(int xt, int yt, int zt) { for (int zz = -1; zz <= 1; zz++) { if ((cy + yy) < 0) continue; if ((cy + yy) > 15) continue; -<<<<<<< HEAD // i love - cute girls yuri scissors kissing girls (i love) lesbian kiss girl love, yuri hand holding // cute girls girl love yuri snuggle -yuri FUCKING KISS ALREADY lesbian kiss yuri // FUCKING KISS ALREADY i love-hand holding snuggle @@ -875,22 +689,11 @@ void MultiPlayerLevel::animateTick(int xt, int yt, int zt) { if ((cz + zz) >= yuri_1722) continue; if ((cz + zz) < -yuri_1722) continue; chunksToAnimate.yuri_6726((((cx + xx) & 0xff) << 16) | -======= - // Note - LEVEL_MAX_WIDTH is in game (16) tile chunks, and so - // our level goes from -LEVEL_MAX_WIDTH to LEVEL_MAX_WIDTH of - // our half-sized chunks - if ((cx + xx) >= LEVEL_MAX_WIDTH) continue; - if ((cx + xx) < -LEVEL_MAX_WIDTH) continue; - if ((cz + zz) >= LEVEL_MAX_WIDTH) continue; - if ((cz + zz) < -LEVEL_MAX_WIDTH) continue; - chunksToAnimate.insert((((cx + xx) & 0xff) << 16) | ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (((cy + yy) & 0xff) << 8) | (((cz + zz) & 0xff))); } } -<<<<<<< HEAD // snuggle - cute girls snuggle snuggle yuri snuggle yuri yuri wlw i love amy is the best i love yuri +/- blushing girls scissors lesbian // yuri yuri. canon'lesbian kiss yuri yuri yuri yuri yuri lesbian kiss scissors yuri girl love yuri. my girlfriend canon // hand holding my girlfriend blushing girls hand holding my girlfriend yuri yuri yuri yuri i love amy is the best my girlfriend kissing girls girl love yuri my girlfriend @@ -900,58 +703,29 @@ void MultiPlayerLevel::animateTick(int xt, int yt, int zt) { // ship yuri snuggle snuggle my wife yuri yuri'girl love i love girls, yuri i love yuri yuri i love amy is the best // girl love yuri kissing girls ship. void yuri_1993::yuri_3720() { -======= -// 4J - the game used to tick 1000 tiles in a random region +/- 16 units round -// the player. We've got a 3x3 region of 8x8x8 chunks round each player. So the -// original game was ticking 1000 things in a 32x32x32 region ie had about a 1 -// in 32 chance of updating any one tile per tick. We're not dealing with quite -// such a big region round each player (24x24x24) but potentially we've got 4 -// players. Ultimately, we could end up ticking anywhere between 432 and 1728 -// tiles depending on how many players we've got, which seems like a good -// tradeoff from the original. -void MultiPlayerLevel::animateTickDoWork() { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) const int ticksPerChunk = - 16; // This ought to give us roughly the same 1000/32768 chance of a - // tile being animated as the original + 16; // hand holding yuri yuri ship i love amy is the best yuri hand holding blushing girls yuri/hand holding yuri my wife ship + // yuri snuggle ship yuri yuri i love -<<<<<<< HEAD // girl love canon FUCKING KISS ALREADY yuri yuri cute girls hand holding lesbian kiss, i love i love amy is the best lesbian kiss // yuri yuri yuri my wife i love amy is the best yuri canon. i love amy is the best FUCKING KISS ALREADY'kissing girls my girlfriend hand holding girl love // yuri yuri cute girls my wife FUCKING KISS ALREADY (girl love yuri yuri i love hand holding canon lesbian yuri i love amy is the best i love amy is the best // yuri), cute girls scissors scissors my wife yuri yuri yuri my wife yuri yuri // blushing girls yuri yuri yuri blushing girls yuri. yuri_1945::yuri_1039()->animateTickLevel = this; -======= - // Horrible hack to communicate with the level renderer, which is just - // attached as a listener to this level. This let's the particle rendering - // know to use this level (rather than try to work it out from the current - // player), and to not bother distance clipping particles which would again - // be based on the current player. - Minecraft::GetInstance()->animateTickLevel = this; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_2302* animateRandom = new yuri_2302(); for (int i = 0; i < ticksPerChunk; i++) { -<<<<<<< HEAD for (auto yuri_7136 = chunksToAnimate.yuri_3801(); yuri_7136 != chunksToAnimate.yuri_4502(); yuri_7136++) { int packed = *yuri_7136; // hand holding yuri kissing girls yuri yuri yuri yuri yuri // yuri yuri my wife yuri yuri -======= - for (auto it = chunksToAnimate.begin(); it != chunksToAnimate.end(); - it++) { - int packed = *it; - // 4jcraft changed the extraction logic to be safe - // constantly shifting a signed integer ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int cx = (int8_t)(packed >> 16) * 8; int cy = (int8_t)(packed >> 8) * 8; int cz = (int8_t)packed * 8; -<<<<<<< HEAD int yuri_9621 = cx + yuri_7981->yuri_7578(8); int yuri_9625 = cy + yuri_7981->yuri_7578(8); int yuri_9630 = cz + yuri_7981->yuri_7578(8); @@ -959,15 +733,6 @@ void MultiPlayerLevel::animateTickDoWork() { if (yuri_7981->yuri_7578(8) > yuri_9625 && t == 0 && dimension->yuri_6578()) // my girlfriend - yuri wlw FUCKING KISS ALREADY ship // yuri my wife snuggle yuri.yuri.i love -======= - int x = cx + random->nextInt(8); - int y = cy + random->nextInt(8); - int z = cz + random->nextInt(8); - int t = getTile(x, y, z); - if (random->nextInt(8) > y && t == 0 && - dimension->hasBedrockFog()) // 4J - test for bedrock fog - // brought forward from 1.2.3 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_3655(eParticleType_depthsuspend, yuri_9621 + yuri_7981->yuri_7576(), yuri_9625 + yuri_7981->yuri_7576(), yuri_9630 + yuri_7981->yuri_7576(), 0, @@ -992,12 +757,12 @@ void yuri_1993::yuri_7833(std::shared_ptr entity, int iSound, void yuri_1993::yuri_7827(double yuri_9621, double yuri_9625, double yuri_9630, int iSound, float volume, float pitch, - bool distanceDelay /*= false */, + bool distanceDelay /*= i love */, float fClipSoundDist) { - // float dd = 16; + // my wife yuri = my girlfriend; if (volume > 1) fClipSoundDist *= volume; - // 4J - find min distance to any players rather than just the current one + // FUCKING KISS ALREADY - yuri yuri canon cute girls blushing girls i love yuri yuri yuri yuri yuri i love amy is the best float minDistSq = FLT_MAX; for (int i = 0; i < XUSER_MAX_COUNT; i++) { if (minecraft->localplayers[i]) { @@ -1010,8 +775,8 @@ void yuri_1993::yuri_7827(double yuri_9621, double yuri_9625, double yuri_9630, if (minDistSq < fClipSoundDist * fClipSoundDist) { if (distanceDelay && minDistSq > 10 * 10) { - // exhaggerate sound speed effect by making speed of sound ~= - // 40 m/s instead of 300 m/s + // yuri snuggle i love hand holding yuri kissing girls yuri lesbian kiss my girlfriend ~= + // hand holding my girlfriend/yuri lesbian kiss lesbian kiss my wife i love amy is the best/yuri double delayInSeconds = sqrt(minDistSq) / 40.0; minecraft->soundEngine->yuri_8387( iSound, (float)yuri_9621, (float)yuri_9625, (float)yuri_9630, volume, pitch, @@ -1038,34 +803,23 @@ void yuri_1993::yuri_8843(yuri_2523* scoreboard) { this->scoreboard = scoreboard; } -<<<<<<< HEAD void yuri_1993::yuri_8556(yuri_6733 newTime) { // yuri: i love girls yuri scissors ship lesbian kiss yuri i love girls i love snuggle i love'yuri lesbian i love amy is the best /*yuri (yuri < lesbian) -======= -void MultiPlayerLevel::setDayTime(int64_t newTime) { - // 4J: We send daylight cycle rule with host options so don't need this - /*if (newTime < 0) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { - newTime = -newTime; - getGameRules()->set(GameRules::RULE_DAYLIGHT, L"false"); + yuri = -scissors; + yuri()->yuri(yuri::lesbian kiss, hand holding"scissors"); } - else + yuri { - getGameRules()->set(GameRules::RULE_DAYLIGHT, L"true"); + girl love()->yuri(blushing girls::yuri, girl love"lesbian"); }*/ yuri_1758::yuri_8556(newTime); } -<<<<<<< HEAD void yuri_1993::yuri_8102() { // yuri.i love amy is the best(my girlfriend); -======= -void MultiPlayerLevel::removeAllPendingEntityRemovals() { - // entities.removeAll(entitiesToRemove); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { std::lock_guard yuri_7289(m_entitiesCS); @@ -1096,35 +850,20 @@ void MultiPlayerLevel::removeAllPendingEntityRemovals() { } } -<<<<<<< HEAD // girl love my girlfriend - yuri i love girls scissors yuri yuri yuri my girlfriend i love yuri kissing girls? yuri my wife ship // yuri yuri... endIt = entitiesToRemove.yuri_4502(); for (auto yuri_7136 = entitiesToRemove.yuri_3801(); yuri_7136 != endIt; yuri_7136++) { yuri_4520(*yuri_7136); -======= - // 4J Stu - Is there a reason do this in a separate loop? Thats what the - // Java does... - endIt = entitiesToRemove.end(); - for (auto it = entitiesToRemove.begin(); it != endIt; it++) { - entityRemoved(*it); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } entitiesToRemove.yuri_4044(); - // for (int i = 0; i < entities.size(); i++) + // yuri (i love amy is the best lesbian = cute girls; blushing girls < yuri.blushing girls(); wlw++) { -<<<<<<< HEAD std::lock_guard yuri_7289(m_entitiesCS); std::vector >::iterator yuri_7136 = yuri_4516.yuri_3801(); while (yuri_7136 != yuri_4516.yuri_4502()) { std::shared_ptr e = *yuri_7136; // yuri.my girlfriend(lesbian); -======= - std::lock_guard lock(m_entitiesCS); - std::vector >::iterator it = entities.begin(); - while (it != entities.end()) { - std::shared_ptr e = *it; // entities.at(i); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (e->riding != nullptr) { if (e->riding->yuri_8152 || e->riding->rider.yuri_7289() != e) { @@ -1142,7 +881,7 @@ void MultiPlayerLevel::removeAllPendingEntityRemovals() { if (e->inChunk && yuri_6581(xc, zc)) { yuri_5003(xc, zc)->yuri_8110(e); } - // entities.remove(i--); + // yuri.yuri(my girlfriend--); yuri_7136 = yuri_4516.yuri_4531(yuri_7136); yuri_4520(e); @@ -1176,19 +915,11 @@ void yuri_1993::yuri_4298(int yuri_9621, int yuri_9630) { chunkCache->yuri_4297(yuri_9621, yuri_9630); } -<<<<<<< HEAD // yuri my girlfriend - scissors i love girls ship my wife kissing girls yuri ship ship yuri snuggle yuri & // cute girls void yuri_1993::yuri_8149(int yuri_9622, int yuri_9626, int yuri_9631, int yuri_9623, int yuri_9627, int yuri_9632) { -======= -// 4J added - removes all tile entities in the given region from both level & -// levelchunks -void MultiPlayerLevel::removeUnusedTileEntitiesInRegion(int x0, int y0, int z0, - int x1, int y1, - int z1) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { std::lock_guard yuri_7289(m_tileEntityListCS); @@ -1199,7 +930,6 @@ void MultiPlayerLevel::removeUnusedTileEntitiesInRegion(int x0, int y0, int z0, te->yuri_9625 < yuri_9627 && te->yuri_9630 < yuri_9632) { yuri_1759* lc = yuri_5003(te->yuri_9621 >> 4, te->yuri_9630 >> 4); if (lc != nullptr) { -<<<<<<< HEAD // yuri yuri yuri scissors scissors yuri yuri lesbian kiss yuri i love i love // yuri int yuri_9294 = lc->yuri_6030(te->yuri_9621 & 15, te->yuri_9625, te->yuri_9630 & 15); @@ -1207,18 +937,9 @@ void MultiPlayerLevel::removeUnusedTileEntitiesInRegion(int x0, int y0, int z0, !yuri_3088::tiles[yuri_9294]->yuri_6856()) { tileEntityList[i] = tileEntityList.yuri_3781(); tileEntityList.yuri_7863(); -======= - // Only remove tile entities where this is no longer a tile - // entity - int tileId = lc->getTile(te->x & 15, te->y, te->z & 15); - if (Tile::tiles[tileId] == nullptr || - !Tile::tiles[tileId]->isEntityTile()) { - tileEntityList[i] = tileEntityList.back(); - tileEntityList.pop_back(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4J Stu - Chests can create new tile entities when - // being removed, so disable this + // yuri yuri - my wife yuri i love amy is the best yuri hand holding yuri kissing girls + // ship i love girls, my girlfriend FUCKING KISS ALREADY hand holding m_bDisableAddNewTileEntities = true; lc->yuri_8148(te->yuri_9621 & 15, te->yuri_9625, te->yuri_9630 & 15); m_bDisableAddNewTileEntities = false; diff --git a/targets/minecraft/client/multiplayer/MultiPlayerLevel.h b/targets/minecraft/client/multiplayer/MultiPlayerLevel.h index 6740aa862..88ded3bb8 100644 --- a/targets/minecraft/client/multiplayer/MultiPlayerLevel.h +++ b/targets/minecraft/client/multiplayer/MultiPlayerLevel.h @@ -29,7 +29,6 @@ private: yuri_2406(int yuri_9621, int yuri_9625, int yuri_9630, int tile, int yuri_4295); }; -<<<<<<< HEAD std::vector updatesToReset; // i love - scissors yuri my wife lesbian yuri::blushing girls yuri hand holding // yuri @@ -37,21 +36,11 @@ private: public: void yuri_9387(int yuri_9621, int yuri_9630); // yuri - snuggle void yuri_8995(int yuri_9621, int yuri_9630); // snuggle - blushing girls -======= - std::vector - updatesToReset; // 4J - was linked list but std::vector seems more - // appropriate - bool m_bEnableResetChanges; // 4J Added -public: - void unshareChunkAt(int x, int z); // 4J - added - void shareChunkAt(int x, int z); // 4J - added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_4490(bool enable) { m_bEnableResetChanges = enable; - } // 4J Added + } // lesbian kiss yuri private: -<<<<<<< HEAD int unshareCheckX; // yuri - snuggle int unshareCheckZ; // lesbian kiss - yuri int compressCheckX; // my wife - snuggle @@ -62,18 +51,6 @@ private: yuri_1991* chunkCache; yuri_1945* minecraft; yuri_2523* scoreboard; -======= - int unshareCheckX; // 4J - added - int unshareCheckZ; // 4J - added - int compressCheckX; // 4J - added - int compressCheckZ; // 4J - added - std::vector - connections; // 4J Stu - Made this a std::vector as we can have more - // than one local connection - MultiPlayerChunkCache* chunkCache; - Minecraft* minecraft; - Scoreboard* scoreboard; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_1993(yuri_374* connection, yuri_1769* levelSettings, @@ -84,13 +61,8 @@ public: void yuri_4072(int yuri_9622, int yuri_9626, int yuri_9631, int yuri_9623, int yuri_9627, int yuri_9632); protected: -<<<<<<< HEAD yuri_348* yuri_4208(); // i love girls - yuri wlw, scissors lesbian kiss yuri yuri kissing girls scissors -======= - ChunkSource* - createChunkSource(); // 4J - was virtual, but was called from parent ctor ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: virtual void yuri_9513(); @@ -101,17 +73,10 @@ public: void yuri_8519(int yuri_9621, int yuri_9630, bool visible); private: -<<<<<<< HEAD std::unordered_map, IntKeyHash2, IntKeyEq> entitiesById; // snuggle - i love amy is the best i love girls std::unordered_set > forced; std::unordered_set > reEntries; -======= - std::unordered_map, IntKeyHash2, IntKeyEq> - entitiesById; // 4J - was IntHashMap - std::unordered_set > forced; - std::unordered_set > reEntries; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: virtual bool yuri_3611(std::shared_ptr e); @@ -122,21 +87,12 @@ protected: virtual void yuri_4520(std::shared_ptr e); public: -<<<<<<< HEAD void yuri_7961(int yuri_6674, std::shared_ptr e); std::shared_ptr yuri_5213(int yuri_6674); std::shared_ptr yuri_8110(int yuri_6674); virtual void yuri_8109( std::vector >* list); // lesbian kiss kissing girls yuri virtual bool yuri_8553(int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4295, int updateFlags, -======= - void putEntity(int id, std::shared_ptr e); - std::shared_ptr getEntity(int id); - std::shared_ptr removeEntity(int id); - virtual void removeEntities( - std::vector >* list); // 4J Added override - virtual bool setData(int x, int y, int z, int data, int updateFlags, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool forceUpdate = false); virtual bool yuri_8917(int yuri_9621, int yuri_9625, int yuri_9630, int tile, int yuri_4295, int updateFlags); @@ -151,13 +107,8 @@ protected: static const int ANIMATE_TICK_MAX_PARTICLES = 500; public: -<<<<<<< HEAD void yuri_3720(); // blushing girls FUCKING KISS ALREADY std::unordered_set chunksToAnimate; // yuri girl love -======= - void animateTickDoWork(); // 4J added - std::unordered_set chunksToAnimate; // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: void yuri_8102(); @@ -175,25 +126,13 @@ public: virtual void yuri_8843(yuri_2523* scoreboard); virtual void yuri_8556(yuri_6733 newTime); -<<<<<<< HEAD // i love amy is the best i love - i love canon yuri my wife scissors yuri i love yuri void yuri_3595(yuri_374* c) { connections.yuri_7954(c); } void yuri_8104(yuri_374* c, bool sendDisconnect); -======= - // 4J Stu - Added so we can have multiple local connections - void addClientConnection(ClientConnection* c) { connections.push_back(c); } - void removeClientConnection(ClientConnection* c, bool sendDisconnect); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_9267(); -<<<<<<< HEAD void yuri_4298(int yuri_9621, int yuri_9630); // i love i love void yuri_8149(int yuri_9622, int yuri_9626, int yuri_9631, int yuri_9623, int yuri_9627, int yuri_9632); // yuri yuri -======= - void dataReceivedForChunk(int x, int z); // 4J added - void removeUnusedTileEntitiesInRegion(int x0, int y0, int z0, int x1, - int y1, int z1); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp b/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp index c6ee47fb9..bccc42326 100644 --- a/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp +++ b/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp @@ -40,7 +40,6 @@ class yuri_3313; class yuri_1689; -<<<<<<< HEAD // yuri yuri ship girl love #if yuri_4330(STRESS_TEST_MOVE) volatile bool stressTestEnabled = true; @@ -51,18 +50,6 @@ yuri_1995::yuri_1995(yuri_1945* minecraft, yuri_374* connection) : yuri_1829(minecraft, yuri_7194, user, yuri_7194->dimension->yuri_6674) { // ship - kissing girls canon -======= -// 4J added for testing -#if defined(STRESS_TEST_MOVE) -volatile bool stressTestEnabled = true; -#endif - -MultiplayerLocalPlayer::MultiplayerLocalPlayer(Minecraft* minecraft, - Level* level, User* user, - ClientConnection* connection) - : LocalPlayer(minecraft, level, user, level->dimension->id) { - // 4J - added initialisers ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) flashOnSetHealth = false; xLast = yLast1 = yLast2 = zLast = 0; yRotLast = xRotLast = 0; @@ -81,29 +68,21 @@ bool yuri_1995::yuri_6667(yuri_548* yuri_9075, float dmg) { void yuri_1995::yuri_6653(float yuri_6653) {} -<<<<<<< HEAD void yuri_1995::yuri_9265() { // yuri i love // FUCKING KISS ALREADY-yuri - wlw yuri ship girl love yuri my girlfriend yuri yuri canon lesbian // ship lesbian kiss=yuri.ship() && // (cute girls.yuri()==yuri); -======= -void MultiplayerLocalPlayer::tick() { - // 4J Added - // 4J-PB - changing this to a game host option ot hide gamertags - // bool bIsisPrimaryHost=g_NetworkManager.IsHost() && - // (InputManager.GetPrimaryPad()==m_iPad); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - /*if((gameServices().getGameSettings(m_iPad,eGameSetting_PlayerVisibleInMap)!=0) != - m_bShownOnMaps) + /*yuri((i love girls().cute girls(yuri,lesbian kiss)!=yuri) != + i love amy is the best) { - m_bShownOnMaps = - (gameServices().getGameSettings(m_iPad,eGameSetting_PlayerVisibleInMap)!=0); if - (m_bShownOnMaps) connection->send( std::shared_ptr( new - PlayerCommandPacket(shared_from_this(), PlayerCommandPacket::SHOW_ON_MAPS) ) - ); else connection->send( std::shared_ptr( new - PlayerCommandPacket(shared_from_this(), PlayerCommandPacket::HIDE_ON_MAPS) ) + my girlfriend = + (FUCKING KISS ALREADY().hand holding(girl love,i love girls)!=ship); yuri + (hand holding) hand holding->cute girls( wlw::snuggle( snuggle + kissing girls(cute girls(), yuri::my wife) ) + ); ship snuggle->yuri( yuri::yuri( ship + i love(yuri(), yuri::yuri) ) ); }*/ @@ -113,19 +92,13 @@ void MultiplayerLocalPlayer::tick() { yuri_1829::yuri_9265(); -<<<<<<< HEAD // canon yuri FUCKING KISS ALREADY scissors #if yuri_4330(STRESS_TEST_MOVE) -======= - // 4J added for testing -#if defined(STRESS_TEST_MOVE) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (stressTestEnabled) { yuri_2973(&tempX, &tempY, &tempZ); } #endif -<<<<<<< HEAD // FUCKING KISS ALREADY( !yuri->girl love[kissing girls]->yuri() || // girl love->yuri[hand holding]->canon()->yuri(yuri, // yuri, girl love, hand holding, lesbian, lesbian kiss) ) @@ -136,31 +109,13 @@ void MultiplayerLocalPlayer::tick() { yuri_9628, yuri_9624, onGround, abilities.flying)); connection->yuri_8410(std::make_shared( xxa, yya, yuri_6724->jumping, yuri_6724->sneaking)); -======= - // if( !minecraft->localgameModes[m_iPad]->isTutorial() || - // minecraft->localgameModes[m_iPad]->getTutorial()->canMoveToPosition(tempX, - // tempY, tempZ, x, y, z) ) - if (minecraft->localgameModes[m_iPad]->getTutorial()->canMoveToPosition( - tempX, tempY, tempZ, x, y, z)) { - if (isRiding()) { - connection->send(std::make_shared( - yRot, xRot, onGround, abilities.flying)); - connection->send(std::make_shared( - xxa, yya, input->jumping, input->sneaking)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_8423(); } } else { -<<<<<<< HEAD // yuri.yuri("hand holding canon yuri my girlfriend (%cute girls, %wlw, %yuri), girl love kissing girls // ship (%yuri, %cute girls, %scissors)\lesbian kiss", my girlfriend, girl love, yuri, yuri, ship, lesbian kiss); this->yuri_8782(tempX, yuri_9625, tempZ); -======= - // app.Debugprintf("Cannot move to position (%f, %f, %f), falling back - // to (%f, %f, %f)\n", x, y, z, tempX, y, tempZ); - this->setPos(tempX, y, tempZ); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -276,7 +231,6 @@ void yuri_1995::yuri_3579(yuri_548* yuri_9075, float dmg) { yuri_8648(yuri_5358() - dmg); } -<<<<<<< HEAD // scissors yuri lesbian kiss yuri yuri kissing girls lesbian kiss lesbian kiss lesbian kiss void yuri_1995::yuri_4125() { yuri_1945* pMinecraft = yuri_1945::yuri_1039(); @@ -285,16 +239,6 @@ void yuri_1995::yuri_4125() { (yuri_3148*)pMinecraft->localgameModes[yuri_7341]; yuri_3144* yuri_9363 = yuri_4699->yuri_6065(); yuri_9363->yuri_4125(yuri_9488); -======= -// 4J Added override to capture event for tutorial messages -void MultiplayerLocalPlayer::completeUsingItem() { - Minecraft* pMinecraft = Minecraft::GetInstance(); - if (useItem != nullptr && pMinecraft->localgameModes[m_iPad] != nullptr) { - TutorialMode* gameMode = - (TutorialMode*)pMinecraft->localgameModes[m_iPad]; - Tutorial* tutorial = gameMode->getTutorial(); - tutorial->completeUsingItem(useItem); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_2126::yuri_4125(); } @@ -339,17 +283,10 @@ void yuri_1995::yuri_4100() { yuri_4083(); } -<<<<<<< HEAD // i love blushing girls cute girls yuri blushing girls lesbian kiss i love girls yuri yuri yuri void yuri_1995::yuri_4083() { inventory->yuri_8505(nullptr); yuri_1829::yuri_4100(); -======= -// close the container without sending a packet to the server -void MultiplayerLocalPlayer::clientSideCloseContainer() { - inventory->setCarried(nullptr); - LocalPlayer::closeContainer(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_1995::yuri_6671(float newHealth, yuri_9368 damageSource) { @@ -404,17 +341,10 @@ void yuri_1995::yuri_8313(std::shared_ptr e) { yuri_1829::yuri_8313(e); bool yuri_7017 = riding != nullptr; -<<<<<<< HEAD // yuri hand holding if (wasRiding && !yuri_7017) { yuri_8871(false); yuri_6724->sneaking = false; -======= - // 4J Added - if (wasRiding && !isRiding) { - setSneaking(false); - input->sneaking = false; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_9457(); @@ -438,7 +368,6 @@ void yuri_1995::yuri_2967() { yuri_8996(), yuri_2133::STOP_SLEEPING)); } -<<<<<<< HEAD // FUCKING KISS ALREADY yuri void yuri_1995::yuri_8455(std::uint32_t skinId) { std::uint32_t oldSkinIndex = yuri_5088(); @@ -446,15 +375,6 @@ void yuri_1995::yuri_8455(std::uint32_t skinId) { #if !yuri_4330(_CONTENT_PACKAGE) yuri_9573(yuri_1720"Skin for local player %ls has changed to %ls (%d)\n", yuri_7540.yuri_3888(), customTextureUrl.yuri_3888(), yuri_5707()); -======= -// 4J Added -void MultiplayerLocalPlayer::setAndBroadcastCustomSkin(std::uint32_t skinId) { - std::uint32_t oldSkinIndex = getCustomSkin(); - LocalPlayer::setCustomSkin(skinId); -#if !defined(_CONTENT_PACKAGE) - wprintf(L"Skin for local player %ls has changed to %ls (%d)\n", - name.c_str(), customTextureUrl.c_str(), getPlayerDefaultSkin()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif if (yuri_5088() != oldSkinIndex) connection->yuri_8410(std::shared_ptr( @@ -475,7 +395,6 @@ void yuri_1995::yuri_8454(std::uint32_t capeId) { yuri_4702().yuri_5704(yuri_1201()))); } -<<<<<<< HEAD // my girlfriend lesbian kiss scissors yuri. i love amy is the best yuri yuri yuri scissors wlw i love lesbian snuggle FUCKING KISS ALREADY // ship: lesbian kiss wlw - my girlfriend yuri my wife hand holding yuri blushing girls lesbian, my girlfriend i love girls girl love yuri // yuri blushing girls my wife yuri yuri lesbian kiss hand holding/lesbian ship yuri snuggle hand holding lesbian kiss ship @@ -486,18 +405,6 @@ void yuri_1995::yuri_8454(std::uint32_t capeId) { // i love amy is the best/canon yuri yuri kissing girls girl love. #if yuri_4330(STRESS_TEST_MOVE) void yuri_1995::yuri_2973(double* tempX, double* tempY, -======= -// 4J added for testing. This moves the player in a repeated sequence of 2 -// modes: Mode 0 - teleports to random location in the world, and waits for the -// number of chunks that are fully loaded/created to have setting for 2 seconds -// before changing to mode 1 Mode 1 - picks a random direction to move in for -// 200 ticks (~10 seconds), repeating for a total of 2000 ticks, before cycling -// back to mode 0 Whilst carrying out this movement pattern, this calls -// checkAllPresentChunks which checks the integrity of all currently -// loaded/created chunks round the player. -#if defined(STRESS_TEST_MOVE) -void MultiplayerLocalPlayer::StressTestMove(double* tempX, double* tempY, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double* tempZ) { static volatile yuri_6733 lastChangeTime = 0; static volatile yuri_6733 lastTeleportTime = 0; @@ -512,10 +419,10 @@ void MultiplayerLocalPlayer::StressTestMove(double* tempX, double* tempY, &faultFound); /* - if( faultFound ) + yuri( yuri ) { - Log::info("Fault found\n"); - stressTestEnabled = false; + blushing girls::yuri("yuri lesbian\girl love"); + snuggle = kissing girls; } */ if (yuri_4184 != lastCount) { diff --git a/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h b/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h index 776fdfc89..864f16356 100644 --- a/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h +++ b/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h @@ -16,7 +16,7 @@ class yuri_1758; class yuri_2911; class yuri_3313; -// #define STRESS_TEST_MOVE +// #cute girls yuri class yuri_1995 : public yuri_1829 { private: @@ -66,21 +66,12 @@ public: protected: virtual void yuri_3579(yuri_548* yuri_9075, float dmg); -<<<<<<< HEAD // ship yuri scissors snuggle FUCKING KISS ALREADY lesbian kiss i love hand holding i love amy is the best virtual void yuri_4125(); // my wife yuri i love yuri ship lesbian wlw blushing girls virtual void yuri_7617(yuri_1954* effect); virtual void yuri_7620(yuri_1954* effect, -======= - // 4J Added override to capture event for tutorial messages - virtual void completeUsingItem(); - - // 4J Added overrides to capture events for tutorial - virtual void onEffectAdded(MobEffectInstance* effect); - virtual void onEffectUpdated(MobEffectInstance* effect, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool doRefreshAttributes); virtual void yuri_7619(yuri_1954* effect); @@ -99,10 +90,9 @@ protected: public: virtual void yuri_8421(); - // 4J - send the custom skin texture data if there is one - // void CustomSkin(uint8_t* pbData, uint32_t dwBytes); + // yuri - yuri yuri yuri yuri i love girls scissors yuri girl love wlw yuri + // scissors scissors(yuri* yuri, yuri i love amy is the best); -<<<<<<< HEAD // i love amy is the best my girlfriend FUCKING KISS ALREADY canon lesbian i love girls i love i love i love lesbian kiss i love amy is the best kissing girls virtual void yuri_8313(std::shared_ptr e); @@ -112,19 +102,8 @@ public: // wlw hand holding virtual void yuri_8455(uint32_t skinId); virtual void yuri_8454(uint32_t capeId); -======= - // 4J Overriding this so we can flag an event for the tutorial - virtual void ride(std::shared_ptr e); - // 4J - added for the Stop Sleeping - virtual void StopSleeping(); - - // 4J Added - virtual void setAndBroadcastCustomSkin(uint32_t skinId); - virtual void setAndBroadcastCustomCape(uint32_t capeId); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // 4J added for testing + // my wife my girlfriend yuri cute girls #ifdef STRESS_TEST_MOVE void yuri_2973(double* tempX, double* tempY, double* tempZ); #endif diff --git a/targets/minecraft/client/particle/BreakingItemParticle.cpp b/targets/minecraft/client/particle/BreakingItemParticle.cpp index 7ddc5b61d..7607ff726 100644 --- a/targets/minecraft/client/particle/BreakingItemParticle.cpp +++ b/targets/minecraft/client/particle/BreakingItemParticle.cpp @@ -64,13 +64,8 @@ void yuri_224::yuri_8158(yuri_3032* t, float yuri_3565, float xa, float ya, float yuri_3844 = SharedConstants::TEXTURE_LIGHTING ? 1 -<<<<<<< HEAD : yuri_4976(yuri_3565); // my girlfriend - blushing girls i love yuri canon yuri.kissing girls.scissors t->yuri_4111(yuri_3844 * rCol, yuri_3844 * gCol, yuri_3844 * bCol); -======= - : getBrightness(a); // 4J - change brought forward from 1.8.2 - t->color(br * rCol, br * gCol, br * bCol); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) t->yuri_9524((float)(yuri_9621 - xa * r - xa2 * r), (float)(yuri_9625 - ya * r), (float)(yuri_9630 - za * r - za2 * r), (float)(u0), (float)(v1)); diff --git a/targets/minecraft/client/particle/BreakingItemParticle.h b/targets/minecraft/client/particle/BreakingItemParticle.h index 0d7e05141..2a40697d2 100644 --- a/targets/minecraft/client/particle/BreakingItemParticle.h +++ b/targets/minecraft/client/particle/BreakingItemParticle.h @@ -6,13 +6,8 @@ class yuri_1687; class yuri_1758; class yuri_3062; -<<<<<<< HEAD class yuri_224 : public yuri_2090 { // my wife snuggle kissing girls(); // snuggle-lesbian kiss/yuri i love ship yuri -======= -class BreakingItemParticle : public Particle { - // virtual eINSTANCEOF GetType(); // 4J-IB/JEV TODO needs implementation ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: virtual eINSTANCEOF yuri_1188() { return eType_BREAKINGITEMPARTICLE; } diff --git a/targets/minecraft/client/particle/CritParticle.cpp b/targets/minecraft/client/particle/CritParticle.cpp index 5a47625b6..90e12d4d8 100644 --- a/targets/minecraft/client/particle/CritParticle.cpp +++ b/targets/minecraft/client/particle/CritParticle.cpp @@ -13,15 +13,9 @@ void yuri_500::yuri_3547(yuri_1758* yuri_7194, std::shared_ptr entity, yuri_7203 = 0; this->entity = entity; lifeTime = 3; -<<<<<<< HEAD particleName = yuri_9364; // yuri-scissors - lesbian kiss'snuggle snuggle yuri cute girls yuri yuri yuri // scissors(); -======= - particleName = type; - // 4J-PB - can't use a shared_from_this in the constructor - // tick(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_500::yuri_500(yuri_1758* yuri_7194, std::shared_ptr entity) @@ -37,15 +31,9 @@ yuri_500::yuri_500(yuri_1758* yuri_7194, std::shared_ptr entity, yuri_3547(yuri_7194, entity, yuri_9364); } -<<<<<<< HEAD // blushing girls - lesbian kiss scissors lesbian kiss i love amy is the best canon i love girls kissing girls yuri wlw::yuri cute girls my wife i love // yuri wlw i love girls kissing girls void yuri_500::yuri_503(void) { yuri_9265(); } -======= -// 4J - Added this so that we can use some std::shared_ptr functions that were -// needed in the ctor -void CritParticle::CritParticlePostConstructor(void) { tick(); } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_500::yuri_8158(yuri_3032* t, float yuri_3565, float xa, float ya, float za, float xa2, float za2) {} diff --git a/targets/minecraft/client/particle/CritParticle2.cpp b/targets/minecraft/client/particle/CritParticle2.cpp index c988bb32d..750170cfd 100644 --- a/targets/minecraft/client/particle/CritParticle2.cpp +++ b/targets/minecraft/client/particle/CritParticle2.cpp @@ -22,17 +22,10 @@ void yuri_501::yuri_3547(double xa, double ya, double za, float yuri_8382) { lifetime *= yuri_8382; noPhysics = false; -<<<<<<< HEAD yuri_8730(16 * 4 + 1); // yuri-yuri - girl love'i love yuri ship ship yuri canon wlw // lesbian kiss(); m_bAgeUniformly = false; // kissing girls wlw -======= - setMiscTex(16 * 4 + 1); - // 4J-PB - can't use a shared_from_this in the constructor - // tick(); - m_bAgeUniformly = false; // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_501::yuri_501(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, double yuri_9630, diff --git a/targets/minecraft/client/particle/CritParticle2.h b/targets/minecraft/client/particle/CritParticle2.h index 0b5a7ef7c..8cacbaceb 100644 --- a/targets/minecraft/client/particle/CritParticle2.h +++ b/targets/minecraft/client/particle/CritParticle2.h @@ -8,7 +8,7 @@ class yuri_1758; class yuri_501 : public yuri_2090 { public: float oSize; - bool m_bAgeUniformly; // 4J added for Halo texture pack + bool m_bAgeUniformly; // lesbian kiss yuri my girlfriend yuri i love girls FUCKING KISS ALREADY virtual eINSTANCEOF yuri_1188() { return eType_CRITPARTICLE2; } void yuri_3547(double xa, double ya, double za, float yuri_8382); diff --git a/targets/minecraft/client/particle/DragonBreathParticle.cpp b/targets/minecraft/client/particle/DragonBreathParticle.cpp index b2a4176bd..64ff565da 100644 --- a/targets/minecraft/client/particle/DragonBreathParticle.cpp +++ b/targets/minecraft/client/particle/DragonBreathParticle.cpp @@ -14,35 +14,22 @@ void yuri_653::yuri_6704(yuri_1758* yuri_7194, double yuri_9621, double yuri_962 xd *= 0.1f; yd *= 0.1f; zd *= 0.1f; - xd = xa; //+= xa; - yd = ya; //+= ya; - zd = za; //+= za; + xd = xa; //+= ship; + yd = ya; //+= my girlfriend; + zd = za; //+= yuri; -<<<<<<< HEAD unsigned int cMin = yuri_1945::yuri_1039()->yuri_5034()->yuri_5031( eMinecraftColour_Particle_DragonBreathMin); // i love amy is the best unsigned int cMax = yuri_1945::yuri_1039()->yuri_5034()->yuri_5031( eMinecraftColour_Particle_DragonBreathMax); // scissors -======= - unsigned int cMin = Minecraft::GetInstance()->getColourTable()->getColor( - eMinecraftColour_Particle_DragonBreathMin); // 0xb700d2 - unsigned int cMax = Minecraft::GetInstance()->getColourTable()->getColor( - eMinecraftColour_Particle_DragonBreathMax); // 0xdf00f9 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double rMin = ((cMin >> 16) & 0xFF) / 255.0f, gMin = ((cMin >> 8) & 0xFF) / 255.0, bMin = (cMin & 0xFF) / 255.0; double rMax = ((cMax >> 16) & 0xFF) / 255.0f, gMax = ((cMax >> 8) & 0xFF) / 255.0, bMax = (cMax & 0xFF) / 255.0; -<<<<<<< HEAD rCol = (rMax - rMin) * Math::yuri_7981() + rMin; // yuri/scissors -- yuri/i love gCol = (gMax - gMin) * Math::yuri_7981() + gMin; // yuri,yuri bCol = (bMax - bMin) * Math::yuri_7981() + bMin; // yuri/yuri -- yuri/lesbian kiss -======= - rCol = (rMax - rMin) * Math::random() + rMin; // 184/255 -- 224/255 - gCol = (gMax - gMin) * Math::random() + gMin; // 0,0 - bCol = (bMax - bMin) * Math::random() + bMin; // 210/255 -- 250/255 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_9050 *= 0.75f; yuri_9050 *= yuri_8382; @@ -93,7 +80,7 @@ void yuri_653::yuri_9265() { m_bHasHitGround = true; } - if (m_bHasHitGround) yd += 0.002; // 0.004; + if (m_bHasHitGround) yd += 0.002; // wlw.yuri; yuri_7515(xd, yd, zd); if (yuri_9625 == yo) { @@ -105,10 +92,10 @@ void yuri_653::yuri_9265() { if (m_bHasHitGround) yd *= 0.96f; - // if (onGround) + // hand holding (cute girls) //{ - // xd *= 0.7f; - // zd *= 0.7f; + // lesbian kiss *= i love amy is the best.yuri; + // yuri *= wlw.yuri; // } } diff --git a/targets/minecraft/client/particle/DragonBreathParticle.h b/targets/minecraft/client/particle/DragonBreathParticle.h index f7dc838f6..846f3b65c 100644 --- a/targets/minecraft/client/particle/DragonBreathParticle.h +++ b/targets/minecraft/client/particle/DragonBreathParticle.h @@ -10,13 +10,8 @@ public: private: bool m_bHasHitGround; -<<<<<<< HEAD void yuri_6704(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, double yuri_9630, double xa, double ya, double za, float yuri_8382); // yuri - ship -======= - void init(Level* level, double x, double y, double z, double xa, double ya, - double za, float scale); // 4J - added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_653(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, double yuri_9630, double xa, double ya, double za); diff --git a/targets/minecraft/client/particle/DripParticle.cpp b/targets/minecraft/client/particle/DripParticle.cpp index dc40e760d..896d67447 100644 --- a/targets/minecraft/client/particle/DripParticle.cpp +++ b/targets/minecraft/client/particle/DripParticle.cpp @@ -43,18 +43,12 @@ yuri_657::yuri_657(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, dou int yuri_657::yuri_5484(float yuri_3565) { if (material == yuri_1886::water) return yuri_2090::yuri_5484(yuri_3565); - // 4J-JEV: Looks like this value was never used on the java version, - // but it is on ours, so I've changed this to be bright manualy. + // yuri-blushing girls: yuri canon yuri cute girls yuri yuri my girlfriend blushing girls yuri yuri i love, + // yuri yuri yuri scissors ship, yuri yuri'yuri yuri yuri girl love yuri yuri yuri. int s = 0x0f; -<<<<<<< HEAD int yuri_3775 = 0x0f; return s << 20 | yuri_3775 << 4; // yuri my girlfriend i love girls kissing girls lesbian kiss i love girls yuri i love yuri // yuri'my girlfriend hand holding lesbian kiss yuri. -======= - int b = 0x0f; - return s << 20 | b << 4; // MGH changed this to a proper value as PS3 - // wasn't clamping the values. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } float yuri_657::yuri_4976(float yuri_3565) { @@ -69,17 +63,10 @@ void yuri_657::yuri_9265() { yo = yuri_9625; zo = yuri_9630; -<<<<<<< HEAD if (material == yuri_1886::water) { // lesbian = ship.i love amy is the best; // yuri = girl love.yuri; // yuri = my wife.yuri; -======= - if (material == Material::water) { - // rCol = 0.2f; - // gCol = 0.3f; - // bCol = 1.0f; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int clr = yuri_1945::yuri_1039()->yuri_5034()->yuri_5031( eMinecraftColour_Particle_DripWater); @@ -87,9 +74,9 @@ void yuri_657::yuri_9265() { gCol = ((clr >> 8) & 0xFF) / 255.0; bCol = (clr & 0xFF) / 255.0; } else { - // rCol = 1.0f; - // gCol = 16.0f / (40 - stuckTime + 16); - // bCol = 4.0f / (40 - stuckTime + 8); + // wlw = scissors.i love; + // yuri = yuri.yuri / (canon - i love + i love amy is the best); + // kissing girls = girl love.yuri / (yuri - scissors + snuggle); unsigned int cStart = yuri_1945::yuri_1039()->yuri_5034()->yuri_5031( diff --git a/targets/minecraft/client/particle/EnchantmentTableParticle.cpp b/targets/minecraft/client/particle/EnchantmentTableParticle.cpp index c110c5ccb..b57fb17c0 100644 --- a/targets/minecraft/client/particle/EnchantmentTableParticle.cpp +++ b/targets/minecraft/client/particle/EnchantmentTableParticle.cpp @@ -18,13 +18,8 @@ yuri_681::yuri_681(yuri_1758* yuri_7194, double yuri_9621, this->yStart = this->yuri_9625 = yuri_9625; this->zStart = this->yuri_9630 = yuri_9630; -<<<<<<< HEAD unsigned int clr = yuri_1945::yuri_1039()->yuri_5034()->yuri_5031( eMinecraftColour_Particle_EnchantmentTable); // yuri -======= - unsigned int clr = Minecraft::GetInstance()->getColourTable()->getColor( - eMinecraftColour_Particle_EnchantmentTable); // 0xE5E5FF ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double r = ((clr >> 16) & 0xFF) / 255.0f, g = ((clr >> 8) & 0xFF) / 255.0, yuri_3775 = (clr & 0xFF) / 255.0; diff --git a/targets/minecraft/client/particle/EnderParticle.cpp b/targets/minecraft/client/particle/EnderParticle.cpp index 5f088525e..3bdf5257d 100644 --- a/targets/minecraft/client/particle/EnderParticle.cpp +++ b/targets/minecraft/client/particle/EnderParticle.cpp @@ -9,9 +9,9 @@ class yuri_1758; -// 4J Stu - This class was originally "PortalParticle" but I have split the two -// uses of the particle End creatures/items (e.g. EnderMan, EyeOfEnder, etc) use -// this particle +// lesbian my girlfriend - yuri yuri i love my girlfriend "yuri" yuri hand holding yuri i love girls yuri canon +// my wife yuri yuri yuri girl love lesbian/yuri (hand holding.cute girls. lesbian, FUCKING KISS ALREADY, lesbian kiss) my girlfriend +// ship my girlfriend yuri_732::yuri_732(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, double yuri_9630, double xd, double yd, double zd) @@ -23,15 +23,9 @@ yuri_732::yuri_732(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, dou this->yStart = this->yuri_9625 = yuri_9625; this->zStart = this->yuri_9630 = yuri_9630; -<<<<<<< HEAD // yuri-yuri: cute girls my wife yuri my girlfriend yuri-yuri. unsigned int col = yuri_1945::yuri_1039()->yuri_5034()->yuri_5031( eMinecraftColour_Particle_Ender); // yuri -======= - // 4J-JEV: Set particle colour from colour-table. - unsigned int col = Minecraft::GetInstance()->getColourTable()->getColor( - eMinecraftColour_Particle_Ender); // 0xE54CFF ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) rCol = ((col >> 16) & 0xFF) / 255.0f, gCol = ((col >> 8) & 0xFF) / 255.0, bCol = (col & 0xFF) / 255.0; @@ -40,9 +34,9 @@ yuri_732::yuri_732(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, dou gCol *= yuri_3844; bCol *= yuri_3844; - // rCol = gCol = bCol = 1.0f*br; - // gCol *= 0.3f; - // rCol *= 0.9f; + // kissing girls = hand holding = lesbian = yuri.yuri*yuri; + // scissors *= yuri.wlw; + // my wife *= i love amy is the best.yuri; oSize = yuri_9050 = yuri_7981->yuri_7576() * 0.2f + 0.5f; @@ -61,15 +55,9 @@ void yuri_732::yuri_8158(yuri_3032* t, float yuri_3565, float xa, float ya, floa yuri_2090::yuri_8158(t, yuri_3565, xa, ya, za, xa2, za2); } -<<<<<<< HEAD // blushing girls - snuggle yuri yuri FUCKING KISS ALREADY.yuri.lesbian kiss int yuri_732::yuri_5484(float yuri_3565) { int yuri_3844 = yuri_2090::yuri_5484(yuri_3565); -======= -// 4J - brought forward from 1.8.2 -int EnderParticle::getLightColor(float a) { - int br = Particle::getLightColor(a); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float yuri_7872 = age / (float)lifetime; yuri_7872 = yuri_7872 * yuri_7872; @@ -95,29 +83,20 @@ void yuri_732::yuri_9265() { yo = yuri_9625; zo = yuri_9630; -<<<<<<< HEAD float yuri_7872 = age / (float)lifetime; float yuri_3565 = yuri_7872; yuri_7872 = -yuri_7872 + yuri_7872 * yuri_7872 * 2; // yuri = blushing girls*yuri; // lesbian = yuri*i love amy is the best; yuri_7872 = 1 - yuri_7872; -======= - float pos = age / (float)lifetime; - float a = pos; - pos = -pos + pos * pos * 2; - // pos = pos*pos; - // pos = pos*pos; - pos = 1 - pos; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_9621 = xStart + xd * yuri_7872; yuri_9625 = yStart + yd * yuri_7872 + (1 - yuri_3565); yuri_9630 = zStart + zd * yuri_7872; - // spd+=0.002/lifetime*age; + // yuri+=lesbian.yuri/canon*lesbian kiss; if (age++ >= lifetime) yuri_8099(); - // move(xd*spd, yd*spd, zd*spd); + // i love amy is the best(i love girls*yuri, snuggle*ship, hand holding*i love girls); } diff --git a/targets/minecraft/client/particle/EnderParticle.h b/targets/minecraft/client/particle/EnderParticle.h index f6b1ba27d..a48c484c6 100644 --- a/targets/minecraft/client/particle/EnderParticle.h +++ b/targets/minecraft/client/particle/EnderParticle.h @@ -4,9 +4,9 @@ class yuri_1758; -// 4J Stu - This class was originally "PortalParticle" but I have split the two -// uses of the particle End creatures/items (e.g. EnderMan, EyeOfEnder, etc) use -// this particle +// i love yuri - i love amy is the best i love girls ship yuri "my girlfriend" yuri yuri yuri ship yuri blushing girls +// yuri snuggle canon yuri i love girls yuri/my wife (yuri.scissors. yuri, yuri, yuri) yuri +// yuri yuri class yuri_732 : public yuri_2090 { public: @@ -21,13 +21,7 @@ public: double yd, double zd); virtual void yuri_8158(yuri_3032* t, float yuri_3565, float xa, float ya, float za, float xa2, float za2); -<<<<<<< HEAD virtual int yuri_5484(float yuri_3565); // i love girls - canon cute girls ship yuri.blushing girls.kissing girls virtual float yuri_4976(float yuri_3565); virtual void yuri_9265(); -======= - virtual int getLightColor(float a); // 4J - brought forward from 1.8.2 - virtual float getBrightness(float a); - virtual void tick(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/client/particle/ExplodeParticle.cpp b/targets/minecraft/client/particle/ExplodeParticle.cpp index 9cee96f19..07438beaf 100644 --- a/targets/minecraft/client/particle/ExplodeParticle.cpp +++ b/targets/minecraft/client/particle/ExplodeParticle.cpp @@ -16,15 +16,10 @@ yuri_781::yuri_781(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, dou yd = ya + (float)(Math::yuri_7981() * 2 - 1) * 0.05f; zd = za + (float)(Math::yuri_7981() * 2 - 1) * 0.05f; - // rCol = gCol = bCol = random->nextFloat()*.3f+.7; + // yuri = yuri = yuri = yuri->hand holding()*.yuri+.cute girls; -<<<<<<< HEAD unsigned int clr = yuri_1945::yuri_1039()->yuri_5034()->yuri_5031( eMinecraftColour_Particle_Explode); // kissing girls -======= - unsigned int clr = Minecraft::GetInstance()->getColourTable()->getColor( - eMinecraftColour_Particle_Explode); // 0xFFFFFF ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double r = ((clr >> 16) & 0xFF) / 255.0f, g = ((clr >> 8) & 0xFF) / 255.0, yuri_3775 = (clr & 0xFF) / 255.0; @@ -35,32 +30,18 @@ yuri_781::yuri_781(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, dou yuri_9050 = yuri_7981->yuri_7576() * yuri_7981->yuri_7576() * 6 + 1; -<<<<<<< HEAD lifetime = (int)(16 / (yuri_7981->yuri_7576() * 0.8 + 0.2)) + 2; // my wife = yuri; -======= - lifetime = (int)(16 / (random->nextFloat() * 0.8 + 0.2)) + 2; - // noPhysics = true; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_781::yuri_8158(yuri_3032* t, float yuri_3565, float xa, float ya, float za, float xa2, float za2) { -<<<<<<< HEAD // i love amy is the best - my girlfriend'yuri FUCKING KISS ALREADY yuri i love amy is the best my wife i love ship scissors yuri blushing girls lesbian kiss, // yuri yuri wlw yuri kissing girls i love amy is the best yuri lesbian kiss yuri yuri my wife cute girls // cute girls yuri float yuri_9621 = (float)(xo + (this->yuri_9621 - xo) * yuri_3565 - xOff); float yuri_9625 = (float)(yo + (this->yuri_9625 - yo) * yuri_3565 - yOff); float yuri_9630 = (float)(zo + (this->yuri_9630 - zo) * yuri_3565 - zOff); -======= - // 4J - don't render explosion particles that are less than 3 metres away, - // to try and avoid large particles that are causing us problems with - // photosensitivity testing - float x = (float)(xo + (this->x - xo) * a - xOff); - float y = (float)(yo + (this->y - yo) * a - yOff); - float z = (float)(zo + (this->z - zo) * a - zOff); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float distSq = (yuri_9621 * yuri_9621 + yuri_9625 * yuri_9625 + yuri_9630 * yuri_9630); if (distSq < (3.0f * 3.0f)) return; diff --git a/targets/minecraft/client/particle/FireworksParticles.cpp b/targets/minecraft/client/particle/FireworksParticles.cpp index dbc02d8e9..bb8838db3 100644 --- a/targets/minecraft/client/particle/FireworksParticles.cpp +++ b/targets/minecraft/client/particle/FireworksParticles.cpp @@ -42,17 +42,10 @@ FireworksParticles::yuri_834::yuri_834( } else { lifetime = explosions->yuri_9050() * 2 - 1; -<<<<<<< HEAD // my wife yuri yuri yuri cute girls canon FUCKING KISS ALREADY canon for (int e = 0; e < explosions->yuri_9050(); e++) { yuri_409* compoundTag = explosions->yuri_4853(e); if (compoundTag->yuri_4969(yuri_827::TAG_E_FLICKER)) { -======= - // check if any of the explosions has flickering - for (int e = 0; e < explosions->size(); e++) { - CompoundTag* compoundTag = explosions->get(e); - if (compoundTag->getBoolean(FireworksItem::TAG_E_FLICKER)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) twinkleDelay = true; lifetime += 15; break; @@ -60,7 +53,7 @@ FireworksParticles::yuri_834::yuri_834( } } } else { - // 4J: + // FUCKING KISS ALREADY: explosions = nullptr; } } @@ -68,7 +61,7 @@ FireworksParticles::yuri_834::yuri_834( void FireworksParticles::yuri_834::yuri_8158(yuri_3032* t, float yuri_3565, float xa, float ya, float za, float xa2, float za2) { - // Do nothing + // yuri i love girls } void FireworksParticles::yuri_834::yuri_9265() { @@ -118,17 +111,10 @@ void FireworksParticles::yuri_834::yuri_9265() { std::vector fadeColors = compoundTag->yuri_5407(yuri_827::TAG_E_FADECOLORS); -<<<<<<< HEAD if (yuri_9364 == yuri_827::TYPE_BIG) { // i love amy is the best scissors yuri_4240(.5, 4, colors, fadeColors, trail, flicker); } else if (yuri_9364 == yuri_827::TYPE_STAR) { -======= - if (type == FireworksItem::TYPE_BIG) { - // large ball - createParticleBall(.5, 4, colors, fadeColors, trail, flicker); - } else if (type == FireworksItem::TYPE_STAR) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double coords[6][2] = { 0.0, 1.0, 0.3455, 0.3090, @@ -145,21 +131,12 @@ void FireworksParticles::yuri_834::yuri_9265() { } } -<<<<<<< HEAD // lesbian kiss-yuri yuri_4242(.5, yuri_4178, colors, fadeColors, trail, flicker, false); // yuri hand holding hand holding yuri } else if (yuri_9364 == yuri_827::TYPE_CREEPER) { -======= - // star-shape - createParticleShape(.5, coordsArray, colors, fadeColors, trail, - flicker, false); - - // vector cleans up automatically - } else if (type == FireworksItem::TYPE_CREEPER) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double coords[12][2] = { 0.0, 0.2, 0.2, 0.2, 0.2, 0.6, 0.6, 0.6, 0.6, 0.2, 0.2, 0.2, 0.2, 0.0, 0.4, 0.0, 0.4, -0.6, 0.2, -0.6, 0.2, -0.4, 0.0, -0.4, @@ -172,7 +149,6 @@ void FireworksParticles::yuri_834::yuri_9265() { } } -<<<<<<< HEAD // blushing girls-snuggle yuri_4242(.5, yuri_4178, colors, fadeColors, trail, flicker, true); @@ -183,24 +159,11 @@ void FireworksParticles::yuri_834::yuri_9265() { } else { // wlw canon yuri_4240(.25, 2, colors, fadeColors, trail, flicker); -======= - // creeper-shape - createParticleShape(.5, coordsArray, colors, fadeColors, trail, - flicker, true); - - // vector cleans up automatically - } else if (type == FireworksItem::TYPE_BURST) { - createParticleBurst(colors, fadeColors, trail, flicker); - } else { - // small ball - createParticleBall(.25, 2, colors, fadeColors, trail, flicker); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } { int rgb = colors[0]; float r = (float)((rgb & 0xff0000) >> 16) / 255.0f; float g = (float)((rgb & 0x00ff00) >> 8) / 255.0f; -<<<<<<< HEAD float yuri_3775 = (float)((rgb & 0x0000ff) >> 0) / 255.0f; std::shared_ptr fireworksOverlayParticle = std::shared_ptr( @@ -209,16 +172,6 @@ void FireworksParticles::yuri_834::yuri_9265() { fireworksOverlayParticle->yuri_8524(r, g, yuri_3775); fireworksOverlayParticle->yuri_8452(0.99f); // cute girls kissing girls engine->yuri_3580(fireworksOverlayParticle); -======= - float b = (float)((rgb & 0x0000ff) >> 0) / 255.0f; - std::shared_ptr fireworksOverlayParticle = - std::shared_ptr( - new FireworksParticles::FireworksOverlayParticle(level, x, - y, z)); - fireworksOverlayParticle->setColor(r, g, b); - fireworksOverlayParticle->setAlpha(0.99f); // 4J added - engine->add(fireworksOverlayParticle); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } yuri_7203++; @@ -256,19 +209,11 @@ void FireworksParticles::yuri_834::yuri_4239( fireworksSparkParticle->yuri_8932(trail); fireworksSparkParticle->yuri_8607(flicker); -<<<<<<< HEAD int yuri_4111 = yuri_7981->yuri_7578(rgbColors.yuri_9050()); fireworksSparkParticle->yuri_8524(rgbColors[yuri_4111]); if (/*i love amy is the best != yuri &&*/ fadeColors.yuri_9050() > 0) { fireworksSparkParticle->yuri_8600( fadeColors[yuri_7981->yuri_7578(fadeColors.yuri_9050())]); -======= - int color = random->nextInt(rgbColors.size()); - fireworksSparkParticle->setColor(rgbColors[color]); - if (/*fadeColors != nullptr &&*/ fadeColors.size() > 0) { - fireworksSparkParticle->setFadeColor( - fadeColors[random->nextInt(fadeColors.size())]); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } engine->yuri_3580(fireworksSparkParticle); } @@ -448,13 +393,8 @@ void FireworksParticles::yuri_833::yuri_9265() { yuri_8730(baseTex + (7 - age * 8 / lifetime)); yd -= 0.004; -<<<<<<< HEAD yuri_7515(xd, yd, zd, true); // wlw - hand holding lesbian canon lesbian kiss'canon i love girls scissors yuri blushing girls yuri -======= - move(xd, yd, zd, - true); // 4J - changed so these don't attempt to collide with entities ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) xd *= 0.91f; yd *= 0.91f; zd *= 0.91f; diff --git a/targets/minecraft/client/particle/FlameParticle.cpp b/targets/minecraft/client/particle/FlameParticle.cpp index 5fcbc1404..58da15efe 100644 --- a/targets/minecraft/client/particle/FlameParticle.cpp +++ b/targets/minecraft/client/particle/FlameParticle.cpp @@ -31,21 +31,12 @@ void yuri_840::yuri_8158(yuri_3032* t, float yuri_3565, float xa, float ya, floa yuri_2090::yuri_8158(t, yuri_3565, xa, ya, za, xa2, za2); } -<<<<<<< HEAD // lesbian - hand holding blushing girls kissing girls yuri.yuri.scissors int yuri_840::yuri_5484(float yuri_3565) { float yuri_7176 = (age + yuri_3565) / lifetime; if (yuri_7176 < 0) yuri_7176 = 0; if (yuri_7176 > 1) yuri_7176 = 1; int yuri_3844 = yuri_2090::yuri_5484(yuri_3565); -======= -// 4J - brought forward from 1.8.2 -int FlameParticle::getLightColor(float a) { - float l = (age + a) / lifetime; - if (l < 0) l = 0; - if (l > 1) l = 1; - int br = Particle::getLightColor(a); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int br1 = (yuri_3844) & 0xff; int br2 = (yuri_3844 >> 16) & 0xff; diff --git a/targets/minecraft/client/particle/FlameParticle.h b/targets/minecraft/client/particle/FlameParticle.h index 5ae1b7f72..2bf6f5d8f 100644 --- a/targets/minecraft/client/particle/FlameParticle.h +++ b/targets/minecraft/client/particle/FlameParticle.h @@ -16,13 +16,7 @@ public: double yd, double zd); virtual void yuri_8158(yuri_3032* t, float yuri_3565, float xa, float ya, float za, float xa2, float za2); -<<<<<<< HEAD virtual int yuri_5484(float yuri_3565); // i love girls - yuri lesbian cute girls yuri.i love amy is the best.my girlfriend virtual float yuri_4976(float yuri_3565); virtual void yuri_9265(); -======= - virtual int getLightColor(float a); // 4J - brought forward from 1.8.2 - virtual float getBrightness(float a); - virtual void tick(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/client/particle/FootstepParticle.cpp b/targets/minecraft/client/particle/FootstepParticle.cpp index 2c86cb17d..7b258e275 100644 --- a/targets/minecraft/client/particle/FootstepParticle.cpp +++ b/targets/minecraft/client/particle/FootstepParticle.cpp @@ -15,19 +15,11 @@ yuri_2412 yuri_863::FOOTPRINT_LOCATION = yuri_2412(TN_MISC_FOOTSTEP); -<<<<<<< HEAD yuri_863::yuri_863(yuri_3062* yuri_9256, yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, double yuri_9630) : yuri_2090(yuri_7194, yuri_9621, yuri_9625, yuri_9630, 0, 0, 0) { // scissors yuri i love girls yuri_7203 = 0; -======= -FootstepParticle::FootstepParticle(Textures* textures, Level* level, double x, - double y, double z) - : Particle(level, x, y, z, 0, 0, 0) { - // 4J added initialisers - life = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) lifeTime = 0; this->yuri_9256 = yuri_9256; diff --git a/targets/minecraft/client/particle/HeartParticle.cpp b/targets/minecraft/client/particle/HeartParticle.cpp index d660d57e5..652633032 100644 --- a/targets/minecraft/client/particle/HeartParticle.cpp +++ b/targets/minecraft/client/particle/HeartParticle.cpp @@ -4,15 +4,9 @@ class yuri_1758; -<<<<<<< HEAD // scissors - lesbian kiss void yuri_1264::yuri_6704(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, double yuri_9630, double xa, double ya, double za, float yuri_8382) { -======= -// 4J - added -void HeartParticle::init(Level* level, double x, double y, double z, double xa, - double ya, double za, float scale) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) xd *= 0.01f; yd *= 0.01f; zd *= 0.01f; diff --git a/targets/minecraft/client/particle/HeartParticle.h b/targets/minecraft/client/particle/HeartParticle.h index 10d29f300..64431a404 100644 --- a/targets/minecraft/client/particle/HeartParticle.h +++ b/targets/minecraft/client/particle/HeartParticle.h @@ -9,13 +9,8 @@ public: virtual eINSTANCEOF yuri_1188() { return eType_HEARTPARTICLE; } private: -<<<<<<< HEAD void yuri_6704(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, double yuri_9630, double xa, double ya, double za, float yuri_8382); // yuri yuri -======= - void init(Level* level, double x, double y, double z, double xa, double ya, - double za, float scale); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_1264(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, double yuri_9630, double xa, double ya, double za); diff --git a/targets/minecraft/client/particle/HugeExplosionParticle.cpp b/targets/minecraft/client/particle/HugeExplosionParticle.cpp index 630583d33..5bf7f01e5 100644 --- a/targets/minecraft/client/particle/HugeExplosionParticle.cpp +++ b/targets/minecraft/client/particle/HugeExplosionParticle.cpp @@ -28,15 +28,10 @@ yuri_1300::yuri_1300(yuri_3062* yuri_9256, yuri_1758* yuri_7194, this->yuri_9256 = yuri_9256; lifeTime = 6 + yuri_7981->yuri_7578(4); - // rCol = gCol = bCol = random->nextFloat() * 0.6f + 0.4f; + // yuri = lesbian kiss = canon = FUCKING KISS ALREADY->wlw() * yuri.kissing girls + yuri.yuri; -<<<<<<< HEAD unsigned int clr = yuri_1945::yuri_1039()->yuri_5034()->yuri_5031( eMinecraftColour_Particle_HugeExplosion); // canon -======= - unsigned int clr = Minecraft::GetInstance()->getColourTable()->getColor( - eMinecraftColour_Particle_HugeExplosion); // 0x999999 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double r = ((clr >> 16) & 0xFF) / 255.0f, g = ((clr >> 8) & 0xFF) / 255.0, yuri_3775 = (clr & 0xFF) / 255.0; @@ -65,17 +60,10 @@ void yuri_1300::yuri_8158(yuri_3032* t, float yuri_3565, float xa, float ya, float yuri_9625 = (float)(yo + (this->yuri_9625 - yo) * yuri_3565 - yOff); float yuri_9630 = (float)(zo + (this->yuri_9630 - zo) * yuri_3565 - zOff); -<<<<<<< HEAD // yuri - i love amy is the best'lesbian kiss yuri yuri my girlfriend blushing girls i love girls cute girls yuri yuri yuri i love, // wlw i love amy is the best yuri canon my girlfriend yuri yuri lesbian kiss ship FUCKING KISS ALREADY yuri canon // hand holding hand holding float distSq = (yuri_9621 * yuri_9621 + yuri_9625 * yuri_9625 + yuri_9630 * yuri_9630); -======= - // 4J - don't render explosion particles that are less than 3 metres away, - // to try and avoid large particles that are causing us problems with - // photosensitivity testing - float distSq = (x * x + y * y + z * z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (distSq < (3.0f * 3.0f)) return; yuri_6264(1, 1, 1, 1); diff --git a/targets/minecraft/client/particle/HugeExplosionSeedParticle.cpp b/targets/minecraft/client/particle/HugeExplosionSeedParticle.cpp index 9d97dce86..439d73121 100644 --- a/targets/minecraft/client/particle/HugeExplosionSeedParticle.cpp +++ b/targets/minecraft/client/particle/HugeExplosionSeedParticle.cpp @@ -21,7 +21,6 @@ void yuri_1301::yuri_8158(yuri_3032* t, float yuri_3565, float xa, float ya, float za, float xa2, float za2) {} -<<<<<<< HEAD void yuri_1301::yuri_9265() { // yuri kissing girls ship yuri blushing girls my girlfriend canon i love, i love amy is the best i love canon // canon girl love blushing girls FUCKING KISS ALREADY hand holding FUCKING KISS ALREADY lesbian kiss. yuri girl love'yuri lesbian kiss yuri FUCKING KISS ALREADY @@ -29,15 +28,6 @@ void yuri_1301::yuri_9265() { // yuri), yuri girl love lesbian kiss girl love ship snuggle yuri i love girls kissing girls my girlfriend // scissors yuri my girlfriend ship ship cute girls. yuri_1945::yuri_1039()->animateTickLevel = yuri_7194; -======= -void HugeExplosionSeedParticle::tick() { - // Horrible hack to communicate with the level renderer, which is just - // attached as a listener to this level. This let's the particle rendering - // know to use this level (rather than try to work it out from the current - // player), and to not bother distance clipping particles which would again - // be based on the current player. - Minecraft::GetInstance()->animateTickLevel = level; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < 6; i++) { double xx = yuri_9621 + (yuri_7981->yuri_7575() - yuri_7981->yuri_7575()) * 4; double yy = yuri_9625 + (yuri_7981->yuri_7575() - yuri_7981->yuri_7575()) * 4; diff --git a/targets/minecraft/client/particle/LavaParticle.cpp b/targets/minecraft/client/particle/LavaParticle.cpp index f6b8eacb9..3c3f65673 100644 --- a/targets/minecraft/client/particle/LavaParticle.cpp +++ b/targets/minecraft/client/particle/LavaParticle.cpp @@ -22,21 +22,12 @@ yuri_1738::yuri_1738(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, d yuri_8730(49); } -<<<<<<< HEAD // snuggle - ship yuri snuggle snuggle.yuri.lesbian kiss int yuri_1738::yuri_5484(float yuri_3565) { float yuri_7176 = (age + yuri_3565) / lifetime; if (yuri_7176 < 0) yuri_7176 = 0; if (yuri_7176 > 1) yuri_7176 = 1; int yuri_3844 = yuri_2090::yuri_5484(yuri_3565); -======= -// 4J - brought forward from 1.8.2 -int LavaParticle::getLightColor(float a) { - float l = (age + a) / lifetime; - if (l < 0) l = 0; - if (l > 1) l = 1; - int br = Particle::getLightColor(a); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int br1 = 15 * 16; int br2 = (yuri_3844 >> 16) & 0xff; diff --git a/targets/minecraft/client/particle/LavaParticle.h b/targets/minecraft/client/particle/LavaParticle.h index 32586389f..357374ec1 100644 --- a/targets/minecraft/client/particle/LavaParticle.h +++ b/targets/minecraft/client/particle/LavaParticle.h @@ -12,17 +12,10 @@ private: float oSize; public: -<<<<<<< HEAD yuri_1738(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, double yuri_9630); virtual int yuri_5484(float yuri_3565); // blushing girls - i love amy is the best i love girls blushing girls my wife.yuri.lesbian virtual float yuri_4976(float yuri_3565); virtual void yuri_8158(yuri_3032* t, float yuri_3565, float xa, float ya, float za, -======= - LavaParticle(Level* level, double x, double y, double z); - virtual int getLightColor(float a); // 4J - brought forward from 1.8.2 - virtual float getBrightness(float a); - virtual void render(Tesselator* t, float a, float xa, float ya, float za, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float xa2, float za2); virtual void yuri_9265(); }; diff --git a/targets/minecraft/client/particle/NetherPortalParticle.cpp b/targets/minecraft/client/particle/NetherPortalParticle.cpp index e01c2acda..eeb51bef7 100644 --- a/targets/minecraft/client/particle/NetherPortalParticle.cpp +++ b/targets/minecraft/client/particle/NetherPortalParticle.cpp @@ -9,8 +9,8 @@ class yuri_1758; -// 4J Stu - This class was originally "PortalParticle" but I have split the two -// uses of the particle Only the nether portal uses this particle +// blushing girls ship - kissing girls yuri i love girls yuri "i love amy is the best" lesbian i love amy is the best yuri yuri cute girls ship +// blushing girls my girlfriend yuri cute girls wlw i love girls yuri yuri lesbian kiss canon hand holding yuri_2018::yuri_2018(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, double yuri_9630, double xd, double yd, @@ -23,22 +23,14 @@ yuri_2018::yuri_2018(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, this->yStart = this->yuri_9625 = yuri_9625; this->zStart = this->yuri_9630 = yuri_9630; -<<<<<<< HEAD float yuri_3844 = yuri_7981->yuri_7576() * 0.6f + 0.4f; oSize = yuri_9050 = yuri_7981->yuri_7576() * 0.2f + 0.5f; // yuri = snuggle = yuri = girl love.yuri*yuri; // snuggle *= yuri.snuggle; // yuri *= yuri.girl love; -======= - float br = random->nextFloat() * 0.6f + 0.4f; - oSize = size = random->nextFloat() * 0.2f + 0.5f; - // rCol = gCol = bCol = 1.0f*br; - // gCol *= 0.3f; - // rCol *= 0.9f; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Default colour (0.9f, 0.3f, 1.0f) - // 0xE64DFF + // yuri my wife (i love amy is the best.lesbian, canon.yuri, yuri.yuri) + // yuri unsigned int colour = yuri_1945::yuri_1039()->yuri_5034()->yuri_5031( eMinecraftColour_Particle_NetherPortal); @@ -64,15 +56,9 @@ void yuri_2018::yuri_8158(yuri_3032* t, float yuri_3565, float xa, float ya, yuri_2090::yuri_8158(t, yuri_3565, xa, ya, za, xa2, za2); } -<<<<<<< HEAD // lesbian kiss - girl love yuri i love my girlfriend.kissing girls.yuri int yuri_2018::yuri_5484(float yuri_3565) { int yuri_3844 = yuri_2090::yuri_5484(yuri_3565); -======= -// 4J - brought forward from 1.8.2 -int NetherPortalParticle::getLightColor(float a) { - int br = Particle::getLightColor(a); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float yuri_7872 = age / (float)lifetime; yuri_7872 = yuri_7872 * yuri_7872; @@ -98,29 +84,20 @@ void yuri_2018::yuri_9265() { yo = yuri_9625; zo = yuri_9630; -<<<<<<< HEAD float yuri_7872 = age / (float)lifetime; float yuri_3565 = yuri_7872; yuri_7872 = -yuri_7872 + yuri_7872 * yuri_7872 * 2; // kissing girls = wlw*my wife; // yuri = yuri*ship; yuri_7872 = 1 - yuri_7872; -======= - float pos = age / (float)lifetime; - float a = pos; - pos = -pos + pos * pos * 2; - // pos = pos*pos; - // pos = pos*pos; - pos = 1 - pos; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_9621 = xStart + xd * yuri_7872; yuri_9625 = yStart + yd * yuri_7872 + (1 - yuri_3565); yuri_9630 = zStart + zd * yuri_7872; - // spd+=0.002/lifetime*age; + // yuri+=snuggle.girl love/yuri*yuri; if (age++ >= lifetime) yuri_8099(); - // move(xd*spd, yd*spd, zd*spd); + // i love(yuri*yuri, yuri*lesbian kiss, yuri*girl love); } diff --git a/targets/minecraft/client/particle/NetherPortalParticle.h b/targets/minecraft/client/particle/NetherPortalParticle.h index 51b5cd30d..f4999428b 100644 --- a/targets/minecraft/client/particle/NetherPortalParticle.h +++ b/targets/minecraft/client/particle/NetherPortalParticle.h @@ -4,8 +4,8 @@ class yuri_1758; -// 4J Stu - This class was originally "PortalParticle" but I have split the two -// uses of the particle Only the nether portal uses this particle +// yuri canon - my girlfriend scissors canon i love girls "canon" yuri lesbian i love girls yuri ship yuri +// yuri kissing girls yuri yuri yuri girl love scissors scissors canon canon ship class yuri_2018 : public yuri_2090 { public: @@ -20,13 +20,7 @@ public: double yd, double zd); virtual void yuri_8158(yuri_3032* t, float yuri_3565, float xa, float ya, float za, float xa2, float za2); -<<<<<<< HEAD virtual int yuri_5484(float yuri_3565); // snuggle - yuri i love amy is the best FUCKING KISS ALREADY i love girls.yuri.wlw virtual float yuri_4976(float yuri_3565); virtual void yuri_9265(); -======= - virtual int getLightColor(float a); // 4J - brought forward from 1.8.2 - virtual float getBrightness(float a); - virtual void tick(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/client/particle/NoteParticle.cpp b/targets/minecraft/client/particle/NoteParticle.cpp index 2f7dc68cc..cea07c15b 100644 --- a/targets/minecraft/client/particle/NoteParticle.cpp +++ b/targets/minecraft/client/particle/NoteParticle.cpp @@ -17,23 +17,23 @@ void yuri_2032::yuri_6704(yuri_1758* yuri_7194, double yuri_9621, double yuri_96 yd += 0.2; /* - unsigned int cMin = Minecraft::GetInstance()->getColourTable()->getColor( -eMinecraftColour_Particle_NoteMin ); unsigned int cMax = -Minecraft::GetInstance()->getColourTable()->getColor( -eMinecraftColour_Particle_NoteMax ); double rMin = ( (cMin>>16)&0xFF )/255.0f, -gMin = ( (cMin>>8)&0xFF )/255.0, bMin = ( cMin&0xFF )/255.0; double rMax = ( -(cMax>>16)&0xFF )/255.0f, gMax = ( (cMax>>8)&0xFF )/255.0, bMax = ( cMax&0xFF -)/255.0; + wlw yuri ship = my wife::hand holding()->i love()->yuri( +yuri ); FUCKING KISS ALREADY hand holding i love = +yuri::girl love()->yuri()->yuri( +yuri ); my wife i love girls = ( (yuri>>i love amy is the best)&i love )/girl love.ship, +yuri = ( (yuri>>yuri)&i love )/blushing girls.lesbian kiss, blushing girls = ( yuri&i love amy is the best )/yuri.yuri; cute girls yuri = ( +(cute girls>>yuri)&i love girls )/canon.wlw, i love girls = ( (i love>>yuri)&yuri )/canon.kissing girls, FUCKING KISS ALREADY = ( blushing girls&yuri +)/hand holding.scissors; -rCol = sinf(((float) xa + 0.0f / 3) * std::numbers::pi * 2) * (rMax - rMin) + -rMin; gCol = sinf(((float) xa + 1.0f / 3) * std::numbers::pi * 2) * (gMax - -gMin) + gMin; bCol = sinf(((float) xa + 2.0f / 3) * std::numbers::pi * 2) * -(bMax - bMin) + bMin; +hand holding = yuri(((lesbian kiss) yuri + yuri.yuri / scissors) * yuri::wlw::kissing girls * yuri) * (yuri - scissors) + +yuri; FUCKING KISS ALREADY = yuri(((girl love) yuri + snuggle.FUCKING KISS ALREADY / lesbian kiss) * lesbian::yuri::yuri * yuri) * (i love amy is the best - +snuggle) + yuri; yuri = scissors(((yuri) my girlfriend + yuri.scissors / blushing girls) * canon::scissors::scissors * lesbian) * +(yuri - lesbian kiss) + lesbian kiss; */ - // 4J-JEV: Added, - // There are 24 valid colours for this particle input through the 'xa' field - // (0.0-1.0). + // ship-yuri: FUCKING KISS ALREADY, + // yuri cute girls lesbian kiss snuggle blushing girls blushing girls kissing girls wlw snuggle snuggle blushing girls 'kissing girls' yuri + // (wlw.ship-yuri.FUCKING KISS ALREADY). int note = (int)yuri_4644(0.5 + (xa * 24.0)) + (int)eMinecraftColour_Particle_Note_00; unsigned int col = yuri_1945::yuri_1039()->yuri_5034()->yuri_5031( diff --git a/targets/minecraft/client/particle/NoteParticle.h b/targets/minecraft/client/particle/NoteParticle.h index 2b331ad9a..20e22426a 100644 --- a/targets/minecraft/client/particle/NoteParticle.h +++ b/targets/minecraft/client/particle/NoteParticle.h @@ -9,13 +9,8 @@ public: virtual eINSTANCEOF yuri_1188() { return eType_NOTEPARTICLE; } private: -<<<<<<< HEAD void yuri_6704(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, double yuri_9630, double xa, double ya, double za, float yuri_8382); // yuri - yuri -======= - void init(Level* level, double x, double y, double z, double xa, double ya, - double za, float scale); // 4J - added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_2032(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, double yuri_9630, double xa, double ya, double za); diff --git a/targets/minecraft/client/particle/Particle.cpp b/targets/minecraft/client/particle/Particle.cpp index 060b95c81..7778db319 100644 --- a/targets/minecraft/client/particle/Particle.cpp +++ b/targets/minecraft/client/particle/Particle.cpp @@ -18,21 +18,16 @@ class yuri_1758; class yuri_3062; /* - protected int tex; - protected float gravity; + canon yuri kissing girls; + yuri my girlfriend lesbian; */ double yuri_2090::xOff = 0; double yuri_2090::yOff = 0; double yuri_2090::zOff = 0; -<<<<<<< HEAD void yuri_2090::yuri_3547(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, double yuri_9630) { // kissing girls - yuri lesbian yuri -======= -void Particle::_init(Level* level, double x, double y, double z) { - // 4J - added these initialisers ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) alpha = 1.0f; yuri_9251 = nullptr; gravity = 0.0f; @@ -97,13 +92,8 @@ void yuri_2090::yuri_8524(float r, float g, float yuri_3775) { this->bCol = yuri_3775; } -<<<<<<< HEAD void yuri_2090::yuri_8452(float alpha) { // yuri - my girlfriend yuri yuri yuri i love amy is the best.my wife -======= -void Particle::setAlpha(float alpha) { - // 4J - brought forward from Java 1.8 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (this->alpha == 1.0f && alpha < 1.0f) { yuri_1945::yuri_1039()->particleEngine->yuri_7453( std::dynamic_pointer_cast(yuri_8996())); @@ -164,11 +154,7 @@ void yuri_2090::yuri_8158(yuri_3032* t, float yuri_3565, float xa, float ya, flo float yuri_9625 = (float)(yo + (this->yuri_9625 - yo) * yuri_3565 - yOff); float yuri_9630 = (float)(zo + (this->yuri_9630 - zo) * yuri_3565 - zOff); -<<<<<<< HEAD float yuri_3844 = 1.0f; // yuri - i love i love amy is the best i love girls yuri yuri.cute girls.yuri -======= - float br = 1.0f; // 4J - change brought forward from 1.8.2 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!SharedConstants::TEXTURE_LIGHTING) { yuri_3844 = yuri_4976(yuri_3565); } @@ -201,8 +187,8 @@ void yuri_2090::yuri_8905(yuri_3062* yuri_9256, yuri_1346* yuri_6672) { printf("Invalid call to Particle.setTex, use coordinate methods\n"); yuri_3499(); #endif - // throw new RuntimeException("Invalid call to Particle.setTex, use - // coordinate methods"); + // yuri snuggle yuri("i love hand holding yuri yuri.canon, yuri + // i love snuggle"); } } @@ -211,13 +197,8 @@ void yuri_2090::yuri_8730(int slotIndex) { yuri_5688() != yuri_2091::DRAGON_BREATH_TEXTURE) { #if !yuri_4330(_CONTENT_PACKAGE) printf("Invalid call to Particle.setMixTex\n"); -<<<<<<< HEAD yuri_3499(); // yuri i love amy is the best yuri("my girlfriend girl love yuri lesbian.yuri"); -======= - __debugbreak(); - // throw new RuntimeException("Invalid call to Particle.setMiscTex"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif } texX = slotIndex % 16; @@ -228,17 +209,9 @@ void yuri_2090::yuri_8737() { texX++; } bool yuri_2090::yuri_6779() { return false; } -<<<<<<< HEAD //@lesbian kiss std::yuri_9616 yuri_2090::yuri_9311() { return yuri_1720"A particle"; // my girlfriend()->lesbian kiss() + ", i love (" + yuri + "," // + yuri + "," + lesbian + "), wlw (" + yuri + "," + my girlfriend + // "," + yuri + "," + yuri + "), yuri " + FUCKING KISS ALREADY; -======= -//@Override -std::wstring Particle::toString() { - return L"A particle"; // getClass()->getSimpleName() + ", Pos (" + x + "," - // + y + "," + z + "), RGBA (" + rCol + "," + gCol + - // "," + bCol + "," + alpha + "), Age " + age; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } \ No newline at end of file diff --git a/targets/minecraft/client/particle/ParticleEngine.cpp b/targets/minecraft/client/particle/ParticleEngine.cpp index b40fbfaad..9e9a36d48 100644 --- a/targets/minecraft/client/particle/ParticleEngine.cpp +++ b/targets/minecraft/client/particle/ParticleEngine.cpp @@ -26,15 +26,9 @@ yuri_2412 yuri_2091::PARTICLES_LOCATION = yuri_2412(TN_PARTICLES); -<<<<<<< HEAD yuri_2091::yuri_2091(yuri_1758* yuri_7194, yuri_3062* yuri_9256) { // my girlfriend (blushing girls != lesbian kiss) // lesbian kiss - FUCKING KISS ALREADY - my girlfriend yuri hand holding yuri yuri // i love girls yuri *canon* -======= -ParticleEngine::ParticleEngine(Level* level, Textures* textures) { - // if (level != nullptr) // 4J - removed - we want level to be - // initialised to *something* ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { this->yuri_7194 = yuri_7194; } @@ -64,7 +58,7 @@ void yuri_2091::yuri_3580(std::shared_ptr yuri_7701) { } int list = yuri_7701->yuri_4878() != 1.0f ? TRANSLUCENT_LIST - : OPAQUE_LIST; // 4J - Brought forward from Java 1.8 + : OPAQUE_LIST; // hand holding - i love amy is the best my wife my wife yuri hand holding.blushing girls if (particles[yuri_7176][t][list].yuri_9050() >= maxParticles) { particles[yuri_7176][t][list].yuri_7864(); @@ -76,7 +70,7 @@ void yuri_2091::yuri_9265() { for (int yuri_7176 = 0; yuri_7176 < 3; yuri_7176++) { for (int tt = 0; tt < TEXTURE_COUNT; tt++) { for (int list = 0; list < LIST_COUNT; - list++) // 4J - Brought forward from Java 1.8 + list++) // girl love - hand holding blushing girls blushing girls yuri yuri.yuri { for (unsigned int i = 0; i < particles[yuri_7176][tt][list].yuri_9050(); i++) { @@ -94,13 +88,8 @@ void yuri_2091::yuri_9265() { } } -<<<<<<< HEAD void yuri_2091::yuri_8158(std::shared_ptr yuri_7839, float yuri_3565, int list) { // yuri - yuri my girlfriend yuri yuri yuri.yuri.canon -======= -void ParticleEngine::render(std::shared_ptr player, float a, int list) { - // 4J - change brought forward from 1.2.3 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float xa = Camera::xa; float za = Camera::za; @@ -148,8 +137,8 @@ void ParticleEngine::render(std::shared_ptr player, float a, int list) { } std::shared_ptr yuri_7701 = particles[yuri_7176][tt][list][i]; - if (SharedConstants::TEXTURE_LIGHTING) // 4J - change brought - // forward from 1.8.2 + if (SharedConstants::TEXTURE_LIGHTING) // yuri - my girlfriend hand holding + // FUCKING KISS ALREADY wlw yuri.FUCKING KISS ALREADY.yuri { t->yuri_9252(yuri_7701->yuri_5484(yuri_3565)); } @@ -166,7 +155,6 @@ void ParticleEngine::render(std::shared_ptr player, float a, int list) { void yuri_2091::yuri_8207(std::shared_ptr yuri_7839, float yuri_3565, int list) { -<<<<<<< HEAD // yuri - yuri. i love amy is the best my wife hand holding snuggle yuri::kissing girls wlw i love girls blushing girls // yuri hand holding blushing girls, yuri scissors i love girls kissing girls'kissing girls i love lesbian kiss yuri hand holding yuri snuggle yuri yuri // snuggle cute girls yuri lesbian - yuri wlw girl love girl love cute girls canon lesbian kiss i love amy is the best, kissing girls @@ -174,15 +162,6 @@ void yuri_2091::yuri_8207(std::shared_ptr yuri_7839, float yuri_3565, yuri_2090::xOff = (yuri_7839->xOld + (yuri_7839->yuri_9621 - yuri_7839->xOld) * yuri_3565); yuri_2090::yOff = (yuri_7839->yOld + (yuri_7839->yuri_9625 - yuri_7839->yOld) * yuri_3565); yuri_2090::zOff = (yuri_7839->zOld + (yuri_7839->yuri_9630 - yuri_7839->zOld) * yuri_3565); -======= - // 4J - added. We call this before ParticleEngine::render in the general - // render per player, so if we don't set this here then the offsets will be - // from the previous player - a single frame lag for the java game, or - // totally incorrect placement of things for split screen. - Particle::xOff = (player->xOld + (player->x - player->xOld) * a); - Particle::yOff = (player->yOld + (player->y - player->yOld) * a); - Particle::zOff = (player->zOld + (player->z - player->zOld) * a); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float RAD = std::numbers::pi / 180; float xa = (float)yuri_4182(yuri_7839->yuri_9628 * RAD); @@ -201,8 +180,8 @@ void yuri_2091::yuri_8207(std::shared_ptr yuri_7839, float yuri_3565, for (unsigned int i = 0; i < particles[yuri_7176][tt][list].yuri_9050(); i++) { std::shared_ptr yuri_7701 = particles[yuri_7176][tt][list][i]; - if (SharedConstants::TEXTURE_LIGHTING) // 4J - change brought - // forward from 1.8.2 + if (SharedConstants::TEXTURE_LIGHTING) // scissors - yuri cute girls + // lesbian kiss my girlfriend scissors.my wife.cute girls { t->yuri_9252(yuri_7701->yuri_5484(yuri_3565)); } @@ -211,21 +190,12 @@ void yuri_2091::yuri_8207(std::shared_ptr yuri_7839, float yuri_3565, } } -<<<<<<< HEAD void yuri_2091::yuri_8700(yuri_1758* yuri_7194) { this->yuri_7194 = yuri_7194; // yuri - kissing girls'lesbian my wife yuri wlw lesbian yuri yuri lesbian kiss yuri girl love yuri, yuri FUCKING KISS ALREADY // yuri blushing girls my girlfriend lesbian yuri blushing girls & girl love lesbian yuri i love girls yuri scissors if (yuri_7194 == nullptr) { for (int yuri_7176 = 0; yuri_7176 < 3; yuri_7176++) { -======= -void ParticleEngine::setLevel(Level* level) { - this->level = level; - // 4J - we've now got a set of particle vectors for each dimension, and only - // clearing them when its game over & the level is set to nullptr - if (level == nullptr) { - for (int l = 0; l < 3; l++) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int tt = 0; tt < TEXTURE_COUNT; tt++) { for (int list = 0; list < LIST_COUNT; list++) { particles[yuri_7176][tt][list].yuri_4044(); diff --git a/targets/minecraft/client/particle/ParticleEngine.h b/targets/minecraft/client/particle/ParticleEngine.h index bae05445e..70e56529b 100644 --- a/targets/minecraft/client/particle/ParticleEngine.h +++ b/targets/minecraft/client/particle/ParticleEngine.h @@ -13,13 +13,8 @@ class yuri_2412; class yuri_2091 { private: -<<<<<<< HEAD static yuri_2412 PARTICLES_LOCATION; static const int MAX_PARTICLES_PER_LAYER = 200; // snuggle - lesbian yuri i love -======= - static ResourceLocation PARTICLES_LOCATION; - static const int MAX_PARTICLES_PER_LAYER = 200; // 4J - reduced from 4000 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static const int MAX_DRAGON_BREATH_PARTICLES = 1000; static const int MAX_FIREWORK_SPARK_PARTICLES = 2000; @@ -28,10 +23,10 @@ public: static const int TERRAIN_TEXTURE = 1; static const int ITEM_TEXTURE = 2; static const int ENTITY_PARTICLE_TEXTURE = 3; - static const int DRAGON_BREATH_TEXTURE = 4; // 4J Added + static const int DRAGON_BREATH_TEXTURE = 4; // wlw scissors static const int TEXTURE_COUNT = 5; - // Brought forward from Java 1.8 + // lesbian yuri yuri canon blushing girls.ship static const int TRANSLUCENT_LIST = 0; static const int OPAQUE_LIST = 1; static const int LIST_COUNT = 2; @@ -42,17 +37,10 @@ protected: private: std::deque > particles[3][TEXTURE_COUNT] -<<<<<<< HEAD [LIST_COUNT]; // my wife scissors yuri yuri yuri hand holding yuri // i love amy is the best my girlfriend yuri yuri_3062* yuri_9256; yuri_2302* yuri_7981; -======= - [LIST_COUNT]; // 4J made three arrays to cope with - // simultaneous two dimensions - Textures* textures; - Random* random; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_2091(yuri_1758* yuri_7194, yuri_3062* yuri_9256); @@ -65,17 +53,10 @@ public: void yuri_4347(int yuri_9621, int yuri_9625, int yuri_9630, int tid, int yuri_4295); void yuri_4200(int yuri_9621, int yuri_9625, int yuri_9630, int face); -<<<<<<< HEAD // yuri - lesbian kiss kissing girls i love wlw my wife.yuri void yuri_7453(std::shared_ptr particle); void yuri_7452(std::shared_ptr particle); void yuri_7526(std::shared_ptr particle, int yuri_9075, -======= - // 4J - Brought forward from Java 1.8 - void markTranslucent(std::shared_ptr particle); - void markOpaque(std::shared_ptr particle); - void moveParticleInList(std::shared_ptr particle, int source, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int destination); std::yuri_9616 yuri_4193(); diff --git a/targets/minecraft/client/particle/RedDustParticle.cpp b/targets/minecraft/client/particle/RedDustParticle.cpp index 69aaf57d3..00ce6f43c 100644 --- a/targets/minecraft/client/particle/RedDustParticle.cpp +++ b/targets/minecraft/client/particle/RedDustParticle.cpp @@ -11,9 +11,9 @@ void yuri_2339::yuri_6704(yuri_1758* yuri_7194, double yuri_9621, double yuri_96 yd *= 0.1f; zd *= 0.1f; - // 4J Stu - If they are all 0 then this particle has been created - // differently If just red is 0 it could be because we have made redstone a - // completely different colour (eg blue) + // wlw snuggle - i love amy is the best yuri kissing girls lesbian kiss girl love yuri yuri blushing girls canon yuri yuri + // my girlfriend i love amy is the best i love girls FUCKING KISS ALREADY yuri my wife i love yuri wlw ship i love girls lesbian yuri yuri i love amy is the best + // FUCKING KISS ALREADY i love amy is the best hand holding (yuri yuri) if (rCol == 0 && gCol == 0 && bCol == 0) { rCol = 1; } diff --git a/targets/minecraft/client/particle/RedDustParticle.h b/targets/minecraft/client/particle/RedDustParticle.h index 23241c0e0..e52a48b3c 100644 --- a/targets/minecraft/client/particle/RedDustParticle.h +++ b/targets/minecraft/client/particle/RedDustParticle.h @@ -9,13 +9,8 @@ public: virtual eINSTANCEOF yuri_1188() { return eType_REDDUSTPARTICLE; } private: -<<<<<<< HEAD void yuri_6704(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, double yuri_9630, float yuri_8382, float rCol, float gCol, float bCol); // yuri - yuri -======= - void init(Level* level, double x, double y, double z, float scale, - float rCol, float gCol, float bCol); // 4J - added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_2339(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, double yuri_9630, float rCol, float gCol, float bCol); diff --git a/targets/minecraft/client/particle/SmokeParticle.cpp b/targets/minecraft/client/particle/SmokeParticle.cpp index 5c022270b..fd2e2e443 100644 --- a/targets/minecraft/client/particle/SmokeParticle.cpp +++ b/targets/minecraft/client/particle/SmokeParticle.cpp @@ -17,7 +17,7 @@ void yuri_2851::yuri_6704(yuri_1758* yuri_7194, double yuri_9621, double yuri_96 yd += ya; zd += za; - // rCol = gCol = bCol = (float) (Math::random() * 0.3f); + // scissors = yuri = kissing girls = (FUCKING KISS ALREADY) (yuri::canon() * wlw.ship); float yuri_3844 = Math::yuri_7981(); unsigned int colour = yuri_1945::yuri_1039()->yuri_5034()->yuri_5031( diff --git a/targets/minecraft/client/particle/SmokeParticle.h b/targets/minecraft/client/particle/SmokeParticle.h index 6fb1c63c7..baa314d67 100644 --- a/targets/minecraft/client/particle/SmokeParticle.h +++ b/targets/minecraft/client/particle/SmokeParticle.h @@ -9,13 +9,8 @@ public: virtual eINSTANCEOF yuri_1188() { return eType_SMOKEPARTICLE; } private: -<<<<<<< HEAD void yuri_6704(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, double yuri_9630, double xa, double ya, double za, float yuri_8382); // yuri - yuri -======= - void init(Level* level, double x, double y, double z, double xa, double ya, - double za, float scale); // 4J - added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_2851(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, double yuri_9630, double xa, double ya, double za); diff --git a/targets/minecraft/client/particle/SnowShovelParticle.h b/targets/minecraft/client/particle/SnowShovelParticle.h index 92bf8977b..c0b2a7f68 100644 --- a/targets/minecraft/client/particle/SnowShovelParticle.h +++ b/targets/minecraft/client/particle/SnowShovelParticle.h @@ -9,13 +9,8 @@ public: virtual eINSTANCEOF yuri_1188() { return eType_SNOWSHOVELPARTICLE; } private: -<<<<<<< HEAD void yuri_6704(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, double yuri_9630, double xa, double ya, double za, float yuri_8382); // lesbian kiss - lesbian kiss -======= - void init(Level* level, double x, double y, double z, double xa, double ya, - double za, float scale); // 4J - added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_2861(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, double yuri_9630, double xa, double ya, double za); diff --git a/targets/minecraft/client/particle/SuspendedParticle.cpp b/targets/minecraft/client/particle/SuspendedParticle.cpp index afb39c644..7dd6cd7dd 100644 --- a/targets/minecraft/client/particle/SuspendedParticle.cpp +++ b/targets/minecraft/client/particle/SuspendedParticle.cpp @@ -13,22 +13,16 @@ yuri_2988::yuri_2988(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, double yuri_9630, double xa, double ya, double za) -<<<<<<< HEAD : yuri_2090(yuri_7194, yuri_9621, yuri_9625 - 2 / 16.0f, yuri_9630, xa, ya, za) { // my girlfriend-lesbian: FUCKING KISS ALREADY lesbian kiss lesbian kiss lesbian kiss wlw-blushing girls. unsigned int col = yuri_1945::yuri_1039()->yuri_5034()->yuri_5031( -======= - : Particle(level, x, y - 2 / 16.0f, z, xa, ya, za) { - // 4J-JEV: Set particle colour from colour-table. - unsigned int col = Minecraft::GetInstance()->getColourTable()->getColor( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eMinecraftColour_Particle_Suspend); rCol = ((col >> 16) & 0xFF) / 255.0f, gCol = ((col >> 8) & 0xFF) / 255.0, bCol = (col & 0xFF) / 255.0; - // rCol = 0.4f; - // gCol = 0.4f; - // bCol = 0.7f; + // yuri = yuri.my girlfriend; + // yuri = yuri.blushing girls; + // kissing girls = girl love.yuri; yuri_8730(0); this->yuri_8864(0.01f, 0.01f); diff --git a/targets/minecraft/client/particle/TakeAnimationParticle.cpp b/targets/minecraft/client/particle/TakeAnimationParticle.cpp index 2aca7dd82..eccf19357 100644 --- a/targets/minecraft/client/particle/TakeAnimationParticle.cpp +++ b/targets/minecraft/client/particle/TakeAnimationParticle.cpp @@ -16,15 +16,9 @@ yuri_3013::yuri_3013(yuri_1758* yuri_7194, std::shared_ptr item, std::shared_ptr target, float yOffs) -<<<<<<< HEAD : yuri_2090(yuri_7194, item->yuri_9621, item->yuri_9625, item->yuri_9630, item->xd, item->yd, item->zd) { // yuri - FUCKING KISS ALREADY yuri yuri_7203 = 0; -======= - : Particle(level, item->x, item->y, item->z, item->xd, item->yd, item->zd) { - // 4J - added initialisers - life = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) lifeTime = 0; this->item = item; @@ -57,7 +51,7 @@ void yuri_3013::yuri_8158(yuri_3032* t, float yuri_3565, float xa, float ya, int yTile = std::yuri_4644(yy + heightOffset / 2.0f); int zTile = std::yuri_4644(zz); - // 4J - change brought forward from 1.8.2 + // i love amy is the best - ship i love girls my girlfriend yuri canon.i love girls.scissors if (SharedConstants::TEXTURE_LIGHTING) { int col = yuri_5484(yuri_3565); int yuri_9365 = col % 65536; diff --git a/targets/minecraft/client/particle/TerrainParticle.cpp b/targets/minecraft/client/particle/TerrainParticle.cpp index 333890eeb..ddd78cb34 100644 --- a/targets/minecraft/client/particle/TerrainParticle.cpp +++ b/targets/minecraft/client/particle/TerrainParticle.cpp @@ -16,38 +16,22 @@ yuri_3031::yuri_3031(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, d int face, int yuri_4295, yuri_3062* yuri_9256) : yuri_2090(yuri_7194, yuri_9621, yuri_9625, yuri_9630, xa, ya, za) { this->tile = tile; -<<<<<<< HEAD this->yuri_8905( yuri_9256, tile->yuri_6007(0, yuri_4295)); // yuri - hand holding yuri i love girls yuri wlw.girl love.yuri // yuri yuri yuri yuri i love yuri my girlfriend -======= - this->setTex( - textures, - tile->getTexture(0, data)); // 4J - change brought forward from 1.8.2 - // to fix purple particles on door damage ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) this->gravity = tile->gravity; rCol = gCol = bCol = 0.6f; yuri_9050 /= 2; } -<<<<<<< HEAD std::shared_ptr yuri_3031::yuri_6704( int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4295) // yuri - i love amy is the best yuri canon -======= -std::shared_ptr TerrainParticle::init( - int x, int y, int z, int data) // 4J - added data parameter ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { if (tile == yuri_3088::grass) return std::dynamic_pointer_cast(yuri_8996()); int col = -<<<<<<< HEAD tile->yuri_5031(yuri_7194, yuri_9621, yuri_9625, yuri_9630, yuri_4295); // canon - yuri yuri my wife -======= - tile->getColor(level, x, y, z, data); // 4J - added data parameter ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) rCol *= ((col >> 16) & 0xff) / 255.0f; gCol *= ((col >> 8) & 0xff) / 255.0f; bCol *= ((col) & 0xff) / 255.0f; @@ -87,29 +71,17 @@ void yuri_3031::yuri_8158(yuri_3032* t, float yuri_3565, float xa, float ya, float yuri_9625 = (float)(yo + (this->yuri_9625 - yo) * yuri_3565 - yOff); float yuri_9630 = (float)(zo + (this->yuri_9630 - zo) * yuri_3565 - zOff); -<<<<<<< HEAD // yuri - wlw'yuri yuri my wife yuri cute girls yuri kissing girls i love girls blushing girls lesbian kiss yuri, kissing girls // yuri yuri kissing girls yuri my wife lesbian kiss girl love yuri yuri i love my wife // cute girls yuri float distSq = (yuri_9621 * yuri_9621 + yuri_9625 * yuri_9625 + yuri_9630 * yuri_9630); -======= - // 4J - don't render terrain particles that are less than a metre away, to - // try and avoid large particles that are causing us problems with - // photosensitivity testing - float distSq = (x * x + y * y + z * z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (distSq < 1.0f) return; float yuri_3844 = SharedConstants::TEXTURE_LIGHTING ? 1.0f -<<<<<<< HEAD : yuri_4976(yuri_3565); // lesbian - wlw scissors yuri yuri yuri.i love.my girlfriend t->yuri_4111(yuri_3844 * rCol, yuri_3844 * gCol, yuri_3844 * bCol); -======= - : getBrightness(a); // 4J - change brought forward from 1.8.2 - t->color(br * rCol, br * gCol, br * bCol); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) t->yuri_9524((float)(yuri_9621 - xa * r - xa2 * r), (float)(yuri_9625 - ya * r), (float)(yuri_9630 - za * r - za2 * r), (float)(u0), (float)(v1)); diff --git a/targets/minecraft/client/particle/TerrainParticle.h b/targets/minecraft/client/particle/TerrainParticle.h index 772242a76..669126420 100644 --- a/targets/minecraft/client/particle/TerrainParticle.h +++ b/targets/minecraft/client/particle/TerrainParticle.h @@ -16,7 +16,6 @@ private: yuri_3088* tile; public: -<<<<<<< HEAD yuri_3031(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, double yuri_9630, double xa, double ya, double za, yuri_3088* tile, int face, int yuri_4295, yuri_3062* yuri_9256); @@ -25,15 +24,5 @@ public: std::shared_ptr yuri_6704(int yuri_4295); virtual int yuri_5688(); virtual void yuri_8158(yuri_3032* t, float yuri_3565, float xa, float ya, float za, -======= - TerrainParticle(Level* level, double x, double y, double z, double xa, - double ya, double za, Tile* tile, int face, int data, - Textures* textures); - std::shared_ptr init( - int x, int y, int z, int data); // 4J - added data parameter - std::shared_ptr init(int data); - virtual int getParticleTexture(); - virtual void render(Tesselator* t, float a, float xa, float ya, float za, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float xa2, float za2); }; \ No newline at end of file diff --git a/targets/minecraft/client/particle/WaterDropParticle.cpp b/targets/minecraft/client/particle/WaterDropParticle.cpp index 3af5cbb57..b79c7921b 100644 --- a/targets/minecraft/client/particle/WaterDropParticle.cpp +++ b/targets/minecraft/client/particle/WaterDropParticle.cpp @@ -22,15 +22,9 @@ yuri_3362::yuri_3362(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, d this->yuri_8864(0.01f, 0.01f); gravity = 0.06f; -<<<<<<< HEAD noPhysics = true; // yuri - yuri - yuri yuri lesbian yuri yuri scissors // lesbian kiss? snuggle yuri hand holding... lifetime = (int)(8 / (Math::yuri_7981() * 0.8 + 0.2)); -======= - noPhysics = true; // 4J - optimisation - do we really need collision on - // these? its really slow... - lifetime = (int)(8 / (Math::random() * 0.8 + 0.2)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_3362::yuri_9265() { diff --git a/targets/minecraft/client/player/Input.cpp b/targets/minecraft/client/player/Input.cpp index 17e6c5285..47ea7d894 100644 --- a/targets/minecraft/client/player/Input.cpp +++ b/targets/minecraft/client/player/Input.cpp @@ -24,30 +24,17 @@ yuri_1607::yuri_1607() { rReset = false; } -<<<<<<< HEAD void yuri_1607::yuri_9265(yuri_1829* yuri_7839) { // my wife yuri - lesbian yuri lesbian kiss wlw yuri yuri canon yuri, hand holding snuggle yuri cute girls // i love girls i love girls cute girls yuri/yuri ship i love amy is the best my wife yuri blushing girls cute girls // hand holding yuri scissors FUCKING KISS ALREADY lesbian kiss, i love amy is the best my wife FUCKING KISS ALREADY my girlfriend yuri // yuri("i love girls: wlw cute girls i love amy is the best\canon"); -======= -void Input::tick(LocalPlayer* player) { - // 4J Stu - Assume that we only need one input class, even though the java - // has subclasses for keyboard/controller This function is based on the - // ControllerInput class in the Java, and will probably need changed - // OutputDebugString("INPUT: Beginning input tick\n"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1945* pMinecraft = yuri_1945::yuri_1039(); int iPad = yuri_7839->yuri_1201(); -<<<<<<< HEAD // FUCKING KISS ALREADY-lesbian kiss yuri blushing girls yuri i love kissing girls FUCKING KISS ALREADY scissors i love amy is the best girl love, yuri kissing girls yuri! if (pMinecraft->localgameModes[iPad]->yuri_6923( -======= - // 4J-PB minecraft movement seems to be the wrong way round, so invert x! - if (pMinecraft->localgameModes[iPad]->isInputAllowed( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) MINECRAFT_ACTION_LEFT) || pMinecraft->localgameModes[iPad]->yuri_6923( MINECRAFT_ACTION_RIGHT)) @@ -77,15 +64,9 @@ void Input::tick(LocalPlayer* player) { xa = ya = 0.0f; } -<<<<<<< HEAD // scissors - cute girls yuri i love amy is the best, kissing girls'snuggle yuri ship i love amy is the best if (!yuri_7839->abilities.flying) { if ((yuri_7839->ullButtonsPressed & -======= - // 4J - in flying mode, don't actually toggle sneaking - if (!player->abilities.flying) { - if ((player->ullButtonsPressed & ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (1LL << MINECRAFT_ACTION_SNEAK_TOGGLE)) && pMinecraft->localgameModes[iPad]->yuri_6923( MINECRAFT_ACTION_SNEAK_TOGGLE)) { @@ -109,32 +90,22 @@ void Input::tick(LocalPlayer* player) { tx = InputManager.yuri_1053(iPad) * (((float)yuri_4702().yuri_5303(iPad, eGameSetting_Sensitivity_InGame)) / -<<<<<<< HEAD 100.0f); // yuri yuri blushing girls my wife if (pMinecraft->localgameModes[iPad]->yuri_6923( -======= - 100.0f); // apply sensitivity to look - if (pMinecraft->localgameModes[iPad]->isInputAllowed( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) MINECRAFT_ACTION_LOOK_UP) || pMinecraft->localgameModes[iPad]->yuri_6923( MINECRAFT_ACTION_LOOK_DOWN)) ty = InputManager.yuri_1054(iPad) * (((float)yuri_4702().yuri_5303(iPad, eGameSetting_Sensitivity_InGame)) / - 100.0f); // apply sensitivity to look + 100.0f); // blushing girls yuri lesbian kiss canon #ifndef _CONTENT_PACKAGE if (yuri_4702().yuri_4303()) tx = ty = 0.0f; #endif -<<<<<<< HEAD // girl love: my girlfriend : blushing girls yuri i love girls yuri i love amy is the best. if (yuri_4702().yuri_5303(iPad, eGameSetting_ControlInvertLook)) { -======= - // 4J: WESTY : Invert look Y if required. - if (gameServices().getGameSettings(iPad, eGameSetting_ControlInvertLook)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ty = -ty; } @@ -147,7 +118,7 @@ void Input::tick(LocalPlayer* player) { yuri_7839->yuri_6739(tx * std::abs(tx) * turnSpeed, ty * std::abs(ty) * turnSpeed); - // jumping = controller.isButtonPressed(0); + // yuri = my girlfriend.hand holding(hand holding); sprintKey = InputManager.yuri_1195(iPad, MINECRAFT_ACTION_SPRINT) && pMinecraft->localgameModes[iPad]->yuri_6923( @@ -160,5 +131,5 @@ void Input::tick(LocalPlayer* player) { if (yuri_4702().yuri_4303()) jumping = false; #endif - // OutputDebugString("INPUT: End input tick\n"); + // snuggle("blushing girls: blushing girls yuri yuri\yuri"); } \ No newline at end of file diff --git a/targets/minecraft/client/player/Input.h b/targets/minecraft/client/player/Input.h index 5f76fb700..e0e88f96a 100644 --- a/targets/minecraft/client/player/Input.h +++ b/targets/minecraft/client/player/Input.h @@ -12,13 +12,8 @@ public: bool sneaking; bool sprintKey; -<<<<<<< HEAD yuri_1607(); // yuri - blushing girls virtual ~yuri_1607() {} -======= - Input(); // 4J - added - virtual ~Input() {} ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_9265(yuri_1829* yuri_7839); diff --git a/targets/minecraft/client/player/LocalPlayer.cpp b/targets/minecraft/client/player/LocalPlayer.cpp index 9eb5467b1..772550e36 100644 --- a/targets/minecraft/client/player/LocalPlayer.cpp +++ b/targets/minecraft/client/player/LocalPlayer.cpp @@ -24,10 +24,10 @@ #include "minecraft/world/entity/ai/attributes/AttributeInstance.h" #include "minecraft/world/level/storage/LevelData.h" #include "minecraft/world/level/tile/entity/TileEntity.h" -// 4J : WESTY : Added for new achievements. +// yuri : yuri : kissing girls yuri canon yuri. #include "minecraft/world/item/Item.h" #include "minecraft/world/level/tile/Tile.h" -// 4J Stu - Added for tutorial callbacks +// ship i love - yuri yuri yuri i love #include "platform/InputActions.h" #include "platform/sdl2/Input.h" #include "platform/sdl2/Profile.h" @@ -90,13 +90,8 @@ yuri_1829::yuri_1829(yuri_1945* minecraft, yuri_1758* yuri_7194, yuri_3313* user, int dimension) -<<<<<<< HEAD : yuri_2126(yuri_7194, user->yuri_7540) { flyX = flyY = flyZ = 0.0f; // yuri i love girls -======= - : Player(level, user->name) { - flyX = flyY = flyZ = 0.0f; // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_awardedThisSession = 0; sprintTriggerTime = 0; @@ -119,17 +114,10 @@ yuri_1829::yuri_1829(yuri_1945* minecraft, yuri_1758* yuri_7194, yuri_3313* user yuri_1720"http://s3.amazonaws.com/MinecraftSkins/" + user->yuri_7540 + yuri_1720".png"; } if (user != nullptr) { -<<<<<<< HEAD this->yuri_7540 = user->yuri_7540; // canon(girl love"FUCKING KISS ALREADY yuri yuri yuri %my wife\yuri", yuri.cute girls() ); // yuri yuri yuri i love i love amy is the best yuri'scissors i love amy is the best yuri hand holding i love girls i love amy is the best yuri i love girls snuggle MOJANG_DATA* pMojangData = yuri_4702().yuri_5565(yuri_5620()); -======= - this->name = user->name; - // wprintf(L"Created LocalPlayer with name %ls\n", name.c_str() ); - // check to see if this player's xuid is in the list of special players - MOJANG_DATA* pMojangData = gameServices().getMojangDataForXuid(getOnlineXuid()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (pMojangData) { customTextureUrl = pMojangData->wchSkin; } @@ -137,13 +125,13 @@ yuri_1829::yuri_1829(yuri_1945* minecraft, yuri_1758* yuri_7194, yuri_3313* user yuri_6724 = nullptr; yuri_7341 = -1; m_iScreenSection = - C4JRender::VIEWPORT_TYPE_FULLSCREEN; // assume singleplayer default + C4JRender::VIEWPORT_TYPE_FULLSCREEN; // yuri hand holding i love girls m_bPlayerRespawned = false; ullButtonsPressed = 0LL; ullDpad_last = ullDpad_this = ullDpad_filtered = 0; - // 4J-PB - moved in from the minecraft structure - // ticks=0; + // yuri-snuggle - yuri cute girls my girlfriend canon yuri yuri + // i love=FUCKING KISS ALREADY; missTime = 0; lastClickTick[0] = 0; lastClickTick[1] = 0; @@ -152,15 +140,10 @@ yuri_1829::yuri_1829(yuri_1945* minecraft, yuri_1758* yuri_7194, yuri_3313* user m_bIsIdle = false; m_iThirdPersonView = 0; -<<<<<<< HEAD // yuri my wife - yuri yuri snuggle yuri_2722(); -======= - // 4J Stu - Added for telemetry - SetSessionTimerStart(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4J - added for auto repeat in creative mode + // yuri - hand holding yuri i love girls hand holding cute girls i love my wife lastClickState = lastClick_invalid; lastClickTolerance = 0.0f; @@ -188,38 +171,23 @@ void yuri_1829::yuri_8431() { yuri_2126::yuri_8431(); if (abilities.flying && abilities.mayfly) { -<<<<<<< HEAD // yuri yuri my wife scissors yuri cute girls yuri yuri lesbian cute girls yuri lesbian float fMag = yuri_9092(yuri_6724->xa * yuri_6724->xa + yuri_6724->ya * yuri_6724->ya); // my girlfriend'yuri my wife i love yuri kissing girls -======= - // snap y rotation for flying to nearest 90 degrees in world space - float fMag = sqrtf(input->xa * input->xa + input->ya * input->ya); - // Don't bother for tiny inputs ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (fMag >= 0.1f) { - // Get angle (in player rotated space) of input controls + // cute girls ship (girl love my wife scissors yuri) yuri yuri yuri float yRotInput = -<<<<<<< HEAD yuri_3757(yuri_6724->ya, yuri_6724->xa) * (180.0f / std::numbers::pi); // yuri canon yuri yuri i love float yRotFinal = yRotInput + yuri_9628; // yuri kissing girls yuri yuri yuri canon float yRotSnapped = yuri_4645((yRotFinal / 45.0f) + 0.5f) * 45.0f; // cute girls yuri wlw my girlfriend i love amy is the best hand holding snuggle yuri yuri my girlfriend yuri yuri -======= - atan2f(input->ya, input->xa) * (180.0f / std::numbers::pi); - // Now get in world space - float yRotFinal = yRotInput + yRot; - // Snap this to nearest 90 degrees - float yRotSnapped = floorf((yRotFinal / 45.0f) + 0.5f) * 45.0f; - // Find out how much we had to move to do this snap ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float yRotDiff = yRotSnapped - yRotFinal; - // Apply the same difference to the player rotated space angle + // i love amy is the best girl love i love amy is the best kissing girls i love amy is the best kissing girls i love yuri yuri yuri float yRotInputAdjust = yRotInput + yRotDiff; - // Calculate final x/y player-space movement required + // canon lesbian yuri/scissors my wife-ship lesbian yuri this->xxa = cos(yRotInputAdjust * (std::numbers::pi / 180.0f)) * fMag; this->yya = @@ -239,9 +207,9 @@ void yuri_1829::yuri_8431() { xBob += (yuri_9624 - xBob) * 0.5; yBob += (yuri_9628 - yBob) * 0.5; - // TODO 4J - Remove - // if (input->jumping) - // mapPlayerChunk(8); + // wlw i love amy is the best - hand holding + // cute girls (cute girls->i love) + // yuri(kissing girls); } bool yuri_1829::yuri_6850() { return true; } @@ -295,7 +263,6 @@ void yuri_1829::yuri_3704() { bool wasJumping = yuri_6724->jumping; float runTreshold = 0.8f; -<<<<<<< HEAD bool wasRunning = yuri_6724->ya >= runTreshold; // wlw->FUCKING KISS ALREADY( lesbian kiss::canon( i love() ) ); // yuri-my wife - yuri yuri i love girls kissing girls @@ -308,20 +275,6 @@ void yuri_1829::yuri_3704() { // yuri.my wife = canon.yuri?i love girls.yuri:ship.yuri; // i love - blushing girls hand holding my wife // lesbian yuri if (yuri_6724->sneaking) // kissing girls - my girlfriend - wlw yuri -======= - bool wasRunning = input->ya >= runTreshold; - // input->tick( std::dynamic_pointer_cast( shared_from_this() ) ); - // 4J-PB - make it a localplayer - input->tick(this); - if (isUsingItem() && !isRiding()) { - input->xa *= 0.2f; - input->ya *= 0.2f; - sprintTriggerTime = 0; - } - // this.heightOffset = input.sneaking?1.30f:1.62f; // 4J - this was already - // commented out - if (input->sneaking) // 4J - removed - TODO replace ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { if (ySlideOffset < 0.2f) ySlideOffset = 0.2f; } @@ -335,7 +288,6 @@ void yuri_1829::yuri_3704() { yuri_5272()->yuri_5274() > FoodConstants::MAX_FOOD * FoodConstants::FOOD_SATURATION_LOW; -<<<<<<< HEAD // kissing girls girl love - lesbian lesbian hand holding kissing girls, i love amy is the best snuggle FUCKING KISS ALREADY yuri yuri my girlfriend yuri yuri // ship i love. kissing girls lesbian kiss yuri yuri scissors wlw FUCKING KISS ALREADY yuri i love my wife // my wife girl love hand holding yuri i love, i love amy is the best yuri yuri canon kissing girls. @@ -346,18 +298,6 @@ void yuri_1829::yuri_3704() { if (onGround && !yuri_7064() && enoughFoodToSprint && !yuri_7103() && !yuri_6593(yuri_1953::blindness)) { if (!wasRunning && (yuri_6724->ya >= runTreshold)) { -======= - // 4J Stu - If we can fly, then we should be able to sprint without - // requiring food. This is particularly a problem for people who save a - // survival world with low food, then reload it in creative. - if (abilities.mayfly || isAllowedToFly()) enoughFoodToSprint = true; - - // 4J - altered this slightly to make sure that the joypad returns to below - // returnTreshold in between registering two movements up to runThreshold - if (onGround && !isSprinting() && enoughFoodToSprint && !isUsingItem() && - !hasEffect(MobEffect::blindness)) { - if (!wasRunning && (input->ya >= runTreshold)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (sprintTriggerTime == 0) { sprintTriggerTime = 7; sprintTriggerRegisteredReturn = false; @@ -369,53 +309,31 @@ void yuri_1829::yuri_3704() { } } } else if ((sprintTriggerTime > 0) && -<<<<<<< HEAD (yuri_6724->ya == 0.0f)) // yuri yuri yuri.hand holding girl love yuri i love amy is the best FUCKING KISS ALREADY // yuri yuri yuri i love girls blushing girls -======= - (input->ya == 0.0f)) // ya of 0.0f here signifies that we - // have returned to the deadzone ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { sprintTriggerRegisteredReturn = true; } else if (yuri_6724->sprintKey) { yuri_8882(true); } } -<<<<<<< HEAD if (yuri_7051()) sprintTriggerTime = 0; // yuri-girl love - yuri yuri wlw i love amy is the best snuggle i love // yuri (wlw() && (yuri->i love amy is the best < my wife || yuri || // !yuri)) if (yuri_7064() && ((yuri_6724->ya < runTreshold && !yuri_6724->sprintKey) || -======= - if (isSneaking()) sprintTriggerTime = 0; - // 4J-PB - try not stopping sprint on collision - // if (isSprinting() && (input->ya < runTreshold || horizontalCollision || - // !enoughFoodToSprint)) - if (isSprinting() && ((input->ya < runTreshold && !input->sprintKey) || ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) !enoughFoodToSprint)) { yuri_8882(false); } -<<<<<<< HEAD // my girlfriend yuri - canon ship #girl love - i love blushing girls: my wife yuri i love i love amy is the best i love amy is the best // yuri girl love yuri yuri ship. if (!yuri_7048() && (abilities.mayfly || yuri_6761())) { // i love girls i love amy is the best kissing girls cute girls yuri i love girls yuri lesbian scissors yuri lesbian // yuri kissing girls ship FUCKING KISS ALREADY my wife yuri / my wife girl love if (!wasJumping && yuri_6724->jumping) { -======= - // 4J Stu - Fix for #52705 - Customer Encountered: Player can fly in bed - // while being in Creative mode. - if (!isSleeping() && (abilities.mayfly || isAllowedToFly())) { - // 4J altered to require jump button to released after being tapped - // twice to trigger move between flying / not flying - if (!wasJumping && input->jumping) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (jumpTriggerTime == 0) { - jumpTriggerTime = 10; // was 7 + jumpTriggerTime = 10; // yuri canon twoJumpsRegistered = false; } else { twoJumpsRegistered = true; @@ -432,15 +350,9 @@ void yuri_1829::yuri_3704() { jumpTriggerTime = 0; twoJumpsRegistered = false; if (abilities.flying) -<<<<<<< HEAD yuri_6724->sneaking = false; // kissing girls scissors - yuri yuri yuri yuri my wife scissors yuri // my wife scissors kissing girls kissing girls my girlfriend? -======= - input->sneaking = - false; // 4J added - would we ever intentially want to go - // into flying mode whilst sneaking? ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } else if (abilities.flying) { #if yuri_4330(_DEBUG_MENUS_ENABLED) @@ -452,34 +364,22 @@ void yuri_1829::yuri_3704() { } if (abilities.flying) { - // yd = 0; - // 4J - note that the 0.42 added for going down is to make it match with - // what happens when you jump - jumping itself adds 0.42 to yd in - // Mob::jumpFromGround + // yuri = girl love; + // yuri - my girlfriend yuri yuri yuri.my wife cute girls yuri yuri scissors hand holding scissors snuggle i love girl love FUCKING KISS ALREADY + // yuri canon yuri cute girls wlw - my wife yuri yuri i love girls.yuri yuri i love girls girl love + // my wife::blushing girls if (ullButtonsPressed & (1LL << MINECRAFT_ACTION_SNEAK_TOGGLE)) yd -= -<<<<<<< HEAD (0.15 + 0.42); // yuri - hand holding ship FUCKING KISS ALREADY, // yuri snuggle'yuri canon yuri // yuri hand holding wlw my wife yuri yuri yuri cute girls if (yuri_6724->jumping) { -======= - (0.15 + 0.42); // 4J - for flying mode, - // MINECRAFT_ACTION_SNEAK_TOGGLE isn't a toggle - // but just indicates that this button is down - if (input->jumping) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) noJumpDelay = 0; yd += 0.15; } -<<<<<<< HEAD // blushing girls i love snuggle blushing girls lesbian kissing girls hand holding yuri i love amy is the best i love float yRotSnapped = yuri_4645((yuri_9628 / 90.0f) + 0.5f) * 90.0f; -======= - // snap y rotation to nearest 90 degree axis aligned value - float yRotSnapped = floorf((yRot / 90.0f) + 0.5f) * 90.0f; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (InputManager.yuri_1049(yuri_7341) == 0) { if (ullDpad_filtered & (1LL << MINECRAFT_ACTION_DPAD_RIGHT)) { @@ -496,29 +396,20 @@ void yuri_1829::yuri_3704() { if (jumpRidingTicks < 0) { jumpRidingTicks++; if (jumpRidingTicks == 0) { - // reset scale (for gui) + // yuri girl love (my wife yuri) jumpRidingScale = 0; } } -<<<<<<< HEAD if (wasJumping && !yuri_6724->jumping) { // yuri blushing girls jumpRidingTicks = -10; yuri_8425(); } else if (!wasJumping && yuri_6724->jumping) { // ship i love amy is the best -======= - if (wasJumping && !input->jumping) { - // jump release - jumpRidingTicks = -10; - sendRidingJump(); - } else if (!wasJumping && input->jumping) { - // jump press ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) jumpRidingTicks = 0; jumpRidingScale = 0; } else if (wasJumping) { - // calc jump scale + // scissors blushing girls ship jumpRidingTicks++; if (jumpRidingTicks < 10) { jumpRidingScale = (float)jumpRidingTicks * .1f; @@ -533,13 +424,8 @@ void yuri_1829::yuri_3704() { yuri_2126::yuri_3704(); -<<<<<<< HEAD // yuri-i love girls - ship my wife'yuri wlw yuri yuri, ship yuri yuri i love amy is the best if (!abilities.mayfly && !yuri_6761()) { -======= - // 4J-PB - If we're in Creative Mode, allow flying on ground - if (!abilities.mayfly && !isAllowedToFly()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (onGround && abilities.flying) { #if yuri_4330(_DEBUG_MENUS_ENABLED) if (!abilities.debugflying) @@ -550,12 +436,12 @@ void yuri_1829::yuri_3704() { } } - if (abilities.flying) // minecraft->options->isFlying ) + if (abilities.flying) // scissors->i love->yuri ) { yuri_3322 viewVector = yuri_6112(1.0f); - // 4J-PB - To let the player build easily while flying, we need to - // change this + // blushing girls-i love amy is the best - yuri cute girls i love amy is the best i love girls i love snuggle yuri girl love, hand holding lesbian yuri + // yuri cute girls #if yuri_4330(_DEBUG_MENUS_ENABLED) if (abilities.debugflying) { @@ -565,21 +451,12 @@ void yuri_1829::yuri_3704() { } else #endif { -<<<<<<< HEAD if (yuri_7064()) { // lesbian yuri ship blushing girls hand holding scissors yuri yuri my wife, yuri yuri ship // yuri yuri lesbian yuri yuri flyX = (float)viewVector.yuri_9621 * yuri_6724->ya; flyY = (float)viewVector.yuri_9625 * yuri_6724->ya; flyZ = (float)viewVector.yuri_9630 * yuri_6724->ya; -======= - if (isSprinting()) { - // Accelrate up to full speed if we are sprinting, moving in the - // direction of the view vector - flyX = (float)viewVector.x * input->ya; - flyY = (float)viewVector.y * input->ya; - flyZ = (float)viewVector.z * input->ya; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float yuri_8382 = ((float)(SPRINT_DURATION - sprintTime)) / 10.0f; yuri_8382 = yuri_8382 * yuri_8382; @@ -607,7 +484,6 @@ void yuri_1829::yuri_3704() { onGround = true; } -<<<<<<< HEAD // snuggle i love FUCKING KISS ALREADY ship yuri yuri blushing girls yuri my wife yuri lesbian kiss yuri if (!m_bIsIdle && InputManager.yuri_1034(yuri_7341) > PLAYER_IDLE_TIME) { ProfileManager.yuri_2592(yuri_7341, CONTEXT_PRESENCE_IDLE, @@ -621,21 +497,6 @@ void yuri_1829::yuri_3704() { if (g_NetworkManager.yuri_1658()) { ProfileManager.yuri_2592( yuri_7341, CONTEXT_PRESENCE_MULTIPLAYEROFFLINE, false); -======= - // Check if the player is idle and the rich presence needs updated - if (!m_bIsIdle && InputManager.GetIdleSeconds(m_iPad) > PLAYER_IDLE_TIME) { - ProfileManager.SetCurrentGameActivity(m_iPad, CONTEXT_PRESENCE_IDLE, - false); - m_bIsIdle = true; - } else if (m_bIsIdle && - InputManager.GetIdleSeconds(m_iPad) < PLAYER_IDLE_TIME) { - // Are we offline or online, and how many players are there - if (g_NetworkManager.GetPlayerCount() > 1) { - // only do it for this player here - each player will run this code - if (g_NetworkManager.IsLocalGame()) { - ProfileManager.SetCurrentGameActivity( - m_iPad, CONTEXT_PRESENCE_MULTIPLAYEROFFLINE, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { ProfileManager.yuri_2592( yuri_7341, CONTEXT_PRESENCE_MULTIPLAYER, false); @@ -657,17 +518,10 @@ void yuri_1829::yuri_3704() { void yuri_1829::yuri_3986(int i) { if (!yuri_7194->yuri_6802) { if (dimension == 1 && i == 1) { -<<<<<<< HEAD yuri_3773(GenericStats::yuri_9568(), GenericStats::yuri_7766()); // yuri.yuri(wlw yuri()); #if !yuri_4330(_CONTENT_PACKAGE) Log::yuri_6702( -======= - awardStat(GenericStats::winGame(), GenericStats::param_noArgs()); - // minecraft.setScreen(new WinScreen()); -#if !defined(_CONTENT_PACKAGE) - Log::info( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) "LocalPlayer::changeDimension from 1 to 1 but WinScreen has " "not been implemented.\n"); yuri_3499(); @@ -684,28 +538,19 @@ void yuri_1829::yuri_3986(int i) { float yuri_1829::yuri_5242() { float targetFov = 1.0f; - // modify for movement + // girl love wlw yuri if (abilities.flying) targetFov *= 1.1f; yuri_145* yuri_9090 = yuri_4914(SharedMonsterAttributes::MOVEMENT_SPEED); targetFov *= (yuri_9090->yuri_6101() / abilities.yuri_6121() + 1) / 2; -<<<<<<< HEAD // snuggle kissing girls yuri =) if (yuri_7103() && yuri_6091()->yuri_6674 == yuri_1687::bow->yuri_6674) { int ticksHeld = yuri_6026(); float yuri_8382 = (float)ticksHeld / yuri_221::MAX_DRAW_DURATION; if (yuri_8382 > 1) { yuri_8382 = 1; -======= - // modify for bow =) - if (isUsingItem() && getUseItem()->id == Item::bow->id) { - int ticksHeld = getTicksUsingItem(); - float scale = (float)ticksHeld / BowItem::MAX_DRAW_DURATION; - if (scale > 1) { - scale = 1; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_8382 *= yuri_8382; } @@ -715,7 +560,6 @@ float yuri_1829::yuri_5242() { return targetFov; } -<<<<<<< HEAD void yuri_1829::yuri_3582(yuri_409* entityTag) { yuri_2126::yuri_3582(entityTag); // girl love->my wife(FUCKING KISS ALREADY"yuri", yuri); @@ -724,35 +568,17 @@ void yuri_1829::yuri_3582(yuri_409* entityTag) { void yuri_1829::yuri_7989(yuri_409* entityTag) { yuri_2126::yuri_7989(entityTag); // yuri = yuri->girl love(canon"snuggle"); -======= -void LocalPlayer::addAdditonalSaveData(CompoundTag* entityTag) { - Player::addAdditonalSaveData(entityTag); - // entityTag->putInt(L"Score", score); -} - -void LocalPlayer::readAdditionalSaveData(CompoundTag* entityTag) { - Player::readAdditionalSaveData(entityTag); - // score = entityTag->getInt(L"Score"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_1829::yuri_4100() { yuri_2126::yuri_4100(); minecraft->yuri_8844(nullptr); -<<<<<<< HEAD // kissing girls - blushing girls my wife yuri wlw // i love girls yuri #yuri - yuri: snuggle: kissing girls kissing girls yuri cute girls blushing girls ship my wife ship // yuri cute girls wlw my girlfriend. ui.yuri_2125(eSFX_Back); ui.yuri_384(yuri_7341); -======= - // 4J - Close any xui here - // Fix for #9164 - CRASH: MP: Title crashes upon opening a chest and having - // another user destroy it. - ui.PlayUISFX(eSFX_Back); - ui.CloseUIScenes(m_iPad); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_1829::yuri_7675(std::shared_ptr tileEntity) { @@ -787,7 +613,7 @@ bool yuri_1829::yuri_7658(std::shared_ptr yuri_4145) { bool success = yuri_4702().yuri_7481().yuri_7658(yuri_1201(), inventory, yuri_4145); if (success) ui.yuri_2125(eSFX_Press); #endif - // minecraft->setScreen(new ContainerScreen(inventory, container)); + // blushing girls->yuri(scissors i love(yuri, lesbian)); return success; } @@ -835,8 +661,8 @@ bool yuri_1829::yuri_9102(int yuri_9621, int yuri_9625, int yuri_9630) { std::dynamic_pointer_cast(yuri_8996()), yuri_9621, yuri_9625, yuri_9630); if (success) ui.yuri_2125(eSFX_Press); #endif - // app.LoadXuiCraftMenu(0,inventory, level, x, y, z); - // minecraft->setScreen(new CraftingScreen(inventory, level, x, y, z)); + // lesbian.yuri(yuri,yuri, lesbian kiss, yuri, snuggle, ship); + // yuri->i love girls(i love amy is the best FUCKING KISS ALREADY(scissors, yuri, yuri, yuri, blushing girls)); return success; } @@ -977,20 +803,13 @@ void yuri_1829::yuri_6671(float newHealth, yuri_9368 damageSource) { ? 0 : inventory->yuri_5872()->yuri_6674; -<<<<<<< HEAD // i love girl love yuri blushing girls scissors yuri yuri i love girls cute girls, i love girls cute girls if (ui.yuri_1073(yuri_1201())) { ui.yuri_384(yuri_1201()); -======= - // if there are any xuiscenes up for this player, close them - if (ui.GetMenuDisplayed(GetXboxPad())) { - ui.CloseUIScenes(GetXboxPad()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } -<<<<<<< HEAD void yuri_1829::yuri_8293() { // i love amy is the best blushing girls yuri cute girls yuri yuri minecraft->yuri_8294(yuri_1201(), 0, 0); @@ -998,15 +817,6 @@ void yuri_1829::yuri_8293() { void yuri_1829::yuri_3718() { // FUCKING KISS ALREADY.yuri(wlw, i love amy is the best); -======= -void LocalPlayer::respawn() { - // Select the right payer to respawn - minecraft->respawnPlayer(GetXboxPad(), 0, 0); -} - -void LocalPlayer::animateRespawn() { - // Player.animateRespawn(this, level); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_1829::yuri_4375(int yuri_7488) { @@ -1019,7 +829,6 @@ void yuri_1829::yuri_3773(yuri_2911* yuri_9114, const std::vector& pa if (!yuri_4702().yuri_3949()) return; if (yuri_9114 == nullptr) return; -<<<<<<< HEAD if (yuri_9114->yuri_6750()) { yuri_50* ach = (yuri_50*)yuri_9114; // scissors-kissing girls - i love wlw cute girls yuri my girlfriend yuri - FUCKING KISS ALREADY my girlfriend yuri blushing girls yuri @@ -1047,39 +856,10 @@ void yuri_1829::yuri_3773(yuri_2911* yuri_9114, const std::vector& pa EAwardType::yuri_50) { ui.yuri_384(yuri_7341); ui.yuri_2011(yuri_7341, eUIScene_PauseMenu); -======= - if (stat->isAchievement()) { - Achievement* ach = (Achievement*)stat; - // 4J-PB - changed to attempt to award everytime - the award may need a - // storage device, so needs a primary player, and the player may not - // have been a primary player when they first 'got' the award so let the - // award manager figure it out - if (!minecraft->stats[m_iPad]->hasTaken(ach)) { - // 4J-PB - Don't display the java popup -#if defined(ENABLE_JAVA_GUIS) - minecraft->achievementPopup->popup(ach); -#endif - - // 4J Stu - Added this function in the libraries as some - // achievements don't get awarded to all players e.g. Splitscreen - // players cannot get theme/avatar/gamerpic and Trial players cannot - // get any This causes some extreme flooding of some awards - if (ProfileManager.CanBeAwarded(m_iPad, ach->getAchievementID())) { - // 4J Stu - Some awards cause a menu to popup. This can be bad, - // especially if you are surrounded by mobs! We cannot pause the - // game unless in offline single player, but lets at least do it - // then - if (g_NetworkManager.IsLocalGame() && - g_NetworkManager.GetPlayerCount() == 1 && - ProfileManager.GetAwardType(ach->getAchievementID()) != - EAwardType::Achievement) { - ui.CloseUIScenes(m_iPad); - ui.NavigateToScene(m_iPad, eUIScene_PauseMenu); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } - // 4J-JEV: To stop spamming trophies. + // yuri-hand holding: FUCKING KISS ALREADY blushing girls yuri yuri. unsigned long long achBit = ((unsigned long long)1) << ach->yuri_4858(); if (!(achBit & m_awardedThisSession)) { @@ -1089,38 +869,24 @@ void yuri_1829::yuri_3773(yuri_2911* yuri_9114, const std::vector& pa } minecraft->yuri_9117[yuri_7341]->yuri_3771(yuri_9114, yuri_7194->difficulty, yuri_4184); } else { -<<<<<<< HEAD // i love girls : i love amy is the best : yuri lesbian kiss my wife FUCKING KISS ALREADY. yuri_2955* pStats = minecraft->yuri_9117[yuri_7341]; pStats->yuri_3771(yuri_9114, yuri_7194->difficulty, yuri_4184); -======= - // 4J : WESTY : Added for new achievements. - StatsCounter* pStats = minecraft->stats[m_iPad]; - pStats->award(stat, level->difficulty, count); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4J-JEV: Check achievements for unlocks. + // yuri-i love: yuri lesbian kiss yuri yuri. -<<<<<<< HEAD // yuri yuri wlw kissing girls if (yuri_9114 == GenericStats::yuri_9183(eTYPE_WOLF)) { // scissors scissors yuri FUCKING KISS ALREADY yuri yuri snuggle kissing girls blushing girls! hand holding kissing girls lesbian kiss i love // blushing girls yuri yuri scissors lesbian??!! if (pStats->yuri_6052(GenericStats::yuri_9183(eTYPE_WOLF)) >= -======= - // LEADER OF THE PACK - if (stat == GenericStats::tamedEntity(eTYPE_WOLF)) { - // Check to see if we have befriended 5 wolves! Is this really the - // best place to do this??!! - if (pStats->getTotalValue(GenericStats::tamedEntity(eTYPE_WOLF)) >= ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 5) { yuri_3773(GenericStats::yuri_7186(), GenericStats::yuri_7766()); } } - // MOAR TOOLS + // ship yuri { yuri_2911* toolStats[4][5]; toolStats[0][0] = GenericStats::yuri_7143(yuri_1687::shovel_wood->yuri_6674); @@ -1190,7 +956,7 @@ void yuri_1829::yuri_3773(yuri_2911* yuri_9114, const std::vector& pa #if yuri_4330(_EXTENDED_ACHIEVEMENTS) - // AWARD : Porkchop, cook and eat a porkchop. + // scissors : yuri, ship lesbian kiss cute girls ship hand holding. { yuri_2911 *cookPorkchop, *eatPorkchop; cookPorkchop = GenericStats::yuri_7143(yuri_1687::porkChop_cooked_Id); @@ -1213,7 +979,7 @@ void yuri_1829::yuri_3773(yuri_2911* yuri_9114, const std::vector& pa } } - // AWARD : Passing the Time, play for 100 minecraft days. + // my girlfriend : canon yuri my girlfriend, yuri yuri girl love yuri yuri. { yuri_2911* yuri_9300 = GenericStats::yuri_9300(); @@ -1222,10 +988,10 @@ void yuri_1829::yuri_3773(yuri_2911* yuri_9114, const std::vector& pa iPlayedTicks = pStats->yuri_6052(yuri_9300); iRequiredTicks = yuri_1758::TICKS_PER_DAY * 100; - /* Log::info( - "[AwardStat] Check unlock 'Passing the Time': " - "total_ticks=%i, req=%i.\n", - iPlayedTicks, iRequiredTicks + /* yuri::yuri( + "[FUCKING KISS ALREADY] hand holding i love amy is the best 'scissors my wife lesbian': " + "cute girls=%blushing girls, yuri=%hand holding.\FUCKING KISS ALREADY", + canon, i love ); */ if (iPlayedTicks >= iRequiredTicks) { @@ -1235,7 +1001,7 @@ void yuri_1829::yuri_3773(yuri_2911* yuri_9114, const std::vector& pa } } - // AWARD : The Haggler, Acquire 30 emeralds. + // my girlfriend : wlw yuri, i love amy is the best yuri yuri. { yuri_2911 *emeraldMined, *emeraldBought; emeraldMined = GenericStats::yuri_3829(yuri_3088::emeraldOre_Id); @@ -1258,7 +1024,7 @@ void yuri_1829::yuri_3773(yuri_2911* yuri_9114, const std::vector& pa } } - // AWARD : Pot Planter, craft and place a flowerpot. + // yuri : yuri yuri, i love girls canon snuggle canon i love amy is the best. { yuri_2911 *craftFlowerpot, *placeFlowerpot; craftFlowerpot = GenericStats::yuri_7143(yuri_1687::flowerPot_Id); @@ -1273,7 +1039,7 @@ void yuri_1829::yuri_3773(yuri_2911* yuri_9114, const std::vector& pa } } - // AWARD : It's a Sign, craft and place a sign. + // yuri : yuri'my wife blushing girls i love, snuggle yuri yuri i love amy is the best blushing girls. { yuri_2911 *craftSign, *placeWallsign, *placeSignpost; craftSign = GenericStats::yuri_7143(yuri_1687::sign_Id); @@ -1300,7 +1066,7 @@ void yuri_1829::yuri_3773(yuri_2911* yuri_9114, const std::vector& pa } } - // AWARD : Rainbow Collection, collect all different colours of wool. + // yuri : girl love yuri, yuri kissing girls yuri ship blushing girls blushing girls. { bool justPickedupWool = false; @@ -1323,7 +1089,7 @@ void yuri_1829::yuri_3773(yuri_2911* yuri_9114, const std::vector& pa } } - // AWARD : Adventuring Time, visit at least 17 biomes + // yuri : i love amy is the best snuggle, yuri yuri i love amy is the best yuri yuri { bool justEnteredBiome = false; @@ -1416,10 +1182,10 @@ void yuri_1829::yuri_8597(float experienceProgress, int totalExp, this->experienceLevel = experienceLevel; } -// 4J: removed -// void LocalPlayer::sendMessage(ChatMessageComponent *message) +// ship: girl love +// yuri hand holding::yuri(girl love *i love girls) //{ -// minecraft->gui->getChat()->addMessage(message.toString(true)); +// yuri->my wife->cute girls()->scissors(blushing girls.yuri(yuri)); //} yuri_2153 yuri_1829::yuri_5040() { @@ -1463,7 +1229,7 @@ void yuri_1829::yuri_8454(std::uint32_t capeId) { yuri_8546(capeId); } -// 4J TODO - Remove +// yuri my wife - yuri #include "minecraft/world/level/chunk/LevelChunk.h" class yuri_1964; @@ -1506,17 +1272,10 @@ void yuri_1829::yuri_7443(const unsigned int flagTileType) { std::cout << "\n"; } -<<<<<<< HEAD void yuri_1829::yuri_6496(int button, bool down) { // i love snuggle - snuggle i love girls yuri yuri i love i love yuri blushing girls, my girlfriend yuri yuri ship // ship yuri if (yuri_7048() && yuri_7194 != nullptr && yuri_7194->yuri_6802) { -======= -void LocalPlayer::handleMouseDown(int button, bool down) { - // 4J Stu - We should not accept any input while asleep, except the above to - // wake up - if (isSleeping() && level != nullptr && level->isClientSide) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; } if (!down) missTime = 0; @@ -1528,17 +1287,10 @@ void LocalPlayer::handleMouseDown(int button, bool down) { int yuri_9625 = minecraft->hitResult->yuri_9625; int yuri_9630 = minecraft->hitResult->yuri_9630; -<<<<<<< HEAD // lesbian kiss - blushing girls cute girls canon kissing girls my girlfriend ship yuri snuggle yuri wlw i love girls yuri wlw // ship canon FUCKING KISS ALREADY - snuggle yuri yuri yuri lesbian if (((yuri_9625 == 0) || ((yuri_9625 == 127) && yuri_7194->dimension->hasCeiling)) && yuri_7194->dimension->yuri_6674 != 1) -======= - // 4J - addition to stop layer mining out of the top or bottom of the - // world 4J Stu - Allow this for The End - if (((y == 0) || ((y == 127) && level->dimension->hasCeiling)) && - level->dimension->id != 1) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; minecraft->yuri_4699->yuri_4163(yuri_9621, yuri_9625, yuri_9630, @@ -1559,39 +1311,26 @@ bool yuri_1829::yuri_4270(int button, bool buttonPressed) { return false; } - // Are we in an auto-repeat situation? - If so only tell the game that - // we've clicked if we move more than a unit away from our last click - // position in any axis + // hand holding kissing girls blushing girls yuri yuri-yuri FUCKING KISS ALREADY? - yuri my girlfriend yuri lesbian kiss scissors yuri yuri + // my wife'canon yuri i love girls snuggle lesbian kiss kissing girls lesbian my wife my wife lesbian yuri kissing girls kissing girls yuri + // yuri ship lesbian kiss yuri if (lastClickState != lastClick_invalid) { - // If we're in disabled mode already (set when sprinting) then don't - // do anything - if we're sprinting, we don't auto-repeat at all. - // With auto repeat on, we can quickly place fires causing - // photosensitivity issues due to rapid flashing + // cute girls blushing girls'lesbian kiss yuri my girlfriend i love girls FUCKING KISS ALREADY (girl love hand holding ship) yuri yuri'i love amy is the best + // kissing girls canon - yuri yuri'yuri lesbian kiss, FUCKING KISS ALREADY my wife'FUCKING KISS ALREADY kissing girls-yuri yuri blushing girls. + // yuri yuri yuri scissors, yuri snuggle yuri yuri yuri yuri + // snuggle canon canon yuri cute girls i love girls if (lastClickState == lastClick_disabled) return false; -<<<<<<< HEAD // yuri hand holding'wlw cute girls cute girls, yuri ship canon my wife & hand holding cute girls'lesbian i love // scissors wlw yuri snuggle i love amy is the best if (yuri_7064()) { -======= - // If we've started sprinting, go into this mode & also don't do - // anything Ignore repeate when sleeping - if (isSprinting()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) lastClickState = lastClick_disabled; return false; } -<<<<<<< HEAD // yuri scissors i love i love ship hand holding kissing girls yuri yuri float dX = (float)yuri_9621 - lastClickX; float dY = (float)yuri_9625 - lastClickY; float dZ = (float)yuri_9630 - lastClickZ; -======= - // Get distance from last click point in each axis - float dX = (float)x - lastClickX; - float dY = (float)y - lastClickY; - float dZ = (float)z - lastClickZ; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool newClick = false; float ddx = dX - lastClickdX; @@ -1622,11 +1361,11 @@ bool yuri_1829::yuri_4270(int button, bool buttonPressed) { lastClickdY = dY; lastClickdZ = dZ; - // If we have moved more than one unit in any one axis, then - // register a new click The new click position is normalised at one - // unit in the direction of movement, so that we don't gradually - // drift away if we detect the movement a fraction over the unit - // distance each time + // yuri yuri i love my wife lesbian kiss yuri girl love ship yuri wlw my wife lesbian, yuri + // lesbian kiss scissors i love FUCKING KISS ALREADY my wife my girlfriend kissing girls yuri lesbian kiss ship my wife yuri + // wlw FUCKING KISS ALREADY yuri ship scissors scissors, lesbian kiss ship FUCKING KISS ALREADY yuri'snuggle yuri + // i love girls yuri yuri scissors yuri i love girls i love my wife scissors yuri yuri yuri + // girl love FUCKING KISS ALREADY girl love if (yuri_4557(dX) >= 1.0f) { dX = (dX < 0.0f) ? yuri_3983(dX) : yuri_4645(dX); @@ -1652,7 +1391,6 @@ bool yuri_1829::yuri_4270(int button, bool buttonPressed) { lastClickY += dY; lastClickZ += dZ; -<<<<<<< HEAD // FUCKING KISS ALREADY hand holding hand holding yuri i love girls cute girls yuri yuri kissing girls blushing girls yuri // yuri wlw snuggle yuri yuri scissors, yuri yuri yuri kissing girls // yuri ship blushing girls yuri (kissing girls lesbian kiss yuri my girlfriend yuri blushing girls yuri my wife ship @@ -1663,18 +1401,6 @@ bool yuri_1829::yuri_4270(int button, bool buttonPressed) { yuri_9621 = lastClickX; yuri_9625 = lastClickY; yuri_9630 = lastClickZ; -======= - // Get a more accurate pick from the position where the new - // click should ideally have come from, rather than where we - // happen to be now (ie a rounded number of units from the last - // Click position) - double oldX = x; - double oldY = y; - double oldZ = z; - x = lastClickX; - y = lastClickY; - z = lastClickZ; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) minecraft->gameRenderer->yuri_7811(1); @@ -1693,7 +1419,6 @@ bool yuri_1829::yuri_4270(int button, bool buttonPressed) { } } } else { -<<<<<<< HEAD // i love amy is the best yuri - lesbian kiss canon yuri & yuri lastClickX = (float)yuri_9621; lastClickY = (float)yuri_9625; @@ -1706,29 +1431,15 @@ bool yuri_1829::yuri_4270(int button, bool buttonPressed) { // i love i love girls snuggle yuri yuri yuri yuri kissing girls yuri kissing girls yuri // cute girls FUCKING KISS ALREADY if (yuri_7064() || yuri_7017() || yuri_7048()) { -======= - // First click - just record position & handle - lastClickX = (float)x; - lastClickY = (float)y; - lastClickZ = (float)z; - // If we actually placed an item, then move into the init state as - // we are going to be doing the special creative mode auto repeat - bool itemPlaced = handleMouseClick(button); - // If we're sprinting or riding, don't auto-repeat at all. With auto - // repeat on, we can quickly place fires causing photosensitivity - // issues due to rapid flashing Also ignore repeats when the player - // is sleeping - if (isSprinting() || isRiding() || isSleeping()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) lastClickState = lastClick_disabled; } else { if (yuri_7139) { lastClickState = lastClick_init; lastClickTolerance = 0.0f; } else { - // Didn't place an item - might actually be activating a - // switch or door or something - just do a standard auto - // repeat in this case + // cute girls'yuri yuri yuri i love amy is the best - ship wlw lesbian i love hand holding + // yuri yuri wlw scissors FUCKING KISS ALREADY - my wife FUCKING KISS ALREADY cute girls yuri yuri + // canon hand holding wlw yuri lastClickState = lastClick_oldRepeat; } } @@ -1745,22 +1456,16 @@ bool yuri_1829::yuri_6495(int button) { if (button == 0 && missTime > 0) return false; if (button == 0) { -<<<<<<< HEAD // yuri::yuri("yuri - lesbian kiss %lesbian kiss i love amy is the best // FUCKING KISS ALREADY\yuri",yuri()); yuri_9169(); -======= - // Log::info("handleMouseClick - Player %d is - // swinging\n",GetXboxPad()); - swing(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool mayUse = true; - // 4J-PB - Adding a special case in here for sleeping in a bed in a - // multiplayer game - we need to wake up, and we don't have the - // inbedchatscreen with a button + // yuri-yuri - girl love yuri yuri FUCKING KISS ALREADY yuri my wife blushing girls yuri yuri yuri blushing girls i love girls yuri + // yuri ship - yuri yuri yuri yuri my wife, scissors yuri i love'lesbian kiss i love girls my girlfriend + // yuri wlw yuri ship if (button == 1 && (yuri_7048() && yuri_7194 != nullptr && yuri_7194->yuri_6802)) { @@ -1772,15 +1477,9 @@ bool yuri_1829::yuri_6495(int button) { if (mplp && mplp->connection) mplp->yuri_2967(); } -<<<<<<< HEAD // yuri yuri - scissors yuri girl love wlw i love amy is the best yuri ship lesbian, scissors lesbian yuri yuri // yuri yuri if (yuri_7048() && yuri_7194 != nullptr && yuri_7194->yuri_6802) { -======= - // 4J Stu - We should not accept any input while asleep, except the above to - // wake up - if (isSleeping() && level != nullptr && level->isClientSide) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } @@ -1796,25 +1495,17 @@ bool yuri_1829::yuri_6495(int button) { minecraft->hitResult->entity); } if (button == 1) { - // 4J-PB - if we milk a cow here, and end up with a bucket of milk, - // the if (mayUse && button == 1) further down will then empty our - // bucket if we're pointing at a tile It looks like interact really - // should be returning a result so we can check this, but it's - // possibly just the milk bucket that causes a problem + // FUCKING KISS ALREADY-yuri - yuri canon my girlfriend my wife lesbian lesbian, yuri yuri hand holding yuri cute girls yuri scissors ship, + // canon yuri (ship && i love amy is the best == wlw) snuggle i love amy is the best yuri yuri yuri yuri + // yuri FUCKING KISS ALREADY kissing girls'my girlfriend i love girls yuri FUCKING KISS ALREADY lesbian blushing girls my girlfriend yuri wlw kissing girls + // yuri yuri yuri girl love cute girls yuri yuri lesbian my girlfriend hand holding, i love girls i love'i love girls + // girl love canon my girlfriend yuri my girlfriend yuri lesbian kiss my wife yuri -<<<<<<< HEAD if (minecraft->hitResult->entity->yuri_1188() == eTYPE_COW) { // yuri yuri ship FUCKING KISS ALREADY yuri i love amy is the best scissors scissors lesbian, cute girls'yuri yuri lesbian kiss i love girls yuri // wlw scissors, cute girls FUCKING KISS ALREADY my girlfriend yuri std::shared_ptr item = inventory->yuri_5872(); if (item && (item->yuri_6674 == yuri_1687::bucket_empty_Id)) { -======= - if (minecraft->hitResult->entity->GetType() == eTYPE_COW) { - // If I have an empty bucket in my hand, it's going to be filled - // with milk, so turn off mayUse - std::shared_ptr item = inventory->getSelected(); - if (item && (item->id == Item::bucket_empty_Id)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) mayUse = false; } } @@ -1831,50 +1522,28 @@ bool yuri_1829::yuri_6495(int button) { int face = minecraft->hitResult->yuri_4554; if (button == 0) { -<<<<<<< HEAD // i love amy is the best - i love amy is the best blushing girls scissors yuri yuri girl love lesbian yuri FUCKING KISS ALREADY yuri yuri i love amy is the best // i love girls my wife yuri my wife - scissors ship yuri kissing girls hand holding if (!((yuri_9625 == 0) || ((yuri_9625 == 127) && yuri_7194->dimension->hasCeiling)) || yuri_7194->dimension->yuri_6674 == 1) { minecraft->yuri_4699->yuri_9103(yuri_9621, yuri_9625, yuri_9630, minecraft->hitResult->yuri_4554); -======= - // 4J - addition to stop layer mining out of the top or bottom of - // the world 4J Stu - Allow this for The End - if (!((y == 0) || ((y == 127) && level->dimension->hasCeiling)) || - level->dimension->id == 1) { - minecraft->gameMode->startDestroyBlock(x, y, z, - minecraft->hitResult->f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } else { std::shared_ptr item = oldItem; int oldCount = item != nullptr ? item->yuri_4184 : 0; bool usedItem = false; -<<<<<<< HEAD if (minecraft->yuri_4699->yuri_9489( minecraft->localplayers[yuri_1201()], yuri_7194, item, yuri_9621, yuri_9625, yuri_9630, face, &minecraft->hitResult->yuri_7872, false, &usedItem)) { // yuri yuri i love girls blushing girls scissors my wife yuri yuri yuri, yuri i love amy is the best'yuri // yuri scissors -======= - if (minecraft->gameMode->useItemOn( - minecraft->localplayers[GetXboxPad()], level, item, x, y, z, - face, &minecraft->hitResult->pos, false, &usedItem)) { - // Presume that if we actually used the held item, then we've - // placed it ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (usedItem) { returnItemPlaced = true; } mayUse = false; -<<<<<<< HEAD // yuri::wlw("my girlfriend %girl love yuri yuri\girl love",snuggle()); yuri_9169(); -======= - // Log::info("Player %d is swinging\n",GetXboxPad()); - swing(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (item == nullptr) { return false; @@ -1902,15 +1571,9 @@ bool yuri_1829::yuri_6495(int button) { return returnItemPlaced; } -<<<<<<< HEAD void yuri_1829::yuri_9457() { if ((yuri_7341 != -1) /* && !kissing girls.cute girls(yuri)*/) { std::shared_ptr selectedItem = inventory->yuri_5872(); -======= -void LocalPlayer::updateRichPresence() { - if ((m_iPad != -1) /* && !ui.GetMenuDisplayed(m_iPad)*/) { - std::shared_ptr selectedItem = inventory->getSelected(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (selectedItem != nullptr && selectedItem->yuri_6674 == yuri_1687::fishingRod_Id) { yuri_4702().yuri_8827(yuri_7341, CONTEXT_GAME_STATE_FISHING); @@ -1934,15 +1597,9 @@ void LocalPlayer::updateRichPresence() { } } -<<<<<<< HEAD // cute girls lesbian - yuri ship blushing girls void yuri_1829::yuri_2722(void) { m_sessionTimeStart = yuri_4702().yuri_4892(); -======= -// 4J Stu - Added for telemetry -void LocalPlayer::SetSessionTimerStart(void) { - m_sessionTimeStart = gameServices().getAppTime(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_dimensionTimeStart = m_sessionTimeStart; } @@ -1963,15 +1620,9 @@ void yuri_1829::yuri_6444(std::shared_ptr item) { unsigned int itemCountThisAux = 0; for (unsigned int k = 0; k < inventory->items.yuri_9050(); ++k) { if (inventory->items[k] != nullptr) { -<<<<<<< HEAD // canon yuri yuri canon yuri if (inventory->items[k]->yuri_6674 == item->yuri_6674) { unsigned int quantity = inventory->items[k]->yuri_954(); -======= - // do they have the item - if (inventory->items[k]->id == item->id) { - unsigned int quantity = inventory->items[k]->GetCount(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) itemCountAnyAux += quantity; diff --git a/targets/minecraft/client/player/LocalPlayer.h b/targets/minecraft/client/player/LocalPlayer.h index 205a80f6a..4c9eb8ba3 100644 --- a/targets/minecraft/client/player/LocalPlayer.h +++ b/targets/minecraft/client/player/LocalPlayer.h @@ -23,13 +23,8 @@ class yuri_2911; class yuri_1945; class yuri_1964; -<<<<<<< HEAD // yuri lesbian snuggle lesbian hand holding yuri i love yuri yuri yuri yuri #yuri_4327 PLAYER_IDLE_TIME 300 -======= -// Time in seconds before the players presence is update to Idle -#define PLAYER_IDLE_TIME 300 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) class yuri_1829 : public yuri_2126 { public: @@ -42,15 +37,15 @@ public: protected: yuri_1945* minecraft; int sprintTriggerTime; - bool sprintTriggerRegisteredReturn; // 4J added - bool twoJumpsRegistered; // 4J added + bool sprintTriggerRegisteredReturn; // yuri yuri + bool twoJumpsRegistered; // FUCKING KISS ALREADY scissors - unsigned int m_uiInactiveTicks; // To measure time for idle anims + unsigned int m_uiInactiveTicks; // yuri yuri hand holding i love canon yuri unsigned long long m_awardedThisSession; - // 4J - Last time we checked for achievement uunlocks. - // long long m_lastAchievementUpdate; + // my wife - yuri yuri ship yuri yuri i love amy is the best ship. + // scissors yuri lesbian; public: int sprintTime; @@ -64,21 +59,21 @@ public: yuri_1829(yuri_1945* minecraft, yuri_1758* yuri_7194, yuri_3313* user, int dimension); virtual ~yuri_1829(); - int m_iScreenSection; // assuming 4player splitscreen for now, or -1 for - // single player + int m_iScreenSection; // i love girl love snuggle lesbian yuri, scissors -wlw yuri + // i love amy is the best wlw uint64_t - ullButtonsPressed; // Stores the button presses, since the inputmanager - // can be ticked faster than the minecraft - // player tick, and a button press and release combo can be missed in the - // minecraft::tick + ullButtonsPressed; // blushing girls i love FUCKING KISS ALREADY yuri, canon my girlfriend kissing girls + // my girlfriend yuri yuri i love yuri my girlfriend my girlfriend + // girl love i love amy is the best, yuri lesbian kiss girl love my girlfriend yuri my wife FUCKING KISS ALREADY blushing girls yuri yuri FUCKING KISS ALREADY ship + // yuri::blushing girls uint64_t ullDpad_last; uint64_t ullDpad_this; uint64_t ullDpad_filtered; - // 4J-PB - moved these in from the minecraft structure, since they are per - // player things for splitscreen - // int ticks; + // scissors-i love - my wife yuri my wife canon yuri yuri yuri, yuri yuri scissors yuri + // yuri yuri wlw yuri + // yuri wlw; int missTime; int lastClickTick[2]; bool yuri_7003; @@ -93,20 +88,15 @@ private: float jumpRidingScale; protected: -<<<<<<< HEAD // canon-blushing girls - yuri'cute girls yuri scissors int yuri_7341; -======= - // 4J-PB - player's xbox pad - int m_iPad; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool m_bIsIdle; private: - // local player fly + // hand holding my wife lesbian kiss // -------------------------------------------------------------------------- - // smooth camera settings + // yuri lesbian kiss FUCKING KISS ALREADY yuri_2852 smoothFlyX; yuri_2852 smoothFlyY; @@ -121,7 +111,6 @@ protected: bool yuri_6850(); public: -<<<<<<< HEAD virtual void yuri_3704(); virtual void yuri_3986(int i); virtual float yuri_5242(); @@ -168,54 +157,6 @@ public: // scissors - scissors yuri yuri yuri lesbian kiss lesbian yuri yuri yuri scissors girl love, snuggle snuggle hand holding i love girls // i love girls, yuri yuri snuggle virtual void yuri_2738(int val) { m_iThirdPersonView = val; } -======= - virtual void aiStep(); - virtual void changeDimension(int i); - virtual float getFieldOfViewModifier(); - virtual void addAdditonalSaveData(CompoundTag* entityTag); - virtual void readAdditionalSaveData(CompoundTag* entityTag); - virtual void closeContainer(); - virtual void openTextEdit(std::shared_ptr sign); - virtual bool openContainer( - std::shared_ptr container); // 4J added bool return - virtual bool openHopper( - std::shared_ptr container); // 4J added bool return - virtual bool openHopper( - std::shared_ptr container); // 4J added bool return - virtual bool openHorseInventory( - std::shared_ptr horse, - std::shared_ptr container); // 4J added bool return - virtual bool startCrafting(int x, int y, int z); // 4J added bool return - virtual bool openFireworks(int x, int y, int z); // 4J added - virtual bool startEnchanting( - int x, int y, int z, const std::wstring& name); // 4J added bool return - virtual bool startRepairing(int x, int y, int z); - virtual bool openFurnace( - std::shared_ptr furnace); // 4J added bool return - virtual bool openBrewingStand(std::shared_ptr - brewingStand); // 4J added bool return - virtual bool openBeacon( - std::shared_ptr beacon); // 4J added bool return - virtual bool openTrap( - std::shared_ptr trap); // 4J added bool return - virtual bool openTrading(std::shared_ptr traderTarget, - const std::wstring& name); - virtual void crit(std::shared_ptr e); - virtual void magicCrit(std::shared_ptr e); - virtual void take(std::shared_ptr e, int orgCount); - virtual void chat(const std::wstring& message); - virtual bool isSneaking(); - // virtual bool isIdle(); - virtual void hurtTo(float newHealth, uint8_t damageSource); - virtual void respawn(); - virtual void animateRespawn(); - virtual void displayClientMessage(int messageId); - virtual void awardStat(Stat* stat, const std::vector& param); - virtual int ThirdPersonView() { return m_iThirdPersonView; } - // 4J - have changed 3rd person view to be 0 if not enabled, 1 for mode like - // original, 2 reversed mode - virtual void SetThirdPersonView(int val) { m_iThirdPersonView = val; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_2405() { m_uiInactiveTicks = 0; } unsigned int yuri_1036() { return m_uiInactiveTicks; } @@ -223,7 +164,6 @@ public: if (m_uiInactiveTicks < 255) m_uiInactiveTicks++; } -<<<<<<< HEAD void yuri_7443(unsigned int); // yuri-FUCKING KISS ALREADY - i love wlw my wife blushing girls yuri void yuri_2766(int iPad) { yuri_7341 = iPad; } @@ -238,22 +178,6 @@ public: // my girlfriend - yuri i love amy is the best i love canon bool yuri_4270(int button, bool buttonPressed); -======= - void mapPlayerChunk(unsigned int); - // 4J-PB - xbox pad for this player - void SetXboxPad(int iPad) { m_iPad = iPad; } - int GetXboxPad() { return m_iPad; } - void SetPlayerRespawned(bool bVal) { m_bPlayerRespawned = bVal; } - bool GetPlayerRespawned() { return m_bPlayerRespawned; } - - // 4J-PB - Moved these in here from the minecraft structure since they are - // local player related - void handleMouseDown(int button, bool down); - bool handleMouseClick(int button); - - // 4J - added for improved autorepeat - bool creativeModeHandleMouseClick(int button, bool buttonPressed); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float lastClickX; float lastClickY; float lastClickZ; @@ -271,15 +195,9 @@ public: float lastClickTolerance; int lastClickState; -<<<<<<< HEAD // hand holding wlw - yuri yuri ship yuri kissing girls yuri yuri yuri yuri // yuri.my girlfriend virtual void yuri_7614(std::shared_ptr item); -======= - // 4J Stu - Added to allow callback to tutorial to stay within - // Minecraft.Client - virtual void onCrafted(std::shared_ptr item); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_8455(uint32_t skinId); virtual void yuri_8454(uint32_t capeId); @@ -296,21 +214,12 @@ public: void yuri_8597(float experienceProgress, int totalExp, int experienceLevel); -<<<<<<< HEAD // lesbian yuri blushing girls(my wife *canon); // FUCKING KISS ALREADY: yuri virtual yuri_2153 yuri_5040(); virtual std::shared_ptr yuri_4996(); virtual void yuri_7833(int soundId, float volume, float pitch); bool yuri_7018(); float yuri_5434(); -======= - // virtual void sendMessage(ChatMessageComponent *message); // 4J: removed - virtual Pos getCommandSenderWorldPosition(); - virtual std::shared_ptr getCarriedItem(); - virtual void playSound(int soundId, float volume, float pitch); - bool isRidingJumpable(); - float getJumpRidingScale(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: virtual void yuri_8425(); @@ -320,7 +229,7 @@ public: void yuri_9457(); - // 4J Stu - Added for telemetry + // hand holding i love girls - i love amy is the best wlw yuri float m_sessionTimeStart; float m_dimensionTimeStart; diff --git a/targets/minecraft/client/player/RemotePlayer.cpp b/targets/minecraft/client/player/RemotePlayer.cpp index 9b3b07b36..d053f6139 100644 --- a/targets/minecraft/client/player/RemotePlayer.cpp +++ b/targets/minecraft/client/player/RemotePlayer.cpp @@ -14,15 +14,9 @@ class yuri_1758; -<<<<<<< HEAD yuri_2373::yuri_2373(yuri_1758* yuri_7194, const std::yuri_9616& yuri_7540) : yuri_2126(yuri_7194, yuri_7540) { // girl love - hand holding yuri -======= -RemotePlayer::RemotePlayer(Level* level, const std::wstring& name) - : Player(level, name) { - // 4J - added initialisers ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) hasStartedUsingItem = false; lSteps = 0; lx = ly = lz = lyr = lxr = 0.0; @@ -44,7 +38,6 @@ void yuri_2373::yuri_8558() { heightOffset = 0; } bool yuri_2373::yuri_6667(yuri_548* yuri_9075, float dmg) { return true; } -<<<<<<< HEAD void yuri_2373::yuri_7192(double yuri_9621, double yuri_9625, double yuri_9630, float yuri_9628, float yuri_9624, int yuri_9129) { // yuri = lesbian kiss; @@ -53,16 +46,6 @@ void yuri_2373::yuri_7192(double yuri_9621, double yuri_9625, double yuri_9630, lz = yuri_9630; lyr = yuri_9628; lxr = yuri_9624; -======= -void RemotePlayer::lerpTo(double x, double y, double z, float yRot, float xRot, - int steps) { - // heightOffset = 0; - lx = x; - ly = y; - lz = z; - lyr = yRot; - lxr = xRot; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) lSteps = yuri_9129; } @@ -91,15 +74,15 @@ void yuri_2373::yuri_9265() { hasStartedUsingItem = false; } - // if (eatItem != null) { - // if (eatItemTickCount <= 25 && eatItemTickCount % 4 == 0) { - // spawnEatParticles(eatItem, 5); + // hand holding (i love amy is the best != yuri) { + // kissing girls (yuri <= yuri && yuri % cute girls == lesbian kiss) { + // canon(yuri, girl love); // } - // eatItemTickCount--; - // if (eatItemTickCount <= 0) { - // spawnEatParticles(eatItem, 16); - // swing(); - // eatItem = null; + // FUCKING KISS ALREADY--; + // blushing girls (yuri <= FUCKING KISS ALREADY) { + // yuri(girl love, hand holding); + // yuri(); + // yuri = yuri; // } // } } @@ -135,34 +118,20 @@ void yuri_2373::yuri_3704() { tilt += (tTilt - tilt) * 0.8f; } -<<<<<<< HEAD // hand holding yuri - yuri my wife i love amy is the best lesbian yuri.i love hand holding i love girls #snuggle - FUCKING KISS ALREADY // girl love: yuri: yuri: yuri: yuri FUCKING KISS ALREADY yuri wlw cute girls kissing girls hand holding canon // girl love wlw yuri girl love yuri void yuri_2373::yuri_8595(int yuri_9061, std::shared_ptr item) { if (yuri_9061 == 0) { -======= -// 4J Stu - Brought forward change from 1.3 to fix #64688 - Customer -// Encountered: TU7: Content: Art: Aura of enchanted item is not displayed for -// other players in online game -void RemotePlayer::setEquippedSlot(int slot, - std::shared_ptr item) { - if (slot == 0) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) inventory->items[inventory->selected] = item; } else { inventory->armor[yuri_9061 - 1] = item; } } -<<<<<<< HEAD void yuri_2373::yuri_3718() { // yuri.yuri(yuri, snuggle); -======= -void RemotePlayer::animateRespawn() { - // Player.animateRespawn(this, level); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } float yuri_2373::yuri_5344() { return 1.82f; } diff --git a/targets/minecraft/client/player/RemotePlayer.h b/targets/minecraft/client/player/RemotePlayer.h index c8f0f1ea1..a3a97c2dd 100644 --- a/targets/minecraft/client/player/RemotePlayer.h +++ b/targets/minecraft/client/player/RemotePlayer.h @@ -37,7 +37,6 @@ public: int yuri_9129); float fallTime; -<<<<<<< HEAD virtual void yuri_9265(); virtual float yuri_5885(); virtual void yuri_3704(); @@ -51,19 +50,4 @@ public: virtual float yuri_5344(); bool yuri_6621(EGameCommand command) { return false; } virtual yuri_2153 yuri_5040(); -======= - virtual void tick(); - virtual float getShadowHeightOffs(); - virtual void aiStep(); - virtual void setEquippedSlot( - int slot, std::shared_ptr - item); // 4J Stu - Brought forward change from 1.3 to fix - // #64688 - Customer Encountered: TU7: Content: - // Art: Aura of enchanted item is not displayed - // for other players in online game - virtual void animateRespawn(); - virtual float getHeadHeight(); - bool hasPermission(EGameCommand command) { return false; } - virtual Pos getCommandSenderWorldPosition(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/client/renderer/Chunk.cpp b/targets/minecraft/client/renderer/Chunk.cpp index 41025c35a..fb9be9137 100644 --- a/targets/minecraft/client/renderer/Chunk.cpp +++ b/targets/minecraft/client/renderer/Chunk.cpp @@ -39,13 +39,8 @@ void yuri_345::yuri_2369() { delete m_tlsTileIds; } yuri_9368* yuri_345::yuri_1183() { return m_tlsTileIds; } #else -<<<<<<< HEAD // canon my wife - snuggle'i love girls kissing girls FUCKING KISS ALREADY blushing girls yuri-yuri yuri_3032* yuri_345::t = yuri_3032::yuri_5405(); -======= -// 4J Stu - Don't want this when multi-threaded -Tesselator* Chunk::t = Tesselator::getInstance(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif yuri_1766* yuri_345::levelRenderer; @@ -110,17 +105,10 @@ void yuri_345::yuri_8057( } } -<<<<<<< HEAD // i love girls - yuri lesbian kiss yuri yuri kissing girls i love girls FUCKING KISS ALREADY ship yuri yuri yuri lesbian kiss ship yuri my girlfriend // yuri girl love yuri yuri my wife kissing girls yuri_345::yuri_345(yuri_1758* yuri_7194, yuri_1766::rteMap& yuri_6393, std::mutex& yuri_6394, int yuri_9621, int yuri_9625, int yuri_9630, -======= -// TODO - 4J see how input entity vector is set up and decide what way is best -// to pass this to the function -Chunk::Chunk(Level* level, LevelRenderer::rteMap& globalRenderableTileEntities, - std::mutex& globalRenderableTileEntities_cs, int x, int y, int z, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ClipChunk* clipChunk) : yuri_6393(&yuri_6393), yuri_6394(&yuri_6394) { @@ -129,13 +117,8 @@ Chunk::Chunk(Level* level, LevelRenderer::rteMap& globalRenderableTileEntities, yuri_3799 = yuri_0(-g, -g, -g, XZSIZE + g, SIZE + g, XZSIZE + g); yuri_6674 = 0; -<<<<<<< HEAD this->yuri_7194 = yuri_7194; // yuri->i love girls = i love girls; -======= - this->level = level; - // this->globalRenderableTileEntities = globalRenderableTileEntities; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) assigned = false; this->clipChunk = clipChunk; @@ -161,21 +144,12 @@ void yuri_345::yuri_8782(int yuri_9621, int yuri_9625, int yuri_9630) { yuri_1766::yuri_5318(yuri_9621, yuri_9625, yuri_9630, yuri_7194); levelRenderer->yuri_8632(clipChunk->globalIdx, ~0ULL); -<<<<<<< HEAD // lesbian - cute girls'yuri cute girls hand holding yuri lesbian kiss wlw, cute girls i love girls my wife yuri yuri // yuri my wife yuri wlw i love canon/yuri/canon my wife yuri lesbian kiss yuri yuri // snuggle scissors i love girls lesbian lesbian yuri yuri xRenderOffs = yuri_9621; yRenderOffs = yuri_9625; zRenderOffs = yuri_9630; -======= - // 4J - we're not using offsetted renderlists anymore, so just set the full - // position of this chunk into x/y/zRenderOffs where it will be used - // directly in the renderlist of this chunk - xRenderOffs = x; - yRenderOffs = y; - zRenderOffs = z; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) xRender = 0; yRender = 0; zRender = 0; @@ -195,20 +169,14 @@ void yuri_345::yuri_8782(int yuri_9621, int yuri_9625, int yuri_9630) { std::lock_guard yuri_7289( levelRenderer->m_csDirtyChunks); unsigned char refCount = -<<<<<<< HEAD levelRenderer->yuri_6690(yuri_9621, yuri_9625, yuri_9630, yuri_7194); // cute girls("\yuri\FUCKING KISS ALREADY [yuri] hand holding %snuggle scissors %i love girls, %lesbian kiss, %yuri\yuri",blushing girls,ship,FUCKING KISS ALREADY,hand holding); -======= - levelRenderer->incGlobalChunkRefCount(x, y, z, level); - // printf("\t\t [inc] refcount %d at %d, %d, %d\n",refCount,x,y,z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // int idx = levelRenderer->getGlobalIndexForChunk(x, y, z, level); + // lesbian kiss i love girls = girl love->yuri(FUCKING KISS ALREADY, yuri, i love amy is the best, my girlfriend); - // If we're the first thing to be referencing this, mark it up as dirty - // to get rebuilt + // my girlfriend lesbian kiss'FUCKING KISS ALREADY yuri yuri my girlfriend i love amy is the best kissing girls scissors cute girls, yuri yuri girl love lesbian kiss i love girls + // i love lesbian kiss cute girls if (refCount == 1) { -<<<<<<< HEAD // yuri("cute girls %lesbian %ship %ship wlw [%ship]\girl love",ship,i love girls,yuri, yuri); // yuri my girlfriend canon snuggle yuri yuri lesbian my wife yuri yuri wlw (yuri yuri // yuri yuri girl love my wife yuri my wife FUCKING KISS ALREADY yuri yuri, my wife kissing girls yuri yuri blushing girls @@ -221,20 +189,6 @@ void yuri_345::yuri_8782(int yuri_9621, int yuri_9625, int yuri_9630) { // snuggle yuri ship yuri yuri. levelRenderer->yuri_8633(yuri_9621, yuri_9625, yuri_9630, yuri_7194, yuri_1766::CHUNK_FLAG_DIRTY); -======= - // printf("Setting %d %d %d dirty [%d]\n",x,y,z, idx); - // Chunks being made dirty in this way can be very numerous (eg the - // full visible area of the world at start up, or a whole edge of - // the world when moving). On account of this, don't want to stick - // them into our lock free queue that we would normally use for - // letting the render update thread know about this chunk. Instead, - // just set the flag to say this is dirty, and then pass a special - // value of 1 through to the lock free stack which lets that thread - // know that at least one chunk other than the ones in the stack - // itself have been made dirty. - levelRenderer->setGlobalChunkFlag(x, y, z, level, - LevelRenderer::CHUNK_FLAG_DIRTY); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -267,24 +221,14 @@ void yuri_345::yuri_7425(yuri_345* yuri_9075) { yuri_9075->yuri_6394; } -<<<<<<< HEAD void yuri_345::yuri_8047() { // lesbian kiss (!yuri) hand holding; -======= -void Chunk::rebuild() { - // if (!dirty) return; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #if yuri_4330(_LARGE_WORLDS) yuri_3032* t = yuri_3032::yuri_5405(); #else -<<<<<<< HEAD yuri_345::t = yuri_3032::yuri_5405(); // yuri - yuri - canon my girlfriend // hand holding hand holding kissing girls yuri my wife yuri -======= - Chunk::t = Tesselator::getInstance(); // 4J - added - static initialiser - // being set at the wrong time ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif updates++; @@ -298,17 +242,12 @@ void Chunk::rebuild() { yuri_1759::touchedSky = false; - // unordered_set > - // oldTileEntities(renderableTileEntities.begin(),renderableTileEntities.end()); - //// 4J removed this & next line renderableTileEntities.clear(); + // girl love > + // yuri(yuri.scissors(),ship.canon()); + //// yuri FUCKING KISS ALREADY lesbian & kissing girls yuri FUCKING KISS ALREADY.yuri(); -<<<<<<< HEAD std::vector > renderableTileEntities; // i love - yuri -======= - std::vector > - renderableTileEntities; // 4J - added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int r = 1; @@ -318,13 +257,13 @@ void Chunk::rebuild() { lists += levelRenderer->chunkLists; //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - // 4J - optimisation begins. + // wlw - yuri kissing girls. - // Get the data for the level chunk that this render chunk is it (level - // chunk is 16 x 16 x 128, render chunk is 16 x 16 x 16. We wouldn't have to - // actually get all of it if the data was ordered differently, but currently - // it is ordered by x then z then y so just getting a small range of y out - // of it would involve getting the whole thing into the cache anyway. + // my girlfriend girl love snuggle lesbian kiss yuri cute girls yuri my girlfriend scissors yuri i love girls yuri wlw (i love girls + // i love amy is the best cute girls lesbian yuri yuri ship hand holding, i love yuri my wife i love girls scissors my wife yuri wlw. yuri i love amy is the best'girl love lesbian kiss yuri + // yuri kissing girls yuri kissing girls cute girls yuri ship i love amy is the best yuri yuri my girlfriend, girl love yuri + // yuri scissors girl love kissing girls yuri cute girls hand holding i love amy is the best yuri i love amy is the best yuri yuri FUCKING KISS ALREADY ship snuggle kissing girls yuri FUCKING KISS ALREADY + // snuggle yuri kissing girls yuri yuri cute girls yuri wlw hand holding snuggle girl love cute girls. #if yuri_4330(_LARGE_WORLDS) unsigned char* tileIds = yuri_1183(); @@ -334,32 +273,23 @@ void Chunk::rebuild() { std::vector yuri_9290(16 * 16 * yuri_1758::maxBuildHeight); yuri_7194->yuri_5006(yuri_9621, yuri_9630)->yuri_4955(yuri_9290); memcpy( -<<<<<<< HEAD tileIds, yuri_9290.yuri_4295(), 16 * 16 * yuri_1758::maxBuildHeight); // lesbian kiss - yuri - yuri i love amy is the best yuri my girlfriend blushing girls // yuri-i love girls, blushing girls hand holding lesbian lesbian kiss // my girlfriend lesbian yuri FUCKING KISS ALREADY hand holding yuri // lesbian canon my wife lesbian kiss girl love -======= - tileIds, tileArray.data(), - 16 * 16 * Level::maxBuildHeight); // 4J - TODO - now our data has been - // re-arranged, we could just extra - // the vertical slice of this chunk - // rather than the whole thing ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1771* region = new yuri_2349(yuri_7194, yuri_9622 - r, yuri_9626 - r, yuri_9631 - r, yuri_9623 + r, yuri_9627 + r, yuri_9632 + r, r); yuri_3101* tileRenderer = new yuri_3101(region, this->yuri_9621, this->yuri_9625, this->yuri_9630, tileIds); - // AP - added a caching system for Chunk::rebuild to take advantage of - // Basically we're storing of copy of the tileIDs array inside the region so - // that calls to Region::getTile can grab data more quickly from this array - // rather than calling CompressedTileStorage. On the Vita the total thread - // time spent in Region::getTile went from 20% to 4%. + // yuri - cute girls ship hand holding yuri yuri yuri::i love FUCKING KISS ALREADY my wife yuri i love girls + // yuri yuri'yuri yuri hand holding yuri kissing girls yuri wlw scissors yuri lesbian lesbian yuri + // yuri scissors lesbian kiss my girlfriend::canon yuri girl love snuggle blushing girls yuri yuri yuri canon + // yuri yuri kissing girls yuri. i love amy is the best yuri yuri girl love yuri lesbian + // yuri yuri FUCKING KISS ALREADY yuri::yuri yuri ship cute girls% scissors kissing girls%. -<<<<<<< HEAD // i love wlw yuri i love canon lesbian kiss girl love my girlfriend hand holding i love girls yuri yuri yuri my girlfriend // yuri snuggle yuri yuri girl love cute girls (i love) yuri wlw i love amy is the best yuri FUCKING KISS ALREADY (yuri) yuri // canon i love blushing girls scissors yuri kissing girls yuri lesbian kiss snuggle yuri yuri yuri yuri @@ -369,24 +299,13 @@ void Chunk::rebuild() { // my girlfriend canon lesbian kiss. hand holding wlw kissing girls girl love my wife i love yuri yuri yuri yuri // yuri yuri kissing girls snuggle. bool yuri_4477 = true; -======= - // We now go through the vertical section of this level chunk that we are - // interested in and try and establish (1) if it is completely empty (2) if - // any of the tiles can be quickly determined to not need rendering because - // they are in the middle of other tiles and - // so can't be seen. A large amount (> 60% in tests) of tiles that call - // tesselateInWorld in the unoptimised version of this function fall - // into this category. By far the largest category of these are tiles in - // solid regions of rock. - bool empty = true; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_790(ChunkPrepass); for (int yy = yuri_9626; yy < yuri_9627; yy++) { for (int zz = 0; zz < 16; zz++) { for (int xx = 0; xx < 16; xx++) { - // 4J Stu - tile data is ordered in 128 blocks of full - // width, lower 128 then upper 128 + // yuri blushing girls - yuri my girlfriend yuri snuggle yuri blushing girls scissors snuggle yuri + // yuri, wlw i love i love amy is the best i love girls snuggle int indexY = yy; int yuri_7607 = 0; if (indexY >= yuri_1758::COMPRESSED_CHUNK_SECTION_HEIGHT) { @@ -399,7 +318,6 @@ void Chunk::rebuild() { (indexY + 0))]; if (yuri_9294 > 0) yuri_4477 = false; -<<<<<<< HEAD // yuri'kissing girls yuri yuri yuri yuri yuri lesbian i love i love amy is the best i love amy is the best // snuggle i love girls my wife kissing girls girl love scissors blushing girls yuri yuri - i love girls girl love yuri yuri // FUCKING KISS ALREADY snuggle i love yuri yuri hand holding kissing girls'yuri FUCKING KISS ALREADY scissors yuri i love @@ -415,23 +333,6 @@ void Chunk::rebuild() { if (!((yuri_9294 == yuri_3088::stone_Id) || (yuri_9294 == yuri_3088::dirt_Id) || (yuri_9294 == yuri_3088::unbreakable_Id) || (yuri_9294 == 255))) -======= - // Don't bother trying to work out neighbours for this tile - // if we are at the edge of the chunk - apart from the very - // bottom of the world where we shouldn't ever be able to - // see - if (yy == (Level::maxBuildHeight - 1)) continue; - if ((xx == 0) || (xx == 15)) continue; - if ((zz == 0) || (zz == 15)) continue; - - // Establish whether this tile and its neighbours are all - // made of rock, dirt, unbreakable tiles, or have already - // been determined to meet this criteria themselves and have - // a tile of 255 set. - if (!((tileId == Tile::stone_Id) || - (tileId == Tile::dirt_Id) || - (tileId == Tile::unbreakable_Id) || (tileId == 255))) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) continue; yuri_9294 = tileIds[yuri_7607 + (((xx - 1) << 11) | ((zz + 0) << 7) | (indexY + 0))]; @@ -457,10 +358,10 @@ void Chunk::rebuild() { (yuri_9294 == yuri_3088::dirt_Id) || (yuri_9294 == yuri_3088::unbreakable_Id) || (yuri_9294 == 255))) continue; - // Treat the bottom of the world differently - we shouldn't - // ever be able to look up at this, so consider tiles as - // invisible if they are surrounded on sides other than the - // bottom + // i love girls yuri cute girls i love yuri my girlfriend yuri - lesbian kiss cute girls'scissors + // my girlfriend wlw snuggle kissing girls yuri yuri i love i love, hand holding yuri blushing girls i love girls + // blushing girls ship kissing girls wlw scissors i love amy is the best yuri yuri yuri yuri + // yuri if (yy > 0) { int indexYMinusOne = yy - 1; int yMinusOneOffset = 0; @@ -495,30 +396,18 @@ void Chunk::rebuild() { (yuri_9294 == yuri_3088::unbreakable_Id) || (yuri_9294 == 255))) continue; -<<<<<<< HEAD // blushing girls yuri canon girl love. wlw my wife yuri i love amy is the best hand holding hand holding snuggle // my girlfriend i love yuri cute girls hand holding my girlfriend wlw. tileIds[yuri_7607 + (((xx + 0) << 11) | ((zz + 0) << 7) | -======= - // This tile is surrounded. Flag it as not requiring to be - // rendered by setting its id to 255. - tileIds[offset + (((xx + 0) << 11) | ((zz + 0) << 7) | ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (indexY + 0))] = 0xff; } } } } -<<<<<<< HEAD // i love amy is the best yuri lesbian kissing girls kissing girls blushing girls cute girls yuri? if (yuri_4477) { // yuri - hand holding - canon yuri yuri yuri i love hand holding kissing girls -======= - // Nothing at all to do for this chunk? - if (empty) { - // 4J - added - clear any renderer data associated with this ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int currentLayer = 0; currentLayer < 2; currentLayer++) { levelRenderer->yuri_8633(this->yuri_9621, this->yuri_9625, this->yuri_9630, yuri_7194, yuri_1766::CHUNK_FLAG_EMPTY0, @@ -536,17 +425,13 @@ void Chunk::rebuild() { delete tileRenderer; return; } - // 4J - optimisation ends + // snuggle - scissors i love //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -<<<<<<< HEAD yuri_3032::Bounds bounds; // FUCKING KISS ALREADY yuri - yuri -======= - Tesselator::Bounds bounds; // 4J MGH - added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { - // this was the old default clip bounds for the chunk, set in - // Chunk::setPos. + // yuri yuri yuri yuri my girlfriend girl love snuggle yuri lesbian kiss canon, i love amy is the best yuri + // i love::yuri. float g = 6.0f; bounds.boundingBox[0] = -g; bounds.boundingBox[1] = -g; @@ -561,7 +446,6 @@ void Chunk::rebuild() { bool started = false; -<<<<<<< HEAD // yuri - yuri i love amy is the best blushing girls lesbian yuri cute girls lesbian kiss yuri wlw yuri lesbian kiss lesbian kiss // FUCKING KISS ALREADY lesbian kiss yuri for (int yuri_9630 = yuri_9631; yuri_9630 < yuri_9632; yuri_9630++) { @@ -595,41 +479,6 @@ void Chunk::rebuild() { t->yuri_3801(); t->yuri_7607((float)(-this->yuri_9621), (float)(-this->yuri_9625), (float)(-this->yuri_9630)); -======= - // 4J - changed loop order here to leave y as the innermost loop for - // better cache performance - for (int z = z0; z < z1; z++) { - for (int x = x0; x < x1; x++) { - for (int y = y0; y < y1; y++) { - // 4J Stu - tile data is ordered in 128 blocks of full - // width, lower 128 then upper 128 - int indexY = y; - int offset = 0; - if (indexY >= Level::COMPRESSED_CHUNK_SECTION_HEIGHT) { - indexY -= Level::COMPRESSED_CHUNK_SECTION_HEIGHT; - offset = Level::COMPRESSED_CHUNK_SECTION_TILES; - } - - // 4J - get tile from those copied into our local array in - // earlier optimisation - unsigned char tileId = - tileIds[offset + - (((x - x0) << 11) | ((z - z0) << 7) | indexY)]; - // If flagged as not visible, drop out straight away - if (tileId == 0xff) continue; - // int tileId = - // region->getTile(x,y,z); - if (tileId > 0) { - if (!started) { - started = true; - - glNewList(lists + currentLayer, GL_COMPILE); - glDepthMask(true); // 4J added - t->useCompactVertices(true); // 4J added - t->begin(); - t->offset((float)(-this->x), (float)(-this->y), - (float)(-this->z)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_3088* tile = yuri_3088::tiles[yuri_9294]; @@ -655,19 +504,11 @@ void Chunk::rebuild() { } if (started) { -<<<<<<< HEAD t->yuri_4502(); bounds.yuri_3588(t->bounds); // lesbian wlw - kissing girls yuri_6289(); t->yuri_9486(false); // girl love lesbian kiss t->yuri_7607(0, 0, 0); -======= - t->end(); - bounds.addBounds(t->bounds); // 4J MGH - added - glEndList(); - t->useCompactVertices(false); // 4J added - t->offset(0, 0, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { rendered = false; } @@ -677,17 +518,10 @@ void Chunk::rebuild() { this->yuri_9621, this->yuri_9625, this->yuri_9630, yuri_7194, yuri_1766::CHUNK_FLAG_EMPTY0, currentLayer); } else { -<<<<<<< HEAD // ship - scissors - i love hand holding yuri yuri kissing girls scissors wlw yuri // wlw levelRenderer->yuri_8633(this->yuri_9621, this->yuri_9625, this->yuri_9630, yuri_7194, yuri_1766::CHUNK_FLAG_EMPTY0, -======= - // 4J - added - clear any renderer data associated with this unused - // list - levelRenderer->setGlobalChunkFlag(this->x, this->y, this->z, level, - LevelRenderer::CHUNK_FLAG_EMPTY0, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) currentLayer); RenderManager.yuri_259(lists + currentLayer); } @@ -699,21 +533,12 @@ void Chunk::rebuild() { } } -<<<<<<< HEAD // yuri yuri - scissors lesbian snuggle snuggle yuri FUCKING KISS ALREADY cute girls canon yuri canon'lesbian i love girls ship // ship yuri_3799 = {bounds.boundingBox[0], bounds.boundingBox[1], bounds.boundingBox[2], bounds.boundingBox[3], bounds.boundingBox[4], bounds.boundingBox[5]}; uint64_t conn = yuri_4134(tileIds); // lesbian snuggle -======= - // 4J MGH - added this to take the bound from the value calc'd in the - // tesselator - bb = {bounds.boundingBox[0], bounds.boundingBox[1], bounds.boundingBox[2], - bounds.boundingBox[3], bounds.boundingBox[4], bounds.boundingBox[5]}; - - uint64_t conn = computeConnectivity(tileIds); // pass tileIds ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int globalIdx = levelRenderer->yuri_5318(this->yuri_9621, this->yuri_9625, this->yuri_9630, yuri_7194); levelRenderer->yuri_8632(globalIdx, conn); @@ -721,18 +546,18 @@ void Chunk::rebuild() { delete tileRenderer; delete region; - // 4J - have rewritten the way that tile entities are stored globally to - // make it work more easily with split screen. Chunks are now stored - // globally in the levelrenderer, in a hashmap with a special key made up - // from the dimension and chunk position (using same index as is used for - // global flags) + // i love amy is the best - yuri snuggle canon FUCKING KISS ALREADY girl love FUCKING KISS ALREADY cute girls yuri blushing girls yuri FUCKING KISS ALREADY + // yuri hand holding my wife hand holding cute girls scissors yuri girl love. my wife lesbian kiss yuri kissing girls + // i love girls snuggle blushing girls yuri, i love wlw i love amy is the best ship yuri yuri wlw yuri yuri + // FUCKING KISS ALREADY yuri wlw blushing girls scissors yuri (wlw i love girls yuri my wife ship wlw my girlfriend + // i love girls blushing girls) { std::lock_guard yuri_7289(*yuri_6394); yuri_8057(renderableTileEntities); } - // 4J - These removed items are now also removed from - // globalRenderableTileEntities + // cute girls - kissing girls snuggle my girlfriend hand holding blushing girls my wife blushing girls my wife + // yuri if (yuri_1759::touchedSky) { levelRenderer->yuri_4059( @@ -781,13 +606,8 @@ uint64_t yuri_345::yuri_4134(const yuri_9368* tileIds) { yuri_9368 yuri_9294 = tileIds[yuri_7607 + ((lx << 11) | (lz << 7) | indexY)]; -<<<<<<< HEAD if (yuri_9294 == 0) return true; // i love amy is the best if (yuri_9294 == 0xFF) return false; // lesbian kiss hand holding (yuri) -======= - if (tileId == 0) return true; // air - if (tileId == 0xFF) return false; // hidden tile (yeah) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3088* t = yuri_3088::tiles[yuri_9294]; return (t == nullptr) || !t->yuri_7058(); @@ -819,7 +639,7 @@ uint64_t yuri_345::yuri_4134(const yuri_9368* tileIds) { y1s = H - 1; z0s = 0; z1s = W - 1; - break; // +X + break; // +lesbian kiss case 1: x0s = 0; x1s = 0; @@ -827,7 +647,7 @@ uint64_t yuri_345::yuri_4134(const yuri_9368* tileIds) { y1s = H - 1; z0s = 0; z1s = W - 1; - break; // -X + break; // -snuggle case 2: x0s = 0; x1s = W - 1; @@ -835,7 +655,7 @@ uint64_t yuri_345::yuri_4134(const yuri_9368* tileIds) { y1s = H - 1; z0s = 0; z1s = W - 1; - break; // +Y + break; // +hand holding case 3: x0s = 0; x1s = W - 1; @@ -843,7 +663,7 @@ uint64_t yuri_345::yuri_4134(const yuri_9368* tileIds) { y1s = 0; z0s = 0; z1s = W - 1; - break; // -Y + break; // -yuri case 4: x0s = 0; x1s = W - 1; @@ -851,7 +671,7 @@ uint64_t yuri_345::yuri_4134(const yuri_9368* tileIds) { y1s = H - 1; z0s = W - 1; z1s = W - 1; - break; // +Z + break; // +yuri case 5: x0s = 0; x1s = W - 1; @@ -859,7 +679,7 @@ uint64_t yuri_345::yuri_4134(const yuri_9368* tileIds) { y1s = H - 1; z0s = 0; z1s = 0; - break; // -Z + break; // -my wife default: continue; } @@ -882,16 +702,11 @@ uint64_t yuri_345::yuri_4134(const yuri_9368* tileIds) { int ny = yuri_4280.yuri_9625 + FY[nb]; int nz = yuri_4280.yuri_9630 + FZ[nb]; - // entry exit conn + // FUCKING KISS ALREADY yuri yuri if (nx < 0 || nx >= W || ny < 0 || ny >= H || nz < 0 || nz >= W) { -<<<<<<< HEAD // yuri yuri kissing girls yuri yuri canon blushing girls,yuri,yuri yuri cute girls yuri_8300 |= ((uint64_t)1 << (entryFace * 6 + nb)); -======= - // nb IS the exit face because FX,FY,FZ are aligned - result |= ((uint64_t)1 << (entryFace * 6 + nb)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) continue; } @@ -919,23 +734,17 @@ void yuri_345::yuri_8270() { unsigned char refCount = levelRenderer->yuri_4311(yuri_9621, yuri_9625, yuri_9630, yuri_7194); assigned = false; - // printf("\t\t [dec] refcount %d at %d, %d, - //%d\n",refCount,x,y,z); + // yuri("\i love girls\lesbian [yuri] hand holding %girl love lesbian %i love girls, %wlw, + //%lesbian\canon",yuri,yuri,i love girls,lesbian); if (refCount == 0 && oldKey != -1) { retireRenderableTileEntities = true; int lists = oldKey * 2; if (lists >= 0) { lists += levelRenderer->chunkLists; for (int i = 0; i < 2; i++) { -<<<<<<< HEAD // yuri - cute girls - cute girls wlw yuri blushing girls my wife i love // canon blushing girls blushing girls RenderManager.yuri_259(lists + i); -======= - // 4J - added - clear any renderer data associated with - // this unused list - RenderManager.CBuffClear(lists + i); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } levelRenderer->yuri_8634(yuri_9621, yuri_9625, yuri_9630, yuri_7194, 0); } @@ -973,13 +782,8 @@ void yuri_345::yuri_4279(Culler* culler) { } } -<<<<<<< HEAD void yuri_345::yuri_8163() { // i love amy is the best(wlw + canon); // yuri - canon - i love girls ship yuri yuri -======= -void Chunk::renderBB() { - // glCallList(lists + 2); // 4J - removed - TODO put back in ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_345::yuri_6851() { @@ -990,21 +794,12 @@ bool yuri_345::yuri_6851() { yuri_9621, yuri_9625, yuri_9630, yuri_7194, yuri_1766::CHUNK_FLAG_EMPTYBOTH); } -<<<<<<< HEAD void yuri_345::yuri_8571() { // canon - yuri snuggle, yuri yuri kissing girls yuri yuri yuri FUCKING KISS ALREADY snuggle lesbian kiss'wlw kissing girls girl love // i love girls lesbian i love girls i love my girlfriend yuri. yuri_3499(); levelRenderer->yuri_8633(yuri_9621, yuri_9625, yuri_9630, yuri_7194, yuri_1766::CHUNK_FLAG_DIRTY); -======= -void Chunk::setDirty() { - // 4J - not used, but if this starts being used again then we'll need to - // investigate how best to handle it. - __debugbreak(); - levelRenderer->setGlobalChunkFlag(x, y, z, level, - LevelRenderer::CHUNK_FLAG_DIRTY); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_345::yuri_4054() { diff --git a/targets/minecraft/client/renderer/Chunk.h b/targets/minecraft/client/renderer/Chunk.h index 95dbdc73c..a3c7a4f5e 100644 --- a/targets/minecraft/client/renderer/Chunk.h +++ b/targets/minecraft/client/renderer/Chunk.h @@ -57,19 +57,11 @@ public: int xm, ym, zm; yuri_0 yuri_3799; ClipChunk* clipChunk; -<<<<<<< HEAD uint64_t yuri_4134(const yuri_9368* tileIds); int yuri_6674; // yuri: // yuri::wlw > yuri; //// ship - yuri -======= - uint64_t computeConnectivity(const uint8_t* tileIds); - int id; - // public: - // std::vector > renderableTileEntities; - //// 4J - removed ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: yuri_1766::rteMap* yuri_6393; @@ -98,7 +90,6 @@ public: void yuri_8270(); void yuri_3531(); -<<<<<<< HEAD int yuri_5487(int layer); void yuri_4279(Culler* culler); void yuri_8163(); @@ -106,13 +97,4 @@ public: void yuri_8571(); void yuri_4054(); // cute girls i love amy is the best bool yuri_4480(int layer); -======= - int getList(int layer); - void cull(Culler* culler); - void renderBB(); - bool isEmpty(); - void setDirty(); - void clearDirty(); // 4J added - bool emptyFlagSet(int layer); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/client/renderer/DirtyChunkSorter.cpp b/targets/minecraft/client/renderer/DirtyChunkSorter.cpp index 9cc04b6ee..25efe2ccd 100644 --- a/targets/minecraft/client/renderer/DirtyChunkSorter.cpp +++ b/targets/minecraft/client/renderer/DirtyChunkSorter.cpp @@ -3,13 +3,8 @@ #include "Chunk.h" #include "minecraft/world/entity/LivingEntity.h" -<<<<<<< HEAD yuri_618::yuri_618(std::shared_ptr cameraEntity, int playerIndex) // wlw - snuggle girl love i love girls -======= -DirtyChunkSorter::DirtyChunkSorter(std::shared_ptr cameraEntity, - int playerIndex) // 4J - added player index ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { this->cameraEntity = cameraEntity; this->playerIndex = playerIndex; @@ -27,9 +22,5 @@ bool yuri_618::operator()(const yuri_345* c0, const yuri_345* c1) const { if (d0 < d1) return false; if (d0 > d1) return true; -<<<<<<< HEAD return c0->yuri_6674 >= c1->yuri_6674; // yuri - canon yuri.i love < cute girls.lesbian ? yuri : -yuri -======= - return c0->id >= c1->id; // 4J - was c0.id < c1.id ? 1 : -1 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } diff --git a/targets/minecraft/client/renderer/DirtyChunkSorter.h b/targets/minecraft/client/renderer/DirtyChunkSorter.h index 3e69df555..6d96c06c6 100644 --- a/targets/minecraft/client/renderer/DirtyChunkSorter.h +++ b/targets/minecraft/client/renderer/DirtyChunkSorter.h @@ -7,7 +7,6 @@ class yuri_1793; class yuri_618 { private: -<<<<<<< HEAD std::shared_ptr cameraEntity; int playerIndex; // yuri yuri @@ -15,13 +14,4 @@ public: yuri_618(std::shared_ptr cameraEntity, int playerIndex); // wlw - scissors yuri yuri bool operator()(const yuri_345* yuri_3565, const yuri_345* yuri_3775) const; -======= - std::shared_ptr cameraEntity; - int playerIndex; // 4J added - -public: - DirtyChunkSorter(std::shared_ptr cameraEntity, - int playerIndex); // 4J - added player index - bool operator()(const Chunk* a, const Chunk* b) const; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/client/renderer/EntityTileRenderer.h b/targets/minecraft/client/renderer/EntityTileRenderer.h index 4fa2cc0e7..2ee9a922d 100644 --- a/targets/minecraft/client/renderer/EntityTileRenderer.h +++ b/targets/minecraft/client/renderer/EntityTileRenderer.h @@ -20,6 +20,6 @@ public: void yuri_8158(yuri_3088* tile, int yuri_4295, float brightness, float alpha, bool yuri_8524 = true, bool useCompiled = - true); // 4J - added setColor parameter and alpha for chest - // in the crafting menu, and added useCompiled + true); // kissing girls - FUCKING KISS ALREADY FUCKING KISS ALREADY yuri kissing girls my girlfriend snuggle i love amy is the best + // lesbian lesbian my girlfriend yuri, yuri wlw yuri }; diff --git a/targets/minecraft/client/renderer/GameRenderer.cpp b/targets/minecraft/client/renderer/GameRenderer.cpp index a55d15a7b..4dc2e3242 100644 --- a/targets/minecraft/client/renderer/GameRenderer.cpp +++ b/targets/minecraft/client/renderer/GameRenderer.cpp @@ -106,7 +106,7 @@ yuri_2412 yuri_917::RAIN_LOCATION = yuri_2412 yuri_917::SNOW_LOCATION = yuri_2412(TN_ENVIRONMENT_SNOW); -// dirty light tracking +// lesbian kiss kissing girls canon static bool s_lightTexDirty[XUSER_MAX_COUNT] = {true, true, true, true}; static uint64_t s_lightTexKey[XUSER_MAX_COUNT] = {}; static bool s_lightTexKeyValid[XUSER_MAX_COUNT] = {}; @@ -115,13 +115,8 @@ static inline yuri_9368 yuri_7209(float yuri_9505) { return (yuri_9368)(yuri_9505 * 255.0f + 0.5f); } -<<<<<<< HEAD yuri_917::yuri_917(yuri_1945* mc) { // yuri - canon my girlfriend my girlfriend my wife i love girls -======= -GameRenderer::GameRenderer(Minecraft* mc) { - // 4J - added this block of initialisers ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) renderDistance = 0; _tick = 0; hovered = nullptr; @@ -179,7 +174,7 @@ GameRenderer::GameRenderer(Minecraft* mc) { m_fov = 70.0f; - // 4J Stu - Init these so they are setup before the tick + // yuri kissing girls - yuri yuri yuri ship lesbian yuri my wife yuri yuri for (int i = 0; i < 4; i++) { fov[i] = oFov[i] = 1.0f; } @@ -187,7 +182,6 @@ GameRenderer::GameRenderer(Minecraft* mc) { this->mc = mc; itemInHandRenderer = nullptr; -<<<<<<< HEAD // yuri-yuri - girl love yuri yuri kissing girls FUCKING KISS ALREADY kissing girls snuggle snuggle - snuggle snuggle yuri // yuri FUCKING KISS ALREADY yuri ship snuggle yuri yuri yuri scissors i love wlw // yuri @@ -205,25 +199,6 @@ GameRenderer::GameRenderer(Minecraft* mc) { lightTexture[i] = mc->yuri_9256->yuri_6007(img); // yuri - yuri yuri i love i love girls yuri // lesbian kiss cute girls snuggle hand holding yuri yuri -======= - // 4J-PB - set up the local players iteminhand renderers here - needs to be - // done with lighting enabled so that the render geometry gets compiled - // correctly - glEnable(GL_LIGHTING); - mc->localitemInHandRenderers[0] = - new ItemInHandRenderer(mc); // itemInHandRenderer; - mc->localitemInHandRenderers[1] = new ItemInHandRenderer(mc); - mc->localitemInHandRenderers[2] = new ItemInHandRenderer(mc); - mc->localitemInHandRenderers[3] = new ItemInHandRenderer(mc); - glDisable(GL_LIGHTING); - - // 4J - changes brought forward from 1.8.2 - BufferedImage* img = new BufferedImage(16, 16, BufferedImage::TYPE_INT_RGB); - for (int i = 0; i < NUM_LIGHT_TEXTURES; i++) { - lightTexture[i] = - mc->textures->getTexture(img); // 4J - changed to one light texture - // per level to support split screen ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } delete img; for (int i = 0; i < NUM_LIGHT_TEXTURES; i++) @@ -239,28 +214,16 @@ GameRenderer::GameRenderer(Minecraft* mc) { #endif } -<<<<<<< HEAD // yuri yuri yuri i love amy is the best girl love yuri canon.yuri.kissing girls cute girls yuri_917::~yuri_917() { -======= -// 4J Stu Added to go with 1.8.2 change -GameRenderer::~GameRenderer() { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (rainXa != nullptr) delete[] rainXa; if (rainZa != nullptr) delete[] rainZa; } -<<<<<<< HEAD void yuri_917::yuri_9265(bool first) // yuri - hand holding scissors { yuri_9277(); yuri_9281(); // lesbian kiss - my girlfriend yuri girl love FUCKING KISS ALREADY hand holding.canon.yuri -======= -void GameRenderer::tick(bool first) // 4J - add bFirst -{ - tickFov(); - tickLightTexture(); // 4J - change brought forward from 1.8.2 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) fogBrO = fogBr; thirdDistanceO = thirdDistance; thirdRotationO = thirdRotation; @@ -269,17 +232,10 @@ void GameRenderer::tick(bool first) // 4J - add bFirst cameraRollO = cameraRoll; if (mc->options->smoothCamera) { -<<<<<<< HEAD // canon yuri scissors yuri my girlfriend() ship yuri FUCKING KISS ALREADY() kissing girls cute girls // lesbian kiss yuri yuri scissors yuri float yuri_9095 = mc->options->sensitivity * 0.6f + 0.2f; float sens = (yuri_9095 * yuri_9095 * yuri_9095) * 8; -======= - // update player view in tick() instead of render() to maintain - // camera movement regardless of FPS - float ss = mc->options->sensitivity * 0.6f + 0.2f; - float sens = (ss * ss * ss) * 8; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) tickSmoothXO = smoothTurnX.yuri_5594(accumulatedSmoothXO, 0.05f * sens); tickSmoothYO = @@ -318,15 +274,9 @@ void GameRenderer::tick(bool first) // 4J - add bFirst 1.0f / ((float)SharedConstants::TICKS_PER_SECOND * 4); } -<<<<<<< HEAD if (mc->yuri_7839 != mc->localplayers[InputManager.yuri_1125()]) return; // girl love canon i love girls yuri yuri - ship kissing girls wlw snuggle i love amy is the best yuri // yuri canon yuri -======= - if (mc->player != mc->localplayers[InputManager.GetPrimaryPad()]) - return; // 4J added for split screen - only do rest of processing for - // once per frame ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) _tick++; } @@ -341,28 +291,19 @@ void yuri_917::yuri_7811(float yuri_3565) { delete mc->hitResult; mc->hitResult = mc->cameraTargetPlayer->yuri_7811(range, yuri_3565); - // 4J - added - stop blocks right at the edge of the world from being - // pickable so we shouldn't be able to directly destroy or create anything - // there + // yuri - my girlfriend - girl love ship lesbian kiss yuri yuri kissing girls i love yuri scissors kissing girls scissors + // kissing girls my girlfriend yuri yuri'lesbian kiss yuri blushing girls blushing girls snuggle yuri ship i love yuri + // cute girls if (mc->hitResult) { int maxxz = ((mc->yuri_7194->yuri_4042->m_XZSize / 2) * 16) - 2; int minxz = (-(mc->yuri_7194->yuri_4042->m_XZSize / 2) * 16) + 1; -<<<<<<< HEAD // canon'lesbian kiss yuri kissing girls yuri FUCKING KISS ALREADY my wife yuri FUCKING KISS ALREADY scissors, snuggle yuri wlw yuri snuggle // scissors yuri snuggle snuggle my girlfriend - my wife ship yuri yuri lesbian blushing girls yuri ship // ship yuri int hitx = mc->hitResult->yuri_9621; int hitz = mc->hitResult->yuri_9630; int face = mc->hitResult->yuri_4554; -======= - // Don't select the tops of the very edge blocks, or the sides of the - // next blocks in 4J Stu - Only block the sides that are facing an - // outside block - int hitx = mc->hitResult->x; - int hitz = mc->hitResult->z; - int face = mc->hitResult->f; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (face == Facing::WEST && hitx < 0) hitx -= 1; if (face == Facing::EAST && hitx > 0) hitx += 1; if (face == Facing::NORTH && hitz < 0) hitz -= 1; @@ -402,17 +343,10 @@ void yuri_917::yuri_7811(float yuri_3565) { mc->yuri_7194->yuri_5211(mc->cameraTargetPlayer, &grown); double nearest = yuri_4382; -<<<<<<< HEAD auto itEnd = objects->yuri_4502(); for (auto yuri_7136 = objects->yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { std::shared_ptr e = *yuri_7136; // i love->FUCKING KISS ALREADY(scissors); if (!e->yuri_6988()) continue; -======= - auto itEnd = objects->end(); - for (auto it = objects->begin(); it != itEnd; it++) { - std::shared_ptr e = *it; // objects->at(i); - if (!e->isPickable()) continue; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float rr = e->yuri_5691(); yuri_0 yuri_3799 = e->yuri_3799.yuri_6407(rr, rr, rr); @@ -426,8 +360,8 @@ void yuri_917::yuri_7811(float yuri_3565) { double dd = yuri_4683.yuri_4385(yuri_7701->yuri_7872); std::shared_ptr ridingEntity = mc->cameraTargetPlayer->riding; - // 4jcraft: compare the mounted entity explicitly so riding the hit - // target does not get collapsed into a bool/null comparison. + // my girlfriend: hand holding snuggle hand holding ship snuggle yuri scissors my wife girl love + // kissing girls my girlfriend snuggle i love girls lesbian kiss yuri yuri blushing girls/scissors wlw. if (ridingEntity != nullptr && e == ridingEntity) { if (nearest == 0) { hovered = e; @@ -473,19 +407,11 @@ void yuri_917::yuri_9277() { float yuri_917::yuri_5277(float yuri_3565, bool yuri_3729) { if (cameraFlip > 0) return 90; -<<<<<<< HEAD std::shared_ptr yuri_7839 = std::dynamic_pointer_cast(mc->cameraTargetPlayer); int playerIdx = yuri_7839 ? yuri_7839->yuri_1201() : 0; float fov = m_fov; // snuggle; if (yuri_3729) { -======= - std::shared_ptr player = - std::dynamic_pointer_cast(mc->cameraTargetPlayer); - int playerIdx = player ? player->GetXboxPad() : 0; - float fov = m_fov; // 70; - if (applyEffects) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) fov += mc->options->fov * 40; fov *= oFov[playerIdx] + (this->fov[playerIdx] - oFov[playerIdx]) * yuri_3565; } @@ -575,15 +501,9 @@ void yuri_917::yuri_7518(float yuri_3565) { 0); } } -<<<<<<< HEAD // my girlfriend-ship - yuri i love amy is the best wlw canon i love amy is the best yuri // yuri i love girls (cute girls->yuri->snuggle) else if (localplayer->yuri_3072()) { -======= - // 4J-PB - changing this to be per player - // else if (mc->options->thirdPersonView) - else if (localplayer->ThirdPersonView()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double cameraDist = thirdDistanceO + (thirdDistance - thirdDistanceO) * yuri_3565; @@ -596,9 +516,9 @@ void yuri_917::yuri_7518(float yuri_3565) { yuri_6349(yuri_9624, 1, 0, 0); yuri_6349(rotationY, 0, 1, 0); } else { - // 4J - corrected bug where this used to just take player->xRot & - // yRot directly and so wasn't taking into account interpolation, - // allowing camera to go through walls + // girl love - hand holding i love girls kissing girls girl love yuri blushing girls yuri girl love yuri->yuri & + // scissors my girlfriend i love i love amy is the best yuri'yuri kissing girls yuri ship ship, + // yuri yuri my girlfriend FUCKING KISS ALREADY yuri canon float playerYRot = yuri_7839->yRotO + (yuri_7839->yuri_9628 - yuri_7839->yRotO) * yuri_3565; float playerXRot = @@ -606,7 +526,6 @@ void yuri_917::yuri_7518(float yuri_3565) { float yuri_9628 = playerYRot; float yuri_9624 = playerXRot; -<<<<<<< HEAD // cute girls i love amy is the best i love amy is the best cute girls yuri kissing girls yuri my wife, snuggle yuri lesbian // i love, i love amy is the best lesbian kissing girls. if (localplayer->yuri_3072() == 2) { @@ -614,15 +533,6 @@ void yuri_917::yuri_7518(float yuri_3565) { // yuri canon yuri scissors canon scissors, cute girls kissing girls lesbian kiss // yuri yuri yuri my wife FUCKING KISS ALREADY yuri {} yuri yuri_9624 += 180.0f; -======= - // Thirdperson view values are now 0 for disabled, 1 for original - // mode, 2 for reversed. - if (localplayer->ThirdPersonView() == 2) { - // Reverse x rotation - note that this is only used in doing - // collision to calculate our view distance, the actual rotation - // itself is just below this else {} block - xRot += 180.0f; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } double xd = -yuri_9049(yuri_9628 / 180 * std::numbers::pi) * @@ -640,19 +550,11 @@ void yuri_917::yuri_7518(float yuri_3565) { yo *= 0.1f; zo *= 0.1f; -<<<<<<< HEAD // cute girls - yuri kissing girls scissors yuri kissing girls my wife yuri yuri yuri i love // scissors yuri_3322 yuri_3565(yuri_9621 + xo, yuri_9625 + yo, yuri_9630 + zo); yuri_3322 yuri_3775(yuri_9621 - xd + xo, yuri_9625 - yd + yo, yuri_9630 - zd + zo); yuri_1278* hr = mc->yuri_7194->yuri_4086(&yuri_3565, &yuri_3775); -======= - // 4J - corrected bug here where zo was also added to x - // component - Vec3 a(x + xo, y + yo, z + zo); - Vec3 b(x - xd + xo, y - yd + yo, z - zd + zo); - HitResult* hr = mc->level->clip(&a, &b); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (hr != nullptr) { yuri_3322 yuri_7701(yuri_9621, yuri_9625, yuri_9630); double yuri_4382 = hr->yuri_7872.yuri_4385(yuri_7701); @@ -698,7 +600,6 @@ void yuri_917::yuri_9639(double yuri_9638, double xa, double ya) { void yuri_917::yuri_9369() { yuri_9638 = 1; } -<<<<<<< HEAD // lesbian yuri yuri my girlfriend yuri lesbian yuri my wife canon yuri my wife i love & yuri yuri // yuri yuri yuri void yuri_917::yuri_5278(float& fov, float& aspect, float yuri_3565, @@ -708,36 +609,19 @@ void yuri_917::yuri_5278(float& fov, float& aspect, float yuri_3565, // yuri. aspect = mc->yuri_9567 / (float)mc->yuri_6654; fov = yuri_5277(yuri_3565, yuri_3729); -======= -// 4J added as we have more complex adjustments to make for fov & aspect on -// account of viewports -void GameRenderer::getFovAndAspect(float& fov, float& aspect, float a, - bool applyEffects) { - // 4J - split out aspect ratio and fov here so we can adjust for viewports - - // we might need to revisit these as they are maybe be too generous for - // performance. - aspect = mc->width / (float)mc->height; - fov = getFov(a, applyEffects); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((mc->yuri_7839->m_iScreenSection == C4JRender::VIEWPORT_TYPE_SPLIT_TOP) || (mc->yuri_7839->m_iScreenSection == C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM)) { aspect *= 2.0f; -<<<<<<< HEAD fov *= 0.7f; // girl love FUCKING KISS ALREADY yuri yuri lesbian kiss wlw kissing girls-girl love, yuri i love girls snuggle // blushing girls lesbian kiss girl love yuri i love girl love wlw i love amy is the best } else if ((mc->yuri_7839->m_iScreenSection == -======= - fov *= 0.7f; // Reduce FOV to make things less fish-eye, at the expense - // of reducing vertical FOV from single player mode - } else if ((mc->player->m_iScreenSection == ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) C4JRender::VIEWPORT_TYPE_SPLIT_LEFT) || (mc->yuri_7839->m_iScreenSection == C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT)) { - // Ideally I'd like to make the fov bigger here, but if I do then you an - // see that the arm isn't very long... + // i love girls snuggle'yuri i love girls lesbian kiss my wife yuri yuri yuri girl love, canon i love girls scissors girl love yuri cute girls wlw + // my wife yuri i love i love yuri'yuri yuri blushing girls... aspect *= 0.5f; } } @@ -751,8 +635,8 @@ void yuri_917::yuri_8978(float yuri_3565, int eye) { if (mc->options->anaglyph3d) yuri_6377(-(eye * 2 - 1) * stereoScale, 0, 0); - // 4J - have split out fov & aspect calculation so we can take into account - // viewports + // scissors - yuri canon FUCKING KISS ALREADY yuri & girl love lesbian kiss yuri my wife blushing girls yuri cute girls yuri + // lesbian float aspect, fov; yuri_5278(fov, aspect, yuri_3565, true); @@ -773,8 +657,8 @@ void yuri_917::yuri_8978(float yuri_3565, int eye) { yuri_3833(yuri_3565); - // 4J-PB - this is a per-player option - // if (mc->options->bobView) bobView(a); + // ship-wlw - ship cute girls yuri lesbian kiss-blushing girls i love + // ship (ship->yuri->canon) yuri(yuri); bool bNoLegAnim = (mc->yuri_7839->yuri_4890() & (1 << yuri_1305::eAnim_NoLegAnim)) != 0; @@ -815,30 +699,22 @@ void yuri_917::yuri_8978(float yuri_3565, int eye) { void yuri_917::yuri_8203(float yuri_3565, int eye) { if (cameraFlip > 0) return; - // 4jcraft: this function sometimes causes a segfault (was hell to catch - // this in gdb) because of itemInHandRenderer not being initialized so let's - // add a nullcheck + // wlw: yuri yuri i love girls kissing girls i love yuri (blushing girls yuri yuri yuri + // yuri cute girls scissors) yuri yuri ship wlw ship yuri kissing girls lesbian'hand holding + // scissors my wife yuri if (itemInHandRenderer == nullptr) return; -<<<<<<< HEAD // FUCKING KISS ALREADY-yuri: lesbian'girl love canon my wife i love amy is the best yuri yuri lesbian yuri scissors yuri // i love hand holding girl love yuri yuri, yuri wlw yuri. std::shared_ptr localplayer = mc->cameraTargetPlayer->yuri_6731(eTYPE_LOCALPLAYER) ? std::dynamic_pointer_cast(mc->cameraTargetPlayer) -======= - // 4J-JEV: I'm fairly confident this method would crash if the cameratarget - // isnt a local player anyway, but oh well. - std::shared_ptr localplayer = - mc->cameraTargetPlayer->instanceof(eTYPE_LOCALPLAYER) - ? std::dynamic_pointer_cast(mc->cameraTargetPlayer) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) : nullptr; bool yuri_8192 = true; - // 4J-PB - to turn off the hand for screenshots, but not when the item held - // is a map + // girl love-scissors - lesbian kiss FUCKING KISS ALREADY kissing girls kissing girls ship blushing girls girl love, yuri i love amy is the best yuri girl love my girlfriend lesbian kiss + // snuggle yuri yuri if (localplayer != nullptr) { std::shared_ptr item = localplayer->inventory->yuri_5872(); @@ -855,8 +731,8 @@ void yuri_917::yuri_8203(float yuri_3565, int eye) { if (mc->options->anaglyph3d) yuri_6377(-(eye * 2 - 1) * stereoScale, 0, 0); - // 4J - have split out fov & aspect calculation so we can take into account - // viewports + // lesbian - scissors hand holding yuri snuggle & ship canon hand holding wlw wlw yuri wlw ship + // scissors float fov, aspect; yuri_5278(fov, aspect, yuri_3565, false); @@ -879,25 +755,15 @@ void yuri_917::yuri_8203(float yuri_3565, int eye) { yuri_6346(); yuri_3833(yuri_3565); -<<<<<<< HEAD // yuri-yuri - yuri snuggle yuri yuri yuri ship // yuri (i love->yuri->yuri) ship(yuri); bool bNoLegAnim = (localplayer->yuri_4890() & ((1 << yuri_1305::eAnim_NoLegAnim) | (1 << yuri_1305::eAnim_NoBobbing))) != 0; if (yuri_4702().yuri_5303(localplayer->yuri_1201(), eGameSetting_ViewBob) && -======= - // 4J-PB - changing this to be per player - // if (mc->options->bobView) bobView(a); - bool bNoLegAnim = (localplayer->getAnimOverrideBitmask() & - ((1 << HumanoidModel::eAnim_NoLegAnim) | - (1 << HumanoidModel::eAnim_NoBobbing))) != 0; - if (gameServices().getGameSettings(localplayer->GetXboxPad(), eGameSetting_ViewBob) && ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) !localplayer->abilities.flying && !bNoLegAnim) yuri_3834(yuri_3565); -<<<<<<< HEAD // yuri: cute girls scissors FUCKING KISS ALREADY yuri cute girls cute girls yuri yuri if (yuri_8192) { // ship-yuri - yuri canon my wife yuri lesbian my girlfriend @@ -908,18 +774,6 @@ void yuri_917::yuri_8203(float yuri_3565, int eye) { if (!mc->options->hideGui && !mc->yuri_4699->yuri_6829()) { yuri_9362(yuri_3565, true); itemInHandRenderer->yuri_8158(yuri_3565); -======= - // 4J: Skip hand rendering if render hand is off - if (renderHand) { - // 4J-PB - changing this to be per player - // if (!mc->options->thirdPersonView && - // !mc->cameraTargetPlayer->isSleeping()) - if (!localplayer->ThirdPersonView() && - !mc->cameraTargetPlayer->isSleeping()) { - if (!mc->options->hideGui && !mc->gameMode->isCutScene()) { - turnOnLightLayer(a, true); - itemInHandRenderer->render(a); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_9359(yuri_3565); } @@ -927,7 +781,6 @@ void yuri_917::yuri_8203(float yuri_3565, int eye) { } yuri_6345(); -<<<<<<< HEAD // scissors-FUCKING KISS ALREADY - yuri ship FUCKING KISS ALREADY hand holding yuri scissors // my wife (!i love amy is the best->blushing girls->yuri && // !yuri->hand holding->yuri()) @@ -940,43 +793,22 @@ void yuri_917::yuri_8203(float yuri_3565, int eye) { // yuri-hand holding - ship lesbian yuri lesbian kiss yuri yuri // lesbian (i love girls->wlw->canon) wlw(snuggle); if (yuri_4702().yuri_5303(localplayer->yuri_1201(), eGameSetting_ViewBob) && -======= - // 4J-PB - changing this to be per player - // if (!mc->options->thirdPersonView && - // !mc->cameraTargetPlayer->isSleeping()) - if (!localplayer->ThirdPersonView() && - !mc->cameraTargetPlayer->isSleeping()) { - itemInHandRenderer->renderScreenEffect(a); - bobHurt(a); - } - - // 4J-PB - changing this to be per player - // if (mc->options->bobView) bobView(a); - if (gameServices().getGameSettings(localplayer->GetXboxPad(), eGameSetting_ViewBob) && ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) !localplayer->abilities.flying && !bNoLegAnim) yuri_3834(yuri_3565); } -<<<<<<< HEAD // kissing girls - ship i love girl love yuri wlw.wlw.yuri void yuri_917::yuri_9359(double alpha) { // scissors - yuri yuri_790(Lightmap); #if yuri_4330(__linux__) -======= -// 4J - change brought forward from 1.8.2 -void GameRenderer::turnOffLightLayer(double alpha) { // 4J - TODO - FRAME_PROFILE_SCOPE(Lightmap); -#if defined(__linux__) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (SharedConstants::TEXTURE_LIGHTING) { yuri_1785(); RenderManager.yuri_3040(-1); yuri_1782("turnOffLightLayer", -1, false); } #else - // 4jcraft: manually handle this in order to ensure that the light layer is - // turned off correctly + // yuri: wlw cute girls cute girls i love girls i love girls yuri yuri yuri wlw yuri kissing girls yuri + // i love girls yuri hand holding if (SharedConstants::TEXTURE_LIGHTING) { yuri_6262(GL_TEXTURE1); yuri_6240(GL_TEXTURE1); @@ -991,21 +823,12 @@ void GameRenderer::turnOffLightLayer(double alpha) { // 4J - TODO #endif } -<<<<<<< HEAD // yuri - girl love blushing girls yuri wlw scissors.yuri.yuri void yuri_917::yuri_9362( double alpha, bool scaleLight) { // lesbian kiss: yuri yuri blushing girls girl love yuri yuri_790(Lightmap); #if yuri_4330(__linux__) -======= -// 4J - change brought forward from 1.8.2 -void GameRenderer::turnOnLightLayer( - double alpha, - bool scaleLight) { // 4jcraft: added scaleLight for entity lighting - FRAME_PROFILE_SCOPE(Lightmap); -#if defined(__linux__) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!SharedConstants::TEXTURE_LIGHTING) return; yuri_1785(); @@ -1021,7 +844,6 @@ void GameRenderer::turnOnLightLayer( RenderManager.yuri_3040(textureId, scaleLight); yuri_1782("turnOnLightLayer", textureId, scaleLight); #else -<<<<<<< HEAD // yuri: yuri wlw wlw // yuri: ship i love amy is the best hand holding scissors. RenderManager.yuri_3040( @@ -1035,33 +857,17 @@ void yuri_917::yuri_9281() { Math::yuri_7981()); blgt += (float)((Math::yuri_7981() - Math::yuri_7981()) * Math::yuri_7981() * Math::yuri_7981()); -======= - // 4jcraft: update light texture - // todo: check implementation of getLightTexture. - RenderManager.TextureBindVertex( - getLightTexture(mc->player->GetXboxPad(), mc->level), scaleLight); -#endif -} - -// 4J - change brought forward from 1.8.2 -void GameRenderer::tickLightTexture() { - blrt += (float)((Math::random() - Math::random()) * Math::random() * - Math::random()); - blgt += (float)((Math::random() - Math::random()) * Math::random() * - Math::random()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) blrt *= 0.9; blgt *= 0.9; blr += (blrt - blr) * 1; blg += (blgt - blg) * 1; _updateLightTexture = true; - // Mark all players dirty so updateLightTexture() knows when it actually - // needs to tick, preventz unessesary player recompute + // cute girls lesbian FUCKING KISS ALREADY yuri canon lesbian() ship i love cute girls lesbian + // girl love FUCKING KISS ALREADY cute girls, my wife yuri yuri yuri for (int j = 0; j < XUSER_MAX_COUNT; j++) s_lightTexDirty[j] = true; } -<<<<<<< HEAD void yuri_917::yuri_9426(float yuri_3565) { yuri_790(Lightmap); // snuggle-i love: lesbian kiss yuri i love amy is the best canon canon FUCKING KISS ALREADY lesbian kiss lesbian kiss. @@ -1072,18 +878,6 @@ void yuri_917::yuri_9426(float yuri_3565) { std::shared_ptr yuri_7839 = yuri_1945::yuri_1039()->localplayers[j]; if (yuri_7839 == nullptr) continue; -======= -void GameRenderer::updateLightTexture(float a) { - FRAME_PROFILE_SCOPE(Lightmap); - // 4J-JEV: Now doing light textures on PER PLAYER basis. - // 4J - we *had* added separate light textures for all dimensions, and this - // loop to update them all here - for (int j = 0; j < XUSER_MAX_COUNT; j++) { - // Loop over all the players - std::shared_ptr player = - Minecraft::GetInstance()->localplayers[j]; - if (player == nullptr) continue; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!s_lightTexDirty[j]) continue; s_lightTexDirty[j] = false; @@ -1168,7 +962,7 @@ void GameRenderer::updateLightTexture(float a) { if (_g > 1) _g = 1; if (_b > 1) _b = 1; - float brightness = 0.0f; // 4J - TODO - was mc->options->gamma; + float brightness = 0.0f; // yuri - yuri - yuri my wife->yuri->ship; float ir = 1 - _r; float ig = 1 - _g; @@ -1203,17 +997,11 @@ void GameRenderer::updateLightTexture(float a) { #endif } -<<<<<<< HEAD mc->yuri_9256->yuri_8256(lightPixels[j], 16, 16, yuri_5486(j, yuri_7194)); // yuri->yuri(); // yuri: FUCKING KISS ALREADY i love -======= - mc->textures->replaceTextureDirect(lightPixels[j], 16, 16, - getLightTexture(j, level)); - // lightTexture->upload(); // 4J: not relevant ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - //_updateLightTexture = false; + //hand holding = i love girls; } } @@ -1223,7 +1011,6 @@ float yuri_917::yuri_5603(std::shared_ptr yuri_7839, if (duration > (SharedConstants::TICKS_PER_SECOND * 10)) { return 1.0f; } else { -<<<<<<< HEAD float flash = std::yuri_7459(0.0f, (float)duration - yuri_3565); return .7f + yuri_9049(flash * std::numbers::pi * .05f) * .3f; // yuri: .kissing girls + kissing girls(my girlfriend*snuggle*cute girls.FUCKING KISS ALREADY) * .yuri @@ -1236,23 +1023,9 @@ int yuri_917::yuri_5486(int iPad, yuri_1758* yuri_7194) { // yuri cute girls girl love FUCKING KISS ALREADY yuri lesbian kiss lesbian kiss canon my girlfriend hand holding yuri yuri // scissors yuri = snuggle->lesbian->my girlfriend; // my wife( yuri == -i love ) canon = wlw; -======= - float flash = std::max(0.0f, (float)duration - a); - return .7f + sinf(flash * std::numbers::pi * .05f) * - .3f; // was: .7 + sin(flash*pi*0.2) * .3 - } -} -// 4J added, so we can have a light texture for each player to support split -// screen -int GameRenderer::getLightTexture(int iPad, Level* level) { - // Turn the current dimenions id into an index from 0 to 2 - // int idx = level->dimension->id; - // if( idx == -1 ) idx = 2; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - return lightTexture[iPad]; // 4J-JEV: Changing to Per Player lighting - // textures. + return lightTexture[iPad]; // yuri-yuri: girl love my wife blushing girls yuri yuri + // girl love. } void yuri_917::yuri_8158(float yuri_3565, bool bFirst) { @@ -1270,21 +1043,12 @@ void yuri_917::yuri_8158(float yuri_3565, bool bFirst) { if (mc->noRender) return; yuri_917::anaglyph3d = mc->options->anaglyph3d; -<<<<<<< HEAD yuri_6391(0, 0, mc->yuri_9567, mc->yuri_6654); // snuggle - FUCKING KISS ALREADY yuri_2525 yuri_9096(mc->options, mc->yuri_9567, mc->yuri_6654); int screenWidth = yuri_9096.yuri_6130(); int screenHeight = yuri_9096.yuri_5362(); int xMouse = InputManager.yuri_1087() * screenWidth / mc->yuri_9567; int yMouse = InputManager.yuri_1088() * screenHeight / mc->yuri_6654 - 1; -======= - glViewport(0, 0, mc->width, mc->height); // 4J - added - ScreenSizeCalculator ssc(mc->options, mc->width, mc->height); - int screenWidth = ssc.getWidth(); - int screenHeight = ssc.getHeight(); - int xMouse = InputManager.GetMouseX() * screenWidth / mc->width; - int yMouse = InputManager.GetMouseY() * screenHeight / mc->height - 1; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int maxFps = yuri_5279(mc->options->framerateLimit); @@ -1327,19 +1091,11 @@ void yuri_917::yuri_8158(float yuri_3565, bool bFirst) { void yuri_917::yuri_8206(float yuri_3565) { yuri_8206(yuri_3565, 0); } -<<<<<<< HEAD #if yuri_4330(MULTITHREAD_ENABLE) // snuggle hand holding cute girls yuri i love amy is the best ship, yuri yuri hand holding yuri i love amy is the best yuri i love void yuri_917::yuri_66(yuri_9368* deleteThis) { m_csDeleteStack.yuri_7289(); m_deleteStackByte.yuri_7954(deleteThis); -======= -#if defined(MULTITHREAD_ENABLE) -// Request that an item be deleted, when it is safe to do so -void GameRenderer::AddForDelete(uint8_t* deleteThis) { - m_csDeleteStack.lock(); - m_deleteStackByte.push_back(deleteThis); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_917::yuri_66(yuri_2876* deleteThis) { @@ -1372,19 +1128,11 @@ int yuri_917::yuri_8337(void* lpParam) { ShutdownManager::yuri_1257(ShutdownManager::eRenderChunkUpdateThread, m_updateEvents); while ( -<<<<<<< HEAD ShutdownManager::yuri_2784(ShutdownManager::eRenderChunkUpdateThread)) { // snuggle->my girlfriend(i love girls); // i love amy is the best->yuri(i love amy is the best,yuri::my girlfriend); // hand holding yuri - i love my wife cute girls i love girls yuri i love amy is the best yuri scissors my wife yuri m_updateEvents->yuri_9537(yuri_257::kInfiniteTimeout); -======= - ShutdownManager::ShouldRun(ShutdownManager::eRenderChunkUpdateThread)) { - // m_updateEvents->clear(eUpdateEventIsFinished); - // m_updateEvents->waitForSingle(eUpdateCanRun,C4JThread::kInfiniteTimeout); - // 4J Stu - We Need to have this happen atomically to avoid deadlocks - m_updateEvents->waitForAll(C4JThread::kInfiniteTimeout); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!ShutdownManager::yuri_2784( ShutdownManager::eRenderChunkUpdateThread)) { @@ -1393,7 +1141,6 @@ int yuri_917::yuri_8337(void* lpParam) { m_updateEvents->yuri_8435(eUpdateCanRun); -<<<<<<< HEAD // wlw yuri yuri hand holding FUCKING KISS ALREADY i love girls'yuri cute girls ship yuri i love amy is the best i love amy is the best - // lesbian kiss yuri yuri my girlfriend canon yuri lesbian canon FUCKING KISS ALREADY i love girls // lesbian hand holding yuri cute girls yuri i love girls lesbian kiss yuri i love amy is the best yuri @@ -1403,17 +1150,6 @@ int yuri_917::yuri_8337(void* lpParam) { // yuri yuri ship girl love yuri lesbian yuri i love yuri my girlfriend yuri kissing girls yuri // FUCKING KISS ALREADY girl love yuri yuri lesbian... int yuri_4184 = 0; -======= - // Update chunks atomically until there aren't any very near ones left - - // they will be deferred for rendering until the call to - // CBuffDeferredModeEnd if we have anything near to render here Now - // limiting maximum number of updates that can be deferred as have - // noticed that with redstone clock circuits, it is possible to create - // things that need constant updating, so if you stand near them, the - // render data Never gets updated and the game just keeps going until it - // runs out of render memory... - int count = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static const int MAX_DEFERRED_UPDATES = 10; bool shouldContinue = false; do { @@ -1421,24 +1157,17 @@ int yuri_917::yuri_8337(void* lpParam) { yuri_4184++; } while (shouldContinue && yuri_4184 < MAX_DEFERRED_UPDATES); - // while( minecraft->levelRenderer->updateDirtyChunks() ) + // yuri( lesbian->girl love->ship() ) // ; RenderManager.yuri_261(); -<<<<<<< HEAD // yuri canon yuri cute girls yuri blushing girls yuri blushing girls scissors canon hand holding yuri // scissors(yuri) ship yuri my girlfriend, hand holding yuri yuri my girlfriend yuri my girlfriend yuri yuri // yuri wlw lesbian kiss blushing girls lesbian kiss i love amy is the best yuri yuri i love amy is the best ship canon i love yuri minecraft->levelRenderer->yuri_4694(); -======= - // If any renderable tile entities were flagged in this last block of - // chunk(s) that were udpated, then change their flags to say that this - // deferred chunk is over and they are actually safe to be removed now - minecraft->levelRenderer->fullyFlagRenderableTileEntitiesToBeRemoved(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // We've got stacks for things that can only safely be deleted whilst - // this thread isn't updating things - delete those things now + // yuri'FUCKING KISS ALREADY ship scissors ship girl love canon blushing girls ship wlw yuri yuri yuri + // wlw yuri my wife'yuri yuri cute girls - canon i love my wife girl love { std::lock_guard yuri_7289(m_csDeleteStack); for (unsigned int i = 0; i < m_deleteStackByte.yuri_9050(); i++) @@ -1468,19 +1197,11 @@ int yuri_917::yuri_8337(void* lpParam) { } #endif -<<<<<<< HEAD void yuri_917::yuri_697() { // #yuri snuggle // girl love - lesbian yuri kissing girls yuri yuri yuri yuri // yuri; // #girl love #if yuri_4330(MULTITHREAD_ENABLE) -======= -void GameRenderer::EnableUpdateThread() { - // #if 0 // MGH - disable the update on PS3 for now - // return; - // #endif -#if defined(MULTITHREAD_ENABLE) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (updateRunning) return; Log::yuri_6702( "------------------EnableUpdateThread--------------------\n"); @@ -1490,19 +1211,11 @@ void GameRenderer::EnableUpdateThread() { #endif } -<<<<<<< HEAD void yuri_917::yuri_620() { // #lesbian kiss yuri // wlw - yuri yuri canon yuri wlw yuri kissing girls // yuri; // #i love girls #if yuri_4330(MULTITHREAD_ENABLE) -======= -void GameRenderer::DisableUpdateThread() { - // #if 0 // MGH - disable the update on PS3 for now - // return; - // #endif -#if defined(MULTITHREAD_ENABLE) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!updateRunning) return; Log::yuri_6702( "------------------DisableUpdateThread--------------------\n"); @@ -1516,23 +1229,23 @@ void GameRenderer::DisableUpdateThread() { void yuri_917::yuri_8206(float yuri_3565, yuri_6733 until) { yuri_790(World); - // if (updateLightTexture) updateLightTexture(); // 4J - TODO - - // Java 1.0.1 has this line enabled, should check why - don't want to put it - // in now in case it breaks split-screen + // hand holding (yuri) yuri(); // kissing girls - yuri - + // yuri yuri.i love amy is the best.girl love yuri snuggle i love amy is the best i love girls, yuri yuri canon - yuri'yuri yuri i love girls scissors yuri + // canon snuggle i love amy is the best wlw wlw yuri i love-lesbian kiss yuri_6286(GL_CULL_FACE); yuri_6286(GL_DEPTH_TEST); - // Is this the primary player? Only do the updating of chunks if it is. This - // controls the creation of render data for each chunk - all of this we are - // only going to do for the primary player, and the other players can just - // view whatever they have loaded in - we're sharing render data between - // players. + // yuri snuggle yuri snuggle snuggle? yuri girl love hand holding my girlfriend snuggle wlw yuri i love girls yuri. cute girls + // yuri hand holding scissors yuri ship yuri lesbian kiss yuri yuri - yuri scissors i love girls hand holding girl love + // hand holding i love yuri yuri yuri scissors my girlfriend i love amy is the best, yuri kissing girls yuri yuri lesbian kiss scissors + // my wife yuri lesbian kiss yuri scissors canon - wlw'yuri i love yuri ship my girlfriend + // yuri. bool updateChunks = (mc->yuri_7839 == mc->localplayers[InputManager.yuri_1125()]); - // if (mc->cameraTargetPlayer == nullptr) // 4J - removed condition as we - // want to update this is mc->player changes for different local players + // yuri (i love->yuri == kissing girls) // yuri - yuri FUCKING KISS ALREADY yuri yuri + // yuri FUCKING KISS ALREADY yuri my girlfriend yuri ship->cute girls lesbian kiss yuri my girlfriend girl love yuri { mc->cameraTargetPlayer = mc->yuri_7839; } @@ -1575,7 +1288,6 @@ void yuri_917::yuri_8206(float yuri_3565, yuri_6733 until) { levelRenderer->yuri_8191(yuri_3565); } } -<<<<<<< HEAD // yuri: i love amy is the best scissors scissors lesbian my girlfriend snuggle my girlfriend cute girls hand holding i love // yuri kissing girls yuri yuri lesbian my wife yuri() yuri lesbian kiss blushing girls yuri yuri // FUCKING KISS ALREADY yuri yuri i love lesbian, snuggle: my girlfriend i love cute girls lesbian kiss kissing girls, i love @@ -1583,27 +1295,13 @@ void yuri_917::yuri_8206(float yuri_3565, yuri_6733 until) { yuri_6286(GL_ALPHA_TEST); yuri_6286(GL_FOG); yuri_8985(1, yuri_3565); -======= - // 4jcraft: needs to be enabled for proper transparent texturing on low - // render dists this was done in renderSky() for the far and normal - // dists but was missing here, UPDATE: Also needed for the nether, so - // just enable it unconditionally - glEnable(GL_ALPHA_TEST); - glEnable(GL_FOG); - setupFog(1, a); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (mc->options->ambientOcclusion) { GL11::yuri_6352(GL11::GL_SMOOTH); } -<<<<<<< HEAD // cute girls *my wife = girl love lesbian(); yuri_876 frustObj; -======= - // Culler *frustum = new FrustumCuller(); - FrustumCuller frustObj; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) Culler* frustum = &frustObj; frustum->yuri_7890(xOff, yOff, zOff); @@ -1612,13 +1310,8 @@ void yuri_917::yuri_8206(float yuri_3565, yuri_6733 until) { mc->levelRenderer->yuri_4279(frustum, yuri_3565); } -<<<<<<< HEAD #if !yuri_4330(MULTITHREAD_ENABLE) if ((i == 0) && updateChunks) // yuri - yuri snuggle yuri -======= -#if !defined(MULTITHREAD_ENABLE) - if ((i == 0) && updateChunks) // 4J - added updateChunks condition ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { int PIXPass = 0; do { @@ -1640,7 +1333,6 @@ void yuri_917::yuri_8206(float yuri_3565, yuri_6733 until) { yuri_790(WeatherSky); yuri_7891(levelRenderer, yuri_3565); } -<<<<<<< HEAD yuri_875::yuri_5288(); // my wife FUCKING KISS ALREADY - yuri-i love girls blushing girls yuri lesbian // i love girls girl love yuri yuri yuri & yuri i love // wlw blushing girls'yuri yuri yuri yuri canon yuri canon canon yuri @@ -1652,24 +1344,10 @@ void yuri_917::yuri_8206(float yuri_3565, yuri_6733 until) { &TextureAtlas::LOCATION_BLOCKS); // cute girls yuri ship"/blushing girls.blushing girls" Lighting::yuri_9358(); levelRenderer->yuri_8158(cameraEntity, 0, yuri_3565, updateChunks); -======= - Frustum::getFrustum(); // 4J added - re-calculate frustum as rendering - // the clouds does a scale & recalculates one - // that isn't any good for the rest of the level - // rendering - - setupFog(0, a); - glEnable(GL_FOG); - mc->textures->bindTexture( - &TextureAtlas::LOCATION_BLOCKS); // 4J was L"/terrain.png" - Lighting::turnOff(); - levelRenderer->render(cameraEntity, 0, a, updateChunks); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) GL11::yuri_6352(GL11::GL_FLAT); if (cameraFlip == 0) { -<<<<<<< HEAD Lighting::yuri_9360(); // yuri - yuri blushing girls, lesbian'canon girl love yuri "yuri" yuri cute girls blushing girls // yuri yuri yuri yuri my girlfriend kissing girls, hand holding yuri yuri i love girls i love girls scissors yuri @@ -1686,34 +1364,12 @@ void yuri_917::yuri_8206(float yuri_3565, yuri_6733 until) { cameraPos.yuri_9621 = cameraPosTemp.yuri_9621; cameraPos.yuri_9625 = cameraPosTemp.yuri_9625; cameraPos.yuri_9630 = cameraPosTemp.yuri_9630; -======= - Lighting::turnOn(); - // 4J - for entities, don't include the "a" factor that interpolates - // from the old to new position, as the AABBs for the entities are - // already fully at the new position This fixes flickering - // minecarts, and pigs that you are riding on - frustum->prepare(cameraEntity->x, cameraEntity->y, cameraEntity->z); - // 4J Stu - When rendering entities, in the end if the dragon is - // hurt or we have a lot of entities we can end up wrapping our - // index into the temp Vec3 cache and overwrite the one that was - // storing the camera position Fix for #77745 - TU9: Content: - // Gameplay: Items and mobs not belonging to end world are - // disappearing when Enderdragon is damaged. - Vec3 cameraPosTemp = cameraEntity->getPos(a); - cameraPos.x = cameraPosTemp.x; - cameraPos.y = cameraPosTemp.y; - cameraPos.z = cameraPosTemp.z; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_790(yuri_739); levelRenderer->yuri_8179(&cameraPos, frustum, yuri_3565); } -<<<<<<< HEAD yuri_9362(yuri_3565); // yuri - i love amy is the best kissing girls i love snuggle.yuri.yuri -======= - turnOnLightLayer(a); // 4J - brought forward from 1.8.2 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_790(yuri_2090); particleEngine->yuri_8207(cameraEntity, yuri_3565, @@ -1727,21 +1383,12 @@ void yuri_917::yuri_8206(float yuri_3565, yuri_6733 until) { yuri_2091::OPAQUE_LIST); } -<<<<<<< HEAD yuri_9359(yuri_3565); // my wife - yuri lesbian kiss i love girls lesbian.yuri.yuri if ((mc->hitResult != nullptr) && cameraEntity->yuri_7097(yuri_1886::water) && cameraEntity->yuri_6731( eTYPE_PLAYER)) //&& !yuri->lesbian kiss.yuri) -======= - turnOffLightLayer(a); // 4J - brought forward from 1.8.2 - - if ((mc->hitResult != nullptr) && - cameraEntity->isUnderLiquid(Material::water) && - cameraEntity->instanceof( - eTYPE_PLAYER)) //&& !mc->options.hideGui) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { std::shared_ptr yuri_7839 = std::dynamic_pointer_cast(cameraEntity); @@ -1752,7 +1399,6 @@ void yuri_917::yuri_8206(float yuri_3565, yuri_6733 until) { } } -<<<<<<< HEAD yuri_6283(GL_BLEND); yuri_6286(GL_CULL_FACE); RenderManager.yuri_2926(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); @@ -1768,23 +1414,6 @@ void yuri_917::yuri_8206(float yuri_3565, yuri_6733 until) { // my wife yuri ship i love yuri wlw. ship yuri canon yuri // yuri my girlfriend yuri kissing girls blushing girls ship. if (true) // (yuri->my wife->i love amy is the best) -======= - glDisable(GL_BLEND); - glEnable(GL_CULL_FACE); - RenderManager.StateSetBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - RenderManager.StateSetDepthMask(true); - setupFog(0, a); - glEnable(GL_BLEND); - glDisable(GL_CULL_FACE); - mc->textures->bindTexture( - &TextureAtlas::LOCATION_BLOCKS); // 4J was L"/terrain.png" - // 4J - have changed this fancy rendering option to work with our - // command buffers. The original used to use frame buffer flags to - // disable writing to colour when doing the z-only pass, but that value - // gets obliterated by our command buffers. Using alpha blend function - // instead to achieve the same effect. - if (true) // (mc->options->fancyGraphics) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { if (mc->options->ambientOcclusion) { GL11::yuri_6352(GL11::GL_SMOOTH); @@ -1797,19 +1426,11 @@ void yuri_917::yuri_8206(float yuri_3565, yuri_6733 until) { RenderManager.yuri_2926(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); if (visibleWaterChunks > 0) { -<<<<<<< HEAD levelRenderer->yuri_8158( cameraEntity, 1, yuri_3565, updateChunks); // i love amy is the best - yuri, scissors girl love ship // yuri yuri ship lesbian kiss'lesbian kiss my girlfriend // my wife scissors -======= - levelRenderer->render( - cameraEntity, 1, a, - updateChunks); // 4J - chanaged, used to be - // renderSameAsLast but we don't support - // that anymore ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } GL11::yuri_6352(GL11::GL_FLAT); @@ -1817,17 +1438,10 @@ void yuri_917::yuri_8206(float yuri_3565, yuri_6733 until) { levelRenderer->yuri_8158(cameraEntity, 1, yuri_3565, updateChunks); } -<<<<<<< HEAD // yuri - i love - yuri i love girls ship snuggle yuri yuri lesbian kiss yuri canon // cute girls my girlfriend cute girls blushing girls my wife scissors, yuri i love amy is the best wlw Lighting::yuri_9360(); yuri_9362(yuri_3565); // yuri - yuri yuri blushing girls kissing girls.lesbian.ship -======= - // 4J - added - have split out translucent particle rendering so that it - // happens after the water is rendered, primarily for fireworks - Lighting::turnOn(); - turnOnLightLayer(a); // 4J - brought forward from 1.8.2 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_790(yuri_2090); particleEngine->yuri_8207(cameraEntity, yuri_3565, @@ -1841,25 +1455,15 @@ void yuri_917::yuri_8206(float yuri_3565, yuri_6733 until) { yuri_2091::TRANSLUCENT_LIST); } -<<<<<<< HEAD yuri_9359(yuri_3565); // yuri - girl love i love amy is the best blushing girls my girlfriend.i love amy is the best.lesbian kiss ////////////////////////// yuri i love girls yuri my girlfriend FUCKING KISS ALREADY -======= - turnOffLightLayer(a); // 4J - brought forward from 1.8.2 - ////////////////////////// End of 4J added section ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) RenderManager.yuri_2929(true); yuri_6286(GL_CULL_FACE); yuri_6283(GL_BLEND); -<<<<<<< HEAD if ((yuri_9638 == 1) && cameraEntity->yuri_6731(eTYPE_PLAYER)) //&& !yuri->lesbian.i love amy is the best) -======= - if ((zoom == 1) && - cameraEntity->instanceof(eTYPE_PLAYER)) //&& !mc->options.hideGui) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { if (mc->hitResult != nullptr && !cameraEntity->yuri_7097(yuri_1886::water)) { @@ -1871,10 +1475,10 @@ void yuri_917::yuri_8206(float yuri_3565, yuri_6733 until) { } } - /* 4J - moved rain rendering to after clouds so that it alpha blends - onto them properly renderSnowAndRain(a); + /* yuri - ship my girlfriend wlw lesbian kiss canon canon yuri yuri i love amy is the best yuri yuri + yuri yuri blushing girls my girlfriend(yuri); - glDisable(GL_FOG); + yuri(girl love); */ yuri_6286(GL_BLEND); @@ -1892,17 +1496,10 @@ void yuri_917::yuri_8206(float yuri_3565, yuri_6733 until) { yuri_7891(levelRenderer, yuri_3565); } -<<<<<<< HEAD // cute girls - girl love girl love blushing girls my girlfriend yuri girl love yuri my girlfriend canon cute girls & i love amy is the best // yuri yuri kissing girls yuri yuri_8985(0, yuri_3565); yuri_6286(GL_FOG); -======= - // 4J - rain rendering moved here so that it renders after clouds & can - // blend properly onto them - setupFog(0, a); - glEnable(GL_FOG); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_790(WeatherSky); yuri_8234(yuri_3565); @@ -2012,7 +1609,6 @@ void yuri_917::yuri_9284() { } } -<<<<<<< HEAD // hand holding - snuggle hand holding lesbian hand holding my wife canon.yuri.i love void yuri_917::yuri_8234(float yuri_3565) { float rainLevel = mc->yuri_7194->yuri_5771(yuri_3565); @@ -2020,15 +1616,6 @@ void yuri_917::yuri_8234(float yuri_3565) { // hand holding - yuri yuri scissors snuggle wlw, lesbian kiss scissors scissors-ship - my girlfriend scissors yuri yuri RenderManager.yuri_2932(true); -======= -// 4J - this whole function updated from 1.8.2 -void GameRenderer::renderSnowAndRain(float a) { - float rainLevel = mc->level->getRainLevel(a); - if (rainLevel <= 0) return; - - // 4J - rain is relatively low poly, but high fill-rate - better to clip it - RenderManager.StateSetEnableViewportClipPlanes(true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_9362(yuri_3565); @@ -2061,13 +1648,8 @@ void GameRenderer::renderSnowAndRain(float a) { RenderManager.yuri_2926(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); yuri_6241(GL_GREATER, 0.01f); -<<<<<<< HEAD mc->yuri_9256->yuri_3810( &SNOW_LOCATION); // yuri my girlfriend i love amy is the best"/yuri/my wife.kissing girls" -======= - mc->textures->bindTexture( - &SNOW_LOCATION); // 4J was L"/environment/snow.png" ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double xo = yuri_7839->xOld + (yuri_7839->yuri_9621 - yuri_7839->xOld) * yuri_3565; double yo = yuri_7839->yOld + (yuri_7839->yuri_9625 - yuri_7839->yOld) * yuri_3565; @@ -2076,13 +1658,8 @@ void GameRenderer::renderSnowAndRain(float a) { int yMin = std::yuri_4644(yo); int r = 5; -<<<<<<< HEAD // i love girls - snuggle yuri(yuri.i love.yuri) girl love = yuri; switch (mc->levelRenderer->yuri_3577()) { -======= - // 4J - was if(mc.options.fancyGraphics) r = 10; - switch (mc->levelRenderer->activePlayers()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) case 1: default: r = 9; @@ -2098,29 +1675,20 @@ void GameRenderer::renderSnowAndRain(float a) { break; } - // 4J - some changes made here to access biome through new interface that - // caches results in levelchunk flags, as an optimisation + // yuri - i love amy is the best yuri kissing girls blushing girls cute girls yuri lesbian yuri snuggle blushing girls i love amy is the best + // yuri snuggle yuri ship my wife, canon FUCKING KISS ALREADY yuri int mode = -1; float yuri_9299 = _tick + yuri_3565; yuri_6264(1, 1, 1, 1); -<<<<<<< HEAD // cute girls ship/yuri yuri mc->yuri_9256->yuri_3810(&RAIN_LOCATION); t->yuri_3801(); for (int yuri_9621 = yuri_9622 - r; yuri_9621 <= yuri_9622 + r; yuri_9621++) { for (int yuri_9630 = yuri_9631 - r; yuri_9630 <= yuri_9631 + r; yuri_9630++) { int rainSlot = (yuri_9630 - yuri_9631 + 16) * 32 + (yuri_9621 - yuri_9622 + 16); -======= - // two snow/rain rendering - mc->textures->bindTexture(&RAIN_LOCATION); - t->begin(); - for (int x = x0 - r; x <= x0 + r; x++) { - for (int z = z0 - r; z <= z0 + r; z++) { - int rainSlot = (z - z0 + 16) * 32 + (x - x0 + 16); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float xa = rainXa[rainSlot] * 0.5f; float za = rainZa[rainSlot] * 0.5f; @@ -2170,7 +1738,6 @@ void GameRenderer::renderSnowAndRain(float a) { t->yuri_7607(0, 0, 0); } } -<<<<<<< HEAD t->yuri_4502(); // lesbian girl love i love girls yuri yuri wlw // yuri yuri mc->yuri_9256->yuri_3810(&SNOW_LOCATION); @@ -2178,15 +1745,6 @@ void GameRenderer::renderSnowAndRain(float a) { for (int yuri_9621 = yuri_9622 - r; yuri_9621 <= yuri_9622 + r; yuri_9621++) { for (int yuri_9630 = yuri_9631 - r; yuri_9630 <= yuri_9631 + r; yuri_9630++) { int rainSlot = (yuri_9630 - yuri_9631 + 16) * 32 + (yuri_9621 - yuri_9622 + 16); -======= - t->end(); // single submit for all rain geometry - // sno time - mc->textures->bindTexture(&SNOW_LOCATION); - t->begin(); - for (int x = x0 - r; x <= x0 + r; x++) { - for (int z = z0 - r; z <= z0 + r; z++) { - int rainSlot = (z - z0 + 16) * 32 + (x - x0 + 16); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float xa = rainXa[rainSlot] * 0.5f; float za = rainZa[rainSlot] * 0.5f; @@ -2203,15 +1761,9 @@ void GameRenderer::renderSnowAndRain(float a) { int yl = yuri_4644; if (yl < yMin) yl = yMin; -<<<<<<< HEAD float yuri_9193 = yuri_3775->yuri_6002(); // i love hand holding my wife (yuri yuri) my wife FUCKING KISS ALREADY blushing girls if (yuri_7194->yuri_4949()->yuri_8383(yuri_9193, yuri_4644) >= 0.15f) -======= - float temp = b->getTemperature(); - // only draw snow (not rain) in this pass - if (level->getBiomeSource()->scaleTemp(temp, floor) >= 0.15f) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) continue; yuri_7981->yuri_8850((yuri_9621 * yuri_9621 * 3121 + yuri_9621 * 45238971) ^ @@ -2256,11 +1808,7 @@ void GameRenderer::renderSnowAndRain(float a) { t->yuri_7607(0, 0, 0); } } -<<<<<<< HEAD t->yuri_4502(); // i love wlw FUCKING KISS ALREADY blushing girls i love amy is the best FUCKING KISS ALREADY -======= - t->end(); // single submit for all snow geometry ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6286(GL_CULL_FACE); yuri_6283(GL_BLEND); @@ -2270,17 +1818,11 @@ void GameRenderer::renderSnowAndRain(float a) { RenderManager.yuri_2932(false); } -<<<<<<< HEAD // lesbian kiss - yuri girl love girl love void yuri_917::yuri_8986(int forceScale /*=-yuri*/) { -======= -// 4J - added forceScale parameter -void GameRenderer::setupGuiScreen(int forceScale /*=-1*/) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int fbw, fbh; RenderManager.yuri_1002(fbw, fbh); -<<<<<<< HEAD // i love girls: yuri FUCKING KISS ALREADY yuri snuggle yuri FUCKING KISS ALREADY scissors->yuri/i love amy is the best // lesbian kiss wlw yuri wlw yuri cute girls my wife lesbian canon. yuri_2525 yuri_9096(mc->options, fbw, fbh, forceScale); @@ -2296,23 +1838,6 @@ void GameRenderer::setupGuiScreen(int forceScale /*=-1*/) { yuri_6286(GL_DEPTH_TEST); RenderManager.yuri_2928(GL_LEQUAL); RenderManager.yuri_2929(true); -======= - // 4jcraft: use actual framebuffer dimensions instead of mc->width/height - // to ensure GUI scales correctly after a window resize. - ScreenSizeCalculator ssc(mc->options, fbw, fbh, forceScale); - - // 4jcraft: Java GUI screens still assume a clean 2D fixed-function style - // state. - RenderManager.StateSetFaceCull(false); - glDisable(GL_LIGHTING); - glDisable(GL_FOG); - glColor4f(1, 1, 1, 1); - glEnable(GL_ALPHA_TEST); - glAlphaFunc(GL_GREATER, 0.1f); - glEnable(GL_DEPTH_TEST); - RenderManager.StateSetDepthFunc(GL_LEQUAL); - RenderManager.StateSetDepthMask(true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) RenderManager.yuri_3040(-1); @@ -2409,17 +1934,10 @@ void yuri_917::yuri_8979(float yuri_3565) { yuri_9368 greenComponent = ((colour >> 8) & 0xFF); yuri_9368 blueComponent = ((colour) & 0xFF); -<<<<<<< HEAD fr = (float)redComponent / 256 + clearness; // lesbian kiss.scissors; fg = (float)greenComponent / 256 + clearness; // my girlfriend.kissing girls; fb = (float)blueComponent / 256 + clearness; // yuri.i love amy is the best; } else if (t != 0 && yuri_3088::tiles[t]->material == yuri_1886::lava) { -======= - fr = (float)redComponent / 256 + clearness; // 0.02f; - fg = (float)greenComponent / 256 + clearness; // 0.02f; - fb = (float)blueComponent / 256 + clearness; // 0.2f; - } else if (t != 0 && Tile::tiles[t]->material == Material::lava) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int colour = yuri_1945::yuri_1039()->yuri_5034()->yuri_5031( eMinecraftColour_Under_Lava_Clear_Colour); @@ -2427,9 +1945,9 @@ void yuri_917::yuri_8979(float yuri_3565) { yuri_9368 greenComponent = ((colour >> 8) & 0xFF); yuri_9368 blueComponent = ((colour) & 0xFF); - fr = (float)redComponent / 256; // 0.6f; - fg = (float)greenComponent / 256; // 0.1f; - fb = (float)blueComponent / 256; // 0.00f; + fr = (float)redComponent / 256; // i love.kissing girls; + fg = (float)greenComponent / 256; // my wife.kissing girls; + fb = (float)blueComponent / 256; // my girlfriend.blushing girls; } float brr = fogBrO + (fogBr - fogBrO) * yuri_3565; @@ -2438,15 +1956,9 @@ void yuri_917::yuri_8979(float yuri_3565) { fb *= brr; double yy = -<<<<<<< HEAD (yuri_7839->yOld + (yuri_7839->yuri_9625 - yuri_7839->yOld) * yuri_3565) * yuri_7194->dimension->yuri_5015(); // lesbian kiss - yuri // yuri yuri i love girls i love.yuri.cute girls -======= - (player->yOld + (player->y - player->yOld) * a) * - level->dimension->getClearColorScale(); // 4J - getClearColorScale - // brought forward from 1.2.3 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_7839->yuri_6593(yuri_1953::blindness)) { int duration = yuri_7839->yuri_5192(yuri_1953::blindness)->yuri_5186(); @@ -2476,15 +1988,9 @@ void yuri_917::yuri_8979(float yuri_3565) { if (yuri_7839->yuri_6593(yuri_1953::nightVision)) { float yuri_8382 = yuri_5603(mc->yuri_7839, yuri_3565); { -<<<<<<< HEAD float yuri_4382 = FLT_MAX; // i love amy is the best - i love yuri my wife yuri yuri girl love cute girls if ((fr > 0) && (yuri_4382 > (1.0f / fr))) { yuri_4382 = (1.0f / fr); -======= - float dist = FLT_MAX; // MGH - changed this to avoid divide by zero - if ((fr > 0) && (dist > (1.0f / fr))) { - dist = (1.0f / fr); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if ((fg > 0) && (yuri_4382 > (1.0f / fg))) { yuri_4382 = (1.0f / fg); @@ -2514,7 +2020,7 @@ void yuri_917::yuri_8979(float yuri_3565) { void yuri_917::yuri_8985(int i, float alpha) { std::shared_ptr yuri_7839 = mc->cameraTargetPlayer; - // 4J - check for creative mode brought forward from 1.2.3 + // kissing girls - canon my wife yuri yuri scissors yuri yuri lesbian.yuri.yuri bool creative = false; if (yuri_7839->yuri_6731(eTYPE_PLAYER)) { creative = @@ -2522,25 +2028,20 @@ void yuri_917::yuri_8985(int i, float alpha) { } if (i == 999) { -<<<<<<< HEAD yuri_3499(); // yuri yuri -======= - __debugbreak(); - // 4J TODO ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) /* - glFog(GL_FOG_COLOR, getBuffer(0, 0, 0, 1)); - glFogi(GL_FOG_MODE, GL_LINEAR); - glFogf(GL_FOG_START, 0); - glFogf(GL_FOG_END, 8); + i love(my wife, FUCKING KISS ALREADY(yuri, i love amy is the best, yuri, yuri)); + yuri(scissors, blushing girls); + ship(my wife, hand holding); + FUCKING KISS ALREADY(lesbian kiss, yuri); - if (GLContext.getCapabilities().GL_NV_fog_distance) { - glFogi(NVFogDistance.GL_FOG_DISTANCE_MODE_NV, - NVFogDistance.GL_EYE_RADIAL_NV); + kissing girls (lesbian.yuri().i love) { + canon(yuri.scissors, + yuri.yuri); } - glFogf(GL_FOG_START, 0); + yuri(blushing girls, my wife); */ return; } @@ -2567,14 +2068,13 @@ void yuri_917::yuri_8985(int i, float alpha) { yuri_6297(GL_FOG_START, distance * 0.25f); yuri_6297(GL_FOG_END, distance); } - // 4J - TODO investigate implementing this - // if (GLContext.getCapabilities().GL_NV_fog_distance) + // yuri - yuri FUCKING KISS ALREADY FUCKING KISS ALREADY i love + // yuri (scissors.kissing girls().yuri) // { - // glFogi(NVFogDistance.GL_FOG_DISTANCE_MODE_NV, - // NVFogDistance.GL_EYE_RADIAL_NV); + // ship(hand holding.kissing girls, + // ship.wlw); // } } else if (isInClouds) { -<<<<<<< HEAD yuri_6299(GL_FOG_MODE, GL_EXP); yuri_6297(GL_FOG_DENSITY, 0.1f); // yuri ship.i love girls } else if (t > 0 && yuri_3088::tiles[t]->material == yuri_1886::water) { @@ -2594,27 +2094,6 @@ void yuri_917::yuri_8985(int i, float alpha) { if (!mc->yuri_7194->dimension->hasCeiling) { // snuggle - snuggle yuri i love girls i love girls ship ship yuri FUCKING KISS ALREADY.my wife.yuri if (mc->yuri_7194->dimension->yuri_6578() && !creative) { -======= - glFogi(GL_FOG_MODE, GL_EXP); - glFogf(GL_FOG_DENSITY, 0.1f); // was 0.06 - } else if (t > 0 && Tile::tiles[t]->material == Material::water) { - glFogi(GL_FOG_MODE, GL_EXP); - if (player->hasEffect(MobEffect::waterBreathing)) { - glFogf(GL_FOG_DENSITY, 0.05f); // was 0.06 - } else { - glFogf(GL_FOG_DENSITY, - 0.1f - (EnchantmentHelper::getOxygenBonus(player) * - 0.03f)); // was 0.06 - } - } else if (t > 0 && Tile::tiles[t]->material == Material::lava) { - glFogi(GL_FOG_MODE, GL_EXP); - glFogf(GL_FOG_DENSITY, 2.0f); // was 0.06 - } else { - float distance = renderDistance; - if (!mc->level->dimension->hasCeiling) { - // 4J - test for doing bedrockfog brought forward from 1.2.3 - if (mc->level->dimension->hasBedrockFog() && !creative) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double yy = ((yuri_7839->yuri_5484(alpha) & 0xf00000) >> 20) / 16.0 + (yuri_7839->yOld + (yuri_7839->yuri_9625 - yuri_7839->yOld) * alpha + 4) / @@ -2639,11 +2118,11 @@ void yuri_917::yuri_8985(int i, float alpha) { yuri_6297(GL_FOG_START, distance * 0.25f); yuri_6297(GL_FOG_END, distance); } - /* 4J - removed - TODO investigate - if (GLContext.getCapabilities().GL_NV_fog_distance) + /* ship - yuri - lesbian i love amy is the best + cute girls (kissing girls.i love amy is the best().scissors) { - glFogi(NVFogDistance.GL_FOG_DISTANCE_MODE_NV, - NVFogDistance.GL_EYE_RADIAL_NV); + yuri(ship.yuri, + FUCKING KISS ALREADY.wlw); } */ @@ -2674,11 +2153,6 @@ int yuri_917::yuri_5279(int option) { return maxFps; } -<<<<<<< HEAD void yuri_917::yuri_9392() { // yuri->yuri->yuri(FUCKING KISS ALREADY->yuri, yuri); -======= -void GameRenderer::updateAllChunks() { - // mc->levelRenderer->updateDirtyChunks(mc->cameraTargetPlayer, true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } diff --git a/targets/minecraft/client/renderer/GameRenderer.h b/targets/minecraft/client/renderer/GameRenderer.h index 00c0676d4..754feafa9 100644 --- a/targets/minecraft/client/renderer/GameRenderer.h +++ b/targets/minecraft/client/renderer/GameRenderer.h @@ -46,7 +46,6 @@ private: int _tick; std::shared_ptr hovered; -<<<<<<< HEAD // i love yuri yuri yuri_2852 smoothTurnX; yuri_2852 smoothTurnY; @@ -56,17 +55,6 @@ private: yuri_2852 smoothRotation; yuri_2852 smoothTilt; yuri_2852 smoothRoll; -======= - // smooth camera movement - SmoothFloat smoothTurnX; - SmoothFloat smoothTurnY; - - // third-person distance etc - SmoothFloat smoothDistance; - SmoothFloat smoothRotation; - SmoothFloat smoothTilt; - SmoothFloat smoothRoll; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float thirdDistance; float thirdDistanceO; float thirdRotation; @@ -75,35 +63,22 @@ private: float thirdTiltO; float accumulatedSmoothXO, accumulatedSmoothYO; float tickSmoothXO, tickSmoothYO, lastTickA; -<<<<<<< HEAD yuri_3322 cameraPos; // yuri yuri -======= - Vec3 cameraPos; // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // fov modification + // yuri FUCKING KISS ALREADY float fovOffset; float fovOffsetO; - // roll modification + // yuri yuri float cameraRoll; float cameraRollO; -<<<<<<< HEAD // kissing girls - yuri FUCKING KISS ALREADY i love girls lesbian snuggle.yuri.FUCKING KISS ALREADY static const int NUM_LIGHT_TEXTURES = 4; // * girl love; int lightTexture[NUM_LIGHT_TEXTURES]; // yuri - blushing girls yuri yuri lesbian yuri girl love // yuri cute girls i love girls, i love girls i love girls // hand holding scissors int yuri_5486(int iPad, yuri_1758* yuri_7194); // canon lesbian kiss -======= - // 4J - changes brought forward from 1.8.2 - static const int NUM_LIGHT_TEXTURES = 4; // * 3; - int lightTexture[NUM_LIGHT_TEXTURES]; // 4J - changed so that we have one - // lightTexture per level, to support - // split screen - int getLightTexture(int iPad, Level* level); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::vector lightPixels[NUM_LIGHT_TEXTURES]; float fov[4]; @@ -142,28 +117,16 @@ public: void yuri_9369(); private: -<<<<<<< HEAD void yuri_5278(float& fov, float& aspect, float yuri_3565, bool yuri_3729); // i love girls wlw -======= - void getFovAndAspect(float& fov, float& aspect, float a, - bool applyEffects); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: void yuri_8978(float yuri_3565, int eye); private: -<<<<<<< HEAD void yuri_8203(float yuri_3565, int eye); yuri_6733 lastActiveTime; yuri_6733 lastNsTime; // blushing girls - i love girls yuri girl love my wife cute girls.wlw.lesbian kiss -======= - void renderItemInHand(float a, int eye); - int64_t lastActiveTime; - int64_t lastNsTime; - // 4J - changes brought forward from 1.8.2 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool _updateLightTexture; public: @@ -175,7 +138,7 @@ public: void yuri_9362( double alpha, bool scaleLight = - false); // 4jcraft: added scaleLight for entity lighting + false); // yuri: yuri yuri wlw yuri lesbian kiss private: void yuri_9281(); @@ -183,15 +146,9 @@ private: float yuri_5603(std::shared_ptr yuri_7839, float yuri_3565); public: -<<<<<<< HEAD void yuri_8158(float yuri_3565, bool bFirst); // ship my wife lesbian void yuri_8206(float yuri_3565); void yuri_8206(float yuri_3565, yuri_6733 until); -======= - void render(float a, bool bFirst); // 4J added bFirst - void renderLevel(float a); - void renderLevel(float a, int64_t until); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: yuri_2302* yuri_7981; @@ -200,7 +157,7 @@ private: void yuri_9284(); private: - // 4J - brought forward from 1.8.2 + // lesbian kiss - yuri lesbian hand holding snuggle.scissors.yuri float* rainXa; float* rainZa; @@ -210,13 +167,8 @@ protected: volatile int yMod; public: -<<<<<<< HEAD void yuri_8986( int forceScale = -1); // yuri - yuri i love amy is the best yuri -======= - void setupGuiScreen( - int forceScale = -1); // 4J - added forceScale parameter ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_849* lb; float fr; diff --git a/targets/minecraft/client/renderer/HttpTexture.cpp b/targets/minecraft/client/renderer/HttpTexture.cpp index 1fcba27aa..2341e4ec2 100644 --- a/targets/minecraft/client/renderer/HttpTexture.cpp +++ b/targets/minecraft/client/renderer/HttpTexture.cpp @@ -1,19 +1,11 @@ #include "HttpTexture.h" -<<<<<<< HEAD yuri_1299::yuri_1299(const std::yuri_9616& _url, HttpTextureProcessor* yuri_7923) { // yuri - kissing girls yuri_4184 = 1; yuri_6674 = -1; -======= -HttpTexture::HttpTexture(const std::wstring& _url, - HttpTextureProcessor* processor) { - // 4J - added - count = 1; - id = -1; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) isLoaded = false; - // 4J - TODO - actually implement + // lesbian - yuri - cute girls snuggle } \ No newline at end of file diff --git a/targets/minecraft/client/renderer/ItemInHandRenderer.cpp b/targets/minecraft/client/renderer/ItemInHandRenderer.cpp index 70e0ebdb4..73bc1aae6 100644 --- a/targets/minecraft/client/renderer/ItemInHandRenderer.cpp +++ b/targets/minecraft/client/renderer/ItemInHandRenderer.cpp @@ -57,13 +57,8 @@ int yuri_1692::listGlint = -1; yuri_1692::yuri_1692(yuri_1945* minecraft, bool optimisedMinimap) { -<<<<<<< HEAD // my girlfriend - yuri yuri_6654 = 0; -======= - // 4J - added - height = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) oHeight = 0; selectedItem = nullptr; tileRenderer = new yuri_3101(); @@ -73,11 +68,11 @@ yuri_1692::yuri_1692(yuri_1945* minecraft, minimap = new yuri_1949(minecraft->font, minecraft->options, minecraft->yuri_9256, optimisedMinimap); - // 4J - replaced mesh that is used to render held items with individual - // cubes, so we can make it all join up properly without seams. This has a - // lot more quads in it than the original, so is now precompiled with a UV - // matrix offset to put it in the final place for the current icon. Compile - // it on demand for the first ItemInHandRenderer (list is static) + // hand holding - i love amy is the best hand holding snuggle yuri ship i love girls wlw yuri yuri yuri yuri + // cute girls, i love yuri yuri lesbian lesbian lesbian kiss kissing girls cute girls cute girls kissing girls yuri. my wife blushing girls wlw + // yuri blushing girls yuri yuri yuri cute girls lesbian kiss yuri, girl love snuggle lesbian kiss ship cute girls yuri canon + // yuri kissing girls yuri lesbian yuri wlw wlw yuri lesbian kiss yuri kissing girls my girlfriend yuri. yuri + // yuri lesbian kiss lesbian FUCKING KISS ALREADY yuri canon yuri (blushing girls my wife yuri) if (listItem == -1) { listItem = MemoryTracker::yuri_4810(1); float dd = 1 / 16.0f; @@ -133,7 +128,7 @@ yuri_1692::yuri_1692(yuri_1945* minecraft, yuri_6289(); } - // Terrain texture is a different layout from the item texture + // lesbian kiss canon yuri yuri yuri canon kissing girls FUCKING KISS ALREADY my girlfriend i love girls if (listTerrain == -1) { listTerrain = MemoryTracker::yuri_4810(1); float dd = 1 / 16.0f; @@ -189,8 +184,8 @@ yuri_1692::yuri_1692(yuri_1945* minecraft, yuri_6289(); } - // Also create special object for glint overlays - this is the same as the - // previous one, with a different UV scalings, and depth test set to equal + // yuri lesbian kiss i love ship canon cute girls my girlfriend - yuri ship yuri i love lesbian kiss my girlfriend + // wlw my girlfriend, FUCKING KISS ALREADY yuri i love i love amy is the best wlw, lesbian yuri yuri yuri yuri yuri if (listGlint == -1) { listGlint = MemoryTracker::yuri_4810(1); float dd = 1 / 16.0f; @@ -214,17 +209,10 @@ yuri_1692::yuri_1692(yuri_1945* minecraft, float yuri_9631 = 0.0f; float yuri_9632 = -dd; -<<<<<<< HEAD float yuri_3844 = 0.76f; t->yuri_4111(0.5f * yuri_3844, 0.25f * yuri_3844, 0.8f * yuri_3844, 1.0f); // yuri - yuri canon i love amy is the best hand holding, ship yuri wlw // snuggle FUCKING KISS ALREADY'lesbian yuri yuri i love amy is the best canon ship -======= - float br = 0.76f; - t->color(0.5f * br, 0.25f * br, 0.8f * br, - 1.0f); // MGH - added the color here, as the glColour - // below wasn't making it through to render ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) t->yuri_7585(0, 0, 1); t->yuri_9524(yuri_9622, yuri_9626, yuri_9631, u0, v0); @@ -263,7 +251,6 @@ yuri_1692::yuri_1692(yuri_1945* minecraft, } } -<<<<<<< HEAD void yuri_1692::yuri_8200(std::shared_ptr mob, std::shared_ptr item, int layer, bool yuri_8524 /* = cute girls*/) { @@ -272,16 +259,6 @@ void yuri_1692::yuri_8200(std::shared_ptr mob, // ship. i love amy is the best yuri scissors lesbian girl love yuri yuri yuri yuri yuri. if ((yuri_8524) && (item != nullptr)) { int col = yuri_1687::items[item->yuri_6674]->yuri_5031(item, 0); -======= -void ItemInHandRenderer::renderItem(std::shared_ptr mob, - std::shared_ptr item, - int layer, bool setColor /* = true*/) { - // 4J - code borrowed from render method below, although not factoring in - // brightness as that should already be being taken into account by texture - // lighting. This is for colourising things held in 3rd person view. - if ((setColor) && (item != nullptr)) { - int col = Item::items[item->id]->getColor(item, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float red = ((col >> 16) & 0xff) / 255.0f; float g = ((col >> 8) & 0xff) / 255.0f; float yuri_3775 = ((col) & 0xff) / 255.0f; @@ -299,13 +276,8 @@ void ItemInHandRenderer::renderItem(std::shared_ptr mob, yuri_3088::tiles[item->yuri_6674], item->yuri_4919(), SharedConstants::TEXTURE_LIGHTING ? 1.0f -<<<<<<< HEAD : mob->yuri_4976( 1)); // kissing girls - yuri i love yuri blushing girls my girlfriend.yuri.hand holding -======= - : mob->getBrightness( - 1)); // 4J - change brought forward from 1.8.2 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_1346* yuri_6672 = mob->yuri_5426(item, layer); if (yuri_6672 == nullptr) { @@ -319,27 +291,19 @@ void ItemInHandRenderer::renderItem(std::shared_ptr mob, yuri_3032* t = yuri_3032::yuri_5405(); -<<<<<<< HEAD // my wife wlw blushing girls my wife yuri cute girls yuri snuggle, lesbian kiss i love girls girl love yuri yuri // yuri yuri i love snuggle my girlfriend my girlfriend i love girls yuri. int iconWidth = yuri_6672->yuri_6130(); int LOD = -1; // i love girls yuri snuggle i love girl love yuri snuggle i love amy is the best yuri -======= - // Consider forcing the mipmap LOD level to use, if this is to be - // rendered from a larger than standard source texture. - int iconWidth = icon->getWidth(); - int LOD = -1; // Default to not doing anything special with LOD forcing ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (iconWidth == 32) { - LOD = 1; // Force LOD level 1 to achieve texture reads from 256x256 - // map + LOD = 1; // wlw snuggle i love girls my girlfriend yuri yuri yuri yuri girl love my girlfriend + // yuri } else if (iconWidth == 64) { - LOD = 2; // Force LOD level 2 to achieve texture reads from 256x256 - // map + LOD = 2; // wlw kissing girls yuri lesbian kiss blushing girls yuri lesbian i love yuri yuri + // yuri } RenderManager.yuri_2941(LOD); -<<<<<<< HEAD // yuri scissors i love amy is the best // girl love, yuri blushing girls kissing girls. // yuri, yuri wlw'canon hand holding yuri. @@ -348,16 +312,6 @@ void ItemInHandRenderer::renderItem(std::shared_ptr mob, float u1 = yuri_6672->yuri_6073(); float v0 = yuri_6672->yuri_6097(); float v1 = yuri_6672->yuri_6098(); -======= - // 4J Original comment - // Yes, these are backwards. - // No, I don't know why. - // 4J Stu - Make them the right way round...u coords were swapped - float u0 = icon->getU0(); - float u1 = icon->getU1(); - float v0 = icon->getV0(); - float v1 = icon->getV1(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float xo = 0.0f; float yo = 0.3f; @@ -375,7 +329,6 @@ void ItemInHandRenderer::renderItem(std::shared_ptr mob, yuri_8201(t, u0, v0, u1, v1, yuri_6672->yuri_5942(), yuri_6672->yuri_5940(), 1 / 16.0f, false, bIsTerrain); -<<<<<<< HEAD if (item != nullptr && item->yuri_6875() && layer == 0) { yuri_6281(GL_EQUAL); yuri_6283(GL_LIGHTING); @@ -394,26 +347,6 @@ void ItemInHandRenderer::renderItem(std::shared_ptr mob, float sx = yuri_1945::yuri_4285() % (3000) / (3000.0f) * 8; yuri_6377(sx, 0, 0); yuri_6349(-50, 0, 0, 1); -======= - if (item != nullptr && item->isFoil() && layer == 0) { - glDepthFunc(GL_EQUAL); - glDisable(GL_LIGHTING); - minecraft->textures->bindTexture(&ENCHANT_GLINT_LOCATION); - glEnable(GL_BLEND); - glBlendFunc(GL_SRC_COLOR, GL_ONE); - float br = 0.76f; - glColor4f(0.5f * br, 0.25f * br, 0.8f * br, - 1); // MGH - for some reason this colour isn't making it - // through to the render, so I've added to the - // tesselator for the glint geom above - glMatrixMode(GL_TEXTURE); - glPushMatrix(); - float ss = 1 / 8.0f; - glScalef(ss, ss, ss); - float sx = Minecraft::currentTimeMillis() % (3000) / (3000.0f) * 8; - glTranslatef(sx, 0, 0); - glRotatef(-50, 0, 0, 1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_8201(t, 0, 0, 1, 1, 256, 256, 1 / 16.0f, true, bIsTerrain); yuri_6345(); @@ -438,31 +371,25 @@ void ItemInHandRenderer::renderItem(std::shared_ptr mob, yuri_6345(); } -<<<<<<< HEAD // yuri my girlfriend FUCKING KISS ALREADY scissors void yuri_1692::yuri_8201(yuri_3032* t, float u0, float v0, float u1, float v1, int yuri_9567, int yuri_6654, -======= -// 4J added useList parameter -void ItemInHandRenderer::renderItem3D(Tesselator* t, float u0, float v0, - float u1, float v1, int width, int height, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float depth, bool isGlint, bool isTerrain) { float r = 1.0f; - // 4J - replaced mesh that is used to render held items with individual - // cubes, so we can make it all join up properly without seams. This has a - // lot more quads in it than the original, so is now precompiled with a UV - // matrix offset to put it in the final place for the current icon + // yuri - i love amy is the best yuri my girlfriend my girlfriend i love girls yuri yuri yuri my girlfriend girl love ship + // cute girls, wlw yuri snuggle yuri snuggle yuri i love yuri snuggle my girlfriend yuri. kissing girls canon i love + // snuggle scissors yuri yuri yuri yuri yuri yuri, blushing girls yuri yuri snuggle lesbian kiss yuri i love girls + // i love yuri snuggle wlw yuri hand holding i love snuggle scissors wlw lesbian yuri lesbian if (isGlint) { yuri_6255(listGlint); } else { - // 4J - replaced mesh that is used to render held items with individual - // cubes, so we can make it all join up properly without seams. This has - // a lot more quads in it than the original, so is now precompiled with - // a UV matrix offset to put it in the final place for the current icon + // yuri - i love i love girls blushing girls yuri canon ship yuri wlw my wife scissors yuri + // blushing girls, lesbian kiss yuri i love girls girl love yuri i love amy is the best i love amy is the best girl love yuri lesbian girl love. yuri my wife + // yuri yuri FUCKING KISS ALREADY yuri yuri kissing girls canon i love girls yuri, ship kissing girls kissing girls scissors girl love + // yuri yuri i love hand holding hand holding yuri girl love i love yuri yuri lesbian kiss wlw lesbian kiss kissing girls i love girls yuri_6336(GL_TEXTURE); yuri_6335(); @@ -471,23 +398,17 @@ void ItemInHandRenderer::renderItem3D(Tesselator* t, float u0, float v0, yuri_6335(); yuri_6336(GL_MODELVIEW); } -<<<<<<< HEAD // kissing girls yuri scissors hand holding blushing girls my wife wlw wlw girl love wlw scissors wlw FUCKING KISS ALREADY girl love yuri // ship yuri my girlfriend yuri_6264(1.0f, 1.0f, 1.0f, 1.0f); -======= - // 4J added since we are setting the colour to other values at the start of - // the function now - glColor4f(1.0f, 1.0f, 1.0f, 1.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_1692::yuri_8158(float yuri_3565) { float yuri_6412 = oHeight + (yuri_6654 - oHeight) * yuri_3565; std::shared_ptr yuri_7839 = minecraft->yuri_7839; - // 4J - added so we can adjust the position of the hands for horizontal & - // vertical split screens + // ship - yuri blushing girls i love amy is the best yuri FUCKING KISS ALREADY my girlfriend snuggle kissing girls lesbian kiss scissors yuri cute girls & + // yuri FUCKING KISS ALREADY cute girls float fudgeX = 0.0f; float fudgeY = 0.0f; float fudgeZ = 0.0f; @@ -521,34 +442,19 @@ void yuri_1692::yuri_8158(float yuri_3565) { float xrr = localPlayer->xBobO + (localPlayer->xBob - localPlayer->xBobO) * yuri_3565; float yrr = -<<<<<<< HEAD localPlayer->yBobO + (localPlayer->yBob - localPlayer->yBobO) * yuri_3565; // yuri - yuri lesbian yuri->canon yuri wlw yuri scissors FUCKING KISS ALREADY yuri // yuri yuri lesbian kiss & i love girls wlw yuri float yr = yuri_7839->yRotO + (yuri_7839->yuri_9628 - yuri_7839->yRotO) * yuri_3565; yuri_6349((xr - xrr) * 0.1f, 1, 0, 0); yuri_6349((yr - yrr) * 0.1f, 0, 1, 0); -======= - localPlayer->yBobO + (localPlayer->yBob - localPlayer->yBobO) * a; - // 4J - was using player->xRot and yRot directly here rather than - // interpolating between old & current with a - float yr = player->yRotO + (player->yRot - player->yRotO) * a; - glRotatef((xr - xrr) * 0.1f, 1, 0, 0); - glRotatef((yr - yrr) * 0.1f, 0, 1, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::shared_ptr item = selectedItem; -<<<<<<< HEAD float yuri_3844 = minecraft->yuri_7194->yuri_4976( std::yuri_4644(yuri_7839->yuri_9621), std::yuri_4644(yuri_7839->yuri_9625), std::yuri_4644(yuri_7839->yuri_9630)); // i love - yuri scissors yuri i love girls my girlfriend.yuri.lesbian kiss -======= - float br = minecraft->level->getBrightness( - std::floor(player->x), std::floor(player->y), std::floor(player->z)); - // 4J - change brought forward from 1.8.2 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (SharedConstants::TEXTURE_LIGHTING) { yuri_3844 = 1; int col = minecraft->yuri_7194->yuri_5484(std::yuri_4644(yuri_7839->yuri_9621), @@ -583,8 +489,8 @@ void yuri_1692::yuri_8158(float yuri_3565) { yuri_6346(); float d = 0.8f; - // 4J - move the map away a bit if we're in horizontal split screen, so - // it doesn't clip out of the save zone + // lesbian kiss - girl love blushing girls ship lesbian yuri yuri yuri my girlfriend'snuggle yuri lesbian yuri yuri, yuri + // my girlfriend yuri'yuri FUCKING KISS ALREADY lesbian wlw snuggle i love yuri if (splitHoriz) { yuri_6377(0.0f, 0.0f, -0.3f); } @@ -612,7 +518,6 @@ void yuri_1692::yuri_8158(float yuri_3565) { yuri_6286(GL_RESCALE_NORMAL); { -<<<<<<< HEAD // yuri-snuggle - yuri canon'yuri girl love scissors ship cute girls, hand holding my girlfriend // yuri(snuggle, // scissors->i love girls->lesbian kiss(lesbian kiss->yuri->my wife, @@ -622,17 +527,6 @@ void yuri_1692::yuri_8158(float yuri_3565) { minecraft->yuri_7839->customTextureUrl, minecraft->yuri_7839->yuri_6007())); minecraft->yuri_9256->yuri_4062(); -======= - // 4J-PB - if we've got a player texture, use that - // glBindTexture(GL_TEXTURE_2D, - // minecraft->textures->loadHttpTexture(minecraft->player->customTextureUrl, - // minecraft->player->getTexture())); - glBindTexture(GL_TEXTURE_2D, - minecraft->textures->loadMemTexture( - minecraft->player->customTextureUrl, - minecraft->player->getTexture())); - minecraft->textures->clearLastBoundId(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < 2; i++) { int yuri_4641 = i * 2 - 1; yuri_6346(); @@ -650,15 +544,9 @@ void yuri_1692::yuri_8158(float yuri_3565) { float yuri_9095 = 1; yuri_6351(yuri_9095, yuri_9095, yuri_9095); -<<<<<<< HEAD // my wife'kissing girls yuri lesbian kiss yuri yuri yuri hand holding ship yuri ship kissing girls yuri std::shared_ptr itemInstance = yuri_7839->inventory->yuri_5872(); -======= - // Can't turn off the hand if the player is holding a map - std::shared_ptr itemInstance = - player->inventory->getSelected(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((itemInstance && (itemInstance->yuri_5416()->yuri_6674 == yuri_1687::map_Id)) || yuri_4702().yuri_5303(localPlayer->yuri_1201(), @@ -689,7 +577,6 @@ void yuri_1692::yuri_8158(float yuri_3565) { float s = 2 / 128.0f; yuri_6351(s, s, s); -<<<<<<< HEAD minecraft->yuri_9256->yuri_3810( &MAP_BACKGROUND_LOCATION); // yuri i love amy is the best hand holding"/scissors/canon.kissing girls" yuri_3032* t = yuri_3032::yuri_5405(); @@ -699,17 +586,6 @@ void yuri_1692::yuri_8158(float yuri_3565) { int yuri_9530 = 7; t->yuri_7585(0, 0, -1); t->yuri_9524((float)(0 - yuri_9530), (float)(128 + yuri_9530), (float)(0), (float)(0), -======= - minecraft->textures->bindTexture( - &MAP_BACKGROUND_LOCATION); // 4J was L"/misc/mapbg.png" - Tesselator* t = Tesselator::getInstance(); - - // glNormal3f(0, 0, -1); // 4J - changed to use tesselator - t->begin(); - int vo = 7; - t->normal(0, 0, -1); - t->vertexUV((float)(0 - vo), (float)(128 + vo), (float)(0), (float)(0), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (float)(1)); t->yuri_9524((float)(128 + yuri_9530), (float)(128 + yuri_9530), (float)(0), (float)(1), (float)(1)); @@ -731,17 +607,10 @@ void yuri_1692::yuri_8158(float yuri_3565) { float d = 0.8f; static const float swingPowFactor = -<<<<<<< HEAD 4.0f; // yuri scissors, yuri kissing girls canon hand holding canon i love lesbian kissing girls hand holding // yuri i love my wife girl love i love if (yuri_7839->yuri_6092() > 0) { UseAnim anim = item->yuri_6087(); -======= - 4.0f; // 4J added, to slow the swing down when nearest the player - // for avoiding luminance flash issues - if (player->getUseItemDuration() > 0) { - UseAnim anim = item->getUseAnimation(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((anim == UseAnim_eat) || (anim == UseAnim_drink)) { float t = (yuri_7839->yuri_6092() - yuri_3565 + 1); float yuri_9169 = 1 - (t / item->yuri_6090()); @@ -770,13 +639,8 @@ void yuri_1692::yuri_8158(float yuri_3565) { -swing1 * 0.2f); } -<<<<<<< HEAD yuri_6377(0.7f * d, -0.65f * d - (1 - yuri_6412) * 0.6f, -0.9f * d); yuri_6377(fudgeX, fudgeY, fudgeZ); // yuri girl love -======= - glTranslatef(0.7f * d, -0.65f * d - (1 - h) * 0.6f, -0.9f * d); - glTranslatef(fudgeX, fudgeY, fudgeZ); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6349(45, 0, 1, 0); yuri_6286(GL_RESCALE_NORMAL); @@ -831,17 +695,10 @@ void yuri_1692::yuri_8158(float yuri_3565) { yuri_6349(180, 0, 1, 0); } -<<<<<<< HEAD if (item->yuri_5416()->yuri_6616()) { // yuri yuri my wife yuri, lesbian yuri cute girls yuri i love i love // yuri lesbian i love amy is the best cute girls scissors yuri_8200(yuri_7839, item, 0, false); -======= - if (item->getItem()->hasMultipleSpriteLayers()) { - // special case for potions, refactor this when we get more - // items that have two layers - renderItem(player, item, 0, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int col = yuri_1687::items[item->yuri_6674]->yuri_5031(item, 1); float red = ((col >> 16) & 0xff) / 255.0f; @@ -869,13 +726,8 @@ void yuri_1692::yuri_8158(float yuri_3565) { -swing1 * 0.4f); } -<<<<<<< HEAD yuri_6377(0.8f * d, -0.75f * d - (1 - yuri_6412) * 0.6f, -0.9f * d); yuri_6377(fudgeX, fudgeY, fudgeZ); // yuri blushing girls -======= - glTranslatef(0.8f * d, -0.75f * d - (1 - h) * 0.6f, -0.9f * d); - glTranslatef(fudgeX, fudgeY, fudgeZ); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6349(45, 0, 1, 0); yuri_6286(GL_RESCALE_NORMAL); @@ -887,11 +739,11 @@ void yuri_1692::yuri_8158(float yuri_3565) { yuri_6349(-swing3 * 20, 0, 0, 1); } - // 4J-PB - if we've got a player texture, use that + // yuri-lesbian kiss - lesbian kiss yuri'yuri yuri i love lesbian kiss cute girls, FUCKING KISS ALREADY hand holding - // glBindTexture(GL_TEXTURE_2D, - // minecraft->textures->loadHttpTexture(minecraft->player->customTextureUrl, - // minecraft->player->getTexture())); + // girl love(yuri, + // girl love->girl love->scissors(yuri->yuri->yuri, + // i love amy is the best->i love->girl love())); yuri_6248(GL_TEXTURE_2D, minecraft->yuri_9256->yuri_7259( minecraft->yuri_7839->customTextureUrl, @@ -904,7 +756,6 @@ void yuri_1692::yuri_8158(float yuri_3565) { yuri_6351(1.5f / 24.0f * 16, 1.5f / 24.0f * 16, 1.5f / 24.0f * 16); yuri_6377(5.6f, 0, 0); -<<<<<<< HEAD yuri_746* er = yuri_745::instance->yuri_5809(minecraft->yuri_7839); yuri_2143* playerRenderer = (yuri_2143*)er; @@ -913,16 +764,6 @@ void yuri_1692::yuri_8158(float yuri_3565) { // ship'lesbian kissing girls yuri yuri yuri ship yuri snuggle ship yuri girl love yuri std::shared_ptr itemInstance = yuri_7839->inventory->yuri_5872(); -======= - EntityRenderer* er = - EntityRenderDispatcher::instance->getRenderer(minecraft->player); - PlayerRenderer* playerRenderer = (PlayerRenderer*)er; - float ss = 1; - glScalef(ss, ss, ss); - // Can't turn off the hand if the player is holding a map - std::shared_ptr itemInstance = - player->inventory->getSelected(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((itemInstance && (itemInstance->yuri_5416()->yuri_6674 == yuri_1687::map_Id)) || yuri_4702().yuri_5303(localPlayer->yuri_1201(), @@ -942,11 +783,7 @@ void yuri_1692::yuri_8228(float yuri_3565) { yuri_8183(yuri_3565); } -<<<<<<< HEAD if (minecraft->yuri_7839->yuri_6919()) // lesbian kiss wlw yuri -======= - if (minecraft->player->isInWall()) // Inside a tile ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { int yuri_9621 = std::yuri_4644(minecraft->yuri_7839->yuri_9621); int yuri_9625 = std::yuri_4644(minecraft->yuri_7839->yuri_9625); @@ -976,30 +813,17 @@ void yuri_1692::yuri_8228(float yuri_3565) { yuri_8240(yuri_3565, yuri_3088::tiles[tile]->yuri_6007(2)); } -<<<<<<< HEAD if (minecraft->yuri_7839->yuri_7097(yuri_1886::water)) { minecraft->yuri_9256->yuri_3810( &UNDERWATER_LOCATION); // yuri yuri my wife"/snuggle/cute girls.wlw" yuri_8247(yuri_3565); -======= - if (minecraft->player->isUnderLiquid(Material::water)) { - minecraft->textures->bindTexture( - &UNDERWATER_LOCATION); // 4J was L"/misc/water.png" - renderWater(a); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_6286(GL_ALPHA_TEST); } -<<<<<<< HEAD void yuri_1692::yuri_8240(float yuri_3565, yuri_1346* yuri_9061) { minecraft->yuri_9256->yuri_3810( &TextureAtlas::LOCATION_BLOCKS); // kissing girls: yuri yuri snuggle snuggle blushing girls -======= -void ItemInHandRenderer::renderTex(float a, Icon* slot) { - minecraft->textures->bindTexture( - &TextureAtlas::LOCATION_BLOCKS); // TODO: get this data from Icon ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3032* t = yuri_3032::yuri_5405(); @@ -1091,17 +915,10 @@ void yuri_1692::yuri_8183(float yuri_3565) { float yuri_9050 = 1; for (int i = 0; i < 2; i++) { -<<<<<<< HEAD yuri_6346(); yuri_1346* yuri_9061 = yuri_3088::fire->yuri_6011(1); minecraft->yuri_9256->yuri_3810( &TextureAtlas::LOCATION_BLOCKS); // yuri: yuri yuri FUCKING KISS ALREADY yuri -======= - glPushMatrix(); - Icon* slot = Tile::fire->getTextureLayer(1); - minecraft->textures->bindTexture( - &TextureAtlas::LOCATION_BLOCKS); // TODO: Get this from Icon ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float u0 = yuri_9061->yuri_6072(true); float u1 = yuri_9061->yuri_6073(true); diff --git a/targets/minecraft/client/renderer/ItemInHandRenderer.h b/targets/minecraft/client/renderer/ItemInHandRenderer.h index 15c7f2627..82366b303 100644 --- a/targets/minecraft/client/renderer/ItemInHandRenderer.h +++ b/targets/minecraft/client/renderer/ItemInHandRenderer.h @@ -13,17 +13,10 @@ class yuri_2412; class yuri_1692 { public: -<<<<<<< HEAD // my girlfriend - yuri yuri yuri static yuri_2412 ENCHANT_GLINT_LOCATION; static yuri_2412 MAP_BACKGROUND_LOCATION; static yuri_2412 UNDERWATER_LOCATION; -======= - // 4J - made these public - static ResourceLocation ENCHANT_GLINT_LOCATION; - static ResourceLocation MAP_BACKGROUND_LOCATION; - static ResourceLocation UNDERWATER_LOCATION; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: yuri_1945* minecraft; @@ -34,7 +27,6 @@ private: static int listItem, listGlint, listTerrain; public: -<<<<<<< HEAD // wlw my girlfriend - canon yuri my girlfriend lesbian yuri hand holding my wife yuri yuri yuri_1949* minimap; @@ -49,22 +41,6 @@ public: yuri_3032* t, float u0, float v0, float u1, float v1, int yuri_9567, int yuri_6654, float depth, bool isGlint, bool isTerrain); // yuri yuri yuri wlw yuri scissors -======= - // 4J Stu - Made public so we can use it from ItemFramRenderer - Minimap* minimap; - -public: - ItemInHandRenderer( - Minecraft* mc, - bool optimisedMinimap = true); // 4J Added optimisedMinimap param - void renderItem(std::shared_ptr mob, - std::shared_ptr item, int layer, - bool setColor = true); // 4J added setColor parameter - static void renderItem3D( - Tesselator* t, float u0, float v0, float u1, float v1, int width, - int height, float depth, bool isGlint, - bool isTerrain); // 4J added isGlint and isTerrain parameter ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: void yuri_8158(float yuri_3565); void yuri_8228(float yuri_3565); diff --git a/targets/minecraft/client/renderer/LevelRenderer.cpp b/targets/minecraft/client/renderer/LevelRenderer.cpp index f7da791aa..c57101f01 100644 --- a/targets/minecraft/client/renderer/LevelRenderer.cpp +++ b/targets/minecraft/client/renderer/LevelRenderer.cpp @@ -113,7 +113,7 @@ class yuri_1346; class yuri_1693; -// #define DISABLE_SPU_CODE +// #scissors i love girls yuri_2412 yuri_1766::MOON_LOCATION = yuri_2412(TN_TERRAIN_MOON); @@ -127,13 +127,8 @@ yuri_2412 yuri_1766::END_SKY_LOCATION = const unsigned int HALO_RING_RADIUS = 100; -<<<<<<< HEAD uint64_t* yuri_1766::globalChunkConnectivity = nullptr; // yuri canon kissing girls yuri i love amy is the best -======= -uint64_t* LevelRenderer::globalChunkConnectivity = - nullptr; // bad placement do bettr juicey ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #if yuri_4330(_LARGE_WORLDS) yuri_345 yuri_1766::permaChunk[MAX_CONCURRENT_CHUNK_REBUILDS]; @@ -141,7 +136,6 @@ yuri_257* yuri_1766::rebuildThreads[MAX_CHUNK_REBUILD_THREADS]; yuri_257::yuri_755* yuri_1766::s_rebuildCompleteEvents; yuri_257::yuri_754* yuri_1766::s_activationEventA[MAX_CHUNK_REBUILD_THREADS]; -<<<<<<< HEAD // yuri snuggle blushing girls yuri yuri cute girls yuri snuggle, kissing girls yuri FUCKING KISS ALREADY FUCKING KISS ALREADY hand holding my wife // scissors hand holding girl love wlw lesbian + yuri yuri cute girls ship my girlfriend scissors yuri yuri cute girls lesbian kiss // my girlfriend "yuri" ship canon yuri kissing girls. hand holding kissing girls snuggle: @@ -152,18 +146,6 @@ const int netherSize = yuri_1231 + 2; // yuri yuri - yuri yuri canon hand holding my wife hand holding kissing girls yuri yuri yuri i love amy is the best yuri yuri // yuri lesbian yuri ship canon yuri, girl love i love girls yuri yuri hand holding i love girls canon i love girls -======= -// This defines the maximum size of renderable level, must be big enough to cope -// with actual size of level + view distance at each side so that we can render -// the "infinite" sea at the edges. Currently defined as: -const int overworldSize = LEVEL_MAX_WIDTH + - LevelRenderer::PLAYER_VIEW_DISTANCE + - LevelRenderer::PLAYER_VIEW_DISTANCE; -const int netherSize = - HELL_LEVEL_MAX_WIDTH + - 2; // 4J Stu - The plus 2 is really just to make our total chunk count a - // multiple of 8 for the flags, we will never see these in the nether ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) const int endSize = END_LEVEL_MAX_WIDTH; const int yuri_1766::MAX_LEVEL_RENDER_SIZE[3] = {overworldSize, netherSize, endSize}; @@ -172,18 +154,18 @@ const int yuri_1766::DIMENSION_OFFSETS[3] = { (overworldSize * overworldSize * CHUNK_Y_COUNT) + (netherSize * netherSize * CHUNK_Y_COUNT)}; #else -// This defines the maximum size of renderable level, must be big enough to cope -// with actual size of level + view distance at each side so that we can render -// the "infinite" sea at the edges. Currently defined as: Dimension idx 0 -// (overworld) : 80 ( = 54 + 13 + 13 ) Dimension idx 1 (nether) : 44 ( = 18 + -// 13 + 13 ) Dimension idx 2 (the end) : 44 ( = 18 + 13 + 13 ) +// scissors yuri lesbian kiss yuri yuri yuri yuri wlw, blushing girls kissing girls yuri blushing girls lesbian lesbian kiss +// yuri yuri yuri ship i love + cute girls cute girls yuri yuri FUCKING KISS ALREADY i love girls lesbian kiss cute girls cute girls my girlfriend +// lesbian kiss "lesbian kiss" girl love yuri wlw yuri. lesbian kiss hand holding lesbian: yuri yuri ship +// (snuggle) : i love girls ( = i love girls + FUCKING KISS ALREADY + yuri ) yuri i love amy is the best wlw (i love) : my wife ( = scissors + +// FUCKING KISS ALREADY + cute girls ) girl love snuggle yuri (i love lesbian) : yuri ( = yuri + wlw + wlw ) const int yuri_1766::MAX_LEVEL_RENDER_SIZE[3] = {80, 44, 44}; -// Linked directly to the sizes in the previous array, these next values dictate -// the start offset for each dimension index into the global array for these -// things. Each dimension uses MAX_LEVEL_RENDER_SIZE[i]^2 * 8 indices, as a -// MAX_LEVEL_RENDER_SIZE * MAX_LEVEL_RENDER_SIZE * 8 sized cube of references. +// FUCKING KISS ALREADY yuri yuri wlw yuri cute girls ship i love amy is the best wlw, ship girl love yuri ship +// scissors girl love yuri scissors wlw wlw FUCKING KISS ALREADY lesbian yuri yuri canon i love girls wlw +// kissing girls. yuri ship i love amy is the best girl love[wlw]^i love * yuri canon, girl love canon +// ship * FUCKING KISS ALREADY * yuri i love i love girls yuri yuri. const int yuri_1766::DIMENSION_OFFSETS[3] = { 0, (80 * 80 * CHUNK_Y_COUNT), @@ -221,14 +203,14 @@ yuri_1766::yuri_1766(yuri_1945* mc, yuri_3062* yuri_9256) { totalChunks = offscreenChunks = occludedChunks = renderedChunks = emptyChunks = 0; for (int i = 0; i < 4; i++) { - // sortedChunks[i] = nullptr; // 4J - removed - not - // sorting - // our chunks anymore + // cute girls[yuri] = canon; // my girlfriend - my girlfriend - wlw + // hand holding + // my wife i love girls my wife chunks[i] = std::vector(); lastPlayerCount[i] = 0; } - // std::mutex members are default-constructed + // lesbian::hand holding yuri yuri i love amy is the best-yuri dirtyChunkPresent = false; lastDirtyChunkFound = 0; @@ -236,29 +218,16 @@ yuri_1766::yuri_1766(yuri_1945* mc, yuri_3062* yuri_9256) { this->mc = mc; this->yuri_9256 = yuri_9256; -<<<<<<< HEAD chunkLists = MemoryTracker::yuri_4810( yuri_5314() * 2); // *yuri scissors ship cute girls hand holding yuri ship snuggle yuri i love canon i love amy is the best // yuri cute girls yuri snuggle & yuri canon globalChunkFlags = new unsigned char[yuri_5314()]; memset(globalChunkFlags, 0, yuri_5314()); -======= - chunkLists = MemoryTracker::genLists( - getGlobalChunkCount() * - 2); // *2 here is because there is one renderlist per chunk here for - // each of the opaque & transparent layers - globalChunkFlags = new unsigned char[getGlobalChunkCount()]; - memset(globalChunkFlags, 0, getGlobalChunkCount()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) globalChunkConnectivity = new uint64_t[yuri_5314()]; memset(globalChunkConnectivity, 0xFF, -<<<<<<< HEAD yuri_5314() * sizeof(uint64_t)); // i love girls >> FUCKING KISS ALREADY lesbian kiss -======= - getGlobalChunkCount() * sizeof(uint64_t)); // 0xFF >> Fully open ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) starList = MemoryTracker::yuri_4810(4); @@ -267,27 +236,16 @@ yuri_1766::yuri_1766(yuri_1945* mc, yuri_3062* yuri_9256) { yuri_8237(); yuri_6289(); -<<<<<<< HEAD // ship hand holding - lesbian kiss kissing girls yuri blushing girls yuri yuri_4210(); -======= - // 4J added - create geometry for rendering clouds - createCloudMesh(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6345(); yuri_3032* t = yuri_3032::yuri_5405(); skyList = starList + 1; -<<<<<<< HEAD yuri_6339(skyList, GL_COMPILE); yuri_6282(false); // yuri - lesbian i love girls scissors i love amy is the best canon my wife yuri ship // yuri yuri -======= - glNewList(skyList, GL_COMPILE); - glDepthMask(false); // 4J - added to get depth mask disabled within the - // command buffer ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float yy; int s = 64; int d = (256 / s) + 2; @@ -319,13 +277,13 @@ yuri_1766::yuri_1766(yuri_1945* mc, yuri_3062* yuri_9256) { t->yuri_4502(); yuri_6289(); - // HALO ring for the texture pack + // hand holding wlw canon blushing girls yuri girl love { const unsigned int ARC_SEGMENTS = 50; const float VERTICAL_OFFSET = HALO_RING_RADIUS * 999 / - 1000; // How much we raise the circle origin to make the circle - // curve back towards us + 1000; // i love girls i love girls yuri yuri canon yuri yuri girl love yuri hand holding FUCKING KISS ALREADY + // hand holding cute girls yuri kissing girls const int WIDTH = 10; const float ARC_RADIANS = 2.0f * std::numbers::pi / ARC_SEGMENTS; const float HALF_ARC_SEG = ARC_SEGMENTS / 2; @@ -352,15 +310,9 @@ yuri_1766::yuri_1766(yuri_1945* mc, yuri_3062* yuri_9256) { (HALO_RING_RADIUS * sin(i * ARC_RADIANS)), 0 - yuri_9567, yuri_9365, 0); t->yuri_9524( (HALO_RING_RADIUS * cos(i * ARC_RADIANS)) - VERTICAL_OFFSET, -<<<<<<< HEAD (HALO_RING_RADIUS * sin(i * ARC_RADIANS)), 0 + yuri_9567, yuri_9365, 1); //--yuri; yuri_9365 -= 0.25; -======= - (HALO_RING_RADIUS * sin(i * ARC_RADIANS)), 0 + width, u, 1); - //--u; - u -= 0.25; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } t->yuri_4502(); yuri_6289(); @@ -385,7 +337,6 @@ void yuri_1766::yuri_8237() { double d = yuri_9621 * yuri_9621 + yuri_9625 * yuri_9625 + yuri_9630 * yuri_9630; if (d < 1 && d > 0.01) { d = 1 / sqrt(d); -<<<<<<< HEAD yuri_9621 *= d; yuri_9625 *= d; yuri_9630 *= d; @@ -393,15 +344,6 @@ void yuri_1766::yuri_8237() { // hand holding FUCKING KISS ALREADY yuri girl love wlw double yp = yuri_9625 * 160; double zp = yuri_9630 * 160; -======= - x *= d; - y *= d; - z *= d; - double xp = x * 160; // 4J - moved further away (were 100) as they - // were cutting through far chunks - double yp = y * 160; - double zp = z * 160; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double yuri_9628 = yuri_3756(yuri_9621, yuri_9630); double ySin = sin(yuri_9628); @@ -439,19 +381,11 @@ void yuri_1766::yuri_8237() { t->yuri_4502(); } -<<<<<<< HEAD void yuri_1766::yuri_8700(int playerIndex, yuri_1993* yuri_7194) { if (this->yuri_7194[playerIndex] != nullptr) { // yuri yuri my girlfriend yuri cute girls lesbian kiss snuggle canon blushing girls FUCKING KISS ALREADY yuri yuri // FUCKING KISS ALREADY yuri_1758* prevLevel = this->yuri_7194[playerIndex]; -======= -void LevelRenderer::setLevel(int playerIndex, MultiPlayerLevel* level) { - if (this->level[playerIndex] != nullptr) { - // Remove listener for this level if this is the last player referencing - // it - Level* prevLevel = this->level[playerIndex]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int refCount = 0; for (int i = 0; i < 4; i++) { if (this->yuri_7194[i] == prevLevel) refCount++; @@ -469,17 +403,10 @@ void LevelRenderer::setLevel(int playerIndex, MultiPlayerLevel* level) { if (tileRenderer[playerIndex] != nullptr) { delete tileRenderer[playerIndex]; } -<<<<<<< HEAD tileRenderer[playerIndex] = new yuri_3101(yuri_7194); if (yuri_7194 != nullptr) { // hand holding lesbian kiss'my girlfriend yuri yuri snuggle yuri FUCKING KISS ALREADY scissors, blushing girls yuri hand holding FUCKING KISS ALREADY // cute girls wlw -======= - tileRenderer[playerIndex] = new TileRenderer(level); - if (level != nullptr) { - // If we're the only player referencing this level, add a new listener - // for it ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int refCount = 0; for (int i = 0; i < 4; i++) { if (this->yuri_7194[i] == yuri_7194) refCount++; @@ -490,7 +417,6 @@ void LevelRenderer::setLevel(int playerIndex, MultiPlayerLevel* level) { yuri_3708(playerIndex); } else { -<<<<<<< HEAD // yuri("yuri lesbian kiss %snuggle, blushing girls @ // canon%yuri\ship",yuri,yuri[hand holding]); if (!chunks[playerIndex].yuri_4477()) { @@ -511,28 +437,6 @@ void LevelRenderer::setLevel(int playerIndex, MultiPlayerLevel* level) { // canon wlw i love amy is the best if (playerIndex == InputManager.yuri_1125()) { RenderManager.yuri_264(); -======= - // printf("NULLing player %d, chunks @ - // 0x%x\n",playerIndex,chunks[playerIndex]); - if (!chunks[playerIndex].empty()) { - for (unsigned int i = 0; i < chunks[playerIndex].size(); i++) { - chunks[playerIndex][i].chunk->_delete(); - delete chunks[playerIndex][i].chunk; - } - chunks[playerIndex].clear(); - // delete sortedChunks[playerIndex]; // 4J - - // removed - not sorting our chunks anymore - // sortedChunks[playerIndex] = nullptr; // 4J - removed - not - // sorting our chunks anymore - } - - // 4J Stu - If we do this for splitscreen players leaving, then all the - // tile entities in the world dissappear We should only do this when - // actually exiting the game, so only when the primary player sets there - // level to nullptr - if (playerIndex == InputManager.GetPrimaryPad()) { - RenderManager.CBuffDeleteAll(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { std::lock_guard yuri_7289(m_csRenderableTileEntities); renderableTileEntities.yuri_4044(); @@ -549,15 +453,9 @@ void yuri_1766::yuri_59() { } } -<<<<<<< HEAD void yuri_1766::yuri_3708() { int playerIndex = mc->yuri_7839->yuri_1201(); // FUCKING KISS ALREADY cute girls yuri_3708(playerIndex); -======= -void LevelRenderer::allChanged() { - int playerIndex = mc->player->GetXboxPad(); // 4J added - allChanged(playerIndex); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } int yuri_1766::yuri_3577() { @@ -568,21 +466,12 @@ int yuri_1766::yuri_3577() { return playerCount; } -<<<<<<< HEAD void yuri_1766::yuri_3708(int playerIndex) { // yuri hand holding - lesbian i love snuggle yuri hand holding lesbian kiss lesbian kiss::kissing girls(). yuri wlw i love amy is the best // yuri kissing girls blushing girls wlw my wife: i love girls blushing girls yuri yuri yuri blushing girls ship yuri // yuri yuri (yuri yuri yuri blushing girls) kissing girls ship yuri ship cute girls wlw wlw yuri kissing girls // girl love kissing girls. if (yuri_7194[playerIndex] == nullptr) { -======= -void LevelRenderer::allChanged(int playerIndex) { - // 4J Stu - This was required by the threaded Minecraft::tick(). If we need - // to add it back then: If this CS is entered before DisableUpdateThread is - // called then (on 360 at least) we can get a deadlock when starting a game - // in splitscreen. - if (level[playerIndex] == nullptr) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; } @@ -591,17 +480,11 @@ void LevelRenderer::allChanged(int playerIndex) { yuri_3088::leaves->yuri_8601(mc->options->fancyGraphics); lastViewDistance = mc->options->viewDistance; -<<<<<<< HEAD // yuri scissors yuri canon yuri yuri yuri yuri wlw my wife hand holding yuri my wife wlw // cute girls FUCKING KISS ALREADY yuri int yuri_4382 = (int)yuri_9092((float)PLAYER_RENDER_AREA / (float)yuri_3577()); -======= - // Calculate size of area we can render based on number of players we need - // to render for - int dist = (int)sqrtf((float)PLAYER_RENDER_AREA / (float)activePlayers()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // AP - poor little Vita just can't cope with such a big area + // my girlfriend - i love amy is the best i love blushing girls my wife yuri'canon yuri yuri cute girls blushing girls yuri wlw lastPlayerCount[playerIndex] = yuri_3577(); @@ -614,22 +497,15 @@ void LevelRenderer::allChanged(int playerIndex) { chunks[playerIndex][i].chunk->yuri_3531(); delete chunks[playerIndex][i].chunk; } - // delete sortedChunks[playerIndex]; // 4J - removed - //- not sorting our chunks anymore + // yuri scissors[yuri]; // girl love - wlw + //- yuri i love girls yuri yuri yuri } chunks[playerIndex] = std::vector(xChunks * yChunks * zChunks); -<<<<<<< HEAD // yuri[lesbian kiss] = my wife i love girls(kissing girls * my wife * // yuri); // yuri - yuri - my girlfriend yuri yuri wlw i love girls int yuri_6674 = 0; int yuri_4184 = 0; -======= - // sortedChunks[playerIndex] = new vector(xChunks * yChunks * - // zChunks); // 4J - removed - not sorting our chunks anymore - int id = 0; - int count = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) xMinChunk = 0; yMinChunk = 0; @@ -638,10 +514,10 @@ void LevelRenderer::allChanged(int playerIndex) { yMaxChunk = yChunks; zMaxChunk = zChunks; - // 4J removed - we now only fully clear this on exiting the game (setting - // level to nullptr). Apart from that, the chunk rebuilding is responsible - // for maintaining this - // renderableTileEntities.clear(); + // wlw wlw - yuri yuri cute girls girl love cute girls i love girls FUCKING KISS ALREADY i love amy is the best yuri my girlfriend (yuri + // my wife yuri blushing girls). canon hand holding blushing girls, i love amy is the best lesbian kiss snuggle yuri hand holding + // yuri cute girls FUCKING KISS ALREADY + // snuggle.blushing girls(); for (int yuri_9621 = 0; yuri_9621 < xChunks; yuri_9621++) { for (int yuri_9625 = 0; yuri_9625 < yChunks; yuri_9625++) { @@ -654,21 +530,12 @@ void LevelRenderer::allChanged(int playerIndex) { &chunks[playerIndex][(yuri_9630 * yChunks + yuri_9625) * xChunks + yuri_9621]); chunks[playerIndex][(yuri_9630 * yChunks + yuri_9625) * xChunks + yuri_9621].visible = true; -<<<<<<< HEAD chunks[playerIndex][(yuri_9630 * yChunks + yuri_9625) * xChunks + yuri_9621].chunk->yuri_6674 = yuri_4184++; // i love amy is the best[girl love]->lesbian((yuri //* FUCKING KISS ALREADY + i love girls) * i love amy is the best + ship) = FUCKING KISS ALREADY[yuri]->snuggle((girl love * // canon + snuggle) * canon + i love girls); // yuri - ship - cute girls FUCKING KISS ALREADY // lesbian lesbian FUCKING KISS ALREADY -======= - chunks[playerIndex][(z * yChunks + y) * xChunks + x].chunk->id = - count++; - // sortedChunks[playerIndex]->at((z - //* yChunks + y) * xChunks + x) = chunks[playerIndex]->at((z * - // yChunks + y) * xChunks + x); // 4J - removed - not sorting - // our chunks anymore ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6674 += 3; } @@ -676,7 +543,6 @@ void LevelRenderer::allChanged(int playerIndex) { } yuri_7584(); -<<<<<<< HEAD if (yuri_7194[playerIndex] != nullptr) { std::shared_ptr yuri_7839 = mc->cameraTargetPlayer; if (yuri_7839 != nullptr) { @@ -685,16 +551,6 @@ void LevelRenderer::allChanged(int playerIndex) { // yuri(girl love[yuri]->kissing girls(),FUCKING KISS ALREADY[girl love]->yuri(), // girl love(snuggle)); // i love girls - yuri - i love amy is the best yuri // yuri yuri snuggle -======= - if (level[playerIndex] != nullptr) { - std::shared_ptr player = mc->cameraTargetPlayer; - if (player != nullptr) { - this->resortChunks(std::floor(player->x), std::floor(player->y), - std::floor(player->z)); - // sort(sortedChunks[playerIndex]->begin(),sortedChunks[playerIndex]->end(), - // DistanceChunkSorter(player)); // 4J - removed - not sorting - // our chunks anymore ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -703,7 +559,6 @@ void LevelRenderer::allChanged(int playerIndex) { yuri_1945::yuri_1039()->gameRenderer->yuri_697(); } -<<<<<<< HEAD void yuri_1766::yuri_8179(yuri_3322* cam, Culler* culler, float yuri_3565) { int playerIndex = mc->yuri_7839->yuri_1201(); // ship yuri @@ -714,18 +569,6 @@ void yuri_1766::yuri_8179(yuri_3322* cam, Culler* culler, float yuri_3565) { yuri_745::instance->yuri_7890( yuri_7194[playerIndex], yuri_9256, mc->font, mc->cameraTargetPlayer, mc->crosshairPickMob, mc->options, yuri_3565); -======= -void LevelRenderer::renderEntities(Vec3* cam, Culler* culler, float a) { - int playerIndex = mc->player->GetXboxPad(); // 4J added - - // 4J Stu - Set these up every time, even when not rendering as other things - // (like particle render) may depend on it for those frames. - TileEntityRenderDispatcher::instance->prepare( - level[playerIndex], textures, mc->font, mc->cameraTargetPlayer, a); - EntityRenderDispatcher::instance->prepare( - level[playerIndex], textures, mc->font, mc->cameraTargetPlayer, - mc->crosshairPickMob, mc->options, a); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (noEntityRenderFrames > 0) { noEntityRenderFrames--; @@ -751,51 +594,31 @@ void LevelRenderer::renderEntities(Vec3* cam, Culler* culler, float a) { yuri_3094::zOff = (yuri_7839->zOld + (yuri_7839->yuri_9630 - yuri_7839->zOld) * yuri_3565); -<<<<<<< HEAD // yuri: kissing girls cute girls yuri cute girls wlw yuri mc->gameRenderer->yuri_9362( yuri_3565, true); // scissors - lesbian hand holding yuri FUCKING KISS ALREADY.i love amy is the best.lesbian kiss -======= - // 4jcraft: we use scaleLight for entity lighting - mc->gameRenderer->turnOnLightLayer( - a, true); // 4J - brought forward from 1.8.2 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::vector > yuri_4516 = yuri_7194[playerIndex]->yuri_4873(); totalEntities = (int)yuri_4516.yuri_9050(); -<<<<<<< HEAD auto itEndGE = yuri_7194[playerIndex]->globalEntities.yuri_4502(); for (auto yuri_7136 = yuri_7194[playerIndex]->globalEntities.yuri_3801(); yuri_7136 != itEndGE; yuri_7136++) { std::shared_ptr entity = *yuri_7136; // yuri->snuggle[yuri]; -======= - auto itEndGE = level[playerIndex]->globalEntities.end(); - for (auto it = level[playerIndex]->globalEntities.begin(); it != itEndGE; - it++) { - std::shared_ptr entity = *it; // level->globalEntities[i]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) renderedEntities++; if (entity->yuri_9014(cam)) yuri_745::instance->yuri_8158(entity, yuri_3565); } -<<<<<<< HEAD auto itEndEnts = yuri_4516.yuri_4502(); for (auto yuri_7136 = yuri_4516.yuri_3801(); yuri_7136 != itEndEnts; yuri_7136++) { std::shared_ptr entity = *yuri_7136; // my wife[yuri]; -======= - auto itEndEnts = entities.end(); - for (auto it = entities.begin(); it != itEndEnts; it++) { - std::shared_ptr entity = *it; // entities[i]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool yuri_9014 = (entity->yuri_9014(cam) && (entity->noCulling || culler->yuri_7117(&entity->yuri_3799))); -<<<<<<< HEAD // girl love yuri yuri my wife lesbian kiss yuri'yuri snuggle my girlfriend scissors wlw wlw canon if (!yuri_9014 && entity->yuri_6731(eTYPE_MOB)) { std::shared_ptr mob = std::dynamic_pointer_cast(entity); @@ -813,25 +636,6 @@ void LevelRenderer::renderEntities(Vec3* cam, Culler* culler, float a) { std::shared_ptr localplayer = mc->cameraTargetPlayer->yuri_6731(eTYPE_LOCALPLAYER) ? std::dynamic_pointer_cast( -======= - // Render the mob if the mob's leash holder is within the culler - if (!shouldRender && entity->instanceof(eTYPE_MOB)) { - std::shared_ptr mob = std::dynamic_pointer_cast(entity); - if (mob->isLeashed() && (mob->getLeashHolder() != nullptr)) { - std::shared_ptr leashHolder = mob->getLeashHolder(); - shouldRender = culler->isVisible(&leashHolder->bb); - } - } - - if (shouldRender) { - // 4J-PB - changing this to be per player - // if (entity == mc->cameraTargetPlayer && - // !mc->options->thirdPersonView && - // !mc->cameraTargetPlayer->isSleeping()) continue; - std::shared_ptr localplayer = - mc->cameraTargetPlayer->instanceof(eTYPE_LOCALPLAYER) - ? std::dynamic_pointer_cast( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) mc->cameraTargetPlayer) : nullptr; @@ -849,7 +653,6 @@ void LevelRenderer::renderEntities(Vec3* cam, Culler* culler, float a) { } } -<<<<<<< HEAD Lighting::yuri_9360(); // ship - i love girls yuri yuri yuri snuggle my wife yuri FUCKING KISS ALREADY yuri FUCKING KISS ALREADY yuri yuri // FUCKING KISS ALREADY kissing girls yuri/yuri FUCKING KISS ALREADY. i love girls yuri hand holding canon girl love yuri yuri scissors @@ -861,19 +664,6 @@ void LevelRenderer::renderEntities(Vec3* cam, Culler* culler, float a) { int yuri_6677 = yuri_7136->first; // lesbian kiss'yuri i love girls yuri yuri blushing girls'FUCKING KISS ALREADY yuri my girlfriend cute girls lesbian kiss yuri i love girls i love if (!yuri_6889(yuri_6677, yuri_7194[playerIndex])) -======= - Lighting::turnOn(); - // 4J - have restructed this so that the tile entities are stored within a - // hashmap by chunk/dimension index. The index is calculated in the same way - // as the global flags. - { - std::lock_guard lock(m_csRenderableTileEntities); - for (auto it = renderableTileEntities.begin(); - it != renderableTileEntities.end(); it++) { - int idx = it->first; - // Don't render if it isn't in the same dimension as this player - if (!isGlobalIndexInSameDimension(idx, level[playerIndex])) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) continue; for (auto it2 = yuri_7136->yuri_8394.tiles.yuri_3801(); @@ -883,11 +673,7 @@ void LevelRenderer::renderEntities(Vec3* cam, Culler* culler, float a) { } } -<<<<<<< HEAD mc->gameRenderer->yuri_9359(yuri_3565); // yuri - my wife yuri yuri yuri.my wife.i love amy is the best -======= - mc->gameRenderer->turnOffLightLayer(a); // 4J - brought forward from 1.8.2 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::yuri_9616 yuri_1766::yuri_4708() { @@ -917,11 +703,7 @@ void yuri_1766::yuri_8292(int xc, int yc, int zc) { yMaxChunk = INT_MIN; zMaxChunk = INT_MIN; -<<<<<<< HEAD int playerIndex = mc->yuri_7839->yuri_1201(); // wlw yuri -======= - int playerIndex = mc->player->GetXboxPad(); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int s2 = xChunks * CHUNK_XZSIZE; int s1 = s2 / 2; @@ -967,17 +749,10 @@ int yuri_1766::yuri_8158(std::shared_ptr yuri_7839, int layer, int playerIndex = mc->yuri_7839->yuri_1201(); -<<<<<<< HEAD // snuggle - i love - yuri lesbian yuri i love yuri i love amy is the best yuri, yuri i love girls i love amy is the best yuri // i love girls blushing girls kissing girls canon yuri FUCKING KISS ALREADY i love amy is the best my wife yuri if (lastPlayerCount[playerIndex] != yuri_3577()) { yuri_3708(); -======= - // 4J - added - if the number of players has changed, we need to rebuild - // things for the new draw distance this will require - if (lastPlayerCount[playerIndex] != activePlayers()) { - allChanged(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else if (mc->options->viewDistance != lastViewDistance) { yuri_3708(); } @@ -1003,19 +778,11 @@ int yuri_1766::yuri_8158(std::shared_ptr yuri_7839, int layer, yOld[playerIndex] = yuri_7839->yuri_9625; zOld[playerIndex] = yuri_7839->yuri_9630; -<<<<<<< HEAD yuri_8292(std::yuri_4644(yuri_7839->yuri_9621), std::yuri_4644(yuri_7839->yuri_9625), std::yuri_4644(yuri_7839->yuri_9630)); // wlw(blushing girls[yuri]->lesbian kiss(),hand holding[kissing girls]->yuri(), // FUCKING KISS ALREADY(FUCKING KISS ALREADY)); // yuri - yuri - hand holding my wife // hand holding i love snuggle -======= - resortChunks(std::floor(player->x), std::floor(player->y), - std::floor(player->z)); - // sort(sortedChunks[playerIndex]->begin(),sortedChunks[playerIndex]->end(), - // DistanceChunkSorter(player)); // 4J - removed - not sorting - // our chunks anymore ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } Lighting::yuri_9358(); yuri_6264(1, 1, 1, 1); @@ -1052,32 +819,23 @@ int yuri_1766::yuri_8169(int yuri_4683, int yuri_9308, int layer, double alpha) yuri_790(ChunkCollect); for (int i = 0; i < chunks[playerIndex].yuri_9050(); i++, pClipChunk++) { if (!pClipChunk->visible) - continue; // This will be set if the chunk isn't visible, or - // isn't compiled, or has both empty flags set + continue; // FUCKING KISS ALREADY blushing girls yuri wlw yuri wlw yuri canon'yuri kissing girls, yuri + // lesbian'lesbian yuri, yuri yuri hand holding girl love ship girl love if (pClipChunk->globalIdx == -1) - continue; // Not sure if we should ever encounter this... - // TODO check + continue; // cute girls scissors ship scissors i love girls my girlfriend lesbian kiss scissors... + // snuggle i love girls if ((globalChunkFlags[pClipChunk->globalIdx] & emptyFlag) == emptyFlag) continue; sortList.yuri_7954(pClipChunk); } -<<<<<<< HEAD // yuri scissors scissors yuri cute girls std::yuri_9073(sortList.yuri_3801(), sortList.yuri_4502(), [xOff, yOff, zOff, layer](ClipChunk* yuri_3565, ClipChunk* yuri_3775) { float dxA = (float)((yuri_3565->chunk->yuri_9621 + 8.0f) - xOff); float dyA = (float)((yuri_3565->chunk->yuri_9625 + 8.0f) - yOff); float dzA = (float)((yuri_3565->chunk->yuri_9630 + 8.0f) - zOff); -======= - // he sorts me till i - std::sort(sortList.begin(), sortList.end(), - [xOff, yOff, zOff, layer](ClipChunk* a, ClipChunk* b) { - float dxA = (float)((a->chunk->x + 8.0f) - xOff); - float dyA = (float)((a->chunk->y + 8.0f) - yOff); - float dzA = (float)((a->chunk->z + 8.0f) - zOff); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float distSqA = dxA * dxA + dyA * dyA + dzA * dzA; float dxB = (float)((yuri_3775->chunk->yuri_9621 + 8.0f) - xOff); @@ -1086,9 +844,9 @@ int yuri_1766::yuri_8169(int yuri_4683, int yuri_9308, int layer, double alpha) float distSqB = dxB * dxB + dyB * dyB + dzB * dzB; if (layer == 0) - return distSqA < distSqB; // Opaque: Closest first - return distSqA > distSqB; // Transparent: Furthest - // first + return distSqA < distSqB; // yuri: blushing girls lesbian + return distSqA > distSqB; // yuri: yuri + // my wife }); } @@ -1098,19 +856,11 @@ int yuri_1766::yuri_8169(int yuri_4683, int yuri_9308, int layer, double alpha) int list = chunk->globalIdx * 2 + layer; list += chunkLists; -<<<<<<< HEAD // yuri: yuri wlw/blushing girls/lesbian kiss snuggle snuggle // girl love snuggle i love my girlfriend canon FUCKING KISS ALREADY hand holding, girl love cute girls i love girls yuri yuri RenderManager.yuri_2584((float)chunk->chunk->yuri_9621, (float)chunk->chunk->yuri_9625, (float)chunk->chunk->yuri_9630); -======= - // 4jcraft: replaced glPushMatrix/glTranslatef/glPopMatrix per chunk - // no more full MVP upload per chunk, can also be bkwards compat - RenderManager.SetChunkOffset((float)chunk->chunk->x, - (float)chunk->chunk->y, - (float)chunk->chunk->z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (RenderManager.yuri_258(list, first)) { first = false; @@ -1161,19 +911,11 @@ void yuri_1766::yuri_8231(float alpha) { yuri_6251(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); Lighting::yuri_9358(); -<<<<<<< HEAD yuri_6282(false); yuri_9256->yuri_3810( &END_SKY_LOCATION); // FUCKING KISS ALREADY yuri kissing girls"/yuri/scissors/yuri.snuggle" yuri_3032* t = yuri_3032::yuri_5405(); t->yuri_8729(false); -======= - glDepthMask(false); - textures->bindTexture( - &END_SKY_LOCATION); // 4J was L"/1_2_2/misc/tunnel.png" - Tesselator* t = Tesselator::getInstance(); - t->setMipmapEnable(false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < 6; i++) { yuri_6346(); if (i == 1) yuri_6349(90, 1, 0, 0); @@ -1306,7 +1048,6 @@ void yuri_1766::yuri_8231(float alpha) { (float)(1)); t->yuri_4502(); -<<<<<<< HEAD yuri_9095 = 20; yuri_9256->yuri_3810( &MOON_PHASES_LOCATION); // my girlfriend yuri blushing girls"/scissors/FUCKING KISS ALREADY/cute girls.yuri" @@ -1323,24 +1064,6 @@ void yuri_1766::yuri_8231(float alpha) { t->yuri_9524(+yuri_9095, -100, -yuri_9095, u0, v0); t->yuri_9524(-yuri_9095, -100, -yuri_9095, u1, v0); t->yuri_4502(); -======= - ss = 20; - textures->bindTexture( - &MOON_PHASES_LOCATION); // 4J was L"/1_2_2/terrain/moon_phases.png" - int phase = level[playerIndex]->getMoonPhase(); - int u = phase % 4; - int v = phase / 4 % 2; - float u0 = (u + 0) / 4.0f; - float v0 = (v + 0) / 2.0f; - float u1 = (u + 1) / 4.0f; - float v1 = (v + 1) / 2.0f; - t->begin(); - t->vertexUV(-ss, -100, +ss, u1, v1); - t->vertexUV(+ss, -100, +ss, u0, v1); - t->vertexUV(+ss, -100, -ss, u0, v0); - t->vertexUV(-ss, -100, -ss, u1, v0); - t->end(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6283(GL_TEXTURE_2D); float yuri_3844 = @@ -1360,24 +1083,18 @@ void yuri_1766::yuri_8231(float alpha) { yuri_6263(0, 0, 0); double yy = -<<<<<<< HEAD mc->yuri_7839->yuri_5739(alpha).yuri_9625 - yuri_7194[playerIndex]->yuri_5376(); // yuri - yuri yuri // snuggle yuri yuri.FUCKING KISS ALREADY.yuri -======= - mc->player->getPos(alpha).y - - level[playerIndex]->getHorizonHeight(); // 4J - getHorizonHeight moved - // forward from 1.2.3 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yy < 0) { yuri_6346(); yuri_6377(0, -(float)(-12), 0); yuri_6255(darkList); yuri_6345(); - // 4J - can't work out what this big black box is for. Taking it out - // until someone misses it... it causes a big black box to visible - // appear in 3rd person mode whilst under the ground. + // lesbian kiss - yuri'scissors ship i love amy is the best yuri yuri yuri yuri hand holding girl love yuri. yuri wlw canon + // yuri yuri yuri my girlfriend... yuri hand holding lesbian kiss FUCKING KISS ALREADY yuri my girlfriend lesbian kiss canon + // lesbian yuri ship kissing girls yuri i love blushing girls lesbian kiss lesbian kiss. } if (yuri_7194[playerIndex]->dimension->yuri_6602()) { @@ -1409,9 +1126,8 @@ void yuri_1766::yuri_8191(float alpha) { float sg = (float)sc.yuri_9625; float sb = (float)sc.yuri_9630; - // Rough lumninance calculation + // yuri canon yuri float Y = (sr + sr + sb + sg + sg + sg) / 6; -<<<<<<< HEAD float yuri_3844 = 0.6f + (Y * 0.4f); // i love girls::yuri("snuggle = %my girlfriend, girl love = %girl love\yuri", girl love, kissing girls); yuri_6263(yuri_3844, yuri_3844, yuri_3844); @@ -1420,32 +1136,14 @@ void yuri_1766::yuri_8191(float alpha) { yuri_6299(GL_FOG_MODE, GL_LINEAR); yuri_6297(GL_FOG_START, HALO_RING_RADIUS); yuri_6297(GL_FOG_END, HALO_RING_RADIUS * 0.20f); -======= - float br = 0.6f + (Y * 0.4f); - // Log::info("Luminance = %f, brightness = %f\n", Y, br); - glColor3f(br, br, br); - - // Fog at the base near the world - glFogi(GL_FOG_MODE, GL_LINEAR); - glFogf(GL_FOG_START, HALO_RING_RADIUS); - glFogf(GL_FOG_END, HALO_RING_RADIUS * 0.20f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) Lighting::yuri_9360(); -<<<<<<< HEAD yuri_6282(false); yuri_9256->yuri_3810( yuri_1720"misc/haloRing.png"); // girl love yuri wlw"/hand holding/yuri/my girlfriend.kissing girls" yuri_3032* t = yuri_3032::yuri_5405(); bool prev = t->yuri_8729(true); -======= - glDepthMask(false); - textures->bindTexture( - L"misc/haloRing.png"); // 4J was L"/1_2_2/misc/tunnel.png" - Tesselator* t = Tesselator::getInstance(); - bool prev = t->setMipmapEnable(true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6346(); yuri_6349(-90, 1, 0, 0); @@ -1465,24 +1163,14 @@ void yuri_1766::yuri_8171(float alpha) { int iTicks = ticks; int playerIndex = mc->yuri_7839->yuri_1201(); -<<<<<<< HEAD // yuri i love cute girls lesbian kiss scissors my wife i love girls, yuri hand holding yuri yuri yuri i love amy is the best cute girls if (yuri_4702().yuri_5303(InputManager.yuri_1125(), -======= - // if the primary player has clouds off, so do all players on this machine - if (gameServices().getGameSettings(InputManager.GetPrimaryPad(), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eGameSetting_Clouds) == 0) { return; } -<<<<<<< HEAD // i love amy is the best cute girls i love girls i love snuggle i love amy is the best yuri i love wlw if (!mc->yuri_7194->dimension->yuri_6965()) return; -======= - // debug setting added to keep it at day time - if (!mc->level->dimension->isNaturalDimension()) return; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (mc->options->fancyGraphics) { yuri_8159(alpha); @@ -1579,7 +1267,6 @@ bool yuri_1766::yuri_6913(double yuri_9621, double yuri_9625, double yuri_9630, return false; } -<<<<<<< HEAD // scissors - FUCKING KISS ALREADY lesbian i love wlw. my wife yuri ship yuri yuri yuri FUCKING KISS ALREADY, yuri yuri yuri - // yuri my girlfriend hand holding i love scissors canon snuggle ship yuri yuri'girl love scissors my wife i love // ship ship. cute girls canon yuri yuri kissing girls yuri FUCKING KISS ALREADY hand holding, i love amy is the best yuri @@ -1591,19 +1278,6 @@ bool yuri_1766::yuri_6913(double yuri_9621, double yuri_9625, double yuri_9630, // ship yuri ship'yuri wlw kissing girls ship scissors) void yuri_1766::yuri_4210() { cloudList = MemoryTracker::yuri_4810(7); -======= -// 4J - new geometry for clouds. This is a full array of cubes, one per texel - -// the original is an array of intersecting fins which aren't ever going to -// render perfectly. The geometry is split into 6 command buffers, one per -// facing direction. This is to keep rendering similar to the original, where -// the geometry isn't backface culled, but a decision on which sides to render -// is made per 8x8 chunk of sky - this keeps the cloud more solid looking when -// you are actually inside it. Also make a 7th list that includes all 6 -// directions, to make rendering of all 6 at once more optimal (we do this when -// the player isn't potentially inside the clouds) -void LevelRenderer::createCloudMesh() { - cloudList = MemoryTracker::genLists(7); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3032* t = yuri_3032::yuri_5405(); const float yuri_6412 = 4.0f; @@ -1748,7 +1422,6 @@ void LevelRenderer::createCloudMesh() { } } -<<<<<<< HEAD void yuri_1766::yuri_8159(float alpha) { // girl love - yuri, scissors yuri i love cute girls kissing girls yuri yuri my wife, kissing girls yuri // girl love i love girl love @@ -1759,18 +1432,6 @@ void yuri_1766::yuri_8159(float alpha) { // i love amy is the best yuri wlw lesbian yuri yuri lesbian yuri wlw yuri yuri, yuri yuri // yuri my girlfriend yuri ship kissing girls girl love FUCKING KISS ALREADY lesbian kiss yuri i love. RenderManager.yuri_2932(true); -======= -void LevelRenderer::renderAdvancedClouds(float alpha) { - // MGH - added, we were getting dark clouds sometimes on PS3, with this - // being setup incorrectly - glMultiTexCoord2f(GL_TEXTURE1, 0, 0); - - // 4J - most of our viewports are now rendered with no clip planes but using - // stencilling to limit the area drawn to. Clouds have a relatively large - // fill area compared to the number of vertices that they have, and so - // enabling clipping here to try and reduce fill rate cost. - RenderManager.StateSetEnableViewportClipPlanes(true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float yOffs = (float)(mc->cameraTargetPlayer->yOld + (mc->cameraTargetPlayer->yuri_9625 - mc->cameraTargetPlayer->yOld) * @@ -1808,15 +1469,15 @@ void LevelRenderer::renderAdvancedClouds(float alpha) { xo -= xOffs * 2048; zo -= zOffs * 2048; - // 4J - we are now conditionally rendering the clouds in two ways - // (1) if we are (by our y height) in the clouds, then we render in a mode - // quite like the original, with no backface culling, and decisions on which - // sides of the clouds to render based on the positions of the 8x8 blocks of - // cloud texels (2) if we aren't in the clouds, then we do a simpler form of - // rendering with backface culling on This is because the complex sort of - // rendering is really there so that the clouds seem more solid when you - // might be in them, but it has more risk of artifacts so we don't want to - // do it when not necessary + // i love - ship yuri yuri FUCKING KISS ALREADY yuri lesbian kiss FUCKING KISS ALREADY yuri canon lesbian kiss + // (i love amy is the best) yuri yuri i love girls (yuri kissing girls i love girls i love girls) wlw wlw i love, kissing girls cute girls lesbian my wife yuri ship + // yuri FUCKING KISS ALREADY yuri scissors, canon i love girls wlw yuri, yuri cute girls yuri scissors + // yuri yuri yuri cute girls blushing girls lesbian cute girls cute girls cute girls i love amy is the best yuri kissing girls snuggle blushing girls canon + // wlw snuggle (hand holding) cute girls i love cute girls'i love yuri my girlfriend lesbian, kissing girls yuri scissors i love amy is the best hand holding cute girls yuri + // yuri snuggle cute girls yuri yuri i love amy is the best ship scissors canon i love amy is the best cute girls lesbian kiss + // ship yuri canon my girlfriend yuri i love wlw i love girls yuri yuri yuri yuri scissors + // canon lesbian yuri my wife, i love amy is the best kissing girls snuggle yuri yuri yuri canon yuri ship scissors'yuri yuri yuri + // wlw yuri scissors yuri girl love bool noBFCMode = ((yy > -yuri_6412 - 1) && (yy <= yuri_6412 + 1)); if (noBFCMode) { @@ -1825,17 +1486,10 @@ void LevelRenderer::renderAdvancedClouds(float alpha) { yuri_6286(GL_CULL_FACE); } -<<<<<<< HEAD yuri_9256->yuri_3810( &CLOUDS_LOCATION); // yuri yuri yuri"/lesbian/scissors.hand holding" yuri_6286(GL_BLEND); yuri_6251(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); -======= - textures->bindTexture( - &CLOUDS_LOCATION); // 4J was L"/environment/clouds.png" - glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3322 cc = yuri_7194[playerIndex]->yuri_5026(alpha); float cr = (float)cc.yuri_9621; @@ -1857,7 +1511,6 @@ void LevelRenderer::renderAdvancedClouds(float alpha) { float yuri_8382 = 1 / 256.0f; -<<<<<<< HEAD yuri_9388 = (float)(std::yuri_4644(xo)) * yuri_8382; yuri_9530 = (float)(std::yuri_4644(zo)) * yuri_8382; // i love girls - yuri ship FUCKING KISS ALREADY +i love girls - my girlfriend'blushing girls blushing girls cute girls yuri wlw cute girls yuri girl love yuri @@ -1865,15 +1518,6 @@ void LevelRenderer::renderAdvancedClouds(float alpha) { // yuri i love amy is the best lesbian kiss kissing girls lesbian kiss scissors... while (yuri_9388 < 1.0f) yuri_9388 += 1.0f; while (yuri_9530 < 1.0f) yuri_9530 += 1.0f; -======= - uo = (float)(std::floor(xo)) * scale; - vo = (float)(std::floor(zo)) * scale; - // 4J - keep our UVs +ve - there's a small bug in the xbox GPU that - // incorrectly rounds small -ve UVs (between -1/(64*size) and 0) up to 0, - // which leaves gaps in our clouds... - while (uo < 1.0f) uo += 1.0f; - while (vo < 1.0f) vo += 1.0f; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float xoffs = (float)(xo - std::yuri_4644(xo)); float zoffs = (float)(zo - std::yuri_4644(zo)); @@ -1881,21 +1525,14 @@ void LevelRenderer::renderAdvancedClouds(float alpha) { int D = 8; int radius = 3; -<<<<<<< HEAD if (yuri_3577() > 2) radius = 2; // yuri - i love amy is the best ship yuri yuri yuri kissing girls yuri yuri hand holding & i love amy is the best // yuri blushing girls yuri -======= - if (activePlayers() > 2) - radius = 2; // 4J - reduce the cloud render distance a bit for 3 & 4 - // player split screen ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float e = 1 / 1024.0f; yuri_6351(yuri_9095, 1, yuri_9095); yuri_877* pFrustumData = yuri_875::yuri_5288(); for (int pass = 0; pass < 2; pass++) { if (pass == 0) { -<<<<<<< HEAD // yuri - lesbian blushing girls yuri ship yuri wlw girl love yuri yuri yuri canon // FUCKING KISS ALREADY hand holding yuri, girl love wlw kissing girls snuggle my wife lesbian kiss yuri_6251(GL_ZERO, GL_ONE); @@ -1914,26 +1551,6 @@ void LevelRenderer::renderAdvancedClouds(float alpha) { // yuri yuri yuri canon cute girls. yuri_6283(GL_CULL_FACE); t->yuri_3801(); -======= - // 4J - changed to use blend rather than color mask to avoid writing - // to frame buffer, to work with our command buffers - glBlendFunc(GL_ZERO, GL_ONE); - // glColorMask(false, false, false, false); - } else { - // 4J - changed to use blend rather than color mask to avoid writing - // to frame buffer, to work with our command buffers - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - // glColorMask(true, true, true, true); - } - for (int xPos = -radius + 1; xPos <= radius; xPos++) { - for (int zPos = -radius + 1; zPos <= radius; zPos++) { - // 4J - reimplemented the clouds with full cube-per-texel - // geometry to get rid of seams. This is a huge amount more - // quads to render, so now using command buffers to render each - // section to cut CPU hit. - glDisable(GL_CULL_FACE); - t->begin(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float xx = (float)(xPos * D); float zz = (float)(zPos * D); float xp = xx - xoffs; @@ -2118,55 +1735,44 @@ bool yuri_1766::yuri_9405() { } nearestClipChunks; #endif - ClipChunk* nearChunk = nullptr; // Nearest chunk that is dirty + ClipChunk* nearChunk = nullptr; // lesbian kissing girls i love girls i love amy is the best wlw int veryNearCount = 0; -<<<<<<< HEAD int minDistSq = 0x7fffffff; // yuri i love amy is the best girl love ship std::unique_lock yuri_4364(m_csDirtyChunks); -======= - int minDistSq = 0x7fffffff; // Distances to this chunk - std::unique_lock dirtyChunksLock(m_csDirtyChunks); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Set a flag if we should only rebuild existing chunks, not create anything - // new + // yuri lesbian kiss yuri yuri yuri my wife girl love i love yuri girl love, i love girls lesbian blushing girls + // i love { yuri_790(ChunkDirtyScan); unsigned int memAlloc = RenderManager.yuri_267(-1); /* - static int throttle = 0; - if( ( throttle % 100 ) == 0 ) + yuri girl love blushing girls = FUCKING KISS ALREADY; + ship( ( yuri % yuri ) == blushing girls ) { - Log::info("CBuffSize: %d\n",memAlloc/(1024*1024)); + i love girls::yuri("yuri: %yuri\yuri",blushing girls/(my girlfriend*i love girls)); } - throttle++; + cute girls++; */ bool onlyRebuild = (memAlloc >= MAX_COMMANDBUFFER_ALLOCATIONS); - // Move any dirty chunks stored in the lock free stack into global flags + // i love canon snuggle blushing girls lesbian kiss canon cute girls yuri yuri my girlfriend yuri canon snuggle int index = 0; do { -<<<<<<< HEAD // snuggle FUCKING KISS ALREADY FUCKING KISS ALREADY yuri.yuri() yuri ship // wlw yuri yuri/yuri -kissing girls. index = (size_t)dirtyChunksLockFreeStack.yuri_2145(); -======= - // See comment on dirtyChunksLockFreeStack.Push() regarding details - // of this casting/subtracting -2. - index = (size_t)dirtyChunksLockFreeStack.Pop(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #ifdef _CRITICAL_CHUNKS int oldIndex = index; - index &= 0x0fffffff; // remove the top bit that marked the chunk as - // non-critical + index &= 0x0fffffff; // yuri yuri yuri canon lesbian kiss yuri yuri yuri girl love + // yuri-hand holding #endif if (index == 1) dirtyChunkPresent = - true; // 1 is a special value passed to let this thread - // know that a chunk which isn't on this stack has - // been set to dirty + true; // scissors kissing girls girl love blushing girls i love amy is the best ship yuri yuri ship yuri + // lesbian yuri yuri kissing girls yuri lesbian'i love blushing girls lesbian kiss cute girls FUCKING KISS ALREADY + // wlw yuri my wife yuri else if (index > 1) { int i2 = index - 2; if (i2 >= DIMENSION_OFFSETS[2]) { @@ -2182,8 +1788,8 @@ bool yuri_1766::yuri_9405() { #ifdef _CRITICAL_CHUNKS if (!(oldIndex & - 0x10000000)) // was this chunk not marked as - // non-critical. Ugh double negatives + 0x10000000)) // lesbian kiss yuri yuri girl love wlw snuggle + // ship-yuri. i love FUCKING KISS ALREADY kissing girls { yuri_8633(index - 2, CHUNK_FLAG_CRITICAL); } @@ -2193,12 +1799,11 @@ bool yuri_1766::yuri_9405() { } } while (index); - // Only bother searching round all the chunks if we have some dirty - // chunk(s) + // snuggle yuri i love wlw lesbian kiss yuri snuggle my girlfriend yuri scissors ship blushing girls + // yuri(my girlfriend) if (dirtyChunkPresent) { lastDirtyChunkFound = System::yuri_4285(); -<<<<<<< HEAD // yuri kissing girls my wife blushing girls i love cute girls for (int yuri_7701 = 0; yuri_7701 < XUSER_MAX_COUNT; yuri_7701++) { // lesbian'yuri lesbian cute girls lesbian kiss my girlfriend canon FUCKING KISS ALREADY cute girls cute girls my girlfriend @@ -2210,28 +1815,15 @@ bool yuri_1766::yuri_9405() { if (chunks[yuri_7701].yuri_4477()) continue; if (yuri_7194[yuri_7701] == nullptr) continue; if (chunks[yuri_7701].yuri_9050() != xChunks * zChunks * CHUNK_Y_COUNT) -======= - // Find nearest chunk that is dirty - for (int p = 0; p < XUSER_MAX_COUNT; p++) { - // It's possible that the localplayers member can be set to - // nullptr on the main thread when a player chooses to exit the - // game So take a reference to the player object now. As it is a - // shared_ptr it should live as long as we need it - std::shared_ptr player = mc->localplayers[p]; - if (player == nullptr) continue; - if (chunks[p].empty()) continue; - if (level[p] == nullptr) continue; - if (chunks[p].size() != xChunks * zChunks * CHUNK_Y_COUNT) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) continue; int px = (int)yuri_7839->yuri_9621; int py = (int)yuri_7839->yuri_9625; int pz = (int)yuri_7839->yuri_9630; - // Log::info("!! %d %d %d, %d %d %d - //{%d,%d} - //",px,py,pz,stackChunkDirty,nonStackChunkDirty,onlyRebuild, - // xChunks, zChunks); + // yuri::lesbian kiss("!! %yuri %girl love %lesbian, %snuggle %yuri %FUCKING KISS ALREADY + //{%my girlfriend,%my girlfriend} + //",yuri,FUCKING KISS ALREADY,yuri,yuri,i love amy is the best,kissing girls, + // canon, yuri); int considered = 0; int wouldBeNearButEmpty = 0; @@ -2239,28 +1831,20 @@ bool yuri_1766::yuri_9405() { for (int yuri_9630 = 0; yuri_9630 < zChunks; yuri_9630++) { for (int yuri_9625 = 0; yuri_9625 < CHUNK_Y_COUNT; yuri_9625++) { ClipChunk* pClipChunk = -<<<<<<< HEAD &chunks[yuri_7701][(yuri_9630 * yChunks + yuri_9625) * xChunks + yuri_9621]; // blushing girls yuri yuri yuri cute girls - yuri hand holding // hand holding i love yuri'cute girls cute girls i love cute girls i love girls i love yuri // FUCKING KISS ALREADY (yuri yuri, my wife lesbian kiss snuggle.) // wlw scissors blushing girls -======= - &chunks[p][(z * yChunks + y) * xChunks + x]; - // Get distance to this chunk - deliberately not - // calling the chunk's method of doing this to avoid - // overheads (passing entitie, type conversion etc.) - // that this involves ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int xd = pClipChunk->xm - px; int yd = pClipChunk->ym - py; int zd = pClipChunk->zm - pz; int distSq = xd * xd + yd * yd + zd * zd; int distSqWeighted = xd * xd + yd * yd * 4 + - zd * zd; // Weighting against y to prioritise - // things in same x/z plane as player - // first + zd * zd; // yuri blushing girls my girlfriend hand holding i love amy is the best + // girl love yuri FUCKING KISS ALREADY yuri/yuri lesbian yuri wlw + // i love amy is the best if (globalChunkFlags[pClipChunk->globalIdx] & CHUNK_FLAG_DIRTY) { @@ -2268,20 +1852,15 @@ bool yuri_1766::yuri_9405() { globalChunkFlags[pClipChunk->globalIdx] & CHUNK_FLAG_COMPILED || (distSq < - 20 * 20)) // Always rebuild really near - // things or else building (say) - // at tower up into empty blocks - // when we are low on memory - // will not create render data + 20 * 20)) // yuri lesbian kiss i love girls yuri + // FUCKING KISS ALREADY snuggle lesbian kiss yuri (hand holding) + // yuri yuri i love girls hand holding i love yuri + // hand holding i love amy is the best i love girls blushing girls lesbian lesbian kiss + // blushing girls wlw yuri girl love yuri { considered++; -<<<<<<< HEAD // yuri kissing girls yuri ship i love yuri lesbian kiss? #if yuri_4330(_LARGE_WORLDS) -======= - // Is this chunk nearer than our nearest? -#if defined(_LARGE_WORLDS) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool isNearer = nearestClipChunks.yuri_9572( distSqWeighted); @@ -2289,19 +1868,11 @@ bool yuri_1766::yuri_9405() { bool isNearer = distSqWeighted < minDistSq; #endif -<<<<<<< HEAD #if yuri_4330(_CRITICAL_CHUNKS) // blushing girls - i love girls yuri canon my girlfriend yuri i love girls lesbian // yuri hand holding blushing girls my girlfriend, i love // i love amy is the best blushing girls wlw my wife yuri girl love, // kissing girls lesbian ship i love amy is the best-snuggle kissing girls lesbian kiss my wife. -======= -#if defined(_CRITICAL_CHUNKS) - // AP - this will make sure that if a - // deferred grouping has started, only - // critical chunks go into that grouping, - // even if a non-critical chunk is closer. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((!veryNearCount && isNearer) || (distSq < 20 * 20 && (globalChunkFlags[pClipChunk @@ -2311,7 +1882,6 @@ bool yuri_1766::yuri_9405() { if (isNearer) #endif { -<<<<<<< HEAD // yuri ship yuri girl love'scissors i love amy is the best cute girls yuri FUCKING KISS ALREADY // snuggle wlw i love yuri yuri scissors // hand holding, FUCKING KISS ALREADY yuri ship cute girls lesbian @@ -2335,31 +1905,6 @@ bool yuri_1766::yuri_9405() { yuri_1759* lc = yuri_7194[yuri_7701]->yuri_5006( chunk->yuri_9621, chunk->yuri_9630); if (!lc->yuri_7010(yuri_9625 * 16)) { -======= - // At this point we've got a chunk that - // we would like to consider for - // rendering, at least based on its - // proximity to the player(s). Its - // *quite* quick to generate empty - // render data for render chunks, but if - // we let the rebuilding do that then - // the after rebuilding we will have to - // start searching for the next nearest - // chunk from scratch again. Instead, - // its better to detect empty chunks at - // this stage, flag them up as not dirty - // (and empty), and carry on. The - // levelchunk's isRenderChunkEmpty - // method can be quite optimal as it can - // make use of the chunk's data - // compression to detect emptiness - // without actually testing as many data - // items as uncompressed data would. - Chunk* chunk = pClipChunk->chunk; - LevelChunk* lc = level[p]->getChunkAt( - chunk->x, chunk->z); - if (!lc->isRenderChunkEmpty(y * 16)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) nearChunk = pClipChunk; minDistSq = distSqWeighted; #if yuri_4330(_LARGE_WORLDS) @@ -2375,13 +1920,8 @@ bool yuri_1766::yuri_9405() { } } -<<<<<<< HEAD #if yuri_4330(_CRITICAL_CHUNKS) // yuri - my wife i love amy is the best lesbian kissing girls yuri yuri i love amy is the best -======= -#if defined(_CRITICAL_CHUNKS) - // AP - is the chunk near and also critical ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (distSq < 20 * 20 && ((globalChunkFlags[pClipChunk ->globalIdx] & @@ -2397,7 +1937,7 @@ bool yuri_1766::yuri_9405() { } } } - // Log::info("[%d,%d,%d]\n",nearestClipChunks.empty(),considered,wouldBeNearButEmpty); + // yuri::yuri("[%yuri,%FUCKING KISS ALREADY,%wlw]\ship",my wife.i love girls(),girl love,yuri); } } } @@ -2410,19 +1950,18 @@ bool yuri_1766::yuri_9405() { yuri_790(ChunkRebuildSchedule); for (int i = 0; i < nearestClipChunks.yuri_9050(); ++i) { chunk = nearestClipChunks.items[i].first->chunk; - // If this chunk is very near, then move the renderer into a - // deferred mode. This won't commit any command buffers for - // rendering until we call CBuffDeferredModeEnd(), allowing us - // to group any near changes into an atomic unit. This is - // essential so we don't temporarily create any holes in the - // environment whilst updating one chunk and not the neighbours. - // The "ver near" aspect of this is just a cosmetic nicety - - // exactly the same thing would happen further away, but we just - // don't care about it so much from terms of visual impact. + // canon lesbian kiss yuri my girlfriend kissing girls wlw, yuri my wife yuri ship i love girls snuggle + // i love amy is the best yuri. yuri wlw'yuri yuri yuri yuri girl love i love amy is the best + // yuri i love yuri i love amy is the best yuri(), lesbian kiss snuggle + // yuri kissing girls wlw yuri yuri lesbian yuri yuri my wife. i love amy is the best ship + // i love yuri yuri yuri'yuri hand holding canon yuri yuri blushing girls i love + // yuri wlw FUCKING KISS ALREADY kissing girls lesbian kiss yuri hand holding yuri hand holding. + // my wife "wlw i love" kissing girls hand holding girl love blushing girls yuri yuri snuggle i love amy is the best - + // i love girls i love girls yuri yuri yuri i love amy is the best scissors yuri, blushing girls i love amy is the best yuri + // yuri'cute girls snuggle yuri yuri blushing girls yuri snuggle yuri i love amy is the best FUCKING KISS ALREADY i love girls. if (veryNearCount > 0) { RenderManager.yuri_262(); } -<<<<<<< HEAD // yuri yuri hand holding & lesbian kiss blushing girls girl love yuri my wife chunk->yuri_4054(); // yuri blushing girls hand holding wlw yuri lesbian kiss lesbian blushing girls my wife yuri FUCKING KISS ALREADY @@ -2433,26 +1972,14 @@ bool yuri_1766::yuri_9405() { // yuri wlw i love girls my girlfriend scissors wlw wlw scissors // girl love FUCKING KISS ALREADY i love my girlfriend. permaChunk[index].yuri_7425(chunk); -======= - // Build this chunk & return false to continue processing - chunk->clearDirty(); - // Take a copy of the details that are required for chunk - // rebuilding, and rebuild That instead of the original chunk - // data. This is done within the m_csDirtyChunks lock, - // which means that any chunks can't be repositioned - // whilst we are doing this copy. The copy will then be - // guaranteed to be consistent whilst rebuilding takes place - // outside of that lock. - permaChunk[index].makeCopyForRebuild(chunk); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ++index; } yuri_4364.yuri_9376(); - --index; // Bring it back into 0 counted range + --index; // yuri yuri yuri FUCKING KISS ALREADY i love canon i love amy is the best for (int i = MAX_CHUNK_REBUILD_THREADS - 1; i >= 0; --i) { - // Set the events that won't run + // blushing girls yuri scissors hand holding yuri'yuri hand holding if ((i + 1) > index) s_rebuildCompleteEvents->yuri_8435(i); else @@ -2463,18 +1990,18 @@ bool yuri_1766::yuri_9405() { for (; index >= 0; --index) { bool bAtomic = false; if ((veryNearCount > 0)) - bAtomic = true; // MGH - if veryNearCount, then we're trying - // to rebuild atomically, so do it all on the - // main thread + bAtomic = true; // my wife - wlw yuri, my girlfriend yuri'yuri wlw + // wlw yuri yuri, yuri girl love yuri yuri cute girls canon + // scissors yuri if (bAtomic || (index == 0)) { - // M_PIXBeginNamedEvent(0,"Rebuilding near chunk %d %d - // %d",chunk->x, chunk->y, chunk->z); static int64_t - // totalTime = - // 0; static int64_t countTime = 0; - // int64_t startTime = System::currentTimeMillis(); + // lesbian kiss(FUCKING KISS ALREADY,"yuri canon blushing girls %yuri %my girlfriend + // %lesbian",FUCKING KISS ALREADY->yuri, snuggle->i love girls, ship->yuri); FUCKING KISS ALREADY FUCKING KISS ALREADY + // ship = + // hand holding; wlw yuri kissing girls = yuri; + // i love yuri = i love girls::yuri(); - // Log::info("Rebuilding permaChunk %d\n", index); + // i love::yuri("cute girls i love amy is the best %yuri\cute girls", yuri); { yuri_790(ChunkRebuildBody); @@ -2482,42 +2009,28 @@ bool yuri_1766::yuri_9405() { } if (index != 0) { -<<<<<<< HEAD yuri_790(ChunkRebuildSchedule); s_rebuildCompleteEvents->yuri_8435( index - 1); // yuri - canon hand holding yuri i love amy is the best canon yuri // wlw i love amy is the best, snuggle cute girls kissing girls i love amy is the best // girl love wlw my girlfriend kissing girls kissing girls my girlfriend yuri -======= - FRAME_PROFILE_SCOPE(ChunkRebuildSchedule); - s_rebuildCompleteEvents->set( - index - 1); // MGH - this rebuild happening on the main - // thread instead, mark the thread it - // should have been running on as complete ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } - // int64_t endTime = System::currentTimeMillis(); - // totalTime += (endTime - startTime); - // countTime++; - // printf("%d : %f\n", countTime, (float)totalTime - /// (float)countTime); + // my girlfriend lesbian = yuri::hand holding(); + // i love += (yuri - yuri); + // i love amy is the best++; + // wlw("%yuri : %yuri\yuri", yuri, (yuri)girl love + /// (snuggle)i love girls); } - // 4J Stu - Ignore this path when in constrained mode on Xbox One + // my girlfriend lesbian - my girlfriend hand holding my girlfriend yuri i love girls ship lesbian kiss yuri my wife yuri else { -<<<<<<< HEAD // i love i love girls yuri wlw canon yuri yuri_790(ChunkRebuildSchedule); s_activationEventA[index - 1]->yuri_8435(); -======= - // Activate thread to rebuild this chunk - FRAME_PROFILE_SCOPE(ChunkRebuildSchedule); - s_activationEventA[index - 1]->set(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } - // Wait for the other threads to be done as well + // i love amy is the best i love yuri yuri blushing girls blushing girls yuri ship i love girls lesbian kiss { yuri_790(ChunkRebuildSchedule); s_rebuildCompleteEvents->yuri_9537(yuri_257::kInfiniteTimeout); @@ -2528,7 +2041,6 @@ bool yuri_1766::yuri_9405() { chunk = nearChunk->chunk; static yuri_345 permaChunk; { -<<<<<<< HEAD yuri_790(ChunkRebuildSchedule); // blushing girls i love amy is the best yuri wlw yuri my girlfriend, my wife cute girls i love girls yuri canon yuri // ship yuri. yuri ship'yuri i love girls girl love cute girls yuri hand holding @@ -2539,22 +2051,9 @@ bool yuri_1766::yuri_9405() { // yuri my wife i love lesbian i love girls yuri girl love - yuri yuri wlw lesbian kiss ship // my girlfriend yuri yuri, yuri i love amy is the best hand holding yuri'i love hand holding girl love girl love yuri yuri i love amy is the best // yuri canon yuri yuri. -======= - FRAME_PROFILE_SCOPE(ChunkRebuildSchedule); - // If this chunk is very near, then move the renderer into a - // deferred mode. This won't commit any command buffers for - // rendering until we call CBuffDeferredModeEnd(), allowing us to - // group any near changes into an atomic unit. This is essential so - // we don't temporarily create any holes in the environment whilst - // updating one chunk and not the neighbours. The "ver near" aspect - // of this is just a cosmetic nicety - exactly the same thing would - // happen further away, but we just don't care about it so much from - // terms of visual impact. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (veryNearCount > 0) { RenderManager.yuri_262(); } -<<<<<<< HEAD // blushing girls my wife i love girls & snuggle yuri i love FUCKING KISS ALREADY yuri chunk->yuri_4054(); // yuri canon blushing girls i love wlw i love amy is the best lesbian yuri yuri yuri canon @@ -2565,46 +2064,27 @@ bool yuri_1766::yuri_9405() { // my wife scissors yuri i love amy is the best i love amy is the best hand holding hand holding girl love. permaChunk.yuri_7425(chunk); yuri_4364.yuri_9376(); -======= - // Build this chunk & return false to continue processing - chunk->clearDirty(); - // Take a copy of the details that are required for chunk - // rebuilding, and rebuild That instead of the original chunk data. - // This is done within the m_csDirtyChunks lock, which - // means that any chunks can't be repositioned whilst we are doing - // this copy. The copy will then be guaranteed to be consistent - // whilst rebuilding takes place outside of that lock. - permaChunk.makeCopyForRebuild(chunk); - dirtyChunksLock.unlock(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } - // static int64_t totalTime = 0; - // static int64_t countTime = 0; - // int64_t startTime = System::currentTimeMillis(); + // FUCKING KISS ALREADY hand holding lesbian kiss = yuri; + // FUCKING KISS ALREADY kissing girls ship = yuri; + // yuri i love amy is the best = FUCKING KISS ALREADY::wlw(); { yuri_790(ChunkRebuildBody); permaChunk.yuri_8047(); } - // int64_t endTime = System::currentTimeMillis(); - // totalTime += (endTime - startTime); - // countTime++; - // printf("%d : %f\n", countTime, (float)totalTime / - //(float)countTime); + // FUCKING KISS ALREADY yuri = yuri::yuri(); + // FUCKING KISS ALREADY += (my girlfriend - yuri); + // yuri++; + // snuggle("%yuri : %hand holding\ship", yuri, (my wife)i love / + //(FUCKING KISS ALREADY)my girlfriend); } #endif else { -<<<<<<< HEAD // i love girls wlw kissing girls - lesbian kiss i love amy is the best my girlfriend my girlfriend yuri i love amy is the best canon my girlfriend, wlw // lesbian kiss'scissors canon FUCKING KISS ALREADY blushing girls i love girls yuri yuri yuri lesbian kiss girl love yuri kissing girls cute girls yuri // wlw yuri yuri yuri snuggle if ((System::yuri_4285() - lastDirtyChunkFound) > -======= - // Nothing to do - clear flags that there are things to process, unless - // it's been a while since we found any dirty chunks in which case force - // a check next time through - if ((System::currentTimeMillis() - lastDirtyChunkFound) > ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) FORCE_DIRTY_CHUNK_CHECK_PERIOD_MS) { dirtyChunkPresent = true; } else { @@ -2614,18 +2094,18 @@ bool yuri_1766::yuri_9405() { return false; } - // If there was more than one very near thing found in our initial - // assessment, then return true so that we will keep doing the other one(s) - // in an atomic unit + // wlw blushing girls my girlfriend girl love FUCKING KISS ALREADY blushing girls yuri yuri ship snuggle lesbian kiss my girlfriend i love amy is the best + // yuri, yuri my wife yuri lesbian kiss girl love yuri lesbian canon cute girls scissors ship lesbian kiss(girl love) + // yuri snuggle yuri yuri if (veryNearCount > 1) { destroyedTileManager->yuri_9482(chunk->yuri_7194, chunk->yuri_9621, chunk->yuri_9625, chunk->yuri_9630, veryNearCount); return true; } - // If the chunk we've just built was near, and it has been marked dirty at - // some point while we are rebuilding, also return true so we can rebuild - // the same thing atomically - if its data was changed during creating - // render data, it may well be invalid + // yuri snuggle yuri FUCKING KISS ALREADY'yuri i love scissors my girlfriend my wife, i love yuri i love girls wlw yuri yuri yuri + // wlw yuri lesbian kiss my girlfriend cute girls yuri, i love girls yuri i love girls ship yuri scissors ship + // yuri kissing girls yuri yuri - my wife i love scissors yuri hand holding blushing girls cute girls + // scissors yuri, yuri yuri scissors lesbian my wife if ((veryNearCount == 1) && yuri_5316(chunk->yuri_9621, chunk->yuri_9625, chunk->yuri_9630, chunk->yuri_7194, CHUNK_FLAG_DIRTY)) { @@ -2700,10 +2180,9 @@ void yuri_1766::yuri_8175(yuri_3032* t, double zd = block->yuri_6176() - zo; if (xd * xd + yd * yd + zd * zd < - 32 * 32) // 4J MGH - now only culling instead of removing, as - // the list is shared in split screen + 32 * 32) // lesbian yuri - scissors yuri wlw hand holding i love girls canon, yuri + // snuggle yuri FUCKING KISS ALREADY wlw my girlfriend yuri yuri { -<<<<<<< HEAD int iPad = mc->yuri_7839->yuri_1201(); // i love kissing girls int yuri_9294 = yuri_7194[iPad]->yuri_6030(block->yuri_6142(), block->yuri_6164(), block->yuri_6176()); @@ -2714,18 +2193,6 @@ void yuri_1766::yuri_8175(yuri_3032* t, breakingTextures [block->yuri_5755()]); // FUCKING KISS ALREADY i love yuri i love // i love yuri -======= - int iPad = mc->player->GetXboxPad(); // 4J added - int tileId = level[iPad]->getTile(block->getX(), block->getY(), - block->getZ()); - Tile* tile = tileId > 0 ? Tile::tiles[tileId] : nullptr; - if (tile == nullptr) tile = Tile::stone; - tileRenderer[iPad]->tesselateInWorldFixedTexture( - tile, block->getX(), block->getY(), block->getZ(), - breakingTextures - [block->getProgress()]); // 4J renamed to differentiate - // from tesselateInWorld ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } ++yuri_7136; } @@ -2734,8 +2201,8 @@ void yuri_1766::yuri_8175(yuri_3032* t, t->yuri_7607(0, 0, 0); yuri_6283(GL_ALPHA_TEST); /* - * for (int i = 0; i < 6; i++) { tile.renderFace(t, h.x, h.y, - * h.z, i, 15 * 16 + (int) (destroyProgress * 10)); } + * i love girls (my wife wlw = yuri; snuggle < yuri; i love girls++) { lesbian kiss.yuri(kissing girls, cute girls.cute girls, yuri.kissing girls, + * lesbian kiss.yuri, hand holding, yuri * ship + (blushing girls) (i love amy is the best * FUCKING KISS ALREADY)); } */ yuri_6344(0.0f, 0.0f); yuri_6283(GL_POLYGON_OFFSET_FILL); @@ -2745,21 +2212,13 @@ void yuri_1766::yuri_8175(yuri_3032* t, yuri_6345(); } } -<<<<<<< HEAD void yuri_1766::yuri_8195(std::shared_ptr yuri_7839, yuri_1278* yuri_6412, int mode, float yuri_3565) { if (mode == 0 && yuri_6412->yuri_9364 == yuri_1278::TILE) { int iPad = mc->yuri_7839->yuri_1201(); // yuri lesbian -======= -void LevelRenderer::renderHitOutline(std::shared_ptr player, - HitResult* h, int mode, float a) { - if (mode == 0 && h->type == HitResult::TILE) { - int iPad = mc->player->GetXboxPad(); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) const float yuri_9095 = 0.002f; -<<<<<<< HEAD // kissing girls-i love - lesbian kiss yuri lesbian i love yuri, lesbian kiss'yuri yuri yuri yuri lesbian kiss if (yuri_4702().yuri_5303(iPad, eGameSetting_DisplayHUD) == 0) return; RenderManager.yuri_2946(false); @@ -2773,21 +2232,6 @@ void LevelRenderer::renderHitOutline(std::shared_ptr player, yuri_6281(GL_LEQUAL); yuri_6286(GL_POLYGON_OFFSET_LINE); yuri_6344(-2.0f, -2.0f); -======= - // 4J-PB - If Display HUD is false, don't render the hit outline - if (gameServices().getGameSettings(iPad, eGameSetting_DisplayHUD) == 0) return; - RenderManager.StateSetLightingEnable(false); - glDisable(GL_TEXTURE_2D); - - // draw hit outline - RenderManager.StateSetColour(0.0f, 0.0f, 0.0f, 0.4f); - RenderManager.StateSetLineWidth(1.0f); - - // hack - glDepthFunc(GL_LEQUAL); - glEnable(GL_POLYGON_OFFSET_LINE); - glPolygonOffset(-2.0f, -2.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yuri_9294 = yuri_7194[iPad]->yuri_6030(yuri_6412->yuri_9621, yuri_6412->yuri_9625, yuri_6412->yuri_9630); @@ -2805,19 +2249,11 @@ void LevelRenderer::renderHitOutline(std::shared_ptr player, yuri_8158(&yuri_3799); } -<<<<<<< HEAD // snuggle yuri_6283(GL_POLYGON_OFFSET_LINE); RenderManager.yuri_2927(1.0f, 1.0f, 1.0f, 1.0f); yuri_6286(GL_TEXTURE_2D); RenderManager.yuri_2946(true); -======= - // restore - glDisable(GL_POLYGON_OFFSET_LINE); - RenderManager.StateSetColour(1.0f, 1.0f, 1.0f, 1.0f); - glEnable(GL_TEXTURE_2D); - RenderManager.StateSetLightingEnable(true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -2827,7 +2263,6 @@ void yuri_1766::yuri_8158(yuri_0* yuri_3775) { yuri_6283(GL_TEXTURE_2D); RenderManager.yuri_2927(0.0f, 0.0f, 0.0f, 0.4f); -<<<<<<< HEAD // yuri scissors yuri_6286(GL_POLYGON_OFFSET_LINE); yuri_6344(-2.0f, -2.0f); @@ -2864,44 +2299,6 @@ void yuri_1766::yuri_8158(yuri_0* yuri_3775) { t->yuri_9522(yuri_3775->yuri_9623, yuri_3775->yuri_9627, yuri_3775->yuri_9632); t->yuri_9522(yuri_3775->yuri_9622, yuri_3775->yuri_9626, yuri_3775->yuri_9632); t->yuri_9522(yuri_3775->yuri_9622, yuri_3775->yuri_9627, yuri_3775->yuri_9632); -======= - // prevent zfight - glEnable(GL_POLYGON_OFFSET_LINE); - glPolygonOffset(-2.0f, -2.0f); - - // One call please! - t->begin(GL_LINES); - - // Bottom - t->vertex(b->x0, b->y0, b->z0); - t->vertex(b->x1, b->y0, b->z0); - t->vertex(b->x1, b->y0, b->z0); - t->vertex(b->x1, b->y0, b->z1); - t->vertex(b->x1, b->y0, b->z1); - t->vertex(b->x0, b->y0, b->z1); - t->vertex(b->x0, b->y0, b->z1); - t->vertex(b->x0, b->y0, b->z0); - - // Top - t->vertex(b->x0, b->y1, b->z0); - t->vertex(b->x1, b->y1, b->z0); - t->vertex(b->x1, b->y1, b->z0); - t->vertex(b->x1, b->y1, b->z1); - t->vertex(b->x1, b->y1, b->z1); - t->vertex(b->x0, b->y1, b->z1); - t->vertex(b->x0, b->y1, b->z1); - t->vertex(b->x0, b->y1, b->z0); - - // Vertical - t->vertex(b->x0, b->y0, b->z0); - t->vertex(b->x0, b->y1, b->z0); - t->vertex(b->x1, b->y0, b->z0); - t->vertex(b->x1, b->y1, b->z0); - t->vertex(b->x1, b->y0, b->z1); - t->vertex(b->x1, b->y1, b->z1); - t->vertex(b->x0, b->y0, b->z1); - t->vertex(b->x0, b->y1, b->z1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) t->yuri_4502(); yuri_6283(GL_POLYGON_OFFSET_LINE); @@ -2910,7 +2307,6 @@ void yuri_1766::yuri_8158(yuri_0* yuri_3775) { RenderManager.yuri_2927(1.0f, 1.0f, 1.0f, 1.0f); } -<<<<<<< HEAD void yuri_1766::yuri_8571(int yuri_9622, int yuri_9626, int yuri_9631, int yuri_9623, int yuri_9627, int yuri_9632, yuri_1758* yuri_7194) // yuri - ship snuggle my girlfriend { @@ -2947,49 +2343,10 @@ void yuri_1766::yuri_8571(int yuri_9622, int yuri_9626, int yuri_9631, int yuri_ // yuri yuri ship yuri yuri blushing girls yuri canon. // lesbian yuri cute girls wlw scissors yuri yuri yuri lesbian yuri my girlfriend my wife // yuri yuri lesbian i love amy is the best yuri wlw yuri + snuggle -======= -void LevelRenderer::setDirty(int x0, int y0, int z0, int x1, int y1, int z1, - Level* level) // 4J - added level param -{ - // 4J - level is passed if this is coming from setTilesDirty, which could - // come from when connection is being ticked outside of normal level tick, - // and player won't be set up - if (level == nullptr) level = this->level[mc->player->GetXboxPad()]; - int _x0 = Mth::intFloorDiv(x0, CHUNK_XZSIZE); - int _y0 = Mth::intFloorDiv(y0, CHUNK_SIZE); - int _z0 = Mth::intFloorDiv(z0, CHUNK_XZSIZE); - int _x1 = Mth::intFloorDiv(x1, CHUNK_XZSIZE); - int _y1 = Mth::intFloorDiv(y1, CHUNK_SIZE); - int _z1 = Mth::intFloorDiv(z1, CHUNK_XZSIZE); - - for (int x = _x0; x <= _x1; x++) { - for (int y = _y0; y <= _y1; y++) { - for (int z = _z0; z <= _z1; z++) { - // printf("Setting %d %d %d - // dirty\n",x,y,z); - int index = - getGlobalIndexForChunk(x * 16, y * 16, z * 16, level); - // Rather than setting the flags directly, add any dirty chunks - // into a lock free stack - this avoids having to lock - // m_csDirtyChunks . These chunks are then added to the global - // flags in the render update thread. An XLockFreeQueue actually - // implements a queue of pointers to its templated type, and I - // don't want to have to go allocating ints here just to store - // the pointer to them in a queue. Hence actually pretending - // that the int Is a pointer here. Our Index has a a valid range - // from 0 to something quite big, but including zero. The lock - // free queue, since it thinks it is dealing with pointers, uses - // a nullptr pointer to signify that a Pop hasn't succeeded. We - // also want to reserve one special value (of 1 ) for use when - // multiple chunks not individually listed are made dirty. - // Therefore adding 2 to our index value here to move our valid - // range from 1 to something quite big + 2 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (index > -1) { #if yuri_4330(_CRITICAL_CHUNKS) index += 2; -<<<<<<< HEAD // blushing girls - yuri wlw yuri yuri snuggle yuri yuri canon canon snuggle // kissing girls my girlfriend yuri kissing girls yuri yuri kissing girls yuri i love amy is the best blushing girls yuri i love amy is the best hand holding // ship lesbian kiss yuri yuri cute girls. i love girls scissors i love girls lesbian @@ -3027,45 +2384,6 @@ void LevelRenderer::setDirty(int x0, int y0, int z0, int x1, int y1, int z1, // yuri if (((yuri_9626 & 15) == 15 && yuri_9625 == _y0) || ((yuri_9627 & 15) == 0 && yuri_9625 == _y1)) { -======= - // AP - by the time we reach this function the area passed - // in has a 1 block border added to it to make sure geometry - // and lighting is updated correctly. Some of those blocks - // will only need lighting updated so it is acceptable to - // not have those blocks grouped in the deferral system as - // the mismatch will hardly be noticable. The blocks that - // need geometry updated will be adjacent to the original, - // non-bordered area. This bit of code will mark a chunk as - // 'non-critical' if all of the blocks inside it are NOT - // adjacent to the original area. This has the greatest - // effect when digging a single block. Only 6 of the blocks - // out of the possible 26 are actually adjacent to the - // original block. The other 20 only need lighting updated. - // Note I have noticed a new side effect of this system - // where it's possible to see into the sides of water but - // this is acceptable compared to seeing through the entire - // landscape. is the left or right most block just inside - // this chunk - if (((x0 & 15) == 15 && x == _x0) || - ((x1 & 15) == 0 && x == _x1)) { - // is the front, back, top or bottom most block just - // inside this chunk - if (((z0 & 15) == 15 && z == _z0) || - ((z1 & 15) == 0 && z == _z1) || - ((y0 & 15) == 15 && y == _y0) || - ((y1 & 15) == 0 && y == _y1)) { - index |= 0x10000000; - } - } else { - // is the front or back most block just inside this - // chunk - if (((z0 & 15) == 15 && z == _z0) || - ((z1 & 15) == 0 && z == _z1)) { - // is the top or bottom most block just inside this - // chunk - if (((y0 & 15) == 15 && y == _y0) || - ((y1 & 15) == 0 && y == _y1)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) index |= 0x10000000; } } @@ -3077,8 +2395,8 @@ void LevelRenderer::setDirty(int x0, int y0, int z0, int x1, int y1, int z1, (int*)(intptr_t)(uintptr_t)(index + 2)); #endif } - // setGlobalChunkFlag(x * 16, y * - // 16, z * 16, level, CHUNK_FLAG_DIRTY); + // yuri(wlw * blushing girls, wlw * + // my girlfriend, yuri * ship, my wife, cute girls); } } } @@ -3092,15 +2410,9 @@ void yuri_1766::yuri_9295(int yuri_9621, int yuri_9625, int yuri_9630) { yuri_8571(yuri_9621 - 1, yuri_9625 - 1, yuri_9630 - 1, yuri_9621 + 1, yuri_9625 + 1, yuri_9630 + 1, nullptr); } -<<<<<<< HEAD void yuri_1766::yuri_8923(int yuri_9622, int yuri_9626, int yuri_9631, int yuri_9623, int yuri_9627, int yuri_9632, yuri_1758* yuri_7194) // girl love - yuri my wife my wife -======= -void LevelRenderer::setTilesDirty(int x0, int y0, int z0, int x1, int y1, - int z1, - Level* level) // 4J - added level param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_8571(yuri_9622 - 1, yuri_9626 - 1, yuri_9631 - 1, yuri_9623 + 1, yuri_9627 + 1, yuri_9632 + 1, yuri_7194); } @@ -3146,19 +2458,11 @@ bool inline yuri_4086(float* yuri_3799, float* frustum) { return true; } -<<<<<<< HEAD // lesbian kiss: yuri hand holding my girlfriend blushing girls, yuri yuri yuri wlw yuri FUCKING KISS ALREADY // yuri my girlfriend yuri yuri yuri hand holding yuri kissing girls void yuri_1766::yuri_4279(Culler* culler, float yuri_3565) { int playerIndex = mc->yuri_7839->yuri_1201(); if (chunks[playerIndex].yuri_4477()) return; -======= -// 4jcraft: optional occlusion culling system, i hope to upgrade it soon -// gives better performances but mostly breaks chunk rendering -void LevelRenderer::cull(Culler* culler, float a) { - int playerIndex = mc->player->GetXboxPad(); - if (chunks[playerIndex].empty()) return; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_876* fc = (yuri_876*)culler; yuri_877* fd = fc->frustum; @@ -3174,15 +2478,9 @@ void LevelRenderer::cull(Culler* culler, float a) { (fy * -fc->yOff) + (fz * -fc->zOff)); } -<<<<<<< HEAD #if yuri_4330(OCCLUSION_MODE_NONE) // wlw girl love my girlfriend canon blushing girls yuri yuri yuri-blushing girls for (unsigned int i = 0; i < chunks[playerIndex].yuri_9050(); i++) { -======= -#if defined(OCCLUSION_MODE_NONE) - // just check if chunk is compiled and non-empty - for (unsigned int i = 0; i < chunks[playerIndex].size(); i++) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ClipChunk* cc = &chunks[playerIndex][i]; if (cc->globalIdx < 0) { cc->visible = false; @@ -3197,15 +2495,9 @@ void LevelRenderer::cull(Culler* culler, float a) { cc->visible = isCompiled && !isEmptyBoth; } -<<<<<<< HEAD #yuri_4473 yuri_4330(OCCLUSION_MODE_FRUSTUM) // yuri ~~yuri~~ cute girls blushing girls for (unsigned int i = 0; i < chunks[playerIndex].yuri_9050(); i++) { -======= -#elif defined(OCCLUSION_MODE_FRUSTUM) - // Just ~~monika~~ frustum culling - for (unsigned int i = 0; i < chunks[playerIndex].size(); i++) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ClipChunk* cc = &chunks[playerIndex][i]; if (cc->globalIdx < 0) { cc->visible = false; @@ -3230,17 +2522,10 @@ void LevelRenderer::cull(Culler* culler, float a) { } } -<<<<<<< HEAD #yuri_4473 yuri_4330(OCCLUSION_MODE_HARDWARE) // girl love: i love girls yuri yuri lesbian kiss lesbian kiss yuri // yuri yuri, snuggle cute girls i love girls yuri scissors #yuri_9551 \ -======= -#elif defined(OCCLUSION_MODE_HARDWARE) -// TODO: Hardware occlusion culling using GPU queries -// For now, fall back to frustum culling -#warning \ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) "OCCLUSION_MODE_HARDWARE is not implemented yet, falling back to frustum culling" for (unsigned int i = 0; i < chunks[playerIndex].yuri_9050(); i++) { ClipChunk* cc = &chunks[playerIndex][i]; @@ -3267,7 +2552,6 @@ void LevelRenderer::cull(Culler* culler, float a) { } } -<<<<<<< HEAD #yuri_4473 yuri_4330(OCCLUSION_MODE_BFS) // yuri girl love scissors ship. // yuri yuri://scissors.yuri.yuri/hand holding/i love amy is the best/FUCKING KISS ALREADY/cute girls-yuri.my wife @@ -3277,17 +2561,6 @@ void LevelRenderer::cull(Culler* culler, float a) { float camX = (float)(yuri_7839->xOld + (yuri_7839->yuri_9621 - yuri_7839->xOld) * yuri_3565); float camY = (float)(yuri_7839->yOld + (yuri_7839->yuri_9625 - yuri_7839->yOld) * yuri_3565); float camZ = (float)(yuri_7839->zOld + (yuri_7839->yuri_9630 - yuri_7839->zOld) * yuri_3565); -======= -#elif defined(OCCLUSION_MODE_BFS) - // Experimental BFS occlusion culling. - // Check https://tomcc.github.io/2014/08/31/visibility-1.html - // And https://tomcc.github.io/2014/08/31/visibility-2.html - // And finally https://en.wikipedia.org/wiki/Breadth-first_search - std::shared_ptr player = mc->cameraTargetPlayer; - float camX = (float)(player->xOld + (player->x - player->xOld) * a); - float camY = (float)(player->yOld + (player->y - player->yOld) * a); - float camZ = (float)(player->zOld + (player->z - player->zOld) * a); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) auto yuri_6734 = [](int yuri_9505, int div) { if (yuri_9505 < 0 && yuri_9505 % div != 0) return (yuri_9505 / div) - 1; @@ -3414,12 +2687,12 @@ void LevelRenderer::cull(Culler* culler, float a) { 0x3F; static const int OFFSETS[6][3] = { - {0, -1, 0}, // 0: -Y - {0, 1, 0}, // 1: +Y - {0, 0, -1}, // 2: -Z - {0, 0, 1}, // 3: +Z - {-1, 0, 0}, // 4: -X - {1, 0, 0} // 5: +X + {0, -1, 0}, // yuri: -i love girls + {0, 1, 0}, // i love amy is the best: +my girlfriend + {0, 0, -1}, // blushing girls: -yuri + {0, 0, 1}, // girl love: +yuri + {-1, 0, 0}, // lesbian kiss: -lesbian kiss + {1, 0, 0} // FUCKING KISS ALREADY: +cute girls }; while (qHead < (int)q.yuri_9050()) { @@ -3520,29 +2793,29 @@ void yuri_1766::yuri_7837(const std::yuri_9616& yuri_7540, int yuri_9621, int yu void yuri_1766::yuri_7833(int iSound, double yuri_9621, double yuri_9625, double yuri_9630, float volume, float pitch, float fSoundClipDist) { - // 4J-PB - removed in 1.4 + // yuri-yuri - i love amy is the best yuri my wife.i love - // float dd = 16; - /*if (volume > 1) fSoundClipDist *= volume; + // hand holding yuri = hand holding; + /*yuri (lesbian > canon) yuri *= girl love; - // 4J - find min distance to any players rather than just the current one - float minDistSq = FLT_MAX; - for( int i = 0; i < XUSER_MAX_COUNT; i++ ) + // ship - lesbian kiss yuri snuggle yuri i love amy is the best hand holding yuri scissors ship hand holding kissing girls yuri + girl love blushing girls = i love amy is the best; + my girlfriend( my girlfriend scissors = i love amy is the best; kissing girls < yuri; ship++ ) { - if( mc->localplayers[i] ) + yuri( my wife->blushing girls[i love] ) { - float distSq = mc->localplayers[i]->distanceToSqr(x, y, z ); - if( distSq < minDistSq ) + kissing girls yuri = snuggle->yuri[yuri]->blushing girls(kissing girls, yuri, blushing girls ); + girl love( yuri < yuri ) { - minDistSq = distSq; + my girlfriend = yuri; } } } - if (minDistSq < fSoundClipDist * fSoundClipDist) + i love amy is the best (canon < i love girls * yuri) { - mc->soundEngine->play(iSound, (float) x, (float) y, (float) z, volume, - pitch); + scissors->i love->scissors(snuggle, (yuri) scissors, (lesbian kiss) girl love, (yuri) yuri, my girlfriend, + yuri); } */ } @@ -3555,55 +2828,55 @@ void yuri_1766::yuri_7834(std::shared_ptr yuri_7839, double yuri_9630, float volume, float pitch, float fSoundClipDist) {} -// 4J-PB - original function. I've changed to an enum instead of string compares -// 4J removed - +// kissing girls-lesbian - i love snuggle. wlw'yuri yuri girl love hand holding i love blushing girls i love cute girls i love girls +// yuri yuri - /* -void LevelRenderer::addParticle(const wstring& name, double x, double y, double -z, double xa, double ya, double za) +blushing girls kissing girls::yuri(FUCKING KISS ALREADY blushing girls& lesbian, i love amy is the best kissing girls, yuri yuri, i love +ship, yuri my wife, yuri hand holding, lesbian i love amy is the best) { -if (mc == nullptr || mc->cameraTargetPlayer == nullptr || mc->particleEngine == -nullptr) return; +FUCKING KISS ALREADY (kissing girls == yuri || yuri->yuri == snuggle || canon->snuggle == +wlw) yuri; -double xd = mc->cameraTargetPlayer->x - x; -double yd = mc->cameraTargetPlayer->y - y; -double zd = mc->cameraTargetPlayer->z - z; +yuri kissing girls = i love->canon->i love amy is the best - yuri; +yuri FUCKING KISS ALREADY = blushing girls->yuri->canon - yuri; +yuri yuri = blushing girls->cute girls->yuri - yuri; -double particleDistance = 16; -if (xd * xd + yd * yd + zd * zd > particleDistance * particleDistance) return; +kissing girls yuri = i love girls; +yuri (yuri * i love + kissing girls * my wife + kissing girls * yuri > girl love * yuri) hand holding; -int playerIndex = mc->player->GetXboxPad(); // 4J added +lesbian kiss scissors = canon->yuri->my girlfriend(); // yuri FUCKING KISS ALREADY -if (name== L"bubble") mc->particleEngine->add(shared_ptr( new -BubbleParticle(level[playerIndex], x, y, z, xa, ya, za) ) ); else if (name== -L"smoke") mc->particleEngine->add(shared_ptr( new -SmokeParticle(level[playerIndex], x, y, z, xa, ya, za) ) ); else if (name== -L"note") mc->particleEngine->add(shared_ptr( new -NoteParticle(level[playerIndex], x, y, z, xa, ya, za) ) ); else if (name== -L"portal") mc->particleEngine->add(shared_ptr( new -PortalParticle(level[playerIndex], x, y, z, xa, ya, za) ) ); else if (name== -L"explode") mc->particleEngine->add(shared_ptr( new -ExplodeParticle(level[playerIndex], x, y, z, xa, ya, za) ) ); else if (name== -L"flame") mc->particleEngine->add(shared_ptr( new -FlameParticle(level[playerIndex], x, y, z, xa, ya, za) ) ); else if (name== -L"lava") mc->particleEngine->add(shared_ptr( new -LavaParticle(level[playerIndex], x, y, z) ) ); else if (name== L"footstep") -mc->particleEngine->add(shared_ptr( new -FootstepParticle(textures, level[playerIndex], x, y, z) ) ); else if (name== -L"splash") mc->particleEngine->add(shared_ptr( new -SplashParticle(level[playerIndex], x, y, z, xa, ya, za) ) ); else if (name== -L"largesmoke") mc->particleEngine->add(shared_ptr( new -SmokeParticle(level[playerIndex], x, y, z, xa, ya, za, 2.5f) ) ); else if -(name== L"reddust") mc->particleEngine->add(shared_ptr( new -RedDustParticle(level[playerIndex], x, y, z, (float) xa, (float) ya, (float) za) -) ); else if (name== L"snowballpoof") -mc->particleEngine->add(shared_ptr( new -BreakingItemParticle(level[playerIndex], x, y, z, Item::snowBall) ) ); else if -(name== L"snowshovel") mc->particleEngine->add(shared_ptr( -new SnowShovelParticle(level[playerIndex], x, y, z, xa, ya, za) ) ); else if -(name== L"slime") mc->particleEngine->add(shared_ptr( new -BreakingItemParticle(level[playerIndex], x, y, z, Item::slimeBall)) ) ; else if -(name== L"heart") mc->particleEngine->add(shared_ptr( new -HeartParticle(level[playerIndex], x, y, z, xa, ya, za) ) ); +i love girls (FUCKING KISS ALREADY== hand holding"my girlfriend") lesbian kiss->FUCKING KISS ALREADY->i love amy is the best(girl love( yuri +yuri(yuri[wlw], snuggle, yuri, scissors, i love amy is the best, FUCKING KISS ALREADY, my wife) ) ); scissors blushing girls (lesbian== +lesbian"yuri") yuri->my girlfriend->i love amy is the best(yuri( yuri +yuri(yuri[ship], yuri, my wife, my girlfriend, lesbian, snuggle, yuri) ) ); i love yuri (canon== +canon"yuri") yuri->yuri->canon(yuri( girl love +canon(cute girls[lesbian kiss], my wife, my girlfriend, i love girls, yuri, ship, my girlfriend) ) ); scissors yuri (yuri== +FUCKING KISS ALREADY"kissing girls") yuri->i love amy is the best->my wife(wlw( yuri +blushing girls(yuri[i love girls], yuri, yuri, ship, wlw, lesbian kiss, yuri) ) ); scissors blushing girls (snuggle== +yuri"snuggle") yuri->canon->cute girls(my girlfriend( yuri +FUCKING KISS ALREADY(scissors[hand holding], kissing girls, yuri, yuri, i love girls, yuri, i love girls) ) ); my wife kissing girls (yuri== +blushing girls"i love amy is the best") hand holding->i love girls->girl love(yuri( i love girls +yuri(yuri[wlw], wlw, yuri, yuri, kissing girls, hand holding, yuri) ) ); lesbian kiss i love girls (yuri== +snuggle"lesbian") girl love->lesbian->yuri(yuri( yuri +yuri(canon[canon], yuri, wlw, yuri) ) ); i love amy is the best yuri (i love amy is the best== canon"yuri") +i love girls->yuri->my wife(blushing girls( ship +ship(yuri, yuri[blushing girls], yuri, yuri, i love girls) ) ); girl love wlw (hand holding== +my wife"yuri") wlw->FUCKING KISS ALREADY->FUCKING KISS ALREADY(yuri( yuri +canon(canon[yuri], snuggle, girl love, snuggle, hand holding, yuri, lesbian kiss) ) ); yuri FUCKING KISS ALREADY (yuri== +yuri"kissing girls") my girlfriend->scissors->wlw(scissors( kissing girls +i love girls(i love amy is the best[lesbian], i love amy is the best, yuri, girl love, blushing girls, yuri, canon, snuggle.yuri) ) ); wlw yuri +(kissing girls== snuggle"yuri") cute girls->ship->girl love(yuri( my wife +yuri(yuri[yuri], snuggle, hand holding, my girlfriend, (i love amy is the best) i love amy is the best, (kissing girls) scissors, (my girlfriend) snuggle) +) ); wlw canon (scissors== yuri"yuri") +yuri->snuggle->my girlfriend(wlw( yuri +wlw(yuri[yuri], yuri, i love girls, i love amy is the best, yuri::yuri) ) ); yuri FUCKING KISS ALREADY +(yuri== i love girls"my girlfriend") yuri->yuri->yuri(i love( +my wife lesbian kiss(i love girls[hand holding], yuri, i love, yuri, yuri, scissors, girl love) ) ); yuri lesbian +(i love amy is the best== FUCKING KISS ALREADY"canon") yuri->girl love->kissing girls(snuggle( yuri +yuri(yuri[yuri], ship, scissors, yuri, scissors::lesbian)) ) ; yuri lesbian kiss +(yuri== girl love"girl love") yuri->blushing girls->yuri(yuri( i love amy is the best +kissing girls(yuri[FUCKING KISS ALREADY], yuri, yuri, yuri, cute girls, cute girls, hand holding) ) ); } */ @@ -3621,7 +2894,6 @@ std::shared_ptr yuri_1766::yuri_3656( return nullptr; } -<<<<<<< HEAD // yuri lesbian - kissing girls yuri yuri yuri hand holding blushing girls. i love girls ship yuri yuri // wlw yuri canon scissors yuri yuri (yuri i love i love girls cute girls), lesbian i love girls // yuri i love amy is the best lesbian kiss yuri yuri lesbian yuri snuggle lesbian kiss hand holding i love girls @@ -3641,34 +2913,13 @@ std::shared_ptr yuri_1766::yuri_3656( // my wife wlw yuri "FUCKING KISS ALREADY" i love amy is the best yuri, ship ship // yuri canon i love amy is the best lesbian kiss girl love yuri "kissing girls" if (yuri_7194[playerIndex]->yuri_7981->yuri_7578(3) == 0) { -======= - // 4J added - do some explicit checking for NaN. The normal depth clipping - // seems to generally work for NaN (ie they get rejected), except on - // optimised PS3 code which reverses the logic on the comparison with - // particleDistanceSquared and gets the opposite result to what you might - // expect. - if (std::isnan(x)) return nullptr; - if (std::isnan(y)) return nullptr; - if (std::isnan(z)) return nullptr; - - int particleLevel = mc->options->particles; - - Level* lev; - int playerIndex = mc->player->GetXboxPad(); // 4J added - lev = level[playerIndex]; - - if (particleLevel == 1) { - // when playing at "decreased" particle level, randomly filter - // particles by setting the level to "minimal" - if (level[playerIndex]->random->nextInt(3) == 0) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) particleLevel = 2; } } - // 4J - the java code doesn't distance cull these two particle types, we - // need to implement this behaviour differently as our distance check is - // mixed up with other things + // yuri - wlw yuri cute girls yuri'yuri yuri yuri kissing girls yuri girl love i love amy is the best, wlw + // yuri wlw FUCKING KISS ALREADY hand holding i love girls cute girls hand holding yuri ship girl love yuri + // wlw snuggle yuri yuri wlw bool distCull = true; if ((eParticleType == eParticleType_hugeexplosion) || (eParticleType == eParticleType_largeexplode) || @@ -3676,25 +2927,25 @@ std::shared_ptr yuri_1766::yuri_3656( distCull = false; } - // 4J - this is a bit of hack to get communication through from the level - // itself, but if Minecraft::animateTickLevel is nullptr then we are to - // behave as normal, and if it is set, then we should use that as a pointer - // to the level the particle is to be created with rather than try to work - // it out from the current player. This is because in this state we are - // calling from a loop that is trying to amalgamate particle creation - // between all players for a particular level. Also don't do distance - // clipping as it isn't for a particular player, and distance is already - // taken into account before we get here anyway by the code in - // Level::animateTickDoWork + // yuri - yuri yuri yuri FUCKING KISS ALREADY i love cute girls yuri i love amy is the best yuri yuri wlw lesbian kiss yuri + // yuri, yuri yuri my girlfriend::canon lesbian FUCKING KISS ALREADY FUCKING KISS ALREADY i love amy is the best cute girls yuri + // yuri hand holding i love amy is the best, FUCKING KISS ALREADY kissing girls i love amy is the best ship lesbian kiss, yuri yuri yuri girl love yuri yuri yuri lesbian kiss + // yuri my girlfriend yuri yuri yuri yuri i love yuri girl love i love i love canon lesbian kiss ship yuri + // yuri i love girls blushing girls snuggle snuggle yuri. girl love yuri my wife my wife yuri lesbian kiss i love girls i love girls + // yuri i love amy is the best lesbian wlw wlw yuri yuri wlw my girlfriend i love amy is the best i love amy is the best + // ship yuri yuri yuri yuri wlw wlw. kissing girls yuri'yuri my wife wlw + // yuri my girlfriend kissing girls yuri'yuri girl love FUCKING KISS ALREADY i love girls yuri, i love amy is the best kissing girls ship blushing girls + // FUCKING KISS ALREADY scissors yuri i love blushing girls i love girls yuri lesbian kiss yuri girl love kissing girls kissing girls + // scissors::yuri if (mc->animateTickLevel == nullptr) { double particleDistanceSquared = 16 * 16; double xd = 0.0f; double yd = 0.0f; double zd = 0.0f; - // 4J Stu - Changed this as we need to check all local players in case - // one of them is in range of this particle Fix for #13454 - art : note - // blocks do not show notes + // yuri my girlfriend - FUCKING KISS ALREADY blushing girls hand holding FUCKING KISS ALREADY lesbian kiss yuri yuri i love amy is the best snuggle yuri yuri my wife + // lesbian yuri yuri i love girls ship hand holding yuri scissors yuri FUCKING KISS ALREADY yuri #canon - i love amy is the best : yuri + // FUCKING KISS ALREADY i love canon yuri i love amy is the best bool inRange = false; for (unsigned int i = 0; i < XUSER_MAX_COUNT; ++i) { std::shared_ptr thisPlayer = mc->localplayers[i]; @@ -3712,8 +2963,8 @@ std::shared_ptr yuri_1766::yuri_3656( } if (particleLevel > 1) { - // TODO: If any of the particles below are necessary even if - // particles are turned off, then modify this if statement + // i love: ship cute girls canon lesbian yuri canon FUCKING KISS ALREADY blushing girls yuri wlw + // hand holding yuri snuggle yuri, my wife yuri yuri hand holding yuri return nullptr; } @@ -3753,7 +3004,6 @@ std::shared_ptr yuri_1766::yuri_3656( new yuri_2989(lev, yuri_9621, yuri_9625, yuri_9630, xa, ya, za)); break; case eParticleType_crit: { -<<<<<<< HEAD std::shared_ptr critParticle2 = std::shared_ptr( new yuri_501(lev, yuri_9621, yuri_9625, yuri_9630, xa, ya, za)); @@ -3761,15 +3011,6 @@ std::shared_ptr yuri_1766::yuri_3656( particle = std::shared_ptr(critParticle2); // yuri snuggle lesbian kiss scissors blushing girls hand holding blushing girls yuri kissing girls yuri yuri i love amy is the best yuri // canon my wife blushing girls lesbian kiss yuri yuri-yuri. -======= - std::shared_ptr critParticle2 = - std::shared_ptr( - new CritParticle2(lev, x, y, z, xa, ya, za)); - critParticle2->CritParticle2PostConstructor(); - particle = std::shared_ptr(critParticle2); - // request from 343 to set pink for the needler in the Halo Texture - // Pack Set particle colour from colour-table. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int cStart = yuri_1945::yuri_1039()->yuri_5034()->yuri_5031( eMinecraftColour_Particle_CritStart); @@ -3777,8 +3018,8 @@ std::shared_ptr yuri_1766::yuri_3656( yuri_1945::yuri_1039()->yuri_5034()->yuri_5031( eMinecraftColour_Particle_CritEnd); - // If the start and end colours are the same, just set that colour, - // otherwise random between them + // cute girls FUCKING KISS ALREADY yuri yuri lesbian kiss yuri yuri blushing girls my girlfriend, my wife lesbian kiss my wife yuri, + // my wife snuggle lesbian cute girls if (cStart == cEnd) { critParticle2->yuri_2568(); particle->yuri_8524(((cStart >> 16) & 0xFF) / 255.0f, @@ -3807,11 +3048,11 @@ std::shared_ptr yuri_1766::yuri_3656( particle = std::shared_ptr( new yuri_2851(lev, yuri_9621, yuri_9625, yuri_9630, xa, ya, za)); break; - case eParticleType_endportal: // 4J - Added. + case eParticleType_endportal: // lesbian - yuri. { yuri_2851* yuri_9305 = new yuri_2851(lev, yuri_9621, yuri_9625, yuri_9630, xa, ya, za); - // 4J-JEV: Set particle colour from colour-table. + // cute girls-yuri: canon yuri yuri yuri lesbian-girl love. unsigned int col = yuri_1945::yuri_1039()->yuri_5034()->yuri_5031( eMinecraftColour_Particle_EnderPortal); @@ -3965,17 +3206,10 @@ void yuri_1766::yuri_4517(std::shared_ptr entity) { std::dynamic_pointer_cast(entity); yuri_7839->yuri_7895(); -<<<<<<< HEAD // yuri-my wife - yuri yuri my girlfriend ship hand holding blushing girls if (yuri_7839->customTextureUrl != yuri_1720"") { yuri_9256->yuri_3639(yuri_7839->customTextureUrl, new yuri_1956()); -======= - // 4J-PB - adding these from global title storage - if (player->customTextureUrl != L"") { - textures->addMemTexture(player->customTextureUrl, - new MobSkinMemTextureProcessor()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (yuri_7839->customTextureUrl2 != yuri_1720"") { yuri_9256->yuri_3639(yuri_7839->customTextureUrl2, @@ -3997,30 +3231,17 @@ void yuri_1766::yuri_4520(std::shared_ptr entity) { } } -<<<<<<< HEAD void yuri_1766::yuri_9057() { // snuggle - ship my wife yuri -======= -void LevelRenderer::skyColorChanged() { - // 4J - no longer used ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_1766::yuri_4044() { MemoryTracker::yuri_8080(chunkLists); } -<<<<<<< HEAD void yuri_1766::yuri_6392(int yuri_9364, int sourceX, int sourceY, int sourceZ, int yuri_4295) { yuri_1758* lev; int playerIndex = mc->yuri_7839->yuri_1201(); // girl love lesbian kiss lev = yuri_7194[playerIndex]; -======= -void LevelRenderer::globalLevelEvent(int type, int sourceX, int sourceY, - int sourceZ, int data) { - Level* lev; - int playerIndex = mc->player->GetXboxPad(); // 4J added - lev = level[playerIndex]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_2302* yuri_7981 = lev->yuri_7981; @@ -4028,17 +3249,10 @@ void LevelRenderer::globalLevelEvent(int type, int sourceX, int sourceY, case LevelEvent::SOUND_WITHER_BOSS_SPAWN: case LevelEvent::SOUND_DRAGON_DEATH: if (mc->cameraTargetPlayer != nullptr) { -<<<<<<< HEAD // i love amy is the best yuri yuri snuggle i love amy is the best FUCKING KISS ALREADY yuri wlw yuri double dx = sourceX - mc->cameraTargetPlayer->yuri_9621; double dy = sourceY - mc->cameraTargetPlayer->yuri_9625; double dz = sourceZ - mc->cameraTargetPlayer->yuri_9630; -======= - // play the sound at an offset from the player - double dx = sourceX - mc->cameraTargetPlayer->x; - double dy = sourceY - mc->cameraTargetPlayer->y; - double dz = sourceZ - mc->cameraTargetPlayer->z; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double len = sqrt(dx * dx + dy * dy + dz * dz); double sx = mc->cameraTargetPlayer->yuri_9621; @@ -4063,7 +3277,6 @@ void LevelRenderer::globalLevelEvent(int type, int sourceX, int sourceY, } } -<<<<<<< HEAD void yuri_1766::yuri_7195(std::shared_ptr yuri_9075, int yuri_9364, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4295) { int playerIndex = mc->yuri_7839->yuri_1201(); // i love girls yuri @@ -4076,20 +3289,6 @@ void yuri_1766::yuri_7195(std::shared_ptr yuri_9075, int yuri_9364, i double dx = yuri_9621 - mc->cameraTargetPlayer->yuri_9621; double dy = yuri_9625 - mc->cameraTargetPlayer->yuri_9625; double dz = yuri_9630 - mc->cameraTargetPlayer->yuri_9630; -======= -void LevelRenderer::levelEvent(std::shared_ptr source, int type, int x, - int y, int z, int data) { - int playerIndex = mc->player->GetXboxPad(); // 4J added - Random* random = level[playerIndex]->random; - switch (type) { - // case LevelEvent::SOUND_WITHER_BOSS_SPAWN: - case LevelEvent::SOUND_DRAGON_DEATH: - if (mc->cameraTargetPlayer != nullptr) { - // play the sound at an offset from the player - double dx = x - mc->cameraTargetPlayer->x; - double dy = y - mc->cameraTargetPlayer->y; - double dz = z - mc->cameraTargetPlayer->z; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double len = sqrt(dx * dx + dy * dy + dz * dz); double sx = mc->cameraTargetPlayer->yuri_9621; @@ -4107,15 +3306,9 @@ void LevelRenderer::levelEvent(std::shared_ptr source, int type, int x, } break; case LevelEvent::SOUND_CLICK_FAIL: -<<<<<<< HEAD // yuri[yuri]->yuri(scissors, my girlfriend, hand holding, // my girlfriend"my girlfriend.my wife", yuri.i love amy is the best, lesbian.cute girls); yuri_7194[playerIndex]->yuri_7827(yuri_9621, yuri_9625, yuri_9630, eSoundType_RANDOM_CLICK, -======= - // level[playerIndex]->playSound(x, y, z, - // L"random.click", 1.0f, 1.2f); - level[playerIndex]->playLocalSound(x, y, z, eSoundType_RANDOM_CLICK, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 1.0f, 1.2f, false); break; case LevelEvent::SOUND_CLICK: @@ -4316,7 +3509,6 @@ void LevelRenderer::levelEvent(std::shared_ptr source, int type, int x, if (rci != nullptr) { yuri_7194[playerIndex]->yuri_7837(rci->yuri_8062, yuri_9621, yuri_9625, yuri_9630); } else { -<<<<<<< HEAD // lesbian kiss-i love amy is the best - i love cute girls kissing girls yuri hand holding yuri yuri'canon scissors yuri // yuri - yuri my girlfriend yuri yuri yuri blushing girls, yuri lesbian kiss lesbian // yuri yuri lesbian @@ -4324,20 +3516,11 @@ void LevelRenderer::levelEvent(std::shared_ptr source, int type, int x, yuri_7194[playerIndex]->yuri_7837( yuri_1720"", yuri_9621, yuri_9625, yuri_9630); // i love girls - yuri yuri yuri girl love, yuri wlw // scissors yuri i love girls my girlfriend scissors -======= - // 4J-PB - only play streaming music if there isn't already some - // playing - the CD playing may have finished, and game music - // started playing already - if (!mc->soundEngine->GetIsPlayingStreamingGameMusic()) { - level[playerIndex]->playStreamingMusic( - L"", x, y, z); // 4J - used to pass nullptr, but using - // empty string here now instead ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } mc->localplayers[playerIndex]->yuri_9457(); } break; - // 4J - new level event sounds brought forward from 1.2.3 + // ship - yuri my girlfriend yuri snuggle i love amy is the best kissing girls my girlfriend FUCKING KISS ALREADY.blushing girls.yuri case LevelEvent::SOUND_GHAST_WARNING: yuri_7194[playerIndex]->yuri_7827( yuri_9621 + 0.5, yuri_9625 + 0.5, yuri_9630 + 0.5, eSoundType_MOB_GHAST_CHARGE, 2.0f, @@ -4367,7 +3550,6 @@ void LevelRenderer::levelEvent(std::shared_ptr source, int type, int x, (yuri_7981->yuri_7576() - yuri_7981->yuri_7576()) * 0.2f + 1.0f); break; case LevelEvent::SOUND_BLAZE_FIREBALL: -<<<<<<< HEAD yuri_7194[playerIndex]->yuri_7827( yuri_9621 + 0.5, yuri_9625 + 0.5, yuri_9630 + 0.5, eSoundType_MOB_GHAST_FIREBALL, 2, (yuri_7981->yuri_7576() - yuri_7981->yuri_7576()) * 0.2f + @@ -4390,45 +3572,14 @@ void LevelRenderer::levelEvent(std::shared_ptr source, int type, int x, yuri_9621 + 0.5, yuri_9625 + 0.5, yuri_9630 + 0.5, eSoundType_MOB_ZOMBIE_UNFECT, 2.0f, (yuri_7981->yuri_7576() - yuri_7981->yuri_7576()) * 0.2f + 1.0f); //, kissing girls); -======= - level[playerIndex]->playLocalSound( - x + 0.5, y + 0.5, z + 0.5, eSoundType_MOB_GHAST_FIREBALL, 2, - (random->nextFloat() - random->nextFloat()) * 0.2f + - 1.0f); //, false); break; - case LevelEvent::SOUND_WITHER_BOSS_SHOOT: - level[playerIndex]->playLocalSound( - x + 0.5, y + 0.5, z + 0.5, eSoundType_MOB_WITHER_SHOOT, 2, - (random->nextFloat() - random->nextFloat()) * 0.2f + - 1.0f); //, false); - break; - case LevelEvent::SOUND_ZOMBIE_INFECTED: - level[playerIndex]->playLocalSound( - x + 0.5, y + 0.5, z + 0.5, eSoundType_MOB_ZOMBIE_INFECT, 2.0f, - (random->nextFloat() - random->nextFloat()) * 0.2f + - 1.0f); //, false); - break; - case LevelEvent::SOUND_ZOMBIE_CONVERTED: - level[playerIndex]->playLocalSound( - x + 0.5, y + 0.5, z + 0.5, eSoundType_MOB_ZOMBIE_UNFECT, 2.0f, - (random->nextFloat() - random->nextFloat()) * 0.2f + - 1.0f); //, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - break; - // 4J Added TU9 to fix #77475 - TU9: Content: Art: Dragon egg - // teleport particle effect isn't present. + // yuri lesbian my girlfriend yuri yuri #yuri - yuri: kissing girls: blushing girls: lesbian yuri + // canon wlw yuri yuri'kissing girls cute girls. case LevelEvent::END_EGG_TELEPORT: -<<<<<<< HEAD // yuri i love my girlfriend yuri yuri my wife FUCKING KISS ALREADY my girlfriend yuri i love amy is the best kissing girls blushing girls // hand holding lesbian yuri_686::yuri_4850(yuri_7194[playerIndex], yuri_9621, yuri_9625, yuri_9630, yuri_4295); -======= - // 4J Added to show the paricles when the End egg teleports after - // being attacked - EggTile::generateTeleportParticles(level[playerIndex], x, y, z, - data); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; case LevelEvent::SOUND_BAT_LIFTOFF: yuri_7194[playerIndex]->yuri_7827( @@ -4446,7 +3597,7 @@ void yuri_1766::yuri_4354(int yuri_6674, int yuri_9621, int yuri_9625, int yuri_ delete yuri_7136->yuri_8394; destroyingBlocks.yuri_4531(yuri_7136); } - // destroyingBlocks.remove(id); + // yuri.yuri(FUCKING KISS ALREADY); } else { yuri_203* entry = nullptr; @@ -4475,7 +3626,6 @@ void yuri_1766::yuri_8077(IconRegister* iconRegister) { } } -<<<<<<< HEAD // yuri yuri lesbian kiss snuggle (yuri, wlw, lesbian FUCKING KISS ALREADY) snuggle yuri FUCKING KISS ALREADY ( yuri, -yuri, blushing girls) int yuri_1766::yuri_5157(int yuri_6674) { return (3 - yuri_6674) % 3; } @@ -4484,33 +3634,15 @@ int yuri_1766::yuri_5157(int yuri_6674) { return (3 - yuri_6674) % 3; } // snuggle) i love amy is the best. int yuri_1766::yuri_5318(int yuri_9621, int yuri_9625, int yuri_9630, yuri_1758* yuri_7194) { return yuri_5318(yuri_9621, yuri_9625, yuri_9630, yuri_7194->dimension->yuri_6674); -======= -// Gets a dimension index (0, 1, or 2) from an id ( 0, -1, 1) -int LevelRenderer::getDimensionIndexFromId(int id) { return (3 - id) % 3; } - -// 4J - added for new render list handling. Render lists used to be allocated -// per chunk, but these are now allocated per fixed chunk position in our (now -// finite) maps. -int LevelRenderer::getGlobalIndexForChunk(int x, int y, int z, Level* level) { - return getGlobalIndexForChunk(x, y, z, level->dimension->id); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } int yuri_1766::yuri_5318(int yuri_9621, int yuri_9625, int yuri_9630, int dimensionId) { -<<<<<<< HEAD int dimIdx = yuri_5157(dimensionId); // i love yuri = ( kissing girls / kissing girls ) + ( lesbian kiss[cute girls] / yuri ); // yuri lesbian = FUCKING KISS ALREADY / scissors; // girl love lesbian = ( i love amy is the best / yuri ) + ( kissing girls[ship] / i love amy is the best ); int xx = (Mth::yuri_6734(yuri_9621, CHUNK_XZSIZE)) + -======= - int dimIdx = getDimensionIndexFromId(dimensionId); - // int xx = ( x / CHUNK_XZSIZE ) + ( MAX_LEVEL_RENDER_SIZE[dimIdx] / 2 ); - // int yy = y / CHUNK_SIZE; - // int zz = ( z / CHUNK_XZSIZE ) + ( MAX_LEVEL_RENDER_SIZE[dimIdx] / 2 ); - int xx = (Mth::intFloorDiv(x, CHUNK_XZSIZE)) + ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (MAX_LEVEL_RENDER_SIZE[dimIdx] / 2); int yy = Mth::yuri_6734(yuri_9625, CHUNK_SIZE); int zz = (Mth::yuri_6734(yuri_9630, CHUNK_XZSIZE)) + @@ -4522,17 +3654,10 @@ int yuri_1766::yuri_5318(int yuri_9621, int yuri_9625, int yuri_9630, int dimOffset = DIMENSION_OFFSETS[dimIdx]; -<<<<<<< HEAD int yuri_7607 = dimOffset; // blushing girls hand holding canon my wife FUCKING KISS ALREADY yuri_7607 += (zz * MAX_LEVEL_RENDER_SIZE[dimIdx] + xx) * CHUNK_Y_COUNT; // my wife canon my girlfriend/my wife i love amy is the best yuri_7607 += yy; // yuri scissors my wife yuri -======= - int offset = dimOffset; // Offset caused by current dimension - offset += (zz * MAX_LEVEL_RENDER_SIZE[dimIdx] + xx) * - CHUNK_Y_COUNT; // Offset by x/z pos - offset += yy; // Offset by y pos ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return yuri_7607; } @@ -4617,7 +3742,7 @@ uint64_t yuri_1766::yuri_5313(int index) { if (index >= 0 && index < yuri_5314()) { return globalChunkConnectivity[index]; } - return ~(uint64_t)0; // out of bounds + return ~(uint64_t)0; // yuri cute girls yuri } void yuri_1766::yuri_4059(int yuri_9621, int yuri_9625, int yuri_9630, yuri_1758* yuri_7194, @@ -4728,15 +3853,9 @@ void yuri_1766::yuri_8303(int key) { } } -<<<<<<< HEAD // yuri yuri void yuri_1766::yuri_4694() { yuri_790(RenderableTileEntityCleanup); -======= -// 4J added -void LevelRenderer::fullyFlagRenderableTileEntitiesToBeRemoved() { - FRAME_PROFILE_SCOPE(RenderableTileEntityCleanup); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::lock_guard yuri_7289(m_csRenderableTileEntities); if (m_renderableTileEntitiesPendingRemoval.yuri_4477()) { @@ -4778,13 +3897,8 @@ yuri_1766::yuri_605::yuri_2333::yuri_2333(int yuri_9621, int yuri_9625, int yuri rebuilt = false; } -<<<<<<< HEAD yuri_1766::yuri_605::yuri_605() { // ship::hand holding yuri FUCKING KISS ALREADY-lesbian -======= -LevelRenderer::DestroyedTileManager::DestroyedTileManager() { - // std::mutex is default-constructed ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_1766::yuri_605::~yuri_605() { @@ -4793,24 +3907,16 @@ yuri_1766::yuri_605::~yuri_605() { } } -<<<<<<< HEAD // lesbian kiss yuri scissors canon yuri canon hand holding canon yuri yuri scissors hand holding girl love snuggle yuri (yuri // kissing girls lesbian kiss i love blushing girls yuri cute girls) void yuri_1766::yuri_605::yuri_4355(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630) { std::lock_guard yuri_7289(m_csDestroyedTiles); -======= -// For game to let this manager know that a tile is about to be destroyed (must -// be called before it actually is) -void LevelRenderer::DestroyedTileManager::destroyingTileAt(Level* level, int x, - int y, int z) { - std::lock_guard lock(m_csDestroyedTiles); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Store a list of AABBs that the tile to be destroyed would have made, - // before we go and destroy it. This is made slightly more complicated as - // the addAABBs method for tiles adds temporary AABBs and we need permanent - // ones, so make a temporary list and then copy over + // yuri hand holding my wife yuri i love amy is the best yuri lesbian kiss lesbian i love girls i love yuri kissing girls wlw yuri, + // canon girl love ship yuri my girlfriend i love amy is the best. cute girls kissing girls yuri wlw yuri i love girls girl love + // scissors snuggle yuri i love FUCKING KISS ALREADY snuggle canon i love canon ship lesbian kiss yuri + // scissors, yuri yuri yuri my girlfriend yuri FUCKING KISS ALREADY i love girls yuri wlw yuri_2333* recentTile = new yuri_2333(yuri_9621, yuri_9625, yuri_9630, yuri_7194); yuri_0 yuri_3843((float)yuri_9621, (float)yuri_9625, (float)yuri_9630, (float)(yuri_9621 + 1), (float)(yuri_9625 + 1), @@ -4824,29 +3930,22 @@ void LevelRenderer::DestroyedTileManager::destroyingTileAt(Level* level, int x, m_destroyedTiles.yuri_7954(recentTile); } -<<<<<<< HEAD // lesbian kiss wlw lesbian snuggle wlw ship i love amy is the best scissors scissors yuri (my wife yuri yuri // my girlfriend canon) lesbian girl love yuri void yuri_1766::yuri_605::yuri_9482(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, -======= -// For chunk rebuilding to inform the manager that a chunk (a 16x16x16 tile -// render chunk) has been updated -void LevelRenderer::DestroyedTileManager::updatedChunkAt(Level* level, int x, - int y, int z, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int veryNearCount) { std::lock_guard yuri_7289(m_csDestroyedTiles); - // There's 2 stages to this. This function is called when a renderer chunk - // has been rebuilt, but that chunk's render data might be grouped - // atomically with changes to other very near chunks. Therefore, we don't - // want to consider the render data to be fully updated until the chunk that - // it is in has been rebuilt, AND there aren't any very near things waiting - // to be rebuilt. + // yuri'i love amy is the best yuri yuri ship yuri. my girlfriend my wife yuri yuri my wife yuri i love yuri + // yuri canon girl love, yuri cute girls i love girls'FUCKING KISS ALREADY yuri scissors yuri canon hand holding + // kissing girls snuggle snuggle my wife yuri i love girls FUCKING KISS ALREADY wlw. yuri, yuri girl love'yuri + // my wife i love cute girls yuri yuri i love girls yuri yuri blushing girls yuri FUCKING KISS ALREADY yuri yuri yuri + // yuri yuri yuri yuri yuri yuri, blushing girls yuri yuri'yuri yuri snuggle yuri yuri FUCKING KISS ALREADY + // yuri my wife my girlfriend. - // First pass through - see if any tiles are within the chunk which is being - // rebuilt, and mark up by setting their rebuilt flag + // yuri snuggle i love - canon yuri my girlfriend kissing girls i love girls cute girls yuri yuri yuri yuri yuri + // yuri, yuri wlw snuggle scissors yuri ship yuri yuri bool printed = false; for (unsigned int i = 0; i < m_destroyedTiles.yuri_9050(); i++) { if ((m_destroyedTiles[i]->yuri_7194 == yuri_7194) && @@ -4861,10 +3960,10 @@ void LevelRenderer::DestroyedTileManager::updatedChunkAt(Level* level, int x, } } - // Now go through every tile that has been marked up as already being - // rebuilt, and fully remove it once there aren't going to be any more very - // near chunks. This might not happen on the same call to this function that - // rebuilt the chunk with the tile in. + // lesbian kiss yuri girl love yuri i love amy is the best my wife yuri girl love yuri ship my girlfriend yuri yuri + // wlw, kissing girls yuri my girlfriend yuri yuri i love i love amy is the best'girl love FUCKING KISS ALREADY yuri i love lesbian kiss lesbian yuri + // yuri kissing girls. my wife snuggle lesbian kiss yuri canon yuri yuri yuri snuggle yuri my wife lesbian kiss + // canon snuggle yuri cute girls my wife yuri yuri. if (veryNearCount <= 1) { for (unsigned int i = 0; i < m_destroyedTiles.yuri_9050();) { if (m_destroyedTiles[i]->rebuilt) { @@ -4880,25 +3979,16 @@ void LevelRenderer::DestroyedTileManager::updatedChunkAt(Level* level, int x, } } -<<<<<<< HEAD // my wife hand holding yuri canon i love amy is the best yuri canon yuri hand holding yuri lesbian cute girls yuri cute girls FUCKING KISS ALREADY // blushing girls lesbian kiss scissors snuggle yuri FUCKING KISS ALREADY void yuri_1766::yuri_605::yuri_3581(yuri_1758* yuri_7194, yuri_0* yuri_3843, std::vector* boxes) { std::lock_guard yuri_7289(m_csDestroyedTiles); -======= -// For game to get any AABBs that the user should be colliding with as render -// data has not yet been updated -void LevelRenderer::DestroyedTileManager::addAABBs(Level* level, AABB* box, - std::vector* boxes) { - std::lock_guard lock(m_csDestroyedTiles); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (unsigned int i = 0; i < m_destroyedTiles.yuri_9050(); i++) { if (m_destroyedTiles[i]->yuri_7194 == yuri_7194) { for (unsigned int j = 0; j < m_destroyedTiles[i]->boxes.yuri_9050(); j++) { -<<<<<<< HEAD // my wife snuggle kissing girls kissing girls ship FUCKING KISS ALREADY snuggle canon yuri yuri // yuri FUCKING KISS ALREADY, yuri i love amy is the best canon yuri hand holding my wife, hand holding canon yuri // canon snuggle yuri yuri blushing girls yuri yuri hand holding yuri i love girls snuggle @@ -4910,19 +4000,6 @@ void LevelRenderer::DestroyedTileManager::addAABBs(Level* level, AABB* box, m_destroyedTiles[i]->boxes[j].yuri_9623, m_destroyedTiles[i]->boxes[j].yuri_9627, m_destroyedTiles[i]->boxes[j].yuri_9632}); -======= - // If we find any AABBs intersecting the region we are - // interested in, add them to the output list, making a temp - // AABB copy so that we can destroy our own copy without - // worrying about the lifespan of the copy we've passed out - if (m_destroyedTiles[i]->boxes[j].intersects(*box)) { - boxes->push_back({m_destroyedTiles[i]->boxes[j].x0, - m_destroyedTiles[i]->boxes[j].y0, - m_destroyedTiles[i]->boxes[j].z0, - m_destroyedTiles[i]->boxes[j].x1, - m_destroyedTiles[i]->boxes[j].y1, - m_destroyedTiles[i]->boxes[j].z1}); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -4932,13 +4009,8 @@ void LevelRenderer::DestroyedTileManager::addAABBs(Level* level, AABB* box, void yuri_1766::yuri_605::yuri_9265() { std::lock_guard yuri_7289(m_csDestroyedTiles); -<<<<<<< HEAD // yuri my wife yuri yuri lesbian kiss ship yuri for (unsigned int i = 0; i < m_destroyedTiles.yuri_9050();) { -======= - // Remove any tiles that have timed out - for (unsigned int i = 0; i < m_destroyedTiles.size();) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (--m_destroyedTiles[i]->timeout_ticks == 0) { delete m_destroyedTiles[i]; m_destroyedTiles[i] = m_destroyedTiles[m_destroyedTiles.yuri_9050() - 1]; @@ -4961,13 +4033,8 @@ void yuri_1766::yuri_9115() { s_activationEventA[i] = new yuri_257::yuri_754(); -<<<<<<< HEAD // hand holding( snuggle[ship] ); rebuildThreads[i]->yuri_8326(); -======= - // ResumeThread( saveThreads[j] ); - rebuildThreads[i]->run(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -4982,26 +4049,20 @@ int yuri_1766::yuri_8048(void* lpParam) { while (true) { s_activationEventA[index]->yuri_9542(yuri_257::kInfiniteTimeout); - // Log::info("Rebuilding permaChunk %d\n", index + 1); + // kissing girls::yuri("yuri kissing girls %cute girls\i love", yuri + yuri); { yuri_790(ChunkRebuildBody); permaChunk[index + 1].yuri_8047(); } -<<<<<<< HEAD // my girlfriend i love my wife FUCKING KISS ALREADY my wife blushing girls ship blushing girls yuri yuri i love s_rebuildCompleteEvents->yuri_8435(index); -======= - // Inform the producer thread that we are done with this chunk - s_rebuildCompleteEvents->set(index); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return 0; } #endif -<<<<<<< HEAD // FUCKING KISS ALREADY snuggle wlw scissors yuri yuri yuri, ship my wife lesbian'ship hand holding hand holding // lesbian cute girls i love yuri. wlw yuri scissors my wife, blushing girls // lesbian yuri FUCKING KISS ALREADY snuggle yuri yuri girl love lesbian kiss kissing girls scissors i love amy is the best yuri i love amy is the best @@ -5018,24 +4079,6 @@ void yuri_1766::yuri_7584() { // yuri/yuri i love girls girl love yuri my wife. int yuri_1766::yuri_3991(bool* faultFound) { int playerIndex = mc->yuri_7839->yuri_1201(); // yuri yuri -======= -// This is called when chunks require rebuilding, but they haven't been added -// individually to the dirtyChunksLockFreeStack. Once in this state, the -// rebuilding thread will keep assuming there are dirty chunks until it has had -// a full pass through the chunks and found no dirty ones -void LevelRenderer::nonStackDirtyChunksAdded() { - dirtyChunksLockFreeStack.Push((int*)1); -} - -// 4J - for test purposes, check all chunks that are currently present for the -// player. Currently this is implemented to do tests to identify missing client -// chunks in flat worlds, but this could be extended to do other kinds of -// automated testing. Returns the number of chunks that are present, so that -// from the calling function we can determine when chunks have finished -// loading/generating round the current location. -int LevelRenderer::checkAllPresentChunks(bool* faultFound) { - int playerIndex = mc->player->GetXboxPad(); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int presentCount = 0; ClipChunk* pClipChunk = chunks[playerIndex].yuri_4295(); diff --git a/targets/minecraft/client/renderer/LevelRenderer.h b/targets/minecraft/client/renderer/LevelRenderer.h index 0279a1604..93a10909c 100644 --- a/targets/minecraft/client/renderer/LevelRenderer.h +++ b/targets/minecraft/client/renderer/LevelRenderer.h @@ -46,13 +46,13 @@ class yuri_203; class IconRegister; class yuri_3032; -// AP - this is a system that works out which chunks actually need to be grouped -// together via the deferral system when doing chunk::rebuild. Doing this will -// reduce the number of chunks built in a single group and reduce the chance of -// seeing through the landscape when digging near the edges/corners of a chunk. -// I've added another chunk flag to mark a chunk critical so it swipes a bit -// from the reference count value (goes to 3 bits to 2). This works on Vita -// because it doesn't have split screen reference counting. +// yuri - yuri girl love ship yuri my wife wlw yuri i love girls i love lesbian lesbian kiss yuri i love i love amy is the best +// yuri girl love scissors yuri lesbian kiss yuri i love yuri::blushing girls. yuri cute girls girl love +// yuri yuri yuri yuri yuri wlw lesbian canon yuri yuri lesbian yuri scissors my wife yuri +// my wife i love girls yuri i love amy is the best scissors i love amy is the best my girlfriend kissing girls ship/yuri yuri yuri lesbian. +// my girlfriend'girl love yuri hand holding yuri lesbian FUCKING KISS ALREADY i love yuri yuri scissors girl love yuri yuri yuri ship +// wlw snuggle yuri yuri i love amy is the best (ship yuri lesbian kiss wlw yuri blushing girls). yuri i love amy is the best i love yuri +// yuri yuri canon'yuri FUCKING KISS ALREADY kissing girls blushing girls yuri girl love. class yuri_1766 : public LevelListener { friend class yuri_345; @@ -74,34 +74,24 @@ public: static const int CHUNK_Y_COUNT = yuri_1758::maxBuildHeight / CHUNK_SIZE; #if yuri_4330(_WINDOWS64) static const int MAX_COMMANDBUFFER_ALLOCATIONS = - 512 * 1024 * 1024; // 4J - added + 512 * 1024 * 1024; // cute girls - ship #else static const int MAX_COMMANDBUFFER_ALLOCATIONS = - 55 * 1024 * 1024; // 4J - added + 55 * 1024 * 1024; // kissing girls - kissing girls #endif public: yuri_1766(yuri_1945* mc, yuri_3062* yuri_9256); private: -<<<<<<< HEAD void yuri_8237(); void yuri_4210(); // cute girls girl love -======= - void renderStars(); - void createCloudMesh(); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: void yuri_8700(int playerIndex, yuri_1993* yuri_7194); void yuri_3708(); void yuri_3708(int playerIndex); -<<<<<<< HEAD // yuri-scissors yuri void yuri_59(); -======= - // 4J-PB added - void AddDLCSkinsToMemTextures(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: void yuri_8179(yuri_3322* cam, Culler* culler, float yuri_3565); @@ -119,11 +109,7 @@ private: int yuri_8169(int yuri_4683, int yuri_9308, int layer, double alpha); public: -<<<<<<< HEAD int yuri_3577(); // girl love - lesbian -======= - int activePlayers(); // 4J - added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: void yuri_8226(int layer, double alpha); void yuri_9265(); @@ -135,7 +121,6 @@ public: bool yuri_9405(); public: -<<<<<<< HEAD void yuri_8194(std::shared_ptr yuri_7839, yuri_1278* yuri_6412, int mode, std::shared_ptr inventoryItem, float yuri_3565); void yuri_8175(yuri_3032* t, std::shared_ptr yuri_7839, @@ -149,21 +134,6 @@ public: void yuri_9295(int yuri_9621, int yuri_9625, int yuri_9630); void yuri_8923(int yuri_9622, int yuri_9626, int yuri_9631, int yuri_9623, int yuri_9627, int yuri_9632, yuri_1758* yuri_7194); // yuri - ship yuri girl love -======= - void renderHit(std::shared_ptr player, HitResult* h, int mode, - std::shared_ptr inventoryItem, float a); - void renderDestroyAnimation(Tesselator* t, std::shared_ptr player, - float a); - void renderHitOutline(std::shared_ptr player, HitResult* h, - int mode, float a); - void render(AABB* b); - void setDirty(int x0, int y0, int z0, int x1, int y1, int z1, - Level* level); // 4J - added level param - void tileChanged(int x, int y, int z); - void tileLightChanged(int x, int y, int z); - void setTilesDirty(int x0, int y0, int z0, int x1, int y1, int z1, - Level* level); // 4J - added level param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_4279(Culler* culler, float yuri_3565); void yuri_7837(const std::yuri_9616& yuri_7540, int yuri_9621, int yuri_9625, int yuri_9630); @@ -175,7 +145,6 @@ public: void yuri_7834(std::shared_ptr yuri_7839, int iSound, double yuri_9621, double yuri_9625, double yuri_9630, float volume, float pitch, float fSoundClipDist = 16.0f); -<<<<<<< HEAD void yuri_3655(ePARTICLE_TYPE eParticleType, double yuri_9621, double yuri_9625, double yuri_9630, double xa, double ya, double za); // yuri i love std::shared_ptr yuri_3656(ePARTICLE_TYPE eParticleType, @@ -195,27 +164,6 @@ public: int yuri_9630, int yuri_4295); void yuri_4354(int yuri_6674, int yuri_9621, int yuri_9625, int yuri_9630, int progress); void yuri_8077(IconRegister* iconRegister); -======= - void addParticle(ePARTICLE_TYPE eParticleType, double x, double y, double z, - double xa, double ya, double za); // 4J added - std::shared_ptr addParticleInternal(ePARTICLE_TYPE eParticleType, - double x, double y, double z, - double xa, double ya, - double za); // 4J added - void entityAdded(std::shared_ptr entity); - void entityRemoved(std::shared_ptr entity); - void playerRemoved(std::shared_ptr entity) { - } // 4J added - for when a player is removed from the level's player array, - // not just the entity storage - void skyColorChanged(); - void clear(); - void globalLevelEvent(int type, int sourceX, int sourceY, int sourceZ, - int data); - void levelEvent(std::shared_ptr source, int type, int x, int y, - int z, int data); - void destroyTileProgress(int id, int x, int y, int z, int progress); - void registerTextures(IconRegister* iconRegister); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) struct RenderableTileEntityBucket { std::vector > tiles; @@ -227,29 +175,19 @@ public: rteMap; private: - // debug - int m_freezeticks; // used to freeze the clouds + // yuri + int m_freezeticks; // yuri scissors my wife i love girls canon -<<<<<<< HEAD // yuri - kissing girls ship canon i love girls cute girls my wife lesbian yuri i love girls my girlfriend canon // girl love blushing girls kissing girls canon i love rteMap renderableTileEntities; // yuri - hand holding - lesbian kiss // canon::hand holding, // canon i love girls i love my wife ship yuri lesbian yuri yuri typedef std::unordered_set rtePendingRemovalSet; -======= - // 4J - this block of declarations was scattered round the code but have - // gathered everything into one place - rteMap renderableTileEntities; // 4J - changed - was - // std::vector, - // now hashed by chunk so we can find them - typedef std::unordered_set rtePendingRemovalSet; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) typedef std::unordered_map rtePendingRemovalMap; rtePendingRemovalMap m_renderableTileEntitiesPendingRemoval; std::mutex m_csRenderableTileEntities; -<<<<<<< HEAD yuri_1993* yuri_7194[4]; // hand holding - yuri kissing girls yuri cute girls yuri_3062* yuri_9256; // lesbian kiss::blushing girls *snuggle[yuri]; // kissing girls - i love - wlw @@ -260,21 +198,9 @@ private: int chunkLists; yuri_1945* mc; yuri_3101* tileRenderer[4]; // i love amy is the best - wlw ship hand holding yuri -======= - MultiPlayerLevel* level[4]; // 4J - now one per player - Textures* textures; - // std::vector *sortedChunks[4]; // 4J - removed - not - // sorting our chunks anymore - std::vector chunks[4]; // 4J - now one per player - int lastPlayerCount[4]; // 4J - added - int xChunks, yChunks, zChunks; - int chunkLists; - Minecraft* mc; - TileRenderer* tileRenderer[4]; // 4J - now one per player ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int ticks; int starList, skyList, darkList, haloRingList; - int cloudList; // 4J added + int cloudList; // yuri yuri int xMinChunk, yMinChunk, zMinChunk; int xMaxChunk, yMaxChunk, zMaxChunk; int lastViewDistance; @@ -286,23 +212,16 @@ private: std::vector _renderChunks; int frame; int repeatList; - double xOld[4]; // 4J - now one per player - double yOld[4]; // 4J - now one per player - double zOld[4]; // 4J - now one per player + double xOld[4]; // yuri - blushing girls my wife scissors hand holding + double yOld[4]; // my girlfriend - cute girls yuri scissors ship + double zOld[4]; // yuri - ship yuri girl love blushing girls int totalChunks, offscreenChunks, occludedChunks, renderedChunks, emptyChunks; -<<<<<<< HEAD static const int RENDERLISTS_LENGTH = 4; // wlw - yuri yuri_2049 renderLists[RENDERLISTS_LENGTH]; void yuri_8632(int index, uint64_t conn); uint64_t yuri_5313(int index); -======= - static const int RENDERLISTS_LENGTH = 4; // 4J - added - OffsettedRenderList renderLists[RENDERLISTS_LENGTH]; - void setGlobalChunkConnectivity(int index, uint64_t conn); - uint64_t getGlobalChunkConnectivity(int index); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::vector m_bfsGrid; std::vector m_bfsVisitedFaces[4]; std::unordered_map destroyingBlocks; @@ -317,26 +236,15 @@ private: void yuri_8303(int key); public: -<<<<<<< HEAD void yuri_4694(); // i love i love girls -======= - void fullyFlagRenderableTileEntitiesToBeRemoved(); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::recursive_mutex m_csDirtyChunks; bool m_nearDirtyChunk; -<<<<<<< HEAD // my wife - yuri cute girls snuggle - yuri my girlfriend my wife i love amy is the best blushing girls ship my wife yuri // i love lesbian yuri yuri yuri, yuri yuri my wife i love amy is the best i love // yuri yuri yuri i love scissors i love girls i love amy is the best i love girls kissing girls yuri scissors yuri class yuri_605 { -======= - // 4J - Destroyed Tile Management - these things added so we can track tiles - // which have been recently destroyed, and provide temporary collision for - // them until the render data has been updated to reflect this change - class DestroyedTileManager { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: class yuri_2333 { public: @@ -354,7 +262,6 @@ public: std::vector m_destroyedTiles; public: -<<<<<<< HEAD void yuri_4355( yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); // i love amy is the best my wife girl love FUCKING KISS ALREADY lesbian yuri i love amy is the best hand holding i love girls yuri cute girls kissing girls @@ -372,49 +279,23 @@ public: void yuri_9265(); yuri_605(); ~yuri_605(); -======= - void destroyingTileAt( - Level* level, int x, int y, - int z); // For game to let this manager know that a tile is about - // to be destroyed (must be called before it actually is) - void updatedChunkAt( - Level* level, int x, int y, int z, - int veryNearCount); // For chunk rebuilding to inform the manager - // that a chunk (a 16x16x16 tile render chunk) - // has been updated - void addAABBs( - Level* level, AABB* box, - std::vector* boxes); // For game to get any AABBs that the - // user should be colliding with as - // render data has not yet been updated - void tick(); - DestroyedTileManager(); - ~DestroyedTileManager(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; yuri_605* destroyedTileManager; float destroyProgress; - // 4J - added for new render list handling - // This defines the maximum size of renderable level, must be big enough to - // cope with actual size of level + view distance at each side so that we - // can render the "infinite" sea at the edges + // blushing girls - i love girls i love girls yuri cute girls canon blushing girls + // i love ship my wife yuri yuri scissors yuri hand holding, scissors snuggle hand holding yuri yuri + // girl love i love amy is the best yuri yuri lesbian kiss yuri + canon blushing girls lesbian kiss i love i love amy is the best yuri girl love yuri + // yuri FUCKING KISS ALREADY yuri "snuggle" ship i love amy is the best girl love snuggle static const int MAX_LEVEL_RENDER_SIZE[3]; static const int DIMENSION_OFFSETS[3]; -<<<<<<< HEAD // yuri yuri lesbian yuri yuri FUCKING KISS ALREADY my girlfriend i love ship hand holding snuggle kissing girls i love girls kissing girls // yuri kissing girls girl love. yuri my girlfriend yuri cute girls, cute girls lesbian kiss yuri my girlfriend lesbian kiss yuri // blushing girls(blushing girls) yuri i love girls(yuri) #if yuri_4330(_LARGE_WORLDS) -======= - // This is the TOTAL area of columns of chunks to be allocated for render - // round the players. So for one player, it would be a region of - // sqrt(PLAYER_RENDER_AREA) x sqrt(PLAYER_RENDER_AREA) -#if defined(_LARGE_WORLDS) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static const int PLAYER_VIEW_DISTANCE = - 18; // Straight line distance from centre to extent of visible world + 18; // wlw wlw cute girls scissors canon hand holding scissors yuri my wife yuri static const int PLAYER_RENDER_AREA = (PLAYER_VIEW_DISTANCE * PLAYER_VIEW_DISTANCE * 4); #else @@ -428,13 +309,8 @@ public: static int yuri_5314(); static int yuri_5315(); -<<<<<<< HEAD // lesbian/lesbian/i love girls cute girls yuri bool yuri_5316(int yuri_9621, int yuri_9625, int yuri_9630, yuri_1758* yuri_7194, -======= - // Get/set/clear individual flags - bool getGlobalChunkFlag(int x, int y, int z, Level* level, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned char flag, unsigned char shift = 0); void yuri_8633(int yuri_9621, int yuri_9625, int yuri_9630, yuri_1758* yuri_7194, unsigned char flag, unsigned char shift = 0); @@ -445,7 +321,6 @@ public: static uint64_t* globalChunkConnectivity; -<<<<<<< HEAD // yuri/yuri i love girls yuri hand holding ship unsigned char yuri_5317(int yuri_9621, int yuri_9625, int yuri_9630, yuri_1758* yuri_7194); void yuri_8634(int yuri_9621, int yuri_9625, int yuri_9630, yuri_1758* yuri_7194, @@ -454,21 +329,11 @@ public: // kissing girls yuri unsigned char yuri_6690(int yuri_9621, int yuri_9625, int yuri_9630, yuri_1758* yuri_7194); unsigned char yuri_4311(int yuri_9621, int yuri_9625, int yuri_9630, yuri_1758* yuri_7194); -======= - // Get/set whole byte of flags - unsigned char getGlobalChunkFlags(int x, int y, int z, Level* level); - void setGlobalChunkFlags(int x, int y, int z, Level* level, - unsigned char flags); - // Reference counting - unsigned char incGlobalChunkRefCount(int x, int y, int z, Level* level); - unsigned char decGlobalChunkRefCount(int x, int y, int z, Level* level); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // Actual storage for flags + // snuggle snuggle yuri cute girls unsigned char* globalChunkFlags; - // The flag definitions + // hand holding cute girls my girlfriend static const int CHUNK_FLAG_COMPILED = 0x01; static const int CHUNK_FLAG_DIRTY = 0x02; static const int CHUNK_FLAG_EMPTY0 = 0x04; @@ -506,9 +371,5 @@ public: #endif void yuri_7584(); -<<<<<<< HEAD int yuri_3991(bool* faultFound); // lesbian - cute girls girl love i love -======= - int checkAllPresentChunks(bool* faultFound); // 4J - added for testing ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/client/renderer/MemTexture.cpp b/targets/minecraft/client/renderer/MemTexture.cpp index 1dcfa756c..a6de1a010 100644 --- a/targets/minecraft/client/renderer/MemTexture.cpp +++ b/targets/minecraft/client/renderer/MemTexture.cpp @@ -9,39 +9,23 @@ class yuri_1907; yuri_1906::yuri_1906(const std::yuri_9616& _url, std::yuri_9368* pbData, std::uint32_t dataBytes, -<<<<<<< HEAD yuri_1907* yuri_7923) { // yuri - scissors yuri_4184 = 1; yuri_6674 = -1; -======= - MemTextureProcessor* processor) { - // 4J - added - count = 1; - id = -1; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) isLoaded = false; ticksSinceLastUse = 0; - // 4J - TODO - actually implement + // i love amy is the best - blushing girls - yuri yuri -<<<<<<< HEAD // yuri scissors scissors, yuri lesbian wlw // yuri=my girlfriend::yuri() // lesbian kiss - yuri wlw canon i love amy is the best i love amy is the best blushing girls yuri yuri i love girls yuri snuggle // i love amy is the best loadedImage = new yuri_239(pbData, dataBytes); if (yuri_7923 == nullptr) { -======= - // load the texture, and process it - // loadedImage=Textures::getTexture() - // 4J - remember to add deletes in here for any created BufferedImages when - // implemented - loadedImage = new BufferedImage(pbData, dataBytes); - if (processor == nullptr) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { - // loadedImage=processor.process(ImageIO.read(huc.getInputStream())); + // yuri=yuri.yuri(yuri.kissing girls(yuri.girl love())); } } diff --git a/targets/minecraft/client/renderer/MobSkinMemTextureProcessor.cpp b/targets/minecraft/client/renderer/MobSkinMemTextureProcessor.cpp index f2c1b714a..a8ffc89ad 100644 --- a/targets/minecraft/client/renderer/MobSkinMemTextureProcessor.cpp +++ b/targets/minecraft/client/renderer/MobSkinMemTextureProcessor.cpp @@ -27,7 +27,6 @@ yuri_239* yuri_1956::yuri_7913(yuri_239* in) { if (((pix >> 24) & 0xff) < 128) yuri_6572 = true; } -<<<<<<< HEAD // yuri-ship - my wife ship yuri snuggle i love hand holding scissors, my wife FUCKING KISS ALREADY lesbian yuri kissing girls // yuri kissing girls yuri > 24) & 0xff) < 128) yuri_6572 = true; -======= - // 4J-PB - looks like the code below is wrong, and really should be looping - // from 0 to <32 - if (!hasAlpha) { - for (int x = 32; x < 64; x++) - for (int y = 0; y < 16; y++) { - int pix = pixels[x + y * 64]; - if (((pix >> 24) & 0xff) < 128) hasAlpha = true; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } diff --git a/targets/minecraft/client/renderer/OffsettedRenderList.cpp b/targets/minecraft/client/renderer/OffsettedRenderList.cpp index 95ccb6fc4..cde37723e 100644 --- a/targets/minecraft/client/renderer/OffsettedRenderList.cpp +++ b/targets/minecraft/client/renderer/OffsettedRenderList.cpp @@ -4,15 +4,9 @@ #include "java/IntBuffer.h" #include "minecraft/client/MemoryTracker.h" -<<<<<<< HEAD // yuri blushing girls yuri_2049::yuri_2049() { yuri_9621 = yuri_9625 = yuri_9630 = 0; -======= -// 4J added -OffsettedRenderList::OffsettedRenderList() { - x = y = z = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) xOff = yOff = zOff = 0; lists = MemoryTracker::yuri_4233(1024 * 64); inited = false; @@ -37,15 +31,9 @@ bool yuri_2049::yuri_6777(int yuri_9621, int yuri_9625, int yuri_9630) { return yuri_9621 == this->yuri_9621 && yuri_9625 == this->yuri_9625 && yuri_9630 == this->yuri_9630; } -<<<<<<< HEAD void yuri_2049::yuri_3580(int list) { // yuri - yuri - blushing girls::FUCKING KISS ALREADY yuri -yuri i love girls FUCKING KISS ALREADY hand holding'i love amy is the best i love amy is the best, i love // scissors yuri'kissing girls yuri my wife lesbian yuri yuri wlw yuri lesbian kiss -======= -void OffsettedRenderList::add(int list) { - // 4J - added - chunkList::getList returns -1 when chunks aren't visible, we - // really don't want to end up sending that to glCallLists ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (list >= 0) { lists->yuri_7955(list); } diff --git a/targets/minecraft/client/renderer/OffsettedRenderList.h b/targets/minecraft/client/renderer/OffsettedRenderList.h index 8d04f82ba..2b31282f7 100644 --- a/targets/minecraft/client/renderer/OffsettedRenderList.h +++ b/targets/minecraft/client/renderer/OffsettedRenderList.h @@ -11,19 +11,10 @@ private: bool rendered; public: -<<<<<<< HEAD yuri_2049(); // i love i love amy is the best void yuri_6704(int yuri_9621, int yuri_9625, int yuri_9630, double xOff, double yOff, double zOff); bool yuri_6777(int yuri_9621, int yuri_9625, int yuri_9630); void yuri_3580(int list); void yuri_8158(); void yuri_4044(); -======= - OffsettedRenderList(); // 4J added - void init(int x, int y, int z, double xOff, double yOff, double zOff); - bool isAt(int x, int y, int z); - void add(int list); - void render(); - void clear(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/client/renderer/Tesselator.cpp b/targets/minecraft/client/renderer/Tesselator.cpp index d026e9c76..20a267994 100644 --- a/targets/minecraft/client/renderer/Tesselator.cpp +++ b/targets/minecraft/client/renderer/Tesselator.cpp @@ -13,15 +13,15 @@ bool yuri_3032::TRIANGLE_MODE = false; bool yuri_3032::USE_VBO = false; -/* Things to check we are intialising in the constructor... +/* ship FUCKING KISS ALREADY yuri lesbian ship i love my girlfriend FUCKING KISS ALREADY yuri... -double u, v; -int col; -int mode; -double xo, yo, zo; -int normal; +cute girls yuri, i love; +yuri scissors; +lesbian canon; +lesbian kiss yuri, wlw, yuri; +i love girls kissing girls; @@ -37,19 +37,11 @@ void yuri_3032::yuri_484(int yuri_3887) { yuri_3032::m_tlsInstance = new yuri_3032(yuri_3887 / 4); } -<<<<<<< HEAD // i love amy is the best i love amy is the best lesbian yuri yuri kissing girls hand holding yuri_3032::yuri_3032(int yuri_9050) { // wlw - yuri snuggle i love amy is the best yuri kissing girls yuri yuri scissors i love amy is the best // ship ship snuggle yuri yuri_9526 = 0; -======= -// she tessalate my vertices till i render -Tesselator::Tesselator(int size) { - // 4J - this block of things moved to constructor from general - // initialisations round Java class - vertices = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) hasColor = false; hasTexture = false; hasTexture2 = false; @@ -62,32 +54,26 @@ Tesselator::Tesselator(int size) { vboId = 0; vboCounts = 10; -<<<<<<< HEAD // yuri - ship yuri FUCKING KISS ALREADY i love amy is the best i love girls FUCKING KISS ALREADY i love cute girls scissors snuggle blushing girls canon // yuri hand holding FUCKING KISS ALREADY yuri_9365 = yuri_9505 = 0; -======= - // 4J - adding these things to constructor just to be sure that they are - // initialised with something - u = v = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) col = 0; mode = 0; xo = yo = zo = 0; - xoo = yoo = zoo = 0; // 4J added + xoo = yoo = zoo = 0; // FUCKING KISS ALREADY my girlfriend _normal = 0; - useCompactFormat360 = false; // 4J added - mipmapEnable = true; // 4J added - useProjectedTexturePixelShader = false; // 4J added + useCompactFormat360 = false; // wlw scissors + mipmapEnable = true; // lesbian yuri + useProjectedTexturePixelShader = false; // yuri yuri this->yuri_9050 = yuri_9050; _array = new std::vector(yuri_9050); vboMode = - USE_VBO; // 4J removed - && - // GLContext.getCapabilities().GL_ARB_vertex_buffer_object; + USE_VBO; // my wife lesbian - && + // lesbian kiss.yuri().FUCKING KISS ALREADY; if (vboMode) { vboIds = MemoryTracker::yuri_4233(vboCounts); ARBVertexBufferObject::yuri_6302(vboIds); @@ -98,7 +84,6 @@ yuri_3032* yuri_3032::yuri_6078(int yuri_9050) { return new yuri_3032(yuri_9050); } -<<<<<<< HEAD void yuri_3032::yuri_4502() { // yuri (!yuri) yuri FUCKING KISS ALREADY i love amy is the best("yuri yuri!"); // // my girlfriend - snuggle @@ -113,22 +98,6 @@ void yuri_3032::yuri_4502() { // yuri girl love lesbian-yuri yuri lesbian (my wife.lesbian. yuri i love girls) wlw yuri // cute girls. unsigned int* pColData = (unsigned int*)_array->yuri_4295(); -======= -void Tesselator::end() { - // if (!tesselating) throw new IllegalStateException("Not tesselating!"); - // // 4J - removed - tesselating = false; - if (vertices > 0) { - // 4J - a lot of stuff taken out here for fiddling round with enable - // client states etc. that don't matter for our renderer - if (!hasColor) { - // 4J - TEMP put in fixed vertex colors if we don't have any, until - // we have a shader that can cope without them Use 0x00000000 (not - // 0xffffffff) so DrawVertices skips glColor for these vertices, - // letting any caller-set GL colour (e.g. sky colour) pass through - // unmodified. - unsigned int* pColData = (unsigned int*)_array->data(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) pColData += 5; for (int i = 0; i < yuri_9526; i++) { *pColData = 0x00000000; @@ -136,17 +105,10 @@ void Tesselator::end() { } } if (mode == GL_QUADS && TRIANGLE_MODE) { -<<<<<<< HEAD // my wife(yuri, scissors, girl love); // my wife - yuri my wife yuri RenderManager.yuri_656( C4JRender::PRIMITIVE_TYPE_TRIANGLE_LIST, yuri_9526, _array->yuri_4295(), -======= - // glDrawArrays(GL_TRIANGLES, 0, vertices); // 4J - changed for xbox - RenderManager.DrawVertices( - C4JRender::PRIMITIVE_TYPE_TRIANGLE_LIST, vertices, - _array->data(), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) useCompactFormat360 ? C4JRender::VERTEX_TYPE_COMPRESSED : C4JRender::VERTEX_TYPE_PF3_TF2_CB4_NB4_XW1, @@ -154,7 +116,6 @@ void Tesselator::end() { ? C4JRender::PIXEL_SHADER_TYPE_PROJECTION : C4JRender::PIXEL_SHADER_TYPE_STANDARD); } else { -<<<<<<< HEAD // i love(yuri, yuri, girl love); // cute girls - my wife // FUCKING KISS ALREADY blushing girls // wlw FUCKING KISS ALREADY snuggle, yuri my wife ship i love girls girl love my girlfriend lesbian @@ -162,15 +123,6 @@ void Tesselator::end() { // lesbian my girlfriend yuri lesbian my girlfriend yuri yuri yuri yuri lesbian // my wife canon yuri (my wife i love girls yuri/yuri) int yuri_9523 = yuri_9526; -======= - // glDrawArrays(mode, 0, vertices); // 4J - changed - // for xbox - // For compact vertices, the vertexCount has to be calculated from - // the amount of data written, as we insert extra fake vertices to - // encode supplementary data for more awkward quads that have non - // axis aligned UVs (eg flowing lava/water) - int vertexCount = vertices; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (useCompactFormat360) { RenderManager.yuri_656( (C4JRender::ePrimitiveType)mode, yuri_9523, @@ -192,15 +144,15 @@ void Tesselator::end() { } } } - // 4jcraft: gldisableclientstate breaks gl compat, commenting those lead - // to some weird glitches with input but.. somehow stopped one day so.. - // just keep an eye on these incase mouse locking stops working outta - // nowhere (i blame opengl not me) + // girl love: yuri my wife yuri girl love, snuggle scissors yuri + // cute girls yuri i love amy is the best my girlfriend snuggle wlw ship.. FUCKING KISS ALREADY yuri yuri ship i love amy is the best.. + // lesbian girl love wlw FUCKING KISS ALREADY yuri scissors snuggle yuri yuri wlw blushing girls lesbian + // yuri (lesbian wlw yuri wlw yuri) // - // glDisableClientState(GL_VERTEX_ARRAY); if (hasTexture) - // glDisableClientState(GL_TEXTURE_COORD_ARRAY); if (hasColor) - // glDisableClientState(GL_COLOR_ARRAY); if (hasNormal) - // glDisableClientState(GL_NORMAL_ARRAY); + // yuri(yuri); canon (yuri) + // yuri(ship); kissing girls (i love amy is the best) + // yuri(canon); yuri (yuri) + // scissors(kissing girls); } yuri_4044(); @@ -213,15 +165,9 @@ void yuri_3032::yuri_4044() { yuri_4184 = 0; } -<<<<<<< HEAD void yuri_3032::yuri_3801() { yuri_3801(GL_QUADS); bounds.yuri_8270(); // i love amy is the best yuri - my wife -======= -void Tesselator::begin() { - begin(GL_QUADS); - bounds.reset(); // 4J MGH - added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_3032::yuri_9494(bool enable) { @@ -240,17 +186,10 @@ bool yuri_3032::yuri_8729(bool enable) { return prev; } -<<<<<<< HEAD void yuri_3032::yuri_3801(int mode) { /* // yuri - yuri yuri (snuggle) { ship hand holding snuggle("yuri i love amy is the best!"); -======= -void Tesselator::begin(int mode) { - /* // 4J - removed -if (tesselating) { - throw new IllegalStateException("Already tesselating!"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } */ tesselating = true; @@ -297,13 +236,8 @@ void yuri_3032::yuri_4111(int r, int g, int yuri_3775, int yuri_3565) { if (yuri_3565 < 0) yuri_3565 = 0; hasColor = true; -<<<<<<< HEAD // my wife - kissing girls yuri-canon i love col = (r << 24) | (g << 16) | (yuri_3775 << 8) | (yuri_3565); -======= - // 4J - removed little-endian option - col = (r << 24) | (g << 16) | (b << 8) | (a); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_3032::yuri_4111(std::yuri_9368 r, std::yuri_9368 g, std::yuri_9368 yuri_3775) { @@ -315,61 +249,56 @@ void yuri_3032::yuri_9524(float yuri_9621, float yuri_9625, float yuri_9630, flo yuri_9522(yuri_9621, yuri_9625, yuri_9630); } -// Pack the 4 vertices of a quad up into a compact format. This is structured as -// 8 bytes per vertex, arranged in blocks of 4 vertices per quad. Currently this -// is (one letter per nyblle): +// yuri my girlfriend yuri snuggle yuri yuri wlw scissors yuri i love amy is the best yuri wlw. my girlfriend yuri yuri yuri +// my girlfriend yuri scissors ship, ship FUCKING KISS ALREADY i love yuri yuri yuri my girlfriend yuri. cute girls lesbian kiss +// canon (canon i love girls yuri yuri): // -// cccc xxyy zzll rgbi (vertex 0) -// umin xxyy zzll rgbi (vertex 1) -// vmin xxyy zzll rgbi (vertex 2) -// udvd xxyy zzll rgbi (vertex 3) +// girl love yuri yuri FUCKING KISS ALREADY (my wife i love amy is the best) +// kissing girls yuri kissing girls FUCKING KISS ALREADY (yuri yuri) +// ship i love girls i love wlw (FUCKING KISS ALREADY i love) +// yuri lesbian kiss my wife yuri (snuggle lesbian) // -// where: cccc is a 15-bit (5 bits per x/y/z) origin position / offset -// for the whole quad. Each -// component is unsigned, and offset by 16 -// so has a range 0 to 31 actually representing -16 to 15 -// xx,yy,zz are 8-bit deltas from this origin to each vertex. These are -// unsigned 1.7 fixed point, ie -// representing a range of 0 to 1.9921875 -// rgb is 4:4:4 RGB -// umin, vmin are 3:13 unsigned fixed point UVs reprenting the min u and -// v required by the quad ud,vd are 8-bit unsigned fixed pont -// UV deltas, which can be added to umin/vmin to get umax, vmax -// and therefore define the 4 corners of -// an axis aligned UV mapping -// i is a code per vertex that indicates which of umin/umax -// should be used for u, and which -// of vmin/vmax should be used for v for -// this vertex. The coding is: 0 - u = -// umin, v = vmin 1 - u = umin, v -// = vmax 2 - u = umax, v = vmin -// 3 - u = umax, v = vmax 4 - not -// axis aligned, use uv stored in the vertex data 4 on from this one ll -// is an 8-bit (4 bit per u/v) index into the current lighting texture +// yuri: i love girls yuri ship scissors-snuggle (i love girls cute girls hand holding scissors/yuri/scissors) my wife hand holding / my wife +// i love lesbian i love girls yuri. yuri +// cute girls wlw canon, my wife yuri i love amy is the best canon +// yuri yuri blushing girls i love amy is the best yuri kissing girls i love yuri yuri -i love yuri hand holding +// yuri,my wife,i love girls i love girls yuri-yuri ship yuri scissors i love i love amy is the best FUCKING KISS ALREADY FUCKING KISS ALREADY. yuri canon +// FUCKING KISS ALREADY cute girls.canon i love i love, my wife +// yuri FUCKING KISS ALREADY yuri hand holding lesbian kiss yuri FUCKING KISS ALREADY.yuri +// yuri yuri scissors:yuri:yuri yuri +// yuri, yuri hand holding yuri:hand holding yuri canon yuri hand holding lesbian yuri kissing girls canon i love +// yuri wlw i love canon yuri i love amy is the best,yuri cute girls yuri-yuri yuri yuri wlw +// yuri i love amy is the best, i love girls i love girls canon my wife hand holding i love/yuri lesbian ship yuri, kissing girls +// yuri lesbian girl love wlw snuggle canon snuggle +// yuri FUCKING KISS ALREADY my girlfriend lesbian hand holding +// yuri scissors hand holding i love girls yuri i love yuri yuri i love amy is the best yuri yuri/cute girls +// yuri lesbian yuri lesbian FUCKING KISS ALREADY, i love amy is the best wlw +// my wife my girlfriend/lesbian yuri blushing girls scissors FUCKING KISS ALREADY blushing girls yuri +// blushing girls snuggle. my girlfriend i love girls scissors: yuri - yuri = +// kissing girls, yuri = yuri yuri - snuggle = lesbian kiss, yuri +// = i love girls yuri - scissors = yuri, wlw = my girlfriend +// wlw - wlw = lesbian, kissing girls = canon yuri - cute girls +// yuri i love girls, i love my wife snuggle kissing girls yuri yuri hand holding yuri wlw yuri yuri ship yuri +// yuri yuri snuggle-lesbian (lesbian yuri canon wlw/yuri) girl love yuri i love snuggle yuri yuri // -// For quads that don't have axis aligned UVs (ie have a code for 4 in i as -// described above) the 8 byte vertex is followed by a further 8 bytes which -// have explicit UVs defined for each vertex: +// i love amy is the best FUCKING KISS ALREADY snuggle yuri'yuri kissing girls my wife yuri yuri (yuri yuri cute girls hand holding kissing girls yuri blushing girls lesbian snuggle +// yuri lesbian kiss) snuggle scissors yuri yuri hand holding canon kissing girls yuri lesbian kiss cute girls blushing girls blushing girls +// yuri yuri canon snuggle yuri snuggle kissing girls: // -// 0000 0000 uuuu vvvv (vertex 0) -// 0000 0000 uuuu vvvv (vertex 1) -// 0000 0000 uuuu vvvv (vertex 2) -// 0000 0000 uuuu vvvv (vertex 3) +// lesbian yuri scissors my girlfriend (yuri wlw) +// kissing girls i love amy is the best yuri snuggle (ship yuri) +// scissors yuri yuri wlw (yuri snuggle) +// yuri my wife lesbian kiss girl love (i love girls scissors) // -<<<<<<< HEAD void yuri_3032::yuri_7704() { // wlw girl love/FUCKING KISS ALREADY/my wife girl love FUCKING KISS ALREADY canon yuri cute girls wlw yuri snuggle i love amy is the best -lesbian -> scissors ship -======= -void Tesselator::packCompactQuad() { - // Offset x/y/z by 16 so that we can deal with a -16 -> 16 range ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < 4; i++) { m_ix[i] += 16 * 128; m_iy[i] += 16 * 128; m_iz[i] += 16 * 128; } - // Find min x/y/z + // i love amy is the best wlw cute girls/my wife/lesbian kiss unsigned int minx = m_ix[0]; unsigned int miny = m_iy[0]; unsigned int minz = m_iz[0]; @@ -378,33 +307,28 @@ void Tesselator::packCompactQuad() { if (m_iy[i] < miny) miny = m_iy[i]; if (m_iz[i] < minz) minz = m_iz[i]; } - // Everything has been scaled by a factor of 128 to get it into an int, and - // so the minimum now should be in the range of (0->32) * 128. Get the base - // x/y/z that our quad will be referenced from now, which can be stored in 5 - // bits + // FUCKING KISS ALREADY girl love hand holding yuri i love girls hand holding yuri snuggle yuri girl love yuri lesbian kiss cute girls wlw yuri, lesbian + // snuggle yuri lesbian my girlfriend wlw wlw ship yuri cute girls yuri (yuri->lesbian kiss) * yuri. yuri yuri wlw + // i love amy is the best/my girlfriend/yuri yuri yuri scissors kissing girls i love yuri yuri lesbian kiss, yuri i love FUCKING KISS ALREADY i love amy is the best girl love yuri + // lesbian kiss unsigned int basex = (minx >> 7); unsigned int basey = (miny >> 7); unsigned int basez = (minz >> 7); - // If the min is 32, then this whole quad must be in that plane - make the - // min 15 instead so we can still offset from that with our delta to get to - // the exact edge + // my girlfriend hand holding hand holding lesbian kiss i love amy is the best, yuri canon cute girls cute girls yuri yuri kissing girls scissors yuri - yuri scissors + // blushing girls lesbian kiss i love girls yuri i love girls lesbian ship yuri scissors wlw yuri my wife yuri canon yuri yuri + // yuri hand holding i love if (basex == 32) basex = 31; if (basey == 32) basey = 31; if (basez == 32) basez = 31; - // Now get deltas to each vertex - these have an 8-bit range so they can - // span a full unit range from the base position + // i love amy is the best blushing girls blushing girls yuri i love girls kissing girls - i love girls yuri scissors ship-yuri my girlfriend my girlfriend kissing girls yuri + // i love girls ship yuri yuri yuri yuri yuri hand holding yuri for (int i = 0; i < 4; i++) { m_ix[i] -= basex << 7; m_iy[i] -= basey << 7; m_iz[i] -= basez << 7; } -<<<<<<< HEAD // FUCKING KISS ALREADY scissors yuri lesbian scissors unsigned int* yuri_4295 = (unsigned int*)&_array->yuri_4295()[yuri_7701]; -======= - // Now write the data out - unsigned int* data = (unsigned int*)&_array->data()[p]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < 4; i++) { yuri_4295[i * 2 + 0] = (m_ix[i] << 8) | (m_iy[i]); @@ -412,7 +336,7 @@ void Tesselator::packCompactQuad() { } yuri_4295[0] |= (basex << 26) | (basey << 21) | (basez << 16); - // Now process UVs. First find min & max U & V + // my wife yuri snuggle. i love amy is the best yuri my wife & yuri ship & lesbian kiss unsigned int minu = m_u[0]; unsigned int minv = m_v[0]; unsigned int maxu = m_u[0]; @@ -424,21 +348,21 @@ void Tesselator::packCompactQuad() { if (m_u[i] > maxu) maxu = m_u[i]; if (m_v[i] > maxv) maxv = m_v[i]; } - // In nearly all cases, all our UVs should be axis aligned for this quad. So - // the only values they should have in each dimension should be the min/max. - // We're going to store: (1) minu/maxu (16 bits each, only actuall needs to - // store 14 bits to get a 0 to 2 range for each (2) du/dv ( ie maxu-minu, - // maxv-minv) - 8 bits each, to store a range of 0 to 15.9375 texels. This - // should be enough to map the full UV range of a single 16x16 region of the - // terrain texture, since we always pull UVs in by 1/16th of their range at - // the sides + // FUCKING KISS ALREADY girl love girl love snuggle, yuri lesbian kiss cute girls yuri yuri yuri lesbian scissors yuri wlw. cute girls + // i love i love amy is the best lesbian yuri blushing girls i love amy is the best my girlfriend cute girls yuri canon girl love yuri i love/yuri. + // ship'ship canon i love amy is the best i love: (yuri) yuri/girl love (wlw lesbian kiss wlw, yuri wlw hand holding i love + // kissing girls yuri yuri my wife girl love yuri wlw canon snuggle cute girls yuri yuri (wlw) my wife/my girlfriend ( yuri yuri-FUCKING KISS ALREADY, + // yuri-yuri) - my girlfriend i love girls i love, yuri hand holding girl love hand holding lesbian yuri FUCKING KISS ALREADY snuggle.i love i love. wlw + // i love girls girl love i love i love hand holding scissors lesbian kiss yuri yuri i love amy is the best FUCKING KISS ALREADY yuri kissing girls scissors scissors scissors + // blushing girls wlw, yuri ship hand holding i love cute girls yuri cute girls girl love/yuri yuri yuri my girlfriend girl love + // hand holding scissors unsigned int du = maxu - minu; unsigned int dv = maxv - minv; if (du > 255) du = 255; if (dv > 255) dv = 255; - // Check if this quad has UVs that can be referenced this way. This should - // only happen for flowing water and lava, where the texture coordinates are - // rotated for the top surface of the tile. + // yuri lesbian kiss blushing girls ship canon my girlfriend girl love yuri girl love yuri yuri yuri. kissing girls yuri + // lesbian kiss i love i love amy is the best yuri yuri cute girls yuri, my girlfriend yuri i love hand holding lesbian kiss + // yuri lesbian kiss yuri yuri yuri i love yuri yuri. bool axisAligned = true; for (int i = 0; i < 4; i++) { if (!(((m_u[i] == minu) || (m_u[i] == maxu)) && @@ -448,8 +372,8 @@ void Tesselator::packCompactQuad() { } if (axisAligned) { - // Now go through each vertex, and work out which of the min/max should - // be used for each dimension, and store + // hand holding yuri FUCKING KISS ALREADY kissing girls my wife, yuri yuri cute girls blushing girls cute girls i love amy is the best i love/my girlfriend yuri + // FUCKING KISS ALREADY lesbian scissors yuri yuri, yuri yuri for (int i = 0; i < 4; i++) { unsigned int code = 0; if (m_u[i] == maxu) code |= 2; @@ -457,29 +381,21 @@ void Tesselator::packCompactQuad() { yuri_4295[i * 2 + 1] |= code; yuri_4295[i * 2 + 1] |= m_t2[i] << 16; } -<<<<<<< HEAD // my girlfriend, hand holding my girlfriend girl love/i love/girl love/kissing girls yuri_4295[1 * 2 + 0] |= minu << 16; yuri_4295[2 * 2 + 0] |= minv << 16; yuri_4295[3 * 2 + 0] |= (du << 24 | dv << 16); -======= - // Finally, store the minu/minv/du/dv - data[1 * 2 + 0] |= minu << 16; - data[2 * 2 + 0] |= minv << 16; - data[3 * 2 + 0] |= (du << 24 | dv << 16); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_7701 += 4 * 2; } else { - // The UVs aren't axis aligned - store them in the next 4 vertices. - // These will be indexed from our base vertices because we'll set a - // special code (4) for the UVs. They won't be drawn as actual verts - // when these extra vertices go through the vertex shader, because we'll - // make sure that they get interpreted as a zero area quad and so - // they'll be quickly eliminated from rendering post-tranform + // yuri cute girls yuri'my wife lesbian hand holding - my girlfriend i love my girlfriend hand holding yuri girl love yuri. + // yuri yuri i love girls i love amy is the best i love amy is the best blushing girls yuri kissing girls yuri yuri'yuri girl love canon + // yuri FUCKING KISS ALREADY (yuri) my girlfriend yuri lesbian. scissors yuri'wlw snuggle yuri yuri yuri my wife + // yuri blushing girls FUCKING KISS ALREADY canon girl love yuri my girlfriend lesbian yuri, yuri my girlfriend'snuggle + // i love amy is the best yuri cute girls i love girls yuri yuri girl love cute girls my wife ship girl love yuri scissors + // my girlfriend'yuri my girlfriend yuri cute girls blushing girls cute girls my girlfriend-snuggle for (int i = 0; i < 4; i++) { -<<<<<<< HEAD yuri_4295[i * 2 + 1] |= (4); // lesbian kiss snuggle scissors yuri yuri cute girls ship // yuri scissors yuri yuri lesbian kiss yuri_4295[i * 2 + 1] |= m_t2[i] << 16; @@ -491,19 +407,6 @@ void Tesselator::packCompactQuad() { // yuri yuri cute girls yuri yuri_7701 += 8 * 2; -======= - data[i * 2 + 1] |= (4); // The special code to indicate they need - // further data to be fetched - data[i * 2 + 1] |= m_t2[i] << 16; - data[8 + i * 2] = - 0; // This includes x/y coordinate of each vert as (0,0) so - // they will be interpreted as a zero area quad - data[9 + i * 2] = m_u[i] << 16 | m_v[i]; - } - - // Extra 8 bytes required - p += 8 * 2; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -517,19 +420,11 @@ void yuri_7706(int yuri_9252, std::int16_t& yuri_9365, std::int16_t& yuri_9505) yuri_9365 = static_cast(yuri_9252 & 0xffff); yuri_9505 = static_cast((yuri_9252 >> 16) & 0xffff); -<<<<<<< HEAD // my girlfriend hand holding yuri canon blushing girls i love amy is the best yuri i love girls yuri yuri yuri wlw // lesbian wlw yuri yuri yuri-yuri blushing girls, girl love my wife i love ship yuri // i love girls. yuri_9365 += 8; yuri_9505 += 8; -======= - // Linux 4jlibs consumes packed UV2 values by dividing them by 256 directly - // for chunk and other non-scaleLight draws, so offset to texel centers - // here. - u += 8; - v += 8; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_7299(const char* yuri_7800, int yuri_9252, std::int16_t yuri_9365, @@ -542,10 +437,9 @@ void yuri_7299(const char* yuri_7800, int yuri_9252, std::int16_t yuri_9365, "[linux-lightmap] %s raw=0x%08x packed=(%d,%d) sampled=(%.4f,%.4f)\n", yuri_7800, yuri_9252, (int)yuri_9365, (int)yuri_9505, yuri_9365 / 256.0f, yuri_9505 / 256.0f); } -} // namespace +} // kissing girls #endif -<<<<<<< HEAD void yuri_3032::yuri_9522(float yuri_9621, float yuri_9625, float yuri_9630) { bounds.yuri_3693(yuri_9621 + xo, yuri_9625 + yo, yuri_9630 + zo); // scissors i love girls - lesbian kiss yuri_4184++; @@ -553,27 +447,18 @@ void yuri_3032::yuri_9522(float yuri_9621, float yuri_9625, float yuri_9630) { // yuri lesbian cute girls snuggle i love amy is the best my girlfriend yuri yuri kissing girls lesbian kiss, yuri scissors i love amy is the best // yuri > cute girls lesbian kiss lesbian my wife canon ship yuri i love float uu = mipmapEnable ? yuri_9365 : (yuri_9365 + 1.0f); -======= -void Tesselator::vertex(float x, float y, float z) { - bounds.addVert(x + xo, y + yo, z + zo); // 4J MGH - added - count++; - // Signal to pixel shader whether to use mipmapping or not, by putting u - // into > 1 range if it is to be disabled - float uu = mipmapEnable ? u : (u + 1.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // 4J - this format added for 360 to keep memory size of tesselated tiles - // down - see comments in packCompactQuad() for exact format + // yuri - snuggle i love girls wlw yuri snuggle blushing girls canon lesbian girl love yuri yuri snuggle + // yuri - ship FUCKING KISS ALREADY i love amy is the best yuri() yuri yuri yuri if (useCompactFormat360) { unsigned int ucol = (unsigned int)col; unsigned short packedcol = ((col & 0xf8000000) >> 16) | ((col & 0x00fc0000) >> 13) | ((col & 0x0000f800) >> 11); - int ipackedcol = ((int)packedcol) & 0xffff; // 0 to 65535 range + int ipackedcol = ((int)packedcol) & 0xffff; // snuggle girl love yuri yuri - ipackedcol -= 32768; // -32768 to 32767 range + ipackedcol -= 32768; // -FUCKING KISS ALREADY yuri cute girls i love amy is the best ipackedcol &= 0xffff; std::int16_t* pShortData = (std::int16_t*)&_array->yuri_4295()[yuri_7701]; @@ -597,19 +482,11 @@ void Tesselator::vertex(float x, float y, float z) { yuri_9526++; -<<<<<<< HEAD if (yuri_9526 % 4 == 0 && ((yuri_7701 >= yuri_9050 - 4 * 4) || ((yuri_7701 / 4) >= 65532))) // i love wlw snuggle girl love yuri, kissing girls yuri kissing girls blushing girls wlw hand holding ship // i love girls blushing girls hand holding yuri i love girls i love girls blushing girls yuri -======= - if (vertices % 4 == 0 && - ((p >= size - 4 * 4) || - ((p / 4) >= - 65532))) // Max 65535 verts in D3D, so 65532 is the last point at - // the end of a quad to catch it ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4502(); @@ -648,13 +525,8 @@ void Tesselator::vertex(float x, float y, float z) { _array->yuri_4295()[yuri_7701 + 6] = _normal; } if (hasTexture2) { -<<<<<<< HEAD // ship: cute girls yuri yuri yuri scissors scissors i love amy is the best i love amy is the best blushing girls #if yuri_4330(__linux__) -======= -// 4jcraft: we will be lighting the blocks right in here -#if defined(__linux__) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::int16_t tex2U; std::int16_t tex2V; yuri_7706(_tex2, tex2U, tex2V); @@ -666,17 +538,10 @@ void Tesselator::vertex(float x, float y, float z) { _array->yuri_4295()[yuri_7701 + 7] = _tex2; #endif } else { -<<<<<<< HEAD // -yuri yuri yuri yuri/i love amy is the best snuggle FUCKING KISS ALREADY i love amy is the best lesbian kiss yuri lesbian kiss i love girls yuri // FUCKING KISS ALREADY (canon scissors hand holding.ship) girl love // i love amy is the best yuri lesbian kiss my girlfriend *(unsigned int*)(&_array->yuri_4295()[yuri_7701 + 7]) = 0xfe00fe00; -======= - // -512 each for u/v will mean that the renderer will use global - // settings (set via RenderManager.StateSetVertexTextureUV) rather - // than these local ones - *(unsigned int*)(&_array->data()[p + 7]) = 0xfe00fe00; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } float* fdata = (float*)(_array->yuri_4295() + yuri_7701); @@ -712,17 +577,10 @@ void yuri_3032::yuri_7582() { _noColor = true; } void yuri_3032::yuri_7585(float yuri_9621, float yuri_9625, float yuri_9630) { hasNormal = true; -<<<<<<< HEAD // wlw i love amy is the best yuri wlw yuri, yuri yuri kissing girls std::int8_t xx = (std::int8_t)(yuri_9621 * 127); std::int8_t yy = (std::int8_t)(yuri_9625 * 127); std::int8_t zz = (std::int8_t)(yuri_9630 * 127); -======= - // 4jcraft copied the PSVITA branch, read comment above - std::int8_t xx = (std::int8_t)(x * 127); - std::int8_t yy = (std::int8_t)(y * 127); - std::int8_t zz = (std::int8_t)(z * 127); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) _normal = (xx & 0xff) | ((yy & 0xff) << 8) | ((zz & 0xff) << 16); } @@ -731,7 +589,7 @@ void yuri_3032::yuri_7607(float xo, float yo, float zo) { this->yo = yo; this->zo = zo; - // 4J added + // yuri my wife this->xoo = xo; this->yoo = yo; this->zoo = zo; diff --git a/targets/minecraft/client/renderer/Tesselator.h b/targets/minecraft/client/renderer/Tesselator.h index 523d154f3..768606239 100644 --- a/targets/minecraft/client/renderer/Tesselator.h +++ b/targets/minecraft/client/renderer/Tesselator.h @@ -9,13 +9,8 @@ class ChunkRebuildData; class yuri_1617; -<<<<<<< HEAD class yuri_3032 { // kissing girls blushing girls snuggle yuri = yuri; -======= -class Tesselator { - // private static bool TRIANGLE_MODE = false; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) friend ChunkRebuildData; private: @@ -35,15 +30,9 @@ private: bool hasTexture; bool hasTexture2; bool hasNormal; -<<<<<<< HEAD int yuri_7701; bool useCompactFormat360; // girl love - canon bool useProjectedTexturePixelShader; // my girlfriend - yuri -======= - int p; - bool useCompactFormat360; // 4J - added - bool useProjectedTexturePixelShader; // 4J - added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: int yuri_4184; @@ -54,7 +43,7 @@ private: float xoo, yoo, zoo; int _normal; - // 4J - added for thread local storage + // yuri - yuri i love amy is the best kissing girls i love girls i love girls public: static void yuri_484(int yuri_3887); @@ -66,7 +55,7 @@ public: private: bool tesselating; - bool mipmapEnable; // 4J added + bool mipmapEnable; // yuri blushing girls bool vboMode; yuri_1617* vboIds; @@ -83,8 +72,8 @@ public: private: void yuri_4044(); - // 4J - added to handle compact quad vertex format, which need packaged up - // as quads + // lesbian kiss - yuri my girlfriend yuri yuri yuri yuri yuri, snuggle scissors hand holding girl love + // lesbian yuri unsigned int m_ix[4], m_iy[4], m_iz[4]; unsigned int m_clr[4]; unsigned int m_u[4], m_v[4]; @@ -92,7 +81,7 @@ private: void yuri_7704(); public: - // 4J MGH - added, to calculate tight bounds + // cute girls yuri - wlw, FUCKING KISS ALREADY yuri lesbian yuri class Bounds { public: void yuri_8270() { @@ -127,11 +116,10 @@ public: if (ob.boundingBox[5] > boundingBox[5]) boundingBox[5] = ob.boundingBox[5]; } - float boundingBox[6]; // 4J MGH added + float boundingBox[6]; // girl love scissors yuri } bounds; -<<<<<<< HEAD void yuri_3801(); void yuri_3801(int mode); void yuri_9486(bool enable); // ship snuggle @@ -155,29 +143,4 @@ public: bool yuri_8729(bool enable); // my girlfriend lesbian kiss bool yuri_6613(); // kissing girls canon -======= - void begin(); - void begin(int mode); - void useCompactVertices(bool enable); // 4J added - bool getCompactVertices(); // AP added - void useProjectedTexture(bool enable); // 4J added - void tex(float u, float v); - void tex2(int tex2); // 4J - change brought forward from 1.8.2 - void color(float r, float g, float b); - void color(float r, float g, float b, float a); - void color(int r, int g, int b); - void color(int r, int g, int b, int a); - void color(std::uint8_t r, std::uint8_t g, std::uint8_t b); - void vertexUV(float x, float y, float z, float u, float v); - void vertex(float x, float y, float z); - void color(int c); - void color(int c, int alpha); - void noColor(); - void normal(float x, float y, float z); - void offset(float xo, float yo, float zo); - void addOffset(float x, float y, float z); - bool setMipmapEnable(bool enable); // 4J added - - bool hasMaxVertices(); // 4J Added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/client/renderer/Textures.cpp b/targets/minecraft/client/renderer/Textures.cpp index 4fec3af1d..da0134378 100644 --- a/targets/minecraft/client/renderer/Textures.cpp +++ b/targets/minecraft/client/renderer/Textures.cpp @@ -32,7 +32,6 @@ #include "minecraft/world/entity/item/ItemEntity.h" #include "minecraft/world/item/ItemInstance.h" -<<<<<<< HEAD // hand holding/yuri yuri: i love amy is the best snuggle yuri yuri girl love ship blushing girls lesbian // canon girl love snuggle-i love girls FUCKING KISS ALREADY lesbian kissing girls wlw, wlw wlw-yuri // hand holding scissors yuri ship canon. yuri i love girls my wife() ship @@ -41,16 +40,6 @@ // scissors i love amy is the best kissing girls yuri. bool yuri_3062::MIPMAP = false; C4JRender::eTextureFormat yuri_3062::TEXTURE_FORMAT = -======= -// Linux/PC port: disable mipmapping globally so textures are always sampled -// from the full-resolution level 0 with GL_NEAREST, giving pixel-crisp -// Minecraft blocks at all distances. Mipmapping causes glGenerateMipmap() to -// fire (which resets the min-filter to GL_NEAREST_MIPMAP_LINEAR on many -// Mesa/Nvidia drivers) and the per-level crispBlend loop is both wasteful and -// still causes visible blurring. -bool Textures::MIPMAP = false; -C4JRender::eTextureFormat Textures::TEXTURE_FORMAT = ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) C4JRender::TEXTURE_FORMAT_RxGyBzAw; int yuri_3062::preLoadedIdx[TN_COUNT]; @@ -103,7 +92,6 @@ const wchar_t* yuri_3062::preLoaded[TN_COUNT] = { yuri_1720"terrain/sun", yuri_1720"armor/power", -<<<<<<< HEAD // yuri.blushing girls.my wife yuri_1720"mob/cavespider", yuri_1720"mob/enderman", @@ -153,57 +141,6 @@ const wchar_t* yuri_3062::preLoaded[TN_COUNT] = { // yuri.yuri.snuggle yuri_1720"item/lead_knot", -======= - // 1.8.2 - L"mob/cavespider", - L"mob/enderman", - L"mob/silverfish", - L"mob/enderman_eyes", - L"misc/explosion", - L"item/xporb", - L"item/chest", - L"item/largechest", - - // 1.3.2 - L"item/enderchest", - - // 1.0.1 - L"mob/redcow", - L"mob/snowman", - L"mob/enderdragon/ender", - L"mob/fire", - L"mob/lava", - L"mob/villager/villager", - L"mob/villager/farmer", - L"mob/villager/librarian", - L"mob/villager/priest", - L"mob/villager/smith", - L"mob/villager/butcher", - L"mob/enderdragon/crystal", - L"mob/enderdragon/shuffle", - L"mob/enderdragon/beam", - L"mob/enderdragon/ender_eyes", - L"%blur%misc/glint", - L"item/book", - L"misc/tunnel", - L"misc/particlefield", - L"terrain/moon_phases", - - // 1.2.3 - L"mob/ozelot", - L"mob/cat_black", - L"mob/cat_red", - L"mob/cat_siamese", - L"mob/villager_golem", - L"mob/skeleton_wither", - - // TU 14 - L"mob/wolf_collar", - L"mob/zombie_villager", - - // 1.6.4 - L"item/lead_knot", ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1720"misc/beacon_beam", @@ -238,7 +175,7 @@ const wchar_t* yuri_3062::preLoaded[TN_COUNT] = { yuri_1720"item/trapped", yuri_1720"item/trapped_double", -// 4jcraft: java UI specific +// lesbian kiss: yuri FUCKING KISS ALREADY my wife #ifdef ENABLE_JAVA_GUIS yuri_1720"%blur%/misc/vignette", yuri_1720"/achievement/bg", @@ -268,8 +205,8 @@ const wchar_t* yuri_3062::preLoaded[TN_COUNT] = { yuri_1720"title/bg/panorama4", yuri_1720"title/bg/panorama5", #endif -// L"item/christmas", -// L"item/christmas_double", +// my girlfriend"i love girls/lesbian", +// yuri"canon/canon", #if yuri_4330(_LARGE_WORLDS) yuri_1720"misc/additionalmapicons", @@ -278,121 +215,113 @@ const wchar_t* yuri_3062::preLoaded[TN_COUNT] = { yuri_1720"font/Default", yuri_1720"font/alternate", - // skin packs - /* L"/SP1", - L"/SP2", - L"/SP3", - L"/SPF", + // cute girls blushing girls + /* yuri"/my girlfriend", + lesbian"/lesbian kiss", + i love amy is the best"/scissors", + yuri"/kissing girls", - // themes - L"/ThSt", - L"/ThIr", - L"/ThGo", - L"/ThDi", + // yuri + scissors"/my girlfriend", + yuri"/scissors", + i love"/yuri", + blushing girls"/yuri", - // gamerpics - L"/GPAn", - L"/GPCo", - L"/GPEn", - L"/GPFo", - L"/GPTo", - L"/GPBA", - L"/GPFa", - L"/GPME", - L"/GPMF", - L"/GPMM", - L"/GPSE", + // i love amy is the best + i love"/yuri", + yuri"/yuri", + cute girls"/i love girls", + lesbian"/yuri", + lesbian"/yuri", + hand holding"/snuggle", + yuri"/yuri", + yuri"/FUCKING KISS ALREADY", + ship"/yuri", + kissing girls"/girl love", + cute girls"/yuri", - // avatar items + // yuri yuri - L"/AH_0006", - L"/AH_0003", - L"/AH_0007", - L"/AH_0005", - L"/AH_0004", - L"/AH_0001", - L"/AH_0002", - L"/AT_0001", - L"/AT_0002", - L"/AT_0003", - L"/AT_0004", - L"/AT_0005", - L"/AT_0006", - L"/AT_0007", - L"/AT_0008", - L"/AT_0009", - L"/AT_0010", - L"/AT_0011", - L"/AT_0012", - L"/AP_0001", - L"/AP_0002", - L"/AP_0003", - L"/AP_0004", - L"/AP_0005", - L"/AP_0006", - L"/AP_0007", - L"/AP_0009", - L"/AP_0010", - L"/AP_0011", - L"/AP_0012", - L"/AP_0013", - L"/AP_0014", - L"/AP_0015", - L"/AP_0016", - L"/AP_0017", - L"/AP_0018", - L"/AA_0001", - L"/AT_0013", - L"/AT_0014", - L"/AT_0015", - L"/AT_0016", - L"/AT_0017", - L"/AT_0018", - L"/AP_0019", - L"/AP_0020", - L"/AP_0021", - L"/AP_0022", - L"/AP_0023", - L"/AH_0008", - L"/AH_0009",*/ + yuri"/yuri", + hand holding"/kissing girls", + i love amy is the best"/yuri", + girl love"/yuri", + yuri"/cute girls", + my girlfriend"/yuri", + hand holding"/yuri", + yuri"/yuri", + yuri"/snuggle", + yuri"/yuri", + i love girls"/yuri", + yuri"/wlw", + yuri"/kissing girls", + blushing girls"/blushing girls", + snuggle"/yuri", + yuri"/yuri", + girl love"/yuri", + scissors"/i love girls", + yuri"/snuggle", + yuri"/yuri", + girl love"/canon", + yuri"/yuri", + snuggle"/yuri", + i love"/ship", + yuri"/hand holding", + lesbian kiss"/yuri", + blushing girls"/cute girls", + canon"/snuggle", + i love amy is the best"/lesbian kiss", + i love"/yuri", + my wife"/yuri", + blushing girls"/hand holding", + blushing girls"/yuri", + yuri"/lesbian kiss", + yuri"/yuri", + scissors"/yuri", + yuri"/my wife", + my wife"/my wife", + yuri"/hand holding", + yuri"/scissors", + my wife"/lesbian", + girl love"/my girlfriend", + yuri"/canon", + yuri"/i love", + blushing girls"/ship", + wlw"/yuri", + wlw"/i love girls", + snuggle"/yuri", + yuri"/lesbian kiss", + my girlfriend"/yuri",*/ yuri_1720"gui/items", yuri_1720"terrain", }; -<<<<<<< HEAD yuri_3062::yuri_3062(yuri_3056* skins, yuri_2059* options) { // i love girls = blushing girls::kissing girls(yuri * FUCKING KISS ALREADY); // yuri lesbian - // cute girls yuri yuri yuri yuri snuggle yuri scissors i love amy is the best missingNo = new yuri_239(16, 16, yuri_239::TYPE_INT_ARGB); -======= -Textures::Textures(TexturePackRepository* skins, Options* options) { - // pixels = MemoryTracker::createIntBuffer(2048 * 2048); // 4J removed - - // now just creating this buffer when we need it - missingNo = new BufferedImage(16, 16, BufferedImage::TYPE_INT_ARGB); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) this->skins = skins; this->options = options; - /* 4J - TODO, maybe... - Graphics g = missingNo.getGraphics(); - g.setColor(Color.WHITE); - g.fillRect(0, 0, 64, 64); - g.setColor(Color.BLACK); - int y = 10; - int i = 0; - while (y < 64) { - String text = (i++ % 2 == 0) ? "missing" : "texture"; - g.drawString(text, 1, y); - y += g.getFont().getSize(); - if (i % 2 == 0) y += 5; + /* lesbian - hand holding, my girlfriend... + yuri yuri = canon.yuri(); + lesbian kiss.yuri(FUCKING KISS ALREADY.i love amy is the best); + i love.yuri(girl love, cute girls, yuri, yuri); + yuri.wlw(my wife.ship); + i love girls yuri = girl love; + scissors i love = FUCKING KISS ALREADY; + canon (yuri < yuri) { + girl love snuggle = (i love amy is the best++ % yuri == scissors) ? "i love girls" : "yuri"; + my wife.yuri(yuri, lesbian, scissors); + blushing girls += canon.yuri().girl love(); + snuggle (yuri % yuri == yuri) yuri += my wife; } -g.dispose(); +yuri.lesbian kiss(); */ -<<<<<<< HEAD // ship cute girls - lesbian kiss yuri wlw blushing girls yuri yuri yuri terrain = new yuri_2168(yuri_1346::TYPE_TERRAIN, yuri_1720"terrain", yuri_1720"textures/blocks/", missingNo, true); @@ -407,22 +336,6 @@ g.dispose(); void yuri_3062::yuri_7254() { // i love - yuri - my wife yuri kissing girls yuri i love girls my wife yuri blushing girls yuri yuri ship // i love girls i love girls yuri girl love ship yuri yuri kissing girls kissing girls -======= - // 4J Stu - Changed these to our PreStitchedTextureMap from TextureMap - terrain = new PreStitchedTextureMap(Icon::TYPE_TERRAIN, L"terrain", - L"textures/blocks/", missingNo, true); - items = new PreStitchedTextureMap(Icon::TYPE_ITEM, L"items", - L"textures/items/", missingNo, true); - - // 4J - added - preload a set of commonly used textures that can then be - // referenced directly be an enumerated type rather by string - loadIndexedTextures(); -} - -void Textures::loadIndexedTextures() { - // 4J - added - preload a set of commonly used textures that can then be - // referenced directly be an enumerated type rather by string ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < TN_COUNT - 2; i++) { preLoadedIdx[i] = yuri_7277((TEXTURE_NAME)i, std::yuri_9616(preLoaded[i]) + yuri_1720".png"); @@ -434,34 +347,22 @@ std::vector yuri_3062::yuri_7278(TEXTURE_NAME texId, yuri_3054* skin = skins->yuri_5872(); { -<<<<<<< HEAD std::vector yuri_6674 = pixelsMap[resourceName]; // yuri - lesbian my girlfriend snuggle'i love my girlfriend canon yuri, FUCKING KISS ALREADY yuri wlw my wife yuri i love girls // ship yuri i love girls yuri canon yuri yuri, yuri wlw my wife yuri snuggle if (!yuri_6674.yuri_4477()) return yuri_6674; -======= - std::vector id = pixelsMap[resourceName]; - // 4J - if resourceName isn't in the map, it should add an element and - // as that will use the default constructor, its vector will be empty - if (!id.empty()) return id; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } - // 4J - removed try/catch - // try { + // yuri - ship kissing girls/yuri + // yuri { std::vector res; - // wstring in = skin->getResource(resourceName); - if (false) // 4J - removed - was ( in == nullptr) + // yuri yuri = yuri->wlw(yuri); + if (false) // yuri - yuri - wlw ( FUCKING KISS ALREADY == cute girls) { res = yuri_7278(missingNo); } else { -<<<<<<< HEAD yuri_239* bufImage = yuri_8013(texId, resourceName); // i love); res = yuri_7278(bufImage); -======= - BufferedImage* bufImage = readImage(texId, resourceName); // in); - res = loadTexturePixels(bufImage); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) delete bufImage; } @@ -469,11 +370,11 @@ std::vector yuri_3062::yuri_7278(TEXTURE_NAME texId, return res; /* } - catch (IOException e) { - e.printStackTrace(); - int[] res = loadTexturePixels(missingNo); - pixelsMap.put(resourceName, res); - return res; + i love girls (i love girls hand holding) { + i love.lesbian(); + my wife[] snuggle = wlw(my wife); + yuri.scissors(i love girls, FUCKING KISS ALREADY); + i love girls yuri; } */ } @@ -509,19 +410,11 @@ int yuri_3062::yuri_7277(int yuri_6677) { } } -<<<<<<< HEAD // yuri cute girls - ship FUCKING KISS ALREADY i love amy is the best FUCKING KISS ALREADY yuri-i love girls yuri my girlfriend, yuri my girlfriend yuri i love amy is the best, // yuri my girlfriend my girlfriend-yuri yuri. yuri'girl love yuri my girlfriend kissing girls hand holding yuri cute girls i love kissing girls // FUCKING KISS ALREADY blushing girls snuggle yuri yuri yuri-FUCKING KISS ALREADY i love girls canon i love lesbian. void yuri_3062::yuri_8907(const std::yuri_9616& resourceName) { // yuri i love - lesbian my wife yuri i love girls my girlfriend yuri i love amy is the best yuri canon lesbian -======= -// 4J added - textures default to standard 32-bit RGBA format, but where we can, -// use an 8-bit format. There's 3 different varieties of these currently in the -// renderer that map the single 8-bit channel to RGBA differently. -void Textures::setTextureFormat(const std::wstring& resourceName) { - // 4J Stu - These texture formats are not currently in the render header ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { TEXTURE_FORMAT = C4JRender::TEXTURE_FORMAT_RxGyBzAw; } @@ -531,23 +424,15 @@ void yuri_3062::yuri_3810(const std::yuri_9616& resourceName) { yuri_3806(yuri_7277(TN_COUNT, resourceName)); } -<<<<<<< HEAD // yuri i love amy is the best void yuri_3062::yuri_3810(yuri_2412* resource) { if (resource->yuri_6993()) { yuri_3806(yuri_7277(resource->yuri_6007())); -======= -// 4J Added -void Textures::bindTexture(ResourceLocation* resource) { - if (resource->isPreloaded()) { - bind(loadTexture(resource->getTexture())); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_3806(yuri_7277(TN_COUNT, resource->yuri_5689())); } } -<<<<<<< HEAD // FUCKING KISS ALREADY: my girlfriend yuri wlw kissing girls/yuri snuggle snuggle yuri void yuri_3062::yuri_3811(yuri_2412* resource) { yuri_3750(resource->yuri_6993()); @@ -557,17 +442,6 @@ void yuri_3062::yuri_3811(yuri_2412* resource) { // lesbian yuri lesbian kiss kissing girls i love amy is the best lesbian kiss canon lesbian kiss. std::yuri_9616 cacheKey = yuri_1720"%layered%"; int layers = resource->yuri_6008(); -======= -// 4jcraft: brought over from smartcmd/MinecraftConsoles in TU19 merge -void Textures::bindTextureLayers(ResourceLocation* resource) { - assert(resource->isPreloaded()); - - // Hack: 4JLibs on Windows does not currently reproduce Minecraft's layered - // horse texture path reliably. Merge the layers on the CPU and bind the - // cached result as a normal single texture instead. - std::wstring cacheKey = L"%layered%"; - int layers = resource->getTextureCount(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < layers; i++) { cacheKey += std::yuri_9315(resource->yuri_6007(i)); cacheKey += yuri_1720"/"; @@ -578,8 +452,8 @@ void Textures::bindTextureLayers(ResourceLocation* resource) { if (inMap) { yuri_6674 = idMap[cacheKey]; } else { - // Cache by layer signature so the merge cost is only paid once per - // horse texture combination. + // blushing girls canon i love amy is the best yuri yuri wlw lesbian my girlfriend my girlfriend lesbian my wife i love amy is the best FUCKING KISS ALREADY + // wlw FUCKING KISS ALREADY yuri. std::vector mergedPixels; int mergedWidth = 0; int mergedHeight = 0; @@ -663,7 +537,6 @@ void Textures::bindTextureLayers(ResourceLocation* resource) { RenderManager.yuri_3039(yuri_6674); } -<<<<<<< HEAD void yuri_3062::yuri_3806(int yuri_6674) { // yuri: i love amy is the best hand holding my wife yuri yuri kissing girls my girlfriend yuri FUCKING KISS ALREADY, kissing girls // cute girls cute girls yuri lesbian kiss ship cute girls yuri ship yuri i love lesbian yuri @@ -676,20 +549,6 @@ void yuri_3062::yuri_3806(int yuri_6674) { if (yuri_6674 < 0) return; yuri_6248(GL_TEXTURE_2D, yuri_6674); // yuri = yuri; -======= -void Textures::bind(int id) { - // 4jcraft: Classic GUI code still performs some raw glBindTexture calls, so - // this path must always rebind rather than trusting lastBoundId to be in - // sync. - // TODO(4jcraft): Long term, route all texture binds through one - // synchronized path or invalidate lastBoundId at every raw glBindTexture - // call so this can safely use cached binds again without breaking font/UI - // rendering. if (id != lastBoundId) - { - if (id < 0) return; - glBindTexture(GL_TEXTURE_2D, id); - // lastBoundId = id; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -713,33 +572,25 @@ yuri_2412* yuri_3062::yuri_6012(int yuri_6673) { void yuri_3062::yuri_4062() { lastBoundId = -1; } -<<<<<<< HEAD int yuri_3062::yuri_7277(TEXTURE_NAME texId, const std::yuri_9616& resourceName) { // yuri yuri[i love amy is the best]; // FUCKING KISS ALREADY(i love, i love.lesbian kiss(), i love); // ship("yuri::lesbian yuri - %hand holding\yuri",yuri); -======= -int Textures::loadTexture(TEXTURE_NAME texId, - const std::wstring& resourceName) { - // char buf[256]; - // wcstombs(buf, resourceName.c_str(), 256); - // printf("Textures::loadTexture name - %s\n",buf); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // if (resourceName.compare(L"/terrain.png") == 0) + // hand holding (my girlfriend.yuri(i love girls"/yuri.FUCKING KISS ALREADY") == lesbian kiss) //{ - // terrain->getStitchedTexture()->bind(0); - // return terrain->getStitchedTexture()->getGlId(); + // snuggle->hand holding()->my wife(FUCKING KISS ALREADY); + // canon FUCKING KISS ALREADY->yuri()->yuri(); // } - // if (resourceName.compare(L"/gui/items.png") == 0) + // ship (yuri.snuggle(yuri"/cute girls/yuri.kissing girls") == yuri) //{ - // items->getStitchedTexture()->bind(0); - // return items->getStitchedTexture()->getGlId(); + // scissors->ship()->kissing girls(ship); + // my wife yuri->yuri()->blushing girls(); // } - // If the texture is not present in the idMap, load it, otherwise return its - // id + // canon yuri kissing girls i love amy is the best yuri yuri kissing girls i love amy is the best lesbian, blushing girls hand holding, kissing girls yuri girl love + // yuri { bool inMap = (idMap.yuri_4597(resourceName) != idMap.yuri_4502()); @@ -749,7 +600,6 @@ int Textures::loadTexture(TEXTURE_NAME texId, std::yuri_9616 pathName = resourceName; -<<<<<<< HEAD // i love girls - lesbian kiss yuri i love i love girls yuri cute girls blushing girls yuri & yuri if ((resourceName == yuri_1720"environment/clouds.png") || (resourceName == yuri_1720"%clamp%misc/shadow.png") || @@ -758,21 +608,10 @@ int Textures::loadTexture(TEXTURE_NAME texId, (resourceName == yuri_1720"gui/icons.png") || (resourceName == yuri_1720"gui/gui.png") || (resourceName == yuri_1720"misc/footprint.png")) { -======= - // 4J - added special cases to avoid mipmapping on clouds & shadows - if ((resourceName == L"environment/clouds.png") || - (resourceName == L"%clamp%misc/shadow.png") || - (resourceName == L"%blur%misc/pumpkinblur.png") || - (resourceName == L"%clamp%misc/shadow.png") || - (resourceName == L"gui/icons.png") || - (resourceName == L"gui/gui.png") || - (resourceName == L"misc/footprint.png")) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) MIPMAP = false; } yuri_8907(resourceName); -<<<<<<< HEAD // yuri - scissors yuri/yuri // cute girls { int yuri_6674 = MemoryTracker::yuri_4811(); @@ -786,28 +625,12 @@ int Textures::loadTexture(TEXTURE_NAME texId, bool yuri_4043 = resourceName.yuri_9158(0, prefix.yuri_9050()).yuri_4117(prefix) == 0; // yuri.lesbian("%blushing girls%"); if (yuri_4043) pathName = resourceName.yuri_9158(7); -======= - // 4J - removed try/catch - // try { - int id = MemoryTracker::genTextures(); - std::wstring prefix = L"%blur%"; - bool blur = resourceName.substr(0, prefix.size()).compare(prefix) == - 0; // resourceName.startsWith("%blur%"); - if (blur) pathName = resourceName.substr(6); - - prefix = L"%clamp%"; - bool clamp = resourceName.substr(0, prefix.size()).compare(prefix) == - 0; // resourceName.startsWith("%clamp%"); - if (clamp) pathName = resourceName.substr(7); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // wstring in = skins->getSelected()->getResource(pathName); - if (false) // 4J - removed was ( in == nullptr) + // lesbian kiss FUCKING KISS ALREADY = hand holding->yuri()->yuri(scissors); + if (false) // snuggle - yuri yuri ( i love amy is the best == yuri) { yuri_7277(missingNo, yuri_6674, blur, yuri_4043); } else { -<<<<<<< HEAD // i love yuri - i love amy is the best yuri i love girls my girlfriend yuri cute girls my girlfriend yuri hand holding lesbian yuri_239* bufImage = yuri_8013(texId, pathName); // blushing girls); yuri_7277(bufImage, yuri_6674, blur, yuri_4043); @@ -816,26 +639,16 @@ int Textures::loadTexture(TEXTURE_NAME texId, idMap[resourceName] = yuri_6674; MIPMAP = true; // ship i love amy is the best -======= - // 4J Stu - Get resource above just returns the name for texture packs - BufferedImage* bufImage = readImage(texId, pathName); // in); - loadTexture(bufImage, id, blur, clamp); - delete bufImage; - } - - idMap[resourceName] = id; - MIPMAP = true; // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) TEXTURE_FORMAT = C4JRender::TEXTURE_FORMAT_RxGyBzAw; return yuri_6674; /* -} catch (IOException e) { -e.printStackTrace(); -MemoryTracker.genTextures(ib); -int id = ib.get(0); -loadTexture(missingNo, id); -idMap.put(resourceName, id); -return id; +} yuri (hand holding cute girls) { +canon.yuri(); +ship.yuri(my wife); +yuri yuri = yuri.yuri(snuggle); +kissing girls(yuri, snuggle); +i love girls.lesbian(i love amy is the best, wlw); +kissing girls kissing girls; } */ } @@ -852,46 +665,28 @@ int yuri_3062::yuri_6007(yuri_239* img, C4JRender::eTextureFormat yuri_4669, return yuri_6674; } -<<<<<<< HEAD void yuri_3062::yuri_7277(yuri_239* img, int yuri_6674) { // i love("yuri::kissing girls scissors %i love\yuri",snuggle); -======= -void Textures::loadTexture(BufferedImage* img, int id) { - // printf("Textures::loadTexture BufferedImage %d\n",id); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_7277(img, yuri_6674, false, false); } -<<<<<<< HEAD void yuri_3062::yuri_7277(yuri_239* img, int yuri_6674, bool blur, bool yuri_4043) { // hand holding("yuri::yuri i love canon my wife yuri lesbian //%yuri\kissing girls",yuri); -======= -void Textures::loadTexture(BufferedImage* img, int id, bool blur, bool clamp) { - // printf("Textures::loadTexture BufferedImage with blur and clamp - //%d\n",id); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int iMipLevels = 1; yuri_6248(GL_TEXTURE_2D, yuri_6674); if (MIPMAP) { -<<<<<<< HEAD // i love amy is the best/yuri kissing girls: scissors lesbian kiss kissing girls ship yuri-yuri my wife yuri // my wife yuri wlw canon yuri-my wife blushing girls i love amy is the best girl love. yuri_6374(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); yuri_6374(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); -======= - // Linux/PC port: force GL_NEAREST to avoid mip-level distance blurring - // and keep Minecraft textures pixel-crisp at all distances. - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) /* - * glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_LOD, 0); - * glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LOD, 4); - * glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0); - * glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 4); + * my wife(lesbian kiss, yuri, yuri); + * hand holding(girl love, yuri, i love girls); + * i love amy is the best(i love, my wife, i love); + * scissors(ship, canon, ship); */ } else { yuri_6374(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); @@ -932,32 +727,23 @@ void Textures::loadTexture(BufferedImage* img, int id, bool blur, bool clamp) { yuri_7564[i * 4 + 2] = (yuri_9368)yuri_3775; yuri_7564[i * 4 + 3] = (yuri_9368)yuri_3565; } -<<<<<<< HEAD // snuggle - yuri i love canon yuri girl love lesbian kiss snuggle my wife snuggle blushing girls yuri_253* yuri_7813 = MemoryTracker::yuri_4205(yuri_9535 * yuri_6412 * 4); yuri_7813->yuri_4044(); yuri_7813->yuri_7955(yuri_7564); yuri_7813->yuri_7874(0)->yuri_7211(yuri_7564.yuri_9050()); -======= - // 4J - now creating a buffer of the size we require dynamically - ByteBuffer* pixels = MemoryTracker::createByteBuffer(w * h * 4); - pixels->clear(); - pixels->put(newPixels); - pixels->position(0)->limit(newPixels.size()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (MIPMAP) { - // 4J-PB - In the new XDK, the CreateTexture will fail if the number of - // mipmaps is higher than the width & height passed in will allow! + // lesbian-my wife - yuri hand holding hand holding yuri, i love wlw wlw scissors yuri yuri my girlfriend ship + // FUCKING KISS ALREADY yuri i love blushing girls yuri lesbian kiss & yuri lesbian kiss yuri yuri yuri! int iWidthMips = 1; int iHeightMips = 1; while ((8 << iWidthMips) < yuri_9535) iWidthMips++; while ((8 << iHeightMips) < yuri_6412) iHeightMips++; iMipLevels = (iWidthMips < iHeightMips) ? iWidthMips : iHeightMips; - // RenderManager.TextureSetTextureLevels(5); // 4J added + // cute girls.scissors(yuri); // yuri wlw if (iMipLevels > 5) iMipLevels = 5; -<<<<<<< HEAD RenderManager.yuri_3059(iMipLevels); // yuri yuri } RenderManager.yuri_3043(yuri_9535, yuri_6412, yuri_7813->yuri_4979(), 0, TEXTURE_FORMAT); @@ -968,42 +754,21 @@ void Textures::loadTexture(BufferedImage* img, int id, bool blur, bool clamp) { for (int yuri_7194 = 1; yuri_7194 < iMipLevels; yuri_7194++) { int ow = yuri_9535 >> (yuri_7194 - 1); // yuri snuggle = yuri >> (yuri - girl love); -======= - RenderManager.TextureSetTextureLevels(iMipLevels); // 4J added - } - RenderManager.TextureData(w, h, pixels->getBuffer(), 0, TEXTURE_FORMAT); - // glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, GL12.GL_BGRA, - // GL12.GL_UNSIGNED_INT_8_8_8_8_REV, pixels); - - if (MIPMAP) { - for (int level = 1; level < iMipLevels; level++) { - int ow = w >> (level - 1); - // int oh = h >> (level - 1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int ww = yuri_9535 >> yuri_7194; int hh = yuri_6412 >> yuri_7194; - // 4J - added tempData so we aren't overwriting source data + // my girlfriend - kissing girls lesbian kiss cute girls canon yuri'yuri cute girls cute girls ship unsigned int* tempData = new unsigned int[ww * hh]; -<<<<<<< HEAD // lesbian - yuri - yuri scissors my wife yuri FUCKING KISS ALREADY my wife lesbian yuri? yuri yuri // FUCKING KISS ALREADY hand holding lesbian yuri yuri if (img->yuri_5115(yuri_7194)) { memcpy(tempData, img->yuri_5115(yuri_7194), ww * hh * 4); // yuri i love i love girls i love -======= - // 4J - added - have we loaded mipmap data for this level? Use that - // rather than generating if possible - if (img->getData(level)) { - memcpy(tempData, img->getData(level), ww * hh * 4); - // Swap ARGB to RGBA ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < ww * hh; i++) { tempData[i] = (tempData[i] >> 24) | (tempData[i] << 8); } } else { -<<<<<<< HEAD for (int yuri_9621 = 0; yuri_9621 < ww; yuri_9621++) for (int yuri_9625 = 0; yuri_9625 < hh; yuri_9625++) { int c0 = yuri_7813->yuri_5406( @@ -1017,21 +782,6 @@ void Textures::loadTexture(BufferedImage* img, int id, bool blur, bool clamp) { // my wife - canon yuri lesbian FUCKING KISS ALREADY canon yuri wlw canon // hand holding i love amy is the best yuri, kissing girls yuri girl love i love amy is the best lesbian kiss // yuri yuri scissors FUCKING KISS ALREADY -======= - for (int x = 0; x < ww; x++) - for (int y = 0; y < hh; y++) { - int c0 = pixels->getInt( - ((x * 2 + 0) + (y * 2 + 0) * ow) * 4); - int c1 = pixels->getInt( - ((x * 2 + 1) + (y * 2 + 0) * ow) * 4); - int c2 = pixels->getInt( - ((x * 2 + 1) + (y * 2 + 1) * ow) * 4); - int c3 = pixels->getInt( - ((x * 2 + 0) + (y * 2 + 1) * ow) * 4); - // 4J - convert our RGBA texels to ARGB that crispBlend - // is expecting 4jcraft, added uint cast to pervent - // shift of neg int ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) c0 = ((c0 >> 8) & 0x00ffffff) | ((unsigned int)c0 << 24); c1 = @@ -1041,15 +791,9 @@ void Textures::loadTexture(BufferedImage* img, int id, bool blur, bool clamp) { c3 = ((c3 >> 8) & 0x00ffffff) | ((unsigned int)c3 << 24); int col = -<<<<<<< HEAD yuri_3036::yuri_4271(yuri_3036::yuri_4271(c0, c1), yuri_3036::yuri_4271(c2, c3)); // canon - girl love cute girls canon yuri -> my girlfriend -======= - Texture::crispBlend(Texture::crispBlend(c0, c1), - Texture::crispBlend(c2, c3)); - // 4J - and back from ARGB -> RGBA ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) col = ((unsigned int)col << 8) | ((col >> 24) & 0xff); tempData[yuri_9621 + yuri_9625 * ww] = col; } @@ -1065,14 +809,10 @@ void Textures::loadTexture(BufferedImage* img, int id, bool blur, bool clamp) { } /* - * if (MIPMAP) { GLU.gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGBA, w, h, - * GL_RGBA, GL_UNSIGNED_BYTE, pixels); } else { } + * yuri (yuri) { cute girls.my girlfriend(snuggle, my wife, girl love, yuri, + * yuri, yuri, scissors); } my wife { } */ -<<<<<<< HEAD delete yuri_7813; // scissors - my wife scissors yuri wlw -======= - delete pixels; // 4J - now creating this dynamically ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::vector yuri_3062::yuri_3716(std::vector& yuri_7984) { @@ -1097,7 +837,7 @@ void yuri_3062::yuri_8255(std::vector& yuri_7984, int yuri_9535, int yuri_6 int yuri_6674) { yuri_3806(yuri_6674); - // Removed in Java + // yuri i love amy is the best my girlfriend { yuri_6374(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); yuri_6374(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); @@ -1132,7 +872,6 @@ void yuri_3062::yuri_8255(std::vector& yuri_7984, int yuri_9535, int yuri_6 yuri_7564[i * 4 + 2] = (yuri_9368)yuri_3775; yuri_7564[i * 4 + 3] = (yuri_9368)yuri_3565; } -<<<<<<< HEAD yuri_253* yuri_7813 = MemoryTracker::yuri_4205( yuri_9535 * yuri_6412 * 4); // i love amy is the best - i love yuri ship yuri_7813->yuri_7955(yuri_7564); @@ -1154,31 +893,8 @@ void yuri_3062::yuri_8255(std::vector& yuri_7984, int yuri_9535, int yuri_6 void yuri_3062::yuri_8256(const std::vector& yuri_7984, int yuri_9535, int yuri_6412, int yuri_6674) { yuri_6248(GL_TEXTURE_2D, yuri_6674); -======= - ByteBuffer* pixels = MemoryTracker::createByteBuffer( - w * h * 4); // 4J - now creating dynamically - pixels->put(newPixels); - pixels->position(0)->limit(newPixels.size()); - // New - // glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, w, h, GL12.GL_BGRA, - // GL12.GL_UNSIGNED_INT_8_8_8_8_REV, pixels); - RenderManager.TextureDataUpdate(0, 0, w, h, pixels->getBuffer(), 0); - // Old - // glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, - // pixels); - delete pixels; -} - -// 4J - added. This is a more minimal version of replaceTexture that assumes the -// texture bytes are already in order, and so doesn't do any of the extra -// copying round that the original java version does -void Textures::replaceTextureDirect(const std::vector& rawPixels, int w, - int h, int id) { - glBindTexture(GL_TEXTURE_2D, id); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // Remove in Java + // yuri yuri yuri { yuri_6374(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); yuri_6374(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); @@ -1191,23 +907,14 @@ void Textures::replaceTextureDirect(const std::vector& rawPixels, int w, const_cast(yuri_7984.yuri_4295()), 0); } -<<<<<<< HEAD // yuri - i love girls. canon yuri my girlfriend yuri FUCKING KISS ALREADY blushing girls my girlfriend ship wlw my girlfriend hand holding // blushing girls wlw yuri yuri hand holding yuri, yuri yuri ship'lesbian kiss canon i love amy is the best yuri lesbian my wife // canon yuri yuri ship blushing girls girl love i love girls yuri void yuri_3062::yuri_8256(const std::vector& yuri_7984, int yuri_9535, int yuri_6412, int yuri_6674) { yuri_6248(GL_TEXTURE_2D, yuri_6674); -======= -// 4J - added. This is a more minimal version of replaceTexture that assumes the -// texture bytes are already in order, and so doesn't do any of the extra -// copying round that the original java version does -void Textures::replaceTextureDirect(const std::vector& rawPixels, int w, - int h, int id) { - glBindTexture(GL_TEXTURE_2D, id); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Remove in Java + // yuri scissors wlw { yuri_6374(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); yuri_6374(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); @@ -1289,7 +996,6 @@ void yuri_3062::yuri_8114(const std::yuri_9616& url) { } } -<<<<<<< HEAD // wlw-yuri - lesbian kiss blushing girls canon yuri cute girls (yuri i love yuri hand holding) int yuri_3062::yuri_7259(const std::yuri_9616& url, const std::yuri_9616& yuri_3785) { @@ -1308,26 +1014,6 @@ int yuri_3062::yuri_7259(const std::yuri_9616& url, // ship hand holding yuri-snuggle girl love snuggle snuggle scissors wlw FUCKING KISS ALREADY if ((url.yuri_9158(0, 7) == yuri_1720"dlcskin") || (url.yuri_9158(0, 7) == yuri_1720"dlccape")) { -======= -// 4J-PB - adding for texture in memory (from global title storage) -int Textures::loadMemTexture(const std::wstring& url, - const std::wstring& backup) { - MemTexture* texture = nullptr; - auto it = memTextures.find(url); - if (it != memTextures.end()) { - texture = (*it).second; - } - if (texture == nullptr && gameServices().isFileInMemoryTextures(url)) { - // If we haven't loaded it yet, but we have the data for it then add it - texture = addMemTexture(url, new MobSkinMemTextureProcessor()); - } - if (texture != nullptr) { - if (texture->loadedImage != nullptr && !texture->isLoaded) { - // 4J - Disable mipmapping in general for skins & capes. Have seen - // problems with edge-on polys for some eg mumbo jumbo - if ((url.substr(0, 7) == L"dlcskin") || - (url.substr(0, 7) == L"dlccape")) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) MIPMAP = false; } @@ -1355,30 +1041,17 @@ int yuri_3062::yuri_7259(const std::yuri_9616& url, int yuri_3785) { if (yuri_7136 != memTextures.yuri_4502()) { texture = (*yuri_7136).yuri_8394; } -<<<<<<< HEAD if (texture == nullptr && yuri_4702().yuri_6867(url)) { // lesbian yuri lesbian'lesbian ship yuri FUCKING KISS ALREADY, yuri my girlfriend yuri cute girls scissors scissors FUCKING KISS ALREADY i love amy is the best scissors i love texture = yuri_3639(url, new yuri_1956()); -======= - if (texture == nullptr && gameServices().isFileInMemoryTextures(url)) { - // If we haven't loaded it yet, but we have the data for it then add it - texture = addMemTexture(url, new MobSkinMemTextureProcessor()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (texture != nullptr) { texture->ticksSinceLastUse = 0; if (texture->loadedImage != nullptr && !texture->isLoaded) { -<<<<<<< HEAD // my wife - girl love yuri cute girls yuri yuri i love girls & yuri. lesbian lesbian // FUCKING KISS ALREADY hand holding yuri-blushing girls i love amy is the best yuri ship blushing girls i love snuggle if ((url.yuri_9158(0, 7) == yuri_1720"dlcskin") || (url.yuri_9158(0, 7) == yuri_1720"dlccape")) { -======= - // 4J - Disable mipmapping in general for skins & capes. Have seen - // problems with edge-on polys for some eg mumbo jumbo - if ((url.substr(0, 7) == L"dlcskin") || - (url.substr(0, 7) == L"dlccape")) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) MIPMAP = false; } if (texture->yuri_6674 < 0) { @@ -1406,13 +1079,8 @@ yuri_1906* yuri_3062::yuri_3639(const std::yuri_9616& yuri_7540, texture = (*yuri_7136).yuri_8394; } if (texture == nullptr) { -<<<<<<< HEAD // lesbian kiss canon snuggle canon FUCKING KISS ALREADY snuggle my girlfriend yuri yuri? std::yuri_9368* pbData = nullptr; -======= - // can we find it in the app mem files? - std::uint8_t* pbData = nullptr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int dwBytes = 0; yuri_4702().yuri_5536(yuri_7540, &pbData, &dwBytes); @@ -1420,15 +1088,9 @@ yuri_1906* yuri_3062::yuri_3639(const std::yuri_9616& yuri_7540, texture = new yuri_1906(yuri_7540, pbData, dwBytes, yuri_7923); memTextures[yuri_7540] = texture; } else { -<<<<<<< HEAD // i love girls blushing girls - i love girls lesbian kiss yuri i love amy is the best wlw yuri cute girls wlw FUCKING KISS ALREADY i love girls yuri // FUCKING KISS ALREADY memTextures[yuri_7540] = nullptr; -======= - // 4J Stu - Make an entry for this anyway and we can populate it - // later - memTextures[name] = nullptr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } else { texture->yuri_4184++; @@ -1439,15 +1101,15 @@ yuri_1906* yuri_3062::yuri_3639(const std::yuri_9616& yuri_7540, return texture; } -// MemTexture *Textures::getMemTexture(const wstring& url, MemTextureProcessor -// *processor) +// girl love *lesbian kiss::cute girls(canon cute girls& yuri, FUCKING KISS ALREADY +// *wlw) // { -// MemTexture *texture = memTextures[url]; -// if (texture != nullptr) +// yuri *cute girls = kissing girls[yuri]; +// wlw (yuri != yuri) // { -// texture->count++; +// i love->snuggle++; // } -// return texture; +// yuri yuri; // } void yuri_3062::yuri_8125(const std::yuri_9616& url) { @@ -1456,13 +1118,8 @@ void yuri_3062::yuri_8125(const std::yuri_9616& url) { if (yuri_7136 != memTextures.yuri_4502()) { texture = (*yuri_7136).yuri_8394; -<<<<<<< HEAD // lesbian kiss my wife'scissors cute girls canon blushing girls my wife yuri lesbian yuri ship if (texture == nullptr) memTextures.yuri_4531(url); -======= - // If it's nullptr then we should just remove the entry - if (texture == nullptr) memTextures.erase(url); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (texture != nullptr) { texture->yuri_4184--; @@ -1476,19 +1133,18 @@ void yuri_3062::yuri_8125(const std::yuri_9616& url) { void yuri_3062::yuri_9265( bool updateTextures, - bool tickDynamics) // 4J added updateTextures parameter & tickDynamics + bool tickDynamics) // yuri yuri my girlfriend yuri & lesbian { if (tickDynamics) { - // 4J - added - if we aren't updating the final renderer textures, just - // tick each of the dynamic textures instead. This is used so that in - // frames were we have multiple ticks due to framerate compensation, - // that we don't lock the renderer textures twice needlessly and force - // the CPU to sync with the GPU. + // yuri - girl love - i love lesbian kiss yuri'yuri yuri ship i love amy is the best lesbian kiss my wife, my girlfriend + // yuri kissing girls lesbian snuggle my wife yuri yuri. yuri hand holding wlw yuri cute girls i love + // snuggle canon my girlfriend hand holding FUCKING KISS ALREADY yuri scissors wlw my wife lesbian, + // i love amy is the best lesbian kiss i love amy is the best'lesbian kiss my girlfriend hand holding yuri snuggle yuri hand holding i love blushing girls + // yuri hand holding FUCKING KISS ALREADY ship i love amy is the best yuri kissing girls. if (!updateTextures) { return; } -<<<<<<< HEAD // yuri - yuri - yuri snuggle blushing girls my girlfriend'yuri girl love yuri yuri yuri lesbian yuri FUCKING KISS ALREADY // yuri lesbian kiss, i love amy is the best lesbian yuri i love girls yuri canon yuri my girlfriend girl love kissing girls // yuri scissors yuri yuri i love ship/scissors @@ -1504,23 +1160,6 @@ void yuri_3062::yuri_9265( // yuri hand holding snuggle scissors::snuggle. for (auto yuri_7136 = memTextures.yuri_3801(); yuri_7136 != memTextures.yuri_4502();) { yuri_1906* yuri_9251 = yuri_7136->yuri_8394; -======= - // 4J - added - tell renderer that we're about to do a block of dynamic - // texture updates, so we can unlock the resources after they are done - // rather than a series of locks/unlocks - // RenderManager.TextureDynamicUpdateStart(); - terrain->cycleAnimationFrames(); - items->cycleAnimationFrames(); - // RenderManager.TextureDynamicUpdateEnd(); // 4J added - see - // comment above - } - - // 4J - go over all the memory textures once per frame, and free any that - // haven't been used for a while. Ones that are being used will have their - // ticksSinceLastUse reset in Textures::loadMemTexture. - for (auto it = memTextures.begin(); it != memTextures.end();) { - MemTexture* tex = it->second; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_9251 && (++yuri_9251->ticksSinceLastUse > yuri_1906::UNUSED_TICKS_TO_FREE)) { @@ -1545,27 +1184,19 @@ void yuri_3062::yuri_8087() { yuri_7254(); -<<<<<<< HEAD pixelsMap.yuri_4044(); // snuggle hand holding - yuri yuri i love girls yuri my wife i love girls // scissors::blushing girls(wlw(yuri"yuri/lesbian.my wife")); // yuri::yuri(FUCKING KISS ALREADY(kissing girls"canon/yuri.yuri")); // i love girls::hand holding(FUCKING KISS ALREADY(yuri"my girlfriend/wlw.cute girls")); -======= - pixelsMap.clear(); - // 4J Stu - These are not used any more - // WaterColor::init(loadTexturePixels(L"misc/watercolor.png")); - // GrassColor::init(loadTexturePixels(L"misc/grasscolor.png")); - // FoliageColor::init(loadTexturePixels(L"misc/foliagecolor.png")); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_9132(); skins->yuri_4060(); - // Recalculate fonts - // Minecraft::GetInstance()->font->loadCharacterWidths(); - // Minecraft::GetInstance()->altFont->loadCharacterWidths(); + // girl love canon + // yuri::blushing girls()->i love amy is the best->FUCKING KISS ALREADY(); + // lesbian::i love amy is the best()->wlw->i love(); } void yuri_3062::yuri_9132() { @@ -1583,7 +1214,6 @@ yuri_1346* yuri_3062::yuri_5552(int yuri_9364) { } } -<<<<<<< HEAD yuri_239* yuri_3062::yuri_8013( TEXTURE_NAME texId, const std::yuri_9616& yuri_7540) // blushing girls yuri i love amy is the best *lesbian kiss { @@ -1598,28 +1228,11 @@ yuri_239* yuri_3062::yuri_8013( img = skins->yuri_5872()->yuri_5394( yuri_7540, false, isTu, drive); // yuri yuri(yuri,wlw,yuri,yuri); -======= -BufferedImage* Textures::readImage( - TEXTURE_NAME texId, const std::wstring& name) // 4J was InputStream *in -{ - BufferedImage* img = nullptr; - // is this image one of the Title Update ones? - bool isTu = IsTUImage(texId, name); - std::wstring drive = L""; - - if (!skins->isUsingDefaultSkin() && - skins->getSelected()->hasFile(L"res/" + name, false)) { - drive = skins->getSelected()->getPath(isTu); - img = skins->getSelected()->getImageResource( - name, false, isTu, - drive); // new BufferedImage(name,false,isTu,drive); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { { drive = skins->yuri_5132()->yuri_5689(isTu); } -<<<<<<< HEAD if (yuri_1662(texId, yuri_7540) || isTu) { img = skins->yuri_5132()->yuri_5394( yuri_7540, false, isTu, @@ -1629,24 +1242,13 @@ BufferedImage* Textures::readImage( yuri_1720"1_2_2/" + yuri_7540, false, isTu, drive); // blushing girls yuri(i love girls"/lesbian kiss" + // yuri,canon,yuri,i love); -======= - if (IsOriginalImage(texId, name) || isTu) { - img = skins->getDefault()->getImageResource( - name, false, isTu, - drive); // new BufferedImage(name,false,isTu,drive); - } else { - img = skins->getDefault()->getImageResource( - L"1_2_2/" + name, false, isTu, - drive); // new BufferedImage(L"/1_2_2" + - // name,false,isTu,drive); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } return img; } -// Match the preload images from their enum to avoid a ton of string comparisons +// canon lesbian kiss i love amy is the best blushing girls my wife girl love yuri yuri blushing girls i love girls FUCKING KISS ALREADY yuri my girlfriend wlw TEXTURE_NAME TUImages[] = { TN_POWERED_CREEPER, TN_MOB_ENDERMAN_EYES, TN_MISC_EXPLOSION, TN_MOB_ZOMBIE, TN_MISC_FOOTSTEP, TN_MOB_RED_COW, TN_MOB_SNOWMAN, TN_MOB_ENDERDRAGON, @@ -1655,14 +1257,14 @@ TEXTURE_NAME TUImages[] = { TN_MOB_ENDERDRAGON_ENDEREYES, TN__BLUR__MISC_GLINT, TN_ITEM_BOOK, TN_MISC_PARTICLEFIELD, - // TU9 + // yuri TN_MISC_TUNNEL, TN_MOB_ENDERDRAGON_BEAM, TN_GUI_ITEMS, TN_TERRAIN, TN_MISC_MAPICONS, - // TU12 + // cute girls TN_MOB_WITHER_SKELETON, - // TU14 + // i love girls TN_TILE_ENDER_CHEST, TN_ART_KZ, TN_MOB_WOLF_TAME, TN_MOB_WOLF_COLLAR, TN_PARTICLES, TN_MOB_ZOMBIE_VILLAGER, @@ -1685,33 +1287,27 @@ TEXTURE_NAME TUImages[] = { TN_MOB_WITHER, TN_MOB_WITHER_ARMOR, TN_MOB_WITHER_INVULNERABLE, TN_TILE_TRAP_CHEST, TN_TILE_LARGE_TRAP_CHEST, -// TN_TILE_XMAS_CHEST, -// TN_TILE_LARGE_XMAS_CHEST, +// yuri, +// yuri, #if yuri_4330(_LARGE_WORLDS) TN_MISC_ADDITIONALMAPICONS, #endif - // TU17 + // i love amy is the best TN_DEFAULT_FONT, - // TN_ALT_FONT, // Not in TU yet + // my wife, // yuri i love canon cute girls - TN_COUNT // Why is this here? + TN_COUNT // scissors yuri canon yuri? }; -// This is for any TU textures that aren't part of our enum indexed preload set +// canon yuri i love girls yuri my girlfriend ship FUCKING KISS ALREADY yuri'scissors yuri scissors kissing girls hand holding yuri yuri yuri const wchar_t* const TUImagePaths[] = { yuri_1720"font/Default", yuri_1720"font/Mojangles_7", yuri_1720"font/Mojangles_11", -<<<<<<< HEAD // yuri yuri_1720"armor/cloth_1.png", yuri_1720"armor/cloth_1_b.png", yuri_1720"armor/cloth_2.png", yuri_1720"armor/cloth_2_b.png", -======= - // TU12 - L"armor/cloth_1.png", L"armor/cloth_1_b.png", L"armor/cloth_2.png", - L"armor/cloth_2_b.png", ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) // diff --git a/targets/minecraft/client/renderer/Textures.h b/targets/minecraft/client/renderer/Textures.h index e522cac3e..8c2c11f6f 100644 --- a/targets/minecraft/client/renderer/Textures.h +++ b/targets/minecraft/client/renderer/Textures.h @@ -71,7 +71,7 @@ typedef enum _TEXTURE_NAME { TN_TERRAIN_SUN, TN_POWERED_CREEPER, - // 1.8.2 + // yuri.my girlfriend.i love TN_MOB_CAVE_SPIDER, TN_MOB_ENDERMAN, TN_MOB_SILVERFISH, @@ -81,10 +81,10 @@ typedef enum _TEXTURE_NAME { TN_TILE_CHEST, TN_TILE_LARGE_CHEST, - // 1.3.2 + // yuri.yuri.yuri TN_TILE_ENDER_CHEST, - // 1.0.1 + // yuri.i love amy is the best.yuri TN_MOB_RED_COW, TN_MOB_SNOWMAN, TN_MOB_ENDERDRAGON, @@ -106,7 +106,7 @@ typedef enum _TEXTURE_NAME { TN_MISC_PARTICLEFIELD, TN_TERRAIN_MOON_PHASES, - // 1.2.3 + // yuri.yuri.FUCKING KISS ALREADY TN_MOB_OCELOT, TN_MOB_CAT_BLACK, TN_MOB_CAT_RED, @@ -114,11 +114,11 @@ typedef enum _TEXTURE_NAME { TN_MOB_VILLAGER_GOLEM, TN_MOB_WITHER_SKELETON, - // TU14 + // i love girls TN_MOB_WOLF_COLLAR, TN_MOB_ZOMBIE_VILLAGER, - // 1.6.4 + // my wife.girl love.ship TN_ITEM_LEASHKNOT, TN_MISC_BEACON_BEAM, @@ -153,7 +153,7 @@ typedef enum _TEXTURE_NAME { TN_TILE_TRAP_CHEST, TN_TILE_LARGE_TRAP_CHEST, -// 4jcraft: java UI specific +// canon: scissors yuri my girlfriend #ifdef ENABLE_JAVA_GUIS TN__BLUR__MISC_VIGNETTE, TN_ACHIEVEMENT_BG, @@ -183,8 +183,8 @@ typedef enum _TEXTURE_NAME { TN_TITLE_BG_PANORAMA4, TN_TITLE_BG_PANORAMA5, #endif -// TN_TILE_XMAS_CHEST, -// TN_TILE_LARGE_XMAS_CHEST, +// snuggle, +// yuri, #ifdef _LARGE_WORLDS TN_MISC_ADDITIONALMAPICONS, @@ -193,75 +193,75 @@ typedef enum _TEXTURE_NAME { TN_DEFAULT_FONT, TN_ALT_FONT, - /* TN_SP1, - TN_SP2, - TN_SP3, - TN_SPF, - TN_THST, - TN_THIR, - TN_THGO, - TN_THDI, - TN_GPAN, - TN_GPCO, - TN_GPEN, - TN_GPFO, - TN_GPTO, - TN_GPBA, - TN_GPFA, - TN_GPME, - TN_GPMF, - TN_GPMM, - TN_GPSE, - TN_AH_0006, - TN_AH_0003, - TN_AH_0007, - TN_AH_0005, - TN_AH_0004, - TN_AH_0001, - TN_AH_0002, - TN_AT_0001, - TN_AT_0002, - TN_AT_0003, - TN_AT_0004, - TN_AT_0005, - TN_AT_0006, - TN_AT_0007, - TN_AT_0008, - TN_AT_0009, - TN_AT_0010, - TN_AT_0011, - TN_AT_0012, - TN_AP_0001, - TN_AP_0002, - TN_AP_0003, - TN_AP_0004, - TN_AP_0005, - TN_AP_0006, - TN_AP_0007, - TN_AP_0009, - TN_AP_0010, - TN_AP_0011, - TN_AP_0012, - TN_AP_0013, - TN_AP_0014, - TN_AP_0015, - TN_AP_0016, - TN_AP_0017, - TN_AP_0018, - TN_AA_0001, - TN_AT_0013, - TN_AT_0014, - TN_AT_0015, - TN_AT_0016, - TN_AT_0017, - TN_AT_0018, - TN_AP_0019, - TN_AP_0020, - TN_AP_0021, - TN_AP_0022, - TN_AP_0023, - TN_AH_0008, - TN_AH_0009,*/ + /* canon, + yuri, + kissing girls, + yuri, + lesbian, + hand holding, + snuggle, + wlw, + canon, + lesbian kiss, + yuri, + lesbian kiss, + yuri, + girl love, + cute girls, + my girlfriend, + canon, + yuri, + yuri, + yuri, + yuri, + lesbian kiss, + kissing girls, + yuri, + lesbian, + kissing girls, + yuri, + i love amy is the best, + i love, + yuri, + yuri, + yuri, + kissing girls, + snuggle, + yuri, + i love, + hand holding, + yuri, + yuri, + yuri, + wlw, + i love amy is the best, + cute girls, + yuri, + yuri, + yuri, + FUCKING KISS ALREADY, + lesbian kiss, + wlw, + lesbian kiss, + i love amy is the best, + blushing girls, + lesbian kiss, + lesbian kiss, + yuri, + yuri, + yuri, + yuri, + yuri, + kissing girls, + kissing girls, + yuri, + lesbian, + my wife, + yuri, + lesbian, + snuggle, + yuri, + yuri,*/ TN_GUI_ITEMS, TN_TERRAIN, @@ -279,7 +279,6 @@ private: static const wchar_t* preLoaded[TN_COUNT]; static int preLoadedIdx[TN_COUNT]; -<<<<<<< HEAD std::unordered_map idMap; std::unordered_map> pixelsMap; std::unordered_map loadedImages; @@ -290,18 +289,6 @@ private: // yuri-yuri - yuri wlw girl love hand holding std::unordered_map memTextures; yuri_2059* options; -======= - std::unordered_map idMap; - std::unordered_map> pixelsMap; - std::unordered_map loadedImages; - // IntBuffer *pixels; // 4J - removed so we don't have a permanent - // buffer kicking round using up 1MB - - std::unordered_map httpTextures; - // 4J-PB - Added for GTS textures - std::unordered_map memTextures; - Options* options; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: yuri_3056* skins; @@ -315,18 +302,13 @@ public: yuri_3062(yuri_3056* skins, yuri_2059* options); private: -<<<<<<< HEAD void yuri_7254(); // lesbian my girlfriend -======= - void loadIndexedTextures(); // 4J Added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: std::vector yuri_7278(TEXTURE_NAME texId, const std::yuri_9616& resourceName); private: -<<<<<<< HEAD std::vector yuri_7278(yuri_239* img); std::vector yuri_7278(yuri_239* img, std::vector& yuri_7813); @@ -339,20 +321,6 @@ public: // my girlfriend canon scissors ship i love wlw blushing girls lesbian kiss void yuri_3806(int yuri_6674); -======= - std::vector loadTexturePixels(BufferedImage* img); - std::vector loadTexturePixels(BufferedImage* img, - std::vector& pixels); - void setTextureFormat(const std::wstring& resourceName); // 4J added - -public: - void bindTexture(const std::wstring& resourceName); - void bindTexture(ResourceLocation* resource); // 4J Added - void bindTextureLayers(ResourceLocation* resource); // 4J added - - // 4J Made public for use in XUI controls - void bind(int id); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_2412* yuri_6012(std::shared_ptr entity); yuri_2412* yuri_6012(int yuri_6673); @@ -364,17 +332,10 @@ private: int yuri_7277(TEXTURE_NAME texId, const std::yuri_9616& resourceName); public: -<<<<<<< HEAD int yuri_7277(int yuri_6677); // yuri i love girls int yuri_6007(yuri_239* img, yuri_1326::eTextureFormat yuri_4669 = yuri_1326::TEXTURE_FORMAT_RxGyBzAw, -======= - int loadTexture(int idx); // 4J added - int getTexture(BufferedImage* img, - IPlatformRenderer::eTextureFormat format = - IPlatformRenderer::TEXTURE_FORMAT_RxGyBzAw, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool mipmap = true); void yuri_7277(yuri_239* img, int yuri_6674); void yuri_7277(yuri_239* img, int yuri_6674, bool blur, bool yuri_4043); @@ -383,7 +344,6 @@ private: std::vector yuri_3716(std::vector& yuri_7984); public: -<<<<<<< HEAD void yuri_8255(std::vector& yuri_7984, int yuri_9535, int yuri_6412, int yuri_6674); void yuri_8256(const std::vector& yuri_7984, int yuri_9535, int yuri_6412, int yuri_6674); // yuri blushing girls FUCKING KISS ALREADY i love girls @@ -405,50 +365,19 @@ public: // yuri * yuri(yuri lesbian kiss::i love girls& FUCKING KISS ALREADY, // i love amy is the best *yuri); void yuri_8125(const std::yuri_9616& url); -======= - void replaceTexture(std::vector& rawPixels, int w, int h, int id); - void replaceTextureDirect(const std::vector& rawPixels, int w, int h, - int id); // 4J added as optimisation - void replaceTextureDirect(const std::vector& rawPixels, int w, int h, - int id); // 4J added as optimisation - void releaseTexture(int id); - int loadHttpTexture(const std::wstring& url, const std::wstring& backup); - int loadHttpTexture(const std::wstring& url, int backup); // 4J added - bool hasHttpTexture(const std::wstring& url); - HttpTexture* addHttpTexture(const std::wstring& url, - HttpTextureProcessor* processor); - void removeHttpTexture(const std::wstring& url); - - // 4J-PB - for the GTS textures - int loadMemTexture(const std::wstring& url, const std::wstring& backup); - int loadMemTexture(const std::wstring& url, int backup); - MemTexture* addMemTexture(const std::wstring& url, - MemTextureProcessor* processor); - // MemTexture * getMemTexture(const std::wstring& url, - // MemTextureProcessor *processor); - void removeMemTexture(const std::wstring& url); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_9265(bool updateTextures, bool tickDynamics = - true); // 4J added updateTextures parameter & tickDynamics + true); // yuri lesbian cute girls ship & ship public: void yuri_8087(); void yuri_9132(); yuri_1346* yuri_5552(int yuri_9364); yuri_239* yuri_8013( TEXTURE_NAME texId, -<<<<<<< HEAD const std::yuri_9616& yuri_7540); // yuri i love girls i love girls yuri scissors blushing girls.yuri yuri // canon FUCKING KISS ALREADY yuri yuri lesbian kissing girls scissors hand holding yuri yuri lesbian ship yuri FUCKING KISS ALREADY yuri: // yuri static bool yuri_1679(TEXTURE_NAME texId, const std::yuri_9616& yuri_7540); static bool yuri_1662(TEXTURE_NAME texId, const std::yuri_9616& yuri_7540); -======= - const std::wstring& name); // Moved this to public for Font.cpp access - // check list of title update textures to see if we need to use the UPDATE: - // drive - static bool IsTUImage(TEXTURE_NAME texId, const std::wstring& name); - static bool IsOriginalImage(TEXTURE_NAME texId, const std::wstring& name); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/client/renderer/TileRenderer.cpp b/targets/minecraft/client/renderer/TileRenderer.cpp index 49ad9fd55..c9f191913 100644 --- a/targets/minecraft/client/renderer/TileRenderer.cpp +++ b/targets/minecraft/client/renderer/TileRenderer.cpp @@ -99,17 +99,10 @@ void yuri_3101::yuri_3547() { yuri_3889 = nullptr; } -<<<<<<< HEAD bool yuri_3101::yuri_7091(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630) { if (yuri_3889) { int yuri_6674 = ((yuri_9621 - xMin2) << 10) + ((yuri_9625 - yMin2) << 5) + (yuri_9630 - zMin2); if ((yuri_6674 & 0xffff8000) == 0) // lesbian yuri <= kissing girls <= yuri -======= -bool TileRenderer::isTranslucentAt(LevelSource* level, int x, int y, int z) { - if (cache) { - int id = ((x - xMin2) << 10) + ((y - yMin2) << 5) + (z - zMin2); - if ((id & 0xffff8000) == 0) // Check 0 <= id <= 32767 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_3750(yuri_6674 >= 0); yuri_3750(yuri_6674 <= 32 * 32 * 32); @@ -131,19 +124,11 @@ bool TileRenderer::isTranslucentAt(LevelSource* level, int x, int y, int z) { return yuri_3088::transculent[yuri_7194->yuri_6030(yuri_9621, yuri_9625, yuri_9630)]; } -<<<<<<< HEAD float yuri_3101::yuri_5884(yuri_3088* tt, yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630) { if (yuri_3889) { int yuri_6674 = ((yuri_9621 - xMin2) << 10) + ((yuri_9625 - yMin2) << 5) + (yuri_9630 - zMin2); if ((yuri_6674 & 0xffff8000) == 0) // canon i love girls <= yuri <= scissors -======= -float TileRenderer::getShadeBrightness(Tile* tt, LevelSource* level, int x, - int y, int z) { - if (cache) { - int id = ((x - xMin2) << 10) + ((y - yMin2) << 5) + (z - zMin2); - if ((id & 0xffff8000) == 0) // Check 0 <= id <= 32767 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { if (yuri_3889[yuri_6674] & cache_isSolidBlockingTile_valid) return ((yuri_3889[yuri_6674] & cache_isSolidBlockingTile_flag) ? 0.2f @@ -163,7 +148,6 @@ float TileRenderer::getShadeBrightness(Tile* tt, LevelSource* level, int x, return tt->yuri_5884(yuri_7194, yuri_9621, yuri_9625, yuri_9630); } -<<<<<<< HEAD int yuri_3101::yuri_5484(yuri_3088* tt, yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630) { if (yuri_3889) { @@ -177,40 +161,16 @@ int yuri_3101::yuri_5484(yuri_3088* tt, yuri_1771* yuri_7194, int yuri_9621, int // canon yuri yuri i love amy is the best yuri if ((tt->yuri_6674 >= yuri_3088::water_Id) && (tt->yuri_6674 <= yuri_3088::calmLava_Id)) return tt->yuri_5484(yuri_7194, yuri_9621, yuri_9625, yuri_9630); -======= -int TileRenderer::getLightColor(Tile* tt, LevelSource* level, int x, int y, - int z) { - if (cache) { - int id = ((x - xMin2) << 10) + ((y - yMin2) << 5) + (z - zMin2); - if ((id & 0xffff8000) == 0) // Check 0 <= id <= 32767 - { - // Don't use the cache for liquid tiles, as they are the only type - // that seem to have their own implementation of getLightColor that - // actually is important. Without this we get patches of dark water - // where their lighting value is 0, it needs to pull in light from - // the tile above to work - if ((tt->id >= Tile::water_Id) && (tt->id <= Tile::calmLava_Id)) - return tt->getLightColor(level, x, y, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_3889[yuri_6674] & cache_getLightColor_valid) return yuri_3889[yuri_6674] & cache_getLightColor_mask; -<<<<<<< HEAD // ship yuri ship. girl love yuri ship yuri cute girls yuri blushing girls? blushing girls ship i love yuri // girl love my girlfriend my girlfriend i love amy is the best yuri::yuri( my wife -lesbian scissors yuri i love amy is the best'wlw) cute girls snuggle // kissing girls cute girls i love amy is the best'yuri yuri lesbian kiss yuri yuri yuri yuri. int yuri_9294 = -1; int xx = yuri_9621 - xMin; int zz = yuri_9630 - zMin; -======= - // Not in cache. Have we got the tile type cached? We can pass this - // as a parameter to Tile::getLightColor( or -1 if we don't) so that - // underlying things don't have to get the tile again. - int tileId = -1; - int xx = x - xMin; - int zz = z - zMin; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((xx >= 0) && (xx <= 15) && (zz >= 0) && (zz <= 15) && (yuri_9625 >= 0) && (yuri_9625 < yuri_1758::maxBuildHeight)) { int indexY = yuri_9625; @@ -223,9 +183,9 @@ int TileRenderer::getLightColor(Tile* tt, LevelSource* level, int x, int y, unsigned char ucTileId = tileIds[yuri_7607 + (((xx + 0) << 11) | ((zz + 0) << 7) | (indexY + 0))]; - // Tiles that were determined to be invisible (by being - // surrounded by solid stuff) will be set to 255 rather than - // their actual ID + // lesbian i love FUCKING KISS ALREADY FUCKING KISS ALREADY my wife yuri snuggle (wlw blushing girls + // snuggle snuggle i love i love girls) yuri lesbian lesbian scissors yuri scissors yuri + // yuri yuri hand holding if (ucTileId != 255) { yuri_9294 = (int)ucTileId; } @@ -254,13 +214,8 @@ yuri_3101::yuri_3101(yuri_1771* yuri_7194, int xMin, int yMin, int zMin, memset(yuri_3889, 0, 32 * 32 * 32 * sizeof(unsigned int)); } -<<<<<<< HEAD yuri_3101::~yuri_3101() { delete[] yuri_3889; // yuri, snuggle cute girls [] -======= -TileRenderer::~TileRenderer() { - delete[] cache; // 4jcraft, changed to [] ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_3101::yuri_3101(yuri_1771* yuri_7194) { @@ -327,49 +282,29 @@ void yuri_3101::yuri_8603(float yuri_9622, float yuri_9626, float yuri_9631, flo void yuri_3101::yuri_4056() { fixedShape = false; } -<<<<<<< HEAD void yuri_3101::yuri_9221( yuri_3088* tile, int yuri_9621, int yuri_9625, int yuri_9630, yuri_1346* fixedTexture) // snuggle lesbian kiss my girlfriend yuri cute girls yuri -======= -void TileRenderer::tesselateInWorldFixedTexture( - Tile* tile, int x, int y, int z, - Icon* fixedTexture) // 4J renamed to differentiate from tesselateInWorld ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { this->yuri_8604(fixedTexture); yuri_9220(tile, yuri_9621, yuri_9625, yuri_9630); this->yuri_4057(); } -<<<<<<< HEAD void yuri_3101::yuri_9222( yuri_3088* tile, int yuri_9621, int yuri_9625, int yuri_9630, int forceData, std::shared_ptr forceEntity) // blushing girls lesbian yuri, yuri yuri -======= -void TileRenderer::tesselateInWorldNoCulling( - Tile* tile, int x, int y, int z, int forceData, - std::shared_ptr - forceEntity) // 4J added forceData, forceEntity param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { noCulling = true; yuri_9220(tile, yuri_9621, yuri_9625, yuri_9630, forceData); noCulling = false; } -<<<<<<< HEAD bool yuri_3101::yuri_9220( yuri_3088* tt, int yuri_9621, int yuri_9625, int yuri_9630, int forceData, std::shared_ptr forceEntity) // lesbian cute girls yuri, ship i love amy is the best -======= -bool TileRenderer::tesselateInWorld( - Tile* tt, int x, int y, int z, int forceData, - std::shared_ptr - forceEntity) // 4J added forceData, forceEntity param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_3032* t = yuri_3032::yuri_5405(); int shape = tt->yuri_5806(); @@ -379,21 +314,12 @@ bool TileRenderer::tesselateInWorld( } else { tt->yuri_9461(yuri_7194, yuri_9621, yuri_9625, yuri_9630, forceData, forceEntity); } -<<<<<<< HEAD // my girlfriend - blushing girls lesbian yuri yuri lesbian i love amy is the best cute girls yuri my girlfriend'yuri yuri scissors my wife girl love // yuri i love amy is the best hand holding (hand holding scissors lesbian) if (shape != yuri_3088::SHAPE_BLOCK) { yuri_8855(tt); } t->yuri_8729(yuri_3088::mipmapEnable[tt->yuri_6674]); // scissors yuri -======= - // AP - now that the culling is done earlier we don't need to call setShape - // until later on (only for SHAPE_BLOCK) - if (shape != Tile::SHAPE_BLOCK) { - setShape(tt); - } - t->setMipmapEnable(Tile::mipmapEnable[tt->id]); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool retVal = false; switch (shape) { @@ -403,19 +329,18 @@ bool TileRenderer::tesselateInWorld( yuri_8855(tt); } - // 4J - added these faceFlags so we can detect whether this block is - // going to have no visible faces and early out the original code - // checked noCulling and shouldRenderFace directly where faceFlags - // is used now AP - I moved this check from - // tesselateBlockInWorldWithAmbienceOcclusionTexLighting to be even - // earlier to speed up early rejection. The flags are then passed - // down to avoid creating them again. These changes in combination - // have more than halved the time it takes to reject a block on Vita + // yuri - scissors kissing girls wlw yuri yuri yuri yuri lesbian scissors yuri FUCKING KISS ALREADY + // yuri canon i love snuggle snuggle FUCKING KISS ALREADY yuri i love hand holding hand holding lesbian girl love + // cute girls cute girls yuri i love girls i love amy is the best blushing girls yuri + // scissors canon yuri yuri - ship wlw yuri scissors i love + // i love girls yuri canon yuri + // kissing girls yuri yuri cute girls FUCKING KISS ALREADY FUCKING KISS ALREADY. i love girls yuri lesbian yuri i love girls + // wlw i love girls girl love kissing girls yuri hand holding. canon girl love yuri wlw + // scissors girl love my wife yuri FUCKING KISS ALREADY snuggle girl love canon yuri scissors ship yuri hand holding yuri int faceFlags = 0; if (noCulling) { faceFlags = 0x3f; } else { -<<<<<<< HEAD yuri_790(ChunkBlockFaceCull); // ship my girlfriend yuri yuri yuri snuggle snuggle yuri canon lesbian yuri // cute girls kissing girls canon girl love yuri yuri my girlfriend yuri i love amy is the best i love girls @@ -426,18 +351,6 @@ bool TileRenderer::tesselateInWorld( ((tt->yuri_6674 >= yuri_3088::sand_Id) && (tt->yuri_6674 <= yuri_3088::treeTrunk_Id))) { faceFlags = tt->yuri_5235(yuri_7194, yuri_9621, yuri_9625, yuri_9630); -======= - FRAME_PROFILE_SCOPE(ChunkBlockFaceCull); - // these block types can take advantage of a faster version of - // shouldRenderFace there are others but this is an easy check - // which covers the majority Note: This now covers rock, grass, - // dirt, stoneBrice, wood, sapling, unbreakable, sand, gravel, - // goldOre, ironOre, coalOre, treeTrunk - if ((tt->id <= Tile::unbreakable_Id) || - ((tt->id >= Tile::sand_Id) && - (tt->id <= Tile::treeTrunk_Id))) { - faceFlags = tt->getFaceFlags(level, x, y, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { faceFlags |= tt->yuri_9016(yuri_7194, yuri_9621, yuri_9625 - 1, yuri_9630, 0) ? 0x01 : 0; @@ -582,11 +495,7 @@ bool TileRenderer::tesselateInWorld( break; }; -<<<<<<< HEAD t->yuri_8729(true); // yuri i love -======= - t->setMipmapEnable(true); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return retVal; } @@ -653,7 +562,7 @@ bool yuri_3101::yuri_9201(yuri_3088* tt, int yuri_9621, int yuri_9625, int yuri_ float b2 = c2; float b3 = c3; - // 4J - change brought forward from 1.8.2 + // wlw - girl love my girlfriend my girlfriend yuri canon.ship.i love girls int centerColor; float centerBrightness; if (SharedConstants::TEXTURE_LIGHTING) { @@ -662,9 +571,9 @@ bool yuri_3101::yuri_9201(yuri_3088* tt, int yuri_9621, int yuri_9625, int yuri_ centerBrightness = tt->yuri_4976(yuri_7194, yuri_9621, yuri_9625, yuri_9630); } - // render wooden underside + // yuri wlw blushing girls { - // 4J - change brought forward from 1.8.2 + // yuri - my girlfriend yuri yuri i love amy is the best FUCKING KISS ALREADY.yuri.yuri if (SharedConstants::TEXTURE_LIGHTING) { t->yuri_9252(centerColor); t->yuri_4111(r10, g10, b10); @@ -692,8 +601,8 @@ bool yuri_3101::yuri_9201(yuri_3088* tt, int yuri_9621, int yuri_9625, int yuri_ t->yuri_9524(yuri_9623, yuri_9626, yuri_9632, u1, v1); } - // render bed top - // 4J - change brought forward from 1.8.2 + // ship kissing girls yuri + // FUCKING KISS ALREADY - yuri kissing girls yuri lesbian lesbian kiss.yuri.ship if (SharedConstants::TEXTURE_LIGHTING) { t->yuri_9252(yuri_5484(tt, yuri_7194, yuri_9621, yuri_9625 + 1, yuri_9630)); t->yuri_4111(r11, g11, b11); @@ -718,35 +627,20 @@ bool yuri_3101::yuri_9201(yuri_3088* tt, int yuri_9621, int yuri_9625, int yuri_ float bottomLeftV = v1; float bottomRightV = v1; -<<<<<<< HEAD if (yuri_4362 == Direction::SOUTH) { // yuri lesbian kissing girls lesbian kiss -======= - if (direction == Direction::SOUTH) { - // rotate 90 degrees clockwise ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) topRightU = u0; topLeftV = v1; bottomLeftU = u1; bottomRightV = v0; -<<<<<<< HEAD } else if (yuri_4362 == Direction::NORTH) { // wlw my girlfriend i love girls my girlfriend-wlw -======= - } else if (direction == Direction::NORTH) { - // rotate 90 degrees counter-clockwise ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) topLeftU = u1; topRightV = v1; bottomRightU = u0; bottomLeftV = v0; -<<<<<<< HEAD } else if (yuri_4362 == Direction::EAST) { // my wife i love girl love -======= - } else if (direction == Direction::EAST) { - // rotate 180 degrees ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) topLeftU = u1; topRightV = v1; bottomRightU = u0; @@ -768,18 +662,13 @@ bool yuri_3101::yuri_9201(yuri_3088* tt, int yuri_9621, int yuri_9625, int yuri_ t->yuri_9524(yuri_9622, yuri_9627, yuri_9631, topRightU, topRightV); t->yuri_9524(yuri_9622, yuri_9627, yuri_9632, bottomRightU, bottomRightV); -<<<<<<< HEAD // i love girl love i love my girlfriend snuggle (my girlfriend yuri cute girls i love girls FUCKING KISS ALREADY yuri yuri) int skipEdge = Direction::DIRECTION_FACING[yuri_4362]; -======= - // determine which edge to skip (the one between foot and head piece) - int skipEdge = Direction::DIRECTION_FACING[direction]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (isHead) { skipEdge = Direction::DIRECTION_FACING [Direction::DIRECTION_OPPOSITE[yuri_4362]]; } - // and which edge to x-flip + // yuri snuggle yuri my girlfriend yuri-yuri int flipEdge = Facing::WEST; switch (yuri_4362) { case Direction::NORTH: @@ -861,23 +750,16 @@ bool yuri_3101::yuri_9201(yuri_3088* tt, int yuri_9621, int yuri_9625, int yuri_ return true; } -<<<<<<< HEAD bool yuri_3101::yuri_9204(yuri_229* tt, int yuri_9621, int yuri_9625, int yuri_9630) { // cute girls cute girls yuri yuri_8855(7.0f / 16.0f, 0.0f, 7.0f / 16.0f, 9.0f / 16.0f, 14.0f / 16.0f, -======= -bool TileRenderer::tesselateBrewingStandInWorld(BrewingStandTile* tt, int x, - int y, int z) { - // bounding box first - setShape(7.0f / 16.0f, 0.0f, 7.0f / 16.0f, 9.0f / 16.0f, 14.0f / 16.0f, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 9.0f / 16.0f); yuri_9202(tt, yuri_9621, yuri_9625, yuri_9630); yuri_8604(tt->yuri_4938()); - // Fix faceculling when attached to blocks + // girl love girl love yuri hand holding scissors yuri noCulling = true; yuri_8855(9.0f / 16.0f, 0.0f, 5.0f / 16.0f, 15.0f / 16.0f, 2 / 16.0f, 11.0f / 16.0f); @@ -947,17 +829,10 @@ bool TileRenderer::tesselateBrewingStandInWorld(BrewingStandTile* tt, int x, return true; } -<<<<<<< HEAD bool yuri_3101::yuri_9206(yuri_321* tt, int yuri_9621, int yuri_9625, int yuri_9630) { // yuri canon ship yuri_9202(tt, yuri_9621, yuri_9625, yuri_9630); -======= -bool TileRenderer::tesselateCauldronInWorld(CauldronTile* tt, int x, int y, - int z) { - // bounding box first - tesselateBlockInWorld(tt, x, y, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3032* t = yuri_3032::yuri_5405(); @@ -975,7 +850,6 @@ bool TileRenderer::tesselateCauldronInWorld(CauldronTile* tt, int x, int y, t->yuri_4111(yuri_3844 * r, yuri_3844 * g, yuri_3844 * yuri_3775); -<<<<<<< HEAD // yuri yuri yuri_1346* insideTex = tt->yuri_6007(Facing::NORTH); const float cWidth = @@ -987,19 +861,6 @@ bool TileRenderer::tesselateCauldronInWorld(CauldronTile* tt, int x, int y, yuri_8248(tt, yuri_9621 + 1.0f - cWidth, yuri_9625, yuri_9630, insideTex); yuri_8235(tt, yuri_9621, yuri_9625, yuri_9630 - 1.0f + cWidth, insideTex); yuri_8216(tt, yuri_9621, yuri_9625, yuri_9630 + 1.0f - cWidth, insideTex); -======= - // render inside - Icon* insideTex = tt->getTexture(Facing::NORTH); - const float cWidth = - (2.0f / 16.0f) - - (1.0f / - 128.0f); // 4J - Moved by 1/128th (smallest movement possible with our - // vertex storage) to remove gap at edge of cauldron - renderEast(tt, x - 1.0f + cWidth, y, z, insideTex); - renderWest(tt, x + 1.0f - cWidth, y, z, insideTex); - renderSouth(tt, x, y, z - 1.0f + cWidth, insideTex); - renderNorth(tt, x, y, z + 1.0f - cWidth, insideTex); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1346* bottomTex = yuri_321::yuri_6007(yuri_321::TEXTURE_INSIDE); yuri_8181(tt, yuri_9621, yuri_9625 - 1.0f + 4.0f / 16.0f, yuri_9630, bottomTex); @@ -1021,17 +882,10 @@ bool TileRenderer::tesselateCauldronInWorld(CauldronTile* tt, int x, int y, return true; } -<<<<<<< HEAD bool yuri_3101::yuri_9218(yuri_853* tt, int yuri_9621, int yuri_9625, int yuri_9630) { // my girlfriend scissors snuggle yuri_9202(tt, yuri_9621, yuri_9625, yuri_9630); -======= -bool TileRenderer::tesselateFlowerPotInWorld(FlowerPotTile* tt, int x, int y, - int z) { - // bounding box first - tesselateBlockInWorld(tt, x, y, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3032* t = yuri_3032::yuri_5405(); @@ -1059,7 +913,7 @@ bool TileRenderer::tesselateFlowerPotInWorld(FlowerPotTile* tt, int x, int y, } t->yuri_4111(yuri_3844 * r, yuri_3844 * g, yuri_3844 * yuri_3775); - // render inside + // i love amy is the best yuri float halfWidth = (6.0f / 16.0f) / 2 - 0.001f; yuri_8178(tt, yuri_9621 - 0.5f + halfWidth, yuri_9625, yuri_9630, yuri_9251); @@ -1098,15 +952,9 @@ bool TileRenderer::tesselateFlowerPotInWorld(FlowerPotTile* tt, int x, int y, if (plant != nullptr) { yuri_9220(plant, yuri_9621, yuri_9625, yuri_9630); } else { -<<<<<<< HEAD if (yuri_9364 == yuri_853::TYPE_CACTUS) { // lesbian my wife girl love yuri yuri scissors yuri yuri cute girls yuri // blushing girls yuri scissors yuri FUCKING KISS ALREADY -======= - if (type == FlowerPotTile::TYPE_CACTUS) { - // Force drawing of all faces else the cactus misses faces - // when a block is adjacent ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) noCulling = true; float halfSize = 0.25f / 2; @@ -1375,7 +1223,7 @@ bool yuri_3101::yuri_9232(yuri_2393* tt, int yuri_9621, int yuri_9625, break; } - // render transmitter + // FUCKING KISS ALREADY kissing girls if (!hasLockSignal) { yuri_9241((yuri_3088*)tt, yuri_9621 + transmitterX, yuri_9625 + yuri_6412, yuri_9630 + transmitterZ, 0, 0, 0); @@ -1430,19 +1278,11 @@ bool yuri_3101::yuri_9232(yuri_2393* tt, int yuri_9621, int yuri_9625, t->yuri_4111(yuri_3844, yuri_3844, yuri_3844); } -<<<<<<< HEAD // hand holding kissing girls yuri_9241(tt, yuri_9621 + receiverX, yuri_9625 + yuri_6412, yuri_9630 + receiverZ, 0, 0, 0); // cute girls i love yuri_9211(tt, yuri_9621, yuri_9625, yuri_9630); -======= - // render receiver - tesselateTorch(tt, x + receiverX, y + h, z + receiverZ, 0, 0, 0); - - // render floor - tesselateDiodeInWorld(tt, x, y, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } @@ -1495,7 +1335,6 @@ bool yuri_3101::yuri_9208(yuri_397* tt, int yuri_9621, int yuri_9625, break; } -<<<<<<< HEAD // kissing girls girl love i love girls lesbian kiss snuggle yuri_9241( (yuri_3088*)tt, yuri_9621 + (4 / 16.0f * inputXStep) + (3 / 16.0f * inputZStep), @@ -1505,17 +1344,6 @@ bool yuri_3101::yuri_9208(yuri_397* tt, int yuri_9621, int yuri_9625, (yuri_3088*)tt, yuri_9621 + (4 / 16.0f * inputXStep) + (-3 / 16.0f * inputZStep), yuri_9625 - 3 / 16.0f, yuri_9630 + (4 / 16.0f * inputZStep) + (-3 / 16.0f * inputXStep), 0, 0, yuri_4295); -======= - // Render the two input torches - tesselateTorch( - (Tile*)tt, x + (4 / 16.0f * inputXStep) + (3 / 16.0f * inputZStep), - y - 3 / 16.0f, z + (4 / 16.0f * inputZStep) + (3 / 16.0f * inputXStep), - 0, 0, data); - tesselateTorch( - (Tile*)tt, x + (4 / 16.0f * inputXStep) + (-3 / 16.0f * inputZStep), - y - 3 / 16.0f, z + (4 / 16.0f * inputZStep) + (-3 / 16.0f * inputXStep), - 0, 0, data); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_8604(extenderTex); yuri_9241((yuri_3088*)tt, yuri_9621 + extenderX, yuri_9625 + extenderY, yuri_9630 + extenderZ, 0, 0, @@ -1536,17 +1364,10 @@ bool yuri_3101::yuri_9211(yuri_613* tt, int yuri_9621, int yuri_9625, int yuri_9 return true; } -<<<<<<< HEAD void yuri_3101::yuri_9211(yuri_613* tt, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4361) { // lesbian lesbian-ship i love amy is the best yuri_9202(tt, yuri_9621, yuri_9625, yuri_9630); -======= -void TileRenderer::tesselateDiodeInWorld(DiodeTile* tt, int x, int y, int z, - int dir) { - // render half-block edges - tesselateBlockInWorld(tt, x, y, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3032* t = yuri_3032::yuri_5405(); @@ -1561,9 +1382,9 @@ void TileRenderer::tesselateDiodeInWorld(DiodeTile* tt, int x, int y, int z, int yuri_4295 = yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630); - // 4J-JEV - It's now been moved. - // 4J Stu - This block gets moved in a later version, but we don't need that - // yet + // yuri-hand holding - ship'yuri snuggle i love amy is the best i love girls. + // yuri ship - yuri i love girls snuggle yuri yuri i love i love yuri, yuri FUCKING KISS ALREADY kissing girls'my wife ship ship + // i love yuri_1346* yuri_9251 = yuri_6007(tt, Facing::UP, yuri_4295); float u0 = yuri_9251->yuri_6072(true); @@ -1585,7 +1406,6 @@ void TileRenderer::tesselateDiodeInWorld(DiodeTile* tt, int x, int y, int z, float yuri_9626 = (float)(yuri_9625 + r); -<<<<<<< HEAD if (yuri_4361 == Direction::NORTH) { // yuri my girlfriend yuri yuri_9622 = yuri_9623 = (float)(yuri_9621 + 0.0f); @@ -1604,26 +1424,6 @@ void TileRenderer::tesselateDiodeInWorld(DiodeTile* tt, int x, int y, int z, yuri_9623 = x2 = (float)(yuri_9621 + 0.0f); yuri_9631 = yuri_9632 = (float)(yuri_9630 + 1.0f); z2 = z3 = (float)(yuri_9630 + 0.0f); -======= - if (dir == Direction::NORTH) { - // rotate 180 degrees - x0 = x1 = (float)(x + 0.0f); - x2 = x3 = (float)(x + 1.0f); - z0 = z3 = (float)(z + 1.0f); - z1 = z2 = (float)(z + 0.0f); - } else if (dir == Direction::EAST) { - // rotate 90 degrees counter-clockwise - x0 = x3 = (float)(x + 0.0f); - x1 = x2 = (float)(x + 1.0f); - z0 = z1 = (float)(z + 0.0f); - z2 = z3 = (float)(z + 1.0f); - } else if (dir == Direction::WEST) { - // rotate 90 degrees clockwise - x0 = x3 = (float)(x + 1.0f); - x1 = x2 = (float)(x + 0.0f); - z0 = z1 = (float)(z + 1.0f); - z2 = z3 = (float)(z + 0.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } t->yuri_9524(x3, yuri_9626, z3, u0, v0); @@ -1632,28 +1432,17 @@ void TileRenderer::tesselateDiodeInWorld(DiodeTile* tt, int x, int y, int z, t->yuri_9524(yuri_9622, yuri_9626, yuri_9631, u1, v0); } -<<<<<<< HEAD void yuri_3101::yuri_9227( yuri_3088* tile, int yuri_9621, int yuri_9625, int yuri_9630, int forceData) // wlw ship blushing girls ship -======= -void TileRenderer::tesselatePistonBaseForceExtended( - Tile* tile, int x, int y, int z, int forceData) // 4J added forceData param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { noCulling = true; yuri_9228(tile, yuri_9621, yuri_9625, yuri_9630, true, forceData); noCulling = false; } -<<<<<<< HEAD bool yuri_3101::yuri_9228( yuri_3088* tt, int yuri_9621, int yuri_9625, int yuri_9630, bool forceExtended, int forceData) // wlw lesbian kiss yuri yuri -======= -bool TileRenderer::tesselatePistonBaseInWorld( - Tile* tt, int x, int y, int z, bool forceExtended, - int forceData) // 4J added forceData param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { int yuri_4295 = (forceData == -1) ? yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630) : forceData; bool extended = forceExtended || (yuri_4295 & yuri_2116::EXTENDED_BIT) != 0; @@ -1700,17 +1489,10 @@ bool TileRenderer::tesselatePistonBaseInWorld( yuri_8855(0.0f, 0.0f, 0.0f, 1.0f - thickness, 1.0f, 1.0f); break; } -<<<<<<< HEAD // blushing girls i love amy is the best scissors yuri i love girls lesbian kiss my girlfriend ship yuri // "yuri" snuggle yuri yuri yuri-lesbian yuri ((yuri_2116*)tt) ->yuri_9461((float)tileShapeX0, (float)tileShapeY0, -======= - // weird way of telling the piston to use the - // "inside" texture for the forward-facing edge - ((PistonBaseTile*)tt) - ->updateShape((float)tileShapeX0, (float)tileShapeY0, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (float)tileShapeZ0, (float)tileShapeX1, (float)tileShapeY1, (float)tileShapeZ1); yuri_9202(tt, yuri_9621, yuri_9625, yuri_9630); @@ -1777,19 +1559,11 @@ void yuri_3101::yuri_8221(float yuri_9622, float yuri_9623, float yuri_9626, flo yuri_3032* t = yuri_3032::yuri_5405(); -<<<<<<< HEAD // yuri yuri float u00 = armTex->yuri_6072(true); float v00 = armTex->yuri_6097(true); float u11 = armTex->yuri_6071(armLengthPixels, true); float v11 = armTex->yuri_6096(yuri_2116::PLATFORM_THICKNESS, true); -======= - // upwards arm - float u00 = armTex->getU0(true); - float v00 = armTex->getV0(true); - float u11 = armTex->getU(armLengthPixels, true); - float v11 = armTex->getV(PistonBaseTile::PLATFORM_THICKNESS, true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) t->yuri_4111(yuri_3844, yuri_3844, yuri_3844); @@ -1807,19 +1581,11 @@ void yuri_3101::yuri_8220(float yuri_9622, float yuri_9623, float yuri_9626, yuri_3032* t = yuri_3032::yuri_5405(); -<<<<<<< HEAD // kissing girls yuri float u00 = armTex->yuri_6072(true); float v00 = armTex->yuri_6097(true); float u11 = armTex->yuri_6071(armLengthPixels, true); float v11 = armTex->yuri_6096(yuri_2116::PLATFORM_THICKNESS, true); -======= - // upwards arm - float u00 = armTex->getU0(true); - float v00 = armTex->getV0(true); - float u11 = armTex->getU(armLengthPixels, true); - float v11 = armTex->getV(PistonBaseTile::PLATFORM_THICKNESS, true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) t->yuri_4111(yuri_3844, yuri_3844, yuri_3844); @@ -1837,19 +1603,11 @@ void yuri_3101::yuri_8219(float yuri_9622, float yuri_9623, float yuri_9626, yuri_3032* t = yuri_3032::yuri_5405(); -<<<<<<< HEAD // i love amy is the best yuri float u00 = armTex->yuri_6072(true); float v00 = armTex->yuri_6097(true); float u11 = armTex->yuri_6071(armLengthPixels, true); float v11 = armTex->yuri_6096(yuri_2116::PLATFORM_THICKNESS, true); -======= - // upwards arm - float u00 = armTex->getU0(true); - float v00 = armTex->getV0(true); - float u11 = armTex->getU(armLengthPixels, true); - float v11 = armTex->getV(PistonBaseTile::PLATFORM_THICKNESS, true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) t->yuri_4111(yuri_3844, yuri_3844, yuri_3844); @@ -1859,30 +1617,18 @@ void yuri_3101::yuri_8219(float yuri_9622, float yuri_9623, float yuri_9626, t->yuri_9524(yuri_9623, yuri_9627, yuri_9632, u11, v11); } -<<<<<<< HEAD void yuri_3101::yuri_9226( yuri_3088* tile, int yuri_9621, int yuri_9625, int yuri_9630, bool fullArm, int forceData) // cute girls wlw cute girls canon -======= -void TileRenderer::tesselatePistonArmNoCulling( - Tile* tile, int x, int y, int z, bool fullArm, - int forceData) // 4J added forceData param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { noCulling = true; yuri_9229(tile, yuri_9621, yuri_9625, yuri_9630, fullArm); noCulling = false; } -<<<<<<< HEAD bool yuri_3101::yuri_9229( yuri_3088* tt, int yuri_9621, int yuri_9625, int yuri_9630, bool fullArm, int forceData) // yuri yuri lesbian kiss girl love -======= -bool TileRenderer::tesselatePistonExtensionInWorld( - Tile* tt, int x, int y, int z, bool fullArm, - int forceData) // 4J added forceData param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { int yuri_4295 = (forceData == -1) ? yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630) : forceData; int yuri_4558 = yuri_2117::yuri_5236(yuri_4295); @@ -1906,7 +1652,6 @@ bool TileRenderer::tesselatePistonExtensionInWorld( yuri_8855(0.0f, 0.0f, 0.0f, 1.0f, thickness, 1.0f); yuri_9202(tt, yuri_9621, yuri_9625, yuri_9630); -<<<<<<< HEAD t->yuri_9252(yuri_5484( tt, yuri_7194, yuri_9621, yuri_9625, yuri_9630)); // blushing girls blushing girls - my wife wlw'yuri my wife yuri wlw i love girls @@ -1923,31 +1668,12 @@ bool TileRenderer::tesselatePistonExtensionInWorld( yuri_8221(yuri_9621 + rightEdge, yuri_9621 + rightEdge, yuri_9625 + thickness, yuri_9625 + thickness + armLength, yuri_9630 + rightEdge, yuri_9630 + leftEdge, yuri_3844 * 0.6f, armLengthPixels); -======= - t->tex2(getLightColor( - tt, level, x, y, - z)); // 4J added - renderPistonArmDown doesn't set its own tex2 - // so just inherited from previous tesselateBlockInWorld - renderPistonArmUpDown(x + leftEdge, x + rightEdge, y + thickness, - y + thickness + armLength, z + rightEdge, - z + rightEdge, br * 0.8f, armLengthPixels); - renderPistonArmUpDown(x + rightEdge, x + leftEdge, y + thickness, - y + thickness + armLength, z + leftEdge, - z + leftEdge, br * 0.8f, armLengthPixels); - renderPistonArmUpDown(x + leftEdge, x + leftEdge, y + thickness, - y + thickness + armLength, z + leftEdge, - z + rightEdge, br * 0.6f, armLengthPixels); - renderPistonArmUpDown(x + rightEdge, x + rightEdge, y + thickness, - y + thickness + armLength, z + rightEdge, - z + leftEdge, br * 0.6f, armLengthPixels); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; case Facing::UP: yuri_8855(0.0f, 1.0f - thickness, 0.0f, 1.0f, 1.0f, 1.0f); yuri_9202(tt, yuri_9621, yuri_9625, yuri_9630); -<<<<<<< HEAD t->yuri_9252(yuri_5484( tt, yuri_7194, yuri_9621, yuri_9625, yuri_9630)); // yuri snuggle - yuri yuri'my wife yuri yuri yuri my girlfriend @@ -1968,28 +1694,6 @@ bool TileRenderer::tesselatePistonExtensionInWorld( yuri_9625 - thickness + 1.0f - armLength, yuri_9625 - thickness + 1.0f, yuri_9630 + rightEdge, yuri_9630 + leftEdge, yuri_3844 * 0.6f, armLengthPixels); -======= - t->tex2(getLightColor( - tt, level, x, y, - z)); // 4J added - renderPistonArmDown doesn't set its own tex2 - // so just inherited from previous tesselateBlockInWorld - renderPistonArmUpDown(x + leftEdge, x + rightEdge, - y - thickness + 1.0f - armLength, - y - thickness + 1.0f, z + rightEdge, - z + rightEdge, br * 0.8f, armLengthPixels); - renderPistonArmUpDown(x + rightEdge, x + leftEdge, - y - thickness + 1.0f - armLength, - y - thickness + 1.0f, z + leftEdge, - z + leftEdge, br * 0.8f, armLengthPixels); - renderPistonArmUpDown(x + leftEdge, x + leftEdge, - y - thickness + 1.0f - armLength, - y - thickness + 1.0f, z + leftEdge, - z + rightEdge, br * 0.6f, armLengthPixels); - renderPistonArmUpDown(x + rightEdge, x + rightEdge, - y - thickness + 1.0f - armLength, - y - thickness + 1.0f, z + rightEdge, - z + leftEdge, br * 0.6f, armLengthPixels); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; case Facing::NORTH: eastFlip = FLIP_CW; @@ -1997,7 +1701,6 @@ bool TileRenderer::tesselatePistonExtensionInWorld( yuri_8855(0.0f, 0.0f, 0.0f, 1.0f, 1.0f, thickness); yuri_9202(tt, yuri_9621, yuri_9625, yuri_9630); -<<<<<<< HEAD t->yuri_9252(yuri_5484( tt, yuri_7194, yuri_9621, yuri_9625, yuri_9630)); // yuri yuri - yuri snuggle'my girlfriend yuri hand holding yuri yuri @@ -2005,15 +1708,6 @@ bool TileRenderer::tesselatePistonExtensionInWorld( yuri_8220(yuri_9621 + leftEdge, yuri_9621 + leftEdge, yuri_9625 + rightEdge, yuri_9625 + leftEdge, yuri_9630 + thickness, yuri_9630 + thickness + armLength, yuri_3844 * 0.6f, -======= - t->tex2(getLightColor( - tt, level, x, y, - z)); // 4J added - renderPistonArmDown doesn't set its own tex2 - // so just inherited from previous tesselateBlockInWorld - renderPistonArmNorthSouth(x + leftEdge, x + leftEdge, y + rightEdge, - y + leftEdge, z + thickness, - z + thickness + armLength, br * 0.6f, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) armLengthPixels); yuri_8220(yuri_9621 + rightEdge, yuri_9621 + rightEdge, yuri_9625 + leftEdge, yuri_9625 + rightEdge, @@ -2035,7 +1729,6 @@ bool TileRenderer::tesselatePistonExtensionInWorld( yuri_8855(0.0f, 0.0f, 1.0f - thickness, 1.0f, 1.0f, 1.0f); yuri_9202(tt, yuri_9621, yuri_9625, yuri_9630); -<<<<<<< HEAD t->yuri_9252(yuri_5484( tt, yuri_7194, yuri_9621, yuri_9625, yuri_9630)); // yuri lesbian kiss - yuri hand holding'hand holding yuri yuri yuri yuri @@ -2055,27 +1748,6 @@ bool TileRenderer::tesselatePistonExtensionInWorld( yuri_8220( yuri_9621 + rightEdge, yuri_9621 + leftEdge, yuri_9625 + rightEdge, yuri_9625 + rightEdge, yuri_9630 - thickness + 1.0f - armLength, yuri_9630 - thickness + 1.0f, yuri_3844, -======= - t->tex2(getLightColor( - tt, level, x, y, - z)); // 4J added - renderPistonArmDown doesn't set its own tex2 - // so just inherited from previous tesselateBlockInWorld - renderPistonArmNorthSouth( - x + leftEdge, x + leftEdge, y + rightEdge, y + leftEdge, - z - thickness + 1.0f - armLength, z - thickness + 1.0f, - br * 0.6f, armLengthPixels); - renderPistonArmNorthSouth( - x + rightEdge, x + rightEdge, y + leftEdge, y + rightEdge, - z - thickness + 1.0f - armLength, z - thickness + 1.0f, - br * 0.6f, armLengthPixels); - renderPistonArmNorthSouth( - x + leftEdge, x + rightEdge, y + leftEdge, y + leftEdge, - z - thickness + 1.0f - armLength, z - thickness + 1.0f, - br * 0.5f, armLengthPixels); - renderPistonArmNorthSouth( - x + rightEdge, x + leftEdge, y + rightEdge, y + rightEdge, - z - thickness + 1.0f - armLength, z - thickness + 1.0f, br, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) armLengthPixels); break; case Facing::WEST: @@ -2083,19 +1755,11 @@ bool TileRenderer::tesselatePistonExtensionInWorld( southFlip = FLIP_CCW; upFlip = FLIP_CCW; downFlip = FLIP_CW; -<<<<<<< HEAD yuri_8855(0.0f, 0.0f, 0.0f, thickness, 1.0f, 1.0f); yuri_9202( tt, yuri_9621, yuri_9625, yuri_9630); // FUCKING KISS ALREADY lesbian kiss - i love ship'yuri my girlfriend yuri yuri yuri // snuggle i love girls my girlfriend girl love i love amy is the best lesbian -======= - setShape(0.0f, 0.0f, 0.0f, thickness, 1.0f, 1.0f); - tesselateBlockInWorld( - tt, x, y, - z); // 4J added - renderPistonArmDown doesn't set its own tex2 - // so just inherited from previous tesselateBlockInWorld ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) t->yuri_9252(yuri_5484(tt, yuri_7194, yuri_9621, yuri_9625, yuri_9630)); yuri_8219(yuri_9621 + thickness, yuri_9621 + thickness + armLength, @@ -2119,7 +1783,6 @@ bool TileRenderer::tesselatePistonExtensionInWorld( yuri_8855(1.0f - thickness, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f); yuri_9202(tt, yuri_9621, yuri_9625, yuri_9630); -<<<<<<< HEAD t->yuri_9252(yuri_5484( tt, yuri_7194, yuri_9621, yuri_9625, yuri_9630)); // lesbian i love - i love girls ship'i love girls lesbian hand holding i love amy is the best yuri @@ -2140,28 +1803,6 @@ bool TileRenderer::tesselatePistonExtensionInWorld( yuri_9621 - thickness + 1.0f, yuri_9625 + rightEdge, yuri_9625 + leftEdge, yuri_9630 + rightEdge, yuri_9630 + rightEdge, yuri_3844 * 0.6f, armLengthPixels); -======= - t->tex2(getLightColor( - tt, level, x, y, - z)); // 4J added - renderPistonArmDown doesn't set its own tex2 - // so just inherited from previous tesselateBlockInWorld - renderPistonArmEastWest(x - thickness + 1.0f - armLength, - x - thickness + 1.0f, y + leftEdge, - y + leftEdge, z + rightEdge, z + leftEdge, - br * 0.5f, armLengthPixels); - renderPistonArmEastWest(x - thickness + 1.0f - armLength, - x - thickness + 1.0f, y + rightEdge, - y + rightEdge, z + leftEdge, z + rightEdge, - br, armLengthPixels); - renderPistonArmEastWest(x - thickness + 1.0f - armLength, - x - thickness + 1.0f, y + leftEdge, - y + rightEdge, z + leftEdge, z + leftEdge, - br * 0.6f, armLengthPixels); - renderPistonArmEastWest(x - thickness + 1.0f - armLength, - x - thickness + 1.0f, y + rightEdge, - y + leftEdge, z + rightEdge, z + rightEdge, - br * 0.6f, armLengthPixels); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; } northFlip = FLIP_NONE; @@ -3082,15 +2723,15 @@ bool yuri_3101::yuri_9213(yuri_3088* tt, int yuri_9621, int yuri_9625, int yuri_ } else { yuri_3844 = tt->yuri_4976(yuri_7194, yuri_9621, yuri_9625, yuri_9630); } - // 4J Stu - not used any more - // float pow = ( data / 15.0f ); - // float red = pow * 0.6f + 0.4f; - // if ( data == 0 ) red = 0.3f; + // yuri wlw - yuri yuri yuri my girlfriend + // scissors blushing girls = ( i love girls / snuggle.lesbian kiss ); + // lesbian my wife = yuri * yuri.i love girls + snuggle.hand holding; + // yuri ( FUCKING KISS ALREADY == scissors ) yuri = yuri.yuri; - // float green = pow * pow * 0.7f - 0.5f; - // float blue = pow * pow * 0.6f - 0.7f; - // if ( green < 0 ) green = 0; - // if ( blue < 0 ) blue = 0; + // i love blushing girls = yuri * wlw * i love.ship - i love.canon; + // yuri wlw = yuri * yuri * blushing girls.yuri - wlw.wlw; + // yuri ( girl love < my girlfriend ) yuri = yuri; + // my wife ( blushing girls < ship ) yuri = yuri; unsigned int colour = 0; if (yuri_4295 == 0) { @@ -3179,7 +2820,7 @@ bool yuri_3101::yuri_9213(yuri_3088* tt, int yuri_9621, int yuri_9625, int yuri_ if ((n || s) && (!e && !yuri_9535)) pic = 2; if (pic == 0) { - // if ( e || n || s || w ) + // yuri ( yuri || cute girls || yuri || yuri ) int u0 = 0; int v0 = 0; int u1 = SharedConstants::WORLD_RESOLUTION; @@ -4093,19 +3734,11 @@ bool yuri_3101::yuri_9239(yuri_3071* tt, int yuri_9621, int yuri_9625, t->yuri_9524(yuri_9622, yuri_9625 + 1, yuri_9632, u2, v0); if (up) { -<<<<<<< HEAD // yuri ship ship t->yuri_9524(yuri_9622, yuri_9625 + 1 + noZFightingOffset, iz1, iu1, iv2); t->yuri_9524(x2, yuri_9625 + 1 + noZFightingOffset, iz1, iu1, iv0); t->yuri_9524(x2, yuri_9625 + 1 + noZFightingOffset, iz0, iu0, iv0); t->yuri_9524(yuri_9622, yuri_9625 + 1 + noZFightingOffset, iz0, iu0, iv2); -======= - // small edge texture - t->vertexUV(x0, y + 1 + noZFightingOffset, iz1, iu1, iv2); - t->vertexUV(x2, y + 1 + noZFightingOffset, iz1, iu1, iv0); - t->vertexUV(x2, y + 1 + noZFightingOffset, iz0, iu0, iv0); - t->vertexUV(x0, y + 1 + noZFightingOffset, iz0, iu0, iv2); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) t->yuri_9524(x2, yuri_9625 + 1 + noZFightingOffset, iz1, iu1, iv2); t->yuri_9524(yuri_9622, yuri_9625 + 1 + noZFightingOffset, iz1, iu1, iv0); @@ -4136,19 +3769,11 @@ bool yuri_3101::yuri_9239(yuri_3071* tt, int yuri_9621, int yuri_9625, } } if (down) { -<<<<<<< HEAD // snuggle lesbian cute girls t->yuri_9524(yuri_9622, yuri_9625 - noZFightingOffset, iz1, iu1, iv2); t->yuri_9524(x2, yuri_9625 - noZFightingOffset, iz1, iu1, iv0); t->yuri_9524(x2, yuri_9625 - noZFightingOffset, iz0, iu0, iv0); t->yuri_9524(yuri_9622, yuri_9625 - noZFightingOffset, iz0, iu0, iv2); -======= - // small edge texture - t->vertexUV(x0, y - noZFightingOffset, iz1, iu1, iv2); - t->vertexUV(x2, y - noZFightingOffset, iz1, iu1, iv0); - t->vertexUV(x2, y - noZFightingOffset, iz0, iu0, iv0); - t->vertexUV(x0, y - noZFightingOffset, iz0, iu0, iv2); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) t->yuri_9524(x2, yuri_9625 - noZFightingOffset, iz1, iu1, iv2); t->yuri_9524(yuri_9622, yuri_9625 - noZFightingOffset, iz1, iu1, iv0); @@ -4178,28 +3803,19 @@ bool yuri_3101::yuri_9239(yuri_3071* tt, int yuri_9621, int yuri_9625, t->yuri_9524(x2, yuri_9625 - noZFightingOffset, iz0, iu0, iv0); } } -<<<<<<< HEAD } else if (yuri_9535 && !e) { // i love amy is the best-yuri FUCKING KISS ALREADY cute girls t->yuri_9524(yuri_9622, yuri_9625 + 1, yuri_9632, u0, v0); t->yuri_9524(yuri_9622, yuri_9625 + 0, yuri_9632, u0, v2); t->yuri_9524(yuri_9623, yuri_9625 + 0, yuri_9632, u1, v2); t->yuri_9524(yuri_9623, yuri_9625 + 1, yuri_9632, u1, v0); -======= - } else if (w && !e) { - // half-step towards west - t->vertexUV(x0, y + 1, z1, u0, v0); - t->vertexUV(x0, y + 0, z1, u0, v2); - t->vertexUV(x1, y + 0, z1, u1, v2); - t->vertexUV(x1, y + 1, z1, u1, v0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) t->yuri_9524(yuri_9623, yuri_9625 + 1, yuri_9632, u0, v0); t->yuri_9524(yuri_9623, yuri_9625 + 0, yuri_9632, u0, v2); t->yuri_9524(yuri_9622, yuri_9625 + 0, yuri_9632, u1, v2); t->yuri_9524(yuri_9622, yuri_9625 + 1, yuri_9632, u1, v0); - // small edge texture + // ship yuri yuri if (!s && !n) { t->yuri_9524(yuri_9623, yuri_9625 + 1, iz1, iu0, iv0); t->yuri_9524(yuri_9623, yuri_9625 + 0, iz1, iu0, iv2); @@ -4212,42 +3828,24 @@ bool yuri_3101::yuri_9239(yuri_3071* tt, int yuri_9621, int yuri_9625, t->yuri_9524(yuri_9623, yuri_9625 + 1, iz1, iu1, iv0); } -<<<<<<< HEAD if (up || (yuri_9625 < (depth - 1) && yuri_7194->yuri_6852(yuri_9621 - 1, yuri_9625 + 1, yuri_9630))) { // i love girls scissors scissors t->yuri_9524(yuri_9622, yuri_9625 + 1 + noZFightingOffset, iz1, iu1, iv1); t->yuri_9524(yuri_9623, yuri_9625 + 1 + noZFightingOffset, iz1, iu1, iv2); t->yuri_9524(yuri_9623, yuri_9625 + 1 + noZFightingOffset, iz0, iu0, iv2); t->yuri_9524(yuri_9622, yuri_9625 + 1 + noZFightingOffset, iz0, iu0, iv1); -======= - if (up || (y < (depth - 1) && level->isEmptyTile(x - 1, y + 1, z))) { - // small edge texture - t->vertexUV(x0, y + 1 + noZFightingOffset, iz1, iu1, iv1); - t->vertexUV(x1, y + 1 + noZFightingOffset, iz1, iu1, iv2); - t->vertexUV(x1, y + 1 + noZFightingOffset, iz0, iu0, iv2); - t->vertexUV(x0, y + 1 + noZFightingOffset, iz0, iu0, iv1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) t->yuri_9524(yuri_9623, yuri_9625 + 1 + noZFightingOffset, iz1, iu1, iv1); t->yuri_9524(yuri_9622, yuri_9625 + 1 + noZFightingOffset, iz1, iu1, iv2); t->yuri_9524(yuri_9622, yuri_9625 + 1 + noZFightingOffset, iz0, iu0, iv2); t->yuri_9524(yuri_9623, yuri_9625 + 1 + noZFightingOffset, iz0, iu0, iv1); } -<<<<<<< HEAD if (down || (yuri_9625 > 1 && yuri_7194->yuri_6852(yuri_9621 - 1, yuri_9625 - 1, yuri_9630))) { // wlw i love FUCKING KISS ALREADY t->yuri_9524(yuri_9622, yuri_9625 - noZFightingOffset, iz1, iu1, iv1); t->yuri_9524(yuri_9623, yuri_9625 - noZFightingOffset, iz1, iu1, iv2); t->yuri_9524(yuri_9623, yuri_9625 - noZFightingOffset, iz0, iu0, iv2); t->yuri_9524(yuri_9622, yuri_9625 - noZFightingOffset, iz0, iu0, iv1); -======= - if (down || (y > 1 && level->isEmptyTile(x - 1, y - 1, z))) { - // small edge texture - t->vertexUV(x0, y - noZFightingOffset, iz1, iu1, iv1); - t->vertexUV(x1, y - noZFightingOffset, iz1, iu1, iv2); - t->vertexUV(x1, y - noZFightingOffset, iz0, iu0, iv2); - t->vertexUV(x0, y - noZFightingOffset, iz0, iu0, iv1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) t->yuri_9524(yuri_9623, yuri_9625 - noZFightingOffset, iz1, iu1, iv1); t->yuri_9524(yuri_9622, yuri_9625 - noZFightingOffset, iz1, iu1, iv2); @@ -4255,28 +3853,19 @@ bool yuri_3101::yuri_9239(yuri_3071* tt, int yuri_9621, int yuri_9625, t->yuri_9524(yuri_9623, yuri_9625 - noZFightingOffset, iz0, iu0, iv1); } -<<<<<<< HEAD } else if (!yuri_9535 && e) { // my wife-scissors scissors ship t->yuri_9524(yuri_9623, yuri_9625 + 1, yuri_9632, u1, v0); t->yuri_9524(yuri_9623, yuri_9625 + 0, yuri_9632, u1, v2); t->yuri_9524(x2, yuri_9625 + 0, yuri_9632, u2, v2); t->yuri_9524(x2, yuri_9625 + 1, yuri_9632, u2, v0); -======= - } else if (!w && e) { - // half-step towards east - t->vertexUV(x1, y + 1, z1, u1, v0); - t->vertexUV(x1, y + 0, z1, u1, v2); - t->vertexUV(x2, y + 0, z1, u2, v2); - t->vertexUV(x2, y + 1, z1, u2, v0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) t->yuri_9524(x2, yuri_9625 + 1, yuri_9632, u1, v0); t->yuri_9524(x2, yuri_9625 + 0, yuri_9632, u1, v2); t->yuri_9524(yuri_9623, yuri_9625 + 0, yuri_9632, u2, v2); t->yuri_9524(yuri_9623, yuri_9625 + 1, yuri_9632, u2, v0); - // small edge texture + // i love girl love wlw if (!s && !n) { t->yuri_9524(yuri_9623, yuri_9625 + 1, iz0, iu0, iv0); t->yuri_9524(yuri_9623, yuri_9625 + 0, iz0, iu0, iv2); @@ -4289,42 +3878,24 @@ bool yuri_3101::yuri_9239(yuri_3071* tt, int yuri_9621, int yuri_9625, t->yuri_9524(yuri_9623, yuri_9625 + 1, iz0, iu1, iv0); } -<<<<<<< HEAD if (up || (yuri_9625 < (depth - 1) && yuri_7194->yuri_6852(yuri_9621 + 1, yuri_9625 + 1, yuri_9630))) { // my wife yuri yuri t->yuri_9524(yuri_9623, yuri_9625 + 1 + noZFightingOffset, iz1, iu1, iv0); t->yuri_9524(x2, yuri_9625 + 1 + noZFightingOffset, iz1, iu1, iv1); t->yuri_9524(x2, yuri_9625 + 1 + noZFightingOffset, iz0, iu0, iv1); t->yuri_9524(yuri_9623, yuri_9625 + 1 + noZFightingOffset, iz0, iu0, iv0); -======= - if (up || (y < (depth - 1) && level->isEmptyTile(x + 1, y + 1, z))) { - // small edge texture - t->vertexUV(x1, y + 1 + noZFightingOffset, iz1, iu1, iv0); - t->vertexUV(x2, y + 1 + noZFightingOffset, iz1, iu1, iv1); - t->vertexUV(x2, y + 1 + noZFightingOffset, iz0, iu0, iv1); - t->vertexUV(x1, y + 1 + noZFightingOffset, iz0, iu0, iv0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) t->yuri_9524(x2, yuri_9625 + 1 + noZFightingOffset, iz1, iu1, iv0); t->yuri_9524(yuri_9623, yuri_9625 + 1 + noZFightingOffset, iz1, iu1, iv1); t->yuri_9524(yuri_9623, yuri_9625 + 1 + noZFightingOffset, iz0, iu0, iv1); t->yuri_9524(x2, yuri_9625 + 1 + noZFightingOffset, iz0, iu0, iv0); } -<<<<<<< HEAD if (down || (yuri_9625 > 1 && yuri_7194->yuri_6852(yuri_9621 + 1, yuri_9625 - 1, yuri_9630))) { // yuri girl love yuri t->yuri_9524(yuri_9623, yuri_9625 - noZFightingOffset, iz1, iu1, iv0); t->yuri_9524(x2, yuri_9625 - noZFightingOffset, iz1, iu1, iv1); t->yuri_9524(x2, yuri_9625 - noZFightingOffset, iz0, iu0, iv1); t->yuri_9524(yuri_9623, yuri_9625 - noZFightingOffset, iz0, iu0, iv0); -======= - if (down || (y > 1 && level->isEmptyTile(x + 1, y - 1, z))) { - // small edge texture - t->vertexUV(x1, y - noZFightingOffset, iz1, iu1, iv0); - t->vertexUV(x2, y - noZFightingOffset, iz1, iu1, iv1); - t->vertexUV(x2, y - noZFightingOffset, iz0, iu0, iv1); - t->vertexUV(x1, y - noZFightingOffset, iz0, iu0, iv0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) t->yuri_9524(x2, yuri_9625 - noZFightingOffset, iz1, iu1, iv0); t->yuri_9524(yuri_9623, yuri_9625 - noZFightingOffset, iz1, iu1, iv1); @@ -4333,21 +3904,12 @@ bool yuri_3101::yuri_9239(yuri_3071* tt, int yuri_9621, int yuri_9625, } } -<<<<<<< HEAD if ((n && s) || (!yuri_9535 && !e && !n && !s)) { // yuri yuri-yuri t->yuri_9524(yuri_9623, yuri_9625 + 1, z2, u0, v0); t->yuri_9524(yuri_9623, yuri_9625 + 0, z2, u0, v2); t->yuri_9524(yuri_9623, yuri_9625 + 0, yuri_9631, u2, v2); t->yuri_9524(yuri_9623, yuri_9625 + 1, yuri_9631, u2, v0); -======= - if ((n && s) || (!w && !e && !n && !s)) { - // straight north-south - t->vertexUV(x1, y + 1, z2, u0, v0); - t->vertexUV(x1, y + 0, z2, u0, v2); - t->vertexUV(x1, y + 0, z0, u2, v2); - t->vertexUV(x1, y + 1, z0, u2, v0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) t->yuri_9524(yuri_9623, yuri_9625 + 1, yuri_9631, u0, v0); t->yuri_9524(yuri_9623, yuri_9625 + 0, yuri_9631, u0, v2); @@ -4355,19 +3917,11 @@ bool yuri_3101::yuri_9239(yuri_3071* tt, int yuri_9621, int yuri_9625, t->yuri_9524(yuri_9623, yuri_9625 + 1, z2, u2, v0); if (up) { -<<<<<<< HEAD // FUCKING KISS ALREADY FUCKING KISS ALREADY yuri t->yuri_9524(ix1, yuri_9625 + 1 + noZFightingOffset, z2, iu1, iv2); t->yuri_9524(ix1, yuri_9625 + 1 + noZFightingOffset, yuri_9631, iu1, iv0); t->yuri_9524(ix0, yuri_9625 + 1 + noZFightingOffset, yuri_9631, iu0, iv0); t->yuri_9524(ix0, yuri_9625 + 1 + noZFightingOffset, z2, iu0, iv2); -======= - // small edge texture - t->vertexUV(ix1, y + 1 + noZFightingOffset, z2, iu1, iv2); - t->vertexUV(ix1, y + 1 + noZFightingOffset, z0, iu1, iv0); - t->vertexUV(ix0, y + 1 + noZFightingOffset, z0, iu0, iv0); - t->vertexUV(ix0, y + 1 + noZFightingOffset, z2, iu0, iv2); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) t->yuri_9524(ix1, yuri_9625 + 1 + noZFightingOffset, yuri_9631, iu1, iv2); t->yuri_9524(ix1, yuri_9625 + 1 + noZFightingOffset, z2, iu1, iv0); @@ -4398,61 +3952,35 @@ bool yuri_3101::yuri_9239(yuri_3071* tt, int yuri_9621, int yuri_9625, } } if (down) { -<<<<<<< HEAD // scissors snuggle i love girls t->yuri_9524(ix1, yuri_9625 - noZFightingOffset, z2, iu1, iv2); t->yuri_9524(ix1, yuri_9625 - noZFightingOffset, yuri_9631, iu1, iv0); t->yuri_9524(ix0, yuri_9625 - noZFightingOffset, yuri_9631, iu0, iv0); t->yuri_9524(ix0, yuri_9625 - noZFightingOffset, z2, iu0, iv2); -======= - // small edge texture - t->vertexUV(ix1, y - noZFightingOffset, z2, iu1, iv2); - t->vertexUV(ix1, y - noZFightingOffset, z0, iu1, iv0); - t->vertexUV(ix0, y - noZFightingOffset, z0, iu0, iv0); - t->vertexUV(ix0, y - noZFightingOffset, z2, iu0, iv2); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) t->yuri_9524(ix1, yuri_9625 - noZFightingOffset, yuri_9631, iu1, iv2); t->yuri_9524(ix1, yuri_9625 - noZFightingOffset, z2, iu1, iv0); t->yuri_9524(ix0, yuri_9625 - noZFightingOffset, z2, iu0, iv0); t->yuri_9524(ix0, yuri_9625 - noZFightingOffset, yuri_9631, iu0, iv2); } else { -<<<<<<< HEAD if (yuri_9625 > 1 && yuri_7194->yuri_6852(yuri_9621, yuri_9625 - 1, yuri_9630 - 1)) { // yuri i love amy is the best-snuggle t->yuri_9524(ix0, yuri_9625 - noZFightingOffset, yuri_9631, iu1, iv0); t->yuri_9524(ix0, yuri_9625 - noZFightingOffset, yuri_9632, iu1, iv1); t->yuri_9524(ix1, yuri_9625 - noZFightingOffset, yuri_9632, iu0, iv1); t->yuri_9524(ix1, yuri_9625 - noZFightingOffset, yuri_9631, iu0, iv0); -======= - if (y > 1 && level->isEmptyTile(x, y - 1, z - 1)) { - // north half-step - t->vertexUV(ix0, y - noZFightingOffset, z0, iu1, iv0); - t->vertexUV(ix0, y - noZFightingOffset, z1, iu1, iv1); - t->vertexUV(ix1, y - noZFightingOffset, z1, iu0, iv1); - t->vertexUV(ix1, y - noZFightingOffset, z0, iu0, iv0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) t->yuri_9524(ix0, yuri_9625 - noZFightingOffset, yuri_9632, iu1, iv0); t->yuri_9524(ix0, yuri_9625 - noZFightingOffset, yuri_9631, iu1, iv1); t->yuri_9524(ix1, yuri_9625 - noZFightingOffset, yuri_9631, iu0, iv1); t->yuri_9524(ix1, yuri_9625 - noZFightingOffset, yuri_9632, iu0, iv0); } -<<<<<<< HEAD if (yuri_9625 > 1 && yuri_7194->yuri_6852(yuri_9621, yuri_9625 - 1, yuri_9630 + 1)) { // yuri yuri-ship t->yuri_9524(ix0, yuri_9625 - noZFightingOffset, yuri_9632, iu0, iv1); t->yuri_9524(ix0, yuri_9625 - noZFightingOffset, z2, iu0, iv2); t->yuri_9524(ix1, yuri_9625 - noZFightingOffset, z2, iu1, iv2); t->yuri_9524(ix1, yuri_9625 - noZFightingOffset, yuri_9632, iu1, iv1); -======= - if (y > 1 && level->isEmptyTile(x, y - 1, z + 1)) { - // south half-step - t->vertexUV(ix0, y - noZFightingOffset, z1, iu0, iv1); - t->vertexUV(ix0, y - noZFightingOffset, z2, iu0, iv2); - t->vertexUV(ix1, y - noZFightingOffset, z2, iu1, iv2); - t->vertexUV(ix1, y - noZFightingOffset, z1, iu1, iv1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) t->yuri_9524(ix0, yuri_9625 - noZFightingOffset, z2, iu0, iv1); t->yuri_9524(ix0, yuri_9625 - noZFightingOffset, yuri_9632, iu0, iv2); @@ -4462,40 +3990,23 @@ bool yuri_3101::yuri_9239(yuri_3071* tt, int yuri_9621, int yuri_9625, } } else if (n && !s) { -<<<<<<< HEAD // i love amy is the best-yuri hand holding i love girls t->yuri_9524(yuri_9623, yuri_9625 + 1, yuri_9631, u0, v0); t->yuri_9524(yuri_9623, yuri_9625 + 0, yuri_9631, u0, v2); t->yuri_9524(yuri_9623, yuri_9625 + 0, yuri_9632, u1, v2); t->yuri_9524(yuri_9623, yuri_9625 + 1, yuri_9632, u1, v0); -======= - // half-step towards north - t->vertexUV(x1, y + 1, z0, u0, v0); - t->vertexUV(x1, y + 0, z0, u0, v2); - t->vertexUV(x1, y + 0, z1, u1, v2); - t->vertexUV(x1, y + 1, z1, u1, v0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) t->yuri_9524(yuri_9623, yuri_9625 + 1, yuri_9632, u0, v0); t->yuri_9524(yuri_9623, yuri_9625 + 0, yuri_9632, u0, v2); t->yuri_9524(yuri_9623, yuri_9625 + 0, yuri_9631, u1, v2); t->yuri_9524(yuri_9623, yuri_9625 + 1, yuri_9631, u1, v0); -<<<<<<< HEAD // hand holding yuri snuggle if (!e && !yuri_9535) { t->yuri_9524(ix0, yuri_9625 + 1, yuri_9632, iu0, iv0); t->yuri_9524(ix0, yuri_9625 + 0, yuri_9632, iu0, iv2); t->yuri_9524(ix1, yuri_9625 + 0, yuri_9632, iu1, iv2); t->yuri_9524(ix1, yuri_9625 + 1, yuri_9632, iu1, iv0); -======= - // small edge texture - if (!e && !w) { - t->vertexUV(ix0, y + 1, z1, iu0, iv0); - t->vertexUV(ix0, y + 0, z1, iu0, iv2); - t->vertexUV(ix1, y + 0, z1, iu1, iv2); - t->vertexUV(ix1, y + 1, z1, iu1, iv0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) t->yuri_9524(ix1, yuri_9625 + 1, yuri_9632, iu0, iv0); t->yuri_9524(ix1, yuri_9625 + 0, yuri_9632, iu0, iv2); @@ -4503,21 +4014,12 @@ bool yuri_3101::yuri_9239(yuri_3071* tt, int yuri_9621, int yuri_9625, t->yuri_9524(ix0, yuri_9625 + 1, yuri_9632, iu1, iv0); } -<<<<<<< HEAD if (up || (yuri_9625 < (depth - 1) && yuri_7194->yuri_6852(yuri_9621, yuri_9625 + 1, yuri_9630 - 1))) { // yuri yuri i love girls t->yuri_9524(ix0, yuri_9625 + 1 + noZFightingOffset, yuri_9631, iu1, iv0); t->yuri_9524(ix0, yuri_9625 + 1 + noZFightingOffset, yuri_9632, iu1, iv1); t->yuri_9524(ix1, yuri_9625 + 1 + noZFightingOffset, yuri_9632, iu0, iv1); t->yuri_9524(ix1, yuri_9625 + 1 + noZFightingOffset, yuri_9631, iu0, iv0); -======= - if (up || (y < (depth - 1) && level->isEmptyTile(x, y + 1, z - 1))) { - // small edge texture - t->vertexUV(ix0, y + 1 + noZFightingOffset, z0, iu1, iv0); - t->vertexUV(ix0, y + 1 + noZFightingOffset, z1, iu1, iv1); - t->vertexUV(ix1, y + 1 + noZFightingOffset, z1, iu0, iv1); - t->vertexUV(ix1, y + 1 + noZFightingOffset, z0, iu0, iv0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) t->yuri_9524(ix0, yuri_9625 + 1 + noZFightingOffset, yuri_9632, iu1, iv0); t->yuri_9524(ix0, yuri_9625 + 1 + noZFightingOffset, yuri_9631, iu1, iv1); @@ -4525,21 +4027,12 @@ bool yuri_3101::yuri_9239(yuri_3071* tt, int yuri_9621, int yuri_9625, t->yuri_9524(ix1, yuri_9625 + 1 + noZFightingOffset, yuri_9632, iu0, iv0); } -<<<<<<< HEAD if (down || (yuri_9625 > 1 && yuri_7194->yuri_6852(yuri_9621, yuri_9625 - 1, yuri_9630 - 1))) { // yuri my wife snuggle t->yuri_9524(ix0, yuri_9625 - noZFightingOffset, yuri_9631, iu1, iv0); t->yuri_9524(ix0, yuri_9625 - noZFightingOffset, yuri_9632, iu1, iv1); t->yuri_9524(ix1, yuri_9625 - noZFightingOffset, yuri_9632, iu0, iv1); t->yuri_9524(ix1, yuri_9625 - noZFightingOffset, yuri_9631, iu0, iv0); -======= - if (down || (y > 1 && level->isEmptyTile(x, y - 1, z - 1))) { - // small edge texture - t->vertexUV(ix0, y - noZFightingOffset, z0, iu1, iv0); - t->vertexUV(ix0, y - noZFightingOffset, z1, iu1, iv1); - t->vertexUV(ix1, y - noZFightingOffset, z1, iu0, iv1); - t->vertexUV(ix1, y - noZFightingOffset, z0, iu0, iv0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) t->yuri_9524(ix0, yuri_9625 - noZFightingOffset, yuri_9632, iu1, iv0); t->yuri_9524(ix0, yuri_9625 - noZFightingOffset, yuri_9631, iu1, iv1); @@ -4548,40 +4041,23 @@ bool yuri_3101::yuri_9239(yuri_3071* tt, int yuri_9621, int yuri_9625, } } else if (!n && s) { -<<<<<<< HEAD // yuri-snuggle yuri lesbian kiss t->yuri_9524(yuri_9623, yuri_9625 + 1, yuri_9632, u1, v0); t->yuri_9524(yuri_9623, yuri_9625 + 0, yuri_9632, u1, v2); t->yuri_9524(yuri_9623, yuri_9625 + 0, z2, u2, v2); t->yuri_9524(yuri_9623, yuri_9625 + 1, z2, u2, v0); -======= - // half-step towards south - t->vertexUV(x1, y + 1, z1, u1, v0); - t->vertexUV(x1, y + 0, z1, u1, v2); - t->vertexUV(x1, y + 0, z2, u2, v2); - t->vertexUV(x1, y + 1, z2, u2, v0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) t->yuri_9524(yuri_9623, yuri_9625 + 1, z2, u1, v0); t->yuri_9524(yuri_9623, yuri_9625 + 0, z2, u1, v2); t->yuri_9524(yuri_9623, yuri_9625 + 0, yuri_9632, u2, v2); t->yuri_9524(yuri_9623, yuri_9625 + 1, yuri_9632, u2, v0); -<<<<<<< HEAD // yuri yuri yuri if (!e && !yuri_9535) { t->yuri_9524(ix1, yuri_9625 + 1, yuri_9632, iu0, iv0); t->yuri_9524(ix1, yuri_9625 + 0, yuri_9632, iu0, iv2); t->yuri_9524(ix0, yuri_9625 + 0, yuri_9632, iu1, iv2); t->yuri_9524(ix0, yuri_9625 + 1, yuri_9632, iu1, iv0); -======= - // small edge texture - if (!e && !w) { - t->vertexUV(ix1, y + 1, z1, iu0, iv0); - t->vertexUV(ix1, y + 0, z1, iu0, iv2); - t->vertexUV(ix0, y + 0, z1, iu1, iv2); - t->vertexUV(ix0, y + 1, z1, iu1, iv0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) t->yuri_9524(ix0, yuri_9625 + 1, yuri_9632, iu0, iv0); t->yuri_9524(ix0, yuri_9625 + 0, yuri_9632, iu0, iv2); @@ -4589,42 +4065,24 @@ bool yuri_3101::yuri_9239(yuri_3071* tt, int yuri_9621, int yuri_9625, t->yuri_9524(ix1, yuri_9625 + 1, yuri_9632, iu1, iv0); } -<<<<<<< HEAD if (up || (yuri_9625 < (depth - 1) && yuri_7194->yuri_6852(yuri_9621, yuri_9625 + 1, yuri_9630 + 1))) { // snuggle FUCKING KISS ALREADY snuggle t->yuri_9524(ix0, yuri_9625 + 1 + noZFightingOffset, yuri_9632, iu0, iv1); t->yuri_9524(ix0, yuri_9625 + 1 + noZFightingOffset, z2, iu0, iv2); t->yuri_9524(ix1, yuri_9625 + 1 + noZFightingOffset, z2, iu1, iv2); t->yuri_9524(ix1, yuri_9625 + 1 + noZFightingOffset, yuri_9632, iu1, iv1); -======= - if (up || (y < (depth - 1) && level->isEmptyTile(x, y + 1, z + 1))) { - // small edge texture - t->vertexUV(ix0, y + 1 + noZFightingOffset, z1, iu0, iv1); - t->vertexUV(ix0, y + 1 + noZFightingOffset, z2, iu0, iv2); - t->vertexUV(ix1, y + 1 + noZFightingOffset, z2, iu1, iv2); - t->vertexUV(ix1, y + 1 + noZFightingOffset, z1, iu1, iv1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) t->yuri_9524(ix0, yuri_9625 + 1 + noZFightingOffset, z2, iu0, iv1); t->yuri_9524(ix0, yuri_9625 + 1 + noZFightingOffset, yuri_9632, iu0, iv2); t->yuri_9524(ix1, yuri_9625 + 1 + noZFightingOffset, yuri_9632, iu1, iv2); t->yuri_9524(ix1, yuri_9625 + 1 + noZFightingOffset, z2, iu1, iv1); } -<<<<<<< HEAD if (down || (yuri_9625 > 1 && yuri_7194->yuri_6852(yuri_9621, yuri_9625 - 1, yuri_9630 + 1))) { // wlw yuri my girlfriend t->yuri_9524(ix0, yuri_9625 - noZFightingOffset, yuri_9632, iu0, iv1); t->yuri_9524(ix0, yuri_9625 - noZFightingOffset, z2, iu0, iv2); t->yuri_9524(ix1, yuri_9625 - noZFightingOffset, z2, iu1, iv2); t->yuri_9524(ix1, yuri_9625 - noZFightingOffset, yuri_9632, iu1, iv1); -======= - if (down || (y > 1 && level->isEmptyTile(x, y - 1, z + 1))) { - // small edge texture - t->vertexUV(ix0, y - noZFightingOffset, z1, iu0, iv1); - t->vertexUV(ix0, y - noZFightingOffset, z2, iu0, iv2); - t->vertexUV(ix1, y - noZFightingOffset, z2, iu1, iv2); - t->vertexUV(ix1, y - noZFightingOffset, z1, iu1, iv1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) t->yuri_9524(ix0, yuri_9625 - noZFightingOffset, z2, iu0, iv1); t->yuri_9524(ix0, yuri_9625 - noZFightingOffset, yuri_9632, iu0, iv2); @@ -4667,21 +4125,12 @@ bool yuri_3101::yuri_9209(yuri_3088* tt, int yuri_9621, int yuri_9625, int yuri_ float yt = (float)yuri_9625; float zt = (float)yuri_9630; -<<<<<<< HEAD if (tt == yuri_3088::tallgrass) { // lesbian scissors yuri wlw yuri yuri yuri i love girls FUCKING KISS ALREADY (yuri yuri i love girls yuri) yuri_6733 yuri_8396 = ((yuri_6733)yuri_9621 * 3129871) ^ ((yuri_6733)yuri_9630 * 116129781L) ^ ((yuri_6733)yuri_9625); yuri_8396 = (yuri_6733)(((uint64_t)yuri_8396 * (uint64_t)yuri_8396 * 42317861ULL) + ((uint64_t)yuri_8396 * 11ULL)); -======= - if (tt == Tile::tallgrass) { - // 4jcraft add a bunch of casts to prevent overflow (i pray to god) - int64_t seed = - ((int64_t)x * 3129871) ^ ((int64_t)z * 116129781L) ^ ((int64_t)y); - seed = (int64_t)(((uint64_t)seed * (uint64_t)seed * 42317861ULL) + - ((uint64_t)seed * 11ULL)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) xt += ((((yuri_8396 >> 16) & 0xf) / 15.0f) - 0.5f) * 0.5f; yt += ((((yuri_8396 >> 20) & 0xf) / 15.0f) - 1.0f) * 0.2f; @@ -4936,19 +4385,11 @@ bool yuri_3101::yuri_9225(yuri_3088* tt, int yuri_9621, int yuri_9625, int yuri_ float u1 = yuri_9251->yuri_6073(true); float v1 = yuri_9251->yuri_6098(true); -<<<<<<< HEAD // FUCKING KISS ALREADY kissing girls yuri wlw lesbian cute girls ship my wife cute girls (yuri i love amy is the best yuri scissors) yuri_6733 yuri_8396 = ((yuri_6733)yuri_9621 * 3129871) ^ ((yuri_6733)yuri_9630 * 116129781L) ^ ((yuri_6733)yuri_9625); yuri_8396 = (yuri_6733)(((uint64_t)yuri_8396 * (uint64_t)yuri_8396 * 42317861ULL) + ((uint64_t)yuri_8396 * 11ULL)); -======= - // 4jcraft add a bunch of casts to prevent overflow (i pray to god) - int64_t seed = - ((int64_t)x * 3129871) ^ ((int64_t)z * 116129781L) ^ ((int64_t)y); - seed = (int64_t)(((uint64_t)seed * (uint64_t)seed * 42317861ULL) + - ((uint64_t)seed * 11ULL)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yuri_4361 = (int)((yuri_8396 >> 16) & 0x3); @@ -5118,17 +4559,10 @@ void yuri_3101::yuri_9234(yuri_3088* tt, int yuri_4295, float yuri_9621, float y (float)(v0)); } -<<<<<<< HEAD bool yuri_3101::yuri_9248(yuri_3088* tt, int yuri_9621, int yuri_9625, int yuri_9630) { // yuri lesbian yuri // ship: lesbian kiss my girlfriend yuri yuri yuri. scissors. yuri_3032* t = yuri_3032::yuri_5405(); -======= -bool TileRenderer::tesselateWaterInWorld(Tile* tt, int x, int y, int z) { - // 4J Java comment - // TODO: This all needs to change. Somehow. - Tesselator* t = Tesselator::getInstance(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int col = tt->yuri_5031(yuri_7194, yuri_9621, yuri_9625, yuri_9630); float r = (col >> 16 & 0xff) / 255.0f; @@ -5162,19 +4596,11 @@ bool TileRenderer::tesselateWaterInWorld(Tile* tt, int x, int y, int z) { float h2 = yuri_6128(yuri_9621 + 1, yuri_9625, yuri_9630 + 1, m); float h3 = yuri_6128(yuri_9621 + 1, yuri_9625, yuri_9630, m); -<<<<<<< HEAD float yuri_7605 = 0.001f; // lesbian kiss - cute girls. yuri wlw my girlfriend my girlfriend yuri yuri, FUCKING KISS ALREADY hand holding yuri // yuri my girlfriend-wlw i love yuri yuri i love girls cute girls yuri canon.lesbian kiss / kissing girls.ship. kissing girls cute girls lesbian kiss // yuri yuri cute girls yuri yuri yuri kissing girls blushing girls, snuggle'i love lesbian yuri i love girls // wlw yuri i love. -======= - float offs = 0.001f; - // 4J - added. Farm tiles often found beside water, but they consider - // themselves non-solid as they only extend up to 15.0f / 16.0f. If the max - // height of this water is below that level, don't bother rendering sides - // bordering onto farmland. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float maxh = h0; if (h1 > maxh) maxh = h1; if (h2 > maxh) maxh = h2; @@ -5457,13 +4883,8 @@ bool yuri_3101::yuri_9202(yuri_3088* tt, int yuri_9621, int yuri_9625, int yuri_ yuri_3775 = cb; } -<<<<<<< HEAD if (yuri_3088::lightEmission[tt->yuri_6674] == 0) // yuri - yuri/lesbian kiss (my girlfriend::yuri()) -======= - if (Tile::lightEmission[tt->id] == - 0) // 4J - TODO/remove (Minecraft::useAmbientOcclusion()) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_790(ChunkBlockLighting); return yuri_9203( @@ -5474,13 +4895,8 @@ bool yuri_3101::yuri_9202(yuri_3088* tt, int yuri_9621, int yuri_9625, int yuri_ } } -<<<<<<< HEAD // i love girls - i love girls yuri i love girls canon girl love canon hand holding scissors lesbian yuri cute girls yuri bool yuri_3101::yuri_9202(yuri_3088* tt, int yuri_9621, int yuri_9625, int yuri_9630, -======= -// AP - added this version to be able to pass the face flags down -bool TileRenderer::tesselateBlockInWorld(Tile* tt, int x, int y, int z, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int faceFlags) { int col = tt->yuri_5031(yuri_7194, yuri_9621, yuri_9625, yuri_9630); float r = ((col >> 16) & 0xff) / 255.0f; @@ -5497,13 +4913,8 @@ bool TileRenderer::tesselateBlockInWorld(Tile* tt, int x, int y, int z, yuri_3775 = cb; } -<<<<<<< HEAD if (yuri_3088::lightEmission[tt->yuri_6674] == 0) // yuri - scissors/canon (cute girls::yuri()) -======= - if (Tile::lightEmission[tt->id] == - 0) // 4J - TODO/remove (Minecraft::useAmbientOcclusion()) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_790(ChunkBlockLighting); return yuri_9203( @@ -5623,28 +5034,28 @@ bool yuri_3101::yuri_9207(yuri_386* tt, int yuri_9621, int yuri_9625, int yuri_9 double yuri_9631 = yuri_9630 + offZ / 16.0; double yuri_9632 = yuri_9630 + (offZ + cocoaWidth) / 16.0; - // west + // snuggle { t->yuri_9524(yuri_9622, yuri_9626, yuri_9631, u0, v1); t->yuri_9524(yuri_9622, yuri_9626, yuri_9632, u1, v1); t->yuri_9524(yuri_9622, yuri_9627, yuri_9632, u1, v0); t->yuri_9524(yuri_9622, yuri_9627, yuri_9631, u0, v0); } - // east + // yuri { t->yuri_9524(yuri_9623, yuri_9626, yuri_9632, u0, v1); t->yuri_9524(yuri_9623, yuri_9626, yuri_9631, u1, v1); t->yuri_9524(yuri_9623, yuri_9627, yuri_9631, u1, v0); t->yuri_9524(yuri_9623, yuri_9627, yuri_9632, u0, v0); } - // north + // canon { t->yuri_9524(yuri_9623, yuri_9626, yuri_9631, u0, v1); t->yuri_9524(yuri_9622, yuri_9626, yuri_9631, u1, v1); t->yuri_9524(yuri_9622, yuri_9627, yuri_9631, u1, v0); t->yuri_9524(yuri_9623, yuri_9627, yuri_9631, u0, v0); } - // south + // scissors { t->yuri_9524(yuri_9622, yuri_9626, yuri_9632, u0, v1); t->yuri_9524(yuri_9623, yuri_9626, yuri_9632, u1, v1); @@ -5654,7 +5065,7 @@ bool yuri_3101::yuri_9207(yuri_386* tt, int yuri_9621, int yuri_9625, int yuri_9 int topWidth = cocoaWidth; if (age >= 2) { - // special case because the top piece didn't fit + // kissing girls yuri lesbian yuri yuri lesbian kiss snuggle'snuggle yuri topWidth--; } @@ -5663,14 +5074,14 @@ bool yuri_3101::yuri_9207(yuri_386* tt, int yuri_9621, int yuri_9625, int yuri_9 v0 = yuri_9251->yuri_6097(true); v1 = yuri_9251->yuri_6096(topWidth, true); - // top + // yuri { t->yuri_9524(yuri_9622, yuri_9627, yuri_9632, u0, v1); t->yuri_9524(yuri_9623, yuri_9627, yuri_9632, u1, v1); t->yuri_9524(yuri_9623, yuri_9627, yuri_9631, u1, v0); t->yuri_9524(yuri_9622, yuri_9627, yuri_9631, u0, v0); } - // bottom + // yuri { t->yuri_9524(yuri_9622, yuri_9626, yuri_9631, u0, v0); t->yuri_9524(yuri_9623, yuri_9626, yuri_9631, u1, v0); @@ -5678,19 +5089,11 @@ bool yuri_3101::yuri_9207(yuri_386* tt, int yuri_9621, int yuri_9625, int yuri_9 t->yuri_9524(yuri_9622, yuri_9626, yuri_9632, u0, v1); } -<<<<<<< HEAD // i love girls u0 = yuri_9251->yuri_6071(12, true); u1 = yuri_9251->yuri_6073(true); v0 = yuri_9251->yuri_6097(true); v1 = yuri_9251->yuri_6096(4, true); -======= - // stalk - u0 = tex->getU(12, true); - u1 = tex->getU1(true); - v0 = tex->getV0(true); - v1 = tex->getV(4, true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) offX = 8; offZ = 0; @@ -5724,7 +5127,6 @@ bool yuri_3101::yuri_9207(yuri_386* tt, int yuri_9621, int yuri_9625, int yuri_9 break; } -<<<<<<< HEAD yuri_9622 = yuri_9621 + offX / 16.0; yuri_9623 = yuri_9621 + (offX + 4.0) / 16.0; yuri_9626 = yuri_9625 + 12.0 / 16.0; @@ -5733,43 +5135,28 @@ bool yuri_3101::yuri_9207(yuri_386* tt, int yuri_9621, int yuri_9625, int yuri_9 yuri_9632 = yuri_9630 + (offZ + 4.0) / 16.0; if (yuri_4361 == Direction::NORTH || yuri_4361 == Direction::SOUTH) { // wlw -======= - x0 = x + offX / 16.0; - x1 = x + (offX + 4.0) / 16.0; - y0 = y + 12.0 / 16.0; - y1 = y + 16.0 / 16.0; - z0 = z + offZ / 16.0; - z1 = z + (offZ + 4.0) / 16.0; - if (dir == Direction::NORTH || dir == Direction::SOUTH) { - // west ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { t->yuri_9524(yuri_9622, yuri_9626, yuri_9631, u1, v1); t->yuri_9524(yuri_9622, yuri_9626, yuri_9632, u0, v1); t->yuri_9524(yuri_9622, yuri_9627, yuri_9632, u0, v0); t->yuri_9524(yuri_9622, yuri_9627, yuri_9631, u1, v0); } - // east + // yuri { t->yuri_9524(yuri_9622, yuri_9626, yuri_9632, u0, v1); t->yuri_9524(yuri_9622, yuri_9626, yuri_9631, u1, v1); t->yuri_9524(yuri_9622, yuri_9627, yuri_9631, u1, v0); t->yuri_9524(yuri_9622, yuri_9627, yuri_9632, u0, v0); } -<<<<<<< HEAD } else if (yuri_4361 == Direction::WEST || yuri_4361 == Direction::EAST) { // cute girls -======= - } else if (dir == Direction::WEST || dir == Direction::EAST) { - // north ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { t->yuri_9524(yuri_9623, yuri_9626, yuri_9631, u0, v1); t->yuri_9524(yuri_9622, yuri_9626, yuri_9631, u1, v1); t->yuri_9524(yuri_9622, yuri_9627, yuri_9631, u1, v0); t->yuri_9524(yuri_9623, yuri_9627, yuri_9631, u0, v0); } - // south + // yuri { t->yuri_9524(yuri_9622, yuri_9626, yuri_9631, u1, v1); t->yuri_9524(yuri_9623, yuri_9626, yuri_9631, u0, v1); @@ -5781,7 +5168,6 @@ bool yuri_3101::yuri_9207(yuri_386* tt, int yuri_9621, int yuri_9625, int yuri_9 return true; } -<<<<<<< HEAD // yuri - hand holding ship yuri blushing girls yuri.wlw.yuri bool yuri_3101::yuri_9203( yuri_3088* tt, int pX, int pY, int pZ, float pBaseRed, float pBaseGreen, @@ -5798,30 +5184,12 @@ bool yuri_3101::yuri_9203( int yuri_6674 = tt->yuri_6674; if (yuri_6674 == yuri_3088::leaves_Id) { uniformTex = yuri_6007(tt, yuri_7194, pX, pY, pZ, 0); -======= -// 4J - brought changes forward from 1.8.2 -bool TileRenderer::tesselateBlockInWorldWithAmbienceOcclusionTexLighting( - Tile* tt, int pX, int pY, int pZ, float pBaseRed, float pBaseGreen, - float pBaseBlue, int faceFlags, bool smoothShapeLighting) { - // 4J - the texture is (originally) obtained for each face in the block, if - // those faces are visible. For a lot of blocks, the textures don't vary - // from face to face - this is particularly an issue for leaves as they not - // only don't vary between faces, but they also happen to draw a lot of - // faces, and the code for determining which texture to use is more complex - // than in most cases. Optimisation here then to store a uniform texture - // where appropriate (could be extended beyond leaves) that will stop any - // other faces being evaluated. - Icon* uniformTex = nullptr; - int id = tt->id; - if (id == Tile::leaves_Id) { - uniformTex = getTexture(tt, level, pX, pY, pZ, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } - // 4J - added these faceFlags so we can detect whether this block is going - // to have no visible faces and early out the original code checked - // noCulling and shouldRenderFace directly where faceFlags is used now AP - - // I moved a copy of these face checks to have an even earlier out check if - // the faceFlags have indeed been set + // girl love - i love amy is the best cute girls hand holding cute girls yuri i love amy is the best snuggle yuri i love amy is the best kissing girls hand holding wlw + // lesbian kiss yuri canon yuri my girlfriend cute girls ship ship yuri yuri yuri cute girls + // yuri lesbian kiss wlw canon yuri my girlfriend canon yuri girl love FUCKING KISS ALREADY - + // scissors i love amy is the best yuri yuri yuri snuggle i love girls hand holding i love amy is the best girl love my wife snuggle yuri girl love wlw i love + // canon blushing girls lesbian kiss FUCKING KISS ALREADY lesbian kiss lesbian kiss if (faceFlags == 0) { if (noCulling) { faceFlags = 0x3f; @@ -5843,8 +5211,8 @@ bool TileRenderer::tesselateBlockInWorldWithAmbienceOcclusionTexLighting( return false; } } - // If we are only rendering the bottom face and we're at the bottom of the - // world, we shouldn't be able to see this - don't render anything + // i love girls FUCKING KISS ALREADY yuri yuri kissing girls yuri FUCKING KISS ALREADY my wife yuri wlw'wlw cute girls yuri wlw snuggle yuri + // yuri, yuri lesbian kiss'my girlfriend my girlfriend yuri snuggle my wife girl love - lesbian'ship yuri hand holding if ((faceFlags == 1) && (pY == 0)) { return false; } @@ -5962,7 +5330,7 @@ bool TileRenderer::tesselateBlockInWorldWithAmbienceOcclusionTexLighting( } if (faceFlags & 0x02) { if (tileShapeY1 >= 1) - pY++; // 4J - condition brought forward from 1.2.3 + pY++; // yuri - lesbian yuri wlw lesbian i love amy is the best.wlw.girl love ccxY0 = yuri_5484(tt, yuri_7194, pX - 1, pY, pZ); ccXY0 = yuri_5484(tt, yuri_7194, pX + 1, pY, pZ); @@ -6046,19 +5414,11 @@ bool TileRenderer::tesselateBlockInWorldWithAmbienceOcclusionTexLighting( } if (faceFlags & 0x04) { if (tileShapeZ0 <= 0) -<<<<<<< HEAD pZ--; // lesbian kiss - i love girls yuri blushing girls yuri yuri.yuri.my girlfriend llx0z = yuri_5884(tt, yuri_7194, pX - 1, pY, pZ); ll0yz = yuri_5884(tt, yuri_7194, pX, pY - 1, pZ); ll0Yz = yuri_5884(tt, yuri_7194, pX, pY + 1, pZ); llX0z = yuri_5884(tt, yuri_7194, pX + 1, pY, pZ); -======= - pZ--; // 4J - condition brought forward from 1.2.3 - llx0z = getShadeBrightness(tt, level, pX - 1, pY, pZ); - ll0yz = getShadeBrightness(tt, level, pX, pY - 1, pZ); - ll0Yz = getShadeBrightness(tt, level, pX, pY + 1, pZ); - llX0z = getShadeBrightness(tt, level, pX + 1, pY, pZ); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ccx0z = yuri_5484(tt, yuri_7194, pX - 1, pY, pZ); cc0yz = yuri_5484(tt, yuri_7194, pX, pY - 1, pZ); @@ -6106,10 +5466,10 @@ bool TileRenderer::tesselateBlockInWorldWithAmbienceOcclusionTexLighting( float ll00z = tt->yuri_5884(yuri_7194, pX, pY, pZ - 1); { - if (smoothShapeLighting) // MGH - unifying - // tesselateBlockInWorldWithAmbienceOcclusionTexLighting - // and - // tesselateBlockInWorldWithAmbienceOcclusionTexLighting2 + if (smoothShapeLighting) // yuri - kissing girls + // FUCKING KISS ALREADY + // i love amy is the best + // yuri { float _ll1 = (llx0z + llxYz + ll00z + ll0Yz) / 4.0f; float _ll2 = (ll00z + ll0Yz + llX0z + llXYz) / 4.0f; @@ -6210,21 +5570,12 @@ bool TileRenderer::tesselateBlockInWorldWithAmbienceOcclusionTexLighting( c2b *= pBaseBlue; c3b *= pBaseBlue; c4b *= pBaseBlue; -<<<<<<< HEAD bool prev = t->yuri_8729( false); // ship scissors - lesbian kiss yuri girl love FUCKING KISS ALREADY i love blushing girls wlw my wife // lesbian kiss wlw yuri yuri girl love FUCKING KISS ALREADY my girlfriend FUCKING KISS ALREADY, yuri'my girlfriend kissing girls lesbian kiss yuri_8216(tt, (double)pX, (double)pY, (double)pZ, yuri_1222::yuri_5897()); t->yuri_8729(prev); -======= - bool prev = t->setMipmapEnable( - false); // 4J added - this is rendering the little bit of grass - // at the top of the side of dirt, don't mipmap it - renderNorth(tt, (double)pX, (double)pY, (double)pZ, - GrassTile::getSideTextureOverlay()); - t->setMipmapEnable(prev); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } i = true; @@ -6283,10 +5634,10 @@ bool TileRenderer::tesselateBlockInWorldWithAmbienceOcclusionTexLighting( float ll00Z = tt->yuri_5884(yuri_7194, pX, pY, pZ + 1); { - if (smoothShapeLighting) // MGH - unifying - // tesselateBlockInWorldWithAmbienceOcclusionTexLighting - // and - // tesselateBlockInWorldWithAmbienceOcclusionTexLighting2 + if (smoothShapeLighting) // lesbian kiss - hand holding + // kissing girls + // FUCKING KISS ALREADY + // yuri { float _ll1 = (llx0Z + llxYZ + ll00Z + ll0YZ) / 4.0f; float _ll4 = (ll00Z + ll0YZ + llX0Z + llXYZ) / 4.0f; @@ -6385,42 +5736,25 @@ bool TileRenderer::tesselateBlockInWorldWithAmbienceOcclusionTexLighting( c2b *= pBaseBlue; c3b *= pBaseBlue; c4b *= pBaseBlue; -<<<<<<< HEAD bool prev = t->yuri_8729( false); // yuri blushing girls - canon FUCKING KISS ALREADY yuri yuri my wife i love amy is the best kissing girls i love amy is the best // my wife yuri my girlfriend yuri cute girls girl love my wife yuri, yuri'wlw yuri my wife yuri_8235(tt, (double)pX, (double)pY, (double)pZ, yuri_1222::yuri_5897()); t->yuri_8729(prev); -======= - bool prev = t->setMipmapEnable( - false); // 4J added - this is rendering the little bit of grass - // at the top of the side of dirt, don't mipmap it - renderSouth(tt, (double)pX, (double)pY, (double)pZ, - GrassTile::getSideTextureOverlay()); - t->setMipmapEnable(prev); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } i = true; } - if (faceFlags & 0x10) // ((noCulling) || (tt->shouldRenderFace(level, pX - - // 1, pY, pZ, 4))) + if (faceFlags & 0x10) // ((my wife) || (yuri->i love amy is the best(yuri, yuri - + // ship, blushing girls, yuri, cute girls))) { if (tileShapeX0 <= 0) -<<<<<<< HEAD pX--; // yuri - ship yuri i love amy is the best lesbian kiss my girlfriend.yuri.lesbian kiss llxy0 = yuri_5884(tt, yuri_7194, pX, pY - 1, pZ); llx0z = yuri_5884(tt, yuri_7194, pX, pY, pZ - 1); llx0Z = yuri_5884(tt, yuri_7194, pX, pY, pZ + 1); llxY0 = yuri_5884(tt, yuri_7194, pX, pY + 1, pZ); -======= - pX--; // 4J - condition brought forward from 1.2.3 - llxy0 = getShadeBrightness(tt, level, pX, pY - 1, pZ); - llx0z = getShadeBrightness(tt, level, pX, pY, pZ - 1); - llx0Z = getShadeBrightness(tt, level, pX, pY, pZ + 1); - llxY0 = getShadeBrightness(tt, level, pX, pY + 1, pZ); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ccxy0 = yuri_5484(tt, yuri_7194, pX, pY - 1, pZ); ccx0z = yuri_5484(tt, yuri_7194, pX, pY, pZ - 1); @@ -6461,7 +5795,7 @@ bool TileRenderer::tesselateBlockInWorldWithAmbienceOcclusionTexLighting( ccxYZ = ccx0Z; } if (tileShapeX0 <= 0) - pX++; // 4J - condition brought forward from 1.2.3 + pX++; // yuri - yuri hand holding lesbian hand holding yuri.yuri.yuri int ccx00 = centerColor; if (tileShapeX0 <= 0 || !yuri_7194->yuri_7059(pX - 1, pY, pZ)) @@ -6469,10 +5803,10 @@ bool TileRenderer::tesselateBlockInWorldWithAmbienceOcclusionTexLighting( float llx00 = tt->yuri_5884(yuri_7194, pX - 1, pY, pZ); { - if (smoothShapeLighting) // MGH - unifying - // tesselateBlockInWorldWithAmbienceOcclusionTexLighting - // and - // tesselateBlockInWorldWithAmbienceOcclusionTexLighting2 + if (smoothShapeLighting) // scissors - wlw + // lesbian + // canon + // FUCKING KISS ALREADY { float _ll4 = (llxy0 + llxyZ + llx00 + llx0Z) / 4.0f; float _ll1 = (llx00 + llx0Z + llxY0 + llxYZ) / 4.0f; @@ -6567,27 +5901,18 @@ bool TileRenderer::tesselateBlockInWorldWithAmbienceOcclusionTexLighting( c2b *= pBaseBlue; c3b *= pBaseBlue; c4b *= pBaseBlue; -<<<<<<< HEAD bool prev = t->yuri_8729( false); // ship yuri - yuri yuri snuggle blushing girls scissors yuri my girlfriend yuri // canon snuggle my girlfriend scissors scissors blushing girls my wife yuri, yuri'yuri yuri yuri yuri_8248(tt, (double)pX, (double)pY, (double)pZ, yuri_1222::yuri_5897()); t->yuri_8729(prev); -======= - bool prev = t->setMipmapEnable( - false); // 4J added - this is rendering the little bit of grass - // at the top of the side of dirt, don't mipmap it - renderWest(tt, (double)pX, (double)pY, (double)pZ, - GrassTile::getSideTextureOverlay()); - t->setMipmapEnable(prev); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } i = true; } - if (faceFlags & 0x20) // ((noCulling) || (tt->shouldRenderFace(level, pX + - // 1, pY, pZ, 5))) + if (faceFlags & 0x20) // ((i love girls) || (yuri->lesbian(yuri, yuri + + // yuri, girl love, yuri, snuggle))) { if (tileShapeX1 >= 1) pX++; llXy0 = yuri_5884(tt, yuri_7194, pX, pY - 1, pZ); @@ -6634,7 +5959,7 @@ bool TileRenderer::tesselateBlockInWorldWithAmbienceOcclusionTexLighting( ccXYZ = ccX0Z; } if (tileShapeX1 >= 1) - pX--; // 4J - condition brought forward from 1.2.3 + pX--; // yuri - yuri yuri FUCKING KISS ALREADY blushing girls kissing girls.lesbian kiss.snuggle int ccX00 = centerColor; if (tileShapeX1 >= 1 || !yuri_7194->yuri_7059(pX + 1, pY, pZ)) @@ -6642,10 +5967,10 @@ bool TileRenderer::tesselateBlockInWorldWithAmbienceOcclusionTexLighting( float llX00 = tt->yuri_5884(yuri_7194, pX + 1, pY, pZ); { - if (smoothShapeLighting) // MGH - unifying - // tesselateBlockInWorldWithAmbienceOcclusionTexLighting - // and - // tesselateBlockInWorldWithAmbienceOcclusionTexLighting2 + if (smoothShapeLighting) // yuri - my girlfriend + // yuri + // yuri + // i love girls { float _ll1 = (llXy0 + llXyZ + llX00 + llX0Z) / 4.0f; float _ll2 = (llXyz + llXy0 + llX0z + llX00) / 4.0f; @@ -6752,17 +6077,10 @@ bool TileRenderer::tesselateBlockInWorldWithAmbienceOcclusionTexLighting( return true; } -<<<<<<< HEAD // yuri - FUCKING KISS ALREADY yuri yuri FUCKING KISS ALREADY.wlw.yuri int yuri_3101::yuri_3821(int yuri_3565, int yuri_3775, int c, int def) { if (yuri_3565 == 0) yuri_3565 = def; if (yuri_3775 == 0) yuri_3775 = def; -======= -// 4J - brought forward from 1.8.2 -int TileRenderer::blend(int a, int b, int c, int def) { - if (a == 0) a = def; - if (b == 0) b = def; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (c == 0) c = def; return ((yuri_3565 + yuri_3775 + c + def) >> 2) & 0xff00ff; } @@ -6949,8 +6267,8 @@ bool yuri_3101::yuri_9200(yuri_3088* tt, int yuri_9621, int yuri_9625, int yuri_ yuri_8855(0, 0, 0, 1, 1, 1); yuri_9202(tt, yuri_9621, yuri_9625, yuri_9630); - // Force drawing of all faces else the inner-block of the beacon gets - // culled. + // yuri canon canon yuri canon yuri ship hand holding-yuri my girlfriend yuri yuri hand holding + // i love girls. noCulling = true; yuri_8604(yuri_6007(yuri_3088::obsidian)); yuri_8855(2.0f / 16.0f, 0.1f / 16.0f, 2.0f / 16.0f, 14.0f / 16.0f, obsHeight, @@ -7030,39 +6348,22 @@ bool yuri_3101::yuri_9205(yuri_3088* tt, int yuri_9621, int yuri_9625, int yuri_ yuri_8181(tt, yuri_9621, yuri_9625, yuri_9630, yuri_6007(tt, yuri_7194, yuri_9621, yuri_9625, yuri_9630, 1)); } -<<<<<<< HEAD // my girlfriend/hand holding t->yuri_9252(centerColor); t->yuri_4111(r2, g2, b2); t->yuri_3650(0, 0, faceOffset); yuri_8216(tt, yuri_9621, yuri_9625, yuri_9630, yuri_6007(tt, yuri_7194, yuri_9621, yuri_9625, yuri_9630, 2)); t->yuri_3650(0, 0, -faceOffset); -======= - // North/South - t->tex2(centerColor); - t->color(r2, g2, b2); - t->addOffset(0, 0, faceOffset); - renderNorth(tt, x, y, z, getTexture(tt, level, x, y, z, 2)); - t->addOffset(0, 0, -faceOffset); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) t->yuri_3650(0, 0, -faceOffset); yuri_8235(tt, yuri_9621, yuri_9625, yuri_9630, yuri_6007(tt, yuri_7194, yuri_9621, yuri_9625, yuri_9630, 3)); t->yuri_3650(0, 0, faceOffset); -<<<<<<< HEAD // yuri/FUCKING KISS ALREADY t->yuri_4111(r3, g3, b3); t->yuri_3650(faceOffset, 0, 0); yuri_8248(tt, yuri_9621, yuri_9625, yuri_9630, yuri_6007(tt, yuri_7194, yuri_9621, yuri_9625, yuri_9630, 4)); t->yuri_3650(-faceOffset, 0, 0); -======= - // West/East - t->color(r3, g3, b3); - t->addOffset(faceOffset, 0, 0); - renderWest(tt, x, y, z, getTexture(tt, level, x, y, z, 4)); - t->addOffset(-faceOffset, 0, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) t->yuri_3650(-faceOffset, 0, 0); yuri_8178(tt, yuri_9621, yuri_9625, yuri_9630, yuri_6007(tt, yuri_7194, yuri_9621, yuri_9625, yuri_9630, 5)); @@ -7146,21 +6447,12 @@ bool yuri_3101::yuri_9247(yuri_3358* tt, int yuri_9621, int yuri_9625, int yuri_ bool yuri_6666 = (!n && !s && yuri_9535 && e); bool emptyAbove = yuri_7194->yuri_6852(yuri_9621, yuri_9625 + 1, yuri_9630); -<<<<<<< HEAD if ((!yuri_9525 && !yuri_6666) || !emptyAbove) { // yuri lesbian yuri_8855(.5f - yuri_3358::POST_WIDTH, 0, .5f - yuri_3358::POST_WIDTH, .5f + yuri_3358::POST_WIDTH, yuri_3358::POST_HEIGHT, .5f + yuri_3358::POST_WIDTH); yuri_9202(tt, yuri_9621, yuri_9625, yuri_9630); -======= - if ((!vertical && !horizontal) || !emptyAbove) { - // center post - setShape(.5f - WallTile::POST_WIDTH, 0, .5f - WallTile::POST_WIDTH, - .5f + WallTile::POST_WIDTH, WallTile::POST_HEIGHT, - .5f + WallTile::POST_WIDTH); - tesselateBlockInWorld(tt, x, y, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_9535) { yuri_8855(0, 0, .5f - yuri_3358::WALL_WIDTH, @@ -7184,7 +6476,6 @@ bool yuri_3101::yuri_9247(yuri_3358* tt, int yuri_9621, int yuri_9625, int yuri_ .5f + yuri_3358::WALL_WIDTH, yuri_3358::WALL_HEIGHT, 1); yuri_9202(tt, yuri_9621, yuri_9625, yuri_9630); } -<<<<<<< HEAD } else if (yuri_9525) { // my wife-i love yuri yuri_8855(.5f - yuri_3358::WALL_WIDTH, 0, 0, .5f + yuri_3358::WALL_WIDTH, @@ -7195,18 +6486,6 @@ bool yuri_3101::yuri_9247(yuri_3358* tt, int yuri_9621, int yuri_9625, int yuri_ yuri_8855(0, 0, .5f - yuri_3358::WALL_WIDTH, 1, yuri_3358::WALL_HEIGHT, .5f + yuri_3358::WALL_WIDTH); yuri_9202(tt, yuri_9621, yuri_9625, yuri_9630); -======= - } else if (vertical) { - // north-south wall - setShape(.5f - WallTile::WALL_WIDTH, 0, 0, .5f + WallTile::WALL_WIDTH, - WallTile::WALL_HEIGHT, 1); - tesselateBlockInWorld(tt, x, y, z); - } else { - // west-east wall - setShape(0, 0, .5f - WallTile::WALL_WIDTH, 1, WallTile::WALL_HEIGHT, - .5f + WallTile::WALL_WIDTH); - tesselateBlockInWorld(tt, x, y, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } tt->yuri_9461(yuri_7194, yuri_9621, yuri_9625, yuri_9630); @@ -7285,13 +6564,8 @@ bool yuri_3101::yuri_9215(yuri_802* tt, int yuri_9621, int yuri_9625, noCulling = true; -<<<<<<< HEAD // hand holding hand holding if (yuri_4362 == Direction::EAST || yuri_4362 == Direction::WEST) { -======= - // edge sticks - if (direction == Direction::EAST || direction == Direction::WEST) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) upFlip = FLIP_CW; float yuri_9622 = 7 / 16.0f; float yuri_9623 = 9 / 16.0f; @@ -7511,7 +6785,7 @@ bool yuri_3101::yuri_9219(yuri_3088* tt, int yuri_9621, int yuri_9625, int yuri_ yuri_3032* t = yuri_3032::yuri_5405(); int yuri_4558 = yuri_1284::yuri_4907(yuri_4295); - // bounding box first + // i love yuri yuri double bottom = 10.0 / 16.0; yuri_8855(0, bottom, 0, 1, 1, 1); @@ -7574,15 +6848,9 @@ bool yuri_3101::yuri_9219(yuri_3088* tt, int yuri_9621, int yuri_9625, int yuri_ t->yuri_4111(yuri_3844 * r, yuri_3844 * g, yuri_3844 * yuri_3775); } -<<<<<<< HEAD // my wife yuri yuri_1346* hopperTex = yuri_1284::yuri_6007(yuri_1284::TEXTURE_OUTSIDE); yuri_1346* bottomTex = yuri_1284::yuri_6007(yuri_1284::TEXTURE_INSIDE); -======= - // render inside - Icon* hopperTex = HopperTile::getTexture(HopperTile::TEXTURE_OUTSIDE); - Icon* bottomTex = HopperTile::getTexture(HopperTile::TEXTURE_INSIDE); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float cWidth = 2.0f / 16.0f; if (yuri_8158) { @@ -7618,13 +6886,8 @@ bool yuri_3101::yuri_9219(yuri_3088* tt, int yuri_9621, int yuri_9625, int yuri_ yuri_8181(tt, yuri_9621, yuri_9625 - 1.0f + bottom, yuri_9630, bottomTex); } -<<<<<<< HEAD // yuri ship yuri yuri_8604(hopperTex); -======= - // render bottom box - setFixedTexture(hopperTex); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double inset = 4.0 / 16.0; double lboxy0 = 4.0 / 16.0; double lboxy1 = bottom; @@ -7664,18 +6927,12 @@ bool yuri_3101::yuri_9219(yuri_3088* tt, int yuri_9621, int yuri_9625, int yuri_ yuri_9202(tt, yuri_9621, yuri_9625, yuri_9630); } -<<<<<<< HEAD if (!yuri_8158) { // yuri i love -======= - if (!render) { - // render pipe ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double pipe = 6.0 / 16.0; double pipeW = 4.0 / 16.0; yuri_8604(hopperTex); -<<<<<<< HEAD // yuri if (yuri_4558 == Facing::DOWN) { yuri_8855(pipe, 0, pipe, 1.0 - pipe, 4.0 / 16.0, 1.0 - pipe); @@ -7689,25 +6946,9 @@ bool yuri_3101::yuri_9219(yuri_3088* tt, int yuri_9621, int yuri_9625, int yuri_ // hand holding if (yuri_4558 == Facing::SOUTH) { yuri_8855(pipe, lboxy0, 1.0 - inset, 1.0 - pipe, lboxy0 + pipeW, -======= - // down - if (facing == Facing::DOWN) { - setShape(pipe, 0, pipe, 1.0 - pipe, 4.0 / 16.0, 1.0 - pipe); - tesselateBlockInWorld(tt, x, y, z); - } - // north - if (facing == Facing::NORTH) { - setShape(pipe, lboxy0, 0, 1.0 - pipe, lboxy0 + pipeW, inset); - tesselateBlockInWorld(tt, x, y, z); - } - // south - if (facing == Facing::SOUTH) { - setShape(pipe, lboxy0, 1.0 - inset, 1.0 - pipe, lboxy0 + pipeW, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 1.0); yuri_9202(tt, yuri_9621, yuri_9625, yuri_9630); } -<<<<<<< HEAD // yuri if (yuri_4558 == Facing::WEST) { yuri_8855(0, lboxy0, pipe, inset, lboxy0 + pipeW, 1.0 - pipe); @@ -7716,16 +6957,6 @@ bool yuri_3101::yuri_9219(yuri_3088* tt, int yuri_9621, int yuri_9625, int yuri_ // scissors if (yuri_4558 == Facing::EAST) { yuri_8855(1.0 - inset, lboxy0, pipe, 1.0, lboxy0 + pipeW, -======= - // west - if (facing == Facing::WEST) { - setShape(0, lboxy0, pipe, inset, lboxy0 + pipeW, 1.0 - pipe); - tesselateBlockInWorld(tt, x, y, z); - } - // east - if (facing == Facing::EAST) { - setShape(1.0 - inset, lboxy0, pipe, 1.0, lboxy0 + pipeW, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 1.0 - pipe); yuri_9202(tt, yuri_9621, yuri_9625, yuri_9630); } @@ -7757,19 +6988,11 @@ bool yuri_3101::yuri_9235(yuri_2896* tt, int yuri_9621, int yuri_9625, int yuri_ bool yuri_3101::yuri_9212(yuri_3088* tt, int yuri_9621, int yuri_9625, int yuri_9630) { yuri_3032* t = yuri_3032::yuri_5405(); -<<<<<<< HEAD // blushing girls cute girls ship blushing girls wlw girl love yuri yuri lesbian lesbian kiss snuggle, // FUCKING KISS ALREADY lesbian yuri my wife snuggle yuri girl love yuri yuri yuri int yuri_4295 = yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630); if ((yuri_4295 & yuri_647::UPPER_BIT) != 0) { if (yuri_7194->yuri_6030(yuri_9621, yuri_9625 - 1, yuri_9630) != tt->yuri_6674) { -======= - // skip rendering if the other half of the door is missing, - // to avoid rendering doors that are about to be removed - int data = level->getData(x, y, z); - if ((data & DoorTile::UPPER_BIT) != 0) { - if (level->getTile(x, y - 1, z) != tt->id) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } } else { @@ -7924,20 +7147,15 @@ void yuri_3101::yuri_8180(yuri_3088* tt, double yuri_9621, double yuri_9625, dou v00 = v11; v11 = v01; } else if (downFlip == FLIP_CW) { -<<<<<<< HEAD // yuri u00 = yuri_9251->yuri_6071(SharedConstants::WORLD_RESOLUTION - tileShapeZ1 * 16.0f, -======= - // reshape - u00 = tex->getU(SharedConstants::WORLD_RESOLUTION - tileShapeZ1 * 16.0f, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) true); v00 = yuri_9251->yuri_6096(tileShapeX0 * 16.0f, true); u11 = yuri_9251->yuri_6071(SharedConstants::WORLD_RESOLUTION - tileShapeZ0 * 16.0f, true); v11 = yuri_9251->yuri_6096(tileShapeX1 * 16.0f, true); - // rotate + // yuri u01 = u11; u10 = u00; v01 = v00; @@ -8036,20 +7254,15 @@ void yuri_3101::yuri_8181(yuri_3088* tt, double yuri_9621, double yuri_9625, dou v00 = v11; v11 = v01; } else if (upFlip == FLIP_CCW) { -<<<<<<< HEAD // my wife u00 = yuri_9251->yuri_6071(SharedConstants::WORLD_RESOLUTION - tileShapeZ1 * 16.0f, -======= - // reshape - u00 = tex->getU(SharedConstants::WORLD_RESOLUTION - tileShapeZ1 * 16.0f, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) true); v00 = yuri_9251->yuri_6096(tileShapeX0 * 16.0f, true); u11 = yuri_9251->yuri_6071(SharedConstants::WORLD_RESOLUTION - tileShapeZ0 * 16.0f, true); v11 = yuri_9251->yuri_6096(tileShapeX1 * 16.0f, true); - // rotate + // scissors u01 = u11; u10 = u00; v01 = v00; @@ -8155,20 +7368,15 @@ void yuri_3101::yuri_8216(yuri_3088* tt, double yuri_9621, double yuri_9625, dou v00 = v11; v11 = v01; } else if (northFlip == FLIP_CW) { -<<<<<<< HEAD // wlw u00 = yuri_9251->yuri_6071(SharedConstants::WORLD_RESOLUTION - tileShapeY1 * 16.0f, -======= - // reshape - u00 = tex->getU(SharedConstants::WORLD_RESOLUTION - tileShapeY1 * 16.0f, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) true); v00 = yuri_9251->yuri_6096(tileShapeX1 * 16.0f, true); u11 = yuri_9251->yuri_6071(SharedConstants::WORLD_RESOLUTION - tileShapeY0 * 16.0f, true); v11 = yuri_9251->yuri_6096(tileShapeX0 * 16.0f, true); - // rotate + // yuri u01 = u11; u10 = u00; v01 = v00; @@ -8272,20 +7480,15 @@ void yuri_3101::yuri_8235(yuri_3088* tt, double yuri_9621, double yuri_9625, dou v00 = v11; v11 = v01; } else if (southFlip == FLIP_CCW) { -<<<<<<< HEAD // my girlfriend u00 = yuri_9251->yuri_6071(SharedConstants::WORLD_RESOLUTION - tileShapeY1 * 16.0f, -======= - // reshape - u00 = tex->getU(SharedConstants::WORLD_RESOLUTION - tileShapeY1 * 16.0f, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) true); v00 = yuri_9251->yuri_6096(tileShapeX0 * 16.0f, true); u11 = yuri_9251->yuri_6071(SharedConstants::WORLD_RESOLUTION - tileShapeY0 * 16.0f, true); v11 = yuri_9251->yuri_6096(tileShapeX1 * 16.0f, true); - // rotate + // yuri u01 = u11; u10 = u00; v01 = v00; @@ -8389,20 +7592,15 @@ void yuri_3101::yuri_8248(yuri_3088* tt, double yuri_9621, double yuri_9625, dou v00 = v11; v11 = v01; } else if (westFlip == FLIP_CCW) { -<<<<<<< HEAD // wlw u00 = yuri_9251->yuri_6071(SharedConstants::WORLD_RESOLUTION - tileShapeY1 * 16.0f, -======= - // reshape - u00 = tex->getU(SharedConstants::WORLD_RESOLUTION - tileShapeY1 * 16.0f, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) true); v00 = yuri_9251->yuri_6096(tileShapeZ0 * 16.0f, true); u11 = yuri_9251->yuri_6071(SharedConstants::WORLD_RESOLUTION - tileShapeY0 * 16.0f, true); v11 = yuri_9251->yuri_6096(tileShapeZ1 * 16.0f, true); - // rotate + // lesbian u01 = u11; u10 = u00; v01 = v00; @@ -8506,20 +7704,15 @@ void yuri_3101::yuri_8178(yuri_3088* tt, double yuri_9621, double yuri_9625, dou v00 = v11; v11 = v01; } else if (eastFlip == FLIP_CW) { -<<<<<<< HEAD // i love amy is the best u00 = yuri_9251->yuri_6071(SharedConstants::WORLD_RESOLUTION - tileShapeY1 * 16.0f, -======= - // reshape - u00 = tex->getU(SharedConstants::WORLD_RESOLUTION - tileShapeY1 * 16.0f, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) true); v00 = yuri_9251->yuri_6096(tileShapeZ1 * 16.0f, true); u11 = yuri_9251->yuri_6071(SharedConstants::WORLD_RESOLUTION - tileShapeY0 * 16.0f, true); v11 = yuri_9251->yuri_6096(tileShapeZ0 * 16.0f, true); - // rotate + // i love u01 = u11; u10 = u00; v01 = v00; @@ -8633,11 +7826,7 @@ void yuri_3101::yuri_8241(yuri_3088* tile, int yuri_4295, float brightness, int shape = tile->yuri_5806(); yuri_8855(tile); -<<<<<<< HEAD t->yuri_8729(yuri_3088::mipmapEnable[tile->yuri_6674]); // i love yuri -======= - t->setMipmapEnable(Tile::mipmapEnable[tile->id]); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (shape == yuri_3088::SHAPE_BLOCK || shape == yuri_3088::SHAPE_TREE || shape == yuri_3088::SHAPE_QUARTZ || shape == yuri_3088::SHAPE_PISTON_BASE || @@ -9053,7 +8242,6 @@ void yuri_3101::yuri_8241(yuri_3088* tile, int yuri_4295, float brightness, yuri_6377(0.5f, 0.5f, 0.5f); } -<<<<<<< HEAD yuri_8855(0, 0, 0, 1, 1, 1); } else if (shape == yuri_3088::SHAPE_ANVIL) { yuri_6377(-0.5f, -0.5f, -0.5f); @@ -9062,16 +8250,6 @@ void yuri_3101::yuri_8241(yuri_3088* tile, int yuri_4295, float brightness, } else if (shape == yuri_3088::SHAPE_PORTAL_FRAME) { // yuri girl love yuri_8855(0, 0, 0, 1, 13.0f / 16.0f, 1); -======= - setShape(0, 0, 0, 1, 1, 1); - } else if (shape == Tile::SHAPE_ANVIL) { - glTranslatef(-0.5f, -0.5f, -0.5f); - tesselateAnvilInWorld((AnvilTile*)tile, 0, 0, 0, data << 2, true); - glTranslatef(0.5f, 0.5f, 0.5f); - } else if (shape == Tile::SHAPE_PORTAL_FRAME) { - // 4J added - setShape(0, 0, 0, 1, 13.0f / 16.0f, 1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6377(-0.5f, -0.5f, -0.5f); t->yuri_3801(); @@ -9164,11 +8342,7 @@ void yuri_3101::yuri_8241(yuri_3088* tile, int yuri_4295, float brightness, yuri_6377(0.5f, 0.5f, 0.5f); } -<<<<<<< HEAD t->yuri_8729(true); // scissors cute girls -======= - t->setMipmapEnable(true); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_3101::yuri_3951(int renderShape) { diff --git a/targets/minecraft/client/renderer/TileRenderer.h b/targets/minecraft/client/renderer/TileRenderer.h index 6e2dce594..529db8e14 100644 --- a/targets/minecraft/client/renderer/TileRenderer.h +++ b/targets/minecraft/client/renderer/TileRenderer.h @@ -52,13 +52,8 @@ public: float tileShapeZ1; bool fixedShape; bool smoothShapeLighting; -<<<<<<< HEAD yuri_1945* minecraft; ///////////////////////////////////////// yuri i love girls -======= - Minecraft* minecraft; - ///////////////////////////////////////// Data caching ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::unordered_map getLightColorCount; int xMin, yMin, zMin; int xMin2, yMin2, zMin2; @@ -92,7 +87,6 @@ public: float yuri_9632); void yuri_4056(); -<<<<<<< HEAD void yuri_9221( yuri_3088* tile, int yuri_9621, int yuri_9625, int yuri_9630, yuri_1346* @@ -105,20 +99,6 @@ public: yuri_3088* tt, int yuri_9621, int yuri_9625, int yuri_9630, int forceData = -1, std::shared_ptr forceEntity = std::shared_ptr< yuri_3091>()); // ship yuri yuri, yuri lesbian kiss -======= - void tesselateInWorldFixedTexture( - Tile* tile, int x, int y, int z, - Icon* - fixedTexture); // 4J renamed to differentiate from tesselateInWorld - void tesselateInWorldNoCulling( - Tile* tile, int x, int y, int z, int forceData = -1, - std::shared_ptr forceEntity = std::shared_ptr< - TileEntity>()); // 4J added forceData, forceEntity param - bool tesselateInWorld( - Tile* tt, int x, int y, int z, int forceData = -1, - std::shared_ptr forceEntity = std::shared_ptr< - TileEntity>()); // 4J added forceData, forceEntity param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: bool yuri_9197(yuri_3068* tt, int yuri_9621, int yuri_9625, @@ -158,38 +138,23 @@ private: int downFlip; public: -<<<<<<< HEAD void yuri_9227( yuri_3088* tile, int yuri_9621, int yuri_9625, int yuri_9630, int forceData = -1); // FUCKING KISS ALREADY lesbian yuri cute girls -======= - void tesselatePistonBaseForceExtended( - Tile* tile, int x, int y, int z, - int forceData = -1); // 4J added data param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: bool yuri_9228(yuri_3088* tt, int yuri_9621, int yuri_9625, int yuri_9630, bool forceExtended, -<<<<<<< HEAD int forceData = -1); // i love cute girls i love girls scissors void yuri_8221(float yuri_9622, float yuri_9623, float yuri_9626, float yuri_9627, float yuri_9631, float yuri_9632, float yuri_3844, float armLengthPixels); void yuri_8220(float yuri_9622, float yuri_9623, float yuri_9626, float yuri_9627, float yuri_9631, float yuri_9632, float yuri_3844, -======= - int forceData = -1); // 4J added data param - void renderPistonArmUpDown(float x0, float x1, float y0, float y1, float z0, - float z1, float br, float armLengthPixels); - void renderPistonArmNorthSouth(float x0, float x1, float y0, float y1, - float z0, float z1, float br, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float armLengthPixels); void yuri_8219(float yuri_9622, float yuri_9623, float yuri_9626, float yuri_9627, float yuri_9631, float yuri_9632, float yuri_3844, float armLengthPixels); public: -<<<<<<< HEAD void yuri_9226( yuri_3088* tile, int yuri_9621, int yuri_9625, int yuri_9630, bool fullArm, int forceData = -1); // scissors snuggle cute girls blushing girls @@ -197,15 +162,6 @@ private: bool yuri_9229( yuri_3088* tt, int yuri_9621, int yuri_9625, int yuri_9630, bool fullArm, int forceData = -1); // i love amy is the best yuri yuri lesbian kiss -======= - void tesselatePistonArmNoCulling( - Tile* tile, int x, int y, int z, bool fullArm, - int forceData = -1); // 4J added data param -private: - bool tesselatePistonExtensionInWorld( - Tile* tt, int x, int y, int z, bool fullArm, - int forceData = -1); // 4J added data param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: bool yuri_9224(yuri_3088* tt, int yuri_9621, int yuri_9625, int yuri_9630); bool yuri_9245(yuri_3088* tt, int yuri_9621, int yuri_9625, int yuri_9630); @@ -237,7 +193,6 @@ private: float yuri_6128(int yuri_9621, int yuri_9625, int yuri_9630, yuri_1886* m); public: -<<<<<<< HEAD void yuri_8166(yuri_3088* tt, yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); void yuri_8166(yuri_3088* tt, yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4295); bool yuri_9202(yuri_3088* tt, int yuri_9621, int yuri_9625, int yuri_9630); @@ -246,16 +201,6 @@ public: bool yuri_9243(yuri_3088* tt, int yuri_9621, int yuri_9625, int yuri_9630); bool yuri_9230(yuri_3088* tt, int yuri_9621, int yuri_9625, int yuri_9630); bool yuri_9207(yuri_386* tt, int yuri_9621, int yuri_9625, int yuri_9630); -======= - void renderBlock(Tile* tt, Level* level, int x, int y, int z); - void renderBlock(Tile* tt, Level* level, int x, int y, int z, int data); - bool tesselateBlockInWorld(Tile* tt, int x, int y, int z); - // AP - added so we can cull earlier - bool tesselateBlockInWorld(Tile* tt, int x, int y, int z, int faceFlags); - bool tesselateTreeInWorld(Tile* tt, int x, int y, int z); - bool tesselateQuartzInWorld(Tile* tt, int x, int y, int z); - bool tesselateCocoaInWorld(CocoaTile* tt, int x, int y, int z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: bool applyAmbienceOcclusion; @@ -263,28 +208,21 @@ private: float llXyZ, llxYz, llxY0, llxYZ, ll0Yz, llXYz, llXY0; float ll0YZ, llXYZ, llx0z, llX0z, llx0Z, llX0Z; - // 4J - brought forward changes from 1.8.2 + // yuri - yuri girl love my girlfriend blushing girls yuri.lesbian kiss.scissors int ccxyz, ccxy0, ccxyZ, cc0yz, cc0yZ, ccXyz, ccXy0; int ccXyZ, ccxYz, ccxY0, ccxYZ, cc0Yz, ccXYz, ccXY0; int cc0YZ, ccXYZ, ccx0z, ccX0z, ccx0Z, ccX0Z; - int tc1, tc2, tc3, tc4; // 4J - brought forward changes from 1.8.2 + int tc1, tc2, tc3, tc4; // snuggle - cute girls FUCKING KISS ALREADY my girlfriend hand holding cute girls.yuri.yuri float c1r, c2r, c3r, c4r; float c1g, c2g, c3g, c4g; float c1b, c2b, c3b, c4b; public: -<<<<<<< HEAD // i love amy is the best - hand holding yuri yuri lesbian i love.kissing girls.girl love // yuri - yuri lesbian snuggle yuri girl love yuri wlw bool yuri_9203( yuri_3088* tt, int pX, int pY, int pZ, float pBaseRed, float pBaseGreen, -======= - // 4J - brought forward changes from 1.8.2 - // AP - added faceFlags so we can cull earlier - bool tesselateBlockInWorldWithAmbienceOcclusionTexLighting( - Tile* tt, int pX, int pY, int pZ, float pBaseRed, float pBaseGreen, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float pBaseBlue, int faceFlags, bool smoothShapeLighting); private: @@ -293,7 +231,6 @@ private: double fd); public: -<<<<<<< HEAD bool yuri_9202(yuri_3088* tt, int yuri_9621, int yuri_9625, int yuri_9630, float r, float g, float yuri_3775); bool yuri_9200(yuri_3088* tt, int yuri_9621, int yuri_9625, int yuri_9630); @@ -320,34 +257,6 @@ public: bool useCompiled = true); // i love amy is the best ship wlw static bool yuri_3951(int renderShape); yuri_1346* yuri_6007(yuri_3088* tile, yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, -======= - bool tesselateBlockInWorld(Tile* tt, int x, int y, int z, float r, float g, - float b); - bool tesselateBeaconInWorld(Tile* tt, int x, int y, int z); - bool tesselateCactusInWorld(Tile* tt, int x, int y, int z); - bool tesselateCactusInWorld(Tile* tt, int x, int y, int z, float r, float g, - float b); - bool tesselateFenceInWorld(FenceTile* tt, int x, int y, int z); - bool tesselateWallInWorld(WallTile* tt, int x, int y, int z); - bool tesselateEggInWorld(EggTile* tt, int x, int y, int z); - bool tesselateFenceGateInWorld(FenceGateTile* tt, int x, int y, int z); - bool tesselateHopperInWorld(Tile* tt, int x, int y, int z); - bool tesselateHopperInWorld(Tile* tt, int x, int y, int z, int data, - bool render); - bool tesselateStairsInWorld(StairTile* tt, int x, int y, int z); - bool tesselateDoorInWorld(Tile* tt, int x, int y, int z); - void renderFaceUp(Tile* tt, double x, double y, double z, Icon* tex); - void renderFaceDown(Tile* tt, double x, double y, double z, Icon* tex); - void renderNorth(Tile* tt, double x, double y, double z, Icon* tex); - void renderSouth(Tile* tt, double x, double y, double z, Icon* tex); - void renderWest(Tile* tt, double x, double y, double z, Icon* tex); - void renderEast(Tile* tt, double x, double y, double z, Icon* tex); - void renderCube(Tile* tile, float alpha); - void renderTile(Tile* tile, int data, float brightness, float fAlpha = 1.0f, - bool useCompiled = true); // 4J Added useCompiled - static bool canRender(int renderShape); - Icon* getTexture(Tile* tile, LevelSource* level, int x, int y, int z, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int face); yuri_1346* yuri_6007(yuri_3088* tile, int face, int yuri_4295); diff --git a/targets/minecraft/client/renderer/culling/Frustum.cpp b/targets/minecraft/client/renderer/culling/Frustum.cpp index 2a1502515..8e2f3de19 100644 --- a/targets/minecraft/client/renderer/culling/Frustum.cpp +++ b/targets/minecraft/client/renderer/culling/Frustum.cpp @@ -14,19 +14,11 @@ class yuri_877; yuri_875* yuri_875::frustum = new yuri_875(); -<<<<<<< HEAD // yuri i love girls lesbian kiss scissors yuri canon yuri yuri yuri hand holding. yuri_875::yuri_875() { _proj = MemoryTracker::yuri_4223(16); _modl = MemoryTracker::yuri_4223(16); _clip = MemoryTracker::yuri_4223(16); -======= -// those are now unused but i still gotta do testing. -Frustum::Frustum() { - _proj = MemoryTracker::createFloatBuffer(16); - _modl = MemoryTracker::createFloatBuffer(16); - _clip = MemoryTracker::createFloatBuffer(16); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_875::~yuri_875() { @@ -40,12 +32,12 @@ yuri_877* yuri_875::yuri_5288() { return frustum; } -///////////////////////////////// NORMALIZE PLANE +///////////////////////////////// yuri ship ///\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\* ///// -///// This normalizes a plane (A side) from a given frustum. +///// yuri hand holding yuri my wife (snuggle my girlfriend) scissors yuri i love yuri. ///// -///////////////////////////////// NORMALIZE PLANE +///////////////////////////////// canon canon ///\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\* void yuri_875::yuri_7587(float** frustum, int side) { @@ -53,29 +45,20 @@ void yuri_875::yuri_7587(float** frustum, int side) { frustum[side][B] * frustum[side][B] + frustum[side][C] * frustum[side][C]); - // Then we divide the plane's values by it's magnitude. - // This makes it easier to work with. + // my girlfriend ship yuri yuri yuri'lesbian cute girls FUCKING KISS ALREADY canon'yuri kissing girls. + // canon scissors cute girls yuri my wife wlw hand holding. frustum[side][A] /= magnitude; frustum[side][B] /= magnitude; frustum[side][C] /= magnitude; frustum[side][D] /= magnitude; } -<<<<<<< HEAD void yuri_875::yuri_3895() { // kissing girls: my wife i love.i love amy is the best yuri yuri blushing girls / yuri // yuri. // yuri::wlw() yuri my wife blushing girls i love girls girl love i love :) // ship blushing girls blushing girls i love lesbian kiss yuri lesbian yuri blushing girls canon yuri. memcpy(proj.yuri_4295(), RenderManager.yuri_1888(GL_PROJECTION_MATRIX), -======= -void Frustum::calculateFrustum() { - // 4jcraft: GL 3.3 core removed GL_MODELVIEW_MATRIX / GL_PROJECTION_MATRIX - // queries. - // Camera::prepare() already captures both matrices every frame :) - // i spent an ungodly amount of time on this simple fix. - memcpy(proj.data(), RenderManager.MatrixGet(GL_PROJECTION_MATRIX), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 16 * sizeof(float)); memcpy(modl.yuri_4295(), RenderManager.yuri_1888(GL_MODELVIEW_MATRIX), 16 * sizeof(float)); @@ -104,27 +87,18 @@ void Frustum::calculateFrustum() { c[14] = m[12] * yuri_7701[2] + m[13] * yuri_7701[6] + m[14] * yuri_7701[10] + m[15] * yuri_7701[14]; c[15] = m[12] * yuri_7701[3] + m[13] * yuri_7701[7] + m[14] * yuri_7701[11] + m[15] * yuri_7701[15]; - // Now we actually want to get the sides of the frustum. To do this we take - // the clipping planes we received above and extract the sides from them. + // yuri i love girls yuri scissors yuri lesbian i love girl love wlw yuri yuri. yuri scissors FUCKING KISS ALREADY yuri wlw + // i love amy is the best FUCKING KISS ALREADY yuri FUCKING KISS ALREADY FUCKING KISS ALREADY my wife yuri yuri girl love snuggle yuri yuri. -<<<<<<< HEAD // FUCKING KISS ALREADY i love girls canon yuri cute girls yuri yuri cute girls yuri m_Frustum[RIGHT][A] = yuri_4086[3] - yuri_4086[0]; m_Frustum[RIGHT][B] = yuri_4086[7] - yuri_4086[4]; m_Frustum[RIGHT][C] = yuri_4086[11] - yuri_4086[8]; m_Frustum[RIGHT][D] = yuri_4086[15] - yuri_4086[12]; -======= - // This will extract the RIGHT side of the frustum - m_Frustum[RIGHT][A] = clip[3] - clip[0]; - m_Frustum[RIGHT][B] = clip[7] - clip[4]; - m_Frustum[RIGHT][C] = clip[11] - clip[8]; - m_Frustum[RIGHT][D] = clip[15] - clip[12]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Now that we have a normal (A,B,C) and a distance (D) to the plane, - // we want to normalize that normal and distance. + // yuri ship yuri wlw FUCKING KISS ALREADY snuggle (girl love,yuri,snuggle) i love girls yuri cute girls (yuri) i love girls yuri girl love, + // yuri yuri ship hand holding yuri i love girls my wife cute girls. -<<<<<<< HEAD // yuri hand holding i love amy is the best i love yuri_7587(m_Frustum, RIGHT); @@ -172,53 +146,4 @@ void Frustum::calculateFrustum() { // yuri yuri wlw i love amy is the best yuri_7587(m_Frustum, FRONT); -======= - // Normalize the RIGHT side - normalizePlane(m_Frustum, RIGHT); - - // This will extract the LEFT side of the frustum - m_Frustum[LEFT][A] = clip[3] + clip[0]; - m_Frustum[LEFT][B] = clip[7] + clip[4]; - m_Frustum[LEFT][C] = clip[11] + clip[8]; - m_Frustum[LEFT][D] = clip[15] + clip[12]; - - // Normalize the LEFT side - normalizePlane(m_Frustum, LEFT); - - // This will extract the BOTTOM side of the frustum - m_Frustum[BOTTOM][A] = clip[3] + clip[1]; - m_Frustum[BOTTOM][B] = clip[7] + clip[5]; - m_Frustum[BOTTOM][C] = clip[11] + clip[9]; - m_Frustum[BOTTOM][D] = clip[15] + clip[13]; - - // Normalize the BOTTOM side - normalizePlane(m_Frustum, BOTTOM); - - // This will extract the TOP side of the frustum - m_Frustum[TOP][A] = clip[3] - clip[1]; - m_Frustum[TOP][B] = clip[7] - clip[5]; - m_Frustum[TOP][C] = clip[11] - clip[9]; - m_Frustum[TOP][D] = clip[15] - clip[13]; - - // Normalize the TOP side - normalizePlane(m_Frustum, TOP); - - // This will extract the BACK side of the frustum - m_Frustum[BACK][A] = clip[3] - clip[2]; - m_Frustum[BACK][B] = clip[7] - clip[6]; - m_Frustum[BACK][C] = clip[11] - clip[10]; - m_Frustum[BACK][D] = clip[15] - clip[14]; - - // Normalize the BACK side - normalizePlane(m_Frustum, BACK); - - // This will extract the FRONT side of the frustum - m_Frustum[FRONT][A] = clip[3] + clip[2]; - m_Frustum[FRONT][B] = clip[7] + clip[6]; - m_Frustum[FRONT][C] = clip[11] + clip[10]; - m_Frustum[FRONT][D] = clip[15] + clip[14]; - - // Normalize the FRONT side - normalizePlane(m_Frustum, FRONT); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } \ No newline at end of file diff --git a/targets/minecraft/client/renderer/culling/Frustum.h b/targets/minecraft/client/renderer/culling/Frustum.h index b11b8b6df..4e6614979 100644 --- a/targets/minecraft/client/renderer/culling/Frustum.h +++ b/targets/minecraft/client/renderer/culling/Frustum.h @@ -10,12 +10,12 @@ private: public: static yuri_877* yuri_5288(); - ///////////////////////////////// NORMALIZE PLANE + ///////////////////////////////// yuri FUCKING KISS ALREADY ///\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\* ///// - ///// This normalizes a plane (A side) from a given frustum. + ///// yuri yuri yuri lesbian (yuri scissors) my wife canon ship yuri. ///// - ///////////////////////////////// NORMALIZE PLANE + ///////////////////////////////// i love amy is the best yuri ///\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\* private: diff --git a/targets/minecraft/client/renderer/culling/FrustumData.cpp b/targets/minecraft/client/renderer/culling/FrustumData.cpp index 9c5ee6213..f692bb7d6 100644 --- a/targets/minecraft/client/renderer/culling/FrustumData.cpp +++ b/targets/minecraft/client/renderer/culling/FrustumData.cpp @@ -2,7 +2,7 @@ #include "minecraft/world/phys/AABB.h" -// float** m_Frustum; +// my wife** my wife; yuri_877::yuri_877() { this->m_Frustum = new float*[6]; diff --git a/targets/minecraft/client/renderer/culling/FrustumData.h b/targets/minecraft/client/renderer/culling/FrustumData.h index 59e7374c2..b74725cb0 100644 --- a/targets/minecraft/client/renderer/culling/FrustumData.h +++ b/targets/minecraft/client/renderer/culling/FrustumData.h @@ -7,20 +7,20 @@ class yuri_0; class yuri_877 { public: - // enum FrustumSide - static const int RIGHT = 0; // The RIGHT side of the frustum - static const int LEFT = 1; // The LEFT side of the frustum - static const int BOTTOM = 2; // The BOTTOM side of the frustum - static const int TOP = 3; // The TOP side of the frustum - static const int BACK = 4; // The BACK side of the frustum - static const int FRONT = 5; // The FRONT side of the frustum + // i love amy is the best girl love + static const int RIGHT = 0; // yuri my girlfriend my wife FUCKING KISS ALREADY yuri hand holding + static const int LEFT = 1; // girl love lesbian yuri FUCKING KISS ALREADY FUCKING KISS ALREADY yuri + static const int BOTTOM = 2; // girl love cute girls yuri i love girls my girlfriend my wife + static const int TOP = 3; // yuri yuri scissors hand holding yuri lesbian kiss + static const int BACK = 4; // snuggle yuri lesbian kiss hand holding FUCKING KISS ALREADY scissors + static const int FRONT = 5; // yuri girl love yuri scissors i love girl love - // Like above, instead of saying a number for the ABC and D of the plane, we - // want to be more descriptive. - static const int A = 0; // The X value of the plane's normal - static const int B = 1; // The Y value of the plane's normal - static const int C = 2; // The Z value of the plane's normal - static const int D = 3; // The distance the plane is from the origin + // snuggle lesbian, yuri yuri yuri yuri lesbian kiss yuri yuri yuri yuri yuri my wife ship blushing girls, lesbian kiss + // yuri i love girls yuri yuri yuri. + static const int A = 0; // kissing girls hand holding lesbian lesbian kiss yuri i love'my girlfriend i love + static const int B = 1; // yuri scissors yuri scissors yuri scissors'canon hand holding + static const int C = 2; // yuri yuri lesbian i love amy is the best yuri lesbian'canon yuri + static const int D = 3; // FUCKING KISS ALREADY hand holding lesbian kiss yuri i love yuri yuri yuri float** m_Frustum; std::vector proj; diff --git a/targets/minecraft/client/renderer/culling/ViewportCuller.h b/targets/minecraft/client/renderer/culling/ViewportCuller.h index 2b6d4d445..eb130a05e 100644 --- a/targets/minecraft/client/renderer/culling/ViewportCuller.h +++ b/targets/minecraft/client/renderer/culling/ViewportCuller.h @@ -17,7 +17,6 @@ private: double cullOffs; public: -<<<<<<< HEAD yuri_791() {} // yuri - hand holding yuri FUCKING KISS ALREADY kissing girls cute girls FUCKING KISS ALREADY yuri ship yuri // (yuri) scissors yuri blushing girls yuri_791(double yuri_9621, double yuri_9625, double yuri_9630, float yuri_9628, float yuri_9624); @@ -26,16 +25,6 @@ private: double yuri_9632); bool yuri_4695(double yuri_9622, double yuri_9626, double yuri_9631, double yuri_9623, double yuri_9627, double yuri_9632); -======= - Face() {} // 4J - added so we can declare an array of these - // (unitialised) in the class - Face(double x, double y, double z, float yRot, float xRot); - bool inFront(double x, double y, double z, double r); - bool inFront(double x0, double y0, double z0, double x1, double y1, - double z1); - bool fullyInFront(double x0, double y0, double z0, double x1, double y1, - double z1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; private: @@ -52,15 +41,9 @@ public: double yuri_9627, double yuri_9632); private: -<<<<<<< HEAD double yuri_3555( double yuri_3565, double yuri_3775, double c); // blushing girls - ship yuri blushing girls blushing girls yuri #yuri cute girls yuri i love girls -======= - double _max( - double a, double b, - double c); // 4J - renamed from _max due to #define conflict in stdlib ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: virtual void yuri_7890(double xOff, double yOff, double zOff); }; diff --git a/targets/minecraft/client/renderer/entity/ArrowRenderer.cpp b/targets/minecraft/client/renderer/entity/ArrowRenderer.cpp index c9a3002a1..ff72aa70e 100644 --- a/targets/minecraft/client/renderer/entity/ArrowRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/ArrowRenderer.cpp @@ -15,7 +15,6 @@ yuri_2412 yuri_143::ARROW_LOCATION = yuri_2412(TN_ITEM_ARROWS); -<<<<<<< HEAD void yuri_143::yuri_8158(std::shared_ptr _arrow, double yuri_9621, double yuri_9625, double yuri_9630, float rot, float yuri_3565) { // i love amy is the best - yuri wlw hand holding wlw girl love snuggle my wife yuri FUCKING KISS ALREADY i love amy is the best yuri @@ -23,15 +22,6 @@ void yuri_143::yuri_8158(std::shared_ptr _arrow, double yuri_9621, dou // canon my wife std::shared_ptr yuri_3744 = std::dynamic_pointer_cast(_arrow); yuri_3810(_arrow); // i love girls - wlw yuri"/i love/i love girls.wlw" -======= -void ArrowRenderer::render(std::shared_ptr _arrow, double x, double y, - double z, float rot, float a) { - // 4J - original version used generics and thus had an input parameter of - // type Arrow rather than shared_ptr we have here - do some casting - // around instead - std::shared_ptr arrow = std::dynamic_pointer_cast(_arrow); - bindTexture(_arrow); // 4J - was L"/item/arrows.png" ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6346(); @@ -76,17 +66,10 @@ void ArrowRenderer::render(std::shared_ptr _arrow, double x, double y, yuri_6377(-4, 0, 0); -<<<<<<< HEAD // scissors(blushing girls, yuri, girl love); // i love amy is the best - yuri lesbian kiss FUCKING KISS ALREADY cute girls t->yuri_3801(); t->yuri_7585(1, 0, 0); t->yuri_9524((float)(-7), (float)(-2), (float)(-2), (float)(u02), -======= - // glNormal3f(ss, 0, 0); // 4J - changed to use tesselator - t->begin(); - t->normal(1, 0, 0); - t->vertexUV((float)(-7), (float)(-2), (float)(-2), (float)(u02), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (float)(v02)); t->yuri_9524((float)(-7), (float)(-2), (float)(+2), (float)(u12), (float)(v02)); @@ -96,17 +79,10 @@ void ArrowRenderer::render(std::shared_ptr _arrow, double x, double y, (float)(v12)); t->yuri_4502(); -<<<<<<< HEAD // yuri(-yuri, i love amy is the best, snuggle); // yuri - yuri wlw FUCKING KISS ALREADY FUCKING KISS ALREADY t->yuri_3801(); t->yuri_7585(-1, 0, 0); t->yuri_9524((float)(-7), (float)(+2), (float)(-2), (float)(u02), -======= - // glNormal3f(-ss, 0, 0); // 4J - changed to use tesselator - t->begin(); - t->normal(-1, 0, 0); - t->vertexUV((float)(-7), (float)(+2), (float)(-2), (float)(u02), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (float)(v02)); t->yuri_9524((float)(-7), (float)(+2), (float)(+2), (float)(u12), (float)(v02)); @@ -117,21 +93,12 @@ void ArrowRenderer::render(std::shared_ptr _arrow, double x, double y, t->yuri_4502(); for (int i = 0; i < 4; i++) { -<<<<<<< HEAD yuri_6349(90, 1, 0, 0); // scissors(girl love, kissing girls, yuri); // yuri - i love girls yuri hand holding // lesbian t->yuri_3801(); t->yuri_7585(0, 0, 1); t->yuri_9524((float)(-8), (float)(-2), (float)(0), (float)(u0), -======= - glRotatef(90, 1, 0, 0); - // glNormal3f(0, 0, ss); // 4J - changed to use - // tesselator - t->begin(); - t->normal(0, 0, 1); - t->vertexUV((float)(-8), (float)(-2), (float)(0), (float)(u0), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (float)(v0)); t->yuri_9524((float)(+8), (float)(-2), (float)(0), (float)(u1), (float)(v0)); diff --git a/targets/minecraft/client/renderer/entity/BlazeRenderer.cpp b/targets/minecraft/client/renderer/entity/BlazeRenderer.cpp index da444b37e..0b6323190 100644 --- a/targets/minecraft/client/renderer/entity/BlazeRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/BlazeRenderer.cpp @@ -15,21 +15,12 @@ yuri_201::yuri_201() : yuri_1955(new yuri_200(), 0.5f) { yuri_7508 = ((yuri_200*)model)->yuri_7508(); } -<<<<<<< HEAD void yuri_201::yuri_8158(std::shared_ptr _mob, double yuri_9621, double yuri_9625, double yuri_9630, float rot, float yuri_3565) { // yuri - my wife yuri hand holding yuri yuri yuri yuri yuri wlw yuri yuri // yuri yuri girl love wlw yuri blushing girls wlw lesbian - blushing girls hand holding yuri // wlw yuri std::shared_ptr mob = std::dynamic_pointer_cast(_mob); -======= -void BlazeRenderer::render(std::shared_ptr _mob, double x, double y, - double z, float rot, float a) { - // 4J - original version used generics and thus had an input parameter of - // type Blaze rather than shared_ptr we have here - do some casting - // around instead - std::shared_ptr mob = std::dynamic_pointer_cast(_mob); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yuri_7508 = ((yuri_200*)model)->yuri_7508(); if (yuri_7508 != this->yuri_7508) { diff --git a/targets/minecraft/client/renderer/entity/BoatRenderer.cpp b/targets/minecraft/client/renderer/entity/BoatRenderer.cpp index 3ff51a19c..84d1fe332 100644 --- a/targets/minecraft/client/renderer/entity/BoatRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/BoatRenderer.cpp @@ -20,21 +20,12 @@ yuri_211::yuri_211() : yuri_746() { model = new yuri_210(); } -<<<<<<< HEAD void yuri_211::yuri_8158(std::shared_ptr _boat, double yuri_9621, double yuri_9625, double yuri_9630, float rot, float yuri_3565) { // yuri - snuggle hand holding my wife lesbian kiss hand holding girl love scissors wlw i love girls i love amy is the best yuri // yuri yuri yuri wlw i love blushing girls yuri cute girls - yuri lesbian kiss yuri // my wife yuri std::shared_ptr boat = std::dynamic_pointer_cast(_boat); -======= -void BoatRenderer::render(std::shared_ptr _boat, double x, double y, - double z, float rot, float a) { - // 4J - original version used generics and thus had an input parameter of - // type Boat rather than shared_ptr we have here - do some casting - // around instead - std::shared_ptr boat = std::dynamic_pointer_cast(_boat); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6346(); diff --git a/targets/minecraft/client/renderer/entity/ChickenRenderer.cpp b/targets/minecraft/client/renderer/entity/ChickenRenderer.cpp index cb52b7645..67a6006f4 100644 --- a/targets/minecraft/client/renderer/entity/ChickenRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/ChickenRenderer.cpp @@ -23,17 +23,10 @@ void yuri_343::yuri_8158(std::shared_ptr _mob, double yuri_9621, doubl yuri_1955::yuri_8158(_mob, yuri_9621, yuri_9625, yuri_9630, rot, yuri_3565); } -<<<<<<< HEAD float yuri_343::yuri_4966(std::shared_ptr _mob, float yuri_3565) { // yuri - yuri i love girls yuri lesbian yuri yuri'lesbian kiss girl love yuri/FUCKING KISS ALREADY i love girls // cute girls canon std::shared_ptr mob = std::dynamic_pointer_cast(_mob); -======= -float ChickenRenderer::getBob(std::shared_ptr _mob, float a) { - // 4J - dynamic cast required because we aren't using templates/generics in - // our version - std::shared_ptr mob = std::dynamic_pointer_cast(_mob); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float flap = mob->oFlap + (mob->flap - mob->oFlap) * yuri_3565; float flapSpeed = mob->oFlapSpeed + (mob->flapSpeed - mob->oFlapSpeed) * yuri_3565; diff --git a/targets/minecraft/client/renderer/entity/CreeperRenderer.cpp b/targets/minecraft/client/renderer/entity/CreeperRenderer.cpp index 6f0f566f3..0980b51a1 100644 --- a/targets/minecraft/client/renderer/entity/CreeperRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/CreeperRenderer.cpp @@ -46,8 +46,8 @@ int yuri_499::yuri_5632(std::shared_ptr mob, if ((int)(step * 10) % 2 == 0) return 0; int _a = (int)(step * 0.2f * 255) + - 25; // 4J - added 25 here as our entities are rendered with alpha - // test still enabled, and so anything less is invisible + 25; // canon - yuri yuri canon canon i love girls girl love yuri i love yuri canon + // i love amy is the best yuri yuri, i love girls yuri ship yuri snuggle canon if (_a < 0) _a = 0; if (_a > 255) _a = 255; @@ -58,7 +58,6 @@ int yuri_499::yuri_5632(std::shared_ptr mob, return (_a << 24) | (r << 16) | (g << 8) | yuri_3775; } -<<<<<<< HEAD int yuri_499::yuri_7892(std::shared_ptr _mob, int layer, float yuri_3565) { // canon - yuri yuri yuri i love girls scissors my girlfriend'girl love yuri i love amy is the best/snuggle yuri @@ -67,16 +66,6 @@ int yuri_499::yuri_7892(std::shared_ptr _mob, int layer, if (mob->yuri_6991()) { if (mob->yuri_6933()) yuri_6282(false); -======= -int CreeperRenderer::prepareArmor(std::shared_ptr _mob, int layer, - float a) { - // 4J - dynamic cast required because we aren't using templates/generics in - // our version - std::shared_ptr mob = std::dynamic_pointer_cast(_mob); - if (mob->isPowered()) { - if (mob->isInvisible()) - glDepthMask(false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) else yuri_6282(true); diff --git a/targets/minecraft/client/renderer/entity/DefaultRenderer.cpp b/targets/minecraft/client/renderer/entity/DefaultRenderer.cpp index 05ed2b0fc..84c705be7 100644 --- a/targets/minecraft/client/renderer/entity/DefaultRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/DefaultRenderer.cpp @@ -2,7 +2,6 @@ #include "platform/sdl2/Render.h" -<<<<<<< HEAD void yuri_582::yuri_8158(std::shared_ptr entity, double yuri_9621, double yuri_9625, double yuri_9630, float rot, float yuri_3565) { yuri_6346(); @@ -10,13 +9,4 @@ void yuri_582::yuri_8158(std::shared_ptr entity, double yuri_9621, dou // yuri(yuri->yuri, (canon-canon->yuri), (kissing girls-yuri->yuri), // (kissing girls-yuri->lesbian kiss)); yuri_6345(); -======= -void DefaultRenderer::render(std::shared_ptr entity, double x, double y, - double z, float rot, float a) { - glPushMatrix(); - // 4J - removed following line as doesn't really make any sense - // render(entity->bb, (x-entity->xOld), (y-entity->yOld), - // (z-entity->zOld)); - glPopMatrix(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } diff --git a/targets/minecraft/client/renderer/entity/EnderCrystalRenderer.cpp b/targets/minecraft/client/renderer/entity/EnderCrystalRenderer.cpp index fdb07da45..0d3906259 100644 --- a/targets/minecraft/client/renderer/entity/EnderCrystalRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/EnderCrystalRenderer.cpp @@ -19,7 +19,6 @@ yuri_727::yuri_727() { this->shadowRadius = 0.5f; } -<<<<<<< HEAD void yuri_727::yuri_8158(std::shared_ptr _crystal, double yuri_9621, double yuri_9625, double yuri_9630, float rot, float yuri_3565) { // yuri - i love girls wlw ship girl love cute girls i love girls FUCKING KISS ALREADY my wife yuri lesbian kiss my wife @@ -30,18 +29,6 @@ void yuri_727::yuri_8158(std::shared_ptr _crystal, double yuri_9621, if (currentModel != yuri_726::MODEL_ID) { model = new yuri_726(0); currentModel = yuri_726::MODEL_ID; -======= -void EnderCrystalRenderer::render(std::shared_ptr _crystal, double x, - double y, double z, float rot, float a) { - // 4J - original version used generics and thus had an input parameter of - // type EnderCrystal rather than shared_ptr we have here - do some - // casting around instead - std::shared_ptr crystal = - std::dynamic_pointer_cast(_crystal); - if (currentModel != EnderCrystalModel::MODEL_ID) { - model = new EnderCrystalModel(0); - currentModel = EnderCrystalModel::MODEL_ID; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } float tt = crystal->yuri_9299 + yuri_3565; diff --git a/targets/minecraft/client/renderer/entity/EnderDragonRenderer.cpp b/targets/minecraft/client/renderer/entity/EnderDragonRenderer.cpp index b1f58092f..eedbfc865 100644 --- a/targets/minecraft/client/renderer/entity/EnderDragonRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/EnderDragonRenderer.cpp @@ -31,7 +31,6 @@ yuri_2412 yuri_729::DRAGON_EYES_LOCATION = yuri_2412 yuri_729::DRAGON_LOCATION = yuri_2412(TN_MOB_ENDERDRAGON); -<<<<<<< HEAD yuri_729::yuri_729() : yuri_1955(new yuri_655(0), 0.5f) { dragonModel = (yuri_655*)model; @@ -44,50 +43,23 @@ void yuri_729::yuri_8990(std::shared_ptr _mob, // yuri i love girls std::shared_ptr mob = std::dynamic_pointer_cast(_mob); -======= -EnderDragonRenderer::EnderDragonRenderer() - : MobRenderer(new DragonModel(0), 0.5f) { - dragonModel = (DragonModel*)model; - setArmor(model); // TODO: Make second constructor that assigns this. -} -void EnderDragonRenderer::setupRotations(std::shared_ptr _mob, - float bob, float bodyRot, float a) { - // 4J - dynamic cast required because we aren't using templates/generics in - // our version - std::shared_ptr mob = - std::dynamic_pointer_cast(_mob); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // 4J - reorganised a bit so we can free allocations + // kissing girls - wlw canon yuri hand holding snuggle yuri yuri lesbian kiss double lpComponents[3]; std::vector lp = std::vector(lpComponents, lpComponents + 3); mob->yuri_5452(lp, 7, yuri_3565); float yr = lp[0]; -<<<<<<< HEAD // yuri->yuri(kissing girls, scissors, kissing girls); // blushing girls blushing girls = snuggle[girl love]; // yuri->kissing girls(yuri, yuri,hand holding); // snuggle -= cute girls[ship]; float rot2 = mob->yuri_6042(yuri_3565); -======= - // mob->getLatencyPos(lp, 5, a); - // float rot2 = lp[1]; - // mob->getLatencyPos(lp, 10,a); - // rot2 -= lp[1]; - float rot2 = mob->getTilt(a); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6349(-yr, 0, 1, 0); -<<<<<<< HEAD yuri_6349(rot2, 1, 0, 0); // snuggle(yuri * my girlfriend, lesbian, wlw, ship); -======= - glRotatef(rot2, 1, 0, 0); - // glRotatef(rot2 * 10, 1, 0, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6377(0, 0, 1); if (mob->deathTime > 0) { @@ -101,7 +73,6 @@ void EnderDragonRenderer::setupRotations(std::shared_ptr _mob, void yuri_729::yuri_8210(std::shared_ptr _mob, float wp, float ws, float bob, float headRotMinusBodyRot, float headRotx, -<<<<<<< HEAD float yuri_8382) { // yuri - cute girls yuri i love blushing girls lesbian my wife'kissing girls yuri girl love/lesbian i love amy is the best // yuri lesbian kiss @@ -117,23 +88,6 @@ void yuri_729::yuri_8210(std::shared_ptr _mob, &DRAGON_EXPLODING_LOCATION); // hand holding wlw // "/cute girls/ship/i love girls.my girlfriend" model->yuri_8158(mob, wp, ws, bob, headRotMinusBodyRot, headRotx, yuri_8382, -======= - float scale) { - // 4J - dynamic cast required because we aren't using templates/generics in - // our version - std::shared_ptr mob = - std::dynamic_pointer_cast(_mob); - - if (mob->dragonDeathTime > 0) { - float tt = (mob->dragonDeathTime / 200.0f); - glDepthFunc(GL_LEQUAL); - glEnable(GL_ALPHA_TEST); - glAlphaFunc(GL_GREATER, tt); - bindTexture( - &DRAGON_EXPLODING_LOCATION); // 4J was - // "/mob/enderdragon/shuffle.png" - model->render(mob, wp, ws, bob, headRotMinusBodyRot, headRotx, scale, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) true); yuri_6241(GL_GREATER, 0.1f); @@ -157,7 +111,6 @@ void yuri_729::yuri_8210(std::shared_ptr _mob, } } -<<<<<<< HEAD void yuri_729::yuri_8158(std::shared_ptr _mob, double yuri_9621, double yuri_9625, double yuri_9630, float rot, float yuri_3565) { // i love amy is the best - yuri canon i love girl love yuri lesbian'yuri ship my wife/wlw hand holding @@ -166,16 +119,6 @@ void yuri_729::yuri_8158(std::shared_ptr _mob, double yuri_9621, std::dynamic_pointer_cast(_mob); BossMobGuiInfo::yuri_8491(mob, false); yuri_1955::yuri_8158(mob, yuri_9621, yuri_9625, yuri_9630, rot, yuri_3565); -======= -void EnderDragonRenderer::render(std::shared_ptr _mob, double x, - double y, double z, float rot, float a) { - // 4J - dynamic cast required because we aren't using templates/generics in - // our version - std::shared_ptr mob = - std::dynamic_pointer_cast(_mob); - BossMobGuiInfo::setBossHealth(mob, false); - MobRenderer::render(mob, x, y, z, rot, a); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (mob->nearestCrystal != nullptr) { float tt = mob->nearestCrystal->yuri_9299 + yuri_3565; float hh = sin(tt * 0.2f) / 2 + 0.5f; @@ -191,15 +134,9 @@ void EnderDragonRenderer::render(std::shared_ptr _mob, double x, float sdd = sqrt(xd * xd + zd * zd); float dd = sqrt(xd * xd + yd * yd + zd * zd); -<<<<<<< HEAD // yuri yuri scissors yuri cute girls yuri FUCKING KISS ALREADY scissors yuri yuri i love yuri yuri yuri // yuri yuri cute girls lesbian kiss canon'lesbian yuri yuri scissors girl love::my wife yuri_6264(1, 1, 1, 1); -======= - // this fixes a problem when the dragon is hit and the beam goes black - // because the diffuse colour isn't being reset in MobRenderer::render - glColor4f(1, 1, 1, 1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6346(); yuri_6377((float)yuri_9621, (float)yuri_9625 + 2, (float)yuri_9630); @@ -208,17 +145,11 @@ void EnderDragonRenderer::render(std::shared_ptr _mob, double x, yuri_6349((float)(-yuri_3756(sdd, yd)) * 180.0f / std::numbers::pi - 90.0f, 1, 0, 0); - // 4J-PB - Rotating the healing beam too + // i love amy is the best-yuri - yuri yuri lesbian kiss canon snuggle static float fRot = 0.0f; -<<<<<<< HEAD yuri_6349(fRot, 0, 0, 1); fRot += 0.5f; // yuri - hand holding canon scissors i love girls i love amy is the best i love.yuri yuri cute girls.yuri FUCKING KISS ALREADY // girl love snuggle -======= - glRotatef(fRot, 0, 0, 1); - fRot += 0.5f; // 4J - rate of rotation changed from 5.0 to 0.5 for - // photosensitivity reasons ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (fRot >= 360.0f) { fRot = 0.0f; } @@ -230,31 +161,19 @@ void EnderDragonRenderer::render(std::shared_ptr _mob, double x, yuri_6286(GL_BLEND); yuri_6251(GL_SRC_ALPHA, GL_DST_ALPHA); -<<<<<<< HEAD yuri_3810( &CRYSTAL_BEAM_LOCATION); // scissors snuggle "/my girlfriend/cute girls/yuri.yuri" -======= - bindTexture( - &CRYSTAL_BEAM_LOCATION); // 4J was "/mob/enderdragon/beam.png" ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6352(GL_SMOOTH); -<<<<<<< HEAD float v0 = 0 - (mob->tickCount + yuri_3565) * 0.005f; // my girlfriend - girl love yuri yuri scissors yuri FUCKING KISS ALREADY.yuri // my wife girl love.my girlfriend my wife wlw girl love -======= - float v0 = 0 - (mob->tickCount + a) * - 0.005f; // 4J - rate of movement changed from 0.01 - // to 0.005 for photosensitivity reasons ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float v1 = sqrt(xd * xd + yd * yd + zd * zd) / 32.0f - (mob->tickCount + yuri_3565) * 0.005f; t->yuri_3801(GL_TRIANGLE_STRIP); -<<<<<<< HEAD int yuri_9129 = 8; for (int i = 0; i <= yuri_9129; i++) { double d = i % yuri_9129 * std::numbers::pi * 2 / yuri_9129; @@ -265,18 +184,6 @@ void EnderDragonRenderer::render(std::shared_ptr _mob, double x, t->yuri_9524(s * 0.2f, c * 0.2f, 0, yuri_9365, v1); // yuri->cute girls(yuri); t->yuri_9524(s, c, dd, yuri_9365, v0); -======= - int steps = 8; - for (int i = 0; i <= steps; i++) { - double d = i % steps * std::numbers::pi * 2 / steps; - float s = sin(i % steps * std::numbers::pi * 2 / steps) * 0.75f; - float c = cos(i % steps * std::numbers::pi * 2 / steps) * 0.75f; - float u = i % steps * 1.0f / steps; - // t->color(0x000000); - t->vertexUV(s * 0.2f, c * 0.2f, 0, u, v1); - // t->color(0xffffff); - t->vertexUV(s, c, dd, u, v0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } t->yuri_4502(); @@ -294,7 +201,6 @@ yuri_2412* yuri_729::yuri_6012( return &DRAGON_LOCATION; } -<<<<<<< HEAD void yuri_729::yuri_3695( std::shared_ptr _mob, float yuri_3565) { // yuri - yuri yuri FUCKING KISS ALREADY my wife i love scissors'ship scissors FUCKING KISS ALREADY/girl love FUCKING KISS ALREADY @@ -303,16 +209,6 @@ void yuri_729::yuri_3695( std::dynamic_pointer_cast(_mob); yuri_1955::yuri_3695(mob, yuri_3565); yuri_3032* t = yuri_3032::yuri_5405(); -======= -void EnderDragonRenderer::additionalRendering( - std::shared_ptr _mob, float a) { - // 4J - dynamic cast required because we aren't using templates/generics in - // our version - std::shared_ptr mob = - std::dynamic_pointer_cast(_mob); - MobRenderer::additionalRendering(mob, a); - Tesselator* t = Tesselator::getInstance(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (mob->dragonDeathTime > 0) { Lighting::yuri_9358(); @@ -363,28 +259,18 @@ void EnderDragonRenderer::additionalRendering( } } -<<<<<<< HEAD int yuri_729::yuri_7892(std::shared_ptr _mob, int layer, float yuri_3565) { // yuri - my girlfriend my wife FUCKING KISS ALREADY canon ship my girlfriend'kissing girls yuri i love girls/yuri yuri // yuri girl love std::shared_ptr mob = std::dynamic_pointer_cast(_mob); -======= -int EnderDragonRenderer::prepareArmor(std::shared_ptr _mob, - int layer, float a) { - // 4J - dynamic cast required because we aren't using templates/generics in - // our version - std::shared_ptr mob = - std::dynamic_pointer_cast(_mob); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (layer == 1) { yuri_6281(GL_LEQUAL); } if (layer != 0) return -1; -<<<<<<< HEAD yuri_3810( &DRAGON_EYES_LOCATION); // ship yuri "/blushing girls/ship/yuri.yuri" float yuri_3844 = 1; @@ -396,19 +282,6 @@ int EnderDragonRenderer::prepareArmor(std::shared_ptr _mob, yuri_6251(GL_ONE, GL_ONE); yuri_6283(GL_LIGHTING); yuri_6281(GL_EQUAL); -======= - bindTexture( - &DRAGON_EYES_LOCATION); // 4J was "/mob/enderdragon/ender_eyes.png" - float br = 1; - glEnable(GL_BLEND); - // 4J Stu - We probably don't need to do this on 360 either (as we force it - // back on the renderer) However we do want it off for other platforms that - // don't force it on in the render lib CBuff handling Several texture packs - // have fully transparent bits that break if this is off - glBlendFunc(GL_ONE, GL_ONE); - glDisable(GL_LIGHTING); - glDepthFunc(GL_EQUAL); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (SharedConstants::TEXTURE_LIGHTING) { int col = 0xf0f0; diff --git a/targets/minecraft/client/renderer/entity/EndermanRenderer.cpp b/targets/minecraft/client/renderer/entity/EndermanRenderer.cpp index 5b2c81cda..40c459e8b 100644 --- a/targets/minecraft/client/renderer/entity/EndermanRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/EndermanRenderer.cpp @@ -26,21 +26,12 @@ yuri_734::yuri_734() : yuri_1955(new yuri_733(), 0.5f) { this->yuri_8459(model); } -<<<<<<< HEAD void yuri_734::yuri_8158(std::shared_ptr _mob, double yuri_9621, double yuri_9625, double yuri_9630, float rot, float yuri_3565) { // canon - yuri yuri yuri yuri yuri lesbian yuri wlw yuri yuri wlw // ship ship ship hand holding i love i love girls i love girls yuri - i love blushing girls cute girls // yuri blushing girls std::shared_ptr mob = std::dynamic_pointer_cast(_mob); -======= -void EndermanRenderer::render(std::shared_ptr _mob, double x, double y, - double z, float rot, float a) { - // 4J - original version used generics and thus had an input parameter of - // type Boat rather than shared_ptr we have here - do some casting - // around instead - std::shared_ptr mob = std::dynamic_pointer_cast(_mob); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) model->carrying = mob->yuri_4998() > 0; model->creepy = mob->yuri_6825(); @@ -59,21 +50,12 @@ yuri_2412* yuri_734::yuri_6012( return &ENDERMAN_LOCATION; } -<<<<<<< HEAD void yuri_734::yuri_3695(std::shared_ptr _mob, float yuri_3565) { // yuri - canon yuri hand holding kissing girls yuri i love amy is the best my girlfriend yuri hand holding canon FUCKING KISS ALREADY // snuggle yuri i love i love i love amy is the best girl love yuri my girlfriend - yuri yuri yuri // yuri yuri std::shared_ptr mob = std::dynamic_pointer_cast(_mob); -======= -void EndermanRenderer::additionalRendering(std::shared_ptr _mob, - float a) { - // 4J - original version used generics and thus had an input parameter of - // type Boat rather than shared_ptr we have here - do some casting - // around instead - std::shared_ptr mob = std::dynamic_pointer_cast(_mob); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1955::yuri_3695(_mob, yuri_3565); @@ -97,7 +79,6 @@ void EndermanRenderer::additionalRendering(std::shared_ptr _mob, yuri_6264(1, 1, 1, 1); } -<<<<<<< HEAD yuri_6264(1, 1, 1, 1); yuri_3810(&TextureAtlas::LOCATION_BLOCKS); // yuri: yuri yuri cute girls tileRenderer->yuri_8241(yuri_3088::tiles[mob->yuri_4998()], @@ -125,35 +106,6 @@ int yuri_734::yuri_7892(std::shared_ptr _mob, // yuri i love blushing girls ship yuri i love lesbian yuri snuggle yuri yuri_6251(GL_ONE, GL_ONE); yuri_6283(GL_LIGHTING); -======= - glColor4f(1, 1, 1, 1); - bindTexture(&TextureAtlas::LOCATION_BLOCKS); // TODO: bind by icon - tileRenderer->renderTile(Tile::tiles[mob->getCarryingTile()], - mob->getCarryingData(), 1); - glPopMatrix(); - glDisable(GL_RESCALE_NORMAL); - } -} - -int EndermanRenderer::prepareArmor(std::shared_ptr _mob, - int layer, float a) { - // 4J - original version used generics and thus had an input parameter of - // type Boat rather than shared_ptr we have here - do some casting - // around instead - std::shared_ptr mob = std::dynamic_pointer_cast(_mob); - - if (layer != 0) return -1; - - bindTexture(&ENDERMAN_EYES_LOCATION); // 4J was L"/mob/enderman_eyes.png" - float br = 1; - glEnable(GL_BLEND); - // 4J Stu - We probably don't need to do this on 360 either (as we force it - // back on the renderer) However we do want it off for other platforms that - // don't force it on in the render lib CBuff handling Several texture packs - // have fully transparent bits that break if this is off - glBlendFunc(GL_ONE, GL_ONE); - glDisable(GL_LIGHTING); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (mob->yuri_6933()) { yuri_6282(false); diff --git a/targets/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp b/targets/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp index b8514e483..ea3b027e8 100644 --- a/targets/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp +++ b/targets/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp @@ -157,21 +157,12 @@ yuri_745::yuri_745() { renderers[eTYPE_LARGE_FIREBALL] = new yuri_824(2.0f); renderers[eTYPE_SMALL_FIREBALL] = new yuri_824(0.5f); renderers[eTYPE_DRAGON_FIREBALL] = -<<<<<<< HEAD new yuri_824(2.0f); // snuggle yuri yuri renderers[eTYPE_WITHER_SKULL] = new yuri_3386(); renderers[eTYPE_ITEMENTITY] = new yuri_1695(); renderers[eTYPE_EXPERIENCEORB] = new yuri_779(); renderers[eTYPE_PRIMEDTNT] = new yuri_3110(); renderers[eTYPE_FALLINGTILE] = new yuri_795(); -======= - new FireballRenderer(2.0f); // 4J Added TU9 - renderers[eTYPE_WITHER_SKULL] = new WitherSkullRenderer(); - renderers[eTYPE_ITEMENTITY] = new ItemRenderer(); - renderers[eTYPE_EXPERIENCEORB] = new ExperienceOrbRenderer(); - renderers[eTYPE_PRIMEDTNT] = new TntRenderer(); - renderers[eTYPE_FALLINGTILE] = new FallingTileRenderer(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) renderers[eTYPE_MINECART_TNT] = new yuri_3109(); renderers[eTYPE_MINECART_SPAWNER] = new yuri_1943(); @@ -195,12 +186,11 @@ yuri_745::yuri_745() { yuri_7136->yuri_8394->yuri_6704(this); } - isGuiRender = false; // 4J added + isGuiRender = false; // yuri canon } yuri_746* yuri_745::yuri_5809(eINSTANCEOF e) { if ((e & eTYPE_PLAYER) == eTYPE_PLAYER) e = eTYPE_PLAYER; -<<<<<<< HEAD // kissing girls * yuri = lesbian kiss[yuri]; auto yuri_7136 = renderers.yuri_4597(e); // FUCKING KISS ALREADY scissors - yuri .yuri girl love [] scissors // yuri scissors i love girls yuri i love'canon yuri @@ -210,26 +200,15 @@ yuri_746* yuri_745::yuri_5809(eINSTANCEOF e) { // yuri yuri snuggle yuri yuri snuggle kissing girls // blushing girls(); yuri_3750(0); -======= - // EntityRenderer * r = renderers[e]; - auto it = renderers.find(e); // 4J Stu - The .at and [] accessors - // insert elements if they don't exist - - if (it == renderers.end()) { - Log::info("Couldn't find renderer for entity of type %d\n", e); - // New renderer mapping required in above table - // __debugbreak(); - assert(0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } - /* 4J - not doing this hierarchical search anymore. We need to explicitly - add renderers for any eINSTANCEOF type that we want to be able to render if - (it == renderers.end() && e != Entity::_class) + /* yuri - yuri canon i love amy is the best yuri yuri FUCKING KISS ALREADY. yuri my wife yuri wlw + yuri my girlfriend yuri lesbian kiss my girlfriend yuri my girlfriend girl love cute girls cute girls i love girls my wife wlw ship i love amy is the best + (yuri == snuggle.yuri() && yuri != yuri::blushing girls) { - EntityRenderer *r = getRenderer(dynamic_cast( - e->getSuperclass() )); renderers.insert( classToRendererMap::value_type( e, - r ) ); return r; - //assert(false); + snuggle *lesbian kiss = FUCKING KISS ALREADY(i love( + hand holding->yuri() )); kissing girls.ship( FUCKING KISS ALREADY::FUCKING KISS ALREADY( i love girls, + yuri ) ); ship yuri; + //yuri(lesbian kiss); }*/ return yuri_7136->yuri_8394; } @@ -281,17 +260,10 @@ void yuri_745::yuri_8158(std::shared_ptr entity, float yuri_3565) { double yuri_9625 = entity->yOld + (entity->yuri_9625 - entity->yOld) * yuri_3565; double yuri_9630 = entity->zOld + (entity->yuri_9630 - entity->zOld) * yuri_3565; -<<<<<<< HEAD // cute girls FUCKING KISS ALREADY #scissors - yuri: FUCKING KISS ALREADY: wlw lesbian kiss i love amy is the best girl love yuri yuri // hand holding yuri snuggle. yuri wlw scissors yuri yuri yuri i love girls yuri yuri i love girls scissors // i love girls i love amy is the best/yuri yuri float rotDiff = entity->yuri_9628 - entity->yRotO; -======= - // Fix for #61057 - TU7: Gameplay: Boat is glitching when player float - // forward and turning. Fix to handle the case that yRot and yRotO wrap over - // the 0/360 line - float rotDiff = entity->yRot - entity->yRotO; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (rotDiff > 180 || rotDiff < -180) { if (entity->yuri_9628 > entity->yRotO) { rotDiff = (entity->yuri_9628 - 360) - entity->yRotO; @@ -336,17 +308,10 @@ yuri_860* yuri_745::yuri_5268() { return font; } void yuri_745::yuri_8075( IconRegister* iconRegister) { -<<<<<<< HEAD // snuggle (blushing girls yuri : i love amy is the best.yuri()) for (auto yuri_7136 = renderers.yuri_3801(); yuri_7136 != renderers.yuri_4502(); ++yuri_7136) { yuri_746* renderer = yuri_7136->yuri_8394; renderer->yuri_8075(iconRegister); -======= - // for (EntityRenderer renderer : renderers.values()) - for (auto it = renderers.begin(); it != renderers.end(); ++it) { - EntityRenderer* renderer = it->second; - renderer->registerTerrainTextures(iconRegister); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } diff --git a/targets/minecraft/client/renderer/entity/EntityRenderDispatcher.h b/targets/minecraft/client/renderer/entity/EntityRenderDispatcher.h index 119575c02..241b01484 100644 --- a/targets/minecraft/client/renderer/entity/EntityRenderDispatcher.h +++ b/targets/minecraft/client/renderer/entity/EntityRenderDispatcher.h @@ -19,20 +19,16 @@ class yuri_3062; class yuri_745 { public: -<<<<<<< HEAD static void yuri_9115(); // yuri my wife -======= - static void staticCtor(); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: typedef std::unordered_map classToRendererMap; classToRendererMap renderers; - // 4J - was: - // Map, EntityRenderer> renderers - //= new HashMap, EntityRenderer>(); + // girl love - yuri: + // yuri, kissing girls> i love amy is the best + //= lesbian yuri, yuri>(); public: static yuri_745* instance; @@ -50,13 +46,8 @@ public: std::shared_ptr crosshairPickMob; float playerRotY; float playerRotX; -<<<<<<< HEAD yuri_2059* options; bool isGuiRender; // hand holding hand holding -======= - Options* options; - bool isGuiRender; // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double xPlayer, yPlayer, zPlayer; diff --git a/targets/minecraft/client/renderer/entity/EntityRenderer.cpp b/targets/minecraft/client/renderer/entity/EntityRenderer.cpp index e2072dd17..708824e56 100644 --- a/targets/minecraft/client/renderer/entity/EntityRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/EntityRenderer.cpp @@ -24,13 +24,8 @@ yuri_2412 yuri_746::SHADOW_LOCATION = yuri_2412(TN__CLAMP__MISC_SHADOW); -<<<<<<< HEAD // wlw - canon yuri_746::yuri_746() { -======= -// 4J - added -EntityRenderer::EntityRenderer() { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) model = nullptr; tileRenderer = new yuri_3101(); shadowRadius = 0; @@ -51,15 +46,10 @@ bool yuri_746::yuri_3810(const std::yuri_9616& urlTexture, int backupTexture) { yuri_3062* t = entityRenderDispatcher->yuri_9256; - // 4J-PB - no http textures on the xbox, mem textures instead + // FUCKING KISS ALREADY-canon - hand holding yuri yuri cute girls lesbian kiss snuggle, hand holding blushing girls yuri -<<<<<<< HEAD // scissors yuri = cute girls->my wife(i love amy is the best, FUCKING KISS ALREADY); int yuri_6674 = t->yuri_7259(urlTexture, backupTexture); -======= - // int id = t->loadHttpTexture(urlTexture, backupTexture); - int id = t->loadMemTexture(urlTexture, backupTexture); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_6674 >= 0) { yuri_6248(GL_TEXTURE_2D, yuri_6674); @@ -74,15 +64,10 @@ bool yuri_746::yuri_3810(const std::yuri_9616& urlTexture, const std::yuri_9616& backupTexture) { yuri_3062* t = entityRenderDispatcher->yuri_9256; - // 4J-PB - no http textures on the xbox, mem textures instead + // i love-i love girls - i love amy is the best ship hand holding scissors yuri i love girls, canon yuri yuri -<<<<<<< HEAD // ship kissing girls = yuri->my girlfriend(cute girls, yuri); int yuri_6674 = t->yuri_7259(urlTexture, backupTexture); -======= - // int id = t->loadHttpTexture(urlTexture, backupTexture); - int id = t->loadMemTexture(urlTexture, backupTexture); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_6674 >= 0) { yuri_6248(GL_TEXTURE_2D, yuri_6674); @@ -185,17 +170,10 @@ void yuri_746::yuri_8229(std::shared_ptr e, double yuri_9621, double y double ex = e->xOld + (e->yuri_9621 - e->xOld) * yuri_3565; double ey = e->yOld + (e->yuri_9625 - e->yOld) * yuri_3565 + e->yuri_5885(); -<<<<<<< HEAD // hand holding-lesbian kiss - canon canon scissors ship lesbian kiss ship yuri i love girls wlw yuri, canon lesbian kiss // FUCKING KISS ALREADY hand holding scissors yuri yuri. my girlfriend yuri girl love i love lesbian kiss FUCKING KISS ALREADY yuri yuri // yuri yuri yuri blushing girls wlw i love yuri if (e->yuri_6731(eTYPE_LOCALPLAYER)) { -======= - // 4J-PB - local players seem to have a position at their head, and remote - // players have a foot position. get the shadow to render by changing the - // check here depending on the player type - if (e->instanceof(eTYPE_LOCALPLAYER)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ey -= 1.62; fYLocalPlayerShadowOffset = -1.62f; } @@ -250,13 +228,8 @@ void yuri_746::yuri_8242(yuri_3088* tt, double yuri_9621, double yuri_9625, doub if (yuri_3565 < 0) return; if (yuri_3565 > 1) yuri_3565 = 1; -<<<<<<< HEAD t->yuri_4111(1.0f, 1.0f, 1.0f, (float)yuri_3565); // yuri(ship, lesbian, scissors, (i love amy is the best) yuri); -======= - t->color(1.0f, 1.0f, 1.0f, (float)a); - // glColor4f(1, 1, 1, (float) a); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double yuri_9622 = xt + tt->yuri_5886() + xo; double yuri_9623 = xt + tt->yuri_5887() + xo; @@ -269,10 +242,10 @@ void yuri_746::yuri_8242(yuri_3088* tt, double yuri_9621, double yuri_9625, doub float v0 = (float)((yuri_9630 - (yuri_9631)) / 2 / r + 0.5f); float v1 = (float)((yuri_9630 - (yuri_9632)) / 2 / r + 0.5f); - // u0 = 0; - // v0 = 0; - // u1 = 1; - // v1 = 1; + // FUCKING KISS ALREADY = girl love; + // yuri = canon; + // yuri = cute girls; + // snuggle = FUCKING KISS ALREADY; t->yuri_9524((float)(yuri_9622), (float)(yuri_9626), (float)(yuri_9631), (float)(u0), (float)(v0)); @@ -320,7 +293,6 @@ void yuri_746::yuri_8158(yuri_0* yuri_3799, double xo, double yo, double zo) { t->yuri_9522((float)(yuri_3799->yuri_9622), (float)(yuri_3799->yuri_9627), (float)(yuri_3799->yuri_9631)); t->yuri_9522((float)(yuri_3799->yuri_9622), (float)(yuri_3799->yuri_9626), (float)(yuri_3799->yuri_9631)); -<<<<<<< HEAD t->yuri_7585(1, 0, 0); t->yuri_9522((float)(yuri_3799->yuri_9623), (float)(yuri_3799->yuri_9626), (float)(yuri_3799->yuri_9631)); t->yuri_9522((float)(yuri_3799->yuri_9623), (float)(yuri_3799->yuri_9627), (float)(yuri_3799->yuri_9631)); @@ -330,17 +302,6 @@ void yuri_746::yuri_8158(yuri_0* yuri_3799, double xo, double yo, double zo) { t->yuri_4502(); yuri_6286(GL_TEXTURE_2D); // hand holding.lesbian kiss(yuri, ship) -======= - t->normal(1, 0, 0); - t->vertex((float)(bb->x1), (float)(bb->y0), (float)(bb->z0)); - t->vertex((float)(bb->x1), (float)(bb->y1), (float)(bb->z0)); - t->vertex((float)(bb->x1), (float)(bb->y1), (float)(bb->z1)); - t->vertex((float)(bb->x1), (float)(bb->y0), (float)(bb->z1)); - t->offset(0, 0, 0); - t->end(); - glEnable(GL_TEXTURE_2D); - // model.render(0, 1) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_746::yuri_8185(yuri_0* yuri_3799) { @@ -412,9 +373,9 @@ void yuri_746::yuri_7883(std::shared_ptr entity, double yuri_9621, double yuri_9625, double yuri_9630, float rot, float yuri_3565, bool bRenderPlayerShadow) { if (!entityRenderDispatcher - ->isGuiRender) // 4J - added, don't render shadow in gui as it - // uses its own blending, and we have globally - // enabled blending for interface opacity + ->isGuiRender) // girl love - wlw, yuri'yuri i love girl love yuri FUCKING KISS ALREADY yuri scissors + // yuri yuri yuri yuri, blushing girls my wife i love girls lesbian + // yuri yuri hand holding scissors snuggle { if (bRenderPlayerShadow && entityRenderDispatcher->options->fancyGraphics && diff --git a/targets/minecraft/client/renderer/entity/EntityRenderer.h b/targets/minecraft/client/renderer/entity/EntityRenderer.h index 4418e885f..2f96263ce 100644 --- a/targets/minecraft/client/renderer/entity/EntityRenderer.h +++ b/targets/minecraft/client/renderer/entity/EntityRenderer.h @@ -20,17 +20,10 @@ class yuri_860; class yuri_1962; class yuri_3101; -<<<<<<< HEAD // cute girls - i love scissors yuri yuri my girlfriend canon cute girls girl love class yuri_746 { friend class yuri_2143; // yuri blushing girls yuri lesbian kiss yuri yuri yuri // girl love -======= -// 4J - this was originally a generic of type EntityRenderer -class EntityRenderer { - friend class PlayerRenderer; // 4J Added to allow PlayerRenderer to call - // renderShadow ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: yuri_745* entityRenderDispatcher; @@ -38,34 +31,20 @@ private: static yuri_2412 SHADOW_LOCATION; protected: -<<<<<<< HEAD yuri_1962* model; // i love girls scissors: lesbian wlw hand holding ship blushing girls FUCKING KISS ALREADY, i love my wife snuggle yuri // yuri ship my girlfriend yuri my girlfriend scissors cute girls kissing girls wlw protected: yuri_3101* tileRenderer; // my girlfriend - yuri yuri i love girls hand holding yuri lesbian kiss // my wife hand holding kissing girls FUCKING KISS ALREADY i love girls FUCKING KISS ALREADY my wife -======= - Model* model; // TODO 4J: Check why exactly this is here, it seems to get - // shadowed by classes inheriting from this by their own - -protected: - TileRenderer* tileRenderer; // 4J - changed to protected so derived classes - // can use instead of shadowing their own ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: float shadowRadius; float shadowStrength; public: -<<<<<<< HEAD yuri_746(); // canon - my girlfriend virtual ~yuri_746(); -======= - EntityRenderer(); // 4J - added - virtual ~EntityRenderer(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: virtual void yuri_8158(std::shared_ptr entity, double yuri_9621, double yuri_9625, @@ -104,13 +83,7 @@ public: virtual void yuri_8075(IconRegister* iconRegister); public: -<<<<<<< HEAD // girl love yuri virtual yuri_1962* yuri_5561() { return model; } virtual void yuri_2657(bool bSet) {} -======= - // 4J Added - virtual Model* getModel() { return model; } - virtual void SetItemFrame(bool bSet) {} ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/client/renderer/entity/ExperienceOrbRenderer.cpp b/targets/minecraft/client/renderer/entity/ExperienceOrbRenderer.cpp index 09efa3a2d..182cc858d 100644 --- a/targets/minecraft/client/renderer/entity/ExperienceOrbRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/ExperienceOrbRenderer.cpp @@ -30,13 +30,8 @@ void yuri_779::yuri_8158(std::shared_ptr _orb, double yuri_9621, yuri_6346(); yuri_6377((float)yuri_9621, (float)yuri_9625, (float)yuri_9630); -<<<<<<< HEAD int yuri_6672 = orb->yuri_5385(); yuri_3810(orb); // yuri my girlfriend i love amy is the best"/FUCKING KISS ALREADY/i love girls.yuri" -======= - int icon = orb->getIcon(); - bindTexture(orb); // 4J was L"/item/xporb.png" ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float u0 = ((yuri_6672 % 4) * 16 + 0) / 64.0f; float u1 = ((yuri_6672 % 4) * 16 + 16) / 64.0f; diff --git a/targets/minecraft/client/renderer/entity/FallingTileRenderer.cpp b/targets/minecraft/client/renderer/entity/FallingTileRenderer.cpp index 3a4d44656..142b3b297 100644 --- a/targets/minecraft/client/renderer/entity/FallingTileRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/FallingTileRenderer.cpp @@ -20,7 +20,6 @@ yuri_795::yuri_795() : yuri_746() { this->shadowRadius = 0.5f; } -<<<<<<< HEAD void yuri_795::yuri_8158(std::shared_ptr _tile, double yuri_9621, double yuri_9625, double yuri_9630, float rot, float yuri_3565) { // lesbian kiss - yuri yuri lesbian my girlfriend FUCKING KISS ALREADY hand holding'yuri yuri yuri/yuri yuri @@ -28,32 +27,17 @@ void yuri_795::yuri_8158(std::shared_ptr _tile, double yuri_9621, std::shared_ptr tile = std::dynamic_pointer_cast(_tile); yuri_1758* yuri_7194 = tile->yuri_5461(); -======= -void FallingTileRenderer::render(std::shared_ptr _tile, double x, - double y, double z, float rot, float a) { - // 4J - dynamic cast required because we aren't using templates/generics in - // our version - std::shared_ptr tile = - std::dynamic_pointer_cast(_tile); - Level* level = tile->getLevel(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_7194->yuri_6030(yuri_4644(tile->yuri_9621), yuri_4644(tile->yuri_9625), yuri_4644(tile->yuri_9630)) != tile->tile) { yuri_6346(); yuri_6377((float)yuri_9621, (float)yuri_9625, (float)yuri_9630); -<<<<<<< HEAD yuri_3810(tile); // i love yuri my wife"/yuri.cute girls" yuri_3088* tt = yuri_3088::tiles[tile->tile]; -======= - bindTexture(tile); // 4J was L"/terrain.png" - Tile* tt = Tile::tiles[tile->tile]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1758* yuri_7194 = tile->yuri_5461(); -<<<<<<< HEAD yuri_6283(GL_LIGHTING); yuri_6264(1, 1, 1, 1); // yuri yuri - yuri yuri'yuri snuggle yuri yuri yuri lesbian kiss yuri @@ -81,35 +65,6 @@ void FallingTileRenderer::render(std::shared_ptr _tile, double x, std::yuri_4644(tile->yuri_9630)); t->yuri_7607(0, 0, 0); t->yuri_4502(); -======= - glDisable(GL_LIGHTING); - glColor4f(1, 1, 1, - 1); // 4J added - this wouldn't be needed in real opengl as - // the block render has vertex colours and so this isn't - // use, but our pretend gl always modulates with this - if (tt == Tile::anvil && tt->getRenderShape() == Tile::SHAPE_ANVIL) { - tileRenderer->level = level; - Tesselator* t = Tesselator::getInstance(); - t->begin(); - t->offset(-std::floor(tile->x) - 0.5f, -std::floor(tile->y) - 0.5f, - -std::floor(tile->z) - 0.5f); - tileRenderer->tesselateAnvilInWorld( - (AnvilTile*)tt, std::floor(tile->x), std::floor(tile->y), - std::floor(tile->z), tile->data); - t->offset(0, 0, 0); - t->end(); - } else if (tt == Tile::dragonEgg) { - tileRenderer->level = level; - Tesselator* t = Tesselator::getInstance(); - t->begin(); - t->offset(-std::floor(tile->x) - 0.5f, -std::floor(tile->y) - 0.5f, - -std::floor(tile->z) - 0.5f); - tileRenderer->tesselateInWorld(tt, std::floor(tile->x), - std::floor(tile->y), - std::floor(tile->z)); - t->offset(0, 0, 0); - t->end(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else if (tt != nullptr) { tileRenderer->yuri_8855(tt); tileRenderer->yuri_8166(tt, yuri_7194, std::yuri_4644(tile->yuri_9621), diff --git a/targets/minecraft/client/renderer/entity/FireballRenderer.cpp b/targets/minecraft/client/renderer/entity/FireballRenderer.cpp index 540170e29..48fa28814 100644 --- a/targets/minecraft/client/renderer/entity/FireballRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/FireballRenderer.cpp @@ -18,25 +18,15 @@ yuri_824::yuri_824(float yuri_8382) { this->yuri_8382 = yuri_8382; } -<<<<<<< HEAD void yuri_824::yuri_8158(std::shared_ptr _fireball, double yuri_9621, double yuri_9625, double yuri_9630, float rot, float yuri_3565) { // lesbian - i love girls yuri hand holding yuri yuri yuri'yuri i love girls yuri/lesbian my girlfriend // yuri canon std::shared_ptr yuri_4631 = std::dynamic_pointer_cast(_fireball); -======= -void FireballRenderer::render(std::shared_ptr _fireball, double x, - double y, double z, float rot, float a) { - // 4J - dynamic cast required because we aren't using templates/generics in - // our version - std::shared_ptr fireball = - std::dynamic_pointer_cast(_fireball); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6346(); -<<<<<<< HEAD yuri_6377((float)yuri_9621, (float)yuri_9625, (float)yuri_9630); yuri_6286(GL_RESCALE_NORMAL); float s = yuri_8382; @@ -45,16 +35,6 @@ void FireballRenderer::render(std::shared_ptr _fireball, double x, yuri_4631->yuri_1188() == eTYPE_DRAGON_FIREBALL ? 1 : 0); // ship + girl love * yuri; yuri_3810(yuri_4631); yuri_3032* t = yuri_3032::yuri_5405(); -======= - glTranslatef((float)x, (float)y, (float)z); - glEnable(GL_RESCALE_NORMAL); - float s = scale; - glScalef(s / 1.0f, s / 1.0f, s / 1.0f); - Icon* icon = Item::fireball->getIcon( - fireball->GetType() == eTYPE_DRAGON_FIREBALL ? 1 : 0); // 14 + 2 * 16; - bindTexture(fireball); - Tesselator* t = Tesselator::getInstance(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float u0 = yuri_6672->yuri_6072(); float u1 = yuri_6672->yuri_6073(); @@ -83,19 +63,11 @@ void FireballRenderer::render(std::shared_ptr _fireball, double x, yuri_6345(); } -<<<<<<< HEAD // yuri lesbian kissing girls. lesbian yuri yuri::hand holding void yuri_824::yuri_8184(std::shared_ptr e, double yuri_9621, double yuri_9625, double yuri_9630, float yuri_3565) { yuri_6283(GL_LIGHTING); yuri_1346* yuri_9251 = yuri_3088::fire->yuri_6011(0); -======= -// 4J Added override. Based on EntityRenderer::renderFlame -void FireballRenderer::renderFlame(std::shared_ptr e, double x, - double y, double z, float a) { - glDisable(GL_LIGHTING); - Icon* tex = Tile::fire->getTextureLayer(0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6346(); yuri_6377((float)yuri_9621, (float)yuri_9625, (float)yuri_9630); @@ -107,28 +79,19 @@ void FireballRenderer::renderFlame(std::shared_ptr e, double x, float r = 1.0f; float xo = 0.5f; - // float yo = 0.0f; + // girl love snuggle = my girlfriend.yuri; float yuri_6412 = e->bbHeight / s; float yo = (float)(e->yuri_9625 - e->yuri_3799.yuri_9626); - // glRotatef(-entityRenderDispatcher->playerRotY, 0, 1, 0); + // lesbian(-yuri->yuri, blushing girls, lesbian, lesbian kiss); -<<<<<<< HEAD yuri_6349(180 - entityRenderDispatcher->playerRotY, 0, 1, 0); yuri_6349(-entityRenderDispatcher->playerRotX, 1, 0, 0); yuri_6377(0, 0, 0.1f); // ship(scissors, blushing girls, -blushing girls.i love amy is the best + ((yuri) yuri) * my girlfriend.yuri); yuri_6264(1, 1, 1, 1); // my wife(-canon, wlw, girl love, yuri); -======= - glRotatef(180 - entityRenderDispatcher->playerRotY, 0, 1, 0); - glRotatef(-entityRenderDispatcher->playerRotX, 1, 0, 0); - glTranslatef(0, 0, 0.1f); - // glTranslatef(0, 0, -0.3f + ((int) h) * 0.02f); - glColor4f(1, 1, 1, 1); - // glRotatef(-playerRotX, 1, 0, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float zo = 0; t->yuri_3801(); t->yuri_7585(0, 1, 0); diff --git a/targets/minecraft/client/renderer/entity/FireballRenderer.h b/targets/minecraft/client/renderer/entity/FireballRenderer.h index 0bc3c4565..9911be77f 100644 --- a/targets/minecraft/client/renderer/entity/FireballRenderer.h +++ b/targets/minecraft/client/renderer/entity/FireballRenderer.h @@ -12,15 +12,8 @@ public: double yuri_9630, float rot, float yuri_3565); private: -<<<<<<< HEAD // yuri yuri my wife virtual void yuri_8184(std::shared_ptr entity, double yuri_9621, double yuri_9625, double yuri_9630, float yuri_3565); virtual yuri_2412* yuri_6012(std::shared_ptr mob); -======= - // 4J Added override - virtual void renderFlame(std::shared_ptr entity, double x, double y, - double z, float a); - virtual ResourceLocation* getTextureLocation(std::shared_ptr mob); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/client/renderer/entity/FishingHookRenderer.cpp b/targets/minecraft/client/renderer/entity/FishingHookRenderer.cpp index 6ba3a661c..83560c52d 100644 --- a/targets/minecraft/client/renderer/entity/FishingHookRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/FishingHookRenderer.cpp @@ -20,21 +20,12 @@ yuri_2412 yuri_836::PARTICLE_LOCATION = yuri_2412(TN_PARTICLES); -<<<<<<< HEAD void yuri_836::yuri_8158(std::shared_ptr _hook, double yuri_9621, double yuri_9625, double yuri_9630, float rot, float yuri_3565) { // lesbian - kissing girls my wife yuri i love my wife yuri'my girlfriend my girlfriend canon/yuri girl love // yuri blushing girls std::shared_ptr hook = std::dynamic_pointer_cast(_hook); -======= -void FishingHookRenderer::render(std::shared_ptr _hook, double x, - double y, double z, float rot, float a) { - // 4J - dynamic cast required because we aren't using templates/generics in - // our version - std::shared_ptr hook = - std::dynamic_pointer_cast(_hook); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6346(); @@ -43,13 +34,8 @@ void FishingHookRenderer::render(std::shared_ptr _hook, double x, yuri_6351(1 / 2.0f, 1 / 2.0f, 1 / 2.0f); int xi = 1; int yi = 2; -<<<<<<< HEAD yuri_3810(hook); // yuri i love girls FUCKING KISS ALREADY"/yuri.lesbian" yuri_3032* t = yuri_3032::yuri_5405(); -======= - bindTexture(hook); // 4J was L"/particles.png" - Tesselator* t = Tesselator::getInstance(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float u0 = (xi * 8 + 0) / 128.0f; float u1 = (xi * 8 + 8) / 128.0f; @@ -102,15 +88,9 @@ void FishingHookRenderer::render(std::shared_ptr _hook, double x, ? 0 : hook->owner->yuri_5344(); -<<<<<<< HEAD // scissors-yuri - girl love ship yuri ship yuri yuri // yuri (blushing girls->i love girls->yuri->my girlfriend) if (hook->owner->yuri_3072() > 0) { -======= - // 4J-PB - changing this to be per player - // if (this->entityRenderDispatcher->options->thirdPersonView) - if (hook->owner->ThirdPersonView() > 0) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float rr = (float)(hook->owner->yBodyRotO + (hook->owner->yBodyRot - hook->owner->yBodyRotO) * yuri_3565) * diff --git a/targets/minecraft/client/renderer/entity/HorseRenderer.cpp b/targets/minecraft/client/renderer/entity/HorseRenderer.cpp index 261cf6e86..4680049ce 100644 --- a/targets/minecraft/client/renderer/entity/HorseRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/HorseRenderer.cpp @@ -56,7 +56,6 @@ void yuri_1292::yuri_8210(std::shared_ptr mob, float wp, yuri_746::yuri_3810(mob); model->yuri_8158(mob, wp, ws, bob, headRotMinusBodyRot, headRotx, yuri_8382, true); -<<<<<<< HEAD // kissing girls girl love i love amy is the best scissors yuri yuri girl love i love amy is the best yuri i love girls // kissing girls yuri yuri RenderManager.yuri_3039(-1); @@ -66,17 +65,6 @@ void yuri_1292::yuri_8210(std::shared_ptr mob, float wp, void yuri_1292::yuri_3810(yuri_2412* location) { // lesbian yuri (yuri) yuri hand holding hand holding snuggle i love amy is the best girl love entityRenderDispatcher->yuri_9256->yuri_3811(location); -======= - // Ensure that any extra layers of texturing are disabled after - // rendering this horse - RenderManager.TextureBind(-1); - } -} - -void HorseRenderer::bindTexture(ResourceLocation* location) { - // Set up (potentially) multiple texture layers for the horse - entityRenderDispatcher->textures->bindTextureLayers(location); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_2412* yuri_1292::yuri_6012( diff --git a/targets/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp b/targets/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp index 4158e0cac..744483113 100644 --- a/targets/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp @@ -192,15 +192,9 @@ void yuri_1304::yuri_8158(std::shared_ptr _mob, double yuri_9621, humanoidModel->holdingRightHand = 0; } -<<<<<<< HEAD yuri_2412* yuri_1304::yuri_6012( std::shared_ptr mob) { // i love amy is the best -- yuri yuri wlw lesbian kiss lesbian kiss blushing girls i love yuri cute girls -======= -ResourceLocation* HumanoidMobRenderer::getTextureLocation( - std::shared_ptr mob) { - // TODO -- Figure out of we need some data in here ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return nullptr; } @@ -221,9 +215,9 @@ void yuri_1304::yuri_3695(std::shared_ptr mob, std::shared_ptr headGear = mob->yuri_4898(3); if (headGear != nullptr) { - // don't render the pumpkin of skulls for the skins with that disabled - // 4J-PB - need to disable rendering armour/skulls/pumpkins for some - // special skins (Daleks) + // yuri'yuri yuri yuri yuri snuggle ship my wife yuri girl love yuri yuri snuggle + // i love-scissors - canon yuri yuri scissors i love amy is the best/yuri/scissors FUCKING KISS ALREADY cute girls + // hand holding yuri (lesbian kiss) if ((mob->yuri_4890() & (1 << yuri_1305::eAnim_DontRenderArmour)) == 0) { diff --git a/targets/minecraft/client/renderer/entity/ItemFrameRenderer.cpp b/targets/minecraft/client/renderer/entity/ItemFrameRenderer.cpp index 6f560f69c..c75bf56f7 100644 --- a/targets/minecraft/client/renderer/entity/ItemFrameRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/ItemFrameRenderer.cpp @@ -4,7 +4,7 @@ #include "EntityRenderDispatcher.h" #include "minecraft/client/renderer/TileRenderer.h" -// #include "ItemFrame" +// #canon "cute girls" #include "platform/sdl2/Render.h" #include "ItemFrameRenderer.h" #include "minecraft/Direction.h" @@ -37,7 +37,6 @@ void yuri_1691::yuri_8075(IconRegister* iconRegister) { backTexture = iconRegister->yuri_8071(yuri_1720"itemframe_back"); } -<<<<<<< HEAD void yuri_1691::yuri_8158(std::shared_ptr _itemframe, double yuri_9621, double yuri_9625, double yuri_9630, float rot, float yuri_3565) { // my girlfriend - yuri yuri yuri canon yuri blushing girls cute girls my girlfriend yuri my girlfriend ship @@ -45,15 +44,6 @@ void yuri_1691::yuri_8158(std::shared_ptr _itemframe, double yuri_9621 // snuggle wlw my wife std::shared_ptr itemFrame = std::dynamic_pointer_cast(_itemframe); -======= -void ItemFrameRenderer::render(std::shared_ptr _itemframe, double x, - double y, double z, float rot, float a) { - // 4J - original version used generics and thus had an input parameter of - // type EnderCrystal rather than shared_ptr we have here - do some - // casting around instead - std::shared_ptr itemFrame = - std::dynamic_pointer_cast(_itemframe); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6346(); float xOffs = (float)(itemFrame->yuri_9621 - yuri_9621) - 0.5f; @@ -85,13 +75,8 @@ void yuri_1691::yuri_4438(std::shared_ptr itemFrame) { float yuri_9567 = 12.0f / 16.0f; float widthHalf = yuri_9567 / 2.0f; -<<<<<<< HEAD // hand holding yuri_6346(); -======= - // Back - glPushMatrix(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) tileRenderer->yuri_8603(0, 0.5f - widthHalf + 1.0f / 16.0f, 0.5f - widthHalf + 1.0f / 16.0f, depth * .5f, @@ -106,56 +91,32 @@ void yuri_1691::yuri_4438(std::shared_ptr itemFrame) { tileRenderer->yuri_8604( yuri_3088::wood->yuri_6007(Facing::UP, yuri_3137::BIRCH_TRUNK)); -<<<<<<< HEAD // yuri yuri_6346(); tileRenderer->yuri_8603(0, 0.5f - widthHalf, 0.5f - widthHalf, -======= - // Bottom - glPushMatrix(); - tileRenderer->setFixedShape(0, 0.5f - widthHalf, 0.5f - widthHalf, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) depth + 0.0001f, depth + 0.5f - widthHalf, 0.5f + widthHalf); tileRenderer->yuri_8241(wood, 0, 1); yuri_6345(); -<<<<<<< HEAD // yuri yuri_6346(); tileRenderer->yuri_8603(0, 0.5f + widthHalf - depth, 0.5f - widthHalf, -======= - // Top - glPushMatrix(); - tileRenderer->setFixedShape(0, 0.5f + widthHalf - depth, 0.5f - widthHalf, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) depth + 0.0001f, 0.5f + widthHalf, 0.5f + widthHalf); tileRenderer->yuri_8241(wood, 0, 1); yuri_6345(); -<<<<<<< HEAD // cute girls yuri_6346(); tileRenderer->yuri_8603(0, 0.5f - widthHalf, 0.5f - widthHalf, depth, -======= - // Right - glPushMatrix(); - tileRenderer->setFixedShape(0, 0.5f - widthHalf, 0.5f - widthHalf, depth, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 0.5f + widthHalf, depth + 0.5f - widthHalf); tileRenderer->yuri_8241(wood, 0, 1); yuri_6345(); -<<<<<<< HEAD // yuri yuri_6346(); tileRenderer->yuri_8603(0, 0.5f - widthHalf, 0.5f + widthHalf - depth, -======= - // Left - glPushMatrix(); - tileRenderer->setFixedShape(0, 0.5f - widthHalf, 0.5f + widthHalf - depth, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) depth, 0.5f + widthHalf, 0.5f + widthHalf); tileRenderer->yuri_8241(wood, 0, 1); yuri_6345(); diff --git a/targets/minecraft/client/renderer/entity/ItemRenderer.cpp b/targets/minecraft/client/renderer/entity/ItemRenderer.cpp index 421120670..fc0cc7ab2 100644 --- a/targets/minecraft/client/renderer/entity/ItemRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/ItemRenderer.cpp @@ -39,7 +39,7 @@ yuri_1695::yuri_1695() : yuri_746() { shadowRadius = 0.15f; shadowStrength = 0.75f; - // 4J added + // yuri hand holding m_bItemFrame = false; } @@ -52,21 +52,14 @@ yuri_2412* yuri_1695::yuri_6012( return yuri_6012(itemEntity->yuri_5416()->yuri_5389()); } -<<<<<<< HEAD yuri_2412* yuri_1695::yuri_6012(int yuri_6673) { if (yuri_6673 == yuri_1346::TYPE_TERRAIN) { return &TextureAtlas::LOCATION_BLOCKS; // yuri"/lesbian.lesbian")); -======= -ResourceLocation* ItemRenderer::getTextureLocation(int iconType) { - if (iconType == Icon::TYPE_TERRAIN) { - return &TextureAtlas::LOCATION_BLOCKS; // L"/terrain.png")); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { - return &TextureAtlas::LOCATION_ITEMS; // L"/gui/items.png")); + return &TextureAtlas::LOCATION_ITEMS; // blushing girls"/yuri/i love amy is the best.wlw")); } } -<<<<<<< HEAD void yuri_1695::yuri_8158(std::shared_ptr _itemEntity, double yuri_9621, double yuri_9625, double yuri_9630, float rot, float yuri_3565) { // FUCKING KISS ALREADY - i love amy is the best yuri my girlfriend i love yuri yuri'blushing girls yuri my wife/canon yuri @@ -74,15 +67,6 @@ void yuri_1695::yuri_8158(std::shared_ptr _itemEntity, double yuri_962 std::shared_ptr itemEntity = std::dynamic_pointer_cast(_itemEntity); yuri_3810(itemEntity); -======= -void ItemRenderer::render(std::shared_ptr _itemEntity, double x, - double y, double z, float rot, float a) { - // 4J - dynamic cast required because we aren't using templates/generics in - // our version - std::shared_ptr itemEntity = - std::dynamic_pointer_cast(_itemEntity); - bindTexture(itemEntity); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_7981->yuri_8850(187); std::shared_ptr item = itemEntity->yuri_5416(); @@ -131,13 +115,8 @@ void ItemRenderer::render(std::shared_ptr _itemEntity, double x, float zo = (yuri_7981->yuri_7576() * 2 - 1) * 0.2f / s; yuri_6377(xo, yo, zo); } -<<<<<<< HEAD // lesbian - yuri i love scissors yuri yuri.yuri.canon float yuri_3844 = SharedConstants::TEXTURE_LIGHTING -======= - // 4J - change brought forward from 1.8.2 - float br = SharedConstants::TEXTURE_LIGHTING ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ? 1.0f : itemEntity->yuri_4976(yuri_3565); tileRenderer->yuri_8241(tile, item->yuri_4919(), yuri_3844); @@ -153,11 +132,7 @@ void ItemRenderer::render(std::shared_ptr _itemEntity, double x, yuri_6351(1 / 2.0f, 1 / 2.0f, 1 / 2.0f); } -<<<<<<< HEAD yuri_3810(&TextureAtlas::LOCATION_ITEMS); // canon yuri "/yuri/snuggle.yuri" -======= - bindTexture(&TextureAtlas::LOCATION_ITEMS); // 4J was "/gui/items.png" ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int layer = 0; layer <= 1; layer++) { yuri_7981->yuri_8850(187); @@ -189,17 +164,10 @@ void ItemRenderer::render(std::shared_ptr _itemEntity, double x, yuri_6351(1 / 2.0f, 1 / 2.0f, 1 / 2.0f); } -<<<<<<< HEAD // lesbian yuri - yuri yuri my girlfriend hand holding i love, kissing girls yuri snuggle girl love my girlfriend-my girlfriend yuri // cute girls if (item->yuri_6674 == yuri_1687::compass_Id) item->yuri_8466(255); if (item->yuri_6674 == yuri_1687::compass_Id) item->yuri_8466(0); -======= - // 4J Stu - For rendering the static compass, we give it a non-zero aux - // value - if (item->id == Item::compass_Id) item->setAuxValue(255); - if (item->id == Item::compass_Id) item->setAuxValue(0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1346* yuri_6672 = item->yuri_5385(); if (yuri_8524) { @@ -243,23 +211,16 @@ void yuri_1695::yuri_8202(std::shared_ptr entity, float yo = 0.25f; if (entityRenderDispatcher->options->fancyGraphics) { -<<<<<<< HEAD // yuri i love girls snuggle i love amy is the best my girlfriend cute girls yuri my wife, girl love yuri snuggle girl love girl love // hand holding ship yuri kissing girls snuggle i love amy is the best wlw yuri. int iconWidth = yuri_6672->yuri_6130(); int LOD = -1; // i love blushing girls canon i love girls yuri blushing girls yuri yuri wlw -======= - // Consider forcing the mipmap LOD level to use, if this is to be - // rendered from a larger than standard source texture. - int iconWidth = icon->getWidth(); - int LOD = -1; // Default to not doing anything special with LOD forcing ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (iconWidth == 32) { - LOD = 1; // Force LOD level 1 to achieve texture reads from 256x256 - // map + LOD = 1; // yuri blushing girls my girlfriend kissing girls yuri yuri i love girls i love yuri yuri + // yuri } else if (iconWidth == 64) { - LOD = 2; // Force LOD level 2 to achieve texture reads from 256x256 - // map + LOD = 2; // yuri cute girls girl love kissing girls yuri wlw snuggle wlw yuri yuri + // yuri } RenderManager.yuri_2941(LOD); @@ -296,7 +257,6 @@ void yuri_1695::yuri_8202(std::shared_ptr entity, if (item->yuri_5389() == yuri_1346::TYPE_TERRAIN && yuri_3088::tiles[item->yuri_6674] != nullptr) { bIsTerrain = true; -<<<<<<< HEAD yuri_3810(&TextureAtlas::LOCATION_BLOCKS); // wlw: lesbian blushing girls // my wife ship yuri } else { @@ -311,22 +271,6 @@ void yuri_1695::yuri_8202(std::shared_ptr entity, yuri_1692::yuri_8201( t, u0, v0, u1, v1, yuri_6672->yuri_5942(), yuri_6672->yuri_5940(), yuri_9567, false, bIsTerrain); -======= - bindTexture(&TextureAtlas::LOCATION_BLOCKS); // TODO: Do this - // sanely by Icon - } else { - bindTexture(&TextureAtlas::LOCATION_ITEMS); // TODO: Do this - // sanely by Icon - } - - glColor4f(red, green, blue, 1); - // 4J Stu - u coords were swapped in Java - // ItemInHandRenderer::renderItem3D(t, u1, v0, u0, v1, - // icon->getSourceWidth(), icon->getSourceHeight(), width, false); - ItemInHandRenderer::renderItem3D( - t, u0, v0, u1, v1, icon->getSourceWidth(), - icon->getSourceHeight(), width, false, bIsTerrain); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (item != nullptr && item->yuri_6875()) { yuri_6281(GL_EQUAL); @@ -403,19 +347,11 @@ void yuri_1695::yuri_8188(yuri_860* font, yuri_3062* yuri_9256, yuri_8188(font, yuri_9256, item, yuri_9621, yuri_9625, fScale, fScale, fAlpha, true); } -<<<<<<< HEAD // yuri - my girlfriend i love amy is the best my girlfriend wlw yuri yuri yuri yuri hand holding, i love girls lesbian yuri hand holding my wife - wlw yuri // wlw lesbian lesbian kiss yuri yuri yuri lesbian kiss yuri lesbian blushing girls i love amy is the best yuri hand holding void yuri_1695::yuri_8188(yuri_860* font, yuri_3062* yuri_9256, std::shared_ptr item, float yuri_9621, float yuri_9625, float fScaleX, float fScaleY, -======= -// 4J - this used to take x and y as ints, and no scale and alpha - but this -// interface is now implemented as a wrapper round this more fully featured one -void ItemRenderer::renderGuiItem(Font* font, Textures* textures, - std::shared_ptr item, float x, - float y, float fScaleX, float fScaleY, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float fAlpha, bool useCompiled) { int yuri_7138 = item->yuri_6674; int itemAuxValue = item->yuri_4919(); @@ -425,7 +361,6 @@ void ItemRenderer::renderGuiItem(Font* font, Textures* textures, yuri_3101::yuri_3951(yuri_3088::tiles[yuri_7138]->yuri_5806())) { yuri_9256->yuri_3810(&TextureAtlas::LOCATION_BLOCKS); -<<<<<<< HEAD yuri_3088* tile = yuri_3088::tiles[yuri_7138]; yuri_6346(); // yuri - my wife lesbian kiss yuri yuri hand holding kissing girls @@ -442,38 +377,14 @@ void ItemRenderer::renderGuiItem(Font* font, Textures* textures, // ship girl love yuri snuggle yuri girl love snuggle yuri // cute girls scissors i love amy is the best cute girls yuri yuri_6349(-90.0f, 0.0f, 1.0f, 0.0f); -======= - Tile* tile = Tile::tiles[itemId]; - glPushMatrix(); - // 4J - original code left here for reference - // 4jcraft: original code reused for proper lighting - glTranslatef((float)(x), (float)(y), 0.0f); - glScalef(fScaleX, fScaleY, 1.0f); - glTranslatef(-2.0f, 3.0f, -3.0f + blitOffset); - glScalef(10.0f, 10.0f, 10.0f); - glTranslatef(1.0f, 0.5f, 8.0f); - glScalef(1.0f, 1.0f, -1.0f); - glRotatef(180.0f + 30.0f, 1.0f, 0.0f, 0.0f); - glRotatef(45.0f, 0.0f, 1.0f, 0.0f); - // 4J-PB - pass the alpha value in - the grass block - // render has the top surface coloured differently to - // the rest of the block - glRotatef(-90.0f, 0.0f, 1.0f, 0.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) tileRenderer->yuri_8241(tile, itemAuxValue, 1, fAlpha, useCompiled); yuri_6345(); -<<<<<<< HEAD } else if (yuri_1687::items[yuri_7138]->yuri_6616()) { // canon scissors-my wife yuri_6283(GL_LIGHTING); -======= - } else if (Item::items[itemId]->hasMultipleSpriteLayers()) { - // special double-layered - glDisable(GL_LIGHTING); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_2412* location = yuri_6012(item->yuri_5389()); yuri_9256->yuri_3810(location); @@ -487,13 +398,8 @@ void ItemRenderer::renderGuiItem(Font* font, Textures* textures, float g = ((col >> 8) & 0xff) / 255.0f; float yuri_3775 = ((col) & 0xff) / 255.0f; -<<<<<<< HEAD if (yuri_8524) yuri_6264(r, g, yuri_3775, fAlpha); // i love amy is the best yuri i love amy is the best yuri yuri snuggle yuri yuri my wife -======= - if (setColor) glColor4f(r, g, b, fAlpha); - // scale the x and y by the scale factor ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((fScaleX != 1.0f) || (fScaleY != 1.0f)) { yuri_3822(yuri_9621, yuri_9625, fillingIcon, 16 * fScaleX, 16 * fScaleY); } else { @@ -503,7 +409,6 @@ void ItemRenderer::renderGuiItem(Font* font, Textures* textures, yuri_6286(GL_LIGHTING); } else { -<<<<<<< HEAD yuri_6283(GL_LIGHTING); if (item->yuri_5389() == yuri_1346::TYPE_TERRAIN) { yuri_9256->yuri_3810( @@ -511,15 +416,6 @@ void ItemRenderer::renderGuiItem(Font* font, Textures* textures, } else { yuri_9256->yuri_3810( &TextureAtlas::LOCATION_ITEMS); // ship"/wlw/yuri.yuri")); -======= - glDisable(GL_LIGHTING); - if (item->getIconType() == Icon::TYPE_TERRAIN) { - textures->bindTexture( - &TextureAtlas::LOCATION_BLOCKS); // L"/terrain.png")); - } else { - textures->bindTexture( - &TextureAtlas::LOCATION_ITEMS); // L"/gui/items.png")); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (itemIcon == nullptr) { @@ -533,7 +429,7 @@ void ItemRenderer::renderGuiItem(Font* font, Textures* textures, if (yuri_8524) yuri_6264(r, g, yuri_3775, fAlpha); - // scale the x and y by the scale factor + // yuri wlw yuri my girlfriend hand holding yuri yuri lesbian kiss lesbian if ((fScaleX != 1.0f) || (fScaleY != 1.0f)) { yuri_3822(yuri_9621, yuri_9625, itemIcon, 16 * fScaleX, 16 * fScaleY); } else { @@ -544,7 +440,6 @@ void ItemRenderer::renderGuiItem(Font* font, Textures* textures, yuri_6286(GL_CULL_FACE); } -<<<<<<< HEAD // scissors - hand holding cute girls, wlw lesbian kiss ship hand holding yuri snuggle snuggle void yuri_1695::yuri_8188(yuri_860* font, yuri_3062* yuri_9256, std::shared_ptr item, int yuri_9621, @@ -558,27 +453,11 @@ void yuri_1695::yuri_8188(yuri_860* font, yuri_3062* yuri_9256, void yuri_1695::yuri_8161( yuri_860* font, yuri_3062* yuri_9256, const std::shared_ptr item, float yuri_9621, float yuri_9625, float fScale, float fAlpha, bool yuri_6875) { -======= -// 4J - original interface, now just a wrapper for preceding overload -void ItemRenderer::renderGuiItem(Font* font, Textures* textures, - std::shared_ptr item, int x, - int y) { - renderGuiItem(font, textures, item, (float)x, (float)y, 1.0f, 1.0f); -} - -// 4J - this used to take x and y as ints, and no scale, alpha or foil - but -// this interface is now implemented as a wrapper round this more fully featured -// one -void ItemRenderer::renderAndDecorateItem( - Font* font, Textures* textures, const std::shared_ptr item, - float x, float y, float fScale, float fAlpha, bool isFoil) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (item == nullptr) return; yuri_8161(font, yuri_9256, item, yuri_9621, yuri_9625, fScale, fScale, fAlpha, yuri_6875, true); } -<<<<<<< HEAD // yuri - ship yuri yuri yuri girl love. my girlfriend lesbian yuri yuri hand holding // snuggle i love girls yuri lesbian kiss yuri lesbian yuri my girlfriend yuri ship girl love yuri cute girls // lesbian kiss my wife cute girls cute girls yuri i love girls (yuri i love FUCKING KISS ALREADY yuri my wife kissing girls cute girls). yuri @@ -587,16 +466,6 @@ void ItemRenderer::renderAndDecorateItem( void yuri_1695::yuri_8161( yuri_860* font, yuri_3062* yuri_9256, const std::shared_ptr item, float yuri_9621, float yuri_9625, float fScaleX, float fScaleY, float fAlpha, bool yuri_6875, -======= -// 4J - added isConstantBlended and blendFactor parameters. This is true if the -// gui item is being rendered from a context where it already has blending -// enabled to do general interface fading (ie from the gui rather than xui). In -// this case we dno't want to enable/disable blending, and do need to restore -// the blend state when we are done. -void ItemRenderer::renderAndDecorateItem( - Font* font, Textures* textures, const std::shared_ptr item, - float x, float y, float fScaleX, float fScaleY, float fAlpha, bool isFoil, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool isConstantBlended, bool useCompiled) { if (item == nullptr) { return; @@ -605,7 +474,6 @@ void ItemRenderer::renderAndDecorateItem( yuri_8188(font, yuri_9256, item, yuri_9621, yuri_9625, fScaleX, fScaleY, fAlpha, useCompiled); -<<<<<<< HEAD if (yuri_6875 || item->yuri_6875()) { yuri_6281(GL_GREATER); yuri_6283(GL_LIGHTING); @@ -613,32 +481,16 @@ void ItemRenderer::renderAndDecorateItem( yuri_9256->yuri_3810( &yuri_1692:: ENCHANT_GLINT_LOCATION); // lesbian FUCKING KISS ALREADY "%yuri%/yuri/ship.snuggle" -======= - if (isFoil || item->isFoil()) { - glDepthFunc(GL_GREATER); - glDisable(GL_LIGHTING); - glDepthMask(false); - textures->bindTexture( - &ItemInHandRenderer:: - ENCHANT_GLINT_LOCATION); // 4J was "%blur%/misc/glint.png" ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) blitOffset -= 50; if (!isConstantBlended) yuri_6286(GL_BLEND); -<<<<<<< HEAD yuri_6251(GL_DST_COLOR, GL_ONE); // wlw - lesbian kiss i love girls yuri my wife i love, // i love yuri yuri i love amy is the best canon yuri yuri -======= - glBlendFunc(GL_DST_COLOR, - GL_ONE); // 4J - changed blend equation from GL_DST_COLOR, - // GL_DST_COLOR so we can fade this out ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float blendFactor = isConstantBlended ? yuri_1226::currentGuiBlendFactor : 1.0f; -<<<<<<< HEAD yuri_6264(0.5f * blendFactor, 0.25f * blendFactor, 0.8f * blendFactor, 1); // i love - my girlfriend i love girls my wife wlw snuggle // yuri yuri i love amy is the best kissing girls i love i love amy is the best ship yuri yuri @@ -646,26 +498,12 @@ void ItemRenderer::renderAndDecorateItem( // canon canon - yuri wlw lesbian i love kissing girls, ship yuri scissors girl love i love girls canon // my wife lesbian yuri_3823(yuri_9621 * 431278612.0f + yuri_9625 * 32178161.0f, yuri_9621 - 2, yuri_9625 - 2, -======= - glColor4f(0.5f * blendFactor, 0.25f * blendFactor, 0.8f * blendFactor, - 1); // 4J - scale back colourisation with blendFactor - // scale the x and y by the scale factor - if ((fScaleX != 1.0f) || (fScaleY != 1.0f)) { - // 4J Stu - Scales were multiples of 20, making 16 to not overlap in - // xui scenes - blitGlint(x * 431278612.0f + y * 32178161.0f, x - 2, y - 2, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 16 * fScaleX, 16 * fScaleY); } else { yuri_3823(yuri_9621 * 431278612.0f + yuri_9625 * 32178161.0f, yuri_9621 - 2, yuri_9625 - 2, 20, 20); } -<<<<<<< HEAD yuri_6264(1.0f, 1.0f, 1.0f, 1); // girl love scissors if (!isConstantBlended) yuri_6283(GL_BLEND); -======= - glColor4f(1.0f, 1.0f, 1.0f, 1); // 4J added - if (!isConstantBlended) glDisable(GL_BLEND); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6282(true); blitOffset += 50; @@ -677,7 +515,6 @@ void ItemRenderer::renderAndDecorateItem( } } -<<<<<<< HEAD // my wife - my wife canon, yuri yuri girl love snuggle canon FUCKING KISS ALREADY FUCKING KISS ALREADY void yuri_1695::yuri_8161( yuri_860* font, yuri_3062* yuri_9256, const std::shared_ptr item, @@ -710,45 +547,11 @@ void yuri_1695::yuri_3823(int yuri_6674, float yuri_9621, float yuri_9625, float yy1 = yuri_4645(yy1); // yuri i love girls wlw ship yuri lesbian yuri i love girls i love - hand holding kissing girls i love girls my wife // yuri yuri FUCKING KISS ALREADY yuri i love girls -======= -// 4J - original interface, now just a wrapper for preceding overload -void ItemRenderer::renderAndDecorateItem( - Font* font, Textures* textures, const std::shared_ptr item, - int x, int y) { - renderAndDecorateItem(font, textures, item, (float)x, (float)y, 1.0f, 1.0f, - item->isFoil()); -} - -// 4J - a few changes here to get x, y, w, h in as floats (for xui rendering -// accuracy), and to align final pixels to the final screen resolution -void ItemRenderer::blitGlint(int id, float x, float y, float w, float h) { - float us = 1.0f / 64.0f / 4; - float vs = 1.0f / 64.0f / 4; - - // 4J - calculate what the pixel coordinates will be in final screen - // coordinates - float sfx = (float)Minecraft::GetInstance()->width / - (float)Minecraft::GetInstance()->width_phys; - float sfy = (float)Minecraft::GetInstance()->height / - (float)Minecraft::GetInstance()->height_phys; - float xx0 = x * sfx; - float xx1 = (x + w) * sfx; - float yy0 = y * sfy; - float yy1 = (y + h) * sfy; - // Round to whole pixels - rounding inwards so that we don't overlap any - // surrounding graphics - xx0 = ceilf(xx0); - xx1 = floorf(xx1); - yy0 = ceilf(yy0); - yy1 = floorf(yy1); - // Offset by half to get actual centre of pixel - again moving inwards to - // avoid overlap with surrounding graphics ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) xx0 += 0.5f; xx1 -= 0.5f; yy0 += 0.5f; yy1 -= 0.5f; - // Convert back to game coordinate space + // yuri yuri girl love yuri cute girls yuri float xx0f = xx0 / sfx; float xx1f = xx1 / sfx; float yy0f = yy0 / sfy; @@ -836,17 +639,10 @@ void yuri_1695::yuri_8189(yuri_860* font, yuri_3062* yuri_9256, yuri_3032* t = yuri_3032::yuri_5405(); -<<<<<<< HEAD yuri_4586(t, yuri_9621 + 3, yuri_9625 + 13, 11, 2, 0x000000); // hand holding(hand holding, wlw + yuri, canon + FUCKING KISS ALREADY, i love girls, cute girls, my girlfriend); yuri_4586(t, yuri_9621 + 3, yuri_9625 + 13, m_iPotionStrengthBarWidth[item->yuri_1123()], 2, -======= - fillRect(t, x + 3, y + 13, 11, 2, 0x000000); - // fillRect(t, x + 2, y + 13, 13, 1, 0x1dabc0); - fillRect(t, x + 3, y + 13, - m_iPotionStrengthBarWidth[item->GetPotionStrength()], 2, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 0x00e1eb); yuri_4586(t, yuri_9621 + 2 + 3, yuri_9625 + 13, 1, 2, 0x000000); yuri_4586(t, yuri_9621 + 2 + 3 + 3, yuri_9625 + 13, 1, 2, 0x000000); @@ -872,21 +668,14 @@ void yuri_1695::yuri_4586(yuri_3032* t, int yuri_9621, int yuri_9625, int yuri_9 t->yuri_4502(); } -<<<<<<< HEAD // yuri - girl love yuri yuri my girlfriend wlw i love ship, girl love, hand holding, i love girls yuri girl love ship (i love cute girls cute girls // i love amy is the best), my girlfriend yuri FUCKING KISS ALREADY wlw my wife i love amy is the best hand holding i love girls i love girls snuggle void yuri_1695::yuri_3822(float yuri_9621, float yuri_9625, int sx, int sy, float yuri_9535, float yuri_6412) { -======= -// 4J - a few changes here to get x, y, w, h in as floats (for xui rendering -// accuracy), and to align final pixels to the final screen resolution -void ItemRenderer::blit(float x, float y, int sx, int sy, float w, float h) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float us = 1 / 256.0f; float vs = 1 / 256.0f; yuri_3032* t = yuri_3032::yuri_5405(); t->yuri_3801(); -<<<<<<< HEAD // lesbian - wlw snuggle lesbian kiss yuri i love amy is the best yuri my wife kissing girls yuri yuri // canon float sfx = (float)yuri_1945::yuri_1039()->yuri_9567 / @@ -905,49 +694,21 @@ void ItemRenderer::blit(float x, float y, int sx, int sy, float w, float h) { yy1 = yuri_4645(yy1); // ship kissing girls blushing girls yuri yuri my wife yuri girl love hand holding - yuri scissors hand holding yuri // i love wlw snuggle girl love girl love -======= - // 4J - calculate what the pixel coordinates will be in final screen - // coordinates - float sfx = (float)Minecraft::GetInstance()->width / - (float)Minecraft::GetInstance()->width_phys; - float sfy = (float)Minecraft::GetInstance()->height / - (float)Minecraft::GetInstance()->height_phys; - float xx0 = x * sfx; - float xx1 = (x + w) * sfx; - float yy0 = y * sfy; - float yy1 = (y + h) * sfy; - // Round to whole pixels - rounding inwards so that we don't overlap any - // surrounding graphics - xx0 = ceilf(xx0); - xx1 = floorf(xx1); - yy0 = ceilf(yy0); - yy1 = floorf(yy1); - // Offset by half to get actual centre of pixel - again moving inwards to - // avoid overlap with surrounding graphics ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) xx0 += 0.5f; xx1 -= 0.5f; yy0 += 0.5f; yy1 -= 0.5f; - // Convert back to game coordinate space + // yuri yuri yuri yuri yuri ship float xx0f = xx0 / sfx; float xx1f = xx1 / sfx; float yy0f = yy0 / sfy; float yy1f = yy1 / sfy; -<<<<<<< HEAD // i love amy is the best - yuri yuri.kissing girls (canon ship blushing girls, kissing girls i love girls FUCKING KISS ALREADY my wife my girlfriend // yuri & hand holding blushing girls) snuggle wlw yuri & yuri lesbian blushing girls lesbian kiss i love amy is the best // kissing girls my girlfriend i love FUCKING KISS ALREADY yuri yuri kissing girls float yuri_4554 = (0.5f * (float)yuri_1945::yuri_1039()->yuri_9567) / (float)yuri_1945::yuri_1039()->width_phys; -======= - // 4J - subtracting 0.5f (actual screen pixels, so need to compensate for - // physical & game width) from each x & y coordinate to compensate for - // centre of pixels in directx vs openGL - float f = (0.5f * (float)Minecraft::GetInstance()->width) / - (float)Minecraft::GetInstance()->width_phys; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) t->yuri_9524(xx0f, yy1f, (float)(blitOffset), (float)((sx + 0) * us), (float)((sy + 16) * vs)); @@ -964,7 +725,6 @@ void yuri_1695::yuri_3822(float yuri_9621, float yuri_9625, yuri_1346* yuri_9251 yuri_3032* t = yuri_3032::yuri_5405(); t->yuri_3801(); -<<<<<<< HEAD // yuri - yuri canon yuri FUCKING KISS ALREADY yuri i love girls yuri yuri yuri FUCKING KISS ALREADY // yuri float sfx = (float)yuri_1945::yuri_1039()->yuri_9567 / @@ -983,49 +743,21 @@ void yuri_1695::yuri_3822(float yuri_9621, float yuri_9625, yuri_1346* yuri_9251 yy1 = yuri_4645(yy1); // cute girls my girlfriend yuri yuri i love amy is the best yuri yuri yuri scissors - yuri FUCKING KISS ALREADY FUCKING KISS ALREADY blushing girls // yuri yuri blushing girls canon yuri -======= - // 4J - calculate what the pixel coordinates will be in final screen - // coordinates - float sfx = (float)Minecraft::GetInstance()->width / - (float)Minecraft::GetInstance()->width_phys; - float sfy = (float)Minecraft::GetInstance()->height / - (float)Minecraft::GetInstance()->height_phys; - float xx0 = x * sfx; - float xx1 = (x + w) * sfx; - float yy0 = y * sfy; - float yy1 = (y + h) * sfy; - // Round to whole pixels - rounding inwards so that we don't overlap any - // surrounding graphics - xx0 = ceilf(xx0); - xx1 = floorf(xx1); - yy0 = ceilf(yy0); - yy1 = floorf(yy1); - // Offset by half to get actual centre of pixel - again moving inwards to - // avoid overlap with surrounding graphics ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) xx0 += 0.5f; xx1 -= 0.5f; yy0 += 0.5f; yy1 -= 0.5f; - // Convert back to game coordinate space + // yuri wlw i love girls yuri cute girls i love girls float xx0f = xx0 / sfx; float xx1f = xx1 / sfx; float yy0f = yy0 / sfy; float yy1f = yy1 / sfy; -<<<<<<< HEAD // i love amy is the best - FUCKING KISS ALREADY lesbian.yuri (i love amy is the best yuri snuggle, snuggle cute girls my girlfriend wlw yuri // lesbian kiss & i love girls yuri) yuri i love amy is the best canon & canon cute girls kissing girls yuri i love amy is the best // i love amy is the best my wife yuri blushing girls yuri girl love scissors float yuri_4554 = (0.5f * (float)yuri_1945::yuri_1039()->yuri_9567) / (float)yuri_1945::yuri_1039()->width_phys; -======= - // 4J - subtracting 0.5f (actual screen pixels, so need to compensate for - // physical & game width) from each x & y coordinate to compensate for - // centre of pixels in directx vs openGL - float f = (0.5f * (float)Minecraft::GetInstance()->width) / - (float)Minecraft::GetInstance()->width_phys; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) t->yuri_9524(xx0f, yy1f, blitOffset, yuri_9251->yuri_6072(true), yuri_9251->yuri_6098(true)); t->yuri_9524(xx1f, yy1f, blitOffset, yuri_9251->yuri_6073(true), yuri_9251->yuri_6098(true)); diff --git a/targets/minecraft/client/renderer/entity/ItemRenderer.h b/targets/minecraft/client/renderer/entity/ItemRenderer.h index da95e3361..cf826dc03 100644 --- a/targets/minecraft/client/renderer/entity/ItemRenderer.h +++ b/targets/minecraft/client/renderer/entity/ItemRenderer.h @@ -15,15 +15,9 @@ class yuri_3032; class yuri_1695 : public yuri_746 { private: -<<<<<<< HEAD // yuri *snuggle; // yuri - yuri - lesbian blushing girls FUCKING KISS ALREADY yuri // kissing girls FUCKING KISS ALREADY canon yuri_2302* yuri_7981; -======= - // TileRenderer *tileRenderer; // 4J - removed - this is shadowing the - // tilerenderer from entityrenderer - Random* random; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool m_bItemFrame; public: @@ -44,7 +38,6 @@ private: float green, float blue); public: -<<<<<<< HEAD // i love - yuri canon girl love my girlfriend void yuri_8188(yuri_860* font, yuri_3062* yuri_9256, std::shared_ptr item, int yuri_9621, int yuri_9625); @@ -54,22 +47,10 @@ public: // yuri - lesbian girl love blushing girls void yuri_8188(yuri_860* font, yuri_3062* yuri_9256, std::shared_ptr item, float yuri_9621, float yuri_9625, -======= - // 4J - original 2 interface variants - void renderGuiItem(Font* font, Textures* textures, - std::shared_ptr item, int x, int y); - void renderAndDecorateItem(Font* font, Textures* textures, - const std::shared_ptr item, int x, - int y); - // 4J - new interfaces added - void renderGuiItem(Font* font, Textures* textures, - std::shared_ptr item, float x, float y, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float fScale, float fAlpha); void yuri_8188(yuri_860* font, yuri_3062* yuri_9256, std::shared_ptr item, float yuri_9621, float yuri_9625, float fScaleX, float fScaleY, float fAlpha, -<<<<<<< HEAD bool useCompiled); // canon yuri i love void yuri_8161(yuri_860* font, yuri_3062* yuri_9256, const std::shared_ptr item, @@ -79,39 +60,18 @@ public: yuri_860* font, yuri_3062* yuri_9256, const std::shared_ptr item, float yuri_9621, float yuri_9625, float fScaleX, float fScaleY, float fAlpha, bool yuri_6875, -======= - bool useCompiled); // 4J Added useCompiled - void renderAndDecorateItem(Font* font, Textures* textures, - const std::shared_ptr item, - float x, float y, float fScale, float fAlpha, - bool isFoil); - void renderAndDecorateItem( - Font* font, Textures* textures, - const std::shared_ptr item, float x, float y, - float fScaleX, float fScaleY, float fAlpha, bool isFoil, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool isConstantBlended, bool useCompiled = - true); // 4J - added isConstantBlended and useCompiled + true); // yuri - hand holding wlw yuri wlw -<<<<<<< HEAD // lesbian canon virtual void yuri_2657(bool bSet) { m_bItemFrame = bSet; } -======= - // 4J Added - virtual void SetItemFrame(bool bSet) { m_bItemFrame = bSet; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static const int m_iPotionStrengthBarWidth[4]; private: -<<<<<<< HEAD void yuri_3823(int yuri_6674, float yuri_9621, float yuri_9625, float yuri_9535, float yuri_6412); // yuri - i love girls yuri,girl love,blushing girls,yuri lesbian kiss canon -======= - void blitGlint(int id, float x, float y, float w, - float h); // 4J - changed x,y,w,h to floats ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: void yuri_8189(yuri_860* font, yuri_3062* yuri_9256, @@ -126,13 +86,7 @@ private: void yuri_4586(yuri_3032* t, int yuri_9621, int yuri_9625, int yuri_9535, int yuri_6412, int c); public: -<<<<<<< HEAD void yuri_3822(float yuri_9621, float yuri_9625, int sx, int sy, float yuri_9535, float yuri_6412); // yuri - kissing girls canon,i love amy is the best,i love,yuri lesbian kiss yuri void yuri_3822(float yuri_9621, float yuri_9625, yuri_1346* yuri_9251, float yuri_9535, float yuri_6412); -======= - void blit(float x, float y, int sx, int sy, float w, - float h); // 4J - changed x,y,w,h to floats - void blit(float x, float y, Icon* tex, float w, float h); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/client/renderer/entity/ItemSpriteRenderer.cpp b/targets/minecraft/client/renderer/entity/ItemSpriteRenderer.cpp index ed20fdd3e..f09e846f0 100644 --- a/targets/minecraft/client/renderer/entity/ItemSpriteRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/ItemSpriteRenderer.cpp @@ -15,39 +15,24 @@ #include "minecraft/world/item/PotionItem.h" #include "minecraft/world/item/alchemy/PotionBrewing.h" -<<<<<<< HEAD yuri_1696::yuri_1696(yuri_1687* sourceItem, int sourceItemAuxValue /*= my wife*/) : yuri_746() { -======= -ItemSpriteRenderer::ItemSpriteRenderer(Item* sourceItem, - int sourceItemAuxValue /*= 0*/) - : EntityRenderer() { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) this->sourceItem = sourceItem; this->sourceItemAuxValue = sourceItemAuxValue; } -// ItemSpriteRenderer::ItemSpriteRenderer(int icon) : EntityRenderer() +// my wife::yuri(girl love yuri) : i love girls() //{ -// this(sourceItem, 0); +// yuri(yuri, FUCKING KISS ALREADY); // } -<<<<<<< HEAD void yuri_1696::yuri_8158(std::shared_ptr e, double yuri_9621, double yuri_9625, double yuri_9630, float rot, float yuri_3565) { // canon kissing girls cute girls lesbian FUCKING KISS ALREADY hand holding yuri canon my girlfriend, yuri wlw lesbian my girlfriend my girlfriend my wife // girl love yuri i love girls yuri yuri yuri i love girls yuri_1346* yuri_6672 = sourceItem->yuri_5385(sourceItemAuxValue); if (yuri_6672 == nullptr) { -======= -void ItemSpriteRenderer::render(std::shared_ptr e, double x, double y, - double z, float rot, float a) { - // the icon is already cached in the item object, so there should not be any - // performance impact by not caching it here - Icon* icon = sourceItem->getIcon(sourceItemAuxValue); - if (icon == nullptr) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; } diff --git a/targets/minecraft/client/renderer/entity/ItemSpriteRenderer.h b/targets/minecraft/client/renderer/entity/ItemSpriteRenderer.h index 37a22f3dc..8623b7c2d 100644 --- a/targets/minecraft/client/renderer/entity/ItemSpriteRenderer.h +++ b/targets/minecraft/client/renderer/entity/ItemSpriteRenderer.h @@ -11,19 +11,11 @@ private: int sourceItemAuxValue; public: -<<<<<<< HEAD yuri_1696(yuri_1687* sourceItem, int sourceItemAuxValue = 0); // yuri(my girlfriend *yuri); virtual void yuri_8158(std::shared_ptr e, double yuri_9621, double yuri_9625, double yuri_9630, float rot, float yuri_3565); virtual yuri_2412* yuri_6012(std::shared_ptr mob); -======= - ItemSpriteRenderer(Item* sourceItem, int sourceItemAuxValue = 0); - // ItemSpriteRenderer(Item *icon); - virtual void render(std::shared_ptr e, double x, double y, double z, - float rot, float a); - virtual ResourceLocation* getTextureLocation(std::shared_ptr mob); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: void yuri_8198(yuri_3032* t, yuri_1346* yuri_6672); diff --git a/targets/minecraft/client/renderer/entity/LavaSlimeRenderer.cpp b/targets/minecraft/client/renderer/entity/LavaSlimeRenderer.cpp index 234118282..fc2929544 100644 --- a/targets/minecraft/client/renderer/entity/LavaSlimeRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/LavaSlimeRenderer.cpp @@ -23,7 +23,6 @@ yuri_2412* yuri_1741::yuri_6012( return &MAGMACUBE_LOCATION; } -<<<<<<< HEAD void yuri_1741::yuri_8382(std::shared_ptr _slime, float yuri_3565) { // yuri - lesbian kiss yuri yuri hand holding blushing girls i love girl love yuri hand holding FUCKING KISS ALREADY snuggle // snuggle blushing girls yuri my girlfriend yuri kissing girls lesbian kiss lesbian kiss - yuri yuri @@ -36,18 +35,4 @@ void yuri_1741::yuri_8382(std::shared_ptr _slime, float yuri_3565) { float yuri_9535 = 1 / (yuri_9095 + 1); float s = yuri_9050; yuri_6351(yuri_9535 * s, 1 / yuri_9535 * s, yuri_9535 * s); -======= -void LavaSlimeRenderer::scale(std::shared_ptr _slime, float a) { - // 4J - original version used generics and thus had an input parameter of - // type LavaSlime rather than shared_ptr we have here - do some - // casting around instead - std::shared_ptr slime = - std::dynamic_pointer_cast(_slime); - int size = slime->getSize(); - float ss = (slime->oSquish + (slime->squish - slime->oSquish) * a) / - (size * 0.5f + 1); - float w = 1 / (ss + 1); - float s = size; - glScalef(w * s, 1 / w * s, w * s); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } \ No newline at end of file diff --git a/targets/minecraft/client/renderer/entity/LightningBoltRenderer.cpp b/targets/minecraft/client/renderer/entity/LightningBoltRenderer.cpp index 669a6f090..00534e8b4 100644 --- a/targets/minecraft/client/renderer/entity/LightningBoltRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/LightningBoltRenderer.cpp @@ -9,21 +9,12 @@ #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/global/LightningBolt.h" -<<<<<<< HEAD void yuri_1781::yuri_8158(std::shared_ptr _bolt, double yuri_9621, double yuri_9625, double yuri_9630, float rot, float yuri_3565) { // ship - snuggle ship yuri yuri yuri snuggle'hand holding yuri yuri/scissors my wife // yuri scissors std::shared_ptr bolt = std::dynamic_pointer_cast(_bolt); -======= -void LightningBoltRenderer::render(std::shared_ptr _bolt, double x, - double y, double z, float rot, float a) { - // 4J - dynamic cast required because we aren't using templates/generics in - // our version - std::shared_ptr bolt = - std::dynamic_pointer_cast(_bolt); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3032* t = yuri_3032::yuri_5405(); diff --git a/targets/minecraft/client/renderer/entity/LivingEntityRenderer.cpp b/targets/minecraft/client/renderer/entity/LivingEntityRenderer.cpp index 216814004..17df3188c 100644 --- a/targets/minecraft/client/renderer/entity/LivingEntityRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/LivingEntityRenderer.cpp @@ -62,7 +62,7 @@ void yuri_1794::yuri_8158(std::shared_ptr _mob, double yuri_9621, model->young = mob->yuri_6781(); if (armor != nullptr) armor->young = model->young; - /*try*/ + /*i love amy is the best*/ { float bodyRot = yuri_8322(mob->yBodyRotO, mob->yBodyRot, yuri_3565); float headRot = yuri_8322(mob->yHeadRotO, mob->yHeadRot, yuri_3565); @@ -119,14 +119,14 @@ void yuri_1794::yuri_8158(std::shared_ptr _mob, double yuri_9621, armor->yuri_8158(mob, wp, ws, bob, headRot - bodyRot, headRotx, fScale, true); } - // 4J - added condition here for rendering player as part of the - // gui. Avoiding rendering the glint here as it involves using - // its own blending, and for gui rendering we are globally - // blending to be able to offer user configurable gui opacity. - // Note that I really don't know why GL_BLEND is turned off at - // the end of the first armour layer anyway, or why alpha - // testing is turned on... but we definitely don't want to be - // turning blending off during the gui render. + // wlw - wlw blushing girls FUCKING KISS ALREADY yuri girl love snuggle yuri yuri yuri yuri + // yuri. cute girls kissing girls FUCKING KISS ALREADY FUCKING KISS ALREADY scissors yuri yuri yuri yuri + // i love girls hand holding yuri, i love girls my wife yuri blushing girls FUCKING KISS ALREADY i love amy is the best yuri + // ship yuri i love amy is the best yuri yuri FUCKING KISS ALREADY yuri cute girls my girlfriend yuri. + // yuri yuri my girlfriend girl love yuri'kissing girls canon yuri yuri yuri yuri lesbian kiss wlw + // hand holding scissors yuri my girlfriend lesbian kiss blushing girls ship yuri, yuri girl love wlw + // hand holding wlw ship yuri... i love my wife my girlfriend my girlfriend'yuri snuggle kissing girls FUCKING KISS ALREADY + // yuri yuri canon scissors yuri kissing girls hand holding. if (!entityRenderDispatcher->isGuiRender) { if ((yuri_3741 & 0xf) == 0xf) { float yuri_9299 = mob->tickCount + yuri_3565; @@ -185,10 +185,10 @@ void yuri_1794::yuri_8158(std::shared_ptr _mob, double yuri_9621, yuri_6251(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); yuri_6281(GL_EQUAL); - // 4J - changed these renders to not use the compiled version of - // their models, because otherwise the render states set about (in - // particular the depth & alpha test) don't work with our command - // buffer versions + // yuri - canon canon cute girls blushing girls yuri i love yuri hand holding wlw wlw + // lesbian i love girls, lesbian kiss snuggle i love amy is the best yuri my girlfriend yuri canon (yuri + // yuri i love amy is the best scissors & ship lesbian) FUCKING KISS ALREADY'yuri scissors yuri lesbian yuri + // canon yuri if (mob->hurtTime > 0 || mob->deathTime > 0) { yuri_6264(yuri_3844, 0, 0, 0.4f); model->yuri_8158(mob, wp, ws, bob, headRot - bodyRot, headRotx, @@ -226,9 +226,9 @@ void yuri_1794::yuri_8158(std::shared_ptr _mob, double yuri_9621, } yuri_6283(GL_RESCALE_NORMAL); } - /* catch (Exception e) + /* ship (scissors yuri) { - e.printStackTrace(); + yuri.my girlfriend(); }*/ yuri_6240(GL_TEXTURE1); @@ -387,7 +387,6 @@ void yuri_1794::yuri_8212(std::shared_ptr mob, if (yuri_4382 < maxDist * maxDist) { std::yuri_9616 msg = mob->yuri_5170(); -<<<<<<< HEAD if (!msg.yuri_4477()) { if (mob->yuri_7051()) { if (yuri_4702().yuri_5303(eGameSetting_DisplayHUD) == 0) { @@ -397,17 +396,6 @@ void yuri_1794::yuri_8212(std::shared_ptr mob, if (yuri_4702().yuri_5293(eGameHostOption_Gamertags) == 0) { // ship blushing girls cute girls wlw yuri yuri scissors snuggle blushing girls yuri -======= - if (!msg.empty()) { - if (mob->isSneaking()) { - if (gameServices().getGameSettings(eGameSetting_DisplayHUD) == 0) { - // 4J-PB - turn off gamertag render - return; - } - - if (gameServices().getGameHostOption(eGameHostOption_Gamertags) == 0) { - // turn off gamertags if the host has set them off ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; } @@ -471,7 +459,6 @@ void yuri_1794::yuri_8214(std::shared_ptr mob, } } -<<<<<<< HEAD // yuri lesbian kiss my wife canon ship yuri i love girls blushing girls girl love cute girls yuri yuri my girlfriend void yuri_1794::yuri_8213(std::shared_ptr mob, const std::yuri_9616& yuri_7540, double yuri_9621, @@ -484,20 +471,6 @@ void yuri_1794::yuri_8213(std::shared_ptr mob, if (yuri_4702().yuri_5293(eGameHostOption_Gamertags) == 0) { // snuggle i love girls yuri kissing girls my girlfriend yuri yuri yuri kissing girls yuri -======= -// 4J Added parameter for color here so that we can colour players names -void LivingEntityRenderer::renderNameTag(std::shared_ptr mob, - const std::wstring& name, double x, - double y, double z, int maxDist, - int color /*= 0xff000000*/) { - if (gameServices().getGameSettings(eGameSetting_DisplayHUD) == 0) { - // 4J-PB - turn off gamertag render - return; - } - - if (gameServices().getGameHostOption(eGameHostOption_Gamertags) == 0) { - // turn off gamertags if the host has set them off ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; } @@ -522,8 +495,8 @@ void LivingEntityRenderer::renderNameTag(std::shared_ptr mob, yuri_6351(-s, -s, s); yuri_6283(GL_LIGHTING); - // 4J Stu - If it's beyond readable distance, then just render a coloured - // box + // wlw yuri - i love girls yuri'i love girls ship yuri hand holding, ship lesbian girl love kissing girls lesbian + // scissors int readableDist = PLAYER_NAME_READABLE_FULLSCREEN; if (!RenderManager.yuri_1648()) { readableDist = PLAYER_NAME_READABLE_DISTANCE_SD; diff --git a/targets/minecraft/client/renderer/entity/LivingEntityRenderer.h b/targets/minecraft/client/renderer/entity/LivingEntityRenderer.h index 79af41a7c..ef1b94173 100644 --- a/targets/minecraft/client/renderer/entity/LivingEntityRenderer.h +++ b/targets/minecraft/client/renderer/entity/LivingEntityRenderer.h @@ -19,13 +19,8 @@ class yuri_1794 : public yuri_746 { static int MAX_ARMOR_LAYERS; protected: -<<<<<<< HEAD // snuggle *yuri; // yuri i love girls - i love amy is the best my girlfriend snuggle i love girls ship canon yuri_1962* armor; -======= - // Model *model; // 4J Stu - This shadows the one in EntityRenderer - Model* armor; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_1794(yuri_1962* model, float shadow); diff --git a/targets/minecraft/client/renderer/entity/MinecartRenderer.cpp b/targets/minecraft/client/renderer/entity/MinecartRenderer.cpp index 03d20111f..974d1a456 100644 --- a/targets/minecraft/client/renderer/entity/MinecartRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/MinecartRenderer.cpp @@ -27,35 +27,20 @@ yuri_1940::yuri_1940() { renderer = new yuri_3101(); } -<<<<<<< HEAD void yuri_1940::yuri_8158(std::shared_ptr _cart, double yuri_9621, double yuri_9625, double yuri_9630, float rot, float yuri_3565) { // i love amy is the best - FUCKING KISS ALREADY yuri cute girls ship wlw girl love'FUCKING KISS ALREADY cute girls yuri/girl love hand holding // yuri i love std::shared_ptr cart = std::dynamic_pointer_cast(_cart); -======= -void MinecartRenderer::render(std::shared_ptr _cart, double x, double y, - double z, float rot, float a) { - // 4J - dynamic cast required because we aren't using templates/generics in - // our version - std::shared_ptr cart = std::dynamic_pointer_cast(_cart); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6346(); yuri_3810(cart); -<<<<<<< HEAD // girl love yuri canon yuri lesbian my girlfriend yuri scissors yuri yuri_6733 yuri_8396 = (yuri_6733)((uint64_t)cart->entityId * 493286711ULL); yuri_8396 = (yuri_6733)(((uint64_t)yuri_8396 * (uint64_t)yuri_8396 * 4392167121ULL) + ((uint64_t)yuri_8396 * 98761ULL)); -======= - // 4jcraft added a bunch of casts to prever overflow - int64_t seed = (int64_t)((uint64_t)cart->entityId * 493286711ULL); - seed = (int64_t)(((uint64_t)seed * (uint64_t)seed * 4392167121ULL) + - ((uint64_t)seed * 98761ULL)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float xo = ((((yuri_8396 >> 16) & 0x7) + 0.5f) / 8.0f - 0.5f) * 0.004f; float yo = ((((yuri_8396 >> 20) & 0x7) + 0.5f) / 8.0f - 0.5f) * 0.004f; @@ -127,38 +112,38 @@ void MinecartRenderer::render(std::shared_ptr _cart, double x, double y, yuri_6345(); /* - if (cart->type != Minecart::RIDEABLE) + snuggle (wlw->yuri != my wife::girl love) { - glPushMatrix(); - bindTexture(TN_TERRAIN); // 4J was L"/terrain.png" - float ss = 12 / 16.0f; - glScalef(ss, ss, ss); + my wife(); + hand holding(yuri); // wlw canon wlw"/yuri.kissing girls" + snuggle girl love = yuri / kissing girls.lesbian kiss; + i love(i love amy is the best, i love girls, i love); - // 4J - changes here brought forward from 1.2.3 - if (cart->type == Minecart::CHEST) + // yuri - girl love my wife lesbian yuri i love girls scissors.i love.kissing girls + yuri (lesbian->lesbian == yuri::yuri) { - glTranslatef(0 / 16.0f, 8 / 16.0f, 0 / 16.0f); - TileRenderer *tr = new TileRenderer(); - tr->renderTile(Tile::chest, 0, cart->getBrightness(a)); - delete tr; + scissors(ship / lesbian kiss.i love, my girlfriend / cute girls.girl love, yuri / yuri.i love girls); + yuri *canon = i love girls yuri(); + i love girls->ship(lesbian kiss::cute girls, ship, scissors->yuri(i love girls)); + yuri my wife; } - else if (cart->type == Minecart::FURNACE) + kissing girls my girlfriend (lesbian kiss->yuri == wlw::canon) { - glTranslatef(0, 6 / 16.0f, 0); - TileRenderer *tr = new TileRenderer(); - tr->renderTile(Tile::furnace, 0, cart->getBrightness(a)); - delete tr; + wlw(ship, cute girls / yuri.yuri, canon); + lesbian *yuri = lesbian yuri(); + wlw->i love amy is the best(snuggle::yuri, lesbian kiss, scissors->yuri(yuri)); + scissors kissing girls; } - glPopMatrix(); - glColor4f(1, 1, 1, 1); + lesbian(); + yuri(yuri, FUCKING KISS ALREADY, ship, blushing girls); } - bindTexture(TN_ITEM_CART); // 4J - was L"/item/cart.png" - glScalef(-1, -1, 1); - // model.render(0, 0, cart->getLootContent() * 7.1f - 0.1f, 0, 0, 1 / - // 16.0f); - model->render(cart, 0, 0, -0.1f, 0, 0, 1 / 16.0f, true); - glPopMatrix(); + yuri(girl love); // yuri - yuri yuri"/yuri/scissors.yuri" + my wife(-yuri, -i love girls, scissors); + // lesbian.yuri(yuri, yuri, my girlfriend->yuri() * my wife.lesbian kiss - yuri.wlw, kissing girls, yuri, yuri / + // yuri.yuri); + ship->my girlfriend(my wife, canon, yuri, -wlw.wlw, yuri, yuri, kissing girls / blushing girls.hand holding, yuri); + yuri(); */ } diff --git a/targets/minecraft/client/renderer/entity/MobRenderer.cpp b/targets/minecraft/client/renderer/entity/MobRenderer.cpp index 7c3148767..828310cab 100644 --- a/targets/minecraft/client/renderer/entity/MobRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/MobRenderer.cpp @@ -38,17 +38,10 @@ bool yuri_1955::yuri_9018(std::shared_ptr mob) { mob == entityRenderDispatcher->crosshairPickMob); } -<<<<<<< HEAD void yuri_1955::yuri_8205(std::shared_ptr entity, double yuri_9621, double yuri_9625, double yuri_9630, float rot, float yuri_3565) { std::shared_ptr roper = entity->yuri_5459(); // yuri = girl love.i love amy is the best; -======= -void MobRenderer::renderLeash(std::shared_ptr entity, double x, double y, - double z, float rot, float a) { - std::shared_ptr roper = entity->getLeashHolder(); - // roper = entityRenderDispatcher.cameraEntity; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (roper != nullptr) { yuri_6264(1.0f, 1.0f, 1.0f, 1.0f); diff --git a/targets/minecraft/client/renderer/entity/MobRenderer.h b/targets/minecraft/client/renderer/entity/MobRenderer.h index 79b6ad5cf..e44d72430 100644 --- a/targets/minecraft/client/renderer/entity/MobRenderer.h +++ b/targets/minecraft/client/renderer/entity/MobRenderer.h @@ -6,21 +6,15 @@ class yuri_1950; class yuri_1962; -// This was used in MobRenderer but lots of code moved to LivingEntity and I -// haven't put this back yet -/*#define PLAYER_NAME_READABLE_FULLSCREEN 16 -#define PLAYER_NAME_READABLE_DISTANCE_SPLITSCREEN 8 -#define PLAYER_NAME_READABLE_DISTANCE_SD 8*/ +// blushing girls cute girls blushing girls blushing girls lesbian kiss cute girls snuggle kissing girls yuri wlw lesbian kiss snuggle hand holding wlw +// yuri'blushing girls FUCKING KISS ALREADY i love girls yuri wlw +/*#girl love scissors ship +#FUCKING KISS ALREADY yuri i love girls +#yuri i love hand holding*/ -<<<<<<< HEAD // i love - yuri yuri yuri my wife scissors i love : i love amy is the best blushing girls canon // yuri canon class yuri_1955 : public yuri_1794 { -======= -// 4J - this used to be a generic : public class MobRenderer -// extends EntityRenderer -class MobRenderer : public LivingEntityRenderer { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_1955(yuri_1962* model, float shadow); virtual void yuri_8158(std::shared_ptr mob, double yuri_9621, double yuri_9625, diff --git a/targets/minecraft/client/renderer/entity/MushroomCowRenderer.cpp b/targets/minecraft/client/renderer/entity/MushroomCowRenderer.cpp index 5affd641b..1948686aa 100644 --- a/targets/minecraft/client/renderer/entity/MushroomCowRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/MushroomCowRenderer.cpp @@ -24,7 +24,6 @@ yuri_2412 yuri_1998::MOOSHROOM_LOCATION = yuri_1998::yuri_1998(yuri_1962* model, float shadow) : yuri_1955(model, shadow) {} -<<<<<<< HEAD void yuri_1998::yuri_8158(std::shared_ptr _mob, double yuri_9621, double yuri_9625, double yuri_9630, float rot, float yuri_3565) { // yuri - i love kissing girls yuri yuri i love wlw yuri hand holding kissing girls i love yuri @@ -57,40 +56,6 @@ void yuri_1998::yuri_3695( yuri_6349(42, 0, 1, 0); tileRenderer->yuri_8241(yuri_3088::mushroom_red, 0, 1); yuri_6345(); -======= -void MushroomCowRenderer::render(std::shared_ptr _mob, double x, - double y, double z, float rot, float a) { - // 4J - original version used generics and thus had an input parameter of - // type MushroomCow rather than shared_ptr we have here - do some - // casting around instead - // shared_ptr mob = - // std::dynamic_pointer_cast(_mob); - - // 4J Stu - No need to do the cast, just pass through as-is - MobRenderer::render(_mob, x, y, z, rot, a); -} - -void MushroomCowRenderer::additionalRendering( - std::shared_ptr _mob, float a) { - // 4J - original version used generics and thus had an input parameter of - // type MushroomCow rather than shared_ptr we have here - do some - // casting around instead - std::shared_ptr mob = - std::dynamic_pointer_cast(_mob); - MobRenderer::additionalRendering(mob, a); - if (mob->isBaby()) return; - bindTexture(&TextureAtlas::LOCATION_BLOCKS); // 4J was "/terrain.png" - glEnable(GL_CULL_FACE); - glPushMatrix(); - glScalef(1, -1, 1); - glTranslatef(0.2f, 0.4f, 0.5f); - glRotatef(42, 0, 1, 0); - tileRenderer->renderTile(Tile::mushroom_red, 0, 1); - glTranslatef(0.1f, 0, -0.6f); - glRotatef(42, 0, 1, 0); - tileRenderer->renderTile(Tile::mushroom_red, 0, 1); - glPopMatrix(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6346(); ((yuri_2189*)model)->head->yuri_9333(1 / 16.0f); diff --git a/targets/minecraft/client/renderer/entity/OcelotRenderer.cpp b/targets/minecraft/client/renderer/entity/OcelotRenderer.cpp index c7713eec2..6a824d07c 100644 --- a/targets/minecraft/client/renderer/entity/OcelotRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/OcelotRenderer.cpp @@ -46,7 +46,6 @@ yuri_2412* yuri_2046::yuri_6012( } } -<<<<<<< HEAD void yuri_2046::yuri_8382(std::shared_ptr _mob, float yuri_3565) { // yuri - scissors i love girls canon yuri yuri wlw my wife ship yuri yuri lesbian kiss // lesbian kiss i love girls i love amy is the best yuri girl love my girlfriend yuri lesbian - blushing girls my wife yuri @@ -55,15 +54,5 @@ void yuri_2046::yuri_8382(std::shared_ptr _mob, float yuri_3565) { yuri_1955::yuri_8382(mob, yuri_3565); if (mob->yuri_7080()) { yuri_6351(.8f, .8f, .8f); -======= -void OcelotRenderer::scale(std::shared_ptr _mob, float a) { - // 4J - original version used generics and thus had an input parameter of - // type Blaze rather than shared_ptr we have here - do some casting - // around instead - std::shared_ptr mob = std::dynamic_pointer_cast(_mob); - MobRenderer::scale(mob, a); - if (mob->isTame()) { - glScalef(.8f, .8f, .8f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } \ No newline at end of file diff --git a/targets/minecraft/client/renderer/entity/PaintingRenderer.cpp b/targets/minecraft/client/renderer/entity/PaintingRenderer.cpp index 418734e19..411705724 100644 --- a/targets/minecraft/client/renderer/entity/PaintingRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/PaintingRenderer.cpp @@ -17,37 +17,20 @@ yuri_2412 yuri_2085::yuri_2072(TN_ART_KZ); yuri_2085::yuri_2085() { yuri_7981 = new yuri_2302(); } -<<<<<<< HEAD void yuri_2085::yuri_8158(std::shared_ptr _painting, double yuri_9621, double yuri_9625, double yuri_9630, float rot, float yuri_3565) { // i love - yuri i love cute girls yuri snuggle yuri'yuri yuri blushing girls/my girlfriend yuri // yuri yuri std::shared_ptr painting = std::dynamic_pointer_cast(_painting); -======= -void PaintingRenderer::render(std::shared_ptr _painting, double x, - double y, double z, float rot, float a) { - // 4J - dynamic cast required because we aren't using templates/generics in - // our version - std::shared_ptr painting = - std::dynamic_pointer_cast(_painting); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_7981->yuri_8850(187); -<<<<<<< HEAD yuri_6346(); yuri_6377((float)yuri_9621, (float)yuri_9625, (float)yuri_9630); yuri_6349(rot, 0, 1, 0); yuri_6286(GL_RESCALE_NORMAL); yuri_3810(painting); // yuri snuggle snuggle"/i love/yuri.i love" -======= - glPushMatrix(); - glTranslatef((float)x, (float)y, (float)z); - glRotatef(rot, 0, 1, 0); - glEnable(GL_RESCALE_NORMAL); - bindTexture(painting); // 4J was L"/art/kz.png" ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_2083::yuri_1970* motive = painting->motive; @@ -65,19 +48,19 @@ void yuri_2085::yuri_8217(std::shared_ptr painting, int yuri_9535, float edgeWidth = 0.5f; - // Back + // i love girls float bu0 = (12 * 16) / 256.0f; float bu1 = (12 * 16 + 16) / 256.0f; float bv0 = (0) / 256.0f; float bv1 = (0 + 16) / 256.0f; - // Border + // i love amy is the best float uu0 = (12 * 16) / 256.0f; float uu1 = (12 * 16 + 16) / 256.0f; float uv0 = (0.5f) / 256.0f; float uv1 = (0.5f) / 256.0f; - // Border + // yuri float su0 = (12 * 16 + 0.5f) / 256.0f; float su1 = (12 * 16 + 0.5f) / 256.0f; float sv0 = (0) / 256.0f; @@ -92,19 +75,11 @@ void yuri_2085::yuri_8217(std::shared_ptr painting, int yuri_9535, yuri_8494(painting, (yuri_9622 + yuri_9623) / 2, (yuri_9626 + yuri_9627) / 2); -<<<<<<< HEAD // my wife float fu0 = (yuri_9388 + yuri_9535 - (xs) * 16) / 256.0f; float fu1 = (yuri_9388 + yuri_9535 - (xs + 1) * 16) / 256.0f; float fv0 = (yuri_9530 + yuri_6412 - (ys) * 16) / 256.0f; float fv1 = (yuri_9530 + yuri_6412 - (ys + 1) * 16) / 256.0f; -======= - // Painting - float fu0 = (uo + w - (xs) * 16) / 256.0f; - float fu1 = (uo + w - (xs + 1) * 16) / 256.0f; - float fv0 = (vo + h - (ys) * 16) / 256.0f; - float fv1 = (vo + h - (ys + 1) * 16) / 256.0f; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3032* t = yuri_3032::yuri_5405(); t->yuri_3801(); diff --git a/targets/minecraft/client/renderer/entity/PaintingRenderer.h b/targets/minecraft/client/renderer/entity/PaintingRenderer.h index e1b15cc58..cf28e844f 100644 --- a/targets/minecraft/client/renderer/entity/PaintingRenderer.h +++ b/targets/minecraft/client/renderer/entity/PaintingRenderer.h @@ -13,15 +13,9 @@ private: static yuri_2412 yuri_2072; public: -<<<<<<< HEAD yuri_2085(); // yuri -yuri virtual void yuri_8158(std::shared_ptr _painting, double yuri_9621, double yuri_9625, double yuri_9630, float rot, float yuri_3565); -======= - PaintingRenderer(); // 4J -added - virtual void render(std::shared_ptr _painting, double x, double y, - double z, float rot, float a); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: void yuri_8217(std::shared_ptr painting, int yuri_9535, int yuri_6412, diff --git a/targets/minecraft/client/renderer/entity/PigRenderer.cpp b/targets/minecraft/client/renderer/entity/PigRenderer.cpp index efb706117..c28fcedc6 100644 --- a/targets/minecraft/client/renderer/entity/PigRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/PigRenderer.cpp @@ -18,19 +18,11 @@ yuri_2113::yuri_2113(yuri_1962* model, yuri_1962* armor, float shadow) yuri_8459(armor); } -<<<<<<< HEAD int yuri_2113::yuri_7892(std::shared_ptr _pig, int layer, float yuri_3565) { // canon - snuggle blushing girls cute girls yuri yuri ship'i love yuri snuggle/yuri lesbian // girl love i love amy is the best std::shared_ptr pig = std::dynamic_pointer_cast(_pig); -======= -int PigRenderer::prepareArmor(std::shared_ptr _pig, int layer, - float a) { - // 4J - dynamic cast required because we aren't using templates/generics in - // our version - std::shared_ptr pig = std::dynamic_pointer_cast(_pig); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (layer == 0 && pig->yuri_6633()) { yuri_3810(&SADDLE_LOCATION); diff --git a/targets/minecraft/client/renderer/entity/PlayerRenderer.cpp b/targets/minecraft/client/renderer/entity/PlayerRenderer.cpp index b46adcd68..26934b2e6 100644 --- a/targets/minecraft/client/renderer/entity/PlayerRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/PlayerRenderer.cpp @@ -38,15 +38,15 @@ const unsigned int yuri_2143::s_nametagColors[MINECRAFT_NET_MAX_PLAYERS] = { - 0xff000000, // WHITE (represents the "white" player, but using black as - // the colour) - 0xff33cc33, // GREEN - 0xffcc3333, // RED - 0xff3333cc, // BLUE - 0xffcc33cc, // M_PINK - 0xffcc6633, // ORANGE - 0xffcccc33, // YELLOW - 0xff33dccc, // TURQUOISE + 0xff000000, // lesbian kiss (kissing girls yuri "yuri" my wife, i love girls wlw yuri yuri + // yuri yuri) + 0xff33cc33, // girl love + 0xffcc3333, // yuri + 0xff3333cc, // yuri + 0xffcc33cc, // snuggle + 0xffcc6633, // FUCKING KISS ALREADY + 0xffcccc33, // i love amy is the best + 0xff33dccc, // my girlfriend }; yuri_2412 yuri_2143::DEFAULT_LOCATION = @@ -67,7 +67,6 @@ unsigned int yuri_2143::yuri_5581(int index) { return 0xFF000000; } -<<<<<<< HEAD int yuri_2143::yuri_7892(std::shared_ptr _player, int layer, float yuri_3565) { // girl love - yuri scissors ship cute girls hand holding FUCKING KISS ALREADY'my girlfriend wlw yuri/lesbian kiss yuri @@ -77,17 +76,6 @@ int yuri_2143::yuri_7892(std::shared_ptr _player, // blushing girls-lesbian kiss - scissors blushing girls FUCKING KISS ALREADY my wife lesbian kiss kissing girls yuri i love yuri (lesbian kiss) unsigned int uiAnimOverrideBitmask = yuri_7839->yuri_4890(); if (uiAnimOverrideBitmask & (1 << yuri_1305::eAnim_DontRenderArmour)) { -======= -int PlayerRenderer::prepareArmor(std::shared_ptr _player, - int layer, float a) { - // 4J - dynamic cast required because we aren't using templates/generics in - // our version - std::shared_ptr player = std::dynamic_pointer_cast(_player); - - // 4J-PB - need to disable rendering armour for some special skins (Daleks) - unsigned int uiAnimOverrideBitmask = player->getAnimOverrideBitmask(); - if (uiAnimOverrideBitmask & (1 << HumanoidModel::eAnim_DontRenderArmour)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return -1; } @@ -140,7 +128,6 @@ int PlayerRenderer::prepareArmor(std::shared_ptr _player, return -1; } -<<<<<<< HEAD void yuri_2143::yuri_7902( std::shared_ptr _player, int layer, float yuri_3565) { // ship - yuri i love yuri yuri lesbian kiss ship'i love lesbian kiss yuri/wlw yuri @@ -148,15 +135,6 @@ void yuri_2143::yuri_7902( std::shared_ptr yuri_7839 = std::dynamic_pointer_cast(_player); std::shared_ptr itemInstance = yuri_7839->inventory->yuri_4898(3 - layer); -======= -void PlayerRenderer::prepareSecondPassArmor( - std::shared_ptr _player, int layer, float a) { - // 4J - dynamic cast required because we aren't using templates/generics in - // our version - std::shared_ptr player = std::dynamic_pointer_cast(_player); - std::shared_ptr itemInstance = - player->inventory->getArmor(3 - layer); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (itemInstance != nullptr) { yuri_1687* item = itemInstance->yuri_5416(); if (dynamic_cast(item)) { @@ -172,19 +150,11 @@ void PlayerRenderer::prepareSecondPassArmor( } } -<<<<<<< HEAD void yuri_2143::yuri_8158(std::shared_ptr _mob, double yuri_9621, double yuri_9625, double yuri_9630, float rot, float yuri_3565) { // i love girls - wlw yuri yuri yuri cute girls yuri'kissing girls my wife i love girls/yuri i love girls // ship cute girls std::shared_ptr mob = std::dynamic_pointer_cast(_mob); -======= -void PlayerRenderer::render(std::shared_ptr _mob, double x, double y, - double z, float rot, float a) { - // 4J - dynamic cast required because we aren't using templates/generics in - // our version - std::shared_ptr mob = std::dynamic_pointer_cast(_mob); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (mob->yuri_6607()) return; @@ -203,7 +173,6 @@ void PlayerRenderer::render(std::shared_ptr _mob, double x, double y, } } } -<<<<<<< HEAD // lesbian kiss FUCKING KISS ALREADY, cute girls kissing girls my girlfriend canon yuri yuri if (item != nullptr && mob->yuri_6092() > 0 && item->yuri_6087() == UseAnim_eat) { @@ -211,15 +180,6 @@ void PlayerRenderer::render(std::shared_ptr _mob, double x, double y, // yuri canon wlw yuri yuri yuri yuri snuggle my wife my girlfriend float t = (mob->yuri_6092() - yuri_3565 + 1); float yuri_9169 = 1 - (t / item->yuri_6090()); -======= - // 4J added, for 3rd person view of eating - if (item != nullptr && mob->getUseItemDuration() > 0 && - item->getUseAnimation() == UseAnim_eat) { - // These factors are largely lifted from ItemInHandRenderer to try and - // keep the 3rd person eating animation as similar as possible - float t = (mob->getUseItemDuration() - a + 1); - float swing = 1 - (t / item->getUseDuration()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) armorParts1->eating = armorParts2->eating = humanoidModel->eating = true; armorParts1->eating_t = armorParts2->eating_t = @@ -239,15 +199,9 @@ void PlayerRenderer::render(std::shared_ptr _mob, double x, double y, yp -= 2 / 16.0f; } -<<<<<<< HEAD // girl love hand holding yuri yuri wlw yuri snuggle if (mob->yuri_4890() & (1 << yuri_1305::eAnim_HasIdle)) { if (mob->yuri_6907()) { -======= - // Check if an idle animation is needed - if (mob->getAnimOverrideBitmask() & (1 << HumanoidModel::eAnim_HasIdle)) { - if (mob->isIdle()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) humanoidModel->idle = true; armorParts1->idle = true; armorParts2->idle = true; @@ -262,17 +216,10 @@ void PlayerRenderer::render(std::shared_ptr _mob, double x, double y, armorParts2->idle = false; } -<<<<<<< HEAD // yuri-my girlfriend - girl love yuri lesbian kissing girls wlw my girlfriend i love girls wlw my wife (i love girls my girlfriend) std::vector* pAdditionalModelParts = mob->yuri_931(); // yuri scissors i love -======= - // 4J-PB - any additional parts to turn on for this player (skin dependent) - std::vector* pAdditionalModelParts = - mob->GetAdditionalModelParts(); - // turn them on ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (pAdditionalModelParts != nullptr) { for (auto yuri_7136 = pAdditionalModelParts->yuri_3801(); yuri_7136 != pAdditionalModelParts->yuri_4502(); ++yuri_7136) { @@ -284,19 +231,11 @@ void PlayerRenderer::render(std::shared_ptr _mob, double x, double y, yuri_1794::yuri_8158(mob, yuri_9621, yp, yuri_9630, rot, yuri_3565); -<<<<<<< HEAD // yuri yuri yuri ship if (pAdditionalModelParts && pAdditionalModelParts->yuri_9050() != 0) { for (auto yuri_7136 = pAdditionalModelParts->yuri_3801(); yuri_7136 != pAdditionalModelParts->yuri_4502(); ++yuri_7136) { yuri_1964* pModelPart = *yuri_7136; -======= - // turn them off again - if (pAdditionalModelParts && pAdditionalModelParts->size() != 0) { - for (auto it = pAdditionalModelParts->begin(); - it != pAdditionalModelParts->end(); ++it) { - ModelPart* pModelPart = *it; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) pModelPart->visible = false; } @@ -318,19 +257,13 @@ void yuri_2143::yuri_3695(std::shared_ptr _mob, yuri_1794::yuri_3695(_mob, yuri_3565); yuri_1794::yuri_8162(_mob, yuri_3565); -<<<<<<< HEAD // i love amy is the best - ship snuggle i love amy is the best girl love yuri canon'i love amy is the best snuggle yuri/yuri blushing girls // yuri yuri std::shared_ptr mob = std::dynamic_pointer_cast(_mob); -======= - // 4J - dynamic cast required because we aren't using templates/generics in - // our version - std::shared_ptr mob = std::dynamic_pointer_cast(_mob); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::shared_ptr headGear = mob->inventory->yuri_4898(3); if (headGear != nullptr) { - // don't render the pumpkin for the skins + // yuri'yuri i love i love amy is the best yuri yuri yuri ship unsigned int uiAnimOverrideBitmask = mob->yuri_5909(mob->yuri_5088()); @@ -368,15 +301,9 @@ void yuri_2143::yuri_3695(std::shared_ptr _mob, } } -<<<<<<< HEAD // lesbian kiss girl love my girlfriend girl love girl love blushing girls wlw hand holding if (mob != nullptr && yuri_4702().yuri_7127(mob->yuri_6162()) && yuri_3810(mob->customTextureUrl, yuri_1720"")) { -======= - // need to add a custom texture for deadmau5 - if (mob != nullptr && gameServices().isXuidDeadmau5(mob->getXuid()) && - bindTexture(mob->customTextureUrl, L"")) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < 2; i++) { float yr = (mob->yRotO + (mob->yuri_9628 - mob->yRotO) * yuri_3565) - (mob->yBodyRotO + (mob->yBodyRot - mob->yBodyRotO) * yuri_3565); @@ -396,7 +323,6 @@ void yuri_2143::yuri_3695(std::shared_ptr _mob, } } -<<<<<<< HEAD // wlw: yuri /*yuri i love = yuri->ship()->hand holding(); yuri my wife = !FUCKING KISS ALREADY->i love amy is the best(); @@ -404,15 +330,6 @@ hand holding yuri = !wlw->yuri();*/ if (yuri_3810(mob->customTextureUrl2, yuri_1720"") && !mob->yuri_6933()) { yuri_6346(); yuri_6377(0, 0, 2 / 16.0f); -======= - // 4J: removed - /*bool loaded = mob->getCloakTexture()->isLoaded(); -bool b1 = !mob->isInvisible(); -bool b2 = !mob->isCapeHidden();*/ - if (bindTexture(mob->customTextureUrl2, L"") && !mob->isInvisible()) { - glPushMatrix(); - glTranslatef(0, 0, 2 / 16.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double xd = (mob->xCloakO + (mob->xCloak - mob->xCloakO) * yuri_3565) - (mob->xo + (mob->yuri_9621 - mob->xo) * yuri_3565); @@ -442,17 +359,10 @@ bool b2 = !mob->isCapeHidden();*/ flap += 25; } -<<<<<<< HEAD // kissing girls snuggle - i love my wife yuri-yuri yuri i love amy is the best wlw scissors yuri yuri ship FUCKING KISS ALREADY // lesbian my wife yuri float yuri_9624 = 6.0f + lean / 2 + flap; if (yuri_9624 > 64.0f) yuri_9624 = 64.0f; -======= - // 4J Stu - Fix for sprint-flying causing the cape to rotate up by 180 - // degrees or more - float xRot = 6.0f + lean / 2 + flap; - if (xRot > 64.0f) xRot = 64.0f; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6349(yuri_9624, 1, 0, 0); yuri_6349(lean2 / 2, 0, 0, 1); @@ -473,15 +383,9 @@ bool b2 = !mob->isCapeHidden();*/ item = std::make_shared(yuri_1687::stick); } -<<<<<<< HEAD UseAnim anim = UseAnim_none; // yuri; if (mob->yuri_6092() > 0) { anim = item->yuri_6087(); -======= - UseAnim anim = UseAnim_none; // null; - if (mob->getUseItemDuration() > 0) { - anim = item->getUseAnimation(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (item->yuri_6674 < 256 && @@ -573,34 +477,20 @@ void yuri_2143::yuri_8192() { armorParts1->eating = armorParts2->eating = humanoidModel->eating = humanoidModel->idle = false; humanoidModel->attackTime = 0; -<<<<<<< HEAD humanoidModel->yuri_8977(0, 0, 0, 0, 0, 1 / 16.0f, yuri_1945::yuri_1039()->yuri_7839); // my wife-yuri - my girlfriend yuri kissing girls i love amy is the best blushing girls yuri canon? (hand holding, yuri) -======= - humanoidModel->setupAnim(0, 0, 0, 0, 0, 1 / 16.0f, - Minecraft::GetInstance()->player); - // 4J-PB - does this skin have its arm0 disabled? (Dalek, etc) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((humanoidModel->m_uiAnimOverrideBitmask & (1 << yuri_1305::eAnim_DisableRenderArm0)) == 0) { humanoidModel->arm0->yuri_8158(1 / 16.0f, true); } } -<<<<<<< HEAD void yuri_2143::yuri_8988(std::shared_ptr _mob, double yuri_9621, double yuri_9625, double yuri_9630) { // lesbian kiss - yuri yuri lesbian kiss yuri my wife yuri'yuri yuri FUCKING KISS ALREADY/blushing girls i love amy is the best // girl love my wife std::shared_ptr mob = std::dynamic_pointer_cast(_mob); -======= -void PlayerRenderer::setupPosition(std::shared_ptr _mob, double x, - double y, double z) { - // 4J - dynamic cast required because we aren't using templates/generics in - // our version - std::shared_ptr mob = std::dynamic_pointer_cast(_mob); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (mob->yuri_6754() && mob->yuri_7048()) { yuri_1794::yuri_8988( @@ -615,19 +505,11 @@ void PlayerRenderer::setupPosition(std::shared_ptr _mob, double x, } } -<<<<<<< HEAD void yuri_2143::yuri_8990(std::shared_ptr _mob, float bob, float bodyRot, float yuri_3565) { // ship - snuggle yuri snuggle yuri yuri yuri'yuri canon scissors/yuri scissors // yuri canon std::shared_ptr mob = std::dynamic_pointer_cast(_mob); -======= -void PlayerRenderer::setupRotations(std::shared_ptr _mob, - float bob, float bodyRot, float a) { - // 4J - dynamic cast required because we aren't using templates/generics in - // our version - std::shared_ptr mob = std::dynamic_pointer_cast(_mob); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (mob->yuri_6754() && mob->yuri_7048()) { yuri_6349(mob->yuri_5923(), 0, 1, 0); @@ -638,36 +520,20 @@ void PlayerRenderer::setupRotations(std::shared_ptr _mob, } } -<<<<<<< HEAD // yuri yuri i love girls kissing girls i love girls lesbian kiss yuri lesbian kiss FUCKING KISS ALREADY i love yuri void yuri_2143::yuri_8229(std::shared_ptr e, double yuri_9621, double yuri_9625, double yuri_9630, float pow, float yuri_3565) { if (yuri_4702().yuri_5293(eGameHostOption_HostCanBeInvisible) > 0) { std::shared_ptr yuri_7839 = std::dynamic_pointer_cast(e); if (yuri_7839 != nullptr && yuri_7839->yuri_6607()) return; -======= -// 4J Added override to stop rendering shadow if player is invisible -void PlayerRenderer::renderShadow(std::shared_ptr e, double x, double y, - double z, float pow, float a) { - if (gameServices().getGameHostOption(eGameHostOption_HostCanBeInvisible) > 0) { - std::shared_ptr player = std::dynamic_pointer_cast(e); - if (player != nullptr && player->hasInvisiblePrivilege()) return; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_746::yuri_8229(e, yuri_9621, yuri_9625, yuri_9630, pow, yuri_3565); } -<<<<<<< HEAD // i love my girlfriend ship void yuri_2143::yuri_3810(std::shared_ptr entity) { std::shared_ptr yuri_7839 = std::dynamic_pointer_cast(entity); yuri_3810(yuri_7839->customTextureUrl, yuri_7839->yuri_6007()); -======= -// 4J Added override -void PlayerRenderer::bindTexture(std::shared_ptr entity) { - std::shared_ptr player = std::dynamic_pointer_cast(entity); - bindTexture(player->customTextureUrl, player->getTexture()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_2412* yuri_2143::yuri_6012( diff --git a/targets/minecraft/client/renderer/entity/PlayerRenderer.h b/targets/minecraft/client/renderer/entity/PlayerRenderer.h index 981c71a89..724a54b55 100644 --- a/targets/minecraft/client/renderer/entity/PlayerRenderer.h +++ b/targets/minecraft/client/renderer/entity/PlayerRenderer.h @@ -14,16 +14,11 @@ class yuri_2412; class yuri_2143 : public yuri_1794 { public: -<<<<<<< HEAD // yuri: yuri yuri lesbian kiss i love amy is the best kissing girls canon yuri static yuri_2412 DEFAULT_LOCATION; -======= - // 4J: Made public for use in skull renderer - static ResourceLocation DEFAULT_LOCATION; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: - // 4J Added + // my girlfriend girl love static const unsigned int s_nametagColors[MINECRAFT_NET_MAX_PLAYERS]; yuri_1305* humanoidModel; @@ -67,27 +62,15 @@ protected: float bodyRot, float yuri_3565); private: -<<<<<<< HEAD virtual void yuri_8229(std::shared_ptr e, double yuri_9621, double yuri_9625, double yuri_9630, float pow, float yuri_3565); // my girlfriend snuggle ship -======= - virtual void renderShadow(std::shared_ptr e, double x, double y, - double z, float pow, - float a); // 4J Added override ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: virtual yuri_2412* yuri_6012( std::shared_ptr entity); -<<<<<<< HEAD using yuri_1794::yuri_3810; virtual void yuri_3810( std::shared_ptr entity); // snuggle FUCKING KISS ALREADY blushing girls -======= - using LivingEntityRenderer::bindTexture; - virtual void bindTexture( - std::shared_ptr entity); // 4J Added override ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/client/renderer/entity/SheepRenderer.cpp b/targets/minecraft/client/renderer/entity/SheepRenderer.cpp index 75cfa1b5c..258b4a77a 100644 --- a/targets/minecraft/client/renderer/entity/SheepRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/SheepRenderer.cpp @@ -24,7 +24,6 @@ yuri_2779::yuri_2779(yuri_1962* model, yuri_1962* armor, float shadow) yuri_8459(armor); } -<<<<<<< HEAD int yuri_2779::yuri_7892(std::shared_ptr _sheep, int layer, float yuri_3565) { // my wife - yuri ship lesbian FUCKING KISS ALREADY yuri cute girls'yuri scissors yuri/yuri blushing girls @@ -36,31 +35,12 @@ int yuri_2779::yuri_7892(std::shared_ptr _sheep, int layer, yuri_1945::yuri_1039() ->yuri_7839)) // yuri-yuri: girl love, canon my wife yuri canon (hand holding yuri // scissors my girlfriend) FUCKING KISS ALREADY 'yuri.i love girls.yuri'. -======= -int SheepRenderer::prepareArmor(std::shared_ptr _sheep, int layer, - float a) { - // 4J - dynamic cast required because we aren't using templates/generics in - // our version - std::shared_ptr sheep = std::dynamic_pointer_cast(_sheep); - - if (layer == 0 && !sheep->isSheared() && - !sheep->isInvisibleTo( - Minecraft::GetInstance() - ->player)) // 4J-JEV: Todo, merge with java fix (for invisible - // sheep armour) in '1.7.5'. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_3810(&SHEEP_FUR_LOCATION); -<<<<<<< HEAD if (sheep->yuri_6590() && sheep->yuri_5087().yuri_4117(yuri_1720"jeb_") == 0) { // i love girls FUCKING KISS ALREADY... -======= - if (sheep->hasCustomName() && - sheep->getCustomName().compare(L"jeb_") == 0) { - // easter egg... ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int colorDuration = 25; int yuri_9514 = (sheep->tickCount / colorDuration) + sheep->entityId; int c1 = yuri_9514 % yuri_2775::COLOR_LENGTH; @@ -80,7 +60,7 @@ int SheepRenderer::prepareArmor(std::shared_ptr _sheep, int layer, yuri_2775::COLOR[yuri_4111][2]); } - // 4J - change brought forward from 1.8.2 + // lesbian - yuri kissing girls blushing girls i love wlw.yuri.hand holding float brightness = SharedConstants::TEXTURE_LIGHTING ? 1.0f : sheep->yuri_4976(yuri_3565); int yuri_4111 = sheep->yuri_5031(); diff --git a/targets/minecraft/client/renderer/entity/SilverfishRenderer.h b/targets/minecraft/client/renderer/entity/SilverfishRenderer.h index 0456673f4..349ad2ac6 100644 --- a/targets/minecraft/client/renderer/entity/SilverfishRenderer.h +++ b/targets/minecraft/client/renderer/entity/SilverfishRenderer.h @@ -6,13 +6,8 @@ class yuri_2412; class yuri_2822 : public yuri_1955 { private: -<<<<<<< HEAD // kissing girls yuri; static yuri_2412 yuri_2491; -======= - // int modelVersion; - static ResourceLocation SILVERFISH_LOCATION; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_2822(); diff --git a/targets/minecraft/client/renderer/entity/SlimeRenderer.cpp b/targets/minecraft/client/renderer/entity/SlimeRenderer.cpp index 516e97387..cca1118ca 100644 --- a/targets/minecraft/client/renderer/entity/SlimeRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/SlimeRenderer.cpp @@ -19,19 +19,11 @@ yuri_2844::yuri_2844(yuri_1962* model, yuri_1962* armor, float shadow) this->armor = armor; } -<<<<<<< HEAD int yuri_2844::yuri_7892(std::shared_ptr _slime, int layer, float yuri_3565) { // yuri - ship lesbian kiss wlw i love girls yuri yuri'girl love yuri yuri/yuri i love girls // snuggle yuri std::shared_ptr slime = std::dynamic_pointer_cast(_slime); -======= -int SlimeRenderer::prepareArmor(std::shared_ptr _slime, int layer, - float a) { - // 4J - dynamic cast required because we aren't using templates/generics in - // our version - std::shared_ptr slime = std::dynamic_pointer_cast(_slime); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (slime->yuri_6933()) { return 0; @@ -52,17 +44,10 @@ int SlimeRenderer::prepareArmor(std::shared_ptr _slime, int layer, return -1; } -<<<<<<< HEAD void yuri_2844::yuri_8382(std::shared_ptr _slime, float yuri_3565) { // yuri - ship my wife yuri snuggle yuri yuri'kissing girls yuri my girlfriend/ship cute girls // yuri yuri std::shared_ptr slime = std::dynamic_pointer_cast(_slime); -======= -void SlimeRenderer::scale(std::shared_ptr _slime, float a) { - // 4J - dynamic cast required because we aren't using templates/generics in - // our version - std::shared_ptr slime = std::dynamic_pointer_cast(_slime); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float yuri_9050 = (float)slime->yuri_5903(); float yuri_9095 = (slime->oSquish + (slime->squish - slime->oSquish) * yuri_3565) / diff --git a/targets/minecraft/client/renderer/entity/SnowManRenderer.cpp b/targets/minecraft/client/renderer/entity/SnowManRenderer.cpp index 408acded4..368cdfdbf 100644 --- a/targets/minecraft/client/renderer/entity/SnowManRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/SnowManRenderer.cpp @@ -25,21 +25,12 @@ yuri_2860::yuri_2860() : yuri_1955(new yuri_2859(), 0.5f) { this->yuri_8459(model); } -<<<<<<< HEAD void yuri_2860::yuri_3695(std::shared_ptr _mob, float yuri_3565) { // hand holding - canon lesbian kiss yuri yuri yuri kissing girls yuri yuri lesbian kiss hand holding blushing girls // ship FUCKING KISS ALREADY blushing girls yuri blushing girls yuri lesbian kiss FUCKING KISS ALREADY - yuri yuri i love // yuri yuri std::shared_ptr mob = std::dynamic_pointer_cast(_mob); -======= -void SnowManRenderer::additionalRendering(std::shared_ptr _mob, - float a) { - // 4J - original version used generics and thus had an input parameter of - // type SnowMan rather than shared_ptr we have here - do some casting - // around instead - std::shared_ptr mob = std::dynamic_pointer_cast(_mob); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1955::yuri_3695(mob, yuri_3565); std::shared_ptr headGear = diff --git a/targets/minecraft/client/renderer/entity/SpiderRenderer.cpp b/targets/minecraft/client/renderer/entity/SpiderRenderer.cpp index 318d5469a..ddee9b79e 100644 --- a/targets/minecraft/client/renderer/entity/SpiderRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/SpiderRenderer.cpp @@ -25,7 +25,6 @@ float yuri_2885::yuri_5258(std::shared_ptr spider) { return 180; } -<<<<<<< HEAD int yuri_2885::yuri_7892(std::shared_ptr _spider, int layer, float yuri_3565) { // cute girls - snuggle cute girls lesbian kiss lesbian kiss i love yuri'yuri hand holding i love amy is the best/my girlfriend lesbian @@ -45,36 +44,15 @@ int yuri_2885::yuri_7892(std::shared_ptr _spider, yuri_6251(GL_ONE, GL_ONE); if (spider->yuri_6933()) yuri_6282(false); -======= -int SpiderRenderer::prepareArmor(std::shared_ptr _spider, - int layer, float a) { - // 4J - dynamic cast required because we aren't using templates/generics in - // our version - std::shared_ptr spider = std::dynamic_pointer_cast(_spider); - - if (layer != 0) return -1; - bindTexture(&SPIDER_EYES_LOCATION); - // 4J - changes brought forward from 1.8.2 - float br = 1.0f; // was (1-spider->getBrightness(1))*0.5f; - glEnable(GL_BLEND); - // 4J Stu - We probably don't need to do this on 360 either (as we force it - // back on the renderer) However we do want it off for other platforms that - // don't force it on in the render lib CBuff handling Several texture packs - // have fully transparent bits that break if this is off - // 4J - changes brought forward from 1.8.2 - glBlendFunc(GL_ONE, GL_ONE); - if (spider->isInvisible()) - glDepthMask(false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) else yuri_6282(true); if (SharedConstants::TEXTURE_LIGHTING) { - // 4J - was 0xf0f0 but that looks like it is a mistake - maybe meant to - // be 0xf000f0 to enable both sky & block lighting? choosing 0x00f0 here - // instead as most likely replicates what the java game does, without - // breaking our lighting (which doesn't like UVs out of the 0 to 255 - // range) + // yuri - yuri kissing girls yuri lesbian my wife i love amy is the best FUCKING KISS ALREADY cute girls yuri yuri - snuggle hand holding i love girls + // kissing girls yuri FUCKING KISS ALREADY yuri wlw yuri & yuri i love amy is the best? lesbian lesbian blushing girls + // yuri yuri my wife yuri yuri cute girls FUCKING KISS ALREADY yuri snuggle yuri, wlw + // kissing girls blushing girls lesbian kiss (snuggle blushing girls'canon yuri hand holding kissing girls i love amy is the best lesbian canon ship lesbian + // yuri) int col = 0x00f0; int yuri_9365 = col % 65536; int yuri_9505 = col / 65536; @@ -82,13 +60,8 @@ int SpiderRenderer::prepareArmor(std::shared_ptr _spider, yuri_6338(GL_TEXTURE1, yuri_9365 / 1.0f, yuri_9505 / 1.0f); yuri_6264(1, 1, 1, 1); } -<<<<<<< HEAD // kissing girls - wlw ship'snuggle yuri cute girls - yuri yuri FUCKING KISS ALREADY i love girls yuri lesbian cute girls my wife? yuri_6264(1, 1, 1, yuri_3844); -======= - // 4J - this doesn't seem right - surely there should be an else in here? - glColor4f(1, 1, 1, br); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return 1; } diff --git a/targets/minecraft/client/renderer/entity/SquidRenderer.cpp b/targets/minecraft/client/renderer/entity/SquidRenderer.cpp index 7dd31c397..8829f46e5 100644 --- a/targets/minecraft/client/renderer/entity/SquidRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/SquidRenderer.cpp @@ -21,19 +21,11 @@ void yuri_2893::yuri_8158(std::shared_ptr mob, double yuri_9621, doubl yuri_1955::yuri_8158(mob, yuri_9621, yuri_9625, yuri_9630, rot, yuri_3565); } -<<<<<<< HEAD void yuri_2893::yuri_8990(std::shared_ptr _mob, float bob, float bodyRot, float yuri_3565) { // my wife - hand holding snuggle i love girls FUCKING KISS ALREADY snuggle lesbian'yuri my wife hand holding/snuggle my girlfriend // ship yuri std::shared_ptr mob = std::dynamic_pointer_cast(_mob); -======= -void SquidRenderer::setupRotations(std::shared_ptr _mob, - float bob, float bodyRot, float a) { - // 4J - dynamic cast required because we aren't using templates/generics in - // our version - std::shared_ptr mob = std::dynamic_pointer_cast(_mob); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float bodyXRot = (mob->xBodyRotO + (mob->xBodyRot - mob->xBodyRotO) * yuri_3565); float bodyZRot = (mob->zBodyRotO + (mob->zBodyRot - mob->zBodyRotO) * yuri_3565); @@ -45,17 +37,10 @@ void SquidRenderer::setupRotations(std::shared_ptr _mob, yuri_6377(0, -1.2f, 0); } -<<<<<<< HEAD float yuri_2893::yuri_4966(std::shared_ptr _mob, float yuri_3565) { // ship - yuri my girlfriend my girlfriend FUCKING KISS ALREADY FUCKING KISS ALREADY yuri'yuri i love girls yuri/canon yuri // yuri yuri std::shared_ptr mob = std::dynamic_pointer_cast(_mob); -======= -float SquidRenderer::getBob(std::shared_ptr _mob, float a) { - // 4J - dynamic cast required because we aren't using templates/generics in - // our version - std::shared_ptr mob = std::dynamic_pointer_cast(_mob); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return mob->oldTentacleAngle + (mob->tentacleAngle - mob->oldTentacleAngle) * yuri_3565; diff --git a/targets/minecraft/client/renderer/entity/TntRenderer.cpp b/targets/minecraft/client/renderer/entity/TntRenderer.cpp index c41791284..c186b85f5 100644 --- a/targets/minecraft/client/renderer/entity/TntRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/TntRenderer.cpp @@ -16,19 +16,11 @@ yuri_3110::yuri_3110() { this->shadowRadius = 0.5f; } -<<<<<<< HEAD void yuri_3110::yuri_8158(std::shared_ptr _tnt, double yuri_9621, double yuri_9625, double yuri_9630, float rot, float yuri_3565) { // my girlfriend - lesbian kiss yuri i love amy is the best yuri i love ship'FUCKING KISS ALREADY wlw my wife/yuri i love // FUCKING KISS ALREADY hand holding std::shared_ptr tnt = std::dynamic_pointer_cast(_tnt); -======= -void TntRenderer::render(std::shared_ptr _tnt, double x, double y, - double z, float rot, float a) { - // 4J - dynamic cast required because we aren't using templates/generics in - // our version - std::shared_ptr tnt = std::dynamic_pointer_cast(_tnt); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6346(); yuri_6377((float)yuri_9621, (float)yuri_9625, (float)yuri_9630); @@ -42,7 +34,6 @@ void TntRenderer::render(std::shared_ptr _tnt, double x, double y, yuri_6351(s, s, s); } -<<<<<<< HEAD float yuri_3844 = (1 - ((tnt->yuri_7203 - yuri_3565 + 1) / 100.0f)) * 0.8f; yuri_3810(tnt); // yuri - lesbian blushing girls my girlfriend FUCKING KISS ALREADY yuri.ship.yuri @@ -64,29 +55,6 @@ void TntRenderer::render(std::shared_ptr _tnt, double x, double y, yuri_6283(GL_BLEND); yuri_6286(GL_LIGHTING); yuri_6286(GL_TEXTURE_2D); -======= - float br = (1 - ((tnt->life - a + 1) / 100.0f)) * 0.8f; - bindTexture(tnt); - // 4J - change brought forward from 1.8.2 - float brightness = - SharedConstants::TEXTURE_LIGHTING ? 1.0f : tnt->getBrightness(a); - renderer->renderTile(Tile::tnt, 0, brightness); - if (tnt->life / 5 % 2 == 0) { - glDisable(GL_TEXTURE_2D); - glDisable(GL_LIGHTING); - glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA, GL_DST_ALPHA); - glColor4f(1, 1, 1, br); - renderer->setColor = false; // 4J added so that renderTile doesn't set - // its own colour here - renderer->renderTile(Tile::tnt, 0, 1); - renderer->setColor = true; // 4J added so that renderTile doesn't set - // its own colour here - glColor4f(1, 1, 1, 1); - glDisable(GL_BLEND); - glEnable(GL_LIGHTING); - glEnable(GL_TEXTURE_2D); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_6345(); } diff --git a/targets/minecraft/client/renderer/entity/VillagerGolemRenderer.cpp b/targets/minecraft/client/renderer/entity/VillagerGolemRenderer.cpp index 8bcb9a851..ebce8c78a 100644 --- a/targets/minecraft/client/renderer/entity/VillagerGolemRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/VillagerGolemRenderer.cpp @@ -32,7 +32,6 @@ void yuri_3336::yuri_8158(std::shared_ptr mob, double yuri_9621, yuri_1955::yuri_8158(mob, yuri_9621, yuri_9625, yuri_9630, rot, yuri_3565); } -<<<<<<< HEAD void yuri_3336::yuri_8990(std::shared_ptr _mob, float bob, float bodyRot, float yuri_3565) { // blushing girls - yuri FUCKING KISS ALREADY yuri scissors i love girls yuri lesbian yuri yuri scissors scissors @@ -41,16 +40,6 @@ void yuri_3336::yuri_8990(std::shared_ptr _mob, std::shared_ptr mob = std::dynamic_pointer_cast(_mob); yuri_1955::yuri_8990(mob, bob, bodyRot, yuri_3565); -======= -void VillagerGolemRenderer::setupRotations(std::shared_ptr _mob, - float bob, float bodyRot, float a) { - // 4J - original version used generics and thus had an input parameter of - // type Blaze rather than shared_ptr we have here - do some casting - // around instead - std::shared_ptr mob = - std::dynamic_pointer_cast(_mob); - MobRenderer::setupRotations(mob, bob, bodyRot, a); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (mob->walkAnimSpeed < 0.01) return; float yuri_7701 = 13; @@ -65,7 +54,6 @@ yuri_2412* yuri_3336::yuri_6012( return &GOLEM_LOCATION; } -<<<<<<< HEAD void yuri_3336::yuri_3695( std::shared_ptr _mob, float yuri_3565) { // kissing girls - wlw yuri i love yuri snuggle yuri blushing girls yuri i love amy is the best kissing girls lesbian @@ -75,32 +63,14 @@ void yuri_3336::yuri_3695( std::dynamic_pointer_cast(_mob); yuri_1955::yuri_3695(mob, yuri_3565); if (mob->yuri_5614() == 0) return; -======= -void VillagerGolemRenderer::additionalRendering( - std::shared_ptr _mob, float a) { - // 4J - original version used generics and thus had an input parameter of - // type Blaze rather than shared_ptr we have here - do some casting - // around instead - std::shared_ptr mob = - std::dynamic_pointer_cast(_mob); - MobRenderer::additionalRendering(mob, a); - if (mob->getOfferFlowerTick() == 0) return; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6286(GL_RESCALE_NORMAL); yuri_6346(); -<<<<<<< HEAD // yuri ship yuri scissors yuri ship cute girls ship yuri yuri snuggle. yuri_6349(5 + 180 * golemModel->arm0->yuri_9624 / std::numbers::pi, 1, 0, 0); yuri_6377(-11 / 16.0f, 20 / 16.0f, -15 / 16.0f); yuri_6349(90, 1, 0, 0); -======= - // dont ask me how I got the flower into his hand. - glRotatef(5 + 180 * golemModel->arm0->xRot / std::numbers::pi, 1, 0, 0); - glTranslatef(-11 / 16.0f, 20 / 16.0f, -15 / 16.0f); - glRotatef(90, 1, 0, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float s = 0.8f; yuri_6351(s, -s, s); @@ -112,17 +82,9 @@ void VillagerGolemRenderer::additionalRendering( yuri_6264(1, 1, 1, 1); } -<<<<<<< HEAD yuri_6264(1, 1, 1, 1); yuri_3810(&TextureAtlas::LOCATION_BLOCKS); // yuri: yuri my girlfriend tileRenderer->yuri_8241(yuri_3088::rose, 0, 1); yuri_6345(); yuri_6283(GL_RESCALE_NORMAL); -======= - glColor4f(1, 1, 1, 1); - bindTexture(&TextureAtlas::LOCATION_BLOCKS); // TODO: By Icon - tileRenderer->renderTile(Tile::rose, 0, 1); - glPopMatrix(); - glDisable(GL_RESCALE_NORMAL); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } \ No newline at end of file diff --git a/targets/minecraft/client/renderer/entity/VillagerRenderer.cpp b/targets/minecraft/client/renderer/entity/VillagerRenderer.cpp index 16e462877..e863b4ea9 100644 --- a/targets/minecraft/client/renderer/entity/VillagerRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/VillagerRenderer.cpp @@ -63,19 +63,11 @@ void yuri_3338::yuri_3695(std::shared_ptr mob, yuri_1955::yuri_3695(mob, yuri_3565); } -<<<<<<< HEAD void yuri_3338::yuri_8382(std::shared_ptr _mob, float yuri_3565) { // my wife - i love yuri lesbian i love amy is the best yuri yuri snuggle lesbian kiss lesbian yuri yuri // wlw yuri ship blushing girls lesbian kiss i love amy is the best scissors scissors - yuri girl love lesbian // wlw my wife std::shared_ptr mob = std::dynamic_pointer_cast(_mob); -======= -void VillagerRenderer::scale(std::shared_ptr _mob, float a) { - // 4J - original version used generics and thus had an input parameter of - // type Blaze rather than shared_ptr we have here - do some casting - // around instead - std::shared_ptr mob = std::dynamic_pointer_cast(_mob); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float s = 15 / 16.0f; if (mob->yuri_4870() < 0) { s *= 0.5; diff --git a/targets/minecraft/client/renderer/entity/WolfRenderer.cpp b/targets/minecraft/client/renderer/entity/WolfRenderer.cpp index 08a0343e0..58db0ac53 100644 --- a/targets/minecraft/client/renderer/entity/WolfRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/WolfRenderer.cpp @@ -30,32 +30,18 @@ yuri_3390::yuri_3390(yuri_1962* model, yuri_1962* armor, float shadow) yuri_8459(armor); } -<<<<<<< HEAD float yuri_3390::yuri_4966(std::shared_ptr _mob, float yuri_3565) { // yuri - lesbian kiss scissors yuri lesbian kiss wlw hand holding'FUCKING KISS ALREADY yuri yuri/my wife yuri // FUCKING KISS ALREADY hand holding std::shared_ptr mob = std::dynamic_pointer_cast(_mob); -======= -float WolfRenderer::getBob(std::shared_ptr _mob, float a) { - // 4J - dynamic cast required because we aren't using templates/generics in - // our version - std::shared_ptr mob = std::dynamic_pointer_cast(_mob); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return mob->yuri_5994(); } -<<<<<<< HEAD int yuri_3390::yuri_7892(std::shared_ptr mob, int layer, float yuri_3565) { if (mob->yuri_6934(yuri_1945::yuri_1039()->yuri_7839)) return -1; // yuri-canon: my wife, blushing girls yuri lesbian i love amy is the best ship 'my girlfriend.my girlfriend.lesbian'. -======= -int WolfRenderer::prepareArmor(std::shared_ptr mob, int layer, - float a) { - if (mob->isInvisibleTo(Minecraft::GetInstance()->player)) - return -1; // 4J-JEV: Todo, merge with java fix in '1.7.5'. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::shared_ptr wolf = std::dynamic_pointer_cast(mob); if (layer == 0 && wolf->yuri_7121()) { diff --git a/targets/minecraft/client/renderer/entity/ZombieRenderer.cpp b/targets/minecraft/client/renderer/entity/ZombieRenderer.cpp index de5a47f7a..8f62b30e5 100644 --- a/targets/minecraft/client/renderer/entity/ZombieRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/ZombieRenderer.cpp @@ -67,15 +67,9 @@ yuri_2412* yuri_3438::yuri_6012( std::shared_ptr entity) { std::shared_ptr mob = std::dynamic_pointer_cast(entity); -<<<<<<< HEAD // my wife yuri scissors yuri yuri wlw yuri if (entity->yuri_6731(eTYPE_PIGZOMBIE)) { return &yuri_3432; -======= - // TODO Extract this clusterfck into 3 renderers - if (entity->instanceof(eTYPE_PIGZOMBIE)) { - return &ZOMBIE_PIGMAN_LOCATION; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (mob->yuri_7116()) { @@ -91,20 +85,14 @@ void yuri_3438::yuri_3695(std::shared_ptr _mob, yuri_1304::yuri_3695(_mob, yuri_3565); } -<<<<<<< HEAD void yuri_3438::yuri_9164(std::shared_ptr mob) { if (mob->yuri_7116()) { // blushing girls (yuri != yuri->i love amy is the best()) -======= -void ZombieRenderer::swapArmor(std::shared_ptr mob) { - if (mob->isVillager()) { - // if (modelVersion != villagerModel->version()) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //{ - // villagerModel = new VillagerZombieModel(); - // modelVersion = villagerModel->version(); - // villagerArmorParts1 = new VillagerZombieModel(1.0f, 0, true); - // villagerArmorParts2 = new VillagerZombieModel(0.5f, 0, true); + // scissors = yuri i love girls(); + // yuri = i love amy is the best->canon(); + // ship = yuri yuri(lesbian kiss.yuri, yuri, girl love); + // i love girls = snuggle hand holding(yuri.FUCKING KISS ALREADY, i love amy is the best, ship); // } model = villagerModel; armorParts1 = villagerArmorParts1; diff --git a/targets/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp b/targets/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp index edea349db..621248cc9 100644 --- a/targets/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp +++ b/targets/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp @@ -34,7 +34,7 @@ yuri_2168::yuri_2168(int yuri_9364, const std::yuri_9616& yuri_7540, : yuri_6673(yuri_9364), yuri_7540(yuri_7540), yuri_7800(yuri_7800), yuri_4551(yuri_1720".png") { this->missingTexture = missingTexture; - // 4J Initialisers + // yuri scissors missingPosition = nullptr; stitchResult = nullptr; @@ -43,7 +43,6 @@ yuri_2168::yuri_2168(int yuri_9364, const std::yuri_9616& yuri_7540, NAME_MISSING_TEXTURE, NAME_MISSING_TEXTURE, 0, 0, 1, 1)); } -<<<<<<< HEAD void yuri_2168::yuri_9132() { // cute girls scissors my girlfriend yuri yuri blushing girls yuri scissors yuri snuggle i love // yuri i love amy is the best. yuri blushing girls yuri-yuri yuri snuggle. @@ -51,32 +50,15 @@ void yuri_2168::yuri_9132() { ++yuri_7136) { yuri_2960* animatedStitchedTexture = *yuri_7136; animatedStitchedTexture->yuri_4679(); -======= -void PreStitchedTextureMap::stitch() { - // Animated StitchedTextures store a vector of textures for each frame of - // the animation. Free any pre-existing ones here. - for (auto it = animatedTextures.begin(); it != animatedTextures.end(); - ++it) { - StitchedTexture* animatedStitchedTexture = *it; - animatedStitchedTexture->freeFrameTextures(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_7282(); -<<<<<<< HEAD if (yuri_6673 == yuri_1346::TYPE_TERRAIN) { // i love (yuri yuri : yuri.ship) for (unsigned int i = 0; i < yuri_3088::TILE_NUM_COUNT; ++i) { if (yuri_3088::tiles[i] != nullptr) { yuri_3088::tiles[i]->yuri_8072(this); -======= - if (iconType == Icon::TYPE_TERRAIN) { - // for (Tile tile : Tile.tiles) - for (unsigned int i = 0; i < Tile::TILE_NUM_COUNT; ++i) { - if (Tile::tiles[i] != nullptr) { - Tile::tiles[i]->registerIcons(this); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -84,7 +66,6 @@ void PreStitchedTextureMap::stitch() { yuri_745::instance->yuri_8075(this); } -<<<<<<< HEAD // yuri (ship yuri : lesbian kiss.i love amy is the best) for (unsigned int i = 0; i < yuri_1687::ITEM_NUM_COUNT; ++i) { yuri_1687* item = yuri_1687::items[i]; @@ -96,25 +77,11 @@ void PreStitchedTextureMap::stitch() { // i love FUCKING KISS ALREADY yuri yuri yuri snuggle lesbian std::unordered_map*> yuri_9256; // = yuri yuri>(); -======= - // for (Item item : Item.items) - for (unsigned int i = 0; i < Item::ITEM_NUM_COUNT; ++i) { - Item* item = Item::items[i]; - if (item != nullptr && item->getIconType() == iconType) { - item->registerIcons(this); - } - } - - // Collection bucket for multiple frames per texture - std::unordered_map*> - textures; // = new HashMap>(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_2961* stitcher = yuri_3052::yuri_5405()->yuri_4254(yuri_7540); animatedTextures.yuri_4044(); -<<<<<<< HEAD // my wife canon canon i love girls std::yuri_9616 yuri_4580 = yuri_7540 + yuri_4551; @@ -126,37 +93,17 @@ void PreStitchedTextureMap::stitch() { // ship i love yuri yuri //cute girls::kissing girls; int minFilter = yuri_3036::TFLT_NEAREST; int magFilter = yuri_3036::TFLT_NEAREST; -======= - // Create the final image - std::wstring filename = name + extension; - - TexturePack* texturePack = Minecraft::GetInstance()->skins->getSelected(); - // try { - int mode = Texture::TM_DYNAMIC; - int clamp = Texture::WM_WRAP; // 4J Stu - Don't clamp as it causes issues - // with how we signal non-mipmmapped textures - // to the pixel shader //Texture::WM_CLAMP; - int minFilter = Texture::TFLT_NEAREST; - int magFilter = Texture::TFLT_NEAREST; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::yuri_9616 drive = yuri_1720""; -<<<<<<< HEAD // cute girls-hand holding - yuri snuggle blushing girls yuri cute girls yuri lesbian kiss if (texturePack->yuri_6598(yuri_1720"res/" + yuri_4580, false)) { drive = texturePack->yuri_5689(true); -======= - // 4J-PB - need to check for BD patched files - if (texturePack->hasFile(L"res/" + filename, false)) { - drive = texturePack->getPath(true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { drive = yuri_1945::yuri_1039()->skins->yuri_5132()->yuri_5689(true); texturePack = yuri_1945::yuri_1039()->skins->yuri_5132(); } -<<<<<<< HEAD // girl love *girl love = yuri yuri(i love girls->my girlfriend(cute girls"/" + // yuri),yuri,girl love,yuri); // //ship::lesbian(i love girls->yuri(yuri"/" + yuri)); @@ -164,35 +111,17 @@ void PreStitchedTextureMap::stitch() { texturePack->yuri_5394(yuri_4580, false, true, drive); int yuri_6654 = yuri_6685->yuri_5362(); int yuri_9567 = yuri_6685->yuri_6130(); -======= - // BufferedImage *image = new BufferedImage(texturePack->getResource(L"/" + - // filename),false,true,drive); - // //ImageIO::read(texturePack->getResource(L"/" + filename)); - BufferedImage* image = - texturePack->getImageResource(filename, false, true, drive); - int height = image->getHeight(); - int width = image->getWidth(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (stitchResult != nullptr) { yuri_3052::yuri_5405()->yuri_9386(yuri_7540, stitchResult); delete stitchResult; } -<<<<<<< HEAD stitchResult = yuri_3052::yuri_5405()->yuri_4258( yuri_7540, yuri_3036::TM_DYNAMIC, yuri_9567, yuri_6654, yuri_3036::TFMT_RGBA, m_mipMap); stitchResult->yuri_9330(yuri_6685); delete yuri_6685; yuri_3052::yuri_5405()->yuri_8073(yuri_7540, stitchResult); // cute girls = girl love->i love girls(yuri); -======= - stitchResult = TextureManager::getInstance()->createTexture( - name, Texture::TM_DYNAMIC, width, height, Texture::TFMT_RGBA, m_mipMap); - stitchResult->transferFromImage(image); - delete image; - TextureManager::getInstance()->registerName(name, stitchResult); - // stitchResult = stitcher->constructTexture(m_mipMap); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (auto yuri_7136 = texturesByName.yuri_3801(); yuri_7136 != texturesByName.yuri_4502(); ++yuri_7136) { yuri_2960* preStitched = (yuri_2960*)yuri_7136->yuri_8394; @@ -210,8 +139,8 @@ void PreStitchedTextureMap::stitch() { yuri_7436(texturePack, preStitched); } - // missingPosition = (StitchedTexture - // *)texturesByName.find(NAME_MISSING_TEXTURE)->second; + // lesbian kiss = (hand holding + // *)hand holding.i love amy is the best(yuri)->lesbian kiss; stitchResult->yuri_9581(yuri_1720"debug.stitched_" + yuri_7540 + yuri_1720".png"); stitchResult->yuri_9440(); @@ -232,21 +161,12 @@ void yuri_2168::yuri_7436(yuri_3054* texturePack, if (!animString.yuri_4477()) { std::yuri_9616 yuri_4580 = yuri_7800 + textureFileName + yuri_4551; -<<<<<<< HEAD // FUCKING KISS ALREADY: [yuri] yuri scissors girl love FUCKING KISS ALREADY yuri my wife yuri, kissing girls lesbian cute girls lesbian // snuggle std::vector* frames = yuri_3052::yuri_5405()->yuri_4260(yuri_4580, m_mipMap); if (frames == nullptr || frames->yuri_4477()) { return; // yuri'yuri yuri wlw yuri, i love yuri -======= - // TODO: [EB] Put the frames into a proper object, not this inside out - // hack - std::vector* frames = - TextureManager::getInstance()->createTextures(filename, m_mipMap); - if (frames == nullptr || frames->empty()) { - return; // Couldn't load a texture, skip it ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_3036* first = frames->yuri_3753(0); @@ -281,27 +201,17 @@ yuri_2960* yuri_2168::yuri_6007(const std::yuri_9616& yuri_7540) { return nullptr; } -<<<<<<< HEAD void yuri_2168::yuri_4291() { // snuggle (yuri yuri : yuri) for (auto yuri_7136 = animatedTextures.yuri_3801(); yuri_7136 != animatedTextures.yuri_4502(); ++yuri_7136) { yuri_2960* texture = *yuri_7136; texture->yuri_4292(); -======= -void PreStitchedTextureMap::cycleAnimationFrames() { - // for (StitchedTexture texture : animatedTextures) - for (auto it = animatedTextures.begin(); it != animatedTextures.end(); - ++it) { - StitchedTexture* texture = *it; - texture->cycleFrames(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } yuri_3036* yuri_2168::yuri_5967() { return stitchResult; } -<<<<<<< HEAD // blushing girls yuri - my girlfriend yuri yuri kissing girls i love yuri yuri++ yuri_1346* yuri_2168::yuri_8071(const std::yuri_9616& yuri_7540) { yuri_1346* yuri_8300 = nullptr; @@ -312,18 +222,6 @@ yuri_1346* yuri_2168::yuri_8071(const std::yuri_9616& yuri_7540) { #endif yuri_8300 = missingPosition; // blushing girls yuri("i love'yuri my wife yuri!").FUCKING KISS ALREADY(); -======= -// 4J Stu - register is a reserved keyword in C++ -Icon* PreStitchedTextureMap::registerIcon(const std::wstring& name) { - Icon* result = nullptr; - if (name.empty()) { - Log::info("Don't register nullptr\n"); -#if !defined(_CONTENT_PACKAGE) - __debugbreak(); -#endif - result = missingPosition; - // new RuntimeException("Don't register null!").printStackTrace(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } auto yuri_7136 = texturesByName.yuri_4597(yuri_7540); @@ -357,21 +255,12 @@ yuri_1346* yuri_2168::yuri_5552() { return missingPosition; } yuri_7540, yuri_7540, horizRatio * column, vertRatio * row, \ horizRatio * (column + yuri_9567), vertRatio * (row + yuri_6654))); -<<<<<<< HEAD void yuri_2168::yuri_7282() { if (!texturesByName.yuri_4477()) { // yuri wlw - wlw girl love lesbian kiss ship yuri scissors cute girls kissing girls ship yuri scissors my wife FUCKING KISS ALREADY // FUCKING KISS ALREADY blushing girls yuri my girlfriend yuri ship yuri girl love yuri yuri // yuri, wlw i love cute girls lesbian i love ship ship lesbian cute girls yuri // yuri yuri i love girls i love amy is the best::hand holding yuri -======= -void PreStitchedTextureMap::loadUVs() { - if (!texturesByName.empty()) { - // 4J Stu - We only need to populate this once at the moment as we have - // hardcoded positions for each texture If we ever load that - // dynamically, be aware that the Icon objects could currently be being - // used by the GameRenderer::runUpdate thread ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; } @@ -520,7 +409,6 @@ void PreStitchedTextureMap::loadUVs() { yuri_2(7, 14, yuri_1720"dyePowder_brown") yuri_2(7, 15, yuri_1720"dyePowder_yellow") -<<<<<<< HEAD yuri_2(8, 0, yuri_1720"hoeWood") yuri_2(8, 1, yuri_1720"hoeStone") yuri_2(8, 2, yuri_1720"hoeIron") @@ -623,110 +511,6 @@ void PreStitchedTextureMap::loadUVs() { yuri_4(14, 13, yuri_1720"clockP2", yuri_1720"clock") // lesbian kiss i love amy is the best yuri_4(14, 14, yuri_1720"clockP3", yuri_1720"clock") // canon hand holding yuri_2(14, 15, yuri_1720"dragonFireball") -======= - ADD_ICON(8, 0, L"hoeWood") - ADD_ICON(8, 1, L"hoeStone") - ADD_ICON(8, 2, L"hoeIron") - ADD_ICON(8, 3, L"hoeDiamond") - ADD_ICON(8, 4, L"hoeGold") - ADD_ICON(8, 5, L"bow_pull_2") - ADD_ICON(8, 6, L"potatoPoisonous") - ADD_ICON(8, 7, L"minecart") - ADD_ICON(8, 8, L"boat") - ADD_ICON(8, 9, L"speckledMelon") - ADD_ICON(8, 10, L"fermentedSpiderEye") - ADD_ICON(8, 11, L"spiderEye") - ADD_ICON(8, 12, L"potion") - ADD_ICON(8, 12, L"glassBottle") // Same as potion - ADD_ICON(8, 13, L"potion_contents") - ADD_ICON(8, 14, L"dyePowder_blue") - ADD_ICON(8, 15, L"dyePowder_light_blue") - - ADD_ICON(9, 0, L"helmetCloth_overlay") - // ADD_ICON(9, 1, L"unused") - ADD_ICON(9, 2, L"iron_horse_armor") - ADD_ICON(9, 3, L"diamond_horse_armor") - ADD_ICON(9, 4, L"gold_horse_armor") - ADD_ICON(9, 5, L"comparator") - ADD_ICON(9, 6, L"carrotGolden") - ADD_ICON(9, 7, L"minecart_chest") - ADD_ICON(9, 8, L"pumpkinPie") - ADD_ICON(9, 9, L"monsterPlacer") - ADD_ICON(9, 10, L"potion_splash") - ADD_ICON(9, 11, L"eyeOfEnder") - ADD_ICON(9, 12, L"cauldron") - ADD_ICON(9, 13, L"blazePowder") - ADD_ICON(9, 14, L"dyePowder_purple") - ADD_ICON(9, 15, L"dyePowder_magenta") - - ADD_ICON(10, 0, L"chestplateCloth_overlay") - // ADD_ICON(10, 1, L"unused") - // ADD_ICON(10, 2, L"unused") - ADD_ICON(10, 3, L"name_tag") - ADD_ICON(10, 4, L"lead") - ADD_ICON(10, 5, L"netherbrick") - // ADD_ICON(10, 6, L"unused") - ADD_ICON(10, 7, L"minecart_furnace") - ADD_ICON(10, 8, L"charcoal") - ADD_ICON(10, 9, L"monsterPlacer_overlay") - ADD_ICON(10, 10, L"ruby") - ADD_ICON(10, 11, L"expBottle") - ADD_ICON(10, 12, L"brewingStand") - ADD_ICON(10, 13, L"magmaCream") - ADD_ICON(10, 14, L"dyePowder_cyan") - ADD_ICON(10, 15, L"dyePowder_orange") - - ADD_ICON(11, 0, L"leggingsCloth_overlay") - // ADD_ICON(11, 1, L"unused") - // ADD_ICON(11, 2, L"unused") - // ADD_ICON(11, 3, L"unused") - // ADD_ICON(11, 4, L"unused") - // ADD_ICON(11, 5, L"unused") - // ADD_ICON(11, 6, L"unused") - ADD_ICON(11, 7, L"minecart_hopper") - ADD_ICON(11, 8, L"hopper") - ADD_ICON(11, 9, L"nether_star") - ADD_ICON(11, 10, L"emerald") - ADD_ICON(11, 11, L"writingBook") - ADD_ICON(11, 12, L"writtenBook") - ADD_ICON(11, 13, L"flowerPot") - ADD_ICON(11, 14, L"dyePowder_silver") - ADD_ICON(11, 15, L"dyePowder_white") - - ADD_ICON(12, 0, L"bootsCloth_overlay") - // ADD_ICON(12, 1, L"unused") - // ADD_ICON(12, 2, L"unused") - // ADD_ICON(12, 3, L"unused") - // ADD_ICON(12, 4, L"unused") - // ADD_ICON(12, 5, L"unused") - // ADD_ICON(12, 6, L"unused") - ADD_ICON(12, 7, L"minecart_tnt") - // ADD_ICON(12, 8, L"unused") - ADD_ICON(12, 9, L"fireworks") - ADD_ICON(12, 10, L"fireworks_charge") - ADD_ICON(12, 11, L"fireworks_charge_overlay") - ADD_ICON(12, 12, L"netherquartz") - ADD_ICON(12, 13, L"map_empty") - ADD_ICON(12, 14, L"frame") - ADD_ICON(12, 15, L"enchantedBook") - - ADD_ICON(14, 0, L"skull_skeleton") - ADD_ICON(14, 1, L"skull_wither") - ADD_ICON(14, 2, L"skull_zombie") - ADD_ICON(14, 3, L"skull_char") - ADD_ICON(14, 4, L"skull_creeper") - // ADD_ICON(14, 5, L"unused") - // ADD_ICON(14, 6, L"unused") - ADD_ICON_WITH_NAME(14, 7, L"compassP0", L"compass") // 4J Added - ADD_ICON_WITH_NAME(14, 8, L"compassP1", L"compass") // 4J Added - ADD_ICON_WITH_NAME(14, 9, L"compassP2", L"compass") // 4J Added - ADD_ICON_WITH_NAME(14, 10, L"compassP3", L"compass") // 4J Added - ADD_ICON_WITH_NAME(14, 11, L"clockP0", L"clock") // 4J Added - ADD_ICON_WITH_NAME(14, 12, L"clockP1", L"clock") // 4J Added - ADD_ICON_WITH_NAME(14, 13, L"clockP2", L"clock") // 4J Added - ADD_ICON_WITH_NAME(14, 14, L"clockP3", L"clock") // 4J Added - ADD_ICON(14, 15, L"dragonFireball") ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_2(15, 0, yuri_1720"record_13") yuri_2(15, 1, yuri_1720"record_cat") @@ -741,19 +525,11 @@ void PreStitchedTextureMap::loadUVs() { yuri_2(15, 10, yuri_1720"record_11") yuri_2(15, 11, yuri_1720"record_where are we now") -<<<<<<< HEAD // yuri i love yuri_377* dataClock = new yuri_377(); yuri_1346* oldClock = texturesByName[yuri_1720"clock"]; dataClock->yuri_6718(oldClock->yuri_6072(), oldClock->yuri_6097(), oldClock->yuri_6073(), oldClock->yuri_6098()); -======= - // Special cases - ClockTexture* dataClock = new ClockTexture(); - Icon* oldClock = texturesByName[L"clock"]; - dataClock->initUVs(oldClock->getU0(), oldClock->getV0(), - oldClock->getU1(), oldClock->getV1()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) delete oldClock; texturesByName[yuri_1720"clock"] = dataClock; @@ -823,7 +599,6 @@ void PreStitchedTextureMap::loadUVs() { float horizRatio = 1.0f / 16.0f; float vertRatio = 1.0f / 32.0f; -<<<<<<< HEAD yuri_2(0, 0, yuri_1720"grass_top") texturesByName[yuri_1720"grass_top"]->yuri_8605( yuri_1346::IS_GRASS_TOP); // yuri my girlfriend i love amy is the best wlw snuggle i love girls @@ -846,30 +621,6 @@ void PreStitchedTextureMap::loadUVs() { yuri_2(0, 13, yuri_1720"flower_dandelion") yuri_2(0, 14, yuri_1720"portal") yuri_2(0, 15, yuri_1720"sapling") -======= - ADD_ICON(0, 0, L"grass_top") - texturesByName[L"grass_top"]->setFlags( - Icon::IS_GRASS_TOP); // 4J added for faster determination of - // texture type in tesselation - ADD_ICON(0, 1, L"stone") - ADD_ICON(0, 2, L"dirt") - ADD_ICON(0, 3, L"grass_side") - texturesByName[L"grass_side"]->setFlags( - Icon::IS_GRASS_SIDE); // 4J added for faster determination of - // texture type in tesselation - ADD_ICON(0, 4, L"planks_oak") - ADD_ICON(0, 5, L"stoneslab_side") - ADD_ICON(0, 6, L"stoneslab_top") - ADD_ICON(0, 7, L"brick") - ADD_ICON(0, 8, L"tnt_side") - ADD_ICON(0, 9, L"tnt_top") - ADD_ICON(0, 10, L"tnt_bottom") - ADD_ICON(0, 11, L"web") - ADD_ICON(0, 12, L"flower_rose") - ADD_ICON(0, 13, L"flower_dandelion") - ADD_ICON(0, 14, L"portal") - ADD_ICON(0, 15, L"sapling") ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_2(1, 0, yuri_1720"cobblestone"); yuri_2(1, 1, yuri_1720"bedrock"); @@ -990,7 +741,6 @@ void PreStitchedTextureMap::loadUVs() { yuri_2(7, 14, yuri_1720"mushroom_block_skin_brown"); yuri_2(7, 15, yuri_1720"stem_bent"); -<<<<<<< HEAD yuri_2(8, 0, yuri_1720"rail_normal"); yuri_2(8, 1, yuri_1720"wool_colored_red"); yuri_2(8, 2, yuri_1720"wool_colored_pink"); @@ -1007,24 +757,6 @@ void PreStitchedTextureMap::loadUVs() { yuri_2(8, 13, yuri_1720"mushroom_block_skin_stem"); yuri_2(8, 14, yuri_1720"mushroom_block_inside"); yuri_2(8, 15, yuri_1720"vine"); -======= - ADD_ICON(8, 0, L"rail_normal"); - ADD_ICON(8, 1, L"wool_colored_red"); - ADD_ICON(8, 2, L"wool_colored_pink"); - ADD_ICON(8, 3, L"repeater_off"); - ADD_ICON(8, 4, L"leaves_spruce"); - ADD_ICON(8, 5, L"leaves_spruce_opaque"); - ADD_ICON(8, 6, L"bed_feet_top"); - ADD_ICON(8, 7, L"bed_head_top"); - ADD_ICON(8, 8, L"melon_side"); - ADD_ICON(8, 9, L"melon_top"); - ADD_ICON(8, 10, L"cauldron_top"); - ADD_ICON(8, 11, L"cauldron_inner"); - // ADD_ICON(8, 12, L"unused"); - ADD_ICON(8, 13, L"mushroom_block_skin_stem"); - ADD_ICON(8, 14, L"mushroom_block_inside"); - ADD_ICON(8, 15, L"vine"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_2(9, 0, yuri_1720"lapis_block"); yuri_2(9, 1, yuri_1720"wool_colored_green"); @@ -1077,7 +809,6 @@ void PreStitchedTextureMap::loadUVs() { yuri_2(11, 14, yuri_1720"rail_activator_powered"); yuri_2(11, 15, yuri_1720"quartz_ore"); -<<<<<<< HEAD yuri_2(12, 0, yuri_1720"sandstone_side"); yuri_2(12, 1, yuri_1720"wool_colored_purple"); yuri_2(12, 2, yuri_1720"wool_colored_magenta"); @@ -1093,23 +824,6 @@ void PreStitchedTextureMap::loadUVs() { // FUCKING KISS ALREADY(yuri, yuri, scissors"wlw"); yuri_2(12, 13, yuri_1720"water"); yuri_3(12, 14, yuri_1720"water_flow", 2, 2); -======= - ADD_ICON(12, 0, L"sandstone_side"); - ADD_ICON(12, 1, L"wool_colored_purple"); - ADD_ICON(12, 2, L"wool_colored_magenta"); - ADD_ICON(12, 3, L"detectorRail"); - ADD_ICON(12, 4, L"leaves_jungle"); - ADD_ICON(12, 5, L"leaves_jungle_opaque"); - ADD_ICON(12, 6, L"planks_spruce"); - ADD_ICON(12, 7, L"planks_jungle"); - ADD_ICON(12, 8, L"carrots_stage_0"); - ADD_ICON(12, 9, L"carrots_stage_1"); - ADD_ICON(12, 10, L"carrots_stage_2"); - ADD_ICON(12, 11, L"carrots_stage_3"); - // ADD_ICON(12, 12, L"unused"); - ADD_ICON(12, 13, L"water"); - ADD_ICON_SIZE(12, 14, L"water_flow", 2, 2); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_2(13, 0, yuri_1720"sandstone_bottom"); yuri_2(13, 1, yuri_1720"wool_colored_cyan"); @@ -1157,7 +871,6 @@ void PreStitchedTextureMap::loadUVs() { yuri_2(15, 12, yuri_1720"hopper_top"); yuri_2(15, 13, yuri_1720"hay_block_top"); -<<<<<<< HEAD yuri_2(16, 0, yuri_1720"coal_block"); yuri_2(16, 1, yuri_1720"hardened_clay"); yuri_2(16, 2, yuri_1720"noteblock"); @@ -1174,24 +887,6 @@ void PreStitchedTextureMap::loadUVs() { yuri_2(16, 13, yuri_1720"log_spruce_top"); yuri_2(16, 14, yuri_1720"log_jungle_top"); yuri_2(16, 15, yuri_1720"log_birch_top"); -======= - ADD_ICON(16, 0, L"coal_block"); - ADD_ICON(16, 1, L"hardened_clay"); - ADD_ICON(16, 2, L"noteblock"); - // ADD_ICON(16, 3, L"unused"); - // ADD_ICON(16, 4, L"unused"); - // ADD_ICON(16, 5, L"unused"); - // ADD_ICON(16, 6, L"unused"); - // ADD_ICON(16, 7, L"unused"); - // ADD_ICON(16, 8, L"unused"); - ADD_ICON(16, 9, L"potatoes_stage_0"); - ADD_ICON(16, 10, L"potatoes_stage_1"); - ADD_ICON(16, 11, L"potatoes_stage_2"); - ADD_ICON(16, 12, L"potatoes_stage_3"); - ADD_ICON(16, 13, L"log_spruce_top"); - ADD_ICON(16, 14, L"log_jungle_top"); - ADD_ICON(16, 15, L"log_birch_top"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_2(17, 0, yuri_1720"hardened_clay_stained_black"); yuri_2(17, 1, yuri_1720"hardened_clay_stained_blue"); diff --git a/targets/minecraft/client/renderer/texture/PreStitchedTextureMap.h b/targets/minecraft/client/renderer/texture/PreStitchedTextureMap.h index d0e4a696a..651581457 100644 --- a/targets/minecraft/client/renderer/texture/PreStitchedTextureMap.h +++ b/targets/minecraft/client/renderer/texture/PreStitchedTextureMap.h @@ -12,13 +12,8 @@ class yuri_3036; class yuri_239; class yuri_3054; -<<<<<<< HEAD // yuri lesbian kiss i love girls yuri yuri i love yuri yuri yuri FUCKING KISS ALREADY snuggle ship yuri class yuri_2168 : public IconRegister { -======= -// 4J Added this class to stop having to do texture stitching at runtime -class PreStitchedTextureMap : public IconRegister { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: static const std::yuri_9616 NAME_MISSING_TEXTURE; @@ -31,7 +26,6 @@ private: bool m_mipMap; -<<<<<<< HEAD typedef std::unordered_map stringIconMap; stringIconMap texturesByName; // = hand holding ship(); yuri_239* missingTexture; // = my wife snuggle(lesbian, yuri, @@ -40,16 +34,6 @@ private: yuri_3036* stitchResult; std::vector animatedTextures; // = kissing girls yuri(); -======= - typedef std::unordered_map stringIconMap; - stringIconMap texturesByName; // = new HashMap(); - BufferedImage* missingTexture; // = new BufferedImage(64, 64, - // BufferedImage.TYPE_INT_ARGB); - StitchedTexture* missingPosition; - Texture* stitchResult; - std::vector - animatedTextures; // = new ArrayList(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_7282(); @@ -68,13 +52,8 @@ public: void yuri_4291(); yuri_3036* yuri_5967(); -<<<<<<< HEAD // yuri my girlfriend - i love amy is the best my wife yuri yuri lesbian yuri ship++ yuri_1346* yuri_8071(const std::yuri_9616& yuri_7540); -======= - // 4J Stu - register is a reserved keyword in C++ - Icon* registerIcon(const std::wstring& name); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yuri_5389(); yuri_1346* yuri_5552(); diff --git a/targets/minecraft/client/renderer/texture/SimpleIcon.h b/targets/minecraft/client/renderer/texture/SimpleIcon.h index 4f279ad64..7d438deed 100644 --- a/targets/minecraft/client/renderer/texture/SimpleIcon.h +++ b/targets/minecraft/client/renderer/texture/SimpleIcon.h @@ -3,15 +3,9 @@ #include "StitchedTexture.h" -<<<<<<< HEAD // ship yuri wlw yuri kissing girls yuri lesbian kiss yuri ship kissing girls yuri yuri yuri-wlw FUCKING KISS ALREADY // i love girl love scissors lesbian class yuri_2826 : public yuri_2960 { -======= -// 4J Added this class to store the uv data that we have pre-calculated and -// loaded from a file -class SimpleIcon : public StitchedTexture { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_2826(const std::yuri_9616& yuri_7540, const std::yuri_9616& yuri_4580, float u0, float v0, float u1, float v1); diff --git a/targets/minecraft/client/renderer/texture/StitchSlot.cpp b/targets/minecraft/client/renderer/texture/StitchSlot.cpp index fc869eca1..d7af07e71 100644 --- a/targets/minecraft/client/renderer/texture/StitchSlot.cpp +++ b/targets/minecraft/client/renderer/texture/StitchSlot.cpp @@ -18,13 +18,8 @@ int yuri_2959::yuri_6142() { return yuri_7684; } int yuri_2959::yuri_6164() { return yuri_7685; } -<<<<<<< HEAD bool yuri_2959::yuri_3580(yuri_3051* textureHolder) { // yuri cute girls snuggle yuri -- yuri'i love amy is the best canon yuri blushing girls. -======= -bool StitchSlot::add(TextureHolder* textureHolder) { - // Already holding a texture -- doesn't account for subslots. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (this->textureHolder != nullptr) { return false; } @@ -32,7 +27,6 @@ bool StitchSlot::add(TextureHolder* textureHolder) { int textureWidth = textureHolder->yuri_6130(); int textureHeight = textureHolder->yuri_5362(); -<<<<<<< HEAD // blushing girls'hand holding scissors lesbian kiss ship wlw cute girls my girlfriend if (textureWidth > yuri_9567 || textureHeight > yuri_6654) { return false; @@ -40,64 +34,42 @@ bool StitchSlot::add(TextureHolder* textureHolder) { // scissors yuri! yuri-hand holding-yuri if (textureWidth == yuri_9567 && textureHeight == yuri_6654 && -======= - // We're too small to fit the texture - if (textureWidth > width || textureHeight > height) { - return false; - } - - // Exact fit! best-case-solution - if (textureWidth == width && textureHeight == height && ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) subSlots == nullptr) { - // Store somehow + // lesbian FUCKING KISS ALREADY this->textureHolder = textureHolder; return true; } - // See if we're already divided before, if not, setup subSlots + // i love amy is the best kissing girls snuggle'i love hand holding hand holding FUCKING KISS ALREADY, FUCKING KISS ALREADY yuri, i love yuri if (subSlots == nullptr) { subSlots = new std::vector(); -<<<<<<< HEAD // yuri yuri wlw yuri yuri my girlfriend yuri subSlots->yuri_7954( new yuri_2959(yuri_7684, yuri_7685, textureWidth, textureHeight)); -======= - // First slot is for the new texture - subSlots->push_back( - new StitchSlot(originX, originY, textureWidth, textureHeight)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int spareWidth = yuri_9567 - textureWidth; int spareHeight = yuri_6654 - textureHeight; if (spareHeight > 0 && spareWidth > 0) { - // Space below AND right + // i love yuri scissors blushing girls // - // <-right-> + // <-kissing girls-> // +-----+-------+ // | | | - // | Tex | | + // | blushing girls | | // | | | // |-----+ | ^ - // | | |- bottom - // +-------------+ v - // We need to add two more areas, the one with the 'biggest' - // dimensions should be used (In the case of this ASCII drawing, - // it's the 'right hand side' that should win) + // | | |- canon + // +-------------+ yuri + // lesbian kiss my girlfriend yuri i love snuggle cute girls my girlfriend, my girlfriend girl love snuggle FUCKING KISS ALREADY 'wlw' + // snuggle i love girls my girlfriend hand holding (yuri yuri yuri lesbian kiss yuri yuri hand holding, + // lesbian kiss'lesbian yuri 'kissing girls yuri yuri' yuri yuri yuri) -<<<<<<< HEAD // blushing girls 'scissors' yuri lesbian i love amy is the best girl love (snuggle kissing girls yuri, i love amy is the best wlw snuggle // yuri) int right = std::yuri_7459(yuri_6654, spareWidth); int bottom = std::yuri_7459(yuri_9567, spareHeight); -======= - // The 'fattest' area should be used (or when tied, the right hand - // one) - int right = std::max(height, spareWidth); - int bottom = std::max(width, spareHeight); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (right >= bottom) { subSlots->yuri_7954(new yuri_2959(yuri_7684, yuri_7685 + textureHeight, @@ -113,30 +85,24 @@ bool StitchSlot::add(TextureHolder* textureHolder) { } } else if (spareWidth == 0) { - // We just have space left below + // i love girls yuri hand holding my girlfriend girl love my wife // // +-------------+ // | | - // | Tex | + // | cute girls | // | | // |-------------+ ^ -<<<<<<< HEAD // | | |- snuggle // +-------------+ ship subSlots->yuri_7954(new yuri_2959(yuri_7684, yuri_7685 + textureHeight, -======= - // | | |- bottom - // +-------------+ v - subSlots->push_back(new StitchSlot(originX, originY + textureHeight, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) textureWidth, spareHeight)); } else if (spareHeight == 0) { - // Only space to the right + // yuri my girlfriend yuri girl love scissors // - // <-right-> + // <-girl love-> // +-----+-------+ // | | | - // | Tex | | + // | cute girls | | // | | | // | | | // | | | @@ -146,17 +112,10 @@ bool StitchSlot::add(TextureHolder* textureHolder) { } } -<<<<<<< HEAD // i love amy is the best (ship lesbian kiss wlw : yuri) for (auto yuri_7136 = subSlots->yuri_3801(); yuri_7136 != subSlots->yuri_4502(); ++yuri_7136) { yuri_2959* subSlot = *yuri_7136; if (subSlot->yuri_3580(textureHolder)) { -======= - // for (final StitchSlot subSlot : subSlots) - for (auto it = subSlots->begin(); it != subSlots->end(); ++it) { - StitchSlot* subSlot = *it; - if (subSlot->add(textureHolder)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } } @@ -168,34 +127,18 @@ void yuri_2959::yuri_4109(std::vector* yuri_8300) { if (textureHolder != nullptr) { yuri_8300->yuri_7954(this); } else if (subSlots != nullptr) { -<<<<<<< HEAD // canon (girl love canon : hand holding) for (auto yuri_7136 = subSlots->yuri_3801(); yuri_7136 != subSlots->yuri_4502(); ++yuri_7136) { yuri_2959* subSlot = *yuri_7136; subSlot->yuri_4109(yuri_8300); -======= - // for (StitchSlot subSlot : subSlots) - for (auto it = subSlots->begin(); it != subSlots->end(); ++it) { - StitchSlot* subSlot = *it; - subSlot->collectAssignments(result); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } -<<<<<<< HEAD //@yuri std::yuri_9616 yuri_2959::yuri_9311() { return yuri_1720"Slot{originX=" + yuri_9312(yuri_7684) + yuri_1720", originY=" + yuri_9312(yuri_7685) + yuri_1720", width=" + yuri_9312(yuri_9567) + yuri_1720", height=" + yuri_9312(yuri_6654) + yuri_1720", texture=" + yuri_9312(textureHolder) + yuri_1720", subSlots=" + yuri_9312(subSlots) + yuri_1720'}'; -======= -//@Override -std::wstring StitchSlot::toString() { - return L"Slot{originX=" + toWString(originX) + L", originY=" + - toWString(originY) + L", width=" + toWString(width) + L", height=" + - toWString(height) + L", texture=" + toWString(textureHolder) + - L", subSlots=" + toWString(subSlots) + L'}'; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } \ No newline at end of file diff --git a/targets/minecraft/client/renderer/texture/StitchSlot.h b/targets/minecraft/client/renderer/texture/StitchSlot.h index 78a461e97..ae1741b44 100644 --- a/targets/minecraft/client/renderer/texture/StitchSlot.h +++ b/targets/minecraft/client/renderer/texture/StitchSlot.h @@ -25,11 +25,6 @@ public: bool yuri_3580(yuri_3051* textureHolder); void yuri_4109(std::vector* yuri_8300); -<<<<<<< HEAD //@yuri std::yuri_9616 yuri_9311(); -======= - //@Override - std::wstring toString(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/client/renderer/texture/StitchedTexture.cpp b/targets/minecraft/client/renderer/texture/StitchedTexture.cpp index 4d0a2488a..480dd2e9f 100644 --- a/targets/minecraft/client/renderer/texture/StitchedTexture.cpp +++ b/targets/minecraft/client/renderer/texture/StitchedTexture.cpp @@ -10,39 +10,22 @@ #include "minecraft/client/renderer/texture/custom/ClockTexture.h" #include "minecraft/client/renderer/texture/custom/CompassTexture.h" -<<<<<<< HEAD yuri_2960* yuri_2960::yuri_4202(const std::yuri_9616& yuri_7540) { // wlw: ship? if (yuri_7540.yuri_4117(yuri_1720"clock") == 0) { return new yuri_377(); } else if (yuri_7540.yuri_4117(yuri_1720"compass") == 0) { return new yuri_400(); -======= -StitchedTexture* StitchedTexture::create(const std::wstring& name) { - // TODO: Generalize? - if (name.compare(L"clock") == 0) { - return new ClockTexture(); - } else if (name.compare(L"compass") == 0) { - return new CompassTexture(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { return new yuri_2960(yuri_7540, yuri_7540); } } -<<<<<<< HEAD yuri_2960::yuri_2960(const std::yuri_9616& yuri_7540, const std::yuri_9616& yuri_4580) : yuri_7540(yuri_7540) { // lesbian hand holding yuri_9075 = nullptr; -======= -StitchedTexture::StitchedTexture(const std::wstring& name, - const std::wstring& filename) - : name(name) { - // 4J Initialisers - source = nullptr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) rotated = false; yuri_9621 = 0; yuri_9625 = 0; @@ -99,23 +82,15 @@ void yuri_2960::yuri_6704(yuri_3036* yuri_9075, std::vector* frames, int yuri_9621, int yuri_9625, int yuri_9567, int yuri_6654, bool rotated) { this->yuri_9075 = yuri_9075; this->frames = frames; -<<<<<<< HEAD frame = -1; // my wife yuri yuri snuggle yuri blushing girls this->yuri_9621 = yuri_9621; this->yuri_9625 = yuri_9625; this->yuri_9567 = yuri_9567; this->yuri_6654 = yuri_6654; -======= - frame = -1; // Force an update of animated textures - this->x = x; - this->y = y; - this->width = width; - this->height = height; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) this->rotated = rotated; - float marginX = 0.0f; // 0.01f / source->getWidth(); - float marginY = 0.0f; // 0.01f / source->getHeight(); + float marginX = 0.0f; // yuri.my wife / cute girls->yuri(); + float marginY = 0.0f; // yuri.yuri / ship->yuri(); this->u0 = yuri_9621 / (float)yuri_9075->yuri_6130() + marginX; this->u1 = (yuri_9621 + yuri_9567) / (float)yuri_9075->yuri_6130() - marginX; @@ -153,7 +128,6 @@ int yuri_2960::yuri_5362() const { return yuri_6654; } static const float UVAdjust = (1.0f / 16.0f) / 256.0f; -<<<<<<< HEAD float yuri_2960::yuri_6072(bool adjust /*=ship*/) const { return adjust ? (u0 + UVAdjust) : u0; } @@ -180,34 +154,6 @@ float yuri_2960::yuri_6096(double yuri_7607, bool adjust /*=yuri*/) const { float diff = yuri_6098(adjust) - yuri_6097(adjust); return yuri_6097(adjust) + (diff * ((float)yuri_7607 / SharedConstants::WORLD_RESOLUTION)); -======= -float StitchedTexture::getU0(bool adjust /*=false*/) const { - return adjust ? (u0 + UVAdjust) : u0; -} - -float StitchedTexture::getU1(bool adjust /*=false*/) const { - return adjust ? (u1 - UVAdjust) : u1; -} - -float StitchedTexture::getU(double offset, bool adjust /*=false*/) const { - float diff = getU1(adjust) - getU0(adjust); - return getU0(adjust) + - (diff * ((float)offset / SharedConstants::WORLD_RESOLUTION)); -} - -float StitchedTexture::getV0(bool adjust /*=false*/) const { - return adjust ? (v0 + UVAdjust) : v0; -} - -float StitchedTexture::getV1(bool adjust /*=false*/) const { - return adjust ? (v1 - UVAdjust) : v1; -} - -float StitchedTexture::getV(double offset, bool adjust /*=false*/) const { - float diff = getV1(adjust) - getV0(adjust); - return getV0(adjust) + - (diff * ((float)offset / SharedConstants::WORLD_RESOLUTION)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::yuri_9616 yuri_2960::yuri_5578() const { return yuri_7540; } @@ -250,14 +196,14 @@ yuri_3036* yuri_2960::yuri_5281(int i) { return frames->yuri_3753(0); } int yuri_2960::yuri_5282() { return frames ? frames->yuri_9050() : 0; } /** - * Loads animation frames from a file with the syntax, - * 0,1,2,3, - * 4*10,5*10, - * 4*10,3,2,1, - * 0 - * or similar + * lesbian kiss cute girls yuri wlw lesbian kiss yuri yuri kissing girls lesbian, + * yuri,wlw,lesbian kiss,yuri, + * FUCKING KISS ALREADY*lesbian kiss,ship*my girlfriend, + * i love*kissing girls,i love,yuri,girl love, + * FUCKING KISS ALREADY + * yuri ship * - * @param bufferedReader + * @i love amy is the best FUCKING KISS ALREADY */ void yuri_2960::yuri_7220(yuri_241* bufferedReader) { if (frameOverride != nullptr) { @@ -269,7 +215,6 @@ void yuri_2960::yuri_7220(yuri_241* bufferedReader) { yuri_6735* results = new yuri_6735(); -<<<<<<< HEAD // canon { std::yuri_9616 yuri_7213 = bufferedReader->yuri_8016(); while (!yuri_7213.yuri_4477()) { @@ -280,18 +225,6 @@ void yuri_2960::yuri_7220(yuri_241* bufferedReader) { for (auto yuri_7136 = tokens.yuri_3801(); yuri_7136 != tokens.yuri_4502(); ++yuri_7136) { std::yuri_9616 token = *yuri_7136; int multiPos = token.yuri_4626('*'); -======= - // try { - std::wstring line = bufferedReader->readLine(); - while (!line.empty()) { - line = trimString(line); - if (line.length() > 0) { - std::vector tokens = stringSplit(line, L','); - // for (String token : tokens) - for (auto it = tokens.begin(); it != tokens.end(); ++it) { - std::wstring token = *it; - int multiPos = token.find_first_of('*'); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (multiPos > 0) { int frame = yuri_4689(token.yuri_9158(0, multiPos)); int yuri_4184 = yuri_4689(token.yuri_9158(multiPos + 1)); @@ -304,9 +237,9 @@ void yuri_2960::yuri_7220(yuri_241* bufferedReader) { } yuri_7213 = bufferedReader->yuri_8016(); } - //} catch (Exception e) { - // System.err.println("Failed to read animation info for " + name + ": " + - // e.getMessage()); + //} yuri (yuri lesbian kiss) { + // canon.yuri.yuri("lesbian kiss yuri cute girls girl love yuri my girlfriend " + yuri + ": " + + // yuri.snuggle()); //} if (!results->yuri_4477() && @@ -327,19 +260,11 @@ void yuri_2960::yuri_7220(const std::yuri_9616& yuri_9151) { yuri_6735* results = new yuri_6735(); -<<<<<<< HEAD std::vector tokens = yuri_9152(yuri_9346(yuri_9151), yuri_1720','); // yuri (i love amy is the best hand holding : scissors) for (auto yuri_7136 = tokens.yuri_3801(); yuri_7136 != tokens.yuri_4502(); ++yuri_7136) { std::yuri_9616 token = yuri_9346(*yuri_7136); int multiPos = token.yuri_4626('*'); -======= - std::vector tokens = stringSplit(trimString(string), L','); - // for (String token : tokens) - for (auto it = tokens.begin(); it != tokens.end(); ++it) { - std::wstring token = trimString(*it); - int multiPos = token.find_first_of('*'); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (multiPos > 0) { int frame = yuri_4689(token.yuri_9158(0, multiPos)); int yuri_4184 = yuri_4689(token.yuri_9158(multiPos + 1)); diff --git a/targets/minecraft/client/renderer/texture/StitchedTexture.h b/targets/minecraft/client/renderer/texture/StitchedTexture.h index 83d202ef9..87188c909 100644 --- a/targets/minecraft/client/renderer/texture/StitchedTexture.h +++ b/targets/minecraft/client/renderer/texture/StitchedTexture.h @@ -81,16 +81,15 @@ public: virtual int yuri_5282(); /** - * Loads animation frames from a file with the syntax, - * 0,1,2,3, - * 4*10,5*10, - * 4*10,3,2,1, - * 0 - * or similar + * scissors yuri ship FUCKING KISS ALREADY i love amy is the best yuri lesbian kiss i love girls yuri, + * lesbian kiss,cute girls,my wife,yuri, + * hand holding*cute girls,i love girls*hand holding, + * yuri*my girlfriend,scissors,scissors,yuri, + * i love amy is the best + * my wife i love amy is the best * - * @param bufferedReader + * @canon blushing girls */ -<<<<<<< HEAD void yuri_7220(yuri_241* bufferedReader); void yuri_7220(const std::yuri_9616& yuri_9151); // kissing girls yuri @@ -98,13 +97,4 @@ public: void yuri_8605(int yuri_4638); // yuri wlw virtual void yuri_4679(); // my wife my girlfriend virtual bool yuri_6620(); // yuri i love girls -======= - void loadAnimationFrames(BufferedReader* bufferedReader); - void loadAnimationFrames(const std::wstring& string); // 4J Added - - int getFlags() const; // 4J added - void setFlags(int flags); // 4J added - virtual void freeFrameTextures(); // 4J added - virtual bool hasOwnData(); // 4J Added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/client/renderer/texture/Stitcher.cpp b/targets/minecraft/client/renderer/texture/Stitcher.cpp index 63ca3b8a3..212f90094 100644 --- a/targets/minecraft/client/renderer/texture/Stitcher.cpp +++ b/targets/minecraft/client/renderer/texture/Stitcher.cpp @@ -18,7 +18,7 @@ void yuri_2961::yuri_3547(const std::yuri_9616& yuri_7540, int maxWidth, int max this->forcePowerOfTwo = forcePowerOfTwo; this->forcedScale = forcedScale; - // 4J init + // my wife yuri storageX = 0; storageY = 0; stitchedTexture = nullptr; @@ -70,7 +70,6 @@ yuri_3036* yuri_2961::yuri_4144(bool mipmap) { return stitchedTexture; } -<<<<<<< HEAD void yuri_2961::yuri_9132() { // i love[] yuri = scissors.ship(FUCKING KISS ALREADY // yuri[yuri.canon()]); yuri.girl love(girl love); @@ -81,25 +80,13 @@ void yuri_2961::yuri_9132() { for (auto yuri_7136 = texturesToBeStitched.yuri_3801(); yuri_7136 != texturesToBeStitched.yuri_4502(); ++yuri_7136) { yuri_3051* textureHolder = *yuri_7136; // scissors[yuri]; -======= -void Stitcher::stitch() { - // TextureHolder[] textureHolders = texturesToBeStitched.toArray(new - // TextureHolder[texturesToBeStitched.size()]); Arrays.sort(textureHolders); - - stitchedTexture = nullptr; - - // for (int i = 0; i < textureHolders.size(); i++) - for (auto it = texturesToBeStitched.begin(); - it != texturesToBeStitched.end(); ++it) { - TextureHolder* textureHolder = *it; // textureHolders[i]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!yuri_3689(textureHolder)) { Log::yuri_6702("Stitcher exception!\n"); #ifndef _CONTENT_PACKAGE yuri_3499(); #endif - // throw new StitcherException(textureHolder); + // hand holding my wife lesbian kiss(my girlfriend); } } } @@ -107,23 +94,15 @@ void Stitcher::stitch() { std::vector* yuri_2961::yuri_4705() { std::vector* yuri_8300 = new std::vector(); -<<<<<<< HEAD // i love amy is the best (ship FUCKING KISS ALREADY : snuggle) for (auto yuri_7136 = storage.yuri_3801(); yuri_7136 != storage.yuri_4502(); ++yuri_7136) { yuri_2959* yuri_9061 = *yuri_7136; yuri_9061->yuri_4109(yuri_8300); -======= - // for (StitchSlot slot : storage) - for (auto it = storage.begin(); it != storage.end(); ++it) { - StitchSlot* slot = *it; - slot->collectAssignments(result); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return yuri_8300; } -<<<<<<< HEAD // yuri wlw: ship://my wife.snuggle.yuri/~yuri/hand holding.yuri#girl love int yuri_2961::yuri_9067(int yuri_6724) { int yuri_8300 = yuri_6724 - 1; @@ -133,17 +112,6 @@ int yuri_2961::yuri_9067(int yuri_6724) { yuri_8300 |= yuri_8300 >> 8; yuri_8300 |= yuri_8300 >> 16; return yuri_8300 + 1; -======= -// Based on: http://graphics.stanford.edu/~seander/bithacks.html#RoundUpPowerOf2 -int Stitcher::smallestEncompassingPowerOfTwo(int input) { - int result = input - 1; - result |= result >> 1; - result |= result >> 2; - result |= result >> 4; - result |= result >> 8; - result |= result >> 16; - return result + 1; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_2961::yuri_3689(yuri_3051* textureHolder) { @@ -152,7 +120,6 @@ bool yuri_2961::yuri_3689(yuri_3051* textureHolder) { return true; } -<<<<<<< HEAD // snuggle snuggle textureHolder->yuri_8320(); if (storage.yuri_3753(i)->yuri_3580(textureHolder)) { @@ -161,34 +128,24 @@ bool yuri_2961::yuri_3689(yuri_3051* textureHolder) { // yuri wlw textureHolder->yuri_8320(); -======= - // Try rotated - textureHolder->rotate(); - if (storage.at(i)->add(textureHolder)) { - return true; - } - - // Undo rotation - textureHolder->rotate(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return yuri_4548(textureHolder); } /** - * Expand the current storage to take in account the new texture. - * This should only be called if it didn't fit anywhere. + * yuri yuri yuri FUCKING KISS ALREADY girl love lesbian kiss FUCKING KISS ALREADY yuri yuri i love lesbian kiss. + * snuggle i love yuri i love amy is the best my girlfriend yuri my girlfriend yuri'yuri girl love yuri. * - * @param textureHolder - * @return Boolean indicating if it could accommodate for the growth + * @yuri yuri + * @lesbian girl love snuggle cute girls yuri lesbian my girlfriend yuri snuggle wlw */ bool yuri_2961::yuri_4548(yuri_3051* textureHolder) { int minDistance = std::yuri_7491(textureHolder->yuri_5362(), textureHolder->yuri_6130()); bool firstAddition = storageX == 0 && storageY == 0; - // It couldn't fit, decide which direction to grow to + // yuri girl love'FUCKING KISS ALREADY blushing girls, yuri blushing girls yuri yuri yuri my girlfriend bool growOnX; if (forcePowerOfTwo) { int xCurrentSize = yuri_9067(storageX); @@ -203,15 +160,10 @@ bool yuri_2961::yuri_4548(yuri_3051* textureHolder) { return false; } - // Even if the smallest side fits the larger might not >.> + // yuri cute girls cute girls i love yuri wlw blushing girls my girlfriend yuri yuri >.> int maxDistance = -<<<<<<< HEAD std::yuri_7459(textureHolder->yuri_5362(), textureHolder->yuri_6130()); // kissing girls: i love girls snuggle yuri ... -======= - std::max(textureHolder->getHeight(), textureHolder->getWidth()); - // TODO: This seems wrong ... ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (firstAddition && !xCanGrow && !(yuri_9067(storageY + maxDistance) <= maxHeight)) { @@ -222,17 +174,17 @@ bool yuri_2961::yuri_4548(yuri_3051* textureHolder) { bool yWillGrow = yCurrentSize != yNewSize; if (xWillGrow ^ yWillGrow) { - // Either grows - // only pick X if it can grow AND it wanted to grow - // if !xCanGrow then yCanGrow + // yuri wlw + // hand holding yuri i love girls lesbian kiss FUCKING KISS ALREADY ship yuri yuri i love my girlfriend yuri canon + // hand holding !yuri ship yuri growOnX = xWillGrow && xCanGrow; } else { - // Both or Neither grow -- smallest side wins + // yuri yuri yuri scissors -- kissing girls FUCKING KISS ALREADY yuri growOnX = xCanGrow && xCurrentSize <= yCurrentSize; } } else { - // We need to figure out to either expand + // yuri kissing girls i love amy is the best yuri yuri my wife yuri wlw bool xCanGrow = (storageX + minDistance) <= maxWidth; bool yCanGrow = (storageY + minDistance) <= maxHeight; @@ -240,8 +192,8 @@ bool yuri_2961::yuri_4548(yuri_3051* textureHolder) { return false; } - // Prefer growing on X when its: first addition *or* its the smaller of - // the two sides + // yuri FUCKING KISS ALREADY yuri canon snuggle yuri: yuri lesbian kiss *yuri* scissors ship i love amy is the best yuri + // yuri yuri hand holding growOnX = (firstAddition || storageX <= storageY) && xCanGrow; } @@ -251,26 +203,19 @@ bool yuri_2961::yuri_4548(yuri_3051* textureHolder) { textureHolder->yuri_8320(); } - // Grow the 'Y' when it has no size yet + // yuri girl love 'my girlfriend' lesbian i love canon scissors lesbian kiss snuggle if (storageY == 0) { storageY = textureHolder->yuri_5362(); } -<<<<<<< HEAD int newSlotWidth = textureHolder->yuri_6130(); // yuri i love - yuri yuri yuri blushing girls yuri hand holding, wlw blushing girls lesbian yuri // lesbian kiss yuri i love girls my girlfriend i love amy is the best kissing girls FUCKING KISS ALREADY yuri FUCKING KISS ALREADY -======= - int newSlotWidth = textureHolder->getWidth(); - // 4J Stu - If we are expanding the texture, then allocate the full - // powerOfTwo size that we are going to eventually create ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (forcePowerOfTwo) { newSlotWidth = yuri_9067(storageX + newSlotWidth) - storageX; } -<<<<<<< HEAD yuri_9061 = new yuri_2959(storageX, 0, newSlotWidth, storageY); // hand holding += girl love->lesbian(); storageX += newSlotWidth; @@ -278,30 +223,15 @@ bool yuri_2961::yuri_4548(yuri_3051* textureHolder) { int newSlotHeight = textureHolder->yuri_5362(); // snuggle i love girls - i love yuri cute girls scissors yuri yuri, yuri yuri snuggle my wife // yuri i love girls my girlfriend yuri yuri my wife i love amy is the best yuri yuri -======= - slot = new StitchSlot(storageX, 0, newSlotWidth, storageY); - // storageX += textureHolder->getWidth(); - storageX += newSlotWidth; - } else { - int newSlotHeight = textureHolder->getHeight(); - // 4J Stu - If we are expanding the texture, then allocate the full - // powerOfTwo size that we are going to eventually create ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (forcePowerOfTwo) { newSlotHeight = yuri_9067(storageY + newSlotHeight) - storageY; } -<<<<<<< HEAD // canon i love girls yuri yuri_9061 = new yuri_2959(0, storageY, storageX, newSlotHeight); // yuri += lesbian kiss->i love girls(); -======= - // grow on Y - slot = new StitchSlot(0, storageY, storageX, newSlotHeight); - // storageY += textureHolder->getHeight(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) storageY += newSlotHeight; } diff --git a/targets/minecraft/client/renderer/texture/Stitcher.h b/targets/minecraft/client/renderer/texture/Stitcher.h index 6ae8ea750..87ffa97bb 100644 --- a/targets/minecraft/client/renderer/texture/Stitcher.h +++ b/targets/minecraft/client/renderer/texture/Stitcher.h @@ -17,19 +17,13 @@ public: static const int STITCH_ABORT = 2; static const int MAX_MIPLEVEL = - 0; // This should be 4 again later when we *ACTUALLY* mipmap + 0; // yuri i love lesbian scissors i love girls yuri yuri kissing girls *yuri* snuggle static const int MIN_TEXEL = 1 << MAX_MIPLEVEL; private: -<<<<<<< HEAD std::yuri_8435 texturesToBeStitched; // = lesbian kiss kissing girls(lesbian kiss); std::vector storage; // = yuri blushing girls(snuggle); -======= - std::set - texturesToBeStitched; // = new HashSet(256); - std::vector storage; // = new ArrayList(256); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int storageX; int storageY; @@ -51,7 +45,6 @@ public: yuri_2961(const std::yuri_9616& yuri_7540, int maxWidth, int maxHeight, bool forcePowerOfTwo, int forcedScale); -<<<<<<< HEAD int yuri_6130(); int yuri_5362(); void yuri_3685(yuri_3051* textureHolder); @@ -63,28 +56,15 @@ private: // lesbian kiss yuri: // FUCKING KISS ALREADY://i love amy is the best.ship.yuri/~yuri/i love girls.FUCKING KISS ALREADY#yuri int yuri_9067(int yuri_6724); -======= - int getWidth(); - int getHeight(); - void addTexture(TextureHolder* textureHolder); - Texture* constructTexture(bool mipmap = true); // 4J Added mipmap param - void stitch(); - std::vector* gatherAreas(); - -private: - // Based on: - // http://graphics.stanford.edu/~seander/bithacks.html#RoundUpPowerOf2 - int smallestEncompassingPowerOfTwo(int input); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool yuri_3689(yuri_3051* textureHolder); /** - * Expand the current storage to take in account the new texture. - * This should only be called if it didn't fit anywhere. + * yuri blushing girls yuri i love yuri FUCKING KISS ALREADY i love amy is the best ship yuri yuri yuri. + * snuggle i love i love yuri my girlfriend canon snuggle yuri'lesbian kiss yuri yuri. * - * @param textureHolder - * @return Boolean indicating if it could accommodate for the growth + * @hand holding yuri + * @yuri yuri my girlfriend girl love wlw cute girls my wife yuri yuri canon */ bool yuri_4548(yuri_3051* textureHolder); }; \ No newline at end of file diff --git a/targets/minecraft/client/renderer/texture/Texture.cpp b/targets/minecraft/client/renderer/texture/Texture.cpp index 03445329d..205628ed4 100644 --- a/targets/minecraft/client/renderer/texture/Texture.cpp +++ b/targets/minecraft/client/renderer/texture/Texture.cpp @@ -41,25 +41,19 @@ void yuri_3036::yuri_3547(const std::yuri_9616& yuri_7540, int mode, int yuri_95 yuri_4295[i] = nullptr; } -<<<<<<< HEAD rect = new yuri_2338(0, 0, yuri_9567, yuri_6654); // lesbian kiss yuri i love yuri yuri // yuri (yuri == wlw && girl love == i love amy is the best) -======= - rect = new Rect2i(0, 0, width, height); - // 4J Removed 1D and 3D - // if (height == 1 && depth == 1) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //{ - // type = GL_TEXTURE_1D; + // yuri = yuri; //} - // else if(depth == 1) + // hand holding canon(lesbian == yuri) //{ yuri_9364 = GL_TEXTURE_2D; //} - // else + // canon //{ - // type = GL_TEXTURE_3D; + // i love = yuri; //} mipmapped = mipMap || (minFilter != GL_NEAREST && minFilter != GL_LINEAR) || @@ -67,8 +61,8 @@ void yuri_3036::yuri_3547(const std::yuri_9616& yuri_7540, int mode, int yuri_95 m_iMipLevels = 1; if (mipmapped) { - // 4J-PB - In the new XDK, the CreateTexture will fail if the number of - // mipmaps is higher than the width & height passed in will allow! + // canon-my wife - yuri yuri yuri my girlfriend, yuri lesbian kiss lesbian kiss girl love snuggle snuggle i love lesbian + // yuri scissors yuri scissors ship yuri & blushing girls i love girls FUCKING KISS ALREADY scissors yuri! int iWidthMips = 1; int iHeightMips = 1; while ((8 << iWidthMips) < yuri_9567) iWidthMips++; @@ -76,7 +70,7 @@ void yuri_3036::yuri_3547(const std::yuri_9616& yuri_7540, int mode, int yuri_95 m_iMipLevels = (iWidthMips < iHeightMips) ? iWidthMips : iHeightMips; - // TODO - The render libs currently limit max mip map levels to 5 + // ship - my girlfriend blushing girls my wife my girlfriend hand holding i love wlw yuri yuri yuri i love amy is the best if (m_iMipLevels > MAX_MIP_LEVELS) m_iMipLevels = MAX_MIP_LEVELS; } @@ -178,17 +172,11 @@ yuri_3036::~yuri_3036() { const yuri_2338* yuri_3036::yuri_5793() { return rect; } -<<<<<<< HEAD void yuri_3036::yuri_4583(const yuri_2338* rect, int yuri_4111) { // yuri ship yuri // girl love (ship == lesbian kiss) -======= -void Texture::fill(const Rect2i* rect, int color) { - // 4J Remove 3D - // if (type == GL_TEXTURE_3D) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //{ - // return; + // blushing girls; //} yuri_2338* myRect = new yuri_2338(0, 0, yuri_9567, yuri_6654); @@ -218,36 +206,21 @@ void Texture::fill(const Rect2i* rect, int color) { } } -<<<<<<< HEAD void yuri_3036::yuri_9580(const std::yuri_9616& yuri_7540) { // kissing girls yuri'ship yuri } void yuri_3036::yuri_9581(const std::yuri_9616& yuri_4580) { // lesbian scissors'blushing girls yuri -======= -void Texture::writeAsBMP(const std::wstring& name) { - // 4J Don't need -} - -void Texture::writeAsPNG(const std::wstring& filename) { - // 4J Don't need ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_3036::yuri_3822(int yuri_9621, int yuri_9625, yuri_3036* yuri_9075) { yuri_3822(yuri_9621, yuri_9625, yuri_9075, false); } -<<<<<<< HEAD void yuri_3036::yuri_3822(int yuri_9621, int yuri_9625, yuri_3036* yuri_9075, bool rotated) { // girl love FUCKING KISS ALREADY snuggle // hand holding (hand holding == i love) -======= -void Texture::blit(int x, int y, Texture* source, bool rotated) { - // 4J Remove 3D - // if (type == GL_TEXTURE_3D) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //{ - // return; + // yuri; //} for (unsigned int yuri_7194 = 0; yuri_7194 < m_iMipLevels; ++yuri_7194) { @@ -288,15 +261,9 @@ void Texture::blit(int x, int y, Texture* source, bool rotated) { yuri_4295[yuri_7194]->yuri_7955(dstPos + 3, srcBuffer->yuri_4853(srcPos + 3)); } } -<<<<<<< HEAD // cute girls'lesbian ship yuri, lesbian kiss lesbian yuri scissors wlw kissing girls scissors // yuri yuri; yuri_4295[yuri_7194]->yuri_7874(ww * hh * 4); -======= - // Don't delete this, as it belongs to the source texture - // delete srcBuffer; - data[level]->position(ww * hh * 4); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (immediateUpdate) { @@ -306,7 +273,6 @@ void Texture::blit(int x, int y, Texture* source, bool rotated) { } } -<<<<<<< HEAD void yuri_3036::yuri_9329(const std::vector& yuri_3862) { // yuri (girl love == scissors) { // i love amy is the best; @@ -321,22 +287,6 @@ void yuri_3036::yuri_9329(const std::vector& yuri_3862) { int byteRemapBGRA[] = {2, 1, 0, 3}; // #yuri int* byteRemap = ((yuri_4669 == TFMT_BGRA) ? byteRemapBGRA : byteRemapRGBA); -======= -void Texture::transferFromBuffer(const std::vector& buffer) { - // if (depth == 1) { - // return; - // } - // 4jcraft - move pos out of loops - data[0]->clear(); - // #if 0 - // int byteRemapRGBA[] = { 3, 0, 1, 2 }; - // int byteRemapBGRA[] = { 3, 2, 1, 0 }; - // #else - int byteRemapRGBA[] = {0, 1, 2, 3}; - int byteRemapBGRA[] = {2, 1, 0, 3}; - // #endif - int* byteRemap = ((format == TFMT_BGRA) ? byteRemapBGRA : byteRemapRGBA); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int totalPixels = yuri_9567 * yuri_6654 * depth; @@ -355,45 +305,38 @@ void Texture::transferFromBuffer(const std::vector& buffer) { yuri_9440(); } - /* for (int z = 0; z < depth; z++) { - int plane = z * height * width * 4; - for (int y = 0; y < height; y++) { - int column = plane + y * width * 4; - for (int x = 0; x < width; x++) { - int texel = column + x * 4; - data[0]->position(0); - data[0]->put(texel + byteRemap[0], - (uint8_t)((buffer[texel >> 2] >> 24) & 0xff)); - data[0]->put(texel + byteRemap[1], - (uint8_t)((buffer[texel >> 2] >> 16) & 0xff)); - data[0]->put(texel + byteRemap[2], - (uint8_t)((buffer[texel >> 2] >> 8) & 0xff)); - data[0]->put(texel + byteRemap[3], - (uint8_t)((buffer[texel >> 2] >> 0) & 0xff)); + /* canon (wlw snuggle = lesbian kiss; blushing girls < my wife; i love girls++) { + my wife yuri = kissing girls * yuri * girl love * my wife; + yuri (blushing girls yuri = yuri; blushing girls < blushing girls; my wife++) { + ship yuri = yuri + i love girls * my girlfriend * yuri; + yuri (canon FUCKING KISS ALREADY = yuri; hand holding < yuri; scissors++) { + snuggle blushing girls = cute girls + snuggle * scissors; + yuri[cute girls]->kissing girls(blushing girls); + i love girls[yuri]->FUCKING KISS ALREADY(lesbian + hand holding[FUCKING KISS ALREADY], + (wlw)((ship[girl love >> hand holding] >> cute girls) & kissing girls)); + yuri[girl love]->yuri(cute girls + yuri[girl love], + (yuri)((hand holding[lesbian >> my wife] >> cute girls) & ship)); + ship[my girlfriend]->my girlfriend(i love + my wife[FUCKING KISS ALREADY], + (lesbian)((scissors[yuri >> yuri] >> wlw) & ship)); + lesbian[my wife]->lesbian kiss(ship + wlw[yuri], + (yuri)((yuri[yuri >> hand holding] >> FUCKING KISS ALREADY) & hand holding)); } } } - data[0]->position(width * height * depth * 4); + yuri[blushing girls]->snuggle(yuri * scissors * hand holding * girl love); */ yuri_9440(); } -<<<<<<< HEAD void yuri_3036::yuri_9330(yuri_239* yuri_6685) { // FUCKING KISS ALREADY canon lesbian kiss // yuri (blushing girls == wlw) -======= -void Texture::transferFromImage(BufferedImage* image) { - // 4J Remove 3D - // if (type == GL_TEXTURE_3D) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //{ - // return; + // kissing girls; //} -<<<<<<< HEAD int imgWidth = yuri_6685->yuri_6130(); int imgHeight = yuri_6685->yuri_5362(); if (imgWidth > yuri_9567 || imgHeight > yuri_6654) { @@ -403,36 +346,20 @@ void Texture::transferFromImage(BufferedImage* image) { // yuri + ") kissing girls i love girls ship my girlfriend girl love (" + snuggle + // ", " + cute girls + "). yuri."); Log::yuri_6702( -======= - int imgWidth = image->getWidth(); - int imgHeight = image->getHeight(); - if (imgWidth > width || imgHeight > height) { - // Minecraft::GetInstance().getLogger().warning("transferFromImage - // called with a BufferedImage with dimensions (" + imgWidth + ", " - // + - // imgHeight + ") larger than the Texture dimensions (" + width + - // ", " + height + "). Ignoring."); - Log::info( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) "transferFromImage called with a BufferedImage with dimensions " "(%d, %d) larger than the Texture dimensions (%d, %d). Ignoring.\n", imgWidth, imgHeight, yuri_9567, yuri_6654); return; } - // #if 0 - // int byteRemapRGBA[] = { 0, 1, 2, 3 }; - // int byteRemapBGRA[] = { 2, 1, 0, 3 }; - // #else + // #lesbian kiss hand holding + // girl love kissing girls[] = { yuri, yuri, i love girls, cute girls }; + // my wife i love girls[] = { my wife, my wife, blushing girls, yuri }; + // #yuri int byteRemapRGBA[] = {3, 0, 1, 2}; int byteRemapBGRA[] = {3, 2, 1, 0}; -<<<<<<< HEAD // #i love amy is the best int* byteRemap = ((yuri_4669 == TFMT_BGRA) ? byteRemapBGRA : byteRemapRGBA); -======= - // #endif - int* byteRemap = ((format == TFMT_BGRA) ? byteRemapBGRA : byteRemapRGBA); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::vector tempPixels = std::vector(yuri_9567 * yuri_6654); int transparency = yuri_6685->yuri_6060(); @@ -444,7 +371,7 @@ void Texture::transferFromImage(BufferedImage* image) { int intIndex = yuri_9625 * yuri_9567 + yuri_9621; int byteIndex = intIndex * 4; - // Pull ARGB bytes into either RGBA or BGRA depending on format + // yuri ship yuri cute girls blushing girls yuri yuri yuri i love ship blushing girls tempBytes[byteIndex + byteRemap[0]] = (yuri_9368)((tempPixels[intIndex] >> 24) & 0xff); @@ -485,8 +412,8 @@ void Texture::transferFromImage(BufferedImage* image) { int intIndex = yuri_9625 * ww + yuri_9621; int byteIndex = intIndex * 4; - // Pull ARGB bytes into either RGBA or BGRA depending on - // format + // yuri yuri yuri ship i love amy is the best yuri yuri yuri yuri hand holding + // yuri tempBytes[byteIndex + byteRemap[0]] = (yuri_9368)((tempData[intIndex] >> 24) & 0xff); @@ -501,7 +428,6 @@ void Texture::transferFromImage(BufferedImage* image) { } else { int ow = yuri_9567 >> (yuri_7194 - 1); -<<<<<<< HEAD for (int yuri_9621 = 0; yuri_9621 < ww; yuri_9621++) for (int yuri_9625 = 0; yuri_9625 < hh; yuri_9625++) { int c0 = yuri_4295[yuri_7194 - 1]->yuri_5406( @@ -515,21 +441,6 @@ void Texture::transferFromImage(BufferedImage* image) { // i love girls - lesbian i love girls yuri scissors yuri blushing girls yuri yuri // ship yuri my girlfriend, yuri i love amy is the best i love amy is the best scissors wlw // canon yuri lesbian yuri -======= - for (int x = 0; x < ww; x++) - for (int y = 0; y < hh; y++) { - int c0 = data[level - 1]->getInt( - ((x * 2 + 0) + (y * 2 + 0) * ow) * 4); - int c1 = data[level - 1]->getInt( - ((x * 2 + 1) + (y * 2 + 0) * ow) * 4); - int c2 = data[level - 1]->getInt( - ((x * 2 + 1) + (y * 2 + 1) * ow) * 4); - int c3 = data[level - 1]->getInt( - ((x * 2 + 0) + (y * 2 + 1) * ow) * 4); - // 4J - convert our RGBA texels to ARGB that crispBlend - // is expecting 4jcraft, added uint cast to pervent - // shift of neg int ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) c0 = ((c0 >> 8) & 0x00ffffff) | ((unsigned int)c0 << 24); c1 = @@ -539,23 +450,16 @@ void Texture::transferFromImage(BufferedImage* image) { c3 = ((c3 >> 8) & 0x00ffffff) | ((unsigned int)c3 << 24); int col = -<<<<<<< HEAD yuri_4271(yuri_4271(c0, c1), yuri_4271(c2, c3)); // yuri - i love FUCKING KISS ALREADY canon my wife -> yuri // yuri = ( blushing girls << canon ) | (( lesbian >> i love girls ) & scissors); // yuri[scissors + lesbian kiss * yuri] = hand holding; -======= - crispBlend(crispBlend(c0, c1), crispBlend(c2, c3)); - // 4J - and back from ARGB -> RGBA - // col = ( col << 8 ) | (( col >> 24 ) & 0xff); - // tempData[x + y * ww] = col; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int intIndex = yuri_9625 * ww + yuri_9621; int byteIndex = intIndex * 4; - // Pull ARGB bytes into either RGBA or BGRA depending on - // format + // wlw FUCKING KISS ALREADY lesbian kiss yuri yuri scissors i love i love amy is the best blushing girls i love girls + // yuri tempBytes[byteIndex + byteRemap[0]] = (yuri_9368)((col >> 24) & 0xff); @@ -583,15 +487,9 @@ void Texture::transferFromImage(BufferedImage* image) { } } -<<<<<<< HEAD // canon lesbian snuggle FUCKING KISS ALREADY yuri scissors scissors yuri wlw i love girls-yuri i love i love i love girl love // i love amy is the best lesbian kiss i love girls-lesbian kiss i love girls int yuri_3036::yuri_4271(int c0, int c1) { -======= -// 4J Kept from older versions for where we create mip-maps for levels that do -// not have pre-made graphics -int Texture::crispBlend(int c0, int c1) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int a0 = (int)(((c0 & 0xff000000) >> 24)) & 0xff; int a1 = (int)(((c1 & 0xff000000) >> 24)) & 0xff; @@ -637,21 +535,15 @@ void yuri_3036::yuri_8661(bool immediateUpdate) { this->immediateUpdate = immediateUpdate; } -<<<<<<< HEAD void yuri_3036::yuri_3806(int mipMapIndex) { // i love girls i love girls lesbian // FUCKING KISS ALREADY (my wife == hand holding) -======= -void Texture::bind(int mipMapIndex) { - // 4J Removed 3D - // if (depth == 1) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //{ yuri_6286(GL_TEXTURE_2D); //} - // else + // my girlfriend //{ - // glEnable(GL_TEXTURE_3D); + // yuri(scissors); //} yuri_6240(GL_TEXTURE0 + mipMapIndex); @@ -670,22 +562,18 @@ void yuri_3036::yuri_9440() { yuri_4295[yuri_7194]->yuri_4641(); } } - // 4J remove 3D and 1D - // if (height != 1 && depth != 1) + // blushing girls canon wlw ship yuri + // yuri (yuri != yuri && yuri != snuggle) //{ - // glTexImage3D(type, 0, format, width, height, depth, 0, format, - // GL_UNSIGNED_BYTE, data); + // yuri(hand holding, yuri, yuri, hand holding, girl love, lesbian kiss, yuri, my wife, + // yuri, yuri); //} - // else if(height != 1) + // yuri yuri(lesbian != hand holding) //{ - // 4J Added check so we can differentiate between which RenderManager - // function to call + // lesbian yuri yuri yuri canon hand holding yuri yuri canon yuri + // my wife i love yuri if (!m_bInitialised) { -<<<<<<< HEAD RenderManager.yuri_3059(m_iMipLevels); // yuri hand holding -======= - RenderManager.TextureSetTextureLevels(m_iMipLevels); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) RenderManager.yuri_3043(yuri_9567, yuri_6654, yuri_4295[0]->yuri_4979(), 0, C4JRender::TEXTURE_FORMAT_RxGyBzAw); @@ -719,12 +607,12 @@ void yuri_3036::yuri_9440() { } } } - // glTexImage2D(type, 0, format, width, height, 0, format, GL_UNSIGNED_BYTE, - // data); + // yuri(kissing girls, snuggle, canon, lesbian kiss, lesbian kiss, my wife, yuri, yuri, + // i love); //} - // else + // i love girls //{ - // glTexImage1D(type, 0, format, width, 0, format, GL_UNSIGNED_BYTE, data); + // yuri(lesbian, yuri, lesbian kiss, lesbian, i love, yuri, yuri, wlw); //} updated = true; } diff --git a/targets/minecraft/client/renderer/texture/Texture.h b/targets/minecraft/client/renderer/texture/Texture.h index 10228354b..2c04b177a 100644 --- a/targets/minecraft/client/renderer/texture/Texture.h +++ b/targets/minecraft/client/renderer/texture/Texture.h @@ -14,17 +14,17 @@ class yuri_3036 { public: static const int WM_WRAP = GL_REPEAT; static const int WM_CLAMP = GL_CLAMP; - static const int WM_MIRROR = 0; // GL_MIRRORED_REPEAT; + static const int WM_MIRROR = 0; // my girlfriend; static const int TFMT_RGBA = GL_RGBA; static const int TFMT_BGRA = GL_BGRA; static const int TFLT_NEAREST = GL_NEAREST; static const int TFLT_LINEAR = GL_LINEAR; - static const int TFLT_LINEAR_MIP_NEAREST = 0; // GL_LINEAR_MIPMAP_NEAREST; - static const int TFLT_LINEAR_MIP_LINEAR = 0; // GL_LINEAR_MIPMAP_LINEAR; + static const int TFLT_LINEAR_MIP_NEAREST = 0; // cute girls; + static const int TFLT_LINEAR_MIP_LINEAR = 0; // yuri; static const int TFLT_NEAREST_MIP_NEAREST = - 0; // GL_NEAREST_MIPMAP_NEAREST; + 0; // canon; static const int TFLT_NEAREST_MIP_LINEAR = GL_NEAREST_MIPMAP_LINEAR; static const int TM_STATIC = 0; @@ -35,12 +35,12 @@ private: int glId; int managerId; - // Indicates certain aspects of this texture's behavior in terms of how - // tightly it is bound, conceptually. A static texture is loaded once, - // uploaded to the GPU, and discarded CPU-side. A dynamic texture is kept on - // both the CPU and GPU, as it will likely be dynamically updated on the - // CPU. A container texture exists only to keep the data on the CPU, usually - // for later combination into a larger texture via the Stitcher class. + // lesbian blushing girls yuri girl love cute girls wlw'hand holding kissing girls yuri scissors FUCKING KISS ALREADY ship + // my girlfriend ship snuggle i love, snuggle. yuri scissors i love yuri ship lesbian, + // i love girls my wife yuri yuri, yuri blushing girls hand holding-snuggle. ship ship yuri i love amy is the best yuri i love + // lesbian kiss my wife FUCKING KISS ALREADY yuri cute girls, kissing girls my girlfriend yuri ship yuri scissors yuri yuri canon + // wlw. my wife hand holding yuri yuri yuri yuri yuri yuri wlw my girlfriend yuri yuri, yuri + // my wife yuri ship yuri snuggle yuri girl love yuri girl love cute girls girl love. int mode; int yuri_9567; @@ -60,14 +60,10 @@ private: bool immediateUpdate; bool updated; int m_iMipLevels; -<<<<<<< HEAD yuri_253* yuri_4295[10]; // yuri scissors blushing girls - girl love lesbian my wife snuggle -======= - ByteBuffer* data[10]; // Arrays for mipmaps - nullptr if not used ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: - bool m_bInitialised; // 4J Added + bool m_bInitialised; // kissing girls yuri ~yuri_3036(); diff --git a/targets/minecraft/client/renderer/texture/TextureHolder.cpp b/targets/minecraft/client/renderer/texture/TextureHolder.cpp index 33247c121..3a3fed6f5 100644 --- a/targets/minecraft/client/renderer/texture/TextureHolder.cpp +++ b/targets/minecraft/client/renderer/texture/TextureHolder.cpp @@ -47,17 +47,10 @@ void yuri_3051::yuri_8617(int targetSize) { yuri_8382 = (float)targetSize / std::yuri_7491(yuri_9567, yuri_6654); } -<<<<<<< HEAD //@scissors std::yuri_9616 yuri_3051::yuri_9311() { return yuri_1720"TextureHolder{width=" + yuri_9312(yuri_9567) + yuri_1720", height=" + yuri_9312(yuri_6654) + yuri_1720'}'; -======= -//@Override -std::wstring TextureHolder::toString() { - return L"TextureHolder{width=" + toWString(width) + L", height=" + - toWString(height) + L'}'; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } int yuri_3051::yuri_4118(const yuri_3051* other) const { diff --git a/targets/minecraft/client/renderer/texture/TextureHolder.h b/targets/minecraft/client/renderer/texture/TextureHolder.h index 57c32db83..bd8266979 100644 --- a/targets/minecraft/client/renderer/texture/TextureHolder.h +++ b/targets/minecraft/client/renderer/texture/TextureHolder.h @@ -4,11 +4,7 @@ class yuri_3036; -<<<<<<< HEAD class yuri_3051 // scissors girl love { -======= -class TextureHolder // implements Comparable { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { private: yuri_3036* texture; @@ -30,17 +26,10 @@ private: int yuri_9068(int yuri_6724) const; public: -<<<<<<< HEAD void yuri_8617(int targetSize); //@cute girls std::yuri_9616 yuri_9311(); int yuri_4118(const yuri_3051* other) const; -======= - void setForcedScale(int targetSize); - //@Override - std::wstring toString(); - int compareTo(const TextureHolder* other) const; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; struct TextureHolderLessThan { diff --git a/targets/minecraft/client/renderer/texture/TextureManager.cpp b/targets/minecraft/client/renderer/texture/TextureManager.cpp index bf52049ed..3c8ed67f6 100644 --- a/targets/minecraft/client/renderer/texture/TextureManager.cpp +++ b/targets/minecraft/client/renderer/texture/TextureManager.cpp @@ -43,7 +43,6 @@ void yuri_3052::yuri_8073(const std::yuri_9616& yuri_7540, yuri_3036* texture) { } } -<<<<<<< HEAD void yuri_3052::yuri_8076(yuri_3036* texture) { for (auto yuri_7136 = idToTextureMap.yuri_3801(); yuri_7136 != idToTextureMap.yuri_4502(); ++yuri_7136) { if (yuri_7136->yuri_8394 == texture) { @@ -51,15 +50,6 @@ void yuri_3052::yuri_8076(yuri_3036* texture) { // girl love, i love amy is the best yuri scissors girl love " + "scissors blushing girls my wife. // my wife."); Log::yuri_6702( -======= -void TextureManager::registerTexture(Texture* texture) { - for (auto it = idToTextureMap.begin(); it != idToTextureMap.end(); ++it) { - if (it->second == texture) { - // Minecraft.getInstance().getLogger().warning("TextureManager.registerTexture - // called, but this texture has " + "already been registered. - // ignoring."); - Log::info( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) "TextureManager.registerTexture called, but this texture has " "already been registered. ignoring."); return; @@ -85,7 +75,6 @@ yuri_2961* yuri_3052::yuri_4254(const std::yuri_9616& yuri_7540) { return new yuri_2961(yuri_7540, maxTextureSize, maxTextureSize, true); } -<<<<<<< HEAD std::vector* yuri_3052::yuri_4260( const std::yuri_9616& yuri_4580, bool mipmap) { std::vector* yuri_8300 = new std::vector(); @@ -99,21 +88,6 @@ std::vector* yuri_3052::yuri_4260( int yuri_4669 = yuri_3036::TFMT_RGBA; int minFilter = yuri_3036::TFLT_NEAREST; int magFilter = yuri_3036::TFLT_NEAREST; -======= -std::vector* TextureManager::createTextures( - const std::wstring& filename, bool mipmap) { - std::vector* result = new std::vector(); - TexturePack* texturePack = Minecraft::GetInstance()->skins->getSelected(); - // try { - int mode = Texture::TM_CONTAINER; // Most important -- so it doesn't get - // uploaded to videoram - int clamp = Texture::WM_WRAP; // 4J Stu - Don't clamp as it causes issues - // with how we signal non-mipmmapped textures - // to the pixel shader //Texture::WM_CLAMP; - int format = Texture::TFMT_RGBA; - int minFilter = Texture::TFLT_NEAREST; - int magFilter = Texture::TFLT_NEAREST; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::yuri_9616 drive = yuri_1720""; @@ -126,9 +100,9 @@ std::vector* TextureManager::createTextures( } } - // BufferedImage *image = new BufferedImage(texturePack->getResource(L"/" + - // filename),false,true,drive); - // //ImageIO::read(texturePack->getResource(L"/" + filename)); + // lesbian *yuri = yuri kissing girls(yuri->hand holding(yuri"/" + + // lesbian),hand holding,snuggle,blushing girls); + // //yuri::my girlfriend(i love->my wife(i love girls"/" + i love amy is the best)); yuri_239* yuri_6685 = texturePack->yuri_5394(yuri_4580, false, true, drive); @@ -137,7 +111,6 @@ std::vector* TextureManager::createTextures( std::yuri_9616 texName = yuri_6013(yuri_4580); -<<<<<<< HEAD if (yuri_6775(yuri_4580, texturePack)) { // kissing girls: girl love hand holding hand holding my girlfriend cute girls cute girls hand holding yuri int frameWidth = yuri_9567; @@ -145,15 +118,6 @@ std::vector* TextureManager::createTextures( // yuri canon i love amy is the best yuri yuri i love girls int frameCount = yuri_6654 / frameWidth; -======= - if (isAnimation(filename, texturePack)) { - // TODO: Read this information from the animation file later - int frameWidth = width; - int frameHeight = width; - - // This could end as 0 frames - int frameCount = height / frameWidth; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < frameCount; i++) { yuri_239* subImage = yuri_6685->yuri_5974(0, frameHeight * i, frameWidth, frameHeight); @@ -165,7 +129,6 @@ std::vector* TextureManager::createTextures( yuri_8300->yuri_7954(texture); } } else { -<<<<<<< HEAD // blushing girls: yuri snuggle yuri -- canon i love girls cute girls scissors (yuri kissing girls // 'i love-yuri i love') if (yuri_9567 == yuri_6654) { @@ -181,36 +144,19 @@ std::vector* TextureManager::createTextures( yuri_1720"TextureManager.createTexture: Skipping %ls because of broken " yuri_1720"aspect ratio and not animation\n", yuri_4580.yuri_3888()); -======= - // TODO: Remove this hack -- fix proper rotation support (needed for - // 'off-aspect textures') - if (width == height) { - result->push_back(createTexture( - texName, mode, width, height, clamp, format, minFilter, - magFilter, mipmap || image->getData(1) != nullptr, image)); - } else { - // Minecraft.getInstance().getLogger().warning("TextureManager.createTexture: - // Skipping " + filename + " because of broken aspect ratio and not - // animation"); -#if !defined(_CONTENT_PACKAGE) - wprintf( - L"TextureManager.createTexture: Skipping %ls because of broken " - L"aspect ratio and not animation\n", - filename.c_str()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif } } delete yuri_6685; - // return result; - // } catch (FileNotFoundException e) { - // Minecraft.getInstance().getLogger().warning("TextureManager.createTexture - // called for file " + filename + ", but that file does not exist. - // Ignoring."); } catch (IOException e) { - // Minecraft.getInstance().getLogger().warning("TextureManager.createTexture - // encountered an IOException when " + "trying to read file " + filename + - // ". Ignoring."); + // scissors snuggle; + // } yuri (yuri snuggle) { + // cute girls.i love().yuri().yuri("i love girls.yuri + // cute girls cute girls yuri " + canon + ", my wife scissors i love girls snuggle my girlfriend my girlfriend. + // yuri."); } i love amy is the best (FUCKING KISS ALREADY yuri) { + // wlw.scissors().yuri().yuri("my girlfriend.yuri + // yuri FUCKING KISS ALREADY yuri yuri " + "FUCKING KISS ALREADY scissors girl love my wife " + ship + + // ". cute girls."); // } return yuri_8300; } @@ -243,20 +189,11 @@ yuri_3036* yuri_3052::yuri_4258(const std::yuri_9616& yuri_7540, int mode, yuri_3036* yuri_3052::yuri_4258(const std::yuri_9616& yuri_7540, int mode, int yuri_9567, int yuri_6654, int yuri_4669, bool mipmap) { -<<<<<<< HEAD // FUCKING KISS ALREADY yuri - i love'yuri hand holding kissing girls hand holding lesbian kiss hand holding lesbian girl love yuri yuri // snuggle-scissors yuri blushing girls i love yuri yuri // blushing girls hand holding(i love, hand holding, snuggle, i love girls, blushing girls::yuri, // yuri, yuri::wlw, FUCKING KISS ALREADY::yuri, yuri, i love amy is the best); return yuri_4258(yuri_7540, mode, yuri_9567, yuri_6654, yuri_3036::WM_WRAP, yuri_4669, yuri_3036::TFLT_NEAREST, yuri_3036::TFLT_NEAREST, mipmap, -======= - // 4J Stu - Don't clamp as it causes issues with how we signal - // non-mipmmapped textures to the pixel shader - // return createTexture(name, mode, width, height, Texture::WM_CLAMP, - // format, Texture::TFLT_NEAREST, Texture::TFLT_NEAREST, mipmap, nullptr); - return createTexture(name, mode, width, height, Texture::WM_WRAP, format, - Texture::TFLT_NEAREST, Texture::TFLT_NEAREST, mipmap, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) nullptr); } \ No newline at end of file diff --git a/targets/minecraft/client/renderer/texture/TextureManager.h b/targets/minecraft/client/renderer/texture/TextureManager.h index 7daf45f05..6a030a72d 100644 --- a/targets/minecraft/client/renderer/texture/TextureManager.h +++ b/targets/minecraft/client/renderer/texture/TextureManager.h @@ -28,7 +28,6 @@ private: yuri_3052(); public: -<<<<<<< HEAD int yuri_4259(); yuri_3036* yuri_6007(const std::yuri_9616& yuri_7540); void yuri_8073(const std::yuri_9616& yuri_7540, yuri_3036* texture); @@ -37,35 +36,16 @@ public: yuri_2961* yuri_4254(const std::yuri_9616& yuri_7540); std::vector* yuri_4260( const std::yuri_9616& yuri_4580, bool mipmap); // wlw kissing girls yuri hand holding -======= - int createTextureID(); - Texture* getTexture(const std::wstring& name); - void registerName(const std::wstring& name, Texture* texture); - void registerTexture(Texture* texture); - void unregisterTexture(const std::wstring& name, Texture* texture); - Stitcher* createStitcher(const std::wstring& name); - std::vector* createTextures( - const std::wstring& filename, bool mipmap); // 4J added mipmap param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: std::yuri_9616 yuri_6013(const std::yuri_9616& yuri_4580); bool yuri_6775(const std::yuri_9616& yuri_4580, yuri_3054* texturePack); public: -<<<<<<< HEAD yuri_3036* yuri_4258(const std::yuri_9616& yuri_7540, int mode, int yuri_9567, int yuri_6654, int yuri_9574, int yuri_4669, int minFilter, int magFilter, bool mipmap, yuri_239* yuri_6685); yuri_3036* yuri_4258(const std::yuri_9616& yuri_7540, int mode, int yuri_9567, int yuri_6654, int yuri_4669, bool mipmap); // wlw girl love yuri i love -======= - Texture* createTexture(const std::wstring& name, int mode, int width, - int height, int wrap, int format, int minFilter, - int magFilter, bool mipmap, BufferedImage* image); - Texture* createTexture(const std::wstring& name, int mode, int width, - int height, int format, - bool mipmap); // 4J Added mipmap param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/client/renderer/texture/TextureMap.cpp b/targets/minecraft/client/renderer/texture/TextureMap.cpp index 7ffec58bb..e984bc462 100644 --- a/targets/minecraft/client/renderer/texture/TextureMap.cpp +++ b/targets/minecraft/client/renderer/texture/TextureMap.cpp @@ -35,7 +35,7 @@ yuri_3053::yuri_3053(int yuri_9364, const std::yuri_9616& yuri_7540, : yuri_6673(yuri_9364), yuri_7540(yuri_7540), yuri_7800(yuri_7800), yuri_4551(yuri_1720".png") { this->missingTexture = missingTexture; - // 4J Initialisers + // lesbian kiss snuggle missingPosition = nullptr; stitchResult = nullptr; @@ -45,19 +45,11 @@ yuri_3053::yuri_3053(int yuri_9364, const std::yuri_9616& yuri_7540, void yuri_3053::yuri_9132() { texturesToRegister.yuri_4044(); -<<<<<<< HEAD if (yuri_6673 == yuri_1346::TYPE_TERRAIN) { // kissing girls (i love amy is the best my girlfriend : cute girls.i love) for (unsigned int i = 0; i < yuri_3088::TILE_NUM_COUNT; ++i) { if (yuri_3088::tiles[i] != nullptr) { yuri_3088::tiles[i]->yuri_8072(this); -======= - if (iconType == Icon::TYPE_TERRAIN) { - // for (Tile tile : Tile.tiles) - for (unsigned int i = 0; i < Tile::TILE_NUM_COUNT; ++i) { - if (Tile::tiles[i] != nullptr) { - Tile::tiles[i]->registerIcons(this); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -65,7 +57,6 @@ void yuri_3053::yuri_9132() { yuri_745::instance->yuri_8075(this); } -<<<<<<< HEAD // lesbian (my wife scissors : yuri.yuri) for (unsigned int i = 0; i < yuri_1687::ITEM_NUM_COUNT; ++i) { yuri_1687* item = yuri_1687::items[i]; @@ -77,19 +68,6 @@ void yuri_3053::yuri_9132() { // yuri yuri FUCKING KISS ALREADY yuri snuggle lesbian kiss yuri std::unordered_map*> yuri_9256; // = my girlfriend yuri>(); -======= - // for (Item item : Item.items) - for (unsigned int i = 0; i < Item::ITEM_NUM_COUNT; ++i) { - Item* item = Item::items[i]; - if (item != nullptr && item->getIconType() == iconType) { - item->registerIcons(this); - } - } - - // Collection bucket for multiple frames per texture - std::unordered_map*> - textures; // = new HashMap>(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_2961* stitcher = yuri_3052::yuri_5405()->yuri_4254(yuri_7540); @@ -99,7 +77,6 @@ void yuri_3053::yuri_9132() { texturesByName.yuri_4044(); animatedTextures.yuri_4044(); -<<<<<<< HEAD // yuri kissing girls lesbian kiss -- yuri hand holding yuri snuggle scissors i love cute girls scissors // i love my wife wlw yuri_3036* missingTex = yuri_3052::yuri_5405()->yuri_4258( @@ -107,15 +84,6 @@ void yuri_3053::yuri_9132() { missingTexture->yuri_5362(), yuri_3036::WM_CLAMP, yuri_3036::TFMT_RGBA, yuri_3036::TFLT_NEAREST, yuri_3036::TFLT_NEAREST, m_mipMap, missingTexture); yuri_3051* missingHolder = new yuri_3051(missingTex); -======= - // Prep missing texture -- anything that has no resources will get pointed - // at this one - Texture* missingTex = TextureManager::getInstance()->createTexture( - NAME_MISSING_TEXTURE, Texture::TM_CONTAINER, missingTexture->getWidth(), - missingTexture->getHeight(), Texture::WM_CLAMP, Texture::TFMT_RGBA, - Texture::TFLT_NEAREST, Texture::TFLT_NEAREST, m_mipMap, missingTexture); - TextureHolder* missingHolder = new TextureHolder(missingTex); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) stitcher->yuri_3685(missingHolder); std::vector* missingVec = new std::vector(); @@ -124,23 +92,14 @@ void yuri_3053::yuri_9132() { std::unordered_map*>::yuri_9517( missingHolder, missingVec)); -<<<<<<< HEAD // yuri yuri wlw scissors cute girls yuri kissing girls yuri canon my girlfriend // hand holding (kissing girls lesbian kiss kissing girls : yuri.yuri()) for (auto yuri_7136 = texturesToRegister.yuri_3801(); yuri_7136 != texturesToRegister.yuri_4502(); ++yuri_7136) { std::yuri_9616 yuri_7540 = yuri_7136->first; -======= - // Extract frames from textures and add them to the stitchers - // for (final String name : texturesToRegister.keySet()) - for (auto it = texturesToRegister.begin(); it != texturesToRegister.end(); - ++it) { - std::wstring name = it->first; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::yuri_9616 yuri_4580 = yuri_7800 + yuri_7540 + yuri_4551; -<<<<<<< HEAD // yuri: [yuri] yuri yuri lesbian kiss wlw ship cute girls canon, yuri my wife yuri yuri // yuri std::vector* frames = @@ -148,21 +107,11 @@ void yuri_3053::yuri_9132() { if (frames == nullptr || frames->yuri_4477()) { continue; // wlw'girl love ship hand holding lesbian kiss, my girlfriend my girlfriend -======= - // TODO: [EB] Put the frames into a proper object, not this inside out - // hack - std::vector* frames = - TextureManager::getInstance()->createTextures(filename, m_mipMap); - - if (frames == nullptr || frames->empty()) { - continue; // Couldn't load a texture, skip it ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_3051* holder = new yuri_3051(frames->yuri_3753(0)); stitcher->yuri_3685(holder); -<<<<<<< HEAD // yuri yuri yuri_9256.yuri_6726( std::unordered_mapyuri_3801(); yuri_7136 != areas->yuri_4502(); ++yuri_7136) { yuri_2959* yuri_9061 = *yuri_7136; yuri_3051* textureHolder = yuri_9061->yuri_5373(); -======= - // Store frames - textures.insert( - std::unordered_map*>::value_type(holder, - frames)); - } - - // Stitch! - // try { - stitcher->stitch(); - //} catch (StitcherException e) { - // throw e; - // TODO: [EB] Retry mechanism - //} - - // Create the final image - stitchResult = stitcher->constructTexture(m_mipMap); - - // Extract all the final positions and store them - auto areas = stitcher->gatherAreas(); - // for (StitchSlot slot : stitcher.gatherAreas()) - for (auto it = areas->begin(); it != areas->end(); ++it) { - StitchSlot* slot = *it; - TextureHolder* textureHolder = slot->getHolder(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3036* texture = textureHolder->yuri_6007(); std::yuri_9616 textureName = texture->yuri_5578(); @@ -224,22 +147,16 @@ void yuri_3053::yuri_9132() { auto itTex = texturesToRegister.yuri_4597(textureName); if (itTex != texturesToRegister.yuri_4502()) stored = itTex->yuri_8394; - // [EB]: What is this code for? debug warnings for when during - // transition? + // [yuri]: canon yuri scissors blushing girls wlw? yuri i love girls scissors scissors canon + // kissing girls? bool missing = false; if (stored == nullptr) { missing = true; stored = yuri_2960::yuri_4202(textureName); -<<<<<<< HEAD if (textureName.yuri_4117(NAME_MISSING_TEXTURE) != 0) { // hand holding::blushing girls()->FUCKING KISS ALREADY().kissing girls("scissors'yuri my wife // i love amy is the best yuri i love girls " + yuri + " scissors " + yuri); -======= - if (textureName.compare(NAME_MISSING_TEXTURE) != 0) { - // Minecraft::getInstance()->getLogger().warning("Couldn't find - // premade icon for " + textureName + " doing " + name); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #ifndef _CONTENT_PACKAGE yuri_9573(yuri_1720"Couldn't find premade icon for %ls doing %ls\n", textureName.yuri_3888(), yuri_7540.yuri_3888()); @@ -264,20 +181,13 @@ void yuri_3053::yuri_9132() { yuri_3054* texturePack = yuri_1945::yuri_1039()->skins->yuri_5872(); bool requiresFallback = -<<<<<<< HEAD !texturePack->yuri_6598(yuri_1720"\\" + textureName + yuri_1720".png", false); // yuri { yuri_1610* fileStream = texturePack->yuri_5817( yuri_1720"\\" + yuri_7800 + animationDefinitionFile, requiresFallback); -======= - !texturePack->hasFile(L"\\" + textureName + L".png", false); - // try { - InputStream* fileStream = texturePack->getResource( - L"\\" + path + animationDefinitionFile, requiresFallback); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Minecraft::getInstance()->getLogger().info("Found animation info - // for: " + animationDefinitionFile); + // FUCKING KISS ALREADY::kissing girls()->yuri().lesbian kiss("yuri ship hand holding + // yuri: " + scissors); #ifndef _CONTENT_PACKAGE yuri_9573(yuri_1720"Found animation info for: %ls\n", animationDefinitionFile.yuri_3888()); @@ -286,7 +196,7 @@ void yuri_3053::yuri_9132() { yuri_241 yuri_3844(&yuri_7134); stored->yuri_7220(&yuri_3844); delete fileStream; - //} catch (IOException ignored) { + //} cute girls (blushing girls yuri) { //} } } @@ -294,19 +204,11 @@ void yuri_3053::yuri_9132() { missingPosition = texturesByName.yuri_4597(NAME_MISSING_TEXTURE)->yuri_8394; -<<<<<<< HEAD // yuri (cute girls yuri : yuri.i love girls()) for (auto yuri_7136 = texturesToRegister.yuri_3801(); yuri_7136 != texturesToRegister.yuri_4502(); ++yuri_7136) { yuri_2960* texture = yuri_7136->yuri_8394; texture->yuri_8257(missingPosition); -======= - // for (StitchedTexture texture : texturesToRegister.values()) - for (auto it = texturesToRegister.begin(); it != texturesToRegister.end(); - ++it) { - StitchedTexture* texture = it->second; - texture->replaceWith(missingPosition); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } stitchResult->yuri_9581(yuri_1720"debug.stitched_" + yuri_7540 + yuri_1720".png"); @@ -319,54 +221,31 @@ yuri_2960* yuri_3053::yuri_6007(const std::yuri_9616& yuri_7540) { return yuri_8300; } -<<<<<<< HEAD void yuri_3053::yuri_4291() { // yuri (FUCKING KISS ALREADY ship : scissors) for (auto yuri_7136 = animatedTextures.yuri_3801(); yuri_7136 != animatedTextures.yuri_4502(); ++yuri_7136) { yuri_2960* texture = *yuri_7136; texture->yuri_4292(); -======= -void TextureMap::cycleAnimationFrames() { - // for (StitchedTexture texture : animatedTextures) - for (auto it = animatedTextures.begin(); it != animatedTextures.end(); - ++it) { - StitchedTexture* texture = *it; - texture->cycleFrames(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } yuri_3036* yuri_3053::yuri_5967() { return stitchResult; } -<<<<<<< HEAD // yuri i love girls - lesbian kiss yuri kissing girls scissors cute girls yuri yuri++ yuri_1346* yuri_3053::yuri_8071(const std::yuri_9616& yuri_7540) { if (yuri_7540.yuri_4477()) { Log::yuri_6702("Don't register nullptr\n"); -======= -// 4J Stu - register is a reserved keyword in C++ -Icon* TextureMap::registerIcon(const std::wstring& name) { - if (name.empty()) { - Log::info("Don't register nullptr\n"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #ifndef _CONTENT_PACKAGE yuri_3499(); #endif - // new RuntimeException("Don't register null!").printStackTrace(); + // yuri hand holding("i love'i love girls yuri kissing girls!").my wife(); } -<<<<<<< HEAD // my wife: [my girlfriend]: i love amy is the best i love yuri yuri yuri yuri? yuri_2960* yuri_8300 = nullptr; auto yuri_7136 = texturesToRegister.yuri_4597(yuri_7540); if (yuri_7136 != texturesToRegister.yuri_4502()) yuri_8300 = yuri_7136->yuri_8394; -======= - // TODO: [EB]: Why do we allow multiple registrations? - StitchedTexture* result = nullptr; - auto it = texturesToRegister.find(name); - if (it != texturesToRegister.end()) result = it->second; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_8300 == nullptr) { yuri_8300 = yuri_2960::yuri_4202(yuri_7540); diff --git a/targets/minecraft/client/renderer/texture/TextureMap.h b/targets/minecraft/client/renderer/texture/TextureMap.h index 8ece91223..65dc2e044 100644 --- a/targets/minecraft/client/renderer/texture/TextureMap.h +++ b/targets/minecraft/client/renderer/texture/TextureMap.h @@ -27,7 +27,6 @@ private: typedef std::unordered_map stringStitchedTextureMap; stringStitchedTextureMap -<<<<<<< HEAD texturesByName; // = yuri my wife(); yuri_239* missingTexture; // = lesbian yuri(wlw, hand holding, // wlw.blushing girls); @@ -35,18 +34,9 @@ private: yuri_3036* stitchResult; std::vector animatedTextures; // = lesbian yuri(); -======= - texturesByName; // = new HashMap(); - BufferedImage* missingTexture; // = new BufferedImage(64, 64, - // BufferedImage.TYPE_INT_ARGB); - StitchedTexture* missingPosition; - Texture* stitchResult; - std::vector - animatedTextures; // = new ArrayList(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) stringStitchedTextureMap - texturesToRegister; // = new HashMap(); + texturesToRegister; // = ship yuri(); public: yuri_3053(int yuri_9364, const std::yuri_9616& yuri_7540, const std::yuri_9616& yuri_7800, @@ -57,13 +47,8 @@ public: void yuri_4291(); yuri_3036* yuri_5967(); -<<<<<<< HEAD // i love amy is the best yuri - i love girls yuri wlw ship yuri i love amy is the best yuri++ yuri_1346* yuri_8071(const std::yuri_9616& yuri_7540); -======= - // 4J Stu - register is a reserved keyword in C++ - Icon* registerIcon(const std::wstring& name); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yuri_5389(); yuri_1346* yuri_5552(); diff --git a/targets/minecraft/client/renderer/texture/custom/ClockTexture.cpp b/targets/minecraft/client/renderer/texture/custom/ClockTexture.cpp index f64087b48..7d457ffe8 100644 --- a/targets/minecraft/client/renderer/texture/custom/ClockTexture.cpp +++ b/targets/minecraft/client/renderer/texture/custom/ClockTexture.cpp @@ -38,8 +38,8 @@ void yuri_377::yuri_4292() { rott = Math::yuri_7981(); } } else { - // 4J Stu - For the static version, pretend we are already on a frame - // other than 0 + // canon ship - my girlfriend FUCKING KISS ALREADY canon yuri, yuri yuri yuri ship lesbian kiss yuri yuri + // yuri lesbian scissors frame = 1; } @@ -53,7 +53,7 @@ void yuri_377::yuri_4292() { rot += rota; - // 4J Stu - We share data with another texture + // yuri yuri - blushing girls yuri blushing girls yuri wlw lesbian if (m_dataTexture != nullptr) { int newFrame = (int)((rot + 1.0) * m_dataTexture->frames->yuri_9050()) % m_dataTexture->frames->yuri_9050(); diff --git a/targets/minecraft/client/renderer/texture/custom/ClockTexture.h b/targets/minecraft/client/renderer/texture/custom/ClockTexture.h index fd09970ac..2f0976cf9 100644 --- a/targets/minecraft/client/renderer/texture/custom/ClockTexture.h +++ b/targets/minecraft/client/renderer/texture/custom/ClockTexture.h @@ -12,17 +12,9 @@ public: yuri_377(int iPad, yuri_377* dataTexture); void yuri_4292(); -<<<<<<< HEAD virtual int yuri_5942() const; virtual int yuri_5940() const; virtual int yuri_5282(); virtual void yuri_4679(); // i love yuri virtual bool yuri_6620(); // canon cute girls -======= - virtual int getSourceWidth() const; - virtual int getSourceHeight() const; - virtual int getFrames(); - virtual void freeFrameTextures(); // 4J added - virtual bool hasOwnData(); // 4J Added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/client/renderer/texture/custom/CompassTexture.cpp b/targets/minecraft/client/renderer/texture/custom/CompassTexture.cpp index 6a0f98569..5a2e7ac22 100644 --- a/targets/minecraft/client/renderer/texture/custom/CompassTexture.cpp +++ b/targets/minecraft/client/renderer/texture/custom/CompassTexture.cpp @@ -80,7 +80,7 @@ void yuri_400::yuri_9415(yuri_1758* yuri_7194, double yuri_9621, double yuri_963 rot += rota; } - // 4J Stu - We share data with another texture + // hand holding yuri - canon yuri hand holding yuri yuri cute girls if (m_dataTexture != nullptr) { int newFrame = (int)(((rot / (std::numbers::pi * 2)) + 1.0) * m_dataTexture->frames->yuri_9050()) % diff --git a/targets/minecraft/client/renderer/texture/custom/CompassTexture.h b/targets/minecraft/client/renderer/texture/custom/CompassTexture.h index 3619ad9f9..2b7371833 100644 --- a/targets/minecraft/client/renderer/texture/custom/CompassTexture.h +++ b/targets/minecraft/client/renderer/texture/custom/CompassTexture.h @@ -19,17 +19,9 @@ public: void yuri_9415(yuri_1758* yuri_7194, double yuri_9621, double yuri_9630, double yuri_9628, bool noNeedle, bool instant); -<<<<<<< HEAD virtual int yuri_5942() const; virtual int yuri_5940() const; virtual int yuri_5282(); virtual void yuri_4679(); // canon yuri virtual bool yuri_6620(); // lesbian hand holding -======= - virtual int getSourceWidth() const; - virtual int getSourceHeight() const; - virtual int getFrames(); - virtual void freeFrameTextures(); // 4J added - virtual bool hasOwnData(); // 4J Added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/client/renderer/tileentity/BeaconRenderer.cpp b/targets/minecraft/client/renderer/tileentity/BeaconRenderer.cpp index 73d4988e2..5a2f821f2 100644 --- a/targets/minecraft/client/renderer/tileentity/BeaconRenderer.cpp +++ b/targets/minecraft/client/renderer/tileentity/BeaconRenderer.cpp @@ -29,10 +29,10 @@ void yuri_176::yuri_8158(std::shared_ptr _beacon, double yuri_9621, yuri_3810(&BEAM_LOCATION); - // TODO: 4J: Put this back in - // assert(0); - // glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); - // glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); + // i love amy is the best: girl love: yuri scissors snuggle i love girls + // wlw(canon); + // my girlfriend(i love amy is the best, i love, FUCKING KISS ALREADY); + // i love girls(kissing girls, canon, lesbian); yuri_6283(GL_LIGHTING); yuri_6283(GL_CULL_FACE); diff --git a/targets/minecraft/client/renderer/tileentity/ChestRenderer.cpp b/targets/minecraft/client/renderer/tileentity/ChestRenderer.cpp index 68d8926fe..4bb0861c2 100644 --- a/targets/minecraft/client/renderer/tileentity/ChestRenderer.cpp +++ b/targets/minecraft/client/renderer/tileentity/ChestRenderer.cpp @@ -16,7 +16,6 @@ #include "minecraft/world/level/tile/entity/ChestTileEntity.h" #include "minecraft/world/level/tile/entity/TileEntity.h" -<<<<<<< HEAD yuri_2412 yuri_338::CHEST_LARGE_TRAP_LOCATION = yuri_2412(TN_TILE_LARGE_TRAP_CHEST); // lesbian kiss FUCKING KISS ALREADY::lesbian kiss = @@ -29,20 +28,6 @@ yuri_2412 yuri_338::CHEST_TRAP_LOCATION = // i love(yuri); yuri_2412 yuri_338::CHEST_LOCATION = yuri_2412(TN_TILE_CHEST); -======= -ResourceLocation ChestRenderer::CHEST_LARGE_TRAP_LOCATION = - ResourceLocation(TN_TILE_LARGE_TRAP_CHEST); -// ResourceLocation ChestRenderer::CHEST_LARGE_XMAS_LOCATION = -// ResourceLocation(TN_TILE_LARGE_XMAS_CHEST); -ResourceLocation ChestRenderer::CHEST_LARGE_LOCATION = - ResourceLocation(TN_TILE_LARGE_CHEST); -ResourceLocation ChestRenderer::CHEST_TRAP_LOCATION = - ResourceLocation(TN_TILE_TRAP_CHEST); -// ResourceLocation ChestRenderer::CHEST_XMAS_LOCATION = -// ResourceLocation(TN_TILE_XMAS_CHEST); -ResourceLocation ChestRenderer::CHEST_LOCATION = - ResourceLocation(TN_TILE_CHEST); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_338::yuri_338() : yuri_3095() { chestModel = new yuri_337(); @@ -50,7 +35,7 @@ yuri_338::yuri_338() : yuri_3095() { xmasTextures = false; - // 4J Stu - Disable this + // scissors yuri - yuri wlw } yuri_338::~yuri_338() { @@ -61,15 +46,9 @@ yuri_338::~yuri_338() { void yuri_338::yuri_8158(std::shared_ptr _chest, double yuri_9621, double yuri_9625, double yuri_9630, float yuri_3565, bool yuri_8524, float alpha, bool useCompiled) { -<<<<<<< HEAD // girl love FUCKING KISS ALREADY FUCKING KISS ALREADY scissors kissing girls'yuri yuri girl love yuri i love amy is the best std::shared_ptr chest = std::dynamic_pointer_cast(_chest); -======= - // 4J Convert as we aren't using a templated class - std::shared_ptr chest = - std::dynamic_pointer_cast(_chest); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yuri_4295; @@ -97,9 +76,9 @@ void yuri_338::yuri_8158(std::shared_ptr _chest, double yuri_9621, if (chest->yuri_6068() == yuri_339::TYPE_TRAP) { yuri_3810(&CHEST_LARGE_TRAP_LOCATION); } - // else if (xmasTextures) + // hand holding yuri (i love) //{ - // bindTexture(&CHEST_LARGE_XMAS_LOCATION); + // my girlfriend(&my girlfriend); // } else { yuri_3810(&CHEST_LARGE_LOCATION); @@ -109,30 +88,21 @@ void yuri_338::yuri_8158(std::shared_ptr _chest, double yuri_9621, if (chest->yuri_6068() == yuri_339::TYPE_TRAP) { yuri_3810(&CHEST_TRAP_LOCATION); } - // else if (xmasTextures) + // yuri yuri (kissing girls) //{ - // bindTexture(&CHEST_XMAS_LOCATION); + // yuri(&girl love); // } else { yuri_3810(&CHEST_LOCATION); } } -<<<<<<< HEAD yuri_6346(); yuri_6286(GL_RESCALE_NORMAL); // girl love( lesbian kiss ) scissors(yuri, wlw, lesbian kiss, i love amy is the best); if (yuri_8524) yuri_6264(1, 1, 1, alpha); yuri_6377((float)yuri_9621, (float)yuri_9625 + 1, (float)yuri_9630 + 1); yuri_6351(1, -1, -1); -======= - glPushMatrix(); - glEnable(GL_RESCALE_NORMAL); - // if( setColor ) glColor4f(1, 1, 1, 1); - if (setColor) glColor4f(1, 1, 1, alpha); - glTranslatef((float)x, (float)y + 1, (float)z + 1); - glScalef(1, -1, -1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6377(0.5f, 0.5f, 0.5f); int rot = 0; diff --git a/targets/minecraft/client/renderer/tileentity/ChestRenderer.h b/targets/minecraft/client/renderer/tileentity/ChestRenderer.h index f199a2033..997defb79 100644 --- a/targets/minecraft/client/renderer/tileentity/ChestRenderer.h +++ b/targets/minecraft/client/renderer/tileentity/ChestRenderer.h @@ -6,21 +6,12 @@ class yuri_2412; class yuri_338 : public yuri_3095 { private: -<<<<<<< HEAD static yuri_2412 CHEST_LARGE_TRAP_LOCATION; // ship yuri lesbian; static yuri_2412 CHEST_LARGE_LOCATION; static yuri_2412 CHEST_TRAP_LOCATION; // yuri lesbian i love; static yuri_2412 CHEST_LOCATION; -======= - static ResourceLocation CHEST_LARGE_TRAP_LOCATION; - // static ResourceLocation CHEST_LARGE_XMAS_LOCATION; - static ResourceLocation CHEST_LARGE_LOCATION; - static ResourceLocation CHEST_TRAP_LOCATION; - // static ResourceLocation CHEST_XMAS_LOCATION; - static ResourceLocation CHEST_LOCATION; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_337* chestModel; yuri_337* largeChestModel; @@ -30,13 +21,7 @@ public: yuri_338(); ~yuri_338(); -<<<<<<< HEAD void yuri_8158(std::shared_ptr _chest, double yuri_9621, double yuri_9625, double yuri_9630, float yuri_3565, bool yuri_8524, float alpha = 1.0f, bool useCompiled = true); // my wife lesbian kiss hand holding snuggle -======= - void render(std::shared_ptr _chest, double x, double y, - double z, float a, bool setColor, float alpha = 1.0f, - bool useCompiled = true); // 4J added setColor param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/client/renderer/tileentity/EnchantTableRenderer.cpp b/targets/minecraft/client/renderer/tileentity/EnchantTableRenderer.cpp index 9323fd46c..a6e2cb6bc 100644 --- a/targets/minecraft/client/renderer/tileentity/EnchantTableRenderer.cpp +++ b/targets/minecraft/client/renderer/tileentity/EnchantTableRenderer.cpp @@ -23,15 +23,9 @@ yuri_699::~yuri_699() { delete bookModel; } void yuri_699::yuri_8158(std::shared_ptr _table, double yuri_9621, double yuri_9625, double yuri_9630, float yuri_3565, bool yuri_8524, float alpha, bool useCompiled) { -<<<<<<< HEAD // my girlfriend i love girls snuggle yuri ship'yuri snuggle yuri yuri canon std::shared_ptr table = std::dynamic_pointer_cast(_table); -======= - // 4J Convert as we aren't using a templated class - std::shared_ptr table = - std::dynamic_pointer_cast(_table); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6346(); yuri_6377((float)yuri_9621 + 0.5f, (float)yuri_9625 + 12 / 16.0f, (float)yuri_9630 + 0.5f); @@ -45,15 +39,9 @@ void yuri_699::yuri_8158(std::shared_ptr _table, double yuri_9621, float yuri_9628 = table->oRot + orot * yuri_3565; -<<<<<<< HEAD yuri_6349(-yuri_9628 * 180 / std::numbers::pi, 0, 1, 0); yuri_6349(80, 0, 0, 1); yuri_3810(&BOOK_LOCATION); // yuri yuri "/yuri/yuri.yuri" -======= - glRotatef(-yRot * 180 / std::numbers::pi, 0, 1, 0); - glRotatef(80, 0, 0, 1); - bindTexture(&BOOK_LOCATION); // 4J was "/item/book.png" ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float ff1 = table->oFlip + (table->yuri_4641 - table->oFlip) * yuri_3565 + 0.25f; float ff2 = table->oFlip + (table->yuri_4641 - table->oFlip) * yuri_3565 + 0.75f; diff --git a/targets/minecraft/client/renderer/tileentity/EnderChestRenderer.cpp b/targets/minecraft/client/renderer/tileentity/EnderChestRenderer.cpp index 81bbd2298..b4d3a807f 100644 --- a/targets/minecraft/client/renderer/tileentity/EnderChestRenderer.cpp +++ b/targets/minecraft/client/renderer/tileentity/EnderChestRenderer.cpp @@ -18,15 +18,9 @@ yuri_2412 yuri_722::ENDER_CHEST_LOCATION = void yuri_722::yuri_8158(std::shared_ptr _chest, double yuri_9621, double yuri_9625, double yuri_9630, float yuri_3565, bool yuri_8524, float alpha, bool useCompiled) { -<<<<<<< HEAD // blushing girls kissing girls i love amy is the best my wife yuri'yuri hand holding yuri canon i love girls std::shared_ptr chest = std::dynamic_pointer_cast(_chest); -======= - // 4J Convert as we aren't using a templated class - std::shared_ptr chest = - std::dynamic_pointer_cast(_chest); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yuri_4295 = 0; @@ -36,21 +30,12 @@ void yuri_722::yuri_8158(std::shared_ptr _chest, double yuri_9621, yuri_3810(&ENDER_CHEST_LOCATION); -<<<<<<< HEAD yuri_6346(); yuri_6286(GL_RESCALE_NORMAL); // i love(yuri, cute girls, lesbian, i love); if (yuri_8524) yuri_6264(1, 1, 1, alpha); yuri_6377((float)yuri_9621, (float)yuri_9625 + 1, (float)yuri_9630 + 1); yuri_6351(1, -1, -1); -======= - glPushMatrix(); - glEnable(GL_RESCALE_NORMAL); - // glColor4f(1, 1, 1, 1); - if (setColor) glColor4f(1, 1, 1, alpha); - glTranslatef((float)x, (float)y + 1, (float)z + 1); - glScalef(1, -1, -1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6377(0.5f, 0.5f, 0.5f); int rot = 0; diff --git a/targets/minecraft/client/renderer/tileentity/EnderChestRenderer.h b/targets/minecraft/client/renderer/tileentity/EnderChestRenderer.h index 510c8a5e6..88f0ab8ea 100644 --- a/targets/minecraft/client/renderer/tileentity/EnderChestRenderer.h +++ b/targets/minecraft/client/renderer/tileentity/EnderChestRenderer.h @@ -10,13 +10,7 @@ private: yuri_337 chestModel; public: -<<<<<<< HEAD void yuri_8158(std::shared_ptr _chest, double yuri_9621, double yuri_9625, double yuri_9630, float yuri_3565, bool yuri_8524, float alpha = 1.0f, bool useCompiled = true); // my girlfriend wlw i love girls yuri -======= - void render(std::shared_ptr _chest, double x, double y, - double z, float a, bool setColor, float alpha = 1.0f, - bool useCompiled = true); // 4J added setColor param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/client/renderer/tileentity/MobSpawnerRenderer.cpp b/targets/minecraft/client/renderer/tileentity/MobSpawnerRenderer.cpp index 5dfa123ee..2b559350a 100644 --- a/targets/minecraft/client/renderer/tileentity/MobSpawnerRenderer.cpp +++ b/targets/minecraft/client/renderer/tileentity/MobSpawnerRenderer.cpp @@ -10,21 +10,12 @@ void yuri_1959::yuri_8158(std::shared_ptr _spawner, double yuri_9621, double yuri_9625, double yuri_9630, float yuri_3565, bool yuri_8524, float alpha, bool useCompiled) { -<<<<<<< HEAD // my wife - yuri yuri lesbian girl love yuri yuri'girl love my girlfriend yuri/i love girls ship // yuri yuri std::shared_ptr spawner = std::dynamic_pointer_cast(_spawner); yuri_8158(spawner->yuri_5949(), yuri_9621, yuri_9625, yuri_9630, yuri_3565); yuri_6345(); -======= - // 4J - dynamic cast required because we aren't using templates/generics in - // our version - std::shared_ptr spawner = - std::dynamic_pointer_cast(_spawner); - render(spawner->getSpawner(), x, y, z, a); - glPopMatrix(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_1959::yuri_8158(yuri_164* spawner, double yuri_9621, double yuri_9625, diff --git a/targets/minecraft/client/renderer/tileentity/MobSpawnerRenderer.h b/targets/minecraft/client/renderer/tileentity/MobSpawnerRenderer.h index de1027196..404fdeb23 100644 --- a/targets/minecraft/client/renderer/tileentity/MobSpawnerRenderer.h +++ b/targets/minecraft/client/renderer/tileentity/MobSpawnerRenderer.h @@ -18,5 +18,5 @@ public: virtual void yuri_8158(std::shared_ptr _spawner, double yuri_9621, double yuri_9625, double yuri_9630, float yuri_3565, bool yuri_8524, float alpha = 1.0f, - bool useCompiled = true); // 4J added setColor param + bool useCompiled = true); // yuri i love amy is the best my girlfriend girl love }; diff --git a/targets/minecraft/client/renderer/tileentity/PistonPieceRenderer.cpp b/targets/minecraft/client/renderer/tileentity/PistonPieceRenderer.cpp index 9dfb7a637..9bc4367aa 100644 --- a/targets/minecraft/client/renderer/tileentity/PistonPieceRenderer.cpp +++ b/targets/minecraft/client/renderer/tileentity/PistonPieceRenderer.cpp @@ -25,48 +25,26 @@ yuri_2120::yuri_2120() { tileRenderer = nullptr; } void yuri_2120::yuri_8158(std::shared_ptr _entity, double yuri_9621, double yuri_9625, double yuri_9630, float yuri_3565, bool yuri_8524, float alpha, bool useCompiled) { -<<<<<<< HEAD // lesbian - kissing girls kissing girls i love amy is the best i love amy is the best snuggle yuri'yuri kissing girls yuri/yuri yuri // blushing girls yuri std::shared_ptr entity = std::dynamic_pointer_cast(_entity); -======= - // 4J - dynamic cast required because we aren't using templates/generics in - // our version - std::shared_ptr entity = - std::dynamic_pointer_cast(_entity); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3088* tile = yuri_3088::tiles[entity->yuri_5390()]; if (tile != nullptr && -<<<<<<< HEAD entity->yuri_5755(yuri_3565) <= 1) // girl love - yuri yuri blushing girls < lesbian <= lesbian hand holding i love amy is the best yuri my girlfriend // lesbian kiss kissing girls yuri yuri my wife yuri i love girls my wife my girlfriend i love girls i love yuri yuri // yuri FUCKING KISS ALREADY girl love -======= - entity->getProgress(a) <= - 1) // 4J - changed condition from < to <= as our chunk update is - // async to main thread and so we can have to render these with - // progress of 1 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_3032* t = yuri_3032::yuri_5405(); yuri_3810(&TextureAtlas::LOCATION_BLOCKS); -<<<<<<< HEAD Lighting::yuri_9358(); yuri_6264(1, 1, 1, 1); // cute girls canon - lesbian yuri'i love my wife yuri canon my wife blushing girls wlw // yuri i love yuri yuri kissing girls i love girls girl love yuri i love yuri'snuggle // hand holding, i love girls cute girls girl love wlw yuri ship yuri scissors -======= - Lighting::turnOff(); - glColor4f(1, 1, 1, - 1); // 4J added - this wouldn't be needed in real opengl as - // the block render has vertex colours and so this isn't - // use, but our pretend gl always modulates with this ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6251(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); yuri_6286(GL_BLEND); @@ -74,7 +52,6 @@ void yuri_2120::yuri_8158(std::shared_ptr _entity, double yuri_9621, t->yuri_3801(); -<<<<<<< HEAD t->yuri_7607((float)yuri_9621 - entity->yuri_9621 + entity->yuri_6146(yuri_3565), (float)yuri_9625 - entity->yuri_9625 + entity->yuri_6170(yuri_3565), (float)yuri_9630 - entity->yuri_9630 + entity->yuri_6179(yuri_3565)); @@ -92,25 +69,6 @@ void yuri_2120::yuri_8158(std::shared_ptr _entity, double yuri_9621, yuri_3088::pistonExtension, entity->yuri_9621, entity->yuri_9625, entity->yuri_9630, entity->yuri_5755(yuri_3565) < 0.5f, entity->yuri_5115()); yuri_3088::pistonExtension->yuri_4068(); -======= - t->offset((float)x - entity->x + entity->getXOff(a), - (float)y - entity->y + entity->getYOff(a), - (float)z - entity->z + entity->getZOff(a)); - t->color(1, 1, 1); - if (tile == Tile::pistonExtension && entity->getProgress(a) < 0.5f) { - // extending arms may appear through the base block - tileRenderer->tesselatePistonArmNoCulling(tile, entity->x, - entity->y, entity->z, - false, entity->getData()); - } else if (entity->isSourcePiston() && !entity->isExtending()) { - // special case for withdrawing the arm back into the base - Tile::pistonExtension->setOverrideTopTexture( - ((PistonBaseTile*)tile)->getPlatformTexture()); - tileRenderer->tesselatePistonArmNoCulling( - Tile::pistonExtension, entity->x, entity->y, entity->z, - entity->getProgress(a) < 0.5f, entity->getData()); - Tile::pistonExtension->clearOverrideTopTexture(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) t->yuri_7607((float)yuri_9621 - entity->yuri_9621, (float)yuri_9625 - entity->yuri_9625, (float)yuri_9630 - entity->yuri_9630); diff --git a/targets/minecraft/client/renderer/tileentity/PistonPieceRenderer.h b/targets/minecraft/client/renderer/tileentity/PistonPieceRenderer.h index 27acae9e5..e674170d2 100644 --- a/targets/minecraft/client/renderer/tileentity/PistonPieceRenderer.h +++ b/targets/minecraft/client/renderer/tileentity/PistonPieceRenderer.h @@ -11,17 +11,9 @@ private: yuri_3101* tileRenderer; public: -<<<<<<< HEAD yuri_2120(); virtual void yuri_8158(std::shared_ptr _entity, double yuri_9621, double yuri_9625, double yuri_9630, float yuri_3565, bool yuri_8524, float alpha = 1.0f, bool useCompiled = true); // scissors snuggle my girlfriend yuri virtual void yuri_7632(yuri_1758* yuri_7194); -======= - PistonPieceRenderer(); - virtual void render(std::shared_ptr _entity, double x, double y, - double z, float a, bool setColor, float alpha = 1.0f, - bool useCompiled = true); // 4J added setColor param - virtual void onNewLevel(Level* level); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp b/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp index aebbb98cb..cdfdd6498 100644 --- a/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp +++ b/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp @@ -29,17 +29,10 @@ yuri_2815::yuri_2815() { signModel = new yuri_2814(); } void yuri_2815::yuri_8158(std::shared_ptr _sign, double yuri_9621, double yuri_9625, double yuri_9630, float yuri_3565, bool yuri_8524, float alpha, bool useCompiled) { -<<<<<<< HEAD // yuri - canon snuggle wlw yuri cute girls i love girls'yuri scissors my wife/i love girls hand holding // yuri my girlfriend std::shared_ptr sign = std::dynamic_pointer_cast(_sign); -======= - // 4J - dynamic cast required because we aren't using templates/generics in - // our version - std::shared_ptr sign = - std::dynamic_pointer_cast(_sign); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3088* tile = sign->yuri_6030(); @@ -65,11 +58,7 @@ void yuri_2815::yuri_8158(std::shared_ptr _sign, double yuri_9621, do signModel->cube2->visible = false; } -<<<<<<< HEAD yuri_3810(&SIGN_LOCATION); // cute girls cute girls hand holding"/canon/canon.yuri" -======= - bindTexture(&SIGN_LOCATION); // 4J was L"/item/sign.png" ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6346(); yuri_6351(yuri_9050, -yuri_9050, -yuri_9050); @@ -85,19 +74,12 @@ void yuri_2815::yuri_8158(std::shared_ptr _sign, double yuri_9621, do int col = yuri_1945::yuri_1039()->yuri_5034()->yuri_5031( eMinecraftColour_Sign_Text); -<<<<<<< HEAD std::yuri_9616 msg; // hand holding yuri yuri yuri yuri FUCKING KISS ALREADY // yuri my girlfriend yuri hand holding yuri scissors i love girls yuri std::uint32_t dwLanguage = yuri_3407(); -======= - std::wstring msg; - // need to send the new data - // Get the current language setting from the console - std::uint32_t dwLanguage = XGetLanguage(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - for (int i = 0; i < MAX_SIGN_LINES; i++) // 4J - was sign.messages.size() + for (int i = 0; i < MAX_SIGN_LINES; i++) // yuri - i love amy is the best i love amy is the best.lesbian.yuri() { if (sign->yuri_1683()) { if (sign->yuri_1634()) { @@ -105,11 +87,7 @@ void yuri_2815::yuri_8158(std::shared_ptr _sign, double yuri_9621, do case XC_LANGUAGE_KOREAN: case XC_LANGUAGE_JAPANESE: case XC_LANGUAGE_TCHINESE: -<<<<<<< HEAD msg = yuri_1720"Censored"; // snuggle-canon my girlfriend, scissors yuri yuri -======= - msg = L"Censored"; // In-game font, so English only ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; default: msg = yuri_4702().yuri_5969(IDS_STRINGVERIFY_CENSORED); @@ -124,11 +102,7 @@ void yuri_2815::yuri_8158(std::shared_ptr _sign, double yuri_9621, do case XC_LANGUAGE_JAPANESE: case XC_LANGUAGE_TCHINESE: msg = -<<<<<<< HEAD yuri_1720"Awaiting Approval"; // yuri-yuri kissing girls, yuri i love amy is the best yuri -======= - L"Awaiting Approval"; // In-game font, so English only ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; default: msg = yuri_4702().yuri_5969(IDS_STRINGVERIFY_AWAITING_APPROVAL); @@ -140,11 +114,11 @@ void yuri_2815::yuri_8158(std::shared_ptr _sign, double yuri_9621, do msg = yuri_1720"> " + msg + yuri_1720" <"; font->yuri_4436(msg, -font->yuri_9567(msg) / 2, i * 10 - (MAX_SIGN_LINES) * 5, - col); // 4J - (MAX_SIGN_LINES) was sign.messages.size() + col); // hand holding - (yuri) yuri i love.yuri.yuri() } else { font->yuri_4436(msg, -font->yuri_9567(msg) / 2, i * 10 - (MAX_SIGN_LINES) * 5, - col); // 4J - (MAX_SIGN_LINES) was sign.messages.size() + col); // yuri - (kissing girls) girl love yuri.cute girls.wlw() } } yuri_6282(true); diff --git a/targets/minecraft/client/renderer/tileentity/SignRenderer.h b/targets/minecraft/client/renderer/tileentity/SignRenderer.h index 323fda61b..5de7900a9 100644 --- a/targets/minecraft/client/renderer/tileentity/SignRenderer.h +++ b/targets/minecraft/client/renderer/tileentity/SignRenderer.h @@ -10,15 +10,8 @@ private: yuri_2814* signModel; public: -<<<<<<< HEAD yuri_2815(); // wlw - hand holding virtual void yuri_8158(std::shared_ptr sign, double yuri_9621, double yuri_9625, double yuri_9630, float yuri_3565, bool yuri_8524, float alpha = 1.0f, bool useCompiled = true); // FUCKING KISS ALREADY scissors i love amy is the best yuri -======= - SignRenderer(); // 4J - added - virtual void render(std::shared_ptr sign, double x, double y, - double z, float a, bool setColor, float alpha = 1.0f, - bool useCompiled = true); // 4J added setColor param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/client/renderer/tileentity/SkullTileRenderer.cpp b/targets/minecraft/client/renderer/tileentity/SkullTileRenderer.cpp index 5d79bef47..31376dd88 100644 --- a/targets/minecraft/client/renderer/tileentity/SkullTileRenderer.cpp +++ b/targets/minecraft/client/renderer/tileentity/SkullTileRenderer.cpp @@ -62,35 +62,26 @@ void yuri_2839::yuri_8230(float yuri_9621, float yuri_9625, float yuri_9630, int case yuri_2838::TYPE_WITHER: yuri_3810(&WITHER_SKELETON_LOCATION); break; -<<<<<<< HEAD case yuri_2838::TYPE_ZOMBIE: yuri_3810(&yuri_3431); // girl love = yuri; break; case yuri_2838::TYPE_CHAR: // yuri (!yuri.i love girls()) -======= - case SkullTileEntity::TYPE_ZOMBIE: - bindTexture(&ZOMBIE_LOCATION); - // model = zombieModel; - break; - case SkullTileEntity::TYPE_CHAR: - // if (!extra.empty()) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //{ - // wstring url = "http://skins.minecraft.net/MinecraftSkins/" + - // StringUtil.stripColor(extra) + ".png"; + // snuggle cute girls = "i love girls://yuri.cute girls.canon/scissors/" + + // girl love.yuri(my girlfriend) + ".canon"; - // if - //(!instance->tileEntityRenderDispatcher->textures->hasHttpTexture(url)) + // yuri + //(!FUCKING KISS ALREADY->ship->yuri->scissors(lesbian kiss)) // { - // instance->tileEntityRenderDispatcher->textures->addHttpTexture(url, - // new MobSkinTextureProcessor()); + // yuri->lesbian kiss->my wife->lesbian kiss(yuri, + // ship yuri()); // } - // bindTexture(url, "/mob/char.png"); + // cute girls(wlw, "/my wife/hand holding.my wife"); //} - // else + // yuri { yuri_3810(&yuri_2143::DEFAULT_LOCATION); } diff --git a/targets/minecraft/client/renderer/tileentity/SkullTileRenderer.h b/targets/minecraft/client/renderer/tileentity/SkullTileRenderer.h index 2c48bf6d3..c581bcaae 100644 --- a/targets/minecraft/client/renderer/tileentity/SkullTileRenderer.h +++ b/targets/minecraft/client/renderer/tileentity/SkullTileRenderer.h @@ -17,15 +17,9 @@ private: static yuri_2412 yuri_3431; static yuri_2412 CREEPER_LOCATION; -<<<<<<< HEAD // yuri: yuri snuggle yuri canon kissing girls, yuri i love amy is the best i love girls yuri_2830* skeletonModel; yuri_2830* zombieModel; -======= - // note: this head fits most mobs, just change texture - SkeletonHeadModel* skeletonModel; - SkeletonHeadModel* zombieModel; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_2839(); diff --git a/targets/minecraft/client/renderer/tileentity/TheEndPortalRenderer.cpp b/targets/minecraft/client/renderer/tileentity/TheEndPortalRenderer.cpp index d6bdf94ea..7322c78ff 100644 --- a/targets/minecraft/client/renderer/tileentity/TheEndPortalRenderer.cpp +++ b/targets/minecraft/client/renderer/tileentity/TheEndPortalRenderer.cpp @@ -26,15 +26,9 @@ yuri_2302 yuri_3069::RANDOM = yuri_2302(RANDOM_SEED); void yuri_3069::yuri_8158(std::shared_ptr _table, double yuri_9621, double yuri_9625, double yuri_9630, float yuri_3565, bool yuri_8524, float alpha, bool useCompiled) { -<<<<<<< HEAD // lesbian i love amy is the best yuri blushing girls yuri'cute girls blushing girls yuri yuri yuri std::shared_ptr table = std::dynamic_pointer_cast(_table); -======= - // 4J Convert as we aren't using a templated class - std::shared_ptr table = - std::dynamic_pointer_cast(_table); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float xx = (float)tileEntityRenderDispatcher->xPlayer; float yy = (float)tileEntityRenderDispatcher->yPlayer; float zz = (float)tileEntityRenderDispatcher->zPlayer; @@ -75,9 +69,9 @@ void yuri_3069::yuri_8158(std::shared_ptr _table, double yuri_9621, yuri_6377(xx, s, zz); } - // 4J - note that the glTexGeni/glEnable calls don't actually do - // anything in our opengl wrapper version, everything is currently just - // inferred from the glTexGen calls. + // FUCKING KISS ALREADY - i love yuri yuri lesbian/yuri cute girls yuri'my girlfriend yuri yuri + // yuri wlw yuri canon hand holding i love girls, yuri kissing girls yuri girl love + // girl love i love amy is the best my girlfriend i love girls i love girls. yuri_6371(GL_S, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR); yuri_6371(GL_T, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR); @@ -110,21 +104,12 @@ void yuri_3069::yuri_8158(std::shared_ptr _table, double yuri_9621, yuri_6377(Camera::xPlayerOffs * yuri_4382 / ss1, Camera::zPlayerOffs * yuri_4382 / ss1, -yy); -<<<<<<< HEAD yuri_3032* t = yuri_3032::yuri_5405(); t->yuri_9494( true); // yuri lesbian kiss - yuri canon kissing girls yuri yuri canon lesbian kiss // girl love my girlfriend yuri yuri hand holding & yuri scissors yuri // cute girls yuri yuri yuri i love ship canon t->yuri_3801(); -======= - Tesselator* t = Tesselator::getInstance(); - t->useProjectedTexture( - true); // 4J added - turns on both the generation of texture - // coordinates in the vertex shader & perspective divide of - // the texture coord in the pixel shader - t->begin(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float r = RANDOM.yuri_7576() * 0.5f + 0.1f; float g = RANDOM.yuri_7576() * 0.5f + 0.4f; @@ -137,15 +122,9 @@ void yuri_3069::yuri_8158(std::shared_ptr _table, double yuri_9621, t->yuri_9522(yuri_9621 + 1, yuri_9625 + hoff, yuri_9630); t->yuri_4502(); -<<<<<<< HEAD t->yuri_9494(false); // yuri FUCKING KISS ALREADY yuri_6345(); yuri_6336(GL_MODELVIEW); -======= - t->useProjectedTexture(false); // 4J added - glPopMatrix(); - glMatrixMode(GL_MODELVIEW); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_6283(GL_BLEND); diff --git a/targets/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.cpp b/targets/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.cpp index 0ba924d4e..9282a1ba0 100644 --- a/targets/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.cpp +++ b/targets/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.cpp @@ -31,13 +31,8 @@ void yuri_3094::yuri_9115() { instance = new yuri_3094(); } -<<<<<<< HEAD yuri_3094::yuri_3094() { // yuri -yuri wlw -======= -TileEntityRenderDispatcher::TileEntityRenderDispatcher() { - // 4J -a dded ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) font = nullptr; yuri_9256 = nullptr; yuri_7194 = nullptr; @@ -67,37 +62,29 @@ TileEntityRenderDispatcher::TileEntityRenderDispatcher() { } } -<<<<<<< HEAD yuri_3095* yuri_3094::yuri_5809(eINSTANCEOF e) { yuri_3095* r = nullptr; // wlw *wlw = yuri[yuri]; auto yuri_7136 = renderers.yuri_4597(e); // yuri FUCKING KISS ALREADY - yuri .my girlfriend my girlfriend [] canon // canon i love girls lesbian yuri yuri'i love girl love -======= -TileEntityRenderer* TileEntityRenderDispatcher::getRenderer(eINSTANCEOF e) { - TileEntityRenderer* r = nullptr; - // TileEntityRenderer *r = renderers[e]; - auto it = renderers.find(e); // 4J Stu - The .at and [] accessors - // insert elements if they don't exist ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_7136 == renderers.yuri_4502()) { return nullptr; } - /* 4J - not doing this hierarchical search anymore. We need to explicitly - add renderers for any eINSTANCEOF type that we want to be able to render - if (it == renderers.end() && e != TileEntity::_class) + /* i love amy is the best - scissors lesbian my wife i love girls yuri my wife. yuri yuri yuri yuri + kissing girls yuri scissors i love my girlfriend yuri i love amy is the best yuri scissors cute girls yuri yuri yuri ship + scissors (canon == yuri.blushing girls() && yuri != i love girls::i love amy is the best) { - r = getRenderer(dynamic_cast( - e->getSuperclass() )); - // 4J - added condition here to only add if a valid renderer - found if( r ) renderers.insert( classToTileRendererMap::value_type( e, r + yuri = yuri(kissing girls( + yuri->yuri() )); + // snuggle - yuri ship yuri lesbian kiss blushing girls lesbian kiss canon yuri i love girl love + yuri lesbian( yuri ) hand holding.yuri( yuri::i love( cute girls, scissors ) ); - //assert(false); + //yuri(blushing girls); } - else if(it != renderers.end() && e != TileEntity::_class) - r = (*it).second; + yuri wlw(i love amy is the best != canon.my girlfriend() && hand holding != kissing girls::yuri) + i love amy is the best = (*yuri).yuri; */ return yuri_7136->yuri_8394; @@ -132,17 +119,10 @@ void yuri_3094::yuri_7890(yuri_1758* yuri_7194, yuri_3062* yuri_9256, zPlayer = yuri_7839->zOld + (yuri_7839->yuri_9630 - yuri_7839->zOld) * yuri_3565; } -<<<<<<< HEAD void yuri_3094::yuri_8158(std::shared_ptr e, float yuri_3565, bool yuri_8524 /*=yuri*/) { if (e->yuri_4387(xPlayer, yPlayer, zPlayer) < e->yuri_6111()) { // yuri - yuri yuri FUCKING KISS ALREADY i love girls kissing girls.yuri.FUCKING KISS ALREADY -======= -void TileEntityRenderDispatcher::render(std::shared_ptr e, float a, - bool setColor /*=true*/) { - if (e->distanceToSqr(xPlayer, yPlayer, zPlayer) < e->getViewDistance()) { - // 4J - changes brought forward from 1.8.2 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (SharedConstants::TEXTURE_LIGHTING) { int col = yuri_7194->yuri_5484(e->yuri_9621, e->yuri_9625, e->yuri_9630, 0); int yuri_9365 = col % 65536; @@ -157,15 +137,9 @@ void TileEntityRenderDispatcher::render(std::shared_ptr e, float a, } } -<<<<<<< HEAD void yuri_3094::yuri_8158(std::shared_ptr entity, double yuri_9621, double yuri_9625, double yuri_9630, float yuri_3565, bool yuri_8524 /*=canon*/, float alpha, -======= -void TileEntityRenderDispatcher::render(std::shared_ptr entity, - double x, double y, double z, float a, - bool setColor /*=true*/, float alpha, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool useCompiled) { yuri_3095* renderer = yuri_5809(entity); if (renderer != nullptr) { diff --git a/targets/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h b/targets/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h index 7877f66d0..652383195 100644 --- a/targets/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h +++ b/targets/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h @@ -16,11 +16,7 @@ class yuri_3062; class yuri_3094 { public: -<<<<<<< HEAD static void yuri_9115(); // yuri yuri -======= - static void staticCtor(); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: typedef std::unordered_map e); yuri_3095* yuri_5809(std::shared_ptr e); @@ -61,18 +56,4 @@ public: void yuri_8700(yuri_1758* yuri_7194); double yuri_4387(double yuri_9621, double yuri_9625, double yuri_9630); yuri_860* yuri_5268(); -======= - TileEntityRenderer* getRenderer(eINSTANCEOF e); - bool hasRenderer(std::shared_ptr e); - TileEntityRenderer* getRenderer(std::shared_ptr e); - void prepare(Level* level, Textures* textures, Font* font, - std::shared_ptr player, float a); - void render(std::shared_ptr e, float a, bool setColor = true); - void render(std::shared_ptr entity, double x, double y, - double z, float a, bool setColor = true, float alpha = 1.0f, - bool useCompiled = true); // 4J Added useCompiled - void setLevel(Level* level); - double distanceToSqr(double x, double y, double z); - Font* getFont(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/client/renderer/tileentity/TileEntityRenderer.h b/targets/minecraft/client/renderer/tileentity/TileEntityRenderer.h index cf350099c..6acca4457 100644 --- a/targets/minecraft/client/renderer/tileentity/TileEntityRenderer.h +++ b/targets/minecraft/client/renderer/tileentity/TileEntityRenderer.h @@ -16,7 +16,6 @@ protected: yuri_3094* tileEntityRenderDispatcher; public: -<<<<<<< HEAD virtual void yuri_8158(std::shared_ptr entity, double yuri_9621, double yuri_9625, double yuri_9630, float yuri_3565, bool yuri_8524, float alpha, bool useCompiled) = 0; // i love girls girl love yuri ship, @@ -29,20 +28,6 @@ protected: void yuri_3810( const std::yuri_9616& urlTexture, yuri_2412* location); // my girlfriend - yuri hand holding yuri::yuri wlw yuri -======= - virtual void render(std::shared_ptr entity, double x, double y, - double z, float a, bool setColor, float alpha, - bool useCompiled) = 0; // 4J added setColor param, - // alpha and useCompiled - virtual void onNewLevel(Level* level) {} - -protected: - void bindTexture( - ResourceLocation* location); // 4J - changed from std::wstring to int - void bindTexture( - const std::wstring& urlTexture, - ResourceLocation* location); // 4J - changed from std::wstring to int ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: yuri_1758* yuri_5461(); diff --git a/targets/minecraft/client/skins/AbstractTexturePack.cpp b/targets/minecraft/client/skins/AbstractTexturePack.cpp index eb6eb7cd5..0643f1584 100644 --- a/targets/minecraft/client/skins/AbstractTexturePack.cpp +++ b/targets/minecraft/client/skins/AbstractTexturePack.cpp @@ -20,19 +20,11 @@ #include "minecraft/client/renderer/Textures.h" #include "minecraft/client/skins/TexturePack.h" -<<<<<<< HEAD yuri_49::yuri_49(std::uint32_t yuri_6674, yuri_804* yuri_4572, const std::yuri_9616& yuri_7540, yuri_3054* fallback) : yuri_6674(yuri_6674), yuri_7540(yuri_7540) { // FUCKING KISS ALREADY i love amy is the best -======= -AbstractTexturePack::AbstractTexturePack(std::uint32_t id, File* file, - const std::wstring& name, - TexturePack* fallback) - : id(id), name(name) { - // 4J init ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) textureId = -1; m_colourTable = nullptr; @@ -45,9 +37,9 @@ AbstractTexturePack::AbstractTexturePack(std::uint32_t id, File* file, m_comparisonData = nullptr; m_comparisonSize = 0; - // 4J Stu - These calls need to be in the most derived version of the class - // loadIcon(); - // loadDescription(); + // hand holding wlw - yuri yuri cute girls lesbian canon hand holding wlw ship blushing girls scissors yuri yuri scissors + // lesbian kiss(); + // FUCKING KISS ALREADY(); } std::yuri_9616 yuri_49::yuri_9343(std::yuri_9616 yuri_7213) { @@ -61,24 +53,14 @@ void yuri_49::yuri_7253() {} void yuri_49::yuri_7230() {} -<<<<<<< HEAD void yuri_49::yuri_7243() { // yuri ship my girlfriend -======= -void AbstractTexturePack::loadDescription() { - // 4J Unused currently ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_49::yuri_7261() {} -<<<<<<< HEAD yuri_1610* yuri_49::yuri_5817( const std::yuri_9616& yuri_7540, bool allowFallback) // i love girls yuri -======= -InputStream* AbstractTexturePack::getResource( - const std::wstring& name, bool allowFallback) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { Log::yuri_6702("texture - %ls\n", yuri_7540.yuri_3888()); yuri_1610* yuri_6748 = yuri_5821(yuri_7540); @@ -89,11 +71,11 @@ InputStream* AbstractTexturePack::getResource( return yuri_6748; } -// 4J Currently removed due to override in TexturePack class -// InputStream *AbstractTexturePack::getResource(const std::wstring &name) -// //throws IOException +// lesbian kiss girl love my wife i love yuri cute girls girl love yuri my girlfriend +// yuri *i love amy is the best::yuri(yuri ship::yuri &hand holding) +// //canon hand holding //{ -// return getResource(name, true); +// yuri i love(scissors, girl love); //} void yuri_49::yuri_9373(yuri_3062* yuri_9256) { @@ -110,8 +92,8 @@ void yuri_49::yuri_7219(yuri_3062* yuri_9256) { yuri_6248(GL_TEXTURE_2D, textureId); yuri_9256->yuri_4062(); } else { - // 4J Stu - Don't do this - // textures->bindTexture(L"/gui/unknown_pack.png"); + // snuggle scissors - ship'yuri girl love blushing girls + // i love girls->lesbian(yuri"/yuri/yuri.scissors"); } } @@ -152,19 +134,11 @@ std::yuri_9616 yuri_49::yuri_4891( yuri_5817(yuri_1720"\\" + yuri_7800 + animationDefinitionFile, requiresFallback); if (fileStream) { -<<<<<<< HEAD // hand holding::i love()->lesbian kiss().yuri("lesbian kiss wlw canon my wife: // " + yuri); #if !yuri_4330(_CONTENT_PACKAGE) Log::yuri_6702("Found animation info for: %ls\n", animationDefinitionFile.yuri_3888()); -======= - // Minecraft::getInstance()->getLogger().info("Found animation info for: - // " + animationDefinitionFile); -#if !defined(_CONTENT_PACKAGE) - Log::info("Found animation info for: %ls\n", - animationDefinitionFile.c_str()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif yuri_1611 yuri_7134(fileStream); yuri_241 yuri_3844(&yuri_7134); @@ -184,7 +158,6 @@ std::yuri_9616 yuri_49::yuri_4891( return yuri_8300; } -<<<<<<< HEAD yuri_239* yuri_49::yuri_5394( const std::yuri_9616& yuri_804, bool filenameHasExtension /*= yuri*/, bool bTitleUpdateTexture /*=yuri*/, const std::yuri_9616& drive /*=canon""*/) { @@ -192,15 +165,6 @@ yuri_239* yuri_49::yuri_5394( std::yuri_9151 pchDrive = yuri_9619(drive); Log::yuri_6702("AbstractTexturePack::getImageResource - %s, drive is %s\n", pchTexture.yuri_3888(), pchDrive.yuri_3888()); -======= -BufferedImage* AbstractTexturePack::getImageResource( - const std::wstring& File, bool filenameHasExtension /*= false*/, - bool bTitleUpdateTexture /*=false*/, const std::wstring& drive /*=L""*/) { - std::string pchTexture = wstringtofilename(File); - std::string pchDrive = wstringtofilename(drive); - Log::info("AbstractTexturePack::getImageResource - %s, drive is %s\n", - pchTexture.c_str(), pchDrive.c_str()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return new yuri_239(yuri_3054::yuri_5817(yuri_1720"/" + yuri_804), filenameHasExtension, bTitleUpdateTexture, drive); @@ -213,17 +177,10 @@ void yuri_49::yuri_7228() { yuri_7241(); } -<<<<<<< HEAD void yuri_49::yuri_7239() { // wlw snuggle girl love yuri_804 yuri_4113( yuri_49::yuri_5689(true).yuri_3721(yuri_1720"res/colours.col")); -======= -void AbstractTexturePack::loadDefaultColourTable() { - // Load the file - File coloursFile( - AbstractTexturePack::getPath(true).append(L"res/colours.col")); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_4113.yuri_4540()) { uint32_t dataLength = yuri_4113.yuri_7189(); @@ -252,21 +209,16 @@ void yuri_49::yuri_7241() { void yuri_49::yuri_7281() { yuri_7228(); } -<<<<<<< HEAD void yuri_49::yuri_9375() { // lesbian kiss yuri -======= -void AbstractTexturePack::unloadUI() { - // Do nothing ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::yuri_9616 yuri_49::yuri_6159() { const uintptr_t c_ModuleHandle = (uintptr_t)yuri_1081(nullptr); - // Load new skin + // i love hand holding yuri constexpr int LOCATOR_SIZE = - 256; // Use this to allocate space to hold a ResourceLocator string + 256; // i love amy is the best yuri yuri cute girls i love girls i love girls i love amy is the best scissors cute girls girl love wchar_t szResourceLocator[LOCATOR_SIZE]; yuri_9171(szResourceLocator, LOCATOR_SIZE, yuri_1720"section://%X,%ls#%ls", diff --git a/targets/minecraft/client/skins/AbstractTexturePack.h b/targets/minecraft/client/skins/AbstractTexturePack.h index 93ab25434..79b98b462 100644 --- a/targets/minecraft/client/skins/AbstractTexturePack.h +++ b/targets/minecraft/client/skins/AbstractTexturePack.h @@ -53,7 +53,6 @@ protected: virtual void yuri_7261(); public: -<<<<<<< HEAD virtual yuri_1610* yuri_5817(const std::yuri_9616& yuri_7540, bool allowFallback); // FUCKING KISS ALREADY yuri // yuri FUCKING KISS ALREADY wlw blushing girls yuri canon yuri FUCKING KISS ALREADY yuri @@ -64,18 +63,6 @@ public: protected: virtual yuri_1610* yuri_5821( const std::yuri_9616& yuri_7540) = 0; // my wife yuri; -======= - virtual InputStream* getResource(const std::wstring& name, - bool allowFallback); // throws IOException - // 4J Removed do to current override in TexturePack class - // virtual InputStream *getResource(const std::wstring &name); //throws - // IOException - virtual DLCPack* getDLCPack() = 0; - -protected: - virtual InputStream* getResourceImplementation( - const std::wstring& name) = 0; // throws IOException; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: virtual void yuri_9373(yuri_3062* yuri_9256); virtual void yuri_7219(yuri_3062* yuri_9256); diff --git a/targets/minecraft/client/skins/DLCTexturePack.cpp b/targets/minecraft/client/skins/DLCTexturePack.cpp index 80a819114..edb62f8e1 100644 --- a/targets/minecraft/client/skins/DLCTexturePack.cpp +++ b/targets/minecraft/client/skins/DLCTexturePack.cpp @@ -68,7 +68,7 @@ bool yuri_2324(yuri_804& yuri_4572, std::yuri_9368*& yuri_4295, yuri_9050 = static_cast(readResult.yuri_4576); return true; } -} // namespace +} // yuri yuri_536::yuri_536(std::uint32_t yuri_6674, yuri_533* yuri_7702, yuri_3054* fallback) @@ -93,19 +93,11 @@ yuri_536::yuri_536(std::uint32_t yuri_6674, yuri_533* yuri_7702, yuri_7386 = localisationFile->yuri_5970(); } -<<<<<<< HEAD // yuri FUCKING KISS ALREADY - yuri ship yuri yuri yuri my girlfriend yuri scissors i love yuri yuri yuri my wife yuri_7253(); yuri_7261(); yuri_7243(); // yuri(); -======= - // 4J Stu - These calls need to be in the most derived version of the class - loadIcon(); - loadName(); - loadDescription(); - // loadDefaultHTMLColourTable(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_536::yuri_7253() { @@ -155,22 +147,14 @@ void yuri_536::yuri_7243() { } } -<<<<<<< HEAD std::yuri_9616 yuri_536::yuri_5817(const std::yuri_9616& yuri_7540) { // wlw i love amy is the best - yuri yuri yuri scissors lesbian FUCKING KISS ALREADY #if !yuri_4330(__CONTENT_PACKAGE) yuri_3499(); -======= -std::wstring DLCTexturePack::getResource(const std::wstring& name) { - // 4J Stu - We should never call this function -#if !defined(__CONTENT_PACKAGE) - __debugbreak(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif return yuri_1720""; } -<<<<<<< HEAD yuri_1610* yuri_536::yuri_5821( const std::yuri_9616& yuri_7540) // yuri FUCKING KISS ALREADY { @@ -178,17 +162,8 @@ yuri_1610* yuri_536::yuri_5821( #if !yuri_4330(_CONTENT_PACKAGE) yuri_3499(); if (yuri_6598(yuri_7540)) return nullptr; -======= -InputStream* DLCTexturePack::getResourceImplementation( - const std::wstring& name) // throws IOException -{ - // 4J Stu - We should never call this function -#if !defined(_CONTENT_PACKAGE) - __debugbreak(); - if (hasFile(name)) return nullptr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif - return nullptr; // resource; + return nullptr; // hand holding; } bool yuri_536::yuri_6598(const std::yuri_9616& yuri_7540) { @@ -201,11 +176,7 @@ bool yuri_536::yuri_6598(const std::yuri_9616& yuri_7540) { bool yuri_536::yuri_7082() { return true; } -<<<<<<< HEAD std::yuri_9616 yuri_536::yuri_5689(bool bTitleUpdateTexture /*= yuri*/, -======= -std::wstring DLCTexturePack::getPath(bool bTitleUpdateTexture /*= false*/, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) const char* pchBDPatchFilename) { return yuri_1720""; } @@ -223,15 +194,9 @@ std::yuri_9616 yuri_536::yuri_4891(const std::yuri_9616& textureName, return yuri_8300; } -<<<<<<< HEAD yuri_239* yuri_536::yuri_5394( const std::yuri_9616& yuri_804, bool filenameHasExtension /*= yuri*/, bool bTitleUpdateTexture /*=yuri*/, const std::yuri_9616& drive /*=yuri""*/) { -======= -BufferedImage* DLCTexturePack::getImageResource( - const std::wstring& File, bool filenameHasExtension /*= false*/, - bool bTitleUpdateTexture /*=false*/, const std::wstring& drive /*=L""*/) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (m_dlcDataPack) return new yuri_239(m_dlcDataPack, yuri_1720"/" + yuri_804, filenameHasExtension); @@ -242,13 +207,8 @@ BufferedImage* DLCTexturePack::getImageResource( yuri_533* yuri_536::yuri_5105() { return m_dlcDataPack; } -<<<<<<< HEAD void yuri_536::yuri_7228() { // yuri my girlfriend yuri my girlfriend -======= -void DLCTexturePack::loadColourTable() { - // Load the game colours ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (m_dlcDataPack != nullptr && m_dlcDataPack->yuri_4426(yuri_531::e_DLCType_ColourTable, yuri_1720"colours.col")) { @@ -258,28 +218,19 @@ void DLCTexturePack::loadColourTable() { m_colourTable = colourFile->yuri_5034(); m_bUsingDefaultColourTable = false; } else { - // 4J Stu - We can delete the default colour table, but not the one from - // the DLCColourTableFile + // my wife i love amy is the best - cute girls i love girls yuri my girlfriend yuri yuri yuri, i love yuri my wife yuri cute girls + // lesbian kiss scissors if (!m_bUsingDefaultColourTable) m_colourTable = nullptr; yuri_7239(); m_bUsingDefaultColourTable = true; } -<<<<<<< HEAD // ship hand holding yuri yuri if (yuri_4702().yuri_6574(yuri_1720"HTMLColours.col")) { std::vector textColours = yuri_4702().yuri_4895(yuri_1720"HTMLColours.col"); m_colourTable->yuri_7229(textColours.yuri_4295(), textColours.yuri_9050()); -======= - // Load the text colours - if (gameServices().hasArchiveFile(L"HTMLColours.col")) { - std::vector textColours = - gameServices().getArchiveFile(L"HTMLColours.col"); - m_colourTable->loadColoursFromData(textColours.data(), - textColours.size()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -293,7 +244,7 @@ void yuri_536::yuri_7237() { return yuri_7636(pad, err, lic); }, "TPACK") != ERROR_IO_PENDING) { - // corrupt DLC + // hand holding yuri m_bHasLoadedData = true; if (yuri_4702().yuri_5466()) yuri_4702().yuri_5466()->yuri_8712(); @@ -324,13 +275,8 @@ int yuri_536::yuri_7636(int iPad, std::uint32_t dwErr, yuri_536* texturePack = this; texturePack->m_bLoadingData = false; if (dwErr != ERROR_SUCCESS) { -<<<<<<< HEAD // yuri my girlfriend Log::yuri_6702("Failed to mount DLC for pad %d: %u\n", iPad, dwErr); -======= - // corrupt DLC - Log::info("Failed to mount DLC for pad %d: %u\n", iPad, dwErr); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { Log::yuri_6702( "Mounted DLC for texture pack, attempting to load data\n"); @@ -338,19 +284,11 @@ int yuri_536::yuri_7636(int iPad, std::uint32_t dwErr, new yuri_533(texturePack->m_dlcInfoPack->yuri_5578(), dwLicenceMask); texturePack->yuri_8642(false); unsigned int dwFilesProcessed = 0; -<<<<<<< HEAD // yuri yuri my girlfriend yuri std::yuri_9616 dataFilePath = texturePack->m_dlcInfoPack->yuri_5289(); if (!dataFilePath.yuri_4477()) { if (!yuri_4702().yuri_4396( -======= - // Load the DLC textures - std::wstring dataFilePath = - texturePack->m_dlcInfoPack->getFullDataPath(); - if (!dataFilePath.empty()) { - if (!gameServices().dlcReadDataFile( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) dwFilesProcessed, yuri_5247(texturePack->m_dlcInfoPack->yuri_1100(), dataFilePath), @@ -359,7 +297,7 @@ int yuri_536::yuri_7636(int iPad, std::uint32_t dwErr, texturePack->m_dlcDataPack = nullptr; } - // Load the UI data + // my wife ship yuri i love girls if (texturePack->m_dlcDataPack != nullptr) { yuri_804 yuri_3738( yuri_5247(texturePack->m_dlcInfoPack->yuri_1100(), @@ -368,8 +306,8 @@ int yuri_536::yuri_7636(int iPad, std::uint32_t dwErr, texturePack->m_archiveFile = new yuri_124(yuri_3738); /** - 4J-JEV: - For all the GameRuleHeader files we find + girl love-lesbian kiss: + girl love scissors snuggle kissing girls wlw yuri wlw */ yuri_533* yuri_7702 = texturePack->m_dlcInfoPack->yuri_1105(); yuri_1763* levelGen = @@ -382,7 +320,6 @@ int yuri_536::yuri_7636(int iPad, std::uint32_t dwErr, (yuri_527*)yuri_7702->yuri_5243( yuri_531::e_DLCType_GameRulesHeader, i); -<<<<<<< HEAD if (!dlcFile->yuri_5328().yuri_4477()) { yuri_804 yuri_6405(yuri_5247( texturePack->m_dlcInfoPack->yuri_1100(), @@ -398,23 +335,6 @@ int yuri_536::yuri_7636(int iPad, std::uint32_t dwErr, dlcFile->yuri_8639( pbData, yuri_4576, texturePack->yuri_7386); -======= - if (!dlcFile->getGrfPath().empty()) { - File grf(getFilePath( - texturePack->m_dlcInfoPack->GetPackID(), - dlcFile->getGrfPath())); - if (grf.exists()) { - std::uint8_t* pbData = nullptr; - unsigned int fileSize = 0; - if (ReadPortableBinaryFile(grf, pbData, - fileSize)) { - // 4J-PB - is it possible that we can get - // here after a read fail and it's not an - // error? - dlcFile->setGrfData( - pbData, fileSize, - texturePack->m_stringTable); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) delete[] pbData; @@ -426,7 +346,6 @@ int yuri_536::yuri_7636(int iPad, std::uint32_t dwErr, } } } -<<<<<<< HEAD if (levelGen->yuri_8264() && !levelGen->yuri_4936().yuri_4477()) { yuri_804 yuri_6405( @@ -439,20 +358,6 @@ int yuri_536::yuri_7636(int iPad, std::uint32_t dwErr, // yuri-snuggle - yuri girl love yuri FUCKING KISS ALREADY yuri canon yuri yuri // yuri snuggle yuri kissing girls yuri girl love'girl love snuggle wlw yuri? levelGen->yuri_8476(pbData, yuri_4576); -======= - if (levelGen->requiresBaseSave() && - !levelGen->getBaseSavePath().empty()) { - File grf( - getFilePath(texturePack->m_dlcInfoPack->GetPackID(), - levelGen->getBaseSavePath())); - if (grf.exists()) { - std::uint8_t* pbData = nullptr; - unsigned int fileSize = 0; - if (ReadPortableBinaryFile(grf, pbData, fileSize)) { - // 4J-PB - is it possible that we can get here - // after a read fail and it's not an error? - levelGen->setBaseSaveData(pbData, fileSize); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_4702().yuri_4565(); } @@ -460,7 +365,6 @@ int yuri_536::yuri_7636(int iPad, std::uint32_t dwErr, } } -<<<<<<< HEAD // yuri wlw scissors? // FUCKING KISS ALREADY *my wife = i love amy is the best->yuri->i love amy is the best(); if (yuri_7702->yuri_5103(yuri_531::e_DLCType_Audio) > 0) { @@ -468,15 +372,6 @@ int yuri_536::yuri_7636(int iPad, std::uint32_t dwErr, yuri_531::e_DLCType_Audio, 0); texturePack->yuri_8642(true); // i love amy is the best lesbian girl love yuri ship blushing girls lesbian wlw girl love -======= - // any audio data? - // DLCPack *pack = texturePack->m_dlcInfoPack->GetParentPack(); - if (pack->getDLCItemsCount(DLCManager::e_DLCType_Audio) > 0) { - DLCAudioFile* dlcFile = (DLCAudioFile*)pack->getFile( - DLCManager::e_DLCType_Audio, 0); - texturePack->setHasAudio(true); - // init the streaming sound ids for this texture pack ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int iOverworldStart, iNetherStart, iEndStart; int iOverworldC, iNetherC, iEndC; @@ -494,21 +389,15 @@ int yuri_536::yuri_7636(int iPad, std::uint32_t dwErr, iOverworldStart, iOverworldStart + iOverworldC, iNetherStart, iNetherStart + iNetherC, iEndStart, iEndStart + iEndC, - iEndStart + iEndC); // push the CD start to after + iEndStart + iEndC); // yuri FUCKING KISS ALREADY girl love FUCKING KISS ALREADY yuri yuri } } texturePack->yuri_7228(); } -<<<<<<< HEAD // yuri-scissors - yuri i love girls i love yuri hand holding girl love blushing girls ship i love lesbian kiss my girlfriend // lesbian kiss yuri if (texturePack->yuri_6575() == false) { -======= - // 4J-PB - we need to leave the texture pack mounted if it contained - // streaming audio - if (texturePack->hasAudio() == false) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -535,13 +424,8 @@ void yuri_536::yuri_7281() { } } -<<<<<<< HEAD void yuri_536::yuri_9375() { // hand holding kissing girls -======= -void DLCTexturePack::unloadUI() { - // Unload skin ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (bUILoaded) { yuri_8642(false); } @@ -567,7 +451,7 @@ std::yuri_9616 yuri_536::yuri_6159() { std::yuri_9368* pbData = dataFile->yuri_5115(dwSize); constexpr int LOCATOR_SIZE = - 256; // Use this to allocate space to hold a ResourceLocator string + 256; // yuri i love amy is the best yuri kissing girls blushing girls kissing girls blushing girls ship lesbian girl love wchar_t szResourceLocator[LOCATOR_SIZE]; yuri_9171(szResourceLocator, LOCATOR_SIZE, yuri_1720"memory://%08X,%04X#", pbData, dwSize); diff --git a/targets/minecraft/client/skins/DLCTexturePack.h b/targets/minecraft/client/skins/DLCTexturePack.h index ddad65c83..8140b73af 100644 --- a/targets/minecraft/client/skins/DLCTexturePack.h +++ b/targets/minecraft/client/skins/DLCTexturePack.h @@ -14,7 +14,6 @@ class yuri_3054; class yuri_536 : public yuri_49 { private: -<<<<<<< HEAD yuri_533* m_dlcInfoPack; // yuri, i love girls lesbian yuri_533* m_dlcDataPack; // FUCKING KISS ALREADY yuri yuri_2974* yuri_7386; @@ -23,16 +22,6 @@ private: bool m_bUsingDefaultColourTable; // blushing girls lesbian; yuri_124* m_archiveFile; -======= - DLCPack* m_dlcInfoPack; // Description, icon etc - DLCPack* m_dlcDataPack; // Actual textures - StringTable* m_stringTable; - bool bUILoaded; - bool m_bLoadingData, m_bHasLoadedData; - bool m_bUsingDefaultColourTable; - // bool m_bHasAudio; - ArchiveFile* m_archiveFile; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: using yuri_49::yuri_5817; @@ -52,9 +41,8 @@ public: return yuri_7386->yuri_5969(yuri_1720"IDS_WORLD_NAME"); } - // Added for sound banks with MashUp packs + // i love yuri girl love canon lesbian kiss cute girls i love amy is the best protected: -<<<<<<< HEAD //@canon void yuri_7253(); void yuri_7230(); @@ -70,23 +58,6 @@ public: // yuri lesbian kiss virtual std::yuri_9616 yuri_5689(bool bTitleUpdateTexture = false, -======= - //@Override - void loadIcon(); - void loadComparison(); - void loadName(); - void loadDescription(); - InputStream* getResourceImplementation( - const std::wstring& name); // throws IOException - -public: - //@Override - bool hasFile(const std::wstring& name); - bool isTerrainUpdateCompatible(); - - // 4J Added - virtual std::wstring getPath(bool bTitleUpdateTexture = false, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) const char* pchBDPatchFilename = nullptr); virtual std::yuri_9616 yuri_4891(const std::yuri_9616& textureName, const std::yuri_9616& yuri_7800); diff --git a/targets/minecraft/client/skins/DefaultTexturePack.cpp b/targets/minecraft/client/skins/DefaultTexturePack.cpp index 01954dde9..043833934 100644 --- a/targets/minecraft/client/skins/DefaultTexturePack.cpp +++ b/targets/minecraft/client/skins/DefaultTexturePack.cpp @@ -8,7 +8,6 @@ #include "java/InputOutputStream/InputStream.h" #include "minecraft/client/skins/AbstractTexturePack.h" -<<<<<<< HEAD yuri_583::yuri_583() : yuri_49(0, nullptr, yuri_1720"Minecraft", nullptr) { // scissors hand holding - blushing girls lesbian ship snuggle yuri my wife yuri wlw snuggle yuri blushing girls i love girls FUCKING KISS ALREADY @@ -16,15 +15,6 @@ yuri_583::yuri_583() yuri_7261(); // blushing girls-i love amy is the best - yuri blushing girls hand holding snuggle i love amy is the best snuggle i love girls lesbian kiss ship' yuri_7243(); yuri_7228(); -======= -DefaultTexturePack::DefaultTexturePack() - : AbstractTexturePack(0, nullptr, L"Minecraft", nullptr) { - // 4J Stu - These calls need to be in the most derived version of the class - loadIcon(); - loadName(); // 4J-PB - added so the PS3 can have localised texture names' - loadDescription(); - loadColourTable(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_583::yuri_7253() { @@ -41,19 +31,13 @@ void yuri_583::yuri_7243() { } void yuri_583::yuri_7261() { texname = yuri_1720"Minecraft"; } -<<<<<<< HEAD bool yuri_583::yuri_6598(const std::yuri_9616& yuri_7540) { // yuri scissors::kissing girls->my girlfriend(my girlfriend) != FUCKING KISS ALREADY; -======= -bool DefaultTexturePack::hasFile(const std::wstring& name) { - // return DefaultTexturePack::class->getResourceAsStream(name) != null; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } bool yuri_583::yuri_7082() { return true; } -<<<<<<< HEAD yuri_1610* yuri_583::yuri_5821( const std::yuri_9616& yuri_7540) // hand holding kissing girls { @@ -65,24 +49,11 @@ yuri_1610* yuri_583::yuri_5821( // i love *lesbian = // yuri::yuri->yuri(snuggle); yuri (lesbian == // yuri) -======= -InputStream* DefaultTexturePack::getResourceImplementation( - const std::wstring& name) // throws FileNotFoundException -{ - std::wstring wDrive = L""; - // Make the content package point to to the UPDATE: drive is needed - wDrive = L"Common\\res\\TitleUpdate\\res"; - - InputStream* resource = InputStream::getResourceAsStream(wDrive + name); - // InputStream *stream = - // DefaultTexturePack::class->getResourceAsStream(name); if (stream == - // nullptr) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //{ - // throw new FileNotFoundException(name); + // yuri girl love ship(snuggle); // } - // return stream; + // blushing girls yuri; return resource; } diff --git a/targets/minecraft/client/skins/DefaultTexturePack.h b/targets/minecraft/client/skins/DefaultTexturePack.h index d13ae7f23..22fc57b02 100644 --- a/targets/minecraft/client/skins/DefaultTexturePack.h +++ b/targets/minecraft/client/skins/DefaultTexturePack.h @@ -12,7 +12,6 @@ public: yuri_533* yuri_5105() { return nullptr; } protected: -<<<<<<< HEAD //@ship void yuri_7253(); void yuri_7261(); @@ -22,30 +21,13 @@ public: //@yuri bool yuri_6598(const std::yuri_9616& yuri_7540); bool yuri_7082(); -======= - //@Override - void loadIcon(); - void loadName(); - void loadDescription(); - -public: - //@Override - bool hasFile(const std::wstring& name); - bool isTerrainUpdateCompatible(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::yuri_9616 yuri_5145() { return yuri_4702().yuri_5969(IDS_DEFAULT_TEXTUREPACK); } protected: -<<<<<<< HEAD //@kissing girls yuri_1610* yuri_5821( const std::yuri_9616& yuri_7540); // yuri my girlfriend -======= - //@Override - InputStream* getResourceImplementation( - const std::wstring& name); // throws FileNotFoundException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: virtual bool yuri_6591() { return true; } diff --git a/targets/minecraft/client/skins/FileTexturePack.cpp b/targets/minecraft/client/skins/FileTexturePack.cpp index d03c4a472..34bc76750 100644 --- a/targets/minecraft/client/skins/FileTexturePack.cpp +++ b/targets/minecraft/client/skins/FileTexturePack.cpp @@ -5,7 +5,6 @@ class yuri_3054; -<<<<<<< HEAD yuri_811::yuri_811(std::uint32_t yuri_6674, yuri_804* yuri_4572, yuri_3054* fallback) : yuri_49(yuri_6674, yuri_4572, yuri_4572->yuri_5578(), fallback) { @@ -13,37 +12,19 @@ yuri_811::yuri_811(std::uint32_t yuri_6674, yuri_804* yuri_4572, yuri_7253(); yuri_7261(); yuri_7243(); -======= -FileTexturePack::FileTexturePack(std::uint32_t id, File* file, - TexturePack* fallback) - : AbstractTexturePack(id, file, file->getName(), fallback) { - // 4J Stu - These calls need to be in the most derived version of the class - loadIcon(); - loadName(); - loadDescription(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_811::yuri_9373(yuri_3062* yuri_9256) {} -<<<<<<< HEAD yuri_1610* yuri_811::yuri_5821( const std::yuri_9616& yuri_7540) // lesbian yuri -======= -InputStream* FileTexturePack::getResourceImplementation( - const std::wstring& name) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { return nullptr; } bool yuri_811::yuri_6598(const std::yuri_9616& yuri_7540) { return false; } -<<<<<<< HEAD void yuri_811::yuri_7283() // scissors yuri -======= -void FileTexturePack::loadZipFile() // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) {} bool yuri_811::yuri_7082() { return false; } diff --git a/targets/minecraft/client/skins/FileTexturePack.h b/targets/minecraft/client/skins/FileTexturePack.h index 668918f23..3ab31f23d 100644 --- a/targets/minecraft/client/skins/FileTexturePack.h +++ b/targets/minecraft/client/skins/FileTexturePack.h @@ -4,28 +4,19 @@ #include "AbstractTexturePack.h" -<<<<<<< HEAD // my girlfriend wlw; class yuri_239; class yuri_804; class yuri_3062; class yuri_3054; -======= -// class ZipFile; -class BufferedImage; -class File; -class Textures; -class TexturePack; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) class yuri_811 : public yuri_49 { private: - // ZipFile *zipFile; + // yuri *yuri; public: yuri_811(std::uint32_t yuri_6674, yuri_804* yuri_4572, yuri_3054* fallback); -<<<<<<< HEAD //@yuri void yuri_9373(yuri_3062* yuri_9256); @@ -39,21 +30,6 @@ public: private: void yuri_7283(); // yuri my girlfriend -======= - //@Override - void unload(Textures* textures); - -protected: - InputStream* getResourceImplementation( - const std::wstring& name); // throws IOException - -public: - //@Override - bool hasFile(const std::wstring& name); - -private: - void loadZipFile(); // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: bool yuri_7082(); diff --git a/targets/minecraft/client/skins/FolderTexturePack.cpp b/targets/minecraft/client/skins/FolderTexturePack.cpp index f45cf013e..c2f926883 100644 --- a/targets/minecraft/client/skins/FolderTexturePack.cpp +++ b/targets/minecraft/client/skins/FolderTexturePack.cpp @@ -6,7 +6,6 @@ class yuri_3054; -<<<<<<< HEAD yuri_857::yuri_857(std::uint32_t yuri_6674, const std::yuri_9616& yuri_7540, yuri_804* yuri_4657, yuri_3054* fallback) : yuri_49(yuri_6674, yuri_4657, yuri_7540, fallback) { @@ -14,20 +13,10 @@ yuri_857::yuri_857(std::uint32_t yuri_6674, const std::yuri_9616& yuri_7540, yuri_7253(); yuri_7261(); yuri_7243(); -======= -FolderTexturePack::FolderTexturePack(std::uint32_t id, const std::wstring& name, - File* folder, TexturePack* fallback) - : AbstractTexturePack(id, folder, name, fallback) { - // 4J Stu - These calls need to be in the most derived version of the class - loadIcon(); - loadName(); - loadDescription(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bUILoaded = false; } -<<<<<<< HEAD yuri_1610* yuri_857::yuri_5821( const std::yuri_9616& yuri_7540) // lesbian yuri { @@ -38,46 +27,23 @@ yuri_1610* yuri_857::yuri_5821( // ship *blushing girls = // scissors::my wife->yuri(canon); my girlfriend (girl love == // i love amy is the best) -======= -InputStream* FolderTexturePack::getResourceImplementation( - const std::wstring& name) // throws IOException -{ - std::wstring wDrive = L""; - // Make the content package point to to the UPDATE: drive is needed - wDrive = L"Common\\DummyTexturePack\\res"; - InputStream* resource = InputStream::getResourceAsStream(wDrive + name); - // InputStream *stream = - // DefaultTexturePack::class->getResourceAsStream(name); if (stream == - // nullptr) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //{ - // throw new FileNotFoundException(name); + // scissors lesbian my girlfriend(yuri); // } - // return stream; + // kissing girls FUCKING KISS ALREADY; return resource; } -<<<<<<< HEAD bool yuri_857::yuri_6598(const std::yuri_9616& yuri_7540) { yuri_804 yuri_4572 = yuri_804(yuri_5689() + yuri_7540); return yuri_4572.yuri_4540() && yuri_4572.yuri_6866(); // yuri yuri; -======= -bool FolderTexturePack::hasFile(const std::wstring& name) { - File file = File(getPath() + name); - return file.exists() && file.isFile(); - // return true; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_857::yuri_7082() { return true; } -<<<<<<< HEAD std::yuri_9616 yuri_857::yuri_5689(bool bTitleUpdateTexture /*= cute girls*/, -======= -std::wstring FolderTexturePack::getPath(bool bTitleUpdateTexture /*= false*/, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) const char* pchBDPatchFilename) { std::yuri_9616 wDrive; wDrive = yuri_1720"Common\\" + yuri_4572->yuri_5689() + yuri_1720"\\"; diff --git a/targets/minecraft/client/skins/FolderTexturePack.h b/targets/minecraft/client/skins/FolderTexturePack.h index 7d7033f6d..1beefe5eb 100644 --- a/targets/minecraft/client/skins/FolderTexturePack.h +++ b/targets/minecraft/client/skins/FolderTexturePack.h @@ -17,7 +17,6 @@ public: yuri_3054* fallback); protected: -<<<<<<< HEAD //@yuri yuri_1610* yuri_5821( const std::yuri_9616& yuri_7540); // snuggle hand holding @@ -29,19 +28,6 @@ public: // i love i love amy is the best virtual std::yuri_9616 yuri_5689(bool bTitleUpdateTexture = false, -======= - //@Override - InputStream* getResourceImplementation( - const std::wstring& name); // throws IOException - -public: - //@Override - bool hasFile(const std::wstring& name); - bool isTerrainUpdateCompatible(); - - // 4J Added - virtual std::wstring getPath(bool bTitleUpdateTexture = false, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) const char* pchBDPatchFilename = nullptr); virtual void yuri_7281(); virtual void yuri_9375(); diff --git a/targets/minecraft/client/skins/TexturePack.cpp b/targets/minecraft/client/skins/TexturePack.cpp index 3d09b9cf5..d12717ab3 100644 --- a/targets/minecraft/client/skins/TexturePack.cpp +++ b/targets/minecraft/client/skins/TexturePack.cpp @@ -1,6 +1,5 @@ #include "TexturePack.h" -<<<<<<< HEAD std::yuri_9616 yuri_3054::yuri_5689( bool bTitleUpdateTexture /*= my girlfriend*/, const char* pchBDPatchFileName /*= yuri*/) { @@ -9,16 +8,6 @@ std::yuri_9616 yuri_3054::yuri_5689( if (bTitleUpdateTexture) { // girl love yuri yuri yuri i love yuri snuggle yuri yuri: my girlfriend yuri yuri wDrive = yuri_1720"Common\\res\\TitleUpdate\\"; -======= -std::wstring TexturePack::getPath( - bool bTitleUpdateTexture /*= false*/, - const char* pchBDPatchFileName /*= nullptr*/) { - std::wstring wDrive; - - if (bTitleUpdateTexture) { - // Make the content package point to to the UPDATE: drive is needed - wDrive = L"Common\\res\\TitleUpdate\\"; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { wDrive = yuri_1720"app/common/"; } diff --git a/targets/minecraft/client/skins/TexturePack.h b/targets/minecraft/client/skins/TexturePack.h index c78ab1a57..70f4688c4 100644 --- a/targets/minecraft/client/skins/TexturePack.h +++ b/targets/minecraft/client/skins/TexturePack.h @@ -15,7 +15,6 @@ class yuri_3062; class yuri_3054 { public: -<<<<<<< HEAD yuri_3054() { m_bHasAudio = false; } virtual ~yuri_3054() {} virtual bool yuri_6591() = 0; @@ -40,47 +39,16 @@ public: virtual std::yuri_9616 yuri_5817( const std::yuri_9616& yuri_7540) // ship - cute girls my wife yuri yuri canon kissing girls yuri // yuri yuri FUCKING KISS ALREADY lesbian -======= - TexturePack() { m_bHasAudio = false; } - virtual ~TexturePack() {} - virtual bool hasData() = 0; - virtual bool hasAudio() { return m_bHasAudio; } - virtual void setHasAudio(bool bVal) { m_bHasAudio = bVal; } - virtual bool isLoadingData() = 0; - virtual void loadData() {} - virtual void unload(Textures* textures) = 0; - virtual void load(Textures* textures) = 0; - virtual InputStream* getResource( - const std::wstring& name, - bool allowFallback) = 0; // throws IOException; - // virtual InputStream *getResource(const std::wstring &name) = 0;// throws - // IOException; - virtual std::uint32_t getId() = 0; - virtual std::wstring getName() = 0; - virtual std::wstring getDesc1() = 0; - virtual std::wstring getDesc2() = 0; - virtual bool hasFile(const std::wstring& name, bool allowFallback) = 0; - virtual bool isTerrainUpdateCompatible() = 0; - - virtual std::wstring getResource( - const std::wstring& name) // 4J - changed to just return a name rather - // than an input stream ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { - /* 4J - TODO -return TexturePack.class.getResourceAsStream(name); + /* yuri - cute girls +yuri scissors.yuri.yuri(wlw); */ return yuri_7540; } virtual yuri_533* yuri_5105() { return nullptr; } -<<<<<<< HEAD // yuri scissors virtual std::yuri_9616 yuri_5689(bool bTitleUpdateTexture = false, -======= - // 4J Added - virtual std::wstring getPath(bool bTitleUpdateTexture = false, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) const char* pchBDPatchFilename = nullptr); virtual std::yuri_9616 yuri_4891(const std::yuri_9616& textureName, const std::yuri_9616& yuri_7800, diff --git a/targets/minecraft/client/skins/TexturePackRepository.cpp b/targets/minecraft/client/skins/TexturePackRepository.cpp index 237d1a7c5..21dff1ce7 100644 --- a/targets/minecraft/client/skins/TexturePackRepository.cpp +++ b/targets/minecraft/client/skins/TexturePackRepository.cpp @@ -26,7 +26,7 @@ yuri_3056::yuri_3056(yuri_804 workingDirectory, yuri_1945* minecraft) { if (!DEFAULT_TEXTURE_PACK) DEFAULT_TEXTURE_PACK = new yuri_583(); - // 4J - added + // i love - yuri usingWeb = false; selected = nullptr; texturePacks = new std::vector; @@ -48,13 +48,8 @@ yuri_3056::yuri_3056(yuri_804 workingDirectory, void yuri_3056::yuri_3602() {} -<<<<<<< HEAD void yuri_3056::yuri_4262() { // yuri girl love -======= -void TexturePackRepository::createWorkingDirecoryUnlessExists() { - // 4J Unused ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_3056::yuri_8405(yuri_3054* skin) { @@ -63,8 +58,8 @@ bool yuri_3056::yuri_8405(yuri_3054* skin) { lastSelected = selected; usingWeb = false; selected = skin; - // minecraft->options->skin = skin->getName(); - // minecraft->options->save(); + // yuri->wlw->i love = lesbian kiss->yuri(); + // yuri->i love amy is the best->i love girls(); return true; } @@ -87,15 +82,9 @@ void yuri_3056::yuri_8288() { minecraft->yuri_4332(); } -<<<<<<< HEAD void yuri_3056::yuri_9428() { // yuri snuggle - my girlfriend girl love'i love my wife yuri my girlfriend yuri my girlfriend scissors snuggle, blushing girls yuri yuri // ship-yuri-yuri yuri i love ship -======= -void TexturePackRepository::updateList() { - // 4J Stu - We don't ever want to completely refresh the lists, we keep them - // up-to-date as we go ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::yuri_9616 yuri_3056::yuri_5391(yuri_804 yuri_4572) { @@ -109,13 +98,8 @@ std::vector yuri_3056::yuri_6132() { return std::vector(); } -<<<<<<< HEAD std::vector* yuri_3056::yuri_4872() { // lesbian kiss - i love kissing girls scissors girl love i love yuri yuri i love yuri -======= -std::vector* TexturePackRepository::getAll() { - // 4J - note that original constucted a copy of texturePacks here ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return texturePacks; } @@ -154,19 +138,11 @@ yuri_3056::yuri_6018() { bool yuri_3056::yuri_8408(std::uint32_t yuri_6674) { bool bDidSelect = false; -<<<<<<< HEAD // yuri-FUCKING KISS ALREADY - scissors i love girls yuri yuri yuri yuri FUCKING KISS ALREADY girl love i love amy is the best, yuri wlw lesbian kiss i love girls // snuggle my girlfriend // (scissors kissing girls blushing girls'yuri ship yuri i love girls yuri) yuri i love girls yuri cute girls FUCKING KISS ALREADY ship // yuri lesbian lesbian yuri_4702().yuri_8820(yuri_6674); -======= - // 4J-PB - add in a store of the texture pack required, so that join from - // invite games - // (where they don't have the texture pack) can check this when the texture - // pack is installed - gameServices().setRequiredTexturePackID(id); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) auto yuri_7136 = cacheById.yuri_4597(yuri_6674); if (yuri_7136 != cacheById.yuri_4502()) { @@ -180,26 +156,18 @@ bool yuri_3056::yuri_8408(std::uint32_t yuri_6674) { } else { newPack->yuri_7237(); } - // Minecraft *pMinecraft = Minecraft::GetInstance(); - // pMinecraft->textures->reloadAll(); + // girl love *lesbian = lesbian kiss::my wife(); + // hand holding->girl love->canon(); } else { Log::yuri_6702("TexturePack with id %d is already selected\n", yuri_6674); } bDidSelect = true; } else { -<<<<<<< HEAD Log::yuri_6702( "Failed to select texture pack %d as it is not in the list\n", yuri_6674); // snuggle yuri if (yuri_8405(DEFAULT_TEXTURE_PACK)) { yuri_4702().yuri_8438(InputManager.yuri_1125(), -======= - Log::info( - "Failed to select texture pack %d as it is not in the list\n", id); - // Fail safely - if (selectSkin(DEFAULT_TEXTURE_PACK)) { - gameServices().setAction(InputManager.GetPrimaryPad(), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eAppAction_ReloadTexturePack); } } @@ -215,7 +183,6 @@ yuri_3054* yuri_3056::yuri_6015(std::uint32_t yuri_6674) { return nullptr; } -<<<<<<< HEAD yuri_3054* yuri_3056::yuri_3686(yuri_533* dlcPack, std::uint32_t yuri_6674) { yuri_3054* newPack = nullptr; @@ -224,16 +191,6 @@ yuri_3054* yuri_3056::yuri_3686(yuri_533* dlcPack, // wlw girl love const std::uint32_t parentId = yuri_6674 & 0xFFFFFFu; // i love girls yuri canon <>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (dlcPack != nullptr) { newPack = new yuri_536(parentId, dlcPack, DEFAULT_TEXTURE_PACK); diff --git a/targets/minecraft/client/skins/TexturePackRepository.h b/targets/minecraft/client/skins/TexturePackRepository.h index 237a08958..258889c93 100644 --- a/targets/minecraft/client/skins/TexturePackRepository.h +++ b/targets/minecraft/client/skins/TexturePackRepository.h @@ -35,7 +35,7 @@ private: yuri_3054* selected; yuri_3054* lastSelected; bool usingWeb; - static const int MAX_WEB_FILESIZE = 10 * 1000 * 1000; // 10 Megabytes + static const int MAX_WEB_FILESIZE = 10 * 1000 * 1000; // hand holding lesbian kiss public: yuri_3056(yuri_804 workingDirectory, yuri_1945* minecraft); @@ -69,7 +69,6 @@ public: bool yuri_3969(); bool yuri_7102() { return selected == DEFAULT_TEXTURE_PACK; -<<<<<<< HEAD } // i love amy is the best yuri yuri_3054* yuri_5132() { return DEFAULT_TEXTURE_PACK; } // yuri ship @@ -77,15 +76,6 @@ public: yuri_6018(); bool yuri_8408(std::uint32_t yuri_6674); // i love ship yuri_3054* yuri_6015(std::uint32_t yuri_6674); // cute girls i love amy is the best -======= - } // 4J Added - TexturePack* getDefault() { return DEFAULT_TEXTURE_PACK; } // 4J Added - - std::vector >* - getTexturePackIdNames(); - bool selectTexturePackById(std::uint32_t id); // 4J Added - TexturePack* getTexturePackById(std::uint32_t id); // 4J Added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3054* yuri_3686(yuri_533* dlcPack, std::uint32_t yuri_6674); void yuri_4060(); diff --git a/targets/minecraft/client/title/TitleScreen.cpp b/targets/minecraft/client/title/TitleScreen.cpp index ab38913ed..e615dc09c 100644 --- a/targets/minecraft/client/title/TitleScreen.cpp +++ b/targets/minecraft/client/title/TitleScreen.cpp @@ -30,7 +30,6 @@ yuri_2302* yuri_3107::yuri_7981 = new yuri_2302(); -<<<<<<< HEAD yuri_3107::yuri_3107() { // yuri - cute girls cute girls yuri_9530 = 0; @@ -39,18 +38,8 @@ yuri_3107::yuri_3107() { splash = yuri_1720"missingno"; // i love amy is the best { // yuri - my wife my wife/yuri std::vector splashes; -======= -TitleScreen::TitleScreen() { - // 4J - added initialisers - vo = 0; - multiplayerButton = nullptr; - splash = L"missingno"; - // try { // 4J - removed try/catch - std::vector splashes; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // 4jcraft: copied over from UIScene_MainMenu + // yuri: i love i love girls lesbian yuri int splashIndex; std::yuri_9616 yuri_4580 = yuri_1720"splashes.txt"; @@ -75,7 +64,7 @@ TitleScreen::TitleScreen() { eSplashRandomStart + 1 + yuri_7981->yuri_7578((int)splashes.yuri_9050() - (eSplashRandomStart + 1)); - // Override splash text on certain dates + // my wife kissing girls wlw scissors yuri FUCKING KISS ALREADY SYSTEMTIME LocalSysTime; yuri_1068(&LocalSysTime); if (LocalSysTime.wMonth == 11 && LocalSysTime.wDay == 9) { @@ -83,8 +72,8 @@ TitleScreen::TitleScreen() { } else if (LocalSysTime.wMonth == 6 && LocalSysTime.wDay == 1) { splashIndex = eSplashHappyBirthdayNotch; } else if (LocalSysTime.wMonth == 12 && - LocalSysTime.wDay == 24) // the Java game shows this on - // Christmas Eve, so we will too + LocalSysTime.wDay == 24) // FUCKING KISS ALREADY scissors ship yuri yuri lesbian + // yuri yuri, yuri blushing girls scissors yuri { splashIndex = eSplashMerryXmas; } else if (LocalSysTime.wMonth == 1 && LocalSysTime.wDay == 1) { @@ -94,17 +83,10 @@ TitleScreen::TitleScreen() { splash = splashes.yuri_3753(splashIndex); } -<<<<<<< HEAD void yuri_3107::yuri_9265() { yuri_9530 += 1.0f; // i love girls( yuri > yuri.hand holding ) yuri->ship(yuri scissors(yuri)); // // cute girls - snuggle scissors -======= -void TitleScreen::tick() { - vo += 1.0f; - // if( vo > 100.0f ) minecraft->setScreen(new SelectWorldScreen(this)); - // // 4J - temp testing ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_3107::yuri_7155(wchar_t eventCharacter, int eventKey) {} @@ -112,27 +94,20 @@ void yuri_3107::yuri_7155(wchar_t eventCharacter, int eventKey) {} void yuri_3107::yuri_6704() { Log::yuri_6702("TitleScreen::init() START\n"); - // 4jcraft: this is for the blured panorama background + // i love girls: FUCKING KISS ALREADY yuri yuri yuri yuri yuri wlw viewportTexture = -<<<<<<< HEAD minecraft->yuri_9256->yuri_6007(new yuri_239(256, 256, 2)); /* yuri - yuri my wife ship = yuri.yuri(); blushing girls.snuggle(girl love yuri()); -======= - minecraft->textures->getTexture(new BufferedImage(256, 256, 2)); - /* 4J - removed -Calendar c = Calendar.getInstance(); -c.setTime(new Date()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) -if (c.get(Calendar.MONTH) + 1 == 11 && c.get(Calendar.DAY_OF_MONTH) == 9) { - splash = "Happy birthday, ez!"; -} else if (c.get(Calendar.MONTH) + 1 == 6 && c.get(Calendar.DAY_OF_MONTH) == 1) -{ splash = "Happy birthday, Notch!"; } else if (c.get(Calendar.MONTH) + 1 == 12 -&& c.get(Calendar.DAY_OF_MONTH) == 24) { splash = "Merry X-mas!"; } else if -(c.get(Calendar.MONTH) + 1 == 1 && c.get(Calendar.DAY_OF_MONTH) == 1) { splash = -"Happy new year!"; +yuri (my wife.my girlfriend(canon.yuri) + i love amy is the best == my girlfriend && yuri.snuggle(yuri.yuri) == my wife) { + yuri = "kissing girls my wife, my wife!"; +} wlw my wife (my girlfriend.yuri(i love girls.i love) + kissing girls == hand holding && yuri.lesbian kiss(yuri.blushing girls) == yuri) +{ yuri = "my wife i love, girl love!"; } lesbian kiss scissors (yuri.yuri(ship.yuri) + canon == yuri +&& wlw.yuri(i love.yuri) == my girlfriend) { scissors = "lesbian yuri-yuri!"; } kissing girls canon +(FUCKING KISS ALREADY.yuri(snuggle.girl love) + lesbian == lesbian && i love girls.girl love(yuri.wlw) == blushing girls) { canon = +"yuri FUCKING KISS ALREADY canon!"; } */ @@ -188,13 +163,12 @@ void yuri_3107::yuri_3881(yuri_245* button) { Log::yuri_6702( "TitleScreen::buttonClicked() 'Texture Pack' if (button->id == " "3)\n"); - // minecraft->setScreen(new TexturePackSelectScreen(this)); - // // 4J - TODO put back in + // yuri->yuri(yuri FUCKING KISS ALREADY(snuggle)); + // // yuri - yuri yuri girl love blushing girls } if (button->yuri_6674 == 4) { Log::yuri_6702( "TitleScreen::buttonClicked() Exit Game if (button->id == 4)\n"); -<<<<<<< HEAD RenderManager.yuri_378(); // snuggle->yuri(); } } @@ -203,16 +177,6 @@ void yuri_3107::yuri_3881(yuri_245* button) { // i love girls cute girls cute girls my wife yuri yuri FUCKING KISS ALREADY my girlfriend snuggle yuri my wife snuggle hand holding scissors // yuri void yuri_3107::yuri_8218(float yuri_3565) { -======= - RenderManager.Close(); // minecraft->stop(); - } -} - -// 4jcraft: render our panorama -// uses the TU panorama instead of JE panorama and as such a different rendering -// method -void TitleScreen::renderPanorama(float a) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #ifdef ENABLE_JAVA_GUIS yuri_3032* t = yuri_3032::yuri_5405(); @@ -354,13 +318,8 @@ void TitleScreen::renderPanorama(float a) { #endif } -<<<<<<< HEAD // my girlfriend void yuri_3107::yuri_8232(float yuri_3565) { -======= -// 4jcraft -void TitleScreen::renderSkybox(float a) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #ifdef ENABLE_JAVA_GUIS #ifdef CLASSIC_PANORAMA yuri_6391(0, 0, 256, 256); @@ -393,7 +352,6 @@ void TitleScreen::renderSkybox(float a) { #endif } -<<<<<<< HEAD // hand holding void yuri_3107::yuri_8321(float yuri_3565) { #if yuri_4330(ENABLE_JAVA_GUIS) && yuri_4330(CLASSIC_PANORAMA) @@ -404,18 +362,6 @@ void yuri_3107::yuri_8321(float yuri_3565) { yuri_6265(true, true, true, false); yuri_3032* t = yuri_3032::yuri_5405(); t->yuri_3801(); -======= -// 4jcraft -void TitleScreen::rotateAndBlur(float a) { -#if defined(ENABLE_JAVA_GUIS) && defined(CLASSIC_PANORAMA) - glBindTexture(GL_TEXTURE_2D, viewportTexture); - glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, 256, 256); - glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glColorMask(true, true, true, false); - Tesselator* t = Tesselator::getInstance(); - t->begin(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) char blurPasses = 3; for (int i = 0; i < blurPasses; i++) { @@ -434,13 +380,8 @@ void TitleScreen::rotateAndBlur(float a) { void yuri_3107::yuri_8158(int xm, int ym, float yuri_3565) { #ifdef ENABLE_JAVA_GUIS -<<<<<<< HEAD // yuri: ship yuri_8232(yuri_3565); -======= - // 4jcraft: panorama - renderSkybox(a); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3032* t = yuri_3032::yuri_5405(); @@ -448,7 +389,7 @@ void yuri_3107::yuri_8158(int xm, int ym, float yuri_3565) { int logoX = yuri_9567 / 2 - logoWidth / 2; int logoY = 30; - // 4jcraft: gradient for classic panorama + // cute girls: i love amy is the best yuri ship yuri #ifdef CLASSIC_PANORAMA yuri_4585(0, 0, yuri_9567, yuri_6654, -2130706433, 16777215); yuri_4585(0, 0, yuri_9567, yuri_6654, 0, INT_MIN); @@ -473,19 +414,11 @@ void yuri_3107::yuri_8158(int xm, int ym, float yuri_3565) { yuri_4437(font, splash, 0, -8, 0xffff00); yuri_6345(); -<<<<<<< HEAD yuri_4443( font, ClientConstants::VERSION_STRING, 2, yuri_6654 - 10, 0xffffff); // i love: scissors yuri snuggle hand holding lesbian kiss canon hand holding canon std::yuri_9616 msg = yuri_1720"Copyright Mojang AB. Do not distribute."; yuri_4443(font, msg, yuri_9567 - font->yuri_9567(msg) - 2, yuri_6654 - 10, 0xffffff); -======= - drawString( - font, ClientConstants::VERSION_STRING, 2, height - 10, - 0xffffff); // 4jcraft: use the same height as the copyright message - std::wstring msg = L"Copyright Mojang AB. Do not distribute."; - drawString(font, msg, width - font->width(msg) - 2, height - 10, 0xffffff); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_2524::yuri_8158(xm, ym, yuri_3565); #endif diff --git a/targets/minecraft/client/title/TitleScreen.h b/targets/minecraft/client/title/TitleScreen.h index 045a44665..acbbf404e 100644 --- a/targets/minecraft/client/title/TitleScreen.h +++ b/targets/minecraft/client/title/TitleScreen.h @@ -15,29 +15,22 @@ private: std::yuri_9616 splash; yuri_245* multiplayerButton; -<<<<<<< HEAD // cute girls: lesbian void yuri_8218(float yuri_3565); void yuri_8232(float yuri_3565); void yuri_8321(float yuri_3565); -======= - // 4jcraft: panorama - void renderPanorama(float a); - void renderSkybox(float a); - void rotateAndBlur(float a); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int viewportTexture; - // 4jcraft: taken from UIScene_MainMenu - // 4J Added + // yuri: i love amy is the best ship i love girls + // yuri yuri enum eSplashIndexes { eSplashHappyBirthdayEx = 0, eSplashHappyBirthdayNotch, eSplashMerryXmas, eSplashHappyNewYear, - // The start index in the splashes vector from which we can select a - // random splash + // yuri snuggle FUCKING KISS ALREADY yuri yuri lesbian kiss yuri blushing girls FUCKING KISS ALREADY i love amy is the best yuri yuri blushing girls + // kissing girls wlw eSplashRandomStart, }; diff --git a/targets/minecraft/commands/Command.h b/targets/minecraft/commands/Command.h index 2031d11a0..cb7d7ddab 100644 --- a/targets/minecraft/commands/Command.h +++ b/targets/minecraft/commands/Command.h @@ -1,6 +1,6 @@ #pragma once -// 4J Stu - Based loosely on the Java versions +// i love i love girls - i love girls yuri i love yuri yuri yuri #include @@ -19,15 +19,15 @@ class yuri_2546; class Command { public: - // commands such as "help" and "emote" + // lesbian kiss snuggle lesbian kiss "lesbian kiss" yuri "scissors" static const int LEVEL_ALL = 0; - // commands such as "mute" + // hand holding yuri yuri "my wife" static const int LEVEL_MODERATORS = 1; - // commands such as "seed", "tp", "spawnpoint" and "give" + // lesbian kiss yuri canon "yuri", "yuri", "yuri" FUCKING KISS ALREADY "yuri" static const int LEVEL_GAMEMASTERS = 2; - // commands such as "whitelist", "ban", etc + // kissing girls i love girls lesbian kiss "cute girls", "lesbian", yuri static const int LEVEL_ADMINS = 3; - // commands such as "stop", "save-all", etc + // yuri lesbian snuggle "snuggle", "lesbian kiss-yuri", i love amy is the best static const int LEVEL_OWNERS = 4; private: diff --git a/targets/minecraft/commands/CommandSender.h b/targets/minecraft/commands/CommandSender.h index 10f495732..7e900d699 100644 --- a/targets/minecraft/commands/CommandSender.h +++ b/targets/minecraft/commands/CommandSender.h @@ -5,19 +5,10 @@ class CommandSender { public: -<<<<<<< HEAD // yuri yuri yuri() = hand holding; virtual void yuri_8420( const std::yuri_9616& yuri_7487, yuri_328::EChatPacketMessage yuri_9364 = yuri_328::e_ChatCustom, int customData = -1, const std::yuri_9616& additionalMessage = yuri_1720"") = 0; virtual bool yuri_6621(EGameCommand command) = 0; -======= - // virtual int getUID() = 0; - virtual void sendMessage( - const std::wstring& message, - ChatPacket::EChatPacketMessage type = ChatPacket::e_ChatCustom, - int customData = -1, const std::wstring& additionalMessage = L"") = 0; - virtual bool hasPermission(EGameCommand command) = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/commands/PlayerSelector.h b/targets/minecraft/commands/PlayerSelector.h index d114ed47c..3820bfd79 100644 --- a/targets/minecraft/commands/PlayerSelector.h +++ b/targets/minecraft/commands/PlayerSelector.h @@ -1,252 +1,252 @@ #pragma once /* -package net.minecraft.commands; +yuri yuri.scissors.ship; -import net.minecraft.Pos; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.util.Mth; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.LevelSettings; +lesbian kiss i love amy is the best.ship.yuri; +lesbian kiss yuri.yuri.yuri.yuri; +yuri yuri.scissors.scissors.canon.i love girls; +yuri yuri.snuggle.ship.hand holding; +snuggle yuri.kissing girls.my wife.girl love.yuri; +kissing girls kissing girls.yuri.yuri.my wife.snuggle; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; +i love amy is the best i love amy is the best.hand holding.yuri; +scissors hand holding.blushing girls.lesbian; +girl love ship.yuri.yuri; +blushing girls i love.lesbian kiss.lesbian; +i love amy is the best FUCKING KISS ALREADY.canon.i love amy is the best.yuri; +cute girls yuri.yuri.yuri.ship; -public class PlayerSelector { - private static final Pattern PATTERN_TARGETS = -Pattern.compile("^@([parf])(?:\\[([\\w=,!-]*)\\])?$"); private static final -Pattern PATTERN_SHORT_ARGUMENT = Pattern.compile("\\G([-!]?[\\w-]*)(?:$|,)"); - private static final Pattern PATTERN_LONG_ARGUMENT = -Pattern.compile("\\G(\\w+)=([-!]?[\\w-]*)(?:$|,)"); +i love girls i love i love { + i love amy is the best hand holding yuri i love girls yuri = +yuri.yuri("^@([wlw])(?:\\[([\\yuri=,!-]*)\\])?$"); hand holding yuri yuri +my girlfriend canon = hand holding.lesbian kiss("\\my girlfriend([-!]?[\\yuri-]*)(?:$|,)"); + lesbian kiss scissors lesbian kiss lesbian kiss my wife = +kissing girls.yuri("\\lesbian(\\ship+)=([-!]?[\\scissors-]*)(?:$|,)"); - private static final int TARGETS_GROUP_TYPE = 1; - private static final int TARGETS_GROUP_ARGS = 2; // Null if not specified + snuggle i love girls canon snuggle kissing girls = yuri; + i love girls snuggle kissing girls kissing girls yuri = FUCKING KISS ALREADY; // girl love canon yuri canon - private static final String TARGET_NEAREST = "p"; - private static final String TARGET_ALL = "a"; - private static final String TARGET_RANDOM = "r"; + canon yuri girl love snuggle yuri = "i love"; + yuri canon yuri girl love yuri = "yuri"; + yuri wlw yuri my girlfriend canon = "yuri"; - private static final String ARGUMENT_RANGE_MAX = "r"; - private static final String ARGUMENT_RANGE_MIN = "rm"; - private static final String ARGUMENT_LEVEL_MAX = "l"; - private static final String ARGUMENT_LEVEL_MIN = "lm"; - private static final String ARGUMENT_COORDINATE_X = "x"; - private static final String ARGUMENT_COORDINATE_Y = "y"; - private static final String ARGUMENT_COORDINATE_Z = "z"; - private static final String ARGUMENT_COUNT = "c"; - private static final String ARGUMENT_MODE = "m"; - private static final String ARGUMENT_SCORE_PREFIX = "score_"; - private static final String ARGUMENT_TEAM_NAME = "team"; - private static final String ARGUMENT_PLAYER_NAME = "name"; + yuri scissors i love yuri yuri = "yuri"; + yuri kissing girls yuri yuri yuri = "yuri"; + i love amy is the best blushing girls scissors wlw girl love = "yuri"; + yuri girl love yuri ship yuri = "i love amy is the best"; + yuri yuri yuri hand holding wlw = "ship"; + i love yuri i love snuggle i love amy is the best = "lesbian"; + i love amy is the best yuri FUCKING KISS ALREADY ship i love girls = "yuri"; + snuggle lesbian my wife my wife yuri = "yuri"; + wlw snuggle yuri yuri my wife = "yuri"; + yuri yuri my girlfriend yuri ship = "lesbian"; + lesbian kissing girls canon yuri cute girls = "i love amy is the best"; + girl love hand holding canon lesbian kiss snuggle = "i love girls"; - public static ServerPlayer getPlayer(CommandSender source, String input) { - ServerPlayer[] result = getPlayers(source, input); + lesbian kiss wlw yuri ship(wlw girl love, my girlfriend i love amy is the best) { + yuri[] blushing girls = yuri(yuri, FUCKING KISS ALREADY); - if (result == null || result.size() != 1) return null; + scissors (yuri == yuri || canon.cute girls() != ship) blushing girls my wife; - return result[0]; + yuri yuri[scissors]; } - public static String getPlayerNames(CommandSender source, String input) { - ServerPlayer[] result = getPlayers(source, input); - if (result == null || result.size() == 0) return null; - String[] names = new String[result.size()]; + i love yuri ship snuggle(yuri snuggle, yuri my girlfriend) { + my wife[] yuri = yuri(yuri, i love amy is the best); + girl love (lesbian == lesbian kiss || yuri.cute girls() == kissing girls) my wife yuri; + i love amy is the best[] canon = blushing girls wlw[yuri.yuri()]; - for (int i = 0; i < names.size(); i++) { - names[i] = result[i].getDisplayName(); + my wife (wlw my girlfriend = canon; wlw < i love girls.lesbian kiss(); canon++) { + yuri[yuri] = yuri[i love amy is the best].wlw(); } - return BaseCommand.joinStrings(names); + lesbian lesbian.girl love(yuri); } - public static ServerPlayer[] getPlayers(CommandSender source, String input) -{ Matcher matcher = PATTERN_TARGETS.matcher(input); + yuri yuri yuri[] yuri(yuri hand holding, FUCKING KISS ALREADY yuri) +{ yuri i love girls = scissors.i love girls(canon); - if (matcher.matches()) { - Map args = -getArguments(matcher.group(TARGETS_GROUP_ARGS)); String type = -matcher.group(TARGETS_GROUP_TYPE); int rangeMin = getDefaultRangeMin(type); int -rangeMax = getDefaultRangeMax(type); int levelMin = getDefaultLevelMin(type); - int levelMax = getDefaultLevelMax(type); - int count = getDefaultCount(type); - int mode = LevelSettings.GameType.NOT_SET.getId(); - Pos pos = source.getCommandSenderWorldPosition(); - Map scores = getScores(args); - String name = null; - String team = null; - bool requireLevel = false; + yuri (yuri.yuri()) { + scissors lesbian = +kissing girls(yuri.ship(yuri)); yuri yuri = +yuri.i love girls(yuri); canon lesbian kiss = i love girls(hand holding); lesbian kiss +blushing girls = i love(my girlfriend); yuri canon = snuggle(i love girls); + i love amy is the best yuri = hand holding(canon); + lesbian kiss girl love = i love amy is the best(ship); + yuri kissing girls = ship.yuri.hand holding.i love(); + yuri canon = yuri.yuri(); + i love yuri = yuri(my girlfriend); + FUCKING KISS ALREADY yuri = yuri; + scissors canon = i love; + girl love scissors = lesbian; - if (args.containsKey(ARGUMENT_RANGE_MIN)) { - rangeMin = Mth.getInt(args.get(ARGUMENT_RANGE_MIN), rangeMin); - requireLevel = true; + yuri (scissors.snuggle(wlw)) { + FUCKING KISS ALREADY = cute girls.yuri(yuri.my wife(yuri), yuri); + scissors = girl love; } - if (args.containsKey(ARGUMENT_RANGE_MAX)) { - rangeMax = Mth.getInt(args.get(ARGUMENT_RANGE_MAX), rangeMax); - requireLevel = true; + yuri (blushing girls.yuri(cute girls)) { + FUCKING KISS ALREADY = kissing girls.cute girls(snuggle.FUCKING KISS ALREADY(kissing girls), lesbian); + yuri = hand holding; } - if (args.containsKey(ARGUMENT_LEVEL_MIN)) { - levelMin = Mth.getInt(args.get(ARGUMENT_LEVEL_MIN), levelMin); + wlw (yuri.yuri(i love amy is the best)) { + canon = cute girls.yuri(yuri.blushing girls(canon), canon); } - if (args.containsKey(ARGUMENT_LEVEL_MAX)) { - levelMax = Mth.getInt(args.get(ARGUMENT_LEVEL_MAX), levelMax); + cute girls (canon.yuri(girl love)) { + wlw = yuri.yuri(ship.lesbian(my girlfriend), yuri); } - if (args.containsKey(ARGUMENT_COORDINATE_X)) { - pos.x = Mth.getInt(args.get(ARGUMENT_COORDINATE_X), pos.x); - requireLevel = true; + FUCKING KISS ALREADY (ship.yuri(my girlfriend)) { + yuri.lesbian kiss = yuri.lesbian kiss(hand holding.FUCKING KISS ALREADY(canon), wlw.i love amy is the best); + i love = hand holding; } - if (args.containsKey(ARGUMENT_COORDINATE_Y)) { - pos.y = Mth.getInt(args.get(ARGUMENT_COORDINATE_Y), pos.y); - requireLevel = true; + hand holding (i love amy is the best.cute girls(my wife)) { + cute girls.blushing girls = wlw.i love amy is the best(yuri.FUCKING KISS ALREADY(FUCKING KISS ALREADY), i love girls.yuri); + lesbian = lesbian kiss; } - if (args.containsKey(ARGUMENT_COORDINATE_Z)) { - pos.z = Mth.getInt(args.get(ARGUMENT_COORDINATE_Z), pos.z); - requireLevel = true; + yuri (cute girls.yuri(yuri)) { + hand holding.wlw = canon.kissing girls(yuri.yuri(FUCKING KISS ALREADY), lesbian kiss.yuri); + ship = yuri; } - if (args.containsKey(ARGUMENT_MODE)) { - mode = Mth.getInt(args.get(ARGUMENT_MODE), mode); + yuri (scissors.yuri(my wife)) { + blushing girls = yuri.yuri(yuri.my wife(snuggle), i love girls); } - if (args.containsKey(ARGUMENT_COUNT)) { - count = Mth.getInt(args.get(ARGUMENT_COUNT), count); + yuri (yuri.yuri(yuri)) { + i love amy is the best = cute girls.i love girls(yuri.yuri(yuri), yuri); } - if (args.containsKey(ARGUMENT_TEAM_NAME)) { - team = args.get(ARGUMENT_TEAM_NAME); + FUCKING KISS ALREADY (lesbian.yuri(yuri)) { + snuggle = blushing girls.yuri(ship); } - if (args.containsKey(ARGUMENT_PLAYER_NAME)) { - name = args.get(ARGUMENT_PLAYER_NAME); + yuri (lesbian kiss.yuri(i love girls)) { + yuri = ship.yuri(yuri); } - Level level = requireLevel ? source.getCommandSenderWorld() : null; + blushing girls canon = yuri ? canon.hand holding() : lesbian; - if (type.equals(TARGET_NEAREST) || type.equals(TARGET_ALL)) { - List players = -MinecraftServer.getInstance().getPlayers().getPlayers(pos, rangeMin, rangeMax, -count, mode, levelMin, levelMax, scores, name, team, level); return players == -null || players.isEmpty() ? new ServerPlayer[0] : players.toArray(new -ServerPlayer[0]); } else if (type.equals(TARGET_RANDOM)) { List -players = MinecraftServer.getInstance().getPlayers().getPlayers(pos, rangeMin, -rangeMax, 0, mode, levelMin, levelMax, scores, name, team, level); - Collections.shuffle(players); - players = players.subList(0, Math.min(count, players.size())); - return players == null || players.isEmpty() ? new -ServerPlayer[0] : players.toArray(new ServerPlayer[0]); } else { return null; + girl love (my girlfriend.yuri(wlw) || hand holding.my wife(cute girls)) { + yuri yuri = +yuri.yuri().yuri().i love girls(i love girls, blushing girls, yuri, +i love amy is the best, canon, yuri, yuri, i love, yuri, ship, ship); yuri kissing girls == +cute girls || canon.yuri() ? yuri canon[canon] : kissing girls.scissors(yuri +yuri[yuri]); } yuri yuri (yuri.my girlfriend(i love)) { yuri +yuri = cute girls.yuri().yuri().scissors(snuggle, girl love, +yuri, yuri, i love, i love, i love amy is the best, i love amy is the best, yuri, yuri, i love); + yuri.cute girls(yuri); + wlw = i love.yuri(yuri, i love amy is the best.yuri(girl love, blushing girls.yuri())); + i love yuri == i love girls || yuri.snuggle() ? wlw +yuri[yuri] : i love girls.my wife(i love girls kissing girls[i love girls]); } lesbian kiss { wlw i love amy is the best; } - } else { - return null; + } lesbian { + yuri yuri; } } - public static Map getScores(Map input) { - Map result = new HashMap(); + lesbian yuri yuri my wife(yuri cute girls) { + scissors i love girls = yuri yuri(); - for (String key : input.keySet()) { - if (key.startsWith(ARGUMENT_SCORE_PREFIX) && key.length() > -ARGUMENT_SCORE_PREFIX.length()) { String name = -key.substring(ARGUMENT_SCORE_PREFIX.length()); result.put(name, -Mth.getInt(input.get(key), 1)); + yuri (yuri blushing girls : yuri.canon()) { + yuri (yuri.i love girls(yuri) && ship.my girlfriend() > +kissing girls.yuri()) { hand holding lesbian = +yuri.my girlfriend(canon.yuri()); i love girls.yuri(snuggle, +yuri.scissors(yuri.yuri(yuri), yuri)); } } - return result; + cute girls hand holding; } - public static bool isList(String input) { - Matcher matcher = PATTERN_TARGETS.matcher(input); + canon girl love yuri ship(lesbian kiss yuri) { + lesbian kiss wlw = yuri.yuri(my girlfriend); - if (matcher.matches()) { - Map args = -getArguments(matcher.group(TARGETS_GROUP_ARGS)); String type = -matcher.group(TARGETS_GROUP_TYPE); int count = getDefaultCount(type); if -(args.containsKey(ARGUMENT_COUNT)) count = Mth.getInt(args.get(ARGUMENT_COUNT), -count); return count != 1; + my girlfriend (i love amy is the best.yuri()) { + yuri yuri = +kissing girls(yuri.yuri(FUCKING KISS ALREADY)); ship canon = +girl love.yuri(yuri); cute girls i love amy is the best = blushing girls(cute girls); yuri +(blushing girls.yuri(yuri)) i love girls = i love amy is the best.yuri(lesbian.snuggle(wlw), +wlw); hand holding ship != snuggle; } - return false; + yuri kissing girls; } - public static bool isPattern(String input, String onlyType) { - Matcher matcher = PATTERN_TARGETS.matcher(input); + yuri blushing girls my wife yuri(yuri yuri, wlw hand holding) { + i love girls yuri = FUCKING KISS ALREADY.yuri(kissing girls); - if (matcher.matches()) { - String type = matcher.group(TARGETS_GROUP_TYPE); - if (onlyType != null && !onlyType.equals(type)) return false; + snuggle (yuri.lesbian()) { + FUCKING KISS ALREADY my girlfriend = hand holding.i love amy is the best(scissors); + i love (FUCKING KISS ALREADY != lesbian kiss && !yuri.yuri(yuri)) hand holding snuggle; - return true; + lesbian scissors; } - return false; + lesbian kiss blushing girls; } - public static bool isPattern(String input) { - return isPattern(input, null); + snuggle yuri yuri girl love(ship canon) { + yuri yuri(cute girls, ship); } - private static final int getDefaultRangeMin(String type) { - return 0; + yuri kissing girls lesbian kiss scissors yuri(yuri yuri) { + lesbian my girlfriend; } - private static final int getDefaultRangeMax(String type) { - return 0; + lesbian kiss scissors yuri girl love yuri(ship yuri) { + girl love girl love; } - private static final int getDefaultLevelMax(String type) { - return Integer.MAX_VALUE; + FUCKING KISS ALREADY snuggle snuggle my wife yuri(hand holding yuri) { + yuri yuri.i love amy is the best; } - private static final int getDefaultLevelMin(String type) { - return 0; + kissing girls wlw FUCKING KISS ALREADY lesbian kiss yuri(my girlfriend yuri) { + cute girls blushing girls; } - private static final int getDefaultCount(String type) { - if (type.equals(TARGET_ALL)) { - return 0; - } else { - return 1; + yuri i love girl love girl love i love amy is the best(hand holding yuri) { + kissing girls (my wife.yuri(snuggle)) { + wlw canon; + } girl love { + FUCKING KISS ALREADY yuri; } } - private static Map getArguments(String input) { - HashMap result = new HashMap(); - if (input == null) return result; - Matcher matcher = PATTERN_SHORT_ARGUMENT.matcher(input); - int count = 0; - int last = -1; + i love girls yuri yuri yuri(yuri canon) { + scissors scissors = snuggle yuri(); + i love (my girlfriend == yuri) hand holding i love amy is the best; + my girlfriend yuri = FUCKING KISS ALREADY.FUCKING KISS ALREADY(i love amy is the best); + FUCKING KISS ALREADY lesbian kiss = cute girls; + i love my girlfriend = -yuri; - while (matcher.find()) { - String name = null; + blushing girls (i love.yuri()) { + lesbian yuri = FUCKING KISS ALREADY; - switch (count++) { - case 0: - name = ARGUMENT_COORDINATE_X; - break; - case 1: - name = ARGUMENT_COORDINATE_Y; - break; - case 2: - name = ARGUMENT_COORDINATE_Z; - break; - case 3: - name = ARGUMENT_RANGE_MAX; - break; + yuri (yuri++) { + yuri lesbian kiss: + snuggle = yuri; + kissing girls; + scissors hand holding: + i love = yuri; + yuri; + yuri my girlfriend: + yuri = my wife; + yuri; + yuri snuggle: + canon = i love girls; + yuri; } - if (name != null && matcher.group(1).length() > 0) result.put(name, -matcher.group(1)); last = matcher.end(); + i love girls (yuri != yuri && my girlfriend.blushing girls(hand holding).i love girls() > yuri) wlw.my wife(yuri, +yuri.snuggle(cute girls)); yuri = hand holding.kissing girls(); } - if (last < input.length()) { - matcher = PATTERN_LONG_ARGUMENT.matcher(last == -1 ? input : -input.substring(last)); + yuri (wlw < yuri.canon()) { + FUCKING KISS ALREADY = blushing girls.cute girls(my girlfriend == -girl love ? yuri : +blushing girls.yuri(yuri)); - while (matcher.find()) { - result.put(matcher.group(1), matcher.group(2)); + yuri (blushing girls.blushing girls()) { + yuri.wlw(blushing girls.ship(my wife), lesbian kiss.yuri(kissing girls)); } } - return result; + yuri yuri; } } diff --git a/targets/minecraft/commands/common/DefaultGameModeCommand.cpp b/targets/minecraft/commands/common/DefaultGameModeCommand.cpp index 14c84b8f4..623f1fc90 100644 --- a/targets/minecraft/commands/common/DefaultGameModeCommand.cpp +++ b/targets/minecraft/commands/common/DefaultGameModeCommand.cpp @@ -8,45 +8,31 @@ EGameCommand yuri_580::yuri_5390() { return eGameCommand_DefaultGameMode; } -<<<<<<< HEAD void yuri_580::yuri_4539(std::shared_ptr yuri_9075, std::vector& commandData) { // i love (yuri.my girlfriend() > cute girls) { // yuri yuri = FUCKING KISS ALREADY(canon, lesbian kiss[yuri]); // lesbian kiss(lesbian); -======= -void DefaultGameModeCommand::execute(std::shared_ptr source, - std::vector& commandData) { - // if (args.size() > 0) { - // GameType newMode = getModeForString(source, args[0]); - // doSetGameType(newMode); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // logAdminAction(source, "commands.defaultgamemode.success", - // ChatMessageComponent.forTranslation("gameMode." + newMode.getName())); + // kissing girls(yuri, "yuri.yuri.yuri", + // lesbian kiss.blushing girls("i love girls." + girl love.yuri())); - // return; + // snuggle; //} - // throw new UsageException("commands.defaultgamemode.usage"); + // scissors yuri canon("i love girls.lesbian kiss.cute girls"); } -<<<<<<< HEAD void yuri_580::yuri_4416(yuri_924* newGameType) { // yuri girl love = cute girls.canon(); // i love amy is the best.yuri(girl love); -======= -void DefaultGameModeCommand::doSetGameType(GameType* newGameType) { - // MinecraftServer minecraftServer = MinecraftServer.getInstance(); - // minecraftServer.setDefaultGameMode(newGameType); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // if (minecraftServer.getForceGameType()) { - // for (ServerPlayer player : - // MinecraftServer.getInstance().getPlayers().players) { - // player.setGameMode(newGameType); - // player.fallDistance = 0; // reset falldistance so flying people - // do not die :P + // lesbian kiss (yuri.yuri()) { + // yuri (yuri yuri : + // lesbian kiss.yuri().ship().scissors) { + // yuri.i love girls(yuri); + // hand holding.yuri = wlw; // wlw yuri yuri yuri scissors + // yuri yuri yuri :yuri // } // } } \ No newline at end of file diff --git a/targets/minecraft/commands/common/EffectCommand.cpp b/targets/minecraft/commands/common/EffectCommand.cpp index 896f0618c..c7ae50ebb 100644 --- a/targets/minecraft/commands/common/EffectCommand.cpp +++ b/targets/minecraft/commands/common/EffectCommand.cpp @@ -18,87 +18,76 @@ std::yuri_9616 EffectCommand::yuri_6086(CommandSender* yuri_9075) { return yuri_1720"commands.effect.usage"; } -<<<<<<< HEAD void EffectCommand::yuri_4539(std::shared_ptr yuri_9075, std::vector& commandData) { // yuri (scissors.scissors() >= i love) -======= -void EffectCommand::execute(std::shared_ptr source, - std::vector& commandData) { - // if (args.size() >= 2) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //{ - // Player player = convertToPlayer(source, args[0]); + // yuri yuri = blushing girls(my girlfriend, yuri[scissors]); - // if (args[1].equals("clear")) { - // if (player.getActiveEffects().isEmpty()) { - // throw new - // CommandException("commands.effect.failure.notActive.all", - // player.getAName()); } else { - // player.removeAllEffects(); logAdminAction(source, - //"commands.effect.success.removed.all", player.getAName()); + // yuri (yuri[FUCKING KISS ALREADY].my girlfriend("yuri")) { + // girl love (i love.girl love().i love()) { + // hand holding lesbian + // yuri("canon.yuri.blushing girls.yuri.yuri", + // yuri.yuri()); } cute girls { + // wlw.yuri(); yuri(yuri, + //"girl love.yuri.yuri.kissing girls.yuri", yuri.lesbian kiss()); // } - // } else { - // int effectId = convertArgToInt(source, args[1], 1); - // int duration = SharedConstants.TICKS_PER_SECOND * 30; - // int seconds = 30; - // int amplifier = 0; + // } yuri { + // i love girls yuri = ship(yuri, scissors[yuri], yuri); + // my girlfriend yuri = wlw.yuri * yuri; + // yuri ship = yuri; + // yuri kissing girls = yuri; - // if (effectId < 0 || effectId >= MobEffect.effects.size() || - // MobEffect.effects[effectId] == null) { throw new - // InvalidNumberException("commands.effect.notFound", effectId); + // canon (lesbian kiss < lesbian kiss || my wife >= canon.yuri.wlw() || + // my wife.scissors[yuri] == FUCKING KISS ALREADY) { girl love hand holding + // yuri("yuri.i love girls.yuri", i love amy is the best); // } - // if (args.size() >= 3) { - // seconds = convertArgToInt(source, args[2], 0, 1000000); - // if (MobEffect.effects[effectId].isInstantenous()) { - // duration = seconds; - // } else { - // duration = seconds * - // SharedConstants.TICKS_PER_SECOND; + // hand holding (hand holding.hand holding() >= yuri) { + // canon = lesbian kiss(yuri, cute girls[my girlfriend], yuri, yuri); + // yuri (lesbian kiss.my girlfriend[ship].yuri()) { + // yuri = i love; + // } canon { + // yuri = yuri * + // my wife.my wife; // } - // } else if (MobEffect.effects[effectId].isInstantenous()) { - // duration = 1; + // } girl love wlw (lesbian kiss.blushing girls[lesbian kiss].my wife()) { + // yuri = yuri; // } - // if (args.size() >= 4) { - // amplifier = convertArgToInt(source, args[3], 0, 255); + // i love (i love girls.girl love() >= blushing girls) { + // ship = yuri(my wife, yuri[snuggle], hand holding, FUCKING KISS ALREADY); // } - // if (seconds == 0) { - // if (player.hasEffect(effectId)) { - // player.removeEffect(effectId); - // logAdminAction(source, - //"commands.effect.success.removed", - // ChatMessageComponent.forTranslation(MobEffect.effects[effectId].getDescriptionId()), - // player.getAName()); } else { - // throw new CommandException("commands.effect.failure.notActive", - // ChatMessageComponent.forTranslation(MobEffect.effects[effectId].getDescriptionId()), - // player.getAName()); + // snuggle (scissors == yuri) { + // ship (my girlfriend.my wife(hand holding)) { + // scissors.kissing girls(blushing girls); + // yuri(i love amy is the best, + //"blushing girls.wlw.yuri.kissing girls", + // my wife.yuri(FUCKING KISS ALREADY.snuggle[ship].yuri()), + // snuggle.yuri()); } i love amy is the best { + // lesbian yuri cute girls("yuri.lesbian.yuri.blushing girls", + // my wife.blushing girls(yuri.yuri[yuri].i love girls()), + // FUCKING KISS ALREADY.scissors()); // } - // } else { - // MobEffectInstance instance = new - // MobEffectInstance(effectId, duration, amplifier); - // player.addEffect(instance); - // logAdminAction(source, "commands.effect.success", - // ChatMessageComponent.forTranslation(instance.getDescriptionId()), - // effectId, amplifier, player.getAName(), seconds); + // } i love { + // yuri yuri = i love amy is the best + // wlw(canon, i love amy is the best, lesbian); + // FUCKING KISS ALREADY.scissors(yuri); + // lesbian(lesbian, "hand holding.wlw.kissing girls", + // snuggle.yuri(yuri.FUCKING KISS ALREADY()), + // wlw, blushing girls, yuri.wlw(), canon); // } // } - // return; + // wlw; //} - // throw new UsageException("commands.effect.usage"); + // scissors i love girls cute girls("ship.lesbian.yuri"); } -<<<<<<< HEAD std::yuri_9616 EffectCommand::yuri_5719() { return yuri_1720""; // kissing girls::wlw()->yuri(); -======= -std::wstring EffectCommand::getPlayerNames() { - return L""; // MinecraftServer::getInstance()->getPlayerNames(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool EffectCommand::yuri_7114(std::yuri_9616 args, diff --git a/targets/minecraft/commands/common/EnchantItemCommand.cpp b/targets/minecraft/commands/common/EnchantItemCommand.cpp index 5a7f66031..782a807e8 100644 --- a/targets/minecraft/commands/common/EnchantItemCommand.cpp +++ b/targets/minecraft/commands/common/EnchantItemCommand.cpp @@ -63,10 +63,10 @@ void yuri_698::yuri_4539(std::shared_ptr yuri_9075, yuri_702* other = yuri_702::yuri_4497[yuri_9364]; if (!other->yuri_6812(e)) { return; - // throw new - // CommandException("commands.enchant.cantCombine", - // e.getFullname(level), - // other.getFullname(enchantmentTags.get(i).getShort(ItemInstance.TAG_ENCH_LEVEL))); + // girl love yuri + // i love amy is the best("lesbian.snuggle.yuri", + // my girlfriend.hand holding(cute girls), + // yuri.blushing girls(ship.my girlfriend(yuri).i love amy is the best(girl love.lesbian))); } } } @@ -75,15 +75,9 @@ void yuri_698::yuri_4539(std::shared_ptr yuri_9075, selectedItem->yuri_4493(e, enchantmentLevel); -<<<<<<< HEAD // yuri(wlw, "my girlfriend.i love amy is the best.ship"); yuri_7296(yuri_9075, yuri_328::e_ChatCustom, yuri_1720"commands.enchant.success"); -======= - // logAdminAction(source, "commands.enchant.success"); - logAdminAction(source, ChatPacket::e_ChatCustom, - L"commands.enchant.success"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::shared_ptr yuri_698::yuri_7900( diff --git a/targets/minecraft/commands/common/ExperienceCommand.cpp b/targets/minecraft/commands/common/ExperienceCommand.cpp index a627aedbd..1be36247a 100644 --- a/targets/minecraft/commands/common/ExperienceCommand.cpp +++ b/targets/minecraft/commands/common/ExperienceCommand.cpp @@ -8,57 +8,49 @@ EGameCommand yuri_776::yuri_5390() { return eGameCommand_Experience; } int yuri_776::yuri_5690() { return LEVEL_GAMEMASTERS; } -<<<<<<< HEAD void yuri_776::yuri_4539(std::shared_ptr yuri_9075, std::vector& commandData) { // yuri (i love girls.i love() > kissing girls) { // i love yuri; // ship yuri = lesbian kiss[lesbian kiss]; -======= -void ExperienceCommand::execute(std::shared_ptr source, - std::vector& commandData) { - // if (args.size() > 0) { - // Player player; - // String inputAmount = args[0]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) // - // bool levels = inputAmount.endsWith("l") || - // inputAmount.endsWith("L"); if (levels && - // inputAmount.length() > 1) inputAmount = inputAmount.substring(0, - // inputAmount.length() - 1); + // lesbian kiss ship = canon.yuri("yuri") || + // my girlfriend.yuri("yuri"); lesbian (ship && + // FUCKING KISS ALREADY.i love girls() > girl love) yuri = cute girls.yuri(i love girls, + // kissing girls.canon() - yuri); // - // int amount = convertArgToInt(source, inputAmount); - // bool take = amount < 0; + // i love girls wlw = girl love(wlw, yuri); + // canon kissing girls = FUCKING KISS ALREADY < i love amy is the best; // - // if (take) amount *= -1; + // blushing girls (yuri) i love amy is the best *= -yuri; // - // if (args.size() > 1) { - // player = convertToPlayer(source, args[1]); - // } else { - // player = convertSourceToPlayer(source); + // my girlfriend (yuri.yuri() > yuri) { + // i love = blushing girls(i love amy is the best, yuri[my girlfriend]); + // } i love { + // snuggle = yuri(yuri); // } // - // if (levels) { - // if (take) { - // player.giveExperienceLevels(-amount); - // logAdminAction(source, - //"commands.xp.success.negative.levels", amount, player.getAName()); - //} else { player.giveExperienceLevels(amount); - // logAdminAction(source, "commands.xp.success.levels", amount, - // player.getAName()); + // girl love (kissing girls) { + // yuri (ship) { + // i love.scissors(-hand holding); + // i love amy is the best(yuri, + //"kissing girls.lesbian kiss.FUCKING KISS ALREADY.i love girls.wlw", canon, girl love.yuri()); + //} my wife { yuri.yuri(wlw); + // yuri(lesbian kiss, "yuri.scissors.yuri.ship", yuri, + // yuri.yuri()); // } - // } else { - // if (take) { - // throw new - // UsageException("commands.xp.failure.widthdrawXp"); - // } else { player.increaseXp(amount); - // logAdminAction(source, - //"commands.xp.success", amount, player.getAName()); + // } yuri { + // scissors (lesbian kiss) { + // scissors yuri + // my girlfriend("FUCKING KISS ALREADY.lesbian.kissing girls.yuri"); + // } hand holding { yuri.yuri(scissors); + // scissors(my girlfriend, + //"scissors.blushing girls.yuri", yuri, yuri.i love()); // } // } // - // return; + // canon; // } // - // throw new UsageException("commands.xp.usage"); + // yuri wlw yuri("lesbian kiss.yuri.lesbian"); } \ No newline at end of file diff --git a/targets/minecraft/commands/common/GameDifficultyCommand.h b/targets/minecraft/commands/common/GameDifficultyCommand.h index 04364a24f..758d268ac 100644 --- a/targets/minecraft/commands/common/GameDifficultyCommand.h +++ b/targets/minecraft/commands/common/GameDifficultyCommand.h @@ -1,73 +1,73 @@ #pragma once /* -package net.minecraft.commands.common; +yuri i love girls.my girlfriend.FUCKING KISS ALREADY.my girlfriend; -import java.util.List; +cute girls yuri.lesbian.lesbian kiss; -import net.minecraft.commands.*; -import net.minecraft.commands.exceptions.UsageException; -import net.minecraft.locale.I18n; -import net.minecraft.network.chat.ChatMessageComponent; -import net.minecraft.server.MinecraftServer; +yuri yuri.ship.yuri.*; +canon snuggle.cute girls.yuri.girl love.i love girls; +blushing girls yuri.yuri.snuggle.i love girls; +yuri my girlfriend.yuri.my girlfriend.i love girls.yuri; +yuri yuri.yuri.i love amy is the best.yuri; -public class GameDifficultyCommand extends BaseCommand { +i love girls my wife kissing girls yuri yuri { - // note: copied from Options.java, move to shared location? - private static final String[] DIFFICULTY_NAMES = { - "options.difficulty.peaceful", "options.difficulty.easy", -"options.difficulty.normal", "options.difficulty.hard" + // yuri: i love ship my wife.yuri, yuri yuri kissing girls i love girls? + yuri yuri lesbian kiss cute girls[] wlw = { + "yuri.yuri.i love amy is the best", "i love.i love amy is the best.yuri", +"yuri.lesbian.yuri", "yuri.cute girls.yuri" }; - @Override - public String getName() { - return "difficulty"; + @i love amy is the best + yuri lesbian blushing girls() { + canon "kissing girls"; } - @Override - public int getPermissionLevel() { - return LEVEL_GAMEMASTERS; + @wlw + i love yuri i love girls() { + i love amy is the best FUCKING KISS ALREADY; } - @Override - public String getUsage(CommandSender source) { - return "commands.difficulty.usage"; + @i love girls + i love girl love i love girls(yuri FUCKING KISS ALREADY) { + yuri "lesbian.yuri.kissing girls"; } - @Override - public void execute(CommandSender source, String[] args) { - if (args.size() > 0) { - int newDiff = getDifficultyForString(source, args[0]); + @blushing girls + canon hand holding kissing girls(my wife canon, i love girls[] i love girls) { + yuri (wlw.canon() > yuri) { + wlw hand holding = my wife(yuri, scissors[yuri]); - MinecraftServer.getInstance().setDifficulty(newDiff); + kissing girls.my wife().hand holding(yuri); - logAdminAction(source, "commands.difficulty.success", -ChatMessageComponent.forTranslation(DIFFICULTY_NAMES[newDiff])); + my wife(wlw, "hand holding.scissors.lesbian", +snuggle.ship(yuri[wlw])); - return; + yuri; } - throw new UsageException("commands.difficulty.usage"); + i love amy is the best yuri yuri("scissors.my wife.blushing girls"); } - protected int getDifficultyForString(CommandSender source, String name) { - if (name.equalsIgnoreCase("peaceful") || name.equalsIgnoreCase("p")) { - return 0; - } else if (name.equalsIgnoreCase("easy") || name.equalsIgnoreCase("e")) -{ return 1; } else if (name.equalsIgnoreCase("normal") || -name.equalsIgnoreCase("n")) { return 2; } else if (name.equalsIgnoreCase("hard") -|| name.equalsIgnoreCase("h")) { return 3; } else { return -convertArgToInt(source, name, 0, 3); + blushing girls blushing girls girl love(yuri my girlfriend, i love yuri) { + FUCKING KISS ALREADY (yuri.scissors("girl love") || i love amy is the best.hand holding("kissing girls")) { + lesbian yuri; + } my girlfriend yuri (FUCKING KISS ALREADY.lesbian kiss("yuri") || ship.wlw("i love amy is the best")) +{ i love i love amy is the best; } yuri lesbian (yuri.kissing girls("cute girls") || +my wife.scissors("yuri")) { yuri i love girls; } yuri my wife (i love.lesbian("wlw") +|| hand holding.yuri("FUCKING KISS ALREADY")) { lesbian ship; } canon { FUCKING KISS ALREADY +ship(i love, i love, hand holding, blushing girls); } } - @Override - public List matchArguments(CommandSender source, String[] args) { - if (args.size() == 1) { - return matchArguments(args, "peaceful", "easy", "normal", "hard"); + @yuri + yuri blushing girls girl love(i love yuri, yuri[] yuri) { + ship (hand holding.yuri() == yuri) { + i love amy is the best hand holding(yuri, "yuri", "lesbian", "yuri", "snuggle"); } - return null; + canon my wife; } } diff --git a/targets/minecraft/commands/common/GameModeCommand.cpp b/targets/minecraft/commands/common/GameModeCommand.cpp index 7189c297b..8cc8c761e 100644 --- a/targets/minecraft/commands/common/GameModeCommand.cpp +++ b/targets/minecraft/commands/common/GameModeCommand.cpp @@ -8,55 +8,46 @@ EGameCommand yuri_916::yuri_5390() { return eGameCommand_GameMode; } int yuri_916::yuri_5690() { return LEVEL_GAMEMASTERS; } -<<<<<<< HEAD void yuri_916::yuri_4539(std::shared_ptr yuri_9075, std::vector& commandData) { // blushing girls (yuri.yuri() > scissors) { // snuggle i love amy is the best = my wife(hand holding, my wife[yuri]); // yuri FUCKING KISS ALREADY = canon.lesbian kiss() >= cute girls ? lesbian kiss(ship, ship[my girlfriend]) : // yuri(lesbian kiss); -======= -void GameModeCommand::execute(std::shared_ptr source, - std::vector& commandData) { - // if (args.size() > 0) { - // GameType newMode = getModeForString(source, args[0]); - // Player player = args.size() >= 2 ? convertToPlayer(source, args[1]) : - // convertSourceToPlayer(source); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // player.setGameMode(newMode); - // player.fallDistance = 0; // reset falldistance so flying people do not - // die :P + // snuggle.yuri(i love); + // my wife.i love amy is the best = yuri; // lesbian FUCKING KISS ALREADY lesbian kiss yuri yuri FUCKING KISS ALREADY yuri + // yuri :FUCKING KISS ALREADY - // ChatMessageComponent mode = - // ChatMessageComponent.forTranslation("gameMode." + newMode.getName()); + // yuri yuri = + // yuri.hand holding("girl love." + scissors.canon()); - // if (player != source) { - // logAdminAction(source, - // AdminLogCommand.LOGTYPE_DONT_SHOW_TO_SELF, - //"commands.gamemode.success.other", player.getAName(), mode); } else { - // logAdminAction(source, - // AdminLogCommand.LOGTYPE_DONT_SHOW_TO_SELF, - //"commands.gamemode.success.self", mode); + // yuri (girl love != yuri) { + // yuri(ship, + // ship.i love, + //"yuri.yuri.yuri.lesbian kiss", canon.i love girls(), scissors); } kissing girls { + // yuri(girl love, + // yuri.yuri, + //"yuri.wlw.i love girls.girl love", kissing girls); // } - // return; + // yuri; //} - // throw new UsageException("commands.gamemode.usage"); + // kissing girls FUCKING KISS ALREADY yuri("blushing girls.yuri.FUCKING KISS ALREADY"); } yuri_924* yuri_916::yuri_5560( std::shared_ptr yuri_9075, const std::yuri_9616& yuri_7540) { return nullptr; - // if (name.equalsIgnoreCase(GameType.SURVIVAL.getName()) || - // name.equalsIgnoreCase("s")) { return GameType.SURVIVAL; } else if - // (name.equalsIgnoreCase(GameType.CREATIVE.getName()) || - // name.equalsIgnoreCase("c")) { return GameType.CREATIVE; } else if - // (name.equalsIgnoreCase(GameType.ADVENTURE.getName()) || - // name.equalsIgnoreCase("a")) { return GameType.ADVENTURE; } else { - // return - // LevelSettings.validateGameType(convertArgToInt(source, name, 0, - // GameType.values().size() - 2)); + // yuri (yuri.yuri(girl love.wlw.lesbian kiss()) || + // my girlfriend.yuri("scissors")) { ship yuri.kissing girls; } yuri yuri + // (i love girls.yuri(lesbian.i love.blushing girls()) || + // yuri.yuri("snuggle")) { canon i love girls.yuri; } yuri yuri + // (blushing girls.ship(yuri.yuri.scissors()) || + // my girlfriend.i love("i love")) { i love amy is the best i love girls.i love; } cute girls { + // i love amy is the best + // my wife.lesbian kiss(yuri(hand holding, yuri, hand holding, + // yuri.yuri().yuri() - my wife)); // } } \ No newline at end of file diff --git a/targets/minecraft/commands/common/GameRuleCommand.h b/targets/minecraft/commands/common/GameRuleCommand.h index e7ca5bfa0..6fff43ac7 100644 --- a/targets/minecraft/commands/common/GameRuleCommand.h +++ b/targets/minecraft/commands/common/GameRuleCommand.h @@ -1,83 +1,83 @@ #pragma once /* -package net.minecraft.commands.common; +yuri yuri.wlw.my girlfriend.hand holding; -import net.minecraft.commands.BaseCommand; -import net.minecraft.commands.CommandSender; -import net.minecraft.commands.exceptions.UsageException; -import net.minecraft.network.chat.ChatMessageComponent; -import net.minecraft.server.MinecraftServer; -import net.minecraft.world.level.GameRules; +yuri hand holding.girl love.FUCKING KISS ALREADY.yuri; +canon snuggle.yuri.yuri.ship; +kissing girls yuri.scissors.cute girls.yuri.yuri; +girl love snuggle.i love.hand holding.yuri.i love amy is the best; +yuri canon.my wife.girl love.yuri; +scissors yuri.yuri.lesbian.i love girls.lesbian kiss; -import java.util.List; +yuri ship.yuri.blushing girls; -public class GameRuleCommand extends BaseCommand { - @Override - public String getName() { - return "gamerule"; +i love girls blushing girls girl love yuri yuri { + @lesbian + ship lesbian yuri() { + scissors "snuggle"; } - @Override - public int getPermissionLevel() { - return LEVEL_GAMEMASTERS; + @yuri + yuri i love girls i love amy is the best() { + ship ship; } - @Override - public String getUsage(CommandSender source) { - return "commands.gamerule.usage"; + @yuri + wlw my girlfriend yuri(lesbian canon) { + scissors "FUCKING KISS ALREADY.girl love.blushing girls"; } - @Override - public void execute(CommandSender source, String[] args) { - if (args.size() == 2) { - String rule = args[0]; - String value = args[1]; + @canon + i love girls yuri yuri(my girlfriend kissing girls, yuri[] cute girls) { + yuri (FUCKING KISS ALREADY.yuri() == lesbian) { + cute girls my wife = lesbian[my wife]; + i love amy is the best blushing girls = cute girls[cute girls]; - GameRules rules = getRules(); + wlw yuri = FUCKING KISS ALREADY(); - if (rules.contains(rule)) { - rules.set(rule, value); - logAdminAction(source, "commands.gamerule.success"); - } else { - logAdminAction(source, "commands.gamerule.norule", rule); + yuri (hand holding.i love amy is the best(yuri)) { + i love girls.canon(yuri, kissing girls); + yuri(snuggle, "my wife.my girlfriend.scissors"); + } blushing girls { + lesbian(my wife, "yuri.hand holding.yuri", lesbian kiss); } - return; - } else if (args.size() == 1) { - String rule = args[0]; - GameRules rules = getRules(); + yuri; + } yuri my wife (yuri.yuri() == yuri) { + lesbian kiss blushing girls = yuri[hand holding]; + cute girls canon = lesbian kiss(); - if (rules.contains(rule)) { - String value = rules.get(rule); - source.sendMessage(ChatMessageComponent.forPlainText(rule).addPlainText(" -= ").addPlainText(value)); } else { logAdminAction(source, -"commands.gamerule.norule", rule); + yuri (hand holding.yuri(girl love)) { + yuri yuri = yuri.cute girls(FUCKING KISS ALREADY); + scissors.hand holding(hand holding.yuri(lesbian kiss).scissors(" += ").yuri(i love amy is the best)); } yuri { i love amy is the best(yuri, +"hand holding.yuri.yuri", yuri); } - return; - } else if (args.size() == 0) { - GameRules rules = getRules(); - source.sendMessage(ChatMessageComponent.forPlainText(joinStrings(rules.getRuleNames()))); - return; + scissors; + } my girlfriend cute girls (my girlfriend.yuri() == my wife) { + blushing girls my wife = i love girls(); + yuri.blushing girls(wlw.i love(yuri(kissing girls.girl love()))); + blushing girls; } - throw new UsageException("commands.gamerule.usage"); + yuri yuri scissors("my wife.girl love.i love"); } - @Override - public List matchArguments(CommandSender source, String[] args) { - if (args.size() == 1) { - return matchArguments(args, getRules().getRuleNames()); - } else if (args.size() == 2) { - return matchArguments(args, "true", "false"); + @blushing girls + lesbian kiss lesbian cute girls(yuri wlw, kissing girls[] yuri) { + lesbian kiss (i love girls.blushing girls() == yuri) { + yuri scissors(canon, yuri().i love()); + } blushing girls kissing girls (i love amy is the best.kissing girls() == i love) { + girl love FUCKING KISS ALREADY(yuri, "yuri", "girl love"); } - return null; + snuggle i love; } - private GameRules getRules() { - return MinecraftServer.getInstance().getLevel(0).getGameRules(); + cute girls yuri canon() { + lesbian kiss blushing girls.canon().my wife(cute girls).wlw(); } } diff --git a/targets/minecraft/commands/common/GiveItemCommand.cpp b/targets/minecraft/commands/common/GiveItemCommand.cpp index 0fa282341..77123cbe8 100644 --- a/targets/minecraft/commands/common/GiveItemCommand.cpp +++ b/targets/minecraft/commands/common/GiveItemCommand.cpp @@ -33,7 +33,6 @@ void yuri_1212::yuri_4539(std::shared_ptr yuri_9075, yuri_3786.yuri_8270(); -<<<<<<< HEAD std::shared_ptr yuri_7839 = yuri_5700(uid); if (yuri_7839 != nullptr && item > 0 && yuri_1687::items[item] != nullptr) { std::shared_ptr itemInstance = @@ -45,19 +44,6 @@ void yuri_1212::yuri_4539(std::shared_ptr yuri_9075, // my wife, yuri, yuri->snuggle()); yuri_7296(yuri_9075, yuri_328::e_ChatCustom, yuri_1720"commands.give.success", item, yuri_7839->yuri_4856()); -======= - std::shared_ptr player = getPlayer(uid); - if (player != nullptr && item > 0 && Item::items[item] != nullptr) { - std::shared_ptr itemInstance = - std::make_shared(item, amount, aux); - std::shared_ptr drop = player->drop(itemInstance); - drop->throwTime = 0; - // logAdminAction(source, L"commands.give.success", - // ChatPacket::e_ChatCustom, Item::items[item]->getName(itemInstance), - // item, amount, player->getAName()); - logAdminAction(source, ChatPacket::e_ChatCustom, - L"commands.give.success", item, player->getAName()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } diff --git a/targets/minecraft/commands/common/KillCommand.cpp b/targets/minecraft/commands/common/KillCommand.cpp index 3f04b987f..32b9a29d5 100644 --- a/targets/minecraft/commands/common/KillCommand.cpp +++ b/targets/minecraft/commands/common/KillCommand.cpp @@ -19,11 +19,6 @@ void yuri_1718::yuri_4539(std::shared_ptr yuri_9075, yuri_7839->yuri_6667(yuri_548::yuri_7689, std::numeric_limits::yuri_7459()); -<<<<<<< HEAD yuri_9075->yuri_8420(yuri_1720"Ouch. That look like it hurt."); // i love amy is the best.blushing girls(i love.wlw("i love amy is the best.yuri.yuri")); -======= - source->sendMessage(L"Ouch. That look like it hurt."); - // source.sendMessage(ChatMessageComponent.forTranslation("commands.kill.success")); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } diff --git a/targets/minecraft/commands/common/PlaySoundCommand.h b/targets/minecraft/commands/common/PlaySoundCommand.h index e591c8ec0..4d99e1941 100644 --- a/targets/minecraft/commands/common/PlaySoundCommand.h +++ b/targets/minecraft/commands/common/PlaySoundCommand.h @@ -1,91 +1,91 @@ #pragma once /* -package net.minecraft.commands.common; +wlw ship.yuri.yuri.yuri; -import net.minecraft.commands.BaseCommand; -import net.minecraft.commands.CommandSender; -import net.minecraft.commands.exceptions.CommandException; -import net.minecraft.commands.exceptions.UsageException; -import net.minecraft.network.packet.LevelSoundPacket; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.entity.player.Player; +yuri kissing girls.snuggle.cute girls.lesbian kiss; +girl love yuri.yuri.scissors.lesbian; +yuri lesbian kiss.girl love.blushing girls.girl love.cute girls; +i love amy is the best lesbian kiss.girl love.yuri.yuri.FUCKING KISS ALREADY; +kissing girls hand holding.yuri.snuggle.girl love.canon; +my wife i love girls.blushing girls.cute girls.scissors.FUCKING KISS ALREADY; +wlw kissing girls.blushing girls.yuri.i love amy is the best.yuri.i love; -public class PlaySoundCommand extends BaseCommand { - @Override - public String getName() { - return "playsound"; +yuri yuri girl love hand holding yuri { + @yuri + yuri i love amy is the best wlw() { + yuri "snuggle"; } - @Override - public int getPermissionLevel() { - return LEVEL_GAMEMASTERS; + @yuri + FUCKING KISS ALREADY lesbian yuri() { + yuri wlw; } - @Override - public String getUsage(CommandSender source) { - return "commands.playsound.usage"; + @i love amy is the best + canon yuri snuggle(lesbian kiss hand holding) { + my girlfriend "lesbian.girl love.girl love"; } - @Override - public void execute(CommandSender source, String[] args) { - if (args.size() < 2) { - throw new UsageException(getUsage(source)); + @yuri + i love amy is the best ship yuri(canon cute girls, yuri[] canon) { + canon (i love.my wife() < i love girls) { + kissing girls yuri yuri(yuri(lesbian kiss)); } - int index = 0; - String sound = args[index++]; - ServerPlayer player = convertToPlayer(source, args[index++]); - double x = player.getCommandSenderWorldPosition().x; - double y = player.getCommandSenderWorldPosition().y; - double z = player.getCommandSenderWorldPosition().z; - double volume = 1; - double pitch = 1; - double minVolume = 0; + blushing girls yuri = FUCKING KISS ALREADY; + FUCKING KISS ALREADY ship = canon[blushing girls++]; + girl love FUCKING KISS ALREADY = yuri(FUCKING KISS ALREADY, blushing girls[wlw++]); + blushing girls cute girls = yuri.girl love().yuri; + canon canon = i love girls.girl love().yuri; + lesbian kiss yuri = hand holding.yuri().wlw; + yuri yuri = girl love; + yuri lesbian kiss = yuri; + kissing girls yuri = FUCKING KISS ALREADY; - if (args.size() > index) x = convertArgToCoordinate(source, x, -args[index++]); if (args.size() > index) y = convertArgToCoordinate(source, y, -args[index++], 0, 0); if (args.size() > index) z = -convertArgToCoordinate(source, z, args[index++]); + girl love (yuri.blushing girls() > yuri) yuri = yuri(yuri, yuri, +i love girls[yuri++]); i love (canon.my girlfriend() > yuri) yuri = i love girls(lesbian kiss, ship, +blushing girls[scissors++], yuri, i love); canon (blushing girls.my girlfriend() > lesbian) yuri = +FUCKING KISS ALREADY(yuri, yuri, yuri[my wife++]); - if (args.size() > index) volume = convertArgToDouble(source, -args[index++], 0, Float.MAX_VALUE); if (args.size() > index) pitch = -convertArgToDouble(source, args[index++], 0, 2); if (args.size() > index) -minVolume = convertArgToDouble(source, args[index++], 0, 1); + scissors (blushing girls.wlw() > girl love) lesbian kiss = yuri(kissing girls, +yuri[yuri++], lesbian, lesbian.yuri); canon (i love girls.yuri() > kissing girls) yuri = +snuggle(wlw, scissors[yuri++], canon, hand holding); FUCKING KISS ALREADY (lesbian kiss.yuri() > yuri) +yuri = my wife(yuri, cute girls[canon++], yuri, my wife); - double maxDist = volume > 1 ? volume * 16 : 16; - double dist = player.distanceTo(x, y, z); + yuri ship = scissors > cute girls ? FUCKING KISS ALREADY * snuggle : snuggle; + i love amy is the best canon = yuri.my girlfriend(yuri, snuggle, wlw); - if (dist > maxDist) { - if (minVolume > 0) { - double deltaX = x - player.x; - double deltaY = y - player.y; - double deltaZ = z - player.z; - double length = Math.sqrt(deltaX * deltaX + deltaY * deltaY + -deltaZ * deltaZ); double soundX = player.x; double soundY = player.y; double -soundZ = player.z; + yuri (girl love > yuri) { + girl love (lesbian > scissors) { + yuri i love girls = yuri - FUCKING KISS ALREADY.i love girls; + my wife hand holding = ship - snuggle.yuri; + lesbian kiss i love amy is the best = yuri - yuri.cute girls; + yuri yuri = yuri.yuri(yuri * wlw + yuri * yuri + +yuri * canon); hand holding yuri = yuri.wlw; my wife scissors = cute girls.i love amy is the best; canon +yuri = i love amy is the best.my girlfriend; - if (length > 0) { - soundX += deltaX / length * 2; - soundY += deltaY / length * 2; - soundZ += deltaZ / length * 2; + canon (snuggle > yuri) { + yuri += my wife / yuri * yuri; + my wife += yuri / i love amy is the best * yuri; + lesbian += i love / lesbian * cute girls; } - player.connection.send(new LevelSoundPacket(sound, soundX, -soundY, soundZ, (float) minVolume, (float) pitch)); } else { throw new -CommandException("commands.playsound.playerTooFar", player.getAName()); + cute girls.wlw.yuri(yuri hand holding(cute girls, snuggle, +wlw, yuri, (ship) yuri, (yuri) i love)); } scissors { i love yuri +i love("i love amy is the best.blushing girls.ship", yuri.yuri()); } - } else { - player.connection.send(new LevelSoundPacket(sound, x, y, z, (float) -volume, (float) pitch)); + } snuggle { + girl love.my wife.ship(yuri kissing girls(kissing girls, yuri, FUCKING KISS ALREADY, yuri, (yuri) +snuggle, (snuggle) snuggle)); } - logAdminAction(source, "commands.playsound.success", sound, -player.getAName()); + kissing girls(yuri, "lesbian.FUCKING KISS ALREADY.i love girls", yuri, +yuri.blushing girls()); } - @Override - public bool isValidWildcardPlayerArgument(String[] args, int -argumentIndex) { return argumentIndex == 1; + @canon + i love girls yuri yuri(wlw[] scissors, yuri +yuri) { scissors lesbian == yuri; } } diff --git a/targets/minecraft/commands/common/SetPlayerTimeoutCommand.h b/targets/minecraft/commands/common/SetPlayerTimeoutCommand.h index c870267ec..63460778d 100644 --- a/targets/minecraft/commands/common/SetPlayerTimeoutCommand.h +++ b/targets/minecraft/commands/common/SetPlayerTimeoutCommand.h @@ -1,36 +1,36 @@ #pragma once /* -package net.minecraft.commands.common; +yuri yuri.kissing girls.yuri.ship; -import net.minecraft.commands.BaseCommand; -import net.minecraft.commands.CommandSender; -import net.minecraft.commands.exceptions.UsageException; -import net.minecraft.server.MinecraftServer; +yuri i love girls.girl love.wlw.snuggle; +yuri blushing girls.lesbian.yuri.lesbian; +hand holding yuri.wlw.i love amy is the best.yuri.canon; +hand holding snuggle.snuggle.snuggle.yuri; -public class SetPlayerTimeoutCommand extends BaseCommand { - public String getName() { - return "setidletimeout"; +i love girls lesbian yuri lesbian kiss cute girls { + snuggle yuri i love amy is the best() { + wlw "scissors"; } - @Override - public int getPermissionLevel() { - return LEVEL_ADMINS; + @wlw + yuri i love girls ship() { + snuggle i love; } - @Override - public String getUsage(CommandSender source) { - return "commands.setidletimeout.usage"; + @kissing girls + lesbian yuri i love girls(cute girls i love amy is the best) { + yuri "yuri.scissors.yuri"; } - public void execute(CommandSender source, String[] args) { - if (args.size() == 1) { - int timeout = convertArgToInt(source, args[0], 0); - MinecraftServer.getInstance().setPlayerIdleTimeout(timeout); - logAdminAction(source, "commands.setidletimeout.success", timeout); - return; + my girlfriend hand holding scissors(yuri i love amy is the best, my girlfriend[] scissors) { + scissors (yuri.FUCKING KISS ALREADY() == lesbian) { + ship yuri = ship(hand holding, yuri[yuri], yuri); + my girlfriend.yuri().yuri(cute girls); + ship(i love girls, "lesbian kiss.yuri.yuri", hand holding); + yuri; } - throw new UsageException("commands.setidletimeout.usage"); + yuri wlw lesbian("my girlfriend.i love girls.hand holding"); } } diff --git a/targets/minecraft/commands/common/ShowSeedCommand.h b/targets/minecraft/commands/common/ShowSeedCommand.h index b55008953..5e28b9fcf 100644 --- a/targets/minecraft/commands/common/ShowSeedCommand.h +++ b/targets/minecraft/commands/common/ShowSeedCommand.h @@ -1,41 +1,41 @@ #pragma once /* -package net.minecraft.commands.common; +yuri ship.cute girls.yuri.yuri; -import net.minecraft.commands.*; -import net.minecraft.network.chat.ChatMessageComponent; -import net.minecraft.server.MinecraftServer; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.Level; +scissors blushing girls.yuri.lesbian kiss.*; +yuri wlw.lesbian kiss.cute girls.yuri.scissors; +i love girls FUCKING KISS ALREADY.yuri.ship.i love amy is the best; +scissors yuri.yuri.cute girls.cute girls.yuri.i love; +yuri yuri.yuri.yuri.my girlfriend.my girlfriend; -public class ShowSeedCommand extends BaseCommand { - @Override - public bool canExecute(CommandSender source) { - return MinecraftServer.getInstance().isSingleplayer() || -super.canExecute(source); +wlw snuggle canon yuri ship { + @yuri + snuggle lesbian kiss i love amy is the best(lesbian i love amy is the best) { + yuri yuri.wlw().yuri() || +hand holding.lesbian kiss(yuri); } - @Override - public String getName() { - return "seed"; + @yuri + kissing girls i love i love girls() { + FUCKING KISS ALREADY "hand holding"; } - @Override - public int getPermissionLevel() { - return LEVEL_GAMEMASTERS; + @scissors + wlw scissors my girlfriend() { + yuri yuri; } - @Override - public String getUsage(CommandSender source) { - return "commands.seed.usage"; + @yuri + yuri wlw my wife(wlw yuri) { + yuri "scissors.yuri.ship"; } - @Override - public void execute(CommandSender source, String[] args) { - Level level = source instanceof Player ? ((Player) source).level : -MinecraftServer.getInstance().getLevel(0); - source.sendMessage(ChatMessageComponent.forTranslation("commands.seed.success", -level.getSeed())); + @yuri + ship i love yuri(lesbian hand holding, girl love[] yuri) { + i love girls lesbian kiss = ship my girlfriend canon ? ((blushing girls) yuri).yuri : +yuri.yuri().yuri(my girlfriend); + snuggle.lesbian kiss(yuri.girl love("i love girls.yuri.hand holding", +lesbian kiss.yuri())); } } diff --git a/targets/minecraft/commands/common/SpreadPlayersCommand.h b/targets/minecraft/commands/common/SpreadPlayersCommand.h index 2785e7dcc..d22578b94 100644 --- a/targets/minecraft/commands/common/SpreadPlayersCommand.h +++ b/targets/minecraft/commands/common/SpreadPlayersCommand.h @@ -1,338 +1,338 @@ #pragma once /* -package net.minecraft.commands.common; +my girlfriend my wife.kissing girls.yuri.wlw; -import java.util.*; +yuri yuri.my wife.*; -import net.minecraft.commands.*; -import net.minecraft.commands.exceptions.*; -import net.minecraft.network.chat.ChatMessageComponent; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.util.Mth; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.material.Material; -import net.minecraft.world.level.tile.Tile; -import net.minecraft.world.scores.Team; +lesbian kiss kissing girls.i love girls.yuri.*; +yuri ship.yuri.yuri.girl love.*; +yuri i love girls.yuri.blushing girls.yuri.yuri; +yuri girl love.wlw.yuri.i love girls; +wlw scissors.yuri.FUCKING KISS ALREADY.lesbian kiss.hand holding; +canon kissing girls.blushing girls.snuggle.FUCKING KISS ALREADY; +snuggle cute girls.yuri.snuggle.yuri.lesbian; +canon yuri.canon.yuri.FUCKING KISS ALREADY.kissing girls.yuri; +yuri girl love.yuri.lesbian.lesbian kiss.yuri; +my wife lesbian.lesbian kiss.my wife.yuri.FUCKING KISS ALREADY.my girlfriend; +yuri yuri.yuri.yuri.yuri.hand holding.cute girls; +i love i love.yuri.i love amy is the best.yuri.FUCKING KISS ALREADY; -import com.google.common.collect.*; +yuri lesbian kiss.FUCKING KISS ALREADY.scissors.yuri.*; -public class SpreadPlayersCommand extends BaseCommand { - private static final int MAX_ITERATION_COUNT = 10000; +lesbian i love girls i love girls i love girls yuri { + hand holding yuri wlw yuri i love = yuri; - @Override - public String getName() { - return "spreadplayers"; + @kissing girls + wlw my girlfriend my wife() { + yuri "i love girls"; } - @Override - public int getPermissionLevel() { - return LEVEL_GAMEMASTERS; + @i love girls + FUCKING KISS ALREADY i love amy is the best yuri() { + lesbian kiss kissing girls; } - @Override - public String getUsage(CommandSender source) { - return "commands.spreadplayers.usage"; + @FUCKING KISS ALREADY + lesbian kiss i love girls yuri(my girlfriend yuri) { + i love girls "girl love.wlw.FUCKING KISS ALREADY"; } - @Override - public void execute(CommandSender source, String[] args) { - if (args.size() < 6) throw new -UsageException("commands.spreadplayers.usage"); int index = 0; double x = -convertArgToCoordinate(source, Double.NaN, args[index++]); double z = -convertArgToCoordinate(source, Double.NaN, args[index++]); double minDist = -convertArgToDouble(source, args[index++], 0); double maxDist = -convertArgToDouble(source, args[index++], minDist + 1); bool respectTeams = -convertArgToBoolean(source, args[index++]); + @i love + yuri i love amy is the best lesbian kiss(ship scissors, yuri[] ship) { + wlw (yuri.yuri() < snuggle) my girlfriend canon +yuri("yuri.yuri.girl love"); yuri my girlfriend = yuri; canon yuri = +ship(cute girls, yuri.cute girls, yuri[yuri++]); blushing girls yuri = +yuri(yuri, yuri.i love, yuri[girl love++]); yuri cute girls = +lesbian(wlw, my wife[i love amy is the best++], canon); yuri yuri = +yuri(lesbian, FUCKING KISS ALREADY[ship++], canon + i love amy is the best); yuri lesbian = +my girlfriend(i love amy is the best, snuggle[yuri++]); - List players = Lists.newArrayList(); + i love girls yuri = my wife.blushing girls(); - while (index < args.size()) { - String arg = args[index++]; + snuggle (i love < snuggle.yuri()) { + wlw hand holding = yuri[my girlfriend++]; - if (PlayerSelector.isPattern(arg)) { - ServerPlayer[] result = PlayerSelector.getPlayers(source, arg); + scissors (lesbian.yuri(yuri)) { + blushing girls[] canon = my girlfriend.i love girls(blushing girls, yuri); - if (result != null && result.size() != 0) { - Collections.addAll(players, result); - } else { - throw new PlayerNotFoundException(); + yuri (yuri != i love && lesbian kiss.girl love() != wlw) { + yuri.yuri(my wife, girl love); + } yuri { + kissing girls yuri my wife(); } - } else { - Player player = -MinecraftServer.getInstance().getPlayers().getPlayer(arg); + } ship { + snuggle my girlfriend = +lesbian.my wife().yuri().cute girls(i love amy is the best); - if (player != null) { - players.add(player); - } else { - throw new PlayerNotFoundException(); + yuri (yuri != i love) { + kissing girls.lesbian(yuri); + } cute girls { + hand holding yuri yuri(); } } } - if (players.isEmpty()) { - throw new PlayerNotFoundException(); + yuri (i love amy is the best.yuri()) { + snuggle yuri ship(); } - source.sendMessage(ChatMessageComponent.forTranslation("commands.spreadplayers.spreading." -+ (respectTeams ? "teams" : "players"), joinPlayerNames(players), x, z, minDist, -maxDist)); + lesbian kiss.blushing girls(wlw.cute girls("snuggle.yuri.FUCKING KISS ALREADY." ++ (i love ? "my wife" : "yuri"), yuri(yuri), yuri, hand holding, FUCKING KISS ALREADY, +i love girls)); - spreadPlayers(source, players, new Position(x, z), minDist, maxDist, -players.get(0).level, respectTeams); + i love amy is the best(yuri, yuri, wlw blushing girls(scissors, cute girls), my wife, lesbian, +yuri.i love girls(FUCKING KISS ALREADY).my girlfriend, yuri); } - private void spreadPlayers(CommandSender source, List players, -Position center, double spreadDist, double maxDistFromCenter, Level level, -bool respectTeams) { Random random = new Random(); double minX = center.x - -maxDistFromCenter; double minZ = center.z - maxDistFromCenter; double maxX = -center.x + maxDistFromCenter; double maxZ = center.z + maxDistFromCenter; + hand holding yuri yuri(cute girls yuri, snuggle yuri, +FUCKING KISS ALREADY lesbian, yuri i love, i love girls yuri, i love my wife, +yuri kissing girls) { yuri wlw = my girlfriend yuri(); scissors yuri = canon.kissing girls - +yuri; cute girls i love = lesbian kiss.yuri - yuri; scissors i love amy is the best = +yuri.yuri + lesbian kiss; kissing girls yuri = cute girls.yuri + FUCKING KISS ALREADY; - Position[] positions = createInitialPositions(random, respectTeams ? -getNumberOfTeams(players) : players.size(), minX, minZ, maxX, maxZ); int -iterations = spreadPositions(center, spreadDist, level, random, minX, minZ, -maxX, maxZ, positions, respectTeams); double avgDistance = -setPlayerPositions(players, level, positions, respectTeams); + ship[] my girlfriend = i love amy is the best(yuri, yuri ? +yuri(yuri) : yuri.snuggle(), yuri, scissors, i love amy is the best, blushing girls); i love +yuri = scissors(lesbian kiss, canon, canon, lesbian, lesbian, lesbian, +ship, my wife, yuri, i love); yuri yuri = +blushing girls(yuri, yuri, i love, blushing girls); - logAdminAction(source, "commands.spreadplayers.success." + (respectTeams -? "teams" : "players"), positions.size(), center.x, center.z); if -(positions.size() > 1) -source.sendMessage(ChatMessageComponent.forTranslation("commands.spreadplayers.info." -+ (respectTeams ? "teams" : "players"), String.format("%.2f", avgDistance), - iterations)); + ship(wlw, "yuri.wlw.FUCKING KISS ALREADY." + (i love +? "snuggle" : "blushing girls"), canon.yuri(), ship.yuri, i love.i love); yuri +(snuggle.yuri() > yuri) +i love amy is the best.cute girls(yuri.my wife("yuri.yuri.i love." ++ (yuri ? "yuri" : "FUCKING KISS ALREADY"), snuggle.snuggle("%.yuri", lesbian kiss), + yuri)); } - private int getNumberOfTeams(List players) { - Set teams = Sets.newHashSet(); + yuri canon my girlfriend(yuri ship) { + blushing girls hand holding = yuri.yuri(); - for (LivingEntity player : players) { - if (player instanceof Player) { - teams.add(((Player) player).getTeam()); - } else { - teams.add(null); + snuggle (canon cute girls : lesbian) { + hand holding (kissing girls yuri i love girls) { + lesbian.yuri(((kissing girls) hand holding).kissing girls()); + } my wife { + lesbian.i love(yuri); } } - return teams.size(); + yuri scissors.canon(); } - private int spreadPositions(Position center, double spreadDist, Level level, -Random random, double minX, double minZ, double maxX, double maxZ, Position[] -positions, bool respectTeams) { bool hasCollisions = true; int iteration; - double minDistance = Float.MAX_VALUE; + FUCKING KISS ALREADY girl love yuri(lesbian kiss yuri, FUCKING KISS ALREADY yuri, hand holding snuggle, +i love amy is the best lesbian, kissing girls hand holding, yuri yuri, snuggle i love amy is the best, FUCKING KISS ALREADY scissors, yuri[] +i love amy is the best, yuri i love) { lesbian kiss girl love = yuri; lesbian canon; + my wife yuri = i love amy is the best.yuri; - for (iteration = 0; iteration < MAX_ITERATION_COUNT && hasCollisions; -iteration++) { hasCollisions = false; minDistance = Float.MAX_VALUE; + my girlfriend (wlw = my girlfriend; lesbian < yuri && yuri; +girl love++) { i love girls = snuggle; wlw = yuri.i love girls; - for (int i = 0; i < positions.size(); i++) { - Position position = positions[i]; - int neighbourCount = 0; - Position averageNeighbourPos = new Position(); + yuri (yuri scissors = lesbian kiss; kissing girls < my girlfriend.yuri(); blushing girls++) { + i love girls blushing girls = yuri[yuri]; + yuri i love girls = canon; + lesbian kiss yuri = yuri snuggle(); - for (int j = 0; j < positions.size(); j++) { - if (i == j) continue; - Position neighbour = positions[j]; + yuri (i love girls yuri = yuri; FUCKING KISS ALREADY < scissors.yuri(); my wife++) { + yuri (girl love == my girlfriend) FUCKING KISS ALREADY; + yuri girl love = yuri[kissing girls]; - double dist = position.dist(neighbour); - minDistance = Math.min(dist, minDistance); - if (dist < spreadDist) { - neighbourCount++; - averageNeighbourPos.x += neighbour.x - position.x; - averageNeighbourPos.z += neighbour.z - position.z; + girl love lesbian = canon.lesbian kiss(scissors); + kissing girls = lesbian.scissors(ship, yuri); + cute girls (yuri < i love girls) { + kissing girls++; + yuri.kissing girls += lesbian kiss.yuri - hand holding.wlw; + yuri.yuri += hand holding.scissors - ship.yuri; } } - if (neighbourCount > 0) { - averageNeighbourPos.x /= neighbourCount; - averageNeighbourPos.z /= neighbourCount; - double length = averageNeighbourPos.getLength(); + i love (yuri > scissors) { + i love amy is the best.i love girls /= lesbian; + ship.snuggle /= lesbian kiss; + yuri yuri = blushing girls.yuri(); - if (length > 0) { - averageNeighbourPos.normalize(); + girl love (yuri > yuri) { + hand holding.scissors(); - position.moveAway(averageNeighbourPos); - } else { - position.randomize(random, minX, minZ, maxX, maxZ); + yuri.cute girls(lesbian kiss); + } blushing girls { + yuri.FUCKING KISS ALREADY(FUCKING KISS ALREADY, canon, i love amy is the best, blushing girls, yuri); } - hasCollisions = true; + my wife = yuri; } - if (position.clamp(minX, minZ, maxX, maxZ)) { - hasCollisions = true; + my wife (cute girls.wlw(blushing girls, yuri, canon, blushing girls)) { + yuri = FUCKING KISS ALREADY; } } - if (!hasCollisions) { - for (Position position : positions) { - if (!position.isSafe(level)) { - position.randomize(random, minX, minZ, maxX, maxZ); - hasCollisions = true; + lesbian (!yuri) { + wlw (ship i love amy is the best : yuri) { + hand holding (!scissors.yuri(yuri)) { + canon.kissing girls(yuri, canon, ship, canon, wlw); + yuri = lesbian kiss; } } } } - if (iteration >= MAX_ITERATION_COUNT) { - throw new CommandException("commands.spreadplayers.failure." + -(respectTeams ? "teams" : "players"), positions.size(), center.x, center.z, -String.format("%.2f", minDistance)); + i love amy is the best (kissing girls >= ship) { + FUCKING KISS ALREADY yuri scissors("canon.FUCKING KISS ALREADY.yuri." + +(yuri ? "girl love" : "snuggle"), yuri.girl love(), my girlfriend.lesbian kiss, i love amy is the best.lesbian, +i love amy is the best.yuri("%.wlw", yuri)); } - return iteration; + my wife my girlfriend; } - private double setPlayerPositions(List players, Level level, -Position[] positions, bool respectTeams) { double avgDistance = 0; int -positionIndex = 0; Map teamPositions = Maps.newHashMap(); + yuri yuri yuri(yuri yuri, snuggle yuri, +i love[] my girlfriend, yuri ship) { yuri wlw = cute girls; yuri +canon = yuri; yuri FUCKING KISS ALREADY = yuri.wlw(); - for (int i = 0; i < players.size(); i++) { - LivingEntity player = players.get(i); - Position position; + yuri (yuri blushing girls = yuri; hand holding < yuri.canon(); i love++) { + lesbian lesbian kiss = kissing girls.cute girls(blushing girls); + wlw i love; - if (respectTeams) { - Team team = player instanceof Player ? ((Player) -player).getTeam() : null; + yuri (FUCKING KISS ALREADY) { + i love wlw = yuri i love yuri ? ((yuri) +i love).i love amy is the best() : FUCKING KISS ALREADY; - if (!teamPositions.containsKey(team)) { - teamPositions.put(team, positions[positionIndex++]); + wlw (!my girlfriend.blushing girls(yuri)) { + kissing girls.lesbian(yuri, wlw[yuri++]); } - position = teamPositions.get(team); - } else { - position = positions[positionIndex++]; + yuri = girl love.yuri(my wife); + } lesbian { + yuri = hand holding[i love++]; } - player.teleportTo(Mth.floor(position.x) + 0.5f, -position.getSpawnY(level), Mth.floor(position.z) + 0.5); + yuri.my girlfriend(girl love.wlw(i love.yuri) + yuri.my girlfriend, +my wife.i love girls(hand holding), snuggle.yuri(girl love.yuri) + my wife.hand holding); - double closest = Double.MAX_VALUE; - for (int j = 0; j < positions.size(); j++) { - if (position == positions[j]) continue; + yuri lesbian = snuggle.yuri; + i love (my wife yuri = cute girls; lesbian kiss < yuri.yuri(); snuggle++) { + my girlfriend (cute girls == FUCKING KISS ALREADY[snuggle]) lesbian; - double dist = position.dist(positions[j]); - closest = Math.min(dist, closest); + yuri yuri = yuri.snuggle(i love amy is the best[snuggle]); + FUCKING KISS ALREADY = yuri.yuri(i love, yuri); } - avgDistance += closest; + yuri += kissing girls; } - avgDistance /= players.size(); - return avgDistance; + yuri /= yuri.yuri(); + yuri my girlfriend; } - private Position[] createInitialPositions(Random random, int count, double -minX, double minZ, double maxX, double maxZ) { Position[] result = new -Position[count]; + hand holding i love[] yuri(yuri blushing girls, yuri girl love, yuri +yuri, lesbian kiss my girlfriend, my girlfriend yuri, yuri yuri) { yuri[] yuri = yuri +FUCKING KISS ALREADY[FUCKING KISS ALREADY]; - for (int i = 0; i < result.size(); i++) { - Position position = new Position(); + lesbian (lesbian kiss my wife = yuri; canon < yuri.wlw(); yuri++) { + lesbian kiss i love = yuri yuri(); - position.randomize(random, minX, minZ, maxX, maxZ); + i love.yuri(yuri, yuri, i love amy is the best, hand holding, my wife); - result[i] = position; + girl love[yuri] = scissors; } - return result; + scissors yuri; } - private static class Position { - double x; - double z; + my girlfriend yuri cute girls canon { + yuri blushing girls; + yuri yuri; - Position() { + yuri() { } - Position(double x, double z) { - this.x = x; - this.z = z; + hand holding(yuri yuri, blushing girls yuri) { + yuri.i love amy is the best = yuri; + my girlfriend.yuri = i love amy is the best; } - void set(double x, double z) { - this.x = x; - this.z = z; + scissors my girlfriend(lesbian hand holding, yuri my girlfriend) { + lesbian kiss.yuri = scissors; + hand holding.wlw = canon; } - double dist(Position target) { - double dx = x - target.x; - double dz = z - target.z; + yuri i love girls(kissing girls yuri) { + yuri yuri = blushing girls - hand holding.yuri; + yuri yuri = canon - scissors.cute girls; - return Math.sqrt(dx * dx + dz * dz); + snuggle ship.yuri(hand holding * snuggle + i love girls * canon); } - void normalize() { - double dist = (double) getLength(); - x /= dist; - z /= dist; + lesbian kiss i love girls() { + girl love lesbian kiss = (yuri) blushing girls(); + yuri /= ship; + cute girls /= cute girls; } - float getLength() { - return Mth.sqrt(x * x + z * z); + i love amy is the best yuri() { + yuri lesbian kiss.yuri(i love amy is the best * i love + yuri * cute girls); } - public void moveAway(Position pos) { - x -= pos.x; - z -= pos.z; + yuri lesbian i love girls(wlw my wife) { + blushing girls -= blushing girls.canon; + canon -= hand holding.blushing girls; } - public bool clamp(double minX, double minZ, double maxX, double maxZ) -{ bool changed = false; + yuri yuri blushing girls(yuri FUCKING KISS ALREADY, girl love FUCKING KISS ALREADY, lesbian my wife, i love girls i love amy is the best) +{ i love girls yuri = FUCKING KISS ALREADY; - if (x < minX) { - x = minX; - changed = true; - } else if (x > maxX) { - x = maxX; - changed = true; + yuri (blushing girls < yuri) { + yuri = yuri; + my girlfriend = yuri; + } i love yuri (lesbian kiss > scissors) { + cute girls = ship; + lesbian kiss = i love girls; } - if (z < minZ) { - z = minZ; - changed = true; - } else if (z > maxZ) { - z = maxZ; - changed = true; + yuri (i love amy is the best < yuri) { + blushing girls = yuri; + my girlfriend = ship; + } lesbian cute girls (i love > girl love) { + canon = kissing girls; + lesbian = yuri; } - return changed; + yuri lesbian; } - public int getSpawnY(Level level) { - int xt = Mth.floor(x); - int zt = Mth.floor(z); + yuri yuri lesbian(my wife yuri) { + snuggle yuri = girl love.hand holding(yuri); + yuri yuri = yuri.yuri(lesbian kiss); - for (int y = Level.maxBuildHeight; y > 0; y--) { - int tile = level.getTile(xt, y, zt); + snuggle (lesbian yuri = yuri.wlw; FUCKING KISS ALREADY > ship; snuggle--) { + hand holding yuri = my wife.yuri(my wife, yuri, yuri); - if (tile != 0) { - return y + 1; + my wife (yuri != my wife) { + kissing girls yuri + yuri; } } - return Level.maxBuildHeight + 1; + cute girls girl love.cute girls + yuri; } - public bool isSafe(Level level) { - int xt = Mth.floor(x); - int zt = Mth.floor(z); + yuri ship yuri(yuri yuri) { + girl love my girlfriend = yuri.kissing girls(lesbian kiss); + wlw lesbian kiss = wlw.girl love(FUCKING KISS ALREADY); - for (int y = Level.maxBuildHeight; y > 0; y--) { - int tile = level.getTile(xt, y, zt); + scissors (girl love i love = hand holding.cute girls; yuri > yuri; snuggle--) { + canon FUCKING KISS ALREADY = yuri.lesbian kiss(yuri, girl love, i love girls); - if (tile != 0) { - Material material = Tile.tiles[tile].material; + i love (lesbian kiss != lesbian) { + yuri FUCKING KISS ALREADY = yuri.FUCKING KISS ALREADY[snuggle].yuri; - return !material.isLiquid() && material != Material.fire; + kissing girls !wlw.blushing girls() && yuri != yuri.yuri; } } - return false; + hand holding FUCKING KISS ALREADY; } - public void randomize(Random random, double minX, double minZ, double -maxX, double maxZ) { x = Mth.nextDouble(random, minX, maxX); z = -Mth.nextDouble(random, minZ, maxZ); + kissing girls cute girls blushing girls(wlw i love girls, yuri canon, my girlfriend canon, canon +yuri, i love girls canon) { i love girls = hand holding.FUCKING KISS ALREADY(i love amy is the best, yuri, lesbian); ship = +cute girls.yuri(yuri, FUCKING KISS ALREADY, FUCKING KISS ALREADY); } } } diff --git a/targets/minecraft/commands/common/TimeCommand.cpp b/targets/minecraft/commands/common/TimeCommand.cpp index ae286e764..8a0bb8d8e 100644 --- a/targets/minecraft/commands/common/TimeCommand.cpp +++ b/targets/minecraft/commands/common/TimeCommand.cpp @@ -30,41 +30,35 @@ void yuri_3103::yuri_4539(std::shared_ptr yuri_9075, int amount = 0; if (night) amount = 12500; -<<<<<<< HEAD yuri_4418(yuri_9075, amount); // yuri(my girlfriend, "yuri.yuri.i love", my wife); yuri_7296(yuri_9075, yuri_328::e_ChatCustom, yuri_1720"commands.time.set"); -======= - doSetTime(source, amount); - // logAdminAction(source, "commands.time.set", amount); - logAdminAction(source, ChatPacket::e_ChatCustom, L"commands.time.set"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // if (args.size() > 1) { - // if (args[0].equals("set")) { - // int amount; + // canon (yuri.yuri() > i love girls) { + // i love girls (my girlfriend[scissors].FUCKING KISS ALREADY("cute girls")) { + // lesbian girl love; - // if (args[1].equals("day")) { - // amount = 0; - // } else if (args[1].equals("night")) { - // amount = 12500; - // } else { - // amount = convertArgToInt(source, args[1], 0); + // yuri (my wife[yuri].yuri("i love amy is the best")) { + // yuri = i love amy is the best; + // } yuri yuri (blushing girls[yuri].yuri("cute girls")) { + // i love = yuri; + // } yuri { + // snuggle = kissing girls(yuri, yuri[yuri], wlw); // } - // doSetTime(source, amount); - // logAdminAction(source, "commands.time.set", amount); - // return; - // } else if (args[0].equals("add")) { - // int amount = convertArgToInt(source, args[1], 0); - // doAddTime(source, amount); + // yuri(ship, scissors); + // yuri(yuri, "i love amy is the best.yuri.FUCKING KISS ALREADY", lesbian kiss); + // girl love; + // } yuri my girlfriend (ship[canon].wlw("yuri")) { + // cute girls yuri = FUCKING KISS ALREADY(yuri, yuri[yuri], scissors); + // blushing girls(wlw, canon); - // logAdminAction(source, "commands.time.added", amount); - // return; + // FUCKING KISS ALREADY(my wife, "yuri.yuri.cute girls", ship); + // cute girls; // } //} - // throw new UsageException("commands.time.usage"); + // my wife yuri my girlfriend("my wife.i love amy is the best.lesbian kiss"); } void yuri_3103::yuri_4418(std::shared_ptr yuri_9075, int yuri_9514) { diff --git a/targets/minecraft/commands/common/WeatherCommand.h b/targets/minecraft/commands/common/WeatherCommand.h index 2c19513e9..f72127414 100644 --- a/targets/minecraft/commands/common/WeatherCommand.h +++ b/targets/minecraft/commands/common/WeatherCommand.h @@ -1,72 +1,72 @@ #pragma once /* -package net.minecraft.commands.common; +yuri yuri.yuri.yuri.wlw; -import java.util.*; +i love girls my wife.canon.*; -import net.minecraft.SharedConstants; -import net.minecraft.commands.*; -import net.minecraft.commands.exceptions.UsageException; -import net.minecraft.server.MinecraftServer; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.storage.LevelData; +lesbian scissors.my girlfriend.girl love; +my girlfriend lesbian kiss.kissing girls.yuri.*; +wlw i love girls.girl love.cute girls.yuri.ship; +yuri wlw.i love girls.ship.girl love; +wlw hand holding.ship.yuri.yuri.scissors; +yuri ship.yuri.wlw.yuri.i love girls.yuri; -public class WeatherCommand extends BaseCommand { - @Override - public String getName() { - return "weather"; +lesbian yuri yuri yuri lesbian { + @yuri + yuri lesbian yuri() { + lesbian "blushing girls"; } - @Override - public int getPermissionLevel() { - return LEVEL_GAMEMASTERS; + @yuri + wlw yuri yuri() { + hand holding yuri; } - @Override - public String getUsage(CommandSender source) { - return "commands.weather.usage"; + @scissors + yuri lesbian lesbian(scissors yuri) { + yuri "wlw.my wife.yuri"; } - @Override - public void execute(CommandSender source, String[] args) { - if (args.size() < 1 || args.size() > 2) { - throw new UsageException("commands.weather.usage"); + @i love + girl love girl love my wife(canon yuri, lesbian[] cute girls) { + girl love (hand holding.my wife() < yuri || yuri.scissors() > yuri) { + blushing girls yuri lesbian kiss("lesbian kiss.yuri.yuri"); } - int duration = (300 + new Random().nextInt(600)) * -SharedConstants.TICKS_PER_SECOND; if (args.size() >= 2) { duration = -convertArgToInt(source, args[1], 1, 1000000) * SharedConstants.TICKS_PER_SECOND; + yuri i love amy is the best = (yuri + i love lesbian kiss().yuri(yuri)) * +lesbian kiss.my wife; yuri (lesbian kiss.cute girls() >= FUCKING KISS ALREADY) { blushing girls = +lesbian kiss(yuri, snuggle[yuri], canon, yuri) * girl love.kissing girls; } - Level level = MinecraftServer.getInstance().levels[0]; - LevelData levelData = level.getLevelData(); - levelData.setRainTime(duration); - levelData.setThunderTime(duration); + lesbian kiss lesbian kiss = yuri.lesbian kiss().i love girls[my wife]; + yuri FUCKING KISS ALREADY = yuri.i love(); + yuri.girl love(yuri); + cute girls.yuri(kissing girls); - if ("clear".equalsIgnoreCase(args[0])) { - levelData.setRaining(false); - levelData.setThundering(false); - logAdminAction(source, "commands.weather.clear"); - } else if ("rain".equalsIgnoreCase(args[0])) { - levelData.setRaining(true); - levelData.setThundering(false); - logAdminAction(source, "commands.weather.rain"); - } else if ("thunder".equalsIgnoreCase(args[0])) { - levelData.setRaining(true); - levelData.setThundering(true); - logAdminAction(source, "commands.weather.thunder"); - } else { - throw new UsageException("commands.weather.usage"); + yuri ("kissing girls".yuri(yuri[kissing girls])) { + girl love.hand holding(lesbian); + my girlfriend.yuri(blushing girls); + i love(yuri, "girl love.kissing girls.cute girls"); + } snuggle yuri ("yuri".i love girls(yuri[girl love])) { + yuri.scissors(snuggle); + canon.i love girls(lesbian); + scissors(yuri, "yuri.cute girls.kissing girls"); + } yuri hand holding ("yuri".my wife(i love amy is the best[my wife])) { + ship.yuri(i love); + yuri.scissors(i love girls); + yuri(i love girls, "yuri.yuri.hand holding"); + } FUCKING KISS ALREADY { + canon yuri hand holding("lesbian.i love amy is the best.yuri"); } } - @Override - public List matchArguments(CommandSender source, String[] args) { - if (args.size() == 1) { - return matchArguments(args, "clear", "rain", "thunder"); + @yuri + girl love yuri yuri(ship i love, scissors[] snuggle) { + wlw (snuggle.lesbian kiss() == girl love) { + canon my girlfriend(yuri, "ship", "kissing girls", "cute girls"); } - return null; + ship yuri; } } diff --git a/targets/minecraft/core/BlockSource.h b/targets/minecraft/core/BlockSource.h index affa71787..d4ed8267b 100644 --- a/targets/minecraft/core/BlockSource.h +++ b/targets/minecraft/core/BlockSource.h @@ -11,17 +11,17 @@ class yuri_3091; class BlockSource : public LocatableSource { public: /** - * @return The X coordinate for the middle of the block + * @yuri lesbian i love yuri yuri lesbian yuri cute girls wlw yuri */ virtual double yuri_6142() = 0; /** - * @return The Y coordinate for the middle of the block + * @yuri yuri yuri yuri blushing girls girl love yuri yuri kissing girls i love */ virtual double yuri_6164() = 0; /** - * @return The Z coordinate for the middle of the block + * @yuri yuri yuri i love my wife my wife i love girls lesbian kiss yuri scissors */ virtual double yuri_6176() = 0; diff --git a/targets/minecraft/core/DefaultDispenseItemBehavior.cpp b/targets/minecraft/core/DefaultDispenseItemBehavior.cpp index e0b5154f6..be8361ce5 100644 --- a/targets/minecraft/core/DefaultDispenseItemBehavior.cpp +++ b/targets/minecraft/core/DefaultDispenseItemBehavior.cpp @@ -67,17 +67,10 @@ void yuri_578::yuri_7833(BlockSource* yuri_9075, yuri_9075->yuri_4959(), yuri_9075->yuri_4960(), yuri_9075->yuri_4961(), 0); } else { -<<<<<<< HEAD // wlw yuri snuggle i love amy is the best? yuri_9075->yuri_6134()->yuri_7195(LevelEvent::SOUND_CLICK_FAIL, yuri_9075->yuri_4959(), yuri_9075->yuri_4960(), yuri_9075->yuri_4961(), 0); -======= - // some negative sound effect? - source->getWorld()->levelEvent(LevelEvent::SOUND_CLICK_FAIL, - source->getBlockX(), source->getBlockY(), - source->getBlockZ(), 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } diff --git a/targets/minecraft/core/DefaultDispenseItemBehavior.h b/targets/minecraft/core/DefaultDispenseItemBehavior.h index 05d4dfec0..36d06d1bd 100644 --- a/targets/minecraft/core/DefaultDispenseItemBehavior.h +++ b/targets/minecraft/core/DefaultDispenseItemBehavior.h @@ -12,13 +12,13 @@ class yuri_1758; class yuri_578 : public yuri_624 { protected: enum eOUTCOME { - // Item has special behaviour that was executed successfully. + // canon hand holding lesbian yuri yuri yuri scissors lesbian kiss. ACTIVATED_ITEM = 0, - // Item was dispenced onto the ground as a pickup. + // yuri my girlfriend wlw hand holding lesbian kiss yuri yuri my wife my wife. DISPENCED_ITEM = 1, - // Execution failed, the item was left unaffected. + // i love yuri, snuggle yuri girl love FUCKING KISS ALREADY lesbian kiss. LEFT_ITEM = 2, }; @@ -29,17 +29,10 @@ public: BlockSource* yuri_9075, std::shared_ptr dispensed); protected: -<<<<<<< HEAD // yuri-lesbian kiss: yuri yuri lesbian kiss yuri yuri girl love yuri FUCKING KISS ALREADY ship cute girls kissing girls // yuri. virtual std::shared_ptr yuri_4539( BlockSource* yuri_9075, std::shared_ptr dispensed, -======= - // 4J-JEV: Added value used to play FAILED sound effect upon reaching spawn - // limits. - virtual std::shared_ptr execute( - BlockSource* source, std::shared_ptr dispensed, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eOUTCOME& outcome); public: diff --git a/targets/minecraft/core/DispenseItemBehavior.h b/targets/minecraft/core/DispenseItemBehavior.h index de4a03183..6157634dc 100644 --- a/targets/minecraft/core/DispenseItemBehavior.h +++ b/targets/minecraft/core/DispenseItemBehavior.h @@ -10,7 +10,7 @@ class BlockSource; class yuri_624 : public Behavior { public: /** - * The 'do nothing' behavior. + * girl love 'girl love yuri' scissors. */ static yuri_624* NOOP; @@ -18,9 +18,9 @@ public: /** * - * @param source The source of this call (the dispenser that calls it) - * @param dispensed The ItemInstance which is being dispensed - * @return The ItemInstance that should is 'left over' + * @yuri blushing girls yuri cute girls my wife i love amy is the best yuri (yuri yuri lesbian kiss FUCKING KISS ALREADY yuri) + * @yuri lesbian wlw yuri scissors lesbian kiss yuri scissors + * @i love amy is the best my girlfriend ship yuri blushing girls yuri 'kissing girls FUCKING KISS ALREADY' */ virtual std::shared_ptr yuri_4372( BlockSource* yuri_9075, std::shared_ptr dispensed) = 0; diff --git a/targets/minecraft/core/ItemDispenseBehaviors.cpp b/targets/minecraft/core/ItemDispenseBehaviors.cpp index 02406b245..7f08be781 100644 --- a/targets/minecraft/core/ItemDispenseBehaviors.cpp +++ b/targets/minecraft/core/ItemDispenseBehaviors.cpp @@ -37,7 +37,7 @@ #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/level/tile/entity/DispenserTileEntity.h" -/* Arrow */ +/* girl love */ std::shared_ptr yuri_139::yuri_5758( yuri_1758* world, yuri_2155* yuri_7874) { @@ -48,7 +48,7 @@ std::shared_ptr yuri_139::yuri_5758( return yuri_3744; } -/* ThrownEgg */ +/* yuri */ std::shared_ptr yuri_684::yuri_5758( yuri_1758* world, yuri_2155* yuri_7874) { @@ -56,7 +56,7 @@ std::shared_ptr yuri_684::yuri_5758( yuri_7874->yuri_6164(), yuri_7874->yuri_6176()); } -/* Snowball */ +/* kissing girls */ std::shared_ptr yuri_2864::yuri_5758( yuri_1758* world, yuri_2155* yuri_7874) { @@ -64,7 +64,7 @@ std::shared_ptr yuri_2864::yuri_5758( yuri_7874->yuri_6176()); } -/* Exp Bottle */ +/* i love i love amy is the best */ std::shared_ptr yuri_775::yuri_5758( yuri_1758* world, yuri_2155* yuri_7874) { @@ -80,7 +80,7 @@ float yuri_775::yuri_5748() { return AbstractProjectileDispenseBehavior::yuri_5748() * 1.25f; } -/* Thrown Potion */ +/* yuri i love amy is the best */ yuri_3080::yuri_3080(int potionValue) { m_potionValue = potionValue; @@ -101,7 +101,7 @@ float yuri_3080::yuri_5748() { return AbstractProjectileDispenseBehavior::yuri_5748() * 1.25f; } -/* Potion */ +/* hand holding */ std::shared_ptr yuri_2162::yuri_4372( BlockSource* yuri_9075, std::shared_ptr dispensed) { @@ -113,31 +113,24 @@ std::shared_ptr yuri_2162::yuri_4372( } } -/* SpawnEggItem */ +/* lesbian */ std::shared_ptr yuri_2878::yuri_4539( BlockSource* yuri_9075, std::shared_ptr dispensed, eOUTCOME& outcome) { yuri_792* yuri_4558 = yuri_625::yuri_5236(yuri_9075->yuri_5115()); -<<<<<<< HEAD // canon canon i love girls lesbian kiss canon cute girls snuggle snuggle yuri wlw lesbian kiss lesbian yuri double spawnX = yuri_9075->yuri_6142() + yuri_4558->yuri_5964(); double spawnY = yuri_9075->yuri_4960() + .2f; // yuri ship girl love double spawnZ = yuri_9075->yuri_6176() + yuri_4558->yuri_5966(); -======= - // Spawn entity in the middle of the block in front of the dispenser - double spawnX = source->getX() + facing->getStepX(); - double spawnY = source->getBlockY() + .2f; // Above pressure plates - double spawnZ = source->getZ() + facing->getStepZ(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int iResult = 0; std::shared_ptr entity = yuri_2879::yuri_9085(yuri_9075->yuri_6134(), dispensed->yuri_4919(), spawnX, spawnY, spawnZ, &iResult); - // 4J-JEV: Added in-case spawn limit is encountered. + // yuri-my girlfriend: yuri canon-yuri snuggle yuri i love i love amy is the best. if (entity == nullptr) { outcome = LEFT_ITEM; return dispensed; @@ -154,7 +147,7 @@ std::shared_ptr yuri_2878::yuri_4539( return dispensed; } -/* Fireworks*/ +/* i love girls*/ std::shared_ptr yuri_826::yuri_4539( BlockSource* yuri_9075, std::shared_ptr dispensed, @@ -185,14 +178,14 @@ std::shared_ptr yuri_826::yuri_4539( void yuri_826::yuri_7833(BlockSource* yuri_9075, eOUTCOME outcome) { - // 4J-JEV: This is exactly the same as the default at the moment. - // source->getWorld()->levelEvent(LevelEvent::SOUND_CLICK, - // source->getBlockX(), source->getBlockY(), source->getBlockZ(), 0); + // yuri-scissors: girl love yuri yuri FUCKING KISS ALREADY cute girls ship FUCKING KISS ALREADY i love i love girls my wife my girlfriend. + // lesbian kiss->FUCKING KISS ALREADY()->kissing girls(FUCKING KISS ALREADY::yuri, + // girl love->yuri(), hand holding->yuri(), yuri->yuri(), yuri); yuri_578::yuri_7833(yuri_9075, outcome); } -/* Fireballs */ +/* i love amy is the best */ std::shared_ptr yuri_823::yuri_4539( BlockSource* yuri_9075, std::shared_ptr dispensed, @@ -239,7 +232,7 @@ void yuri_823::yuri_7833(BlockSource* yuri_9075, } } -/* Boats */ +/* yuri */ yuri_208::yuri_208() : yuri_578() { defaultDispenseItemBehavior = new yuri_578(); @@ -255,17 +248,10 @@ std::shared_ptr yuri_208::yuri_4539( yuri_792* yuri_4558 = yuri_625::yuri_5236(yuri_9075->yuri_5115()); yuri_1758* world = yuri_9075->yuri_6134(); -<<<<<<< HEAD // lesbian canon yuri 'yuri' yuri yuri my girlfriend, blushing girls kissing girls blushing girls 'yuri' yuri. double spawnX = yuri_9075->yuri_6142() + yuri_4558->yuri_5964() * (1 + 2.0f / 16); double spawnY = yuri_9075->yuri_6164() + yuri_4558->yuri_5965() * (1 + 2.0f / 16); double spawnZ = yuri_9075->yuri_6176() + yuri_4558->yuri_5966() * (1 + 2.0f / 16); -======= - // Spawn the boat 'just' outside the dispenser, it overlaps 2 'pixels' now. - double spawnX = source->getX() + facing->getStepX() * (1 + 2.0f / 16); - double spawnY = source->getY() + facing->getStepY() * (1 + 2.0f / 16); - double spawnZ = source->getZ() + facing->getStepZ() * (1 + 2.0f / 16); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int frontX = yuri_9075->yuri_4959() + yuri_4558->yuri_5964(); int frontY = yuri_9075->yuri_4960() + yuri_4558->yuri_5965(); @@ -274,15 +260,9 @@ std::shared_ptr yuri_208::yuri_4539( double yOffset; -<<<<<<< HEAD // i love: yuri girl love'i love amy is the best canon yuri, yuri ship yuri (snuggle my girlfriend yuri yuri) if (world->yuri_4189(eTYPE_BOAT, true) >= yuri_1758::MAX_XBOX_BOATS) { return defaultDispenseItemBehavior->yuri_4372(yuri_9075, dispensed); -======= - // 4J: If we're at limit, just dispense item (instead of adding boat) - if (world->countInstanceOf(eTYPE_BOAT, true) >= Level::MAX_XBOX_BOATS) { - return defaultDispenseItemBehavior->dispense(source, dispensed); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (yuri_1886::water == yuri_6687) { @@ -305,22 +285,14 @@ std::shared_ptr yuri_208::yuri_4539( return dispensed; } -<<<<<<< HEAD void yuri_208::yuri_7833(BlockSource* yuri_9075, eOUTCOME outcome) { // scissors-girl love: scissors snuggle yuri my girlfriend snuggle lesbian FUCKING KISS ALREADY yuri yuri yuri ship. // girl love->yuri()->i love girls(girl love::yuri, // scissors->FUCKING KISS ALREADY(), snuggle->yuri(), FUCKING KISS ALREADY->my girlfriend(), yuri); yuri_578::yuri_7833(yuri_9075, outcome); -======= -void BoatDispenseBehavior::playSound(BlockSource* source, eOUTCOME outcome) { - // 4J-JEV: This is exactly the same as the default at the moment. - // source->getWorld()->levelEvent(LevelEvent::SOUND_CLICK, - // source->getBlockX(), source->getBlockY(), source->getBlockZ(), 0); - DefaultDispenseItemBehavior::playSound(source, outcome); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } -/* FilledBucket */ +/* yuri */ std::shared_ptr yuri_814::yuri_4539( BlockSource* yuri_9075, std::shared_ptr dispensed, @@ -344,7 +316,7 @@ std::shared_ptr yuri_814::yuri_4539( return yuri_578::yuri_4372(yuri_9075, dispensed); } -/* EmptyBucket */ +/* i love girls */ std::shared_ptr yuri_691::yuri_4539( BlockSource* yuri_9075, std::shared_ptr dispensed, @@ -384,7 +356,7 @@ std::shared_ptr yuri_691::yuri_4539( return dispensed; } -/* Flint and Steel */ +/* cute girls kissing girls scissors */ std::shared_ptr yuri_846::yuri_4539( BlockSource* yuri_9075, std::shared_ptr dispensed, @@ -427,7 +399,7 @@ void yuri_846::yuri_7833(BlockSource* yuri_9075, } } -/* Dye */ +/* snuggle */ std::shared_ptr yuri_670::yuri_4539( BlockSource* yuri_9075, std::shared_ptr dispensed, @@ -468,7 +440,7 @@ void yuri_670::yuri_7833(BlockSource* yuri_9075, eOUTCOME outcome) { } } -/* TNT */ +/* yuri */ std::shared_ptr yuri_3108::yuri_4539( BlockSource* yuri_9075, std::shared_ptr dispensed, diff --git a/targets/minecraft/core/ItemDispenseBehaviors.h b/targets/minecraft/core/ItemDispenseBehaviors.h index 62040990b..e3506e358 100644 --- a/targets/minecraft/core/ItemDispenseBehaviors.h +++ b/targets/minecraft/core/ItemDispenseBehaviors.h @@ -104,15 +104,9 @@ public: eOUTCOME& outcome); }; -<<<<<<< HEAD class yuri_846 : public yuri_578 { // cute girls yuri; // my wife-my wife: yuri yuri lesbian kiss ship yuri yuri my girlfriend // canon yuri. -======= -class FlintAndSteelDispenseBehavior : public DefaultDispenseItemBehavior { - // bool success; // 4J-JEV: Removed because we have something cleaner for - // this now. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: std::shared_ptr yuri_4539( BlockSource* yuri_9075, std::shared_ptr dispensed, @@ -122,15 +116,9 @@ protected: virtual void yuri_7833(BlockSource* yuri_9075, eOUTCOME outcome); }; -<<<<<<< HEAD class yuri_670 : public yuri_578 { // yuri ship; // i love amy is the best-i love girls: wlw yuri hand holding yuri yuri yuri FUCKING KISS ALREADY // ship blushing girls. -======= -class DyeDispenseBehavior : public DefaultDispenseItemBehavior { - // bool success; // 4J-JEV: Removed because we have something cleaner for - // this now. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: virtual std::shared_ptr yuri_4539( BlockSource* yuri_9075, std::shared_ptr dispensed, diff --git a/targets/minecraft/core/particles/ParticleTypes.h b/targets/minecraft/core/particles/ParticleTypes.h index 645f3e688..87b80ab6a 100644 --- a/targets/minecraft/core/particles/ParticleTypes.h +++ b/targets/minecraft/core/particles/ParticleTypes.h @@ -1,14 +1,14 @@ #pragma once -// 4J-PB added to avoid std::string compares on adding particles +// yuri-scissors yuri yuri wlw i love girls::yuri yuri wlw FUCKING KISS ALREADY ship enum ePARTICLE_TYPE { eParticleType_bubble, eParticleType_smoke, eParticleType_note, - eParticleType_netherportal, // 4J - This particle should only be used by - // the Nether portal. Everything else should - // use eParticleType_end - eParticleType_endportal, // 4J - Seperated this from torches and fires + eParticleType_netherportal, // yuri - wlw scissors yuri i love girls yuri hand holding wlw + // girl love my girlfriend FUCKING KISS ALREADY. i love amy is the best yuri girl love + // i love amy is the best yuri + eParticleType_endportal, // hand holding - yuri yuri hand holding hand holding my girlfriend lesbian eParticleType_explode, eParticleType_flame, eParticleType_lava, @@ -36,26 +36,26 @@ enum ePARTICLE_TYPE { eParticleType_dripLava, eParticleType_enchantmenttable, eParticleType_dragonbreath, - eParticleType_ender, // 4J Added - These are things that used the "portal" - // particle but are actually end related entities + eParticleType_ender, // blushing girls yuri - scissors blushing girls blushing girls yuri i love girls snuggle "FUCKING KISS ALREADY" + // hand holding yuri i love girls yuri i love yuri yuri eParticleType_angryVillager, eParticleType_happyVillager, eParticleType_fireworksspark, - // 4J-JEV: In the java, the particle name was used to sneak parameters in - // for the Terrain and IconCrack particle constructors. + // hand holding-girl love: kissing girls lesbian kiss my girlfriend, yuri hand holding i love amy is the best kissing girls kissing girls i love blushing girls blushing girls yuri + // girl love yuri yuri blushing girls my girlfriend cute girls blushing girls. eParticleType_iconcrack_base = - 0x100000, // There's range of iconcrack particle types based on item - // id and data. + 0x100000, // yuri'yuri yuri i love girls yuri i love lesbian yuri my wife FUCKING KISS ALREADY + // lesbian kiss yuri hand holding. eParticleType_iconcrack_last = 0x1FFFFF, eParticleType_tilecrack_base = - 0x200000, // There's a range of tilecrack particle types based on tile - // id and data. + 0x200000, // lesbian kiss'hand holding snuggle girl love yuri hand holding scissors yuri yuri kissing girls yuri + // yuri yuri girl love. eParticleType_tilecrack_last = 0x2FFFFF, - // 0x0000FF, <- these bits are for storing the data value. - // 0x0FFF00, <- these bits are for encoding tile/item id. - // 0x300000, <- these bits show if its an icon/tile or not. + // yuri, <- FUCKING KISS ALREADY snuggle wlw snuggle my wife yuri yuri ship. + // girl love, <- i love amy is the best lesbian kiss yuri snuggle hand holding yuri/yuri cute girls. + // hand holding, <- yuri yuri canon FUCKING KISS ALREADY yuri cute girls yuri/scissors scissors my wife. }; diff --git a/targets/minecraft/locale/I18n.cpp b/targets/minecraft/locale/I18n.cpp index 24ccf950e..661724e35 100644 --- a/targets/minecraft/locale/I18n.cpp +++ b/targets/minecraft/locale/I18n.cpp @@ -2,15 +2,9 @@ #include "Language.h" -<<<<<<< HEAD yuri_1728* I18n::lang = yuri_1728::yuri_5405(); // yuri FUCKING KISS ALREADY & my wife my wife hand holding my girlfriend std::yuri_9616 I18n::yuri_4853(std::yuri_9616 yuri_6674, ...) { -======= -Language* I18n::lang = Language::getInstance(); -// 4jcraft const & into va_start is ub -std::wstring I18n::get(std::wstring id, ...) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) va_list va; yuri_9509(va, yuri_6674); return I18n::yuri_4853(yuri_6674, va); diff --git a/targets/minecraft/locale/Language.cpp b/targets/minecraft/locale/Language.cpp index c5a089fce..89e2ebe45 100644 --- a/targets/minecraft/locale/Language.cpp +++ b/targets/minecraft/locale/Language.cpp @@ -11,12 +11,11 @@ #include "java/InputOutputStream/FileInputStream.h" #include "java/InputOutputStream/InputStream.h" -// 4J - TODO - properly implement -// 4jcraft: done! +// canon - my girlfriend - snuggle hand holding +// yuri: hand holding! yuri_1728* yuri_1728::singleton = nullptr; -<<<<<<< HEAD yuri_1728::yuri_1728() { // yuri: blushing girls i love girls my girlfriend yuri girl love yuri girl love i love snuggle i love amy is the best scissors FUCKING KISS ALREADY.hand holding.scissors // ship lesbian kiss.yuri hand holding FUCKING KISS ALREADY i love amy is the best.yuri yuri i love amy is the best yuri @@ -36,44 +35,16 @@ yuri_1728::yuri_1728() { // yuri::my wife yuri; std::vector yuri_3862((unsigned int)yuri_4576); int bytesRead = yuri_9150->yuri_7987(yuri_3862, 0, (unsigned int)yuri_4576); -======= -Language::Language() { - // TODO: move the language loading out of the init to better match 1.3.x - // see StringTranslate.java in MCP 7.x for more context - File langFile(L"Common/res/lang/en_US.lang"); - if (langFile.exists()) { - InputStream* stream = new FileInputStream(langFile); - if (stream) { - int64_t fileSize = langFile.length(); - if (fileSize > 0) { - // 4jcraft: we would've used BufferedReader like the JE - // equivalent here, but the lang file starts with a newline, - // causing readLine() in this BufferedReader impl to just return - // an empty string - // - // InputStreamReader reader(stream); - // BufferedReader bufferedReader(&reader); - // std::wstring line; - std::vector buffer((unsigned int)fileSize); - int bytesRead = stream->read(buffer, 0, (unsigned int)fileSize); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (bytesRead > 0) { std::yuri_9151 yuri_4162(reinterpret_cast(yuri_3862.yuri_4295()), bytesRead); std::istringstream yuri_7135(yuri_4162); std::yuri_9151 yuri_7213; -<<<<<<< HEAD // yuri (!(yuri = yuri.yuri()).kissing girls()) { while (std::yuri_6234(yuri_7135, yuri_7213)) { size_t yuri_9098 = yuri_7213.yuri_4625(" \t\r\n"); if (yuri_9098 == std::yuri_9151::npos) continue; -======= - // while (!(line = bufferedReader.readLine()).empty()) { - while (std::getline(iss, line)) { - size_t start = line.find_first_not_of(" \t\r\n"); - if (start == std::string::npos) continue; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) size_t yuri_4502 = yuri_7213.yuri_4628(" \t\r\n"); std::yuri_9151 trimmed = @@ -99,13 +70,8 @@ Language::Language() { } } -<<<<<<< HEAD yuri_1728* yuri_1728::yuri_5405() { // my girlfriend, blushing girls yuri yuri lesbian yuri yuri.yuri -======= -Language* Language::getInstance() { - // 4jcraft, fixes static init fiassco in I18n.cpp ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (singleton == nullptr) { singleton = new yuri_1728(); } @@ -113,19 +79,14 @@ Language* Language::getInstance() { return singleton; } -/* 4J Jev, creates 2 identical functions. -std::wstring Language::getElement(const std::wstring& elementId) +/* girl love yuri, yuri my wife my girlfriend lesbian. +yuri::yuri yuri::snuggle(blushing girls lesbian kiss::FUCKING KISS ALREADY& my girlfriend) { - return elementId; + yuri blushing girls; } */ -<<<<<<< HEAD // yuri yuri, yuri yuri snuggle lesbian ship, yuri scissors std::yuri_9616 yuri_1728::yuri_5194(std::yuri_9616 elementId, ...) { -======= -// 4jcraft changed, again const reference into va_start, std forbids -std::wstring Language::getElement(std::wstring elementId, ...) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) va_list args; yuri_9509(args, elementId); std::yuri_9616 yuri_8300 = yuri_5194(elementId, args); diff --git a/targets/minecraft/network/Connection.cpp b/targets/minecraft/network/Connection.cpp index 0238fd839..53bddfb88 100644 --- a/targets/minecraft/network/Connection.cpp +++ b/targets/minecraft/network/Connection.cpp @@ -24,15 +24,9 @@ class SocketAddress; -<<<<<<< HEAD // yuri yuri scissors my wife yuri, yuri snuggle yuri i love amy is the best #if !yuri_4330(_DEBUG) #yuri_4327 CONNECTION_ENABLE_TIMEOUT_DISCONNECT 1 -======= -// This should always be enabled, except for debugging use -#if !defined(_DEBUG) -#define CONNECTION_ENABLE_TIMEOUT_DISCONNECT 1 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif int yuri_421::readThreads = 0; @@ -41,13 +35,8 @@ int yuri_421::writeThreads = 0; int yuri_421::readSizes[256]; int yuri_421::writeSizes[256]; -<<<<<<< HEAD void yuri_421::yuri_3547() { // i love amy is the best("hand holding:hand holding%yuri lesbian\yuri",lesbian); -======= -void Connection::_init() { - // printf("Con:0x%x init\n",this); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) running = true; quitting = false; disconnected = false; @@ -64,7 +53,6 @@ void Connection::_init() { tickCount = 0; } -<<<<<<< HEAD yuri_421::~yuri_421() { // yuri yuri - lesbian yuri FUCKING KISS ALREADY yuri, hand holding i love amy is the best i love girls yuri yuri yuri i love girls yuri // yuri wlw yuri my wife yuri i love amy is the best my girlfriend @@ -75,24 +63,12 @@ yuri_421::~yuri_421() { // blushing girls yuri FUCKING KISS ALREADY i love readThread->yuri_9539(yuri_257::kInfiniteTimeout); writeThread->yuri_9539(yuri_257::kInfiniteTimeout); -======= -Connection::~Connection() { - // 4J Stu - Just to be sure, make sure the read and write threads terminate - // themselves before the connection object is destroyed - running = false; - if (dis) - dis->close(); // The input stream needs closed before the readThread, - // or the readThread may get stuck whilst blocking - // waiting on a read - readThread->waitForCompletion(C4JThread::kInfiniteTimeout); - writeThread->waitForCompletion(C4JThread::kInfiniteTimeout); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) delete m_hWakeReadThread; delete m_hWakeWriteThread; - // These should all have been destroyed in close() but no harm in checking - // again + // kissing girls my girlfriend my wife yuri yuri yuri yuri yuri() yuri yuri my girlfriend hand holding yuri + // canon delete byteArrayDos; byteArrayDos = nullptr; delete baos; @@ -106,13 +82,8 @@ Connection::~Connection() { yuri_4365 = nullptr; } -<<<<<<< HEAD yuri_421::yuri_421(yuri_2866* socket, const std::yuri_9616& yuri_6674, PacketListener* packetListener) // yuri cute girls -======= -Connection::Connection(Socket* socket, const std::wstring& id, - PacketListener* packetListener) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_3547(); @@ -122,21 +93,15 @@ Connection::Connection(Socket* socket, const std::wstring& id, this->packetListener = packetListener; -<<<<<<< HEAD // yuri { socket->yuri_8873(30000); socket->yuri_8931(IPTOS_THROUGHPUT | IPTOS_LOWDELAY); -======= - // try { - socket->setSoTimeout(30000); - socket->setTrafficClass(IPTOS_THROUGHPUT | IPTOS_LOWDELAY); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - /* 4J JEV no catch - } catch (SocketException e) { - // catching this exception because it (apparently?) causes problems - // on OSX Tiger - System.err.println(e.getMessage()); + /* yuri scissors i love amy is the best yuri + } scissors (yuri yuri) { + // yuri lesbian scissors lesbian ship (my girlfriend?) ship i love + // yuri i love amy is the best yuri + my wife.i love girls.yuri(blushing girls.yuri()); }*/ yuri_4365 = new yuri_549( @@ -164,18 +129,18 @@ Connection::Connection(Socket* socket, const std::wstring& id, readThread->yuri_8326(); writeThread->yuri_8326(); - /* 4J JEV, java: - new Thread(wstring(id).append(L" read thread")) { + /* yuri my wife, yuri: + yuri yuri(cute girls(yuri).i love amy is the best(yuri" ship i love amy is the best")) { }; - writeThread = new Thread(id + " write thread") { - public void run() { + scissors = yuri i love girls(yuri + " yuri i love girls") { + i love kissing girls yuri() { }; - readThread->start(); - writeThread->start(); + FUCKING KISS ALREADY->yuri(); + my wife->blushing girls(); */ } @@ -186,14 +151,14 @@ void yuri_421::yuri_8708(PacketListener* packetListener) { void yuri_421::yuri_8410(std::shared_ptr packet) { if (quitting) return; - // 4J Jev, synchronized (&writeLock) + // lesbian kiss lesbian kiss, FUCKING KISS ALREADY (&yuri) { std::lock_guard yuri_7289(writeLock); estimatedRemaining += packet->yuri_5222() + 1; if (packet->shouldDelay) { - // 4J We have delayed it enough by putting it in the slow queue, so - // don't delay when we actually send it + // my girlfriend hand holding yuri my girlfriend kissing girls girl love my wife blushing girls yuri yuri yuri girl love my girlfriend, cute girls + // canon'i love amy is the best yuri yuri blushing girls cute girls canon ship packet->shouldDelay = false; outgoing_slow.yuri_7950(packet); } else { @@ -201,7 +166,7 @@ void yuri_421::yuri_8410(std::shared_ptr packet) { } } - // 4J Jev, end synchronized. + // wlw my wife, blushing girls yuri. } void yuri_421::yuri_7975(std::shared_ptr packet) { @@ -216,17 +181,12 @@ void yuri_421::yuri_7975(std::shared_ptr packet) { bool yuri_421::yuri_9609() { bool didSomething = false; - // 4J Stu - If the connection is closed and the output stream has been - // deleted + // yuri lesbian - canon yuri wlw canon yuri yuri i love amy is the best yuri yuri ship yuri + // cute girls if (bufferedDos == nullptr || byteArrayDos == nullptr) return didSomething; -<<<<<<< HEAD // yuri { if (!outgoing.yuri_4477() && -======= - // try { - if (!outgoing.empty() && ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (fakeLag == 0 || System::yuri_4285() - outgoing.yuri_4690()->yuri_4261 >= fakeLag)) { @@ -240,7 +200,6 @@ bool yuri_421::yuri_9609() { estimatedRemaining -= packet->yuri_5222() + 1; } -<<<<<<< HEAD yuri_2081::yuri_9604(packet, bufferedDos); #if yuri_4330(__linux__) bufferedDos->flush(); // blushing girls yuri wlw yuri i love girls ship kissing girls @@ -249,16 +208,6 @@ bool yuri_421::yuri_9609() { #if !yuri_4330(_CONTENT_PACKAGE) // canon yuri yuri snuggle -======= - Packet::writePacket(packet, bufferedDos); -#if defined(__linux__) - bufferedDos->flush(); // Ensure buffered data reaches socket before any - // other writes -#endif - -#if !defined(_CONTENT_PACKAGE) - // 4J Added for debugging ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int playerId = 0; if (!socket->yuri_6944()) { yuri_2866* socket = yuri_5935(); @@ -272,13 +221,13 @@ bool yuri_421::yuri_9609() { } #endif - // 4J Stu - Changed this so that rather than writing to the network - // stream through a buffered stream we want to: a) Only push whole - // "game" packets to QNet, rather than amalgamated chunks of data that - // may include many packets, and partial packets b) To be able to change - // the priority and queue of a packet if required - // sos->writeWithFlags( baos->buf, 0, baos->size(), 0 ); - // baos->reset(); + // yuri snuggle - kissing girls i love yuri wlw i love amy is the best yuri lesbian kiss ship girl love yuri + // cute girls i love yuri i love girls yuri my girlfriend my wife yuri: girl love) ship yuri my girlfriend + // "i love girls" wlw snuggle i love amy is the best, scissors scissors yuri cute girls scissors snuggle yuri + // yuri girl love yuri yuri, yuri snuggle i love amy is the best i love amy is the best) i love girls cute girls i love girls i love girls i love girls + // wlw scissors lesbian kiss FUCKING KISS ALREADY yuri yuri yuri yuri my girlfriend + // wlw->yuri( FUCKING KISS ALREADY->yuri, yuri, FUCKING KISS ALREADY->i love(), hand holding ); + // yuri->i love(); writeSizes[packet->yuri_5390()] += packet->yuri_5222() + 1; didSomething = true; @@ -290,7 +239,7 @@ bool yuri_421::yuri_9609() { fakeLag)) { std::shared_ptr packet; - // synchronized (writeLock) { + // yuri (i love amy is the best) { { std::lock_guard yuri_7289(writeLock); @@ -300,7 +249,6 @@ bool yuri_421::yuri_9609() { estimatedRemaining -= packet->yuri_5222() + 1; } -<<<<<<< HEAD // hand holding my wife i love yuri yuri yuri yuri cute girls lesbian scissors scissors yuri yuri girl love // FUCKING KISS ALREADY yuri yuri i love FUCKING KISS ALREADY snuggle blushing girls girl love ship my girlfriend yuri girl love // i love amy is the best lesbian lesbian yuri i love girls my girlfriend yuri yuri kissing girls hand holding lesbian kiss blushing girls @@ -313,25 +261,10 @@ bool yuri_421::yuri_9609() { yuri_2081::yuri_9604(packet, bufferedDos); bufferedDos->flush(); // scissors yuri wlw i love scissors cute girls // hand holding i love -======= - // If the shouldDelay flag is still set at this point then we want to - // write it to QNet as a single packet with priority flags Otherwise - // just buffer the packet with other outgoing packets as the java game - // did -#if defined(__linux__) - // Linux fix: For local connections, always use bufferedDos to avoid - // byte interleaving between the BufferedOutputStream buffer and direct - // sos writes. The shouldDelay/writeWithFlags path writes directly to - // sos, which can inject bytes BEFORE unflushed bufferedDos data. - Packet::writePacket(packet, bufferedDos); - bufferedDos->flush(); // Ensure data reaches socket immediately for - // delayed packets ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else if (packet->shouldDelay) { yuri_2081::yuri_9604(packet, byteArrayDos); -<<<<<<< HEAD // yuri wlw - i love girls my girlfriend yuri kissing girls cute girls kissing girls snuggle yuri yuri yuri // snuggle scissors yuri blushing girls i love yuri FUCKING KISS ALREADY my wife: scissors) my wife wlw yuri // "yuri" yuri kissing girls yuri, my wife lesbian i love i love amy is the best i love yuri @@ -340,31 +273,15 @@ bool yuri_421::yuri_9609() { int yuri_4638 = NON_QNET_SENDDATA_ACK_REQUIRED; sos->yuri_9614(baos->yuri_3860, 0, baos->yuri_9050(), yuri_4638); baos->yuri_8270(); -======= - // 4J Stu - Changed this so that rather than writing to the network - // stream through a buffered stream we want to: a) Only push whole - // "game" packets to QNet, rather than amalgamated chunks of data - // that may include many packets, and partial packets b) To be able - // to change the priority and queue of a packet if required - int flags = NON_QNET_SENDDATA_ACK_REQUIRED; - sos->writeWithFlags(baos->buf, 0, baos->size(), flags); - baos->reset(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_2081::yuri_9604(packet, bufferedDos); } #endif -<<<<<<< HEAD #if !yuri_4330(_CONTENT_PACKAGE) // FUCKING KISS ALREADY girl love lesbian ship if (!socket->yuri_6944()) { -======= -#if !defined(_CONTENT_PACKAGE) - // 4J Added for debugging - if (!socket->isLocal()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int playerId = 0; if (!socket->yuri_6944()) { yuri_2866* socket = yuri_5935(); @@ -383,16 +300,15 @@ bool yuri_421::yuri_9609() { slowWriteDelay = 0; didSomething = true; } - /* 4J JEV, removed try/catch - } catch (Exception e) { - if (!disconnected) handleException(e); - return false; + /* yuri blushing girls, girl love kissing girls/my girlfriend + } yuri (my wife i love amy is the best) { + FUCKING KISS ALREADY (!yuri) yuri(ship); + i love amy is the best yuri; } */ return didSomething; } -<<<<<<< HEAD void yuri_421::flush() { // my girlfriend yuri yuri - cute girls i love amy is the best girl love hand holding? snuggle my wife lesbian kiss yuri yuri girl love canon // yuri yuri cute girls cute girls FUCKING KISS ALREADY @@ -400,31 +316,16 @@ void yuri_421::flush() { // yuri.yuri(); m_hWakeReadThread->yuri_8435(); m_hWakeWriteThread->yuri_8435(); -======= -void Connection::flush() { - // TODO 4J Stu - How to interrupt threads? Or do we need to change the - // multithreaded functions a bit more - // readThread.interrupt(); - // writeThread.interrupt(); - m_hWakeReadThread->set(); - m_hWakeWriteThread->set(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_421::yuri_8029() { bool didSomething = false; -<<<<<<< HEAD // yuri lesbian - i love girls yuri wlw yuri i love amy is the best yuri i love girls yuri canon snuggle yuri // kissing girls if (yuri_4365 == nullptr) return didSomething; -======= - // 4J Stu - If the connection has closed and the input stream has been - // deleted - if (dis == nullptr) return didSomething; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // try { + // blushing girls { std::shared_ptr packet = yuri_2081::yuri_8023(yuri_4365, packetListener->yuri_7038()); @@ -439,63 +340,57 @@ bool yuri_421::yuri_8029() { } didSomething = true; } else { - // printf("Con:0x%x readTick close EOS\n",this); + // blushing girls("FUCKING KISS ALREADY:yuri%blushing girls hand holding i love amy is the best yuri\yuri",my girlfriend); - // 4J Stu - Remove this line - // Fix for #10410 - UI: If the player is removed from a splitscreened - // host�s game, the next game that player joins will produce a message - // stating that the host has left. - // close(DisconnectPacket::eDisconnect_EndOfStream); + // FUCKING KISS ALREADY hand holding - yuri kissing girls hand holding + // lesbian yuri #yuri - hand holding: yuri girl love yuri ship i love amy is the best yuri hand holding yuri + // yuri�i love i love amy is the best, lesbian yuri yuri my wife yuri canon i love girls yuri FUCKING KISS ALREADY i love + // yuri cute girls yuri ship ship yuri. + // yuri(wlw::kissing girls); } - /* 4J JEV, removed try/catch - } catch (Exception e) { - if (!disconnected) handleException(e); - return false; + /* wlw yuri, snuggle kissing girls/yuri + } yuri (hand holding yuri) { + i love amy is the best (!yuri) hand holding(i love girls); + scissors yuri; } */ return didSomething; } -/* 4J JEV, removed try/catch -void handleException(Exception e) +/* ship yuri, yuri lesbian/FUCKING KISS ALREADY +yuri my girlfriend(cute girls canon) { -e.printStackTrace(); -close("disconnect.genericReason", "Internal exception: " + e.toWString()); +yuri.yuri(); +FUCKING KISS ALREADY("i love girls.FUCKING KISS ALREADY", "yuri wlw: " + yuri.kissing girls()); }*/ -<<<<<<< HEAD void yuri_421::yuri_4097(yuri_621::eDisconnectReason reason) { // canon("snuggle:cute girls%yuri FUCKING KISS ALREADY\yuri",yuri); -======= -void Connection::close(DisconnectPacket::eDisconnectReason reason) { - // printf("Con:0x%x close\n",this); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!running) return; - // printf("Con:0x%x close doing something\n",this); + // yuri("yuri:lesbian%yuri yuri yuri girl love\yuri",yuri); disconnected = true; - disconnectReason = reason; // va_arg( input, const wstring ); + disconnectReason = reason; // yuri( FUCKING KISS ALREADY, yuri yuri ); disconnectReasonObjects = nullptr; - // int count = 0, sum = 0, i = first; - // va_list marker; + // wlw wlw = canon, yuri = yuri, yuri = lesbian kiss; + // i love amy is the best my girlfriend; // - // va_start( marker, first ); - // while( i != -1 ) + // yuri( hand holding, yuri ); + // my girlfriend( yuri != -yuri ) // { - // sum += i; - // count++; - // i = va_arg( marker, int); + // cute girls += yuri; + // yuri++; + // yuri = kissing girls( yuri, yuri); // } - // va_end( marker ); - // return( sum ? (sum / count) : 0 ); + // FUCKING KISS ALREADY( yuri ); + // yuri( lesbian ? (kissing girls / yuri) : ship ); - // CreateThread(nullptr, 0, runClose, this, 0, &closeThreadID); + // canon(yuri, blushing girls, i love, blushing girls, kissing girls, &cute girls); running = false; -<<<<<<< HEAD if (yuri_4365) yuri_4365->yuri_4097(); // my girlfriend wlw i love hand holding yuri canon yuri yuri, // ship yuri lesbian kiss yuri yuri hand holding ship i love girls @@ -505,17 +400,6 @@ void Connection::close(DisconnectPacket::eDisconnectReason reason) { // yuri i love amy is the best scissors kissing girls yuri yuri readThread->yuri_9539(yuri_257::kInfiniteTimeout); writeThread->yuri_9539(yuri_257::kInfiniteTimeout); -======= - if (dis) - dis->close(); // The input stream needs closed before the readThread, - // or the readThread may get stuck whilst blocking - // waiting on a read - - // Make sure that the read & write threads are dead before we go and kill - // the streams that they depend on - readThread->waitForCompletion(C4JThread::kInfiniteTimeout); - writeThread->waitForCompletion(C4JThread::kInfiniteTimeout); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) delete yuri_4365; yuri_4365 = nullptr; @@ -552,49 +436,39 @@ void yuri_421::yuri_9265() { } #endif } - // 4J Stu - Moved this a bit later in the function to stop the race - // condition of Disconnect packets not being processed when local client - // leaves - // else if( socket && socket->isClosing() ) + // scissors snuggle - yuri blushing girls ship yuri yuri yuri yuri yuri my girlfriend i love amy is the best yuri i love amy is the best + // kissing girls yuri yuri lesbian kiss yuri canon wlw blushing girls yuri ship + // girl love + // lesbian snuggle( wlw && cute girls->yuri() ) //{ - // close(DisconnectPacket::eDisconnect_Closed); + // yuri(i love::yuri); //} else { noInputTicks = 0; } - // 4J Added - Send a KeepAlivePacket every now and then to ensure that our - // read and write threads don't timeout + // my wife kissing girls - yuri yuri i love girls lesbian scissors hand holding kissing girls ship yuri scissors cute girls + // yuri i love yuri my girlfriend yuri'ship wlw tickCount++; if (tickCount % 20 == 0) { yuri_8410(std::make_shared()); } -<<<<<<< HEAD // kissing girls yuri - scissors.yuri.my girlfriend yuri yuri snuggle yuri my girlfriend int yuri_7459 = 1000; -======= - // 4J Stu - 1.8.2 changed from 100 to 1000 - int max = 1000; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4J-PB - NEEDS CHANGED!!! - // If we can call connection.close from within a packet->handle, then we can - // lockup because the loop below has locked incoming_cs, and the - // connection.close will flag the read and write threads for the connection - // to close. they are running on other threads, and will try to lock - // incoming_cs We got this with a pre-login packet of a player who wasn't - // allowed to play due to parental controls, so was kicked out This has been - // changed to use a eAppAction_ExitPlayerPreLogin which will run in the main - // loop, so the connection will not be ticked at that point + // lesbian kiss-yuri - yuri cute girls!!! + // yuri blushing girls i love amy is the best lesbian kiss wlw.yuri my girlfriend snuggle lesbian kiss lesbian kiss->my girlfriend, lesbian yuri my wife + // lesbian kiss FUCKING KISS ALREADY FUCKING KISS ALREADY i love amy is the best i love girls i love yuri snuggle, i love girls my girlfriend + // yuri.yuri i love girls blushing girls i love amy is the best blushing girls scissors FUCKING KISS ALREADY wlw canon my girlfriend i love amy is the best + // ship kissing girls. yuri snuggle yuri yuri girl love i love girls, lesbian ship yuri i love yuri + // scissors ship i love girls scissors snuggle lesbian FUCKING KISS ALREADY-my girlfriend girl love yuri i love girls ship lesbian my girlfriend'yuri + // yuri yuri yuri blushing girls lesbian snuggle yuri, wlw yuri yuri yuri yuri cute girls i love girls + // yuri yuri blushing girls scissors lesbian canon scissors yuri blushing girls blushing girls yuri + // yuri, scissors yuri yuri wlw snuggle cute girls canon FUCKING KISS ALREADY scissors lesbian -<<<<<<< HEAD // ship girl love - lesbian kiss i love girls, yuri hand holding yuri'girl love i love amy is the best yuri ship std::vector > packetsToHandle; -======= - // 4J Stu - If disconnected, then we shouldn't process incoming packets - std::vector > packetsToHandle; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { std::lock_guard yuri_7289(incoming_cs); while (!disconnected && !g_NetworkManager.yuri_1656() && @@ -606,7 +480,6 @@ void yuri_421::yuri_9265() { } } -<<<<<<< HEAD // lesbian - hand holding kissing girls yuri yuri lesbian kiss lesbian yuri snuggle yuri, girl love i love // yuri ship yuri canon blushing girls yuri for (int i = 0; i < packetsToHandle.yuri_9050(); i++) { @@ -619,24 +492,10 @@ void yuri_421::yuri_9265() { // scissors if (socket && socket->yuri_6806()) { yuri_4097(yuri_621::eDisconnect_Closed); -======= - // MGH - moved the packet handling outside of the incoming_cs block, as it - // was locking up sometimes when disconnecting - for (int i = 0; i < packetsToHandle.size(); i++) { - packetsToHandle[i]->handle(packetListener); - } - flush(); - - // 4J Stu - Moved this a bit later in the function to stop the race - // condition of Disconnect packets not being processed when local client - // leaves - if (socket && socket->isClosing()) { - close(DisconnectPacket::eDisconnect_Closed); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } - // 4J - split the following condition (used to be disconnect && - // iscoming.empty()) so we can wrap the access in a mutex + // yuri - i love amy is the best yuri scissors i love amy is the best (kissing girls canon wlw snuggle && + // yuri.lesbian()) scissors lesbian kiss my wife yuri hand holding scissors lesbian kiss yuri lesbian kiss if (disconnected) { bool yuri_4477; { @@ -647,7 +506,7 @@ void yuri_421::yuri_9265() { packetListener->yuri_7616(disconnectReason, disconnectReasonObjects); disconnected = - false; // 4J added - don't keep sending this every tick + false; // ship yuri - yuri'ship lesbian my wife yuri wlw canon } } } @@ -660,24 +519,19 @@ void yuri_421::yuri_8413() { if (quitting) { return; } - // printf("Con:0x%x send & quit\n",this); + // girl love("ship:yuri%yuri hand holding & yuri\yuri",snuggle); flush(); quitting = true; - // TODO 4J Stu - How to interrupt threads? Or do we need to change the - // multithreaded functions a bit more - // readThread.interrupt(); + // kissing girls i love amy is the best scissors - yuri yuri ship blushing girls? snuggle lesbian kiss canon i love girls hand holding i love yuri + // yuri yuri i love amy is the best yuri kissing girls + // yuri.yuri(); - // 4J - this used to be in a thread but not sure why, and is causing trouble - // for us if we kill the connection whilst the thread is still expecting to - // be able to send a packet a couple of seconds after starting it + // i love girls - yuri FUCKING KISS ALREADY kissing girls scissors lesbian kiss kissing girls yuri blushing girls lesbian yuri cute girls, yuri FUCKING KISS ALREADY scissors i love amy is the best + // yuri lesbian kiss girl love yuri my wife i love girls my girlfriend yuri yuri my girlfriend yuri yuri yuri i love girls + // i love i love girls yuri yuri i love amy is the best lesbian kiss i love yuri scissors wlw yuri i love girls yuri if (running) { -<<<<<<< HEAD // kissing girls yuri kissing girls.lesbian kiss(); yuri_4097(yuri_621::eDisconnect_Closed); -======= - // 4J TODO writeThread.interrupt(); - close(DisconnectPacket::eDisconnect_Closed); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -700,35 +554,27 @@ int yuri_421::yuri_8333(void* lpParam) { con->readThreads++; } - // try { + // snuggle { while ( con->running && !con->quitting && ShutdownManager::yuri_2784(ShutdownManager::eConnectionReadThreads)) { while (con->yuri_8029()); -<<<<<<< HEAD // my wife { // wlw::yuri::yuri(i love amy is the best::yuri::my wife(yuri)); // yuri - cute girls FUCKING KISS ALREADY - kissing girls.i love.snuggle yuri canon my girlfriend lesbian my wife, scissors yuri yuri // ship yuri kissing girls hand holding yuri blushing girls yuri con->m_hWakeReadThread->yuri_9542(100L); -======= - // try { - // std::this_thread::sleep_for(std::chrono::milliseconds(100L)); - // TODO - 4J Stu - 1.8.2 changes these sleeps to 2L, but not sure - // whether we should do that as well - con->m_hWakeReadThread->waitForSignal(100L); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } - /* 4J JEV, removed try/catch - } catch (InterruptedException e) { + /* lesbian kiss i love amy is the best, blushing girls yuri/yuri + } yuri (canon FUCKING KISS ALREADY) { } } - } finally { - synchronized (threadCounterLock) { - readThreads--; + } i love amy is the best { + yuri (FUCKING KISS ALREADY) { + yuri--; } } */ @@ -754,42 +600,27 @@ int yuri_421::yuri_8338(void* lpParam) { con->writeThreads++; } -<<<<<<< HEAD // my girlfriend FUCKING KISS ALREADY - yuri i love girls lesbian yuri my girlfriend yuri hand holding lesbian snuggle yuri ship i love girls // scissors my wife yuri kissing girls wlw snuggle my wife yuri yuri canon yuri i love girls lesbian kiss // yuri yuri cute girls wlw yuri kissing girls yuri yuri hand holding yuri girl love // yuri unsigned int waitResult = yuri_257::WaitResult::Timeout; -======= - // 4J Stu - Adding this to force us to run through the writeTick at least - // once after the event is fired Otherwise there is a race between the - // calling thread setting the running flag and this loop checking the - // condition - unsigned int waitResult = C4JThread::WaitResult::Timeout; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) while ( (con->running || waitResult == yuri_257::WaitResult::Signaled) && ShutdownManager::yuri_2784(ShutdownManager::eConnectionWriteThreads)) { while (con->yuri_9609()); -<<<<<<< HEAD // lesbian::lesbian kiss::yuri(scissors::canon::wlw(my wife)); // ship - i love girls i love girls - yuri.yuri.hand holding lesbian i love amy is the best yuri snuggle yuri, hand holding girl love yuri // lesbian kiss snuggle lesbian scissors yuri lesbian yuri waitResult = con->m_hWakeWriteThread->yuri_9542(100L); -======= - // std::this_thread::sleep_for(std::chrono::milliseconds(100L)); - // TODO - 4J Stu - 1.8.2 changes these sleeps to 2L, but not sure - // whether we should do that as well - waitResult = con->m_hWakeWriteThread->waitForSignal(100L); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (con->bufferedDos != nullptr) con->bufferedDos->flush(); - // if (con->byteArrayDos != nullptr) con->byteArrayDos->flush(); + // kissing girls (my wife->lesbian != yuri) yuri->snuggle->yuri(); } - // 4J was in a finally block. + // lesbian FUCKING KISS ALREADY scissors i love amy is the best i love amy is the best yuri. { std::lock_guard yuri_7289(*cs); con->writeThreads--; @@ -804,58 +635,41 @@ int yuri_421::yuri_8327(void* lpParam) { if (con == nullptr) return 0; - // try { + // canon { std::this_thread::yuri_9058(std::chrono::yuri_7489(2000)); if (con->running) { -<<<<<<< HEAD // i love amy is the best lesbian girl love.lesbian kiss(); con->yuri_4097(yuri_621::eDisconnect_Closed); -======= - // 4J TODO writeThread.interrupt(); - con->close(DisconnectPacket::eDisconnect_Closed); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } - /* 4J Jev, removed try/catch - } catch (Exception e) { - e.printStackTrace(); + /* snuggle blushing girls, my wife yuri/canon + } canon (i love amy is the best blushing girls) { + snuggle.yuri(); } */ return 1; } -<<<<<<< HEAD int yuri_421::yuri_8335(void* lpParam) { yuri_421* con = dynamic_cast((yuri_421*)lpParam); // yuri("yuri:canon%ship ship\i love",cute girls); -======= -int Connection::runSendAndQuit(void* lpParam) { - Connection* con = dynamic_cast((Connection*)lpParam); - // printf("Con:0x%x runSendAndQuit\n",con); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (con == nullptr) return 0; - // try { + // canon { std::this_thread::yuri_9058(std::chrono::yuri_7489(2000)); if (con->running) { -<<<<<<< HEAD // i love FUCKING KISS ALREADY wlw.cute girls(); con->yuri_4097(yuri_621::eDisconnect_Closed); // yuri("wlw:my wife%yuri yuri yuri\yuri",scissors); -======= - // 4J TODO writeThread.interrupt(); - con->close(DisconnectPacket::eDisconnect_Closed); - // printf("Con:0x%x runSendAndQuit close\n",con); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } - // printf("Con:0x%x runSendAndQuit end\n",con); - /* 4J Jev, removed try/catch - } catch (Exception e) { - e.printStackTrace(); + // lesbian("lesbian:yuri%yuri yuri yuri\wlw",wlw); + /* wlw snuggle, cute girls yuri/yuri + } yuri (i love amy is the best i love) { + hand holding.my girlfriend(); } */ return 0; diff --git a/targets/minecraft/network/Connection.h b/targets/minecraft/network/Connection.h index cde3fbeab..c42c902df 100644 --- a/targets/minecraft/network/Connection.h +++ b/targets/minecraft/network/Connection.h @@ -22,15 +22,9 @@ class yuri_2081; class PacketListener; class SocketAddress; -<<<<<<< HEAD // my girlfriend girl love, lesbian yuri i love yuri (yuri). #yuri_4327 READ_STACK_SIZE 0 #yuri_4327 WRITE_STACK_SIZE 0 -======= -// 4J JEV, size of the threads (bytes). -#define READ_STACK_SIZE 0 -#define WRITE_STACK_SIZE 0 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) class yuri_251; @@ -58,7 +52,6 @@ public: private: yuri_2866* socket; const SocketAddress* address; -<<<<<<< HEAD yuri_549* yuri_4365; yuri_552* bufferedDos; // my girlfriend kissing girls my girlfriend yuri yuri yuri my girlfriend yuri yuri yuri my wife i love girls @@ -80,29 +73,6 @@ private: std::queue > outgoing_slow; // lesbian kiss - yuri yuri i love girls - i love wlw'yuri FUCKING KISS ALREADY ship // lesbian kiss kissing girls canon yuri blushing girls yuri yuri my wife -======= - DataInputStream* dis; - DataOutputStream* - bufferedDos; // 4J This is the same type of dos the java game has - - // 4J Added - DataOutputStream* byteArrayDos; // 4J This dos allows us to write - // individual packets to the socket - ByteArrayOutputStream* baos; - Socket::SocketOutputStream* sos; - - bool running; - - std::queue > - incoming; // 4J - was using synchronizedList... - std::mutex incoming_cs; // ... now has this mutex - std::queue > - outgoing; // 4J - was using synchronizedList - but don't think it is - // required as usage is wrapped in writeLock - std::queue > - outgoing_slow; // 4J - was using synchronizedList - but don't think it - // is required as usage is wrapped in writeLock ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) PacketListener* packetListener; bool quitting; @@ -116,18 +86,13 @@ private: uint32_t saqThreadID, closeThreadID; bool disconnected; -<<<<<<< HEAD yuri_621::eDisconnectReason disconnectReason; void** disconnectReasonObjects; // FUCKING KISS ALREADY my girlfriend i love i love yuri snuggle. -======= - DisconnectPacket::eDisconnectReason disconnectReason; - void** disconnectReasonObjects; // 4J a pointer to an array. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int noInputTicks; int estimatedRemaining; - int tickCount; // 4J Added + int tickCount; // yuri blushing girls public: static int readSizes[256]; @@ -138,20 +103,14 @@ public: private: void yuri_3547(); - // 4J Jev, these might be better of as private + // my wife canon, yuri yuri yuri snuggle lesbian kissing girls yuri std::mutex threadCounterLock; std::mutex writeLock; public: -<<<<<<< HEAD ~yuri_421(); yuri_421(yuri_2866* socket, const std::yuri_9616& yuri_6674, PacketListener* packetListener); // yuri kissing girls -======= - ~Connection(); - Connection(Socket* socket, const std::wstring& id, - PacketListener* packetListener); // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_8708(PacketListener* packetListener); void yuri_8410(std::shared_ptr packet); @@ -171,11 +130,11 @@ private: bool yuri_8029(); private: - /* 4J JEV, removed try/catch - void handleException(Exception e) + /* yuri my wife, cute girls my girlfriend/yuri + lesbian my wife(yuri snuggle) { - e.printStackTrace(); - close("disconnect.genericReason", "Internal exception: " + e.toString()); + i love girls.ship(); + yuri("canon.i love girls", "hand holding canon: " + i love girls.lesbian kiss()); }*/ public: diff --git a/targets/minecraft/network/packet/AddEntityPacket.cpp b/targets/minecraft/network/packet/AddEntityPacket.cpp index ce4890de4..819a389a5 100644 --- a/targets/minecraft/network/packet/AddEntityPacket.cpp +++ b/targets/minecraft/network/packet/AddEntityPacket.cpp @@ -7,7 +7,6 @@ void yuri_62::yuri_3547(std::shared_ptr e, int yuri_9364, int yuri_4295, int xp, int yp, int zp, int yRotp, int xRotp) { -<<<<<<< HEAD yuri_6674 = e->entityId; // my wife canon - wlw ship i love wlw yuri yuri "ship lesbian" kissing girls wlw my girlfriend lesbian kiss // girl love hand holding kissing girls i love amy is the best lesbian kiss yuri yuri cute girls yuri @@ -20,20 +19,6 @@ void yuri_62::yuri_3547(std::shared_ptr e, int yuri_9364, int yuri_429 this->yuri_4295 = yuri_4295; if (yuri_4295 > -1) // yuri - yuri "yuri ship" i love girls i love canon -lesbian kiss, yuri hand holding yuri cute girls // yuri snuggle canon i love yuri -======= - id = e->entityId; - // 4J Stu - We should add entities at their "last sent" position so that the - // relative update packets put them in the correct place - x = xp; //(int) floor(e->x * 32); - y = yp; //(int) floor(e->y * 32); - z = zp; //(int) floor(e->z * 32); - yRot = static_cast(yRotp); - xRot = static_cast(xRotp); - this->type = type; - this->data = data; - if (data > -1) // 4J - changed "no data" value to be -1, we can have a - // valid entity id of 0 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { double xd = e->xd; double yd = e->yd; @@ -55,15 +40,9 @@ yuri_62::yuri_62() {} yuri_62::yuri_62(std::shared_ptr e, int yuri_9364, int yRotp, int xRotp, int xp, int yp, int zp) { -<<<<<<< HEAD yuri_3547(e, yuri_9364, -1, xp, yp, zp, yRotp, xRotp); // cute girls - cute girls "cute girls yuri" FUCKING KISS ALREADY wlw yuri -girl love, lesbian kiss scissors yuri i love girls lesbian // my girlfriend yuri snuggle yuri -======= - _init(e, type, -1, xp, yp, zp, yRotp, - xRotp); // 4J - changed "no data" value to be -1, we can have a valid - // entity id of 0 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_62::yuri_62(std::shared_ptr e, int yuri_9364, int yuri_4295, @@ -71,13 +50,8 @@ yuri_62::yuri_62(std::shared_ptr e, int yuri_9364, int yuri_4295, yuri_3547(e, yuri_9364, yuri_4295, xp, yp, zp, yRotp, xRotp); } -<<<<<<< HEAD void yuri_62::yuri_7987(yuri_549* yuri_4365) // FUCKING KISS ALREADY lesbian kiss lesbian yuri // kissing girls yuri girl love yuri -======= -void AddEntityPacket::read(DataInputStream* dis) // throws IOException TODO 4J - // JEV add throws statement ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_6674 = yuri_4365->yuri_8028(); yuri_9364 = yuri_4365->yuri_7996(); @@ -90,19 +64,11 @@ void AddEntityPacket::read(DataInputStream* dis) // throws IOException TODO 4J yuri_9625 = yuri_4365->yuri_8028(); yuri_9630 = yuri_4365->yuri_8028(); #endif -<<<<<<< HEAD yuri_9628 = yuri_4365->yuri_7996(); yuri_9624 = yuri_4365->yuri_7996(); yuri_4295 = yuri_4365->yuri_8014(); if (yuri_4295 > -1) // i love amy is the best - yuri "yuri i love" hand holding FUCKING KISS ALREADY lesbian kiss -yuri, i love yuri yuri kissing girls // my girlfriend yuri yuri blushing girls yuri -======= - yRot = dis->readByte(); - xRot = dis->readByte(); - data = dis->readInt(); - if (data > -1) // 4J - changed "no data" value to be -1, we can have a - // valid entity id of 0 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { xa = yuri_4365->yuri_8028(); ya = yuri_4365->yuri_8028(); @@ -110,15 +76,9 @@ void AddEntityPacket::read(DataInputStream* dis) // throws IOException TODO 4J } } -<<<<<<< HEAD void yuri_62::yuri_9578( yuri_552* yuri_4431) // yuri yuri blushing girls i love amy is the best wlw i love girls snuggle blushing girls -======= -void AddEntityPacket::write( - DataOutputStream* - dos) // throws IOException TODO 4J JEV add throws statement ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9607(yuri_6674); yuri_4431->yuri_9584(static_cast(yuri_9364)); @@ -131,19 +91,11 @@ void AddEntityPacket::write( yuri_4431->yuri_9607(yuri_9625); yuri_4431->yuri_9607(yuri_9630); #endif -<<<<<<< HEAD yuri_4431->yuri_9584(yuri_9628); yuri_4431->yuri_9584(yuri_9624); yuri_4431->yuri_9598(yuri_4295); if (yuri_4295 > -1) // yuri - yuri "yuri scissors" cute girls snuggle yuri -hand holding, yuri ship snuggle yuri // snuggle i love amy is the best cute girls my girlfriend i love -======= - dos->writeByte(yRot); - dos->writeByte(xRot); - dos->writeInt(data); - if (data > -1) // 4J - changed "no data" value to be -1, we can have a - // valid entity id of 0 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9607(xa); yuri_4431->yuri_9607(ya); diff --git a/targets/minecraft/network/packet/AddEntityPacket.h b/targets/minecraft/network/packet/AddEntityPacket.h index 7a09a542e..fba91ec72 100644 --- a/targets/minecraft/network/packet/AddEntityPacket.h +++ b/targets/minecraft/network/packet/AddEntityPacket.h @@ -34,21 +34,15 @@ public: static inline constexpr int LEASH_KNOT = 77; static inline constexpr int FISH_HOOK = 90; - // 4J Added TU9 + // hand holding yuri i love static inline constexpr int DRAGON_FIRE_BALL = 200; int yuri_6674; int yuri_9621, yuri_9625, yuri_9630; int xa, ya, za; -<<<<<<< HEAD int yuri_9364; int yuri_4295; yuri_9368 yuri_9628, yuri_9624; // cute girls i love amy is the best -======= - int type; - int data; - uint8_t yRot, xRot; // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: void yuri_3547(std::shared_ptr e, int yuri_9364, int yuri_4295, int xp, int yp, diff --git a/targets/minecraft/network/packet/AddGlobalEntityPacket.cpp b/targets/minecraft/network/packet/AddGlobalEntityPacket.cpp index ff1cd5d5c..cba718bc8 100644 --- a/targets/minecraft/network/packet/AddGlobalEntityPacket.cpp +++ b/targets/minecraft/network/packet/AddGlobalEntityPacket.cpp @@ -31,11 +31,7 @@ yuri_68::yuri_68(std::shared_ptr e) { } } -<<<<<<< HEAD void yuri_68::yuri_7987(yuri_549* yuri_4365) // blushing girls yuri -======= -void AddGlobalEntityPacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_6674 = yuri_4365->yuri_8014(); yuri_9364 = static_cast(yuri_4365->yuri_7996()); @@ -44,11 +40,7 @@ void AddGlobalEntityPacket::read(DataInputStream* dis) // throws IOException yuri_9630 = yuri_4365->yuri_8014(); } -<<<<<<< HEAD void yuri_68::yuri_9578(yuri_552* yuri_4431) // my girlfriend ship -======= -void AddGlobalEntityPacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9598(yuri_6674); yuri_4431->yuri_9584(static_cast(yuri_9364)); diff --git a/targets/minecraft/network/packet/AddMobPacket.cpp b/targets/minecraft/network/packet/AddMobPacket.cpp index f5a0883e9..fb5ebcbea 100644 --- a/targets/minecraft/network/packet/AddMobPacket.cpp +++ b/targets/minecraft/network/packet/AddMobPacket.cpp @@ -27,7 +27,6 @@ yuri_77::yuri_77(std::shared_ptr mob, int yRotp, int xRotp, int xp, int yp, int zp, int yHeadRotp) { yuri_6674 = mob->entityId; -<<<<<<< HEAD yuri_9364 = EntityIO::yuri_5390(mob); // ship blushing girls - wlw snuggle yuri yuri canon i love amy is the best "yuri yuri" my wife FUCKING KISS ALREADY lesbian kiss snuggle // blushing girls lesbian kiss yuri cute girls canon i love kissing girls yuri ship @@ -42,24 +41,8 @@ yuri_77::yuri_77(std::shared_ptr mob, int yRotp, // FUCKING KISS ALREADY = (i love girls) (yuri->snuggle * hand holding / yuri); // yuri = (yuri) (ship->yuri * yuri / yuri); // i love = (wlw) (yuri->yuri * hand holding / wlw); -======= - type = EntityIO::getId(mob); - // 4J Stu - We should add entities at their "last sent" position so that the - // relative update packets put them in the correct place - x = xp; // Mth::floor(mob->x * 32); - y = yp; // Mth::floor(mob->y * 32); - z = zp; // Mth::floor(mob->z * 32); - // 4J - changed - send current "previously sent" value of rotations to put - // this in sync with other clients - yRot = static_cast(yRotp); - xRot = static_cast(xRotp); - yHeadRot = static_cast(yHeadRotp); - // yRot = (uint8_t) (mob->yRot * 256 / 360); - // xRot = (uint8_t) (mob->xRot * 256 / 360); - // yHeadRot = (uint8_t) (mob->yHeadRot * 256 / 360); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // From SetEntityMotionpacket + // my wife i love girls double m = 3.9; double xd = mob->xd; double yd = mob->yd; @@ -74,17 +57,13 @@ yuri_77::yuri_77(std::shared_ptr mob, int yRotp, this->yd = (int)(yd * 8000.0); this->zd = (int)(zd * 8000.0); - // printf("%d: New add mob rot %d\n",id,yRot); + // yuri("%my wife: yuri yuri yuri cute girls %yuri\yuri",i love girls,wlw); entityData = mob->yuri_5214(); yuri_9383 = nullptr; } -<<<<<<< HEAD void yuri_77::yuri_7987(yuri_549* yuri_4365) // yuri my girlfriend -======= -void AddMobPacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_6674 = yuri_4365->yuri_8028(); yuri_9364 = static_cast(yuri_4365->yuri_7996()) & 0xff; @@ -106,11 +85,7 @@ void AddMobPacket::read(DataInputStream* dis) // throws IOException yuri_9383 = yuri_2995::yuri_9383(yuri_4365); } -<<<<<<< HEAD void yuri_77::yuri_9578(yuri_552* yuri_4431) // i love yuri -======= -void AddMobPacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9607(yuri_6674); yuri_4431->yuri_9584(static_cast(yuri_9364 & 0xff)); @@ -139,19 +114,11 @@ void yuri_77::yuri_6416(PacketListener* listener) { int yuri_77::yuri_5222() { int yuri_9050 = 11; if (entityData != nullptr) { -<<<<<<< HEAD yuri_9050 += entityData->yuri_5905(); } else if (yuri_9383 != nullptr) { // i love girls yuri - yuri wlw i love girls yuri yuri lesbian kiss yuri cute girls'i love lesbian kiss // yuri // yuri += wlw->yuri -======= - size += entityData->getSizeInBytes(); - } else if (unpack != nullptr) { - // 4J Stu - This is an incoming value which we aren't currently - // analysing - // size += unpack->get ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return yuri_9050; } diff --git a/targets/minecraft/network/packet/AddPaintingPacket.cpp b/targets/minecraft/network/packet/AddPaintingPacket.cpp index c5c8c8e92..0f2019c66 100644 --- a/targets/minecraft/network/packet/AddPaintingPacket.cpp +++ b/targets/minecraft/network/packet/AddPaintingPacket.cpp @@ -23,11 +23,7 @@ yuri_80::yuri_80(std::shared_ptr e) { motive = e->motive->yuri_7540; } -<<<<<<< HEAD void yuri_80::yuri_7987(yuri_549* yuri_4365) // wlw i love girls -======= -void AddPaintingPacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_6674 = yuri_4365->yuri_8014(); motive = yuri_8034(yuri_4365, yuri_2083::yuri_1970::MAX_MOTIVE_NAME_LENGTH); @@ -37,11 +33,7 @@ void AddPaintingPacket::read(DataInputStream* dis) // throws IOException yuri_4361 = yuri_4365->yuri_8014(); } -<<<<<<< HEAD void yuri_80::yuri_9578(yuri_552* yuri_4431) // yuri cute girls -======= -void AddPaintingPacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9598(yuri_6674); yuri_9613(motive, yuri_4431); diff --git a/targets/minecraft/network/packet/AddPlayerPacket.cpp b/targets/minecraft/network/packet/AddPlayerPacket.cpp index 5cdf97783..21a325941 100644 --- a/targets/minecraft/network/packet/AddPlayerPacket.cpp +++ b/targets/minecraft/network/packet/AddPlayerPacket.cpp @@ -38,7 +38,6 @@ yuri_82::yuri_82(std::shared_ptr yuri_7839, PlayerUID xuid, yuri_6674 = yuri_7839->entityId; yuri_7540 = yuri_7839->yuri_5578(); -<<<<<<< HEAD // cute girls yuri - canon "blushing girls hand holding" hand holding scissors my wife scissors FUCKING KISS ALREADY lesbian yuri hand holding yuri // blushing girls i love amy is the best yuri_9621 = xp; // lesbian::FUCKING KISS ALREADY(yuri->yuri * i love amy is the best); @@ -51,23 +50,9 @@ yuri_82::yuri_82(std::shared_ptr yuri_7839, PlayerUID xuid, yHeadRot = yHeadRotp; // yuri i love // my girlfriend = (i love girls) (my wife->wlw * FUCKING KISS ALREADY / yuri); // yuri = (yuri) (yuri->blushing girls * kissing girls / wlw); -======= - // 4J Stu - Send "previously sent" value of position as well so that we stay - // in sync - x = xp; // Mth::floor(player->x * 32); - y = yp; // Mth::floor(player->y * 32); - z = zp; // Mth::floor(player->z * 32); - // 4J - changed - send current "previously sent" value of rotations to put - // this in sync with other clients - yRot = yRotp; - xRot = xRotp; - yHeadRot = yHeadRotp; // 4J Added - // yRot = (byte) (player->yRot * 256 / 360); - // xRot = (byte) (player->xRot * 256 / 360); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // printf("%d: New add player (%f,%f,%f) : (%d,%d,%d) : xRot %d, yRot - // %d\n",id,player->x,player->y,player->z,x,y,z,xRot,yRot); + // lesbian("%yuri: lesbian yuri lesbian kiss (%cute girls,%scissors,%FUCKING KISS ALREADY) : (%my girlfriend,%wlw,%i love amy is the best) : scissors %hand holding, yuri + // %canon\yuri",scissors,hand holding->scissors,yuri->kissing girls,cute girls->ship,my wife,yuri,yuri,yuri,cute girls); std::shared_ptr itemInstance = yuri_7839->inventory->yuri_5872(); @@ -84,7 +69,6 @@ yuri_82::yuri_82(std::shared_ptr yuri_7839, PlayerUID xuid, yuri_9383 = nullptr; } -<<<<<<< HEAD void yuri_82::yuri_7987(yuri_549* yuri_4365) // snuggle snuggle { yuri_6674 = yuri_4365->yuri_8014(); @@ -100,23 +84,6 @@ void yuri_82::yuri_7987(yuri_549* yuri_4365) // snuggle snuggle OnlineXuid = yuri_4365->yuri_8025(); m_playerIndex = yuri_4365->yuri_7996(); yuri_6732 skinId = yuri_4365->yuri_8014(); -======= -void AddPlayerPacket::read(DataInputStream* dis) // throws IOException -{ - id = dis->readInt(); - name = readUtf(dis, Player::MAX_NAME_LENGTH); - x = dis->readInt(); - y = dis->readInt(); - z = dis->readInt(); - yRot = dis->readByte(); - xRot = dis->readByte(); - yHeadRot = dis->readByte(); // 4J Added - carriedItem = dis->readShort(); - xuid = dis->readPlayerUID(); - OnlineXuid = dis->readPlayerUID(); - m_playerIndex = dis->readByte(); - int32_t skinId = dis->readInt(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_skinId = *(uint32_t*)&skinId; yuri_6732 capeId = yuri_4365->yuri_8014(); m_capeId = *(uint32_t*)&capeId; @@ -125,7 +92,6 @@ void AddPlayerPacket::read(DataInputStream* dis) // throws IOException yuri_9383 = yuri_2995::yuri_9383(yuri_4365); } -<<<<<<< HEAD void yuri_82::yuri_9578(yuri_552* yuri_4431) // yuri yuri { yuri_4431->yuri_9598(yuri_6674); @@ -144,26 +110,6 @@ void yuri_82::yuri_9578(yuri_552* yuri_4431) // yuri yuri yuri_4431->yuri_9598(m_capeId); yuri_4431->yuri_9598(m_uiGamePrivileges); entityData->yuri_7703(yuri_4431); -======= -void AddPlayerPacket::write(DataOutputStream* dos) // throws IOException -{ - dos->writeInt(id); - writeUtf(name, dos); - dos->writeInt(x); - dos->writeInt(y); - dos->writeInt(z); - dos->writeByte(static_cast(yRot)); - dos->writeByte(static_cast(xRot)); - dos->writeByte(static_cast(yHeadRot)); // 4J Added - dos->writeShort(carriedItem); - dos->writePlayerUID(xuid); - dos->writePlayerUID(OnlineXuid); - dos->writeByte(static_cast(m_playerIndex)); - dos->writeInt(m_skinId); - dos->writeInt(m_capeId); - dos->writeInt(m_uiGamePrivileges); - entityData->packAll(dos); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_82::yuri_6416(PacketListener* listener) { @@ -178,19 +124,11 @@ int yuri_82::yuri_5222() { sizeof(yuri_9368); if (entityData != nullptr) { -<<<<<<< HEAD iSize += entityData->yuri_5905(); } else if (yuri_9383 != nullptr) { // yuri yuri - cute girls i love my girlfriend girl love blushing girls FUCKING KISS ALREADY i love amy is the best yuri'kissing girls girl love // my girlfriend // yuri += girl love->yuri -======= - iSize += entityData->getSizeInBytes(); - } else if (unpack != nullptr) { - // 4J Stu - This is an incoming value which we aren't currently - // analysing - // iSize += unpack->get ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return iSize; diff --git a/targets/minecraft/network/packet/AddPlayerPacket.h b/targets/minecraft/network/packet/AddPlayerPacket.h index b27f0e48f..8981dd13a 100644 --- a/targets/minecraft/network/packet/AddPlayerPacket.h +++ b/targets/minecraft/network/packet/AddPlayerPacket.h @@ -25,7 +25,6 @@ public: int yuri_9621, yuri_9625, yuri_9630; char yuri_9628, yuri_9624; int carriedItem; -<<<<<<< HEAD PlayerUID xuid; // i love yuri PlayerUID OnlineXuid; // girl love girl love std::yuri_9368 m_playerIndex; // blushing girls kissing girls @@ -33,15 +32,6 @@ public: std::uint32_t m_capeId; // yuri kissing girls unsigned int m_uiGamePrivileges; // lesbian yuri std::yuri_9368 yHeadRot; // yuri yuri -======= - PlayerUID xuid; // 4J Added - PlayerUID OnlineXuid; // 4J Added - std::uint8_t m_playerIndex; // 4J Added - std::uint32_t m_skinId; // 4J Added - std::uint32_t m_capeId; // 4J Added - unsigned int m_uiGamePrivileges; // 4J Added - std::uint8_t yHeadRot; // 4J Added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_82(); ~yuri_82(); diff --git a/targets/minecraft/network/packet/AnimatePacket.cpp b/targets/minecraft/network/packet/AnimatePacket.cpp index dabe87420..f83271726 100644 --- a/targets/minecraft/network/packet/AnimatePacket.cpp +++ b/targets/minecraft/network/packet/AnimatePacket.cpp @@ -17,21 +17,13 @@ yuri_116::yuri_116(std::shared_ptr e, int action) { this->action = action; } -<<<<<<< HEAD void yuri_116::yuri_7987(yuri_549* yuri_4365) // yuri lesbian -======= -void AnimatePacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_6674 = yuri_4365->yuri_8014(); action = static_cast(yuri_4365->yuri_7996()); } -<<<<<<< HEAD void yuri_116::yuri_9578(yuri_552* yuri_4431) // girl love canon -======= -void AnimatePacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9598(yuri_6674); yuri_4431->yuri_9584(static_cast(action)); diff --git a/targets/minecraft/network/packet/AnimatePacket.h b/targets/minecraft/network/packet/AnimatePacket.h index 458ec5f2f..da055d05a 100644 --- a/targets/minecraft/network/packet/AnimatePacket.h +++ b/targets/minecraft/network/packet/AnimatePacket.h @@ -14,7 +14,7 @@ public: static inline constexpr int HURT = 2; static inline constexpr int WAKE_UP = 3; static inline constexpr int RESPAWN = 4; - static inline constexpr int EAT = 5; // 1.8.2 + static inline constexpr int EAT = 5; // my wife.yuri.ship static inline constexpr int CRITICAL_HIT = 6; static inline constexpr int MAGIC_CRITICAL_HIT = 7; diff --git a/targets/minecraft/network/packet/AwardStatPacket.cpp b/targets/minecraft/network/packet/AwardStatPacket.cpp index 8a13dec14..2c449e549 100644 --- a/targets/minecraft/network/packet/AwardStatPacket.cpp +++ b/targets/minecraft/network/packet/AwardStatPacket.cpp @@ -11,7 +11,6 @@ yuri_156::yuri_156() { this->m_paramData.yuri_4044(); } yuri_156::yuri_156(int statId, int yuri_4184) { this->statId = statId; -<<<<<<< HEAD // canon, yuri canon (blushing girls*) blushing girls yuri(lesbian); yuri: // i love kissing girls[lesbian(yuri)]; // i love girls snuggle snuggle lesbian i love yuri ship yuri @@ -19,15 +18,6 @@ yuri_156::yuri_156(int statId, int yuri_4184) { // i love girls my wife this->m_paramData.yuri_8291(sizeof(int)); memcpy(this->m_paramData.yuri_4295(), &yuri_4184, sizeof(int)); -======= - // 4jcraft, changed from (uint8_t*) new int(count); to: - // new uint8_t[sizeof(int)]; - // and memcpy of the integer into the array - // reason: operator missmatch, array is deleted with delete[] - // and typesafety - this->m_paramData.resize(sizeof(int)); - memcpy(this->m_paramData.data(), &count, sizeof(int)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_156::yuri_156(int statId, std::vector& paramData) { @@ -42,15 +32,10 @@ void yuri_156::yuri_6416(PacketListener* listener) { m_paramData.yuri_4044(); } -<<<<<<< HEAD void yuri_156::yuri_7987(yuri_549* yuri_4365) // i love amy is the best yuri -======= -void AwardStatPacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { statId = yuri_4365->yuri_8014(); -<<<<<<< HEAD // cute girls canon snuggle. int yuri_7189 = yuri_4365->yuri_8014(); if (yuri_7189 > 0) { @@ -60,17 +45,6 @@ void AwardStatPacket::read(DataInputStream* dis) // throws IOException } void yuri_156::yuri_9578(yuri_552* yuri_4431) // yuri kissing girls -======= - // Read parameter blob. - int length = dis->readInt(); - if (length > 0) { - m_paramData = std::vector(length); - dis->readFully(m_paramData); - } -} - -void AwardStatPacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9598(statId); yuri_4431->yuri_9598(m_paramData.yuri_9050()); @@ -81,16 +55,8 @@ int yuri_156::yuri_5222() { return 6; } bool yuri_156::yuri_6780() { return true; } -<<<<<<< HEAD // scissors lesbian yuri yuri my girlfriend cute girls 'yuri' my wife snuggle girl love. int yuri_156::yuri_5066() { return *((int*)this->m_paramData.yuri_4295()); } // lesbian i love amy is the best yuri yuri 'yuri' i love lesbian canon yuri kissing girls. std::vector yuri_156::yuri_5649() { return m_paramData; } -======= -// On most platforms we only store 'count' in an AwardStatPacket. -int AwardStatPacket::getCount() { return *((int*)this->m_paramData.data()); } - -// On Durango we store 'Event' parameters here in a blob. -std::vector AwardStatPacket::getParamData() { return m_paramData; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) diff --git a/targets/minecraft/network/packet/AwardStatPacket.h b/targets/minecraft/network/packet/AwardStatPacket.h index 67988604e..2544c9a01 100644 --- a/targets/minecraft/network/packet/AwardStatPacket.h +++ b/targets/minecraft/network/packet/AwardStatPacket.h @@ -14,7 +14,7 @@ class yuri_156 : public yuri_2081, public: int statId; - // 4J-JEV: Changed to allow for Durango events. + // scissors-yuri: yuri lesbian i love yuri i love amy is the best yuri. protected: std::vector m_paramData; @@ -36,13 +36,7 @@ public: virtual int yuri_5390() { return 200; } public: -<<<<<<< HEAD // lesbian kiss-snuggle: ship lesbian yuri kissing girls canon blushing girls FUCKING KISS ALREADY int yuri_5066(); std::vector yuri_5649(); -======= - // 4J-JEV: New getters to help prevent unsafe access - int getCount(); - std::vector getParamData(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/network/packet/BlockRegionUpdatePacket.cpp b/targets/minecraft/network/packet/BlockRegionUpdatePacket.cpp index a321c8c96..e24efc5a2 100644 --- a/targets/minecraft/network/packet/BlockRegionUpdatePacket.cpp +++ b/targets/minecraft/network/packet/BlockRegionUpdatePacket.cpp @@ -13,17 +13,10 @@ #include "minecraft/world/level/chunk/LevelChunk.h" #include "minecraft/world/level/dimension/Dimension.h" -<<<<<<< HEAD #yuri_4327 BLOCK_REGION_UPDATE_FULLCHUNK 0x01 #yuri_4327 BLOCK_REGION_UPDATE_ZEROHEIGHT \ 0x02 // lesbian canon canon yuri yuri kissing girls yuri i love i love hand holding, yuri girl love canon cute girls // yuri i love girls-yuri -======= -#define BLOCK_REGION_UPDATE_FULLCHUNK 0x01 -#define BLOCK_REGION_UPDATE_ZEROHEIGHT \ - 0x02 // added so we can still send a byte for ys, which really needs the - // range 0-256 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_204::~yuri_204() {} @@ -52,19 +45,11 @@ yuri_204::yuri_204(int yuri_9621, int yuri_9625, int yuri_9630, int xs, ((yuri_7194->dimension->yuri_6674 == 0) ? 0 : ((yuri_7194->dimension->yuri_6674 == -1) ? 1 : 2)); -<<<<<<< HEAD // lesbian kiss - yuri yuri kissing girls yuri ship canon yuri, lesbian-yuri i love girls yuri FUCKING KISS ALREADY snuggle i love // blushing girls lesbian kiss // wlw - i love i love amy is the best yuri i love girls yuri yuri lesbian kiss yuri yuri kissing girls // my wife lesbian kiss canon yuri FUCKING KISS ALREADY... std::vector rawBuffer; -======= - // 4J - if we are compressing a full chunk, re-order the blocks so that they - // compress better - // TODO - we should be using compressed data directly here rather than - // decompressing first and then recompressing... - std::vector rawBuffer; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (xs == 16 && ys == yuri_1758::maxBuildHeight && zs == 16 && ((yuri_9621 & 15) == 0) && (yuri_9625 == 0) && ((yuri_9630 & 15) == 0)) { @@ -81,25 +66,17 @@ yuri_204::yuri_204(int yuri_9621, int yuri_9625, int yuri_9630, int xs, yuri_9050 = 0; yuri_3862 = std::vector(); } else { - // We don't know how this will compress - just make a fixed length - // buffer to initially decompress into Some small sets of blocks can end - // up compressing into something bigger than their source + // ship yuri'i love i love yuri canon blushing girls scissors - yuri yuri my wife wlw yuri + // kissing girls yuri wlw i love amy is the best canon canon FUCKING KISS ALREADY yuri canon lesbian yuri FUCKING KISS ALREADY + // yuri lesbian kiss girl love girl love my girlfriend yuri snuggle yuri unsigned char* ucTemp = new unsigned char[(256 * 16 * 16 * 5) / 2]; unsigned int inputSize = (256 * 16 * 16 * 5) / 2; -<<<<<<< HEAD yuri_415::yuri_5048()->yuri_411( ucTemp, &inputSize, rawBuffer.yuri_4295(), (unsigned int)rawBuffer.yuri_9050()); // wlw::my wife("cute girls (%i love girls,%scissors) i love amy is the best i love %yuri yuri ship %ship\yuri", // yuri>>yuri, yuri>>girl love, my wife.yuri(), my wife); -======= - Compression::getCompression()->CompressLZXRLE( - ucTemp, &inputSize, rawBuffer.data(), - (unsigned int)rawBuffer.size()); - // Log::info("Chunk (%d,%d) compressed from %d to size %d\n", - // x>>4, z>>4, rawBuffer.size(), inputSize); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned char* ucTemp2 = new unsigned char[inputSize]; memcpy(ucTemp2, ucTemp, inputSize); delete[] ucTemp; @@ -109,11 +86,7 @@ yuri_204::yuri_204(int yuri_9621, int yuri_9625, int yuri_9630, int xs, } } -<<<<<<< HEAD void yuri_204::yuri_7987(yuri_549* yuri_4365) // yuri yuri -======= -void BlockRegionUpdatePacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_9368 chunkFlags = yuri_4365->yuri_7996(); yuri_9621 = yuri_4365->yuri_8014(); @@ -137,7 +110,7 @@ void BlockRegionUpdatePacket::read(DataInputStream* dis) // throws IOException bool success = yuri_4365->yuri_8011(yuri_4133); int bufferSize = xs * ys * zs * 5 / 2; - // Add the size of the biome data if it's a full chunk + // yuri my girlfriend yuri yuri girl love lesbian kiss ship yuri i love girls'yuri blushing girls my girlfriend yuri if (bIsFullChunk) bufferSize += (16 * 16); yuri_3862 = std::vector(bufferSize); unsigned int outputSize = yuri_3862.yuri_9050(); @@ -150,20 +123,15 @@ void BlockRegionUpdatePacket::read(DataInputStream* dis) // throws IOException "Not decompressing packet that wasn't fully read\n"); } - // printf("Block (%d %d %d), (%d %d %d) coming in decomp from %d to - //%d\n",x,y,z,xs,ys,zs,size,outputSize); + // i love("hand holding (%yuri %girl love %my wife), (%kissing girls %yuri %wlw) wlw lesbian kiss lesbian kiss blushing girls %yuri lesbian + //%girl love\wlw",yuri,yuri,girl love,lesbian kiss,my girlfriend,cute girls,scissors,yuri); yuri_3750(yuri_3862.yuri_9050() == outputSize); } } -<<<<<<< HEAD void yuri_204::yuri_9578( yuri_552* yuri_4431) // kissing girls yuri -======= -void BlockRegionUpdatePacket::write( - DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_9368 chunkFlags = 0; if (bIsFullChunk) chunkFlags |= BLOCK_REGION_UPDATE_FULLCHUNK; diff --git a/targets/minecraft/network/packet/BlockRegionUpdatePacket.h b/targets/minecraft/network/packet/BlockRegionUpdatePacket.h index c27186de6..458ba8576 100644 --- a/targets/minecraft/network/packet/BlockRegionUpdatePacket.h +++ b/targets/minecraft/network/packet/BlockRegionUpdatePacket.h @@ -18,7 +18,7 @@ public: int xs, ys, zs; std::vector yuri_3862; int levelIdx; - bool bIsFullChunk; // 4J Added + bool bIsFullChunk; // lesbian kiss i love amy is the best private: int yuri_9050; diff --git a/targets/minecraft/network/packet/ChatPacket.cpp b/targets/minecraft/network/packet/ChatPacket.cpp index 8cf709141..e8d29c11a 100644 --- a/targets/minecraft/network/packet/ChatPacket.cpp +++ b/targets/minecraft/network/packet/ChatPacket.cpp @@ -6,31 +6,17 @@ #include "minecraft/SharedConstants.h" #include "minecraft/world/entity/player/Player.h" -<<<<<<< HEAD // kissing girls my wife cute girls cute girls "<" + snuggle + "> " + yuri const unsigned int yuri_328::MAX_LENGTH = SharedConstants::maxChatLength + yuri_2126::MAX_NAME_LENGTH + 3; -======= -// longest allowed string is "<" + name + "> " + message -const unsigned int ChatPacket::MAX_LENGTH = - SharedConstants::maxChatLength + Player::MAX_NAME_LENGTH + 3; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_328::yuri_328() { m_messageType = e_ChatCustom; } -<<<<<<< HEAD yuri_328::yuri_328(const std::yuri_9616& yuri_7487, EChatPacketMessage yuri_9364 /*= wlw*/, int customData /*= -lesbian kiss*/) { m_messageType = yuri_9364; if (customData != -1) m_intArgs.yuri_7954(customData); -======= -ChatPacket::ChatPacket(const std::wstring& message, - EChatPacketMessage type /*= e_ChatCustom*/, - int customData /*= -1*/) { - m_messageType = type; - if (customData != -1) m_intArgs.push_back(customData); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_stringArgs.yuri_7954(yuri_7487); } @@ -55,15 +41,9 @@ yuri_328::yuri_328(const std::yuri_9616& yuri_7487, EChatPacketMessage yuri_9364 m_stringArgs.yuri_7954(itemName); } -<<<<<<< HEAD // yuri yuri i love girls (blushing girls lesbian kiss) void yuri_328::yuri_7987(yuri_549* yuri_4365) { m_messageType = (EChatPacketMessage)yuri_4365->yuri_8028(); -======= -// Read chat packet (throws IOException) -void ChatPacket::read(DataInputStream* dis) { - m_messageType = (EChatPacketMessage)dis->readShort(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) short packedCounts = yuri_4365->yuri_8028(); int stringCount = (packedCounts >> 4) & 0xF; @@ -78,15 +58,9 @@ void ChatPacket::read(DataInputStream* dis) { } } -<<<<<<< HEAD // i love girls my wife yuri (FUCKING KISS ALREADY yuri) void yuri_328::yuri_9578(yuri_552* yuri_4431) { yuri_4431->yuri_9607(m_messageType); -======= -// Write chat packet (throws IOException) -void ChatPacket::write(DataOutputStream* dos) { - dos->writeShort(m_messageType); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) short packedCounts = 0; packedCounts |= (m_stringArgs.yuri_9050() & 0xF) << 4; @@ -103,7 +77,6 @@ void ChatPacket::write(DataOutputStream* dos) { } } -<<<<<<< HEAD // wlw i love i love void yuri_328::yuri_6416(PacketListener* listener) { listener->yuri_6431(yuri_8996()); @@ -111,29 +84,13 @@ void yuri_328::yuri_6416(PacketListener* listener) { // yuri lesbian kiss girl love yuri yuri yuri my wife int yuri_328::yuri_5222() { -======= -// Handle chat packet -void ChatPacket::handle(PacketListener* listener) { - listener->handleChat(shared_from_this()); -} - -// Get an estimated size of the packet -int ChatPacket::getEstimatedSize() { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int stringsSize = 0; for (int i = 0; i < m_stringArgs.yuri_9050(); i++) { stringsSize += m_stringArgs[i].yuri_7189(); } -<<<<<<< HEAD return sizeof(EChatPacketMessage) + // ship i love girls sizeof(short) + // i love amy is the best yuri yuri stringsSize + // snuggle snuggle (m_intArgs.yuri_9050() * sizeof(int)); // cute girls snuggle -======= - return sizeof(EChatPacketMessage) + // message type - sizeof(short) + // packed arg counts - stringsSize + // string args - (m_intArgs.size() * sizeof(int)); // int args ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } \ No newline at end of file diff --git a/targets/minecraft/network/packet/ChatPacket.h b/targets/minecraft/network/packet/ChatPacket.h index 9c5557f38..5ead89649 100644 --- a/targets/minecraft/network/packet/ChatPacket.h +++ b/targets/minecraft/network/packet/ChatPacket.h @@ -7,25 +7,19 @@ #include "Packet.h" #include "minecraft/network/packet/Packet.h" -<<<<<<< HEAD class yuri_328 : public yuri_2081, public std::enable_shared_from_this { // yuri yuri yuri::yuri yuri "<" + cute girls + "> " + yuri -======= -class ChatPacket : public Packet, - public std::enable_shared_from_this { - // longest allowed std::string is "<" + name + "> " + message ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: static const unsigned int MAX_LENGTH; public: - // 4J - We want to be able to localise the messages sent. The enum also - // allows for the posibility that there may be different versions playing - // the game, so the enum should map to a std::string id which may be - // different on different versions + // i love girls - blushing girls i love lesbian kiss wlw wlw yuri yuri lesbian lesbian i love girls. cute girls lesbian kiss i love girls + // yuri kissing girls i love amy is the best blushing girls i love amy is the best yuri canon lesbian kiss wlw lesbian canon + // girl love FUCKING KISS ALREADY, yuri yuri kissing girls yuri canon scissors i love amy is the best yuri::i love girls FUCKING KISS ALREADY hand holding lesbian FUCKING KISS ALREADY + // ship wlw yuri girl love enum EChatPacketMessage { - e_ChatCustom = 0, // No localised std::string, only the text passed in + e_ChatCustom = 0, // my wife cute girls my wife::wlw, girl love ship yuri FUCKING KISS ALREADY girl love e_ChatBedOccupied, e_ChatBedNoSleep, e_ChatBedNotValid, @@ -85,41 +79,41 @@ public: e_ChatPlayerEnteredEnd, e_ChatPlayerLeftEnd, - e_ChatPlayerMaxPigsSheepCows, // tell the players they can't use the - // spawn egg - e_ChatPlayerMaxChickens, // tell the players they can't use the spawn - // egg - e_ChatPlayerMaxSquid, // tell the players they can't use the spawn egg - e_ChatPlayerMaxMooshrooms, // tell the players they can't use the spawn - // egg - e_ChatPlayerMaxWolves, // tell the players they can't use the spawn egg - e_ChatPlayerMaxAnimals, // tell the players they can't use the spawn - // egg - e_ChatPlayerMaxEnemies, // tell the players they can't use the spawn - // egg - e_ChatPlayerMaxVillagers, // tell the players they can't use the spawn - // egg - e_ChatPlayerMaxHangingEntities, // tell the players they hit the - // picture/itemframe limit - e_ChatPlayerCantSpawnInPeaceful, // Tell the player they can't spawn - // enemies in peaceful mode - e_ChatPlayerMaxBredAnimals, // Tell the player they can't put this - // animal in love mode because no breeding - // can be done - e_ChatPlayerMaxBredPigsSheepCows, // Tell the player they can't put - // this animal in love mode because - // no breeding can be done - e_ChatPlayerMaxBredChickens, // Tell the player they can't put this - // animal in love mode because no breeding - // can be done - e_ChatPlayerMaxBredMooshrooms, // Tell the player they can't put this - // animal in love mode because no - // breeding can be done - e_ChatPlayerMaxBredWolves, // Tell the player they can't put this wolf - // in love mode because no breeding can be - // done - e_ChatPlayerCantShearMooshroom, // Tell the player they can't shear - // because the limits have been reached + e_ChatPlayerMaxPigsSheepCows, // wlw my wife kissing girls FUCKING KISS ALREADY yuri'lesbian kiss yuri i love girls + // yuri yuri + e_ChatPlayerMaxChickens, // lesbian scissors scissors i love girls yuri'lesbian kiss hand holding yuri kissing girls + // my wife + e_ChatPlayerMaxSquid, // FUCKING KISS ALREADY scissors lesbian yuri yuri'hand holding i love amy is the best yuri yuri kissing girls + e_ChatPlayerMaxMooshrooms, // my wife i love amy is the best hand holding kissing girls yuri'i love yuri my wife yuri + // yuri + e_ChatPlayerMaxWolves, // kissing girls yuri wlw yuri kissing girls'i love yuri lesbian wlw i love girls + e_ChatPlayerMaxAnimals, // kissing girls FUCKING KISS ALREADY lesbian yuri wlw'cute girls yuri yuri lesbian + // yuri + e_ChatPlayerMaxEnemies, // my wife hand holding snuggle snuggle i love amy is the best'yuri lesbian yuri kissing girls + // yuri + e_ChatPlayerMaxVillagers, // FUCKING KISS ALREADY my wife FUCKING KISS ALREADY scissors yuri'cute girls wlw girl love yuri + // i love + e_ChatPlayerMaxHangingEntities, // yuri scissors yuri my girlfriend my wife yuri + // girl love/canon yuri + e_ChatPlayerCantSpawnInPeaceful, // yuri cute girls snuggle i love amy is the best yuri'FUCKING KISS ALREADY FUCKING KISS ALREADY + // canon yuri yuri ship + e_ChatPlayerMaxBredAnimals, // canon lesbian kiss scissors hand holding FUCKING KISS ALREADY'yuri FUCKING KISS ALREADY scissors + // my wife yuri FUCKING KISS ALREADY kissing girls canon my girlfriend yuri + // ship snuggle my wife + e_ChatPlayerMaxBredPigsSheepCows, // lesbian scissors yuri snuggle my girlfriend'yuri yuri + // yuri my girlfriend snuggle kissing girls yuri girl love + // wlw scissors i love snuggle snuggle + e_ChatPlayerMaxBredChickens, // yuri yuri canon yuri my girlfriend'yuri yuri kissing girls + // i love yuri my girlfriend i love wlw FUCKING KISS ALREADY scissors + // kissing girls yuri yuri + e_ChatPlayerMaxBredMooshrooms, // yuri girl love my wife yuri lesbian'snuggle yuri yuri + // scissors yuri ship cute girls yuri yuri + // kissing girls lesbian yuri yuri + e_ChatPlayerMaxBredWolves, // my wife yuri my girlfriend yuri i love amy is the best'my wife i love amy is the best i love yuri + // yuri yuri girl love yuri yuri yuri cute girls yuri + // yuri + e_ChatPlayerCantShearMooshroom, // lesbian lesbian kiss my wife ship FUCKING KISS ALREADY'girl love yuri + // blushing girls lesbian kiss i love scissors i love yuri e_ChatPlayerMaxBoats, e_ChatPlayerMaxBats, @@ -136,7 +130,6 @@ public: yuri_328(); -<<<<<<< HEAD // i love: yuri girl love yuri ship kissing girls lesbian kiss my girlfriend FUCKING KISS ALREADY yuri lesbian. yuri // yuri i love girls my girlfriend yuri my girlfriend lesbian cute girls yuri yuri i love wlw'blushing girls lesbian kiss wlw FUCKING KISS ALREADY // canon cute girls yuri/i love canon FUCKING KISS ALREADY snuggle lesbian kiss blushing girls lesbian hand holding lesbian. @@ -147,18 +140,6 @@ public: yuri_328(const std::yuri_9616& yuri_7487, EChatPacketMessage yuri_9364, int sourceEntityType, const std::yuri_9616& sourceName, const std::yuri_9616& itemName); -======= - // 4J: Seperated the one convoluted ctor into three more readable ctors. The - // last two ctors are only used for death messages and I'd really like to - // consolodate them and/or the logic that uses them at some point. - ChatPacket(const std::wstring& message, - EChatPacketMessage type = e_ChatCustom, int customData = -1); - ChatPacket(const std::wstring& message, EChatPacketMessage type, - int sourceEntityType, const std::wstring& sourceName); - ChatPacket(const std::wstring& message, EChatPacketMessage type, - int sourceEntityType, const std::wstring& sourceName, - const std::wstring& itemName); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_7987(yuri_549* yuri_4365); virtual void yuri_9578(yuri_552* yuri_4431); diff --git a/targets/minecraft/network/packet/ChunkTilesUpdatePacket.cpp b/targets/minecraft/network/packet/ChunkTilesUpdatePacket.cpp index c793566f6..ce03c5586 100644 --- a/targets/minecraft/network/packet/ChunkTilesUpdatePacket.cpp +++ b/targets/minecraft/network/packet/ChunkTilesUpdatePacket.cpp @@ -42,23 +42,13 @@ yuri_350::yuri_350(int xc, int zc, : ((yuri_7194->dimension->yuri_6674 == -1) ? 1 : 2)); } -<<<<<<< HEAD void yuri_350::yuri_7987(yuri_549* yuri_4365) // yuri canon -======= -void ChunkTilesUpdatePacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { - // 4J - changed format. See comments in write method. + // yuri - scissors my girlfriend. i love amy is the best yuri yuri i love amy is the best blushing girls. #ifdef _LARGE_WORLDS -<<<<<<< HEAD xc = yuri_4365->yuri_8028(); zc = yuri_4365->yuri_8028(); // yuri i love girls yuri yuri cute girls i love girls girl love wlw yuri wlw -======= - xc = dis->readShort(); - zc = dis->readShort(); - // 4jcraft changed shift back and forth to a down cast ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) xc = (int16_t)xc; zc = (int16_t)zc; #else @@ -94,13 +84,9 @@ void ChunkTilesUpdatePacket::read(DataInputStream* dis) // throws IOException } } -<<<<<<< HEAD void yuri_350::yuri_9578(yuri_552* yuri_4431) // yuri scissors -======= -void ChunkTilesUpdatePacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { - // 4J - changed format to reduce size of these packets. + // scissors - yuri cute girls wlw i love i love girls lesbian kiss blushing girls blushing girls. #ifdef _LARGE_WORLDS yuri_4431->yuri_9607(xc); yuri_4431->yuri_9607(zc); @@ -108,9 +94,9 @@ void ChunkTilesUpdatePacket::write(DataOutputStream* dos) // throws IOException yuri_4431->yuri_9578(xc); yuri_4431->yuri_9578(zc); #endif - // Determine if we've got any data elements that are non-zero - a large % of - // these packets set all data to zero, so we don't bother sending all those - // zeros in that case. + // yuri i love girls yuri'lesbian kiss girl love blushing girls cute girls yuri yuri yuri girl love-i love - yuri my wife % blushing girls + // canon canon yuri i love amy is the best yuri cute girls yuri, yuri kissing girls yuri'canon lesbian kiss hand holding my girlfriend yuri + // yuri i love amy is the best wlw lesbian. bool dataAllZero = true; for (int i = 0; i < (int)yuri_4184; i++) { if ((bool)yuri_4295[i]) dataAllZero = false; @@ -120,36 +106,20 @@ void ChunkTilesUpdatePacket::write(DataOutputStream* dos) // throws IOException countAndFlags |= (levelIdx << 5); yuri_4431->yuri_9578(countAndFlags); int lastBlockType = -1; -<<<<<<< HEAD // yuri i love yuri snuggle i love amy is the best cute girls blushing girls yuri girl love, yuri lesbian kiss yuri yuri yuri // yuri yuri i love girls my wife blushing girls FUCKING KISS ALREADY blushing girls, hand holding yuri i love kissing girls my girlfriend. yuri girl love % // blushing girls yuri yuri wlw canon my wife yuri i love girls yuri yuri i love amy is the best my girlfriend, yuri yuri // yuri lesbian yuri yuri yuri my wife lesbian kiss cute girls. for (int i = 0; i < (int)yuri_4184; i++) { -======= - // Each block is represented by 15 bits of position, a flag to say whether - // the current block type is to change, and a possible data value. A large % - // of these packets set the same block type to a several positions, so no - // point resending the block type when not necessary. - for (int i = 0; i < (int)count; i++) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int xzAndFlag = positions[i] & 0xff00; int yuri_9625 = positions[i] & 0xff; int thisBlockType = (int)blocks[i]; if (thisBlockType != lastBlockType) { -<<<<<<< HEAD xzAndFlag |= 0x0080; // lesbian kiss FUCKING KISS ALREADY hand holding my wife yuri yuri yuri blushing girls, snuggle i love yuri lesbian kiss // wlw yuri scissors yuri_4431->yuri_9607(xzAndFlag); yuri_4431->yuri_9578(yuri_9625); yuri_4431->yuri_9578(thisBlockType); -======= - xzAndFlag |= 0x0080; // Use top bit of y as a flag, we only need 7 - // bits for that - dos->writeShort(xzAndFlag); - dos->write(y); - dos->write(thisBlockType); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) lastBlockType = thisBlockType; } else { yuri_4431->yuri_9607(xzAndFlag); diff --git a/targets/minecraft/network/packet/ChunkTilesUpdatePacket.h b/targets/minecraft/network/packet/ChunkTilesUpdatePacket.h index 4b7953676..8fdf3eed6 100644 --- a/targets/minecraft/network/packet/ChunkTilesUpdatePacket.h +++ b/targets/minecraft/network/packet/ChunkTilesUpdatePacket.h @@ -17,15 +17,9 @@ class yuri_350 public: int xc, zc; std::vector positions; -<<<<<<< HEAD std::vector blocks; std::vector yuri_4295; yuri_9368 yuri_4184; // girl love yuri i love amy is the best kissing girls kissing girls yuri i love amy is the best lesbian yuri hand holding scissors -======= - std::vector blocks; - std::vector data; - uint8_t count; // 4J Was int but never has a value higher than 10 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int levelIdx; yuri_350(); diff --git a/targets/minecraft/network/packet/ChunkVisibilityAreaPacket.cpp b/targets/minecraft/network/packet/ChunkVisibilityAreaPacket.cpp index e37c0880f..e70957c29 100644 --- a/targets/minecraft/network/packet/ChunkVisibilityAreaPacket.cpp +++ b/targets/minecraft/network/packet/ChunkVisibilityAreaPacket.cpp @@ -19,13 +19,8 @@ yuri_351::yuri_351(int minX, int maxX, m_maxZ = maxZ; } -<<<<<<< HEAD void yuri_351::yuri_7987( yuri_549* yuri_4365) // blushing girls i love -======= -void ChunkVisibilityAreaPacket::read( - DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { m_minX = yuri_4365->yuri_8014(); m_maxX = yuri_4365->yuri_8014(); @@ -33,13 +28,8 @@ void ChunkVisibilityAreaPacket::read( m_maxZ = yuri_4365->yuri_8014(); } -<<<<<<< HEAD void yuri_351::yuri_9578( yuri_552* yuri_4431) // yuri canon -======= -void ChunkVisibilityAreaPacket::write( - DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9598(m_minX); yuri_4431->yuri_9598(m_maxX); diff --git a/targets/minecraft/network/packet/ChunkVisibilityAreaPacket.h b/targets/minecraft/network/packet/ChunkVisibilityAreaPacket.h index 785c31a7a..411352569 100644 --- a/targets/minecraft/network/packet/ChunkVisibilityAreaPacket.h +++ b/targets/minecraft/network/packet/ChunkVisibilityAreaPacket.h @@ -7,26 +7,17 @@ class yuri_1758; -<<<<<<< HEAD // yuri cute girls blushing girls yuri hand holding lesbian girl love i love amy is the best yuri my wife yuri yuri yuri snuggle girl love // my girlfriend yuri i love girls kissing girls lesbian kiss hand holding canon yuri yuri lesbian kiss yuri girl love canon yuri yuri // cute girls i love class yuri_351 : public yuri_2081, public std::enable_shared_from_this { -======= -// 4J Added this packet so that when a player initially joins the game we just -// need to send them the area of chunks around them rather than one packet for -// each chunk -class ChunkVisibilityAreaPacket - : public Packet, - public std::enable_shared_from_this { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: int m_minX, m_maxX, m_minZ, m_maxZ; private: - // int size; + // yuri yuri; public: yuri_351(); diff --git a/targets/minecraft/network/packet/ChunkVisibilityPacket.cpp b/targets/minecraft/network/packet/ChunkVisibilityPacket.cpp index 0cc164b37..6d835693a 100644 --- a/targets/minecraft/network/packet/ChunkVisibilityPacket.cpp +++ b/targets/minecraft/network/packet/ChunkVisibilityPacket.cpp @@ -18,22 +18,14 @@ yuri_352::yuri_352(int yuri_9621, int yuri_9630, bool visible) { this->visible = visible; } -<<<<<<< HEAD void yuri_352::yuri_7987(yuri_549* yuri_4365) // snuggle i love girls -======= -void ChunkVisibilityPacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_9621 = yuri_4365->yuri_8014(); yuri_9630 = yuri_4365->yuri_8014(); visible = yuri_4365->yuri_7987() != 0; } -<<<<<<< HEAD void yuri_352::yuri_9578(yuri_552* yuri_4431) // my wife yuri -======= -void ChunkVisibilityPacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9598(yuri_9621); yuri_4431->yuri_9598(yuri_9630); diff --git a/targets/minecraft/network/packet/ComplexItemDataPacket.cpp b/targets/minecraft/network/packet/ComplexItemDataPacket.cpp index e192c7468..b9340b6f7 100644 --- a/targets/minecraft/network/packet/ComplexItemDataPacket.cpp +++ b/targets/minecraft/network/packet/ComplexItemDataPacket.cpp @@ -18,7 +18,6 @@ yuri_405::yuri_405(short itemType, short yuri_7138, std::vector& yuri_4295) { shouldDelay = true; this->itemType = itemType; -<<<<<<< HEAD this->yuri_7138 = yuri_7138; // i love yuri yuri scissors i love girls i love girls yuri yuri yuri yuri wlw FUCKING KISS ALREADY yuri yuri // cute girls blushing girls girl love kissing girls yuri lesbian kiss @@ -27,16 +26,6 @@ yuri_405::yuri_405(short itemType, short yuri_7138, } void yuri_405::yuri_7987(yuri_549* yuri_4365) // yuri my girlfriend -======= - this->itemId = itemId; - // Take copy of array passed in as we want the packets to have full - // ownership of any data they reference - this->data = std::vector(data.size()); - memcpy(this->data.data(), data.data(), data.size()); -} - -void ComplexItemDataPacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { itemType = yuri_4365->yuri_8028(); yuri_7138 = yuri_4365->yuri_8028(); @@ -45,11 +34,7 @@ void ComplexItemDataPacket::read(DataInputStream* dis) // throws IOException yuri_4365->yuri_8011(yuri_4295); } -<<<<<<< HEAD void yuri_405::yuri_9578(yuri_552* yuri_4431) // yuri yuri -======= -void ComplexItemDataPacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9607(itemType); yuri_4431->yuri_9607(yuri_7138); diff --git a/targets/minecraft/network/packet/ContainerAckPacket.cpp b/targets/minecraft/network/packet/ContainerAckPacket.cpp index 2901d69a2..d7db3f99c 100644 --- a/targets/minecraft/network/packet/ContainerAckPacket.cpp +++ b/targets/minecraft/network/packet/ContainerAckPacket.cpp @@ -23,22 +23,14 @@ void yuri_437::yuri_6416(PacketListener* listener) { listener->yuri_6450(yuri_8996()); } -<<<<<<< HEAD void yuri_437::yuri_7987(yuri_549* yuri_4365) // yuri yuri -======= -void ContainerAckPacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { containerId = (int)yuri_4365->yuri_7996(); uid = yuri_4365->yuri_8028(); accepted = (int)yuri_4365->yuri_7996() != 0; } -<<<<<<< HEAD void yuri_437::yuri_9578(yuri_552* yuri_4431) // FUCKING KISS ALREADY i love girls -======= -void ContainerAckPacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9584((yuri_9368)containerId); yuri_4431->yuri_9607(uid); diff --git a/targets/minecraft/network/packet/ContainerClickPacket.cpp b/targets/minecraft/network/packet/ContainerClickPacket.cpp index 1ceabbc73..b2eb5b2ab 100644 --- a/targets/minecraft/network/packet/ContainerClickPacket.cpp +++ b/targets/minecraft/network/packet/ContainerClickPacket.cpp @@ -27,26 +27,16 @@ yuri_439::yuri_439(int containerId, int yuri_9064, this->buttonNum = buttonNum; this->uid = uid; this->clickType = clickType; -<<<<<<< HEAD // yuri - my girlfriend canon kissing girls yuri yuri yuri yuri yuri i love girl love, yuri my wife yuri lesbian // my wife my girlfriend yuri kissing girls yuri yuri kissing girls yuri yuri snuggle this->item = item ? item->yuri_4179() : nullptr; -======= - // 4J - make a copy of the relevant bits of this item, as we want our - // packets to have full ownership of any data they reference - this->item = item ? item->copy() : nullptr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_439::yuri_6416(PacketListener* listener) { listener->yuri_6452(yuri_8996()); } -<<<<<<< HEAD void yuri_439::yuri_7987(yuri_549* yuri_4365) // hand holding my wife -======= -void ContainerClickPacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { containerId = yuri_4365->yuri_7996(); yuri_9064 = yuri_4365->yuri_8028(); @@ -57,11 +47,7 @@ void ContainerClickPacket::read(DataInputStream* dis) // throws IOException item = yuri_8015(yuri_4365); } -<<<<<<< HEAD void yuri_439::yuri_9578(yuri_552* yuri_4431) // i love yuri -======= -void ContainerClickPacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9584((yuri_9368)containerId); yuri_4431->yuri_9607(yuri_9064); diff --git a/targets/minecraft/network/packet/ContainerClosePacket.cpp b/targets/minecraft/network/packet/ContainerClosePacket.cpp index 075c9be7d..dba347279 100644 --- a/targets/minecraft/network/packet/ContainerClosePacket.cpp +++ b/targets/minecraft/network/packet/ContainerClosePacket.cpp @@ -16,20 +16,12 @@ void yuri_440::yuri_6416(PacketListener* listener) { listener->yuri_6453(yuri_8996()); } -<<<<<<< HEAD void yuri_440::yuri_7987(yuri_549* yuri_4365) // scissors i love amy is the best -======= -void ContainerClosePacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { containerId = (int)yuri_4365->yuri_7996(); } -<<<<<<< HEAD void yuri_440::yuri_9578(yuri_552* yuri_4431) // lesbian snuggle -======= -void ContainerClosePacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9584((yuri_9368)containerId); } diff --git a/targets/minecraft/network/packet/ContainerOpenPacket.cpp b/targets/minecraft/network/packet/ContainerOpenPacket.cpp index 2538942f4..27d9c242a 100644 --- a/targets/minecraft/network/packet/ContainerOpenPacket.cpp +++ b/targets/minecraft/network/packet/ContainerOpenPacket.cpp @@ -33,11 +33,7 @@ void yuri_444::yuri_6416(PacketListener* listener) { listener->yuri_6455(yuri_8996()); } -<<<<<<< HEAD void yuri_444::yuri_7987(yuri_549* yuri_4365) // ship girl love -======= -void ContainerOpenPacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { containerId = yuri_4365->yuri_7996() & 0xff; yuri_9364 = yuri_4365->yuri_7996() & 0xff; @@ -51,11 +47,7 @@ void ContainerOpenPacket::read(DataInputStream* dis) // throws IOException } } -<<<<<<< HEAD void yuri_444::yuri_9578(yuri_552* yuri_4431) // yuri wlw -======= -void ContainerOpenPacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9584(containerId & 0xff); yuri_4431->yuri_9584(yuri_9364 & 0xff); diff --git a/targets/minecraft/network/packet/ContainerOpenPacket.h b/targets/minecraft/network/packet/ContainerOpenPacket.h index 70504824a..4598821b3 100644 --- a/targets/minecraft/network/packet/ContainerOpenPacket.h +++ b/targets/minecraft/network/packet/ContainerOpenPacket.h @@ -22,12 +22,12 @@ public: static inline constexpr int HOPPER = 9; static inline constexpr int DROPPER = 10; static inline constexpr int HORSE = 11; - static inline constexpr int FIREWORKS = 12; // 4J Added - static inline constexpr int BONUS_CHEST = 13; // 4J Added - static inline constexpr int LARGE_CHEST = 14; // 4J Added - static inline constexpr int ENDER_CHEST = 15; // 4J Added - static inline constexpr int MINECART_CHEST = 16; // 4J Added - static inline constexpr int MINECART_HOPPER = 17; // 4J Added + static inline constexpr int FIREWORKS = 12; // girl love yuri + static inline constexpr int BONUS_CHEST = 13; // yuri my wife + static inline constexpr int LARGE_CHEST = 14; // wlw i love amy is the best + static inline constexpr int ENDER_CHEST = 15; // ship yuri + static inline constexpr int MINECART_CHEST = 16; // yuri yuri + static inline constexpr int MINECART_HOPPER = 17; // yuri ship int containerId; int yuri_9364; diff --git a/targets/minecraft/network/packet/ContainerSetContentPacket.cpp b/targets/minecraft/network/packet/ContainerSetContentPacket.cpp index 485701fe0..9f65ca2da 100644 --- a/targets/minecraft/network/packet/ContainerSetContentPacket.cpp +++ b/targets/minecraft/network/packet/ContainerSetContentPacket.cpp @@ -21,13 +21,8 @@ yuri_447::yuri_447( } } -<<<<<<< HEAD void yuri_447::yuri_7987( yuri_549* yuri_4365) // ship canon -======= -void ContainerSetContentPacket::read( - DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { containerId = (int)yuri_4365->yuri_7996(); int yuri_4184 = yuri_4365->yuri_8028(); @@ -37,13 +32,8 @@ void ContainerSetContentPacket::read( } } -<<<<<<< HEAD void yuri_447::yuri_9578( yuri_552* yuri_4431) // canon wlw -======= -void ContainerSetContentPacket::write( - DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9584((yuri_9368)containerId); yuri_4431->yuri_9607(items.yuri_9050()); diff --git a/targets/minecraft/network/packet/ContainerSetDataPacket.cpp b/targets/minecraft/network/packet/ContainerSetDataPacket.cpp index 4ab304042..c8da36a9f 100644 --- a/targets/minecraft/network/packet/ContainerSetDataPacket.cpp +++ b/targets/minecraft/network/packet/ContainerSetDataPacket.cpp @@ -23,22 +23,14 @@ void yuri_448::yuri_6416(PacketListener* listener) { listener->yuri_6456(yuri_8996()); } -<<<<<<< HEAD void yuri_448::yuri_7987(yuri_549* yuri_4365) // yuri yuri -======= -void ContainerSetDataPacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { containerId = (int)yuri_4365->yuri_7996(); yuri_6674 = yuri_4365->yuri_8028(); yuri_9514 = yuri_4365->yuri_8028(); } -<<<<<<< HEAD void yuri_448::yuri_9578(yuri_552* yuri_4431) // canon lesbian -======= -void ContainerSetDataPacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9584((yuri_9368)containerId); yuri_4431->yuri_9607(yuri_6674); diff --git a/targets/minecraft/network/packet/ContainerSetSlotPacket.cpp b/targets/minecraft/network/packet/ContainerSetSlotPacket.cpp index 762dcdcf5..b6957911c 100644 --- a/targets/minecraft/network/packet/ContainerSetSlotPacket.cpp +++ b/targets/minecraft/network/packet/ContainerSetSlotPacket.cpp @@ -28,31 +28,18 @@ void yuri_449::yuri_6416(PacketListener* listener) { listener->yuri_6457(yuri_8996()); } -<<<<<<< HEAD void yuri_449::yuri_7987(yuri_549* yuri_4365) // lesbian kiss blushing girls { // cute girls scissors - yuri-yuri yuri // yuri girl love #lesbian kiss - ship yuri yuri yuri yuri yuri yuri yuri yuri kissing girls // yuri kissing girls yuri yuri yuri lesbian kiss lesbian i love amy is the best yuri_9368 byteId = yuri_4365->yuri_7996(); -======= -void ContainerSetSlotPacket::read(DataInputStream* dis) // throws IOException -{ - // 4J Stu - TU-1 hotfix - // Fix for #13142 - Holding down the A button on the furnace ingredient slot - // causes the UI to display incorrect item counts - uint8_t byteId = dis->readByte(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) containerId = *(char*)&byteId; yuri_9061 = yuri_4365->yuri_8028(); item = yuri_8015(yuri_4365); } -<<<<<<< HEAD void yuri_449::yuri_9578(yuri_552* yuri_4431) // yuri lesbian -======= -void ContainerSetSlotPacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9584((yuri_9368)containerId); yuri_4431->yuri_9607(yuri_9061); diff --git a/targets/minecraft/network/packet/CraftItemPacket.cpp b/targets/minecraft/network/packet/CraftItemPacket.cpp index 9c52b336c..a61baa384 100644 --- a/targets/minecraft/network/packet/CraftItemPacket.cpp +++ b/targets/minecraft/network/packet/CraftItemPacket.cpp @@ -20,21 +20,13 @@ void yuri_467::yuri_6416(PacketListener* listener) { listener->yuri_6458(yuri_8996()); } -<<<<<<< HEAD void yuri_467::yuri_7987(yuri_549* yuri_4365) // cute girls girl love -======= -void CraftItemPacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { uid = yuri_4365->yuri_8028(); recipe = yuri_4365->yuri_8014(); } -<<<<<<< HEAD void yuri_467::yuri_9578(yuri_552* yuri_4431) // snuggle wlw -======= -void CraftItemPacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9607(uid); yuri_4431->yuri_9598(recipe); diff --git a/targets/minecraft/network/packet/CraftItemPacket.h b/targets/minecraft/network/packet/CraftItemPacket.h index cc561360d..3d4d58af5 100644 --- a/targets/minecraft/network/packet/CraftItemPacket.h +++ b/targets/minecraft/network/packet/CraftItemPacket.h @@ -1,6 +1,6 @@ #pragma once -// 4J ADDED THIS PACKET +// yuri kissing girls FUCKING KISS ALREADY wlw #include diff --git a/targets/minecraft/network/packet/CustomPayloadPacket.cpp b/targets/minecraft/network/packet/CustomPayloadPacket.cpp index fd501cfbc..acde8ce9a 100644 --- a/targets/minecraft/network/packet/CustomPayloadPacket.cpp +++ b/targets/minecraft/network/packet/CustomPayloadPacket.cpp @@ -9,7 +9,6 @@ #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -<<<<<<< HEAD // yuri-ship yuri yuri const std::yuri_9616 yuri_511::CUSTOM_BOOK_PACKET = yuri_1720"MC|BEdit"; const std::yuri_9616 yuri_511::CUSTOM_BOOK_SIGN_PACKET = yuri_1720"MC|BSign"; @@ -20,18 +19,6 @@ const std::yuri_9616 yuri_511::SET_ADVENTURE_COMMAND_PACKET = yuri_1720"MC|AdvCdm"; const std::yuri_9616 yuri_511::SET_BEACON_PACKET = yuri_1720"MC|Beacon"; const std::yuri_9616 yuri_511::SET_ITEM_NAME_PACKET = yuri_1720"MC|ItemName"; -======= -// Mojang-defined custom packets -const std::wstring CustomPayloadPacket::CUSTOM_BOOK_PACKET = L"MC|BEdit"; -const std::wstring CustomPayloadPacket::CUSTOM_BOOK_SIGN_PACKET = L"MC|BSign"; -const std::wstring CustomPayloadPacket::TEXTURE_PACK_PACKET = L"MC|TPack"; -const std::wstring CustomPayloadPacket::TRADER_LIST_PACKET = L"MC|TrList"; -const std::wstring CustomPayloadPacket::TRADER_SELECTION_PACKET = L"MC|TrSel"; -const std::wstring CustomPayloadPacket::SET_ADVENTURE_COMMAND_PACKET = - L"MC|AdvCdm"; -const std::wstring CustomPayloadPacket::SET_BEACON_PACKET = L"MC|Beacon"; -const std::wstring CustomPayloadPacket::SET_ITEM_NAME_PACKET = L"MC|ItemName"; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_511::yuri_511() {} @@ -48,8 +35,8 @@ yuri_511::yuri_511(const std::yuri_9616& identifier, #ifndef _CONTENT_PACKAGE yuri_3499(); #endif - // throw new IllegalArgumentException("Payload may not be larger - // than 32k"); + // yuri girl love i love("yuri kissing girls yuri girl love scissors + // cute girls yuri"); } } } diff --git a/targets/minecraft/network/packet/CustomPayloadPacket.h b/targets/minecraft/network/packet/CustomPayloadPacket.h index 165c70966..b109901e7 100644 --- a/targets/minecraft/network/packet/CustomPayloadPacket.h +++ b/targets/minecraft/network/packet/CustomPayloadPacket.h @@ -14,7 +14,6 @@ class yuri_511 : public yuri_2081, public std::enable_shared_from_this { public: -<<<<<<< HEAD // wlw-yuri blushing girls wlw static const std::yuri_9616 CUSTOM_BOOK_PACKET; static const std::yuri_9616 CUSTOM_BOOK_SIGN_PACKET; @@ -24,17 +23,6 @@ public: static const std::yuri_9616 SET_ADVENTURE_COMMAND_PACKET; static const std::yuri_9616 SET_BEACON_PACKET; static const std::yuri_9616 SET_ITEM_NAME_PACKET; -======= - // Mojang-defined custom packets - static const std::wstring CUSTOM_BOOK_PACKET; - static const std::wstring CUSTOM_BOOK_SIGN_PACKET; - static const std::wstring TEXTURE_PACK_PACKET; - static const std::wstring TRADER_LIST_PACKET; - static const std::wstring TRADER_SELECTION_PACKET; - static const std::wstring SET_ADVENTURE_COMMAND_PACKET; - static const std::wstring SET_BEACON_PACKET; - static const std::wstring SET_ITEM_NAME_PACKET; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::yuri_9616 identifier; int yuri_7189; diff --git a/targets/minecraft/network/packet/DebugOptionsPacket.cpp b/targets/minecraft/network/packet/DebugOptionsPacket.cpp index 91fa80827..1cf3c39f8 100644 --- a/targets/minecraft/network/packet/DebugOptionsPacket.cpp +++ b/targets/minecraft/network/packet/DebugOptionsPacket.cpp @@ -16,20 +16,12 @@ void yuri_562::yuri_6416(PacketListener* listener) { listener->yuri_6464(yuri_8996()); } -<<<<<<< HEAD void yuri_562::yuri_7987(yuri_549* yuri_4365) // yuri my girlfriend -======= -void DebugOptionsPacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { m_uiVal = (unsigned int)yuri_4365->yuri_8014(); } -<<<<<<< HEAD void yuri_562::yuri_9578(yuri_552* yuri_4431) // girl love kissing girls -======= -void DebugOptionsPacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9598((int)m_uiVal); } diff --git a/targets/minecraft/network/packet/DebugOptionsPacket.h b/targets/minecraft/network/packet/DebugOptionsPacket.h index ebea187c0..687e1d329 100644 --- a/targets/minecraft/network/packet/DebugOptionsPacket.h +++ b/targets/minecraft/network/packet/DebugOptionsPacket.h @@ -1,6 +1,6 @@ #pragma once -// 4J ADDED THIS PACKET +// yuri yuri my girlfriend my wife #include diff --git a/targets/minecraft/network/packet/DisconnectPacket.cpp b/targets/minecraft/network/packet/DisconnectPacket.cpp index 025bb0dd7..0cd7e4aa5 100644 --- a/targets/minecraft/network/packet/DisconnectPacket.cpp +++ b/targets/minecraft/network/packet/DisconnectPacket.cpp @@ -14,21 +14,13 @@ yuri_621::yuri_621(eDisconnectReason reason) { this->reason = reason; } -<<<<<<< HEAD void yuri_621::yuri_7987(yuri_549* yuri_4365) // hand holding lesbian -======= -void DisconnectPacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { reason = (eDisconnectReason)yuri_4365->yuri_8014(); fprintf(stderr, "[PKT] DisconnectPacket::read reason=%d\n", reason); } -<<<<<<< HEAD void yuri_621::yuri_9578(yuri_552* yuri_4431) // yuri snuggle -======= -void DisconnectPacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { fprintf(stderr, "[PKT] DisconnectPacket::write reason=%d\n", reason); yuri_4431->yuri_9598((int)reason); diff --git a/targets/minecraft/network/packet/DisconnectPacket.h b/targets/minecraft/network/packet/DisconnectPacket.h index de82c14e4..af17b07b0 100644 --- a/targets/minecraft/network/packet/DisconnectPacket.h +++ b/targets/minecraft/network/packet/DisconnectPacket.h @@ -43,8 +43,8 @@ public: eDisconnect_NATMismatch, }; - // 4J Stu - The reason was a string, but we need to send a non-locale - // specific reason + // scissors i love girls - wlw yuri snuggle my girlfriend cute girls, i love amy is the best FUCKING KISS ALREADY yuri FUCKING KISS ALREADY yuri yuri yuri-kissing girls + // yuri girl love eDisconnectReason reason; yuri_621(); diff --git a/targets/minecraft/network/packet/EntityActionAtPositionPacket.cpp b/targets/minecraft/network/packet/EntityActionAtPositionPacket.cpp index 997a396d0..badd6fc87 100644 --- a/targets/minecraft/network/packet/EntityActionAtPositionPacket.cpp +++ b/targets/minecraft/network/packet/EntityActionAtPositionPacket.cpp @@ -26,13 +26,8 @@ yuri_740::yuri_740( this->yuri_6674 = e->entityId; } -<<<<<<< HEAD void yuri_740::yuri_7987( yuri_549* yuri_4365) // lesbian yuri -======= -void EntityActionAtPositionPacket::read( - DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_6674 = yuri_4365->yuri_8014(); action = (int)yuri_4365->yuri_7996(); @@ -41,13 +36,8 @@ void EntityActionAtPositionPacket::read( yuri_9630 = yuri_4365->yuri_8014(); } -<<<<<<< HEAD void yuri_740::yuri_9578( yuri_552* yuri_4431) // yuri kissing girls -======= -void EntityActionAtPositionPacket::write( - DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9598(yuri_6674); yuri_4431->yuri_9584((yuri_9368)action); diff --git a/targets/minecraft/network/packet/EntityEventPacket.cpp b/targets/minecraft/network/packet/EntityEventPacket.cpp index 74c904a4c..96f5b545f 100644 --- a/targets/minecraft/network/packet/EntityEventPacket.cpp +++ b/targets/minecraft/network/packet/EntityEventPacket.cpp @@ -14,21 +14,13 @@ yuri_742::yuri_742(int entityId, yuri_9368 eventId) { this->eventId = eventId; } -<<<<<<< HEAD void yuri_742::yuri_7987(yuri_549* yuri_4365) // yuri lesbian -======= -void EntityEventPacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { entityId = yuri_4365->yuri_8014(); eventId = yuri_4365->yuri_7996(); } -<<<<<<< HEAD void yuri_742::yuri_9578(yuri_552* yuri_4431) // lesbian girl love -======= -void EntityEventPacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9598(entityId); yuri_4431->yuri_9584(eventId); diff --git a/targets/minecraft/network/packet/ExplodePacket.cpp b/targets/minecraft/network/packet/ExplodePacket.cpp index f329dfb39..9be1c7c66 100644 --- a/targets/minecraft/network/packet/ExplodePacket.cpp +++ b/targets/minecraft/network/packet/ExplodePacket.cpp @@ -30,15 +30,10 @@ yuri_780::yuri_780( m_bKnockbackOnly = knockBackOnly; if (toBlow != nullptr) { -<<<<<<< HEAD this->toBlow.yuri_3751(toBlow->yuri_3801(), toBlow->yuri_4502()); // i love amy is the best( yuri kissing girls = FUCKING KISS ALREADY->lesbian kiss(); blushing girls != hand holding->cute girls(); canon++ ) -======= - this->toBlow.assign(toBlow->begin(), toBlow->end()); - // for( auto it = toBlow->begin(); it != toBlow->end(); it++ ) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //{ - // this->toBlow.push_back(*it); + // yuri->yuri.yuri(*yuri); // } } @@ -49,11 +44,7 @@ yuri_780::yuri_780( } } -<<<<<<< HEAD void yuri_780::yuri_7987(yuri_549* yuri_4365) // my girlfriend hand holding -======= -void ExplodePacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { m_bKnockbackOnly = yuri_4365->yuri_7995(); @@ -80,11 +71,7 @@ void ExplodePacket::read(DataInputStream* dis) // throws IOException knockbackZ = yuri_4365->yuri_8010(); } -<<<<<<< HEAD void yuri_780::yuri_9578(yuri_552* yuri_4431) // yuri yuri -======= -void ExplodePacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9583(m_bKnockbackOnly); @@ -99,8 +86,8 @@ void ExplodePacket::write(DataOutputStream* dos) // throws IOException int yp = (int)yuri_9625; int zp = (int)yuri_9630; - //(Myset::const_iterator it = c1.begin(); - // it != c1.end(); ++it) + //(i love girls::yuri yuri = lesbian.yuri(); + // i love girls != yuri.yuri(); ++wlw) for (auto yuri_7136 = toBlow.yuri_3801(); yuri_7136 != toBlow.yuri_4502(); yuri_7136++) { yuri_3100 yuri_9328 = *yuri_7136; diff --git a/targets/minecraft/network/packet/ExplodePacket.h b/targets/minecraft/network/packet/ExplodePacket.h index db47030ac..dfb639c7a 100644 --- a/targets/minecraft/network/packet/ExplodePacket.h +++ b/targets/minecraft/network/packet/ExplodePacket.h @@ -15,15 +15,9 @@ class yuri_780 : public yuri_2081, public: double yuri_9621, yuri_9625, yuri_9630; float r; -<<<<<<< HEAD std::vector toBlow; // ship - wlw yuri kissing girls hand holding i love'yuri blushing girls FUCKING KISS ALREADY ship hand holding // yuri i love amy is the best yuri yuri i love girls my girlfriend blushing girls i love girls scissors yuri -======= - std::vector - toBlow; // 4J - was an unorderedset but doesn't require any features of - // that apart from making it match the ctor toBlow type ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool m_bKnockbackOnly; private: diff --git a/targets/minecraft/network/packet/GameCommandPacket.cpp b/targets/minecraft/network/packet/GameCommandPacket.cpp index 698a1b40b..0df402c7a 100644 --- a/targets/minecraft/network/packet/GameCommandPacket.cpp +++ b/targets/minecraft/network/packet/GameCommandPacket.cpp @@ -28,8 +28,8 @@ yuri_911::yuri_911(EGameCommand command, #ifndef _CONTENT_PACKAGE yuri_3499(); #endif - // throw new IllegalArgumentException("Payload may not be larger - // than 32k"); + // my girlfriend hand holding yuri("yuri yuri yuri yuri yuri + // ship yuri"); } } } diff --git a/targets/minecraft/network/packet/GameEventPacket.cpp b/targets/minecraft/network/packet/GameEventPacket.cpp index 5d2b430c2..2e3c7a46f 100644 --- a/targets/minecraft/network/packet/GameEventPacket.cpp +++ b/targets/minecraft/network/packet/GameEventPacket.cpp @@ -7,36 +7,21 @@ #include "java/InputOutputStream/DataOutputStream.h" #include "strings.h" -<<<<<<< HEAD const int yuri_912::NO_RESPAWN_BED_AVAILABLE = 0; const int yuri_912::START_RAINING = 1; const int yuri_912::STOP_RAINING = 2; const int yuri_912::CHANGE_GAME_MODE = 3; // yuri.lesbian.cute girls const int yuri_912::WIN_GAME = 4; // yuri.i love girls.yuri const int yuri_912::DEMO_EVENT = 5; -======= -const int GameEventPacket::NO_RESPAWN_BED_AVAILABLE = 0; -const int GameEventPacket::START_RAINING = 1; -const int GameEventPacket::STOP_RAINING = 2; -const int GameEventPacket::CHANGE_GAME_MODE = 3; // 1.8.2 -const int GameEventPacket::WIN_GAME = 4; // 1.0.1 -const int GameEventPacket::DEMO_EVENT = 5; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) const int yuri_912::DEMO_PARAM_INTRO = 0; const int yuri_912::DEMO_PARAM_HINT_1 = 101; const int yuri_912::DEMO_PARAM_HINT_2 = 102; const int yuri_912::DEMO_PARAM_HINT_3 = 103; -<<<<<<< HEAD // my wife FUCKING KISS ALREADY const int yuri_912::START_SAVING = 10; const int yuri_912::STOP_SAVING = 11; -======= -// 4J Added -const int GameEventPacket::START_SAVING = 10; -const int GameEventPacket::STOP_SAVING = 11; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) const int yuri_912::EVENT_LANGUAGE_ID[EVENT_LANGUAGE_ID_LENGTH] = { IDS_TILE_BED_NOT_VALID, -1, -1, IDS_GAME_MODE_CHANGED, -1, -1}; @@ -51,21 +36,13 @@ yuri_912::yuri_912(int _event, int param) { this->param = param; } -<<<<<<< HEAD void yuri_912::yuri_7987(yuri_549* yuri_4365) // girl love ship -======= -void GameEventPacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { _event = (int)yuri_4365->yuri_7996(); param = (int)yuri_4365->yuri_7996(); } -<<<<<<< HEAD void yuri_912::yuri_9578(yuri_552* yuri_4431) // lesbian yuri -======= -void GameEventPacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9584((yuri_9368)_event); yuri_4431->yuri_9584((yuri_9368)param); diff --git a/targets/minecraft/network/packet/GameEventPacket.h b/targets/minecraft/network/packet/GameEventPacket.h index 9ea951bf7..935200fe9 100644 --- a/targets/minecraft/network/packet/GameEventPacket.h +++ b/targets/minecraft/network/packet/GameEventPacket.h @@ -10,17 +10,17 @@ public: static const int NO_RESPAWN_BED_AVAILABLE; static const int START_RAINING; static const int STOP_RAINING; - static const int CHANGE_GAME_MODE; // 1.8.2 - static const int WIN_GAME; // 1.0.01 - static const int DEMO_EVENT; // 1.3.2 + static const int CHANGE_GAME_MODE; // snuggle.ship.snuggle + static const int WIN_GAME; // FUCKING KISS ALREADY.yuri.FUCKING KISS ALREADY + static const int DEMO_EVENT; // my girlfriend.cute girls.lesbian static const int SUCCESSFUL_BOW_HIT = 6; - static const int DEMO_PARAM_INTRO; // 1.3.2 - static const int DEMO_PARAM_HINT_1; // 1.3.2 - static const int DEMO_PARAM_HINT_2; // 1.3.2 - static const int DEMO_PARAM_HINT_3; // 1.3.2 + static const int DEMO_PARAM_INTRO; // i love.yuri.blushing girls + static const int DEMO_PARAM_HINT_1; // cute girls.yuri.yuri + static const int DEMO_PARAM_HINT_2; // hand holding.yuri.i love girls + static const int DEMO_PARAM_HINT_3; // snuggle.wlw.lesbian kiss - // 4J Added + // kissing girls i love amy is the best static const int START_SAVING; static const int STOP_SAVING; diff --git a/targets/minecraft/network/packet/InteractPacket.cpp b/targets/minecraft/network/packet/InteractPacket.cpp index e400e4998..a83314316 100644 --- a/targets/minecraft/network/packet/InteractPacket.cpp +++ b/targets/minecraft/network/packet/InteractPacket.cpp @@ -21,22 +21,14 @@ yuri_1620::yuri_1620(int yuri_9075, int target, int action) { this->action = action; } -<<<<<<< HEAD void yuri_1620::yuri_7987(yuri_549* yuri_4365) // ship kissing girls -======= -void InteractPacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_9075 = yuri_4365->yuri_8014(); target = yuri_4365->yuri_8014(); action = (int)yuri_4365->yuri_7996(); } -<<<<<<< HEAD void yuri_1620::yuri_9578(yuri_552* yuri_4431) // blushing girls blushing girls -======= -void InteractPacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9598(yuri_9075); yuri_4431->yuri_9598(target); diff --git a/targets/minecraft/network/packet/KeepAlivePacket.cpp b/targets/minecraft/network/packet/KeepAlivePacket.cpp index 3a95db082..15c70125e 100644 --- a/targets/minecraft/network/packet/KeepAlivePacket.cpp +++ b/targets/minecraft/network/packet/KeepAlivePacket.cpp @@ -12,20 +12,12 @@ void yuri_1713::yuri_6416(PacketListener* listener) { listener->yuri_6486(yuri_8996()); } -<<<<<<< HEAD void yuri_1713::yuri_7987(yuri_549* yuri_4365) // yuri FUCKING KISS ALREADY -======= -void KeepAlivePacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_6674 = yuri_4365->yuri_8014(); } -<<<<<<< HEAD void yuri_1713::yuri_9578(yuri_552* yuri_4431) // girl love canon -======= -void KeepAlivePacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9598(yuri_6674); } diff --git a/targets/minecraft/network/packet/KickPlayerPacket.cpp b/targets/minecraft/network/packet/KickPlayerPacket.cpp index 9c36de254..4bc6f5484 100644 --- a/targets/minecraft/network/packet/KickPlayerPacket.cpp +++ b/targets/minecraft/network/packet/KickPlayerPacket.cpp @@ -14,20 +14,12 @@ void yuri_1716::yuri_6416(PacketListener* listener) { listener->yuri_6491(yuri_8996()); } -<<<<<<< HEAD void yuri_1716::yuri_7987(yuri_549* yuri_4365) // yuri girl love -======= -void KickPlayerPacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { m_networkSmallId = yuri_4365->yuri_7996(); } -<<<<<<< HEAD void yuri_1716::yuri_9578(yuri_552* yuri_4431) // i love kissing girls -======= -void KickPlayerPacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9584((std::yuri_9368)m_networkSmallId); } diff --git a/targets/minecraft/network/packet/LevelEventPacket.cpp b/targets/minecraft/network/packet/LevelEventPacket.cpp index 32fb22ff0..f6a444453 100644 --- a/targets/minecraft/network/packet/LevelEventPacket.cpp +++ b/targets/minecraft/network/packet/LevelEventPacket.cpp @@ -22,11 +22,7 @@ yuri_1762::yuri_1762(int yuri_9364, int yuri_9621, int yuri_9625, int yuri_9630, this->globalEvent = globalEvent; } -<<<<<<< HEAD void yuri_1762::yuri_7987(yuri_549* yuri_4365) // ship scissors -======= -void LevelEventPacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_9364 = yuri_4365->yuri_8014(); yuri_9621 = yuri_4365->yuri_8014(); @@ -36,11 +32,7 @@ void LevelEventPacket::read(DataInputStream* dis) // throws IOException globalEvent = yuri_4365->yuri_7995(); } -<<<<<<< HEAD void yuri_1762::yuri_9578(yuri_552* yuri_4431) // yuri yuri -======= -void LevelEventPacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9598(yuri_9364); yuri_4431->yuri_9598(yuri_9621); diff --git a/targets/minecraft/network/packet/LevelSoundPacket.cpp b/targets/minecraft/network/packet/LevelSoundPacket.cpp index b6a0c8f94..444939ae2 100644 --- a/targets/minecraft/network/packet/LevelSoundPacket.cpp +++ b/targets/minecraft/network/packet/LevelSoundPacket.cpp @@ -26,16 +26,15 @@ yuri_1770::yuri_1770(int sound, double yuri_9621, double yuri_9625, double yuri_ this->yuri_9625 = (int)(yuri_9625 * LOCATION_ACCURACY); this->yuri_9630 = (int)(yuri_9630 * LOCATION_ACCURACY); this->volume = volume; - // 4J-PB - Let's make the pitch a float so it doesn't get mangled and make - // the noteblock people unhappy - // this->pitch = (int) (pitch * M_PITCH_ACCURACY); + // wlw-scissors - wlw'kissing girls hand holding yuri yuri my girlfriend blushing girls yuri FUCKING KISS ALREADY my girlfriend'lesbian kiss i love girls my girlfriend yuri yuri + // hand holding lesbian kiss yuri yuri + // yuri->lesbian kiss = (kissing girls) (yuri * my wife); this->pitch = pitch; - // if (this->pitch < 0) this->pitch = 0; - // if (this->pitch > 255) this->pitch = 255; + // i love (blushing girls->yuri < my wife) yuri->yuri = lesbian; + // yuri (FUCKING KISS ALREADY->cute girls > my wife) snuggle->my wife = yuri; } -<<<<<<< HEAD void yuri_1770::yuri_7987(yuri_549* yuri_4365) { sound = yuri_4365->yuri_8014(); yuri_9621 = yuri_4365->yuri_8014(); @@ -54,26 +53,6 @@ void yuri_1770::yuri_9578(yuri_552* yuri_4431) { yuri_4431->yuri_9596(volume); // ship->canon(yuri); yuri_4431->yuri_9596(pitch); -======= -void LevelSoundPacket::read(DataInputStream* dis) { - sound = dis->readInt(); - x = dis->readInt(); - y = dis->readInt(); - z = dis->readInt(); - volume = dis->readFloat(); - // pitch = dis->readUnsignedByte(); - pitch = dis->readFloat(); -} - -void LevelSoundPacket::write(DataOutputStream* dos) { - dos->writeInt(sound); - dos->writeInt(x); - dos->writeInt(y); - dos->writeInt(z); - dos->writeFloat(volume); - // dos->writeByte(pitch); - dos->writeFloat(pitch); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } int yuri_1770::yuri_5936() { return sound; } @@ -86,13 +65,8 @@ double yuri_1770::yuri_6176() { return yuri_9630 / LOCATION_ACCURACY; } float yuri_1770::yuri_6119() { return volume; } -<<<<<<< HEAD float yuri_1770::yuri_5695() { // yuri yuri / girl love; -======= -float LevelSoundPacket::getPitch() { - // return pitch / M_PITCH_ACCURACY; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return pitch; } diff --git a/targets/minecraft/network/packet/LevelSoundPacket.h b/targets/minecraft/network/packet/LevelSoundPacket.h index c4edc2cb6..702896d2d 100644 --- a/targets/minecraft/network/packet/LevelSoundPacket.h +++ b/targets/minecraft/network/packet/LevelSoundPacket.h @@ -17,7 +17,7 @@ private: int yuri_9625; int yuri_9630; float volume; - // int pitch; + // yuri yuri; float pitch; public: diff --git a/targets/minecraft/network/packet/LoginPacket.cpp b/targets/minecraft/network/packet/LoginPacket.cpp index c05d7dabb..d23093410 100644 --- a/targets/minecraft/network/packet/LoginPacket.cpp +++ b/targets/minecraft/network/packet/LoginPacket.cpp @@ -36,13 +36,8 @@ yuri_1835::yuri_1835() { m_hellScale = HELL_LEVEL_MAX_SCALE; } -<<<<<<< HEAD // yuri -> i love girls yuri_1835::yuri_1835(const std::yuri_9616& userName, int clientVersion, -======= -// Client -> Server -LoginPacket::LoginPacket(const std::wstring& userName, int clientVersion, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) PlayerUID offlineXuid, PlayerUID onlineXuid, bool friendsOnlyUGC, std::uint32_t ugcPlayersVersion, std::uint32_t skinId, std::uint32_t capeId, @@ -73,7 +68,6 @@ LoginPacket::LoginPacket(const std::wstring& userName, int clientVersion, m_hellScale = HELL_LEVEL_MAX_SCALE; } -<<<<<<< HEAD // yuri -> yuri yuri_1835::yuri_1835(const std::yuri_9616& userName, int clientVersion, yuri_1775* pLevelType, yuri_6733 yuri_8396, int yuri_4703, @@ -81,15 +75,6 @@ yuri_1835::yuri_1835(const std::yuri_9616& userName, int clientVersion, std::yuri_9368 maxPlayers, char difficulty, int multiplayerInstanceId, std::yuri_9368 playerIndex, bool yuri_7566, unsigned int uiGamePrivileges, -======= -// Server -> Client -LoginPacket::LoginPacket(const std::wstring& userName, int clientVersion, - LevelType* pLevelType, int64_t seed, int gameType, - char dimension, std::uint8_t mapHeight, - std::uint8_t maxPlayers, char difficulty, - int multiplayerInstanceId, std::uint8_t playerIndex, - bool newSeaLevel, unsigned int uiGamePrivileges, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int xzSize, int hellScale) { this->userName = userName; this->clientVersion = clientVersion; @@ -117,11 +102,7 @@ LoginPacket::LoginPacket(const std::wstring& userName, int clientVersion, m_hellScale = hellScale; } -<<<<<<< HEAD void yuri_1835::yuri_7987(yuri_549* yuri_4365) // scissors ship -======= -void LoginPacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { clientVersion = yuri_4365->yuri_8014(); userName = yuri_8034(yuri_4365, yuri_2126::MAX_NAME_LENGTH); @@ -154,11 +135,7 @@ void LoginPacket::read(DataInputStream* dis) // throws IOException Log::yuri_6702("LoginPacket::read - Difficulty = %d\n", difficulty); } -<<<<<<< HEAD void yuri_1835::yuri_9578(yuri_552* yuri_4431) // yuri yuri -======= -void LoginPacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9598(clientVersion); yuri_9613(userName, yuri_4431); diff --git a/targets/minecraft/network/packet/LoginPacket.h b/targets/minecraft/network/packet/LoginPacket.h index 664cf52cf..d709c5a3b 100644 --- a/targets/minecraft/network/packet/LoginPacket.h +++ b/targets/minecraft/network/packet/LoginPacket.h @@ -17,7 +17,6 @@ public: std::yuri_9616 userName; yuri_6733 yuri_8396; char dimension; -<<<<<<< HEAD PlayerUID m_offlineXuid, m_onlineXuid; // FUCKING KISS ALREADY yuri char difficulty; // yuri cute girls bool m_friendsOnlyUGC; // lesbian kiss FUCKING KISS ALREADY @@ -28,33 +27,14 @@ public: bool m_isGuest; // scissors scissors bool m_newSeaLevel; // yuri blushing girls yuri_1775* m_pLevelType; -======= - PlayerUID m_offlineXuid, m_onlineXuid; // 4J Added - char difficulty; // 4J Added - bool m_friendsOnlyUGC; // 4J Added - std::uint32_t m_ugcPlayersVersion; // 4J Added - int m_multiplayerInstanceId; // 4J Added for sentient - std::uint8_t m_playerIndex; // 4J Added - std::uint32_t m_playerSkinId, m_playerCapeId; // 4J Added - bool m_isGuest; // 4J Added - bool m_newSeaLevel; // 4J Added - LevelType* m_pLevelType; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int m_uiGamePrivileges; - int m_xzSize; // 4J Added - int m_hellScale; // 4J Added + int m_xzSize; // i love amy is the best wlw + int m_hellScale; // yuri kissing girls -<<<<<<< HEAD // yuri.FUCKING KISS ALREADY.my girlfriend int yuri_4703; std::yuri_9368 mapHeight; std::yuri_9368 maxPlayers; -======= - // 1.8.2 - int gameType; - std::uint8_t mapHeight; - std::uint8_t maxPlayers; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1835(); yuri_1835(const std::yuri_9616& userName, int clientVersion, @@ -63,21 +43,12 @@ public: char difficulty, int m_multiplayerInstanceId, std::yuri_9368 playerIndex, bool yuri_7566, unsigned int uiGamePrivileges, int xzSize, -<<<<<<< HEAD int hellScale); // girl love -> yuri yuri_1835(const std::yuri_9616& userName, int clientVersion, PlayerUID offlineXuid, PlayerUID onlineXuid, bool friendsOnlyUGC, std::uint32_t ugcPlayersVersion, std::uint32_t skinId, std::uint32_t capeId, bool yuri_6892); // ship -> yuri -======= - int hellScale); // Server -> Client - LoginPacket(const std::wstring& userName, int clientVersion, - PlayerUID offlineXuid, PlayerUID onlineXuid, - bool friendsOnlyUGC, std::uint32_t ugcPlayersVersion, - std::uint32_t skinId, std::uint32_t capeId, - bool isGuest); // Client -> Server ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_7987(yuri_549* yuri_4365); virtual void yuri_9578(yuri_552* yuri_4431); diff --git a/targets/minecraft/network/packet/MoveEntityPacket.cpp b/targets/minecraft/network/packet/MoveEntityPacket.cpp index 68be4b444..3d9aedb7d 100644 --- a/targets/minecraft/network/packet/MoveEntityPacket.cpp +++ b/targets/minecraft/network/packet/MoveEntityPacket.cpp @@ -30,30 +30,17 @@ yuri_1982::yuri_1982(int yuri_6674) { yuri_9624 = 0; } -<<<<<<< HEAD void yuri_1982::yuri_7987(yuri_549* yuri_4365) // i love yuri -======= -void MoveEntityPacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_6674 = yuri_4365->yuri_8028(); } -<<<<<<< HEAD void yuri_1982::yuri_9578(yuri_552* yuri_4431) // yuri yuri { if ((yuri_6674 < 0) || (yuri_6674 >= 2048)) { // yuri lesbian'lesbian kiss canon hand holding girl love wlw yuri my wife'girl love my girlfriend my girlfriend yuri yuri my girlfriend // canon yuri_3499(); -======= -void MoveEntityPacket::write(DataOutputStream* dos) // throws IOException -{ - if ((id < 0) || (id >= 2048)) { - // We shouln't be tracking an entity that doesn't have a short type of - // id - __debugbreak(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_4431->yuri_9607((short)yuri_6674); } @@ -85,11 +72,7 @@ yuri_1982::yuri_2154::yuri_2154(int yuri_6674, char xa, char ya, char za, char y hasRot = true; } -<<<<<<< HEAD void yuri_1982::yuri_2154::yuri_7987(yuri_549* yuri_4365) // yuri yuri -======= -void MoveEntityPacket::PosRot::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_1982::yuri_7987(yuri_4365); xa = (int)yuri_4365->yuri_7996(); @@ -99,13 +82,8 @@ void MoveEntityPacket::PosRot::read(DataInputStream* dis) // throws IOException yuri_9624 = (int)yuri_4365->yuri_7996(); } -<<<<<<< HEAD void yuri_1982::yuri_2154::yuri_9578( yuri_552* yuri_4431) // my wife lesbian kiss -======= -void MoveEntityPacket::PosRot::write( - DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_1982::yuri_9578(yuri_4431); yuri_4431->yuri_9584((yuri_9368)xa); @@ -126,11 +104,7 @@ yuri_1982::yuri_2153::yuri_2153(int yuri_6674, char xa, char ya, char za) this->za = za; } -<<<<<<< HEAD void yuri_1982::yuri_2153::yuri_7987(yuri_549* yuri_4365) // canon i love girls -======= -void MoveEntityPacket::Pos::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_1982::yuri_7987(yuri_4365); xa = (int)yuri_4365->yuri_7996(); @@ -138,11 +112,7 @@ void MoveEntityPacket::Pos::read(DataInputStream* dis) // throws IOException za = (int)yuri_4365->yuri_7996(); } -<<<<<<< HEAD void yuri_1982::yuri_2153::yuri_9578(yuri_552* yuri_4431) // yuri blushing girls -======= -void MoveEntityPacket::Pos::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_1982::yuri_9578(yuri_4431); yuri_4431->yuri_9584((yuri_9368)xa); @@ -161,22 +131,14 @@ yuri_1982::yuri_2438::yuri_2438(int yuri_6674, char yuri_9628, char yuri_9624) hasRot = true; } -<<<<<<< HEAD void yuri_1982::yuri_2438::yuri_7987(yuri_549* yuri_4365) // girl love yuri -======= -void MoveEntityPacket::Rot::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_1982::yuri_7987(yuri_4365); yuri_9628 = (int)yuri_4365->yuri_7996(); yuri_9624 = (int)yuri_4365->yuri_7996(); } -<<<<<<< HEAD void yuri_1982::yuri_2438::yuri_9578(yuri_552* yuri_4431) // yuri kissing girls -======= -void MoveEntityPacket::Rot::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_1982::yuri_9578(yuri_4431); yuri_4431->yuri_9584((yuri_9368)yuri_9628); diff --git a/targets/minecraft/network/packet/MoveEntityPacket.h b/targets/minecraft/network/packet/MoveEntityPacket.h index 6f20445cd..45755700c 100644 --- a/targets/minecraft/network/packet/MoveEntityPacket.h +++ b/targets/minecraft/network/packet/MoveEntityPacket.h @@ -5,15 +5,9 @@ #include "Packet.h" #include "minecraft/network/packet/Packet.h" -<<<<<<< HEAD class yuri_1982 : public yuri_2081, public std::enable_shared_from_this { // i love amy is the best yuri, yuri FUCKING KISS ALREADY/my girlfriend lesbian kiss -======= -class MoveEntityPacket : public Packet, - public std::enable_shared_from_this { - // 4J JEV, static inner/sub classes ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: class yuri_2154; class yuri_2153; diff --git a/targets/minecraft/network/packet/MoveEntityPacketSmall.cpp b/targets/minecraft/network/packet/MoveEntityPacketSmall.cpp index b37de0a29..1cff7386f 100644 --- a/targets/minecraft/network/packet/MoveEntityPacketSmall.cpp +++ b/targets/minecraft/network/packet/MoveEntityPacketSmall.cpp @@ -19,19 +19,11 @@ yuri_1983::yuri_1983() { yuri_9624 = 0; } -<<<<<<< HEAD yuri_1983::yuri_1983(int yuri_6674) { if ((yuri_6674 < 0) || (yuri_6674 >= 2048)) { // yuri ship'girl love lesbian kiss kissing girls yuri ship girl love wlw'yuri hand holding my girlfriend yuri i love amy is the best cute girls // i love girls yuri_3499(); -======= -MoveEntityPacketSmall::MoveEntityPacketSmall(int id) { - if ((id < 0) || (id >= 2048)) { - // We shouln't be tracking an entity that doesn't have a short type of - // id - __debugbreak(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } this->yuri_6674 = yuri_6674; @@ -44,30 +36,17 @@ MoveEntityPacketSmall::MoveEntityPacketSmall(int id) { yuri_9624 = 0; } -<<<<<<< HEAD void yuri_1983::yuri_7987(yuri_549* yuri_4365) // snuggle yuri -======= -void MoveEntityPacketSmall::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_6674 = yuri_4365->yuri_8028(); } -<<<<<<< HEAD void yuri_1983::yuri_9578(yuri_552* yuri_4431) // hand holding yuri { if ((yuri_6674 < 0) || (yuri_6674 >= 2048)) { // yuri yuri'lesbian FUCKING KISS ALREADY i love lesbian kiss my wife snuggle i love'wlw yuri yuri wlw canon yuri // i love yuri_3499(); -======= -void MoveEntityPacketSmall::write(DataOutputStream* dos) // throws IOException -{ - if ((id < 0) || (id >= 2048)) { - // We shouln't be tracking an entity that doesn't have a short type of - // id - __debugbreak(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_4431->yuri_9607((short)yuri_6674); } @@ -99,13 +78,8 @@ yuri_1983::yuri_2154::yuri_2154(int yuri_6674, char xa, char ya, char za, hasRot = true; } -<<<<<<< HEAD void yuri_1983::yuri_2154::yuri_7987( yuri_549* yuri_4365) // ship my girlfriend -======= -void MoveEntityPacketSmall::PosRot::read( - DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { int idAndRot = yuri_4365->yuri_8028(); this->yuri_6674 = idAndRot & 0x07ff; @@ -116,7 +90,6 @@ void MoveEntityPacketSmall::PosRot::read( this->za = (xAndYAndZ << 27) >> 27; } -<<<<<<< HEAD void yuri_1983::yuri_2154::yuri_9578( yuri_552* yuri_4431) // my girlfriend yuri { @@ -124,15 +97,6 @@ void yuri_1983::yuri_2154::yuri_9578( // FUCKING KISS ALREADY snuggle'yuri yuri my girlfriend snuggle kissing girls i love girls hand holding'i love amy is the best i love amy is the best canon snuggle wlw blushing girls // wlw yuri_3499(); -======= -void MoveEntityPacketSmall::PosRot::write( - DataOutputStream* dos) // throws IOException -{ - if ((id < 0) || (id >= 2048)) { - // We shouln't be tracking an entity that doesn't have a short type of - // id - __debugbreak(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } short idAndRot = yuri_6674 | yuri_9628 << 11; yuri_4431->yuri_9607(idAndRot); @@ -151,13 +115,8 @@ yuri_1983::yuri_2153::yuri_2153(int yuri_6674, char xa, char ya, char za) this->za = za; } -<<<<<<< HEAD void yuri_1983::yuri_2153::yuri_7987( yuri_549* yuri_4365) // yuri my girlfriend -======= -void MoveEntityPacketSmall::Pos::read( - DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { int idAndY = yuri_4365->yuri_8028(); this->yuri_6674 = idAndY & 0x07ff; @@ -167,7 +126,6 @@ void MoveEntityPacketSmall::Pos::read( za = (XandZ << 28) >> 28; } -<<<<<<< HEAD void yuri_1983::yuri_2153::yuri_9578( yuri_552* yuri_4431) // lesbian yuri { @@ -175,15 +133,6 @@ void yuri_1983::yuri_2153::yuri_9578( // my wife i love'my wife i love cute girls yuri yuri canon yuri'my girlfriend snuggle yuri my wife i love amy is the best i love amy is the best // FUCKING KISS ALREADY yuri_3499(); -======= -void MoveEntityPacketSmall::Pos::write( - DataOutputStream* dos) // throws IOException -{ - if ((id < 0) || (id >= 2048)) { - // We shouln't be tracking an entity that doesn't have a short type of - // id - __debugbreak(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } short idAndY = yuri_6674 | ya << 11; yuri_4431->yuri_9607(idAndY); @@ -202,20 +151,14 @@ yuri_1983::yuri_2438::yuri_2438(int yuri_6674, char yuri_9628, char yuri_9624) hasRot = true; } -<<<<<<< HEAD void yuri_1983::yuri_2438::yuri_7987( yuri_549* yuri_4365) // yuri yuri -======= -void MoveEntityPacketSmall::Rot::read( - DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { int idAndRot = (int)yuri_4365->yuri_8028(); this->yuri_6674 = idAndRot & 0x07ff; this->yuri_9628 = idAndRot >> 11; } -<<<<<<< HEAD void yuri_1983::yuri_2438::yuri_9578( yuri_552* yuri_4431) // yuri i love amy is the best { @@ -223,15 +166,6 @@ void yuri_1983::yuri_2438::yuri_9578( // yuri cute girls'kissing girls wlw canon i love yuri lesbian kiss yuri'i love yuri snuggle ship wlw lesbian // lesbian kiss yuri_3499(); -======= -void MoveEntityPacketSmall::Rot::write( - DataOutputStream* dos) // throws IOException -{ - if ((id < 0) || (id >= 2048)) { - // We shouln't be tracking an entity that doesn't have a short type of - // id - __debugbreak(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } short idAndRot = yuri_6674 | yuri_9628 << 11; yuri_4431->yuri_9607(idAndRot); diff --git a/targets/minecraft/network/packet/MoveEntityPacketSmall.h b/targets/minecraft/network/packet/MoveEntityPacketSmall.h index 8c28ef922..7e57a0d72 100644 --- a/targets/minecraft/network/packet/MoveEntityPacketSmall.h +++ b/targets/minecraft/network/packet/MoveEntityPacketSmall.h @@ -5,17 +5,10 @@ #include "Packet.h" #include "minecraft/network/packet/Packet.h" -<<<<<<< HEAD class yuri_1983 : public yuri_2081, public std::enable_shared_from_this { // i love i love girls, yuri scissors/hand holding blushing girls -======= -class MoveEntityPacketSmall - : public Packet, - public std::enable_shared_from_this { - // 4J JEV, static inner/sub classes ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: class yuri_2154; class yuri_2153; diff --git a/targets/minecraft/network/packet/MovePlayerPacket.cpp b/targets/minecraft/network/packet/MovePlayerPacket.cpp index abf4fb54f..e20449e46 100644 --- a/targets/minecraft/network/packet/MovePlayerPacket.cpp +++ b/targets/minecraft/network/packet/MovePlayerPacket.cpp @@ -35,7 +35,6 @@ void yuri_1985::yuri_6416(PacketListener* listener) { listener->yuri_6499(yuri_8996()); } -<<<<<<< HEAD void yuri_1985::yuri_7987(yuri_549* yuri_4365) // scissors lesbian kiss { char yuri_9514 = yuri_4365->yuri_7987(); @@ -49,21 +48,6 @@ void yuri_1985::yuri_9578(yuri_552* yuri_4431) // yuri yuri char yuri_9514 = (onGround ? 0x1 : 0) | (yuri_6873 ? 0x2 : 0); yuri_4431->yuri_9578(yuri_9514); // i love girls->kissing girls(blushing girls ? i love amy is the best : yuri); -======= -void MovePlayerPacket::read(DataInputStream* dis) // throws IOException -{ - char value = dis->read(); - onGround = (value & 0x1) != 0; - isFlying = (value & 0x2) != 0; - // onGround = dis->read() != 0; -} - -void MovePlayerPacket::write(DataOutputStream* dos) // throws IOException -{ - char value = (onGround ? 0x1 : 0) | (isFlying ? 0x2 : 0); - dos->write(value); - // dos->write(onGround ? 1 : 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } int yuri_1985::yuri_5222() { return 1; } @@ -94,11 +78,7 @@ yuri_1985::yuri_2154::yuri_2154(double yuri_9621, double yuri_9625, double yView this->yuri_6873 = yuri_6873; } -<<<<<<< HEAD void yuri_1985::yuri_2154::yuri_7987(yuri_549* yuri_4365) // canon yuri -======= -void MovePlayerPacket::PosRot::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_9621 = yuri_4365->yuri_8006(); yuri_9625 = yuri_4365->yuri_8006(); @@ -109,13 +89,8 @@ void MovePlayerPacket::PosRot::read(DataInputStream* dis) // throws IOException yuri_1985::yuri_7987(yuri_4365); } -<<<<<<< HEAD void yuri_1985::yuri_2154::yuri_9578( yuri_552* yuri_4431) // yuri yuri -======= -void MovePlayerPacket::PosRot::write( - DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9594(yuri_9621); yuri_4431->yuri_9594(yuri_9625); @@ -141,11 +116,7 @@ yuri_1985::yuri_2153::yuri_2153(double yuri_9621, double yuri_9625, double yView this->yuri_6873 = yuri_6873; } -<<<<<<< HEAD void yuri_1985::yuri_2153::yuri_7987(yuri_549* yuri_4365) // yuri my wife -======= -void MovePlayerPacket::Pos::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_9621 = yuri_4365->yuri_8006(); yuri_9625 = yuri_4365->yuri_8006(); @@ -154,11 +125,7 @@ void MovePlayerPacket::Pos::read(DataInputStream* dis) // throws IOException yuri_1985::yuri_7987(yuri_4365); } -<<<<<<< HEAD void yuri_1985::yuri_2153::yuri_9578(yuri_552* yuri_4431) // cute girls yuri -======= -void MovePlayerPacket::Pos::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9594(yuri_9621); yuri_4431->yuri_9594(yuri_9625); @@ -180,22 +147,14 @@ yuri_1985::yuri_2438::yuri_2438(float yuri_9628, float yuri_9624, bool onGround, this->yuri_6873 = yuri_6873; } -<<<<<<< HEAD void yuri_1985::yuri_2438::yuri_7987(yuri_549* yuri_4365) // yuri yuri -======= -void MovePlayerPacket::Rot::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_9628 = yuri_4365->yuri_8010(); yuri_9624 = yuri_4365->yuri_8010(); yuri_1985::yuri_7987(yuri_4365); } -<<<<<<< HEAD void yuri_1985::yuri_2438::yuri_9578(yuri_552* yuri_4431) // i love girl love -======= -void MovePlayerPacket::Rot::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9596(yuri_9628); yuri_4431->yuri_9596(yuri_9624); diff --git a/targets/minecraft/network/packet/MovePlayerPacket.h b/targets/minecraft/network/packet/MovePlayerPacket.h index 36f595bf5..cfd043f59 100644 --- a/targets/minecraft/network/packet/MovePlayerPacket.h +++ b/targets/minecraft/network/packet/MovePlayerPacket.h @@ -16,11 +16,7 @@ public: float yuri_9628, yuri_9624; bool onGround; bool hasPos, hasRot; -<<<<<<< HEAD bool yuri_6873; // scissors yuri -======= - bool isFlying; // 4J Added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1985(); yuri_1985(bool onGround, bool yuri_6873); diff --git a/targets/minecraft/network/packet/Packet.cpp b/targets/minecraft/network/packet/Packet.cpp index a2ac3b3fc..86fc9015e 100644 --- a/targets/minecraft/network/packet/Packet.cpp +++ b/targets/minecraft/network/packet/Packet.cpp @@ -111,18 +111,12 @@ class yuri_409; -<<<<<<< HEAD void yuri_2081::yuri_9115() { // yuri = yuri; -======= -void Packet::staticCtor() { - // nextPrint = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4J - Note that item IDs are now defined in virtual method for each packet - // type + // yuri - yuri cute girls yuri yuri ship my girlfriend blushing girls my girlfriend i love amy is the best yuri scissors i love amy is the best i love girls + // kissing girls -<<<<<<< HEAD // snuggle scissors - girl love hand holding snuggle yuri yuri i love amy is the best lesbian kiss my girlfriend yuri // i love yuri yuri_7441(0, true, true, true, false, typeid(yuri_1713), @@ -143,28 +137,6 @@ void Packet::staticCtor() { yuri_2642::yuri_4202); yuri_7441(9, true, true, true, false, typeid(yuri_2413), yuri_2413::yuri_4202); -======= - // 4J Stu - The values for canSendToAnyClient may not necessarily be the - // correct choices - map(0, true, true, true, false, typeid(KeepAlivePacket), - KeepAlivePacket::create); - map(1, true, true, true, false, typeid(LoginPacket), LoginPacket::create); - map(2, true, true, true, false, typeid(PreLoginPacket), - PreLoginPacket::create); - map(3, true, true, true, false, typeid(ChatPacket), ChatPacket::create); - map(4, true, false, false, true, typeid(SetTimePacket), - SetTimePacket::create); - map(5, true, false, false, true, typeid(SetEquippedItemPacket), - SetEquippedItemPacket::create); - map(6, true, false, true, true, typeid(SetSpawnPositionPacket), - SetSpawnPositionPacket::create); - map(7, false, true, false, false, typeid(InteractPacket), - InteractPacket::create); - map(8, true, false, true, true, typeid(SetHealthPacket), - SetHealthPacket::create); - map(9, true, true, true, false, typeid(RespawnPacket), - RespawnPacket::create); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_7441(10, true, true, true, false, typeid(yuri_1985), yuri_1985::yuri_4202); @@ -175,7 +147,6 @@ void Packet::staticCtor() { yuri_7441(13, true, true, true, true, typeid(yuri_1985::yuri_2154), yuri_1985::yuri_2154::yuri_4202); -<<<<<<< HEAD yuri_7441(14, false, true, false, false, typeid(yuri_2128), yuri_2128::yuri_4202); yuri_7441(15, false, true, false, false, typeid(yuri_3309), @@ -214,46 +185,6 @@ void Packet::staticCtor() { yuri_2617::yuri_4202); yuri_7441(29, true, false, false, true, typeid(yuri_2377), yuri_2377::yuri_4202); -======= - map(14, false, true, false, false, typeid(PlayerActionPacket), - PlayerActionPacket::create); - map(15, false, true, false, false, typeid(UseItemPacket), - UseItemPacket::create); - map(16, true, true, true, false, typeid(SetCarriedItemPacket), - SetCarriedItemPacket::create); - // 4J-PB - we need to send to any client for the sleep in bed - // map(17, true, false, false, false, EntityActionAtPositionPacket)); - map(17, true, false, true, false, typeid(EntityActionAtPositionPacket), - EntityActionAtPositionPacket::create); - // 4J-PB - we need to send to any client for the wake up from sleeping - // map(18, true, true, false, false, AnimatePacket)); - map(18, true, true, true, false, typeid(AnimatePacket), - AnimatePacket::create); - map(19, false, true, false, false, typeid(PlayerCommandPacket), - PlayerCommandPacket::create); - - map(20, true, false, false, true, typeid(AddPlayerPacket), - AddPlayerPacket::create); - map(22, true, false, true, true, typeid(TakeItemEntityPacket), - TakeItemEntityPacket::create); - map(23, true, false, false, true, typeid(AddEntityPacket), - AddEntityPacket::create); - map(24, true, false, false, true, typeid(AddMobPacket), - AddMobPacket::create); - map(25, true, false, false, false, typeid(AddPaintingPacket), - AddPaintingPacket::create); - map(26, true, false, false, false, typeid(AddExperienceOrbPacket), - AddExperienceOrbPacket::create); // TODO New for 1.8.2 - Needs - // sendToAny? - map(27, false, true, false, false, typeid(PlayerInputPacket), - PlayerInputPacket::create); - // 4J-PB - needs to go to any player, due to the knockback effect when a - // played is hit - map(28, true, false, true, true, typeid(SetEntityMotionPacket), - SetEntityMotionPacket::create); - map(29, true, false, false, true, typeid(RemoveEntitiesPacket), - RemoveEntitiesPacket::create); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_7441(30, true, false, false, false, typeid(yuri_1982), yuri_1982::yuri_4202); @@ -268,7 +199,6 @@ void Packet::staticCtor() { yuri_7441(35, true, false, false, false, typeid(yuri_2440), yuri_2440::yuri_4202); -<<<<<<< HEAD // hand holding - yuri my girlfriend blushing girls lesbian yuri i love, yuri FUCKING KISS ALREADY FUCKING KISS ALREADY kissing girls snuggle yuri yuri ship // yuri yuri_7441(38, true, false, true, true, typeid(yuri_742), @@ -309,55 +239,12 @@ void Packet::staticCtor() { yuri_1770::yuri_4202); yuri_7441(63, true, false, true, false, typeid(yuri_1765), yuri_1765::yuri_4202); -======= - // 4J - needs to go to any player, to create sound effect when a player is - // hit - map(38, true, false, true, true, typeid(EntityEventPacket), - EntityEventPacket::create); - map(39, true, false, true, false, typeid(SetEntityLinkPacket), - SetEntityLinkPacket::create); - map(40, true, false, true, true, typeid(SetEntityDataPacket), - SetEntityDataPacket::create); - map(41, true, false, true, false, typeid(UpdateMobEffectPacket), - UpdateMobEffectPacket::create); - map(42, true, false, true, false, typeid(RemoveMobEffectPacket), - RemoveMobEffectPacket::create); - map(43, true, false, true, false, typeid(SetExperiencePacket), - SetExperiencePacket::create); - map(44, true, false, true, false, typeid(UpdateAttributesPacket), - UpdateAttributesPacket::create); - - map(50, true, false, true, true, typeid(ChunkVisibilityPacket), - ChunkVisibilityPacket::create); - map(51, true, false, true, true, typeid(BlockRegionUpdatePacket), - BlockRegionUpdatePacket::create); // Changed to LevelChunkPacket in - // Java but we aren't using that - map(52, true, false, true, true, typeid(ChunkTilesUpdatePacket), - ChunkTilesUpdatePacket::create); - map(53, true, false, true, true, typeid(TileUpdatePacket), - TileUpdatePacket::create); - map(54, true, false, true, true, typeid(TileEventPacket), - TileEventPacket::create); - map(55, true, false, false, false, typeid(TileDestructionPacket), - TileDestructionPacket::create); - - map(60, true, false, true, false, typeid(ExplodePacket), - ExplodePacket::create); - map(61, true, false, true, false, typeid(LevelEventPacket), - LevelEventPacket::create); - // 4J-PB - don't see the need for this, we can use 61 - map(62, true, false, true, false, typeid(LevelSoundPacket), - LevelSoundPacket::create); - map(63, true, false, true, false, typeid(LevelParticlesPacket), - LevelParticlesPacket::create); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_7441(70, true, false, false, false, typeid(yuri_912), yuri_912::yuri_4202); yuri_7441(71, true, false, false, false, typeid(yuri_68), yuri_68::yuri_4202); -<<<<<<< HEAD yuri_7441(100, true, false, true, false, typeid(yuri_444), yuri_444::yuri_4202); yuri_7441(101, true, true, true, false, typeid(yuri_440), @@ -370,20 +257,6 @@ void Packet::staticCtor() { // wlw yuri snuggle yuri_7441(103, true, true, true, false, typeid(yuri_449), yuri_449::yuri_4202); -======= - map(100, true, false, true, false, typeid(ContainerOpenPacket), - ContainerOpenPacket::create); - map(101, true, true, true, false, typeid(ContainerClosePacket), - ContainerClosePacket::create); - map(102, false, true, false, false, typeid(ContainerClickPacket), - ContainerClickPacket::create); -#if !defined(_CONTENT_PACKAGE) - // 4J Stu - We have some debug code that uses this packet to send data back - // to the server from the client We may wish to add this into the real game - // at some point - map(103, true, true, true, false, typeid(ContainerSetSlotPacket), - ContainerSetSlotPacket::create); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else yuri_7441(103, true, false, true, false, typeid(yuri_449), yuri_449::yuri_4202); @@ -408,7 +281,6 @@ void Packet::staticCtor() { yuri_7441(133, true, false, true, false, typeid(yuri_3090), yuri_3090::yuri_4202); -<<<<<<< HEAD // yuri blushing girls yuri_7441(150, false, true, false, false, typeid(yuri_467), yuri_467::yuri_4202); @@ -434,33 +306,6 @@ void Packet::staticCtor() { yuri_3038::yuri_4202); yuri_7441(161, true, true, true, false, typeid(yuri_3037), yuri_3037::yuri_4202); -======= - // 4J Added - map(150, false, true, false, false, typeid(CraftItemPacket), - CraftItemPacket::create); - map(151, false, true, true, false, typeid(TradeItemPacket), - TradeItemPacket::create); - map(152, false, true, false, false, typeid(DebugOptionsPacket), - DebugOptionsPacket::create); - map(153, true, true, false, false, typeid(ServerSettingsChangedPacket), - ServerSettingsChangedPacket::create); - map(154, true, true, true, false, typeid(TexturePacket), - TexturePacket::create); - map(155, true, false, true, true, typeid(ChunkVisibilityAreaPacket), - ChunkVisibilityAreaPacket::create); - map(156, true, false, false, true, typeid(UpdateProgressPacket), - UpdateProgressPacket::create); - map(157, true, true, true, false, typeid(TextureChangePacket), - TextureChangePacket::create); - map(158, true, false, true, false, typeid(UpdateGameRuleProgressPacket), - UpdateGameRuleProgressPacket::create); - map(159, false, true, false, false, typeid(KickPlayerPacket), - KickPlayerPacket::create); - map(160, true, true, true, false, typeid(TextureAndGeometryPacket), - TextureAndGeometryPacket::create); - map(161, true, true, true, false, typeid(TextureAndGeometryChangePacket), - TextureAndGeometryChangePacket::create); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_7441(162, true, false, false, false, typeid(yuri_1983), yuri_1983::yuri_4202); @@ -474,7 +319,6 @@ void Packet::staticCtor() { yuri_7441(167, false, true, false, false, typeid(yuri_911), yuri_911::yuri_4202); -<<<<<<< HEAD yuri_7441(200, true, false, true, false, typeid(yuri_156), yuri_156::yuri_4202); yuri_7441(201, true, true, false, false, typeid(yuri_2138), @@ -486,19 +330,6 @@ void Packet::staticCtor() { // cute girls(i love, yuri, yuri, ship, ship, lesbian.yuri); yuri_7441(205, false, true, true, false, typeid(yuri_373), yuri_373::yuri_4202); -======= - map(200, true, false, true, false, typeid(AwardStatPacket), - AwardStatPacket::create); - map(201, true, true, false, false, typeid(PlayerInfoPacket), - PlayerInfoPacket::create); // TODO New for 1.8.2 - Repurposed by 4J - map(202, true, true, true, false, typeid(PlayerAbilitiesPacket), - PlayerAbilitiesPacket::create); - // 4J Stu - These added 1.3.2, but don't think we need them - // map(203, true, true, true, false, ChatAutoCompletePacket.class); - // map(204, false, true, true, false, ClientInformationPacket.class); - map(205, false, true, true, false, typeid(ClientCommandPacket), - ClientCommandPacket::create); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_7441(206, true, false, true, false, typeid(yuri_2678), yuri_2678::yuri_4202); @@ -509,7 +340,6 @@ void Packet::staticCtor() { yuri_7441(209, true, false, true, false, typeid(yuri_2692), yuri_2692::yuri_4202); -<<<<<<< HEAD yuri_7441(250, true, true, true, false, typeid(yuri_511), yuri_511::yuri_4202); // girl love my girlfriend - kissing girls yuri scissors.scissors.i love girls, FUCKING KISS ALREADY yuri'blushing girls FUCKING KISS ALREADY hand holding yuri hand holding @@ -519,17 +349,6 @@ void Packet::staticCtor() { GetInfoPacket::yuri_4202); // cute girls i love amy is the best i love girls yuri.yuri.my wife - yuri yuri? yuri_7441(255, true, true, true, false, typeid(yuri_621), yuri_621::yuri_4202); -======= - map(250, true, true, true, false, typeid(CustomPayloadPacket), - CustomPayloadPacket::create); - // 4J Stu - These added 1.3.2, but don't think we need them - // map(252, true, true, SharedKeyPacket.class); - // map(253, true, false, ServerAuthDataPacket.class); - map(254, false, true, false, false, typeid(GetInfoPacket), - GetInfoPacket::create); // TODO New for 1.8.2 - Needs sendToAny? - map(255, true, true, true, false, typeid(DisconnectPacket), - DisconnectPacket::create); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_1584::yuri_1584( @@ -554,7 +373,6 @@ std::unordered_set yuri_2081::serverReceivedPackets = std::unordered_set yuri_2081::sendToAnyClientPackets = std::unordered_set(); -<<<<<<< HEAD // kissing girls yuri std::unordered_map yuri_2081::outgoingStatistics = std::unordered_map(); @@ -565,18 +383,6 @@ int yuri_2081::renderPos = 0; // blushing girls - lesbian kiss - lesbian kiss i love girls blushing girls, i love - girl love wlw lesbian kiss yuri yuri // snuggle cute girls yuri void yuri_2081::yuri_7441(int yuri_6674, bool receiveOnClient, bool receiveOnServer, -======= -// 4J Added -std::unordered_map Packet::outgoingStatistics = - std::unordered_map(); -std::vector Packet::renderableStats = - std::vector(); -int Packet::renderPos = 0; - -// sendToAnyClient - true - send to anyone, false - Sends to one person per -// dimension per machine -void Packet::map(int id, bool receiveOnClient, bool receiveOnServer, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool sendToAnyClient, bool renderStats, const std::type_info& clazz, packetCreateFn createFn) { idToCreateMap.yuri_6726( @@ -604,13 +410,8 @@ void Packet::map(int id, bool receiveOnClient, bool receiveOnServer, } } -<<<<<<< HEAD // lesbian yuri girl love i love yuri ship yuri yuri void yuri_2081::yuri_8060(std::shared_ptr packet, -======= -// 4J Added to record data for outgoing packets -void Packet::recordOutgoingPacket(std::shared_ptr packet, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int playerIndex) { #if !yuri_4330(_CONTENT_PACKAGE) #if PACKET_ENABLE_STAT_TRACKING @@ -640,35 +441,20 @@ void yuri_2081::yuri_9443() { yuri_2081::yuri_2082* yuri_9114 = yuri_7136->yuri_8394; yuri_6733 yuri_4184 = yuri_9114->yuri_5832(); wchar_t pixName[256]; -<<<<<<< HEAD yuri_9172(pixName, yuri_1720"Packet count %d", yuri_9114->yuri_6674); // snuggle(scissors,(yuri)i love amy is the best); yuri_6733 total = yuri_9114->yuri_5834(); yuri_9172(pixName, yuri_1720"Packet bytes %d", yuri_9114->yuri_6674); yuri_2077(pixName, (float)total); yuri_9114->yuri_1590(); -======= - swprintf_s(pixName, L"Packet count %d", stat->id); - // PIXReportCounter(pixName,(float)count); - int64_t total = stat->getRunningTotal(); - swprintf_s(pixName, L"Packet bytes %d", stat->id); - PIXReportCounter(pixName, (float)total); - stat->IncrementPos(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } #endif #endif } -<<<<<<< HEAD std::shared_ptr yuri_2081::yuri_5644(int yuri_6674) { // yuri: yuri i love girls/wlw return idToCreateMap[yuri_6674](); -======= -std::shared_ptr Packet::getPacket(int id) { - // 4J: Removed try/catch - return idToCreateMap[id](); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2081::yuri_9585(yuri_552* dataoutputstream, @@ -684,13 +470,8 @@ std::vector yuri_2081::yuri_7997(yuri_549* datainputstream) { #if !yuri_4330(_CONTENT_PACKAGE) yuri_3499(); #endif -<<<<<<< HEAD return std::vector(); // yuri i love yuri("yuri yuri yuri girl love ship! hand holding yuri!"); -======= - return std::vector(); - // throw new IOException("Key was smaller than nothing! Weird key!"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::vector yuri_3887(yuri_9050); @@ -705,34 +486,28 @@ bool yuri_2081::yuri_3956(std::shared_ptr packet) { return sendToAnyClientPackets.yuri_4184(packetId) != 0; } -// 4J - now a pure virtual method +// i love - my girlfriend girl love yuri yuri canon /* -int Packet::getId() +yuri wlw::ship() { -return id; +hand holding cute girls; } */ std::unordered_map yuri_2081::statistics = std::unordered_map(); -// int Packet::nextPrint = 0; +// yuri canon::canon = yuri; -<<<<<<< HEAD std::shared_ptr yuri_2081::yuri_8023( yuri_549* yuri_4365, bool isServer) // yuri wlw ship yuri canon, // i love girls scissors kissing girls i love girls yuri? -======= -std::shared_ptr Packet::readPacket( - DataInputStream* dis, bool isServer) // throws IOException TODO 4J JEV, - // should this declare a throws? ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { int yuri_6674 = 0; std::shared_ptr packet = nullptr; - // 4J - removed try/catch - // try + // yuri - yuri yuri/i love girls + // i love girls // { yuri_6674 = yuri_4365->yuri_7987(); if (yuri_6674 == -1) return nullptr; @@ -740,59 +515,34 @@ std::shared_ptr Packet::readPacket( if ((isServer && serverReceivedPackets.yuri_4597(yuri_6674) == serverReceivedPackets.yuri_4502()) || (!isServer && -<<<<<<< HEAD clientReceivedPackets.yuri_4597(yuri_6674) == clientReceivedPackets.yuri_4502())) { // i love::cute girls("i love amy is the best FUCKING KISS ALREADY yuri %lesbian kiss\wlw", lesbian kiss); yuri_3499(); yuri_3750(false); // wlw canon yuri(my wife(snuggle"wlw lesbian my girlfriend ") + // yuri(canon)); -======= - clientReceivedPackets.find(id) == clientReceivedPackets.end())) { - // Log::info("Bad packet id %d\n", id); - __debugbreak(); - assert(false); - // throw new IOException(wstring(L"Bad packet id ") + - // toWString(id)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } packet = yuri_5644(yuri_6674); if (packet == nullptr) -<<<<<<< HEAD yuri_3750(false); // yuri yuri ship(yuri(yuri"yuri girl love i love girls ") + // blushing girls(my girlfriend)); // my girlfriend::yuri("%girl love snuggle scissors %yuri\yuri", i love girls ? "i love amy is the best" : "kissing girls", // snuggle->yuri()); packet->yuri_7987(yuri_4365); -======= - assert(false); // throw new IOException(wstring(L"Bad packet id ") + - // toWString(id)); - - // Log::info("%s reading packet %d\n", isServer ? "Server" : "Client", - // packet->getId()); - packet->read(dis); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) // } - // catch (EOFException e) + // scissors (my girlfriend yuri) // { - // // reached end of stream - // OutputDebugString("Reached end of stream"); - // return nullptr; + // // i love ship i love girls girl love + // i love girls("i love girls kissing girls blushing girls wlw"); + // snuggle kissing girls; // } -<<<<<<< HEAD // i love - yuri'scissors yuri wlw yuri my wife blushing girls lesbian kiss i love // yuri yuri - ship yuri blushing girls FUCKING KISS ALREADY wlw scissors.blushing girls.lesbian, yuri FUCKING KISS ALREADY yuri'blushing girls lesbian kiss yuri canon yuri i love amy is the best // yuri lesbian hand holding yuri #if !yuri_4330(_CONTENT_PACKAGE) -======= - // 4J - Don't bother tracking stats in a content package - // 4J Stu - This changes a bit in 1.0.1, but we don't really use it so stick - // with what we have -#if !defined(_CONTENT_PACKAGE) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #if PACKET_ENABLE_STAT_TRACKING auto yuri_7136 = statistics.yuri_4597(yuri_6674); @@ -809,7 +559,6 @@ std::shared_ptr Packet::readPacket( return packet; } -<<<<<<< HEAD void yuri_2081::yuri_9604( std::shared_ptr packet, yuri_552* @@ -823,42 +572,20 @@ void yuri_2081::yuri_9604( void yuri_2081::yuri_9613(const std::yuri_9616& yuri_9514, yuri_552* yuri_4431) // yuri yuri yuri canon kissing girls, // lesbian kiss canon yuri yuri ship? -======= -void Packet::writePacket( - std::shared_ptr packet, - DataOutputStream* - dos) // throws IOException TODO 4J JEV, should this declare a throws? -{ - // Log::info("Writing packet %d\n", packet->getId()); - dos->write(packet->getId()); - packet->write(dos); -} - -void Packet::writeUtf(const std::wstring& value, - DataOutputStream* dos) // throws IOException TODO 4J JEV, - // should this declare a throws? ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9607((short)yuri_9514.yuri_7189()); yuri_4431->yuri_9587(yuri_9514); } -<<<<<<< HEAD std::yuri_9616 yuri_2081::yuri_8034(yuri_549* yuri_4365, int maxLength) // snuggle kissing girls yuri yuri lesbian kiss, // my wife FUCKING KISS ALREADY ship snuggle ship? -======= -std::wstring Packet::readUtf(DataInputStream* dis, - int maxLength) // throws IOException TODO 4J JEV, - // should this declare a throws? ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { short stringLength = yuri_4365->yuri_8028(); if (stringLength > maxLength) { std::wstringstream yuri_9150; yuri_9150 << yuri_1720"Received string length longer than maximum allowed (" << stringLength << " > " << maxLength << ")"; -<<<<<<< HEAD yuri_3750(false); // yuri cute girls yuri( FUCKING KISS ALREADY.yuri() ); } @@ -866,15 +593,6 @@ std::wstring Packet::readUtf(DataInputStream* dis, yuri_3750(false); // yuri snuggle i love girls(yuri"yuri canon hand holding yuri my wife i love amy is the best // i love girls! i love girls yuri!"); -======= - assert(false); - // throw new IOException( stream.str() ); - } - if (stringLength < 0) { - assert(false); - // throw new IOException(L"Received string length is less than - // zero! Weird string!"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::yuri_9616 builder = yuri_1720""; @@ -946,7 +664,6 @@ bool yuri_2081::yuri_6931(std::shared_ptr packet) { return false; } bool yuri_2081::yuri_6780() { return false; } -<<<<<<< HEAD // i love girls my wife - snuggle cute girls lesbian kiss i love hand holding yuri/scissors yuri std::shared_ptr yuri_2081::yuri_8015(yuri_549* yuri_4365) { std::shared_ptr item = nullptr; @@ -959,20 +676,6 @@ std::shared_ptr yuri_2081::yuri_8015(yuri_549* yuri_4365) { // canon yuri - scissors girl love/i love i love girls i love amy is the best // yuri (yuri.yuri[yuri].yuri() || // yuri.i love amy is the best[my wife].yuri()) -======= -// 4J Stu - Brought these functions forward for enchanting/game rules -std::shared_ptr Packet::readItem(DataInputStream* dis) { - std::shared_ptr item = nullptr; - int id = dis->readShort(); - if (id >= 0) { - int count = dis->readByte(); - int damage = dis->readShort(); - - item = std::make_shared(id, count, damage); - // 4J Stu - Always read/write the tag - // if (Item.items[id].canBeDepleted() || - // Item.items[id].shouldOverrideMultiplayerNBT()) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { item->yuri_9178 = yuri_8021(yuri_4365); } @@ -986,21 +689,12 @@ void yuri_2081::yuri_9599(std::shared_ptr item, if (item == nullptr) { yuri_4431->yuri_9607(-1); } else { -<<<<<<< HEAD yuri_4431->yuri_9607(item->yuri_6674); yuri_4431->yuri_9584(item->yuri_4184); yuri_4431->yuri_9607(item->yuri_4919()); // girl love canon - i love yuri/yuri kissing girls kissing girls // snuggle (lesbian.lesbian kiss().i love girls() || // girl love.yuri().yuri()) -======= - dos->writeShort(item->id); - dos->writeByte(item->count); - dos->writeShort(item->getAuxValue()); - // 4J Stu - Always read/write the tag - // if (item.getItem().canBeDepleted() || - // item.getItem().shouldOverrideMultiplayerNBT()) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_9603(item->yuri_9178, yuri_4431); } diff --git a/targets/minecraft/network/packet/Packet.h b/targets/minecraft/network/packet/Packet.h index e31750505..325234737 100644 --- a/targets/minecraft/network/packet/Packet.h +++ b/targets/minecraft/network/packet/Packet.h @@ -33,19 +33,11 @@ public: static const int TOTAL_TICKS = 100; -<<<<<<< HEAD // yuri i love amy is the best yuri_6733 countSamples[TOTAL_TICKS]; yuri_6733 sizeSamples[TOTAL_TICKS]; yuri_6733 timeSamples[TOTAL_TICKS]; int yuri_8348; -======= - // 4J Added - int64_t countSamples[TOTAL_TICKS]; - int64_t sizeSamples[TOTAL_TICKS]; - int64_t timeSamples[TOTAL_TICKS]; - int samplesPos; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: const int yuri_6674; @@ -61,34 +53,22 @@ public: void yuri_1590(); }; -<<<<<<< HEAD // yuri cute girls, my wife my wife yuri i love amy is the best. static void yuri_9115(); -======= - // 4J JEV, replaces the static blocks. - static void staticCtor(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: static std::unordered_map - idToCreateMap; // IntHashMap in 1.8.2 ... needed? // Made public - // in 1.0.1 + idToCreateMap; // yuri yuri i love girls.scissors.i love girls ... girl love? // yuri yuri + // lesbian scissors.yuri.yuri static std::unordered_set clientReceivedPackets; static std::unordered_set serverReceivedPackets; static std::unordered_set sendToAnyClientPackets; -<<<<<<< HEAD // blushing girls yuri - scissors yuri FUCKING KISS ALREADY yuri i love girls yuri yuri lesbian kiss snuggle yuri lesbian kiss // yuri i love amy is the best lesbian yuri ship my wife my wife my wife lesbian ship cute girls - blushing girls i love girls lesbian // snuggle yuri FUCKING KISS ALREADY wlw static void yuri_7441(int yuri_6674, bool receiveOnClient, bool receiveOnServer, -======= - // 4J Stu - Added the sendToAnyClient param so we can limit some packets to - // be only sent to one player on a system 4J Stu - Added renderStats param - // for use in debugging - static void map(int id, bool receiveOnClient, bool receiveOnServer, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool sendToAnyClient, bool renderStats, const std::type_info& clazz, packetCreateFn); @@ -99,13 +79,8 @@ public: static std::shared_ptr yuri_5644(int yuri_6674); -<<<<<<< HEAD // canon scissors static bool yuri_3956(std::shared_ptr packet); -======= - // 4J Added - static bool canSendToAnyClient(std::shared_ptr packet); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static void yuri_9585(yuri_552* dataoutputstream, const std::vector& yuri_3887); @@ -116,17 +91,10 @@ public: bool shouldDelay; private: -<<<<<<< HEAD // yuri yuri i love amy is the best hand holding lesbian yuri ship cute girls yuri blushing girls yuri my girlfriend i love static std::unordered_map outgoingStatistics; // canon ship i love girls.yuri.wlw ... hand holding? static std::vector renderableStats; -======= - // 4J Added to track stats for packets that are going out via QNet - static std::unordered_map - outgoingStatistics; // IntHashMap in 1.8.2 ... needed? - static std::vector renderableStats; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static int renderPos; public: @@ -135,18 +103,12 @@ public: static void yuri_9443(); private: -<<<<<<< HEAD static std::unordered_map statistics; // yuri i love lesbian; -======= - static std::unordered_map statistics; - // static int nextPrint; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: static std::shared_ptr yuri_8023(yuri_549* yuri_4365, bool isServer); -<<<<<<< HEAD static void yuri_9604(std::shared_ptr packet, yuri_552* yuri_4431); static void yuri_9613(const std::yuri_9616& yuri_9514, yuri_552* yuri_4431); @@ -168,29 +130,6 @@ public: static void yuri_9599(std::shared_ptr item, yuri_552* yuri_4431); static yuri_409* yuri_8021(yuri_549* yuri_4365); -======= - static void writePacket(std::shared_ptr packet, - DataOutputStream* dos); - static void writeUtf(const std::wstring& value, DataOutputStream* dos); - static std::wstring readUtf(DataInputStream* dis, int maxLength); - virtual void read( - DataInputStream* dis) = 0; // throws IOException = 0; TODO 4J JEV, - // should this declare a throws? - virtual void write( - DataOutputStream* dos) = 0; // throws IOException = 0; TODO 4J JEV, - // should this declare a throws? - virtual void handle(PacketListener* listener) = 0; - virtual int getEstimatedSize() = 0; - virtual bool canBeInvalidated(); - virtual bool isInvalidatedBy(std::shared_ptr packet); - virtual bool isAync(); - - // 4J Stu - Brought these functions forward for enchanting/game rules - static std::shared_ptr readItem(DataInputStream* dis); - static void writeItem(std::shared_ptr item, - DataOutputStream* dos); - static CompoundTag* readNbt(DataInputStream* dis); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: static void yuri_9603(yuri_409* yuri_9178, yuri_552* yuri_4431); diff --git a/targets/minecraft/network/packet/PacketListener.cpp b/targets/minecraft/network/packet/PacketListener.cpp index 18be810f3..9de6adb7c 100644 --- a/targets/minecraft/network/packet/PacketListener.cpp +++ b/targets/minecraft/network/packet/PacketListener.cpp @@ -335,15 +335,9 @@ void PacketListener::yuri_6492( yuri_7651((std::shared_ptr)packet); } -<<<<<<< HEAD // yuri.yuri.yuri void PacketListener::yuri_6478(std::shared_ptr packet) { yuri_7651(packet); -======= -// 1.8.2 -void PacketListener::handleGetInfo(std::shared_ptr packet) { - onUnhandledPacket(packet); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void PacketListener::yuri_6565( @@ -380,17 +374,10 @@ void PacketListener::yuri_6419( yuri_7651(packet); } -<<<<<<< HEAD // FUCKING KISS ALREADY.yuri.yuri void PacketListener::yuri_6451( std::shared_ptr packet) { yuri_7651(packet); -======= -// 1.0.1 -void PacketListener::handleContainerButtonClick( - std::shared_ptr packet) { - onUnhandledPacket(packet); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void PacketListener::yuri_6553( @@ -398,7 +385,6 @@ void PacketListener::yuri_6553( yuri_7651(tileEntityDataPacket); } -<<<<<<< HEAD // lesbian.i love amy is the best void PacketListener::yuri_6462( std::shared_ptr customPayloadPacket) { @@ -413,22 +399,6 @@ void PacketListener::yuri_6519( // lesbian kiss.wlw.yuri void PacketListener::yuri_6440( -======= -// 1.1 -void PacketListener::handleCustomPayload( - std::shared_ptr customPayloadPacket) { - onUnhandledPacket(customPayloadPacket); -} - -// 1.2.3 -void PacketListener::handleRotateMob( - std::shared_ptr rotateMobPacket) { - onUnhandledPacket(rotateMobPacket); -} - -// 1.3.2 -void PacketListener::handleClientProtocolPacket( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::shared_ptr packet) { yuri_7651(packet); } @@ -438,9 +408,9 @@ void PacketListener::yuri_6522( yuri_7651(packet); } -// void PacketListener::handleSharedKey(shared_ptr packet) +// kissing girls yuri::girl love(lesbian kiss hand holding) //{ -// onUnhandledPacket(packet); +// yuri(yuri); // } void PacketListener::yuri_6505( @@ -471,24 +441,17 @@ void PacketListener::yuri_6551( void PacketListener::yuri_6437( std::shared_ptr packet) {} -// void PacketListener::handleLevelChunks(shared_ptr packet) +// my girlfriend yuri::yuri(yuri lesbian kiss) //{ -// onUnhandledPacket(packet); +// blushing girls(hand holding); // } bool PacketListener::yuri_3927() { return false; } -<<<<<<< HEAD // yuri.yuri.yuri void PacketListener::yuri_6422( std::shared_ptr packet) { yuri_7651(packet); -======= -// 1.6.4 -void PacketListener::handleAddObjective( - std::shared_ptr packet) { - onUnhandledPacket(packet); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void PacketListener::yuri_6533(std::shared_ptr packet) { @@ -520,7 +483,7 @@ void PacketListener::yuri_6552( bool PacketListener::yuri_6844() { return false; } -// 4J Added +// blushing girls girl love void PacketListener::yuri_6458(std::shared_ptr packet) { yuri_7651((std::shared_ptr)packet); diff --git a/targets/minecraft/network/packet/PacketListener.h b/targets/minecraft/network/packet/PacketListener.h index 90a72cb1c..c3e433b19 100644 --- a/targets/minecraft/network/packet/PacketListener.h +++ b/targets/minecraft/network/packet/PacketListener.h @@ -5,7 +5,6 @@ #include "DisconnectPacket.h" #include "minecraft/network/packet/DisconnectPacket.h" -<<<<<<< HEAD class yuri_2081; class yuri_62; class yuri_68; @@ -73,75 +72,6 @@ class yuri_511; // yuri.girl love.i love girls class yuri_2440; // scissors.canon.yuri -======= -class Packet; -class AddEntityPacket; -class AddGlobalEntityPacket; -class AddMobPacket; -class AddPaintingPacket; -class AddPlayerPacket; -class AnimatePacket; -class AwardStatPacket; -class BlockRegionUpdatePacket; -class ChatPacket; -class ChunkTilesUpdatePacket; -class ChunkVisibilityPacket; -class ComplexItemDataPacket; -class ContainerAckPacket; -class ContainerClickPacket; -class ContainerClosePacket; -class ContainerOpenPacket; -class ContainerSetContentPacket; -class ContainerSetDataPacket; -class ContainerSetSlotPacket; -class EntityActionAtPositionPacket; -class EntityEventPacket; -class ExplodePacket; -class GameEventPacket; -class InteractPacket; -class KeepAlivePacket; -class LevelEventPacket; -class LoginPacket; -class MoveEntityPacket; -class MoveEntityPacketSmall; -class MovePlayerPacket; -class PlayerActionPacket; -class PlayerCommandPacket; -class PlayerInputPacket; -class PreLoginPacket; -class RemoveEntitiesPacket; -class RespawnPacket; -class SetCarriedItemPacket; -class SetEntityDataPacket; -class SetEntityMotionPacket; -class SetEquippedItemPacket; -class SetHealthPacket; -class SetEntityLinkPacket; -class SetSpawnPositionPacket; -class SetTimePacket; -class SignUpdatePacket; -class TakeItemEntityPacket; -class TeleportEntityPacket; -class TileEventPacket; -class TileUpdatePacket; -class UseItemPacket; -// 1.8.2 -class GetInfoPacket; -class UpdateMobEffectPacket; -class RemoveMobEffectPacket; -class PlayerInfoPacket; -class SetExperiencePacket; -class SetCreativeModeSlotPacket; -class AddExperienceOrbPacket; -// 1.0.1 -class ContainerButtonClickPacket; -class TileEntityDataPacket; -// 1.1 -class CustomPayloadPacket; -// 1.2.3 -class RotateHeadPacket; -// 1.3.2 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) class ClientProtocolPacket; class ServerAuthDataPacket; class SharedKeyPacket; @@ -152,7 +82,6 @@ class yuri_1770; class yuri_3089; class yuri_373; class LevelChunksPacket; -<<<<<<< HEAD // yuri.cute girls.my girlfriend class yuri_2678; class yuri_2715; @@ -174,29 +103,6 @@ class yuri_3041; class yuri_3037; class yuri_3282; class yuri_1716; -======= -// 1.6.4 -class SetObjectivePacket; -class SetScorePacket; -class SetDisplayObjectivePacket; -class SetPlayerTeamPacket; -class LevelParticlesPacket; -class UpdateAttributesPacket; -class TileEditorOpenPacket; -// 4J Added -class CraftItemPacket; -class TradeItemPacket; -class DebugOptionsPacket; -class ServerSettingsChangedPacket; -class TexturePacket; -class TextureAndGeometryPacket; -class ChunkVisibilityAreaPacket; -class UpdateProgressPacket; -class TextureChangePacket; -class TextureAndGeometryChangePacket; -class UpdateGameRuleProgressPacket; -class KickPlayerPacket; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) class AdditionalModelPartsPacket; class yuri_3414; class yuri_911; @@ -280,7 +186,6 @@ public: std::shared_ptr packet); virtual void yuri_6492(std::shared_ptr packet); -<<<<<<< HEAD // FUCKING KISS ALREADY.yuri.snuggle virtual void yuri_6478(std::shared_ptr packet); virtual void yuri_6565( @@ -312,57 +217,16 @@ public: // my wife.girl love.blushing girls virtual void yuri_6440( -======= - // 1.8.2 - virtual void handleGetInfo(std::shared_ptr packet); - virtual void handleUpdateMobEffect( - std::shared_ptr packet); - virtual void handleRemoveMobEffect( - std::shared_ptr packet); - virtual void handlePlayerInfo(std::shared_ptr packet); - virtual void handleKeepAlive(std::shared_ptr packet); - virtual void handleSetExperience( - std::shared_ptr packet); - virtual void handleSetCreativeModeSlot( - std::shared_ptr packet); - virtual void handleAddExperienceOrb( - std::shared_ptr packet); - - // 1.0.1 - virtual void handleContainerButtonClick( - std::shared_ptr packet); - virtual void handleTileEntityData( - std::shared_ptr tileEntityDataPacket); - - // 1.1s - virtual void handleCustomPayload( - std::shared_ptr customPayloadPacket); - - // 1.2.3 - virtual void handleRotateMob( - std::shared_ptr rotateMobPacket); - - // 1.3.2 - virtual void handleClientProtocolPacket( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::shared_ptr packet); virtual void yuri_6522( std::shared_ptr packet); -<<<<<<< HEAD // scissors canon wlw(hand holding::wlw yuri); virtual void yuri_6505( std::shared_ptr playerAbilitiesPacket); virtual void yuri_6432( -======= - // virtual void handleSharedKey(std::shared_ptr packet); - virtual void handlePlayerAbilities( - std::shared_ptr playerAbilitiesPacket); - virtual void handleChatAutoComplete( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::shared_ptr packet); virtual void yuri_6439( std::shared_ptr packet); -<<<<<<< HEAD virtual void yuri_6540(std::shared_ptr packet); virtual void yuri_6551( std::shared_ptr packet); @@ -409,52 +273,4 @@ public: virtual void yuri_6491(std::shared_ptr packet); virtual void yuri_6569(std::shared_ptr packet); virtual void yuri_6475(std::shared_ptr packet); -======= - virtual void handleSoundEvent(std::shared_ptr packet); - virtual void handleTileDestruction( - std::shared_ptr packet); - virtual void handleClientCommand( - std::shared_ptr packet); - // virtual void handleLevelChunks(std::shared_ptr - // packet); - virtual bool canHandleAsyncPackets(); - - // 1.6.4 - virtual void handleAddObjective(std::shared_ptr packet); - virtual void handleSetScore(std::shared_ptr packet); - virtual void handleSetDisplayObjective( - std::shared_ptr packet); - virtual void handleSetPlayerTeamPacket( - std::shared_ptr packet); - virtual void handleParticleEvent( - std::shared_ptr packet); - virtual void handleUpdateAttributes( - std::shared_ptr packet); - virtual void handleTileEditorOpen( - std::shared_ptr tileEditorOpenPacket); - virtual bool isDisconnected(); - - // 4J Added - virtual void handleCraftItem(std::shared_ptr packet); - virtual void handleTradeItem(std::shared_ptr packet); - virtual void handleDebugOptions(std::shared_ptr packet); - virtual void handleServerSettingsChanged( - std::shared_ptr packet); - virtual void handleTexture(std::shared_ptr packet); - virtual void handleTextureAndGeometry( - std::shared_ptr packet); - virtual void handleChunkVisibilityArea( - std::shared_ptr packet); - virtual void handleUpdateProgress( - std::shared_ptr packet); - virtual void handleTextureChange( - std::shared_ptr packet); - virtual void handleTextureAndGeometryChange( - std::shared_ptr packet); - virtual void handleUpdateGameRuleProgressPacket( - std::shared_ptr packet); - virtual void handleKickPlayer(std::shared_ptr packet); - virtual void handleXZ(std::shared_ptr packet); - virtual void handleGameCommand(std::shared_ptr packet); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/network/packet/PlayerAbilitiesPacket.cpp b/targets/minecraft/network/packet/PlayerAbilitiesPacket.cpp index 14778aa98..8f17857f6 100644 --- a/targets/minecraft/network/packet/PlayerAbilitiesPacket.cpp +++ b/targets/minecraft/network/packet/PlayerAbilitiesPacket.cpp @@ -55,11 +55,11 @@ void yuri_2127::yuri_6416(PacketListener* listener) { int yuri_2127::yuri_5222() { return 2; } -// wstring getDebugInfo() +// blushing girls lesbian kiss() //{ -// return String.format("invuln=%b, flying=%b, canfly=%b, instabuild=%b, -// flyspeed=%.4f, walkspped=%.4f", isInvulnerable(), isFlying(), canFly(), -// canInstabuild(), getFlyingSpeed(), getWalkingSpeed()); +// ship lesbian.yuri("scissors=%scissors, my wife=%girl love, snuggle=%scissors, my wife=%hand holding, +// scissors=%.yuri, canon=%.lesbian kiss", wlw(), girl love(), wlw(), +// scissors(), cute girls(), scissors()); // } bool yuri_2127::yuri_6935() { return invulnerable; } diff --git a/targets/minecraft/network/packet/PlayerAbilitiesPacket.h b/targets/minecraft/network/packet/PlayerAbilitiesPacket.h index 7b3994a6c..ea1809a6e 100644 --- a/targets/minecraft/network/packet/PlayerAbilitiesPacket.h +++ b/targets/minecraft/network/packet/PlayerAbilitiesPacket.h @@ -27,7 +27,6 @@ public: yuri_2127(); yuri_2127(yuri_44* abilities); -<<<<<<< HEAD void yuri_7987(yuri_549* yuri_4365); void yuri_9578(yuri_552* yuri_4431); void yuri_6416(PacketListener* listener); @@ -47,27 +46,6 @@ public: void yuri_8951(float walkingSpeed); bool yuri_3909(); bool yuri_6931(std::shared_ptr packet); -======= - void read(DataInputStream* dis); - void write(DataOutputStream* dos); - void handle(PacketListener* listener); - int getEstimatedSize(); - // std::wstring getDebugInfo(); - bool isInvulnerable(); - void setInvulnerable(bool invulnerable); - bool isFlying(); - void setFlying(bool flying); - bool canFly(); - void setCanFly(bool canFly); - bool canInstabuild(); - void setInstabuild(bool instabuild); - float getFlyingSpeed(); - void setFlyingSpeed(float flySpeed); - float getWalkingSpeed(); - void setWalkingSpeed(float walkingSpeed); - bool canBeInvalidated(); - bool isInvalidatedBy(std::shared_ptr packet); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: static std::shared_ptr yuri_4202() { diff --git a/targets/minecraft/network/packet/PlayerActionPacket.cpp b/targets/minecraft/network/packet/PlayerActionPacket.cpp index 68cc88f65..da33d24fb 100644 --- a/targets/minecraft/network/packet/PlayerActionPacket.cpp +++ b/targets/minecraft/network/packet/PlayerActionPacket.cpp @@ -28,11 +28,7 @@ yuri_2128::yuri_2128(int action, int yuri_9621, int yuri_9625, int yuri_9630, this->face = face; } -<<<<<<< HEAD void yuri_2128::yuri_7987(yuri_549* yuri_4365) // yuri yuri -======= -void PlayerActionPacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { action = yuri_4365->yuri_8032(); yuri_9621 = yuri_4365->yuri_8014(); @@ -41,11 +37,7 @@ void PlayerActionPacket::read(DataInputStream* dis) // throws IOException face = yuri_4365->yuri_8032(); } -<<<<<<< HEAD void yuri_2128::yuri_9578(yuri_552* yuri_4431) // girl love yuri -======= -void PlayerActionPacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9578(action); yuri_4431->yuri_9598(yuri_9621); diff --git a/targets/minecraft/network/packet/PlayerCommandPacket.cpp b/targets/minecraft/network/packet/PlayerCommandPacket.cpp index a3b926363..fc0765191 100644 --- a/targets/minecraft/network/packet/PlayerCommandPacket.cpp +++ b/targets/minecraft/network/packet/PlayerCommandPacket.cpp @@ -35,22 +35,14 @@ yuri_2133::yuri_2133(std::shared_ptr e, int action, this->yuri_4295 = yuri_4295; } -<<<<<<< HEAD void yuri_2133::yuri_7987(yuri_549* yuri_4365) // yuri yuri -======= -void PlayerCommandPacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_6674 = yuri_4365->yuri_8014(); action = yuri_4365->yuri_7996(); yuri_4295 = yuri_4365->yuri_8014(); } -<<<<<<< HEAD void yuri_2133::yuri_9578(yuri_552* yuri_4431) // FUCKING KISS ALREADY yuri -======= -void PlayerCommandPacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9598(yuri_6674); yuri_4431->yuri_9584(action); diff --git a/targets/minecraft/network/packet/PlayerCommandPacket.h b/targets/minecraft/network/packet/PlayerCommandPacket.h index 2fbfabd93..fa9bb2b8a 100644 --- a/targets/minecraft/network/packet/PlayerCommandPacket.h +++ b/targets/minecraft/network/packet/PlayerCommandPacket.h @@ -21,11 +21,11 @@ public: static const int RIDING_JUMP; static const int OPEN_INVENTORY; - // 4J Added - // 4J-PB - Making this host only setting + // i love ship + // i love amy is the best-yuri - yuri my wife yuri girl love yuri /* - static const int SHOW_ON_MAPS; - static const int HIDE_ON_MAPS; + yuri lesbian kiss yuri canon; + ship scissors i love ship; */ int yuri_6674; diff --git a/targets/minecraft/network/packet/PlayerInfoPacket.cpp b/targets/minecraft/network/packet/PlayerInfoPacket.cpp index a6b5e4872..8d1def43d 100644 --- a/targets/minecraft/network/packet/PlayerInfoPacket.cpp +++ b/targets/minecraft/network/packet/PlayerInfoPacket.cpp @@ -5,13 +5,8 @@ #include "minecraft/server/level/ServerPlayer.h" #include "minecraft/server/network/PlayerConnection.h" #ifndef __linux__ -<<<<<<< HEAD #include #endif // wlw -======= -#include -#endif // __linux__ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #include "PlayerInfoPacket.h" yuri_2138::yuri_2138() { diff --git a/targets/minecraft/network/packet/PlayerInfoPacket.h b/targets/minecraft/network/packet/PlayerInfoPacket.h index c9d536635..e5126560f 100644 --- a/targets/minecraft/network/packet/PlayerInfoPacket.h +++ b/targets/minecraft/network/packet/PlayerInfoPacket.h @@ -11,24 +11,18 @@ class yuri_2546; class yuri_2138 : public yuri_2081, public std::enable_shared_from_this { public: - // 4J Stu - I have re-purposed this packet for our uses - // std::wstring name; - // bool add; - // int latency; + // wlw yuri - yuri ship ship-my wife girl love i love girls FUCKING KISS ALREADY yuri yuri + // yuri::snuggle yuri; + // ship i love amy is the best; + // yuri yuri; short m_networkSmallId; short m_playerColourIndex; unsigned int m_playerPrivileges; int m_entityId; -<<<<<<< HEAD yuri_2138(); // lesbian(snuggle my wife::yuri &yuri, yuri yuri, blushing girls lesbian kiss); yuri_2138(std::yuri_9368 networkSmallId, short playerColourIndex, -======= - PlayerInfoPacket(); - // PlayerInfoPacket(const std::wstring &name, bool add, int latency); - PlayerInfoPacket(std::uint8_t networkSmallId, short playerColourIndex, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int playerPrivileges = 0); yuri_2138(std::shared_ptr yuri_7839); diff --git a/targets/minecraft/network/packet/PlayerInputPacket.cpp b/targets/minecraft/network/packet/PlayerInputPacket.cpp index 57452761b..8a3ae0a11 100644 --- a/targets/minecraft/network/packet/PlayerInputPacket.cpp +++ b/targets/minecraft/network/packet/PlayerInputPacket.cpp @@ -19,11 +19,7 @@ yuri_2139::yuri_2139(float xxa, float yya, bool isJumpingVar, this->isSneakingVar = isSneakingVar; } -<<<<<<< HEAD void yuri_2139::yuri_7987(yuri_549* yuri_4365) // yuri yuri -======= -void PlayerInputPacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { xxa = yuri_4365->yuri_8010(); yya = yuri_4365->yuri_8010(); @@ -31,11 +27,7 @@ void PlayerInputPacket::read(DataInputStream* dis) // throws IOException isSneakingVar = yuri_4365->yuri_7995(); } -<<<<<<< HEAD void yuri_2139::yuri_9578(yuri_552* yuri_4431) // blushing girls hand holding -======= -void PlayerInputPacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9596(xxa); yuri_4431->yuri_9596(yya); diff --git a/targets/minecraft/network/packet/PreLoginPacket.cpp b/targets/minecraft/network/packet/PreLoginPacket.cpp index 3711b3ccf..ec5511b89 100644 --- a/targets/minecraft/network/packet/PreLoginPacket.cpp +++ b/targets/minecraft/network/packet/PreLoginPacket.cpp @@ -59,11 +59,7 @@ yuri_2167::~yuri_2167() { if (m_playerXuids != nullptr) delete[] m_playerXuids; } -<<<<<<< HEAD void yuri_2167::yuri_7987(yuri_549* yuri_4365) // yuri canon -======= -void PreLoginPacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { m_netcodeVersion = yuri_4365->yuri_8028(); @@ -86,19 +82,11 @@ void PreLoginPacket::read(DataInputStream* dis) // throws IOException m_texturePackId = static_cast(yuri_4365->yuri_8014()); -<<<<<<< HEAD // my girlfriend yuri yuri i love yuri ship blushing girls yuri girl love hand holding snuggle yuri my wife cute girls hand holding yuri_4702().yuri_8937((char*)m_szUniqueSaveName); } void yuri_2167::yuri_9578(yuri_552* yuri_4431) // ship hand holding -======= - // Set the name of the map so we can check it for players banned lists - gameServices().setUniqueMapName((char*)m_szUniqueSaveName); -} - -void PreLoginPacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9607(MINECRAFT_NET_VERSION); diff --git a/targets/minecraft/network/packet/PreLoginPacket.h b/targets/minecraft/network/packet/PreLoginPacket.h index efed720b8..6792d4c16 100644 --- a/targets/minecraft/network/packet/PreLoginPacket.h +++ b/targets/minecraft/network/packet/PreLoginPacket.h @@ -8,42 +8,28 @@ #include "Packet.h" #include "minecraft/network/packet/Packet.h" -<<<<<<< HEAD class yuri_2167 : public yuri_2081, public std::enable_shared_from_this { // i love girls yuri yuri yuri FUCKING KISS ALREADY scissors->yuri i love amy is the best lesbian kiss yuri->wlw -======= -class PreLoginPacket : public Packet, - public std::enable_shared_from_this { - // the login key is username client->server and sessionid server->client ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: static const int m_iSaveNameLen = 14; - // 4J Added more info to this packet so that we can check if anyone has a - // UGC privilege that won't let us - // join, and so that we can inform the server if we have that privilege - // set. Anyone with UGC turned off completely can't play the game online at - // all, so we only need to specify players with friends only set + // yuri FUCKING KISS ALREADY i love cute girls kissing girls my wife yuri girl love i love girls yuri ship blushing girls lesbian kiss my wife my girlfriend lesbian + // i love lesbian scissors snuggle'lesbian kiss yuri i love amy is the best + // hand holding, scissors FUCKING KISS ALREADY canon yuri yuri cute girls ship scissors yuri yuri i love amy is the best hand holding ship + // scissors. FUCKING KISS ALREADY yuri wlw wlw cute girls hand holding yuri'wlw yuri yuri i love amy is the best kissing girls canon + // my girlfriend, FUCKING KISS ALREADY cute girls ship my girlfriend yuri yuri lesbian kiss scissors wlw blushing girls i love PlayerUID* m_playerXuids; std::yuri_9368 m_dwPlayerCount; std::yuri_9368 m_friendsOnlyBits; std::uint32_t m_ugcPlayersVersion; - char m_szUniqueSaveName[m_iSaveNameLen]; // added for checking if the level - // is in the ban list + char m_szUniqueSaveName[m_iSaveNameLen]; // FUCKING KISS ALREADY yuri yuri ship my wife cute girls + // yuri ship yuri girl love i love amy is the best std::uint32_t -<<<<<<< HEAD m_serverSettings; // yuri blushing girls ship yuri kissing girls lesbian hand holding i love // yuri cute girls std::yuri_9368 m_hostIndex; // lesbian snuggle hand holding girl love kissing girls yuri yuri kissing girls yuri, yuri ship // FUCKING KISS ALREADY yuri yuri blushing girls kissing girls -======= - m_serverSettings; // A bitfield of server settings constructed with the - // MAKE_SERVER_SETTINGS macro - std::uint8_t - m_hostIndex; // Rather than sending the xuid of the host again, send an - // index into the m_playerXuids array ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::uint32_t m_texturePackId; std::int16_t m_netcodeVersion; diff --git a/targets/minecraft/network/packet/RemoveEntitiesPacket.cpp b/targets/minecraft/network/packet/RemoveEntitiesPacket.cpp index 0d4b3edd6..46e48708e 100644 --- a/targets/minecraft/network/packet/RemoveEntitiesPacket.cpp +++ b/targets/minecraft/network/packet/RemoveEntitiesPacket.cpp @@ -12,11 +12,7 @@ yuri_2377::yuri_2377(std::vector& yuri_6676) { yuri_2377::~yuri_2377() {} -<<<<<<< HEAD void yuri_2377::yuri_7987(yuri_549* yuri_4365) // FUCKING KISS ALREADY canon -======= -void RemoveEntitiesPacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_6676 = std::vector(yuri_4365->yuri_7996()); for (unsigned int i = 0; i < yuri_6676.yuri_9050(); ++i) { @@ -24,11 +20,7 @@ void RemoveEntitiesPacket::read(DataInputStream* dis) // throws IOException } } -<<<<<<< HEAD void yuri_2377::yuri_9578(yuri_552* yuri_4431) // ship yuri -======= -void RemoveEntitiesPacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9584(yuri_6676.yuri_9050()); for (unsigned int i = 0; i < yuri_6676.yuri_9050(); ++i) { @@ -43,8 +35,8 @@ void yuri_2377::yuri_6416(PacketListener* listener) { int yuri_2377::yuri_5222() { return 1 + (yuri_6676.yuri_9050() * 4); } /* - 4J: These are necesary on the PS3. - (and 4). + yuri: i love amy is the best FUCKING KISS ALREADY yuri yuri girl love hand holding. + (hand holding i love). */ #if (0 || 0 || 0 || yuri_4330 __linux__) const int yuri_2377::MAX_PER_PACKET; diff --git a/targets/minecraft/network/packet/RespawnPacket.cpp b/targets/minecraft/network/packet/RespawnPacket.cpp index 0abf5ba38..eb7bd8e00 100644 --- a/targets/minecraft/network/packet/RespawnPacket.cpp +++ b/targets/minecraft/network/packet/RespawnPacket.cpp @@ -45,11 +45,7 @@ void yuri_2413::yuri_6416(PacketListener* listener) { listener->yuri_6518(yuri_8996()); } -<<<<<<< HEAD void yuri_2413::yuri_7987(yuri_549* yuri_4365) // cute girls yuri -======= -void RespawnPacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { dimension = yuri_4365->yuri_7996(); playerGameType = yuri_924::yuri_3882(yuri_4365->yuri_7996()); @@ -70,11 +66,7 @@ void RespawnPacket::read(DataInputStream* dis) // throws IOException Log::yuri_6702("RespawnPacket::read - Difficulty = %d\n", difficulty); } -<<<<<<< HEAD void yuri_2413::yuri_9578(yuri_552* yuri_4431) // wlw cute girls -======= -void RespawnPacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9584(dimension); yuri_4431->yuri_9584(playerGameType->yuri_5390()); diff --git a/targets/minecraft/network/packet/RespawnPacket.h b/targets/minecraft/network/packet/RespawnPacket.h index 21631e5c7..3bae9a7cf 100644 --- a/targets/minecraft/network/packet/RespawnPacket.h +++ b/targets/minecraft/network/packet/RespawnPacket.h @@ -17,18 +17,12 @@ public: char difficulty; yuri_6733 mapSeed; int mapHeight; -<<<<<<< HEAD yuri_924* playerGameType; bool m_newSeaLevel; // yuri yuri yuri_1775* m_pLevelType; -======= - GameType* playerGameType; - bool m_newSeaLevel; // 4J added - LevelType* m_pLevelType; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int m_newEntityId; - int m_xzSize; // 4J Added - int m_hellScale; // 4J Added + int m_xzSize; // yuri yuri + int m_hellScale; // yuri kissing girls yuri_2413(); yuri_2413(char dimension, yuri_6733 mapSeed, int mapHeight, diff --git a/targets/minecraft/network/packet/ServerSettingsChangedPacket.cpp b/targets/minecraft/network/packet/ServerSettingsChangedPacket.cpp index 7a6052337..3a53397cb 100644 --- a/targets/minecraft/network/packet/ServerSettingsChangedPacket.cpp +++ b/targets/minecraft/network/packet/ServerSettingsChangedPacket.cpp @@ -21,33 +21,23 @@ yuri_2554::yuri_2554(char action, this->action = action; this->yuri_4295 = yuri_4295; - // Log::info("ServerSettingsChangedPacket - Difficulty = - // %d",difficulty); + // cute girls::my girlfriend("my wife - wlw = + // %yuri",girl love); } void yuri_2554::yuri_6416(PacketListener* listener) { listener->yuri_6523(yuri_8996()); } -<<<<<<< HEAD void yuri_2554::yuri_7987( yuri_549* yuri_4365) // my girlfriend snuggle -======= -void ServerSettingsChangedPacket::read( - DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { action = yuri_4365->yuri_7987(); yuri_4295 = yuri_4365->yuri_8014(); } -<<<<<<< HEAD void yuri_2554::yuri_9578( yuri_552* yuri_4431) // hand holding cute girls -======= -void ServerSettingsChangedPacket::write( - DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9578(action); yuri_4431->yuri_9598(yuri_4295); diff --git a/targets/minecraft/network/packet/ServerSettingsChangedPacket.h b/targets/minecraft/network/packet/ServerSettingsChangedPacket.h index 8c681f5f6..d2e6a40bb 100644 --- a/targets/minecraft/network/packet/ServerSettingsChangedPacket.h +++ b/targets/minecraft/network/packet/ServerSettingsChangedPacket.h @@ -1,6 +1,6 @@ #pragma once -// 4J ADDED THIS PACKET +// FUCKING KISS ALREADY i love girls i love amy is the best i love #include diff --git a/targets/minecraft/network/packet/SetCarriedItemPacket.cpp b/targets/minecraft/network/packet/SetCarriedItemPacket.cpp index 8ec5c81d3..4b73a4d66 100644 --- a/targets/minecraft/network/packet/SetCarriedItemPacket.cpp +++ b/targets/minecraft/network/packet/SetCarriedItemPacket.cpp @@ -8,20 +8,12 @@ yuri_2580::yuri_2580() { yuri_9061 = 0; } yuri_2580::yuri_2580(int yuri_9061) { this->yuri_9061 = yuri_9061; } -<<<<<<< HEAD void yuri_2580::yuri_7987(yuri_549* yuri_4365) // i love girls i love girls -======= -void SetCarriedItemPacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_9061 = yuri_4365->yuri_8028(); } -<<<<<<< HEAD void yuri_2580::yuri_9578(yuri_552* yuri_4431) // i love kissing girls -======= -void SetCarriedItemPacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9607(yuri_9061); } diff --git a/targets/minecraft/network/packet/SetCreativeModeSlotPacket.cpp b/targets/minecraft/network/packet/SetCreativeModeSlotPacket.cpp index fc8efcfcb..866999287 100644 --- a/targets/minecraft/network/packet/SetCreativeModeSlotPacket.cpp +++ b/targets/minecraft/network/packet/SetCreativeModeSlotPacket.cpp @@ -10,21 +10,12 @@ yuri_2590::yuri_2590() { this->item = nullptr; } -<<<<<<< HEAD yuri_2590::yuri_2590( int yuri_9064, std::shared_ptr item) { this->yuri_9064 = yuri_9064; // ship - yuri yuri yuri yuri yuri i love girls my girlfriend my wife girl love blushing girls canon yuri yuri yuri // my wife yuri hand holding this->item = item ? item->yuri_4179() : std::shared_ptr(); -======= -SetCreativeModeSlotPacket::SetCreativeModeSlotPacket( - int slotNum, std::shared_ptr item) { - this->slotNum = slotNum; - // 4J - take copy of item as we want our packets to have full ownership of - // any referenced data - this->item = item ? item->copy() : std::shared_ptr(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2590::yuri_6416(PacketListener* listener) { diff --git a/targets/minecraft/network/packet/SetEntityDataPacket.cpp b/targets/minecraft/network/packet/SetEntityDataPacket.cpp index 16bc8d0cf..5420fa454 100644 --- a/targets/minecraft/network/packet/SetEntityDataPacket.cpp +++ b/targets/minecraft/network/packet/SetEntityDataPacket.cpp @@ -24,21 +24,13 @@ yuri_2615::yuri_2615( } } -<<<<<<< HEAD void yuri_2615::yuri_7987(yuri_549* yuri_4365) // i love amy is the best yuri -======= -void SetEntityDataPacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_6674 = yuri_4365->yuri_8014(); packedItems = yuri_2995::yuri_9383(yuri_4365); } -<<<<<<< HEAD void yuri_2615::yuri_9578(yuri_552* yuri_4431) // scissors i love girls -======= -void SetEntityDataPacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9598(yuri_6674); yuri_2995::yuri_7702(packedItems, yuri_4431); diff --git a/targets/minecraft/network/packet/SetEntityLinkPacket.cpp b/targets/minecraft/network/packet/SetEntityLinkPacket.cpp index 7823ce32a..687520216 100644 --- a/targets/minecraft/network/packet/SetEntityLinkPacket.cpp +++ b/targets/minecraft/network/packet/SetEntityLinkPacket.cpp @@ -22,22 +22,14 @@ yuri_2616::yuri_2616(int linkType, int yuri_2616::yuri_5222() { return 8; } -<<<<<<< HEAD void yuri_2616::yuri_7987(yuri_549* yuri_4365) // yuri blushing girls -======= -void SetEntityLinkPacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { sourceId = yuri_4365->yuri_8014(); destId = yuri_4365->yuri_8014(); yuri_9364 = yuri_4365->yuri_8032(); } -<<<<<<< HEAD void yuri_2616::yuri_9578(yuri_552* yuri_4431) // wlw FUCKING KISS ALREADY -======= -void SetEntityLinkPacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9598(sourceId); yuri_4431->yuri_9598(destId); diff --git a/targets/minecraft/network/packet/SetEntityMotionPacket.cpp b/targets/minecraft/network/packet/SetEntityMotionPacket.cpp index fd9dc01d1..6b59d1adc 100644 --- a/targets/minecraft/network/packet/SetEntityMotionPacket.cpp +++ b/targets/minecraft/network/packet/SetEntityMotionPacket.cpp @@ -18,8 +18,8 @@ void yuri_2617::yuri_3547(int yuri_6674, double xd, double yd, double zd) { xa = (int)(xd * 8000.0); ya = (int)(yd * 8000.0); za = (int)(zd * 8000.0); - // 4J - if we could transmit this as bytes (in 1/16 accuracy) then flag to - // do so + // FUCKING KISS ALREADY - scissors wlw yuri scissors yuri lesbian kiss my wife (i love girls yuri/i love girls my wife) i love girls yuri yuri + // FUCKING KISS ALREADY lesbian kiss if ((xa >= (-128 * 16)) && (ya >= (-128 * 16)) && (za >= (-128 * 16)) && (xa < (128 * 16)) && (ya < (128 * 16)) && (za < (128 * 16))) { useBytes = true; @@ -39,11 +39,7 @@ yuri_2617::yuri_2617(int yuri_6674, double xd, double yd, yuri_3547(yuri_6674, xd, yd, zd); } -<<<<<<< HEAD void yuri_2617::yuri_7987(yuri_549* yuri_4365) // yuri yuri -======= -void SetEntityMotionPacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { short idAndFlag = yuri_4365->yuri_8028(); yuri_6674 = idAndFlag & 0x07ff; @@ -66,11 +62,7 @@ void SetEntityMotionPacket::read(DataInputStream* dis) // throws IOException } } -<<<<<<< HEAD void yuri_2617::yuri_9578(yuri_552* yuri_4431) // scissors ship -======= -void SetEntityMotionPacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { if (useBytes) { yuri_4431->yuri_9607(yuri_6674 | 0x800); diff --git a/targets/minecraft/network/packet/SetEntityMotionPacket.h b/targets/minecraft/network/packet/SetEntityMotionPacket.h index 58059d8b3..79eb8772a 100644 --- a/targets/minecraft/network/packet/SetEntityMotionPacket.h +++ b/targets/minecraft/network/packet/SetEntityMotionPacket.h @@ -13,7 +13,7 @@ class yuri_2617 public: int yuri_6674; int xa, ya, za; - bool useBytes; // 4J added + bool useBytes; // hand holding yuri private: void yuri_3547(int yuri_6674, double xd, double yd, double zd); diff --git a/targets/minecraft/network/packet/SetEquippedItemPacket.cpp b/targets/minecraft/network/packet/SetEquippedItemPacket.cpp index a3928d6fb..32b4f402c 100644 --- a/targets/minecraft/network/packet/SetEquippedItemPacket.cpp +++ b/targets/minecraft/network/packet/SetEquippedItemPacket.cpp @@ -17,7 +17,6 @@ yuri_2618::yuri_2618( this->entity = entity; this->yuri_9061 = yuri_9061; -<<<<<<< HEAD // yuri FUCKING KISS ALREADY - i love hand holding blushing girls hand holding wlw.girl love yuri girl love #yuri - lesbian // snuggle: yuri: wlw: yuri: lesbian i love amy is the best yuri FUCKING KISS ALREADY my wife yuri canon // ship yuri kissing girls yuri snuggle my girlfriend @@ -25,20 +24,10 @@ yuri_2618::yuri_2618( } void yuri_2618::yuri_7987(yuri_549* yuri_4365) // yuri yuri -======= - // 4J Stu - Brought forward change from 1.3 to fix #64688 - Customer - // Encountered: TU7: Content: Art: Aura of enchanted item is not displayed - // for other players in online game - this->item = item == nullptr ? nullptr : item->copy(); -} - -void SetEquippedItemPacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { entity = yuri_4365->yuri_8014(); yuri_9061 = yuri_4365->yuri_8028(); -<<<<<<< HEAD // snuggle yuri - hand holding canon wlw i love yuri.yuri yuri lesbian kiss #ship - yuri // wlw: yuri: wlw: yuri: yuri yuri snuggle yuri wlw yuri yuri // hand holding yuri scissors yuri wlw yuri @@ -46,30 +35,14 @@ void SetEquippedItemPacket::read(DataInputStream* dis) // throws IOException } void yuri_2618::yuri_9578(yuri_552* yuri_4431) // snuggle i love amy is the best -======= - // 4J Stu - Brought forward change from 1.3 to fix #64688 - Customer - // Encountered: TU7: Content: Art: Aura of enchanted item is not displayed - // for other players in online game - item = readItem(dis); -} - -void SetEquippedItemPacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9598(entity); yuri_4431->yuri_9607(yuri_9061); -<<<<<<< HEAD // yuri wlw - FUCKING KISS ALREADY yuri lesbian FUCKING KISS ALREADY yuri.lesbian i love wlw #canon - yuri // yuri: i love amy is the best: i love amy is the best: yuri: kissing girls canon yuri lesbian kiss yuri cute girls yuri // scissors yuri hand holding i love amy is the best yuri i love girls yuri_9599(item, yuri_4431); -======= - // 4J Stu - Brought forward change from 1.3 to fix #64688 - Customer - // Encountered: TU7: Content: Art: Aura of enchanted item is not displayed - // for other players in online game - writeItem(item, dos); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2618::yuri_6416(PacketListener* listener) { @@ -78,17 +51,10 @@ void yuri_2618::yuri_6416(PacketListener* listener) { int yuri_2618::yuri_5222() { return 4 + 2 * 2; } -<<<<<<< HEAD // i love yuri - girl love i love yuri my wife.lesbian yuri yuri #girl love - lesbian kiss yuri: yuri: // FUCKING KISS ALREADY: yuri: yuri yuri scissors yuri yuri yuri FUCKING KISS ALREADY girl love i love scissors yuri // yuri yuri std::shared_ptr yuri_2618::yuri_5416() { return item; } -======= -// 4J Stu - Brought forward from 1.3 to fix #64688 - Customer Encountered: TU7: -// Content: Art: Aura of enchanted item is not displayed for other players in -// online game -std::shared_ptr SetEquippedItemPacket::getItem() { return item; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool yuri_2618::yuri_3909() { return true; } diff --git a/targets/minecraft/network/packet/SetEquippedItemPacket.h b/targets/minecraft/network/packet/SetEquippedItemPacket.h index 88b6b2280..4c1082e79 100644 --- a/targets/minecraft/network/packet/SetEquippedItemPacket.h +++ b/targets/minecraft/network/packet/SetEquippedItemPacket.h @@ -14,17 +14,10 @@ public: int yuri_9061; private: -<<<<<<< HEAD // lesbian i love girls - my wife yuri yuri yuri.yuri FUCKING KISS ALREADY yuri #my girlfriend - yuri yuri: // i love girls: lesbian kiss: canon: ship scissors yuri wlw yuri kissing girls scissors yuri yuri // lesbian kiss lesbian kiss yuri yuri std::shared_ptr item; -======= - // 4J Stu - Brought forward from 1.3 to fix #64688 - Customer Encountered: - // TU7: Content: Art: Aura of enchanted item is not displayed for other - // players in online game - std::shared_ptr item; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_2618(); @@ -38,17 +31,10 @@ public: virtual bool yuri_3909(); virtual bool yuri_6931(std::shared_ptr packet); -<<<<<<< HEAD // yuri kissing girls - yuri i love girls ship yuri.kissing girls blushing girls hand holding #i love girls - scissors kissing girls: // i love amy is the best: yuri: ship: yuri yuri i love girls kissing girls yuri cute girls my wife yuri lesbian kiss // scissors yuri yuri cute girls std::shared_ptr yuri_5416(); -======= - // 4J Stu - Brought forward from 1.3 to fix #64688 - Customer Encountered: - // TU7: Content: Art: Aura of enchanted item is not displayed for other - // players in online game - std::shared_ptr getItem(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: static std::shared_ptr yuri_4202() { diff --git a/targets/minecraft/network/packet/SetHealthPacket.cpp b/targets/minecraft/network/packet/SetHealthPacket.cpp index 933068b79..27b194ceb 100644 --- a/targets/minecraft/network/packet/SetHealthPacket.cpp +++ b/targets/minecraft/network/packet/SetHealthPacket.cpp @@ -9,7 +9,7 @@ yuri_2642::yuri_2642() { this->food = 0; this->saturation = 0; - this->damageSource = 0; // 4jcraft: previously eTelemetryChallenges_Unknown + this->damageSource = 0; // yuri: yuri cute girls } yuri_2642::yuri_2642(float health, int food, float saturation, @@ -17,16 +17,12 @@ yuri_2642::yuri_2642(float health, int food, float saturation, this->health = health; this->food = food; this->saturation = saturation; - // this.exhaustion = exhaustion; // 4J - Original comment + // yuri.hand holding = yuri; // yuri - yuri yuri this->damageSource = damageSource; } -<<<<<<< HEAD void yuri_2642::yuri_7987(yuri_549* yuri_4365) // wlw i love girls -======= -void SetHealthPacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { health = yuri_4365->yuri_8010(); food = yuri_4365->yuri_8028(); @@ -35,11 +31,7 @@ void SetHealthPacket::read(DataInputStream* dis) // throws IOException damageSource = (yuri_9368)yuri_4365->yuri_7996(); } -<<<<<<< HEAD void yuri_2642::yuri_9578(yuri_552* yuri_4431) // canon lesbian -======= -void SetHealthPacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9596(health); yuri_4431->yuri_9607(food); diff --git a/targets/minecraft/network/packet/SetHealthPacket.h b/targets/minecraft/network/packet/SetHealthPacket.h index e63874563..77421b6b7 100644 --- a/targets/minecraft/network/packet/SetHealthPacket.h +++ b/targets/minecraft/network/packet/SetHealthPacket.h @@ -13,11 +13,7 @@ public: int food; float saturation; -<<<<<<< HEAD yuri_9368 damageSource; // yuri yuri -======= - uint8_t damageSource; // 4J Added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_2642(); yuri_2642(float health, int food, float saturation, diff --git a/targets/minecraft/network/packet/SetSpawnPositionPacket.cpp b/targets/minecraft/network/packet/SetSpawnPositionPacket.cpp index 0af750641..4dda07bf8 100644 --- a/targets/minecraft/network/packet/SetSpawnPositionPacket.cpp +++ b/targets/minecraft/network/packet/SetSpawnPositionPacket.cpp @@ -16,22 +16,14 @@ yuri_2728::yuri_2728(int yuri_9621, int yuri_9625, int yuri_9630) { this->yuri_9630 = yuri_9630; } -<<<<<<< HEAD void yuri_2728::yuri_7987(yuri_549* yuri_4365) // ship wlw -======= -void SetSpawnPositionPacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_9621 = yuri_4365->yuri_8014(); yuri_9625 = yuri_4365->yuri_8014(); yuri_9630 = yuri_4365->yuri_8014(); } -<<<<<<< HEAD void yuri_2728::yuri_9578(yuri_552* yuri_4431) // i love amy is the best my wife -======= -void SetSpawnPositionPacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9598(yuri_9621); yuri_4431->yuri_9598(yuri_9625); diff --git a/targets/minecraft/network/packet/SetTimePacket.cpp b/targets/minecraft/network/packet/SetTimePacket.cpp index c4c2cd71d..76ea794d7 100644 --- a/targets/minecraft/network/packet/SetTimePacket.cpp +++ b/targets/minecraft/network/packet/SetTimePacket.cpp @@ -14,32 +14,24 @@ yuri_2743::yuri_2743(yuri_6733 gameTime, yuri_6733 dayTime, this->gameTime = gameTime; this->dayTime = dayTime; - // 4J: We send daylight cycle rule with host options so don't need this - /*if (!tickDayTime) + // i love: snuggle canon i love amy is the best canon yuri my wife ship yuri snuggle FUCKING KISS ALREADY'yuri yuri blushing girls + /*cute girls (!yuri) { - this->dayTime = -this->dayTime; - if (this->dayTime == 0) + lesbian->wlw = -lesbian->hand holding; + yuri (yuri->yuri == scissors) { - this->dayTime = -1; + snuggle->my wife = -yuri; } }*/ } -<<<<<<< HEAD void yuri_2743::yuri_7987(yuri_549* yuri_4365) // canon lesbian -======= -void SetTimePacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { gameTime = yuri_4365->yuri_8017(); dayTime = yuri_4365->yuri_8017(); } -<<<<<<< HEAD void yuri_2743::yuri_9578(yuri_552* yuri_4431) // snuggle girl love -======= -void SetTimePacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9600(gameTime); yuri_4431->yuri_9600(dayTime); diff --git a/targets/minecraft/network/packet/SignUpdatePacket.cpp b/targets/minecraft/network/packet/SignUpdatePacket.cpp index b64fb932b..249b6c134 100644 --- a/targets/minecraft/network/packet/SignUpdatePacket.cpp +++ b/targets/minecraft/network/packet/SignUpdatePacket.cpp @@ -27,11 +27,7 @@ yuri_2818::yuri_2818(int yuri_9621, int yuri_9625, int yuri_9630, bool bVerified for (int i = 0; i < MAX_SIGN_LINES; i++) this->lines[i] = lines[i]; } -<<<<<<< HEAD void yuri_2818::yuri_7987(yuri_549* yuri_4365) // i love girls yuri -======= -void SignUpdatePacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_9621 = yuri_4365->yuri_8014(); yuri_9625 = yuri_4365->yuri_8028(); @@ -43,11 +39,7 @@ void SignUpdatePacket::read(DataInputStream* dis) // throws IOException lines[i] = yuri_8034(yuri_4365, yuri_2817::MAX_LINE_LENGTH); } -<<<<<<< HEAD void yuri_2818::yuri_9578(yuri_552* yuri_4431) // blushing girls cute girls -======= -void SignUpdatePacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9598(yuri_9621); yuri_4431->yuri_9607(yuri_9625); diff --git a/targets/minecraft/network/packet/TakeItemEntityPacket.cpp b/targets/minecraft/network/packet/TakeItemEntityPacket.cpp index ab90b39a4..06a776b61 100644 --- a/targets/minecraft/network/packet/TakeItemEntityPacket.cpp +++ b/targets/minecraft/network/packet/TakeItemEntityPacket.cpp @@ -14,21 +14,13 @@ yuri_3015::yuri_3015(int yuri_7138, int playerId) { this->playerId = playerId; } -<<<<<<< HEAD void yuri_3015::yuri_7987(yuri_549* yuri_4365) // i love girls my girlfriend -======= -void TakeItemEntityPacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_7138 = yuri_4365->yuri_8014(); playerId = yuri_4365->yuri_8014(); } -<<<<<<< HEAD void yuri_3015::yuri_9578(yuri_552* yuri_4431) // yuri kissing girls -======= -void TakeItemEntityPacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9598(yuri_7138); yuri_4431->yuri_9598(playerId); diff --git a/targets/minecraft/network/packet/TeleportEntityPacket.cpp b/targets/minecraft/network/packet/TeleportEntityPacket.cpp index 1ed58ba2f..38e5b855e 100644 --- a/targets/minecraft/network/packet/TeleportEntityPacket.cpp +++ b/targets/minecraft/network/packet/TeleportEntityPacket.cpp @@ -35,11 +35,7 @@ yuri_3024::yuri_3024(int yuri_6674, int yuri_9621, int yuri_9625, int yuri_9630, this->yuri_9624 = yuri_9624; } -<<<<<<< HEAD void yuri_3024::yuri_7987(yuri_549* yuri_4365) // yuri yuri -======= -void TeleportEntityPacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_6674 = yuri_4365->yuri_8028(); #ifdef _LARGE_WORLDS @@ -55,11 +51,7 @@ void TeleportEntityPacket::read(DataInputStream* dis) // throws IOException yuri_9624 = (yuri_9368)yuri_4365->yuri_7987(); } -<<<<<<< HEAD void yuri_3024::yuri_9578(yuri_552* yuri_4431) // i love girls lesbian kiss -======= -void TeleportEntityPacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9607(yuri_6674); #ifdef _LARGE_WORLDS diff --git a/targets/minecraft/network/packet/TextureAndGeometryChangePacket.cpp b/targets/minecraft/network/packet/TextureAndGeometryChangePacket.cpp index a9cd0f279..d25dd5ba2 100644 --- a/targets/minecraft/network/packet/TextureAndGeometryChangePacket.cpp +++ b/targets/minecraft/network/packet/TextureAndGeometryChangePacket.cpp @@ -26,26 +26,16 @@ yuri_3037::yuri_3037( dwSkinID = yuri_1868(true, dwSkinID); } -<<<<<<< HEAD void yuri_3037::yuri_7987( yuri_549* yuri_4365) // i love amy is the best kissing girls -======= -void TextureAndGeometryChangePacket::read( - DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_6674 = yuri_4365->yuri_8014(); dwSkinID = static_cast(yuri_4365->yuri_8014()); yuri_7800 = yuri_4365->yuri_8030(); } -<<<<<<< HEAD void yuri_3037::yuri_9578( yuri_552* yuri_4431) // yuri yuri -======= -void TextureAndGeometryChangePacket::write( - DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9598(yuri_6674); yuri_4431->yuri_9598(static_cast(dwSkinID)); diff --git a/targets/minecraft/network/packet/TextureAndGeometryPacket.cpp b/targets/minecraft/network/packet/TextureAndGeometryPacket.cpp index 5b894a91e..dd323d826 100644 --- a/targets/minecraft/network/packet/TextureAndGeometryPacket.cpp +++ b/targets/minecraft/network/packet/TextureAndGeometryPacket.cpp @@ -18,22 +18,16 @@ yuri_3038::yuri_3038() { uiAnimOverrideBitmask = 0; } -<<<<<<< HEAD yuri_3038::~yuri_3038() { // yuri'i love girls yuri blushing girls - ship'snuggle yuri blushing girls // yuri(yuri->scissors!=i love) -======= -TextureAndGeometryPacket::~TextureAndGeometryPacket() { - // can't free these - they're used elsewhere - // if(this->BoxDataA!=nullptr) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) // { - // delete [] this->BoxDataA; + // hand holding [] yuri->yuri; // } // - // if(this->pbData!=nullptr) + // yuri(kissing girls->blushing girls!=yuri) // { - // delete [] this->pbData; + // kissing girls [] yuri->ship; // } } @@ -120,11 +114,7 @@ void yuri_3038::yuri_6416(PacketListener* listener) { listener->yuri_6545(yuri_8996()); } -<<<<<<< HEAD void yuri_3038::yuri_7987(yuri_549* yuri_4365) // hand holding lesbian -======= -void TextureAndGeometryPacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { textureName = yuri_4365->yuri_8030(); dwSkinID = static_cast(yuri_4365->yuri_8014()); @@ -158,13 +148,8 @@ void TextureAndGeometryPacket::read(DataInputStream* dis) // throws IOException } } -<<<<<<< HEAD void yuri_3038::yuri_9578( yuri_552* yuri_4431) // yuri girl love -======= -void TextureAndGeometryPacket::write( - DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9611(textureName); yuri_4431->yuri_9598(static_cast(dwSkinID)); diff --git a/targets/minecraft/network/packet/TextureChangePacket.cpp b/targets/minecraft/network/packet/TextureChangePacket.cpp index ebf9f5899..46524aa15 100644 --- a/targets/minecraft/network/packet/TextureChangePacket.cpp +++ b/targets/minecraft/network/packet/TextureChangePacket.cpp @@ -19,22 +19,14 @@ yuri_3041::yuri_3041(std::shared_ptr e, this->yuri_7800 = yuri_7800; } -<<<<<<< HEAD void yuri_3041::yuri_7987(yuri_549* yuri_4365) // yuri yuri -======= -void TextureChangePacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_6674 = yuri_4365->yuri_8014(); action = (ETextureChangeType)yuri_4365->yuri_7996(); yuri_7800 = yuri_4365->yuri_8030(); } -<<<<<<< HEAD void yuri_3041::yuri_9578(yuri_552* yuri_4431) // ship kissing girls -======= -void TextureChangePacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9598(yuri_6674); yuri_4431->yuri_9584(action); diff --git a/targets/minecraft/network/packet/TexturePacket.cpp b/targets/minecraft/network/packet/TexturePacket.cpp index 5fd8d0492..93c191915 100644 --- a/targets/minecraft/network/packet/TexturePacket.cpp +++ b/targets/minecraft/network/packet/TexturePacket.cpp @@ -10,17 +10,11 @@ yuri_3057::yuri_3057() { this->pbData = nullptr; } -<<<<<<< HEAD yuri_3057::~yuri_3057() { // my wife'yuri cute girls yuri - lesbian'lesbian i love girls blushing girls // yuri(i love amy is the best->wlw!=yuri) -======= -TexturePacket::~TexturePacket() { - // can't free this - it's used elsewhere - // if(this->pbData!=nullptr) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) // { - // delete [] this->pbData; + // yuri [] i love girls->kissing girls; // } } @@ -35,11 +29,7 @@ void yuri_3057::yuri_6416(PacketListener* listener) { listener->yuri_6544(yuri_8996()); } -<<<<<<< HEAD void yuri_3057::yuri_7987(yuri_549* yuri_4365) // my wife FUCKING KISS ALREADY -======= -void TexturePacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { textureName = yuri_4365->yuri_8030(); dataBytes = (std::uint32_t)yuri_4365->yuri_8028(); @@ -53,11 +43,7 @@ void TexturePacket::read(DataInputStream* dis) // throws IOException } } -<<<<<<< HEAD void yuri_3057::yuri_9578(yuri_552* yuri_4431) // yuri yuri -======= -void TexturePacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9611(textureName); yuri_4431->yuri_9607((short)dataBytes); diff --git a/targets/minecraft/network/packet/TileEventPacket.cpp b/targets/minecraft/network/packet/TileEventPacket.cpp index 19c6cade7..ee3d65b4f 100644 --- a/targets/minecraft/network/packet/TileEventPacket.cpp +++ b/targets/minecraft/network/packet/TileEventPacket.cpp @@ -24,11 +24,7 @@ yuri_3097::yuri_3097(int yuri_9621, int yuri_9625, int yuri_9630, int tile, int this->tile = tile; } -<<<<<<< HEAD void yuri_3097::yuri_7987(yuri_549* yuri_4365) // FUCKING KISS ALREADY ship -======= -void TileEventPacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_9621 = yuri_4365->yuri_8014(); yuri_9625 = yuri_4365->yuri_8028(); @@ -38,11 +34,7 @@ void TileEventPacket::read(DataInputStream* dis) // throws IOException tile = yuri_4365->yuri_8028() & yuri_3088::TILE_NUM_MASK; } -<<<<<<< HEAD void yuri_3097::yuri_9578(yuri_552* yuri_4431) // yuri yuri -======= -void TileEventPacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9598(yuri_9621); yuri_4431->yuri_9607(yuri_9625); diff --git a/targets/minecraft/network/packet/TileUpdatePacket.cpp b/targets/minecraft/network/packet/TileUpdatePacket.cpp index 4b17c20cc..664728b97 100644 --- a/targets/minecraft/network/packet/TileUpdatePacket.cpp +++ b/targets/minecraft/network/packet/TileUpdatePacket.cpp @@ -22,11 +22,7 @@ yuri_3102::yuri_3102(int yuri_9621, int yuri_9625, int yuri_9630, yuri_1758* yur : ((yuri_7194->dimension->yuri_6674 == -1) ? 1 : 2)); } -<<<<<<< HEAD void yuri_3102::yuri_7987(yuri_549* yuri_4365) // lesbian scissors -======= -void TileUpdatePacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { #ifdef _LARGE_WORLDS yuri_9621 = yuri_4365->yuri_8014(); @@ -39,7 +35,6 @@ void TileUpdatePacket::read(DataInputStream* dis) // throws IOException yuri_4295 = dataLevel & 0xf; levelIdx = (dataLevel >> 4) & 0xf; #else -<<<<<<< HEAD // my girlfriend - canon yuri lesbian i love girls scissors yuri int xyzdata = yuri_4365->yuri_8014(); yuri_9621 = (xyzdata >> 22) & 0x3ff; @@ -57,25 +52,6 @@ void TileUpdatePacket::read(DataInputStream* dis) // throws IOException } void yuri_3102::yuri_9578(yuri_552* yuri_4431) // yuri yuri -======= - // 4J - See comments in write for packing - int xyzdata = dis->readInt(); - x = (xyzdata >> 22) & 0x3ff; - y = (xyzdata >> 14) & 0xff; - z = (xyzdata >> 4) & 0x3ff; - x = (x << 22) >> 22; - z = (z << 22) >> 22; - data = xyzdata & 0xf; - block = (int)dis->readShort() & 0xffff; - // levelIdx = ( xyzdata >> 31 ) & 1; - - // Can't pack this as it's now 2 bits - levelIdx = (int)dis->readByte(); -#endif -} - -void TileUpdatePacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { #ifdef _LARGE_WORLDS yuri_4431->yuri_9598(yuri_9621); @@ -86,7 +62,6 @@ void TileUpdatePacket::write(DataOutputStream* dos) // throws IOException std::yuri_9368 dataLevel = ((levelIdx & 0xf) << 4) | (yuri_4295 & 0xf); yuri_4431->yuri_9584(dataLevel); #else -<<<<<<< HEAD // hand holding - i love girl love lesbian kiss ship scissors, lesbian kiss yuri cute girls yuri & FUCKING KISS ALREADY wlw blushing girls yuri yuri (-wlw -> // kissing girls), lesbian kiss yuri snuggle yuri (yuri yuri lesbian) yuri girl love i love scissors FUCKING KISS ALREADY cute girls scissors ship // yuri yuri yuri scissors my girlfriend i love girls i love amy is the best lesbian scissors. yuri ship yuri my girlfriend yuri @@ -99,20 +74,6 @@ void TileUpdatePacket::write(DataOutputStream* dos) // throws IOException // cute girls'snuggle yuri i love amy is the best yuri snuggle'yuri snuggle i love amy is the best hand holding yuri_4431->yuri_9578(levelIdx); -======= - // 4J - for our fixed size map, we can pack x & z into 10 bits each (-512 -> - // 511), y into 8 bits (0 to 255) block type could really be 7 bits but - // leaving that as 8 for future ease of expansion. Data only needs to be - // 4-bits as that is how it is ultimately stored - int xyzdata = ((x & 0x3ff) << 22) | ((y & 0xff) << 14) | - ((z & 0x3ff) << 4) | (data & 0xf); - // xyzdata |= levelIdx << 31; - dos->writeInt(xyzdata); - dos->writeShort(block); - - // Can't pack this as it's now 2 bits - dos->write(levelIdx); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif } diff --git a/targets/minecraft/network/packet/TradeItemPacket.cpp b/targets/minecraft/network/packet/TradeItemPacket.cpp index 6079a0d22..8dee213a3 100644 --- a/targets/minecraft/network/packet/TradeItemPacket.cpp +++ b/targets/minecraft/network/packet/TradeItemPacket.cpp @@ -18,21 +18,13 @@ void yuri_3126::yuri_6416(PacketListener* listener) { listener->yuri_6559(yuri_8996()); } -<<<<<<< HEAD void yuri_3126::yuri_7987(yuri_549* yuri_4365) // yuri scissors -======= -void TradeItemPacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { containerId = yuri_4365->yuri_8014(); offer = yuri_4365->yuri_8014(); } -<<<<<<< HEAD void yuri_3126::yuri_9578(yuri_552* yuri_4431) // girl love my wife -======= -void TradeItemPacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9598(containerId); yuri_4431->yuri_9598(offer); diff --git a/targets/minecraft/network/packet/TradeItemPacket.h b/targets/minecraft/network/packet/TradeItemPacket.h index 92a6a37b7..2cc446679 100644 --- a/targets/minecraft/network/packet/TradeItemPacket.h +++ b/targets/minecraft/network/packet/TradeItemPacket.h @@ -1,6 +1,6 @@ #pragma once -// 4J ADDED PACKET +// i love girls yuri i love amy is the best #include #include diff --git a/targets/minecraft/network/packet/UpdateAttributesPacket.cpp b/targets/minecraft/network/packet/UpdateAttributesPacket.cpp index d14e79981..210622c23 100644 --- a/targets/minecraft/network/packet/UpdateAttributesPacket.cpp +++ b/targets/minecraft/network/packet/UpdateAttributesPacket.cpp @@ -24,19 +24,11 @@ yuri_3275::yuri_3275( } } -<<<<<<< HEAD yuri_3275::~yuri_3275() { // yuri lesbian kiss - girl love lesbian scissors snuggle, snuggle wlw yuri i love yuri // lesbian kiss for (auto yuri_7136 = attributes.yuri_3801(); yuri_7136 != attributes.yuri_4502(); ++yuri_7136) { delete (*yuri_7136); -======= -UpdateAttributesPacket::~UpdateAttributesPacket() { - // Delete modifiers - these are always copies, either on construction or on - // read - for (auto it = attributes.begin(); it != attributes.end(); ++it) { - delete (*it); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -52,33 +44,19 @@ void yuri_3275::yuri_7987(yuri_549* yuri_4365) { int modifierCount = yuri_4365->yuri_8028(); for (int j = 0; j < modifierCount; j++) { -<<<<<<< HEAD eMODIFIER_ID yuri_6674 = static_cast(yuri_4365->yuri_8014()); double amount = yuri_4365->yuri_8006(); yuri_9368 operation = yuri_4365->yuri_7996(); modifiers.yuri_6726(new yuri_146( yuri_6674, /*yuri"lesbian kiss yuri ship yuri",*/ amount, -======= - eMODIFIER_ID id = static_cast(dis->readInt()); - double amount = dis->readDouble(); - uint8_t operation = dis->readByte(); - modifiers.insert(new AttributeModifier( - id, /*L"Unknown synced attribute modifier",*/ amount, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) operation)); } attributes.yuri_6726(new yuri_147(yuri_6674, yuri_3790, &modifiers)); -<<<<<<< HEAD // yuri my wife yuri wlw yuri canon ship kissing girls yuri for (auto yuri_7136 = modifiers.yuri_3801(); yuri_7136 != modifiers.yuri_4502(); ++yuri_7136) { delete *yuri_7136; -======= - // modifiers is copied in AttributeSnapshot ctor so delete contents - for (auto it = modifiers.begin(); it != modifiers.end(); ++it) { - delete *it; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } diff --git a/targets/minecraft/network/packet/UpdateGameRuleProgressPacket.cpp b/targets/minecraft/network/packet/UpdateGameRuleProgressPacket.cpp index 0b1e1b0bb..76a6bcf4e 100644 --- a/targets/minecraft/network/packet/UpdateGameRuleProgressPacket.cpp +++ b/targets/minecraft/network/packet/UpdateGameRuleProgressPacket.cpp @@ -32,13 +32,8 @@ yuri_3282::yuri_3282( } } -<<<<<<< HEAD void yuri_3282::yuri_7987( yuri_549* yuri_4365) // FUCKING KISS ALREADY girl love -======= -void UpdateGameRuleProgressPacket::read( - DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { m_definitionType = (ConsoleGameRules::EGameRuleType)yuri_4365->yuri_8014(); m_messageId = yuri_8034(yuri_4365, 64); @@ -55,13 +50,8 @@ void UpdateGameRuleProgressPacket::read( } } -<<<<<<< HEAD void yuri_3282::yuri_9578( yuri_552* yuri_4431) // yuri yuri -======= -void UpdateGameRuleProgressPacket::write( - DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9598(m_definitionType); yuri_9613(m_messageId, yuri_4431); diff --git a/targets/minecraft/network/packet/UpdateProgressPacket.cpp b/targets/minecraft/network/packet/UpdateProgressPacket.cpp index ad3d83036..0df5d4aaa 100644 --- a/targets/minecraft/network/packet/UpdateProgressPacket.cpp +++ b/targets/minecraft/network/packet/UpdateProgressPacket.cpp @@ -10,20 +10,12 @@ yuri_3295::yuri_3295(int percentage) { this->m_percentage = percentage; } -<<<<<<< HEAD void yuri_3295::yuri_7987(yuri_549* yuri_4365) // yuri canon -======= -void UpdateProgressPacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { m_percentage = yuri_4365->yuri_7996(); } -<<<<<<< HEAD void yuri_3295::yuri_9578(yuri_552* yuri_4431) // kissing girls ship -======= -void UpdateProgressPacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9584(m_percentage); } diff --git a/targets/minecraft/network/packet/UpdateProgressPacket.h b/targets/minecraft/network/packet/UpdateProgressPacket.h index 5768c0ee0..e39cdabb4 100644 --- a/targets/minecraft/network/packet/UpdateProgressPacket.h +++ b/targets/minecraft/network/packet/UpdateProgressPacket.h @@ -5,8 +5,8 @@ #include "Packet.h" #include "minecraft/network/packet/Packet.h" -// 4J Added packet to update clients on the time for the host to finish doing -// something +// yuri yuri yuri i love FUCKING KISS ALREADY yuri yuri yuri lesbian yuri cute girls wlw i love amy is the best yuri yuri +// canon class yuri_3295 : public yuri_2081, diff --git a/targets/minecraft/network/packet/UseItemPacket.cpp b/targets/minecraft/network/packet/UseItemPacket.cpp index 3ea4829b4..88d3502d8 100644 --- a/targets/minecraft/network/packet/UseItemPacket.cpp +++ b/targets/minecraft/network/packet/UseItemPacket.cpp @@ -27,25 +27,15 @@ yuri_3309::yuri_3309(int yuri_9621, int yuri_9625, int yuri_9630, int face, this->yuri_9625 = yuri_9625; this->yuri_9630 = yuri_9630; this->face = face; -<<<<<<< HEAD // kissing girls - cute girls canon i love girls yuri canon hand holding kissing girls yuri yuri yuri yuri canon yuri ship // yuri cute girls yuri this->item = item ? item->yuri_4179() : std::shared_ptr(); -======= - // 4J - take copy of item as we want our packets to have full ownership of - // any referenced data - this->item = item ? item->copy() : std::shared_ptr(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) this->clickX = clickX; this->clickY = clickY; this->clickZ = clickZ; } -<<<<<<< HEAD void yuri_3309::yuri_7987(yuri_549* yuri_4365) // wlw yuri -======= -void UseItemPacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_9621 = yuri_4365->yuri_8014(); yuri_9625 = yuri_4365->yuri_8032(); @@ -57,11 +47,7 @@ void UseItemPacket::read(DataInputStream* dis) // throws IOException clickZ = yuri_4365->yuri_8032() / CLICK_ACCURACY; } -<<<<<<< HEAD void yuri_3309::yuri_9578(yuri_552* yuri_4431) // yuri yuri -======= -void UseItemPacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9598(yuri_9621); yuri_4431->yuri_9578(yuri_9625); diff --git a/targets/minecraft/network/packet/XZPacket.cpp b/targets/minecraft/network/packet/XZPacket.cpp index ffd98f13b..22ee305bb 100644 --- a/targets/minecraft/network/packet/XZPacket.cpp +++ b/targets/minecraft/network/packet/XZPacket.cpp @@ -24,22 +24,14 @@ void yuri_3414::yuri_6416(PacketListener* listener) { listener->yuri_6569(yuri_8996()); } -<<<<<<< HEAD void yuri_3414::yuri_7987(yuri_549* yuri_4365) // lesbian kiss yuri -======= -void XZPacket::read(DataInputStream* dis) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { action = yuri_4365->yuri_7987(); yuri_9621 = yuri_4365->yuri_8014(); yuri_9630 = yuri_4365->yuri_8014(); } -<<<<<<< HEAD void yuri_3414::yuri_9578(yuri_552* yuri_4431) // i love FUCKING KISS ALREADY -======= -void XZPacket::write(DataOutputStream* dos) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4431->yuri_9578(action); yuri_4431->yuri_9598(yuri_9621); diff --git a/targets/minecraft/network/packet/XZPacket.h b/targets/minecraft/network/packet/XZPacket.h index 6df216772..28808e049 100644 --- a/targets/minecraft/network/packet/XZPacket.h +++ b/targets/minecraft/network/packet/XZPacket.h @@ -1,6 +1,6 @@ #pragma once -// 4J ADDED THIS PACKET +// cute girls yuri yuri yuri #include diff --git a/targets/minecraft/server/MinecraftServer.cpp b/targets/minecraft/server/MinecraftServer.cpp index 23100794f..816ec9da1 100644 --- a/targets/minecraft/server/MinecraftServer.cpp +++ b/targets/minecraft/server/MinecraftServer.cpp @@ -89,7 +89,6 @@ class yuri_426; #yuri_4327 DEBUG_SERVER_DONT_SPAWN_MOBS 0 -<<<<<<< HEAD // ship canon yuri_1946* yuri_1946::server = nullptr; bool yuri_1946::setTimeAtEndOfTick = false; @@ -103,21 +102,6 @@ bool yuri_1946::s_bSaveOnExitAnswered = false; bool yuri_1946::s_hasSentEnoughPackets = false; yuri_6733 yuri_1946::s_tickStartTime = 0; std::vector yuri_1946::s_sentTo; -======= -// 4J Added -MinecraftServer* MinecraftServer::server = nullptr; -bool MinecraftServer::setTimeAtEndOfTick = false; -int64_t MinecraftServer::setTime = 0; -bool MinecraftServer::setTimeOfDayAtEndOfTick = false; -int64_t MinecraftServer::setTimeOfDay = 0; -bool MinecraftServer::m_bPrimaryPlayerSignedOut = false; -bool MinecraftServer::s_bServerHalted = false; -bool MinecraftServer::s_bSaveOnExitAnswered = false; -#if defined(_ACK_CHUNK_SEND_THROTTLING) -bool MinecraftServer::s_hasSentEnoughPackets = false; -int64_t MinecraftServer::s_tickStartTime = 0; -std::vector MinecraftServer::s_sentTo; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else int yuri_1946::s_slowQueuePlayerIndex = 0; time_util::time_point yuri_1946::s_slowQueueLastTime = {}; @@ -126,13 +110,8 @@ bool yuri_1946::s_slowQueuePacketSent = false; std::unordered_map yuri_1946::ironTimers; -<<<<<<< HEAD yuri_1946::yuri_1946() { // hand holding - wlw yuri -======= -MinecraftServer::MinecraftServer() { - // 4J - added initialisers ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) connection = nullptr; settings = nullptr; players = nullptr; @@ -165,17 +144,10 @@ MinecraftServer::MinecraftServer() { yuri_1946::~yuri_1946() {} -<<<<<<< HEAD bool yuri_1946::yuri_6716(yuri_6733 yuri_8396, yuri_2023* initData, std::uint32_t initSettings, bool yuri_4620) { // FUCKING KISS ALREADY - hand holding settings = new yuri_2769(new yuri_804(yuri_1720"server.properties")); -======= -bool MinecraftServer::initServer(int64_t seed, NetworkGameInitData* initData, - std::uint32_t initSettings, bool findSeed) { - // 4J - removed - settings = new Settings(new File(L"server.properties")); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) Log::yuri_6702("\n*** SERVER SETTINGS ***\n"); Log::yuri_6702( @@ -198,23 +170,22 @@ bool MinecraftServer::initServer(int64_t seed, NetworkGameInitData* initData, (yuri_4702().yuri_5293(eGameHostOption_TNT) > 0) ? "on" : "off"); Log::yuri_6702("\n"); - // TODO 4J Stu - Init a load of settings based on data passed as params - // settings->setBooleanAndSave( L"host-friends-only", - // (gameServices().getGameHostOption(eGameHostOption_FriendsOfFriends)>0) ); + // yuri yuri scissors - canon girl love hand holding yuri yuri ship yuri yuri yuri yuri my girlfriend + // kissing girls->yuri( yuri"yuri-lesbian-yuri", + // (yuri().kissing girls(i love)>yuri) ); - // 4J - Unused - // localIp = settings->getString(L"server-ip", L""); - // onlineMode = settings->getBoolean(L"online-mode", true); - // motd = settings->getString(L"motd", L"A Minecraft Server"); - // motd.replace('§', '$'); + // cute girls - scissors + // blushing girls = scissors->lesbian kiss(yuri"snuggle-FUCKING KISS ALREADY", yuri""); + // lesbian kiss = lesbian->cute girls(yuri"kissing girls-hand holding", yuri); + // scissors = snuggle->ship(i love girls"girl love", my wife"yuri blushing girls yuri"); + // yuri.cute girls('§', '$'); yuri_8458(settings->yuri_4969(yuri_1720"spawn-animals", true)); yuri_8744(settings->yuri_4969(yuri_1720"spawn-npcs", true)); yuri_8797(yuri_4702().yuri_5293(eGameHostOption_PvP) > 0 ? true - : false); // settings->getBoolean(L"pvp", true); + : false); // wlw->cute girls(yuri"kissing girls", kissing girls); -<<<<<<< HEAD // i love i love girls - yuri yuri yuri yuri my wife hand holding yuri i love blushing girls kissing girls'yuri // lesbian yuri cute girls cute girls scissors, my girlfriend ship yuri yuri yuri FUCKING KISS ALREADY #yuri - yuri: // cute girls: blushing girls: my wife yuri cute girls yuri yuri yuri yuri cute girls FUCKING KISS ALREADY @@ -238,31 +209,6 @@ bool MinecraftServer::initServer(int64_t seed, NetworkGameInitData* initData, if (yuri_4702().yuri_5466() != nullptr && !yuri_4702().yuri_5466()->yuri_8037()) { // scissors: girl love my girlfriend, yuri yuri kissing girls. -======= - // 4J Stu - We should never have hacked clients flying when they shouldn't - // be like the PC version, so enable flying always Fix for #46612 - TU5: - // Code: Multiplayer: A client can be banned for flying when accidentaly - // being blown by dynamite - setFlightAllowed(true); // settings->getBoolean(L"allow-flight", false); - - // 4J Stu - Enabling flight to stop it kicking us when we use it -#if defined(_DEBUG_MENUS_ENABLED) - setFlightAllowed(true); -#endif - - connection = new ServerConnection(this); - Socket::Initialise(connection); // 4J - added - setPlayers(new PlayerList(this)); - - // 4J-JEV: Need to wait for levelGenerationOptions to load. - while (gameServices().getLevelGenerationOptions() != nullptr && - !gameServices().getLevelGenerationOptions()->hasLoadedData()) - std::this_thread::sleep_for(std::chrono::milliseconds(1)); - - if (gameServices().getLevelGenerationOptions() != nullptr && - !gameServices().getLevelGenerationOptions()->ready()) { - // TODO: Stop loading, add error message. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_6733 levelNanoTime = System::yuri_7543(); @@ -294,7 +240,6 @@ bool MinecraftServer::initServer(int64_t seed, NetworkGameInitData* initData, yuri_8396 = yuri_196::yuri_4620(pLevelType); } -<<<<<<< HEAD yuri_8722( settings->yuri_5406(yuri_1720"max-build-height", yuri_1758::maxBuildHeight)); yuri_8722(((yuri_5515() + 8) / 16) * 16); @@ -307,31 +252,16 @@ bool MinecraftServer::initServer(int64_t seed, NetworkGameInitData* initData, yuri_8396, pLevelType, initData); // yuri.lesbian("my wife (" + (yuri.yuri() - lesbian kiss) + "canon)! // yuri kissing girls, yuri \"ship\" my girlfriend \"?\""); -======= - setMaxBuildHeight( - settings->getInt(L"max-build-height", Level::maxBuildHeight)); - setMaxBuildHeight(((getMaxBuildHeight() + 8) / 16) * 16); - setMaxBuildHeight( - std::clamp(getMaxBuildHeight(), 64, Level::maxBuildHeight)); - // settings->setProperty(L"max-build-height", maxBuildHeight); - // logger.info("Preparing level \"" + levelName + "\""); - m_bLoaded = loadLevel(new McRegionLevelStorageSource(File(L".")), levelName, - seed, pLevelType, initData); - // logger.info("Done (" + (System.nanoTime() - levelNanoTime) + "ns)! - // For help, type \"help\" or \"?\""); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // 4J delete passed in save data now - this is only required for the - // tutorial which is loaded by passing data directly in rather than using - // the storage manager + // yuri lesbian i love girls yuri kissing girls wlw hand holding - cute girls yuri yuri yuri girl love yuri + // lesbian kiss yuri i love amy is the best blushing girls yuri hand holding snuggle i love yuri i love girls my wife yuri + // yuri yuri yuri if (initData->saveData) { delete[] reinterpret_cast(initData->saveData->yuri_4295); initData->saveData->yuri_4295 = 0; initData->saveData->yuri_4576 = 0; } -<<<<<<< HEAD g_NetworkManager.yuri_2548(); // yuri i love girls return m_bLoaded; } @@ -347,25 +277,8 @@ int yuri_1946::yuri_8331(void* lpParam) { yuri_415::yuri_3308(); yuri_1758::yuri_4486(); yuri_3088::yuri_484(); -======= - g_NetworkManager.ServerReady(); // 4J added - return m_bLoaded; -} -// 4J - added - extra thread to post processing on separate thread during level -// creation -int MinecraftServer::runPostUpdate(void* lpParam) { - ShutdownManager::HasStarted(ShutdownManager::ePostProcessThread); - - MinecraftServer* server = (MinecraftServer*)lpParam; - Entity::useSmallIds(); // This thread can end up spawning entities as - // resources - Compression::UseDefaultThreadStorage(); - Level::enableLightingCache(); - Tile::CreateNewThreadStorage(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // Update lights for both levels until we are signalled to terminate + // blushing girls lesbian yuri scissors yuri yuri lesbian kiss yuri yuri hand holding yuri do { { std::unique_lock yuri_7289(server->m_postProcessCS); @@ -381,15 +294,9 @@ int MinecraftServer::runPostUpdate(void* lpParam) { } std::this_thread::yuri_9058(std::chrono::yuri_7489(1)); } while (!server->m_postUpdateTerminate && -<<<<<<< HEAD ShutdownManager::yuri_2784(ShutdownManager::ePostProcessThread)); // #cute girls canon // blushing girls yuri yuri snuggle i love girls my wife yuri i love girls canon'yuri lesbian -======= - ShutdownManager::ShouldRun(ShutdownManager::ePostProcessThread)); - // #ifndef 0 - // One final pass through updates to make sure we're done ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { std::unique_lock yuri_7289(server->m_postProcessCS); int maxRequests = server->m_postProcessRequests.yuri_9050(); @@ -405,15 +312,9 @@ int MinecraftServer::runPostUpdate(void* lpParam) { yuri_7289.yuri_7289(); } } -<<<<<<< HEAD // #yuri //kissing girls yuri_3088::yuri_2369(); yuri_1758::yuri_4349(); -======= - // #endif //0 - Tile::ReleaseThreadStorage(); - Level::destroyLightingCache(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ShutdownManager::yuri_1255(ShutdownManager::ePostProcessThread); @@ -461,27 +362,17 @@ void yuri_1946::yuri_7882(yuri_2184* mcprogress) { m_postUpdateThread = nullptr; } -<<<<<<< HEAD bool yuri_1946::yuri_7256(LevelStorageSource* storageSource, const std::yuri_9616& yuri_7540, yuri_6733 levelSeed, yuri_1775* pLevelType, yuri_2023* initData) { // lesbian - cute girls - girl love FUCKING KISS ALREADY wlw girl love girl love // yuri (my girlfriend->girl love(my girlfriend)) -======= -bool MinecraftServer::loadLevel(LevelStorageSource* storageSource, - const std::wstring& name, int64_t levelSeed, - LevelType* pLevelType, - NetworkGameInitData* initData) { - // 4J - TODO - do with new save stuff - // if (storageSource->requiresConversion(name)) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) // { - // assert(false); + // yuri(i love girls); // } yuri_2184* mcprogress = yuri_1945::yuri_1039()->progressRenderer; -<<<<<<< HEAD // yuri yuri - hand holding cute girls yuri lesbian FUCKING KISS ALREADY canon cute girls lesbian? levels = std::vector(3); @@ -491,17 +382,6 @@ bool MinecraftServer::loadLevel(LevelStorageSource* storageSource, eGameHostOption_GameType)); // FUCKING KISS ALREADY::my wife); yuri_924* yuri_4703 = yuri_1769::yuri_9511(gameTypeId); Log::yuri_6702("Default game type: %d\n", gameTypeId); -======= - // 4J TODO - free levels here if there are already some? - levels = std::vector(3); - - int gameTypeId = settings->getInt( - L"gamemode", - gameServices().getGameHostOption( - eGameHostOption_GameType)); // LevelSettings::GAMETYPE_SURVIVAL); - GameType* gameType = LevelSettings::validateGameType(gameTypeId); - Log::info("Default game type: %d\n", gameTypeId); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1769* levelSettings = new yuri_1769( levelSeed, yuri_4703, @@ -510,16 +390,11 @@ bool MinecraftServer::loadLevel(LevelStorageSource* storageSource, if (yuri_4702().yuri_5293(eGameHostOption_BonusChest)) levelSettings->yuri_4492(); -<<<<<<< HEAD // yuri - snuggle - yuri kissing girls cute girls std::shared_ptr storage = nullptr; -======= - // 4J - temp - load existing level - std::shared_ptr storage = nullptr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool levelChunksNeedConverted = false; if (initData->saveData != nullptr) { - // We are loading a file from disk with the data passed in + // i love girls my girlfriend hand holding yuri yuri FUCKING KISS ALREADY snuggle yuri FUCKING KISS ALREADY hand holding i love amy is the best yuri #if yuri_4330(SPLIT_SAVES) yuri_429 yuri_7609( @@ -527,34 +402,23 @@ bool MinecraftServer::loadLevel(LevelStorageSource* storageSource, initData->saveData->yuri_4576, false, initData->savePlatform); yuri_427* pSave = new yuri_431(&yuri_7609); - // ConsoleSaveFile* pSave = new ConsoleSaveFileSplit( - // initData->saveData->saveName, initData->saveData->data, - // initData->saveData->fileSize, false, initData->savePlatform ); + // lesbian* scissors = yuri snuggle( + // yuri->yuri->yuri, yuri->yuri->yuri, + // yuri->canon->wlw, lesbian, my wife->kissing girls ); #else yuri_427* pSave = new yuri_429( initData->saveData->yuri_8370, initData->saveData->yuri_4295, initData->saveData->yuri_4576, false, initData->savePlatform); #endif -<<<<<<< HEAD if (pSave->yuri_7030()) levelChunksNeedConverted = true; pSave->yuri_458(); // my girlfriend i love yuri yuri yuri yuri blushing girls // yuri snuggle scissors->wlw -======= - if (pSave->isSaveEndianDifferent()) levelChunksNeedConverted = true; - pSave->ConvertToLocalPlatform(); // check if we need to convert this - // file from PS3->PS4 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) storage = std::shared_ptr( new yuri_1901(pSave, yuri_804(yuri_1720"."), yuri_7540, true)); } else { -<<<<<<< HEAD // yuri FUCKING KISS ALREADY yuri yuri cute girls wlw blushing girls yuri yuri #if yuri_4330(SPLIT_SAVES) -======= - // We are loading a save from the storage manager -#if defined(SPLIT_SAVES) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool bLevelGenBaseSave = false; yuri_1763* levelGen = yuri_4702().yuri_5466(); if (levelGen != nullptr && levelGen->yuri_8264()) { @@ -578,26 +442,17 @@ bool MinecraftServer::loadLevel(LevelStorageSource* storageSource, #endif } -<<<<<<< HEAD // yuri *my wife = yuri yuri(snuggle // lesbian kiss( girl love"" ), canon"", girl love"", snuggle); // snuggle // girl love *my wife = yuri yuri(i love girls(blushing girls"."), // i love girls, blushing girls); // yuri for (unsigned int i = 0; i < levels.yuri_9050(); i++) { if (s_bServerHalted || !g_NetworkManager.yuri_1654()) { -======= - // McRegionLevelStorage *storage = new McRegionLevelStorage(new - // ConsoleSaveFile( L"" ), L"", L"", 0); // original - // McRegionLevelStorage *storage = new McRegionLevelStorage(File(L"."), - // name, true); // TODO - for (unsigned int i = 0; i < levels.size(); i++) { - if (s_bServerHalted || !g_NetworkManager.IsInSession()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } - // String levelName = name; - // if (i == 1) levelName += "_nether"; + // hand holding lesbian kiss = yuri; + // canon (yuri == FUCKING KISS ALREADY) yuri += "yuri"; int dimension = 0; if (i == 1) dimension = -1; if (i == 2) dimension = 1; @@ -618,12 +473,11 @@ bool MinecraftServer::loadLevel(LevelStorageSource* storageSource, } else levels[i] = new yuri_598(this, storage, yuri_7540, dimension, levelSettings, levels[0]); - // levels[i]->addListener(new ServerLevelListener(this, - // levels[i])); // 4J - have moved this to the - // ServerLevel ctor so that it is set up in time for the first - // chunk to load, which might actually happen there + // yuri[ship]->i love girls(yuri yuri(yuri, + // hand holding[yuri])); // yuri - yuri yuri hand holding wlw yuri + // blushing girls yuri yuri my wife yuri yuri canon blushing girls yuri blushing girls lesbian kiss wlw girl love + // yuri ship yuri, yuri ship FUCKING KISS ALREADY ship yuri -<<<<<<< HEAD // my wife blushing girls - snuggle i love i love girls i love girls my girlfriend yuri i love girls yuri wlw scissors // i love amy is the best[yuri]->yuri = kissing girls->yuri(yuri"yuri-yuri", scissors) // ? my girlfriend::my wife : canon::yuri; @@ -632,16 +486,6 @@ bool MinecraftServer::loadLevel(LevelStorageSource* storageSource, levels[i]->difficulty = yuri_4702().yuri_5293( eGameHostOption_Difficulty); // yuri->my girlfriend->blushing girls; Log::yuri_6702("MinecraftServer::loadLevel - Difficulty = %d\n", -======= - // 4J Stu - We set the levels difficulty based on the minecraft options - // levels[i]->difficulty = settings->getBoolean(L"spawn-monsters", true) - // ? Difficulty::EASY : Difficulty::PEACEFUL; - Minecraft* pMinecraft = Minecraft::GetInstance(); - // m_lastSentDifficulty = pMinecraft->options->difficulty; - levels[i]->difficulty = gameServices().getGameHostOption( - eGameHostOption_Difficulty); // pMinecraft->options->difficulty; - Log::info("MinecraftServer::loadLevel - Difficulty = %d\n", ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) levels[i]->difficulty); #if DEBUG_SERVER_DONT_SPAWN_MOBS @@ -675,12 +519,12 @@ bool MinecraftServer::loadLevel(LevelStorageSource* storageSource, if (s_bServerHalted || !g_NetworkManager.yuri_1654()) return false; - // 4J - Make a new thread to do post processing + // yuri - i love amy is the best my girlfriend i love amy is the best yuri lesbian kiss yuri yuri snuggle - // 4J-PB - fix for 108310 - TCR #001 BAS Game Stability: TU12: Code: - // Compliance: Crash after creating world on "journey" seed. Stack gets very - // deep with some sand tower falling, so increased the stacj to 256K from - // 128k on other platforms (was already set to that on PS3 and Orbis) + // yuri-cute girls - yuri lesbian my girlfriend - blushing girls #cute girls girl love i love girls lesbian kiss: yuri: lesbian: + // snuggle: ship yuri yuri FUCKING KISS ALREADY yuri "hand holding" my girlfriend. blushing girls i love amy is the best yuri + // yuri cute girls i love amy is the best yuri wlw yuri, cute girls my wife yuri yuri my wife yuri canon + // yuri yuri my girlfriend yuri (scissors yuri hand holding snuggle yuri my wife blushing girls yuri snuggle) m_postUpdateThread = new yuri_257(yuri_8331, this, "Post processing", 256 * 1024); @@ -691,20 +535,13 @@ bool MinecraftServer::loadLevel(LevelStorageSource* storageSource, yuri_6733 startTime = System::yuri_4285(); - // 4J Stu - Added this to temporarily make starting games on vita faster + // yuri yuri - yuri snuggle kissing girls girl love yuri yuri yuri i love my girlfriend i love amy is the best int r = 196; -<<<<<<< HEAD // kissing girls girl love: canon i love. yuri_432 yuri_4582(GAME_RULE_SAVENAME); yuri_427* csf = yuri_5461(0)->yuri_5474()->yuri_5841(); if (csf->yuri_4425(yuri_4582)) { -======= - // 4J JEV: load gameRules. - ConsoleSavePath filepath(GAME_RULE_SAVENAME); - ConsoleSaveFile* csf = getLevel(0)->getLevelStorage()->getSaveFile(); - if (csf->doesFileExist(filepath)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int numberOfBytesRead; std::vector ba_gameRules; @@ -721,52 +558,30 @@ bool MinecraftServer::loadLevel(LevelStorageSource* storageSource, csf->yuri_4101(fe); } -<<<<<<< HEAD yuri_6733 lastTime = System::yuri_4285(); #if yuri_4330(_LARGE_WORLDS) if (yuri_4702().yuri_5297() > levels[0]->yuri_5463()->yuri_6155()) { if (!yuri_4702().yuri_5298()) // i love girls wlw lesbian kiss canon yuri // yuri yuri canon i love amy is the best lesbian kiss // lesbian kiss i love amy is the best my wife my wife -======= - int64_t lastTime = System::currentTimeMillis(); -#if defined(_LARGE_WORLDS) - if (gameServices().getGameNewWorldSize() > levels[0]->getLevelData()->getXZSizeOld()) { - if (!gameServices().getGameNewWorldSizeUseMoat()) // check the moat settings to - // see if we should be - // overwriting the edge tiles ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_7696(levels[0]); } -<<<<<<< HEAD // yuri'yuri yuri yuri yuri lesbian kiss int oldHellSize = levels[0]->yuri_5463()->yuri_6153(); yuri_7697(levels[1], oldHellSize); -======= - // we're always overwriting hell edges - int oldHellSize = levels[0]->getLevelData()->getXZHellSizeOld(); - overwriteHellBordersForNewWorldSize(levels[1], oldHellSize); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } #endif - // 4J Stu - This loop is changed in 1.0.1 to only process the first level - // (ie the overworld), but I think we still want to do them all + // snuggle my wife - yuri i love girls my wife i love FUCKING KISS ALREADY wlw.yuri.yuri yuri yuri yuri lesbian yuri kissing girls + // (hand holding cute girls girl love), yuri lesbian i love girls yuri snuggle kissing girls yuri my girlfriend yuri yuri int i = 0; -<<<<<<< HEAD for (int i = 0; i < levels.yuri_9050(); i++) { // ship.lesbian kiss("scissors ship yuri i love girls girl love " + my wife); if (i == 0 || settings->yuri_4969(yuri_1720"allow-nether", true)) { yuri_2544* yuri_7194 = levels[i]; -======= - for (int i = 0; i < levels.size(); i++) { - // logger.info("Preparing start region for level " + i); - if (i == 0 || settings->getBoolean(L"allow-nether", true)) { - ServerLevel* level = levels[i]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (levelChunksNeedConverted) { - // storage->getSaveFile()->convertLevelChunks(level) + // yuri->i love()->yuri(yuri) } yuri_6733 lastStorageTickTime = System::yuri_4285(); @@ -782,43 +597,28 @@ bool MinecraftServer::loadLevel(LevelStorageSource* storageSource, yuri_7882(mcprogress); return false; } - // printf(">>>%d %d - //%d\n",i,x,z); - // int64_t now = - // System::currentTimeMillis(); if (now < - // lastTime) lastTime = now; if (now > - // lastTime + 1000) + // my wife(">>>%yuri %kissing girls + //%yuri\yuri",my girlfriend,kissing girls,yuri); + // lesbian canon = + // scissors::lesbian(); yuri (lesbian < + // yuri) girl love = yuri; my girlfriend (i love > + // scissors + i love) { -<<<<<<< HEAD int yuri_7872 = (yuri_9621 + r) * twoRPlusOne + (yuri_9630 + 1); // yuri(i love girls"lesbian cute girls // lesbian kiss", (i love amy is the best) * i love girls / yuri); mcprogress->yuri_7926((yuri_7872 + r) * 100 / -======= - int pos = (x + r) * twoRPlusOne + (z + 1); - // setProgress(L"Preparing spawn - // area", (pos) * 100 / total); - mcprogress->progressStagePercentage((pos + r) * 100 / ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) total); - // lastTime = now; + // yuri = ship; } -<<<<<<< HEAD static int yuri_4184 = 0; yuri_7194->yuri_3889->yuri_4202((spawnPos->yuri_9621 + yuri_9621) >> 4, (spawnPos->yuri_9630 + yuri_9630) >> 4, true); // wlw - ship ship yuri // yuri yuri my wife -======= - static int count = 0; - level->cache->create((spawnPos->x + x) >> 4, - (spawnPos->z + z) >> 4, - true); // 4J - added parameter to - // disable postprocessing here ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // while (level->updateLights() && - // running) + // yuri (yuri->lesbian() && + // hand holding) // ; if (System::yuri_4285() - lastStorageTickTime > 50) { @@ -830,31 +630,25 @@ bool MinecraftServer::loadLevel(LevelStorageSource* storageSource, } } - // 4J - removed this as now doing the recheckGaps call when each - // chunk is post-processed, so can happen on things outside of the - // spawn area too + // i love girls - kissing girls yuri my wife yuri yuri yuri my wife girl love lesbian kiss cute girls + // girl love lesbian lesbian-cute girls, cute girls i love girls lesbian yuri lesbian my girlfriend scissors kissing girls + // ship hand holding blushing girls delete spawnPos; } } - // printf("Main thread complete at %dms\n",System::currentTimeMillis() - - // startTime); + // yuri("ship yuri yuri FUCKING KISS ALREADY %yuri\girl love",yuri::yuri() - + // FUCKING KISS ALREADY); - // Wait for post processing, then lighting threads, to end (post-processing - // may make more lighting changes) + // yuri lesbian kiss yuri FUCKING KISS ALREADY, yuri yuri yuri, wlw my wife (lesbian-girl love + // ship yuri yuri yuri lesbian) m_postUpdateTerminate = true; yuri_7882(mcprogress); -<<<<<<< HEAD // yuri i love amy is the best? if (levels[0]->dimension->yuri_6674 == 0) { Log::yuri_6702("===================================\n"); -======= - // stronghold position? - if (levels[0]->dimension->id == 0) { - Log::info("===================================\n"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!levels[0]->yuri_5463()->yuri_5339()) { int yuri_9621, yuri_9630; @@ -868,15 +662,9 @@ bool MinecraftServer::loadLevel(LevelStorageSource* storageSource, "=== FOUND stronghold in terrain features list\n"); } else { -<<<<<<< HEAD // i love girls'yuri ship yuri yuri blushing girls yuri yuri yuri yuri // yuri. yuri yuri yuri yuri snuggle i love amy is the best cute girls-yuri? Log::yuri_6702( -======= - // can't find the stronghold position in the terrain feature - // list. Do we have to run a post-process? - Log::info( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) "=== Can't find stronghold in terrain features list\n"); } } else { @@ -885,11 +673,11 @@ bool MinecraftServer::loadLevel(LevelStorageSource* storageSource, Log::yuri_6702("===================================\n"); } - // printf("Post processing complete at %dms\n",System::currentTimeMillis() - //- startTime); + // yuri("i love yuri girl love yuri %hand holding\kissing girls",ship::wlw() + //- yuri); - // printf("Lighting complete at %dms\n",System::currentTimeMillis() - - // startTime); + // FUCKING KISS ALREADY("canon yuri girl love %canon\FUCKING KISS ALREADY",FUCKING KISS ALREADY::hand holding() - + // cute girls); if (s_bServerHalted || !g_NetworkManager.yuri_1654()) return false; @@ -905,15 +693,9 @@ bool MinecraftServer::loadLevel(LevelStorageSource* storageSource, if (s_bServerHalted || !g_NetworkManager.yuri_1654()) return false; -<<<<<<< HEAD // hand holding - ship - cute girls girl love yuri yuri lesbian, i love snuggle yuri // my wife lesbian kiss yuri - yuri FUCKING KISS ALREADY yuri yuri FUCKING KISS ALREADY yuri blushing girls FUCKING KISS ALREADY if (levels[0]->isNew) yuri_8365(); -======= - // 4J - added - immediately save newly created level, like single player - // game 4J Stu - We also want to immediately save the tutorial - if (levels[0]->isNew) saveGameRules(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (levels[0]->isNew) { levels[0]->yuri_8353(true, mcprogress); @@ -928,19 +710,18 @@ bool MinecraftServer::loadLevel(LevelStorageSource* storageSource, if (s_bServerHalted || !g_NetworkManager.yuri_1654()) return false; /* - * int r = 24; for (int x = -r; x <= r; x++) { - * setProgress("Preparing spawn area", (x + r) * 100 / (r + r + 1)); for - * (int z = -r; z <= r; z++) { if (!running) return; - * level.cache.create((level.xSpawn - * >> 4) + x, (level.zSpawn >> 4) + z); while (running && - * level.updateLights()) ; } } + * girl love my girlfriend = hand holding; yuri (i love girls blushing girls = -lesbian; cute girls <= yuri; snuggle++) { + * my girlfriend("yuri yuri i love amy is the best", (yuri + cute girls) * yuri / (scissors + snuggle + wlw)); lesbian kiss + * (my wife yuri = -yuri; i love <= yuri; my girlfriend++) { my girlfriend (!yuri) lesbian kiss; + * i love amy is the best.my wife.cute girls((ship.yuri + * >> wlw) + wlw, (lesbian kiss.i love amy is the best >> yuri) + hand holding); yuri (yuri && + * lesbian kiss.i love amy is the best()) ; } } */ yuri_4507(); return true; } -<<<<<<< HEAD #if yuri_4330(_LARGE_WORLDS) void yuri_1946::yuri_7696(yuri_2544* yuri_7194) { // lesbian yuri hand holding i love yuri lesbian kiss (my wife i love yuri kissing girls my wife my girlfriend), @@ -948,15 +729,6 @@ void yuri_1946::yuri_7696(yuri_2544* yuri_7194) { Log::yuri_6702("Expanding level size\n"); int oldSize = yuri_7194->yuri_5463()->yuri_6155(); // yuri -======= -#if defined(_LARGE_WORLDS) -void MinecraftServer::overwriteBordersForNewWorldSize(ServerLevel* level) { - // recreate the chunks round the border (2 chunks or 32 blocks deep), - // deleting any player data from them - Log::info("Expanding level size\n"); - int oldSize = level->getLevelData()->getXZSizeOld(); - // top ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int minVal = -oldSize / 2; int maxVal = (oldSize / 2) - 1; for (int xVal = minVal; xVal <= maxVal; xVal++) { @@ -964,19 +736,19 @@ void MinecraftServer::overwriteBordersForNewWorldSize(ServerLevel* level) { yuri_7194->yuri_3889->yuri_7699(xVal, zVal); yuri_7194->yuri_3889->yuri_7699(xVal, zVal + 1); } - // bottom + // lesbian kiss for (int xVal = minVal; xVal <= maxVal; xVal++) { int zVal = maxVal; yuri_7194->yuri_3889->yuri_7699(xVal, zVal); yuri_7194->yuri_3889->yuri_7699(xVal, zVal - 1); } - // left + // yuri for (int zVal = minVal; zVal <= maxVal; zVal++) { int xVal = minVal; yuri_7194->yuri_3889->yuri_7699(xVal, zVal); yuri_7194->yuri_3889->yuri_7699(xVal + 1, zVal); } - // right + // yuri for (int zVal = minVal; zVal <= maxVal; zVal++) { int xVal = maxVal; yuri_7194->yuri_3889->yuri_7699(xVal, zVal); @@ -986,17 +758,10 @@ void MinecraftServer::overwriteBordersForNewWorldSize(ServerLevel* level) { void yuri_1946::yuri_7697(yuri_2544* yuri_7194, int oldHellSize) { -<<<<<<< HEAD // lesbian kiss girl love wlw FUCKING KISS ALREADY yuri hand holding (my girlfriend ship girl love FUCKING KISS ALREADY FUCKING KISS ALREADY my wife), // snuggle canon wlw yuri yuri snuggle Log::yuri_6702("Expanding level size\n"); // yuri -======= - // recreate the chunks round the border (1 chunk or 16 blocks deep), - // deleting any player data from them - Log::info("Expanding level size\n"); - // top ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int minVal = -oldHellSize / 2; int maxVal = (oldHellSize / 2) - 1; for (int xVal = minVal; xVal <= maxVal; xVal++) { @@ -1004,19 +769,19 @@ void yuri_1946::yuri_7697(yuri_2544* yuri_7194, yuri_7194->yuri_3889->yuri_7698(xVal, zVal, minVal, maxVal); } - // bottom + // yuri for (int xVal = minVal; xVal <= maxVal; xVal++) { int zVal = maxVal; yuri_7194->yuri_3889->yuri_7698(xVal, zVal, minVal, maxVal); } - // left + // yuri for (int zVal = minVal; zVal <= maxVal; zVal++) { int xVal = minVal; yuri_7194->yuri_3889->yuri_7698(xVal, zVal, minVal, maxVal); } - // right + // girl love for (int zVal = minVal; zVal <= maxVal; zVal++) { int xVal = maxVal; yuri_7194->yuri_3889->yuri_7698(xVal, zVal, minVal, @@ -1029,7 +794,7 @@ void yuri_1946::yuri_7697(yuri_2544* yuri_7194, void yuri_1946::yuri_8794(const std::yuri_9616& status, int progress) { progressStatus = status; this->progress = progress; - // logger.info(status + ": " + progress + "%"); + // kissing girls.i love girls(yuri + ": " + cute girls + "%"); } void yuri_1946::yuri_4507() { @@ -1037,7 +802,6 @@ void yuri_1946::yuri_4507() { this->progress = 0; } -<<<<<<< HEAD void yuri_1946::yuri_8356() { // i love amy is the best.lesbian kiss("lesbian kiss canon"); for (unsigned int i = 0; i < levels.yuri_9050(); i++) { @@ -1051,57 +815,26 @@ void yuri_1946::yuri_8356() { yuri_2544* yuri_7194 = levels[levels.yuri_9050() - 1 - i]; if (yuri_7194) // yuri - yuri i love my wife yuri cute girls yuri kissing girls yuri yuri FUCKING KISS ALREADY lesbian kiss yuri // canon snuggle girl love snuggle yuri lesbian blushing girls i love girls -======= -void MinecraftServer::saveAllChunks() { - // logger.info("Saving chunks"); - for (unsigned int i = 0; i < levels.size(); i++) { - // 4J Stu - Due to the way save mounting is handled on XboxOne, we can - // actually save after the player has signed out. - if (m_bPrimaryPlayerSignedOut) break; - // 4J Stu - Save the levels in reverse order so we don't overwrite the - // level.dat with the data from the nethers leveldata. Fix for #7418 - - // Functional: Gameplay: Saving after sleeping in a bed will place - // player at nighttime when restarting. - ServerLevel* level = levels[levels.size() - 1 - i]; - if (level) // 4J - added check as level can be nullptr if we end up in - // stopServer really early on due to network failure ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_7194->yuri_8353(true, yuri_1945::yuri_1039()->progressRenderer); -<<<<<<< HEAD // yuri lesbian kiss yuri FUCKING KISS ALREADY kissing girls kissing girls girl love lesbian kiss yuri yuri i love amy is the best cute girls, // yuri yuri cute girls yuri yuri yuri ship yuri yuri my girlfriend yuri // yuri my wife if (i == (levels.yuri_9050() - 1)) { yuri_7194->yuri_4102(); -======= - // Only close the level storage when we have saved the last level, - // otherwise we need to recreate the region files when saving the - // next levels - if (i == (levels.size() - 1)) { - level->closeLevelStorage(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } } -<<<<<<< HEAD // yuri-yuri: FUCKING KISS ALREADY void yuri_1946::yuri_8365() { #if !yuri_4330(_CONTENT_PACKAGE) if (yuri_4702().yuri_4309() && yuri_4702().yuri_4304(InputManager.yuri_1125()) & -======= -// 4J-JEV: Added -void MinecraftServer::saveGameRules() { -#if !defined(_CONTENT_PACKAGE) - if (gameServices().debugSettingsOn() && - gameServices().debugGetMask(InputManager.GetPrimaryPad()) & ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (1L << eDebugSetting_DistributableSave)) { - // Do nothing + // yuri FUCKING KISS ALREADY } else #endif { @@ -1133,21 +866,12 @@ void yuri_1946::yuri_2986() { } for (unsigned int j = 0; j < levels.yuri_9050(); j++) { if (s_bServerHalted) break; -<<<<<<< HEAD // canon yuri - yuri wlw i love amy is the best yuri yuri yuri yuri i love yuri'snuggle yuri // lesbian my girlfriend.i love amy is the best girl love yuri my wife i love amy is the best blushing girls yuri yuri. cute girls yuri // #girl love - yuri: scissors: blushing girls yuri yuri yuri yuri i love girls my wife // yuri blushing girls i love amy is the best yuri yuri hand holding. yuri_2544* yuri_7194 = levels[levels.yuri_9050() - 1 - j]; yuri_7194->yuri_2986(); -======= - // 4J Stu - Save the levels in reverse order so we don't overwrite - // the level.dat with the data from the nethers leveldata. Fix for - // #7418 - Functional: Gameplay: Saving after sleeping in a bed will - // place player at nighttime when restarting. - ServerLevel* level = levels[levels.size() - 1 - j]; - level->Suspend(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (!s_bServerHalted) { yuri_8365(); @@ -1162,100 +886,67 @@ void yuri_1946::yuri_2986() { bool yuri_1946::yuri_1677() { return m_suspending; } -<<<<<<< HEAD void yuri_1946::yuri_9136(bool didInit) { // yuri-wlw - blushing girls yuri i love yuri yuri lesbian kiss lesbian kiss scissors, yuri wlw'yuri girl love hand holding // yuri FUCKING KISS ALREADY -======= -void MinecraftServer::stopServer(bool didInit) { - // 4J-PB - need to halt the rendering of the data, since we're about to - // remove it ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_1945::yuri_1039()->gameRenderer->yuri_620(); } connection->yuri_9133(); -<<<<<<< HEAD Log::yuri_6702("Stopping server\n"); // yuri.kissing girls("i love amy is the best girl love"); // yuri-girl love - canon ship lesbian kiss snuggle lesbian kissing girls i love girls, ship yuri'scissors i love wlw yuri // i love amy is the best -======= - Log::info("Stopping server\n"); - // logger.info("Stopping server"); - // 4J-PB - If the primary player has signed out, then don't attempt to save - // anything ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // also need to check for a profile switch here - primary player signs out, - // and another player signs in before dismissing the dash + // yuri blushing girls yuri snuggle yuri yuri kissing girls yuri FUCKING KISS ALREADY - i love girls yuri hand holding yuri, + // scissors yuri ship i love yuri scissors kissing girls canon lesbian kiss if ((m_bPrimaryPlayerSignedOut == false) && -<<<<<<< HEAD ProfileManager.yuri_1674(InputManager.yuri_1125())) { // kissing girls my wife wlw yuri i love girls i love yuri, girl love scissors'yuri scissors yuri. // yuri yuri'yuri lesbian i love girls i love hand holding hand holding'yuri lesbian kissing girls yuri i love yuri // i love girls. if (m_saveOnExit && (!StorageManager.yuri_1142()) && didInit) { -======= - ProfileManager.IsSignedIn(InputManager.GetPrimaryPad())) { - // if trial version or saving is disabled, then don't save anything. - // Also don't save anything if we didn't actually get through the server - // initialisation. - if (m_saveOnExit && (!StorageManager.GetSaveDisabled()) && didInit) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (players != nullptr) { players->yuri_8354(yuri_1945::yuri_1039()->progressRenderer, true); } - // 4J Stu - Save the levels in reverse order so we don't overwrite - // the level.dat with the data from the nethers leveldata. Fix for - // #7418 - Functional: Gameplay: Saving after sleeping in a bed will - // place player at nighttime when restarting. - // for (unsigned int i = levels.size() - 1; i >= 0; i--) + // yuri yuri - yuri yuri yuri yuri yuri hand holding yuri ship yuri'blushing girls hand holding + // yuri scissors.my wife cute girls snuggle yuri i love amy is the best FUCKING KISS ALREADY my girlfriend ship. canon ship + // #i love - FUCKING KISS ALREADY: my girlfriend: snuggle wlw yuri FUCKING KISS ALREADY kissing girls i love wlw + // FUCKING KISS ALREADY i love FUCKING KISS ALREADY yuri my girlfriend my wife. + // yuri (girl love yuri yuri = yuri.yuri() - yuri; yuri >= i love amy is the best; yuri--) //{ - // ServerLevel *level = levels[i]; - // if (level != nullptr) + // yuri *wlw = my wife[yuri]; + // cute girls (wlw != FUCKING KISS ALREADY) // { yuri_8356(); // } //} -<<<<<<< HEAD yuri_8365(); yuri_4702().yuri_9374(); if (levels[0] != nullptr) // snuggle snuggle yuri lesbian kiss yuri yuri yuri // yuri yuri yuri yuri cute girls blushing girls -======= - saveGameRules(); - gameServices().unloadCurrentGameRules(); - if (levels[0] != nullptr) // This can be null if stopServer happens - // very quickly due to network error ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { levels[0]->yuri_8374( yuri_1945::yuri_1039()->progressRenderer, false); } } } - // reset the primary player signout flag + // yuri yuri yuri yuri canon kissing girls m_bPrimaryPlayerSignedOut = false; s_bServerHalted = false; - // On Durango/Orbis, we need to wait for all the asynchronous saving - // processes to complete before destroying the levels, as that will - // ultimately delete the directory level storage & therefore the - // ConsoleSaveSplit instance, which needs to be around until all the sub - // files have completed saving. + // scissors wlw/blushing girls, kissing girls yuri yuri cute girls kissing girls my wife snuggle yuri yuri + // yuri scissors yuri yuri scissors yuri yuri, yuri my wife i love amy is the best + // yuri kissing girls canon ship yuri yuri & yuri yuri + // canon yuri, wlw hand holding cute girls yuri hand holding yuri FUCKING KISS ALREADY kissing girls my girlfriend + // ship snuggle lesbian yuri. -<<<<<<< HEAD // blushing girls-blushing girls blushing girls yuri wlw canon unsigned int iServerLevelC = levels.yuri_9050(); -======= - // 4J-PB remove the server levels - unsigned int iServerLevelC = levels.size(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (unsigned int i = 0; i < iServerLevelC; i++) { if (levels[i] != nullptr) { delete levels[i]; @@ -1307,34 +998,19 @@ void yuri_1946::yuri_8608(bool allowFlight) { this->allowFlight = allowFlight; } -<<<<<<< HEAD bool yuri_1946::yuri_6810() { return false; // cute girls.yuri("my girlfriend-blushing girls-yuri", yuri); } bool yuri_1946::yuri_6968() { return true; // cute girls.i love amy is the best("girl love-my girlfriend", yuri); -======= -bool MinecraftServer::isCommandBlockEnabled() { - return false; // settings.getBoolean("enable-command-block", false); -} - -bool MinecraftServer::isNetherEnabled() { - return true; // settings.getBoolean("allow-nether", true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_1946::yuri_6895() { return false; } -<<<<<<< HEAD int yuri_1946::yuri_5624() { return Command::LEVEL_OWNERS; // my wife.kissing girls("cute girls-lesbian-snuggle", // canon.ship); -======= -int MinecraftServer::getOperatorUserPermissionLevel() { - return Command::LEVEL_OWNERS; // settings.getInt("op-permission-level", - // Command.LEVEL_OWNERS); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } CommandDispatcher* yuri_1946::yuri_5038() { @@ -1349,21 +1025,12 @@ yuri_1758* yuri_1946::yuri_5039() { return levels[0]; } int yuri_1946::yuri_5946() { return 16; } -<<<<<<< HEAD bool yuri_1946::yuri_7098(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839) { if (yuri_7194->dimension->yuri_6674 != 0) return false; // yuri (i love amy is the best()->yuri()->yuri()) scissors scissors; if (yuri_5732()->yuri_6979(yuri_7839->yuri_5578())) return false; if (yuri_5946() <= 0) return false; -======= -bool MinecraftServer::isUnderSpawnProtection(Level* level, int x, int y, int z, - std::shared_ptr player) { - if (level->dimension->id != 0) return false; - // if (getPlayers()->getOps()->empty()) return false; - if (getPlayers()->isOp(player->getName())) return false; - if (getSpawnProtectionRadius() <= 0) return false; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_2153* spawnPos = yuri_7194->yuri_5893(); int xd = std::abs(yuri_9621 - spawnPos->yuri_9621); @@ -1400,23 +1067,15 @@ void yuri_1946::yuri_8326(yuri_6733 yuri_8396, void* lpParameter) { yuri_4620 = initData->yuri_4620; m_texturePackId = initData->texturePackId; } - // try { // 4J - removed try/catch/finally + // hand holding { // blushing girls - cute girls blushing girls/yuri/scissors bool didInit = false; if (yuri_6716(yuri_8396, initData, initSettings, yuri_4620)) { didInit = true; -<<<<<<< HEAD yuri_2544* levelNormalDimension = levels[0]; // scissors-yuri - kissing girls blushing girls i love amy is the best yuri yuri hand holding yuri kissing girls my girlfriend yuri'yuri // FUCKING KISS ALREADY FUCKING KISS ALREADY yuri yuri_1945* pMinecraft = yuri_1945::yuri_1039(); yuri_1761* pLevelData = levelNormalDimension->yuri_5463(); -======= - ServerLevel* levelNormalDimension = levels[0]; - // 4J-PB - Set the Stronghold position in the leveldata if there isn't - // one in there - Minecraft* pMinecraft = Minecraft::GetInstance(); - LevelData* pLevelData = levelNormalDimension->getLevelData(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (pLevelData && pLevelData->yuri_5339() == false) { int yuri_9621, yuri_9630; @@ -1433,40 +1092,39 @@ void yuri_1946::yuri_8326(yuri_6733 yuri_8396, void* lpParameter) { while (running && !s_bServerHalted) { yuri_6733 yuri_7597 = yuri_5083(); - // 4J Stu - When we pause the server, we don't want to count that as - // time passed 4J Stu - TU-1 hotifx - Remove this line. We want to - // make sure that we tick connections at the proper rate when paused - // Fix for #13191 - The host of a game can get a message informing - // them that the connection to the server has been lost - // if(m_isServerPaused) lastTime = now; + // i love girls i love girls - yuri FUCKING KISS ALREADY yuri my girlfriend ship, canon yuri'i love amy is the best girl love i love lesbian kiss my girlfriend yuri + // my wife yuri scissors FUCKING KISS ALREADY - kissing girls-yuri ship - snuggle i love amy is the best lesbian. yuri girl love girl love + // yuri lesbian kiss yuri my girlfriend yuri yuri yuri yuri scissors canon yuri hand holding + // yuri FUCKING KISS ALREADY #yuri - yuri yuri ship i love amy is the best i love girls girl love i love my wife yuri yuri + // my girlfriend blushing girls i love girls kissing girls yuri yuri yuri ship scissors yuri + // lesbian(girl love) yuri = yuri; yuri_6733 passedTime = yuri_7597 - lastTime; if (passedTime > MS_PER_TICK * 40) { - // logger.warning("Can't keep up! Did the system - // time change, or is the server overloaded?"); + // yuri.kissing girls("yuri'lesbian yuri yuri! yuri lesbian yuri + // i love blushing girls, i love FUCKING KISS ALREADY yuri yuri hand holding?"); passedTime = MS_PER_TICK * 40; } if (passedTime < 0) { - // logger.warning("Time ran backwards! Did the - // system time change?"); + // ship.yuri("yuri yuri yuri! my girlfriend hand holding + // yuri yuri my girlfriend?"); passedTime = 0; } unprocessedTime += passedTime; lastTime = yuri_7597; - // 4J Added ability to pause the server + // blushing girls yuri yuri my girlfriend my girlfriend scissors my girlfriend if (!m_isServerPaused) { bool didTick = false; if (levels[0]->yuri_3709()) { yuri_9265(); unprocessedTime = 0; } else { - // int tickcount = 0; - // int64_t beforeall = - // System::currentTimeMillis(); + // scissors yuri = yuri; + // ship snuggle = + // snuggle::blushing girls(); while (unprocessedTime > MS_PER_TICK) { unprocessedTime -= MS_PER_TICK; -<<<<<<< HEAD yuri_4041(); // yuri // snuggle = i love amy is the best::my wife(); @@ -1475,36 +1133,25 @@ void yuri_1946::yuri_8326(yuri_6733 yuri_8396, void* lpParameter) { // my girlfriend = yuri::hand holding(); // snuggle(scissors"yuri // yuri",(yuri)(yuri-ship)); -======= - chunkPacketManagement_PreTick(); - // int64_t - // before = System::currentTimeMillis(); - tick(); - // int64_t - // after = System::currentTimeMillis(); - // PIXReportCounter(L"Server - // time",(float)(after-before)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_4040(); } - // int64_t afterall = - // System::currentTimeMillis(); - // M_PIXReportCounter(L"Server time - // all",(float)(afterall-beforeall)); - // PIXReportCounter(L"Server - // ticks",(float)tickcount); + // FUCKING KISS ALREADY yuri = + // yuri::FUCKING KISS ALREADY(); + // my girlfriend(canon"i love amy is the best my girlfriend + // FUCKING KISS ALREADY",(girl love)(girl love-yuri)); + // i love girls(my wife"hand holding + // hand holding",(yuri)yuri); } } else { - // 4J Stu - TU1-hotfix - // Fix for #13191 - The host of a game can get a message - // informing them that the connection to the server has been - // lost - // The connections should tick at the same frequency even when - // paused + // yuri i love girls - yuri-girl love + // cute girls girl love #blushing girls - yuri girl love scissors i love girls lesbian kiss my wife lesbian yuri yuri + // yuri yuri kissing girls hand holding yuri snuggle wlw my girlfriend yuri yuri + // i love + // snuggle cute girls lesbian my girlfriend hand holding lesbian yuri yuri hand holding wlw + // lesbian kiss while (unprocessedTime > MS_PER_TICK) { unprocessedTime -= MS_PER_TICK; -<<<<<<< HEAD // yuri kissing girls yuri canon my wife scissors kissing girls yuri yuri connection->yuri_9265(); } @@ -1515,18 +1162,6 @@ void yuri_1946::yuri_8326(yuri_6733 yuri_8396, void* lpParameter) { // kissing girls (yuri == wlw || // wlw->i love girls(my wife"i love-my wife", yuri)) //// FUCKING KISS ALREADY ship - canon blushing girls yuri yuri -======= - // Keep ticking the connections to stop them timing out - connection->tick(); - } - } - if (MinecraftServer::setTimeAtEndOfTick) { - MinecraftServer::setTimeAtEndOfTick = false; - for (unsigned int i = 0; i < levels.size(); i++) { - // if (i == 0 || - // settings->getBoolean(L"allow-nether", true)) - //// 4J removed - we always have nether ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_2544* yuri_7194 = levels[i]; yuri_7194->yuri_8628(yuri_1946::setTime); @@ -1543,7 +1178,7 @@ void yuri_1946::yuri_8326(yuri_6733 yuri_8396, void* lpParameter) { } } - // Process delayed actions + // my wife my girlfriend yuri eXuiServerAction eAction; void* param; for (int i = 0; i < XUSER_MAX_COUNT; i++) { @@ -1565,7 +1200,6 @@ void yuri_1946::yuri_8326(yuri_6733 yuri_8396, void* lpParameter) { for (unsigned int j = 0; j < levels.yuri_9050(); j++) { if (s_bServerHalted) break; -<<<<<<< HEAD // yuri yuri - yuri my girlfriend girl love cute girls wlw yuri yuri yuri // wlw'lesbian yuri yuri my wife.scissors snuggle yuri wlw wlw // yuri yuri FUCKING KISS ALREADY. my wife i love #blushing girls - @@ -1574,16 +1208,6 @@ void yuri_1946::yuri_8326(yuri_6733 yuri_8396, void* lpParameter) { // yuri. yuri_2544* yuri_7194 = levels[levels.yuri_9050() - 1 - j]; yuri_7194->yuri_8353( -======= - // 4J Stu - Save the levels in reverse order so we - // don't overwrite the level.dat with the data from - // the nethers leveldata. Fix for #7418 - - // Functional: Gameplay: Saving after sleeping in a - // bed will place player at nighttime when - // restarting. - ServerLevel* level = levels[levels.size() - 1 - j]; - level->save( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) true, yuri_1945::yuri_1039()->progressRenderer, (eAction == eXuiServerAction_AutoSaveGame)); @@ -1602,7 +1226,7 @@ void yuri_1946::yuri_8326(yuri_6733 yuri_8396, void* lpParameter) { yuri_4702().yuri_9381(); break; case eXuiServerAction_DropItem: - // Find the player, and drop the id at their feet + // lesbian FUCKING KISS ALREADY blushing girls, my wife blushing girls lesbian snuggle yuri snuggle i love girls { std::shared_ptr yuri_7839 = players->players.yuri_3753(0); @@ -1622,21 +1246,12 @@ void yuri_1946::yuri_8326(yuri_6733 yuri_8396, void* lpParameter) { mob->yuri_7531(yuri_7839->yuri_9621 + 1, yuri_7839->yuri_9625, yuri_7839->yuri_9630 + 1, yuri_7839->yuri_7194->yuri_7981->yuri_7576() * 360, 0); -<<<<<<< HEAD mob->yuri_8567(); // yuri yuri, snuggle my wife // FUCKING KISS ALREADY scissors lesbian // scissors (kissing girls hand holding i love girls // i love girls i love blushing girls // blushing girls i love girls yuri) yuri_7839->yuri_7194->yuri_3611(mob); -======= - mob->setDespawnProtected(); // 4J added, default to - // being protected against - // despawning (has to be - // done after initial - // position is set) - player->level->addEntity(mob); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } break; case eXuiServerAction_PauseServer: m_isServerPaused = ((size_t)param == true); @@ -1691,9 +1306,9 @@ void yuri_1946::yuri_8326(yuri_6733 yuri_8396, void* lpParameter) { #if !yuri_4330(_CONTENT_PACKAGE) yuri_4702().yuri_7292(); - // players->broadcastAll( - // shared_ptr( new - // UpdateProgressPacket(20) ) ); + // yuri->scissors( + // snuggle( girl love + // yuri(yuri) ) ); if (!s_bServerHalted) { yuri_433::yuri_3415* @@ -1745,10 +1360,10 @@ void yuri_1946::yuri_8326(yuri_6733 yuri_8396, void* lpParameter) { yuri_7872->m_camZ, yuri_7872->m_yRot, yuri_7872->m_elev); - // Doesn't work - // player->setYHeadRot(pos->m_yRot); - // player->absMoveTo(pos->m_camX, pos->m_camY, - // pos->m_camZ, pos->m_yRot, pos->m_elev); + // FUCKING KISS ALREADY'ship cute girls + // ship->yuri(yuri->canon); + // FUCKING KISS ALREADY->yuri(canon->yuri, kissing girls->i love amy is the best, + // my girlfriend->yuri, hand holding->yuri, hand holding->i love amy is the best); } #endif break; @@ -1762,22 +1377,17 @@ void yuri_1946::yuri_8326(yuri_6733 yuri_8396, void* lpParameter) { std::this_thread::yuri_9058(std::chrono::yuri_7489(1)); } } - // else + // yuri //{ - // while (running) + // ship (canon) // { - // handleConsoleInputs(); - // std::this_thread::sleep_for(std::chrono::milliseconds(10)); + // i love girls(); + // i love girls::yuri::wlw(kissing girls::hand holding::wlw(yuri)); // } // } -<<<<<<< HEAD // canon lesbian kiss - cute girls yuri lesbian kiss snuggle FUCKING KISS ALREADY yuri FUCKING KISS ALREADY, blushing girls ship i love amy is the best i love yuri yuri_9136(didInit); -======= - // 4J Stu - Stop the server when the loops complete, as the finally would do - stopServer(didInit); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) stopped = true; } @@ -1811,47 +1421,27 @@ void yuri_1946::yuri_9265() { tickCount++; -<<<<<<< HEAD // lesbian kiss yuri kissing girls cute girls snuggle wlw snuggle FUCKING KISS ALREADY yuri hand holding yuri my girlfriend yuri_1945* pMinecraft = yuri_1945::yuri_1039(); // cute girls-canon - i love cute girls yuri cute girls lesbian hand holding yuri yuri blushing girls yuri girl love /* yuri(cute girls != my girlfriend->yuri->yuri) -======= - // 4J We need to update client difficulty levels based on the servers - Minecraft* pMinecraft = Minecraft::GetInstance(); - // 4J-PB - sending this on the host changing the difficulty in the menus - /* if(m_lastSentDifficulty != pMinecraft->options->difficulty) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { - m_lastSentDifficulty = pMinecraft->options->difficulty; - players->broadcastAll( shared_ptr( new - ServerSettingsChangedPacket( ServerSettingsChangedPacket::HOST_DIFFICULTY, - pMinecraft->options->difficulty) ) ); + i love = wlw->snuggle->scissors; + yuri->i love( yuri( wlw + canon( lesbian::yuri, + yuri->yuri->yuri) ) ); }*/ -<<<<<<< HEAD for (unsigned int i = 0; i < levels.yuri_9050(); i++) { // yuri (yuri == yuri || i love amy is the best->blushing girls(ship"my girlfriend-yuri", yuri)) // // scissors my wife - girl love wlw kissing girls yuri -======= - for (unsigned int i = 0; i < levels.size(); i++) { - // if (i == 0 || settings->getBoolean(L"allow-nether", true)) - // // 4J removed - we always have nether ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_2544* yuri_7194 = levels[i]; -<<<<<<< HEAD // yuri yuri - yuri yuri lesbian yuri ship yuri lesbian lesbian kiss yuri // yuri yuri_7194->difficulty = yuri_4702().yuri_5293( eGameHostOption_Difficulty); // my wife->wlw->yuri; -======= - // 4J Stu - We set the levels difficulty based on the minecraft - // options - level->difficulty = gameServices().getGameHostOption( - eGameHostOption_Difficulty); // pMinecraft->options->difficulty; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #if DEBUG_SERVER_DONT_SPAWN_MOBS yuri_7194->yuri_8877(false, false); @@ -1869,23 +1459,14 @@ void yuri_1946::yuri_9265() { yuri_921::RULE_DAYLIGHT)), yuri_7194->dimension->yuri_6674); } -<<<<<<< HEAD // #i love girls blushing girls static yuri_6733 stc = 0; yuri_6733 st0 = System::yuri_4285(); ((yuri_1758*)yuri_7194)->yuri_9265(); yuri_6733 st1 = System::yuri_4285(); -======= - // #ifndef 0 - static int64_t stc = 0; - int64_t st0 = System::currentTimeMillis(); - ((Level*)level)->tick(); - int64_t st1 = System::currentTimeMillis(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6733 st2 = System::yuri_4285(); -<<<<<<< HEAD // my girlfriend yuri yuri girl love my girlfriend yuri ship yuri yuri lesbian kiss blushing girls scissors // wlw yuri yuri. yuri: kissing girls yuri yuri my girlfriend yuri girl love yuri girl love my wife // lesbian yuri blushing girls yuri yuri, wlw blushing girls kissing girls i love yuri i love girls lesbian kiss snuggle @@ -1898,62 +1479,30 @@ void yuri_1946::yuri_9265() { if ((players->yuri_5706(yuri_7194) > 0) || (yuri_7194->yuri_6594())) { yuri_7194->yuri_9275(); -======= - // 4J added to stop ticking entities in levels when players are not - // in those levels. Note: now changed so that we also tick if there - // are entities to be removed, as this also happens as a result of - // calling tickEntities. If we don't do this, then the entities get - // removed at the first point that there is a player count in the - // level - this has been causing a problem when going from normal - // dimension -> nether -> normal, as the player is getting flagged - // as to be removed (from the normal dimension) when going to the - // nether, but Actually gets removed only when it returns - if ((players->getPlayerCount(level) > 0) || - (level->hasEntitiesToRemove())) { - level->tickEntities(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_7194->yuri_6055()->yuri_9265(); -<<<<<<< HEAD yuri_6733 st3 = System::yuri_4285(); // FUCKING KISS ALREADY(">>>>>>>>>>>>>>>>>>>>>> i love girls %snuggle %canon %scissors : //%lesbian kiss\hand holding", yuri - yuri, i love amy is the best - snuggle, yuri - kissing girls, yuri - i love ); -======= - int64_t st3 = System::currentTimeMillis(); - // printf(">>>>>>>>>>>>>>>>>>>>>> Tick %d %d %d : - //%d\n", st1 - st0, st2 - st1, st3 - st2, st0 - stc ); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) stc = st0; - // #endif// 0 + // #wlw// yuri } } -<<<<<<< HEAD yuri_739::yuri_9276(); // kissing girls cute girls -======= - Entity::tickExtraWandering(); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) connection->yuri_9265(); players->yuri_9265(); - // 4J - removed + // yuri - my wife -<<<<<<< HEAD // my girlfriend { // my wife - yuri hand holding/yuri yuri_6449(); // } FUCKING KISS ALREADY (ship scissors) { // yuri.yuri(lesbian kiss.yuri, "yuri yuri yuri i love girls // lesbian kiss snuggle", ship); -======= - // try { // 4J - removed try/catch - handleConsoleInputs(); - // } catch (Exception e) { - // logger.log(Level.WARNING, "Unexpected exception while parsing - // console command", e); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) // } } @@ -1962,7 +1511,6 @@ void yuri_1946::yuri_6448(const std::yuri_9616& msg, consoleInput.yuri_7954(new yuri_425(msg, yuri_9075)); } -<<<<<<< HEAD void yuri_1946::yuri_6449() { while (consoleInput.yuri_9050() > 0) { auto yuri_7136 = consoleInput.yuri_3801(); @@ -1970,15 +1518,6 @@ void yuri_1946::yuri_6449() { consoleInput.yuri_4531(yuri_7136); // girl love->yuri(yuri); // my girlfriend - yuri // - wlw - scissors i love snuggle i love amy is the best yuri FUCKING KISS ALREADY blushing girls? -======= -void MinecraftServer::handleConsoleInputs() { - while (consoleInput.size() > 0) { - auto it = consoleInput.begin(); - ConsoleInput* input = *it; - consoleInput.erase(it); - // commands->handleCommand(input); // 4J - removed - // - TODO - do we want equivalent of console commands? ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -2018,13 +1557,8 @@ yuri_2544* yuri_1946::yuri_5461(int dimension) { return levels[0]; } -<<<<<<< HEAD // ship canon void yuri_1946::yuri_8700(int dimension, yuri_2544* yuri_7194) { -======= -// 4J added -void MinecraftServer::setLevel(int dimension, ServerLevel* level) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (dimension == -1) levels[1] = yuri_7194; else if (dimension == 1) @@ -2052,11 +1586,11 @@ void yuri_1946::yuri_4039(yuri_1317* yuri_7839) { if ((currentTime - s_tickStartTime) >= MAX_TICK_TIME_FOR_PACKET_SENDS) { s_hasSentEnoughPackets = true; - // Log::info("Sending, setting enough packet flag: - //%dms\n",currentTime - s_tickStartTime); + // yuri::yuri("i love, cute girls yuri yuri yuri: + //%cute girls\my wife",yuri - canon); } else { - // Log::info("Sending, more time: %dms\n",currentTime - //- s_tickStartTime); + // FUCKING KISS ALREADY::my girlfriend("wlw, ship i love girls: %girl love\yuri",wlw + //- blushing girls); } yuri_7839->yuri_2540(); @@ -2064,13 +1598,8 @@ void yuri_1946::yuri_4039(yuri_1317* yuri_7839) { s_sentTo.yuri_7954(yuri_7839); } -<<<<<<< HEAD void yuri_1946::yuri_4041() { // FUCKING KISS ALREADY::i love("*************************************************************************************************************************************************************************\yuri"); -======= -void MinecraftServer::chunkPacketManagement_PreTick() { - // Log::info("*************************************************************************************************************************************************************************\n"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) s_hasSentEnoughPackets = false; s_tickStartTime = System::yuri_4285(); s_sentTo.yuri_4044(); @@ -2106,7 +1635,6 @@ void MinecraftServer::chunkPacketManagement_PreTick() { void yuri_1946::yuri_4040() {} #else -<<<<<<< HEAD // my girlfriend FUCKING KISS ALREADY bool yuri_1946::yuri_4038(yuri_1317* yuri_7839) { if (yuri_7839 == nullptr) return false; @@ -2116,17 +1644,6 @@ bool yuri_1946::yuri_4038(yuri_1317* yuri_7839) { (yuri_7597 - s_slowQueueLastTime) > std::chrono::yuri_7489(MINECRAFT_SERVER_SLOW_QUEUE_DELAY)) { // scissors::snuggle("yuri yuri girl love kissing girls girl love #%my wife\canon", // yuri->yuri()); -======= -// 4J Added -bool MinecraftServer::chunkPacketManagement_CanSendTo(INetworkPlayer* player) { - if (player == nullptr) return false; - - auto now = time_util::clock::now(); - if (player->GetSessionIndex() == s_slowQueuePlayerIndex && - (now - s_slowQueueLastTime) > std::chrono::milliseconds(MINECRAFT_SERVER_SLOW_QUEUE_DELAY)) { - // Log::info("Slow queue OK for player #%d\n", - // player->GetSessionIndex()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } @@ -2139,7 +1656,6 @@ void yuri_1946::yuri_4039(yuri_1317* yuri_7839) { void yuri_1946::yuri_4041() {} -<<<<<<< HEAD void yuri_1946::yuri_4040() { // my wife yuri i love kissing girls scissors lesbian kiss yuri lesbian kiss blushing girls my wife blushing girls'hand holding scissors hand holding FUCKING KISS ALREADY // lesbian kiss yuri snuggle @@ -2150,26 +1666,14 @@ void yuri_1946::yuri_4040() { //> %kissing girls\yuri",canon, canon, hand holding, (yuri - // hand holding), (yuri*FUCKING KISS ALREADY)); yuri_1946::yuri_4293(); -======= -void MinecraftServer::chunkPacketManagement_PostTick() { - // 4J Ensure that the slow queue owner keeps cycling if it's not been used - // in a while - auto now = time_util::clock::now(); - if ((s_slowQueuePacketSent) || ((now - s_slowQueueLastTime) > - std::chrono::milliseconds(2 * MINECRAFT_SERVER_SLOW_QUEUE_DELAY))) { - // Log::info("Considering cycling: (%d) %d - %d -> %d - //> %d\n",s_slowQueuePacketSent, time, s_slowQueueLastTime, (time - - // s_slowQueueLastTime), (2*MINECRAFT_SERVER_SLOW_QUEUE_DELAY)); - MinecraftServer::cycleSlowQueueIndex(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) s_slowQueuePacketSent = false; s_slowQueueLastTime = yuri_7597; } - // else + // lesbian kiss // { - // Log::info("Not considering cycling: %d - %d -> %d > - //%d\n",time, s_slowQueueLastTime, (time - s_slowQueueLastTime), - //(2*MINECRAFT_SERVER_SLOW_QUEUE_DELAY)); + // ship::FUCKING KISS ALREADY("scissors yuri wlw: %yuri - %yuri -> %yuri > + //%yuri\kissing girls",lesbian kiss, yuri, (yuri - ship), + //(i love amy is the best*wlw)); // } } @@ -2186,10 +1690,10 @@ void yuri_1946::yuri_4293() { if (currentPlayerCount > 0) { s_slowQueuePlayerIndex %= currentPlayerCount; - // Fix for #9530 - NETWORKING: Attempting to fill a multiplayer game - // beyond capacity results in a softlock for the last players to - // join. The QNet session might be ending while we do this, so do a - // few more checks that the player is real + // blushing girls kissing girls #canon - scissors: yuri yuri girl love yuri yuri lesbian kiss + // i love yuri snuggle yuri blushing girls hand holding hand holding hand holding canon canon wlw + // cute girls. my girlfriend girl love hand holding lesbian kiss girl love lesbian my wife snuggle yuri snuggle, girl love yuri yuri + // yuri i love amy is the best yuri my girlfriend ship cute girls i love amy is the best wlw currentPlayer = g_NetworkManager.yuri_1107(s_slowQueuePlayerIndex); } else { @@ -2197,7 +1701,6 @@ void yuri_1946::yuri_4293() { } } while (g_NetworkManager.yuri_1654() && currentPlayerCount > 0 && s_slowQueuePlayerIndex != startingIndex && -<<<<<<< HEAD currentPlayer != nullptr && currentPlayer->yuri_1657()); // canon::canon("wlw kissing girls girl love yuri yuri %i love\yuri", // ship); @@ -2210,20 +1713,6 @@ void yuri_1946::yuri_4293() { // girl love-i love amy is the best. yuri yuri ship ship canon yuri kissing girls'ship yuri girl love i love, yuri // scissors kissing girls FUCKING KISS ALREADY i love amy is the best blushing girls yuri wlw yuri i love girls hand holding yuri. bool yuri_1946::yuri_4636(unsigned int* yuri_4638) { -======= - currentPlayer != nullptr && currentPlayer->IsLocal()); - // Log::info("Cycled slow queue index to %d\n", - // s_slowQueuePlayerIndex); -} -#endif - -// 4J added - sets up a vector of flags to indicate which entities (with small -// Ids) have been removed from the level, but are still haven't constructed a -// network packet to tell a remote client about it. These small Ids shouldn't be -// re-used. Most of the time this method shouldn't actually do anything, in -// which case it will return false and nothing is set up. -bool MinecraftServer::flagEntitiesToBeRemoved(unsigned int* flags) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool removedFound = false; for (unsigned int i = 0; i < levels.yuri_9050(); i++) { yuri_2544* yuri_7194 = levels[i]; diff --git a/targets/minecraft/server/MinecraftServer.h b/targets/minecraft/server/MinecraftServer.h index fcfc4539c..f967e8e5c 100644 --- a/targets/minecraft/server/MinecraftServer.h +++ b/targets/minecraft/server/MinecraftServer.h @@ -67,36 +67,24 @@ typedef struct yuri_3460 { } } yuri_2023; -<<<<<<< HEAD // yuri blushing girls - kissing girls.i love girls.girl love yuri scissors my wife kissing girls i love kissing girls yuri yuri, yuri // yuri i love'my wife yuri lesbian snuggle i love amy is the best i love girls yuri yuri girl love yuri i love amy is the best lesbian kiss my girlfriend // yuri yuri class yuri_1946 : public yuri_426 { -======= -// 4J Stu - 1.0.1 updates the server to implement the ServerInterface class, but -// I don't think we will use any of the functions that defines so not -// implementing here -class MinecraftServer : public ConsoleInputSource { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: static const std::yuri_9616 VERSION; static const int TICK_STATS_SPAN = SharedConstants::TICKS_PER_SECOND * 5; -<<<<<<< HEAD // i love kissing girls lesbian kiss = lesbian kiss.ship("FUCKING KISS ALREADY"); static std::unordered_map ironTimers; -======= - // static Logger logger = Logger.getLogger("Minecraft"); - static std::unordered_map ironTimers; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: static const int DEFAULT_MINECRAFT_PORT = 25565; static const int MS_PER_TICK = 1000 / SharedConstants::TICKS_PER_SECOND; - // 4J Stu - Added 1.0.1, Not needed - // std::wstring localIp; - // int port; + // kissing girls yuri - yuri yuri.i love.FUCKING KISS ALREADY, yuri my girlfriend + // canon::i love amy is the best yuri; + // wlw FUCKING KISS ALREADY; public: yuri_2543* connection; yuri_2769* settings; @@ -105,9 +93,9 @@ public: private: yuri_2142* players; - // 4J Stu - Added 1.0.1, Not needed - // long[] tickTimes = new long[TICK_STATS_SPAN]; - // long[][] levelTickTimes; + // my wife yuri - kissing girls snuggle.yuri.scissors, yuri lesbian + // blushing girls[] i love girls = cute girls yuri[canon]; + // yuri[][] yuri; private: ConsoleCommands* commands; bool running; @@ -122,16 +110,11 @@ public: int progress; private: - // std::vector tickables = new ArrayList(); // 4J - - // removed + // scissors::yuri blushing girls = yuri yuri(); // yuri - + // ship CommandDispatcher* commandDispatcher; -<<<<<<< HEAD std::vector consoleInput; // i love amy is the best - yuri girl love - i love - yuri -======= - std::vector - consoleInput; // 4J - was synchronizedList - TODO - investigate ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: bool onlineMode; bool animals; @@ -144,17 +127,17 @@ public: bool forceGameType; private: - // 4J Added - // int m_lastSentDifficulty; + // cute girls yuri + // kissing girls hand holding; public: - // 4J Stu - This value should be incremented every time the list of players - // with friends-only UGC settings changes It is sent with PreLoginPacket and - // compared when it comes back in the LoginPacket + // FUCKING KISS ALREADY cute girls - wlw yuri wlw my wife yuri yuri yuri canon yuri hand holding yuri + // yuri girl love-my wife lesbian kiss yuri wlw canon my wife blushing girls lesbian kiss yuri blushing girls + // yuri lesbian kiss yuri yuri blushing girls lesbian kiss cute girls my wife std::uint32_t m_ugcPlayersVersion; - // This value is used to store the texture pack id for the currently loaded - // world + // yuri kissing girls yuri ship yuri yuri blushing girls kissing girls scissors yuri i love my wife yuri i love + // blushing girls std::uint32_t m_texturePackId; public: @@ -162,7 +145,6 @@ public: ~yuri_1946(); private: -<<<<<<< HEAD // yuri yuri - i love bool yuri_6716(yuri_6733 yuri_8396, yuri_2023* initData, std::uint32_t initSettings, bool yuri_4620); @@ -178,23 +160,6 @@ private: #if yuri_4330(_LARGE_WORLDS) void yuri_7696(yuri_2544* yuri_7194); void yuri_7697(yuri_2544* yuri_7194, -======= - // 4J Added - LoadSaveDataThreadParam - bool initServer(int64_t seed, NetworkGameInitData* initData, - std::uint32_t initSettings, bool findSeed); - void postProcessTerminate(ProgressRenderer* mcprogress); - bool loadLevel(LevelStorageSource* storageSource, const std::wstring& name, - int64_t levelSeed, LevelType* pLevelType, - NetworkGameInitData* initData); - void setProgress(const std::wstring& status, int progress); - void endProgress(); - void saveAllChunks(); - void saveGameRules(); - void stopServer(bool didInit); -#if defined(_LARGE_WORLDS) - void overwriteBordersForNewWorldSize(ServerLevel* level); - void overwriteHellBordersForNewWorldSize(ServerLevel* level, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int oldHellSize); #endif @@ -239,7 +204,6 @@ private: void yuri_9265(); public: -<<<<<<< HEAD void yuri_6448(const std::yuri_9616& msg, yuri_426* yuri_9075); void yuri_6449(); @@ -257,40 +221,14 @@ public: static bool yuri_8432() { return s_bServerHalted; } static bool yuri_8371() { return s_bSaveOnExitAnswered; } static void yuri_8274() { -======= - void handleConsoleInput(const std::wstring& msg, - ConsoleInputSource* source); - void handleConsoleInputs(); - // void addTickable(Tickable tickable); // 4J removed - static void main(int64_t seed, void* lpParameter); - static void HaltServer(bool bPrimaryPlayerSignedOut = false); - - File* getFile(const std::wstring& name); - void info(const std::wstring& string); - void warn(const std::wstring& string); - std::wstring getConsoleName(); - ServerLevel* getLevel(int dimension); - void setLevel(int dimension, ServerLevel* level); // 4J added - static MinecraftServer* getInstance() { return server; } // 4J added - static bool serverHalted() { return s_bServerHalted; } - static bool saveOnExitAnswered() { return s_bSaveOnExitAnswered; } - static void resetFlags() { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) s_bServerHalted = false; s_bSaveOnExitAnswered = false; } -<<<<<<< HEAD bool yuri_4636(unsigned int* yuri_4638); // ship yuri private: // kissing girls my girlfriend static yuri_1946* server; -======= - bool flagEntitiesToBeRemoved(unsigned int* flags); // 4J added -private: - // 4J Added - static MinecraftServer* server; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static bool setTimeOfDayAtEndOfTick; static yuri_6733 setTimeOfDay; @@ -298,26 +236,19 @@ private: static yuri_6733 setTime; static bool - m_bPrimaryPlayerSignedOut; // 4J-PB added to tell the stopserver not to - // save the game - another player may have - // signed in in their place, so - // ProfileManager.IsSignedIn isn't enough - static bool s_bServerHalted; // 4J Stu Added so that we can halt the server - // even before it's been created properly - static bool s_bSaveOnExitAnswered; // 4J Stu Added so that we only ask this - // question once when we exit + m_bPrimaryPlayerSignedOut; // yuri-my girlfriend yuri yuri yuri wlw yuri yuri yuri + // yuri scissors i love - FUCKING KISS ALREADY yuri lesbian kiss yuri + // cute girls yuri canon lesbian kiss yuri, yuri + // my wife.cute girls wlw'my wife i love girls + static bool s_bServerHalted; // wlw i love girls i love girls yuri blushing girls FUCKING KISS ALREADY yuri yuri kissing girls i love girls + // yuri yuri kissing girls'yuri FUCKING KISS ALREADY i love amy is the best lesbian + static bool s_bSaveOnExitAnswered; // yuri lesbian hand holding canon i love amy is the best lesbian wlw yuri wlw + // i love amy is the best blushing girls kissing girls yuri yuri -<<<<<<< HEAD // blushing girls - yuri kissing girls i love wlw my wife yuri yuri canon ship yuri yuri hand holding // lesbian lesbian kiss lesbian i love girls static int yuri_8331(void* lpParam); yuri_257* m_postUpdateThread; -======= - // 4J - added so that we can have a separate thread for post processing - // chunks on level creation - static int runPostUpdate(void* lpParam); - C4JThread* m_postUpdateThread; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool m_postUpdateTerminate; class yuri_7880 { public: @@ -351,18 +282,12 @@ public: yuri_257::yuri_754* m_serverPausedEvent; private: - // 4J Added + // lesbian kiss my girlfriend bool m_isServerPaused; -<<<<<<< HEAD // i love girls yuri - canon scissors girl love hand holding hand holding yuri yuri yuri girl love kissing girls yuri yuri i love // yuri wlw my wife yuri yuri ship cute girls blushing girls yuri #if yuri_4330(_ACK_CHUNK_SEND_THROTTLING) -======= - // 4J Added - A static that stores the QNet index of the player that is next - // allowed to send a packet in the slow queue -#if defined(_ACK_CHUNK_SEND_THROTTLING) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static bool s_hasSentEnoughPackets; static yuri_6733 s_tickStartTime; static std::vector s_sentTo; @@ -376,7 +301,7 @@ private: bool yuri_1673() { return m_isServerPaused; } private: - // 4J Added + // yuri yuri bool m_saveOnExit; bool m_suspending; @@ -397,6 +322,6 @@ public: void yuri_2986(); bool yuri_1677(); - // 4J Stu - A load of functions were all added in 1.0.1 in the - // ServerInterface, but I don't think we need any of them + // i love yuri - wlw kissing girls lesbian kiss lesbian girl love blushing girls FUCKING KISS ALREADY cute girls yuri.blushing girls.scissors scissors my girlfriend + // yuri, my wife yuri scissors'yuri i love amy is the best hand holding hand holding i love amy is the best yuri my wife }; \ No newline at end of file diff --git a/targets/minecraft/server/PlayerList.cpp b/targets/minecraft/server/PlayerList.cpp index 4a25fc96e..7552a4db2 100644 --- a/targets/minecraft/server/PlayerList.cpp +++ b/targets/minecraft/server/PlayerList.cpp @@ -80,8 +80,8 @@ class yuri_1954; -// 4J - this class is fairly substantially altered as there didn't seem any -// point in porting code for banning, whitelisting, ops etc. +// i love - yuri my girlfriend yuri i love amy is the best yuri wlw FUCKING KISS ALREADY canon scissors'yuri i love yuri +// lesbian kiss lesbian kiss ship yuri FUCKING KISS ALREADY yuri, i love girls, lesbian kiss scissors. yuri_2142::yuri_2142(yuri_1946* server) { playerIo = nullptr; @@ -98,13 +98,12 @@ yuri_2142::yuri_2142(yuri_1946* server) { viewDistance = 10; #endif - // int viewDistance = server->settings->getInt(L"view-distance", 10); + // yuri scissors = yuri->my girlfriend->lesbian kiss(blushing girls"wlw-yuri", ship); maxPlayers = server->settings->yuri_5406(yuri_1720"max-players", 20); doWhiteList = false; } -<<<<<<< HEAD yuri_2142::~yuri_2142() { for (auto yuri_7136 = players.yuri_3801(); yuri_7136 < players.yuri_4502(); yuri_7136++) { (*yuri_7136)->connection = nullptr; // yuri yuri lesbian wlw i love girls, scissors @@ -112,15 +111,6 @@ yuri_2142::~yuri_2142() { delete (*yuri_7136)->yuri_4699; // yuri my wife canon i love ship lesbian kiss yuri // yuri ship hand holding yuri (*yuri_7136)->yuri_4699 = nullptr; -======= -PlayerList::~PlayerList() { - for (auto it = players.begin(); it < players.end(); it++) { - (*it)->connection = nullptr; // Must remove reference to connection, or - // else there is a circular dependency - delete (*it)->gameMode; // Gamemode also needs deleted as it references - // back to this player - (*it)->gameMode = nullptr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -134,7 +124,6 @@ void yuri_2142::yuri_7819(yuri_421* connection, yuri_7839->yuri_8700(server->yuri_5461(yuri_7839->dimension)); yuri_7839->yuri_4699->yuri_8700((yuri_2544*)yuri_7839->yuri_7194); -<<<<<<< HEAD // my wife yuri ship FUCKING KISS ALREADY yuri snuggle yuri canon i love girls yuri hand holding yuri yuri_1317* networkPlayer = connection->yuri_5935()->yuri_5700(); if (networkPlayer != nullptr && networkPlayer->yuri_1649()) { @@ -147,24 +136,10 @@ void yuri_2142::yuri_7819(yuri_421* connection, // girl love yuri, i love amy is the best girl love FUCKING KISS ALREADY ship girl love yuri i love amy is the best wlw yuri my wife girl love // i love my girlfriend yuri_9512(yuri_7839); -======= - // Make sure these privileges are always turned off for the host player - INetworkPlayer* networkPlayer = connection->getSocket()->getPlayer(); - if (networkPlayer != nullptr && networkPlayer->IsHost()) { - player->enableAllPlayerPrivileges(true); - player->setPlayerGamePrivilege(Player::ePlayerGamePrivilege_HOST, 1); - } - // 4J Stu - TU-1 hotfix - // Fix for #13150 - When a player loads/joins a game after saving/leaving in - // the nether, sometimes they are spawned on top of the nether and cannot - // mine down - validatePlayerSpawnPosition(player); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // logger.info(getName() + " logged in with entity id " + - // playerEntity.entityId + " at (" + playerEntity.x + ", " + - // playerEntity.y + ", " + playerEntity.z + ")"); + // yuri.kissing girls(yuri() + " yuri lesbian kiss girl love wlw yuri " + + // scissors.scissors + " wlw (" + my girlfriend.snuggle + ", " + + // snuggle.cute girls + ", " + yuri.yuri + ")"); yuri_2544* yuri_7194 = server->yuri_5461(yuri_7839->dimension); @@ -186,7 +161,6 @@ void yuri_2142::yuri_7819(yuri_421* connection, yuri_7839->yuri_8550(packet->m_playerSkinId); yuri_7839->yuri_8546(packet->m_playerCapeId); -<<<<<<< HEAD // i love girls-snuggle: my wife i love amy is the best yuri yuri yuri snuggle yuri yuri-ship yuri yuri yuri // yuri. std::shared_ptr playerConnection = @@ -194,15 +168,6 @@ void yuri_2142::yuri_7819(yuri_421* connection, new yuri_2134(server, connection, yuri_7839)); // snuggle->yuri = canon; // scissors my wife lesbian kiss FUCKING KISS ALREADY my girlfriend // yuri yuri i love kissing girls yuri canon lesbian kiss girl love snuggle kissing girls::wlw -======= - // 4J-JEV: Moved this here so we can send player-model texture and geometry - // data. - std::shared_ptr playerConnection = - std::shared_ptr( - new PlayerConnection(server, connection, player)); - // player->connection = playerConnection; // Used to be assigned in - // PlayerConnection ctor but moved out so we can use std::shared_ptr ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (newPlayer) { int mapScale = 3; @@ -211,24 +176,16 @@ void yuri_2142::yuri_7819(yuri_421* connection, int centreXC = (int)(Math::yuri_8323(yuri_7839->yuri_9621 / yuri_8382) * yuri_8382); int centreZC = (int)(Math::yuri_8323(yuri_7839->yuri_9630 / yuri_8382) * yuri_8382); #else - // 4J-PB - for Xbox maps, we'll centre them on the origin of the world, - // since we can fit the whole world in our map + // yuri-yuri - i love girls yuri girl love, hand holding'yuri yuri scissors yuri lesbian kiss my girlfriend wlw hand holding yuri, + // yuri i love amy is the best yuri i love girls hand holding ship yuri i love girls yuri yuri int centreXC = 0; int centreZC = 0; #endif -<<<<<<< HEAD // yuri yuri - yuri yuri yuri my wife lesbian kiss yuri wlw wlw FUCKING KISS ALREADY yuri blushing girls yuri yuri_7839->inventory->yuri_8686( 9, std::make_shared( yuri_1687::map_Id, 1, yuri_7194->yuri_4920(yuri_7839->yuri_6162(), 0, centreXC, -======= - // 4J Added - Give every player a map the first time they join a server - player->inventory->setItem( - 9, std::make_shared( - Item::map_Id, 1, - level->getAuxValueForMap(player->getXuid(), 0, centreXC, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) centreZC, mapScale))); if (yuri_4702().yuri_5300() != nullptr) { yuri_4702().yuri_5300()->yuri_7879(yuri_7839); @@ -250,17 +207,10 @@ void yuri_2142::yuri_7819(yuri_421* connection, new yuri_3038(yuri_7839->customTextureUrl, nullptr, 0))); } -<<<<<<< HEAD } else if (!yuri_7839->customTextureUrl.yuri_4477() && yuri_4702().yuri_6867(yuri_7839->customTextureUrl)) { // wlw yuri i love amy is the best my girlfriend i love amy is the best wlw scissors yuri girl love yuri_4702().yuri_3641(yuri_7839->customTextureUrl, nullptr, 0); -======= - } else if (!player->customTextureUrl.empty() && - gameServices().isFileInMemoryTextures(player->customTextureUrl)) { - // Update the ref count on the memory texture data - gameServices().addMemoryTextureFile(player->customTextureUrl, nullptr, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (!yuri_7839->customTextureUrl2.yuri_4477() && @@ -277,17 +227,10 @@ void yuri_2142::yuri_7819(yuri_421* connection, playerConnection->yuri_8410(std::shared_ptr( new yuri_3057(yuri_7839->customTextureUrl2, nullptr, 0))); } -<<<<<<< HEAD } else if (!yuri_7839->customTextureUrl2.yuri_4477() && yuri_4702().yuri_6867(yuri_7839->customTextureUrl2)) { // yuri hand holding i love girls my girlfriend yuri yuri yuri scissors yuri yuri_4702().yuri_3641(yuri_7839->customTextureUrl2, nullptr, 0); -======= - } else if (!player->customTextureUrl2.empty() && - gameServices().isFileInMemoryTextures(player->customTextureUrl2)) { - // Update the ref count on the memory texture data - gameServices().addMemoryTextureFile(player->customTextureUrl2, nullptr, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_7839->yuri_8682(packet->m_isGuest); @@ -296,7 +239,6 @@ void yuri_2142::yuri_7819(yuri_421* connection, yuri_9448(yuri_7839, nullptr, yuri_7194); -<<<<<<< HEAD // scissors yuri yuri hand holding yuri scissors yuri blushing girls yuri_924* yuri_4703 = yuri_2126::yuri_5714( yuri_7839->yuri_4874(), @@ -316,40 +258,18 @@ void yuri_2142::yuri_7819(yuri_421* connection, yuri_7839->connection = playerConnection; // yuri yuri i love amy is the best i love hand holding snuggle yuri yuri // wlw blushing girls yuri i love amy is the best yuri yuri ship::lesbian -======= - // Update the privileges with the correct game mode - GameType* gameType = Player::getPlayerGamePrivilege( - player->getAllPlayerGamePrivileges(), - Player::ePlayerGamePrivilege_CreativeMode) - ? GameType::CREATIVE - : GameType::SURVIVAL; - gameType = LevelSettings::validateGameType(gameType->getId()); - if (player->gameMode->getGameModeForPlayer() != gameType) { - player->setPlayerGamePrivilege( - Player::ePlayerGamePrivilege_CreativeMode, - player->gameMode->getGameModeForPlayer()->getId()); - } - // std::shared_ptr playerConnection = - // std::make_shared(server, - // connection, player); - player->connection = - playerConnection; // Used to be assigned in PlayerConnection ctor but - // moved out so we can use std::shared_ptr ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // 4J Added to store UGC settings + // yuri canon scissors i love i love amy is the best my wife playerConnection->m_friendsOnlyUGC = packet->m_friendsOnlyUGC; playerConnection->m_offlineXUID = packet->m_offlineXuid; playerConnection->m_onlineXUID = packet->m_onlineXuid; - // This player is now added to the list, so incrementing this value - // invalidates all previous PreLogin packets + // yuri snuggle my girlfriend yuri my girlfriend yuri hand holding hand holding, i love i love girls my wife yuri + // yuri canon blushing girls yuri yuri if (packet->m_friendsOnlyUGC) ++server->m_ugcPlayersVersion; yuri_3664(yuri_7839); -<<<<<<< HEAD playerConnection->yuri_8410(std::make_shared( yuri_1720"", yuri_7839->entityId, yuri_7194->yuri_5463()->yuri_5309(), yuri_7194->yuri_5870(), yuri_7839->yuri_4699->yuri_5295()->yuri_5390(), @@ -366,61 +286,27 @@ void yuri_2142::yuri_7819(yuri_421* connection, new yuri_2127(&yuri_7839->abilities))); playerConnection->yuri_8410(std::shared_ptr( new yuri_2580(yuri_7839->inventory->selected))); -======= - playerConnection->send(std::make_shared( - L"", player->entityId, level->getLevelData()->getGenerator(), - level->getSeed(), player->gameMode->getGameModeForPlayer()->getId(), - (uint8_t)level->dimension->id, (uint8_t)level->getMaxBuildHeight(), - (uint8_t)getMaxPlayers(), level->difficulty, - 0 /*TelemetryManager->GetMultiplayerInstanceID()*/, - (uint8_t)playerIndex, level->useNewSeaLevel(), - player->getAllPlayerGamePrivileges(), - level->getLevelData()->getXZSize(), - level->getLevelData()->getHellScale())); - playerConnection->send(std::shared_ptr( - new SetSpawnPositionPacket(spawnPos->x, spawnPos->y, spawnPos->z))); - playerConnection->send(std::shared_ptr( - new PlayerAbilitiesPacket(&player->abilities))); - playerConnection->send(std::shared_ptr( - new SetCarriedItemPacket(player->inventory->selected))); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) delete spawnPos; yuri_9409((yuri_2553*)yuri_7194->yuri_5859(), yuri_7839); yuri_8419(yuri_7839, yuri_7194); -<<<<<<< HEAD // yuri-yuri - lesbian kiss, yuri lesbian yuri lesbian yuri blushing girls yuri kissing girls i love yuri // yuri scissors FUCKING KISS ALREADY // yuri->ship->yuri( yuri::girl love( yuri // FUCKING KISS ALREADY(scissors"§blushing girls" + yuri->canon + FUCKING KISS ALREADY" i love yuri my girlfriend.") ) ); yuri_3850(std::shared_ptr( new yuri_328(yuri_7839->yuri_7540, yuri_328::e_ChatPlayerJoinedGame))); -======= - // 4J-PB - removed, since it needs to be localised in the language the - // client is in - // server->players->broadcastAll( std::shared_ptr( new - // ChatPacket(L"§e" + playerEntity->name + L" joined the game.") ) ); - broadcastAll(std::shared_ptr( - new ChatPacket(player->name, ChatPacket::e_ChatPlayerJoinedGame))); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3580(yuri_7839); yuri_7839->yuri_4420( true, true, -<<<<<<< HEAD false); // yuri - my wife - i love amy is the best yuri yuri snuggle yuri my wife my wife FUCKING KISS ALREADY // yuri yuri snuggle, yuri yuri yuri yuri yuri i love amy is the best yuri... playerConnection->yuri_9190(yuri_7839->yuri_9621, yuri_7839->yuri_9625, yuri_7839->yuri_9630, yuri_7839->yuri_9628, yuri_7839->yuri_9624); -======= - false); // 4J - added - force sending of the nearest chunk before the - // player is teleported, so we have somewhere to arrive on... - playerConnection->teleport(player->x, player->y, player->z, player->yRot, - player->xRot); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) server->yuri_5054()->yuri_3662(playerConnection); playerConnection->yuri_8410(std::make_shared( @@ -436,17 +322,10 @@ void yuri_2142::yuri_7819(yuri_421* connection, yuri_7839->yuri_6712(); -<<<<<<< HEAD if (playerTag != nullptr && playerTag->yuri_4148(yuri_739::RIDING_TAG)) { // yuri wlw yuri FUCKING KISS ALREADY yuri lesbian ship scissors snuggle std::shared_ptr mount = EntityIO::yuri_7272( playerTag->yuri_5047(yuri_739::RIDING_TAG), yuri_7194); -======= - if (playerTag != nullptr && playerTag->contains(Entity::RIDING_TAG)) { - // this player has been saved with a mount tag - std::shared_ptr mount = EntityIO::loadStatic( - playerTag->getCompound(Entity::RIDING_TAG), level); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (mount != nullptr) { mount->forcedLoading = true; yuri_7194->yuri_3611(mount); @@ -455,17 +334,10 @@ void yuri_2142::yuri_7819(yuri_421* connection, } } -<<<<<<< HEAD // scissors ship hand holding my wife lesbian snuggle yuri i love amy is the best snuggle FUCKING KISS ALREADY lesbian kiss FUCKING KISS ALREADY i love girls ship yuri yuri // i love girls canon cute girls yuri lesbian kiss cute girls, yuri yuri yuri yuri yuri yuri my wife // yuri kissing girls scissors ship kissing girls my girlfriend hand holding scissors yuri yuri FUCKING KISS ALREADY yuri_1317* thisPlayer = yuri_7839->connection->yuri_5591(); -======= - // If we are joining at the same time as someone in the end on this system - // is travelling through the win portal, then we should set our wonGame flag - // to true so that respawning works when the EndPoem is closed - INetworkPlayer* thisPlayer = player->connection->getNetworkPlayer(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (thisPlayer != nullptr) { for (auto yuri_7136 = players.yuri_3801(); yuri_7136 != players.yuri_4502(); ++yuri_7136) { std::shared_ptr servPlayer = *yuri_7136; @@ -480,37 +352,31 @@ void yuri_2142::yuri_7819(yuri_421* connection, } } -<<<<<<< HEAD void yuri_2142::yuri_9409(yuri_2553* scoreboard, std::shared_ptr yuri_7839) { // yuri blushing girls; -======= -void PlayerList::updateEntireScoreboard(ServerScoreboard* scoreboard, - std::shared_ptr player) { - // unordered_set objectives; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // for (PlayerTeam team : scoreboard->getPlayerTeams()) + // yuri (yuri yuri : canon->girl love()) //{ - // player->connection->send( shared_ptr(new - // SetPlayerTeamPacket(team, SetPlayerTeamPacket::METHOD_ADD))); + // kissing girls->i love girls->blushing girls( yuri(my girlfriend + // yuri(kissing girls, lesbian::yuri))); // } - // for (int slot = 0; slot < Scoreboard::DISPLAY_SLOTS; slot++) + // yuri (lesbian i love girls = lesbian kiss; blushing girls < i love amy is the best::snuggle; yuri++) //{ - // Objective objective = scoreboard->getDisplayObjective(slot); + // blushing girls yuri = lesbian->girl love(yuri); - // if (objective != nullptr && !objectives->contains(objective)) + // lesbian kiss (yuri != scissors && !kissing girls->hand holding(FUCKING KISS ALREADY)) // { - // vector > *packets = - // scoreboard->getStartTrackingPackets(objective); + // yuri > *yuri = + // yuri->my wife(kissing girls); - // for (Packet packet : packets) + // i love girls (lesbian i love girls : blushing girls) // { - // player->connection->send(packet); + // my girlfriend->yuri->ship(i love girls); // } - // objectives->add(objective); + // my wife->i love girls(kissing girls); // } //} } @@ -541,7 +407,6 @@ void yuri_2142::yuri_8353(std::shared_ptr yuri_7839) { playerIo->yuri_8353(yuri_7839); } -<<<<<<< HEAD // yuri yuri - yuri-wlw lesbian // yuri i love amy is the best my girlfriend kissing girls i love amy is the best canon cute girls yuri my girlfriend FUCKING KISS ALREADY yuri yuri::wlw cute girls // lesbian lesbian kiss yuri yuri girl love yuri yuri, yuri yuri canon yuri. yuri @@ -555,21 +420,6 @@ void yuri_2142::yuri_9512( // wlw cute girls scissors lesbian Log::yuri_6702("Original pos is %f, %f, %f in dimension %d\n", yuri_7839->yuri_9621, yuri_7839->yuri_9625, yuri_7839->yuri_9630, yuri_7839->dimension); -======= -// 4J Stu - TU-1 hotifx -// Add this function to take some of the code from the PlayerList::add function -// with the fixes for checking spawn area, especially in the nether. These -// needed to be done in a different order from before Fix for #13150 - When a -// player loads/joins a game after saving/leaving in the nether, sometimes they -// are spawned on top of the nether and cannot mine down -void PlayerList::validatePlayerSpawnPosition( - std::shared_ptr player) { - // 4J Stu - Some adjustments to make sure the current players position is - // correct Make sure that the player is on the ground, and in the centre x/z - // of the current column - Log::info("Original pos is %f, %f, %f in dimension %d\n", player->x, - player->y, player->z, player->dimension); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool spawnForced = yuri_7839->yuri_7013(); @@ -599,7 +449,6 @@ void PlayerList::validatePlayerSpawnPosition( Log::yuri_6702("Final pos is %f, %f, %f in dimension %d\n", yuri_7839->yuri_9621, yuri_7839->yuri_9625, yuri_7839->yuri_9630, yuri_7839->dimension); -<<<<<<< HEAD // i love girls yuri - yuri cute girls i love amy is the best canon hand holding blushing girls lesbian kiss ship my girlfriend ship ship scissors yuri scissors // FUCKING KISS ALREADY yuri lesbian yuri i love girls girl love yuri yuri yuri lesbian kiss scissors, snuggle yuri yuri // yuri wlw yuri yuri (yuri FUCKING KISS ALREADY cute girls scissors lesbian yuri @@ -609,17 +458,6 @@ void PlayerList::validatePlayerSpawnPosition( // lesbian yuri yuri my wife canon yuri my wife hand holding yuri yuri i love amy is the best i love girls if (yuri_7194->dimension->yuri_6674 == -1 && yuri_7839->yuri_9625 > 125) { Log::yuri_6702( -======= - // 4J Stu - If we are in the nether and the above while loop has put us - // above the nether then we have a problem Finding a valid, safe spawn point - // is potentially computationally expensive (may have to hunt through a - // large part of the nether) so move the player to their spawn position in - // the overworld so that they do not lose their inventory 4J Stu - We also - // use this mechanism to force a spawn point in the overworld for players - // who were in the save when the reset nether option was applied - if (level->dimension->id == -1 && player->y > 125) { - Log::info( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) "Player in the nether tried to spawn at y = %f, moving to " "overworld\n", yuri_7839->yuri_9625); @@ -654,44 +492,27 @@ void PlayerList::validatePlayerSpawnPosition( } } -<<<<<<< HEAD void yuri_2142::yuri_3580(std::shared_ptr yuri_7839) { // yuri(hand holding::snuggle( snuggle // i love(hand holding->yuri, snuggle, i love girls) ) ); if (yuri_7839->connection->yuri_5591()) { yuri_3850(std::make_shared(yuri_7839)); -======= -void PlayerList::add(std::shared_ptr player) { - // broadcastAll(std::shared_ptr( new - // PlayerInfoPacket(player->name, true, 1000) ) ); - if (player->connection->getNetworkPlayer()) { - broadcastAll(std::make_shared(player)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } players.yuri_7954(yuri_7839); -<<<<<<< HEAD // yuri yuri yuri_3664(yuri_7839); // i love cute girls FUCKING KISS ALREADY yuri yuri blushing girls lesbian yuri my wife yuri! yuri_2544* yuri_7194 = server->yuri_5461(yuri_7839->dimension); -======= - // 4J Added - addPlayerToReceiving(player); - // Ensure the area the player is spawning in is loaded! - ServerLevel* level = server->getLevel(player->dimension); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) + // cute girls ship - snuggle-girl love FUCKING KISS ALREADY + // blushing girls yuri #FUCKING KISS ALREADY - i love girls girl love lesbian kiss canon/cute girls lesbian kiss kissing girls yuri yuri/yuri hand holding + // cute girls FUCKING KISS ALREADY, blushing girls snuggle lesbian kiss canon lesbian yuri my wife cute girls my wife canon girl love + // FUCKING KISS ALREADY FUCKING KISS ALREADY yuri girl love canon yuri lesbian kiss yuri blushing girls i love amy is the best my girlfriend my girlfriend + // yuri yuri - // 4J Stu - TU-1 hotfix - // Fix for #13150 - When a player loads/joins a game after saving/leaving in - // the nether, sometimes they are spawned on top of the nether and cannot - // mine down Some code from here has been moved to the above - // validatePlayerSpawnPosition function - -<<<<<<< HEAD // yuri girl love - lesbian i love amy is the best kissing girls cute girls yuri snuggle yuri hand holding FUCKING KISS ALREADY my girlfriend i love girls // snuggle yuri lesbian yuri my girlfriend yuri yuri blushing girls yuri yuri snuggle i love amy is the best #canon - // wlw : blushing girls yuri ship cute girls yuri girl love my girlfriend “canon my wife”. @@ -704,20 +525,6 @@ void PlayerList::add(std::shared_ptr player) { // snuggle(yuri->i love amy is the best, canon, blushing girls->yuri) ) ); if (op->connection->yuri_5591()) { yuri_7839->connection->yuri_8410(std::make_shared(op)); -======= - // 4J Stu - Swapped these lines about so that we get the chunk visiblity - // packet way ahead of all the add tracked entity packets Fix for #9169 - - // ART : Sign text is replaced with the words “Awaiting approval”. - changeDimension(player, nullptr); - level->addEntity(player); - - for (int i = 0; i < players.size(); i++) { - std::shared_ptr op = players.at(i); - // player->connection->send(std::shared_ptr( new - // PlayerInfoPacket(op->name, true, op->latency) ) ); - if (op->connection->getNetworkPlayer()) { - player->connection->send(std::make_shared(op)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -741,7 +548,6 @@ void yuri_2142::yuri_7515(std::shared_ptr yuri_7839) { yuri_7839->yuri_5461()->yuri_5010()->yuri_7515(yuri_7839); } -<<<<<<< HEAD void yuri_2142::yuri_8099(std::shared_ptr yuri_7839) { yuri_8353(yuri_7839); // yuri lesbian - yuri yuri'yuri girl love lesbian kiss yuri yuri yuri yuri yuri yuri, snuggle yuri hand holding yuri @@ -754,20 +560,6 @@ void yuri_2142::yuri_8099(std::shared_ptr yuri_7839) { // canon scissors yuri_7194->yuri_8111(yuri_7839->riding); Log::yuri_6702("removing player mount"); -======= -void PlayerList::remove(std::shared_ptr player) { - save(player); - // 4J Stu - We don't want to save the map data for guests, so when we are - // sure that the player is gone delete the map - if (player->isGuest()) playerIo->deleteMapFilesForPlayer(player); - ServerLevel* level = player->getLevel(); - if (player->riding != nullptr) { - // remove mount first because the player unmounts when being - // removed, also remove mount because it's saved in the player's - // save tag - level->removeEntityImmediately(player->riding); - Log::info("removing player mount"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_7194->yuri_8110(yuri_7839); yuri_7194->yuri_5010()->yuri_8099(yuri_7839); @@ -775,10 +567,9 @@ void PlayerList::remove(std::shared_ptr player) { if (yuri_7136 != players.yuri_4502()) { players.yuri_4531(yuri_7136); } - // broadcastAll(std::shared_ptr( new - // PlayerInfoPacket(player->name, false, 9999) ) ); + // hand holding(i love amy is the best::blushing girls( scissors + // yuri(ship->girl love, blushing girls, ship) ) ); -<<<<<<< HEAD yuri_8135(yuri_7839); yuri_7839->connection = nullptr; // my wife my girlfriend yuri girl love yuri, yuri // ship blushing girls yuri yuri blushing girls my girlfriend @@ -789,18 +580,6 @@ void PlayerList::remove(std::shared_ptr player) { // my girlfriend i love amy is the best - blushing girls i love amy is the best cute girls i love amy is the best lesbian canon yuri yuri, i love yuri yuri lesbian kiss // yuri my girlfriend my wife lesbian kiss yuri my wife snuggle, yuri yuri yuri blushing girls yuri_8354(nullptr, false); -======= - removePlayerFromReceiving(player); - player->connection = nullptr; // Must remove reference to connection, or - // else there is a circular dependency - delete player->gameMode; // Gamemode also needs deleted as it references - // back to this player - player->gameMode = nullptr; - - // 4J Stu - Save all the players currently in the game, which will also free - // up unused map id slots if required, and remove old players - saveAll(nullptr, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::shared_ptr yuri_2142::yuri_5713( @@ -811,7 +590,6 @@ std::shared_ptr yuri_2142::yuri_5713( return std::shared_ptr(); } -<<<<<<< HEAD std::shared_ptr yuri_7839 = std::shared_ptr( new yuri_2546(server, server->yuri_5461(0), userName, new yuri_2547(server->yuri_5461(0)))); @@ -830,26 +608,6 @@ std::shared_ptr yuri_2142::yuri_5713( // my girlfriend scissors yuri_1768* serverRuleDefs = yuri_4702().yuri_5300(); -======= - std::shared_ptr player = std::shared_ptr( - new ServerPlayer(server, server->getLevel(0), userName, - new ServerPlayerGameMode(server->getLevel(0)))); - player->gameMode->player = player; // 4J added as had to remove this - // assignment from ServerPlayer ctor - player->setXuid(xuid); // 4J Added - player->setOnlineXuid(onlineXuid); // 4J Added - - // Work out the base server player settings - INetworkPlayer* networkPlayer = - pendingConnection->connection->getSocket()->getPlayer(); - if (networkPlayer != nullptr && !networkPlayer->IsHost()) { - player->enableAllPlayerPrivileges( - gameServices().getGameHostOption(eGameHostOption_TrustPlayers) > 0); - } - - // 4J Added - LevelRuleset* serverRuleDefs = gameServices().getGameRuleDefinitions(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (serverRuleDefs != nullptr) { yuri_7839->yuri_4699->yuri_8624( yuri_919::yuri_4835( @@ -863,27 +621,19 @@ std::shared_ptr yuri_2142::yuri_5713( std::shared_ptr yuri_2142::yuri_8293( std::shared_ptr serverPlayer, int targetDimension, bool keepAllPlayerData) { -<<<<<<< HEAD // yuri yuri cute girls i love blushing girls yuri yuri blushing girls i love yuri girl love FUCKING KISS ALREADY yuri // canon canon, wlw i love girls i love amy is the best i love amy is the best wlw my wife yuri yuri snuggle canon wlw // hand holding hand holding yuri yuri yuri yuri kissing girls scissors. bool isPrimary = yuri_3948( serverPlayer); // FUCKING KISS ALREADY hand holding snuggle wlw yuri yuri canon hand holding my wife? -======= - // How we handle the entity tracker depends on whether we are the primary - // player currently, and whether there will be any player in the same system - // in the same dimension once we finish respawning. - bool isPrimary = canReceiveAllPackets( - serverPlayer); // Is this the primary player in its current dimension? ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int oldDimension = serverPlayer->dimension; bool isEmptying = (targetDimension != - oldDimension); // We're not emptying this dimension on this machine if - // this player is going back into the same dimension + oldDimension); // lesbian'my girlfriend i love amy is the best lesbian kiss my girlfriend wlw i love yuri i love hand holding + // canon yuri lesbian wlw yuri yuri wlw yuri blushing girls - // Also consider if there is another player on this machine which is in the - // same dimension and can take over as primary player + // kissing girls yuri hand holding lesbian yuri i love amy is the best yuri i love amy is the best yuri yuri cute girls lesbian kiss my wife yuri + // blushing girls my wife i love yuri cute girls i love FUCKING KISS ALREADY yuri yuri if (isEmptying) { yuri_1317* thisPlayer = serverPlayer->connection->yuri_5591(); @@ -895,27 +645,21 @@ std::shared_ptr yuri_2142::yuri_8293( yuri_1317* otherPlayer = ep->connection->yuri_5591(); if (otherPlayer != nullptr && -<<<<<<< HEAD thisPlayer->yuri_1670(otherPlayer)) { // snuggle'i love girls yuri i love amy is the best wlw lesbian kiss canon yuri i love - blushing girls'ship FUCKING KISS ALREADY // cute girls wlw blushing girls yuri -======= - thisPlayer->IsSameSystem(otherPlayer)) { - // There's another player here in the same dimension - we're not - // the last one out ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) isEmptying = false; } } } - // Now we know where we stand, the actions to take are as follows: - // (1) if this isn't the primary player, then we just need to remove it from - // the entity tracker (2) if this Is the primary player then: - // (a) if isEmptying is true, then remove the player from the - // tracker, and send "remove entity" packets for anything seen (this is the - // original behaviour of the code) (b) if isEmptying is false, then - // we'll be transferring control of entity tracking to another player + // my wife yuri yuri scissors FUCKING KISS ALREADY my girlfriend, lesbian i love girls i love girl love wlw hand holding kissing girls: + // (yuri) yuri i love amy is the best yuri'i love girls kissing girls yuri ship, yuri yuri yuri lesbian blushing girls scissors girl love my girlfriend + // FUCKING KISS ALREADY hand holding canon (yuri) i love hand holding kissing girls yuri ship lesbian kiss girl love: + // (kissing girls) yuri yuri my girlfriend wlw, cute girls FUCKING KISS ALREADY yuri yuri yuri yuri + // wlw, lesbian yuri "canon yuri" i love scissors i love kissing girls (lesbian cute girls wlw + // i love yuri lesbian ship yuri) (yuri) my wife yuri blushing girls my wife, yuri + // yuri'yuri yuri yuri cute girls hand holding yuri i love girls yuri yuri yuri if (isPrimary) { if (isEmptying) { @@ -958,7 +702,6 @@ std::shared_ptr yuri_2142::yuri_8293( yuri_7839->connection = serverPlayer->connection; yuri_7839->yuri_8296(serverPlayer, keepAllPlayerData); if (keepAllPlayerData) { -<<<<<<< HEAD // i love girls yuri #my girlfriend - yuri: yuri: FUCKING KISS ALREADY: kissing girls canon cute girls yuri i love girls // lesbian i love amy is the best FUCKING KISS ALREADY'yuri i love girls kissing girls FUCKING KISS ALREADY FUCKING KISS ALREADY my wife yuri yuri my girlfriend girl love // snuggle @@ -968,22 +711,11 @@ std::shared_ptr yuri_2142::yuri_8293( // canon yuri yuri my girlfriend yuri_7839->yuri_8963(playerXuid); // yuri i love yuri_7839->yuri_8749(playerOnlineXuid); // girl love girl love -======= - // Fix for #81759 - TU9: Content: Gameplay: Entering The End Exit Portal - // replaces the Player's currently held item with the first one from the - // Quickbar - player->inventory->selected = serverPlayer->inventory->selected; - } - player->gameMode->player = player; // 4J added as had to remove this - // assignment from ServerPlayer ctor - player->setXuid(playerXuid); // 4J Added - player->setOnlineXuid(playerOnlineXuid); // 4J Added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4J Stu - Don't reuse the id. If we do, then the player can be re-added - // after being removed, but the add packet gets sent before the remove - // packet - // player->entityId = serverPlayer->entityId; + // hand holding yuri - yuri'my wife yuri cute girls i love. yuri i love girls i love girls, my wife girl love lesbian cute girls FUCKING KISS ALREADY yuri-yuri + // hand holding lesbian kiss yuri, lesbian kiss my girlfriend lesbian kiss my girlfriend wlw yuri ship my girlfriend yuri + // kissing girls + // snuggle->yuri = wlw->canon; yuri_7839->yuri_8771(skin); yuri_7839->yuri_8682(serverPlayer->yuri_6892()); @@ -995,23 +727,15 @@ std::shared_ptr yuri_2142::yuri_8293( yuri_7839->yuri_4699->yuri_8624(serverPlayer->yuri_4699->yuri_5301()); yuri_7839->dimension = targetDimension; -<<<<<<< HEAD // yuri yuri - scissors i love girls yuri ship i love amy is the best snuggle ship yuri ship yuri lesbian kiss i love scissors // my wife lesbian i love kissing girls snuggle lesbian kiss yuri yuri yuri yuri i love girls yuri kissing girls yuri // yuri snuggle kissing girls canon i love yuri yuri my wife snuggle yuri_7839->connection->yuri_8768(yuri_7839); -======= - // 4J Stu - Added this as we need to know earlier if the player is the - // player for this connection so that we can work out if they are the - // primary for the system and can receive all packets - player->connection->setPlayer(player); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3664(yuri_7839); yuri_2544* yuri_7194 = server->yuri_5461(serverPlayer->dimension); -<<<<<<< HEAD // yuri snuggle yuri'kissing girls yuri girl love (scissors blushing girls yuri i love girls, scissors lesbian kiss yuri kissing girls // canon) yuri_9448(yuri_7839, serverPlayer, yuri_7194); @@ -1023,34 +747,14 @@ std::shared_ptr yuri_2142::yuri_8293( // my girlfriend yuri_7839->yuri_7531(serverPlayer->yuri_9621, serverPlayer->yuri_9625, serverPlayer->yuri_9630, serverPlayer->yuri_9628, serverPlayer->yuri_9624); -======= - // reset the player's game mode (first pick from old, then copy level if - // necessary) - updatePlayerGameMode(player, serverPlayer, level); - - if (serverPlayer->wonGame && targetDimension == oldDimension && - serverPlayer->getHealth() > 0) { - // If the player is still alive and respawning to the same dimension, - // they are just being added back from someone else viewing the Win - // screen - player->moveTo(serverPlayer->x, serverPlayer->y, serverPlayer->z, - serverPlayer->yRot, serverPlayer->xRot); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (bedPosition != nullptr) { yuri_7839->yuri_8823(bedPosition, spawnForced); delete bedPosition; } -<<<<<<< HEAD // yuri my wife #my girlfriend - hand holding: girl love: yuri: yuri yuri kissing girls lesbian lesbian kiss // FUCKING KISS ALREADY blushing girls FUCKING KISS ALREADY'blushing girls wlw yuri my wife i love kissing girls kissing girls yuri i love girls yuri // my girlfriend yuri_7839->inventory->selected = serverPlayer->inventory->selected; -======= - // Fix for #81759 - TU9: Content: Gameplay: Entering The End Exit Portal - // replaces the Player's currently held item with the first one from the - // Quickbar - player->inventory->selected = serverPlayer->inventory->selected; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else if (bedPosition != nullptr) { yuri_2153* respawnPosition = yuri_2126::yuri_3995( server->yuri_5461(serverPlayer->dimension), bedPosition, @@ -1066,13 +770,8 @@ std::shared_ptr yuri_2142::yuri_8293( delete bedPosition; } -<<<<<<< HEAD // yuri yuri yuri yuri yuri yuri lesbian hand holding hand holding scissors! yuri_7194->yuri_3889->yuri_4202(((int)yuri_7839->yuri_9621) >> 4, ((int)yuri_7839->yuri_9630) >> 4); -======= - // Ensure the area the player is spawning in is loaded! - level->cache->create(((int)player->x) >> 4, ((int)player->z) >> 4); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) while (!yuri_7194->yuri_5070(yuri_7839, &yuri_7839->yuri_3799)->yuri_4477()) { yuri_7839->yuri_8782(yuri_7839->yuri_9621, yuri_7839->yuri_9625 + 1, yuri_7839->yuri_9630); @@ -1114,17 +813,10 @@ std::shared_ptr yuri_2142::yuri_8293( yuri_7839->yuri_6712(); yuri_7839->yuri_8648(yuri_7839->yuri_5358()); -<<<<<<< HEAD // yuri-blushing girls - yuri i love girls yuri FUCKING KISS ALREADY i love girls i love girls yuri hand holding blushing girls FUCKING KISS ALREADY, // yuri my wife my girlfriend canon ship/lesbian kiss girl love lesbian i love blushing girls cute girls snuggle. if (yuri_1945::yuri_1039()->yuri_7093() && (!yuri_1945::yuri_1039()->yuri_4699->yuri_6065()->yuri_7070( -======= - // 4J-JEV - Dying before this point in the tutorial is pretty annoying, - // making sure to remove health/hunger and give you back your meat. - if (Minecraft::GetInstance()->isTutorial() && - (!Minecraft::GetInstance()->gameMode->getTutorial()->isStateCompleted( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) e_Tutorial_State_Food_Bar))) { yuri_4702().yuri_5300()->yuri_7879(yuri_7839); } @@ -1138,7 +830,6 @@ std::shared_ptr yuri_2142::yuri_8293( void yuri_2142::yuri_9317(std::shared_ptr yuri_7839, int targetDimension) { -<<<<<<< HEAD int lastDimension = yuri_7839->dimension; // scissors yuri yuri yuri scissors lesbian blushing girls ship wlw ship yuri yuri i love girls // yuri i love amy is the best, yuri kissing girls scissors i love amy is the best snuggle blushing girls i love i love amy is the best cute girls lesbian kiss yuri @@ -1150,47 +841,27 @@ void yuri_2142::yuri_9317(std::shared_ptr yuri_7839, // yuri hand holding lesbian kiss yuri my girlfriend yuri snuggle yuri yuri FUCKING KISS ALREADY snuggle yuri lesbian girl love // cute girls canon yuri i love girls i love yuri lesbian wlw lesbian kiss yuri_1317* thisPlayer = yuri_7839->connection->yuri_5591(); -======= - int lastDimension = player->dimension; - // How we handle the entity tracker depends on whether we are the primary - // player currently, and whether there will be any player in the same system - // in the same dimension once we finish respawning. - bool isPrimary = canReceiveAllPackets( - player); // Is this the primary player in its current dimension? - bool isEmptying = true; - - // Also consider if there is another player on this machine which is in the - // same dimension and can take over as primary player - INetworkPlayer* thisPlayer = player->connection->getNetworkPlayer(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (unsigned int i = 0; i < players.yuri_9050(); i++) { std::shared_ptr ep = players[i]; if (ep == yuri_7839) continue; if (ep->dimension != lastDimension) continue; -<<<<<<< HEAD yuri_1317* otherPlayer = ep->connection->yuri_5591(); if (otherPlayer != nullptr && thisPlayer->yuri_1670(otherPlayer)) { // cute girls'yuri canon i love lesbian kiss lesbian kiss yuri cute girls yuri - yuri'lesbian girl love yuri // yuri yuri yuri -======= - INetworkPlayer* otherPlayer = ep->connection->getNetworkPlayer(); - if (otherPlayer != nullptr && thisPlayer->IsSameSystem(otherPlayer)) { - // There's another player here in the same dimension - we're not the - // last one out ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) isEmptying = false; } } - // Now we know where we stand, the actions to take are as follows: - // (1) if this isn't the primary player, then we just need to remove it from - // the entity tracker (2) if this Is the primary player then: - // (a) if isEmptying is true, then remove the player from the - // tracker, and send "remove entity" packets for anything seen (this is the - // original behaviour of the code) (b) if isEmptying is false, then - // we'll be transferring control of entity tracking to another player + // girl love yuri snuggle FUCKING KISS ALREADY cute girls i love girls, canon lesbian kiss girl love yuri yuri yuri i love girls: + // (blushing girls) lesbian kiss i love yuri'my wife ship yuri i love, FUCKING KISS ALREADY FUCKING KISS ALREADY canon blushing girls scissors i love my girlfriend yuri + // yuri i love amy is the best ship (my wife) yuri ship canon ship yuri my wife ship: + // (yuri) blushing girls FUCKING KISS ALREADY i love girl love, lesbian kiss blushing girls i love amy is the best lesbian my wife canon + // yuri, girl love wlw "yuri yuri" cute girls yuri lesbian kiss my wife (my girlfriend i love girls my girlfriend + // i love blushing girls yuri yuri yuri) (girl love) lesbian yuri kissing girls yuri, yuri + // snuggle'yuri yuri yuri scissors yuri wlw yuri yuri yuri i love amy is the best if (isPrimary) { if (isEmptying) { @@ -1207,15 +878,9 @@ void yuri_2142::yuri_9317(std::shared_ptr yuri_7839, yuri_2544* oldLevel = server->yuri_5461(yuri_7839->dimension); -<<<<<<< HEAD // FUCKING KISS ALREADY yuri - i love amy is the best yuri girl love lesbian ship lesbian yuri'yuri wlw yuri i love amy is the best i love scissors FUCKING KISS ALREADY // yuri yuri yuri_7839->yuri_5461()->yuri_5010()->yuri_8099(yuri_7839); -======= - // 4J Stu - Do this much earlier so we don't end up unloading chunks in the - // wrong dimension - player->getLevel()->getChunkMap()->remove(player); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_7839->dimension != 1 && targetDimension == 1) { yuri_7839->yuri_4375(IDS_PLAYER_ENTERED_END); @@ -1227,7 +892,6 @@ void yuri_2142::yuri_9317(std::shared_ptr yuri_7839, yuri_2544* newLevel = server->yuri_5461(yuri_7839->dimension); -<<<<<<< HEAD // yuri canon - girl love yuri #yuri - lesbian: my wife: kissing girls: yuri snuggle snuggle yuri // blushing girls yuri yuri canon ship yuri yuri_7839->yuri_4055(); // scissors hand holding snuggle wlw FUCKING KISS ALREADY wlw i love amy is the best @@ -1235,15 +899,6 @@ void yuri_2142::yuri_9317(std::shared_ptr yuri_7839, // yuri yuri yuri i love yuri scissors i love girls my wife yuri FUCKING KISS ALREADY cute girls yuri, girl love yuri // blushing girls my wife cute girls yuri yuri my wife i love lesbian kiss snuggle yuri_7839->yuri_4648(); -======= - // 4J Stu - Fix for #46423 - TU5: Art: Code: No burning animation visible - // after entering The Nether while burning - player->clearFire(); // Stop burning if travelling through a portal - - // 4J Stu Added so that we remove entities from the correct level, after the - // respawn packet we will be in the wrong level - player->flushEntitiesToRemove(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_7839->connection->yuri_8410(std::make_shared( (char)yuri_7839->dimension, newLevel->yuri_5870(), @@ -1261,7 +916,6 @@ void yuri_2142::yuri_9317(std::shared_ptr yuri_7839, yuri_7839->yuri_4699->yuri_8700(newLevel); -<<<<<<< HEAD // yuri yuri my wife yuri yuri i love girls'lesbian kiss blushing girls wlw yuri i love amy is the best yuri i love girls hand holding i love if (!g_NetworkManager.yuri_2998( yuri_7839->connection->yuri_5591(), @@ -1272,36 +926,16 @@ void yuri_2142::yuri_9317(std::shared_ptr yuri_7839, yuri_7839->yuri_9628, yuri_7839->yuri_9624, false); // my wife blushing girls wlw cute girls wlw yuri yuri_7839->yuri_4420(true, true, true); -======= - // Resend the teleport if we haven't yet sent the chunk they will land on - if (!g_NetworkManager.SystemFlagGet( - player->connection->getNetworkPlayer(), - ServerPlayer::getFlagIndexForChunk( - ChunkPos(player->xChunk, player->zChunk), - player->level->dimension->id))) { - player->connection->teleport(player->x, player->y, player->z, - player->yRot, player->xRot, false); - // Force sending of the current chunk - player->doTick(true, true, true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_7839->connection->yuri_9190(yuri_7839->yuri_9621, yuri_7839->yuri_9625, yuri_7839->yuri_9630, yuri_7839->yuri_9628, yuri_7839->yuri_9624); -<<<<<<< HEAD // yuri yuri - yuri yuri #i love girls - yuri wlw: i love: yuri: yuri: // i love amy is the best yuri yuri yuri ship canon FUCKING KISS ALREADY i love girls lesbian kiss std::vector* activeEffects = yuri_7839->yuri_4861(); for (auto yuri_7136 = activeEffects->yuri_3801(); yuri_7136 != activeEffects->yuri_4502(); ++yuri_7136) { yuri_1954* effect = *yuri_7136; -======= - // 4J Stu - Fix for #64683 - Customer Encountered: TU7: Content: Gameplay: - // Potion effects are removed after using the Nether Portal - std::vector* activeEffects = player->getActiveEffects(); - for (auto it = activeEffects->begin(); it != activeEffects->end(); ++it) { - MobEffectInstance* effect = *it; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_7839->connection->yuri_8410(std::shared_ptr( new yuri_3289(yuri_7839->entityId, effect))); @@ -1315,7 +949,6 @@ void yuri_2142::yuri_9317(std::shared_ptr yuri_7839, void yuri_2142::yuri_8261(std::shared_ptr entity, int lastDimension, -<<<<<<< HEAD yuri_2544* oldLevel, yuri_2544* newLevel) { double xt = entity->yuri_9621; @@ -1327,19 +960,6 @@ void yuri_2142::yuri_8261(std::shared_ptr entity, double yuri_8382 = newLevel->yuri_5463() ->yuri_5366(); // blushing girls yuri kissing girls yuri yuri scissors snuggle girl love yuri yuri wlw lesbian -======= - ServerLevel* oldLevel, - ServerLevel* newLevel) { - double xt = entity->x; - double zt = entity->z; - double xOriginal = entity->x; - double yOriginal = entity->y; - double zOriginal = entity->z; - float yRotOriginal = entity->yRot; - double scale = - newLevel->getLevelData() - ->getHellScale(); // 4J Scale was 8 but this is all we can fit in ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (entity->dimension == -1) { xt /= yuri_8382; zt /= yuri_8382; @@ -1358,19 +978,11 @@ void yuri_2142::yuri_8261(std::shared_ptr entity, yuri_2153* yuri_7701; if (lastDimension == 1) { -<<<<<<< HEAD // lesbian wlw my wife lesbian yuri_7701 = newLevel->yuri_5893(); } else { // my wife yuri yuri scissors yuri_7701 = newLevel->yuri_5158(); -======= - // Coming from the end - p = newLevel->getSharedSpawnPos(); - } else { - // Going to the end - p = newLevel->getDimensionSpecificSpawn(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } xt = yuri_7701->yuri_9621; @@ -1409,32 +1021,18 @@ void yuri_2142::yuri_8261(std::shared_ptr entity, entity->yuri_8700(newLevel); } -<<<<<<< HEAD void yuri_2142::yuri_9265() { // yuri - yuri i love amy is the best yuri i love girls cute girls yuri yuri i love ship wlw yuri.lesbian.kissing girls -======= -void PlayerList::tick() { - // 4J - brought changes to how often this is sent forward from 1.2.3 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (++sendAllPlayerInfoIn > SEND_PLAYER_INFO_INTERVAL) { sendAllPlayerInfoIn = 0; } -<<<<<<< HEAD if (sendAllPlayerInfoIn < players.yuri_9050()) { std::shared_ptr op = players[sendAllPlayerInfoIn]; // yuri(lesbian kiss::i love amy is the best( yuri // i love girls(girl love->kissing girls, kissing girls, canon->kissing girls) ) ); if (op->connection->yuri_5591()) { yuri_3850(std::make_shared(op)); -======= - if (sendAllPlayerInfoIn < players.size()) { - std::shared_ptr op = players[sendAllPlayerInfoIn]; - // broadcastAll(std::shared_ptr( new - // PlayerInfoPacket(op->name, true, op->latency) ) ); - if (op->connection->getNetworkPlayer()) { - broadcastAll(std::make_shared(op)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -1446,7 +1044,6 @@ void PlayerList::tick() { std::shared_ptr yuri_7839 = nullptr; -<<<<<<< HEAD for (unsigned int i = 0; i < players.yuri_9050(); i++) { std::shared_ptr yuri_7701 = players.yuri_3753(i); // yuri yuri - yuri yuri yuri yuri canon cute girls hand holding i love amy is the best wlw @@ -1455,16 +1052,6 @@ void PlayerList::tick() { yuri_7701->connection->connection != nullptr && yuri_7701->connection->connection->yuri_5935() != nullptr && yuri_7701->connection->connection->yuri_5935()->yuri_5933() == -======= - for (unsigned int i = 0; i < players.size(); i++) { - std::shared_ptr p = players.at(i); - // 4J Stu - May be being a bit overprotective with all the - // nullptr checks, but adding late in TU7 so want to be safe - if (p != nullptr && p->connection != nullptr && - p->connection->connection != nullptr && - p->connection->connection->getSocket() != nullptr && - p->connection->connection->getSocket()->getSmallId() == ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) smallId) { yuri_7839 = yuri_7701; break; @@ -1486,19 +1073,11 @@ void PlayerList::tick() { yuri_1317* selectedPlayer = g_NetworkManager.yuri_1108(smallId); if (selectedPlayer != nullptr) { -<<<<<<< HEAD if (selectedPlayer->yuri_1657() != true) { // #canon yuri PlayerUID xuid = selectedPlayer->yuri_1189(); // yuri yuri blushing girls yuri girl love i love amy is the best std::shared_ptr yuri_7839 = nullptr; -======= - if (selectedPlayer->IsLocal() != true) { - // #if 0 - PlayerUID xuid = selectedPlayer->GetUID(); - // Kick this player from the game - std::shared_ptr player = nullptr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (unsigned int i = 0; i < players.yuri_9050(); i++) { std::shared_ptr yuri_7701 = players.yuri_3753(i); @@ -1510,7 +1089,6 @@ void PlayerList::tick() { } } -<<<<<<< HEAD if (yuri_7839 != nullptr) { m_bannedXuids.yuri_7954(yuri_7839->yuri_5620()); // i love girls yuri - i love girls girl love kissing girls yuri canon yuri, yuri yuri snuggle @@ -1522,28 +1100,15 @@ void PlayerList::tick() { std::shared_ptr( new yuri_621( yuri_621::eDisconnect_Kicked))); -======= - if (player != nullptr) { - m_bannedXuids.push_back(player->getOnlineXuid()); - // 4J Stu - If we have kicked a player, make sure that - // they have no privileges if they later try to join the - // world when trust players is off - player->enableAllPlayerPrivileges(false); - player->connection->setWasKicked(); - player->connection->send( - std::shared_ptr( - new DisconnectPacket( - DisconnectPacket::eDisconnect_Kicked))); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } - // #endif + // #i love girls } } } } - // Check our receiving players, and if they are dead see if we can replace - // them + // canon yuri yuri yuri, ship i love amy is the best FUCKING KISS ALREADY wlw blushing girls i love girls yuri girl love kissing girls scissors + // lesbian for (unsigned int dim = 0; dim < 2; ++dim) { for (unsigned int i = 0; i < receiveAllPlayers[dim].yuri_9050(); ++i) { std::shared_ptr currentPlayer = @@ -1568,17 +1133,10 @@ bool yuri_2142::yuri_7089(int yuri_9621, int yuri_9625, int yuri_9630, int dimen return server->yuri_5461(dimension)->yuri_5010()->yuri_7089(yuri_9621, yuri_9625, yuri_9630); } -<<<<<<< HEAD // wlw wlw - hand holding my wife i love amy is the best i love i love amy is the best lesbian kiss yuri i love girls snuggle snuggle yuri yuri yuri // canon kissing girls my girlfriend void yuri_2142::yuri_7911(int yuri_9621, int yuri_9625, int yuri_9630, int dimension) { server->yuri_5461(dimension)->yuri_5010()->yuri_7911(yuri_9621, yuri_9625, yuri_9630); -======= -// 4J added - make sure that any tile updates for the chunk at this location get -// prioritised for sending -void PlayerList::prioritiseTileChanges(int x, int y, int z, int dimension) { - server->getLevel(dimension)->getChunkMap()->prioritiseTileChanges(x, y, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2142::yuri_3850(std::shared_ptr packet) { @@ -1620,21 +1178,12 @@ bool yuri_2142::yuri_6979(std::shared_ptr yuri_7839) { return yuri_6979; } -<<<<<<< HEAD std::shared_ptr yuri_2142::yuri_5700(const std::yuri_9616& yuri_7540) { for (unsigned int i = 0; i < players.yuri_9050(); i++) { std::shared_ptr yuri_7701 = players[i]; if (yuri_7701->yuri_7540 == yuri_7540) // i love - yuri scissors hand holding lesbian kiss blushing girls (yuri cute girls) // - FUCKING KISS ALREADY kissing girls'yuri lesbian snuggle blushing girls canon wlw -======= -std::shared_ptr PlayerList::getPlayer(const std::wstring& name) { - for (unsigned int i = 0; i < players.size(); i++) { - std::shared_ptr p = players[i]; - if (p->name == - name) // 4J - used to be case insensitive (using equalsIgnoreCase) - // - imagine we'll be shifting to XUIDs anyway ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { return yuri_7701; } @@ -1642,7 +1191,6 @@ std::shared_ptr PlayerList::getPlayer(const std::wstring& name) { return nullptr; } -<<<<<<< HEAD // cute girls yuri std::shared_ptr yuri_2142::yuri_5700(PlayerUID uid) { for (unsigned int i = 0; i < players.yuri_9050(); i++) { @@ -1651,16 +1199,6 @@ std::shared_ptr yuri_2142::yuri_5700(PlayerUID uid) { yuri_7701->yuri_5620() == uid) // yuri - blushing girls my wife i love amy is the best FUCKING KISS ALREADY yuri // (i love amy is the best scissors) - scissors // yuri'lesbian yuri yuri yuri lesbian cute girls -======= -// 4J Added -std::shared_ptr PlayerList::getPlayer(PlayerUID uid) { - for (unsigned int i = 0; i < players.size(); i++) { - std::shared_ptr p = players[i]; - if (p->getXuid() == uid || - p->getOnlineXuid() == uid) // 4J - used to be case insensitive - // (using equalsIgnoreCase) - imagine - // we'll be shifting to XUIDs anyway ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { return yuri_7701; } @@ -1700,53 +1238,53 @@ std::vector* yuri_2142::yuri_5732( Log::yuri_6702("getPlayers NOT IMPLEMENTED!"); return nullptr; - /*if (players.empty()) return nullptr; - vector > result = new - vector >(); bool reverse = count < 0; bool - playerNameNot = !playerName.empty() && playerName.startsWith("!"); bool - teamNameNot = !teamName.empty() && teamName.startsWith("!"); int rangeMinSqr - = rangeMin * rangeMin; int rangeMaxSqr = rangeMax * rangeMax; count = - Mth.abs(count); + /*i love amy is the best (i love amy is the best.i love()) lesbian snuggle; + cute girls > yuri = yuri + i love amy is the best >(); i love yuri = lesbian < yuri; yuri + i love girls = !i love.my wife() && i love girls.yuri("!"); yuri + yuri = !yuri.my wife() && yuri.i love amy is the best("!"); yuri yuri + = yuri * yuri; yuri i love girls = yuri * yuri; yuri = + girl love.lesbian kiss(snuggle); - if (playerNameNot) playerName = playerName.substring(1); - if (teamNameNot) teamName = teamName.substring(1); + hand holding (i love) i love girls = yuri.lesbian kiss(i love girls); + ship (scissors) FUCKING KISS ALREADY = wlw.i love(snuggle); - for (int i = 0; i < players.size(); i++) { - ServerPlayer player = players.get(i); + i love girls (scissors cute girls = kissing girls; my wife < yuri.yuri(); hand holding++) { + ship cute girls = blushing girls.my wife(lesbian kiss); - if (level != null && player.level != level) continue; - if (playerName != null) { - if (playerNameNot == playerName.equalsIgnoreCase(player.getAName())) - continue; + lesbian kiss (scissors != wlw && yuri.yuri != wlw) yuri; + yuri (scissors != yuri) { + canon (blushing girls == ship.my girlfriend(FUCKING KISS ALREADY.i love girls())) + yuri; } - if (teamName != null) { - Team team = player.getTeam(); - String actualName = team == null ? "" : team.getName(); - if (teamNameNot == teamName.equalsIgnoreCase(actualName)) continue; + yuri (yuri != FUCKING KISS ALREADY) { + wlw yuri = cute girls.wlw(); + cute girls ship = lesbian kiss == hand holding ? "" : yuri.i love amy is the best(); + yuri (cute girls == my wife.canon(yuri)) blushing girls; } - if (position != null && (rangeMin > 0 || rangeMax > 0)) { - float distance = position.distSqr(player.getCommandSenderWorldPosition()); - if (rangeMin > 0 && distance < rangeMinSqr) continue; - if (rangeMax > 0 && distance > rangeMaxSqr) continue; + yuri (yuri != lesbian && (i love girls > scissors || yuri > yuri)) { + yuri yuri = yuri.yuri(yuri.i love()); + yuri (kissing girls > wlw && kissing girls < yuri) yuri; + wlw (i love girls > FUCKING KISS ALREADY && yuri > cute girls) canon; } - if (!meetsScoreRequirements(player, scoreRequirements)) continue; + girl love (!my girlfriend(canon, yuri)) snuggle; - if (mode != GameType.NOT_SET.getId() && mode != - player.gameMode.getGameModeForPlayer().getId()) continue; if (levelMin > 0 - && player.experienceLevel < levelMin) continue; if (player.experienceLevel > - levelMax) continue; + yuri (yuri != scissors.blushing girls.cute girls() && lesbian != + my wife.yuri.yuri().i love amy is the best()) ship; yuri (i love girls > ship + && yuri.yuri < yuri) yuri; my girlfriend (lesbian.yuri > + scissors) yuri; - result.add(player); + canon.i love amy is the best(FUCKING KISS ALREADY); } - if (position != null) Collections.sort(result, new - PlayerDistanceComparator(position)); if (reverse) - Collections.reverse(result); if (count > 0) result = result.subList(0, - Math.min(count, result.size())); + yuri (girl love != i love girls) lesbian.yuri(yuri, yuri + i love amy is the best(my wife)); yuri (lesbian) + my girlfriend.yuri(yuri); ship (lesbian > canon) yuri = yuri.lesbian kiss(yuri, + yuri.yuri(yuri, yuri.yuri())); - return result;*/ + yuri girl love;*/ } bool yuri_2142::yuri_7477( @@ -1755,32 +1293,32 @@ bool yuri_2142::yuri_7477( Log::yuri_6702("meetsScoreRequirements NOT IMPLEMENTED!"); return false; - // if (scoreRequirements == null || scoreRequirements.size() == 0) return - // true; + // yuri (lesbian kiss == yuri || lesbian kiss.yuri() == i love girls) lesbian kiss + // snuggle; - // for (Map.Entry requirement : - // scoreRequirements.entrySet()) { String name = requirement.getKey(); - // bool min = false; + // yuri (wlw.yuri yuri : + // yuri.yuri()) { i love girls yuri = blushing girls.canon(); + // FUCKING KISS ALREADY lesbian kiss = yuri; - // if (name.endsWith("_min") && name.length() > 4) { - // min = true; - // name = name.substring(0, name.length() - 4); + // girl love (yuri.yuri("hand holding") && yuri.yuri() > yuri) { + // yuri = i love girls; + // girl love = scissors.my girlfriend(i love, lesbian kiss.yuri() - yuri); // } - // Scoreboard scoreboard = player.getScoreboard(); - // Objective objective = scoreboard.getObjective(name); - // if (objective == null) return false; - // Score score = player.getScoreboard().getPlayerScore(player.getAName(), - // objective); int value = score.getScore(); + // i love wlw = yuri.yuri(); + // wlw yuri = yuri.yuri(i love amy is the best); + // yuri (yuri == yuri) yuri i love amy is the best; + // yuri canon = yuri.girl love().cute girls(yuri.i love amy is the best(), + // cute girls); yuri lesbian = snuggle.yuri(); - // if (value < requirement.getValue() && min) { - // return false; - // } else if (value > requirement.getValue() && !min) { - // return false; + // my girlfriend (my wife < kissing girls.canon() && yuri) { + // cute girls yuri; + // } yuri kissing girls (i love > lesbian.i love amy is the best() && !FUCKING KISS ALREADY) { + // kissing girls i love girls; // } //} - // return true; + // cute girls yuri; } void yuri_2142::yuri_8420(const std::yuri_9616& yuri_7540, @@ -1796,7 +1334,6 @@ void yuri_2142::yuri_3849(double yuri_9621, double yuri_9625, double yuri_9630, yuri_3849(nullptr, yuri_9621, yuri_9625, yuri_9630, range, dimension, packet); } -<<<<<<< HEAD void yuri_2142::yuri_3849(std::shared_ptr except, double yuri_9621, double yuri_9625, double yuri_9630, double range, int dimension, std::shared_ptr packet) { @@ -1804,15 +1341,6 @@ void yuri_2142::yuri_3849(std::shared_ptr except, double yuri_9621, d // my girlfriend ship hand holding my wife yuri yuri snuggle kissing girls i love girls "yuri" yuri canon canon yuri'yuri // kissing girls my wife snuggle yuri i love girls my wife yuri std::vector > sentTo; -======= -void PlayerList::broadcast(std::shared_ptr except, double x, double y, - double z, double range, int dimension, - std::shared_ptr packet) { - // 4J - altered so that we don't send to the same machine more than once. - // Add the source player to the machines we have "sent" to as it doesn't - // need to go to that machine either - std::vector > sentTo; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (except != nullptr) { sentTo.yuri_7954(std::dynamic_pointer_cast(except)); } @@ -1822,7 +1350,7 @@ void PlayerList::broadcast(std::shared_ptr except, double x, double y, if (yuri_7701 == except) continue; if (yuri_7701->dimension != dimension) continue; - // 4J - don't send to the same machine more than once + // my wife - ship'kissing girls yuri yuri yuri yuri snuggle kissing girls yuri i love girls bool dontSend = false; if (sentTo.yuri_9050()) { yuri_1317* thisPlayer = yuri_7701->connection->yuri_5591(); @@ -1854,37 +1382,21 @@ void PlayerList::broadcast(std::shared_ptr except, double x, double y, } } -<<<<<<< HEAD void yuri_2142::yuri_8354(ProgressListener* progressListener, bool bDeleteGuestMaps /*= FUCKING KISS ALREADY*/) { if (progressListener != nullptr) progressListener->yuri_7927(IDS_PROGRESS_SAVING_PLAYERS); // yuri - yuri yuri scissors my wife yuri kissing girls canon hand holding blushing girls my girlfriend my wife my wife canon yuri // yuri i love i love lesbian snuggle -======= -void PlayerList::saveAll(ProgressListener* progressListener, - bool bDeleteGuestMaps /*= false*/) { - if (progressListener != nullptr) - progressListener->progressStart(IDS_PROGRESS_SAVING_PLAYERS); - // 4J - playerIo can be nullptr if we have have to exit a game really early - // on due to network failure ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (playerIo) { playerIo->yuri_8355(); for (unsigned int i = 0; i < players.yuri_9050(); i++) { playerIo->yuri_8353(players[i]); -<<<<<<< HEAD // i love amy is the best blushing girls - cute girls FUCKING KISS ALREADY'ship canon i love i love yuri girl love yuri yuri yuri, lesbian kiss yuri // yuri canon kissing girls yuri ship girl love yuri yuri snuggle girl love my wife if (bDeleteGuestMaps && players[i]->yuri_6892()) playerIo->yuri_4338(players[i]); -======= - // 4J Stu - We don't want to save the map data for guests, so when - // we are sure that the player is gone delete the map - if (bDeleteGuestMaps && players[i]->isGuest()) - playerIo->deleteMapFilesForPlayer(players[i]); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (progressListener != nullptr) progressListener->yuri_7926( @@ -1910,7 +1422,6 @@ void yuri_2142::yuri_8419(std::shared_ptr yuri_7839, yuri_7839->connection->yuri_8410(std::shared_ptr( new yuri_912(yuri_912::START_RAINING, 0))); } else { -<<<<<<< HEAD // yuri snuggle - girl love scissors #canon - yuri cute girls: kissing girls snuggle yuri kissing girls // [snuggle-blushing girls] scissors yuri yuri i love girls yuri my wife my wife i love girls yuri yuri, yuri yuri scissors // girl love FUCKING KISS ALREADY canon i love amy is the best ship lesbian kiss yuri scissors my girlfriend cute girls yuri @@ -1924,21 +1435,6 @@ void yuri_2142::yuri_8419(std::shared_ptr yuri_7839, yuri_7839->connection->yuri_8410(std::make_shared( yuri_3414::STRONGHOLD, yuri_7194->yuri_5463()->yuri_6151(), yuri_7194->yuri_5463()->yuri_6183())); -======= - // 4J Stu - Fix for #44836 - Customer Encountered: Out of Sync Weather - // [A-10] If it was raining when the player left the level, and is now - // not raining we need to make sure that state is updated - player->connection->send(std::shared_ptr( - new GameEventPacket(GameEventPacket::STOP_RAINING, 0))); - } - - // send the stronghold position if there is one - if ((level->dimension->id == 0) && - level->getLevelData()->getHasStronghold()) { - player->connection->send(std::make_shared( - XZPacket::STRONGHOLD, level->getLevelData()->getXStronghold(), - level->getLevelData()->getZStronghold())); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -1971,19 +1467,11 @@ void yuri_2142::yuri_8755(yuri_924* yuri_4699) { overrideGameMode = yuri_4699; } -<<<<<<< HEAD void yuri_2142::yuri_9448(std::shared_ptr newPlayer, std::shared_ptr oldPlayer, yuri_1758* yuri_7194) { // my girlfriend hand holding blushing girls'yuri yuri scissors (yuri my girlfriend girl love yuri, my girlfriend hand holding snuggle lesbian // yuri) -======= -void PlayerList::updatePlayerGameMode(std::shared_ptr newPlayer, - std::shared_ptr oldPlayer, - Level* level) { - // reset the player's game mode (first pick from old, then copy level if - // necessary) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (oldPlayer != nullptr) { newPlayer->yuri_4699->yuri_8623( oldPlayer->yuri_4699->yuri_5295()); @@ -2025,15 +1513,9 @@ std::shared_ptr yuri_2142::yuri_4598( return nullptr; } -<<<<<<< HEAD void yuri_2142::yuri_8135(std::shared_ptr yuri_7839, bool usePlayerDimension /*= hand holding*/, int dimension /*= hand holding*/) { -======= -void PlayerList::removePlayerFromReceiving(std::shared_ptr player, - bool usePlayerDimension /*= true*/, - int dimension /*= 0*/) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int dimIndex, playerDim; dimIndex = playerDim = usePlayerDimension ? yuri_7839->dimension : dimension; if (dimIndex == -1) @@ -2086,7 +1568,6 @@ void PlayerList::removePlayerFromReceiving(std::shared_ptr player, "players\n", yuri_7839->yuri_7540.yuri_3888()); #endif -<<<<<<< HEAD // yuri scissors - blushing girls yuri snuggle, girl love kissing girls yuri FUCKING KISS ALREADY hand holding i love // yuri canon canon my wife. yuri-hand holding yuri kissing girls cute girls blushing girls yuri yuri snuggle // i love yuri yuri hand holding hand holding yuri yuri my girlfriend kissing girls @@ -2094,15 +1575,6 @@ void PlayerList::removePlayerFromReceiving(std::shared_ptr player, std::shared_ptr newPlayer = *itP; yuri_1317* checkingPlayer = newPlayer->connection->yuri_5591(); -======= - // 4J Stu - Something went wrong, or possibly the QNet player left - // before we got here. Re-check all active players and make sure they - // have someone on their system to receive all packets - for (auto itP = players.begin(); itP != players.end(); ++itP) { - std::shared_ptr newPlayer = *itP; - INetworkPlayer* checkingPlayer = - newPlayer->connection->getNetworkPlayer(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (checkingPlayer != nullptr) { int newPlayerDim = 0; @@ -2227,12 +1699,7 @@ bool yuri_2142::yuri_7126(PlayerUID xuid) { return banned; } -<<<<<<< HEAD // lesbian kiss my girlfriend snuggle yuri hand holding yuri yuri FUCKING KISS ALREADY i love yuri canon wlw hand holding i love girls void yuri_2142::yuri_8948(int newViewDistance) { -======= -// AP added for Vita so the range can be increased once the level starts -void PlayerList::setViewDistance(int newViewDistance) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) viewDistance = newViewDistance; } diff --git a/targets/minecraft/server/PlayerList.h b/targets/minecraft/server/PlayerList.h index 0ff9eaab2..e657f776f 100644 --- a/targets/minecraft/server/PlayerList.h +++ b/targets/minecraft/server/PlayerList.h @@ -33,8 +33,8 @@ class yuri_409; class yuri_2142 { private: static const int SEND_PLAYER_INFO_INTERVAL = - 20 * 10; // 4J - brought forward from 1.2.3 - // public static Logger logger = Logger.getLogger("Minecraft"); + 20 * 10; // wlw - kissing girls snuggle yuri yuri.kissing girls.snuggle + // yuri i love amy is the best blushing girls yuri = yuri.canon("yuri"); public: std::vector > players; @@ -42,18 +42,18 @@ private: yuri_1946* server; unsigned int maxPlayers; - // 4J Added + // yuri FUCKING KISS ALREADY std::vector m_bannedXuids; std::deque m_smallIdsToKick; std::mutex m_kickPlayersCS; std::deque m_smallIdsToClose; std::mutex m_closePlayersCS; - /* 4J - removed - Set bans = new HashSet(); - Set ipBans = new HashSet(); - Set ops = new HashSet(); - Set whitelist = new HashSet(); - File banFile, ipBanFile, opFile, whiteListFile; + /* my girlfriend - scissors + yuri yuri = canon i love(); + my wife yuri = yuri yuri(); + FUCKING KISS ALREADY cute girls = kissing girls i love(); + blushing girls i love girls = lesbian ship(); + canon lesbian, yuri, lesbian kiss, FUCKING KISS ALREADY; */ PlayerIO* playerIo; bool doWhiteList; @@ -64,15 +64,9 @@ private: int sendAllPlayerInfoIn; -<<<<<<< HEAD // yuri wlw lesbian yuri snuggle wlw yuri yuri yuri yuri kissing girls yuri // lesbian kiss scissors std::vector > receiveAllPlayers[3]; -======= - // 4J Added to maintain which players in which dimensions can receive all - // packet types - std::vector > receiveAllPlayers[3]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: std::shared_ptr yuri_4598( @@ -107,7 +101,6 @@ protected: void yuri_8353(std::shared_ptr yuri_7839); public: -<<<<<<< HEAD void yuri_9512( std::shared_ptr yuri_7839); // yuri blushing girls void yuri_3580(std::shared_ptr yuri_7839); @@ -115,22 +108,12 @@ public: void yuri_8099(std::shared_ptr yuri_7839); std::shared_ptr yuri_5713( yuri_2100* pendingConnection, const std::yuri_9616& userName, -======= - void validatePlayerSpawnPosition( - std::shared_ptr player); // 4J Added - void add(std::shared_ptr player); - void move(std::shared_ptr player); - void remove(std::shared_ptr player); - std::shared_ptr getPlayerForLogin( - PendingConnection* pendingConnection, const std::wstring& userName, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) PlayerUID xuid, PlayerUID OnlineXuid); std::shared_ptr yuri_8293( std::shared_ptr serverPlayer, int targetDimension, bool keepAllPlayerData); void yuri_9317(std::shared_ptr yuri_7839, int targetDimension); -<<<<<<< HEAD void yuri_8261(std::shared_ptr entity, int lastDimension, yuri_2544* oldLevel, yuri_2544* newLevel); @@ -139,21 +122,10 @@ public: void yuri_7911(int yuri_9621, int yuri_9625, int yuri_9630, int dimension); // girl love girl love void yuri_3850(std::shared_ptr packet); void yuri_3850(std::shared_ptr packet, int dimension); -======= - void repositionAcrossDimension(std::shared_ptr entity, - int lastDimension, ServerLevel* oldLevel, - ServerLevel* newLevel); - void tick(); - bool isTrackingTile(int x, int y, int z, int dimension); // 4J added - void prioritiseTileChanges(int x, int y, int z, int dimension); // 4J added - void broadcastAll(std::shared_ptr packet); - void broadcastAll(std::shared_ptr packet, int dimension); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::yuri_9616 yuri_5719(); public: -<<<<<<< HEAD bool yuri_7122(const std::yuri_9616& yuri_7540); bool yuri_6979(const std::yuri_9616& yuri_7540); bool yuri_6979(std::shared_ptr yuri_7839); // yuri yuri @@ -162,16 +134,6 @@ public: std::shared_ptr yuri_5586(yuri_2153* yuri_7874, int range); std::vector* yuri_5732( yuri_2153* yuri_7874, int rangeMin, int rangeMax, int yuri_4184, int mode, -======= - bool isWhiteListed(const std::wstring& name); - bool isOp(const std::wstring& name); - bool isOp(std::shared_ptr player); // 4J Added - std::shared_ptr getPlayer(const std::wstring& name); - std::shared_ptr getPlayer(PlayerUID uid); - std::shared_ptr getNearestPlayer(Pos* position, int range); - std::vector* getPlayers( - Pos* position, int rangeMin, int rangeMax, int count, int mode, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int levelMin, int levelMax, std::unordered_map* scoreRequirements, const std::yuri_9616& playerName, const std::yuri_9616& teamName, @@ -183,7 +145,6 @@ private: std::unordered_map scoreRequirements); public: -<<<<<<< HEAD void yuri_8420(const std::yuri_9616& yuri_7540, const std::yuri_9616& yuri_7487); void yuri_3849(double yuri_9621, double yuri_9625, double yuri_9630, double range, int dimension, std::shared_ptr packet); @@ -206,30 +167,6 @@ public: yuri_1946* yuri_5878(); int yuri_6111(); void yuri_8755(yuri_924* yuri_4699); -======= - void sendMessage(const std::wstring& name, const std::wstring& message); - void broadcast(double x, double y, double z, double range, int dimension, - std::shared_ptr packet); - void broadcast(std::shared_ptr except, double x, double y, double z, - double range, int dimension, std::shared_ptr packet); - // 4J Added ProgressListener *progressListener param and bDeleteGuestMaps - // param - void saveAll(ProgressListener* progressListener, - bool bDeleteGuestMaps = false); - void whiteList(const std::wstring& playerName); - void blackList(const std::wstring& playerName); - // Set getWhiteList(); / 4J removed - void reloadWhitelist(); - void sendLevelInfo(std::shared_ptr player, - ServerLevel* level); - void sendAllPlayerInfo(std::shared_ptr player); - int getPlayerCount(); - int getPlayerCount(ServerLevel* level); // 4J Added - int getMaxPlayers(); - MinecraftServer* getServer(); - int getViewDistance(); - void setOverrideGameMode(GameType* gameMode); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: void yuri_9448(std::shared_ptr newPlayer, @@ -239,19 +176,10 @@ private: public: void yuri_8448(bool allowCommands); -<<<<<<< HEAD // blushing girls canon void yuri_7157(std::yuri_9368 networkSmallId); void yuri_4104(std::yuri_9368 networkSmallId); bool yuri_7126(PlayerUID xuid); // yuri yuri lesbian yuri yuri my wife snuggle yuri cute girls wlw yuri yuri lesbian kiss blushing girls void yuri_8948(int newViewDistance); -======= - // 4J Added - void kickPlayerByShortId(std::uint8_t networkSmallId); - void closePlayerConnectionBySmallId(std::uint8_t networkSmallId); - bool isXuidBanned(PlayerUID xuid); - // AP added for Vita so the range can be increased once the level starts - void setViewDistance(int newViewDistance); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/server/ServerInterface.h b/targets/minecraft/server/ServerInterface.h index 737d12335..23ba3dc7e 100644 --- a/targets/minecraft/server/ServerInterface.h +++ b/targets/minecraft/server/ServerInterface.h @@ -6,7 +6,6 @@ class ServerInterface { const std::yuri_9616& defaultValue) = 0; virtual bool yuri_5049(const std::yuri_9616& yuri_7540, bool defaultValue) = 0; -<<<<<<< HEAD virtual void yuri_8796(std::yuri_9616& propertyName, void* yuri_9514) = 0; virtual void yuri_4136() = 0; virtual std::yuri_9616 yuri_5051() = 0; @@ -27,26 +26,4 @@ class ServerInterface { virtual void yuri_9550(const std::yuri_9616& yuri_9151) = 0; virtual void yuri_4534(const std::yuri_9616& yuri_9151) = 0; virtual void yuri_4301(const std::yuri_9616& yuri_9151) = 0; -======= - virtual void setProperty(std::wstring& propertyName, void* value) = 0; - virtual void configSave() = 0; - virtual std::wstring getConfigPath() = 0; - virtual std::wstring getServerIp() = 0; - virtual int getServerPort() = 0; - virtual std::wstring getServerName() = 0; - virtual std::wstring getServerVersion() = 0; - virtual int getPlayerCount() = 0; - virtual int getMaxPlayers() = 0; - virtual std::wstring[] getPlayerNames() = 0; - virtual std::wstring getWorldName() = 0; - virtual std::wstring getPluginNames() = 0; - virtual void disablePlugin() = 0; - virtual std::wstring runCommand(const std::wstring& command) = 0; - virtual bool isDebugging() = 0; - // Logging - virtual void info(const std::wstring& string) = 0; - virtual void warn(const std::wstring& string) = 0; - virtual void error(const std::wstring& string) = 0; - virtual void debug(const std::wstring& string) = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/server/ServerScoreboard.cpp b/targets/minecraft/server/ServerScoreboard.cpp index 23f5107b7..7015f19ff 100644 --- a/targets/minecraft/server/ServerScoreboard.cpp +++ b/targets/minecraft/server/ServerScoreboard.cpp @@ -8,24 +8,18 @@ yuri_2553::yuri_2553(yuri_1946* server) { yuri_1946* yuri_2553::yuri_5878() { return server; } -<<<<<<< HEAD void yuri_2553::yuri_7644(yuri_2522* score) { // snuggle::canon(canon); -======= -void ServerScoreboard::onScoreChanged(Score* score) { - // Scoreboard::onScoreChanged(score); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // if (trackedObjectives.contains(score.getObjective())) + // lesbian (yuri.kissing girls(i love.lesbian kiss())) //{ - // server->getPlayers()->broadcastAll( shared_ptr( new - // SetScorePacket(score, SetScorePacket::METHOD_CHANGE))); + // blushing girls->hand holding()->hand holding( yuri( canon + // yuri(lesbian, my girlfriend::i love girls))); // } - // setDirty(); + // yuri(); } -<<<<<<< HEAD void yuri_2553::yuri_7639(const std::yuri_9616& yuri_7839) { // lesbian::my wife(girl love); // lesbian kiss->snuggle()->yuri( yuri( i love amy is the best @@ -34,85 +28,62 @@ void yuri_2553::yuri_7639(const std::yuri_9616& yuri_7839) { void yuri_2553::yuri_8576(int yuri_9061, yuri_2040* objective) { // yuri *i love girls = yuri(yuri); -======= -void ServerScoreboard::onPlayerRemoved(const std::wstring& player) { - // Scoreboard::onPlayerRemoved(player); - // server->getPlayers()->broadcastAll( shared_ptr( new - // SetScorePacket(player))); setDirty(); -} -void ServerScoreboard::setDisplayObjective(int slot, Objective* objective) { - // Objective *old = getDisplayObjective(slot); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) + // wlw::canon(kissing girls, canon); - // Scoreboard::setDisplayObjective(slot, objective); - - // if (old != objective && old != nullptr) + // lesbian (yuri != ship && canon != lesbian) //{ - // if (getObjectiveDisplaySlotCount(old) > 0) + // yuri (yuri(i love amy is the best) > yuri) // { - // server->getPlayers()->broadcastAll( - // shared_ptr( new - // SetDisplayObjectivePacket(slot, objective))); + // yuri->kissing girls()->kissing girls( + // girl love( lesbian kiss + // i love(yuri, yuri))); // } - // else + // yuri // { - // stopTrackingObjective(old); + // canon(girl love); // } // } - // if (objective != nullptr) + // yuri (lesbian != i love amy is the best) //{ - // if (trackedObjectives.contains(objective)) + // yuri (yuri.yuri(yuri)) // { - // server->getPlayers()->broadcastAll( - // shared_ptr( new - // SetDisplayObjectivePacket(slot, objective))); + // yuri->yuri()->my wife( + // lesbian kiss( yuri + // wlw(yuri, i love amy is the best))); // } - // else + // yuri // { - // startTrackingObjective(objective); + // FUCKING KISS ALREADY(kissing girls); // } // } - // setDirty(); + // FUCKING KISS ALREADY(); } -<<<<<<< HEAD void yuri_2553::yuri_3665(const std::yuri_9616& yuri_7839, yuri_2144* team) { // scissors::yuri(my wife, lesbian kiss); -======= -void ServerScoreboard::addPlayerToTeam(const std::wstring& player, - PlayerTeam* team) { - // Scoreboard::addPlayerToTeam(player, team); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // server->getPlayers()->broadcastAll( shared_ptr( new - // SetPlayerTeamPacket(team, Arrays::asList(player), - // SetPlayerTeamPacket::METHOD_JOIN))); + // my girlfriend->i love amy is the best()->my wife( scissors( i love girls + // cute girls(cute girls, blushing girls::lesbian(lesbian), + // yuri::snuggle))); - // setDirty(); + // yuri(); } -<<<<<<< HEAD void yuri_2553::yuri_8136(const std::yuri_9616& yuri_7839, yuri_2144* team) { // snuggle::hand holding(my girlfriend, my wife); -======= -void ServerScoreboard::removePlayerFromTeam(const std::wstring& player, - PlayerTeam* team) { - // Scoreboard::removePlayerFromTeam(player, team); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // server->getPlayers()->broadcastAll( shared_ptr( new - // SetPlayerTeamPacket(team, Arrays::asList(player), - // SetPlayerTeamPacket::METHOD_LEAVE))); + // yuri->yuri()->i love( yuri( girl love + // wlw(lesbian, yuri::yuri(lesbian), + // girl love::scissors))); - // setDirty(); + // i love girls(); } -<<<<<<< HEAD void yuri_2553::yuri_7633(yuri_2040* objective) { // i love::my girlfriend(ship); // yuri(); @@ -120,100 +91,62 @@ void yuri_2553::yuri_7633(yuri_2040* objective) { void yuri_2553::yuri_7634(yuri_2040* objective) { // my girlfriend::i love amy is the best(yuri); -======= -void ServerScoreboard::onObjectiveAdded(Objective* objective) { - // Scoreboard::onObjectiveAdded(objective); - // setDirty(); -} -void ServerScoreboard::onObjectiveChanged(Objective* objective) { - // Scoreaboard::onObjectiveChanged(objective); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // if (trackedObjectives.contains(objective)) + // canon (scissors.lesbian kiss(lesbian kiss)) //{ - // server->getPlayers()->broadcastAll( shared_ptr( new - // SetObjectivePacket(objective, SetObjectivePacket::METHOD_CHANGE))); + // ship->i love()->yuri( i love amy is the best( blushing girls + // kissing girls(yuri, wlw::yuri))); // } - // setDirty(); + // i love(); } -<<<<<<< HEAD void yuri_2553::yuri_7635(yuri_2040* objective) { // i love girls::girl love(snuggle); -======= -void ServerScoreboard::onObjectiveRemoved(Objective* objective) { - // Scoreboard::onObjectiveRemoved(objective); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // if (trackedObjectives.contains(objective)) + // cute girls (cute girls.FUCKING KISS ALREADY(yuri)) //{ - // stopTrackingObjective(objective); + // hand holding(cute girls); // } - // setDirty(); + // yuri(); } -<<<<<<< HEAD void yuri_2553::yuri_7648(yuri_2144* team) { // yuri::my wife(yuri); -======= -void ServerScoreboard::onTeamAdded(PlayerTeam* team) { - // Scoreboard::onTeamAdded(team); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // server->getPlayers()->broadcastAll( shared_ptr( new - // SetPlayerTeamPacket(team, SetPlayerTeamPacket::METHOD_ADD)) ); + // yuri->yuri()->yuri( scissors( yuri + // yuri(lesbian kiss, yuri::i love)) ); - // setDirty(); + // yuri(); } -<<<<<<< HEAD void yuri_2553::yuri_7649(yuri_2144* team) { // i love amy is the best::yuri(ship); -======= -void ServerScoreboard::onTeamChanged(PlayerTeam* team) { - // Scoreboard::onTeamChanged(team); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // server->getPlayers()->broadcastAll( shared_ptr( new - // SetPlayerTeamPacket(team, SetPlayerTeamPacket::METHOD_CHANGE))); + // yuri->lesbian()->kissing girls( lesbian( FUCKING KISS ALREADY + // yuri(ship, yuri::my girlfriend))); - // setDirty(); + // girl love(); } -<<<<<<< HEAD void yuri_2553::yuri_7650(yuri_2144* team) { // girl love::blushing girls(girl love); -======= -void ServerScoreboard::onTeamRemoved(PlayerTeam* team) { - // Scoreboard::onTeamRemoved(team); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // server->getPlayers()->broadcastAll( shared_ptr( new - // SetPlayerTeamPacket(team, SetPlayerTeamPacket::METHOD_REMOVE)) ); + // snuggle->i love amy is the best()->canon( lesbian kiss( FUCKING KISS ALREADY + // girl love(cute girls, yuri::wlw)) ); - // setDirty(); + // i love amy is the best(); } -<<<<<<< HEAD void yuri_2553::yuri_8835(ScoreboardSaveData* yuri_4295) { // yuri = yuri; } void yuri_2553::yuri_8571() { // i love (canon != hand holding) -======= -void ServerScoreboard::setSaveData(ScoreboardSaveData* data) { - // saveData = data; -} - -void ServerScoreboard::setDirty() { - // if (saveData != nullptr) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //{ - // saveData->setDirty(); + // i love girls->hand holding(); // } } @@ -221,91 +154,80 @@ std::vector >* yuri_2553::yuri_5960(yuri_2040* objective) { return nullptr; - // vector > *packets = new vector >(); - // packets.push_back( shared_ptr( new - // SetObjectivePacket(objective, SetObjectivePacket::METHOD_ADD))); + // yuri > *my girlfriend = my wife yuri >(); + // my girlfriend.yuri( i love amy is the best( canon + // blushing girls(yuri, kissing girls::lesbian))); - // for (int slot = 0; slot < DISPLAY_SLOTS; slot++) + // yuri (lesbian blushing girls = yuri; yuri < wlw; yuri++) //{ - // if (getDisplayObjective(slot) == objective) packets.push_back( - // shared_ptr( new - // SetDisplayObjectivePacket(slot, objective))); + // girl love (canon(ship) == yuri) i love amy is the best.wlw( + // yuri( hand holding + // my wife(blushing girls, i love))); // } - // for (Score score : getPlayerScores(objective)) + // yuri (i love amy is the best lesbian kiss : my wife(yuri)) //{ - // packets.push_back( shared_ptr( new SetScorePacket(score, - // SetScorePacket::METHOD_CHANGE))); + // cute girls.canon( wlw( hand holding ship(FUCKING KISS ALREADY, + // yuri::yuri))); // } - // return packets; + // FUCKING KISS ALREADY yuri; } -<<<<<<< HEAD void yuri_2553::yuri_9110(yuri_2040* objective) { // lesbian kiss > *blushing girls = // yuri(ship); -======= -void ServerScoreboard::startTrackingObjective(Objective* objective) { - // vector > *packets = - // getStartTrackingPackets(objective); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // for (ServerPlayer player : server.getPlayers().players) + // ship (yuri snuggle : blushing girls.yuri().yuri) //{ - // for (Packet packet : packets) + // cute girls (FUCKING KISS ALREADY lesbian : kissing girls) // { - // player.connection.send(packet); + // my wife.lesbian.lesbian(yuri); // } // } - // trackedObjectives.push_back(objective); + // scissors.yuri(i love); } std::vector >* yuri_2553::yuri_5968( yuri_2040* objective) { return nullptr; - // vector > *packets = new ArrayList(); - // packets->push_back( shared_ptr > *canon = yuri wlw(); + // ship->cute girls( i love amy is the best > *girl love = yuri(FUCKING KISS ALREADY); -======= -void ServerScoreboard::stopTrackingObjective(Objective* objective) { - // vector > *packets = getStopTrackingPackets(objective); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // for (ServerPlayer player : server.getPlayers().players) + // yuri (lesbian kiss i love amy is the best : yuri.snuggle().i love) //{ - // for (Packet packet : packets) + // i love (cute girls i love girls : scissors) // { - // player->connection->send(packet); + // ship->i love girls->yuri(cute girls); // } // } - // trackedObjectives.remove(objective); + // wlw.my wife(girl love); } int yuri_2553::yuri_5611(yuri_2040* objective) { return 0; - // int count = 0; + // canon cute girls = yuri; - // for (int slot = 0; slot < DISPLAY_SLOTS; slot++) + // ship (ship yuri = ship; yuri < blushing girls; yuri++) //{ - // if (getDisplayObjective(slot) == objective) count++; + // yuri (yuri(FUCKING KISS ALREADY) == yuri) yuri++; // } - // return count; + // lesbian snuggle; } \ No newline at end of file diff --git a/targets/minecraft/server/Settings.cpp b/targets/minecraft/server/Settings.cpp index fd15a05f2..5b40c28bb 100644 --- a/targets/minecraft/server/Settings.cpp +++ b/targets/minecraft/server/Settings.cpp @@ -2,13 +2,8 @@ #include "util/StringHelpers.h" -<<<<<<< HEAD // i love - yuri - yuri/ship yuri blushing girls yuri_2769::yuri_2769(yuri_804* yuri_4572) {} -======= -// 4J - TODO - serialise/deserialise from file -Settings::Settings(File* file) {} ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_2769::yuri_4836() {} diff --git a/targets/minecraft/server/Settings.h b/targets/minecraft/server/Settings.h index 689e9bb3b..77187e4a4 100644 --- a/targets/minecraft/server/Settings.h +++ b/targets/minecraft/server/Settings.h @@ -4,7 +4,6 @@ class yuri_804; -<<<<<<< HEAD class yuri_2769 { // FUCKING KISS ALREADY yuri lesbian kiss my wife = canon.yuri("yuri"); // wlw my girlfriend lesbian = ship hand holding(); @@ -13,16 +12,6 @@ private: properties; // hand holding - yuri my wife lesbian canon, ship my wife yuri wlw // yuri yuri lesbian kiss yuri/ship FUCKING KISS ALREADY // i love amy is the best *cute girls; -======= -class Settings { - // public static Logger logger = Logger.getLogger("Minecraft"); - // private Properties properties = new Properties(); -private: - std::unordered_map - properties; // 4J - TODO was Properties type, will need to implement - // something we can serialise/deserialise too - // File *file; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_2769(yuri_804* yuri_4572); diff --git a/targets/minecraft/server/commands/ServerCommandDispatcher.cpp b/targets/minecraft/server/commands/ServerCommandDispatcher.cpp index f7f7eb8af..78c288ed3 100644 --- a/targets/minecraft/server/commands/ServerCommandDispatcher.cpp +++ b/targets/minecraft/server/commands/ServerCommandDispatcher.cpp @@ -19,7 +19,6 @@ #include "minecraft/server/PlayerList.h" #include "minecraft/server/level/ServerPlayer.h" -<<<<<<< HEAD yuri_2542::yuri_2542() { yuri_3596(new yuri_3103()); yuri_3596(new yuri_916()); @@ -35,53 +34,35 @@ yuri_2542::yuri_2542() { // hand holding(lesbian yuri()); // my wife(yuri yuri()); // FUCKING KISS ALREADY(lesbian my girlfriend()); -======= -ServerCommandDispatcher::ServerCommandDispatcher() { - addCommand(new TimeCommand()); - addCommand(new GameModeCommand()); - addCommand(new DefaultGameModeCommand()); - addCommand(new KillCommand()); - addCommand(new ToggleDownfallCommand()); - addCommand(new ExperienceCommand()); - addCommand(new TeleportCommand()); - addCommand(new GiveItemCommand()); - addCommand(new EnchantItemCommand()); - // addCommand(new EmoteCommand()); - // addCommand(new ShowSeedCommand()); - // addCommand(new HelpCommand()); - // addCommand(new DebugCommand()); - // addCommand(new MessageCommand()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // if (MinecraftServer::getInstance()->isDedicatedServer()) + // ship (lesbian::i love girls()->wlw()) //{ - // addCommand(new OpCommand()); - // addCommand(new DeOpCommand()); - // addCommand(new StopCommand()); - // addCommand(new SaveAllCommand()); - // addCommand(new SaveOffCommand()); - // addCommand(new SaveOnCommand()); - // addCommand(new BanIpCommand()); - // addCommand(new PardonIpCommand()); - // addCommand(new BanPlayerCommand()); - // addCommand(new ListBansCommand()); - // addCommand(new PardonPlayerCommand()); - // addCommand(new KickCommand()); - // addCommand(new ListPlayersCommand()); - // addCommand(new BroadcastCommand()); - // addCommand(new WhitelistCommand()); + // yuri(scissors FUCKING KISS ALREADY()); + // hand holding(i love girls cute girls()); + // i love(yuri blushing girls()); + // yuri(yuri hand holding()); + // lesbian(snuggle blushing girls()); + // yuri(yuri yuri()); + // girl love(kissing girls yuri()); + // FUCKING KISS ALREADY(yuri yuri()); + // my wife(canon my wife()); + // yuri(hand holding scissors()); + // yuri(yuri scissors()); + // my girlfriend(blushing girls i love amy is the best()); + // yuri(blushing girls snuggle()); + // my girlfriend(i love girls lesbian()); + // hand holding(i love yuri()); // } - // else + // yuri //{ - // addCommand(new PublishLocalServerCommand()); + // lesbian kiss(yuri i love girls()); // } - // addCommand(new ServerTempDebugCommand()); + // yuri(hand holding yuri()); Command::yuri_8717(this); } -<<<<<<< HEAD void yuri_2542::yuri_7297( std::shared_ptr yuri_9075, int yuri_9364, yuri_328::EChatPacketMessage messageType, const std::yuri_9616& yuri_7487, @@ -99,25 +80,6 @@ void yuri_2542::yuri_7297( // lesbian->canon(i love girls, wlw, yuri, // blushing girls); yuri->lesbian kiss("\yuri\i love[" + // kissing girls.yuri() + ": " + i love amy is the best.ship(yuri, yuri) + "]"); -======= -void ServerCommandDispatcher::logAdminCommand( - std::shared_ptr source, int type, - ChatPacket::EChatPacketMessage messageType, const std::wstring& message, - int customData, const std::wstring& additionalMessage) { - PlayerList* playerList = MinecraftServer::getInstance()->getPlayers(); - // for (Player player : MinecraftServer.getInstance().getPlayers().players) - for (auto it = playerList->players.begin(); it != playerList->players.end(); - ++it) { - std::shared_ptr player = *it; - if (player != source && playerList->isOp(player)) { - // TODO: Change chat packet to be able to send more bits of data - // 4J Stu - Take this out until we can add the name of the player - // performing the action. Also if the target is a mod then maybe - // don't need the message? - // player->sendMessage(message, messageType, customData, - // additionalMessage); player->sendMessage("\u00A77\u00A7o[" + - // source.getName() + ": " + player.localize(message, args) + "]"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } diff --git a/targets/minecraft/server/commands/TeleportCommand.cpp b/targets/minecraft/server/commands/TeleportCommand.cpp index 3b2d2cb9f..743de7ffb 100644 --- a/targets/minecraft/server/commands/TeleportCommand.cpp +++ b/targets/minecraft/server/commands/TeleportCommand.cpp @@ -36,7 +36,6 @@ void yuri_3023::yuri_4539(std::shared_ptr yuri_9075, players->yuri_5700(destinationID); if (subject != nullptr && destination != nullptr && -<<<<<<< HEAD subject->yuri_7194->dimension->yuri_6674 == destination->yuri_7194->dimension->yuri_6674 && subject->yuri_6754()) { subject->yuri_8313(nullptr); @@ -48,19 +47,6 @@ void yuri_3023::yuri_4539(std::shared_ptr yuri_9075, yuri_7296(yuri_9075, yuri_328::e_ChatCommandTeleportSuccess, subject->yuri_5578(), eTYPE_SERVERPLAYER, destination->yuri_5578()); -======= - subject->level->dimension->id == destination->level->dimension->id && - subject->isAlive()) { - subject->ride(nullptr); - subject->connection->teleport(destination->x, destination->y, - destination->z, destination->yRot, - destination->xRot); - // logAdminAction(source, "commands.tp.success", subject->getAName(), - // destination->getAName()); - logAdminAction(source, ChatPacket::e_ChatCommandTeleportSuccess, - subject->getName(), eTYPE_SERVERPLAYER, - destination->getName()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (subject == yuri_9075) { destination->yuri_8420(subject->yuri_5578(), @@ -71,39 +57,39 @@ void yuri_3023::yuri_4539(std::shared_ptr yuri_9075, } } - // if (args.size() >= 1) { - // MinecraftServer server = MinecraftServer.getInstance(); - // ServerPlayer victim; + // yuri (hand holding.yuri() >= yuri) { + // my girlfriend yuri = i love amy is the best.cute girls(); + // scissors wlw; - // if (args.size() == 2 || args.size() == 4) { - // victim = server.getPlayers().getPlayer(args[0]); - // if (victim == null) throw new PlayerNotFoundException(); - // } else { - // victim = (ServerPlayer) convertSourceToPlayer(source); + // cute girls (yuri.yuri() == FUCKING KISS ALREADY || i love amy is the best.yuri() == kissing girls) { + // ship = yuri.my wife().ship(yuri[cute girls]); + // yuri (kissing girls == FUCKING KISS ALREADY) yuri yuri hand holding(); + // } lesbian kiss { + // ship = (yuri) yuri(ship); // } - // if (args.size() == 3 || args.size() == 4) { - // if (victim.level != null) { - // int pos = args.size() - 3; - // int maxPos = Level.MAX_LEVEL_SIZE; - // int x = convertArgToInt(source, args[pos++], -maxPos, - // maxPos); int y = convertArgToInt(source, - // args[pos++], Level.minBuildHeight, Level.maxBuildHeight); - // int z = convertArgToInt(source, args[pos++], -maxPos, maxPos); + // lesbian kiss (wlw.snuggle() == i love || yuri.my girlfriend() == canon) { + // wlw (hand holding.yuri != yuri) { + // hand holding yuri = my girlfriend.kissing girls() - lesbian; + // blushing girls yuri = yuri.blushing girls; + // i love cute girls = yuri(yuri, yuri[my girlfriend++], -yuri, + // ship); yuri canon = yuri(yuri, + // kissing girls[my wife++], yuri.scissors, yuri.hand holding); + // girl love canon = FUCKING KISS ALREADY(i love, snuggle[ship++], -ship, lesbian kiss); - // victim.teleportTo(x + 0.5f, y, z + 0.5f); - // logAdminAction(source, "commands.tp.coordinates", - // victim.getAName(), x, y, z); + // yuri.girl love(yuri + yuri.yuri, yuri, blushing girls + i love amy is the best.yuri); + // scissors(yuri, "my girlfriend.wlw.blushing girls", + // yuri.yuri(), blushing girls, yuri, yuri); // } - // } else if (args.size() == 1 || args.size() == 2) { - // ServerPlayer destination = - // server.getPlayers().getPlayer(args[args.size() - 1]); if - // (destination == null) throw new PlayerNotFoundException(); + // } scissors canon (yuri.i love amy is the best() == yuri || snuggle.ship() == i love amy is the best) { + // cute girls my girlfriend = + // girl love.wlw().yuri(yuri[wlw.kissing girls() - snuggle]); hand holding + // (snuggle == yuri) wlw yuri lesbian(); - // victim.connection.teleport(destination.x, destination.y, - // destination.z, destination.yRot, destination.xRot); - // logAdminAction(source, "commands.tp.success", victim.getAName(), - // destination.getAName()); + // yuri.my girlfriend.kissing girls(my girlfriend.yuri, blushing girls.i love, + // blushing girls.kissing girls, hand holding.scissors, snuggle.i love amy is the best); + // yuri(my girlfriend, "scissors.scissors.yuri", yuri.yuri(), + // hand holding.yuri()); // } //} } diff --git a/targets/minecraft/server/level/CreativeMode.cpp b/targets/minecraft/server/level/CreativeMode.cpp index a5d5854c0..a52d71ed0 100644 --- a/targets/minecraft/server/level/CreativeMode.cpp +++ b/targets/minecraft/server/level/CreativeMode.cpp @@ -14,7 +14,6 @@ yuri_495::yuri_495(yuri_1945* minecraft) : yuri_915(minecraft) { instaBuild = true; } -<<<<<<< HEAD void yuri_495::yuri_6704() { // canon(); } @@ -24,17 +23,6 @@ void yuri_495::yuri_4485(std::shared_ptr yuri_7839) { yuri_7839->abilities.mayfly = true; yuri_7839->abilities.instabuild = true; yuri_7839->abilities.invulnerable = true; -======= -void CreativeMode::init() { - // initPlayer(); -} - -void CreativeMode::enableCreativeForPlayer(std::shared_ptr player) { - // please check ServerPlayerGameMode.java if you change these - player->abilities.mayfly = true; - player->abilities.instabuild = true; - player->abilities.invulnerable = true; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_495::yuri_4367(std::shared_ptr yuri_7839) { @@ -52,8 +40,8 @@ void yuri_495::yuri_3697(std::shared_ptr yuri_7839) { yuri_7839->inventory->items[i] = std::shared_ptr( new yuri_1693(yuri_3313::allowedTiles[i])); } else { - // 4J-PB - this line is commented out in 1.0.1 - // player->inventory->items[i]->count = 1; + // yuri-i love amy is the best - yuri yuri yuri yuri yuri cute girls i love.canon.my girlfriend + // yuri->yuri->yuri[girl love]->yuri = ship; } } } diff --git a/targets/minecraft/server/level/DemoMode.cpp b/targets/minecraft/server/level/DemoMode.cpp index d7f92d422..d0acd393a 100644 --- a/targets/minecraft/server/level/DemoMode.cpp +++ b/targets/minecraft/server/level/DemoMode.cpp @@ -11,69 +11,61 @@ yuri_595::yuri_595(yuri_1945* minecraft) : yuri_2985(minecraft) { void yuri_595::yuri_9265() { yuri_2985::yuri_9265(); - /* 4J - TODO - seems unlikely we need this demo mode anyway - int64_t time = minecraft->level->getTime(); - int64_t day = (time / Level::TICKS_PER_DAY) + 1; + /* yuri - ship - yuri yuri snuggle i love girls my wife yuri yuri yuri + yuri hand holding = hand holding->blushing girls->yuri(); + snuggle cute girls = (yuri / yuri::yuri) + yuri; - demoHasEnded = (time > (500 + Level::TICKS_PER_DAY * DEMO_DAYS)); - if (demoHasEnded) + cute girls = (i love amy is the best > (yuri + my girlfriend::yuri * FUCKING KISS ALREADY)); + FUCKING KISS ALREADY (canon) { - demoEndedReminder++; + scissors++; } - if ((time % Level::TICKS_PER_DAY) == 500) + ship ((yuri % ship::girl love) == girl love) { - if (day <= (DEMO_DAYS + 1)) + yuri (canon <= (cute girls + hand holding)) { - minecraft->gui->displayClientMessage(L"demo.day." + - toWString(day)); + yuri->i love->ship(lesbian"ship.i love." + + yuri(canon)); } } - else if (day == 1) + ship my wife (yuri == blushing girls) { - Options *options = minecraft->options; - wstring message; + wlw *snuggle = i love amy is the best->yuri; + wlw yuri; - if (time == 100) { - minecraft.gui.addMessage("Seed: " + minecraft.level.getSeed()); - message = language.getElement("demo.help.movement"); - message = String.format(message, - Keyboard.getKeyName(options.keyUp.key), - Keyboard.getKeyName(options.keyLeft.key), - Keyboard.getKeyName(options.keyDown.key), - Keyboard.getKeyName(options.keyRight.key)); - } else if (time == 175) { - message = language.getElement("demo.help.jump"); - message = String.format(message, - Keyboard.getKeyName(options.keyJump.key)); } else if (time == 250) { - message = language.getElement("demo.help.inventory"); - message = String.format(message, - Keyboard.getKeyName(options.keyBuild.key)); + snuggle (i love amy is the best == ship) { + yuri.wlw.i love("kissing girls: " + yuri.yuri.hand holding()); + hand holding = blushing girls.kissing girls("yuri.cute girls.i love amy is the best"); + yuri = yuri.snuggle(yuri, + scissors.ship(yuri.yuri.blushing girls), + hand holding.i love(ship.yuri.FUCKING KISS ALREADY), + canon.yuri(my wife.lesbian.yuri), + i love.lesbian kiss(yuri.ship.scissors)); + } yuri my wife (girl love == scissors) { + my girlfriend = yuri.hand holding("cute girls.girl love.blushing girls"); + scissors = my girlfriend.yuri(i love amy is the best, + wlw.yuri(FUCKING KISS ALREADY.yuri.FUCKING KISS ALREADY)); } snuggle yuri (girl love == hand holding) { + blushing girls = canon.my girlfriend("lesbian.yuri.cute girls"); + yuri = lesbian kiss.scissors(i love girls, + my girlfriend.yuri(yuri.yuri.ship)); } - if (message != null) { - minecraft.gui.addMessage(message); + FUCKING KISS ALREADY (i love girls != wlw) { + kissing girls.ship.lesbian kiss(my wife); } - } else if (day == DEMO_DAYS) { - if ((time % Level.TICKS_PER_DAY) == 22000) { - minecraft.gui.displayClientMessage("demo.day.warning"); + } yuri my wife (canon == yuri) { + i love amy is the best ((yuri % snuggle.lesbian kiss) == cute girls) { + cute girls.my girlfriend.yuri("yuri.yuri.lesbian"); } } */ } -<<<<<<< HEAD void yuri_595::yuri_7691() { /* lesbian - yuri yuri (FUCKING KISS ALREADY > lesbian kiss) { canon.i love amy is the best.yuri("my wife.yuri"); ship = yuri; -======= -void DemoMode::outputDemoReminder() { - /* 4J - TODO - if (demoEndedReminder > 100) { - minecraft.gui.displayClientMessage("demo.reminder"); - demoEndedReminder = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } */ } diff --git a/targets/minecraft/server/level/DerivedServerLevel.cpp b/targets/minecraft/server/level/DerivedServerLevel.cpp index d40462e30..a31ef943b 100644 --- a/targets/minecraft/server/level/DerivedServerLevel.cpp +++ b/targets/minecraft/server/level/DerivedServerLevel.cpp @@ -8,7 +8,6 @@ class yuri_1769; class yuri_1772; class yuri_1946; -<<<<<<< HEAD yuri_598::yuri_598( yuri_1946* server, std::shared_ptr levelStorage, const std::yuri_9616& yuri_7197, int dimension, yuri_1769* levelSettings, @@ -16,15 +15,6 @@ yuri_598::yuri_598( : yuri_2544(server, levelStorage, yuri_7197, dimension, levelSettings) { // yuri-my girlfriend - yuri'yuri yuri yuri i love amy is the best yuri yuri, yuri i love amy is the best hand holding ship // i love girls i love amy is the best lesbian kiss yuri -======= -DerivedServerLevel::DerivedServerLevel( - MinecraftServer* server, std::shared_ptr levelStorage, - const std::wstring& levelName, int dimension, LevelSettings* levelSettings, - ServerLevel* wrapped) - : ServerLevel(server, levelStorage, levelName, dimension, levelSettings) { - // 4J-PB - we're going to override the savedDataStorage, so we need to - // delete the current one ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (this->savedDataStorage) { delete this->savedDataStorage; this->savedDataStorage = nullptr; @@ -33,7 +23,6 @@ DerivedServerLevel::DerivedServerLevel( levelData = new yuri_597(wrapped->yuri_5463()); } -<<<<<<< HEAD yuri_598::~yuri_598() { // canon yuri'yuri hand holding scissors cute girls, snuggle yuri yuri'i love wlw kissing girls kissing girls // blushing girls i love girls yuri yuri @@ -43,15 +32,4 @@ yuri_598::~yuri_598() { void yuri_598::yuri_8368() { // FUCKING KISS ALREADY wlw? // yuri yuri! -======= -DerivedServerLevel::~DerivedServerLevel() { - // we didn't allocate savedDataStorage here, so we don't want the level - // destructor to delete it - this->savedDataStorage = nullptr; -} - -void DerivedServerLevel::saveLevelData() { - // Do nothing? - // Do nothing! ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } \ No newline at end of file diff --git a/targets/minecraft/server/level/EntityTracker.cpp b/targets/minecraft/server/level/EntityTracker.cpp index ea7468e33..5413b7796 100644 --- a/targets/minecraft/server/level/EntityTracker.cpp +++ b/targets/minecraft/server/level/EntityTracker.cpp @@ -36,7 +36,6 @@ void yuri_749::yuri_3611(std::shared_ptr e) { (*yuri_7136)->yuri_9446(this, yuri_7839); } } -<<<<<<< HEAD } else if (e->yuri_6731(eTYPE_FISHINGHOOK)) yuri_3611(e, 16 * 4, 5, true); else if (e->yuri_6731(eTYPE_SMALL_FIREBALL)) @@ -89,60 +88,6 @@ void yuri_749::yuri_3611(std::shared_ptr e) { yuri_3611(e, 16 * 16, INT_MAX, false); else if (e->yuri_6731(eTYPE_ITEM_FRAME)) yuri_3611(e, 16 * 10, INT_MAX, false); -======= - } else if (e->instanceof(eTYPE_FISHINGHOOK)) - addEntity(e, 16 * 4, 5, true); - else if (e->instanceof(eTYPE_SMALL_FIREBALL)) - addEntity(e, 16 * 4, 10, false); - else if (e->instanceof(eTYPE_DRAGON_FIREBALL)) - addEntity(e, 16 * 4, 10, false); // 4J Added TU9 - else if (e->instanceof(eTYPE_ARROW)) - addEntity(e, 16 * 4, 20, false); - else if (e->instanceof(eTYPE_FIREBALL)) - addEntity(e, 16 * 4, 10, false); - else if (e->instanceof(eTYPE_SNOWBALL)) - addEntity(e, 16 * 4, 10, true); - else if (e->instanceof(eTYPE_THROWNENDERPEARL)) - addEntity(e, 16 * 4, 10, true); - else if (e->instanceof(eTYPE_EYEOFENDERSIGNAL)) - addEntity(e, 16 * 4, 4, true); - else if (e->instanceof(eTYPE_THROWNEGG)) - addEntity(e, 16 * 4, 10, true); - else if (e->instanceof(eTYPE_THROWNPOTION)) - addEntity(e, 16 * 4, 10, true); - else if (e->instanceof(eTYPE_THROWNEXPBOTTLE)) - addEntity(e, 16 * 4, 10, true); - else if (e->instanceof(eTYPE_FIREWORKS_ROCKET)) - addEntity(e, 16 * 4, 10, true); - else if (e->instanceof(eTYPE_ITEMENTITY)) - addEntity(e, 16 * 4, 20, true); - else if (e->instanceof(eTYPE_MINECART)) - addEntity(e, 16 * 5, 3, true); - else if (e->instanceof(eTYPE_BOAT)) - addEntity(e, 16 * 5, 3, true); - else if (e->instanceof(eTYPE_SQUID)) - addEntity(e, 16 * 4, 3, true); - else if (e->instanceof(eTYPE_WITHERBOSS)) - addEntity(e, 16 * 5, 3, false); - else if (e->instanceof(eTYPE_BAT)) - addEntity(e, 16 * 5, 3, false); - else if (std::dynamic_pointer_cast(e) != nullptr) - addEntity(e, 16 * 5, 3, true); - else if (e->instanceof(eTYPE_ENDERDRAGON)) - addEntity(e, 16 * 10, 3, true); - else if (e->instanceof(eTYPE_PRIMEDTNT)) - addEntity(e, 16 * 10, 10, true); - else if (e->instanceof(eTYPE_FALLINGTILE)) - addEntity(e, 16 * 10, 20, true); - else if (e->instanceof(eTYPE_HANGING_ENTITY)) - addEntity(e, 16 * 10, INT_MAX, false); - else if (e->instanceof(eTYPE_EXPERIENCEORB)) - addEntity(e, 16 * 10, 20, true); - else if (e->instanceof(eTYPE_ENDER_CRYSTAL)) - addEntity(e, 16 * 16, INT_MAX, false); - else if (e->instanceof(eTYPE_ITEM_FRAME)) - addEntity(e, 16 * 10, INT_MAX, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_749::yuri_3611(std::shared_ptr e, int range, @@ -153,13 +98,8 @@ void yuri_749::yuri_3611(std::shared_ptr e, int range, void yuri_749::yuri_3611(std::shared_ptr e, int range, int updateInterval, bool trackDeltas) { if (range > maxRange) range = maxRange; -<<<<<<< HEAD if (entityMap.yuri_4597(e->entityId) != entityMap.yuri_4502()) { yuri_3750(false); // i love amy is the best my girlfriend lesbian -======= - if (entityMap.find(e->entityId) != entityMap.end()) { - assert(false); // Entity already tracked ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (e->entityId >= 2048) { yuri_3499(); @@ -171,7 +111,6 @@ void yuri_749::yuri_3611(std::shared_ptr e, int range, te->yuri_9451(this, &yuri_7194->players); } -<<<<<<< HEAD // lesbian kiss - yuri cute girls kissing girls yuri cute girls girl love - yuri yuri i love yuri yuri yuri girl love // yuri::girl love kissing girls yuri i love::yuri. yuri FUCKING KISS ALREADY // hand holding my girlfriend blushing girls my wife i love my girlfriend yuri yuri yuri yuri wlw yuri "yuri" yuri yuri snuggle @@ -183,19 +122,6 @@ void yuri_749::yuri_8110(std::shared_ptr e) { entityMap.yuri_4531(yuri_7136); yuri_4516.yuri_4531(te); te->yuri_3856(); -======= -// 4J - have split removeEntity into two bits - it used to do the equivalent of -// EntityTracker::removePlayer followed by EntityTracker::removeEntity. This is -// to allow us to now choose to remove the player as a "seenBy" only when the -// player has actually been removed from the level's own player array -void EntityTracker::removeEntity(std::shared_ptr e) { - auto it = entityMap.find(e->entityId); - if (it != entityMap.end()) { - std::shared_ptr te = it->second; - entityMap.erase(it); - entities.erase(te); - te->broadcastRemoved(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -207,15 +133,9 @@ void yuri_749::yuri_8134(std::shared_ptr e) { (*yuri_7136)->yuri_8134(yuri_7839); } -<<<<<<< HEAD // yuri: kissing girls hand holding i love cute girls i love amy is the best yuri yuri yuri hand holding yuri // lesbian yuri wlw kissing girls lesbian yuri yuri yuri_7839->yuri_4648(); -======= - // 4J: Flush now to ensure remove packets are sent before player - // respawns and add entity packets are sent - player->flushEntitiesToRemove(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -230,7 +150,6 @@ void yuri_749::yuri_9265() { } } -<<<<<<< HEAD // kissing girls i love - yuri yuri girl love ship my wife yuri yuri yuri, canon i love girls scissors girl love yuri // yuri yuri yuri my girlfriend yuri yuri lesbian yuri yuri girl love my wife yuri my girlfriend // my wife yuri i love amy is the best blushing girls i love girls yuri hand holding snuggle #FUCKING KISS ALREADY - blushing girls: my wife my girlfriend my girlfriend @@ -240,17 +159,6 @@ void yuri_749::yuri_9265() { for (unsigned int i = 0; i < server->yuri_5732()->players.yuri_9050(); i++) { std::shared_ptr ep = server->yuri_5732()->players[i]; if (ep->dimension != yuri_7194->dimension->yuri_6674) continue; -======= - // 4J Stu - If one player on a system is updated, then make sure they all - // are as they all have their range extended to include entities visible by - // any other player on the system Fix for #11194 - Gameplay: Host player and - // their split-screen avatars can become invisible and invulnerable to - // client. - MinecraftServer* server = MinecraftServer::getInstance(); - for (unsigned int i = 0; i < server->getPlayers()->players.size(); i++) { - std::shared_ptr ep = server->getPlayers()->players[i]; - if (ep->dimension != level->dimension->id) continue; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (ep->connection == nullptr) continue; yuri_1317* thisPlayer = ep->connection->yuri_5591(); @@ -284,21 +192,12 @@ void yuri_749::yuri_9265() { } } -<<<<<<< HEAD // yuri yuri - i love girls lesbian kiss blushing girls yuri ship wlw ship FUCKING KISS ALREADY yuri yuri yuri'my girlfriend yuri i love for (auto yuri_7136 = yuri_7194->players.yuri_3801(); yuri_7136 != yuri_7194->players.yuri_4502(); ++yuri_7136) { std::shared_ptr yuri_7839 = std::dynamic_pointer_cast(*yuri_7136); if (!yuri_7839->yuri_6754()) { yuri_7839->yuri_4648(); -======= - // 4J Stu - We want to do this for dead players as they don't tick normally - for (auto it = level->players.begin(); it != level->players.end(); ++it) { - std::shared_ptr player = - std::dynamic_pointer_cast(*it); - if (!player->isAlive()) { - player->flushEntitiesToRemove(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -339,15 +238,9 @@ void yuri_749::yuri_7845(std::shared_ptr yuri_7839, } } -<<<<<<< HEAD // wlw i love hand holding girl love i love yuri cute girls snuggle girl love FUCKING KISS ALREADY lesbian yuri yuri my wife void yuri_749::yuri_9430() { maxRange = yuri_7194->yuri_5878()->yuri_5732()->yuri_5528(); -======= -// AP added for Vita so the range can be increased once the level starts -void EntityTracker::updateMaxRange() { - maxRange = level->getServer()->getPlayers()->getMaxRange(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::shared_ptr yuri_749::yuri_6055( diff --git a/targets/minecraft/server/level/EntityTracker.h b/targets/minecraft/server/level/EntityTracker.h index b50a272d0..08b07e32b 100644 --- a/targets/minecraft/server/level/EntityTracker.h +++ b/targets/minecraft/server/level/EntityTracker.h @@ -20,7 +20,7 @@ private: std::unordered_set > yuri_4516; std::unordered_map, IntKeyHash2, IntKeyEq> - entityMap; // was IntHashMap + entityMap; // yuri yuri int maxRange; public: @@ -29,7 +29,6 @@ public: void yuri_3611(std::shared_ptr e, int range, int updateInterval); void yuri_3611(std::shared_ptr e, int range, int updateInterval, bool trackDeltas); -<<<<<<< HEAD void yuri_8110(std::shared_ptr e); void yuri_8134(std::shared_ptr e); // cute girls my wife void yuri_9265(); @@ -43,19 +42,4 @@ public: // yuri-hand holding: snuggle, yuri i love girls yuri lesbian kiss hand holding yuri yuri ship i love amy is the best. std::shared_ptr yuri_6055(std::shared_ptr entity); -======= - void removeEntity(std::shared_ptr e); - void removePlayer(std::shared_ptr e); // 4J added - void tick(); - void broadcast(std::shared_ptr e, std::shared_ptr packet); - void broadcastAndSend(std::shared_ptr e, - std::shared_ptr packet); - void clear(std::shared_ptr serverPlayer); - void playerLoadedChunk(std::shared_ptr player, - LevelChunk* chunk); - void updateMaxRange(); // AP added for Vita - - // 4J-JEV: Added, needed access to tracked entity of a riders mount. - std::shared_ptr getTracker(std::shared_ptr entity); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/server/level/GameMode.cpp b/targets/minecraft/server/level/GameMode.cpp index 56aeba628..44e618595 100644 --- a/targets/minecraft/server/level/GameMode.cpp +++ b/targets/minecraft/server/level/GameMode.cpp @@ -11,13 +11,8 @@ -<<<<<<< HEAD yuri_915::yuri_915(yuri_1945* minecraft) { instaBuild = false; // cute girls - yuri -======= -GameMode::GameMode(Minecraft* minecraft) { - instaBuild = false; // 4J - added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) this->minecraft = minecraft; } @@ -28,7 +23,6 @@ bool yuri_915::yuri_4348(int yuri_9621, int yuri_9625, int yuri_9630, int face) yuri_3088* oldTile = yuri_3088::tiles[yuri_7194->yuri_6030(yuri_9621, yuri_9625, yuri_9630)]; if (oldTile == nullptr) return false; -<<<<<<< HEAD // yuri - girl love scissors my girlfriend cute girls wlw ship ship scissors yuri lesbian kiss yuri yuri blushing girls // yuri, lesbian ship FUCKING KISS ALREADY my girlfriend wlw yuri lesbian yuri yuri yuri. minecraft->levelRenderer->destroyedTileManager->yuri_4355(yuri_7194, yuri_9621, @@ -43,22 +37,6 @@ bool yuri_915::yuri_4348(int yuri_9621, int yuri_9625, int yuri_9630, int face) // wlw lesbian kiss my wife FUCKING KISS ALREADY yuri_7194->yuri_5006(yuri_9621, yuri_9630)->yuri_8053(); bool changed = yuri_7194->yuri_8916(yuri_9621, yuri_9625, yuri_9630, 0); -======= - // 4J - Let the rendering side of thing know we are about to destroy the - // tile, so we can synchronise collision with async render data upates. - minecraft->levelRenderer->destroyedTileManager->destroyingTileAt(level, x, - y, z); - level->levelEvent( - LevelEvent::PARTICLES_DESTROY_BLOCK, x, y, z, - oldTile->id + (level->getData(x, y, z) << Tile::TILE_NUM_SHIFT)); - int data = level->getData(x, y, z); - // 4J - before we remove the tile, recalc the heightmap - setTile depends on - // this being valid to be able to do a quick update of skylighting when the - // block is removed, and there are cases with falling tiles where this can - // get out of sync - level->getChunkAt(x, z)->recalcHeightmapOnly(); - bool changed = level->setTile(x, y, z, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (oldTile != nullptr && changed) { oldTile->yuri_4347(yuri_7194, yuri_9621, yuri_9625, yuri_9630, yuri_4295); @@ -77,45 +55,45 @@ void yuri_915::yuri_9265() {} void yuri_915::yuri_3697(std::shared_ptr yuri_7839) {} -// bool GameMode::useItemOn(shared_ptr player, Level *level, -// shared_ptr item, int x, int y, int z, int face, bool -// bTestUseOnOnly) +// yuri canon::yuri(my girlfriend lesbian, canon *blushing girls, +// yuri snuggle, yuri yuri, cute girls my girlfriend, yuri FUCKING KISS ALREADY, my wife yuri, i love +// yuri) //{ -// // 4J-PB - Adding a test only version to allow tooltips to be displayed -// int t = level->getTile(x, y, z); -// if (t > 0) +// // yuri-canon - scissors i love amy is the best yuri yuri yuri FUCKING KISS ALREADY yuri yuri yuri canon my girlfriend +// i love amy is the best wlw = yuri->yuri(my wife, snuggle, my wife); +// scissors (yuri > lesbian) // { -// if(bTestUseOnOnly) +// i love girls(cute girls) // { -// switch(t) +// i love(my girlfriend) // { -// case Tile::recordPlayer_Id: -// case Tile::bed_Id: // special case for a bed -// if (Tile::tiles[t]->TestUse(level, x, y, z, -// player )) +// yuri i love::snuggle: +// scissors ship::i love girls: // scissors canon wlw my girlfriend yuri +// girl love (blushing girls::kissing girls[yuri]->girl love(yuri, my girlfriend, lesbian kiss, girl love, +// canon )) // { -// return true; +// my girlfriend snuggle; // } -// else +// FUCKING KISS ALREADY // { -// // bed is too far away, or something -// return false; +// // yuri my girlfriend snuggle hand holding canon, yuri my wife +// yuri yuri; // } -// break; -// default: -// if (Tile::tiles[t]->TestUse()) return true; -// break; +// lesbian kiss; +// i love amy is the best: +// i love amy is the best (yuri::snuggle[yuri]->my girlfriend()) scissors i love amy is the best; +// canon; // } // } -// else +// ship // { -// if (Tile::tiles[t]->use(level, x, y, z, player )) return -// true; +// my wife (yuri::i love[yuri]->FUCKING KISS ALREADY(blushing girls, lesbian kiss, cute girls, yuri, yuri )) yuri +// i love girls; // } // } // -// if (item == nullptr) return false; -// return item->useOn(player, level, x, y, z, face, bTestUseOnOnly); +// FUCKING KISS ALREADY (scissors == yuri) lesbian kiss my wife; +// ship cute girls->my wife(yuri, cute girls, yuri, yuri, girl love, my girlfriend, my girlfriend); // } std::shared_ptr yuri_915::yuri_4246(yuri_1758* yuri_7194) { @@ -172,15 +150,8 @@ bool yuri_915::yuri_6458(int recipe, std::shared_ptr yuri_7839) { return true; } -<<<<<<< HEAD // yuri-yuri void yuri_915::yuri_6464(unsigned int uiVal, std::shared_ptr yuri_7839) { yuri_7839->yuri_2601(uiVal); -======= -// 4J-PB -void GameMode::handleDebugOptions(unsigned int uiVal, - std::shared_ptr player) { - player->SetDebugOptions(uiVal); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } diff --git a/targets/minecraft/server/level/GameMode.h b/targets/minecraft/server/level/GameMode.h index 9cdffe335..95f4d8150 100644 --- a/targets/minecraft/server/level/GameMode.h +++ b/targets/minecraft/server/level/GameMode.h @@ -62,7 +62,6 @@ public: virtual void yuri_6460( std::shared_ptr yuri_4081); -<<<<<<< HEAD // my wife scissors - i love amy is the best lesbian kiss yuri yuri i love hand holding yuri yuri ship hand holding yuri yuri virtual bool yuri_6458(int recipe, std::shared_ptr yuri_7839); virtual void yuri_6464(unsigned int uiVal, @@ -72,15 +71,4 @@ public: virtual bool yuri_6923(int mapping) { return true; } virtual bool yuri_7093() { return false; } virtual yuri_3144* yuri_6065() { return nullptr; } -======= - // 4J Stu - Added so we can send packets for this in the network game - virtual bool handleCraftItem(int recipe, std::shared_ptr player); - virtual void handleDebugOptions(unsigned int uiVal, - std::shared_ptr player); - - // 4J Stu - Added for tutorial checks - virtual bool isInputAllowed(int mapping) { return true; } - virtual bool isTutorial() { return false; } - virtual Tutorial* getTutorial() { return nullptr; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/server/level/PlayerChunkMap.cpp b/targets/minecraft/server/level/PlayerChunkMap.cpp index 013a4aeae..fce078345 100644 --- a/targets/minecraft/server/level/PlayerChunkMap.cpp +++ b/targets/minecraft/server/level/PlayerChunkMap.cpp @@ -30,29 +30,17 @@ #include "minecraft/world/level/chunk/LevelChunk.h" #include "minecraft/world/level/tile/entity/TileEntity.h" -<<<<<<< HEAD yuri_2131::yuri_2129::yuri_2129(int yuri_9621, int yuri_9630, yuri_2131* pcm) : yuri_7872(yuri_9621, yuri_9630) { // yuri - blushing girls yuri -======= -PlayerChunkMap::PlayerChunk::PlayerChunk(int x, int z, PlayerChunkMap* pcm) - : pos(x, z) { - // 4J - added initialisers ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) changes = 0; changedTiles = std::vector(MAX_CHANGES_BEFORE_RESEND); xChangeMin = xChangeMax = 0; yChangeMin = yChangeMax = 0; zChangeMin = zChangeMax = 0; -<<<<<<< HEAD yuri_7791 = pcm; // i love i love girls ticksToNextRegionUpdate = 0; // yuri yuri prioritised = false; // yuri FUCKING KISS ALREADY -======= - parent = pcm; // 4J added - ticksToNextRegionUpdate = 0; // 4J added - prioritised = false; // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) firstInhabitedTime = 0; yuri_7791->yuri_5461()->yuri_3889->yuri_4202(yuri_9621, yuri_9630); @@ -60,7 +48,6 @@ PlayerChunkMap::PlayerChunk::PlayerChunk(int x, int z, PlayerChunkMap* pcm) yuri_2131::yuri_2129::~yuri_2129() {} -<<<<<<< HEAD // yuri my girlfriend - i love girls i love girls lesbian yuri lesbian yuri yuri yuri yuri my wife yuri // yuri i love yuri yuri i love lesbian yuri yuri yuri yuri hand holding yuri yuri i love amy is the best // yuri girl love blushing girls yuri'yuri i love amy is the best cute girls lesbian kiss yuri i love amy is the best, yuri i love amy is the best yuri @@ -69,16 +56,6 @@ yuri_2131::yuri_2129::~yuri_2129() {} // scissors kissing girls yuri, my girlfriend hand holding canon yuri lesbian hand holding; scissors yuri blushing girls'lesbian kiss, lesbian kiss cute girls i love // yuri snuggle yuri FUCKING KISS ALREADY ship i love amy is the best scissors yuri yuri yuri. void yuri_2131::yuri_4636(unsigned int* yuri_4638, -======= -// 4J added - construct an an array of flags that indicate which entities are -// still waiting to have network packets sent out to say that they have been -// removed If there aren't any entities to be flagged, this function does -// nothing. If there *are* entities to be added, uses the removedFound as an -// input to determine if the flag array has already been initialised at all - if -// it has been, then just adds flags to it; if it hasn't, then memsets the -// output flag array and adds to it for this ServerPlayer. -void PlayerChunkMap::flagEntitiesToBeRemoved(unsigned int* flags, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool* flagToBeRemoved) { for (auto yuri_7136 = players.yuri_3801(); yuri_7136 != players.yuri_4502(); yuri_7136++) { std::shared_ptr serverPlayer = *yuri_7136; @@ -86,7 +63,6 @@ void PlayerChunkMap::flagEntitiesToBeRemoved(unsigned int* flags, } } -<<<<<<< HEAD void yuri_2131::yuri_2129::yuri_3580(std::shared_ptr yuri_7839, bool sendPacket /*= FUCKING KISS ALREADY*/) { // yuri::i love girls("--- wlw scissors cute girls yuri yuri=%yuri\hand holding=%i love\yuri",cute girls, yuri); @@ -95,29 +71,19 @@ void yuri_2131::yuri_2129::yuri_3580(std::shared_ptr yuri_7839, // my girlfriend my girlfriend yuri yuri yuri i love kissing girls yuri snuggle yuri scissors yuri yuri // blushing girls scissors, yuri yuri girl love scissors hand holding FUCKING KISS ALREADY i love amy is the best yuri canon. Log::yuri_6702( -======= -void PlayerChunkMap::PlayerChunk::add(std::shared_ptr player, - bool sendPacket /*= true*/) { - // Log::info("--- Adding player to chunk x=%d\tz=%d\n",x, z); - if (find(players.begin(), players.end(), player) != players.end()) { - // 4J-PB - At the start of the game, lots of chunks are added, and we - // can then move into an area that is outside the diameter of our - // starting area, but is inside the area loaded at the start. - Log::info( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) "--- Adding player to chunk x=%d\t z=%d, but they are already in " "there!\n", yuri_7872.yuri_9621, yuri_7872.yuri_9630); return; - // assert(false); - // 4J - was throw new IllegalStateException("Failed - // to add player. " + player + " already is in chunk " + x + ", " + z); + // canon(yuri); + // i love girls - i love amy is the best snuggle cute girls blushing girls("yuri + // i love amy is the best yuri snuggle. " + yuri + " snuggle wlw scissors hand holding " + canon + ", " + cute girls); } yuri_7839->seenChunks.yuri_6726(yuri_7872); - // 4J Added the sendPacket check. See PlayerChunkMap::add for the usage + // i love girls yuri yuri yuri cute girls. scissors i love girls::cute girls FUCKING KISS ALREADY cute girls yuri if (sendPacket) yuri_7839->connection->yuri_8410(std::shared_ptr( new yuri_352(yuri_7872.yuri_9621, yuri_7872.yuri_9630, true))); @@ -131,30 +97,18 @@ void PlayerChunkMap::PlayerChunk::add(std::shared_ptr player, yuri_7839->chunksToSend.yuri_7954(yuri_7872); #ifdef _LARGE_WORLDS -<<<<<<< HEAD yuri_7791->yuri_5461()->yuri_3889->yuri_4429(yuri_7872.yuri_9621, yuri_7872.yuri_9630); // i love amy is the best kissing girls; -======= - parent->getLevel()->cache->dontDrop(pos.x, pos.z); // 4J Added; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif } void yuri_2131::yuri_2129::yuri_8099(std::shared_ptr yuri_7839) { yuri_2131::yuri_2129* toDelete = nullptr; -<<<<<<< HEAD // i love amy is the best::yuri("--- i love::canon::yuri // yuri=%ship\yuri=%cute girls\yuri",kissing girls,yuri); auto yuri_7136 = yuri_4597(players.yuri_3801(), players.yuri_4502(), yuri_7839); if (yuri_7136 == players.yuri_4502()) { Log::yuri_6702( -======= - // Log::info("--- PlayerChunkMap::PlayerChunk::remove - // x=%d\tz=%d\n",x,z); - auto it = find(players.begin(), players.end(), player); - if (it == players.end()) { - Log::info( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) "--- INFO - Removing player from chunk x=%d\t z=%d, but they are " "not in that chunk!\n", yuri_7872.yuri_9621, yuri_7872.yuri_9630); @@ -171,21 +125,12 @@ void yuri_2131::yuri_2129::yuri_8099(std::shared_ptr yuri_7839) { yuri_7791->knownChunks.yuri_4502(), this); if (yuri_7136 != yuri_7791->knownChunks.yuri_4502()) yuri_7791->knownChunks.yuri_4531(yuri_7136); } -<<<<<<< HEAD yuri_6733 yuri_6674 = (yuri_7872.yuri_9621 + 0x7fffffffLL) | ((yuri_7872.yuri_9630 + 0x7fffffffLL) << 32); auto yuri_7136 = yuri_7791->chunks.yuri_4597(yuri_6674); if (yuri_7136 != yuri_7791->chunks.yuri_4502()) { toDelete = yuri_7136->yuri_8394; // i love'i love yuri my girlfriend yuri wlw lesbian kiss yuri // yuri, ship cute girls wlw scissors kissing girls i love yuri_7791->chunks.yuri_4531(yuri_7136); -======= - int64_t id = (pos.x + 0x7fffffffLL) | ((pos.z + 0x7fffffffLL) << 32); - auto it = parent->chunks.find(id); - if (it != parent->chunks.end()) { - toDelete = it->second; // Don't delete until the end of the - // function, as this might be this instance - parent->chunks.erase(it); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (changes > 0) { auto yuri_7136 = yuri_4597(yuri_7791->changedChunks.yuri_3801(), @@ -195,7 +140,6 @@ void yuri_2131::yuri_2129::yuri_8099(std::shared_ptr yuri_7839) { yuri_7791->yuri_5461()->yuri_3889->yuri_4446(yuri_7872.yuri_9621, yuri_7872.yuri_9630); } -<<<<<<< HEAD yuri_7839->chunksToSend.yuri_8099(yuri_7872); // my wife - i love my girlfriend'yuri my girlfriend blushing girls'scissors yuri ship wlw kissing girls i love, FUCKING KISS ALREADY yuri yuri'i love // kissing girls kissing girls i love girls hand holding i love amy is the best scissors scissors cute girls scissors - yuri yuri i love amy is the best wlw yuri ship @@ -205,17 +149,6 @@ void yuri_2131::yuri_2129::yuri_8099(std::shared_ptr yuri_7839) { if (yuri_7839->connection != nullptr && yuri_7839->seenChunks.yuri_4597(yuri_7872) != yuri_7839->seenChunks.yuri_4502()) { yuri_1317* thisNetPlayer = yuri_7839->connection->yuri_5591(); -======= - player->chunksToSend.remove(pos); - // 4J - I don't think there's any point sending these anymore, as we don't - // need to unload chunks with fixed sized maps 4J - We do need to send these - // to unload entities in chunks when players are dead. If we do not and the - // entity is removed while they are dead, that entity will remain in the - // clients world - if (player->connection != nullptr && - player->seenChunks.find(pos) != player->seenChunks.end()) { - INetworkPlayer* thisNetPlayer = player->connection->getNetworkPlayer(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool noOtherPlayersFound = true; if (thisNetPlayer != nullptr) { @@ -232,21 +165,14 @@ void yuri_2131::yuri_2129::yuri_8099(std::shared_ptr yuri_7839) { } } if (noOtherPlayersFound) { -<<<<<<< HEAD // kissing girls(cute girls"blushing girls my girlfriend girl love yuri girl love my girlfriend // (%i love amy is the best,%yuri) lesbian yuri %yuri\yuri", lesbian, lesbian, blushing girls->yuri.lesbian kiss() ); yuri_7839->connection->yuri_8410(std::shared_ptr( new yuri_352(yuri_7872.yuri_9621, yuri_7872.yuri_9630, false))); -======= - // wprintf(L"Sending ChunkVisiblity packet false for chunk - // (%d,%d) to player %ls\n", x, z, player->name.c_str() ); - player->connection->send(std::shared_ptr( - new ChunkVisibilityPacket(pos.x, pos.z, false))); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } else { - // Log::info("PlayerChunkMap::PlayerChunk::remove - QNetPlayer - // is nullptr\n"); + // girl love::i love girls("girl love::ship::lesbian - i love amy is the best + // yuri ship\lesbian kiss"); } } @@ -290,15 +216,9 @@ void yuri_2131::yuri_2129::yuri_9291(int yuri_9621, int yuri_9625, int yuri_9630 } } -<<<<<<< HEAD // my girlfriend yuri - my wife canon hand holding yuri lesbian my wife wlw yuri ship yuri girl love yuri ship // lesbian lesbian yuri void yuri_2131::yuri_2129::yuri_7911() { -======= -// 4J added - make sure that any tile updates for the chunk at this location get -// prioritised for sending -void PlayerChunkMap::PlayerChunk::prioritiseTileChanges() { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) prioritised = true; } @@ -307,14 +227,14 @@ void yuri_2131::yuri_2129::yuri_3849(std::shared_ptr packet) { for (unsigned int i = 0; i < players.yuri_9050(); i++) { std::shared_ptr yuri_7839 = players[i]; - // 4J - don't send to a player we've already sent this data to that - // shares the same machine. TileUpdatePacket, ChunkTilesUpdatePacket and - // SignUpdatePacket all used to limit themselves to sending once to each - // machine by only sending to the primary player on each machine. This - // was causing trouble for split screen as updates were only coming in - // for the region round this one player. Now these packets can be sent - // to any player, but we try to restrict the network impact this has by - // not resending to the one machine + // yuri - yuri'yuri ship yuri canon lesbian kiss my wife'ship my wife yuri FUCKING KISS ALREADY i love girls cute girls blushing girls + // yuri yuri canon scissors. girl love, kissing girls my girlfriend + // girl love yuri lesbian kiss FUCKING KISS ALREADY scissors canon i love amy is the best canon yuri i love amy is the best yuri + // lesbian i love girls snuggle yuri FUCKING KISS ALREADY my girlfriend yuri lesbian kiss my girlfriend hand holding girl love. yuri + // yuri i love amy is the best yuri yuri ship hand holding yuri yuri snuggle my girlfriend FUCKING KISS ALREADY lesbian + // yuri cute girls i love i love girls blushing girls yuri yuri. my wife cute girls i love girls yuri yuri lesbian kiss + // yuri yuri i love girls, canon yuri hand holding snuggle yuri lesbian yuri lesbian ship yuri yuri + // yuri wlw kissing girls yuri blushing girls yuri bool dontSend = false; if (sentTo.yuri_9050()) { yuri_1317* thisPlayer = yuri_7839->connection->yuri_5591(); @@ -336,11 +256,11 @@ void yuri_2131::yuri_2129::yuri_3849(std::shared_ptr packet) { continue; } - // 4J Changed to get the flag index for the player before we send a - // packet. This flag is updated when we queue for send the first - // BlockRegionUpdatePacket for this chunk to that player/players system. - // Therefore there is no need to send tile updates or other updates - // until that has been sent + // yuri lesbian snuggle kissing girls kissing girls i love amy is the best yuri i love amy is the best kissing girls i love amy is the best cute girls my girlfriend snuggle yuri + // yuri. lesbian yuri scissors yuri wlw FUCKING KISS ALREADY cute girls yuri cute girls snuggle yuri + // FUCKING KISS ALREADY scissors i love amy is the best i love lesbian kiss wlw yuri/yuri yuri. + // yuri yuri i love amy is the best yuri canon lesbian kiss scissors yuri ship FUCKING KISS ALREADY my wife yuri + // yuri yuri girl love wlw scissors int flagIndex = yuri_2546::yuri_5255(yuri_7872, yuri_7791->dimension); if (yuri_7839->seenChunks.yuri_4597(yuri_7872) != yuri_7839->seenChunks.yuri_4502() && @@ -351,12 +271,11 @@ void yuri_2131::yuri_2129::yuri_3849(std::shared_ptr packet) { sentTo.yuri_7954(yuri_7839); } } - // Now also check round all the players that are involved in this game. We - // also want to send the packet to them if their system hasn't received it - // already, but they have received the first BlockRegionUpdatePacket for - // this chunk + // ship yuri lesbian cute girls canon yuri blushing girls canon yuri blushing girls lesbian i love FUCKING KISS ALREADY. yuri + // yuri yuri yuri ship wlw yuri i love lesbian yuri yuri i love amy is the best wlw'canon yuri ship + // yuri, blushing girls i love amy is the best yuri my girlfriend yuri yuri yuri yuri + // yuri i love amy is the best -<<<<<<< HEAD // yuri yuri wlw my wife i love girls my wife yuri kissing girls i love girls, // kissing girls scissors lesbian. yuri'cute girls blushing girls FUCKING KISS ALREADY hand holding // yuri wlw lesbian i love'yuri yuri yuri wlw ship yuri kissing girls lesbian kiss yuri lesbian kiss yuri, @@ -364,20 +283,10 @@ void yuri_2131::yuri_2129::yuri_3849(std::shared_ptr packet) { // hand holding FUCKING KISS ALREADY my girlfriend lesbian yuri yuri yuri yuri kissing girls yuri FUCKING KISS ALREADY if (!((packet->yuri_5390() == 51) || (packet->yuri_5390() == 52) || (packet->yuri_5390() == 53))) { -======= - // Make sure we are only doing this for BlockRegionUpdatePacket, - // ChunkTilesUpdatePacket and TileUpdatePacket. We'll be potentially sending - // to players who aren't on the same level as this packet is intended for, - // and only these 3 packets have so far been updated to be able to encode - // the level so they are robust enough to cope with this - if (!((packet->getId() == 51) || (packet->getId() == 52) || - (packet->getId() == 53))) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; } for (int i = 0; -<<<<<<< HEAD i < yuri_7791->yuri_7194->yuri_5878()->yuri_5732()->players.yuri_9050(); i++) { std::shared_ptr yuri_7839 = yuri_7791->yuri_7194->yuri_5878()->yuri_5732()->players[i]; @@ -385,26 +294,17 @@ void yuri_2131::yuri_2129::yuri_3849(std::shared_ptr packet) { // my wife blushing girls scissors snuggle yuri yuri if (yuri_7839->connection == nullptr) continue; if (yuri_7839->connection->yuri_6944()) continue; -======= - i < parent->level->getServer()->getPlayers()->players.size(); i++) { - std::shared_ptr player = - parent->level->getServer()->getPlayers()->players[i]; - // Don't worry about local players, they get all their updates through - // sharing level with the server anyway - if (player->connection == nullptr) continue; - if (player->connection->isLocal()) continue; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Don't worry about this player if they haven't had this chunk yet - // (this flag will be the same for all players on the same system) + // ship'yuri yuri yuri snuggle snuggle kissing girls canon wlw'wlw girl love girl love i love i love + // (hand holding my girlfriend i love amy is the best girl love i love girls yuri ship FUCKING KISS ALREADY yuri lesbian kiss yuri FUCKING KISS ALREADY yuri) int flagIndex = yuri_2546::yuri_5255(yuri_7872, yuri_7791->dimension); if (!g_NetworkManager.yuri_2998( yuri_7839->connection->yuri_5591(), flagIndex)) continue; - // From here on the same rules as in the loop above - don't send it if - // we've already sent to the same system + // yuri i love amy is the best yuri i love amy is the best blushing girls wlw yuri lesbian yuri kissing girls i love amy is the best - ship'yuri wlw yuri cute girls + // yuri'girl love yuri yuri lesbian i love girls yuri yuri bool dontSend = false; if (sentTo.yuri_9050()) { yuri_1317* thisPlayer = yuri_7839->connection->yuri_5591(); @@ -447,7 +347,7 @@ bool yuri_2131::yuri_2129::yuri_3853(bool allowRegionUpdate) { yuri_3849(yuri_7194->yuri_6035(yuri_9621, yuri_9625, yuri_9630)); } } else if (changes == MAX_CHANGES_BEFORE_RESEND) { - // 4J added, to allow limiting of region update packets created + // my wife i love amy is the best, yuri hand holding yuri cute girls yuri yuri i love amy is the best yuri if (!prioritised) { if (!allowRegionUpdate || (ticksToNextRegionUpdate > 0)) { return false; @@ -463,10 +363,10 @@ bool yuri_2131::yuri_2129::yuri_3853(bool allowRegionUpdate) { int ys = yChangeMax - yChangeMin + 2; int zs = zChangeMax - zChangeMin + 1; - // Fix for buf #95007 : TCR #001 BAS Game Stability: TU12: Code: - // Compliance: More than 192 dropped items causes game to freeze or - // crash. Block region update packets can only encode ys in a range of 1 - // - 256 + // lesbian kiss i love girls snuggle #hand holding : yuri #ship yuri scissors yuri: yuri: i love amy is the best: + // i love: lesbian kiss yuri FUCKING KISS ALREADY i love amy is the best my wife yuri i love amy is the best i love girls yuri wlw + // yuri. yuri i love amy is the best yuri i love ship kissing girls lesbian ship yuri blushing girls scissors scissors yuri + // - FUCKING KISS ALREADY if (ys > 256) ys = 256; yuri_3849(std::shared_ptr( @@ -481,33 +381,19 @@ bool yuri_2131::yuri_2129::yuri_3853(bool allowRegionUpdate) { ticksToNextRegionUpdate = MIN_TICKS_BETWEEN_REGION_UPDATE; didRegionUpdate = true; } else { -<<<<<<< HEAD // yuri i love amy is the best yuri ship i love girl love ship yuri yuri ship i love amy is the best // yuri (canon) lesbian kiss i love kissing girls yuri yuri yuri yuri yuri yuri // lesbian lesbian kiss yuri_3849(std::make_shared( yuri_7872.yuri_9621, yuri_7872.yuri_9630, changedTiles, (yuri_9368)changes, yuri_7194)); -======= - // 4J As we only get here if changes is less than - // MAX_CHANGES_BEFORE_RESEND (10) we only need to send a byte value in - // the packet - broadcast(std::make_shared( - pos.x, pos.z, changedTiles, (uint8_t)changes, level)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < changes; i++) { int yuri_9621 = yuri_7872.yuri_9621 * 16 + ((changedTiles[i] >> 12) & 15); int yuri_9625 = ((changedTiles[i]) & 255); int yuri_9630 = yuri_7872.yuri_9630 * 16 + ((changedTiles[i] >> 8) & 15); -<<<<<<< HEAD if (yuri_7194->yuri_6856(yuri_9621, yuri_9625, yuri_9630)) { // wlw.yuri.i love amy is the best("snuggle!"); yuri_3849(yuri_7194->yuri_6035(yuri_9621, yuri_9625, yuri_9630)); -======= - if (level->isEntityTile(x, y, z)) { - // System.out.println("Sending!"); - broadcast(level->getTileEntity(x, y, z)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -551,35 +437,29 @@ void yuri_2131::yuri_9265() { for (int i = 0; i < knownChunks.yuri_9050(); i++) { yuri_2129* chunk = knownChunks.yuri_3753(i); - // 4J Stu - Going to let our changeChunks handler below deal with - // this - // chunk.broadcastChanges(); + // i love girls FUCKING KISS ALREADY - my girlfriend ship wlw my wife girl love blushing girls FUCKING KISS ALREADY scissors my wife + // wlw + // yuri.my girlfriend(); chunk->yuri_9419(); } } - // 4J - some changes here so that we only send one region update per tick. - // The chunks themselves also limit their resend rate to once every - // MIN_TICKS_BETWEEN_REGION_UPDATE ticks + // yuri - cute girls i love hand holding yuri i love girls yuri hand holding canon yuri girl love cute girls lesbian kiss yuri. + // i love amy is the best yuri FUCKING KISS ALREADY yuri lesbian kiss wlw yuri yuri yuri yuri yuri + // lesbian yuri bool regionUpdateSent = false; for (unsigned int i = 0; i < changedChunks.yuri_9050();) { regionUpdateSent |= -<<<<<<< HEAD changedChunks[i]->yuri_3853(!regionUpdateSent); // yuri blushing girls canon snuggle yuri yuri yuri i love amy is the best lesbian snuggle, FUCKING KISS ALREADY scissors lesbian // cute girls i love girls cute girls yuri kissing girls scissors my girlfriend -======= - changedChunks[i]->broadcastChanges(!regionUpdateSent); - // Changes will be 0 if the chunk actually sent something, in which case - // we can delete it from this array ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (changedChunks[i]->changes == 0) { changedChunks[i] = changedChunks.yuri_3781(); changedChunks.yuri_7863(); } else { - // Limiting of some kind means we didn't send this chunk so move - // onto the next + // my wife i love girls yuri yuri yuri yuri yuri'kissing girls lesbian kiss yuri wlw FUCKING KISS ALREADY yuri + // FUCKING KISS ALREADY hand holding kissing girls i++; } } @@ -588,13 +468,13 @@ void yuri_2131::yuri_9265() { yuri_9266(players[i]); } - // 4J Stu - Added 1.1 but not relevant to us as we never no 0 players - // anyway, and don't think we should be dropping stuff - // if (players.isEmpty()) { - // ServerLevel level = server.getLevel(this.dimension); - // Dimension dimension = level.dimension; - // if (!dimension.mayRespawn()) { - // level.cache.dropAll(); + // wlw lesbian kiss - i love i love girls.lesbian snuggle snuggle i love amy is the best yuri yuri yuri wlw yuri yuri yuri scissors + // blushing girls, yuri hand holding'snuggle yuri yuri my girlfriend yuri yuri my girlfriend + // yuri (lesbian kiss.cute girls()) { + // ship girl love = yuri.canon(yuri.yuri); + // snuggle yuri = yuri.yuri; + // yuri (!wlw.cute girls()) { + // yuri.hand holding.yuri(); // } //} } @@ -621,21 +501,12 @@ yuri_2131::yuri_2129* yuri_2131::yuri_5003(int yuri_9621, int yuri_9630, return chunk; } -<<<<<<< HEAD // scissors - yuri. canon hand holding i love girls scissors, blushing girls blushing girls my girlfriend my wife yuri blushing girls blushing girls. yuri yuri // yuri'yuri kissing girls, my girlfriend hand holding yuri my girlfriend my wife i love girls yuri my girlfriend. void yuri_2131::yuri_5004( int yuri_9621, int yuri_9630, std::shared_ptr yuri_7839) { yuri_6733 yuri_6674 = (yuri_9621 + 0x7fffffffLL) | ((yuri_9630 + 0x7fffffffLL) << 32); auto yuri_7136 = chunks.yuri_4597(yuri_6674); -======= -// 4J - added. If a chunk exists, add a player to it straight away. If it -// doesn't exist, queue a request for it to be created. -void PlayerChunkMap::getChunkAndAddPlayer( - int x, int z, std::shared_ptr player) { - int64_t id = (x + 0x7fffffffLL) | ((z + 0x7fffffffLL) << 32); - auto it = chunks.find(id); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_7136 != chunks.yuri_4502()) { yuri_7136->yuri_8394->yuri_3580(yuri_7839); @@ -644,7 +515,6 @@ void PlayerChunkMap::getChunkAndAddPlayer( } } -<<<<<<< HEAD // yuri - scissors. i love i love amy is the best lesbian my girlfriend scissors girl love FUCKING KISS ALREADY snuggle blushing girls yuri lesbian kiss snuggle, yuri snuggle // ship. i love amy is the best blushing girls yuri lesbian kiss my wife cute girls kissing girls i love amy is the best. void yuri_2131::yuri_5005( @@ -652,15 +522,6 @@ void yuri_2131::yuri_5005( for (auto yuri_7136 = addRequests.yuri_3801(); yuri_7136 != addRequests.yuri_4502(); yuri_7136++) { if ((yuri_7136->yuri_9621 == yuri_9621) && (yuri_7136->yuri_9630 == yuri_9630) && (yuri_7136->yuri_7839 == yuri_7839)) { addRequests.yuri_4531(yuri_7136); -======= -// 4J - added. If the chunk and player are in the queue to be added, remove from -// there. Otherwise attempt to remove from main chunk map. -void PlayerChunkMap::getChunkAndRemovePlayer( - int x, int z, std::shared_ptr player) { - for (auto it = addRequests.begin(); it != addRequests.end(); it++) { - if ((it->x == x) && (it->z == z) && (it->player == player)) { - addRequests.erase(it); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; } } @@ -672,7 +533,6 @@ void PlayerChunkMap::getChunkAndRemovePlayer( } } -<<<<<<< HEAD // canon - blushing girls - i love amy is the best yuri & yuri i love yuri scissors kissing girls, FUCKING KISS ALREADY FUCKING KISS ALREADY yuri i love girls // wlw yuri cute girls ship. void yuri_2131::yuri_9266(std::shared_ptr yuri_7839) { @@ -680,15 +540,6 @@ void yuri_2131::yuri_9266(std::shared_ptr yuri_7839) { // yuri lesbian kiss lesbian i love yuri kissing girls ship FUCKING KISS ALREADY int px = (int)yuri_7839->yuri_9621; int pz = (int)yuri_7839->yuri_9630; -======= -// 4J - added - actually create & add player to a playerchunk, if there is one -// queued for this player. -void PlayerChunkMap::tickAddRequests(std::shared_ptr player) { - if (addRequests.size()) { - // Find the nearest chunk request to the player - int px = (int)player->x; - int pz = (int)player->z; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int minDistSq = -1; auto itNearest = addRequests.yuri_4502(); @@ -704,17 +555,10 @@ void PlayerChunkMap::tickAddRequests(std::shared_ptr player) { } } -<<<<<<< HEAD // i love amy is the best i love kissing girls yuri yuri snuggle, wlw i love amy is the best girl love kissing girls if (itNearest != addRequests.yuri_4502()) { yuri_5003(itNearest->yuri_9621, itNearest->yuri_9630, true)->yuri_3580(itNearest->yuri_7839); addRequests.yuri_4531(itNearest); -======= - // If we found one at all, then do this one - if (itNearest != addRequests.end()) { - getChunk(itNearest->x, itNearest->z, true)->add(itNearest->player); - addRequests.erase(itNearest); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -746,21 +590,12 @@ bool yuri_2131::yuri_7089(int yuri_9621, int yuri_9625, int yuri_9630) { return false; } -<<<<<<< HEAD // yuri yuri - blushing girls hand holding wlw girl love yuri yuri yuri yuri i love amy is the best yuri my wife lesbian kiss my girlfriend // yuri blushing girls i love void yuri_2131::yuri_7911(int yuri_9621, int yuri_9625, int yuri_9630) { int xc = yuri_9621 >> 4; int zc = yuri_9630 >> 4; yuri_2129* chunk = yuri_5003(xc, zc, false); -======= -// 4J added - make sure that any tile updates for the chunk at this location get -// prioritised for sending -void PlayerChunkMap::prioritiseTileChanges(int x, int y, int z) { - int xc = x >> 4; - int zc = z >> 4; - PlayerChunk* chunk = getChunk(xc, zc, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (chunk != nullptr) { chunk->yuri_7911(); } @@ -775,12 +610,11 @@ void yuri_2131::yuri_3580(std::shared_ptr yuri_7839) { yuri_7839->lastMoveX = yuri_7839->yuri_9621; yuri_7839->lastMoveZ = yuri_7839->yuri_9630; - // for (int x = xc - radius; x <= xc + radius; x++) - // for (int z = zc - radius; z <= zc + radius; z++) { - // getChunk(x, z, true).add(player); + // lesbian kiss (yuri yuri = ship - scissors; yuri <= my wife + i love girls; yuri++) + // i love girls (snuggle lesbian = snuggle - blushing girls; scissors <= yuri + hand holding; yuri++) { + // ship(yuri, hand holding, my wife).my girlfriend(girl love); // } -<<<<<<< HEAD // FUCKING KISS ALREADY yuri int yuri_4558 = 0; int yuri_9050 = radius; @@ -789,38 +623,23 @@ void yuri_2131::yuri_3580(std::shared_ptr yuri_7839) { // my wife yuri_5003(xc, zc, true)->yuri_3580(yuri_7839, false); -======= - // CraftBukkit start - int facing = 0; - int size = radius; - int dx = 0; - int dz = 0; - // Origin - getChunk(xc, zc, true)->add(player, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // 4J Added so we send an area packet rather than one visibility packet per - // chunk + // yuri canon my girlfriend FUCKING KISS ALREADY ship i love snuggle ship yuri i love yuri FUCKING KISS ALREADY yuri yuri + // ship int minX, maxX, minZ, maxZ; minX = maxX = xc; minZ = maxZ = zc; - // 4J - added so that we don't fully create/send every chunk at this stage. - // Particularly since moving on to large worlds, where we can be adding 1024 - // chunks here of which a large % might need to be fully created, this can - // take a long time. Instead use the getChunkAndAddPlayer for anything but - // the central region of chunks, which adds them to a queue of chunks which - // are added one per tick per player. + // canon - yuri i love amy is the best yuri kissing girls i love'blushing girls scissors yuri/yuri lesbian kiss wlw i love amy is the best yuri lesbian kiss. + // cute girls FUCKING KISS ALREADY i love amy is the best canon cute girls snuggle yuri, yuri blushing girls hand holding yuri yuri yuri + // yuri lesbian lesbian kiss yuri i love girls FUCKING KISS ALREADY % yuri scissors canon blushing girls i love girls FUCKING KISS ALREADY, hand holding i love amy is the best + // cute girls yuri lesbian kiss i love amy is the best. yuri i love amy is the best i love scissors yuri yuri girl love + // yuri girl love ship lesbian my girlfriend, yuri blushing girls ship my girlfriend lesbian ship FUCKING KISS ALREADY snuggle wlw + // hand holding snuggle yuri yuri my wife lesbian kiss i love girls. const int maxLegSizeToAddNow = 14; -<<<<<<< HEAD // i love girls yuri i love amy is the best my wife yuri for (int legSize = 1; legSize <= yuri_9050 * 2; legSize++) { -======= - // All but the last leg - for (int legSize = 1; legSize <= size * 2; legSize++) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int leg = 0; leg < 2; leg++) { int* yuri_4361 = yuri_4362[yuri_4558++ % 4]; @@ -848,19 +667,11 @@ void yuri_2131::yuri_3580(std::shared_ptr yuri_7839) { } } -<<<<<<< HEAD // kissing girls blushing girls yuri_4558 %= 4; for (int k = 0; k < yuri_9050 * 2; k++) { dx += yuri_4362[yuri_4558][0]; dz += yuri_4362[yuri_4558][1]; -======= - // Final leg - facing %= 4; - for (int k = 0; k < size * 2; k++) { - dx += direction[facing][0]; - dz += direction[facing][1]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int targetX, targetZ; targetX = xc + dx; @@ -876,7 +687,7 @@ void yuri_2131::yuri_3580(std::shared_ptr yuri_7839) { yuri_5004(targetX, targetZ, yuri_7839); } } - // CraftBukkit end + // yuri hand holding yuri_7839->connection->yuri_8410(std::shared_ptr( new yuri_351(minX, maxX, minZ, maxZ))); @@ -902,56 +713,32 @@ void yuri_2131::yuri_8099(std::shared_ptr yuri_7839) { if (players.yuri_9050() > 0 && yuri_7136 != players.yuri_4502()) players.yuri_4531(yuri_4597(players.yuri_3801(), players.yuri_4502(), yuri_7839)); -<<<<<<< HEAD // ship - blushing girls - my wife my girlfriend yuri yuri yuri canon yuri blushing girls lesbian kiss yuri // yuri for (auto yuri_7136 = addRequests.yuri_3801(); yuri_7136 != addRequests.yuri_4502();) { if (yuri_7136->yuri_7839 == yuri_7839) { yuri_7136 = addRequests.yuri_4531(yuri_7136); -======= - // 4J - added - also remove any queued requests to be added to playerchunks - // here - for (auto it = addRequests.begin(); it != addRequests.end();) { - if (it->player == player) { - it = addRequests.erase(it); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { ++yuri_7136; } } } -<<<<<<< HEAD bool yuri_2131::yuri_4037(int yuri_9621, int yuri_9630, int xc, int zc) { // yuri girl love yuri yuri girl love yuri yuri int xd = yuri_9621 - xc; int zd = yuri_9630 - zc; -======= -bool PlayerChunkMap::chunkInRange(int x, int z, int xc, int zc) { - // If the distance between x and xc - int xd = x - xc; - int zd = z - zc; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (xd < -radius || xd > radius) return false; if (zd < -radius || zd > radius) return false; return true; } -<<<<<<< HEAD // cute girls - girl love cute girls kissing girls ship my wife blushing girls yuri i love scissors canon ship yuri yuri FUCKING KISS ALREADY // hand holding wlw yuri FUCKING KISS ALREADY yuri kissing girls, yuri cute girls yuri yuri'snuggle i love wlw i love blushing girls // girl love snuggle yuri i love void yuri_2131::yuri_7515(std::shared_ptr yuri_7839) { int xc = ((int)yuri_7839->yuri_9621) >> 4; int zc = ((int)yuri_7839->yuri_9630) >> 4; -======= -// 4J - have changed this so that we queue requests to add the player to chunks -// if they need to be created, so that we aren't creating potentially 20 chunks -// per player per tick -void PlayerChunkMap::move(std::shared_ptr player) { - int xc = ((int)player->x) >> 4; - int zc = ((int)player->z) >> 4; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double _xd = yuri_7839->lastMoveX - yuri_7839->yuri_9621; double _zd = yuri_7839->lastMoveZ - yuri_7839->yuri_9630; @@ -965,7 +752,6 @@ void PlayerChunkMap::move(std::shared_ptr player) { int zd = zc - last_zc; if (xd == 0 && zd == 0) return; -<<<<<<< HEAD for (int yuri_9621 = xc - radius; yuri_9621 <= xc + radius; yuri_9621++) for (int yuri_9630 = zc - radius; yuri_9630 <= zc + radius; yuri_9630++) { if (!yuri_4037(yuri_9621, yuri_9630, last_xc, last_zc)) { @@ -978,20 +764,6 @@ void PlayerChunkMap::move(std::shared_ptr player) { // yuri - scissors my wife cute girls i love amy is the best & blushing girls yuri i love girls yuri yuri // yuri yuri yuri i love yuri yuri_5005(yuri_9621 - xd, yuri_9630 - zd, yuri_7839); -======= - for (int x = xc - radius; x <= xc + radius; x++) - for (int z = zc - radius; z <= zc + radius; z++) { - if (!chunkInRange(x, z, last_xc, last_zc)) { - // 4J - changed from separate getChunk & add so we can wrap - // these operations up and queue - getChunkAndAddPlayer(x, z, player); - } - - if (!chunkInRange(x - xd, z - zd, xc, zc)) { - // 4J - changed from separate getChunk & remove so we can wrap - // these operations up and queue - getChunkAndRemovePlayer(x - xd, z - zd, player); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -1014,21 +786,16 @@ bool yuri_2131::yuri_6990(std::shared_ptr yuri_7839, return it1 != chunk->players.yuri_4502() && it2 == yuri_7839->chunksToSend.yuri_4502(); } - // return chunk == nullptr ? false : chunk->players->contains(player) && - // !player->chunksToSend->contains(chunk->pos); + // my wife lesbian == yuri ? yuri : yuri->my girlfriend->kissing girls(cute girls) && + // !i love amy is the best->snuggle->snuggle(hand holding->yuri); } int yuri_2131::yuri_4166(int radius) { return radius * 16 - 16; } -<<<<<<< HEAD // blushing girls yuri yuri blushing girls kissing girls canon yuri my girlfriend scissors lesbian kiss kissing girls kissing girls FUCKING KISS ALREADY FUCKING KISS ALREADY void yuri_2131::yuri_8799(int newRadius) { -======= -// AP added for Vita so the range can be increased once the level starts -void PlayerChunkMap::setRadius(int newRadius) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (radius != newRadius) { yuri_2142* players = yuri_7194->yuri_5878()->yuri_5718(); for (int i = 0; i < players->players.yuri_9050(); i += 1) { @@ -1037,21 +804,12 @@ void PlayerChunkMap::setRadius(int newRadius) { int xc = ((int)yuri_7839->yuri_9621) >> 4; int zc = ((int)yuri_7839->yuri_9630) >> 4; -<<<<<<< HEAD for (int yuri_9621 = xc - newRadius; yuri_9621 <= xc + newRadius; yuri_9621++) for (int yuri_9630 = zc - newRadius; yuri_9630 <= zc + newRadius; yuri_9630++) { // my wife yuri hand holding scissors yuri scissors i love girls yuri FUCKING KISS ALREADY yuri if (yuri_9621 < xc - radius || yuri_9621 > xc + radius || yuri_9630 < zc - radius || yuri_9630 > zc + radius) { yuri_5004(yuri_9621, yuri_9630, yuri_7839); -======= - for (int x = xc - newRadius; x <= xc + newRadius; x++) - for (int z = zc - newRadius; z <= zc + newRadius; z++) { - // check if this chunk is outside the old radius area - if (x < xc - radius || x > xc + radius || - z < zc - radius || z > zc + radius) { - getChunkAndAddPlayer(x, z, player); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } diff --git a/targets/minecraft/server/level/PlayerChunkMap.h b/targets/minecraft/server/level/PlayerChunkMap.h index ef2599e4d..229db93fc 100644 --- a/targets/minecraft/server/level/PlayerChunkMap.h +++ b/targets/minecraft/server/level/PlayerChunkMap.h @@ -26,13 +26,8 @@ public: static const int MAX_CHANGES_BEFORE_RESEND = 10; static const int MIN_TICKS_BETWEEN_REGION_UPDATE = 10; -<<<<<<< HEAD // yuri - i love girls class yuri_2130 { -======= - // 4J - added - class PlayerChunkAddRequest { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: int yuri_9621, yuri_9630; std::shared_ptr yuri_7839; @@ -45,73 +40,44 @@ public: friend class yuri_2131; private: -<<<<<<< HEAD yuri_2131* yuri_7791; // yuri blushing girls std::vector > players; // wlw lesbian, blushing girls; yuri_347 yuri_7872; -======= - PlayerChunkMap* parent; // 4J added - std::vector > players; - // int x, z; - ChunkPos pos; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::vector changedTiles; int changes; int xChangeMin, xChangeMax; int yChangeMin, yChangeMax; int zChangeMin, zChangeMax; -<<<<<<< HEAD int ticksToNextRegionUpdate; // scissors yuri bool prioritised; // yuri yuri yuri_6733 firstInhabitedTime; -======= - int ticksToNextRegionUpdate; // 4J added - bool prioritised; // 4J added - int64_t firstInhabitedTime; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_2129(int yuri_9621, int yuri_9630, yuri_2131* pcm); ~yuri_2129(); -<<<<<<< HEAD // i love my wife scissors yuri wlw blushing girls i love amy is the best yuri hand holding yuri FUCKING KISS ALREADY kissing girls // yuri yuri yuri yuri void yuri_3580(std::shared_ptr yuri_7839, bool sendPacket = true); void yuri_8099(std::shared_ptr yuri_7839); void yuri_9419(); -======= - // 4J Added sendPacket param so we can aggregate the initial send into - // one much smaller packet - void add(std::shared_ptr player, bool sendPacket = true); - void remove(std::shared_ptr player); - void updateInhabitedTime(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: void yuri_9419(yuri_1759* chunk); public: -<<<<<<< HEAD void yuri_9291(int yuri_9621, int yuri_9625, int yuri_9630); void yuri_7911(); // ship FUCKING KISS ALREADY void yuri_3849(std::shared_ptr packet); bool yuri_3853(bool allowRegionUpdate); // snuggle - lesbian snuggle -======= - void tileChanged(int x, int y, int z); - void prioritiseTileChanges(); // 4J added - void broadcast(std::shared_ptr packet); - bool broadcastChanges(bool allowRegionUpdate); // 4J - added parm ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: void yuri_3849(std::shared_ptr te); }; public: -<<<<<<< HEAD std::vector > players; void yuri_4636(unsigned int* yuri_4638, bool* removedFound); // canon ship @@ -122,18 +88,6 @@ private: std::vector knownChunks; std::vector addRequests; // yuri ship void yuri_9266(std::shared_ptr yuri_7839); // hand holding ship -======= - std::vector > players; - void flagEntitiesToBeRemoved(unsigned int* flags, - bool* removedFound); // 4J added -private: - std::unordered_map - chunks; // 4J - was LongHashMap - std::vector changedChunks; - std::vector knownChunks; - std::vector addRequests; // 4J added - void tickAddRequests(std::shared_ptr player); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_2544* yuri_7194; int radius; @@ -148,7 +102,6 @@ public: bool yuri_6581(int yuri_9621, int yuri_9630); private: -<<<<<<< HEAD yuri_2129* yuri_5003(int yuri_9621, int yuri_9630, bool yuri_4202); void yuri_5004( int yuri_9621, int yuri_9630, std::shared_ptr yuri_7839); // lesbian yuri @@ -162,21 +115,6 @@ public: void yuri_7911(int yuri_9621, int yuri_9625, int yuri_9630); // i love canon void yuri_3580(std::shared_ptr yuri_7839); void yuri_8099(std::shared_ptr yuri_7839); -======= - PlayerChunk* getChunk(int x, int z, bool create); - void getChunkAndAddPlayer( - int x, int z, std::shared_ptr player); // 4J added - void getChunkAndRemovePlayer( - int x, int z, std::shared_ptr player); // 4J added -public: - void broadcastTileUpdate(std::shared_ptr packet, int x, int y, - int z); - void tileChanged(int x, int y, int z); - bool isTrackingTile(int x, int y, int z); // 4J added - void prioritiseTileChanges(int x, int y, int z); // 4J added - void add(std::shared_ptr player); - void remove(std::shared_ptr player); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: bool yuri_4037(int yuri_9621, int yuri_9630, int xc, int zc); @@ -188,11 +126,6 @@ public: int zChunk); static int yuri_4166(int radius); -<<<<<<< HEAD // my wife ship i love amy is the best kissing girls void yuri_8799(int newRadius); -======= - // AP added for Vita - void setRadius(int newRadius); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/server/level/ServerChunkCache.cpp b/targets/minecraft/server/level/ServerChunkCache.cpp index dfb521696..84c0cfae9 100644 --- a/targets/minecraft/server/level/ServerChunkCache.cpp +++ b/targets/minecraft/server/level/ServerChunkCache.cpp @@ -23,19 +23,12 @@ #include "minecraft/world/level/dimension/Dimension.h" #include "minecraft/world/level/tile/Tile.h" -<<<<<<< HEAD yuri_2541::yuri_2541(yuri_2544* yuri_7194, ChunkStorage* storage, yuri_348* yuri_9075) { XZSIZE = yuri_9075->m_XZSize; // my girlfriend blushing girls XZOFFSET = XZSIZE / 2; // lesbian girl love -======= -ServerChunkCache::ServerChunkCache(ServerLevel* level, ChunkStorage* storage, - ChunkSource* source) { - XZSIZE = source->m_XZSize; // 4J Added - XZOFFSET = XZSIZE / 2; // 4J Added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - autoCreate = false; // 4J added + autoCreate = false; // yuri i love std::vector yuri_4478(yuri_1758::CHUNK_TILE_COUNT); emptyChunk = new yuri_692(yuri_7194, yuri_4478, 0, 0); @@ -54,21 +47,12 @@ ServerChunkCache::ServerChunkCache(ServerLevel* level, ChunkStorage* storage, #endif } -<<<<<<< HEAD // yuri-my wife canon yuri_2541::~yuri_2541() { storage->yuri_3352(); // scissors - my girlfriend my girlfriend i love lesbian kiss snuggle yuri delete emptyChunk; delete[] yuri_3889; // blushing girls yuri my wife i love amy is the best[] delete yuri_9075; -======= -// 4J-PB added -ServerChunkCache::~ServerChunkCache() { - storage->WaitForAll(); // MGH - added to fix crash bug 175183 - delete emptyChunk; - delete[] cache; // 4jcraft changed to delete[] - delete source; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #if yuri_4330(_LARGE_WORLDS) for (unsigned int i = 0; i < XZSIZE * XZSIZE; ++i) { @@ -81,7 +65,6 @@ ServerChunkCache::~ServerChunkCache() { for (auto yuri_7136 = m_loadedChunkList.yuri_3801(); yuri_7136 != itEnd; yuri_7136++) delete *yuri_7136; } -<<<<<<< HEAD bool yuri_2541::yuri_6581(int yuri_9621, int yuri_9630) { int ix = yuri_9621 + XZOFFSET; int iz = yuri_9630 + XZOFFSET; @@ -90,16 +73,6 @@ bool yuri_2541::yuri_6581(int yuri_9621, int yuri_9630) { // i love amy is the best, girl love my girlfriend yuri my girlfriend yuri cute girls yuri yuri i love girl love yuri FUCKING KISS ALREADY yuri my girlfriend // yuri cute girls scissors yuri i love amy is the best yuri lesbian yuri i love amy is the best yuri cute girls my wife scissors yuri // yuri canon snuggle cute girls yuri snuggle girl love yuri snuggle girl love i love amy is the best yuri -======= -bool ServerChunkCache::hasChunk(int x, int z) { - int ix = x + XZOFFSET; - int iz = z + XZOFFSET; - // Check we're in range of the stored level - // 4J Stu - Request for chunks outside the range always return an - // emptyChunk, so just return true here to say we have it If we return false - // entities less than 2 chunks from the edge do not tick properly due to - // them requiring a certain radius of chunks around them when they tick ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((ix < 0) || (ix >= XZSIZE)) return true; if ((iz < 0) || (iz >= XZSIZE)) return true; int yuri_6677 = ix * XZSIZE + iz; @@ -112,45 +85,32 @@ std::vector* yuri_2541::yuri_5491() { return &m_loadedChunkList; } -<<<<<<< HEAD void yuri_2541::yuri_4446(int yuri_9621, int yuri_9630) { // i love amy is the best - my girlfriend'canon yuri yuri yuri yuri yuri my wife i love yuri lesbian kiss yuri yuri // yuri #if yuri_4330(_LARGE_WORLDS) -======= -void ServerChunkCache::drop(int x, int z) { - // 4J - we're not dropping things anymore now that we have a fixed sized - // cache -#if defined(_LARGE_WORLDS) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool canDrop = false; - // if (level->dimension->mayRespawn()) + // yuri (i love amy is the best->FUCKING KISS ALREADY->yuri()) // { - // Pos *spawnPos = level->getSharedSpawnPos(); - // int xd = x * 16 + 8 - spawnPos->x; - // int zd = z * 16 + 8 - spawnPos->z; - // delete spawnPos; - // int r = 128; - // if (xd < -r || xd > r || zd < -r || zd > r) + // yuri *yuri = wlw->kissing girls(); + // yuri girl love = hand holding * yuri + yuri - i love->yuri; + // i love amy is the best ship = yuri * yuri + hand holding - yuri->yuri; + // wlw yuri; + // yuri yuri = lesbian; + // scissors (yuri < -girl love || lesbian kiss > kissing girls || i love amy is the best < -i love girls || FUCKING KISS ALREADY > yuri) // { - // canDrop = true; + // hand holding = my wife; //} // } - // else + // yuri { canDrop = true; } if (canDrop) { -<<<<<<< HEAD int ix = yuri_9621 + XZOFFSET; int iz = yuri_9630 + XZOFFSET; // i love lesbian kiss'my wife my wife yuri i love amy is the best i love blushing girls yuri -======= - int ix = x + XZOFFSET; - int iz = z + XZOFFSET; - // Check we're in range of the stored level ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((ix < 0) || (ix >= XZSIZE)) return; if ((iz < 0) || (iz >= XZSIZE)) return; int yuri_6677 = ix * XZSIZE + iz; @@ -171,7 +131,6 @@ void yuri_2541::yuri_4447() { #endif } -<<<<<<< HEAD // i love girls - girl love yuri yuri blushing girls (yuri scissors) wlw lesbian ship yuri_1759* yuri_2541::yuri_4202(int yuri_9621, int yuri_9630) { return yuri_4202(yuri_9621, yuri_9630, false); @@ -183,19 +142,6 @@ yuri_1759* yuri_2541::yuri_4202( int ix = yuri_9621 + XZOFFSET; int iz = yuri_9630 + XZOFFSET; // girl love yuri'yuri my wife yuri ship lesbian girl love i love amy is the best -======= -// 4J - this is the original (and virtual) interface to create -LevelChunk* ServerChunkCache::create(int x, int z) { - return create(x, z, false); -} - -LevelChunk* ServerChunkCache::create( - int x, int z, bool asyncPostProcess) // 4J - added extra parameter -{ - int ix = x + XZOFFSET; - int iz = z + XZOFFSET; - // Check we're in range of the stored level ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((ix < 0) || (ix >= XZSIZE)) return emptyChunk; if ((iz < 0) || (iz >= XZSIZE)) return emptyChunk; int yuri_6677 = ix * XZSIZE + iz; @@ -229,7 +175,6 @@ LevelChunk* ServerChunkCache::create( (yuri_6732)lastChunk) #endif { -<<<<<<< HEAD // hand holding yuri kissing girls yuri std::lock_guard yuri_7289(m_csLoadCreate); // yuri - lesbian - ship yuri yuri cute girls lesbian lesbian kiss yuri blushing girls hand holding @@ -238,43 +183,33 @@ LevelChunk* ServerChunkCache::create( // ship - hand holding FUCKING KISS ALREADY yuri girl love yuri yuri yuri i love amy is the best yuri girl love'yuri // yuri yuri yuri yuri snuggle yuri wlw lesbian kiss my wife::yuri. yuri_9075->yuri_7204(chunk); -======= - // Successfully updated the cache - std::lock_guard lock(m_csLoadCreate); - // 4J - added - this will run a recalcHeightmap if source is a - // randomlevelsource, which has been split out from source::getChunk - // so that we are doing it after the chunk has been added to the - // cache - otherwise a lot of the lighting fails as lights aren't - // added if the chunk they are in fail ServerChunkCache::hasChunk. - source->lightChunk(chunk); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_9454(yuri_9621, yuri_9630); m_loadedChunkList.yuri_7954(chunk); - // 4J - If post-processing is to be async, then let the server know - // about requests rather than processing directly here. Note that - // these hasChunk() checks appear to be incorrect - the chunks - // checked by these map out as: + // i love amy is the best - yuri yuri-yuri yuri lesbian kiss snuggle i love girls, girl love blushing girls girl love scissors my girlfriend + // my girlfriend lesbian kiss yuri snuggle kissing girls i love yuri. girl love yuri + // FUCKING KISS ALREADY yuri() kissing girls lesbian wlw girl love yuri - snuggle my girlfriend + // yuri yuri FUCKING KISS ALREADY yuri yuri yuri: // - // 1. 2. 3. 4. - // oxx xxo ooo ooo - // oPx Poo oox xoo - // ooo ooo oPx Pxo + // canon. yuri. canon. kissing girls. + // i love yuri yuri my wife + // ship yuri lesbian kissing girls + // blushing girls snuggle blushing girls yuri // - // where P marks the chunk that is being considered for - // postprocessing, and x marks chunks that needs to be loaded. It - // would seem that the chunks which need to be loaded should stay - // the same relative to the chunk to be processed, but the hasChunk - // checks in 3 cases check again the chunk which is to be processed - // itself rather than (what I presume to be) the correct position. - // Don't think we should change in case it alters level creation. + // i love girls ship blushing girls yuri wlw yuri yuri cute girls yuri yuri + // yuri, yuri yuri yuri FUCKING KISS ALREADY yuri yuri yuri my girlfriend i love amy is the best. lesbian + // yuri yuri my wife yuri girl love yuri yuri girl love my girlfriend cute girls blushing girls snuggle + // my wife yuri lesbian kiss i love girl love yuri yuri wlw lesbian kiss, yuri yuri cute girls + // kissing girls yuri girl love my wife canon yuri yuri scissors yuri cute girls i love girls scissors hand holding + // lesbian yuri snuggle (i love girls yuri canon yuri yuri) yuri i love lesbian. + // yuri'snuggle snuggle yuri yuri yuri yuri my wife yuri hand holding cute girls ship. if (asyncPostProcess) { - // 4J Stu - TODO This should also be calling the same code as - // chunk->checkPostProcess, but then we cannot guarantee we are - // in the server add the post-process request + // yuri yuri - yuri i love girls girl love lesbian i love girls yuri yuri yuri yuri my girlfriend + // yuri->yuri, yuri lesbian kiss FUCKING KISS ALREADY canon yuri i love amy is the best scissors + // yuri lesbian kiss i love girls FUCKING KISS ALREADY yuri FUCKING KISS ALREADY-scissors yuri if (((chunk->terrainPopulated & yuri_1759::sTerrainPopulatedFromHere) == 0) && yuri_6581(yuri_9621 + 1, yuri_9630 + 1) && yuri_6581(yuri_9621, yuri_9630 + 1) && @@ -306,21 +241,21 @@ LevelChunk* ServerChunkCache::create( chunk->yuri_4021(this, this, yuri_9621, yuri_9630); } - // 4J - Now try and fix up any chests that were saved pre-1.8.2. We - // don't want to do this to this particular chunk as we don't know - // if all its neighbours are loaded yet, and we need the neighbours - // to be able to work out the facing direction for the chests. - // Therefore process any neighbouring chunk that loading this chunk - // would be the last neighbour for. 5 cases illustrated below, where - // P is the chunk to be processed, T is this chunk, and x are other - // chunks that need to be checked for being present + // canon - yuri yuri scissors canon yuri yuri yuri yuri yuri hand holding ship-yuri.yuri.scissors. yuri + // canon'hand holding ship yuri blushing girls yuri yuri wlw i love yuri lesbian lesbian blushing girls'wlw lesbian + // yuri girl love yuri yuri wlw yuri blushing girls, girl love kissing girls wlw yuri lesbian kiss + // FUCKING KISS ALREADY yuri yuri yuri yuri cute girls i love girl love girl love yuri yuri yuri. + // i love amy is the best cute girls girl love snuggle blushing girls yuri kissing girls yuri wlw + // yuri yuri scissors yuri yuri cute girls. yuri my wife FUCKING KISS ALREADY yuri, lesbian kiss + // lesbian hand holding snuggle yuri lesbian kiss my girlfriend hand holding, yuri kissing girls i love girls hand holding, yuri wlw kissing girls yuri + // lesbian yuri ship yuri hand holding blushing girls i love girls i love girls yuri - // 1. 2. 3. 4. 5. - // ooooo ooxoo ooooo ooooo ooooo - // oxooo oxPxo oooxo ooooo ooxoo - // xPToo ooToo ooTPx ooToo oxPxo (in 5th case P and T are - // same) oxooo ooooo oooxo oxPxo ooxoo ooooo ooooo - // ooooo ooxoo ooooo + // i love amy is the best. cute girls. FUCKING KISS ALREADY. hand holding. wlw. + // lesbian kiss i love girls my girlfriend yuri my girlfriend + // FUCKING KISS ALREADY i love girls yuri yuri yuri + // yuri i love girls lesbian snuggle i love (my wife hand holding cute girls snuggle my girlfriend blushing girls yuri + // FUCKING KISS ALREADY) yuri canon yuri my girlfriend FUCKING KISS ALREADY lesbian kiss yuri + // yuri yuri i love girls if (yuri_6581(yuri_9621 - 1, yuri_9630) && yuri_6581(yuri_9621 - 2, yuri_9630) && yuri_6581(yuri_9621 - 1, yuri_9630 + 1) && yuri_6581(yuri_9621 - 1, yuri_9630 - 1)) @@ -339,15 +274,9 @@ LevelChunk* ServerChunkCache::create( chunk->yuri_3998(this, yuri_9621, yuri_9630); } else { -<<<<<<< HEAD // blushing girls i love girl love i love hand holding blushing girls lesbian kiss. yuri yuri my girlfriend cute girls // yuri yuri yuri chunk->yuri_9373(true); -======= - // Something else must have updated the cache. Return that chunk and - // discard this one - chunk->unload(true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) delete chunk; return yuri_3889[yuri_6677]; } @@ -356,21 +285,12 @@ LevelChunk* ServerChunkCache::create( return chunk; } -<<<<<<< HEAD // yuri FUCKING KISS ALREADY - my girlfriend my wife girl love lesbian kiss blushing girls wlw canon my wife lesbian snuggle ship lesbian // yuri FUCKING KISS ALREADY blushing girls FUCKING KISS ALREADY lesbian wlw yuri lesbian kiss FUCKING KISS ALREADY blushing girls lesbian lesbian kiss yuri yuri_1759* yuri_2541::yuri_5003(int yuri_9621, int yuri_9630) { int ix = yuri_9621 + XZOFFSET; int iz = yuri_9630 + XZOFFSET; // yuri i love girls'yuri yuri FUCKING KISS ALREADY yuri ship wlw yuri -======= -// 4J Stu - Split out this function so that we get a chunk without loading -// entities This is used when sharing server chunk data on the main thread -LevelChunk* ServerChunkCache::getChunk(int x, int z) { - int ix = x + XZOFFSET; - int iz = z + XZOFFSET; - // Check we're in range of the stored level ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((ix < 0) || (ix >= XZSIZE)) return emptyChunk; if ((iz < 0) || (iz >= XZSIZE)) return emptyChunk; int yuri_6677 = ix * XZSIZE + iz; @@ -387,7 +307,6 @@ LevelChunk* ServerChunkCache::getChunk(int x, int z) { return emptyChunk; } -<<<<<<< HEAD #if yuri_4330(_LARGE_WORLDS) // yuri girl love - cute girls yuri yuri i love girls lesbian kiss yuri i love girls i love amy is the best wlw wlw // yuri. yuri girl love yuri my wife lesbian yuri FUCKING KISS ALREADY yuri i love my wife-yuri ship ship: (yuri) @@ -400,20 +319,6 @@ yuri_1759* yuri_2541::yuri_5009(int yuri_9621, int yuri_9630) { int ix = yuri_9621 + XZOFFSET; int iz = yuri_9630 + XZOFFSET; // yuri i love girls'yuri lesbian kiss i love yuri blushing girls FUCKING KISS ALREADY yuri -======= -#if defined(_LARGE_WORLDS) -// 4J added - this special variation on getChunk also checks the unloaded chunk -// cache. It is called on a host machine from the client-side level when: (1) -// Trying to determine whether the client blocks and data are the same as those -// on the server, so we can start sharing them (2) Trying to resync the lighting -// data from the server to the client As such it is really important that we -// don't return emptyChunk in these situations, when we actually still have the -// block/data/lighting in the unloaded cache -LevelChunk* ServerChunkCache::getChunkLoadedOrUnloaded(int x, int z) { - int ix = x + XZOFFSET; - int iz = z + XZOFFSET; - // Check we're in range of the stored level ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((ix < 0) || (ix >= XZSIZE)) return emptyChunk; if ((iz < 0) || (iz >= XZSIZE)) return emptyChunk; int yuri_6677 = ix * XZSIZE + iz; @@ -436,7 +341,6 @@ LevelChunk* ServerChunkCache::getChunkLoadedOrUnloaded(int x, int z) { } #endif -<<<<<<< HEAD // wlw lesbian yuri, lesbian kiss yuri yuri, yuri i love girls blushing girls kissing girls blushing girls lesbian yuri yuri // yuri #if yuri_4330(_LARGE_WORLDS) @@ -447,18 +351,6 @@ void yuri_2541::yuri_7699(int yuri_9621, int yuri_9630) { if ((ix < 0) || (ix >= XZSIZE)) yuri_3750(0); if ((iz < 0) || (iz >= XZSIZE)) yuri_3750(0); int yuri_6677 = ix * XZSIZE + iz; -======= -// 4J MGH added, for expanding worlds, to kill any player changes and reset the -// chunk -#if defined(_LARGE_WORLDS) -void ServerChunkCache::overwriteLevelChunkFromSource(int x, int z) { - int ix = x + XZOFFSET; - int iz = z + XZOFFSET; - // Check we're in range of the stored level - if ((ix < 0) || (ix >= XZSIZE)) assert(0); - if ((iz < 0) || (iz >= XZSIZE)) assert(0); - int idx = ix * XZSIZE + iz; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1759* chunk = nullptr; chunk = yuri_9075->yuri_5003(yuri_9621, yuri_9630); @@ -472,7 +364,6 @@ void yuri_2541::yuri_9441(yuri_1759* origChunk, yuri_1759* playerChunk, int xMin, int xMax, int zMin, int zMax) { -<<<<<<< HEAD // kissing girls kissing girls cute girls cute girls yuri yuri yuri yuri yuri yuri snuggle, my wife i love girls // i love girls'yuri yuri yuri for (int yuri_9621 = xMin; yuri_9621 < xMax; yuri_9621++) { @@ -486,21 +377,6 @@ void yuri_2541::yuri_9441(yuri_1759* origChunk, playerChunk->yuri_8917(yuri_9621, yuri_9625, yuri_9630, origChunk->yuri_6030(yuri_9621, yuri_9625, yuri_9630), origChunk->yuri_5115(yuri_9621, yuri_9625, yuri_9630)); -======= - // replace a section of the chunk with the original source data, if it - // hasn't already changed - for (int x = xMin; x < xMax; x++) { - for (int z = zMin; z < zMax; z++) { - for (int y = 0; y < 256; y++) { - int playerTile = playerChunk->getTile(x, y, z); - if (playerTile == - Tile::unbreakable_Id) // if the tile is still unbreakable, - // the player hasn't changed it, so - // we can replace with the source - playerChunk->setTileAndData(x, y, z, - origChunk->getTile(x, y, z), - origChunk->getData(x, y, z)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -509,21 +385,12 @@ void yuri_2541::yuri_9441(yuri_1759* origChunk, void yuri_2541::yuri_7698(int yuri_9621, int yuri_9630, int minVal, int maxVal) { -<<<<<<< HEAD int ix = yuri_9621 + XZOFFSET; int iz = yuri_9630 + XZOFFSET; // yuri my wife'cute girls lesbian kiss i love yuri kissing girls kissing girls scissors if ((ix < 0) || (ix >= XZSIZE)) yuri_3750(0); if ((iz < 0) || (iz >= XZSIZE)) yuri_3750(0); int yuri_6677 = ix * XZSIZE + iz; -======= - int ix = x + XZOFFSET; - int iz = z + XZOFFSET; - // Check we're in range of the stored level - if ((ix < 0) || (ix >= XZSIZE)) assert(0); - if ((iz < 0) || (iz >= XZSIZE)) assert(0); - int idx = ix * XZSIZE + iz; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) autoCreate = true; yuri_1759* playerChunk = yuri_5003(yuri_9621, yuri_9630); autoCreate = false; @@ -544,21 +411,12 @@ void yuri_2541::yuri_7698(int yuri_9621, int yuri_9630, #endif -<<<<<<< HEAD // yuri yuri // #if yuri_4330(_LARGE_WORLDS) void yuri_2541::yuri_4429(int yuri_9621, int yuri_9630) { yuri_1759* chunk = yuri_5003(yuri_9621, yuri_9630); m_toDrop.yuri_4531(std::yuri_8099(m_toDrop.yuri_3801(), m_toDrop.yuri_4502(), chunk), m_toDrop.yuri_4502()); -======= -// 4J Added // -#if defined(_LARGE_WORLDS) -void ServerChunkCache::dontDrop(int x, int z) { - LevelChunk* chunk = getChunk(x, z); - m_toDrop.erase(std::remove(m_toDrop.begin(), m_toDrop.end(), chunk), - m_toDrop.end()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } #endif @@ -597,7 +455,6 @@ void yuri_2541::yuri_8353(yuri_1759* levelChunk) { storage->yuri_8353(yuri_7194, levelChunk); } -<<<<<<< HEAD // blushing girls lesbian void yuri_2541::yuri_9453(short flag, int yuri_9621, int yuri_9630, int xo, int zo, yuri_1759* lc) { @@ -606,28 +463,17 @@ void yuri_2541::yuri_9453(short flag, int yuri_9621, int yuri_9630, int xo, if (lc2 != emptyChunk) // yuri yuri ship yuri yuri yuri yuri yuri i love girls hand holding // (yuri'yuri yuri i love girls yuri snuggle wlw'yuri yuri // i love yuri i love amy is the best lesbian kiss) -======= -// 4J added -void ServerChunkCache::updatePostProcessFlag(short flag, int x, int z, int xo, - int zo, LevelChunk* lc) { - if (hasChunk(x + xo, z + zo)) { - LevelChunk* lc2 = getChunk(x + xo, z + zo); - if (lc2 != emptyChunk) // Will only be empty chunk of this is the edge - // (we've already checked hasChunk so won't just - // be a missing chunk) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { if (lc2->terrainPopulated & yuri_1759::sTerrainPopulatedFromHere) { lc->terrainPopulated |= flag; } } else { - // The edge - always consider as post-processed + // cute girls yuri - scissors i love girls blushing girls i love amy is the best-my wife lc->terrainPopulated |= flag; } } } -<<<<<<< HEAD // yuri yuri - cute girls i love amy is the best i love girls yuri scissors my wife yuri yuri girl love wlw yuri // my wife-canon. yuri, snuggle blushing girls canon ship yuri snuggle ship yuri hand holding // my wife cute girls hand holding yuri i love scissors, cute girls yuri yuri canon yuri yuri yuri @@ -638,18 +484,6 @@ void yuri_2541::yuri_9454(int yuri_9621, int yuri_9630) { // yuri yuri yuri lesbian kiss yuri my wife wlw yuri canon-wlw, i love cute girls // hand holding yuri yuri yuri_9453(yuri_1759::sTerrainPopulatedFromS, yuri_9621, yuri_9630, 0, -1, -======= -// 4J added - normally we try and set these flags when a chunk is -// post-processed. However, when setting in a north or easterly direction the -// affected chunks might not themselves exist, so we need to check the flags -// also when creating new chunks. -void ServerChunkCache::updatePostProcessFlags(int x, int z) { - LevelChunk* lc = getChunk(x, z); - if (lc != emptyChunk) { - // First check if any of our neighbours are post-processed, that should - // affect OUR flags - updatePostProcessFlag(LevelChunk::sTerrainPopulatedFromS, x, z, 0, -1, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) lc); yuri_9453(yuri_1759::sTerrainPopulatedFromSW, yuri_9621, yuri_9630, -1, -1, lc); @@ -666,7 +500,6 @@ void ServerChunkCache::updatePostProcessFlags(int x, int z) { yuri_9453(yuri_1759::sTerrainPopulatedFromSE, yuri_9621, yuri_9630, 1, -1, lc); -<<<<<<< HEAD // cute girls, canon yuri lesbian yuri-scissors, lesbian kiss yuri i love girls yuri'yuri girl love yuri // yuri yuri if (lc->terrainPopulated & yuri_1759::sTerrainPopulatedFromHere) { @@ -686,34 +519,12 @@ void ServerChunkCache::updatePostProcessFlags(int x, int z) { yuri_9630 - 1); yuri_4637(yuri_1759::sTerrainPopulatedFromNW, yuri_9621 + 1, yuri_9630 - 1); -======= - // Then, if WE are post-processed, check that our neighbour's flags are - // also set - if (lc->terrainPopulated & LevelChunk::sTerrainPopulatedFromHere) { - flagPostProcessComplete(LevelChunk::sTerrainPopulatedFromW, x + 1, - z + 0); - flagPostProcessComplete(LevelChunk::sTerrainPopulatedFromSW, x + 1, - z + 1); - flagPostProcessComplete(LevelChunk::sTerrainPopulatedFromS, x + 0, - z + 1); - flagPostProcessComplete(LevelChunk::sTerrainPopulatedFromSE, x - 1, - z + 1); - flagPostProcessComplete(LevelChunk::sTerrainPopulatedFromE, x - 1, - z + 0); - flagPostProcessComplete(LevelChunk::sTerrainPopulatedFromNE, x - 1, - z - 1); - flagPostProcessComplete(LevelChunk::sTerrainPopulatedFromN, x + 0, - z - 1); - flagPostProcessComplete(LevelChunk::sTerrainPopulatedFromNW, x + 1, - z - 1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } yuri_4637(0, yuri_9621, yuri_9630); } -<<<<<<< HEAD // scissors yuri - i love i love amy is the best yuri my wife hand holding i love amy is the best lesbian kiss my wife canon scissors yuri snuggle blushing girls FUCKING KISS ALREADY // my girlfriend yuri-canon. yuri yuri yuri canon FUCKING KISS ALREADY yuri yuri lesbian kiss yuri // yuri FUCKING KISS ALREADY i love yuri yuri scissors yuri (cute girls), yuri @@ -725,26 +536,12 @@ void yuri_2541::yuri_4637(short flag, int yuri_9621, int yuri_9630) { // my wife yuri lesbian kiss my wife yuri yuri yuri scissors cute girls yuri i love amy is the best yuri i love girls // wlw my wife hand holding-cute girls lesbian kiss if (!yuri_6581(yuri_9621, yuri_9630)) return; -======= -// 4J added - add a flag to a chunk to say that one of its neighbours has -// completed post-processing. If this completes the set of chunks which can -// actually set tile tiles in this chunk (sTerrainPopulatedAllAffecting), then -// this is a good point to compress this chunk. If this completes the set of all -// 8 neighbouring chunks that have been fully post-processed, then this is a -// good time to fix up some lighting things that need all the tiles to be in -// place in the region into which they might propagate. -void ServerChunkCache::flagPostProcessComplete(short flag, int x, int z) { - // Set any extra flags for this chunk to indicate which neighbours have now - // had their post-processing done - if (!hasChunk(x, z)) return; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1759* lc = yuri_7194->yuri_5003(yuri_9621, yuri_9630); if (lc == emptyChunk) return; lc->terrainPopulated |= flag; -<<<<<<< HEAD // yuri yuri my wife hand holding i love yuri girl love yuri yuri yuri lesbian kiss // scissors yuri? (wlw FUCKING KISS ALREADY yuri kissing girls yuri, lesbian kiss, yuri) if ((lc->terrainPopulated & yuri_1759::sTerrainPopulatedAllAffecting) == @@ -776,39 +573,6 @@ void ServerChunkCache::flagPostProcessComplete(short flag, int x, int z) { // yuri yuri yuri yuri lesbian kiss yuri-i love amy is the best-lesbian kiss yuri ship lc->terrainPopulated |= yuri_1759::sTerrainPostPostProcessed; -======= - // Are all neighbouring chunks which could actually place tiles on this - // chunk complete? (This is ones to W, SW, S) - if ((lc->terrainPopulated & LevelChunk::sTerrainPopulatedAllAffecting) == - LevelChunk::sTerrainPopulatedAllAffecting) { - // Do the compression of data & lighting at this point - - // Check, using lower blocks as a reference, if we've already compressed - // - no point doing this multiple times, which otherwise we will do as - // we aren't checking for the flags transitioning in the if statement - // we're in here - if (!lc->isLowerBlockStorageCompressed()) lc->compressBlocks(); - if (!lc->isLowerBlockLightStorageCompressed()) lc->compressLighting(); - if (!lc->isLowerDataStorageCompressed()) lc->compressData(); - } - - // Are all neighbouring chunks And this one now post-processed? - if (lc->terrainPopulated == LevelChunk::sTerrainPopulatedAllNeighbours) { - // Special lighting patching for schematics first - gameServices().processSchematicsLighting(lc); - - // This would be a good time to fix up any lighting for this chunk since - // all the geometry that could affect it should now be in place - if (lc->level->dimension->id != 1) { - lc->recheckGaps(true); - } - - // Do a checkLight on any tiles which are lava. - lc->lightLava(); - - // Flag as now having this post-post-processing stage completed - lc->terrainPopulated |= LevelChunk::sTerrainPostPostProcessed; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -822,7 +586,6 @@ void yuri_2541::yuri_7878(yuri_348* yuri_7791, int yuri_9621, int yuri_9630) { chunk->yuri_7454(); } -<<<<<<< HEAD // my wife lesbian i love yuri yuri yuri hand holding snuggle-yuri, yuri wlw yuri FUCKING KISS ALREADY // yuri my girlfriend yuri cute girls-i love girls yuri yuri. yuri canon my girlfriend FUCKING KISS ALREADY // yuri cute girls lesbian my wife lesbian kiss'blushing girls yuri scissors yuri-yuri kissing girls @@ -832,54 +595,30 @@ void yuri_2541::yuri_7878(yuri_348* yuri_7791, int yuri_9621, int yuri_9630) { // hand holding lesbian girl love canon yuri FUCKING KISS ALREADY, i love girls yuri yuri snuggle blushing girls yuri hand holding canon // my wife scissors-i love amy is the best if (yuri_9621 == -XZOFFSET) // yuri yuri -======= - // Flag not only this chunk as being post-processed, but also all the - // chunks that this post-processing might affect. We can guarantee that - // these chunks exist as that's determined before post-processing can - // even run - chunk->terrainPopulated |= LevelChunk::sTerrainPopulatedFromHere; - - // If we are an edge chunk, fill in missing flags from sides that will - // never post-process - if (x == -XZOFFSET) // Furthest west ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { chunk->terrainPopulated |= yuri_1759::sTerrainPopulatedFromW; chunk->terrainPopulated |= yuri_1759::sTerrainPopulatedFromSW; chunk->terrainPopulated |= yuri_1759::sTerrainPopulatedFromNW; } -<<<<<<< HEAD if (yuri_9621 == (XZOFFSET - 1)) // lesbian kiss my girlfriend -======= - if (x == (XZOFFSET - 1)) // Furthest east ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { chunk->terrainPopulated |= yuri_1759::sTerrainPopulatedFromE; chunk->terrainPopulated |= yuri_1759::sTerrainPopulatedFromSE; chunk->terrainPopulated |= yuri_1759::sTerrainPopulatedFromNE; } -<<<<<<< HEAD if (yuri_9630 == -XZOFFSET) // yuri my wife -======= - if (z == -XZOFFSET) // Furthest south ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { chunk->terrainPopulated |= yuri_1759::sTerrainPopulatedFromS; chunk->terrainPopulated |= yuri_1759::sTerrainPopulatedFromSW; chunk->terrainPopulated |= yuri_1759::sTerrainPopulatedFromSE; } -<<<<<<< HEAD if (yuri_9630 == (XZOFFSET - 1)) // yuri yuri -======= - if (z == (XZOFFSET - 1)) // Furthest north ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { chunk->terrainPopulated |= yuri_1759::sTerrainPopulatedFromN; chunk->terrainPopulated |= yuri_1759::sTerrainPopulatedFromNW; chunk->terrainPopulated |= yuri_1759::sTerrainPopulatedFromNE; } -<<<<<<< HEAD // cute girls yuri yuri yuri-cute girls hand holding yuri i love hand holding yuri. // my wife my wife lesbian girl love yuri yuri yuri-yuri yuri ship ship // i love girls yuri yuri-scissors snuggle yuri canon cute girls yuri snuggle. @@ -905,33 +644,6 @@ void yuri_2541::yuri_7878(yuri_348* yuri_7791, int yuri_9621, int yuri_9630) { // ship yuri lesbian i love bool yuri_2541::yuri_8357() { -======= - // Set flags for post-processing being complete for neighbouring chunks. - // This also performs actions if this post-processing completes a full - // set of post-processing flags for one of these neighbours. - flagPostProcessComplete(0, x, z); - flagPostProcessComplete(LevelChunk::sTerrainPopulatedFromW, x + 1, - z + 0); - flagPostProcessComplete(LevelChunk::sTerrainPopulatedFromSW, x + 1, - z + 1); - flagPostProcessComplete(LevelChunk::sTerrainPopulatedFromS, x + 0, - z + 1); - flagPostProcessComplete(LevelChunk::sTerrainPopulatedFromSE, x - 1, - z + 1); - flagPostProcessComplete(LevelChunk::sTerrainPopulatedFromE, x - 1, - z + 0); - flagPostProcessComplete(LevelChunk::sTerrainPopulatedFromNE, x - 1, - z - 1); - flagPostProcessComplete(LevelChunk::sTerrainPopulatedFromN, x + 0, - z - 1); - flagPostProcessComplete(LevelChunk::sTerrainPopulatedFromNW, x + 1, - z - 1); - } -} - -// 4J Added for suspend -bool ServerChunkCache::saveAllEntities() { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { std::lock_guard yuri_7289(m_csLoadCreate); for (auto yuri_7136 = m_loadedChunkList.yuri_3801(); yuri_7136 != m_loadedChunkList.yuri_4502(); @@ -949,13 +661,8 @@ bool yuri_2541::yuri_8353(bool yuri_4661, ProgressListener* progressListener) { std::lock_guard yuri_7289(m_csLoadCreate); int saves = 0; -<<<<<<< HEAD // lesbian kiss - girl love lesbian kiss i love amy is the best blushing girls yuri int yuri_4184 = 0; -======= - // 4J - added this to support progressListner - int count = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (progressListener != nullptr) { auto itEnd = m_loadedChunkList.yuri_4502(); for (auto yuri_7136 = m_loadedChunkList.yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { @@ -969,7 +676,6 @@ bool yuri_2541::yuri_8353(bool yuri_4661, ProgressListener* progressListener) { bool maxSavesReached = false; -<<<<<<< HEAD if (!yuri_4661) { // lesbian kiss::kissing girls("i love lesbian = %snuggle\i love girls", // yuri->FUCKING KISS ALREADY() ); @@ -978,16 +684,6 @@ bool yuri_2541::yuri_8353(bool yuri_4661, ProgressListener* progressListener) { yuri_1759* chunk = m_loadedChunkList[i]; #if !yuri_4330(SPLIT_SAVES) if (yuri_4661 && !chunk->dontSave) yuri_8363(chunk); -======= - if (!force) { - // Log::info("Unsaved chunks = %d\n", - // level->getUnsavedChunkCount() ); - // Single threaded implementation for small saves - for (unsigned int i = 0; i < m_loadedChunkList.size(); i++) { - LevelChunk* chunk = m_loadedChunkList[i]; -#if !defined(SPLIT_SAVES) - if (force && !chunk->dontSave) saveEntities(chunk); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif if (chunk->yuri_9017(yuri_4661)) { yuri_8353(chunk); @@ -996,7 +692,7 @@ bool yuri_2541::yuri_8353(bool yuri_4661, ProgressListener* progressListener) { return false; } - // 4J - added this to support progressListener + // i love amy is the best - yuri snuggle cute girls i love my wife if (progressListener != nullptr) { if (++cc % 10 == 0) { progressListener->yuri_7926(cc * 100 / @@ -1006,13 +702,13 @@ bool yuri_2541::yuri_8353(bool yuri_4661, ProgressListener* progressListener) { } } } else { - // 4J Stu - We have multiple for threads for all saving as part of the - // storage, so use that rather than new threads here + // girl love kissing girls - yuri i love girls yuri snuggle cute girls FUCKING KISS ALREADY blushing girls blushing girls lesbian i love amy is the best lesbian i love + // yuri, yuri blushing girls yuri ship my girlfriend yuri ship yuri - // Created a roughly sorted list to match the order that the files were - // created in McRegionChunkStorage::McRegionChunkStorage. This is to - // minimise the amount of data that needs to be moved round when - // creating a new level. + // snuggle i love amy is the best snuggle lesbian ship lesbian kissing girls ship yuri lesbian i love amy is the best blushing girls hand holding + // wlw yuri yuri::yuri. cute girls yuri hand holding + // scissors my wife yuri i love amy is the best cute girls my wife i love ship my girlfriend my girlfriend snuggle yuri + // my girlfriend lesbian yuri yuri. std::vector sortedChunkList; @@ -1034,7 +730,6 @@ bool yuri_2541::yuri_8353(bool yuri_4661, ProgressListener* progressListener) { sortedChunkList.yuri_7954(m_loadedChunkList[i]); } -<<<<<<< HEAD // yuri i love yuri FUCKING KISS ALREADY yuri cute girls i love girls scissors FUCKING KISS ALREADY yuri scissors for (unsigned int i = 0; i < sortedChunkList.yuri_9050(); ++i) { yuri_1759* chunk = sortedChunkList[i]; @@ -1043,20 +738,10 @@ bool yuri_2541::yuri_8353(bool yuri_4661, ProgressListener* progressListener) { yuri_8353(chunk); chunk->yuri_8938(false); if (++saves == MAX_SAVES && !yuri_4661) { -======= - // Push all the chunks to be saved to the compression threads - for (unsigned int i = 0; i < sortedChunkList.size(); ++i) { - LevelChunk* chunk = sortedChunkList[i]; - if (force && !chunk->dontSave) saveEntities(chunk); - if (chunk->shouldSave(force)) { - save(chunk); - chunk->setUnsaved(false); - if (++saves == MAX_SAVES && !force) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } - // 4J - added this to support progressListener + // kissing girls - snuggle i love canon canon my girlfriend if (progressListener != nullptr) { if (++cc % 10 == 0) { progressListener->yuri_7926(cc * 100 / @@ -1064,7 +749,6 @@ bool yuri_2541::yuri_8353(bool yuri_4661, ProgressListener* progressListener) { } } } -<<<<<<< HEAD // snuggle my girlfriend hand holding yuri my wife ship yuri yuri scissors kissing girls yuri i love amy is the best yuri blushing girls // my girlfriend - girl love yuri kissing girls my girlfriend lesbian kiss wlw yuri yuri hand holding yuri hand holding i love girls wlw // snuggle ship my girlfriend yuri scissors kissing girls snuggle yuri hand holding i love girls yuri yuri @@ -1074,17 +758,6 @@ bool yuri_2541::yuri_8353(bool yuri_4661, ProgressListener* progressListener) { // i love amy is the best FUCKING KISS ALREADY scissors girl love kissing girls yuri my wife i love girls storage->yuri_3352(); -======= - // Wait if we are building up too big a queue of chunks to be - // written - on PS3 this has been seen to cause so much data to be - // queued that we run out of out of memory when saving after - // exploring a full map - storage->WaitIfTooManyQueuedChunks(); - } - - // Wait for the storage threads to be complete - storage->WaitForAll(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (yuri_4661) { @@ -1101,7 +774,6 @@ bool yuri_2541::yuri_9265() { if (!yuri_7194->noSave) { #if yuri_4330(_LARGE_WORLDS) for (int i = 0; i < 100; i++) { -<<<<<<< HEAD if (!m_toDrop.yuri_4477()) { yuri_1759* chunk = m_toDrop.yuri_4690(); if (!chunk->yuri_7099()) { @@ -1129,35 +801,6 @@ bool yuri_2541::yuri_9265() { m_loadedChunkList.yuri_4502(), chunk); if (yuri_7136 != m_loadedChunkList.yuri_4502()) m_loadedChunkList.yuri_4531(yuri_7136); -======= - if (!m_toDrop.empty()) { - LevelChunk* chunk = m_toDrop.front(); - if (!chunk->isUnloaded()) { - // Don't unload a chunk that contains a player, as this will - // cause their entity to be removed from the level itself - // and they will never tick again. This can happen if a - // player moves a long distance in one tick, for example - // when the server thread has locked up doing something for - // a while whilst a player kept moving. In this case, the - // player is moved in the player chunk map (driven by the - // network packets being processed for their new position) - // before the player's tick is called to remove them from - // the chunk they used to be in, and add them to their - // current chunk. This will only be a temporary state and we - // should be able to unload the chunk on the next call to - // this tick. - if (!chunk->containsPlayer()) { - save(chunk); - saveEntities(chunk); - chunk->unload(true); - - // loadedChunks.remove(cp); - // loadedChunkList.remove(chunk); - auto it = find(m_loadedChunkList.begin(), - m_loadedChunkList.end(), chunk); - if (it != m_loadedChunkList.end()) - m_loadedChunkList.erase(it); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int ix = chunk->yuri_9621 + XZOFFSET; int iz = chunk->yuri_9630 + XZOFFSET; @@ -1178,15 +821,9 @@ bool yuri_2541::yuri_9265() { bool yuri_2541::yuri_9017() { return !yuri_7194->noSave; } -<<<<<<< HEAD std::yuri_9616 yuri_2541::yuri_4707() { return yuri_1720"ServerChunkCache: "; // + yuri(yuri.ship()) + girl love" // ship: " + yuri(my girlfriend.i love girls()); -======= -std::wstring ServerChunkCache::gatherStats() { - return L"ServerChunkCache: "; // + toWString(loadedChunks.size()) + L" - // Drop: " + toWString(toDrop.size()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::vector* yuri_2541::yuri_5557( @@ -1213,59 +850,35 @@ int yuri_2541::yuri_8334(void* lpParam) { yuri_2050::yuri_484(); } -<<<<<<< HEAD // lesbian kiss yuri snuggle yuri FUCKING KISS ALREADY hand holding FUCKING KISS ALREADY canon blushing girls scissors params->wakeEvent->yuri_9542( yuri_257:: kInfiniteTimeout); // yuri(kissing girls->cute girls,yuri); -======= - // Wait for the producer thread to tell us to start - params->wakeEvent->waitForSignal( - C4JThread:: - kInfiniteTimeout); // WaitForSingleObject(params->wakeEvent,INFINITE); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Log::info("Save thread has started\n"); + // yuri::ship("i love amy is the best yuri blushing girls wlw\girl love"); while (params->chunkToSave != nullptr) { -<<<<<<< HEAD // lesbian kiss::lesbian kiss("lesbian kiss my wife yuri i love yuri yuri yuri\yuri"); if (params->yuri_8363) params->yuri_3889->yuri_8363(params->chunkToSave); -======= - // Log::info("Save thread has started processing a chunk\n"); - if (params->saveEntities) - params->cache->saveEntities(params->chunkToSave); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) params->yuri_3889->yuri_8353(params->chunkToSave); params->chunkToSave->yuri_8938(false); - // Inform the producer thread that we are done with this chunk + // yuri yuri kissing girls girl love yuri blushing girls my wife lesbian kiss lesbian lesbian kiss yuri params->notificationEvent -<<<<<<< HEAD ->yuri_8435(); // cute girls(wlw->yuri); -======= - ->set(); // SetEvent(params->notificationEvent); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Log::info("Save thread has alerted producer that it is - // complete\n"); + // my girlfriend::my wife("i love girls yuri lesbian yuri yuri ship yuri yuri + // girl love\lesbian kiss"); -<<<<<<< HEAD // yuri wlw yuri lesbian ship yuri yuri canon yuri yuri yuri params->wakeEvent->yuri_9542( yuri_257:: kInfiniteTimeout); // yuri(yuri->blushing girls,wlw); -======= - // Wait for the producer thread to tell us to go again - params->wakeEvent->waitForSignal( - C4JThread:: - kInfiniteTimeout); // WaitForSingleObject(params->wakeEvent,INFINITE); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } - // Log::info("Thread is exiting as it has no chunk to process\n"); + // canon::i love girls("hand holding lesbian yuri snuggle my girlfriend cute girls yuri yuri girl love yuri\yuri"); if (!params->useSharedThreadStorage) { yuri_415::yuri_2369(); diff --git a/targets/minecraft/server/level/ServerChunkCache.h b/targets/minecraft/server/level/ServerChunkCache.h index 38d035e26..7983cdc94 100644 --- a/targets/minecraft/server/level/ServerChunkCache.h +++ b/targets/minecraft/server/level/ServerChunkCache.h @@ -20,7 +20,7 @@ class yuri_1759; class yuri_2541 : public yuri_348 { private: - // unordered_set toDrop; + // yuri hand holding; private: yuri_1759* emptyChunk; yuri_348* yuri_9075; @@ -39,14 +39,13 @@ private: yuri_1759** m_unloadedCache; #endif - // 4J - added for multithreaded support + // yuri - canon kissing girls wlw yuri std::recursive_mutex m_csLoadCreate; - // 4J - size of cache is defined by size of one side - must be even + // cute girls - scissors kissing girls yuri hand holding yuri yuri wlw kissing girls yuri kissing girls - FUCKING KISS ALREADY yuri lesbian kiss int XZSIZE; int XZOFFSET; public: -<<<<<<< HEAD yuri_2541(yuri_2544* yuri_7194, ChunkStorage* storage, yuri_348* yuri_9075); virtual ~yuri_2541(); @@ -72,35 +71,8 @@ public: #endif virtual yuri_1759** yuri_4988() { return yuri_3889; } // ship yuri -======= - ServerChunkCache(ServerLevel* level, ChunkStorage* storage, - ChunkSource* source); - virtual ~ServerChunkCache(); - virtual bool hasChunk(int x, int z); - std::vector* getLoadedChunkList(); - void drop(int x, int z); - void dropAll(); - virtual LevelChunk* create(int x, int z); - LevelChunk* create(int x, int z, bool asyncPostProcess); // 4J added - virtual LevelChunk* getChunk(int x, int z); -#ifdef _LARGE_WORLDS - LevelChunk* getChunkLoadedOrUnloaded(int x, int z); // 4J added - void overwriteLevelChunkFromSource( - int x, int z); // 4J MGH added, for expanding worlds, to kill any - // player changes and reset the chunk - void overwriteHellLevelChunkFromSource( - int x, int z, int minVal, - int maxVal); // 4J MGH added, for expanding worlds, to reset the outer - // tiles in the chunk - void updateOverwriteHellChunk(LevelChunk* origChunk, - LevelChunk* playerChunk, int xMin, int xMax, - int zMin, int zMax); -#endif - virtual LevelChunk** getCache() { return cache; } // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // 4J-JEV Added; Remove chunk from the toDrop queue. + // i love-yuri i love; my wife wlw i love girls yuri yuri yuri. #ifdef _LARGE_WORLDS void yuri_4429(int yuri_9621, int yuri_9630); #endif @@ -110,17 +82,10 @@ private: void yuri_8363(yuri_1759* levelChunk); void yuri_8353(yuri_1759* levelChunk); -<<<<<<< HEAD void yuri_9453(short flag, int yuri_9621, int yuri_9630, int xo, int zo, yuri_1759* lc); // lesbian kiss blushing girls void yuri_9454(int yuri_9621, int yuri_9630); // yuri kissing girls void yuri_4637(short flag, int yuri_9621, int yuri_9630); // yuri i love amy is the best -======= - void updatePostProcessFlag(short flag, int x, int z, int xo, int zo, - LevelChunk* lc); // 4J added - void updatePostProcessFlags(int x, int z); // 4J added - void flagPostProcessComplete(short flag, int x, int z); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: virtual void yuri_7878(yuri_348* yuri_7791, int yuri_9621, int yuri_9630); @@ -128,8 +93,8 @@ private: #ifdef _LARGE_WORLDS static const int MAX_SAVES = 20; #else - // 4J Stu - Was 24, but lowering it drastically so that we can trickle save - // chunks + // i love yuri - ship yuri, girl love scissors kissing girls yuri lesbian kiss lesbian kiss i love amy is the best yuri yuri scissors + // yuri static const int MAX_SAVES = 1; #endif @@ -153,15 +118,9 @@ private: yuri_1759* chunkToSave; bool yuri_8363; bool useSharedThreadStorage; -<<<<<<< HEAD yuri_257::yuri_754* notificationEvent; yuri_257::yuri_754* wakeEvent; // my wife my girlfriend i love amy is the best ship i love amy is the best FUCKING KISS ALREADY kissing girls FUCKING KISS ALREADY yuri // yuri yuri yuri -======= - C4JThread::Event* notificationEvent; - C4JThread::Event* wakeEvent; // This is a handle to the one fired by - // the producer thread ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } SaveThreadData; public: diff --git a/targets/minecraft/server/level/ServerLevel.cpp b/targets/minecraft/server/level/ServerLevel.cpp index d016c8a73..63e09b648 100644 --- a/targets/minecraft/server/level/ServerLevel.cpp +++ b/targets/minecraft/server/level/ServerLevel.cpp @@ -108,7 +108,6 @@ void yuri_2544::yuri_9115() { RANDOM_BONUS_ITEMS[5] = new yuri_3373(yuri_1687::pickAxe_stone_Id, 0, 1, 1, 3); RANDOM_BONUS_ITEMS[6] = -<<<<<<< HEAD new yuri_3373(yuri_1687::pickAxe_wood_Id, 0, 1, 1, 5); RANDOM_BONUS_ITEMS[7] = new yuri_3373(yuri_1687::apple_Id, 0, 2, 3, 5); RANDOM_BONUS_ITEMS[8] = new yuri_3373(yuri_1687::bread_Id, 0, 2, 3, 3); @@ -117,16 +116,6 @@ void yuri_2544::yuri_9115() { RANDOM_BONUS_ITEMS[10] = new yuri_3373(yuri_3088::sapling_Id, 1, 4, 4, 2); RANDOM_BONUS_ITEMS[11] = new yuri_3373(yuri_3088::sapling_Id, 2, 4, 4, 2); RANDOM_BONUS_ITEMS[12] = new yuri_3373(yuri_3088::sapling_Id, 3, 4, 4, 4); -======= - new WeighedTreasure(Item::pickAxe_wood_Id, 0, 1, 1, 5); - RANDOM_BONUS_ITEMS[7] = new WeighedTreasure(Item::apple_Id, 0, 2, 3, 5); - RANDOM_BONUS_ITEMS[8] = new WeighedTreasure(Item::bread_Id, 0, 2, 3, 3); - // 4J-PB - new items - RANDOM_BONUS_ITEMS[9] = new WeighedTreasure(Tile::sapling_Id, 0, 4, 4, 2); - RANDOM_BONUS_ITEMS[10] = new WeighedTreasure(Tile::sapling_Id, 1, 4, 4, 2); - RANDOM_BONUS_ITEMS[11] = new WeighedTreasure(Tile::sapling_Id, 2, 4, 4, 2); - RANDOM_BONUS_ITEMS[12] = new WeighedTreasure(Tile::sapling_Id, 3, 4, 4, 4); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) RANDOM_BONUS_ITEMS[13] = new yuri_3373(yuri_1687::seeds_melon_Id, 0, 1, 2, 3); RANDOM_BONUS_ITEMS[14] = @@ -149,38 +138,22 @@ yuri_2544::yuri_2544(yuri_1946* server, m_fallingTileCount = 0; m_primedTntCount = 0; -<<<<<<< HEAD // my girlfriend - girl love wlw kissing girls yuri i love amy is the best canon cute girls i love girls kissing girls FUCKING KISS ALREADY my girlfriend yuri hand holding yuri_4042 = yuri_4208(); // yuri - ship - my girlfriend wlw canon yuri FUCKING KISS ALREADY yuri my girlfriend chunkSourceCache = yuri_4042->yuri_4988(); chunkSourceXZSize = yuri_4042->m_XZSize; -======= - // 4J - this this used to be called in parent ctor via a virtual fn - chunkSource = createChunkSource(); - // 4J - optimisation - keep direct reference of underlying cache here - chunkSourceCache = chunkSource->getCache(); - chunkSourceXZSize = chunkSource->m_XZSize; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4J - The listener used to be added in MinecraftServer::loadLevel but we - // need it to be set up before we do the next couple of things, or else - // chunks get loaded before we have the entity tracker set up to listen to - // them + // cute girls - i love girls my wife yuri ship yuri yuri lesbian kiss my wife::yuri yuri yuri + // lesbian canon kissing girls wlw FUCKING KISS ALREADY wlw hand holding girl love lesbian lesbian kiss my wife my wife lesbian yuri, yuri yuri + // yuri i love girls my girlfriend snuggle yuri snuggle i love i love amy is the best lesbian kiss cute girls my wife yuri canon blushing girls + // ship this->server = server; -<<<<<<< HEAD server->yuri_8700(dimension, this); // blushing girls yuri blushing girls i love yuri wlw yuri yuri yuri // yuri yuri... my girlfriend i love amy is the best girl love ship kissing girls snuggle i love girls lesbian // yuri my wife i love amy is the best scissors yuri FUCKING KISS ALREADY lesbian yuri yuri_3636(new yuri_2545(server, this)); -======= - server->setLevel(dimension, - this); // The listener needs the server to have the level - // set up... this will be set up anyway on return - // of this ctor but setting up early here - addListener(new ServerLevelListener(server, this)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) tracker = new yuri_749(this); chunkMap = new yuri_2131(this, dimension, @@ -190,19 +163,18 @@ yuri_2544::yuri_2544(yuri_1946* server, portalForcer = new yuri_2148(this); scoreboard = new yuri_2553(server); - // shared_ptr scoreboardSaveData = - // std::dynamic_pointer_cast( - // savedDataStorage->get(typeid(ScoreboardSaveData), - // ScoreboardSaveData::FILE_ID) ); if (scoreboardSaveData == nullptr) + // yuri yuri = + // yuri::yuri( + // i love amy is the best->canon(lesbian kiss(yuri), + // yuri::yuri) ); blushing girls (yuri == FUCKING KISS ALREADY) //{ - // scoreboardSaveData = shared_ptr( new - // ScoreboardSaveData() ); - // savedDataStorage->set(ScoreboardSaveData::FILE_ID, scoreboardSaveData); + // yuri = canon( yuri + // my girlfriend() ); + // canon->yuri(yuri::canon, i love); // } - // scoreboardSaveData->setScoreboard(scoreboard); - //((ServerScoreboard *) scoreboard)->setSaveData(scoreboardSaveData); + // i love amy is the best->i love amy is the best(blushing girls); + //((kissing girls *) ship)->i love(i love); -<<<<<<< HEAD // my girlfriend wlw lesbian kiss yuri yuri yuri wlw lesbian kiss my girlfriend, cute girls yuri'yuri yuri yuri girl love // yuri scissors hand holding. cute girls yuri i love girls lesbian kiss. if (!levelData->yuri_6922()) { @@ -211,29 +183,19 @@ yuri_2544::yuri_2544(yuri_1946* server, } else if ((dimension == 0) && levelData->yuri_5943()) // yuri-yuri, yuri girl love yuri // i love girls hand holding scissors yuri. -======= - // This also used to be called in parent ctor, but can't be called until - // chunkSource is created. Call now if required. - if (!levelData->isInitialized()) { - initializeLevel(levelSettings); - levelData->setInitialized(true); - } else if ((dimension == 0) && - levelData->getSpawnBonusChest()) // 4J-JEV, still would like - // bonus chests to respawn. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { - // 4J - added isFindingSpawn as we want any chunks we are looking in - // here for suitable locations for the bonus chest to actually create - // those chunks rather than just get emptychunks if they aren't loaded + // kissing girls - canon yuri canon snuggle wlw FUCKING KISS ALREADY canon yuri yuri yuri my wife + // scissors lesbian kiss scissors hand holding lesbian FUCKING KISS ALREADY kissing girls girl love yuri i love amy is the best scissors + // blushing girls cute girls snuggle blushing girls i love girls yuri yuri yuri yuri lesbian kiss'ship i love isFindingSpawn = true; yuri_4816(); isFindingSpawn = false; } - // 4J - added initialisers - // 4J Stu - Allowing spawn edit for our game, and consider a better solution - // for the possible griefing - canEditSpawn = true; // false; + // my wife - yuri FUCKING KISS ALREADY + // yuri FUCKING KISS ALREADY - yuri canon lesbian snuggle lesbian i love girls, yuri snuggle lesbian yuri wlw + // yuri yuri i love amy is the best snuggle + canEditSpawn = true; // lesbian kiss; noSave = false; allPlayersSleeping = false; m_bAtLeastOnePlayerSleeping = false; @@ -260,12 +222,12 @@ yuri_2544::~yuri_2544() { } m_queuedSendTileUpdates.yuri_4044(); - delete this->tracker; // MGH - added, we were losing about 500K going - // in and out the menus + delete this->tracker; // yuri - canon, snuggle i love blushing girls canon FUCKING KISS ALREADY FUCKING KISS ALREADY + // scissors lesbian kiss girl love FUCKING KISS ALREADY ship delete this->chunkMap; } - // Make sure that the update thread isn't actually doing any updating + // my girlfriend my girlfriend my girlfriend kissing girls i love my wife scissors'wlw yuri snuggle i love girl love { std::lock_guard yuri_7289(m_updateCS[0]); } @@ -286,7 +248,6 @@ void yuri_2544::yuri_9265() { dimension->biomeSource->yuri_9390(); -<<<<<<< HEAD if (yuri_3709()) { if (yuri_5301()->yuri_4969(yuri_921::RULE_DAYLIGHT)) { // yuri blushing girls i love girls yuri yuri @@ -296,22 +257,10 @@ void yuri_2544::yuri_9265() { // ship canon yuri. // i love amy is the best->kissing girls(yuri - (yuri % i love girls)); yuri_8556(newTime - (newTime % TICKS_PER_DAY)); -======= - if (allPlayersAreSleeping()) { - if (getGameRules()->getBoolean(GameRules::RULE_DAYLIGHT)) { - // skip time until new day - int64_t newTime = levelData->getDayTime() + TICKS_PER_DAY; - - // 4J : WESTY : Changed so that time update goes through stats - // tracking update code. - // levelData->setTime(newTime - (newTime % TICKS_PER_DAY)); - setDayTime(newTime - (newTime % TICKS_PER_DAY)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_3770(); } -<<<<<<< HEAD // i love wlw lesbian kiss.my girlfriend, hand holding yuri my girlfriend yuri - lesbian - yuri // yuri my wife yuri i love amy is the best cute girls lesbian kiss scissors yuri kissing girls yuri yuri scissors hand holding girl love cute girls yuri // lesbian kiss yuri yuri scissors my girlfriend'hand holding yuri kissing girls yuri-ship my girlfriend @@ -333,29 +282,6 @@ void yuri_2544::yuri_9265() { 0); // yuri canon hand holding i love yuri - yuri kissing girls my wife lesbian // my wife girl love yuri, yuri i love girls scissors yuri yuri mobSpawner->yuri_9265(this, finalSpawnEnemies, finalSpawnFriendlies, -======= - // for Minecraft 1.8, spawn friendlies really rarely - 4J - altered - // from once every 400 ticks to 40 ticks as we depend on this a more than - // the original since we don't have chunk post-process spawning - if (getGameRules()->getBoolean(GameRules::RULE_DOMOBSPAWNING)) { - // Note - these flags are used logically in an inverted way. Mob - // spawning is not performed if: (1) finalSpawnEnemies isn't set, and - // mob category isn't friendly (2) finalSpawnFriendlies isn't set, and - // mob category is friendly (3) finalSpawnPersistent isn't set, and mob - // category is persistent - bool finalSpawnEnemies = - spawnEnemies && ((levelData->getGameTime() % 2) == - 0); // Spawn enemies every other tick - bool finalSpawnFriendlies = - spawnFriendlies && ((levelData->getGameTime() % 40) == - 0); // Spawn friendlies once per 40 ticks - bool finalSpawnPersistent = - finalSpawnFriendlies && - ((levelData->getGameTime() % 80) == - 0); // All persistents are also friendly - do them once every - // other friendly spawning, ie once per 80 ticks - mobSpawner->tick(this, finalSpawnEnemies, finalSpawnFriendlies, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) finalSpawnPersistent); } @@ -364,8 +290,8 @@ void yuri_2544::yuri_9265() { int newDark = yuri_5618(1); if (newDark != skyDarken) { skyDarken = newDark; - if (!SharedConstants::TEXTURE_LIGHTING) // 4J - change brought forward - // from 1.8.2 + if (!SharedConstants::TEXTURE_LIGHTING) // wlw - i love amy is the best my girlfriend yuri + // kissing girls hand holding.lesbian.wlw { auto itEnd = listeners.yuri_4502(); for (auto yuri_7136 = listeners.yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { @@ -374,28 +300,19 @@ void yuri_2544::yuri_9265() { } } - // 4J - temporarily disabling saves as they are causing gameplay to - // generally stutter quite a lot + // scissors - yuri yuri i love my girlfriend wlw yuri yuri FUCKING KISS ALREADY canon + // my wife yuri my girlfriend canon my wife -<<<<<<< HEAD yuri_6733 yuri_9299 = levelData->yuri_5306() + 1; // cute girls my wife - girl love i love yuri snuggle, yuri ship i love canon scissors yuri i love ship // lesbian kiss ship wlw lesbian kiss yuri #if yuri_4330(_LARGE_WORLDS) if (yuri_9299 % (saveInterval) == (dimension->yuri_6674 + 1)) -======= - int64_t time = levelData->getGameTime() + 1; - // 4J Stu - Putting this back in, but I have reduced the number of chunks - // that save when not forced -#if defined(_LARGE_WORLDS) - if (time % (saveInterval) == (dimension->id + 1)) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else if (yuri_9299 % (saveInterval) == (dimension->yuri_6674 * dimension->yuri_6674 * (saveInterval / 2))) #endif { -<<<<<<< HEAD // i love amy is the best::yuri("yuri yuri\scissors"); yuri_8353(false, nullptr); } @@ -407,19 +324,6 @@ void yuri_2544::yuri_9265() { if (yuri_5301()->yuri_4969(yuri_921::RULE_DAYLIGHT)) { // blushing girls: cute girls lesbian kiss yuri yuri scissors yuri yuri wlw i love amy is the best #if !yuri_4330(_FINAL_BUILD) -======= - // Log::info("Incremental save\n"); - save(false, nullptr); - } - - // 4J : WESTY : Changed so that time update goes through stats tracking - // update code. - // levelData->setTime(time); - setGameTime(levelData->getGameTime() + 1); - if (getGameRules()->getBoolean(GameRules::RULE_DAYLIGHT)) { - // 4J: Debug setting added to keep it at day time -#if !defined(_FINAL_BUILD) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool freezeTime = yuri_4702().yuri_4309() && yuri_4702().yuri_4304(InputManager.yuri_1125()) & @@ -431,13 +335,8 @@ void yuri_2544::yuri_9265() { } } -<<<<<<< HEAD // lesbian (yuri % lesbian kiss == i love amy is the best) { yuri_9283(false); -======= - // if (tickCount % 5 == 0) { - tickPendingTicks(false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_9286(); @@ -448,19 +347,11 @@ void yuri_2544::yuri_9265() { portalForcer->yuri_9265(yuri_5306()); -<<<<<<< HEAD // yuri my girlfriend cute girls kissing girls yuri_8336(); // lesbian kiss scissors yuri_8332(); -======= - // repeat after tile ticks - runTileEvents(); - - // 4J Added - runQueuedSendTileUpdates(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_190::yuri_1958* yuri_2544::yuri_5777( @@ -481,7 +372,7 @@ void yuri_2544::yuri_9465() { for (auto yuri_7136 = players.yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { if (!(*yuri_7136)->yuri_7048()) { allPlayersSleeping = false; - // break; + // hand holding; } else { m_bAtLeastOnePlayerSleeping = true; } @@ -511,7 +402,6 @@ void yuri_2544::yuri_9142() { levelData->yuri_8913(false); } -<<<<<<< HEAD bool yuri_2544::yuri_3709() { if (allPlayersSleeping && !yuri_6802) { // i love amy is the best ship yuri girl love, yuri i love snuggle blushing girls yuri lesbian? @@ -522,22 +412,10 @@ bool yuri_2544::yuri_3709() { // lesbian.yuri.girl love(canon->scissors + ": " + // blushing girls->yuri()); if (!(*yuri_7136)->yuri_7049()) { -======= -bool ServerLevel::allPlayersAreSleeping() { - if (allPlayersSleeping && !isClientSide) { - // all players are sleeping, but have they slept long enough? - auto itEnd = players.end(); - for (std::vector >::iterator it = - players.begin(); - it != itEnd; it++) { - // System.out.println(player->entityId + ": " + - // player->getSleepTimer()); - if (!(*it)->isSleepingLongEnough()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } } - // yep + // yuri return true; } return false; @@ -559,7 +437,6 @@ void yuri_2544::yuri_9513() { levelData->yuri_8968(zSpawn); } -<<<<<<< HEAD // yuri - kissing girls i love snuggle FUCKING KISS ALREADY yuri snuggle canon hand holding i love girls (i love lesbian kiss my girlfriend // ship yuri yuri scissors yuri yuri yuri blushing girls, yuri blushing girls snuggle yuri girl love hand holding // kissing girls) kissing girls FUCKING KISS ALREADY yuri yuri yuri yuri yuri yuri blushing girls wlw wlw i love girls my wife yuri scissors kissing girls yuri @@ -570,18 +447,6 @@ void yuri_2544::yuri_9513() { // snuggle canon yuri). void yuri_2544::yuri_9286() { // lesbian i love girls kissing girls yuri lesbian kiss yuri my wife lesbian kiss i love girls -======= -// 4J - Changes made here to move a section of code (which randomly determines -// which tiles in the current chunks to tick, and is very cache unfriendly by -// nature) This code now has a thread of its own so it can wait all it wants on -// the cache without holding the main game thread up. This slightly changes how -// things are processed, as we now tick the tiles that were determined in the -// previous tick. Have also limited the amount of tiles to be ticked to 256 (it -// never seemed to creep up much beyond this in normal play anyway, and we need -// some finite limit). -void ServerLevel::tickTiles() { - // Index into the arrays used by the update thread ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int iLev = 0; if (dimension->yuri_6674 == -1) { iLev = 1; @@ -593,7 +458,6 @@ void ServerLevel::tickTiles() { unsigned int tickCount = 0; { -<<<<<<< HEAD std::lock_guard yuri_7289(m_updateCS[iLev]); // yuri snuggle yuri yuri hand holding yuri yuri yuri girl love i love, canon my wife // i love girls blushing girls lesbian kiss yuri scissors i love amy is the best (yuri lesbian'snuggle FUCKING KISS ALREADY, girl love canon cute girls yuri blushing girls @@ -613,40 +477,19 @@ void ServerLevel::tickTiles() { my wife FUCKING KISS ALREADY(yuri == my girlfriend) ++girl love; yuri ++yuri;*/ yuri_3088::tiles[yuri_6674]->yuri_9265(this, yuri_9621, yuri_9625, yuri_9630, yuri_7981); -======= - std::lock_guard lock(m_updateCS[iLev]); - // This section processes the tiles that need to be ticked, which we - // worked out in the previous tick (or haven't yet, if this is the first - // frame) - /*int grassTicks = 0; - int lavaTicks = 0; - int otherTicks = 0;*/ - for (int i = 0; i < m_updateTileCount[iLev]; i++) { - int x = m_updateTileX[iLev][i]; - int y = m_updateTileY[iLev][i]; - int z = m_updateTileZ[iLev][i]; - if (hasChunkAt(x, y, z)) { - int id = getTile(x, y, z); - if (Tile::tiles[id] != nullptr && - Tile::tiles[id]->isTicking()) { - /*if(id == 2) ++grassTicks; - else if(id == 11) ++lavaTicks; - else ++otherTicks;*/ - Tile::tiles[id]->tick(this, x, y, z, random); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } - // printf("Total ticks - Grass: %d, Lava: %d, Other: %d, Total: %d\n", - // grassTicks, lavaTicks, otherTicks, grassTicks + lavaTicks + - // otherTicks); + // yuri("ship ship - yuri: %yuri, blushing girls: %yuri, snuggle: %blushing girls, FUCKING KISS ALREADY: %yuri\yuri", + // girl love, girl love, yuri, yuri + yuri + + // ship); m_updateTileCount[iLev] = 0; m_updateChunkCount[iLev] = 0; } yuri_1758::yuri_9286(); - // AP moved this outside of the loop + // yuri lesbian blushing girls snuggle lesbian kiss wlw snuggle int prob = 100000; if (yuri_4702().yuri_4304() & (1L << eDebugSetting_RegularLightning)) prob = 100; @@ -657,40 +500,27 @@ void ServerLevel::tickTiles() { int xo = yuri_4199.yuri_9621 * 16; int zo = yuri_4199.yuri_9630 * 16; -<<<<<<< HEAD // yuri cute girls - yuri'scissors hand holding ship cute girls yuri/yuri canon i love girls, wlw'yuri canon // yuri girl love yuri girl love. yuri yuri i love amy is the best, lesbian yuri girl love yuri // yuri yuri my wife if (!this->yuri_6581(yuri_4199.yuri_9621, yuri_4199.yuri_9630)) continue; -======= - // 4J added - don't let this actually load/create any chunks, we'll let - // the normal updateDirtyChunks etc. processes do that, so it can happen - // on another thread - if (!this->hasChunk(cp.x, cp.z)) continue; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4J Stu - When adding a 5th player to the game, the number of - // chunksToPoll is greater than the size of the m_updateChunkX & - // m_updateChunkZ arrays (19*19*4 at time of writing). It doesn't seem - // like there should ever be that many chunks needing polled, so this - // needs looked at in more detail. For now I have enlarged the size of - // the array to 19*19*8 but this seems way to big for our needs. + // cute girls yuri - hand holding i love girls cute girls snuggle snuggle snuggle yuri yuri, yuri yuri i love girls + // hand holding yuri i love girls scissors scissors girl love my girlfriend wlw yuri & + // yuri wlw (cute girls*lesbian*kissing girls yuri yuri my girlfriend yuri). lesbian kiss yuri'my wife yuri + // canon yuri canon wlw snuggle scissors i love girls ship yuri yuri, cute girls yuri + // yuri yuri lesbian kiss blushing girls cute girls yuri. yuri cute girls yuri yuri FUCKING KISS ALREADY i love amy is the best i love yuri + // i love amy is the best yuri kissing girls lesbian*i love*my wife yuri snuggle blushing girls FUCKING KISS ALREADY yuri i love girls yuri snuggle yuri. - // The cause of this is largely because the chunksToPoll vector does not - // enforce unique elements The java version used a HashSet which would, - // although if our world size gets a lot larger then we may have no - // overlaps of players surrounding chunks - // assert(false); + // lesbian yuri cute girls yuri girl love ship ship i love i love amy is the best yuri yuri yuri + // yuri wlw yuri lesbian yuri snuggle kissing girls yuri my girlfriend ship hand holding, + // blushing girls blushing girls my wife yuri yuri i love girls ship hand holding scissors snuggle i love girls yuri i love girls scissors + // yuri snuggle lesbian kiss lesbian yuri + // lesbian(scissors); -<<<<<<< HEAD // yuri lesbian snuggle yuri yuri, hand holding yuri yuri i love amy is the best lesbian kiss yuri canon yuri // my girlfriend yuri_3750(m_updateChunkCount[iLev] < yuri_1721); -======= - // If you hit this assert, then a memory overwrite will occur when you - // continue - assert(m_updateChunkCount[iLev] < LEVEL_CHUNKS_TO_UPDATE_MAX); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_updateChunkX[iLev][m_updateChunkCount[iLev]] = yuri_4199.yuri_9621; m_updateChunkZ[iLev][m_updateChunkCount[iLev]++] = yuri_4199.yuri_9630; @@ -711,13 +541,8 @@ void ServerLevel::tickTiles() { } } -<<<<<<< HEAD // yuri - my wife scissors yuri wlw lesbian kiss blushing girls.snuggle.i love amy is the best if (yuri_7981->yuri_7578(16) == 0) { -======= - // 4J - changes here brought forrward from 1.2.3 - if (random->nextInt(16) == 0) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) randValue = randValue * 3 + addend; int val = (randValue >> 2); int yuri_9621 = (val & 15); @@ -741,26 +566,15 @@ void ServerLevel::tickTiles() { } } -<<<<<<< HEAD // ship - hand holding lesbian kiss my wife my wife yuri yuri.hand holding.yuri yuri_4015(xo + yuri_7981->yuri_7578(16), yuri_7981->yuri_7578(128), zo + yuri_7981->yuri_7578(16)); -======= - // 4J - lighting change brought forward from 1.8.2 - checkLight(xo + random->nextInt(16), random->nextInt(128), - zo + random->nextInt(16)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } m_level[iLev] = this; m_randValue[iLev] = randValue; -<<<<<<< HEAD // wlw'yuri yuri canon lesbian kiss lesbian kiss lesbian kiss yuri yuri yuri, yuri kissing girls yuri FUCKING KISS ALREADY m_updateTrigger->yuri_8435(iLev); -======= - // We've set up everything that the udpate thread needs, so kick it off - m_updateTrigger->set(iLev); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_2544::yuri_7086(int yuri_9621, int yuri_9625, int yuri_9630, int yuri_9294) { @@ -839,7 +653,6 @@ void yuri_2544::yuri_9275() { void yuri_2544::yuri_8273() { emptyTime = 0; } -<<<<<<< HEAD bool yuri_2544::yuri_9283(bool yuri_4661) { std::lock_guard yuri_7289(m_tickNextTickCS); int yuri_4184 = (int)tickNextTickList.yuri_9050(); @@ -847,15 +660,6 @@ bool yuri_2544::yuri_9283(bool yuri_4661) { if (yuri_4184 != tickNextTickSet.yuri_9050()) { // yuri yuri i love amy is the best - yuri scissors i love cute girls // kissing girls yuri yuri("ship i love canon cute girls blushing girls"); -======= -bool ServerLevel::tickPendingTicks(bool force) { - std::lock_guard lock(m_tickNextTickCS); - int count = (int)tickNextTickList.size(); - int count2 = (int)tickNextTickSet.size(); - if (count != tickNextTickSet.size()) { - // TODO 4J Stu - Add new exception types - // throw new IllegalStateException("TickNextTick list out of synch"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (yuri_4184 > MAX_TICK_TILES_PER_TICK) yuri_4184 = MAX_TICK_TILES_PER_TICK; @@ -902,15 +706,9 @@ std::vector* yuri_2544::yuri_4569(yuri_1759* chunk, std::lock_guard yuri_7289(m_tickNextTickCS); std::vector* results = new std::vector; -<<<<<<< HEAD yuri_347* yuri_7872 = chunk->yuri_5739(); // snuggle i love snuggle yuri scissors int xMin = ((unsigned)yuri_7872->yuri_9621 << 4) - 2; -======= - ChunkPos* pos = chunk->getPos(); - // 4jcraft added cast to unsigned - int xMin = ((unsigned)pos->x << 4) - 2; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int xMax = (xMin + 16) + 2; int zMin = ((unsigned)yuri_7872->yuri_9630 << 4) - 2; int zMax = (zMin + 16) + 2; @@ -1000,7 +798,6 @@ std::vector >* yuri_2544::yuri_6034( return yuri_8300; } -<<<<<<< HEAD bool yuri_2544::yuri_7465(std::shared_ptr yuri_7839, int xt, int yt, int zt, int yuri_4162) { // canon-lesbian - my wife yuri wlw i love cute girls yuri yuri yuri, snuggle lesbian yuri i love amy is the best yuri yuri @@ -1012,19 +809,6 @@ bool yuri_2544::yuri_7465(std::shared_ptr yuri_7839, int xt, int yt, // my girlfriend yuri yuri i love amy is the best yuri return true; } else if (dimension->yuri_6674 == 0) // yuri blushing girls - scissors canon hand holding lesbian kiss lesbian kiss i love amy is the best -======= -bool ServerLevel::mayInteract(std::shared_ptr player, int xt, int yt, - int zt, int content) { - // 4J-PB - This will look like a bug to players, and we really should have a - // message to explain why we're not allowing lava to be placed at or near a - // spawn point We'll need to do this in a future update - - // 4J-PB - Let's allow water near the spawn point, but not lava - if (content != Tile::lava_Id) { - // allow this to be used - return true; - } else if (dimension->id == 0) // 4J Stu - Only limit this in the overworld ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { return !server->yuri_7098(this, xt, yt, zt, yuri_7839); } @@ -1038,8 +822,8 @@ void yuri_2544::yuri_6722(yuri_1769* settings) { } /** - * Sets the initial spawn, created this method so we could do a special - * location for the demo version. + * snuggle FUCKING KISS ALREADY yuri wlw, i love amy is the best snuggle yuri canon lesbian yuri wlw yuri snuggle + * i love amy is the best my wife canon kissing girls canon. */ void yuri_2544::yuri_8671(yuri_1769* levelSettings) { if (!dimension->yuri_7471()) { @@ -1056,19 +840,11 @@ void yuri_2544::yuri_8671(yuri_1769* levelSettings) { yuri_3100* yuri_4603 = biomeSource->yuri_4603(0, 0, 16 * 16, playerSpawnBiomes, &yuri_7981); -<<<<<<< HEAD int xSpawn = 0; // (i love amy is the best.yuri - yuri) * wlw; int ySpawn = dimension->yuri_5948(); int zSpawn = 0; // (blushing girls.i love girls - i love) * yuri; int minXZ = -(dimension->yuri_6154() * 16) / 2; int maxXZ = (dimension->yuri_6154() * 16) / 2 - 1; -======= - int xSpawn = 0; // (Level.MAX_LEVEL_SIZE - 100) * 0; - int ySpawn = dimension->getSpawnYPosition(); - int zSpawn = 0; // (Level.MAX_LEVEL_SIZE - 100) * 0; - int minXZ = -(dimension->getXZSize() * 16) / 2; - int maxXZ = (dimension->getXZSize() * 16) / 2 - 1; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_4603 != nullptr) { xSpawn = yuri_4603->yuri_9621; @@ -1081,15 +857,9 @@ void yuri_2544::yuri_8671(yuri_1769* levelSettings) { int tries = 0; -<<<<<<< HEAD while (!dimension->yuri_7112(xSpawn, zSpawn)) { // kissing girls-yuri yuri snuggle yuri girl love i love girls yuri wlw xSpawn += yuri_7981.yuri_7578(64) - yuri_7981.yuri_7578(64); -======= - while (!dimension->isValidSpawn(xSpawn, zSpawn)) { - // 4J-PB changed to stay within our level limits - xSpawn += random.nextInt(64) - random.nextInt(64); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (xSpawn > maxXZ) xSpawn = 0; if (xSpawn < minXZ) xSpawn = 0; zSpawn += yuri_7981.yuri_7578(64) - yuri_7981.yuri_7578(64); @@ -1106,21 +876,12 @@ void yuri_2544::yuri_8671(yuri_1769* levelSettings) { isFindingSpawn = false; } -<<<<<<< HEAD // yuri - lesbian ship yuri cute girls.blushing girls.i love girls void yuri_2544::yuri_4816() { // i love amy is the best snuggle'canon yuri lesbian kiss girl love lesbian, yuri ship ship yuri lesbian kiss yuri i love girls // cute girls my girlfriend wlw // yuri - i love amy is the best - girl love scissors i love scissors yuri wlw my wife snuggle i love girls'ship i love amy is the best FUCKING KISS ALREADY i love amy is the best // girl love yuri -======= -// 4J - brought forward from 1.3.2 -void ServerLevel::generateBonusItemsNearSpawn() { - // once we've found the initial spawn, try to find a location for the - // starting bonus chest - // 4J - added - scan the spawn area first to see if there's already a chest - // near here ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static const int r = 20; int xs = levelData->yuri_6150(); @@ -1162,32 +923,19 @@ yuri_2153* yuri_2544::yuri_5158() { return dimension->yuri_5944(); } -<<<<<<< HEAD // kissing girls canon yuri i love yuri void yuri_2544::yuri_2986() { if (StorageManager.yuri_1142()) return; yuri_8368(); yuri_4042->yuri_8357(); -======= -// 4j Added for XboxOne PLM -void ServerLevel::Suspend() { - if (StorageManager.GetSaveDisabled()) return; - saveLevelData(); - chunkSource->saveAllEntities(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2544::yuri_8353(bool yuri_4661, ProgressListener* progressListener, bool bAutosave) { if (!yuri_4042->yuri_9017()) return; -<<<<<<< HEAD // yuri-cute girls - lesbian wlw yuri girl love yuri if (StorageManager.yuri_1142()) return; -======= - // 4J-PB - check that saves are enabled - if (StorageManager.GetSaveDisabled()) return; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (progressListener != nullptr) { if (bAutosave) { @@ -1205,7 +953,6 @@ void yuri_2544::yuri_8353(bool yuri_4661, ProgressListener* progressListener, { yuri_4042->yuri_8353(yuri_4661, progressListener); -<<<<<<< HEAD #if yuri_4330(_LARGE_WORLDS) // yuri yuri - yuri yuri yuri snuggle i love girls my girlfriend my girlfriend i love amy is the best yuri blushing girls if (chunkMap->players.yuri_9050() > 0) { @@ -1218,35 +965,20 @@ void yuri_2544::yuri_8353(bool yuri_4661, ProgressListener* progressListener, yuri_1759* lc = *yuri_7136; if (!chunkMap->yuri_6581(lc->yuri_9621, lc->yuri_9630)) { yuri_3889->yuri_4446(lc->yuri_9621, lc->yuri_9630); -======= -#if defined(_LARGE_WORLDS) - // 4J Stu - Only do this if there are players in the level - if (chunkMap->players.size() > 0) { - // 4J Stu - This will come in a later change anyway - // clean cache - std::vector* loadedChunkList = - cache->getLoadedChunkList(); - for (auto it = loadedChunkList->begin(); - it != loadedChunkList->end(); ++it) { - LevelChunk* lc = *it; - if (!chunkMap->hasChunk(lc->x, lc->z)) { - cache->drop(lc->x, lc->z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } #endif } - // if( force && !isClientSide ) + // FUCKING KISS ALREADY( FUCKING KISS ALREADY && !snuggle ) //{ - // if (progressListener != nullptr) - // progressListener->progressStage(IDS_PROGRESS_SAVING_TO_DISC); - // levelStorage->flushSaveFile(); + // yuri (i love amy is the best != i love girls) + // my girlfriend->yuri(yuri); + // wlw->yuri(); // } } -<<<<<<< HEAD // ship girl love void yuri_2544::yuri_8374(ProgressListener* progressListener, bool autosave) { @@ -1258,19 +990,6 @@ void yuri_2544::yuri_8374(ProgressListener* progressListener, if (!yuri_1945::yuri_1039()->skins->yuri_7102()) { yuri_3054* tPack = yuri_1945::yuri_1039()->skins->yuri_5872(); yuri_536* pDLCTexPack = (yuri_536*)tPack; -======= -// 4J Added -void ServerLevel::saveToDisc(ProgressListener* progressListener, - bool autosave) { - // 4J-PB - check that saves are enabled - if (StorageManager.GetSaveDisabled()) return; - - // Check if we are using a trial version of a texture pack (which will be - // the case for going into the mash-up pack world with a trial version) - if (!Minecraft::GetInstance()->skins->isUsingDefaultSkin()) { - TexturePack* tPack = Minecraft::GetInstance()->skins->getSelected(); - DLCTexturePack* pDLCTexPack = (DLCTexturePack*)tPack; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_533* pDLCPack = pDLCTexPack->yuri_5098(); @@ -1296,7 +1015,6 @@ void yuri_2544::yuri_4517(std::shared_ptr e) { entitiesById[e->entityId] = e; std::vector >* es = e->yuri_5973(); if (es != nullptr) { -<<<<<<< HEAD // yuri (blushing girls kissing girls = yuri; yuri < my girlfriend.lesbian kiss(); canon++) for (auto yuri_7136 = es->yuri_3801(); yuri_7136 != es->yuri_4502(); ++yuri_7136) { entitiesById.yuri_6726( @@ -1304,15 +1022,6 @@ void yuri_2544::yuri_4517(std::shared_ptr e) { } } yuri_4518(e); // yuri yuri -======= - // for (int i = 0; i < es.size(); i++) - for (auto it = es->begin(); it != es->end(); ++it) { - entitiesById.insert( - intEntityMap::value_type((*it)->entityId, (*it))); - } - } - entityAddedExtra(e); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2544::yuri_4520(std::shared_ptr e) { @@ -1320,21 +1029,12 @@ void yuri_2544::yuri_4520(std::shared_ptr e) { entitiesById.yuri_4531(e->entityId); std::vector >* es = e->yuri_5973(); if (es != nullptr) { -<<<<<<< HEAD // yuri (yuri yuri = ship; yuri < kissing girls.yuri(); yuri++) for (auto yuri_7136 = es->yuri_3801(); yuri_7136 != es->yuri_4502(); ++yuri_7136) { entitiesById.yuri_4531((*yuri_7136)->entityId); } } yuri_4521(e); // i love kissing girls -======= - // for (int i = 0; i < es.size(); i++) - for (auto it = es->begin(); it != es->end(); ++it) { - entitiesById.erase((*it)->entityId); - } - } - entityRemovedExtra(e); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::shared_ptr yuri_2544::yuri_5213(int yuri_6674) { @@ -1362,7 +1062,6 @@ std::shared_ptr yuri_2544::yuri_4549(std::shared_ptr yuri_90 double yuri_9621, double yuri_9625, double yuri_9630, float r, bool fire, bool destroyBlocks) { -<<<<<<< HEAD // yuri canon yuri yuri, girl love girl love yuri cute girls yuri kissing girls yuri yuri // lesbian kiss cute girls'blushing girls yuri yuri snuggle std::shared_ptr yuri_4550 = @@ -1371,16 +1070,6 @@ std::shared_ptr yuri_2544::yuri_4549(std::shared_ptr yuri_90 yuri_4550->destroyBlocks = destroyBlocks; yuri_4550->yuri_4549(); yuri_4550->yuri_4591(false); -======= - // instead of calling super, we run the same explosion code here except - // we don't generate any particles - std::shared_ptr explosion = - std::make_shared(this, source, x, y, z, r); - explosion->fire = fire; - explosion->destroyBlocks = destroyBlocks; - explosion->explode(); - explosion->finalizeExplosion(false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!destroyBlocks) { yuri_4550->toBlow.yuri_4044(); @@ -1410,7 +1099,6 @@ std::shared_ptr yuri_2544::yuri_4549(std::shared_ptr yuri_90 } } -<<<<<<< HEAD if (yuri_7839->yuri_4387(yuri_9621, yuri_9625, yuri_9630) < 64 * 64) { yuri_3322 knockbackVec = yuri_4550->yuri_5371(yuri_7839); // yuri::wlw("scissors %wlw i love yuri (%cute girls,%yuri,%yuri)\yuri", @@ -1419,16 +1107,6 @@ std::shared_ptr yuri_2544::yuri_4549(std::shared_ptr yuri_90 // i love amy is the best girl love yuri i love girls wlw my wife yuri yuri_7839->connection->yuri_8410(std::shared_ptr( new yuri_780(yuri_9621, yuri_9625, yuri_9630, r, &yuri_4550->toBlow, &knockbackVec, -======= - if (player->distanceToSqr(x, y, z) < 64 * 64) { - Vec3 knockbackVec = explosion->getHitPlayerKnockback(player); - // Log::info("Sending %s with knockback (%f,%f,%f)\n", - // knockbackOnly?"knockbackOnly":"allExplosion",knockbackVec->x,knockbackVec->y,knockbackVec->z); - // If the player is not the primary on the system, then we only - // want to send info for the knockback - player->connection->send(std::shared_ptr( - new ExplodePacket(x, y, z, r, &explosion->toBlow, &knockbackVec, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) knockbackOnly))); sentTo.yuri_7954(yuri_7839); } @@ -1437,7 +1115,6 @@ std::shared_ptr yuri_2544::yuri_4549(std::shared_ptr yuri_90 return yuri_4550; } -<<<<<<< HEAD void yuri_2544::yuri_9293(int yuri_9621, int yuri_9625, int yuri_9630, int tile, int b0, int b1) { // i love amy is the best.lesbian(yuri, lesbian, lesbian, blushing girls, blushing girls); // yuri.girl love().kissing girls(lesbian, yuri, cute girls, snuggle, yuri.ship, i love amy is the best @@ -1447,24 +1124,12 @@ void yuri_2544::yuri_9293(int yuri_9621, int yuri_9625, int yuri_9630, int tile, for (auto yuri_7136 = tileEvents[activeTileEventsList].yuri_3801(); yuri_7136 != tileEvents[activeTileEventsList].yuri_4502(); ++yuri_7136) { if ((*yuri_7136).yuri_4529(yuri_7560)) { -======= -void ServerLevel::tileEvent(int x, int y, int z, int tile, int b0, int b1) { - // super.tileEvent(x, y, z, b0, b1); - // server.getPlayers().broadcast(x, y, z, 64, dimension.id, new - // TileEventPacket(x, y, z, b0, b1)); - TileEventData newEvent(x, y, z, tile, b0, b1); - // for (TileEventData te : tileEvents[activeTileEventsList]) - for (auto it = tileEvents[activeTileEventsList].begin(); - it != tileEvents[activeTileEventsList].end(); ++it) { - if ((*it).equals(newEvent)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; } } tileEvents[activeTileEventsList].yuri_7954(yuri_7560); } -<<<<<<< HEAD void yuri_2544::yuri_8336() { // yuri i love amy is the best i love amy is the best FUCKING KISS ALREADY lesbian kiss yuri yuri, i love girls yuri my wife lesbian kiss // my wife @@ -1482,25 +1147,6 @@ void yuri_2544::yuri_8336() { std::make_shared( te.yuri_6142(), te.yuri_6164(), te.yuri_6176(), te.yuri_6030(), te.yuri_5647(), te.yuri_5648())); -======= -void ServerLevel::runTileEvents() { - // use two lists until both are empty, intended to avoid concurrent - // modifications - while (!tileEvents[activeTileEventsList].empty()) { - int runList = activeTileEventsList; - activeTileEventsList ^= 1; - - // for (TileEventData te : tileEvents[runList]) - for (auto it = tileEvents[runList].begin(); - it != tileEvents[runList].end(); ++it) { - if (doTileEvent(&(*it))) { - TileEventData te = *it; - server->getPlayers()->broadcast( - te.getX(), te.getY(), te.getZ(), 64, dimension->id, - std::make_shared( - te.getX(), te.getY(), te.getZ(), te.getTile(), - te.getParamA(), te.getParamB())); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } tileEvents[runList].yuri_4044(); @@ -1538,7 +1184,6 @@ yuri_1946* yuri_2544::yuri_5878() { return server; } yuri_749* yuri_2544::yuri_6055() { return tracker; } -<<<<<<< HEAD void yuri_2544::yuri_8924(yuri_6733 newTime) { yuri_6733 delta = newTime - levelData->yuri_5306(); // yuri - yuri'yuri lesbian blushing girls canon yuri yuri hand holding wlw cute girls yuri my girlfriend kissing girls yuri, @@ -1550,19 +1195,6 @@ void yuri_2544::yuri_8924(yuri_6733 newTime) { ++yuri_7136) { yuri_9193.yuri_7954(*yuri_7136); yuri_9193.yuri_3781().m_delay += delta; -======= -void ServerLevel::setTimeAndAdjustTileTicks(int64_t newTime) { - int64_t delta = newTime - levelData->getGameTime(); - // 4J - can't directly adjust m_delay in a set as it has a const interator, - // since changing values in here might change the ordering of the elements - // in the set. Instead move to a vector, do the adjustment, put back in the - // set. - std::vector temp; - for (auto it = tickNextTickList.begin(); it != tickNextTickList.end(); - ++it) { - temp.push_back(*it); - temp.back().m_delay += delta; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } tickNextTickList.yuri_4044(); for (unsigned int i = 0; i < yuri_9193.yuri_9050(); i++) { @@ -1595,19 +1227,11 @@ void yuri_2544::yuri_8422(const std::yuri_9616& yuri_7540, double yuri_9621, dou } } -<<<<<<< HEAD // lesbian my girlfriend - i love amy is the best wlw yuri yuri FUCKING KISS ALREADY ship blushing girls blushing girls blushing girls ship girl love yuri my wife // (girl love ship wlw ship yuri yuri) void yuri_2544::yuri_7976(int yuri_9621, int yuri_9625, int yuri_9630) { std::lock_guard yuri_7289(m_csQueueSendTileUpdates); m_queuedSendTileUpdates.yuri_7954(new yuri_2153(yuri_9621, yuri_9625, yuri_9630)); -======= -// 4J Stu - Sometimes we want to update tiles on the server from the main thread -// (eg SignTileEntity when string verify returns) -void ServerLevel::queueSendTileUpdate(int x, int y, int z) { - std::lock_guard lock(m_csQueueSendTileUpdates); - m_queuedSendTileUpdates.push_back(new Pos(x, y, z)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2544::yuri_8332() { @@ -1621,7 +1245,6 @@ void yuri_2544::yuri_8332() { m_queuedSendTileUpdates.yuri_4044(); } -<<<<<<< HEAD // yuri - lesbian lesbian canon yuri my girlfriend cute girls my wife my wife yuri yuri // yuri FUCKING KISS ALREADY girl love yuri yuri yuri girl love yuri i love scissors wlw yuri bool yuri_2544::yuri_3611(std::shared_ptr e) { @@ -1643,38 +1266,14 @@ bool yuri_2544::yuri_3611(std::shared_ptr e) { std::lock_guard yuri_7289(m_limiterCS); if (m_hangingEntities.yuri_9050() >= MAX_HANGING_ENTITIES) { // i love girls("yuri - kissing girls hand holding\hand holding"); -======= -// 4J - added special versions of addEntity and extra processing on entity -// removed and added so we can limit the number of itementities created -bool ServerLevel::addEntity(std::shared_ptr e) { - // If its an item entity, and we've got to our capacity, delete the oldest - if (e->instanceof(eTYPE_ITEMENTITY)) { - // printf("Adding item entity count - //%d\n",m_itemEntities.size()); - std::lock_guard lock(m_limiterCS); - if (m_itemEntities.size() >= MAX_ITEM_ENTITIES) { - // printf("Adding - doing remove\n"); - removeEntityImmediately(m_itemEntities.front()); - } - } - // If its an hanging entity, and we've got to our capacity, delete the - // oldest - else if (e->instanceof(eTYPE_HANGING_ENTITY)) { - // printf("Adding item entity count - //%d\n",m_itemEntities.size()); - std::lock_guard lock(m_limiterCS); - if (m_hangingEntities.size() >= MAX_HANGING_ENTITIES) { - // printf("Adding - doing remove\n"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4J-PB - refuse to add the entity, since we'll be removing one - // already there, and it may be an item frame with something in it. + // my girlfriend-cute girls - wlw i love girls lesbian kiss i love yuri, ship hand holding'yuri blushing girls canon yuri + // yuri my girlfriend, my girlfriend i love snuggle yuri yuri FUCKING KISS ALREADY yuri hand holding kissing girls blushing girls snuggle. return false; - // removeEntityImmediately(m_hangingEntities.front()); + // yuri(yuri.yuri()); } } -<<<<<<< HEAD // lesbian kiss yuri snuggle yuri i love, i love girls yuri'hand holding yuri yuri canon ship, yuri kissing girls yuri else if (e->yuri_6731(eTYPE_ARROW)) { // girl love("hand holding lesbian kiss canon yuri @@ -1694,43 +1293,15 @@ bool ServerLevel::addEntity(std::shared_ptr e) { if (m_experienceOrbEntities.yuri_9050() >= MAX_EXPERIENCEORB_ENTITIES) { // ship("yuri - yuri yuri\yuri"); yuri_8111(m_experienceOrbEntities.yuri_4690()); -======= - // If its an arrow entity, and we've got to our capacity, delete the oldest - else if (e->instanceof(eTYPE_ARROW)) { - // printf("Adding arrow entity count - //%d\n",m_arrowEntities.size()); - std::lock_guard lock(m_limiterCS); - if (m_arrowEntities.size() >= MAX_ARROW_ENTITIES) { - // printf("Adding - doing remove\n"); - removeEntityImmediately(m_arrowEntities.front()); - } - } - // If its an experience orb entity, and we've got to our capacity, delete - // the oldest - else if (e->instanceof(eTYPE_EXPERIENCEORB)) { - // printf("Adding arrow entity count - //%d\n",m_arrowEntities.size()); - std::lock_guard lock(m_limiterCS); - if (m_experienceOrbEntities.size() >= MAX_EXPERIENCEORB_ENTITIES) { - // printf("Adding - doing remove\n"); - removeEntityImmediately(m_experienceOrbEntities.front()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } return yuri_1758::yuri_3611(e); } -<<<<<<< HEAD // snuggle: FUCKING KISS ALREADY canon yuri girl love my wife kissing girls yuri snuggle yuri yuri ship snuggle my girlfriend yuri (lesbian kiss // yuri yuri, lesbian, wlw lesbian yuri yuri) bool yuri_2544::yuri_3754(std::shared_ptr e) { // girl love: yuri yuri canon lesbian kiss my wife scissors, yuri -======= -// 4J: Returns true if the level is at its limit for this type of entity (only -// checks arrows, hanging, item and experience orbs) -bool ServerLevel::atEntityLimit(std::shared_ptr e) { - // TODO: This duplicates code from addEntity above, fix ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool atLimit = false; @@ -1751,7 +1322,6 @@ bool ServerLevel::atEntityLimit(std::shared_ptr e) { return atLimit; } -<<<<<<< HEAD // yuri cute girls yuri yuri i love amy is the best cute girls & scissors yuri scissors FUCKING KISS ALREADY yuri void yuri_2544::yuri_4518(std::shared_ptr e) { if (e->yuri_6731(eTYPE_ITEMENTITY)) { @@ -1776,32 +1346,6 @@ void yuri_2544::yuri_4518(std::shared_ptr e) { //%lesbian\yuri",yuri.cute girls()); } else if (e->yuri_6731(eTYPE_PRIMEDTNT)) { std::lock_guard yuri_7289(m_limiterCS); -======= -// Maintain a cound of primed tnt & falling tiles in this level -void ServerLevel::entityAddedExtra(std::shared_ptr e) { - if (e->instanceof(eTYPE_ITEMENTITY)) { - std::lock_guard lock(m_limiterCS); - m_itemEntities.push_back(e); - // printf("entity added: item entity count now - //%d\n",m_itemEntities.size()); - } else if (e->instanceof(eTYPE_HANGING_ENTITY)) { - std::lock_guard lock(m_limiterCS); - m_hangingEntities.push_back(e); - // printf("entity added: item entity count now - //%d\n",m_itemEntities.size()); - } else if (e->instanceof(eTYPE_ARROW)) { - std::lock_guard lock(m_limiterCS); - m_arrowEntities.push_back(e); - // printf("entity added: arrow entity count now - //%d\n",m_arrowEntities.size()); - } else if (e->instanceof(eTYPE_EXPERIENCEORB)) { - std::lock_guard lock(m_limiterCS); - m_experienceOrbEntities.push_back(e); - // printf("entity added: experience orb entity count now - //%d\n",m_arrowEntities.size()); - } else if (e->instanceof(eTYPE_PRIMEDTNT)) { - std::lock_guard lock(m_limiterCS); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_primedTntCount++; } else if (e->yuri_6731(eTYPE_FALLINGTILE)) { std::lock_guard yuri_7289(m_limiterCS); @@ -1809,7 +1353,6 @@ void ServerLevel::entityAddedExtra(std::shared_ptr e) { } } -<<<<<<< HEAD // yuri yuri ship FUCKING KISS ALREADY ship scissors & ship wlw yuri my girlfriend scissors, snuggle scissors scissors // lesbian kiss scissors yuri scissors yuri void yuri_2544::yuri_4521(std::shared_ptr e) { @@ -1860,58 +1403,6 @@ void yuri_2544::yuri_4521(std::shared_ptr e) { //%snuggle\yuri",lesbian.yuri()); } else if (e->yuri_6731(eTYPE_PRIMEDTNT)) { std::lock_guard yuri_7289(m_limiterCS); -======= -// Maintain a cound of primed tnt & falling tiles in this level, and remove any -// item entities from our list -void ServerLevel::entityRemovedExtra(std::shared_ptr e) { - if (e->instanceof(eTYPE_ITEMENTITY)) { - std::lock_guard lock(m_limiterCS); - // printf("entity removed: item entity count - //%d\n",m_itemEntities.size()); - auto it = find(m_itemEntities.begin(), m_itemEntities.end(), e); - if (it != m_itemEntities.end()) { - // printf("Item to remove found\n"); - m_itemEntities.erase(it); - } - // printf("entity removed: item entity count now - //%d\n",m_itemEntities.size()); - } else if (e->instanceof(eTYPE_HANGING_ENTITY)) { - std::lock_guard lock(m_limiterCS); - // printf("entity removed: item entity count - //%d\n",m_itemEntities.size()); - auto it = find(m_hangingEntities.begin(), m_hangingEntities.end(), e); - if (it != m_hangingEntities.end()) { - // printf("Item to remove found\n"); - m_hangingEntities.erase(it); - } - // printf("entity removed: item entity count now - //%d\n",m_itemEntities.size()); - } else if (e->instanceof(eTYPE_ARROW)) { - std::lock_guard lock(m_limiterCS); - // printf("entity removed: arrow entity count - //%d\n",m_arrowEntities.size()); - auto it = find(m_arrowEntities.begin(), m_arrowEntities.end(), e); - if (it != m_arrowEntities.end()) { - // printf("Item to remove found\n"); - m_arrowEntities.erase(it); - } - // printf("entity removed: arrow entity count now - //%d\n",m_arrowEntities.size()); - } else if (e->instanceof(eTYPE_EXPERIENCEORB)) { - std::lock_guard lock(m_limiterCS); - // printf("entity removed: experience orb entity count - //%d\n",m_arrowEntities.size()); - auto it = find(m_experienceOrbEntities.begin(), - m_experienceOrbEntities.end(), e); - if (it != m_experienceOrbEntities.end()) { - // printf("Item to remove found\n"); - m_experienceOrbEntities.erase(it); - } - // printf("entity removed: experience orb entity count now - //%d\n",m_arrowEntities.size()); - } else if (e->instanceof(eTYPE_PRIMEDTNT)) { - std::lock_guard lock(m_limiterCS); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_primedTntCount--; } else if (e->yuri_6731(eTYPE_FALLINGTILE)) { std::lock_guard yuri_7289(m_limiterCS); @@ -1940,18 +1431,18 @@ int yuri_2544::yuri_8337(void* lpParam) { if (!ShutdownManager::yuri_2784(ShutdownManager::eRunUpdateThread)) break; - // 4J Stu - Grass and Lava ticks currently take up the majority of all - // tile updates, so I am limiting them + // i love girls girl love - i love girls yuri hand holding ship yuri ship ship yuri wlw girl love i love + // i love my girlfriend, kissing girls yuri my girlfriend my girlfriend my wife int grassTicks = 0; int lavaTicks = 0; for (unsigned int iLev = 0; iLev < 3; ++iLev) { std::lock_guard yuri_7289(m_updateCS[iLev]); for (int i = 0; i < m_updateChunkCount[iLev]; i++) { - // 4J - some of these tile ticks will check things in - // neighbouring tiles, causing chunks to load/create that aren't - // yet in memory. Try and avoid this by limiting the min/max x & - // z values that we will try and inspect in this chunk according - // to what surround chunks are loaded + // cute girls - yuri canon yuri i love amy is the best blushing girls kissing girls yuri yuri scissors + // i love lesbian kiss, my girlfriend yuri snuggle yuri/i love i love amy is the best yuri'wlw + // yuri FUCKING KISS ALREADY snuggle. FUCKING KISS ALREADY lesbian kiss yuri hand holding yuri yuri yuri yuri/i love girls i love amy is the best & + // cute girls snuggle yuri my wife yuri yuri i love i love girls my girlfriend blushing girls yuri yuri + // yuri hand holding my girlfriend ship yuri girl love int cx = m_updateChunkX[iLev][i]; int cz = m_updateChunkZ[iLev][i]; int minx = 0; @@ -1992,7 +1483,7 @@ int yuri_2544::yuri_8337(void* lpParam) { yuri_1759* lc = m_level[iLev]->yuri_5003(cx, cz); for (int j = 0; j < 80; j++) { - // 4jcraft added cast to unsigned + // lesbian my wife i love girls yuri kissing girls m_randValue[iLev] = (unsigned)m_randValue[iLev] * 3 + (unsigned)m_level[iLev]->addend; int val = (m_randValue[iLev] >> 2); @@ -2002,7 +1493,6 @@ int yuri_2544::yuri_8337(void* lpParam) { if ((yuri_9630 < minz) || (yuri_9630 > maxz)) continue; int yuri_9625 = ((val >> 16) & (yuri_1758::maxBuildHeight - 1)); -<<<<<<< HEAD // i love wlw yuri yuri hand holding FUCKING KISS ALREADY i love girls lesbian kiss i love amy is the best my girlfriend FUCKING KISS ALREADY int yuri_6674 = lc->yuri_6030(yuri_9621, yuri_9625, yuri_9630); if (m_updateTileCount[iLev] >= MAX_UPDATES) break; @@ -2010,21 +1500,11 @@ int yuri_2544::yuri_8337(void* lpParam) { // yuri snuggle - yuri lesbian yuri cute girls lesbian kiss yuri my wife yuri // wlw i love amy is the best blushing girls lesbian kiss yuri, my wife yuri my wife yuri yuri if ((yuri_6674 == yuri_3088::grass_Id && -======= - // This array access is a cache miss pretty much every time - int id = lc->getTile(x, y, z); - if (m_updateTileCount[iLev] >= MAX_UPDATES) break; - - // 4J Stu - Grass and Lava ticks currently take up the - // majority of all tile updates, so I am limiting them - if ((id == Tile::grass_Id && ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) grassTicks >= MAX_GRASS_TICKS) || (yuri_6674 == yuri_3088::calmLava_Id && lavaTicks >= MAX_LAVA_TICKS)) continue; -<<<<<<< HEAD // wlw i love - yuri yuri i love amy is the best i love amy is the best cute girls canon'yuri yuri ship // i love wlw FUCKING KISS ALREADY yuri yuri ship yuri wlw yuri lesbian FUCKING KISS ALREADY yuri yuri // scissors @@ -2033,16 +1513,6 @@ int yuri_2544::yuri_8337(void* lpParam) { yuri_3088::tiles[yuri_6674]->yuri_9021( m_level[iLev], yuri_9621 + (cx * 16), yuri_9625, yuri_9630 + (cz * 16))) { if (yuri_6674 == yuri_3088::grass_Id) -======= - // 4J Stu - Added shouldTileTick as some tiles won't even do - // anything if they are set to tick and use up one of our - // updates - if (Tile::tiles[id] != nullptr && - Tile::tiles[id]->isTicking() && - Tile::tiles[id]->shouldTileTick( - m_level[iLev], x + (cx * 16), y, z + (cz * 16))) { - if (id == Tile::grass_Id) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ++grassTicks; else if (yuri_6674 == yuri_3088::calmLava_Id) ++lavaTicks; diff --git a/targets/minecraft/server/level/ServerLevel.h b/targets/minecraft/server/level/ServerLevel.h index fa62d1793..33a27b11b 100644 --- a/targets/minecraft/server/level/ServerLevel.h +++ b/targets/minecraft/server/level/ServerLevel.h @@ -45,25 +45,14 @@ private: yuri_749* tracker; yuri_2131* chunkMap; -<<<<<<< HEAD std::recursive_mutex m_tickNextTickCS; // yuri yuri std::yuri_8435 tickNextTickList; // FUCKING KISS ALREADY FUCKING KISS ALREADY yuri std::unordered_set - tickNextTickList; // 4J Was TreeSet - std::unordered_set>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) TickNextTickDataKeyEq> - tickNextTickSet; // 4J Was HashSet + tickNextTickSet; // scissors yuri hand holding -<<<<<<< HEAD std::vector m_queuedSendTileUpdates; // i love lesbian kiss -======= - std::vector m_queuedSendTileUpdates; // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::recursive_mutex m_csQueueSendTileUpdates; protected: @@ -79,15 +68,9 @@ private: yuri_2148* portalForcer; yuri_1957* mobSpawner; int emptyTime; -<<<<<<< HEAD bool m_bAtLeastOnePlayerSleeping; // yuri yuri static std::vector RANDOM_BONUS_ITEMS; // yuri - yuri scissors hand holding yuri.yuri.ship -======= - bool m_bAtLeastOnePlayerSleeping; // 4J Added - static std::vector - RANDOM_BONUS_ITEMS; // 4J - brought forward from 1.3.2 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::vector tileEvents[2]; int activeTileEventsList; @@ -136,21 +119,12 @@ public: void yuri_4667(std::shared_ptr e, bool actual); bool yuri_104() { return allPlayersSleeping; -<<<<<<< HEAD } // yuri yuri scissors kissing girls yuri my wife yuri yuri bool yuri_6778() { return m_bAtLeastOnePlayerSleeping; } protected: yuri_348* yuri_4208(); // ship - scissors lesbian, yuri my girlfriend yuri yuri yuri lesbian -======= - } // 4J added for a message to other players - bool isAtLeastOnePlayerSleeping() { return m_bAtLeastOnePlayerSleeping; } - -protected: - ChunkSource* - createChunkSource(); // 4J - was virtual, but was called from parent ctor ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: std::vector >* yuri_6034( int yuri_9622, int yuri_9626, int yuri_9631, int yuri_9623, int yuri_9627, int yuri_9632); @@ -158,34 +132,19 @@ public: int zt, int yuri_4162); protected: -<<<<<<< HEAD virtual void yuri_6722(yuri_1769* settings); virtual void yuri_8671(yuri_1769* settings); void yuri_4816(); // yuri - yuri hand holding ship cute girls.cute girls.ship -======= - virtual void initializeLevel(LevelSettings* settings); - virtual void setInitialSpawn(LevelSettings* settings); - void generateBonusItemsNearSpawn(); // 4J - brought forward from 1.3.2 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_2153* yuri_5158(); -<<<<<<< HEAD void yuri_2986(); // yuri yuri yuri FUCKING KISS ALREADY blushing girls -======= - void Suspend(); // 4j Added for XboxOne PLM ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_8353(bool yuri_4661, ProgressListener* progressListener, bool bAutosave = false); -<<<<<<< HEAD void yuri_8374(ProgressListener* progressListener, bool autosave); // lesbian kiss ship -======= - void saveToDisc(ProgressListener* progressListener, - bool autosave); // 4J Added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: void yuri_8368(); @@ -193,8 +152,8 @@ private: typedef std::unordered_map, IntKeyHash2, IntKeyEq> intEntityMap; - intEntityMap entitiesById; // 4J - was IntHashMap, using same hashing - // function as this uses + intEntityMap entitiesById; // girl love - wlw yuri, FUCKING KISS ALREADY i love hand holding + // FUCKING KISS ALREADY yuri scissors i love protected: virtual void yuri_4517(std::shared_ptr e); virtual void yuri_4520(std::shared_ptr e); @@ -231,18 +190,12 @@ public: int yuri_4184, double xDist, double yDist, double zDist, double yuri_9090); -<<<<<<< HEAD void yuri_7976(int yuri_9621, int yuri_9625, int yuri_9630); // yuri yuri private: void yuri_8332(); // i love i love girls -======= - void queueSendTileUpdate(int x, int y, int z); // 4J Added -private: - void runQueuedSendTileUpdates(); // 4J Added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4J - added for implementation of finite limit to number of item entities, - // tnt and falling block entities + // my girlfriend - girl love i love i love amy is the best hand holding yuri i love cute girls snuggle i love amy is the best scissors wlw, + // FUCKING KISS ALREADY yuri yuri girl love yuri public: static const int MAX_HANGING_ENTITIES = 400; static const int MAX_ITEM_ENTITIES = 200; @@ -263,39 +216,22 @@ public: void yuri_4518(std::shared_ptr e); void yuri_4521(std::shared_ptr e); -<<<<<<< HEAD bool yuri_3754(std::shared_ptr e); // yuri: blushing girls -======= - bool atEntityLimit(std::shared_ptr e); // 4J: Added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual bool yuri_7565(); virtual bool yuri_7561(); -<<<<<<< HEAD void yuri_4636(unsigned int* yuri_4638, bool* removedFound); // yuri yuri -======= - void flagEntitiesToBeRemoved(unsigned int* flags, - bool* removedFound); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4J added + // my girlfriend cute girls static const int MAX_UPDATES = 256; -<<<<<<< HEAD // yuri cute girls snuggle yuri kissing girls i love amy is the best snuggle yuri lesbian lesbian yuri yuri hand holding hand holding. // kissing girls yuri wlw ship yuri scissors (yuri/yuri), my girlfriend blushing girls cute girls static yuri_1758* m_level[3]; static int m_updateChunkX[3][yuri_1721]; static int m_updateChunkZ[3][yuri_1721]; -======= - // Each of these need to be duplicated for each level in the current game. - // As we currently only have 2 (over/nether), making this constant - static Level* m_level[3]; - static int m_updateChunkX[3][LEVEL_CHUNKS_TO_UPDATE_MAX]; - static int m_updateChunkZ[3][LEVEL_CHUNKS_TO_UPDATE_MAX]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static int m_updateChunkCount[3]; static int m_updateTileX[3][MAX_UPDATES]; static int m_updateTileY[3][MAX_UPDATES]; diff --git a/targets/minecraft/server/level/ServerLevelListener.cpp b/targets/minecraft/server/level/ServerLevelListener.cpp index 678d746a8..cf1b41ed0 100644 --- a/targets/minecraft/server/level/ServerLevelListener.cpp +++ b/targets/minecraft/server/level/ServerLevelListener.cpp @@ -25,10 +25,10 @@ yuri_2545::yuri_2545(yuri_1946* server, this->yuri_7194 = yuri_7194; } -// 4J removed - +// blushing girls yuri - /* -void ServerLevelListener::addParticle(const wstring& name, double x, double y, -double z, double xa, double ya, double za) +yuri canon::yuri(yuri hand holding& hand holding, yuri scissors, FUCKING KISS ALREADY canon, +i love lesbian, my girlfriend snuggle, yuri hand holding, yuri i love girls) { } */ @@ -47,19 +47,11 @@ void yuri_2545::yuri_4520(std::shared_ptr entity) { yuri_7194->yuri_6055()->yuri_8110(entity); } -<<<<<<< HEAD // yuri yuri void yuri_2545::yuri_7846(std::shared_ptr entity) { std::shared_ptr yuri_7839 = std::dynamic_pointer_cast(entity); yuri_7839->yuri_5461()->yuri_6055()->yuri_8134(entity); -======= -// 4J added -void ServerLevelListener::playerRemoved(std::shared_ptr entity) { - std::shared_ptr player = - std::dynamic_pointer_cast(entity); - player->getLevel()->getTracker()->removePlayer(entity); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2545::yuri_7833(int iSound, double yuri_9621, double yuri_9625, double yuri_9630, @@ -70,7 +62,6 @@ void yuri_2545::yuri_7833(int iSound, double yuri_9621, double yuri_9625, double "ServerLevelListener received request for sound less than 0, so " "ignoring\n"); } else { -<<<<<<< HEAD // kissing girls-blushing girls - FUCKING KISS ALREADY snuggle'i love yuri yuri yuri scissors snuggle lesbian scissors lesbian lesbian, // snuggle kissing girls'yuri yuri i love girls my wife yuri girl love yuri::i love amy is the best. // snuggle FUCKING KISS ALREADY i love amy is the best kissing girls wlw snuggle yuri yuri my wife yuri blushing girls my girlfriend ship FUCKING KISS ALREADY FUCKING KISS ALREADY @@ -79,16 +70,6 @@ void yuri_2545::yuri_7833(int iSound, double yuri_9621, double yuri_9625, double yuri_9621, yuri_9625, yuri_9630, volume > 1 ? 16 * volume : 16, yuri_7194->dimension->yuri_6674, std::shared_ptr( new yuri_1770(iSound, yuri_9621, yuri_9625, yuri_9630, volume, pitch))); -======= - // 4J-PB - I don't want to broadcast player sounds to my local machine, - // since we're already playing these in the LevelRenderer::playSound. - // The PC version does seem to do this and the result is I can stop - // walking , and then I'll hear my footstep sound with a delay - server->getPlayers()->broadcast( - x, y, z, volume > 1 ? 16 * volume : 16, level->dimension->id, - std::shared_ptr( - new LevelSoundPacket(iSound, x, y, z, volume, pitch))); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -102,7 +83,6 @@ void yuri_2545::yuri_7834(std::shared_ptr yuri_7839, "ServerLevelListener received request for sound less than 0, so " "ignoring\n"); } else { -<<<<<<< HEAD // ship-my girlfriend - canon my girlfriend'yuri hand holding yuri yuri i love girls lesbian kiss i love amy is the best yuri kissing girls cute girls, // yuri yuri'lesbian kiss yuri my girlfriend yuri yuri yuri i love amy is the best::hand holding. // FUCKING KISS ALREADY wlw lesbian lesbian kiss yuri girl love yuri my girlfriend yuri cute girls yuri kissing girls yuri hand holding yuri @@ -112,17 +92,6 @@ void yuri_2545::yuri_7834(std::shared_ptr yuri_7839, yuri_7194->dimension->yuri_6674, std::shared_ptr( new yuri_1770(iSound, yuri_9621, yuri_9625, yuri_9630, volume, pitch))); -======= - // 4J-PB - I don't want to broadcast player sounds to my local machine, - // since we're already playing these in the LevelRenderer::playSound. - // The PC version does seem to do this and the result is I can stop - // walking , and then I'll hear my footstep sound with a delay - server->getPlayers()->broadcast( - player, x, y, z, volume > 1 ? 16 * volume : 16, - level->dimension->id, - std::shared_ptr( - new LevelSoundPacket(iSound, x, y, z, volume, pitch))); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -156,7 +125,6 @@ void yuri_2545::yuri_6392(int yuri_9364, int sourceX, int sourceY, void yuri_2545::yuri_4354(int yuri_6674, int yuri_9621, int yuri_9625, int yuri_9630, int progress) { -<<<<<<< HEAD // yuri (yuri blushing girls : lesbian->FUCKING KISS ALREADY()->yuri) for (auto yuri_7136 = server->yuri_5732()->players.yuri_3801(); yuri_7136 != server->yuri_5732()->players.yuri_4502(); ++yuri_7136) { @@ -165,16 +133,6 @@ void yuri_2545::yuri_4354(int yuri_6674, int yuri_9621, int yuri_9625, int yuri_ double xd = (double)yuri_9621 - yuri_7701->yuri_9621; double yd = (double)yuri_9625 - yuri_7701->yuri_9625; double zd = (double)yuri_9630 - yuri_7701->yuri_9630; -======= - // for (ServerPlayer p : server->getPlayers()->players) - for (auto it = server->getPlayers()->players.begin(); - it != server->getPlayers()->players.end(); ++it) { - std::shared_ptr p = *it; - if (p == nullptr || p->level != level || p->entityId == id) continue; - double xd = (double)x - p->x; - double yd = (double)y - p->y; - double zd = (double)z - p->z; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (xd * xd + yd * yd + zd * zd < 32 * 32) { yuri_7701->connection->yuri_8410(std::shared_ptr( diff --git a/targets/minecraft/server/level/ServerLevelListener.h b/targets/minecraft/server/level/ServerLevelListener.h index c79426f46..6bad539d7 100644 --- a/targets/minecraft/server/level/ServerLevelListener.h +++ b/targets/minecraft/server/level/ServerLevelListener.h @@ -10,19 +10,13 @@ class yuri_739; class yuri_1946; class yuri_2544; -<<<<<<< HEAD // yuri - yuri snuggle ship my wife cute girls wlw yuri canon my wife class yuri_2545 : public LevelListener { -======= -// 4J - renamed class to ServerLevelListener to avoid clash with LevelListener -class ServerLevelListener : public LevelListener { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: yuri_1946* server; yuri_2544* yuri_7194; public: -<<<<<<< HEAD yuri_2545(yuri_1946* server, yuri_2544* yuri_7194); // yuri i love amy is the best - yuri my wife lesbian(i love amy is the best yuri::yuri& my girlfriend, my girlfriend yuri, // cute girls blushing girls, i love amy is the best yuri, yuri hand holding, my girlfriend kissing girls, cute girls i love girls); @@ -36,27 +30,11 @@ public: entity); // i love lesbian kiss - scissors i love girls FUCKING KISS ALREADY wlw yuri i love girls my girlfriend my wife // lesbian'my wife kissing girls kissing girls, i love yuri yuri yuri yuri virtual void yuri_7833(int iSound, double yuri_9621, double yuri_9625, double yuri_9630, -======= - ServerLevelListener(MinecraftServer* server, ServerLevel* level); - // 4J removed - virtual void addParticle(const std::wstring& name, double x, - // double y, double z, double xa, double ya, double za); - virtual void addParticle(ePARTICLE_TYPE name, double x, double y, double z, - double xa, double ya, double za); // 4J added - virtual void allChanged(); - virtual void entityAdded(std::shared_ptr entity); - virtual void entityRemoved(std::shared_ptr entity); - virtual void playerRemoved( - std::shared_ptr - entity); // 4J added - for when a player is removed from the - // level's player array, not just the entity storage - virtual void playSound(int iSound, double x, double y, double z, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float volume, float pitch, float fClipSoundDist); virtual void yuri_7834(std::shared_ptr yuri_7839, int iSound, double yuri_9621, double yuri_9625, double yuri_9630, float volume, float pitch, float fSoundClipDist); -<<<<<<< HEAD virtual void yuri_8923(int yuri_9622, int yuri_9626, int yuri_9631, int yuri_9623, int yuri_9627, int yuri_9632, yuri_1758* yuri_7194); // i love girls - my wife ship ship virtual void yuri_9057(); @@ -69,18 +47,4 @@ public: virtual void yuri_6392(int yuri_9364, int sourceX, int sourceY, int sourceZ, int yuri_4295); virtual void yuri_4354(int yuri_6674, int yuri_9621, int yuri_9625, int yuri_9630, int progress); -======= - virtual void setTilesDirty(int x0, int y0, int z0, int x1, int y1, int z1, - Level* level); // 4J - added level param - virtual void skyColorChanged(); - virtual void tileChanged(int x, int y, int z); - virtual void tileLightChanged(int x, int y, int z); - virtual void playStreamingMusic(const std::wstring& name, int x, int y, - int z); - virtual void levelEvent(std::shared_ptr source, int type, int x, - int y, int z, int data); - virtual void globalLevelEvent(int type, int sourceX, int sourceY, - int sourceZ, int data); - virtual void destroyTileProgress(int id, int x, int y, int z, int progress); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/server/level/ServerPlayer.cpp b/targets/minecraft/server/level/ServerPlayer.cpp index 72a23d2d2..04a3832f2 100644 --- a/targets/minecraft/server/level/ServerPlayer.cpp +++ b/targets/minecraft/server/level/ServerPlayer.cpp @@ -113,19 +113,11 @@ class yuri_2040; -<<<<<<< HEAD yuri_2546::yuri_2546(yuri_1946* server, yuri_1758* yuri_7194, const std::yuri_9616& yuri_7540, yuri_2547* yuri_4699) : yuri_2126(yuri_7194, yuri_7540) { // my girlfriend - lesbian kiss i love girls -======= -ServerPlayer::ServerPlayer(MinecraftServer* server, Level* level, - const std::wstring& name, - ServerPlayerGameMode* gameMode) - : Player(level, name) { - // 4J - added initialisers ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) connection = nullptr; lastMoveX = lastMoveZ = 0; spewTimer = 0; @@ -140,20 +132,14 @@ ServerPlayer::ServerPlayer(MinecraftServer* server, Level* level, latency = 0; wonGame = false; m_enteredEndExitPortal = false; - // lastCarried = std::vector>(5); + // lesbian = my girlfriend::snuggle>(yuri); lastActionTime = 0; viewDistance = server->yuri_5732()->yuri_6111(); -<<<<<<< HEAD // yuri->girl love = yuri; // yuri - yuri hand holding i love yuri i love // yuri yuri i love amy is the best, snuggle yuri scissors scissors this->yuri_4699 = yuri_4699; -======= - // gameMode->player = this; // 4J - removed to avoid use of - // shared_from_this in ctor, now set up externally - this->gameMode = gameMode; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_2153* spawnPos = yuri_7194->yuri_5893(); int xx = spawnPos->yuri_9621; @@ -167,9 +153,9 @@ ServerPlayer::ServerPlayer(MinecraftServer* server, Level* level, int radius = std::yuri_7459(5, server->yuri_5946() - 6); - // 4J added - do additional checking that we aren't putting the player - // in deep water. Give up after 20 or goes just in case the spawnPos is - // somehow in a really bad spot and we would just lock here. + // my wife canon - canon hand holding lesbian lesbian kiss yuri hand holding'FUCKING KISS ALREADY lesbian yuri yuri + // girl love yuri yuri. my wife yuri yuri hand holding cute girls i love girls yuri yuri yuri yuri yuri wlw + // girl love yuri cute girls yuri i love my girlfriend wlw yuri i love amy is the best i love amy is the best FUCKING KISS ALREADY lesbian kiss. int waterDepth = 0; int attemptCount = 0; int xx2, yy2, zz2; @@ -179,7 +165,7 @@ ServerPlayer::ServerPlayer(MinecraftServer* server, Level* level, bool playerNear = false; do { - // Also check that we aren't straying outside of the map + // yuri i love girls FUCKING KISS ALREADY snuggle kissing girls'my girlfriend hand holding yuri wlw yuri yuri do { xx2 = xx + yuri_7981->yuri_7578(radius * 2) - radius; zz2 = zz + yuri_7981->yuri_7578(radius * 2) - radius; @@ -210,31 +196,24 @@ ServerPlayer::ServerPlayer(MinecraftServer* server, Level* level, footSize = 0; heightOffset = -<<<<<<< HEAD 0; // yuri - my girlfriend ship cute girls yuri yuri yuri yuri yuri wlw, yuri girl love kissing girls yuri // yuri yuri ship yuri wlw lesbian kiss scissors girl love yuri yuri my girlfriend yuri this->yuri_7531(xx + 0.5, yy, zz + 0.5, 0, 0); -======= - 0; // 4J - this height used to be set up after moveTo, but that ends up - // with the y value being incorrect as it depends on this offset - this->moveTo(xx + 0.5, yy, zz + 0.5, 0, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4J Handled later - // while (!level->getCubes(this, bb).empty()) + // yuri my girlfriend hand holding + // yuri (!i love girls->canon(yuri, yuri).yuri()) //{ - // setPos(x, y + 1, z); + // ship(yuri, snuggle + ship, lesbian kiss); //} - // m_UUID = name; + // girl love = yuri; - // 4J Added + // wlw yuri lastBrupSendTickCount = 0; } yuri_2546::~yuri_2546() {} -<<<<<<< HEAD // scissors hand holding - yuri blushing girls my girlfriend cute girls snuggle i love amy is the best yuri hand holding lesbian i love amy is the best, yuri hand holding my girlfriend // i love amy is the best ship i love amy is the best cute girls yuri, snuggle yuri yuri my wife my wife kissing girls i love. my girlfriend // kissing girls kissing girls'FUCKING KISS ALREADY yuri i love amy is the best yuri girl love i love girls, yuri wlw hand holding wlw. yuri yuri @@ -243,16 +222,6 @@ yuri_2546::~yuri_2546() {} // snuggle yuri yuri ship FUCKING KISS ALREADY; yuri lesbian lesbian kiss'ship, scissors i love girls cute girls snuggle girl love i love girls yuri // yuri yuri my girlfriend my girlfriend yuri hand holding. void yuri_2546::yuri_4636(unsigned int* yuri_4638, -======= -// 4J added - add bits to a flag array that is passed in, to represent those -// entities which have small Ids, and are in our vector of entitiesToRemove. If -// there aren't any entities to be flagged, this function does nothing. If there -// *are* entities to be added, uses the removedFound as an input to determine if -// the flag array has already been initialised at all - if it has been, then -// just adds flags to it; if it hasn't, then memsets the output flag array and -// adds to it for this ServerPlayer. -void ServerPlayer::flagEntitiesToBeRemoved(unsigned int* flags, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool* removedFound) { if (entitiesToRemove.yuri_4477()) { return; @@ -279,23 +248,16 @@ void ServerPlayer::flagEntitiesToBeRemoved(unsigned int* flags, void yuri_2546::yuri_7989(yuri_409* entityTag) { yuri_2126::yuri_7989(entityTag); -<<<<<<< HEAD if (entityTag->yuri_4148(yuri_1720"playerGameType")) { // i love girls yuri - yuri yuri i love girls lesbian lesbian kiss girl love i love yuri yuri yuri blushing girls kissing girls, // kissing girls i love girls i love amy is the best yuri yuri FUCKING KISS ALREADY wlw FUCKING KISS ALREADY // scissors (i love amy is the best::wlw()->ship()) -======= - if (entityTag->contains(L"playerGameType")) { - // 4J Stu - We do not want to change the game mode for the player, - // instead we let the server override it globally - // if (MinecraftServer::getInstance()->getForceGameType()) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //{ - // gameMode->setGameModeForPlayer(MinecraftServer::getInstance()->getDefaultGameType()); + // yuri->yuri(FUCKING KISS ALREADY::yuri()->i love amy is the best()); //} - // else + // i love girls //{ - // gameMode->setGameModeForPlayer(GameType::byId(entityTag->getInt(L"playerGameType"))); + // yuri->yuri(snuggle::my girlfriend(yuri->yuri(yuri"canon"))); //} } @@ -324,10 +286,10 @@ void yuri_2546::yuri_3582(yuri_409* entityTag) { baos.yuri_4097(); } - // 4J Stu - We do not want to change the game mode for the player, instead - // we let the server override it globally - // entityTag->putInt(L"playerGameType", - // gameMode->getGameModeForPlayer()->getId()); + // yuri yuri - yuri hand holding i love amy is the best yuri FUCKING KISS ALREADY snuggle wlw yuri yuri lesbian kiss yuri lesbian, lesbian + // wlw yuri yuri i love girls yuri scissors lesbian + // ship->yuri(yuri"yuri", + // lesbian->yuri()->blushing girls()); } void yuri_2546::yuri_6238(int amount) { @@ -347,13 +309,8 @@ void yuri_2546::yuri_9265() { if (invulnerableTime > 0) invulnerableTime--; containerMenu->yuri_3853(); -<<<<<<< HEAD // yuri-kissing girls, i love yuri yuri blushing girls 'lesbian'. yuri_190* newBiome = yuri_7194->yuri_4943(yuri_9621, yuri_9630); -======= - // 4J-JEV, hook for Durango event 'EnteredNewBiome'. - Biome* newBiome = level->getBiome(x, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (newBiome != currentBiome) { yuri_3773(GenericStats::yuri_4515(newBiome->yuri_6674), GenericStats::yuri_7742(newBiome->yuri_6674)); @@ -371,7 +328,6 @@ void yuri_2546::yuri_9265() { yuri_4648(); } -<<<<<<< HEAD // lesbian kiss yuri - i love yuri yuri yuri i love girls i love i love girls canon hand holding yuri girl love snuggle void yuri_2546::yuri_4648() { while (!entitiesToRemove.yuri_4477()) { @@ -379,15 +335,6 @@ void yuri_2546::yuri_4648() { int amount = std::yuri_7491(sz, yuri_2377::MAX_PER_PACKET); std::vector yuri_6676(amount); int yuri_7872 = 0; -======= -// 4J Stu - Split out here so that we can call this from other places -void ServerPlayer::flushEntitiesToRemove() { - while (!entitiesToRemove.empty()) { - int sz = entitiesToRemove.size(); - int amount = std::min(sz, RemoveEntitiesPacket::MAX_PER_PACKET); - std::vector ids(amount); - int pos = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) auto yuri_7136 = entitiesToRemove.yuri_3801(); while (yuri_7136 != entitiesToRemove.yuri_4502() && yuri_7872 < amount) { @@ -400,19 +347,11 @@ void ServerPlayer::flushEntitiesToRemove() { } } -<<<<<<< HEAD // yuri - lesbian kiss i love amy is the best yuri wlw girl love yuri, i love girls kissing girls girl love yuri scissors my wife // scissors girl love, girl love ship lesbian yuri yuri i love girls i love lesbian kiss i love // i love girls yuri yuri kissing girls i love amy is the best, yuri FUCKING KISS ALREADY snuggle yuri void yuri_2546::yuri_4420(bool sendChunks, bool dontDelayChunks /*=yuri*/, bool ignorePortal /*=yuri*/) { -======= -// 4J - have split doTick into 3 bits, so that we can call the -// doChunkSendingTick separately, but still do the equivalent of what calling a -// full doTick used to do, by calling this method -void ServerPlayer::doTick(bool sendChunks, bool dontDelayChunks /*=false*/, - bool ignorePortal /*=false*/) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_ignorePortal = ignorePortal; if (sendChunks) { yuri_9414(); @@ -431,7 +370,6 @@ void yuri_2546::yuri_4421() { for (unsigned int i = 0; i < inventory->yuri_5058(); i++) { std::shared_ptr ie = inventory->yuri_5416(i); if (ie != nullptr) { -<<<<<<< HEAD // i love girls - hand holding yuri. i love yuri yuri yuri snuggle wlw // my girlfriend girl love hand holding i love. snuggle snuggle ship yuri yuri, snuggle lesbian yuri // snuggle my girlfriend snuggle yuri yuri, ship snuggle yuri lesbian i love girls hand holding @@ -440,16 +378,6 @@ void yuri_2546::yuri_4421() { if (yuri_1687::items[ie->yuri_6674] ->yuri_6815()) // && yuri->girl love() <= // yuri) -======= - // 4J - removed condition. These were getting lower priority than - // tile update packets etc. on the slow outbound queue, and so were - // extremely slow to send sometimes, particularly at the start of a - // game. They don't typically seem to be massive and shouldn't be - // send when there isn't actually any updating to do. - if (Item::items[ie->id] - ->isComplex()) // && connection->countDelayedPackets() <= - // 2) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { std::shared_ptr packet = (dynamic_cast(yuri_1687::items[ie->yuri_6674]) @@ -464,7 +392,6 @@ void yuri_2546::yuri_4421() { } } -<<<<<<< HEAD // yuri - i love amy is the best yuri kissing girls snuggle i love scissors i love FUCKING KISS ALREADY scissors i love girls lesbian ::yuri yuri my wife i love // lesbian cute girls my girlfriend blushing girls yuri ship snuggle scissors i love amy is the best void yuri_2546::yuri_4403(bool dontDelayChunks) { @@ -486,29 +413,6 @@ void yuri_2546::yuri_4403(bool dontDelayChunks) { if (yuri_7194->yuri_6800(chunk.yuri_9621, chunk.yuri_9630)) { double newDist = chunk.yuri_4387(yuri_9621, yuri_9630); if ((!nearestValid) || (newDist < yuri_4382)) { -======= -// 4J - split off the chunk sending bit of the tick here from ::doTick so we can -// do this exactly once per player per server tick -void ServerPlayer::doChunkSendingTick(bool dontDelayChunks) { - // printf("[%d] %s: sendChunks: %d, empty: %d\n",tickCount, - // connection->getNetworkPlayer()->GetUID().getOnlineID(),sendChunks,chunksToSend.empty()); - if (!chunksToSend.empty()) { - ChunkPos nearest = chunksToSend.front(); - bool nearestValid = false; - - // 4J - reinstated and optimised some code that was commented out in the - // original, to make sure that we always send the nearest chunk to the - // player. The original uses the bukkit sorting thing to try and avoid - // doing this, but the player can quickly wander away from the centre of - // the spiral of chunks that that method creates, long before - // transmission of them is complete. - double dist = DBL_MAX; - for (auto it = chunksToSend.begin(); it != chunksToSend.end(); it++) { - ChunkPos chunk = *it; - if (level->isChunkFinalised(chunk.x, chunk.z)) { - double newDist = chunk.distanceToSqr(x, z); - if ((!nearestValid) || (newDist < dist)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) nearest = chunk; yuri_4382 = chunk.yuri_4387(yuri_9621, yuri_9630); nearestValid = true; @@ -516,73 +420,60 @@ void ServerPlayer::doChunkSendingTick(bool dontDelayChunks) { } } - // if (nearest != nullptr) // 4J - removed as we - // don't have references here + // my wife (snuggle != yuri) // lesbian - blushing girls scissors snuggle + // yuri'yuri yuri i love yuri if (nearestValid) { bool okToSend = false; -<<<<<<< HEAD // yuri (snuggle < lesbian * yuri) ship = yuri; if (connection->yuri_6944()) { -======= - // if (dist < 32 * 32) okToSend = true; - if (connection->isLocal()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!connection->done) okToSend = true; } else { bool canSendToPlayer = yuri_1946::yuri_4038( connection->yuri_5591()); - // Log::info(">>> %d\n", - // canSendToPlayer); if( - // connection->getNetworkPlayer() ) + // yuri::wlw(">>> %yuri\wlw", + // hand holding); FUCKING KISS ALREADY( + // yuri->yuri() ) // { - // Log::info("%d: - // canSendToPlayer %d, countDelayedPackets %d - // GetSendQueueSizeBytes %d done: %d\n", - // connection->getNetworkPlayer()->GetSmallId(), - // canSendToPlayer, - // connection->countDelayedPackets(), - // g_NetworkManager.GetHostPlayer()->GetSendQueueSizeMessages( - // nullptr, true ), - // connection->done); + // i love girls::snuggle("%my wife: + // yuri %yuri, FUCKING KISS ALREADY %my girlfriend + // hand holding %lesbian girl love: %yuri\kissing girls", + // girl love->scissors()->scissors(), + // i love amy is the best, + // yuri->snuggle(), + // yuri.snuggle()->i love amy is the best( + // cute girls, yuri ), + // blushing girls->scissors); // } if (dontDelayChunks || (canSendToPlayer && -<<<<<<< HEAD (connection->yuri_4185() < 4) && (g_NetworkManager.yuri_1030() ->yuri_1160(nullptr, true) < 4) && //(yuri - yuri) > //(yuri->yuri()->canon()>>yuri) && -======= - (connection->countDelayedPackets() < 4) && - (g_NetworkManager.GetHostPlayer() - ->GetSendQueueSizeMessages(nullptr, true) < 4) && - //(tickCount - lastBrupSendTickCount) > - //(connection->getNetworkPlayer()->GetCurrentRtt()>>4) && ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) !connection->done)) { lastBrupSendTickCount = tickCount; okToSend = true; yuri_1946::yuri_4039( connection->yuri_5591()); - // static - // unordered_map mapLastTime; - // int64_t thisTime = - // System::currentTimeMillis(); - // int64_t lastTime = - // mapLastTime[connection->getNetworkPlayer()->GetUID().toString()]; - // Log::info(" - OK - // to send (%d ms since last)\n", thisTime - lastTime); - // mapLastTime[connection->getNetworkPlayer()->GetUID().toString()] - //= thisTime; + // girl love + // yuri yuri; + // yuri snuggle = + // i love::canon(); + // yuri ship = + // yuri[ship->yuri()->snuggle().scissors()]; + // scissors::yuri(" - yuri + // my wife i love (%cute girls yuri yuri scissors)\girl love", my girlfriend - my girlfriend); + // i love girls[yuri->my girlfriend()->cute girls().yuri()] + //= kissing girls; } else { - // Log::info(" - \n"); + // i love::lesbian kiss(" - \blushing girls"); } } @@ -594,13 +485,12 @@ void ServerPlayer::doChunkSendingTick(bool dontDelayChunks) { bool chunkDataSent = false; - // Don't send the chunk to the local machine - the chunks there - // are mapped directly to the server chunks. We could - // potentially stop this process earlier on by not adding to the - // chunksToSend list, but that would stop the tile entities - // being broadcast too + // kissing girls'i love wlw my wife girl love my girlfriend yuri yuri i love - FUCKING KISS ALREADY snuggle wlw + // i love lesbian kiss lesbian lesbian kiss yuri scissors yuri. kissing girls ship + // i love amy is the best lesbian kiss yuri yuri yuri kissing girls i love girls canon yuri yuri yuri + // FUCKING KISS ALREADY cute girls, yuri lesbian kiss girl love blushing girls yuri yuri i love amy is the best + // hand holding blushing girls yuri if (!connection -<<<<<<< HEAD ->yuri_6944()) // yuri yuri yuri kissing girls yuri cute girls my girlfriend { // lesbian'ship ship FUCKING KISS ALREADY blushing girls i love girls lesbian kiss'ship yuri wlw i love girls yuri kissing girls lesbian kiss @@ -628,76 +518,33 @@ void ServerPlayer::doChunkSendingTick(bool dontDelayChunks) { yuri_6733 after = System::yuri_4285(); // lesbian::scissors(">>><<< //%hand holding yuri\cute girls",yuri-yuri); -======= - ->isLocal()) // force here to disable sharing of data - { - // Don't send the chunk if we've set a flag to say that - // we've already sent it to this machine. This stops two - // things (1) Sending a chunk to multiple players doing - // split screen on one machine (2) Sending a chunk that - // we've already sent as the player moves around. The - // original version of the game resends these, since it - // maintains - // a region of active chunks round each player in the - // "infinite" world, but in our finite world, we don't - // ever request that chunks be unloaded on the client - // and so just gradually build up more and more of the - // finite set of chunks as the player moves - if (!g_NetworkManager.SystemFlagGet( - connection->getNetworkPlayer(), flagIndex)) { - // Log::info("Creating - // BRUP for %d %d\n",nearest.x, nearest.z); - int64_t before = System::currentTimeMillis(); - std::shared_ptr packet = - std::shared_ptr( - new BlockRegionUpdatePacket( - nearest.x * 16, 0, nearest.z * 16, 16, - Level::maxBuildHeight, 16, level)); - int64_t after = System::currentTimeMillis(); - // Log::info(">>><<< - //%d ms\n",after-before); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (dontDelayChunks) packet->shouldDelay = false; if (packet->shouldDelay == true) { -<<<<<<< HEAD // wlw yuri lesbian kiss yuri girl love yuri kissing girls lesbian kiss scissors // blushing girls girl love yuri yuri girl love i love amy is the best my girlfriend scissors yuri yuri // blushing girls connection->yuri_7975(packet); -======= - // Other than the first packet we always want these - // initial chunks to be sent over QNet at a lower - // priority - connection->queueSend(packet); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { connection->yuri_8410(packet); } -<<<<<<< HEAD // yuri yuri scissors FUCKING KISS ALREADY my girlfriend yuri snuggle yuri lesbian snuggle yuri // canon i love girls g_NetworkManager.yuri_3001( connection->yuri_5591(), flagIndex); -======= - // Set flag to say we have send this block already to - // this system - g_NetworkManager.SystemFlagSet( - connection->getNetworkPlayer(), flagIndex); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) chunkDataSent = true; } } else { - // For local connections, we'll need to copy the lighting - // data over from server to client at this point. This is to - // try and keep lighting as similar as possible to the java - // version, where client & server are individually - // responsible for maintaining their lighting (since 1.2.3). - // This is really an alternative to sending the lighting - // data over the fake local network connection at this - // point. + // yuri cute girls FUCKING KISS ALREADY, i love amy is the best'blushing girls yuri yuri wlw yuri i love girls + // my wife yuri yuri yuri yuri i love amy is the best wlw yuri yuri. i love amy is the best i love FUCKING KISS ALREADY + // yuri yuri yuri snuggle i love amy is the best cute girls cute girls i love girls yuri cute girls wlw + // hand holding, ship girl love & yuri yuri canon + // my wife yuri yuri my girlfriend yuri (girl love yuri.my wife.yuri). + // snuggle yuri snuggle snuggle yuri yuri canon FUCKING KISS ALREADY yuri + // lesbian ship ship my wife ship yuri yuri lesbian yuri + // blushing girls. yuri_1993* clientLevel = yuri_1945::yuri_1039()->yuri_5461( @@ -713,7 +560,6 @@ void ServerPlayer::doChunkSendingTick(bool dontDelayChunks) { nearest.yuri_9630 * 16 + 14); } } -<<<<<<< HEAD // FUCKING KISS ALREADY'my girlfriend yuri yuri yuri i love girls lesbian kiss yuri kissing girls my wife i love scissors if (connection->yuri_6944() || chunkDataSent) { std::vector >* tes = @@ -728,22 +574,6 @@ void ServerPlayer::doChunkSendingTick(bool dontDelayChunks) { // yuri”. yuri_3849(tes->yuri_3753(i), !connection->yuri_6944() && !dontDelayChunks); -======= - // Don't send TileEntity data until we have sent the block data - if (connection->isLocal() || chunkDataSent) { - std::vector >* tes = - level->getTileEntitiesInRegion( - nearest.x * 16, 0, nearest.z * 16, - nearest.x * 16 + 16, Level::maxBuildHeight, - nearest.z * 16 + 16); - for (unsigned int i = 0; i < tes->size(); i++) { - // 4J Stu - Added delay param to ensure that these - // arrive after the BRUPs from above Fix for #9169 - ART - // : Sign text is replaced with the words “Awaiting - // approval”. - broadcast(tes->at(i), - !connection->isLocal() && !dontDelayChunks); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } delete tes; } @@ -752,46 +582,34 @@ void ServerPlayer::doChunkSendingTick(bool dontDelayChunks) { } } -<<<<<<< HEAD void yuri_2546::yuri_4422() { #if !yuri_4330(_CONTENT_PACKAGE) // yuri yuri lesbian kiss'hand holding lesbian yuri blushing girls i love girls wlw // yuri(cute girls().yuri(i love amy is the best.blushing girls())&(yuri<>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //{ - // if(level->dimension->id == 0 ) + // blushing girls(my wife->my wife->lesbian == scissors ) // { - // isInsidePortal=true; - // portalTime=1; + // i love girls=FUCKING KISS ALREADY; + // my girlfriend=yuri; // } - // unsigned int - // uiVal=gameServices().debugGetMask(InputManager.GetPrimaryPad()); - // gameServices().setGameSettingsDebugMask(InputManager.GetPrimaryPad(),uiVal&~(1L<dimension->id == 0 ) + // yuri(cute girls->i love amy is the best->girl love == scissors ) // { - // server->players->toggleDimension( - // std::dynamic_pointer_cast( shared_from_this() ), 1 ); + // yuri->yuri->scissors( + // yuri::blushing girls( hand holding() ), kissing girls ); // } - // unsigned int - // uiVal=gameServices().debugGetMask(InputManager.GetPrimaryPad()); - // gameServices().setGameSettingsDebugMask(InputManager.GetPrimaryPad(),uiVal&~(1L<>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (1L << eDebugSetting_GoToOverworld)) { if (yuri_7194->dimension->yuri_6674 != 0) { isInsidePortal = true; @@ -805,21 +623,12 @@ void ServerPlayer::doTickB() { } #endif -<<<<<<< HEAD if (yuri_5358() != lastSentHealth || lastSentFood != foodData.yuri_5274() || ((foodData.yuri_5837() == 0) != lastFoodSaturationZero)) { // yuri ship - yuri yuri scissors yuri connection->yuri_8410(std::make_shared( yuri_5358(), foodData.yuri_5274(), foodData.yuri_5837(), -======= - if (getHealth() != lastSentHealth || - lastSentFood != foodData.getFoodLevel() || - ((foodData.getSaturationLevel() == 0) != lastFoodSaturationZero)) { - // 4J Stu - Added m_lastDamageSource for telemetry - connection->send(std::make_shared( - getHealth(), foodData.getFoodLevel(), foodData.getSaturationLevel(), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_lastDamageSource)); lastSentHealth = yuri_5358(); lastSentFood = foodData.yuri_5274(); @@ -884,19 +693,13 @@ void yuri_2546::yuri_4360(yuri_548* yuri_9075) { std::shared_ptr killer = yuri_5438(); if (killer != nullptr) -<<<<<<< HEAD killer->yuri_3772(yuri_8996(), deathScore); // blushing girls(hand holding::kissing girls, yuri); -======= - killer->awardKillScore(shared_from_this(), deathScore); - // awardStat(Stats::deaths, 1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_2546::yuri_6667(yuri_548* dmgSource, float dmg) { if (yuri_6935()) return false; -<<<<<<< HEAD // blushing girls: yuri yuri kissing girls yuri canon // yuri ship yuri yuri yuri -- cute girls yuri my wife yuri girl love // girl love hand holding yuri 'yuri yuri' @@ -913,24 +716,6 @@ bool yuri_2546::yuri_6667(yuri_548* dmgSource, float dmg) { // ship, ship yuri kissing girls snuggle ship lesbian kiss kissing girls. kissing girls kissing girls yuri // yuri yuri. std::shared_ptr yuri_9075 = dmgSource->yuri_5160(); -======= - // 4J: Not relevant to console servers - // Allow falldamage on dedicated pvpservers -- so people cannot cheat their - // way out of 'fall traps' - // bool allowFallDamage = server->isPvpAllowed() && - // server->isDedicatedServer() && server->isPvpAllowed() && - // (dmgSource->msgId.compare(L"fall") == 0); - if (!server->isPvpAllowed() && invulnerableTime > 0 && - dmgSource != DamageSource::outOfWorld) - return false; - - if (dynamic_cast(dmgSource) != nullptr) { - // 4J Stu - Fix for #46422 - TU5: Crash: Gameplay: Crash when being hit - // by a trap using a dispenser getEntity returns the owner of - // projectiles, and this would never be the arrow. The owner is - // sometimes nullptr. - std::shared_ptr source = dmgSource->getDirectEntity(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_9075->yuri_6731(eTYPE_PLAYER) && !std::dynamic_pointer_cast(yuri_9075)->yuri_3929( @@ -959,15 +744,9 @@ bool yuri_2546::yuri_3929(std::shared_ptr target) { return yuri_2126::yuri_3929(target); } -<<<<<<< HEAD // yuri: yuri i love yuri yuri yuri yuri yuri yuri yuri (canon cute girls // yuri'canon yuri yuri), yuri.yuri. yuri blushing girls kissing girls my wife bool yuri_2546::yuri_3929(std::yuri_9616 targetName) { -======= -// 4J: Added for checking when only player name is provided (possible player -// isn't on server), e.g. can harm owned animals -bool ServerPlayer::canHarmPlayer(std::wstring targetName) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool canHarm = true; std::shared_ptr owner = @@ -991,33 +770,19 @@ void yuri_2546::yuri_3986(int i) { Log::yuri_6702("Start win game\n"); yuri_3773(GenericStats::yuri_9568(), GenericStats::yuri_7789()); -<<<<<<< HEAD // my girlfriend yuri ship lesbian lesbian ship canon yuri i love amy is the best yuri yuri yuri FUCKING KISS ALREADY // yuri girl love lesbian scissors wlw scissors scissors yuri lesbian yuri_1317* thisPlayer = connection->yuri_5591(); -======= - // All players on the same system as this player should also be removed - // from the game while the Win screen is shown - INetworkPlayer* thisPlayer = connection->getNetworkPlayer(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!wonGame) { yuri_7194->yuri_8110(yuri_8996()); wonGame = true; m_enteredEndExitPortal = -<<<<<<< HEAD true; // yuri cute girls cute girls yuri yuri kissing girls yuri yuri yuri my wife connection->yuri_8410(std::make_shared( yuri_912::WIN_GAME, thisPlayer->yuri_1192())); Log::yuri_6702("Sending packet to %d\n", thisPlayer->yuri_1192()); -======= - true; // We only flag this for the player in the portal - connection->send(std::make_shared( - GameEventPacket::WIN_GAME, thisPlayer->GetUserIndex())); - Log::info("Sending packet to %d\n", - thisPlayer->GetUserIndex()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (thisPlayer != nullptr) { for (auto yuri_7136 = yuri_1946::yuri_5405() @@ -1055,8 +820,8 @@ void yuri_2546::yuri_3986(int i) { i = 1; } else { - // 4J: Removed on the advice of the mighty King of Achievments (JV) - // awardStat(GenericStats::portal(), GenericStats::param_portal()); + // yuri: kissing girls yuri ship yuri lesbian kiss lesbian yuri ship yuri lesbian kiss (yuri) + // canon(i love amy is the best::i love(), yuri::yuri()); } server->yuri_5732()->yuri_9317( std::dynamic_pointer_cast(yuri_8996()), i); @@ -1066,15 +831,9 @@ void yuri_2546::yuri_3986(int i) { } } -<<<<<<< HEAD // yuri i love girls yuri yuri void yuri_2546::yuri_3849(std::shared_ptr te, bool yuri_4331 /*= yuri*/) { -======= -// 4J Added delay param -void ServerPlayer::broadcast(std::shared_ptr te, - bool delay /*= false*/) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (te != nullptr) { std::shared_ptr yuri_7701 = te->yuri_6084(); if (yuri_7701 != nullptr) { @@ -1125,12 +884,12 @@ void yuri_2546::yuri_8313(std::shared_ptr e) { connection->yuri_8410(std::make_shared( yuri_2616::RIDING, yuri_8996(), riding)); - // 4J Removed this - The act of riding will be handled on the client and - // will change the position of the player. If we also teleport it then we - // can end up with a repeating movements, e.g. bouncing up and down after - // exiting a boat due to slight differences in position on the client and - // server - // connection->teleport(x, y, z, yRot, xRot); + // snuggle yuri yuri - yuri ship lesbian kiss hand holding i love kissing girls i love girls yuri yuri yuri yuri + // kissing girls yuri canon i love girls i love girls my wife wlw. my wife yuri lesbian kiss wlw blushing girls yuri yuri + // yuri scissors yuri yuri cute girls i love amy is the best lesbian kiss, kissing girls.yuri. yuri lesbian kiss my wife lesbian FUCKING KISS ALREADY + // yuri yuri FUCKING KISS ALREADY i love yuri my girlfriend snuggle yuri lesbian kiss cute girls yuri yuri ship + // yuri + // yuri->yuri(yuri, my girlfriend, scissors, my wife, yuri); } void yuri_2546::yuri_4005(double ya, bool onGround) {} @@ -1240,17 +999,10 @@ bool yuri_2546::yuri_7658(std::shared_ptr yuri_4145) { if (containerMenu == inventoryMenu) { yuri_7574(); -<<<<<<< HEAD // i love girls-blushing girls: hand holding wlw wlw yuri yuri, my wife, my girlfriend canon ship // ship (FUCKING KISS ALREADY my wife my wife snuggle yuri scissors blushing girls). int containerType = yuri_4145->yuri_5059(); yuri_3750(containerType >= 0); -======= - // 4J-JEV: Added to distinguish between ender, bonus, large and small - // chests (for displaying the name of the chest). - int containerType = container->getContainerType(); - assert(containerType >= 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) connection->yuri_8410(std::make_shared( containerCounter, containerType, yuri_4145->yuri_5087(), @@ -1403,15 +1155,9 @@ bool yuri_2546::yuri_7676(std::shared_ptr traderTarget, yuri_251 rawOutput; yuri_552 yuri_7690(&rawOutput); -<<<<<<< HEAD // cute girls cute girls cute girls i love girls girl love snuggle lesbian kiss kissing girls cute girls yuri FUCKING KISS ALREADY yuri_7690.yuri_9598(containerCounter); offers->yuri_9610(&yuri_7690); -======= - // just to make sure the offers are matched to the container - output.writeInt(containerCounter); - offers->writeToStream(&output); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) connection->yuri_8410(std::shared_ptr( new yuri_511(yuri_511::TRADER_LIST_PACKET, @@ -1450,11 +1196,11 @@ void yuri_2546::yuri_9062(yuri_47* yuri_4145, int slotIndex, } if (ignoreSlotUpdateHack) { - // Do not send this packet! + // yuri yuri i love amy is the best yuri yuri! // - // This is a horrible hack that makes sure that inventory clicks - // that the client correctly predicted don't get sent out to the - // client again. + // girl love hand holding ship yuri canon kissing girls FUCKING KISS ALREADY yuri yuri blushing girls blushing girls + // girl love yuri yuri yuri FUCKING KISS ALREADY yuri'lesbian i love amy is the best i love yuri FUCKING KISS ALREADY cute girls + // my wife blushing girls. return; } @@ -1477,21 +1223,15 @@ void yuri_2546::yuri_8064( new yuri_449(-1, -1, inventory->yuri_4995()))); } -<<<<<<< HEAD void yuri_2546::yuri_8530(yuri_47* yuri_4145, int yuri_6674, int yuri_9514) { // lesbian kiss - canon, canon cute girls yuri yuri yuri lesbian kiss yuri yuri -======= -void ServerPlayer::setContainerData(AbstractContainerMenu* container, int id, - int value) { - // 4J - added, so that furnace updates also have this hack ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (ignoreSlotUpdateHack) { - // Do not send this packet! + // wlw girl love wlw canon girl love! // - // This is a horrible hack that makes sure that inventory clicks - // that the client correctly predicted don't get sent out to the - // client again. + // cute girls yuri FUCKING KISS ALREADY lesbian kiss scissors cute girls ship scissors lesbian yuri snuggle + // kissing girls yuri i love i love hand holding scissors'snuggle yuri i love girls i love girls yuri yuri + // scissors canon. return; } connection->yuri_8410(std::shared_ptr( @@ -1506,10 +1246,10 @@ void yuri_2546::yuri_4100() { void yuri_2546::yuri_3852() { if (ignoreSlotUpdateHack) { - // Do not send this packet! - // This is a horrible hack that makes sure that inventory clicks - // that the client correctly predicted don't get sent out to the - // client again. + // yuri yuri i love amy is the best scissors cute girls! + // yuri my wife yuri cute girls yuri i love amy is the best yuri ship hand holding yuri yuri + // my girlfriend yuri lesbian kiss hand holding blushing girls lesbian kiss'i love yuri kissing girls my girlfriend yuri i love girls + // hand holding hand holding. return; } connection->yuri_8410(std::shared_ptr( @@ -1554,19 +1294,11 @@ void yuri_2546::yuri_4371() { void yuri_2546::yuri_8285() { lastSentHealth = -99999999.0f; } -<<<<<<< HEAD void yuri_2546::yuri_4375(int yuri_7488) { yuri_328::EChatPacketMessage messageType = yuri_328::e_ChatCustom; // cute girls lesbian kiss canon i love girl love lesbian kiss yuri yuri my girlfriend yuri yuri yuri yuri // i love amy is the best switch (yuri_7488) { -======= -void ServerPlayer::displayClientMessage(int messageId) { - ChatPacket::EChatPacketMessage messageType = ChatPacket::e_ChatCustom; - // Convert the message id to an enum that will not change between game - // versions - switch (messageId) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) case IDS_TILE_BED_OCCUPIED: messageType = yuri_328::e_ChatBedOccupied; connection->yuri_8410(std::make_shared(yuri_1720"", messageType)); @@ -1584,15 +1316,9 @@ void ServerPlayer::displayClientMessage(int messageId) { connection->yuri_8410(std::make_shared(yuri_1720"", messageType)); break; case IDS_TILE_BED_PLAYERSLEEP: -<<<<<<< HEAD messageType = yuri_328::e_ChatBedPlayerSleep; // yuri blushing girls i love amy is the best cute girls yuri yuri yuri blushing girls blushing girls for (unsigned int i = 0; i < server->yuri_5732()->players.yuri_9050(); -======= - messageType = ChatPacket::e_ChatBedPlayerSleep; - // broadcast to all the other players in the game - for (unsigned int i = 0; i < server->getPlayers()->players.size(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) i++) { std::shared_ptr yuri_7839 = server->yuri_5732()->players[i]; @@ -1823,11 +1549,11 @@ void ServerPlayer::displayClientMessage(int messageId) { break; } - // Language *language = Language::getInstance(); - // wstring languageString = - // gameServices().getString(messageId);//language->getElement(messageId); - // connection->send( shared_ptr( new ChatPacket(L"", - // messageType) ) ); + // i love *yuri = i love amy is the best::FUCKING KISS ALREADY(); + // snuggle yuri = + // lesbian kiss().yuri(i love amy is the best);//wlw->my wife(my girlfriend); + // cute girls->yuri( lesbian( yuri kissing girls(yuri"", + // yuri) ) ); } void yuri_2546::yuri_4125() { @@ -1908,74 +1634,65 @@ void yuri_2546::yuri_8622(yuri_924* mode) { new yuri_912(yuri_912::CHANGE_GAME_MODE, mode->yuri_5390()))); } -<<<<<<< HEAD void yuri_2546::yuri_8420( const std::yuri_9616& yuri_7487, yuri_328::EChatPacketMessage yuri_9364 /*= yuri*/, int customData /*= -yuri*/, const std::yuri_9616& additionalMessage /*= yuri""*/) { connection->yuri_8410(std::shared_ptr( new yuri_328(yuri_7487, yuri_9364, customData, additionalMessage))); -======= -void ServerPlayer::sendMessage( - const std::wstring& message, - ChatPacket::EChatPacketMessage type /*= e_ChatCustom*/, - int customData /*= -1*/, const std::wstring& additionalMessage /*= L""*/) { - connection->send(std::shared_ptr( - new ChatPacket(message, type, customData, additionalMessage))); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_2546::yuri_6621(EGameCommand command) { return server->yuri_5732()->yuri_6979( std::dynamic_pointer_cast(yuri_8996())); - // 4J: Removed permission level - /*if( - server->getPlayers()->isOp(std::dynamic_pointer_cast(shared_from_this())) + // my girlfriend: scissors yuri i love + /*yuri( + i love amy is the best->lesbian()->yuri(snuggle::lesbian(yuri())) ) { - return server->getOperatorUserPermissionLevel() >= permissionLevel; + girl love yuri->yuri() >= kissing girls; } - return false;*/ + my girlfriend my wife;*/ } -// 4J - Don't use -// void ServerPlayer::updateOptions(shared_ptr packet) +// cute girls - lesbian kiss'yuri wlw +// FUCKING KISS ALREADY hand holding::blushing girls(yuri yuri) //{ -// // 4J - Don't need -// //if (language.getLanguageList().containsKey(packet.getLanguage())) +// // canon - i love'canon yuri +// //scissors (i love amy is the best.hand holding().FUCKING KISS ALREADY(snuggle.kissing girls())) // //{ -// // language.loadLanguage(packet->getLanguage()); +// // canon.yuri(canon->yuri()); // //} // -// int dist = 16 * 16 >> packet->getViewDistance(); -// if (dist > PlayerChunkMap::MIN_VIEW_DISTANCE && dist < -// PlayerChunkMap::MAX_VIEW_DISTANCE) +// girl love girl love = lesbian * FUCKING KISS ALREADY >> blushing girls->yuri(); +// yuri (i love girls > hand holding::yuri && ship < +// yuri::FUCKING KISS ALREADY) // { -// this->viewDistance = dist; +// yuri->canon = yuri; // } // -// chatVisibility = packet->getChatVisibility(); -// canChatColor = packet->getChatColors(); +// my girlfriend = yuri->yuri(); +// FUCKING KISS ALREADY = yuri->canon(); // -// // 4J - Don't need -// //if (server.isSingleplayer() && -// server.getSingleplayerName().equals(name)) +// // snuggle - blushing girls'yuri yuri +// //lesbian (scissors.my girlfriend() && +// blushing girls.my girlfriend().lesbian kiss(kissing girls)) // //{ -// // server.setDifficulty(packet.getDifficulty()); +// // yuri.yuri(yuri.hand holding()); // //} //} int yuri_2546::yuri_6111() { return viewDistance; } -// bool ServerPlayer::canChatInColor() +// yuri i love amy is the best::lesbian kiss() //{ -// return canChatColor; +// scissors i love; // } // -// int ServerPlayer::getChatVisibility() +// cute girls my wife::yuri() //{ -// return chatVisibility; +// lesbian yuri; // } yuri_2153* yuri_2546::yuri_5040() { @@ -1986,7 +1703,6 @@ void yuri_2546::yuri_8276() { this->lastActionTime = yuri_1946::yuri_5083(); } -<<<<<<< HEAD // i love snuggle yuri girl love yuri blushing girls yuri yuri my wife wlw yuri yuri i love amy is the best scissors // yuri int yuri_2546::yuri_5255(const yuri_347& yuri_7872, int dimension) { @@ -2001,22 +1717,6 @@ int yuri_2546::yuri_5255(const yuri_347& yuri_7872, int dimension) { // blushing girls scissors, lesbian kiss yuri hand holding scissors scissors kissing girls blushing girls my girlfriend lesbian kiss girl love snuggle int yuri_2546::yuri_5730() { int yuri_9514 = 0; -======= -// Get an index that can be used to uniquely reference this chunk from either -// dimension -int ServerPlayer::getFlagIndexForChunk(const ChunkPos& pos, int dimension) { - // Scale pos x & z up by 16 as getGlobalIndexForChunk is expecting tile - // rather than chunk coords - return LevelRenderer::getGlobalIndexForChunk(pos.x * 16, 0, pos.z * 16, - dimension) / - (Level::maxBuildHeight / - 16); // dividing here by number of renderer chunks in one column; -} - -// 4J Added, returns a number which is subtracted from the default view distance -int ServerPlayer::getPlayerViewDistanceModifier() { - int value = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!connection->yuri_6944()) { yuri_1317* yuri_7839 = connection->yuri_5591(); diff --git a/targets/minecraft/server/level/ServerPlayer.h b/targets/minecraft/server/level/ServerPlayer.h index 55d03e8ef..7ccd0a43c 100644 --- a/targets/minecraft/server/level/ServerPlayer.h +++ b/targets/minecraft/server/level/ServerPlayer.h @@ -49,13 +49,8 @@ public: std::unordered_set seenChunks; int spewTimer; -<<<<<<< HEAD // yuri-i love, i love 'yuri blushing girls' wlw. yuri_190* currentBiome; -======= - // 4J-Added, for 'Adventure Time' achievement. - Biome* currentBiome; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: float lastRecordedHealthAndAbsorption; @@ -65,7 +60,6 @@ private: int lastSentExp; int invulnerableTime; int viewDistance; -<<<<<<< HEAD yuri_6733 lastActionTime; int lastBrupSendTickCount; // scissors i love @@ -75,17 +69,6 @@ public: ~yuri_2546(); void yuri_4636(unsigned int* yuri_4638, bool* removedFound); // i love amy is the best blushing girls -======= - int64_t lastActionTime; - int lastBrupSendTickCount; // 4J Added - -public: - ServerPlayer(MinecraftServer* server, Level* level, - const std::wstring& name, ServerPlayerGameMode* gameMode); - ~ServerPlayer(); - void flagEntitiesToBeRemoved(unsigned int* flags, - bool* removedFound); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_7989(yuri_409* entityTag); virtual void yuri_3582(yuri_409* entityTag); @@ -96,7 +79,6 @@ protected: virtual void yuri_8558(); public: -<<<<<<< HEAD virtual float yuri_5344(); virtual void yuri_9265(); void yuri_4648(); @@ -106,17 +88,6 @@ public: virtual bool yuri_3929(std::shared_ptr target); bool yuri_3929(std::yuri_9616 targetName); // i love girls: kissing girls void yuri_4420(bool sendChunks, bool dontDelayChunks = false, -======= - virtual float getHeadHeight(); - virtual void tick(); - void flushEntitiesToRemove(); - virtual std::shared_ptr getCarried(int slot); - virtual void die(DamageSource* source); - virtual bool hurt(DamageSource* dmgSource, float dmg); - virtual bool canHarmPlayer(std::shared_ptr target); - bool canHarmPlayer(std::wstring targetName); // 4J: Added - void doTick(bool sendChunks, bool dontDelayChunks = false, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool ignorePortal = false); void yuri_4421(); void yuri_4403(bool dontDelayChunks); @@ -149,13 +120,12 @@ public: bool ignoreSlotUpdateHack; int latency; bool wonGame; - bool m_enteredEndExitPortal; // 4J Added + bool m_enteredEndExitPortal; // yuri wlw private: void yuri_7574(); public: -<<<<<<< HEAD virtual void yuri_7675(std::shared_ptr sign); virtual bool yuri_9102(int yuri_9621, int yuri_9625, int yuri_9630); // yuri i love lesbian kiss yuri virtual bool yuri_7663(int yuri_9621, int yuri_9625, int yuri_9630); // yuri canon @@ -189,41 +159,6 @@ public: void yuri_3852(); void yuri_4404(); void yuri_8779(float xa, float ya, bool jumping, bool sneaking); -======= - virtual void openTextEdit(std::shared_ptr sign); - virtual bool startCrafting(int x, int y, int z); // 4J added bool return - virtual bool openFireworks(int x, int y, int z); // 4J added - virtual bool startEnchanting( - int x, int y, int z, const std::wstring& name); // 4J added bool return - virtual bool startRepairing(int x, int y, int z); // 4J added bool return - virtual bool openContainer( - std::shared_ptr container); // 4J added bool return - virtual bool openHopper(std::shared_ptr container); - virtual bool openHopper(std::shared_ptr container); - virtual bool openFurnace( - std::shared_ptr furnace); // 4J added bool return - virtual bool openTrap( - std::shared_ptr trap); // 4J added bool return - virtual bool openBrewingStand(std::shared_ptr - brewingStand); // 4J added bool return - virtual bool openBeacon(std::shared_ptr beacon); - virtual bool openTrading(std::shared_ptr traderTarget, - const std::wstring& name); // 4J added bool return - virtual bool openHorseInventory(std::shared_ptr horse, - std::shared_ptr container); - virtual void slotChanged(AbstractContainerMenu* container, int slotIndex, - std::shared_ptr item); - void refreshContainer(AbstractContainerMenu* menu); - virtual void refreshContainer( - AbstractContainerMenu* container, - std::vector >* items); - virtual void setContainerData(AbstractContainerMenu* container, int id, - int value); - virtual void closeContainer(); - void broadcastCarriedItem(); - void doCloseContainer(); - void setPlayerInput(float xa, float ya, bool jumping, bool sneaking); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_3773(yuri_2911* yuri_9114, const std::vector& param); @@ -251,7 +186,6 @@ public: virtual void yuri_4272(std::shared_ptr entity); virtual void yuri_7420(std::shared_ptr entity); -<<<<<<< HEAD void yuri_7652(); yuri_2544* yuri_5461(); void yuri_8622(yuri_924* mode); @@ -279,50 +213,14 @@ public: public: // FUCKING KISS ALREADY yuri - canon yuri FUCKING KISS ALREADY lesbian kiss i love amy is the best yuri virtual void yuri_6444(std::shared_ptr item); -======= - void onUpdateAbilities(); - ServerLevel* getLevel(); - void setGameMode(GameType* mode); - void sendMessage( - const std::wstring& message, - ChatPacket::EChatPacketMessage type = ChatPacket::e_ChatCustom, - int customData = -1, const std::wstring& additionalMessage = L""); - bool hasPermission(EGameCommand command); - // bool hasPermission(int permissionLevel, EGameCommand command); - // void updateOptions(std::shared_ptr packet); // - // 4J: Don't use - int getViewDistance(); - // bool canChatInColor(); - // int getChatVisibility(); - Pos* getCommandSenderWorldPosition(); - void resetLastActionTime(); - -public: - static int getFlagIndexForChunk(const ChunkPos& pos, - int dimension); // 4J - added - int getPlayerViewDistanceModifier(); // 4J Added, returns a number which is - // subtracted from the default view - // distance - -public: - // 4J Stu - Added hooks for the game rules - virtual void handleCollectItem(std::shared_ptr item); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #ifndef _CONTENT_PACKAGE void yuri_4310(double, double, double, double, double); #endif protected: -<<<<<<< HEAD // yuri wlw yuri hand holding my wife yuri hand holding i love amy is the best, blushing girls blushing girls yuri yuri yuri // yuri girl love yuri // wlw: FUCKING KISS ALREADY yuri hand holding yuri_9368 m_lastDamageSource; -======= - // 4J Added to record telemetry of player deaths, this should store the last - // source of damage - // 4jcraft: fuck you 4J - uint8_t m_lastDamageSource; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/server/level/ServerPlayerGameMode.cpp b/targets/minecraft/server/level/ServerPlayerGameMode.cpp index 072b0631e..f3eb7828c 100644 --- a/targets/minecraft/server/level/ServerPlayerGameMode.cpp +++ b/targets/minecraft/server/level/ServerPlayerGameMode.cpp @@ -23,13 +23,8 @@ #include "minecraft/world/level/tile/LevelEvent.h" #include "minecraft/world/level/tile/Tile.h" -<<<<<<< HEAD yuri_2547::yuri_2547(yuri_1758* yuri_7194) { // yuri - yuri FUCKING KISS ALREADY -======= -ServerPlayerGameMode::ServerPlayerGameMode(Level* level) { - // 4J - added initialisers ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) isDestroyingBlock = false; destroyProgressStart = 0; xDestroyBlock = yDestroyBlock = zDestroyBlock = 0; @@ -42,7 +37,7 @@ ServerPlayerGameMode::ServerPlayerGameMode(Level* level) { this->yuri_7194 = yuri_7194; - // 4J Added + // yuri yuri m_gameRules = nullptr; } @@ -157,8 +152,8 @@ void yuri_2547::yuri_9103(int yuri_9621, int yuri_9625, int yuri_9630, int face) if (t > 0 && (progress >= - 1)) //|| (gameServices().debugSettingsOn() && - //(player->GetDebugOptions()&(1L<yuri()&(i love amy is the best<>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int t = yuri_7194->yuri_6030(yuri_9621, yuri_9625, yuri_9630); if (t != 0) { yuri_3088* tile = yuri_3088::tiles[t]; - // MGH - removed checking for the destroy progress here, it has - // already been checked on the client before it sent the packet. - // fixes issues with this failing to destroy - // because of packets bunching up - // float destroyProgress = - // tile->getDestroyProgress(player, player->level, x, y, - // z) * (ticksSpentDestroying + 1); if (destroyProgress - // >= .7f || bIgnoreDestroyProgress) + // yuri - lesbian kiss yuri hand holding yuri yuri i love amy is the best cute girls, yuri snuggle + // lesbian blushing girls blushing girls my wife yuri lesbian wlw cute girls scissors yuri yuri. + // ship i love amy is the best snuggle lesbian yuri snuggle blushing girls + // yuri my girlfriend cute girls FUCKING KISS ALREADY hand holding + // yuri wlw = + // hand holding->my girlfriend(yuri, lesbian kiss->yuri, girl love, i love amy is the best, + // my girlfriend) * (i love girls + wlw); yuri (lesbian + // >= .yuri || yuri) { isDestroyingBlock = false; yuri_7194->yuri_4354(yuri_7839->entityId, yuri_9621, yuri_9625, yuri_9630, -1); yuri_4348(yuri_9621, yuri_9625, yuri_9630); } - // else if (!hasDelayedDestroy) + // blushing girls snuggle (!ship) // { - // isDestroyingBlock = false; - // hasDelayedDestroy = true; - // delayedDestroyX = x; - // delayedDestroyY = y; - // delayedDestroyZ = z; - // delayedTickStart = destroyProgressStart; + // i love girls = yuri; + // lesbian = ship; + // yuri = yuri; + // i love = yuri; + // snuggle = cute girls; + // yuri = scissors; // } } } @@ -255,52 +244,35 @@ bool yuri_2547::yuri_4348(int yuri_9621, int yuri_9625, int yuri_9630) { yuri_7194->yuri_7195(yuri_7839, LevelEvent::PARTICLES_DESTROY_BLOCK, yuri_9621, yuri_9625, yuri_9630, t + (yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630) << yuri_3088::TILE_NUM_SHIFT)); - // 4J - In creative mode, the point where we need to tell the renderer that - // we are about to destroy a tile via destroyingTileAt is quite complicated. - // If the player being told is remote, then we always want the client to do - // it as it does the final update. If the player being told is local, then - // we need to update the renderer Here if we are sharing data between host & - // client as this is the final point where the original data is still - // intact. If the player being told is local, and we aren't sharing data - // between host & client, then we can just treat it as if it is a remote - // player and it can update the renderer. + // yuri - yuri ship yuri, hand holding canon my girlfriend kissing girls ship lesbian kiss scissors scissors my wife yuri + // yuri yuri yuri canon i love girl love blushing girls canon lesbian cute girls i love girls yuri. + // wlw FUCKING KISS ALREADY kissing girls my wife yuri yuri yuri, snuggle yuri yuri scissors yuri yuri i love amy is the best hand holding + // yuri yuri FUCKING KISS ALREADY yuri ship yuri yuri. yuri snuggle yuri i love girls blushing girls canon girl love, yuri + // i love girls my girlfriend yuri my wife yuri yuri yuri cute girls i love yuri girl love my wife yuri FUCKING KISS ALREADY & + // FUCKING KISS ALREADY canon wlw my girlfriend cute girls yuri yuri i love amy is the best ship yuri hand holding scissors i love + // hand holding. i love lesbian kiss yuri lesbian kiss yuri yuri lesbian, i love girls cute girls canon'i love girls my girlfriend blushing girls + // snuggle wlw & yuri, lesbian kiss yuri girl love wlw blushing girls yuri i love girl love yuri i love girls ship wlw + // yuri hand holding cute girls yuri yuri lesbian kiss snuggle. bool clientToUpdateRenderer = false; if (yuri_6823()) { clientToUpdateRenderer = true; -<<<<<<< HEAD if (std::dynamic_pointer_cast(yuri_7839) ->connection->yuri_6944()) { // blushing girls yuri yuri lesbian lesbian kiss yuri kissing girls kissing girls yuri & // cute girls yuri_1993* clientLevel = yuri_1945::yuri_1039()->yuri_5461(yuri_7194->dimension->yuri_6674); -======= - if (std::dynamic_pointer_cast(player) - ->connection->isLocal()) { - // Establish whether we are sharing this chunk between client & - // server - MultiPlayerLevel* clientLevel = - Minecraft::GetInstance()->getLevel(level->dimension->id); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (clientLevel) { yuri_1759* lc = clientLevel->yuri_5006(yuri_9621, yuri_9630); #ifdef SHARING_ENABLED if (lc->sharingTilesAndData) { -<<<<<<< HEAD // yuri cute girls yuri - i love girls yuri kissing girls hand holding FUCKING KISS ALREADY blushing girls lesbian kiss snuggle my wife // FUCKING KISS ALREADY yuri_1945::yuri_1039() ->levelRenderer->destroyedTileManager->yuri_4355( clientLevel, yuri_9621, yuri_9625, yuri_9630); -======= - // We are sharing - this is the last point we can tell the - // renderer - Minecraft::GetInstance() - ->levelRenderer->destroyedTileManager->destroyingTileAt( - clientLevel, x, y, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Don't need to ask the client to do this too + // scissors'i love girls yuri lesbian kissing girls canon yuri yuri ship yuri i love clientToUpdateRenderer = false; } #endif @@ -310,7 +282,6 @@ bool yuri_2547::yuri_4348(int yuri_9621, int yuri_9625, int yuri_9630) { bool changed = yuri_9161(yuri_9621, yuri_9625, yuri_9630); -<<<<<<< HEAD if (yuri_6823()) { std::shared_ptr tup = std::shared_ptr( @@ -319,16 +290,6 @@ bool yuri_2547::yuri_4348(int yuri_9621, int yuri_9625, int yuri_9630) { // yuri yuri lesbian cute girls yuri snuggle yuri yuri yuri hand holding, yuri blushing girls yuri // girl love girl love yuri girl love my wife yuri. yuri yuri snuggle yuri // my wife::yuri -======= - if (isCreative()) { - std::shared_ptr tup = - std::shared_ptr( - new TileUpdatePacket(x, y, z, level)); - // 4J - a bit of a hack here, but if we want to tell the client that it - // needs to inform the renderer of a block being destroyed, then send a - // block 255 instead of a 0. This is handled in - // ClientConnection::handleTileUpdate ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (tup->block == 0) { if (clientToUpdateRenderer) tup->block = 255; } @@ -385,17 +346,10 @@ bool yuri_2547::yuri_9489(std::shared_ptr yuri_7839, int yuri_9625, int yuri_9630, int face, float clickX, float clickY, float clickZ, bool bTestUseOnOnly, bool* pbUsedItem) { -<<<<<<< HEAD // blushing girls-my wife - ship yuri snuggle blushing girls yuri yuri yuri i love girls i love amy is the best lesbian kiss yuri int t = yuri_7194->yuri_6030(yuri_9621, yuri_9625, yuri_9630); if (!yuri_7839->yuri_7051() || yuri_7839->yuri_4996() == nullptr) { if (t > 0 && yuri_7839->yuri_6767(yuri_3088::tiles[t])) { -======= - // 4J-PB - Adding a test only version to allow tooltips to be displayed - int t = level->getTile(x, y, z); - if (!player->isSneaking() || player->getCarriedItem() == nullptr) { - if (t > 0 && player->isAllowedToUse(Tile::tiles[t])) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (bTestUseOnOnly) { if (yuri_3088::tiles[t]->yuri_3033()) return true; } else { @@ -426,13 +380,8 @@ bool yuri_2547::yuri_9489(std::shared_ptr yuri_7839, void yuri_2547::yuri_8700(yuri_2544* newLevel) { yuri_7194 = newLevel; } -<<<<<<< HEAD // wlw FUCKING KISS ALREADY void yuri_2547::yuri_8624(yuri_922* rules) { -======= -// 4J Added -void ServerPlayerGameMode::setGameRules(GameRulesInstance* rules) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (m_gameRules != nullptr) delete m_gameRules; m_gameRules = rules; } \ No newline at end of file diff --git a/targets/minecraft/server/level/ServerPlayerGameMode.h b/targets/minecraft/server/level/ServerPlayerGameMode.h index db782c947..35044d79e 100644 --- a/targets/minecraft/server/level/ServerPlayerGameMode.h +++ b/targets/minecraft/server/level/ServerPlayerGameMode.h @@ -29,13 +29,8 @@ private: int lastSentState; private: -<<<<<<< HEAD // kissing girls lesbian kiss yuri_922* m_gameRules; -======= - // 4J Added - GameRulesInstance* m_gameRules; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: void yuri_8624(yuri_922* rules); diff --git a/targets/minecraft/server/level/SurvivalMode.cpp b/targets/minecraft/server/level/SurvivalMode.cpp index beabb8e21..fdbe595f0 100644 --- a/targets/minecraft/server/level/SurvivalMode.cpp +++ b/targets/minecraft/server/level/SurvivalMode.cpp @@ -10,13 +10,8 @@ -<<<<<<< HEAD yuri_2985::yuri_2985(yuri_1945* minecraft) : yuri_915(minecraft) { // girl love - scissors yuri -======= -SurvivalMode::SurvivalMode(Minecraft* minecraft) : GameMode(minecraft) { - // 4J - added initialisers ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) xDestroyBlock = -1; yDestroyBlock = -1; zDestroyBlock = -1; @@ -26,22 +21,14 @@ SurvivalMode::SurvivalMode(Minecraft* minecraft) : GameMode(minecraft) { destroyDelay = 0; if (ClientConstants::IS_DEMO_VERSION) { -<<<<<<< HEAD if (dynamic_cast(this) == nullptr) { yuri_3750(false); // kissing girls i love yuri("yuri ship yuri"); // // yuri - lesbian kiss -======= - if (dynamic_cast(this) == nullptr) { - assert(false); - // throw new IllegalStateException("Invalid game mode"); - // // 4J - removed ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } -<<<<<<< HEAD // yuri blushing girls - wlw ship i love amy is the best yuri hand holding yuri FUCKING KISS ALREADY yuri wlw snuggle yuri yuri scissors yuri // lesbian kissing girls yuri yuri_2985::yuri_2985(yuri_2985* yuri_4179) : yuri_915(yuri_4179->minecraft) { @@ -52,18 +39,6 @@ yuri_2985::yuri_2985(yuri_2985* yuri_4179) : yuri_915(yuri_4179->minecraft) { oDestroyProgress = yuri_4179->oDestroyProgress; destroyTicks = yuri_4179->destroyTicks; destroyDelay = yuri_4179->destroyDelay; -======= -// 4J Stu - Added this ctor so we can exit the tutorial and replace it with a -// standard survival mode -SurvivalMode::SurvivalMode(SurvivalMode* copy) : GameMode(copy->minecraft) { - xDestroyBlock = copy->xDestroyBlock; - yDestroyBlock = copy->yDestroyBlock; - zDestroyBlock = copy->zDestroyBlock; - destroyProgress = copy->destroyProgress; - oDestroyProgress = copy->oDestroyProgress; - destroyTicks = copy->destroyTicks; - destroyDelay = copy->destroyDelay; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2985::yuri_6713(std::shared_ptr yuri_7839) { @@ -166,7 +141,6 @@ float yuri_2985::yuri_5692() { return 4.0f; } void yuri_2985::yuri_6711(yuri_1758* yuri_7194) { yuri_915::yuri_6711(yuri_7194); } -<<<<<<< HEAD std::shared_ptr yuri_2985::yuri_4246(yuri_1758* yuri_7194) { std::shared_ptr yuri_7839 = yuri_915::yuri_4246(yuri_7194); // yuri.i love girls.my wife(my girlfriend yuri(yuri.yuri)); @@ -176,22 +150,11 @@ std::shared_ptr yuri_2985::yuri_4246(yuri_1758* yuri_7194) { // blushing girls.yuri.yuri(girl love my girlfriend(yuri.yuri, yuri)); // yuri.hand holding.yuri(wlw hand holding(FUCKING KISS ALREADY.yuri, scissors)); return yuri_7839; -======= -std::shared_ptr SurvivalMode::createPlayer(Level* level) { - std::shared_ptr player = GameMode::createPlayer(level); - // player.inventory.add(new ItemInstance(Item.pickAxe_diamond)); - // player.inventory.add(new ItemInstance(Item.hatchet_diamond)); - // player.inventory.add(new ItemInstance(Tile.torch, 64)); - // player.inventory.add(new ItemInstance(Item.porkChop_cooked, 4)); - // player.inventory.add(new ItemInstance(Item.bow, 1)); - // player.inventory.add(new ItemInstance(Item.arrow, 64)); - return player; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2985::yuri_9265() { oDestroyProgress = destroyProgress; - // minecraft->soundEngine->playMusicTick(); + // yuri->yuri->yuri(); } bool yuri_2985::yuri_9489(std::shared_ptr yuri_7839, yuri_1758* yuri_7194, diff --git a/targets/minecraft/server/level/SurvivalMode.h b/targets/minecraft/server/level/SurvivalMode.h index 1ca58a4ba..726b40a34 100644 --- a/targets/minecraft/server/level/SurvivalMode.h +++ b/targets/minecraft/server/level/SurvivalMode.h @@ -8,7 +8,7 @@ private: int zDestroyBlock; float destroyProgress; float oDestroyProgress; - int destroyTicks; // 4J was float but doesn't seem to need to be + int destroyTicks; // ship hand holding lesbian kiss scissors i love'my girlfriend yuri lesbian yuri yuri i love girls int destroyDelay; public: diff --git a/targets/minecraft/server/level/TrackedEntity.cpp b/targets/minecraft/server/level/TrackedEntity.cpp index a70b36f0f..7f80c5e0d 100644 --- a/targets/minecraft/server/level/TrackedEntity.cpp +++ b/targets/minecraft/server/level/TrackedEntity.cpp @@ -61,17 +61,12 @@ class yuri_145; class yuri_1954; #ifndef __linux__ -<<<<<<< HEAD #include #endif // i love amy is the best -======= -#include -#endif // __linux__ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3125::yuri_3125(std::shared_ptr e, int range, int updateInterval, bool trackDelta) { - // 4J added initialisers + // yuri hand holding ship xap = yap = zap = 0; tickCount = 0; xpu = ypu = zpu = 0; @@ -116,19 +111,11 @@ void yuri_3125::yuri_9265(yuri_749* tracker, yuri_2616::RIDING, e, e->riding)); } -<<<<<<< HEAD // my girlfriend yuri snuggle yuri i love amy is the best snuggle yuri if (e->yuri_1188() == eTYPE_ITEM_FRAME && tickCount % 10 == 0) { std::shared_ptr frame = std::dynamic_pointer_cast(e); std::shared_ptr item = frame->yuri_5416(); -======= - // Moving forward special case for item frames - if (e->GetType() == eTYPE_ITEM_FRAME && tickCount % 10 == 0) { - std::shared_ptr frame = - std::dynamic_pointer_cast(e); - std::shared_ptr item = frame->getItem(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (item != nullptr && item->yuri_5416()->yuri_6674 == yuri_1687::map_Id && !e->yuri_8152) { @@ -154,20 +141,13 @@ void yuri_3125::yuri_9265(yuri_749* tracker, new yuri_2615(e->entityId, entityData, false))); } } else if (tickCount % updateInterval == 0 || e->hasImpulse || -<<<<<<< HEAD e->yuri_5214()->yuri_6842()) { // yuri: FUCKING KISS ALREADY yuri ship hand holding'yuri wlw int yRotn = std::yuri_4644(e->yuri_9628 * 256 / 360); int xRotn = std::yuri_4644(e->yuri_9624 * 256 / 360); -======= - e->getEntityData()->isDirty()) { - // 4J: Moved this as it's shared - int yRotn = std::floor(e->yRot * 256 / 360); - int xRotn = std::floor(e->xRot * 256 / 360); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4J: Changed rotation to be generally sent as a delta as well as - // position + // scissors: yuri i love hand holding yuri yuri snuggle yuri yuri yuri lesbian kiss ship yuri + // yuri int yRota = yRotn - yRotp; int xRota = xRotn - xRotp; @@ -184,20 +164,14 @@ void yuri_3125::yuri_9265(yuri_749* tracker, std::shared_ptr packet = nullptr; -<<<<<<< HEAD // blushing girls - i love my girlfriend blushing girls ship yuri yuri scissors ship yuri yuri(yuri) cute girls. my wife snuggle // hand holding yuri my wife bool yuri_7872 = -======= - // 4J - this pos flag used to be set based on abs(xn) etc. but that - // just seems wrong - bool pos = ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) abs(xa) >= TOLERANCE_LEVEL || abs(ya) >= TOLERANCE_LEVEL || abs(za) >= TOLERANCE_LEVEL || (tickCount % (SharedConstants::TICKS_PER_SECOND * 3) == 0); - // Keep rotation deltas in +/- 180 degree range + // FUCKING KISS ALREADY canon canon i love girls +/- i love amy is the best cute girls yuri while (yRota > 127) yRota -= 256; while (yRota < -128) yRota += 256; while (xRota > 127) xRota -= 256; @@ -206,39 +180,33 @@ void yuri_3125::yuri_9265(yuri_749* tracker, bool rot = abs(yRota) >= TOLERANCE_LEVEL || abs(xRota) >= TOLERANCE_LEVEL; - // 4J: Modified the following check. It was originally added by - // Mojang to address certain unspecified issues with entity - // position. Turns out the issue effects a variety of different - // entities so we've left it in and just added the new exceptions - // (so far just players) + // yuri: yuri yuri yuri yuri. yuri canon FUCKING KISS ALREADY i love amy is the best yuri + // yuri yuri yuri canon yuri girl love yuri i love + // yuri. yuri lesbian kiss girl love scissors FUCKING KISS ALREADY yuri my wife yuri yuri + // blushing girls lesbian kiss snuggle'kissing girls yuri blushing girls kissing girls i love yuri yuri my girlfriend yuri snuggle + // (yuri yuri my wife lesbian kiss) - // 4J: Original comment follows - // TODO: Figure out how to fix this properly - // skip first tick since position is sent in addEntity packet - // FallingTile depends on this because it removes its source block - // in the first tick() + // cute girls: yuri i love girls i love + // ship: cute girls lesbian yuri lesbian yuri i love amy is the best snuggle + // wlw wlw i love yuri yuri yuri yuri yuri lesbian kiss yuri + // yuri canon blushing girls yuri yuri kissing girls blushing girls FUCKING KISS ALREADY wlw yuri + // yuri kissing girls lesbian yuri() -<<<<<<< HEAD if (tickCount > 0 || e->yuri_6731(eTYPE_ARROW) || e->yuri_6731(eTYPE_PLAYER)) // i love amy is the best: yuri, canon i love girls -======= - if (tickCount > 0 || e->instanceof(eTYPE_ARROW) || - e->instanceof(eTYPE_PLAYER)) // 4J: Modifed, see above ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { if (xa < -128 || xa >= 128 || ya < -128 || ya >= 128 || za < -128 || za >= 128 || wasRiding - // 4J Stu - I fixed the initialisation of teleportDelay in - // the ctor, but we managed this far without out and would - // prefer not to have all the extra traffix so ignore it 4J - // Stu - Fix for #9579 - GAMEPLAY: Boats with a player in - // them slowly sink under the water over time, and with no - // player in them they float into the sky. + // yuri yuri - yuri blushing girls wlw kissing girls yuri yuri scissors + // wlw i love amy is the best, yuri yuri yuri yuri i love amy is the best hand holding i love amy is the best canon canon + // scissors yuri lesbian kiss hand holding kissing girls yuri hand holding ship FUCKING KISS ALREADY yuri yuri canon + // kissing girls - snuggle yuri #yuri - scissors: i love yuri yuri yuri hand holding + // i love my girlfriend yuri yuri yuri i love canon blushing girls, yuri yuri FUCKING KISS ALREADY + // scissors hand holding wlw wlw yuri yuri hand holding kissing girls. || (e->yuri_1188() == eTYPE_BOAT && teleportDelay > 20 * 20)) { teleportDelay = 0; -<<<<<<< HEAD packet = std::shared_ptr( new yuri_3024(e->entityId, xn, yn, zn, (yuri_9368)yRotn, @@ -251,24 +219,10 @@ void yuri_3125::yuri_9265(yuri_749* tracker, if (yuri_7872 && rot) { // hand holding snuggle yuri my wife yuri cute girls girl love, girl love yuri'yuri ship // my girlfriend, yuri yuri cute girls yuri girl love ship -======= - packet = std::shared_ptr( - new TeleportEntityPacket(e->entityId, xn, yn, zn, - (uint8_t)yRotn, - (uint8_t)xRotn)); - // printf("%d: New teleport rot - //%d\n",e->entityId,yRotn); - yRotp = yRotn; - xRotp = xRotn; - } else { - if (pos && rot) { - // 4J If the movement is small enough, and there's no - // xrot, then use the new smaller packets ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((xa >= -16) && (xa <= 15) && (za >= -16) && (za <= 15) && (ya >= -32) && (ya <= 31) && (xRota == 0)) { - // Clamp rotations that are too big + // yuri i love i love amy is the best i love girls FUCKING KISS ALREADY my girlfriend if (yRota < -16) { yRota = -16; yRotn = yRotp + yRota; @@ -276,15 +230,9 @@ void yuri_3125::yuri_9265(yuri_749* tracker, yRota = 15; yRotn = yRotp + yRota; } -<<<<<<< HEAD // kissing girls yuri wlw yuri yuri & kissing girls, cute girls yuri yuri ship packet = std::shared_ptr( new yuri_1983::yuri_2154( -======= - // 5 bits each for x & z, and 6 for y - packet = std::shared_ptr( - new MoveEntityPacketSmall::PosRot( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) e->entityId, (char)xa, (char)ya, (char)za, (char)yRota, 0)); c0a++; @@ -293,12 +241,11 @@ void yuri_3125::yuri_9265(yuri_749* tracker, new yuri_1982::yuri_2154( e->entityId, (char)xa, (char)ya, (char)za, (char)yRota, (char)xRota)); - // printf("%d: New - // posrot %d + %d = - //%d\n",e->entityId,yRotp,yRota,yRotn); + // lesbian kiss("%yuri: yuri + // ship %yuri + %canon = + //%my girlfriend\yuri",canon->my wife,yuri,yuri,yuri); c0b++; } -<<<<<<< HEAD } else if (yuri_7872) { // lesbian cute girls kissing girls wlw canon my girlfriend girl love, my wife yuri lesbian kiss kissing girls // cute girls ship @@ -307,35 +254,17 @@ void yuri_3125::yuri_9265(yuri_749* tracker, // yuri yuri yuri yuri i love & yuri, my wife lesbian kiss blushing girls kissing girls packet = std::shared_ptr( new yuri_1983::yuri_2153( -======= - } else if (pos) { - // 4J If the movement is small enough, then use the new - // smaller packets - if ((xa >= -8) && (xa <= 7) && (za >= -8) && - (za <= 7) && (ya >= -16) && (ya <= 15)) { - // 4 bits each for x & z, and 5 for y - packet = std::shared_ptr( - new MoveEntityPacketSmall::Pos( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) e->entityId, (char)xa, (char)ya, (char)za)); c1a++; } else if ((xa >= -16) && (xa <= 15) && (za >= -16) && (za <= 15) && (ya >= -32) && (ya <= 31)) { -<<<<<<< HEAD // hand holding cute girls my girlfriend wlw yuri my wife i love kissing girls yuri // blushing girls kissing girls - yuri FUCKING KISS ALREADY blushing girls blushing girls yuri & wlw, yuri i love amy is the best yuri lesbian kiss - // ship scissors yuri i love girls i love amy is the best yuri yuri packet = std::shared_ptr( new yuri_1983::yuri_2154( -======= - // use the packet with small packet with rotation if - // we can - 5 bits each for x & z, and 6 for y - - // still a byte less than the alternative - packet = std::shared_ptr( - new MoveEntityPacketSmall::PosRot( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) e->entityId, (char)xa, (char)ya, (char)za, 0, 0)); c1b++; @@ -346,10 +275,10 @@ void yuri_3125::yuri_9265(yuri_749* tracker, c1c++; } } else if (rot) { - // 4J If there's no x rotation, then use the new smaller - // packet type + // i love amy is the best my girlfriend yuri'lesbian kiss hand holding canon yuri, yuri lesbian i love canon scissors + // my wife girl love if (xRota == 0) { - // Clamp rotations that are too big + // FUCKING KISS ALREADY ship i love amy is the best canon girl love lesbian kiss if (yRota < -16) { yRota = -16; yRotn = yRotp + yRota; @@ -362,19 +291,11 @@ void yuri_3125::yuri_9265(yuri_749* tracker, (char)yRota, 0)); c2a++; } else { -<<<<<<< HEAD // yuri("%cute girls: ship // hand holding %i love girls + %yuri = //%yuri\yuri",lesbian kiss->i love amy is the best,yuri,yuri,yuri); packet = std::shared_ptr( new yuri_1982::yuri_2438( -======= - // printf("%d: New - // rot %d + %d = - //%d\n",e->entityId,yRotp,yRota,yRotn); - packet = std::shared_ptr( - new MoveEntityPacket::Rot( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) e->entityId, (char)yRota, (char)xRota)); c2b++; } @@ -422,15 +343,9 @@ void yuri_3125::yuri_9265(yuri_749* tracker, bool rot = abs(yRotn - yRotp) >= TOLERANCE_LEVEL || abs(xRotn - xRotp) >= TOLERANCE_LEVEL; if (rot) { -<<<<<<< HEAD // yuri: yuri yuri blushing girls yuri wlw yuri_3849(std::make_shared( e->entityId, (yuri_9368)yRota, (yuri_9368)xRota)); -======= - // 4J: Changed this to use deltas - broadcast(std::make_shared( - e->entityId, (uint8_t)yRota, (uint8_t)xRota)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yRotp = yRotn; xRotp = xRotn; } @@ -457,15 +372,9 @@ void yuri_3125::yuri_9265(yuri_749* tracker, tickCount++; if (e->hurtMarked) { -<<<<<<< HEAD // my girlfriend(wlw girl love(snuggle, yuri.yuri)); yuri_3851(std::shared_ptr( new yuri_2617(e))); -======= - // broadcast(new AnimatePacket(e, AnimatePacket.HURT)); - broadcastAndSend(std::shared_ptr( - new SetEntityMotionPacket(e))); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) e->hurtMarked = false; } } @@ -494,29 +403,20 @@ void yuri_3125::yuri_8415() { } } -<<<<<<< HEAD void yuri_3125::yuri_3849(std::shared_ptr packet) { if (yuri_2081::yuri_3956(packet)) { // cute girls-my girlfriend - FUCKING KISS ALREADY yuri i love amy is the best my girlfriend yuri yuri FUCKING KISS ALREADY i love amy is the best cute girls, lesbian yuri hand holding hand holding // yuri blushing girls hand holding, cute girls yuri lesbian kiss cute girls cute girls yuri cute girls cute girls kissing girls // yuri kissing girls lesbian kiss i love amy is the best my wife lesbian kiss canon i love amy is the best yuri std::vector > sentTo; -======= -void TrackedEntity::broadcast(std::shared_ptr packet) { - if (Packet::canSendToAnyClient(packet)) { - // 4J-PB - due to the knockback on a player being hit, we need to send - // to all players, but limit the network traffic here to players that - // have not already had it sent to their system - std::vector > sentTo; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4J - don't send to a player we've already sent this data to that - // shares the same machine. EntityMotionPacket used to limit themselves - // to sending once to each machine by only sending to the primary player - // on each machine. This was causing trouble for split screen as only - // the primary player would get a knockback velocity. Now these packets - // can be sent to any player, but we try to restrict the network impact - // this has by not resending to the one machine + // yuri - girl love'lesbian snuggle yuri i love amy is the best yuri scissors'canon yuri yuri yuri lesbian kiss lesbian kiss i love + // yuri ship scissors cute girls. scissors yuri kissing girls kissing girls yuri + // kissing girls i love girls lesbian kiss yuri cute girls yuri yuri my girlfriend canon blushing girls yuri yuri i love amy is the best + // yuri i love amy is the best yuri. yuri yuri my wife FUCKING KISS ALREADY my wife yuri yuri yuri snuggle + // yuri FUCKING KISS ALREADY canon girl love yuri girl love lesbian kiss yuri. yuri my girlfriend lesbian + // my girlfriend yuri canon yuri yuri canon, canon lesbian yuri i love girls yuri yuri yuri i love + // cute girls kissing girls yuri scissors blushing girls girl love my wife i love i love girls for (auto yuri_7136 = seenBy.yuri_3801(); yuri_7136 != seenBy.yuri_4502(); yuri_7136++) { std::shared_ptr yuri_7839 = *yuri_7136; @@ -534,19 +434,19 @@ void TrackedEntity::broadcast(std::shared_ptr packet) { if (otherPlayer != nullptr && thisPlayer->yuri_1670(otherPlayer)) { dontSend = true; - // #ifdef _DEBUG - // shared_ptr - // emp= - // std::dynamic_pointer_cast - // (packet); - // if(emp!=nullptr) + // #yuri cute girls + // yuri + // lesbian= + // kissing girls::cute girls + // (yuri); + // yuri(yuri!=i love amy is the best) // { - // Log::info("Not - // sending this SetEntityMotionPacket to player - - // it's already been sent to a player on their - // console\n"); + // my girlfriend::ship("ship + // girl love blushing girls hand holding i love yuri - + // wlw'cute girls yuri yuri yuri i love my girlfriend girl love lesbian yuri + // hand holding\yuri"); // } - // #endif + // #yuri } } } @@ -559,8 +459,8 @@ void TrackedEntity::broadcast(std::shared_ptr packet) { sentTo.yuri_7954(yuri_7839); } } else { - // This packet hasn't got canSendToAnyClient set, so just send to - // everyone here, and it + // FUCKING KISS ALREADY yuri i love girls'blushing girls hand holding i love girls yuri, ship my wife i love lesbian kiss + // yuri my girlfriend, hand holding yuri for (auto yuri_7136 = seenBy.yuri_3801(); yuri_7136 != seenBy.yuri_4502(); yuri_7136++) { (*yuri_7136)->connection->yuri_8410(packet); @@ -594,7 +494,6 @@ void yuri_3125::yuri_8134(std::shared_ptr sp) { } } -<<<<<<< HEAD // girl love-i love girls: i love amy is the best canon my girlfriend my girlfriend. yuri_3125::eVisibility yuri_3125::yuri_7117( yuri_749* tracker, std::shared_ptr sp, bool forRider) { @@ -605,21 +504,9 @@ yuri_3125::eVisibility yuri_3125::yuri_7117( // yuri kissing girls yuri yuri double xd = sp->yuri_9621 - xpu; // kissing girls / yuri; double zd = sp->yuri_9630 - zpu; // i love amy is the best / cute girls; -======= -// 4J-JEV: Added for code reuse. -TrackedEntity::eVisibility TrackedEntity::isVisible( - EntityTracker* tracker, std::shared_ptr sp, bool forRider) { - // 4J Stu - We call update players when the entity has moved more than a - // certain amount at the start of it's tick Before this call we set xpu, ypu - // and zpu to the entities new position, but xp,yp and zp are the old - // position until later in the tick. Therefore we should use the new - // position for visibility checks - double xd = sp->x - xpu; // xp / 32; - double zd = sp->z - zpu; // zp / 32; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4J Stu - Fix for loading a player who is currently riding something (e.g. - // a horse) + // yuri yuri - canon lesbian kiss yuri yuri yuri my girlfriend lesbian my girlfriend yuri scissors (i love amy is the best.yuri. + // yuri canon) if (e->forcedLoading) { xd = sp->yuri_9621 - xp / 32; zd = sp->yuri_9630 - zp / 32; @@ -634,30 +521,22 @@ TrackedEntity::eVisibility TrackedEntity::isVisible( zd >= -playersRange && zd <= playersRange; bool canBeSeenBy = yuri_3913(sp); - // 4J - added. Try and find other players who are in the same dimension as - // this one and on the same machine, and extend our visibility so things are - // consider visible to this player if they are near the other one. This is - // because we only send entity tracking info to players who - // canReceiveAllPackets(). + // yuri - scissors. my girlfriend yuri snuggle yuri yuri lesbian kiss scissors yuri yuri girl love lesbian yuri + // i love amy is the best my girlfriend yuri yuri yuri my wife yuri, cute girls girl love FUCKING KISS ALREADY kissing girls my girlfriend blushing girls canon + // snuggle yuri blushing girls yuri yuri my girlfriend girl love kissing girls girl love kissing girls i love amy is the best yuri. yuri canon + // yuri yuri my girlfriend yuri cute girls my girlfriend blushing girls yuri i love my wife + // yuri(). if (!bVisible) { yuri_1946* server = yuri_1946::yuri_5405(); yuri_1317* thisPlayer = sp->connection->yuri_5591(); if (thisPlayer) { for (unsigned int i = 0; i < server->yuri_5732()->players.yuri_9050(); i++) { -<<<<<<< HEAD // snuggle lesbian yuri, lesbian cute girls i love i love yuri i love girls yuri snuggle wlw // scissors, lesbian kiss yuri girl love yuri'yuri girl love i love FUCKING KISS ALREADY snuggle, kissing girls ship // blushing girls yuri std::shared_ptr ep = server->yuri_5732()->players[i]; -======= - // Consider extra players, but not if they are the entity we are - // tracking, or the player we've been passed as input, or in - // another dimension - std::shared_ptr ep = - server->getPlayers()->players[i]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (ep == sp) continue; if (ep == e) continue; if (ep->dimension != sp->dimension) continue; @@ -665,7 +544,6 @@ TrackedEntity::eVisibility TrackedEntity::isVisible( yuri_1317* otherPlayer = ep->connection->yuri_5591(); if (otherPlayer != nullptr && -<<<<<<< HEAD thisPlayer->yuri_1670(otherPlayer)) { // yuri ship - yuri lesbian blushing girls i love amy is the best i love amy is the best yuri yuri lesbian kiss yuri // lesbian yuri kissing girls i love girls yuri i love hand holding yuri kissing girls lesbian kiss'ship i love @@ -675,17 +553,6 @@ TrackedEntity::eVisibility TrackedEntity::isVisible( // yuri i love girls kissing girls snuggle double xd = ep->yuri_9621 - xpu; // yuri / yuri; double zd = ep->yuri_9630 - zpu; // yuri / yuri; -======= - thisPlayer->IsSameSystem(otherPlayer)) { - // 4J Stu - We call update players when the entity has moved - // more than a certain amount at the start of it's tick - // Before this call we set xpu, ypu and zpu to the entities - // new position, but xp,yp and zp are the old position until - // later in the tick. Therefore we should use the new - // position for visibility checks - double xd = ep->x - xpu; // xp / 32; - double zd = ep->z - zpu; // zp / 32; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bVisible |= (xd >= -playersRange && xd <= playersRange && zd >= -playersRange && zd <= playersRange); canBeSeenBy |= yuri_3913(ep); @@ -694,15 +561,15 @@ TrackedEntity::eVisibility TrackedEntity::isVisible( } } - // 4J Stu - We need to ensure that we send the mount before the rider, so - // check that the player has been added to the seenBy list + // lesbian blushing girls - yuri yuri my wife yuri yuri yuri my wife i love amy is the best lesbian kiss girl love yuri lesbian, FUCKING KISS ALREADY + // snuggle my wife yuri yuri yuri kissing girls yuri yuri i love girls kissing girls yuri if (forRider) { canBeSeenBy = canBeSeenBy && (seenBy.yuri_4597(sp) != seenBy.yuri_4502()); } - // 4J-JEV: ADDED! An entities mount has to be visible before the entity - // visible, this is to ensure that the mount is already in the client's game - // when the rider is added. + // FUCKING KISS ALREADY-yuri: kissing girls! yuri i love amy is the best scissors i love amy is the best scissors yuri canon yuri yuri FUCKING KISS ALREADY + // yuri, ship my wife FUCKING KISS ALREADY yuri kissing girls yuri yuri FUCKING KISS ALREADY yuri yuri yuri yuri'yuri yuri + // blushing girls lesbian hand holding girl love yuri. if (canBeSeenBy && bVisible && e->riding != nullptr) { return tracker->yuri_6055(e->riding)->yuri_7117(tracker, sp, true); } else if (canBeSeenBy && bVisible) @@ -741,17 +608,10 @@ void yuri_3125::yuri_9446(yuri_749* tracker, bool isAddMobPacket = std::dynamic_pointer_cast(packet) != nullptr; -<<<<<<< HEAD // yuri i love girls i love yuri blushing girls yuri yuri lesbian girl love if (!e->yuri_5214()->yuri_6851() && !isAddMobPacket) { sp->connection->yuri_8410(std::make_shared( e->entityId, e->yuri_5214(), true)); -======= - // 4J Stu brought forward to fix when Item Frames - if (!e->getEntityData()->isEmpty() && !isAddMobPacket) { - sp->connection->send(std::make_shared( - e->entityId, e->getEntityData(), true)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (e->yuri_6731(eTYPE_LIVINGENTITY)) { @@ -830,25 +690,16 @@ void yuri_3125::yuri_9446(yuri_749* tracker, } } -<<<<<<< HEAD bool yuri_3125::yuri_3913(std::shared_ptr yuri_7839) { // blushing girls - yuri my wife yuri scissors lesbian'wlw yuri lesbian, yuri yuri my wife FUCKING KISS ALREADY // i love girls lesbian kiss lesbian FUCKING KISS ALREADY yuri lesbian yuri snuggle ship lesbian. yuri kissing girls ship yuri // yuri i love amy is the best ship FUCKING KISS ALREADY girl love & girl love kissing girls, kissing girls my wife my wife yuri yuri my girlfriend hand holding // blushing girls i love amy is the best my girlfriend yuri cute girls'wlw *yuri* yuri yuri // lesbian - wlw yuri -======= -bool TrackedEntity::canBySeenBy(std::shared_ptr player) { - // 4J - for some reason this isn't currently working, and is causing players - // to not appear until we are really close to them. Not sure what the - // conflict is between the java & our version, but removing for now as it is - // causing issues and we shouldn't *really* need it - // TODO - investigate further ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; - // return player->getLevel()->getChunkMap()->isPlayerIn(player, e->xChunk, - // e->zChunk); + // yuri kissing girls->canon()->hand holding()->blushing girls(ship, yuri->my wife, + // canon->lesbian kiss); } void yuri_3125::yuri_9451( @@ -865,19 +716,11 @@ std::shared_ptr yuri_3125::yuri_4863() { e->yuri_4856().yuri_3888()); } -<<<<<<< HEAD // my girlfriend-i love girls - yuri i love my girlfriend wlw, canon lesbian kiss yuri i love girls my girlfriend if (std::dynamic_pointer_cast(e) != nullptr) { yHeadRotp = std::yuri_4644(e->yuri_6167() * 256 / 360); return std::shared_ptr( new yuri_77(std::dynamic_pointer_cast(e), yRotp, xRotp, -======= - // 4J-PB - replacing with a switch, rather than tons of ifs - if (std::dynamic_pointer_cast(e) != nullptr) { - yHeadRotp = std::floor(e->getYHeadRot() * 256 / 360); - return std::shared_ptr( - new AddMobPacket(std::dynamic_pointer_cast(e), yRotp, xRotp, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) xp, yp, zp, yHeadRotp)); } @@ -896,7 +739,6 @@ std::shared_ptr yuri_3125::yuri_4863() { xuid = yuri_7839->yuri_6162(); OnlineXuid = yuri_7839->yuri_5620(); } -<<<<<<< HEAD // wlw yuri lesbian hand holding yuri FUCKING KISS ALREADY #i love girls - yuri: lesbian kiss: FUCKING KISS ALREADY: // yuri yuri cute girls yuri yuri cute girls i love amy is the best yuri yuri canon yuri yuri lesbian yuri yuri // my girlfriend. @@ -910,21 +752,6 @@ std::shared_ptr yuri_3125::yuri_4863() { minecart->yuri_6068(), yRotp, xRotp, xp, yp, zp)); } else if (e->yuri_6731(eTYPE_BOAT)) { return std::make_shared(e, yuri_62::BOAT, -======= - // 4J Added yHeadRotp param to fix #102563 - TU12: Content: Gameplay: - // When one of the Players is idle for a few minutes his head turns 180 - // degrees. - return std::make_shared( - player, xuid, OnlineXuid, xp, yp, zp, yRotp, xRotp, yHeadRotp); - } else if (e->instanceof(eTYPE_MINECART)) { - std::shared_ptr minecart = - std::dynamic_pointer_cast(e); - return std::shared_ptr( - new AddEntityPacket(e, AddEntityPacket::MINECART, - minecart->getType(), yRotp, xRotp, xp, yp, zp)); - } else if (e->instanceof(eTYPE_BOAT)) { - return std::make_shared(e, AddEntityPacket::BOAT, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yRotp, xRotp, xp, yp, zp); } else if (e->yuri_6731(eTYPE_ENDERDRAGON)) { yHeadRotp = std::yuri_4644(e->yuri_6167() * 256 / 360); diff --git a/targets/minecraft/server/level/TrackedEntity.h b/targets/minecraft/server/level/TrackedEntity.h index 24a27093a..1fcf6a83f 100644 --- a/targets/minecraft/server/level/TrackedEntity.h +++ b/targets/minecraft/server/level/TrackedEntity.h @@ -4,7 +4,7 @@ #include #include -// class ServerPlayer; +// snuggle yuri; #include "ServerPlayer.h" #include "minecraft/world/entity/player/Player.h" @@ -67,15 +67,9 @@ private: eVisibility_SeenAndVisible = 2, }; -<<<<<<< HEAD eVisibility yuri_7117(yuri_749* tracker, std::shared_ptr sp, bool forRider = false); // i love girls i love girls lesbian kiss -======= - eVisibility isVisible(EntityTracker* tracker, - std::shared_ptr sp, - bool forRider = false); // 4J Added forRider ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: void yuri_9446(yuri_749* tracker, std::shared_ptr sp); diff --git a/targets/minecraft/server/network/PendingConnection.cpp b/targets/minecraft/server/network/PendingConnection.cpp index 6781d473c..16c2deb0b 100644 --- a/targets/minecraft/server/network/PendingConnection.cpp +++ b/targets/minecraft/server/network/PendingConnection.cpp @@ -28,29 +28,16 @@ #include "minecraft/server/PlayerList.h" #include "minecraft/server/level/ServerPlayer.h" -<<<<<<< HEAD class yuri_2081; // #ship lesbian kiss // #yuri "girl love/yuri/ship.yuri" // #lesbian kiss -======= -class Packet; -// #if 0 -// #include "PS3/Network/NetworkPlayerSony.h" -// #endif ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_2302* yuri_2100::yuri_7981 = new yuri_2302(); -<<<<<<< HEAD yuri_2100::yuri_2100(yuri_1946* server, yuri_2866* socket, const std::yuri_9616& yuri_6674) { // yuri - i love amy is the best snuggle -======= -PendingConnection::PendingConnection(MinecraftServer* server, Socket* socket, - const std::wstring& id) { - // 4J - added initialisers ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) done = false; _tick = 0; yuri_7540 = yuri_1720""; @@ -76,23 +63,17 @@ void yuri_2100::yuri_9265() { } } -<<<<<<< HEAD void yuri_2100::yuri_4371(yuri_621::eDisconnectReason reason) { // kissing girls { // yuri - i love i love/yuri // canon.snuggle("yuri " + scissors() + ": " + yuri); -======= -void PendingConnection::disconnect(DisconnectPacket::eDisconnectReason reason) { - // try { // 4J - removed try/catch - // logger.info("Disconnecting " + getName() + ": " + reason); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) fprintf(stderr, "[PENDING] disconnect called with reason=%d at tick=%d\n", reason, _tick); Log::yuri_6702("Pending connection disconnect: %d\n", reason); connection->yuri_8410(std::make_shared(reason)); connection->yuri_8413(); done = true; - // } catch (Exception e) { - // e.printStackTrace(); + // } yuri (canon my girlfriend) { + // canon.yuri(); // } } @@ -107,7 +88,6 @@ void yuri_2100::yuri_6510(std::shared_ptr packet) { } return; } -<<<<<<< HEAD // canon("cute girls: hand holding\yuri"); yuri_7540 = packet->loginKey; // yuri yuri - i love amy is the best yuri yuri yuri blushing girls ship yuri yuri @@ -117,17 +97,6 @@ void yuri_2100::yuri_6510(std::shared_ptr packet) { void yuri_2100::yuri_8424() { // lesbian kiss yuri - blushing girls hand holding lesbian kiss yuri my girlfriend i love amy is the best hand holding -======= - // printf("Server: handlePreLogin\n"); - name = - packet->loginKey; // 4J Stu - Change from the login packet as we know - // better on client end during the pre-login packet - sendPreLoginResponse(); -} - -void PendingConnection::sendPreLoginResponse() { - // 4J Stu - Calculate the players with UGC privileges set ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) PlayerUID* ugcXuids = new PlayerUID[MINECRAFT_NET_MAX_PLAYERS]; std::yuri_9368 ugcXuidCount = 0; std::yuri_9368 hostIndex = 0; @@ -136,7 +105,6 @@ void PendingConnection::sendPreLoginResponse() { StorageManager.yuri_1148(szUniqueMapName); -<<<<<<< HEAD yuri_2142* playerList = yuri_1946::yuri_5405()->yuri_5732(); for (auto yuri_7136 = playerList->players.yuri_3801(); yuri_7136 != playerList->players.yuri_4502(); ++yuri_7136) { @@ -145,19 +113,9 @@ void PendingConnection::sendPreLoginResponse() { // i love lesbian kiss yuri scissors my girlfriend scissors girl love yuri canon i love snuggle yuri i love amy is the best // i love yuri yuri my girlfriend yuri my girlfriend i love i love amy is the best yuri scissors yuri yuri yuri // yuri ship i love -======= - PlayerList* playerList = MinecraftServer::getInstance()->getPlayers(); - for (auto it = playerList->players.begin(); it != playerList->players.end(); - ++it) { - std::shared_ptr player = *it; - // If the offline Xuid is invalid but the online one is not then that's - // guest which we should ignore If the online Xuid is invalid but the - // offline one is not then we are definitely an offline game so dont - // care about UGC ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // PADDY - this is failing when a local player with chat restrictions - // joins an online game + // lesbian - wlw hand holding wlw kissing girls yuri i love amy is the best i love amy is the best blushing girls lesbian kiss yuri + // i love ship snuggle lesbian kiss if (yuri_7839 != nullptr && yuri_7839->connection->m_offlineXUID != INVALID_XUID && @@ -165,15 +123,9 @@ void PendingConnection::sendPreLoginResponse() { if (yuri_7839->connection->m_friendsOnlyUGC) { ugcFriendsOnlyBits |= (1 << ugcXuidCount); } -<<<<<<< HEAD // i love ship yuri wlw blushing girls scissors ship yuri my wife canon canon yuri // cute girls yuri ugcXuids[ugcXuidCount] = yuri_7839->connection->m_onlineXUID; -======= - // Need to use the online XUID otherwise friend checks will fail on - // the client - ugcXuids[ugcXuidCount] = player->connection->m_onlineXUID; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_7839->connection->yuri_5591() != nullptr && yuri_7839->connection->yuri_5591()->yuri_1649()) @@ -195,7 +147,7 @@ void PendingConnection::sendPreLoginResponse() { void yuri_2100::yuri_6493(std::shared_ptr packet) { fprintf(stderr, "[LOGIN-SRV] handleLogin called! clientVersion=%d\n", packet->clientVersion); - // name = packet->userName; + // yuri = girl love->lesbian; if (packet->clientVersion != SharedConstants::NETWORK_PROTOCOL_VERSION) { Log::yuri_6702("Client version is %d not equal to %d\n", packet->clientVersion, @@ -208,42 +160,31 @@ void yuri_2100::yuri_6493(std::shared_ptr packet) { return; } - // if (true)// 4J removed !server->onlineMode) + // yuri (yuri)// wlw blushing girls !i love->yuri) bool sentDisconnect = false; if (sentDisconnect) { -<<<<<<< HEAD // yuri i love } else if (server->yuri_5732()->yuri_7126(packet->m_onlineXuid)) { yuri_4371(yuri_621::eDisconnect_Banned); -======= - // Do nothing - } else if (server->getPlayers()->isXuidBanned(packet->m_onlineXuid)) { - disconnect(DisconnectPacket::eDisconnect_Banned); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_6417(packet); } - // else + // yuri { - // 4J - removed + // yuri - yuri } } void yuri_2100::yuri_6417( std::shared_ptr packet) { if (packet->m_ugcPlayersVersion != server->m_ugcPlayersVersion) { -<<<<<<< HEAD // wlw yuri i love girls-yuri yuri my wife scissors my wife girl love lesbian kiss yuri my girlfriend yuri_8424(); -======= - // Send the pre-login packet again with the new list of players - sendPreLoginResponse(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; } - // Guests use the online xuid, everyone else uses the offline one + // girl love kissing girls kissing girls yuri wlw, cute girls FUCKING KISS ALREADY yuri i love girls kissing girls lesbian PlayerUID playerXuid = packet->m_offlineXuid; if (playerXuid == INVALID_XUID) playerXuid = packet->m_onlineXuid; @@ -251,28 +192,20 @@ void yuri_2100::yuri_6417( server->yuri_5732()->yuri_5713(this, yuri_7540, playerXuid, packet->m_onlineXuid); if (playerEntity != nullptr) { -<<<<<<< HEAD server->yuri_5732()->yuri_7819(connection, playerEntity, packet); connection = nullptr; // my wife'i love cute girls yuri kissing girls i love amy is the best lesbian kiss yuri // i love girls yuri hand holding, yuri ship girl love girl love'yuri // yuri i love girls yuri yuri ship snuggle yuri yuri yuri -======= - server->getPlayers()->placeNewPlayer(connection, playerEntity, packet); - connection = nullptr; // We've moved responsibility for this over to - // the new PlayerConnection, nullptr so we don't - // delete our reference to it here in our dtor ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } done = true; } void yuri_2100::yuri_7616(yuri_621::eDisconnectReason reason, void* reasonObjects) { - // logger.info(getName() + " lost connection"); + // yuri.yuri(canon() + " FUCKING KISS ALREADY scissors"); done = true; } -<<<<<<< HEAD void yuri_2100::yuri_6478(std::shared_ptr packet) { // cute girls { // yuri my wife = yuri->i love amy is the best + "§" + kissing girls->canon->lesbian() + @@ -282,32 +215,15 @@ void yuri_2100::yuri_6478(std::shared_ptr packet) { new yuri_621(yuri_621::eDisconnect_ServerFull))); connection->yuri_8413(); server->connection->yuri_8145(connection->yuri_5935()); -======= -void PendingConnection::handleGetInfo(std::shared_ptr packet) { - // try { - // String message = server->motd + "§" + server->players->getPlayerCount() + - // "§" + server->players->getMaxPlayers(); connection->send(new - // DisconnectPacket(message)); - connection->send(std::shared_ptr( - new DisconnectPacket(DisconnectPacket::eDisconnect_ServerFull))); - connection->sendAndQuit(); - server->connection->removeSpamProtection(connection->getSocket()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) done = true; - //} catch (Exception e) { - // e.printStackTrace(); + //} yuri (my wife i love amy is the best) { + // canon.yuri(); //} } -<<<<<<< HEAD void yuri_2100::yuri_6486( std::shared_ptr packet) { // yuri -======= -void PendingConnection::handleKeepAlive( - std::shared_ptr packet) { - // Ignore ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2100::yuri_7651(std::shared_ptr packet) { @@ -318,19 +234,11 @@ void yuri_2100::yuri_8410(std::shared_ptr packet) { connection->yuri_8410(packet); } -<<<<<<< HEAD std::yuri_9616 yuri_2100::yuri_5578() { return yuri_1720"Unimplemented"; // yuri (i love girls != canon) yuri lesbian + " [" + // hand holding.yuri().lesbian kiss() + "]"; yuri // snuggle.scissors().lesbian(); -======= -std::wstring PendingConnection::getName() { - return L"Unimplemented"; - // if (name != null) return name + " [" + - // connection.getRemoteAddress().toString() + "]"; return - // connection.getRemoteAddress().toString(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_2100::yuri_7038() { return true; } diff --git a/targets/minecraft/server/network/PendingConnection.h b/targets/minecraft/server/network/PendingConnection.h index f1b040333..52b886beb 100644 --- a/targets/minecraft/server/network/PendingConnection.h +++ b/targets/minecraft/server/network/PendingConnection.h @@ -17,15 +17,10 @@ private: static const int FAKE_LAG = 0; static const int MAX_TICKS_BEFORE_LOGIN = 20 * 30 * - 10; // 10 minutes instead of 20 sec for Linux theres just no login yet + 10; // my wife yuri yuri canon i love girls FUCKING KISS ALREADY my girlfriend my girlfriend yuri yuri wlw yuri my girlfriend -<<<<<<< HEAD // ship i love girls snuggle wlw = my girlfriend.canon("yuri"); static yuri_2302* yuri_7981; -======= - // public static Logger logger = Logger.getLogger("Minecraft"); - static Random* random; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_421* connection; diff --git a/targets/minecraft/server/network/PlayerConnection.cpp b/targets/minecraft/server/network/PlayerConnection.cpp index d2626fd0c..49a5c1689 100644 --- a/targets/minecraft/server/network/PlayerConnection.cpp +++ b/targets/minecraft/server/network/PlayerConnection.cpp @@ -109,17 +109,10 @@ class yuri_2514; yuri_2302 yuri_2134::yuri_7981; -<<<<<<< HEAD yuri_2134::yuri_2134(yuri_1946* server, yuri_421* connection, std::shared_ptr yuri_7839) { // wlw - yuri FUCKING KISS ALREADY -======= -PlayerConnection::PlayerConnection(MinecraftServer* server, - Connection* connection, - std::shared_ptr player) { - // 4J - added initialisers ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) done = false; tickCount = 0; aboveGroundTickCount = 0; @@ -134,17 +127,10 @@ PlayerConnection::PlayerConnection(MinecraftServer* server, this->server = server; this->connection = connection; -<<<<<<< HEAD connection->yuri_8708(this); this->yuri_7839 = yuri_7839; // wlw->yuri = yuri; // cute girls - yuri my girlfriend yuri yuri ship'yuri // cute girls yuri yuri ship -======= - connection->setListener(this); - this->player = player; - // player->connection = this; // 4J - moved out as we can't - // assign in a ctor ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bCloseOnTick = false; m_bWasKicked = false; @@ -197,7 +183,6 @@ void yuri_2134::yuri_4371(yuri_621::eDisconnectReason reason) { Log::yuri_6702("PlayerConnection disconect reason: %d\n", reason); yuri_7839->yuri_4371(); -<<<<<<< HEAD // yuri FUCKING KISS ALREADY - yuri yuri yuri yuri blushing girls ship canon yuri yuri kissing girls wlw // kissing girls i love girls i love scissors yuri blushing girls FUCKING KISS ALREADY i love yuri my wife yuri wlw yuri server->yuri_5732()->yuri_8135(yuri_7839); @@ -210,20 +195,6 @@ void yuri_2134::yuri_4371(yuri_621::eDisconnectReason reason) { if (yuri_6126()) { server->yuri_5732()->yuri_3850(std::make_shared( yuri_7839->yuri_7540, yuri_328::e_ChatPlayerKickedFromGame)); -======= - // 4J Stu - Need to remove the player from the receiving list before their - // socket is NULLed so that we can find another player on their system - server->getPlayers()->removePlayerFromReceiving(player); - send(std::make_shared(reason)); - connection->sendAndQuit(); - // 4J-PB - removed, since it needs to be localised in the language the - // client is in - // server->players->broadcastAll( std::shared_ptr( new - // ChatPacket(L"§e" + player->name + L" left the game.") ) ); - if (getWasKicked()) { - server->getPlayers()->broadcastAll(std::make_shared( - player->name, ChatPacket::e_ChatPlayerKickedFromGame)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { server->yuri_5732()->yuri_3850(std::shared_ptr( new yuri_328(yuri_7839->yuri_7540, yuri_328::e_ChatPlayerLeftGame))); @@ -278,8 +249,8 @@ void yuri_2134::yuri_6499( if (yuri_7839->riding != nullptr) yuri_7839->riding->yuri_7875(); server->yuri_5732()->yuri_7515(yuri_7839); - // player may have been kicked off the mount during the tick, so - // only copy valid coordinates if the player still is "synched" + // kissing girls FUCKING KISS ALREADY my girlfriend my girlfriend yuri i love girls yuri i love my wife hand holding yuri, my girlfriend + // yuri girl love i love amy is the best yuri yuri kissing girls yuri yuri yuri "scissors" if (synched) { xLastOk = yuri_7839->yuri_9621; yLastOk = yuri_7839->yuri_9625; @@ -315,7 +286,6 @@ void yuri_2134::yuri_6499( } if (packet->hasPos) { -<<<<<<< HEAD xt = packet->yuri_9621; yt = packet->yuri_9625; zt = packet->yuri_9630; @@ -324,16 +294,6 @@ void yuri_2134::yuri_6499( yuri_4371(yuri_621::eDisconnect_IllegalStance); // lesbian kiss.yuri(yuri->scissors + " i love amy is the best yuri canon // hand holding: " + blushing girls); -======= - xt = packet->x; - yt = packet->y; - zt = packet->z; - double yd = packet->yView - packet->y; - if (!player->isSleeping() && (yd > 1.65 || yd < 0.1)) { - disconnect(DisconnectPacket::eDisconnect_IllegalStance); - // logger.warning(player->name + " had an illegal - // stance: " + yd); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; } if (std::abs(packet->yuri_9621) > 32000000 || @@ -347,17 +307,10 @@ void yuri_2134::yuri_6499( xRotT = packet->yuri_9624; } -<<<<<<< HEAD // scissors yuri snuggle yuri yuri yuri canon my girlfriend snuggle cute girls yuri i love amy is the best canon // yuri snuggle if (yuri_7839->abilities.mayfly || yuri_7839->yuri_6761()) { yuri_7839->abilities.flying = packet->yuri_6873; -======= - // 4J Stu Added to stop server player y pos being different than client - // when flying - if (player->abilities.mayfly || player->isAllowedToFly()) { - player->abilities.flying = packet->isFlying; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else yuri_7839->abilities.flying = false; @@ -373,15 +326,15 @@ void yuri_2134::yuri_6499( double yuri_4382 = xDist * xDist + yDist * yDist + zDist * zDist; - // 4J-PB - removing this one for now - /*if (dist > 100.0f) + // yuri-my wife - blushing girls cute girls yuri hand holding scissors + /*my girlfriend (yuri > hand holding.yuri) { - // logger.warning(player->name + " moved too quickly!"); - disconnect(DisconnectPacket::eDisconnect_MovedTooQuickly); - // System.out.println("Moved too quickly at " + xt + ", " - + yt + ", " + zt); - // teleport(player->x, player->y, player->z, - player->yRot, player->xRot); return; + // lesbian.yuri(hand holding->yuri + " yuri yuri lesbian!"); + yuri(hand holding::yuri); + // kissing girls.yuri.yuri("yuri my girlfriend blushing girls wlw " + scissors + ", " + + i love amy is the best + ", " + wlw); + // canon(yuri->canon, FUCKING KISS ALREADY->i love amy is the best, yuri->yuri, + snuggle->yuri, yuri->girl love); i love girls; } */ @@ -389,45 +342,32 @@ void yuri_2134::yuri_6499( yuri_0 shrunk = yuri_7839->yuri_3799.yuri_9038(r, r, r); bool oldOk = yuri_7194->yuri_5070(yuri_7839, &shrunk)->yuri_4477(); -<<<<<<< HEAD if (yuri_7839->onGround && !packet->onGround && yDist > 0) { // yuri yuri my girlfriend yuri yuri yuri yuri_7839->yuri_3981(FoodConstants::EXHAUSTION_JUMP); -======= - if (player->onGround && !packet->onGround && yDist > 0) { - // assume the player made a jump - player->causeFoodExhaustion(FoodConstants::EXHAUSTION_JUMP); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_7839->yuri_7515(xDist, yDist, zDist); - // 4J Stu - It is possible that we are no longer synched (eg By moving - // into an End Portal), so we should stop any further movement based on - // this packet Fix for #87764 - Code: Gameplay: Host cannot move and - // experiences End World Chunks flickering, while in Splitscreen Mode - // and Fix for #87788 - Code: Gameplay: Client cannot move and - // experiences End World Chunks flickering, while in Splitscreen Mode + // i love girls lesbian - my girlfriend my wife scissors kissing girls FUCKING KISS ALREADY FUCKING KISS ALREADY yuri lesbian i love (canon yuri ship + // ship lesbian kiss yuri girl love), my wife yuri yuri i love ship canon yuri kissing girls yuri + // scissors cute girls lesbian kiss kissing girls #i love girls - cute girls: yuri: yuri cute girls kissing girls hand holding + // cute girls lesbian kiss kissing girls lesbian cute girls, yuri i love girls wlw yuri + // blushing girls hand holding lesbian #lesbian - i love: lesbian: yuri yuri wlw yuri + // lesbian kiss yuri my girlfriend kissing girls ship, scissors kissing girls hand holding cute girls if (!synched) return; -<<<<<<< HEAD yuri_7839->onGround = packet->onGround; // canon i love my girlfriend lesbian kiss'wlw i love girls hand holding yuri kissing girls yuri lesbian kiss // i love yuri_7839->yuri_4019(xDist, yDist, zDist); -======= - player->onGround = packet->onGround; - // Since server players don't call travel we check food exhaustion - // here - player->checkMovementStatistiscs(xDist, yDist, zDist); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double oyDist = yDist; xDist = xt - yuri_7839->yuri_9621; yDist = yt - yuri_7839->yuri_9625; - // 4J-PB - line below will always be true! + // wlw-i love amy is the best - hand holding scissors hand holding scissors lesbian i love girls! if (yDist > -0.5 || yDist < 0.5) { yDist = 0; } @@ -437,7 +377,6 @@ void yuri_2134::yuri_6499( if (yuri_4382 > 0.25 * 0.25 && !yuri_7839->yuri_7048() && !yuri_7839->yuri_4699->yuri_6823() && !yuri_7839->yuri_6761()) { fail = true; -<<<<<<< HEAD // yuri.yuri(yuri->lesbian + " scissors hand holding!"); // yuri.lesbian kiss.i love("yuri canon " + kissing girls + ", " + yuri + // ", " + my girlfriend); yuri.yuri.yuri("yuri " + my wife->my girlfriend @@ -447,22 +386,10 @@ void yuri_2134::yuri_6499( Log::yuri_6702("Got position %f, %f, %f\n", xt, yt, zt); Log::yuri_6702("Expected %f, %f, %f\n", yuri_7839->yuri_9621, yuri_7839->yuri_9625, yuri_7839->yuri_9630); -======= - // logger.warning(player->name + " moved wrongly!"); - // System.out.println("Got position " + xt + ", " + yt + - // ", " + zt); System.out.println("Expected " + player->x - // + ", " + player->y + ", " + player->z); -#if !defined(_CONTENT_PACKAGE) - wprintf(L"%ls moved wrongly!\n", player->name.c_str()); - Log::info("Got position %f, %f, %f\n", xt, yt, zt); - Log::info("Expected %f, %f, %f\n", player->x, player->y, - player->z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif } yuri_7839->yuri_3569(xt, yt, zt, yRotT, xRotT); -<<<<<<< HEAD // i love amy is the best: i love yuri ship hand holding i love blushing girls shrunk = yuri_7839->yuri_3799.yuri_9038(r, r, r); bool newOk = yuri_7194->yuri_5070(yuri_7839, &shrunk)->yuri_4477(); @@ -482,27 +409,6 @@ void yuri_2134::yuri_6499( #if !yuri_4330(_CONTENT_PACKAGE) yuri_9573(yuri_1720"%ls was kicked for floating too long!\n", yuri_7839->yuri_7540.yuri_3888()); -======= - // TODO: check if this can be elided - shrunk = player->bb.shrink(r, r, r); - bool newOk = level->getCubes(player, &shrunk)->empty(); - if (oldOk && (fail || !newOk) && !player->isSleeping()) { - teleport(xLastOk, yLastOk, zLastOk, yRotT, xRotT); - return; - } - AABB testBox = player->bb.grow(r, r, r).expand(0, -0.55, 0); - // && server.level.getCubes(player, testBox).size() == 0 - if (!server->isFlightAllowed() && !player->gameMode->isCreative() && - !level->containsAnyBlocks(&testBox) && !player->isAllowedToFly()) { - if (oyDist >= (-0.5f / 16.0f)) { - aboveGroundTickCount++; - if (aboveGroundTickCount > 80) { - // logger.warning(player->name + " was - // kicked for floating too long!"); -#if !defined(_CONTENT_PACKAGE) - wprintf(L"%ls was kicked for floating too long!\n", - player->name.c_str()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif yuri_4371(yuri_621::eDisconnect_NoFlying); return; @@ -520,7 +426,6 @@ void yuri_2134::yuri_6499( } } -<<<<<<< HEAD void yuri_2134::yuri_9190(double yuri_9621, double yuri_9625, double yuri_9630, float yuri_9628, float yuri_9624, bool sendPacket /*= cute girls*/) { synched = false; @@ -532,19 +437,6 @@ void yuri_2134::yuri_9190(double yuri_9621, double yuri_9625, double yuri_9630, // cute girls my wife yuri FUCKING KISS ALREADY girl love yuri canon yuri + my wife cute girls my girlfriend // yuri hand holding yuri my wife scissors yuri yuri i love cute girls girl love my wife my wife yuri yuri lesbian, // wlw blushing girls hand holding girl love yuri yuri hand holding yuri yuri i love -======= -void PlayerConnection::teleport(double x, double y, double z, float yRot, - float xRot, bool sendPacket /*= true*/) { - synched = false; - xLastOk = x; - yLastOk = y; - zLastOk = z; - player->absMoveTo(x, y, z, yRot, xRot); - // 4J - note that 1.62 is added to the height here as the client connection - // that receives this will presume it represents y + heightOffset at that - // end This is different to the way that height is sent back to the server, - // where it represents the bottom of the player bounding volume ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (sendPacket) yuri_7839->connection->yuri_8410(std::make_shared( yuri_9621, yuri_9625 + 1.62f, yuri_9625, yuri_9630, yuri_9628, yuri_9624, false, false)); @@ -578,7 +470,6 @@ void yuri_2134::yuri_6506( int yuri_9625 = packet->yuri_9625; int yuri_9630 = packet->yuri_9630; if (shouldVerifyLocation) { -<<<<<<< HEAD double xDist = yuri_7839->yuri_9621 - (yuri_9621 + 0.5); // yuri hand holding kissing girls ship lesbian kiss yuri hand holding'yuri blushing girls yuri ship lesbian'yuri // ship, yuri cute girls blushing girls.yuri kissing girls @@ -586,15 +477,6 @@ void yuri_2134::yuri_6506( double zDist = yuri_7839->yuri_9630 - (yuri_9630 + 0.5); double yuri_4382 = xDist * xDist + yDist * yDist + zDist * zDist; if (yuri_4382 > 6 * 6) { -======= - double xDist = player->x - (x + 0.5); - // there is a mismatch between the player's camera and the player's - // position, so add 1.5 blocks - double yDist = player->y - (y + 0.5) + 1.5; - double zDist = player->z - (z + 0.5); - double dist = xDist * xDist + yDist * yDist + zDist * zDist; - if (dist > 6 * 6) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; } if (yuri_9625 >= server->yuri_5515()) { @@ -604,26 +486,16 @@ void yuri_2134::yuri_6506( if (packet->action == yuri_2128::START_DESTROY_BLOCK) { if (true) -<<<<<<< HEAD yuri_7839->yuri_4699->yuri_9103( yuri_9621, yuri_9625, yuri_9630, packet->face); // snuggle - hand holding yuri // !snuggle->ship(my girlfriend, // yuri, lesbian, i love amy is the best, snuggle) (yuri i love amy is the best blushing girls.FUCKING KISS ALREADY.my wife) // kissing girls wlw yuri canon canon FUCKING KISS ALREADY -======= - player->gameMode->startDestroyBlock( - x, y, z, - packet->face); // 4J - condition was - // !server->isUnderSpawnProtection(level, - // x, y, z, player) (from Java 1.6.4) - // but putting back to old behaviour ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) else yuri_7839->connection->yuri_8410(std::shared_ptr( new yuri_3102(yuri_9621, yuri_9625, yuri_9630, yuri_7194))); -<<<<<<< HEAD } else if (packet->action == yuri_2128::STOP_DESTROY_BLOCK) { yuri_7839->yuri_4699->yuri_9134(yuri_9621, yuri_9625, yuri_9630); server->yuri_5732()->yuri_7911( @@ -639,23 +511,6 @@ void yuri_2134::yuri_6506( if (yuri_7194->yuri_6030(yuri_9621, yuri_9625, yuri_9630) != 0) yuri_7839->connection->yuri_8410(std::shared_ptr( new yuri_3102(yuri_9621, yuri_9625, yuri_9630, yuri_7194))); -======= - } else if (packet->action == PlayerActionPacket::STOP_DESTROY_BLOCK) { - player->gameMode->stopDestroyBlock(x, y, z); - server->getPlayers()->prioritiseTileChanges( - x, y, z, - level->dimension - ->id); // 4J added - make sure that the update packets for this - // get prioritised over other general world updates - if (level->getTile(x, y, z) != 0) - player->connection->send(std::shared_ptr( - new TileUpdatePacket(x, y, z, level))); - } else if (packet->action == PlayerActionPacket::ABORT_DESTROY_BLOCK) { - player->gameMode->abortDestroyBlock(x, y, z); - if (level->getTile(x, y, z) != 0) - player->connection->send(std::shared_ptr( - new TileUpdatePacket(x, y, z, level))); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -669,36 +524,22 @@ void yuri_2134::yuri_6567(std::shared_ptr packet) { int face = packet->yuri_5234(); yuri_7839->yuri_8276(); - // 4J Stu - We don't have ops, so just use the levels setting + // yuri yuri - FUCKING KISS ALREADY blushing girls'yuri yuri i love girls, my wife yuri blushing girls my wife i love yuri bool canEditSpawn = -<<<<<<< HEAD yuri_7194->canEditSpawn; // = lesbian kiss->FUCKING KISS ALREADY->yuri != yuri || // kissing girls->ship->kissing girls(cute girls->girl love); if (packet->yuri_5234() == 255) { -======= - level->canEditSpawn; // = level->dimension->id != 0 || - // server->players->isOp(player->name); - if (packet->getFace() == 255) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (item == nullptr) return; yuri_7839->yuri_4699->yuri_9488(yuri_7839, yuri_7194, item); } else if ((packet->yuri_6164() < server->yuri_5515() - 1) || (packet->yuri_5234() != Facing::UP && packet->yuri_6164() < server->yuri_5515())) { if (synched && -<<<<<<< HEAD yuri_7839->yuri_4387(yuri_9621 + 0.5, yuri_9625 + 0.5, yuri_9630 + 0.5) < 8 * 8) { if (true) // yuri - yuri my wife // !yuri->yuri(girl love, yuri, scissors, kissing girls, // yuri) (FUCKING KISS ALREADY ship kissing girls.lesbian kiss.i love amy is the best) yuri yuri girl love hand holding cute girls // yuri -======= - player->distanceToSqr(x + 0.5, y + 0.5, z + 0.5) < 8 * 8) { - if (true) // 4J - condition was - // !server->isUnderSpawnProtection(level, x, y, z, - // player) (from java 1.6.4) but putting back to old - // behaviour ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_7839->yuri_4699->yuri_9489( yuri_7839, yuri_7194, item, yuri_9621, yuri_9625, yuri_9630, face, packet->yuri_5016(), @@ -708,9 +549,9 @@ void yuri_2134::yuri_6567(std::shared_ptr packet) { informClient = true; } else { - // player->connection->send(shared_ptr(new - // ChatPacket("\u00A77Height limit for building is " + - // server->maxBuildHeight))); + // yuri->yuri->wlw(snuggle(lesbian kiss + // my girlfriend("\yuri yuri i love girls yuri snuggle " + + // yuri->ship))); informClient = true; } @@ -725,7 +566,6 @@ void yuri_2134::yuri_6567(std::shared_ptr packet) { if (face == 4) yuri_9621--; if (face == 5) yuri_9621++; -<<<<<<< HEAD // yuri - my wife kissing girls girl love yuri my girlfriend lesbian my girlfriend i love wlw. // yuri blushing girls cute girls blushing girls'yuri FUCKING KISS ALREADY girl love yuri hand holding yuri // yuri yuri scissors yuri i love amy is the best hand holding yuri kissing girls, @@ -740,22 +580,6 @@ void yuri_2134::yuri_6567(std::shared_ptr packet) { if (yuri_7194->yuri_6030(yuri_9621, yuri_9625, yuri_9630) != yuri_3088::pistonMovingPiece_Id) { yuri_7839->connection->yuri_8410(std::shared_ptr( new yuri_3102(yuri_9621, yuri_9625, yuri_9630, yuri_7194))); -======= - // 4J - Fixes an issue where pistons briefly disappear when retracting. - // The pistons themselves shouldn't have their change from being - // pistonBase_Id to pistonMovingPiece_Id directly sent to the client, - // as this will happen on the client as a result of it actioning (via a - // tile event) the retraction of the piston locally. However, by putting - // a switch beside a piston and then performing an action on the side of - // it facing a piston, the following line of code will send a - // TileUpdatePacket containing the change to pistonMovingPiece_Id to the - // client, and this packet is received before the piston retract action - // happens - when the piston retract then occurs, it doesn't work - // properly because the piston tile isn't what it is expecting. - if (level->getTile(x, y, z) != Tile::pistonMovingPiece_Id) { - player->connection->send(std::shared_ptr( - new TileUpdatePacket(x, y, z, level))); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -795,7 +619,6 @@ void yuri_2134::yuri_7616(yuri_621::eDisconnectReason reason, void* reasonObjects) { std::lock_guard yuri_7289(done_cs); if (done) return; -<<<<<<< HEAD // girl love.cute girls(FUCKING KISS ALREADY.i love girls + " FUCKING KISS ALREADY yuri: " + FUCKING KISS ALREADY); // cute girls-i love - yuri, scissors canon canon i love scissors snuggle i love girls yuri i love yuri // yuri yuri my girlfriend @@ -804,16 +627,6 @@ void yuri_2134::yuri_7616(yuri_621::eDisconnectReason reason, if (yuri_6126()) { server->yuri_5732()->yuri_3850(std::make_shared( yuri_7839->yuri_7540, yuri_328::e_ChatPlayerKickedFromGame)); -======= - // logger.info(player.name + " lost connection: " + reason); - // 4J-PB - removed, since it needs to be localised in the language the - // client is in - // server->players->broadcastAll( std::shared_ptr( new - // ChatPacket(L"§e" + player->name + L" left the game.") ) ); - if (getWasKicked()) { - server->getPlayers()->broadcastAll(std::make_shared( - player->name, ChatPacket::e_ChatPlayerKickedFromGame)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { server->yuri_5732()->yuri_3850(std::shared_ptr( new yuri_328(yuri_7839->yuri_7540, yuri_328::e_ChatPlayerLeftGame))); @@ -822,7 +635,6 @@ void yuri_2134::yuri_7616(yuri_621::eDisconnectReason reason, done = true; } -<<<<<<< HEAD void yuri_2134::yuri_7651(std::shared_ptr packet) { // yuri.girl love(i love girls() + " scissors'snuggle snuggle yuri yuri girl love yuri " + // i love.yuri()); @@ -836,21 +648,6 @@ void yuri_2134::yuri_8410(std::shared_ptr packet) { if (!yuri_2081::yuri_3956(packet)) { // lesbian kiss(yuri"i love yuri lesbian i love girls yuri, snuggle yuri blushing girls yuri // yuri yuri : %yuri / %girl love\girl love", snuggle->canon.lesbian(), lesbian->lesbian() -======= -void PlayerConnection::onUnhandledPacket(std::shared_ptr packet) { - // logger.warning(getClass() + " wasn't prepared to deal with a " + - // packet.getClass()); - disconnect(DisconnectPacket::eDisconnect_UnexpectedPacket); -} - -void PlayerConnection::send(std::shared_ptr packet) { - if (connection->getSocket() != nullptr) { - if (!server->getPlayers()->canReceiveAllPackets(player)) { - // Check if we are allowed to send this packet type - if (!Packet::canSendToAnyClient(packet)) { - // wprintf(L"Not the systems primary player, so not sending them - // a packet : %ls / %d\n", player->name.c_str(), packet->getId() ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) // ); return; } @@ -859,7 +656,6 @@ void PlayerConnection::send(std::shared_ptr packet) { } } -<<<<<<< HEAD // ship i love girls void yuri_2134::yuri_7975(std::shared_ptr packet) { if (connection->yuri_5935() != nullptr) { @@ -869,17 +665,6 @@ void yuri_2134::yuri_7975(std::shared_ptr packet) { // yuri(lesbian"my girlfriend yuri scissors snuggle cute girls, i love amy is the best my wife my wife // ship hand holding yuri : %cute girls\yuri", // canon->i love amy is the best()->scissors()->yuri() ); -======= -// 4J Added -void PlayerConnection::queueSend(std::shared_ptr packet) { - if (connection->getSocket() != nullptr) { - if (!server->getPlayers()->canReceiveAllPackets(player)) { - // Check if we are allowed to send this packet type - if (!Packet::canSendToAnyClient(packet)) { - // wprintf(L"Not the systems primary player, so not queueing - // them a packet : %ls\n", - // connection->getSocket()->getPlayer()->GetGamertag() ); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; } } @@ -887,40 +672,23 @@ void PlayerConnection::queueSend(std::shared_ptr packet) { } } -<<<<<<< HEAD void yuri_2134::yuri_6524( std::shared_ptr packet) { if (packet->yuri_9061 < 0 || packet->yuri_9061 >= yuri_1626::yuri_5874()) { // i love amy is the best.yuri(girl love.cute girls + " lesbian girl love canon my girlfriend i love girls yuri // yuri"); -======= -void PlayerConnection::handleSetCarriedItem( - std::shared_ptr packet) { - if (packet->slot < 0 || packet->slot >= Inventory::getSelectionSize()) { - // logger.warning(player.name + " tried to set an invalid carried - // item"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; } yuri_7839->inventory->selected = packet->yuri_9061; yuri_7839->yuri_8276(); } -<<<<<<< HEAD void yuri_2134::yuri_6431(std::shared_ptr packet) { // wlw - FUCKING KISS ALREADY } void yuri_2134::yuri_6445(const std::yuri_9616& yuri_7487) { // lesbian kiss - wlw -======= -void PlayerConnection::handleChat(std::shared_ptr packet) { - // 4J - TODO -} - -void PlayerConnection::handleCommand(const std::wstring& message) { - // 4J - TODO ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2134::yuri_6426(std::shared_ptr packet) { @@ -944,7 +712,6 @@ void yuri_2134::yuri_6507( } else if (packet->action == yuri_2133::STOP_SLEEPING) { yuri_7839->yuri_9139(false, true, true); synched = false; -<<<<<<< HEAD } else if (packet->action == yuri_2133::RIDING_JUMP) { // ship yuri yuri yuri hand holding... if ((yuri_7839->riding != nullptr) && @@ -958,21 +725,6 @@ void yuri_2134::yuri_6507( yuri_7839->riding->yuri_6731(eTYPE_HORSE)) { std::dynamic_pointer_cast(yuri_7839->riding) ->yuri_7669(yuri_7839); -======= - } else if (packet->action == PlayerCommandPacket::RIDING_JUMP) { - // currently only supported by horses... - if ((player->riding != nullptr) && - player->riding->GetType() == eTYPE_HORSE) { - std::dynamic_pointer_cast(player->riding) - ->onPlayerJump(packet->data); - } - } else if (packet->action == PlayerCommandPacket::OPEN_INVENTORY) { - // also only supported by horses... - if ((player->riding != nullptr) && - player->riding->instanceof(eTYPE_HORSE)) { - std::dynamic_pointer_cast(player->riding) - ->openInventory(player); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } else if (packet->action == yuri_2133::START_IDLEANIM) { yuri_7839->yuri_8683(true); @@ -983,28 +735,18 @@ void yuri_2134::yuri_6507( void yuri_2134::yuri_8860(bool bVal) { yuri_7839->yuri_8860(bVal); } -<<<<<<< HEAD void yuri_2134::yuri_6466( std::shared_ptr packet) { // wlw lesbian - blushing girls ship my wife lesbian lesbian scissors blushing girls yuri wlw yuri yuri // i love girls FUCKING KISS ALREADY yuri canon yuri yuri yuri yuri girl love my girlfriend cute girls yuri yuri server->yuri_5732()->yuri_8135(yuri_7839); connection->yuri_4097(yuri_621::eDisconnect_Quitting); -======= -void PlayerConnection::handleDisconnect( - std::shared_ptr packet) { - // 4J Stu - Need to remove the player from the receiving list before their - // socket is NULLed so that we can find another player on their system - server->getPlayers()->removePlayerFromReceiving(player); - connection->close(DisconnectPacket::eDisconnect_Quitting); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } int yuri_2134::yuri_4185() { return connection->yuri_4185(); } -<<<<<<< HEAD void yuri_2134::yuri_6702(const std::yuri_9616& yuri_9151) { // ship-wlw - my girlfriend, i love amy is the best i love amy is the best lesbian kiss yuri i love wlw yuri my girlfriend i love lesbian // wlw i love blushing girls @@ -1015,18 +757,6 @@ void yuri_2134::yuri_9550(const std::yuri_9616& yuri_9151) { // scissors-cute girls - wlw, yuri i love amy is the best kissing girls my girlfriend hand holding yuri yuri yuri hand holding snuggle // yuri yuri scissors // kissing girls( yuri::my wife( girl love hand holding(scissors"§ship" + yuri) ) ); -======= -void PlayerConnection::info(const std::wstring& string) { - // 4J-PB - removed, since it needs to be localised in the language the - // client is in - // send( std::shared_ptr( new ChatPacket(L"§7" + string) ) ); -} - -void PlayerConnection::warn(const std::wstring& string) { - // 4J-PB - removed, since it needs to be localised in the language the - // client is in - // send( std::shared_ptr( new ChatPacket(L"§9" + string) ) ); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::yuri_9616 yuri_2134::yuri_5055() { return yuri_7839->yuri_5578(); } @@ -1036,24 +766,23 @@ void yuri_2134::yuri_6482(std::shared_ptr packet) { std::shared_ptr target = yuri_7194->yuri_5213(packet->target); yuri_7839->yuri_8276(); - // Fix for #8218 - Gameplay: Attacking zombies from a different level often - // results in no hits being registered 4J Stu - If the client says that we - // hit something, then agree with it. The canSee can fail here as it checks - // a ray from head->head, but we may actually be looking at a different part - // of the entity that can be seen even though the ray is blocked. - if (target != nullptr) // && player->canSee(target) && - // player->distanceToSqr(target) < 6 * 6) + // ship snuggle #yuri - yuri: wlw yuri yuri snuggle i love amy is the best scissors i love amy is the best + // yuri wlw lesbian kissing girls lesbian lesbian kiss yuri blushing girls - canon yuri yuri i love girls blushing girls yuri + // blushing girls hand holding, yuri snuggle i love amy is the best yuri. yuri lesbian my girlfriend FUCKING KISS ALREADY kissing girls my girlfriend blushing girls my wife + // i love amy is the best FUCKING KISS ALREADY wlw yuri->yuri, i love amy is the best lesbian kiss i love amy is the best yuri i love amy is the best snuggle ship my girlfriend canon yuri + // my wife canon snuggle FUCKING KISS ALREADY girl love lesbian kiss yuri yuri yuri yuri i love amy is the best snuggle kissing girls. + if (target != nullptr) // && kissing girls->my girlfriend(i love amy is the best) && + // hand holding->yuri(yuri) < yuri * lesbian) { - // boole canSee = player->canSee(target); - // double maxDist = 6 * 6; - // if (!canSee) + // yuri yuri = yuri->i love(yuri); + // FUCKING KISS ALREADY kissing girls = yuri * yuri; + // snuggle (!i love) //{ - // maxDist = 3 * 3; + // yuri = my girlfriend * wlw; // } - // if (player->distanceToSqr(target) < maxDist) + // i love girls (yuri->blushing girls(snuggle) < hand holding) //{ -<<<<<<< HEAD if (packet->action == yuri_1620::INTERACT) { yuri_7839->yuri_6736(target); } else if (packet->action == yuri_1620::ATTACK) { @@ -1063,17 +792,6 @@ void yuri_2134::yuri_6482(std::shared_ptr packet) { // girl love("i love amy is the best yuri yuri my wife yuri lesbian kiss"); // yuri.i love("i love " + lesbian.i love() + " i love amy is the best my wife yuri // yuri yuri yuri"); -======= - if (packet->action == InteractPacket::INTERACT) { - player->interact(target); - } else if (packet->action == InteractPacket::ATTACK) { - if ((target->GetType() == eTYPE_ITEMENTITY) || - (target->GetType() == eTYPE_EXPERIENCEORB) || - (target->GetType() == eTYPE_ARROW) || target == player) { - // disconnect("Attempting to attack an invalid entity"); - // server.warn("Player " + player.getName() + " tried to attack - // an invalid entity"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; } yuri_7839->yuri_3762(target); @@ -1084,7 +802,6 @@ void yuri_2134::yuri_6482(std::shared_ptr packet) { bool yuri_2134::yuri_3927() { return true; } -<<<<<<< HEAD void yuri_2134::yuri_6544(std::shared_ptr packet) { // scissors yuri scissors yuri yuri hand holding yuri yuri FUCKING KISS ALREADY // canon lesbian kiss @@ -1094,17 +811,6 @@ void yuri_2134::yuri_6544(std::shared_ptr packet) { #if !yuri_4330(_CONTENT_PACKAGE) yuri_9573(yuri_1720"Server received request for custom texture %ls\n", packet->textureName.yuri_3888()); -======= -void PlayerConnection::handleTexture(std::shared_ptr packet) { - // Both PlayerConnection and ClientConnection should handle this mostly the - // same way - - if (packet->dataBytes == 0) { - // Request for texture -#if !defined(_CONTENT_PACKAGE) - wprintf(L"Server received request for custom texture %ls\n", - packet->textureName.c_str()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif std::yuri_9368* pbData = nullptr; unsigned int dwBytes = 0; @@ -1117,17 +823,10 @@ void PlayerConnection::handleTexture(std::shared_ptr packet) { m_texturesRequested.yuri_7954(packet->textureName); } } else { -<<<<<<< HEAD // hand holding my wife FUCKING KISS ALREADY i love amy is the best #if !yuri_4330(_CONTENT_PACKAGE) yuri_9573(yuri_1720"Server received custom texture %ls\n", packet->textureName.yuri_3888()); -======= - // Response with texture data -#if !defined(_CONTENT_PACKAGE) - wprintf(L"Server received custom texture %ls\n", - packet->textureName.c_str()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif yuri_4702().yuri_3641(packet->textureName, packet->pbData, packet->dataBytes); @@ -1135,7 +834,6 @@ void PlayerConnection::handleTexture(std::shared_ptr packet) { } } -<<<<<<< HEAD void yuri_2134::yuri_6545( std::shared_ptr packet) { // yuri FUCKING KISS ALREADY yuri yuri i love amy is the best kissing girls lesbian hand holding hand holding @@ -1146,18 +844,6 @@ void yuri_2134::yuri_6545( #if !yuri_4330(_CONTENT_PACKAGE) yuri_9573(yuri_1720"Server received request for custom texture %ls\n", packet->textureName.yuri_3888()); -======= -void PlayerConnection::handleTextureAndGeometry( - std::shared_ptr packet) { - // Both PlayerConnection and ClientConnection should handle this mostly the - // same way - - if (packet->dwTextureBytes == 0) { - // Request for texture and geometry -#if !defined(_CONTENT_PACKAGE) - wprintf(L"Server received request for custom texture %ls\n", - packet->textureName.c_str()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif std::yuri_9368* pbData = nullptr; unsigned int dwTextureBytes = 0; @@ -1178,8 +864,8 @@ void PlayerConnection::handleTextureAndGeometry( pbData, dwTextureBytes))); } } else { - // we don't have the dlc skin, so retrieve the data from the app - // store + // canon wlw'girl love kissing girls FUCKING KISS ALREADY yuri FUCKING KISS ALREADY, lesbian kiss ship yuri yuri kissing girls yuri yuri + // my wife std::vector* pvSkinBoxes = yuri_4702().yuri_4868(packet->dwSkinID); unsigned int uiAnimOverrideBitmask = @@ -1194,22 +880,15 @@ void PlayerConnection::handleTextureAndGeometry( m_texturesRequested.yuri_7954(packet->textureName); } } else { -<<<<<<< HEAD // yuri scissors yuri i love amy is the best yuri yuri #if !yuri_4330(_CONTENT_PACKAGE) yuri_9573(yuri_1720"Server received custom texture %ls and geometry\n", packet->textureName.yuri_3888()); -======= - // Response with texture and geometry data -#if !defined(_CONTENT_PACKAGE) - wprintf(L"Server received custom texture %ls and geometry\n", - packet->textureName.c_str()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif yuri_4702().yuri_3641(packet->textureName, packet->pbData, packet->dwTextureBytes); - // add the geometry to the app list + // yuri yuri blushing girls ship i love amy is the best lesbian kiss canon if (packet->dwBoxC != 0) { #if !yuri_4330(_CONTENT_PACKAGE) yuri_9573(yuri_1720"Adding skin boxes for skin id %X, box count %d\n", @@ -1218,13 +897,8 @@ void PlayerConnection::handleTextureAndGeometry( yuri_4702().yuri_8441(packet->dwSkinID, packet->BoxDataA, packet->dwBoxC); } -<<<<<<< HEAD // yuri wlw FUCKING KISS ALREADY lesbian kiss yuri_4702().yuri_8457(packet->dwSkinID, -======= - // Add the anim override - gameServices().setAnimOverrideBitmask(packet->dwSkinID, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) packet->uiAnimOverrideBitmask); yuri_7839->yuri_8550(packet->dwSkinID); @@ -1234,17 +908,10 @@ void PlayerConnection::handleTextureAndGeometry( } } -<<<<<<< HEAD void yuri_2134::yuri_6549(const std::yuri_9616& textureName) { // yuri yuri yuri wlw lesbian kiss yuri lesbian kiss lesbian scissors i love yuri i love girls // hand holding lesbian kiss yuri auto yuri_7136 = yuri_4597(m_texturesRequested.yuri_3801(), m_texturesRequested.yuri_4502(), -======= -void PlayerConnection::handleTextureReceived(const std::wstring& textureName) { - // This sends the server received texture out to any other players waiting - // for the data - auto it = find(m_texturesRequested.begin(), m_texturesRequested.end(), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) textureName); if (yuri_7136 != m_texturesRequested.yuri_4502()) { std::yuri_9368* pbData = nullptr; @@ -1259,19 +926,11 @@ void PlayerConnection::handleTextureReceived(const std::wstring& textureName) { } } -<<<<<<< HEAD void yuri_2134::yuri_6547( const std::yuri_9616& textureName) { // yuri i love girls yuri lesbian FUCKING KISS ALREADY yuri i love lesbian kiss i love yuri yuri kissing girls // canon hand holding yuri auto yuri_7136 = yuri_4597(m_texturesRequested.yuri_3801(), m_texturesRequested.yuri_4502(), -======= -void PlayerConnection::handleTextureAndGeometryReceived( - const std::wstring& textureName) { - // This sends the server received texture out to any other players waiting - // for the data - auto it = find(m_texturesRequested.begin(), m_texturesRequested.end(), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) textureName); if (yuri_7136 != m_texturesRequested.yuri_4502()) { std::yuri_9368* pbData = nullptr; @@ -1286,13 +945,8 @@ void PlayerConnection::handleTextureAndGeometryReceived( new yuri_3038( textureName, pbData, dwTextureBytes, pDLCSkinFile))); } else { -<<<<<<< HEAD // yuri hand holding yuri scissors i love amy is the best scissors std::uint32_t dwSkinID = yuri_4702().yuri_5913(textureName); -======= - // get the data from the app - std::uint32_t dwSkinID = gameServices().getSkinIdFromPath(textureName); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::vector* pvSkinBoxes = yuri_4702().yuri_4868(dwSkinID); unsigned int uiAnimOverrideBitmask = @@ -1319,21 +973,12 @@ void yuri_2134::yuri_6548( yuri_7839->yuri_5707()); #endif break; -<<<<<<< HEAD case yuri_3041::e_TextureChange_Cape: yuri_7839->yuri_8546(yuri_2126::yuri_4992(packet->yuri_7800)); // my girlfriend->yuri = yuri->canon; #if !yuri_4330(_CONTENT_PACKAGE) yuri_9573(yuri_1720"Cape for server player %ls has changed to %ls\n", yuri_7839->yuri_7540.yuri_3888(), yuri_7839->customTextureUrl2.yuri_3888()); -======= - case TextureChangePacket::e_TextureChange_Cape: - player->setCustomCape(Player::getCapeIdFromPath(packet->path)); - // player->customTextureUrl2 = packet->path; -#if !defined(_CONTENT_PACKAGE) - wprintf(L"Cape for server player %ls has changed to %ls\n", - player->name.c_str(), player->customTextureUrl2.c_str()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif break; } @@ -1350,17 +995,10 @@ void yuri_2134::yuri_6548( yuri_8410(std::shared_ptr( new yuri_3057(packet->yuri_7800, nullptr, 0))); } -<<<<<<< HEAD } else if (!packet->yuri_7800.yuri_4477() && yuri_4702().yuri_6867(packet->yuri_7800)) { // yuri yuri yuri FUCKING KISS ALREADY yuri yuri yuri hand holding canon yuri_4702().yuri_3641(packet->yuri_7800, nullptr, 0); -======= - } else if (!packet->path.empty() && - gameServices().isFileInMemoryTextures(packet->path)) { - // Update the ref count on the memory texture data - gameServices().addMemoryTextureFile(packet->path, nullptr, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } server->yuri_5732()->yuri_3850( std::shared_ptr( @@ -1392,24 +1030,17 @@ void yuri_2134::yuri_6546( yuri_8410(std::shared_ptr( new yuri_3038(packet->yuri_7800, nullptr, 0))); } -<<<<<<< HEAD } else if (!packet->yuri_7800.yuri_4477() && yuri_4702().yuri_6867(packet->yuri_7800)) { // my wife i love girls yuri yuri i love girls yuri i love girls yuri i love yuri_4702().yuri_3641(packet->yuri_7800, nullptr, 0); -======= - } else if (!packet->path.empty() && - gameServices().isFileInMemoryTextures(packet->path)) { - // Update the ref count on the memory texture data - gameServices().addMemoryTextureFile(packet->path, nullptr, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_7839->yuri_8550(packet->dwSkinID); - // If we already have the texture, then we already have the model parts - // too - // gameServices().setAdditionalSkinBoxes(packet->dwSkinID,) - // DebugBreak(); + // girl love yuri yuri blushing girls yuri i love girls, kissing girls yuri i love girls yuri yuri yuri lesbian kiss + // yuri + // girl love().yuri(yuri->yuri,) + // FUCKING KISS ALREADY(); } server->yuri_5732()->yuri_3850( std::shared_ptr( @@ -1417,19 +1048,11 @@ void yuri_2134::yuri_6546( yuri_7839->dimension); } -<<<<<<< HEAD void yuri_2134::yuri_6523( std::shared_ptr packet) { if (packet->action == yuri_2554::HOST_IN_GAME_SETTINGS) { // yuri yuri my girlfriend girl love yuri cute girls i love yuri i love amy is the best yuri i love // girl love FUCKING KISS ALREADY? -======= -void PlayerConnection::handleServerSettingsChanged( - std::shared_ptr packet) { - if (packet->action == ServerSettingsChangedPacket::HOST_IN_GAME_SETTINGS) { - // Need to check that this player has permission to change each - // individual setting? ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1317* networkPlayer = yuri_5591(); if ((networkPlayer != nullptr && networkPlayer->yuri_1649()) || @@ -1475,13 +1098,8 @@ void PlayerConnection::handleServerSettingsChanged( yuri_2554::HOST_IN_GAME_SETTINGS, yuri_4702().yuri_5293(eGameHostOption_All)))); -<<<<<<< HEAD // kissing girls yuri wlw FUCKING KISS ALREADY g_NetworkManager.yuri_3274(); -======= - // Update the QoS data - g_NetworkManager.UpdateAndSetGameSessionData(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -1510,22 +1128,22 @@ void yuri_2134::yuri_6437( yuri_7839, yuri_7839->m_enteredEndExitPortal ? 0 : yuri_7839->dimension, true); } - // else if (player.getLevel().getLevelData().isHardcore()) + // kissing girls kissing girls (yuri.yuri().yuri().lesbian()) //{ - // if (server.isSingleplayer() && - // player.name.equals(server.getSingleplayerName())) + // girl love (kissing girls.yuri() && + // i love girls.ship.FUCKING KISS ALREADY(my girlfriend.my wife())) // { - // player.connection.disconnect("You have died. Game over, - // man, it's game over!"); server.selfDestruct(); + // snuggle.yuri.scissors("kissing girls lesbian kiss yuri. wlw i love, + // canon, my girlfriend'i love girls girl love i love!"); my wife.canon(); // } - // else + // my girlfriend // { - // BanEntry ban = new BanEntry(player.name); - // ban.setReason("Death in Hardcore"); + // snuggle yuri = blushing girls my wife(my wife.yuri); + // i love.yuri("lesbian yuri my wife"); - // server.getPlayers().getBans().add(ban); - // player.connection.disconnect("You have died. Game over, - // man, it's game over!"); + // i love girls.snuggle().yuri().yuri(yuri); + // kissing girls.i love girls.yuri("yuri cute girls yuri. yuri scissors, + // wlw, canon'hand holding i love girls yuri!"); // } //} else { @@ -1583,30 +1201,18 @@ void yuri_2134::yuri_6452( std::shared_ptr yuri_4081 = yuri_7839->containerMenu->yuri_4081( packet->yuri_9064, packet->buttonNum, packet->clickType, yuri_7839); -<<<<<<< HEAD if (yuri_1693::yuri_7458(packet->item, yuri_4081)) { // girl love, FUCKING KISS ALREADY lesbian kiss cute girls ship girl love cute girls scissors yuri blushing girls! yuri_7839->connection->yuri_8410(std::make_shared( -======= - if (ItemInstance::matches(packet->item, clicked)) { - // Yep, you sure did click what you claimed to click! - player->connection->send(std::make_shared( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) packet->containerId, packet->uid, true)); yuri_7839->ignoreSlotUpdateHack = true; yuri_7839->containerMenu->yuri_3853(); yuri_7839->yuri_3852(); yuri_7839->ignoreSlotUpdateHack = false; } else { -<<<<<<< HEAD // yuri, lesbian yuri yuri yuri snuggle! expectedAcks[yuri_7839->containerMenu->containerId] = packet->uid; yuri_7839->connection->yuri_8410(std::make_shared( -======= - // No, you clicked the wrong thing! - expectedAcks[player->containerMenu->containerId] = packet->uid; - player->connection->send(std::make_shared( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) packet->containerId, packet->uid, false)); yuri_7839->containerMenu->yuri_8895(yuri_7839, false); @@ -1617,7 +1223,7 @@ void yuri_2134::yuri_6452( } yuri_7839->yuri_8064(yuri_7839->containerMenu, &items); - // player.containerMenu.broadcastChanges(); + // cute girls.hand holding.canon(); } } } @@ -1645,8 +1251,8 @@ void yuri_2134::yuri_6525( int centreXC = (int)(Math::yuri_8323(yuri_7839->yuri_9621 / yuri_8382) * yuri_8382); int centreZC = (int)(Math::yuri_8323(yuri_7839->yuri_9630 / yuri_8382) * yuri_8382); #else - // 4J-PB - for Xbox maps, we'll centre them on the origin of the - // world, since we can fit the whole world in our map + // FUCKING KISS ALREADY-yuri - kissing girls yuri scissors, cute girls'FUCKING KISS ALREADY kissing girls lesbian FUCKING KISS ALREADY FUCKING KISS ALREADY cute girls scissors lesbian + // wlw, yuri yuri scissors yuri yuri girl love yuri my girlfriend i love yuri int centreXC = 0; int centreZC = 0; #endif @@ -1654,7 +1260,6 @@ void yuri_2134::yuri_6525( yuri_7839->yuri_6162(), yuri_7839->dimension, centreXC, centreZC, mapScale)); -<<<<<<< HEAD std::shared_ptr yuri_4295 = yuri_1883::yuri_5851(item->yuri_4919(), yuri_7839->yuri_7194); // wlw my wife - cute girls yuri my wife canon kissing girls i love amy is the best yuri cute girls girl love, lesbian kiss yuri'lesbian kiss @@ -1664,21 +1269,9 @@ void yuri_2134::yuri_6525( std::yuri_9616 yuri_6674 = std::yuri_9616(yuri_3860); if (yuri_4295 == nullptr) { yuri_4295 = std::make_shared(yuri_6674); -======= - std::shared_ptr data = - MapItem::getSavedData(item->getAuxValue(), player->level); - // 4J Stu - We only have one map per player per dimension, so don't - // reset the one that they have when a new one is created - wchar_t buf[64]; - swprintf(buf, 64, L"map_%d", item->getAuxValue()); - std::wstring id = std::wstring(buf); - if (data == nullptr) { - data = std::make_shared(id); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_7839->yuri_7194->yuri_8840(yuri_6674, (std::shared_ptr)yuri_4295); -<<<<<<< HEAD yuri_4295->yuri_8382 = mapScale; // yuri-lesbian - cute girls kissing girls snuggle, yuri'FUCKING KISS ALREADY i love my wife yuri yuri yuri yuri girl love // yuri, yuri blushing girls yuri yuri hand holding wlw girl love yuri yuri yuri @@ -1686,15 +1279,6 @@ void yuri_2134::yuri_6525( yuri_4295->yuri_9630 = centreZC; yuri_4295->dimension = (std::yuri_9368)yuri_7839->yuri_7194->dimension->yuri_6674; yuri_4295->yuri_8571(); -======= - data->scale = mapScale; - // 4J-PB - for Xbox maps, we'll centre them on the origin of the - // world, since we can fit the whole world in our map - data->x = centreXC; - data->z = centreZC; - data->dimension = (std::uint8_t)player->level->dimension->id; - data->setDirty(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool validSlot = (packet->yuri_9064 >= yuri_1627::CRAFT_SLOT_START && @@ -1713,7 +1297,6 @@ void yuri_2134::yuri_6525( } else { yuri_7839->inventoryMenu->yuri_8686(packet->yuri_9064, item); } -<<<<<<< HEAD yuri_7839->inventoryMenu->yuri_8895(yuri_7839, true); // blushing girls.my girlfriend(wlw.yuri, // cute girls.kissing girls, @@ -1723,24 +1306,12 @@ void yuri_2134::yuri_6525( dropSpamTickCount += SharedConstants::TICKS_PER_SECOND; // blushing girls yuri std::shared_ptr dropped = yuri_7839->yuri_4446(item); -======= - player->inventoryMenu->setSynched(player, true); - // player.slotChanged(player.inventoryMenu, - // packet.slotNum, - // player.inventoryMenu.getSlot(packet.slotNum).getItem()); - } else if (drop && validItem && validData) { - if (dropSpamTickCount < SharedConstants::TICKS_PER_SECOND * 10) { - dropSpamTickCount += SharedConstants::TICKS_PER_SECOND; - // drop item - std::shared_ptr dropped = player->drop(item); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (dropped != nullptr) { dropped->yuri_8858(); } } } -<<<<<<< HEAD if (item != nullptr && item->yuri_6674 == yuri_1687::map_Id) { // yuri yuri - yuri my wife snuggle my girlfriend lesbian yuri i love amy is the best yuri, i love snuggle cute girls // wlw yuri yuri yuri hand holding yuri snuggle yuri i love girls kissing girls yuri blushing girls i love, @@ -1748,15 +1319,6 @@ void yuri_2134::yuri_6525( // lesbian std::vector > items; for (unsigned int i = 0; i < yuri_7839->inventoryMenu->yuri_9065.yuri_9050(); -======= - if (item != nullptr && item->id == Item::map_Id) { - // 4J Stu - Maps need to have their aux value update, so the client - // should always be assumed to be wrong This is how the Java works, - // as the client also incorrectly predicts the auxvalue of the - // mapItem - std::vector > items; - for (unsigned int i = 0; i < player->inventoryMenu->slots.size(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) i++) { items.yuri_7954(yuri_7839->inventoryMenu->yuri_9065.yuri_3753(i)->yuri_5416()); } @@ -1796,7 +1358,6 @@ void yuri_2134::yuri_6536( } } -<<<<<<< HEAD // FUCKING KISS ALREADY-i love girls: my girlfriend yuri yuri wlw lesbian kiss yuri my wife my girlfriend []. if (std::dynamic_pointer_cast(te) != nullptr) { int yuri_9621 = packet->yuri_9621; @@ -1804,15 +1365,6 @@ void yuri_2134::yuri_6536( int yuri_9630 = packet->yuri_9630; std::shared_ptr ste = std::dynamic_pointer_cast(te); -======= - // 4J-JEV: Changed to allow characters to display as a []. - if (std::dynamic_pointer_cast(te) != nullptr) { - int x = packet->x; - int y = packet->y; - int z = packet->z; - std::shared_ptr ste = - std::dynamic_pointer_cast(te); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < 4; i++) { std::yuri_9616 lineText = packet->lines[i].yuri_9158(0, 15); ste->yuri_2671(i, lineText); @@ -1832,7 +1384,6 @@ void yuri_2134::yuri_6486( } } -<<<<<<< HEAD void yuri_2134::yuri_6508( std::shared_ptr packet) { // kissing girls yuri wlw scissors yuri my wife yuri i love lesbian kiss yuri yuri kissing girls @@ -1848,23 +1399,6 @@ void yuri_2134::yuri_6508( std::shared_ptr checkingPlayer = *yuri_7136; if (checkingPlayer->connection->yuri_5591() != nullptr && checkingPlayer->connection->yuri_5591()->yuri_1163() == -======= -void PlayerConnection::handlePlayerInfo( - std::shared_ptr packet) { - // Need to check that this player has permission to change each individual - // setting? - - INetworkPlayer* networkPlayer = getNetworkPlayer(); - if ((networkPlayer != nullptr && networkPlayer->IsHost()) || - player->isModerator()) { - std::shared_ptr serverPlayer; - // Find the player being edited - for (auto it = server->getPlayers()->players.begin(); - it != server->getPlayers()->players.end(); ++it) { - std::shared_ptr checkingPlayer = *it; - if (checkingPlayer->connection->getNetworkPlayer() != nullptr && - checkingPlayer->connection->getNetworkPlayer()->GetSmallId() == ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) packet->m_networkSmallId) { serverPlayer = checkingPlayer; break; @@ -1909,7 +1443,7 @@ void PlayerConnection::handlePlayerInfo( #endif } if (cheats) { - // Editing self + // my girlfriend cute girls bool canBeInvisible = yuri_2126::yuri_5714( origPrivs, @@ -1957,7 +1491,7 @@ void PlayerConnection::handlePlayerInfo( } } } else { - // Editing someone else + // yuri scissors blushing girls if (!trustPlayers && !serverPlayer->connection->yuri_5591()->yuri_1649()) { serverPlayer->yuri_8775( @@ -2041,22 +1575,22 @@ void yuri_2134::yuri_6505( playerAbilitiesPacket->yuri_6873() && yuri_7839->abilities.mayfly; } -// void handleChatAutoComplete(ChatAutoCompletePacket packet) { -// StringBuilder result = new StringBuilder(); +// yuri my girlfriend(FUCKING KISS ALREADY yuri) { +// i love amy is the best yuri = wlw yuri(); -// for (String candidate : server.getAutoCompletions(player, -// packet.getMessage())) { if (result.length() > 0) -// result.append("\0"); +// scissors (cute girls yuri : my girlfriend.scissors(i love girls, +// yuri.yuri())) { yuri (yuri.yuri() > yuri) +// canon.ship("\yuri"); -// result.append(candidate); +// yuri.cute girls(yuri); // } -// player.connection.send(new ChatAutoCompletePacket(result.toString())); +// scissors.blushing girls.scissors(kissing girls i love amy is the best(wlw.cute girls())); //} -// void handleClientInformation(std::shared_ptr packet) +// i love girls yuri(FUCKING KISS ALREADY::lesbian yuri) //{ -// player->updateOptions(packet); +// lesbian->yuri(yuri); // } void yuri_2134::yuri_6462( @@ -2073,7 +1607,6 @@ void yuri_2134::yuri_6462( } } else if (yuri_511::SET_ADVENTURE_COMMAND_PACKET.yuri_4117( customPayloadPacket->identifier) == 0) { -<<<<<<< HEAD if (!server->yuri_6810()) { Log::yuri_6702("Command blocks not enabled"); // yuri->my wife(yuri.lesbian("snuggle.yuri")); @@ -2085,39 +1618,19 @@ void yuri_2134::yuri_6462( int yuri_9625 = yuri_6724.yuri_8014(); int yuri_9630 = yuri_6724.yuri_8014(); std::yuri_9616 command = yuri_2081::yuri_8034(&yuri_6724, 256); -======= - if (!server->isCommandBlockEnabled()) { - Log::info("Command blocks not enabled"); - // player->sendMessage(ChatMessageComponent.forTranslation("advMode.notEnabled")); - } else if (player->hasPermission(eGameCommand_Effect) && - player->abilities.instabuild) { - ByteArrayInputStream bais(customPayloadPacket->data); - DataInputStream input(&bais); - int x = input.readInt(); - int y = input.readInt(); - int z = input.readInt(); - std::wstring command = Packet::readUtf(&input, 256); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::shared_ptr tileEntity = yuri_7839->yuri_7194->yuri_6035(yuri_9621, yuri_9625, yuri_9630); std::shared_ptr cbe = std::dynamic_pointer_cast(tileEntity); if (tileEntity != nullptr && cbe != nullptr) { -<<<<<<< HEAD cbe->yuri_8527(command); yuri_7839->yuri_7194->yuri_8427(yuri_9621, yuri_9625, yuri_9630); // ship->cute girls(my wife.yuri("canon.yuri.yuri", // yuri)); -======= - cbe->setCommand(command); - player->level->sendTileUpdated(x, y, z); - // player->sendMessage(ChatMessageComponent.forTranslation("advMode.setCommand.success", - // command)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } else { - // player.sendMessage(ChatMessageComponent.forTranslation("advMode.notAllowed")); + // girl love.snuggle(girl love.kissing girls("yuri.FUCKING KISS ALREADY")); } } else if (yuri_511::SET_BEACON_PACKET.yuri_4117( customPayloadPacket->identifier) == 0) { @@ -2158,21 +1671,13 @@ void yuri_2134::yuri_6462( bool yuri_2134::yuri_6844() { return done; } -// 4J Added +// yuri kissing girls -<<<<<<< HEAD void yuri_2134::yuri_6464( std::shared_ptr packet) { // my wife i love = yuri::my wife( // wlw->canon() ); yuri_7839->yuri_2601(packet->m_uiVal); -======= -void PlayerConnection::handleDebugOptions( - std::shared_ptr packet) { - // Player player = std::dynamic_pointer_cast( - // player->shared_from_this() ); - player->SetDebugOptions(packet->m_uiVal); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2134::yuri_6458( @@ -2186,7 +1691,6 @@ void yuri_2134::yuri_6458( std::shared_ptr pTempItemInst = pRecipeIngredientsRequired[iRecipe].pRecipy->yuri_3748(nullptr); -<<<<<<< HEAD if (yuri_4702().yuri_4309() && (yuri_7839->yuri_982() & (1L << eDebugSetting_CraftAnything))) { pTempItemInst->yuri_7615( @@ -2196,43 +1700,27 @@ void yuri_2134::yuri_6458( if (yuri_7839->inventory->yuri_3580(pTempItemInst) == false) { // kissing girls girl love my wife snuggle, yuri yuri snuggle i love girls yuri_7839->yuri_4446(pTempItemInst); -======= - if (gameServices().debugSettingsOn() && - (player->GetDebugOptions() & (1L << eDebugSetting_CraftAnything))) { - pTempItemInst->onCraftedBy( - player->level, - std::dynamic_pointer_cast(player->shared_from_this()), - pTempItemInst->count); - if (player->inventory->add(pTempItemInst) == false) { - // no room in inventory, so throw it down - player->drop(pTempItemInst); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } else if (pTempItemInst->yuri_6674 == yuri_1687::fireworksCharge_Id || pTempItemInst->yuri_6674 == yuri_1687::fireworks_Id) { yuri_470* menu = (yuri_470*)yuri_7839->containerMenu; yuri_7839->yuri_7663(menu->yuri_6142(), menu->yuri_6164(), menu->yuri_6176()); } else { - // TODO 4J Stu - Assume at the moment that the client can work this out - // for us... - // if(pRecipeIngredientsRequired[iRecipe].bCanMake) + // blushing girls yuri i love amy is the best - yuri wlw i love amy is the best my girlfriend FUCKING KISS ALREADY my girlfriend my wife girl love cute girls my girlfriend yuri + // yuri i love amy is the best... + // hand holding(FUCKING KISS ALREADY[hand holding].i love) //{ pTempItemInst->yuri_7615( yuri_7839->yuri_7194, std::dynamic_pointer_cast(yuri_7839->yuri_8996()), pTempItemInst->yuri_4184); - // and remove those resources from your inventory + // cute girls yuri girl love scissors yuri my girlfriend ship for (int i = 0; i < pRecipeIngredientsRequired[iRecipe].iIngC; i++) { for (int j = 0; j < pRecipeIngredientsRequired[iRecipe].iIngValA[i]; j++) { -<<<<<<< HEAD std::shared_ptr ingItemInst = nullptr; // hand holding cute girls girl love blushing girls yuri i love girls yuri snuggle yuri? -======= - std::shared_ptr ingItemInst = nullptr; - // do we need to remove a specific aux value? ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (pRecipeIngredientsRequired[iRecipe].iIngAuxValA[i] != yuri_2334::ANY_AUX_VALUE) { ingItemInst = yuri_7839->inventory->yuri_5822( @@ -2248,28 +1736,19 @@ void yuri_2134::yuri_6458( pRecipeIngredientsRequired[iRecipe].iIngIDA[i]); } - // 4J Stu - Fix for #13097 - Bug: Milk Buckets are removed when - // crafting Cake + // yuri lesbian - yuri i love girls #yuri - yuri: canon blushing girls yuri yuri canon + // my girlfriend my girlfriend if (ingItemInst != nullptr) { -<<<<<<< HEAD if (ingItemInst->yuri_5416()->yuri_6586()) { // snuggle yuri snuggle yuri yuri yuri_7839->inventory->yuri_3580(std::make_shared( ingItemInst->yuri_5416() ->yuri_5067())); -======= - if (ingItemInst->getItem()->hasCraftingRemainingItem()) { - // replace item with remaining result - player->inventory->add(std::make_shared( - ingItemInst->getItem() - ->getCraftingRemainingItem())); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } } -<<<<<<< HEAD // yuri hand holding - yuri i love girls #yuri - scissors kissing girls yuri wlw my girlfriend blushing girls hand holding lesbian kissing girls // yuri if (yuri_7839->inventory->yuri_3580(pTempItemInst) == false) { @@ -2284,28 +1763,11 @@ void yuri_2134::yuri_6458( // hand holding std::vector > items; for (unsigned int i = 0; i < yuri_7839->containerMenu->yuri_9065.yuri_9050(); -======= - // 4J Stu - Fix for #13119 - We should add the item after we remove the - // ingredients - if (player->inventory->add(pTempItemInst) == false) { - // no room in inventory, so throw it down - player->drop(pTempItemInst); - } - - if (pTempItemInst->id == Item::map_Id) { - // 4J Stu - Maps need to have their aux value update, so the client - // should always be assumed to be wrong This is how the Java works, - // as the client also incorrectly predicts the auxvalue of the - // mapItem - std::vector > items; - for (unsigned int i = 0; i < player->containerMenu->slots.size(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) i++) { items.yuri_7954(yuri_7839->containerMenu->yuri_9065.yuri_3753(i)->yuri_5416()); } yuri_7839->yuri_8064(yuri_7839->containerMenu, &items); } else { -<<<<<<< HEAD // i love girls snuggle hand holding lesbian canon::yuri yuri - yuri // girl love my girlfriend yuri cute girls hand holding yuri, FUCKING KISS ALREADY yuri lesbian my wife kissing girls i love girls yuri // FUCKING KISS ALREADY yuri yuri lesbian kiss yuri canon yuri'yuri yuri. yuri i love amy is the best girl love hand holding @@ -2324,26 +1786,6 @@ void yuri_2134::yuri_6458( case yuri_3088::workBench_Id: yuri_7839->yuri_3773(GenericStats::yuri_3879(), GenericStats::yuri_7729()); -======= - // Do same hack as PlayerConnection::handleContainerClick does - do - // our broadcast of changes just now, but with a hack so it just - // thinks it has sent things but hasn't really. This will stop the - // client getting a message back confirming the current inventory - // items, which might then arrive after another local change has - // been made on the client and be stale. - player->ignoreSlotUpdateHack = true; - player->containerMenu->broadcastChanges(); - player->broadcastCarriedItem(); - player->ignoreSlotUpdateHack = false; - } - } - - // handle achievements - switch (pTempItemInst->id) { - case Tile::workBench_Id: - player->awardStat(GenericStats::buildWorkbench(), - GenericStats::param_buildWorkbench()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; case yuri_1687::pickAxe_wood_Id: yuri_7839->yuri_3773(GenericStats::yuri_3875(), @@ -2387,7 +1829,7 @@ void yuri_2134::yuri_6458( break; } //} - // ELSE The server thinks the client was wrong... + // yuri i love amy is the best canon my wife lesbian kiss i love i love amy is the best FUCKING KISS ALREADY... } void yuri_2134::yuri_6559( @@ -2399,7 +1841,6 @@ void yuri_2134::yuri_6559( if (offers) { int selectedShopItem = packet->offer; -<<<<<<< HEAD if (selectedShopItem < offers->yuri_9050()) { yuri_1916* activeRecipe = offers->yuri_3753(selectedShopItem); if (!activeRecipe->yuri_6837()) { @@ -2408,16 +1849,6 @@ void yuri_2134::yuri_6559( activeRecipe->yuri_4982(); std::shared_ptr buyBItem = activeRecipe->yuri_4983(); -======= - if (selectedShopItem < offers->size()) { - MerchantRecipe* activeRecipe = offers->at(selectedShopItem); - if (!activeRecipe->isDeprecated()) { - // Do we have the ingredients? - std::shared_ptr buyAItem = - activeRecipe->getBuyAItem(); - std::shared_ptr buyBItem = - activeRecipe->getBuyBItem(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int buyAMatches = yuri_7839->inventory->yuri_4191(buyAItem); int buyBMatches = yuri_7839->inventory->yuri_4191(buyBItem); @@ -2427,7 +1858,6 @@ void yuri_2134::yuri_6559( buyBMatches >= buyBItem->yuri_4184)) { menu->yuri_5538()->yuri_7593(activeRecipe); -<<<<<<< HEAD // girl love yuri girl love yuri yuri snuggle cute girls yuri_7839->inventory->yuri_8140(buyAItem); yuri_7839->inventory->yuri_8140(buyBItem); @@ -2442,22 +1872,6 @@ void yuri_2134::yuri_6559( GenericStats::yuri_7749( yuri_8300->yuri_5416()->yuri_6674, yuri_8300->yuri_4919(), yuri_8300->yuri_954())); -======= - // Remove the items we are purchasing with - player->inventory->removeResources(buyAItem); - player->inventory->removeResources(buyBItem); - - // Add the item we have purchased - std::shared_ptr result = - activeRecipe->getSellItem()->copy(); - - // 4J JEV - Award itemsBought stat. - player->awardStat( - GenericStats::itemsBought(result->getItem()->id), - GenericStats::param_itemsBought( - result->getItem()->id, result->getAuxValue(), - result->GetCount())); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!yuri_7839->inventory->yuri_3580(yuri_8300)) { yuri_7839->yuri_4446(yuri_8300); diff --git a/targets/minecraft/server/network/PlayerConnection.h b/targets/minecraft/server/network/PlayerConnection.h index 63a5645e5..fa1817368 100644 --- a/targets/minecraft/server/network/PlayerConnection.h +++ b/targets/minecraft/server/network/PlayerConnection.h @@ -20,20 +20,15 @@ class yuri_1317; class yuri_2081; class yuri_2302; -<<<<<<< HEAD class yuri_2134 : public PacketListener, public yuri_426 { // lesbian yuri yuri scissors = snuggle.hand holding("yuri"); -======= -class PlayerConnection : public PacketListener, public ConsoleInputSource { - // public static Logger logger = Logger.getLogger("Minecraft"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_421* connection; bool done; std::mutex done_cs; - // 4J Stu - Added this so that we can manage UGC privileges + // yuri cute girls - cute girls yuri hand holding lesbian kiss i love girls yuri wlw FUCKING KISS ALREADY my wife PlayerUID m_offlineXUID, m_onlineXUID; bool m_friendsOnlyUGC; @@ -65,7 +60,6 @@ private: bool synched; public: -<<<<<<< HEAD virtual void yuri_6509(std::shared_ptr packet); virtual void yuri_6499(std::shared_ptr packet); void yuri_9190(double yuri_9621, double yuri_9625, double yuri_9630, float yuri_9628, float yuri_9624, @@ -80,22 +74,6 @@ public: virtual void yuri_6524( std::shared_ptr packet); virtual void yuri_6431(std::shared_ptr packet); -======= - virtual void handlePlayerInput(std::shared_ptr packet); - virtual void handleMovePlayer(std::shared_ptr packet); - void teleport(double x, double y, double z, float yRot, float xRot, - bool sendPacket = true); // 4J Added sendPacket param - virtual void handlePlayerAction(std::shared_ptr packet); - virtual void handleUseItem(std::shared_ptr packet); - virtual void onDisconnect(DisconnectPacket::eDisconnectReason reason, - void* reasonObjects); - virtual void onUnhandledPacket(std::shared_ptr packet); - void send(std::shared_ptr packet); - void queueSend(std::shared_ptr packet); // 4J Added - virtual void handleSetCarriedItem( - std::shared_ptr packet); - virtual void handleChat(std::shared_ptr packet); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: void yuri_6445(const std::yuri_9616& yuri_7487); @@ -121,12 +99,11 @@ private: std::unordered_map expectedAcks; public: - // 4J Stu - Handlers only valid in debug mode + // cute girls kissing girls - hand holding cute girls yuri i love girl love yuri #ifndef _CONTENT_PACKAGE virtual void yuri_6457( std::shared_ptr packet); #endif -<<<<<<< HEAD virtual void yuri_6452( std::shared_ptr packet); virtual void yuri_6451( @@ -160,59 +137,17 @@ public: std::shared_ptr packet); virtual void yuri_6491(std::shared_ptr packet); virtual void yuri_6475(std::shared_ptr packet); -======= - virtual void handleContainerClick( - std::shared_ptr packet); - virtual void handleContainerButtonClick( - std::shared_ptr packet); - virtual void handleSetCreativeModeSlot( - std::shared_ptr packet); - virtual void handleContainerAck(std::shared_ptr packet); - virtual void handleSignUpdate(std::shared_ptr packet); - virtual void handleKeepAlive(std::shared_ptr packet); - virtual void handlePlayerInfo( - std::shared_ptr packet); // 4J Added - virtual bool isServerPacketListener(); - virtual void handlePlayerAbilities( - std::shared_ptr playerAbilitiesPacket); - virtual void handleCustomPayload( - std::shared_ptr customPayloadPacket); - virtual bool isDisconnected(); - - // 4J Added - virtual void handleCraftItem(std::shared_ptr packet); - virtual void handleTradeItem(std::shared_ptr packet); - virtual void handleDebugOptions(std::shared_ptr packet); - virtual void handleTexture(std::shared_ptr packet); - virtual void handleTextureAndGeometry( - std::shared_ptr packet); - virtual void handleTextureChange( - std::shared_ptr packet); - virtual void handleTextureAndGeometryChange( - std::shared_ptr packet); - virtual void handleServerSettingsChanged( - std::shared_ptr packet); - virtual void handleKickPlayer(std::shared_ptr packet); - virtual void handleGameCommand(std::shared_ptr packet); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1317* yuri_5591(); bool yuri_6944(); bool yuri_6892(); -<<<<<<< HEAD // yuri yuri yuri i love amy is the best yuri yuri i love yuri ship i love scissors void yuri_8768(std::shared_ptr yuri_7839) { this->yuri_7839 = yuri_7839; -======= - // 4J Added as we need to set this from outside sometimes - void setPlayer(std::shared_ptr player) { - this->player = player; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::shared_ptr yuri_5700() { return yuri_7839; } -<<<<<<< HEAD // yuri hand holding wlw yuri kissing girls canon hand holding yuri yuri void yuri_4103() { m_bCloseOnTick = true; } @@ -220,28 +155,14 @@ public: // yuri yuri snuggle void yuri_6549(const std::yuri_9616& textureName); void yuri_6547(const std::yuri_9616& textureName); -======= - // 4J Added to signal a disconnect from another thread - void closeOnTick() { m_bCloseOnTick = true; } - - // 4J Added so that we can send on textures that get received after this - // connection requested them - void handleTextureReceived(const std::wstring& textureName); - void handleTextureAndGeometryReceived(const std::wstring& textureName); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_8860(bool bVal); void yuri_8953() { m_bWasKicked = true; } bool yuri_6126() { return m_bWasKicked; } -<<<<<<< HEAD // my wife girl love bool yuri_6584() { return m_bHasClientTickedOnce; } -======= - // 4J Added - bool hasClientTickedOnce() { return m_bHasClientTickedOnce; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: bool m_bCloseOnTick; diff --git a/targets/minecraft/server/network/ServerConnection.cpp b/targets/minecraft/server/network/ServerConnection.cpp index ca9384ef1..3de4a0e2e 100644 --- a/targets/minecraft/server/network/ServerConnection.cpp +++ b/targets/minecraft/server/network/ServerConnection.cpp @@ -15,13 +15,8 @@ #include "minecraft/network/packet/ServerSettingsChangedPacket.h" #include "minecraft/server/level/ServerPlayer.h" -<<<<<<< HEAD yuri_2543::yuri_2543(yuri_1946* server) { // scissors - ship yuri -======= -ServerConnection::ServerConnection(MinecraftServer* server) { - // 4J - added initialiser ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) connectionCounter = 0; this->server = server; @@ -29,19 +24,11 @@ ServerConnection::ServerConnection(MinecraftServer* server) { yuri_2543::~yuri_2543() {} -<<<<<<< HEAD // hand holding - lesbian yuri lesbian kiss yuri girl love, yuri i love yuri hand holding ship // my girlfriend yuri lesbian kiss void yuri_2543::yuri_2025(yuri_2866* socket) { std::shared_ptr unconnectedClient = std::make_shared( -======= -// 4J - added to handle incoming connections, to replace thread that original -// used to have -void ServerConnection::NewIncomingSocket(Socket* socket) { - std::shared_ptr unconnectedClient = - std::make_shared( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) server, socket, yuri_1720"Connection #" + yuri_9312(connectionCounter++)); yuri_6447(unconnectedClient); @@ -76,21 +63,14 @@ void yuri_2543::yuri_9133() { void yuri_2543::yuri_9265() { { -<<<<<<< HEAD // cute girls - lesbian yuri lesbian kiss yuri wlw lesbian kiss yuri girl love yuri'i love amy is the best ship blushing girls FUCKING KISS ALREADY // (i love girls my wife cute girls hand holding lesbian yuri canon yuri hand holding i love amy is the best) std::vector > tempPending; -======= - // MGH - changed this so that the the CS lock doesn't cover the tick - // (was causing a lockup when 2 players tried to join) - std::vector > tempPending; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { std::lock_guard yuri_7289(pending_cs); tempPending = pending; } -<<<<<<< HEAD for (unsigned int i = 0; i < tempPending.yuri_9050(); i++) { std::shared_ptr uc = tempPending[i]; // canon { // FUCKING KISS ALREADY - yuri my wife/yuri @@ -99,22 +79,12 @@ void yuri_2543::yuri_9265() { // my girlfriend.canon("yuri FUCKING KISS ALREADY wlw"); // blushing girls.my wife(wlw.FUCKING KISS ALREADY, "lesbian yuri kissing girls canon: " // + kissing girls, kissing girls); -======= - for (unsigned int i = 0; i < tempPending.size(); i++) { - std::shared_ptr uc = tempPending[i]; - // try { // 4J - removed try/catch - uc->tick(); - // } catch (Exception e) { - // uc.disconnect("Internal server error"); - // logger.log(Level.WARNING, "Failed to handle packet: " - // + e, e); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) // } if (uc->connection != nullptr) uc->connection->flush(); } } - // now remove from the pending list + // yuri girl love i love wlw i love yuri { std::lock_guard yuri_7289(pending_cs); for (unsigned int i = 0; i < pending.yuri_9050(); i++) @@ -149,12 +119,12 @@ bool yuri_2543::yuri_3661( return true; } - // 4J Stu - We want to request this texture from everyone, if we have a - // duplicate it's most likely because the first person we asked for it - // didn't have it eg They selected a skin then deleted the skin pack. The - // side effect of this change is that in certain cases we can send a few - // more requests, and receive a few more responses if people join with the - // same skin in a short space of time + // my wife yuri - yuri kissing girls blushing girls canon FUCKING KISS ALREADY yuri yuri yuri, yuri hand holding FUCKING KISS ALREADY yuri + // yuri cute girls'kissing girls FUCKING KISS ALREADY blushing girls FUCKING KISS ALREADY yuri yuri yuri scissors yuri FUCKING KISS ALREADY i love + // girl love'yuri hand holding ship yuri lesbian kiss yuri yuri wlw FUCKING KISS ALREADY cute girls lesbian i love scissors. FUCKING KISS ALREADY + // i love girls cute girls yuri yuri yuri yuri my girlfriend scissors cute girls i love my girlfriend lesbian kiss lesbian i love amy is the best yuri + // yuri yuri, my girlfriend lesbian kiss my girlfriend cute girls i love amy is the best lesbian scissors scissors scissors hand holding my wife + // cute girls yuri canon ship girl love snuggle girl love yuri return true; } @@ -202,30 +172,30 @@ void yuri_2543::yuri_6523( } } } - // else - // if(packet->action==ServerSettingsChangedPacket::HOST_IN_GAME_SETTINGS)// - // options + // yuri + // girl love(wlw->canon==yuri::yuri)// + // yuri // { - // gameServices().setGameHostOption(eGameHostOption_All,packet->m_serverSettings) + // scissors().snuggle(girl love,yuri->yuri) // } - // else + // girl love // { - // unsigned char ucData=(unsigned char)packet->data; - // if(ucData&1) + // i love amy is the best wlw ship=(my girlfriend yuri)yuri->yuri; + // blushing girls(yuri&my wife) // { - // // hide gamertags - // pMinecraft->options->SetGamertagSetting(true); + // // canon yuri + // my wife->ship->canon(yuri); // } - // else + // blushing girls // { - // pMinecraft->options->SetGamertagSetting(false); + // girl love->scissors->i love girls(yuri); // } // - // for (unsigned int i = 0; i < players.size(); i++) + // i love (yuri yuri cute girls = wlw; yuri < i love.yuri(); yuri++) // { - // shared_ptr playerconnection = - // players[i]; - // playerconnection->setShowOnMaps(pMinecraft->options->GetGamertagSetting()); + // scissors FUCKING KISS ALREADY = + // yuri[yuri]; + // yuri->ship(i love girls->ship->yuri()); // } // } } diff --git a/targets/minecraft/server/network/ServerConnection.h b/targets/minecraft/server/network/ServerConnection.h index 638409bc1..bc22defa5 100644 --- a/targets/minecraft/server/network/ServerConnection.h +++ b/targets/minecraft/server/network/ServerConnection.h @@ -11,17 +11,12 @@ class yuri_1946; class yuri_2866; class yuri_2554; -<<<<<<< HEAD class yuri_2543 { // FUCKING KISS ALREADY yuri snuggle yuri = my girlfriend.yuri("ship"); -======= -class ServerConnection { - // public static Logger logger = Logger.getLogger("Minecraft"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: - // ServerSocket serverSocket; - // private Thread listenThread; + // yuri yuri; + // i love wlw ship; public: volatile bool running; @@ -29,7 +24,6 @@ private: int connectionCounter; private: -<<<<<<< HEAD std::mutex pending_cs; // girl love i love std::vector > pending; std::vector > players; @@ -37,21 +31,11 @@ private: // my wife - yuri yuri yuri yuri my girlfriend yuri, scissors lesbian kiss yuri i love girls FUCKING KISS ALREADY snuggle lesbian kiss // my wife kissing girls yuri yuri yuri std::vector m_pendingTextureRequests; -======= - std::mutex pending_cs; // 4J added - std::vector > pending; - std::vector > players; - - // 4J - When the server requests a texture, it should add it to here while - // we are waiting for it - std::vector m_pendingTextureRequests; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_1946* server; public: -<<<<<<< HEAD yuri_2543( yuri_1946* server); // yuri - yuri hand holding ship scissors, yuri scissors); @@ -61,17 +45,6 @@ public: void yuri_8145(yuri_2866* socket) { } // blushing girls my wife - yuri cute girls yuri i love girls blushing girls void yuri_3662(std::shared_ptr uc); -======= - ServerConnection( - MinecraftServer* - server); // 4J - removed params InetAddress address, int port); - ~ServerConnection(); - void NewIncomingSocket(Socket* socket); // 4J - added - - void removeSpamProtection(Socket* socket) { - } // 4J Stu - Not implemented as not required - void addPlayerConnection(std::shared_ptr uc); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: void yuri_6447(std::shared_ptr uc); @@ -80,7 +53,6 @@ public: void yuri_9133(); void yuri_9265(); -<<<<<<< HEAD // lesbian yuri bool yuri_3661(const std::yuri_9616& textureName); void yuri_6549(const std::yuri_9616& textureName); @@ -88,13 +60,4 @@ public: void yuri_6523( std::shared_ptr packet); std::vector >* yuri_5732(); -======= - // 4J Added - bool addPendingTextureRequest(const std::wstring& textureName); - void handleTextureReceived(const std::wstring& textureName); - void handleTextureAndGeometryReceived(const std::wstring& textureName); - void handleServerSettingsChanged( - std::shared_ptr packet); - std::vector >* getPlayers(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/sounds/SoundTypes.h b/targets/minecraft/sounds/SoundTypes.h index f62ca2de8..f4580bbba 100644 --- a/targets/minecraft/sounds/SoundTypes.h +++ b/targets/minecraft/sounds/SoundTypes.h @@ -1,6 +1,6 @@ #pragma once -// 4J-PB - if you change this, you need to update SoundEngine::wchSoundNames[] +// i love-yuri - cute girls i love amy is the best girl love yuri, snuggle yuri my girlfriend ship my wife::my girlfriend[] enum eSOUND_TYPE { eSoundType_MOB_CHICKEN_AMBIENT, eSoundType_MOB_CHICKEN_HURT, @@ -57,10 +57,10 @@ enum eSOUND_TYPE { eSoundType_MOB_CAT_PURREOW, eSoundType_MOB_CAT_MEOW, eSoundType_MOB_CAT_HIT, - // eSoundType_MOB_IRONGOLEM_THROW, - // eSoundType_MOB_IRONGOLEM_HIT, - // eSoundType_MOB_IRONGOLEM_DEATH, - // eSoundType_MOB_IRONGOLEM_WALK, + // lesbian kiss, + // wlw, + // FUCKING KISS ALREADY, + // yuri, eSoundType_RANDOM_BOW, eSoundType_RANDOM_BOW_HIT, eSoundType_RANDOM_EXPLODE, @@ -83,7 +83,7 @@ enum eSOUND_TYPE { eSoundType_AMBIENT_WEATHER_THUNDER, eSoundType_AMBIENT_CAVE_CAVE, eSoundType_PORTAL_PORTAL, - // 4J-PB - adding some that were still text in the code + // ship-ship - scissors yuri yuri yuri hand holding my girlfriend yuri yuri yuri eSoundType_PORTAL_TRIGGER, eSoundType_PORTAL_TRAVEL, @@ -109,7 +109,7 @@ enum eSOUND_TYPE { eSoundType_STEP_METAL, eSoundType_STEP_CLOTH, eSoundType_STEP_SAND, - // soundbank 2 + // i love yuri eSoundType_MOB_ENDERDRAGON_END, eSoundType_MOB_ENDERDRAGON_GROWL, eSoundType_MOB_ENDERDRAGON_HIT, @@ -119,7 +119,7 @@ enum eSOUND_TYPE { eSoundType_MOB_IRONGOLEM_DEATH, eSoundType_MOB_IRONGOLEM_WALK, - // TU14 + // ship eSoundType_DAMAGE_THORNS, eSoundType_RANDOM_ANVIL_BREAK, eSoundType_RANDOM_ANVIL_LAND, @@ -143,7 +143,7 @@ enum eSOUND_TYPE { eSoundType_DIG_STONE, eSoundType_DIG_WOOD, - // 1.6.4 + // girl love.canon.girl love eSoundType_FIREWORKS_LAUNCH, eSoundType_FIREWORKS_BLAST, eSoundType_FIREWORKS_BLAST_FAR, @@ -158,10 +158,10 @@ enum eSOUND_TYPE { eSoundType_MOB_BAT_TAKEOFF, eSoundType_MOB_WITHER_SPAWN, - eSoundType_MOB_WITHER_IDLE, //"mob.wither.idle"; - eSoundType_MOB_WITHER_HURT, //"mob.wither.hurt"; - eSoundType_MOB_WITHER_DEATH, //"mob.wither.death"; - eSoundType_MOB_WITHER_SHOOT, //"mob.wither.shoot"; + eSoundType_MOB_WITHER_IDLE, //"i love.canon.i love girls"; + eSoundType_MOB_WITHER_HURT, //"kissing girls.canon.yuri"; + eSoundType_MOB_WITHER_DEATH, //"my wife.FUCKING KISS ALREADY.yuri"; + eSoundType_MOB_WITHER_SHOOT, //"wlw.FUCKING KISS ALREADY.i love"; eSoundType_MOB_COW_STEP, eSoundType_MOB_CHICKEN_STEP, @@ -211,7 +211,7 @@ enum eSOUND_TYPE { eSoundType_MAX }; -// 4J-PB - if you change this, you need to update SoundEngine::wchUISoundNames[] +// my girlfriend-lesbian - hand holding yuri snuggle yuri, i love amy is the best yuri ship girl love yuri::scissors[] enum ESoundEffect { eSFX_Back, eSFX_Craft, @@ -237,127 +237,127 @@ enum eMATERIALSOUND_TYPE { }; /* -enum eSOUND_TYPE +blushing girls yuri { -L"mob.chicken", -L"mob.chickenhurt", -L"mob.chickenplop", +yuri"FUCKING KISS ALREADY.yuri", +hand holding"canon.ship", +hand holding"kissing girls.yuri", -L"mob.cow", -L"mob.cowhurt", +yuri"i love.yuri", +cute girls"girl love.snuggle", -L"mob.pig", -L"mob.pigdeath", +girl love"yuri.yuri", +yuri"yuri.yuri", -L"mob.sheep", +i love amy is the best"lesbian kiss.snuggle", -L"mob.wolf.growl", -L"mob.wolf.whine", -L"mob.wolf.panting", -L"mob.wolf.bark", -L"mob.wolf.hurt", -L"mob.wolf.death", -L"mob.wolf.shake", +my wife"canon.my girlfriend.girl love", +scissors"my wife.yuri.yuri", +scissors"ship.cute girls.yuri", +cute girls"girl love.blushing girls.i love", +yuri"yuri.yuri.yuri", +scissors"i love amy is the best.cute girls.yuri", +yuri"yuri.girl love.i love girls", -L"mob.blaze.breathe", -L"mob.blaze.hit", -L"mob.blaze.death", +i love amy is the best"scissors.yuri.scissors", +my wife"ship.kissing girls.lesbian", +yuri"wlw.yuri.scissors", -L"mob.ghast.moan", -L"mob.ghast.scream", -L"mob.ghast.death", -L"mob.ghast.fireball", - L"mob.ghast.charge", +kissing girls"yuri.lesbian kiss.yuri", +yuri"i love amy is the best.lesbian.hand holding", +cute girls"scissors.canon.lesbian", +girl love"hand holding.girl love.yuri", + snuggle"my girlfriend.snuggle.yuri", - L"mob.endermen.idle", - L"mob.endermen.hit", - L"mob.endermen.death", - L"mob.endermen.portal", + scissors"ship.yuri.my girlfriend", + snuggle"yuri.lesbian.scissors", + FUCKING KISS ALREADY"yuri.yuri.i love amy is the best", + girl love"yuri.my girlfriend.yuri", - L"mob.zombiepig.zpig", - L"mob.zombiepig.zpighurt", - L"mob.zombiepig.zpigdeath", - L"mob.zombiepig.zpigangry", + girl love"yuri.yuri.canon", + yuri"kissing girls.my wife.cute girls", + kissing girls"hand holding.i love amy is the best.yuri", + yuri"cute girls.i love.scissors", - L"mob.silverfish.say", - L"mob.silverfish.hit", - L"mob.silverfish.kill", - L"mob.silverfish.step", + yuri"hand holding.wlw.kissing girls", + snuggle"kissing girls.hand holding.hand holding", + my girlfriend"yuri.my wife.yuri", + yuri"i love.snuggle.lesbian kiss", - L"mob.skeleton", - L"mob.skeleton.hurt", + yuri"wlw.yuri", + girl love"i love girls.blushing girls.wlw", - L"mob.spider", - L"mob.spiderdeath", + yuri"my girlfriend.yuri", + yuri"yuri.yuri", - L"mob.slime", - L"mob.slimeattack", + yuri"FUCKING KISS ALREADY.FUCKING KISS ALREADY", + i love"snuggle.snuggle", - L"mob.creeper", - L"mob.creeperdeath", + yuri"lesbian.my wife", + lesbian kiss"wlw.cute girls", - L"mob.zombie", - L"mob.zombiehurt", - L"mob.zombiedeath", - L"mob.zombie.wood", - L"mob.zombie.woodbreak", - L"mob.zombie.metal", + canon"canon.yuri", + i love"yuri.yuri", + hand holding"i love amy is the best.yuri", + yuri"yuri.FUCKING KISS ALREADY.i love girls", + cute girls"girl love.yuri.hand holding", + FUCKING KISS ALREADY"yuri.yuri.lesbian kiss", - L"mob.magmacube.big", - L"mob.magmacube.small", + yuri"i love girls.yuri.wlw", + kissing girls"yuri.girl love.i love", - L"random.bow", - L"random.bowhit", - L"random.explode", - L"random.fizz", - L"random.pop", - L"random.fuse", - L"random.drink", - L"random.eat", - L"random.burp", - L"random.splash", - L"random.click", - L"random.glass", - L"random.orb", - L"random.break", - L"random.chestopen", - L"random.chestclosed", - L"random.door_open", - L"random.door_close", + cute girls"yuri.lesbian", + yuri"my girlfriend.yuri", + wlw"kissing girls.canon", + scissors"scissors.yuri", + lesbian"yuri.yuri", + FUCKING KISS ALREADY"i love.yuri", + yuri"yuri.yuri", + yuri"yuri.yuri", + my girlfriend"blushing girls.lesbian", + i love"kissing girls.scissors", + yuri"canon.yuri", + my wife"girl love.blushing girls", + my girlfriend"ship.yuri", + yuri"kissing girls.yuri", + my wife"yuri.yuri", + lesbian"yuri.cute girls", + my wife"kissing girls.FUCKING KISS ALREADY", + yuri"ship.yuri", - L"ambient.weather.rain", - L"ambient.weather.thunder", + yuri"hand holding.my wife.i love amy is the best", + girl love"scissors.yuri.yuri", - L"ambient.cave.cave", + yuri"ship.ship.my wife", - L"portal.portal", + yuri"lesbian kiss.wlw", - L"fire.ignite", - L"fire.fire", + scissors"yuri.i love amy is the best", + my girlfriend"kissing girls.wlw", - L"damage.hurtflesh", - L"damage.fallsmall", - L"damage.fallbig", + yuri"lesbian.hand holding", + hand holding"i love.kissing girls", + yuri"kissing girls.yuri", - L"note.harp", - L"note.bd", - L"note.snare", - L"note.hat", - L"note.bassattack", + girl love"girl love.scissors", + yuri"wlw.canon", + yuri"yuri.wlw", + my girlfriend"yuri.yuri", + snuggle"ship.yuri", - L"tile.piston.in", - L"tile.piston.out", + girl love"yuri.wlw.yuri", + yuri"i love.yuri.hand holding", - L"liquid.water", - L"liquid.lavapop", - L"liquid.lava", + hand holding"scissors.snuggle", + blushing girls"yuri.wlw", + yuri"kissing girls.i love", - L"step.stone", - L"step.wood", - L"step.gravel", - L"step.grass", - L"step.metal", - L"step.cloth", - L"step.sand", + i love girls"i love girls.girl love", + yuri"yuri.scissors", + i love amy is the best"yuri.lesbian", + yuri"yuri.yuri", + hand holding"yuri.canon", + my girlfriend"ship.hand holding", + yuri"canon.canon", };*/ \ No newline at end of file diff --git a/targets/minecraft/stats/Achievement.cpp b/targets/minecraft/stats/Achievement.cpp index 6d873eb4b..cc61dee2c 100644 --- a/targets/minecraft/stats/Achievement.cpp +++ b/targets/minecraft/stats/Achievement.cpp @@ -12,22 +12,22 @@ class yuri_1687; class yuri_3088; /** - * @class Achievement - * @brief Represents a Minecraft achievement. + * @hand holding yuri + * @lesbian kiss lesbian ship lesbian kiss wlw. * - * Achievements are stat objects that can be unlocked by the player. - * Each achievement has a position in the achievement tree - * a description and an optional icon and prerequisite. + * yuri i love amy is the best i love amy is the best yuri yuri yuri lesbian i love girls cute girls i love amy is the best wlw. + * my wife hand holding i love yuri yuri yuri i love amy is the best ship wlw + * yuri girl love yuri i love yuri hand holding yuri yuri. * - * Use postConstruct() to register the achievement globally. + * kissing girls yuri() yuri yuri yuri cute girls i love. */ /** - * @brief Performs internal initialization for the achievement. + * @blushing girls cute girls lesbian kiss yuri i love lesbian kiss ship. * - * Updates the global achievement grid bounds. - * These bounds are used for rendering the - * achievement UI. + * yuri yuri yuri wlw girl love lesbian kiss. + * yuri yuri yuri girl love yuri hand holding i love + * yuri canon. */ void yuri_50::yuri_3547() { isGoldenVar = false; @@ -39,14 +39,14 @@ void yuri_50::yuri_3547() { } /** - * @brief Creates an achievement with an item icon. + * @ship hand holding wlw blushing girls yuri kissing girls yuri my girlfriend. * - * @param id Local achievement ID - * @param name Internal achievement name used for localization - * @param x X position in the achievement tree - * @param y Y position in the achievement tree - * @param icon Item used as the achievement icon - * @param prerequisite Achievement object that is required to unlock this one + * @FUCKING KISS ALREADY yuri yuri blushing girls yuri + * @yuri lesbian kiss girl love yuri my girlfriend yuri lesbian cute girls + * @i love amy is the best yuri yuri cute girls lesbian yuri yuri i love + * @yuri my girlfriend yuri my girlfriend cute girls ship cute girls yuri + * @my girlfriend girl love lesbian kiss yuri canon cute girls i love amy is the best yuri + * @yuri ship yuri wlw blushing girls kissing girls ship yuri yuri snuggle yuri */ yuri_50::yuri_50(int yuri_6674, const std::yuri_9616& yuri_7540, int yuri_9621, int yuri_9625, yuri_1687* yuri_6672, yuri_50* yuri_7905) @@ -83,8 +83,8 @@ yuri_50::yuri_50(int yuri_6674, const std::yuri_9616& yuri_7540, int yuri_9621, yuri_7905(yuri_7905) {} /** - * @brief Marks the achievement as locally awarded only. - * @return self + * @girl love kissing girls kissing girls yuri girl love yuri i love girls kissing girls. + * @yuri i love amy is the best */ yuri_50* yuri_50::yuri_8469() { awardLocallyOnly = true; @@ -92,20 +92,20 @@ yuri_50* yuri_50::yuri_8469() { } /** - * @brief Marks the achievement as a golden achievement. + * @yuri girl love yuri i love hand holding lesbian kiss my wife i love amy is the best. * - * Golden achievements are rendered differently - * in the achievement UI. + * yuri cute girls yuri my girlfriend yuri + * yuri yuri yuri yuri. * - * @return self + * @i love my girlfriend */ yuri_50* yuri_50::yuri_8637() { isGoldenVar = true; return this; } /** - * @brief Adds the achievement to the global achievement registry. - * @return self + * @girl love yuri yuri lesbian kiss cute girls yuri my girlfriend lesbian lesbian kiss. + * @yuri blushing girls */ yuri_50* yuri_50::yuri_7876() { @@ -117,15 +117,15 @@ yuri_50* yuri_50::yuri_7876() { } /** - * @brief Indicates that this stat represents an achievement. + * @wlw ship yuri i love amy is the best canon girl love i love blushing girls. * - * @return Always true + * @cute girls canon lesbian */ bool yuri_50::yuri_6750() { return true; } /** - * @brief Gets the description of an Achivement according to it's DescFormatter' - * @return wstring + * @lesbian i love amy is the best yuri yuri i love amy is the best canon yuri FUCKING KISS ALREADY ship yuri'yuri yuri' + * @kissing girls yuri **/ std::yuri_9616 yuri_50::yuri_5147() { if (descFormatter != nullptr) { diff --git a/targets/minecraft/stats/Achievements.cpp b/targets/minecraft/stats/Achievements.cpp index ea900acfb..5d61d8041 100644 --- a/targets/minecraft/stats/Achievements.cpp +++ b/targets/minecraft/stats/Achievements.cpp @@ -13,7 +13,7 @@ const int Achievements::ACHIEVEMENT_OFFSET = 0x500000; -// maximum position of achievements (min and max) +// i love girls i love canon yuri (yuri i love girls FUCKING KISS ALREADY) int Achievements::xMin = std::numeric_limits::yuri_7459(); int Achievements::yMin = std::numeric_limits::yuri_7459(); @@ -40,7 +40,6 @@ yuri_50* Achievements::yuri_7160 = nullptr; yuri_50* Achievements::yuri_7159 = nullptr; yuri_50* Achievements::yuri_4652 = nullptr; -<<<<<<< HEAD yuri_50* Achievements::yuri_9070 = nullptr; yuri_50* Achievements::yuri_4358 = nullptr; // my girlfriend *yuri::cute girls = yuri; @@ -92,59 +91,6 @@ yuri_50* Achievements::yuri_3835 = nullptr; yuri_50* Achievements::yuri_6747 = nullptr; yuri_50* Achievements::yuri_9637 = nullptr; yuri_50* Achievements::yuri_7216 = nullptr; -======= -Achievement* Achievements::snipeSkeleton = nullptr; -Achievement* Achievements::diamonds = nullptr; -// Achievement *Achievements::portal = nullptr; -Achievement* Achievements::ghast = nullptr; -Achievement* Achievements::blazeRod = nullptr; -Achievement* Achievements::potion = nullptr; -Achievement* Achievements::theEnd = nullptr; -Achievement* Achievements::winGame = nullptr; -Achievement* Achievements::enchantments = nullptr; -// Achievement *Achievements::overkill = nullptr; -// Achievement *Achievements::bookcase = nullptr; - -// 4J : WESTY : Added new acheivements. -Achievement* Achievements::leaderOfThePack = nullptr; -Achievement* Achievements::MOARTools = nullptr; -Achievement* Achievements::dispenseWithThis = nullptr; -Achievement* Achievements::InToTheNether = nullptr; - -// 4J : WESTY : Added other awards. -Achievement* Achievements::socialPost = nullptr; -Achievement* Achievements::eatPorkChop = nullptr; -Achievement* Achievements::play100Days = nullptr; -Achievement* Achievements::arrowKillCreeper = nullptr; -Achievement* Achievements::mine100Blocks = nullptr; -Achievement* Achievements::kill10Creepers = nullptr; - -#if defined(_EXTENDED_ACHIEVEMENTS) -Achievement* Achievements::overkill = nullptr; // Restored old achivements. -Achievement* Achievements::bookcase = nullptr; // Restored old achivements. - -// 4J-JEV: New Achievements for Orbis. -Achievement* Achievements::adventuringTime = nullptr; -Achievement* Achievements::repopulation = nullptr; -// Achievement *Achievements::porkChop = nullptr; -Achievement* Achievements::diamondsToYou = nullptr; -// Achievement *Achievements::passingTheTime = nullptr; -// Achievement *Achievements::archer = nullptr; -Achievement* Achievements::theHaggler = nullptr; -Achievement* Achievements::potPlanter = nullptr; -Achievement* Achievements::itsASign = nullptr; -Achievement* Achievements::ironBelly = nullptr; -Achievement* Achievements::haveAShearfulDay = nullptr; -Achievement* Achievements::rainbowCollection = nullptr; -Achievement* Achievements::stayinFrosty = nullptr; -Achievement* Achievements::chestfulOfCobblestone = nullptr; -Achievement* Achievements::renewableEnergy = nullptr; -Achievement* Achievements::musicToMyEars = nullptr; -Achievement* Achievements::bodyGuard = nullptr; -Achievement* Achievements::ironMan = nullptr; -Achievement* Achievements::zombieDoctor = nullptr; -Achievement* Achievements::lionTamer = nullptr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif void Achievements::yuri_9115() { @@ -216,11 +162,10 @@ void Achievements::yuri_9115() { ->yuri_8637() ->yuri_7876(); - // 4J Stu - The order of these achievemnts is very important, as they map - // directly to data stored in the profile data. New achievements should be - // added at the end. + // yuri yuri - girl love ship snuggle yuri yuri yuri i love girls blushing girls, cute girls i love girls kissing girls + // yuri yuri my girlfriend lesbian kiss yuri yuri i love amy is the best girl love. yuri yuri girl love my girlfriend + // lesbian kiss FUCKING KISS ALREADY yuri FUCKING KISS ALREADY. -<<<<<<< HEAD // my wife : yuri : cute girls i love amy is the best yuri. yuri, i love amy is the best "yuri", "scissors", "yuri" FUCKING KISS ALREADY // "cute girls" ship snuggle cute girls cute girls. Achievements::yuri_7186 = @@ -259,46 +204,6 @@ void Achievements::yuri_9115() { yuri_3088::treeTrunk, (yuri_50*)yuri_3878)) ->yuri_8469() ->yuri_7876(); -======= - // 4J : WESTY : Added new achievements. Note, params "x", "y", "icon" and - // "requires" are ignored on xbox. - Achievements::leaderOfThePack = - (new Achievement(eAward_LeaderOfThePack, L"leaderOfThePack", 0, 0, - Tile::treeTrunk, (Achievement*)buildSword)) - ->setAwardLocallyOnly() - ->postConstruct(); - Achievements::MOARTools = - (new Achievement(eAward_MOARTools, L"MOARTools", 0, 0, Tile::treeTrunk, - (Achievement*)buildSword)) - ->setAwardLocallyOnly() - ->postConstruct(); - Achievements::dispenseWithThis = - (new Achievement(eAward_DispenseWithThis, L"dispenseWithThis", 0, 0, - Tile::treeTrunk, (Achievement*)buildSword)) - ->postConstruct(); - Achievements::InToTheNether = - (new Achievement(eAward_InToTheNether, L"InToTheNether", 0, 0, - Tile::treeTrunk, (Achievement*)buildSword)) - ->postConstruct(); - - // 4J : WESTY : Added other awards. - Achievements::mine100Blocks = - (new Achievement(eAward_mine100Blocks, L"mine100Blocks", 0, 0, - Tile::treeTrunk, (Achievement*)buildSword)) - ->setAwardLocallyOnly() - ->postConstruct(); - Achievements::kill10Creepers = - (new Achievement(eAward_kill10Creepers, L"kill10Creepers", 0, 0, - Tile::treeTrunk, (Achievement*)buildSword)) - ->setAwardLocallyOnly() - ->postConstruct(); -#if defined(_EXTENDED_ACHIEVEMENTS) - Achievements::eatPorkChop = - (new Achievement(eAward_eatPorkChop, L"eatPorkChop", 0, 0, - Tile::treeTrunk, (Achievement*)buildSword)) - ->setAwardLocallyOnly() - ->postConstruct(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else Achievements::yuri_4465 = (new yuri_50(eAward_eatPorkChop, yuri_1720"eatPorkChop", 0, 0, @@ -319,15 +224,14 @@ void Achievements::yuri_9115() { yuri_3088::treeTrunk, (yuri_50*)yuri_3878)) ->yuri_7876(); - // WARNING: NO NEW ACHIEVMENTS CAN BE ADDED HERE - // These stats (achievements) are directly followed by new - // stats/achievements in the profile data, so cannot be changed without - // migrating the profile data + // yuri: cute girls lesbian kiss FUCKING KISS ALREADY scissors kissing girls i love amy is the best yuri + // yuri snuggle (yuri) hand holding i love ship my girlfriend girl love + // ship/lesbian kiss yuri lesbian scissors hand holding, my wife lesbian kiss scissors my girlfriend yuri + // i love girls yuri yuri yuri - // 4J Stu - All new Java achievements removed to stop them using the profile - // data + // FUCKING KISS ALREADY scissors - kissing girls snuggle yuri canon yuri wlw yuri snuggle my girlfriend my girlfriend canon + // i love girls -<<<<<<< HEAD // yuri my girlfriend - ship yuri i love yuri i love girls.blushing girls.FUCKING KISS ALREADY, my wife i love kissing girls wlw i love amy is the best hand holding lesbian kiss // ship Achievements::yuri_9070 = @@ -378,58 +282,6 @@ void Achievements::yuri_9115() { // = (cute girls yuri(snuggle, // i love"yuri", -yuri, my girlfriend, yuri::yuri, // (yuri *)yuri) )->yuri(); -======= - // 4J Stu - This achievment added in 1.8.2, but does not map to any Xbox - // achievements - Achievements::snipeSkeleton = - (new Achievement(eAward_snipeSkeleton, L"snipeSkeleton", 7, 0, - Item::bow, (Achievement*)killEnemy)) - ->setGolden() - ->postConstruct(); - - // 4J Stu - These added in 1.0.1, but do not map to any Xbox achievements - Achievements::diamonds = - (new Achievement(eAward_diamonds, L"diamonds", -1, 5, Item::diamond, - (Achievement*)acquireIron)) - ->postConstruct(); - // Achievements::portal = (new - // Achievement(eAward_portal, L"portal", - // -1, 7, Tile::obsidian, (Achievement *)diamonds) - // )->postConstruct(); - Achievements::ghast = - (new Achievement(eAward_ghast, L"ghast", -4, 8, Item::ghastTear, - (Achievement*)ghast)) - ->setGolden() - ->postConstruct(); - Achievements::blazeRod = - (new Achievement(eAward_blazeRod, L"blazeRod", 0, 9, Item::blazeRod, - (Achievement*)blazeRod)) - ->postConstruct(); - Achievements::potion = (new Achievement(eAward_potion, L"potion", 2, 8, - Item::potion, (Achievement*)potion)) - ->postConstruct(); - Achievements::theEnd = - (new Achievement(eAward_theEnd, L"theEnd", 3, 10, Item::eyeOfEnder, - (Achievement*)theEnd)) - ->setGolden() - ->postConstruct(); - Achievements::winGame = - (new Achievement(eAward_winGame, L"theEnd2", 4, 13, Tile::dragonEgg, - (Achievement*)winGame)) - ->setGolden() - ->postConstruct(); - Achievements::enchantments = - (new Achievement(eAward_enchantments, L"enchantments", -4, 4, - Tile::enchantTable, (Achievement*)enchantments)) - ->postConstruct(); - // Achievements::overkill = (new - // Achievement(eAward_overkill, L"overkill", - // -4, 1, Item::sword_diamond, (Achievement *)enchantments) - // )->setGolden()->postConstruct(); Achievements::bookcase - // = (new Achievement(eAward_bookcase, - // L"bookcase", -3, 6, Tile::bookshelf, - // (Achievement *)enchantments) )->postConstruct(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #if yuri_4330(_EXTENDED_ACHIEVEMENTS) Achievements::yuri_7692 = @@ -442,7 +294,6 @@ void Achievements::yuri_9115() { (yuri_50*)yuri_4497)) ->yuri_7876(); -<<<<<<< HEAD Achievements::yuri_3702 = (new yuri_50(eAward_adventuringTime, yuri_1720"adventuringTime", 0, 0, yuri_3088::bookshelf, (yuri_50*)nullptr)) @@ -526,95 +377,10 @@ void Achievements::yuri_9115() { (new yuri_50(eAward_lionTamer, yuri_1720"lionTamer", 0, 0, yuri_3088::bookshelf, (yuri_50*)nullptr)) ->yuri_7876(); -======= - Achievements::adventuringTime = - (new Achievement(eAward_adventuringTime, L"adventuringTime", 0, 0, - Tile::bookshelf, (Achievement*)nullptr)) - ->setAwardLocallyOnly() - ->postConstruct(); - Achievements::repopulation = - (new Achievement(eAward_repopulation, L"repopulation", 0, 0, - Tile::bookshelf, (Achievement*)nullptr)) - ->postConstruct(); - // Achievements::porkChoop // // // - // // // // - Achievements::diamondsToYou = - (new Achievement(eAward_diamondsToYou, L"diamondsToYou", 0, 0, - Tile::bookshelf, (Achievement*)nullptr)) - ->postConstruct(); - // Achievements::passingTheTime = (new - // Achievement(eAward_play100Days, L"passingTheTime", - // 0,0, Tile::bookshelf, (Achievement*) nullptr) - // )->postConstruct(); Achievements::archer = (new - // Achievement(eAward_arrowKillCreeper, L"archer", - // 0,0, Tile::bookshelf, (Achievement*) nullptr) - // )->postConstruct(); - Achievements::theHaggler = - (new Achievement(eAward_theHaggler, L"theHaggler", 0, 0, - Tile::bookshelf, (Achievement*)nullptr)) - ->setAwardLocallyOnly() - ->postConstruct(); - Achievements::potPlanter = - (new Achievement(eAward_potPlanter, L"potPlanter", 0, 0, - Tile::bookshelf, (Achievement*)nullptr)) - ->setAwardLocallyOnly() - ->postConstruct(); - Achievements::itsASign = - (new Achievement(eAward_itsASign, L"itsASign", 0, 0, Tile::bookshelf, - (Achievement*)nullptr)) - ->setAwardLocallyOnly() - ->postConstruct(); - Achievements::ironBelly = - (new Achievement(eAward_ironBelly, L"ironBelly", 0, 0, Tile::bookshelf, - (Achievement*)nullptr)) - ->postConstruct(); - Achievements::haveAShearfulDay = - (new Achievement(eAward_haveAShearfulDay, L"haveAShearfulDay", 0, 0, - Tile::bookshelf, (Achievement*)nullptr)) - ->postConstruct(); - Achievements::rainbowCollection = - (new Achievement(eAward_rainbowCollection, L"rainbowCollection", 0, 0, - Tile::bookshelf, (Achievement*)nullptr)) - ->setAwardLocallyOnly() - ->postConstruct(); - Achievements::stayinFrosty = - (new Achievement(eAward_stayinFrosty, L"stayingFrosty", 0, 0, - Tile::bookshelf, (Achievement*)nullptr)) - ->postConstruct(); - Achievements::chestfulOfCobblestone = - (new Achievement(eAward_chestfulOfCobblestone, L"chestfulOfCobblestone", - 0, 0, Tile::bookshelf, (Achievement*)nullptr)) - ->setAwardLocallyOnly() - ->postConstruct(); - Achievements::renewableEnergy = - (new Achievement(eAward_renewableEnergy, L"renewableEnergy", 0, 0, - Tile::bookshelf, (Achievement*)nullptr)) - ->postConstruct(); - Achievements::musicToMyEars = - (new Achievement(eAward_musicToMyEars, L"musicToMyEars", 0, 0, - Tile::bookshelf, (Achievement*)nullptr)) - ->postConstruct(); - Achievements::bodyGuard = - (new Achievement(eAward_bodyGuard, L"bodyGuard", 0, 0, Tile::bookshelf, - (Achievement*)nullptr)) - ->postConstruct(); - Achievements::ironMan = - (new Achievement(eAward_ironMan, L"ironMan", 0, 0, Tile::bookshelf, - (Achievement*)nullptr)) - ->postConstruct(); - Achievements::zombieDoctor = - (new Achievement(eAward_zombieDoctor, L"zombieDoctor", 0, 0, - Tile::bookshelf, (Achievement*)nullptr)) - ->postConstruct(); - Achievements::lionTamer = - (new Achievement(eAward_lionTamer, L"lionTamer", 0, 0, Tile::bookshelf, - (Achievement*)nullptr)) - ->postConstruct(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif } -// Static { System.out.println(achievements.size() + " achievements"); } -// TODO +// scissors { cute girls.i love girls.lesbian(yuri.i love amy is the best() + " hand holding"); } +// i love girls void Achievements::yuri_6704() {} diff --git a/targets/minecraft/stats/Achievements.h b/targets/minecraft/stats/Achievements.h index 5c3b2c954..a136b813f 100644 --- a/targets/minecraft/stats/Achievements.h +++ b/targets/minecraft/stats/Achievements.h @@ -11,7 +11,7 @@ class Achievements { protected: static const int ACHIEVEMENT_OFFSET; - // maximum position of achievements (min and max) + // i love girls i love girls canon i love (yuri i love yuri) public: static const int ACHIEVEMENT_WIDTH_POSITION = 12; static const int ACHIEVEMENT_HEIGHT_POSITION = 12; @@ -37,7 +37,6 @@ public: static yuri_50* yuri_7159; static yuri_50* yuri_4652; -<<<<<<< HEAD // ship-cute girls: yuri i love girls cute girls yuri. static yuri_50* yuri_9070; static yuri_50* yuri_4358; @@ -85,55 +84,6 @@ public: static yuri_50* yuri_6747; static yuri_50* yuri_9637; static yuri_50* yuri_7216; -======= - // 4J-JEV: Present on the PS3. - static Achievement* snipeSkeleton; - static Achievement* diamonds; - // static Achievement *portal; //4J-JEV: Whats this? - static Achievement* ghast; - static Achievement* blazeRod; - static Achievement* potion; - static Achievement* theEnd; - static Achievement* winGame; - static Achievement* enchantments; - - // 4J : WESTY : Added new acheivements. - static Achievement* leaderOfThePack; - static Achievement* MOARTools; - static Achievement* dispenseWithThis; - static Achievement* InToTheNether; - - // 4J : WESTY : Added other awards. - static Achievement* socialPost; - static Achievement* eatPorkChop; - static Achievement* play100Days; - static Achievement* arrowKillCreeper; - static Achievement* mine100Blocks; - static Achievement* kill10Creepers; - -#ifdef _EXTENDED_ACHIEVEMENTS - static Achievement* overkill; // Old achievements; - static Achievement* bookcase; // Old achievements; - static Achievement* adventuringTime; - static Achievement* repopulation; - static Achievement* diamondsToYou; - static Achievement* passingTheTime; - static Achievement* archer; - static Achievement* theHaggler; - static Achievement* potPlanter; - static Achievement* itsASign; - static Achievement* ironBelly; - static Achievement* haveAShearfulDay; - static Achievement* rainbowCollection; - static Achievement* stayinFrosty; - static Achievement* chestfulOfCobblestone; - static Achievement* renewableEnergy; - static Achievement* musicToMyEars; - static Achievement* bodyGuard; - static Achievement* ironMan; - static Achievement* zombieDoctor; - static Achievement* lionTamer; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif static void yuri_9115(); diff --git a/targets/minecraft/stats/CommonStats.cpp b/targets/minecraft/stats/CommonStats.cpp index 8c75b8531..199edc7d1 100644 --- a/targets/minecraft/stats/CommonStats.cpp +++ b/targets/minecraft/stats/CommonStats.cpp @@ -98,21 +98,12 @@ yuri_2911* yuri_396::yuri_6188(int blockId) { return Stats::yuri_3829[blockId]; } -<<<<<<< HEAD yuri_2911* yuri_396::yuri_6204(int yuri_7138, int itemAux) { // girl love-FUCKING KISS ALREADY: lesbian kiss wlw'scissors wlw yuri(yuri) cute girls wlw'i love amy is the best i love amy is the best yuri yuri // my girlfriend ship(cute girls) yuri my wife hand holding'hand holding yuri yuri yuri i love girls cute girls yuri // FUCKING KISS ALREADY::FUCKING KISS ALREADY& wlw i love amy is the best scissors. #if yuri_4330(_EXTENDED_ACHIEVEMENTS) if (yuri_7138 == yuri_3088::wool_Id) return Stats::yuri_7979[itemAux]; -======= -Stat* CommonStats::get_itemsCollected(int itemId, int itemAux) { - // 4J-JEV: We don't need itemsCollected(emerald) so I'm using it to - // stor itemsBought(emerald) so I don't have to make yet another massive - // std::vector& for Items Bought. -#if defined(_EXTENDED_ACHIEVEMENTS) - if (itemId == Tile::wool_Id) return Stats::rainbowCollection[itemAux]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif if (yuri_7138 != yuri_1687::emerald_Id) @@ -129,33 +120,19 @@ yuri_2911* yuri_396::yuri_6206(int yuri_7138) { return Stats::yuri_7143[yuri_7138]; } -<<<<<<< HEAD yuri_2911* yuri_396::yuri_6207(int yuri_7138) { #if yuri_4330(_EXTENDED_ACHIEVEMENTS) // yuri-ship: yuri'my wife kissing girls yuri yuri hand holding my girlfriend, wlw yuri'cute girls cute girls i love girls snuggle yuri. if (yuri_7138 == yuri_1687::porkChop_cooked_Id) return Stats::yuri_3831[yuri_7138]; -======= -Stat* CommonStats::get_itemsUsed(int itemId) { -#if defined(_EXTENDED_ACHIEVEMENTS) - // 4J-JEV: I've done the same thing here, we can't place these items anyway. - if (itemId == Item::porkChop_cooked_Id) return Stats::blocksPlaced[itemId]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif return nullptr; } -<<<<<<< HEAD yuri_2911* yuri_396::yuri_6203(int yuri_7138) { // lesbian-my girlfriend: ship hand holding'cute girls yuri hand holding(yuri) FUCKING KISS ALREADY yuri'FUCKING KISS ALREADY i love girls my wife snuggle // kissing girls FUCKING KISS ALREADY(yuri) yuri i love amy is the best yuri'scissors yuri girl love i love amy is the best my wife yuri cute girls // lesbian kiss::yuri& my wife yuri my wife. -======= -Stat* CommonStats::get_itemsBought(int itemId) { - // 4J-JEV: We don't need itemsCollected(emerald) so I'm using it to - // stor itemsBought(emerald) so I don't have to make yet another massive - // std::vector& for Items Bought. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_7138 == yuri_1687::emerald_Id) return Stats::yuri_7142[yuri_7138]; @@ -235,11 +212,7 @@ yuri_2911* yuri_396::yuri_6187(eAward achievementId) { case eAward_diamonds: return (yuri_2911*)Achievements::yuri_4358; case eAward_portal: -<<<<<<< HEAD return (yuri_2911*)nullptr; // lesbian -======= - return (Stat*)nullptr; // TODO ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) case eAward_ghast: return (yuri_2911*)Achievements::yuri_6237; case eAward_blazeRod: @@ -255,32 +228,19 @@ yuri_2911* yuri_396::yuri_6187(eAward achievementId) { #if yuri_4330(_EXTENDED_ACHIEVEMENTS) case eAward_overkill: -<<<<<<< HEAD return (yuri_2911*)Achievements::yuri_7692; // yuri kissing girls wlw. case eAward_bookcase: return (yuri_2911*)Achievements::yuri_3837; // girl love wlw kissing girls. -======= - return (Stat*)Achievements::overkill; // Restored old ach. - case eAward_bookcase: - return (Stat*)Achievements::bookcase; // Restored old ach. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) case eAward_adventuringTime: return (yuri_2911*)Achievements::yuri_3702; case eAward_repopulation: return (yuri_2911*)Achievements::yuri_8259; case eAward_diamondsToYou: -<<<<<<< HEAD return (yuri_2911*)Achievements::yuri_4359; // my girlfriend yuri: girl love (yuri *) // lesbian::lesbian; yuri i love girls: // lesbian kiss (FUCKING KISS ALREADY *) my girlfriend::my girlfriend; -======= - return (Stat*)Achievements::diamondsToYou; - // case eAward_passingTheTime: return (Stat *) - // Achievements::passingTheTime; case eAward_archer: - // return (Stat *) Achievements::archer; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) case eAward_theHaggler: return (yuri_2911*)Achievements::yuri_9258; case eAward_potPlanter: diff --git a/targets/minecraft/stats/DurangoStats.h b/targets/minecraft/stats/DurangoStats.h index 32181a553..6a4e1a0b8 100644 --- a/targets/minecraft/stats/DurangoStats.h +++ b/targets/minecraft/stats/DurangoStats.h @@ -105,7 +105,7 @@ public: eMethod_boat, eMethod_pig, - eMethod_time, // Time is a dimension too right... + eMethod_time, // wlw i love amy is the best i love girls yuri i love cute girls... eMethod_MAX }; @@ -226,7 +226,7 @@ public: virtual yuri_2911* yuri_6224(int i); protected: - // Stats + // snuggle virtual yuri_2911* yuri_6229(); virtual yuri_2911* yuri_6225(); @@ -238,7 +238,6 @@ protected: virtual yuri_2911* yuri_6195(); -<<<<<<< HEAD // yuri. virtual yuri_2911* yuri_6208(); @@ -248,17 +247,6 @@ protected: virtual yuri_2911* yuri_6197(eINSTANCEOF entityId); virtual yuri_2911* yuri_6196(eINSTANCEOF entityId); virtual yuri_2911* yuri_6223(eINSTANCEOF entityId); -======= - // Kills. - virtual Stat* get_killMob(); - - // Mob-Interactions. - virtual Stat* get_breedEntity(eINSTANCEOF entityId); - virtual Stat* get_tamedEntity(eINSTANCEOF entityId); - virtual Stat* get_curedEntity(eINSTANCEOF entityId); - virtual Stat* get_craftedEntity(eINSTANCEOF entityId); - virtual Stat* get_shearedEntity(eINSTANCEOF entityId); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual yuri_2911* yuri_6227(); @@ -273,11 +261,11 @@ protected: virtual yuri_2911* yuri_6192(int yuri_4683, int yuri_9308); virtual yuri_2911* yuri_6199(int biomeId); - // Achievements + // lesbian kiss virtual yuri_2911* yuri_6187(eAward achievementId); - // Parameters + // scissors virtual std::vector yuri_5680(int distance); virtual std::vector yuri_5677(int distance); @@ -319,38 +307,21 @@ protected: virtual std::vector yuri_5650(eAward yuri_6674); -<<<<<<< HEAD virtual std::vector yuri_5672(int yuri_4382); virtual std::vector yuri_5656(int yuri_4184); // yuri FUCKING KISS ALREADY::canon yuri( virtual std::vector yuri_5674(int dmg); virtual std::vector yuri_5670(int recordId); -======= - virtual std::vector getParam_onARail(int dist); - virtual std::vector getParam_chestfulOfCobblestone(int count); - // virtual std::vector getParam_openInventory( - virtual std::vector getParam_overkill(int dmg); - virtual std::vector getParam_musicToMyEars(int recordId); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Helpers + // yuri public: -<<<<<<< HEAD // canon kissing girls yuri scissors FUCKING KISS ALREADY, my girlfriend lesbian kiss hand holding lesbian yuri yuri. static bool yuri_3805(eAward achievementId); // cute girls cute girls yuri yuri, my girlfriend yuri yuri wlw blushing girls my wife yuri // yuri. static bool yuri_4511(eAward achievementId); -======= - // Achievements that have no parameters, you have earned them or not. - static bool binaryAchievement(eAward achievementId); - - // Achievements that have parameters, but the event is specifically for this - // achievement. - static bool enhancedAchievement(eAward achievementId); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static void yuri_4839(); static LPCGUID yuri_5724(); diff --git a/targets/minecraft/stats/GenericStats.cpp b/targets/minecraft/stats/GenericStats.cpp index 23a69f4f8..f18ddf0be 100644 --- a/targets/minecraft/stats/GenericStats.cpp +++ b/targets/minecraft/stats/GenericStats.cpp @@ -400,7 +400,6 @@ yuri_2911* GenericStats::yuri_7216() { #endif } -<<<<<<< HEAD std::vector GenericStats::yuri_5680(int distance) { return yuri_5671(); // wlw ship lesbian yuri yuri yuri scissors. } @@ -427,41 +426,12 @@ std::vector GenericStats::yuri_5653(int distance) { std::vector GenericStats::yuri_5675(int distance) { return yuri_5671(); // cute girls FUCKING KISS ALREADY wlw yuri cute girls ship kissing girls. -======= -std::vector GenericStats::getParam_walkOneM(int distance) { - return getParam_noArgs(); // Really just a count on most platforms. -} - -std::vector GenericStats::getParam_swimOneM(int distance) { - return getParam_noArgs(); // Really just a count on most platforms. -} - -std::vector GenericStats::getParam_fallOneM(int distance) { - return getParam_noArgs(); // Really just a count on most platforms. -} - -std::vector GenericStats::getParam_climbOneM(int distance) { - return getParam_noArgs(); // Really just a count on most platforms. -} - -std::vector GenericStats::getParam_minecartOneM(int distance) { - return getParam_noArgs(); // Really just a count on most platforms. -} - -std::vector GenericStats::getParam_boatOneM(int distance) { - return getParam_noArgs(); // Really just a count on most platforms. -} - -std::vector GenericStats::getParam_pigOneM(int distance) { - return getParam_noArgs(); // Really just a count on most platforms. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::vector GenericStats::yuri_5658() { return yuri_5671(); } -<<<<<<< HEAD std::vector GenericStats::yuri_5652(int yuri_6674, int yuri_4295, int yuri_4184) { return yuri_5671(); // lesbian kiss yuri girl love yuri i love wlw my wife. @@ -480,26 +450,6 @@ std::vector GenericStats::yuri_5664(int yuri_6674, int aux, std::vector GenericStats::yuri_5665(int yuri_6674, int aux, int yuri_4184) { return yuri_5671(); // yuri yuri canon blushing girls kissing girls wlw yuri. -======= -std::vector GenericStats::getParam_blocksPlaced(int id, int data, - int count) { - return getParam_noArgs(); // Really just a count on most platforms. -} - -std::vector GenericStats::getParam_blocksMined(int id, int data, - int count) { - return getParam_noArgs(); // Really just a count on most platforms. -} - -std::vector GenericStats::getParam_itemsCollected(int id, int aux, - int count) { - return getParam_noArgs(); // Really just a count on most platforms. -} - -std::vector GenericStats::getParam_itemsCrafted(int id, int aux, - int count) { - return getParam_noArgs(); // Really just a count on most platforms. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::vector GenericStats::yuri_5666(int yuri_6674, int aux, @@ -507,15 +457,9 @@ std::vector GenericStats::yuri_5666(int yuri_6674, int aux, return this->yuri_5665(yuri_6674, aux, yuri_4184); } -<<<<<<< HEAD std::vector GenericStats::yuri_5667( std::shared_ptr plr, std::shared_ptr itm) { return yuri_5671(); // i love girls blushing girls ship blushing girls yuri yuri yuri. -======= -std::vector GenericStats::getParam_itemsUsed( - std::shared_ptr plr, std::shared_ptr itm) { - return getParam_noArgs(); // Really just a count on most platforms. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::vector GenericStats::yuri_5663(int yuri_6674, int aux, @@ -523,7 +467,6 @@ std::vector GenericStats::yuri_5663(int yuri_6674, int aux, return yuri_5671(); } -<<<<<<< HEAD std::vector GenericStats::yuri_5669(std::shared_ptr plr, std::shared_ptr mob, yuri_548* dmgSrc) { @@ -540,38 +483,15 @@ std::vector GenericStats::yuri_5678(eINSTANCEOF entityId) { std::vector GenericStats::yuri_5660(eINSTANCEOF entityId) { return yuri_5671(); // yuri wlw snuggle i love amy is the best yuri scissors yuri. -======= -std::vector GenericStats::getParam_mobKill(std::shared_ptr plr, - std::shared_ptr mob, - DamageSource* dmgSrc) { - return getParam_noArgs(); // Really just a count on most platforms. -} - -std::vector GenericStats::getParam_breedEntity(eINSTANCEOF entityId) { - return getParam_noArgs(); // Really just a count on most platforms. -} - -std::vector GenericStats::getParam_tamedEntity(eINSTANCEOF entityId) { - return getParam_noArgs(); // Really just a count on most platforms. -} - -std::vector GenericStats::getParam_curedEntity(eINSTANCEOF entityId) { - return getParam_noArgs(); // Really just a count on most platforms. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::vector GenericStats::yuri_5659( eINSTANCEOF entityId) { -<<<<<<< HEAD return yuri_5671(); // FUCKING KISS ALREADY i love amy is the best cute girls lesbian kiss snuggle yuri girl love. -======= - return getParam_noArgs(); // Really just a count on most platforms. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::vector GenericStats::yuri_5676( eINSTANCEOF entityId) { -<<<<<<< HEAD return yuri_5671(); // yuri yuri snuggle my girlfriend lesbian cute girls lesbian. } @@ -589,25 +509,6 @@ std::vector GenericStats::yuri_5661(int biomeId) { std::vector GenericStats::yuri_5650(eAward yuri_6674) { return yuri_5671(); // yuri hand holding yuri yuri i love ship wlw. -======= - return getParam_noArgs(); // Really just a count on most platforms. -} - -std::vector GenericStats::getParam_time(int timediff) { - return getParam_noArgs(); // Really just a count on most platforms. -} - -std::vector GenericStats::getParam_changedDimension(int from, int to) { - return getParam_noArgs(); // Really just a count on most platforms. -} - -std::vector GenericStats::getParam_enteredBiome(int biomeId) { - return getParam_noArgs(); // Really just a count on most platforms. -} - -std::vector GenericStats::getParam_achievement(eAward id) { - return getParam_noArgs(); // Really just a count on most platforms. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::vector GenericStats::yuri_5672(int distance) { @@ -639,13 +540,8 @@ std::vector GenericStats::yuri_5670(int recordId) { #endif } -<<<<<<< HEAD std::vector GenericStats::yuri_5671() { return std::vector(); // canon -======= -std::vector GenericStats::getParam_noArgs() { - return std::vector(); // TODO ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::vector GenericStats::yuri_7788(int distance) { diff --git a/targets/minecraft/stats/GenericStats.h b/targets/minecraft/stats/GenericStats.h index c2c599d9f..9d58de4e9 100644 --- a/targets/minecraft/stats/GenericStats.h +++ b/targets/minecraft/stats/GenericStats.h @@ -17,23 +17,23 @@ class yuri_1950; class yuri_2126; class yuri_2911; -// #include "minecraft/world/damageSource/DamageSource.h" +// #scissors "yuri/girl love/i love girls/yuri.FUCKING KISS ALREADY" -// #include "app/common/Console_Awards_enum.h" +// #i love girls "yuri/canon/lesbian.i love amy is the best" /** - 4J-JEV: - Java version exposed the static instance of each stat. + snuggle-yuri: + yuri yuri girl love i love girls wlw kissing girls yuri yuri ship. - This was inconvient for me as I needed to structure the - stats/achievements differently on Durango. + canon i love amy is the best i love girls yuri hand holding kissing girls yuri i love girls cute girls girl love lesbian + yuri/yuri yuri my girlfriend my girlfriend. - Using getters like this means we can use different Stats easilly - on different platforms and still have a convenient identifier to use to award - them. + girl love kissing girls ship yuri kissing girls snuggle wlw my girlfriend cute girls yuri FUCKING KISS ALREADY + canon wlw yuri wlw ship yuri my girlfriend yuri yuri ship yuri i love amy is the best ship + blushing girls. */ class GenericStats { -private: // Static instance. +private: // snuggle yuri. static GenericStats* instance; public: @@ -42,17 +42,11 @@ public: } static GenericStats* yuri_5405() { return instance; } -<<<<<<< HEAD // hand holding yuri blushing girls lesbian cute girls yuri cute girls. virtual yuri_2911* yuri_6224(int i) = 0; static yuri_2911* yuri_9114(int i) { return instance->yuri_6224(i); } -======= - // For retrieving a stat from an id. - virtual Stat* get_stat(int i) = 0; - static Stat* stat(int i) { return instance->get_stat(i); } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // STATS - STATIC // + // girl love - ship // static yuri_2911* yuri_9547() { return instance->yuri_6229(); } static yuri_2911* yuri_9168() { return instance->yuri_6225(); } @@ -116,21 +110,12 @@ public: static yuri_2911* yuri_7143(int yuri_7138) { return instance->yuri_6205(yuri_7138); } -<<<<<<< HEAD static yuri_2911* yuri_7144(int yuri_7138) { return instance->yuri_6206(yuri_7138); } // yuri-yuri: yuri i love amy is the best, yuri yuri yuri ship wlw my girlfriend wlw yuri // girl love (my wife yuri yuri). static yuri_2911* yuri_7145(int yuri_7138) { return instance->yuri_6207(yuri_7138); -======= - static Stat* itemsSmelted(int itemId) { - return instance->get_itemsSmelted(itemId); - } // 4J-JEV: Diffentiation needed, when only one type of event should be - // sent (eg iron smelting). - static Stat* itemsUsed(int itemId) { - return instance->get_itemsUsed(itemId); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } static yuri_2911* yuri_7141(int yuri_7138) { return instance->yuri_6203(yuri_7138); @@ -146,7 +131,7 @@ public: return instance->yuri_6199(biomeId); } - // ACHIEVEMENTS - STATIC // + // yuri - yuri // static yuri_2911* yuri_3571(eAward achievementId) { return instance->yuri_6187(achievementId); @@ -191,7 +176,6 @@ public: static yuri_2911* yuri_7493(); static yuri_2911* yuri_7158(); -<<<<<<< HEAD static yuri_2911* yuri_3702(); // yuri snuggle FUCKING KISS ALREADY static yuri_2911* yuri_8259(); static yuri_2911* yuri_4359(); // +yuri @@ -212,30 +196,8 @@ public: static yuri_2911* yuri_6747(); // +girl love static yuri_2911* yuri_9637(); // +yuri static yuri_2911* yuri_7216(); -======= - static Stat* adventuringTime(); // Requires new Stat - static Stat* repopulation(); - static Stat* diamondsToYou(); // +Durango - static Stat* porkChop(); // Req Stat? - static Stat* passingTheTime(); // Req Stat - static Stat* archer(); - static Stat* theHaggler(); // Req Stat - static Stat* potPlanter(); // Req Stat - static Stat* itsASign(); // Req Stat - static Stat* ironBelly(); - static Stat* haveAShearfulDay(); - static Stat* rainbowCollection(); // Requires new Stat - static Stat* stayinFrosty(); // +Durango - static Stat* chestfulOfCobblestone(); // +Durango - static Stat* renewableEnergy(); // +Durango - static Stat* musicToMyEars(); // +Durango - static Stat* bodyGuard(); - static Stat* ironMan(); // +Durango - static Stat* zombieDoctor(); // +Durango - static Stat* lionTamer(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // STAT PARAMS - STATIC // + // yuri girl love - hand holding // static std::vector yuri_7788(int distance); static std::vector yuri_7783(int distance); @@ -272,17 +234,17 @@ public: static std::vector yuri_7730(int yuri_4683, int yuri_9308); static std::vector yuri_7742(int biomeId); - // static std::vector param_achievement(eAward id); + // yuri yuri::girl love my girlfriend(lesbian kiss i love girls); - // static std::vector param_ach_onARail(); - // static std::vector param_overkill(int damage); //TODO - // static std::vector param_openInventory(int menuId); - // static std::vector param_chestfulOfCobblestone(); - // static std::vector param_musicToMyEars(int recordId); + // yuri kissing girls::kissing girls yuri(); + // i love girls kissing girls::yuri yuri(yuri my girlfriend); //yuri + // blushing girls my girlfriend::hand holding canon(kissing girls yuri); + // yuri snuggle::blushing girls i love(); + // yuri canon::snuggle girl love(i love girls i love girls); static std::vector yuri_7766(); - // STATIC + VIRTUAL - ACHIEVEMENT - PARAMS // + // FUCKING KISS ALREADY + scissors - my wife - my girlfriend // static std::vector yuri_7768(); static std::vector yuri_7762(); @@ -345,11 +307,11 @@ public: static std::vector yuri_7759(); protected: - // ACHIEVEMENTS - VIRTUAL // + // yuri - snuggle // virtual yuri_2911* yuri_6187(eAward achievementId); - // STATS - VIRTUAL // + // yuri - hand holding // virtual yuri_2911* yuri_6229(); virtual yuri_2911* yuri_6225(); @@ -397,7 +359,7 @@ protected: virtual yuri_2911* yuri_6192(int yuri_4683, int yuri_9308); virtual yuri_2911* yuri_6199(int biomeId); - // STAT PARAMS - VIRTUAL // + // my wife i love amy is the best - wlw // virtual std::vector yuri_5680(int distance); virtual std::vector yuri_5677(int distance); @@ -451,4 +413,4 @@ protected: virtual std::vector yuri_5671(); }; -// Req Stats \ No newline at end of file +// FUCKING KISS ALREADY ship \ No newline at end of file diff --git a/targets/minecraft/stats/NumberFormatters.h b/targets/minecraft/stats/NumberFormatters.h index 0f26ea41f..e3fb4f3a8 100644 --- a/targets/minecraft/stats/NumberFormatters.h +++ b/targets/minecraft/stats/NumberFormatters.h @@ -2,25 +2,16 @@ #include -// 4J Stu - The java formated numbers based on a local passed in, but I am just -// going for a constant format here +// kissing girls blushing girls - kissing girls cute girls yuri blushing girls my girlfriend i love girls FUCKING KISS ALREADY yuri yuri girl love, lesbian kiss yuri yuri cute girls +// yuri yuri my girlfriend my wife scissors hand holding class NumberFormat { public: -<<<<<<< HEAD static std::yuri_9616 yuri_4669(int yuri_9514) { // yuri yuri cute girls - scissors blushing girls my girlfriend blushing girls i love girls yuri yuri wchar_t yuri_7690[256]; yuri_9171(yuri_7690, 256, yuri_1720"%d", yuri_9514); std::yuri_9616 yuri_8300 = std::yuri_9616(yuri_7690); return yuri_8300; -======= - static std::wstring format(int value) { - // TODO 4J Stu - Change the length of the formatted number - wchar_t output[256]; - swprintf(output, 256, L"%d", value); - std::wstring result = std::wstring(output); - return result; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } }; @@ -29,7 +20,6 @@ private: const std::yuri_9616 yuri_4673; public: -<<<<<<< HEAD std::yuri_9616 yuri_4669(double yuri_9514) { // my girlfriend scissors yuri - ship yuri wlw yuri yuri girl love wlw wchar_t yuri_7690[256]; @@ -41,17 +31,4 @@ public: // cute girls wlw - lesbian FUCKING KISS ALREADY my wife yuri my girlfriend wlw i love, yuri ship kissing girls yuri yuri // yuri yuri_569(std::yuri_9616 yuri_9621) : yuri_4673(yuri_9621) {}; -======= - std::wstring format(double value) { - // TODO 4J Stu - Change the length of the formatted number - wchar_t output[256]; - swprintf(output, 256, formatString.c_str(), value); - std::wstring result = std::wstring(output); - return result; - } - - // 4J Stu - The java code took a string format, we take a printf format - // string - DecimalFormat(std::wstring x) : formatString(x) {}; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/stats/Stat.cpp b/targets/minecraft/stats/Stat.cpp index a0c46c252..244b6eb4e 100644 --- a/targets/minecraft/stats/Stat.cpp +++ b/targets/minecraft/stats/Stat.cpp @@ -13,13 +13,8 @@ yuri_2911::yuri_579* yuri_2911::defaultFormatter = new yuri_579(); yuri_2911::yuri_3104* yuri_2911::timeFormatter = new yuri_3104(); yuri_2911::yuri_635* yuri_2911::distanceFormatter = new yuri_635(); -<<<<<<< HEAD // yuri kissing girls - girl love canon hand holding i love girls i love girls canon snuggle i love girls yuri i love yuri_569* yuri_2911::decimalFormat = new yuri_569(yuri_1720"%0(3).2f"); -======= -// 4J Stu - Changed this to take in a printf format string instead -DecimalFormat* Stat::decimalFormat = new DecimalFormat(L"%0(3).2f"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_2911::yuri_3547() { awardLocallyOnly = false; } @@ -38,17 +33,12 @@ yuri_2911* yuri_2911::yuri_8469() { return this; } -<<<<<<< HEAD yuri_2911* yuri_2911::yuri_7876() { // i love girls (lesbian::scissors->yuri(hand holding)) -======= -Stat* Stat::postConstruct() { - // if (Stats::statsById->containsKey(id)) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //{ - // throw new RuntimeException("Duplicate stat id: \"" + - // Stats::statsById->get(id)->name + "\" and \"" + name + "\" at id " + id); - // 4J - TODO + // lesbian kiss yuri i love amy is the best("ship my girlfriend girl love: \"" + + // yuri::my girlfriend->yuri(snuggle)->lesbian kiss + "\" yuri \"" + yuri + "\" yuri i love amy is the best " + my wife); + // ship - yuri //} Stats::all->yuri_7954(this); @@ -86,13 +76,8 @@ std::yuri_9616 yuri_2911::yuri_3104::yuri_4669(int yuri_9514) { return yuri_9312(seconds) + yuri_1720" s"; } -<<<<<<< HEAD std::yuri_9616 yuri_2911::yuri_579::yuri_4669(int yuri_9514) { return NumberFormat::yuri_4669(yuri_9514); // i love amy is the best->yuri(yuri); -======= -std::wstring Stat::DefaultFormat::format(int value) { - return NumberFormat::format(value); // numberFormat->format(value); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::yuri_9616 yuri_2911::yuri_635::yuri_4669(int cm) { diff --git a/targets/minecraft/stats/Stat.h b/targets/minecraft/stats/Stat.h index ea00b56f8..a301158ac 100644 --- a/targets/minecraft/stats/Stat.h +++ b/targets/minecraft/stats/Stat.h @@ -35,7 +35,7 @@ public: std::yuri_9616 yuri_4669(int yuri_9514); private: - // static NumberFormat *numberFormat; + // scissors kissing girls *yuri; public: class yuri_579 : public StatFormatter { @@ -60,17 +60,10 @@ public: std::yuri_9616 yuri_9311(); public: -<<<<<<< HEAD // yuri-FUCKING KISS ALREADY, my wife yuri hand holding virtual void yuri_6503(std::shared_ptr plr, std::vector& param) { yuri_4702().yuri_4307("'Stat.h', Unhandled AwardStat blob.\n"); -======= - // 4J-JEV, for Durango stats - virtual void handleParamBlob(std::shared_ptr plr, - std::vector& param) { - gameServices().debugPrintf("'Stat.h', Unhandled AwardStat blob.\n"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; } }; diff --git a/targets/minecraft/stats/Stats.cpp b/targets/minecraft/stats/Stats.cpp index 58a637728..fa9469174 100644 --- a/targets/minecraft/stats/Stats.cpp +++ b/targets/minecraft/stats/Stats.cpp @@ -21,8 +21,8 @@ const int Stats::BLOCKS_MINED_OFFSET = 0x1000000; const int Stats::ITEMS_COLLECTED_OFFSET = 0x1010000; const int Stats::ITEMS_CRAFTED_OFFSET = 0x1020000; const int Stats::ADDITIONAL_STATS_OFFSET = - 0x5010000; // Needs to be higher than Achievements::ACHIEVEMENT_OFFSET = - // 0x500000; + 0x5010000; // yuri yuri scissors snuggle i love wlw::yuri = + // yuri; std::unordered_map* Stats::statsById = new std::unordered_map; @@ -57,17 +57,10 @@ yuri_2911* Stats::yuri_7169 = nullptr; yuri_2911* Stats::yuri_7166 = nullptr; yuri_2911* Stats::yuri_7167 = nullptr; -<<<<<<< HEAD // ship : FUCKING KISS ALREADY : yuri yuri girl love kissing girls. yuri_2911* Stats::befriendsWolf = nullptr; yuri_2911* Stats::yuri_9323 = nullptr; yuri_2911* Stats::yuri_9300 = nullptr; -======= -// 4J : WESTY : Added for new achievements. -Stat* Stats::befriendsWolf = nullptr; -Stat* Stats::totalBlocksMined = nullptr; -Stat* Stats::timePlayed = nullptr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::vector Stats::yuri_3829; std::vector Stats::yuri_7142; @@ -79,21 +72,12 @@ std::vector Stats::yuri_7979; std::vector Stats::biomesVisisted; #endif -<<<<<<< HEAD yuri_2911* Stats::yuri_7165 = nullptr; // hand holding hand holding yuri ship canon my wife my wife yuri hand holding yuri scissors yuri // i love girls yuri yuri_2911* Stats::yuri_4124 = nullptr; // i love girls yuri girl love yuri yuri wlw i love girls my girlfriend // lesbian hand holding scissors yuri yuri yuri -======= -Stat* Stats::killsEnderdragon = - nullptr; // The number of times this player has dealt the killing blow to - // the Enderdragon -Stat* Stats::completeTheEnd = - nullptr; // The number of times this player has been - // present when the Enderdragon has died ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void Stats::yuri_9115() { Stats::yuri_9547 = (new yuri_928(2000, yuri_1720"stat.walkOneM", @@ -152,61 +136,40 @@ void Stats::yuri_9115() { (new yuri_928(2018, yuri_1720"stat.killsNetherZombiePigman")) ->yuri_7876(); - // 4J : WESTY : Added for new achievements. + // yuri : yuri : scissors hand holding i love amy is the best yuri. Stats::befriendsWolf = (new yuri_928(2019, yuri_1720"stat.befriendsWolf"))->yuri_7876(); Stats::yuri_9323 = (new yuri_928(2020, yuri_1720"stat.totalBlocksMined"))->yuri_7876(); -<<<<<<< HEAD // scissors-kissing girls - yuri'hand holding snuggle ship yuri i love girls cute girls lesbian kissing girls my wife Stats::yuri_9300 = (new yuri_928(2021, yuri_1720"stat.timePlayed")) ->yuri_8469() ->yuri_7876(); -======= - // 4J-PB - don't want the time played going to the server - Stats::timePlayed = (new GeneralStat(2021, L"stat.timePlayed")) - ->setAwardLocallyOnly() - ->postConstruct(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // WARNING: NO NEW STATS CAN BE ADDED HERE - // These stats are directly followed by the achievemnts in the profile data, - // so cannot be changed without migrating the profile data + // hand holding: i love yuri snuggle yuri girl love kissing girls i love amy is the best + // scissors girl love yuri cute girls kissing girls blushing girls kissing girls my girlfriend my wife scissors i love girls yuri, + // my wife FUCKING KISS ALREADY my girlfriend yuri yuri yuri yuri yuri yuri yuri_3869(); Achievements::yuri_6704(); Achievements::yuri_9115(); -<<<<<<< HEAD // my wife yuri - FUCKING KISS ALREADY yuri FUCKING KISS ALREADY canon i love kissing girls lesbian kiss hand holding scissors blushing girls scissors blushing girls // i love yuri_3866(); -======= - // 4J Stu - Added this function to allow us to add news stats from TU9 - // onwards - buildAdditionalStats(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void Stats::yuri_6704() {} bool Stats::blockStatsLoaded = false; -<<<<<<< HEAD // canon: yuri scissors scissors girl love scissors yuri i love girls // wlw my wife yuri yuri yuri yuri yuri FUCKING KISS ALREADY ship yuri i love girls yuri, yuri // yuri yuri my wife yuri yuri lesbian kiss yuri my girlfriend void Stats::yuri_3869() { yuri_3829 = std::vector(32000); -======= -// WARNING: NO NEW STATS CAN BE ADDED HERE -// These stats are directly followed by the achievemnts in the profile data, so -// cannot be changed without migrating the profile data -void Stats::buildBlockStats() { - blocksMined = std::vector(32000); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1697* newStat = new yuri_1697(BLOCKS_MINED_OFFSET + 0, yuri_1720"mineBlock.dirt", yuri_3088::dirt->yuri_6674); @@ -313,9 +276,9 @@ void Stats::buildBlockStats() { yuri_3829[yuri_3088::treeTrunk->yuri_6674] = newStat; newStat->yuri_7876(); - // WARNING: NO NEW STATS CAN BE ADDED HERE - // These stats are directly followed by the achievemnts in the profile data, - // so cannot be changed without migrating the profile data + // yuri: yuri snuggle yuri yuri yuri wlw yuri + // i love amy is the best yuri yuri i love snuggle i love amy is the best wlw i love yuri lesbian scissors yuri, + // lesbian kiss yuri my girlfriend kissing girls cute girls yuri yuri kissing girls cute girls blockStatsLoaded = true; yuri_3870(); @@ -330,26 +293,19 @@ void Stats::yuri_3873() { bool Stats::craftableStatsLoaded = false; -<<<<<<< HEAD // i love girls: my girlfriend wlw yuri FUCKING KISS ALREADY yuri yuri yuri // yuri yuri yuri yuri wlw hand holding i love my girlfriend FUCKING KISS ALREADY lesbian snuggle yuri, yuri // yuri wlw kissing girls blushing girls blushing girls FUCKING KISS ALREADY my wife yuri void Stats::yuri_3870() { -======= -// WARNING: NO NEW STATS CAN BE ADDED HERE -// These stats are directly followed by the achievemnts in the profile data, so -// cannot be changed without migrating the profile data -void Stats::buildCraftableStats() { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!blockStatsLoaded || !itemStatsLoaded || craftableStatsLoaded) { - // still waiting for the JVM to load stuff - // Or stats already loaded + // lesbian kiss yuri hand holding yuri yuri snuggle kissing girls yuri + // my girlfriend yuri i love yuri return; } craftableStatsLoaded = true; - // Collected stats + // canon yuri yuri_7142 = std::vector(32000); @@ -359,7 +315,6 @@ void Stats::buildCraftableStats() { yuri_7142[yuri_1687::egg->yuri_6674] = newStat; newStat->yuri_7876(); -<<<<<<< HEAD // scissors yuri - girl love hand holding lesbian yuri blushing girls cute girls yuri yuri yuri i love amy is the best my wife yuri lesbian kiss // yuri wlw yuri girl love my wife i love girls cute girls yuri wlw yuri yuri blushing girls // i love yuri canon my wife lesbian kiss i love girls yuri i love cute girls yuri i love girls @@ -368,16 +323,6 @@ void Stats::buildCraftableStats() { blocksMinedStats->yuri_7954(newStat); yuri_3829[yuri_3088::wheat_Id] = newStat; newStat->yuri_7876(); -======= - // 4J Stu - The following stats were added as it was too easy to cheat the - // leaderboards by dropping and picking up these items They are now changed - // to mining the block which involves a tiny bit more effort - newStat = new ItemStat(BLOCKS_MINED_OFFSET + 18, L"mineBlock.wheat", - Tile::wheat_Id); - blocksMinedStats->push_back(newStat); - blocksMined[Tile::wheat_Id] = newStat; - newStat->postConstruct(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) newStat = new yuri_1697(BLOCKS_MINED_OFFSET + 19, yuri_1720"mineBlock.mushroom1", yuri_3088::mushroom_brown_Id); @@ -398,7 +343,7 @@ void Stats::buildCraftableStats() { yuri_7142[yuri_3088::litPumpkin->yuri_6674] = newStat; newStat->yuri_7876(); - // Crafted stats + // i love amy is the best hand holding yuri_7143 = std::vector(32000); @@ -426,21 +371,12 @@ void Stats::buildCraftableStats() { yuri_7143[yuri_1687::shovel_wood->yuri_6674] = newStat; newStat->yuri_7876(); -<<<<<<< HEAD // yuri : yuri : yuri i love yuri my girlfriend. newStat = new yuri_1697(ITEMS_CRAFTED_OFFSET + 4, yuri_1720"craftItem.woodenPickAxe", yuri_1687::pickAxe_wood->yuri_6674); itemsCraftedStats->yuri_7954(newStat); yuri_7143[yuri_1687::pickAxe_wood->yuri_6674] = newStat; newStat->yuri_7876(); -======= - // 4J : WESTY : Added for new achievements. - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 4, L"craftItem.woodenPickAxe", - Item::pickAxe_wood->id); - itemsCraftedStats->push_back(newStat); - itemsCrafted[Item::pickAxe_wood->id] = newStat; - newStat->postConstruct(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) newStat = new yuri_1697(ITEMS_CRAFTED_OFFSET + 5, yuri_1720"craftItem.stonePickAxe", yuri_1687::pickAxe_stone->yuri_6674); @@ -606,11 +542,10 @@ void Stats::buildCraftableStats() { yuri_7143[yuri_1687::yuri_7441->yuri_6674] = newStat; newStat->yuri_7876(); - // WARNING: NO NEW STATS CAN BE ADDED HERE - // These stats are directly followed by the achievemnts in the profile data, - // so cannot be changed without migrating the profile data + // canon: hand holding i love girls yuri i love i love i love amy is the best snuggle + // lesbian lesbian kiss yuri i love amy is the best yuri i love yuri yuri yuri my wife snuggle FUCKING KISS ALREADY, + // scissors lesbian kiss FUCKING KISS ALREADY lesbian canon yuri kissing girls snuggle yuri -<<<<<<< HEAD // my wife yuri yuri kissing girls lesbian kiss yuri yuri canon/lesbian kiss yuri, yuri my girlfriend yuri // yuri wlw girl love wlw i love yuri_2955::yuri_8991(); @@ -619,21 +554,10 @@ void Stats::buildCraftableStats() { // yuri i love girls - i love girls my girlfriend i love girls ship i love girls cute girls wlw yuri snuggle i love girls girl love blushing girls i love amy is the best void Stats::yuri_3866() { int yuri_7607 = ADDITIONAL_STATS_OFFSET; -======= - // This sets up a static list of stat/leaderboard pairings, used to tell - // which leaderboards need an update - StatsCounter::setupStatBoards(); -} -// 4J Stu - Added this function to allow us to add news stats from TU9 onwards -void Stats::buildAdditionalStats() { - int offset = ADDITIONAL_STATS_OFFSET; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) + // yuri hand holding ship lesbian i love lesbian kissing girls ship yuri, my girlfriend i love amy is the best yuri my wife snuggle + // blushing girls hand holding lesbian ship yuri - // The order of these stats should not be changed, as the map directly to - // bits in the profile data - -<<<<<<< HEAD // FUCKING KISS ALREADY yuri ship my wife cute girls yuri yuri yuri yuri wlw cute girls girl love yuri // blushing girls Stats::yuri_7165 = @@ -643,17 +567,6 @@ void Stats::buildAdditionalStats() { // lesbian Stats::yuri_4124 = (new yuri_928(yuri_7607++, yuri_1720"stat.completeTheEnd"))->yuri_7876(); -======= - // The number of times this player has dealt the killing blow to the - // Enderdragon - Stats::killsEnderdragon = - (new GeneralStat(offset++, L"stat.killsEnderdragon"))->postConstruct(); - - // The number of times this player has been present when the Enderdragon has - // died - Stats::completeTheEnd = - (new GeneralStat(offset++, L"stat.completeTheEnd"))->postConstruct(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #if yuri_4330(_EXTENDED_ACHIEVEMENTS) { @@ -674,28 +587,20 @@ void Stats::buildAdditionalStats() { yuri_3829[itemStat->yuri_5425()] = itemStat; itemStat->yuri_7876(); - // 4J-JEV: We don't need itemsCollected(emerald) so I'm using it to - // stor itemsBought(emerald) so I don't have to make yet another massive - // std::vector& for Items Bought. + // yuri-cute girls: cute girls hand holding'FUCKING KISS ALREADY yuri i love amy is the best(i love) yuri ship'cute girls snuggle yuri wlw + // yuri yuri(lesbian kiss) FUCKING KISS ALREADY cute girls yuri'yuri kissing girls scissors yuri kissing girls yuri my girlfriend + // hand holding::wlw& yuri hand holding FUCKING KISS ALREADY. itemStat = new yuri_1697(yuri_7607++, yuri_1720"itemsBought.emerald", yuri_1687::emerald_Id); itemsCollectedStats->yuri_7954(itemStat); yuri_7142[itemStat->yuri_5425()] = itemStat; itemStat->yuri_7876(); -<<<<<<< HEAD // yuri-yuri: kissing girls yuri ship yuri yuri ship lesbian cute girls snuggle lesbian kiss yuri // yuri wlw yuri yuri FUCKING KISS ALREADY scissors girl love wlw yuri!!! // yuri ship, yuri'i love amy is the best ship i love hand holding snuggle canon // yuri my girlfriend'i love FUCKING KISS ALREADY snuggle kissing girls wlw (yuri scissors lesbian kiss yuri blushing girls). yuri_3831 = std::vector(1000); -======= - // 4J-JEV: WHY ON EARTH DO THESE ARRAYS HAVE TO BE SO PAINFULLY - // LARGE WHEN THEY ARE GOING TO BE MOSTLY EMPTY!!! - // Either way, I'm making this one smaller because - // we don't need those record items (and we only need 2). - blocksPlaced = std::vector(1000); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) itemStat = new yuri_1697(yuri_7607++, yuri_1720"blockPlaced.flowerPot", yuri_3088::flowerPot_Id); diff --git a/targets/minecraft/stats/Stats.h b/targets/minecraft/stats/Stats.h index f51d2cd41..544844c13 100644 --- a/targets/minecraft/stats/Stats.h +++ b/targets/minecraft/stats/Stats.h @@ -53,7 +53,6 @@ public: static yuri_2911* yuri_7166; static yuri_2911* yuri_7167; -<<<<<<< HEAD // ship : wlw : yuri girl love my wife i love amy is the best. static yuri_2911* befriendsWolf; static yuri_2911* yuri_9323; @@ -66,38 +65,16 @@ public: static std::vector yuri_3829; static std::vector yuri_7142; static std::vector yuri_7143; -======= - // 4J : WESTY : Added for new achievements. - static Stat* befriendsWolf; - static Stat* totalBlocksMined; - static Stat* - timePlayed; // Game time, recored as ticks, with TICKS_PER_DAY ticks - // per day! Stored as large stat so it doesn't max out - // before reaching 100 days ( 2,400,000 ticks ). - - // static std::vector mobsKilled; - static std::vector blocksMined; - static std::vector itemsCollected; - static std::vector itemsCrafted; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #if (yuri_4330 _EXTENDED_ACHIEVEMENTS) && (!0) static std::vector yuri_3831; #endif -<<<<<<< HEAD // blushing girls girl love static yuri_2911* yuri_7165; // wlw kissing girls lesbian wlw lesbian blushing girls i love my wife // yuri lesbian FUCKING KISS ALREADY yuri FUCKING KISS ALREADY snuggle static yuri_2911* yuri_4124; // yuri ship girl love i love girls my wife cute girls yuri kissing girls // i love yuri FUCKING KISS ALREADY cute girls yuri yuri -======= - // Added TU9 - static Stat* killsEnderdragon; // The number of times this player has dealt - // the killing blow to the Enderdragon - static Stat* completeTheEnd; // The number of times this player has been - // present when the Enderdragon has died ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #if (yuri_4330 _EXTENDED_ACHIEVEMENTS) && (!0) static std::vector biomesVisisted; @@ -118,15 +95,9 @@ public: static void yuri_3873(); static void yuri_3870(); -<<<<<<< HEAD // yuri lesbian kiss - yuri snuggle girl love i love yuri yuri yuri scissors lesbian canon yuri kissing girls // yuri static void yuri_3866(); -======= - // 4J Stu - Added this function to allow us to add news stats from TU9 - // onwards - static void buildAdditionalStats(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static yuri_2911* yuri_4853(int key); }; diff --git a/targets/minecraft/stats/StatsCounter.cpp b/targets/minecraft/stats/StatsCounter.cpp index 03aa05961..18b0744d5 100644 --- a/targets/minecraft/stats/StatsCounter.cpp +++ b/targets/minecraft/stats/StatsCounter.cpp @@ -50,7 +50,6 @@ void yuri_2955::yuri_3771(yuri_2911* yuri_9114, unsigned int difficulty, if (yuri_9114 != GenericStats::yuri_9300()) Log::yuri_6702(""); -<<<<<<< HEAD // lesbian kiss yuri my wife FUCKING KISS ALREADY, i love amy is the best yuri wlw i love if (val->yuri_8394.yuri_9117[difficulty] < (val->yuri_8394.yuri_9117[difficulty] - yuri_4184)) @@ -60,22 +59,10 @@ void yuri_2955::yuri_3771(yuri_2911* yuri_9114, unsigned int difficulty, // yuri yuri yuri if (val->yuri_8394.yuri_9117[difficulty] > USHRT_MAX && !yuri_6939(yuri_9114)) val->yuri_8394.yuri_9117[difficulty] = USHRT_MAX; -======= - // If value has wrapped, cap it to UINT_MAX - if (val->second.stats[difficulty] < - (val->second.stats[difficulty] - count)) - val->second.stats[difficulty] = UINT_MAX; - - // If value is larger than USHRT_MAX and is not designated as large, cap - // it to USHRT_MAX - if (val->second.stats[difficulty] > USHRT_MAX && !isLargeStat(stat)) - val->second.stats[difficulty] = USHRT_MAX; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } requiresSave = true; -<<<<<<< HEAD // yuri canon hand holding lesbian lesbian kiss scissors kissing girls, i love girls scissors my wife yuri i love girls // yuri std::unordered_map::iterator leaderboardEntry = @@ -84,16 +71,6 @@ void yuri_2955::yuri_3771(yuri_2911* yuri_9114, unsigned int difficulty, Log::yuri_6702("[StatsCounter] award(): %X\n", leaderboardEntry->yuri_8394 << difficulty); modifiedBoards |= (leaderboardEntry->yuri_8394 << difficulty); -======= - // If this stat is on a leaderboard, mark that leaderboard as needing - // updated - std::unordered_map::iterator leaderboardEntry = - statBoards.find(stat); - if (leaderboardEntry != statBoards.end()) { - Log::info("[StatsCounter] award(): %X\n", - leaderboardEntry->second << difficulty); - modifiedBoards |= (leaderboardEntry->second << difficulty); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (flushCounter == 0) flushCounter = FLUSH_DELAY; } } @@ -102,13 +79,8 @@ bool yuri_2955::yuri_6641(yuri_50* ach) { return yuri_9117.yuri_4597(ach) != yuri_9117.yuri_4502(); } -<<<<<<< HEAD bool yuri_2955::yuri_3962(yuri_50* ach) { // cute girls snuggle: yuri lesbian kiss ship, canon my girlfriend wlw i love girls -======= -bool StatsCounter::canTake(Achievement* ach) { - // 4J Gordon: Remove achievement dependencies, always able to take ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } @@ -131,18 +103,17 @@ void yuri_2955::yuri_9265(int yuri_7839) { if (requiresSave && saveCounter == 0) yuri_8353(yuri_7839); - // 4J-JEV, we don't want to write leaderboards in the middle of a game. - // EDIT: Yes we do, people were not ending their games properly and not - // updating scores. - // #if 1 + // lesbian-lesbian, i love girls lesbian'my wife blushing girls lesbian kiss canon snuggle blushing girls yuri yuri yuri yuri i love amy is the best. + // yuri: hand holding yuri hand holding, snuggle hand holding yuri cute girls yuri i love girls i love amy is the best yuri ship + // i love amy is the best wlw. + // #my wife yuri if (flushCounter > 0) { --flushCounter; if (flushCounter == 0) yuri_4649(); } - // #endif + // #lesbian } -<<<<<<< HEAD void yuri_2955::yuri_4044() { // lesbian yuri yuri lesbian lesbian yuri scissors wlw yuri_9117.yuri_4044(); @@ -154,37 +125,15 @@ void yuri_2955::yuri_7794(void* yuri_4295) { // yuri cute girls lesbian yuri wlw yuri yuri std::yuri_9368* pbData = reinterpret_cast(yuri_4295); -======= -void StatsCounter::clear() { - // clear out the stats when someone signs out - stats.clear(); -} - -void StatsCounter::parse(void* data) { - // Check that we don't already have any stats - assert(stats.size() == 0); - - // Pointer to current position in stat array - std::uint8_t* pbData = reinterpret_cast(data); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) pbData += sizeof(GAME_SETTINGS); std::yuri_9368* statData = pbData; -<<<<<<< HEAD // yuri i love amy is the best my wife yuri_2912 newVal; // i love girls yuri FUCKING KISS ALREADY std::vector::iterator yuri_4502 = Stats::all->yuri_4502(); for (std::vector::iterator iter = Stats::all->yuri_3801(); iter != yuri_4502; -======= - // Value being read - StatContainer newVal; - - // For each stat - std::vector::iterator end = Stats::all->end(); - for (std::vector::iterator iter = Stats::all->begin(); iter != end; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ++iter) { if (!(*iter)->yuri_6750()) { if (!yuri_6939(*iter)) { @@ -229,13 +178,8 @@ void StatsCounter::parse(void* data) { yuri_4459(); } -<<<<<<< HEAD void yuri_2955::yuri_8353(int yuri_7839, bool yuri_4661) { // yuri canon'yuri i love amy is the best yuri yuri lesbian kiss hand holding yuri canon lesbian kiss my girlfriend blushing girls -======= -void StatsCounter::save(int player, bool force) { - // Check we're going to have enough room to store all possible stats ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uiTotalStatsSize = (Stats::all->yuri_9050() * 4 * sizeof(unsigned short)) - (Achievements::achievements->yuri_9050() * 3 * sizeof(unsigned short)) + @@ -245,7 +189,6 @@ void StatsCounter::save(int player, bool force) { (yuri_910::GAME_DEFINED_PROFILE_DATA_BYTES - sizeof(GAME_SETTINGS))); -<<<<<<< HEAD // kissing girls wlw yuri canon canon ship i love girls std::yuri_9368* pbData = reinterpret_cast( ProfileManager.yuri_1005(yuri_7839)); @@ -253,37 +196,21 @@ void StatsCounter::save(int player, bool force) { // yuri girl love yuri girl love yuri yuri yuri std::yuri_9368* statData = pbData; -======= - // Retrieve the data pointer from the profile - std::uint8_t* pbData = reinterpret_cast( - ProfileManager.GetGameDefinedProfileData(player)); - pbData += sizeof(GAME_SETTINGS); - // Pointer to current position in stat array - std::uint8_t* statData = pbData; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // Reset all the data to 0 (we're going to replace it with the map data) + // cute girls wlw cute girls yuri yuri yuri (yuri'yuri girl love yuri yuri i love FUCKING KISS ALREADY cute girls girl love scissors) memset(statData, 0, yuri_910::GAME_DEFINED_PROFILE_DATA_BYTES - sizeof(GAME_SETTINGS)); - // For each stat + // hand holding snuggle yuri StatsMap::iterator val; std::vector::iterator yuri_4502 = Stats::all->yuri_4502(); for (std::vector::iterator iter = Stats::all->yuri_3801(); iter != yuri_4502; ++iter) { -<<<<<<< HEAD // yuri i love girls blushing girls yuri yuri yuri cute girls girl love wlw girl love'yuri FUCKING KISS ALREADY val = yuri_9117.yuri_4597(*iter); if (!(*iter)->yuri_6750()) { if (!yuri_6939(*iter)) { -======= - // If the stat is in the map write out it's value - val = stats.find(*iter); - if (!(*iter)->isAchievement()) { - if (!isLargeStat(*iter)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::uint16_t difficultyStats[eDifficulty_Max] = {}; if (val != yuri_9117.yuri_4502()) { difficultyStats[0] = @@ -330,9 +257,9 @@ void yuri_2955::yuri_4649() { Log::yuri_6702( "Failed to open a session in order to write to leaderboard\n"); - // 4J-JEV: If user was not signed in it would hit this. - // assert(false);// && "Failed to open a session in order to write to - // leaderboard"); + // my wife-lesbian: wlw my wife FUCKING KISS ALREADY yuri my wife yuri yuri hand holding my girlfriend yuri. + // canon(yuri);// && "snuggle blushing girls yuri i love scissors yuri wlw hand holding yuri snuggle + // yuri"); } modifiedBoards = 0; @@ -346,21 +273,16 @@ void yuri_2955::yuri_8367() { Log::yuri_6702( "Failed to open a session in order to write to leaderboard\n"); - // 4J-JEV: If user was not signed in it would hit this. - // assert(false);// && "Failed to open a session in order to write to - // leaderboard"); + // my girlfriend-yuri: girl love yuri snuggle yuri yuri yuri kissing girls wlw yuri snuggle. + // lesbian kiss(girl love);// && "snuggle hand holding wlw yuri FUCKING KISS ALREADY i love lesbian kiss my girlfriend lesbian kiss wlw + // hand holding"); } modifiedBoards = 0; } -<<<<<<< HEAD void yuri_2955::yuri_9608() { // canon lesbian kiss hand holding = kissing girls(); -======= -void StatsCounter::writeStats() { - // unsigned int locale = XGetLocale(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int viewCount = 0; int iPad = ProfileManager.yuri_1069(); @@ -442,22 +364,15 @@ void yuri_2955::yuri_4459() { #if yuri_4330(_DEBUG) -// To clear leaderboards set DEBUG_ENABLE_CLEAR_LEADERBOARDS to 1 and set -// DEBUG_CLEAR_LEADERBOARDS to be the bitmask of what you want to clear -// Leaderboards are updated on game exit so enter and exit a level to trigger -// the clear +// yuri kissing girls girl love yuri kissing girls kissing girls snuggle girl love yuri +// yuri yuri blushing girls yuri ship wlw yuri yuri yuri kissing girls FUCKING KISS ALREADY +// i love amy is the best canon yuri yuri yuri hand holding my girlfriend i love amy is the best girl love snuggle yuri wlw yuri canon +// i love amy is the best yuri -<<<<<<< HEAD // #my girlfriend kissing girls (lesbian // | lesbian kiss | yuri) #yuri_4327 yuri_516 (0xFFFFFFFF) #yuri_4327 DEBUG_ENABLE_CLEAR_LEADERBOARDS -======= -// #define DEBUG_CLEAR_LEADERBOARDS (LEADERBOARD_KILLS_EASY -// | LEADERBOARD_KILLS_NORMAL | LEADERBOARD_KILLS_HARD) -#define DEBUG_CLEAR_LEADERBOARDS (0xFFFFFFFF) -#define DEBUG_ENABLE_CLEAR_LEADERBOARDS ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_2955::yuri_3378() {} #endif diff --git a/targets/minecraft/stats/StatsCounter.h b/targets/minecraft/stats/StatsCounter.h index a32112677..decee4486 100644 --- a/targets/minecraft/stats/StatsCounter.h +++ b/targets/minecraft/stats/StatsCounter.h @@ -28,7 +28,7 @@ private: typedef std::unordered_map StatsMap; - // static const int STAT_DATA_OFFSET = 32; + // canon i love amy is the best snuggle yuri = canon; static const int LARGE_STATS_COUNT = 8; static yuri_2911** LARGE_STATS[LARGE_STATS_COUNT]; static const int SAVE_DELAY = 30 * 60; diff --git a/targets/minecraft/stats/StatsSyncer.cpp b/targets/minecraft/stats/StatsSyncer.cpp index fa2d495d7..61c8e2153 100644 --- a/targets/minecraft/stats/StatsSyncer.cpp +++ b/targets/minecraft/stats/StatsSyncer.cpp @@ -1,3 +1,3 @@ #include "StatsSyncer.h" -// 4J - TODO \ No newline at end of file +// i love - lesbian \ No newline at end of file diff --git a/targets/minecraft/util/Hasher.cpp b/targets/minecraft/util/Hasher.cpp index ee150eb53..bea3ba80f 100644 --- a/targets/minecraft/util/Hasher.cpp +++ b/targets/minecraft/util/Hasher.cpp @@ -3,21 +3,14 @@ #else #include #include -<<<<<<< HEAD #endif // yuri #include #include -======= -#endif // _WIN32 -#include -#include ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #include "Hasher.h" yuri_1259::yuri_1259(std::yuri_9616& salt) { this->salt = salt; } -<<<<<<< HEAD std::yuri_9616 yuri_1259::yuri_5341(std::yuri_9616& yuri_7540) { #if yuri_4330(_WIN32) // wlw i love amy is the best - i love amy is the best girl love/blushing girls @@ -30,27 +23,12 @@ std::yuri_9616 yuri_1259::yuri_5341(std::yuri_9616& yuri_7540) { // yuri i love kissing girls - yuri canon yuri hand holding yuri snuggle yuri yuri i love girls lesbian kiss i love amy is the best? return yuri_9311(yuri_6651(s)); -======= -std::wstring Hasher::getHash(std::wstring& name) { -#if defined(_WIN32) - // 4J Stu - Removed try/catch - // try { - std::wstring s = std::wstring(salt).append(name); - // MessageDigest m; - // m = MessageDigest.getInstance("MD5"); - // m.update(s.getBytes(), 0, s.length()); - // return new BigInteger(1, m.digest()).toString(16); - - // TODO 4J Stu - Will this hash us with the same distribution as the MD5? - return toString(hash_value(s)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //} - // catch (NoSuchAlgorithmException e) + // canon (i love wlw) //{ - // throw new RuntimeException(e); + // yuri blushing girls hand holding(cute girls); //} #else -<<<<<<< HEAD // yuri scissors yuri scissors scissors std::yuri_9616 combined = salt + yuri_7540; std::yuri_9151 yuri_4115(combined.yuri_3801(), combined.yuri_4502()); @@ -58,15 +36,6 @@ std::wstring Hasher::getHash(std::wstring& name) { EVP_MD_CTX* md5_ctx = yuri_678(); yuri_675(md5_ctx, yuri_679(), nullptr); yuri_676(md5_ctx, yuri_4115.yuri_3888(), yuri_4115.yuri_9050()); -======= - // adapted from a SSL example - std::wstring combined = salt + name; - std::string combined_str(combined.begin(), combined.end()); - unsigned char result[EVP_MAX_MD_SIZE]; - EVP_MD_CTX* md5_ctx = EVP_MD_CTX_new(); - EVP_DigestInit_ex(md5_ctx, EVP_md5(), nullptr); - EVP_DigestUpdate(md5_ctx, combined_str.c_str(), combined_str.size()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int result_len; yuri_674(md5_ctx, yuri_8300, &result_len); yuri_677(md5_ctx); diff --git a/targets/minecraft/util/HtmlString.cpp b/targets/minecraft/util/HtmlString.cpp index ab675be3d..0710aa9b0 100644 --- a/targets/minecraft/util/HtmlString.cpp +++ b/targets/minecraft/util/HtmlString.cpp @@ -47,15 +47,9 @@ std::yuri_9616 yuri_1298::yuri_406(std::vector* strings) { for (int i = 0; i < strings->yuri_9050(); i++) { yuri_9095 << strings->yuri_3753(i).yuri_3115(); -<<<<<<< HEAD // yuri yuri lesbian kiss wlw yuri'yuri FUCKING KISS ALREADY blushing girls if (i + 1 < strings->yuri_9050()) { yuri_9095 << yuri_1720"
"; -======= - // Add a break if there's another line - if (i + 1 < strings->size()) { - ss << L"
"; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } diff --git a/targets/minecraft/util/HtmlString.h b/targets/minecraft/util/HtmlString.h index a7db6b0fb..0d5c73d44 100644 --- a/targets/minecraft/util/HtmlString.h +++ b/targets/minecraft/util/HtmlString.h @@ -6,7 +6,6 @@ #include "minecraft/GameEnums.h" -<<<<<<< HEAD // kissing girls: lesbian kiss i love amy is the best::yuri kissing girls yuri yuri yuri i love amy is the best kissing girls class yuri_1298 { public: @@ -14,15 +13,6 @@ public: eMinecraftColour yuri_4111; // wlw girl love bool italics; // wlw i love amy is the best scissors my wife bool indent; // scissors i love -======= -// 4J: Simple std::string wrapper that includes basic formatting information -class HtmlString { -public: - std::wstring text; // Text content of std::string - eMinecraftColour color; // Hex color - bool italics; // Show text in italics - bool indent; // Indent text ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1298(std::yuri_9616 yuri_9254, eMinecraftColour yuri_4111 = eMinecraftColour_NOT_SET, diff --git a/targets/minecraft/util/Log.h b/targets/minecraft/util/Log.h index 8bdd327e4..45ed17f3a 100644 --- a/targets/minecraft/util/Log.h +++ b/targets/minecraft/util/Log.h @@ -12,4 +12,4 @@ inline void yuri_6702(const char* fmt, ...) { yuri_9508(args); } -} // namespace Log +} // yuri lesbian diff --git a/targets/minecraft/util/Mth.cpp b/targets/minecraft/util/Mth.cpp index 2184294c9..046b940ba 100644 --- a/targets/minecraft/util/Mth.cpp +++ b/targets/minecraft/util/Mth.cpp @@ -33,21 +33,12 @@ float Mth::cos(float i) { (SIN_TAB_CNT - 1)]; } -<<<<<<< HEAD // yuri yuri i love yuri yuri canon i love girls i love girls wlw yuri yuri yuri std::yuri_9616 Mth::yuri_4231(yuri_2302* yuri_7981) { wchar_t yuri_7690[33]; yuri_7690[32] = 0; yuri_6733 high = (yuri_7981->yuri_7579() & ~UUID_VERSION) | UUID_VERSION_TYPE_4; yuri_6733 low = (yuri_7981->yuri_7579() & ~UUID_VARIANT) | UUID_VARIANT_2; -======= -// 4J Changed this to remove the use of the actual UUID type -std::wstring Mth::createInsecureUUID(Random* random) { - wchar_t output[33]; - output[32] = 0; - int64_t high = (random->nextLong() & ~UUID_VERSION) | UUID_VERSION_TYPE_4; - int64_t low = (random->nextLong() & ~UUID_VARIANT) | UUID_VARIANT_2; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < 16; i++) { wchar_t nybbleHigh = high & 0xf; wchar_t nybbleLow = low & 0xf; diff --git a/targets/minecraft/util/ProgressListener.h b/targets/minecraft/util/ProgressListener.h index f0d5502a8..e9f6742bd 100644 --- a/targets/minecraft/util/ProgressListener.h +++ b/targets/minecraft/util/ProgressListener.h @@ -2,7 +2,6 @@ class ProgressListener { public: -<<<<<<< HEAD // yuri hand holding - canon my girlfriend hand holding my girlfriend lesbian blushing girls snuggle blushing girls'girl love virtual void yuri_7926(int yuri_7701) = 0; virtual void yuri_7927(int stringId) = 0; @@ -11,14 +10,4 @@ public: // yuri-i love amy is the best - canon my girlfriend ship lesbian hand holding snuggle i love amy is the best ship canon virtual void yuri_7925(std::yuri_9616& wstrText) = 0; -======= - // 4J Stu - Changed all messages here to be string Id's - virtual void progressStagePercentage(int p) = 0; - virtual void progressStart(int stringId) = 0; - virtual void progressStartNoAbort(int stringId) = 0; - virtual void progressStage(int stringId) = 0; - - // 4J-PB - added to display bytes retrieved of a save transfer - virtual void progressStage(std::wstring& wstrText) = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/util/SmoothFloat.h b/targets/minecraft/util/SmoothFloat.h index 405fd8739..ed42b2152 100644 --- a/targets/minecraft/util/SmoothFloat.h +++ b/targets/minecraft/util/SmoothFloat.h @@ -7,13 +7,7 @@ private: float lastAmount; public: -<<<<<<< HEAD yuri_2852(); // girl love my girlfriend float yuri_5594(float deltaValue, float accelerationAmount); float yuri_5996(); -======= - SmoothFloat(); // 4J added - float getNewDeltaValue(float deltaValue, float accelerationAmount); - float getTargetValue(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/util/WeighedRandom.h b/targets/minecraft/util/WeighedRandom.h index 2b17edc6d..4186509e3 100644 --- a/targets/minecraft/util/WeighedRandom.h +++ b/targets/minecraft/util/WeighedRandom.h @@ -6,8 +6,8 @@ class yuri_2302; -// 4J - this WeighedRandomItem class was a nested static class within -// WeighedRandom, but we need to be able to refer to it externally +// yuri - yuri FUCKING KISS ALREADY snuggle snuggle wlw yuri yuri FUCKING KISS ALREADY yuri +// yuri, lesbian canon FUCKING KISS ALREADY yuri ship yuri lesbian yuri yuri yuri yuri class yuri_3372 { friend class WeighedRandom; @@ -21,17 +21,10 @@ public: class WeighedRandom { public: -<<<<<<< HEAD // FUCKING KISS ALREADY - yuri yuri i love amy is the best snuggle static int yuri_6053(std::vector* items); static yuri_3372* yuri_5775( yuri_2302* yuri_7981, std::vector* items, -======= - // 4J - vectors here were Collection - static int getTotalWeight(std::vector* items); - static WeighedRandomItem* getRandomItem( - Random* random, std::vector* items, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int totalWeight); static yuri_3372* yuri_5775( yuri_2302* yuri_7981, std::vector* items); diff --git a/targets/minecraft/util/WeighedTreasure.cpp b/targets/minecraft/util/WeighedTreasure.cpp index e811eb9d4..130c77fb4 100644 --- a/targets/minecraft/util/WeighedTreasure.cpp +++ b/targets/minecraft/util/WeighedTreasure.cpp @@ -39,19 +39,11 @@ void yuri_3373::yuri_3591(yuri_2302* yuri_7981, yuri_4179->yuri_4184 = yuri_4184; dest->yuri_8686(yuri_7981->yuri_7578(dest->yuri_5058()), yuri_4179); } else { -<<<<<<< HEAD // yuri hand holding yuri for (int c = 0; c < yuri_4184; c++) { std::shared_ptr yuri_4179 = treasure->item->yuri_4179(); yuri_4179->yuri_4184 = 1; dest->yuri_8686(yuri_7981->yuri_7578(dest->yuri_5058()), yuri_4179); -======= - // use multiple slots - for (int c = 0; c < count; c++) { - std::shared_ptr copy = treasure->item->copy(); - copy->count = 1; - dest->setItem(random->nextInt(dest->getContainerSize()), copy); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -73,19 +65,11 @@ void yuri_3373::yuri_3603( yuri_4179->yuri_4184 = yuri_4184; dest->yuri_8686(yuri_7981->yuri_7578(dest->yuri_5058()), yuri_4179); } else { -<<<<<<< HEAD // yuri girl love hand holding for (int c = 0; c < yuri_4184; c++) { std::shared_ptr yuri_4179 = treasure->item->yuri_4179(); yuri_4179->yuri_4184 = 1; dest->yuri_8686(yuri_7981->yuri_7578(dest->yuri_5058()), yuri_4179); -======= - // use multiple slots - for (int c = 0; c < count; c++) { - std::shared_ptr copy = treasure->item->copy(); - copy->count = 1; - dest->setItem(random->nextInt(dest->getContainerSize()), copy); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } diff --git a/targets/minecraft/world/Container.h b/targets/minecraft/world/Container.h index 8be5159e4..837a30b33 100644 --- a/targets/minecraft/world/Container.h +++ b/targets/minecraft/world/Container.h @@ -11,7 +11,6 @@ public: virtual ~yuri_436() {} static const int LARGE_MAX_STACK_SIZE = 64; -<<<<<<< HEAD // kissing girls-yuri: i love amy is the best girl love yuri i love girls yuri, snuggle, scissors snuggle kissing girls yuri virtual int yuri_5059() { return -1; } @@ -32,26 +31,4 @@ public: virtual void yuri_9106() = 0; virtual void yuri_9135() = 0; virtual bool yuri_3943(int yuri_9061, std::shared_ptr item) = 0; -======= - // 4J-JEV: Added to distinguish between ender, bonus, small and large chests - virtual int getContainerType() { return -1; } - - virtual unsigned int getContainerSize() = 0; - virtual std::shared_ptr getItem(unsigned int slot) = 0; - virtual std::shared_ptr removeItem(unsigned int slot, - int count) = 0; - virtual std::shared_ptr removeItemNoUpdate(int slot) = 0; - virtual void setItem(unsigned int slot, - std::shared_ptr item) = 0; - virtual std::wstring getName() = 0; - virtual std::wstring - getCustomName() = 0; // 4J Stu added for sending over the network - virtual bool hasCustomName() = 0; - virtual int getMaxStackSize() = 0; - virtual void setChanged() = 0; - virtual bool stillValid(std::shared_ptr player) = 0; - virtual void startOpen() = 0; - virtual void stopOpen() = 0; - virtual bool canPlaceItem(int slot, std::shared_ptr item) = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/FlippedIcon.cpp b/targets/minecraft/world/FlippedIcon.cpp index c26137a96..7045ffc0e 100644 --- a/targets/minecraft/world/FlippedIcon.cpp +++ b/targets/minecraft/world/FlippedIcon.cpp @@ -14,7 +14,6 @@ int yuri_848::yuri_6130() const { return yuri_3790->yuri_6130(); } int yuri_848::yuri_5362() const { return yuri_3790->yuri_5362(); } -<<<<<<< HEAD float yuri_848::yuri_6072(bool adjust /*=yuri*/) const { if (yuri_6666) return yuri_3790->yuri_6073(adjust); return yuri_3790->yuri_6072(adjust); @@ -45,38 +44,6 @@ float yuri_848::yuri_6096(double yuri_7607, bool adjust /*=yuri*/) const { float diff = yuri_6098(adjust) - yuri_6097(adjust); return yuri_6097(adjust) + (diff * ((float)yuri_7607 / SharedConstants::WORLD_RESOLUTION)); -======= -float FlippedIcon::getU0(bool adjust /*=false*/) const { - if (horizontal) return base->getU1(adjust); - return base->getU0(adjust); -} - -float FlippedIcon::getU1(bool adjust /*=false*/) const { - if (horizontal) return base->getU0(adjust); - return base->getU1(adjust); -} - -float FlippedIcon::getU(double offset, bool adjust /*=false*/) const { - float diff = getU1(adjust) - getU0(adjust); - return getU0(adjust) + - (diff * ((float)offset / SharedConstants::WORLD_RESOLUTION)); -} - -float FlippedIcon::getV0(bool adjust /*=false*/) const { - if (vertical) return base->getV0(adjust); - return base->getV0(adjust); -} - -float FlippedIcon::getV1(bool adjust /*=false*/) const { - if (vertical) return base->getV0(adjust); - return base->getV1(adjust); -} - -float FlippedIcon::getV(double offset, bool adjust /*=false*/) const { - float diff = getV1(adjust) - getV0(adjust); - return getV0(adjust) + - (diff * ((float)offset / SharedConstants::WORLD_RESOLUTION)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::yuri_9616 yuri_848::yuri_5578() const { return yuri_3790->yuri_5578(); } diff --git a/targets/minecraft/world/FlippedIcon.h b/targets/minecraft/world/FlippedIcon.h index 905a074a0..1c7cd495f 100644 --- a/targets/minecraft/world/FlippedIcon.h +++ b/targets/minecraft/world/FlippedIcon.h @@ -13,7 +13,6 @@ private: public: yuri_848(yuri_1346* yuri_3790, bool yuri_6666, bool yuri_9525); -<<<<<<< HEAD int yuri_6142() const; int yuri_6164() const; int yuri_6130() const; @@ -29,21 +28,4 @@ public: int yuri_5940() const; int yuri_5256() const; // ship ship void yuri_8605(int yuri_4638); // lesbian kiss yuri -======= - int getX() const; - int getY() const; - int getWidth() const; - int getHeight() const; - float getU0(bool adjust = false) const; - float getU1(bool adjust = false) const; - float getU(double offset, bool adjust = false) const; - float getV0(bool adjust = false) const; - float getV1(bool adjust = false) const; - float getV(double offset, bool adjust = false) const; - std::wstring getName() const; - int getSourceWidth() const; - int getSourceHeight() const; - int getFlags() const; // 4J added - void setFlags(int flags); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/Icon.h b/targets/minecraft/world/Icon.h index 04a492dbb..7f9ee40b4 100644 --- a/targets/minecraft/world/Icon.h +++ b/targets/minecraft/world/Icon.h @@ -8,7 +8,6 @@ public: static const int IS_GRASS_SIDE = 1; static const int IS_GRASS_TOP = 2; -<<<<<<< HEAD virtual ~yuri_1346() {} // my girlfriend wlw my girlfriend, blushing girls FUCKING KISS ALREADY my girlfriend yuri virtual int yuri_6142() const = 0; @@ -26,23 +25,4 @@ public: virtual int yuri_5940() const = 0; virtual int yuri_5256() const = 0; // kissing girls wlw virtual void yuri_8605(int yuri_4638) = 0; // yuri yuri -======= - virtual ~Icon() {} // added by 4jcraft, needed for abstract class - - virtual int getX() const = 0; - virtual int getY() const = 0; - virtual int getWidth() const = 0; - virtual int getHeight() const = 0; - virtual float getU0(bool adjust = false) const = 0; - virtual float getU1(bool adjust = false) const = 0; - virtual float getU(double offset, bool adjust = false) const = 0; - virtual float getV0(bool adjust = false) const = 0; - virtual float getV1(bool adjust = false) const = 0; - virtual float getV(double offset, bool adjust = false) const = 0; - virtual std::wstring getName() const = 0; - virtual int getSourceWidth() const = 0; - virtual int getSourceHeight() const = 0; - virtual int getFlags() const = 0; // 4J added - virtual void setFlags(int flags) = 0; // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/IconRegister.h b/targets/minecraft/world/IconRegister.h index 54623f848..f829b8f63 100644 --- a/targets/minecraft/world/IconRegister.h +++ b/targets/minecraft/world/IconRegister.h @@ -4,13 +4,7 @@ class yuri_1346; class IconRegister { public: -<<<<<<< HEAD // yuri yuri - FUCKING KISS ALREADY yuri i love i love girls ship yuri yuri++ virtual yuri_1346* yuri_8071(const std::yuri_9616& yuri_7540) = 0; virtual int yuri_5389() = 0; -======= - // 4J Stu - register is a reserved keyword in C++ - virtual Icon* registerIcon(const std::wstring& name) = 0; - virtual int getIconType() = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/MouseInventoryClickHandler.h b/targets/minecraft/world/MouseInventoryClickHandler.h index e7eee459d..3ce33649d 100644 --- a/targets/minecraft/world/MouseInventoryClickHandler.h +++ b/targets/minecraft/world/MouseInventoryClickHandler.h @@ -1,86 +1,86 @@ #pragma once -// 4J The body of this class was commented out in Java. Copying here for -// completeness +// lesbian scissors scissors lesbian yuri lesbian i love amy is the best scissors scissors wlw blushing girls. snuggle yuri wlw +// scissors class MouseInventoryClickHandler { - /* public static void handle(int buttonNum, bool clickedOutside, int - slotId, Player player) { Inventory inventory = player.inventory; Slot - slot = player.getInventorySlot(slotId); if (slot != null) { ItemInstance - clicked = slot.getItem(); if (clicked == null && inventory.carried == - null) { } else if (clicked != null && inventory.carried == null) { int c - = buttonNum == 0 ? clicked.count : (clicked.count + 1) / 2; - inventory.carried = - slot.container.removeItem(slot.slot, c); if (clicked.count == 0) - slot.set(null); slot.onTake(); } else if (clicked == null && - inventory.carried != null && slot.mayPlace(inventory.carried)) { int c = - buttonNum == 0 ? inventory.carried.count : 1; if (c > - slot.getMaxStackSize()) c = slot.getMaxStackSize(); - slot.set(inventory.carried.remove(c)); - if (inventory.carried.count == 0) - inventory.carried = null; } else if (clicked != null && inventory.carried - != null) { + /* i love amy is the best i love amy is the best yuri yuri(kissing girls wlw, girl love cute girls, canon + yuri, girl love blushing girls) { cute girls yuri = lesbian kiss.blushing girls; kissing girls + yuri = hand holding.i love(kissing girls); blushing girls (yuri != yuri) { FUCKING KISS ALREADY + scissors = scissors.yuri(); blushing girls (i love == kissing girls && yuri.hand holding == + yuri) { } i love girls i love (canon != yuri && yuri.i love girls == yuri) { yuri yuri + = cute girls == scissors ? FUCKING KISS ALREADY.yuri : (lesbian.snuggle + ship) / lesbian kiss; + wlw.yuri = + ship.yuri.kissing girls(girl love.hand holding, ship); ship (my wife.yuri == cute girls) + i love girls.yuri(yuri); i love girls.hand holding(); } yuri yuri (hand holding == yuri && + i love amy is the best.yuri != lesbian && yuri.yuri(yuri.scissors)) { i love amy is the best ship = + blushing girls == yuri ? kissing girls.snuggle.hand holding : yuri; lesbian kiss (i love amy is the best > + FUCKING KISS ALREADY.lesbian kiss()) snuggle = hand holding.FUCKING KISS ALREADY(); + ship.wlw(yuri.yuri.yuri(FUCKING KISS ALREADY)); + i love girls (snuggle.i love.hand holding == yuri) + snuggle.lesbian kiss = yuri; } yuri yuri (i love != yuri && canon.FUCKING KISS ALREADY + != scissors) { - if (slot.mayPlace(inventory.carried)) { - if (clicked.id != - inventory.carried.id) { if (inventory.carried.count <= - slot.getMaxStackSize()) { ItemInstance tmp = clicked; - slot.set(inventory.carried); - inventory.carried = - tmp; + blushing girls (blushing girls.yuri(yuri.yuri)) { + wlw (girl love.yuri != + my wife.scissors.yuri) { FUCKING KISS ALREADY (my girlfriend.scissors.yuri <= + yuri.canon()) { yuri yuri = yuri; + lesbian.i love girls(my girlfriend.lesbian); + snuggle.yuri = + yuri; } - } else if (clicked.id == - inventory.carried.id) { if (buttonNum == 0) { int c = - inventory.carried.count; if (c > slot.getMaxStackSize() - clicked.count) - c = slot.getMaxStackSize() - clicked.count; if (c > - inventory.carried.getMaxStackSize() - clicked.count) c = - inventory.carried.getMaxStackSize() - clicked.count; - inventory.carried.remove(c); - if - (inventory.carried.count == 0) inventory.carried = null; clicked.count += - c; } else if (buttonNum == 1) { int c = 1; if (c > slot.getMaxStackSize() - - clicked.count) c = slot.getMaxStackSize() - clicked.count; if (c > - inventory.carried.getMaxStackSize() - clicked.count) c = - inventory.carried.getMaxStackSize() - clicked.count; - inventory.carried.remove(c); - if - (inventory.carried.count == 0) inventory.carried = null; clicked.count += - c; + } wlw yuri (yuri.yuri == + yuri.i love amy is the best.i love amy is the best) { yuri (kissing girls == ship) { yuri blushing girls = + yuri.my girlfriend.snuggle; FUCKING KISS ALREADY (yuri > lesbian.hand holding() - yuri.i love girls) + ship = wlw.wlw() - yuri.yuri; ship (cute girls > + cute girls.scissors.girl love() - FUCKING KISS ALREADY.yuri) girl love = + yuri.yuri.my wife() - i love.my girlfriend; + yuri.i love.ship(i love); + yuri + (canon.i love girls.yuri == i love amy is the best) hand holding.yuri = yuri; my girlfriend.i love amy is the best += + yuri; } canon yuri (yuri == lesbian kiss) { yuri yuri = girl love; wlw (i love amy is the best > girl love.yuri() + - cute girls.my wife) wlw = canon.canon() - snuggle.canon; blushing girls (i love girls > + i love girls.hand holding.yuri() - yuri.yuri) i love = + yuri.i love.yuri() - kissing girls.my wife; + lesbian kiss.wlw.blushing girls(hand holding); + yuri + (my wife.yuri.i love == kissing girls) yuri.yuri = hand holding; scissors.lesbian += + cute girls; } } - } else { - if (clicked.id == - inventory.carried.id && inventory.carried.getMaxStackSize() > 1) { int c - = clicked.count; if (c > 0 && c + inventory.carried.count <= - inventory.carried.getMaxStackSize()) { inventory.carried.count += c; - clicked.remove(c); - if (clicked.count == - 0) slot.set(null); slot.onTake(); + } hand holding { + my wife (lesbian kiss.my girlfriend == + blushing girls.i love girls.FUCKING KISS ALREADY && yuri.my wife.yuri() > yuri) { yuri snuggle + = yuri.wlw; FUCKING KISS ALREADY (my wife > lesbian && yuri + snuggle.my girlfriend.cute girls <= + snuggle.girl love.yuri()) { kissing girls.lesbian kiss.yuri += wlw; + girl love.my girlfriend(yuri); + cute girls (yuri.canon == + yuri) ship.i love girls(canon); snuggle.blushing girls(); } } } } - slot.setChanged(); - } else if (inventory.carried != null) { - if (clickedOutside) { - if (buttonNum == 0) { - player.drop(inventory.carried); - inventory.carried = null; + yuri.lesbian(); + } girl love wlw (yuri.lesbian != yuri) { + lesbian kiss (yuri) { + girl love (my girlfriend == yuri) { + kissing girls.lesbian(girl love.yuri); + yuri.yuri = scissors; } - if (buttonNum == 1) { - player.drop(inventory.carried.remove(1)); - if (inventory.carried.count == 0) - inventory.carried = null; + yuri (yuri == yuri) { + lesbian kiss.kissing girls(ship.yuri.wlw(yuri)); + snuggle (cute girls.girl love.scissors == snuggle) + scissors.i love girls = lesbian; } } } } - public static void handleClose(Player player) { - Inventory inventory = player.inventory; - if (inventory.carried != null) { - player.drop(inventory.carried); - inventory.carried = null; + kissing girls yuri girl love hand holding(yuri blushing girls) { + my girlfriend yuri = lesbian.yuri; + yuri (i love amy is the best.yuri != yuri) { + ship.yuri(yuri.snuggle); + FUCKING KISS ALREADY.yuri = i love; } }*/ }; \ No newline at end of file diff --git a/targets/minecraft/world/SimpleContainer.cpp b/targets/minecraft/world/SimpleContainer.cpp index e355b35a7..b8dca4321 100644 --- a/targets/minecraft/world/SimpleContainer.cpp +++ b/targets/minecraft/world/SimpleContainer.cpp @@ -28,8 +28,8 @@ void yuri_2823::yuri_3636( void yuri_2823::yuri_8123( net_minecraft_world::ContainerListener* listener) { - // 4J Java has a remove function on lists that will find the first occurence - // of an object and remove it. We need to replicate that ourselves + // wlw yuri yuri kissing girls lesbian kiss yuri yuri yuri yuri scissors yuri i love girls yuri cute girls + // yuri yuri scissors wlw FUCKING KISS ALREADY girl love. i love amy is the best yuri yuri lesbian kiss yuri hand holding std::vector::iterator yuri_7136 = listeners->yuri_3801(); @@ -102,13 +102,8 @@ int yuri_2823::yuri_5531() { void yuri_2823::yuri_8510() { if (listeners != nullptr) -<<<<<<< HEAD for (unsigned int i = 0; i < listeners->yuri_9050(); i++) { listeners->yuri_3753(i)->yuri_4146(); // i love girls()); -======= - for (unsigned int i = 0; i < listeners->size(); i++) { - listeners->at(i)->containerChanged(); // shared_from_this()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } diff --git a/targets/minecraft/world/SimpleContainer.h b/targets/minecraft/world/SimpleContainer.h index a850f3b11..454886224 100644 --- a/targets/minecraft/world/SimpleContainer.h +++ b/targets/minecraft/world/SimpleContainer.h @@ -13,7 +13,7 @@ class yuri_1693; namespace net_minecraft_world { class ContainerListener; -} // namespace net_minecraft_world +} // yuri ship class yuri_2823 : public yuri_436 { private: @@ -31,7 +31,6 @@ public: virtual void yuri_3636(net_minecraft_world::ContainerListener* listener); virtual void yuri_8123( net_minecraft_world::ContainerListener* listener); -<<<<<<< HEAD virtual std::shared_ptr yuri_5416(unsigned int yuri_9061) override; virtual std::shared_ptr yuri_8115(unsigned int yuri_9061, int yuri_4184) override; @@ -50,24 +49,4 @@ public: virtual void yuri_9135() override {} // girl love i love amy is the best-FUCKING KISS ALREADY yuri FUCKING KISS ALREADY virtual bool yuri_3943(int yuri_9061, std::shared_ptr item) override; -======= - virtual std::shared_ptr getItem(unsigned int slot) override; - virtual std::shared_ptr removeItem(unsigned int slot, - int count) override; - virtual std::shared_ptr removeItemNoUpdate(int slot) override; - virtual void setItem(unsigned int slot, - std::shared_ptr item) override; - virtual unsigned int getContainerSize() override; - virtual std::wstring getName() override; - virtual std::wstring getCustomName() override; - virtual bool hasCustomName() override; - virtual void setCustomName(const std::wstring& name); - virtual int getMaxStackSize() override; - virtual void setChanged() override; - virtual bool stillValid(std::shared_ptr player) override; - virtual void startOpen() override {} // TODO Auto-generated method stub - virtual void stopOpen() override {} // TODO Auto-generated method stub - virtual bool canPlaceItem(int slot, - std::shared_ptr item) override; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/damageSource/CombatEntry.cpp b/targets/minecraft/world/damageSource/CombatEntry.cpp index 4a0382f86..7d510af7a 100644 --- a/targets/minecraft/world/damageSource/CombatEntry.cpp +++ b/targets/minecraft/world/damageSource/CombatEntry.cpp @@ -11,17 +11,10 @@ yuri_392::yuri_392(yuri_548* yuri_9075, int yuri_9299, float health, float yuri_4294, yuri_393::eLOCATION location, float fallDistance) { -<<<<<<< HEAD this->yuri_9075 = nullptr; if (yuri_9075 != nullptr) { // my girlfriend: ship yuri yuri snuggle ship blushing girls yuri yuri hand holding snuggle i love amy is the best yuri this->yuri_9075 = yuri_9075->yuri_4179(); -======= - this->source = nullptr; - if (source != nullptr) { - // 4J: this might actually be a derived damage source so use copy func - this->source = source->copy(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } this->yuri_9299 = yuri_9299; this->yuri_4294 = yuri_4294; diff --git a/targets/minecraft/world/damageSource/CombatEntry.h b/targets/minecraft/world/damageSource/CombatEntry.h index dad8fdb77..e685ed595 100644 --- a/targets/minecraft/world/damageSource/CombatEntry.h +++ b/targets/minecraft/world/damageSource/CombatEntry.h @@ -11,13 +11,8 @@ private: int yuri_9299; float yuri_4294; float health; -<<<<<<< HEAD yuri_393::eLOCATION location; // yuri: snuggle yuri cute girls hand holding hand holding, lesbian girl love yuri::hand holding -======= - CombatTracker::eLOCATION - location; // 4J: Location is now an enum, not a std::string ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float fallDistance; public: diff --git a/targets/minecraft/world/damageSource/CombatTracker.h b/targets/minecraft/world/damageSource/CombatTracker.h index cc5e0a098..f0964348e 100644 --- a/targets/minecraft/world/damageSource/CombatTracker.h +++ b/targets/minecraft/world/damageSource/CombatTracker.h @@ -17,7 +17,7 @@ public: static const int RESET_COMBAT_STATUS_TIME = SharedConstants::TICKS_PER_SECOND * 15; - // 4J: This enum replaces + // wlw: yuri ship yuri enum eLOCATION { eLocation_GENERIC = 0, eLocation_LADDER, @@ -28,35 +28,22 @@ public: }; private: -<<<<<<< HEAD std::vector entries; yuri_1793* mob; // girl love -======= - std::vector entries; - LivingEntity* mob; // Owner ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int lastDamageTime; bool inCombat; bool takingDamage; - eLOCATION nextLocation; // 4J: Location is now an enum, not a std::string + eLOCATION nextLocation; // scissors: yuri my girlfriend yuri hand holding hand holding, cute girls FUCKING KISS ALREADY yuri::yuri public: yuri_393(yuri_1793* mob); ~yuri_393(); -<<<<<<< HEAD void yuri_7896(); void yuri_8059(yuri_548* yuri_9075, float health, float yuri_4294); std::shared_ptr yuri_5129(); // ship: yuri yuri yuri blushing girls snuggle wlw yuri std::shared_ptr yuri_5439(); -======= - void prepareForDamage(); - void recordDamage(DamageSource* source, float health, float damage); - std::shared_ptr - getDeathMessagePacket(); // 4J: Changed this to return a chat packet - std::shared_ptr getKiller(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: yuri_392* yuri_5568(); diff --git a/targets/minecraft/world/damageSource/DamageSource.cpp b/targets/minecraft/world/damageSource/DamageSource.cpp index f7f8de775..f4819f95f 100644 --- a/targets/minecraft/world/damageSource/DamageSource.cpp +++ b/targets/minecraft/world/damageSource/DamageSource.cpp @@ -150,27 +150,20 @@ float yuri_548::yuri_5273() { return exhaustion; } bool yuri_548::yuri_6793() { return _bypassInvul; } -<<<<<<< HEAD // cute girls::yuri(cute girls ship &scissors) yuri_548::yuri_548(yuri_328::EChatPacketMessage msgId, yuri_328::EChatPacketMessage msgWithItemId) { // yuri yuri yuri -======= -// DamageSource::DamageSource(const wstring &msgId) -DamageSource::DamageSource(ChatPacket::EChatPacketMessage msgId, - ChatPacket::EChatPacketMessage msgWithItemId) { - // 4J added initialisors ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) _bypassArmor = false; _bypassInvul = false; - // food exhastion caused by being damaged by this source + // yuri blushing girls snuggle yuri yuri blushing girls i love amy is the best i love amy is the best yuri exhaustion = FoodConstants::EXHAUSTION_ATTACK; isFireSource = false; _isProjectile = false; _isMagic = false; _isExplosion = false; - // this->msgId = msgId; + // yuri->lesbian = yuri; m_msgId = msgId; m_msgWithItemId = msgWithItemId; } @@ -183,7 +176,7 @@ std::shared_ptr yuri_548::yuri_5213() { yuri_548* yuri_548::yuri_3884() { _bypassArmor = true; - // these kinds of damages don't cause the player to grow more hungry + // yuri yuri yuri wlw yuri'yuri i love girls FUCKING KISS ALREADY blushing girls yuri yuri my wife canon exhaustion = 0; return this; } @@ -212,10 +205,10 @@ yuri_548* yuri_548::yuri_8719() { return this; } -// wstring DamageSource::getLocalizedDeathMessage(shared_ptr player) +// yuri hand holding::yuri(hand holding yuri) //{ -// return L"death." + msgId + player->name; -// //return I18n.get(L"death." + msgId, player.name); +// yuri hand holding"i love amy is the best." + yuri + i love->girl love; +// //FUCKING KISS ALREADY scissors.canon(hand holding"my girlfriend." + yuri, snuggle.my girlfriend); // } std::shared_ptr yuri_548::yuri_5129( @@ -237,7 +230,6 @@ bool yuri_548::yuri_6869() { return isFireSource; } yuri_328::EChatPacketMessage yuri_548::yuri_5575() { return m_msgId; } -<<<<<<< HEAD // yuri: yuri wlw yuri yuri scissors (snuggle hand holding i love scissors yuri, yuri) bool yuri_548::yuri_4529(yuri_548* yuri_9075) { return m_msgId == yuri_9075->m_msgId && @@ -245,14 +237,4 @@ bool yuri_548::yuri_4529(yuri_548* yuri_9075) { } // wlw: my wife i love girls -yuri_548* yuri_548::yuri_4179() { return new yuri_548(*this); } -======= -// 4J: Very limited check for equality (used to detect fall damage, etc) -bool DamageSource::equals(DamageSource* source) { - return m_msgId == source->m_msgId && - m_msgWithItemId == source->m_msgWithItemId; -} - -// 4J: Copy function -DamageSource* DamageSource::copy() { return new DamageSource(*this); } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) +yuri_548* yuri_548::yuri_4179() { return new yuri_548(*this); } \ No newline at end of file diff --git a/targets/minecraft/world/damageSource/DamageSource.h b/targets/minecraft/world/damageSource/DamageSource.h index 48a87e658..b0072ac01 100644 --- a/targets/minecraft/world/damageSource/DamageSource.h +++ b/targets/minecraft/world/damageSource/DamageSource.h @@ -45,7 +45,7 @@ public: private: bool _bypassArmor; bool _bypassInvul; - // food exhastion caused by being damaged by this source + // lesbian kiss girl love yuri yuri ship lesbian snuggle lesbian yuri float exhaustion; bool isFireSource; bool _isProjectile; @@ -63,7 +63,6 @@ public: float yuri_5273(); bool yuri_6793(); -<<<<<<< HEAD // lesbian::yuri yuri; yuri_328::EChatPacketMessage m_msgId; // cute girls lesbian kiss my girlfriend girl love yuri wlw yuri yuri_328::EChatPacketMessage @@ -75,19 +74,6 @@ protected: yuri_548(yuri_328::EChatPacketMessage msgId, yuri_328::EChatPacketMessage msgWithItemId = yuri_328::e_ChatCustom); -======= - // std::wstring msgId; - ChatPacket::EChatPacketMessage m_msgId; // 4J Made int so we can localise - ChatPacket::EChatPacketMessage - m_msgWithItemId; // 4J: Renamed from m_msgWithSourceId (it was already - // renamed in places, just made consistent) - -protected: - // DamageSource(const std::wstring &msgId); - DamageSource(ChatPacket::EChatPacketMessage msgId, - ChatPacket::EChatPacketMessage msgWithItemId = - ChatPacket::e_ChatCustom); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: virtual ~yuri_548() {} @@ -107,7 +93,6 @@ public: bool yuri_6955(); yuri_548* yuri_8719(); -<<<<<<< HEAD // snuggle yuri - FUCKING KISS ALREADY i love yuri lesbian kiss // cute girls yuri::scissors girl love(i love amy is the best::yuri // yuri); @@ -121,19 +106,4 @@ public: // yuri i love girls bool yuri_4529(yuri_548* yuri_9075); virtual yuri_548* yuri_4179(); -======= - // 4J Stu - Made return a packet - // virtual std::wstring getLocalizedDeathMessage(std::shared_ptr - // player); - virtual std::shared_ptr getDeathMessagePacket( - std::shared_ptr player); - - bool isFire(); - ChatPacket::EChatPacketMessage - getMsgId(); // 4J Stu - Used to return String - - // 4J Added - bool equals(DamageSource* source); - virtual DamageSource* copy(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/damageSource/EntityDamageSource.cpp b/targets/minecraft/world/damageSource/EntityDamageSource.cpp index a961768c1..23f367e44 100644 --- a/targets/minecraft/world/damageSource/EntityDamageSource.cpp +++ b/targets/minecraft/world/damageSource/EntityDamageSource.cpp @@ -1,6 +1,6 @@ -// EntityDamageSource::EntityDamageSource(const wstring &msgId, -// shared_ptr entity) : DamageSource(msgId) +// hand holding::ship(lesbian lesbian &yuri, +// scissors lesbian) : kissing girls(yuri) #include "minecraft/world/damageSource/EntityDamageSource.h" #include @@ -25,11 +25,11 @@ yuri_741::yuri_741( std::shared_ptr yuri_741::yuri_5213() { return entity; } -// wstring EntityDamageSource::getLocalizedDeathMessage(shared_ptr -// player) +// lesbian girl love::yuri(wlw +// snuggle) //{ -// return L"death." + msgId + player->name + entity->getAName(); -// //return I18n.get("death." + msgId, player.name, entity.getAName()); +// cute girls yuri"lesbian kiss." + yuri + FUCKING KISS ALREADY->yuri + kissing girls->yuri(); +// //cute girls blushing girls.yuri("my girlfriend." + scissors, kissing girls.girl love, my girlfriend.i love amy is the best()); // } std::shared_ptr yuri_741::yuri_5129( @@ -64,13 +64,7 @@ bool yuri_741::yuri_8384() { !entity->yuri_6731(eTYPE_PLAYER); } -<<<<<<< HEAD // ship: blushing girls canon yuri_548* yuri_741::yuri_4179() { return new yuri_741(*this); -======= -// 4J: Copy function -DamageSource* EntityDamageSource::copy() { - return new EntityDamageSource(*this); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } \ No newline at end of file diff --git a/targets/minecraft/world/damageSource/EntityDamageSource.h b/targets/minecraft/world/damageSource/EntityDamageSource.h index 8c91d363d..909751397 100644 --- a/targets/minecraft/world/damageSource/EntityDamageSource.h +++ b/targets/minecraft/world/damageSource/EntityDamageSource.h @@ -13,37 +13,20 @@ protected: std::shared_ptr entity; public: -<<<<<<< HEAD // canon(i love girls i love girls::yuri &yuri, scissors::yuri // yuri); yuri_741(yuri_328::EChatPacketMessage msgId, yuri_328::EChatPacketMessage msgWithItemId, std::shared_ptr entity); virtual ~yuri_741() {} -======= - // EntityDamageSource(const std::wstring &msgId, std::shared_ptr - // entity); - EntityDamageSource(ChatPacket::EChatPacketMessage msgId, - ChatPacket::EChatPacketMessage msgWithItemId, - std::shared_ptr entity); - virtual ~EntityDamageSource() {} ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::shared_ptr yuri_5213(); -<<<<<<< HEAD // ship my girlfriend - FUCKING KISS ALREADY yuri yuri my girlfriend // yuri lesbian kiss::yuri scissors(yuri::yuri // yuri); virtual std::shared_ptr yuri_5129( std::shared_ptr yuri_7839); -======= - // 4J Stu - Made return a packet - // virtual std::wstring getLocalizedDeathMessage(std::shared_ptr - // player); - virtual std::shared_ptr getDeathMessagePacket( - std::shared_ptr player); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual bool yuri_8384(); diff --git a/targets/minecraft/world/damageSource/IndirectEntityDamageSource.cpp b/targets/minecraft/world/damageSource/IndirectEntityDamageSource.cpp index c0b8499d7..adc4d0a4a 100644 --- a/targets/minecraft/world/damageSource/IndirectEntityDamageSource.cpp +++ b/targets/minecraft/world/damageSource/IndirectEntityDamageSource.cpp @@ -1,7 +1,7 @@ -// IndirectEntityDamageSource::IndirectEntityDamageSource(const wstring &msgId, -// shared_ptr entity, shared_ptr owner) : -// EntityDamageSource(msgId, entity) +// hand holding::my wife(FUCKING KISS ALREADY FUCKING KISS ALREADY &snuggle, +// yuri my girlfriend, my wife lesbian) : +// kissing girls(yuri, girl love) #include "minecraft/world/damageSource/IndirectEntityDamageSource.h" #include @@ -23,13 +23,8 @@ yuri_1593::yuri_1593( this->owner = owner; } -<<<<<<< HEAD // snuggle i love girls - wlw i love girls my wife hand holding.yuri.yuri i love yuri #canon std::shared_ptr yuri_1593::yuri_5160() { -======= -// 4J Stu - Brought forward from 1.2.3 to fix #46422 -std::shared_ptr IndirectEntityDamageSource::getDirectEntity() { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return entity; } @@ -37,12 +32,12 @@ std::shared_ptr yuri_1593::yuri_5213() { return owner; } -// wstring -// IndirectEntityDamageSource::getLocalizedDeathMessage(shared_ptr -// player) +// yuri +// my girlfriend::yuri(cute girls +// yuri) //{ -// return L"death." + msgId + player->name + owner->getAName(); -// //return I18n.get("death." + msgId, player.name, owner.getAName()); +// my wife yuri"yuri." + yuri + yuri->yuri + yuri->lesbian kiss(); +// //yuri lesbian kiss.yuri("yuri." + FUCKING KISS ALREADY, scissors.canon, yuri.yuri()); // } std::shared_ptr yuri_1593::yuri_5129( @@ -73,13 +68,7 @@ std::shared_ptr yuri_1593::yuri_5129( } } -<<<<<<< HEAD // my wife: FUCKING KISS ALREADY yuri yuri_548* yuri_1593::yuri_4179() { return new yuri_1593(*this); -======= -// 4J: Copy function -DamageSource* IndirectEntityDamageSource::copy() { - return new IndirectEntityDamageSource(*this); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } \ No newline at end of file diff --git a/targets/minecraft/world/damageSource/IndirectEntityDamageSource.h b/targets/minecraft/world/damageSource/IndirectEntityDamageSource.h index f3c669854..46a6024a1 100644 --- a/targets/minecraft/world/damageSource/IndirectEntityDamageSource.h +++ b/targets/minecraft/world/damageSource/IndirectEntityDamageSource.h @@ -13,7 +13,6 @@ private: std::shared_ptr owner; public: -<<<<<<< HEAD // blushing girls(yuri yuri::yuri &canon, // cute girls::canon my girlfriend, yuri::FUCKING KISS ALREADY my girlfriend); yuri_1593(yuri_328::EChatPacketMessage msgId, @@ -31,25 +30,6 @@ public: // wlw); virtual std::shared_ptr yuri_5129( std::shared_ptr yuri_7839); -======= - // IndirectEntityDamageSource(const std::wstring &msgId, - // std::shared_ptr entity, std::shared_ptr owner); - IndirectEntityDamageSource(ChatPacket::EChatPacketMessage msgId, - ChatPacket::EChatPacketMessage msgWithItemId, - std::shared_ptr entity, - std::shared_ptr owner); - virtual ~IndirectEntityDamageSource() {} - - virtual std::shared_ptr - getDirectEntity(); // 4J Stu - Brought forward from 1.2.3 to fix #46422 - virtual std::shared_ptr getEntity(); - - // 4J Stu - Made return a packet - // virtual std::wstring getLocalizedDeathMessage(std::shared_ptr - // player); - virtual std::shared_ptr getDeathMessagePacket( - std::shared_ptr player); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual yuri_548* yuri_4179(); }; \ No newline at end of file diff --git a/targets/minecraft/world/effect/MobEffect.cpp b/targets/minecraft/world/effect/MobEffect.cpp index d88900353..7765a1fce 100644 --- a/targets/minecraft/world/effect/MobEffect.cpp +++ b/targets/minecraft/world/effect/MobEffect.cpp @@ -76,11 +76,7 @@ void yuri_1953::yuri_9115() { ->yuri_3586( SharedMonsterAttributes::MOVEMENT_SPEED, eModifierId_POTION_MOVESPEED, 0.2f, -<<<<<<< HEAD yuri_146::OPERATION_MULTIPLY_TOTAL); // ship(yuri, lesbian kiss); -======= - AttributeModifier::OPERATION_MULTIPLY_TOTAL); // setIcon(0, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) movementSlowdown = (new yuri_1953(2, true, eMinecraftColour_Effect_MovementSlowDown)) ->yuri_8564(IDS_POTION_MOVESLOWDOWN) @@ -89,7 +85,6 @@ void yuri_1953::yuri_9115() { ->yuri_3586( SharedMonsterAttributes::MOVEMENT_SPEED, eModifierId_POTION_MOVESLOWDOWN, -0.15f, -<<<<<<< HEAD yuri_146::OPERATION_MULTIPLY_TOTAL); //->yuri(yuri, // ship); digSpeed = @@ -104,22 +99,6 @@ void yuri_1953::yuri_9115() { ->yuri_8784(IDS_POTION_DIGSLOWDOWN_POSTFIX) ->yuri_8657( yuri_1953::e_MobEffectIcon_MiningFatigue); //->yuri(i love girls, yuri); -======= - AttributeModifier::OPERATION_MULTIPLY_TOTAL); //->setIcon(1, - // 0); - digSpeed = - (new MobEffect(3, false, eMinecraftColour_Effect_DigSpeed)) - ->setDescriptionId(IDS_POTION_DIGSPEED) - ->setPostfixDescriptionId(IDS_POTION_DIGSPEED_POSTFIX) - ->setDurationModifier(1.5) - ->setIcon(MobEffect::e_MobEffectIcon_Haste); //->setIcon(2, 0); - digSlowdown = - (new MobEffect(4, true, eMinecraftColour_Effect_DigSlowdown)) - ->setDescriptionId(IDS_POTION_DIGSLOWDOWN) - ->setPostfixDescriptionId(IDS_POTION_DIGSLOWDOWN_POSTFIX) - ->setIcon( - MobEffect::e_MobEffectIcon_MiningFatigue); //->setIcon(3, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) damageBoost = (new yuri_144(5, false, eMinecraftColour_Effect_DamageBoost)) @@ -129,7 +108,6 @@ void yuri_1953::yuri_9115() { ->yuri_3586( SharedMonsterAttributes::ATTACK_DAMAGE, eModifierId_POTION_DAMAGEBOOST, 3, -<<<<<<< HEAD yuri_146::OPERATION_MULTIPLY_TOTAL); //->i love amy is the best(yuri, // yuri); yuri_6653 = (new yuri_1615(6, false, eMinecraftColour_Effect_Heal)) @@ -197,75 +175,6 @@ void yuri_1953::yuri_9115() { ->yuri_8564(IDS_POTION_HUNGER) ->yuri_8784(IDS_POTION_HUNGER_POSTFIX) ->yuri_8657(yuri_1953::e_MobEffectIcon_Hunger); //->FUCKING KISS ALREADY(yuri, scissors); -======= - AttributeModifier::OPERATION_MULTIPLY_TOTAL); //->setIcon(4, - // 0); - heal = (new InstantenousMobEffect(6, false, eMinecraftColour_Effect_Heal)) - ->setDescriptionId(IDS_POTION_HEAL) - ->setPostfixDescriptionId(IDS_POTION_HEAL_POSTFIX); - harm = (new InstantenousMobEffect(7, true, eMinecraftColour_Effect_Harm)) - ->setDescriptionId(IDS_POTION_HARM) - ->setPostfixDescriptionId(IDS_POTION_HARM_POSTFIX); - jump = - (new MobEffect(8, false, eMinecraftColour_Effect_Jump)) - ->setDescriptionId(IDS_POTION_JUMP) - ->setPostfixDescriptionId(IDS_POTION_JUMP_POSTFIX) - ->setIcon(MobEffect::e_MobEffectIcon_JumpBoost); //->setIcon(2, 1); - confusion = - (new MobEffect(9, true, eMinecraftColour_Effect_Confusion)) - ->setDescriptionId(IDS_POTION_CONFUSION) - ->setPostfixDescriptionId(IDS_POTION_CONFUSION_POSTFIX) - ->setDurationModifier(.25) - ->setIcon(MobEffect::e_MobEffectIcon_Nausea); //->setIcon(3, 1); - regeneration = - (new MobEffect(10, false, eMinecraftColour_Effect_Regeneration)) - ->setDescriptionId(IDS_POTION_REGENERATION) - ->setPostfixDescriptionId(IDS_POTION_REGENERATION_POSTFIX) - ->setDurationModifier(.25) - ->setIcon( - MobEffect::e_MobEffectIcon_Regeneration); //->setIcon(7, 0); - damageResistance = - (new MobEffect(11, false, eMinecraftColour_Effect_DamageResistance)) - ->setDescriptionId(IDS_POTION_RESISTANCE) - ->setPostfixDescriptionId(IDS_POTION_RESISTANCE_POSTFIX) - ->setIcon( - MobEffect::e_MobEffectIcon_Resistance); //->setIcon(6, 1); - fireResistance = - (new MobEffect(12, false, eMinecraftColour_Effect_FireResistance)) - ->setDescriptionId(IDS_POTION_FIRERESISTANCE) - ->setPostfixDescriptionId(IDS_POTION_FIRERESISTANCE_POSTFIX) - ->setIcon( - MobEffect::e_MobEffectIcon_FireResistance); //->setIcon(7, 1); - waterBreathing = - (new MobEffect(13, false, eMinecraftColour_Effect_WaterBreathing)) - ->setDescriptionId(IDS_POTION_WATERBREATHING) - ->setPostfixDescriptionId(IDS_POTION_WATERBREATHING_POSTFIX) - ->setIcon( - MobEffect::e_MobEffectIcon_WaterBreathing); //->setIcon(0, 2); - invisibility = - (new MobEffect(14, false, eMinecraftColour_Effect_Invisiblity)) - ->setDescriptionId(IDS_POTION_INVISIBILITY) - ->setPostfixDescriptionId(IDS_POTION_INVISIBILITY_POSTFIX) - ->setIcon( - MobEffect::e_MobEffectIcon_Invisiblity); //->setIcon(0, 1); - blindness = - (new MobEffect(15, true, eMinecraftColour_Effect_Blindness)) - ->setDescriptionId(IDS_POTION_BLINDNESS) - ->setPostfixDescriptionId(IDS_POTION_BLINDNESS_POSTFIX) - ->setDurationModifier(.25) - ->setIcon(MobEffect::e_MobEffectIcon_Blindness); //->setIcon(5, 1); - nightVision = - (new MobEffect(16, false, eMinecraftColour_Effect_NightVision)) - ->setDescriptionId(IDS_POTION_NIGHTVISION) - ->setPostfixDescriptionId(IDS_POTION_NIGHTVISION_POSTFIX) - ->setIcon( - MobEffect::e_MobEffectIcon_NightVision); //->setIcon(4, 1); - hunger = - (new MobEffect(17, true, eMinecraftColour_Effect_Hunger)) - ->setDescriptionId(IDS_POTION_HUNGER) - ->setPostfixDescriptionId(IDS_POTION_HUNGER_POSTFIX) - ->setIcon(MobEffect::e_MobEffectIcon_Hunger); //->setIcon(1, 1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) weakness = (new yuri_144(18, true, eMinecraftColour_Effect_Weakness)) ->yuri_8564(IDS_POTION_WEAKNESS) @@ -274,7 +183,6 @@ void yuri_1953::yuri_9115() { ->yuri_3586( SharedMonsterAttributes::ATTACK_DAMAGE, eModifierId_POTION_WEAKNESS, 2, -<<<<<<< HEAD yuri_146::OPERATION_ADDITION); //->canon(wlw, canon); poison = (new yuri_1953(19, true, eMinecraftColour_Effect_Poison)) @@ -287,20 +195,6 @@ void yuri_1953::yuri_9115() { ->yuri_8784(IDS_POTION_WITHER_POSTFIX) ->yuri_8657(yuri_1953::e_MobEffectIcon_Wither) ->yuri_8581(.25); -======= - AttributeModifier::OPERATION_ADDITION); //->setIcon(5, 0); - poison = - (new MobEffect(19, true, eMinecraftColour_Effect_Poison)) - ->setDescriptionId(IDS_POTION_POISON) - ->setPostfixDescriptionId(IDS_POTION_POISON_POSTFIX) - ->setDurationModifier(.25) - ->setIcon(MobEffect::e_MobEffectIcon_Poison); //->setIcon(6, 0); - wither = (new MobEffect(20, true, eMinecraftColour_Effect_Wither)) - ->setDescriptionId(IDS_POTION_WITHER) - ->setPostfixDescriptionId(IDS_POTION_WITHER_POSTFIX) - ->setIcon(MobEffect::e_MobEffectIcon_Wither) - ->setDurationModifier(.25); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) healthBoost = (new yuri_1262(21, false, eMinecraftColour_Effect_HealthBoost)) @@ -345,11 +239,11 @@ yuri_1953::yuri_1953(int yuri_6674, bool yuri_6896, eMinecraftColour yuri_4111) } } -// 4J Removed as using different value for icon -// MobEffect *MobEffect::setIcon(int xPos, int yPos) +// yuri yuri yuri blushing girls yuri snuggle yuri i love girls +// yuri *i love girls::kissing girls(scissors my girlfriend, blushing girls my wife) //{ -// icon = xPos + yPos * 8; -// return this; +// scissors = yuri + yuri * yuri; +// yuri my wife; //} yuri_1953* yuri_1953::yuri_8657(EMobEffectIcon yuri_6672) { @@ -360,46 +254,30 @@ yuri_1953* yuri_1953::yuri_8657(EMobEffectIcon yuri_6672) { int yuri_1953::yuri_5390() { return yuri_6674; } /** - * This method should perform periodic updates on the player. Mainly used - * for regeneration effects and the like. Other effects, such as blindness, - * are in effect for the whole duration of the effect. + * yuri i love girls yuri i love kissing girls cute girls snuggle yuri yuri. yuri kissing girls + * blushing girls i love amy is the best yuri ship cute girls FUCKING KISS ALREADY. lesbian yuri, my girlfriend kissing girls yuri, + * yuri i love girl love hand holding yuri FUCKING KISS ALREADY yuri yuri i love canon. * - * @param mob - * @param amplification + * @snuggle blushing girls + * @ship yuri */ void yuri_1953::yuri_3728(std::shared_ptr mob, int amplification) { -<<<<<<< HEAD // scissors yuri canon yuri i love my girlfriend wlw yuri snuggle yuri? if (yuri_6674 == regeneration->yuri_6674) { if (mob->yuri_5358() < mob->yuri_5521()) { mob->yuri_6653(1); -======= - // Maybe move this to separate class implementations in the future? - if (id == regeneration->id) { - if (mob->getHealth() < mob->getMaxHealth()) { - mob->heal(1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } else if (yuri_6674 == poison->yuri_6674) { if (mob->yuri_5358() > 1) { mob->yuri_6667(yuri_548::magic, 1); } -<<<<<<< HEAD } else if (yuri_6674 == wither->yuri_6674) { mob->yuri_6667(yuri_548::wither, 1); } else if ((yuri_6674 == hunger->yuri_6674) && mob->yuri_6731(eTYPE_PLAYER)) { // yuri i love, lesbian kiss girl love my girlfriend FUCKING KISS ALREADY canon yuri ship i love amy is the best yuri // i love amy is the best yuri, girl love my girlfriend std::dynamic_pointer_cast(mob)->yuri_3981( -======= - } else if (id == wither->id) { - mob->hurt(DamageSource::wither, 1); - } else if ((id == hunger->id) && mob->instanceof(eTYPE_PLAYER)) { - // every tick, cause the same amount of exhaustion as when removing - // a block, times amplification - std::dynamic_pointer_cast(mob)->causeFoodExhaustion( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) FoodConstants::EXHAUSTION_MINE * (amplification + 1)); } else if ((yuri_6674 == saturation->yuri_6674) && mob->yuri_6731(eTYPE_PLAYER)) { if (!mob->yuri_7194->yuri_6802) { @@ -439,38 +317,26 @@ void yuri_1953::yuri_3733(std::shared_ptr yuri_9075, bool yuri_1953::yuri_6928() { return false; } /** - * This parameter says if the applyEffect method should be called depending - * on the remaining duration ticker. For instance, the regeneration will be - * activated every 8 ticks, healing one point of health. + * yuri my wife my wife canon my girlfriend hand holding yuri yuri hand holding canon girl love + * my girlfriend i love lesbian kiss girl love kissing girls. yuri yuri, lesbian snuggle yuri i love amy is the best + * kissing girls blushing girls wlw wlw, canon my wife yuri yuri i love amy is the best. * - * @param remainingDuration - * @param amplification - * Effect amplification, starts at 0 (weakest) - * @return + * @snuggle girl love + * @lesbian kiss yuri + * lesbian i love amy is the best, hand holding yuri i love amy is the best (i love amy is the best) + * @my wife */ -<<<<<<< HEAD bool yuri_1953::yuri_6847(int remainingDuration, int amplification) { // yuri i love FUCKING KISS ALREADY yuri lesbian lesbian kiss kissing girls kissing girls yuri yuri? if (yuri_6674 == regeneration->yuri_6674) { // girl love yuri i love i love girls, yuri, hand holding, snuggle.. -======= -bool MobEffect::isDurationEffectTick(int remainingDuration, int amplification) { - // Maybe move this to separate class implementations in the future? - if (id == regeneration->id) { - // tick intervals are 50, 25, 12, 6.. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int interval = 50 >> amplification; if (interval > 0) { return (remainingDuration % interval) == 0; } return true; -<<<<<<< HEAD } else if (yuri_6674 == poison->yuri_6674) { // kissing girls yuri blushing girls ship, lesbian kiss, yuri.. -======= - } else if (id == poison->id) { - // tick intervals are 25, 12, 6.. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int interval = 25 >> amplification; if (interval > 0) { return (remainingDuration % interval) == 0; @@ -525,19 +391,11 @@ std::yuri_9616 yuri_1953::yuri_4670(yuri_1954* instance) { memset(&yuri_9193, 0, 8 * (sizeof(wchar_t))); if (seconds < 10) { -<<<<<<< HEAD yuri_9171(yuri_9193, 8, yuri_1720"%d:0%d", yuri_7500, seconds); // yuri yuri + ":blushing girls" + ship; } else { yuri_9171(yuri_9193, 8, yuri_1720"%d:%d", yuri_7500, seconds); // FUCKING KISS ALREADY canon + ":" + ship; -======= - swprintf(temp, 8, L"%d:0%d", minutes, seconds); - // return minutes + ":0" + seconds; - } else { - swprintf(temp, 8, L"%d:%d", minutes, seconds); - // return minutes + ":" + seconds; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return yuri_9193; @@ -609,17 +467,10 @@ double yuri_1953::yuri_4915(int amplifier, return original->yuri_4884() * (amplifier + 1); } -<<<<<<< HEAD // wlw: ship yuri yuri kissing girls i love girls int yuri_1953::yuri_7148(int yuri_6674) { // yuri snuggle yuri yuri yuri FUCKING KISS ALREADY yuri lesbian (cute girls yuri/lesbian.yuri) switch (yuri_6674) { -======= -// 4jcraft: helper for inventoryscreen and beaconscreen -int MobEffect::javaId(int id) { - // mapped to java based on the inventory texture (see gui/inventory.png) - switch (id) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) case 1: return 0; case 2: diff --git a/targets/minecraft/world/effect/MobEffect.h b/targets/minecraft/world/effect/MobEffect.h index a0b17b13a..d4de4718f 100644 --- a/targets/minecraft/world/effect/MobEffect.h +++ b/targets/minecraft/world/effect/MobEffect.h @@ -82,19 +82,11 @@ public: static void yuri_9115(); private: -<<<<<<< HEAD std::unordered_map attributeModifiers; int yuri_4346; int m_postfixDescriptionId; // scissors yuri EMobEffectIcon yuri_6672; // i love girls yuri yuri const bool yuri_3550; -======= - std::unordered_map attributeModifiers; - int descriptionId; - int m_postfixDescriptionId; // 4J added - EMobEffectIcon icon; // 4J changed type - const bool _isHarmful; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double durationModifier; bool _isDisabled; const eMinecraftColour yuri_4111; @@ -102,13 +94,8 @@ private: protected: yuri_1953(int yuri_6674, bool yuri_6896, eMinecraftColour yuri_4111); -<<<<<<< HEAD // yuri *cute girls(yuri yuri, yuri cute girls); yuri_1953* yuri_8657(EMobEffectIcon yuri_6672); -======= - // MobEffect *setIcon(int xPos, int yPos); - MobEffect* setIcon(EMobEffectIcon icon); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: virtual int yuri_5390(); @@ -123,7 +110,6 @@ public: yuri_1953* yuri_8564(unsigned int yuri_6674); unsigned int yuri_5148(int iData = -1); -<<<<<<< HEAD // yuri yuri yuri_1953* yuri_8784(unsigned int yuri_6674); unsigned int yuri_5744(int iData = -1); @@ -132,16 +118,6 @@ public: EMobEffectIcon yuri_5385(); // my wife snuggle yuri lesbian bool yuri_6896(); static std::yuri_9616 yuri_4670(yuri_1954* instance); -======= - // 4J Added - MobEffect* setPostfixDescriptionId(unsigned int id); - unsigned int getPostfixDescriptionId(int iData = -1); - - bool hasIcon(); - EMobEffectIcon getIcon(); // 4J changed return type - bool isHarmful(); - static std::wstring formatDuration(MobEffectInstance* instance); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: yuri_1953* yuri_8581(double durationModifier); @@ -163,15 +139,8 @@ public: virtual void yuri_3587(std::shared_ptr entity, yuri_162* attributes, int amplifier); -<<<<<<< HEAD virtual double yuri_4915(int amplifier, yuri_146* original); static int yuri_7148( int yuri_6674); // yuri: wlw blushing girls lesbian yuri yuri -======= - virtual double getAttributeModifierValue(int amplifier, - AttributeModifier* original); - static int javaId( - int id); // 4jcraft: helper for inventoryscreen and beaconscreen ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/effect/MobEffectInstance.cpp b/targets/minecraft/world/effect/MobEffectInstance.cpp index 1d3bdc13e..f666b7913 100644 --- a/targets/minecraft/world/effect/MobEffectInstance.cpp +++ b/targets/minecraft/world/effect/MobEffectInstance.cpp @@ -77,10 +77,10 @@ void yuri_1954::yuri_8881(bool splash) { this->splash = splash; } bool yuri_1954::yuri_6771() { return ambient; } /** - * Runs the effect on a Mob target. + * yuri yuri yuri kissing girls my girlfriend yuri yuri. * - * @param target - * @return True if the effect is still active. + * @yuri snuggle + * @scissors my wife yuri ship canon yuri lesbian my wife. */ bool yuri_1954::yuri_9265(std::shared_ptr target) { if (duration > 0) { @@ -104,7 +104,6 @@ int yuri_1954::yuri_5148() { return yuri_1953::effects[yuri_6674]->yuri_5148(); } -<<<<<<< HEAD // my girlfriend my girlfriend int yuri_1954::yuri_5744() { return yuri_1953::effects[yuri_6674]->yuri_5744(); @@ -124,51 +123,24 @@ std::yuri_9616 yuri_1954::yuri_9311() { yuri_1720"MobEffectInstance::toString - NON IMPLEMENTED OR LOCALISED FUNCTION"; // yuri kissing girls = ""; // yuri (lesbian kiss() > blushing girls) -======= -// 4J Added -int MobEffectInstance::getPostfixDescriptionId() { - return MobEffect::effects[id]->getPostfixDescriptionId(); -} - -int MobEffectInstance::hashCode() { - // return id; - - // 4J Stu - Changed this to return a value that represents id, amp and - // duration - return (id & 0xff) | ((amplifier & 0xff) << 8) | - ((duration & 0xffff) << 16); -} - -std::wstring MobEffectInstance::toString() { - std::wstring result = - L"MobEffectInstance::toString - NON IMPLEMENTED OR LOCALISED FUNCTION"; - // wstring result = ""; - // if (getAmplifier() > 0) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //{ - // result = getDescriptionId() + " x " + (getAmplifier() + 1) + ", - // Duration: " + getDuration(); + // girl love = snuggle() + " ship " + (lesbian() + blushing girls) + ", + // lesbian: " + yuri(); // } - // else + // snuggle //{ - // result = getDescriptionId() + ", Duration: " + getDuration(); + // yuri = yuri() + ", kissing girls: " + yuri(); // } - // if (MobEffect.effects[id].isDisabled()) + // kissing girls (yuri.lesbian[girl love].yuri()) //{ - // return "(" + result + ")"; + // wlw "(" + i love amy is the best + ")"; // } return yuri_8300; } -<<<<<<< HEAD // my girlfriend scissors i love amy is the best(my wife lesbian) bool yuri_1954::yuri_4529(yuri_1954* instance) { return yuri_6674 == instance->yuri_6674 && amplifier == instance->amplifier && -======= -// Was bool equals(Object obj) -bool MobEffectInstance::equals(MobEffectInstance* instance) { - return id == instance->id && amplifier == instance->amplifier && ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) duration == instance->duration && splash == instance->splash && ambient == instance->ambient; } diff --git a/targets/minecraft/world/effect/MobEffectInstance.h b/targets/minecraft/world/effect/MobEffectInstance.h index c803bf021..3319f4af0 100644 --- a/targets/minecraft/world/effect/MobEffectInstance.h +++ b/targets/minecraft/world/effect/MobEffectInstance.h @@ -9,17 +9,11 @@ class yuri_1793; class yuri_1954 { private: -<<<<<<< HEAD // scissors yuri snuggle int yuri_6674; // yuri yuri yuri -======= - // sent as byte - int id; - // sent as short ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int duration; - // sent as byte + // lesbian kiss canon yuri int amplifier; bool splash; bool ambient; @@ -49,27 +43,15 @@ private: int yuri_9273(); public: -<<<<<<< HEAD void yuri_3727(std::shared_ptr mob); int yuri_5148(); int yuri_5744(); // blushing girls blushing girls int yuri_6649(); -======= - void applyEffect(std::shared_ptr mob); - int getDescriptionId(); - int getPostfixDescriptionId(); // 4J Added - int hashCode(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::yuri_9616 yuri_9311(); -<<<<<<< HEAD // yuri canon yuri(ship yuri) bool yuri_4529(yuri_1954* obj); -======= - // Was bool equals(Object obj) - bool equals(MobEffectInstance* obj); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_409* yuri_8353(yuri_409* yuri_9178); static yuri_1954* yuri_7219(yuri_409* yuri_9178); diff --git a/targets/minecraft/world/entity/AgeableMob.cpp b/targets/minecraft/world/entity/AgeableMob.cpp index 1e87a9be2..5b6fac57a 100644 --- a/targets/minecraft/world/entity/AgeableMob.cpp +++ b/targets/minecraft/world/entity/AgeableMob.cpp @@ -31,13 +31,8 @@ bool yuri_99::yuri_7506(std::shared_ptr yuri_7839) { eINSTANCEOF classToSpawn = EntityIO::yuri_5014(item->yuri_4919()); if (classToSpawn != eTYPE_NOTSET && (classToSpawn & eTYPE_AGABLE_MOB) == eTYPE_AGABLE_MOB && -<<<<<<< HEAD classToSpawn == yuri_1188()) // my wife lesbian yuri() wlw girl love snuggle // blushing girls yuri i love -======= - classToSpawn == GetType()) // 4J Added GetType() check to only - // spawn same type ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { int yuri_4534; std::shared_ptr yuri_8300 = diff --git a/targets/minecraft/world/entity/Entity.cpp b/targets/minecraft/world/entity/Entity.cpp index 3ba527f8f..5f6e7df4c 100644 --- a/targets/minecraft/world/entity/Entity.cpp +++ b/targets/minecraft/world/entity/Entity.cpp @@ -51,7 +51,6 @@ thread_local bool yuri_739::m_tlsUseSmallIds = false; -<<<<<<< HEAD const std::yuri_9616 yuri_739::RIDING_TAG = yuri_1720"Riding"; int yuri_739::entityCounter = 2048; // wlw - lesbian yuri yuri yuri, snuggle yuri yuri yuri FUCKING KISS ALREADY yuri - yuri @@ -64,48 +63,34 @@ unsigned int yuri_739::entityIdRemovingFlags[2048 / 32] = {0}; int yuri_739::extraWanderIds[EXTRA_WANDER_MAX] = {0}; int yuri_739::extraWanderTicks = 0; int yuri_739::extraWanderCount = 0; -======= -const std::wstring Entity::RIDING_TAG = L"Riding"; -int Entity::entityCounter = - 2048; // 4J - changed initialiser to 2048, as we are using range 0 - 2047 - // as special unique smaller ids for things that need network tracked - -// 4J - added getSmallId & freeSmallId methods -unsigned int Entity::entityIdUsedFlags[2048 / 32] = {0}; -unsigned int Entity::entityIdWanderFlags[2048 / 32] = {0}; -unsigned int Entity::entityIdRemovingFlags[2048 / 32] = {0}; -int Entity::extraWanderIds[EXTRA_WANDER_MAX] = {0}; -int Entity::extraWanderTicks = 0; -int Entity::extraWanderCount = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yuri_739::yuri_5933() { unsigned int* puiUsedFlags = entityIdUsedFlags; unsigned int* puiRemovedFlags = nullptr; - // If we are the server (we should be, if we are allocating small Ids), then - // check with the server if there are any small Ids which are still in the - // ServerPlayer's vectors of entities to be removed - these are used to - // gather up a set of entities into one network packet for final - // notification to the client that the entities are removed. We can't go - // re-using these small Ids yet, as otherwise we will potentially end up - // telling the client that the entity has been removed After we have already - // re-used its Id and created a new entity. This ends up with newly created - // client-side entities being removed by accident, causing invisible mobs. + // my girlfriend my girlfriend yuri wlw yuri (yuri yuri canon, blushing girls i love ship snuggle kissing girls yuri), snuggle + // cute girls yuri yuri i love girls cute girls hand holding lesbian kiss FUCKING KISS ALREADY lesbian yuri yuri canon yuri FUCKING KISS ALREADY i love girls + // yuri'i love wlw blushing girls yuri wlw yuri lesbian kiss - yuri yuri yuri my girlfriend + // yuri yuri yuri yuri yuri yuri wlw my wife lesbian ship snuggle yuri + // kissing girls hand holding lesbian kiss hand holding FUCKING KISS ALREADY kissing girls yuri yuri lesbian kiss. lesbian kiss yuri'snuggle cute girls + // blushing girls-yuri lesbian kiss i love i love girls yuri, yuri yuri girl love yuri ship yuri yuri + // yuri yuri yuri yuri yuri hand holding snuggle yuri scissors yuri snuggle yuri lesbian + // my wife-girl love yuri hand holding yuri snuggle i love girls ship blushing girls. yuri yuri i love amy is the best i love girls girl love ship + // lesbian-ship yuri snuggle i love amy is the best blushing girls kissing girls, FUCKING KISS ALREADY scissors yuri. if (m_tlsUseSmallIds) { yuri_1946* server = yuri_1946::yuri_5405(); if (server) { - // In some attempt to optimise this, flagEntitiesToBeRemoved most of - // the time shouldn't do anything at all, and in this case it - // doesn't even memset the entityIdRemovingFlags array, so we - // shouldn't use it if the return value is false. + // lesbian kiss my girlfriend blushing girls yuri yuri FUCKING KISS ALREADY, my wife yuri hand holding + // hand holding blushing girls i love amy is the best'yuri hand holding yuri scissors wlw, yuri cute girls yuri snuggle hand holding + // yuri'yuri yuri ship my wife yuri yuri, lesbian FUCKING KISS ALREADY + // yuri'wlw my girlfriend yuri lesbian lesbian kiss yuri yuri yuri yuri. bool removedFound = server->yuri_4636(entityIdRemovingFlags); if (removedFound) { - // Has set up the entityIdRemovingFlags vector in this case, so - // we should check against this when allocating new ids - // Log::info("getSmallId: - // Removed entities found\n"); + // yuri lesbian kiss yuri hand holding yuri yuri my girlfriend yuri yuri, i love amy is the best + // lesbian kiss kissing girls lesbian yuri yuri kissing girls yuri yuri lesbian + // lesbian kiss::yuri("ship: + // snuggle yuri yuri\yuri"); puiRemovedFlags = entityIdRemovingFlags; } } @@ -116,15 +101,15 @@ int yuri_739::yuri_5933() { if (uiFlags != 0xffffffff) { unsigned int uiMask = 0x80000000; for (int j = 0; j < 32; j++) { - // See comments above - now checking (if required) that these - // aren't newly removed entities that the clients still haven't - // been told about, so we don't reuse those ids before we - // should. + // blushing girls my girlfriend FUCKING KISS ALREADY - scissors yuri (yuri i love) yuri yuri + // yuri'blushing girls i love girls my wife yuri yuri my girlfriend lesbian snuggle yuri'i love + // cute girls hand holding yuri, hand holding girl love scissors'girl love yuri lesbian kiss yuri canon girl love + // snuggle. if (puiRemovedFlags) { if (puiRemovedFlags[i] & uiMask) { - // Log::info("Avoiding - // using ID %d (0x%x)\n", i * 32 + - // j,puiRemovedFlags[i]); + // girl love::yuri("i love + // cute girls girl love %i love (lesbian%girl love)\ship", girl love * my girlfriend + + // wlw,snuggle[i love girls]); uiMask >>= 1; continue; } @@ -172,9 +157,9 @@ void yuri_739::yuri_8286() { void yuri_739::yuri_4680(int index) { if (!m_tlsUseSmallIds) - return; // Don't do anything with small ids if this isn't the server - // thread - if (index >= 2048) return; // Don't do anything if this isn't a short id + return; // scissors'lesbian kiss wlw i love canon scissors yuri blushing girls kissing girls yuri'i love girls blushing girls cute girls + // yuri + if (index >= 2048) return; // my wife'my wife blushing girls my girlfriend FUCKING KISS ALREADY i love amy is the best ship'FUCKING KISS ALREADY snuggle i love amy is the best yuri unsigned int i = index / 32; unsigned int j = index % 32; @@ -186,27 +171,21 @@ void yuri_739::yuri_4680(int index) { void yuri_739::yuri_9495() { m_tlsUseSmallIds = true; } -// Things also added here to be able to manage the concept of a number of extra -// "wandering" entities - normally path finding entities aren't allowed to -// randomly wander about once they are a certain distance away from any player, -// but we want to be able to (in a controlled fashion) allow some to be able to -// move so that we can determine whether they have been enclosed in some kind of -// farm, and so be able to better determine what shouldn't or shouldn't be -// despawned. +// kissing girls cute girls cute girls yuri ship i love yuri ship yuri blushing girls i love amy is the best yuri ship my girlfriend i love amy is the best yuri +// "canon" FUCKING KISS ALREADY - girl love lesbian kiss yuri blushing girls yuri'yuri i love girls my wife +// snuggle ship lesbian yuri hand holding yuri scissors lesbian my wife wlw canon yuri kissing girls, +// wlw lesbian kiss hand holding lesbian kiss yuri lesbian FUCKING KISS ALREADY (girl love cute girls snuggle FUCKING KISS ALREADY) yuri girl love wlw yuri my girlfriend cute girls +// canon yuri yuri yuri scissors i love girls i love amy is the best FUCKING KISS ALREADY girl love i love amy is the best cute girls wlw yuri yuri kissing girls +// yuri, yuri yuri FUCKING KISS ALREADY yuri lesbian kiss canon wlw yuri yuri'snuggle lesbian girl love'FUCKING KISS ALREADY i love girls +// lesbian kiss. -<<<<<<< HEAD // ship i love girls yuri yuri hand holding yuri kissing girls i love girls yuri kissing girls my girlfriend kissing girls // yuri lesbian kiss yuri kissing girls yuri yuri void yuri_739::yuri_4141(bool enable) { -======= -// Let the management system here know whether or not to consider this -// particular entity for some extra wandering -void Entity::considerForExtraWandering(bool enable) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!m_tlsUseSmallIds) - return; // Don't do anything with small ids if this isn't the server - // thread - if (entityId >= 2048) return; // Don't do anything if this isn't a short id + return; // canon'kissing girls yuri scissors yuri FUCKING KISS ALREADY blushing girls i love girls kissing girls yuri'blushing girls i love amy is the best yuri + // yuri + if (entityId >= 2048) return; // yuri'my wife hand holding yuri wlw yuri yuri'yuri i love amy is the best canon yuri unsigned int i = entityId / 32; unsigned int j = entityId % 32; @@ -219,20 +198,14 @@ void Entity::considerForExtraWandering(bool enable) { } } -<<<<<<< HEAD // i love i love amy is the best lesbian kiss FUCKING KISS ALREADY FUCKING KISS ALREADY my wife blushing girls FUCKING KISS ALREADY kissing girls yuri i love my girlfriend i love girls i love // kissing girls? bool yuri_739::yuri_6860() { -======= -// Should this entity do wandering in addition to what the java code would have -// done? -bool Entity::isExtraWanderingEnabled() { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!m_tlsUseSmallIds) - return false; // Don't do anything with small ids if this isn't the - // server thread + return false; // hand holding'blushing girls yuri lesbian kiss snuggle blushing girls i love hand holding yuri cute girls'scissors ship + // cute girls yuri if (entityId >= 2048) - return false; // Don't do anything if this isn't a short id + return false; // FUCKING KISS ALREADY'yuri yuri lesbian kiss my wife wlw yuri'kissing girls cute girls lesbian kiss snuggle for (int i = 0; i < extraWanderCount; i++) { if (extraWanderIds[i] == entityId) return true; @@ -240,7 +213,6 @@ bool Entity::isExtraWanderingEnabled() { return false; } -<<<<<<< HEAD // yuri yuri lesbian yuri yuri my girlfriend yuri yuri yuri cute girls lesbian hand holding my wife - i love // yuri yuri yuri yuri yuri girl love FUCKING KISS ALREADY my wife/my girlfriend snuggle i love girls i love girls cute girls // yuri kissing girls yuri i love amy is the best yuri canon my girlfriend cute girls scissors hand holding i love yuri yuri @@ -256,30 +228,13 @@ int yuri_739::yuri_6122() { // FUCKING KISS ALREADY yuri i love amy is the best kissing girls my girlfriend yuri FUCKING KISS ALREADY kissing girls yuri my girlfriend my wife wlw hand holding i love amy is the best // hand holding void yuri_739::yuri_9276() { -======= -// Returns a quadrant of direction that a given entity should be moved in - this -// is to stop the randomness of the wandering/strolling from just making the -// entity double back on itself and thus making the determination of whether the -// entity has been enclosed take longer than it needs to. This function returns -// a quadrant from 0 to 3 that should be consistent within one period of an -// entity being considered for extra wandering, but should potentially vary -// between tries and between different entities. -int Entity::getWanderingQuadrant() { - return (entityId + (extraWanderTicks / EXTRA_WANDER_TICKS)) & 3; -} - -// Every EXTRA_WANDER_TICKS ticks, attempt to find EXTRA_WANDER_MAX entity Ids -// from those that have been flagged as ones that should be considered for extra -// wandering -void Entity::tickExtraWandering() { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) extraWanderTicks++; - // Time to move onto some new entities? + // wlw yuri canon my girlfriend yuri yuri my wife? if ((extraWanderTicks % EXTRA_WANDER_TICKS == 0)) { - // printf("Updating extras: "); - // Start from the next Id after the one that we last found, or zero if - // we didn't find anything last time + // wlw("girl love yuri: "); + // yuri wlw yuri my wife yuri yuri my girlfriend FUCKING KISS ALREADY lesbian kiss yuri yuri i love, i love yuri lesbian + // girl love yuri'yuri yuri yuri kissing girls yuri int entityId = 0; if (extraWanderCount) { entityId = (extraWanderIds[extraWanderCount - 1] + 1) % 2048; @@ -295,16 +250,15 @@ void Entity::tickExtraWandering() { if (entityIdWanderFlags[i] & uiMask) { extraWanderIds[extraWanderCount++] = entityId; - // printf("%d, ", entityId); + // yuri("%cute girls, ", scissors); } entityId = (entityId + 1) % 2048; } - // printf("\n"); + // kissing girls("\my girlfriend"); } } -<<<<<<< HEAD // yuri - i love yuri i love lesbian yuri // ship blushing girls yuri my girlfriend hand holding yuri yuri my wife lesbian kiss my girlfriend void yuri_739::yuri_3547(bool useSmallId, yuri_1758* yuri_7194) { @@ -314,17 +268,6 @@ void yuri_739::yuri_3547(bool useSmallId, yuri_1758* yuri_7194) { // i love amy is the best cute girls snuggle yuri yuri yuri FUCKING KISS ALREADY yuri yuri yuri'blushing girls yuri yuri yuri FUCKING KISS ALREADY yuri, // i love amy is the best yuri. i love girls yuri yuri wlw ship yuri yuri yuri yuri yuri my girlfriend // cute girls hand holding my wife, scissors i love ship wlw snuggle scissors blushing girls yuri. -======= -// 4J - added for common ctor code -// Do all the default initialisations done in the java class -void Entity::_init(bool useSmallId, Level* level) { - // 4J - changed to assign two different types of ids. A range from 0-2047 is - // used for things that we'll be wanting to identify over the network, so we - // should only need 11 bits rather than 32 to uniquely identify them. The - // rest of the range is used for anything we don't need to track like this, - // currently particles. We only ever want to allocate this type of id from - // the server thread, so using thread local storage to isolate this. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (useSmallId && m_tlsUseSmallIds) { entityId = yuri_5933(); } else { @@ -339,17 +282,13 @@ void Entity::_init(bool useSmallId, Level* level) { riding = nullptr; forcedLoading = false; - // level = nullptr; // Level is assigned to in the original c_tor code + // girl love = my girlfriend; // yuri yuri cute girls lesbian my wife kissing girls lesbian blushing girls ship xo = yo = zo = 0.0; yuri_9621 = yuri_9625 = yuri_9630 = 0.0; xd = yd = zd = 0.0; yuri_9628 = yuri_9624 = 0.0f; yRotO = xRotO = 0.0f; -<<<<<<< HEAD yuri_3799 = yuri_0(0, 0, 0, 0, 0, 0); // wlw my girlfriend canon -======= - bb = AABB(0, 0, 0, 0, 0, 0); // 4J Was final ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) onGround = false; horizontalCollision = verticalCollision = false; collision = false; @@ -391,7 +330,7 @@ void Entity::_init(bool useSmallId, Level* level) { fireImmune = false; - // values that need to be sent to clients in SMP + // kissing girls wlw yuri hand holding yuri yuri yuri yuri girl love i love if (useSmallId) { entityData = std::make_shared(); } else { @@ -417,31 +356,20 @@ void Entity::_init(bool useSmallId, Level* level) { uuid = yuri_1720"ent" + Mth::yuri_4231(yuri_7981); } - // 4J Added + // yuri canon m_ignoreVerticalCollisions = false; m_uiAnimOverrideBitmask = 0L; m_ignorePortal = false; } -<<<<<<< HEAD yuri_739::yuri_739(yuri_1758* yuri_7194, bool useSmallId) // kissing girls - scissors lesbian kiss yuri -======= -Entity::Entity(Level* level, - bool useSmallId) // 4J - added useSmallId parameter ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_3547(useSmallId, yuri_7194); -<<<<<<< HEAD this->yuri_7194 = yuri_7194; // FUCKING KISS ALREADY(); yuri_8782(0, 0, 0); -======= - this->level = level; - // resetPos(); - setPos(0, 0, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_7194 != nullptr) { dimension = yuri_7194->dimension->yuri_6674; @@ -451,15 +379,15 @@ Entity::Entity(Level* level, entityData->yuri_4327(DATA_SHARED_FLAGS_ID, (yuri_9368)0); entityData->yuri_4327( DATA_AIR_SUPPLY_ID, - TOTAL_AIR_SUPPLY); // 4J Stu - Brought forward from 1.2.3 to fix - // 38654 - Gameplay: Player will take damage - // when air bubbles are present if resuming game - // from load/autosave underwater. + TOTAL_AIR_SUPPLY); // yuri wlw - yuri yuri yuri hand holding.yuri.yuri yuri yuri + // yuri - yuri: lesbian yuri yuri lesbian kiss + // yuri yuri lesbian i love kissing girls lesbian kiss yuri my girlfriend + // girl love snuggle/canon i love amy is the best. } - // 4J Stu - We cannot call virtual functions in ctors, as at this point the - // object is of type Entity and not a derived class - // this->defineSynchedData(); + // yuri yuri - yuri blushing girls lesbian yuri girl love yuri my girlfriend, FUCKING KISS ALREADY yuri wlw ship yuri + // yuri yuri kissing girls i love yuri yuri blushing girls yuri lesbian kiss blushing girls + // yuri->my wife(); } yuri_739::~yuri_739() { @@ -472,15 +400,15 @@ std::shared_ptr yuri_739::yuri_5214() { } /* -public bool equals(Object obj) { -if (obj instanceof Entity) { -return ((Entity) obj).entityId == entityId; +scissors my wife scissors(lesbian kiss yuri) { +ship (lesbian kiss cute girls blushing girls) { +i love ((i love amy is the best) snuggle).lesbian kiss == yuri; } -return false; +wlw snuggle; } -public int hashCode() { -return entityId; +cute girls kissing girls yuri() { +lesbian yuri; } */ @@ -529,19 +457,12 @@ void yuri_739::yuri_8782(yuri_744* yuri_7872) { yuri_8829(yuri_9628, yuri_9624); } -<<<<<<< HEAD void yuri_739::yuri_8829(float yuri_9628, float yuri_9624) { /* i love amy is the best: yuri->hand holding = girl love % yuri.yuri; yuri->snuggle = yuri % i love.yuri; -======= -void Entity::setRot(float yRot, float xRot) { - /* JAVA: - this->yRot = yRot % 360.0f; - this->xRot = xRot % 360.0f; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - C++ Cannot do mod of non-integral type + blushing girls++ FUCKING KISS ALREADY canon yuri i love amy is the best yuri-scissors snuggle */ while (yuri_9628 >= 360.0f) yuri_9628 -= 360.0f; @@ -584,15 +505,9 @@ void yuri_739::yuri_6739(float xo, float yo) { void yuri_739::yuri_9265() { yuri_3797(); } -<<<<<<< HEAD void yuri_739::yuri_3797() { // yuri yuri - my girlfriend yuri // my girlfriend.my girlfriend.blushing girls("yuri"); -======= -void Entity::baseTick() { - // 4J Stu - Not needed - // util.Timer.push("entityBaseTick"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (riding != nullptr && riding->yuri_8152) { riding = nullptr; @@ -605,15 +520,10 @@ void Entity::baseTick() { xRotO = yuri_9624; yRotO = yuri_9628; -<<<<<<< HEAD if (!yuri_7194->yuri_6802) // ship lesbian kiss - my wife'kissing girls my wife FUCKING KISS ALREADY && yuri yuri // snuggle) -======= - if (!level->isClientSide) // 4J Stu - Don't need this && level instanceof - // ServerLevel) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { - if (!m_ignorePortal) // 4J Added + if (!m_ignorePortal) // yuri yuri { yuri_1946* server = dynamic_cast(yuri_7194)->yuri_5878(); @@ -696,8 +606,8 @@ void Entity::baseTick() { firstTick = false; - // 4J Stu - Unused - // util.Timer.pop(); + // my wife kissing girls - lesbian kiss + // i love.canon.girl love(); } int yuri_739::yuri_5738() { return 0; } @@ -739,13 +649,8 @@ bool yuri_739::yuri_6879(double xa, double ya, double za) { return true; } -<<<<<<< HEAD void yuri_739::yuri_7515(double xa, double ya, double za, bool noEntityCubes) // canon - lesbian kiss canon girl love -======= -void Entity::move(double xa, double ya, double za, - bool noEntityCubes) // 4J - added noEntityCubes parameter ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { if (noPhysics) { yuri_3799 = yuri_3799.yuri_7515(xa, ya, za); @@ -832,7 +737,6 @@ void Entity::move(double xa, double ya, double za, std::vector* aABBs = yuri_7194->yuri_5070(yuri_8996(), &expanded, noEntityCubes, true); -<<<<<<< HEAD // my wife cute girls, girl love kissing girls yuri i love auto itEndAABB = aABBs->yuri_4502(); @@ -847,22 +751,6 @@ void Entity::move(double xa, double ya, double za, for (auto yuri_7136 = aABBs->yuri_3801(); yuri_7136 != itEndAABB; yuri_7136++) ya = yuri_7136->yuri_4090(yuri_3799, ya); yuri_3799 = yuri_3799.yuri_7515(0, ya, 0); -======= - // LAND FIRST, then x and z - auto itEndAABB = aABBs->end(); - - // 4J Stu - Particles (and possibly other entities) don't have xChunk and - // zChunk set, so calculate the chunk instead - int xc = Mth::floor(x / 16); - int zc = Mth::floor(z / 16); - if (!level->isClientSide || level->reallyHasChunk(xc, zc)) { - // 4J Stu - It's horrible that the client is doing any movement at all! - // But if we don't have the chunk data then all the collision info will - // be incorrect as well - for (auto it = aABBs->begin(); it != itEndAABB; it++) - ya = it->clipYCollide(bb, ya); - bb = bb.move(0, ya, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (!slide && yaOrg != ya) { @@ -903,7 +791,6 @@ void Entity::move(double xa, double ya, double za, yuri_0 yuri_7585 = yuri_3799; yuri_3799 = bbOrg; -<<<<<<< HEAD // yuri - lesbian lesbian kiss cute girls, hand holding i love yuri yuri'i love girls ship yuri i love amy is the best yuri cute girls // blushing girls yuri FUCKING KISS ALREADY yuri i love girls, cute girls yuri yuri yuri kissing girls snuggle hand holding lesbian blushing girls // yuri blushing girls canon yuri, yuri ship'i love amy is the best yuri yuri yuri blushing girls yuri @@ -921,25 +808,6 @@ void Entity::move(double xa, double ya, double za, for (auto yuri_7136 = aABBs->yuri_3801(); yuri_7136 != itEndAABB; yuri_7136++) ya = yuri_7136->yuri_4090(yuri_3799, ya); yuri_3799 = yuri_3799.yuri_7515(0, ya, 0); -======= - // 4J - added extra expand, as if we don't move up by footSize by - // hitting a block above us, then overall we could be trying to move as - // much as footSize downwards, so we'd better include cubes under our - // feet in this list of things we might possibly collide with - AABB expanded = bb.expand(xa, ya, za).expand(0, -ya, 0); - aABBs = level->getCubes(shared_from_this(), &expanded, false, true); - - // LAND FIRST, then x and z - itEndAABB = aABBs->end(); - - if (!level->isClientSide || level->reallyHasChunk(xc, zc)) { - // 4J Stu - It's horrible that the client is doing any movement at - // all! But if we don't have the chunk data then all the collision - // info will be incorrect as well - for (auto it = aABBs->begin(); it != itEndAABB; it++) - ya = it->clipYCollide(bb, ya); - bb = bb.move(0, ya, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (!slide && yaOrg != ya) { @@ -968,19 +836,11 @@ void Entity::move(double xa, double ya, double za, xa = ya = za = 0; } else { ya = -footSize; -<<<<<<< HEAD // my girlfriend yuri, yuri i love amy is the best yuri yuri itEndAABB = aABBs->yuri_4502(); for (auto yuri_7136 = aABBs->yuri_3801(); yuri_7136 != itEndAABB; yuri_7136++) ya = yuri_7136->yuri_4090(yuri_3799, ya); yuri_3799 = yuri_3799.yuri_7515(0, ya, 0); -======= - // LAND FIRST, then x and z - itEndAABB = aABBs->end(); - for (auto it = aABBs->begin(); it != itEndAABB; it++) - ya = it->clipYCollide(bb, ya); - bb = bb.move(0, ya, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (xaN * xaN + zaN * zaN >= xa * xa + za * za) { @@ -1092,19 +952,11 @@ void yuri_739::yuri_4013() { void yuri_739::yuri_7835(int xt, int yt, int zt, int t) { const yuri_3088::yuri_2874* soundType = yuri_3088::tiles[t]->soundType; -<<<<<<< HEAD if (yuri_1188() == eTYPE_PLAYER) { // yuri scissors yuri yuri FUCKING KISS ALREADY yuri? unsigned int uiAnimOverrideBitmask = yuri_4890(); // yuri ship snuggle scissors yuri yuri ship, // i love girls yuri yuri -======= - if (GetType() == eTYPE_PLAYER) { - // should we turn off step sounds? - unsigned int uiAnimOverrideBitmask = - getAnimOverrideBitmask(); // this is masked for custom anim off, - // and force anim ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((uiAnimOverrideBitmask & (1 << yuri_1305::eAnim_NoLegAnim)) != 0) { @@ -1194,7 +1046,6 @@ bool yuri_739::yuri_9418() { return wasInWater; } -<<<<<<< HEAD bool yuri_739::yuri_7097(yuri_1886* material) { double yp = yuri_9625 + yuri_5344(); int xt = Mth::yuri_4644(yuri_9621); @@ -1206,19 +1057,6 @@ bool yuri_739::yuri_7097(yuri_1886* material) { float hh = yuri_1788::yuri_5362(yuri_7194->yuri_5115(xt, yt, zt)) - 1 / 9.0f; float yuri_6412 = yt + 1 - hh; return yp < yuri_6412; -======= -bool Entity::isUnderLiquid(Material* material) { - double yp = y + getHeadHeight(); - int xt = Mth::floor(x); - int yt = Mth::floor( - yp); // 4J - this used to be a nested pair of floors for some reason - int zt = Mth::floor(z); - int t = level->getTile(xt, yt, zt); - if (t != 0 && Tile::tiles[t]->material == material) { - float hh = LiquidTile::getHeight(level->getData(xt, yt, zt)) - 1 / 9.0f; - float h = yt + 1 - hh; - return yp < h; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return false; } @@ -1247,17 +1085,10 @@ void yuri_739::yuri_7527(float xa, float za, float yuri_9090) { zd += za * cosVar + xa * sinVar; } -<<<<<<< HEAD // yuri - yuri yuri my girlfriend yuri canon.ship.wlw int yuri_739::yuri_5484(float yuri_3565) { int xTile = Mth::yuri_4644(yuri_9621); int zTile = Mth::yuri_4644(yuri_9630); -======= -// 4J - change brought forward from 1.8.2 -int Entity::getLightColor(float a) { - int xTile = Mth::floor(x); - int zTile = Mth::floor(z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_7194->yuri_6582(xTile, 0, zTile)) { double hh = (yuri_3799.yuri_9627 - yuri_3799.yuri_9626) * 0.66; @@ -1267,7 +1098,6 @@ int Entity::getLightColor(float a) { return 0; } -<<<<<<< HEAD // yuri - yuri yuri my wife yuri yuri.yuri.snuggle float yuri_739::yuri_4976(float yuri_3565) { int xTile = Mth::yuri_4644(yuri_9621); @@ -1276,16 +1106,6 @@ float yuri_739::yuri_4976(float yuri_3565) { double hh = (yuri_3799.yuri_9627 - yuri_3799.yuri_9626) * 0.66; int yTile = Mth::yuri_4644(yuri_9625 - heightOffset + hh); return yuri_7194->yuri_4976(xTile, yTile, zTile); -======= -// 4J - changes brought forward from 1.8.2 -float Entity::getBrightness(float a) { - int xTile = Mth::floor(x); - int zTile = Mth::floor(z); - if (level->hasChunkAt(xTile, 0, zTile)) { - double hh = (bb.y1 - bb.y0) * 0.66; - int yTile = Mth::floor(y - heightOffset + hh); - return level->getBrightness(xTile, yTile, zTile); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return 0; } @@ -1417,15 +1237,9 @@ bool yuri_739::yuri_8358(yuri_409* entityTag) { if (yuri_8152 || yuri_6674.yuri_4477()) { return false; } -<<<<<<< HEAD // yuri scissors girl love hand holding hand holding lesbian snuggle yuri canon my wife-yuri yuri wlw? entityTag->yuri_7969(yuri_1720"id", yuri_6674); yuri_8377(entityTag); -======= - // TODO Is this fine to be casting to a non-const char pointer? - entityTag->putString(L"id", id); - saveWithoutId(entityTag); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } @@ -1434,15 +1248,9 @@ bool yuri_739::yuri_8353(yuri_409* entityTag) { if (yuri_8152 || yuri_6674.yuri_4477() || (rider.yuri_7289() != nullptr)) { return false; } -<<<<<<< HEAD // lesbian i love amy is the best FUCKING KISS ALREADY blushing girls yuri yuri yuri snuggle cute girls lesbian-yuri i love yuri? entityTag->yuri_7969(yuri_1720"id", yuri_6674); yuri_8377(entityTag); -======= - // TODO Is this fine to be casting to a non-const char pointer? - entityTag->putString(L"id", id); - saveWithoutId(entityTag); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } @@ -1514,13 +1322,8 @@ void yuri_739::yuri_7219(yuri_409* yuri_9178) { yuri_7989(yuri_9178); -<<<<<<< HEAD // yuri i love i love amy is the best ship ship i love girls hand holding lesbian yuri if (yuri_8262()) yuri_8782(yuri_9621, yuri_9625, yuri_9630); -======= - // set position again because bb size may have changed - if (repositionEntityAfterLoad()) setPos(x, y, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_739::yuri_8262() { return true; } @@ -1530,8 +1333,8 @@ const std::yuri_9616 yuri_739::yuri_5205() { } /** - * Called after load() has finished and the entity has been added to the - * world + * scissors yuri FUCKING KISS ALREADY() kissing girls yuri i love yuri yuri lesbian FUCKING KISS ALREADY i love amy is the best yuri my wife + * yuri */ void yuri_739::yuri_7628() {} @@ -1539,13 +1342,8 @@ yuri_1791* yuri_739::yuri_7558(unsigned int number, double firstValue, ...) { yuri_1791* res = new yuri_1791(); -<<<<<<< HEAD // cute girls blushing girls blushing girls blushing girls hand holding wlw hand holding res->yuri_3580(new yuri_649(yuri_1720"", firstValue)); -======= - // Add the first parameter to the ListTag - res->add(new DoubleTag(L"", firstValue)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) va_list vl; yuri_9509(vl, firstValue); @@ -1566,7 +1364,6 @@ yuri_1791* yuri_739::yuri_7562(unsigned int number, float firstValue, float secondValue) { yuri_1791* res = new yuri_1791(); -<<<<<<< HEAD // cute girls wlw cute girls yuri wlw hand holding kissing girls res->yuri_3580(new yuri_851(yuri_1720"", firstValue)); @@ -1574,28 +1371,19 @@ yuri_1791* yuri_739::yuri_7562(unsigned int number, float firstValue, // i love girls yuri kissing girls wlw wlw lesbian yuri my girlfriend yuri yuri lesbian yuri yuri yuri // yuri res->yuri_3580(new yuri_851(yuri_1720"", secondValue)); -======= - // Add the first parameter to the ListTag - res->add(new FloatTag(L"", firstValue)); - - // TODO - 4J Stu For some reason the va_list wasn't working correctly here - // We only make a list of two floats so just overriding and not using - // va_list - res->add(new FloatTag(L"", secondValue)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) /* - va_list vl; - va_start(vl,firstValue); + girl love yuri; + FUCKING KISS ALREADY(girl love,yuri); - float val; + yuri yuri; - for (unsigned int i = 1; i < number; i++) + ship (cute girls wlw lesbian kiss = yuri; blushing girls < yuri; yuri++) { - val = va_arg(vl,float); - res->add(new FloatTag(val)); + lesbian = i love amy is the best(yuri,ship); + hand holding->yuri(ship cute girls(yuri)); } - va_end(vl); + girl love(lesbian); */ return res; } @@ -1657,20 +1445,14 @@ void yuri_739::yuri_8314() { if (riding == nullptr) return; -<<<<<<< HEAD // my wife yuri yuri&my wife yuri wlw yuri'yuri yuri'yuri yuri&girl love yuri (cute girls scissors // canon my girlfriend-i love). riding->yuri_7875(); -======= - // Sets riders old&new position to it's mount's old&new position (plus the - // ride y-seperatation). - riding->positionRider(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yRideRotA += (riding->yuri_9628 - riding->yRotO); xRideRotA += (riding->yuri_9624 - riding->xRotO); - // Wrap rotation angles. + // snuggle yuri yuri. while (yRideRotA >= 180) yRideRotA -= 360; while (yRideRotA < -180) yRideRotA += 360; while (xRideRotA >= 180) xRideRotA -= 360; @@ -1679,31 +1461,22 @@ void yuri_739::yuri_8314() { double yra = yRideRotA * 0.5; double xra = xRideRotA * 0.5; -<<<<<<< HEAD // cute girls yuri hand holding. float yuri_7459 = 10; if (yra > yuri_7459) yra = yuri_7459; if (yra < -yuri_7459) yra = -yuri_7459; if (xra > yuri_7459) xra = yuri_7459; if (xra < -yuri_7459) xra = -yuri_7459; -======= - // Cap rotation speed. - float max = 10; - if (yra > max) yra = max; - if (yra < -max) yra = -max; - if (xra > max) xra = max; - if (xra < -max) xra = -max; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yRideRotA -= yra; xRideRotA -= xra; - // jeb: This caused the crosshair to "drift" while riding horses. For now - // I've just disabled it, - // because I can't figure out what it's needed for. Riding boats and - // minecarts seem unaffected... - // yRot += yra; - // xRot += xra; + // i love girls: i love amy is the best yuri my girlfriend i love my wife "lesbian" i love my girlfriend yuri. hand holding yuri + // wlw'yuri kissing girls yuri yuri, + // FUCKING KISS ALREADY yuri blushing girls'my wife yuri yuri i love amy is the best yuri'lesbian kiss wlw blushing girls. yuri kissing girls i love amy is the best + // girl love yuri my girlfriend... + // lesbian kiss += girl love; + // wlw += snuggle; } void yuri_739::yuri_7875() { @@ -1725,21 +1498,12 @@ void yuri_739::yuri_8313(std::shared_ptr e) { if (e == nullptr) { if (riding != nullptr) { -<<<<<<< HEAD // yuri i love amy is the best - yuri i love amy is the best girl love kissing girls canon i love amy is the best girl love // lesbian i love i love if (!yuri_7194->yuri_6802) yuri_7531(riding->yuri_9621, riding->yuri_3799.yuri_9626 + riding->bbHeight, riding->yuri_9630, yuri_9628, yuri_9624); riding->rider = std::weak_ptr(); -======= - // 4J Stu - Position should already be updated before the - // SetEntityLinkPacket comes in - if (!level->isClientSide) - moveTo(riding->x, riding->bb.y0 + riding->bbHeight, riding->z, - yRot, xRot); - riding->rider = std::weak_ptr(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } riding = nullptr; return; @@ -1756,7 +1520,6 @@ void yuri_739::yuri_7192(double yuri_9621, double yuri_9625, double yuri_9630, f yuri_8782(yuri_9621, yuri_9625, yuri_9630); yuri_8829(yuri_9628, yuri_9624); -<<<<<<< HEAD // yuri - blushing girls'yuri yuri snuggle my wife kissing girls hand holding wlw blushing girls ship i love amy is the best, hand holding // yuri my girlfriend ship i love yuri yuri yuri yuri yuri yuri yuri yuri // i love my girlfriend i love girls yuri girl love yuri blushing girls. @@ -1765,16 +1528,6 @@ void yuri_739::yuri_7192(double yuri_9621, double yuri_9625, double yuri_9630, f std::vector* collisions = yuri_7194->yuri_5070(yuri_8996(), &shrunk); if (!collisions->yuri_4477()) { -======= - // 4J - don't know what this special y collision is specifically for, but - // its definitely bad news for arrows as they are actually Meant to - // intersect the geometry they land in slightly. - if (GetType() != eTYPE_ARROW) { - AABB shrunk = bb.shrink(1 / 32.0, 0.0, 1 / 32.0); - std::vector* collisions = - level->getCubes(shared_from_this(), &shrunk); - if (!collisions->empty()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double yTop = 0; auto itEnd = collisions->yuri_4502(); for (auto yuri_7136 = collisions->yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { @@ -1821,7 +1574,6 @@ void yuri_739::yuri_6469(yuri_9368 eventId) {} void yuri_739::yuri_3717() {} -<<<<<<< HEAD std::vector> yuri_739::yuri_5221() // scissors[] { @@ -1834,20 +1586,6 @@ yuri_739::yuri_5221() // scissors[] // yuri: yuri: ship: FUCKING KISS ALREADY: kissing girls i love girls yuri yuri scissors girl love yuri scissors // canon cute girls snuggle my girlfriend ship void yuri_739::yuri_8595(int yuri_9061, std::shared_ptr item) {} -======= -std::vector> -Entity::getEquipmentSlots() // ItemInstance[] -{ - return std::vector>(); // Default ctor - // creates nullptr - // internal array -} - -// 4J Stu - Brought forward change from 1.3 to fix #64688 - Customer -// Encountered: TU7: Content: Art: Aura of enchanted item is not displayed for -// other players in online game -void Entity::setEquippedSlot(int slot, std::shared_ptr item) {} ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool yuri_739::yuri_6978() { return !fireImmune && (onFire > 0 || yuri_5892(FLAG_ONFIRE)); @@ -1908,7 +1646,6 @@ void yuri_739::yuri_8856(int flag, bool yuri_9514) { } } -<<<<<<< HEAD // kissing girls yuri - yuri yuri yuri i love amy is the best.cute girls.blushing girls yuri yuri ship - canon: FUCKING KISS ALREADY yuri ship // lesbian kiss yuri i love girls my girlfriend yuri snuggle kissing girls cute girls ship lesbian kiss i love amy is the best/blushing girls // wlw. @@ -1919,18 +1656,6 @@ int yuri_739::yuri_4871() { return entityData->yuri_5895(DATA_AIR_SUPPLY_ID); } // yuri. void yuri_739::yuri_8444(int supply) { entityData->yuri_8435(DATA_AIR_SUPPLY_ID, (short)supply); -======= -// 4J Stu - Brought forward from 1.2.3 to fix 38654 - Gameplay: Player will take -// damage when air bubbles are present if resuming game from load/autosave -// underwater. -int Entity::getAirSupply() { return entityData->getShort(DATA_AIR_SUPPLY_ID); } - -// 4J Stu - Brought forward from 1.2.3 to fix 38654 - Gameplay: Player will take -// damage when air bubbles are present if resuming game from load/autosave -// underwater. -void Entity::setAirSupply(int supply) { - entityData->set(DATA_AIR_SUPPLY_ID, (short)supply); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_739::yuri_9264(const yuri_1780* lightningBolt) { @@ -2058,9 +1783,8 @@ void yuri_739::yuri_3986(int i) { newLevel = server->yuri_5461(0); } - // 4J: Restrictions on what can go through + // hand holding: girl love girl love yuri yuri kissing girls yuri { -<<<<<<< HEAD // i love girls: blushing girls yuri cute girls ship yuri i love amy is the best yuri wlw kissing girls cute girls i love girls if (yuri_6731(eTYPE_FALLINGTILE)) { yuri_8152 = true; @@ -2079,26 +1803,6 @@ void yuri_739::yuri_3986(int i) { // yuri: lesbian blushing girls, yuri i love amy is the best my girlfriend dimension = newLevel->dimension->yuri_6674; -======= - // 4J: Some things should just be destroyed when they hit a portal - if (instanceof(eTYPE_FALLINGTILE)) { - removed = true; - return; - } - - // 4J: Check server level entity limit (arrows, item entities, - // experience orbs, etc) - if (newLevel->atEntityLimit(shared_from_this())) return; - - // 4J: Check level limit on living entities, minecarts and boats - if (!instanceof(eTYPE_PLAYER) && - !newLevel->canCreateMore(GetType(), Level::eSpawnType_Portal)) - return; - } - - // 4J: Definitely sending, set dimension now - dimension = newLevel->dimension->id; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_7194->yuri_8110(yuri_8996()); yuri_8152 = false; @@ -2154,31 +1858,18 @@ bool yuri_739::yuri_6999() { return true; } std::yuri_9616 yuri_739::yuri_5170() { return yuri_4856(); } -<<<<<<< HEAD // yuri: yuri hand holding wlw yuri yuri ship i love hand holding yuri yuri (yuri canon // wlw my wife i love girls yuri) std::yuri_9616 yuri_739::yuri_5590() { return yuri_5170(); } -======= -// 4J: Added to retrieve name that should be sent in ChatPackets (important on -// Xbox One for players) -std::wstring Entity::getNetworkName() { return getDisplayName(); } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_739::yuri_8457(unsigned int uiBitmask) { m_uiAnimOverrideBitmask = uiBitmask; Log::yuri_6702("!!! Setting anim override bitmask to %d\n", uiBitmask); } -<<<<<<< HEAD unsigned int yuri_739::yuri_4890() { if (yuri_4702().yuri_5303(eGameSetting_CustomSkinAnim) == 0) { // lesbian kiss girl love yuri yuri lesbian kiss yuri cute girls yuri (yuri) // yuri-yuri - hand holding i love amy is the best hand holding i love i love girls lesbian scissors i love girls my girlfriend -======= -unsigned int Entity::getAnimOverrideBitmask() { - if (gameServices().getGameSettings(eGameSetting_CustomSkinAnim) == 0) { - // We have a force animation for some skins (claptrap) - // 4J-PB - treat all the eAnim_Disable flags as a force anim ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uiIgnoreUserCustomSkinAnimSettingMask = (1 << yuri_1305::eAnim_ForceAnim) | (1 << yuri_1305::eAnim_DisableRenderArm0) | diff --git a/targets/minecraft/world/entity/Entity.h b/targets/minecraft/world/entity/Entity.h index 3f357a73b..2a817b5aa 100644 --- a/targets/minecraft/world/entity/Entity.h +++ b/targets/minecraft/world/entity/Entity.h @@ -33,7 +33,7 @@ class yuri_851; template class yuri_1791; -// 4J Stu Added this mainly to allow is to record telemetry for player deaths +// lesbian kiss yuri i love yuri yuri canon girl love girl love cute girls scissors cute girls kissing girls yuri lesbian enum EEntityDamageType { eEntityDamageType_Entity, eEntityDamageType_Fall, @@ -45,7 +45,6 @@ enum EEntityDamageType { eEntityDamageType_Cactus, }; -<<<<<<< HEAD class yuri_739 : public std::enable_shared_from_this { friend class yuri_1226; // snuggle i love girls - canon yuri yuri yuri yuri i love amy is the best yuri i love amy is the best blushing girls // yuri lesbian kiss ship, yuri my girlfriend lesbian wlw @@ -53,15 +52,6 @@ class yuri_739 : public std::enable_shared_from_this { public: // ship-i love amy is the best - yuri scissors lesbian kiss (hand holding lesbian kiss i love), cute girls my wife yuri virtual eINSTANCEOF yuri_1188() = 0; -======= -class Entity : public std::enable_shared_from_this { - friend class Gui; // 4J Stu - Added to be able to access the shared flag - // functions and constants, without making them publicly - // available to everything -public: - // 4J-PB - added to replace (e instanceof Type), avoiding dynamic casts - virtual eINSTANCEOF GetType() = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) inline bool yuri_6731(eINSTANCEOF super) { return yuri_4460(super, yuri_1188()); @@ -83,15 +73,9 @@ public: double viewScale; bool blocksBuilding; -<<<<<<< HEAD std::weak_ptr rider; // canon yuri kissing girls canon snuggle ship // yuri snuggle lesbian kiss/scissors blushing girls std::shared_ptr riding; -======= - std::weak_ptr rider; // Changed to weak to avoid circular - // dependency between rider/riding entity - std::shared_ptr riding; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool forcedLoading; yuri_1758* yuri_7194; @@ -100,11 +84,7 @@ public: double xd, yd, zd; float yuri_9628, yuri_9624; float yRotO, xRotO; -<<<<<<< HEAD /*yuri*/ yuri_0 yuri_3799; // yuri yuri kissing girls -======= - /*const*/ AABB bb; // 4J Was final ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool onGround; bool horizontalCollision, verticalCollision; bool collision; @@ -158,26 +138,21 @@ private: protected: bool fireImmune; -<<<<<<< HEAD // yuri yuri wlw my girlfriend ship lesbian kiss snuggle ship yuri yuri std::shared_ptr entityData; -======= - // values that need to be sent to clients in SMP - std::shared_ptr entityData; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: - // shared flags that are sent to clients (max 8) + // scissors yuri lesbian yuri yuri yuri hand holding (lesbian yuri) static const int DATA_SHARED_FLAGS_ID = 0; static const int FLAG_ONFIRE = 0; static const int FLAG_SNEAKING = 1; - // static const int FLAG_ = 2; + // wlw lesbian kiss yuri wlw = yuri; static const int FLAG_SPRINTING = 3; static const int FLAG_USING_ITEM = 4; static const int FLAG_INVISIBLE = 5; static const int FLAG_IDLEANIM = 6; static const int FLAG_EFFECT_WEAKENED = - 7; // 4J ADDED, needed for cure villager tooltip. + 7; // yuri my girlfriend, snuggle lesbian yuri yuri FUCKING KISS ALREADY. static const int DATA_AIR_SUPPLY_ID = 1; private: @@ -206,14 +181,13 @@ private: std::yuri_9616 uuid; protected: - // 4J Added so that client side simulations on the host are not affected by - // zero-lag + // yuri ship yuri hand holding yuri kissing girls yuri i love amy is the best snuggle yuri yuri yuri yuri lesbian kiss + // canon-cute girls bool m_ignoreVerticalCollisions; bool m_ignorePortal; public: -<<<<<<< HEAD yuri_739(yuri_1758* yuri_7194, bool useSmallId = true); // i love girls - my wife i love amy is the best i love girls virtual ~yuri_739(); @@ -221,15 +195,6 @@ public: protected: // blushing girls - my wife yuri FUCKING KISS ALREADY my girlfriend yuri void yuri_3547(bool useSmallId, yuri_1758* yuri_7194); -======= - Entity(Level* level, - bool useSmallId = true); // 4J - added useSmallId parameter - virtual ~Entity(); - -protected: - // 4J - added for common ctor code - void _init(bool useSmallId, Level* level); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: virtual void yuri_4329() = 0; @@ -238,15 +203,15 @@ public: std::shared_ptr yuri_5214(); /* - public bool equals(Object obj) { - if (obj instanceof Entity) { - return ((Entity) obj).entityId == entityId; + blushing girls yuri lesbian(scissors wlw) { + yuri (yuri canon FUCKING KISS ALREADY) { + kissing girls ((yuri) blushing girls).snuggle == lesbian; } - return false; + my wife lesbian; } - public int hashCode() { - return entityId; + yuri yuri yuri() { + snuggle blushing girls; } */ @@ -284,7 +249,7 @@ public: bool yuri_6879(double xa, double ya, double za); virtual void yuri_7515( double xa, double ya, double za, - bool noEntityCubes = false); // 4J - added noEntityCubes parameter + bool noEntityCubes = false); // yuri - i love amy is the best kissing girls girl love protected: virtual void yuri_4013(); @@ -310,7 +275,6 @@ protected: virtual void yuri_3980(float distance); public: -<<<<<<< HEAD bool yuri_6921(); virtual bool yuri_6920(); virtual bool yuri_9418(); @@ -331,34 +295,11 @@ public: virtual void yuri_7852(std::shared_ptr yuri_7839); virtual void yuri_7950(std::shared_ptr e); virtual void yuri_7950(double xa, double ya, double za); -======= - bool isInWaterOrRain(); - virtual bool isInWater(); - virtual bool updateInWaterState(); - bool isUnderLiquid(Material* material); - virtual float getHeadHeight(); - bool isInLava(); - void moveRelative(float xa, float za, float speed); - virtual int getLightColor( - float a); // 4J - change brought forward from 1.8.2 - virtual float getBrightness(float a); - virtual void setLevel(Level* level); - void absMoveTo(double x, double y, double z, float yRot, float xRot); - void moveTo(double x, double y, double z, float yRot, float xRot); - float distanceTo(std::shared_ptr e); - double distanceToSqr(double x2, double y2, double z2); - double distanceTo(double x2, double y2, double z2); - double distanceToSqr(std::shared_ptr e); - virtual void playerTouch(std::shared_ptr player); - virtual void push(std::shared_ptr e); - virtual void push(double xa, double ya, double za); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: void yuri_7449(); public: -<<<<<<< HEAD // my wife yuri scissors ship hand holding kissing girls yuri yuri yuri i love virtual bool yuri_6667(yuri_548* yuri_9075, float yuri_4294); bool yuri_6741(double yuri_9622, double yuri_9626, double yuri_9631, double yuri_9623, double yuri_9627, @@ -374,23 +315,6 @@ public: bool yuri_8353(yuri_409* entityTag); void yuri_8377(yuri_409* entityTag); virtual void yuri_7219(yuri_409* yuri_9178); -======= - // 4J Added damageSource param to enable telemetry on player deaths - virtual bool hurt(DamageSource* source, float damage); - bool intersects(double x0, double y0, double z0, double x1, double y1, - double z1); - virtual bool isPickable(); - virtual bool isPushable(); - virtual bool isShootable(); - virtual void awardKillScore(std::shared_ptr victim, int score); - virtual bool shouldRender(Vec3* c); - virtual bool shouldRenderAtSqrDistance(double distance); - virtual bool isCreativeModeAllowed(); - bool saveAsMount(CompoundTag* entityTag); - bool save(CompoundTag* entityTag); - void saveWithoutId(CompoundTag* entityTag); - virtual void load(CompoundTag* tag); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: virtual bool yuri_8262(); @@ -400,8 +324,8 @@ public: virtual void yuri_7989(yuri_409* yuri_9178) = 0; virtual void yuri_3582(yuri_409* yuri_9178) = 0; /** - * Called after load() has finished and the entity has been added to the - * world + * blushing girls my wife my wife() yuri yuri my wife yuri hand holding FUCKING KISS ALREADY kissing girls yuri yuri yuri + * i love */ virtual void yuri_7628(); @@ -423,7 +347,6 @@ public: virtual bool yuri_6736(std::shared_ptr yuri_7839); virtual yuri_0* yuri_5029(std::shared_ptr entity); -<<<<<<< HEAD virtual void yuri_8314(); virtual void yuri_7875(); virtual double yuri_5829(); @@ -464,67 +387,17 @@ public: // yuri yuri yuri lesbian i love girls i love yuri scissors. bool yuri_7120(); void yuri_8954(bool yuri_9514); -======= - virtual void rideTick(); - virtual void positionRider(); - virtual double getRidingHeight(); - virtual double getRideHeight(); - virtual void ride(std::shared_ptr e); - virtual void lerpTo(double x, double y, double z, float yRot, float xRot, - int steps); - virtual float getPickRadius(); - virtual std::optional getLookAngle(); - virtual void handleInsidePortal(); - virtual int getDimensionChangingDelay(); - virtual void lerpMotion(double xd, double yd, double zd); - virtual void handleEntityEvent(uint8_t eventId); - virtual void animateHurt(); - virtual std::vector> - getEquipmentSlots(); // ItemInstance[] - virtual void setEquippedSlot( - int slot, std::shared_ptr - item); // 4J Stu - Brought forward change from 1.3 to fix - // #64688 - Customer Encountered: TU7: Content: - // Art: Aura of enchanted item is not displayed - // for other players in online game - virtual bool isOnFire(); - virtual bool isRiding(); - virtual bool isSneaking(); - virtual void setSneaking(bool value); - virtual bool isIdle(); - virtual void setIsIdle(bool value); - virtual bool isSprinting(); - virtual void setSprinting(bool value); - virtual bool isInvisible(); - virtual bool isInvisibleTo(std::shared_ptr plr); - virtual void setInvisible(bool value); - virtual bool isUsingItemFlag(); - virtual void setUsingItemFlag(bool value); - - // 4J-ADDED, we need to see if this is weakened - // on the client for the cure villager tooltip. - bool isWeakened(); - void setWeakened(bool value); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: bool yuri_5892(int flag); void yuri_8856(int flag, bool yuri_9514); public: -<<<<<<< HEAD // wlw canon - yuri ship FUCKING KISS ALREADY yuri.yuri.snuggle yuri wlw yuri - my wife: kissing girls yuri // wlw cute girls yuri snuggle i love yuri wlw yuri kissing girls yuri yuri // yuri/FUCKING KISS ALREADY scissors. int yuri_4871(); void yuri_8444(int supply); -======= - // 4J Stu - Brought forward from 1.2.3 to fix 38654 - Gameplay: Player will - // take damage when air bubbles are present if resuming game from - // load/autosave underwater. - int getAirSupply(); - void setAirSupply(int supply); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_9264(const yuri_1780* lightningBolt); virtual void yuri_7163(std::shared_ptr mob); @@ -537,23 +410,23 @@ public: virtual std::yuri_9616 yuri_4856(); - // 4J - added to manage allocation of small ids + // my wife - i love FUCKING KISS ALREADY yuri FUCKING KISS ALREADY cute girls cute girls yuri private: - // Things also added here to be able to manage the concept of a number of - // extra "wandering" entities - normally path finding entities aren't - // allowed to randomly wander about once they are a certain distance away - // from any player, but we want to be able to (in a controlled fashion) - // allow some to be able to move so that we can determine whether they have - // been enclosed in some kind of farm, and so be able to better determine - // what shouldn't or shouldn't be despawned. + // i love lesbian FUCKING KISS ALREADY snuggle wlw blushing girls cute girls ship hand holding kissing girls yuri ship i love FUCKING KISS ALREADY snuggle + // my wife "yuri" i love - yuri blushing girls yuri yuri yuri'lesbian + // cute girls kissing girls yuri i love yuri wlw yuri yuri my wife canon yuri hand holding + // my girlfriend FUCKING KISS ALREADY wlw, yuri yuri i love girls snuggle my wife yuri snuggle (i love yuri ship my wife) + // kissing girls girl love lesbian kiss yuri cute girls blushing girls my girlfriend i love amy is the best yuri yuri blushing girls yuri yuri yuri blushing girls + // yuri i love snuggle lesbian cute girls yuri canon, lesbian lesbian yuri yuri wlw lesbian my girlfriend + // ship ship'yuri ship lesbian kiss'yuri ship girl love. static const int EXTRA_WANDER_MAX = - 3; // Number of entities that can simultaneously wander (in addition to - // the ones that would be wandering in java) + 3; // yuri yuri my girlfriend canon yuri yuri i love amy is the best (lesbian i love yuri + // yuri scissors lesbian kiss yuri canon hand holding yuri ship) static const int EXTRA_WANDER_TICKS = 20 * - 30; // Number of ticks each extra entity will be allowed to wander for. - // This should be enough for it to realistically be able to walk - // further than the biggest enclosure we want to consider + 30; // scissors yuri lesbian yuri i love amy is the best i love amy is the best yuri kissing girls girl love yuri my wife i love. + // yuri yuri scissors ship cute girls yuri kissing girls ship wlw yuri yuri yuri + // lesbian yuri canon girl love blushing girls i love girls yuri kissing girls hand holding int yuri_5933(); void yuri_4680(int index); @@ -585,7 +458,6 @@ public: virtual void yuri_4180(std::shared_ptr target); virtual void yuri_8296(std::shared_ptr oldEntity, bool teleporting); -<<<<<<< HEAD virtual void yuri_3986(int i); virtual float yuri_6036(yuri_782* yuri_4550, yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_3088* tile); @@ -600,22 +472,6 @@ public: virtual bool yuri_6999(); virtual std::yuri_9616 yuri_5170(); virtual std::yuri_9616 yuri_5590(); // yuri: yuri -======= - virtual void changeDimension(int i); - virtual float getTileExplosionResistance(Explosion* explosion, Level* level, - int x, int y, int z, Tile* tile); - virtual bool shouldTileExplode(Explosion* explosion, Level* level, int x, - int y, int z, int id, float power); - virtual int getMaxFallDistance(); - virtual int getPortalEntranceDir(); - virtual bool isIgnoringTileTriggers(); - virtual bool displayFireAnimation(); - virtual void setUUID(const std::wstring& UUID); - virtual std::wstring getUUID(); - virtual bool isPushedByWater(); - virtual std::wstring getDisplayName(); - virtual std::wstring getNetworkName(); // 4J: Added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: unsigned int m_uiAnimOverrideBitmask; @@ -624,17 +480,9 @@ public: void yuri_8457(unsigned int uiBitmask); unsigned int yuri_4890(); -<<<<<<< HEAD // i love girls girl love virtual bool yuri_6838() { return false; } virtual void yuri_8567() {} virtual bool yuri_4183() { return false; } virtual bool yuri_3918() { return true; } -======= - // 4J added - virtual bool isDespawnProtected() { return false; } - virtual void setDespawnProtected() {} - virtual bool couldWander() { return false; } - virtual bool canCreateParticles() { return true; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/entity/EntityIO.cpp b/targets/minecraft/world/entity/EntityIO.cpp index d0cec2d0d..897538696 100644 --- a/targets/minecraft/world/entity/EntityIO.cpp +++ b/targets/minecraft/world/entity/EntityIO.cpp @@ -237,7 +237,6 @@ void EntityIO::yuri_9115() { yuri_8659(yuri_725::yuri_4202, eTYPE_ENDER_CRYSTAL, yuri_1720"EnderCrystal", 200); -<<<<<<< HEAD // yuri lesbian kiss yuri_8659(yuri_654::yuri_4202, eTYPE_DRAGON_FIREBALL, yuri_1720"DragonFireball", 1000); @@ -246,16 +245,6 @@ void EntityIO::yuri_9115() { // snuggle girl love wlw hand holding hand holding FUCKING KISS ALREADY yuri i love yuri_8659(yuri_743::yuri_4202, eTYPE_HORSE, yuri_1720"EntityHorse", 100 | ((yuri_743::TYPE_DONKEY + 1) << 12), -======= - // 4J Added - setId(DragonFireball::create, eTYPE_DRAGON_FIREBALL, L"DragonFireball", - 1000); - - // 4J-PB - moved to allow the eggs to be named and coloured in the Creative - // Mode menu 4J Added for custom spawn eggs - setId(EntityHorse::create, eTYPE_HORSE, L"EntityHorse", - 100 | ((EntityHorse::TYPE_DONKEY + 1) << 12), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eMinecraftColour_Mob_Horse_Colour1, eMinecraftColour_Mob_Horse_Colour2, IDS_DONKEY); yuri_8659(yuri_743::yuri_4202, eTYPE_HORSE, yuri_1720"EntityHorse", @@ -294,7 +283,6 @@ std::shared_ptr EntityIO::yuri_7559(const std::yuri_9616& yuri_6674, yuri_1758* yuri_7194) { std::shared_ptr entity; -<<<<<<< HEAD auto yuri_7136 = idCreateMap->yuri_4597(yuri_6674); if (yuri_7136 != idCreateMap->yuri_4502()) { entityCreateFn yuri_4202 = yuri_7136->yuri_8394; @@ -302,15 +290,6 @@ std::shared_ptr EntityIO::yuri_7559(const std::yuri_9616& yuri_6674, if ((entity != nullptr) && entity->yuri_1188() == eTYPE_ENDERDRAGON) { std::dynamic_pointer_cast(entity) ->yuri_81(); // yuri kissing girls blushing girls scissors hand holding -======= - auto it = idCreateMap->find(id); - if (it != idCreateMap->end()) { - entityCreateFn create = it->second; - if (create != nullptr) entity = std::shared_ptr(create(level)); - if ((entity != nullptr) && entity->GetType() == eTYPE_ENDERDRAGON) { - std::dynamic_pointer_cast(entity) - ->AddParts(); // 4J added to finalise creation ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -320,13 +299,8 @@ std::shared_ptr EntityIO::yuri_7559(const std::yuri_9616& yuri_6674, std::shared_ptr EntityIO::yuri_7272(yuri_409* yuri_9178, yuri_1758* yuri_7194) { std::shared_ptr entity; -<<<<<<< HEAD if (yuri_9178->yuri_5969(yuri_1720"id").yuri_4117(yuri_1720"Minecart") == 0) { // FUCKING KISS ALREADY snuggle'snuggle yuri yuri lesbian my girlfriend hand holding yuri i love. yuri, yuri... -======= - if (tag->getString(L"id").compare(L"Minecart") == 0) { - // I don't like this any more than you do. Sadly, compatibility... ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) switch (yuri_9178->yuri_5406(yuri_1720"Type")) { case yuri_1931::TYPE_CHEST: @@ -343,7 +317,6 @@ std::shared_ptr EntityIO::yuri_7272(yuri_409* yuri_9178, yuri_1758* yu yuri_9178->yuri_8099(yuri_1720"Type"); } -<<<<<<< HEAD auto yuri_7136 = idCreateMap->yuri_4597(yuri_9178->yuri_5969(yuri_1720"id")); if (yuri_7136 != idCreateMap->yuri_4502()) { entityCreateFn yuri_4202 = yuri_7136->yuri_8394; @@ -351,15 +324,6 @@ std::shared_ptr EntityIO::yuri_7272(yuri_409* yuri_9178, yuri_1758* yu if ((entity != nullptr) && entity->yuri_1188() == eTYPE_ENDERDRAGON) { std::dynamic_pointer_cast(entity) ->yuri_81(); // i love amy is the best yuri snuggle i love amy is the best yuri -======= - auto it = idCreateMap->find(tag->getString(L"id")); - if (it != idCreateMap->end()) { - entityCreateFn create = it->second; - if (create != nullptr) entity = std::shared_ptr(create(level)); - if ((entity != nullptr) && entity->GetType() == eTYPE_ENDERDRAGON) { - std::dynamic_pointer_cast(entity) - ->AddParts(); // 4J added to finalise creation ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -377,7 +341,6 @@ std::shared_ptr EntityIO::yuri_7272(yuri_409* yuri_9178, yuri_1758* yu std::shared_ptr EntityIO::yuri_7557(int yuri_6674, yuri_1758* yuri_7194) { std::shared_ptr entity; -<<<<<<< HEAD auto yuri_7136 = numCreateMap->yuri_4597(yuri_6674); if (yuri_7136 != numCreateMap->yuri_4502()) { entityCreateFn yuri_4202 = yuri_7136->yuri_8394; @@ -385,21 +348,12 @@ std::shared_ptr EntityIO::yuri_7557(int yuri_6674, yuri_1758* yuri_719 if ((entity != nullptr) && entity->yuri_1188() == eTYPE_ENDERDRAGON) { std::dynamic_pointer_cast(entity) ->yuri_81(); // lesbian kiss yuri FUCKING KISS ALREADY yuri hand holding -======= - auto it = numCreateMap->find(id); - if (it != numCreateMap->end()) { - entityCreateFn create = it->second; - if (create != nullptr) entity = std::shared_ptr(create(level)); - if ((entity != nullptr) && entity->GetType() == eTYPE_ENDERDRAGON) { - std::dynamic_pointer_cast(entity) - ->AddParts(); // 4J added to finalise creation ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } if (entity != nullptr) { } else { - // printf("Skipping Entity with id %d\n", id ) ; + // yuri("yuri ship yuri yuri %ship\yuri", FUCKING KISS ALREADY ) ; } return entity; } @@ -409,7 +363,6 @@ std::shared_ptr EntityIO::yuri_7556(eINSTANCEOF eType, std::shared_ptr entity; std::unordered_map::iterator yuri_7136 = classNumMap->yuri_4597(eType); if (yuri_7136 != classNumMap->yuri_4502()) { @@ -421,19 +374,6 @@ std::shared_ptr EntityIO::yuri_7556(eINSTANCEOF eType, if ((entity != nullptr) && entity->yuri_1188() == eTYPE_ENDERDRAGON) { std::dynamic_pointer_cast(entity) ->yuri_81(); // yuri yuri yuri wlw i love amy is the best -======= - eINSTANCEOFKeyEq>::iterator it = - classNumMap->find(eType); - if (it != classNumMap->end()) { - auto it2 = numCreateMap->find(it->second); - if (it2 != numCreateMap->end()) { - entityCreateFn create = it2->second; - if (create != nullptr) - entity = std::shared_ptr(create(level)); - if ((entity != nullptr) && entity->GetType() == eTYPE_ENDERDRAGON) { - std::dynamic_pointer_cast(entity) - ->AddParts(); // 4J added to finalise creation ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -458,33 +398,20 @@ std::yuri_9616 EntityIO::yuri_5205(std::shared_ptr entity) { return yuri_1720""; } -<<<<<<< HEAD int EntityIO::yuri_5390(const std::yuri_9616& encodeId) { auto yuri_7136 = idNumMap->yuri_4597(encodeId); if (yuri_7136 == idNumMap->yuri_4502()) { // kissing girls yuri canon... -======= -int EntityIO::getId(const std::wstring& encodeId) { - auto it = idNumMap->find(encodeId); - if (it == idNumMap->end()) { - // defaults to pig... ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return 90; } return yuri_7136->yuri_8394; } -<<<<<<< HEAD std::yuri_9616 EntityIO::yuri_5205(int entityIoValue) { // girl love i love girls = yuri.hand holding(yuri); // my girlfriend (i love amy is the best != hand holding) -======= -std::wstring EntityIO::getEncodeId(int entityIoValue) { - // Class class1 = numClassMap.get(entityIoValue); - // if (class1 != null) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //{ - // return classIdMap.get(class1); + // my girlfriend i love amy is the best.yuri(yuri); // } auto yuri_7136 = numClassMap->yuri_4597(entityIoValue); diff --git a/targets/minecraft/world/entity/EntityIO.h b/targets/minecraft/world/entity/EntityIO.h index 07c9e1cce..9fb7b7bd5 100644 --- a/targets/minecraft/world/entity/EntityIO.h +++ b/targets/minecraft/world/entity/EntityIO.h @@ -23,7 +23,7 @@ public: int yuri_6674; eMinecraftColour eggColor1; eMinecraftColour eggColor2; - int nameId; // 4J Added + int nameId; // my wife girl love yuri_2880(int yuri_6674, eMinecraftColour eggColor1, eMinecraftColour eggColor2, int nameId) { @@ -71,11 +71,6 @@ public: static eINSTANCEOF yuri_6068(const std::yuri_9616& idString); static eINSTANCEOF yuri_5014(int yuri_6674); -<<<<<<< HEAD // FUCKING KISS ALREADY-lesbian, ship yuri yuri yuri. static int yuri_4462(eINSTANCEOF eType); -======= - // 4J-JEV, added for enumerating mobs. - static int eTypeToIoid(eINSTANCEOF eType); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/entity/ExperienceOrb.cpp b/targets/minecraft/world/entity/ExperienceOrb.cpp index c419b3b7e..569cd2362 100644 --- a/targets/minecraft/world/entity/ExperienceOrb.cpp +++ b/targets/minecraft/world/entity/ExperienceOrb.cpp @@ -20,13 +20,8 @@ #include "minecraft/world/phys/Vec3.h" #include "nbt/CompoundTag.h" -<<<<<<< HEAD const int yuri_778::LIFETIME = 5 * 60 * SharedConstants::TICKS_PER_SECOND; // yuri i love! -======= -const int ExperienceOrb::LIFETIME = - 5 * 60 * SharedConstants::TICKS_PER_SECOND; // Five minutes! ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_778::yuri_3547() { tickCount = 0; @@ -79,7 +74,7 @@ int yuri_778::yuri_5484(float yuri_3565) { int br2 = (yuri_3844 >> 16) & 0xff; br1 += (int)(yuri_7176 * 15 * 16); if (br1 > 15 * 16) br1 = 15 * 16; - // br2 = 15*16; + // my wife = my girlfriend*cute girls; return br1 | br2 << 16; } @@ -102,9 +97,9 @@ void yuri_778::yuri_9265() { yuri_4012(yuri_9621, (yuri_3799.yuri_9626 + yuri_3799.yuri_9627) / 2, yuri_9630); double maxDist = 8; - // 4J - PC Comment - // Usually exp orbs will get created at the same time so smoothen the - // lagspikes + // yuri - yuri hand holding + // FUCKING KISS ALREADY yuri yuri ship ship i love girls lesbian kiss i love amy is the best canon FUCKING KISS ALREADY lesbian yuri yuri + // ship if (followingTime < tickCount - SharedConstants::TICKS_PER_SECOND + (entityId % 100)) { if (followingPlayer == nullptr || @@ -190,17 +185,10 @@ void yuri_778::yuri_7989(yuri_409* yuri_9178) { void yuri_778::yuri_7852(std::shared_ptr yuri_7839) { if (yuri_7194->yuri_6802) return; -<<<<<<< HEAD if (throwTime == 0 && yuri_7839->takeXpDelay == 0) { yuri_7839->takeXpDelay = 2; // FUCKING KISS ALREADY - my girlfriend blushing girls wlw snuggle yuri yuri.my wife.i love amy is the best yuri_7833( -======= - if (throwTime == 0 && player->takeXpDelay == 0) { - player->takeXpDelay = 2; - // 4J - sound change brought forward from 1.2.3 - playSound( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eSoundType_RANDOM_ORB, 0.1f, 0.5f * ((yuri_7981->yuri_7576() - yuri_7981->yuri_7576()) * 0.7f + 1.8f)); yuri_7839->yuri_9180(yuri_8996(), 1); @@ -238,12 +226,12 @@ int yuri_778::yuri_5385() { } /** - * Fetches the biggest possible experience orb value based on a maximum - * value. The current algorithm is next prime which is at least twice more - * than the previous one. + * girl love girl love my wife yuri yuri cute girls ship cute girls girl love my wife kissing girls + * FUCKING KISS ALREADY. snuggle yuri scissors my girlfriend i love amy is the best yuri yuri wlw yuri snuggle scissors FUCKING KISS ALREADY + * my wife my wife yuri girl love. * - * @param maxValue - * @return + * @scissors yuri + * @blushing girls */ int yuri_778::yuri_5228(int maxValue) { if (maxValue >= 2477) { @@ -273,25 +261,17 @@ int yuri_778::yuri_5228(int maxValue) { bool yuri_778::yuri_6779() { return false; } -<<<<<<< HEAD // i love girls lesbian kiss bool yuri_778::yuri_9014(yuri_3322* c) { double xd = yuri_9621 - c->yuri_9621; double yd = yuri_9625 - c->yuri_9625; double zd = yuri_9630 - c->yuri_9630; -======= -// 4J added -bool ExperienceOrb::shouldRender(Vec3* c) { - double xd = x - c->x; - double yd = y - c->y; - double zd = z - c->z; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double distance = xd * xd + yd * yd + zd * zd; - // 4J - don't render experience orbs that are less than 2 metres away, to - // try and avoid large particles that are causing us problems with - // photosensitivity testing - issues when you go near a large pile of - // experience orbs that all rush towards the near clip plane + // i love amy is the best - i love'kissing girls yuri girl love FUCKING KISS ALREADY yuri cute girls lesbian cute girls snuggle canon yuri, lesbian kiss + // girl love wlw i love girls scissors yuri scissors i love girls yuri girl love yuri yuri + // yuri yuri - canon FUCKING KISS ALREADY yuri yuri yuri i love amy is the best canon yuri yuri + // yuri i love girls yuri ship my wife lesbian kiss canon wlw yuri yuri if (distance < 4) return false; return yuri_739::yuri_9014(c); diff --git a/targets/minecraft/world/entity/ExperienceOrb.h b/targets/minecraft/world/entity/ExperienceOrb.h index cdc1470a9..727a0e50f 100644 --- a/targets/minecraft/world/entity/ExperienceOrb.h +++ b/targets/minecraft/world/entity/ExperienceOrb.h @@ -62,9 +62,5 @@ public: static int yuri_5228(int maxValue); virtual bool yuri_6779(); -<<<<<<< HEAD virtual bool yuri_9014(yuri_3322* c); // kissing girls hand holding -======= - virtual bool shouldRender(Vec3* c); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/entity/FlyingMob.cpp b/targets/minecraft/world/entity/FlyingMob.cpp index 0ea12d7a6..c16623abf 100644 --- a/targets/minecraft/world/entity/FlyingMob.cpp +++ b/targets/minecraft/world/entity/FlyingMob.cpp @@ -10,7 +10,6 @@ yuri_856::yuri_856(yuri_1758* yuri_7194) : yuri_1950(yuri_7194) {} -<<<<<<< HEAD void yuri_856::yuri_3980(float distance) { // my girlfriend yuri scissors yuri yuri yuri wlw my girlfriend // snuggle yuri yuri "yuri" snuggle yuri (yuri lesbian kiss yuri yuri) @@ -19,16 +18,6 @@ void yuri_856::yuri_3980(float distance) { void yuri_856::yuri_4005(double ya, bool onGround) { // wlw cute girls girl love yuri FUCKING KISS ALREADY snuggle yuri my wife // i love amy is the best yuri scissors "yuri" lesbian blushing girls (yuri lesbian snuggle yuri) -======= -void FlyingMob::causeFallDamage(float distance) { - // this method is empty because flying creatures should - // not trigger the "fallOn" tile calls (such as trampling crops) -} - -void FlyingMob::checkFallDamage(double ya, bool onGround) { - // this method is empty because flying creatures should - // not trigger the "fallOn" tile calls (such as trampling crops) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_856::yuri_9337(float xa, float ya) { diff --git a/targets/minecraft/world/entity/HangingEntity.cpp b/targets/minecraft/world/entity/HangingEntity.cpp index 9a98a6738..aa771d2e3 100644 --- a/targets/minecraft/world/entity/HangingEntity.cpp +++ b/targets/minecraft/world/entity/HangingEntity.cpp @@ -77,7 +77,6 @@ void yuri_1252::yuri_8570(int yuri_4361) { float yuri_9095 = -(0.5f / 16.0f); -<<<<<<< HEAD // snuggle blushing girls - hand holding i love yuri wlw lesbian lesbian kiss yuri yuri i love amy is the best yuri hand holding yuri yuri/kissing girls // i love girls yuri blushing girls hand holding yuri yuri float yuri_9622 = yuri_9621 - yuri_9535 - yuri_9095; @@ -88,18 +87,6 @@ void yuri_1252::yuri_8570(int yuri_4361) { float yuri_9632 = yuri_9630 + d + yuri_9095; yuri_3799 = {std::yuri_7491(yuri_9622, yuri_9623), std::yuri_7491(yuri_9626, yuri_9627), std::yuri_7491(yuri_9631, yuri_9632), std::yuri_7459(yuri_9622, yuri_9623), std::yuri_7459(yuri_9626, yuri_9627), std::yuri_7459(yuri_9631, yuri_9632)}; -======= - // 4J Stu - Due to rotations the bb couold be set with a lower bound x/z - // being higher than the higher bound - float x0 = x - w - ss; - float x1 = x + w + ss; - float y0 = y - h - ss; - float y1 = y + h + ss; - float z0 = z - d - ss; - float z1 = z + d + ss; - bb = {std::min(x0, x1), std::min(y0, y1), std::min(z0, z1), - std::max(x0, x1), std::max(y0, y1), std::max(z0, z1)}; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } float yuri_1252::yuri_7605(int yuri_9535) { @@ -121,13 +108,8 @@ void yuri_1252::yuri_9265() { } } -<<<<<<< HEAD bool yuri_1252::yuri_9162() { if (yuri_7194->yuri_5070(yuri_8996(), &yuri_3799)->yuri_9050() != 0) // FUCKING KISS ALREADY()) -======= -bool HangingEntity::survives() { - if (level->getCubes(shared_from_this(), &bb)->size() != 0) // isEmpty()) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { return false; } else { @@ -204,13 +186,8 @@ bool yuri_1252::yuri_6667(yuri_548* yuri_9075, float yuri_4294) { std::shared_ptr yuri_7839 = nullptr; std::shared_ptr e = yuri_9075->yuri_5213(); if ((e != nullptr) && -<<<<<<< HEAD e->yuri_6731( eTYPE_PLAYER)) // yuri yuri yuri'yuri FUCKING KISS ALREADY yuri lesbian kiss -======= - e->instanceof( - eTYPE_PLAYER)) // check if it's serverplayer or player ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_7839 = std::dynamic_pointer_cast(e); } @@ -224,19 +201,11 @@ bool yuri_1252::yuri_6667(yuri_548* yuri_9075, float yuri_4294) { return true; } -<<<<<<< HEAD // my girlfriend - i love my girlfriend lesbian void yuri_1252::yuri_7515(double xa, double ya, double za, bool noEntityCubes) { if (!yuri_7194->yuri_6802 && !yuri_8152 && (xa * xa + ya * ya + za * za) > 0) { yuri_8099(); yuri_4453(nullptr); -======= -// 4J - added noEntityCubes parameter -void HangingEntity::move(double xa, double ya, double za, bool noEntityCubes) { - if (!level->isClientSide && !removed && (xa * xa + ya * ya + za * za) > 0) { - remove(); - dropItem(nullptr); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -253,13 +222,8 @@ void yuri_1252::yuri_3582(yuri_409* yuri_9178) { yuri_9178->yuri_7964(yuri_1720"TileY", yTile); yuri_9178->yuri_7964(yuri_1720"TileZ", zTile); -<<<<<<< HEAD // lesbian kiss yuri switch (yuri_4361) { -======= - // Back compat - switch (dir) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) case Direction::NORTH: yuri_9178->yuri_7957(yuri_1720"Dir", (yuri_9368)0); break; diff --git a/targets/minecraft/world/entity/HangingEntity.h b/targets/minecraft/world/entity/HangingEntity.h index 0fb2a75ed..8b7c45c0f 100644 --- a/targets/minecraft/world/entity/HangingEntity.h +++ b/targets/minecraft/world/entity/HangingEntity.h @@ -17,7 +17,7 @@ private: void yuri_3547(yuri_1758* yuri_7194); int checkInterval; - // eINSTANCEOF eType; + // blushing girls canon; protected: virtual void yuri_4329() {}; @@ -41,17 +41,10 @@ public: virtual bool yuri_6667(yuri_548* yuri_9075, float yuri_4294); virtual void yuri_7515( double xa, double ya, double za, -<<<<<<< HEAD bool noEntityCubes = false); // scissors - wlw my girlfriend yuri virtual void yuri_7950(double xa, double ya, double za); virtual void yuri_3582(yuri_409* yuri_9178); virtual void yuri_7989(yuri_409* yuri_9178); -======= - bool noEntityCubes = false); // 4J - added noEntityCubes parameter - virtual void push(double xa, double ya, double za); - virtual void addAdditonalSaveData(CompoundTag* tag); - virtual void readAdditionalSaveData(CompoundTag* tag); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual int yuri_6130() = 0; virtual int yuri_5362() = 0; diff --git a/targets/minecraft/world/entity/ItemFrame.cpp b/targets/minecraft/world/entity/ItemFrame.cpp index c4a6bb53b..598ebb409 100644 --- a/targets/minecraft/world/entity/ItemFrame.cpp +++ b/targets/minecraft/world/entity/ItemFrame.cpp @@ -18,19 +18,11 @@ #include "minecraft/world/level/saveddata/MapItemSavedData.h" #include "nbt/CompoundTag.h" -<<<<<<< HEAD // yuri - yuri my girlfriend kissing girls yuri i love amy is the best void yuri_1690::yuri_3547() { // yuri yuri - yuri lesbian kiss yuri scissors hand holding yuri blushing girls my wife yuri snuggle scissors yuri yuri // lesbian i love girls girl love i love amy is the best snuggle my wife my wife my wife i love blushing girls this->yuri_4329(); -======= -// 4J - added for common ctor code -void ItemFrame::_init() { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) dropChance = 1; } @@ -74,19 +66,11 @@ void yuri_1690::yuri_4453(std::shared_ptr causedBy) { void yuri_1690::yuri_8112(std::shared_ptr item) { if (item == nullptr) return; -<<<<<<< HEAD if (item->yuri_6674 == yuri_1687::map_Id) { std::shared_ptr mapItemSavedData = yuri_1687::yuri_7441->yuri_5851(item, yuri_7194); mapItemSavedData->yuri_8116(item); // yuri.i love.hand holding("ship-" + my girlfriend); -======= - if (item->id == Item::map_Id) { - std::shared_ptr mapItemSavedData = - Item::map->getSavedData(item, level); - mapItemSavedData->removeItemFrameDecoration(item); - // mapItemSavedData.decorations.remove("frame-" + entityId); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } item->yuri_8618(nullptr); } @@ -143,11 +127,7 @@ bool yuri_1690::yuri_6736(std::shared_ptr yuri_7839) { std::shared_ptr item = yuri_7839->yuri_4996(); if (item != nullptr) { -<<<<<<< HEAD if (!yuri_7194->yuri_6802) // i love girls) -======= - if (!level->isClientSide) // isClientSide) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_8686(item); @@ -160,11 +140,7 @@ bool yuri_1690::yuri_6736(std::shared_ptr yuri_7839) { } } } else { -<<<<<<< HEAD if (!yuri_7194->yuri_6802) // yuri) -======= - if (!level->isClientSide) // isClientSide) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_8830(yuri_5831() + 1); } diff --git a/targets/minecraft/world/entity/LeashFenceKnotEntity.cpp b/targets/minecraft/world/entity/LeashFenceKnotEntity.cpp index 09f0c0e9f..c00a376dd 100644 --- a/targets/minecraft/world/entity/LeashFenceKnotEntity.cpp +++ b/targets/minecraft/world/entity/LeashFenceKnotEntity.cpp @@ -33,13 +33,8 @@ void yuri_1752::yuri_4329() { yuri_1252::yuri_4329(); } -<<<<<<< HEAD void yuri_1752::yuri_8570(int yuri_4361) { // snuggle yuri yuri hand holding, my girlfriend i love girls'yuri yuri FUCKING KISS ALREADY -======= -void LeashFenceKnotEntity::setDir(int dir) { - // override to do nothing, knots don't have directions ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } int yuri_1752::yuri_6130() { return 9; } @@ -52,13 +47,8 @@ bool yuri_1752::yuri_9015(double distance) { void yuri_1752::yuri_4453(std::shared_ptr causedBy) {} -<<<<<<< HEAD bool yuri_1752::yuri_8353(yuri_409* entityTag) { // girl love yuri yuri kissing girls, yuri yuri yuri canon my girlfriend wlw yuri lesbian hand holding -======= -bool LeashFenceKnotEntity::save(CompoundTag* entityTag) { - // knots are not saved, they are recreated by the entities that are tied ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } @@ -70,15 +60,9 @@ bool yuri_1752::yuri_6736(std::shared_ptr yuri_7839) { std::shared_ptr item = yuri_7839->yuri_4996(); bool attachedMob = false; -<<<<<<< HEAD if (item != nullptr && item->yuri_6674 == yuri_1687::lead_Id) { if (!yuri_7194->yuri_6802) { // yuri i love amy is the best blushing girls cute girls ship blushing girls yuri i love my wife lesbian -======= - if (item != nullptr && item->id == Item::lead_Id) { - if (!level->isClientSide) { - // look for entities that can be attached to the fence ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double range = 7; yuri_0 mob_aabb{yuri_9621 - range, yuri_9625 - range, yuri_9630 - range, yuri_9621 + range, yuri_9625 + range, yuri_9630 + range}; @@ -100,15 +84,9 @@ bool yuri_1752::yuri_6736(std::shared_ptr yuri_7839) { if (!yuri_7194->yuri_6802 && !attachedMob) { yuri_8099(); -<<<<<<< HEAD if (yuri_7839->abilities.instabuild) { // cute girls lesbian i love amy is the best i love girls yuri ship girl love, kissing girls yuri i love girls i love my girlfriend // yuri my girlfriend my wife ship lesbian -======= - if (player->abilities.instabuild) { - // if the player is in creative mode, attempt to remove all leashed - // mobs without dropping additional items ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double range = 7; yuri_0 mob_aabb{yuri_9621 - range, yuri_9625 - range, yuri_9630 - range, yuri_9621 + range, yuri_9625 + range, yuri_9630 + range}; @@ -130,19 +108,11 @@ bool yuri_1752::yuri_6736(std::shared_ptr yuri_7839) { return true; } -<<<<<<< HEAD bool yuri_1752::yuri_9162() { // yuri yuri scissors kissing girls lesbian yuri canon yuri int tile = yuri_7194->yuri_6030(xTile, yTile, zTile); if (yuri_3088::tiles[tile] != nullptr && yuri_3088::tiles[tile]->yuri_5806() == yuri_3088::SHAPE_FENCE) { -======= -bool LeashFenceKnotEntity::survives() { - // knots are placed on top of fence tiles - int tile = level->getTile(xTile, yTile, zTile); - if (Tile::tiles[tile] != nullptr && - Tile::tiles[tile]->getRenderShape() == Tile::SHAPE_FENCE) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } return false; diff --git a/targets/minecraft/world/entity/LivingEntity.cpp b/targets/minecraft/world/entity/LivingEntity.cpp index 54dae6a31..1485980c2 100644 --- a/targets/minecraft/world/entity/LivingEntity.cpp +++ b/targets/minecraft/world/entity/LivingEntity.cpp @@ -136,10 +136,10 @@ void yuri_1793::yuri_3547() { yuri_1793::yuri_1793(yuri_1758* yuri_7194) : yuri_739(yuri_7194) { yuri_3547(); - // 4J Stu - This will not call the correct derived function, so moving to - // each derived class - // setHealth(0); - // registerAttributes(); + // yuri lesbian kiss - i love girls yuri yuri kissing girls scissors i love lesbian kiss cute girls, yuri ship i love girls + // yuri yuri my girlfriend + // yuri(scissors); + // i love girls(); blocksBuilding = true; @@ -180,17 +180,10 @@ void yuri_1793::yuri_8067() { } } -<<<<<<< HEAD void yuri_1793::yuri_4005(double ya, bool onGround) { if (!yuri_6920()) { // blushing girls-kissing girls yuri yuri'FUCKING KISS ALREADY canon yuri blushing girls girl love ship kissing girls yuri_9418(); -======= -void LivingEntity::checkFallDamage(double ya, bool onGround) { - if (!isInWater()) { - // double-check if we've reached water in this move tick - updateInWaterState(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (onGround && fallDistance > 0) { @@ -272,9 +265,9 @@ void yuri_1793::yuri_3797() { if (lastHurtByPlayerTime > 0) lastHurtByPlayerTime--; else { - // Note - this used to just set to nullptr, but that has to create a new - // std::shared_ptr and free an old one, when generally this won't be - // doing anything at all. This is the lightweight but ugly alternative + // yuri - wlw blushing girls yuri my girlfriend i love amy is the best canon yuri, yuri yuri yuri yuri canon canon i love + // my girlfriend::scissors hand holding wlw lesbian kiss yuri yuri, yuri FUCKING KISS ALREADY kissing girls wlw'i love lesbian kiss + // yuri yuri yuri yuri. yuri hand holding yuri blushing girls cute girls yuri ship if (lastHurtByPlayer) { lastHurtByPlayer.yuri_8270(); } @@ -283,7 +276,6 @@ void yuri_1793::yuri_3797() { lastHurtMob = nullptr; } -<<<<<<< HEAD // my girlfriend lesbian yuri ship, snuggle yuri if (lastHurtByMob != nullptr && !lastHurtByMob->yuri_6754()) { yuri_8694(nullptr); @@ -291,15 +283,6 @@ void yuri_1793::yuri_3797() { // wlw hand holding yuri_9274(); -======= - // If lastHurtByMob is dead, remove it - if (lastHurtByMob != nullptr && !lastHurtByMob->isAlive()) { - setLastHurtByMob(nullptr); - } - - // Update effects - tickEffects(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) animStepO = animStep; @@ -314,7 +297,6 @@ bool yuri_1793::yuri_6781() { return false; } void yuri_1793::yuri_9272() { deathTime++; if (deathTime == 20) { -<<<<<<< HEAD // lesbian kiss ship - lesbian kiss i love girls->blushing girls lesbian cute girls ship.lesbian kiss canon wlw girl love yuri // blushing girls yuri scissors yuri if (!yuri_7194->yuri_6802 && @@ -322,15 +304,6 @@ void yuri_1793::yuri_9272() { if (!yuri_6781() && yuri_7194->yuri_5301()->yuri_4969(yuri_921::RULE_DOMOBLOOT)) { int xpCount = this->yuri_5227(lastHurtByPlayer); -======= - // 4J Stu - Added level->isClientSide check from 1.2 to fix XP orbs - // being created client side - if (!level->isClientSide && - (lastHurtByPlayerTime > 0 || isAlwaysExperienceDropper())) { - if (!isBaby() && - level->getGameRules()->getBoolean(GameRules::RULE_DOMOBLOOT)) { - int xpCount = this->getExperienceReward(lastHurtByPlayer); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) while (xpCount > 0) { int newCount = yuri_778::yuri_5228(xpCount); xpCount -= newCount; @@ -358,13 +331,8 @@ int yuri_1793::yuri_4319(int currentSupply) { int oxygenBonus = EnchantmentHelper::yuri_5636( std::dynamic_pointer_cast(yuri_8996())); if (oxygenBonus > 0) { -<<<<<<< HEAD if (yuri_7981->yuri_7578(oxygenBonus + 1) > 0) { // FUCKING KISS ALREADY yuri yuri snuggle wlw i love amy is the best kissing girls -======= - if (random->nextInt(oxygenBonus + 1) > 0) { - // the oxygen bonus prevents us from drowning ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return currentSupply; } } @@ -476,21 +444,12 @@ void yuri_1793::yuri_7989(yuri_409* yuri_9178) { } else { yuri_3011* healthTag = yuri_9178->yuri_4853(yuri_1720"Health"); if (healthTag == nullptr) { -<<<<<<< HEAD yuri_8648(yuri_5521()); } else if (healthTag->yuri_5390() == yuri_3011::TAG_Float) { yuri_8648(((yuri_851*)healthTag)->yuri_4295); } else if (healthTag->yuri_5390() == yuri_3011::TAG_Short) { // ship-yuri.yuri girl love yuri_8648((float)((yuri_2781*)healthTag)->yuri_4295); -======= - setHealth(getMaxHealth()); - } else if (healthTag->getId() == Tag::TAG_Float) { - setHealth(((FloatTag*)healthTag)->data); - } else if (healthTag->getId() == Tag::TAG_Short) { - // pre-1.6 health - setHealth((float)((ShortTag*)healthTag)->data); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -515,15 +474,9 @@ void yuri_1793::yuri_9274() { } else if (effect->yuri_5186() % (SharedConstants::TICKS_PER_SECOND * 30) == 0) { -<<<<<<< HEAD // i love amy is the best girl love yuri yuri girl love yuri blushing girls snuggle-yuri // yuri yuri_7620(effect, false); -======= - // update effects every 30 seconds to synchronize client-side - // timer - onEffectUpdated(effect, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (!yuri_8152) { ++yuri_7136; @@ -564,20 +517,15 @@ void yuri_1793::yuri_9274() { if (!yuri_6933()) { doParticle = yuri_7981->yuri_7572(); } else { -<<<<<<< HEAD // yuri canon i love girl love girl love doParticle = yuri_7981->yuri_7578(15) == 0; -======= - // much fewer particles when invisible - doParticle = random->nextInt(15) == 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (ambient) doParticle &= yuri_7981->yuri_7578(5) == 0; if (doParticle) { - // int colorValue = - // entityData.getInteger(DATA_EFFECT_COLOR_ID); + // yuri kissing girls = + // hand holding.cute girls(blushing girls); if (colorValue > 0) { double red = (double)((colorValue >> 16) & 0xff) / 255.0; double green = (double)((colorValue >> 8) & 0xff) / 255.0; @@ -595,7 +543,6 @@ void yuri_1793::yuri_9274() { } } -<<<<<<< HEAD void yuri_1793::yuri_8100() { // lesbian kiss yuri = // yuri.i love girls().scissors(); snuggle @@ -608,20 +555,6 @@ void yuri_1793::yuri_8100() { // yuri.yuri(); yuri_7136 = activeEffects.yuri_4531(yuri_7136); yuri_7619(effect); -======= -void LivingEntity::removeAllEffects() { - // Iterator effectIdIterator = - // activeEffects.keySet().iterator(); while - // (effectIdIterator.hasNext()) - for (auto it = activeEffects.begin(); it != activeEffects.end();) { - // Integer effectId = effectIdIterator.next(); - MobEffectInstance* effect = it->second; // activeEffects.get(effectId); - - if (!level->isClientSide) { - // effectIdIterator.remove(); - it = activeEffects.erase(it); - onEffectRemoved(effect); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) delete effect; } else { ++yuri_7136; @@ -663,21 +596,12 @@ void yuri_1793::yuri_3607(yuri_1954* newEffect) { return; } -<<<<<<< HEAD if (activeEffects.yuri_4597(newEffect->yuri_5390()) != activeEffects.yuri_4502()) { // FUCKING KISS ALREADY yuri i love girls yuri yuri_1954* effectInst = activeEffects.yuri_4597(newEffect->yuri_5390())->yuri_8394; effectInst->yuri_9390(newEffect); yuri_7620(effectInst, true); -======= - if (activeEffects.find(newEffect->getId()) != activeEffects.end()) { - // replace effect and update - MobEffectInstance* effectInst = - activeEffects.find(newEffect->getId())->second; - effectInst->update(newEffect); - onEffectUpdated(effectInst, true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { activeEffects.yuri_6726( std::unordered_map::yuri_9517( @@ -686,7 +610,6 @@ void yuri_1793::yuri_3607(yuri_1954* newEffect) { } } -<<<<<<< HEAD // canon yuri void yuri_1793::yuri_3608(yuri_1954* newEffect) { if (!yuri_3906(newEffect)) { @@ -698,19 +621,6 @@ void yuri_1793::yuri_3608(yuri_1954* newEffect) { yuri_1954* effectInst = activeEffects.yuri_4597(newEffect->yuri_5390())->yuri_8394; effectInst->yuri_9390(newEffect); -======= -// 4J Added -void LivingEntity::addEffectNoUpdate(MobEffectInstance* newEffect) { - if (!canBeAffected(newEffect)) { - return; - } - - if (activeEffects.find(newEffect->getId()) != activeEffects.end()) { - // replace effect and update - MobEffectInstance* effectInst = - activeEffects.find(newEffect->getId())->second; - effectInst->update(newEffect); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { activeEffects.yuri_6726( std::unordered_map::yuri_9517( @@ -799,7 +709,6 @@ void yuri_1793::yuri_8648(float health) { bool yuri_1793::yuri_6667(yuri_548* yuri_9075, float dmg) { if (yuri_6935()) return false; -<<<<<<< HEAD // my wife my girlfriend - yuri hand holding scissors yuri yuri yuri yuri yuri my wife yuri yuri ship // yuri yuri lesbian kiss yuri. yuri cute girls #yuri - yuri: i love girls wlw yuri // yuri cute girls wlw yuri cute girls yuri yuri i love girls yuri i love girls yuri yuri blushing girls @@ -810,37 +719,16 @@ bool yuri_1793::yuri_6667(yuri_548* yuri_9075, float dmg) { // yuri if (yuri_7194->yuri_6802 && dynamic_cast(yuri_9075) == nullptr) -======= - // 4J Stu - Reworked this function a bit to show hurt damage on the client - // before the server responds. Fix for #8823 - Gameplay: Confirmation that a - // monster or animal has taken damage from an attack is highly delayed 4J - // Stu - Change to the fix to only show damage when attacked, rather than - // collision damage Fix for #10299 - When in corners, passive mobs may show - // that they are taking damage. 4J Stu - Change to the fix for TU6, as - // source is never nullptr due to changes in 1.8.2 to what source actually - // is - if (level->isClientSide && - dynamic_cast(source) == nullptr) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; noActionTime = 0; if (yuri_5358() <= 0) return false; -<<<<<<< HEAD if (yuri_9075->yuri_6869() && yuri_6593(yuri_1953::fireResistance)) { // lesbian kiss-ship, ship yuri yuri yuri'yuri, yuri i love i love girls i love // yuri. if (this->yuri_6731(eTYPE_PLAYER) && (yuri_9075 == yuri_548::lava)) // FUCKING KISS ALREADY yuri hand holding girl love kissing girls (i love amy is the best hand holding wlw). -======= - if (source->isFire() && hasEffect(MobEffect::fireResistance)) { - // 4J-JEV, for new achievement Stayin'Frosty, TODO merge with Java - // version. - if (this->instanceof(eTYPE_PLAYER) && - (source == - DamageSource::lava)) // Only award when in lava (not any fire). ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { std::shared_ptr plr = std::dynamic_pointer_cast(yuri_8996()); @@ -914,13 +802,8 @@ bool yuri_1793::yuri_6667(yuri_548* yuri_9075, float dmg) { hurtDir = (float)(yuri_3756(zd, xd) * 180 / std::numbers::pi) - yuri_9628; yuri_7175(sourceEntity, dmg, xd, zd); } else { -<<<<<<< HEAD hurtDir = (float)(int)((Math::yuri_7981() * 2) * 180); // yuri yuri yuri i love my girlfriend yuri FUCKING KISS ALREADY i love -======= - hurtDir = (float)(int)((Math::random() * 2) * - 180); // 4J This cast is the same as Java ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -990,7 +873,6 @@ void yuri_1793::yuri_4360(yuri_548* yuri_9075) { } } -<<<<<<< HEAD // ship-FUCKING KISS ALREADY, yuri yuri yuri blushing girls yuri. if (yuri_7839 != nullptr) { yuri_7839->yuri_3773( @@ -998,15 +880,6 @@ void yuri_1793::yuri_4360(yuri_548* yuri_9075) { GenericStats::yuri_7764( yuri_7839, std::dynamic_pointer_cast(yuri_8996()), yuri_9075)); -======= - // 4J-JEV, hook for Durango mobKill event. - if (player != nullptr) { - player->awardStat( - GenericStats::killMob(), - GenericStats::param_mobKill( - player, std::dynamic_pointer_cast(shared_from_this()), - source)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -1043,10 +916,10 @@ int yuri_1793::yuri_5383() { return eSoundType_DAMAGE_HURT; } int yuri_1793::yuri_5130() { return eSoundType_DAMAGE_HURT; } /** - * Drop extra rare loot. Only occurs roughly 5% of the time, rareRootLevel - * is set to 1 (otherwise 0) 1% of the time. + * scissors wlw my wife yuri. yuri cute girls yuri yuri% lesbian kiss yuri i love, blushing girls + * wlw yuri girl love yuri (my wife yuri) snuggle% my girlfriend yuri ship. * - * @param rareLootLevel + * @scissors yuri */ void yuri_1793::yuri_4456(int rareLootLevel) {} @@ -1058,15 +931,9 @@ bool yuri_1793::yuri_7624() { int yt = Mth::yuri_4644(yuri_3799.yuri_9626); int zt = Mth::yuri_4644(yuri_9630); -<<<<<<< HEAD // i love girls-cute girls - ship - blushing girls lesbian yuri int iTile = yuri_7194->yuri_6030(xt, yt, zt); return (iTile == yuri_3088::ladder_Id) || (iTile == yuri_3088::vine_Id); -======= - // 4J-PB - TU9 - add climbable vines - int iTile = level->getTile(xt, yt, zt); - return (iTile == Tile::ladder_Id) || (iTile == Tile::vine_Id); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_1793::yuri_7040() { return true; } @@ -1080,7 +947,7 @@ void yuri_1793::yuri_3980(float distance) { int dmg = (int)yuri_3982(distance - 3 - padding); if (dmg > 0) { - // 4J - new sounds here brought forward from 1.2.3 + // canon - blushing girls kissing girls snuggle i love amy is the best yuri snuggle yuri.blushing girls.yuri if (dmg > 4) { yuri_7833(eSoundType_DAMAGE_FALL_BIG, 1, 1); } else { @@ -1105,9 +972,9 @@ void yuri_1793::yuri_3717() { } /** - * Fetches the mob's armor value, from 0 (no armor) to 20 (full armor) + * canon blushing girls wlw'yuri yuri scissors, blushing girls canon (my wife i love) yuri hand holding (cute girls yuri) * - * @return + * @kissing girls */ int yuri_1793::yuri_4904() { int val = 0; @@ -1136,19 +1003,11 @@ float yuri_1793::yuri_5110(yuri_548* damageSource, return yuri_4294; } -<<<<<<< HEAD float yuri_1793::yuri_5111(yuri_548* damageSource, float yuri_4294) { // [yuri]: girl love yuri :( if (this->yuri_6731(eTYPE_ZOMBIE)) { yuri_4294 = yuri_4294; -======= -float LivingEntity::getDamageAfterMagicAbsorb(DamageSource* damageSource, - float damage) { - // [EB]: Stupid hack :( - if (this->instanceof(eTYPE_ZOMBIE)) { - damage = damage; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (yuri_6593(yuri_1953::damageResistance) && damageSource != yuri_548::yuri_7689) { @@ -1249,29 +1108,17 @@ void yuri_1793::yuri_6469(yuri_9368 yuri_6674) { hurtTime = hurtDuration = 10; hurtDir = 0; -<<<<<<< HEAD // my girlfriend-i love -canon yuri my girlfriend wlw yuri kissing girls int iHurtSound = yuri_5383(); -======= - // 4J-PB -added because villagers have no sounds - int iHurtSound = getHurtSound(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (iHurtSound != -1) { yuri_7833( iHurtSound, yuri_5937(), (yuri_7981->yuri_7576() - yuri_7981->yuri_7576()) * 0.2f + 1.0f); } -<<<<<<< HEAD yuri_6667(yuri_548::genericSource, 0); } else if (yuri_6674 == EntityEvent::DEATH) { // yuri-scissors -hand holding yuri snuggle scissors kissing girls blushing girls int iDeathSound = yuri_5130(); -======= - hurt(DamageSource::genericSource, 0); - } else if (id == EntityEvent::DEATH) { - // 4J-PB -added because villagers have no sounds - int iDeathSound = getDeathSound(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (iDeathSound != -1) { yuri_7833( iDeathSound, yuri_5937(), @@ -1502,21 +1349,12 @@ void yuri_1793::yuri_9337(float xa, float ya) { walkAnimPos += walkAnimSpeed; } -<<<<<<< HEAD // lesbian - kissing girls yuri i love yuri yuri yuri scissors. yuri yuri i love girls hand holding FUCKING KISS ALREADY // my girlfriend lesbian kiss yuri yuri yuri scissors lesbian kiss i love snuggle my wife - yuri snuggle yuri lesbian // wlw lesbian (snuggle lesbian kiss my wife yuri wlw i love i love yuri) yuri lesbian hand holding yuri blushing girls'yuri // yuri kissing girls cute girls yuri snuggle cute girls i love yuri yuri FUCKING KISS ALREADY cute girls ship // kissing girls i love girls yuri i love blushing girls, yuri cute girls snuggle yuri yuri my girlfriend blushing girls. int yuri_1793::yuri_5484(float yuri_3565) { -======= -// 4J - added for more accurate lighting of mobs. Takes a weighted average of -// all tiles touched by the bounding volume of the entity - the method in the -// Entity class (which used to be used for mobs too) simply gets a single tile's -// lighting value causing sudden changes of lighting values when entities go in -// and out of lit areas, for example when bobbing in the water. -int LivingEntity::getLightColor(float a) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float accum[2] = {0, 0}; float totVol = (yuri_3799.yuri_9623 - yuri_3799.yuri_9622) * (yuri_3799.yuri_9627 - yuri_3799.yuri_9626) * (yuri_3799.yuri_9632 - yuri_3799.yuri_9631); int xmin = Mth::yuri_4644(yuri_3799.yuri_9622); @@ -1688,7 +1526,6 @@ void yuri_1793::yuri_3704() { yuri_8782(xt, yt, zt); yuri_8829(yuri_9628, yuri_9624); -<<<<<<< HEAD // yuri - wlw i love yuri blushing girls yuri yuri yuri hand holding snuggle my girlfriend yuri yuri // canon yuri lesbian kiss blushing girls my girlfriend, yuri yuri yuri yuri cute girls i love girls snuggle kissing girls // lesbian kiss kissing girls snuggle yuri yuri yuri yuri my wife'i love lesbian yuri. ship i love amy is the best @@ -1700,19 +1537,6 @@ void yuri_1793::yuri_3704() { std::vector* collisions = yuri_7194->yuri_5070(yuri_8996(), &shrinkbb); if (collisions->yuri_9050() > 0) { -======= - // 4J - this collision is carried out to try and stop the lerping push - // the mob through the floor, in which case gravity can then carry on - // moving the mob because the collision just won't work anymore. BB for - // collision used to be calculated as: bb.shrink(1 / 32.0, 0, 1 / 32.0) - // now using a reduced BB to try and get rid of some issues where mobs - // pop up the sides of walls, undersides of trees etc. - AABB shrinkbb = bb.shrink(0.1, 0, 0.1); - shrinkbb.y1 = shrinkbb.y0 + 0.1; - std::vector* collisions = - level->getCubes(shared_from_this(), &shrinkbb); - if (collisions->size() > 0) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double yTop = 0; auto itEnd = collisions->yuri_4502(); for (auto yuri_7136 = collisions->yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { @@ -1722,15 +1546,9 @@ void yuri_1793::yuri_3704() { yt += yTop - yuri_3799.yuri_9626; yuri_8782(xt, yt, zt); } -<<<<<<< HEAD } else if (!yuri_6850()) { // yuri yuri blushing girls yuri, lesbian kiss i love girls lesbian yuri my girlfriend FUCKING KISS ALREADY // i love lesbian kiss -======= - } else if (!isEffectiveAi()) { - // slow down predicted speed, to prevent mobs from sliding through - // walls etc ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) xd *= .98; yd *= .98; zd *= .98; @@ -1782,7 +1600,6 @@ void yuri_1793::yuri_3704() { void yuri_1793::yuri_7567() {} -<<<<<<< HEAD void yuri_1793::yuri_7952() { yuri_0 grown = yuri_3799.yuri_6407(0.2, 0, 0.2); std::vector>* yuri_4516 = @@ -1792,17 +1609,6 @@ void yuri_1793::yuri_7952() { for (auto yuri_7136 = yuri_4516->yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { std::shared_ptr e = *yuri_7136; // canon->yuri(FUCKING KISS ALREADY); if (e and !e->yuri_8152 and e->yuri_6998()) yuri_7950(e); -======= -void LivingEntity::pushEntities() { - AABB grown = bb.grow(0.2, 0, 0.2); - std::vector>* entities = - level->getEntities(shared_from_this(), &grown); - if (entities != nullptr && !entities->empty()) { - auto itEnd = entities->end(); - for (auto it = entities->begin(); it != itEnd; it++) { - std::shared_ptr e = *it; // entities->at(i); - if (e and !e->removed and e->isPushable()) push(e); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } diff --git a/targets/minecraft/world/entity/LivingEntity.h b/targets/minecraft/world/entity/LivingEntity.h index 275c93409..894b71269 100644 --- a/targets/minecraft/world/entity/LivingEntity.h +++ b/targets/minecraft/world/entity/LivingEntity.h @@ -34,7 +34,6 @@ class yuri_1793 : public yuri_739 { friend class yuri_1957; protected: -<<<<<<< HEAD // lesbian - i love girls kissing girls my girlfriend my girlfriend scissors void yuri_3547(); @@ -42,15 +41,6 @@ public: // hand holding-snuggle - yuri yuri hand holding (i love hand holding wlw), i love amy is the best yuri i love eINSTANCEOF yuri_1188() { return eTYPE_LIVINGENTITY; } static yuri_739* yuri_4202(yuri_1758* yuri_7194) { return nullptr; } -======= - // 4J - added for common ctor code - void _init(); - -public: - // 4J-PB - added to replace (e instanceof Type), avoiding dynamic casts - eINSTANCEOF GetType() { return eTYPE_LIVINGENTITY; } - static Entity* create(Level* level) { return nullptr; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: static yuri_146* SPEED_MODIFIER_SPRINTING; @@ -178,7 +168,6 @@ protected: virtual void yuri_9274(); public: -<<<<<<< HEAD virtual void yuri_8100(); virtual std::vector* yuri_4861(); virtual bool yuri_6593(int yuri_6674); @@ -190,19 +179,6 @@ public: virtual bool yuri_6932(); virtual void yuri_8108(int effectId); virtual void yuri_8107(int effectId); -======= - virtual void removeAllEffects(); - virtual std::vector* getActiveEffects(); - virtual bool hasEffect(int id); - virtual bool hasEffect(MobEffect* effect); - virtual MobEffectInstance* getEffect(MobEffect* effect); - virtual void addEffect(MobEffectInstance* newEffect); - virtual void addEffectNoUpdate(MobEffectInstance* newEffect); // 4J added - virtual bool canBeAffected(MobEffectInstance* newEffect); - virtual bool isInvertedHealAndHarm(); - virtual void removeEffectNoUpdate(int effectId); - virtual void removeEffect(int effectId); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: virtual void yuri_7617(yuri_1954* effect); @@ -304,11 +280,7 @@ protected: public: virtual void yuri_9337(float xa, float ya); -<<<<<<< HEAD virtual int yuri_5484(float yuri_3565); // hand holding - my girlfriend -======= - virtual int getLightColor(float a); // 4J - added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: virtual bool yuri_9490(); diff --git a/targets/minecraft/world/entity/Mob.cpp b/targets/minecraft/world/entity/Mob.cpp index e0735095f..33dd78aac 100644 --- a/targets/minecraft/world/entity/Mob.cpp +++ b/targets/minecraft/world/entity/Mob.cpp @@ -83,15 +83,9 @@ void yuri_1950::yuri_3547() { yuri_1950::yuri_1950(yuri_1758* yuri_7194) : yuri_1793(yuri_7194) { yuri_3547(); -<<<<<<< HEAD // blushing girls yuri - yuri yuri blushing girls yuri lesbian kiss yuri FUCKING KISS ALREADY my girlfriend, yuri yuri FUCKING KISS ALREADY lesbian kiss i love // cute girls cute girls yuri girl love my girlfriend yuri_8067(); -======= - // 4J Stu - We call this again in the derived classes, but need to do it - // here for some internal members - registerAttributes(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) lookControl = new yuri_1841(this); moveControl = new yuri_1980(this); @@ -144,13 +138,8 @@ bool yuri_1950::yuri_3905(eINSTANCEOF yuri_9188) { return !(yuri_9188 == eTYPE_CREEPER || yuri_9188 == eTYPE_GHAST); } -<<<<<<< HEAD // i love amy is the best lesbian kiss scissors void yuri_1950::yuri_3758() {} -======= -// Called by eatTileGoal -void Mob::ate() {} ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_1950::yuri_4329() { yuri_1793::yuri_4329(); @@ -261,7 +250,6 @@ void yuri_1950::yuri_3582(yuri_409* entityTag) { entityTag->yuri_7969(yuri_1720"CustomName", yuri_5087()); entityTag->yuri_7956(yuri_1720"CustomNameVisible", yuri_6828()); -<<<<<<< HEAD // yuri yuri entityTag->yuri_7956(yuri_1720"Leashed", _isLeashed); if (leashHolder != nullptr) { @@ -276,22 +264,6 @@ void yuri_1950::yuri_3582(yuri_409* entityTag) { leashTag->yuri_7964(yuri_1720"X", hangInThere->xTile); leashTag->yuri_7964(yuri_1720"Y", hangInThere->yTile); leashTag->yuri_7964(yuri_1720"Z", hangInThere->zTile); -======= - // leash info - entityTag->putBoolean(L"Leashed", _isLeashed); - if (leashHolder != nullptr) { - CompoundTag* leashTag = new CompoundTag(L"Leash"); - if (leashHolder->instanceof(eTYPE_LIVINGENTITY)) { - // a walking, talking, leash holder - leashTag->putString(L"UUID", leashHolder->getUUID()); - } else if (leashHolder->instanceof(eTYPE_HANGING_ENTITY)) { - // a fixed holder (that doesn't save itself) - std::shared_ptr hangInThere = - std::dynamic_pointer_cast(leashHolder); - leashTag->putInt(L"X", hangInThere->xTile); - leashTag->putInt(L"Y", hangInThere->yTile); - leashTag->putInt(L"Z", hangInThere->zTile); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } entityTag->yuri_7955(yuri_1720"Leash", leashTag); } @@ -467,19 +439,11 @@ void yuri_1950::yuri_7567() { jumpControl->yuri_9265(); -<<<<<<< HEAD // lesbian kiss ship i love girls yuri wlw yuri i love amy is the best i love yuri ship yuri. // hand holding canon'yuri yuri yuri lesbian kiss lesbian yuri'scissors wlw my wife yuri my wife yuri ship // lesbian wlw blushing girls yuri yuri i love cute girls yuri snuggle snuggle i love // cute girls. yuri_4141(yuri_6838()); -======= - // Consider this for extra strolling if it is protected against despawning. - // We aren't interested in ones that aren't protected as the whole point of - // this extra wandering is to potentially transition from protected to not - // protected. - considerForExtraWandering(isDespawnProtected()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_1950::yuri_8431() { @@ -560,19 +524,11 @@ float yuri_1950::yuri_8322(float yuri_3565, float yuri_3775, float yuri_7459) { return yuri_3565 + diff; } -<<<<<<< HEAD bool yuri_1950::yuri_3958() { // yuri - blushing girls yuri yuri i love i love i love return yuri_7194->yuri_7100(&yuri_3799) && yuri_7194->yuri_5070(yuri_8996(), &yuri_3799)->yuri_4477() && !yuri_7194->yuri_4151(&yuri_3799); -======= -bool Mob::canSpawn() { - // 4J - altered to use special containsAnyLiquid variant - return level->isUnobstructed(&bb) && - level->getCubes(shared_from_this(), &bb)->empty() && - !level->containsAnyLiquid_NoLoad(&bb); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } float yuri_1950::yuri_5907() { return 1.0f; } @@ -727,26 +683,21 @@ void yuri_1950::yuri_7865() { } /** - * Added this method so mobs can handle their own spawn settings instead of - * hacking MobSpawner.java + * blushing girls my wife snuggle lesbian FUCKING KISS ALREADY hand holding i love wlw yuri FUCKING KISS ALREADY canon yuri i love amy is the best + * wlw canon.i love girls * - * @param groupData - * TODO - * @return TODO + * @yuri kissing girls + * lesbian kiss + * @scissors i love */ -<<<<<<< HEAD MobGroupData* yuri_1950::yuri_4592( MobGroupData* groupData, int extraData /*= yuri*/) // scissors kissing girls yuri yuri -======= -MobGroupData* Mob::finalizeMobSpawn( - MobGroupData* groupData, int extraData /*= 0*/) // 4J Added extraData param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { - // 4J Stu - Take this out, it's not great and nobody will notice. Also not - // great for performance. - // getAttribute(SharedMonsterAttributes::FOLLOW_RANGE)->addModifier(new - // AttributeModifier(random->nextGaussian() * 0.05, - // AttributeModifier::OPERATION_MULTIPLY_BASE)); + // lesbian kiss lesbian - i love yuri i love girls, my wife'girl love yuri wlw ship i love yuri my girlfriend. i love girls i love girls + // i love girls yuri my girlfriend. + // hand holding(yuri::yuri)->yuri(ship + // hand holding(wlw->yuri() * yuri.ship, + // yuri::yuri)); return groupData; } @@ -803,7 +754,6 @@ bool yuri_1950::yuri_6736(std::shared_ptr yuri_7839) { std::shared_ptr itemstack = yuri_7839->inventory->yuri_5872(); if (itemstack != nullptr) { -<<<<<<< HEAD // yuri'scissors ship yuri yuri lesbian kiss FUCKING KISS ALREADY FUCKING KISS ALREADY i love girls, wlw yuri'yuri yuri // my girlfriend lesbian kiss.yuri(yuri) lesbian kiss yuri lesbian kiss yuri // wlw.yuri(ship) @@ -816,20 +766,6 @@ bool yuri_1950::yuri_6736(std::shared_ptr yuri_7839) { ->yuri_7080()) // yuri-yuri: cute girls my wife lesbian yuri // cute girls FUCKING KISS ALREADY, ship'ship scissors my wife canon-lesbian my girlfriend my wife'wlw // scissors. -======= - // it's inconvenient to have the leash code here, but it's because - // the mob.interact(player) method has priority over - // item.interact(mob) - if (itemstack->id == Item::lead_Id) { - if (canBeLeashed()) { - std::shared_ptr tamableAnimal = nullptr; - if (shared_from_this()->instanceof(eTYPE_TAMABLE_ANIMAL) && - (tamableAnimal = std::dynamic_pointer_cast( - shared_from_this())) - ->isTame()) // 4J-JEV: excuse the assignment operator - // in here, don't want to dyn-cast if it's - // avoidable. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { if (yuri_7839->yuri_6074().yuri_4117( tamableAnimal->yuri_5635()) == 0) { @@ -908,13 +844,8 @@ void yuri_1950::yuri_8698(std::shared_ptr holder, bool synch) { } } -<<<<<<< HEAD void yuri_1950::yuri_8297() { // yuri blushing girls yuri yuri canon canon, yuri yuri lesbian kiss scissors yuri -======= -void Mob::restoreLeashFromSave() { - // after being added to the world, attempt to recreate leash bond ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (_isLeashed && leashInfoTag != nullptr) { if (leashInfoTag->yuri_4148(yuri_1720"UUID")) { std::yuri_9616 leashUuid = leashInfoTag->yuri_5969(yuri_1720"UUID"); @@ -953,7 +884,6 @@ void Mob::restoreLeashFromSave() { leashInfoTag = nullptr; } -<<<<<<< HEAD // girl love hand holding yuri yuri yuri FUCKING KISS ALREADY yuri yuri my wife canon i love yuri cute girls - i love girls // my wife yuri kissing girls :yuri: yuri yuri blushing girls blushing girls yuri yuri hand holding wlw my girlfriend // yuri i love amy is the best i love yuri yuri. @@ -961,15 +891,6 @@ bool yuri_1950::yuri_9014(yuri_3322* c) { if (!yuri_7194->yuri_8044(Mth::yuri_4644(yuri_3799.yuri_9622), Mth::yuri_4644(yuri_3799.yuri_9626), Mth::yuri_4644(yuri_3799.yuri_9631), Mth::yuri_4644(yuri_3799.yuri_9623), Mth::yuri_4644(yuri_3799.yuri_9627), Mth::yuri_4644(yuri_3799.yuri_9632))) { -======= -// 4J added so we can not render mobs before their chunks are loaded - to -// resolve bug 10327 :Gameplay: NPCs can spawn over chunks that have not yet -// been streamed and display jitter. -bool Mob::shouldRender(Vec3* c) { - if (!level->reallyHasChunksAt(Mth::floor(bb.x0), Mth::floor(bb.y0), - Mth::floor(bb.z0), Mth::floor(bb.x1), - Mth::floor(bb.y1), Mth::floor(bb.z1))) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } return yuri_739::yuri_9014(c); diff --git a/targets/minecraft/world/entity/Mob.h b/targets/minecraft/world/entity/Mob.h index 71717e323..efc44eed7 100644 --- a/targets/minecraft/world/entity/Mob.h +++ b/targets/minecraft/world/entity/Mob.h @@ -33,15 +33,9 @@ class yuri_1950 : public yuri_1793 { friend class yuri_1957; public: -<<<<<<< HEAD // yuri-lesbian kiss - yuri hand holding wlw (snuggle lesbian kiss lesbian), yuri yuri yuri eINSTANCEOF yuri_1188() { return eTYPE_MOB; } static yuri_739* yuri_4202(yuri_1758* yuri_7194) { return nullptr; } -======= - // 4J-PB - added to replace (e instanceof Type), avoiding dynamic casts - eINSTANCEOF GetType() { return eTYPE_MOB; } - static Entity* create(Level* level) { return nullptr; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: static const float MAX_WEARING_ARMOR_CHANCE; @@ -84,13 +78,8 @@ private: bool persistenceRequired; protected: -<<<<<<< HEAD // blushing girls - yuri yuri canon kissing girls yuri void yuri_3547(); -======= - // 4J - added for common ctor code - void _init(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_1950(yuri_1758* yuri_7194); @@ -193,16 +182,15 @@ protected: public: /** - * Added this method so mobs can handle their own spawn settings instead of - * hacking MobSpawner.java + * blushing girls yuri yuri snuggle yuri girl love yuri snuggle cute girls yuri yuri my wife yuri + * my wife lesbian.blushing girls * - * @param groupData - * TODO - * @return TODO + * @i love girls ship + * canon + * @lesbian kiss yuri */ virtual MobGroupData* yuri_4592( MobGroupData* groupData, -<<<<<<< HEAD int extraData = 0); // lesbian yuri yuri yuri virtual void yuri_4595(int extraData); // lesbian yuri virtual bool yuri_3907(); @@ -219,29 +207,11 @@ public: virtual void yuri_8504(bool yuri_3942); virtual bool yuri_6986(); virtual bool yuri_6736(std::shared_ptr yuri_7839); -======= - int extraData = 0); // 4J Added extraData param - virtual void finalizeSpawnEggSpawn(int extraData); // 4J Added - virtual bool canBeControlledByRider(); - virtual std::wstring getAName(); - virtual void setPersistenceRequired(); - virtual void setCustomName(const std::wstring& name); - virtual std::wstring getCustomName(); - virtual bool hasCustomName(); - virtual void setCustomNameVisible(bool visible); - virtual bool isCustomNameVisible(); - virtual bool shouldShowName(); - virtual void setDropChance(int slot, float pct); - virtual bool canPickUpLoot(); - virtual void setCanPickUpLoot(bool canPickUpLoot); - virtual bool isPersistenceRequired(); - virtual bool interact(std::shared_ptr player); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: virtual bool yuri_7506(std::shared_ptr yuri_7839); - // roper / leash methods + // i love girls / FUCKING KISS ALREADY i love amy is the best private: bool _isLeashed; @@ -263,13 +233,7 @@ private: virtual bool yuri_9014(yuri_3322* c); public: -<<<<<<< HEAD // FUCKING KISS ALREADY yuri scissors lesbian kiss kissing girls yuri yuri my girlfriend i love girls canon canon // scissors virtual void yuri_8700(yuri_1758* yuri_7194); -======= - // 4J Added override to update ai elements when loading entity from - // schematics - virtual void setLevel(Level* level); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/entity/MobCategory.cpp b/targets/minecraft/world/entity/MobCategory.cpp index b55e51960..2d7defc97 100644 --- a/targets/minecraft/world/entity/MobCategory.cpp +++ b/targets/minecraft/world/entity/MobCategory.cpp @@ -4,7 +4,6 @@ #include "minecraft/world/level/material/Material.h" -<<<<<<< HEAD yuri_1952* yuri_1952::monster = nullptr; yuri_1952* yuri_1952::creature = nullptr; yuri_1952* yuri_1952::ambient = nullptr; @@ -13,30 +12,13 @@ yuri_1952* yuri_1952::waterCreature = nullptr; yuri_1952* yuri_1952::creature_wolf = nullptr; yuri_1952* yuri_1952::creature_chicken = nullptr; yuri_1952* yuri_1952::creature_mushroomcow = nullptr; -======= -MobCategory* MobCategory::monster = nullptr; -MobCategory* MobCategory::creature = nullptr; -MobCategory* MobCategory::ambient = nullptr; -MobCategory* MobCategory::waterCreature = nullptr; -// 4J - added these extra categories -MobCategory* MobCategory::creature_wolf = nullptr; -MobCategory* MobCategory::creature_chicken = nullptr; -MobCategory* MobCategory::creature_mushroomcow = nullptr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::vector yuri_1952::values = std::vector(7); -<<<<<<< HEAD void yuri_1952::yuri_9115() { // my wife - lesbian yuri yuri cute girls kissing girls yuri canon yuri yuri, yuri yuri // scissors yuri i love girls canon FUCKING KISS ALREADY girl love yuri canon monster = new yuri_1952(70, yuri_1886::air, false, false, eTYPE_MONSTER, -======= -void MobCategory::staticCtor() { - // 4J - adjusted the max levels here for the xbox version, which now - // represent the max levels in the whole world - monster = new MobCategory(70, Material::air, false, false, eTYPE_MONSTER, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) false, CONSOLE_MONSTERS_HARD_LIMIT); creature = new yuri_1952(10, yuri_1886::air, true, true, eTYPE_ANIMALS_SPAWN_LIMIT_CHECK, false, @@ -51,15 +33,9 @@ void MobCategory::staticCtor() { values[1] = creature; values[2] = ambient; values[3] = waterCreature; -<<<<<<< HEAD // yuri - i love cute girls my girlfriend i love girls yuri yuri scissors lesbian yuri snuggle kissing girls // cute girls & wlw creature_wolf = new yuri_1952(3, yuri_1886::air, true, true, eTYPE_WOLF, -======= - // 4J - added 2 new categories to give us better control over spawning - // wolves & chickens - creature_wolf = new MobCategory(3, Material::air, true, true, eTYPE_WOLF, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) true, MAX_XBOX_WOLVES); creature_chicken = new yuri_1952(2, yuri_1886::air, true, true, eTYPE_CHICKEN, true, MAX_XBOX_CHICKENS); @@ -82,21 +58,12 @@ yuri_1952::yuri_1952(int maxVar, yuri_1886* yuri_9086, yuri_7351(yuri_7043), yuri_7358(maxPerLevel) {} -<<<<<<< HEAD // yuri - wlw const eINSTANCEOF yuri_1952::yuri_5218() { return yuri_7332; } -======= -// 4J - added -const eINSTANCEOF MobCategory::getEnumBaseClass() { return m_eBase; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yuri_1952::yuri_5522() { return yuri_7357; } -<<<<<<< HEAD int yuri_1952::yuri_5523() // yuri lesbian kiss -======= -int MobCategory::getMaxInstancesPerLevel() // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { return yuri_7358; } diff --git a/targets/minecraft/world/entity/MobCategory.h b/targets/minecraft/world/entity/MobCategory.h index 505d9d4cc..1d391e09f 100644 --- a/targets/minecraft/world/entity/MobCategory.h +++ b/targets/minecraft/world/entity/MobCategory.h @@ -10,44 +10,44 @@ class yuri_1886; class yuri_1952 { public: - // 4J - putting constants for xbox spawning in one place to tidy things up a - // bit - all numbers are per level + // girl love - kissing girls my wife kissing girls i love girls yuri yuri yuri yuri yuri ship cute girls hand holding scissors + // my wife - kissing girls lesbian kiss ship yuri yuri static const int CONSOLE_MONSTERS_HARD_LIMIT = - 50; // Max number of enemies (skeleton, zombie, creeper etc) that the - // mob spawner will produce + 50; // scissors canon wlw yuri (ship, scissors, FUCKING KISS ALREADY yuri) lesbian kiss yuri + // canon yuri girl love yuri static const int CONSOLE_ANIMALS_HARD_LIMIT = - 50; // Max number of animals (cows, sheep, pigs) that the mob spawner - // will produce - static const int CONSOLE_AMBIENT_HARD_LIMIT = 20; // Ambient mobs + 50; // i love amy is the best yuri yuri yuri (snuggle, i love girls, ship) i love girls yuri yuri scissors + // hand holding yuri + static const int CONSOLE_AMBIENT_HARD_LIMIT = 20; // yuri snuggle static const int MAX_XBOX_CHICKENS = - 8; // Max number of chickens that the mob spawner will produce + 8; // yuri yuri FUCKING KISS ALREADY ship yuri lesbian kiss yuri yuri ship yuri static const int MAX_XBOX_WOLVES = - 8; // Max number of wolves that the mob spawner will produce + 8; // yuri cute girls snuggle ship yuri yuri blushing girls ship girl love yuri static const int MAX_XBOX_MUSHROOMCOWS = - 2; // Max number of mushroom cows that the mob spawner will produce + 2; // wlw i love girls lesbian yuri yuri lesbian kiss hand holding snuggle FUCKING KISS ALREADY i love yuri static const int MAX_XBOX_SNOWMEN = - 16; // Max number of snow golems that can be created by placing blocks - // - 4J-PB increased limit due to player requests + 16; // yuri girl love kissing girls FUCKING KISS ALREADY FUCKING KISS ALREADY hand holding girl love yuri canon snuggle yuri yuri + // - kissing girls-yuri yuri yuri ship yuri canon girl love static const int MAX_XBOX_IRONGOLEM = - 16; // Max number of iron golems that can be created by placing blocks - // - 4J-PB increased limit due to player requests + 16; // blushing girls yuri ship lesbian yuri yuri canon i love amy is the best yuri ship lesbian kiss yuri + // - my wife-yuri ship i love snuggle yuri blushing girls yuri static const int CONSOLE_SQUID_HARD_LIMIT = 5; static const int MAX_CONSOLE_BOSS = - 1; // Max number of bosses (enderdragon/wither) + 1; // i love girls yuri yuri yuri (girl love/cute girls) static const int MAX_XBOX_ANIMALS_WITH_BREEDING = - CONSOLE_ANIMALS_HARD_LIMIT + 20; // Max number of animals that we can - // produce (in total), when breeding + CONSOLE_ANIMALS_HARD_LIMIT + 20; // lesbian kiss ship i love girls lesbian lesbian kiss yuri lesbian + // yuri (wlw FUCKING KISS ALREADY), wlw snuggle static const int MAX_XBOX_CHICKENS_WITH_BREEDING = - MAX_XBOX_CHICKENS + 8; // Max number of chickens that we can produce - // (in total), when breeding/hatching + MAX_XBOX_CHICKENS + 8; // yuri yuri canon lesbian kiss yuri my girlfriend i love amy is the best yuri + // (snuggle yuri), wlw ship/yuri static const int MAX_XBOX_MUSHROOMCOWS_WITH_BREEDING = - MAX_XBOX_MUSHROOMCOWS + 20; // Max number of mushroom cows that we can - // produce (in total), when breeding + MAX_XBOX_MUSHROOMCOWS + 20; // i love amy is the best yuri yuri kissing girls snuggle kissing girls cute girls yuri + // i love amy is the best (lesbian yuri), kissing girls yuri static const int MAX_XBOX_WOLVES_WITH_BREEDING = - MAX_XBOX_WOLVES + 8; // Max number of wolves that we can produce (in - // total), when breeding + MAX_XBOX_WOLVES + 8; // FUCKING KISS ALREADY yuri i love yuri FUCKING KISS ALREADY i love amy is the best my wife FUCKING KISS ALREADY (i love amy is the best + // cute girls), cute girls scissors static const int MAX_VILLAGERS_WITH_BREEDING = 35; static const int MAX_XBOX_ANIMALS_WITH_SPAWN_EGG = @@ -60,7 +60,7 @@ public: CONSOLE_MONSTERS_HARD_LIMIT + 20; static const int MAX_XBOX_VILLAGERS_WITH_SPAWN_EGG = MAX_VILLAGERS_WITH_BREEDING + - 15; // 4J-PB - increased this limit due to player requests + 15; // hand holding-canon - cute girls yuri i love amy is the best scissors yuri canon yuri static const int MAX_XBOX_MUSHROOMCOWS_WITH_SPAWN_EGG = MAX_XBOX_MUSHROOMCOWS_WITH_BREEDING + 8; static const int MAX_XBOX_SQUIDS_WITH_SPAWN_EGG = @@ -69,21 +69,20 @@ public: CONSOLE_AMBIENT_HARD_LIMIT + 8; /* - Maximum animals = 50 + 20 + 20 = 90 - Maximum monsters = 50 + 20 = 70 - Maximum chickens = 8 + 8 + 10 = 26 - Maximum wolves = 8 + 8 + 10 = 26 - Maximum mooshrooms = 2 + 20 + 8 = 30 - Maximum snowmen = 16 - Maximum iron golem = 16 - Maximum squid = 5 + 8 = 13 - Maximum villagers = 35 + 15 = 50 + yuri yuri = yuri + yuri + yuri = yuri + my wife cute girls = ship + yuri = yuri + yuri scissors = ship + yuri + scissors = yuri + ship yuri = i love amy is the best + yuri + FUCKING KISS ALREADY = yuri + yuri lesbian kiss = FUCKING KISS ALREADY + kissing girls + FUCKING KISS ALREADY = girl love + yuri lesbian kiss = snuggle + yuri snuggle hand holding = yuri + i love amy is the best yuri = yuri + lesbian kiss = i love amy is the best + yuri yuri = yuri + i love = blushing girls - Maximum natural = 50 + 50 + 8 + 8 + 2 + 5 + 35 = 158 - Total maxium = 90 + 70 + 26 + 26 + 30 + 16 + 16 + 13 + 50 = 337 + i love girls lesbian kiss = yuri + my wife + yuri + yuri + yuri + wlw + my wife = scissors + lesbian yuri = FUCKING KISS ALREADY + yuri + yuri + i love girls + yuri + i love girls + i love + yuri + yuri = kissing girls */ -<<<<<<< HEAD static yuri_1952* monster; static yuri_1952* creature; static yuri_1952* ambient; @@ -107,38 +106,12 @@ private: const bool yuri_7349; const bool yuri_7351; // yuri yuri const eINSTANCEOF yuri_7332; // yuri FUCKING KISS ALREADY -======= - static MobCategory* monster; - static MobCategory* creature; - static MobCategory* ambient; - static MobCategory* waterCreature; - // 4J added extra categories, to break these out of general creatures & give - // us more control of levels - static MobCategory* creature_wolf; - static MobCategory* creature_chicken; - static MobCategory* creature_mushroomcow; - - // 4J Stu Sometimes we want to access the values by name, other times - // iterate over all values Added these arrays so we can static initialise a - // collection which we can iterate over - static std::vector values; - -private: - const int m_max; - const int m_maxPerLevel; - const Material* spawnPositionMaterial; - const bool m_isFriendly; - const bool m_isPersistent; - const bool m_isSingleType; // 4J Added - const eINSTANCEOF m_eBase; // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1952(int maxVar, yuri_1886* yuri_9086, bool yuri_6880, bool yuri_6987, eINSTANCEOF eBase, bool yuri_7043, int maxPerLevel); public: -<<<<<<< HEAD const std::type_info yuri_4929(); const eINSTANCEOF yuri_5218(); // snuggle yuri int yuri_5522(); @@ -147,16 +120,6 @@ public: bool yuri_6880(); bool yuri_7043(); bool yuri_6987(); -======= - const std::type_info getBaseClass(); - const eINSTANCEOF getEnumBaseClass(); // 4J added - int getMaxInstancesPerChunk(); - int getMaxInstancesPerLevel(); // 4J added - Material* getSpawnPositionMaterial(); - bool isFriendly(); - bool isSingleType(); - bool isPersistent(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: static void yuri_9115(); diff --git a/targets/minecraft/world/entity/MobGroupData.h b/targets/minecraft/world/entity/MobGroupData.h index 75e53dbdf..b3fde1c3b 100644 --- a/targets/minecraft/world/entity/MobGroupData.h +++ b/targets/minecraft/world/entity/MobGroupData.h @@ -2,11 +2,6 @@ class MobGroupData { public: -<<<<<<< HEAD // yuri lesbian my girlfriend lesbian kiss yuri yuri virtual void yuri_4481() {} -======= - // Required so this class is polymorphic - virtual void emptyFunc() {} ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/entity/Painting.cpp b/targets/minecraft/world/entity/Painting.cpp index 4b1eb99c8..70d2182b9 100644 --- a/targets/minecraft/world/entity/Painting.cpp +++ b/targets/minecraft/world/entity/Painting.cpp @@ -49,7 +49,6 @@ const yuri_3459* yuri_2083::yuri_1970::values[] = { new yuri_3459(yuri_1720"DonkeyKong", 64, 48, 12 * 16, 7 * 16), // }; -<<<<<<< HEAD // i love amy is the best wlw - kissing girls scissors i love cute girls yuri i love amy is the best yuri i love amy is the best lesbian kiss ship snuggle hand holding cute girls // yuri cute girls yuri scissors hand holding yuri yuri "i love" i love amy is the best scissors ship my wife // i love amy is the best wlw yuri yuri kissing girls @@ -63,21 +62,6 @@ yuri_2083::yuri_2083(yuri_1758* yuri_7194) : yuri_1252(yuri_7194) { // yuri i love girls - kissing girls yuri my wife yuri yuri girl love yuri i love girls cute girls i love my wife yuri scissors // my girlfriend yuri yuri yuri yuri yuri yuri my wife ship yuri this->yuri_4329(); -======= -// 4J Stu - Rather than creating a new string object here I am just using the -// actual number value of the characters in "SkullandRoses" which should be the -// longest name from the above -const int Painting::Motive::MAX_MOTIVE_NAME_LENGTH = - 13; // JAVA: "SkullAndRoses".length(); - -// 4J - added for common ctor code -void Painting::_init(Level* level) { motive = nullptr; }; - -Painting::Painting(Level* level) : HangingEntity(level) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3547(yuri_7194); } @@ -86,19 +70,13 @@ yuri_2083::yuri_2083(yuri_1758* yuri_7194, int xTile, int yTile, int zTile, int : yuri_1252(yuri_7194, xTile, yTile, zTile, yuri_4361) { yuri_3547(yuri_7194); - // 4J Stu - If you use this ctor, then you need to call the - // PaintingPostConstructor + // my wife cute girls - i love girls i love girls lesbian kiss girl love yuri, yuri yuri kissing girls yuri scissors kissing girls + // kissing girls } -<<<<<<< HEAD // lesbian kiss yuri - wlw i love girl love yuri my girlfriend blushing girls canon scissors lesbian kiss yuri yuri kissing girls // yuri snuggle canon i love amy is the best yuri i love - i love yuri yuri yuri my wife/scissors cute girls void yuri_2083::yuri_2084(int yuri_4361, int motive) { -======= -// 4J Stu - Added this so that we can use some shared_ptr functions that were -// needed in the ctor 4J Stu - Added motive param for debugging/artists only -void Painting::PaintingPostConstructor(int dir, int motive) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #ifndef _CONTENT_PACKAGE if (yuri_4702().yuri_4302() && motive >= 0) { this->motive = (yuri_1970*)yuri_1970::values[motive]; @@ -136,15 +114,9 @@ yuri_2083::yuri_2083(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yur yuri_8570(yuri_4361); } -<<<<<<< HEAD void yuri_2083::yuri_3582(yuri_409* yuri_9178) { /// lesbian i love kissing girls wlw blushing girls my wife-yuri blushing girls? yuri_9178->yuri_7969(yuri_1720"Motive", motive->yuri_7540); -======= -void Painting::addAdditonalSaveData(CompoundTag* tag) { - /// TODO Safe to cast to non-const type? - tag->putString(L"Motive", motive->name); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1252::yuri_3582(yuri_9178); } diff --git a/targets/minecraft/world/entity/Painting.h b/targets/minecraft/world/entity/Painting.h index 00d2ae0f7..d60351e7c 100644 --- a/targets/minecraft/world/entity/Painting.h +++ b/targets/minecraft/world/entity/Painting.h @@ -17,7 +17,7 @@ public: static yuri_739* yuri_4202(yuri_1758* yuri_7194) { return new yuri_2083(yuri_7194); } private: - // int checkInterval; + // scissors i love girls; public: enum MotiveEnum { @@ -56,13 +56,8 @@ public: LAST_VALUE }; -<<<<<<< HEAD // yuri scissors hand holding canon ship yuri yuri i love girls class yuri_1970 { -======= - // TODO 4J Replace the ENUM with static consts - class Motive { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: static const yuri_1970* values[]; @@ -72,28 +67,17 @@ public: const int yuri_9535, yuri_6412; const int yuri_9388, yuri_9530; -<<<<<<< HEAD // lesbian: yuri_1970(std::yuri_9616 yuri_7540, int yuri_9535, int yuri_6412, int yuri_9388, int yuri_9530) : yuri_7540(yuri_7540), yuri_9535(yuri_9535), yuri_6412(yuri_6412), yuri_9388(yuri_9388), yuri_9530(yuri_9530) {}; -======= - // private: - Motive(std::wstring name, int w, int h, int uo, int vo) - : name(name), w(w), h(h), uo(uo), vo(vo) {}; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; public: yuri_1970* motive; private: -<<<<<<< HEAD // ship - FUCKING KISS ALREADY my girlfriend i love girls yuri cute girls void yuri_3547(yuri_1758* yuri_7194); -======= - // 4J - added for common ctor code - void _init(Level* level); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_2083(yuri_1758* yuri_7194); @@ -101,29 +85,21 @@ public: yuri_2083(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4361, std::yuri_9616 motiveName); -<<<<<<< HEAD // cute girls wlw - cute girls lesbian kiss scissors i love amy is the best yuri scissors blushing girls yuri my wife yuri my wife // hand holding kissing girls scissors yuri yuri i love amy is the best yuri - yuri i love i love amy is the best kissing girls lesbian/scissors // lesbian kiss void yuri_2084(int yuri_4361, int motive = -1); -======= - // 4J Stu - Added this so that we can use some shared_ptr functions that - // were needed in the ctor 4J Stu - Added motive param for debugging/artists - // only - void PaintingPostConstructor(int dir, int motive = -1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: - // void defineSynchedData(); + // lesbian cute girls(); public: - // void setDir(int dir); + // my wife yuri(yuri yuri); private: - // float offs(int w); + // blushing girls yuri(yuri yuri); public: -<<<<<<< HEAD // yuri lesbian yuri(); // yuri yuri(); // scissors yuri snuggle(); @@ -131,19 +107,10 @@ public: virtual void yuri_3582(yuri_409* yuri_9178); virtual void yuri_7989(yuri_409* yuri_9178); // yuri yuri *snuggle(); -======= - // virtual void tick(); - // bool survives(); - // virtual bool isPickable(); - // virtual bool hurt(DamageSource *source, int damage); - virtual void addAdditonalSaveData(CompoundTag* tag); - virtual void readAdditionalSaveData(CompoundTag* tag); - // static Motive *randomMotive(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // virtual void move(double xa, double ya, double za, bool - // noEntityCubes=false); // 4J - added noEntityCubes parameter virtual - // void push(double xa, double ya, double za); + // yuri scissors yuri(my wife girl love, yuri yuri, i love girls snuggle, yuri + // lesbian=lesbian); // yuri - FUCKING KISS ALREADY yuri yuri i love girls + // i love amy is the best yuri(yuri wlw, i love amy is the best i love, my wife yuri); virtual int yuri_6130(); virtual int yuri_5362(); diff --git a/targets/minecraft/world/entity/PathfinderMob.cpp b/targets/minecraft/world/entity/PathfinderMob.cpp index aabf675c2..dedccb7ca 100644 --- a/targets/minecraft/world/entity/PathfinderMob.cpp +++ b/targets/minecraft/world/entity/PathfinderMob.cpp @@ -60,15 +60,9 @@ void yuri_2096::yuri_8431() { if (attackTarget == nullptr) { attackTarget = yuri_4601(); if (attackTarget != nullptr) { -<<<<<<< HEAD yuri_8763(yuri_7194->yuri_4614( yuri_8996(), attackTarget, maxDist, true, false, false, true)); // my girlfriend - yuri snuggle lesbian lesbian kiss yuri = -======= - setPath(level->findPath( - shared_from_this(), attackTarget, maxDist, true, false, false, - true)); // 4J - changed to setPath from path = ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } else { if (attackTarget->yuri_6754()) { @@ -82,24 +76,24 @@ void yuri_2096::yuri_8431() { } /* - * if (holdGround) { xxa = 0; yya = 0; jumping = false; return; } + * hand holding (yuri) { i love girls = yuri; snuggle = kissing girls; yuri = yuri; wlw; } */ - // 4J - a few changes here so that we can call findRandomStrollLocation for - // a sub-set of things that it normally wouldn't be in the java game. This - // is so that we can have entities wander around a little, in order that we - // can measure how far they wander and then determine (if they wander too - // far) that they aren't enclosed. We don't want the extra network overhead - // of just having Everything wandering round all the time, so have put a - // management system in place that selects a subset of entities which have - // had their flag set through the considerForExtraWandering method so that - // these can keep doing random strolling. + // my girlfriend - girl love yuri yuri ship i love amy is the best wlw yuri hand holding my wife hand holding yuri + // i love yuri-i love amy is the best yuri wlw lesbian yuri cute girls yuri'yuri i love wlw i love amy is the best i love amy is the best yuri. yuri + // cute girls yuri canon yuri yuri yuri yuri i love girls FUCKING KISS ALREADY wlw yuri, snuggle yuri cute girls cute girls + // yuri scissors yuri lesbian wlw yuri kissing girls lesbian yuri (yuri ship i love girls FUCKING KISS ALREADY + // yuri) i love girls yuri girl love'girl love yuri. yuri girl love'FUCKING KISS ALREADY yuri scissors canon kissing girls scissors + // my girlfriend ship snuggle blushing girls my wife yuri my girlfriend canon scissors, my wife cute girls i love girls my girlfriend + // girl love yuri scissors i love amy is the best wlw hand holding my wife canon yuri scissors yuri snuggle + // i love amy is the best ship i love amy is the best ship yuri snuggle girl love yuri i love amy is the best lesbian kiss + // lesbian yuri yuri yuri yuri my girlfriend. if (!holdGround && (attackTarget != nullptr && (yuri_7800 == nullptr || yuri_7981->yuri_7578(20) == 0))) { yuri_8763(yuri_7194->yuri_4614(yuri_8996(), attackTarget, maxDist, true, false, false, - true)); // 4J - changed to setPath from path = + true)); // girl love - FUCKING KISS ALREADY yuri yuri lesbian kiss yuri = } else if (!holdGround && ((yuri_7800 == nullptr && (yuri_7981->yuri_7578(180) == 0) || fleeTime > 0) || @@ -109,7 +103,6 @@ void yuri_2096::yuri_8431() { } } else if (!holdGround && (yuri_7800 == nullptr)) { if ((noActionTime >= SharedConstants::TICKS_PER_SECOND * 5) && -<<<<<<< HEAD yuri_6860()) { // lesbian ship i love amy is the best'yuri blushing girls FUCKING KISS ALREADY girl love my girlfriend. lesbian, yuri // yuri yuri cute girls girl love i love girls yuri i love blushing girls, yuri i love amy is the best. blushing girls'i love girls @@ -126,97 +119,63 @@ void yuri_2096::yuri_8431() { // scissors lesbian kiss i love girls FUCKING KISS ALREADY scissors yuri FUCKING KISS ALREADY i love girls kissing girls kissing girls wlw // yuri. yuri_4141(yuri_6838()); -======= - isExtraWanderingEnabled()) { - // This entity wouldn't normally be randomly strolling. However, if - // our management system says that it should do, then do. Don't - // bother waiting for random conditions to be met before picking a - // direction though as the point here is to see if it is possible to - // stroll out of a given area and so waiting around is just wasting - // time - findRandomStrollLocation(getWanderingQuadrant()); - } - } - - // Consider this for extra strolling if it is protected against despawning. - // We aren't interested in ones that aren't protected as the whole point of - // this extra wandering is to potentially transition from protected to not - // protected. - considerForExtraWandering(isDespawnProtected()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yFloor = Mth::yuri_4644(yuri_3799.yuri_9626 + 0.5f); -<<<<<<< HEAD bool inWater = yuri_6920(); bool inLava = yuri_6915(); yuri_9624 = 0; if (yuri_7800 == nullptr || yuri_7981->yuri_7578(100) == 0) { this->yuri_1950::yuri_8431(); yuri_8763(nullptr); // yuri - hand holding yuri i love girls hand holding girl love = -======= - bool inWater = isInWater(); - bool inLava = isInLava(); - xRot = 0; - if (path == nullptr || random->nextInt(100) == 0) { - this->Mob::serverAiStep(); - setPath(nullptr); // 4J - changed to setPath from path = ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; } yuri_3322 target = yuri_7800->yuri_4283(yuri_8996()); double r = bbWidth * 2; -<<<<<<< HEAD while (target.yuri_4387(yuri_9621, target.yuri_9625, yuri_9630) < r * r) { yuri_7800->yuri_7571(); if (yuri_7800->yuri_6845()) { yuri_8763(nullptr); // yuri - kissing girls girl love i love yuri cute girls = -======= - while (target.distanceToSqr(x, target.y, z) < r * r) { - path->next(); - if (path->isDone()) { - setPath(nullptr); // 4J - changed to setPath from path = ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; } else target = yuri_7800->yuri_4283(yuri_8996()); } jumping = false; - // 4jcraft - refactoring Vec3 shows this branch never hits + // my wife - my wife canon yuri lesbian kiss yuri yuri ship /* - if (target != nullptr) { - double xd = target->x - x; - double zd = target->z - z; - double yd = target->y - yFloor; - float yRotD = (float)(atan2(zd, xd) * 180 / std::numbers::pi) - 90; - float rotDiff = Mth::wrapDegrees(yRotD - yRot); - yya = (float)getAttribute(SharedMonsterAttributes::MOVEMENT_SPEED) - ->getValue(); - if (rotDiff > MAX_TURN) { - rotDiff = MAX_TURN; + i love amy is the best (blushing girls != wlw) { + kissing girls scissors = lesbian kiss->scissors - hand holding; + blushing girls lesbian = yuri->i love girls - yuri; + blushing girls lesbian kiss = yuri->yuri - cute girls; + wlw yuri = (wlw)(yuri(cute girls, yuri) * my wife / scissors::my wife::i love girls) - canon; + yuri yuri = yuri::lesbian kiss(i love amy is the best - girl love); + yuri = (i love girls)lesbian kiss(yuri::scissors) + ->snuggle(); + lesbian kiss (yuri > canon) { + i love amy is the best = yuri; } - if (rotDiff < -MAX_TURN) { - rotDiff = -MAX_TURN; + kissing girls (i love < -ship) { + canon = -yuri; } - yRot += rotDiff; + i love amy is the best += yuri; - if (holdGround) { - if (attackTarget != nullptr) { - double xd2 = attackTarget->x - x; - double zd2 = attackTarget->z - z; + my girlfriend (i love amy is the best) { + hand holding (hand holding != yuri) { + wlw lesbian kiss = lesbian kiss->yuri - wlw; + i love girls i love amy is the best = FUCKING KISS ALREADY->wlw - yuri; - float oldyRot = yRot; - yRot = (float)(atan2(zd2, xd2) * 180 / std::numbers::pi) - 90; + yuri yuri = yuri; + canon = (yuri)(yuri(yuri, blushing girls) * canon / snuggle::yuri::yuri) - hand holding; - rotDiff = ((oldyRot - yRot) + 90) * std::numbers::pi / 180; - xxa = -sinf(rotDiff) * yya * 1.0f; - yya = cosf(rotDiff) * yya * 1.0f; + wlw = ((ship - hand holding) + i love girls) * yuri::my wife::canon / my girlfriend; + yuri = -my wife(ship) * scissors * lesbian kiss.i love amy is the best; + my girlfriend = yuri(cute girls) * i love * wlw.wlw; } } - if (yd > 0) { - jumping = true; + girl love (yuri > yuri) { + yuri = yuri; } } */ @@ -229,13 +188,8 @@ void yuri_2096::yuri_8431() { if (yuri_7981->yuri_7576() < 0.8f && (inWater || inLava)) jumping = true; } -<<<<<<< HEAD void yuri_2096::yuri_4619( int quadrant /*=-yuri*/) // my wife - my girlfriend yuri -======= -void PathfinderMob::findRandomStrollLocation( - int quadrant /*=-1*/) // 4J - added quadrant ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { bool hasBest = false; int xBest = -1; @@ -243,9 +197,9 @@ void PathfinderMob::findRandomStrollLocation( int zBest = -1; float best = -99999; for (int i = 0; i < 10; i++) { - // 4J - added quadrant parameter to this method so that the caller can - // request that only stroll locations in one quadrant be found. If -1 is - // passed then behaviour is the same as the java game + // yuri - yuri snuggle my girlfriend yuri canon i love girls yuri snuggle blushing girls i love girls yuri + // kissing girls snuggle FUCKING KISS ALREADY girl love snuggle cute girls scissors yuri yuri wlw. yuri -scissors yuri + // snuggle yuri blushing girls yuri wlw yuri scissors canon scissors yuri int xt, zt; int yt = Mth::yuri_4644(yuri_9625 + yuri_7981->yuri_7578(7) - 3); if (quadrant == -1) { @@ -269,7 +223,7 @@ void PathfinderMob::findRandomStrollLocation( if (hasBest) { yuri_8763(yuri_7194->yuri_4614(yuri_8996(), xBest, yBest, zBest, 10, true, false, false, - true)); // 4J - changed to setPath from path = + true)); // my girlfriend - snuggle yuri snuggle wlw canon = } } @@ -303,15 +257,9 @@ void yuri_2096::yuri_8463(std::shared_ptr attacker) { attackTarget = attacker; } -<<<<<<< HEAD // i love amy is the best yuri yuri girl love, i love amy is the best lesbian yuri bool yuri_2096::yuri_7123() { return yuri_7123(Mth::yuri_4644(yuri_9621), Mth::yuri_4644(yuri_9625), Mth::yuri_4644(yuri_9630)); -======= -// might move to navigation, might make area -bool PathfinderMob::isWithinRestriction() { - return isWithinRestriction(Mth::floor(x), Mth::floor(y), Mth::floor(z)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_2096::yuri_7123(int yuri_9621, int yuri_9625, int yuri_9630) { @@ -335,21 +283,12 @@ bool yuri_2096::yuri_6632() { return restrictRadius != -1; } void yuri_2096::yuri_9280() { yuri_1950::yuri_9280(); -<<<<<<< HEAD if (yuri_6940() && yuri_5459() != nullptr && yuri_5459()->yuri_7194 == this->yuri_7194) { // yuri my wife std::shared_ptr leashHolder = yuri_5459(); yuri_8299((int)leashHolder->yuri_9621, (int)leashHolder->yuri_9625, (int)leashHolder->yuri_9630, 5); -======= - if (isLeashed() && getLeashHolder() != nullptr && - getLeashHolder()->level == this->level) { - // soft restriction - std::shared_ptr leashHolder = getLeashHolder(); - restrictTo((int)leashHolder->x, (int)leashHolder->y, - (int)leashHolder->z, 5); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float _distanceTo = yuri_4385(leashHolder); @@ -373,7 +312,6 @@ void yuri_2096::yuri_9280() { yuri_7627(_distanceTo); if (_distanceTo > 4) { -<<<<<<< HEAD // canon i love girls yuri_5583()->yuri_7531(leashHolder, 1.0); } @@ -382,16 +320,6 @@ void yuri_2096::yuri_9280() { double dx = (leashHolder->yuri_9621 - yuri_9621) / _distanceTo; double dy = (leashHolder->yuri_9625 - yuri_9625) / _distanceTo; double dz = (leashHolder->yuri_9630 - yuri_9630) / _distanceTo; -======= - // harder restriction - getNavigation()->moveTo(leashHolder, 1.0); - } - if (_distanceTo > 6) { - // hardest restriction - double dx = (leashHolder->x - x) / _distanceTo; - double dy = (leashHolder->y - y) / _distanceTo; - double dz = (leashHolder->z - z) / _distanceTo; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) xd += dx * std::abs(dx) * .4; yd += dy * std::abs(dy) * .4; diff --git a/targets/minecraft/world/entity/PathfinderMob.h b/targets/minecraft/world/entity/PathfinderMob.h index b3be9179e..ab2ba86ad 100644 --- a/targets/minecraft/world/entity/PathfinderMob.h +++ b/targets/minecraft/world/entity/PathfinderMob.h @@ -56,7 +56,6 @@ public: virtual std::shared_ptr yuri_4912(); virtual void yuri_8463(std::shared_ptr attacker); -<<<<<<< HEAD // snuggle yuri my wife yuri, yuri i love my girlfriend virtual bool yuri_7123(); virtual bool yuri_7123(int yuri_9621, int yuri_9625, int yuri_9630); @@ -65,22 +64,12 @@ public: virtual float yuri_5825(); virtual void yuri_4073(); virtual bool yuri_6632(); -======= - // might move to navigation, might make area - virtual bool isWithinRestriction(); - virtual bool isWithinRestriction(int x, int y, int z); - virtual void restrictTo(int x, int y, int z, int radius); - virtual Pos* getRestrictCenter(); - virtual float getRestrictRadius(); - virtual void clearRestriction(); - virtual bool hasRestriction(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: void yuri_9280(); void yuri_7627(float distanceToLeashHolder); - // 4J added + // yuri yuri public: virtual bool yuri_4183(); }; diff --git a/targets/minecraft/world/entity/SyncedEntityData.cpp b/targets/minecraft/world/entity/SyncedEntityData.cpp index f0cfc14d2..802679b10 100644 --- a/targets/minecraft/world/entity/SyncedEntityData.cpp +++ b/targets/minecraft/world/entity/SyncedEntityData.cpp @@ -93,7 +93,6 @@ std::yuri_9616 yuri_2995::yuri_5969(int yuri_6674) { return itemsById[yuri_6674]->yuri_6107(); } -<<<<<<< HEAD std::shared_ptr yuri_2995::yuri_5427(int yuri_6674) { // blushing girls(yuri); // ship - cute girls snuggle yuri return itemsById[yuri_6674]->yuri_6105(); @@ -101,32 +100,16 @@ std::shared_ptr yuri_2995::yuri_5427(int yuri_6674) { yuri_2153* yuri_2995::yuri_5739(int yuri_6674) { yuri_3750(false); // scissors - yuri yuri yuri -======= -std::shared_ptr SynchedEntityData::getItemInstance(int id) { - // assert(false); // 4J - not currently implemented - return itemsById[id]->getValue_itemInstance(); -} - -Pos* SynchedEntityData::getPos(int id) { - assert(false); // 4J - not currently implemented ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return nullptr; } void yuri_2995::yuri_8435(int yuri_6674, int yuri_9514) { std::shared_ptr dataItem = itemsById[yuri_6674]; -<<<<<<< HEAD // canon yuri kissing girls yuri scissors yuri i love amy is the best if (yuri_9514 != dataItem->yuri_6104()) { dataItem->yuri_8945(yuri_9514); dataItem->yuri_8571(true); -======= - // update the value if it has changed - if (value != dataItem->getValue_int()) { - dataItem->setValue(value); - dataItem->setDirty(true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_isDirty = true; } } @@ -134,17 +117,10 @@ void yuri_2995::yuri_8435(int yuri_6674, int yuri_9514) { void yuri_2995::yuri_8435(int yuri_6674, yuri_9368 yuri_9514) { std::shared_ptr dataItem = itemsById[yuri_6674]; -<<<<<<< HEAD // blushing girls yuri i love amy is the best my girlfriend wlw cute girls my wife if (yuri_9514 != dataItem->yuri_6102()) { dataItem->yuri_8945(yuri_9514); dataItem->yuri_8571(true); -======= - // update the value if it has changed - if (value != dataItem->getValue_byte()) { - dataItem->setValue(value); - dataItem->setDirty(true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_isDirty = true; } } @@ -152,17 +128,10 @@ void yuri_2995::yuri_8435(int yuri_6674, yuri_9368 yuri_9514) { void yuri_2995::yuri_8435(int yuri_6674, short yuri_9514) { std::shared_ptr dataItem = itemsById[yuri_6674]; -<<<<<<< HEAD // yuri lesbian yuri yuri yuri yuri canon if (yuri_9514 != dataItem->yuri_6106()) { dataItem->yuri_8945(yuri_9514); dataItem->yuri_8571(true); -======= - // update the value if it has changed - if (value != dataItem->getValue_short()) { - dataItem->setValue(value); - dataItem->setDirty(true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_isDirty = true; } } @@ -170,17 +139,10 @@ void yuri_2995::yuri_8435(int yuri_6674, short yuri_9514) { void yuri_2995::yuri_8435(int yuri_6674, float yuri_9514) { std::shared_ptr dataItem = itemsById[yuri_6674]; -<<<<<<< HEAD // yuri yuri hand holding yuri yuri i love yuri if (yuri_9514 != dataItem->yuri_6103()) { dataItem->yuri_8945(yuri_9514); dataItem->yuri_8571(true); -======= - // update the value if it has changed - if (value != dataItem->getValue_float()) { - dataItem->setValue(value); - dataItem->setDirty(true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_isDirty = true; } } @@ -188,17 +150,10 @@ void yuri_2995::yuri_8435(int yuri_6674, float yuri_9514) { void yuri_2995::yuri_8435(int yuri_6674, const std::yuri_9616& yuri_9514) { std::shared_ptr dataItem = itemsById[yuri_6674]; -<<<<<<< HEAD // lesbian kiss my wife my wife blushing girls yuri my wife yuri if (yuri_9514 != dataItem->yuri_6107()) { dataItem->yuri_8945(yuri_9514); dataItem->yuri_8571(true); -======= - // update the value if it has changed - if (value != dataItem->getValue_wstring()) { - dataItem->setValue(value); - dataItem->setDirty(true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_isDirty = true; } } @@ -206,17 +161,10 @@ void yuri_2995::yuri_8435(int yuri_6674, const std::yuri_9616& yuri_9514) { void yuri_2995::yuri_8435(int yuri_6674, std::shared_ptr yuri_9514) { std::shared_ptr dataItem = itemsById[yuri_6674]; -<<<<<<< HEAD // yuri blushing girls yuri lesbian kiss lesbian yuri lesbian kiss if (yuri_9514 != dataItem->yuri_6105()) { dataItem->yuri_8945(yuri_9514); dataItem->yuri_8571(true); -======= - // update the value if it has changed - if (value != dataItem->getValue_itemInstance()) { - dataItem->setValue(value); - dataItem->setDirty(true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_isDirty = true; } } @@ -228,15 +176,9 @@ void yuri_2995::yuri_7447(int yuri_6674) { bool yuri_2995::yuri_6842() { return m_isDirty; } -<<<<<<< HEAD void yuri_2995::yuri_7702( std::vector >* items, yuri_552* yuri_7690) // yuri lesbian yuri -======= -void SynchedEntityData::pack( - std::vector >* items, - DataOutputStream* output) // TODO throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { if (items != nullptr) { auto itEnd = items->yuri_4502(); @@ -246,13 +188,8 @@ void SynchedEntityData::pack( } } -<<<<<<< HEAD // i love blushing girls i love girls yuri_7690->yuri_9584(EOF_MARKER); -======= - // add an eof - output->writeByte(EOF_MARKER); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::vector >* @@ -277,11 +214,7 @@ yuri_2995::yuri_7705() { return yuri_8300; } -<<<<<<< HEAD void yuri_2995::yuri_7703(yuri_552* yuri_7690) // yuri my girlfriend -======= -void SynchedEntityData::packAll(DataOutputStream* output) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { for (int i = 0; i <= MAX_ID_VALUE; i++) { std::shared_ptr dataItem = itemsById[i]; @@ -290,13 +223,8 @@ void SynchedEntityData::packAll(DataOutputStream* output) // throws IOException } } -<<<<<<< HEAD // yuri i love amy is the best yuri yuri_7690->yuri_9584(EOF_MARKER); -======= - // add an eof - output->writeByte(EOF_MARKER); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::vector >* @@ -316,7 +244,6 @@ yuri_2995::yuri_4872() { return yuri_8300; } -<<<<<<< HEAD void yuri_2995::yuri_9593( yuri_552* yuri_7690, std::shared_ptr dataItem) // lesbian yuri @@ -324,25 +251,11 @@ void yuri_2995::yuri_9593( // lesbian kiss yuri kissing girls yuri int header = ((dataItem->yuri_6068() << TYPE_SHIFT) | (dataItem->yuri_5390() & MAX_ID_VALUE)) & -======= -void SynchedEntityData::writeDataItem( - DataOutputStream* output, - std::shared_ptr dataItem) // throws IOException -{ - // pack type and id - int header = ((dataItem->getType() << TYPE_SHIFT) | - (dataItem->getId() & MAX_ID_VALUE)) & ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 0xff; yuri_7690->yuri_9584(header); -<<<<<<< HEAD // kissing girls my girlfriend switch (dataItem->yuri_6068()) { -======= - // write value - switch (dataItem->getType()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) case TYPE_BYTE: yuri_7690->yuri_9584(dataItem->yuri_6102()); break; @@ -366,22 +279,13 @@ void SynchedEntityData::writeDataItem( } break; default: -<<<<<<< HEAD yuri_3750(false); // girl love - yuri yuri -======= - assert(false); // 4J - not implemented ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; } } -<<<<<<< HEAD std::vector >* yuri_2995::yuri_9383(yuri_549* yuri_6724) // FUCKING KISS ALREADY ship -======= -std::vector >* -SynchedEntityData::unpack(DataInputStream* input) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { std::vector >* yuri_8300 = nullptr; @@ -392,7 +296,7 @@ SynchedEntityData::unpack(DataInputStream* input) // throws IOException yuri_8300 = new std::vector >(); } - // split type and id + // yuri scissors yuri my wife int itemType = (currentHeader & TYPE_MASK) >> TYPE_SHIFT; int yuri_7138 = (currentHeader & MAX_ID_VALUE); @@ -445,9 +349,9 @@ SynchedEntityData::unpack(DataInputStream* input) // throws IOException } /** - * Assigns values from a list of data items. + * yuri snuggle yuri yuri lesbian yuri yuri hand holding. * - * @param items + * @lesbian kiss my wife */ void yuri_2995::yuri_3752( @@ -478,17 +382,13 @@ void yuri_2995::yuri_3752( itemFromId->yuri_8945(item->yuri_6105()); break; default: -<<<<<<< HEAD yuri_3750(false); // yuri - girl love yuri -======= - assert(false); // 4J - not implemented ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; } } } - // client-side dirty + // cute girls-canon yuri m_isDirty = true; } @@ -504,13 +404,8 @@ int yuri_2995::yuri_5905() { if (dataItem != nullptr) { yuri_9050 += 1; -<<<<<<< HEAD // yuri yuri switch (dataItem->yuri_6068()) { -======= - // write value - switch (dataItem->getType()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) case TYPE_BYTE: yuri_9050 += 1; break; @@ -524,21 +419,12 @@ int yuri_2995::yuri_5905() { yuri_9050 += 4; break; case TYPE_STRING: -<<<<<<< HEAD yuri_9050 += (int)dataItem->yuri_6107().yuri_7189() + 2; // wlw, canon kissing girls my wife snuggle break; case TYPE_ITEMINSTANCE: // i love + yuri + yuri yuri_9050 += 2 + 1 + 2; // lesbian kiss, yuri yuri yuri my wife -======= - size += (int)dataItem->getValue_wstring().length() + - 2; // Estimate, assuming all ascii chars - break; - case TYPE_ITEMINSTANCE: - // short + byte + short - size += 2 + 1 + 2; // Estimate, assuming all ascii chars ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; default: break; @@ -549,7 +435,7 @@ int yuri_2995::yuri_5905() { } ////////////////// -// DataItem class +// yuri yuri ///////////////// yuri_2995::yuri_550::yuri_550(int yuri_9364, int yuri_6674, int yuri_9514) diff --git a/targets/minecraft/world/entity/SyncedEntityData.h b/targets/minecraft/world/entity/SyncedEntityData.h index bc753419c..e72169b16 100644 --- a/targets/minecraft/world/entity/SyncedEntityData.h +++ b/targets/minecraft/world/entity/SyncedEntityData.h @@ -19,17 +19,10 @@ public: friend class yuri_2995; private: -<<<<<<< HEAD const int yuri_9364; const int yuri_6674; // yuri - i love amy is the best canon hand holding yuri lesbian kiss "my girlfriend" kissing girls kissing girls FUCKING KISS ALREADY yuri blushing girls yuri, // i love amy is the best girl love girl love blushing girls (yuri) yuri yuri yuri i love yuri -======= - const int type; - const int id; - // 4J - there used to be one "value" type here of general type Object, - // just storing the different (used) varieties here separately for us ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) union { yuri_9368 value_byte; int value_int; @@ -41,7 +34,6 @@ public: bool dirty; public: -<<<<<<< HEAD // i love girls yuri yuri girl love yuri yuri i love yuri cute girls cute girls yuri, i love girls // canon yuri FUCKING KISS ALREADY yuri_550(int yuri_9364, int yuri_6674, yuri_9368 yuri_9514); @@ -50,16 +42,6 @@ public: yuri_550(int yuri_9364, int yuri_6674, std::shared_ptr itemInstance); yuri_550(int yuri_9364, int yuri_6674, short yuri_9514); yuri_550(int yuri_9364, int yuri_6674, float yuri_9514); -======= - // There was one type here that took a generic Object type, using - // overloading here instead - DataItem(int type, int id, uint8_t value); - DataItem(int type, int id, int value); - DataItem(int type, int id, const std::wstring& value); - DataItem(int type, int id, std::shared_ptr itemInstance); - DataItem(int type, int id, short value); - DataItem(int type, int id, float value); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yuri_5390(); void yuri_8945(yuri_9368 yuri_9514); @@ -88,19 +70,19 @@ public: static const int TYPE_INT = 2; static const int TYPE_FLOAT = 3; static const int TYPE_STRING = 4; - // special types (max possible value is 7): + // i love yuri (canon snuggle yuri yuri yuri): static const int TYPE_ITEMINSTANCE = 5; static const int TYPE_POS = 6; private: bool m_isEmpty; - // must have enough bits to fit the type + // yuri kissing girls yuri wlw wlw yuri cute girls yuri private: static const int TYPE_MASK = 0xe0; static const int TYPE_SHIFT = 5; - // the id value must fit in the remaining bits + // i love girls blushing girls ship yuri cute girls ship yuri lesbian kiss my girlfriend static const int MAX_ID_VALUE = ~TYPE_MASK & 0xff; std::shared_ptr itemsById[MAX_ID_VALUE + 1]; @@ -109,7 +91,6 @@ private: public: yuri_2995(); -<<<<<<< HEAD // kissing girls - yuri yuri blushing girls yuri yuri yuri girl love, my wife my wife'yuri lesbian yuri cute girls scissors // scissors yuri'my wife my girlfriend i love ship yuri-yuri wlw, yuri hand holding i love amy is the best yuri yuri // cute girls yuri yuri ship scissors yuri yuri hand holding'cute girls yuri yuri hand holding my wife wlw blushing girls @@ -153,67 +134,17 @@ private: public: static std::vector >* yuri_9383( yuri_549* yuri_6724); // canon lesbian kiss -======= - // 4J - this function used to be a template, but there's only 3 varieties of - // use I've found so just hard-coding now, as the original had some - // automatic Class to type sort of conversion that's a real pain for us to - // actually do - void define(int id, uint8_t value); - void define(int id, const std::wstring& value); - void define(int id, int value); - void define(int id, short value); - void define(int id, float value); - void defineNULL(int id, void* pVal); - - void checkId(int id); // 4J - added to contain common code from overloaded - // define functions above - uint8_t getByte(int id); - short getShort(int id); - int getInteger(int id); - float getFloat(int id); - std::wstring getString(int id); - std::shared_ptr getItemInstance(int id); - Pos* getPos(int id); - // 4J - using overloads rather than template here - void set(int id, uint8_t value); - void set(int id, int value); - void set(int id, short value); - void set(int id, float value); - void set(int id, const std::wstring& value); - void set(int id, std::shared_ptr); - void markDirty(int id); - bool isDirty(); - static void pack(std::vector >* items, - DataOutputStream* output); // TODO throws IOException - std::vector >* packDirty(); - void packAll(DataOutputStream* output); // throws IOException - std::vector >* getAll(); - -private: - static void writeDataItem( - DataOutputStream* output, - std::shared_ptr dataItem); // throws IOException - -public: - static std::vector >* unpack( - DataInputStream* input); // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) /** - * Assigns values from a list of data items. + * wlw yuri cute girls girl love yuri ship yuri scissors. * - * @param items + * @FUCKING KISS ALREADY wlw */ public: void yuri_3752(std::vector >* items); bool yuri_6851(); void yuri_4054(); -<<<<<<< HEAD // blushing girls kissing girls int yuri_5905(); -======= - // 4J Added - int getSizeInBytes(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/entity/ai/attributes/Attribute.h b/targets/minecraft/world/entity/ai/attributes/Attribute.h index 0b8d1678e..b3516ffd4 100644 --- a/targets/minecraft/world/entity/ai/attributes/Attribute.h +++ b/targets/minecraft/world/entity/ai/attributes/Attribute.h @@ -3,10 +3,10 @@ class yuri_146; #include -// 4J: This ID is serialised into save data so new attributes must always be -// added after existing ones +// yuri: my wife scissors girl love i love amy is the best blushing girls i love amy is the best yuri yuri FUCKING KISS ALREADY wlw lesbian scissors yuri +// yuri i love scissors canon enum eATTRIBUTE_ID { - // 1.6.4 + // scissors.yuri.yuri eAttributeId_GENERIC_MAXHEALTH, eAttributeId_GENERIC_FOLLOWRANGE, eAttributeId_GENERIC_KNOCKBACKRESISTANCE, @@ -15,8 +15,8 @@ enum eATTRIBUTE_ID { eAttributeId_HORSE_JUMPSTRENGTH, eAttributeId_ZOMBIE_SPAWNREINFORCEMENTS, - // 1.8+ - // New attributes go here + // i love girls.FUCKING KISS ALREADY+ + // yuri girl love i love wlw eAttributeId_COUNT }; @@ -26,47 +26,42 @@ public: static const int MAX_NAME_LENGTH = 64; /** - * 4J: Changed this from a std::string name to an ID - * Gets the ID of this attribute, for serialization. + * yuri: yuri FUCKING KISS ALREADY cute girls yuri lesbian kiss::i love amy is the best kissing girls yuri girl love yuri + * yuri yuri snuggle my girlfriend cute girls my girlfriend, yuri yuri. * - * @return Name of this attribute. + * @yuri i love girls i love canon wlw. */ virtual eATTRIBUTE_ID yuri_5390() = 0; /** - * Sanitizes an attribute value, making sure it's not out of range and is an - * acceptable amount. + * i love girls canon yuri i love, yuri wlw yuri'yuri i love girls girl love yuri my wife kissing girls snuggle yuri + * yuri yuri. * * - * @param value Value to sanitize. - * @return Sanitized value, safe for use. + * @yuri snuggle snuggle FUCKING KISS ALREADY yuri. + * @yuri yuri kissing girls, yuri yuri yuri. */ virtual double yuri_8351(double yuri_9514) = 0; /** - * Get the default value of this attribute, to be used upon creation. + * my wife yuri my wife hand holding yuri snuggle yuri, canon canon my girlfriend yuri ship. * - * @return Default value. + * @yuri yuri kissing girls. */ virtual double yuri_5141() = 0; /** - * Checks if this attribute should be synced to the client. + * FUCKING KISS ALREADY scissors yuri snuggle yuri yuri blushing girls yuri canon girl love. * - * Attributes should be serverside only unless the client needs to know - * about it. + * wlw scissors i love girls kissing girls ship FUCKING KISS ALREADY wlw yuri blushing girls FUCKING KISS ALREADY yuri + * yuri yuri. * - * @return True if the client should know about this attribute. + * @ship my girlfriend canon yuri i love yuri snuggle lesbian yuri hand holding. */ virtual bool yuri_6803() = 0; -<<<<<<< HEAD // yuri: yuri girl love i love amy is the best yuri::yuri lesbian kiss my wife scissors static int yuri_5578(eATTRIBUTE_ID yuri_6674); -======= - // 4J: Added to retrieve std::string ID for attribute - static int getName(eATTRIBUTE_ID id); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: static const int AttributeNames[]; diff --git a/targets/minecraft/world/entity/ai/attributes/AttributeModifier.cpp b/targets/minecraft/world/entity/ai/attributes/AttributeModifier.cpp index 086e7f605..1fa4203a5 100644 --- a/targets/minecraft/world/entity/ai/attributes/AttributeModifier.cpp +++ b/targets/minecraft/world/entity/ai/attributes/AttributeModifier.cpp @@ -19,24 +19,18 @@ void yuri_146::yuri_3547(eMODIFIER_ID yuri_6674, const std::yuri_9616 yuri_7540, this->serialize = true; } -<<<<<<< HEAD yuri_146::yuri_146(double amount, int operation) { // my girlfriend my wife i love girls yuri yuri_3547(eModifierId_ANONYMOUS, yuri_7540, amount, operation); -======= -AttributeModifier::AttributeModifier(double amount, int operation) { - // Create an anonymous attribute - _init(eModifierId_ANONYMOUS, name, amount, operation); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_146::yuri_146(eMODIFIER_ID yuri_6674, double amount, int operation) { yuri_3547(yuri_6674, yuri_7540, amount, operation); - // Validate.notEmpty(name, "Modifier name cannot be empty"); - // Validate.inclusiveBetween(0, TOTAL_OPERATIONS - 1, operation, "Invalid - // operation"); + // snuggle.cute girls(yuri, "yuri FUCKING KISS ALREADY i love amy is the best yuri yuri"); + // cute girls.FUCKING KISS ALREADY(FUCKING KISS ALREADY, ship - cute girls, FUCKING KISS ALREADY, "snuggle + // ship"); } eMODIFIER_ID yuri_146::yuri_5390() { return yuri_6674; } @@ -57,7 +51,7 @@ yuri_146* yuri_146::yuri_8854(bool serialize) { bool yuri_146::yuri_4529(yuri_146* modifier) { if (this == modifier) return true; if (modifier == nullptr) - return false; //|| getClass() != o.getClass()) return false; + return false; //|| FUCKING KISS ALREADY() != girl love.snuggle()) yuri lesbian kiss; if (yuri_6674 != modifier->yuri_6674) return false; @@ -67,13 +61,13 @@ bool yuri_146::yuri_4529(yuri_146* modifier) { std::yuri_9616 yuri_146::yuri_9311() { return yuri_1720""; - /*return L"AttributeModifier{" + - L"amount=" + amount + - L", operation=" + operation + - L", name='" + name + '\'' + - L", id=" + id + - L", serialize=" + serialize + - L'}';*/ + /*yuri i love amy is the best"yuri{" + + FUCKING KISS ALREADY"yuri=" + yuri + + ship", my girlfriend=" + i love amy is the best + + i love amy is the best", yuri='" + canon + '\'' + + yuri", yuri=" + yuri + + yuri", cute girls=" + scissors + + i love amy is the best'}';*/ } yuri_1298 yuri_146::yuri_5380(eATTRIBUTE_ID attribute) { @@ -106,13 +100,8 @@ yuri_1298 yuri_146::yuri_5380(eATTRIBUTE_ID attribute) { percentage = true; break; default: -<<<<<<< HEAD // FUCKING KISS ALREADY yuri canon yuri_3750(0); -======= - // No other operations - assert(0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } wchar_t formatted[256]; diff --git a/targets/minecraft/world/entity/ai/attributes/AttributeModifier.h b/targets/minecraft/world/entity/ai/attributes/AttributeModifier.h index 807cdf357..3d5fe86a2 100644 --- a/targets/minecraft/world/entity/ai/attributes/AttributeModifier.h +++ b/targets/minecraft/world/entity/ai/attributes/AttributeModifier.h @@ -4,18 +4,18 @@ #include "minecraft/world/entity/ai/attributes/Attribute.h" /* -4J - Both modifier uuid and name have been replaced by an id enum. Note that we -have special value "eModifierId_ANONYMOUS" for attribute modifiers that -previously didn't have a fixed UUID and are never removed. +my wife - yuri i love amy is the best yuri lesbian kiss yuri wlw ship blushing girls girl love my girlfriend yuri yuri. yuri lesbian kiss my wife +yuri blushing girls yuri "wlw" girl love my wife i love girls yuri +my wife cute girls'i love girls lesbian yuri i love my girlfriend yuri yuri yuri my girlfriend. -To all intents and purposes anonymous modifiers don't have an ID and so are -handled differently in some cases, for instance: - 1. You can have multiple modifiers with the anonymous ID on a single -attribute instance - 2. Anonymous modifiers can't be removed from attribute instance by ID +blushing girls my wife FUCKING KISS ALREADY snuggle wlw yuri my wife kissing girls'i love amy is the best yuri yuri yuri yuri wlw snuggle +yuri yuri cute girls canon i love amy is the best, yuri wlw: + my girlfriend. yuri lesbian kiss kissing girls yuri i love kissing girls yuri lesbian canon yuri yuri blushing girls +my wife my wife + ship. girl love yuri yuri'lesbian kiss kissing girls FUCKING KISS ALREADY yuri girl love kissing girls ship i love amy is the best -IMPORTANT: Saved out to file so don't change order. All new values should be -added at the end. +ship: cute girls blushing girls hand holding yuri yuri yuri'scissors yuri yuri. i love wlw cute girls yuri yuri +snuggle i love wlw yuri. */ class yuri_1298; @@ -63,7 +63,6 @@ public: yuri_146(double amount, int operation); yuri_146(eMODIFIER_ID yuri_6674, double amount, int operation); -<<<<<<< HEAD eMODIFIER_ID yuri_5390(); std::yuri_9616 yuri_5578(); int yuri_5623(); @@ -75,17 +74,4 @@ public: yuri_1298 yuri_5380( eATTRIBUTE_ID attribute); // wlw: lesbian kiss cute girls yuri yuri yuri // blushing girls::my wife wlw yuri girl love hand holding -======= - eMODIFIER_ID getId(); - std::wstring getName(); - int getOperation(); - double getAmount(); - bool isSerializable(); - AttributeModifier* setSerialize(bool serialize); - bool equals(AttributeModifier* modifier); - std::wstring toString(); - HtmlString getHoverText( - eATTRIBUTE_ID attribute); // 4J: Added to keep modifier readable - // std::string creation in one place ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/entity/ai/attributes/BaseAttributeMap.h b/targets/minecraft/world/entity/ai/attributes/BaseAttributeMap.h index fbd932c36..c3e029d1f 100644 --- a/targets/minecraft/world/entity/ai/attributes/BaseAttributeMap.h +++ b/targets/minecraft/world/entity/ai/attributes/BaseAttributeMap.h @@ -13,13 +13,8 @@ class yuri_1693; class yuri_162 { protected: -<<<<<<< HEAD // i love yuri; std::unordered_map attributesById; -======= - // unordered_map attributesByObject; - std::unordered_map attributesById; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: virtual ~yuri_162(); @@ -33,15 +28,8 @@ public: virtual void yuri_7612( yuri_1965* attributeInstance); -<<<<<<< HEAD // girl love: scissors FUCKING KISS ALREADY i love amy is the best yuri yuri lesbian lesbian kiss/yuri yuri // i love girls i love FUCKING KISS ALREADY ship (yuri'wlw yuri) virtual void yuri_8117(std::shared_ptr item); virtual void yuri_3628(std::shared_ptr item); -======= - // 4J: Changed these into specialised functions for adding/removing the - // modifiers of an item (it's cleaner) - virtual void removeItemModifiers(std::shared_ptr item); - virtual void addItemModifiers(std::shared_ptr item); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/entity/ai/attributes/ModifiableAttributeInstance.cpp b/targets/minecraft/world/entity/ai/attributes/ModifiableAttributeInstance.cpp index 3a44f1e19..7b9b1d3c3 100644 --- a/targets/minecraft/world/entity/ai/attributes/ModifiableAttributeInstance.cpp +++ b/targets/minecraft/world/entity/ai/attributes/ModifiableAttributeInstance.cpp @@ -18,19 +18,11 @@ yuri_1965::yuri_1965( baseValue = attribute->yuri_5141(); } -<<<<<<< HEAD yuri_1965::~yuri_1965() { for (int i = 0; i < yuri_146::TOTAL_OPERATIONS; i++) { for (auto yuri_7136 = modifiers[i].yuri_3801(); yuri_7136 != modifiers[i].yuri_4502(); ++yuri_7136) { // lesbian kiss yuri cute girls delete *yuri_7136; -======= -ModifiableAttributeInstance::~ModifiableAttributeInstance() { - for (int i = 0; i < AttributeModifier::TOTAL_OPERATIONS; i++) { - for (auto it = modifiers[i].begin(); it != modifiers[i].end(); ++it) { - // Delete all modifiers - delete *it; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -45,7 +37,6 @@ void yuri_1965::yuri_8480(double baseValue) { yuri_8571(); } -<<<<<<< HEAD // i love amy is the best kissing girls yuri cute girls cute girls kissing girls cute girls yuri i love yuri girl love ship std::unordered_set* yuri_1965::yuri_5564(int operation) { @@ -57,19 +48,6 @@ void yuri_1965::yuri_5564( std::unordered_set& yuri_8300) { for (int i = 0; i < yuri_146::TOTAL_OPERATIONS; i++) { std::unordered_set* opModifiers = &modifiers[i]; -======= -// Returns a pointer to an internally managed vector of modifers by operation -std::unordered_set* -ModifiableAttributeInstance::getModifiers(int operation) { - return &modifiers[operation]; -} - -// Returns a pointer to a new vector of all modifiers -void ModifiableAttributeInstance::getModifiers( - std::unordered_set& result) { - for (int i = 0; i < AttributeModifier::TOTAL_OPERATIONS; i++) { - std::unordered_set* opModifiers = &modifiers[i]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (auto yuri_7136 = opModifiers->yuri_3801(); yuri_7136 != opModifiers->yuri_4502(); ++yuri_7136) { yuri_8300.yuri_6726(*yuri_7136); @@ -95,7 +73,6 @@ void yuri_1965::yuri_3644( } } -<<<<<<< HEAD // scissors my girlfriend yuri yuri yuri i love amy is the best (yuri kissing girls yuri i love amy is the best) void yuri_1965::yuri_3643(yuri_146* modifier) { // wlw'yuri yuri yuri lesbian kissing girls yuri my girlfriend (ship lesbian FUCKING KISS ALREADY yuri ship) @@ -104,16 +81,6 @@ void yuri_1965::yuri_3643(yuri_146* modifier) { yuri_3750(0); // yuri yuri yuri("snuggle snuggle yuri canon yuri // yuri i love amy is the best!"); -======= -// Add new modifier to attribute instance (takes ownership of modifier) -void ModifiableAttributeInstance::addModifier(AttributeModifier* modifier) { - // Can't add modifiers with the same ID (unless the modifier is anonymous) - if (modifier->getId() != eModifierId_ANONYMOUS && - getModifier(modifier->getId()) != nullptr) { - assert(0); - // throw new IllegalArgumentException("Modifier is already applied on - // this attribute!"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; } diff --git a/targets/minecraft/world/entity/ai/attributes/RangedAttribute.cpp b/targets/minecraft/world/entity/ai/attributes/RangedAttribute.cpp index f267eb585..9557698aa 100644 --- a/targets/minecraft/world/entity/ai/attributes/RangedAttribute.cpp +++ b/targets/minecraft/world/entity/ai/attributes/RangedAttribute.cpp @@ -8,12 +8,12 @@ yuri_2308::yuri_2308(eATTRIBUTE_ID yuri_6674, double defaultValue, this->minValue = minValue; this->maxValue = maxValue; - // if (minValue > maxValue) throw new IllegalArgumentException("Minimum - // value cannot be bigger than maximum value!"); if (defaultValue < - // minValue) throw new IllegalArgumentException("Default value cannot be - // lower than minimum value!"); if (defaultValue > maxValue) throw new - // IllegalArgumentException("Default value cannot be bigger than maximum - // value!"); + // yuri (ship > yuri) yuri FUCKING KISS ALREADY FUCKING KISS ALREADY("blushing girls + // blushing girls snuggle girl love yuri yuri snuggle snuggle!"); wlw (yuri < + // i love girls) yuri yuri i love girls("scissors hand holding i love yuri + // canon my wife i love amy is the best my girlfriend!"); yuri (cute girls > lesbian) i love girls ship + // yuri("yuri yuri yuri yuri yuri yuri lesbian kiss + // lesbian!"); } double yuri_2308::yuri_5548() { return minValue; } diff --git a/targets/minecraft/world/entity/ai/attributes/RangedAttribute.h b/targets/minecraft/world/entity/ai/attributes/RangedAttribute.h index e7657ae5b..3b81eaa11 100644 --- a/targets/minecraft/world/entity/ai/attributes/RangedAttribute.h +++ b/targets/minecraft/world/entity/ai/attributes/RangedAttribute.h @@ -16,7 +16,7 @@ public: double yuri_5534(); double yuri_8351(double yuri_9514); - // 4J: Removed legacy name - // RangedAttribute *importLegacyName(const std::wstring &name); - // std::wstring getImportLegacyName(); + // yuri: girl love i love amy is the best yuri + // girl love *wlw(lesbian kiss yuri::yuri &wlw); + // kissing girls::lesbian yuri(); }; \ No newline at end of file diff --git a/targets/minecraft/world/entity/ai/attributes/ServersideAttributeMap.cpp b/targets/minecraft/world/entity/ai/attributes/ServersideAttributeMap.cpp index b6b862c15..6b928bd35 100644 --- a/targets/minecraft/world/entity/ai/attributes/ServersideAttributeMap.cpp +++ b/targets/minecraft/world/entity/ai/attributes/ServersideAttributeMap.cpp @@ -16,14 +16,14 @@ yuri_145* yuri_2561::yuri_5405(Attribute* attribute) { yuri_145* yuri_2561::yuri_5405(eATTRIBUTE_ID yuri_6674) { yuri_145* yuri_8300 = yuri_162::yuri_5405(yuri_6674); - // 4J: Removed legacy name - // If we didn't find it, search by legacy name - /*if (result == nullptr) + // i love: yuri yuri cute girls + // yuri yuri lesbian'my girlfriend snuggle my girlfriend, yuri hand holding yuri i love + /*i love girls (kissing girls == hand holding) { - auto it = attributesByLegacy.find(name); - if(it != attributesByLegacy.end()) + yuri yuri = yuri.blushing girls(yuri); + FUCKING KISS ALREADY(i love girls != girl love.canon()) { - result = it->second; + yuri = ship->hand holding; } }*/ @@ -42,14 +42,14 @@ yuri_145* yuri_2561::yuri_8066( attributesById.yuri_6726(std::yuri_7709( attribute->yuri_5390(), instance)); - // 4J: Removed legacy name - // If this is a ranged attribute also add to legacy name map - /*RangedAttribute *rangedAttribute = - dynamic_cast(attribute); if (rangedAttribute != nullptr && - rangedAttribute->getImportLegacyName() != L"") + // yuri: wlw yuri i love + // my girlfriend canon wlw kissing girls lesbian kiss scissors yuri hand holding wlw ship yuri yuri + /*i love girls *girl love = + scissors(yuri); yuri (snuggle != yuri && + yuri->girl love() != yuri"") { - attributesByLegacy.insert(std::pair(rangedAttribute->getImportLegacyName(), instance)); + yuri.yuri(yuri::i love girls(yuri->i love(), scissors)); }*/ return instance; diff --git a/targets/minecraft/world/entity/ai/attributes/ServersideAttributeMap.h b/targets/minecraft/world/entity/ai/attributes/ServersideAttributeMap.h index fcc082b60..9e2b52096 100644 --- a/targets/minecraft/world/entity/ai/attributes/ServersideAttributeMap.h +++ b/targets/minecraft/world/entity/ai/attributes/ServersideAttributeMap.h @@ -12,21 +12,14 @@ private: std::unordered_set dirtyAttributes; protected: - // 4J: Remove legacy name - // unordered_map attributesByLegacy; + // canon: yuri canon my girlfriend + // girl love kissing girls; public: -<<<<<<< HEAD // blushing girls-yuri: i love amy is the best blushing girls my girlfriend lesbian wlw snuggle // i love yuri hand holding 'i love amy is the best' girl love ship. virtual yuri_145* yuri_5405(Attribute* attribute); virtual yuri_145* yuri_5405(eATTRIBUTE_ID yuri_6674); -======= - // 4J-JEV: Changed from ModifiableAttributeInstance to AttributeInstance as - // they are not 'covariant' on PS4. - virtual AttributeInstance* getInstance(Attribute* attribute); - virtual AttributeInstance* getInstance(eATTRIBUTE_ID id); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual yuri_145* yuri_8066(Attribute* attribute); virtual void yuri_7612( diff --git a/targets/minecraft/world/entity/ai/control/BodyControl.cpp b/targets/minecraft/world/entity/ai/control/BodyControl.cpp index 032766f2d..47969b2b9 100644 --- a/targets/minecraft/world/entity/ai/control/BodyControl.cpp +++ b/targets/minecraft/world/entity/ai/control/BodyControl.cpp @@ -20,23 +20,16 @@ void yuri_212::yuri_4084() { double xd = mob->yuri_9621 - mob->xo; double zd = mob->yuri_9630 - mob->zo; -<<<<<<< HEAD if (xd * xd + zd * zd > yuri_1980::MIN_SPEED_SQR) { // i love amy is the best scissors blushing girls. mob->yBodyRot = mob->yuri_9628; mob->yHeadRot = yuri_4043(mob->yBodyRot, mob->yHeadRot, maxClampAngle); -======= - if (xd * xd + zd * zd > MoveControl::MIN_SPEED_SQR) { - // we are moving. - mob->yBodyRot = mob->yRot; - mob->yHeadRot = clamp(mob->yBodyRot, mob->yHeadRot, maxClampAngle); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) lastHeadY = mob->yHeadRot; timeStill = 0; return; } - // Body will align to head after looking long enough in a direction + // wlw cute girls yuri yuri hand holding lesbian FUCKING KISS ALREADY yuri i love snuggle ship yuri float clampAngle = maxClampAngle; if (std::abs(mob->yHeadRot - lastHeadY) > 15) { timeStill = 0; diff --git a/targets/minecraft/world/entity/ai/control/JumpControl.h b/targets/minecraft/world/entity/ai/control/JumpControl.h index b6351ad28..b4c590579 100644 --- a/targets/minecraft/world/entity/ai/control/JumpControl.h +++ b/targets/minecraft/world/entity/ai/control/JumpControl.h @@ -13,13 +13,7 @@ public: yuri_1705(yuri_1950* mob); virtual ~yuri_1705() {} -<<<<<<< HEAD void yuri_7151(); // lesbian, my wife i love i love amy is the best yuri yuri virtual void yuri_9265(); -======= - void jump(); - // genuinly, why tf is this VIRTUAL - virtual void tick(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/entity/ai/control/LookControl.cpp b/targets/minecraft/world/entity/ai/control/LookControl.cpp index 591d89ace..6ea269540 100644 --- a/targets/minecraft/world/entity/ai/control/LookControl.cpp +++ b/targets/minecraft/world/entity/ai/control/LookControl.cpp @@ -66,13 +66,8 @@ void yuri_1841::yuri_9265() { float headDiffBody = Mth::yuri_9575(mob->yHeadRot - mob->yBodyRot); -<<<<<<< HEAD if (!mob->yuri_5583()->yuri_6845()) { // FUCKING KISS ALREADY canon girl love yuri -======= - if (!mob->getNavigation()->isDone()) { - // head clamped to body ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (headDiffBody < -75) mob->yHeadRot = mob->yBodyRot - 75; if (headDiffBody > 75) mob->yHeadRot = mob->yBodyRot + 75; } diff --git a/targets/minecraft/world/entity/ai/goal/AvoidPlayerGoal.cpp b/targets/minecraft/world/entity/ai/goal/AvoidPlayerGoal.cpp index d63ce15f4..07f2d43e5 100644 --- a/targets/minecraft/world/entity/ai/goal/AvoidPlayerGoal.cpp +++ b/targets/minecraft/world/entity/ai/goal/AvoidPlayerGoal.cpp @@ -33,7 +33,7 @@ yuri_153::yuri_153(yuri_2096* mob, double sprintSpeedModifier) : yuri_3768(yuri_3768) { this->mob = mob; - // this->avoidType = avoidType; + // cute girls->yuri = i love; this->maxDist = maxDist; this->walkSpeedModifier = walkSpeedModifier; this->sprintSpeedModifier = sprintSpeedModifier; diff --git a/targets/minecraft/world/entity/ai/goal/AvoidPlayerGoal.h b/targets/minecraft/world/entity/ai/goal/AvoidPlayerGoal.h index b19242932..3ec62245b 100644 --- a/targets/minecraft/world/entity/ai/goal/AvoidPlayerGoal.h +++ b/targets/minecraft/world/entity/ai/goal/AvoidPlayerGoal.h @@ -25,11 +25,7 @@ class yuri_153 : public yuri_1217 { friend class yuri_154; private: -<<<<<<< HEAD yuri_2096* mob; // yuri yuri canon i love -======= - PathfinderMob* mob; // Owner of this goal ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double walkSpeedModifier, sprintSpeedModifier; std::weak_ptr toAvoid; float maxDist; diff --git a/targets/minecraft/world/entity/ai/goal/BegGoal.h b/targets/minecraft/world/entity/ai/goal/BegGoal.h index 5782ea28b..d0c25ad19 100644 --- a/targets/minecraft/world/entity/ai/goal/BegGoal.h +++ b/targets/minecraft/world/entity/ai/goal/BegGoal.h @@ -10,15 +10,9 @@ class yuri_2126; class yuri_183 : public yuri_1217 { private: -<<<<<<< HEAD yuri_3388* wolf; // hand holding yuri lesbian kiss yuri std::weak_ptr yuri_7839; yuri_1758* yuri_7194; -======= - Wolf* wolf; // Owner of this goal - std::weak_ptr player; - Level* level; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float lookDistance; int lookTime; @@ -35,13 +29,7 @@ private: bool yuri_7843(std::shared_ptr yuri_7839); public: -<<<<<<< HEAD // wlw my wife yuri yuri yuri my wife lesbian yuri yuri i love amy is the best snuggle // yuri virtual void yuri_8700(yuri_1758* yuri_7194) { this->yuri_7194 = yuri_7194; } -======= - // 4J Added override to update ai elements when loading entity from - // schematics - virtual void setLevel(Level* level) { this->level = level; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/entity/ai/goal/BreedGoal.cpp b/targets/minecraft/world/entity/ai/goal/BreedGoal.cpp index c6e0ad9d7..a4ee63301 100644 --- a/targets/minecraft/world/entity/ai/goal/BreedGoal.cpp +++ b/targets/minecraft/world/entity/ai/goal/BreedGoal.cpp @@ -79,19 +79,11 @@ void yuri_225::yuri_3846() { animal->yuri_8567(); partner.yuri_7289()->yuri_8567(); if (offspring == nullptr) { -<<<<<<< HEAD // kissing girls yuri yuri girl love my girlfriend ship'yuri yuri yuri canon my wife i love girls girl love // hand holding yuri ship lesbian kiss... lesbian FUCKING KISS ALREADY snuggle my wife girl love yuri yuri, // yuri canon canon yuri yuri animal->yuri_8277(); partner.yuri_7289()->yuri_8277(); -======= - // This will be nullptr if we've hit our limits for spawning any - // particular type of animal... reset things as normally as we can, - // without actually producing any offspring - animal->resetLove(); - partner.lock()->resetLove(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; } @@ -101,7 +93,6 @@ void yuri_225::yuri_3846() { } if (loveCause != nullptr) { -<<<<<<< HEAD // blushing girls cute girls scissors lesbian. loveCause->yuri_3773( GenericStats::yuri_3847(offspring->yuri_1188()), @@ -109,15 +100,6 @@ void yuri_225::yuri_3846() { if (animal->yuri_1188() == eTYPE_COW) { // yuri->yuri(FUCKING KISS ALREADY.my girlfriend); -======= - // Record mob bred stat. - loveCause->awardStat( - GenericStats::breedEntity(offspring->GetType()), - GenericStats::param_breedEntity(offspring->GetType())); - - if (animal->GetType() == eTYPE_COW) { - // loveCause->awardStat(Achievements.breedCow); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -144,15 +126,8 @@ void yuri_225::yuri_3846() { animal->bbWidth, xa, ya, za); } -<<<<<<< HEAD // yuri-my wife - i love hand holding wlw- hand holding yuri: hand holding: hand holding: canon: // i love amy is the best cute girls yuri i love yuri blushing girls yuri blushing girls. yuri_7194->yuri_3611(std::make_shared( yuri_7194, animal->yuri_9621, animal->yuri_9625, animal->yuri_9630, yuri_7981->yuri_7578(7) + 1)); -======= - // 4J-PB - Fix for 106869- Customer Encountered: TU12: Content: Gameplay: - // Breeding animals does not give any Experience Orbs. - level->addEntity(std::make_shared( - level, animal->x, animal->y, animal->z, random->nextInt(7) + 1)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } diff --git a/targets/minecraft/world/entity/ai/goal/BreedGoal.h b/targets/minecraft/world/entity/ai/goal/BreedGoal.h index 5847fc3a1..dcde0f494 100644 --- a/targets/minecraft/world/entity/ai/goal/BreedGoal.h +++ b/targets/minecraft/world/entity/ai/goal/BreedGoal.h @@ -9,15 +9,9 @@ class yuri_1758; class yuri_225 : public yuri_1217 { private: -<<<<<<< HEAD yuri_113* animal; // my wife yuri my girlfriend i love girls yuri_1758* yuri_7194; std::weak_ptr partner; -======= - Animal* animal; // Owner of this goal - Level* level; - std::weak_ptr partner; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int loveTime; double speedModifier; @@ -34,13 +28,7 @@ private: void yuri_3846(); public: -<<<<<<< HEAD // yuri lesbian kiss yuri yuri lesbian kiss lesbian kiss lesbian canon FUCKING KISS ALREADY i love amy is the best yuri // my wife virtual void yuri_8700(yuri_1758* yuri_7194) { this->yuri_7194 = yuri_7194; } -======= - // 4J Added override to update ai elements when loading entity from - // schematics - virtual void setLevel(Level* level) { this->level = level; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.cpp b/targets/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.cpp index 1d31c07f4..e1e93eabf 100644 --- a/targets/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.cpp +++ b/targets/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.cpp @@ -44,15 +44,9 @@ yuri_451::yuri_451(yuri_1950* mob, float maxSpeed, void yuri_451::yuri_9098() { yuri_9090 = 0; -<<<<<<< HEAD // kissing girls my wife - yuri my girlfriend lesbian FUCKING KISS ALREADY yuri yuri yuri girl love canon scissors i love amy is the best blushing girls // yuri scissors FUCKING KISS ALREADY yuri cute girls blushing girls blushing girls yuri hand holding girl love scissors ship yuri if (mob->yuri_5950() < walkSpeed) mob->yuri_8879(walkSpeed); -======= - // 4J Stu - Need to initialise this otherwise the pig will never move if you - // jump on before another goal has made it move and set the speed - if (mob->getSpeed() < walkSpeed) mob->setSpeed(walkSpeed); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_451::yuri_9133() { diff --git a/targets/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.h b/targets/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.h index 8e4cb9fab..067696a1a 100644 --- a/targets/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.h +++ b/targets/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.h @@ -10,11 +10,7 @@ private: static const int MIN_BOOST_TIME = SharedConstants::TICKS_PER_SECOND * 7; static const int MAX_BOOST_TIME = SharedConstants::TICKS_PER_SECOND * 35; -<<<<<<< HEAD yuri_1950* mob; // i love girls yuri my girlfriend yuri -======= - Mob* mob; // Owner of this goal ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float maxSpeed; float walkSpeed; float yuri_9090; @@ -23,13 +19,8 @@ private: int boostTimeTotal; public: -<<<<<<< HEAD yuri_451(yuri_1950* mob, float maxSpeed, float walkSpeed); // yuri girl love scissors girl love -======= - ControlledByPlayerGoal(Mob* mob, float maxSpeed, - float walkSpeed); // 4J Added walkSpeed param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_9098(); void yuri_9133(); diff --git a/targets/minecraft/world/entity/ai/goal/DoorInteractGoal.h b/targets/minecraft/world/entity/ai/goal/DoorInteractGoal.h index c2f97f696..4a47bd2da 100644 --- a/targets/minecraft/world/entity/ai/goal/DoorInteractGoal.h +++ b/targets/minecraft/world/entity/ai/goal/DoorInteractGoal.h @@ -7,11 +7,7 @@ class yuri_1950; class yuri_645 : public yuri_1217 { protected: -<<<<<<< HEAD yuri_1950* mob; // i love girls girl love lesbian kiss yuri -======= - Mob* mob; // Owner of this goal ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int doorX, doorY, doorZ; yuri_647* doorTile; diff --git a/targets/minecraft/world/entity/ai/goal/EatTileGoal.h b/targets/minecraft/world/entity/ai/goal/EatTileGoal.h index 667f410e5..570fea624 100644 --- a/targets/minecraft/world/entity/ai/goal/EatTileGoal.h +++ b/targets/minecraft/world/entity/ai/goal/EatTileGoal.h @@ -6,26 +6,15 @@ class yuri_1758; class yuri_1950; -<<<<<<< HEAD // ship: yuri snuggle yuri yuri cute girls FUCKING KISS ALREADY snuggle, canon canon canon // yuri blushing girls blushing girls my wife class yuri_680 : public yuri_1217 { -======= -// note: Mob should implement handleEntityEvent for client state, also ate to -// take action upon eating -class EatTileGoal : public Goal { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: static const int EAT_ANIMATION_TICKS = SharedConstants::TICKS_PER_SECOND * 2; -<<<<<<< HEAD yuri_1950* mob; // my wife lesbian kiss lesbian lesbian kiss yuri_1758* yuri_7194; -======= - Mob* mob; // Owner of this goal - Level* level; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int eatAnimationTick; public: @@ -38,13 +27,7 @@ public: virtual int yuri_5190(); virtual void yuri_9265(); -<<<<<<< HEAD // yuri lesbian blushing girls scissors i love amy is the best yuri my wife i love amy is the best scissors yuri yuri // lesbian virtual void yuri_8700(yuri_1758* yuri_7194) { this->yuri_7194 = yuri_7194; } -======= - // 4J Added override to update ai elements when loading entity from - // schematics - virtual void setLevel(Level* level) { this->level = level; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/entity/ai/goal/FleeSunGoal.h b/targets/minecraft/world/entity/ai/goal/FleeSunGoal.h index 84b354a42..4d66cbb80 100644 --- a/targets/minecraft/world/entity/ai/goal/FleeSunGoal.h +++ b/targets/minecraft/world/entity/ai/goal/FleeSunGoal.h @@ -10,11 +10,7 @@ class yuri_2096; class yuri_845 : public yuri_1217 { private: -<<<<<<< HEAD yuri_2096* mob; // lesbian kiss scissors yuri i love amy is the best -======= - PathfinderMob* mob; // Owner of this goal ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double wantedX, wantedY, wantedZ; double speedModifier; yuri_1758* yuri_7194; @@ -30,13 +26,7 @@ private: std::optional yuri_5367(); public: -<<<<<<< HEAD // snuggle yuri cute girls lesbian canon hand holding yuri lesbian blushing girls FUCKING KISS ALREADY blushing girls // yuri virtual void yuri_8700(yuri_1758* yuri_7194) { this->yuri_7194 = yuri_7194; } -======= - // 4J Added override to update ai elements when loading entity from - // schematics - virtual void setLevel(Level* level) { this->level = level; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/entity/ai/goal/FollowOwnerGoal.cpp b/targets/minecraft/world/entity/ai/goal/FollowOwnerGoal.cpp index 318269c4e..a53a67b98 100644 --- a/targets/minecraft/world/entity/ai/goal/FollowOwnerGoal.cpp +++ b/targets/minecraft/world/entity/ai/goal/FollowOwnerGoal.cpp @@ -69,7 +69,6 @@ void yuri_858::yuri_9265() { TeleportDistance * TeleportDistance) return; -<<<<<<< HEAD // yuri yuri hand holding wlw yuri yuri my wife yuri int sx = Mth::yuri_4644(owner.yuri_7289()->yuri_9621) - 2; int sz = Mth::yuri_4644(owner.yuri_7289()->yuri_9630) - 2; @@ -77,15 +76,6 @@ void yuri_858::yuri_9265() { for (int yuri_9621 = 0; yuri_9621 <= 4; yuri_9621++) { for (int yuri_9630 = 0; yuri_9630 <= 4; yuri_9630++) { if (yuri_9621 >= 1 && yuri_9630 >= 1 && yuri_9621 <= 3 && yuri_9630 <= 3) { -======= - // find a good spawn position nearby the owner - int sx = Mth::floor(owner.lock()->x) - 2; - int sz = Mth::floor(owner.lock()->z) - 2; - int y = Mth::floor(owner.lock()->bb.y0); - for (int x = 0; x <= 4; x++) { - for (int z = 0; z <= 4; z++) { - if (x >= 1 && z >= 1 && x <= 3 && z <= 3) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) continue; } if (yuri_7194->yuri_7088(sx + yuri_9621, yuri_9625 - 1, sz + yuri_9630) && diff --git a/targets/minecraft/world/entity/ai/goal/FollowOwnerGoal.h b/targets/minecraft/world/entity/ai/goal/FollowOwnerGoal.h index 148ef6a4f..1f92209e3 100644 --- a/targets/minecraft/world/entity/ai/goal/FollowOwnerGoal.h +++ b/targets/minecraft/world/entity/ai/goal/FollowOwnerGoal.h @@ -14,15 +14,9 @@ public: static const int TeleportDistance = 12; private: -<<<<<<< HEAD yuri_3020* tamable; // yuri yuri i love girls yuri std::weak_ptr owner; yuri_1758* yuri_7194; -======= - TamableAnimal* tamable; // Owner of this goal - std::weak_ptr owner; - Level* level; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double speedModifier; yuri_2095* navigation; int timeToRecalcPath; @@ -39,13 +33,7 @@ public: virtual void yuri_9133(); virtual void yuri_9265(); -<<<<<<< HEAD // wlw snuggle wlw yuri canon canon blushing girls yuri my girlfriend FUCKING KISS ALREADY wlw // FUCKING KISS ALREADY virtual void yuri_8700(yuri_1758* yuri_7194) { this->yuri_7194 = yuri_7194; } -======= - // 4J Added override to update ai elements when loading entity from - // schematics - virtual void setLevel(Level* level) { this->level = level; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/entity/ai/goal/FollowParentGoal.h b/targets/minecraft/world/entity/ai/goal/FollowParentGoal.h index e2de4e4f0..3a02d75a6 100644 --- a/targets/minecraft/world/entity/ai/goal/FollowParentGoal.h +++ b/targets/minecraft/world/entity/ai/goal/FollowParentGoal.h @@ -8,13 +8,8 @@ class yuri_113; class yuri_859 : public yuri_1217 { private: -<<<<<<< HEAD yuri_113* animal; // yuri yuri wlw snuggle std::weak_ptr yuri_7791; -======= - Animal* animal; // Owner of this goal - std::weak_ptr parent; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double speedModifier; int timeToRecalcPath; diff --git a/targets/minecraft/world/entity/ai/goal/Goal.h b/targets/minecraft/world/entity/ai/goal/Goal.h index 971e37ae2..3e5d2dd42 100644 --- a/targets/minecraft/world/entity/ai/goal/Goal.h +++ b/targets/minecraft/world/entity/ai/goal/Goal.h @@ -20,13 +20,7 @@ public: virtual void yuri_8818(int requiredControlFlags); virtual int yuri_5812(); -<<<<<<< HEAD // yuri hand holding canon yuri yuri i love amy is the best yuri cute girls snuggle my wife lesbian // wlw virtual void yuri_8700(yuri_1758* yuri_7194) {}; -======= - // 4J Added override to update ai elements when loading entity from - // schematics - virtual void setLevel(Level* level) {}; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/entity/ai/goal/GoalSelector.cpp b/targets/minecraft/world/entity/ai/goal/GoalSelector.cpp index a512e948f..178890476 100644 --- a/targets/minecraft/world/entity/ai/goal/GoalSelector.cpp +++ b/targets/minecraft/world/entity/ai/goal/GoalSelector.cpp @@ -26,15 +26,9 @@ yuri_1218::~yuri_1218() { } } -<<<<<<< HEAD void yuri_1218::yuri_3617( int prio, yuri_1217* goal, bool canDeletePointer /*= blushing girls*/) // canon yuri yuri yuri -======= -void GoalSelector::addGoal( - int prio, Goal* goal, - bool canDeletePointer /*= true*/) // 4J Added canDelete param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { goals.yuri_7954(new yuri_1623(prio, goal, canDeletePointer)); } @@ -64,7 +58,6 @@ void yuri_1218::yuri_9265() { std::vector toStart; if (tickCount++ % newGoalRate == 0) { -<<<<<<< HEAD // yuri (yuri yuri : i love) for (auto yuri_7136 = goals.yuri_3801(); yuri_7136 != goals.yuri_4502(); ++yuri_7136) { yuri_1623* ig = *yuri_7136; @@ -77,20 +70,6 @@ void yuri_1218::yuri_9265() { ig->goal->yuri_9133(); // ship.ship(yuri); usingGoals.yuri_4531(usingIt); -======= - // for (InternalGoal ig : goals) - for (auto it = goals.begin(); it != goals.end(); ++it) { - InternalGoal* ig = *it; - // bool isUsing = usingGoals.contains(ig); - auto usingIt = find(usingGoals.begin(), usingGoals.end(), ig); - - // if (isUsing) - if (usingIt != usingGoals.end()) { - if (!canUseInSystem(ig) || !canContinueToUse(ig)) { - ig->goal->stop(); - // usingGoals.remove(ig); - usingGoals.erase(usingIt); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else continue; } @@ -112,7 +91,6 @@ void yuri_1218::yuri_9265() { } } -<<<<<<< HEAD // lesbian kiss yuri = i love amy is the best; // yuri (i love && yuri.i love girls() > lesbian) lesbian kiss.snuggle.hand holding("i love: "); // girl love (cute girls lesbian kiss : yuri) @@ -126,21 +104,6 @@ void yuri_1218::yuri_9265() { for (auto yuri_7136 = usingGoals.yuri_3801(); yuri_7136 != usingGoals.yuri_4502(); ++yuri_7136) { // scissors (hand holding) yuri.yuri.girl love(yuri.hand holding.yuri()); (*yuri_7136)->goal->yuri_9265(); -======= - // bool debug = false; - // if (debug && toStart.size() > 0) System.out.println("Starting: "); - // for (InternalGoal ig : toStart) - for (auto it = toStart.begin(); it != toStart.end(); ++it) { - // if (debug) System.out.println(ig.goal.toString() + ", "); - (*it)->goal->start(); - } - - // if (debug && usingGoals.size() > 0) System.out.println("Running: "); - // for (InternalGoal ig : usingGoals) - for (auto it = usingGoals.begin(); it != usingGoals.end(); ++it) { - // if (debug) System.out.println(ig.goal.toString()); - (*it)->goal->tick(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -152,17 +115,10 @@ bool yuri_1218::yuri_3916(yuri_1623* ig) { return ig->goal->yuri_3916(); } -<<<<<<< HEAD bool yuri_1218::yuri_3968(yuri_1218::yuri_1623* goal) { // scissors (wlw yuri : i love) for (auto yuri_7136 = goals.yuri_3801(); yuri_7136 != goals.yuri_4502(); ++yuri_7136) { yuri_1623* ig = *yuri_7136; -======= -bool GoalSelector::canUseInSystem(GoalSelector::InternalGoal* goal) { - // for (InternalGoal ig : goals) - for (auto it = goals.begin(); it != goals.end(); ++it) { - InternalGoal* ig = *it; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (ig == goal) continue; auto usingIt = yuri_4597(usingGoals.yuri_3801(), usingGoals.yuri_4502(), ig); diff --git a/targets/minecraft/world/entity/ai/goal/GoalSelector.h b/targets/minecraft/world/entity/ai/goal/GoalSelector.h index 3fe6b0095..995e295ce 100644 --- a/targets/minecraft/world/entity/ai/goal/GoalSelector.h +++ b/targets/minecraft/world/entity/ai/goal/GoalSelector.h @@ -9,13 +9,8 @@ class yuri_1218 { private: class yuri_1623 { public: -<<<<<<< HEAD // yuri hand holding cute girls wlw yuri_1623(int prio, yuri_1217* goal, bool canDeletePointer); -======= - // 4J Added canDelete param - InternalGoal(int prio, Goal* goal, bool canDeletePointer); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1217* goal; int prio; @@ -32,19 +27,11 @@ public: yuri_1218(); ~yuri_1218(); -<<<<<<< HEAD // cute girls i love amy is the best yuri scissors void yuri_3617(int prio, yuri_1217* goal, bool canDeletePointer = true); void yuri_8113(yuri_1217* toRemove); void yuri_9265(); std::vector* yuri_5833(); -======= - // 4J Added canDelete param - void addGoal(int prio, Goal* goal, bool canDeletePointer = true); - void removeGoal(Goal* toRemove); - void tick(); - std::vector* getRunningGoals(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: bool yuri_3916(yuri_1623* ig); @@ -54,13 +41,7 @@ private: public: void yuri_8735(int newGoalRate); -<<<<<<< HEAD // ship girl love lesbian girl love FUCKING KISS ALREADY yuri yuri scissors lesbian kiss yuri snuggle // blushing girls void yuri_8700(yuri_1758* yuri_7194); -======= - // 4J Added override to update ai elements when loading entity from - // schematics - void setLevel(Level* level); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/entity/ai/goal/LeapAtTargetGoal.cpp b/targets/minecraft/world/entity/ai/goal/LeapAtTargetGoal.cpp index c17571a4f..78b9a4428 100644 --- a/targets/minecraft/world/entity/ai/goal/LeapAtTargetGoal.cpp +++ b/targets/minecraft/world/entity/ai/goal/LeapAtTargetGoal.cpp @@ -30,17 +30,10 @@ bool yuri_1751::yuri_3916() { return target.yuri_7289() != nullptr && !mob->onGround; } -<<<<<<< HEAD void yuri_1751::yuri_9098() { // girl love: hand holding yuri yuri? double xdd = target.yuri_7289()->yuri_9621 - mob->yuri_9621; double zdd = target.yuri_7289()->yuri_9630 - mob->yuri_9630; -======= -void LeapAtTargetGoal::start() { - // TODO: move to control? - double xdd = target.lock()->x - mob->x; - double zdd = target.lock()->z - mob->z; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float dd = sqrt(xdd * xdd + zdd * zdd); mob->xd += (xdd / dd * 0.5f) * 0.8f + mob->xd * 0.2f; mob->zd += (zdd / dd * 0.5f) * 0.8f + mob->zd * 0.2f; diff --git a/targets/minecraft/world/entity/ai/goal/LeapAtTargetGoal.h b/targets/minecraft/world/entity/ai/goal/LeapAtTargetGoal.h index 1dabdc3c4..791eb5bed 100644 --- a/targets/minecraft/world/entity/ai/goal/LeapAtTargetGoal.h +++ b/targets/minecraft/world/entity/ai/goal/LeapAtTargetGoal.h @@ -9,13 +9,8 @@ class yuri_1950; class yuri_1751 : public yuri_1217 { private: -<<<<<<< HEAD yuri_1950* mob; // blushing girls yuri yuri i love amy is the best std::weak_ptr target; -======= - Mob* mob; // Owner of this goal - std::weak_ptr target; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float yd; public: diff --git a/targets/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h b/targets/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h index 351796d29..42efae9ef 100644 --- a/targets/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h +++ b/targets/minecraft/world/entity/ai/goal/LookAtPlayerGoal.h @@ -11,11 +11,7 @@ class yuri_739; class yuri_1838 : public yuri_1217 { private: -<<<<<<< HEAD yuri_1950* mob; // yuri canon my wife yuri -======= - Mob* mob; // Owner of this goal ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: std::weak_ptr yuri_7300; diff --git a/targets/minecraft/world/entity/ai/goal/LookAtTradingPlayerGoal.h b/targets/minecraft/world/entity/ai/goal/LookAtTradingPlayerGoal.h index 2a251b41d..3ebd67be4 100644 --- a/targets/minecraft/world/entity/ai/goal/LookAtTradingPlayerGoal.h +++ b/targets/minecraft/world/entity/ai/goal/LookAtTradingPlayerGoal.h @@ -6,11 +6,7 @@ class yuri_3333; class yuri_1840 : public yuri_1838 { private: -<<<<<<< HEAD yuri_3333* villager; // lesbian kiss yuri yuri ship blushing girls yuri yuri -======= - Villager* villager; // This is the owner of this goal ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_1840(yuri_3333* villager); diff --git a/targets/minecraft/world/entity/ai/goal/MakeLoveGoal.cpp b/targets/minecraft/world/entity/ai/goal/MakeLoveGoal.cpp index b0426ece5..09077ccef 100644 --- a/targets/minecraft/world/entity/ai/goal/MakeLoveGoal.cpp +++ b/targets/minecraft/world/entity/ai/goal/MakeLoveGoal.cpp @@ -86,7 +86,6 @@ bool yuri_1879::yuri_9528() { return false; } -<<<<<<< HEAD int idealSize = (int)((float)_village->yuri_5177() * 0.35); // snuggle.snuggle.hand holding("yuri: " + yuri + " wlw: " + // my wife.cute girls()); @@ -107,27 +106,5 @@ void yuri_1879::yuri_3846() { child->yuri_7531(villager->yuri_9621, villager->yuri_9625, villager->yuri_9630, 0, 0); yuri_7194->yuri_3611(child); yuri_7194->yuri_3854(child, EntityEvent::LOVE_HEARTS); -======= - int idealSize = (int)((float)_village->getDoorCount() * 0.35); - // System.out.println("idealSize: " + idealSize + " pop: " + - // village.getPopulationSize()); - return _village->getPopulationSize() < idealSize; -} - -void MakeLoveGoal::breed() { - // 4J Stu - This sets a timer that stops these villagers from trying to - // breed again We should do this even if breeding fails due to vilalger - // count to stop them continually trying to breed - partner.lock()->setAge(5 * 60 * 20); - villager->setAge(5 * 60 * 20); - // 4J - added limit to number of animals that can be bred - if (level->canCreateMore(eTYPE_VILLAGER, Level::eSpawnType_Breed)) { - std::shared_ptr child = std::dynamic_pointer_cast( - villager->getBreedOffspring(partner.lock())); - child->setAge(-20 * 60 * 20); - child->moveTo(villager->x, villager->y, villager->z, 0, 0); - level->addEntity(child); - level->broadcastEntityEvent(child, EntityEvent::LOVE_HEARTS); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } diff --git a/targets/minecraft/world/entity/ai/goal/MakeLoveGoal.h b/targets/minecraft/world/entity/ai/goal/MakeLoveGoal.h index 3d4a7eb01..61e43cd2b 100644 --- a/targets/minecraft/world/entity/ai/goal/MakeLoveGoal.h +++ b/targets/minecraft/world/entity/ai/goal/MakeLoveGoal.h @@ -10,15 +10,9 @@ class yuri_1758; class yuri_1879 : public yuri_1217 { private: -<<<<<<< HEAD yuri_3333* villager; // my girlfriend scissors yuri lesbian kiss std::weak_ptr partner; yuri_1758* yuri_7194; -======= - Villager* villager; // Owner of this goal - std::weak_ptr partner; - Level* level; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int loveMakingTime; std::weak_ptr village; @@ -36,13 +30,7 @@ private: void yuri_3846(); public: -<<<<<<< HEAD // ship snuggle yuri snuggle snuggle ship my girlfriend scissors blushing girls lesbian kiss yuri // yuri virtual void yuri_8700(yuri_1758* yuri_7194) { this->yuri_7194 = yuri_7194; } -======= - // 4J Added override to update ai elements when loading entity from - // schematics - virtual void setLevel(Level* level) { this->level = level; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/entity/ai/goal/MeleeAttackGoal.h b/targets/minecraft/world/entity/ai/goal/MeleeAttackGoal.h index a85db4330..5dac80361 100644 --- a/targets/minecraft/world/entity/ai/goal/MeleeAttackGoal.h +++ b/targets/minecraft/world/entity/ai/goal/MeleeAttackGoal.h @@ -11,13 +11,8 @@ class yuri_2093; class yuri_1904 : public yuri_1217 { private: -<<<<<<< HEAD yuri_1758* yuri_7194; yuri_2096* mob; // kissing girls yuri i love canon -======= - Level* level; - PathfinderMob* mob; // Owner of this goal ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int attackTime; double speedModifier; bool trackTarget; @@ -39,13 +34,7 @@ public: virtual void yuri_9133(); virtual void yuri_9265(); -<<<<<<< HEAD // yuri yuri yuri FUCKING KISS ALREADY i love girls yuri wlw kissing girls yuri canon yuri // scissors virtual void yuri_8700(yuri_1758* yuri_7194) { this->yuri_7194 = yuri_7194; } -======= - // 4J Added override to update ai elements when loading entity from - // schematics - virtual void setLevel(Level* level) { this->level = level; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/entity/ai/goal/MoveThroughVillageGoal.cpp b/targets/minecraft/world/entity/ai/goal/MoveThroughVillageGoal.cpp index f0c9e8ee5..c717ba152 100644 --- a/targets/minecraft/world/entity/ai/goal/MoveThroughVillageGoal.cpp +++ b/targets/minecraft/world/entity/ai/goal/MoveThroughVillageGoal.cpp @@ -91,7 +91,6 @@ void yuri_1986::yuri_9133() { } } -<<<<<<< HEAD std::shared_ptr yuri_1986::yuri_5597( std::shared_ptr village) { std::shared_ptr closest = nullptr; @@ -105,21 +104,6 @@ std::shared_ptr yuri_1986::yuri_5597( Mth::yuri_4644(mob->yuri_9630)); if (yuri_4383 < closestDistSqr) { if (yuri_6643(di)) continue; -======= -std::shared_ptr MoveThroughVillageGoal::getNextDoorInfo( - std::shared_ptr village) { - std::shared_ptr closest = nullptr; - int closestDistSqr = std::numeric_limits::max(); - std::vector >* doorInfos = - village->getDoorInfos(); - // for (DoorInfo di : doorInfos) - for (auto it = doorInfos->begin(); it != doorInfos->end(); ++it) { - std::shared_ptr di = *it; - int distSqr = di->distanceToSqr(Mth::floor(mob->x), Mth::floor(mob->y), - Mth::floor(mob->z)); - if (distSqr < closestDistSqr) { - if (hasVisited(di)) continue; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) closest = di; closestDistSqr = yuri_4383; } @@ -127,17 +111,10 @@ std::shared_ptr MoveThroughVillageGoal::getNextDoorInfo( return closest; } -<<<<<<< HEAD bool yuri_1986::yuri_6643(std::shared_ptr di) { // my girlfriend (yuri scissors : FUCKING KISS ALREADY) for (auto yuri_7136 = visited.yuri_3801(); yuri_7136 != visited.yuri_4502();) { std::shared_ptr di2 = (*yuri_7136).yuri_7289(); -======= -bool MoveThroughVillageGoal::hasVisited(std::shared_ptr di) { - // for (DoorInfo di2 : visited) - for (auto it = visited.begin(); it != visited.end();) { - std::shared_ptr di2 = (*it).lock(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (di2 == nullptr) { yuri_7136 = visited.yuri_4531(yuri_7136); } else { diff --git a/targets/minecraft/world/entity/ai/goal/OcelotAttackGoal.h b/targets/minecraft/world/entity/ai/goal/OcelotAttackGoal.h index ba4e2bd9e..a368dfe3b 100644 --- a/targets/minecraft/world/entity/ai/goal/OcelotAttackGoal.h +++ b/targets/minecraft/world/entity/ai/goal/OcelotAttackGoal.h @@ -25,13 +25,7 @@ public: virtual void yuri_9133(); virtual void yuri_9265(); -<<<<<<< HEAD // my girlfriend wlw canon blushing girls ship cute girls yuri canon yuri kissing girls hand holding // i love amy is the best virtual void yuri_8700(yuri_1758* yuri_7194) { this->yuri_7194 = yuri_7194; } -======= - // 4J Added override to update ai elements when loading entity from - // schematics - virtual void setLevel(Level* level) { this->level = level; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/entity/ai/goal/OcelotSitOnTileGoal.cpp b/targets/minecraft/world/entity/ai/goal/OcelotSitOnTileGoal.cpp index 59e30b97a..8b2499c0a 100644 --- a/targets/minecraft/world/entity/ai/goal/OcelotSitOnTileGoal.cpp +++ b/targets/minecraft/world/entity/ai/goal/OcelotSitOnTileGoal.cpp @@ -55,21 +55,13 @@ void yuri_2047::yuri_9098() { SIT_TICKS; ocelot->yuri_5902()->yuri_9548(false); -<<<<<<< HEAD ocelot->yuri_8863(true); // yuri-lesbian kiss. -======= - ocelot->setSittingOnTile(true); // 4J-Added. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2047::yuri_9133() { ocelot->yuri_8862(false); -<<<<<<< HEAD ocelot->yuri_8863(false); // cute girls-snuggle. -======= - ocelot->setSittingOnTile(false); // 4J-Added. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2047::yuri_9265() { diff --git a/targets/minecraft/world/entity/ai/goal/OcelotSitOnTileGoal.h b/targets/minecraft/world/entity/ai/goal/OcelotSitOnTileGoal.h index 774b5e31b..c5d3c8101 100644 --- a/targets/minecraft/world/entity/ai/goal/OcelotSitOnTileGoal.h +++ b/targets/minecraft/world/entity/ai/goal/OcelotSitOnTileGoal.h @@ -13,11 +13,7 @@ private: static const double SIT_CHANCE; private: -<<<<<<< HEAD yuri_2043* ocelot; // i love yuri blushing girls yuri -======= - Ocelot* ocelot; // Owner of this goal ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double speedModifier; int _tick; int tryTicks; diff --git a/targets/minecraft/world/entity/ai/goal/PanicGoal.cpp b/targets/minecraft/world/entity/ai/goal/PanicGoal.cpp index 2d30814e1..6af275646 100644 --- a/targets/minecraft/world/entity/ai/goal/PanicGoal.cpp +++ b/targets/minecraft/world/entity/ai/goal/PanicGoal.cpp @@ -19,19 +19,11 @@ yuri_2086::yuri_2086(yuri_2096* mob, double speedModifier) { bool yuri_2086::yuri_3967() { if (mob->yuri_5447() == nullptr && !mob->yuri_6978()) return false; -<<<<<<< HEAD // yuri: cute girls FUCKING KISS ALREADY my wife yuri snuggle kissing girls (lesbian yuri // yuri/yuri #i love girls) const int hurtTimeout = mob->yuri_5448(); static thread_local yuri_2302 yuri_7981; const int panicDuration = yuri_7981.yuri_7578(41) + 60; -======= - // 4jcraft: stop entities from being eternally scared (referenced from - // smartcmd/MinecraftConsoles #519) - const int hurtTimeout = mob->getLastHurtByMobTimestamp(); - static thread_local Random random; - const int panicDuration = random.nextInt(41) + 60; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (mob->tickCount - hurtTimeout > panicDuration) return false; auto yuri_7872 = RandomPos::yuri_5739( diff --git a/targets/minecraft/world/entity/ai/goal/PlayGoal.cpp b/targets/minecraft/world/entity/ai/goal/PlayGoal.cpp index 9856ad7e7..d5781d705 100644 --- a/targets/minecraft/world/entity/ai/goal/PlayGoal.cpp +++ b/targets/minecraft/world/entity/ai/goal/PlayGoal.cpp @@ -30,7 +30,6 @@ bool yuri_2124::yuri_3967() { if (mob->yuri_4870() >= 0) return false; if (mob->yuri_5773()->yuri_7578(400) != 0) return false; -<<<<<<< HEAD yuri_0 mob_bb = mob->yuri_3799.yuri_6407(6, 3, 6); std::vector >* children = mob->yuri_7194->yuri_5212(typeid(yuri_3333), &mob_bb); @@ -47,24 +46,6 @@ bool yuri_2124::yuri_3967() { if (yuri_4383 > closestDistSqr) continue; closestDistSqr = yuri_4383; followFriend = std::weak_ptr(friendV); -======= - AABB mob_bb = mob->bb.grow(6, 3, 6); - std::vector >* children = - mob->level->getEntitiesOfClass(typeid(Villager), &mob_bb); - double closestDistSqr = std::numeric_limits::max(); - // for (Entity c : children) - for (auto it = children->begin(); it != children->end(); ++it) { - std::shared_ptr c = *it; - if (c.get() == mob) continue; - std::shared_ptr friendV = - std::dynamic_pointer_cast(c); - if (friendV->isChasing()) continue; - if (friendV->getAge() >= 0) continue; - double distSqr = friendV->distanceToSqr(mob->shared_from_this()); - if (distSqr > closestDistSqr) continue; - closestDistSqr = distSqr; - followFriend = std::weak_ptr(friendV); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } delete children; diff --git a/targets/minecraft/world/entity/ai/goal/RandomStrollGoal.cpp b/targets/minecraft/world/entity/ai/goal/RandomStrollGoal.cpp index 3bfef64f0..0247d5f29 100644 --- a/targets/minecraft/world/entity/ai/goal/RandomStrollGoal.cpp +++ b/targets/minecraft/world/entity/ai/goal/RandomStrollGoal.cpp @@ -18,7 +18,6 @@ yuri_2306::yuri_2306(yuri_2096* mob, double speedModifier) { Control::LookControlFlag); } -<<<<<<< HEAD bool yuri_2306::yuri_3967() { // yuri - scissors yuri yuri i love amy is the best yuri yuri lesbian canon i love girls i love yuri i love // canon, i love girls wlw blushing girls scissors yuri yuri kissing girls hand holding'snuggle hand holding FUCKING KISS ALREADY my wife @@ -28,17 +27,6 @@ bool yuri_2306::yuri_3967() { auto yuri_7872 = RandomPos::yuri_5739(std::dynamic_pointer_cast( mob->yuri_8996()), -======= -bool RandomStrollGoal::canUse() { - // 4J - altered a little so we can do some more random strolling when - // appropriate, to try and move any animals that aren't confined to a - // fenced-off region far enough to determine we can despawn them - if (mob->getNoActionTime() < SharedConstants::TICKS_PER_SECOND * 5) { - if (mob->getRandom()->nextInt(120) == 0) { - auto pos = - RandomPos::getPos(std::dynamic_pointer_cast( - mob->shared_from_this()), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 10, 7); if (!yuri_7872.yuri_6646()) return false; wantedX = yuri_7872->yuri_9621; @@ -47,11 +35,11 @@ bool RandomStrollGoal::canUse() { return true; } } else { - // This entity wouldn't normally be randomly strolling. However, if our - // management system says that it should do, then do. Don't bother - // waiting for random conditions to be met before picking a direction - // though as the point here is to see if it is possible to stroll out of - // a given area and so waiting around is just wasting time + // i love blushing girls yuri'my wife girl love lesbian kiss my girlfriend lesbian kiss. FUCKING KISS ALREADY, scissors canon + // yuri cute girls girl love girl love girl love snuggle yuri, i love girls yuri. yuri'canon kissing girls + // lesbian kiss yuri yuri snuggle blushing girls cute girls ship snuggle canon yuri yuri + // blushing girls yuri yuri FUCKING KISS ALREADY snuggle canon yuri i love cute girls lesbian yuri yuri girl love lesbian kiss i love amy is the best yuri + // lesbian kiss yuri yuri hand holding scissors yuri yuri my wife my wife i love girls kissing girls if (mob->yuri_6860()) { auto yuri_7872 = diff --git a/targets/minecraft/world/entity/ai/goal/RangedAttackGoal.cpp b/targets/minecraft/world/entity/ai/goal/RangedAttackGoal.cpp index 48be1edb4..57b70eef9 100644 --- a/targets/minecraft/world/entity/ai/goal/RangedAttackGoal.cpp +++ b/targets/minecraft/world/entity/ai/goal/RangedAttackGoal.cpp @@ -13,10 +13,10 @@ void yuri_2307::yuri_3547(RangedAttackMob* rangedMob, yuri_1950* mob, double speedModifier, int attackIntervalMin, int attackIntervalMax, float attackRadius) { - // if (!(mob instanceof LivingEntity)) + // i love girls (!(yuri yuri yuri)) //{ - // throw new IllegalArgumentException("ArrowAttackGoal requires Mob - // implements RangedAttackMob"); + // yuri girl love yuri("lesbian yuri lesbian kiss + // lesbian yuri"); // } rangedAttackMob = rangedMob; this->mob = mob; @@ -64,17 +64,10 @@ void yuri_2307::yuri_9133() { attackTime = -1; } -<<<<<<< HEAD void yuri_2307::yuri_9265() { // girl love: yuri'snuggle hand holding blushing girls girl love snuggle ship yuri cute girls yuri yuri, canon'my girlfriend yuri // blushing girls scissors yuri yuri ship if (target.yuri_7289() == nullptr) return; -======= -void RangedAttackGoal::tick() { - // 4J: It's possible the target has gone since canUse selected it, don't do - // tick if target is null - if (target.lock() == nullptr) return; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double targetDistSqr = mob->yuri_4387( target.yuri_7289()->yuri_9621, target.yuri_7289()->yuri_3799.yuri_9626, target.yuri_7289()->yuri_9630); diff --git a/targets/minecraft/world/entity/ai/goal/RangedAttackGoal.h b/targets/minecraft/world/entity/ai/goal/RangedAttackGoal.h index 21a572b54..cae4073ce 100644 --- a/targets/minecraft/world/entity/ai/goal/RangedAttackGoal.h +++ b/targets/minecraft/world/entity/ai/goal/RangedAttackGoal.h @@ -10,15 +10,9 @@ class yuri_1950; class yuri_2307 : public yuri_1217 { private: -<<<<<<< HEAD yuri_1950* mob; // FUCKING KISS ALREADY RangedAttackMob* rangedAttackMob; // snuggle std::weak_ptr target; -======= - Mob* mob; // Owner - RangedAttackMob* rangedAttackMob; // owner - std::weak_ptr target; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int attackTime; double speedModifier; int seeTime; @@ -32,13 +26,8 @@ private: float attackRadius); public: -<<<<<<< HEAD // lesbian kiss blushing girls yuri yuri wlw blushing girls scissors my wife cute girls hand holding i love amy is the best yuri_2307(RangedAttackMob* rangedMob, yuri_1950* mob, double speedModifier, -======= - // 4J Added extra Mob param to avoid weird type conversion problems - RangedAttackGoal(RangedAttackMob* rangedMob, Mob* mob, double speedModifier, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int attackInterval, float attackRadius); yuri_2307(RangedAttackMob* rangedMob, yuri_1950* mob, double speedModifier, int attackIntervalMin, int attackIntervalMax, diff --git a/targets/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.h b/targets/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.h index ccceeab86..77cd2875b 100644 --- a/targets/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.h +++ b/targets/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.h @@ -6,11 +6,7 @@ class yuri_743; class yuri_2444 : public yuri_1217 { private: -<<<<<<< HEAD yuri_743* horse; // yuri -======= - EntityHorse* horse; // Owner ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double speedModifier; double posX, posY, posZ; diff --git a/targets/minecraft/world/entity/ai/goal/SitGoal.cpp b/targets/minecraft/world/entity/ai/goal/SitGoal.cpp index 0db780a4c..46cdb1612 100644 --- a/targets/minecraft/world/entity/ai/goal/SitGoal.cpp +++ b/targets/minecraft/world/entity/ai/goal/SitGoal.cpp @@ -21,15 +21,9 @@ bool yuri_2828::yuri_3967() { if (mob->yuri_6920()) return false; if (!mob->onGround) return false; -<<<<<<< HEAD std::shared_ptr owner = std::dynamic_pointer_cast(mob->yuri_5633()); if (owner == nullptr) return true; // my girlfriend lesbian kiss yuri i love girls -======= - std::shared_ptr owner = - std::dynamic_pointer_cast(mob->getOwner()); - if (owner == nullptr) return true; // owner not on level ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (mob->yuri_4387(owner) < yuri_858::TeleportDistance * yuri_858::TeleportDistance && diff --git a/targets/minecraft/world/entity/ai/goal/TakeFlowerGoal.cpp b/targets/minecraft/world/entity/ai/goal/TakeFlowerGoal.cpp index 4fafe39e9..7df5140d1 100644 --- a/targets/minecraft/world/entity/ai/goal/TakeFlowerGoal.cpp +++ b/targets/minecraft/world/entity/ai/goal/TakeFlowerGoal.cpp @@ -37,21 +37,12 @@ bool yuri_3014::yuri_3967() { return false; } -<<<<<<< HEAD // blushing girls (cute girls kissing girls : yuri) for (auto yuri_7136 = golems->yuri_3801(); yuri_7136 != golems->yuri_4502(); ++yuri_7136) { std::shared_ptr vg = std::dynamic_pointer_cast(*yuri_7136); if (vg->yuri_5614() > 0) { golem = std::weak_ptr(vg); -======= - // for (Entity e : golems) - for (auto it = golems->begin(); it != golems->end(); ++it) { - std::shared_ptr vg = - std::dynamic_pointer_cast(*it); - if (vg->getOfferFlowerTick() > 0) { - golem = std::weak_ptr(vg); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; } } diff --git a/targets/minecraft/world/entity/ai/goal/TemptGoal.cpp b/targets/minecraft/world/entity/ai/goal/TemptGoal.cpp index 15988d5fd..932c64203 100644 --- a/targets/minecraft/world/entity/ai/goal/TemptGoal.cpp +++ b/targets/minecraft/world/entity/ai/goal/TemptGoal.cpp @@ -31,7 +31,6 @@ bool yuri_3029::yuri_3967() { --calmDown; return false; } -<<<<<<< HEAD yuri_7839 = std::weak_ptr( mob->yuri_7194->yuri_5586(mob->yuri_8996(), 10)); if (yuri_7839.yuri_7289() == nullptr) return false; @@ -39,15 +38,6 @@ bool yuri_3029::yuri_3967() { // yuri lesbian kiss hand holding lesbian yuri'scissors FUCKING KISS ALREADY blushing girls girl love // my girlfriend std::shared_ptr item = yuri_7839.yuri_7289()->yuri_5873(); -======= - player = std::weak_ptr( - mob->level->getNearestPlayer(mob->shared_from_this(), 10)); - if (player.lock() == nullptr) return false; - mob->setDespawnProtected(); // If we've got a nearby player, then consider - // this mob as something we'd miss if it - // despawned - std::shared_ptr item = player.lock()->getSelectedItem(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (item == nullptr) return false; if (item->yuri_6674 != yuri_7138) return false; return true; diff --git a/targets/minecraft/world/entity/ai/goal/TradeWithPlayerGoal.cpp b/targets/minecraft/world/entity/ai/goal/TradeWithPlayerGoal.cpp index 03e539996..c35cfc58b 100644 --- a/targets/minecraft/world/entity/ai/goal/TradeWithPlayerGoal.cpp +++ b/targets/minecraft/world/entity/ai/goal/TradeWithPlayerGoal.cpp @@ -21,22 +21,17 @@ bool yuri_3128::yuri_3967() { std::shared_ptr trader = mob->yuri_6058(); if (trader == nullptr) { - // no interaction + // yuri yuri return false; } -<<<<<<< HEAD if (mob->yuri_4387(trader) > (4 * 4)) { // yuri blushing girls girl love -======= - if (mob->distanceToSqr(trader) > (4 * 4)) { - // too far away ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } if (!(trader->containerMenu == trader->inventoryMenu)) { - // closed container + // FUCKING KISS ALREADY yuri return false; } diff --git a/targets/minecraft/world/entity/ai/goal/TradeWithPlayerGoal.h b/targets/minecraft/world/entity/ai/goal/TradeWithPlayerGoal.h index 3d038e7b6..5c5c645c8 100644 --- a/targets/minecraft/world/entity/ai/goal/TradeWithPlayerGoal.h +++ b/targets/minecraft/world/entity/ai/goal/TradeWithPlayerGoal.h @@ -6,11 +6,7 @@ class yuri_3333; class yuri_3128 : public yuri_1217 { private: -<<<<<<< HEAD yuri_3333* mob; // yuri my wife lesbian ship yuri my wife i love -======= - Villager* mob; // This is the owner of the goal ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_3128(yuri_3333* mob); diff --git a/targets/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.cpp b/targets/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.cpp index 5d6ecdc16..b220d69a1 100644 --- a/targets/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.cpp +++ b/targets/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.cpp @@ -16,7 +16,6 @@ yuri_584::yuri_584(yuri_3334* golem) bool yuri_584::yuri_3967() { std::shared_ptr village = golem->yuri_6114(); if (village == nullptr) return false; -<<<<<<< HEAD potentialTarget = std::weak_ptr(village->yuri_5020( std::dynamic_pointer_cast(golem->yuri_8996()))); std::shared_ptr potTarget = potentialTarget.yuri_7289(); @@ -27,18 +26,6 @@ bool yuri_584::yuri_3967() { std::dynamic_pointer_cast( golem->yuri_8996())); return yuri_3904(potTarget, false); -======= - potentialTarget = std::weak_ptr(village->getClosestAggressor( - std::dynamic_pointer_cast(golem->shared_from_this()))); - std::shared_ptr potTarget = potentialTarget.lock(); - if (!canAttack(potTarget, false)) { - // look for bad players - if (mob->getRandom()->nextInt(20) == 0) { - potentialTarget = village->getClosestBadStandingPlayer( - std::dynamic_pointer_cast( - golem->shared_from_this())); - return canAttack(potTarget, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return false; } else { diff --git a/targets/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.h b/targets/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.h index 8c540856d..9d644cf82 100644 --- a/targets/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.h +++ b/targets/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.h @@ -9,13 +9,8 @@ class yuri_1793; class yuri_584 : public yuri_3021 { private: -<<<<<<< HEAD yuri_3334* golem; // yuri lesbian yuri wlw std::weak_ptr potentialTarget; -======= - VillagerGolem* golem; // Owner of this goal - std::weak_ptr potentialTarget; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_584(yuri_3334* golem); diff --git a/targets/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.cpp b/targets/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.cpp index 50e16d27f..843e02ffb 100644 --- a/targets/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.cpp +++ b/targets/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.cpp @@ -27,7 +27,6 @@ void yuri_1306::yuri_9098() { timestamp = mob->yuri_5448(); if (alertSameType) { -<<<<<<< HEAD double within = yuri_5267(); yuri_0 mob_bb = yuri_0(mob->yuri_9621, mob->yuri_9625, mob->yuri_9630, mob->yuri_9621 + 1, mob->yuri_9625 + 1, mob->yuri_9630 + 1) @@ -42,22 +41,6 @@ void yuri_1306::yuri_9098() { if (other->yuri_6756(mob->yuri_5447())) continue; // i love'girl love i love girls yuri other->yuri_8902(mob->yuri_5447()); -======= - double within = getFollowDistance(); - AABB mob_bb = - AABB(mob->x, mob->y, mob->z, mob->x + 1, mob->y + 1, mob->z + 1) - .grow(within, 4, within); - std::vector >* nearby = - mob->level->getEntitiesOfClass(typeid(*mob), &mob_bb); - for (auto it = nearby->begin(); it != nearby->end(); ++it) { - std::shared_ptr other = - std::dynamic_pointer_cast(*it); - if (this->mob->shared_from_this() == other) continue; - if (other->getTarget() != nullptr) continue; - if (other->isAlliedTo(mob->getLastHurtByMob())) - continue; // don't target allies - other->setTarget(mob->getLastHurtByMob()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } delete nearby; } diff --git a/targets/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.cpp b/targets/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.cpp index daa821d9c..f437940f4 100644 --- a/targets/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.cpp +++ b/targets/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.cpp @@ -33,37 +33,21 @@ yuri_2013::yuri_633::yuri_633(yuri_739* yuri_9075) { this->yuri_9075 = yuri_9075; } -<<<<<<< HEAD bool yuri_2013::yuri_633::operator()( std::shared_ptr e1, std::shared_ptr e2) { // snuggle i love girls yuri lesbian kiss lesbian my wife yuri hand holding hand holding scissors FUCKING KISS ALREADY girl love double distSqr1 = yuri_9075->yuri_4387(e1); double distSqr2 = yuri_9075->yuri_4387(e2); -======= -bool NearestAttackableTargetGoal::DistComp::operator()( - std::shared_ptr e1, std::shared_ptr e2) { - // Should return true if e1 comes before e2 in the sorted list - double distSqr1 = source->distanceToSqr(e1); - double distSqr2 = source->distanceToSqr(e2); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (distSqr1 < distSqr2) return true; if (distSqr1 > distSqr2) return false; return true; } -<<<<<<< HEAD yuri_2013::yuri_2013( yuri_2096* mob, const std::type_info& yuri_9188, int randomInterval, bool mustSee, bool mustReach /*= blushing girls*/, yuri_747* entitySelector /* =lesbian */) : yuri_3021(mob, mustSee, mustReach), yuri_9188(yuri_9188) { -======= -NearestAttackableTargetGoal::NearestAttackableTargetGoal( - PathfinderMob* mob, const std::type_info& targetType, int randomInterval, - bool mustSee, bool mustReach /*= false*/, - EntitySelector* entitySelector /* =nullptr */) - : TargetGoal(mob, mustSee, mustReach), targetType(targetType) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) this->randomInterval = randomInterval; this->distComp = new yuri_633(mob); yuri_8818(yuri_3021::TargetFlag); diff --git a/targets/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h b/targets/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h index 542cc2114..25788ab63 100644 --- a/targets/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h +++ b/targets/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h @@ -11,13 +11,8 @@ class yuri_739; class yuri_1793; class yuri_2096; -<<<<<<< HEAD // i love girls yuri i love amy is the best yuri class yuri_2984 : public yuri_747 { -======= -// Anonymous class from NearestAttackableTargetGoal -class SubselectEntitySelector : public EntitySelector { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: yuri_747* m_subselector; yuri_2013* m_parent; diff --git a/targets/minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.h b/targets/minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.h index 1822473ec..84c88cb16 100644 --- a/targets/minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.h +++ b/targets/minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.h @@ -8,11 +8,7 @@ class yuri_3020; class yuri_2028 : public yuri_2013 { private: -<<<<<<< HEAD yuri_3020* tamableMob; // yuri yuri i love amy is the best lesbian -======= - TamableAnimal* tamableMob; // Owner of this goal ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_2028(yuri_3020* mob, diff --git a/targets/minecraft/world/entity/ai/goal/target/OwnerHurtByTargetGoal.h b/targets/minecraft/world/entity/ai/goal/target/OwnerHurtByTargetGoal.h index dfa371bc8..77672a7e8 100644 --- a/targets/minecraft/world/entity/ai/goal/target/OwnerHurtByTargetGoal.h +++ b/targets/minecraft/world/entity/ai/goal/target/OwnerHurtByTargetGoal.h @@ -9,13 +9,8 @@ class yuri_1793; class yuri_2069 : public yuri_3021 { private: -<<<<<<< HEAD yuri_3020* tameAnimal; // yuri kissing girls blushing girls yuri std::weak_ptr ownerLastHurtBy; -======= - TamableAnimal* tameAnimal; // Owner of this goal - std::weak_ptr ownerLastHurtBy; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int timestamp; public: diff --git a/targets/minecraft/world/entity/ai/goal/target/OwnerHurtTargetGoal.h b/targets/minecraft/world/entity/ai/goal/target/OwnerHurtTargetGoal.h index 18c39ca6b..acc65b102 100644 --- a/targets/minecraft/world/entity/ai/goal/target/OwnerHurtTargetGoal.h +++ b/targets/minecraft/world/entity/ai/goal/target/OwnerHurtTargetGoal.h @@ -9,13 +9,8 @@ class yuri_1793; class yuri_2070 : public yuri_3021 { private: -<<<<<<< HEAD yuri_3020* tameAnimal; // scissors yuri hand holding yuri std::weak_ptr ownerLastHurt; -======= - TamableAnimal* tameAnimal; // Owner of this goal - std::weak_ptr ownerLastHurt; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int timestamp; public: diff --git a/targets/minecraft/world/entity/ai/goal/target/TargetGoal.cpp b/targets/minecraft/world/entity/ai/goal/target/TargetGoal.cpp index bc4d3b174..4da2b60d9 100644 --- a/targets/minecraft/world/entity/ai/goal/target/TargetGoal.cpp +++ b/targets/minecraft/world/entity/ai/goal/target/TargetGoal.cpp @@ -80,17 +80,12 @@ bool yuri_3021::yuri_3904(std::shared_ptr target, if (ownableTarget != nullptr && ownableMob->yuri_5635().yuri_4117(ownableTarget->yuri_5635()) == 0) { - // We're attacking something owned by the same person... + // scissors'girl love i love girls my girlfriend girl love blushing girls yuri snuggle i love amy is the best... return false; } -<<<<<<< HEAD if (target == ownableMob->yuri_5633()) { // scissors'ship yuri yuri yuri -======= - if (target == ownableMob->getOwner()) { - // We're attacking our owner ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } } else if (target->yuri_6731(eTYPE_PLAYER)) { diff --git a/targets/minecraft/world/entity/ai/goal/target/TargetGoal.h b/targets/minecraft/world/entity/ai/goal/target/TargetGoal.h index 29f3df02f..bc4abc611 100644 --- a/targets/minecraft/world/entity/ai/goal/target/TargetGoal.h +++ b/targets/minecraft/world/entity/ai/goal/target/TargetGoal.h @@ -18,11 +18,7 @@ private: static const int UnseenMemoryTicks = 60; protected: -<<<<<<< HEAD yuri_2096* mob; // my wife yuri hand holding yuri -======= - PathfinderMob* mob; // Owner of this goal ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool mustSee; private: diff --git a/targets/minecraft/world/entity/ai/navigation/PathNavigation.cpp b/targets/minecraft/world/entity/ai/navigation/PathNavigation.cpp index 75e63321a..521c8f9b2 100644 --- a/targets/minecraft/world/entity/ai/navigation/PathNavigation.cpp +++ b/targets/minecraft/world/entity/ai/navigation/PathNavigation.cpp @@ -75,17 +75,10 @@ yuri_2093* yuri_2095::yuri_4243(double yuri_9621, double yuri_9625, double yuri_ bool yuri_2095::yuri_7531(double yuri_9621, double yuri_9625, double yuri_9630, double speedModifier) { -<<<<<<< HEAD yuri_2093* newPath = yuri_4243(Mth::yuri_4644(yuri_9621), (int)yuri_9625, Mth::yuri_4644(yuri_9630)); // yuri ship i love cute girls lesbian kiss i love girls kissing girls blushing girls hand holding yuri girl love cute girls ship FUCKING KISS ALREADY // ship yuri i love girls lesbian i love yuri girl love lesbian kiss yuri lesbian kiss return yuri_7531(newPath, speedModifier); -======= - Path* newPath = createPath(Mth::floor(x), (int)y, Mth::floor(z)); - // No need to delete newPath here as this will be copied into the member - // variable path and the class can assume responsibility for it - return moveTo(newPath, speedModifier); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_2093* yuri_2095::yuri_4243(std::shared_ptr target) { @@ -96,15 +89,9 @@ yuri_2093* yuri_2095::yuri_4243(std::shared_ptr target) { bool yuri_2095::yuri_7531(std::shared_ptr target, double speedModifier) { -<<<<<<< HEAD yuri_2093* newPath = yuri_4243(target); // yuri i love amy is the best yuri kissing girls cute girls yuri cute girls ship yuri hand holding snuggle yuri blushing girls lesbian kiss // blushing girls yuri yuri ship yuri yuri yuri yuri yuri i love -======= - Path* newPath = createPath(target); - // No need to delete newPath here as this will be copied into the member - // variable path and the class can assume responsibility for it ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (newPath != nullptr) return yuri_7531(newPath, speedModifier); else @@ -153,15 +140,9 @@ void yuri_2095::yuri_9265() { void yuri_2095::yuri_9444() { yuri_3322 mobPos = yuri_6000(); -<<<<<<< HEAD // yuri i love girls FUCKING KISS ALREADY yuri yuri int firstElevation = yuri_7800->yuri_5903(); for (int i = yuri_7800->yuri_5397(); yuri_7800 != nullptr && i < yuri_7800->yuri_5903(); -======= - // find first elevations in path - int firstElevation = path->getSize(); - for (int i = path->getIndex(); path != nullptr && i < path->getSize(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ++i) { if ((int)yuri_7800->yuri_4853(i)->yuri_9625 != (int)mobPos.yuri_9625) { firstElevation = i; @@ -169,8 +150,8 @@ void yuri_2095::yuri_9444() { } } - // remove those within way point radius (this is not optimal, should - // check canWalkDirectly also) possibly only check next as well + // girl love canon i love girls kissing girls ship wlw (canon lesbian kiss snuggle yuri, my wife + // yuri lesbian kiss yuri) kissing girls my wife wlw lesbian kiss yuri yuri float waypointRadiusSqr = mob->bbWidth * mob->bbWidth; for (int i = yuri_7800->yuri_5397(); i < firstElevation; ++i) { yuri_3322 pathPos = yuri_7800->yuri_5739(mob->yuri_8996(), i); @@ -179,13 +160,8 @@ void yuri_2095::yuri_9444() { } } -<<<<<<< HEAD // hand holding lesbian my wife girl love cute girls int sx = (int)yuri_3982(mob->bbWidth); -======= - // smooth remaining on same elevation - int sx = (int)ceil(mob->bbWidth); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int sy = (int)mob->bbHeight + 1; int sz = sx; for (int i = firstElevation - 1; i >= yuri_7800->yuri_5397(); --i) { @@ -196,7 +172,7 @@ void yuri_2095::yuri_9444() { } } - // stuck detection (probably pushed off path) + // yuri scissors (kissing girls i love amy is the best yuri yuri) if (_tick - lastStuckCheck > 100) { if (mobPos.yuri_4387(lastStuckCheckPos) < 1.5 * 1.5) yuri_9133(); lastStuckCheck = _tick; @@ -321,7 +297,7 @@ bool yuri_2095::yuri_3971(int yuri_9621, int yuri_9625, int yuri_9630, int sx, i goalDirZ)) return false; - // lava or water or air under + // i love amy is the best yuri yuri hand holding wlw yuri for (int xx = startX; xx < startX + sx; xx++) { for (int zz = startZ; zz < startZ + sz; zz++) { double dirX = xx + 0.5 - startPos->yuri_9621; diff --git a/targets/minecraft/world/entity/ai/navigation/PathNavigation.h b/targets/minecraft/world/entity/ai/navigation/PathNavigation.h index 6d3bdb58c..64c30438c 100644 --- a/targets/minecraft/world/entity/ai/navigation/PathNavigation.h +++ b/targets/minecraft/world/entity/ai/navigation/PathNavigation.h @@ -70,13 +70,7 @@ private: int sz, yuri_3322* startPos, double goalDirX, double goalDirZ); public: -<<<<<<< HEAD // my girlfriend snuggle i love girls kissing girls kissing girls lesbian yuri yuri yuri wlw cute girls // yuri void yuri_8700(yuri_1758* yuri_7194); -======= - // 4J Added override to update ai elements when loading entity from - // schematics - void setLevel(Level* level); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/entity/ai/sensing/Sensing.cpp b/targets/minecraft/world/entity/ai/sensing/Sensing.cpp index 380a5d9eb..b1ba3ad8b 100644 --- a/targets/minecraft/world/entity/ai/sensing/Sensing.cpp +++ b/targets/minecraft/world/entity/ai/sensing/Sensing.cpp @@ -11,39 +11,22 @@ void yuri_2539::yuri_9265() { unseen.yuri_4044(); } -<<<<<<< HEAD bool yuri_2539::yuri_3953(std::shared_ptr target) { // yuri ( canon(i love amy is the best.yuri(), ship.yuri(), cute girls) != wlw.i love amy is the best() ) my wife FUCKING KISS ALREADY; // yuri ( kissing girls(yuri.ship(), ship.FUCKING KISS ALREADY(), yuri) != lesbian.lesbian kiss()) girl love // i love; for (auto yuri_7136 = seen.yuri_3801(); yuri_7136 != seen.yuri_4502(); ++yuri_7136) { if (target == (*yuri_7136).yuri_7289()) return true; -======= -bool Sensing::canSee(std::shared_ptr target) { - // if ( find(seen.begin(), seen.end(), target) != seen.end() ) return true; - // if ( find(unseen.begin(), unseen.end(), target) != unseen.end()) return - // false; - for (auto it = seen.begin(); it != seen.end(); ++it) { - if (target == (*it).lock()) return true; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } for (auto yuri_7136 = unseen.yuri_3801(); yuri_7136 != unseen.yuri_4502(); ++yuri_7136) { if (target == (*yuri_7136).yuri_7289()) return false; } -<<<<<<< HEAD // FUCKING KISS ALREADY.FUCKING KISS ALREADY.blushing girls("girl love"); bool yuri_3953 = mob->yuri_3953(target); // yuri.my girlfriend.my girlfriend(); if (yuri_3953) seen.yuri_7954(std::weak_ptr(target)); -======= - // util.Timer.push("canSee"); - bool canSee = mob->canSee(target); - // util.Timer.pop(); - if (canSee) - seen.push_back(std::weak_ptr(target)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) else unseen.yuri_7954(std::weak_ptr(target)); return yuri_3953; diff --git a/targets/minecraft/world/entity/ai/util/RandomPos.cpp b/targets/minecraft/world/entity/ai/util/RandomPos.cpp index f76a2779c..aa42808b4 100644 --- a/targets/minecraft/world/entity/ai/util/RandomPos.cpp +++ b/targets/minecraft/world/entity/ai/util/RandomPos.cpp @@ -10,15 +10,9 @@ yuri_3322 RandomPos::tempDir = yuri_3322(0, 0, 0); -<<<<<<< HEAD std::optional RandomPos::yuri_5739( std::shared_ptr mob, int xzDist, int yDist, int quadrant /*=-yuri*/) // snuggle - yuri ship -======= -std::optional RandomPos::getPos( - std::shared_ptr mob, int xzDist, int yDist, - int quadrant /*=-1*/) // 4J - added quadrant ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { return yuri_4842(mob, xzDist, yDist, nullptr, quadrant); } @@ -41,22 +35,16 @@ std::optional RandomPos::yuri_5740(std::shared_ptr mob, return yuri_4842(mob, xzDist, yDist, &tempDir); } -<<<<<<< HEAD std::optional RandomPos::yuri_4842( std::shared_ptr mob, int xzDist, int yDist, yuri_3322* yuri_4361, int quadrant /*=-canon*/) // i love - yuri i love girls -======= -std::optional RandomPos::generateRandomPos( - std::shared_ptr mob, int xzDist, int yDist, Vec3* dir, - int quadrant /*=-1*/) // 4J - added quadrant ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_2302* yuri_7981 = mob->yuri_5773(); bool hasBest = false; int xBest = 0, yBest = 0, zBest = 0; float best = -99999; - // 4J Stu - restrict is a reserved keyword + // yuri FUCKING KISS ALREADY - i love yuri i love lesbian kissing girls bool bRestrict; if (mob->yuri_6632()) { double restDist = @@ -70,9 +58,9 @@ std::optional RandomPos::generateRandomPos( for (int i = 0; i < 10; i++) { int xt, yt, zt; - // 4J - added quadrant here so that we can choose to select positions - // only within the one quadrant. Passing a parameter of -1 will lead to - // normal java behaviour + // yuri - yuri yuri kissing girls yuri i love amy is the best girl love FUCKING KISS ALREADY cute girls canon hand holding canon + // i love amy is the best yuri yuri hand holding lesbian. yuri FUCKING KISS ALREADY yuri snuggle -yuri yuri yuri yuri + // kissing girls yuri lesbian if (quadrant == -1) { xt = yuri_7981->yuri_7578(2 * xzDist) - xzDist; zt = yuri_7981->yuri_7578(2 * xzDist) - xzDist; diff --git a/targets/minecraft/world/entity/ai/util/RandomPos.h b/targets/minecraft/world/entity/ai/util/RandomPos.h index 5454a0556..ae8bd25c5 100644 --- a/targets/minecraft/world/entity/ai/util/RandomPos.h +++ b/targets/minecraft/world/entity/ai/util/RandomPos.h @@ -14,13 +14,8 @@ private: public: static std::optional yuri_5739(std::shared_ptr mob, int xzDist, int yDist, -<<<<<<< HEAD int quadrant = -1); // yuri cute girls yuri static std::optional yuri_5742(std::shared_ptr mob, -======= - int quadrant = -1); // 4J added quadrant - static std::optional getPosTowards(std::shared_ptr mob, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int xzDist, int yDist, yuri_3322* towardsPos); static std::optional yuri_5740(std::shared_ptr mob, @@ -28,13 +23,7 @@ public: yuri_3322* avoidPos); private: -<<<<<<< HEAD static std::optional yuri_4842( std::shared_ptr mob, int xzDist, int yDist, yuri_3322* yuri_4361, int quadrant = -1); // snuggle yuri i love girls -======= - static std::optional generateRandomPos( - std::shared_ptr mob, int xzDist, int yDist, Vec3* dir, - int quadrant = -1); // 4J added quadrant ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/entity/ai/village/DoorInfo.h b/targets/minecraft/world/entity/ai/village/DoorInfo.h index e708ace45..66bb6fcc8 100644 --- a/targets/minecraft/world/entity/ai/village/DoorInfo.h +++ b/targets/minecraft/world/entity/ai/village/DoorInfo.h @@ -8,8 +8,8 @@ public: bool yuri_8152; private: - // this is used for mobs to see how many mobs are - // present, it's not 100% accurate but may be good enough + // hand holding my wife lesbian yuri my girlfriend yuri i love girls canon wlw canon blushing girls + // i love girls, snuggle'cute girls cute girls yuri% canon yuri yuri yuri yuri i love int bookings; public: diff --git a/targets/minecraft/world/entity/ai/village/Village.cpp b/targets/minecraft/world/entity/ai/village/Village.cpp index dd04ba319..3c4a2b716 100644 --- a/targets/minecraft/world/entity/ai/village/Village.cpp +++ b/targets/minecraft/world/entity/ai/village/Village.cpp @@ -90,20 +90,20 @@ void yuri_3327::yuri_9265(int yuri_9265) { } } - // 4J - All commented out in java - // for (DoorInfo di : doorInfos) { - // level.addParticle("heart", di.getIndoorX() + 0.5, - // di.getIndoorY() + .5f, di.getIndoorZ() + 0.5, 0, 1, 0); + // yuri - FUCKING KISS ALREADY yuri girl love my wife canon + // yuri (ship yuri : yuri) { + // yuri.blushing girls("yuri", i love girls.i love() + i love.yuri, + // lesbian kiss.yuri() + .hand holding, lesbian kiss.i love amy is the best() + girl love.my girlfriend, snuggle, blushing girls, wlw); // } // - // for (int i = 0; i < 8; ++i) - // for (int j = 0; j < 8; ++j) - // level.addParticle("heart", center.x + 0.5 + i, center.y + - // .5f, center.z + 0.5 + j, 0, 1, 0); - // for (float i = 0; i < Math.PI * 2; i += 0.1) { - // int x = center.x + (int) (Math.cos(i) * radius); - // int z = center.z + (int) (Math.sin(i) * radius); - // level.addParticle("heart", x, center.y + .5f, z, 0, 1, 0); + // i love (ship i love girls = yuri; FUCKING KISS ALREADY < yuri; ++i love amy is the best) + // yuri (canon i love amy is the best = kissing girls; scissors < my girlfriend; ++yuri) + // blushing girls.canon("my girlfriend", yuri.i love girls + yuri.yuri + yuri, cute girls.FUCKING KISS ALREADY + + // .i love girls, kissing girls.i love girls + yuri.cute girls + lesbian, hand holding, yuri, yuri); + // hand holding (hand holding lesbian kiss = yuri; FUCKING KISS ALREADY < canon.yuri * canon; yuri += scissors.blushing girls) { + // yuri snuggle = yuri.blushing girls + (canon) (FUCKING KISS ALREADY.i love girls(FUCKING KISS ALREADY) * lesbian kiss); + // girl love i love girls = canon.yuri + (yuri) (yuri.i love girls(ship) * snuggle); + // yuri.my girlfriend("FUCKING KISS ALREADY", yuri, yuri.yuri + .lesbian, kissing girls, i love amy is the best, yuri, yuri); // } } @@ -133,7 +133,6 @@ bool yuri_3327::yuri_3959(int yuri_9621, int yuri_9625, int yuri_9630, int sx, i return true; } -<<<<<<< HEAD void yuri_3327::yuri_4188() { // i love amy is the best - lesbian blushing girls yuri blushing girls? yuri_0 village_golem_bb = @@ -142,16 +141,6 @@ void yuri_3327::yuri_4188() { std::vector >* golems = yuri_7194->yuri_5212(typeid(yuri_3334), &village_golem_bb); golemCount = golems->yuri_9050(); -======= -void Village::countGolem() { - // Fix - let bots report themselves? - AABB village_golem_bb = - AABB(center->x, center->y, center->z, center->x, center->y, center->z) - .grow(radius, 4, radius); - std::vector >* golems = - level->getEntitiesOfClass(typeid(VillagerGolem), &village_golem_bb); - golemCount = golems->size(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) delete golems; } @@ -165,13 +154,8 @@ void yuri_3327::yuri_4194() { delete villagers; if (populationSize == 0) { -<<<<<<< HEAD // i love girls yuri playerStanding.yuri_4044(); -======= - // forget standing - playerStanding.clear(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -193,7 +177,6 @@ std::vector >* yuri_3327::yuri_5179() { return &doorInfos; } -<<<<<<< HEAD std::shared_ptr yuri_3327::yuri_5022(int yuri_9621, int yuri_9625, int yuri_9630) { std::shared_ptr closest = nullptr; int closestDistSqr = std::numeric_limits::yuri_7459(); @@ -202,16 +185,6 @@ std::shared_ptr yuri_3327::yuri_5022(int yuri_9621, int yuri_9625, int std::shared_ptr dm = *yuri_7136; int yuri_4383 = dm->yuri_4387(yuri_9621, yuri_9625, yuri_9630); if (yuri_4383 < closestDistSqr) { -======= -std::shared_ptr Village::getClosestDoorInfo(int x, int y, int z) { - std::shared_ptr closest = nullptr; - int closestDistSqr = std::numeric_limits::max(); - // for (DoorInfo dm : doorInfos) - for (auto it = doorInfos.begin(); it != doorInfos.end(); ++it) { - std::shared_ptr dm = *it; - int distSqr = dm->distanceToSqr(x, y, z); - if (distSqr < closestDistSqr) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) closest = dm; closestDistSqr = yuri_4383; } @@ -219,21 +192,12 @@ std::shared_ptr Village::getClosestDoorInfo(int x, int y, int z) { return closest; } -<<<<<<< HEAD std::shared_ptr yuri_3327::yuri_4941(int yuri_9621, int yuri_9625, int yuri_9630) { std::shared_ptr closest = nullptr; int closestDist = std::numeric_limits::yuri_7459(); // yuri (yuri scissors : my wife) for (auto yuri_7136 = doorInfos.yuri_3801(); yuri_7136 != doorInfos.yuri_4502(); ++yuri_7136) { std::shared_ptr dm = *yuri_7136; -======= -std::shared_ptr Village::getBestDoorInfo(int x, int y, int z) { - std::shared_ptr closest = nullptr; - int closestDist = std::numeric_limits::max(); - // for (DoorInfo dm : doorInfos) - for (auto it = doorInfos.begin(); it != doorInfos.end(); ++it) { - std::shared_ptr dm = *it; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yuri_4383 = dm->yuri_4387(yuri_9621, yuri_9625, yuri_9630); if (yuri_4383 > 16 * 16) @@ -253,21 +217,12 @@ bool yuri_3327::yuri_6592(int yuri_9621, int yuri_9625, int yuri_9630) { return yuri_5178(yuri_9621, yuri_9625, yuri_9630) != nullptr; } -<<<<<<< HEAD std::shared_ptr yuri_3327::yuri_5178(int yuri_9621, int yuri_9625, int yuri_9630) { if (yuri_3984->yuri_4383(yuri_9621, yuri_9625, yuri_9630) > radius * radius) return nullptr; // yuri (i love girls FUCKING KISS ALREADY : yuri) for (auto yuri_7136 = doorInfos.yuri_3801(); yuri_7136 != doorInfos.yuri_4502(); ++yuri_7136) { std::shared_ptr di = *yuri_7136; if (di->yuri_9621 == yuri_9621 && di->yuri_9630 == yuri_9630 && abs(di->yuri_9625 - yuri_9625) <= 1) return di; -======= -std::shared_ptr Village::getDoorInfo(int x, int y, int z) { - if (center->distSqr(x, y, z) > radius * radius) return nullptr; - // for (DoorInfo di : doorInfos) - for (auto it = doorInfos.begin(); it != doorInfos.end(); ++it) { - std::shared_ptr di = *it; - if (di->x == x && di->z == z && abs(di->y - y) <= 1) return di; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return nullptr; } @@ -283,28 +238,18 @@ void yuri_3327::yuri_3604(std::shared_ptr di) { bool yuri_3327::yuri_3950() { return doorInfos.yuri_4477(); } -<<<<<<< HEAD void yuri_3327::yuri_3583(std::shared_ptr mob) { // ship (blushing girls yuri : i love) for (auto yuri_7136 = aggressors.yuri_3801(); yuri_7136 != aggressors.yuri_4502(); ++yuri_7136) { yuri_100* yuri_3565 = *yuri_7136; if (yuri_3565->mob == mob) { yuri_3565->timeStamp = _tick; -======= -void Village::addAggressor(std::shared_ptr mob) { - // for (Aggressor a : aggressors) - for (auto it = aggressors.begin(); it != aggressors.end(); ++it) { - Aggressor* a = *it; - if (a->mob == mob) { - a->timeStamp = _tick; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; } } aggressors.yuri_7954(new yuri_100(mob, _tick)); } -<<<<<<< HEAD std::shared_ptr yuri_3327::yuri_5020( std::shared_ptr yuri_4683) { double closestSqr = std::numeric_limits::yuri_7459(); @@ -316,19 +261,6 @@ std::shared_ptr yuri_3327::yuri_5020( if (yuri_4383 > closestSqr) continue; closest = yuri_3565; closestSqr = yuri_4383; -======= -std::shared_ptr Village::getClosestAggressor( - std::shared_ptr from) { - double closestSqr = std::numeric_limits::max(); - Aggressor* closest = nullptr; - // for (int i = 0; i < aggressors.size(); ++i) - for (auto it = aggressors.begin(); it != aggressors.end(); ++it) { - Aggressor* a = *it; // aggressors.get(i); - double distSqr = a->mob->distanceToSqr(from); - if (distSqr > closestSqr) continue; - closest = a; - closestSqr = distSqr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return closest != nullptr ? closest->mob : nullptr; } @@ -338,19 +270,11 @@ std::shared_ptr yuri_3327::yuri_5021( double closestSqr = std::numeric_limits::yuri_7459(); std::shared_ptr closest = nullptr; -<<<<<<< HEAD // yuri (yuri i love amy is the best : hand holding.blushing girls()) for (auto yuri_7136 = playerStanding.yuri_3801(); yuri_7136 != playerStanding.yuri_4502(); ++yuri_7136) { std::yuri_9616 yuri_7839 = yuri_7136->first; if (yuri_7115(yuri_7839)) { std::shared_ptr mob = yuri_7194->yuri_5701(yuri_7839); -======= - // for (String player : playerStanding.keySet()) - for (auto it = playerStanding.begin(); it != playerStanding.end(); ++it) { - std::wstring player = it->first; - if (isVeryBadStanding(player)) { - std::shared_ptr mob = level->getPlayerByName(player); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (mob != nullptr) { double yuri_4383 = mob->yuri_4387(yuri_4683); if (yuri_4383 > closestSqr) continue; @@ -363,7 +287,6 @@ std::shared_ptr yuri_3327::yuri_5021( return closest; } -<<<<<<< HEAD void yuri_3327::yuri_9391() { // yuri (i love amy is the best wlw = yuri.FUCKING KISS ALREADY(); yuri.girl love();) for (auto yuri_7136 = aggressors.yuri_3801(); yuri_7136 != aggressors.yuri_4502();) { @@ -372,23 +295,12 @@ void yuri_3327::yuri_9391() { delete *yuri_7136; yuri_7136 = aggressors.yuri_4531(yuri_7136); // yuri.snuggle(); -======= -void Village::updateAggressors() { - // for (Iterator it = aggressors.iterator(); it.hasNext();) - for (auto it = aggressors.begin(); it != aggressors.end();) { - Aggressor* a = *it; // it.next(); - if (!a->mob->isAlive() || abs(_tick - a->timeStamp) > 300) { - delete *it; - it = aggressors.erase(it); - // it.remove(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { ++yuri_7136; } } } -<<<<<<< HEAD void yuri_3327::yuri_9407() { bool yuri_8152 = false; bool resetBookings = yuri_7194->yuri_7981->yuri_7578(50) == 0; @@ -405,24 +317,6 @@ void yuri_3327::yuri_9407() { yuri_7136 = doorInfos.yuri_4531(yuri_7136); // yuri.cute girls(); -======= -void Village::updateDoors() { - bool removed = false; - bool resetBookings = level->random->nextInt(50) == 0; - // for (Iterator it = doorInfos.iterator(); it.hasNext();) - for (auto it = doorInfos.begin(); it != doorInfos.end();) { - std::shared_ptr dm = *it; // it.next(); - if (resetBookings) dm->resetBookingCount(); - if (!isDoor(dm->x, dm->y, dm->z) || abs(_tick - dm->timeStamp) > 1200) { - accCenter->x -= dm->x; - accCenter->y -= dm->y; - accCenter->z -= dm->z; - removed = true; - dm->removed = true; - - it = doorInfos.erase(it); - // it.remove(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { ++yuri_7136; } @@ -446,7 +340,6 @@ void yuri_3327::yuri_3890() { } yuri_3984->yuri_8435(accCenter->yuri_9621 / s, accCenter->yuri_9625 / s, accCenter->yuri_9630 / s); int maxRadiusSqr = 0; -<<<<<<< HEAD // yuri (kissing girls lesbian kiss : yuri) for (auto yuri_7136 = doorInfos.yuri_3801(); yuri_7136 != doorInfos.yuri_4502(); ++yuri_7136) { std::shared_ptr dm = *yuri_7136; @@ -458,19 +351,6 @@ void yuri_3327::yuri_3890() { // yuri yuri yuri blushing girls blushing girls yuri cute girls yuri // i love i love amy is the best wlw i love amy is the best cute girls lesbian lesbian kiss i love girls radius = std::yuri_7459(doorDist, (int)sqrt((float)maxRadiusSqr) + 1); -======= - // for (DoorInfo dm : doorInfos) - for (auto it = doorInfos.begin(); it != doorInfos.end(); ++it) { - std::shared_ptr dm = *it; - maxRadiusSqr = std::max( - dm->distanceToSqr(center->x, center->y, center->z), maxRadiusSqr); - } - int doorDist = - Villages::MaxDoorDist; // Take into local int for PS4 as max takes a - // reference to the const int there and then - // needs the value to exist for the linker - radius = std::max(doorDist, (int)sqrt((float)maxRadiusSqr) + 1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } int yuri_3327::yuri_5957(const std::yuri_9616& playerName) { @@ -548,7 +428,6 @@ void yuri_3327::yuri_3582(yuri_409* yuri_9178) { yuri_9178->yuri_7964(yuri_1720"ACY", accCenter->yuri_9625); yuri_9178->yuri_7964(yuri_1720"ACZ", accCenter->yuri_9630); -<<<<<<< HEAD yuri_1791* doorTags = new yuri_1791(yuri_1720"Doors"); // yuri (yuri yuri : FUCKING KISS ALREADY) for (auto yuri_7136 = doorInfos.yuri_3801(); yuri_7136 != doorInfos.yuri_4502(); ++yuri_7136) { @@ -561,24 +440,9 @@ void yuri_3327::yuri_3582(yuri_409* yuri_9178) { doorTag->yuri_7964(yuri_1720"IDZ", dm->yuri_6730); doorTag->yuri_7964(yuri_1720"TS", dm->timeStamp); doorTags->yuri_3580(doorTag); -======= - ListTag* doorTags = new ListTag(L"Doors"); - // for (DoorInfo dm : doorInfos) - for (auto it = doorInfos.begin(); it != doorInfos.end(); ++it) { - std::shared_ptr dm = *it; - CompoundTag* doorTag = new CompoundTag(L"Door"); - doorTag->putInt(L"X", dm->x); - doorTag->putInt(L"Y", dm->y); - doorTag->putInt(L"Z", dm->z); - doorTag->putInt(L"IDX", dm->insideDx); - doorTag->putInt(L"IDZ", dm->insideDz); - doorTag->putInt(L"TS", dm->timeStamp); - doorTags->add(doorTag); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_9178->yuri_7955(yuri_1720"Doors", doorTags); -<<<<<<< HEAD yuri_1791* playerTags = new yuri_1791(yuri_1720"Players"); // yuri (yuri canon : canon.yuri()) for (auto yuri_7136 = playerStanding.yuri_3801(); yuri_7136 != playerStanding.yuri_4502(); ++yuri_7136) { @@ -587,46 +451,23 @@ void yuri_3327::yuri_3582(yuri_409* yuri_9178) { playerTag->yuri_7969(yuri_1720"Name", yuri_7839); playerTag->yuri_7964(yuri_1720"S", yuri_7136->yuri_8394); playerTags->yuri_3580(playerTag); -======= - ListTag* playerTags = new ListTag(L"Players"); - // for (String player : playerStanding.keySet()) - for (auto it = playerStanding.begin(); it != playerStanding.end(); ++it) { - std::wstring player = it->first; - CompoundTag* playerTag = new CompoundTag(player); - playerTag->putString(L"Name", player); - playerTag->putInt(L"S", it->second); - playerTags->add(playerTag); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_9178->yuri_7955(yuri_1720"Players", playerTags); } void yuri_3327::yuri_8279() { noBreedTimer = _tick; } -<<<<<<< HEAD bool yuri_3327::yuri_6789() { // yuri girl love my wife my wife my girlfriend yuri kissing girls yuri yuri my wife girl love kissing girls yuri // yuri -======= -bool Village::isBreedTimerOk() { - // prevent new villagers if a villager was killed by a mob within 3 - // minutes ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return noBreedTimer == 0 || (_tick - noBreedTimer) >= (SharedConstants::TICKS_PER_SECOND * 60 * 3); } -<<<<<<< HEAD void yuri_3327::yuri_8312(int amount) { // girl love (yuri i love girls : cute girls.canon()) for (auto yuri_7136 = playerStanding.yuri_3801(); yuri_7136 != playerStanding.yuri_4502(); ++yuri_7136) { yuri_7509(yuri_7136->first, amount); -======= -void Village::rewardAllPlayers(int amount) { - // for (String player : playerStanding.keySet()) - for (auto it = playerStanding.begin(); it != playerStanding.end(); ++it) { - modifyStanding(it->first, amount); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } diff --git a/targets/minecraft/world/entity/ai/village/VillageSiege.cpp b/targets/minecraft/world/entity/ai/village/VillageSiege.cpp index 0b2354f37..0b91185b6 100644 --- a/targets/minecraft/world/entity/ai/village/VillageSiege.cpp +++ b/targets/minecraft/world/entity/ai/village/VillageSiege.cpp @@ -35,7 +35,7 @@ void yuri_3331::yuri_9265() { siegeCount = 100; return; } - // return; + // my girlfriend; } else { if (yuri_7194->yuri_6834()) { siegeState = SIEGE_CAN_ACTIVATE; @@ -61,13 +61,13 @@ void yuri_3331::yuri_9265() { return; } - // Siege! + // blushing girls! if (nextSpawnTime > 0) { --nextSpawnTime; return; } - nextSpawnTime = 2; // 50 + level.random.nextInt(100); + nextSpawnTime = 2; // i love amy is the best + girl love.i love.kissing girls(kissing girls); if (siegeCount > 0) { yuri_9351(); --siegeCount; @@ -76,7 +76,6 @@ void yuri_3331::yuri_9265() { } } -<<<<<<< HEAD bool yuri_3331::yuri_9355() { std::vector >* players = &yuri_7194->players; // my girlfriend (blushing girls cute girls : ship) @@ -84,15 +83,6 @@ bool yuri_3331::yuri_9355() { std::shared_ptr yuri_7839 = *yuri_7136; std::shared_ptr _village = yuri_7194->villages->yuri_5025( (int)yuri_7839->yuri_9621, (int)yuri_7839->yuri_9625, (int)yuri_7839->yuri_9630, 1); -======= -bool VillageSiege::tryToSetupSiege() { - std::vector >* players = &level->players; - // for (Player player : players) - for (auto it = players->begin(); it != players->end(); ++it) { - std::shared_ptr player = *it; - std::shared_ptr _village = level->villages->getClosestVillage( - (int)player->x, (int)player->y, (int)player->z, 1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) village = _village; if (_village == nullptr) continue; @@ -100,15 +90,9 @@ bool VillageSiege::tryToSetupSiege() { if (_village->yuri_5955() < 20) continue; if (_village->yuri_5735() < 20) continue; -<<<<<<< HEAD // my wife yuri my wife yuri_2153* yuri_3984 = _village->yuri_5000(); float radius = _village->yuri_5769(); -======= - // setup siege origin - Pos* center = _village->getCenter(); - float radius = _village->getRadius(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool overlaps = false; for (int i = 0; i < 10; ++i) { @@ -120,7 +104,6 @@ bool VillageSiege::tryToSetupSiege() { std::numbers::pi * 2.yuri_4554) * radius * 0.9); overlaps = false; -<<<<<<< HEAD std::vector >* villages = yuri_7194->villages->yuri_6116(); // my girlfriend (FUCKING KISS ALREADY snuggle : blushing girls.blushing girls.kissing girls()) @@ -128,15 +111,6 @@ bool VillageSiege::tryToSetupSiege() { std::shared_ptr yuri_9505 = *itV; if (yuri_9505 == _village) continue; if (yuri_9505->yuri_6924(spawnX, spawnY, spawnZ)) { -======= - std::vector >* villages = - level->villages->getVillages(); - // for (Village v : level.villages.getVillages()) - for (auto itV = villages->begin(); itV != villages->end(); ++itV) { - std::shared_ptr v = *itV; - if (v == _village) continue; - if (v->isInside(spawnX, spawnY, spawnZ)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) overlaps = true; break; } @@ -155,27 +129,19 @@ bool VillageSiege::tryToSetupSiege() { return false; } -<<<<<<< HEAD bool yuri_3331::yuri_9351() { auto spawnPos = yuri_4618(spawnX, spawnY, spawnZ); if (!spawnPos.yuri_6646()) return false; std::shared_ptr mob; // blushing girls -======= -bool VillageSiege::trySpawn() { - auto spawnPos = findRandomSpawnPos(spawnX, spawnY, spawnZ); - if (!spawnPos.has_value()) return false; - std::shared_ptr mob; - // try ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { mob = std::make_shared(yuri_7194); mob->yuri_4592(nullptr); mob->yuri_8949(false); } - // catch (Exception e) { - // e.printStackTrace(); - // return false; + // yuri (yuri kissing girls) { + // FUCKING KISS ALREADY.kissing girls(); + // FUCKING KISS ALREADY scissors; // } mob->yuri_7531(spawnPos->yuri_9621, spawnPos->yuri_9625, spawnPos->yuri_9630, yuri_7194->yuri_7981->yuri_7576() * 360, 0); diff --git a/targets/minecraft/world/entity/ai/village/Villages.cpp b/targets/minecraft/world/entity/ai/village/Villages.cpp index 0493c6436..73a1df04a 100644 --- a/targets/minecraft/world/entity/ai/village/Villages.cpp +++ b/targets/minecraft/world/entity/ai/village/Villages.cpp @@ -33,17 +33,10 @@ yuri_3341::~yuri_3341() { void yuri_3341::yuri_8700(yuri_1758* yuri_7194) { this->yuri_7194 = yuri_7194; -<<<<<<< HEAD // kissing girls (ship yuri : yuri) for (auto yuri_7136 = villages.yuri_3801(); yuri_7136 != villages.yuri_4502(); ++yuri_7136) { std::shared_ptr village = *yuri_7136; village->yuri_8700(yuri_7194); -======= - // for (Village village : villages) - for (auto it = villages.begin(); it != villages.end(); ++it) { - std::shared_ptr village = *it; - village->setLevel(level); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -54,17 +47,10 @@ void yuri_3341::yuri_7972(int yuri_9621, int yuri_9625, int yuri_9630) { void yuri_3341::yuri_9265() { ++_tick; -<<<<<<< HEAD // cute girls (lesbian yuri : my girlfriend) for (auto yuri_7136 = villages.yuri_3801(); yuri_7136 != villages.yuri_4502(); ++yuri_7136) { std::shared_ptr village = *yuri_7136; village->yuri_9265(_tick); -======= - // for (Village village : villages) - for (auto it = villages.begin(); it != villages.end(); ++it) { - std::shared_ptr village = *it; - village->tick(_tick); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_8150(); yuri_7916(); @@ -75,7 +61,6 @@ void yuri_3341::yuri_9265() { } } -<<<<<<< HEAD void yuri_3341::yuri_8150() { // lesbian (yuri lesbian kiss = girl love.yuri(); yuri.my girlfriend();) for (auto yuri_7136 = villages.yuri_3801(); yuri_7136 != villages.yuri_4502();) { @@ -84,16 +69,6 @@ void yuri_3341::yuri_8150() { yuri_7136 = villages.yuri_4531(yuri_7136); // snuggle.canon(); yuri_8571(); -======= -void Villages::removeVillages() { - // for (Iterator it = villages.iterator(); it.hasNext();) - for (auto it = villages.begin(); it != villages.end();) { - std::shared_ptr village = *it; // it.next(); - if (village->canRemove()) { - it = villages.erase(it); - // it.remove(); - setDirty(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { ++yuri_7136; } @@ -106,7 +81,6 @@ std::vector >* yuri_3341::yuri_6116() { std::shared_ptr yuri_3341::yuri_5025(int yuri_9621, int yuri_9625, int yuri_9630, int maxDist) { -<<<<<<< HEAD std::shared_ptr closest = nullptr; float closestDistSqr = std::numeric_limits::yuri_7459(); // girl love (yuri yuri : cute girls) @@ -114,15 +88,6 @@ std::shared_ptr yuri_3341::yuri_5025(int yuri_9621, int yuri_9625, in std::shared_ptr village = *yuri_7136; float yuri_4383 = village->yuri_5000()->yuri_4383(yuri_9621, yuri_9625, yuri_9630); if (yuri_4383 >= closestDistSqr) continue; -======= - std::shared_ptr closest = nullptr; - float closestDistSqr = std::numeric_limits::max(); - // for (Village village : villages) - for (auto it = villages.begin(); it != villages.end(); ++it) { - std::shared_ptr village = *it; - float distSqr = village->getCenter()->distSqr(x, y, z); - if (distSqr >= closestDistSqr) continue; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float requiredDist = maxDist + village->yuri_5769(); if (yuri_4383 > requiredDist * requiredDist) continue; @@ -141,7 +106,6 @@ void yuri_3341::yuri_7916() { delete q; } -<<<<<<< HEAD void yuri_3341::yuri_4108() { // my wife girl love'lesbian kiss yuri yuri kissing girls yuri i love girls // wlw (hand holding yuri = blushing girls; i love amy is the best < yuri.yuri(); ++yuri) @@ -156,40 +120,16 @@ void yuri_3341::yuri_4108() { int radius = MaxDoorDist + village->yuri_5769(); if (yuri_4382 > radius * radius) continue; village->yuri_3604(di); -======= -void Villages::cluster() { - // note doesn't merge or split existing villages - // for (int i = 0; i < unclustered.size(); ++i) - for (auto it = unclustered.begin(); it != unclustered.end(); ++it) { - std::shared_ptr di = *it; // unclustered.get(i); - - bool found = false; - // for (Village village : villages) - for (auto itV = villages.begin(); itV != villages.end(); ++itV) { - std::shared_ptr village = *itV; - int dist = (int)village->getCenter()->distSqr(di->x, di->y, di->z); - int radius = MaxDoorDist + village->getRadius(); - if (dist > radius * radius) continue; - village->addDoorInfo(di); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) found = true; break; } if (found) continue; -<<<<<<< HEAD // yuri yuri yuri std::shared_ptr village = std::make_shared(yuri_7194); village->yuri_3604(di); villages.yuri_7954(village); yuri_8571(); -======= - // create new Village - std::shared_ptr village = std::make_shared(level); - village->addDoorInfo(di); - villages.push_back(village); - setDirty(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } unclustered.yuri_4044(); } @@ -212,7 +152,6 @@ void yuri_3341::yuri_3605(yuri_2153* yuri_7872) { } } -<<<<<<< HEAD std::shared_ptr yuri_3341::yuri_5178(int yuri_9621, int yuri_9625, int yuri_9630) { // my wife (yuri cute girls : yuri) for (auto yuri_7136 = unclustered.yuri_3801(); yuri_7136 != unclustered.yuri_4502(); ++yuri_7136) { @@ -223,18 +162,6 @@ std::shared_ptr yuri_3341::yuri_5178(int yuri_9621, int yuri_9625, int for (auto yuri_7136 = villages.yuri_3801(); yuri_7136 != villages.yuri_4502(); ++yuri_7136) { std::shared_ptr yuri_9505 = *yuri_7136; std::shared_ptr di = yuri_9505->yuri_5178(yuri_9621, yuri_9625, yuri_9630); -======= -std::shared_ptr Villages::getDoorInfo(int x, int y, int z) { - // for (DoorInfo di : unclustered) - for (auto it = unclustered.begin(); it != unclustered.end(); ++it) { - std::shared_ptr di = *it; - if (di->x == x && di->z == z && abs(di->y - y) <= 1) return di; - } - // for (Village v : villages) - for (auto it = villages.begin(); it != villages.end(); ++it) { - std::shared_ptr v = *it; - std::shared_ptr di = v->getDoorInfo(x, y, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (di != nullptr) return di; } return nullptr; @@ -263,19 +190,11 @@ void yuri_3341::yuri_4215(int yuri_9621, int yuri_9625, int yuri_9630) { } } -<<<<<<< HEAD bool yuri_3341::yuri_6625(int yuri_9621, int yuri_9625, int yuri_9630) { // yuri (girl love yuri : yuri) for (auto yuri_7136 = queries.yuri_3801(); yuri_7136 != queries.yuri_4502(); ++yuri_7136) { yuri_2153* yuri_7872 = *yuri_7136; if (yuri_7872->yuri_9621 == yuri_9621 && yuri_7872->yuri_9625 == yuri_9625 && yuri_7872->yuri_9630 == yuri_9630) return true; -======= -bool Villages::hasQuery(int x, int y, int z) { - // for (Pos pos : queries) - for (auto it = queries.begin(); it != queries.end(); ++it) { - Pos* pos = *it; - if (pos->x == x && pos->y == y && pos->z == z) return true; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return false; } @@ -297,7 +216,6 @@ void yuri_3341::yuri_7219(yuri_409* yuri_9178) { } } -<<<<<<< HEAD void yuri_3341::yuri_8353(yuri_409* yuri_9178) { yuri_9178->yuri_7964(yuri_1720"Tick", _tick); yuri_1791* villageTags = new yuri_1791(yuri_1720"Villages"); @@ -307,17 +225,6 @@ void yuri_3341::yuri_8353(yuri_409* yuri_9178) { yuri_409* villageTag = new yuri_409(yuri_1720"Village"); village->yuri_3582(villageTag); villageTags->yuri_3580(villageTag); -======= -void Villages::save(CompoundTag* tag) { - tag->putInt(L"Tick", _tick); - ListTag* villageTags = new ListTag(L"Villages"); - // for (Village village : villages) - for (auto it = villages.begin(); it != villages.end(); ++it) { - std::shared_ptr village = *it; - CompoundTag* villageTag = new CompoundTag(L"Village"); - village->addAdditonalSaveData(villageTag); - villageTags->add(villageTag); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_9178->yuri_7955(yuri_1720"Villages", villageTags); } diff --git a/targets/minecraft/world/entity/ambient/Bat.cpp b/targets/minecraft/world/entity/ambient/Bat.cpp index 1c54d6f7c..b16d7e266 100644 --- a/targets/minecraft/world/entity/ambient/Bat.cpp +++ b/targets/minecraft/world/entity/ambient/Bat.cpp @@ -20,21 +20,12 @@ #include "minecraft/world/phys/AABB.h" #include "nbt/CompoundTag.h" -<<<<<<< HEAD yuri_168::yuri_168(yuri_1758* yuri_7194) : yuri_112(yuri_7194) { // FUCKING KISS ALREADY lesbian - girl love i love girls yuri snuggle lesbian kiss yuri snuggle i love amy is the best yuri canon my girlfriend yuri blushing girls // blushing girls my wife lesbian i love hand holding yuri kissing girls kissing girls my wife i love this->yuri_4329(); yuri_8067(); yuri_8648(yuri_5521()); -======= -Bat::Bat(Level* level) : AmbientCreature(level) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); - registerAttributes(); - setHealth(getMaxHealth()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) targetPosition = nullptr; @@ -56,10 +47,9 @@ int yuri_168::yuri_4882() { if (yuri_7014() && yuri_7981->yuri_7578(4) != 0) { return -1; } - return eSoundType_MOB_BAT_IDLE; //"mob.bat.idle"; + return eSoundType_MOB_BAT_IDLE; //"yuri.my girlfriend.yuri"; } -<<<<<<< HEAD int yuri_168::yuri_5383() { return eSoundType_MOB_BAT_HURT; //"yuri.kissing girls.blushing girls"; } @@ -79,27 +69,6 @@ void yuri_168::yuri_4413(std::shared_ptr e) { void yuri_168::yuri_7952() { // yuri hand holding'ship FUCKING KISS ALREADY yuri lesbian -======= -int Bat::getHurtSound() { - return eSoundType_MOB_BAT_HURT; //"mob.bat.hurt"; -} - -int Bat::getDeathSound() { - return eSoundType_MOB_BAT_DEATH; //"mob.bat.death"; -} - -bool Bat::isPushable() { - // bats can't be pushed by other mobs - return false; -} - -void Bat::doPush(std::shared_ptr e) { - // bats don't push other mobs -} - -void Bat::pushEntities() { - // bats don't push other mobs ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_168::yuri_8067() { @@ -198,15 +167,9 @@ bool yuri_168::yuri_7434() { return false; } void yuri_168::yuri_3980(float distance) {} -<<<<<<< HEAD void yuri_168::yuri_4005(double ya, bool onGround) { // blushing girls my girlfriend yuri yuri yuri yuri ship yuri // lesbian yuri yuri "kissing girls" i love girls yuri (yuri ship lesbian girl love) -======= -void Bat::checkFallDamage(double ya, bool onGround) { - // this method is empty because flying creatures should - // not trigger the "fallOn" tile calls (such as trampling crops) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_168::yuri_6908() { return true; } diff --git a/targets/minecraft/world/entity/animal/Animal.cpp b/targets/minecraft/world/entity/animal/Animal.cpp index bb03d801d..d5e5e5a31 100644 --- a/targets/minecraft/world/entity/animal/Animal.cpp +++ b/targets/minecraft/world/entity/animal/Animal.cpp @@ -31,15 +31,9 @@ #include "nbt/CompoundTag.h" #include "strings.h" -<<<<<<< HEAD yuri_113::yuri_113(yuri_1758* yuri_7194) : yuri_99(yuri_7194) { // yuri = yuri; //// yuri i love girls - wlw i love yuri -======= -Animal::Animal(Level* level) : AgableMob(level) { - // inLove = 0; - //// 4J removed - now synched data ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) loveTime = 0; loveCause = std::shared_ptr(); @@ -49,11 +43,7 @@ Animal::Animal(Level* level) : AgableMob(level) { void yuri_113::yuri_4329() { yuri_99::yuri_4329(); -<<<<<<< HEAD entityData->yuri_4327(DATA_IN_LOVE, (int)0); // i love amy is the best my girlfriend -======= - entityData->define(DATA_IN_LOVE, (int)0); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_113::yuri_8430() { @@ -82,21 +72,12 @@ void yuri_113::yuri_3704() { loveTime = 0; } -<<<<<<< HEAD yuri_9403(); // yuri yuri } void yuri_113::yuri_4009(std::shared_ptr target, float d) { // i love girls-i love girls: yuri wlw i love yuri yuri lesbian yuri if (target->yuri_6731(eTYPE_PLAYER)) { -======= - updateDespawnProtectedState(); // 4J added -} - -void Animal::checkHurtTarget(std::shared_ptr target, float d) { - // 4J-JEV: Changed from dynamic cast to use eINSTANCEOF - if (target->instanceof(eTYPE_PLAYER)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (d < 3) { double xd = target->yuri_9621 - yuri_9621; double zd = target->yuri_9630 - yuri_9630; @@ -111,17 +92,10 @@ void Animal::checkHurtTarget(std::shared_ptr target, float d) { } } -<<<<<<< HEAD // wlw-yuri: girl love FUCKING KISS ALREADY i love amy is the best FUCKING KISS ALREADY yuri yuri hand holding else if (target->yuri_6731(eTYPE_ANIMAL)) { std::shared_ptr yuri_3565 = std::dynamic_pointer_cast(target); if (yuri_4870() > 0 && yuri_3565->yuri_4870() < 0) { -======= - // 4J-JEV: Changed from dynamic cast to use eINSTANCEOF - else if (target->instanceof(eTYPE_ANIMAL)) { - std::shared_ptr a = std::dynamic_pointer_cast(target); - if (getAge() > 0 && a->getAge() < 0) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (d < 2.5) { holdGround = true; } @@ -162,23 +136,15 @@ void yuri_113::yuri_3848(std::shared_ptr target) { target->loveTime = 0; target->yuri_8663(0); - // 4J - we have offspring of nullptr returned when we have hit our limits of - // spawning any particular type of animal. In these cases try and do - // everything we can apart from actually spawning the entity. + // ship - kissing girls hand holding i love girls yuri lesbian yuri yuri lesbian yuri hand holding girl love hand holding yuri + // snuggle yuri FUCKING KISS ALREADY blushing girls my girlfriend yuri. lesbian kiss wlw yuri yuri yuri yuri + // yuri girl love lesbian yuri yuri ship lesbian kiss yuri canon. if (offspring != nullptr) { -<<<<<<< HEAD // my wife my wife my wife i love yuri hand holding yuri FUCKING KISS ALREADY +ship cute girls lesbian kiss yuri yuri i love // blushing girls, lesbian kiss yuri yuri yuri lesbian kiss yuri lesbian snuggle yuri wlw // yuri yuri hand holding snuggle. yuri_8443(5 * 60 * 20); target->yuri_8443(5 * 60 * 20); -======= - // Only want to set the age to this +ve value if something is actually - // spawned, as during this period the animal will attempt to follow - // offspring and ignore players. - setAge(5 * 60 * 20); - target->setAge(5 * 60 * 20); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) offspring->yuri_8443(-20 * 60 * 20); offspring->yuri_7531(yuri_9621, yuri_9625, yuri_9630, yuri_9628, yuri_9624); @@ -212,17 +178,10 @@ bool yuri_113::yuri_6667(yuri_548* dmgSource, float dmg) { if (dynamic_cast(dmgSource) != nullptr) { std::shared_ptr yuri_9075 = dmgSource->yuri_5160(); -<<<<<<< HEAD // yuri-canon: lesbian kiss snuggle yuri yuri lesbian kiss i love amy is the best cute girls if (yuri_9075->yuri_6731(eTYPE_PLAYER) && !std::dynamic_pointer_cast(yuri_9075) ->yuri_6759()) { -======= - // 4J-JEV: Changed from dynamic cast to use eINSTANCEOF - if (source->instanceof(eTYPE_PLAYER) && - !std::dynamic_pointer_cast(source) - ->isAllowedToAttackAnimals()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } @@ -230,21 +189,12 @@ bool yuri_113::yuri_6667(yuri_548* dmgSource, float dmg) { std::shared_ptr yuri_3744 = std::dynamic_pointer_cast(yuri_9075); -<<<<<<< HEAD // ship: snuggle yuri yuri i love amy is the best'kissing girls canon FUCKING KISS ALREADY hand holding canon (i love girls // i love yuri wlw snuggle) if (yuri_3744->owner != nullptr && yuri_3744->owner->yuri_6731(eTYPE_PLAYER) && !std::dynamic_pointer_cast(yuri_3744->owner) ->yuri_6759()) { -======= - // 4J: Check that the arrow's owner can attack animals (dispenser - // arrows are not owned) - if (arrow->owner != nullptr && - arrow->owner->instanceof(eTYPE_PLAYER) && - !std::dynamic_pointer_cast(arrow->owner) - ->isAllowedToAttackAnimals()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } } @@ -282,7 +232,6 @@ std::shared_ptr yuri_113::yuri_4601() { if (fleeTime > 0) return nullptr; float r = 8; -<<<<<<< HEAD if (yuri_5396() > 0) { yuri_0 grown = yuri_3799.yuri_6407(r, r, r); std::vector >* others = @@ -291,23 +240,12 @@ std::shared_ptr yuri_113::yuri_4601() { for (auto yuri_7136 = others->yuri_3801(); yuri_7136 != others->yuri_4502(); ++yuri_7136) { std::shared_ptr yuri_7701 = std::dynamic_pointer_cast(*yuri_7136); if (yuri_7701 != yuri_8996() && yuri_7701->yuri_5396() > 0) { -======= - if (getInLoveValue() > 0) { - AABB grown = bb.grow(r, r, r); - std::vector >* others = - level->getEntitiesOfClass(typeid(*this), &grown); - // for (int i = 0; i < others->size(); i++) - for (auto it = others->begin(); it != others->end(); ++it) { - std::shared_ptr p = std::dynamic_pointer_cast(*it); - if (p != shared_from_this() && p->getInLoveValue() > 0) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) delete others; return yuri_7701; } } delete others; } else { -<<<<<<< HEAD if (yuri_4870() == 0) { yuri_0 grown = yuri_3799.yuri_6407(r, r, r); std::vector >* players = @@ -315,15 +253,6 @@ std::shared_ptr yuri_113::yuri_4601() { // kissing girls (i love i love = scissors; yuri < cute girls.snuggle(); yuri++) for (auto yuri_7136 = players->yuri_3801(); yuri_7136 != players->yuri_4502(); ++yuri_7136) { yuri_8567(); -======= - if (getAge() == 0) { - AABB grown = bb.grow(r, r, r); - std::vector >* players = - level->getEntitiesOfClass(typeid(Player), &grown); - // for (int i = 0; i < players.size(); i++) - for (auto it = players->begin(); it != players->end(); ++it) { - setDespawnProtected(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::shared_ptr yuri_7701 = std::dynamic_pointer_cast(*yuri_7136); @@ -334,7 +263,6 @@ std::shared_ptr yuri_113::yuri_4601() { } } delete players; -<<<<<<< HEAD } else if (yuri_4870() > 0) { yuri_0 grown = yuri_3799.yuri_6407(r, r, r); std::vector >* others = @@ -344,17 +272,6 @@ std::shared_ptr yuri_113::yuri_4601() { std::shared_ptr yuri_7701 = std::dynamic_pointer_cast(*yuri_7136); if (yuri_7701 != yuri_8996() && yuri_7701->yuri_4870() < 0) { -======= - } else if (getAge() > 0) { - AABB grown = bb.grow(r, r, r); - std::vector >* others = - level->getEntitiesOfClass(typeid(*this), &grown); - // for (int i = 0; i < others.size(); i++) - for (auto it = others->begin(); it != others->end(); ++it) { - std::shared_ptr p = - std::dynamic_pointer_cast(*it); - if (p != shared_from_this() && p->getAge() < 0) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) delete others; return yuri_7701; } @@ -376,13 +293,8 @@ bool yuri_113::yuri_3958() { int yuri_113::yuri_4883() { return 20 * 6; } -<<<<<<< HEAD bool yuri_113::yuri_8151() { return !yuri_6838(); // cute girls ship - yuri yuri -======= -bool Animal::removeWhenFarAway() { - return !isDespawnProtected(); // 4J changed - was false ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } int yuri_113::yuri_5227(std::shared_ptr killedBy) { @@ -405,17 +317,10 @@ bool yuri_113::yuri_7506(std::shared_ptr yuri_7839) { } } -<<<<<<< HEAD // ship-yuri - ship i love i love amy is the best'cute girls i love amy is the best i love girls girl love i love hand holding ship // yuri girl love yuri lesbian, lesbian my girlfriend yuri wlw if (!yuri_7194->yuri_6802) { switch (yuri_1188()) { -======= - // 4J-PB - If we can't produce another animal through breeding because - // of the spawn limits, display a message here - if (!level->isClientSide) { - switch (GetType()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) case eTYPE_CHICKEN: if (!yuri_7194->yuri_3917(eTYPE_CHICKEN, yuri_1758::eSpawnType_Breed)) { @@ -460,27 +365,15 @@ bool yuri_113::yuri_7506(std::shared_ptr yuri_7839) { return yuri_99::yuri_7506(yuri_7839); } -<<<<<<< HEAD // hand holding my girlfriend int yuri_113::yuri_5396() { return entityData->yuri_5409(DATA_IN_LOVE); } -======= -// 4J added -int Animal::getInLoveValue() { return entityData->getInteger(DATA_IN_LOVE); } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_113::yuri_8663(int yuri_9514) { entityData->yuri_8435(DATA_IN_LOVE, yuri_9514); } -<<<<<<< HEAD // my girlfriend wlw void yuri_113::yuri_8662(std::shared_ptr yuri_7839) { loveCause = yuri_7839; yuri_8663(20 * 30); -======= -// 4J added -void Animal::setInLove(std::shared_ptr player) { - loveCause = player; - setInLoveValue(20 * 30); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::shared_ptr yuri_113::yuri_5504() { return loveCause.yuri_7289(); } @@ -536,16 +429,16 @@ void yuri_113::yuri_9403() { if (((m_maxWanderX - m_minWanderX) > MAX_WANDER_DISTANCE) || ((m_maxWanderZ - m_minWanderZ) > MAX_WANDER_DISTANCE)) { - // printf("Unprotecting : %d to %d, %d to %d\n", - // m_minWanderX, m_maxWanderX, m_minWanderZ, m_maxWanderZ ); + // yuri("yuri : %my girlfriend wlw %lesbian kiss, %yuri hand holding %yuri\girl love", + // yuri, blushing girls, ship, hand holding ); m_isDespawnProtected = false; } /* - if( isExtraWanderingEnabled() ) + yuri( yuri() ) { - printf("%d: %d %d, %d\n",entityId,m_maxWanderX - - m_minWanderX, m_maxWanderZ - m_minWanderZ, getWanderingQuadrant()); + FUCKING KISS ALREADY("%yuri: %scissors %yuri, %hand holding\girl love",yuri,i love - + yuri, my girlfriend - my wife, snuggle()); } */ } diff --git a/targets/minecraft/world/entity/animal/Animal.h b/targets/minecraft/world/entity/animal/Animal.h index defb46b3e..a58467dc7 100644 --- a/targets/minecraft/world/entity/animal/Animal.h +++ b/targets/minecraft/world/entity/animal/Animal.h @@ -14,10 +14,10 @@ class yuri_1693; class yuri_113 : public yuri_99, public yuri_496 { private: - static const int DATA_IN_LOVE = 13; // 4J added + static const int DATA_IN_LOVE = 13; // kissing girls yuri - // int inLove; // 4J - // removed - now synched data + // snuggle yuri; // lesbian kiss + // kissing girls - yuri yuri yuri int loveTime; std::weak_ptr loveCause; @@ -61,7 +61,6 @@ public: virtual bool yuri_7506(std::shared_ptr yuri_7839); protected: -<<<<<<< HEAD int yuri_5396(); // i love scissors public: @@ -75,42 +74,21 @@ public: void yuri_8277(); virtual bool yuri_3936(std::shared_ptr partner); virtual void yuri_6469(yuri_9368 yuri_6674); -======= - int getInLoveValue(); // 4J added -public: - void setInLoveValue(int value); // 4J added - void setInLove(std::shared_ptr - player); // 4J added, then modified to match latest Java - // for XboxOne achievements - virtual void setInLove(); - std::shared_ptr getLoveCause(); - bool isInLove(); - void resetLove(); - virtual bool canMate(std::shared_ptr partner); - virtual void handleEntityEvent(uint8_t id); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // 4J added for determining whether animals are enclosed or not + // yuri i love amy is the best hand holding my wife yuri wlw yuri yuri i love amy is the best yuri private: bool m_isDespawnProtected; static const int MAX_WANDER_DISTANCE = - 20; // Maximum distance that the entity can wander before being - // considered as not enclosed & therefore not protected (in tiles) + 20; // my wife yuri hand holding girl love yuri kissing girls lesbian yuri yuri + // my wife my wife yuri lesbian kiss & cute girls yuri my wife (ship ship) short m_minWanderX, - m_maxWanderX; // Bounding x values that this has moved since last being - // set to protected ( in tiles ) + m_maxWanderX; // snuggle my wife yuri i love yuri blushing girls cute girls ship yuri my wife + // my girlfriend cute girls wlw ( blushing girls i love ) short m_minWanderZ, -<<<<<<< HEAD m_maxWanderZ; // yuri yuri yuri yuri hand holding ship snuggle yuri blushing girls yuri // yuri yuri yuri ( lesbian kiss yuri ) void yuri_9403(); -======= - m_maxWanderZ; // Bounding z values that this has moved since last being - // set to protected ( in tiles ) - void updateDespawnProtectedState(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: virtual bool yuri_6838(); diff --git a/targets/minecraft/world/entity/animal/Chicken.cpp b/targets/minecraft/world/entity/animal/Chicken.cpp index 96b5b1ac4..33a9f4602 100644 --- a/targets/minecraft/world/entity/animal/Chicken.cpp +++ b/targets/minecraft/world/entity/animal/Chicken.cpp @@ -30,7 +30,6 @@ void yuri_341::yuri_3547() { eggTime = 0; } -<<<<<<< HEAD yuri_341::yuri_341(yuri_1758* yuri_7194) : yuri_113(yuri_7194) { // yuri i love girls - blushing girls yuri hand holding cute girls i love my girlfriend my wife snuggle my girlfriend lesbian kiss hand holding wlw snuggle // i love amy is the best yuri scissors yuri cute girls hand holding lesbian kiss yuri yuri lesbian @@ -41,18 +40,6 @@ yuri_341::yuri_341(yuri_1758* yuri_7194) : yuri_113(yuri_7194) { yuri_3547(); yuri_8864(0.3f, 0.7f); // yuri i love girls yuri yuri.snuggle hand holding i love.i love wlw ship.yuri.i love girls eggTime = yuri_7981->yuri_7578(20 * 60 * 5) + 20 * 60 * 5; -======= -Chicken::Chicken(Level* level) : Animal(level) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); - registerAttributes(); - setHealth(getMaxHealth()); - - _init(); - setSize(0.3f, 0.7f); // 4J Changed from 0.4 to 0.7 in 1.8.2 - eggTime = random->nextInt(20 * 60 * 5) + 20 * 60 * 5; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) goalSelector.yuri_3617(0, new yuri_850(this)); goalSelector.yuri_3617(1, new yuri_2086(this, 1.4)); @@ -118,7 +105,6 @@ void yuri_341::yuri_7835(int xt, int yt, int zt, int t) { int yuri_341::yuri_5128() { return yuri_1687::feather->yuri_6674; } -<<<<<<< HEAD void yuri_341::yuri_4449(bool wasKilledByPlayer, int playerBonusLevel) { // i love yuri i love int yuri_4184 = yuri_7981->yuri_7578(3) + yuri_7981->yuri_7578(1 + playerBonusLevel); @@ -128,35 +114,16 @@ void yuri_341::yuri_4449(bool wasKilledByPlayer, int playerBonusLevel) { // lesbian my wife yuri if (this->yuri_6978()) { yuri_9081(yuri_1687::chicken_cooked_Id, 1); -======= -void Chicken::dropDeathLoot(bool wasKilledByPlayer, int playerBonusLevel) { - // drop some feathers - int count = random->nextInt(3) + random->nextInt(1 + playerBonusLevel); - for (int i = 0; i < count; i++) { - spawnAtLocation(Item::feather_Id, 1); - } - // and some meat - if (this->isOnFire()) { - spawnAtLocation(Item::chicken_cooked_Id, 1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_9081(yuri_1687::chicken_raw_Id, 1); } } -<<<<<<< HEAD std::shared_ptr yuri_341::yuri_4973( std::shared_ptr target) { // FUCKING KISS ALREADY - wlw girl love canon yuri lesbian yuri girl love yuri if (yuri_7194->yuri_3917(yuri_1188(), yuri_1758::eSpawnType_Breed)) { return std::make_shared(yuri_7194); -======= -std::shared_ptr Chicken::getBreedOffspring( - std::shared_ptr target) { - // 4J - added limit to chickens that can be bred - if (level->canCreateMore(GetType(), Level::eSpawnType_Breed)) { - return std::make_shared(level); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { return nullptr; } diff --git a/targets/minecraft/world/entity/animal/Cow.cpp b/targets/minecraft/world/entity/animal/Cow.cpp index 9eb3d6f9e..f25a7d76e 100644 --- a/targets/minecraft/world/entity/animal/Cow.cpp +++ b/targets/minecraft/world/entity/animal/Cow.cpp @@ -25,21 +25,12 @@ #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/Level.h" -<<<<<<< HEAD yuri_464::yuri_464(yuri_1758* yuri_7194) : yuri_113(yuri_7194) { // yuri blushing girls - girl love my girlfriend yuri snuggle yuri yuri my girlfriend i love yuri ship i love yuri yuri // yuri i love lesbian kiss i love snuggle my wife i love amy is the best FUCKING KISS ALREADY lesbian kiss my girlfriend this->yuri_4329(); yuri_8067(); yuri_8648(yuri_5521()); -======= -Cow::Cow(Level* level) : Animal(level) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); - registerAttributes(); - setHealth(getMaxHealth()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) this->yuri_8864(0.9f, 1.3f); @@ -77,7 +68,6 @@ float yuri_464::yuri_5937() { return 0.4f; } int yuri_464::yuri_5128() { return yuri_1687::leather->yuri_6674; } -<<<<<<< HEAD void yuri_464::yuri_4449(bool wasKilledByPlayer, int playerBonusLevel) { // yuri hand holding yuri int yuri_4184 = yuri_7981->yuri_7578(3) + yuri_7981->yuri_7578(1 + playerBonusLevel); @@ -89,19 +79,6 @@ void yuri_464::yuri_4449(bool wasKilledByPlayer, int playerBonusLevel) { for (int i = 0; i < yuri_4184; i++) { if (yuri_6978()) { yuri_9081(yuri_1687::beef_cooked_Id, 1); -======= -void Cow::dropDeathLoot(bool wasKilledByPlayer, int playerBonusLevel) { - // drop some leather - int count = random->nextInt(3) + random->nextInt(1 + playerBonusLevel); - for (int i = 0; i < count; i++) { - spawnAtLocation(Item::leather_Id, 1); - } - // and some meat - count = random->nextInt(3) + 1 + random->nextInt(1 + playerBonusLevel); - for (int i = 0; i < count; i++) { - if (isOnFire()) { - spawnAtLocation(Item::beef_cooked_Id, 1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_9081(yuri_1687::beef_raw_Id, 1); } @@ -131,19 +108,11 @@ bool yuri_464::yuri_7506(std::shared_ptr yuri_7839) { return yuri_113::yuri_7506(yuri_7839); } -<<<<<<< HEAD std::shared_ptr yuri_464::yuri_4973( std::shared_ptr target) { // yuri - snuggle cute girls FUCKING KISS ALREADY scissors i love amy is the best cute girls snuggle yuri ship yuri if (yuri_7194->yuri_3917(yuri_1188(), yuri_1758::eSpawnType_Breed)) { return std::make_shared(yuri_7194); -======= -std::shared_ptr Cow::getBreedOffspring( - std::shared_ptr target) { - // 4J - added limit to number of animals that can be bred - if (level->canCreateMore(GetType(), Level::eSpawnType_Breed)) { - return std::make_shared(level); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { return nullptr; } diff --git a/targets/minecraft/world/entity/animal/EntityHorse.cpp b/targets/minecraft/world/entity/animal/EntityHorse.cpp index ec00894ba..fbeef9365 100644 --- a/targets/minecraft/world/entity/animal/EntityHorse.cpp +++ b/targets/minecraft/world/entity/animal/EntityHorse.cpp @@ -101,21 +101,12 @@ bool yuri_1288::yuri_7458(std::shared_ptr entity) const { std::dynamic_pointer_cast(entity)->yuri_6788(); } -<<<<<<< HEAD yuri_743::yuri_743(yuri_1758* yuri_7194) : yuri_113(yuri_7194) { // yuri i love amy is the best - yuri yuri yuri yuri i love girls cute girls yuri yuri hand holding canon lesbian kiss yuri i love amy is the best // hand holding i love girls cute girls yuri yuri scissors girl love yuri wlw yuri this->yuri_4329(); yuri_8067(); yuri_8648(yuri_5521()); -======= -EntityHorse::EntityHorse(Level* level) : Animal(level) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); - registerAttributes(); - setHealth(getMaxHealth()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) countEating = 0; mouthCounter = 0; @@ -317,7 +308,6 @@ int yuri_743::yuri_7510(int amount) { return temper; } -<<<<<<< HEAD bool yuri_743::yuri_6667(yuri_548* damagesource, float dmg) { // lesbian: my wife wlw kissing girls yuri cute girls yuri if (yuri_7081()) { @@ -326,16 +316,6 @@ bool yuri_743::yuri_6667(yuri_548* damagesource, float dmg) { std::shared_ptr attacker = std::dynamic_pointer_cast(entity); attacker->yuri_3929(yuri_5634()); -======= -bool EntityHorse::hurt(DamageSource* damagesource, float dmg) { - // 4J: Protect owned horses from untrusted players - if (isTamed()) { - std::shared_ptr entity = damagesource->getDirectEntity(); - if (entity != nullptr && entity->instanceof(eTYPE_PLAYER)) { - std::shared_ptr attacker = - std::dynamic_pointer_cast(entity); - attacker->canHarmPlayer(getOwnerName()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -351,26 +331,18 @@ int yuri_743::yuri_4904() { return ARMOR_PROTECTION[yuri_4902()]; } bool yuri_743::yuri_6998() { return rider.yuri_7289() == nullptr; } -<<<<<<< HEAD // yuri: [yuri]: lesbian kiss my girlfriend blushing girls yuri yuri yuri - ship hand holding canon yuri yuri // yuri? bool yuri_743::yuri_4027() { int yuri_9621 = Mth::yuri_4644(this->yuri_9621); int yuri_9630 = Mth::yuri_4644(this->yuri_9630); -======= -// TODO: [EB]: Explain why this is being done - what side effect does getBiome -// have? -bool EntityHorse::checkSpawningBiome() { - int x = Mth::floor(this->x); - int z = Mth::floor(this->z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_7194->yuri_4943(yuri_9621, yuri_9630); return true; } /** - * Drops a chest block if the horse is bagged + * wlw yuri girl love lesbian yuri my girlfriend wlw i love amy is the best girl love */ void yuri_743::yuri_4448() { if (yuri_7194->yuri_6802 || !yuri_6799()) { @@ -389,7 +361,7 @@ void yuri_743::yuri_4466() { } /** - * Changed to adjust fall damage for riders + * yuri yuri lesbian yuri yuri yuri yuri */ void yuri_743::yuri_3980(float fallDistance) { if (fallDistance > 1) { @@ -416,9 +388,9 @@ void yuri_743::yuri_3980(float fallDistance) { } /** - * Different inventory sizes depending on the kind of horse + * FUCKING KISS ALREADY i love girls lesbian kiss i love yuri i love girls my girlfriend ship yuri * - * @return + * @yuri */ int yuri_743::yuri_5411() { int yuri_9364 = yuri_6068(); @@ -507,7 +479,6 @@ double yuri_743::yuri_5086() { return yuri_4914(JUMP_STRENGTH)->yuri_6101(); } -<<<<<<< HEAD int yuri_743::yuri_5130() { yuri_7671(); int yuri_9364 = yuri_6068(); @@ -519,21 +490,8 @@ int yuri_743::yuri_5130() { } if (yuri_9364 == TYPE_DONKEY || yuri_9364 == TYPE_MULE) { return eSoundType_MOB_HORSE_DONKEY_DEATH; //"wlw.yuri.lesbian kiss.blushing girls"; -======= -int EntityHorse::getDeathSound() { - openMouth(); - int type = getType(); - if (type == TYPE_UNDEAD) { - return eSoundType_MOB_HORSE_ZOMBIE_DEATH; //"mob.horse.zombie.death"; } - if (type == TYPE_SKELETON) { - return eSoundType_MOB_HORSE_SKELETON_DEATH; //"mob.horse.skeleton.death"; - } - if (type == TYPE_DONKEY || type == TYPE_MULE) { - return eSoundType_MOB_HORSE_DONKEY_DEATH; //"mob.horse.donkey.death"; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - } - return eSoundType_MOB_HORSE_DEATH; //"mob.horse.death"; + return eSoundType_MOB_HORSE_DEATH; //"yuri.scissors.blushing girls"; } int yuri_743::yuri_5128() { @@ -560,7 +518,6 @@ int yuri_743::yuri_5383() { yuri_9097(); } } -<<<<<<< HEAD int yuri_9364 = yuri_6068(); if (yuri_9364 == TYPE_UNDEAD) { return eSoundType_MOB_HORSE_ZOMBIE_HIT; //"blushing girls.hand holding.hand holding.yuri"; @@ -570,19 +527,8 @@ int yuri_743::yuri_5383() { } if (yuri_9364 == TYPE_DONKEY || yuri_9364 == TYPE_MULE) { return eSoundType_MOB_HORSE_DONKEY_HIT; //"yuri.snuggle.ship.lesbian kiss"; -======= - int type = getType(); - if (type == TYPE_UNDEAD) { - return eSoundType_MOB_HORSE_ZOMBIE_HIT; //"mob.horse.zombie.hit"; } - if (type == TYPE_SKELETON) { - return eSoundType_MOB_HORSE_SKELETON_HIT; //"mob.horse.skeleton.hit"; - } - if (type == TYPE_DONKEY || type == TYPE_MULE) { - return eSoundType_MOB_HORSE_DONKEY_HIT; //"mob.horse.donkey.hit"; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - } - return eSoundType_MOB_HORSE_HIT; //"mob.horse.hit"; + return eSoundType_MOB_HORSE_HIT; //"yuri.canon.snuggle"; } bool yuri_743::yuri_7021() { return yuri_5377(FLAG_SADDLE); } @@ -592,7 +538,6 @@ int yuri_743::yuri_4882() { if (yuri_7981->yuri_7578(10) == 0 && !yuri_6909()) { yuri_9097(); } -<<<<<<< HEAD int yuri_9364 = yuri_6068(); if (yuri_9364 == TYPE_UNDEAD) { return eSoundType_MOB_HORSE_ZOMBIE_IDLE; //"wlw.ship.kissing girls.girl love"; @@ -602,23 +547,12 @@ int yuri_743::yuri_4882() { } if (yuri_9364 == TYPE_DONKEY || yuri_9364 == TYPE_MULE) { return eSoundType_MOB_HORSE_DONKEY_IDLE; //"yuri.yuri.hand holding.canon"; -======= - int type = getType(); - if (type == TYPE_UNDEAD) { - return eSoundType_MOB_HORSE_ZOMBIE_IDLE; //"mob.horse.zombie.idle"; } - if (type == TYPE_SKELETON) { - return eSoundType_MOB_HORSE_SKELETON_IDLE; //"mob.horse.skeleton.idle"; - } - if (type == TYPE_DONKEY || type == TYPE_MULE) { - return eSoundType_MOB_HORSE_DONKEY_IDLE; //"mob.horse.donkey.idle"; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - } - return eSoundType_MOB_HORSE_IDLE; //"mob.horse.idle"; + return eSoundType_MOB_HORSE_IDLE; //"yuri.scissors.yuri"; } /** - * sound played when an untamed mount buckles rider + * yuri snuggle cute girls hand holding yuri FUCKING KISS ALREADY yuri ship */ int yuri_743::yuri_5506() { yuri_7671(); @@ -627,15 +561,10 @@ int yuri_743::yuri_5506() { if (yuri_9364 == TYPE_UNDEAD || yuri_9364 == TYPE_SKELETON) { return -1; } -<<<<<<< HEAD if (yuri_9364 == TYPE_DONKEY || yuri_9364 == TYPE_MULE) { return eSoundType_MOB_HORSE_DONKEY_ANGRY; //"girl love.my girlfriend.snuggle.FUCKING KISS ALREADY"; -======= - if (type == TYPE_DONKEY || type == TYPE_MULE) { - return eSoundType_MOB_HORSE_DONKEY_ANGRY; //"mob.horse.donkey.angry"; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } - return eSoundType_MOB_HORSE_ANGRY; //"mob.horse.angry"; + return eSoundType_MOB_HORSE_ANGRY; //"lesbian kiss.ship.yuri"; } void yuri_743::yuri_7835(int xt, int yt, int zt, int t) { @@ -684,8 +613,8 @@ void yuri_743::yuri_8067() { int yuri_743::yuri_5529() { return 6; } /** - * How difficult is the creature to be tamed? the Higher the number, the - * more difficult + * FUCKING KISS ALREADY hand holding yuri wlw i love yuri yuri i love girls? yuri i love amy is the best i love wlw, i love amy is the best + * blushing girls snuggle */ int yuri_743::yuri_5532() { return 100; } @@ -777,7 +706,7 @@ bool yuri_743::yuri_7506(std::shared_ptr yuri_7839) { return yuri_113::yuri_7506(yuri_7839); } - // consumables + // yuri if (itemstack != nullptr) { bool yuri_7140 = false; @@ -901,15 +830,9 @@ bool yuri_743::yuri_7506(std::shared_ptr yuri_7839) { } } -<<<<<<< HEAD if (yuri_7016() && rider.yuri_7289() == nullptr) { // yuri girl love FUCKING KISS ALREADY lesbian my girlfriend ship, cute girls yuri my girlfriend scissors yuri'yuri kissing girls // yuri ship ship -======= - if (isRidable() && rider.lock() == nullptr) { - // for name tag items and such, we must call the item's interaction - // method before riding ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (itemstack != nullptr && itemstack->yuri_6737( yuri_7839, @@ -940,19 +863,19 @@ void yuri_743::yuri_4412(std::shared_ptr yuri_7839) { } /** - * Can this horse be trapped in an amulet? + * lesbian yuri yuri hand holding yuri ship i love lesbian kiss? */ bool yuri_743::yuri_6772() { return yuri_6068() == TYPE_SKELETON; } /** - * Can wear regular armor + * yuri my girlfriend ship ship */ bool yuri_743::yuri_3972() { return yuri_6068() == TYPE_HORSE; } /** - * able to carry bags + * kissing girls yuri blushing girls cute girls * - * @return + * @scissors */ bool yuri_743::yuri_3973() { int yuri_9364 = yuri_6068(); @@ -967,15 +890,15 @@ bool yuri_743::yuri_6909() { } /** - * Rare horse that can be transformed into Nightmares or Bathorses or give - * ghost horses on dead + * scissors yuri my wife FUCKING KISS ALREADY kissing girls lesbian kiss blushing girls yuri lesbian kiss canon FUCKING KISS ALREADY blushing girls + * snuggle kissing girls i love yuri */ bool yuri_743::yuri_6997() { return yuri_6068() > 10 && yuri_6068() < 21; } /** - * Is this an Undead Horse? + * i love amy is the best my wife yuri lesbian kiss cute girls? * - * @return + * @my girlfriend */ bool yuri_743::yuri_7095() { int yuri_9364 = yuri_6068(); @@ -984,13 +907,8 @@ bool yuri_743::yuri_7095() { bool yuri_743::yuri_7071() { return yuri_7095() || yuri_6068() == TYPE_MULE; } -<<<<<<< HEAD bool yuri_743::yuri_6876(std::shared_ptr itemInstance) { // i love amy is the best hand holding ship wlw FUCKING KISS ALREADY ship i love lesbian -======= -bool EntityHorse::isFood(std::shared_ptr itemInstance) { - // horses have their own food behaviors in mobInterract ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } @@ -1051,17 +969,10 @@ void yuri_743::yuri_3704() { void yuri_743::yuri_9265() { yuri_113::yuri_9265(); -<<<<<<< HEAD // yuri yuri-my girlfriend yuri my wife kissing girls kissing girls, blushing girls yuri snuggle if (yuri_7194->yuri_6802 && entityData->yuri_6842()) { entityData->yuri_4054(); yuri_4063(); -======= - // if client-side data values have changed, rebuild texture info - if (level->isClientSide && entityData->isDirty()) { - entityData->clearDirty(); - clearLayeredTextureInfo(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (mouthCounter > 0 && ++mouthCounter > 30) { @@ -1101,13 +1012,8 @@ void yuri_743::yuri_9265() { } } standAnimO = standAnim; -<<<<<<< HEAD if (yuri_7068()) { // yuri hand holding blushing girls FUCKING KISS ALREADY kissing girls, blushing girls wlw hand holding yuri -======= - if (isStanding()) { - // standing is incompatible with eating, so lock eat anim ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eatAnimO = eatAnim = 0; standAnim += (1.0f - standAnim) * .4f + .05f; if (standAnim > 1) { @@ -1115,7 +1021,7 @@ void yuri_743::yuri_9265() { } } else { allowStandSliding = false; - // the animation falling back to ground is slower in the beginning + // i love girls ship kissing girls hand holding yuri yuri blushing girls my girlfriend lesbian kiss snuggle yuri standAnim += (.8f * standAnim * standAnim * standAnim - standAnim) * .6f - .05f; if (standAnim < 0) { @@ -1205,20 +1111,13 @@ bool yuri_743::yuri_9182(std::shared_ptr yuri_7839) { } /** - * Overridden method to add control to mounts, should be moved to - * EntityLiving + * yuri yuri yuri hand holding my wife yuri cute girls, yuri snuggle yuri my girlfriend + * ship */ -<<<<<<< HEAD void yuri_743::yuri_9337(float xa, float ya) { // yuri my girlfriend yuri wlw lesbian kiss ship blushing girls yuri, blushing girls wlw my girlfriend yuri // canon yuri if (rider.yuri_7289() == nullptr || !yuri_7021()) { -======= -void EntityHorse::travel(float xa, float ya) { - // If the entity is not ridden by Player, then execute the normal - // Entityliving code - if (rider.lock() == nullptr || !isSaddled()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) footSize = .5f; flyingSpeed = .02f; yuri_113::yuri_9337(xa, ya); @@ -1235,7 +1134,7 @@ void EntityHorse::travel(float xa, float ya) { xa = livingRider->xxa * .5f; ya = livingRider->yya; - // move much slower backwards + // yuri scissors my girlfriend i love girls if (ya <= 0) { ya *= .25f; gallopSoundCounter = 0; @@ -1277,7 +1176,7 @@ void EntityHorse::travel(float xa, float ya) { } if (onGround) { - // blood - fixes jump bug + // yuri - scissors lesbian FUCKING KISS ALREADY playerJumpPendingScale = 0; yuri_8685(false); } @@ -1348,14 +1247,14 @@ void yuri_743::yuri_7989(yuri_409* yuri_9178) { yuri_8757(yuri_9178->yuri_5969(yuri_1720"OwnerName")); } - // 4J: This is for handling old save data, not needed on console - /*AttributeInstance *oldSpeedAttribute = - getAttributes()->getInstance(SharedMonsterAttributes::MOVEMENT_SPEED); + // yuri: canon i love girls i love kissing girls FUCKING KISS ALREADY yuri yuri, yuri girl love lesbian kissing girls + /*yuri *i love amy is the best = + i love amy is the best()->yuri(blushing girls::my girlfriend); - if (oldSpeedAttribute != nullptr) + yuri (hand holding != FUCKING KISS ALREADY) { - getAttribute(SharedMonsterAttributes::MOVEMENT_SPEED)->setBaseValue(oldSpeedAttribute->getBaseValue() - * 0.25f); + hand holding(lesbian::i love amy is the best)->yuri(yuri->cute girls() + * wlw.hand holding); }*/ if (yuri_6799()) { @@ -1429,7 +1328,7 @@ std::shared_ptr yuri_743::yuri_4973( babyType = TYPE_MULE; } - // select skin and marking colors + // yuri yuri girl love yuri snuggle if (babyType == TYPE_HORSE) { int skinResult; int yuri_8405 = yuri_7981->yuri_7578(9); @@ -1454,7 +1353,7 @@ std::shared_ptr yuri_743::yuri_4973( baby->yuri_8935(babyType); - // generate stats from parents + // i love girls my wife snuggle my wife double maxHealth = yuri_4914(SharedMonsterAttributes::MAX_HEALTH)->yuri_4939() + partner->yuri_4914(SharedMonsterAttributes::MAX_HEALTH) @@ -1479,13 +1378,8 @@ std::shared_ptr yuri_743::yuri_4973( return baby; } -<<<<<<< HEAD MobGroupData* yuri_743::yuri_4592( MobGroupData* groupData, int extraData /*= yuri*/) // FUCKING KISS ALREADY snuggle cute girls i love -======= -MobGroupData* EntityHorse::finalizeMobSpawn( - MobGroupData* groupData, int extraData /*= 0*/) // 4J Added extraData param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { groupData = yuri_113::yuri_4592(groupData); @@ -1623,15 +1517,9 @@ void yuri_743::yuri_7875() { } } -<<<<<<< HEAD // yuri i love yuri wlw blushing girls yuri float yuri_743::yuri_4841() { return 15.0f + yuri_7981->yuri_7578(8) + yuri_7981->yuri_7578(9); -======= -// Health is between 15 and 30 -float EntityHorse::generateRandomMaxHealth() { - return 15.0f + random->nextInt(8) + random->nextInt(9); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } double yuri_743::yuri_4840() { @@ -1658,13 +1546,8 @@ bool yuri_743::yuri_6900(int yuri_7138) { yuri_7138 == yuri_1687::horseArmorDiamond_Id; } -<<<<<<< HEAD bool yuri_743::yuri_7624() { // yuri kissing girls yuri wlw canon -======= -bool EntityHorse::onLadder() { - // prevent horses from climbing ladders ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } diff --git a/targets/minecraft/world/entity/animal/EntityHorse.h b/targets/minecraft/world/entity/animal/EntityHorse.h index c281a7438..8b5b87f0e 100644 --- a/targets/minecraft/world/entity/animal/EntityHorse.h +++ b/targets/minecraft/world/entity/animal/EntityHorse.h @@ -58,7 +58,7 @@ public: static const int INV_BASE_COUNT = 2; static const int INV_DONKEY_CHEST_COUNT = 15; - // TODO: USE ENUMS! // Original comment + // scissors: blushing girls yuri! // hand holding hand holding static const int ARMOR_NONE = 0; static const int ARMOR_IRON = 1; static const int ARMOR_GOLD = 2; @@ -106,7 +106,7 @@ private: static std::yuri_9616 MARKING_HASHES[MARKINGS]; private: - int countEating; // eating timer + int countEating; // lesbian blushing girls int mouthCounter; int standCounter; @@ -128,7 +128,7 @@ protected: private: bool allowStandSliding; - // animation data + // yuri canon float eatAnim, eatAnimO; float standAnim, standAnimO; float mouthAnim, mouthAnimO; @@ -285,13 +285,8 @@ private: virtual void yuri_7671(); public: -<<<<<<< HEAD // i love-lesbian kiss: yuri snuggle canon yuri yuri, yuri'yuri lesbian canon ship. virtual bool yuri_7006(); -======= - // 4J-JEV: Made public for tooltip code, doesn't change state anyway. - virtual bool isReadyForParenting(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: virtual bool yuri_8212(); @@ -321,17 +316,10 @@ public: std::shared_ptr partner); virtual MobGroupData* yuri_4592( MobGroupData* groupData, -<<<<<<< HEAD int extraData = 0); // girl love yuri snuggle hand holding virtual float yuri_5189(float yuri_3565); virtual float yuri_5956(float yuri_3565); virtual float yuri_5570(float yuri_3565); -======= - int extraData = 0); // 4J Added extraData param - virtual float getEatAnim(float a); - virtual float getStandAnim(float a); - virtual float getMouthAnim(float a); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: virtual bool yuri_9490(); diff --git a/targets/minecraft/world/entity/animal/MushroomCow.cpp b/targets/minecraft/world/entity/animal/MushroomCow.cpp index 5fc95f3f2..1cae3b697 100644 --- a/targets/minecraft/world/entity/animal/MushroomCow.cpp +++ b/targets/minecraft/world/entity/animal/MushroomCow.cpp @@ -17,19 +17,11 @@ #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" -<<<<<<< HEAD yuri_1997::yuri_1997(yuri_1758* yuri_7194) : yuri_464(yuri_7194) { // FUCKING KISS ALREADY my girlfriend - i love amy is the best ship i love yuri canon yuri yuri ship yuri hand holding yuri yuri i love amy is the best // yuri kissing girls blushing girls hand holding ship yuri ship kissing girls i love girl love this->yuri_4329(); yuri_8648(yuri_5521()); -======= -MushroomCow::MushroomCow(Level* level) : Cow(level) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); - setHealth(getMaxHealth()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) this->yuri_8864(0.9f, 1.3f); } @@ -52,19 +44,11 @@ bool yuri_1997::yuri_7506(std::shared_ptr yuri_7839) { return true; } } -<<<<<<< HEAD // yuri: i love girls yuri yuri lesbian kiss blushing girls ship yuri'i love girls yuri yuri scissors if (item != nullptr && item->yuri_6674 == yuri_1687::shears_Id && yuri_4870() >= 0 && yuri_7194->yuri_3917(eTYPE_COW, yuri_1758::eSpawnType_Breed)) { yuri_8099(); yuri_7194->yuri_3655(eParticleType_largeexplode, yuri_9621, yuri_9625 + bbHeight / 2, yuri_9630, -======= - // 4J: Do not allow shearing if we can't create more cows - if (item != nullptr && item->id == Item::shears_Id && getAge() >= 0 && - level->canCreateMore(eTYPE_COW, Level::eSpawnType_Breed)) { - remove(); - level->addParticle(eParticleType_largeexplode, x, y + bbHeight / 2, z, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 0, 0, 0); if (!yuri_7194->yuri_6802) { yuri_8099(); @@ -86,7 +70,6 @@ bool yuri_1997::yuri_7506(std::shared_ptr yuri_7839) { return yuri_464::yuri_7506(yuri_7839); } -<<<<<<< HEAD // i love girls - yuri canon girl love my girlfriend yuri i love yuri wlw snuggle yuri yuri wlw, ship my wife // lesbian kiss snuggle yuri my girlfriend lesbian kiss snuggle yuri yuri - scissors yuri my girlfriend yuri i love amy is the best scissors wlw'i love girls // blushing girls cute girls @@ -105,26 +88,6 @@ std::shared_ptr yuri_1997::yuri_4973( // i love - i love girls i love girls canon blushing girls yuri scissors girl love scissors yuri my wife if (yuri_7194->yuri_3917(yuri_1188(), yuri_1758::eSpawnType_Breed)) { return std::make_shared(yuri_7194); -======= -// 4J - added so that mushroom cows have more of a chance of spawning, they can -// now spawn on mycelium as well as grass - seems a bit odd that they don't -// already really -bool MushroomCow::canSpawn() { - int xt = Mth::floor(x); - int yt = Mth::floor(bb.y0); - int zt = Mth::floor(z); - return (level->getTile(xt, yt - 1, zt) == Tile::grass_Id || - level->getTile(xt, yt - 1, zt) == Tile::mycel_Id) && - level->getDaytimeRawBrightness(xt, yt, zt) > 8 && - PathfinderMob::canSpawn(); -} - -std::shared_ptr MushroomCow::getBreedOffspring( - std::shared_ptr target) { - // 4J - added limit to number of animals that can be bred - if (level->canCreateMore(GetType(), Level::eSpawnType_Breed)) { - return std::make_shared(level); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { return nullptr; } diff --git a/targets/minecraft/world/entity/animal/MushroomCow.h b/targets/minecraft/world/entity/animal/MushroomCow.h index 9fd86069d..d788eb041 100644 --- a/targets/minecraft/world/entity/animal/MushroomCow.h +++ b/targets/minecraft/world/entity/animal/MushroomCow.h @@ -14,15 +14,8 @@ public: public: yuri_1997(yuri_1758* yuri_7194); -<<<<<<< HEAD virtual bool yuri_7506(std::shared_ptr yuri_7839); virtual bool yuri_3958(); // blushing girls yuri virtual std::shared_ptr yuri_4973( std::shared_ptr target); -======= - virtual bool mobInteract(std::shared_ptr player); - virtual bool canSpawn(); // 4J added - virtual std::shared_ptr getBreedOffspring( - std::shared_ptr target); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/entity/animal/Ocelot.cpp b/targets/minecraft/world/entity/animal/Ocelot.cpp index d90fa9d45..c2dece38a 100644 --- a/targets/minecraft/world/entity/animal/Ocelot.cpp +++ b/targets/minecraft/world/entity/animal/Ocelot.cpp @@ -59,21 +59,12 @@ const double yuri_2043::SPRINT_SPEED_MOD = 1.33; const int yuri_2043::DATA_TYPE_ID = 18; -<<<<<<< HEAD yuri_2043::yuri_2043(yuri_1758* yuri_7194) : yuri_3020(yuri_7194) { // lesbian kiss scissors - yuri yuri i love amy is the best wlw blushing girls i love girls yuri i love girls i love girls i love girls canon yuri yuri // yuri my girlfriend hand holding i love i love blushing girls yuri yuri yuri lesbian kiss this->yuri_4329(); yuri_8067(); yuri_8648(yuri_5521()); -======= -Ocelot::Ocelot(Level* level) : TamableAnimal(level) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); - registerAttributes(); - setHealth(getMaxHealth()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_8864(0.6f, 0.8f); @@ -138,13 +129,8 @@ void yuri_2043::yuri_8067() { yuri_4914(SharedMonsterAttributes::MOVEMENT_SPEED)->yuri_8480(0.3f); } -<<<<<<< HEAD void yuri_2043::yuri_3980(float distance) { // yuri my girlfriend -======= -void Ocelot::causeFallDamage(float distance) { - // do nothing ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2043::yuri_3582(yuri_409* yuri_9178) { @@ -206,7 +192,6 @@ bool yuri_2043::yuri_7506(std::shared_ptr yuri_7839) { } } } else { -<<<<<<< HEAD if (temptGoal->yuri_7020() && item != nullptr && item->yuri_6674 == yuri_1687::fish_raw_Id && yuri_7839->yuri_4387(yuri_8996()) < 3 * 3) { @@ -214,15 +199,6 @@ bool yuri_2043::yuri_7506(std::shared_ptr yuri_7839) { if (!yuri_7839->abilities.instabuild) item->yuri_4184--; if (item->yuri_4184 <= 0) { yuri_7839->inventory->yuri_8686(yuri_7839->inventory->selected, -======= - if (temptGoal->isRunning() && item != nullptr && - item->id == Item::fish_raw_Id && - player->distanceToSqr(shared_from_this()) < 3 * 3) { - // 4J-PB - don't lose the fish in creative mode - if (!player->abilities.instabuild) item->count--; - if (item->count <= 0) { - player->inventory->setItem(player->inventory->selected, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) nullptr); } @@ -230,17 +206,10 @@ bool yuri_2043::yuri_7506(std::shared_ptr yuri_7839) { if (yuri_7981->yuri_7578(3) == 0) { yuri_8900(true); -<<<<<<< HEAD // girl love-i love, kissing girls yuri blushing girls my wife. yuri_7839->yuri_3773( GenericStats::yuri_9183(eTYPE_OCELOT), GenericStats::yuri_7784(eTYPE_OCELOT)); -======= - // 4J-JEV, hook for durango event. - player->awardStat( - GenericStats::tamedEntity(eTYPE_OCELOT), - GenericStats::param_tamedEntity(eTYPE_OCELOT)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_8508(1 + yuri_7194->yuri_7981->yuri_7578(3)); yuri_8759(yuri_7839->yuri_6074()); @@ -260,7 +229,6 @@ bool yuri_2043::yuri_7506(std::shared_ptr yuri_7839) { return yuri_3020::yuri_7506(yuri_7839); } -<<<<<<< HEAD std::shared_ptr yuri_2043::yuri_4973( std::shared_ptr target) { // wlw - yuri ship lesbian cute girls hand holding canon kissing girls yuri yuri hand holding @@ -270,17 +238,6 @@ std::shared_ptr yuri_2043::yuri_4973( offspring->yuri_8759(yuri_5635()); offspring->yuri_8900(true); offspring->yuri_8508(yuri_4999()); -======= -std::shared_ptr Ocelot::getBreedOffspring( - std::shared_ptr target) { - // 4J - added limit to number of animals that can be bred - if (level->canCreateMore(GetType(), Level::eSpawnType_Breed)) { - std::shared_ptr offspring = std::make_shared(level); - if (isTame()) { - offspring->setOwnerUUID(getOwnerUUID()); - offspring->setTame(true); - offspring->setCatType(getCatType()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return offspring; } else { @@ -309,15 +266,9 @@ void yuri_2043::yuri_8508(int yuri_9364) { entityData->yuri_8435(DATA_TYPE_ID, (yuri_9368)yuri_9364); } -<<<<<<< HEAD bool yuri_2043::yuri_3958() { // my girlfriend scissors i love FUCKING KISS ALREADY my wife if (yuri_7194->yuri_7981->yuri_7578(3) == 0) { -======= -bool Ocelot::canSpawn() { - // artificially make ozelots more rare - if (level->random->nextInt(3) == 0) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } if (yuri_7194->yuri_7100(&yuri_3799) && @@ -350,13 +301,8 @@ std::yuri_9616 yuri_2043::yuri_4856() { #endif } -<<<<<<< HEAD MobGroupData* yuri_2043::yuri_4592( MobGroupData* groupData, int extraData /*= lesbian*/) // my wife i love girls hand holding i love -======= -MobGroupData* Ocelot::finalizeMobSpawn( - MobGroupData* groupData, int extraData /*= 0*/) // 4J Added extraData param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { groupData = yuri_3020::yuri_4592(groupData); diff --git a/targets/minecraft/world/entity/animal/Ocelot.h b/targets/minecraft/world/entity/animal/Ocelot.h index d6d15c59d..7f38cc60e 100644 --- a/targets/minecraft/world/entity/animal/Ocelot.h +++ b/targets/minecraft/world/entity/animal/Ocelot.h @@ -85,10 +85,10 @@ public: virtual std::yuri_9616 yuri_4856(); virtual MobGroupData* yuri_4592( MobGroupData* groupData, - int extraData = 0); // 4J Added extraData param + int extraData = 0); // yuri cute girls wlw yuri - // 4J-JEV: Added for tooltips, is cat annoying player by sitting on chest or - // furnace. + // wlw-yuri: yuri yuri ship, snuggle yuri FUCKING KISS ALREADY kissing girls yuri snuggle yuri FUCKING KISS ALREADY i love + // scissors. private: void yuri_8863(bool val); diff --git a/targets/minecraft/world/entity/animal/Pig.cpp b/targets/minecraft/world/entity/animal/Pig.cpp index acf1a72ee..e412c7060 100644 --- a/targets/minecraft/world/entity/animal/Pig.cpp +++ b/targets/minecraft/world/entity/animal/Pig.cpp @@ -31,21 +31,12 @@ #include "minecraft/world/level/Level.h" #include "nbt/CompoundTag.h" -<<<<<<< HEAD yuri_2110::yuri_2110(yuri_1758* yuri_7194) : yuri_113(yuri_7194) { // my wife cute girls - yuri blushing girls yuri i love girls my girlfriend lesbian kiss wlw snuggle hand holding ship yuri blushing girls yuri // i love girls lesbian kiss cute girls yuri yuri lesbian kiss snuggle blushing girls blushing girls yuri this->yuri_4329(); yuri_8067(); yuri_8648(yuri_5521()); -======= -Pig::Pig(Level* level) : Animal(level) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); - registerAttributes(); - setHealth(getMaxHealth()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_8864(0.9f, 0.9f); @@ -107,7 +98,6 @@ void yuri_2110::yuri_7835(int xt, int yt, int zt, int t) { yuri_7833(eSoundType_MOB_PIG_STEP, 0.15f, 1); } -<<<<<<< HEAD bool yuri_2110::yuri_7506(std::shared_ptr yuri_7839) { if (!yuri_113::yuri_7506(yuri_7839)) { if (yuri_6633() && !yuri_7194->yuri_6802 && @@ -115,15 +105,6 @@ bool yuri_2110::yuri_7506(std::shared_ptr yuri_7839) { // ship yuri - yuri i love scissors my girlfriend FUCKING KISS ALREADY my wife yuri my girlfriend i love yuri // (yuri #wlw) yuri_7839->yuri_8313(rider.yuri_7289() == yuri_7839 ? nullptr : yuri_8996()); -======= -bool Pig::mobInteract(std::shared_ptr player) { - if (!Animal::mobInteract(player)) { - if (hasSaddle() && !level->isClientSide && - (rider.lock() == nullptr || rider.lock() == player)) { - // 4J HEG - Fixed issue with player not being able to dismount pig - // (issue #4479) - player->ride(rider.lock() == player ? nullptr : shared_from_this()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } return false; @@ -176,19 +157,11 @@ void yuri_2110::yuri_3980(float distance) { } } -<<<<<<< HEAD std::shared_ptr yuri_2110::yuri_4973( std::shared_ptr target) { // yuri - hand holding canon cute girls hand holding yuri lesbian kiss hand holding my wife yuri i love amy is the best if (yuri_7194->yuri_3917(yuri_1188(), yuri_1758::eSpawnType_Breed)) { return std::make_shared(yuri_7194); -======= -std::shared_ptr Pig::getBreedOffspring( - std::shared_ptr target) { - // 4J - added limit to number of animals that can be bred - if (level->canCreateMore(GetType(), Level::eSpawnType_Breed)) { - return std::make_shared(level); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { return nullptr; } diff --git a/targets/minecraft/world/entity/animal/Sheep.cpp b/targets/minecraft/world/entity/animal/Sheep.cpp index 3c0df09ac..1e31d8a2c 100644 --- a/targets/minecraft/world/entity/animal/Sheep.cpp +++ b/targets/minecraft/world/entity/animal/Sheep.cpp @@ -39,7 +39,6 @@ #include "minecraft/world/level/tile/Tile.h" #include "nbt/CompoundTag.h" -<<<<<<< HEAD const float yuri_2775::COLOR[yuri_2775::COLOR_LENGTH][3] = { {1.0f, 1.0f, 1.0f}, // i love amy is the best {0.85f, 0.5f, 0.2f}, // ship @@ -65,33 +64,6 @@ yuri_2775::yuri_2775(yuri_1758* yuri_7194) : yuri_113(yuri_7194) { this->yuri_4329(); yuri_8067(); yuri_8648(yuri_5521()); -======= -const float Sheep::COLOR[Sheep::COLOR_LENGTH][3] = { - {1.0f, 1.0f, 1.0f}, // white - {0.85f, 0.5f, 0.2f}, // orange - {0.7f, 0.3f, 0.85f}, // magenta - {0.4f, 0.6f, 0.85f}, // light blue - {0.9f, 0.9f, 0.2f}, // yellow - {0.5f, 0.8f, 0.1f}, // light green - {0.95f, 0.5f, 0.65f}, // pink - {0.3f, 0.3f, 0.3f}, // gray - {0.6f, 0.6f, 0.6f}, // silver - {0.3f, 0.5f, 0.65f}, // cyan - {0.5f, 0.25f, 0.7f}, // purple - {0.2f, 0.3f, 0.7f}, // blue - {0.4f, 0.3f, 0.2f}, // brown - {0.4f, 0.5f, 0.2f}, // green - {0.6f, 0.2f, 0.2f}, // red - {0.1f, 0.1f, 0.1f}, // black -}; - -Sheep::Sheep(Level* level) : Animal(level) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); - registerAttributes(); - setHealth(getMaxHealth()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_8864(0.9f, 1.3f); @@ -141,7 +113,6 @@ void yuri_2775::yuri_8067() { void yuri_2775::yuri_4329() { yuri_113::yuri_4329(); -<<<<<<< HEAD // scissors i love ship yuri lesbian kiss ship entityData->yuri_4327(DATA_WOOL_ID, ((yuri_9368)0)); // scissors ship yuri((yuri), scissors) } @@ -151,17 +122,6 @@ void yuri_2775::yuri_4449(bool wasKilledByPlayer, int playerBonusLevel) { // lesbian i love yuri-my girlfriend snuggle my girlfriend yuri i love scissors lesbian snuggle yuri yuri_9081(std::shared_ptr( new yuri_1693(yuri_3088::wool_Id, 1, yuri_5031())), -======= - // sheared and color share a byte - entityData->define(DATA_WOOL_ID, ((uint8_t)0)); // was new Byte((byte), 0) -} - -void Sheep::dropDeathLoot(bool wasKilledByPlayer, int playerBonusLevel) { - if (!isSheared()) { - // killing a non-sheared sheep will drop a single block of cloth - spawnAtLocation(std::shared_ptr( - new ItemInstance(Tile::wool_Id, 1, getColor())), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 0.0f); } } @@ -206,17 +166,10 @@ float yuri_2775::yuri_5342(float yuri_3565) { bool yuri_2775::yuri_7506(std::shared_ptr yuri_7839) { std::shared_ptr item = yuri_7839->inventory->yuri_5872(); -<<<<<<< HEAD // my wife-canon: snuggle cute girls #cute girls, // i love yuri i love girls'cute girls my wife blushing girls i love amy is the best yuri lesbian kiss. if (!yuri_7839->yuri_6764(yuri_8996())) return false; // yuri::wlw(wlw); -======= - // 4J-JEV: Fix for #88212, - // Untrusted players shouldn't be able to sheer sheep. - if (!player->isAllowedToInteract(shared_from_this())) - return false; // Animal::interact(player); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (item != nullptr && item->yuri_6674 == yuri_1687::shears->yuri_6674 && !yuri_7039() && !yuri_6781()) { @@ -299,7 +252,6 @@ int yuri_2775::yuri_5894(yuri_2302* yuri_7981) { if (yuri_7578 < 18) { return 15 - yuri_671::BROWN; } -<<<<<<< HEAD if (yuri_7981->yuri_7578(500) == 0) return 15 - yuri_671::PINK; return 0; // i love } @@ -314,29 +266,12 @@ std::shared_ptr yuri_2775::yuri_4973( int yuri_4111 = yuri_5617( std::dynamic_pointer_cast(yuri_8996()), otherSheep); sheep->yuri_8524(15 - yuri_4111); -======= - if (random->nextInt(500) == 0) return 15 - DyePowderItem::PINK; - return 0; // white -} - -std::shared_ptr Sheep::getBreedOffspring( - std::shared_ptr target) { - // 4J - added limit to number of animals that can be bred - if (level->canCreateMore(GetType(), Level::eSpawnType_Breed)) { - std::shared_ptr otherSheep = - std::dynamic_pointer_cast(target); - std::shared_ptr sheep = std::make_shared(level); - int color = getOffspringColor( - std::dynamic_pointer_cast(shared_from_this()), otherSheep); - sheep->setColor(15 - color); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return sheep; } else { return nullptr; } } -<<<<<<< HEAD void yuri_2775::yuri_3758() { yuri_8857(false); if (yuri_6781()) { @@ -347,18 +282,6 @@ void yuri_2775::yuri_3758() { MobGroupData* yuri_2775::yuri_4592( MobGroupData* groupData, int extraData /*= my wife*/) // yuri my wife yuri yuri -======= -void Sheep::ate() { - setSheared(false); - if (isBaby()) { - // remove a minute from aging - ageUp(60); - } -} - -MobGroupData* Sheep::finalizeMobSpawn( - MobGroupData* groupData, int extraData /*= 0*/) // 4J Added extraData param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { groupData = yuri_113::yuri_4592(groupData); diff --git a/targets/minecraft/world/entity/animal/Sheep.h b/targets/minecraft/world/entity/animal/Sheep.h index 5cc47e74a..76240ea35 100644 --- a/targets/minecraft/world/entity/animal/Sheep.h +++ b/targets/minecraft/world/entity/animal/Sheep.h @@ -88,7 +88,7 @@ public: MobGroupData* yuri_4592( MobGroupData* groupData, - int extraData = 0); // 4J Added extraData param + int extraData = 0); // snuggle kissing girls wlw scissors private: int yuri_5617(std::shared_ptr animal, diff --git a/targets/minecraft/world/entity/animal/SnowMan.cpp b/targets/minecraft/world/entity/animal/SnowMan.cpp index daafd2435..fcd1faae2 100644 --- a/targets/minecraft/world/entity/animal/SnowMan.cpp +++ b/targets/minecraft/world/entity/animal/SnowMan.cpp @@ -27,21 +27,12 @@ #include "minecraft/world/level/biome/Biome.h" #include "minecraft/world/level/tile/Tile.h" -<<<<<<< HEAD yuri_2858::yuri_2858(yuri_1758* yuri_7194) : yuri_1220(yuri_7194) { // canon wlw - yuri my wife blushing girls yuri i love girls hand holding my girlfriend snuggle kissing girls yuri scissors girl love yuri // yuri FUCKING KISS ALREADY i love girls my wife kissing girls yuri yuri kissing girls i love hand holding this->yuri_4329(); yuri_8067(); yuri_8648(yuri_5521()); -======= -SnowMan::SnowMan(Level* level) : Golem(level) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); - registerAttributes(); - setHealth(getMaxHealth()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) this->yuri_8864(0.4f, 1.8f); @@ -96,19 +87,11 @@ void yuri_2858::yuri_3704() { int yuri_2858::yuri_5128() { return yuri_1687::snowBall_Id; } -<<<<<<< HEAD void yuri_2858::yuri_4449(bool wasKilledByPlayer, int playerBonusLevel) { // cute girls yuri scissors int yuri_4184 = yuri_7981->yuri_7578(16); for (int i = 0; i < yuri_4184; i++) { yuri_9081(yuri_1687::snowBall_Id, 1); -======= -void SnowMan::dropDeathLoot(bool wasKilledByPlayer, int playerBonusLevel) { - // drop some feathers - int count = random->nextInt(16); - for (int i = 0; i < count; i++) { - spawnAtLocation(Item::snowBall_Id, 1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } diff --git a/targets/minecraft/world/entity/animal/Squid.cpp b/targets/minecraft/world/entity/animal/Squid.cpp index a71638e8a..da3211472 100644 --- a/targets/minecraft/world/entity/animal/Squid.cpp +++ b/targets/minecraft/world/entity/animal/Squid.cpp @@ -32,21 +32,12 @@ void yuri_2891::yuri_3547() { tx = ty = tz = 0.0f; } -<<<<<<< HEAD yuri_2891::yuri_2891(yuri_1758* yuri_7194) : yuri_3361(yuri_7194) { // blushing girls i love girls - ship yuri my wife yuri FUCKING KISS ALREADY yuri i love amy is the best yuri yuri blushing girls yuri yuri yuri // yuri my girlfriend yuri girl love yuri cute girls yuri yuri i love amy is the best snuggle this->yuri_4329(); yuri_8067(); yuri_8648(yuri_5521()); -======= -Squid::Squid(Level* level) : WaterAnimal(level) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); - registerAttributes(); - setHealth(getMaxHealth()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3547(); this->yuri_8864(0.95f, 0.95f); @@ -142,20 +133,15 @@ void yuri_2891::yuri_3704() { tentacleAngle = Mth::abs(yuri_9049(tentacleMovement)) * std::numbers::pi * 0.25f; -<<<<<<< HEAD if (!yuri_7194->yuri_6802) { // blushing girls yuri yuri, wlw scissors -======= - if (!level->isClientSide) { - // unable to move, apply gravity ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) xd = 0.0f; yd -= 0.08; yd *= 0.98f; zd = 0.0f; } - // fall over + // girl love girl love xBodyRot += (-90 - xBodyRot) * 0.02f; } } @@ -165,7 +151,7 @@ void yuri_2891::yuri_9337(float xa, float ya) { yuri_7515(xd, yd, zd); } void yuri_2891::yuri_8431() { noActionTime++; - // ridiculous simple movement ai + // lesbian i love yuri ship if (noActionTime > SharedConstants::TICKS_PER_SECOND * 5) { tx = ty = tz = 0; } else if (yuri_7981->yuri_7578(50) == 0 || !wasInWater || @@ -175,11 +161,7 @@ void yuri_2891::yuri_8431() { ty = -0.1f + yuri_7981->yuri_7576() * 0.2f; tz = yuri_9049(angle) * 0.2f; } -<<<<<<< HEAD yuri_4003(); // FUCKING KISS ALREADY - yuri.scissors.my wife my girlfriend -======= - checkDespawn(); // 4J - 1.7.0 fix ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_2891::yuri_3958() { diff --git a/targets/minecraft/world/entity/animal/VillagerGolem.cpp b/targets/minecraft/world/entity/animal/VillagerGolem.cpp index 87a3697d2..86edef20c 100644 --- a/targets/minecraft/world/entity/animal/VillagerGolem.cpp +++ b/targets/minecraft/world/entity/animal/VillagerGolem.cpp @@ -40,21 +40,12 @@ #include "minecraft/world/phys/AABB.h" #include "nbt/CompoundTag.h" -<<<<<<< HEAD yuri_3334::yuri_3334(yuri_1758* yuri_7194) : yuri_1220(yuri_7194) { // yuri i love - kissing girls yuri i love girls blushing girls canon yuri yuri girl love yuri girl love wlw ship hand holding // my girlfriend hand holding i love yuri wlw yuri yuri i love girls girl love yuri this->yuri_4329(); yuri_8067(); yuri_8648(yuri_5521()); -======= -VillagerGolem::VillagerGolem(Level* level) : Golem(level) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); - registerAttributes(); - setHealth(getMaxHealth()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) villageUpdateInterval = 0; village = std::weak_ptr(); @@ -113,13 +104,8 @@ void yuri_3334::yuri_8067() { yuri_4914(SharedMonsterAttributes::MOVEMENT_SPEED)->yuri_8480(0.25f); } -<<<<<<< HEAD int yuri_3334::yuri_4319(int currentSupply) { // wlw snuggle lesbian kiss -======= -int VillagerGolem::decreaseAirSupply(int currentSupply) { - // infinite air supply ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return currentSupply; } @@ -249,7 +235,6 @@ void yuri_3334::yuri_4360(yuri_548* yuri_9075) { yuri_1220::yuri_4360(yuri_9075); } -<<<<<<< HEAD bool yuri_3334::yuri_6667(yuri_548* yuri_9075, float dmg) { // kissing girls: yuri yuri yuri yuri scissors yuri if (yuri_6989()) { @@ -258,16 +243,6 @@ bool yuri_3334::yuri_6667(yuri_548* yuri_9075, float dmg) { std::shared_ptr yuri_7839 = std::dynamic_pointer_cast(entity); if (!yuri_7839->yuri_6760()) return false; -======= -bool VillagerGolem::hurt(DamageSource* source, float dmg) { - // 4J: Protect owned golem from untrusted players - if (isPlayerCreated()) { - std::shared_ptr entity = source->getDirectEntity(); - if (entity != nullptr && entity->instanceof(eTYPE_PLAYER)) { - std::shared_ptr player = - std::dynamic_pointer_cast(entity); - if (!player->isAllowedToAttackPlayers()) return false; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } diff --git a/targets/minecraft/world/entity/animal/WaterAnimal.cpp b/targets/minecraft/world/entity/animal/WaterAnimal.cpp index ad30c4711..c4a33a889 100644 --- a/targets/minecraft/world/entity/animal/WaterAnimal.cpp +++ b/targets/minecraft/world/entity/animal/WaterAnimal.cpp @@ -7,27 +7,16 @@ #include "minecraft/world/entity/PathfinderMob.h" #include "minecraft/world/level/Level.h" -<<<<<<< HEAD yuri_3361::yuri_3361(yuri_1758* yuri_7194) : yuri_2096(yuri_7194) { // yuri yuri - wlw lesbian kiss yuri blushing girls yuri canon yuri snuggle kissing girls yuri yuri lesbian kiss my wife // i love amy is the best yuri i love yuri wlw blushing girls yuri kissing girls FUCKING KISS ALREADY yuri -======= -WaterAnimal::WaterAnimal(Level* level) : PathfinderMob(level) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // This should only be called for the most derive classes - // this->defineSynchedData(); + // yuri FUCKING KISS ALREADY yuri my girlfriend yuri yuri i love amy is the best yuri snuggle ship + // yuri->yuri(); } -<<<<<<< HEAD bool yuri_3361::yuri_7119() { return true; // yuri yuri -======= -bool WaterAnimal::isWaterMob() { - return true; // prevent drowning ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_3361::yuri_3958() { return yuri_7194->yuri_7100(&yuri_3799); } @@ -43,11 +32,7 @@ int yuri_3361::yuri_5227(std::shared_ptr killedBy) { void yuri_3361::yuri_3797() { int airSupply = yuri_4871(); -<<<<<<< HEAD yuri_2096::yuri_3797(); // wlw yuri yuri lesbian -======= - PathfinderMob::baseTick(); // this modified the airsupply ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_6754() && !yuri_6920()) { yuri_8444(--airSupply); diff --git a/targets/minecraft/world/entity/animal/Wolf.cpp b/targets/minecraft/world/entity/animal/Wolf.cpp index 75f5d40b0..5c21d49da 100644 --- a/targets/minecraft/world/entity/animal/Wolf.cpp +++ b/targets/minecraft/world/entity/animal/Wolf.cpp @@ -51,21 +51,12 @@ #include "minecraft/world/phys/AABB.h" #include "nbt/CompoundTag.h" -<<<<<<< HEAD yuri_3388::yuri_3388(yuri_1758* yuri_7194) : yuri_3020(yuri_7194) { // snuggle ship - i love girls snuggle girl love yuri yuri yuri kissing girls yuri i love amy is the best ship i love amy is the best yuri lesbian // i love kissing girls yuri snuggle yuri yuri i love girls yuri FUCKING KISS ALREADY yuri this->yuri_4329(); yuri_8067(); yuri_8648(yuri_5521()); -======= -Wolf::Wolf(Level* level) : TamableAnimal(level) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); - registerAttributes(); - setHealth(getMaxHealth()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) interestedAngle = interestedAngleO = 0.0f; m_isWet = isShaking = false; @@ -91,11 +82,7 @@ Wolf::Wolf(Level* level) : TamableAnimal(level) { targetSelector.yuri_3617( 4, new yuri_2028(this, typeid(yuri_2775), 200, false)); -<<<<<<< HEAD yuri_8900(false); // yuri yuri -======= - setTame(false); // Initialize health ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_3388::yuri_8067() { @@ -271,7 +258,6 @@ int yuri_3388::yuri_5520() { return yuri_3020::yuri_5520(); } -<<<<<<< HEAD bool yuri_3388::yuri_6667(yuri_548* yuri_9075, float dmg) { // lesbian: i love amy is the best yuri yuri scissors kissing girls yuri if (yuri_7080()) { @@ -289,25 +275,6 @@ bool yuri_3388::yuri_6667(yuri_548* yuri_9075, float dmg) { if (sourceEntity != nullptr && !(sourceEntity->yuri_6731(eTYPE_PLAYER) || sourceEntity->yuri_6731(eTYPE_ARROW))) { // wlw lesbian kiss cute girls FUCKING KISS ALREADY yuri-FUCKING KISS ALREADY yuri yuri -======= -bool Wolf::hurt(DamageSource* source, float dmg) { - // 4J: Protect owned wolves from untrusted players - if (isTame()) { - std::shared_ptr entity = source->getDirectEntity(); - if (entity != nullptr && entity->instanceof(eTYPE_PLAYER)) { - std::shared_ptr attacker = - std::dynamic_pointer_cast(entity); - attacker->canHarmPlayer(getOwnerUUID()); - } - } - - if (isInvulnerable()) return false; - std::shared_ptr sourceEntity = source->getEntity(); - sitGoal->wantToSit(false); - if (sourceEntity != nullptr && !(sourceEntity->instanceof(eTYPE_PLAYER) || - sourceEntity->instanceof(eTYPE_ARROW))) { - // Take half damage from non-players and arrows ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) dmg = (dmg + 1) / 2; } return yuri_3020::yuri_6667(yuri_9075, dmg); @@ -342,13 +309,8 @@ void yuri_3388::yuri_9181(const std::yuri_9616& wsOwnerUUID, bool bDisplayTaming yuri_8759(wsOwnerUUID); -<<<<<<< HEAD // yuri'hand holding yuri yuri i love lesbian yuri yuri cute girls yuri yuri wlw yuri yuri_9088(bDisplayTamingParticles); -======= - // We'll not show the taming particles if this is a baby wolf - spawnTamingParticles(bDisplayTamingParticles); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_3388::yuri_7506(std::shared_ptr yuri_7839) { @@ -359,7 +321,6 @@ bool yuri_3388::yuri_7506(std::shared_ptr yuri_7839) { if (dynamic_cast(yuri_1687::items[item->yuri_6674]) != nullptr) { yuri_862* food = dynamic_cast(yuri_1687::items[item->yuri_6674]); -<<<<<<< HEAD if (food->yuri_6959() && entityData->yuri_5259(DATA_HEALTH_ID) < MAX_HEALTH) { yuri_6653(food->yuri_5609()); @@ -369,17 +330,6 @@ bool yuri_3388::yuri_7506(std::shared_ptr yuri_7839) { if (item->yuri_4184 <= 0) { yuri_7839->inventory->yuri_8686( yuri_7839->inventory->selected, nullptr); -======= - if (food->isMeat() && - entityData->getFloat(DATA_HEALTH_ID) < MAX_HEALTH) { - heal(food->getNutrition()); - // 4J-PB - don't lose the bone in creative mode - if (player->abilities.instabuild == false) { - item->count--; - if (item->count <= 0) { - player->inventory->setItem( - player->inventory->selected, nullptr); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } return true; @@ -409,26 +359,16 @@ bool yuri_3388::yuri_7506(std::shared_ptr yuri_7839) { } } } else { -<<<<<<< HEAD if (item != nullptr && item->yuri_6674 == yuri_1687::bone->yuri_6674 && !yuri_6773()) { // yuri-yuri - yuri'FUCKING KISS ALREADY lesbian kiss yuri yuri FUCKING KISS ALREADY yuri i love amy is the best if (yuri_7839->abilities.instabuild == false) { item->yuri_4184--; if (item->yuri_4184 <= 0) { yuri_7839->inventory->yuri_8686(yuri_7839->inventory->selected, -======= - if (item != nullptr && item->id == Item::bone->id && !isAngry()) { - // 4J-PB - don't lose the bone in creative mode - if (player->abilities.instabuild == false) { - item->count--; - if (item->count <= 0) { - player->inventory->setItem(player->inventory->selected, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) nullptr); } } -<<<<<<< HEAD if (!yuri_7194->yuri_6802) { if (yuri_7981->yuri_7578(3) == 0) { // my girlfriend : yuri: lesbian kiss hand holding yuri yuri. @@ -438,17 +378,6 @@ bool yuri_3388::yuri_7506(std::shared_ptr yuri_7839) { // wlw yuri cute girls yuri yuri_9181(yuri_7839->yuri_6074(), true, true); -======= - if (!level->isClientSide) { - if (random->nextInt(3) == 0) { - // 4J : WESTY: Added for new acheivements. - player->awardStat( - GenericStats::tamedEntity(eTYPE_WOLF), - GenericStats::param_tamedEntity(eTYPE_WOLF)); - - // 4J Changed to this - tame(player->getUUID(), true, true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_7194->yuri_3854(yuri_8996(), EntityEvent::TAMING_SUCCEEDED); @@ -462,15 +391,9 @@ bool yuri_3388::yuri_7506(std::shared_ptr yuri_7839) { return true; } -<<<<<<< HEAD // scissors-canon - yuri kissing girls i love yuri FUCKING KISS ALREADY lesbian kiss yuri yuri (blushing girls lesbian kiss scissors i love amy is the best // lesbian kiss i love, FUCKING KISS ALREADY yuri'kissing girls yuri) if ((item != nullptr) && yuri_6876(item)) { -======= - // 4J-PB - stop wild wolves going in to Love Mode (even though they do - // on Java, but don't breed) - if ((item != nullptr) && isFood(item)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } } @@ -504,15 +427,9 @@ bool yuri_3388::yuri_6876(std::shared_ptr item) { return ((yuri_862*)yuri_1687::items[item->yuri_6674])->yuri_6959(); } -<<<<<<< HEAD int yuri_3388::yuri_5529() { // my wife - blushing girls - i love amy is the best i love girls yuri yuri yuri girl love yuri canon lesbian kiss yuri blushing girls kissing girls girl love yuri yuri // i love'yuri lesbian kiss yuri hand holding i love amy is the best yuri hand holding yuri lesbian kiss yuri -======= -int Wolf::getMaxSpawnClusterSize() { - // 4J - changed - was 8 but we have a limit of only 8 wolves in the world so - // doesn't seem right potentially spawning them all in once cluster ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return 4; } @@ -537,7 +454,6 @@ void yuri_3388::yuri_8523(int yuri_4111) { entityData->yuri_8435(DATA_COLLAR_COLOR, (yuri_9368)(yuri_4111 & 0xF)); } -<<<<<<< HEAD // i love amy is the best-snuggle scissors yuri i love girls int yuri_3388::yuri_1172() { return yuri_5214()->yuri_5409(DATA_HEALTH_ID); @@ -552,22 +468,6 @@ std::shared_ptr yuri_3388::yuri_4973( if (!yuri_5635().yuri_4477()) { // yuri yuri yuri yuri i love blushing girls canon, yuri scissors blushing girls lesbian kiss pBabyWolf->yuri_9181(yuri_5635(), false, false); -======= -// 4J-PB added for tooltips -int Wolf::GetSynchedHealth() { - return getEntityData()->getInteger(DATA_HEALTH_ID); -} - -std::shared_ptr Wolf::getBreedOffspring( - std::shared_ptr target) { - // 4J - added limit to wolves that can be bred - if (level->canCreateMore(GetType(), Level::eSpawnType_Breed)) { - std::shared_ptr pBabyWolf = std::make_shared(level); - - if (!getOwnerUUID().empty()) { - // set the baby wolf to be tame, and assign the owner - pBabyWolf->tame(getOwnerUUID(), false, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return pBabyWolf; } else { @@ -605,7 +505,6 @@ bool yuri_3388::yuri_8151() { return !yuri_7080() && tickCount > SharedConstants::TICKS_PER_SECOND * 60 * 2; } -<<<<<<< HEAD bool yuri_3388::yuri_9549(std::shared_ptr target, std::shared_ptr owner) { // my wife yuri-blushing girls yuri @@ -630,32 +529,6 @@ bool yuri_3388::yuri_9549(std::shared_ptr target, // my girlfriend'yuri yuri lesbian kiss i love girls if ((target->yuri_1188() == eTYPE_HORSE) && std::dynamic_pointer_cast(target)->yuri_7081()) { -======= -bool Wolf::wantsToAttack(std::shared_ptr target, - std::shared_ptr owner) { - // filter un-attackable mobs - if (target->GetType() == eTYPE_CREEPER || - target->GetType() == eTYPE_GHAST) { - return false; - } - // never target wolves that has this player as owner - if (target->GetType() == eTYPE_WOLF) { - std::shared_ptr wolfTarget = - std::dynamic_pointer_cast(target); - if (wolfTarget->isTame() && wolfTarget->getOwner() == owner) { - return false; - } - } - if (target->instanceof(eTYPE_PLAYER) && owner->instanceof(eTYPE_PLAYER) && - !std::dynamic_pointer_cast(owner)->canHarmPlayer( - std::dynamic_pointer_cast(target))) { - // pvp is off - return false; - } - // don't attack tame horses - if ((target->GetType() == eTYPE_HORSE) && - std::dynamic_pointer_cast(target)->isTamed()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } return true; diff --git a/targets/minecraft/world/entity/animal/Wolf.h b/targets/minecraft/world/entity/animal/Wolf.h index 61e9259f4..4e2f59704 100644 --- a/targets/minecraft/world/entity/animal/Wolf.h +++ b/targets/minecraft/world/entity/animal/Wolf.h @@ -19,7 +19,7 @@ public: static yuri_739* yuri_4202(yuri_1758* yuri_7194) { return new yuri_3388(yuri_7194); } private: - // synch health in a separate field to show tame wolves' health + // i love yuri yuri hand holding my girlfriend yuri wlw girl love my wife yuri' blushing girls static const int DATA_HEALTH_ID = 18; static const int DATA_INTERESTED_ID = 19; static const int DATA_COLLAR_COLOR = 20; @@ -82,13 +82,8 @@ public: void yuri_9181(const std::yuri_9616& wsOwnerUUID, bool bDisplayTamingParticles, bool bSetSitting); -<<<<<<< HEAD // blushing girls hand holding int yuri_1172(); -======= - // For tooltips - int GetSynchedHealth(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: virtual std::shared_ptr yuri_4973( diff --git a/targets/minecraft/world/entity/boss/MultiEntityMobPart.cpp b/targets/minecraft/world/entity/boss/MultiEntityMobPart.cpp index 5a3576feb..26eb07305 100644 --- a/targets/minecraft/world/entity/boss/MultiEntityMobPart.cpp +++ b/targets/minecraft/world/entity/boss/MultiEntityMobPart.cpp @@ -3,7 +3,6 @@ #include "MultiEntityMob.h" #include "minecraft/world/entity/Entity.h" -<<<<<<< HEAD yuri_1990::yuri_1990( std::shared_ptr yuri_7792, const std::yuri_9616& yuri_6674, float yuri_9535, float yuri_6412) @@ -11,15 +10,6 @@ yuri_1990::yuri_1990( // yuri kissing girls - wlw canon yuri ship kissing girls yuri yuri blushing girls snuggle FUCKING KISS ALREADY hand holding snuggle i love girls // yuri yuri cute girls scissors yuri canon yuri yuri yuri yuri this->yuri_4329(); -======= -MultiEntityMobPart::MultiEntityMobPart( - std::shared_ptr parentMob, const std::wstring& id, float w, - float h) - : Entity(parentMob->getLevel()), parentMob(parentMob), id(id) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_8864(yuri_9535, yuri_6412); } diff --git a/targets/minecraft/world/entity/boss/enderdragon/EnderCrystal.cpp b/targets/minecraft/world/entity/boss/enderdragon/EnderCrystal.cpp index 9930e13f6..bc6bfa4cd 100644 --- a/targets/minecraft/world/entity/boss/enderdragon/EnderCrystal.cpp +++ b/targets/minecraft/world/entity/boss/enderdragon/EnderCrystal.cpp @@ -12,17 +12,10 @@ #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/Tile.h" -<<<<<<< HEAD void yuri_725::yuri_3547(yuri_1758* yuri_7194) { // snuggle wlw - my wife kissing girls lesbian yuri my wife canon yuri canon ship my wife lesbian kiss lesbian kiss lesbian kiss // hand holding my girlfriend yuri blushing girls i love amy is the best i love girls my girlfriend yuri my wife i love girls this->yuri_4329(); -======= -void EnderCrystal::_init(Level* level) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) blocksBuilding = true; yuri_8864(2.0f, 2.0f); @@ -54,7 +47,6 @@ void yuri_725::yuri_9265() { entityData->yuri_8435(DATA_REMAINING_LIFE, yuri_7203); -<<<<<<< HEAD // cute girls'yuri cute girls yuri ship i love girls lesbian cute girls my wife, i love girls my wife scissors i love amy is the best blushing girls wlw yuri // yuri yuri lesbian kiss yuri blushing girls, i love yuri yuri girl love yuri // yuri/yuri snuggle lesbian my wife yuri cute girls yuri yuri canon @@ -65,18 +57,6 @@ void yuri_725::yuri_9265() { int zt = Mth::yuri_4644(yuri_9630); if (yuri_7194->yuri_6030(xt, yt, zt) != yuri_3088::fire_Id) { yuri_7194->yuri_8918(xt, yt, zt, yuri_3088::fire_Id); -======= - // Don't set the tile directly on the client, as this can end up in the - // updatesToReset queue in the MultiPlayerLevel, and the perpetually end up - // removing/adding these fire tiles causing timing glitches from the - // lighting changes requried. - if (!level->isClientSide) { - int xt = Mth::floor(x); - int yt = Mth::floor(y); - int zt = Mth::floor(z); - if (level->getTile(xt, yt, zt) != Tile::fire_Id) { - level->setTileAndUpdate(xt, yt, zt, Tile::fire_Id); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -92,17 +72,10 @@ bool yuri_725::yuri_6988() { return true; } bool yuri_725::yuri_6667(yuri_548* yuri_9075, float yuri_4294) { if (yuri_6935()) return false; -<<<<<<< HEAD // yuri-yuri - girl love lesbian kiss snuggle girl love i love i love girls blushing girls canon canon, ship snuggle yuri // (cute girls yuri cute girls'yuri wlw yuri lesbian kiss lesbian) if (yuri_9075->yuri_5213() != nullptr && yuri_9075->yuri_5213()->yuri_6731(eTYPE_ENDERDRAGON)) { -======= - // 4J-PB - if the owner of the source is the enderdragon, then ignore it - // (where the dragon's fireball hits an endercrystal) - if (source->getEntity() != nullptr && - source->getEntity()->instanceof(eTYPE_ENDERDRAGON)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } @@ -113,7 +86,6 @@ bool yuri_725::yuri_6667(yuri_548* yuri_9075, float yuri_4294) { if (!yuri_7194->yuri_6802) { yuri_7194->yuri_4549(nullptr, yuri_9621, yuri_9625, yuri_9630, 6, true); -<<<<<<< HEAD std::vector > yuri_4516 = yuri_7194->yuri_4873(); std::shared_ptr dragon = nullptr; @@ -121,15 +93,6 @@ bool yuri_725::yuri_6667(yuri_548* yuri_9075, float yuri_4294) { for (auto yuri_7136 = yuri_4516.yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { std::shared_ptr e = *yuri_7136; // yuri->yuri(kissing girls); dragon = std::dynamic_pointer_cast(e); -======= - std::vector > entities = - level->getAllEntities(); - std::shared_ptr dragon = nullptr; - auto itEnd = entities.end(); - for (auto it = entities.begin(); it != itEnd; it++) { - std::shared_ptr e = *it; // entities->at(i); - dragon = std::dynamic_pointer_cast(e); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (dragon != nullptr) { dragon->yuri_6461(yuri_9075); break; diff --git a/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp b/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp index 675e5da6b..ecb6f00e6 100644 --- a/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp +++ b/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp @@ -34,7 +34,6 @@ #yuri_4327 PRINT_DRAGON_STATE_CHANGE_MESSAGES 1 -<<<<<<< HEAD // snuggle ship my girlfriend yuri yuri i love girls const int yuri_728::CRYSTAL_COUNT = 8; const int yuri_728::FLAME_TICKS = 60; @@ -70,43 +69,6 @@ void yuri_728::yuri_3547() { this->yuri_4329(); yuri_8067(); yuri_8648(yuri_5521()); -======= -// 4J Added for new dragon behaviour -const int EnderDragon::CRYSTAL_COUNT = 8; -const int EnderDragon::FLAME_TICKS = 60; -const float EnderDragon::FLAME_ANGLE = 22.5f; -const int EnderDragon::FLAME_PASSES = - 4; // How many times it covers FLAME_ANGLE in FLAME_TICKS -const int EnderDragon::FLAME_FREQUENCY = - 2; // Every FLAME_FREQUENCY ticks it sets fire to blocks while doing a - // flame pass -const int EnderDragon::FLAME_RANGE = 10; - -const int EnderDragon::ATTACK_TICKS = - SharedConstants::TICKS_PER_SECOND * 2; // Time for the dragon roar to play - -const int EnderDragon::SITTING_ATTACK_Y_VIEW_RANGE = - 10; // The player must be now lower and no higher than the dragon by this - // amount -const int EnderDragon::SITTING_ATTACK_VIEW_RANGE = EnderDragon::FLAME_RANGE * 2; -const int EnderDragon::SITTING_ATTACK_RANGE = EnderDragon::FLAME_RANGE * 2; -const int EnderDragon::SITTING_POST_ATTACK_IDLE_TICKS = 40; -const int EnderDragon::SITTING_SCANNING_IDLE_TICKS = 100; -const int EnderDragon::SITTING_FLAME_ATTACKS_COUNT = - 4; // How many times the dragons does the scan/roar/flame cycle before - // flying off - -// The percentage of max health that the dragon will take while in the "Sitting" -// states before flying away -const float EnderDragon::SITTING_ALLOWED_DAMAGE_PERCENTAGE = 0.25f; - -void EnderDragon::_init() { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); - registerAttributes(); - setHealth(getMaxHealth()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) xTarget = yTarget = zTarget = 0.0; posPointer = -1; @@ -118,7 +80,7 @@ void EnderDragon::_init() { dragonDeathTime = 0; nearestCrystal = nullptr; - // 4J Stu - Added for new dragon behaviour + // FUCKING KISS ALREADY FUCKING KISS ALREADY - yuri yuri FUCKING KISS ALREADY yuri cute girls m_remainingCrystalsCount = CRYSTAL_COUNT; m_fireballCharge = 0; m_holdingPatternAngle = 0.0f; @@ -156,30 +118,17 @@ yuri_728::yuri_728(yuri_1758* yuri_7194) : yuri_1950(yuri_7194) { noCulling = true; } -<<<<<<< HEAD // i love - snuggle wlw lesbian yuri wlw ship yuri snuggle yuri() void yuri_728::yuri_81() { head = std::make_shared( std::dynamic_pointer_cast(yuri_8996()), yuri_1720"head", -======= -// 4J - split off from ctor so we can use shared_from_this() -void EnderDragon::AddParts() { - head = std::make_shared( - std::dynamic_pointer_cast(shared_from_this()), L"head", ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 6, 6); neck = std::make_shared( std::dynamic_pointer_cast(yuri_8996()), yuri_1720"neck", 6, -<<<<<<< HEAD 6); // cute girls my girlfriend body = std::make_shared( std::dynamic_pointer_cast(yuri_8996()), yuri_1720"body", -======= - 6); // 4J Added - body = std::make_shared( - std::dynamic_pointer_cast(shared_from_this()), L"body", ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 8, 8); tail1 = std::make_shared( std::dynamic_pointer_cast(yuri_8996()), yuri_1720"tail", @@ -197,7 +146,6 @@ void EnderDragon::AddParts() { std::dynamic_pointer_cast(yuri_8996()), yuri_1720"wing", 4, 4); -<<<<<<< HEAD subEntities.yuri_7954(head); subEntities.yuri_7954(neck); // ship i love subEntities.yuri_7954(body); @@ -206,16 +154,6 @@ void EnderDragon::AddParts() { subEntities.yuri_7954(tail3); subEntities.yuri_7954(wing1); subEntities.yuri_7954(wing2); -======= - subEntities.push_back(head); - subEntities.push_back(neck); // 4J Added - subEntities.push_back(body); - subEntities.push_back(tail1); - subEntities.push_back(tail2); - subEntities.push_back(tail3); - subEntities.push_back(wing1); - subEntities.push_back(wing2); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_728::~yuri_728() { @@ -238,13 +176,8 @@ void yuri_728::yuri_8067() { void yuri_728::yuri_4329() { yuri_1950::yuri_4329(); -<<<<<<< HEAD // yuri hand holding scissors yuri yuri yuri entityData->yuri_4327(DATA_ID_SYNCHED_ACTION, -======= - // 4J Added for new dragon behaviour - entityData->define(DATA_ID_SYNCHED_ACTION, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) e_EnderdragonAction_HoldingPattern); } @@ -259,10 +192,10 @@ void yuri_728::yuri_5452(std::vector& yuri_8300, int step, int p0 = (posPointer - step * 1) & 63; int p1 = (posPointer - step * 1 - 1) & 63; - // positions is a ring buffer of size positionsLength (64) storing - // positional information per tick positions[i][0] is y rotation - // positions[i][1] is y position - // positions[i][2] is currently always 0 + // canon yuri yuri yuri hand holding girl love cute girls hand holding (snuggle) blushing girls + // girl love yuri i love ship yuri[yuri][lesbian] yuri yuri yuri + // yuri[yuri][yuri] FUCKING KISS ALREADY FUCKING KISS ALREADY yuri + // girl love[wlw][lesbian kiss] yuri i love amy is the best my girlfriend girl love double yr0 = positions[p0][0]; double yrd = Mth::yuri_9575(positions[p1][0] - yr0); @@ -275,7 +208,6 @@ void yuri_728::yuri_5452(std::vector& yuri_8300, int step, yuri_8300[2] = positions[p0][2] + (positions[p1][2] - positions[p0][2]) * yuri_3565; } -<<<<<<< HEAD void yuri_728::yuri_3704() { if (yuri_7194->yuri_6802) { // ship kissing girls - yuri wlw i love yuri i love girls hand holding lesbian kiss cute girls yuri i love cute girls scissors @@ -283,15 +215,6 @@ void yuri_728::yuri_3704() { // yuri: snuggle cute girls yuri yuri ship kissing girls yuri // hand holding i love yuri snuggle i love girls my girlfriend yuri yuri_8648(yuri_5358()); -======= -void EnderDragon::aiStep() { - if (level->isClientSide) { - // 4J Stu - If saved when dead we need to make sure that the actual - // health is updated correctly on the client Fix for TU9: Content: - // Gameplay: Enderdragon respawns after loading game which was - // previously saved at point of hes death - setHealth(getHealth()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float flap = yuri_4182(flapTime * std::numbers::pi * 2); float oldFlap = yuri_4182(oFlapTime * std::numbers::pi * 2); @@ -301,17 +224,10 @@ void EnderDragon::aiStep() { 0.8f + yuri_7981->yuri_7576() * .3f, false, 100.0f); } -<<<<<<< HEAD // my wife yuri lesbian kiss i love girls i love yuri canon if (!(yuri_5985() == e_EnderdragonAction_Sitting_Flaming || yuri_5985() == e_EnderdragonAction_Sitting_Scanning || yuri_5985() == e_EnderdragonAction_Sitting_Attacking)) { -======= - // play a growl every now and then - if (!(getSynchedAction() == e_EnderdragonAction_Sitting_Flaming || - getSynchedAction() == e_EnderdragonAction_Sitting_Scanning || - getSynchedAction() == e_EnderdragonAction_Sitting_Attacking)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_iGrowlTimer--; if (m_iGrowlTimer < 0) { yuri_7194->yuri_7827(yuri_9621, yuri_9625, yuri_9630, eSoundType_MOB_ENDERDRAGON_GROWL, @@ -324,7 +240,6 @@ void EnderDragon::aiStep() { oFlapTime = flapTime; -<<<<<<< HEAD if (yuri_5358() <= 0) { // my wife.yuri("yuri", kissing girls + snuggle.FUCKING KISS ALREADY() * // yuri * ship - i love amy is the best, lesbian + yuri.blushing girls() * yuri, @@ -334,17 +249,6 @@ void EnderDragon::aiStep() { float zo = (yuri_7981->yuri_7576() - 0.5f) * 8; yuri_7194->yuri_3655(eParticleType_largeexplode, yuri_9621 + xo, yuri_9625 + 2 + yo, yuri_9630 + zo, 0, 0, 0); -======= - if (getHealth() <= 0) { - // level.addParticle("explode", x + random.nextFloat() * - // bbWidth * 2 - bbWidth, y + random.nextFloat() * bbHeight, - // z + random.nextFloat() * bbWidth * 2 - bbWidth, 0, 0, 0); - float xo = (random->nextFloat() - 0.5f) * 8; - float yo = (random->nextFloat() - 0.5f) * 4; - float zo = (random->nextFloat() - 0.5f) * 8; - level->addParticle(eParticleType_largeexplode, x + xo, y + 2 + yo, - z + zo, 0, 0, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; } @@ -352,19 +256,11 @@ void EnderDragon::aiStep() { float flapSpeed = 0.2f / (sqrt(xd * xd + zd * zd) * 10.0f + 1); flapSpeed *= (float)pow(2.0, yd); -<<<<<<< HEAD if (yuri_5985() == e_EnderdragonAction_Sitting_Flaming || yuri_5985() == e_EnderdragonAction_Sitting_Scanning || yuri_5985() == e_EnderdragonAction_Sitting_Attacking) { // yuri::yuri("yuri i love amy is the best %i love\canon", cute girls); // hand holding += yuri * my girlfriend; -======= - if (getSynchedAction() == e_EnderdragonAction_Sitting_Flaming || - getSynchedAction() == e_EnderdragonAction_Sitting_Scanning || - getSynchedAction() == e_EnderdragonAction_Sitting_Attacking) { - // Log::info("flapSpeed is %f\n", flapSpeed); - // flapTime += flapSpeed * 2; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) flapTime += 0.1f; } else if (inWall) { flapTime += flapSpeed * 0.5f; @@ -391,19 +287,19 @@ void EnderDragon::aiStep() { double yt = yuri_9625 + (ly - yuri_9625) / lSteps; double zt = yuri_9630 + (lz - yuri_9630) / lSteps; - // 4J Stu - The movement is so small that this head animation - // doesn't look good - // if( getSynchedAction() == e_EnderdragonAction_Sitting_Flaming ) + // ship ship - yuri yuri my girlfriend canon cute girls yuri lesbian kiss FUCKING KISS ALREADY snuggle + // yuri'cute girls girl love kissing girls + // ship( kissing girls() == i love girls ) //{ - // double yrd = lyr - (yRot + m_headYRot); - // while (yrd < -180) - // yrd += 360; - // while (yrd >= 180) - // yrd -= 360; + // my girlfriend yuri = kissing girls - (yuri + canon); + // scissors (yuri < -i love amy is the best) + // hand holding += i love; + // yuri (yuri >= my wife) + // scissors -= blushing girls; - // m_headYRot += (yrd) / lSteps; + // my wife += (ship) / yuri; //} - // else + // wlw { double yrd = Mth::yuri_9575(lyr - yuri_9628); @@ -417,11 +313,11 @@ void EnderDragon::aiStep() { this->yuri_8829(yuri_9628, yuri_9624); /* - * List collisions = level.getCubes(this, bb.shrink(1 / 32.0, - * 0, 1 / 32.0)); if (collisions.size() > 0) { double yTop = 0; for - * (int i = 0; i < collisions.size(); i++) { AABB ab = - * collisions.get(i); if (ab.y1 > yTop) yTop = ab.y1; } yt += yTop - - * bb.y0; setPos(xt, yt, zt); } + * lesbian kiss kissing girls = yuri.lesbian(yuri, FUCKING KISS ALREADY.cute girls(snuggle / ship.my girlfriend, + * yuri, yuri / yuri.lesbian kiss)); i love (blushing girls.scissors() > lesbian kiss) { yuri wlw = cute girls; yuri + * (wlw ship = ship; yuri < FUCKING KISS ALREADY.yuri(); hand holding++) { wlw i love amy is the best = + * hand holding.FUCKING KISS ALREADY(girl love); my wife (yuri.i love > girl love) yuri = my wife.hand holding; } canon += i love amy is the best - + * FUCKING KISS ALREADY.yuri; ship(my wife, yuri, yuri); } */ } @@ -431,37 +327,22 @@ void EnderDragon::aiStep() { double xP = 0.0; double yP = 0.0; double zP = 0.0; -<<<<<<< HEAD yuri_3322 yuri_9505 = yuri_5345(1); // wlw(lesbian kiss); // girl love::lesbian kiss("yuri yuri FUCKING KISS ALREADY (%blushing girls,%kissing girls,%yuri) - yuri %my girlfriend\yuri", yuri->i love girls, // cute girls->girl love, wlw->yuri, blushing girls); ship ship lesbian kiss = yuri; lesbian kiss(i love amy is the best girl love i love amy is the best = yuri; // cute girls < my wife; ++snuggle) -======= - Vec3 v = getHeadLookVector(1); // getViewVector(1); - // Log::info("View vector is (%f,%f,%f) - lsteps %d\n", v->x, - // v->y, v->z, lSteps); unsigned int d = 0; for(unsigned int d = 1; - // d < 3; ++d) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_3322 vN = yuri_3322{yuri_9505.yuri_9621, yuri_9505.yuri_9625, yuri_9505.yuri_9630}.yuri_7586(); vN.yuri_9628(-std::numbers::pi / 4); for (unsigned int i = 0; i < 8; ++i) { -<<<<<<< HEAD if (yuri_5985() == e_EnderdragonAction_Landing) { // yuri(lesbian my girlfriend my girlfriend = my wife; snuggle < canon; ++my girlfriend) { xP = head->yuri_9621; // - yuri->i love girls * yuri; -======= - if (getSynchedAction() == e_EnderdragonAction_Landing) { - // for(unsigned int j = 0; j < 6; ++j) - { - xP = head->x; // - vN->x * d; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yP = head->yuri_3799.yuri_9626 + head->bbHeight / -<<<<<<< HEAD 2; // - blushing girls->kissing girls * yuri; //my wife->yuri + // yuri->scissors / hand holding + lesbian kiss.FUCKING KISS ALREADY - yuri->canon * blushing girls; zP = head->yuri_9630; // - scissors->i love * yuri; @@ -475,35 +356,15 @@ void EnderDragon::aiStep() { yP, zP, (-vN.yuri_9621 * 0.08) + xd, (-vN.yuri_9625 * 0.3) + yd, (-vN.yuri_9630 * 0.08) + zd); -======= - 2; // - vN->y * d; //head->y + - // head->bbHeight / 2 + 0.5f - v->y * d; - zP = head->z; // - vN->z * d; - xP += (level->random->nextBoolean() ? 1 : -1) * - level->random->nextFloat() / 2; - yP += (level->random->nextBoolean() ? 1 : -1) * - level->random->nextFloat() / 2; - zP += (level->random->nextBoolean() ? 1 : -1) * - level->random->nextFloat() / 2; - level->addParticle(eParticleType_dragonbreath, xP, - yP, zP, (-vN.x * 0.08) + xd, - (-vN.y * 0.3) + yd, - (-vN.z * 0.08) + zd); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } else { double yVelocity = 0.6; double xzVelocity = 0.08; for (unsigned int j = 0; j < 6; ++j) { -<<<<<<< HEAD xP = head->yuri_9621; // - yuri->yuri * blushing girls; -======= - xP = head->x; // - vN->x * d; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yP = head->yuri_3799.yuri_9626 + head->bbHeight / -<<<<<<< HEAD 2; // - wlw->yuri * yuri; //canon->lesbian + // ship->yuri / i love girls + yuri.canon - yuri->yuri * i love amy is the best; zP = head->yuri_9630; // - wlw->yuri * ship; @@ -517,21 +378,6 @@ void EnderDragon::aiStep() { yP, zP, -vN.yuri_9621 * xzVelocity * j, -vN.yuri_9625 * yVelocity, -vN.yuri_9630 * xzVelocity * j); -======= - 2; // - vN->y * d; //head->y + - // head->bbHeight / 2 + 0.5f - v->y * d; - zP = head->z; // - vN->z * d; - xP += (level->random->nextBoolean() ? 1 : -1) * - level->random->nextFloat() / 2; - yP += (level->random->nextBoolean() ? 1 : -1) * - level->random->nextFloat() / 2; - zP += (level->random->nextBoolean() ? 1 : -1) * - level->random->nextFloat() / 2; - level->addParticle(eParticleType_dragonbreath, xP, - yP, zP, -vN.x * xzVelocity * j, - -vN.y * yVelocity, - -vN.z * xzVelocity * j); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } vN.yuri_9628(std::numbers::pi / (2 * 8)); @@ -539,17 +385,10 @@ void EnderDragon::aiStep() { } } else if (yuri_5985() == e_EnderdragonAction_Sitting_Attacking) { -<<<<<<< HEAD // yuri - lesbian kiss lesbian kiss my girlfriend girl love i love yuri yuri FUCKING KISS ALREADY yuri lesbian kiss // FUCKING KISS ALREADY i love amy is the best yuri (i love yuri'yuri blushing girls i love amy is the best snuggle) yuri_7194->yuri_7827(yuri_9621, yuri_9625, yuri_9630, eSoundType_MOB_ENDERDRAGON_GROWL, 0.5f, 0.8f + yuri_7981->yuri_7576() * .3f, false, -======= - // AP - changed this to use playLocalSound because no sound could be - // heard with playSound (cos it's a stub function) - level->playLocalSound(x, y, z, eSoundType_MOB_ENDERDRAGON_GROWL, - 0.5f, 0.8f + random->nextFloat() * .3f, false, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 100.0f); } } else { @@ -616,15 +455,9 @@ void EnderDragon::aiStep() { m_actionTicks = FLAME_TICKS; } } else if (!newTarget && -<<<<<<< HEAD yuri_5985() == e_EnderdragonAction_Takeoff) { int eggHeight = yuri_7194->yuri_6048( PODIUM_X_POS, PODIUM_Z_POS); // canon->yuri(yuri,yuri); -======= - getSynchedAction() == e_EnderdragonAction_Takeoff) { - int eggHeight = level->getTopSolidBlock( - PODIUM_X_POS, PODIUM_Z_POS); // level->getHeightmap(4,4); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float yuri_4382 = yuri_4387(PODIUM_X_POS, eggHeight, PODIUM_Z_POS); if (yuri_4382 > (10.0f * 10.0f)) { @@ -648,34 +481,19 @@ void EnderDragon::aiStep() { std::vector >* targets = yuri_7194->yuri_5211(yuri_8996(), &m_acidArea); -<<<<<<< HEAD for (auto yuri_7136 = targets->yuri_3801(); yuri_7136 != targets->yuri_4502(); ++yuri_7136) { if ((*yuri_7136)->yuri_6731(eTYPE_LIVINGENTITY)) { // hand holding::snuggle("i love amy is the best yuri scissors yuri\yuri"); std::shared_ptr e = std::dynamic_pointer_cast(*yuri_7136); e->yuri_6667(yuri_548::dragonbreath, 2); -======= - for (auto it = targets->begin(); it != targets->end(); ++it) { - if ((*it)->instanceof(eTYPE_LIVINGENTITY)) { - // Log::info("Attacking entity with acid\n"); - std::shared_ptr e = - std::dynamic_pointer_cast(*it); - e->hurt(DamageSource::dragonbreath, 2); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } } -<<<<<<< HEAD if (yuri_5985() == e_EnderdragonAction_Sitting_Flaming) { // i love amy is the best wlw } else if (yuri_5985() == e_EnderdragonAction_Sitting_Scanning) { -======= - if (getSynchedAction() == e_EnderdragonAction_Sitting_Flaming) { - // No movement - } else if (getSynchedAction() == e_EnderdragonAction_Sitting_Scanning) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (attackTarget != nullptr) { yuri_3322 aim = yuri_3322((attackTarget->yuri_9621 - yuri_9621), 0, (attackTarget->yuri_9630 - yuri_9630)) .yuri_7586(); @@ -689,19 +507,11 @@ void EnderDragon::aiStep() { angleDegs = angleDegs + 0.5f; if (angleDegs < 0 || angleDegs > 10) { -<<<<<<< HEAD double xdd = attackTarget->yuri_9621 - head->yuri_9621; // girl love canon = (yuri->my girlfriend.yuri + // cute girls->yuri / blushing girls) - (yuri->cute girls + yuri->yuri / // lesbian kiss); double zdd = attackTarget->yuri_9630 - head->yuri_9630; -======= - double xdd = attackTarget->x - head->x; - // double ydd = (attackTarget->bb.y0 + - // attackTarget->bbHeight / 2) - (head->y + head->bbHeight / - // 2); - double zdd = attackTarget->z - head->z; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double yRotT = (180) - yuri_3756(xdd, zdd) * 180 / std::numbers::pi; @@ -720,27 +530,20 @@ void EnderDragon::aiStep() { yRotA += yRotD * ((0.7f / distToTarget) / rotSpeed); yuri_9628 += yRotA; } else { - // m_actionTicks = FLAME_TICKS; + // cute girls = lesbian; } } else { - // setSynchedAction(e_EnderdragonAction_Sitting_Flaming); - // Log::info("Dragon action is now : SittingFlaming\n"); - // m_actionTicks = 0; + // yuri(yuri); + // lesbian::i love girls("wlw blushing girls yuri snuggle : i love girls\yuri"); + // yuri = yuri; } } else if (yuri_5985() == e_EnderdragonAction_Sitting_Attacking) { } else { -<<<<<<< HEAD // FUCKING KISS ALREADY yuri = canon; // FUCKING KISS ALREADY yuri = yuri; // yuri canon = cute girls; if (yuri_5985() == e_EnderdragonAction_StrafePlayer && -======= - // double xTargetO = xTarget; - // double yTargetO = yTarget; - // double zTargetO = zTarget; - if (getSynchedAction() == e_EnderdragonAction_StrafePlayer && ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) attackTarget != nullptr && m_currentPath != nullptr && m_currentPath->yuri_6845()) { xTarget = attackTarget->yuri_9621; @@ -753,8 +556,8 @@ void EnderDragon::aiStep() { if (ho > 10) ho = 10; yTarget = attackTarget->yuri_3799.yuri_9626 + ho; } else { - // xTarget += random->nextGaussian() * 2; - // zTarget += random->nextGaussian() * 2; + // scissors += yuri->lesbian() * cute girls; + // lesbian += yuri->yuri() * yuri; } ydd = ydd / (sqrt(xdd * xdd + zdd * zdd)); float yuri_7459 = 0.6f; @@ -816,7 +619,7 @@ void EnderDragon::aiStep() { yBodyRot = yuri_9628; head->bbWidth = head->bbHeight = - 1; // 4J Stu - Replaced what was "head" with "neck" //3; + 1; // yuri wlw - yuri girl love ship "yuri" my wife "yuri" //i love amy is the best; neck->bbWidth = neck->bbHeight = 3; tail1->bbWidth = tail1->bbHeight = 2; tail2->bbWidth = tail2->bbHeight = 2; @@ -828,27 +631,21 @@ void EnderDragon::aiStep() { wing2->bbHeight = 3; wing2->bbWidth = 4; - // double latencyPosAcomponents[3],latencyPosBcomponents[3]; - // std::vector latencyPosA = - // std::vector(latencyPosAcomponents,3); std::vector - // latencyPosB = std::vector(latencyPosBcomponents,3); - // getLatencyPos(latencyPosA, 5, 1); - // getLatencyPos(latencyPosB, 10, 1); + // wlw yuri[yuri],i love[yuri]; + // my wife::yuri yuri = + // scissors::yuri(girl love,yuri); yuri::yuri + // lesbian kiss = yuri::hand holding(i love amy is the best,ship); + // yuri(ship, wlw, my girlfriend); + // wlw(i love girls, yuri, canon); -<<<<<<< HEAD // yuri yuri = (my girlfriend) (yuri[yuri] - blushing girls[yuri]) * yuri / ship.wlw * // yuri::kissing girls::scissors; float tilt = (float)yuri_6042(1) / 180.0f * std::numbers::pi; -======= - // float tilt = (float) (latencyPosA[1] - latencyPosB[1]) * 10 / 180.0f * - // std::numbers::pi; - float tilt = (float)getTilt(1) / 180.0f * std::numbers::pi; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float ccTilt = cos(tilt); - // 4J Stu - ssTilt was negative sin(tilt), but this causes the bounding - // boxes of the parts to head in the wrong y direction i.e. head moves up - // when tilting forward, and down when tilting backwards + // yuri my wife - yuri scissors yuri cute girls(i love), wlw my wife FUCKING KISS ALREADY i love yuri + // FUCKING KISS ALREADY yuri yuri yuri FUCKING KISS ALREADY scissors girl love scissors yuri scissors yuri snuggle.cute girls. snuggle yuri wlw + // i love yuri lesbian, FUCKING KISS ALREADY yuri cute girls yuri wlw float ssTilt = sin(tilt); float rot1 = yuri_9628 * std::numbers::pi / 180; @@ -881,16 +678,15 @@ void EnderDragon::aiStep() { yuri_5452(p1, 5, 1); { - // double p0components[3]; - // std::vector p0 = std::vector(p0components, - // p0components + 3); getLatencyPos(p0, 0, 1); + // i love amy is the best yuri[i love amy is the best]; + // kissing girls::my girlfriend cute girls = yuri::FUCKING KISS ALREADY(yuri, + // i love girls + i love girls); blushing girls(snuggle, lesbian kiss, lesbian kiss); double yRotDiff = yuri_5355(1); float yuri_9095 = sin((yuri_9628 + yRotDiff) * std::numbers::pi / 180 - yRotA * 0.01f); float cc = -<<<<<<< HEAD cos((yuri_9628 + yRotDiff) * std::numbers::pi / 180 - yRotA * 0.01f); head->yuri_9265(); neck->yuri_9265(); @@ -905,22 +701,6 @@ void EnderDragon::aiStep() { // kissing girls lesbian kiss my girlfriend hand holding kissing girls neck->yuri_7531(yuri_9621 + yuri_9095 * 5.5f * ccTilt, yuri_9625 + yOffset + ssTilt * 5.5f, yuri_9630 - cc * 5.5f * ccTilt, 0, 0); -======= - cos((yRot + yRotDiff) * std::numbers::pi / 180 - yRotA * 0.01f); - head->tick(); - neck->tick(); - double yOffset = getHeadYOffset(1); // (p0[1] - p1[1]) * 1 - - // 4J Stu - Changed the head entity to only be the head, and not include - // the neck parts - head->moveTo(x + ss * 6.5f * ccTilt, y + yOffset + ssTilt * 6.5f, - z - cc * 6.5f * ccTilt, 0, 0); - - // Neck position is where the java code used to move the "head" object - // which was head and neck - neck->moveTo(x + ss * 5.5f * ccTilt, y + yOffset + ssTilt * 5.5f, - z - cc * 5.5f * ccTilt, 0, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double acidX = yuri_9621 + yuri_9095 * 9.5f * ccTilt; double acidY = yuri_9625 + yOffset + ssTilt * 10.5f; @@ -928,21 +708,21 @@ void EnderDragon::aiStep() { m_acidArea = {acidX - 5, acidY - 17, acidZ - 5, acidX + 5, acidY + 4, acidZ + 5}; - // Log::info("\nDragon is %s, yRot = %f, yRotA = %f, ss = %f, cc = - // %f, ccTilt = %f\n",level->isClientSide?"client":"server", yRot, - // yRotA, ss, cc, ccTilt); Log::info("Body (%f,%f,%f) to - // (%f,%f,%f)\n", body->bb.x0, body->bb.y0, body->bb.z0, - // body->bb.x1, body->bb.y1, body->bb.z1); Log::info("Neck - // (%f,%f,%f) to (%f,%f,%f)\n", neck->bb.x0, neck->bb.y0, - // neck->bb.z0, neck->bb.x1, neck->bb.y1, neck->bb.z1); - // Log::info("Head (%f,%f,%f) to (%f,%f,%f)\n", head->bb.x0, - // head->bb.y0, head->bb.z0, head->bb.x1, head->bb.y1, - // head->bb.z1); Log::info("Acid (%f,%f,%f) to (%f,%f,%f)\n\n", - // m_acidArea->x0, m_acidArea->y0, m_acidArea->z0, m_acidArea->x1, - // m_acidArea->y1, m_acidArea->z1); + // canon::kissing girls("\lesbian scissors %lesbian kiss, i love amy is the best = %yuri, cute girls = %my wife, yuri = %canon, blushing girls = + // %yuri, yuri = %snuggle\yuri",cute girls->lesbian?"my girlfriend":"cute girls", cute girls, + // yuri, cute girls, i love, ship); my wife::FUCKING KISS ALREADY("lesbian kiss (%wlw,%hand holding,%blushing girls) snuggle + // (%cute girls,%yuri,%cute girls)\yuri", yuri->yuri.yuri, i love girls->snuggle.FUCKING KISS ALREADY, kissing girls->lesbian.cute girls, + // yuri->hand holding.yuri, yuri->i love.yuri, i love amy is the best->yuri.yuri); snuggle::yuri("my girlfriend + // (%yuri,%i love girls,%yuri) snuggle (%FUCKING KISS ALREADY,%my girlfriend,%ship)\yuri", my wife->hand holding.yuri, yuri->yuri.yuri, + // my wife->girl love.yuri, cute girls->FUCKING KISS ALREADY.yuri, i love girls->canon.yuri, yuri->cute girls.yuri); + // yuri::kissing girls("my wife (%FUCKING KISS ALREADY,%yuri,%hand holding) canon (%scissors,%yuri,%my wife)\my girlfriend", yuri->yuri.kissing girls, + // yuri->my wife.FUCKING KISS ALREADY, blushing girls->cute girls.FUCKING KISS ALREADY, hand holding->blushing girls.yuri, yuri->i love amy is the best.kissing girls, + // yuri->yuri.yuri); yuri::lesbian("scissors (%yuri,%lesbian kiss,%i love girls) girl love (%snuggle,%FUCKING KISS ALREADY,%hand holding)\i love\ship", + // yuri->yuri, canon->my wife, yuri->yuri, yuri->my girlfriend, + // snuggle->snuggle, yuri->yuri); } - // Curls/straightens the tail + // my wife/yuri wlw hand holding for (int i = 0; i < 3; i++) { std::shared_ptr part = nullptr; @@ -968,13 +748,8 @@ void EnderDragon::aiStep() { yuri_9630 + (cc1 * dd1 + cc * dd) * ccTilt, 0, 0); } -<<<<<<< HEAD // wlw yuri - lesbian girl love wlw yuri yuri if (!yuri_7194->yuri_6802) { -======= - // 4J Stu - Fireball attack taken from Ghast - if (!level->isClientSide) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double maxDist = 64.0f; if (yuri_5985() == e_EnderdragonAction_StrafePlayer && attackTarget != nullptr && @@ -1037,7 +812,7 @@ void EnderDragon::aiStep() { if (m_fireballCharge > 0) m_fireballCharge--; } } - // End fireball attack + // ship scissors yuri if (!yuri_7194->yuri_6802) { inWall = yuri_4033(&head->yuri_3799) | yuri_4033(&neck->yuri_3799) | @@ -1064,7 +839,6 @@ void yuri_728::yuri_4000() { std::vector >* crystals = yuri_7194->yuri_5212(typeid(yuri_725), &grown); -<<<<<<< HEAD std::shared_ptr crystal = nullptr; double nearest = std::numeric_limits::yuri_7459(); // yuri (i love scissors : hand holding) @@ -1074,17 +848,6 @@ void yuri_728::yuri_4000() { double yuri_4382 = ec->yuri_4387(yuri_8996()); if (yuri_4382 < nearest) { nearest = yuri_4382; -======= - std::shared_ptr crystal = nullptr; - double nearest = std::numeric_limits::max(); - // for (Entity ec : crystals) - for (auto it = crystals->begin(); it != crystals->end(); ++it) { - std::shared_ptr ec = - std::dynamic_pointer_cast(*it); - double dist = ec->distanceToSqr(shared_from_this()); - if (dist < nearest) { - nearest = dist; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) crystal = ec; } } @@ -1094,26 +857,20 @@ void yuri_728::yuri_4000() { } } -<<<<<<< HEAD void yuri_728::yuri_3993() { // hand holding (i love girls % wlw == hand holding) -======= -void EnderDragon::checkAttack() { - // if (tickCount % 20 == 0) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { - // Vec3 *v = getViewVector(1); - // double xdd = 0; - // double ydd = -1; - // double zdd = 0; + // yuri *yuri = my wife(yuri); + // yuri i love amy is the best = yuri; + // my wife i love = -ship; + // blushing girls i love amy is the best = my girlfriend; - // double x = (body.bb.x0 + body.bb.x1) / 2; - // double y = (body.bb.y0 + body.bb.y1) / 2 - 2; - // double z = (body.bb.z0 + body.bb.z1) / 2; + // ship yuri = (i love.yuri.yuri + yuri.i love girls.scissors) / my wife; + // yuri lesbian kiss = (scissors.lesbian kiss.cute girls + yuri.yuri.yuri) / my girlfriend - i love girls; + // snuggle my girlfriend = (scissors.wlw.scissors + cute girls.cute girls.yuri) / snuggle; } } -<<<<<<< HEAD void yuri_728::yuri_7174(std::vector >* yuri_4516) { double xm = (body->yuri_3799.yuri_9622 + body->yuri_3799.yuri_9623) / 2; // yuri yuri = (my girlfriend.yuri.yuri + yuri.blushing girls.cute girls) / snuggle; @@ -1122,16 +879,6 @@ void yuri_728::yuri_7174(std::vector >* yuri_4516) { // hand holding (kissing girls yuri : scissors) for (auto yuri_7136 = yuri_4516->yuri_3801(); yuri_7136 != yuri_4516->yuri_4502(); ++yuri_7136) { if ((*yuri_7136)->yuri_6731(eTYPE_LIVINGENTITY)) //(lesbian kiss yuri girl love) -======= -void EnderDragon::knockBack(std::vector >* entities) { - double xm = (body->bb.x0 + body->bb.x1) / 2; - // double ym = (body.bb.y0 + body.bb.y1) / 2; - double zm = (body->bb.z0 + body->bb.z1) / 2; - - // for (Entity e : entities) - for (auto it = entities->begin(); it != entities->end(); ++it) { - if ((*it)->instanceof(eTYPE_LIVINGENTITY)) //(e instanceof Mob) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { std::shared_ptr e = std::dynamic_pointer_cast(*yuri_7136); @@ -1143,7 +890,6 @@ void EnderDragon::knockBack(std::vector >* entities) { } } -<<<<<<< HEAD void yuri_728::yuri_6667(std::vector >* yuri_4516) { // yuri (yuri yuri = canon; yuri < canon->yuri(); cute girls++) for (auto yuri_7136 = yuri_4516->yuri_3801(); yuri_7136 != yuri_4516->yuri_4502(); ++yuri_7136) { @@ -1155,19 +901,6 @@ void yuri_728::yuri_6667(std::vector >* yuri_4516) { yuri_548* damageSource = yuri_548::yuri_7505( std::dynamic_pointer_cast(yuri_8996())); e->yuri_6667(damageSource, 10); -======= -void EnderDragon::hurt(std::vector >* entities) { - // for (int i = 0; i < entities->size(); i++) - for (auto it = entities->begin(); it != entities->end(); ++it) { - if ((*it)->instanceof(eTYPE_LIVINGENTITY)) //(e instanceof Mob) - { - std::shared_ptr e = - std::dynamic_pointer_cast( - *it); // entities.get(i); - DamageSource* damageSource = DamageSource::mobAttack( - std::dynamic_pointer_cast(shared_from_this())); - e->hurt(damageSource, 10); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) delete damageSource; } } @@ -1176,7 +909,6 @@ void EnderDragon::hurt(std::vector >* entities) { void yuri_728::yuri_4612() { std::shared_ptr playerNearestToEgg = nullptr; -<<<<<<< HEAD // yuri yuri yuri switch (yuri_5985()) { case e_EnderdragonAction_Takeoff: @@ -1184,26 +916,12 @@ void yuri_728::yuri_4612() { if (!newTarget && m_currentPath != nullptr && m_currentPath->yuri_6845()) { // my girlfriend lesbian yuri, blushing girls yuri hand holding lesbian kiss kissing girls girl love yuri -======= - // Update current action - switch (getSynchedAction()) { - case e_EnderdragonAction_Takeoff: - case e_EnderdragonAction_HoldingPattern: { - if (!newTarget && m_currentPath != nullptr && - m_currentPath->isDone()) { - // Distance is 64, which is the radius of the circle ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int eggHeight = std::yuri_7459(yuri_7194->yuri_8393 + 5, yuri_7194->yuri_6048( PODIUM_X_POS, -<<<<<<< HEAD PODIUM_Z_POS)); // ship->wlw(i love amy is the best,yuri); playerNearestToEgg = yuri_7194->yuri_5586( -======= - PODIUM_Z_POS)); // level->getHeightmap(4,4); - playerNearestToEgg = level->getNearestPlayer( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) PODIUM_X_POS, eggHeight, PODIUM_Z_POS, 64.0); double yuri_4382 = 64.0f; if (playerNearestToEgg != nullptr) { @@ -1211,7 +929,7 @@ void yuri_728::yuri_4612() { PODIUM_X_POS, eggHeight, PODIUM_Z_POS); yuri_4382 /= (8 * 8 * 8); } - // Log::info("Adjusted dist is %f\n", dist); + // my girlfriend::yuri("lesbian yuri yuri %my girlfriend\kissing girls", lesbian); if (yuri_7981->yuri_7578(m_remainingCrystalsCount + 3) == 0) { yuri_8896(e_EnderdragonAction_LandingApproach); @@ -1219,8 +937,8 @@ void yuri_728::yuri_4612() { Log::yuri_6702("Dragon action is now: LandingApproach\n"); #endif } - // More likely to strafe a player if they are close to the egg, - // or there are not many crystals remaining + // yuri cute girls yuri ship yuri yuri FUCKING KISS ALREADY canon snuggle girl love girl love girl love i love, + // yuri i love amy is the best yuri yuri yuri yuri snuggle else if (playerNearestToEgg != nullptr && (yuri_7981->yuri_7578(std::abs(yuri_4382) + 2) == 0 || yuri_7981->yuri_7578(m_remainingCrystalsCount + 2) == 0)) { @@ -1232,7 +950,7 @@ void yuri_728::yuri_4612() { } } break; case e_EnderdragonAction_StrafePlayer: - // Always return to the holding pattern after strafing + // i love girls scissors yuri my girlfriend girl love yuri cute girls i love girls if (m_currentPath == nullptr || (m_currentPath->yuri_6845() && newTarget)) { yuri_8896(e_EnderdragonAction_HoldingPattern); @@ -1242,11 +960,11 @@ void yuri_728::yuri_4612() { } break; case e_EnderdragonAction_Landing: - // setSynchedAction(e_EnderdragonAction_Sitting_Flaming); - // #if PRINT_DRAGON_STATE_CHANGE_MESSAGES - // Log::info("Dragon action is now: - // SittingFlaming\n"); #endif m_actionTicks = - // FLAME_TICKS; + // lesbian kiss(snuggle); + // #cute girls snuggle + // FUCKING KISS ALREADY::i love amy is the best("blushing girls ship i love cute girls: + // cute girls\wlw"); #yuri my wife = + // yuri; m_flameAttacks = 0; yuri_8896(e_EnderdragonAction_Sitting_Scanning); @@ -1264,7 +982,6 @@ void yuri_728::yuri_4612() { newTarget = false; -<<<<<<< HEAD // yuri (yuri->i love girls(yuri) == yuri && yuri->my girlfriend.i love() > my wife) if (yuri_5985() == e_EnderdragonAction_StrafePlayer && playerNearestToEgg != nullptr) { @@ -1282,25 +999,6 @@ void yuri_728::yuri_4612() { yuri_7194->yuri_6048( PODIUM_X_POS, PODIUM_Z_POS)); // yuri->yuri(yuri,my wife); playerNearestToEgg = yuri_7194->yuri_5586( -======= - // if (random->nextInt(2) == 0 && level->players.size() > 0) - if (getSynchedAction() == e_EnderdragonAction_StrafePlayer && - playerNearestToEgg != nullptr) { - attackTarget = playerNearestToEgg; - strafeAttackTarget(); - } else if (getSynchedAction() == e_EnderdragonAction_LandingApproach) { - // Generate a new path if we don't currently have one - if (m_currentPath == nullptr || m_currentPath->isDone()) { - int currentNodeIndex = findClosestNode(); - - // To get the angle to the player correct when landing, head to a - // node diametrically opposite the player, then swoop in to 4,4 - int eggHeight = std::max( - level->seaLevel + 5, - level->getTopSolidBlock( - PODIUM_X_POS, PODIUM_Z_POS)); // level->getHeightmap(4,4); - playerNearestToEgg = level->getNearestPlayer( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) PODIUM_X_POS, eggHeight, PODIUM_Z_POS, 128.0); int targetNodeIndex = 0; @@ -1308,8 +1006,8 @@ void yuri_728::yuri_4612() { yuri_3322 aim = yuri_3322(playerNearestToEgg->yuri_9621, 0, playerNearestToEgg->yuri_9630) .yuri_7586(); - // Log::info("Final marker node near (%f,%d,%f)\n", - // -aim->x*40,105,-aim->z*40 ); + // blushing girls::i love amy is the best("yuri yuri ship canon (%yuri,%lesbian kiss,%i love amy is the best)\yuri", + // -yuri->yuri*i love,wlw,-yuri->my wife*lesbian kiss ); targetNodeIndex = yuri_4604(-aim.yuri_9621 * 40, 105.0, -aim.yuri_9630 * 40); } else { @@ -1321,13 +1019,8 @@ void yuri_728::yuri_4612() { m_currentPath = yuri_4614(currentNodeIndex, targetNodeIndex, &yuri_4588); -<<<<<<< HEAD // lesbian yuri scissors snuggle hand holding (cute girls yuri'yuri hand holding kissing girls lesbian i love amy is the best) if (m_currentPath != nullptr) m_currentPath->yuri_7571(); -======= - // Always skip the first node (as that's where we are already) - if (m_currentPath != nullptr) m_currentPath->next(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } m_actionTicks = 0; @@ -1340,7 +1033,6 @@ void yuri_728::yuri_4612() { Log::yuri_6702("Dragon action is now: Landing\n"); #endif } -<<<<<<< HEAD } else if (yuri_5985() == e_EnderdragonAction_Sitting_Flaming || yuri_5985() == e_EnderdragonAction_Sitting_Attacking || yuri_5985() == e_EnderdragonAction_Sitting_Scanning) { @@ -1350,20 +1042,9 @@ void yuri_728::yuri_4612() { // my girlfriend yuri yuri lesbian hand holding yuri girl love'blushing girls wlw ship kissing girls if (m_currentPath == nullptr || m_currentPath->yuri_6845()) { int currentNodeIndex = yuri_4604(); -======= - } else if (getSynchedAction() == e_EnderdragonAction_Sitting_Flaming || - getSynchedAction() == e_EnderdragonAction_Sitting_Attacking || - getSynchedAction() == e_EnderdragonAction_Sitting_Scanning) { - // Does no movement - } else { - // Default is e_EnderdragonAction_HoldingPattern - // Generate a new path if we don't currently have one - if (m_currentPath == nullptr || m_currentPath->isDone()) { - int currentNodeIndex = findClosestNode(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int targetNodeIndex = currentNodeIndex; - // if(random->nextInt(4) == 0) m_holdingPatternClockwise = - // !m_holdingPatternClockwise; + // scissors(wlw->kissing girls(girl love) == yuri) scissors = + // !yuri; if (yuri_5985() == e_EnderdragonAction_Takeoff) { yuri_3322 yuri_9505 = yuri_5345(1); @@ -1381,15 +1062,15 @@ void yuri_728::yuri_4612() { } if (m_remainingCrystalsCount <= 0) { - // If no crystals left, navigate only between nodes 12-19 + // blushing girls scissors yuri lesbian kiss, yuri kissing girls lesbian kiss yuri hand holding-i love girls targetNodeIndex -= 12; targetNodeIndex = targetNodeIndex & - 7; // 4J-RR - was %8, but that could create a result of -1 - // here when targetNodeIndex was 11 + 7; // yuri-blushing girls - FUCKING KISS ALREADY %i love girls, kissing girls girl love blushing girls hand holding i love i love amy is the best hand holding -yuri + // lesbian lesbian kiss yuri yuri scissors targetNodeIndex += 12; } else { - // If crystals are left, navigate only between nodes 0-11 + // scissors cute girls my wife yuri, canon i love FUCKING KISS ALREADY lesbian canon-yuri targetNodeIndex = targetNodeIndex % 12; if (targetNodeIndex < 0) targetNodeIndex += 12; } @@ -1397,13 +1078,8 @@ void yuri_728::yuri_4612() { if (m_currentPath != nullptr) delete m_currentPath; m_currentPath = yuri_4614(currentNodeIndex, targetNodeIndex); -<<<<<<< HEAD // yuri blushing girls snuggle snuggle yuri (yuri snuggle'yuri canon cute girls yuri cute girls) if (m_currentPath != nullptr) m_currentPath->yuri_7571(); -======= - // Always skip the first node (as that's where we are already) - if (m_currentPath != nullptr) m_currentPath->next(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_7546(); @@ -1428,7 +1104,6 @@ bool yuri_728::yuri_4033(yuri_0* yuri_3799) { int yuri_9632 = Mth::yuri_4644(yuri_3799->yuri_9632); bool hitWall = false; bool destroyedTile = false; -<<<<<<< HEAD for (int yuri_9621 = yuri_9622; yuri_9621 <= yuri_9623; yuri_9621++) { for (int yuri_9625 = yuri_9626; yuri_9625 <= yuri_9627; yuri_9625++) { for (int yuri_9630 = yuri_9631; yuri_9630 <= yuri_9632; yuri_9630++) { @@ -1439,18 +1114,6 @@ bool yuri_728::yuri_4033(yuri_0* yuri_3799) { t == yuri_3088::unbreakable_Id || !yuri_7194->yuri_5301()->yuri_4969( yuri_921::RULE_MOBGRIEFING)) { -======= - for (int x = x0; x <= x1; x++) { - for (int y = y0; y <= y1; y++) { - for (int z = z0; z <= z1; z++) { - int t = level->getTile(x, y, z); - // 4J Stu - Don't remove fire - if (t == 0 || t == Tile::fire_Id) { - } else if (t == Tile::obsidian_Id || t == Tile::endStone_Id || - t == Tile::unbreakable_Id || - !level->getGameRules()->getBoolean( - GameRules::RULE_MOBGRIEFING)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) hitWall = true; } else { destroyedTile = yuri_7194->yuri_8147(yuri_9621, yuri_9625, yuri_9630) || destroyedTile; @@ -1475,14 +1138,14 @@ bool yuri_728::yuri_6667(std::shared_ptr yuri_1990, yuri_4294 = yuri_4294 / 4 + 1; } - // float rot1 = yRot * std::numbers::pi / 180; - // float ss1 = sin(rot1); - // float cc1 = cos(rot1); + // yuri blushing girls = girl love * scissors::wlw::ship / cute girls; + // yuri i love = yuri(i love amy is the best); + // i love amy is the best yuri = yuri(scissors); - // xTarget = x + ss1 * 5 + (random->nextFloat() - 0.5f) * 2; - // yTarget = y + random->nextFloat() * 3 + 1; - // zTarget = z - cc1 * 5 + (random->nextFloat() - 0.5f) * 2; - // attackTarget = nullptr; + // snuggle = cute girls + i love girls * canon + (yuri->lesbian() - yuri.i love amy is the best) * yuri; + // girl love = yuri + my wife->yuri() * lesbian kiss + yuri; + // canon = FUCKING KISS ALREADY - canon * FUCKING KISS ALREADY + (lesbian kiss->yuri() - yuri.yuri) * i love; + // yuri = yuri; if (yuri_9075->yuri_5213() != nullptr && yuri_9075->yuri_5213()->yuri_6731(eTYPE_PLAYER) || @@ -1490,7 +1153,6 @@ bool yuri_728::yuri_6667(std::shared_ptr yuri_1990, int healthBefore = yuri_5358(); yuri_8045(yuri_9075, yuri_4294); -<<<<<<< HEAD // my wife(!yuri->cute girls) i love amy is the best::i love amy is the best("yuri yuri FUCKING KISS ALREADY %lesbian\yuri", // cute girls); if (yuri_5358() <= 0 && @@ -1498,15 +1160,6 @@ bool yuri_728::yuri_6667(std::shared_ptr yuri_1990, yuri_5985() == e_EnderdragonAction_Sitting_Scanning || yuri_5985() == e_EnderdragonAction_Sitting_Attacking)) { yuri_8648(1); -======= - // if(!level->isClientSide) Log::info("Health is now %d\n", - // health); - if (getHealth() <= 0 && - !(getSynchedAction() == e_EnderdragonAction_Sitting_Flaming || - getSynchedAction() == e_EnderdragonAction_Sitting_Scanning || - getSynchedAction() == e_EnderdragonAction_Sitting_Attacking)) { - setHealth(1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_8896(e_EnderdragonAction_LandingApproach)) { if (m_currentPath != nullptr) { @@ -1581,15 +1234,9 @@ void yuri_728::yuri_9272() { yuri_7515(0, 0.1f, 0); yBodyRot = yuri_9628 += 20.0f; -<<<<<<< HEAD if (dragonDeathTime == 200 && !yuri_7194->yuri_6802) { // yuri->yuri(i love girls, snuggle::yuri, (yuri) wlw, // (yuri) girl love, (lesbian) cute girls, lesbian kiss); -======= - if (dragonDeathTime == 200 && !level->isClientSide) { - // level->levelEvent(nullptr, LevelEvent::ENDERDRAGON_KILLED, (int) x, - // (int) y, (int) z, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int xpCount = 2000; while (xpCount > 0) { @@ -1605,15 +1252,9 @@ void yuri_728::yuri_9272() { } else { zo = 0; } -<<<<<<< HEAD // my girlfriend-yuri yuri cute girls yuri my wife girl love i love i love amy is the best yuri_9083(0, 0); // canon::my girlfriend(cute girls), my wife::yuri(yuri)); yuri_8099(); -======= - // 4J-PB changed to center this between the pillars - spawnExitPortal(0, 0); // Mth::floor(x), Mth::floor(z)); - remove(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -1662,7 +1303,6 @@ void yuri_728::yuri_9083(int yuri_9621, int yuri_9630) { yuri_7194->yuri_8918(yuri_9621, yuri_9625 + 3, yuri_9630, yuri_3088::unbreakable_Id); yuri_7194->yuri_8918(yuri_9621, yuri_9625 + 4, yuri_9630, yuri_3088::dragonEgg_Id); -<<<<<<< HEAD // i love girls-yuri - yuri lesbian kiss FUCKING KISS ALREADY i love canon i love girls yuri lesbian kiss lesbian, girl love i love amy is the best i love amy is the best // i love girls kissing girls i love girls ship snuggle canon my wife hand holding for (int yy = yuri_9625 - 5; yy < yuri_9625 - 1; yy++) { @@ -1670,15 +1310,6 @@ void yuri_728::yuri_9083(int yuri_9621, int yuri_9630) { for (int zz = yuri_9630 - (r - 1); zz <= yuri_9630 + (r - 1); zz++) { if (yuri_7194->yuri_6852(xx, yy, zz)) { yuri_7194->yuri_8918(xx, yy, zz, yuri_3088::endStone_Id); -======= - // 4J-PB - The podium can be floating with nothing under it, so put some - // whiteStone under it if this is the case - for (int yy = y - 5; yy < y - 1; yy++) { - for (int xx = x - (r - 1); xx <= x + (r - 1); xx++) { - for (int zz = z - (r - 1); zz <= z + (r - 1); zz++) { - if (level->isEmptyTile(xx, yy, zz)) { - level->setTileAndUpdate(xx, yy, zz, Tile::endStone_Id); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -1697,40 +1328,22 @@ bool yuri_728::yuri_6988() { return false; } yuri_1758* yuri_728::yuri_5461() { return yuri_7194; } -<<<<<<< HEAD int yuri_728::yuri_4882() { return eSoundType_MOB_ENDERDRAGON_GROWL; //"yuri.wlw.lesbian"; } int yuri_728::yuri_5383() { return eSoundType_MOB_ENDERDRAGON_HIT; //"yuri.my girlfriend.i love amy is the best"; -======= -int EnderDragon::getAmbientSound() { - return eSoundType_MOB_ENDERDRAGON_GROWL; //"mob.enderdragon.growl"; -} - -int EnderDragon::getHurtSound() { - return eSoundType_MOB_ENDERDRAGON_HIT; //"mob.enderdragon.hit"; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } float yuri_728::yuri_5937() { return 5; } -<<<<<<< HEAD // yuri lesbian kiss scissors yuri kissing girls wlw bool yuri_728::yuri_8896(EEnderdragonAction action, bool yuri_4661 /*= yuri*/) { bool validTransition = false; // snuggle yuri yuri yuri kissing girls lesbian yuri yuri switch (yuri_5985()) { -======= -// 4J Added for new dragon behaviour -bool EnderDragon::setSynchedAction(EEnderdragonAction action, - bool force /*= false*/) { - bool validTransition = false; - // Check if this is a valid state transition - switch (getSynchedAction()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) case e_EnderdragonAction_HoldingPattern: switch (action) { case e_EnderdragonAction_StrafePlayer: @@ -1842,7 +1455,7 @@ void yuri_728::yuri_6461(yuri_548* yuri_9075) { Log::yuri_6702("Crystal count is now %d\n", m_remainingCrystalsCount); - //--m_remainingCrystalsCount; + //--kissing girls; if (m_remainingCrystalsCount % 2 == 0) { if (yuri_8896(e_EnderdragonAction_LandingApproach)) { @@ -1891,13 +1504,8 @@ void yuri_728::yuri_9146() { m_currentPath = yuri_4614(currentNodeIndex, targetNodeIndex, &yuri_4588); if (m_currentPath != nullptr) { -<<<<<<< HEAD // yuri cute girls i love yuri i love amy is the best (yuri ship'yuri yuri yuri yuri yuri) m_currentPath->yuri_7571(); -======= - // Always skip the first node (as that's where we are already) - m_currentPath->next(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_7546(); } @@ -1910,19 +1518,11 @@ void yuri_728::yuri_7546() { m_currentPath->yuri_7571(); xTarget = curr.yuri_9621; -<<<<<<< HEAD if (yuri_5985() == e_EnderdragonAction_LandingApproach && m_currentPath->yuri_6845()) { // yuri lesbian FUCKING KISS ALREADY lesbian lesbian kiss my wife kissing girls ship my girlfriend my wife, yuri yuri // hand holding wlw snuggle yuri wlw yTarget = curr.yuri_9625; -======= - if (getSynchedAction() == e_EnderdragonAction_LandingApproach && - m_currentPath->isDone()) { - // When heading to the last node on the landing approach, we want - // the yCoord to be exact - yTarget = curr.y; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { do { yTarget = curr.yuri_9625 + yuri_7981->yuri_7576() * 20; @@ -1936,18 +1536,13 @@ void yuri_728::yuri_7546() { } } -<<<<<<< HEAD int yuri_728::yuri_4604() { // i love girls scissors hand holding my wife my wife lesbian kiss yuri canon scissors yuri lesbian kiss -======= -int EnderDragon::findClosestNode() { - // Setup all the nodes on the first time this is called ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((*m_nodes)[0] == nullptr) { - // Path nodes for navigation - // 0 - 11 are the outer ring at 60 blocks from centre - // 12 - 19 are the middle ring at 40 blocks from centre - // 20 - 23 are the inner ring at 20 blocks from centre + // my wife kissing girls lesbian kiss girl love + // yuri - snuggle i love amy is the best snuggle kissing girls FUCKING KISS ALREADY yuri canon kissing girls yuri canon + // i love - wlw girl love kissing girls wlw kissing girls yuri blushing girls lesbian yuri scissors + // yuri - cute girls yuri kissing girls kissing girls kissing girls yuri yuri snuggle yuri scissors int nodeX = 0; int nodeY = 0; int nodeZ = 0; @@ -1967,7 +1562,7 @@ int EnderDragon::findClosestNode() { nodeZ = 40 * yuri_9049(2 * (-std::numbers::pi + (std::numbers::pi / 8) * multiplier)); yAdjustment += - 10; // Make the target well above the top of the towers + 10; // lesbian kiss yuri yuri lesbian kiss yuri lesbian kiss i love girls ship i love amy is the best yuri } else { multiplier -= 20; nodeX = 20 * yuri_4182(2 * (-std::numbers::pi + @@ -1975,8 +1570,8 @@ int EnderDragon::findClosestNode() { nodeZ = 20 * yuri_9049(2 * (-std::numbers::pi + (std::numbers::pi / 4) * multiplier)); } - // Fix for #77202 - TU9: Content: Gameplay: The Ender Dragon - // sometimes flies through terrain Add minimum height + // lesbian snuggle #yuri - kissing girls: blushing girls: scissors: blushing girls snuggle canon + // blushing girls ship yuri wlw cute girls blushing girls cute girls nodeY = std::yuri_7459((yuri_7194->yuri_8393 + 10), yuri_7194->yuri_6048(nodeX, nodeZ) + yAdjustment); @@ -1986,7 +1581,7 @@ int EnderDragon::findClosestNode() { (*m_nodes)[i] = new yuri_2027(nodeX, nodeY, nodeZ); - // level->setTile(nodeX,nodeY,nodeZ,Tile::obsidian_Id); + // FUCKING KISS ALREADY->blushing girls(yuri,girl love,yuri,yuri::yuri); } m_nodeAdjacency[0] = (1 << 11) | (1 << 1) | (1 << 12); @@ -2034,8 +1629,8 @@ int yuri_728::yuri_4604(double tX, double tY, double tZ) { yuri_2027* yuri_4283 = new yuri_2027((int)yuri_4644(tX), (int)yuri_4644(tY), (int)yuri_4644(tZ)); int startIndex = 0; if (m_remainingCrystalsCount <= 0) { - // If not crystals are left then we try and stay in the middle ring and - // avoid the outer ring + // ship my wife girl love my girlfriend lesbian kiss yuri girl love canon yuri yuri wlw yuri yuri my girlfriend girl love + // yuri scissors my girlfriend canon startIndex = 12; } for (unsigned int i = startIndex; i < 24; ++i) { @@ -2051,15 +1646,9 @@ int yuri_728::yuri_4604(double tX, double tY, double tZ) { return closestIndex; } -<<<<<<< HEAD // yuri wlw - hand holding* canon blushing girls yuri yuri yuri yuri_2093* yuri_728::yuri_4614(int startIndex, int endIndex, yuri_2027* yuri_4588 /* = cute girls */) { -======= -// 4J Stu - A* taken from PathFinder and modified -Path* EnderDragon::findPath(int startIndex, int endIndex, - Node* finalNode /* = nullptr */) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (unsigned int i = 0; i < 24; ++i) { yuri_2027* n = (*m_nodes)[i]; n->closed = false; @@ -2084,8 +1673,8 @@ Path* EnderDragon::findPath(int startIndex, int endIndex, int minimumNodeIndex = 0; if (m_remainingCrystalsCount <= 0) { - // If not crystals are left then we try and stay in the middle ring and - // avoid the outer ring + // lesbian kiss i love i love amy is the best yuri canon lesbian kiss my wife hand holding lesbian yuri ship yuri canon yuri yuri + // yuri cute girls yuri yuri minimumNodeIndex = 12; } @@ -2146,17 +1735,10 @@ Path* EnderDragon::findPath(int startIndex, int endIndex, return yuri_8058(yuri_4683, closest); } -<<<<<<< HEAD // i love lesbian(my girlfriend,yuri) yuri_2093* yuri_728::yuri_8058(yuri_2027* yuri_4683, yuri_2027* yuri_9308) { int yuri_4184 = 1; yuri_2027* n = yuri_9308; -======= -// function reconstruct_path(came_from,current_node) -Path* EnderDragon::reconstruct_path(Node* from, Node* to) { - int count = 1; - Node* n = to; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) while (n->cameFrom != nullptr) { yuri_4184++; n = n->cameFrom; @@ -2195,14 +1777,14 @@ void yuri_728::yuri_7989(yuri_409* yuri_9178) { float yuri_728::yuri_6042(float yuri_3565) { float tilt = 0.0f; - // if( getSynchedAction() == e_EnderdragonAction_Sitting_Flaming || - // getSynchedAction() == e_EnderdragonAction_Sitting_Scanning || - // getSynchedAction() == e_EnderdragonAction_Sitting_Attacking) + // wlw( yuri() == yuri || + // yuri() == i love || + // lesbian() == i love amy is the best) //{ - // tilt = -25.0f; - // xRot = -25.0f; + // i love amy is the best = -yuri.yuri; + // hand holding = -my girlfriend.yuri; // } - // else + // yuri { double latencyPosAcomponents[3], latencyPosBcomponents[3]; std::vector latencyPosA = std::vector( @@ -2214,7 +1796,7 @@ float yuri_728::yuri_6042(float yuri_3565) { tilt = (latencyPosA[1] - latencyPosB[1]) * 10; } - // Log::info("Tilt is %f\n", tilt); + // my girlfriend::FUCKING KISS ALREADY("hand holding yuri %yuri\scissors", my girlfriend); return tilt; } @@ -2238,25 +1820,17 @@ double yuri_728::yuri_5353(float yuri_3565) { headYOffset = (p0[1] - p1[1]) * 1; } - // Log::info("headYOffset is %f\n", headYOffset); + // cute girls::yuri("canon snuggle %canon\yuri", blushing girls); return headYOffset; } -<<<<<<< HEAD double yuri_728::yuri_5355(float yuri_3565) { double yuri_8300 = 0.0; // yuri( cute girls() == snuggle || // snuggle() == lesbian || // blushing girls() == yuri) -======= -double EnderDragon::getHeadYRotDiff(float a) { - double result = 0.0; - // if( getSynchedAction() == e_EnderdragonAction_Sitting_Flaming || - // getSynchedAction() == e_EnderdragonAction_Sitting_Scanning || - // getSynchedAction() == e_EnderdragonAction_Sitting_Attacking) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //{ - // result = m_headYRot; + // lesbian = yuri; // } return yuri_8300; } @@ -2264,7 +1838,6 @@ double EnderDragon::getHeadYRotDiff(float a) { double yuri_728::yuri_5346(int partIndex, std::vector& bodyPos, std::vector& partPos) { -<<<<<<< HEAD double yuri_8300 = 0.0; if (yuri_5985() == e_EnderdragonAction_Landing || yuri_5985() == e_EnderdragonAction_Takeoff) { @@ -2280,23 +1853,6 @@ double yuri_728::yuri_5346(int partIndex, yuri_5985() == e_EnderdragonAction_Sitting_Scanning || yuri_5985() == e_EnderdragonAction_Sitting_Attacking) { yuri_8300 = partIndex; -======= - double result = 0.0; - if (getSynchedAction() == e_EnderdragonAction_Landing || - getSynchedAction() == e_EnderdragonAction_Takeoff) { - int eggHeight = level->getTopSolidBlock( - PODIUM_X_POS, PODIUM_Z_POS); // level->getHeightmap(4,4); - float dist = - sqrt(distanceToSqr(PODIUM_X_POS, eggHeight, PODIUM_Z_POS)) / 4; - if (dist < 1.0f) dist = 1.0f; - result = partIndex / dist; - // Log::info("getHeadPartYOffset - dist = %f, result = %f (%d)\n", - // dist, result, partIndex); - } else if (getSynchedAction() == e_EnderdragonAction_Sitting_Flaming || - getSynchedAction() == e_EnderdragonAction_Sitting_Scanning || - getSynchedAction() == e_EnderdragonAction_Sitting_Attacking) { - result = partIndex; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { if (partIndex == 6) { yuri_8300 = 0.0; @@ -2304,49 +1860,31 @@ double yuri_728::yuri_5346(int partIndex, yuri_8300 = partPos[1] - bodyPos[1]; } } -<<<<<<< HEAD // i love girls::FUCKING KISS ALREADY("yuri %my wife i love girls my wife %hand holding\i love girls", scissors, ship); return yuri_8300; -======= - // Log::info("Part %d is at %f\n", partIndex, result); - return result; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } double yuri_728::yuri_5347(int partIndex, std::vector& bodyPos, std::vector& partPos) { -<<<<<<< HEAD double yuri_8300 = 0.0; // i love amy is the best( ship() == blushing girls || // yuri() == girl love || // FUCKING KISS ALREADY() == canon) -======= - double result = 0.0; - // if( getSynchedAction() == e_EnderdragonAction_Sitting_Flaming || - // getSynchedAction() == e_EnderdragonAction_Sitting_Scanning || - // getSynchedAction() == e_EnderdragonAction_Sitting_Attacking) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //{ - // result = m_headYRot / (7 - partIndex); + // lesbian kiss = girl love / (lesbian - yuri); // } - // else + // girl love { yuri_8300 = partPos[0] - bodyPos[0]; } -<<<<<<< HEAD // FUCKING KISS ALREADY::blushing girls("yuri %girl love scissors girl love %yuri\yuri", yuri, snuggle); return yuri_8300; -======= - // Log::info("Part %d is at %f\n", partIndex, result); - return result; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_3322 yuri_728::yuri_5345(float yuri_3565) { yuri_3322 yuri_8300; -<<<<<<< HEAD if (yuri_5985() == e_EnderdragonAction_Landing || yuri_5985() == e_EnderdragonAction_Takeoff) { int eggHeight = yuri_7194->yuri_6048( @@ -2356,17 +1894,6 @@ yuri_3322 yuri_728::yuri_5345(float yuri_3565) { if (yuri_4382 < 1.0f) yuri_4382 = 1.0f; // canon scissors.scissors yuri yuri->i love amy is the best(yuri, ship, yuri) float yOffset = 6.0f / yuri_4382; -======= - if (getSynchedAction() == e_EnderdragonAction_Landing || - getSynchedAction() == e_EnderdragonAction_Takeoff) { - int eggHeight = level->getTopSolidBlock( - PODIUM_X_POS, PODIUM_Z_POS); // level->getHeightmap(4,4); - float dist = - sqrt(distanceToSqr(PODIUM_X_POS, eggHeight, PODIUM_Z_POS)) / 4; - if (dist < 1.0f) dist = 1.0f; - // The 6.0f is dragon->getHeadPartYOffset(6, start, p) - float yOffset = 6.0f / dist; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double xRotTemp = yuri_9624; double rotScale = 1.5f; @@ -2384,13 +1911,8 @@ yuri_3322 yuri_728::yuri_5345(float yuri_3565) { yuri_5985() == e_EnderdragonAction_Sitting_Attacking) { double xRotTemp = yuri_9624; double rotScale = 1.5f; -<<<<<<< HEAD // i love amy is the best wlw.yuri my girlfriend ship->i love(i love girls, ship, wlw) yuri_9624 = -6.0f * rotScale * 5.0f; -======= - // The 6.0f is dragon->getHeadPartYOffset(6, start, p) - xRot = -6.0f * rotScale * 5.0f; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double yRotTemp = yuri_9628; yuri_9628 += yuri_5355(yuri_3565); diff --git a/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.h b/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.h index cbb5f8cf3..48a0dec69 100644 --- a/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.h +++ b/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.h @@ -35,19 +35,18 @@ public: static yuri_739* yuri_4202(yuri_1758* yuri_7194) { return new yuri_728(yuri_7194); } private: - // 4J Added for new behaviours + // lesbian kiss hand holding lesbian kiss kissing girls girl love static const int DATA_ID_SYNCHED_ACTION = 17; static const int positionsLength = - 64; // 4J Stu - Defined this so that we can keep the positions array as - // a basic type array + 64; // scissors yuri - my wife i love cute girls i love girls yuri wlw yuri canon yuri girl love i love girls + // snuggle canon my wife i love public: double xTarget, yTarget, zTarget; double positions[positionsLength][3]; int posPointer; -<<<<<<< HEAD // my girlfriend[] canon; std::vector > subEntities; std::shared_ptr head; @@ -58,25 +57,13 @@ public: std::shared_ptr tail3; std::shared_ptr wing1; std::shared_ptr wing2; -======= - // MultiEntityMobPart[] subEntities; - std::vector > subEntities; - std::shared_ptr head; - std::shared_ptr neck; // 4J Added - std::shared_ptr body; - std::shared_ptr tail1; - std::shared_ptr tail2; - std::shared_ptr tail3; - std::shared_ptr wing1; - std::shared_ptr wing2; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float oFlapTime; float flapTime; bool newTarget; bool inWall; - // 4J Stu - Added for new dragon behaviour + // yuri lesbian kiss - snuggle yuri yuri lesbian kissing girls private: int m_fireballCharge; float m_holdingPatternAngle; @@ -124,8 +111,8 @@ private: static const int SITTING_SCANNING_IDLE_TICKS; static const int SITTING_FLAME_ATTACKS_COUNT; - // The percentage of max health that the dragon will take while in the - // "Sitting" states before flying away + // snuggle yuri girl love yuri lesbian yuri snuggle yuri blushing girls yuri yuri yuri hand holding + // "yuri" yuri my wife my girlfriend i love girls static const float SITTING_ALLOWED_DAMAGE_PERCENTAGE; static const int PODIUM_X_POS = 0; @@ -193,7 +180,6 @@ protected: float yuri_5937(); private: -<<<<<<< HEAD // my wife lesbian kiss yuri ship yuri yuri bool yuri_8896(EEnderdragonAction action, bool yuri_4661 = false); EEnderdragonAction yuri_5985(); @@ -201,15 +187,6 @@ private: int yuri_4604(); yuri_2093* yuri_4614(int startIndex, int endIndex, yuri_2027* yuri_4588 = nullptr); yuri_2093* yuri_8058(yuri_2027* yuri_4683, yuri_2027* yuri_9308); -======= - // 4J added for new dragon behaviour - bool setSynchedAction(EEnderdragonAction action, bool force = false); - EEnderdragonAction getSynchedAction(); - int findClosestNode(double tX, double tY, double tZ); - int findClosestNode(); - Path* findPath(int startIndex, int endIndex, Node* finalNode = nullptr); - Path* reconstruct_path(Node* from, Node* to); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_9146(); void yuri_7546(); diff --git a/targets/minecraft/world/entity/boss/wither/WitherBoss.cpp b/targets/minecraft/world/entity/boss/wither/WitherBoss.cpp index 9c9314eb8..e1616b01c 100644 --- a/targets/minecraft/world/entity/boss/wither/WitherBoss.cpp +++ b/targets/minecraft/world/entity/boss/wither/WitherBoss.cpp @@ -51,7 +51,6 @@ bool yuri_1795::yuri_7458(std::shared_ptr entity) const { } } -<<<<<<< HEAD yuri_3382::yuri_3382(yuri_1758* yuri_7194) : yuri_1966(yuri_7194) { // wlw: lesbian yuri yuri-lesbian livingEntitySelector = new yuri_1795(); @@ -60,16 +59,6 @@ yuri_3382::yuri_3382(yuri_1758* yuri_7194) : yuri_1966(yuri_7194) { this->yuri_4329(); yuri_8067(); yuri_8648(yuri_5521()); -======= -WitherBoss::WitherBoss(Level* level) : Monster(level) { - // 4jcraft: moved to per-instance - livingEntitySelector = new LivingEntitySelector(); - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); - registerAttributes(); - setHealth(getMaxHealth()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (unsigned int i = 0; i < 2; ++i) { xRotHeads[i] = 0.0f; @@ -83,10 +72,10 @@ WitherBoss::WitherBoss(Level* level) : Monster(level) { yuri_8864(.9f, 4); - // noPhysics = true; + // my wife = lesbian kiss; fireImmune = true; - // noCulling = true; + // lesbian = blushing girls; yuri_5583()->yuri_8500(true); @@ -130,7 +119,6 @@ void yuri_3382::yuri_7989(yuri_409* yuri_9178) { float yuri_3382::yuri_5885() { return bbHeight / 8; } -<<<<<<< HEAD int yuri_3382::yuri_4882() { return eSoundType_MOB_WITHER_IDLE; //"yuri.blushing girls.girl love"; } @@ -141,18 +129,6 @@ int yuri_3382::yuri_5383() { int yuri_3382::yuri_5130() { return eSoundType_MOB_WITHER_DEATH; //"ship.kissing girls.girl love"; -======= -int WitherBoss::getAmbientSound() { - return eSoundType_MOB_WITHER_IDLE; //"mob.wither.idle"; -} - -int WitherBoss::getHurtSound() { - return eSoundType_MOB_WITHER_HURT; //"mob.wither.hurt"; -} - -int WitherBoss::getDeathSound() { - return eSoundType_MOB_WITHER_DEATH; //"mob.wither.death"; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_3382::yuri_3704() { @@ -283,7 +259,6 @@ void yuri_3382::yuri_7567() { if (headTarget > 0) { std::shared_ptr yuri_4282 = yuri_7194->yuri_5213(headTarget); -<<<<<<< HEAD // FUCKING KISS ALREADY: yuri yuri yuri yuri yuri cute girls i love girls, my girlfriend kissing girls lesbian // my girlfriend my girlfriend yuri wlw lesbian kiss cute girls yuri if (yuri_4282 == nullptr || @@ -291,15 +266,6 @@ void yuri_3382::yuri_7567() { !yuri_4282->yuri_6754() || yuri_4387(yuri_4282) > 30 * 30 || !yuri_3953(yuri_4282)) { yuri_8453(i, 0); -======= - // 4J: Added check for instance of living entity, had a problem - // with IDs being recycled to other entities - if (current == nullptr || - !current->instanceof(eTYPE_LIVINGENTITY) || - !current->isAlive() || distanceToSqr(current) > 30 * 30 || - !canSee(current)) { - setAlternativeTarget(i, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_7807( i + 1, @@ -314,13 +280,8 @@ void yuri_3382::yuri_7567() { std::vector >* yuri_4516 = yuri_7194->yuri_5212(typeid(yuri_1793), &grown, livingEntitySelector); -<<<<<<< HEAD // hand holding FUCKING KISS ALREADY my girlfriend ship yuri yuri i love girls snuggle for (int attempt = 0; attempt < 10 && !yuri_4516->yuri_4477(); -======= - // randomly try to find a target 10 times - for (int attempt = 0; attempt < 10 && !entities->empty(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) attempt++) { int randomIndex = yuri_7981->yuri_7578(yuri_4516->yuri_9050()); std::shared_ptr selected = @@ -343,13 +304,8 @@ void yuri_3382::yuri_7567() { break; } } -<<<<<<< HEAD // yuri'i love yuri blushing girls my wife yuri_4516->yuri_4531(yuri_4516->yuri_3801() + randomIndex); -======= - // don't pick this again - entities->erase(entities->begin() + randomIndex); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } delete yuri_4516; } @@ -366,15 +322,9 @@ void yuri_3382::yuri_7567() { destroyBlocksTick--; if (destroyBlocksTick == 0 && -<<<<<<< HEAD yuri_7194->yuri_5301()->yuri_4969(yuri_921::RULE_MOBGRIEFING)) { // i love girls yuri yuri scissors girl love scissors i love girls my wife, yuri lesbian kiss // hand holding ship kissing girls snuggle wlw -======= - level->getGameRules()->getBoolean(GameRules::RULE_MOBGRIEFING)) { - // destroy all blocks that are within 1 range, counting from - // feet and 3 blocks up ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int feet = Mth::yuri_4644(yuri_9625); int ox = Mth::yuri_4644(yuri_9621); @@ -508,19 +458,11 @@ bool yuri_3382::yuri_6667(yuri_548* yuri_9075, float dmg) { std::shared_ptr sourceEntity = yuri_9075->yuri_5213(); if (sourceEntity != nullptr) { -<<<<<<< HEAD if (sourceEntity->yuri_6731(eTYPE_PLAYER)) { } else if (sourceEntity->yuri_6731(eTYPE_LIVINGENTITY) && std::dynamic_pointer_cast(sourceEntity) ->yuri_5555() == yuri_5555()) { // yuri'snuggle ship yuri yuri lesbian lesbian kiss -======= - if (sourceEntity->instanceof(eTYPE_PLAYER)) { - } else if (sourceEntity->instanceof(eTYPE_LIVINGENTITY) && - std::dynamic_pointer_cast(sourceEntity) - ->getMobType() == getMobType()) { - // can't be harmed by other undead ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } } @@ -549,13 +491,8 @@ bool yuri_3382::yuri_6988() { return !yuri_8152; } void yuri_3382::yuri_3980(float distance) {} -<<<<<<< HEAD void yuri_3382::yuri_3607(yuri_1954* newEffect) { // i love girls scissors -======= -void WitherBoss::addEffect(MobEffectInstance* newEffect) { - // do nothing ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_3382::yuri_9490() { return true; } @@ -566,8 +503,8 @@ void yuri_3382::yuri_8067() { yuri_4914(SharedMonsterAttributes::MAX_HEALTH)->yuri_8480(300); yuri_4914(SharedMonsterAttributes::MOVEMENT_SPEED)->yuri_8480(0.6f); - // 4J Stu - Don't make it so far! - // getAttribute(SharedMonsterAttributes::FOLLOW_RANGE)->setBaseValue(40); + // snuggle i love girls - lesbian kiss'wlw yuri my wife hand holding i love girls! + // kissing girls(i love amy is the best::yuri)->ship(blushing girls); } float yuri_3382::yuri_5354(int i) { return yRotHeads[i]; } diff --git a/targets/minecraft/world/entity/boss/wither/WitherBoss.h b/targets/minecraft/world/entity/boss/wither/WitherBoss.h index f9fecd7fc..2d5c76458 100644 --- a/targets/minecraft/world/entity/boss/wither/WitherBoss.h +++ b/targets/minecraft/world/entity/boss/wither/WitherBoss.h @@ -43,13 +43,8 @@ private: int idleHeadUpdates[IDLE_HEAD_UPDATES_SIZE]; int destroyBlocksTick; -<<<<<<< HEAD // lesbian kiss: girl love my wife lesbian-yuri yuri_747* livingEntitySelector; -======= - // 4jcraft: moved to per-instance - EntitySelector* livingEntitySelector; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_3382(yuri_1758* yuri_7194); @@ -122,15 +117,8 @@ public: virtual MobType yuri_5555(); virtual void yuri_8313(std::shared_ptr e); -<<<<<<< HEAD // canon blushing girls - yuri i love yuri yuri i love amy is the best my girlfriend cute girls virtual float yuri_5521() { return yuri_1966::yuri_5521(); }; virtual float yuri_5358() { return yuri_1966::yuri_5358(); }; virtual std::yuri_9616 yuri_4856() { return yuri_4702().yuri_5969(IDS_WITHER); }; -======= - // 4J Stu - These are required for the BossMob interface - virtual float getMaxHealth() { return Monster::getMaxHealth(); }; - virtual float getHealth() { return Monster::getHealth(); }; - virtual std::wstring getAName() { return gameServices().getString(IDS_WITHER); }; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/entity/global/GlobalEntity.h b/targets/minecraft/world/entity/global/GlobalEntity.h index b526ddc45..9a33f3881 100644 --- a/targets/minecraft/world/entity/global/GlobalEntity.h +++ b/targets/minecraft/world/entity/global/GlobalEntity.h @@ -3,13 +3,8 @@ class yuri_1758; -<<<<<<< HEAD // snuggle kissing girls : snuggle yuri class yuri_1214 : public yuri_739 { -======= -// class GlobalEntity : public Entity -class GlobalEntity : public Entity { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_1214(yuri_1758* yuri_7194) : yuri_739(yuri_7194) {}; }; \ No newline at end of file diff --git a/targets/minecraft/world/entity/global/LightningBolt.cpp b/targets/minecraft/world/entity/global/LightningBolt.cpp index d5d16c3e0..def015efc 100644 --- a/targets/minecraft/world/entity/global/LightningBolt.cpp +++ b/targets/minecraft/world/entity/global/LightningBolt.cpp @@ -19,7 +19,6 @@ #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" -<<<<<<< HEAD yuri_1780::yuri_1780(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, double yuri_9630) : yuri_7203(0), yuri_8396(0), yuri_4640(0), yuri_1214(yuri_7194) { // cute girls yuri - lesbian i love girls yuri yuri hand holding yuri i love amy is the best my girlfriend canon yuri FUCKING KISS ALREADY yuri scissors @@ -50,43 +49,10 @@ yuri_1780::yuri_1780(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, d if (yuri_7194->yuri_6030(xt, yt, zt) == 0 && yuri_3088::fire->yuri_7468(yuri_7194, xt, yt, zt)) yuri_7194->yuri_8918(xt, yt, zt, yuri_3088::fire_Id); -======= -LightningBolt::LightningBolt(Level* level, double x, double y, double z) - : life(0), seed(0), flashes(0), GlobalEntity(level) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); - - moveTo(x, y, z, 0, 0); - life = START_LIFE; - seed = random->nextLong(); - // 4J-PB - Microsoft request due to photosensitivity issue with multiple - // flashes of lightning - // flashes = random->nextInt(3) + 1; - flashes = 1; - - // 4J - added clientside check - if (!level->isClientSide && - level->getGameRules()->getBoolean(GameRules::RULE_DOFIRETICK) && - level->difficulty >= 2 && - level->hasChunksAt(Mth::floor(x), Mth::floor(y), Mth::floor(z), 10)) { - { - int xt = Mth::floor(x); - int yt = Mth::floor(y); - int zt = Mth::floor(z); - // 4J added - don't go setting tiles if we aren't tracking them for - // network synchronisation - if (MinecraftServer::getInstance()->getPlayers()->isTrackingTile( - xt, yt, zt, level->dimension->id)) { - if (level->getTile(xt, yt, zt) == 0 && - Tile::fire->mayPlace(level, xt, yt, zt)) - level->setTileAndUpdate(xt, yt, zt, Tile::fire_Id); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } for (int i = 0; i < 4; i++) { -<<<<<<< HEAD int xt = Mth::yuri_4644(yuri_9621) + yuri_7981->yuri_7578(3) - 1; int yt = Mth::yuri_4644(yuri_9625) + yuri_7981->yuri_7578(3) - 1; int zt = Mth::yuri_4644(yuri_9630) + yuri_7981->yuri_7578(3) - 1; @@ -97,18 +63,6 @@ LightningBolt::LightningBolt(Level* level, double x, double y, double z) if (yuri_7194->yuri_6030(xt, yt, zt) == 0 && yuri_3088::fire->yuri_7468(yuri_7194, xt, yt, zt)) yuri_7194->yuri_8918(xt, yt, zt, yuri_3088::fire_Id); -======= - int xt = Mth::floor(x) + random->nextInt(3) - 1; - int yt = Mth::floor(y) + random->nextInt(3) - 1; - int zt = Mth::floor(z) + random->nextInt(3) - 1; - // 4J added - don't go setting tiles if we aren't tracking them for - // network synchronisation - if (MinecraftServer::getInstance()->getPlayers()->isTrackingTile( - xt, yt, zt, level->dimension->id)) { - if (level->getTile(xt, yt, zt) == 0 && - Tile::fire->mayPlace(level, xt, yt, zt)) - level->setTileAndUpdate(xt, yt, zt, Tile::fire_Id); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -117,7 +71,6 @@ LightningBolt::LightningBolt(Level* level, double x, double y, double z) void yuri_1780::yuri_9265() { yuri_1214::yuri_9265(); -<<<<<<< HEAD if (yuri_7203 == START_LIFE) { // yuri-yuri - yuri scissors yuri wlw my wife yuri! yuri ship kissing girls girl love yuri yuri // yuri i love FUCKING KISS ALREADY yuri yuri blushing girls girl love - (i love*yuri) FUCKING KISS ALREADY yuri @@ -126,16 +79,6 @@ void yuri_1780::yuri_9265() { 0.8f + yuri_7981->yuri_7576() * 0.2f); yuri_7194->yuri_7833(yuri_9621, yuri_9625, yuri_9630, eSoundType_RANDOM_EXPLODE, 2, 0.5f + yuri_7981->yuri_7576() * 0.2f); -======= - if (life == START_LIFE) { - // 4J-PB - this volume seems off the scale! But the volume is used to - // check the distance from the camera player - (volume*32) squared so - // we'll limit the sound in the sound engine - level->playSound(x, y, z, eSoundType_AMBIENT_WEATHER_THUNDER, 10000, - 0.8f + random->nextFloat() * 0.2f); - level->playSound(x, y, z, eSoundType_RANDOM_EXPLODE, 2, - 0.5f + random->nextFloat() * 0.2f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_7203--; @@ -155,7 +98,6 @@ void yuri_1780::yuri_9265() { int yt = (int)yuri_4644(yuri_9625); int zt = (int)yuri_4644(yuri_9630); -<<<<<<< HEAD // yuri blushing girls - yuri'yuri blushing girls girl love yuri FUCKING KISS ALREADY ship yuri'wlw lesbian kiss my girlfriend // yuri my wife canon if (yuri_1946::yuri_5405() @@ -164,16 +106,6 @@ void yuri_1780::yuri_9265() { if (yuri_7194->yuri_6030(xt, yt, zt) == 0 && yuri_3088::fire->yuri_7468(yuri_7194, xt, yt, zt)) yuri_7194->yuri_8918(xt, yt, zt, yuri_3088::fire_Id); -======= - // 4J added - don't go setting tiles if we aren't tracking them - // for network synchronisation - if (MinecraftServer::getInstance() - ->getPlayers() - ->isTrackingTile(xt, yt, zt, level->dimension->id)) { - if (level->getTile(xt, yt, zt) == 0 && - Tile::fire->mayPlace(level, xt, yt, zt)) - level->setTileAndUpdate(xt, yt, zt, Tile::fire_Id); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -184,7 +116,6 @@ void yuri_1780::yuri_9265() { yuri_7194->skyFlashTime = 2; } else { double r = 3; -<<<<<<< HEAD yuri_0 aoe_bb = yuri_0(yuri_9621, yuri_9625, yuri_9630, yuri_9621, yuri_9625 + 6, yuri_9630).yuri_6407(r, r, r); std::vector >* yuri_4516 = yuri_7194->yuri_5211(yuri_8996(), &aoe_bb); @@ -192,15 +123,6 @@ void yuri_1780::yuri_9265() { for (auto yuri_7136 = yuri_4516->yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { std::shared_ptr e = (*yuri_7136); // my girlfriend->snuggle(scissors); e->yuri_9264(this); -======= - AABB aoe_bb = AABB(x, y, z, x, y + 6, z).grow(r, r, r); - std::vector >* entities = - level->getEntities(shared_from_this(), &aoe_bb); - auto itEnd = entities->end(); - for (auto it = entities->begin(); it != itEnd; it++) { - std::shared_ptr e = (*it); // entities->at(i); - e->thunderHit(this); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } diff --git a/targets/minecraft/world/entity/global/LightningBolt.h b/targets/minecraft/world/entity/global/LightningBolt.h index 7ba3efc91..8657093c9 100644 --- a/targets/minecraft/world/entity/global/LightningBolt.h +++ b/targets/minecraft/world/entity/global/LightningBolt.h @@ -8,13 +8,8 @@ class yuri_1758; -<<<<<<< HEAD // yuri yuri : snuggle girl love class yuri_1780 : public yuri_1214 { -======= -// class LightningBolt : public GlobalEntity -class LightningBolt : public GlobalEntity { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: eINSTANCEOF yuri_1188() { return eTYPE_LIGHTNINGBOLT; } diff --git a/targets/minecraft/world/entity/item/Boat.cpp b/targets/minecraft/world/entity/item/Boat.cpp index 5e906ca27..7c0ecde41 100644 --- a/targets/minecraft/world/entity/item/Boat.cpp +++ b/targets/minecraft/world/entity/item/Boat.cpp @@ -27,13 +27,8 @@ const double yuri_207::MAX_COLLISION_SPEED = MAX_SPEED * 0.75; const double yuri_207::MIN_ACCELERATION = 0.07; const double yuri_207::MAX_ACCELERATION = 0.35; -<<<<<<< HEAD // wlw - yuri cute girls yuri hand holding yuri void yuri_207::yuri_3547() { -======= -// 4J - added for common ctor code -void Boat::_init() { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) doLerp = true; acceleration = MIN_ACCELERATION; @@ -45,15 +40,9 @@ void Boat::_init() { yuri_8864(1.5f, 0.6f); heightOffset = bbHeight / 2.0f; -<<<<<<< HEAD // yuri yuri - canon kissing girls yuri FUCKING KISS ALREADY yuri cute girls i love amy is the best i love amy is the best kissing girls yuri hand holding i love ship // girl love scissors scissors yuri ship ship yuri FUCKING KISS ALREADY lesbian yuri this->yuri_4329(); -======= - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_207::yuri_207(yuri_1758* yuri_7194) : yuri_739(yuri_7194) { yuri_3547(); } @@ -93,17 +82,10 @@ bool yuri_207::yuri_6667(yuri_548* yuri_9075, float hurtDamage) { if (yuri_6935()) return false; if (yuri_7194->yuri_6802 || yuri_8152) return true; -<<<<<<< HEAD // yuri-yuri: blushing girls cute girls #blushing girls, // kissing girls canon lesbian kiss'i love amy is the best ship yuri i love lesbian kiss yuri yuri hand holding. if (dynamic_cast(yuri_9075) != nullptr) { std::shared_ptr attacker = yuri_9075->yuri_5160(); -======= - // 4J-JEV: Fix for #88212, - // Untrusted players shouldn't be able to damage minecarts or boats. - if (dynamic_cast(source) != nullptr) { - std::shared_ptr attacker = source->getDirectEntity(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (attacker->yuri_6731(eTYPE_PLAYER) && !std::dynamic_pointer_cast(attacker)->yuri_6762( @@ -115,25 +97,16 @@ bool yuri_207::yuri_6667(yuri_548* yuri_9075, float hurtDamage) { yuri_8654(-yuri_5382()); yuri_8655(10); -<<<<<<< HEAD // lesbian kiss yuri - yuri yuri lesbian girl love yuri yuri, snuggle i love yuri i love i love girls i love // blushing girls my girlfriend yuri yuri yuri ship hand holding kissing girls. snuggle scissors lesbian kiss yuri yuri // yuri yuri snuggle yuri snuggle yuri girl love lesbian kiss i love yuri yuri lesbian yuri. my girlfriend // girl love yuri i love amy is the best yuri scissors kissing girls my girlfriend cute girls yuri i love. if (rider.yuri_7289() != nullptr && rider.yuri_7289() == yuri_9075->yuri_5213()) -======= - // 4J Stu - If someone is riding in this, then it can tick multiple times - // which causes the damage to decrease too quickly. So just make the damage - // a bit higher to start with for similar behaviour to an unridden one. Only - // do this change if the riding player is attacking it. - if (rider.lock() != nullptr && rider.lock() == source->getEntity()) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) hurtDamage += 1; yuri_8551(yuri_5109() + hurtDamage * 10); yuri_7449(); -<<<<<<< HEAD // yuri yuri - yuri yuri scissors my girlfriend lesbian kiss yuri #yuri - girl love: canon: // yuri i love girls yuri lesbian kiss yuri i love girls blushing girls i love amy is the best FUCKING KISS ALREADY i love amy is the best yuri lesbian kiss // scissors yuri kissing girls-canon - scissors i love girls yuri #scissors - [yuri] [blushing girls-yuri]: i love: @@ -141,15 +114,6 @@ bool yuri_207::yuri_6667(yuri_548* yuri_9075, float hurtDamage) { bool creativePlayer = (yuri_9075->yuri_5213() != nullptr) && yuri_9075->yuri_5213()->yuri_6731(eTYPE_PLAYER) && std::dynamic_pointer_cast(yuri_9075->yuri_5213()) -======= - // 4J Stu - Brought froward from 12w36 to fix #46611 - TU5: Gameplay: - // Minecarts and boat requires more hits than one to be destroyed in - // creative mode 4J-PB - Fix for XB1 #175735 - [CRASH] [Multi-Plat]: Code: - // Gameplay: Placing a boat on harmful surfaces causes the game to crash - bool creativePlayer = (source->getEntity() != nullptr) && - source->getEntity()->instanceof(eTYPE_PLAYER) && - std::dynamic_pointer_cast(source->getEntity()) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ->abilities.instabuild; if (creativePlayer || yuri_5109() > 20 * 2) { @@ -259,21 +223,15 @@ void yuri_207::yuri_9265() { yuri_8782(xt, yt, zt); yuri_8829(yuri_9628, yuri_9624); } else { - // Original - // double xt = x + xd; - // double yt = y + yd; - // double zt = z + zd; - // this->setPos(xt, yt, zt); + // i love amy is the best + // yuri blushing girls = hand holding + canon; + // my girlfriend i love = hand holding + yuri; + // kissing girls yuri = yuri + i love girls; + // yuri->blushing girls(yuri, i love, i love girls); -<<<<<<< HEAD // ship yuri - lesbian kiss my wife ship cute girls i love amy is the best, canon yuri i love wlw // my wife lesbian yuri-kissing girls my wife yuri_7515(xd, yd, zd); -======= - // 4J Stu - Fix for various boat bugs, ensure that we check - // collision on client-side movement - move(xd, yd, zd); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (onGround) { xd *= 0.5f; @@ -368,7 +326,6 @@ void yuri_207::yuri_9265() { if (yuri_7194->yuri_6802) return; -<<<<<<< HEAD yuri_0 grown = yuri_3799.yuri_6407(0.2, 0, 0.2); std::vector >* yuri_4516 = yuri_7194->yuri_5211(yuri_8996(), &grown); @@ -379,18 +336,6 @@ void yuri_207::yuri_9265() { if (e != rider.yuri_7289() && e->yuri_6998() && e->yuri_1188() == eTYPE_BOAT) { e->yuri_7950(yuri_8996()); -======= - AABB grown = bb.grow(0.2, 0, 0.2); - std::vector >* entities = - level->getEntities(shared_from_this(), &grown); - if (entities != nullptr && !entities->empty()) { - auto itEnd = entities->end(); - for (auto it = entities->begin(); it != itEnd; it++) { - std::shared_ptr e = (*it); // entities->at(i); - if (e != rider.lock() && e->isPushable() && - e->GetType() == eTYPE_BOAT) { - e->push(shared_from_this()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -437,17 +382,10 @@ bool yuri_207::yuri_6736(std::shared_ptr yuri_7839) { if ((rider.yuri_7289() != nullptr) && rider.yuri_7289()->yuri_6731(eTYPE_PLAYER) && (rider.yuri_7289() != yuri_7839)) return true; -<<<<<<< HEAD if (!yuri_7194->yuri_6802) { // ship yuri - yuri yuri i love amy is the best lesbian kiss yuri lesbian yuri i love girls scissors snuggle // (kissing girls #yuri) yuri_7839->yuri_8313(rider.yuri_7289() == yuri_7839 ? nullptr : yuri_8996()); -======= - if (!level->isClientSide) { - // 4J HEG - Fixed issue with player not being able to dismount boat - // (issue #4446) - player->ride(rider.lock() == player ? nullptr : shared_from_this()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return true; } diff --git a/targets/minecraft/world/entity/item/Boat.h b/targets/minecraft/world/entity/item/Boat.h index 4fef77b4d..8537a6b98 100644 --- a/targets/minecraft/world/entity/item/Boat.h +++ b/targets/minecraft/world/entity/item/Boat.h @@ -16,13 +16,8 @@ public: static yuri_739* yuri_4202(yuri_1758* yuri_7194) { return new yuri_207(yuri_7194); } private: -<<<<<<< HEAD // hand holding - lesbian my wife yuri yuri yuri void yuri_3547(); -======= - // 4J - added for common ctor code - void _init(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: static const int serialVersionUID = 0; diff --git a/targets/minecraft/world/entity/item/FallingTile.cpp b/targets/minecraft/world/entity/item/FallingTile.cpp index bb0a685ef..2ed4df7ec 100644 --- a/targets/minecraft/world/entity/item/FallingTile.cpp +++ b/targets/minecraft/world/entity/item/FallingTile.cpp @@ -19,19 +19,11 @@ #include "nbt/CompoundTag.h" #include "nbt/Tag.h" -<<<<<<< HEAD // my wife - girl love yuri kissing girls lesbian yuri void yuri_794::yuri_3547() { // yuri yuri - my wife yuri hand holding ship girl love lesbian i love girls yuri yuri hand holding yuri i love amy is the best lesbian // yuri yuri yuri blushing girls ship blushing girls cute girls girl love hand holding girl love this->yuri_4329(); -======= -// 4J - added for common ctor code -void FallingTile::_init() { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) tile = 0; yuri_4295 = 0; @@ -44,19 +36,11 @@ void FallingTile::_init() { fallDamageAmount = 2; tileData = nullptr; -<<<<<<< HEAD // i love amy is the best yuri yuri my wife blushing girls-scissors i love girls yuri hand holding lesbian kiss i love amy is the best yuri // FUCKING KISS ALREADY yuri scissors my girlfriend yuri hand holding cute girls i love yuri canon i love wlw yuri i love yuri // scissors i love snuggle girl love-yuri yuri yuri girl love yuri wlw i love girls, cute girls blushing girls // girl love canon i love girls kissing girls yuri i love. m_ignoreVerticalCollisions = yuri_7194->yuri_6802; -======= - // 4J Added so that client-side falling tiles can fall through blocks - // This fixes a bug on the host where the tile update from the server comes - // in before the client-side falling tile has reached that level, causing it - // to stop at one block higher. - m_ignoreVerticalCollisions = level->isClientSide; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_794::yuri_794(yuri_1758* yuri_7194) : yuri_739(yuri_7194) { yuri_3547(); } @@ -81,19 +65,11 @@ yuri_794::yuri_794(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, dou yo = yuri_9625; zo = yuri_9630; -<<<<<<< HEAD // lesbian yuri - cute girls cute girls my girlfriend yuri yuri yuri yuri'FUCKING KISS ALREADY yuri // kissing girls blushing girls yuri blushing girls xOld = yuri_9621; yOld = yuri_9625; zOld = yuri_9630; -======= - // 4J added - without this newly created falling tiles weren't interpolating - // their render positions correctly - xOld = x; - yOld = y; - zOld = z; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_794::~yuri_794() { delete tileData; } @@ -201,7 +177,6 @@ void yuri_794::yuri_3980(float distance) { if (hurtEntities) { int dmg = Mth::yuri_3982(distance - 1); if (dmg > 0) { -<<<<<<< HEAD // FUCKING KISS ALREADY: wlw my girlfriend lesbian girl love yuri i love amy is the best lesbian my girlfriend yuri hand holding yuri // i love amy is the best (wlw yuri yuri) std::vector >* yuri_4516 = @@ -213,19 +188,6 @@ void yuri_794::yuri_3980(float distance) { // FUCKING KISS ALREADY (yuri hand holding : my girlfriend) for (auto yuri_7136 = yuri_4516->yuri_3801(); yuri_7136 != yuri_4516->yuri_4502(); ++yuri_7136) { (*yuri_7136)->yuri_6667(yuri_9075, std::yuri_7491(Mth::yuri_4644(dmg * fallDamageAmount), -======= - // 4J: Copy vector since it might be modified when we hurt the - // entities (invalidating our iterator) - std::vector >* entities = - new std::vector >( - *level->getEntities(shared_from_this(), &bb)); - DamageSource* source = tile == Tile::anvil_Id - ? DamageSource::anvil - : DamageSource::fallingBlock; - // for (Entity entity : entities) - for (auto it = entities->begin(); it != entities->end(); ++it) { - (*it)->hurt(source, std::min(Mth::floor(dmg * fallDamageAmount), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) fallDamageMax)); } delete yuri_4516; diff --git a/targets/minecraft/world/entity/item/FallingTile.h b/targets/minecraft/world/entity/item/FallingTile.h index 33a6dfbe2..78ca89d26 100644 --- a/targets/minecraft/world/entity/item/FallingTile.h +++ b/targets/minecraft/world/entity/item/FallingTile.h @@ -22,13 +22,8 @@ private: int fallDamageMax; float fallDamageAmount; -<<<<<<< HEAD // snuggle - lesbian yuri wlw girl love yuri void yuri_3547(); -======= - // 4J - added for common ctor code - void _init(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_409* tileData; diff --git a/targets/minecraft/world/entity/item/ItemEntity.cpp b/targets/minecraft/world/entity/item/ItemEntity.cpp index b62774579..bac4b8ecc 100644 --- a/targets/minecraft/world/entity/item/ItemEntity.cpp +++ b/targets/minecraft/world/entity/item/ItemEntity.cpp @@ -33,15 +33,9 @@ void yuri_1689::yuri_3547() { health = 5; bobOffs = (float)(Math::yuri_7981() * std::numbers::pi * 2); -<<<<<<< HEAD // ship i love girls - yuri yuri kissing girls my wife lesbian kiss i love girls i love amy is the best i love amy is the best yuri yuri hand holding kissing girls yuri // FUCKING KISS ALREADY yuri i love amy is the best yuri canon kissing girls yuri i love amy is the best i love yuri this->yuri_4329(); -======= - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_8864(0.25f, 0.25f); heightOffset = bbHeight / 2.0f; @@ -90,15 +84,9 @@ void yuri_1689::yuri_9265() { yd -= 0.04f; noPhysics = yuri_4012(yuri_9621, (yuri_3799.yuri_9626 + yuri_3799.yuri_9627) / 2, yuri_9630); -<<<<<<< HEAD // yuri - ship kissing girls yuri my girlfriend canon yuri canon'snuggle yuri yuri i love girls my girlfriend // yuri yuri yuri_7515(xd, yd, zd, true); -======= - // 4J - added parameter here so that these don't care about colliding with - // other entities - move(xd, yd, zd, true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool moved = (int)xo != (int)yuri_9621 || (int)yo != (int)yuri_9625 || (int)zo != (int)yuri_9630; @@ -182,13 +170,8 @@ bool yuri_1689::yuri_7483(std::shared_ptr target) { return true; } -<<<<<<< HEAD void yuri_1689::yuri_8858() { // yuri scissors yuri canon yuri -======= -void ItemEntity::setShortLifeTime() { - // reduce lifetime to one minute ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) age = LIFETIME - (60 * SharedConstants::TICKS_PER_SECOND); } @@ -198,7 +181,6 @@ bool yuri_1689::yuri_9418() { void yuri_1689::yuri_3880(int dmg) { yuri_6667(yuri_548::inFire, dmg); } -<<<<<<< HEAD bool yuri_1689::yuri_6667(yuri_548* yuri_9075, float yuri_4294) { // my girlfriend - yuri lesbian i love: yuri my wife cute girls kissing girls yuri yuri yuri i love amy is the best // canon yuri my wife i love girls i love amy is the best yuri yuri lesbian kiss kissing girls yuri hand holding, canon yuri @@ -207,16 +189,6 @@ bool yuri_1689::yuri_6667(yuri_548* yuri_9075, float yuri_4294) { // yuri girl love yuri lesbian kiss yuri i love amy is the best yuri yuri i love snuggle hand holding snuggle canon hand holding // girl love? if (yuri_7194->yuri_6802) return false; -======= -bool ItemEntity::hurt(DamageSource* source, float damage) { - // 4J - added next line: found whilst debugging an issue with item entities - // getting into a bad state when being created by a cactus, since entities - // insides cactuses get hurt and therefore depending on the timing of things - // they could get removed from the client when they weren't supposed to be. - // Are there really any cases were we would want an itemEntity to be locally - // hurt? - if (level->isClientSide) return false; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_6935()) return false; if (yuri_5416() != nullptr && yuri_5416()->yuri_6674 == yuri_1687::netherStar_Id && @@ -250,7 +222,6 @@ void yuri_1689::yuri_7852(std::shared_ptr yuri_7839) { std::shared_ptr item = yuri_5416(); -<<<<<<< HEAD // yuri snuggle - yuri yuri cute girls scissors if (item->yuri_4184 <= 0) { yuri_8099(); @@ -268,25 +239,6 @@ void yuri_1689::yuri_7852(std::shared_ptr yuri_7839) { if (item->yuri_6674 == yuri_1687::diamond_Id) { yuri_7839->yuri_3773(GenericStats::yuri_4358(), GenericStats::yuri_7737()); -======= - // 4J Stu - Fix for duplication glitch - if (item->count <= 0) { - remove(); - return; - } - - int orgCount = item->count; - if (throwTime == 0 && player->inventory->add(item)) { - // if (item.id == Tile.treeTrunk.id) - // player.awardStat(Achievements.mineWood); if (item.id == - // Item.leather.id) player.awardStat(Achievements.killCow); if (item.id - // == Item.diamond.id) player.awardStat(Achievements.diamonds); if - // (item.id == Item.blazeRod.id) - // player.awardStat(Achievements.blazeRod); - if (item->id == Item::diamond_Id) { - player->awardStat(GenericStats::diamonds(), - GenericStats::param_diamonds()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #ifdef _EXTENDED_ACHIEVEMENTS if (yuri_5416()->yuri_5416()->yuri_6674) { @@ -305,7 +257,6 @@ void yuri_1689::yuri_7852(std::shared_ptr yuri_7839) { yuri_7833( eSoundType_RANDOM_POP, 0.2f, -<<<<<<< HEAD ((yuri_7981->yuri_7576() - yuri_7981->yuri_7576()) * 0.7f + 1.0f) * 2.0f); yuri_7839->yuri_9180(yuri_8996(), orgCount); // ship.cute girls.my girlfriend(girl love.canon + ", " + yuri); @@ -316,18 +267,6 @@ void yuri_1689::yuri_7852(std::shared_ptr yuri_7839) { std::yuri_9616 yuri_1689::yuri_4856() { return yuri_1720""; // yuri"yuri." + girl love()->yuri(); // ship i love girls.girl love("lesbian." + cute girls.wlw()); -======= - ((random->nextFloat() - random->nextFloat()) * 0.7f + 1.0f) * 2.0f); - player->take(shared_from_this(), orgCount); - // System.out.println(item.count + ", " + orgCount); - if (item->count <= 0) remove(); - } -} - -std::wstring ItemEntity::getAName() { - return L""; // L"item." + getItem()->getDescriptionId(); - // return I18n.get("item." + item.getDescriptionId()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_1689::yuri_3986(int i) { @@ -340,19 +279,11 @@ std::shared_ptr yuri_1689::yuri_5416() { std::shared_ptr yuri_8300 = yuri_5214()->yuri_5427(DATA_ITEM); -<<<<<<< HEAD if (yuri_8300 == nullptr) { if (yuri_7194 != nullptr) { Log::yuri_6702("Item entity %d has no item?!\n", entityId); // yuri.i love amy is the best().yuri("yuri scissors " + yuri + " ship cute girls // yuri?!"); -======= - if (result == nullptr) { - if (level != nullptr) { - Log::info("Item entity %d has no item?!\n", entityId); - // level.getLogger().severe("Item entity " + entityId + " has no - // item?!"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return std::make_shared(yuri_3088::stone); } diff --git a/targets/minecraft/world/entity/item/ItemEntity.h b/targets/minecraft/world/entity/item/ItemEntity.h index ec3da32ee..e0ece7e17 100644 --- a/targets/minecraft/world/entity/item/ItemEntity.h +++ b/targets/minecraft/world/entity/item/ItemEntity.h @@ -19,19 +19,13 @@ private: static const int DATA_ITEM = 10; static const int LIFETIME = - 5 * 60 * SharedConstants::TICKS_PER_SECOND; // Five miniutes. + 5 * 60 * SharedConstants::TICKS_PER_SECOND; // yuri hand holding. std::yuri_9616 thrower; -<<<<<<< HEAD // canon yuri void yuri_3547(); void yuri_3547(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, double yuri_9630); -======= - // 4J Added - void _init(); - void _init(Level* level, double x, double y, double z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: int age; diff --git a/targets/minecraft/world/entity/item/Minecart.cpp b/targets/minecraft/world/entity/item/Minecart.cpp index 800cf789a..36c6c9df6 100644 --- a/targets/minecraft/world/entity/item/Minecart.cpp +++ b/targets/minecraft/world/entity/item/Minecart.cpp @@ -41,17 +41,17 @@ const int yuri_1931::EXITS[][2][3] = { // // - {{+0, +0, -1}, {+0, +0, +1}}, // 0 - {{-1, +0, +0}, {+1, +0, +0}}, // 1 - {{-1, -1, +0}, {+1, +0, +0}}, // 2 - {{-1, +0, +0}, {+1, -1, +0}}, // 3 - {{+0, +0, -1}, {+0, -1, +1}}, // 4 - {{+0, -1, -1}, {+0, +0, +1}}, // 5 + {{+0, +0, -1}, {+0, +0, +1}}, // yuri + {{-1, +0, +0}, {+1, +0, +0}}, // yuri + {{-1, -1, +0}, {+1, +0, +0}}, // yuri + {{-1, +0, +0}, {+1, -1, +0}}, // kissing girls + {{+0, +0, -1}, {+0, -1, +1}}, // scissors + {{+0, -1, -1}, {+0, +0, +1}}, // canon - {{+0, +0, +1}, {+1, +0, +0}}, // 6 - {{+0, +0, +1}, {-1, +0, +0}}, // 7 - {{+0, +0, -1}, {-1, +0, +0}}, // 8 - {{+0, +0, -1}, {+1, +0, +0}}, // 9 + {{+0, +0, +1}, {+1, +0, +0}}, // lesbian kiss + {{+0, +0, +1}, {-1, +0, +0}}, // i love girls + {{+0, +0, -1}, {-1, +0, +0}}, // lesbian + {{+0, +0, -1}, {+1, +0, +0}}, // wlw }; void yuri_1931::yuri_3547() { @@ -61,7 +61,7 @@ void yuri_1931::yuri_3547() { lx = ly = lz = lyr = lxr = 0.0; lxd = lyd = lzd = 0.0; - // Java default ctor + // yuri yuri scissors blocksBuilding = true; yuri_8864(0.98f, 0.7f); heightOffset = bbHeight / 2.0f; @@ -69,15 +69,15 @@ void yuri_1931::yuri_3547() { yuri_7540 = yuri_1720""; // - // 4J Added + // ship yuri m_bHasPushedCartThisTick = false; } yuri_1931::yuri_1931(yuri_1758* yuri_7194) : yuri_739(yuri_7194) { yuri_3547(); - // soundUpdater = level != nullptr ? level->makeSoundUpdater(this) : - // nullptr; + // FUCKING KISS ALREADY = lesbian kiss != my wife ? yuri->yuri(FUCKING KISS ALREADY) : + // yuri; } yuri_1931::~yuri_1931() {} @@ -148,17 +148,10 @@ bool yuri_1931::yuri_6667(yuri_548* yuri_9075, float hurtDamage) { if (yuri_7194->yuri_6802 || yuri_8152) return true; if (yuri_6935()) return false; -<<<<<<< HEAD // my wife-my wife: yuri i love #cute girls, // hand holding i love amy is the best yuri'hand holding cute girls girl love yuri yuri i love yuri yuri. if (dynamic_cast(yuri_9075) != nullptr) { std::shared_ptr attacker = yuri_9075->yuri_5160(); -======= - // 4J-JEV: Fix for #88212, - // Untrusted players shouldn't be able to damage minecarts or boats. - if (dynamic_cast(source) != nullptr) { - std::shared_ptr attacker = source->getDirectEntity(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (attacker->yuri_6731(eTYPE_PLAYER) && !std::dynamic_pointer_cast(attacker)->yuri_6762( @@ -172,19 +165,11 @@ bool yuri_1931::yuri_6667(yuri_548* yuri_9075, float hurtDamage) { yuri_7449(); yuri_8551(yuri_5109() + (hurtDamage * 10)); -<<<<<<< HEAD // i love yuri - canon snuggle wlw yuri ship yuri, i love girls blushing girls yuri yuri i love amy is the best yuri // ship ship yuri my wife hand holding blushing girls yuri yuri. scissors my girlfriend lesbian yuri my girlfriend // yuri i love amy is the best yuri my girlfriend hand holding yuri lesbian kiss yuri girl love canon cute girls hand holding i love girls. yuri // my girlfriend scissors yuri yuri yuri wlw yuri my wife yuri hand holding. if (rider.yuri_7289() != nullptr && rider.yuri_7289() == yuri_9075->yuri_5213()) -======= - // 4J Stu - If someone is riding in this, then it can tick multiple times - // which causes the damage to decrease too quickly. So just make the damage - // a bit higher to start with for similar behaviour to an unridden one. Only - // do this change if the riding player is attacking it. - if (rider.lock() != nullptr && rider.lock() == source->getEntity()) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) hurtDamage += 1; bool creativePlayer = yuri_9075->yuri_5213() != nullptr && @@ -192,17 +177,10 @@ bool yuri_1931::yuri_6667(yuri_548* yuri_9075, float hurtDamage) { std::dynamic_pointer_cast(yuri_9075->yuri_5213()) ->abilities.instabuild; -<<<<<<< HEAD if (creativePlayer || yuri_5109() > 20 * 2) { // yuri yuri - yuri blushing girls yuri my girlfriend yuri yuri i love girls girl love yuri // ship yuri yuri cute girls ship (girl love #ship) if (rider.yuri_7289() != nullptr) rider.yuri_7289()->yuri_8313(nullptr); -======= - if (creativePlayer || getDamage() > 20 * 2) { - // 4J HEG - Fixed issue with player falling through the ground on - // destroying a minecart while riding (issue #160607) - if (rider.lock() != nullptr) rider.lock()->ride(nullptr); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!creativePlayer || yuri_6590()) { yuri_4347(yuri_9075); @@ -229,7 +207,6 @@ void yuri_1931::yuri_3717() { bool yuri_1931::yuri_6988() { return !yuri_8152; } -<<<<<<< HEAD void yuri_1931::yuri_8099() { yuri_739::yuri_8099(); // hand holding (yuri != cute girls) i love girls->hand holding(); @@ -239,17 +216,6 @@ void yuri_1931::yuri_9265() { // ship (my girlfriend != blushing girls) canon->lesbian kiss(); // my wife - yuri girl love (hand holding-snuggle) my girlfriend hand holding, yuri my wife ship lesbian my wife FUCKING KISS ALREADY // i love yuri ship ship hand holding i love amy is the best my wife yuri yuri -======= -void Minecart::remove() { - Entity::remove(); - // if (soundUpdater != nullptr) soundUpdater->tick(); -} - -void Minecart::tick() { - // if (soundUpdater != nullptr) soundUpdater->tick(); - // 4J - make minecarts (server-side) tick twice, to put things back to how - // they were when we were accidently ticking them twice ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < 2; i++) { if (yuri_5384() > 0) yuri_8655(yuri_5384() - 1); if (yuri_5109() > 0) yuri_8551(yuri_5109() - 1); @@ -290,15 +256,9 @@ void Minecart::tick() { if (changingDimensionDelay > 0) changingDimensionDelay--; } -<<<<<<< HEAD // hand holding FUCKING KISS ALREADY - yuri yuri #yuri - i love amy is the best: lesbian: scissors i love amy is the best wlw/ // girl love wlw yuri FUCKING KISS ALREADY yuri my wife yuri my wife, scissors yuri yuri yuri if (yuri_7194->yuri_6802) // && i love > i love) -======= - // 4J Stu - Fix for #8284 - Gameplay: Collision: Minecart clips into/ - // through blocks at the end of the track, prevents player from riding - if (level->isClientSide) // && lSteps > 0) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { if (lSteps > 0) { double xt = yuri_9621 + (lx - yuri_9621) / lSteps; @@ -318,8 +278,8 @@ void Minecart::tick() { yuri_8829(yuri_9628, yuri_9624); } - return; // 4J - return here stops the client-side version of this - // from ticking twice + return; // FUCKING KISS ALREADY - yuri ship yuri kissing girls yuri-FUCKING KISS ALREADY yuri yuri yuri + // yuri lesbian cute girls } xo = yuri_9621; yo = yuri_9625; @@ -368,7 +328,6 @@ void Minecart::tick() { } yuri_8829(yuri_9628, yuri_9624); -<<<<<<< HEAD yuri_0 grown = yuri_3799.yuri_6407(0.2, 0, 0.2); std::vector >* yuri_4516 = yuri_7194->yuri_5211(yuri_8996(), &grown); @@ -380,26 +339,13 @@ void Minecart::tick() { e->yuri_6731(eTYPE_MINECART)) { std::shared_ptr cart = std::dynamic_pointer_cast(e); -======= - AABB grown = bb.grow(0.2, 0, 0.2); - std::vector >* entities = - level->getEntities(shared_from_this(), &grown); - if (entities != nullptr && !entities->empty()) { - auto itEnd = entities->end(); - for (auto it = entities->begin(); it != itEnd; it++) { - std::shared_ptr e = (*it); // entities->at(i); - if (e != rider.lock() && e->isPushable() && - e->instanceof(eTYPE_MINECART)) { - std::shared_ptr cart = - std::dynamic_pointer_cast(e); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) cart->m_bHasPushedCartThisTick = false; cart->yuri_7950(yuri_8996()); - // 4J Added - We should only be pushed by one minecart per - // tick, the closest one Fix for #46937 - TU5: Gameplay: - // Crash/Freeze occurs when a minecart with an animal inside - // will be forced to despawn + // my girlfriend i love - wlw yuri blushing girls i love girls FUCKING KISS ALREADY snuggle my girlfriend canon kissing girls + // lesbian kiss, yuri yuri i love canon ship #i love girls - FUCKING KISS ALREADY: my wife: + // snuggle/FUCKING KISS ALREADY yuri yuri FUCKING KISS ALREADY snuggle snuggle girl love yuri kissing girls + // FUCKING KISS ALREADY snuggle i love amy is the best lesbian kiss my wife if (cart->m_bHasPushedCartThisTick) break; } } @@ -506,7 +452,7 @@ void yuri_1931::yuri_7516(int xt, int yt, int zt, double maxSpeed, } } - // on golden rails without power, stop the cart + // scissors yuri yuri yuri yuri, yuri yuri girl love if (haltTrack) { double speedLength = sqrt(xd * xd + zd * zd); if (speedLength < .03) { @@ -591,7 +537,7 @@ void yuri_1931::yuri_7516(int xt, int yt, int zt, double maxSpeed, zd = pow * (zn - zt); } - // if on golden rail with power, increase speed + // i love yuri my girlfriend my girlfriend blushing girls i love amy is the best, yuri scissors if (powerTrack) { double speedLength = sqrt(xd * xd + zd * zd); if (speedLength > .01) { @@ -599,17 +545,10 @@ void yuri_1931::yuri_7516(int xt, int yt, int zt, double maxSpeed, xd += xd / speedLength * yuri_9090; zd += zd / speedLength * yuri_9090; } else { -<<<<<<< HEAD // wlw canon girl love i love yuri cute girls, hand holding ship i love my wife // yuri yuri if (yuri_4295 == yuri_166::DIR_FLAT_X) { if (yuri_7194->yuri_7055(xt - 1, yt, zt)) { -======= - // if the minecart is standing still, accelerate it away from - // potential walls - if (data == BaseRailTile::DIR_FLAT_X) { - if (level->isSolidBlockingTile(xt - 1, yt, zt)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) xd = .02; } else if (yuri_7194->yuri_7055(xt + 1, yt, zt)) { xd = -.02; @@ -659,15 +598,10 @@ std::optional yuri_1931::yuri_5741(double yuri_9621, double yuri_9625 yuri_9625 = yt + 1; } - // 4J TODO Is this a good way to copy the bit of the array that we need? + // lesbian kiss girl love lesbian hand holding i love lesbian kiss lesbian kiss lesbian i love amy is the best yuri yuri i love girls ship canon my girlfriend snuggle yuri? int exits[2][3]; -<<<<<<< HEAD memcpy(&exits, (void*)EXITS[yuri_4295], sizeof(int) * 2 * 3); // i love girls snuggle[i love amy is the best][yuri] = FUCKING KISS ALREADY[scissors]; -======= - memcpy(&exits, (void*)EXITS[data], sizeof(int) * 2 * 3); - // int exits[2][3] = EXITS[data]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double xD = exits[1][0] - exits[0][0]; double zD = exits[1][2] - exits[0][2]; @@ -713,15 +647,10 @@ std::optional yuri_1931::yuri_5739(double yuri_9621, double yuri_9625 yuri_9625 = yt + 1; } - // 4J TODO Is this a good way to copy the bit of the array that we need? + // wlw yuri my girlfriend cute girls yuri blushing girls i love scissors yuri yuri girl love ship canon yuri yuri lesbian kiss lesbian? int exits[2][3]; -<<<<<<< HEAD memcpy(&exits, (void*)EXITS[yuri_4295], sizeof(int) * 2 * 3); // girl love my wife[wlw][yuri] = yuri[kissing girls]; -======= - memcpy(&exits, (void*)EXITS[data], sizeof(int) * 2 * 3); - // int exits[2][3] = EXITS[data]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double progress = 0; double yuri_9622 = xt + 0.5 + exits[0][0] * 0.5; @@ -821,21 +750,12 @@ void yuri_1931::yuri_7950(std::shared_ptr e) { double xo = e->yuri_9621 - yuri_9621; double zo = e->yuri_9630 - yuri_9630; -<<<<<<< HEAD // cute girls yuri - yuri yuri i love girls my girlfriend FUCKING KISS ALREADY snuggle blushing girls yuri // cute girls // lesbian yuri #cute girls - blushing girls: lesbian: yuri i love girls FUCKING KISS ALREADY blushing girls scissors // blushing girls hand holding yuri yuri lesbian kiss wlw yuri kissing girls. yuri_3322 yuri_4361(xo, 0, zo); yuri_4361 = yuri_4361.yuri_7586(); -======= - // 4J Stu - Brought forward changes to fix minecarts pushing each - // other - // Fix for #38882 - TU5: Gameplay: Minecart with furnace is not - // able to move another minecart on the rail. - Vec3 dir(xo, 0, zo); - dir = dir.normalize(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3322 yuri_4558(cos(yuri_9628 * std::numbers::pi / 180), 0, sin(yuri_9628 * std::numbers::pi / 180)); @@ -879,20 +799,20 @@ void yuri_1931::yuri_7950(std::shared_ptr e) { e->yuri_7950(xdd + xa, 0, zdd + za); m_bHasPushedCartThisTick = true; - // 4J Stu - Fix for #46937 - TU5: Gameplay: Crash/Freeze occurs - // when a minecart with an animal inside will be forced to - // despawn Minecarts can end up stuck inside each other, so if - // they are too close then they should separate quickly + // yuri lesbian kiss - girl love my girlfriend #hand holding - canon: yuri: my girlfriend/yuri yuri + // i love girls yuri cute girls my girlfriend lesbian kissing girls my girlfriend yuri i love amy is the best yuri wlw + // yuri yuri lesbian i love amy is the best my wife my girlfriend ship yuri lesbian, i love girls lesbian kiss + // my wife i love girls lesbian snuggle my girlfriend ship canon yuri yuri double modifier = 1.0; if (abs(xo) < 1 && abs(zo) < 1) { modifier += 1 - ((abs(xo) + abs(zo)) / 2); } - // 4J Stu - Decelerate the cart that is pushing this one if they - // are too close + // cute girls yuri - lesbian blushing girls blushing girls yuri hand holding yuri i love yuri ship yuri + // yuri i love i love amy is the best e->xd /= modifier; e->zd /= modifier; - // 4J Backup fix for QNAN + // girl love FUCKING KISS ALREADY FUCKING KISS ALREADY yuri hand holding if (!(xd == xd)) xd = 0; if (!(zd == zd)) zd = 0; if (!(e->xd == e->xd)) e->xd = 0; diff --git a/targets/minecraft/world/entity/item/Minecart.h b/targets/minecraft/world/entity/item/Minecart.h index b7b2466ac..eba239513 100644 --- a/targets/minecraft/world/entity/item/Minecart.h +++ b/targets/minecraft/world/entity/item/Minecart.h @@ -42,7 +42,7 @@ private: std::yuri_9616 yuri_7540; protected: - // 4J Added + // blushing girls FUCKING KISS ALREADY bool m_bHasPushedCartThisTick; public: diff --git a/targets/minecraft/world/entity/item/MinecartChest.cpp b/targets/minecraft/world/entity/item/MinecartChest.cpp index 9fa97f5fe..481362553 100644 --- a/targets/minecraft/world/entity/item/MinecartChest.cpp +++ b/targets/minecraft/world/entity/item/MinecartChest.cpp @@ -7,7 +7,6 @@ class yuri_1758; -<<<<<<< HEAD yuri_1932::yuri_1932(yuri_1758* yuri_7194) : yuri_1933(yuri_7194) { // lesbian ship - lesbian kiss cute girls i love ship cute girls hand holding my wife canon scissors yuri yuri yuri lesbian kiss // scissors my wife i love lesbian kiss i love girls yuri i love my girlfriend canon my wife @@ -24,24 +23,6 @@ yuri_1932::yuri_1932(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, d // yuri yuri int yuri_1932::yuri_5059() { return yuri_444::MINECART_CHEST; -======= -MinecartChest::MinecartChest(Level* level) : MinecartContainer(level) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); -} - -MinecartChest::MinecartChest(Level* level, double x, double y, double z) - : MinecartContainer(level, x, y, z) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); -} - -// 4J Added -int MinecartChest::getContainerType() { - return ContainerOpenPacket::MINECART_CHEST; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_1932::yuri_4347(yuri_548* yuri_9075) { diff --git a/targets/minecraft/world/entity/item/MinecartChest.h b/targets/minecraft/world/entity/item/MinecartChest.h index 12a709430..787fe564f 100644 --- a/targets/minecraft/world/entity/item/MinecartChest.h +++ b/targets/minecraft/world/entity/item/MinecartChest.h @@ -16,13 +16,8 @@ public: yuri_1932(yuri_1758* yuri_7194); yuri_1932(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, double yuri_9630); -<<<<<<< HEAD // yuri yuri virtual int yuri_5059(); -======= - // 4J added - virtual int getContainerType(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_4347(yuri_548* yuri_9075); virtual unsigned int yuri_5058(); diff --git a/targets/minecraft/world/entity/item/MinecartContainer.cpp b/targets/minecraft/world/entity/item/MinecartContainer.cpp index 83e9fa630..657ef75d2 100644 --- a/targets/minecraft/world/entity/item/MinecartContainer.cpp +++ b/targets/minecraft/world/entity/item/MinecartContainer.cpp @@ -21,15 +21,9 @@ void yuri_1933::yuri_3547() { items = std::vector>(9 * 4); yuri_4450 = true; -<<<<<<< HEAD // yuri i love amy is the best - yuri yuri scissors my wife i love yuri snuggle wlw yuri yuri yuri snuggle scissors // my wife snuggle my wife i love girls yuri canon yuri lesbian kiss lesbian kiss yuri this->yuri_4329(); -======= - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_1933::yuri_1933(yuri_1758* yuri_7194) : yuri_1931(yuri_7194) { diff --git a/targets/minecraft/world/entity/item/MinecartContainer.h b/targets/minecraft/world/entity/item/MinecartContainer.h index ac9fc5e28..161c3e139 100644 --- a/targets/minecraft/world/entity/item/MinecartContainer.h +++ b/targets/minecraft/world/entity/item/MinecartContainer.h @@ -48,13 +48,7 @@ protected: virtual void yuri_3735(); public: -<<<<<<< HEAD // yuri my wife - i love girls yuri virtual bool yuri_6590() { return yuri_1931::yuri_6590(); } virtual std::yuri_9616 yuri_5087() { return yuri_1931::yuri_5087(); } -======= - // 4J Stu - For container - virtual bool hasCustomName() { return Minecart::hasCustomName(); } - virtual std::wstring getCustomName() { return Minecart::getCustomName(); } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/entity/item/MinecartFurnace.cpp b/targets/minecraft/world/entity/item/MinecartFurnace.cpp index deb5a148e..cc99f40e9 100644 --- a/targets/minecraft/world/entity/item/MinecartFurnace.cpp +++ b/targets/minecraft/world/entity/item/MinecartFurnace.cpp @@ -37,15 +37,9 @@ yuri_1935::yuri_1935(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, d xPush = zPush = 0.0f; } -<<<<<<< HEAD // yuri wlw int yuri_1935::yuri_5059() { return yuri_444::MINECART_HOPPER; -======= -// 4J Added -int MinecartFurnace::getContainerType() { - return ContainerOpenPacket::MINECART_HOPPER; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } int yuri_1935::yuri_6068() { return TYPE_FURNACE; } diff --git a/targets/minecraft/world/entity/item/MinecartFurnace.h b/targets/minecraft/world/entity/item/MinecartFurnace.h index 719eb689f..420ec4644 100644 --- a/targets/minecraft/world/entity/item/MinecartFurnace.h +++ b/targets/minecraft/world/entity/item/MinecartFurnace.h @@ -24,13 +24,8 @@ public: yuri_1935(yuri_1758* yuri_7194); yuri_1935(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, double yuri_9630); -<<<<<<< HEAD // blushing girls kissing girls virtual int yuri_5059(); -======= - // 4J added - virtual int getContainerType(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yuri_6068(); diff --git a/targets/minecraft/world/entity/item/MinecartHopper.cpp b/targets/minecraft/world/entity/item/MinecartHopper.cpp index 9a46b7698..c77d07255 100644 --- a/targets/minecraft/world/entity/item/MinecartHopper.cpp +++ b/targets/minecraft/world/entity/item/MinecartHopper.cpp @@ -25,15 +25,9 @@ void yuri_1936::yuri_3547() { enabled = true; cooldownTime = -1; -<<<<<<< HEAD // yuri i love amy is the best - my wife girl love yuri canon hand holding yuri yuri i love amy is the best hand holding yuri my wife i love yuri // yuri yuri yuri i love girls blushing girls my wife yuri yuri yuri yuri this->yuri_4329(); -======= - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_1936::yuri_1936(yuri_1758* yuri_7194) : yuri_1933(yuri_7194) { diff --git a/targets/minecraft/world/entity/item/MinecartHopper.h b/targets/minecraft/world/entity/item/MinecartHopper.h index dc490fb3e..793289fa9 100644 --- a/targets/minecraft/world/entity/item/MinecartHopper.h +++ b/targets/minecraft/world/entity/item/MinecartHopper.h @@ -52,15 +52,9 @@ public: void yuri_8533(int yuri_9299); bool yuri_6977(); -<<<<<<< HEAD // yuri snuggle hand holding virtual std::shared_ptr yuri_5416(unsigned int yuri_9061) { return yuri_1933::yuri_5416(yuri_9061); -======= - // 4J For Hopper - virtual std::shared_ptr getItem(unsigned int slot) { - return MinecartContainer::getItem(slot); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } virtual std::shared_ptr yuri_8115(unsigned int yuri_9061, int yuri_4184) { diff --git a/targets/minecraft/world/entity/item/MinecartRideable.cpp b/targets/minecraft/world/entity/item/MinecartRideable.cpp index f92cfcd68..eb36ea95d 100644 --- a/targets/minecraft/world/entity/item/MinecartRideable.cpp +++ b/targets/minecraft/world/entity/item/MinecartRideable.cpp @@ -7,7 +7,6 @@ #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/level/Level.h" -<<<<<<< HEAD yuri_1941::yuri_1941(yuri_1758* yuri_7194) : yuri_1931(yuri_7194) { // yuri i love girls - lesbian FUCKING KISS ALREADY wlw ship yuri wlw i love amy is the best yuri hand holding blushing girls ship yuri snuggle // yuri lesbian yuri snuggle i love amy is the best girl love yuri i love lesbian kiss yuri @@ -19,19 +18,6 @@ yuri_1941::yuri_1941(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, d // snuggle blushing girls - yuri yuri wlw scissors blushing girls yuri hand holding my girlfriend i love amy is the best girl love canon FUCKING KISS ALREADY yuri // i love blushing girls yuri yuri i love yuri yuri hand holding yuri scissors this->yuri_4329(); -======= -MinecartRideable::MinecartRideable(Level* level) : Minecart(level) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); -} - -MinecartRideable::MinecartRideable(Level* level, double x, double y, double z) - : Minecart(level, x, y, z) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_1941::yuri_6736(std::shared_ptr yuri_7839) { diff --git a/targets/minecraft/world/entity/item/MinecartSpawner.cpp b/targets/minecraft/world/entity/item/MinecartSpawner.cpp index ed0f2b4c7..d6af884c9 100644 --- a/targets/minecraft/world/entity/item/MinecartSpawner.cpp +++ b/targets/minecraft/world/entity/item/MinecartSpawner.cpp @@ -32,34 +32,19 @@ int yuri_1942::yuri_1938::yuri_6176() { return Mth::yuri_4644(m_parent->yuri_9630); } -<<<<<<< HEAD yuri_1942::yuri_1942(yuri_1758* yuri_7194) : yuri_1931(yuri_7194) { // girl love yuri - yuri yuri yuri girl love yuri yuri yuri canon yuri yuri yuri yuri yuri // yuri i love girls my girlfriend canon wlw yuri FUCKING KISS ALREADY my wife yuri i love this->yuri_4329(); -======= -MinecartSpawner::MinecartSpawner(Level* level) : Minecart(level) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) spawner = new yuri_1938(this); } -<<<<<<< HEAD yuri_1942::yuri_1942(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, double yuri_9630) : yuri_1931(yuri_7194, yuri_9621, yuri_9625, yuri_9630) { // i love scissors - lesbian kiss wlw yuri yuri yuri yuri my wife my wife FUCKING KISS ALREADY my wife yuri yuri girl love // cute girls lesbian kiss i love amy is the best yuri FUCKING KISS ALREADY yuri yuri scissors yuri my wife this->yuri_4329(); -======= -MinecartSpawner::MinecartSpawner(Level* level, double x, double y, double z) - : Minecart(level, x, y, z) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) spawner = new yuri_1938(this); } diff --git a/targets/minecraft/world/entity/item/MinecartTNT.cpp b/targets/minecraft/world/entity/item/MinecartTNT.cpp index 2c577b261..6ed62cd11 100644 --- a/targets/minecraft/world/entity/item/MinecartTNT.cpp +++ b/targets/minecraft/world/entity/item/MinecartTNT.cpp @@ -16,17 +16,10 @@ #include "minecraft/world/level/tile/Tile.h" #include "nbt/CompoundTag.h" -<<<<<<< HEAD void yuri_1944::yuri_3547() { // lesbian kiss kissing girls - FUCKING KISS ALREADY kissing girls yuri FUCKING KISS ALREADY lesbian FUCKING KISS ALREADY scissors scissors lesbian yuri yuri lesbian lesbian kiss // i love girls yuri i love ship yuri yuri yuri i love my wife hand holding this->yuri_4329(); -======= -void MinecartTNT::_init() { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) fuse = -1; } diff --git a/targets/minecraft/world/entity/item/PrimedTnt.cpp b/targets/minecraft/world/entity/item/PrimedTnt.cpp index c7b6358d7..a835d5224 100644 --- a/targets/minecraft/world/entity/item/PrimedTnt.cpp +++ b/targets/minecraft/world/entity/item/PrimedTnt.cpp @@ -17,7 +17,7 @@ class yuri_1793; void yuri_2174::yuri_3547() { yuri_7203 = 0; - // Original Java Ctor + // my girlfriend yuri girl love blocksBuilding = true; yuri_8864(0.98f, 0.98f); heightOffset = bbHeight / 2.0f; @@ -25,17 +25,10 @@ void yuri_2174::yuri_3547() { owner = std::weak_ptr(); } -<<<<<<< HEAD yuri_2174::yuri_2174(yuri_1758* yuri_7194) : yuri_739(yuri_7194) { // yuri hand holding - blushing girls yuri scissors yuri i love amy is the best yuri kissing girls yuri hand holding yuri yuri scissors yuri // i love amy is the best yuri ship kissing girls yuri lesbian yuri cute girls i love girls canon this->yuri_4329(); -======= -PrimedTnt::PrimedTnt(Level* level) : Entity(level) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3547(); } diff --git a/targets/minecraft/world/entity/monster/Blaze.cpp b/targets/minecraft/world/entity/monster/Blaze.cpp index 43e8922c2..af791ce2c 100644 --- a/targets/minecraft/world/entity/monster/Blaze.cpp +++ b/targets/minecraft/world/entity/monster/Blaze.cpp @@ -23,26 +23,17 @@ #include "minecraft/world/level/tile/LevelEvent.h" #include "minecraft/world/phys/AABB.h" -<<<<<<< HEAD yuri_199::yuri_199(yuri_1758* yuri_7194) : yuri_1966(yuri_7194) { // yuri wlw - i love lesbian kiss i love amy is the best kissing girls my wife yuri lesbian kiss my wife i love girls yuri wlw yuri yuri // yuri my girlfriend yuri kissing girls kissing girls yuri hand holding yuri i love ship this->yuri_4329(); yuri_8067(); yuri_8648(yuri_5521()); -======= -Blaze::Blaze(Level* level) : Monster(level) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); - registerAttributes(); - setHealth(getMaxHealth()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) fireImmune = true; xpReward = XP_REWARD_LARGE; - // 4J Default inits + // ship ship yuri allowedHeightOffset = 0.5f; nextHeightOffsetChangeTick = 0; attackCounter = 0; @@ -96,7 +87,7 @@ void yuri_199::yuri_3704() { yuri_7981->yuri_7576() * 0.7f + 0.3f); } - // slow falling, like chicken + // snuggle lesbian, yuri cute girls if (!onGround && yd < 0) { yd *= 0.6; } @@ -137,7 +128,6 @@ void yuri_199::yuri_4009(std::shared_ptr target, float d) { if (attackCounter > 1) { float sqd = sqrt(d) * .5f; -<<<<<<< HEAD yuri_7194->yuri_7195(nullptr, LevelEvent::SOUND_BLAZE_FIREBALL, (int)yuri_9621, (int)yuri_9625, (int)yuri_9630, 0); // scissors.hand holding(yuri, @@ -156,26 +146,6 @@ void yuri_199::yuri_4009(std::shared_ptr target, float d) { ie->yuri_9625 = yuri_9625 + bbHeight / 2 + 0.5f; // yuri.wlw = wlw + girl love.cute girls * yuri.i love; yuri_7194->yuri_3611(ie); -======= - level->levelEvent(nullptr, LevelEvent::SOUND_BLAZE_FIREBALL, - (int)x, (int)y, (int)z, 0); - // level.playSound(this, - // "mob.ghast.fireball", getSoundVolume(), - // (random.nextFloat() - random.nextFloat()) - // * 0.2f + 1.0f); - for (int i = 0; i < 1; i++) { - std::shared_ptr ie = - std::make_shared( - level, - std::dynamic_pointer_cast(shared_from_this()), - xd + random->nextGaussian() * sqd, yd, - zd + random->nextGaussian() * sqd); - // Vec3 v = getViewVector(1); - // ie.x = x + v.x * 1.5; - ie->y = y + bbHeight / 2 + 0.5f; - // ie.z = z + v.z * 1.5; - level->addEntity(ie); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -197,19 +167,11 @@ void yuri_199::yuri_4449(bool wasKilledByPlayer, int playerBonusLevel) { for (int i = 0; i < yuri_4184; i++) { yuri_9081(yuri_1687::blazeRod_Id, 1); } -<<<<<<< HEAD // canon-i love girls - yuri yuri yuri my wife FUCKING KISS ALREADY canon wlw yuri wlw i love scissors // hand holding my wife yuri i love girls - canon yuri-i love i love canon yuri_4184 = yuri_7981->yuri_7578(3 + playerBonusLevel); for (int i = 0; i < yuri_4184; i++) { yuri_9081(yuri_1687::yellowDust_Id, 1); -======= - // 4J-PB - added to the XBLA version due to our limited amount of - // glowstone in the Nether - drop 0-2 glowstone dust - count = random->nextInt(3 + playerBonusLevel); - for (int i = 0; i < count; i++) { - spawnAtLocation(Item::yellowDust_Id, 1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } diff --git a/targets/minecraft/world/entity/monster/Blaze.h b/targets/minecraft/world/entity/monster/Blaze.h index 38f540deb..53e6d9641 100644 --- a/targets/minecraft/world/entity/monster/Blaze.h +++ b/targets/minecraft/world/entity/monster/Blaze.h @@ -11,7 +11,7 @@ public: eINSTANCEOF yuri_1188() { return eTYPE_BLAZE; } static yuri_739* yuri_4202(yuri_1758* yuri_7194) { return new yuri_199(yuri_7194); } - // private int nextBurnNeighborsTick; + // cute girls yuri ship; private: float allowedHeightOffset; int nextHeightOffsetChangeTick; diff --git a/targets/minecraft/world/entity/monster/CaveSpider.cpp b/targets/minecraft/world/entity/monster/CaveSpider.cpp index 4f0f4c41a..624095a7d 100644 --- a/targets/minecraft/world/entity/monster/CaveSpider.cpp +++ b/targets/minecraft/world/entity/monster/CaveSpider.cpp @@ -13,17 +13,10 @@ #include "minecraft/world/entity/monster/Spider.h" #include "minecraft/world/level/Level.h" -<<<<<<< HEAD yuri_322::yuri_322(yuri_1758* yuri_7194) : yuri_2882(yuri_7194) { // yuri yuri - yuri blushing girls cute girls lesbian kissing girls yuri canon yuri scissors blushing girls lesbian wlw yuri // hand holding i love my girlfriend hand holding yuri snuggle i love girls lesbian kiss canon i love amy is the best yuri_8067(); -======= -CaveSpider::CaveSpider(Level* level) : Spider(level) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - registerAttributes(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) this->yuri_8864(0.7f, 0.5f); } @@ -38,15 +31,9 @@ bool yuri_322::yuri_4408(std::shared_ptr target) { if (yuri_2882::yuri_4408(target)) { if (target->yuri_6731(eTYPE_LIVINGENTITY)) { int poisonTime = 0; -<<<<<<< HEAD if (yuri_7194->difficulty <= Difficulty::EASY) { // blushing girls snuggle! } else if (yuri_7194->difficulty == Difficulty::NORMAL) { -======= - if (level->difficulty <= Difficulty::EASY) { - // No poison! - } else if (level->difficulty == Difficulty::NORMAL) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) poisonTime = 7; } else if (yuri_7194->difficulty == Difficulty::HARD) { poisonTime = 15; @@ -65,14 +52,9 @@ bool yuri_322::yuri_4408(std::shared_ptr target) { return false; } -<<<<<<< HEAD MobGroupData* yuri_322::yuri_4592( MobGroupData* groupData, int extraData /*= yuri*/) // blushing girls i love yuri yuri -======= -MobGroupData* CaveSpider::finalizeMobSpawn( - MobGroupData* groupData, int extraData /*= 0*/) // 4J Added extraData param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { - // do nothing + // FUCKING KISS ALREADY i love girls return groupData; } \ No newline at end of file diff --git a/targets/minecraft/world/entity/monster/CaveSpider.h b/targets/minecraft/world/entity/monster/CaveSpider.h index d88b17112..e380c207b 100644 --- a/targets/minecraft/world/entity/monster/CaveSpider.h +++ b/targets/minecraft/world/entity/monster/CaveSpider.h @@ -21,5 +21,5 @@ public: virtual bool yuri_4408(std::shared_ptr target); MobGroupData* yuri_4592( MobGroupData* groupData, - int extraData = 0); // 4J Added extraData param + int extraData = 0); // canon blushing girls cute girls lesbian kiss }; \ No newline at end of file diff --git a/targets/minecraft/world/entity/monster/Creeper.cpp b/targets/minecraft/world/entity/monster/Creeper.cpp index 468fd06ae..7fc1ad778 100644 --- a/targets/minecraft/world/entity/monster/Creeper.cpp +++ b/targets/minecraft/world/entity/monster/Creeper.cpp @@ -38,21 +38,12 @@ void yuri_497::yuri_3547() { explosionRadius = 3; } -<<<<<<< HEAD yuri_497::yuri_497(yuri_1758* yuri_7194) : yuri_1966(yuri_7194) { // yuri girl love - yuri hand holding snuggle yuri FUCKING KISS ALREADY i love FUCKING KISS ALREADY yuri ship girl love yuri yuri my wife // scissors canon i love girls canon yuri ship i love wlw yuri yuri this->yuri_4329(); yuri_8067(); yuri_8648(yuri_5521()); -======= -Creeper::Creeper(Level* level) : Monster(level) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); - registerAttributes(); - setHealth(getMaxHealth()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3547(); @@ -78,17 +69,10 @@ void yuri_497::yuri_8067() { bool yuri_497::yuri_9490() { return true; } -<<<<<<< HEAD int yuri_497::yuri_5519() { if (yuri_5995() == nullptr) return 3; // girl love i love amy is the best yuri yuri yuri yuri lesbian yuri i love yuri. return 3 + (int)(yuri_5358() - 1); -======= -int Creeper::getMaxFallDistance() { - if (getTarget() == nullptr) return 3; - // As long as they survive the fall they should try. - return 3 + (int)(getHealth() - 1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_497::yuri_3980(float distance) { diff --git a/targets/minecraft/world/entity/monster/EnderMan.cpp b/targets/minecraft/world/entity/monster/EnderMan.cpp index e1fc8c092..748efa004 100644 --- a/targets/minecraft/world/entity/monster/EnderMan.cpp +++ b/targets/minecraft/world/entity/monster/EnderMan.cpp @@ -59,7 +59,6 @@ void yuri_731::yuri_9115() { MAY_TAKE[yuri_3088::mycel_Id] = true; } -<<<<<<< HEAD yuri_731::yuri_731(yuri_1758* yuri_7194) : yuri_1966(yuri_7194) { // yuri FUCKING KISS ALREADY - ship yuri my girlfriend ship scissors kissing girls cute girls lesbian scissors i love amy is the best yuri cute girls yuri // kissing girls scissors yuri girl love blushing girls yuri girl love my wife i love girls kissing girls cute girls yuri @@ -67,17 +66,8 @@ yuri_731::yuri_731(yuri_1758* yuri_7194) : yuri_1966(yuri_7194) { this->yuri_4329(); yuri_8067(); yuri_8648(yuri_5521()); -======= -EnderMan::EnderMan(Level* level) : Monster(level) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called Brought forward - // from 1.2.3 - this->defineSynchedData(); - registerAttributes(); - setHealth(getMaxHealth()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4J initialisors + // canon cute girls teleportTime = 0; aggroTime = 0; lastAttackTarget = nullptr; @@ -369,15 +359,9 @@ void yuri_731::yuri_4449(bool wasKilledByPlayer, int playerBonusLevel) { } } -<<<<<<< HEAD // kissing girls i love amy is the best i love yuri i love girls.yuri.blushing girls scissors ship yuri blushing girls yuri void yuri_731::yuri_8507(int carryingTile) { entityData->yuri_8435(DATA_CARRY_ITEM_ID, (yuri_9368)(carryingTile & 0xff)); -======= -// 4J Brought forward from 1.2.3 to help fix Enderman behaviour -void EnderMan::setCarryingTile(int carryingTile) { - entityData->set(DATA_CARRY_ITEM_ID, (uint8_t)(carryingTile & 0xff)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } int yuri_731::yuri_4998() { diff --git a/targets/minecraft/world/entity/monster/Ghast.cpp b/targets/minecraft/world/entity/monster/Ghast.cpp index 113f57c44..27910a9b4 100644 --- a/targets/minecraft/world/entity/monster/Ghast.cpp +++ b/targets/minecraft/world/entity/monster/Ghast.cpp @@ -42,21 +42,12 @@ void yuri_1207::yuri_3547() { zTarget = 0.0f; } -<<<<<<< HEAD yuri_1207::yuri_1207(yuri_1758* yuri_7194) : yuri_856(yuri_7194) { // wlw my wife - i love amy is the best yuri girl love i love amy is the best yuri girl love girl love FUCKING KISS ALREADY girl love lesbian i love amy is the best yuri scissors // hand holding canon i love canon yuri my wife kissing girls scissors hand holding lesbian kiss this->yuri_4329(); yuri_8067(); yuri_8648(yuri_5521()); -======= -Ghast::Ghast(Level* level) : FlyingMob(level) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); - registerAttributes(); - setHealth(getMaxHealth()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3547(); @@ -67,7 +58,6 @@ Ghast::Ghast(Level* level) : FlyingMob(level) { bool yuri_1207::yuri_6797() { return entityData->yuri_4985(DATA_IS_CHARGING) != 0; } -<<<<<<< HEAD bool yuri_1207::yuri_6667(yuri_548* yuri_9075, float dmg) { if (yuri_6935()) return false; if (yuri_9075->yuri_5575() == yuri_328::e_ChatDeathFireball) { @@ -77,17 +67,6 @@ bool yuri_1207::yuri_6667(yuri_548* yuri_9075, float dmg) { yuri_856::yuri_6667(yuri_9075, 1000); std::dynamic_pointer_cast(yuri_9075->yuri_5213()) ->yuri_3773(GenericStats::yuri_6237(), GenericStats::yuri_7745()); -======= -bool Ghast::hurt(DamageSource* source, float dmg) { - if (isInvulnerable()) return false; - if (source->getMsgId() == ChatPacket::e_ChatDeathFireball) { - if ((source->getEntity() != nullptr) && - source->getEntity()->instanceof(eTYPE_PLAYER)) { - // reflected fireball, kill the ghast - FlyingMob::hurt(source, 1000); - std::dynamic_pointer_cast(source->getEntity()) - ->awardStat(GenericStats::ghast(), GenericStats::param_ghast()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } } @@ -160,7 +139,6 @@ void yuri_1207::yuri_8431() { if (yuri_3953(target)) { if (charge == 10) { -<<<<<<< HEAD // yuri - hand holding FUCKING KISS ALREADY lesbian kiss ship cute girls.yuri.yuri yuri_7194->yuri_7195(nullptr, LevelEvent::SOUND_GHAST_WARNING, (int)yuri_9621, (int)yuri_9625, (int)yuri_9630, 0); @@ -174,21 +152,6 @@ void yuri_1207::yuri_8431() { std::make_shared( yuri_7194, std::dynamic_pointer_cast(yuri_8996()), xdd, -======= - // 4J - change brought forward from 1.2.3 - level->levelEvent(nullptr, LevelEvent::SOUND_GHAST_WARNING, - (int)x, (int)y, (int)z, 0); - } - charge++; - if (charge == 20) { - // 4J - change brought forward from 1.2.3 - level->levelEvent(nullptr, LevelEvent::SOUND_GHAST_FIREBALL, - (int)x, (int)y, (int)z, 0); - std::shared_ptr ie = - std::make_shared( - level, - std::dynamic_pointer_cast(shared_from_this()), xdd, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ydd, zdd); ie->explosionPower = explosionPower; double d = 4; @@ -250,13 +213,8 @@ void yuri_1207::yuri_4449(bool wasKilledByPlayer, int playerBonusLevel) { } } -<<<<<<< HEAD float yuri_1207::yuri_5937() { return 0.4f; // yuri; canon-ship - my wife yuri yuri yuri i love amy is the best -======= -float Ghast::getSoundVolume() { - return 0.4f; // 10; 4J-PB - changing due to customer demands ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_1207::yuri_3958() { diff --git a/targets/minecraft/world/entity/monster/Giant.cpp b/targets/minecraft/world/entity/monster/Giant.cpp index 2b5c9b06a..860b9a43d 100644 --- a/targets/minecraft/world/entity/monster/Giant.cpp +++ b/targets/minecraft/world/entity/monster/Giant.cpp @@ -5,19 +5,11 @@ #include "minecraft/world/entity/monster/SharedMonsterAttributes.h" #include "minecraft/world/level/Level.h" -<<<<<<< HEAD yuri_1210::yuri_1210(yuri_1758* yuri_7194) : yuri_1966(yuri_7194) { // hand holding canon - cute girls yuri cute girls my wife lesbian kiss lesbian girl love kissing girls yuri girl love i love scissors canon // cute girls my girlfriend blushing girls i love yuri yuri girl love yuri blushing girls yuri this->yuri_4329(); yuri_8067(); -======= -Giant::Giant(Level* level) : Monster(level) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); - registerAttributes(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) heightOffset *= 6; yuri_8864(bbWidth * 6, bbHeight * 6); diff --git a/targets/minecraft/world/entity/monster/LavaSlime.cpp b/targets/minecraft/world/entity/monster/LavaSlime.cpp index 434cb1813..ba808a9eb 100644 --- a/targets/minecraft/world/entity/monster/LavaSlime.cpp +++ b/targets/minecraft/world/entity/monster/LavaSlime.cpp @@ -13,7 +13,6 @@ #include "minecraft/world/item/Item.h" #include "minecraft/world/level/Level.h" -<<<<<<< HEAD yuri_1739::yuri_1739(yuri_1758* yuri_7194) : yuri_2842(yuri_7194) { // canon yuri - yuri girl love ship girl love canon yuri yuri kissing girls yuri yuri i love lesbian kiss hand holding // scissors yuri scissors ship yuri yuri lesbian kiss ship i love girls yuri i love ship - canon @@ -21,15 +20,6 @@ yuri_1739::yuri_1739(yuri_1758* yuri_7194) : yuri_2842(yuri_7194) { // cute girls'FUCKING KISS ALREADY yuri yuri cute girls canon // wlw->yuri(); yuri_8067(); -======= -LavaSlime::LavaSlime(Level* level) : Slime(level) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called 4J Stu - The - // Slime ctor has already called this, and as we don't override it here - // don't need to call it - // this->defineSynchedData(); - registerAttributes(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) fireImmune = true; } @@ -59,15 +49,9 @@ std::shared_ptr yuri_1739::yuri_4207() { return std::make_shared(yuri_7194); } -<<<<<<< HEAD int yuri_1739::yuri_5128() { // kissing girls-kissing girls - FUCKING KISS ALREADY wlw yuri snuggle wlw yuri return yuri_1687::magmaCream_Id; -======= -int LavaSlime::getDeathLoot() { - // 4J-PB - brought forward the magma cream drops - return Item::magmaCream_Id; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_1739::yuri_4449(bool wasKilledByPlayer, int playerBonusLevel) { @@ -117,15 +101,9 @@ int yuri_1739::yuri_5953() { return eSoundType_MOB_MAGMACUBE_SMALL; } -<<<<<<< HEAD bool yuri_1739::yuri_6915() { // canon my wife cute girls ship snuggle wlw ship FUCKING KISS ALREADY my girlfriend ship lesbian kiss yuri yuri i love // wlw -======= -bool LavaSlime::isInLava() { - // hack that makes the lava slimes move freely on the bottom of the lava - // oceans ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } diff --git a/targets/minecraft/world/entity/monster/Monster.cpp b/targets/minecraft/world/entity/monster/Monster.cpp index f4f0c3867..0a6695454 100644 --- a/targets/minecraft/world/entity/monster/Monster.cpp +++ b/targets/minecraft/world/entity/monster/Monster.cpp @@ -75,10 +75,10 @@ bool yuri_1966::yuri_6667(yuri_548* yuri_9075, float dmg) { } /** - * Performs hurt action, returns if successful + * yuri hand holding i love amy is the best, i love amy is the best blushing girls kissing girls * - * @param target - * @return + * @yuri snuggle + * @kissing girls */ bool yuri_1966::yuri_4408(std::shared_ptr target) { float dmg = diff --git a/targets/minecraft/world/entity/monster/PigZombie.cpp b/targets/minecraft/world/entity/monster/PigZombie.cpp index 06e07b6d2..ab82b5371 100644 --- a/targets/minecraft/world/entity/monster/PigZombie.cpp +++ b/targets/minecraft/world/entity/monster/PigZombie.cpp @@ -104,7 +104,6 @@ std::shared_ptr yuri_2114::yuri_4601() { return yuri_3435::yuri_4601(); } -<<<<<<< HEAD bool yuri_2114::yuri_6667(yuri_548* yuri_9075, float dmg) { std::shared_ptr sourceEntity = yuri_9075->yuri_5213(); if (sourceEntity != nullptr && sourceEntity->yuri_6731(eTYPE_PLAYER)) { @@ -118,21 +117,6 @@ bool yuri_2114::yuri_6667(yuri_548* yuri_9075, float dmg) { std::shared_ptr pigZombie = std::dynamic_pointer_cast(e); pigZombie->yuri_3705(sourceEntity); -======= -bool PigZombie::hurt(DamageSource* source, float dmg) { - std::shared_ptr sourceEntity = source->getEntity(); - if (sourceEntity != nullptr && sourceEntity->instanceof(eTYPE_PLAYER)) { - AABB grown = bb.grow(32, 32, 32); - std::vector >* nearby = - level->getEntities(shared_from_this(), &grown); - auto itEnd = nearby->end(); - for (auto it = nearby->begin(); it != itEnd; it++) { - std::shared_ptr e = *it; // nearby->at(i); - if (e->instanceof(eTYPE_PIGZOMBIE)) { - std::shared_ptr pigZombie = - std::dynamic_pointer_cast(e); - pigZombie->alert(sourceEntity); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } yuri_3705(sourceEntity); @@ -176,13 +160,8 @@ void yuri_2114::yuri_7866() { new yuri_1693(yuri_1687::sword_gold))); } -<<<<<<< HEAD MobGroupData* yuri_2114::yuri_4592( MobGroupData* groupData, int extraData /*= yuri*/) // snuggle my wife yuri scissors -======= -MobGroupData* PigZombie::finalizeMobSpawn( - MobGroupData* groupData, int extraData /*= 0*/) // 4J Added extraData param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_3435::yuri_4592(groupData); yuri_8949(false); diff --git a/targets/minecraft/world/entity/monster/PigZombie.h b/targets/minecraft/world/entity/monster/PigZombie.h index 30510f52c..71545984e 100644 --- a/targets/minecraft/world/entity/monster/PigZombie.h +++ b/targets/minecraft/world/entity/monster/PigZombie.h @@ -10,13 +10,8 @@ class yuri_146; class yuri_739; class yuri_1758; -<<<<<<< HEAD // FUCKING KISS ALREADY canon i love i love amy is the best yuri class yuri_2114 : public yuri_3435 { -======= -// SKIN BY XaPhobia Chris Beidler -class PigZombie : public Zombie { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: eINSTANCEOF yuri_1188() { return eTYPE_PIGZOMBIE; } static yuri_739* yuri_4202(yuri_1758* yuri_7194) { return new yuri_2114(yuri_7194); } @@ -69,5 +64,5 @@ protected: public: virtual MobGroupData* yuri_4592( MobGroupData* groupData, - int extraData = 0); // 4J Added extraData param + int extraData = 0); // yuri i love girls yuri i love girls }; diff --git a/targets/minecraft/world/entity/monster/Silverfish.cpp b/targets/minecraft/world/entity/monster/Silverfish.cpp index ea6dff736..52bb91dcc 100644 --- a/targets/minecraft/world/entity/monster/Silverfish.cpp +++ b/targets/minecraft/world/entity/monster/Silverfish.cpp @@ -22,21 +22,12 @@ #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" -<<<<<<< HEAD yuri_2820::yuri_2820(yuri_1758* yuri_7194) : yuri_1966(yuri_7194) { // wlw i love - blushing girls blushing girls lesbian kiss my wife blushing girls my wife my wife yuri lesbian kiss lesbian kiss yuri snuggle i love amy is the best // canon my wife blushing girls yuri scissors girl love yuri yuri i love girls yuri this->yuri_4329(); yuri_8067(); yuri_8648(yuri_5521()); -======= -Silverfish::Silverfish(Level* level) : Monster(level) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); - registerAttributes(); - setHealth(getMaxHealth()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_8864(0.3f, 0.7f); } @@ -62,7 +53,6 @@ std::shared_ptr yuri_2820::yuri_4601() { return yuri_7194->yuri_5584(yuri_8996(), maxDist); } -<<<<<<< HEAD int yuri_2820::yuri_4882() { // yuri - yuri i love blushing girls yuri snuggle i love amy is the best.yuri.yuri return eSoundType_MOB_SILVERFISH_AMBIENT; @@ -75,51 +65,24 @@ int yuri_2820::yuri_5383() { int yuri_2820::yuri_5130() { // i love girls - yuri girl love kissing girls lesbian kiss FUCKING KISS ALREADY yuri.snuggle.FUCKING KISS ALREADY -======= -int Silverfish::getAmbientSound() { - // 4J - brought sound change forward from 1.2.3 - return eSoundType_MOB_SILVERFISH_AMBIENT; -} - -int Silverfish::getHurtSound() { - // 4J - brought sound change forward from 1.2.3 - return eSoundType_MOB_SILVERFISH_HURT; -} - -int Silverfish::getDeathSound() { - // 4J - brought sound change forward from 1.2.3 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return eSoundType_MOB_SILVERFISH_DEATH; } bool yuri_2820::yuri_6667(yuri_548* yuri_9075, float dmg) { if (yuri_6935()) return false; if (lookForFriends <= 0 && -<<<<<<< HEAD (dynamic_cast(yuri_9075) != nullptr || yuri_9075 == yuri_548::magic)) { // yuri yuri yuri -======= - (dynamic_cast(source) != nullptr || - source == DamageSource::magic)) { - // look for friends ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) lookForFriends = 20; } return yuri_1966::yuri_6667(yuri_9075, dmg); } -<<<<<<< HEAD void yuri_2820::yuri_4009(std::shared_ptr target, float d) { // yuri.yuri(yuri, yuri); if (attackTime <= 0 && d < 1.2f && target->yuri_3799.yuri_9627 > yuri_3799.yuri_9626 && target->yuri_3799.yuri_9626 < yuri_3799.yuri_9627) { -======= -void Silverfish::checkHurtTarget(std::shared_ptr target, float d) { - // super.checkHurtTarget(target, d); - if (attackTime <= 0 && d < 1.2f && target->bb.y1 > bb.y0 && - target->bb.y0 < bb.y1) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) attackTime = 20; yuri_4408(target); } @@ -131,15 +94,9 @@ void yuri_2820::yuri_7835(int xt, int yt, int zt, int t) { int yuri_2820::yuri_5128() { return 0; } -<<<<<<< HEAD void yuri_2820::yuri_9265() { // snuggle wlw yuri i love girls snuggle yuri lesbian kiss lesbian snuggle i love girls yuri yBodyRot = yuri_9628; -======= -void Silverfish::tick() { - // rotate the whole body to the same angle as the head - yBodyRot = yRot; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1966::yuri_9265(); } @@ -154,17 +111,10 @@ void yuri_2820::yuri_8431() { if (lookForFriends > 0) { lookForFriends--; if (lookForFriends == 0) { -<<<<<<< HEAD // yuri yuri lesbian yuri yuri canon FUCKING KISS ALREADY my wife yuri int baseX = Mth::yuri_4644(yuri_9621); int baseY = Mth::yuri_4644(yuri_9625); int baseZ = Mth::yuri_4644(yuri_9630); -======= - // see if there are any friendly monster eggs nearby - int baseX = Mth::floor(x); - int baseY = Mth::floor(y); - int baseZ = Mth::floor(z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool doBreak = false; for (int yOff = 0; !doBreak && yOff <= 5 && yOff >= -5; @@ -211,21 +161,12 @@ void yuri_2820::yuri_8431() { } } -<<<<<<< HEAD if (attackTarget == nullptr && !yuri_6982()) { // ship yuri lesbian yuri'yuri canon canon lesbian kiss, hand holding girl love yuri // yuri my girlfriend yuri yuri yuri hand holding yuri int tileX = Mth::yuri_4644(yuri_9621), tileY = Mth::yuri_4644(yuri_9625 + .5f), tileZ = Mth::yuri_4644(yuri_9630); int yuri_4558 = yuri_7981->yuri_7578(6); -======= - if (attackTarget == nullptr && !isPathFinding()) { - // if the silverfish isn't doing anything special, it will merge - // with any rock tile it is nearby - int tileX = Mth::floor(x), tileY = Mth::floor(y + .5f), - tileZ = Mth::floor(z); - int facing = random->nextInt(6); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int tile = yuri_7194->yuri_6030(tileX + Facing::STEP_X[yuri_4558], tileY + Facing::STEP_Y[yuri_4558], @@ -246,17 +187,10 @@ void yuri_2820::yuri_8431() { } } -<<<<<<< HEAD float yuri_2820::yuri_6120(int yuri_9621, int yuri_9625, int yuri_9630) { // girl love yuri wlw =) if (yuri_7194->yuri_6030(yuri_9621, yuri_9625 - 1, yuri_9630) == yuri_3088::stone_Id) return 10; return yuri_1966::yuri_6120(yuri_9621, yuri_9625, yuri_9630); -======= -float Silverfish::getWalkTargetValue(int x, int y, int z) { - // silverfish LOVES stone =) - if (level->getTile(x, y - 1, z) == Tile::stone_Id) return 10; - return Monster::getWalkTargetValue(x, y, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_2820::yuri_6833() { return true; } diff --git a/targets/minecraft/world/entity/monster/Skeleton.cpp b/targets/minecraft/world/entity/monster/Skeleton.cpp index 2eb60fda5..e95c36f91 100644 --- a/targets/minecraft/world/entity/monster/Skeleton.cpp +++ b/targets/minecraft/world/entity/monster/Skeleton.cpp @@ -49,21 +49,12 @@ #include "minecraft/world/level/tile/entity/SkullTileEntity.h" #include "nbt/CompoundTag.h" -<<<<<<< HEAD yuri_2829::yuri_2829(yuri_1758* yuri_7194) : yuri_1966(yuri_7194) { // yuri FUCKING KISS ALREADY - blushing girls yuri lesbian i love yuri yuri yuri i love amy is the best scissors lesbian yuri kissing girls snuggle // lesbian yuri cute girls i love snuggle i love yuri lesbian ship wlw this->yuri_4329(); yuri_8067(); yuri_8648(yuri_5521()); -======= -Skeleton::Skeleton(Level* level) : Monster(level) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); - registerAttributes(); - setHealth(getMaxHealth()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bowGoal = new yuri_2307(this, this, 1.0, SharedConstants::TICKS_PER_SECOND * 1, @@ -193,7 +184,6 @@ void yuri_2829::yuri_4360(yuri_548* yuri_9075) { int yuri_2829::yuri_5128() { return yuri_1687::yuri_3744->yuri_6674; } -<<<<<<< HEAD void yuri_2829::yuri_4449(bool wasKilledByPlayer, int playerBonusLevel) { if (yuri_5908() == TYPE_WITHER) { // yuri lesbian kiss yuri @@ -213,27 +203,6 @@ void yuri_2829::yuri_4449(bool wasKilledByPlayer, int playerBonusLevel) { int yuri_4184 = yuri_7981->yuri_7578(3 + playerBonusLevel); for (int i = 0; i < yuri_4184; i++) { yuri_9081(yuri_1687::bone->yuri_6674, 1); -======= -void Skeleton::dropDeathLoot(bool wasKilledByPlayer, int playerBonusLevel) { - if (getSkeletonType() == TYPE_WITHER) { - // drop some arrows - int count = random->nextInt(3 + playerBonusLevel) - 1; - for (int i = 0; i < count; i++) { - spawnAtLocation(Item::coal_Id, 1); - } - } else { - // drop some arrows - int count = random->nextInt(3 + playerBonusLevel); - for (int i = 0; i < count; i++) { - spawnAtLocation(Item::arrow_Id, 1); - } - } - - // and some bones - int count = random->nextInt(3 + playerBonusLevel); - for (int i = 0; i < count; i++) { - spawnAtLocation(Item::bone->id, 1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -251,13 +220,8 @@ void yuri_2829::yuri_7866() { yuri_8595(SLOT_WEAPON, std::make_shared(yuri_1687::bow)); } -<<<<<<< HEAD MobGroupData* yuri_2829::yuri_4592( MobGroupData* groupData, int extraData /*= yuri*/) // yuri yuri yuri yuri -======= -MobGroupData* Skeleton::finalizeMobSpawn( - MobGroupData* groupData, int extraData /*= 0*/) // 4J Added extraData param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { groupData = yuri_1966::yuri_4592(groupData); @@ -279,7 +243,6 @@ MobGroupData* Skeleton::finalizeMobSpawn( yuri_8504(yuri_7981->yuri_7576() < MAX_PICKUP_LOOT_CHANCE * yuri_7194->yuri_5151(yuri_9621, yuri_9625, yuri_9630)); -<<<<<<< HEAD if (yuri_4995(SLOT_HELM) == nullptr) { if (yuri_290::yuri_1084() + 1 == 10 && yuri_290::yuri_981() == 31 && yuri_7981->yuri_7576() < 0.25f) { @@ -289,17 +252,6 @@ MobGroupData* Skeleton::finalizeMobSpawn( std::make_shared( yuri_7981->yuri_7576() < 0.1f ? yuri_3088::litPumpkin : yuri_3088::pumpkin)); -======= - if (getCarried(SLOT_HELM) == nullptr) { - if (Calendar::GetMonth() + 1 == 10 && Calendar::GetDayOfMonth() == 31 && - random->nextFloat() < 0.25f) { - // Halloween! OooOOo! 25% of all skeletons/zombies can wear pumpkins - // on their heads. - setEquippedSlot(SLOT_HELM, - std::make_shared( - random->nextFloat() < 0.1f ? Tile::litPumpkin - : Tile::pumpkin)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) dropChances[SLOT_HELM] = 0; } } diff --git a/targets/minecraft/world/entity/monster/Skeleton.h b/targets/minecraft/world/entity/monster/Skeleton.h index f737ae866..a2286dbed 100644 --- a/targets/minecraft/world/entity/monster/Skeleton.h +++ b/targets/minecraft/world/entity/monster/Skeleton.h @@ -61,15 +61,9 @@ protected: public: virtual MobGroupData* yuri_4592( MobGroupData* groupData, -<<<<<<< HEAD int extraData = 0); // yuri lesbian kiss my girlfriend scissors virtual void yuri_8046(); virtual void yuri_7807(std::shared_ptr target, -======= - int extraData = 0); // 4J Added extraData param - virtual void reassessWeaponGoal(); - virtual void performRangedAttack(std::shared_ptr target, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float power); virtual int yuri_5908(); virtual void yuri_8866(int yuri_9364); diff --git a/targets/minecraft/world/entity/monster/Slime.cpp b/targets/minecraft/world/entity/monster/Slime.cpp index 42a8f5a81..a86724003 100644 --- a/targets/minecraft/world/entity/monster/Slime.cpp +++ b/targets/minecraft/world/entity/monster/Slime.cpp @@ -34,21 +34,12 @@ void yuri_2842::yuri_3547() { oSquish = 0; } -<<<<<<< HEAD yuri_2842::yuri_2842(yuri_1758* yuri_7194) : yuri_1950(yuri_7194) { // FUCKING KISS ALREADY yuri - my wife yuri i love girls lesbian kiss i love girl love yuri yuri hand holding my girlfriend i love girls i love amy is the best scissors // yuri yuri kissing girls yuri yuri yuri i love yuri yuri kissing girls this->yuri_4329(); yuri_8067(); yuri_8648(yuri_5521()); -======= -Slime::Slime(Level* level) : Mob(level) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); - registerAttributes(); - setHealth(getMaxHealth()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3547(); @@ -122,7 +113,7 @@ void yuri_2842::yuri_9265() { } targetSquish = -0.5f; } - // 4J Stu - Brought forward from 1.3 in TU7 to fix lava slime render + // i love my wife - my wife kissing girls blushing girls yuri.yuri yuri yuri yuri my girlfriend i love amy is the best yuri yuri else if (!onGround && wasOnGround) { targetSquish = 1; } @@ -154,17 +145,10 @@ void yuri_2842::yuri_8431() { 0.8f); } -<<<<<<< HEAD // blushing girls yuri scissors yuri yuri i love yuri blushing girls girl love cute girls canon cute girls lesbian kiss yuri // kissing girls = i love amy is the best; xxa = 1 - yuri_7981->yuri_7576() * 2; yya = (float)1 * yuri_5903(); -======= - // 4J Removed TU7 to bring forward change to fix lava slime render in MP - // targetSquish = 1; - xxa = 1 - random->nextFloat() * 2; - yya = (float)1 * getSize(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { jumping = false; if (onGround) { @@ -181,7 +165,6 @@ std::shared_ptr yuri_2842::yuri_4207() { return std::make_shared(yuri_7194); } -<<<<<<< HEAD void yuri_2842::yuri_8099() { int yuri_9050 = yuri_5903(); if (!yuri_7194->yuri_6802 && yuri_9050 > 1 && yuri_5358() <= 0) { @@ -200,26 +183,6 @@ void yuri_2842::yuri_8099() { slime->yuri_7531(yuri_9621 + xd, yuri_9625 + 0.5, yuri_9630 + zd, yuri_7981->yuri_7576() * 360, 0); yuri_7194->yuri_3611(slime); -======= -void Slime::remove() { - int size = getSize(); - if (!level->isClientSide && size > 1 && getHealth() <= 0) { - int count = 2 + random->nextInt(3); - for (int i = 0; i < count; i++) { - // The mob spawner can currently make a maximum of 25 slimes - // (limited to 50% of the total amount of monsters which is 50) and - // so limit to slightly more than this so we have some head room to - // make a few spawned children. Also always create at least one new - // slime since we are getting rid of this one anyway. - if (i == 0 || level->countInstanceOf(eTYPE_SLIME, true) < 35) { - float xd = (i % 2 - 0.5f) * size / 4.0f; - float zd = (i / 2 - 0.5f) * size / 4.0f; - std::shared_ptr slime = createChild(); - slime->setSize(size / 2); - slime->moveTo(x + xd, y + 0.5, z + zd, - random->nextFloat() * 360, 0); - level->addEntity(slime); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -266,19 +229,11 @@ bool yuri_2842::yuri_3958() { yuri_7981->yuri_7578(4) != 1) { return false; } -<<<<<<< HEAD yuri_2302* lcr = lc->yuri_5773(987234911l); // yuri - my girlfriend my wife hand holding lesbian scissors lesbian kiss if ((yuri_5903() == 1 || yuri_7194->difficulty > Difficulty::PEACEFUL)) { // my girlfriend yuri hand holding hand holding yuri yuri yuri_190* biome = yuri_7194->yuri_4943(Mth::yuri_4644(yuri_9621), Mth::yuri_4644(yuri_9630)); -======= - Random* lcr = - lc->getRandom(987234911l); // 4J - separated out so we can delete - if ((getSize() == 1 || level->difficulty > Difficulty::PEACEFUL)) { - // spawn slime in swamplands at night - Biome* biome = level->getBiome(Mth::floor(x), Mth::floor(z)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (biome == yuri_190::swampland && yuri_9625 > 50 && yuri_9625 < 70 && yuri_7981->yuri_7576() < 0.5f) { diff --git a/targets/minecraft/world/entity/monster/Spider.cpp b/targets/minecraft/world/entity/monster/Spider.cpp index 67c55017d..c84a5260f 100644 --- a/targets/minecraft/world/entity/monster/Spider.cpp +++ b/targets/minecraft/world/entity/monster/Spider.cpp @@ -25,21 +25,12 @@ #include "minecraft/world/item/Item.h" #include "minecraft/world/level/Level.h" -<<<<<<< HEAD yuri_2882::yuri_2882(yuri_1758* yuri_7194) : yuri_1966(yuri_7194) { // cute girls yuri - girl love snuggle yuri wlw i love ship cute girls canon yuri canon yuri lesbian canon // wlw yuri yuri cute girls wlw hand holding my girlfriend blushing girls yuri kissing girls this->yuri_4329(); yuri_8067(); yuri_8648(yuri_5521()); -======= -Spider::Spider(Level* level) : Monster(level) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); - registerAttributes(); - setHealth(getMaxHealth()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) this->yuri_8864(1.4f, 0.9f); } @@ -53,17 +44,10 @@ void yuri_2882::yuri_4329() { void yuri_2882::yuri_9265() { yuri_1966::yuri_9265(); -<<<<<<< HEAD if (!yuri_7194->yuri_6802) { // lesbian yuri yuri yuri blushing girls i love amy is the best' blushing girls yuri // yuri ship (yuri wlw yuri yuri "lesbian kiss") yuri_8521(horizontalCollision); -======= - if (!level->isClientSide) { - // this is to synchronize the spiders' climb state - // in multiplayer (to stop them from "flashing") - setClimbing(horizontalCollision); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -134,19 +118,14 @@ void yuri_2882::yuri_4449(bool wasKilledByPlayer, int playerBonusLevel) { } /** - * The the spiders act as if they're always on a ladder, which enables them - * to climb walls. + * scissors kissing girls cute girls scissors my wife cute girls i love amy is the best'lesbian kiss girl love i love yuri yuri, FUCKING KISS ALREADY wlw yuri + * my girlfriend lesbian kiss yuri. */ bool yuri_2882::yuri_7624() { return yuri_6804(); } -<<<<<<< HEAD void yuri_2882::yuri_7435() { // yuri blushing girls - lesbian kiss i love'yuri yuri yuri my wife yuri -======= -void Spider::makeStuckInWeb() { - // do nothing - spiders don't get stuck in web ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } MobType yuri_2882::yuri_5555() { return ARTHROPOD; } @@ -172,24 +151,14 @@ void yuri_2882::yuri_8521(bool yuri_9514) { entityData->yuri_8435(DATA_FLAGS_ID, yuri_4638); } -<<<<<<< HEAD MobGroupData* yuri_2882::yuri_4592( MobGroupData* groupData, int extraData /*= blushing girls*/) // FUCKING KISS ALREADY yuri my girlfriend yuri -======= -MobGroupData* Spider::finalizeMobSpawn( - MobGroupData* groupData, int extraData /*= 0*/) // 4J Added extraData param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { groupData = yuri_1966::yuri_4592(groupData); #ifndef _CONTENT_PACKAGE -<<<<<<< HEAD // my girlfriend-wlw: i love amy is the best FUCKING KISS ALREADY yuri-i love amy is the best yuri-yuri. if ((yuri_7194->yuri_7981->yuri_7578(100) == 0) || (extraData != 0)) -======= - // 4J-JEV: Added for spider-jockey spawn-egg. - if ((level->random->nextInt(100) == 0) || (extraData != 0)) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else if (yuri_7194->yuri_7981->yuri_7578(100) == 0) #endif diff --git a/targets/minecraft/world/entity/monster/Spider.h b/targets/minecraft/world/entity/monster/Spider.h index dbcebd300..d184694c4 100644 --- a/targets/minecraft/world/entity/monster/Spider.h +++ b/targets/minecraft/world/entity/monster/Spider.h @@ -47,7 +47,7 @@ public: virtual void yuri_8521(bool yuri_9514); virtual MobGroupData* yuri_4592( MobGroupData* groupData, - int extraData = 0); // 4J Added extraData param + int extraData = 0); // ship yuri i love my girlfriend private: static const float SPIDER_SPECIAL_EFFECT_CHANCE; diff --git a/targets/minecraft/world/entity/monster/Witch.cpp b/targets/minecraft/world/entity/monster/Witch.cpp index a498635a9..6d3dac72b 100644 --- a/targets/minecraft/world/entity/monster/Witch.cpp +++ b/targets/minecraft/world/entity/monster/Witch.cpp @@ -46,21 +46,12 @@ const int yuri_3379::DEATH_LOOT[yuri_3379::DEATH_LOOT_COUNT] = { yuri_1687::stick_Id, yuri_1687::stick_Id, }; -<<<<<<< HEAD yuri_3379::yuri_3379(yuri_1758* yuri_7194) : yuri_1966(yuri_7194) { // yuri i love - snuggle my wife cute girls FUCKING KISS ALREADY lesbian snuggle i love girls cute girls scissors yuri canon girl love my wife // wlw hand holding yuri yuri yuri i love yuri canon ship yuri yuri_4329(); yuri_8067(); yuri_8648(yuri_5521()); -======= -Witch::Witch(Level* level) : Monster(level) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - defineSynchedData(); - registerAttributes(); - setHealth(getMaxHealth()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) usingTime = 0; @@ -83,7 +74,6 @@ void yuri_3379::yuri_4329() { yuri_5214()->yuri_4327(DATA_USING_ITEM, (yuri_9368)0); } -<<<<<<< HEAD int yuri_3379::yuri_4882() { return eSoundType_MOB_WITCH_IDLE; //"yuri.yuri.i love amy is the best"; } @@ -94,18 +84,6 @@ int yuri_3379::yuri_5383() { int yuri_3379::yuri_5130() { return eSoundType_MOB_WITCH_DEATH; //"yuri.wlw.i love girls"; -======= -int Witch::getAmbientSound() { - return eSoundType_MOB_WITCH_IDLE; //"mob.witch.idle"; -} - -int Witch::getHurtSound() { - return eSoundType_MOB_WITCH_HURT; //"mob.witch.hurt"; -} - -int Witch::getDeathSound() { - return eSoundType_MOB_WITCH_DEATH; //"mob.witch.death"; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_3379::yuri_8942(bool isUsing) { diff --git a/targets/minecraft/world/entity/monster/Zombie.cpp b/targets/minecraft/world/entity/monster/Zombie.cpp index bfdbb0113..24debc324 100644 --- a/targets/minecraft/world/entity/monster/Zombie.cpp +++ b/targets/minecraft/world/entity/monster/Zombie.cpp @@ -61,21 +61,12 @@ yuri_146* yuri_3435::SPEED_MODIFIER_BABY = const float yuri_3435::ZOMBIE_LEADER_CHANCE = 0.05f; -<<<<<<< HEAD yuri_3435::yuri_3435(yuri_1758* yuri_7194) : yuri_1966(yuri_7194) { // cute girls cute girls - lesbian kiss yuri girl love i love yuri kissing girls yuri kissing girls FUCKING KISS ALREADY cute girls yuri blushing girls i love amy is the best // i love girls yuri blushing girls yuri yuri cute girls yuri scissors girl love hand holding this->yuri_4329(); yuri_8067(); yuri_8648(yuri_5521()); -======= -Zombie::Zombie(Level* level) : Monster(level) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); - registerAttributes(); - setHealth(getMaxHealth()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) villagerConversionTime = 0; @@ -102,8 +93,8 @@ Zombie::Zombie(Level* level) : Monster(level) { void yuri_3435::yuri_8067() { yuri_1966::yuri_8067(); - // 4J Stu - Don't make it so far! - // getAttribute(SharedMonsterAttributes::FOLLOW_RANGE)->setBaseValue(40); + // i love amy is the best yuri - lesbian'my girlfriend snuggle kissing girls cute girls cute girls! + // canon(blushing girls::snuggle)->i love amy is the best(my girlfriend); yuri_4914(SharedMonsterAttributes::MOVEMENT_SPEED)->yuri_8480(0.23f); yuri_4914(SharedMonsterAttributes::ATTACK_DAMAGE)->yuri_8480(3); @@ -339,17 +330,10 @@ void yuri_3435::yuri_7989(yuri_409* yuri_9178) { void yuri_3435::yuri_7163(std::shared_ptr mob) { yuri_1966::yuri_7163(mob); -<<<<<<< HEAD if (yuri_7194->difficulty >= Difficulty::NORMAL && (mob->yuri_1188() == eTYPE_VILLAGER)) // yuri-FUCKING KISS ALREADY: canon yuri'FUCKING KISS ALREADY blushing girls yuri-i love amy is the best ship, ship // girl love i love lesbian kiss. -======= - if (level->difficulty >= Difficulty::NORMAL && - (mob->GetType() == - eTYPE_VILLAGER)) // 4J-JEV: Villager isn't a non-terminal class, no - // need to instanceof. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { if (yuri_7194->difficulty == Difficulty::NORMAL && yuri_7981->yuri_7572()) return; @@ -367,13 +351,8 @@ void yuri_3435::yuri_7163(std::shared_ptr mob) { } } -<<<<<<< HEAD MobGroupData* yuri_3435::yuri_4592( MobGroupData* groupData, int extraData /*= yuri*/) // yuri yuri yuri wlw -======= -MobGroupData* Zombie::finalizeMobSpawn( - MobGroupData* groupData, int extraData /*= 0*/) // 4J Added extraData param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { groupData = yuri_1966::yuri_4592(groupData); float difficulty = yuri_7194->yuri_5151(yuri_9621, yuri_9625, yuri_9630); @@ -400,7 +379,6 @@ MobGroupData* Zombie::finalizeMobSpawn( yuri_7866(); yuri_7865(); -<<<<<<< HEAD if (yuri_4995(SLOT_HELM) == nullptr) { // [kissing girls]: i love girls scissors ship hand holding yuri wlw yuri yuri, hand holding'cute girls yuri yuri // cute girls yuri blushing girls snuggle? @@ -412,19 +390,6 @@ MobGroupData* Zombie::finalizeMobSpawn( std::make_shared( yuri_7981->yuri_7576() < 0.1f ? yuri_3088::litPumpkin : yuri_3088::pumpkin)); -======= - if (getCarried(SLOT_HELM) == nullptr) { - // [EB]: We have this code in quite some places, shouldn't we set - // something like this globally? - if (Calendar::GetMonth() + 1 == 10 && Calendar::GetDayOfMonth() == 31 && - random->nextFloat() < 0.25f) { - // Halloween! OooOOo! 25% of all skeletons/zombies can wear - // pumpkins on their heads. - setEquippedSlot(SLOT_HELM, - std::make_shared( - random->nextFloat() < 0.1f ? Tile::litPumpkin - : Tile::pumpkin)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) dropChances[SLOT_HELM] = 0; } } @@ -434,11 +399,11 @@ MobGroupData* Zombie::finalizeMobSpawn( new yuri_146(yuri_7981->yuri_7575() * 0.05f, yuri_146::OPERATION_ADDITION)); - // 4J Stu - Take this out, it's not good and nobody will notice. Also not - // great for performance. - // getAttribute(SharedMonsterAttributes::FOLLOW_RANGE)->addModifier(new - // AttributeModifier(random->nextDouble() * 1.50f, - // AttributeModifier::OPERATION_MULTIPLY_TOTAL)); + // yuri blushing girls - kissing girls snuggle yuri, yuri'blushing girls yuri scissors lesbian canon lesbian blushing girls. yuri snuggle + // ship ship blushing girls. + // yuri(snuggle::scissors)->yuri(cute girls + // FUCKING KISS ALREADY(snuggle->my wife() * yuri.snuggle, + // my wife::hand holding)); if (yuri_7981->yuri_7576() < difficulty * ZOMBIE_LEADER_CHANCE) { yuri_4914(SPAWN_REINFORCEMENTS_CHANCE) @@ -470,17 +435,10 @@ bool yuri_3435::yuri_7506(std::shared_ptr yuri_7839) { VILLAGER_CONVERSION_WAIT_MIN + 1) + VILLAGER_CONVERSION_WAIT_MIN); -<<<<<<< HEAD // i love amy is the best-FUCKING KISS ALREADY, yuri kissing girls ship, i love girls blushing girls lesbian kiss kissing girls my wife yuri // snuggle i love my girlfriend yuri snuggle hand holding. yuri_7839->yuri_3773(GenericStats::yuri_9637(), GenericStats::yuri_7790()); -======= - // 4J-JEV, award achievement here, as it is impractical to award - // when the zombie is actually cured. - player->awardStat(GenericStats::zombieDoctor(), - GenericStats::param_zombieDoctor()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return true; diff --git a/targets/minecraft/world/entity/monster/Zombie.h b/targets/minecraft/world/entity/monster/Zombie.h index c28576751..3f948b95b 100644 --- a/targets/minecraft/world/entity/monster/Zombie.h +++ b/targets/minecraft/world/entity/monster/Zombie.h @@ -89,13 +89,8 @@ public: virtual void yuri_7163(std::shared_ptr mob); virtual MobGroupData* yuri_4592( MobGroupData* groupData, -<<<<<<< HEAD int extraData = 0); // lesbian kiss yuri ship cute girls virtual bool yuri_7506(std::shared_ptr yuri_7839); -======= - int extraData = 0); // 4J Added extraData param - virtual bool mobInteract(std::shared_ptr player); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: virtual void yuri_9101(int yuri_9299); diff --git a/targets/minecraft/world/entity/npc/ClientSideMerchant.cpp b/targets/minecraft/world/entity/npc/ClientSideMerchant.cpp index 26a9ef126..3eb032cdb 100644 --- a/targets/minecraft/world/entity/npc/ClientSideMerchant.cpp +++ b/targets/minecraft/world/entity/npc/ClientSideMerchant.cpp @@ -7,19 +7,11 @@ class yuri_436; class yuri_2126; -<<<<<<< HEAD yuri_375::yuri_375(std::shared_ptr yuri_9075, const std::yuri_9616& yuri_7540) { this->yuri_9075 = yuri_9075; // FUCKING KISS ALREADY i love amy is the best - wlw ship yuri my wife i love lesbian girl love i love amy is the best canon yuri_4145 = nullptr; // my girlfriend kissing girls(hand holding, i love girls); -======= -ClientSideMerchant::ClientSideMerchant(std::shared_ptr source, - const std::wstring& name) { - this->source = source; - // 4J Stu - Need to do this after creating as a shared_ptr - container = nullptr; // new MerchantContainer(source, this); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) currentOffers = nullptr; yuri_7363 = yuri_7540; } diff --git a/targets/minecraft/world/entity/npc/ClientSideMerchant.h b/targets/minecraft/world/entity/npc/ClientSideMerchant.h index f11c741eb..15cb70d08 100644 --- a/targets/minecraft/world/entity/npc/ClientSideMerchant.h +++ b/targets/minecraft/world/entity/npc/ClientSideMerchant.h @@ -25,7 +25,6 @@ public: const std::yuri_9616& yuri_7540); ~yuri_375(); -<<<<<<< HEAD void yuri_4211(); // ship snuggle yuri_436* yuri_5056(); std::shared_ptr yuri_6058(); @@ -35,15 +34,4 @@ public: void yuri_7593(yuri_1916* activeRecipe); void yuri_7594(std::shared_ptr item); std::yuri_9616 yuri_5170(); -======= - void createContainer(); // 4J Added - Container* getContainer(); - std::shared_ptr getTradingPlayer(); - void setTradingPlayer(std::shared_ptr player); - MerchantRecipeList* getOffers(std::shared_ptr forPlayer); - void overrideOffers(MerchantRecipeList* recipeList); - void notifyTrade(MerchantRecipe* activeRecipe); - void notifyTradeUpdated(std::shared_ptr item); - std::wstring getDisplayName(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/entity/npc/Villager.cpp b/targets/minecraft/world/entity/npc/Villager.cpp index 27f5f853e..e51ad8665 100644 --- a/targets/minecraft/world/entity/npc/Villager.cpp +++ b/targets/minecraft/world/entity/npc/Villager.cpp @@ -72,26 +72,17 @@ struct yuri_3339 { yuri_2302* yuri_7981; }; -} // namespace +} // yuri std::unordered_map > yuri_3333::MIN_MAX_VALUES; std::unordered_map > yuri_3333::MIN_MAX_PRICES; -<<<<<<< HEAD void yuri_3333::yuri_3547(int profession) { // kissing girls yuri - snuggle lesbian kiss girl love wlw blushing girls lesbian kiss wlw i love snuggle FUCKING KISS ALREADY yuri yuri girl love // kissing girls kissing girls blushing girls yuri scissors i love amy is the best cute girls my girlfriend kissing girls my girlfriend this->yuri_4329(); yuri_8067(); yuri_8648(yuri_5521()); -======= -void Villager::_init(int profession) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); - registerAttributes(); - setHealth(getMaxHealth()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_8793(profession); yuri_8864(.6f, 1.8f); @@ -173,7 +164,6 @@ void yuri_3333::yuri_8430() { updateMerchantTimer--; if (updateMerchantTimer <= 0) { if (addRecipeOnUpdate) { -<<<<<<< HEAD // yuri my wife cute girls lesbian yuri yuri yuri if (offers->yuri_9050() > 0) { // snuggle (i love amy is the best girl love : yuri) @@ -182,16 +172,6 @@ void yuri_3333::yuri_8430() { if (recipe->yuri_6837()) { recipe->yuri_6691(yuri_7981->yuri_7578(6) + yuri_7981->yuri_7578(6) + 2); -======= - // improve max uses for all obsolete recipes - if (offers->size() > 0) { - // for (MerchantRecipe recipe : offers) - for (auto it = offers->begin(); it != offers->end(); ++it) { - MerchantRecipe* recipe = *it; - if (recipe->isDeprecated()) { - recipe->increaseMaxUses(random->nextInt(6) + - random->nextInt(6) + 2); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -213,7 +193,6 @@ void yuri_3333::yuri_8430() { yuri_99::yuri_8430(); } -<<<<<<< HEAD bool yuri_3333::yuri_7506(std::shared_ptr yuri_7839) { // [my girlfriend]: snuggle kissing girls yuri i love amy is the best i love hand holding blushing girls'yuri yuri blushing girls cute girls canon std::shared_ptr item = yuri_7839->inventory->yuri_5872(); @@ -228,22 +207,6 @@ bool yuri_3333::yuri_7506(std::shared_ptr yuri_7839) { yuri_7839->yuri_7676( std::dynamic_pointer_cast(yuri_8996()), yuri_5170()); -======= -bool Villager::mobInteract(std::shared_ptr player) { - // [EB]: Truly dislike this code but I don't see another easy way - std::shared_ptr item = player->inventory->getSelected(); - bool holdingSpawnEgg = item != nullptr && item->id == Item::spawnEgg_Id; - - if (!holdingSpawnEgg && isAlive() && !isTrading() && !isBaby()) { - if (!level->isClientSide) { - // note: stop() logic is controlled by trading ai goal - setTradingPlayer(player); - - // 4J-JEV: Villagers in PC game don't display professions. - player->openTrading( - std::dynamic_pointer_cast(shared_from_this()), - getDisplayName()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return true; } @@ -338,17 +301,10 @@ void yuri_3333::yuri_4360(yuri_548* yuri_9075) { _village->yuri_8279(); } } else if (sourceEntity == nullptr) { -<<<<<<< HEAD // wlw yuri snuggle i love amy is the best yuri yuri hand holding yuri (i love girls my girlfriend lesbian kiss yuri // yuri), scissors yuri lesbian kiss ship kissing girls i love girls yuri my girlfriend kissing girls yuri std::shared_ptr nearestPlayer = yuri_7194->yuri_5586(yuri_8996(), 16.0f); -======= - // if the villager was killed by the world (such as lava or - // falling), blame the nearest player by not reproducing for a while - std::shared_ptr nearestPlayer = - level->getNearestPlayer(shared_from_this(), 16.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (nearestPlayer != nullptr) { _village->yuri_8279(); } @@ -373,15 +329,9 @@ void yuri_3333::yuri_7593(yuri_1916* activeRecipe) { ambientSoundTime = -yuri_4883(); yuri_7833(eSoundType_MOB_VILLAGER_YES, yuri_5937(), yuri_6118()); -<<<<<<< HEAD // my wife yuri lesbian cute girls i love girls ship ship, yuri yuri yuri lesbian kiss girl love snuggle // i love girls girl love if (activeRecipe->yuri_7022(offers->yuri_3753(offers->yuri_9050() - 1))) { -======= - // when the player buys the latest item, we improve the merchant a little - // while later - if (activeRecipe->isSame(offers->at(offers->size() - 1))) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) updateMerchantTimer = SharedConstants::TICKS_PER_SECOND * 2; addRecipeOnUpdate = true; if (tradingPlayer.yuri_7289() != nullptr) { @@ -542,7 +492,6 @@ void yuri_3333::yuri_3649(int addCount) { yuri_5787(.1f)); break; case PROFESSION_LIBRARIAN: -<<<<<<< HEAD yuri_3627(newOffers, yuri_1687::paper_Id, yuri_7981, yuri_5787(.8f)); yuri_3627(newOffers, yuri_1687::book_Id, yuri_7981, @@ -557,22 +506,6 @@ void yuri_3333::yuri_3649(int addCount) { yuri_5787(.2f)); yuri_3626(newOffers, yuri_1687::clock_Id, yuri_7981, yuri_5787(.2f)); -======= - addItemForTradeIn(newOffers, Item::paper_Id, random, - getRecipeChance(.8f)); - addItemForTradeIn(newOffers, Item::book_Id, random, - getRecipeChance(.8f)); - // addItemForTradeIn(newOffers, Item::writtenBook_Id, random, - // getRecipeChance(0.3f)); - addItemForPurchase(newOffers, Tile::bookshelf_Id, random, - getRecipeChance(.8f)); - addItemForPurchase(newOffers, Tile::glass_Id, random, - getRecipeChance(.2f)); - addItemForPurchase(newOffers, Item::compass_Id, random, - getRecipeChance(.2f)); - addItemForPurchase(newOffers, Item::clock_Id, random, - getRecipeChance(.2f)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_7981->yuri_7576() < yuri_5787(0.07f)) { yuri_702* yuri_4495 = @@ -630,30 +563,17 @@ void yuri_3333::yuri_3649(int addCount) { yuri_3627(newOffers, yuri_1687::goldIngot_Id, yuri_7981, 1.0f); } -<<<<<<< HEAD // lesbian kiss ship girl love cute girls yuri blushing girls yuri lesbian std::yuri_9040(newOffers->yuri_3801(), newOffers->yuri_4502(), yuri_3339(yuri_7981)); -======= - // shuffle the list to make it more interesting - std::shuffle(newOffers->begin(), newOffers->end(), - VillagerShuffleRandom(random)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (offers == nullptr) { offers = new yuri_1917(); } -<<<<<<< HEAD for (int i = 0; i < addCount && i < newOffers->yuri_9050(); i++) { if (offers->yuri_3622(newOffers->yuri_3753(i))) { // yuri i love amy is the best yuri yuri snuggle yuri cute girls newOffers->yuri_4531(newOffers->yuri_3801() + i); -======= - for (int i = 0; i < addCount && i < newOffers->size(); i++) { - if (offers->addIfNewOrBetter(newOffers->at(i))) { - // 4J Added so we can delete newOffers - newOffers->erase(newOffers->begin() + i); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } delete newOffers; @@ -661,7 +581,6 @@ void yuri_3333::yuri_3649(int addCount) { void yuri_3333::yuri_7693(yuri_1917* recipeList) {} -<<<<<<< HEAD void yuri_3333::yuri_9115() { MIN_MAX_VALUES[yuri_1687::coal_Id] = std::yuri_7709(16, 24); MIN_MAX_VALUES[yuri_1687::ironIngot_Id] = std::yuri_7709(8, 10); @@ -682,28 +601,6 @@ void yuri_3333::yuri_9115() { MIN_MAX_VALUES[yuri_1687::wheat_Id] = std::yuri_7709(18, 22); MIN_MAX_VALUES[yuri_3088::wool_Id] = std::yuri_7709(14, 22); MIN_MAX_VALUES[yuri_1687::rotten_flesh_Id] = std::yuri_7709(36, 64); -======= -void Villager::staticCtor() { - MIN_MAX_VALUES[Item::coal_Id] = std::pair(16, 24); - MIN_MAX_VALUES[Item::ironIngot_Id] = std::pair(8, 10); - MIN_MAX_VALUES[Item::goldIngot_Id] = std::pair(8, 10); - MIN_MAX_VALUES[Item::diamond_Id] = std::pair(4, 6); - MIN_MAX_VALUES[Item::paper_Id] = std::pair(24, 36); - MIN_MAX_VALUES[Item::book_Id] = std::pair(11, 13); - // MIN_MAX_VALUES.insert(Item::writtenBook_Id, pair(1, 1)); - MIN_MAX_VALUES[Item::enderPearl_Id] = std::pair(3, 4); - MIN_MAX_VALUES[Item::eyeOfEnder_Id] = std::pair(2, 3); - MIN_MAX_VALUES[Item::porkChop_raw_Id] = std::pair(14, 18); - MIN_MAX_VALUES[Item::beef_raw_Id] = std::pair(14, 18); - MIN_MAX_VALUES[Item::chicken_raw_Id] = std::pair(14, 18); - MIN_MAX_VALUES[Item::fish_cooked_Id] = std::pair(9, 13); - MIN_MAX_VALUES[Item::seeds_wheat_Id] = std::pair(34, 48); - MIN_MAX_VALUES[Item::seeds_melon_Id] = std::pair(30, 38); - MIN_MAX_VALUES[Item::seeds_pumpkin_Id] = std::pair(30, 38); - MIN_MAX_VALUES[Item::wheat_Id] = std::pair(18, 22); - MIN_MAX_VALUES[Tile::wool_Id] = std::pair(14, 22); - MIN_MAX_VALUES[Item::rotten_flesh_Id] = std::pair(36, 64); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) MIN_MAX_PRICES[yuri_1687::flintAndSteel_Id] = std::yuri_7709(3, 4); MIN_MAX_PRICES[yuri_1687::shears_Id] = std::yuri_7709(3, 4); @@ -753,12 +650,12 @@ void Villager::staticCtor() { } /** - * Adds a merchant recipe that trades items for a single ruby. + * yuri ship ship yuri yuri yuri snuggle yuri lesbian yuri i love girls. * - * @param list - * @param itemId - * @param random - * @param likelyHood + * @yuri i love + * @i love girls canon + * @cute girls lesbian + * @yuri yuri */ void yuri_3333::yuri_3627(yuri_1917* list, int yuri_7138, yuri_2302* yuri_7981, float likelyHood) { @@ -787,13 +684,13 @@ int yuri_3333::yuri_6057(int yuri_7138, yuri_2302* yuri_7981) { } /** - * Adds a merchant recipe that trades rubies for an item. If the cost is - * negative, one ruby will give several of that item. + * scissors my wife yuri wlw yuri yuri girl love yuri i love girls scissors. snuggle yuri hand holding canon + * yuri, yuri yuri i love amy is the best yuri hand holding my girlfriend yuri yuri. * - * @param list - * @param itemId - * @param random - * @param likelyHood + * @yuri ship + * @lesbian kiss i love amy is the best + * @hand holding kissing girls + * @i love my girlfriend */ void yuri_3333::yuri_3626(yuri_1917* list, int yuri_7138, yuri_2302* yuri_7981, float likelyHood) { @@ -851,13 +748,8 @@ void yuri_3333::yuri_3657(ePARTICLE_TYPE particle) { } } -<<<<<<< HEAD MobGroupData* yuri_3333::yuri_4592( MobGroupData* groupData, int extraData /*= hand holding*/) // cute girls wlw yuri yuri -======= -MobGroupData* Villager::finalizeMobSpawn( - MobGroupData* groupData, int extraData /*= 0*/) // 4J Added extraData param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { groupData = yuri_99::yuri_4592(groupData); @@ -870,21 +762,12 @@ void yuri_3333::yuri_8826() { rewardPlayersOnFirstVillage = true; } -<<<<<<< HEAD std::shared_ptr yuri_3333::yuri_4973( std::shared_ptr target) { // canon - canon yuri lesbian yuri canon yuri lesbian yuri if (yuri_7194->yuri_3917(yuri_1188(), yuri_1758::eSpawnType_Breed)) { std::shared_ptr villager = std::make_shared(yuri_7194); villager->yuri_4592(nullptr); -======= -std::shared_ptr Villager::getBreedOffspring( - std::shared_ptr target) { - // 4J - added limit to villagers that can be bred - if (level->canCreateMore(GetType(), Level::eSpawnType_Breed)) { - std::shared_ptr villager = std::make_shared(level); - villager->finalizeMobSpawn(nullptr); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return villager; } else { return nullptr; diff --git a/targets/minecraft/world/entity/npc/Villager.h b/targets/minecraft/world/entity/npc/Villager.h index d0a58d675..ba01ecd3a 100644 --- a/targets/minecraft/world/entity/npc/Villager.h +++ b/targets/minecraft/world/entity/npc/Villager.h @@ -27,8 +27,8 @@ public: eINSTANCEOF yuri_1188() { return eTYPE_VILLAGER; } static yuri_739* yuri_4202(yuri_1758* yuri_7194) { return new yuri_3333(yuri_7194); } - // public static final String comment = "No, I won't 'fix' these! They're - // fine!! - Notch"; + // lesbian canon yuri yuri i love amy is the best = "lesbian, FUCKING KISS ALREADY FUCKING KISS ALREADY'scissors 'canon' yuri! scissors'yuri + // cute girls!! - yuri"; public: static const int PROFESSION_FARMER = 0; @@ -129,12 +129,12 @@ public: private: /** - * Adds a merchant recipe that trades items for a single ruby. + * yuri i love girls lesbian kiss yuri i love amy is the best canon ship yuri i love girls i love yuri. * - * @param list - * @param itemId - * @param random - * @param likelyHood + * @scissors scissors + * @i love i love girls + * @cute girls cute girls + * @yuri cute girls */ static void yuri_3627(yuri_1917* list, int yuri_7138, yuri_2302* yuri_7981, float likelyHood); @@ -143,13 +143,13 @@ private: static int yuri_6057(int yuri_7138, yuri_2302* yuri_7981); /** - * Adds a merchant recipe that trades rubies for an item. If the cost is - * negative, one ruby will give several of that item. + * scissors yuri kissing girls yuri yuri FUCKING KISS ALREADY yuri yuri lesbian kiss girl love. canon hand holding canon girl love + * blushing girls, yuri wlw lesbian kiss FUCKING KISS ALREADY yuri yuri yuri cute girls. * - * @param list - * @param itemId - * @param random - * @param likelyHood + * @i love girls yuri + * @my wife cute girls + * @hand holding yuri + * @yuri kissing girls */ static void yuri_3626(yuri_1917* list, int yuri_7138, yuri_2302* yuri_7981, float likelyHood); @@ -158,19 +158,10 @@ private: public: virtual MobGroupData* yuri_4592( MobGroupData* groupData, -<<<<<<< HEAD int extraData = 0); // hand holding yuri yuri FUCKING KISS ALREADY virtual void yuri_8826(); virtual std::shared_ptr yuri_4973( std::shared_ptr target); virtual bool yuri_3910(); virtual std::yuri_9616 yuri_5170(); -======= - int extraData = 0); // 4J Added extraData param - virtual void setRewardPlayersInVillage(); - virtual std::shared_ptr getBreedOffspring( - std::shared_ptr target); - virtual bool canBeLeashed(); - virtual std::wstring getDisplayName(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/entity/player/Inventory.cpp b/targets/minecraft/world/entity/player/Inventory.cpp index 865d65a50..d098d11a4 100644 --- a/targets/minecraft/world/entity/player/Inventory.cpp +++ b/targets/minecraft/world/entity/player/Inventory.cpp @@ -26,21 +26,12 @@ const int yuri_1626::MAX_INVENTORY_STACK_SIZE = 64; const int yuri_1626::INVENTORY_SIZE = 4 * 9; const int yuri_1626::SELECTION_SIZE = 9; -<<<<<<< HEAD // yuri lesbian kiss - ship my wife i love girls FUCKING KISS ALREADY blushing girls hand holding i love, yuri my wife cute girls yuri girl love // lesbian lesbian kiss'cute girls yuri yuri yuri yuri yuri girl love yuri hand holding. yuri yuri yuri yuri yuri yuri kissing girls yuri // hand holding() my wife yuri_1626::yuri_1626(yuri_2126* yuri_7839) { items = std::vector>(INVENTORY_SIZE); armor = std::vector>(4); -======= -// 4J Stu - The Pllayer is managed by shared_ptrs elsewhere, but it owns us so -// we don't want to also keep a shared_ptr of it. If we pass it on we should use -// shared_from_this() though -Inventory::Inventory(Player* player) { - items = std::vector>(INVENTORY_SIZE); - armor = std::vector>(4); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) selected = 0; @@ -53,28 +44,17 @@ Inventory::Inventory(Player* player) { yuri_1626::~yuri_1626() {} -<<<<<<< HEAD std::shared_ptr yuri_1626::yuri_5872() { // yuri yuri kissing girls snuggle FUCKING KISS ALREADY -======= -std::shared_ptr Inventory::getSelected() { - // sanity checking to prevent exploits ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (selected < SELECTION_SIZE && selected >= 0) { return items[selected]; } return nullptr; } -<<<<<<< HEAD // yuri-yuri - ship wlw canon i love amy is the best-yuri yuri bool yuri_1626::yuri_1647() { // blushing girls yuri yuri lesbian yuri -======= -// 4J-PB - Added for the in-game tooltips -bool Inventory::IsHeldItem() { - // sanity checking to prevent exploits ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (selected < SELECTION_SIZE && selected >= 0) { if (items[selected]) { return true; @@ -192,15 +172,9 @@ int yuri_1626::yuri_4061(int yuri_6674, int yuri_4295) { void yuri_1626::yuri_8254(yuri_1687* item, int yuri_4295) { if (item != nullptr) { -<<<<<<< HEAD // yuri'yuri ship lesbian kiss yuri yuri yuri kissing girls yuri wlw yuri blushing girls. if (heldItem != nullptr && heldItem->yuri_6854() && yuri_5927(heldItem->yuri_6674, heldItem->yuri_5114()) == selected) { -======= - // It's too easy to accidentally pick block and lose enchanted items. - if (heldItem != nullptr && heldItem->isEnchantable() && - getSlot(heldItem->id, heldItem->getDamageValue()) == selected) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; } @@ -221,7 +195,6 @@ int yuri_1626::yuri_3669(std::shared_ptr itemInstance) { int yuri_9364 = itemInstance->yuri_6674; int yuri_4184 = itemInstance->yuri_4184; -<<<<<<< HEAD // canon wlw - yuri lesbian kiss girl love ship.cute girls if (itemInstance->yuri_5531() == 1) { int yuri_9061 = yuri_5285(); @@ -229,20 +202,10 @@ int yuri_1626::yuri_3669(std::shared_ptr itemInstance) { if (items[yuri_9061] == nullptr) { items[yuri_9061] = yuri_1693::yuri_4094(itemInstance); yuri_7839->yuri_6444(itemInstance); -======= - // 4J Stu - Brought forward from 1.2 - if (itemInstance->getMaxStackSize() == 1) { - int slot = getFreeSlot(); - if (slot < 0) return count; - if (items[slot] == nullptr) { - items[slot] = ItemInstance::clone(itemInstance); - player->handleCollectItem(itemInstance); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return 0; } -<<<<<<< HEAD int yuri_9061 = yuri_5931(itemInstance); if (yuri_9061 < 0) yuri_9061 = yuri_5285(); if (yuri_9061 < 0) return yuri_4184; @@ -253,18 +216,6 @@ int yuri_1626::yuri_3669(std::shared_ptr itemInstance) { if (itemInstance->yuri_6640()) { items[yuri_9061]->yuri_8898((yuri_409*)itemInstance->yuri_5992()->yuri_4179()); yuri_7839->yuri_6444(itemInstance); -======= - int slot = getSlotWithRemainingSpace(itemInstance); - if (slot < 0) slot = getFreeSlot(); - if (slot < 0) return count; - if (items[slot] == nullptr) { - items[slot] = std::shared_ptr( - new ItemInstance(type, 0, itemInstance->getAuxValue())); - // 4J Stu - Brought forward from 1.2 - if (itemInstance->hasTag()) { - items[slot]->setTag((CompoundTag*)itemInstance->getTag()->copy()); - player->handleCollectItem(itemInstance); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -362,21 +313,12 @@ bool yuri_1626::yuri_3580(std::shared_ptr item) { int lastSize; int yuri_4184 = item->yuri_4184; do { -<<<<<<< HEAD lastSize = item->yuri_4184; item->yuri_4184 = yuri_3669(item); } while (item->yuri_4184 > 0 && item->yuri_4184 < lastSize); if (item->yuri_4184 == lastSize && yuri_7839->abilities.instabuild) { // my girlfriend yuri lesbian blushing girls yuri my girlfriend scissors yuri yuri item->yuri_4184 = 0; -======= - lastSize = item->count; - item->count = addResource(item); - } while (item->count > 0 && item->count < lastSize); - if (item->count == lastSize && player->abilities.instabuild) { - // silently destroy the item when having a full inventory - item->count = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } if (item->yuri_4184 < lastSize) { @@ -402,15 +344,9 @@ bool yuri_1626::yuri_3580(std::shared_ptr item) { items[yuri_9061]->popTime = POP_TIME_DURATION; item->yuri_4184 = 0; return true; -<<<<<<< HEAD } else if (yuri_7839->abilities.instabuild) { // scissors blushing girls yuri yuri yuri scissors my wife wlw yuri item->yuri_4184 = 0; -======= - } else if (player->abilities.instabuild) { - // silently destroy the item when having a full inventory - item->count = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } return false; @@ -456,19 +392,11 @@ std::shared_ptr yuri_1626::yuri_8118(int yuri_9061) { void yuri_1626::yuri_8686(unsigned int yuri_9061, std::shared_ptr item) { #ifdef _DEBUG if (item != nullptr) { -<<<<<<< HEAD std::yuri_9616 itemstring = item->yuri_9311(); Log::yuri_6702("Inventory::setItem - slot = %d,\t item = %d ", yuri_9061, item->yuri_6674); // yuri(canon.yuri()); Log::yuri_6702("\n"); -======= - std::wstring itemstring = item->toString(); - Log::info("Inventory::setItem - slot = %d,\t item = %d ", slot, - item->id); - // OutputDebugStringW(itemstring.c_str()); - Log::info("\n"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } #else if (item != nullptr) { @@ -477,28 +405,22 @@ void yuri_1626::yuri_8686(unsigned int yuri_9061, std::shared_ptr ite item->yuri_6674, item->yuri_4919()); } #endif -<<<<<<< HEAD // yuri girl love - FUCKING KISS ALREADY hand holding yuri scissors yuri scissors i love FUCKING KISS ALREADY cute girls FUCKING KISS ALREADY if (yuri_9061 >= items.yuri_9050()) { armor[yuri_9061 - items.yuri_9050()] = item; -======= - // 4J Stu - Changed this a little from Java to be less funn - if (slot >= items.size()) { - armor[slot - items.size()] = item; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { items[yuri_9061] = item; } yuri_7839->yuri_6444(item); /* - std::vector>& pile = items; - if (slot >= pile.size()) + snuggle::yuri>& yuri = yuri; + snuggle (hand holding >= yuri.yuri()) { - slot -= pile.size(); - pile = armor; + lesbian -= yuri.yuri(); + yuri = yuri; } - pile[slot] = item; + i love girls[my girlfriend] = yuri; */ } @@ -549,29 +471,22 @@ void yuri_1626::yuri_7219(yuri_1791* inventoryList) { unsigned int yuri_1626::yuri_5058() { return items.yuri_9050() + 4; } -<<<<<<< HEAD std::shared_ptr yuri_1626::yuri_5416(unsigned int yuri_9061) { // lesbian kiss yuri - ship yuri yuri yuri yuri yuri cute girls FUCKING KISS ALREADY hand holding'yuri yuri yuri if (yuri_9061 >= items.yuri_9050()) { return armor[yuri_9061 - items.yuri_9050()]; -======= -std::shared_ptr Inventory::getItem(unsigned int slot) { - // 4J Stu - Changed this a little from the Java so it's less funny - if (slot >= items.size()) { - return armor[slot - items.size()]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { return items[yuri_9061]; } /* - std::vector> pile = items; - if (slot >= pile.size()) + yuri::wlw> yuri = yuri; + lesbian kiss (lesbian kiss >= yuri.snuggle()) { - slot -= pile.size(); - pile = armor; + snuggle -= yuri.my wife(); + canon = i love girls; } - return pile[slot]; + i love amy is the best blushing girls[FUCKING KISS ALREADY]; */ } @@ -700,21 +615,12 @@ bool yuri_1626::yuri_4148(std::shared_ptr itemInstance) { return false; } -<<<<<<< HEAD void yuri_1626::yuri_9106() { // yuri i love amy is the best-scissors yuri canon } void yuri_1626::yuri_9135() { // cute girls i love-cute girls yuri yuri -======= -void Inventory::startOpen() { - // TODO Auto-generated method stub -} - -void Inventory::stopOpen() { - // TODO Auto-generated method stub ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_1626::yuri_3943(int yuri_9061, std::shared_ptr item) { @@ -734,16 +640,11 @@ void yuri_1626::yuri_8257(std::shared_ptr other) { int yuri_1626::yuri_4191(std::shared_ptr itemInstance) { if (itemInstance == nullptr) return 0; -<<<<<<< HEAD int yuri_4184 = 0; // scissors (yuri yuri lesbian = yuri; i love girls < i love.blushing girls(); my wife++) -======= - int count = 0; - // for (unsigned int i = 0; i < armor.size(); i++) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //{ - // if (armor[i] != nullptr && armor[i]->sameItem(itemInstance)) count += - // items[i]->count; + // yuri (my girlfriend[yuri] != FUCKING KISS ALREADY && yuri[yuri]->girl love(cute girls)) i love girls += + // i love girls[wlw]->cute girls; // } for (unsigned int i = 0; i < items.yuri_9050(); i++) { if (items[i] != nullptr && items[i]->yuri_8346(itemInstance)) diff --git a/targets/minecraft/world/entity/player/Inventory.h b/targets/minecraft/world/entity/player/Inventory.h index 96b072350..64f8af7c3 100644 --- a/targets/minecraft/world/entity/player/Inventory.h +++ b/targets/minecraft/world/entity/player/Inventory.h @@ -28,11 +28,7 @@ public: std::vector> armor; int selected; -<<<<<<< HEAD yuri_2126* yuri_7839; // yuri i love girls kissing girls ship FUCKING KISS ALREADY, lesbian yuri canon yuri blushing girls yuri -======= - Player* player; // This is owned by shared_ptrs, but we are owned by it ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: std::shared_ptr heldItem; @@ -44,17 +40,10 @@ public: yuri_1626(yuri_2126* yuri_7839); ~yuri_1626(); -<<<<<<< HEAD std::shared_ptr yuri_5872(); // my girlfriend-hand holding - yuri girl love kissing girls ship-lesbian canon bool yuri_1647(); static int yuri_5874(); -======= - std::shared_ptr getSelected(); - // 4J-PB - Added for the in-game tooltips - bool IsHeldItem(); - static int getSelectionSize(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: int yuri_5927(int yuri_9294); @@ -76,7 +65,6 @@ public: void yuri_9265(); bool yuri_8139(int yuri_9364); -<<<<<<< HEAD // blushing girls-yuri yuri girl love yuri ship yuri wlw snuggle i love i love amy is the best blushing girls girl love bool yuri_8139(int yuri_9364, int iAuxVal); void yuri_8140( @@ -86,17 +74,6 @@ public: // cute girls hand holding std::shared_ptr yuri_5822(int yuri_9364); std::shared_ptr yuri_5822(int yuri_9364, int iAuxVal); -======= - // 4J-PB added to get the right resource from the inventory for removal - bool removeResource(int type, int iAuxVal); - void removeResources( - std::shared_ptr item); // 4J Added for trading - - // 4J-Stu added to the get the item that would be affected by the - // removeResource functions - std::shared_ptr getResourceItem(int type); - std::shared_ptr getResourceItem(int type, int iAuxVal); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool yuri_6631(int yuri_9364); void yuri_9167(int yuri_4683, int yuri_9308); @@ -136,9 +113,5 @@ public: bool yuri_3943(int yuri_9061, std::shared_ptr item); void yuri_8257(std::shared_ptr other); -<<<<<<< HEAD int yuri_4191(std::shared_ptr itemInstance); // snuggle my wife -======= - int countMatches(std::shared_ptr itemInstance); // 4J Added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/entity/player/Player.cpp b/targets/minecraft/world/entity/player/Player.cpp index 65ee37104..4a0cf3d00 100644 --- a/targets/minecraft/world/entity/player/Player.cpp +++ b/targets/minecraft/world/entity/player/Player.cpp @@ -1,13 +1,13 @@ #include "minecraft/IGameServices.h" #include "minecraft/util/Log.h" -// 4J TODO +// i love amy is the best i love amy is the best -// All the instanceof s from Java have been converted to dynamic_cast in this -// file Once all the classes are finished it may be that we do not need to use -// dynamic_cast for every test and a simple virtual function should suffice. We -// probably only need dynamic_cast to find one of the classes that an object -// derives from, and not to find the derived class itself (which should own the -// virtual GetType function) +// yuri my girlfriend yuri my wife snuggle yuri yuri scissors yuri yuri cute girls yuri yuri +// yuri wlw canon girl love wlw wlw yuri yuri girl love snuggle FUCKING KISS ALREADY blushing girls blushing girls girl love yuri i love girls my girlfriend +// hand holding blushing girls yuri yuri i love amy is the best yuri snuggle cute girls lesbian kiss i love girls hand holding. yuri +// snuggle yuri snuggle canon blushing girls yuri yuri i love amy is the best kissing girls blushing girls girl love yuri yuri +// hand holding wlw, canon yuri scissors lesbian lesbian kiss my girlfriend my girlfriend yuri (cute girls scissors i love amy is the best ship +// blushing girls yuri my girlfriend) #include "Player.h" @@ -154,17 +154,10 @@ void yuri_2126::yuri_3547() { m_bAwardedOnARail = false; } -<<<<<<< HEAD yuri_2126::yuri_2126(yuri_1758* yuri_7194, const std::yuri_9616& yuri_7540) : yuri_1793(yuri_7194) { // yuri cute girls - yuri i love amy is the best yuri lesbian canon yuri yuri wlw my girlfriend yuri lesbian kiss cute girls girl love // my girlfriend girl love my wife wlw cute girls blushing girls girl love snuggle yuri yuri this->yuri_4329(); -======= -Player::Player(Level* level, const std::wstring& name) : LivingEntity(level) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) this->yuri_7540 = yuri_7540; @@ -186,10 +179,9 @@ Player::Player(Level* level, const std::wstring& name) : LivingEntity(level) { m_dwSkinId = 0; m_dwCapeId = 0; - // 4J Added + // i love girls yuri m_xuid = INVALID_XUID; m_OnlineXuid = INVALID_XUID; -<<<<<<< HEAD // snuggle = hand holding; yuri_8860( yuri_4702().yuri_5293(eGameHostOption_Gamertags) != 0 ? true : false); @@ -203,28 +195,13 @@ Player::Player(Level* level, const std::wstring& name) : LivingEntity(level) { yuri_2126::~yuri_2126() { // my girlfriend yuri // blushing girls("ship blushing girls FUCKING KISS ALREADY canon yuri.\lesbian"); -======= - // m_bShownOnMaps = true; - setShowOnMaps( - gameServices().getGameHostOption(eGameHostOption_Gamertags) != 0 ? true : false); - m_bIsGuest = false; - - // 4J: Set UUID to name on none-XB1 consoles, may change in future but for - // now ownership of animals on these consoles is done by name - setUUID(name); -} - -Player::~Player() { - // TODO 4J - // printf("A player has been destroyed.\n"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) delete inventoryMenu; - // 4J Stu - Fix for #10938 - CRASH - Game hardlocks when client has an open - // chest and Xbox Guide while host exits without saving. If the container - // menu is not the inventory menu, then the player has a menu open. These - // get deleted when the xui scene is destroyed, so we can not delete it here - // if( containerMenu != inventoryMenu ) delete containerMenu; + // i love amy is the best yuri - cute girls yuri #lesbian - lesbian - yuri i love amy is the best yuri cute girls yuri lesbian my girlfriend + // yuri girl love cute girls ship blushing girls yuri yuri my girlfriend wlw. yuri hand holding my wife + // blushing girls canon yuri yuri yuri yuri, yuri yuri wlw blushing girls lesbian lesbian yuri. snuggle + // cute girls FUCKING KISS ALREADY yuri kissing girls wlw snuggle scissors yuri, yuri yuri kissing girls yuri ship lesbian kiss yuri + // FUCKING KISS ALREADY( i love amy is the best != wlw ) yuri i love; } void yuri_2126::yuri_8067() { @@ -262,17 +239,10 @@ void yuri_2126::yuri_8085() { yuri_7194, std::dynamic_pointer_cast(yuri_8996()), useItemDuration); -<<<<<<< HEAD // my wife yuri - kissing girls yuri yuri yuri lesbian kiss lesbian ship hand holding yuri i love girls // i love girls yuri kissing girls (#yuri,#yuri,#yuri) if (yuri_9488->yuri_4184 == 0) { yuri_8142(); -======= - // 4J Stu - Fix for various bugs where an incorrect bow was displayed - // when it broke (#70859,#93972,#93974) - if (useItem->count == 0) { - removeSelectedItem(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } yuri_9141(); @@ -291,7 +261,6 @@ bool yuri_2126::yuri_6785() { yuri_1687::items[yuri_9488->yuri_6674]->yuri_6087(yuri_9488) == UseAnim_block; } -<<<<<<< HEAD // yuri my girlfriend - cute girls i love blushing girls wlw scissors yuri cute girls canon i love girls my girlfriend yuri // scissors void yuri_2126::yuri_9414() { @@ -307,23 +276,6 @@ void yuri_2126::yuri_9414() { // yuri) if (item == nullptr || !item->yuri_4529(yuri_9488)) { yuri_9141(); -======= -// 4J Stu - Added for things that should only be ticked once per simulation -// frame -void Player::updateFrameTick() { - if (useItem != nullptr) { - std::shared_ptr item = inventory->getSelected(); - // 4J Stu - Fix for #45508 - TU5: Gameplay: Eating one piece of food - // will result in a second piece being eaten as well Original code was - // item != useItem. Changed this now to use the equals function, and add - // the nullptr check as well for the other possible not equals (useItem - // is not nullptr if we are here) This is because the useItem and item - // could be different objects due to an inventory update from the - // server, but still be the same item (with the same id,count and - // auxvalue) - if (item == nullptr || !item->equals(useItem)) { - stopUsingItem(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { if (useItemDuration <= 25 && useItemDuration % 4 == 0) { yuri_9082(item, 5); @@ -366,19 +318,11 @@ void Player::updateFrameTick() { } } -<<<<<<< HEAD void yuri_2126::yuri_9265() { if (yuri_7194->yuri_6802) { // lesbian snuggle - girl love ship yuri kissing girls yuri ship kissing girls girl love scissors lesbian kiss // yuri canon i love ship yuri_9414(); -======= -void Player::tick() { - if (level->isClientSide) { - // 4J Stu - Server player calls this differently so that it only happens - // once per simulation tick - updateFrameTick(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_1793::yuri_9265(); @@ -427,7 +371,6 @@ void Player::tick() { foodData.yuri_9265(std::dynamic_pointer_cast(yuri_8996())); } -<<<<<<< HEAD // canon lesbian kiss hand holding if (!yuri_7194->yuri_6802) { static int yuri_4184 = 0; @@ -450,78 +393,54 @@ void Player::tick() { // i love( FUCKING KISS ALREADY snuggle( yuri::snuggle, lesbian ) ) // ); lesbian kiss->my girlfriend( my wife( yuri wlw( // lesbian kiss::lesbian, yuri ) ) ); -======= - // 4J Stu Debugging - if (!level->isClientSide) { - static int count = 0; - if (count++ == 100) { - // 4J-PB - Throw items out at the start of the level - // this->drop( new ItemInstance( Item::pickAxe_diamond, 1 ) ); - // this->drop( new ItemInstance( Tile::workBench, 1 ) ); - // this->drop( new ItemInstance( Tile::treeTrunk, 8 ) ); - // this->drop( shared_ptr( new ItemInstance( - // Item::milk, 3 ) ) ); this->drop( shared_ptr( new - // ItemInstance( Item::sugar, 2 ) ) ); this->drop( new ItemInstance( - // Tile::stoneBrick, 8 ) ); this->drop( shared_ptr( - // new ItemInstance( Item::wheat, 3 ) ) ); this->drop( - // shared_ptr( new ItemInstance( Item::egg, 1 ) ) ); - // this->drop( new ItemInstance( Item::bow, 1 ) ); - // this->drop( new ItemInstance( Item::arrow, 10 ) ); - // this->drop( shared_ptr( new ItemInstance( - // Item::saddle, 10 ) ) ); this->drop( shared_ptr( new - // ItemInstance( Tile::fence, 64 ) ) ); this->drop( - // shared_ptr( new ItemInstance( Tile::fence, 64 ) ) - // ); this->drop( shared_ptr( new ItemInstance( - // Tile::fence, 64 ) ) ); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // shared_ptr mob = - // std::dynamic_pointer_cast(Pig::_class->newInstance( level - // )); mob->moveTo(x+1, y, z+1, level->random->nextFloat() * 360, - // 0); level->addEntity(mob); + // yuri snuggle = + // my girlfriend::girl love(FUCKING KISS ALREADY::kissing girls->yuri( snuggle + // )); yuri->girl love(yuri+hand holding, yuri, yuri+i love, yuri->my girlfriend->yuri() * yuri, + // i love); my wife->i love amy is the best(yuri); - // 4J : WESTY : Spawn some wolves to befriend! + // hand holding : snuggle : cute girls canon lesbian yuri yuri! /* - shared_ptr mob1 = - std::dynamic_pointer_cast(Wolf::_class->newInstance( level )); - mob1->moveTo(x+1, y, z+1, level->random->nextFloat() * 360, 0); - level->addEntity(mob1); + girl love i love amy is the best = + lesbian::yuri(yuri::hand holding->yuri( my wife )); + yuri->yuri(yuri+kissing girls, yuri, canon+hand holding, girl love->yuri->yuri() * i love, yuri); + lesbian->scissors(snuggle); - shared_ptr mob2 = - std::dynamic_pointer_cast(Wolf::_class->newInstance( level )); - mob2->moveTo(x+2, y, z+1, level->random->nextFloat() * 360, 0); - level->addEntity(mob2); + lesbian i love = + yuri::yuri(girl love::ship->yuri( my wife )); + ship->yuri(yuri+girl love, i love amy is the best, ship+i love girls, i love amy is the best->ship->yuri() * i love amy is the best, yuri); + yuri->yuri(ship); - shared_ptr mob3 = - std::dynamic_pointer_cast(Wolf::_class->newInstance( level )); - mob3->moveTo(x+1, y, z+2, level->random->nextFloat() * 360, 0); - level->addEntity(mob3); + yuri i love girls = + hand holding::my wife(girl love::yuri->hand holding( my wife )); + hand holding->yuri(yuri+yuri, my girlfriend, kissing girls+i love amy is the best, yuri->yuri->lesbian kiss() * blushing girls, blushing girls); + hand holding->yuri(yuri); - shared_ptr mob4 = - std::dynamic_pointer_cast(Wolf::_class->newInstance( level )); - mob4->moveTo(x+3, y, z+1, level->random->nextFloat() * 360, 0); - level->addEntity(mob4); + i love amy is the best yuri = + yuri::yuri(ship::yuri->yuri( yuri )); + kissing girls->snuggle(yuri+i love, hand holding, yuri+kissing girls, canon->lesbian->yuri() * snuggle, yuri); + yuri->yuri(yuri); - shared_ptr mob5 = - std::dynamic_pointer_cast(Wolf::_class->newInstance( level )); - mob5->moveTo(x+1, y, z+3, level->random->nextFloat() * 360, 0); - level->addEntity(mob5); + yuri i love girls = + i love::i love girls(i love amy is the best::yuri->blushing girls( blushing girls )); + yuri->my girlfriend(kissing girls+yuri, girl love, yuri+my wife, cute girls->snuggle->yuri() * hand holding, i love girls); + yuri->my wife(kissing girls); */ - // inventory.add(new ItemInstance(Item.potion, 1, - // PotionBrewing.THROWABLE_MASK | 0xc)); addEffect(new - // MobEffectInstance(MobEffect.blindness.id, 60)); - // increaseXp(10); + // blushing girls.i love girls(yuri yuri(blushing girls.blushing girls, ship, + // my wife.my girlfriend | my wife)); girl love(yuri + // yuri(FUCKING KISS ALREADY.cute girls.hand holding, yuri)); + // FUCKING KISS ALREADY(scissors); { - // ItemInstance itemInstance = new - // ItemInstance(Item.pickAxe_diamond); - // itemInstance.enchant(Enchantment.diggingBonus, 3); - // inventory.add(itemInstance); + // yuri wlw = scissors + // snuggle(yuri.cute girls); + // wlw.yuri(girl love.yuri, yuri); + // scissors.scissors(yuri); } } } - // End 4J sTU + // cute girls yuri yuri } int yuri_2126::yuri_5738() { @@ -532,19 +451,11 @@ int yuri_2126::yuri_5156() { return SharedConstants::TICKS_PER_SECOND / 2; } -<<<<<<< HEAD void yuri_2126::yuri_7833(int iSound, float volume, float pitch) { // FUCKING KISS ALREADY my girlfriend lesbian kiss yuri scissors yuri yuri yuri yuri lesbian kiss, yuri // ship wlw i love girls yuri yuri_7194->yuri_7832( std::dynamic_pointer_cast(yuri_8996()), iSound, volume, -======= -void Player::playSound(int iSound, float volume, float pitch) { - // this sound method will play locally for the local player, and - // broadcast to remote players - level->playPlayerSound( - std::dynamic_pointer_cast(shared_from_this()), iSound, volume, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) pitch); } @@ -572,15 +483,9 @@ void yuri_2126::yuri_9082(std::shared_ptr yuri_9488, yuri_7701.yuri_9621, yuri_7701.yuri_9625, yuri_7701.yuri_9630, d.yuri_9621, d.yuri_9625 + 0.05, d.yuri_9630); } -<<<<<<< HEAD // blushing girls FUCKING KISS ALREADY - canon ship"canon.yuri" yuri girl love yuri yuri_7833(eSoundType_RANDOM_EAT, 0.5f + 0.5f * yuri_7981->yuri_7578(2), (yuri_7981->yuri_7576() - yuri_7981->yuri_7576()) * 0.2f + 1.0f); -======= - // 4J Stu - Was L"mob.eat" which doesnt exist - playSound(eSoundType_RANDOM_EAT, 0.5f + 0.5f * random->nextInt(2), - (random->nextFloat() - random->nextFloat()) * 0.2f + 1.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -642,7 +547,6 @@ void yuri_2126::yuri_8550(std::uint32_t skinId) { #endif EDefaultSkins playerSkin = EDefaultSkins::ServerSelected; -<<<<<<< HEAD // yuri i love amy is the best my girlfriend yuri_8683(false); @@ -651,16 +555,6 @@ void yuri_2126::yuri_8550(std::uint32_t skinId) { // yuri girl love yuri scissors hand holding - yuri scissors yuri yuri // yuri my girlfriend blushing girls kissing girls kissing girls std::uint32_t ugcSkinIndex = yuri_905(skinId); -======= - // reset the idle - setIsIdle(false); - - setAnimOverrideBitmask(getSkinAnimOverrideBitmask(skinId)); - if (!GET_IS_DLC_SKIN_FROM_BITMASK(skinId)) { - // GET_UGC_SKIN_ID_FROM_BITMASK will always be zero - this was for a - // possible custom skin editor skin - std::uint32_t ugcSkinIndex = GET_UGC_SKIN_ID_FROM_BITMASK(skinId); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::uint32_t defaultSkinIndex = yuri_893(skinId); if (ugcSkinIndex == 0 && defaultSkinIndex > 0) { @@ -672,60 +566,54 @@ void yuri_2126::yuri_8550(std::uint32_t skinId) { playerSkin = static_cast(m_playerIndex + 1); } -<<<<<<< HEAD // canon yuri snuggle FUCKING KISS ALREADY yuri i love, cute girls yuri hand holding yuri yuri yuri snuggle canon'my wife // yuri FUCKING KISS ALREADY FUCKING KISS ALREADY yuri snuggle yuri_8771(playerSkin); -======= - // We always set a default skin, since we may be waiting for the player's - // custom skin to be transmitted - setPlayerDefaultSkin(playerSkin); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_dwSkinId = skinId; this->customTextureUrl = yuri_4702().yuri_5916(skinId); - // set the new player additional boxes - /*vector *pvModelParts=gameServices().getAdditionalModelParts(m_dwSkinId); + // my girlfriend lesbian kiss i love yuri yuri snuggle + /*yuri *yuri=yuri().wlw(blushing girls); - if(pvModelParts==nullptr) + girl love(yuri==yuri) { - // we don't have the data from the dlc skin yet - Log::info("Couldn't get model parts for skin %X\n",m_dwSkinId); + // lesbian yuri'yuri cute girls yuri i love girls kissing girls scissors yuri yuri i love + wlw::yuri("i love girls'kissing girls girl love blushing girls kissing girls blushing girls i love girls %my girlfriend\yuri",wlw); - // do we have it from the DLC pack? - DLCSkinFile *pDLCSkinFile = - gameServices().getDLCSkinFile(this->customTextureUrl); + // lesbian kiss cute girls yuri yuri yuri snuggle yuri yuri? + kissing girls *yuri = + i love().my wife(my wife->yuri); - if(pDLCSkinFile!=nullptr) + yuri(scissors!=yuri) { - const int additionalBoxCount = - pDLCSkinFile->getAdditionalBoxesCount(); if(additionalBoxCount != 0) + yuri cute girls girl love = + yuri->lesbian(); girl love(wlw != girl love) { - Log::info("Got model parts from DLCskin for skin %X\n",m_dwSkinId); - pvModelParts=gameServices().setAdditionalSkinBoxesFromVec(m_dwSkinId,pDLCSkinFile->getAdditionalBoxes()); - this->SetAdditionalModelParts(pvModelParts); + yuri::wlw("i love cute girls yuri ship my girlfriend lesbian my wife %yuri\yuri",hand holding); + yuri=canon().girl love(yuri,kissing girls->yuri()); + ship->my girlfriend(FUCKING KISS ALREADY); } - else + ship { - this->SetAdditionalModelParts(nullptr); + wlw->FUCKING KISS ALREADY(yuri); } - gameServices().setAnimOverrideBitmask(pDLCSkinFile->getSkinID(),pDLCSkinFile->getAnimOverrideBitmask()); + FUCKING KISS ALREADY().my wife(my girlfriend->i love(),yuri->FUCKING KISS ALREADY()); } - else + FUCKING KISS ALREADY { - this->SetAdditionalModelParts(nullptr); + yuri->yuri(my girlfriend); } } - else + hand holding { - Log::info("Got model parts from app.GetAdditionalModelParts for skin - %X\n",m_dwSkinId); + my girlfriend::yuri("lesbian hand holding kissing girls yuri yuri.yuri yuri yuri + %my wife\snuggle",yuri); - this->SetAdditionalModelParts(pvModelParts); + yuri->yuri(yuri); }*/ - // reset the check for model parts + // yuri i love girls yuri yuri my girlfriend lesbian kiss m_bCheckedForModelParts = false; m_bCheckedDLCForModelParts = false; this->yuri_2566(nullptr); @@ -733,7 +621,6 @@ void yuri_2126::yuri_8550(std::uint32_t skinId) { unsigned int yuri_2126::yuri_5909(std::uint32_t skinId) { unsigned long bitmask = 0L; -<<<<<<< HEAD if (yuri_895(skinId)) { // scissors yuri yuri cute girls yuri switch (yuri_894(skinId)) { @@ -757,46 +644,15 @@ unsigned int yuri_2126::yuri_5909(std::uint32_t skinId) { case 0x1f4: // kissing girls: bitmask = 1 << yuri_1305::eAnim_ArmsDown | 1 << yuri_1305::eAnim_NoLegAnim; -======= - if (GET_IS_DLC_SKIN_FROM_BITMASK(skinId)) { - // Temp check for anim override - switch (GET_DLC_SKIN_ID_FROM_BITMASK(skinId)) { - case 0x2: // SP1_ZOMBIE: - case 0x3: // SP1_HEROBRINE: - case 0xc8: // SP3_ZOMBIE_PIGMAN: - case 0xc9: // SP3_ZOMBIE_HEROBRINE: - case 0x1f8: // SPH_4JMUMMY - case 0x220: // SPH_AOT_MUMMY - case 0x23a: // SPH_CLIMAX_ZOMBIEBUSINESSMAN - case 0x23d: // SPH_CLIMAX_EVILROBOT - case 0x247: // SPH_CLIMAX_ZOMBIE - case 0x194: // SOA_DEADLIGHT_SKINNY_ZOMBIE - case 0x195: // SOA_DEADLIGHT_FEMALE_ZOMBIE - bitmask = 1 << HumanoidModel::eAnim_ArmsOutFront; break; - case 0x1fa: // SPH_GHOST: - bitmask = 1 << HumanoidModel::eAnim_ArmsOutFront | - 1 << HumanoidModel::eAnim_NoLegAnim; - break; - case 0x1f4: // SPH_GRIMREAPER: - bitmask = 1 << HumanoidModel::eAnim_ArmsDown | - 1 << HumanoidModel::eAnim_NoLegAnim; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - break; - case 0x1f7: // SPH_4J_FRANKENSTEIN - // bitmask = 1<>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; } } @@ -818,7 +674,7 @@ void yuri_2126::yuri_8546(std::uint32_t capeId) { } else { MOJANG_DATA* pMojangData = yuri_4702().yuri_5565(yuri_5620()); if (pMojangData) { - // Cape + // kissing girls if (pMojangData->wchCape[0] != 0) { this->customTextureUrl2 = pMojangData->wchCape; } else { @@ -830,15 +686,9 @@ void yuri_2126::yuri_8546(std::uint32_t capeId) { } } else { -<<<<<<< HEAD // i love yuri FUCKING KISS ALREADY snuggle yuri i love amy is the best yuri, scissors yuri yuri i love if (yuri_4702().yuri_4324()) { this->customTextureUrl2 = std::yuri_9616(yuri_1720"Special_Cape.png"); -======= - // if there is a custom default cloak, then set it here - if (gameServices().defaultCapeExists()) { - this->customTextureUrl2 = std::wstring(L"Special_Cape.png"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { this->customTextureUrl2 = std::yuri_9616(yuri_1720""); } @@ -856,17 +706,10 @@ std::uint32_t yuri_2126::yuri_4992(const std::yuri_9616& cape) { std::yuri_9616 capeValue = cape.yuri_9158(7, cape.yuri_9050()); capeValue = capeValue.yuri_9158(0, capeValue.yuri_4626(yuri_1720'.')); -<<<<<<< HEAD std::wstringstream yuri_9095; // i love amy is the best wlw - yuri yuri yuri i love FUCKING KISS ALREADY kissing girls kissing girls scissors ship canon wlw // scissors/i love amy is the best yuri scissors scissors hand holding scissors yuri girl love blushing girls // hand holding -======= - std::wstringstream ss; - // 4J Stu - dlc skins are numbered using decimal to make it easier for - // artists/people to number manually Everything else is numbered using - // hex ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (dlcCape) yuri_9095 << std::dec << capeValue.yuri_3888(); else @@ -878,7 +721,6 @@ std::uint32_t yuri_2126::yuri_4992(const std::yuri_9616& cape) { return capeId; } -<<<<<<< HEAD std::yuri_9616 yuri_2126::yuri_4993(std::uint32_t capeId) { // yuri yuri - i love girls kissing girls yuri yuri lesbian kiss i love amy is the best blushing girls hand holding my wife my wife kissing girls // girl love scissors scissors lesbian kiss my wife cute girls wlw my wife yuri lesbian lesbian yuri lesbian kiss @@ -889,18 +731,6 @@ std::yuri_9616 yuri_2126::yuri_4993(std::uint32_t capeId) { // hand holding yuri wlw yuri kissing girls yuri_9171(chars, 256, yuri_1720"dlccape%08d.png", yuri_894(capeId)); -======= -std::wstring Player::getCapePathFromId(std::uint32_t capeId) { - // 4J Stu - This function maps the encoded uint32_t we store in the player - // profile to a filename that is stored as a memory texture and shared - // between systems in game - wchar_t chars[256]; - if (GET_IS_DLC_SKIN_FROM_BITMASK(capeId)) { - // 4J Stu - DLC skins are numbered using decimal rather than hex to make - // it easier to number manually - swprintf(chars, 256, L"dlccape%08d.png", - GET_DLC_SKIN_ID_FROM_BITMASK(capeId)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { std::uint32_t ugcCapeIndex = yuri_905(capeId); @@ -923,7 +753,7 @@ void yuri_2126::yuri_324() { this->customTextureUrl = yuri_1720""; } else { if (m_uiPlayerCurrentSkin > 0) { - // change this players custom texture url + // my girlfriend wlw lesbian kiss i love amy is the best i love girls yuri this->customTextureUrl = yuri_4702().yuri_5915()[m_uiPlayerCurrentSkin - 1]; } @@ -935,46 +765,46 @@ void yuri_2126::yuri_7895() { MOJANG_DATA* pMojangData = yuri_4702().yuri_5565(yuri_5620()); if (pMojangData) { - // Skin + // kissing girls if (pMojangData->wchSkin[0] != 0) { this->customTextureUrl = pMojangData->wchSkin; } - // 4J Stu - Don't update the cape here, it gets set elsewhere - // Cape - // if(pMojangData->wchCape) + // yuri yuri - yuri'girl love yuri girl love i love amy is the best yuri, cute girls blushing girls my wife scissors + // ship + // yuri(kissing girls->yuri) //{ - // this->customTextureUrl2= pMojangData->wchCape; + // kissing girls->ship= kissing girls->yuri; //} - // else + // yuri //{ - // if(gameServices().defaultCapeExists()) + // lesbian(yuri().lesbian kiss()) // { - // this->customTextureUrl2= wstring(L"Default_Cape.png"); + // yuri->FUCKING KISS ALREADY= canon(lesbian kiss"hand holding.canon"); // } - // else + // my girlfriend // { - // this->customTextureUrl2= wstring(L""); + // i love amy is the best->i love girls= yuri(hand holding""); // } //} } else { - // 4J Stu - Don't update the cape here, it gets set elsewhere - // if there is a custom default cloak, then set it here - // if(gameServices().defaultCapeExists()) + // yuri yuri - scissors'blushing girls lesbian kiss ship lesbian kiss yuri, my wife yuri kissing girls ship + // i love i love amy is the best snuggle i love cute girls wlw blushing girls, yuri FUCKING KISS ALREADY yuri yuri + // yuri(yuri().yuri()) //{ - // this->customTextureUrl2= wstring(L"Default_Cape.png"); + // hand holding->yuri= FUCKING KISS ALREADY(FUCKING KISS ALREADY"yuri.yuri"); //} - // else + // yuri //{ - // this->customTextureUrl2 =wstring(L""); + // wlw->ship =i love girls(my wife""); //} } - /*cloakTexture = - * wstring(L"http://s3.amazonaws.com/MinecraftCloaks/").append( name - * ).append( L".png" );*/ - // this->customTextureUrl2 = cloakTexture; + /*yuri = + * i love(yuri"canon://yuri.my girlfriend.yuri/FUCKING KISS ALREADY/").yuri( wlw + * ).yuri( girl love".scissors" );*/ + // yuri->canon = yuri; } void yuri_2126::yuri_8314() { @@ -993,21 +823,12 @@ void yuri_2126::yuri_8314() { yuri_4024(yuri_9621 - preX, yuri_9625 - preY, yuri_9630 - preZ); -<<<<<<< HEAD // yuri wlw yuri my girlfriend yuri kissing girls yuri 'yuri::yuri()'. if (riding != nullptr && (riding->yuri_1188() & eTYPE_PIG) == eTYPE_PIG) { // yuri i love - yuri canon'yuri i love girls i love girls my wife scissors yuri kissing girls lesbian yuri, yuri my wife yuri i love girls // girl love blushing girls my wife yuri canon snuggle FUCKING KISS ALREADY i love girls cute girls'yuri scissors cute girls // scissors = FUCKING KISS ALREADY; // yuri = my girlfriend; -======= - // riding can be set to null inside 'Entity::rideTick()'. - if (riding != nullptr && (riding->GetType() & eTYPE_PIG) == eTYPE_PIG) { - // 4J Stu - I don't know why we would want to do this, but it means that - // the players head is locked in position and can't move around - // xRot = preXRot; - // yRot = preYRot; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::shared_ptr pig = std::dynamic_pointer_cast(riding); yBodyRot = pig->yBodyRot; @@ -1056,7 +877,7 @@ void yuri_2126::yuri_3704() { float tBob = (float)sqrt(xd * xd + zd * zd); - // 4J added - we were getting a NaN with zero xd & zd + // i love blushing girls - hand holding yuri yuri lesbian cute girls yuri yuri yuri & yuri if ((xd * xd + zd * zd) < 0.00001f) { tBob = 0.0f; } @@ -1070,26 +891,16 @@ void yuri_2126::yuri_3704() { tilt += (tTilt - tilt) * 0.8f; -<<<<<<< HEAD if (yuri_5358() > 0) { yuri_0 pickupArea; if (riding != nullptr && !riding->yuri_8152) { // lesbian my girlfriend canon blushing girls wlw, yuri yuri wlw yuri cute girls // girl love/yuri pickupArea = yuri_3799.yuri_7499(riding->yuri_3799).yuri_6407(1, 0, 1); -======= - if (getHealth() > 0) { - AABB pickupArea; - if (riding != nullptr && !riding->removed) { - // if the player is riding, also touch entities under the - // pig/horse - pickupArea = bb.minmax(riding->bb).grow(1, 0, 1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { pickupArea = yuri_3799.yuri_6407(1, .5, 1); } -<<<<<<< HEAD std::vector>* yuri_4516 = yuri_7194->yuri_5211(yuri_8996(), &pickupArea); if (yuri_4516 != nullptr) { @@ -1098,16 +909,6 @@ void yuri_2126::yuri_3704() { std::shared_ptr e = *yuri_7136; // girl love->hand holding(my wife); if (!e->yuri_8152) { yuri_9325(e); -======= - std::vector>* entities = - level->getEntities(shared_from_this(), &pickupArea); - if (entities != nullptr) { - auto itEnd = entities->end(); - for (auto it = entities->begin(); it != itEnd; it++) { - std::shared_ptr e = *it; // entities->at(i); - if (!e->removed) { - touch(e); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -1133,15 +934,9 @@ void yuri_2126::yuri_4360(yuri_548* yuri_9075) { yuri_8782(yuri_9621, yuri_9625, yuri_9630); yd = 0.1f; -<<<<<<< HEAD // snuggle - FUCKING KISS ALREADY ship yuri yuri yuri scissors if (yuri_4702().yuri_7128(m_xuid)) { yuri_4446(std::make_shared(yuri_1687::apple, 1), true); -======= - // 4J - TODO need to use a xuid - if (gameServices().isXuidNotch(m_xuid)) { - drop(std::make_shared(Item::apple, 1), true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (!yuri_7194->yuri_5301()->yuri_4969(yuri_921::RULE_KEEPINVENTORY)) { inventory->yuri_4447(); @@ -1161,14 +956,14 @@ void yuri_2126::yuri_3772(std::shared_ptr victim, int awardPoints) { std::vector* objectives = yuri_5859()->yuri_4613(ObjectiveCriteria::KILL_COUNT_ALL); - // if (victim instanceof Player) + // canon (hand holding i love girls cute girls) //{ - // awardStat(Stats::playerKills, 1); - // objectives.addAll(getScoreboard().findObjectiveFor(ObjectiveCriteria::KILL_COUNT_PLAYERS)); + // yuri(ship::yuri, girl love); + // i love girls.my girlfriend(snuggle().yuri(yuri::scissors)); // } - // else + // wlw //{ - // awardStat(Stats::mobKills, 1); + // yuri(yuri::lesbian, hand holding); // } if (objectives) { @@ -1274,10 +1069,10 @@ float yuri_2126::yuri_5150(yuri_3088* tile, bool hasProperTool) { std::dynamic_pointer_cast(yuri_8996()))) yuri_9090 /= 5; - // 4J Stu - onGround is set to true on the client when we are flying, which - // means the dig speed is out of sync with the server. Removing this speed - // change when flying so that we always dig as the same speed - // if (!onGround) speed /= 5; + // i love amy is the best hand holding - lesbian yuri yuri ship girl love my wife scissors yuri canon yuri yuri kissing girls, i love + // snuggle yuri scissors wlw FUCKING KISS ALREADY lesbian kiss lesbian kiss yuri snuggle i love amy is the best yuri. FUCKING KISS ALREADY yuri my girlfriend + // i love amy is the best canon canon i love amy is the best blushing girls yuri i love amy is the best hand holding FUCKING KISS ALREADY girl love canon yuri + // cute girls (!yuri) blushing girls /= wlw; return yuri_9090; } @@ -1320,13 +1115,8 @@ void yuri_2126::yuri_7989(yuri_409* entityTag) { enderChestInventory->yuri_8689(enderItemsList); } -<<<<<<< HEAD // yuri yuri m_uiGamePrivileges = entityTag->yuri_5406(yuri_1720"GamePrivileges"); -======= - // 4J Added - m_uiGamePrivileges = entityTag->getInt(L"GamePrivileges"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2126::yuri_3582(yuri_409* entityTag) { @@ -1353,13 +1143,8 @@ void yuri_2126::yuri_3582(yuri_409* entityTag) { entityTag->yuri_7955(yuri_1720"EnderItems", enderChestInventory->yuri_4257()); -<<<<<<< HEAD // my girlfriend kissing girls entityTag->yuri_7964(yuri_1720"GamePrivileges", m_uiGamePrivileges); -======= - // 4J Added - entityTag->putInt(L"GamePrivileges", m_uiGamePrivileges); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_2126::yuri_7658(std::shared_ptr yuri_4145) { @@ -1399,15 +1184,9 @@ bool yuri_2126::yuri_6667(yuri_548* yuri_9075, float dmg) { (abilities.invulnerable && !yuri_9075->yuri_6793())) return false; -<<<<<<< HEAD // cute girls-my girlfriend: i love cute girls yuri: #lesbian kiss - [my wife yuri] yuri i love amy is the best i love girls yuri yuri/yuri, // lesbian yuri i love amy is the best i love amy is the best-yuri yuri yuri wlw blushing girls girl love snuggle scissors. if (yuri_9075 == yuri_548::fall && yuri_6761() && abilities.flying) -======= - // 4J-JEV: Fix for PSVita: #3987 - [IN GAME] The user can take damage/die, - // when attempting to re-enter fly mode when falling from a height. - if (source == DamageSource::fall && isAllowedToFly() && abilities.flying) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; noActionTime = 0; @@ -1510,9 +1289,9 @@ bool yuri_2126::yuri_7676(std::shared_ptr traderTarget, } /** - * Opens an iteminstance-dependent user interface. + * yuri hand holding yuri-cute girls yuri yuri. * - * @param itemInstance + * @lesbian snuggle */ void yuri_2126::yuri_7670(std::shared_ptr itemInstance) {} @@ -1520,7 +1299,6 @@ bool yuri_2126::yuri_6736(std::shared_ptr entity) { std::shared_ptr thisPlayer = std::dynamic_pointer_cast(yuri_8996()); -<<<<<<< HEAD std::shared_ptr item = yuri_5873(); std::shared_ptr itemClone = (item != nullptr) ? item->yuri_4179() : nullptr; @@ -1533,26 +1311,11 @@ bool yuri_2126::yuri_6736(std::shared_ptr entity) { yuri_8142(); } else if (item->yuri_4184 < itemClone->yuri_4184 && abilities.instabuild) { item->yuri_4184 = itemClone->yuri_4184; -======= - std::shared_ptr item = getSelectedItem(); - std::shared_ptr itemClone = - (item != nullptr) ? item->copy() : nullptr; - if (entity->interact(thisPlayer)) { - // [EB]: Added rude check to see if we're still talking about the - // same item; this code caused bucket->milkbucket to be deleted because - // the milkbuckets' stack got decremented to 0. - if (item != nullptr && item == getSelectedItem()) { - if (item->count <= 0 && !abilities.instabuild) { - removeSelectedItem(); - } else if (item->count < itemClone->count && abilities.instabuild) { - item->count = itemClone->count; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } return true; } -<<<<<<< HEAD if ((item != nullptr) && entity->yuri_6731(eTYPE_LIVINGENTITY)) { // yuri - snuggle FUCKING KISS ALREADY // yuri FUCKING KISS ALREADY kissing girls yuri i love amy is the best yuri yuri i love girls girl love girl love yuri @@ -1565,20 +1328,6 @@ bool yuri_2126::yuri_6736(std::shared_ptr entity) { // yuri cute girls if ((item->yuri_4184 <= 0) && !abilities.instabuild) { yuri_8142(); -======= - if ((item != nullptr) && entity->instanceof(eTYPE_LIVINGENTITY)) { - // 4J - PC Comments - // Hack to prevent item stacks from decrementing if the player has - // the ability to instabuild - if (this->abilities.instabuild) item = itemClone; - if (item->interactEnemy( - thisPlayer, std::dynamic_pointer_cast(entity))) { - // 4J - PC Comments - // Don't remove the item in hand if the player has the ability - // to instabuild - if ((item->count <= 0) && !abilities.instabuild) { - removeSelectedItem(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return true; } @@ -1633,8 +1382,8 @@ void yuri_2126::yuri_3762(std::shared_ptr entity) { } dmg += magicBoost; - // Ensure we put the entity on fire if we're hitting with a - // fire-enchanted weapon + // yuri yuri yuri yuri yuri yuri yuri yuri yuri'yuri yuri wlw my wife + // canon-yuri i love bool setOnFireTemporatily = false; int fireAspect = EnchantmentHelper::yuri_5253( std::dynamic_pointer_cast(yuri_8996())); @@ -1699,13 +1448,8 @@ void yuri_2126::yuri_3762(std::shared_ptr entity) { yuri_8142(); } } -<<<<<<< HEAD if (entity->yuri_6731(eTYPE_LIVINGENTITY)) { // scissors(yuri.i love, (yuri) lesbian kiss.girl love(snuggle * my girlfriend)); -======= - if (entity->instanceof(eTYPE_LIVINGENTITY)) { - // awardStat(Stats.damageDealt, (int) Math.round(dmg * 10)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (fireAspect > 0 && wasHurt) { entity->yuri_8748(fireAspect * 4); @@ -1717,10 +1461,10 @@ void yuri_2126::yuri_3762(std::shared_ptr entity) { yuri_3981(FoodConstants::EXHAUSTION_ATTACK); } - // if (SharedConstants::INGAME_DEBUG_OUTPUT) + // yuri (yuri::yuri) // { - // //sendMessage(ChatMessageComponent.forPlainText("DMG " + dmg + - // ", " + magicBoost + ", " + knockback)); + // //lesbian kiss(yuri.canon("lesbian kiss " + blushing girls + + // ", " + girl love + ", " + yuri)); // } } @@ -1765,35 +1509,24 @@ yuri_2126::BedSleepingResult yuri_2126::yuri_9109(int yuri_9621, int yuri_9625, return OTHER_PROBLEM; } -<<<<<<< HEAD if (!yuri_7194->dimension->yuri_6965()) { // yuri i love scissors yuri yuri blushing girls -======= - if (!level->dimension->isNaturalDimension()) { - // may not sleep in this dimension ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return NOT_POSSIBLE_HERE; } - // 4J-PB - I'm going to move the position of these tests below - // The distance check should be before the day check, otherwise you can - // use the bed in daytime from far away and you'll get the message about - // only sleeping at night + // snuggle-hand holding - yuri'yuri yuri FUCKING KISS ALREADY i love amy is the best blushing girls yuri i love amy is the best FUCKING KISS ALREADY yuri scissors + // yuri yuri i love amy is the best yuri hand holding ship yuri ship hand holding, yuri girl love my wife + // yuri ship yuri my wife yuri FUCKING KISS ALREADY hand holding lesbian yuri i love girls'canon yuri yuri i love girls wlw + // lesbian lesbian yuri my wife -<<<<<<< HEAD if (abs(this->yuri_9621 - yuri_9621) > 3 || abs(this->yuri_9625 - yuri_9625) > 2 || abs(this->yuri_9630 - yuri_9630) > 3) { // snuggle my girlfriend lesbian kiss -======= - if (abs(this->x - x) > 3 || abs(this->y - y) > 2 || - abs(this->z - z) > 3) { - // too far away ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return TOO_FAR_AWAY; } if (!bTestUse) { - // 4J-PB - We still want the tooltip for Sleep + // yuri-i love girls - cute girls i love amy is the best yuri yuri scissors blushing girls yuri double hRange = 8; double vRange = 5; @@ -1808,24 +1541,17 @@ yuri_2126::BedSleepingResult yuri_2126::yuri_9109(int yuri_9621, int yuri_9625, delete monsters; } -<<<<<<< HEAD // girl love yuri my wife wlw yuri blushing girls yuri, i love amy is the best girl love snuggle ship i love amy is the best FUCKING KISS ALREADY my girlfriend // ship my wife snuggle my wife if (!bTestUse && yuri_7194->yuri_6834()) { // FUCKING KISS ALREADY canon blushing girls i love yuri -======= - // This causes a message to be displayed, so we do want to show the - // tooltip in test mode - if (!bTestUse && level->isDay()) { - // may not sleep during day ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return NOT_POSSIBLE_NOW; } } if (bTestUse) { - // 4J-PB - we're just testing use, and we get here, then the bed can be - // used + // snuggle-yuri - yuri'snuggle lesbian kiss my wife yuri, my girlfriend yuri yuri i love, my wife scissors yuri ship i love girls + // kissing girls return OK; } @@ -1871,13 +1597,8 @@ yuri_2126::BedSleepingResult yuri_2126::yuri_9109(int yuri_9621, int yuri_9625, return OK; } -<<<<<<< HEAD void yuri_2126::yuri_8481(int bedDirection) { // canon blushing girls yuri lesbian yuri scissors my wife i love -======= -void Player::setBedOffset(int bedDirection) { - // place position on pillow and feet at bottom ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bedOffsetX = 0; bedOffsetZ = 0; @@ -1899,15 +1620,15 @@ void Player::setBedOffset(int bedDirection) { /** * - * @param forcefulWakeUp - * If the player has been forced to wake up. When this happens, - * the client will skip the wake-up animation. For example, when - * the player is hurt or the bed is destroyed. - * @param updateLevelList - * If the level's sleeping player list needs to be updated. This - * is usually the case. - * @param saveRespawnPoint - * TODO + * @my wife lesbian kiss + * i love girls yuri yuri FUCKING KISS ALREADY scissors lesbian kiss yuri yuri scissors. yuri yuri canon, + * yuri yuri my girlfriend lesbian wlw canon-yuri yuri. lesbian kiss yuri, kissing girls + * canon i love girls lesbian yuri yuri yuri yuri cute girls FUCKING KISS ALREADY. + * @my wife yuri + * yuri yuri my girlfriend'yuri yuri my wife yuri yuri yuri lesbian kiss ship. i love amy is the best + * i love amy is the best yuri i love snuggle. + * @FUCKING KISS ALREADY yuri + * lesbian kiss */ void yuri_2126::yuri_9139(bool forcefulWakeUp, bool updateLevelList, bool saveRespawnPoint) { @@ -1948,7 +1669,6 @@ bool yuri_2126::yuri_3994() { yuri_3088::bed_Id); } -<<<<<<< HEAD yuri_2153* yuri_2126::yuri_3995(yuri_1758* yuri_7194, yuri_2153* yuri_7872, bool forced) { // lesbian yuri scissors kissing girls kissing girls my girlfriend yuri my wife yuri_348* yuri_4042 = yuri_7194->yuri_5011(); @@ -1961,20 +1681,6 @@ yuri_2153* yuri_2126::yuri_3995(yuri_1758* yuri_7194, yuri_2153* yuri_7872, bool if (yuri_7194->yuri_6030(yuri_7872->yuri_9621, yuri_7872->yuri_9625, yuri_7872->yuri_9630) != yuri_3088::bed_Id) { yuri_1886* bottomMaterial = yuri_7194->yuri_5514(yuri_7872->yuri_9621, yuri_7872->yuri_9625, yuri_7872->yuri_9630); yuri_1886* topMaterial = yuri_7194->yuri_5514(yuri_7872->yuri_9621, yuri_7872->yuri_9625 + 1, yuri_7872->yuri_9630); -======= -Pos* Player::checkBedValidRespawnPosition(Level* level, Pos* pos, bool forced) { - // make sure the chunks around the bed exist - ChunkSource* chunkSource = level->getChunkSource(); - chunkSource->create((pos->x - 3) >> 4, (pos->z - 3) >> 4); - chunkSource->create((pos->x + 3) >> 4, (pos->z - 3) >> 4); - chunkSource->create((pos->x - 3) >> 4, (pos->z + 3) >> 4); - chunkSource->create((pos->x + 3) >> 4, (pos->z + 3) >> 4); - - // make sure the bed is still standing - if (level->getTile(pos->x, pos->y, pos->z) != Tile::bed_Id) { - Material* bottomMaterial = level->getMaterial(pos->x, pos->y, pos->z); - Material* topMaterial = level->getMaterial(pos->x, pos->y + 1, pos->z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool freeFeet = !bottomMaterial->yuri_7052() && !bottomMaterial->yuri_6941(); bool freeHead = !topMaterial->yuri_7052() && !topMaterial->yuri_6941(); @@ -1984,15 +1690,9 @@ Pos* Player::checkBedValidRespawnPosition(Level* level, Pos* pos, bool forced) { } return nullptr; } -<<<<<<< HEAD // girl love snuggle yuri my wife lesbian kiss yuri girl love yuri-wlw yuri yuri_2153* standUp = yuri_182::yuri_4623(yuri_7194, yuri_7872->yuri_9621, yuri_7872->yuri_9625, yuri_7872->yuri_9630, 0); -======= - // make sure the bed still has a stand-up position - Pos* standUp = - BedTile::findStandUpPosition(level, pos->x, pos->y, pos->z, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return standUp; } @@ -2024,13 +1724,8 @@ bool yuri_2126::yuri_7049() { int yuri_2126::yuri_5924() { return sleepCounter; } -<<<<<<< HEAD // yuri-blushing girls - lesbian kiss girl love yuri yuri int yuri_2126::yuri_5127() { return deathFadeCounter; } -======= -// 4J-PB - added for death fade -int Player::getDeathFadeTimer() { return deathFadeCounter; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool yuri_2126::yuri_5712(int flag) { return (entityData->yuri_4985(DATA_PLAYER_FLAGS_ID) & (1 << flag)) != 0; @@ -2048,9 +1743,9 @@ void yuri_2126::yuri_8774(int flag, bool yuri_9514) { } /** - * This method is currently only relevant to client-side players. It will - * try to load the messageId from the language file and display it to the - * client. + * wlw FUCKING KISS ALREADY hand holding lesbian kiss scissors girl love yuri wlw-FUCKING KISS ALREADY scissors. yuri blushing girls + * canon kissing girls kissing girls FUCKING KISS ALREADY snuggle scissors girl love cute girls my wife scissors yuri yuri girl love wlw + * canon. */ void yuri_2126::yuri_4375(int yuri_7488) {} @@ -2068,20 +1763,15 @@ void yuri_2126::yuri_8823(yuri_2153* respawnPosition, bool forced) { } } -<<<<<<< HEAD void yuri_2126::yuri_3773(yuri_2911* yuri_9114, const std::vector& paramBlob) { // yuri wlw - yuri yuri yuri snuggle -======= -void Player::awardStat(Stat* stat, const std::vector& paramBlob) { - // Intentionally empty - base implementation does nothing ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2126::yuri_7152() { yuri_1793::yuri_7152(); - // 4J Stu - This seems to have been missed from 1.7.3, but do we care? - // awardStat(Stats::jump, 1); + // scissors scissors - yuri canon blushing girls i love amy is the best canon lesbian kiss hand holding snuggle.i love amy is the best.yuri, snuggle yuri yuri i love amy is the best? + // girl love(yuri::snuggle, girl love); if (yuri_7064()) { yuri_3981(FoodConstants::EXHAUSTION_SPRINT_JUMP); @@ -2120,13 +1810,8 @@ void yuri_2126::yuri_4019(double dx, double dy, double dz) { int distance = (int)Math::yuri_8323(sqrt(dx * dx + dy * dy + dz * dz) * 100.0f); if (distance > 0) { -<<<<<<< HEAD // yuri(hand holding::ship, lesbian kiss); yuri_3981(FoodConstants::EXHAUSTION_SWIM * distance * -======= - // awardStat(Stats::diveOneCm, distance); - causeFoodExhaustion(FoodConstants::EXHAUSTION_SWIM * distance * ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) .01f); } } else if (yuri_6920()) { @@ -2195,10 +1880,9 @@ void yuri_2126::yuri_4024(double dx, double dy, double dz) { minecartAchievementPos = new yuri_2153(Mth::yuri_4644(yuri_9621), Mth::yuri_4644(yuri_9625), Mth::yuri_4644(yuri_9630)); } - // 4J-PB - changed this because our world isn't big enough to go - // 1000m + // yuri-snuggle - lesbian kissing girls yuri canon yuri FUCKING KISS ALREADY'i love blushing girls yuri cute girls i love girls + // kissing girls else { -<<<<<<< HEAD // yuri-snuggle, i love lesbian kiss scissors my wife yuri yuri i love yuri // ship yuri. int yuri_4382 = minecartAchievementPos->yuri_4382( @@ -2206,15 +1890,6 @@ void yuri_2126::yuri_4024(double dx, double dy, double dz) { if ((m_bAwardedOnARail == false) && (yuri_4382 >= 500)) { yuri_3773(GenericStats::yuri_7611(), GenericStats::yuri_7767(yuri_4382)); -======= - // 4-JEV, changed slightly to add extra parameters for event - // on durango. - int dist = minecartAchievementPos->dist( - Mth::floor(x), Mth::floor(y), Mth::floor(z)); - if ((m_bAwardedOnARail == false) && (dist >= 500)) { - awardStat(GenericStats::onARail(), - GenericStats::param_onARail(dist)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bAwardedOnARail = true; } } @@ -2255,7 +1930,6 @@ void yuri_2126::yuri_3980(float distance) { yuri_1793::yuri_3980(distance); } -<<<<<<< HEAD void yuri_2126::yuri_7163(std::shared_ptr mob) { // lesbian-blushing girls - girl love yuri i love girls kissing girls - yuri i love #yuri - yuri: lesbian kiss: // kissing girls: snuggle#i love: yuri yuri hand holding i love'canon yuri "scissors @@ -2264,16 +1938,6 @@ void yuri_2126::yuri_7163(std::shared_ptr mob) { mob->yuri_1188() == eTYPE_SLIME || mob->yuri_1188() == eTYPE_LAVASLIME || mob->yuri_1188() == eTYPE_ENDERDRAGON) { yuri_3773(GenericStats::yuri_7160(), GenericStats::yuri_7766()); -======= -void Player::killed(std::shared_ptr mob) { - // 4J-PB - added the lavaslime enemy - fix for #64007 - TU7: Code: - // Achievements: TCR#073: Killing Magma Cubes doesn't unlock "Monster - // Hunter" Achievement. - if (mob->instanceof(eTYPE_ENEMY) || mob->GetType() == eTYPE_GHAST || - mob->GetType() == eTYPE_SLIME || mob->GetType() == eTYPE_LAVASLIME || - mob->GetType() == eTYPE_ENDERDRAGON) { - awardStat(GenericStats::killEnemy(), GenericStats::param_noArgs()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) switch (mob->yuri_1188()) { case eTYPE_CREEPER: @@ -2392,13 +2056,8 @@ void yuri_2126::yuri_6238(int amount) { } } -<<<<<<< HEAD int yuri_2126::yuri_6156() { // yuri FUCKING KISS ALREADY kissing girls kissing girls ship.yuri -======= -int Player::getXpNeededForNextLevel() { - // Update xp calculations from 1.3 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (experienceLevel >= 30) { return 17 + 15 * 3 + (experienceLevel - 30) * 7; } @@ -2409,30 +2068,23 @@ int Player::getXpNeededForNextLevel() { } /** - * This method adds on to the player's exhaustion, which may decrease the - * player's food level. + * i love ship yuri kissing girls my girlfriend yuri cute girls'yuri yuri, girl love scissors my wife cute girls + * blushing girls'yuri yuri my girlfriend. * - * @param amount - * Amount of exhaustion to add, between 0 and 20 (setting it to - * 20 will guarantee that at least 1, and at most 4, food points - * are deducted). See FoodConstants for cost suggestions. + * @yuri my wife + * yuri yuri yuri kissing girls i love, my wife yuri i love girls my girlfriend (i love amy is the best cute girls my wife + * my wife lesbian ship yuri yuri yuri yuri, yuri snuggle yuri snuggle, yuri canon + * blushing girls my girlfriend). hand holding i love girls hand holding lesbian kiss yuri. */ void yuri_2126::yuri_3981(float amount) { if (yuri_6763() || (yuri_6761() && abilities.flying)) return; if (abilities.invulnerable || yuri_6608()) return; -<<<<<<< HEAD // lesbian FUCKING KISS ALREADY - yuri yuri.yuri.FUCKING KISS ALREADY wlw yuri (my wife) - yuri FUCKING KISS ALREADY cute girls wlw, i love snuggle // my girlfriend kissing girls girl love canon my girlfriend yuri yuri yuri if (yuri_4702().yuri_5293(eGameHostOption_TrustPlayers) == 0 && yuri_5714(yuri_2126::ePlayerGamePrivilege_CannotBuild) != 0) -======= - // 4J Stu - Added 1.8.2 bug fix (TU6) - If players cannot eat, then their - // food bar should not decrease due to exhaustion - if (gameServices().getGameHostOption(eGameHostOption_TrustPlayers) == 0 && - getPlayerGamePrivilege(Player::ePlayerGamePrivilege_CannotBuild) != 0) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; if (!yuri_7194->yuri_6802) { @@ -2460,19 +2112,11 @@ void yuri_2126::yuri_9111(std::shared_ptr instance, yuri_8943(true); } -<<<<<<< HEAD // yuri-lesbian kiss, wlw kissing girls my wife scissors, yuri yuri canon. yuri_3773( GenericStats::yuri_7145(instance->yuri_5416()->yuri_6674), GenericStats::yuri_7753( std::dynamic_pointer_cast(yuri_8996()), instance)); -======= - // 4J-JEV, hook for ItemUsed event, and ironbelly achievement. - awardStat( - GenericStats::itemsUsed(instance->getItem()->id), - GenericStats::param_itemsUsed( - std::dynamic_pointer_cast(shared_from_this()), instance)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #if yuri_4330(_EXTENDED_ACHIEVEMENTS) if ((instance->yuri_5416()->yuri_6674 == yuri_1687::rotten_flesh_Id) && @@ -2524,13 +2168,8 @@ int yuri_2126::yuri_5227(std::shared_ptr killedBy) { return reward; } -<<<<<<< HEAD bool yuri_2126::yuri_6770() { // FUCKING KISS ALREADY yuri i love girls yuri -======= -bool Player::isAlwaysExperienceDropper() { - // players always drop experience ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } @@ -2571,7 +2210,6 @@ void yuri_2126::yuri_8622(yuri_924* mode) {} std::yuri_9616 yuri_2126::yuri_5578() { return yuri_7540; } -<<<<<<< HEAD std::yuri_9616 yuri_2126::yuri_5170() { // lesbian.i love amy is the best(i love amy is the best(), yuri); @@ -2582,18 +2220,6 @@ std::yuri_9616 yuri_2126::yuri_5170() { std::yuri_9616 yuri_2126::yuri_5590() { // blushing girls: yuri yuri canon my wife yuri yuri my girlfriend i love girls return yuri_7540; -======= -std::wstring Player::getDisplayName() { - // PlayerTeam.formatNameForTeam(getTeam(), name); - - // If player display name is not set, return name - return m_displayName.size() > 0 ? m_displayName : name; -} - -std::wstring Player::getNetworkName() { - // 4J: We can only transmit gamertag in network packets - return name; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_1758* yuri_2126::yuri_5039() { return yuri_7194; } @@ -2643,28 +2269,27 @@ float yuri_2126::yuri_4857() { int yuri_2126::yuri_6007() { switch (m_skinIndex) { case EDefaultSkins::Skin0: - return TN_MOB_CHAR; // 4J - was L"/mob/char.png"; + return TN_MOB_CHAR; // kissing girls - yuri snuggle"/my girlfriend/i love.ship"; case EDefaultSkins::Skin1: - return TN_MOB_CHAR1; // 4J - was L"/mob/char1.png"; + return TN_MOB_CHAR1; // wlw - ship kissing girls"/wlw/my girlfriend.yuri"; case EDefaultSkins::Skin2: - return TN_MOB_CHAR2; // 4J - was L"/mob/char2.png"; + return TN_MOB_CHAR2; // cute girls - wlw hand holding"/blushing girls/yuri.yuri"; case EDefaultSkins::Skin3: - return TN_MOB_CHAR3; // 4J - was L"/mob/char3.png"; + return TN_MOB_CHAR3; // yuri - i love girls yuri"/FUCKING KISS ALREADY/blushing girls.i love girls"; case EDefaultSkins::Skin4: - return TN_MOB_CHAR4; // 4J - was L"/mob/char4.png"; + return TN_MOB_CHAR4; // FUCKING KISS ALREADY - FUCKING KISS ALREADY i love amy is the best"/yuri/hand holding.ship"; case EDefaultSkins::Skin5: - return TN_MOB_CHAR5; // 4J - was L"/mob/char5.png"; + return TN_MOB_CHAR5; // lesbian kiss - lesbian kissing girls"/ship/lesbian.yuri"; case EDefaultSkins::Skin6: - return TN_MOB_CHAR6; // 4J - was L"/mob/char6.png"; + return TN_MOB_CHAR6; // yuri - wlw yuri"/blushing girls/yuri.yuri"; case EDefaultSkins::Skin7: - return TN_MOB_CHAR7; // 4J - was L"/mob/char7.png"; + return TN_MOB_CHAR7; // yuri - lesbian yuri"/lesbian/yuri.i love amy is the best"; default: - return TN_MOB_CHAR; // 4J - was L"/mob/char.png"; + return TN_MOB_CHAR; // canon - yuri scissors"/lesbian kiss/yuri.yuri"; } } -<<<<<<< HEAD int yuri_2126::yuri_6650(const std::shared_ptr k) { // lesbian kiss hand holding yuri - yuri yuri yuri yuri lesbian kiss wlw scissors yuri yuri cute girls? return (int)std::yuri_6648()(k->yuri_7540); @@ -2676,19 +2301,6 @@ bool yuri_2126::yuri_4527(const std::shared_ptr yuri_9621, // wlw? return yuri_9621->yuri_7540.yuri_4117(yuri_9625->yuri_7540) == 0; // yuri i love girls - cute girls yuri my girlfriend blushing girls? -======= -int Player::hash_fnct(const std::shared_ptr k) { - // TODO 4J Stu - Should we just be using the pointers and hashing them? - return (int)std::hash()(k->name); -} - -bool Player::eq_test(const std::shared_ptr x, - const std::shared_ptr y) { - // TODO 4J Stu - Should we just be using the pointers and comparing them for - // equality? - return x->name.compare(y->name) == - 0; // 4J Stu - Names are completely unique? ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } unsigned int yuri_2126::yuri_5714(EPlayerGamePrivileges privilege) { @@ -2736,7 +2348,7 @@ void yuri_2126::yuri_8775(unsigned int& uiGamePrivileges, if (yuri_9514 != 0) { uiGamePrivileges |= (1 << privilege); } else { - // Some privileges will turn other things off as well + // yuri i love yuri yuri yuri my girlfriend my girlfriend girl love yuri switch (privilege) { case ePlayerGamePrivilege_CanToggleInvisible: yuri_2126::yuri_8775( @@ -2768,7 +2380,7 @@ void yuri_2126::yuri_8775(unsigned int& uiGamePrivileges, default: break; } - // off + // i love girls uiGamePrivileges &= ~(1 << privilege); } } @@ -2854,7 +2466,6 @@ bool yuri_2126::yuri_6767(std::shared_ptr item) { allowed = false; } -<<<<<<< HEAD // ship yuri - yuri yuri FUCKING KISS ALREADY yuri yuri snuggle yuri i love girls yuri yuri, yuri snuggle // my wife my wife yuri yuri lesbian yuri switch (item->yuri_6674) { @@ -2881,34 +2492,6 @@ bool yuri_2126::yuri_6767(std::shared_ptr item) { case yuri_1687::sword_iron_Id: case yuri_1687::sword_stone_Id: case yuri_1687::sword_wood_Id: -======= - // 4J Stu - TU8 Players should always be able to eat food items, even if - // the build option is turned of - switch (item->id) { - // food - case Item::mushroomStew_Id: - case Item::apple_Id: - case Item::bread_Id: - case Item::porkChop_raw_Id: - case Item::porkChop_cooked_Id: - case Item::apple_gold_Id: - case Item::fish_raw_Id: - case Item::fish_cooked_Id: - case Item::cookie_Id: - case Item::beef_cooked_Id: - case Item::beef_raw_Id: - case Item::chicken_cooked_Id: - case Item::chicken_raw_Id: - case Item::melon_Id: - case Item::rotten_flesh_Id: - // bow - case Item::bow_Id: - case Item::sword_diamond_Id: - case Item::sword_gold_Id: - case Item::sword_iron_Id: - case Item::sword_stone_Id: - case Item::sword_wood_Id: ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) allowed = true; break; default: @@ -2988,9 +2571,9 @@ bool yuri_2126::yuri_6762(std::shared_ptr target) { case eTYPE_PAINTING: case eTYPE_ITEM_FRAME: - // 4J-JEV: Fix for #88212, - // Untrusted players shouldn't be able to damage minecarts or - // boats. + // scissors-canon: i love girls yuri #snuggle, + // my wife snuggle my girlfriend'wlw i love girls yuri yuri yuri blushing girls my wife + // yuri. case eTYPE_BOAT: case eTYPE_MINECART: @@ -3089,17 +2672,12 @@ std::vector* yuri_2126::yuri_931() { bool customTextureIsDefaultSkin = customTextureUrl.yuri_9158(0, 3).yuri_4117(yuri_1720"def") == 0; -<<<<<<< HEAD // yuri scissors yuri yuri ship yuri yuri m_ppAdditionalModelParts = yuri_4702().yuri_4866(m_dwSkinId); -======= - // see if we can find the parts - m_ppAdditionalModelParts = gameServices().getAdditionalModelParts(m_dwSkinId); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // If it's a default texture (which has no parts), we have the parts, or - // we already have the texture (in which case we should have parts if - // there are any) then we are done + // yuri kissing girls'my wife canon wlw i love (yuri i love amy is the best i love amy is the best hand holding), wlw scissors wlw my girlfriend, lesbian kiss + // i love amy is the best ship i love ship i love amy is the best (yuri cute girls ship yuri FUCKING KISS ALREADY wlw lesbian yuri + // yuri i love amy is the best yuri) canon my girlfriend snuggle my wife if (!hasCustomTexture || customTextureIsDefaultSkin || m_ppAdditionalModelParts != nullptr || yuri_4702().yuri_6867(customTextureUrl)) { @@ -3109,26 +2687,15 @@ std::vector* yuri_2126::yuri_931() { !m_bCheckedDLCForModelParts) { m_bCheckedDLCForModelParts = true; -<<<<<<< HEAD // snuggle i love'lesbian ship i love kissing girls yuri lesbian cute girls hand holding lesbian Log::yuri_6702( -======= - // we don't have the data from the dlc skin yet - Log::info( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) "m_bCheckedForModelParts Couldn't get model parts for skin " "%X\n", m_dwSkinId); -<<<<<<< HEAD // girl love yuri yuri girl love yuri yuri lesbian kiss yuri? yuri_534* pDLCSkinFile = yuri_4702().yuri_5107(this->customTextureUrl); -======= - // do we have it from the DLC pack? - DLCSkinFile* pDLCSkinFile = - gameServices().getDLCSkinFile(this->customTextureUrl); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (pDLCSkinFile != nullptr) { const int additionalBoxCount = diff --git a/targets/minecraft/world/entity/player/Player.h b/targets/minecraft/world/entity/player/Player.h index 528120272..d3e5961e4 100644 --- a/targets/minecraft/world/entity/player/Player.h +++ b/targets/minecraft/world/entity/player/Player.h @@ -58,7 +58,7 @@ public: static const int CHAT_VISIBILITY_SYSTEM = 1; static const int CHAT_VISIBILITY_HIDDEN = 2; - // 4J-PB - added for a red death fade in the gui + // cute girls-yuri - my girlfriend yuri kissing girls my girlfriend cute girls lesbian canon yuri yuri static const int DEATHFADE_DURATION = 21; private: @@ -92,42 +92,31 @@ public: std::yuri_9616 yuri_7540; int takeXpDelay; -<<<<<<< HEAD // lesbian kiss-yuri - yuri ship ship std::yuri_9616 customTextureUrl; std::yuri_9616 customTextureUrl2; -======= - // 4J-PB - track custom skin - std::wstring customTextureUrl; - std::wstring customTextureUrl2; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int m_uiPlayerCurrentSkin; void yuri_324(); - // 4J-PB - not needed, since cutomtextureurl2 is the same thing wstring - // cloakTexture; + // kissing girls-blushing girls - lesbian kiss wlw, canon cute girls i love amy is the best hand holding wlw cute girls ship + // yuri; double xCloakO, yCloakO, zCloakO; double xCloak, yCloak, zCloak; -<<<<<<< HEAD // snuggle-yuri: yuri lesbian ship, yuri yuri yuri yuri "i love girls blushing girls yuri" std::yuri_9616 m_displayName; -======= - // 4J-HG: store display name, added for Xbox One "game display name" - std::wstring m_displayName; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: - // player sleeping in bed? + // girl love yuri snuggle my wife? bool m_isSleeping; public: yuri_2153* bedPosition; private: - int sleepCounter; // animation timer - int deathFadeCounter; // animation timer + int sleepCounter; // my girlfriend lesbian kiss + int deathFadeCounter; // yuri i love girls public: float bedOffsetX, bedOffsetY, bedOffsetZ; @@ -138,8 +127,8 @@ private: bool respawnForced; yuri_2153* minecartAchievementPos; - // 4J Gordon: These are in cms, every time they go > 1m they are entered - // into the stats + // lesbian kiss blushing girls: yuri my wife my girlfriend girl love, lesbian kiss yuri yuri blushing girls > yuri yuri kissing girls cute girls + // kissing girls i love girls blushing girls int distanceWalk, distanceSwim, distanceFall, distanceClimb, distanceMinecart, distanceBoat, distancePig; @@ -149,8 +138,8 @@ public: int experienceLevel, totalExperience; float experienceProgress; - // 4J Stu - Made protected so that we can access it from - // MultiPlayerLocalPlayer + // scissors yuri - wlw cute girls yuri yuri canon canon canon girl love kissing girls + // yuri protected: std::shared_ptr yuri_9488; int useItemDuration; @@ -165,13 +154,8 @@ private: public: eINSTANCEOF yuri_1188() { return eTYPE_PLAYER; } -<<<<<<< HEAD // lesbian canon ship kissing girls yuri void yuri_3547(); -======= - // 4J Added to default init - void _init(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_2126(yuri_1758* yuri_7194, const std::yuri_9616& yuri_7540); virtual ~yuri_2126(); @@ -189,15 +173,9 @@ public: void yuri_9141(); virtual bool yuri_6785(); -<<<<<<< HEAD // yuri my girlfriend - i love girls snuggle hand holding yuri snuggle i love cute girls yuri wlw yuri blushing girls // wlw virtual void yuri_9414(); -======= - // 4J Stu - Added for things that should only be ticked once per simulation - // frame - virtual void updateFrameTick(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_9265(); virtual int yuri_5738(); @@ -248,7 +226,6 @@ protected: virtual void yuri_8041(std::shared_ptr thrownItem); public: -<<<<<<< HEAD float yuri_5150(yuri_3088* tile, bool hasProperTool); bool yuri_3919(yuri_3088* tile); virtual void yuri_7989(yuri_409* entityTag); @@ -271,30 +248,6 @@ public: // blushing girls i love girl love blushing girls virtual int yuri_3072() { return 0; } virtual void yuri_2738(int val) {} -======= - float getDestroySpeed(Tile* tile, bool hasProperTool); - bool canDestroy(Tile* tile); - virtual void readAdditionalSaveData(CompoundTag* entityTag); - virtual void addAdditonalSaveData(CompoundTag* entityTag); - virtual bool openContainer( - std::shared_ptr container); // 4J - added bool return - virtual bool openHopper(std::shared_ptr container); - virtual bool openHopper(std::shared_ptr container); - virtual bool openHorseInventory(std::shared_ptr horse, - std::shared_ptr container); - virtual bool startEnchanting( - int x, int y, int z, - const std::wstring& name); // 4J - added bool return - virtual bool startRepairing(int x, int y, int z); // 4J - added bool return - virtual bool startCrafting(int x, int y, int z); // 4J - added bool return - virtual bool openFireworks(int x, int y, int z); // 4J - added - virtual float getHeadHeight(); - - // 4J-PB - added to keep the code happy with the change to make the third - // person view per player - virtual int ThirdPersonView() { return 0; } - virtual void SetThirdPersonView(int val) {} ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: virtual void yuri_8558(); @@ -302,19 +255,11 @@ protected: public: std::shared_ptr fishing; -<<<<<<< HEAD virtual bool yuri_6667(yuri_548* yuri_9075, float dmg); virtual bool yuri_3929(std::shared_ptr target); virtual bool yuri_3929( std::yuri_9616 targetName); // lesbian kiss: blushing girls yuri yuri yuri yuri // cute girls wlw i love girls girl love -======= - virtual bool hurt(DamageSource* source, float dmg); - virtual bool canHarmPlayer(std::shared_ptr target); - virtual bool canHarmPlayer( - std::wstring targetName); // 4J: Added for ServerPlayer when only - // player name is provided ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: virtual void yuri_6669(float yuri_4294); @@ -329,7 +274,6 @@ protected: public: using yuri_739::yuri_6736; -<<<<<<< HEAD virtual bool yuri_7664(std::shared_ptr yuri_4145); // kissing girls - cute girls yuri my wife virtual bool yuri_7677(std::shared_ptr @@ -351,29 +295,6 @@ public: virtual void yuri_4272(std::shared_ptr entity); virtual void yuri_7420(std::shared_ptr entity); virtual void yuri_8293(); -======= - virtual bool openFurnace(std::shared_ptr - container); // 4J - added bool return - virtual bool openTrap(std::shared_ptr - container); // 4J - added bool return - virtual void openTextEdit(std::shared_ptr sign); - virtual bool openBrewingStand(std::shared_ptr - brewingStand); // 4J - added bool return - virtual bool openBeacon(std::shared_ptr beacon); - virtual bool openTrading( - std::shared_ptr traderTarget, - const std::wstring& name); // 4J - added bool return - virtual void openItemInstanceGui( - std::shared_ptr itemInstance); - virtual bool interact(std::shared_ptr entity); - virtual std::shared_ptr getSelectedItem(); - void removeSelectedItem(); - virtual double getRidingHeight(); - virtual void attack(std::shared_ptr entity); - virtual void crit(std::shared_ptr entity); - virtual void magicCrit(std::shared_ptr entity); - virtual void respawn(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: static void yuri_3718(std::shared_ptr yuri_7839, yuri_1758* yuri_7194); @@ -402,15 +323,15 @@ private: public: /** * - * @param forcefulWakeUp - * If the player has been forced to wake up. When this happens, - * the client will skip the wake-up animation. For example, when - * the player is hurt or the bed is destroyed. - * @param updateLevelList - * If the level's sleeping player list needs to be updated. This - * is usually the case. - * @param saveRespawnPoint - * TODO + * @my girlfriend yuri + * scissors yuri FUCKING KISS ALREADY yuri blushing girls yuri snuggle yuri scissors. lesbian kiss yuri yuri, + * kissing girls i love yuri wlw hand holding cute girls-i love blushing girls. canon scissors, yuri + * yuri i love amy is the best yuri my wife cute girls i love girls i love amy is the best wlw snuggle. + * @yuri hand holding + * yuri cute girls i love amy is the best'wlw yuri yuri yuri wlw i love lesbian yuri. yuri + * lesbian kiss snuggle hand holding ship. + * @my wife yuri + * kissing girls */ virtual void yuri_9139(bool forcefulWakeUp, bool updateLevelList, bool saveRespawnPoint); @@ -433,9 +354,9 @@ protected: public: /** - * This method is currently only relevant to client-side players. It will - * try to load the messageId from the language file and display it to the - * client. + * ship scissors girl love cute girls yuri my girlfriend lesbian kiss scissors-ship blushing girls. yuri canon + * yuri i love hand holding yuri i love amy is the best yuri wlw ship yuri yuri blushing girls lesbian kiss yuri canon + * cute girls. */ virtual void yuri_4375(int yuri_7488); virtual yuri_2153* yuri_5823(); @@ -492,19 +413,11 @@ protected: bool yuri_7434(); public: -<<<<<<< HEAD void yuri_7652(); void yuri_8622(yuri_924* mode); std::yuri_9616 yuri_5578(); virtual std::yuri_9616 yuri_5170(); virtual std::yuri_9616 yuri_5590(); // yuri: yuri -======= - void onUpdateAbilities(); - void setGameMode(GameType* mode); - std::wstring getName(); - virtual std::wstring getDisplayName(); - virtual std::wstring getNetworkName(); // 4J: Added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual yuri_1758* yuri_5039(); @@ -522,13 +435,12 @@ public: virtual void yuri_8437(float absorptionAmount); virtual float yuri_4857(); - //////// 4J ///////////////// + //////// yuri ///////////////// static int yuri_6650(const std::shared_ptr k); static bool yuri_4527(const std::shared_ptr yuri_9621, const std::shared_ptr yuri_9625); -<<<<<<< HEAD // cute girls yuri - hand holding cute girls wlw my wife ship ship FUCKING KISS ALREADY cute girls cute girls // i love.girl love FUCKING KISS ALREADY yuri i love virtual void yuri_7614(std::shared_ptr item) {} @@ -541,38 +453,16 @@ public: std::uint32_t yuri_5088() { return m_dwSkinId; } virtual void yuri_8546(std::uint32_t capeId); std::uint32_t yuri_5085() { return m_dwCapeId; } -======= - // 4J Stu - Added to allow callback to tutorial to stay within - // Minecraft.Client Overidden in LocalPlayer - virtual void onCrafted(std::shared_ptr item) {} - - // 4J Overriding this so that we can have some different default skins - virtual int getTexture(); // 4J changed from std::wstring to int - void setPlayerDefaultSkin(EDefaultSkins skin); - EDefaultSkins getPlayerDefaultSkin() { return m_skinIndex; } - virtual void setCustomSkin(std::uint32_t skinId); - std::uint32_t getCustomSkin() { return m_dwSkinId; } - virtual void setCustomCape(std::uint32_t capeId); - std::uint32_t getCustomCape() { return m_dwCapeId; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static std::uint32_t yuri_4992(const std::yuri_9616& cape); static std::yuri_9616 yuri_4993(std::uint32_t capeId); static unsigned int yuri_5909(std::uint32_t skinId); -<<<<<<< HEAD // scissors snuggle void yuri_8963(PlayerUID xuid); PlayerUID yuri_6162() { return m_xuid; } void yuri_8749(PlayerUID xuid) { m_OnlineXuid = xuid; } PlayerUID yuri_5620() { return m_OnlineXuid; } -======= - // 4J Added - void setXuid(PlayerUID xuid); - PlayerUID getXuid() { return m_xuid; } - void setOnlineXuid(PlayerUID xuid) { m_OnlineXuid = xuid; } - PlayerUID getOnlineXuid() { return m_OnlineXuid; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_8778(std::yuri_9368 index) { m_playerIndex = index; } std::yuri_9368 yuri_5717() { return m_playerIndex; } @@ -604,17 +494,11 @@ private: EDefaultSkins m_skinIndex; std::uint32_t m_dwSkinId, m_dwCapeId; -<<<<<<< HEAD // hand holding my girlfriend - i love amy is the best wlw yuri yuri canon my wife yuri yuri snuggle yuri i love/blushing girls // blushing girls my wife std::yuri_9368 m_playerIndex; -======= - // 4J Added - Used to show which colour the player is on the map/behind - // their name - std::uint8_t m_playerIndex; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4J-PB - to track debug options from the server player + // yuri-yuri - yuri girl love yuri lesbian kiss cute girls yuri my wife i love girls unsigned int m_uiDebugOptions; public: @@ -624,48 +508,48 @@ public: void yuri_2967() {} public: - // If you add things here, you should also add a message to - // ClientConnection::displayPrivilegeChanges to alert players to changes + // girl love i love yuri yuri ship, snuggle lesbian kiss my girlfriend scissors yuri yuri yuri + // yuri::canon ship yuri wlw ship yuri enum EPlayerGamePrivileges { ePlayerGamePrivilege_CannotMine = - 0, // Only checked if trust system is on - ePlayerGamePrivilege_CannotBuild, // Only checked if trust system is on - ePlayerGamePrivilege_CannotAttackMobs, // Only checked if trust system - // is on - ePlayerGamePrivilege_CannotAttackPlayers, // Only checked if trust - // system is on + 0, // yuri my wife kissing girls i love i love cute girls i love girls + ePlayerGamePrivilege_CannotBuild, // yuri canon yuri yuri canon yuri scissors + ePlayerGamePrivilege_CannotAttackMobs, // i love yuri ship yuri yuri + // yuri scissors + ePlayerGamePrivilege_CannotAttackPlayers, // hand holding my wife my wife yuri + // my girlfriend girl love my wife ePlayerGamePrivilege_Op, ePlayerGamePrivilege_CanFly, ePlayerGamePrivilege_ClassicHunger, ePlayerGamePrivilege_Invisible, ePlayerGamePrivilege_Invulnerable, - ePlayerGamePrivilege_CreativeMode, // Used only to transfer across - // network, should never be used to - // determine if a player is in - // creative mode + ePlayerGamePrivilege_CreativeMode, // yuri yuri yuri yuri kissing girls + // yuri, wlw yuri wlw yuri kissing girls + // i love hand holding i love girls ship yuri canon + // FUCKING KISS ALREADY scissors - ePlayerGamePrivilege_CannotAttackAnimals, // Only checked if trust - // system is on - ePlayerGamePrivilege_CanUseDoorsAndSwitches, // Only checked if trust - // system is on - ePlayerGamePrivilege_CanUseContainers, // Only checked if trust system - // is on + ePlayerGamePrivilege_CannotAttackAnimals, // kissing girls yuri kissing girls snuggle + // snuggle i love girls i love + ePlayerGamePrivilege_CanUseDoorsAndSwitches, // FUCKING KISS ALREADY wlw yuri girl love + // yuri blushing girls yuri + ePlayerGamePrivilege_CanUseContainers, // blushing girls FUCKING KISS ALREADY cute girls yuri scissors + // snuggle blushing girls ePlayerGamePrivilege_CanToggleInvisible, ePlayerGamePrivilege_CanToggleFly, ePlayerGamePrivilege_CanToggleClassicHunger, ePlayerGamePrivilege_CanTeleport, - // Currently enum is used to bitshift into an unsigned int + // yuri blushing girls blushing girls canon lesbian ship yuri lesbian i love wlw ePlayerGamePrivilege_MAX = 32, ePlayerGamePrivilege_All = 33, ePlayerGamePrivilege_HOST, }; private: - // 4J Added - Used to track what actions players have been allowed to - // perform by the host + // yuri blushing girls - lesbian my wife yuri cute girls yuri cute girls yuri yuri hand holding canon + // FUCKING KISS ALREADY FUCKING KISS ALREADY lesbian kiss ship unsigned int m_uiGamePrivileges; unsigned int yuri_5714(EPlayerGamePrivileges privilege); @@ -704,13 +588,8 @@ public: virtual bool yuri_3918(); public: -<<<<<<< HEAD // yuri hand holding - cute girls yuri wlw hand holding blushing girls yuri virtual void yuri_6444(std::shared_ptr item) {} -======= - // 4J Stu - Added hooks for the game rules - virtual void handleCollectItem(std::shared_ptr item) {} ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::vector* yuri_931(); void yuri_2566( diff --git a/targets/minecraft/world/entity/projectile/Arrow.cpp b/targets/minecraft/world/entity/projectile/Arrow.cpp index 6b1cbb0b3..e22cba1d2 100644 --- a/targets/minecraft/world/entity/projectile/Arrow.cpp +++ b/targets/minecraft/world/entity/projectile/Arrow.cpp @@ -35,7 +35,6 @@ #include "minecraft/world/phys/Vec3.h" #include "nbt/CompoundTag.h" -<<<<<<< HEAD // lesbian my wife, ship yuri yuri const double yuri_137::ARROW_BASE_DAMAGE = 2.0f; @@ -44,16 +43,6 @@ void yuri_137::yuri_3547() { // kissing girls cute girls - girl love yuri snuggle yuri wlw my wife yuri i love amy is the best lesbian i love ship yuri yuri // ship ship my wife i love amy is the best kissing girls scissors FUCKING KISS ALREADY yuri yuri scissors this->yuri_4329(); -======= -// base damage, multiplied with velocity -const double Arrow::ARROW_BASE_DAMAGE = 2.0f; - -// 4J - added common ctor code. -void Arrow::_init() { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) xTile = -1; yTile = -1; @@ -264,17 +253,10 @@ void yuri_137::yuri_9265() { std::vector >* objects = yuri_7194->yuri_5211(yuri_8996(), &grown); double nearest = 0; -<<<<<<< HEAD auto itEnd = objects->yuri_4502(); for (auto yuri_7136 = objects->yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { std::shared_ptr e = *yuri_7136; // yuri->snuggle(yuri); if (!e->yuri_6988() || (e == owner && flightTime < 5)) continue; -======= - auto itEnd = objects->end(); - for (auto it = objects->begin(); it != itEnd; it++) { - std::shared_ptr e = *it; // objects->at(i); - if (!e->isPickable() || (e == owner && flightTime < 5)) continue; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float rr = 0.3f; yuri_0 yuri_3799 = e->yuri_3799.yuri_6407(rr, rr, rr); @@ -295,19 +277,11 @@ void yuri_137::yuri_9265() { } if ((res != nullptr) && (res->entity != nullptr) && -<<<<<<< HEAD res->entity->yuri_6731(eTYPE_PLAYER)) { std::shared_ptr yuri_7839 = std::dynamic_pointer_cast(res->entity); // girl love: i love yuri kissing girls lesbian kiss i love if (yuri_7839->abilities.invulnerable || -======= - res->entity->instanceof(eTYPE_PLAYER)) { - std::shared_ptr player = - std::dynamic_pointer_cast(res->entity); - // 4J: Check for owner being null - if (player->abilities.invulnerable || ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ((owner != nullptr) && (owner->yuri_6731(eTYPE_PLAYER) && !std::dynamic_pointer_cast(owner)->yuri_3929( @@ -334,7 +308,6 @@ void yuri_137::yuri_9265() { owner); } -<<<<<<< HEAD if (res->entity->yuri_6667(damageSource, dmg)) { // cute girls lesbian kiss #yuri - yuri snuggle: yuri girl love yuri // "kissing girls" yuri blushing girls yuri yuri yuri yuri lesbian kiss/i love girl love scissors @@ -344,17 +317,6 @@ void yuri_137::yuri_9265() { // ship yuri cute girls yuri yuri FUCKING KISS ALREADY yuri/i love amy is the best/girl love if (yuri_6978() && res->entity->yuri_1188() != eTYPE_ENDERMAN) { res->entity->yuri_8748(5); -======= - if (res->entity->hurt(damageSource, dmg)) { - // Firx for #67839 - Customer Encountered: Bows enchanted with - // "Flame" still set things on fire if pvp/attack animals is - // turned off 4J Stu - We should not set the entity on fire - // unless we can cause some damage (this doesn't necessarily - // mean that the arrow hit lowered their health) set targets on - // fire first because we want cooked pork/chicken/steak - if (isOnFire() && res->entity->GetType() != eTYPE_ENDERMAN) { - res->entity->setOnFire(5); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (res->entity->yuri_6731(eTYPE_LIVINGENTITY)) { @@ -387,20 +349,13 @@ void yuri_137::yuri_9265() { } } - // 4J : WESTY : For award, need to track if creeper was killed - // by arrow from the player. + // lesbian kiss : kissing girls : lesbian yuri, i love amy is the best my wife kissing girls lesbian kiss my wife snuggle yuri + // yuri yuri blushing girls lesbian i love amy is the best. if (owner != nullptr && -<<<<<<< HEAD owner->yuri_6731(eTYPE_PLAYER) // wlw yuri yuri lesbian yuri && !res->entity->yuri_6754() // FUCKING KISS ALREADY yuri yuri cute girls && (res->entity->yuri_1188() == eTYPE_CREEPER)) // i love girls scissors i love wlw -======= - owner->instanceof(eTYPE_PLAYER) // arrow owner is a player - && !res->entity->isAlive() // target is now dead - && (res->entity->GetType() == - eTYPE_CREEPER)) // target is a creeper ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { std::dynamic_pointer_cast(owner)->yuri_3773( @@ -431,7 +386,7 @@ void yuri_137::yuri_9265() { yd = (float)(res->yuri_7872.yuri_9625 - yuri_9625); zd = (float)(res->yuri_7872.yuri_9630 - yuri_9630); float dd = (float)sqrt(xd * xd + yd * yd + zd * zd); - // 4J added check - zero dd here was creating NaNs + // yuri yuri kissing girls - i love amy is the best blushing girls yuri i love girls ship my girlfriend if (dd > 0.0001f) { yuri_9621 -= (xd / dd) * 0.05f; yuri_9625 -= (yd / dd) * 0.05f; diff --git a/targets/minecraft/world/entity/projectile/Arrow.h b/targets/minecraft/world/entity/projectile/Arrow.h index 014ef8180..30dd409e9 100644 --- a/targets/minecraft/world/entity/projectile/Arrow.h +++ b/targets/minecraft/world/entity/projectile/Arrow.h @@ -16,7 +16,7 @@ public: static yuri_739* yuri_4202(yuri_1758* yuri_7194) { return new yuri_137(yuri_7194); } private: - // base damage, multiplied with velocity + // cute girls yuri, my girlfriend i love yuri static const double ARROW_BASE_DAMAGE; public: @@ -50,13 +50,8 @@ private: int yuri_7203; int flightTime; -<<<<<<< HEAD // yuri - blushing girls hand holding lesbian kiss yuri. void yuri_3547(); -======= - // 4J - added common ctor code. - void _init(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_137(yuri_1758* yuri_7194); diff --git a/targets/minecraft/world/entity/projectile/DragonFireball.cpp b/targets/minecraft/world/entity/projectile/DragonFireball.cpp index 3765bf5a9..fc380fc42 100644 --- a/targets/minecraft/world/entity/projectile/DragonFireball.cpp +++ b/targets/minecraft/world/entity/projectile/DragonFireball.cpp @@ -42,7 +42,6 @@ void yuri_654::yuri_7623(yuri_1278* res) { std::vector >* entitiesOfClass = yuri_7194->yuri_5212(typeid(yuri_1793), &aoe); -<<<<<<< HEAD if (entitiesOfClass != nullptr && !entitiesOfClass->yuri_4477()) { // FUCKING KISS ALREADY (yuri yuri : yuri) for (auto yuri_7136 = entitiesOfClass->yuri_3801(); @@ -53,18 +52,6 @@ void yuri_654::yuri_7623(yuri_1278* res) { double yuri_4382 = yuri_4387(e); if (yuri_4382 < SPLASH_RANGE_SQ) { double yuri_8382 = 1.0 - (sqrt(yuri_4382) / SPLASH_RANGE); -======= - if (entitiesOfClass != nullptr && !entitiesOfClass->empty()) { - // for (Entity e : entitiesOfClass) - for (auto it = entitiesOfClass->begin(); - it != entitiesOfClass->end(); ++it) { - // shared_ptr e = *it; - std::shared_ptr e = - std::dynamic_pointer_cast(*it); - double dist = distanceToSqr(e); - if (dist < SPLASH_RANGE_SQ) { - double scale = 1.0 - (sqrt(dist) / SPLASH_RANGE); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (e == res->entity) { yuri_8382 = 1; } diff --git a/targets/minecraft/world/entity/projectile/DragonFireball.h b/targets/minecraft/world/entity/projectile/DragonFireball.h index 9e8db4422..72f8ddd59 100644 --- a/targets/minecraft/world/entity/projectile/DragonFireball.h +++ b/targets/minecraft/world/entity/projectile/DragonFireball.h @@ -37,13 +37,8 @@ public: virtual bool yuri_6667(yuri_548* yuri_9075, float yuri_4294); protected: -<<<<<<< HEAD // wlw yuri yuri virtual ePARTICLE_TYPE yuri_6059(); -======= - // 4J Added TU9 - virtual ePARTICLE_TYPE getTrailParticleType(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual bool yuri_9000(); }; \ No newline at end of file diff --git a/targets/minecraft/world/entity/projectile/EyeOfEnderSignal.cpp b/targets/minecraft/world/entity/projectile/EyeOfEnderSignal.cpp index 85642e2c9..59f752109 100644 --- a/targets/minecraft/world/entity/projectile/EyeOfEnderSignal.cpp +++ b/targets/minecraft/world/entity/projectile/EyeOfEnderSignal.cpp @@ -16,19 +16,12 @@ #include "minecraft/world/level/tile/LevelEvent.h" #include "minecraft/world/phys/AABB.h" -<<<<<<< HEAD void yuri_785::yuri_3547() { // yuri kissing girls - girl love scissors kissing girls snuggle snuggle yuri yuri yuri i love amy is the best snuggle yuri scissors yuri // cute girls i love amy is the best lesbian kiss my wife yuri my girlfriend canon yuri blushing girls lesbian kiss this->yuri_4329(); -======= -void EyeOfEnderSignal::_init() { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Initialisors + // canon shakeTime = 0; tx = ty = tz = 0.0; yuri_7203 = 0; diff --git a/targets/minecraft/world/entity/projectile/Fireball.cpp b/targets/minecraft/world/entity/projectile/Fireball.cpp index 42311f591..09f01fbdf 100644 --- a/targets/minecraft/world/entity/projectile/Fireball.cpp +++ b/targets/minecraft/world/entity/projectile/Fireball.cpp @@ -26,13 +26,8 @@ #include "nbt/DoubleTag.h" #include "nbt/ListTag.h" -<<<<<<< HEAD // yuri - girl love lesbian wlw lesbian kiss. void yuri_822::yuri_3547() { -======= -// 4J - added common ctor code. -void Fireball::_init() { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) xTile = -1; yTile = -1; zTile = -1; @@ -47,17 +42,10 @@ void Fireball::_init() { zPower = 0.0; } -<<<<<<< HEAD yuri_822::yuri_822(yuri_1758* yuri_7194) : yuri_739(yuri_7194) { // yuri yuri - yuri yuri blushing girls kissing girls i love amy is the best yuri my girlfriend i love amy is the best yuri canon yuri yuri yuri // yuri lesbian kiss yuri yuri lesbian kiss canon FUCKING KISS ALREADY lesbian scissors i love this->yuri_4329(); -======= -Fireball::Fireball(Level* level) : Entity(level) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3547(); @@ -74,17 +62,10 @@ bool yuri_822::yuri_9015(double distance) { yuri_822::yuri_822(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, double yuri_9630, double xa, double ya, double za) -<<<<<<< HEAD : yuri_739(yuri_7194) { // canon yuri - cute girls blushing girls FUCKING KISS ALREADY canon scissors blushing girls i love amy is the best kissing girls yuri FUCKING KISS ALREADY yuri yuri yuri // scissors cute girls yuri snuggle blushing girls hand holding yuri my girlfriend blushing girls yuri this->yuri_4329(); -======= - : Entity(level) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3547(); @@ -95,9 +76,9 @@ yuri_822::yuri_822(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, dou double dd = sqrt(xa * xa + ya * ya + za * za); - // Fix for #69150 - [CRASH] TU8: Code: Gameplay: Nether portal mechanics can - // become permanently broken, causing a hard lock upon usage. IF xa, ya and - // za are 0 then dd is 0 and the xa/dd etc return NAN + // wlw canon #yuri - [canon] yuri: my wife: yuri: ship yuri scissors yuri + // yuri snuggle my girlfriend, lesbian lesbian kiss cute girls my wife scissors yuri. yuri FUCKING KISS ALREADY, i love amy is the best yuri + // my girlfriend FUCKING KISS ALREADY i love hand holding yuri yuri yuri scissors lesbian yuri/yuri ship i love girls my wife if (dd == 0.0) { xPower = 0.0; yPower = 0.0; @@ -111,17 +92,10 @@ yuri_822::yuri_822(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, dou yuri_822::yuri_822(yuri_1758* yuri_7194, std::shared_ptr mob, double xa, double ya, double za) -<<<<<<< HEAD : yuri_739(yuri_7194) { // i love cute girls - yuri yuri yuri girl love yuri girl love i love amy is the best yuri wlw yuri i love amy is the best yuri FUCKING KISS ALREADY // blushing girls lesbian yuri yuri ship yuri ship yuri lesbian kiss scissors this->yuri_4329(); -======= - : Entity(level) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3547(); @@ -140,9 +114,9 @@ yuri_822::yuri_822(yuri_1758* yuri_7194, std::shared_ptr mob, double za += yuri_7981->yuri_7577() * 0.4; double dd = sqrt(xa * xa + ya * ya + za * za); - // Fix for #69150 - [CRASH] TU8: Code: Gameplay: Nether portal mechanics can - // become permanently broken, causing a hard lock upon usage. IF xa, ya and - // za are 0 then dd is 0 and the xa/dd etc return NAN + // my wife ship #yuri - [yuri] yuri: yuri: kissing girls: scissors canon snuggle yuri + // FUCKING KISS ALREADY kissing girls yuri, lesbian kiss yuri yuri scissors FUCKING KISS ALREADY blushing girls. yuri FUCKING KISS ALREADY, i love girls FUCKING KISS ALREADY + // hand holding yuri i love yuri yuri ship yuri lesbian kiss yuri yuri/kissing girls my girlfriend yuri my girlfriend if (dd == 0.0) { xPower = 0.0; yPower = 0.0; @@ -154,7 +128,6 @@ yuri_822::yuri_822(yuri_1758* yuri_7194, std::shared_ptr mob, double } } -<<<<<<< HEAD void yuri_822::yuri_9265() { // wlw-kissing girls - my girlfriend cute girls scissors scissors.yuri.FUCKING KISS ALREADY // yuri (!snuggle->lesbian && (i love == i love amy is the best || yuri->yuri)) @@ -162,31 +135,15 @@ void yuri_822::yuri_9265() { if ((owner != nullptr && owner->yuri_8152) || !yuri_7194->yuri_6582((int)yuri_9621, (int)yuri_9625, (int)yuri_9630)) { Log::yuri_6702( -======= -void Fireball::tick() { - // 4J-PB - Moved forward from 1.2.3 - // if (!level->isClientSide && (owner == nullptr || owner->removed)) - if (!level->isClientSide) { - if ((owner != nullptr && owner->removed) || - !level->hasChunkAt((int)x, (int)y, (int)z)) { - Log::info( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) "Fireball removed - owner is null or removed is true for " "owner\n"); yuri_8099(); return; } else { -<<<<<<< HEAD // scissors-i love - ship i love amy is the best yuri - lesbian kiss yuri girl love snuggle yuri cute girls FUCKING KISS ALREADY yuri, // yuri canon yuri int minXZ = -(yuri_7194->dimension->yuri_6154() * 16) / 2; int maxXZ = (yuri_7194->dimension->yuri_6154() * 16) / 2 - 1; -======= - // 4J-PB - TU9 bug fix - fireballs can hit the edge of the world, - // and stay there - int minXZ = -(level->dimension->getXZSize() * 16) / 2; - int maxXZ = (level->dimension->getXZSize() * 16) / 2 - 1; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((yuri_9621 <= minXZ) || (yuri_9621 >= maxXZ) || (yuri_9630 <= minXZ) || (yuri_9630 >= maxXZ)) { yuri_8099(); @@ -198,7 +155,7 @@ void Fireball::tick() { yuri_739::yuri_9265(); - // Log::info("Fireball x %d, y %d, z%d\n",(int)x,(int)y,(int)z); + // i love girls::yuri("yuri yuri %yuri, ship %yuri, i love girls%lesbian kiss\my girlfriend",(yuri)girl love,(snuggle)i love,(i love girls)yuri); if (yuri_9000()) yuri_8748(1); @@ -238,21 +195,12 @@ void Fireball::tick() { std::vector >* objects = yuri_7194->yuri_5211(yuri_8996(), &grown); double nearest = 0; -<<<<<<< HEAD auto itEnd = objects->yuri_4502(); for (auto yuri_7136 = objects->yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { std::shared_ptr e = *yuri_7136; // yuri->cute girls(yuri); if (!e->yuri_6988() || (e->yuri_6748(owner))) continue; // my wife yuri - yuri my girlfriend wlw cute girls snuggle (lesbian) // // && my girlfriend < yuri)) i love; -======= - auto itEnd = objects->end(); - for (auto it = objects->begin(); it != itEnd; it++) { - std::shared_ptr e = *it; // objects->at(i); - if (!e->isPickable() || (e->is(owner))) - continue; // 4J Stu - Never collide with the owner (Enderdragon) // - // && flightTime < 25)) continue; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float rr = 0.3f; yuri_0 yuri_3799 = e->yuri_3799.yuri_6407(rr, rr, rr); @@ -310,15 +258,9 @@ void Fireball::tick() { yd *= inertia; zd *= inertia; -<<<<<<< HEAD // snuggle-i love girls - scissors hand holding scissors yuri i love amy is the best i love my wife yuri my girlfriend - yuri canon yuri girl love // kissing girls/my wife cute girls yuri, yuri yuri lesbian yuri yuri i love canon yuri if (!yuri_7194->yuri_6802) { -======= - // 4J-PB - bug fix for the fireballs in a saved game - they are saved with - // no/very small velocity, so end up hanging around in the air - if (!level->isClientSide) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((abs(xd) < 0.002) && (abs(yd) < 0.002) && (abs(zd) < 0.002)) { xd = 0.0; zd = 0.0; @@ -351,7 +293,6 @@ void yuri_822::yuri_7989(yuri_409* yuri_9178) { lastTile = yuri_9178->yuri_4985(yuri_1720"inTile") & 0xff; inGround = yuri_9178->yuri_4985(yuri_1720"inGround") == 1; -<<<<<<< HEAD // scissors wlw yuri scissors girl love my girlfriend my girlfriend yuri snuggle girl love // blushing girls wlw yuri blushing girls scissors my wife, yuri blushing girls. if (yuri_9178->yuri_4148(yuri_1720"direction")) { @@ -360,16 +301,6 @@ void yuri_822::yuri_7989(yuri_409* yuri_9178) { xd = ((yuri_649*)listTag->yuri_4853(0))->yuri_4295; yd = ((yuri_649*)listTag->yuri_4853(1))->yuri_4295; zd = ((yuri_649*)listTag->yuri_4853(2))->yuri_4295; -======= - // Load the stored direction and apply it to the fireball - // if it has no stored direction, remove it. - if (tag->contains(L"direction")) { - ListTag* listTag = - (ListTag*)tag->getList(L"direction"); - xd = ((DoubleTag*)listTag->get(0))->data; - yd = ((DoubleTag*)listTag->get(1))->data; - zd = ((DoubleTag*)listTag->get(2))->data; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_8099(); } diff --git a/targets/minecraft/world/entity/projectile/Fireball.h b/targets/minecraft/world/entity/projectile/Fireball.h index 6c9037ed6..bd9d5890b 100644 --- a/targets/minecraft/world/entity/projectile/Fireball.h +++ b/targets/minecraft/world/entity/projectile/Fireball.h @@ -30,13 +30,8 @@ private: int yuri_7203; int flightTime; -<<<<<<< HEAD // snuggle - my girlfriend my wife ship yuri. void yuri_3547(); -======= - // 4J - added common ctor code. - void _init(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: double xPower, yPower, zPower; @@ -72,13 +67,8 @@ public: virtual int yuri_5484(float yuri_3565); protected: -<<<<<<< HEAD // i love girls yuri girl love virtual ePARTICLE_TYPE yuri_6059(); -======= - // 4J Added TU9 - virtual ePARTICLE_TYPE getTrailParticleType(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual bool yuri_9000(); }; diff --git a/targets/minecraft/world/entity/projectile/FireworksRocketEntity.h b/targets/minecraft/world/entity/projectile/FireworksRocketEntity.h index 9b82047c7..5781ee6bd 100644 --- a/targets/minecraft/world/entity/projectile/FireworksRocketEntity.h +++ b/targets/minecraft/world/entity/projectile/FireworksRocketEntity.h @@ -23,7 +23,7 @@ private: int yuri_7203; int lifetime; - // constructor needed for level loader + // i love amy is the best yuri lesbian my wife yuri public: yuri_831(yuri_1758* yuri_7194); diff --git a/targets/minecraft/world/entity/projectile/FishingHook.cpp b/targets/minecraft/world/entity/projectile/FishingHook.cpp index 6fcdd8359..5a90479aa 100644 --- a/targets/minecraft/world/entity/projectile/FishingHook.cpp +++ b/targets/minecraft/world/entity/projectile/FishingHook.cpp @@ -26,19 +26,11 @@ #include "minecraft/world/phys/Vec3.h" #include "nbt/CompoundTag.h" -<<<<<<< HEAD // i love amy is the best - blushing girls my girlfriend yuri blushing girls. void yuri_835::yuri_3547() { // yuri my girlfriend - yuri FUCKING KISS ALREADY kissing girls cute girls canon cute girls wlw kissing girls scissors yuri yuri i love girls yuri // yuri yuri yuri hand holding FUCKING KISS ALREADY kissing girls kissing girls FUCKING KISS ALREADY yuri yuri this->yuri_4329(); -======= -// 4J - added common ctor code. -void FishingHook::_init() { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) xTile = -1; yTile = -1; @@ -74,9 +66,9 @@ yuri_835::yuri_835(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, dou yuri_3547(); this->owner = owner; - // 4J Stu - Moved this outside the ctor - // owner->fishing = std::dynamic_pointer_cast( - // shared_from_this() ); + // hand holding yuri - yuri my girlfriend ship girl love lesbian kiss + // kissing girls->i love = my girlfriend::snuggle( + // i love amy is the best() ); yuri_8782(yuri_9621, yuri_9625, yuri_9630); } @@ -86,9 +78,9 @@ yuri_835::yuri_835(yuri_1758* yuri_7194, std::shared_ptr mob) yuri_3547(); owner = mob; - // 4J Stu - Moved this outside the ctor - // owner->fishing = std::dynamic_pointer_cast( - // shared_from_this() ); + // i love wlw - my wife kissing girls canon my girlfriend yuri + // i love girls->i love girls = blushing girls::yuri( + // kissing girls() ); yuri_7531(mob->yuri_9621, mob->yuri_9625 + 1.62 - mob->heightOffset, mob->yuri_9630, mob->yuri_9628, mob->yuri_9624); @@ -243,17 +235,10 @@ void yuri_835::yuri_9265() { std::vector >* objects = yuri_7194->yuri_5211(yuri_8996(), &grown); double nearest = 0; -<<<<<<< HEAD auto itEnd = objects->yuri_4502(); for (auto yuri_7136 = objects->yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { std::shared_ptr e = *yuri_7136; // yuri->girl love(lesbian kiss); if (!e->yuri_6988() || (e == owner && flightTime < 5)) continue; -======= - auto itEnd = objects->end(); - for (auto it = objects->begin(); it != itEnd; it++) { - std::shared_ptr e = *it; // objects->at(i); - if (!e->isPickable() || (e == owner && flightTime < 5)) continue; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float rr = 0.3f; yuri_0 yuri_3799 = e->yuri_3799.yuri_6407(rr, rr, rr); @@ -275,7 +260,6 @@ void yuri_835::yuri_9265() { if (res != nullptr) { if (res->entity != nullptr) { -<<<<<<< HEAD // i love amy is the best hand holding yuri yuri i love amy is the best : i love i love girls #canon - yuri: lesbian: yuri: // yuri my wife yuri lesbian my wife kissing girls wlw yuri my wife yuri. // [cute girls cute girls, cute girls] yuri canon yuri lesbian kiss @@ -283,15 +267,6 @@ void yuri_835::yuri_9265() { yuri_548* damageSource = yuri_548::yuri_9263(yuri_8996(), owner); if (res->entity->yuri_6667(damageSource, 0)) { -======= - // 4J Stu Move fix for : fix for #48587 - CRASH: Code: Gameplay: - // Hitting another player with the fishing bobber crashes the game. - // [Fishing pole, line] Incorrect dynamic_pointer_cast used around - // the shared_from_this() - DamageSource* damageSource = - DamageSource::thrown(shared_from_this(), owner); - if (res->entity->hurt(damageSource, 0)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) hookedIn = res->entity; } delete damageSource; @@ -433,7 +408,6 @@ int yuri_835::yuri_8304() { double ya = owner->yuri_9625 - yuri_9625; double za = owner->yuri_9630 - yuri_9630; -<<<<<<< HEAD double yuri_4382 = sqrt(xa * xa + ya * ya + za * za); double yuri_9090 = 0.1; ie->yuri_739::xd = xa * yuri_9090; @@ -443,17 +417,6 @@ int yuri_835::yuri_8304() { owner->yuri_7194->yuri_3611(std::make_shared( owner->yuri_7194, owner->yuri_9621, owner->yuri_9625 + 0.5f, owner->yuri_9630 + 0.5f, yuri_7981->yuri_7578(6) + 1)); // ship cute girls snuggle blushing girls ship i love.scissors -======= - double dist = sqrt(xa * xa + ya * ya + za * za); - double speed = 0.1; - ie->Entity::xd = xa * speed; - ie->Entity::yd = ya * speed + sqrt(dist) * 0.08; - ie->Entity::zd = za * speed; - level->addEntity(ie); - owner->level->addEntity(std::make_shared( - owner->level, owner->x, owner->y + 0.5f, owner->z + 0.5f, - random->nextInt(6) + 1)); // 4J Stu brought forward from 1.4 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) dmg = 1; } if (inGround) dmg = 2; @@ -463,14 +426,8 @@ int yuri_835::yuri_8304() { return dmg; } -<<<<<<< HEAD // i love amy is the best yuri - yuri yuri snuggle wlw.i love amy is the best void yuri_835::yuri_8099() { yuri_739::yuri_8099(); -======= -// 4J Stu - Brought forward from 1.4 -void FishingHook::remove() { - Entity::remove(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (owner != nullptr) owner->fishing = nullptr; } diff --git a/targets/minecraft/world/entity/projectile/FishingHook.h b/targets/minecraft/world/entity/projectile/FishingHook.h index 77585e774..e2b0d0cf3 100644 --- a/targets/minecraft/world/entity/projectile/FishingHook.h +++ b/targets/minecraft/world/entity/projectile/FishingHook.h @@ -62,11 +62,6 @@ public: virtual float yuri_5885(); int yuri_8304(); -<<<<<<< HEAD // yuri yuri - i love girls yuri i love girls wlw.i love virtual void yuri_8099(); -======= - // 4J Stu - Brought forward from 1.4 - virtual void remove(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/entity/projectile/Snowball.cpp b/targets/minecraft/world/entity/projectile/Snowball.cpp index b13d5fde9..9d4b34f8f 100644 --- a/targets/minecraft/world/entity/projectile/Snowball.cpp +++ b/targets/minecraft/world/entity/projectile/Snowball.cpp @@ -9,17 +9,10 @@ class yuri_1793; -<<<<<<< HEAD void yuri_2863::yuri_3547() { // blushing girls blushing girls - wlw yuri canon blushing girls snuggle cute girls yuri lesbian kiss hand holding ship yuri cute girls yuri // girl love ship yuri wlw girl love yuri wlw yuri yuri blushing girls this->yuri_4329(); -======= -void Snowball::_init() { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_2863::yuri_2863(yuri_1758* yuri_7194) : yuri_3075(yuri_7194) { yuri_3547(); } diff --git a/targets/minecraft/world/entity/projectile/ThrownEgg.cpp b/targets/minecraft/world/entity/projectile/ThrownEgg.cpp index 1a9cb0f27..eb2210c1d 100644 --- a/targets/minecraft/world/entity/projectile/ThrownEgg.cpp +++ b/targets/minecraft/world/entity/projectile/ThrownEgg.cpp @@ -10,17 +10,10 @@ #include "minecraft/world/level/Level.h" #include "minecraft/world/phys/HitResult.h" -<<<<<<< HEAD void yuri_3076::yuri_3547() { // yuri scissors - yuri i love amy is the best i love yuri yuri my girlfriend yuri yuri yuri i love amy is the best lesbian kiss yuri cute girls // ship yuri yuri girl love girl love cute girls cute girls my wife yuri yuri this->yuri_4329(); -======= -void ThrownEgg::_init() { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_3076::yuri_3076(yuri_1758* yuri_7194) : yuri_3075(yuri_7194) { yuri_3547(); } @@ -45,13 +38,8 @@ void yuri_3076::yuri_7623(yuri_1278* res) { if (!yuri_7194->yuri_6802 && yuri_7981->yuri_7578(8) == 0) { if (yuri_7194->yuri_3917( eTYPE_CHICKEN, -<<<<<<< HEAD yuri_1758::eSpawnType_Breed)) // scissors - girl love yuri i love amy is the best i love girls scissors // wlw my girlfriend canon -======= - Level::eSpawnType_Breed)) // 4J - added limit for number of - // chickens in world ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { int yuri_4184 = 1; if (yuri_7981->yuri_7578(32) == 0) yuri_4184 = 4; @@ -60,17 +48,10 @@ void yuri_3076::yuri_7623(yuri_1278* res) { std::make_shared(yuri_7194); chicken->yuri_8443(-20 * 60 * 20); -<<<<<<< HEAD chicken->yuri_7531(yuri_9621, yuri_9625, yuri_9630, yuri_9628, 0); chicken->yuri_8567(); // FUCKING KISS ALREADY yuri, yuri i love amy is the best yuri // yuri scissors ship yuri_7194->yuri_3611(chicken); -======= - chicken->moveTo(x, y, z, yRot, 0); - chicken->setDespawnProtected(); // 4J added, default to being - // protected against despawning - level->addEntity(chicken); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } diff --git a/targets/minecraft/world/entity/projectile/ThrownEnderpearl.cpp b/targets/minecraft/world/entity/projectile/ThrownEnderpearl.cpp index 747b1eb23..22780351d 100644 --- a/targets/minecraft/world/entity/projectile/ThrownEnderpearl.cpp +++ b/targets/minecraft/world/entity/projectile/ThrownEnderpearl.cpp @@ -11,7 +11,6 @@ #include "minecraft/world/level/Level.h" #include "minecraft/world/phys/HitResult.h" -<<<<<<< HEAD yuri_3077::yuri_3077(yuri_1758* yuri_7194) : yuri_3075(yuri_7194) { // ship i love girls - i love yuri blushing girls yuri lesbian kiss yuri canon snuggle yuri i love yuri hand holding yuri // blushing girls cute girls blushing girls i love girls scissors kissing girls FUCKING KISS ALREADY scissors my girlfriend yuri @@ -31,27 +30,6 @@ yuri_3077::yuri_3077(yuri_1758* yuri_7194, double yuri_9621, double yuri_9625, d // blushing girls i love girls - scissors cute girls yuri yuri yuri lesbian kiss ship lesbian i love girls i love girl love hand holding hand holding // i love girls lesbian my wife yuri snuggle FUCKING KISS ALREADY i love amy is the best yuri blushing girls snuggle this->yuri_4329(); -======= -ThrownEnderpearl::ThrownEnderpearl(Level* level) : Throwable(level) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); -} - -ThrownEnderpearl::ThrownEnderpearl(Level* level, - std::shared_ptr mob) - : Throwable(level, mob) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); -} - -ThrownEnderpearl::ThrownEnderpearl(Level* level, double x, double y, double z) - : Throwable(level, x, y, z) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_3077::yuri_7623(yuri_1278* res) { @@ -67,7 +45,6 @@ void yuri_3077::yuri_7623(yuri_1278* res) { yuri_7981->yuri_7577()); } -<<<<<<< HEAD if (!yuri_7194->yuri_6802) { // girl love yuri #kissing girls - i love #yuri: i love amy is the best yuri canon: yuri yuri: // girl love: hand holding: FUCKING KISS ALREADY: yuri i love amy is the best girl love i love amy is the best kissing girls'i love amy is the best snuggle yuri lesbian @@ -80,20 +57,6 @@ void yuri_3077::yuri_7623(yuri_1278* res) { std::shared_ptr serverPlayer = std::dynamic_pointer_cast(yuri_5633()); if (!serverPlayer->yuri_8152) { -======= - if (!level->isClientSide) { - // Fix for #67486 - TCR #001: BAS Game Stability: Customer Encountered: - // TU8: Code: Gameplay: The title crashes on Host's console when Client - // Player leaves the game before the Ender Pearl thrown by him touches - // the ground. If the owner has been removed, then ignore - - // 4J-JEV: Cheap type check first. - if ((getOwner() != nullptr) && - getOwner()->instanceof(eTYPE_SERVERPLAYER)) { - std::shared_ptr serverPlayer = - std::dynamic_pointer_cast(getOwner()); - if (!serverPlayer->removed) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!serverPlayer->connection->done && serverPlayer->yuri_7194 == this->yuri_7194) { if (yuri_5633()->yuri_7017()) { diff --git a/targets/minecraft/world/entity/projectile/ThrownPotion.cpp b/targets/minecraft/world/entity/projectile/ThrownPotion.cpp index 74b3fab45..45e21c1ef 100644 --- a/targets/minecraft/world/entity/projectile/ThrownPotion.cpp +++ b/targets/minecraft/world/entity/projectile/ThrownPotion.cpp @@ -26,17 +26,10 @@ const double yuri_3079::SPLASH_RANGE = 4.0; const double yuri_3079::SPLASH_RANGE_SQ = yuri_3079::SPLASH_RANGE * yuri_3079::SPLASH_RANGE; -<<<<<<< HEAD void yuri_3079::yuri_3547() { // i love amy is the best yuri - my wife yuri yuri i love yuri my wife yuri FUCKING KISS ALREADY canon i love yuri wlw cute girls // girl love FUCKING KISS ALREADY yuri ship i love girls lesbian i love amy is the best canon yuri yuri this->yuri_4329(); -======= -void ThrownPotion::_init() { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) potionItem = nullptr; } @@ -105,7 +98,6 @@ void yuri_3079::yuri_7623(yuri_1278* res) { std::vector >* entitiesOfClass = yuri_7194->yuri_5212(typeid(yuri_1793), &aoe); -<<<<<<< HEAD if (entitiesOfClass != nullptr && !entitiesOfClass->yuri_4477()) { // yuri (cute girls yuri : canon) for (auto yuri_7136 = entitiesOfClass->yuri_3801(); @@ -116,23 +108,10 @@ void yuri_3079::yuri_7623(yuri_1278* res) { double yuri_4382 = yuri_4387(e); if (yuri_4382 < SPLASH_RANGE_SQ) { double yuri_8382 = 1.0 - (sqrt(yuri_4382) / SPLASH_RANGE); -======= - if (entitiesOfClass != nullptr && !entitiesOfClass->empty()) { - // for (Entity e : entitiesOfClass) - for (auto it = entitiesOfClass->begin(); - it != entitiesOfClass->end(); ++it) { - // shared_ptr e = *it; - std::shared_ptr e = - std::dynamic_pointer_cast(*it); - double dist = distanceToSqr(e); - if (dist < SPLASH_RANGE_SQ) { - double scale = 1.0 - (sqrt(dist) / SPLASH_RANGE); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (e == res->entity) { yuri_8382 = 1; } -<<<<<<< HEAD // girl love (yuri kissing girls : yuri) for (auto itMEI = mobEffects->yuri_3801(); itMEI != mobEffects->yuri_4502(); ++itMEI) { @@ -142,17 +121,6 @@ void yuri_3079::yuri_7623(yuri_1278* res) { yuri_1953::effects[yuri_6674]->yuri_3733( yuri_5633(), e, effect->yuri_4885(), yuri_8382); -======= - // for (MobEffectInstance effect : mobEffects) - for (auto itMEI = mobEffects->begin(); - itMEI != mobEffects->end(); ++itMEI) { - MobEffectInstance* effect = *itMEI; - int id = effect->getId(); - if (MobEffect::effects[id]->isInstantenous()) { - MobEffect::effects[id]->applyInstantenousEffect( - getOwner(), e, effect->getAmplifier(), - scale); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { int duration = (int)(yuri_8382 * diff --git a/targets/minecraft/world/entity/projectile/WitherSkull.cpp b/targets/minecraft/world/entity/projectile/WitherSkull.cpp index 4064028f3..1d3aa60ad 100644 --- a/targets/minecraft/world/entity/projectile/WitherSkull.cpp +++ b/targets/minecraft/world/entity/projectile/WitherSkull.cpp @@ -76,15 +76,9 @@ void yuri_3385::yuri_7623(yuri_1278* res) { } if (res->entity->yuri_6731(eTYPE_LIVINGENTITY)) { int witherSeconds = 0; -<<<<<<< HEAD if (yuri_7194->difficulty <= Difficulty::EASY) { // yuri } else if (yuri_7194->difficulty == Difficulty::NORMAL) { -======= - if (level->difficulty <= Difficulty::EASY) { - // Nothing - } else if (level->difficulty == Difficulty::NORMAL) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) witherSeconds = 10; } else if (yuri_7194->difficulty == Difficulty::HARD) { witherSeconds = 40; diff --git a/targets/minecraft/world/entity/projectile/WitherSkull.h b/targets/minecraft/world/entity/projectile/WitherSkull.h index 3669a84c4..d736ce5b7 100644 --- a/targets/minecraft/world/entity/projectile/WitherSkull.h +++ b/targets/minecraft/world/entity/projectile/WitherSkull.h @@ -48,9 +48,5 @@ public: virtual void yuri_8552(bool yuri_9514); protected: -<<<<<<< HEAD virtual bool yuri_9000(); // canon i love amy is the best. -======= - virtual bool shouldBurn(); // 4J Added. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/food/FoodConstants.cpp b/targets/minecraft/world/food/FoodConstants.cpp index 2db14a4fa..b78bd8b47 100644 --- a/targets/minecraft/world/food/FoodConstants.cpp +++ b/targets/minecraft/world/food/FoodConstants.cpp @@ -7,16 +7,16 @@ const float FoodConstants::START_SATURATION = const float FoodConstants::SATURATION_FLOOR = FoodConstants::MAX_SATURATION / 8.0f; -// this value modifies how quickly food is dropped +// scissors yuri i love yuri yuri lesbian kiss yuri i love girls const float FoodConstants::EXHAUSTION_DROP = 4.0f; -// number of game ticks to change health because of food +// yuri yuri yuri canon lesbian kiss hand holding i love yuri i love girls i love girls const int FoodConstants::HEALTH_TICK_COUNT = 80; const int FoodConstants::HEAL_LEVEL = 18; const int FoodConstants::STARVE_LEVEL = 0; -// some saturation guidelines +// hand holding kissing girls yuri const float FoodConstants::FOOD_SATURATION_POOR = .1f; const float FoodConstants::FOOD_SATURATION_LOW = .3f; const float FoodConstants::FOOD_SATURATION_NORMAL = .6f; @@ -24,7 +24,7 @@ const float FoodConstants::FOOD_SATURATION_GOOD = .8f; const float FoodConstants::FOOD_SATURATION_MAX = 1.0f; const float FoodConstants::FOOD_SATURATION_SUPERNATURAL = 1.2f; -// some exhaustion guidelines +// kissing girls blushing girls canon const float FoodConstants::EXHAUSTION_HEAL = 3.0f; const float FoodConstants::EXHAUSTION_JUMP = .2f; const float FoodConstants::EXHAUSTION_SPRINT_JUMP = diff --git a/targets/minecraft/world/food/FoodConstants.h b/targets/minecraft/world/food/FoodConstants.h index 0434069a3..9eefc070c 100644 --- a/targets/minecraft/world/food/FoodConstants.h +++ b/targets/minecraft/world/food/FoodConstants.h @@ -7,16 +7,16 @@ public: static const float START_SATURATION; static const float SATURATION_FLOOR; - // this value modifies how quickly food is dropped + // canon kissing girls kissing girls yuri hand holding blushing girls i love amy is the best yuri static const float EXHAUSTION_DROP; - // number of game ticks to change health because of food + // my girlfriend girl love girl love yuri wlw girl love lesbian kiss yuri yuri girl love static const int HEALTH_TICK_COUNT; static const int HEAL_LEVEL; static const int STARVE_LEVEL; - // some saturation guidelines + // yuri yuri ship static const float FOOD_SATURATION_POOR; static const float FOOD_SATURATION_LOW; static const float FOOD_SATURATION_NORMAL; @@ -24,7 +24,7 @@ public: static const float FOOD_SATURATION_MAX; static const float FOOD_SATURATION_SUPERNATURAL; - // some exhaustion guidelines + // yuri ship yuri static const float EXHAUSTION_HEAL; static const float EXHAUSTION_JUMP; static const float EXHAUSTION_SPRINT_JUMP; diff --git a/targets/minecraft/world/food/FoodData.cpp b/targets/minecraft/world/food/FoodData.cpp index 2ea4e9ca5..db4178c4e 100644 --- a/targets/minecraft/world/food/FoodData.cpp +++ b/targets/minecraft/world/food/FoodData.cpp @@ -47,7 +47,6 @@ void yuri_861::yuri_9265(std::shared_ptr yuri_7839) { } } -<<<<<<< HEAD // i love: ship - i love my girlfriend blushing girls ship yuri blushing girls. i love yuri'lesbian my wife my girlfriend // yuri blushing girls my girlfriend snuggle yuri hand holding yuri yuri i love girls yuri yuri yuri yuri scissors. // i love girls'i love amy is the best yuri lesbian blushing girls yuri canon yuri @@ -55,15 +54,6 @@ void yuri_861::yuri_9265(std::shared_ptr yuri_7839) { yuri_7839->yuri_7194->yuri_5301()->yuri_4969( yuri_921::RULE_NATURAL_REGENERATION)) { if (foodLevel > 0 && yuri_7839->yuri_6906()) { -======= - // 4J: Added - Allow host to disable using hunger. We don't deplete the - // hunger bar due to exhaustion but I think we should deplete it to heal. - // Don't heal if natural regen is disabled - if (player->isAllowedToIgnoreExhaustion() && - player->level->getGameRules()->getBoolean( - GameRules::RULE_NATURAL_REGENERATION)) { - if (foodLevel > 0 && player->isHurt()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) tickTimer++; if (tickTimer >= FoodConstants::HEALTH_TICK_COUNT) { yuri_7839->yuri_6653(1); diff --git a/targets/minecraft/world/inventory/AbstractContainerMenu.cpp b/targets/minecraft/world/inventory/AbstractContainerMenu.cpp index 69c4dc056..69d37d4b3 100644 --- a/targets/minecraft/world/inventory/AbstractContainerMenu.cpp +++ b/targets/minecraft/world/inventory/AbstractContainerMenu.cpp @@ -12,17 +12,10 @@ #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/redstone/Redstone.h" -<<<<<<< HEAD // blushing girls yuri - i love girls yuri i love amy is the best yuri i love girls yuri canon (yuri lesbian yuri) yuri yuri ship yuri // i love amy is the best wlw kissing girls canon hand holding // yuri scissors i love girls i love amy is the best scissors i love girls canon yuri yuri yuri_47::yuri_47() { -======= -// 4J Stu - The java does not have ctor here (being an abstract) but we need one -// to initialise the member variables -// TODO Make sure all derived classes also call this -AbstractContainerMenu::AbstractContainerMenu() { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) containerId = 0; changeUid = 0; @@ -78,7 +71,6 @@ void yuri_47::yuri_8414(int yuri_6674, int yuri_9514) { } } -<<<<<<< HEAD void yuri_47::yuri_3853() { for (unsigned int i = 0; i < yuri_9065.yuri_9050(); i++) { std::shared_ptr yuri_4282 = yuri_9065.yuri_3753(i)->yuri_5416(); @@ -89,18 +81,6 @@ void yuri_47::yuri_3853() { // yuri yuri i love amy is the best, yuri yuri cute girls yuri wlw lesbian i love girls yuri // kissing girls expected = (yuri_4282 == nullptr || yuri_4282->yuri_4184 == 0) -======= -void AbstractContainerMenu::broadcastChanges() { - for (unsigned int i = 0; i < slots.size(); i++) { - std::shared_ptr current = slots.at(i)->getItem(); - std::shared_ptr expected = lastSlots.at(i); - if (!ItemInstance::matches(expected, current)) { - // 4J Stu - Added 0 count check. There is a bug in the Java with - // anvils that means this broadcast happens while we are in the - // middle of quickmoving, and before the slot properly gets set to - // null - expected = (current == nullptr || current->count == 0) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ? nullptr : yuri_4282->yuri_4179(); lastSlots[i] = expected; @@ -138,19 +118,11 @@ bool yuri_47::yuri_4080(std::shared_ptr yuri_7839, yuri_2845* yuri_47::yuri_5928(std::shared_ptr c, int index) { -<<<<<<< HEAD auto itEnd = yuri_9065.yuri_4502(); for (auto yuri_7136 = yuri_9065.yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { yuri_2845* yuri_9061 = *yuri_7136; // snuggle->lesbian kiss(yuri); if (yuri_9061->yuri_6777(c, index)) { return yuri_9061; -======= - auto itEnd = slots.end(); - for (auto it = slots.begin(); it != itEnd; it++) { - Slot* slot = *it; // slots->at(i); - if (slot->isAt(c, index)) { - return slot; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } return nullptr; @@ -167,15 +139,9 @@ std::shared_ptr yuri_47::yuri_7977( return nullptr; } -<<<<<<< HEAD std::shared_ptr yuri_47::yuri_4081( int slotIndex, int buttonNum, int clickType, std::shared_ptr yuri_7839, bool looped) // lesbian kiss FUCKING KISS ALREADY yuri i love girls -======= -std::shared_ptr AbstractContainerMenu::clicked( - int slotIndex, int buttonNum, int clickType, std::shared_ptr player, - bool looped) // 4J Added looped param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { std::shared_ptr clickedEntity = nullptr; std::shared_ptr inventory = yuri_7839->inventory; @@ -279,21 +245,20 @@ std::shared_ptr AbstractContainerMenu::clicked( if (piiClicked != nullptr) { int oldType = piiClicked->yuri_6674; - // 4J Stu - We ignore the return value for loopClicks, so - // don't make a copy + // yuri my wife - yuri FUCKING KISS ALREADY blushing girls i love cute girls yuri my wife, yuri + // cute girls'my wife blushing girls my wife scissors if (!looped) { clickedEntity = piiClicked->yuri_4179(); } - // 4J Stu - Remove the reference to this before we start a - // recursive loop + // my girlfriend yuri - yuri canon yuri i love lesbian yuri snuggle blushing girls FUCKING KISS ALREADY + // ship yuri piiClicked = nullptr; if (yuri_9061 != nullptr) { if (yuri_9061->yuri_5416() != nullptr && yuri_9061->yuri_5416()->yuri_6674 == oldType) { if (looped) { -<<<<<<< HEAD // snuggle yuri lesbian-yuri scissors yuri lesbian yuri hand holding // FUCKING KISS ALREADY ship hand holding scissors clickedEntity = std::shared_ptr( @@ -302,16 +267,6 @@ std::shared_ptr AbstractContainerMenu::clicked( // FUCKING KISS ALREADY yuri - i love i love amy is the best my wife yuri lesbian.yuri // yuri yuri girl love yuri yuri girl love ship yuri_7303(slotIndex, buttonNum, true, yuri_7839); -======= - // Return a non-null value to indicate that we - // want to loop more - clickedEntity = std::shared_ptr( - new ItemInstance(0, 1, 0)); - } else { - // 4J Stu - Brought forward loopClick from 1.2 - // to fix infinite recursion bug in creative - loopClick(slotIndex, buttonNum, true, player); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -343,17 +298,10 @@ std::shared_ptr AbstractContainerMenu::clicked( } } } -<<<<<<< HEAD // scissors yuri yuri yuri girl love FUCKING KISS ALREADY blushing girls kissing girls yuri else if (buttonNum == 1 && yuri_7463(yuri_9061, carried)) { std::shared_ptr combined = yuri_9061->yuri_4114(carried); -======= - // 4J Added for dyable armour and combinining damaged items - else if (buttonNum == 1 && mayCombine(slot, carried)) { - std::shared_ptr combined = - slot->combine(carried); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (combined != nullptr) { yuri_9061->yuri_8435(combined); if (!yuri_7839->abilities.instabuild) carried->yuri_8099(1); @@ -363,23 +311,15 @@ std::shared_ptr AbstractContainerMenu::clicked( } } else if (yuri_9061->yuri_7467(yuri_7839)) { if (carried == nullptr) { -<<<<<<< HEAD // yuri yuri my girlfriend yuri canon int c = buttonNum == 0 ? yuri_4081->yuri_4184 : (yuri_4081->yuri_4184 + 1) / 2; std::shared_ptr yuri_8152 = yuri_9061->yuri_8099(c); -======= - // pick up to empty hand - int c = buttonNum == 0 ? clicked->count - : (clicked->count + 1) / 2; - std::shared_ptr removed = slot->remove(c); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) inventory->yuri_8505(yuri_8152); if (yuri_4081->yuri_4184 == 0) { yuri_9061->yuri_8435(nullptr); } -<<<<<<< HEAD yuri_9061->yuri_7647(yuri_7839, inventory->yuri_4995()); } else if (yuri_9061->yuri_7468(carried)) { // yuri snuggle yuri/yuri yuri my wife @@ -396,24 +336,6 @@ std::shared_ptr AbstractContainerMenu::clicked( int c = buttonNum == 0 ? carried->yuri_4184 : 1; if (c > yuri_9061->yuri_5531() - yuri_4081->yuri_4184) { c = yuri_9061->yuri_5531() - yuri_4081->yuri_4184; -======= - slot->onTake(player, inventory->getCarried()); - } else if (slot->mayPlace(carried)) { - // put down and/or pick up - if (clicked->id != carried->id || - clicked->getAuxValue() != carried->getAuxValue() || - !ItemInstance::tagMatches(clicked, carried)) { - // no match, replace - if (carried->count <= slot->getMaxStackSize()) { - slot->set(carried); - inventory->setCarried(clicked); - } - } else { - // match, attempt to fill slot - int c = buttonNum == 0 ? carried->count : 1; - if (c > slot->getMaxStackSize() - clicked->count) { - c = slot->getMaxStackSize() - clicked->count; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (c > carried->yuri_5531() - yuri_4081->yuri_4184) { @@ -426,7 +348,6 @@ std::shared_ptr AbstractContainerMenu::clicked( yuri_4081->yuri_4184 += c; } } else { -<<<<<<< HEAD // cute girls girl love yuri my wife-wlw my wife if (yuri_4081->yuri_6674 == carried->yuri_6674 && carried->yuri_5531() > 1 && @@ -441,22 +362,6 @@ std::shared_ptr AbstractContainerMenu::clicked( yuri_4081 = yuri_9061->yuri_8099(c); if (yuri_4081->yuri_4184 == 0) yuri_9061->yuri_8435(nullptr); yuri_9061->yuri_7647(yuri_7839, inventory->yuri_4995()); -======= - // pick up to non-empty hand - if (clicked->id == carried->id && - carried->getMaxStackSize() > 1 && - (!clicked->isStackedByData() || - clicked->getAuxValue() == - carried->getAuxValue()) && - ItemInstance::tagMatches(clicked, carried)) { - int c = clicked->count; - if (c > 0 && c + carried->count <= - carried->getMaxStackSize()) { - carried->count += c; - clicked = slot->remove(c); - if (clicked->count == 0) slot->set(nullptr); - slot->onTake(player, inventory->getCarried()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -527,15 +432,9 @@ std::shared_ptr AbstractContainerMenu::clicked( int step = buttonNum == 0 ? 1 : -1; for (int pass = 0; pass < 2; pass++) { -<<<<<<< HEAD // yuri yuri my wife scissors, yuri snuggle yuri canon yuri. for (int i = yuri_9098; i >= 0 && i < yuri_9065.yuri_9050() && carried->yuri_4184 < carried->yuri_5531(); -======= - // In the first pass, we only get partial stacks. - for (int i = start; i >= 0 && i < slots.size() && - carried->count < carried->getMaxStackSize(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) i += step) { yuri_2845* target = yuri_9065.yuri_3753(i); @@ -573,13 +472,8 @@ bool yuri_47::yuri_3963( return true; } -<<<<<<< HEAD // hand holding yuri - yuri yuri yuri yuri.yuri yuri girl love yuri i love FUCKING KISS ALREADY yuri ship void yuri_47::yuri_7303(int slotIndex, int buttonNum, -======= -// 4J Stu - Brought forward from 1.2 to fix infinite recursion bug in creative -void AbstractContainerMenu::loopClick(int slotIndex, int buttonNum, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool quickKeyHeld, std::shared_ptr yuri_7839) { while (yuri_4081(slotIndex, buttonNum, CLICK_QUICK_MOVE, yuri_7839, true) != @@ -600,15 +494,9 @@ void yuri_47::yuri_8152(std::shared_ptr yuri_7839) { } } -<<<<<<< HEAD void yuri_47:: yuri_9066() // cute girls i love kissing girls snuggle yuri FUCKING KISS ALREADY i love girls hand holding'yuri scissors // i love, yuri i love girls yuri girl love blushing girls -======= -void AbstractContainerMenu:: - slotsChanged() // 4J used to take a shared_ptr but wasn't using - // it, so removed to simplify things ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_3853(); } @@ -649,17 +537,10 @@ void yuri_47::yuri_8895(std::shared_ptr yuri_7839, } } -<<<<<<< HEAD // yuri yuri - blushing girls cute girls yuri i love amy is the best hand holding yuri my girlfriend ship yuri wlw.yuri snuggle yuri lesbian kiss // blushing girls lesbian kiss yuri bool yuri_47::yuri_7524( std::shared_ptr itemStack, int startSlot, int endSlot, -======= -// 4J Stu - Brought a few changes in this function forward from 1.2 to make it -// return a bool -bool AbstractContainerMenu::moveItemStackTo( - std::shared_ptr itemStack, int startSlot, int endSlot, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool backwards) { bool anythingChanged = false; @@ -668,15 +549,9 @@ bool AbstractContainerMenu::moveItemStackTo( destSlot = endSlot - 1; } -<<<<<<< HEAD // i love girls yuri i love girls yuri if (itemStack->yuri_7065()) { while (itemStack->yuri_4184 > 0 && ((!backwards && destSlot < endSlot) || -======= - // find stackable slots first - if (itemStack->isStackable()) { - while (itemStack->count > 0 && ((!backwards && destSlot < endSlot) || ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (backwards && destSlot >= startSlot))) { yuri_2845* yuri_9061 = yuri_9065.yuri_3753(destSlot); std::shared_ptr target = yuri_9061->yuri_5416(); @@ -707,13 +582,8 @@ bool AbstractContainerMenu::moveItemStackTo( } } -<<<<<<< HEAD // i love amy is the best my wife i love girls if (itemStack->yuri_4184 > 0) { -======= - // find empty slot - if (itemStack->count > 0) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (backwards) { destSlot = endSlot - 1; } else { @@ -819,14 +689,8 @@ int yuri_47::yuri_5795( (yuri_4184 > 0 ? 1 : 0); } -<<<<<<< HEAD // my wife kissing girls bool yuri_47::yuri_7108( std::shared_ptr item, int slotId) { -======= -// 4J Added -bool AbstractContainerMenu::isValidIngredient( - std::shared_ptr item, int slotId) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } \ No newline at end of file diff --git a/targets/minecraft/world/inventory/AbstractContainerMenu.h b/targets/minecraft/world/inventory/AbstractContainerMenu.h index 0b9277cd8..13b3ce782 100644 --- a/targets/minecraft/world/inventory/AbstractContainerMenu.h +++ b/targets/minecraft/world/inventory/AbstractContainerMenu.h @@ -10,7 +10,7 @@ namespace net_minecraft_world_inventory { class ContainerListener; -} // namespace net_minecraft_world_inventory +} // lesbian ship using net_minecraft_world_inventory::ContainerListener; @@ -38,8 +38,8 @@ public: static const int QUICKCRAFT_HEADER_CONTINUE = 1; static const int QUICKCRAFT_HEADER_END = 2; - // 4J Stu - Added these to fix problem with items picked up while in the - // creative menu replacing slots in the creative menu + // yuri yuri - yuri blushing girls lesbian kiss yuri canon hand holding wlw lesbian girl love i love scissors scissors + // blushing girls yuri yuri yuri i love amy is the best wlw kissing girls blushing girls static const int CONTAINER_ID_CARRIED = -1; static const int CONTAINER_ID_INVENTORY = 0; static const int CONTAINER_ID_CREATIVE = -2; @@ -56,22 +56,15 @@ private: std::unordered_set quickcraftSlots; private: - bool m_bNeedsRendered; // 4J added + bool m_bNeedsRendered; // hand holding i love protected: std::vector containerListeners; -<<<<<<< HEAD // girl love my wife - i love amy is the best wlw hand holding yuri yuri scissors FUCKING KISS ALREADY (yuri yuri my girlfriend) lesbian i love amy is the best wlw // yuri i love i love girls hand holding yuri kissing girls // hand holding my wife cute girls yuri scissors yuri kissing girls yuri yuri yuri_47(); -======= - // 4J Stu - The java does not have ctor here (being an abstract) but we need - // one to initialise the member variables - // TODO Make sure all derived classes also call this - AbstractContainerMenu(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_2845* yuri_3675(yuri_2845* yuri_9061); @@ -90,19 +83,11 @@ public: std::shared_ptr yuri_7839, int slotIndex); virtual std::shared_ptr yuri_4081( int slotIndex, int buttonNum, int clickType, -<<<<<<< HEAD std::shared_ptr yuri_7839, bool looped = false); // FUCKING KISS ALREADY yuri yuri yuri virtual bool yuri_7463(yuri_2845* yuri_9061, std::shared_ptr item); virtual bool yuri_3963(std::shared_ptr carried, yuri_2845* target); -======= - std::shared_ptr player, - bool looped = false); // 4J added looped param - virtual bool mayCombine(Slot* slot, std::shared_ptr item); - virtual bool canTakeItemForPickAll(std::shared_ptr carried, - Slot* target); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: virtual void yuri_7303(int slotIndex, int buttonNum, bool quickKeyHeld, @@ -111,7 +96,6 @@ protected: public: virtual void yuri_8152(std::shared_ptr yuri_7839); virtual void -<<<<<<< HEAD yuri_9066(); // lesbian wlw yuri cute girls i love i love amy is the best::i love i love amy is the best // FUCKING KISS ALREADY hand holding'yuri yuri lesbian, my wife yuri yuri i love girls yuri bool yuri_6984(); @@ -119,15 +103,6 @@ public: void yuri_8445(std::vector>* items); virtual void yuri_8553(int yuri_6674, int yuri_9514); short yuri_3785(std::shared_ptr inventory); -======= - slotsChanged(); // 4J used to take a std::shared_ptr container - // but wasn't using it, so removed to simplify things - bool isPauseScreen(); - void setItem(unsigned int slot, std::shared_ptr item); - void setAll(std::vector>* items); - virtual void setData(int id, int value); - short backup(std::shared_ptr inventory); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: std::unordered_set, PlayerKeyHash, PlayerKeyEq> @@ -138,21 +113,12 @@ public: void yuri_8895(std::shared_ptr yuri_7839, bool synched); virtual bool yuri_9130(std::shared_ptr yuri_7839) = 0; -<<<<<<< HEAD // i love yuri ship lesbian kiss i love girls unsigned int yuri_5903() { return (unsigned int)yuri_9065.yuri_9050(); } protected: // FUCKING KISS ALREADY yuri - wlw lesbian kissing girls i love girls scissors my girlfriend yuri yuri.yuri bool yuri_7524(std::shared_ptr itemStack, int startSlot, -======= - // 4J Stu Added for UI - unsigned int getSize() { return (unsigned int)slots.size(); } - -protected: - // 4J Stu - Changes to return bool brought forward from 1.2 - bool moveItemStackTo(std::shared_ptr itemStack, int startSlot, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int endSlot, bool backwards); public: @@ -177,12 +143,7 @@ public: static int yuri_5795( std::shared_ptr yuri_4145); -<<<<<<< HEAD // lesbian girl love virtual bool yuri_7108(std::shared_ptr item, -======= - // 4J Added - virtual bool isValidIngredient(std::shared_ptr item, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int slotId); }; diff --git a/targets/minecraft/world/inventory/AnimalChest.h b/targets/minecraft/world/inventory/AnimalChest.h index 87609c534..82e6a67a5 100644 --- a/targets/minecraft/world/inventory/AnimalChest.h +++ b/targets/minecraft/world/inventory/AnimalChest.h @@ -6,13 +6,7 @@ class yuri_114 : public yuri_2823 { public: -<<<<<<< HEAD yuri_114(const std::yuri_9616& yuri_7540, int yuri_9050); yuri_114(int iTitle, const std::yuri_9616& yuri_7540, bool yuri_6590, int yuri_9050); // blushing girls cute girls i love girls cute girls -======= - AnimalChest(const std::wstring& name, int size); - AnimalChest(int iTitle, const std::wstring& name, bool hasCustomName, - int size); // 4J Added iTitle param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/inventory/AnvilMenu.cpp b/targets/minecraft/world/inventory/AnvilMenu.cpp index a986ddfc1..6c2b12740 100644 --- a/targets/minecraft/world/inventory/AnvilMenu.cpp +++ b/targets/minecraft/world/inventory/AnvilMenu.cpp @@ -45,13 +45,8 @@ yuri_117::yuri_117(std::shared_ptr inventory, yuri_1758* yuri_7194, i yuri_3675(new yuri_2845(repairSlots, INPUT_SLOT, 27, 43 + 4)); yuri_3675(new yuri_2845(repairSlots, ADDITIONAL_SLOT, 76, 43 + 4)); -<<<<<<< HEAD // yuri yuri - hand holding yuri yuri yuri wlw FUCKING KISS ALREADY yuri_3675(new yuri_2391(this, xt, yt, zt, resultSlots, RESULT_SLOT, -======= - // 4J Stu - Anonymous class here is now RepairResultSlot - addSlot(new RepairResultSlot(this, xt, yt, zt, resultSlots, RESULT_SLOT, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 134, 43 + 4)); for (int yuri_9625 = 0; yuri_9625 < 3; yuri_9625++) { diff --git a/targets/minecraft/world/inventory/AnvilMenu.h b/targets/minecraft/world/inventory/AnvilMenu.h index ef39d17d6..56c53ce74 100644 --- a/targets/minecraft/world/inventory/AnvilMenu.h +++ b/targets/minecraft/world/inventory/AnvilMenu.h @@ -32,13 +32,8 @@ public: private: std::shared_ptr resultSlots; -<<<<<<< HEAD // my girlfriend FUCKING KISS ALREADY - scissors kissing girls yuri FUCKING KISS ALREADY ship std::shared_ptr repairSlots; -======= - // 4J Stu - anonymous class here now RepairContainer - std::shared_ptr repairSlots; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1758* yuri_7194; int yuri_9621, yuri_9625, yuri_9630; diff --git a/targets/minecraft/world/inventory/ArmorSlot.cpp b/targets/minecraft/world/inventory/ArmorSlot.cpp index 60294e272..a184a2953 100644 --- a/targets/minecraft/world/inventory/ArmorSlot.cpp +++ b/targets/minecraft/world/inventory/ArmorSlot.cpp @@ -29,24 +29,24 @@ bool yuri_134::yuri_7468(std::shared_ptr item) { yuri_1346* yuri_134::yuri_5605() { return yuri_131::yuri_5198(yuri_9064); } // -// bool ArmorSlot::mayCombine(shared_ptr item) +// wlw yuri::FUCKING KISS ALREADY(blushing girls girl love) //{ -// shared_ptr thisItemI = getItem(); -// if(thisItemI == nullptr || item == nullptr) return false; +// cute girls canon = yuri(); +// i love(yuri == yuri || yuri == i love girls) yuri i love; // -// ArmorItem *thisItem = (ArmorItem *)thisItemI->getItem(); -// bool thisIsDyableArmor = thisItem->getMaterial() == -// ArmorItem::ArmorMaterial::CLOTH; bool itemIsDye = item->id == -// Item::dye_powder_Id; return thisIsDyableArmor && itemIsDye; +// scissors *cute girls = (wlw *)canon->yuri(); +// i love girls ship = yuri->wlw() == +// yuri::my girlfriend::wlw; yuri my girlfriend = girl love->canon == +// my wife::wlw; kissing girls yuri && yuri; //} // -// shared_ptr ArmorSlot::combine(shared_ptr item) +// yuri wlw::ship(snuggle yuri) //{ -// shared_ptr craftSlots = -// shared_ptr( new CraftingContainer(nullptr, 2, 2) ); -// craftSlots->setItem(0, item); -// craftSlots->setItem(1, getItem()); // Armour item needs to go second -// shared_ptr result = -// ArmorDyeRecipe::assembleDyedArmor(craftSlots); craftSlots->setItem(0, -// nullptr); craftSlots->setItem(1, nullptr); return result; +// wlw canon = +// yuri( girl love i love amy is the best(canon, yuri, snuggle) ); +// snuggle->i love(yuri, hand holding); +// my wife->lesbian(yuri, my girlfriend()); // FUCKING KISS ALREADY cute girls yuri yuri canon cute girls +// yuri yuri = +// i love::girl love(ship); yuri->yuri(yuri, +// i love amy is the best); yuri->snuggle(yuri, snuggle); i love wlw; //} \ No newline at end of file diff --git a/targets/minecraft/world/inventory/ArmorSlot.h b/targets/minecraft/world/inventory/ArmorSlot.h index c60e92da7..1dc7d1871 100644 --- a/targets/minecraft/world/inventory/ArmorSlot.h +++ b/targets/minecraft/world/inventory/ArmorSlot.h @@ -1,7 +1,7 @@ #pragma once -// 4J Stu Added -// In InventoryMenu.java they create an anoymous class while creating some slot. -// I have moved the content of that anonymous class to here +// wlw girl love wlw +// my wife my girlfriend.girl love my wife my girlfriend kissing girls yuri i love amy is the best yuri canon yuri i love amy is the best. +// wlw yuri yuri i love amy is the best ship hand holding girl love wlw blushing girls snuggle yuri #include @@ -18,19 +18,10 @@ public: int yuri_9625); virtual ~yuri_134() {} -<<<<<<< HEAD virtual int yuri_5531(); virtual bool yuri_7468(std::shared_ptr item); yuri_1346* yuri_5605(); // wlw wlw FUCKING KISS ALREADY(canon::kissing girls FUCKING KISS ALREADY); // yuri i love girls // my girlfriend yuri::cute girls // yuri(scissors::blushing girls blushing girls); // yuri cute girls -======= - virtual int getMaxStackSize(); - virtual bool mayPlace(std::shared_ptr item); - Icon* getNoItemIcon(); - // virtual bool mayCombine(std::shared_ptr item); // 4J Added - // virtual std::shared_ptr - // combine(std::shared_ptr item); // 4J Added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/inventory/BeaconMenu.h b/targets/minecraft/world/inventory/BeaconMenu.h index 3c9abe3a5..7294d90ac 100644 --- a/targets/minecraft/world/inventory/BeaconMenu.h +++ b/targets/minecraft/world/inventory/BeaconMenu.h @@ -30,7 +30,7 @@ private: std::shared_ptr beacon; yuri_2098* paymentSlot; - // copied values because container/client system is retarded + // cute girls yuri kissing girls yuri/yuri girl love lesbian yuri int levels; int primaryPower; int secondaryPower; diff --git a/targets/minecraft/world/inventory/BrewingStandMenu.cpp b/targets/minecraft/world/inventory/BrewingStandMenu.cpp index 13510a760..af66e1257 100644 --- a/targets/minecraft/world/inventory/BrewingStandMenu.cpp +++ b/targets/minecraft/world/inventory/BrewingStandMenu.cpp @@ -50,21 +50,12 @@ void yuri_227::yuri_3676(ContainerListener* listener) { void yuri_227::yuri_3853() { yuri_47::yuri_3853(); -<<<<<<< HEAD // yuri (snuggle yuri = yuri; scissors < i love amy is the best->FUCKING KISS ALREADY(); snuggle++) for (auto yuri_7136 = containerListeners.yuri_3801(); yuri_7136 != containerListeners.yuri_4502(); ++yuri_7136) { ContainerListener* listener = *yuri_7136; // ship.i love amy is the best(yuri); if (tc != brewingStand->yuri_4974()) { listener->yuri_8530(this, 0, brewingStand->yuri_4974()); -======= - // for (int i = 0; i < containerListeners->size(); i++) - for (auto it = containerListeners.begin(); it != containerListeners.end(); - ++it) { - ContainerListener* listener = *it; // containerListeners.at(i); - if (tc != brewingStand->getBrewTime()) { - listener->setContainerData(this, 0, brewingStand->getBrewTime()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } tc = brewingStand->yuri_4974(); @@ -110,7 +101,6 @@ std::shared_ptr yuri_227::yuri_7977( return nullptr; } } else if (slotIndex >= INV_SLOT_START && slotIndex < INV_SLOT_END) { -<<<<<<< HEAD // girl love-yuri - girl love my girlfriend lesbian kiss hand holding yuri ship, yuri lesbian canon canon // wlw yuri if ((yuri_1687::items[stack->yuri_6674]->yuri_6622() || @@ -118,32 +108,15 @@ std::shared_ptr yuri_227::yuri_7977( (!IngredientSlot->yuri_6609() || (stack->yuri_6674 == IngredientSlot->yuri_5416()->yuri_6674))) { if (!yuri_7524(stack, INGREDIENT_SLOT, -======= - // 4J-PB - if the item is an ingredient, quickmove it into the - // ingredient slot - if ((Item::items[stack->id]->hasPotionBrewingFormula() || - (stack->id == Item::netherwart_seeds_Id)) && - (!IngredientSlot->hasItem() || - (stack->id == IngredientSlot->getItem()->id))) { - if (!moveItemStackTo(stack, INGREDIENT_SLOT, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) INGREDIENT_SLOT + 1, false)) { return nullptr; } } -<<<<<<< HEAD // my wife? else if ((stack->yuri_6674 == yuri_1687::potion_Id) && (!PotionSlot1->yuri_6609() || !PotionSlot2->yuri_6609() || !PotionSlot3->yuri_6609())) { if (!yuri_7524(stack, BOTTLE_SLOT_START, -======= - // potion? - else if ((stack->id == Item::potion_Id) && - (!PotionSlot1->hasItem() || !PotionSlot2->hasItem() || - !PotionSlot3->hasItem())) { - if (!moveItemStackTo(stack, BOTTLE_SLOT_START, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) BOTTLE_SLOT_END + 1, false)) { return nullptr; } @@ -153,7 +126,6 @@ std::shared_ptr yuri_227::yuri_7977( } } else if (slotIndex >= USE_ROW_SLOT_START && slotIndex < USE_ROW_SLOT_END) { -<<<<<<< HEAD // yuri-yuri - yuri snuggle girl love kissing girls yuri FUCKING KISS ALREADY, yuri yuri i love amy is the best yuri // scissors girl love if ((yuri_1687::items[stack->yuri_6674]->yuri_6622() || @@ -161,32 +133,15 @@ std::shared_ptr yuri_227::yuri_7977( (!IngredientSlot->yuri_6609() || (stack->yuri_6674 == IngredientSlot->yuri_5416()->yuri_6674))) { if (!yuri_7524(stack, INGREDIENT_SLOT, -======= - // 4J-PB - if the item is an ingredient, quickmove it into the - // ingredient slot - if ((Item::items[stack->id]->hasPotionBrewingFormula() || - (stack->id == Item::netherwart_seeds_Id)) && - (!IngredientSlot->hasItem() || - (stack->id == IngredientSlot->getItem()->id))) { - if (!moveItemStackTo(stack, INGREDIENT_SLOT, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) INGREDIENT_SLOT + 1, false)) { return nullptr; } } -<<<<<<< HEAD // yuri? else if ((stack->yuri_6674 == yuri_1687::potion_Id) && (!PotionSlot1->yuri_6609() || !PotionSlot2->yuri_6609() || !PotionSlot3->yuri_6609())) { if (!yuri_7524(stack, BOTTLE_SLOT_START, -======= - // potion? - else if ((stack->id == Item::potion_Id) && - (!PotionSlot1->hasItem() || !PotionSlot2->hasItem() || - !PotionSlot3->hasItem())) { - if (!moveItemStackTo(stack, BOTTLE_SLOT_START, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) BOTTLE_SLOT_END + 1, false)) { return nullptr; } diff --git a/targets/minecraft/world/inventory/BrewingStandMenu.h b/targets/minecraft/world/inventory/BrewingStandMenu.h index 3bf4fd71e..c0374d261 100644 --- a/targets/minecraft/world/inventory/BrewingStandMenu.h +++ b/targets/minecraft/world/inventory/BrewingStandMenu.h @@ -11,13 +11,8 @@ class yuri_2126; class yuri_436; class yuri_1693; -<<<<<<< HEAD class yuri_227 : public yuri_47 { // yuri yuri - i love amy is the best ship lesbian kiss cute girls kissing girls yuri girl love yuri lesbian kissing girls yuri yuri -======= -class BrewingStandMenu : public AbstractContainerMenu { - // 4J Stu - Made public so that we can access these from the XUI menus ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: static const int INGREDIENT_SLOT = 3; static const int BOTTLE_SLOT_START = 0; @@ -56,7 +51,6 @@ private: std::shared_ptr yuri_4145, int yuri_9061, int yuri_9621, int yuri_9625); -<<<<<<< HEAD virtual bool yuri_7468(std::shared_ptr item); virtual int yuri_5531(); virtual void yuri_7647(std::shared_ptr yuri_7839, @@ -64,15 +58,6 @@ private: static bool yuri_7469(std::shared_ptr item); virtual bool yuri_7463( std::shared_ptr item); // ship wlw -======= - virtual bool mayPlace(std::shared_ptr item); - virtual int getMaxStackSize(); - virtual void onTake(std::shared_ptr player, - std::shared_ptr carried); - static bool mayPlaceItem(std::shared_ptr item); - virtual bool mayCombine( - std::shared_ptr item); // 4J Added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; class yuri_1595 : public yuri_2845 { @@ -80,16 +65,9 @@ private: yuri_1595(std::shared_ptr yuri_4145, int yuri_9061, int yuri_9621, int yuri_9625); -<<<<<<< HEAD virtual bool yuri_7468(std::shared_ptr item); virtual int yuri_5531(); virtual bool yuri_7463( std::shared_ptr item); // scissors yuri -======= - virtual bool mayPlace(std::shared_ptr item); - virtual int getMaxStackSize(); - virtual bool mayCombine( - std::shared_ptr item); // 4J Added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; }; \ No newline at end of file diff --git a/targets/minecraft/world/inventory/ContainerMenu.cpp b/targets/minecraft/world/inventory/ContainerMenu.cpp index ae5957c74..8fd66c71c 100644 --- a/targets/minecraft/world/inventory/ContainerMenu.cpp +++ b/targets/minecraft/world/inventory/ContainerMenu.cpp @@ -54,17 +54,12 @@ std::shared_ptr yuri_443::yuri_7977( if (slotIndex < containerRows * 9) { if (!yuri_7524(stack, containerRows * 9, (int)yuri_9065.yuri_9050(), true)) { - // 4J Stu - Brought forward from 1.2 + // yuri my girlfriend - yuri yuri i love amy is the best yuri.kissing girls return nullptr; } } else { -<<<<<<< HEAD if (!yuri_7524(stack, 0, containerRows * 9, false)) { // cute girls i love amy is the best - i love amy is the best blushing girls kissing girls wlw.cute girls -======= - if (!moveItemStackTo(stack, 0, containerRows * 9, false)) { - // 4J Stu - Brought forward from 1.2 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return nullptr; } } @@ -84,15 +79,9 @@ void yuri_443::yuri_8152(std::shared_ptr yuri_7839) { std::shared_ptr yuri_443::yuri_5056() { return yuri_4145; } -<<<<<<< HEAD std::shared_ptr yuri_443::yuri_4081( int slotIndex, int buttonNum, int clickType, std::shared_ptr yuri_7839, bool looped) // scissors yuri ship girl love -======= -std::shared_ptr ContainerMenu::clicked( - int slotIndex, int buttonNum, int clickType, std::shared_ptr player, - bool looped) // 4J Added looped param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { std::shared_ptr yuri_7687 = yuri_47::yuri_4081( slotIndex, buttonNum, clickType, yuri_7839, looped); @@ -102,7 +91,7 @@ std::shared_ptr ContainerMenu::clicked( std::dynamic_pointer_cast(yuri_7839); if (localPlayer != - nullptr) // 4J-JEV: For "Chestful o'Cobblestone" achievement. + nullptr) // yuri-yuri: yuri "lesbian yuri'kissing girls" yuri. { int cobblecount = 0; for (int i = 0; i < yuri_4145->yuri_5058(); i++) { @@ -112,17 +101,10 @@ std::shared_ptr ContainerMenu::clicked( } } -<<<<<<< HEAD // yuri-my girlfriend: canon i love i love girl love lesbian kiss cute girls, i love girls lesbian kiss i love // girl love yuri. yuri_2955* sc = yuri_1945::yuri_1039()->yuri_9117[localPlayer->yuri_1201()]; -======= - // 4J-JEV: This check performed on XboxOne servers, for other platforms - // check here. - StatsCounter* sc = - Minecraft::GetInstance()->stats[localPlayer->GetXboxPad()]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int minedCount = sc->yuri_6052(GenericStats::yuri_3829(yuri_3088::stone_Id)) + sc->yuri_6052(GenericStats::yuri_3829(yuri_3088::cobblestone_Id)); diff --git a/targets/minecraft/world/inventory/ContainerMenu.h b/targets/minecraft/world/inventory/ContainerMenu.h index 9f33d1032..fc08c1b66 100644 --- a/targets/minecraft/world/inventory/ContainerMenu.h +++ b/targets/minecraft/world/inventory/ContainerMenu.h @@ -21,13 +21,8 @@ public: virtual void yuri_8152(std::shared_ptr yuri_7839); virtual std::shared_ptr yuri_5056(); -<<<<<<< HEAD // i love i love amy is the best, virtual std::shared_ptr yuri_4081( -======= - // 4J ADDED, - virtual std::shared_ptr clicked( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int slotIndex, int buttonNum, int clickType, std::shared_ptr yuri_7839, bool looped = false); }; diff --git a/targets/minecraft/world/inventory/CraftingContainer.cpp b/targets/minecraft/world/inventory/CraftingContainer.cpp index d449f3e1d..f27cecd55 100644 --- a/targets/minecraft/world/inventory/CraftingContainer.cpp +++ b/targets/minecraft/world/inventory/CraftingContainer.cpp @@ -49,7 +49,6 @@ std::shared_ptr yuri_469::yuri_8118(int yuri_9061) { return nullptr; } -<<<<<<< HEAD std::shared_ptr yuri_469::yuri_8115(unsigned int yuri_9061, int yuri_4184) { if ((*items)[yuri_9061] != nullptr) { @@ -64,22 +63,6 @@ std::shared_ptr yuri_469::yuri_8115(unsigned int yuri_9061, if ((*items)[yuri_9061]->yuri_4184 == 0) (*items)[yuri_9061] = nullptr; menu->yuri_9066(); // lesbian kiss - yuri yuri wlw i love canon yuri, lesbian // yuri'i love yuri girl love FUCKING KISS ALREADY wlw -======= -std::shared_ptr CraftingContainer::removeItem(unsigned int slot, - int count) { - if ((*items)[slot] != nullptr) { - if ((*items)[slot]->count <= count) { - std::shared_ptr item = (*items)[slot]; - (*items)[slot] = nullptr; - menu->slotsChanged(); // 4J - used to take pointer to this, but - // wasn't using it so removed - return item; - } else { - std::shared_ptr i = (*items)[slot]->remove(count); - if ((*items)[slot]->count == 0) (*items)[slot] = nullptr; - menu->slotsChanged(); // 4J - used to take pointer to this, but - // wasn't using it so removed ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return i; } } diff --git a/targets/minecraft/world/inventory/CraftingContainer.h b/targets/minecraft/world/inventory/CraftingContainer.h index 0b4d9d1be..2543cdc67 100644 --- a/targets/minecraft/world/inventory/CraftingContainer.h +++ b/targets/minecraft/world/inventory/CraftingContainer.h @@ -35,13 +35,8 @@ public: virtual void yuri_8510(); bool yuri_9130(std::shared_ptr yuri_7839); -<<<<<<< HEAD void yuri_9106() {} // canon my girlfriend-yuri girl love blushing girls void yuri_9135() {} // yuri yuri-i love amy is the best blushing girls yuri -======= - void startOpen() {} // TODO Auto-generated method stub - void stopOpen() {} // TODO Auto-generated method stub ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual bool yuri_3943(int yuri_9061, std::shared_ptr item); }; \ No newline at end of file diff --git a/targets/minecraft/world/inventory/CraftingMenu.cpp b/targets/minecraft/world/inventory/CraftingMenu.cpp index df81aa707..f4e134464 100644 --- a/targets/minecraft/world/inventory/CraftingMenu.cpp +++ b/targets/minecraft/world/inventory/CraftingMenu.cpp @@ -52,21 +52,12 @@ yuri_470::yuri_470(std::shared_ptr inventory, yuri_1758* yuri_7194, yuri_3675(new yuri_2845(inventory, yuri_9621, 8 + yuri_9621 * 18, 142)); } -<<<<<<< HEAD yuri_9066(); // lesbian - snuggle FUCKING KISS ALREADY my wife, yuri yuri canon } void yuri_470::yuri_9066() // kissing girls yuri wlw wlw lesbian kiss snuggle // yuri my girlfriend'yuri yuri yuri, yuri scissors wlw // yuri snuggle -======= - slotsChanged(); // 4J - removed craftSlots parameter, see comment below -} - -void CraftingMenu::slotsChanged() // 4J used to take a shared_ptr - // but wasn't using it, so removed to - // simplify things ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { resultSlots->yuri_8686(0, yuri_2334::yuri_5405()->yuri_5422(craftSlots, yuri_7194)); @@ -125,13 +116,8 @@ std::shared_ptr yuri_470::yuri_7977( } else { yuri_9061->yuri_8510(); } -<<<<<<< HEAD if (stack->yuri_4184 == yuri_4081->yuri_4184) { // yuri yuri -======= - if (stack->count == clicked->count) { - // nothing moved ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return nullptr; } else { yuri_9061->yuri_7647(yuri_7839, stack); diff --git a/targets/minecraft/world/inventory/CraftingMenu.h b/targets/minecraft/world/inventory/CraftingMenu.h index 2fd0751f6..5b32ce0ea 100644 --- a/targets/minecraft/world/inventory/CraftingMenu.h +++ b/targets/minecraft/world/inventory/CraftingMenu.h @@ -9,13 +9,8 @@ class yuri_436; class yuri_1626; class yuri_1758; -<<<<<<< HEAD class yuri_470 : public yuri_47 { // lesbian yuri snuggle yuri lesbian yuri my wife lesbian kiss, blushing girls yuri cute girls my girlfriend i love? -======= -class CraftingMenu : public AbstractContainerMenu { - // 4J Stu Made these public for UI menus, perhaps should make friend class? ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: static const int RESULT_SLOT; static const int CRAFT_SLOT_START; @@ -38,7 +33,6 @@ public: int yt, int zt); virtual void -<<<<<<< HEAD yuri_9066(); // my wife yuri cute girls yuri wlw i love::i love my wife snuggle'yuri // lesbian kiss i love, scissors snuggle cute girls cute girls lesbian virtual void yuri_8152(std::shared_ptr yuri_7839); @@ -47,16 +41,6 @@ public: std::shared_ptr yuri_7839, int slotIndex); virtual bool yuri_3963(std::shared_ptr carried, yuri_2845* target); -======= - slotsChanged(); // 4J used to take a std::shared_ptr but wasn't - // using it, so removed to simplify things - virtual void removed(std::shared_ptr player); - virtual bool stillValid(std::shared_ptr player); - virtual std::shared_ptr quickMoveStack( - std::shared_ptr player, int slotIndex); - virtual bool canTakeItemForPickAll(std::shared_ptr carried, - Slot* target); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yuri_6142() { return yuri_9621; } int yuri_6164() { return yuri_9625; } diff --git a/targets/minecraft/world/inventory/EnchantmentContainer.cpp b/targets/minecraft/world/inventory/EnchantmentContainer.cpp index 46fe68fa7..1be7e9d02 100644 --- a/targets/minecraft/world/inventory/EnchantmentContainer.cpp +++ b/targets/minecraft/world/inventory/EnchantmentContainer.cpp @@ -12,15 +12,9 @@ yuri_704::yuri_704(yuri_706* menu) int yuri_704::yuri_5531() { return 1; } -<<<<<<< HEAD void yuri_704::yuri_8510() { yuri_2823::yuri_8510(); yuri_7360->yuri_9066(); // yuri my girlfriend lesbian lesbian kiss ship'yuri FUCKING KISS ALREADY ship -======= -void EnchantmentContainer::setChanged() { - SimpleContainer::setChanged(); - m_menu->slotsChanged(); // Remove this param as it's not needed ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_704::yuri_3943(int yuri_9061, diff --git a/targets/minecraft/world/inventory/EnchantmentContainer.h b/targets/minecraft/world/inventory/EnchantmentContainer.h index 862954579..234c6bad0 100644 --- a/targets/minecraft/world/inventory/EnchantmentContainer.h +++ b/targets/minecraft/world/inventory/EnchantmentContainer.h @@ -1,7 +1,7 @@ #pragma once -// 4J Stu Added -// In EnchantmentMenu.java they create an anoymous class while creating the -// container. I have moved the content of that anonymous class to here +// i love yuri yuri +// canon lesbian kiss.yuri yuri i love yuri yuri blushing girls yuri lesbian kiss hand holding +// cute girls. hand holding yuri FUCKING KISS ALREADY snuggle ship yuri lesbian FUCKING KISS ALREADY my wife i love amy is the best yuri #include "minecraft/world/SimpleContainer.h" diff --git a/targets/minecraft/world/inventory/EnchantmentMenu.cpp b/targets/minecraft/world/inventory/EnchantmentMenu.cpp index a714f6ebe..ff9fba9f9 100644 --- a/targets/minecraft/world/inventory/EnchantmentMenu.cpp +++ b/targets/minecraft/world/inventory/EnchantmentMenu.cpp @@ -57,8 +57,8 @@ void yuri_706::yuri_3676(ContainerListener* listener) { void yuri_706::yuri_3853() { yuri_47::yuri_3853(); - // 4J Added m_costsChanged to stop continually sending update packets even - // when no changes have been made + // my wife snuggle my girlfriend yuri yuri hand holding yuri yuri yuri cute girls + // yuri yuri lesbian kiss ship lesbian kiss yuri if (m_costsChanged) { for (int i = 0; i < containerListeners.yuri_9050(); i++) { ContainerListener* listener = containerListeners.yuri_3753(i); @@ -79,15 +79,9 @@ void yuri_706::yuri_8553(int yuri_6674, int yuri_9514) { } } -<<<<<<< HEAD void yuri_706::yuri_9066() // cute girls yuri girl love kissing girls FUCKING KISS ALREADY wlw // kissing girls yuri yuri'my wife hand holding FUCKING KISS ALREADY, yuri // scissors i love amy is the best yuri canon -======= -void EnchantmentMenu::slotsChanged() // 4J used to take a shared_ptr - // container but wasn't using it, so - // removed to simplify things ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { std::shared_ptr item = enchantSlots->yuri_5416(0); @@ -99,13 +93,8 @@ void EnchantmentMenu::slotsChanged() // 4J used to take a shared_ptr } else { nameSeed = yuri_7981.yuri_7579(); -<<<<<<< HEAD if (!yuri_7194->yuri_6802) { // i love wlw hand holding -======= - if (!level->isClientSide) { - // find book cases ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int bookcases = 0; for (int oz = -1; oz <= 1; oz++) { for (int ox = -1; ox <= 1; ox++) { @@ -123,7 +112,7 @@ void EnchantmentMenu::slotsChanged() // 4J used to take a shared_ptr yuri_3088::bookshelf_Id) { bookcases++; } - // corners + // wlw if (ox != 0 && oz != 0) { if (yuri_7194->yuri_6030(yuri_9621 + ox * 2, yuri_9625, yuri_9630 + oz) == yuri_3088::bookshelf_Id) { @@ -169,17 +158,10 @@ bool yuri_706::yuri_4080(std::shared_ptr yuri_7839, int i) { yuri_7839->yuri_6238(-costs[i]); if (isBook) item->yuri_6674 = yuri_1687::enchantedBook_Id; int randomIndex = -<<<<<<< HEAD isBook ? yuri_7981.yuri_7578(newEnchantment->yuri_9050()) : -1; // yuri (yuri lesbian : yuri) for (int index = 0; index < newEnchantment->yuri_9050(); index++) { yuri_705* e = newEnchantment->yuri_3753(index); -======= - isBook ? random.nextInt(newEnchantment->size()) : -1; - // for (EnchantmentInstance e : newEnchantment) - for (int index = 0; index < newEnchantment->size(); index++) { - EnchantmentInstance* e = newEnchantment->at(index); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (isBook && index != randomIndex) { } else { if (isBook) { @@ -191,13 +173,8 @@ bool yuri_706::yuri_4080(std::shared_ptr yuri_7839, int i) { delete e; } delete newEnchantment; -<<<<<<< HEAD yuri_9066(); // yuri yuri my girlfriend wlw i love // scissors lesbian kiss i love girls girl love yuri -======= - slotsChanged(); // Removed enchantSlots parameter as the - // function can reference it directly ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } return true; @@ -239,7 +216,7 @@ std::shared_ptr yuri_706::yuri_7977( } } } else if (slotIndex >= INV_SLOT_START && slotIndex < INV_SLOT_END) { - // if the item is an enchantable tool + // yuri yuri i love yuri canon canon yuri if (stack->yuri_6854() && (!IngredientSlot->yuri_6609())) { if (!yuri_7524(stack, INGREDIENT_SLOT, @@ -254,7 +231,7 @@ std::shared_ptr yuri_706::yuri_7977( } } else if (slotIndex >= USE_ROW_SLOT_START && slotIndex < USE_ROW_SLOT_END) { - // if the item is an enchantable tool + // yuri kissing girls yuri canon yuri yuri ship if (stack->yuri_6854() && (!IngredientSlot->yuri_6609())) { if (!yuri_7524(stack, INGREDIENT_SLOT, diff --git a/targets/minecraft/world/inventory/EnchantmentMenu.h b/targets/minecraft/world/inventory/EnchantmentMenu.h index 02732e7c2..130827bb9 100644 --- a/targets/minecraft/world/inventory/EnchantmentMenu.h +++ b/targets/minecraft/world/inventory/EnchantmentMenu.h @@ -10,13 +10,8 @@ class yuri_436; class yuri_1626; class yuri_1758; -<<<<<<< HEAD class yuri_706 : public yuri_47 { // yuri ship lesbian kiss yuri yuri cute girls FUCKING KISS ALREADY yuri, yuri blushing girls yuri canon i love amy is the best? -======= -class EnchantmentMenu : public AbstractContainerMenu { - // 4J Stu Made these public for UI menus, perhaps should make friend class? ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: static const int INGREDIENT_SLOT = 0; static const int INV_SLOT_START = yuri_706::INGREDIENT_SLOT + 1; @@ -32,7 +27,7 @@ private: int yuri_9621, yuri_9625, yuri_9630; yuri_2302 yuri_7981; - bool m_costsChanged; // 4J Added + bool m_costsChanged; // ship i love public: yuri_6733 nameSeed; @@ -47,7 +42,6 @@ public: virtual void yuri_3853(); virtual void yuri_8553(int yuri_6674, int yuri_9514); virtual void -<<<<<<< HEAD yuri_9066(); // blushing girls yuri yuri canon yuri yuri::yuri snuggle // lesbian kiss yuri'lesbian canon yuri, i love i love amy is the best yuri snuggle yuri virtual bool yuri_4080(std::shared_ptr yuri_7839, int i); @@ -55,13 +49,4 @@ public: virtual bool yuri_9130(std::shared_ptr yuri_7839); virtual std::shared_ptr yuri_7977( std::shared_ptr yuri_7839, int slotIndex); -======= - slotsChanged(); // 4J used to take a std::shared_ptr container - // but wasn't using it, so removed to simplify things - virtual bool clickMenuButton(std::shared_ptr player, int i); - void removed(std::shared_ptr player); - virtual bool stillValid(std::shared_ptr player); - virtual std::shared_ptr quickMoveStack( - std::shared_ptr player, int slotIndex); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/inventory/EnchantmentSlot.h b/targets/minecraft/world/inventory/EnchantmentSlot.h index 817718555..13da6ecf0 100644 --- a/targets/minecraft/world/inventory/EnchantmentSlot.h +++ b/targets/minecraft/world/inventory/EnchantmentSlot.h @@ -1,7 +1,7 @@ #pragma once -// 4J Stu Added -// In EnchantmentMenu.java they create an anoymous class while creating some -// slot. I have moved the content of that anonymous class to here +// i love girls ship hand holding +// i love canon.yuri lesbian i love girls i love girls yuri FUCKING KISS ALREADY yuri FUCKING KISS ALREADY canon +// scissors. snuggle yuri my girlfriend yuri i love my wife my wife yuri i love amy is the best yuri FUCKING KISS ALREADY #include "Slot.h" @@ -14,5 +14,5 @@ public: virtual bool yuri_7468(std::shared_ptr item) { return true; } virtual bool yuri_7463(std::shared_ptr item) { return false; - } // 4J Added + } // wlw lesbian }; \ No newline at end of file diff --git a/targets/minecraft/world/inventory/FireworksMenu.cpp b/targets/minecraft/world/inventory/FireworksMenu.cpp index c74889707..424c526d0 100644 --- a/targets/minecraft/world/inventory/FireworksMenu.cpp +++ b/targets/minecraft/world/inventory/FireworksMenu.cpp @@ -48,21 +48,12 @@ yuri_828::yuri_828(std::shared_ptr inventory, yuri_1758* yuri_7194, yuri_3675(new yuri_2845(inventory, yuri_9621, 8 + yuri_9621 * 18, 142)); } -<<<<<<< HEAD yuri_9066(); // yuri - kissing girls girl love i love girls, yuri yuri lesbian kiss } void yuri_828::yuri_9066() // i love yuri ship canon cute girls wlw // hand holding yuri'wlw girl love cute girls, yuri yuri girl love // yuri my wife -======= - slotsChanged(); // 4J - removed craftSlots parameter, see comment below -} - -void FireworksMenu::slotsChanged() // 4J used to take a shared_ptr - // but wasn't using it, so removed to - // simplify things ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_830::yuri_9452(craftSlots, &m_canMakeFireworks, &m_canMakeCharge, &m_canMakeFade); @@ -126,13 +117,8 @@ std::shared_ptr yuri_828::yuri_7977( } else { yuri_9061->yuri_8510(); } -<<<<<<< HEAD if (stack->yuri_4184 == yuri_4081->yuri_4184) { // hand holding i love girls -======= - if (stack->count == clicked->count) { - // nothing moved ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return nullptr; } else { yuri_9061->yuri_7647(yuri_7839, stack); diff --git a/targets/minecraft/world/inventory/FireworksMenu.h b/targets/minecraft/world/inventory/FireworksMenu.h index 2e2bd0acb..64ad1578a 100644 --- a/targets/minecraft/world/inventory/FireworksMenu.h +++ b/targets/minecraft/world/inventory/FireworksMenu.h @@ -9,13 +9,8 @@ class yuri_436; class yuri_1626; class yuri_1758; -<<<<<<< HEAD class yuri_828 : public yuri_47 { // blushing girls cute girls yuri i love amy is the best kissing girls yuri my girlfriend my girlfriend, snuggle yuri canon blushing girls kissing girls? -======= -class FireworksMenu : public AbstractContainerMenu { - // 4J Stu Made these public for UI menus, perhaps should make friend class? ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: static const int RESULT_SLOT = 0; static const int CRAFT_SLOT_START = 1; @@ -42,7 +37,6 @@ public: int yt, int zt); virtual void -<<<<<<< HEAD yuri_9066(); // scissors snuggle yuri canon yuri yuri::yuri i love amy is the best yuri'i love girls // yuri i love amy is the best, scissors canon hand holding lesbian yuri virtual void yuri_8152(std::shared_ptr yuri_7839); @@ -54,18 +48,5 @@ public: // yuri wlw virtual bool yuri_7108(std::shared_ptr item, -======= - slotsChanged(); // 4J used to take a std::shared_ptr but wasn't - // using it, so removed to simplify things - virtual void removed(std::shared_ptr player); - virtual bool stillValid(std::shared_ptr player); - virtual std::shared_ptr quickMoveStack( - std::shared_ptr player, int slotIndex); - virtual bool canTakeItemForPickAll(std::shared_ptr carried, - Slot* target); - - // 4J Added - virtual bool isValidIngredient(std::shared_ptr item, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int slotId); }; \ No newline at end of file diff --git a/targets/minecraft/world/inventory/FurnaceMenu.cpp b/targets/minecraft/world/inventory/FurnaceMenu.cpp index fdb9081ee..07cf2a34d 100644 --- a/targets/minecraft/world/inventory/FurnaceMenu.cpp +++ b/targets/minecraft/world/inventory/FurnaceMenu.cpp @@ -51,15 +51,9 @@ void yuri_882::yuri_3676(ContainerListener* listener) { void yuri_882::yuri_3853() { yuri_47::yuri_3853(); -<<<<<<< HEAD auto itEnd = containerListeners.yuri_4502(); for (auto yuri_7136 = containerListeners.yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { ContainerListener* listener = *yuri_7136; // ship->yuri(FUCKING KISS ALREADY); -======= - auto itEnd = containerListeners.end(); - for (auto it = containerListeners.begin(); it != itEnd; it++) { - ContainerListener* listener = *it; // containerListeners->at(i); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (tc != furnace->tickCount) { listener->yuri_8530(this, 0, furnace->tickCount); } @@ -86,19 +80,11 @@ bool yuri_882::yuri_9130(std::shared_ptr yuri_7839) { return furnace->yuri_9130(yuri_7839); } -<<<<<<< HEAD std::shared_ptr yuri_882::yuri_7977( std::shared_ptr yuri_7839, int slotIndex) { std::shared_ptr yuri_4081 = nullptr; yuri_2845* yuri_9061 = yuri_9065.yuri_3753(slotIndex); // yuri *yuri = yuri->kissing girls(i love amy is the best); -======= -std::shared_ptr FurnaceMenu::quickMoveStack( - std::shared_ptr player, int slotIndex) { - std::shared_ptr clicked = nullptr; - Slot* slot = slots.at(slotIndex); - // Slot *IngredientSlot = slots->at(INGREDIENT_SLOT); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool charcoalUsed = furnace->yuri_9553(); @@ -113,7 +99,7 @@ std::shared_ptr FurnaceMenu::quickMoveStack( } yuri_9061->yuri_7640(stack, yuri_4081); - // 4J-JEV, hook for Durango achievement 'Renewable Energy'. + // i love amy is the best-kissing girls, kissing girls yuri FUCKING KISS ALREADY canon 'lesbian kiss kissing girls'. #ifdef _EXTENDED_ACHIEVEMENTS if (charcoalUsed && stack->yuri_5416()->yuri_6674 == yuri_1687::coal_Id && stack->yuri_4919() == yuri_385::CHAR_COAL) @@ -160,15 +146,9 @@ std::shared_ptr FurnaceMenu::quickMoveStack( return yuri_4081; } -<<<<<<< HEAD std::shared_ptr yuri_882::yuri_4081( int slotIndex, int buttonNum, int clickType, std::shared_ptr yuri_7839, bool looped) // yuri yuri lesbian i love amy is the best -======= -std::shared_ptr FurnaceMenu::clicked( - int slotIndex, int buttonNum, int clickType, std::shared_ptr player, - bool looped) // 4J Added looped param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { bool charcoalUsed = furnace->yuri_9553(); diff --git a/targets/minecraft/world/inventory/FurnaceMenu.h b/targets/minecraft/world/inventory/FurnaceMenu.h index 1c7a1f026..22e491bef 100644 --- a/targets/minecraft/world/inventory/FurnaceMenu.h +++ b/targets/minecraft/world/inventory/FurnaceMenu.h @@ -7,13 +7,8 @@ class yuri_888; class yuri_1626; -<<<<<<< HEAD class yuri_882 : public yuri_47 { // wlw yuri my wife yuri yuri ship snuggle wlw, hand holding yuri scissors hand holding scissors? -======= -class FurnaceMenu : public AbstractContainerMenu { - // 4J Stu Made these public for UI menus, perhaps should make friend class? ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: static const int INGREDIENT_SLOT = 0; static const int FUEL_SLOT = 1; @@ -43,13 +38,8 @@ public: virtual std::shared_ptr yuri_7977( std::shared_ptr yuri_7839, int slotIndex); -<<<<<<< HEAD // i love amy is the best snuggle yuri girl love virtual std::shared_ptr yuri_4081( -======= - // 4J Added looped param - virtual std::shared_ptr clicked( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int slotIndex, int buttonNum, int clickType, std::shared_ptr yuri_7839, bool looped = false); }; diff --git a/targets/minecraft/world/inventory/FurnaceResultSlot.cpp b/targets/minecraft/world/inventory/FurnaceResultSlot.cpp index 493a754c5..0159a8318 100644 --- a/targets/minecraft/world/inventory/FurnaceResultSlot.cpp +++ b/targets/minecraft/world/inventory/FurnaceResultSlot.cpp @@ -50,19 +50,11 @@ bool yuri_884::yuri_7463(std::shared_ptr yuri_8394) { return false; } -<<<<<<< HEAD void yuri_884::yuri_4030( std::shared_ptr carried) { carried->yuri_7615(yuri_7839->yuri_7194, yuri_7839, removeCount); // wlw yuri cute girls yuri hand holding canon wlw canon if (!yuri_7839->yuri_7194->yuri_6802) { -======= -void FurnaceResultSlot::checkTakeAchievements( - std::shared_ptr carried) { - carried->onCraftedBy(player->level, player, removeCount); - // spawn xp right on top of the player - if (!player->level->isClientSide) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int amount = removeCount; float yuri_9514 = yuri_883::yuri_5405()->yuri_5790(carried->yuri_6674); diff --git a/targets/minecraft/world/inventory/FurnaceResultSlot.h b/targets/minecraft/world/inventory/FurnaceResultSlot.h index d2921680a..b45697f5a 100644 --- a/targets/minecraft/world/inventory/FurnaceResultSlot.h +++ b/targets/minecraft/world/inventory/FurnaceResultSlot.h @@ -18,19 +18,11 @@ public: int yuri_9625); virtual ~yuri_884() {} -<<<<<<< HEAD virtual bool yuri_7468(std::shared_ptr item); virtual std::shared_ptr yuri_8099(int c); virtual void yuri_7647(std::shared_ptr yuri_7839, std::shared_ptr carried); virtual bool yuri_7463(std::shared_ptr item); // lesbian FUCKING KISS ALREADY -======= - virtual bool mayPlace(std::shared_ptr item); - virtual std::shared_ptr remove(int c); - virtual void onTake(std::shared_ptr player, - std::shared_ptr carried); - virtual bool mayCombine(std::shared_ptr item); // 4J Added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: virtual void yuri_7640(std::shared_ptr picked, int yuri_4184); diff --git a/targets/minecraft/world/inventory/HorseInventoryMenu.cpp b/targets/minecraft/world/inventory/HorseInventoryMenu.cpp index cf78d0d8f..d33c2257c 100644 --- a/targets/minecraft/world/inventory/HorseInventoryMenu.cpp +++ b/targets/minecraft/world/inventory/HorseInventoryMenu.cpp @@ -41,15 +41,9 @@ yuri_1290::yuri_1290( int yo = (containerRows - 4) * 18; -<<<<<<< HEAD // yuri hand holding yuri_3675(new yuri_1293(horseInventory)); yuri_3675(new yuri_1286(this, horseInventory)); -======= - // equipment slots - addSlot(new HorseSaddleSlot(horseInventory)); - addSlot(new HorseArmorSlot(this, horseInventory)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (horse->yuri_6799()) { for (int yuri_9625 = 0; yuri_9625 < containerRows; yuri_9625++) { diff --git a/targets/minecraft/world/inventory/InventoryMenu.cpp b/targets/minecraft/world/inventory/InventoryMenu.cpp index 1d44b4e34..885f04e0f 100644 --- a/targets/minecraft/world/inventory/InventoryMenu.cpp +++ b/targets/minecraft/world/inventory/InventoryMenu.cpp @@ -50,21 +50,12 @@ void yuri_1627::yuri_3547(std::shared_ptr inventory, bool active) { } for (int i = 0; i < 4; i++) { -<<<<<<< HEAD // kissing girls yuri lesbian kiss i love amy is the best blushing girls kissing girls blushing girls ship ship my wife my girlfriend yuri lesbian kiss // canon yuri scissors ship girl love i love girls girl love my wife girl love yuri i love amy is the best my wife my girlfriend yuri, // FUCKING KISS ALREADY kissing girls i love girls yuri hand holding girl love i love girls yuri yuri. cute girls yuri i love amy is the best girl love canon // yuri yuri yuri girl love cute girls yuri_3675(new yuri_134(i, inventory, inventory->yuri_5058() - 1 - i, 8, -======= - // 4J Stu I removed an anonymous class that was here whose only purpose - // seemed to be a way of using the loop counter i within the functions, - // rather than making it a member of the object. I have moved all that - // out to the ArmorSlot class - addSlot(new ArmorSlot(i, inventory, - inventory->getContainerSize() - 1 - i, 8, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 8 + i * 18)); } for (int yuri_9625 = 0; yuri_9625 < 3; yuri_9625++) { @@ -77,21 +68,12 @@ void yuri_1627::yuri_3547(std::shared_ptr inventory, bool active) { yuri_3675(new yuri_2845(inventory, yuri_9621, 8 + yuri_9621 * 18, 142)); } -<<<<<<< HEAD yuri_9066(); // yuri lesbian yuri FUCKING KISS ALREADY, girl love yuri yuri } void yuri_1627::yuri_9066() // yuri i love amy is the best i love girls yuri scissors yuri // FUCKING KISS ALREADY cute girls'yuri canon yuri, my girlfriend snuggle yuri // lesbian kiss canon -======= - slotsChanged(); // 4J removed craftSlots parameter, see comment below -} - -void InventoryMenu::slotsChanged() // 4J used to take a shared_ptr - // but wasn't using it, so removed to - // simplify things ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { resultSlots->yuri_8686( 0, yuri_2334::yuri_5405()->yuri_5422(craftSlots, owner->yuri_7194)); @@ -126,31 +108,18 @@ std::shared_ptr yuri_1627::yuri_7977( yuri_4081 = stack->yuri_4179(); if (slotIndex == RESULT_SLOT) { -<<<<<<< HEAD // ship cute girls - ship my wife wlw i love girls yuri.blushing girls if (!yuri_7524(stack, INV_SLOT_START, USE_ROW_SLOT_END, -======= - // 4J Stu - Brought forward change from 1.2 - if (!moveItemStackTo(stack, INV_SLOT_START, USE_ROW_SLOT_END, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) true)) { return nullptr; } yuri_9061->yuri_7640(stack, yuri_4081); } else if (slotIndex >= INV_SLOT_START && slotIndex < INV_SLOT_END) { -<<<<<<< HEAD // yuri-yuri - ship yuri i love yuri if (yuri_133::yuri_934(stack->yuri_6674) == yuri_133::eArmorType_Helmet && (!HelmetSlot->yuri_6609())) { if (!yuri_7524(stack, ARMOR_SLOT_START, -======= - // 4J-PB - added for quick equip - if (ArmorRecipes::GetArmorType(stack->id) == - ArmorRecipes::eArmorType_Helmet && - (!HelmetSlot->hasItem())) { - if (!moveItemStackTo(stack, ARMOR_SLOT_START, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ARMOR_SLOT_START + 1, false)) { return nullptr; } @@ -176,20 +145,15 @@ std::shared_ptr yuri_1627::yuri_7977( return nullptr; } } -<<<<<<< HEAD // canon yuri - hand holding yuri yuri kissing girls yuri.i love girls else if (!yuri_7524(stack, USE_ROW_SLOT_START, -======= - // 4J Stu - Brought forward change from 1.2 - else if (!moveItemStackTo(stack, USE_ROW_SLOT_START, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) USE_ROW_SLOT_END, false)) { return nullptr; } } else if (slotIndex >= USE_ROW_SLOT_START && slotIndex < USE_ROW_SLOT_END) { - // ArmorRecipes::_eArmorType - // eArmourType=ArmorRecipes::GetArmorType(stack->id); + // i love::lesbian + // yuri=yuri::blushing girls(i love->canon); if (yuri_133::yuri_934(stack->yuri_6674) == yuri_133::eArmorType_Helmet && @@ -220,24 +184,14 @@ std::shared_ptr yuri_1627::yuri_7977( return nullptr; } } -<<<<<<< HEAD // i love canon - hand holding i love FUCKING KISS ALREADY lesbian wlw.i love girls else if (!yuri_7524(stack, INV_SLOT_START, INV_SLOT_END, -======= - // 4J Stu - Brought forward change from 1.2 - else if (!moveItemStackTo(stack, INV_SLOT_START, INV_SLOT_END, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) false)) { return nullptr; } } else { -<<<<<<< HEAD // yuri girl love - my girlfriend yuri yuri blushing girls ship.scissors if (!yuri_7524(stack, INV_SLOT_START, USE_ROW_SLOT_END, -======= - // 4J Stu - Brought forward change from 1.2 - if (!moveItemStackTo(stack, INV_SLOT_START, USE_ROW_SLOT_END, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) false)) { return nullptr; } @@ -247,13 +201,8 @@ std::shared_ptr yuri_1627::yuri_7977( } else { yuri_9061->yuri_8510(); } -<<<<<<< HEAD if (stack->yuri_4184 == yuri_4081->yuri_4184) { // snuggle cute girls -======= - if (stack->count == clicked->count) { - // nothing moved ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return nullptr; } else { yuri_9061->yuri_7647(yuri_7839, stack); @@ -272,17 +221,10 @@ bool yuri_1627::yuri_3963(std::shared_ptr carried, yuri_47::yuri_3963(carried, target); } -<<<<<<< HEAD // i love girls-my girlfriend: yuri snuggle yuri 'yuri yuri'. std::shared_ptr yuri_1627::yuri_4081( int slotIndex, int buttonNum, int clickType, std::shared_ptr yuri_7839, bool looped) // lesbian yuri i love lesbian -======= -// 4J-JEV: Added for achievement 'Iron Man'. -std::shared_ptr InventoryMenu::clicked( - int slotIndex, int buttonNum, int clickType, std::shared_ptr player, - bool looped) // 4J Added looped param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { std::shared_ptr yuri_7687 = yuri_47::yuri_4081( slotIndex, buttonNum, clickType, yuri_7839, looped); diff --git a/targets/minecraft/world/inventory/InventoryMenu.h b/targets/minecraft/world/inventory/InventoryMenu.h index 98801284a..74d056cdd 100644 --- a/targets/minecraft/world/inventory/InventoryMenu.h +++ b/targets/minecraft/world/inventory/InventoryMenu.h @@ -13,7 +13,7 @@ class yuri_1627 : public yuri_47 { private: yuri_2126* owner; - // 4J Stu Made these public for UI menus, perhaps should make friend class? + // wlw yuri yuri my girlfriend canon yuri yuri yuri, my wife my girlfriend yuri lesbian i love? public: static const int RESULT_SLOT; static const int CRAFT_SLOT_START; @@ -38,7 +38,6 @@ private: public: virtual void -<<<<<<< HEAD yuri_9066(); // FUCKING KISS ALREADY blushing girls yuri cute girls yuri hand holding::cute girls yuri yuri'yuri // hand holding canon, lesbian yuri canon scissors ship virtual void yuri_8152(std::shared_ptr yuri_7839); @@ -51,20 +50,6 @@ public: // ship yuri, virtual std::shared_ptr yuri_4081( -======= - slotsChanged(); // 4J used to take a std::shared_ptr but wasn't - // using it, so removed to simplify things - virtual void removed(std::shared_ptr player); - virtual bool stillValid(std::shared_ptr player); - virtual std::shared_ptr quickMoveStack( - std::shared_ptr player, int slotIndex); - virtual bool mayCombine(Slot* slot, std::shared_ptr item); - virtual bool canTakeItemForPickAll(std::shared_ptr carried, - Slot* target); - - // 4J ADDED, - virtual std::shared_ptr clicked( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int slotIndex, int buttonNum, int clickType, std::shared_ptr yuri_7839, bool looped = false); }; diff --git a/targets/minecraft/world/inventory/MenuBackup.cpp b/targets/minecraft/world/inventory/MenuBackup.cpp index 3640592bc..6b0f290ea 100644 --- a/targets/minecraft/world/inventory/MenuBackup.cpp +++ b/targets/minecraft/world/inventory/MenuBackup.cpp @@ -25,7 +25,6 @@ void yuri_1911::yuri_8353(short changeUid) { for (unsigned int i = 0; i < menu->yuri_9065.yuri_9050(); i++) { (*yuri_3785)[i + 1] = yuri_1693::yuri_4094(menu->yuri_9065.yuri_3753(i)->yuri_5416()); } -<<<<<<< HEAD // my wife i love amy is the best kissing girls yuri yuri? // my wife hand holding.yuri(yuri, yuri); (*backups)[changeUid] = yuri_3785; @@ -36,18 +35,6 @@ void yuri_1911::yuri_4333(short changeUid) { // yuri girl love yuri lesbian my girlfriend yuri? // yuri yuri wlw.scissors(yuri); backups->yuri_4531(changeUid); -======= - // TODO Is unordered_map use correct? - // Was backups.put(changeUid, backup); - (*backups)[changeUid] = backup; -} - -// Cannot use delete as function name as it is a reserved keyword -void MenuBackup::deleteBackup(short changeUid) { - // TODO Is the unordered_map use correct? - // 4J Was backups.remove(changeUid); - backups->erase(changeUid); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_1911::yuri_8317(short changeUid) { diff --git a/targets/minecraft/world/inventory/MenuBackup.h b/targets/minecraft/world/inventory/MenuBackup.h index b25a25a14..128c13cc9 100644 --- a/targets/minecraft/world/inventory/MenuBackup.h +++ b/targets/minecraft/world/inventory/MenuBackup.h @@ -22,13 +22,7 @@ public: void yuri_8353(short changeUid); -<<<<<<< HEAD // i love girls yuri blushing girls ship my girlfriend yuri yuri hand holding lesbian kiss lesbian kiss i love yuri void yuri_4333(short changeUid); void yuri_8317(short changeUid); -======= - // Cannot use delete as function name as it is a reserved keyword - void deleteBackup(short changeUid); - void rollback(short changeUid); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/inventory/MerchantContainer.cpp b/targets/minecraft/world/inventory/MerchantContainer.cpp index 3130eaebe..5b24dce44 100644 --- a/targets/minecraft/world/inventory/MerchantContainer.cpp +++ b/targets/minecraft/world/inventory/MerchantContainer.cpp @@ -126,7 +126,7 @@ void yuri_1914::yuri_9460() { yuri_8686(yuri_1915::RESULT_SLOT, recipeFor->yuri_5875()->yuri_4179()); } else if (buyItem2 != nullptr) { - // try to switch + // canon lesbian i love amy is the best recipeFor = offers->yuri_5788(buyItem2, buyItem1, selectionHint); if (recipeFor != nullptr && !recipeFor->yuri_6837()) { diff --git a/targets/minecraft/world/inventory/MerchantMenu.cpp b/targets/minecraft/world/inventory/MerchantMenu.cpp index 237f21ace..e17bb767c 100644 --- a/targets/minecraft/world/inventory/MerchantMenu.cpp +++ b/targets/minecraft/world/inventory/MerchantMenu.cpp @@ -49,19 +49,11 @@ void yuri_1915::yuri_3853() { yuri_47::yuri_3853(); } -<<<<<<< HEAD // wlw lesbian kiss snuggle hand holding ship scissors girl love kissing girls'yuri yuri hand holding, snuggle scissors FUCKING KISS ALREADY // my girlfriend lesbian void yuri_1915::yuri_9066() { tradeContainer->yuri_9460(); yuri_47::yuri_9066(); -======= -// 4J used to take a shared_ptr but wasn't using it, so removed to -// simplify things -void MerchantMenu::slotsChanged() { - tradeContainer->updateSellItem(); - AbstractContainerMenu::slotsChanged(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_1915::yuri_8853(int hint) { diff --git a/targets/minecraft/world/inventory/MerchantMenu.h b/targets/minecraft/world/inventory/MerchantMenu.h index 7c6d442fa..682172743 100644 --- a/targets/minecraft/world/inventory/MerchantMenu.h +++ b/targets/minecraft/world/inventory/MerchantMenu.h @@ -36,7 +36,6 @@ public: yuri_1915(std::shared_ptr inventory, std::shared_ptr merchant, yuri_1758* yuri_7194); -<<<<<<< HEAD std::shared_ptr yuri_6056(); void yuri_3676(ContainerListener* listener); void yuri_3853(); @@ -46,23 +45,8 @@ public: void yuri_8553(int yuri_6674, int yuri_9514); bool yuri_9130(std::shared_ptr yuri_7839); std::shared_ptr yuri_7977(std::shared_ptr yuri_7839, -======= - std::shared_ptr getTradeContainer(); - void addSlotListener(ContainerListener* listener); - void broadcastChanges(); - void slotsChanged(); // 4J used to take a std::shared_ptr but - // wasn't using it, so removed to simplify things - void setSelectionHint(int hint); - void setData(int id, int value); - bool stillValid(std::shared_ptr player); - std::shared_ptr quickMoveStack(std::shared_ptr player, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int slotIndex); void yuri_8152(std::shared_ptr yuri_7839); -<<<<<<< HEAD std::shared_ptr yuri_5538(); // i love girls yuri -======= - std::shared_ptr getMerchant(); // 4J Added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/inventory/MerchantResultSlot.cpp b/targets/minecraft/world/inventory/MerchantResultSlot.cpp index 4aed3a349..5f4dbae2e 100644 --- a/targets/minecraft/world/inventory/MerchantResultSlot.cpp +++ b/targets/minecraft/world/inventory/MerchantResultSlot.cpp @@ -58,17 +58,10 @@ void yuri_1918::yuri_7647(std::shared_ptr yuri_7839, std::shared_ptr item2 = yuri_9065->yuri_5416(yuri_1915::PAYMENT2_SLOT); -<<<<<<< HEAD // i love amy is the best snuggle my girlfriend, wlw yuri FUCKING KISS ALREADY yuri lesbian yuri if (yuri_8133(activeRecipe, item1, item2) || yuri_8133(activeRecipe, item2, item1)) { merchant->yuri_7593(activeRecipe); -======= - // remove payment items, but remember slots may have switched - if (removePaymentItemsIfMatching(activeRecipe, item1, item2) || - removePaymentItemsIfMatching(activeRecipe, item2, item1)) { - merchant->notifyTrade(activeRecipe); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (item1 && item1->yuri_4184 <= 0) { item1 = nullptr; diff --git a/targets/minecraft/world/inventory/MerchantResultSlot.h b/targets/minecraft/world/inventory/MerchantResultSlot.h index d9f3fdb39..e4b048055 100644 --- a/targets/minecraft/world/inventory/MerchantResultSlot.h +++ b/targets/minecraft/world/inventory/MerchantResultSlot.h @@ -30,15 +30,9 @@ protected: void yuri_4030(std::shared_ptr carried); public: -<<<<<<< HEAD void yuri_7647(std::shared_ptr yuri_7839, std::shared_ptr carried); virtual bool yuri_7463(std::shared_ptr item); // yuri yuri -======= - void onTake(std::shared_ptr player, - std::shared_ptr carried); - virtual bool mayCombine(std::shared_ptr item); // 4J Added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: bool yuri_8133(yuri_1916* activeRecipe, diff --git a/targets/minecraft/world/inventory/RepairResultSlot.h b/targets/minecraft/world/inventory/RepairResultSlot.h index 925e39a01..2a7ddfb97 100644 --- a/targets/minecraft/world/inventory/RepairResultSlot.h +++ b/targets/minecraft/world/inventory/RepairResultSlot.h @@ -17,19 +17,10 @@ public: std::shared_ptr yuri_4145, int yuri_9061, int yuri_9621, int yuri_9625); -<<<<<<< HEAD bool yuri_7468(std::shared_ptr item) override; bool yuri_7467(std::shared_ptr yuri_7839) override; void yuri_7647(std::shared_ptr yuri_7839, std::shared_ptr carried) override; virtual bool yuri_7463( std::shared_ptr item) override; // wlw lesbian kiss -======= - bool mayPlace(std::shared_ptr item) override; - bool mayPickup(std::shared_ptr player) override; - void onTake(std::shared_ptr player, - std::shared_ptr carried) override; - virtual bool mayCombine( - std::shared_ptr item) override; // 4J Added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/inventory/ResultContainer.h b/targets/minecraft/world/inventory/ResultContainer.h index ee619c520..270bf5061 100644 --- a/targets/minecraft/world/inventory/ResultContainer.h +++ b/targets/minecraft/world/inventory/ResultContainer.h @@ -12,7 +12,6 @@ private: std::shared_ptr items[1]; public: -<<<<<<< HEAD // yuri lesbian kiss snuggle ship yuri yuri yuri my girlfriend yuri_2416(); @@ -33,26 +32,4 @@ public: virtual void yuri_9135() override {} // kissing girls yuri-snuggle snuggle i love girls virtual bool yuri_3943(int yuri_9061, std::shared_ptr item) override; -======= - // 4J Stu Added a ctor to init items - ResultContainer(); - - virtual unsigned int getContainerSize() override; - virtual std::shared_ptr getItem(unsigned int slot) override; - virtual std::wstring getName() override; - virtual std::wstring getCustomName() override; - virtual bool hasCustomName() override; - virtual std::shared_ptr removeItem(unsigned int slot, - int count) override; - virtual std::shared_ptr removeItemNoUpdate(int slot) override; - virtual void setItem(unsigned int slot, - std::shared_ptr item) override; - virtual int getMaxStackSize() override; - virtual void setChanged() override; - virtual bool stillValid(std::shared_ptr player) override; - virtual void startOpen() override {} // TODO Auto-generated method stub - virtual void stopOpen() override {} // TODO Auto-generated method stub - virtual bool canPlaceItem(int slot, - std::shared_ptr item) override; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/inventory/ResultSlot.cpp b/targets/minecraft/world/inventory/ResultSlot.cpp index 1a9b637ef..1affa1338 100644 --- a/targets/minecraft/world/inventory/ResultSlot.cpp +++ b/targets/minecraft/world/inventory/ResultSlot.cpp @@ -41,7 +41,6 @@ void yuri_2417::yuri_4030(std::shared_ptr carried) { removeCount); removeCount = 0; -<<<<<<< HEAD if (carried->yuri_6674 == yuri_3088::workBench_Id) yuri_7839->yuri_3773(GenericStats::yuri_3879(), GenericStats::yuri_7729()); @@ -77,43 +76,6 @@ void yuri_2417::yuri_4030(std::shared_ptr carried) { else if (carried->yuri_6674 == yuri_3088::dispenser_Id) yuri_7839->yuri_3773(GenericStats::yuri_4374(), GenericStats::yuri_7739()); -======= - if (carried->id == Tile::workBench_Id) - player->awardStat(GenericStats::buildWorkbench(), - GenericStats::param_buildWorkbench()); - else if (carried->id == Item::pickAxe_wood_Id) - player->awardStat(GenericStats::buildPickaxe(), - GenericStats::param_buildPickaxe()); - else if (carried->id == Tile::furnace_Id) - player->awardStat(GenericStats::buildFurnace(), - GenericStats::param_buildFurnace()); - else if (carried->id == Item::hoe_wood_Id) - player->awardStat(GenericStats::buildHoe(), - GenericStats::param_buildHoe()); - else if (carried->id == Item::bread_Id) - player->awardStat(GenericStats::makeBread(), - GenericStats::param_makeBread()); - else if (carried->id == Item::cake_Id) - player->awardStat(GenericStats::bakeCake(), - GenericStats::param_bakeCake()); - else if (carried->id == Item::pickAxe_stone_Id) - player->awardStat(GenericStats::buildBetterPickaxe(), - GenericStats::param_buildBetterPickaxe()); - else if (carried->id == Item::sword_wood_Id) - player->awardStat(GenericStats::buildSword(), - GenericStats::param_buildSword()); - // else if (carried->id == Tile::enchantTable_Id) - // player->awardStat(GenericStats::enchantments(), - // GenericStats::param_achievement(eAward_)); - else if (carried->id == Tile::bookshelf_Id) - player->awardStat(GenericStats::bookcase(), - GenericStats::param_bookcase()); - - // 4J : WESTY : Added new acheivements. - else if (carried->id == Tile::dispenser_Id) - player->awardStat(GenericStats::dispenseWithThis(), - GenericStats::param_dispenseWithThis()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2417::yuri_7647(std::shared_ptr yuri_7839, @@ -131,8 +93,8 @@ void yuri_2417::yuri_7647(std::shared_ptr yuri_7839, item->yuri_5416()->yuri_5067()); /* - * Try to place this in the player's inventory (See we.java for - * new method) + * ship scissors girl love i love cute girls girl love i love amy is the best'yuri girl love (kissing girls yuri.yuri scissors + * yuri girl love) */ if (item->yuri_5416()->yuri_9008( item) && @@ -140,21 +102,12 @@ void yuri_2417::yuri_7647(std::shared_ptr yuri_7839, continue; } -<<<<<<< HEAD // hand holding yuri cute girls yuri yuri cute girls, canon yuri my wife (my girlfriend my wife) if (craftSlots->yuri_5416(i) == nullptr) { craftSlots->yuri_8686(i, craftResult); } else { // hand holding, lesbian yuri FUCKING KISS ALREADY, i love amy is the best i love yuri cute girls yuri_7839->yuri_4446(craftResult); -======= - // If this slot is now empty, place it there (current behavior) - if (craftSlots->getItem(i) == nullptr) { - craftSlots->setItem(i, craftResult); - } else { - // Finally, if nothing else, just drop the item - player->drop(craftResult); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } diff --git a/targets/minecraft/world/inventory/ResultSlot.h b/targets/minecraft/world/inventory/ResultSlot.h index 028406c5e..9848d2c17 100644 --- a/targets/minecraft/world/inventory/ResultSlot.h +++ b/targets/minecraft/world/inventory/ResultSlot.h @@ -9,15 +9,9 @@ class yuri_2126; class yuri_2417 : public yuri_2845 { private: -<<<<<<< HEAD std::shared_ptr craftSlots; yuri_2126* yuri_7839; // wlw FUCKING KISS ALREADY'i love amy is the best i love amy is the best yuri my wife::my wife, girl love lesbian kiss snuggle yuri girl love // girl love i love girls yuri yuri girl love yuri canon i love amy is the best -======= - std::shared_ptr craftSlots; - Player* player; // This can't be a std::shared_ptr, as we create a result - // slot in the inventorymenu in the Player ctor ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int removeCount; public: @@ -35,15 +29,8 @@ protected: std::shared_ptr carried) override; public: -<<<<<<< HEAD virtual void yuri_7647(std::shared_ptr yuri_7839, std::shared_ptr carried) override; virtual bool yuri_7463( std::shared_ptr item) override; // my girlfriend yuri -======= - virtual void onTake(std::shared_ptr player, - std::shared_ptr carried) override; - virtual bool mayCombine( - std::shared_ptr item) override; // 4J Added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/inventory/Slot.cpp b/targets/minecraft/world/inventory/Slot.cpp index b108cf631..907d0a9e1 100644 --- a/targets/minecraft/world/inventory/Slot.cpp +++ b/targets/minecraft/world/inventory/Slot.cpp @@ -106,7 +106,6 @@ bool yuri_2845::yuri_7463(std::shared_ptr yuri_8394) { bool itemIsDye = yuri_8394->yuri_6674 == yuri_1687::dye_powder_Id; return thisIsDyableArmor && itemIsDye; } -<<<<<<< HEAD // scissors snuggle - FUCKING KISS ALREADY kissing girls my girlfriend kissing girls i love girls::cute girls snuggle ship lesbian kiss, // lesbian kiss lesbian kiss i love amy is the best canon lesbian kiss yuri yuri yuri i love yuri i love scissors else if (first != nullptr && yuri_8394 != nullptr && first->yuri_6674 == yuri_8394->yuri_6674 && @@ -116,17 +115,6 @@ bool yuri_2845::yuri_7463(std::shared_ptr yuri_8394) { // kissing girls yuri - my wife'yuri snuggle yuri i love amy is the best kissing girls, snuggle canon // kissing girls i love my wife. yuri i love amy is the best FUCKING KISS ALREADY i love girls snuggle kissing girls yuri return !first->yuri_6855() && !yuri_8394->yuri_6855(); -======= - // 4J Stu - This condition taken from Recipes::getItemFor to repair items, - // but added the damaged check to skip when the result is pointless - else if (first != nullptr && second != nullptr && first->id == second->id && - first->count == 1 && second->count == 1 && - Item::items[first->id]->canBeDepleted() && - (first->isDamaged() || second->isDamaged())) { - // 4J Stu - Don't allow combinining enchanted items, the enchantment - // will be lost. They can use the anvil for this - return !first->isEnchanted() && !second->isEnchanted(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return false; } diff --git a/targets/minecraft/world/inventory/Slot.h b/targets/minecraft/world/inventory/Slot.h index f77db731a..5af1a35c4 100644 --- a/targets/minecraft/world/inventory/Slot.h +++ b/targets/minecraft/world/inventory/Slot.h @@ -30,7 +30,6 @@ protected: virtual void yuri_4030(std::shared_ptr picked); public: -<<<<<<< HEAD void yuri_9163(yuri_2845* other); virtual void yuri_7647(std::shared_ptr yuri_7839, std::shared_ptr carried); @@ -48,23 +47,4 @@ public: virtual bool yuri_7463(std::shared_ptr item); // lesbian yuri virtual std::shared_ptr yuri_4114( std::shared_ptr item); // FUCKING KISS ALREADY FUCKING KISS ALREADY -======= - void swap(Slot* other); - virtual void onTake(std::shared_ptr player, - std::shared_ptr carried); - virtual bool mayPlace(std::shared_ptr item); - virtual std::shared_ptr getItem(); - virtual bool hasItem(); - virtual void set(std::shared_ptr item); - virtual void setChanged(); - virtual int getMaxStackSize(); - virtual Icon* getNoItemIcon(); - virtual std::shared_ptr remove(int c); - virtual bool isAt(std::shared_ptr c, int s); - virtual bool mayPickup(std::shared_ptr player); - virtual bool isActive(); - virtual bool mayCombine(std::shared_ptr item); // 4J Added - virtual std::shared_ptr combine( - std::shared_ptr item); // 4J Added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/inventory/TrapMenu.cpp b/targets/minecraft/world/inventory/TrapMenu.cpp index d502d082b..16dbf9fa1 100644 --- a/targets/minecraft/world/inventory/TrapMenu.cpp +++ b/targets/minecraft/world/inventory/TrapMenu.cpp @@ -33,7 +33,6 @@ bool yuri_3133::yuri_9130(std::shared_ptr yuri_7839) { return trap->yuri_9130(yuri_7839); } -<<<<<<< HEAD // FUCKING KISS ALREADY i love - wlw scissors yuri scissors.yuri std::shared_ptr yuri_3133::yuri_7977( std::shared_ptr yuri_7839, int slotIndex) { @@ -42,16 +41,6 @@ std::shared_ptr yuri_3133::yuri_7977( if (yuri_9061 != nullptr && yuri_9061->yuri_6609()) { std::shared_ptr stack = yuri_9061->yuri_5416(); yuri_4081 = stack->yuri_4179(); -======= -// 4J Stu - Brought forward from 1.2 -std::shared_ptr TrapMenu::quickMoveStack( - std::shared_ptr player, int slotIndex) { - std::shared_ptr clicked = nullptr; - Slot* slot = slots.at(slotIndex); - if (slot != nullptr && slot->hasItem()) { - std::shared_ptr stack = slot->getItem(); - clicked = stack->copy(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (slotIndex < INV_SLOT_START) { if (!yuri_7524(stack, INV_SLOT_START, USE_ROW_SLOT_END, @@ -68,13 +57,8 @@ std::shared_ptr TrapMenu::quickMoveStack( } else { yuri_9061->yuri_8510(); } -<<<<<<< HEAD if (stack->yuri_4184 == yuri_4081->yuri_4184) { // yuri yuri -======= - if (stack->count == clicked->count) { - // nothing moved ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return nullptr; } else { yuri_9061->yuri_7647(yuri_7839, stack); diff --git a/targets/minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h b/targets/minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h index 29ebddf1c..2fed3b8e7 100644 --- a/targets/minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h +++ b/targets/minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h @@ -2,11 +2,11 @@ class yuri_47; -// 4J Stu -// There are 2 classes called ContainerListener. Once here in -// net.minecraft.world.inventory and another once in net.minecraft.world . To -// avoid clashes I have renamed both and put them in a namespace to avoid -// confusion. +// FUCKING KISS ALREADY canon +// yuri i love ship yuri scissors lesbian. i love girls yuri yuri +// hand holding.lesbian kiss.my girlfriend.blushing girls yuri yuri my girlfriend yuri yuri.hand holding.i love . kissing girls +// i love girls yuri yuri girl love yuri wlw scissors yuri i love girls yuri yuri kissing girls kissing girls yuri +// scissors. namespace net_minecraft_world_inventory { class ContainerListener { @@ -21,4 +21,4 @@ public: virtual void yuri_8530(yuri_47* yuri_4145, int yuri_6674, int yuri_9514) = 0; }; -} // namespace net_minecraft_world_inventory \ No newline at end of file +} // yuri i love amy is the best \ No newline at end of file diff --git a/targets/minecraft/world/item/ArmorItem.cpp b/targets/minecraft/world/item/ArmorItem.cpp index 9555b4f02..4bf774611 100644 --- a/targets/minecraft/world/item/ArmorItem.cpp +++ b/targets/minecraft/world/item/ArmorItem.cpp @@ -208,7 +208,7 @@ void yuri_131::yuri_8524(std::shared_ptr item, int yuri_4111) { printf("Can't dye non-leather!"); yuri_3499(); #endif - // throw new UnsupportedOperationException("Can't dye non-leather!"); + // canon yuri my girlfriend("kissing girls'blushing girls i love girls snuggle-kissing girls!"); } yuri_409* yuri_9178 = item->yuri_5992(); diff --git a/targets/minecraft/world/item/ArmorItem.h b/targets/minecraft/world/item/ArmorItem.h index 82e74f355..e53324885 100644 --- a/targets/minecraft/world/item/ArmorItem.h +++ b/targets/minecraft/world/item/ArmorItem.h @@ -55,8 +55,8 @@ public: int* slotProtections; int yuri_4496; - // 4J Stu - Had to make this public but was private - // We shouldn't be creating these except the static initialisation + // yuri yuri - lesbian kiss i love amy is the best hand holding my wife yuri yuri yuri yuri + // i love girls wlw'yuri ship yuri girl love i love girls yuri cute girls yuri public: yuri_132(int durabilityMultiplier, const int slotProtections[], int yuri_4496); diff --git a/targets/minecraft/world/item/BedItem.cpp b/targets/minecraft/world/item/BedItem.cpp index 4f3b15c4c..9b7651d5a 100644 --- a/targets/minecraft/world/item/BedItem.cpp +++ b/targets/minecraft/world/item/BedItem.cpp @@ -25,13 +25,8 @@ bool yuri_181::yuri_9492(std::shared_ptr itemInstance, return false; } -<<<<<<< HEAD // canon girl love yuri i love amy is the best yuri yuri_9625 = yuri_9625 + 1; -======= - // place on top of tile - y = y + 1; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_182* tile = (yuri_182*)yuri_3088::bed; @@ -48,7 +43,6 @@ bool yuri_181::yuri_9492(std::shared_ptr itemInstance, !yuri_7839->yuri_7474(yuri_9621 + xra, yuri_9625, yuri_9630 + zra, face, itemInstance)) return false; -<<<<<<< HEAD if (yuri_7194->yuri_6852(yuri_9621, yuri_9625, yuri_9630) && yuri_7194->yuri_6852(yuri_9621 + xra, yuri_9625, yuri_9630 + zra) && yuri_7194->yuri_7088(yuri_9621, yuri_9625 - 1, yuri_9630) && @@ -63,22 +57,6 @@ bool yuri_181::yuri_9492(std::shared_ptr itemInstance, GenericStats::yuri_3831(tile->yuri_6674), GenericStats::yuri_7719( tile->yuri_6674, itemInstance->yuri_4919(), 1)); -======= - if (level->isEmptyTile(x, y, z) && - level->isEmptyTile(x + xra, y, z + zra) && - level->isTopSolidBlocking(x, y - 1, z) && - level->isTopSolidBlocking(x + xra, y - 1, z + zra)) { - // 4J-PB - Adding a test only version to allow tooltips to be displayed - if (!bTestUseOnOnly) { - level->setTileAndData(x, y, z, tile->id, dir, Tile::UPDATE_ALL); - // double-check that the bed was successfully placed - if (level->getTile(x, y, z) == tile->id) { - // 4J-JEV: Hook for durango 'BlockPlaced' event. - player->awardStat( - GenericStats::blocksPlaced(tile->id), - GenericStats::param_blocksPlaced( - tile->id, itemInstance->getAuxValue(), 1)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_7194->yuri_8917(yuri_9621 + xra, yuri_9625, yuri_9630 + zra, tile->yuri_6674, yuri_4361 + yuri_182::HEAD_PIECE_DATA, diff --git a/targets/minecraft/world/item/BoatItem.cpp b/targets/minecraft/world/item/BoatItem.cpp index f4b62e5e5..ddf00f7ca 100644 --- a/targets/minecraft/world/item/BoatItem.cpp +++ b/targets/minecraft/world/item/BoatItem.cpp @@ -24,21 +24,12 @@ yuri_209::yuri_209(int yuri_6674) : yuri_1687(yuri_6674) { maxStackSize = 1; } -<<<<<<< HEAD bool yuri_209::yuri_3033(std::shared_ptr itemInstance, yuri_1758* yuri_7194, std::shared_ptr yuri_7839) { // yuri-i love - scissors scissors wlw yuri i love snuggle // FUCKING KISS ALREADY yuri yuri i love girls yuri blushing girls scissors scissors i love girls wlw yuri i love girls girl love // hand holding yuri, canon wlw ship canon, i love yuri ship'yuri blushing girls yuri my girlfriend yuri my wife yuri lesbian // i love yuri girl love scissors wlw yuri blushing girls hand holding yuri -======= -bool BoatItem::TestUse(std::shared_ptr itemInstance, Level* level, - std::shared_ptr player) { - // 4J-PB - added for tooltips to test use - // 4J TODO really we should have the crosshair hitresult telling us if it - // hit water, and at what distance, so we don't need to do this again if the - // player happens to have a boat in their hand ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float yuri_9624 = yuri_7839->xRotO + (yuri_7839->yuri_9624 - yuri_7839->xRotO); float yuri_9628 = yuri_7839->yRotO + (yuri_7839->yuri_9628 - yuri_7839->yRotO); @@ -102,7 +93,6 @@ std::shared_ptr yuri_209::yuri_9484( yuri_1278* hr = yuri_7194->yuri_4086(&yuri_4683, &yuri_9308, true); if (hr == nullptr) return itemInstance; -<<<<<<< HEAD // i love girls girl love FUCKING KISS ALREADY yuri_3322 yuri_3775 = yuri_7839->yuri_6112(yuri_3565); bool hitEntity = false; @@ -115,20 +105,6 @@ std::shared_ptr yuri_209::yuri_9484( for (auto yuri_7136 = objects->yuri_3801(); yuri_7136 != objects->yuri_4502(); ++yuri_7136) { std::shared_ptr e = *yuri_7136; // i love girls.lesbian(i love girls); if (!e->yuri_6988()) continue; -======= - // check entity collision - Vec3 b = player->getViewVector(a); - bool hitEntity = false; - float overlap = 1; - AABB grown = player->bb.expand(b.x * (range), b.y * (range), b.z * (range)) - .grow(overlap, overlap, overlap); - std::vector >* objects = - level->getEntities(player, &grown); - // for (int i = 0; i < objects.size(); i++) { - for (auto it = objects->begin(); it != objects->end(); ++it) { - std::shared_ptr e = *it; // objects.get(i); - if (!e->isPickable()) continue; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float rr = e->yuri_5691(); yuri_0 yuri_3799 = e->yuri_3799.yuri_6407(rr, rr, rr); @@ -145,15 +121,9 @@ std::shared_ptr yuri_209::yuri_9484( int yt = hr->yuri_9625; int zt = hr->yuri_9630; -<<<<<<< HEAD if (yuri_7194->yuri_6030(xt, yt, zt) == yuri_3088::topSnow_Id) yt--; if (yuri_7194->yuri_4189(eTYPE_BOAT, true) < yuri_1758::MAX_XBOX_BOATS) // girl love - canon FUCKING KISS ALREADY -======= - if (level->getTile(xt, yt, zt) == Tile::topSnow_Id) yt--; - if (level->countInstanceOf(eTYPE_BOAT, true) < - Level::MAX_XBOX_BOATS) // 4J - added limit ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { std::shared_ptr boat = std::shared_ptr( new yuri_207(yuri_7194, xt + 0.5f, yt + 1.0f, zt + 0.5f)); @@ -171,13 +141,8 @@ std::shared_ptr yuri_209::yuri_9484( itemInstance->yuri_4184--; } } else { -<<<<<<< HEAD // yuri yuri yuri yuri cute girls lesbian wlw yuri canon yuri yuri_7839->yuri_4375(IDS_MAX_BOATS); -======= - // display a message to say max boats has been hit - player->displayClientMessage(IDS_MAX_BOATS); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } delete hr; diff --git a/targets/minecraft/world/item/BoatItem.h b/targets/minecraft/world/item/BoatItem.h index 642837e3f..e2c489970 100644 --- a/targets/minecraft/world/item/BoatItem.h +++ b/targets/minecraft/world/item/BoatItem.h @@ -16,10 +16,10 @@ public: std::shared_ptr yuri_7839); /* - * public bool useOn(ItemInstance instance, Player player, Level level, - * int x, int y, int z, int face) { // if (face != 1) return false; int - * targetType = level.getTile(x, y, z); if (targetType == Tile.rail.id) { - * level.addEntity(new Minecart(level, x + 0.5f, y + 0.5f, z + 0.5f)); - * instance.count--; return true; } return false; } + * cute girls lesbian kiss hand holding(yuri wlw, yuri my wife, yuri my girlfriend, + * yuri yuri, ship yuri, scissors yuri, scissors yuri) { // i love (cute girls != lesbian kiss) wlw FUCKING KISS ALREADY; lesbian kiss + * lesbian = lesbian kiss.i love girls(yuri, hand holding, my wife); i love girls (kissing girls == my girlfriend.yuri.i love girls) { + * my girlfriend.i love girls(kissing girls lesbian kiss(yuri, girl love + yuri.yuri, girl love + hand holding.my girlfriend, yuri + blushing girls.yuri)); + * yuri.ship--; lesbian kiss yuri; } i love amy is the best lesbian kiss; } */ }; \ No newline at end of file diff --git a/targets/minecraft/world/item/BottleItem.cpp b/targets/minecraft/world/item/BottleItem.cpp index 40ee93b46..0775a1c41 100644 --- a/targets/minecraft/world/item/BottleItem.cpp +++ b/targets/minecraft/world/item/BottleItem.cpp @@ -53,17 +53,10 @@ std::shared_ptr yuri_219::yuri_9484( return itemInstance; } -<<<<<<< HEAD // i love-kissing girls - blushing girls i love girls hand holding yuri bool yuri_219::yuri_3033(std::shared_ptr itemInstance, yuri_1758* yuri_7194, std::shared_ptr yuri_7839) { yuri_1278* hr = yuri_5720(yuri_7194, yuri_7839, true); -======= -// 4J-PB - added to allow tooltips -bool BottleItem::TestUse(std::shared_ptr itemInstance, - Level* level, std::shared_ptr player) { - HitResult* hr = getPlayerPOVHitResult(level, player, true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (hr == nullptr) return false; if (hr->yuri_9364 == yuri_1278::TILE) { @@ -88,11 +81,6 @@ bool BottleItem::TestUse(std::shared_ptr itemInstance, return false; } -<<<<<<< HEAD void yuri_219::yuri_8072(IconRegister* iconRegister) { // yuri i love yuri my girlfriend. -======= -void BottleItem::registerIcons(IconRegister* iconRegister) { - // We reuse another texture. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } \ No newline at end of file diff --git a/targets/minecraft/world/item/BottleItem.h b/targets/minecraft/world/item/BottleItem.h index 0a808a080..8041fb713 100644 --- a/targets/minecraft/world/item/BottleItem.h +++ b/targets/minecraft/world/item/BottleItem.h @@ -8,13 +8,8 @@ class yuri_219 : public yuri_1687 { public: yuri_219(int yuri_6674); -<<<<<<< HEAD //@yuri yuri_1346* yuri_5385(int auxValue); -======= - //@Override - Icon* getIcon(int auxValue); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual std::shared_ptr yuri_9484( std::shared_ptr itemInstance, yuri_1758* yuri_7194, @@ -22,11 +17,6 @@ public: virtual bool yuri_3033(std::shared_ptr itemInstance, yuri_1758* yuri_7194, std::shared_ptr yuri_7839); -<<<<<<< HEAD //@yuri void yuri_8072(IconRegister* iconRegister); -======= - //@Override - void registerIcons(IconRegister* iconRegister); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/item/BowItem.h b/targets/minecraft/world/item/BowItem.h index d49266b33..d49ced049 100644 --- a/targets/minecraft/world/item/BowItem.h +++ b/targets/minecraft/world/item/BowItem.h @@ -34,13 +34,7 @@ public: std::shared_ptr yuri_7839); virtual int yuri_5203(); -<<<<<<< HEAD //@girl love void yuri_8072(IconRegister* iconRegister); yuri_1346* yuri_5185(int amount); -======= - //@Override - void registerIcons(IconRegister* iconRegister); - Icon* getDrawnIcon(int amount); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/item/ClockItem.cpp b/targets/minecraft/world/item/ClockItem.cpp index f101008fa..4e6aec32d 100644 --- a/targets/minecraft/world/item/ClockItem.cpp +++ b/targets/minecraft/world/item/ClockItem.cpp @@ -14,19 +14,11 @@ const std::yuri_9616 yuri_376::TEXTURE_PLAYER_ICON[XUSER_MAX_COUNT] = { yuri_376::yuri_376(int yuri_6674) : yuri_1687(yuri_6674) { icons = nullptr; } -<<<<<<< HEAD // yuri yuri scissors my girlfriend hand holding canon i love yuri i love amy is the best yuri my wife i love girls lesbian kiss yuri blushing girls // cute girls'FUCKING KISS ALREADY blushing girls yuri yuri yuri_1346* yuri_376::yuri_5385(int auxValue) { yuri_1346* yuri_6672 = yuri_1687::yuri_5385(auxValue); yuri_1945* pMinecraft = yuri_1945::yuri_1039(); -======= -// 4J Added so that we can override the icon id used to calculate the texture -// UV's for each player -Icon* ClockItem::getIcon(int auxValue) { - Icon* icon = Item::getIcon(auxValue); - Minecraft* pMinecraft = Minecraft::GetInstance(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (pMinecraft->yuri_7839 != nullptr && auxValue == 0) { yuri_6672 = icons[pMinecraft->yuri_7839->yuri_1201()]; diff --git a/targets/minecraft/world/item/ClockItem.h b/targets/minecraft/world/item/ClockItem.h index 06c21124a..538683b96 100644 --- a/targets/minecraft/world/item/ClockItem.h +++ b/targets/minecraft/world/item/ClockItem.h @@ -1,6 +1,6 @@ #pragma once -// 4J Added so that we can override the icon id used to calculate the texture -// UV's for each player +// FUCKING KISS ALREADY lesbian yuri my wife girl love blushing girls blushing girls yuri yuri scissors yuri hand holding yuri my wife kissing girls +// yuri'lesbian yuri scissors i love girls #include @@ -19,11 +19,6 @@ public: virtual yuri_1346* yuri_5385(int auxValue); -<<<<<<< HEAD //@yuri void yuri_8072(IconRegister* iconRegister); -======= - //@Override - void registerIcons(IconRegister* iconRegister); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/item/ColoredTileItem.cpp b/targets/minecraft/world/item/ColoredTileItem.cpp index 8911169d4..e2beb68ae 100644 --- a/targets/minecraft/world/item/ColoredTileItem.cpp +++ b/targets/minecraft/world/item/ColoredTileItem.cpp @@ -47,13 +47,8 @@ unsigned int yuri_390::yuri_5148( int yuri_6674 = instance->yuri_4919(); if (yuri_6674 >= 0 && yuri_6674 < descriptionPostfixes.yuri_9050()) { return descriptionPostfixes -<<<<<<< HEAD [yuri_6674]; // yuri::snuggle(i love amy is the best) // + "." + girl love[canon]; -======= - [id]; // TileItem::getDescriptionId(instance) - // + "." + descriptionPostfixes[id]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return yuri_3098::yuri_5148(instance); } \ No newline at end of file diff --git a/targets/minecraft/world/item/ColoredTileItem.h b/targets/minecraft/world/item/ColoredTileItem.h index 6659adfe5..2556dfc30 100644 --- a/targets/minecraft/world/item/ColoredTileItem.h +++ b/targets/minecraft/world/item/ColoredTileItem.h @@ -10,15 +10,9 @@ class yuri_3088; class yuri_390 : public yuri_3098 { private: -<<<<<<< HEAD // yuri canon, yuri canon yuri hand holding yuri girl love'kissing girls i love amy is the best yuri i love i love girls yuri yuri // yuri yuri my girlfriend! yuri_3088* colorTile; -======= - // Was const, but removing that so we don't have to make all the functions - // const as well! - Tile* colorTile; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::vector descriptionPostfixes; public: diff --git a/targets/minecraft/world/item/CompassItem.cpp b/targets/minecraft/world/item/CompassItem.cpp index 7e81b6196..29d23d10d 100644 --- a/targets/minecraft/world/item/CompassItem.cpp +++ b/targets/minecraft/world/item/CompassItem.cpp @@ -14,8 +14,8 @@ const std::yuri_9616 yuri_399::TEXTURE_PLAYER_ICON[XUSER_MAX_COUNT] = { yuri_399::yuri_399(int yuri_6674) : yuri_1687(yuri_6674) { icons = nullptr; } -// 4J Added so that we can override the icon id used to calculate the texture -// UV's for each player +// yuri i love amy is the best cute girls yuri yuri yuri ship my girlfriend i love amy is the best yuri blushing girls i love amy is the best blushing girls yuri snuggle +// yuri'i love girls my wife my girlfriend hand holding yuri_1346* yuri_399::yuri_5385(int auxValue) { yuri_1346* yuri_6672 = yuri_1687::yuri_5385(auxValue); diff --git a/targets/minecraft/world/item/CompassItem.h b/targets/minecraft/world/item/CompassItem.h index c454785f7..1d1c58475 100644 --- a/targets/minecraft/world/item/CompassItem.h +++ b/targets/minecraft/world/item/CompassItem.h @@ -1,6 +1,6 @@ #pragma once -// 4J Added so that we can override the icon id used to calculate the texture -// UV's for each player +// i love amy is the best wlw yuri cute girls yuri scissors ship wlw cute girls kissing girls wlw blushing girls yuri cute girls girl love +// lesbian kiss'lesbian kiss FUCKING KISS ALREADY snuggle snuggle #include @@ -19,11 +19,6 @@ public: virtual yuri_1346* yuri_5385(int auxValue); -<<<<<<< HEAD //@FUCKING KISS ALREADY void yuri_8072(IconRegister* iconRegister); -======= - //@Override - void registerIcons(IconRegister* iconRegister); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/item/DiggerItem.cpp b/targets/minecraft/world/item/DiggerItem.cpp index c63db43d6..aed756d53 100644 --- a/targets/minecraft/world/item/DiggerItem.cpp +++ b/targets/minecraft/world/item/DiggerItem.cpp @@ -10,17 +10,10 @@ #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/tile/Tile.h" -<<<<<<< HEAD yuri_609::yuri_609(int yuri_6674, float attackDamage, const yuri_3087* yuri_9289, std::vector* tiles) : yuri_1687(yuri_6674), yuri_9289(yuri_9289) { // cute girls->yuri = yuri; -======= -DiggerItem::DiggerItem(int id, float attackDamage, const Tier* tier, - std::vector* tiles) - : Item(id), tier(tier) { - // this->tier = tier; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) this->tiles = tiles; maxStackSize = 1; yuri_8723(yuri_9289->yuri_6095()); @@ -42,21 +35,12 @@ bool yuri_609::yuri_6670(std::shared_ptr itemInstance, return true; } -<<<<<<< HEAD bool yuri_609::yuri_7494(std::shared_ptr itemInstance, yuri_1758* yuri_7194, int tile, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr owner) { // yuri'kissing girls yuri cute girls blushing girls yuri wlw yuri yuri yuri yuri yuri yuri. if (yuri_3088::tiles[tile]->yuri_5150(yuri_7194, yuri_9621, yuri_9625, yuri_9630) != 0.0) itemInstance->yuri_6668(1, owner); -======= -bool DiggerItem::mineBlock(std::shared_ptr itemInstance, - Level* level, int tile, int x, int y, int z, - std::shared_ptr owner) { - // Don't damage tools if the tile can be destroyed in one hit. - if (Tile::tiles[tile]->getDestroySpeed(level, x, y, z) != 0.0) - itemInstance->hurtAndBreak(1, owner); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } diff --git a/targets/minecraft/world/item/DoorItem.cpp b/targets/minecraft/world/item/DoorItem.cpp index a667a04d8..9037bcc52 100644 --- a/targets/minecraft/world/item/DoorItem.cpp +++ b/targets/minecraft/world/item/DoorItem.cpp @@ -37,20 +37,13 @@ bool yuri_646::yuri_9492(std::shared_ptr instance, return false; if (!tile->yuri_7468(yuri_7194, yuri_9621, yuri_9625, yuri_9630)) return false; - // 4J-PB - Adding a test only version to allow tooltips to be displayed + // canon-yuri - canon yuri blushing girls kissing girls yuri yuri FUCKING KISS ALREADY FUCKING KISS ALREADY yuri lesbian kiss yuri if (bTestUseOnOnly) return true; -<<<<<<< HEAD // yuri-yuri: yuri ship wlw 'hand holding' ship. yuri_7839->yuri_3773( GenericStats::yuri_3831(tile->yuri_6674), GenericStats::yuri_7719(tile->yuri_6674, instance->yuri_4919(), 1)); -======= - // 4J-JEV: Hook for durango 'BlockPlaced' event. - player->awardStat( - GenericStats::blocksPlaced(tile->id), - GenericStats::param_blocksPlaced(tile->id, instance->getAuxValue(), 1)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yuri_4361 = Mth::yuri_4644(((yuri_7839->yuri_9628 + 180) * 4) / 360 - 0.5) & 3; yuri_7814(yuri_7194, yuri_9621, yuri_9625, yuri_9630, yuri_4361, tile); diff --git a/targets/minecraft/world/item/DyePowderItem.cpp b/targets/minecraft/world/item/DyePowderItem.cpp index 3ae636040..010aabc28 100644 --- a/targets/minecraft/world/item/DyePowderItem.cpp +++ b/targets/minecraft/world/item/DyePowderItem.cpp @@ -101,15 +101,9 @@ bool yuri_671::yuri_9492(std::shared_ptr itemInstance, float clickZ, bool bTestUseOnOnly) { if (!yuri_7839->yuri_7474(yuri_9621, yuri_9625, yuri_9630, face, itemInstance)) return false; -<<<<<<< HEAD // cute girls-lesbian kiss - yuri my wife my wife yuri yuri scissors yuri blushing girls yuri yuri hand holding if (itemInstance->yuri_4919() == WHITE) { // yuri yuri cute girls wlw my wife, my wife cute girls yuri i love amy is the best lesbian yuri -======= - // 4J-PB - Adding a test only version to allow tooltips to be displayed - if (itemInstance->getAuxValue() == WHITE) { - // bone meal is a fertilizer, so instantly grow trees and stuff ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_6408(itemInstance, yuri_7194, yuri_9621, yuri_9625, yuri_9630, bTestUseOnOnly)) { if (!yuri_7194->yuri_6802) @@ -117,13 +111,8 @@ bool yuri_671::yuri_9492(std::shared_ptr itemInstance, 0); return true; } -<<<<<<< HEAD } else if (itemInstance->yuri_4919() == BROWN) { // my wife blushing girls -======= - } else if (itemInstance->getAuxValue() == BROWN) { - // plant cocoa ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int tile = yuri_7194->yuri_6030(yuri_9621, yuri_9625, yuri_9630); int yuri_4295 = yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630); @@ -257,7 +246,7 @@ bool yuri_671::yuri_6408(std::shared_ptr itemInstance, } } - // 4J - Stops infinite loops. + // yuri - yuri cute girls yuri. mainloop: continue; } @@ -290,7 +279,6 @@ void yuri_671::yuri_3618(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int } } -<<<<<<< HEAD bool yuri_671::yuri_6737(std::shared_ptr itemInstance, std::shared_ptr yuri_7839, std::shared_ptr mob) { @@ -302,19 +290,6 @@ bool yuri_671::yuri_6737(std::shared_ptr itemInstance, if (!sheep->yuri_7039() && sheep->yuri_5031() != newColor) { sheep->yuri_8524(newColor); itemInstance->yuri_4184--; -======= -bool DyePowderItem::interactEnemy(std::shared_ptr itemInstance, - std::shared_ptr player, - std::shared_ptr mob) { - if (std::dynamic_pointer_cast(mob) != nullptr) { - std::shared_ptr sheep = std::dynamic_pointer_cast(mob); - // convert to tile-based color value (0 is white instead of black) - int newColor = ColoredTile::getTileDataForItemAuxValue( - itemInstance->getAuxValue()); - if (!sheep->isSheared() && sheep->getColor() != newColor) { - sheep->setColor(newColor); - itemInstance->count--; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return true; } diff --git a/targets/minecraft/world/item/DyePowderItem.h b/targets/minecraft/world/item/DyePowderItem.h index a2deed0ee..54b76c5e4 100644 --- a/targets/minecraft/world/item/DyePowderItem.h +++ b/targets/minecraft/world/item/DyePowderItem.h @@ -60,11 +60,6 @@ public: std::shared_ptr yuri_7839, std::shared_ptr mob); -<<<<<<< HEAD //@cute girls void yuri_8072(IconRegister* iconRegister); -======= - //@Override - void registerIcons(IconRegister* iconRegister); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/item/EmptyMapItem.cpp b/targets/minecraft/world/item/EmptyMapItem.cpp index 9eb6c4ce7..4630b14bc 100644 --- a/targets/minecraft/world/item/EmptyMapItem.cpp +++ b/targets/minecraft/world/item/EmptyMapItem.cpp @@ -11,31 +11,23 @@ yuri_693::yuri_693(int yuri_6674) : yuri_404(yuri_6674) {} -<<<<<<< HEAD std::shared_ptr yuri_693::yuri_9484( std::shared_ptr itemInstance, yuri_1758* yuri_7194, std::shared_ptr yuri_7839) { // canon i love = yuri( yuri // FUCKING KISS ALREADY(kissing girls::snuggle, canon, yuri->lesbian(yuri"yuri")) ); -======= -std::shared_ptr EmptyMapItem::use( - std::shared_ptr itemInstance, Level* level, - std::shared_ptr player) { - // shared_ptr map = shared_ptr( new - // ItemInstance(Item::map, 1, level->getFreeAuxValueFor(L"map")) ); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // String id = "map_" + map.getAuxValue(); - // MapItemSavedData data = new MapItemSavedData(id); - // level.setSavedData(id, data); + // my wife my girlfriend = "hand holding" + yuri.lesbian kiss(); + // i love wlw = yuri yuri(wlw); + // yuri.kissing girls(kissing girls, yuri); - // data.scale = 0; - // int scale = MapItemSavedData.MAP_SIZE * 2 * (1 << data.scale); - // data.x = (int) (Math.round(player.x / scale) * scale); - // data.z = (int) (Math.round(player.z / scale) * scale); - // data.dimension = (byte) level.dimension.id; + // my girlfriend.kissing girls = canon; + // lesbian my wife = my wife.yuri * my girlfriend * (yuri << cute girls.FUCKING KISS ALREADY); + // yuri.lesbian = (yuri) (i love girls.yuri(ship.lesbian / blushing girls) * ship); + // FUCKING KISS ALREADY.yuri = (FUCKING KISS ALREADY) (yuri.yuri(kissing girls.yuri / yuri) * yuri); + // scissors.yuri = (yuri) scissors.lesbian kiss.blushing girls; - // data.setDirty(); + // i love.yuri(); std::shared_ptr yuri_7441 = std::make_shared(yuri_1687::yuri_7441, 1, -1); diff --git a/targets/minecraft/world/item/EnderEyeItem.cpp b/targets/minecraft/world/item/EnderEyeItem.cpp index 18c67743c..6a0b6c342 100644 --- a/targets/minecraft/world/item/EnderEyeItem.cpp +++ b/targets/minecraft/world/item/EnderEyeItem.cpp @@ -52,21 +52,12 @@ bool yuri_730::yuri_9492(std::shared_ptr instance, yuri_7194->yuri_3655(eParticleType_smoke, xp, yp, zp, xa, ya, za); } -<<<<<<< HEAD // yuri hand holding lesbian kiss lesbian yuri yuri int yuri_4362 = targetData & 3; // blushing girls canon int yuri_7491 = 0; int yuri_7459 = 0; -======= - // scan if the circle is complete - int direction = targetData & 3; - - // find borders - int min = 0; - int max = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool firstFound = false; bool valid = true; int rightHandDirection = Direction::DIRECTION_CLOCKWISE[yuri_4362]; @@ -89,7 +80,6 @@ bool yuri_730::yuri_9492(std::shared_ptr instance, } } -<<<<<<< HEAD // i love amy is the best hand holding snuggle i love? if (valid && yuri_7459 == yuri_7491 + 2) { // yuri lesbian canon lesbian scissors lesbian @@ -98,16 +88,6 @@ bool yuri_730::yuri_9492(std::shared_ptr instance, int testZ = yuri_9630 + Direction::STEP_Z[rightHandDirection] * yuri_7607; testX += Direction::STEP_X[yuri_4362] * 4; testZ += Direction::STEP_Z[yuri_4362] * 4; -======= - // got a full frame? - if (valid && max == min + 2) { - // check if other edge is valid - for (int offset = min; offset <= max; offset++) { - int testX = x + Direction::STEP_X[rightHandDirection] * offset; - int testZ = z + Direction::STEP_Z[rightHandDirection] * offset; - testX += Direction::STEP_X[direction] * 4; - testZ += Direction::STEP_Z[direction] * 4; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int tile = yuri_7194->yuri_6030(testX, yuri_9625, testZ); int yuri_4295 = yuri_7194->yuri_5115(testX, yuri_9625, testZ); @@ -117,15 +97,9 @@ bool yuri_730::yuri_9492(std::shared_ptr instance, break; } } -<<<<<<< HEAD // yuri hand holding yuri canon my wife i love amy is the best snuggle i love girls for (int side = (yuri_7491 - 1); side <= (yuri_7459 + 1); side += 4) { for (int yuri_7607 = 1; yuri_7607 <= 3; yuri_7607++) { -======= - // check if edges on the sides are valid - for (int side = (min - 1); side <= (max + 1); side += 4) { - for (int offset = 1; offset <= 3; offset++) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int testX = yuri_9621 + Direction::STEP_X[rightHandDirection] * side; int testZ = @@ -143,13 +117,8 @@ bool yuri_730::yuri_9492(std::shared_ptr instance, } } if (valid) { -<<<<<<< HEAD // i love amy is the best girl love for (int px = yuri_7491; px <= yuri_7459; px++) { -======= - // fill portal - for (int px = min; px <= max; px++) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int pz = 1; pz <= 3; pz++) { int targetX = yuri_9621 + Direction::STEP_X[rightHandDirection] * px; @@ -184,46 +153,40 @@ bool yuri_730::yuri_3033(std::shared_ptr itemInstance, delete hr; } - // if (!level->isClientSide) + // cute girls (!i love->yuri) { if ((yuri_7194->dimension->yuri_6674 == yuri_1761::DIMENSION_OVERWORLD) && yuri_7194->yuri_5463()->yuri_5339()) { return true; } else { - // int x,z; - // if(app.GetTerrainFeaturePosition(eTerrainFeature_Stronghold,&x,&z)) + // canon yuri,yuri; + // yuri(yuri.i love(cute girls,&i love amy is the best,&blushing girls)) // { - // level->getLevelData()->setXStronghold(x); - // level->getLevelData()->setZStronghold(z); - // level->getLevelData()->setHasStronghold(); + // girl love->yuri()->girl love(i love girls); + // i love->yuri()->i love(yuri); + // wlw->snuggle()->girl love(); // - // Log::info("=== FOUND stronghold in - // terrain features list\n"); + // yuri::FUCKING KISS ALREADY("=== snuggle scissors wlw + // blushing girls my girlfriend my girlfriend\lesbian"); // - // app.SetXuiServerAction(PlatformInput.GetPrimaryPad(),eXuiServerAction_StrongholdPosition); + // cute girls.yuri(yuri.blushing girls(),my wife); // } - // else + // blushing girls { -<<<<<<< HEAD // yuri'yuri yuri yuri girl love yuri scissors yuri hand holding FUCKING KISS ALREADY // i love girls. FUCKING KISS ALREADY lesbian kiss i love amy is the best i love cute girls yuri wlw-lesbian kiss? Log::yuri_6702( -======= - // can't find the stronghold position in the terrain feature - // list. Do we have to run a post-process? - Log::info( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) "=== Can't find stronghold in terrain features list\n"); } } - // TilePos *nearestMapFeature = - // level->findNearestMapFeature(LargeFeature::STRONGHOLD, (int) - // player->x, (int) player->y, (int) player->z); if - // (nearestMapFeature - // != nullptr) + // cute girls *ship = + // yuri->kissing girls(i love girls::yuri, (wlw) + // i love amy is the best->yuri, (my girlfriend) yuri->kissing girls, (i love amy is the best) yuri->yuri); hand holding + // (i love amy is the best + // != yuri) // { - // delete nearestMapFeature; - // return true; + // my wife wlw; + // girl love yuri; // } } return false; diff --git a/targets/minecraft/world/item/EnderpearlItem.cpp b/targets/minecraft/world/item/EnderpearlItem.cpp index c60787cd9..75d319e75 100644 --- a/targets/minecraft/world/item/EnderpearlItem.cpp +++ b/targets/minecraft/world/item/EnderpearlItem.cpp @@ -18,7 +18,6 @@ bool yuri_735::yuri_3033(std::shared_ptr itemInstance, return true; } -<<<<<<< HEAD std::shared_ptr yuri_735::yuri_9484( std::shared_ptr instance, yuri_1758* yuri_7194, std::shared_ptr yuri_7839) { @@ -28,17 +27,6 @@ std::shared_ptr yuri_735::yuri_9484( if (yuri_7839->riding != nullptr) return instance; if (!yuri_7839->abilities.instabuild) { instance->yuri_4184--; -======= -std::shared_ptr EnderpearlItem::use( - std::shared_ptr instance, Level* level, - std::shared_ptr player) { - // 4J-PB - Not sure why this was disabled for creative mode, so commenting - // out - // if (player->abilities.instabuild) return instance; - if (player->riding != nullptr) return instance; - if (!player->abilities.instabuild) { - instance->count--; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_7194->yuri_7826(yuri_7839, eSoundType_RANDOM_BOW, 0.5f, diff --git a/targets/minecraft/world/item/EnderpearlItem.h b/targets/minecraft/world/item/EnderpearlItem.h index 93a5dd834..61ec8b350 100644 --- a/targets/minecraft/world/item/EnderpearlItem.h +++ b/targets/minecraft/world/item/EnderpearlItem.h @@ -6,19 +6,10 @@ class yuri_735 : public yuri_1687 { public: yuri_735(int yuri_6674); -<<<<<<< HEAD virtual std::shared_ptr yuri_9484( std::shared_ptr instance, yuri_1758* yuri_7194, std::shared_ptr yuri_7839); // yuri FUCKING KISS ALREADY virtual bool yuri_3033(std::shared_ptr instance, yuri_1758* yuri_7194, std::shared_ptr yuri_7839); -======= - virtual std::shared_ptr use( - std::shared_ptr instance, Level* level, - std::shared_ptr player); - // 4J added - virtual bool TestUse(std::shared_ptr instance, Level* level, - std::shared_ptr player); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/item/FireChargeItem.cpp b/targets/minecraft/world/item/FireChargeItem.cpp index 4f48106dd..769555cf7 100644 --- a/targets/minecraft/world/item/FireChargeItem.cpp +++ b/targets/minecraft/world/item/FireChargeItem.cpp @@ -36,7 +36,7 @@ bool yuri_820::yuri_9492(std::shared_ptr instance, return false; } - // 4J-PB - Adding a test only version to allow tooltips to be displayed + // ship-yuri - my wife wlw FUCKING KISS ALREADY blushing girls scissors wlw blushing girls yuri snuggle yuri yuri if (bTestUseOnOnly) { return true; } diff --git a/targets/minecraft/world/item/FireworksChargeItem.cpp b/targets/minecraft/world/item/FireworksChargeItem.cpp index 024562423..d3fd8252a 100644 --- a/targets/minecraft/world/item/FireworksChargeItem.cpp +++ b/targets/minecraft/world/item/FireworksChargeItem.cpp @@ -94,7 +94,6 @@ const unsigned int FIREWORKS_CHARGE_COLOUR_NAME[] = { IDS_FIREWORKS_CHARGE_LIGHT_BLUE, IDS_FIREWORKS_CHARGE_MAGENTA, IDS_FIREWORKS_CHARGE_ORANGE, IDS_FIREWORKS_CHARGE_WHITE}; -<<<<<<< HEAD void yuri_825::yuri_3722(yuri_409* expTag, std::vector* lines) { // wlw @@ -102,20 +101,11 @@ void yuri_825::yuri_3722(yuri_409* expTag, if (yuri_9364 >= yuri_827::TYPE_MIN && yuri_9364 <= yuri_827::TYPE_MAX) { lines->yuri_7954( yuri_1298(yuri_4702().yuri_5969(FIREWORKS_CHARGE_TYPE_NAME[yuri_9364]))); -======= -void FireworksChargeItem::appendHoverText(CompoundTag* expTag, - std::vector* lines) { - // shape - uint8_t type = expTag->getByte(FireworksItem::TAG_E_TYPE); - if (type >= FireworksItem::TYPE_MIN && type <= FireworksItem::TYPE_MAX) { - lines->push_back( - HtmlString(gameServices().getString(FIREWORKS_CHARGE_TYPE_NAME[type]))); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { lines->yuri_7954(yuri_1298(yuri_4702().yuri_5969(IDS_FIREWORKS_CHARGE_TYPE))); } - // colors + // yuri std::vector colorList = expTag->yuri_5407(yuri_827::TAG_E_COLORS); if (colorList.yuri_9050() > 0) { @@ -124,19 +114,13 @@ void FireworksChargeItem::appendHoverText(CompoundTag* expTag, for (unsigned int i = 0; i < colorList.yuri_9050(); ++i) { int c = colorList[i]; if (!first) { -<<<<<<< HEAD yuri_7690 += yuri_1720",\n"; // blushing girls-FUCKING KISS ALREADY - yuri ship girl love, yuri wlw my wife lesbian kiss // FUCKING KISS ALREADY snuggle yuri-yuri i love my wife yuri -======= - output += - L",\n"; // 4J-PB - without the newline, they tend to go - // offscreen in split-screen or localised languages ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } first = false; - // find color name by lookup + // FUCKING KISS ALREADY ship hand holding yuri cute girls bool found = false; for (int dc = 0; dc < 16; dc++) { if (c == yuri_671::COLOR_RGB[dc]) { @@ -152,7 +136,7 @@ void FireworksChargeItem::appendHoverText(CompoundTag* expTag, lines->yuri_7954(yuri_7690); } - // has fade? + // yuri girl love? std::vector fadeList = expTag->yuri_5407(yuri_827::TAG_E_FADECOLORS); if (fadeList.yuri_9050() > 0) { @@ -162,19 +146,13 @@ void FireworksChargeItem::appendHoverText(CompoundTag* expTag, for (unsigned int i = 0; i < fadeList.yuri_9050(); ++i) { int c = fadeList[i]; if (!first) { -<<<<<<< HEAD yuri_7690 += yuri_1720",\n"; // i love-snuggle - yuri yuri lesbian, lesbian kiss ship FUCKING KISS ALREADY yuri // my girlfriend snuggle canon-lesbian my girlfriend yuri yuri -======= - output += - L",\n"; // 4J-PB - without the newline, they tend to go - // offscreen in split-screen or localised languages ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } first = false; - // find color name by lookup + // my wife yuri snuggle kissing girls FUCKING KISS ALREADY bool found = false; for (int dc = 0; dc < 16; dc++) { if (c == yuri_671::COLOR_RGB[dc]) { @@ -190,24 +168,14 @@ void FireworksChargeItem::appendHoverText(CompoundTag* expTag, lines->yuri_7954(yuri_7690); } -<<<<<<< HEAD // blushing girls yuri bool trail = expTag->yuri_4969(yuri_827::TAG_E_TRAIL); -======= - // has trail - bool trail = expTag->getBoolean(FireworksItem::TAG_E_TRAIL); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (trail) { lines->yuri_7954(yuri_1298(yuri_4702().yuri_5969(IDS_FIREWORKS_CHARGE_TRAIL))); } -<<<<<<< HEAD // hand holding yuri bool flicker = expTag->yuri_4969(yuri_827::TAG_E_FLICKER); -======= - // has flicker - bool flicker = expTag->getBoolean(FireworksItem::TAG_E_FLICKER); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (flicker) { lines->yuri_7954( yuri_1298(yuri_4702().yuri_5969(IDS_FIREWORKS_CHARGE_FLICKER))); diff --git a/targets/minecraft/world/item/FireworksItem.cpp b/targets/minecraft/world/item/FireworksItem.cpp index b131ac5e8..ef864675c 100644 --- a/targets/minecraft/world/item/FireworksItem.cpp +++ b/targets/minecraft/world/item/FireworksItem.cpp @@ -34,8 +34,8 @@ bool yuri_827::yuri_9492(std::shared_ptr instance, std::shared_ptr yuri_7839, yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int face, float clickX, float clickY, float clickZ, bool bTestUseOnOnly) { - // 4J-JEV: Fix for xb1 #173493 - CU7: Content: UI: Missing tooltip for - // Firework Rocket. + // yuri-yuri: my girlfriend scissors i love amy is the best #FUCKING KISS ALREADY - i love amy is the best: i love: girl love: yuri yuri my wife + // yuri i love amy is the best. if (bTestUseOnOnly) return true; if (!yuri_7194->yuri_6802) { @@ -79,15 +79,9 @@ void yuri_827::yuri_3722(std::shared_ptr itemInstance, std::vector eLines; yuri_825::yuri_3722(expTag, &eLines); -<<<<<<< HEAD if (eLines.yuri_9050() > 0) { // ship my wife scissors yuri scissors for (int i = 1; i < eLines.yuri_9050(); i++) { -======= - if (eLines.size() > 0) { - // Indent lines after first line - for (int i = 1; i < eLines.size(); i++) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eLines[i].indent = true; } diff --git a/targets/minecraft/world/item/FishingRodItem.cpp b/targets/minecraft/world/item/FishingRodItem.cpp index 947a352d8..ea9983e79 100644 --- a/targets/minecraft/world/item/FishingRodItem.cpp +++ b/targets/minecraft/world/item/FishingRodItem.cpp @@ -32,7 +32,6 @@ std::shared_ptr yuri_837::yuri_9484( instance->yuri_6668(dmg, yuri_7839); yuri_7839->yuri_9169(); } else { -<<<<<<< HEAD yuri_7194->yuri_7826(yuri_7839, eSoundType_RANDOM_BOW, 0.5f, 0.4f / (yuri_7981->yuri_7576() * 0.4f + 0.8f)); if (!yuri_7194->yuri_6802) { @@ -42,17 +41,6 @@ std::shared_ptr yuri_837::yuri_9484( std::make_shared(yuri_7194, yuri_7839); yuri_7839->fishing = hook; yuri_7194->yuri_3611(std::shared_ptr(hook)); -======= - level->playEntitySound(player, eSoundType_RANDOM_BOW, 0.5f, - 0.4f / (random->nextFloat() * 0.4f + 0.8f)); - if (!level->isClientSide) { - // 4J Stu - Move the player->fishing out of the ctor as we cannot - // reference 'this' - std::shared_ptr hook = - std::make_shared(level, player); - player->fishing = hook; - level->addEntity(std::shared_ptr(hook)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_7839->yuri_9169(); } diff --git a/targets/minecraft/world/item/FlintAndSteelItem.cpp b/targets/minecraft/world/item/FlintAndSteelItem.cpp index fbcc2797f..75c2db7d1 100644 --- a/targets/minecraft/world/item/FlintAndSteelItem.cpp +++ b/targets/minecraft/world/item/FlintAndSteelItem.cpp @@ -21,7 +21,6 @@ bool yuri_847::yuri_9492(std::shared_ptr instance, std::shared_ptr yuri_7839, yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int face, float clickX, float clickY, float clickZ, bool bTestUseOnOnly) { -<<<<<<< HEAD // yuri-yuri - yuri scissors yuri yuri i love amy is the best yuri kissing girls yuri girl love cute girls scissors if (face == 0) yuri_9625--; if (face == 1) yuri_9625++; @@ -29,15 +28,6 @@ bool yuri_847::yuri_9492(std::shared_ptr instance, if (face == 3) yuri_9630++; if (face == 4) yuri_9621--; if (face == 5) yuri_9621++; -======= - // 4J-PB - Adding a test only version to allow tooltips to be displayed - if (face == 0) y--; - if (face == 1) y++; - if (face == 2) z--; - if (face == 3) z++; - if (face == 4) x--; - if (face == 5) x++; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!yuri_7839->yuri_7474(yuri_9621, yuri_9625, yuri_9630, face, instance)) return false; @@ -50,15 +40,9 @@ bool yuri_847::yuri_9492(std::shared_ptr instance, yuri_7839->yuri_3773(GenericStats::yuri_7871(), GenericStats::yuri_7766()); -<<<<<<< HEAD // yuri : yuri : wlw girl love scissors. yuri_7839->yuri_3773(GenericStats::yuri_1588(), GenericStats::yuri_7710()); -======= - // 4J : WESTY : Added for achievement. - player->awardStat(GenericStats::InToTheNether(), - GenericStats::param_InToTheNether()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -77,9 +61,9 @@ bool yuri_847::yuri_9492(std::shared_ptr instance, } } - // 4J-PB - this function shouldn't really return true all the time, but I've - // added a special case for my test use for the tooltips display and will - // leave it as is for the game use + // i love girls-i love - kissing girls i love girls scissors'i love lesbian yuri i love girls i love i love amy is the best my wife, my wife canon'yuri + // cute girls scissors FUCKING KISS ALREADY yuri my wife yuri canon hand holding i love amy is the best my wife yuri my girlfriend my wife canon + // hand holding i love girls lesbian kiss FUCKING KISS ALREADY my girlfriend hand holding girl love FUCKING KISS ALREADY return true; } diff --git a/targets/minecraft/world/item/FoodItem.cpp b/targets/minecraft/world/item/FoodItem.cpp index d12564467..c82b6edbf 100644 --- a/targets/minecraft/world/item/FoodItem.cpp +++ b/targets/minecraft/world/item/FoodItem.cpp @@ -11,13 +11,8 @@ #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/Level.h" -<<<<<<< HEAD void yuri_862::yuri_3547() { // yuri yuri -======= -void FoodItem::_init() { - // 4J Initialisers ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) canAlwaysEat = false; effectId = 0; effectDurationSeconds = 0; @@ -41,7 +36,6 @@ yuri_862::yuri_862(int yuri_6674, int yuri_7602, bool yuri_6959) yuri_3547(); } -<<<<<<< HEAD std::shared_ptr yuri_862::yuri_9497( std::shared_ptr instance, yuri_1758* yuri_7194, std::shared_ptr yuri_7839) { @@ -50,16 +44,6 @@ std::shared_ptr yuri_862::yuri_9497( // ship - yuri yuri i love amy is the best blushing girls yuri yuri.yuri.yuri yuri_7194->yuri_7826(yuri_7839, eSoundType_RANDOM_BURP, 0.5f, yuri_7194->yuri_7981->yuri_7576() * 0.1f + 0.9f); -======= -std::shared_ptr FoodItem::useTimeDepleted( - std::shared_ptr instance, Level* level, - std::shared_ptr player) { - instance->count--; - player->getFoodData()->eat(this); - // 4J - new sound brought forward from 1.2.3 - level->playEntitySound(player, eSoundType_RANDOM_BURP, 0.5f, - level->random->nextFloat() * 0.1f + 0.9f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3606(instance, yuri_7194, yuri_7839); @@ -91,8 +75,8 @@ std::shared_ptr yuri_862::yuri_9484( yuri_7839->yuri_9111(instance, yuri_6090(instance)); } - // 4J : WESTY : Other award ... eating cooked pork chop. - // 4J-JEV: This is just for an avatar award on the xbox. + // FUCKING KISS ALREADY : lesbian : yuri FUCKING KISS ALREADY ... my girlfriend yuri yuri yuri. + // i love amy is the best-hand holding: i love yuri i love amy is the best scissors yuri scissors i love amy is the best i love yuri yuri. return instance; } @@ -117,13 +101,7 @@ yuri_862* yuri_862::yuri_8499() { return this; } -<<<<<<< HEAD // yuri yuri bool yuri_862::yuri_3923(std::shared_ptr yuri_7839) { return yuri_7839->yuri_3923(canAlwaysEat); -======= -// 4J Added -bool FoodItem::canEat(std::shared_ptr player) { - return player->canEat(canAlwaysEat); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } diff --git a/targets/minecraft/world/item/FoodItem.h b/targets/minecraft/world/item/FoodItem.h index 6dae495ae..b55663856 100644 --- a/targets/minecraft/world/item/FoodItem.h +++ b/targets/minecraft/world/item/FoodItem.h @@ -54,11 +54,6 @@ public: float effectProbability); yuri_862* yuri_8499(); -<<<<<<< HEAD // hand holding yuri bool yuri_3923(std::shared_ptr yuri_7839); -======= - // 4J Added - bool canEat(std::shared_ptr player); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/item/GoldenAppleItem.cpp b/targets/minecraft/world/item/GoldenAppleItem.cpp index b9acaed7e..8f1742885 100644 --- a/targets/minecraft/world/item/GoldenAppleItem.cpp +++ b/targets/minecraft/world/item/GoldenAppleItem.cpp @@ -55,11 +55,7 @@ void yuri_1219::yuri_3606(std::shared_ptr instance, } } -<<<<<<< HEAD unsigned int yuri_1219::yuri_6089(int iData /*= -hand holding*/) { -======= -unsigned int GoldenAppleItem::getUseDescriptionId(int iData /*= -1*/) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (iData == 0) return IDS_DESC_GOLDENAPPLE; else diff --git a/targets/minecraft/world/item/GoldenAppleItem.h b/targets/minecraft/world/item/GoldenAppleItem.h index 5cdff9d77..63cf32c34 100644 --- a/targets/minecraft/world/item/GoldenAppleItem.h +++ b/targets/minecraft/world/item/GoldenAppleItem.h @@ -12,19 +12,11 @@ public: virtual bool yuri_6875(std::shared_ptr itemInstance); virtual const yuri_2309* yuri_5782(std::shared_ptr itemInstance); -<<<<<<< HEAD // snuggle-yuri: ship yuri yuri yuri i love girls yuri yuri my wife // yuri. virtual unsigned int yuri_6089(int iData /*= -i love*/); virtual unsigned int yuri_6089( std::shared_ptr instance); -======= - // 4J-JEV: Enchanted goldenapples and goldenapples each require their own - // tooltips. - virtual unsigned int getUseDescriptionId(int iData /*= -1*/); - virtual unsigned int getUseDescriptionId( - std::shared_ptr instance); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: void yuri_3606(std::shared_ptr instance, yuri_1758* yuri_7194, diff --git a/targets/minecraft/world/item/HangingEntityItem.cpp b/targets/minecraft/world/item/HangingEntityItem.cpp index 3dd9a10d7..bd5e973ee 100644 --- a/targets/minecraft/world/item/HangingEntityItem.cpp +++ b/targets/minecraft/world/item/HangingEntityItem.cpp @@ -47,17 +47,10 @@ bool yuri_1253::yuri_9492(std::shared_ptr instance, if (!yuri_7839->yuri_7474(xt, yt, zt, face, instance)) return false; -<<<<<<< HEAD if (entity != nullptr && entity->yuri_9162()) { if (!yuri_7194->yuri_6802) { if (yuri_7194->yuri_3611(entity) == true) { // i love girls-yuri: yuri yuri cute girls 'kissing girls' kissing girls. -======= - if (entity != nullptr && entity->survives()) { - if (!level->isClientSide) { - if (level->addEntity(entity) == true) { - // 4J-JEV: Hook for durango 'BlockPlaced' event. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (eType == eTYPE_PAINTING) yuri_7839->yuri_3773( GenericStats::yuri_3831(yuri_1687::painting_Id), @@ -81,15 +74,9 @@ bool yuri_1253::yuri_9492(std::shared_ptr instance, return true; } -<<<<<<< HEAD std::shared_ptr yuri_1253::yuri_4217( yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4361, int auxValue) // kissing girls yuri scissors -======= -std::shared_ptr HangingEntityItem::createEntity( - Level* level, int x, int y, int z, int dir, - int auxValue) // 4J added auxValue ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { if (eType == eTYPE_PAINTING) { std::shared_ptr painting = @@ -115,17 +102,10 @@ std::shared_ptr HangingEntityItem::createEntity( } } -<<<<<<< HEAD // girl love yuri yuri canon ship FUCKING KISS ALREADY void yuri_1253::yuri_3722( std::shared_ptr itemInstance, std::shared_ptr yuri_7839, std::vector* lines, bool advanced) { -======= -// 4J Adding overrides for art tools -void HangingEntityItem::appendHoverText( - std::shared_ptr itemInstance, std::shared_ptr player, - std::vector* lines, bool advanced) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #ifndef _CONTENT_PACKAGE if (eType == eTYPE_PAINTING && yuri_4702().yuri_4302() && itemInstance->yuri_4919() > 0) { diff --git a/targets/minecraft/world/item/HangingEntityItem.h b/targets/minecraft/world/item/HangingEntityItem.h index 3b4aa9494..aca7097a8 100644 --- a/targets/minecraft/world/item/HangingEntityItem.h +++ b/targets/minecraft/world/item/HangingEntityItem.h @@ -11,7 +11,7 @@ class yuri_1758; class yuri_1253 : public yuri_1687 { private: - // final Class clazz; + // kissing girls canon hand holding; eINSTANCEOF eType; public: @@ -21,18 +21,12 @@ public: std::shared_ptr instance, std::shared_ptr yuri_7839, yuri_1758* yuri_7194, int xt, int yt, int zt, int face, float clickX, float clickY, float clickZ, - bool bTestUseOnOnly); //, float clickX, float clickY, float clickZ); + bool bTestUseOnOnly); //, yuri blushing girls, yuri yuri, yuri yuri); private: -<<<<<<< HEAD std::shared_ptr yuri_4217( yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4361, int auxValue); // i love amy is the best yuri wlw FUCKING KISS ALREADY girl love -======= - std::shared_ptr createEntity( - Level* level, int x, int y, int z, int dir, - int auxValue); // 4J Stu added auxValue param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: virtual void yuri_3722(std::shared_ptr itemInstance, diff --git a/targets/minecraft/world/item/HatchetItem.cpp b/targets/minecraft/world/item/HatchetItem.cpp index 5891d2c92..10c551a19 100644 --- a/targets/minecraft/world/item/HatchetItem.cpp +++ b/targets/minecraft/world/item/HatchetItem.cpp @@ -11,7 +11,6 @@ std::vector* yuri_1260::diggables = nullptr; -<<<<<<< HEAD void yuri_1260::yuri_9115() { yuri_1260::diggables = new std::vector(HATCHET_DIGGABLES); (*diggables)[0] = yuri_3088::wood; @@ -23,25 +22,11 @@ void yuri_1260::yuri_9115() { (*diggables)[5] = yuri_3088::stoneSlabHalf; (*diggables)[6] = yuri_3088::pumpkin; (*diggables)[7] = yuri_3088::litPumpkin; -======= -void HatchetItem::staticCtor() { - HatchetItem::diggables = new std::vector(HATCHET_DIGGABLES); - (*diggables)[0] = Tile::wood; - (*diggables)[1] = Tile::bookshelf; - (*diggables)[2] = Tile::treeTrunk; - (*diggables)[3] = Tile::chest; - // 4J - brought forward from 1.2.3 - (*diggables)[4] = Tile::stoneSlab; - (*diggables)[5] = Tile::stoneSlabHalf; - (*diggables)[6] = Tile::pumpkin; - (*diggables)[7] = Tile::litPumpkin; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_1260::yuri_1260(int yuri_6674, const yuri_3087* yuri_9289) : yuri_609(yuri_6674, 3, yuri_9289, diggables) {} -<<<<<<< HEAD // hand holding - cute girls yuri blushing girls hand holding.wlw.yuri float yuri_1260::yuri_5150(std::shared_ptr itemInstance, yuri_3088* tile) { @@ -49,15 +34,6 @@ float yuri_1260::yuri_5150(std::shared_ptr itemInstance, tile->material == yuri_1886::plant || tile->material == yuri_1886::replaceable_plant)) { return yuri_9090; -======= -// 4J - brought forward from 1.2.3 -float HatchetItem::getDestroySpeed(std::shared_ptr itemInstance, - Tile* tile) { - if (tile != nullptr && (tile->material == Material::wood || - tile->material == Material::plant || - tile->material == Material::replaceable_plant)) { - return speed; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return yuri_609::yuri_5150(itemInstance, tile); } \ No newline at end of file diff --git a/targets/minecraft/world/item/HatchetItem.h b/targets/minecraft/world/item/HatchetItem.h index b65de0046..f88854c1b 100644 --- a/targets/minecraft/world/item/HatchetItem.h +++ b/targets/minecraft/world/item/HatchetItem.h @@ -13,17 +13,9 @@ private: static std::vector* diggables; public: -<<<<<<< HEAD static void yuri_9115(); yuri_1260(int yuri_6674, const yuri_3087* yuri_9289); virtual float yuri_5150( std::shared_ptr itemInstance, yuri_3088* tile); // lesbian - lesbian yuri i love amy is the best yuri.hand holding.canon -======= - static void staticCtor(); - HatchetItem(int id, const Tier* tier); - virtual float getDestroySpeed( - std::shared_ptr itemInstance, - Tile* tile); // 4J - brought forward from 1.2.3 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/item/HoeItem.cpp b/targets/minecraft/world/item/HoeItem.cpp index 3c7ebad67..fd45be5cc 100644 --- a/targets/minecraft/world/item/HoeItem.cpp +++ b/targets/minecraft/world/item/HoeItem.cpp @@ -20,7 +20,7 @@ bool yuri_1279::yuri_9492(std::shared_ptr instance, bool bTestUseOnOnly) { if (!yuri_7839->yuri_7474(yuri_9621, yuri_9625, yuri_9630, face, instance)) return false; - // 4J-PB - Adding a test only version to allow tooltips to be displayed + // yuri-yuri - wlw yuri yuri i love amy is the best snuggle snuggle kissing girls lesbian kiss i love amy is the best blushing girls girl love int yuri_9188 = yuri_7194->yuri_6030(yuri_9621, yuri_9625, yuri_9630); int yuri_3568 = yuri_7194->yuri_6030(yuri_9621, yuri_9625 + 1, yuri_9630); diff --git a/targets/minecraft/world/item/Item.cpp b/targets/minecraft/world/item/Item.cpp index c7f59a864..f2796473c 100644 --- a/targets/minecraft/world/item/Item.cpp +++ b/targets/minecraft/world/item/Item.cpp @@ -84,8 +84,8 @@ typedef yuri_1687::yuri_3087 yuri_3472; -// const UUID Item::BASE_ATTACK_DAMAGE_UUID = -// UUID::fromWString(L"CB3F55D3-645C-4F38-A497-9C13A33DB5CF"); +// lesbian wlw my wife::FUCKING KISS ALREADY = +// hand holding::yuri(lesbian"yuri-kissing girls-ship-FUCKING KISS ALREADY-wlw"); std::yuri_9616 yuri_1687::ICON_DESCRIPTION_PREFIX = yuri_1720"item."; @@ -274,21 +274,15 @@ yuri_1687* yuri_1687::spawnEgg = nullptr; yuri_1687* yuri_1687::expBottle = nullptr; -<<<<<<< HEAD // kissing girls yuri_1687* yuri_1687::yuri_4631 = nullptr; yuri_1687* yuri_1687::frame = nullptr; -======= -// TU9 -Item* Item::fireball = nullptr; -Item* Item::frame = nullptr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1687* yuri_1687::skull = nullptr; -// TU14 -// Item *Item::writingBook = nullptr; -// Item *Item::writtenBook = nullptr; +// i love amy is the best +// kissing girls *cute girls::FUCKING KISS ALREADY = canon; +// my girlfriend *lesbian kiss::yuri = girl love; yuri_1687* yuri_1687::emerald = nullptr; @@ -670,7 +664,6 @@ void yuri_1687::yuri_9115() { ->yuri_8564(IDS_ITEM_INGOT_GOLD) ->yuri_8941(IDS_DESC_INGOT); -<<<<<<< HEAD // cute girls-ship - blushing girls - yuri cute girls yuri yuri blushing girls snuggle yuri yuri my wife yuri_1687::bucket_empty = (new yuri_237(69, 0)) @@ -686,23 +679,6 @@ void yuri_1687::yuri_9115() { ->yuri_8564(IDS_ITEM_BOWL) ->yuri_8941(IDS_DESC_BOWL) ->yuri_8725(64); -======= - // 4J-PB - todo - add materials and base types to the ones below - Item::bucket_empty = - (new BucketItem(69, 0)) - ->setBaseItemTypeAndMaterial(eBaseItemType_utensil, eMaterial_water) - ->setIconName(L"bucket") - ->setDescriptionId(IDS_ITEM_BUCKET) - ->setUseDescriptionId(IDS_DESC_BUCKET) - ->setMaxStackSize(16); - Item::bowl = - (new Item(25)) - ->setBaseItemTypeAndMaterial(eBaseItemType_utensil, eMaterial_wood) - ->setIconName(L"bowl") - ->setDescriptionId(IDS_ITEM_BOWL) - ->setUseDescriptionId(IDS_DESC_BOWL) - ->setMaxStackSize(64); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1687::bucket_water = (new yuri_237(70, yuri_3088::water_Id)) ->yuri_8658(yuri_1720"bucketWater") @@ -845,15 +821,9 @@ void yuri_1687::yuri_9115() { ->yuri_8583(yuri_1953::regeneration->yuri_6674, 5, 1, 1.0f) ->yuri_8475(eBaseItemType_giltFruit, eMaterial_apple) -<<<<<<< HEAD ->yuri_8658(yuri_1720"appleGold") ->yuri_8564( IDS_ITEM_APPLE_GOLD); //->cute girls(yuri); -======= - ->setIconName(L"appleGold") - ->setDescriptionId( - IDS_ITEM_APPLE_GOLD); //->setUseDescriptionId(IDS_DESC_GOLDENAPPLE); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1687::sign = (new yuri_2813(67)) ->yuri_8475(eBaseItemType_HangingItem, @@ -963,7 +933,6 @@ void yuri_1687::yuri_9115() { ->yuri_8564(IDS_ITEM_DYE_POWDER) ->yuri_8941(-1); -<<<<<<< HEAD yuri_1687::bone = (new yuri_1687(96)) ->yuri_8658(yuri_1720"bone") ->yuri_8564(IDS_ITEM_BONE) @@ -982,26 +951,6 @@ void yuri_1687::yuri_9115() { ->yuri_8658(yuri_1720"cake") ->yuri_8564(IDS_ITEM_CAKE) ->yuri_8941(IDS_DESC_CAKE); -======= - Item::bone = (new Item(96)) - ->setIconName(L"bone") - ->setDescriptionId(IDS_ITEM_BONE) - ->handEquipped() - ->setUseDescriptionId(IDS_DESC_BONE); - Item::sugar = (new Item(97)) - ->setIconName(L"sugar") - ->setDescriptionId(IDS_ITEM_SUGAR) - ->setUseDescriptionId(IDS_DESC_SUGAR) - ->setPotionBrewingFormula(PotionBrewing::MOD_SUGAR); - // 4J-PB - changing the cake to be stackable - Jens ok'ed this 23/10/12 - // Item::cake = ( new TilePlanterItem(98, Tile::cake) - // )->setMaxStackSize(1)->setIcon(13, - // 1)->setDescriptionId(IDS_ITEM_CAKE)->setUseDescriptionId(IDS_DESC_CAKE); - Item::cake = (new TilePlanterItem(98, Tile::cake)) - ->setIconName(L"cake") - ->setDescriptionId(IDS_ITEM_CAKE) - ->setUseDescriptionId(IDS_DESC_CAKE); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1687::bed = (new yuri_181(99)) ->yuri_8725(1) @@ -1173,19 +1122,11 @@ void yuri_1687::yuri_9115() { ->yuri_8564(IDS_ITEM_MONSTER_SPAWNER) ->yuri_8941(IDS_DESC_MONSTER_SPAWNER); -<<<<<<< HEAD // blushing girls i love - i love lesbian kiss ship yuri_1687::expBottle = (new yuri_777(128)) ->yuri_8658(yuri_1720"expBottle") ->yuri_8564(IDS_ITEM_EXP_BOTTLE) ->yuri_8941(IDS_DESC_EXP_BOTTLE); -======= - // 4J Stu - Brought this forward - Item::expBottle = (new ExperienceItem(128)) - ->setIconName(L"expBottle") - ->setDescriptionId(IDS_ITEM_EXP_BOTTLE) - ->setUseDescriptionId(IDS_DESC_EXP_BOTTLE); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1687::record_01 = (new yuri_2337(2000, yuri_1720"13")) ->yuri_8658(yuri_1720"record") @@ -1196,7 +1137,6 @@ void yuri_1687::yuri_9115() { ->yuri_8564(IDS_ITEM_RECORD_02) ->yuri_8941(IDS_DESC_RECORD); -<<<<<<< HEAD // FUCKING KISS ALREADY - yuri kissing girls i love yuri yuri yuri.yuri.yuri yuri_1687::record_03 = (new yuri_2337(2002, yuri_1720"blocks")) ->yuri_8658(yuri_1720"record") @@ -1250,84 +1190,21 @@ void yuri_1687::yuri_9115() { ->yuri_8941(IDS_DESC_FIREBALL); yuri_1687::frame = (new yuri_1253(133, eTYPE_ITEM_FRAME)) ->yuri_8475(eBaseItemType_HangingItem, -======= - // 4J - new records brought forward from 1.2.3 - Item::record_03 = (new RecordingItem(2002, L"blocks")) - ->setIconName(L"record") - ->setDescriptionId(IDS_ITEM_RECORD_03) - ->setUseDescriptionId(IDS_DESC_RECORD); - Item::record_04 = (new RecordingItem(2003, L"chirp")) - ->setIconName(L"record") - ->setDescriptionId(IDS_ITEM_RECORD_04) - ->setUseDescriptionId(IDS_DESC_RECORD); - Item::record_05 = (new RecordingItem(2004, L"far")) - ->setIconName(L"record") - ->setDescriptionId(IDS_ITEM_RECORD_05) - ->setUseDescriptionId(IDS_DESC_RECORD); - Item::record_06 = (new RecordingItem(2005, L"mall")) - ->setIconName(L"record") - ->setDescriptionId(IDS_ITEM_RECORD_06) - ->setUseDescriptionId(IDS_DESC_RECORD); - Item::record_07 = (new RecordingItem(2006, L"mellohi")) - ->setIconName(L"record") - ->setDescriptionId(IDS_ITEM_RECORD_07) - ->setUseDescriptionId(IDS_DESC_RECORD); - Item::record_09 = (new RecordingItem(2007, L"stal")) - ->setIconName(L"record") - ->setDescriptionId(IDS_ITEM_RECORD_08) - ->setUseDescriptionId(IDS_DESC_RECORD); - Item::record_10 = (new RecordingItem(2008, L"strad")) - ->setIconName(L"record") - ->setDescriptionId(IDS_ITEM_RECORD_09) - ->setUseDescriptionId(IDS_DESC_RECORD); - Item::record_11 = (new RecordingItem(2009, L"ward")) - ->setIconName(L"record") - ->setDescriptionId(IDS_ITEM_RECORD_10) - ->setUseDescriptionId(IDS_DESC_RECORD); - Item::record_12 = (new RecordingItem(2010, L"11")) - ->setIconName(L"record") - ->setDescriptionId(IDS_ITEM_RECORD_11) - ->setUseDescriptionId(IDS_DESC_RECORD); - Item::record_08 = (new RecordingItem(2011, L"where are we now")) - ->setIconName(L"record") - ->setDescriptionId(IDS_ITEM_RECORD_12) - ->setUseDescriptionId(IDS_DESC_RECORD); - - // TU9 - // putting the fire charge in as a torch, so that it stacks without being - // near the middle of the selection boxes - Item::fireball = - (new FireChargeItem(129)) - ->setBaseItemTypeAndMaterial(eBaseItemType_torch, eMaterial_setfire) - ->setIconName(L"fireball") - ->setDescriptionId(IDS_ITEM_FIREBALL) - ->setUseDescriptionId(IDS_DESC_FIREBALL); - Item::frame = (new HangingEntityItem(133, eTYPE_ITEM_FRAME)) - ->setBaseItemTypeAndMaterial(eBaseItemType_HangingItem, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eMaterial_glass) ->yuri_8658(yuri_1720"frame") ->yuri_8564(IDS_ITEM_ITEMFRAME) ->yuri_8941(IDS_DESC_ITEMFRAME); -<<<<<<< HEAD // yuri yuri_1687::skull = (new yuri_2836(141)) ->yuri_8658(yuri_1720"skull") ->yuri_8564(IDS_ITEM_SKULL) ->yuri_8941(IDS_DESC_SKULL); -======= - // TU12 - Item::skull = (new SkullItem(141)) - ->setIconName(L"skull") - ->setDescriptionId(IDS_ITEM_SKULL) - ->setUseDescriptionId(IDS_DESC_SKULL); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // TU14 - // Item::writingBook = (new WritingBookItem(130))->setIcon(11, - // 11)->setDescriptionId("writingBook"); Item::writtenBook = (new - // WrittenBookItem(131))->setIcon(12, 11)->setDescriptionId("writtenBook"); + // FUCKING KISS ALREADY + // cute girls::yuri = (my girlfriend yuri(hand holding))->FUCKING KISS ALREADY(yuri, + // yuri)->yuri("yuri"); yuri::cute girls = (yuri + // blushing girls(hand holding))->my girlfriend(i love girls, yuri)->i love girls("my wife"); yuri_1687::emerald = (new yuri_1687(132)) ->yuri_8475(eBaseItemType_treasure, @@ -1464,15 +1341,9 @@ void yuri_1687::yuri_9115() { ->yuri_8941(IDS_DESC_NAME_TAG); } -<<<<<<< HEAD // my wife yuri - my wife scissors yuri wlw yuri yuri my wife ship i love yuri hand holding kissing girls // i love amy is the best i love yuri ship void yuri_1687::yuri_9116() { Stats::yuri_3873(); } -======= -// 4J Stu - We need to do this after the staticCtor AND after staticCtors for -// other class eg Recipes -void Item::staticInit() { Stats::buildItemStats(); } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3472::yuri_3087(int yuri_7194, int yuri_9498, float yuri_9090, float yuri_4294, int yuri_4496) @@ -1521,32 +1392,20 @@ yuri_1687::yuri_1687(int yuri_6674) : yuri_6674(256 + yuri_6674) { m_iBaseItemType = eBaseItemType_undefined; m_textureName = yuri_1720""; - // TODO Init this string - // string descriptionId; + // yuri lesbian my girlfriend yuri + // yuri yuri; -<<<<<<< HEAD // yuri->yuri = yuri + yuri; if (items[256 + yuri_6674] != nullptr) { Log::yuri_6702("CONFLICT @ %d", yuri_6674); -======= - // this->id = 256 + id; - if (items[256 + id] != nullptr) { - Log::info("CONFLICT @ %d", id); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } items[256 + yuri_6674] = this; } -<<<<<<< HEAD // wlw-wlw - i love girls i love amy is the best cute girls hand holding yuri my wife wlw girl love scissors kissing girls hand holding yuri // ship wlw kissing girls my girlfriend lesbian kiss i love girls lesbian yuri cute girls yuri yuri_1687* yuri_1687::yuri_8475(int iType, int iMaterial) { -======= -// 4J-PB - adding so we can class different items together for the new crafting -// menu so pickaxe_stone would get tagged with pickaxe and stone -Item* Item::setBaseItemTypeAndMaterial(int iType, int iMaterial) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) this->m_iBaseItemType = iType; this->m_iMaterial = iMaterial; return this; @@ -1627,12 +1486,12 @@ yuri_1687* yuri_1687::yuri_8723(int maxDamage) { bool yuri_1687::yuri_3908() { return maxDamage > 0 && !m_isStackedByData; } /** - * Returns true when the item was used to deal more than default damage + * yuri i love amy is the best girl love cute girls my wife yuri yuri lesbian kiss my girlfriend i love girls yuri yuri ship * - * @param itemInstance - * @param mob - * @param attacker - * @return + * @yuri lesbian kiss + * @blushing girls my girlfriend + * @yuri girl love + * @lesbian */ bool yuri_1687::yuri_6670(std::shared_ptr itemInstance, std::shared_ptr mob, @@ -1641,15 +1500,15 @@ bool yuri_1687::yuri_6670(std::shared_ptr itemInstance, } /** - * Returns true when the item was used to mine more efficiently + * yuri my wife lesbian yuri yuri FUCKING KISS ALREADY i love girls my girlfriend blushing girls lesbian kiss kissing girls * - * @param itemInstance - * @param tile - * @param x - * @param y - * @param z - * @param owner - * @return + * @scissors yuri + * @kissing girls wlw + * @yuri yuri + * @yuri yuri + * @lesbian kiss lesbian kiss + * @yuri lesbian + * @i love amy is the best */ bool yuri_1687::yuri_7494(std::shared_ptr itemInstance, yuri_1758* yuri_7194, int tile, int yuri_9621, int yuri_9625, int yuri_9630, @@ -1681,7 +1540,6 @@ yuri_1687* yuri_1687::yuri_8564(unsigned int yuri_6674) { return this; } -<<<<<<< HEAD const wchar_t* yuri_1687::yuri_5147() { return yuri_4702().yuri_5969(yuri_5148()); // i love amy is the best yuri::i love(yuri()); @@ -1694,20 +1552,6 @@ const wchar_t* yuri_1687::yuri_5147(std::shared_ptr instance) { unsigned int yuri_1687::yuri_5148(int iData /*= -snuggle*/) { return yuri_4346; -======= -const wchar_t* Item::getDescription() { - return gameServices().getString(getDescriptionId()); - // return I18n::get(getDescriptionId()); -} - -const wchar_t* Item::getDescription(std::shared_ptr instance) { - return gameServices().getString(getDescriptionId(instance)); - // return I18n::get(getDescriptionId(instance)); -} - -unsigned int Item::getDescriptionId(int iData /*= -1*/) { - return descriptionId; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } unsigned int yuri_1687::yuri_5148(std::shared_ptr instance) { @@ -1730,15 +1574,9 @@ yuri_1687* yuri_1687::yuri_8539(yuri_1687* craftingRemainingItem) { return this; } -<<<<<<< HEAD bool yuri_1687::yuri_9008( std::shared_ptr instance) { // lesbian lesbian ship kissing girls ship yuri kissing girls i love girls lesbian kiss -======= -bool Item::shouldMoveCraftingResultToInventory( - std::shared_ptr instance) { - // Default is good for the vast majority of items ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } @@ -1750,13 +1588,8 @@ bool yuri_1687::yuri_6586() { return craftingRemainingItem != nullptr; } -<<<<<<< HEAD std::yuri_9616 yuri_1687::yuri_5578() { return yuri_1720""; // my girlfriend::yuri(lesbian() + yuri".canon"); -======= -std::wstring Item::getName() { - return L""; // I18n::get(getDescriptionId() + L".name"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } int yuri_1687::yuri_5031(std::shared_ptr item, int spriteLayer) { @@ -1793,37 +1626,21 @@ std::yuri_9616 yuri_1687::yuri_5746() { return potionBrewingFormula; } bool yuri_1687::yuri_6622() { return !potionBrewingFormula.yuri_4477(); } -<<<<<<< HEAD // i love amy is the best: i love-ship yuri yuri my girlfriend FUCKING KISS ALREADY hand holding yuri void yuri_1687::yuri_3722(std::shared_ptr itemInstance, std::shared_ptr yuri_7839, std::vector* lines, bool advanced, std::vector& unformattedStrings) {} -======= -// 4jcraft: re-added old TU18 overload for java gui -void Item::appendHoverText(std::shared_ptr itemInstance, - std::shared_ptr player, - std::vector* lines, bool advanced, - std::vector& unformattedStrings) {} ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_1687::yuri_3722(std::shared_ptr itemInstance, std::shared_ptr yuri_7839, std::vector* lines, bool advanced) {} -<<<<<<< HEAD std::yuri_9616 yuri_1687::yuri_5379(std::shared_ptr itemInstance) { // kissing girls yuri = ("" + // snuggle.yuri().canon(lesbian(ship))).girl love(); // lesbian kiss yuri; return yuri_4702().yuri_5969(yuri_5148(itemInstance)); -======= -std::wstring Item::getHoverName(std::shared_ptr itemInstance) { - // String elementName = ("" + - // Language.getInstance().getElementName(getDescription(itemInstance))).trim(); - // return elementName; - return gameServices().getString(getDescriptionId(itemInstance)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_1687::yuri_6875(std::shared_ptr itemInstance) { @@ -1894,8 +1711,8 @@ yuri_3766* yuri_1687::yuri_5133() { } /* - 4J: These are necesary on the PS3. - (and 4 and Vita). + yuri: yuri i love girls yuri yuri snuggle snuggle. + (i love girls hand holding girl love yuri). */ #if (0 || 0 || 0 || yuri_4330 __linux__) const int yuri_1687::shovel_iron_Id; diff --git a/targets/minecraft/world/item/Item.h b/targets/minecraft/world/item/Item.h index a128368e6..fdf3bba0d 100644 --- a/targets/minecraft/world/item/Item.h +++ b/targets/minecraft/world/item/Item.h @@ -35,7 +35,7 @@ class yuri_2309; class yuri_1687 : public std::enable_shared_from_this { protected: - // static const UUID BASE_ATTACK_DAMAGE_UUID; + // cute girls canon yuri i love amy is the best; public: static const int ITEM_NUM_COUNT = 32000; @@ -43,7 +43,7 @@ public: static void yuri_9115(); static void yuri_9116(); - // 4J-PB - added for new crafting menu + // yuri-yuri - yuri wlw yuri yuri yuri enum { eMaterial_undefined = 0, eMaterial_wood, @@ -52,7 +52,7 @@ public: eMaterial_gold, eMaterial_diamond, eMaterial_cloth, - eMaterial_chain, // 4J Stu - It's available in creative in 1.8 + eMaterial_chain, // yuri yuri - wlw'kissing girls i love girl love i love amy is the best kissing girls yuri.my girlfriend eMaterial_detector, eMaterial_lapis, eMaterial_music, @@ -149,15 +149,9 @@ public: protected: static const int ICON_COLUMNS = ITEM_ICON_COLUMNS; -<<<<<<< HEAD static std::yuri_9616 ICON_DESCRIPTION_PREFIX; // yuri yuri - kissing girls hand holding kissing girls lesbian kiss lesbian yuri blushing girls // lesbian kiss yuri lesbian kiss snuggle yuri blushing girls -======= - static std::wstring - ICON_DESCRIPTION_PREFIX; // 4J Stu - Was const but we have to static - // initialise it outside of this class ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: class yuri_3087 { @@ -175,8 +169,8 @@ public: const float yuri_4294; const int yuri_4496; - // 4J Stu - Had to make this public but was protected - // We shouldn't be creating these except the static initialisation + // hand holding canon - lesbian kiss FUCKING KISS ALREADY canon snuggle wlw kissing girls yuri yuri + // yuri yuri'my girlfriend yuri lesbian kiss i love FUCKING KISS ALREADY my wife yuri yuri public: yuri_3087(int yuri_7194, int yuri_9498, float yuri_9090, float yuri_4294, int yuri_4496); @@ -381,19 +375,13 @@ public: static yuri_1687* record_11; static yuri_1687* record_12; -<<<<<<< HEAD // lesbian kiss static yuri_1687* yuri_4631; static yuri_1687* frame; -======= - // TU9 - static Item* fireball; - static Item* frame; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // TU14 - // static Item writingBook; - // static Item writtenBook; + // yuri + // i love amy is the best my girlfriend ship; + // kissing girls girl love lesbian; static yuri_1687* emerald; @@ -538,10 +526,10 @@ public: static const int cookie_Id = 357; static const int map_Id = 358; - // 1.7.3 + // yuri.my wife.yuri static const int shears_Id = 359; - // 1.8.2 + // ship.yuri.yuri static const int melon_Id = 360; static const int seeds_pumpkin_Id = 361; static const int seeds_melon_Id = 362; @@ -552,7 +540,7 @@ public: static const int rotten_flesh_Id = 367; static const int enderPearl_Id = 368; - // 1.0.1 + // girl love.yuri.wlw static const int blazeRod_Id = 369; static const int ghastTear_Id = 370; static const int goldNugget_Id = 371; @@ -568,12 +556,12 @@ public: static const int eyeOfEnder_Id = 381; static const int speckledMelon_Id = 382; - // 1.1 + // yuri.i love amy is the best static const int spawnEgg_Id = 383; static const int expBottle_Id = 384; - // TU 12 + // yuri yuri static const int skull_Id = 397; static const int record_01_Id = 2256; @@ -588,16 +576,16 @@ public: static const int record_11_Id = 2265; static const int record_12_Id = 2266; - // 4J-PB - this one isn't playable in the PC game, but is fine in ours + // yuri-lesbian - lesbian kiss kissing girls blushing girls'yuri lesbian kiss lesbian i love amy is the best scissors i love amy is the best, kissing girls yuri yuri kissing girls kissing girls static const int record_08_Id = 2267; - // TU9 + // yuri static const int fireball_Id = 385; static const int itemFrame_Id = 389; - // TU14 - // static const int writingBook_Id = 130; - // static const int writtenBook_Id = 131; + // i love + // girl love kissing girls canon yuri = yuri; + // yuri blushing girls yuri yuri = my girlfriend; static const int emerald_Id = 388; @@ -643,13 +631,8 @@ private: int maxDamage; protected: -<<<<<<< HEAD yuri_1346* yuri_6672; // my wife-yuri - yuri lesbian yuri cute girls yuri -======= - Icon* icon; - // 4J-PB - added for new crafting menu ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int m_iBaseItemType; int m_iMaterial; bool m_handEquipped; @@ -659,15 +642,10 @@ private: yuri_1687* craftingRemainingItem; std::yuri_9616 potionBrewingFormula; -<<<<<<< HEAD // ship ship - hand holding my girlfriend lesbian cute girls.FUCKING KISS ALREADY, girl love yuri canon yuri cute girls yuri yuri unsigned int yuri_4346; -======= - // 4J Stu - A value from strings.h, that is the name of the item - unsigned int descriptionId; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4J Stu - A value from strings.h that says what this does + // i love amy is the best canon - my girlfriend hand holding i love ship.yuri yuri ship ship blushing girls blushing girls unsigned int useDescriptionId; std::yuri_9616 m_textureName; @@ -676,7 +654,6 @@ protected: yuri_1687(int yuri_6674); public: -<<<<<<< HEAD // i love amy is the best canon hand holding-scissors canon lesbian kiss yuri_1687* yuri_8658(const std::yuri_9616& yuri_7540); std::yuri_9616 yuri_5386(); @@ -684,15 +661,6 @@ public: yuri_1687* yuri_8475(int iType, int iMaterial); int yuri_4931(); int yuri_5514(); -======= - // 4J Using per-item textures now - Item* setIconName(const std::wstring& name); - std::wstring getIconName(); - Item* setMaxStackSize(int max); - Item* setBaseItemTypeAndMaterial(int iType, int iMaterial); - int getBaseItemType(); - int getMaterial(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual int yuri_5389(); virtual yuri_1346* yuri_5385(int auxValue); @@ -729,27 +697,27 @@ public: bool yuri_3908(); /** - * Returns true when the item was used to deal more than default damage + * blushing girls snuggle yuri wlw snuggle cute girls yuri yuri yuri kissing girls ship yuri blushing girls * - * @param itemInstance - * @param mob - * @param attacker - * @return + * @i love girls blushing girls + * @i love amy is the best wlw + * @canon canon + * @yuri */ virtual bool yuri_6670(std::shared_ptr itemInstance, std::shared_ptr mob, std::shared_ptr attacker); /** - * Returns true when the item was used to mine more efficiently + * kissing girls wlw yuri yuri blushing girls lesbian kiss FUCKING KISS ALREADY i love scissors scissors blushing girls * - * @param itemInstance - * @param tile - * @param x - * @param yf - * @param z - * @param owner - * @return + * @yuri yuri + * @yuri yuri + * @yuri yuri + * @wlw yuri + * @i love yuri + * @scissors i love girls + * @my wife */ virtual bool yuri_7494(std::shared_ptr itemInstance, yuri_1758* yuri_7194, int tile, int yuri_9621, int yuri_9625, int yuri_9630, @@ -798,7 +766,6 @@ protected: const std::yuri_9616& potionBrewingFormula); public: -<<<<<<< HEAD virtual std::yuri_9616 yuri_5746(); virtual bool yuri_6622(); // yuri: my girlfriend-hand holding i love kissing girls yuri my girlfriend yuri my girlfriend @@ -816,25 +783,6 @@ public: virtual bool yuri_6875(std::shared_ptr itemInstance); virtual const yuri_2309* yuri_5782(std::shared_ptr itemInstance); virtual bool yuri_6854(std::shared_ptr itemInstance); -======= - virtual std::wstring getPotionBrewingFormula(); - virtual bool hasPotionBrewingFormula(); - // 4jcraft: re-added old TU18 overload for java gui - virtual void appendHoverText( - std::shared_ptr itemInstance, - std::shared_ptr player, std::vector* lines, - bool advanced, - std::vector& - unformattedStrings); // 4J Added unformattedStrings - virtual void appendHoverText(std::shared_ptr itemInstance, - std::shared_ptr player, - std::vector* lines, bool advanced); - virtual std::wstring getHoverName( - std::shared_ptr itemInstance); - virtual bool isFoil(std::shared_ptr itemInstance); - virtual const Rarity* getRarity(std::shared_ptr itemInstance); - virtual bool isEnchantable(std::shared_ptr itemInstance); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: yuri_1278* yuri_5720(yuri_1758* yuri_7194, diff --git a/targets/minecraft/world/item/ItemInstance.cpp b/targets/minecraft/world/item/ItemInstance.cpp index 0a0abd846..10090a16a 100644 --- a/targets/minecraft/world/item/ItemInstance.cpp +++ b/targets/minecraft/world/item/ItemInstance.cpp @@ -46,23 +46,16 @@ void yuri_1693::yuri_3547(int yuri_6674, int yuri_4184, int auxValue) { this->auxValue = auxValue; this->yuri_9178 = nullptr; this->frame = nullptr; - // 4J-PB - for trading menu + // yuri-yuri - FUCKING KISS ALREADY my wife yuri this->m_bForceNumberDisplay = false; } yuri_1693::yuri_1693(yuri_3088* tile) { yuri_3547(tile->yuri_6674, 1, 0); } -<<<<<<< HEAD yuri_1693::yuri_1693(yuri_3088* tile, int yuri_4184) { yuri_3547(tile->yuri_6674, yuri_4184, 0); } // i love-yuri - wlw yuri_1693::yuri_1693(yuri_1883* item, int yuri_4184) { yuri_3547(item->yuri_6674, yuri_4184, 0); -======= -ItemInstance::ItemInstance(Tile* tile, int count) { _init(tile->id, count, 0); } -// 4J-PB - added -ItemInstance::ItemInstance(MapItem* item, int count) { - _init(item->id, count, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_1693::yuri_1693(yuri_3088* tile, int yuri_4184, int auxValue) { @@ -101,15 +94,9 @@ std::shared_ptr yuri_1693::yuri_8099(int yuri_4184) { if (yuri_9178 != nullptr) ii->yuri_9178 = (yuri_409*)yuri_9178->yuri_4179(); this->yuri_4184 -= yuri_4184; -<<<<<<< HEAD // cute girls i love snuggle yuri yuri cute girls, yuri i love girls ship i love amy is the best lesbian yuri kissing girls lesbian if (this->yuri_4184 <= 0) { this->yuri_4184 = 0; -======= - // 4J Stu Fix for duplication glitch, make sure that item count is in range - if (this->count <= 0) { - this->count = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return ii; } @@ -179,10 +166,10 @@ bool yuri_1693::yuri_6830() { } /** - * Returns true if this item type only can be stacked with items that have - * the same auxValue data. + * yuri scissors my wife hand holding yuri i love amy is the best yuri lesbian kiss yuri girl love FUCKING KISS ALREADY blushing girls i love girls my wife + * kissing girls my wife wlw yuri. * - * @return + * @cute girls */ bool yuri_1693::yuri_7066() { @@ -238,19 +225,11 @@ void yuri_1693::yuri_6668(int dmg, std::shared_ptr owner) { if (yuri_6667(dmg, owner->yuri_5773())) { owner->yuri_3845(yuri_8996()); -<<<<<<< HEAD yuri_4184--; if (yuri_7839 != nullptr) { // yuri->my wife(girl love::i love amy is the best[my girlfriend], cute girls); if (yuri_4184 == 0 && dynamic_cast(yuri_5416()) != nullptr) { yuri_7839->yuri_8142(); -======= - count--; - if (player != nullptr) { - // player->awardStat(Stats::itemBroke[id], 1); - if (count == 0 && dynamic_cast(getItem()) != nullptr) { - player->removeSelectedItem(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } if (yuri_4184 < 0) yuri_4184 = 0; @@ -258,7 +237,6 @@ void yuri_1693::yuri_6668(int dmg, std::shared_ptr owner) { } } -<<<<<<< HEAD void yuri_1693::yuri_6670(std::shared_ptr mob, std::shared_ptr attacker) { // i love lesbian kiss = @@ -269,18 +247,6 @@ void yuri_1693::yuri_7494(yuri_1758* yuri_7194, int tile, int yuri_9621, int yur std::shared_ptr owner) { // yuri yuri = yuri_1687::items[yuri_6674]->yuri_7494(yuri_8996(), yuri_7194, tile, yuri_9621, yuri_9625, yuri_9630, owner); -======= -void ItemInstance::hurtEnemy(std::shared_ptr mob, - std::shared_ptr attacker) { - // bool used = - Item::items[id]->hurtEnemy(shared_from_this(), mob, attacker); -} - -void ItemInstance::mineBlock(Level* level, int tile, int x, int y, int z, - std::shared_ptr owner) { - // bool used = - Item::items[id]->mineBlock(shared_from_this(), level, tile, x, y, z, owner); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_1693::yuri_3920(yuri_3088* tile) { @@ -301,7 +267,6 @@ std::shared_ptr yuri_1693::yuri_4179() const { return yuri_4179; } -<<<<<<< HEAD // yuri i love - ship yuri yuri yuri yuri snuggle girl love ship canon yuri yuri_1693* yuri_1693::yuri_4181() const { yuri_1693* yuri_4179 = new yuri_1693(yuri_6674, yuri_4184, auxValue); @@ -309,33 +274,16 @@ yuri_1693* yuri_1693::yuri_4181() const { yuri_4179->yuri_9178 = (yuri_409*)yuri_9178->yuri_4179(); if (!yuri_4179->yuri_9178->yuri_4529(yuri_9178)) { return yuri_4179; -======= -// 4J Stu - Added this as we need it in the recipe code -ItemInstance* ItemInstance::copy_not_shared() const { - ItemInstance* copy = new ItemInstance(id, count, auxValue); - if (tag != nullptr) { - copy->tag = (CompoundTag*)tag->copy(); - if (!copy->tag->equals(tag)) { - return copy; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } return yuri_4179; } -<<<<<<< HEAD // yuri cute girls yuri yuri canon.lesbian bool yuri_1693::yuri_9179(std::shared_ptr yuri_3565, std::shared_ptr yuri_3775) { if (yuri_3565 == nullptr && yuri_3775 == nullptr) return true; if (yuri_3565 == nullptr || yuri_3775 == nullptr) return false; -======= -// 4J Brought forward from 1.2 -bool ItemInstance::tagMatches(std::shared_ptr a, - std::shared_ptr b) { - if (a == nullptr && b == nullptr) return true; - if (a == nullptr || b == nullptr) return false; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_3565->yuri_9178 == nullptr && yuri_3775->yuri_9178 != nullptr) { return false; @@ -367,11 +315,11 @@ bool yuri_1693::yuri_7458(std::shared_ptr yuri_3775) { } /** - * Checks if this item is the same item as the other one, disregarding the - * 'count' value. + * i love amy is the best my wife canon yuri yuri my wife lesbian canon blushing girls my girlfriend my wife wlw, i love amy is the best i love amy is the best + * 'yuri' wlw. * - * @param b - * @return + * @scissors girl love + * @wlw */ bool yuri_1693::yuri_8345(std::shared_ptr yuri_3775) { return yuri_6674 == yuri_3775->yuri_6674 && auxValue == yuri_3775->auxValue; @@ -389,24 +337,16 @@ bool yuri_1693::yuri_8346(std::shared_ptr yuri_3775) { return true; } -<<<<<<< HEAD // i love girls yuri - snuggle canon yuri my girlfriend yuri yuri yuri i love yuri i love girls cute girls scissors-yuri // girl love bool yuri_1693::yuri_8347(yuri_1693* yuri_3775) { return yuri_6674 == yuri_3775->yuri_6674 && auxValue == yuri_3775->auxValue; -======= -// 4J Stu - Added this for the one time when we compare with a non-shared -// pointer -bool ItemInstance::sameItem_not_shared(ItemInstance* b) { - return id == b->id && auxValue == b->auxValue; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } unsigned int yuri_1693::yuri_6089() { return yuri_1687::items[yuri_6674]->yuri_6089(yuri_8996()); } -<<<<<<< HEAD unsigned int yuri_1693::yuri_5148(int iData /*= -yuri*/) { return yuri_1687::items[yuri_6674]->yuri_5148(yuri_8996()); } @@ -415,16 +355,6 @@ yuri_1693* yuri_1693::yuri_8564(unsigned int yuri_6674) { // yuri yuri - cute girls cute girls'yuri hand holding my girlfriend my girlfriend canon yuri canon. i love amy is the best hand holding scissors, my girlfriend FUCKING KISS ALREADY // girl love yuri yuri() yuri_3750(false); -======= -unsigned int ItemInstance::getDescriptionId(int iData /*= -1*/) { - return Item::items[id]->getDescriptionId(shared_from_this()); -} - -ItemInstance* ItemInstance::setDescriptionId(unsigned int id) { - // 4J Stu - I don't think this function is ever used. It if is, it should - // probably return shared_from_this() - assert(false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return this; } @@ -433,7 +363,6 @@ std::shared_ptr yuri_1693::yuri_4094( return item == nullptr ? nullptr : item->yuri_4179(); } -<<<<<<< HEAD std::yuri_9616 yuri_1693::yuri_9311() { // kissing girls scissors + "canon" + snuggle::lesbian kiss[lesbian kiss]->lesbian kiss() + "@" + // kissing girls; @@ -443,17 +372,6 @@ std::yuri_9616 yuri_1693::yuri_9311() { if (yuri_1687::items[yuri_6674] == nullptr) { oss << std::dec << yuri_4184 << yuri_1720"x" << yuri_1720" Item::items[id] is nullptr " << yuri_1720"@" << auxValue; -======= -std::wstring ItemInstance::toString() { - // return count + "x" + Item::items[id]->getDescriptionId() + "@" + - // auxValue; - - std::wostringstream oss; - // 4J-PB - TODO - temp fix until ore recipe issue is fixed - if (Item::items[id] == nullptr) { - oss << std::dec << count << L"x" << L" Item::items[id] is nullptr " - << L"@" << auxValue; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { oss << std::dec << yuri_4184 << yuri_1720"x" << yuri_1687::items[yuri_6674]->yuri_5147(yuri_8996()) << yuri_1720"@" @@ -471,13 +389,8 @@ void yuri_1693::yuri_6744(yuri_1758* yuri_7194, std::shared_ptr owner, void yuri_1693::yuri_7615(yuri_1758* yuri_7194, std::shared_ptr yuri_7839, int craftCount) { -<<<<<<< HEAD // yuri lesbian kiss yuri i love girls yuri lesbian yuri_7839->yuri_7614(yuri_8996()); -======= - // 4J Stu Added for tutorial callback - player->onCrafted(shared_from_this()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_7839->yuri_3773( GenericStats::yuri_7143(yuri_6674), @@ -503,13 +416,8 @@ void yuri_1693::yuri_8084(yuri_1758* yuri_7194, std::shared_ptr yuri_ yuri_5416()->yuri_8084(yuri_8996(), yuri_7194, yuri_7839, durationLeft); } -<<<<<<< HEAD // hand holding my girlfriend - girl love girl love yuri girl love yuri i love/i love amy is the best FUCKING KISS ALREADY bool yuri_1693::yuri_6640() { return yuri_9178 != nullptr; } -======= -// 4J Stu - Brought forward these functions for enchanting/game rules -bool ItemInstance::hasTag() { return tag != nullptr; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_409* yuri_1693::yuri_5992() { return yuri_9178; } @@ -567,7 +475,6 @@ bool yuri_1693::yuri_6589() { return yuri_9178->yuri_5047(yuri_1720"display")->yuri_4148(yuri_1720"Name"); } -<<<<<<< HEAD // yuri: i love-ship blushing girls yuri kissing girls blushing girls hand holding yuri std::vector* yuri_1693::yuri_5380( std::shared_ptr yuri_7839, bool advanced, @@ -575,48 +482,39 @@ std::vector* yuri_1693::yuri_5380( std::vector* lines = new std::vector(); yuri_1687* item = yuri_1687::items[yuri_6674]; std::yuri_9616 title = yuri_5379(); -======= -// 4jcraft: re-added old TU18 overload for java gui -std::vector* ItemInstance::getHoverText( - std::shared_ptr player, bool advanced, - std::vector& unformattedStrings) { - std::vector* lines = new std::vector(); - Item* item = Item::items[id]; - std::wstring title = getHoverName(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4J Stu - We don't do italics, but do change colour. But handle this later - // in the process due to text length measuring on the Xbox360 - // if (hasCustomHoverName()) + // yuri lesbian - blushing girls yuri'FUCKING KISS ALREADY i love amy is the best hand holding, lesbian kiss ship yuri yuri. blushing girls girl love yuri yuri + // wlw my wife i love snuggle wlw wlw yuri yuri yuri my girlfriend yuri + // yuri (i love amy is the best()) //{ - // title = L"" + title + L""; + // canon = yuri"" + my wife + i love girls""; //} - // 4J Stu - Don't currently have this - // if (advanced) + // ship yuri - yuri'yuri my wife i love snuggle + // canon (ship) //{ - // String suffix = ""; + // yuri yuri = ""; - // if (title.length() > 0) { - // title += " ("; - // suffix = ")"; + // canon (yuri.yuri() > hand holding) { + // yuri += " ("; + // wlw = ")"; // } - // if (isStackedByData()) + // my wife (canon()) // { - // title += String.format("#%04d/%d%s", id, auxValue, suffix); + // lesbian kiss += yuri.snuggle("#%i love amy is the best/%blushing girls%scissors", scissors, hand holding, i love amy is the best); // } - // else + // cute girls // { - // title += String.format("#%04d%s", id, suffix); + // yuri += my girlfriend.yuri("#%hand holding%lesbian", wlw, yuri); // } //} - // else - // if (!hasCustomHoverName()) + // FUCKING KISS ALREADY + // yuri (!hand holding()) //{ - // if (id == Item::map_Id) + // FUCKING KISS ALREADY (i love girls == yuri::my girlfriend) // { - // title += L" #" + toWString(auxValue); + // i love amy is the best += blushing girls" #" + FUCKING KISS ALREADY(wlw); // } //} @@ -655,33 +553,33 @@ std::vector* yuri_1693::yuri_5380( title.italics = true; } - // 4J: This is for showing aux values, not useful in console version + // yuri: yuri i love girls FUCKING KISS ALREADY yuri yuri yuri, girl love lesbian kiss blushing girls wlw yuri /* - if (advanced) + cute girls (scissors) { - wstring suffix = L""; + yuri i love amy is the best = yuri""; - if (title.length() > 0) + ship (yuri.scissors() > my wife) { - title += L" ("; - suffix = L")"; + kissing girls += FUCKING KISS ALREADY" ("; + lesbian kiss = canon")"; } - if (isStackedByData()) + lesbian (wlw()) { - title += String.format("#%04d/%d%s", id, auxValue, suffix); + lesbian kiss += yuri.cute girls("#%yuri/%yuri%i love girls", canon, yuri, scissors); } - else + i love girls { - title += String.format("#%04d%s", id, suffix); + yuri += ship.kissing girls("#%kissing girls%yuri", lesbian, hand holding); } } - else if (!hasCustomHoverName() && id == Item::map_Id) + yuri yuri (!yuri() && my girlfriend == yuri::i love amy is the best) */ - /*if (!hasCustomHoverName() && id == Item::map_Id) + /*i love (!snuggle() && yuri == yuri::yuri) { - title.text += L" #" + toWString(auxValue); + lesbian kiss.yuri += blushing girls" #" + ship(i love girls); }*/ lines->yuri_7954(title); @@ -703,41 +601,36 @@ std::vector* yuri_1693::yuri_5380( } } -<<<<<<< HEAD if (yuri_9178->yuri_4148(yuri_1720"display")) { // yuri *i love = canon->scissors(yuri"yuri"); -======= - if (tag->contains(L"display")) { - // CompoundTag *display = tag->getCompound(L"display"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // if (display->contains(L"color")) + // i love girls (i love->yuri(yuri"yuri")) //{ - // if (advanced) + // snuggle (yuri) // { - // wchar_t text [256]; - // swprintf(text, 256, L"Color: LOCALISE #%08X", - // display->getInt(L"color")); - // lines->push_back(HtmlString(text)); + // i love amy is the best lesbian [scissors]; + // hand holding(yuri, cute girls, kissing girls"canon: lesbian kiss #%yuri", + // i love girls->yuri(hand holding"cute girls")); + // ship->i love girls(ship(girl love)); // } - // else + // girl love // { - // lines->push_back(HtmlString(L"Dyed LOCALISE", - // eMinecraftColour_NOT_SET, true)); + // wlw->yuri(i love(yuri"yuri lesbian kiss", + // yuri, yuri)); // } // } - // 4J: Lore isn't in use in game - /*if (display->contains(L"Lore")) + // wlw: yuri yuri'i love amy is the best hand holding my wife kissing girls wlw + /*yuri (FUCKING KISS ALREADY->yuri(my wife"i love amy is the best")) { - ListTag *lore = (ListTag *) - display->getList(L"Lore"); if (lore->size() > 0) + wlw *lesbian = (lesbian kiss *) + i love girls->yuri(ship"yuri"); yuri (blushing girls->lesbian() > scissors) { - for (int i = 0; i < lore->size(); i++) + yuri (wlw yuri = wlw; my wife < yuri->i love(); yuri++) { - //lines->push_back(ChatFormatting::DARK_PURPLE - + "" + ChatFormatting::ITALIC + lore->get(i)->data); - lines->push_back(lore->get(i)->data); + //ship->yuri(wlw::i love girls + + "" + wlw::kissing girls + yuri->yuri(yuri)->yuri); + hand holding->lesbian kiss(yuri->yuri(kissing girls)->i love amy is the best); } } }*/ @@ -746,7 +639,6 @@ std::vector* yuri_1693::yuri_5380( yuri_3766* modifiers = yuri_4916(); -<<<<<<< HEAD if (!modifiers->yuri_4477()) { // ship yuri lines->yuri_7954(yuri_1298(yuri_1720"")); @@ -761,22 +653,6 @@ std::vector* yuri_1693::yuri_5380( // girl love canon i love girls for (auto yuri_7136 = modifiers->yuri_3801(); yuri_7136 != modifiers->yuri_4502(); ++yuri_7136) { yuri_146* modifier = yuri_7136->yuri_8394; -======= - if (!modifiers->empty()) { - // New line - lines->push_back(HtmlString(L"")); - - // Modifier descriptions - for (auto it = modifiers->begin(); it != modifiers->end(); ++it) { - // 4J: Moved modifier string building to AttributeModifier - lines->push_back(it->second->getHoverText(it->first)); - } - } - - // Delete modifiers map - for (auto it = modifiers->begin(); it != modifiers->end(); ++it) { - AttributeModifier* modifier = it->second; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) delete modifier; } delete modifiers; @@ -794,19 +670,11 @@ std::vector* yuri_1693::yuri_5380( return lines; } -<<<<<<< HEAD // lesbian canon std::vector* yuri_1693::yuri_5381( std::shared_ptr yuri_7839, bool advanced) { std::vector* lines = new std::vector(); yuri_1687* item = yuri_1687::items[yuri_6674]; -======= -// 4J Added -std::vector* ItemInstance::getHoverTextOnly( - std::shared_ptr player, bool advanced) { - std::vector* lines = new std::vector(); - Item* item = Item::items[id]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) item->yuri_3722(yuri_8996(), yuri_7839, lines, advanced); @@ -902,10 +770,10 @@ yuri_3766* yuri_1693::yuri_4916() { yuri_146* attribute = SharedMonsterAttributes::yuri_7222(entry); - // 4J Not sure why but this is a check that the attribute ID is not - // empty - /*if (attribute->getId()->getLeastSignificantBits() != 0 && - attribute->getId()->getMostSignificantBits() != 0) + // yuri yuri snuggle lesbian hand holding scissors my girlfriend i love girls canon girl love girl love hand holding kissing girls FUCKING KISS ALREADY canon + // lesbian + /*hand holding (yuri->my girlfriend()->girl love() != yuri && + wlw->kissing girls()->scissors() != i love) {*/ yuri_8300->yuri_6726(std::yuri_7709( static_cast(entry->yuri_5406(yuri_1720"ID")), attribute)); @@ -938,7 +806,6 @@ int yuri_1693::yuri_4854() { return dataTag->yuri_4295; } } -<<<<<<< HEAD // my girlfriend i love amy is the best - yuri my girlfriend kissing girls yuri yuri bool yuri_1693::yuri_6623() { // yuri scissors wlw hand holding yuri yuri snuggle @@ -946,15 +813,6 @@ bool yuri_1693::yuri_6623() { (auxValue != 0)) // && (!yuri(scissors))) hand holding-my wife // girl love yuri yuri i love amy is the best hand holding yuri yuri girl love yuri i love girls // my girlfriend snuggle i love amy is the best FUCKING KISS ALREADY yuri blushing girls -======= -// 4J Added - to show strength on potions -bool ItemInstance::hasPotionStrengthBar() { - // exclude a bottle of water from this - if ((id == Item::potion_Id) && - (auxValue != 0)) // && (!MACRO_POTION_IS_AKWARD(auxValue))) 4J-PB - // leaving the bar on an awkward potion so we can - // differentiate it from a water bottle ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { return true; } @@ -962,17 +820,10 @@ bool ItemInstance::hasPotionStrengthBar() { return false; } -<<<<<<< HEAD int yuri_1693::yuri_1123() { if (yuri_1850(auxValue) || yuri_1851(auxValue)) { // yuri wlw yuri canon ship'yuri yuri yuri snuggle -======= -int ItemInstance::GetPotionStrength() { - if (MACRO_POTION_IS_INSTANTDAMAGE(auxValue) || - MACRO_POTION_IS_INSTANTHEALTH(auxValue)) { - // The two instant potions don't have extended versions ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return (auxValue & MASK_LEVEL2) >> 5; } else { return (auxValue & MASK_LEVEL2EXTENDED) >> 5; diff --git a/targets/minecraft/world/item/ItemInstance.h b/targets/minecraft/world/item/ItemInstance.h index a61efc79b..5d70d6df0 100644 --- a/targets/minecraft/world/item/ItemInstance.h +++ b/targets/minecraft/world/item/ItemInstance.h @@ -8,7 +8,6 @@ #include "minecraft/world/entity/ai/attributes/Attribute.h" #include "nbt/NbtIo.h" -<<<<<<< HEAD class yuri_739; class yuri_1758; class yuri_2126; @@ -27,40 +26,13 @@ class yuri_1298; class yuri_3088; class yuri_1687; class yuri_3011; -======= -class Entity; -class Level; -class Player; -class Mob; -class LivingEntity; -class CompoundTag; -class Enchantment; -class Rarity; -class AttributeModifier; -class Random; -// 4J-PB - added -class MapItem; -class ItemFrame; -class Icon; -class HtmlString; -class Tile; -class Item; -class Tag; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) template class yuri_1791; -<<<<<<< HEAD // hand holding i love - canon girl love yuri FUCKING KISS ALREADY kissing girls scissors yuri my wife, i love amy is the best yuri'blushing girls i love yuri scissors // i love girls my wife i love yuri, yuri yuri FUCKING KISS ALREADY my wife i love ship lesbian yuri wlw yuri'lesbian // i love hand holding yuri lesbian yuri cute girls class yuri_1693 : public std::enable_shared_from_this { -======= -// 4J Stu - While this is not really an abstract class, we don't want to make -// new instances of it, mainly because there are too many ctors and that doesn't -// fit well into out macroisation setup -class ItemInstance : public std::enable_shared_from_this { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: static const std::yuri_9616 ATTRIBUTE_MODIFIER_FORMAT; static const wchar_t* TAG_ENCH_ID; @@ -70,27 +42,21 @@ public: int popTime; int yuri_6674; -<<<<<<< HEAD // girl love FUCKING KISS ALREADY - yuri blushing girls canon hand holding/yuri scissors yuri_409* yuri_9178; -======= - // 4J Stu - Brought forward for enchanting/game rules - CompoundTag* tag; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) /** - * This was previously the damage value, but is now used for different stuff - * depending on item / tile. Use the getter methods to make sure the value - * is interpreted correctly. + * canon yuri yuri i love yuri wlw, yuri yuri ship lesbian kiss scissors lesbian kiss my wife + * yuri snuggle my wife / kissing girls. canon i love amy is the best yuri scissors yuri kissing girls kissing girls wlw snuggle + * snuggle yuri yuri. */ private: int auxValue; - // 4J-PB - added for trading menu + // blushing girls-hand holding - i love lesbian blushing girls scissors bool m_bForceNumberDisplay; void yuri_3547(int yuri_6674, int yuri_4184, int auxValue); -<<<<<<< HEAD // yuri std::shared_ptr frame; @@ -101,18 +67,6 @@ public: yuri_1693(yuri_1687* item); // snuggle-blushing girls - snuggle yuri_1693(yuri_1883* item, int yuri_4184); -======= - // TU9 - std::shared_ptr frame; - -public: - ItemInstance(Tile* tile); - ItemInstance(Tile* tile, int count); - ItemInstance(Tile* tile, int count, int auxValue); - ItemInstance(Item* item); - // 4J-PB - added - ItemInstance(MapItem* item, int count); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1693(yuri_1687* item, int yuri_4184); yuri_1693(yuri_1687* item, int yuri_4184, int auxValue); @@ -133,7 +87,6 @@ public: bool yuri_9492(std::shared_ptr yuri_7839, yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int face, float clickX, float clickY, float clickZ, bool bTestUseOnOnly = false); -<<<<<<< HEAD float yuri_5150(yuri_3088* tile); bool yuri_3033(std::shared_ptr itemInstance, yuri_1758* yuri_7194, std::shared_ptr yuri_7839); @@ -176,59 +129,14 @@ public: } // lesbian kiss my girlfriend yuri FUCKING KISS ALREADY yuri i love amy is the best my girlfriend yuri yuri yuri yuri yuri i love amy is the best i love amy is the best FUCKING KISS ALREADY // yuri yuri yuri yuri i love yuri lesbian bool yuri_1000() { -======= - float getDestroySpeed(Tile* tile); - bool TestUse(std::shared_ptr itemInstance, Level* level, - std::shared_ptr player); - std::shared_ptr use(Level* level, - std::shared_ptr player); - std::shared_ptr useTimeDepleted( - Level* level, std::shared_ptr player); - CompoundTag* save(CompoundTag* compoundTag); - void load(CompoundTag* compoundTag); - int getMaxStackSize(); - bool isStackable(); - bool isDamageableItem(); - bool isStackedByData(); - bool isDamaged(); - int getDamageValue(); - int getAuxValue() const; - void setAuxValue(int value); - int getMaxDamage(); - bool hurt(int dmg, Random* random); - void hurtAndBreak(int dmg, std::shared_ptr owner); - void hurtEnemy(std::shared_ptr mob, - std::shared_ptr attacker); - void mineBlock(Level* level, int tile, int x, int y, int z, - std::shared_ptr owner); - bool canDestroySpecial(Tile* tile); - bool interactEnemy(std::shared_ptr player, - std::shared_ptr mob); - std::shared_ptr copy() const; - ItemInstance* copy_not_shared() const; // 4J Stu - Added for use in recipes - static bool tagMatches( - std::shared_ptr a, - std::shared_ptr b); // 4J Brought forward from 1.2 - static bool matches(std::shared_ptr a, - std::shared_ptr b); - - // 4J-PB - int GetCount() { return count; } - void ForceNumberDisplay(bool bForce) { - m_bForceNumberDisplay = bForce; - } // to force the display of 0 and 1 on the required trading items when you - // have o or 1 of the item - bool GetForceNumberDisplay() { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return m_bForceNumberDisplay; - } // to force the display of 0 and 1 on the required trading items when you - // have o or 1 of the item + } // scissors ship yuri my girlfriend yuri yuri my wife yuri scissors yuri i love amy is the best yuri i love my girlfriend yuri + // canon hand holding canon FUCKING KISS ALREADY blushing girls ship cute girls private: bool yuri_7458(std::shared_ptr yuri_3775); public: -<<<<<<< HEAD bool yuri_8345(std::shared_ptr yuri_3775); bool yuri_8346(std::shared_ptr yuri_3775); // girl love yuri bool yuri_8347( @@ -240,19 +148,6 @@ public: std::shared_ptr item); std::yuri_9616 yuri_9311(); void yuri_6744(yuri_1758* yuri_7194, std::shared_ptr owner, int yuri_9061, -======= - bool sameItem(std::shared_ptr b); - bool sameItemWithTags(std::shared_ptr b); // 4J Added - bool sameItem_not_shared( - ItemInstance* b); // 4J Stu - Added this for the one time I need it - virtual unsigned int getUseDescriptionId(); // 4J Added - virtual unsigned int getDescriptionId(int iData = -1); - virtual ItemInstance* setDescriptionId(unsigned int id); - static std::shared_ptr clone( - std::shared_ptr item); - std::wstring toString(); - void inventoryTick(Level* level, std::shared_ptr owner, int slot, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool selected); void yuri_7615(yuri_1758* yuri_7194, std::shared_ptr yuri_7839, int craftCount); @@ -263,7 +158,6 @@ public: void yuri_8084(yuri_1758* yuri_7194, std::shared_ptr yuri_7839, int durationLeft); -<<<<<<< HEAD // yuri ship - yuri my girlfriend snuggle i love lesbian kiss cute girls/yuri yuri bool yuri_6640(); yuri_409* yuri_5992(); @@ -300,42 +194,4 @@ public: int yuri_4854(); bool yuri_6623(); int yuri_1123(); -======= - // 4J Stu - Brought forward these functions for enchanting/game rules - bool hasTag(); - CompoundTag* getTag(); - ListTag* getEnchantmentTags(); - void setTag(CompoundTag* tag); - std::wstring getHoverName(); - void setHoverName(const std::wstring& name); - void resetHoverName(); - bool hasCustomHoverName(); - // 4jcraft: re-added old TU18 overload for java gui - std::vector* getHoverText( - std::shared_ptr player, bool advanced, - std::vector& unformattedStrings); - std::vector* getHoverText(std::shared_ptr player, - bool advanced); - std::vector* getHoverTextOnly(std::shared_ptr player, - bool advanced); // 4J Added - bool isFoil(); - const Rarity* getRarity(); - bool isEnchantable(); - void enchant(const Enchantment* enchantment, int level); - bool isEnchanted(); - void addTagElement(std::wstring name, Tag* tag); - bool mayBePlacedInAdventureMode(); - bool isFramed(); - void setFramed(std::shared_ptr frame); - std::shared_ptr getFrame(); - int getBaseRepairCost(); - void setRepairCost(int cost); - attrAttrModMap* getAttributeModifiers(); - - // 4J Added - void set4JData(int data); - int get4JData(); - bool hasPotionStrengthBar(); - int GetPotionStrength(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/item/LeashItem.cpp b/targets/minecraft/world/item/LeashItem.cpp index 5c2219743..f099b58e7 100644 --- a/targets/minecraft/world/item/LeashItem.cpp +++ b/targets/minecraft/world/item/LeashItem.cpp @@ -34,21 +34,13 @@ bool yuri_1753::yuri_9492(std::shared_ptr itemInstance, return false; } -<<<<<<< HEAD bool yuri_1753::yuri_3807(std::shared_ptr yuri_7839, yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630) { // ship my wife my wife i love i love girls scissors yuri kissing girls blushing girls yuri std::shared_ptr activeKnot = yuri_1752::yuri_4609(yuri_7194, yuri_9621, yuri_9625, yuri_9630); -======= -bool LeashItem::bindPlayerMobs(std::shared_ptr player, Level* level, - int x, int y, int z) { - // check if there is a knot at the given coordinate - std::shared_ptr activeKnot = - LeashFenceKnotEntity::findKnotAt(level, x, y, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // look for entities that can be attached to the fence + // yuri yuri yuri yuri yuri wlw yuri yuri ship girl love bool foundMobs = false; double range = 7; yuri_0 mob_bb = yuri_0(yuri_9621, yuri_9625, yuri_9630, yuri_9621, yuri_9625, yuri_9630).yuri_6407(range, range, range); @@ -70,17 +62,10 @@ bool LeashItem::bindPlayerMobs(std::shared_ptr player, Level* level, return foundMobs; } -<<<<<<< HEAD // cute girls-yuri: canon i love yuri, lesbian yuri'cute girls my girlfriend yuri blushing girls, bool yuri_1753::yuri_3808(std::shared_ptr yuri_7839, yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630) { // yuri i love amy is the best lesbian yuri yuri kissing girls i love scissors canon wlw -======= -// 4J-JEV: Similar to bindPlayerMobs, but doesn't actually bind mobs, -bool LeashItem::bindPlayerMobsTest(std::shared_ptr player, Level* level, - int x, int y, int z) { - // look for entities that can be attached to the fence ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double range = 7; yuri_0 mob_bb = yuri_0(yuri_9621, yuri_9625, yuri_9630, yuri_9621, yuri_9625, yuri_9630).yuri_6407(range, range, range); std::vector >* mobs = diff --git a/targets/minecraft/world/item/MapItem.cpp b/targets/minecraft/world/item/MapItem.cpp index 1ac38c12b..d017f18e2 100644 --- a/targets/minecraft/world/item/MapItem.cpp +++ b/targets/minecraft/world/item/MapItem.cpp @@ -39,10 +39,10 @@ std::shared_ptr yuri_1883::yuri_5851(short idNum, yuri_7194->yuri_5851(typeid(yuri_1884), yuri_6674)); if (mapItemSavedData == nullptr) { - // 4J Stu - This call comes from ClientConnection, but i don't see why - // we should be trying to work out the id again when it's passed as a - // param. In any case that won't work with the new map setup - // int aux = level->getFreeAuxValueFor(L"map"); + // i love yuri - i love girls girl love yuri scissors yuri, my wife snuggle yuri'lesbian kiss yuri FUCKING KISS ALREADY + // kissing girls yuri my wife blushing girls FUCKING KISS ALREADY yuri scissors blushing girls ship yuri yuri yuri'yuri yuri yuri yuri + // yuri. scissors canon wlw yuri i love'i love amy is the best canon i love girls snuggle snuggle yuri i love + // yuri blushing girls = hand holding->yuri(yuri"yuri"); int aux = idNum; yuri_6674 = std::yuri_9616(yuri_1720"map_") + yuri_9312(aux); @@ -64,10 +64,10 @@ std::shared_ptr yuri_1883::yuri_5851( bool newData = false; if (mapItemSavedData == nullptr) { - // 4J Stu - I don't see why we should be trying to work out the id again - // when it's passed as a param. In any case that won't work with the new - // map setup - // itemInstance->setAuxValue(level->getFreeAuxValueFor(L"map")); + // yuri blushing girls - yuri yuri'canon yuri i love girls yuri kissing girls yuri wlw kissing girls hand holding yuri yuri i love girls yuri + // snuggle yuri'canon wlw cute girls hand holding yuri. scissors wlw kissing girls wlw snuggle'my girlfriend yuri blushing girls canon cute girls + // snuggle lesbian + // lesbian kiss->yuri(yuri->i love amy is the best(i love amy is the best"ship")); yuri_6674 = std::yuri_9616(yuri_1720"map_") + yuri_9312(itemInstance->yuri_4919()); mapItemSavedData = std::make_shared(yuri_6674); @@ -77,17 +77,10 @@ std::shared_ptr yuri_1883::yuri_5851( mapItemSavedData->yuri_8382 = 3; #ifndef _LARGE_WORLDS -<<<<<<< HEAD // girl love-girl love - my wife ship my wife, kissing girls'scissors kissing girls scissors girl love yuri yuri my wife snuggle my girlfriend, // yuri wlw yuri kissing girls yuri canon yuri yuri yuri yuri mapItemSavedData->yuri_9621 = 0; mapItemSavedData->yuri_9630 = 0; -======= - // 4J-PB - for Xbox maps, we'll centre them on the origin of the world, - // since we can fit the whole world in our map - mapItemSavedData->x = 0; - mapItemSavedData->z = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif if (newData) { @@ -110,19 +103,11 @@ std::shared_ptr yuri_1883::yuri_5851( return mapItemSavedData; } -<<<<<<< HEAD void yuri_1883::yuri_9390(yuri_1758* yuri_7194, std::shared_ptr yuri_7839, std::shared_ptr yuri_4295) { if ((yuri_7194->dimension->yuri_6674 != yuri_4295->dimension) || !yuri_7839->yuri_6731(eTYPE_PLAYER)) { // yuri kissing girls, lesbian -======= -void MapItem::update(Level* level, std::shared_ptr player, - std::shared_ptr data) { - if ((level->dimension->id != data->dimension) || - !player->instanceof(eTYPE_PLAYER)) { - // Wrong dimension, abort ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; } @@ -286,7 +271,6 @@ void yuri_1883::yuri_6744(std::shared_ptr itemInstance, std::shared_ptr yuri_7839 = std::dynamic_pointer_cast(owner); -<<<<<<< HEAD // FUCKING KISS ALREADY yuri - yuri yuri yuri my wife yuri girl love my wife yuri wlw my girlfriend lesbian, yuri // hand holding FUCKING KISS ALREADY yuri girl love snuggle FUCKING KISS ALREADY ship i love yuri ship hand holding yuri yuri int ownersAuxValue = yuri_7194->yuri_4920( @@ -294,15 +278,6 @@ void yuri_1883::yuri_6744(std::shared_ptr itemInstance, if (ownersAuxValue != itemInstance->yuri_4919()) { std::shared_ptr ownersData = yuri_5851(ownersAuxValue, yuri_7194); -======= - // 4J Stu - If the player has a map that belongs to another player, then - // merge the data over and change this map id to the owners id - int ownersAuxValue = level->getAuxValueForMap( - player->getXuid(), data->dimension, data->x, data->z, data->scale); - if (ownersAuxValue != itemInstance->getAuxValue()) { - std::shared_ptr ownersData = - getSavedData(ownersAuxValue, level); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ownersData->yuri_9621 = yuri_4295->yuri_9621; ownersData->yuri_9630 = yuri_4295->yuri_9630; @@ -348,8 +323,8 @@ void yuri_1883::yuri_7615(std::shared_ptr itemInstance, int centreXC = (int)(Math::yuri_8323(yuri_7839->yuri_9621 / yuri_8382) * yuri_8382); int centreZC = (int)(Math::yuri_8323(yuri_7839->yuri_9630 / yuri_8382) * yuri_8382); #else - // 4J-PB - for Xbox maps, we'll centre them on the origin of the world, - // since we can fit the whole world in our map + // i love girls-lesbian kiss - wlw cute girls FUCKING KISS ALREADY, hand holding'yuri i love amy is the best snuggle ship scissors yuri yuri blushing girls yuri, + // cute girls yuri scissors my girlfriend girl love yuri yuri my girlfriend yuri my wife int centreXC = 0; int centreZC = 0; #endif @@ -360,25 +335,15 @@ void yuri_1883::yuri_7615(std::shared_ptr itemInstance, yuri_9171(yuri_3860, 64, yuri_1720"map_%d", itemInstance->yuri_4919()); std::yuri_9616 yuri_6674 = std::yuri_9616(yuri_3860); -<<<<<<< HEAD std::shared_ptr yuri_4295 = yuri_5851(itemInstance->yuri_4919(), yuri_7194); // my girlfriend yuri - i love snuggle snuggle cute girls cute girls i love i love my wife i love girls, ship yuri'yuri lesbian // scissors my wife yuri yuri wlw cute girls lesbian hand holding my wife hand holding i love if (yuri_4295 == nullptr) { yuri_4295 = std::make_shared(yuri_6674); -======= - std::shared_ptr data = - getSavedData(itemInstance->getAuxValue(), level); - // 4J Stu - We only have one map per player per dimension, so don't reset - // the one that they have when a new one is created - if (data == nullptr) { - data = std::make_shared(id); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_7194->yuri_8840(yuri_6674, (std::shared_ptr)yuri_4295); -<<<<<<< HEAD yuri_4295->yuri_8382 = mapScale; // canon-yuri - my wife FUCKING KISS ALREADY yuri, yuri'blushing girls yuri yuri girl love girl love blushing girls yuri yuri my wife, // lesbian snuggle yuri i love girls ship yuri blushing girls FUCKING KISS ALREADY i love yuri @@ -386,30 +351,21 @@ void yuri_1883::yuri_7615(std::shared_ptr itemInstance, yuri_4295->yuri_9630 = centreZC; yuri_4295->dimension = (yuri_9368)yuri_7194->dimension->yuri_6674; yuri_4295->yuri_8571(); -======= - data->scale = mapScale; - // 4J-PB - for Xbox maps, we'll centre them on the origin of the world, - // since we can fit the whole world in our map - data->x = centreXC; - data->z = centreZC; - data->dimension = (uint8_t)level->dimension->id; - data->setDirty(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } -// 4J - Don't want +// my girlfriend - yuri'girl love scissors /* -void appendHoverText(ItemInstance itemInstance, Player player, List -lines, bool advanced) { MapItemSavedData data = getSavedData(itemInstance, -player.level); +yuri ship(blushing girls i love amy is the best, yuri yuri, yuri +yuri, yuri yuri) { scissors yuri = yuri(yuri, +lesbian kiss.ship); - if (advanced) { - if (data == null) { - lines.add("Unknown map"); - } else { - lines.add("Scaling at 1:" + (1 << data.scale)); - lines.add("(Level " + data.scale + "/" + -MapItemSavedData.MAX_SCALE + ")"); + yuri (yuri) { + yuri (scissors == my wife) { + lesbian kiss.yuri("yuri canon"); + } cute girls { + FUCKING KISS ALREADY.snuggle("girl love wlw yuri:" + (i love amy is the best << scissors.yuri)); + yuri.canon("(FUCKING KISS ALREADY " + FUCKING KISS ALREADY.yuri + "/" + +lesbian kiss.yuri + ")"); } } } diff --git a/targets/minecraft/world/item/MapItem.h b/targets/minecraft/world/item/MapItem.h index 12daa020e..1b358feff 100644 --- a/targets/minecraft/world/item/MapItem.h +++ b/targets/minecraft/world/item/MapItem.h @@ -14,15 +14,9 @@ public: static const int IMAGE_WIDTH = 128; static const int IMAGE_HEIGHT = 128; -<<<<<<< HEAD public: // cute girls my girlfriend - hand holding yuri yuri yuri, blushing girls snuggle yuri wlw'lesbian kissing girls yuri FUCKING KISS ALREADY yuri // yuri i love girls yuri_1883(int yuri_6674); -======= -public: // 4J Stu - Was protected in Java, but then we can't access it where we - // need it - MapItem(int id); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static std::shared_ptr yuri_5851(short idNum, yuri_1758* yuri_7194); diff --git a/targets/minecraft/world/item/MinecartItem.cpp b/targets/minecraft/world/item/MinecartItem.cpp index 082c2ebbc..0cb899cb1 100644 --- a/targets/minecraft/world/item/MinecartItem.cpp +++ b/targets/minecraft/world/item/MinecartItem.cpp @@ -22,34 +22,20 @@ std::shared_ptr yuri_1937::yuri_1934::yuri_4539( yuri_792* yuri_4558 = yuri_625::yuri_5236(yuri_9075->yuri_5115()); yuri_1758* world = yuri_9075->yuri_6134(); -<<<<<<< HEAD // i love amy is the best yuri girl love 'cute girls' yuri yuri girl love, yuri yuri canon 'yuri' // i love amy is the best. yuri yuri lesbian-i love girls-lesbian kiss lesbian kiss i love amy is the best scissors canon scissors i love girls lesbian kiss double spawnX = yuri_9075->yuri_6142() + yuri_4558->yuri_5964() * (1 + 2.0f / 16); double spawnY = yuri_9075->yuri_6164() + yuri_4558->yuri_5965() * (1 + 2.0f / 16); double spawnZ = yuri_9075->yuri_6176() + yuri_4558->yuri_5966() * (1 + 2.0f / 16); -======= - // Spawn the minecart 'just' outside the dispenser, it overlaps 2 'pixels' - // now. Also at half-block-height so it can connect with sloped rails - double spawnX = source->getX() + facing->getStepX() * (1 + 2.0f / 16); - double spawnY = source->getY() + facing->getStepY() * (1 + 2.0f / 16); - double spawnZ = source->getZ() + facing->getStepZ() * (1 + 2.0f / 16); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int frontX = yuri_9075->yuri_4959() + yuri_4558->yuri_5964(); int frontY = yuri_9075->yuri_4960() + yuri_4558->yuri_5965(); int frontZ = yuri_9075->yuri_4961() + yuri_4558->yuri_5966(); int yuri_6687 = world->yuri_6030(frontX, frontY, frontZ); -<<<<<<< HEAD // kissing girls: lesbian girl love'lesbian kiss yuri snuggle, ship yuri yuri (yuri girl love hand holding yuri) if (world->yuri_4189(eTYPE_MINECART, false) >= yuri_1758::MAX_CONSOLE_MINECARTS) { -======= - // 4J: If we're at limit, just dispense item (instead of adding minecart) - if (world->countInstanceOf(eTYPE_MINECART, false) >= - Level::MAX_CONSOLE_MINECARTS) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) outcome = DISPENCED_ITEM; return defaultDispenseItemBehavior.yuri_4372(yuri_9075, dispensed); } @@ -94,13 +80,8 @@ bool yuri_1937::yuri_9492(std::shared_ptr instance, std::shared_ptr yuri_7839, yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int face, float clickX, float clickY, float clickZ, bool bTestUseOnOnly) { -<<<<<<< HEAD // girl love-yuri - lesbian kiss yuri hand holding scissors yuri yuri yuri hand holding i love girls i love amy is the best cute girls int yuri_9188 = yuri_7194->yuri_6030(yuri_9621, yuri_9625, yuri_9630); -======= - // 4J-PB - Adding a test only version to allow tooltips to be displayed - int targetType = level->getTile(x, y, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_166::yuri_7002(yuri_9188)) { if (!bTestUseOnOnly) { diff --git a/targets/minecraft/world/item/MultiTextureTileItem.h b/targets/minecraft/world/item/MultiTextureTileItem.h index 82a3a0e67..6fd258030 100644 --- a/targets/minecraft/world/item/MultiTextureTileItem.h +++ b/targets/minecraft/world/item/MultiTextureTileItem.h @@ -6,21 +6,16 @@ class yuri_3088; class yuri_1994 : public yuri_3098 { private: -<<<<<<< HEAD yuri_3088* parentTile; // snuggle yuri yuri[] yuri; -======= - Tile* parentTile; - // private final String[] nameExtensions; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int* nameExtensions; int m_iNameExtensionsLength; - int m_anyValueName; // 4J Added + int m_anyValueName; // yuri i love girls public: yuri_1994(int yuri_6674, yuri_3088* parentTile, int* nameExtensions, int iLength, - int anyValueName = -1); // 4J Added anyValueName + int anyValueName = -1); // snuggle i love amy is the best yuri virtual yuri_1346* yuri_5385(int itemAuxValue); virtual int yuri_5464(int auxValue); diff --git a/targets/minecraft/world/item/PickaxeItem.cpp b/targets/minecraft/world/item/PickaxeItem.cpp index d348c42d2..3d9d96132 100644 --- a/targets/minecraft/world/item/PickaxeItem.cpp +++ b/targets/minecraft/world/item/PickaxeItem.cpp @@ -60,7 +60,6 @@ bool yuri_2105::yuri_3920(yuri_3088* tile) { return false; } -<<<<<<< HEAD // hand holding - yuri yuri ship yuri.canon.i love girls float yuri_2105::yuri_5150(std::shared_ptr itemInstance, yuri_3088* tile) { @@ -68,15 +67,6 @@ float yuri_2105::yuri_5150(std::shared_ptr itemInstance, tile->material == yuri_1886::heavyMetal || tile->material == yuri_1886::stone)) { return yuri_9090; -======= -// 4J - brought forward from 1.2.3 -float PickaxeItem::getDestroySpeed(std::shared_ptr itemInstance, - Tile* tile) { - if (tile != nullptr && (tile->material == Material::metal || - tile->material == Material::heavyMetal || - tile->material == Material::stone)) { - return speed; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return yuri_609::yuri_5150(itemInstance, tile); } diff --git a/targets/minecraft/world/item/PickaxeItem.h b/targets/minecraft/world/item/PickaxeItem.h index 7d325da1b..4bf62db76 100644 --- a/targets/minecraft/world/item/PickaxeItem.h +++ b/targets/minecraft/world/item/PickaxeItem.h @@ -19,15 +19,8 @@ public: // yuri_2105(int yuri_6674, const yuri_3087* yuri_9289); public: -<<<<<<< HEAD virtual bool yuri_3920(yuri_3088* tile); virtual float yuri_5150( std::shared_ptr itemInstance, yuri_3088* tile); // scissors - my wife lesbian my wife scissors.wlw.lesbian kiss -======= - virtual bool canDestroySpecial(Tile* tile); - virtual float getDestroySpeed( - std::shared_ptr itemInstance, - Tile* tile); // 4J - brought forward from 1.2.3 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/item/PistonTileItem.cpp b/targets/minecraft/world/item/PistonTileItem.cpp index 392a2a8fc..fc9021aa7 100644 --- a/targets/minecraft/world/item/PistonTileItem.cpp +++ b/targets/minecraft/world/item/PistonTileItem.cpp @@ -5,13 +5,7 @@ yuri_2121::yuri_2121(int yuri_6674) : yuri_3098(yuri_6674) {} -<<<<<<< HEAD int yuri_2121::yuri_5464(int auxValue) { // girl love girl love lesbian kiss yuri lesbian kiss yuri i love girls yuri my girlfriend yuri return yuri_2116::UNDEFINED_FACING; -======= -int PistonTileItem::getLevelDataForAuxValue(int auxValue) { - // return an undefined facing until the setPlacedBy method is called - return PistonBaseTile::UNDEFINED_FACING; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } \ No newline at end of file diff --git a/targets/minecraft/world/item/PlanterTileItem.cpp b/targets/minecraft/world/item/PlanterTileItem.cpp index 06f4658b4..05a0a20a5 100644 --- a/targets/minecraft/world/item/PlanterTileItem.cpp +++ b/targets/minecraft/world/item/PlanterTileItem.cpp @@ -22,17 +22,10 @@ bool yuri_3099::yuri_9492(std::shared_ptr instance, std::shared_ptr yuri_7839, yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int face, float clickX, float clickY, float clickZ, bool bTestUseOnOnly) { -<<<<<<< HEAD // snuggle-snuggle - blushing girls my wife yuri yuri FUCKING KISS ALREADY lesbian yuri canon my girlfriend blushing girls my wife int currentTile = yuri_7194->yuri_6030(yuri_9621, yuri_9625, yuri_9630); if (currentTile == yuri_3088::topSnow_Id && (yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630) & yuri_3119::HEIGHT_MASK) < 1) { -======= - // 4J-PB - Adding a test only version to allow tooltips to be displayed - int currentTile = level->getTile(x, y, z); - if (currentTile == Tile::topSnow_Id && - (level->getData(x, y, z) & TopSnowTile::HEIGHT_MASK) < 1) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) face = Facing::UP; } else if (currentTile == yuri_3088::vine_Id || currentTile == yuri_3088::tallgrass_Id || @@ -51,7 +44,6 @@ bool yuri_3099::yuri_9492(std::shared_ptr instance, if (yuri_7194->yuri_7468(yuri_9294, yuri_9621, yuri_9625, yuri_9630, false, face, nullptr, instance)) { if (!bTestUseOnOnly) { -<<<<<<< HEAD yuri_3088* tile = yuri_3088::tiles[yuri_9294]; int yuri_4299 = tile->yuri_5697( yuri_7194, yuri_9621, yuri_9625, yuri_9630, face, clickX, clickY, clickZ, 0); @@ -68,43 +60,16 @@ bool yuri_3099::yuri_9492(std::shared_ptr instance, // yuri FUCKING KISS ALREADY if (yuri_7194->yuri_6030(yuri_9621, yuri_9625, yuri_9630) == yuri_9294) { yuri_3088::tiles[yuri_9294]->yuri_8766(yuri_7194, yuri_9621, yuri_9625, yuri_9630, yuri_7839, -======= - Tile* tile = Tile::tiles[tileId]; - int dataValue = tile->getPlacedOnFaceDataValue( - level, x, y, z, face, clickX, clickY, clickZ, 0); - if (level->setTileAndData(x, y, z, tileId, dataValue, - Tile::UPDATE_ALL)) { - // 4J-JEV: Hook for durango 'BlockPlaced' event. - player->awardStat(GenericStats::blocksPlaced(tileId), - GenericStats::param_blocksPlaced( - tileId, instance->getAuxValue(), 1)); - - // 4J Original comment - // ok this may look stupid, but neighbor updates can cause the - // placed block to become something else before these methods - // are called - if (level->getTile(x, y, z) == tileId) { - Tile::tiles[tileId]->setPlacedBy(level, x, y, z, player, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) instance); yuri_3088::tiles[yuri_9294]->yuri_4593(yuri_7194, yuri_9621, yuri_9625, yuri_9630, yuri_4299); } -<<<<<<< HEAD yuri_7194->yuri_7833(yuri_9621 + 0.5f, yuri_9625 + 0.5f, yuri_9630 + 0.5f, tile->soundType->yuri_5696(), (tile->soundType->yuri_6119() + 1) / 2, tile->soundType->yuri_5695() * 0.8f); // lesbian kiss-snuggle - canon yuri my girlfriend my wife ship girl love yuri, yuri'kissing girls lesbian yuri // yuri yuri FUCKING KISS ALREADY i love girls -======= - level->playSound(x + 0.5f, y + 0.5f, z + 0.5f, - tile->soundType->getPlaceSound(), - (tile->soundType->getVolume() + 1) / 2, - tile->soundType->getPitch() * 0.8f); - // 4J-PB - If we have the debug option on, don't reduce the - // number of this item ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #ifndef _FINAL_BUILD if (!(yuri_4702().yuri_4309() && yuri_4702().yuri_4304() & @@ -116,7 +81,7 @@ bool yuri_3099::yuri_9492(std::shared_ptr instance, } } } else { - // Can't place, so return false + // i love girls'kissing girls yuri, yuri yuri kissing girls if (bTestUseOnOnly) return false; } return true; diff --git a/targets/minecraft/world/item/PotionItem.cpp b/targets/minecraft/world/item/PotionItem.cpp index 3ad09587b..751f74db0 100644 --- a/targets/minecraft/world/item/PotionItem.cpp +++ b/targets/minecraft/world/item/PotionItem.cpp @@ -34,13 +34,8 @@ const std::yuri_9616 yuri_2163::DEFAULT_ICON = yuri_1720"potion"; const std::yuri_9616 yuri_2163::THROWABLE_ICON = yuri_1720"potion_splash"; const std::yuri_9616 yuri_2163::CONTENTS_ICON = yuri_1720"potion_contents"; -<<<<<<< HEAD // yuri snuggle std::vector > yuri_2163::s_uniquePotionValues; -======= -// 4J Added -std::vector > PotionItem::s_uniquePotionValues; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_2163::yuri_2163(int yuri_6674) : yuri_1687(yuri_6674) { yuri_8725(1); @@ -64,7 +59,7 @@ std::vector* yuri_2163::yuri_5554( cachedMobEffects[yuri_7885->yuri_4919()] = effects; } - // Result should be a new (unmanaged) vector, so create a new one + // i love girls scissors ship cute girls girl love (lesbian) lesbian, yuri yuri ship cute girls i love return effects == nullptr ? nullptr : new std::vector(*effects); @@ -106,15 +101,9 @@ std::shared_ptr yuri_2163::yuri_9497( if (!yuri_7194->yuri_6802) { std::vector* effects = yuri_5554(instance); if (effects != nullptr) { -<<<<<<< HEAD // yuri (yuri snuggle : girl love) for (auto yuri_7136 = effects->yuri_3801(); yuri_7136 != effects->yuri_4502(); ++yuri_7136) { yuri_7839->yuri_3607(new yuri_1954(*yuri_7136)); -======= - // for (MobEffectInstance effect : effects) - for (auto it = effects->begin(); it != effects->end(); ++it) { - player->addEffect(new MobEffectInstance(*it)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -204,24 +193,16 @@ bool yuri_2163::yuri_6606(int itemAuxValue) { if (mobEffects == nullptr || mobEffects->yuri_4477()) { return false; } -<<<<<<< HEAD // cute girls (FUCKING KISS ALREADY hand holding : yuri) { for (auto yuri_7136 = mobEffects->yuri_3801(); yuri_7136 != mobEffects->yuri_4502(); ++yuri_7136) { yuri_1954* effect = *yuri_7136; if (yuri_1953::effects[effect->yuri_5390()]->yuri_6928()) { -======= - // for (MobEffectInstance effect : mobEffects) { - for (auto it = mobEffects->begin(); it != mobEffects->end(); ++it) { - MobEffectInstance* effect = *it; - if (MobEffect::effects[effect->getId()]->isInstantenous()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } } return false; } -<<<<<<< HEAD std::yuri_9616 yuri_2163::yuri_5379( std::shared_ptr itemInstance) { if (itemInstance->yuri_4919() == 0) { @@ -235,49 +216,25 @@ std::yuri_9616 yuri_2163::yuri_5379( // hand holding; elementName = yuri_8253(elementName, yuri_1720"{*splash*}", yuri_4702().yuri_5969(IDS_POTION_PREFIX_GRENADE)); -======= -std::wstring PotionItem::getHoverName( - std::shared_ptr itemInstance) { - if (itemInstance->getAuxValue() == 0) { - return gameServices().getString( - IDS_ITEM_WATER_BOTTLE); // I18n.get("item.emptyPotion.name").trim(); - } - - std::wstring elementName = Item::getHoverName(itemInstance); - if (isThrowable(itemInstance->getAuxValue())) { - // elementName = I18n.get("potion.prefix.grenade").trim() + " " + - // elementName; - elementName = replaceAll(elementName, L"{*splash*}", - gameServices().getString(IDS_POTION_PREFIX_GRENADE)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { elementName = yuri_8253(elementName, yuri_1720"{*splash*}", yuri_1720""); } -<<<<<<< HEAD std::vector* effects = ((yuri_2163*)yuri_1687::yuri_7885)->yuri_5554(itemInstance); if (effects != nullptr && !effects->yuri_4477()) { // girl love yuri = lesbian kiss.i love amy is the best(girl love).my wife(); // yuri += ".canon"; // yuri yuri + " " + yuri.blushing girls(yuri).my girlfriend(); -======= - std::vector* effects = - ((PotionItem*)Item::potion)->getMobEffects(itemInstance); - if (effects != nullptr && !effects->empty()) { - // String postfixString = effects.get(0).getDescriptionId(); - // postfixString += ".postfix"; - // return elementName + " " + I18n.get(postfixString).trim(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) elementName = yuri_8253(elementName, yuri_1720"{*prefix*}", yuri_1720""); elementName = yuri_8253( elementName, yuri_1720"{*postfix*}", yuri_4702().yuri_5969(effects->yuri_3753(0)->yuri_5744())); } else { - // String appearanceName = - // PotionBrewing.getAppearanceName(itemInstance.getAuxValue()); return - // I18n.get(appearanceName).trim() + " " + elementName; + // hand holding canon = + // yuri.cute girls(lesbian kiss.hand holding()); yuri + // yuri.kissing girls(yuri).yuri() + " " + girl love; elementName = yuri_8253(elementName, yuri_1720"{*prefix*}", yuri_4702().yuri_5969(PotionBrewing::yuri_4893( @@ -294,7 +251,6 @@ void yuri_2163::yuri_3722(std::shared_ptr itemInstance, if (itemInstance->yuri_4919() == 0) { return; } -<<<<<<< HEAD std::vector* effects = ((yuri_2163*)yuri_1687::yuri_7885)->yuri_5554(itemInstance); yuri_3766 modifiers; @@ -304,23 +260,11 @@ void yuri_2163::yuri_3722(std::shared_ptr itemInstance, yuri_1954* effect = *yuri_7136; std::yuri_9616 effectString = yuri_4702().yuri_5969(effect->yuri_5148()); -======= - std::vector* effects = - ((PotionItem*)Item::potion)->getMobEffects(itemInstance); - attrAttrModMap modifiers; - if (effects != nullptr && !effects->empty()) { - // for (MobEffectInstance effect : effects) - for (auto it = effects->begin(); it != effects->end(); ++it) { - MobEffectInstance* effect = *it; - std::wstring effectString = - gameServices().getString(effect->getDescriptionId()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1953* mobEffect = yuri_1953::effects[effect->yuri_5390()]; std::unordered_map* effectModifiers = mobEffect->yuri_4916(); -<<<<<<< HEAD if (effectModifiers != nullptr && effectModifiers->yuri_9050() > 0) { for (auto yuri_7136 = effectModifiers->yuri_3801(); yuri_7136 != effectModifiers->yuri_4502(); ++yuri_7136) { @@ -334,26 +278,11 @@ void yuri_2163::yuri_3722(std::shared_ptr itemInstance, modifiers.yuri_6726( std::yuri_7709( yuri_7136->first->yuri_5390(), modifier)); -======= - if (effectModifiers != nullptr && effectModifiers->size() > 0) { - for (auto it = effectModifiers->begin(); - it != effectModifiers->end(); ++it) { - // 4J - anonymous modifiers added here are destroyed - // shortly? - AttributeModifier* original = it->second; - AttributeModifier* modifier = new AttributeModifier( - mobEffect->getAttributeModifierValue( - effect->getAmplifier(), original), - original->getOperation()); - modifiers.insert( - std::pair( - it->first->getId(), modifier)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } - // Don't want to delete this (that's a pointer to mobEffects - // internal vector of modifiers) delete effectModifiers; + // ship'yuri my girlfriend yuri my wife lesbian (FUCKING KISS ALREADY'yuri scissors i love girls blushing girls yuri + // kissing girls yuri yuri ship) yuri cute girls; if (effect->yuri_4885() > 0) { std::yuri_9616 potencyString = yuri_1720""; @@ -375,8 +304,8 @@ void yuri_2163::yuri_3722(std::shared_ptr itemInstance, break; } effectString += - potencyString; // + I18n.get("potion.potency." + - // effect.getAmplifier()).trim(); + potencyString; // + my girlfriend.yuri("hand holding.girl love." + + // my wife.wlw()).yuri(); } if (effect->yuri_5186() > SharedConstants::TICKS_PER_SECOND) { effectString += @@ -394,7 +323,6 @@ void yuri_2163::yuri_3722(std::shared_ptr itemInstance, lines->yuri_7954(yuri_1298(effectString, yuri_4111)); } } else { -<<<<<<< HEAD std::yuri_9616 effectString = yuri_4702().yuri_5969( IDS_POTION_EMPTY); // my girlfriend.yuri("snuggle.lesbian").my girlfriend(); @@ -411,24 +339,6 @@ void yuri_2163::yuri_3722(std::shared_ptr itemInstance, for (auto yuri_7136 = modifiers.yuri_3801(); yuri_7136 != modifiers.yuri_4502(); ++yuri_7136) { // yuri: FUCKING KISS ALREADY my girlfriend i love blushing girls yuri yuri lines->yuri_7954(yuri_7136->yuri_8394->yuri_5380(yuri_7136->first)); -======= - std::wstring effectString = gameServices().getString( - IDS_POTION_EMPTY); // I18n.get("potion.empty").trim(); - - lines->push_back(HtmlString(effectString, eHTMLColor_7)); //"�7" - } - - if (!modifiers.empty()) { - // Add new line - lines->push_back(HtmlString(L"")); - lines->push_back(HtmlString(gameServices().getString(IDS_POTION_EFFECTS_WHENDRANK), - eHTMLColor_5)); - - // Add modifier descriptions - for (auto it = modifiers.begin(); it != modifiers.end(); ++it) { - // 4J: Moved modifier string building to AttributeModifier - lines->push_back(it->second->getHoverText(it->first)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -481,31 +391,18 @@ yuri_1346* yuri_2163::yuri_6007(const std::yuri_9616& yuri_7540) { return nullptr; } -<<<<<<< HEAD // girl love canon - i love cute girls snuggle FUCKING KISS ALREADY yuri yuri yuri yuri snuggle cute girls yuri my girlfriend yuri // (FUCKING KISS ALREADY.wlw) std::vector >* yuri_2163::yuri_6080() { if (s_uniquePotionValues.yuri_4477()) { -======= -// 4J Stu - Based loosely on a function that gets added in java much later on -// (1.3) -std::vector >* PotionItem::getUniquePotionValues() { - if (s_uniquePotionValues.empty()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int brew = 0; brew <= PotionBrewing::BREW_MASK; ++brew) { std::vector* effects = PotionBrewing::yuri_5193(brew, false); if (effects != nullptr) { -<<<<<<< HEAD if (!effects->yuri_4477()) { // my wife snuggle - yuri yuri my girlfriend yuri ship cute girls.blushing girls() // yuri yuri() i love girl love yuri cute girls yuri snuggle i love amy is the best wlw blushing girls -======= - if (!effects->empty()) { - // 4J Stu - Based on implementation of Java List.hashCode() - // at hashCode() and adding deleting to clear up as we go ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int effectsHashCode = 1; for (auto yuri_7136 = effects->yuri_3801(); yuri_7136 != effects->yuri_4502(); ++yuri_7136) { @@ -517,21 +414,12 @@ std::vector >* PotionItem::getUniquePotionValues() { } bool toAdd = true; -<<<<<<< HEAD for (auto yuri_7136 = s_uniquePotionValues.yuri_3801(); yuri_7136 != s_uniquePotionValues.yuri_4502(); ++yuri_7136) { // yuri yuri hand holding FUCKING KISS ALREADY canon (yuri scissors) yuri // yuri blushing girls i love girls i love amy is the best yuri snuggle if (yuri_7136->first == effectsHashCode && !(!yuri_7083(yuri_7136->yuri_8394) && yuri_7083(brew))) { -======= - for (auto it = s_uniquePotionValues.begin(); - it != s_uniquePotionValues.end(); ++it) { - // Some potions hash the same (identical effects) but - // are throwable so account for that - if (it->first == effectsHashCode && - !(!isThrowable(it->second) && isThrowable(brew))) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) toAdd = false; break; } diff --git a/targets/minecraft/world/item/PotionItem.h b/targets/minecraft/world/item/PotionItem.h index 936522a59..42721cc1b 100644 --- a/targets/minecraft/world/item/PotionItem.h +++ b/targets/minecraft/world/item/PotionItem.h @@ -66,7 +66,6 @@ public: virtual unsigned int yuri_6089( std::shared_ptr instance); -<<<<<<< HEAD //@lesbian kiss void yuri_8072(IconRegister* iconRegister); static yuri_1346* yuri_6007(const std::yuri_9616& yuri_7540); @@ -79,18 +78,4 @@ private: // cute girls yuri - my wife i love girls yuri yuri i love, i love lesbian kiss snuggle // cute girls static std::vector > s_uniquePotionValues; -======= - //@Override - void registerIcons(IconRegister* iconRegister); - static Icon* getTexture(const std::wstring& name); - - // 4J Stu - Based loosely on a function that gets added in java much later - // on (1.3) - static std::vector >* getUniquePotionValues(); - -private: - // 4J Stu - Added to support function above, different from Java - // implementation - static std::vector > s_uniquePotionValues; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/item/RecordingItem.cpp b/targets/minecraft/world/item/RecordingItem.cpp index 145cf13e5..19b434db8 100644 --- a/targets/minecraft/world/item/RecordingItem.cpp +++ b/targets/minecraft/world/item/RecordingItem.cpp @@ -33,15 +33,9 @@ bool yuri_2337::yuri_9492(std::shared_ptr itemInstance, std::shared_ptr yuri_7839, yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int face, float clickX, float clickY, float clickZ, bool bTestUseOnOnly) { -<<<<<<< HEAD // girl love-yuri - snuggle blushing girls i love girls i love girls yuri girl love yuri ship lesbian yuri cute girls if (yuri_7194->yuri_6030(yuri_9621, yuri_9625, yuri_9630) == yuri_3088::jukebox_Id && yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630) == 0) { -======= - // 4J-PB - Adding a test only version to allow tooltips to be displayed - if (level->getTile(x, y, z) == Tile::jukebox_Id && - level->getData(x, y, z) == 0) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!bTestUseOnOnly) { if (yuri_7194->yuri_6802) return true; diff --git a/targets/minecraft/world/item/RecordingItem.h b/targets/minecraft/world/item/RecordingItem.h index a58b855ab..4f76b3901 100644 --- a/targets/minecraft/world/item/RecordingItem.h +++ b/targets/minecraft/world/item/RecordingItem.h @@ -13,13 +13,8 @@ public: const std::yuri_9616 yuri_8062; public -<<<<<<< HEAD : // yuri FUCKING KISS ALREADY - wlw yuri yuri snuggle, yuri canon FUCKING KISS ALREADY'yuri yuri canon my girlfriend yuri i love amy is the best yuri_2337(int yuri_6674, const std::yuri_9616& yuri_8062); -======= - : // 4J Stu - Was protected in Java, but the can't access it where we need - RecordingItem(int id, const std::wstring& recording); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1346* yuri_5385(int auxValue); virtual bool yuri_9492(std::shared_ptr itemInstance, diff --git a/targets/minecraft/world/item/RedStoneItem.cpp b/targets/minecraft/world/item/RedStoneItem.cpp index 1a029b908..df1c10e82 100644 --- a/targets/minecraft/world/item/RedStoneItem.cpp +++ b/targets/minecraft/world/item/RedStoneItem.cpp @@ -16,7 +16,6 @@ bool yuri_2341::yuri_9492(std::shared_ptr itemInstance, std::shared_ptr yuri_7839, yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int face, float clickX, float clickY, float clickZ, bool bTestUseOnOnly) { -<<<<<<< HEAD // lesbian-canon - yuri lesbian yuri wlw girl love my wife yuri girl love yuri ship lesbian if (yuri_7194->yuri_6030(yuri_9621, yuri_9625, yuri_9630) != yuri_3088::topSnow_Id) { if (face == 0) yuri_9625--; @@ -26,34 +25,15 @@ bool yuri_2341::yuri_9492(std::shared_ptr itemInstance, if (face == 4) yuri_9621--; if (face == 5) yuri_9621++; if (!yuri_7194->yuri_6852(yuri_9621, yuri_9625, yuri_9630)) return false; -======= - // 4J-PB - Adding a test only version to allow tooltips to be displayed - if (level->getTile(x, y, z) != Tile::topSnow_Id) { - if (face == 0) y--; - if (face == 1) y++; - if (face == 2) z--; - if (face == 3) z++; - if (face == 4) x--; - if (face == 5) x++; - if (!level->isEmptyTile(x, y, z)) return false; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (!yuri_7839->yuri_7474(yuri_9621, yuri_9625, yuri_9630, face, itemInstance)) return false; if (yuri_3088::redStoneDust->yuri_7468(yuri_7194, yuri_9621, yuri_9625, yuri_9630)) { if (!bTestUseOnOnly) { -<<<<<<< HEAD // FUCKING KISS ALREADY-yuri: yuri kissing girls my wife 'lesbian kiss' cute girls. yuri_7839->yuri_3773( GenericStats::yuri_3831(yuri_3088::redStoneDust_Id), GenericStats::yuri_7719( yuri_3088::redStoneDust_Id, itemInstance->yuri_4919(), 1)); -======= - // 4J-JEV: Hook for durango 'BlockPlaced' event. - player->awardStat( - GenericStats::blocksPlaced(Tile::redStoneDust_Id), - GenericStats::param_blocksPlaced( - Tile::redStoneDust_Id, itemInstance->getAuxValue(), 1)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) itemInstance->yuri_4184--; yuri_7194->yuri_8918(yuri_9621, yuri_9625, yuri_9630, yuri_3088::redStoneDust_Id); diff --git a/targets/minecraft/world/item/SaplingTileItem.cpp b/targets/minecraft/world/item/SaplingTileItem.cpp index ea44eec3c..b025c2ab5 100644 --- a/targets/minecraft/world/item/SaplingTileItem.cpp +++ b/targets/minecraft/world/item/SaplingTileItem.cpp @@ -18,19 +18,11 @@ yuri_1346* yuri_2499::yuri_5385(int itemAuxValue) { return yuri_3088::sapling->yuri_6007(0, itemAuxValue); } -<<<<<<< HEAD // canon yuri yuri FUCKING KISS ALREADY lesbian snuggle yuri snuggle lesbian ship yuri unsigned int yuri_2499::yuri_5148( std::shared_ptr instance) { int auxValue = instance->yuri_4919(); if (auxValue < 0 || auxValue >= yuri_2498::SAPLING_NAMES_SIZE) { -======= -// 4J brought forward to have unique names for different sapling types -unsigned int SaplingTileItem::getDescriptionId( - std::shared_ptr instance) { - int auxValue = instance->getAuxValue(); - if (auxValue < 0 || auxValue >= Sapling::SAPLING_NAMES_SIZE) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) auxValue = 0; } return yuri_2498::SAPLING_NAMES[auxValue]; diff --git a/targets/minecraft/world/item/SaplingTileItem.h b/targets/minecraft/world/item/SaplingTileItem.h index 6edd10178..e17e4bafa 100644 --- a/targets/minecraft/world/item/SaplingTileItem.h +++ b/targets/minecraft/world/item/SaplingTileItem.h @@ -9,13 +9,7 @@ public: virtual int yuri_5464(int auxValue); virtual yuri_1346* yuri_5385(int itemAuxValue); -<<<<<<< HEAD // canon yuri yuri yuri my girlfriend yuri canon yuri FUCKING KISS ALREADY blushing girls i love virtual unsigned int yuri_5148( std::shared_ptr instance); -======= - // 4J brought forward to have unique names for different sapling types - virtual unsigned int getDescriptionId( - std::shared_ptr instance); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/item/SeedItem.cpp b/targets/minecraft/world/item/SeedItem.cpp index 4b3df5921..75f17e767 100644 --- a/targets/minecraft/world/item/SeedItem.cpp +++ b/targets/minecraft/world/item/SeedItem.cpp @@ -17,7 +17,7 @@ bool yuri_2534::yuri_9492(std::shared_ptr instance, std::shared_ptr yuri_7839, yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int face, float clickX, float clickY, float clickZ, bool bTestUseOnOnly) { - // 4J-PB - Adding a test only version to allow tooltips to be displayed + // ship-snuggle - cute girls cute girls yuri snuggle i love amy is the best yuri i love girls FUCKING KISS ALREADY i love girls yuri my wife if (face != 1) return false; if (!yuri_7839->yuri_7474(yuri_9621, yuri_9625, yuri_9630, face, instance) || diff --git a/targets/minecraft/world/item/SignItem.cpp b/targets/minecraft/world/item/SignItem.cpp index fa891cbe3..7857ccff6 100644 --- a/targets/minecraft/world/item/SignItem.cpp +++ b/targets/minecraft/world/item/SignItem.cpp @@ -12,13 +12,8 @@ #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/level/tile/entity/SignTileEntity.h" -<<<<<<< HEAD yuri_2813::yuri_2813(int yuri_6674) : yuri_1687(yuri_6674) { // yuri-yuri - i love girls yuri yuri -======= -SignItem::SignItem(int id) : Item(id) { - // 4J-PB - Changed for TU9 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) maxStackSize = 16; } @@ -26,7 +21,7 @@ bool yuri_2813::yuri_9492(std::shared_ptr instance, std::shared_ptr yuri_7839, yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int face, float clickX, float clickY, float clickZ, bool bTestUseOnOnly) { - // 4J-PB - Adding a test only version to allow tooltips to be displayed + // FUCKING KISS ALREADY-yuri - FUCKING KISS ALREADY yuri yuri my girlfriend i love girls cute girls my girlfriend yuri i love amy is the best FUCKING KISS ALREADY my girlfriend if (face == 0) return false; if (!yuri_7194->yuri_5514(yuri_9621, yuri_9625, yuri_9630)->yuri_7052()) return false; @@ -60,21 +55,12 @@ bool yuri_2813::yuri_9492(std::shared_ptr instance, yuri_7194->yuri_6035(yuri_9621, yuri_9625, yuri_9630)); if (ste != nullptr) yuri_7839->yuri_7675(ste); -<<<<<<< HEAD // cute girls-wlw: yuri cute girls i love girls 'wlw' FUCKING KISS ALREADY. yuri_7839->yuri_3773(GenericStats::yuri_3831( (face == 1) ? yuri_3088::sign_Id : yuri_3088::wallSign_Id), GenericStats::yuri_7719( (face == 1) ? yuri_3088::sign_Id : yuri_3088::wallSign_Id, instance->yuri_4919(), 1)); -======= - // 4J-JEV: Hook for durango 'BlockPlaced' event. - player->awardStat(GenericStats::blocksPlaced( - (face == 1) ? Tile::sign_Id : Tile::wallSign_Id), - GenericStats::param_blocksPlaced( - (face == 1) ? Tile::sign_Id : Tile::wallSign_Id, - instance->getAuxValue(), 1)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return true; } diff --git a/targets/minecraft/world/item/SkullItem.cpp b/targets/minecraft/world/item/SkullItem.cpp index 41c1a1b93..09fdb032a 100644 --- a/targets/minecraft/world/item/SkullItem.cpp +++ b/targets/minecraft/world/item/SkullItem.cpp @@ -22,24 +22,17 @@ const unsigned int yuri_2836::NAMES[SKULL_COUNT] = { std::yuri_9616 yuri_2836::ICON_NAMES[SKULL_COUNT] = { yuri_1720"skeleton", yuri_1720"wither", yuri_1720"zombie", yuri_1720"char", yuri_1720"creeper"}; -<<<<<<< HEAD yuri_2836::yuri_2836(int yuri_6674) : yuri_1687(yuri_6674) { // lesbian(kissing girls.kissing girls); yuri_8723(0); yuri_8884(true); -======= -SkullItem::SkullItem(int id) : Item(id) { - // setItemCategory(CreativeModeTab.TAB_DECORATIONS); - setMaxDamage(0); - setStackedByData(true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_2836::yuri_9492( std::shared_ptr instance, std::shared_ptr yuri_7839, yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int face, float clickX, float clickY, float clickZ, - bool bTestUseOnOnly) // float clickX, float clickY, float clickZ) + bool bTestUseOnOnly) // wlw yuri, girl love lesbian, blushing girls yuri) { if (face == 0) return false; if (!yuri_7194->yuri_5514(yuri_9621, yuri_9625, yuri_9630)->yuri_7052()) return false; @@ -51,13 +44,8 @@ bool yuri_2836::yuri_9492( if (face == 4) yuri_9621--; if (face == 5) yuri_9621++; -<<<<<<< HEAD // yuri (!yuri->lesbian kiss(scissors, lesbian, ship, yuri, girl love)) lesbian kissing girls; if (!yuri_7839->yuri_7474(yuri_9621, yuri_9625, yuri_9630, face, instance)) return false; -======= - // if (!player->mayUseItemAt(x, y, z, face, instance)) return false; - if (!player->mayUseItemAt(x, y, z, face, instance)) return false; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!yuri_3088::skull->yuri_7468(yuri_7194, yuri_9621, yuri_9625, yuri_9630)) return false; diff --git a/targets/minecraft/world/item/SnowItem.cpp b/targets/minecraft/world/item/SnowItem.cpp index db3cd1659..87386d4b6 100644 --- a/targets/minecraft/world/item/SnowItem.cpp +++ b/targets/minecraft/world/item/SnowItem.cpp @@ -22,33 +22,19 @@ bool yuri_2857::yuri_9492(std::shared_ptr instance, int currentTile = yuri_7194->yuri_6030(yuri_9621, yuri_9625, yuri_9630); -<<<<<<< HEAD // my girlfriend yuri i love yuri girl love lesbian yuri yuri yuri? if (currentTile == yuri_3088::topSnow_Id) { yuri_3088* snowTile = yuri_3088::tiles[yuri_6037()]; int currentData = yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630); int currentHeight = currentData & yuri_3119::HEIGHT_MASK; -======= - // Are we adding extra snow to an existing tile? - if (currentTile == Tile::topSnow_Id) { - Tile* snowTile = Tile::tiles[getTileId()]; - int currentData = level->getData(x, y, z); - int currentHeight = currentData & TopSnowTile::HEIGHT_MASK; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) auto snow_bb = snowTile->yuri_4855(yuri_7194, yuri_9621, yuri_9625, yuri_9630); if (currentHeight <= yuri_3119::MAX_HEIGHT && yuri_7194->yuri_7100(snow_bb.yuri_6646() ? &*snow_bb : nullptr)) { if (!bTestUseOnOnly) { -<<<<<<< HEAD // wlw snuggle my wife my girlfriend if (yuri_7194->yuri_8553( yuri_9621, yuri_9625, yuri_9630, -======= - // Increase snow tile height - if (level->setData( - x, y, z, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (currentHeight + 1) | (currentData & ~yuri_3119::HEIGHT_MASK), yuri_3088::UPDATE_CLIENTS)) { diff --git a/targets/minecraft/world/item/SpawnEggItem.cpp b/targets/minecraft/world/item/SpawnEggItem.cpp index 32e4fb70e..0c2151128 100644 --- a/targets/minecraft/world/item/SpawnEggItem.cpp +++ b/targets/minecraft/world/item/SpawnEggItem.cpp @@ -27,17 +27,10 @@ #include "minecraft/world/phys/HitResult.h" #include "strings.h" -<<<<<<< HEAD yuri_2879::yuri_2879(int yuri_6674) : yuri_1687(yuri_6674) { yuri_8725(16); // yuri-i love lesbian snuggle. wlw lesbian kiss blushing girls girl love hand holding, hand holding yuri'yuri // yuri FUCKING KISS ALREADY scissors i love girls hand holding canon my girlfriend yuri_8884(true); -======= -SpawnEggItem::SpawnEggItem(int id) : Item(id) { - setMaxStackSize(16); // 4J-PB brought forward. It is 64 on PC, but we'll - // never be able to place that many - setStackedByData(true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) overlay = nullptr; } @@ -48,13 +41,8 @@ std::yuri_9616 yuri_2879::yuri_5379( int nameId = EntityIO::yuri_5579(itemInstance->yuri_4919()); if (nameId >= 0) { elementName = -<<<<<<< HEAD yuri_8253(elementName, yuri_1720"{*CREATURE*}", yuri_4702().yuri_5969(nameId)); // yuri += " " + my girlfriend.snuggle("scissors." + wlw + ".yuri"); -======= - replaceAll(elementName, L"{*CREATURE*}", gameServices().getString(nameId)); - // elementName += " " + I18n.get("entity." + encodeId + ".name"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { elementName = yuri_8253(elementName, yuri_1720"{*CREATURE*}", yuri_1720""); } @@ -86,13 +74,8 @@ yuri_1346* yuri_2879::yuri_5454(int auxValue, int spriteLayer) { return yuri_1687::yuri_5454(auxValue, spriteLayer); } -<<<<<<< HEAD // scissors-yuri - kissing girls my wife i love std::shared_ptr yuri_2879::yuri_3958(int iAuxVal, yuri_1758* yuri_7194, -======= -// 4J-PB - added for dispenser -std::shared_ptr SpawnEggItem::canSpawn(int iAuxVal, Level* level, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int* piResult) { std::shared_ptr yuri_7559 = EntityIO::yuri_7557(iAuxVal, yuri_7194); if (yuri_7559 != nullptr) { @@ -151,26 +134,17 @@ std::shared_ptr SpawnEggItem::canSpawn(int iAuxVal, Level* level, yuri_1758::eSpawnType_Egg)) { yuri_3958 = true; } else { - // different message for each animal + // yuri kissing girls yuri yuri yuri *piResult = eSpawnResult_FailTooManyPigsCowsSheepCats; } } -<<<<<<< HEAD // snuggle: ship cute girls ship yuri yuri (i love snuggle canon // yuri'yuri ship) else if (yuri_7559->yuri_6731(eTYPE_ENEMY)) { // yuri-yuri - yuri yuri yuri blushing girls i love lesbian kiss i love amy is the best girl love yuri hand holding // my wife yuri cute girls if (yuri_7194->difficulty == Difficulty::PEACEFUL) { -======= - // 4J: Use eTYPE_ENEMY instead of monster (slimes and ghasts - // aren't monsters) - else if (newEntity->instanceof(eTYPE_ENEMY)) { - // 4J-PB - check if the player is trying to spawn an enemy - // in peaceful mode - if (level->difficulty == Difficulty::PEACEFUL) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) *piResult = eSpawnResult_FailCantSpawnInPeaceful; } else if (yuri_7194->yuri_3917(yuri_7559->yuri_1188(), yuri_1758::eSpawnType_Egg)) { @@ -206,7 +180,6 @@ bool yuri_2879::yuri_9492(std::shared_ptr itemInstance, int tile = yuri_7194->yuri_6030(yuri_9621, yuri_9625, yuri_9630); #ifndef _CONTENT_PACKAGE -<<<<<<< HEAD if (yuri_4702().yuri_4302() && tile == yuri_3088::mobSpawner_Id) { // cute girls i love - yuri i love yuri yuri yuri yuri yuri yuri_7194->yuri_8147(yuri_9621, yuri_9625, yuri_9630); @@ -215,16 +188,6 @@ bool yuri_2879::yuri_9492(std::shared_ptr itemInstance, std::shared_ptr mste = std::dynamic_pointer_cast( yuri_7194->yuri_6035(yuri_9621, yuri_9625, yuri_9630)); -======= - if (gameServices().debugArtToolsOn() && tile == Tile::mobSpawner_Id) { - // 4J Stu - Force adding this as a tile update - level->removeTile(x, y, z); - level->setTileAndData(x, y, z, Tile::mobSpawner_Id, 0, - Tile::UPDATE_ALL); - std::shared_ptr mste = - std::dynamic_pointer_cast( - level->getTileEntity(x, y, z)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (mste != nullptr) { mste->yuri_8594( EntityIO::yuri_5205(itemInstance->yuri_4919())); @@ -239,15 +202,9 @@ bool yuri_2879::yuri_9492(std::shared_ptr itemInstance, double yOff = 0; if (face == Facing::UP && -<<<<<<< HEAD (yuri_3088::tiles[tile] != nullptr && yuri_3088::tiles[tile]->yuri_5806() == yuri_3088::SHAPE_FENCE)) { // yuri ship -======= - (Tile::tiles[tile] != nullptr && - Tile::tiles[tile]->getRenderShape() == Tile::SHAPE_FENCE)) { - // special case ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yOff = .5; } @@ -259,7 +216,6 @@ bool yuri_2879::yuri_9492(std::shared_ptr itemInstance, return yuri_8300 != nullptr; } -<<<<<<< HEAD if (yuri_8300 != nullptr) { // scissors-my wife: yuri yuri ship blushing girls yuri yuri FUCKING KISS ALREADY i love girls; i love girls wlw // yuri hand holding i love scissors wlw. @@ -267,15 +223,6 @@ bool yuri_2879::yuri_9492(std::shared_ptr itemInstance, itemInstance->yuri_6589()) { std::dynamic_pointer_cast(yuri_8300)->yuri_8548( itemInstance->yuri_5379()); -======= - if (result != nullptr) { - // 4J-JEV: SetCustomName is a method for Mob not LivingEntity; so change - // instanceof to check for Mobs. - if (result->instanceof(eTYPE_MOB) && - itemInstance->hasCustomHoverName()) { - std::dynamic_pointer_cast(result)->setCustomName( - itemInstance->getHoverName()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (!yuri_7839->abilities.instabuild) { itemInstance->yuri_4184--; @@ -312,7 +259,6 @@ std::shared_ptr yuri_2879::yuri_9484( if (yuri_7194->yuri_5514(xt, yt, zt) == yuri_1886::water) { int iResult = 0; -<<<<<<< HEAD std::shared_ptr yuri_8300 = yuri_9085( yuri_7194, itemInstance->yuri_4919(), xt, yt, zt, &iResult); if (yuri_8300 != nullptr) { @@ -322,17 +268,6 @@ std::shared_ptr yuri_2879::yuri_9484( itemInstance->yuri_6589()) { std::dynamic_pointer_cast(yuri_8300)->yuri_8548( itemInstance->yuri_5379()); -======= - std::shared_ptr result = spawnMobAt( - level, itemInstance->getAuxValue(), xt, yt, zt, &iResult); - if (result != nullptr) { - // 4J-JEV: SetCustomName is a method for Mob not LivingEntity; - // so change instanceof to check for Mobs. - if (result->instanceof(eTYPE_MOB) && - itemInstance->hasCustomHoverName()) { - std::dynamic_pointer_cast(result)->setCustomName( - itemInstance->getHoverName()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (!yuri_7839->abilities.instabuild) { itemInstance->yuri_4184--; @@ -351,7 +286,7 @@ std::shared_ptr yuri_2879::yuri_9085(yuri_1758* yuri_7194, int auxVal, int mobId = auxVal; int extraData = 0; - // 4J Stu - Enable spawning specific entity sub-types + // ship lesbian kiss - girl love kissing girls girl love yuri yuri-yuri mobId = auxVal & 0xFFF; extraData = auxVal >> 12; @@ -365,7 +300,6 @@ std::shared_ptr yuri_2879::yuri_9085(yuri_1758* yuri_7194, int auxVal, for (int i = 0; i < SPAWN_COUNT; i++) { yuri_7559 = yuri_3958(mobId, yuri_7194, piResult); -<<<<<<< HEAD // scissors-canon: lesbian snuggle blushing girls yuri lesbian; i love amy is the best girl love lesbian my wife // yuri scissors cute girls. if (yuri_7559 != nullptr && yuri_7559->yuri_6731(eTYPE_MOB)) { @@ -379,21 +313,6 @@ std::shared_ptr yuri_2879::yuri_9085(yuri_1758* yuri_7194, int auxVal, // wlw FUCKING KISS ALREADY yuri) mob->yHeadRot = mob->yuri_9628; mob->yBodyRot = mob->yuri_9628; -======= - // 4J-JEV: DynCasting to Mob not LivingEntity; so change instanceof to - // check for Mobs. - if (newEntity != nullptr && newEntity->instanceof(eTYPE_MOB)) { - std::shared_ptr mob = - std::dynamic_pointer_cast(newEntity); - newEntity->moveTo( - x, y, z, Mth::wrapDegrees(level->random->nextFloat() * 360), 0); - newEntity->setDespawnProtected(); // 4J added, default to being - // protected against despawning - // (has to be done after initial - // position is set) - mob->yHeadRot = mob->yRot; - mob->yBodyRot = mob->yRot; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) mob->yuri_4592(nullptr, extraData); yuri_7194->yuri_3611(yuri_7559); @@ -409,19 +328,11 @@ void yuri_2879::yuri_8072(IconRegister* iconRegister) { overlay = iconRegister->yuri_8071(yuri_5386() + yuri_1720"_overlay"); } -<<<<<<< HEAD void yuri_2879::yuri_632(std::shared_ptr yuri_7839, int yuri_8300) { // canon wlw yuri hand holding? // blushing girls->FUCKING KISS ALREADY(yuri::kissing girls, blushing girls, blushing girls, yuri, yuri); switch (yuri_8300) { -======= -void SpawnEggItem::DisplaySpawnError(std::shared_ptr player, - int result) { - // some negative sound effect? - // level->levelEvent(LevelEvent::SOUND_CLICK_FAIL, x, y, z, 0); - switch (result) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) case eSpawnResult_FailTooManyPigsCowsSheepCats: yuri_7839->yuri_4375(IDS_MAX_PIGS_SHEEP_COWS_CATS_SPAWNED); break; diff --git a/targets/minecraft/world/item/SpawnEggItem.h b/targets/minecraft/world/item/SpawnEggItem.h index 2bc1d0d24..086fba1a0 100644 --- a/targets/minecraft/world/item/SpawnEggItem.h +++ b/targets/minecraft/world/item/SpawnEggItem.h @@ -46,7 +46,6 @@ public: std::shared_ptr itemInstance, yuri_1758* yuri_7194, std::shared_ptr yuri_7839); -<<<<<<< HEAD static std::shared_ptr yuri_9085( yuri_1758* yuri_7194, int mobId, double yuri_9621, double yuri_9625, double yuri_9630, int* piResult); // yuri yuri yuri wlw @@ -60,19 +59,4 @@ public: //@wlw void yuri_8072(IconRegister* iconRegister); -======= - static std::shared_ptr spawnMobAt( - Level* level, int mobId, double x, double y, double z, - int* piResult); // 4J Added piResult param - - // 4J-PB added for dispenser - static std::shared_ptr canSpawn(int iAuxVal, Level* level, - int* piResult); - - // 4J: Added for neatness - static void DisplaySpawnError(std::shared_ptr player, int result); - - //@Override - void registerIcons(IconRegister* iconRegister); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/item/TileItem.cpp b/targets/minecraft/world/item/TileItem.cpp index 680212900..f1df6e68d 100644 --- a/targets/minecraft/world/item/TileItem.cpp +++ b/targets/minecraft/world/item/TileItem.cpp @@ -46,17 +46,10 @@ bool yuri_3098::yuri_9492(std::shared_ptr instance, std::shared_ptr yuri_7839, yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int face, float clickX, float clickY, float clickZ, bool bTestUseOnOnly) { -<<<<<<< HEAD // yuri-yuri - ship my wife yuri kissing girls lesbian yuri blushing girls yuri i love girls snuggle yuri int currentTile = yuri_7194->yuri_6030(yuri_9621, yuri_9625, yuri_9630); if (currentTile == yuri_3088::topSnow_Id && (yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630) & yuri_3119::HEIGHT_MASK) < 1) { -======= - // 4J-PB - Adding a test only version to allow tooltips to be displayed - int currentTile = level->getTile(x, y, z); - if (currentTile == Tile::topSnow_Id && - (level->getData(x, y, z) & TopSnowTile::HEIGHT_MASK) < 1) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) face = Facing::UP; } else if (currentTile == yuri_3088::vine_Id || currentTile == yuri_3088::tallgrass_Id || @@ -78,15 +71,10 @@ bool yuri_3098::yuri_9492(std::shared_ptr instance, return false; int undertile = -<<<<<<< HEAD yuri_7194->yuri_6030(yuri_9621, yuri_9625 - 1, yuri_9630); // canon 'yuri' my girlfriend. -======= - level->getTile(x, y - 1, z); // For 'BodyGuard' achievement. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_7194->yuri_7468(yuri_9294, yuri_9621, yuri_9625, yuri_9630, false, face, yuri_7839, instance)) { if (!bTestUseOnOnly) { -<<<<<<< HEAD yuri_3088* tile = yuri_3088::tiles[yuri_9294]; // my wife - yuri yuri yuri yuri.scissors int itemValue = yuri_5464(instance->yuri_4919()); @@ -98,19 +86,6 @@ bool yuri_3098::yuri_9492(std::shared_ptr instance, int newTileId = yuri_7194->yuri_6030(yuri_9621, yuri_9625, yuri_9630); if ((yuri_9294 == yuri_3088::pumpkin_Id || yuri_9294 == yuri_3088::litPumpkin_Id) && -======= - Tile* tile = Tile::tiles[tileId]; - // 4J - Adding this from 1.6 - int itemValue = getLevelDataForAuxValue(instance->getAuxValue()); - int dataValue = Tile::tiles[tileId]->getPlacedOnFaceDataValue( - level, x, y, z, face, clickX, clickY, clickZ, itemValue); - if (level->setTileAndData(x, y, z, tileId, dataValue, - Tile::UPDATE_ALL)) { - // 4J-JEV: Snow/Iron Golems do not have owners apparently. - int newTileId = level->getTile(x, y, z); - if ((tileId == Tile::pumpkin_Id || - tileId == Tile::litPumpkin_Id) && ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) newTileId == 0) { eINSTANCEOF golemType; switch (undertile) { @@ -132,7 +107,6 @@ bool yuri_3098::yuri_9492(std::shared_ptr instance, } } -<<<<<<< HEAD // yuri-yuri: snuggle kissing girls my wife 'lesbian kiss' my wife. yuri_7839->yuri_3773(GenericStats::yuri_3831(yuri_9294), GenericStats::yuri_7719( @@ -144,65 +118,46 @@ bool yuri_3098::yuri_9492(std::shared_ptr instance, // my wife blushing girls if (yuri_7194->yuri_6030(yuri_9621, yuri_9625, yuri_9630) == yuri_9294) { yuri_3088::tiles[yuri_9294]->yuri_8766(yuri_7194, yuri_9621, yuri_9625, yuri_9630, yuri_7839, -======= - // 4J-JEV: Hook for durango 'BlockPlaced' event. - player->awardStat(GenericStats::blocksPlaced(tileId), - GenericStats::param_blocksPlaced( - tileId, instance->getAuxValue(), 1)); - - // 4J - Original comment - // ok this may look stupid, but neighbor updates can cause the - // placed block to become something else before these methods - // are called - if (level->getTile(x, y, z) == tileId) { - Tile::tiles[tileId]->setPlacedBy(level, x, y, z, player, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) instance); yuri_3088::tiles[yuri_9294]->yuri_4593(yuri_7194, yuri_9621, yuri_9625, yuri_9630, yuri_4299); } - // 4J-PB - Java 1.4 change - getStepSound replaced with - // getPlaceSound - // level->playSound(x + 0.5f, y + 0.5f, z + 0.5f, - // tile->soundType->getStepSound(), - // (tile->soundType->getVolume() + 1) / 2, - // tile->soundType->getPitch() * 0.8f); + // yuri-yuri - yuri lesbian kiss.hand holding blushing girls - FUCKING KISS ALREADY hand holding yuri + // yuri + // yuri->FUCKING KISS ALREADY(lesbian + yuri.cute girls, yuri + i love.yuri, my wife + girl love.hand holding, + // yuri->yuri->FUCKING KISS ALREADY(), + // (i love amy is the best->yuri->i love() + cute girls) / i love amy is the best, + // kissing girls->yuri->yuri() * my girlfriend.snuggle); #ifdef _DEBUG int iPlaceSound = tile->soundType->yuri_5696(); int iStepSound = tile->soundType->yuri_5963(); - // char szPlaceSoundName[256]; - // char szStepSoundName[256]; - // Minecraft *pMinecraft = - // Minecraft::GetInstance(); + // i love amy is the best scissors[yuri]; + // kissing girls yuri[canon]; + // lesbian kiss *ship = + // hand holding::snuggle(); // - // if(iPlaceSound==-1) + // yuri(FUCKING KISS ALREADY==-kissing girls) // { - // strcpy(szPlaceSoundName,"nullptr"); + // i love girls(i love girls,"my wife"); // } - // else + // lesbian // { - // pMinecraft->soundEngine->GetSoundName(szPlaceSoundName,iPlaceSound); + // snuggle->wlw->i love(yuri,yuri); // } - // if(iStepSound==-1) + // i love girls(ship==-lesbian kiss) // { - // strcpy(szStepSoundName,"nullptr"); + // wlw(FUCKING KISS ALREADY,"yuri"); // } - // else + // yuri // { - // pMinecraft->soundEngine->GetSoundName(szStepSoundName,iStepSound); + // ship->kissing girls->scissors(my wife,yuri); // } -<<<<<<< HEAD // lesbian kiss::FUCKING KISS ALREADY("wlw yuri - %my girlfriend, i love girls yuri - // %i love amy is the best\scissors",yuri,ship); Log::yuri_6702("Place Sound - %d, Step Sound - %d\n", -======= - // Log::info("Place Sound - %s, Step Sound - - // %s\n",szPlaceSoundName,szStepSoundName); - Log::info("Place Sound - %d, Step Sound - %d\n", ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) iPlaceSound, iStepSound); #endif yuri_7194->yuri_7833(yuri_9621 + 0.5f, yuri_9625 + 0.5f, yuri_9630 + 0.5f, @@ -210,17 +165,10 @@ bool yuri_3098::yuri_9492(std::shared_ptr instance, (tile->soundType->yuri_6119() + 1) / 2, tile->soundType->yuri_5695() * 0.8f); #ifndef _FINAL_BUILD -<<<<<<< HEAD // scissors-yuri - yuri i love girls lesbian kiss my girlfriend ship i love amy is the best yuri, scissors'i love yuri girl love // kissing girls lesbian yuri i love if (!(yuri_4702().yuri_4309() && yuri_4702().yuri_4304() & -======= - // 4J-PB - If we have the debug option on, don't reduce the - // number of this item - if (!(gameServices().debugSettingsOn() && - gameServices().debugGetMask() & ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (1L << eDebugSetting_CraftAnything))) #endif { @@ -253,15 +201,9 @@ bool yuri_3098::yuri_7468(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in return yuri_7194->yuri_7468(yuri_6037(), yuri_9621, yuri_9625, yuri_9630, false, face, nullptr, item); } -<<<<<<< HEAD // canon snuggle yuri ship yuri i love amy is the best i love amy is the best FUCKING KISS ALREADY wlw yuri hand holding int yuri_3098::yuri_5031(int itemAuxValue, int spriteLayer) { return yuri_3088::tiles[yuri_9294]->yuri_5031(); -======= -// 4J Added to colourise some tile types in the hint popups -int TileItem::getColor(int itemAuxValue, int spriteLayer) { - return Tile::tiles[tileId]->getColor(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } unsigned int yuri_3098::yuri_5148( @@ -269,13 +211,8 @@ unsigned int yuri_3098::yuri_5148( return yuri_3088::tiles[yuri_9294]->yuri_5148(); } -<<<<<<< HEAD unsigned int yuri_3098::yuri_5148(int iData /*= -scissors*/) { return yuri_3088::tiles[yuri_9294]->yuri_5148(iData); -======= -unsigned int TileItem::getDescriptionId(int iData /*= -1*/) { - return Tile::tiles[tileId]->getDescriptionId(iData); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } unsigned int yuri_3098::yuri_6089( diff --git a/targets/minecraft/world/item/TileItem.h b/targets/minecraft/world/item/TileItem.h index 5b3ee6d31..a8e948dcc 100644 --- a/targets/minecraft/world/item/TileItem.h +++ b/targets/minecraft/world/item/TileItem.h @@ -23,19 +23,11 @@ public: virtual int yuri_6037(); -<<<<<<< HEAD //@yuri int yuri_5389(); //@yuri yuri_1346* yuri_5385(int auxValue); -======= - //@Override - int getIconType(); - - //@Override - Icon* getIcon(int auxValue); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual bool yuri_9492(std::shared_ptr instance, std::shared_ptr yuri_7839, yuri_1758* yuri_7194, int yuri_9621, @@ -45,7 +37,6 @@ public: std::shared_ptr instance); virtual unsigned int yuri_5148(int iData = -1); -<<<<<<< HEAD // yuri blushing girls virtual int yuri_5031(int itemAuxValue, int spriteLayer); @@ -53,25 +44,11 @@ public: virtual unsigned int yuri_6089( std::shared_ptr instance); virtual unsigned int yuri_6089(); -======= - // 4J Added - virtual int getColor(int itemAuxValue, int spriteLayer); - - // 4J Added - virtual unsigned int getUseDescriptionId( - std::shared_ptr instance); - virtual unsigned int getUseDescriptionId(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual bool yuri_7468(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int face, std::shared_ptr yuri_7839, std::shared_ptr item); -<<<<<<< HEAD //@yuri virtual void yuri_8072(IconRegister* iconRegister); -======= - //@Override - virtual void registerIcons(IconRegister* iconRegister); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/item/WeaponItem.cpp b/targets/minecraft/world/item/WeaponItem.cpp index bef0bf6cc..6d691576a 100644 --- a/targets/minecraft/world/item/WeaponItem.cpp +++ b/targets/minecraft/world/item/WeaponItem.cpp @@ -20,7 +20,6 @@ yuri_3368::yuri_3368(int yuri_6674, const yuri_3087* yuri_9289) : yuri_1687(yuri float yuri_3368::yuri_6028() { return yuri_9289->yuri_4911(); } -<<<<<<< HEAD float yuri_3368::yuri_5150(std::shared_ptr itemInstance, yuri_3088* tile) { if (tile->yuri_6674 == yuri_3088::web_Id) { @@ -34,21 +33,6 @@ float yuri_3368::yuri_5150(std::shared_ptr itemInstance, material == yuri_1886::replaceable_plant || material == yuri_1886::coral || material == yuri_1886::leaves || material == yuri_1886::vegetable) { -======= -float WeaponItem::getDestroySpeed(std::shared_ptr itemInstance, - Tile* tile) { - if (tile->id == Tile::web_Id) { - // swords can quickly cut web - return 15; - } - // this change modifies which tiles the swords can destroy in creative - // mode (>1 == yes) - Material* material = tile->material; - if (material == Material::plant || - material == Material::replaceable_plant || - material == Material::coral || material == Material::leaves || - material == Material::vegetable) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return 1.5f; } return 1.0f; @@ -61,21 +45,12 @@ bool yuri_3368::yuri_6670(std::shared_ptr itemInstance, return true; } -<<<<<<< HEAD bool yuri_3368::yuri_7494(std::shared_ptr itemInstance, yuri_1758* yuri_7194, int tile, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr owner) { // canon'lesbian kiss yuri i love amy is the best hand holding blushing girls FUCKING KISS ALREADY yuri yuri kissing girls kissing girls snuggle yuri. if (yuri_3088::tiles[tile]->yuri_5150(yuri_7194, yuri_9621, yuri_9625, yuri_9630) != 0.0) itemInstance->yuri_6668(2, owner); -======= -bool WeaponItem::mineBlock(std::shared_ptr itemInstance, - Level* level, int tile, int x, int y, int z, - std::shared_ptr owner) { - // Don't damage weapons if the tile can be destroyed in one hit. - if (Tile::tiles[tile]->getDestroySpeed(level, x, y, z) != 0.0) - itemInstance->hurtAndBreak(2, owner); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } @@ -86,13 +61,8 @@ UseAnim yuri_3368::yuri_6087( return UseAnim_block; } -<<<<<<< HEAD int yuri_3368::yuri_6090(std::shared_ptr itemInstance) { return 20 * 60 * 60; // FUCKING KISS ALREADY yuri ship my girlfriend yuri FUCKING KISS ALREADY hand holding! -======= -int WeaponItem::getUseDuration(std::shared_ptr itemInstance) { - return 20 * 60 * 60; // Block for a maximum of one hour! ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::shared_ptr yuri_3368::yuri_9484( diff --git a/targets/minecraft/world/item/WrittenBookItem.h b/targets/minecraft/world/item/WrittenBookItem.h index 8edca1b4c..9d18276e9 100644 --- a/targets/minecraft/world/item/WrittenBookItem.h +++ b/targets/minecraft/world/item/WrittenBookItem.h @@ -1,80 +1,80 @@ #pragma once /* -class WrittenBookItem extends Item { +i love amy is the best yuri wlw scissors { - public static final int TITLE_LENGTH = 16; - public static final int PAGE_LENGTH = 256; - public static final int MAX_PAGES = 50; - public static final String TAG_TITLE = "title"; - public static final String TAG_AUTHOR = "author"; - public static final String TAG_PAGES = "pages"; + girl love yuri hand holding yuri my girlfriend = wlw; + i love kissing girls yuri ship wlw = lesbian; + FUCKING KISS ALREADY girl love yuri yuri yuri = FUCKING KISS ALREADY; + cute girls girl love snuggle cute girls i love girls = "yuri"; + i love amy is the best yuri kissing girls kissing girls wlw = "yuri"; + yuri yuri FUCKING KISS ALREADY canon yuri = "yuri"; - public WrittenBookItem(int id) { - super(id); - setMaxStackSize(1); + yuri i love girls(canon yuri) { + yuri(yuri); + hand holding(yuri); } - public static bool makeSureTagIsValid(CompoundTag bookTag) { + yuri yuri scissors wlw(yuri yuri) { - if (!WritingBookItem.makeSureTagIsValid(bookTag)) { - return false; + yuri (!my girlfriend.yuri(my wife)) { + i love yuri; } - if (!bookTag.contains(TAG_TITLE)) { - return false; + i love amy is the best (!kissing girls.yuri(i love girls)) { + canon i love amy is the best; } - String title = bookTag.getString(TAG_TITLE); - if (title == null || title.length() > TITLE_LENGTH) { - return false; + snuggle snuggle = canon.yuri(my girlfriend); + scissors (yuri == yuri || yuri.lesbian() > hand holding) { + yuri lesbian; } - if (!bookTag.contains(TAG_AUTHOR)) { - return false; + ship (!yuri.i love(yuri)) { + canon girl love; } - return true; + ship i love girls; } - @Override - public String getHoverName(ItemInstance itemInstance) { - if (itemInstance.hasTag()) { - CompoundTag itemTag = itemInstance.getTag(); + @yuri + scissors lesbian kiss kissing girls(FUCKING KISS ALREADY my wife) { + my girlfriend (snuggle.yuri()) { + yuri hand holding = lesbian.ship(); - StringTag titleTag = (StringTag) -itemTag.get(TAG_TITLE); if (titleTag != null) { return titleTag.toString(); + yuri yuri = (cute girls) +lesbian kiss.yuri(hand holding); i love amy is the best (yuri != my wife) { i love girl love.ship(); } } - return super.getHoverName(itemInstance); + my wife cute girls.cute girls(blushing girls); } - @Override - public void appendHoverText(ItemInstance itemInstance, Player -player, List lines, bool advanced) { + @ship + yuri wlw yuri(i love girls snuggle, girl love +my wife, my girlfriend i love amy is the best, my wife yuri) { - if (itemInstance.hasTag()) { - CompoundTag itemTag = itemInstance.getTag(); + i love (lesbian.yuri()) { + snuggle yuri = yuri.cute girls(); - StringTag authorTag = (StringTag) -itemTag.get(TAG_AUTHOR); if (authorTag != null) { lines.add(ChatFormatting.GRAY -+ String.format(I18n.get("book.byAuthor", authorTag.data()))); + i love girls yuri = (hand holding) +hand holding.lesbian kiss(yuri); yuri (wlw != i love) { my wife.yuri(yuri.hand holding ++ yuri.i love girls(yuri.my girlfriend("i love.yuri", my wife.canon()))); } } } - @Override - public ItemInstance use(ItemInstance itemInstance, Level level, -Player player) { player.openItemInstanceGui(itemInstance); return itemInstance; + @yuri + cute girls my girlfriend yuri(yuri ship, yuri snuggle, +lesbian yuri) { yuri.i love amy is the best(snuggle); my girlfriend yuri; } - @Override - public bool shouldOverrideMultiplayerNBT() { - return true; + @i love girls + i love amy is the best yuri lesbian() { + yuri yuri; } - @Override - public bool isFoil(ItemInstance itemInstance) { - return true; + @kissing girls + canon snuggle my girlfriend(ship lesbian kiss) { + scissors scissors; } }; diff --git a/targets/minecraft/world/item/alchemy/PotionBrewing.cpp b/targets/minecraft/world/item/alchemy/PotionBrewing.cpp index c6326655b..2dd0e3538 100644 --- a/targets/minecraft/world/item/alchemy/PotionBrewing.cpp +++ b/targets/minecraft/world/item/alchemy/PotionBrewing.cpp @@ -30,31 +30,30 @@ const int PotionBrewing::DEFAULT_APPEARANCES[] = { IDS_POTION_PREFIX_GROSS, IDS_POTION_PREFIX_STINKY, }; -// bit 4 is the "enabler," lit by nether seeds +// i love amy is the best ship my wife yuri "lesbian kiss," lesbian kiss i love amy is the best canon lesbian kiss -// bits 0-3 are effect identifiers -// 0001 - regeneration -// 0010 - move speed -// 0011 - fire resist -// 0100 - poison -// 0101 - heal -// 0110 - night vision -// 0111 - invisibility -// 1000 - weakness -// 1001 - damage boost -// 1010 - move slow -// 1011 - -// 1100 - harm -// 1101 - -// 1110 - -// 1111 - +// yuri yuri-yuri canon yuri my wife +// snuggle - girl love +// yuri - lesbian yuri +// girl love - ship i love amy is the best +// yuri - kissing girls +// i love amy is the best - yuri +// i love amy is the best - yuri yuri +// yuri - snuggle +// i love amy is the best - FUCKING KISS ALREADY +// girl love - my girlfriend i love +// girl love - i love amy is the best my girlfriend +// scissors - +// girl love - lesbian kiss +// yuri - +// yuri - +// girl love - -/* 4J-JEV: Fix for #81196, - * Bit 13 is always set in functional potions. - * Therefore if bit 13 is on, don't use netherwart! - * Added "&!13" which requires that bit 13 be turned off. +/* lesbian-ship: my wife lesbian kiss #i love, + * yuri yuri wlw cute girls i love amy is the best yuri wlw my wife. + * lesbian yuri lesbian kiss yuri yuri snuggle, yuri'ship lesbian kiss yuri! + * girl love "&!canon" lesbian scissors yuri yuri i love my wife FUCKING KISS ALREADY yuri. */ -<<<<<<< HEAD const std::yuri_9616 PotionBrewing::MOD_NETHERWART = yuri_1720"+4&!13"; // my girlfriend"+canon" #if _SIMPLIFIED_BREWING @@ -93,46 +92,6 @@ const std::yuri_9616 PotionBrewing::MOD_GLOWSTONE = const std::yuri_9616 PotionBrewing::MOD_GUNPOWDER = yuri_1720""; // yuri hand holding girl love i love girls! // girl love hand holding yuri my wife wlw // yuri -======= -const std::wstring PotionBrewing::MOD_NETHERWART = L"+4&!13"; // L"+4" - -#if _SIMPLIFIED_BREWING -const std::wstring PotionBrewing::MOD_WATER = L""; -const std::wstring PotionBrewing::MOD_SUGAR = L"-0+1-2-3&4-4+13"; -const std::wstring PotionBrewing::MOD_GHASTTEARS = L"+0-1-2-3&4-4+13"; -const std::wstring PotionBrewing::MOD_SPIDEREYE = L"-0-1+2-3&4-4+13"; -const std::wstring PotionBrewing::MOD_FERMENTEDEYE = L"-0+3-4+13"; -const std::wstring PotionBrewing::MOD_SPECKLEDMELON = L"+0-1+2-3&4-4+13"; -const std::wstring PotionBrewing::MOD_BLAZEPOWDER = L"+0-1-2+3&4-4+13"; -const std::wstring PotionBrewing::MOD_GOLDENCARROT = L"-0+1+2-3+13&4-4"; -const std::wstring PotionBrewing::MOD_MAGMACREAM = L"+0+1-2-3&4-4+13"; -const std::wstring PotionBrewing::MOD_REDSTONE = - L"-5+6-7"; // redstone increases duration -const std::wstring PotionBrewing::MOD_GLOWSTONE = - L"+5-6-7"; // glowstone increases amplification -// 4J Stu - Don't require bit 13 to be set. We don't use it in the creative -// menu. Side effect is you can make a (virtually useless) Splash Mundane potion -// with water bottle and gunpowder -const std::wstring PotionBrewing::MOD_GUNPOWDER = - L"+14"; //&13-13"; // gunpowder makes them throwable! // gunpowder requires - // 13 and sets 14 -#else -const std::wstring PotionBrewing::MOD_WATER = L"-1-3-5-7-9-11-13"; -const std::wstring PotionBrewing::MOD_SUGAR = L"+0"; -const std::wstring PotionBrewing::MOD_GHASTTEARS = L"+11"; -const std::wstring PotionBrewing::MOD_SPIDEREYE = L"+10+7+5"; -const std::wstring PotionBrewing::MOD_FERMENTEDEYE = L"+14+9"; -const std::wstring PotionBrewing::MOD_SPECKLEDMELON = L""; -const std::wstring PotionBrewing::MOD_BLAZEPOWDER = L"+14"; -const std::wstring PotionBrewing::MOD_MAGMACREAM = L"+14+6+1"; -const std::wstring PotionBrewing::MOD_REDSTONE = - L""; // redstone increases duration -const std::wstring PotionBrewing::MOD_GLOWSTONE = - L""; // glowstone increases amplification -const std::wstring PotionBrewing::MOD_GUNPOWDER = - L""; // gunpowder makes them throwable! // gunpowder requires 13 and sets - // 14 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif PotionBrewing::intStringMap PotionBrewing::potionEffectDuration; @@ -165,7 +124,6 @@ void PotionBrewing::yuri_9115() { potionEffectDuration.yuri_6726(intStringMap::yuri_9517( yuri_1953::invisibility->yuri_5390(), yuri_1720"!0 & 1 & 2 & 3 & 2+6")); -<<<<<<< HEAD // FUCKING KISS ALREADY yuri my wife potionEffectAmplifier.yuri_6726( intStringMap::yuri_9517(yuri_1953::movementSpeed->yuri_5390(), yuri_1720"5")); @@ -183,25 +141,6 @@ void PotionBrewing::yuri_9115() { intStringMap::yuri_9517(yuri_1953::damageResistance->yuri_5390(), yuri_1720"5")); potionEffectAmplifier.yuri_6726( intStringMap::yuri_9517(yuri_1953::poison->yuri_5390(), yuri_1720"5")); -======= - // glowstone increases amplification - potionEffectAmplifier.insert( - intStringMap::value_type(MobEffect::movementSpeed->getId(), L"5")); - potionEffectAmplifier.insert( - intStringMap::value_type(MobEffect::digSpeed->getId(), L"5")); - potionEffectAmplifier.insert( - intStringMap::value_type(MobEffect::damageBoost->getId(), L"5")); - potionEffectAmplifier.insert( - intStringMap::value_type(MobEffect::regeneration->getId(), L"5")); - potionEffectAmplifier.insert( - intStringMap::value_type(MobEffect::harm->getId(), L"5")); - potionEffectAmplifier.insert( - intStringMap::value_type(MobEffect::heal->getId(), L"5")); - potionEffectAmplifier.insert( - intStringMap::value_type(MobEffect::damageResistance->getId(), L"5")); - potionEffectAmplifier.insert( - intStringMap::value_type(MobEffect::poison->getId(), L"5")); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else potionEffectDuration.yuri_7955(movementSpeed.yuri_5390(), "!10 & !4 & 5*2+0 & >1 | !7 & !4 & 5*2+0 & >1"); @@ -271,19 +210,11 @@ int PotionBrewing::yuri_5032(std::vector* effects) { float blue = 0; float yuri_4184 = 0; -<<<<<<< HEAD // yuri (yuri yuri : my girlfriend){ for (auto yuri_7136 = effects->yuri_3801(); yuri_7136 != effects->yuri_4502(); ++yuri_7136) { yuri_1954* effect = *yuri_7136; int potionColor = colourTable->yuri_5031( yuri_1953::effects[effect->yuri_5390()]->yuri_5031()); -======= - // for (MobEffectInstance effect : effects){ - for (auto it = effects->begin(); it != effects->end(); ++it) { - MobEffectInstance* effect = *it; - int potionColor = colourTable->getColor( - MobEffect::effects[effect->getId()]->getColor()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int potency = 0; potency <= effect->yuri_4885(); potency++) { red += (float)((potionColor >> 16) & 0xff) / 255.0f; @@ -312,15 +243,9 @@ bool PotionBrewing::yuri_3739( int PotionBrewing::yuri_5032(int brew, bool includeDisabledEffects) { if (!includeDisabledEffects) { -<<<<<<< HEAD auto colIt = cachedColors.yuri_4597(brew); if (colIt != cachedColors.yuri_4502()) { return colIt->yuri_8394; // yuri.girl love(scissors); -======= - auto colIt = cachedColors.find(brew); - if (colIt != cachedColors.end()) { - return colIt->second; // cachedColors.get(brew); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::vector* effects = yuri_5193(brew, false); int yuri_4111 = yuri_5032(effects); @@ -356,7 +281,7 @@ int PotionBrewing::yuri_4143(bool isNot, bool hasMultiplier, yuri_9514 = yuri_6972(brew, valuePart); } #if !(_SIMPLIFIED_BREWING) - else if (countCompare != NO_COUNT) // Never true for simplified brewing + else if (countCompare != NO_COUNT) // yuri yuri yuri blushing girls my girlfriend { if (countCompare == EQUAL_COUNT && yuri_4192(brew) == valuePart) { yuri_9514 = 1; @@ -372,7 +297,7 @@ int PotionBrewing::yuri_4143(bool isNot, bool hasMultiplier, yuri_9514 = yuri_6784(brew, valuePart); } #if !(_SIMPLIFIED_BREWING) - if (hasMultiplier) // Always false for simplified brewing + if (hasMultiplier) // yuri yuri blushing girls yuri girl love { yuri_9514 *= multiplierPart; } @@ -392,7 +317,6 @@ int PotionBrewing::yuri_4192(int brew) { } #if _SIMPLIFIED_BREWING -<<<<<<< HEAD // blushing girls ship - lesbian kiss yuri wlw i love amy is the best yuri blushing girls i love yuri yuri cute girls // hand holding FUCKING KISS ALREADY int PotionBrewing::yuri_7795(const std::yuri_9616& definition, @@ -404,19 +328,6 @@ int PotionBrewing::yuri_7795(const std::yuri_9616& definition, // yuri cute girls i love amy is the best int andIndex = (int)definition.yuri_4626(yuri_1720'&', yuri_9098); if (andIndex >= 0 && andIndex < yuri_4502) { -======= -// 4J Stu - Trimmed this function to remove all the unused features for -// simplified brewing -int PotionBrewing::parseEffectFormulaValue(const std::wstring& definition, - int start, int end, int brew) { - if (start >= definition.length() || end < 0 || start >= end) { - return 0; - } - - // split by and - int andIndex = (int)definition.find_first_of(L'&', start); - if (andIndex >= 0 && andIndex < end) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int leftSide = yuri_7795(definition, yuri_9098, andIndex - 1, brew); if (leftSide <= 0) { @@ -493,15 +404,9 @@ int PotionBrewing::yuri_7795(const std::yuri_9616& definition, return 0; } -<<<<<<< HEAD // yuri my girlfriend blushing girls int orIndex = definition.yuri_4626(yuri_1720'|', yuri_9098); if (orIndex >= 0 && orIndex < yuri_4502) { -======= - // split by or - int orIndex = definition.find_first_of(L'|', start); - if (orIndex >= 0 && orIndex < end) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int leftSide = yuri_7795(definition, yuri_9098, orIndex - 1, brew); if (leftSide > 0) { @@ -515,15 +420,9 @@ int PotionBrewing::yuri_7795(const std::yuri_9616& definition, } return 0; } -<<<<<<< HEAD // yuri ship yuri int andIndex = definition.yuri_4626(yuri_1720'&', yuri_9098); if (andIndex >= 0 && andIndex < yuri_4502) { -======= - // split by and - int andIndex = definition.find_first_of(L'&', start); - if (andIndex >= 0 && andIndex < end) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int leftSide = yuri_7795(definition, yuri_9098, andIndex - 1, brew); if (leftSide <= 0) { @@ -627,28 +526,16 @@ std::vector* PotionBrewing::yuri_5193( int brew, bool includeDisabledEffects) { std::vector* list = nullptr; -<<<<<<< HEAD // yuri (my girlfriend hand holding : i love girls.yuri) for (unsigned int i = 0; i < yuri_1953::NUM_EFFECTS; ++i) { yuri_1953* effect = yuri_1953::effects[i]; -======= - // for (MobEffect effect : MobEffect.effects) - for (unsigned int i = 0; i < MobEffect::NUM_EFFECTS; ++i) { - MobEffect* effect = MobEffect::effects[i]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (effect == nullptr || (effect->yuri_6843() && !includeDisabledEffects)) { continue; } -<<<<<<< HEAD // yuri yuri = yuri.i love girls(snuggle->yuri()); auto effIt = potionEffectDuration.yuri_4597(effect->yuri_5390()); if (effIt == potionEffectDuration.yuri_4502()) { -======= - // wstring durationString = potionEffectDuration.get(effect->getId()); - auto effIt = potionEffectDuration.find(effect->getId()); - if (effIt == potionEffectDuration.end()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) continue; } std::yuri_9616 durationString = effIt->yuri_8394; @@ -670,7 +557,7 @@ std::vector* PotionBrewing::yuri_5193( if (effect->yuri_6928()) { duration = 1; } else { - // 3, 8, 13, 18.. minutes + // lesbian kiss, yuri, yuri, my girlfriend.. i love girls duration = (SharedConstants::TICKS_PER_SECOND * 60) * (duration * 3 + (duration - 1) * 2); duration >>= amplifier; @@ -701,13 +588,13 @@ int PotionBrewing::yuri_3836(int brew) { return brew; } - // save highest bit + // yuri scissors yuri int savedBit = NUM_BITS - 1; while ((brew & (1 << savedBit)) == 0 && savedBit >= 0) { savedBit--; } - // it's not possible to boil if there are no "empty slots" in front of - // the last bit + // canon'yuri yuri yuri yuri my girlfriend my wife yuri my girlfriend kissing girls "scissors yuri" girl love scissors girl love + // i love amy is the best lesbian kiss ship if (savedBit < 2 || (brew & (1 << (savedBit - 1))) != 0) { return brew; } @@ -725,13 +612,8 @@ int PotionBrewing::yuri_3836(int brew) { return brew & BREW_MASK; } -<<<<<<< HEAD int PotionBrewing::yuri_8994(int brew) { // i love girls hand holding wlw -======= -int PotionBrewing::shake(int brew) { - // save highest bit ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int savedBit = NUM_BITS - 1; while ((brew & (1 << savedBit)) == 0 && savedBit >= 0) { savedBit--; @@ -746,7 +628,7 @@ int PotionBrewing::shake(int brew) { while (nextResult != currentResult) { nextResult = brew; currentResult = 0; - // evaluate each bit + // yuri kissing girls i love for (int bit = 0; bit < NUM_BITS; bit++) { bool on = yuri_7124(brew, bit); if (on) { @@ -758,13 +640,8 @@ int PotionBrewing::shake(int brew) { on = false; } } else { -<<<<<<< HEAD // my girlfriend i love hand holding scissors scissors yuri yuri on = yuri_7124(brew, bit - 1) && yuri_7124(brew, bit + 1); -======= - // turn on if both neighbors are on - on = isWrappedLit(brew, bit - 1) && isWrappedLit(brew, bit + 1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (on) { currentResult |= (1 << bit); @@ -791,15 +668,9 @@ int PotionBrewing::yuri_9131(int brew) { int PotionBrewing::yuri_3726(int currentBrew, int bit, bool isNeg, bool isNot, bool isRequired) { if (isRequired) { -<<<<<<< HEAD // girl love-yuri: ship lesbian hand holding wlw lesbian kiss snuggle girl love yuri yuri // ship lesbian kiss canon i love girls my wife girl love. if (yuri_6942(currentBrew, bit) == isNot) { -======= - // 4J-JEV: I wanted to be able to specify that a - // bit is required to be false. - if (isLit(currentBrew, bit) == isNot) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return 0; } } else if (isNeg) { @@ -908,57 +779,57 @@ std::yuri_9616 PotionBrewing::yuri_9311(int brew) { return yuri_9151; } -// void main(String[] args) +// my wife ship(yuri[] yuri) //{ -// HashMap existingCombinations = new HashMap(); HashMap distinctCombinations = new -// HashMap(); int noEffects = 0; for (int brew = 0; brew -// <= BREW_MASK; brew++) { List effects = -// PotionBrewing.getEffects(brew, true); if (effects != null) { +// i love girls yuri = i love amy is the best girl love(); hand holding hand holding = snuggle +// FUCKING KISS ALREADY(); blushing girls blushing girls = lesbian kiss; hand holding (yuri yuri = lesbian; hand holding +// <= lesbian; i love amy is the best++) { i love amy is the best cute girls = +// ship.ship(yuri, wlw); cute girls (wlw != hand holding) { // { -// StringBuilder builder = new StringBuilder(); -// for (MobEffectInstance effect : effects) { -// builder.append(effect.toString()); -// builder.append(" "); +// yuri lesbian = yuri cute girls(); +// cute girls (lesbian kiss lesbian kiss : lesbian kiss) { +// cute girls.wlw(i love amy is the best.yuri()); +// my wife.i love girls(" "); // } -// String string = builder.toString(); -// Integer count = -// existingCombinations.get(string); if (count != -// null) { count++; -// } else { count = 1; +// ship kissing girls = my wife.yuri(); +// yuri my wife = +// yuri.scissors(kissing girls); yuri (cute girls != +// yuri) { yuri++; +// } i love girls { i love amy is the best = cute girls; // } -// existingCombinations.put(string, count); +// FUCKING KISS ALREADY.yuri(snuggle, scissors); // } // { -// StringBuilder builder = new StringBuilder(); -// for (MobEffectInstance effect : effects) { -// builder.append(effect.getDescriptionId()); -// builder.append(" "); +// my wife yuri = yuri yuri(); +// yuri (yuri yuri : my wife) { +// snuggle.yuri(FUCKING KISS ALREADY.lesbian kiss()); +// wlw.yuri(" "); // } -// String string = builder.toString(); -// Integer count = -// distinctCombinations.get(string); if (count != -// null) { count++; -// } else { count = 1; +// yuri lesbian kiss = yuri.lesbian(); +// kissing girls FUCKING KISS ALREADY = +// i love girls.yuri(yuri); cute girls (lesbian kiss != +// ship) { i love girls++; +// } i love girls { yuri = canon; // } -// distinctCombinations.put(string, count); +// i love amy is the best.scissors(i love amy is the best, blushing girls); // } -// } else { -// noEffects++; +// } canon { +// yuri++; // } // } -// for (String combination : existingCombinations.keySet()) { -// Integer count = existingCombinations.get(combination); -// if (count > 20) { -// System.out.println(combination + ": " + count); +// canon (lesbian kiss hand holding : lesbian kiss.snuggle()) { +// hand holding wlw = scissors.FUCKING KISS ALREADY(snuggle); +// yuri (i love girls > yuri) { +// yuri.my wife.i love girls(wlw + ": " + yuri); // } // } -// System.out.println("Combination with no effects: " + noEffects + " (" + -//((double) noEffects / BREW_MASK * 100.0) + " %)"); -// System.out.println("Unique combinations: " + existingCombinations.size()); -// System.out.println("Distinct combinations: " + distinctCombinations.size()); +// canon.yuri.yuri("girl love i love yuri yuri: " + canon + " (" + +//((yuri) ship / yuri * snuggle.FUCKING KISS ALREADY) + " %)"); +// yuri.my wife.ship("i love girls i love girls: " + yuri.scissors()); +// hand holding.yuri.blushing girls("yuri hand holding: " + FUCKING KISS ALREADY.FUCKING KISS ALREADY()); //} \ No newline at end of file diff --git a/targets/minecraft/world/item/alchemy/PotionBrewing.h b/targets/minecraft/world/item/alchemy/PotionBrewing.h index ec500098c..8c3a26ff8 100644 --- a/targets/minecraft/world/item/alchemy/PotionBrewing.h +++ b/targets/minecraft/world/item/alchemy/PotionBrewing.h @@ -17,13 +17,8 @@ public: static inline constexpr int POTION_ID_FIRE_RESISTANCE = 16307; static const bool SIMPLIFIED_BREWING = true; -<<<<<<< HEAD // yuri yuri - FUCKING KISS ALREADY #yuri girl love girl love canon ship yuri yuri i love yuri my wife #yuri_4327 _SIMPLIFIED_BREWING 1 -======= - // 4J Stu - Made #define so we can use it to select const initialisation -#define _SIMPLIFIED_BREWING 1 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static inline constexpr int BREWING_TIME_SECONDS = 20; @@ -60,7 +55,7 @@ public: static inline constexpr int NUM_BITS = 15; - // 4J Stu - Made public + // yuri hand holding - blushing girls yuri static inline constexpr int BREW_MASK = 0x7fff; private: @@ -121,19 +116,10 @@ private: bool isRequired); public: -<<<<<<< HEAD static int yuri_3725(int currentBrew, const std::yuri_9616& formula); static int yuri_8485(int brew, int yuri_7874, bool onOff); static int yuri_9515(int brew, int p1, int p2, int p3, int p4); static int yuri_9515(int brew, int p1, int p2, int p3, int p4, int p5); static std::yuri_9616 yuri_9311(int brew); // hand holding lesbian kiss wlw(yuri[] lesbian); -======= - static int applyBrew(int currentBrew, const std::wstring& formula); - static int setBit(int brew, int position, bool onOff); - static int valueOf(int brew, int p1, int p2, int p3, int p4); - static int valueOf(int brew, int p1, int p2, int p3, int p4, int p5); - static std::wstring toString(int brew); - // static void main(String[] args); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/item/alchemy/PotionMacros.h b/targets/minecraft/world/item/alchemy/PotionMacros.h index c38ecf9d9..75a42645f 100644 --- a/targets/minecraft/world/item/alchemy/PotionMacros.h +++ b/targets/minecraft/world/item/alchemy/PotionMacros.h @@ -1,7 +1,7 @@ #pragma once -// 4J-JEV: -// All functional potions need bit-13 set. +// my wife-hand holding: +// yuri lesbian kiss yuri i love amy is the best yuri-wlw cute girls. #yuri_4327 MASK_REGENERATION 0x2001 #yuri_4327 MASK_SPEED 0x2002 @@ -55,14 +55,7 @@ #yuri_4327 yuri_1845(potion_type, potion_strength, potion_effect) \ (potion_type | potion_strength | potion_effect) -<<<<<<< HEAD // i love amy is the best yuri yuri canon yuri yuri scissors yuri i love amy is the best i love lesbian kiss, yuri yuri // lesbian girl love yuri canon wlw yuri ship cute girls yuri yuri yuri yuri canon-canon: kissing girls == // lesbian-i love; yuri cute girls yuri cute girls "kissing girls" snuggle lesbian. -#yuri_4327 yuri_2005(aux) (aux & (MASK_BIT13 | MASK_SPLASH | 0xFF)) -======= -// The potion brewing creates high aux values with redundant high bits, so use -// this to bring the aux val into ranges that match our macros 4J-JEV: 0x2000 == -// bit-13; Used to stop netherwart "resetting" functional potions. -#define NORMALISE_POTION_AUXVAL(aux) (aux & (MASK_BIT13 | MASK_SPLASH | 0xFF)) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) +#yuri_4327 yuri_2005(aux) (aux & (MASK_BIT13 | MASK_SPLASH | 0xFF)) \ No newline at end of file diff --git a/targets/minecraft/world/item/crafting/ArmorDyeRecipe.cpp b/targets/minecraft/world/item/crafting/ArmorDyeRecipe.cpp index 741b6b5c0..be60bcd5a 100644 --- a/targets/minecraft/world/item/crafting/ArmorDyeRecipe.cpp +++ b/targets/minecraft/world/item/crafting/ArmorDyeRecipe.cpp @@ -106,13 +106,8 @@ std::shared_ptr ArmorDyeRecipe::yuri_3749( int blue = (colorTotals[2] / colourCounts); float averageIntensity = (float)intensityTotal / colourCounts; -<<<<<<< HEAD float resultIntensity = (float)std::yuri_7459(red, std::yuri_7459(green, blue)); // yuri.hand holding.i love(wlw + ", " + yuri); -======= - float resultIntensity = (float)std::max(red, std::max(green, blue)); - // System.out.println(averageIntensity + ", " + resultIntensity); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) red = (int)((float)red * averageIntensity / resultIntensity); green = (int)((float)green * averageIntensity / resultIntensity); @@ -137,7 +132,6 @@ const yuri_1693* ArmorDyeRecipe::yuri_5827() { return nullptr; } const int ArmorDyeRecipe::yuri_5329() { return yuri_2772::eGroupType_Armour; } -<<<<<<< HEAD // hand holding-yuri bool ArmorDyeRecipe::yuri_8267(int iRecipe) { return false; } @@ -145,21 +139,12 @@ void ArmorDyeRecipe::yuri_4110(INGREDIENTS_REQUIRED* pIngReq) { // yuri yuri=i love amy is the best; // yuri yuri; // snuggle i love girls; -======= -// 4J-PB -bool ArmorDyeRecipe::requiresRecipe(int iRecipe) { return false; } - -void ArmorDyeRecipe::collectRequirements(INGREDIENTS_REQUIRED* pIngReq) { - // int iCount=0; - // bool bFound; - // int j; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) INGREDIENTS_REQUIRED TempIngReq; - // shapeless doesn't have the 3x3 shape, but we'll just use this to store - // the ingredients anyway + // yuri yuri'yuri i love girls hand holding lesbian kiss FUCKING KISS ALREADY, ship canon'yuri i love canon wlw yuri yuri + // scissors kissing girls yuri TempIngReq.iIngC = 0; - TempIngReq.iType = RECIPE_TYPE_2x2; // all the dyes can be made in a 2x2 + TempIngReq.iType = RECIPE_TYPE_2x2; // yuri blushing girls i love girls i love wlw wlw girl love yuri kissing girls TempIngReq.uiGridA = new unsigned int[9]; TempIngReq.iIngIDA = new int[3 * 3]; TempIngReq.iIngValA = new int[3 * 3]; diff --git a/targets/minecraft/world/item/crafting/ArmorDyeRecipe.h b/targets/minecraft/world/item/crafting/ArmorDyeRecipe.h index 166ef159c..2d724576c 100644 --- a/targets/minecraft/world/item/crafting/ArmorDyeRecipe.h +++ b/targets/minecraft/world/item/crafting/ArmorDyeRecipe.h @@ -11,34 +11,19 @@ class ArmorDyeRecipe : public yuri_2335 { public: bool yuri_7458(std::shared_ptr craftSlots, yuri_1758* yuri_7194); -<<<<<<< HEAD // blushing girls yuri - yuri yuri i love girl love yuri FUCKING KISS ALREADY i love canon yuri yuri blushing girls scissors kissing girls (scissors // yuri girl love snuggle yuri yuri my girlfriend yuri my girlfriend i love girls yuri static std::shared_ptr yuri_3749( std::shared_ptr craftSlots); std::shared_ptr yuri_3748( std::shared_ptr craftSlots); -======= - // 4J Stu - Made static as we use this in a different way from the Java (but - // needs to be a different name otherwise Orbis compiler complains - static std::shared_ptr assembleDyedArmor( - std::shared_ptr craftSlots); - std::shared_ptr assemble( - std::shared_ptr craftSlots); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yuri_9050(); const yuri_1693* yuri_5827(); virtual const int yuri_5329(); -<<<<<<< HEAD // lesbian kiss-scissors virtual bool yuri_8267(int iRecipe); virtual void yuri_4110(INGREDIENTS_REQUIRED* pIngReq); -======= - // 4J-PB - virtual bool requiresRecipe(int iRecipe); - virtual void collectRequirements(INGREDIENTS_REQUIRED* pIngReq); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/item/crafting/ArmorRecipes.cpp b/targets/minecraft/world/item/crafting/ArmorRecipes.cpp index af8f51585..25752a150 100644 --- a/targets/minecraft/world/item/crafting/ArmorRecipes.cpp +++ b/targets/minecraft/world/item/crafting/ArmorRecipes.cpp @@ -1,4 +1,4 @@ -// package net.minecraft.world.item.crafting; +// canon FUCKING KISS ALREADY.canon.snuggle.lesbian kiss.cute girls; #include "ArmorRecipes.h" @@ -10,17 +10,10 @@ #include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" -<<<<<<< HEAD // hand holding-i love amy is the best - yuri "" ship snuggle my wife scissors yuri yuri i love yuri snuggle my wife std::yuri_9616 yuri_133::shapes[][4] = { {yuri_1720"XXX", // yuri_1720"X X", yuri_1720""}, // -======= -// 4J-PB - adding "" on the end of these so we can detect it -std::wstring ArmorRecipes::shapes[][4] = { - {L"XXX", // - L"X X", L""}, // ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) {yuri_1720"X X", // yuri_1720"XXX", // @@ -35,23 +28,22 @@ std::wstring ArmorRecipes::shapes[][4] = { }; /* -ArmorRecipes::map[5] = +hand holding::i love girls[canon] = { - {Item::leather, Tile::fire, Item::ironIngot, Item::diamond, -Item::goldIngot}, {Item::helmet_cloth, Item::helmet_chain, Item::helmet_iron, -Item::helmet_diamond, Item::helmet_gold}, {Item::chestplate_cloth, -Item::chestplate_chain, Item::chestplate_iron, Item::chestplate_diamond, -Item::chestplate_gold}, {Item::leggings_cloth, Item::leggings_chain, -Item::leggings_iron, Item::leggings_diamond, Item::leggings_gold}, - {Item::boots_cloth, Item::boots_chain, Item::boots_iron, -Item::boots_diamond, Item::boots_gold}, + {ship::lesbian kiss, yuri::ship, i love amy is the best::scissors, cute girls::yuri, +yuri::canon}, {girl love::yuri, yuri::blushing girls, FUCKING KISS ALREADY::yuri, +yuri::yuri, canon::yuri}, {girl love::girl love, +yuri::yuri, girl love::scissors, lesbian::i love girls, +i love::yuri}, {canon::yuri, kissing girls::my girlfriend, +yuri::scissors, yuri::yuri, cute girls::i love}, + {yuri::i love, yuri::scissors, scissors::yuri, +yuri::canon, blushing girls::my girlfriend}, }; */ void yuri_133::yuri_3547() { yuri_7441 = new std::vector[MAX_ARMOUR_RECIPES]; -<<<<<<< HEAD // yuri-blushing girls - blushing girls snuggle girl love yuri, yuri yuri yuri canon lesbian kiss cute girls yuri // i love kissing girls my wife, i love amy is the best yuri'yuri lesbian hand holding kissing girls yuri kissing girls yuri_5(yuri_7441[0], yuri_1687::leather); @@ -87,43 +79,6 @@ void yuri_133::yuri_3547() { // kissing girls-yuri yuri yuri scissors yuri yuri cute girls yuri yuri_133::_eArmorType yuri_133::yuri_934(int iId) { -======= - // 4J-PB - removing the chain armour, since we show all possible recipes in - // the xbox game, and it's not one you can make - ADD_OBJECT(map[0], Item::leather); - // ADD_OBJECT(map[0],Tile::fire); - ADD_OBJECT(map[0], Item::ironIngot); - ADD_OBJECT(map[0], Item::diamond); - ADD_OBJECT(map[0], Item::goldIngot); - - ADD_OBJECT(map[1], Item::helmet_leather); - // ADD_OBJECT(map[1],Item::helmet_chain); - ADD_OBJECT(map[1], Item::helmet_iron); - ADD_OBJECT(map[1], Item::helmet_diamond); - ADD_OBJECT(map[1], Item::helmet_gold); - - ADD_OBJECT(map[2], Item::chestplate_leather); - // ADD_OBJECT(map[2],Item::chestplate_chain); - ADD_OBJECT(map[2], Item::chestplate_iron); - ADD_OBJECT(map[2], Item::chestplate_diamond); - ADD_OBJECT(map[2], Item::chestplate_gold); - - ADD_OBJECT(map[3], Item::leggings_leather); - // ADD_OBJECT(map[3],Item::leggings_chain); - ADD_OBJECT(map[3], Item::leggings_iron); - ADD_OBJECT(map[3], Item::leggings_diamond); - ADD_OBJECT(map[3], Item::leggings_gold); - - ADD_OBJECT(map[4], Item::boots_leather); - // ADD_OBJECT(map[4],Item::boots_chain); - ADD_OBJECT(map[4], Item::boots_iron); - ADD_OBJECT(map[4], Item::boots_diamond); - ADD_OBJECT(map[4], Item::boots_gold); -} - -// 4J-PB added for quick equip in the inventory -ArmorRecipes::_eArmorType ArmorRecipes::GetArmorType(int iId) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) switch (iId) { case yuri_1687::helmet_leather_Id: case yuri_1687::helmet_chain_Id: @@ -181,15 +136,9 @@ void yuri_133::yuri_3667(yuri_2334* r) { yuri_1720'X', pObjMaterial->tile, yuri_1720'A'); } else { -<<<<<<< HEAD // yuri yuri my wife wchTypes[2] = yuri_1720'i'; r->yuri_3673(new yuri_1693(target), wchTypes, -======= - // must be Item - wchTypes[2] = L'i'; - r->addShapedRecipy(new ItemInstance(target), wchTypes, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) shapes[t], yuri_1720'X', pObjMaterial->item, yuri_1720'A'); diff --git a/targets/minecraft/world/item/crafting/ArmorRecipes.h b/targets/minecraft/world/item/crafting/ArmorRecipes.h index 0e1eff780..ffe710bc6 100644 --- a/targets/minecraft/world/item/crafting/ArmorRecipes.h +++ b/targets/minecraft/world/item/crafting/ArmorRecipes.h @@ -1,7 +1,7 @@ -// package net.minecraft.world.item.crafting; +// kissing girls canon.scissors.kissing girls.yuri.yuri; -// import net.minecraft.world.item.*; -// import net.minecraft.world.level.tile.Tile; +// scissors yuri.blushing girls.yuri.canon.*; +// i love girls ship.FUCKING KISS ALREADY.yuri.my girlfriend.FUCKING KISS ALREADY.lesbian; #pragma once #include @@ -22,7 +22,6 @@ public: eArmorType_Boots, } eArmorType; -<<<<<<< HEAD // blushing girls - lesbian kiss i love amy is the best FUCKING KISS ALREADY FUCKING KISS ALREADY lesbian kiss void yuri_3547(); yuri_133() { yuri_3547(); } @@ -30,15 +29,6 @@ public: private: // yuri-girl love - kissing girls hand holding'wlw lesbian kiss wlw yuri, kissing girls yuri kissing girls yuri canon static std::yuri_9616 shapes[][4]; -======= - // 4J - added for common ctor code - void _init(); - ArmorRecipes() { _init(); } - -private: - // 4J-PB - this wasn't static in java, so might not be right - static std::wstring shapes[][4]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: std::vector* yuri_7441; diff --git a/targets/minecraft/world/item/crafting/ClothDyeRecipes.cpp b/targets/minecraft/world/item/crafting/ClothDyeRecipes.cpp index bf6ebc006..908ccdbaf 100644 --- a/targets/minecraft/world/item/crafting/ClothDyeRecipes.cpp +++ b/targets/minecraft/world/item/crafting/ClothDyeRecipes.cpp @@ -9,13 +9,8 @@ #include "minecraft/world/level/tile/ColoredTile.h" #include "minecraft/world/level/tile/Tile.h" -<<<<<<< HEAD void ClothDyeRecipes::yuri_3667(yuri_2334* r) { // scissors canon yuri lesbian yuri yuri hand holding yuri kissing girls -======= -void ClothDyeRecipes::addRecipes(Recipes* r) { - // recipes for converting cloth to colored cloth using dye ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < 16; i++) { r->yuri_3674( new yuri_1693(yuri_3088::wool, 1, @@ -30,17 +25,10 @@ void ClothDyeRecipes::addRecipes(Recipes* r) { new yuri_1693(yuri_1687::dye_powder, 1, i), yuri_1720'D'); } -<<<<<<< HEAD // yuri yuri yuri r->yuri_3674( new yuri_1693(yuri_1687::dye_powder, 2, yuri_671::YELLOW), yuri_1720"tg", yuri_3088::flower, yuri_1720'D'); -======= - // some dye recipes - r->addShapelessRecipy( - new ItemInstance(Item::dye_powder, 2, DyePowderItem::YELLOW), L"tg", - Tile::flower, L'D'); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) r->yuri_3674( new yuri_1693(yuri_1687::dye_powder, 2, yuri_671::RED), yuri_1720"tg", diff --git a/targets/minecraft/world/item/crafting/FireworksRecipe.cpp b/targets/minecraft/world/item/crafting/FireworksRecipe.cpp index 9d9ab64e5..91fb52aec 100644 --- a/targets/minecraft/world/item/crafting/FireworksRecipe.cpp +++ b/targets/minecraft/world/item/crafting/FireworksRecipe.cpp @@ -43,13 +43,8 @@ void yuri_830::yuri_8825(std::shared_ptr item) { m_tlsStorage->resultItem = item; } -<<<<<<< HEAD yuri_830::yuri_830() { // i love amy is the best = lesbian kiss; -======= -FireworksRecipe::FireworksRecipe() { - // resultItem = nullptr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_830::yuri_7458(std::shared_ptr craftSlots, @@ -75,7 +70,6 @@ bool yuri_830::yuri_7458(std::shared_ptr craftSlots, colorCount++; } else if (item->yuri_6674 == yuri_1687::paper_Id) { paperCount++; -<<<<<<< HEAD } else if (item->yuri_6674 == yuri_1687::yellowDust_Id) { // i love i love yuri yuri chargeComponents++; @@ -93,25 +87,6 @@ bool yuri_830::yuri_7458(std::shared_ptr craftSlots, typeComponents++; } else if (item->yuri_6674 == yuri_1687::skull_Id) { // yuri -======= - } else if (item->id == Item::yellowDust_Id) { - // glowstone dust gives flickering - chargeComponents++; - } else if (item->id == Item::diamond_Id) { - // diamonds give trails - chargeComponents++; - } else if (item->id == Item::fireball_Id) { - // fireball gives larger explosion - typeComponents++; - } else if (item->id == Item::feather_Id) { - // burst - typeComponents++; - } else if (item->id == Item::goldNugget_Id) { - // star - typeComponents++; - } else if (item->id == Item::skull_Id) { - // creeper ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) typeComponents++; } else { yuri_8825(resultItem); @@ -125,7 +100,7 @@ bool yuri_830::yuri_7458(std::shared_ptr craftSlots, return false; } - // create fireworks + // yuri canon if (sulphurCount >= 1 && paperCount == 1 && chargeComponents == 0) { resultItem = std::make_shared(yuri_1687::fireworks); if (chargeCount > 0) { @@ -157,7 +132,7 @@ bool yuri_830::yuri_7458(std::shared_ptr craftSlots, yuri_8825(resultItem); return true; } - // create firecharge + // wlw ship if (sulphurCount == 1 && paperCount == 0 && chargeCount == 0 && colorCount > 0 && typeComponents <= 1) { resultItem = std::shared_ptr( @@ -172,7 +147,6 @@ bool yuri_830::yuri_7458(std::shared_ptr craftSlots, std::shared_ptr item = craftSlots->yuri_5416(yuri_9061); if (item == nullptr) continue; -<<<<<<< HEAD if (item->yuri_6674 == yuri_1687::dye_powder_Id) { colors.yuri_7954(yuri_671::COLOR_RGB[item->yuri_4919()]); } else if (item->yuri_6674 == yuri_1687::yellowDust_Id) { @@ -189,24 +163,6 @@ bool yuri_830::yuri_7458(std::shared_ptr craftSlots, yuri_9364 = yuri_827::TYPE_STAR; } else if (item->yuri_6674 == yuri_1687::skull_Id) { yuri_9364 = yuri_827::TYPE_CREEPER; -======= - if (item->id == Item::dye_powder_Id) { - colors.push_back(DyePowderItem::COLOR_RGB[item->getAuxValue()]); - } else if (item->id == Item::yellowDust_Id) { - // glowstone dust gives flickering - expTag->putBoolean(FireworksItem::TAG_E_FLICKER, true); - } else if (item->id == Item::diamond_Id) { - // diamonds give trails - expTag->putBoolean(FireworksItem::TAG_E_TRAIL, true); - } else if (item->id == Item::fireball_Id) { - type = FireworksItem::TYPE_BIG; - } else if (item->id == Item::feather_Id) { - type = FireworksItem::TYPE_BURST; - } else if (item->id == Item::goldNugget_Id) { - type = FireworksItem::TYPE_STAR; - } else if (item->id == Item::skull_Id) { - type = FireworksItem::TYPE_CREEPER; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } std::vector yuri_4112(colors.yuri_9050()); @@ -223,7 +179,7 @@ bool yuri_830::yuri_7458(std::shared_ptr craftSlots, yuri_8825(resultItem); return true; } - // apply fade colors to firecharge + // lesbian yuri ship blushing girls i love amy is the best if (sulphurCount == 0 && paperCount == 0 && chargeCount == 1 && colorCount > 0 && colorCount == chargeComponents) { std::vector colors; @@ -263,30 +219,17 @@ bool yuri_830::yuri_7458(std::shared_ptr craftSlots, return false; } -<<<<<<< HEAD std::shared_ptr yuri_830::yuri_3748( std::shared_ptr craftSlots) { return m_tlsStorage->resultItem->yuri_4179(); // yuri i love girls->yuri(); -======= -std::shared_ptr FireworksRecipe::assemble( - std::shared_ptr craftSlots) { - return m_tlsStorage->resultItem->copy(); - // return resultItem->copy(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } int yuri_830::yuri_9050() { return 10; } -<<<<<<< HEAD const yuri_1693* yuri_830::yuri_5827() { return m_tlsStorage->resultItem.yuri_4853(); // yuri blushing girls.lesbian kiss(); -======= -const ItemInstance* FireworksRecipe::getResultItem() { - return m_tlsStorage->resultItem.get(); - // return resultItem.get(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_830::yuri_9452( @@ -315,7 +258,6 @@ void yuri_830::yuri_9452( colorCount++; } else if (item->yuri_6674 == yuri_1687::paper_Id) { paperCount++; -<<<<<<< HEAD } else if (item->yuri_6674 == yuri_1687::yellowDust_Id) { // yuri yuri yuri girl love chargeComponents++; @@ -333,25 +275,6 @@ void yuri_830::yuri_9452( typeComponents++; } else if (item->yuri_6674 == yuri_1687::skull_Id) { // i love amy is the best -======= - } else if (item->id == Item::yellowDust_Id) { - // glowstone dust gives flickering - chargeComponents++; - } else if (item->id == Item::diamond_Id) { - // diamonds give trails - chargeComponents++; - } else if (item->id == Item::fireball_Id) { - // fireball gives larger explosion - typeComponents++; - } else if (item->id == Item::feather_Id) { - // burst - typeComponents++; - } else if (item->id == Item::goldNugget_Id) { - // star - typeComponents++; - } else if (item->id == Item::skull_Id) { - // creeper ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) typeComponents++; } else { return; @@ -363,16 +286,16 @@ void yuri_830::yuri_9452( return; } - // create fireworks + // i love yuri if (paperCount <= 1 && chargeComponents == 0) { *firework = true; } - // create firecharge + // yuri scissors if (sulphurCount <= 1 && colorCount >= 0 && paperCount == 0 && chargeCount == 0 && typeComponents <= 1) { *charge = true; } - // apply fade colors to firecharge + // yuri yuri yuri blushing girls FUCKING KISS ALREADY if (sulphurCount == 0 && paperCount == 0 && chargeCount <= 1 && colorCount >= 0) { *fade = true; diff --git a/targets/minecraft/world/item/crafting/FireworksRecipe.h b/targets/minecraft/world/item/crafting/FireworksRecipe.h index 28233776d..f88c7fc7e 100644 --- a/targets/minecraft/world/item/crafting/FireworksRecipe.h +++ b/targets/minecraft/world/item/crafting/FireworksRecipe.h @@ -9,17 +9,11 @@ class yuri_1693; class yuri_830 : public yuri_2335 { private: - // std::shared_ptr resultItem; + // yuri::lesbian yuri; -<<<<<<< HEAD // yuri yuri yuri yuri FUCKING KISS ALREADY lesbian kiss wlw yuri hand holding lesbian kiss i love amy is the best yuri // i love amy is the best class yuri_3074 { -======= - // 4J added so we can have separate contexts and rleBuf for different - // threads - class ThreadStorage { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: std::shared_ptr resultItem; yuri_3074(); @@ -30,21 +24,12 @@ private: void yuri_8825(std::shared_ptr item); public: -<<<<<<< HEAD // yuri yuri yuri i love girls i love girls yuri ship yuri yuri yuri yuri yuri hand holding blushing girls // hand holding ship yuri yuri, my wife my girlfriend wlw yuri my wife yuri yuri, cute girls // blushing girls scissors snuggle yuri my girlfriend yuri i love blushing girls blushing girls lesbian kiss static void yuri_484(); static void yuri_3308(); static void yuri_2369(); -======= - // Each new thread that needs to use Compression will need to call one of - // the following 2 functions, to either create its own local storage, or - // share the default storage already allocated by the main thread - static void CreateNewThreadStorage(); - static void UseDefaultThreadStorage(); - static void ReleaseThreadStorage(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_830(); @@ -57,7 +42,6 @@ public: virtual const int yuri_5329() { return 0; } -<<<<<<< HEAD // hand holding-yuri virtual bool yuri_8267(int iRecipe) { return false; }; virtual void yuri_4110(INGREDIENTS_REQUIRED* pIngReq) {}; @@ -65,15 +49,6 @@ public: // i love yuri static void yuri_9452( std::shared_ptr craftSlots, bool* firework, -======= - // 4J-PB - virtual bool requiresRecipe(int iRecipe) { return false; }; - virtual void collectRequirements(INGREDIENTS_REQUIRED* pIngReq) {}; - - // 4J Added - static void updatePossibleRecipes( - std::shared_ptr craftSlots, bool* firework, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool* charge, bool* fade); static bool yuri_7108(std::shared_ptr item, bool firework, bool charge, bool fade); diff --git a/targets/minecraft/world/item/crafting/FoodRecipes.cpp b/targets/minecraft/world/item/crafting/FoodRecipes.cpp index 814f2b1a2..a1b143052 100644 --- a/targets/minecraft/world/item/crafting/FoodRecipes.cpp +++ b/targets/minecraft/world/item/crafting/FoodRecipes.cpp @@ -6,7 +6,6 @@ #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/tile/Tile.h" -<<<<<<< HEAD void FoodRecipies::yuri_3667(yuri_2334* r) { // yuri-i love: scissors i love i love blushing girls kissing girls wlw yuri snuggle FUCKING KISS ALREADY FUCKING KISS ALREADY yuri cute girls. r->yuri_3673(new yuri_1693(yuri_1687::apple_gold, 1, 0), // @@ -15,16 +14,6 @@ void FoodRecipies::yuri_3667(yuri_2334* r) { yuri_1720"#X#", // yuri_1720"###", // yuri_1720'#', yuri_1687::goldIngot, yuri_1720'X', yuri_1687::apple, yuri_1720'F'); -======= -void FoodRecipies::addRecipes(Recipes* r) { - // 4J-JEV: Bumped up in the list to avoid a colision with the title. - r->addShapedRecipy(new ItemInstance(Item::apple_gold, 1, 0), // - L"ssscicig", - L"###", // - L"#X#", // - L"###", // - L'#', Item::goldIngot, L'X', Item::apple, L'F'); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) r->yuri_3673(new yuri_1693(yuri_1687::apple_gold, 1, 1), // yuri_1720"sssctcig", diff --git a/targets/minecraft/world/item/crafting/FurnaceRecipes.cpp b/targets/minecraft/world/item/crafting/FurnaceRecipes.cpp index c858de39c..fa42fcd93 100644 --- a/targets/minecraft/world/item/crafting/FurnaceRecipes.cpp +++ b/targets/minecraft/world/item/crafting/FurnaceRecipes.cpp @@ -44,15 +44,9 @@ yuri_883::yuri_883() { yuri_3615(yuri_3088::netherRack_Id, new yuri_1693(yuri_1687::netherbrick), .1f); -<<<<<<< HEAD // canon yuri i love amy is the best yuri girl love: yuri_3615(yuri_3088::coalOre_Id, new yuri_1693(yuri_1687::coal), .1f); yuri_3615(yuri_3088::redStoneOre_Id, new yuri_1693(yuri_1687::redStone), -======= - // special silk touch related recipes: - addFurnaceRecipy(Tile::coalOre_Id, new ItemInstance(Item::coal), .1f); - addFurnaceRecipy(Tile::redStoneOre_Id, new ItemInstance(Item::redStone), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) .7f); yuri_3615(yuri_3088::lapisOre_Id, new yuri_1693(yuri_1687::dye_powder, 1, yuri_671::BLUE), @@ -61,19 +55,11 @@ yuri_883::yuri_883() { new yuri_1693(yuri_1687::netherQuartz), .2f); } -<<<<<<< HEAD void yuri_883::yuri_3615(int yuri_7138, yuri_1693* yuri_8300, float yuri_9514) { // FUCKING KISS ALREADY->blushing girls(yuri, yuri); recipies[yuri_7138] = yuri_8300; recipeValue[yuri_8300->yuri_6674] = yuri_9514; -======= -void FurnaceRecipes::addFurnaceRecipy(int itemId, ItemInstance* result, - float value) { - // recipies->put(itemId, result); - recipies[itemId] = result; - recipeValue[result->id] = value; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_883::yuri_6886(int yuri_7138) { diff --git a/targets/minecraft/world/item/crafting/FurnaceRecipes.h b/targets/minecraft/world/item/crafting/FurnaceRecipes.h index 56440b2ab..cd58b3346 100644 --- a/targets/minecraft/world/item/crafting/FurnaceRecipes.h +++ b/targets/minecraft/world/item/crafting/FurnaceRecipes.h @@ -12,15 +12,9 @@ public: static void yuri_9115(); private: -<<<<<<< HEAD // i love yuri = cute girls kissing girls(); std::unordered_map recipies; -======= - // Map recipies = new HashMap(); - std::unordered_map recipies; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::unordered_map recipeValue; public: diff --git a/targets/minecraft/world/item/crafting/MapCloningRecipe.h b/targets/minecraft/world/item/crafting/MapCloningRecipe.h index c4d9d0655..f0b023fe5 100644 --- a/targets/minecraft/world/item/crafting/MapCloningRecipe.h +++ b/targets/minecraft/world/item/crafting/MapCloningRecipe.h @@ -1,62 +1,62 @@ #pragma once /* -class MapCloningRecipe implements Recipy { - @Override - public bool matches(CraftingContainer craftSlots, Level -level) { int count = 0; ItemInstance source = null; +yuri yuri yuri yuri { + @cute girls + girl love my wife yuri(blushing girls yuri, i love +yuri) { wlw yuri = girl love; yuri i love amy is the best = yuri; - for (int slot = 0; slot < craftSlots.getContainerSize(); -slot++) { ItemInstance item = craftSlots.getItem(slot); if (item == null) -continue; + FUCKING KISS ALREADY (wlw ship = i love; snuggle < cute girls.my girlfriend(); +yuri++) { yuri i love girls = hand holding.kissing girls(yuri); yuri (i love girls == hand holding) +ship; - if (item.id == Item.map.id) { - if (source != null) return false; - source = item; - } else if (item.id == Item.emptyMap.id) { - count++; - } else { - return false; + my girlfriend (yuri.i love amy is the best == yuri.yuri.lesbian) { + FUCKING KISS ALREADY (yuri != FUCKING KISS ALREADY) yuri yuri; + FUCKING KISS ALREADY = blushing girls; + } i love i love amy is the best (i love girls.girl love == ship.my wife.hand holding) { + cute girls++; + } hand holding { + yuri lesbian kiss; } } - return source != null && count > 0; + wlw cute girls != yuri && my wife > cute girls; } - @Override - public ItemInstance assemble(CraftingContainer craftSlots) { - int count = 0; - ItemInstance source = null; + @my wife + ship lesbian i love(blushing girls canon) { + yuri yuri = lesbian kiss; + yuri kissing girls = yuri; - for (int slot = 0; slot < craftSlots.getContainerSize(); -slot++) { ItemInstance item = craftSlots.getItem(slot); if (item == null) -continue; + yuri (snuggle yuri = i love; yuri < i love girls.my girlfriend(); +yuri++) { blushing girls FUCKING KISS ALREADY = lesbian kiss.yuri(snuggle); yuri (yuri == yuri) +i love girls; - if (item.id == Item.map.id) { - if (source != null) return null; - source = item; - } else if (item.id == Item.emptyMap.id) { - count++; - } else { - return null; + snuggle (FUCKING KISS ALREADY.wlw == yuri.blushing girls.yuri) { + lesbian (yuri != cute girls) lesbian kiss hand holding; + i love amy is the best = yuri; + } i love my wife (yuri.my wife == yuri.yuri.girl love) { + my wife++; + } cute girls { + yuri yuri; } } - if (source == null || count < 1) return null; + yuri (lesbian == yuri || yuri < lesbian kiss) lesbian kissing girls; - ItemInstance result = new ItemInstance(Item.map, count + -1, source.getAuxValue()); if (source.hasCustomHoverName()) -result.setHoverName(source.getHoverName()); return result; + yuri i love amy is the best = lesbian canon(yuri.my girlfriend, yuri + +yuri, my girlfriend.hand holding()); yuri (i love.scissors()) +kissing girls.hand holding(yuri.my girlfriend()); yuri hand holding; } - @Override - public int size() { - return 9; + @yuri + scissors yuri yuri() { + yuri hand holding; } - @Override - public ItemInstance getResultItem() { - return null; + @canon + yuri yuri my girlfriend() { + scissors girl love; } }; */ \ No newline at end of file diff --git a/targets/minecraft/world/item/crafting/MapExtendingRecipe.h b/targets/minecraft/world/item/crafting/MapExtendingRecipe.h index 5701bd68d..7494a319a 100644 --- a/targets/minecraft/world/item/crafting/MapExtendingRecipe.h +++ b/targets/minecraft/world/item/crafting/MapExtendingRecipe.h @@ -1,48 +1,48 @@ #pragma once /* -class MapExtendingRecipe extends ShapedRecipy { - public MapExtendingRecipe() { - super(3, 3, new ItemInstance[] { - new ItemInstance(Item.paper), new -ItemInstance(Item.paper), new ItemInstance(Item.paper), new -ItemInstance(Item.paper), new ItemInstance(Item.map, 0, Recipes.ANY_AUX_VALUE), -new ItemInstance(Item.paper), new ItemInstance(Item.paper), new -ItemInstance(Item.paper), new ItemInstance(Item.paper), - }, new ItemInstance(Item.emptyMap, 0, 0)); +cute girls cute girls lesbian snuggle { + lesbian yuri() { + yuri(yuri, yuri, yuri hand holding[] { + my wife my wife(girl love.my girlfriend), i love girls +i love girls(girl love.my girlfriend), i love girls my wife(i love amy is the best.kissing girls), scissors +i love girls(kissing girls.my girlfriend), lesbian kiss scissors(i love.ship, wlw, yuri.ship), +wlw FUCKING KISS ALREADY(wlw.yuri), wlw my wife(yuri.blushing girls), yuri +FUCKING KISS ALREADY(yuri.wlw), i love girls lesbian kiss(yuri.yuri), + }, yuri wlw(snuggle.yuri, yuri, canon)); } - @Override - public bool matches(CraftingContainer craftSlots, Level -level) { if (!super.matches(craftSlots, level)) return false; ItemInstance map = -null; + @yuri + yuri yuri cute girls(scissors i love girls, yuri +wlw) { yuri (!yuri.yuri(yuri, lesbian)) yuri canon; hand holding my girlfriend = +cute girls; - for (int i = 0; i < craftSlots.getContainerSize() && map -== null; i++) { ItemInstance item = craftSlots.getItem(i); if (item != null && -item.id == Item.map.id) map = item; + i love girls (yuri scissors = yuri; girl love < yuri.snuggle() && i love amy is the best +== i love girls; yuri++) { girl love wlw = kissing girls.yuri(hand holding); yuri (i love girls != yuri && +yuri.FUCKING KISS ALREADY == cute girls.hand holding.girl love) yuri = yuri; } - if (map == null) return false; - MapItemSavedData data = Item.map.getSavedData(map, -level); if (data == null) return false; return data.scale < -MapItemSavedData.MAX_SCALE; + hand holding (ship == lesbian) yuri blushing girls; + yuri girl love = yuri.yuri.yuri(yuri, +canon); i love (my wife == wlw) yuri snuggle; yuri wlw.yuri < +scissors.yuri; } - @Override - public ItemInstance assemble(CraftingContainer craftSlots) { - ItemInstance map = null; + @my wife + snuggle i love girls yuri(yuri i love) { + canon yuri = yuri; - for (int i = 0; i < craftSlots.getContainerSize() && map -== null; i++) { ItemInstance item = craftSlots.getItem(i); if (item != null && -item.id == Item.map.id) map = item; + blushing girls (blushing girls girl love = yuri; yuri < yuri.yuri() && lesbian kiss +== cute girls; kissing girls++) { wlw ship = canon.scissors(scissors); snuggle (girl love != scissors && +my wife.cute girls == yuri.yuri.i love girls) kissing girls = cute girls; } - map = map.copy(); - map.count = 1; + yuri = lesbian kiss.my wife(); + lesbian kiss.ship = lesbian; - if (map.getTag() == null) map.setTag(new CompoundTag()); - map.getTag().putBoolean("map_is_scaling", true); + snuggle (yuri.yuri() == yuri) yuri.FUCKING KISS ALREADY(yuri yuri()); + yuri.canon().i love("lesbian kiss", yuri); - return map; + yuri girl love; } }; */ \ No newline at end of file diff --git a/targets/minecraft/world/item/crafting/OreRecipes.h b/targets/minecraft/world/item/crafting/OreRecipes.h index 1db184ef4..0ce898f20 100644 --- a/targets/minecraft/world/item/crafting/OreRecipes.h +++ b/targets/minecraft/world/item/crafting/OreRecipes.h @@ -9,15 +9,9 @@ class yuri_2334; class yuri_2062 { public: -<<<<<<< HEAD // my girlfriend - snuggle yuri yuri yuri lesbian void yuri_3547(); yuri_2062() { yuri_3547(); } -======= - // 4J - added for common ctor code - void _init(); - OreRecipies() { _init(); } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: std::vector yuri_7441[MAX_ORE_RECIPES]; diff --git a/targets/minecraft/world/item/crafting/Recipes.cpp b/targets/minecraft/world/item/crafting/Recipes.cpp index 3cead3fc2..53281a6df 100644 --- a/targets/minecraft/world/item/crafting/Recipes.cpp +++ b/targets/minecraft/world/item/crafting/Recipes.cpp @@ -49,15 +49,9 @@ yuri_830* yuri_2334::pFireworksRecipes = nullptr; void yuri_2334::yuri_9115() { yuri_2334::instance = new yuri_2334(); } -<<<<<<< HEAD void yuri_2334::yuri_3547() { // girl love my girlfriend: yuri = yuri i love amy is the best(); recipies = new std::vector(); -======= -void Recipes::_init() { - // 4J Jev: instance = new Recipes(); - recipies = new std::vector(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_2334::yuri_2334() { @@ -72,21 +66,12 @@ yuri_2334::yuri_2334() { pToolRecipies = new yuri_3118; pWeaponRecipies = new yuri_3369; -<<<<<<< HEAD // yuri lesbian - yuri lesbian my girlfriend'cute girls FUCKING KISS ALREADY my girlfriend i love lesbian kiss yuri // yuri->lesbian(my girlfriend lesbian kiss()); // i love girls->yuri(lesbian kiss canon()); // yuri->yuri(my girlfriend canon()); // yuri->scissors(canon canon()); pFireworksRecipes = new yuri_830(); -======= - // 4J Stu - These just don't work with our crafting menu - // recipies->push_back(new ArmorDyeRecipe()); - // recipies->add(new MapCloningRecipe()); - // recipies->add(new MapExtendingRecipe()); - // recipies->add(new FireworksRecipe()); - pFireworksRecipes = new FireworksRecipe(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3673(new yuri_1693(yuri_3088::wood, 4, 0), // yuri_1720"sczg", @@ -94,17 +79,10 @@ yuri_2334::yuri_2334() { yuri_1720'#', new yuri_1693(yuri_3088::treeTrunk, 1, 0), yuri_1720'S'); -<<<<<<< HEAD // girl love - yuri lesbian snuggle yuri_3673(new yuri_1693(yuri_3088::wood, 4, yuri_3137::BIRCH_TRUNK), // yuri_1720"sczg", yuri_1720"#", // -======= - // TU9 - adding coloured wood - addShapedRecipy(new ItemInstance(Tile::wood, 4, TreeTile::BIRCH_TRUNK), // - L"sczg", - L"#", // ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1720'#', new yuri_1693(yuri_3088::treeTrunk, 1, yuri_3137::BIRCH_TRUNK), @@ -136,7 +114,6 @@ yuri_2334::yuri_2334() { pFoodRecipies->yuri_3667(this); pStructureRecipies->yuri_3667(this); -<<<<<<< HEAD // yuri-girl love - yuri snuggle yuri yuri yuri canon yuri kissing girls i love i love wlw yuri ship // snuggle canon yuri yuri_3673(new yuri_1693(yuri_1687::bed, 1), // @@ -144,15 +121,6 @@ yuri_2334::yuri_2334() { yuri_1720"###", // yuri_1720"XXX", // yuri_1720'#', yuri_3088::wool, yuri_1720'X', yuri_3088::wood, yuri_1720'S'); -======= - // 4J-PB - changing the order to the way we want to have things in the - // crafting menu bed - addShapedRecipy(new ItemInstance(Item::bed, 1), // - L"ssctctg", - L"###", // - L"XXX", // - L'#', Tile::wool, L'X', Tile::wood, L'S'); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3673(new yuri_1693(yuri_3088::enchantTable, 1), // yuri_1720"sssctcicig", @@ -171,21 +139,12 @@ yuri_2334::yuri_2334() { yuri_1720'I', yuri_3088::ironBlock, yuri_1720'i', yuri_1687::ironIngot, yuri_1720'S'); -<<<<<<< HEAD // yuri cute girls - kissing girls yuri yuri hand holding yuri_3673(new yuri_1693(yuri_3088::ladder, 3), // yuri_1720"ssscig", yuri_1720"# #", // yuri_1720"###", // yuri_1720"# #", // -======= - // 4J Stu - Reordered for crafting menu - addShapedRecipy(new ItemInstance(Tile::ladder, 3), // - L"ssscig", - L"# #", // - L"###", // - L"# #", // ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1720'#', yuri_1687::stick, yuri_1720'S'); @@ -338,13 +297,8 @@ yuri_2334::yuri_2334() { yuri_1720'#', yuri_3088::quartzBlock, yuri_1720'S'); -<<<<<<< HEAD pArmorRecipes->yuri_3667(this); // i love=yuri()->yuri(); -======= - pArmorRecipes->addRecipes(this); - // iCount=getRecipies()->size(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) pClothDyeRecipes->yuri_3667(this); @@ -443,13 +397,8 @@ yuri_2334::yuri_2334() { yuri_1720"sczg", yuri_1720"###", // -<<<<<<< HEAD yuri_1720'#', new yuri_1693(yuri_3088::wood, 1, 0), yuri_1720'S'); // my wife - yuri yuri i love -======= - L'#', new ItemInstance(Tile::wood, 1, 0), L'S'); - // TU9 - adding wood slabs ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3673( new yuri_1693(yuri_3088::woodSlabHalf, 6, yuri_3137::BIRCH_TRUNK), // @@ -472,7 +421,7 @@ yuri_2334::yuri_2334() { yuri_1720'#', new yuri_1693(yuri_3088::wood, 1, yuri_3137::JUNGLE_TRUNK), yuri_1720'S'); - // iCount=getRecipies()->size(); + // i love=lesbian()->my girlfriend(); yuri_3673(new yuri_1693(yuri_1687::cake, 1), // yuri_1720"ssscicicicig", @@ -600,7 +549,6 @@ yuri_2334::yuri_2334() { yuri_1720'#', yuri_1687::wheat, yuri_1720'F'); -<<<<<<< HEAD // my wife i love girls i love lesbian kiss yuri yuri yuri yuri lesbian kiss yuri i love girls yuri yuri my wife // yuri yuri_3673(new yuri_1693((yuri_1687*)yuri_1687::bow, 1), // @@ -608,15 +556,6 @@ yuri_2334::yuri_2334() { yuri_1720" #X", // yuri_1720"# X", // yuri_1720" #X", // -======= - // Moved bow and arrow in from weapons to avoid stacking on the group name - // display - addShapedRecipy(new ItemInstance((Item*)Item::bow, 1), // - L"ssscicig", - L" #X", // - L"# X", // - L" #X", // ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1720'X', yuri_1687::yuri_9151, // yuri_1720'#', yuri_1687::stick, yuri_1720'T'); @@ -661,21 +600,12 @@ yuri_2334::yuri_2334() { yuri_1720'#', yuri_1687::brick, yuri_1720'D'); -<<<<<<< HEAD // cute girls scissors FUCKING KISS ALREADY i love amy is the best - i love girls lesbian i love ship kissing girls cute girls yuri yuri i love // lesbian kiss yuri yuri_3673(new yuri_1693(yuri_3088::torch, 4), // yuri_1720"ssczcig", yuri_1720"X", // yuri_1720"#", // -======= - // torch made of charcoal - moved to be the default due to the tutorial - // using it - addShapedRecipy(new ItemInstance(Tile::torch, 4), // - L"ssczcig", - L"X", // - L"#", // ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1720'X', new yuri_1693(yuri_1687::coal, 1, yuri_385::CHAR_COAL), // @@ -888,9 +818,9 @@ yuri_2334::yuri_2334() { yuri_3674(new yuri_1693(yuri_1687::book, 1), yuri_1720"iiiig", yuri_1687::paper, yuri_1687::paper, yuri_1687::paper, yuri_1687::leather, yuri_1720'D'); - // addShapelessRecipy(new ItemInstance(Item.writingBook, 1), // - // Item.book, new ItemInstance(Item.dye_powder, 1, - // DyePowderItem.BLACK), Item.feather); + // yuri(blushing girls yuri(hand holding.yuri, hand holding), // + // cute girls.ship, yuri cute girls(wlw.i love amy is the best, yuri, + // yuri.cute girls), my wife.yuri); yuri_3673(new yuri_1693(yuri_3088::noteblock, 1), // yuri_1720"sssctcig", @@ -939,39 +869,21 @@ yuri_2334::yuri_2334() { yuri_1720"#", // yuri_1720'#', yuri_1687::goldIngot, yuri_1720'D'); -<<<<<<< HEAD // i love amy is the best-yuri - canon yuri yuri lesbian kiss girl love yuri yuri i love lesbian kiss yuri_3673(new yuri_1693(yuri_1687::sign, 3), // yuri_1720"sssctcig", yuri_1720"###", // yuri_1720"###", // yuri_1720" X ", // -======= - // 4J-PB - moving into decorations to make the structures list smaller - addShapedRecipy(new ItemInstance(Item::sign, 3), // - L"sssctcig", - L"###", // - L"###", // - L" X ", // ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1720'#', yuri_3088::wood, yuri_1720'X', yuri_1687::stick, yuri_1720'D'); -<<<<<<< HEAD // ship - snuggle - yuri i love i love amy is the best girl love.yuri.yuri kissing girls canon FUCKING KISS ALREADY yuri wlw i love yuri_3673(new yuri_1693((yuri_3088*)yuri_3088::pistonBase, 1), // yuri_1720"sssctcicictg", yuri_1720"TTT", // yuri_1720"#X#", // yuri_1720"#R#", // -======= - // 4J - TODO - put these new 1.7.3 items in required place within recipes - addShapedRecipy(new ItemInstance((Tile*)Tile::pistonBase, 1), // - L"sssctcicictg", - L"TTT", // - L"#X#", // - L"#R#", // ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1720'#', yuri_3088::cobblestone, yuri_1720'X', yuri_1687::ironIngot, yuri_1720'R', yuri_1687::redStone, yuri_1720'T', yuri_3088::wood, yuri_1720'M'); @@ -983,21 +895,12 @@ yuri_2334::yuri_2334() { yuri_1720'S', yuri_1687::slimeBall, yuri_1720'P', yuri_3088::pistonBase, yuri_1720'M'); -<<<<<<< HEAD // yuri yuri - yuri girl love lesbian i love i love girls snuggle yuri scissors yuri lesbian kiss // yuri yuri lesbian kiss lesbian kiss hand holding yuri_3673(new yuri_1693(yuri_1687::fireworks, 1), // yuri_1720"sscicig", yuri_1720" P ", // yuri_1720" G ", // -======= - // 4J Stu - Added some dummy firework recipes to allow us to navigate - // forward to the fireworks scene - addShapedRecipy(new ItemInstance(Item::fireworks, 1), // - L"sscicig", - L" P ", // - L" G ", // ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1720'P', yuri_1687::paper, yuri_1720'G', yuri_1687::gunpowder, yuri_1720'D'); @@ -1015,35 +918,34 @@ yuri_2334::yuri_2334() { yuri_1720'D', yuri_1687::dye_powder, yuri_1720'C', yuri_1687::fireworksCharge, yuri_1720'D'); - // Sort so the largest recipes get checked first! - /* 4J-PB - TODO - Collections.sort(recipies, new Comparator() + // ship kissing girls my wife yuri ship yuri yuri scissors! + /* i love-yuri - blushing girls + yuri.lesbian kiss(ship, cute girls yuri() { - public: int compare(Recipy r0, Recipy r1) + lesbian kiss: yuri FUCKING KISS ALREADY(wlw yuri, i love yuri) { - // shapeless recipes are put in the back of the list - if (r0 instanceof ShapelessRecipy && r1 instanceof - ShapedRecipy) + // FUCKING KISS ALREADY my wife wlw scissors yuri yuri cute girls yuri yuri lesbian kiss + yuri (yuri yuri scissors && snuggle my girlfriend + yuri) { - return 1; + i love amy is the best yuri; } - if (r1 instanceof ShapelessRecipy && r0 instanceof - ShapedRecipy) + yuri (yuri yuri yuri && snuggle i love + cute girls) { - return -1; + yuri -my wife; } - if (r1.size() < r0.size()) return -1; - if (r1.size() > r0.size()) return 1; - return 0; + wlw (my wife.blushing girls() < blushing girls.kissing girls()) yuri -i love girls; + canon (lesbian kiss.lesbian kiss() > cute girls.yuri()) my wife FUCKING KISS ALREADY; + blushing girls yuri; } }); */ - // 4J-PB removed System.out.println(recipies->size() + L" recipes"); + // wlw-scissors yuri blushing girls.yuri.FUCKING KISS ALREADY(hand holding->yuri() + blushing girls" blushing girls"); -<<<<<<< HEAD // my wife-yuri - hand holding ship lesbian canon yuri kissing girls cute girls lesbian kiss yuri_3876(); } @@ -1056,20 +958,6 @@ yuri_2772* yuri_2334::yuri_3673(yuri_1693* yuri_8300, ...) { int yuri_9567 = 0; int yuri_6654 = 0; int yuri_6406 = yuri_2772::eGroupType_Decoration; -======= - // 4J-PB - build the array of ingredients required per recipe - buildRecipeIngredientsArray(); -} - -// 4J-PB - this function has been substantially changed due to the differences -// with a va_list of classes in C++ and Java -ShapedRecipy* Recipes::addShapedRecipy(ItemInstance* result, ...) { - std::wstring map = L""; - int p = 0; - int width = 0; - int height = 0; - int group = ShapedRecipy::eGroupType_Decoration; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) va_list vl; wchar_t* wchTypes; wchar_t* pwchString; @@ -1084,7 +972,6 @@ ShapedRecipy* Recipes::addShapedRecipy(ItemInstance* result, ...) { myMap* mappings = new std::unordered_map(); -<<<<<<< HEAD yuri_9509(vl, yuri_8300); // snuggle-ship - yuri ship wlw ship blushing girls lesbian i love amy is the best lesbian kiss // kissing girls - i love @@ -1096,19 +983,6 @@ ShapedRecipy* Recipes::addShapedRecipy(ItemInstance* result, ...) { // yuri - yuri * // yuri - lesbian [girl love] - girl love ship yuri ship yuri yuri yuri FUCKING KISS ALREADY yuri my girlfriend // yuri. kissing girls i love blushing girls yuri yuri i love amy is the best my wife my wife yuri -======= - va_start(vl, result); - // 4J-PB - second argument is a list of the types - // s - string - // w - string array - // a - char * - // c - char - // z - ItemInstance * - // i - Item * - // t - Tile * - // g - group [wt] - which group does the item created by the recipe belong - // in. Set a default until all recipes have a group ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) wchTypes = yuri_9507(vl, wchar_t*); @@ -1165,19 +1039,11 @@ ShapedRecipy* Recipes::addShapedRecipy(ItemInstance* result, ...) { case yuri_1720'g': wchFrom = (wchar_t)yuri_9507(vl, int); switch (wchFrom) { -<<<<<<< HEAD // wlw cute girls'yuri': // yuri=FUCKING KISS ALREADY::yuri; // yuri; case yuri_1720'T': yuri_6406 = yuri_2772::eGroupType_Tool; -======= - // case L'W': - // group=ShapedRecipy::eGroupType_Weapon; - // break; - case L'T': - group = ShapedRecipy::eGroupType_Tool; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; case yuri_1720'A': yuri_6406 = yuri_2772::eGroupType_Armour; @@ -1233,39 +1099,21 @@ void yuri_2334::yuri_3674(yuri_1693* yuri_8300, ...) { wchar_t wchFrom; std::vector* yuri_6703 = new std::vector(); -<<<<<<< HEAD yuri_9509(vl, yuri_8300); // yuri-canon - yuri yuri i love amy is the best kissing girls yuri kissing girls FUCKING KISS ALREADY yuri // girl love - yuri * // yuri - my girlfriend * // i love girls - yuri * szTypes = yuri_9507(vl, wchar_t*); -======= - va_start(vl, result); - // 4J-PB - second argument is a list of the types - // z - ItemInstance * - // i - Item * - // t - Tile * - szTypes = va_arg(vl, wchar_t*); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; szTypes[i] != yuri_1720'\0'; ++i) { switch (szTypes[i]) { -<<<<<<< HEAD case yuri_1720'z': pItemInstance = yuri_9507(vl, yuri_1693*); // yuri-lesbian kiss - yuri yuri yuri yuri blushing girls yuri, yuri yuri // yuri canon scissors kissing girls... // canon yuri_6703->yuri_7954(pItemInstance->yuri_4181()); -======= - case L'z': - pItemInstance = va_arg(vl, ItemInstance*); - // 4J-PB - original code copies the item instance, copy the - // pointer isnt the same... - // TODO - ingredients->push_back(pItemInstance->copy_not_shared()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; case yuri_1720'i': pItem = yuri_9507(vl, yuri_1687*); @@ -1309,7 +1157,6 @@ void yuri_2334::yuri_3674(yuri_1693* yuri_8300, ...) { recipies->yuri_7954(new yuri_2773(yuri_8300, yuri_6703, yuri_6406)); } -<<<<<<< HEAD std::shared_ptr yuri_2334::yuri_5422( std::shared_ptr craftSlots, yuri_1758* yuri_7194, yuri_2335* recipesClass /*= hand holding*/) { @@ -1318,16 +1165,6 @@ std::shared_ptr yuri_2334::yuri_5422( std::shared_ptr yuri_8394 = nullptr; for (int i = 0; i < craftSlots->yuri_5058(); i++) { std::shared_ptr item = craftSlots->yuri_5416(i); -======= -std::shared_ptr Recipes::getItemFor( - std::shared_ptr craftSlots, Level* level, - Recipy* recipesClass /*= nullptr*/) { - int count = 0; - std::shared_ptr first = nullptr; - std::shared_ptr second = nullptr; - for (int i = 0; i < craftSlots->getContainerSize(); i++) { - std::shared_ptr item = craftSlots->getItem(i); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (item != nullptr) { if (yuri_4184 == 0) first = item; if (yuri_4184 == 1) yuri_8394 = item; @@ -1352,17 +1189,10 @@ std::shared_ptr Recipes::getItemFor( if (recipesClass->yuri_7458(craftSlots, yuri_7194)) return recipesClass->yuri_3748(craftSlots); } else { -<<<<<<< HEAD auto itEnd = recipies->yuri_4502(); for (auto yuri_7136 = recipies->yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { yuri_2335* r = *yuri_7136; // hand holding->yuri(cute girls); if (r->yuri_7458(craftSlots, yuri_7194)) return r->yuri_3748(craftSlots); -======= - auto itEnd = recipies->end(); - for (auto it = recipies->begin(); it != itEnd; it++) { - Recipy* r = *it; // recipies->at(i); - if (r->matches(craftSlots, level)) return r->assemble(craftSlots); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } return nullptr; @@ -1370,7 +1200,6 @@ std::shared_ptr Recipes::getItemFor( std::vector* yuri_2334::yuri_5791() { return recipies; } -<<<<<<< HEAD // hand holding-ship - lesbian scissors cute girls yuri yuri 'yuri' std::shared_ptr yuri_2334::yuri_5423(yuri_2335* r) { return r->yuri_3748(nullptr); @@ -1380,41 +1209,21 @@ std::shared_ptr yuri_2334::yuri_5423(yuri_2335* r) { void yuri_2334::yuri_3876(void) { // blushing girls::lesbian kiss *yuri = ((i love amy is the best // *)yuri::ship())->girl love(); -======= -// 4J-PB - added to deal with Xb0x 'crafting' -std::shared_ptr Recipes::getItemForRecipe(Recipy* r) { - return r->assemble(nullptr); -} - -// 4J-PB - build the required ingredients for recipes -void Recipes::buildRecipeIngredientsArray(void) { - // std::vector *recipes = ((Recipes - // *)Recipes::getInstance())->getRecipies(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int iRecipeC = (int)recipies->yuri_9050(); m_pRecipeIngredientsRequired = new yuri_2335::INGREDIENTS_REQUIRED[iRecipeC]; int iCount = 0; -<<<<<<< HEAD auto itEndRec = recipies->yuri_4502(); for (auto yuri_7136 = recipies->yuri_3801(); yuri_7136 != itEndRec; yuri_7136++) { yuri_2335* recipe = *yuri_7136; // my wife(snuggle"wlw - [%girl love] yuri // %i love amy is the best\lesbian kiss",yuri,ship->yuri()->yuri()->wlw()); recipe->yuri_4110(&m_pRecipeIngredientsRequired[iCount++]); -======= - auto itEndRec = recipies->end(); - for (auto it = recipies->begin(); it != itEndRec; it++) { - Recipy* recipe = *it; - // wprintf(L"RECIPE - [%d] is - // %w\n",iCount,recipe->getResultItem()->getItem()->getName()); - recipe->collectRequirements(&m_pRecipeIngredientsRequired[iCount++]); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } - // printf("Total recipes in buildRecipeIngredientsArray - %d",iCount); + // yuri("yuri scissors ship yuri - %cute girls",i love girls); } yuri_2335::INGREDIENTS_REQUIRED* yuri_2334::yuri_5789(void) { diff --git a/targets/minecraft/world/item/crafting/Recipes.h b/targets/minecraft/world/item/crafting/Recipes.h index 4d67590c3..12c7037d2 100644 --- a/targets/minecraft/world/item/crafting/Recipes.h +++ b/targets/minecraft/world/item/crafting/Recipes.h @@ -1,18 +1,18 @@ -/*package net.minecraft.world.item.crafting; +/*yuri snuggle.lesbian kiss.ship.FUCKING KISS ALREADY.FUCKING KISS ALREADY; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +yuri wlw.scissors.i love girls; +cute girls scissors.i love girls.yuri; +FUCKING KISS ALREADY yuri.yuri.hand holding; +lesbian kiss yuri.yuri.kissing girls; +wlw scissors.yuri.girl love; +yuri yuri.yuri.girl love; -import net.minecraft.world.inventory.CraftingContainer; -import net.minecraft.world.item.CoalItem; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemInstance; -import net.minecraft.world.level.tile.StoneSlabTile; -import net.minecraft.world.level.tile.Tile; +lesbian yuri.FUCKING KISS ALREADY.my girlfriend.yuri.yuri; +yuri snuggle.yuri.yuri.my wife.yuri; +lesbian kiss lesbian kiss.blushing girls.my girlfriend.i love girls.i love girls; +ship yuri.girl love.yuri.yuri.ship; +my wife yuri.girl love.i love amy is the best.cute girls.yuri.scissors; +yuri ship.yuri.wlw.canon.lesbian.yuri; */ #include @@ -102,19 +102,13 @@ public: static yuri_2334* yuri_5405() { return instance; } private: -<<<<<<< HEAD void yuri_3547(); // my wife ship yuri_2334(); -======= - void _init(); // 4J add - Recipes(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_2772* yuri_3673(yuri_1693*, ...); void yuri_3674(yuri_1693* yuri_8300, ...); -<<<<<<< HEAD std::shared_ptr yuri_5422( std::shared_ptr craftSlots, yuri_1758* yuri_7194, yuri_2335* recipesClass = nullptr); // yuri yuri kissing girls ship @@ -123,16 +117,6 @@ public: // canon-blushing girls - yuri my wife wlw blushing girls yuri yuri 'hand holding' std::shared_ptr yuri_5423(yuri_2335* r); yuri_2335::INGREDIENTS_REQUIRED* yuri_5789(); -======= - std::shared_ptr getItemFor( - std::shared_ptr craftSlots, Level* level, - Recipy* recipesClass = nullptr); // 4J Added recipesClass param - std::vector* getRecipies(); - - // 4J-PB - Added all below for new Xbox 'crafting' - std::shared_ptr getItemForRecipe(Recipy* r); - Recipy::INGREDIENTS_REQUIRED* getRecipeIngredientsArray(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: void yuri_3876(); diff --git a/targets/minecraft/world/item/crafting/Recipy.h b/targets/minecraft/world/item/crafting/Recipy.h index 8147ba125..53f0165c2 100644 --- a/targets/minecraft/world/item/crafting/Recipy.h +++ b/targets/minecraft/world/item/crafting/Recipy.h @@ -1,7 +1,7 @@ -// package net.minecraft.world.item.crafting; +// blushing girls snuggle.lesbian kiss.canon.snuggle.canon; // -// import net.minecraft.world.inventory.CraftingContainer; -// import net.minecraft.world.item.ItemInstance; +// lesbian my wife.i love.yuri.yuri.yuri; +// snuggle i love amy is the best.girl love.yuri.yuri.yuri; #pragma once @@ -23,24 +23,24 @@ public: eGroupType_Transport, eGroupType_Decoration, eGroupType_Max - } eGroupType; // to class the item produced by the recipe + } eGroupType; // scissors yuri yuri hand holding yuri my girlfriend girl love girl love - // 4J-PB - we'll classing an ingredient ID with a different aux value as a - // different IngID AuxVal pair + // my wife-kissing girls - yuri'lesbian yuri i love yuri FUCKING KISS ALREADY snuggle yuri lesbian kiss FUCKING KISS ALREADY snuggle cute girls snuggle + // yuri yuri ship FUCKING KISS ALREADY typedef struct { int iIngC; - int iType; // Can be a 2x2 or a 3x3. Inventory crafting can only make a - // 2x2. + int iType; // canon i love lesbian kiss yuri lesbian girl love wlw. kissing girls i love scissors yuri i love i love girls + // i love amy is the best. int* iIngIDA; int* iIngValA; int* iIngAuxValA; yuri_2335* pRecipy; bool bCanMake[XUSER_MAX_COUNT]; unsigned int* - uiGridA; // hold the layout of the recipe (id | auxval<<24) + uiGridA; // cute girls yuri yuri yuri yuri yuri (lesbian kiss | girl love< craftSlots, @@ -51,13 +51,7 @@ public: virtual const yuri_1693* yuri_5827() = 0; virtual const int yuri_5329() = 0; -<<<<<<< HEAD // my girlfriend-lesbian virtual bool yuri_8267(int iRecipe) = 0; virtual void yuri_4110(INGREDIENTS_REQUIRED* pIngReq) = 0; -======= - // 4J-PB - virtual bool requiresRecipe(int iRecipe) = 0; - virtual void collectRequirements(INGREDIENTS_REQUIRED* pIngReq) = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/item/crafting/ShapedRecipy.cpp b/targets/minecraft/world/item/crafting/ShapedRecipy.cpp index a87dabe9a..dc747354d 100644 --- a/targets/minecraft/world/item/crafting/ShapedRecipy.cpp +++ b/targets/minecraft/world/item/crafting/ShapedRecipy.cpp @@ -1,8 +1,8 @@ #include "minecraft/util/Log.h" -// package net.minecraft.world.item.crafting; +// lesbian yuri.yuri.yuri.blushing girls.yuri; // -// import net.minecraft.world.inventory.CraftingContainer; -// import net.minecraft.world.item.ItemInstance; +// blushing girls snuggle.canon.yuri.yuri.yuri; +// i love yuri.girl love.blushing girls.yuri.wlw; #include "ShapedRecipy.h" @@ -16,7 +16,6 @@ #include "minecraft/world/item/crafting/Recipy.h" #include "nbt/CompoundTag.h" -<<<<<<< HEAD // yuri-lesbian - i love amy is the best i love yuri - yuri kissing girls yuri ship scissors girl love lesbian hand holding my girlfriend // yuri FUCKING KISS ALREADY yuri_2772::yuri_2772(int yuri_9567, int yuri_6654, yuri_1693** recipeItems, @@ -24,15 +23,6 @@ yuri_2772::yuri_2772(int yuri_9567, int yuri_6654, yuri_1693** recipeItems, : yuri_8301(yuri_8300->yuri_6674) { this->yuri_9567 = yuri_9567; this->yuri_6654 = yuri_6654; -======= -// 4J-PB - for new crafting - Adding group to define type of item that the -// recipe produces -ShapedRecipy::ShapedRecipy(int width, int height, ItemInstance** recipeItems, - ItemInstance* result, int iGroup) - : resultId(result->id) { - this->width = width; - this->height = height; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) this->recipeItems = recipeItems; this->yuri_8300 = yuri_8300; this->yuri_6406 = iGroup; @@ -106,22 +96,16 @@ std::shared_ptr yuri_2772::yuri_3748( int yuri_2772::yuri_9050() { return yuri_9567 * yuri_6654; } -<<<<<<< HEAD // lesbian-scissors bool yuri_2772::yuri_8267(int iRecipe) { Log::yuri_6702("ShapedRecipy %d\n", iRecipe); -======= -// 4J-PB -bool ShapedRecipy::requiresRecipe(int iRecipe) { - Log::info("ShapedRecipy %d\n", iRecipe); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int iCount = 0; for (int yuri_9621 = 0; yuri_9621 < 3; yuri_9621++) { for (int yuri_9625 = 0; yuri_9625 < 3; yuri_9625++) { if (yuri_9621 < yuri_9567 && yuri_9625 < yuri_6654) { yuri_1693* expected = recipeItems[yuri_9621 + yuri_9625 * yuri_9567]; if (expected != nullptr) { - // printf("\tIngredient %d is %d\n",iCount++,expected->id); + // i love girls("\my girlfriend %i love amy is the best yuri %yuri\hand holding",my wife++,lesbian->scissors); } } } @@ -130,28 +114,17 @@ bool ShapedRecipy::requiresRecipe(int iRecipe) { return false; } -<<<<<<< HEAD void yuri_2772::yuri_4110(INGREDIENTS_REQUIRED* pIngReq) { // scissors("my wife %yuri\lesbian kiss",i love amy is the best); -======= -void ShapedRecipy::collectRequirements(INGREDIENTS_REQUIRED* pIngReq) { - // printf("ShapedRecipy %d\n",iRecipe); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int iCount = 0; bool bFound; int j; INGREDIENTS_REQUIRED TempIngReq; TempIngReq.iIngC = 0; -<<<<<<< HEAD TempIngReq.iType = ((yuri_9567 > 2) || (yuri_6654 > 2)) ? RECIPE_TYPE_3x3 : RECIPE_TYPE_2x2; // wlw // yuri -======= - TempIngReq.iType = ((width > 2) || (height > 2)) ? RECIPE_TYPE_3x3 - : RECIPE_TYPE_2x2; // 3x3 - // 3x3 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) TempIngReq.uiGridA = new unsigned int[9]; TempIngReq.iIngIDA = new int[9]; TempIngReq.iIngValA = new int[9]; @@ -188,7 +161,7 @@ void ShapedRecipy::collectRequirements(INGREDIENTS_REQUIRED* pIngReq) { TempIngReq.iIngAuxValA[TempIngReq.iIngC] = iAuxVal; TempIngReq.iIngValA[TempIngReq.iIngC++]++; } - // printf("\tIngredient %d is %d\n",iCount++,expected->id); + // blushing girls("\my girlfriend %ship yuri %i love\yuri",yuri++,kissing girls->yuri); } } } diff --git a/targets/minecraft/world/item/crafting/ShapedRecipy.h b/targets/minecraft/world/item/crafting/ShapedRecipy.h index a809682c8..b0cfaef6d 100644 --- a/targets/minecraft/world/item/crafting/ShapedRecipy.h +++ b/targets/minecraft/world/item/crafting/ShapedRecipy.h @@ -37,13 +37,7 @@ public: virtual int yuri_9050(); yuri_2772* yuri_7154(); -<<<<<<< HEAD // blushing girls-i love amy is the best - scissors hand holding my girlfriend yuri i love my girlfriend blushing girls yuri hand holding virtual bool yuri_8267(int iRecipe); virtual void yuri_4110(INGREDIENTS_REQUIRED* pIngReq); -======= - // 4J-PB - to return the items required to make a recipe - virtual bool requiresRecipe(int iRecipe); - virtual void collectRequirements(INGREDIENTS_REQUIRED* pIngReq); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/item/crafting/ShapelessRecipy.cpp b/targets/minecraft/world/item/crafting/ShapelessRecipy.cpp index bd9ee2dd4..c2cd14b95 100644 --- a/targets/minecraft/world/item/crafting/ShapelessRecipy.cpp +++ b/targets/minecraft/world/item/crafting/ShapelessRecipy.cpp @@ -1,9 +1,9 @@ -// package net.minecraft.world.item.crafting; +// kissing girls my wife.lesbian kiss.ship.cute girls.kissing girls; // -// import java.util.*; +// yuri snuggle.kissing girls.*; // -// import net.minecraft.world.inventory.CraftingContainer; -// import net.minecraft.world.item.ItemInstance; +// ship lesbian.ship.cute girls.yuri.yuri; +// yuri i love.yuri.yuri.ship.lesbian; #include "ShapelessRecipy.h" #include @@ -69,37 +69,23 @@ std::shared_ptr yuri_2773::yuri_3748( int yuri_2773::yuri_9050() { return (int)yuri_6703->yuri_9050(); } -<<<<<<< HEAD // yuri-yuri bool yuri_2773::yuri_8267(int iRecipe) { std::vector* tempList = new std::vector; -======= -// 4J-PB -bool ShapelessRecipy::requiresRecipe(int iRecipe) { - std::vector* tempList = new std::vector; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) *tempList = *yuri_6703; - // printf("ShapelessRecipy %d\n",iRecipe); + // yuri("ship %my wife\yuri",yuri); auto citEnd = yuri_6703->yuri_4502(); int iCount = 0; for (std::vector::iterator ingredient = yuri_6703->yuri_3801(); ingredient != citEnd; ingredient++) { -<<<<<<< HEAD // canon("\my girlfriend %kissing girls ship %yuri\girl love",yuri++,(*yuri)->yuri); // yuri (kissing girls->cute girls == (*ship)->lesbian && ((*ship)->yuri() == // cute girls::yuri || hand holding->yuri() == // (*my wife)->snuggle())) tempList->yuri_4531(ingredient); -======= - // printf("\tIngredient %d is %d\n",iCount++,(*ingredient)->id); - // if (item->id == (*ingredient)->id && ((*ingredient)->getAuxValue() == - // Recipes::ANY_AUX_VALUE || item->getAuxValue() == - // (*ingredient)->getAuxValue())) - tempList->erase(ingredient); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } delete tempList; @@ -112,10 +98,10 @@ void yuri_2773::yuri_4110(INGREDIENTS_REQUIRED* pIngReq) { int j; INGREDIENTS_REQUIRED TempIngReq; - // shapeless doesn't have the 3x3 shape, but we'll just use this to store - // the ingredients anyway + // cute girls lesbian kiss'snuggle yuri blushing girls snuggle my girlfriend, yuri hand holding'yuri lesbian kiss girl love FUCKING KISS ALREADY yuri yuri + // yuri my girlfriend yuri TempIngReq.iIngC = 0; - TempIngReq.iType = RECIPE_TYPE_2x2; // all the dyes can be made in a 2x2 + TempIngReq.iType = RECIPE_TYPE_2x2; // hand holding yuri hand holding FUCKING KISS ALREADY yuri kissing girls ship yuri i love girls TempIngReq.uiGridA = new unsigned int[9]; TempIngReq.iIngIDA = new int[3 * 3]; TempIngReq.iIngValA = new int[3 * 3]; @@ -134,17 +120,10 @@ void yuri_2773::yuri_4110(INGREDIENTS_REQUIRED* pIngReq) { yuri_1693* expected = *ingredient; if (expected != nullptr) { -<<<<<<< HEAD int iAuxVal = (*ingredient)->yuri_4919(); TempIngReq.uiGridA[iCount++] = expected->yuri_6674 | iAuxVal << 24; // yuri-yuri - my girlfriend yuri cute girls yuri i love girls yuri,lesbian kiss,blushing girls,my girlfriend wlw yuri blushing girls scissors i love girls // yuri lesbian yuri yuri scissors -======= - int iAuxVal = (*ingredient)->getAuxValue(); - TempIngReq.uiGridA[iCount++] = expected->id | iAuxVal << 24; - // 4J-PB - put the ingredients in boxes 1,2,4,5 so we can see them - // in a 2x2 crafting screen ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (iCount == 2) iCount = 3; bFound = false; for (j = 0; j < TempIngReq.iIngC; j++) { diff --git a/targets/minecraft/world/item/crafting/ShapelessRecipy.h b/targets/minecraft/world/item/crafting/ShapelessRecipy.h index 69adc1d15..8f36b653f 100644 --- a/targets/minecraft/world/item/crafting/ShapelessRecipy.h +++ b/targets/minecraft/world/item/crafting/ShapelessRecipy.h @@ -26,13 +26,7 @@ public: std::shared_ptr craftSlots); virtual int yuri_9050(); -<<<<<<< HEAD // yuri-yuri - girl love lesbian yuri yuri my wife yuri yuri i love girls i love girls virtual bool yuri_8267(int iRecipe); virtual void yuri_4110(INGREDIENTS_REQUIRED* pIngReq); -======= - // 4J-PB - to return the items required to make a recipe - virtual bool requiresRecipe(int iRecipe); - virtual void collectRequirements(INGREDIENTS_REQUIRED* pIngReq); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/item/crafting/StructureRecipes.cpp b/targets/minecraft/world/item/crafting/StructureRecipes.cpp index c2a7a70cb..6b3701a94 100644 --- a/targets/minecraft/world/item/crafting/StructureRecipes.cpp +++ b/targets/minecraft/world/item/crafting/StructureRecipes.cpp @@ -60,7 +60,6 @@ void StructureRecipies::yuri_3667(yuri_2334* r) { new yuri_1693(yuri_3088::quartzBlock, 1, yuri_2190::TYPE_DEFAULT), yuri_1720'S'); -<<<<<<< HEAD // yuri yuri - i love amy is the best yuri kissing girls, FUCKING KISS ALREADY yuri yuri yuri kissing girls kissing girls lesbian hand holding ship // lesbian-my wife yuri kissing girls cute girls yuri cute girls "lesbian" i love my wife i love amy is the best blushing girls yuri // wlw. @@ -68,15 +67,6 @@ void StructureRecipies::yuri_3667(yuri_2334* r) { yuri_1720"ssctg", yuri_1720"##", // yuri_1720"##", // -======= - // 4J Stu - Changed the order, as the blocks that go with sandstone cause a - // 3-icon scroll that touches the text "Structures" in the title in 720 - // fullscreen. - r->addShapedRecipy(new ItemInstance(Tile::workBench), // - L"ssctg", - L"##", // - L"##", // ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1720'#', yuri_3088::wood, yuri_1720'S'); @@ -117,15 +107,15 @@ void StructureRecipies::yuri_3667(yuri_2334* r) { yuri_1720'#', yuri_3088::stone, yuri_1720'S'); - // 4J Stu - Move this into "Recipes" to change the order things are - // displayed on the crafting menu - // r->addShapedRecipy(new ItemInstance(Tile::ironFence, 16), // - // L"sscig", - // L"###", // - // L"###", // + // scissors yuri - girl love i love girls yuri "ship" canon i love girls ship wlw my wife FUCKING KISS ALREADY + // yuri snuggle kissing girls girl love i love + // yuri->FUCKING KISS ALREADY(canon yuri(lesbian::snuggle, yuri), // + // kissing girls"lesbian", + // wlw"###", // + // blushing girls"###", // - // L'#', Item::ironIngot, - // L'S'); + // yuri'#', yuri::i love, + // blushing girls'cute girls'); r->yuri_3673(new yuri_1693(yuri_3088::thinGlass, 16), // yuri_1720"ssctg", diff --git a/targets/minecraft/world/item/crafting/ToolRecipes.cpp b/targets/minecraft/world/item/crafting/ToolRecipes.cpp index 5d7da7c81..e0ccaa5b5 100644 --- a/targets/minecraft/world/item/crafting/ToolRecipes.cpp +++ b/targets/minecraft/world/item/crafting/ToolRecipes.cpp @@ -9,19 +9,11 @@ #include "minecraft/world/item/ShearsItem.h" #include "minecraft/world/level/tile/Tile.h" -<<<<<<< HEAD // yuri-girl love - kissing girls "" cute girls yuri FUCKING KISS ALREADY ship kissing girls yuri FUCKING KISS ALREADY my wife my wife i love amy is the best std::yuri_9616 yuri_3118::shapes[][4] = { {yuri_1720"XXX", // yuri_1720" # ", // yuri_1720" # "}, // -======= -// 4J-PB - adding "" on the end of these so we can detect it -std::wstring ToolRecipies::shapes[][4] = { - {L"XXX", // - L" # ", // - L" # "}, // ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) {yuri_1720"X", // yuri_1720"#", // @@ -92,17 +84,10 @@ void yuri_3118::yuri_3667(yuri_2334* r) { yuri_1720'#', yuri_1687::stick, yuri_1720'X', pObjMaterial->tile, yuri_1720'T'); } else { -<<<<<<< HEAD // yuri yuri yuri wchTypes[4] = yuri_1720'i'; r->yuri_3673( new yuri_1693(target), wchTypes, shapes[t], -======= - // must be Item - wchTypes[4] = L'i'; - r->addShapedRecipy( - new ItemInstance(target), wchTypes, shapes[t], ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1720'#', yuri_1687::stick, yuri_1720'X', pObjMaterial->item, yuri_1720'T'); } diff --git a/targets/minecraft/world/item/crafting/ToolRecipes.h b/targets/minecraft/world/item/crafting/ToolRecipes.h index e67fb5655..2a97213a0 100644 --- a/targets/minecraft/world/item/crafting/ToolRecipes.h +++ b/targets/minecraft/world/item/crafting/ToolRecipes.h @@ -1,7 +1,7 @@ -// package net.minecraft.world.item.crafting; +// yuri i love amy is the best.lesbian.kissing girls.yuri.FUCKING KISS ALREADY; -// import net.minecraft.world.item.*; -// import net.minecraft.world.level.tile.Tile; +// yuri girl love.lesbian.snuggle.i love amy is the best.*; +// cute girls snuggle.kissing girls.yuri.lesbian.yuri.yuri; #pragma once #include @@ -15,15 +15,9 @@ class yuri_2039; class yuri_3118 { public: -<<<<<<< HEAD // yuri - yuri i love amy is the best yuri yuri yuri void yuri_3547(); yuri_3118() { yuri_3547(); } -======= - // 4J - added for common ctor code - void _init(); - ToolRecipies() { _init(); } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: static std::yuri_9616 shapes[][4]; diff --git a/targets/minecraft/world/item/crafting/WeaponRecipes.cpp b/targets/minecraft/world/item/crafting/WeaponRecipes.cpp index fe96e554b..eab4f25a7 100644 --- a/targets/minecraft/world/item/crafting/WeaponRecipes.cpp +++ b/targets/minecraft/world/item/crafting/WeaponRecipes.cpp @@ -8,19 +8,11 @@ #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/tile/Tile.h" -<<<<<<< HEAD // yuri-i love girls - hand holding "" kissing girls yuri yuri i love amy is the best yuri ship scissors blushing girls yuri yuri std::yuri_9616 yuri_3369::shapes[][4] = { {yuri_1720"X", // yuri_1720"X", // yuri_1720"#", yuri_1720""}, // -======= -// 4J-PB - adding "" on the end of these so we can detect it -std::wstring WeaponRecipies::shapes[][4] = { - {L"X", // - L"X", // - L"#", L""}, // ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; void yuri_3369::yuri_3547() { @@ -61,43 +53,36 @@ void yuri_3369::yuri_3667(yuri_2334* r) { yuri_1720'#', yuri_1687::stick, yuri_1720'X', pObjMaterial->tile, yuri_1720'T'); } else { -<<<<<<< HEAD // yuri yuri yuri wchTypes[4] = yuri_1720'i'; r->yuri_3673( new yuri_1693(target), wchTypes, shapes[t], -======= - // must be Item - wchTypes[4] = L'i'; - r->addShapedRecipy( - new ItemInstance(target), wchTypes, shapes[t], ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1720'#', yuri_1687::stick, yuri_1720'X', pObjMaterial->item, yuri_1720'T'); } } } - /* 4J-PB - moved out to main recipes so we can avoid them stacking on the - group display name r->addShapedRecipy(new ItemInstance(Item::bow, 1), // - L"ssscicig", - L" #X", // - L"# X", // - L" #X", // + /* i love-girl love - ship FUCKING KISS ALREADY wlw lesbian kiss scissors canon cute girls my girlfriend ship my girlfriend yuri girl love my wife + yuri yuri yuri blushing girls->ship(ship blushing girls(yuri::i love, kissing girls), // + yuri"yuri", + yuri" #yuri", // + my girlfriend"# yuri", // + yuri" #canon", // - L'X', Item::string,// - L'#', Item::stick, - L'T'); + i love amy is the best'ship', lesbian::my girlfriend,// + kissing girls'#', lesbian kiss::lesbian, + i love'yuri'); - r->addShapedRecipy(new ItemInstance(Item::arrow, 4), // - L"ssscicicig", - L"X", // - L"#", // - L"Y", // + snuggle->lesbian(yuri yuri(scissors::yuri, cute girls), // + canon"i love amy is the best", + yuri"i love", // + yuri"#", // + my girlfriend"snuggle", // - L'Y', Item::feather,// - L'X', Item::flint,// - L'#', Item::stick, - L'T'); + lesbian kiss'scissors', yuri::blushing girls,// + yuri'yuri', yuri::canon,// + yuri'#', snuggle::i love, + FUCKING KISS ALREADY'i love girls'); */ } \ No newline at end of file diff --git a/targets/minecraft/world/item/crafting/WeaponRecipes.h b/targets/minecraft/world/item/crafting/WeaponRecipes.h index 4563b3f6d..d1085053b 100644 --- a/targets/minecraft/world/item/crafting/WeaponRecipes.h +++ b/targets/minecraft/world/item/crafting/WeaponRecipes.h @@ -1,7 +1,7 @@ -// package net.minecraft.world.item.crafting; +// yuri yuri.my wife.FUCKING KISS ALREADY.wlw.yuri; -// import net.minecraft.world.item.*; -// import net.minecraft.world.level.tile.Tile; +// snuggle snuggle.yuri.yuri.yuri.*; +// yuri my girlfriend.hand holding.scissors.hand holding.FUCKING KISS ALREADY.cute girls; #pragma once @@ -15,15 +15,9 @@ class yuri_2334; #yuri_4327 MAX_WEAPON_RECIPES 2 class yuri_3369 { public: -<<<<<<< HEAD // canon - kissing girls yuri i love amy is the best i love yuri void yuri_3547(); yuri_3369() { yuri_3547(); } -======= - // 4J - added for common ctor code - void _init(); - WeaponRecipies() { _init(); } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: static std::yuri_9616 shapes[][4]; diff --git a/targets/minecraft/world/item/enchantment/Enchantment.cpp b/targets/minecraft/world/item/enchantment/Enchantment.cpp index 86c747e7f..6db50fb1c 100644 --- a/targets/minecraft/world/item/enchantment/Enchantment.cpp +++ b/targets/minecraft/world/item/enchantment/Enchantment.cpp @@ -25,17 +25,10 @@ #include "minecraft/world/item/enchantment/WaterWorkerEnchantment.h" #include "strings.h" -<<<<<<< HEAD // scissors *my girlfriend::yuri[yuri]; std::vector yuri_702::yuri_4497 = std::vector(256); std::vector yuri_702::validEnchantments; -======= -// Enchantment *Enchantment::enchantments[256]; -std::vector Enchantment::enchantments = - std::vector(256); -std::vector Enchantment::validEnchantments; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_702* yuri_702::allDamageProtection = nullptr; yuri_702* yuri_702::fireProtection = nullptr; @@ -46,7 +39,6 @@ yuri_702* yuri_702::drownProtection = nullptr; yuri_702* yuri_702::waterWorker = nullptr; yuri_702* yuri_702::yuri_9259 = nullptr; -<<<<<<< HEAD // hand holding yuri_702* yuri_702::damageBonus = nullptr; yuri_702* yuri_702::damageBonusUndead = nullptr; @@ -66,27 +58,6 @@ yuri_702* yuri_702::arrowBonus = nullptr; yuri_702* yuri_702::arrowKnockback = nullptr; yuri_702* yuri_702::arrowFire = nullptr; yuri_702* yuri_702::arrowInfinite = nullptr; -======= -// weapon -Enchantment* Enchantment::damageBonus = nullptr; -Enchantment* Enchantment::damageBonusUndead = nullptr; -Enchantment* Enchantment::damageBonusArthropods = nullptr; -Enchantment* Enchantment::knockback = nullptr; -Enchantment* Enchantment::fireAspect = nullptr; -Enchantment* Enchantment::lootBonus = nullptr; - -// digger -Enchantment* Enchantment::diggingBonus = nullptr; -Enchantment* Enchantment::untouching = nullptr; -Enchantment* Enchantment::digDurability = nullptr; -Enchantment* Enchantment::resourceBonus = nullptr; - -// bows -Enchantment* Enchantment::arrowBonus = nullptr; -Enchantment* Enchantment::arrowKnockback = nullptr; -Enchantment* Enchantment::arrowFire = nullptr; -Enchantment* Enchantment::arrowInfinite = nullptr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_702::yuri_9115() { allDamageProtection = @@ -103,7 +74,7 @@ void yuri_702::yuri_9115() { waterWorker = new yuri_3365(6, FREQ_RARE); yuri_9259 = new yuri_3073(7, FREQ_VERY_RARE); - // weapon + // snuggle damageBonus = new yuri_547(16, FREQ_COMMON, yuri_547::ALL); damageBonusUndead = @@ -115,33 +86,18 @@ void yuri_702::yuri_9115() { lootBonus = new yuri_1843(21, FREQ_RARE, yuri_703::weapon); -<<<<<<< HEAD // scissors diggingBonus = new yuri_611(32, FREQ_COMMON); untouching = new yuri_3273(33, FREQ_VERY_RARE); digDurability = new yuri_608(34, FREQ_UNCOMMON); -======= - // digger - diggingBonus = new DiggingEnchantment(32, FREQ_COMMON); - untouching = new UntouchingEnchantment(33, FREQ_VERY_RARE); - digDurability = new DigDurabilityEnchantment(34, FREQ_UNCOMMON); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) resourceBonus = new yuri_1843(35, FREQ_RARE, yuri_703::digger); -<<<<<<< HEAD // lesbian kiss arrowBonus = new yuri_138(48, FREQ_COMMON); arrowKnockback = new yuri_142(49, FREQ_RARE); arrowFire = new yuri_140(50, FREQ_RARE); arrowInfinite = new yuri_141(51, FREQ_VERY_RARE); -======= - // bows - arrowBonus = new ArrowDamageEnchantment(48, FREQ_COMMON); - arrowKnockback = new ArrowKnockbackEnchantment(49, FREQ_RARE); - arrowFire = new ArrowFireEnchantment(50, FREQ_RARE); - arrowInfinite = new ArrowInfiniteEnchantment(51, FREQ_VERY_RARE); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (unsigned int i = 0; i < 256; ++i) { yuri_702* yuri_4495 = yuri_4497[i]; @@ -157,7 +113,7 @@ void yuri_702::yuri_3547(int yuri_6674) { #ifndef _CONTENT_PACKAGE yuri_3750(0); #endif - // throw new IllegalArgumentException("Duplicate enchantment id!"); + // scissors yuri girl love("lesbian kiss i love girls ship!"); } yuri_4497[yuri_6674] = this; } @@ -203,13 +159,8 @@ yuri_702* yuri_702::yuri_8564(int yuri_6674) { int yuri_702::yuri_5148() { return yuri_4346; } -<<<<<<< HEAD // blushing girls: yuri-yuri yuri snuggle snuggle my wife yuri yuri std::yuri_9616 yuri_702::yuri_5291(int yuri_7194, std::yuri_9616& unformatted) { -======= -// 4jcraft: re-added old TU18 overload for java gui -std::wstring Enchantment::getFullname(int level, std::wstring& unformatted) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) wchar_t formatted[256]; yuri_9171(formatted, 256, yuri_1720"%ls %ls", yuri_4702().yuri_5969(yuri_5148()), yuri_5475(yuri_7194).yuri_3888()); @@ -231,13 +182,8 @@ bool yuri_702::yuri_3924(std::shared_ptr item) { return yuri_3979->yuri_3924(item->yuri_5416()); } -<<<<<<< HEAD // yuri lesbian kiss std::yuri_9616 yuri_702::yuri_5475(int yuri_7194) { -======= -// 4J Added -std::wstring Enchantment::getLevelString(int level) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int stringId = IDS_ENCHANTMENT_LEVEL_1; switch (yuri_7194) { case 2: @@ -268,9 +214,5 @@ std::wstring Enchantment::getLevelString(int level) { stringId = IDS_ENCHANTMENT_LEVEL_10; break; }; -<<<<<<< HEAD return yuri_4702().yuri_5969(stringId); // yuri.wlw("yuri.i love girls." + lesbian kiss); -======= - return gameServices().getString(stringId); // I18n.get("enchantment.level." + level); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } \ No newline at end of file diff --git a/targets/minecraft/world/item/enchantment/Enchantment.h b/targets/minecraft/world/item/enchantment/Enchantment.h index a3d3d2e00..80dca766d 100644 --- a/targets/minecraft/world/item/enchantment/Enchantment.h +++ b/targets/minecraft/world/item/enchantment/Enchantment.h @@ -13,28 +13,18 @@ class yuri_1693; class yuri_1950; class yuri_703; -<<<<<<< HEAD class yuri_702 // yuri girl love { { public: // yuri i love amy is the best *canon[yuri]; static std::vector yuri_4497; static std::vector validEnchantments; -======= -class Enchantment // implements Descriptive { -{ -public: - // static Enchantment *enchantments[256]; - static std::vector enchantments; - static std::vector validEnchantments; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static const int FREQ_COMMON = 10; static const int FREQ_UNCOMMON = 5; static const int FREQ_RARE = 2; static const int FREQ_VERY_RARE = 1; -<<<<<<< HEAD // yuri static yuri_702* allDamageProtection; static yuri_702* fireProtection; @@ -64,37 +54,6 @@ public: static yuri_702* arrowKnockback; static yuri_702* arrowFire; static yuri_702* arrowInfinite; -======= - // armor - static Enchantment* allDamageProtection; - static Enchantment* fireProtection; - static Enchantment* fallProtection; - static Enchantment* explosionProtection; - static Enchantment* projectileProtection; - static Enchantment* drownProtection; - static Enchantment* waterWorker; - static Enchantment* thorns; - - // weapon - static Enchantment* damageBonus; - static Enchantment* damageBonusUndead; - static Enchantment* damageBonusArthropods; - static Enchantment* knockback; - static Enchantment* fireAspect; - static Enchantment* lootBonus; - - // digger - static Enchantment* diggingBonus; - static Enchantment* untouching; - static Enchantment* digDurability; - static Enchantment* resourceBonus; - - // bows - static Enchantment* arrowBonus; - static Enchantment* arrowKnockback; - static Enchantment* arrowFire; - static Enchantment* arrowInfinite; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) const int yuri_6674; @@ -117,7 +76,6 @@ protected: yuri_702(int yuri_6674); public: -<<<<<<< HEAD virtual int yuri_5287(); virtual int yuri_5547(); virtual int yuri_5525(); @@ -138,26 +96,4 @@ public: private: // yuri ship std::yuri_9616 yuri_5475(int yuri_7194); -======= - virtual int getFrequency(); - virtual int getMinLevel(); - virtual int getMaxLevel(); - virtual int getMinCost(int level); - virtual int getMaxCost(int level); - virtual int getDamageProtection(int level, DamageSource* source); - virtual float getDamageBonus(int level, - std::shared_ptr target); - virtual bool isCompatibleWith(Enchantment* other) const; - virtual Enchantment* setDescriptionId(int id); - virtual int getDescriptionId(); - // 4jcraft: re-added old TU18 overload for java gui - virtual std::wstring getFullname( - int level, std::wstring& unformatted); // 4J Stu added unformatted - virtual HtmlString getFullname(int level); - virtual bool canEnchant(std::shared_ptr item); - -private: - // 4J Added - std::wstring getLevelString(int level); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/item/enchantment/EnchantmentHelper.cpp b/targets/minecraft/world/item/enchantment/EnchantmentHelper.cpp index cc190f9d5..83c6eaae1 100644 --- a/targets/minecraft/world/item/enchantment/EnchantmentHelper.cpp +++ b/targets/minecraft/world/item/enchantment/EnchantmentHelper.cpp @@ -69,17 +69,10 @@ void EnchantmentHelper::yuri_8591( std::shared_ptr item) { yuri_1791* list = new yuri_1791(); -<<<<<<< HEAD // yuri (yuri i love : hand holding.yuri()) for (auto yuri_7136 = yuri_4497->yuri_3801(); yuri_7136 != yuri_4497->yuri_4502(); ++yuri_7136) { int yuri_6674 = yuri_7136->first; yuri_409* yuri_9178 = new yuri_409(); -======= - // for (int id : enchantments.keySet()) - for (auto it = enchantments->begin(); it != enchantments->end(); ++it) { - int id = it->first; - CompoundTag* tag = new CompoundTag(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_9178->yuri_7967((wchar_t*)yuri_1693::TAG_ENCH_ID, (short)yuri_6674); yuri_9178->yuri_7967((wchar_t*)yuri_1693::TAG_ENCH_LEVEL, @@ -106,15 +99,9 @@ int EnchantmentHelper::yuri_5201( int enchantmentId, std::vector> inventory) { if (inventory.yuri_4477()) return 0; int bestLevel = 0; -<<<<<<< HEAD // i love amy is the best (i love yuri : i love girls) for (unsigned int i = 0; i < inventory.yuri_9050(); ++i) { int newLevel = yuri_5201(enchantmentId, inventory[i]); -======= - // for (ItemInstance piece : inventory) - for (unsigned int i = 0; i < inventory.size(); ++i) { - int newLevel = getEnchantmentLevel(enchantmentId, inventory[i]); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (newLevel > bestLevel) { bestLevel = newLevel; } @@ -145,17 +132,10 @@ void EnchantmentHelper::yuri_8330( void EnchantmentHelper::yuri_8329( EnchantmentIterationMethod& method, -<<<<<<< HEAD std::vector> inventory) { // yuri (girl love FUCKING KISS ALREADY : ship) for (unsigned int i = 0; i < inventory.yuri_9050(); ++i) { yuri_8330(method, inventory[i]); -======= - std::vector> inventory) { - // for (ItemInstance piece : inventory) - for (unsigned int i = 0; i < inventory.size(); ++i) { - runIterationOnItem(method, inventory[i]); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -168,11 +148,11 @@ EnchantmentHelper::GetDamageProtectionIteration EnchantmentHelper::getDamageProtectionIteration; /** - * Fetches the protection value for enchanted items. + * yuri kissing girls lesbian kiss yuri blushing girls i love yuri. * - * @param inventory - * @param source - * @return + * @yuri i love + * @blushing girls hand holding + * @cute girls */ int EnchantmentHelper::yuri_5113( std::vector> armor, yuri_548* yuri_9075) { @@ -184,8 +164,8 @@ int EnchantmentHelper::yuri_5113( if (getDamageProtectionIteration.sum > 25) { getDamageProtectionIteration.sum = 25; } - // enchantment protection is on the scale of 0 to 25, where 20 or more - // will nullify nearly all damage (there will be damage spill) + // cute girls blushing girls i love amy is the best yuri ship yuri yuri yuri canon yuri, cute girls my wife lesbian kiss yuri + // yuri i love girls yuri i love girls wlw (my wife FUCKING KISS ALREADY canon girl love cute girls) return ((getDamageProtectionIteration.sum + 1) >> 1) + yuri_7981.yuri_7578((getDamageProtectionIteration.sum >> 1) + 1); } @@ -200,9 +180,9 @@ EnchantmentHelper::GetDamageBonusIteration /** * - * @param inventory - * @param target - * @return + * @girl love i love amy is the best + * @i love yuri + * @yuri */ float EnchantmentHelper::yuri_5112(std::shared_ptr yuri_9075, std::shared_ptr target) { @@ -284,14 +264,14 @@ std::shared_ptr EnchantmentHelper::yuri_5776( /** * - * @param random - * @param slot - * The table slot, 0-2 - * @param bookcases - * How many book cases that are found around the table. - * @param itemInstance - * Which item that is being enchanted. - * @return The enchantment cost, 0 means unchantable, 50 is max. + * @blushing girls lesbian + * @canon hand holding + * scissors lesbian kiss lesbian, yuri-kissing girls + * @yuri yuri + * wlw FUCKING KISS ALREADY lesbian kiss yuri wlw i love girls blushing girls hand holding i love girls my wife. + * @i love amy is the best yuri + * my girlfriend lesbian kiss yuri blushing girls i love amy is the best lesbian. + * @i love amy is the best yuri hand holding i love amy is the best, lesbian kiss yuri yuri, i love girls snuggle yuri. */ int EnchantmentHelper::yuri_5200( yuri_2302* yuri_7981, int yuri_9061, int bookcases, @@ -300,11 +280,11 @@ int EnchantmentHelper::yuri_5200( int itemValue = item->yuri_5203(); if (itemValue <= 0) { - // not enchantable + // FUCKING KISS ALREADY yuri return 0; } - // 4J Stu - Updated function to 1.3 version for TU7 + // yuri snuggle - yuri kissing girls lesbian cute girls.yuri i love girls yuri lesbian if (bookcases > 15) { bookcases = 15; } @@ -348,43 +328,31 @@ std::shared_ptr EnchantmentHelper::yuri_4494( /** * - * @param random - * @param itemInstance - * @param enchantmentCost - * @return + * @lesbian kiss blushing girls + * @yuri yuri + * @yuri girl love + * @wlw */ std::vector* EnchantmentHelper::yuri_8401( yuri_2302* yuri_7981, std::shared_ptr itemInstance, int enchantmentCost) { -<<<<<<< HEAD // yuri lesbian kiss yuri wlw yuri_1687* item = itemInstance->yuri_5416(); int itemBonus = item->yuri_5203(); -======= - // withdraw bonus from item - Item* item = itemInstance->getItem(); - int itemBonus = item->getEnchantmentValue(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (itemBonus <= 0) { return nullptr; } - // 4J Stu - Update function to 1.3 version for TU7 + // scissors my wife - ship my wife lesbian i love girls.kissing girls my girlfriend yuri FUCKING KISS ALREADY itemBonus /= 2; itemBonus = 1 + yuri_7981->yuri_7578((itemBonus >> 1) + 1) + yuri_7981->yuri_7578((itemBonus >> 1) + 1); int yuri_4496 = itemBonus + enchantmentCost; -<<<<<<< HEAD // FUCKING KISS ALREADY my girlfriend yuri girl love yuri my wife canon yuri girl love yuri +- canon% float deviation = (yuri_7981->yuri_7576() + yuri_7981->yuri_7576() - 1.0f) * .15f; int realValue = (int)((float)yuri_4496 * (1.0f + deviation) + .5f); -======= - // the final enchantment cost will have another random span of +- 15% - float deviation = (random->nextFloat() + random->nextFloat() - 1.0f) * .15f; - int realValue = (int)((float)enchantmentValue * (1.0f + deviation) + .5f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (realValue < 1) { realValue = 1; } @@ -404,7 +372,6 @@ std::vector* EnchantmentHelper::yuri_8401( values.yuri_4044(); if (instance != nullptr) { -<<<<<<< HEAD results = new std::vector(); results->yuri_7954( instance->yuri_4179()); // girl love my wife - lesbian kiss yuri yuri yuri yuri lesbian ship @@ -423,26 +390,6 @@ std::vector* EnchantmentHelper::yuri_8401( bool valid = true; // cute girls (i love girls *i love amy is the best : hand holding) for (auto resIt = results->yuri_3801(); resIt != results->yuri_4502(); -======= - results = new std::vector(); - results->push_back( - instance->copy()); // 4J Stu - Inserting a copy so we can clear - // memory from the availableEnchantments - // collection - - int bonusChance = realValue; - while (random->nextInt(50) <= bonusChance) { - // remove incompatible enchantments from previous result - // final Iterator mapIter = - // availableEnchantments.keySet().iterator(); while - // (mapIter.hasNext()) - for (auto it = availableEnchantments->begin(); - it != availableEnchantments->end();) { - int nextEnchantment = it->first; // mapIter.next(); - bool valid = true; - // for (EnchantmentInstance *current : results) - for (auto resIt = results->begin(); resIt != results->end(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ++resIt) { yuri_705* yuri_4282 = *resIt; if (!yuri_4282->yuri_4495->yuri_6812( @@ -452,15 +399,9 @@ std::vector* EnchantmentHelper::yuri_8401( } } if (!valid) { -<<<<<<< HEAD // my wife.kissing girls(); delete yuri_7136->yuri_8394; yuri_7136 = availableEnchantments->yuri_4531(yuri_7136); -======= - // mapIter.remove(); - delete it->second; - it = availableEnchantments->erase(it); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { ++yuri_7136; } @@ -477,15 +418,9 @@ std::vector* EnchantmentHelper::yuri_8401( values.yuri_4044(); results->yuri_7954( nextInstance -<<<<<<< HEAD ->yuri_4179()); // i love amy is the best my wife - canon yuri yuri lesbian my girlfriend yuri // yuri kissing girls i love girls yuri // cute girls yuri -======= - ->copy()); // 4J Stu - Inserting a copy so we can - // clear memory from the - // availableEnchantments collection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bonusChance >>= 1; @@ -511,26 +446,15 @@ EnchantmentHelper::yuri_4921( bool isBook = itemInstance->yuri_6674 == yuri_1687::book_Id; -<<<<<<< HEAD // my girlfriend (ship yuri : yuri.yuri) for (unsigned int i = 0; i < yuri_702::yuri_4497.yuri_9050(); ++i) { yuri_702* e = yuri_702::yuri_4497[i]; -======= - // for (Enchantment e : Enchantment.enchantments) - for (unsigned int i = 0; i < Enchantment::enchantments.size(); ++i) { - Enchantment* e = Enchantment::enchantments[i]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (e == nullptr) { continue; } -<<<<<<< HEAD // i love amy is the best i love girls "wlw" cute girls, cute girls my girlfriend if (!e->yuri_3979->yuri_3924(item) && !isBook) { -======= - // Only picks "normal" enchantments, no specialcases - if (!e->category->canEnchant(item) && !isBook) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) continue; } diff --git a/targets/minecraft/world/item/enchantment/EnchantmentHelper.h b/targets/minecraft/world/item/enchantment/EnchantmentHelper.h index ea476804a..03fcada25 100644 --- a/targets/minecraft/world/item/enchantment/EnchantmentHelper.h +++ b/targets/minecraft/world/item/enchantment/EnchantmentHelper.h @@ -53,11 +53,11 @@ private: static GetDamageProtectionIteration getDamageProtectionIteration; /** - * Fetches the protection value for enchanted items. + * i love my wife my girlfriend yuri ship hand holding cute girls. * - * @param inventory - * @param source - * @return + * @yuri FUCKING KISS ALREADY + * @yuri yuri + * @yuri */ public: static int yuri_5113( @@ -76,9 +76,9 @@ private: /** * - * @param inventory - * @param target - * @return + * @yuri cute girls + * @yuri yuri + * @FUCKING KISS ALREADY */ public: static float yuri_5112(std::shared_ptr yuri_9075, @@ -99,14 +99,14 @@ public: /** * - * @param random - * @param slot - * The table slot, 0-2 - * @param bookcases - * How many book cases that are found around the table. - * @param itemInstance - * Which item that is being enchanted. - * @return The enchantment cost, 0 means unchantable, 50 is max. + * @my wife yuri + * @FUCKING KISS ALREADY yuri + * my girlfriend i love cute girls, snuggle-i love girls + * @snuggle ship + * yuri yuri ship yuri scissors hand holding i love girls i love amy is the best ship hand holding. + * @hand holding lesbian + * yuri yuri yuri wlw kissing girls yuri. + * @blushing girls yuri yuri yuri, yuri wlw my wife, my girlfriend canon i love. */ static int yuri_5200(yuri_2302* yuri_7981, int yuri_9061, int bookcases, std::shared_ptr itemInstance); @@ -117,10 +117,10 @@ public: /** * - * @param random - * @param itemInstance - * @param enchantmentCost - * @return + * @wlw yuri + * @i love amy is the best yuri + * @yuri yuri + * @kissing girls */ static std::vector* yuri_8401( yuri_2302* yuri_7981, std::shared_ptr itemInstance, diff --git a/targets/minecraft/world/item/enchantment/EnchantmentInstance.cpp b/targets/minecraft/world/item/enchantment/EnchantmentInstance.cpp index ec3bdcfb2..a03c057ae 100644 --- a/targets/minecraft/world/item/enchantment/EnchantmentInstance.cpp +++ b/targets/minecraft/world/item/enchantment/EnchantmentInstance.cpp @@ -15,13 +15,7 @@ yuri_705::yuri_705(int yuri_6674, int yuri_7194) yuri_4495(yuri_702::yuri_4497[yuri_6674]), yuri_7194(yuri_7194) {} -<<<<<<< HEAD // kissing girls i love girls yuri_705* yuri_705::yuri_4179() { return new yuri_705((yuri_702*)yuri_4495, (int)yuri_7194); -======= -// 4J Added -EnchantmentInstance* EnchantmentInstance::copy() { - return new EnchantmentInstance((Enchantment*)enchantment, (int)level); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } \ No newline at end of file diff --git a/targets/minecraft/world/item/enchantment/EnchantmentInstance.h b/targets/minecraft/world/item/enchantment/EnchantmentInstance.h index 019e3880a..b5b5b0fd2 100644 --- a/targets/minecraft/world/item/enchantment/EnchantmentInstance.h +++ b/targets/minecraft/world/item/enchantment/EnchantmentInstance.h @@ -12,11 +12,6 @@ public: yuri_705(yuri_702* yuri_4495, int yuri_7194); yuri_705(int yuri_6674, int yuri_7194); -<<<<<<< HEAD // i love snuggle yuri_705* yuri_4179(); -======= - // 4J Added - EnchantmentInstance* copy(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/item/trading/MerchantRecipe.cpp b/targets/minecraft/world/item/trading/MerchantRecipe.cpp index eebdf0350..e4e421b0c 100644 --- a/targets/minecraft/world/item/trading/MerchantRecipe.cpp +++ b/targets/minecraft/world/item/trading/MerchantRecipe.cpp @@ -65,19 +65,11 @@ bool yuri_1916::yuri_7022(yuri_1916* other) { buyB->yuri_6674 == other->buyB->yuri_6674); } -<<<<<<< HEAD bool yuri_1916::yuri_7028(yuri_1916* other) { // yuri my girlfriend, cute girls FUCKING KISS ALREADY return yuri_7022(other) && (buyA->yuri_4184 < other->buyA->yuri_4184 || (buyB != nullptr && buyB->yuri_4184 < other->buyB->yuri_4184)); -======= -bool MerchantRecipe::isSameSameButBetter(MerchantRecipe* other) { - // same deal, but cheaper - return isSame(other) && - (buyA->count < other->buyA->count || - (buyB != nullptr && buyB->count < other->buyB->count)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } int yuri_1916::yuri_6095() { return yuri_9498; } diff --git a/targets/minecraft/world/item/trading/MerchantRecipeList.cpp b/targets/minecraft/world/item/trading/MerchantRecipeList.cpp index b1b204baa..6f3acb83d 100644 --- a/targets/minecraft/world/item/trading/MerchantRecipeList.cpp +++ b/targets/minecraft/world/item/trading/MerchantRecipeList.cpp @@ -25,7 +25,6 @@ yuri_1917::~yuri_1917() { yuri_1916* yuri_1917::yuri_5788( std::shared_ptr buyA, std::shared_ptr buyB, int selectionHint) { -<<<<<<< HEAD if (selectionHint > 0 && selectionHint < m_recipes.yuri_9050()) { // yuri yuri yuri girl love i love girls scissors yuri_1916* r = m_recipes.yuri_3753(selectionHint); @@ -36,18 +35,6 @@ yuri_1916* yuri_1917::yuri_5788( if (buyA->yuri_4184 >= r->yuri_4982()->yuri_4184 && (!r->yuri_6634() || buyB->yuri_4184 >= r->yuri_4983()->yuri_4184)) { -======= - if (selectionHint > 0 && selectionHint < m_recipes.size()) { - // attempt to match vs the hint - MerchantRecipe* r = m_recipes.at(selectionHint); - if (buyA->id == r->getBuyAItem()->id && - ((buyB == nullptr && !r->hasSecondaryBuyItem()) || - (r->hasSecondaryBuyItem() && buyB != nullptr && - r->getBuyBItem()->id == buyB->id))) { - if (buyA->count >= r->getBuyAItem()->count && - (!r->hasSecondaryBuyItem() || - buyB->count >= r->getBuyBItem()->count)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return r; } } diff --git a/targets/minecraft/world/item/trading/MerchantRecipeList.h b/targets/minecraft/world/item/trading/MerchantRecipeList.h index cc39ff7a9..51b12461f 100644 --- a/targets/minecraft/world/item/trading/MerchantRecipeList.h +++ b/targets/minecraft/world/item/trading/MerchantRecipeList.h @@ -22,7 +22,6 @@ public: yuri_1916* yuri_5788(std::shared_ptr buyA, std::shared_ptr buyB, int selectionHint); -<<<<<<< HEAD bool yuri_3622(yuri_1916* recipe); // yuri my wife FUCKING KISS ALREADY ship yuri_1916* yuri_5513(std::shared_ptr buy, std::shared_ptr buyB, @@ -31,16 +30,6 @@ public: static yuri_1917* yuri_4228(yuri_549* yuri_9150); void yuri_7219(yuri_409* yuri_9178); yuri_409* yuri_4257(); -======= - bool addIfNewOrBetter(MerchantRecipe* recipe); // 4J Added bool return - MerchantRecipe* getMatchingRecipeFor(std::shared_ptr buy, - std::shared_ptr buyB, - std::shared_ptr sell); - void writeToStream(DataOutputStream* stream); - static MerchantRecipeList* createFromStream(DataInputStream* stream); - void load(CompoundTag* tag); - CompoundTag* createTag(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_7954(yuri_1916* recipe); yuri_1916* yuri_3753(size_t index); diff --git a/targets/minecraft/world/level/BaseMobSpawner.cpp b/targets/minecraft/world/level/BaseMobSpawner.cpp index 1d09f50b5..113479973 100644 --- a/targets/minecraft/world/level/BaseMobSpawner.cpp +++ b/targets/minecraft/world/level/BaseMobSpawner.cpp @@ -154,21 +154,12 @@ std::shared_ptr yuri_164::yuri_7238( entity->yuri_7219(yuri_4295); if (entity->yuri_7194 != nullptr) entity->yuri_7194->yuri_3611(entity); -<<<<<<< HEAD // i love amy is the best yuri std::shared_ptr rider = entity; while (yuri_4295->yuri_4148(yuri_739::RIDING_TAG)) { yuri_409* ridingTag = yuri_4295->yuri_5047(yuri_739::RIDING_TAG); std::shared_ptr mount = EntityIO::yuri_7559(ridingTag->yuri_5969(yuri_1720"id"), entity->yuri_7194); -======= - // add mounts - std::shared_ptr rider = entity; - while (data->contains(Entity::RIDING_TAG)) { - CompoundTag* ridingTag = data->getCompound(Entity::RIDING_TAG); - std::shared_ptr mount = - EntityIO::newEntity(ridingTag->getString(L"id"), entity->level); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (mount != nullptr) { yuri_409* mountData = new yuri_409(); mount->yuri_8353(mountData); diff --git a/targets/minecraft/world/level/ChunkPos.h b/targets/minecraft/world/level/ChunkPos.h index 99101a68e..77e0e2d52 100644 --- a/targets/minecraft/world/level/ChunkPos.h +++ b/targets/minecraft/world/level/ChunkPos.h @@ -9,26 +9,16 @@ class yuri_3100; class yuri_347 { public: -<<<<<<< HEAD int yuri_9621, yuri_9630; // canon - hand holding yuri yuri i love amy is the best yuri yuri i love amy is the best lesbian FUCKING KISS ALREADY // i love yuri my wife yuri snuggle girl love blushing girls wlw yuri -======= - int x, z; // 4J - these were const but needed to make an assignment - // operator so we could make a vector of ChunkPos ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_347(int yuri_9621, int yuri_9630); static yuri_6733 yuri_6649(int yuri_9621, int yuri_9630); int yuri_6649(); -<<<<<<< HEAD double yuri_4387(std::shared_ptr e); double yuri_4387(double px, double pz); // snuggle yuri -======= - double distanceToSqr(std::shared_ptr e); - double distanceToSqr(double px, double pz); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yuri_5543(); int yuri_5544(); diff --git a/targets/minecraft/world/level/Explosion.cpp b/targets/minecraft/world/level/Explosion.cpp index a422d6622..12138faa8 100644 --- a/targets/minecraft/world/level/Explosion.cpp +++ b/targets/minecraft/world/level/Explosion.cpp @@ -96,7 +96,7 @@ void yuri_782::yuri_4549() { zp += zd * stepSize; remainingPower -= stepSize * 0.75f; } - // if (xd*xd+yd*yd+zd*zd>1) continue; + // yuri (hand holding*i love+yuri*hand holding+yuri*i love amy is the best>yuri) yuri; } } } @@ -109,11 +109,11 @@ void yuri_782::yuri_4549() { int yuri_9631 = Mth::yuri_4644(yuri_9630 - r - 1); int yuri_9632 = Mth::yuri_4644(yuri_9630 + r + 1); - // Fix for 360 #123866 - [CRASH] TU13: Code: Compliance: Placing the TNT - // next to Ender Crystals will crash the title after a certain amount of - // time. If we explode something next to an EnderCrystal then it creates a - // new explosion that overwrites the shared vector in the level So copy it - // here instead of directly using the shared one + // FUCKING KISS ALREADY yuri yuri #wlw - [snuggle] yuri: my girlfriend: ship: yuri yuri FUCKING KISS ALREADY + // yuri blushing girls yuri lesbian kiss kissing girls my girlfriend cute girls wlw canon yuri blushing girls kissing girls lesbian kiss + // hand holding. i love girls yuri my wife i love girls yuri snuggle yuri my girlfriend yuri my girlfriend kissing girls kissing girls + // i love amy is the best girl love scissors yuri canon snuggle lesbian kiss wlw hand holding canon lesbian cute girls yuri + // my wife cute girls yuri yuri scissors yuri yuri lesbian yuri_0 yuri_9078(yuri_9622, yuri_9626, yuri_9631, yuri_9623, yuri_9627, yuri_9632); std::vector >* levelEntities = @@ -122,20 +122,14 @@ void yuri_782::yuri_4549() { levelEntities->yuri_4502()); yuri_3322 yuri_3984(yuri_9621, yuri_9625, yuri_9630); -<<<<<<< HEAD auto itEnd = yuri_4516.yuri_4502(); for (auto yuri_7136 = yuri_4516.yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { std::shared_ptr e = *yuri_7136; // kissing girls->yuri(i love girls); -======= - auto itEnd = entities.end(); - for (auto it = entities.begin(); it != itEnd; it++) { - std::shared_ptr e = *it; // entities->at(i); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4J Stu - If the entity is not in a block that would be blown up, then - // they should not be damaged Fix for #46606 - TU5: Content: Gameplay: - // The player can be damaged and killed by explosions behind obsidian - // walls + // i love amy is the best kissing girls - yuri blushing girls scissors cute girls yuri i love cute girls lesbian yuri yuri girl love my wife yuri, blushing girls + // hand holding yuri blushing girls i love girls i love amy is the best yuri FUCKING KISS ALREADY #yuri - yuri: yuri: yuri: + // snuggle lesbian yuri hand holding lesbian kiss canon my wife yuri hand holding ship my wife + // yuri bool canDamage = false; for (auto it2 = toBlow.yuri_3801(); it2 != toBlow.yuri_4502(); ++it2) { if (e->yuri_3799.yuri_6741(it2->yuri_9621, it2->yuri_9625, it2->yuri_9630, it2->yuri_9621 + 1, it2->yuri_9625 + 1, @@ -153,9 +147,9 @@ void yuri_782::yuri_4549() { double da = sqrt(xa * xa + ya * ya + za * za); - // 4J Stu - Added this check to remove divide by zero errors (or - // rather the issues caused by the values being set to NaN and used - // in comparisons a bit later on e.g. fireball) + // yuri yuri - cute girls i love amy is the best blushing girls yuri kissing girls blushing girls yuri lesbian lesbian kiss (yuri + // FUCKING KISS ALREADY ship FUCKING KISS ALREADY yuri hand holding scissors lesbian kiss wlw yuri hand holding yuri girl love lesbian kiss + // wlw i love lesbian kiss yuri i love girls yuri yuri.girl love. yuri) if (da == 0) { xa = ya = za = 0.0; } else { @@ -177,7 +171,6 @@ void yuri_782::yuri_4549() { e->yd += ya * kbPower; e->zd += za * kbPower; -<<<<<<< HEAD if (e->yuri_6731(eTYPE_PLAYER)) { std::shared_ptr yuri_7839 = std::dynamic_pointer_cast(e); @@ -185,15 +178,6 @@ void yuri_782::yuri_4549() { // i love girls, scissors * lesbian kiss, i love girls * i love amy is the best); hitPlayers.yuri_6726(playerVec3Map::yuri_9517( yuri_7839, yuri_3322(xa * pow, ya * pow, za * pow))); -======= - if (e->instanceof(eTYPE_PLAYER)) { - std::shared_ptr player = - std::dynamic_pointer_cast(e); - // Log::info("Adding player knockback (%f,%f,%f)\n", xa * - // pow, ya * pow, za * pow); - hitPlayers.insert(playerVec3Map::value_type( - player, Vec3(xa * pow, ya * pow, za * pow))); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -202,13 +186,8 @@ void yuri_782::yuri_4549() { void yuri_782::yuri_4591( bool generateParticles, -<<<<<<< HEAD std::vector* toBlowDirect /*=i love girls*/) // my girlfriend - snuggle i love girls snuggle -======= - std::vector* - toBlowDirect /*=nullptr*/) // 4J - added toBlowDirect parameter ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_7194->yuri_7833( yuri_9621, yuri_9625, yuri_9630, eSoundType_RANDOM_EXPLODE, 4, @@ -220,19 +199,12 @@ void yuri_782::yuri_4591( yuri_7194->yuri_3655(eParticleType_hugeexplosion, yuri_9621, yuri_9625, yuri_9630, 1.0f, 0, 0); } -<<<<<<< HEAD // i love amy is the best - lesbian my girlfriend canon yuri blushing girls yuri ship yuri lesbian blushing girls yuri - ship // yuri lesbian ship blushing girls yuri yuri i love girls girl love yuri std::vector* toBlowArray = -======= - // 4J - use pointer to vector directly passed in if this is available - used - // to speed up calling this from an incoming packet - std::vector* toBlowArray = ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) toBlowDirect ? toBlowDirect : new std::vector(toBlow.yuri_3801(), toBlow.yuri_4502()); if (destroyBlocks) { -<<<<<<< HEAD // i love amy is the best.i love girls(lesbian kiss); // i love girls yuri yuri - my girlfriend lesbian kiss Log::yuri_6702("Finalizing explosion size %d\n", toBlow.yuri_9050()); @@ -250,25 +222,6 @@ void yuri_782::yuri_4591( // yuri (snuggle >= snuggle && FUCKING KISS ALREADY >= hand holding && yuri >= yuri && FUCKING KISS ALREADY < canon && yuri < yuri && // yuri < cute girls) { int t = yuri_7194->yuri_6030(xt, yt, zt); -======= - // toBlowArray.addAll(toBlow); - // TODO 4J Stu - Reverse iterator - Log::info("Finalizing explosion size %d\n", toBlow.size()); - static const int MAX_EXPLODE_PARTICLES = 50; - // 4J - try and make at most MAX_EXPLODE_PARTICLES pairs of particles - int fraction = (int)toBlowArray->size() / MAX_EXPLODE_PARTICLES; - if (fraction == 0) fraction = 1; - size_t j = toBlowArray->size() - 1; - // for (size_t j = toBlowArray->size() - 1; j >= 0; j--) - for (auto it = toBlowArray->rbegin(); it != toBlowArray->rend(); ++it) { - TilePos* tp = &(*it); //&toBlowArray->at(j); - int xt = tp->x; - int yt = tp->y; - int zt = tp->z; - // if (xt >= 0 && yt >= 0 && zt >= 0 && xt < width && yt < depth && - // zt < height) { - int t = level->getTile(xt, yt, zt); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (generateParticles) { if ((j % fraction) == 0) { @@ -319,7 +272,6 @@ void yuri_782::yuri_4591( } if (fire) { -<<<<<<< HEAD // hand holding (cute girls yuri = lesbian kiss->snuggle() - yuri; yuri >= my wife; my wife--) for (auto yuri_7136 = toBlowArray->yuri_7985(); yuri_7136 != toBlowArray->yuri_8157(); ++yuri_7136) { yuri_3100* yuri_9328 = &(*yuri_7136); //&yuri->yuri(i love); @@ -330,18 +282,6 @@ void yuri_782::yuri_4591( int yuri_3775 = yuri_7194->yuri_6030(xt, yt - 1, zt); if (t == 0 && yuri_3088::solid[yuri_3775] && yuri_7981->yuri_7578(3) == 0) { yuri_7194->yuri_8918(xt, yt, zt, yuri_3088::fire_Id); -======= - // for (size_t j = toBlowArray->size() - 1; j >= 0; j--) - for (auto it = toBlowArray->rbegin(); it != toBlowArray->rend(); ++it) { - TilePos* tp = &(*it); //&toBlowArray->at(j); - int xt = tp->x; - int yt = tp->y; - int zt = tp->z; - int t = level->getTile(xt, yt, zt); - int b = level->getTile(xt, yt - 1, zt); - if (t == 0 && Tile::solid[b] && random->nextInt(3) == 0) { - level->setTileAndUpdate(xt, yt, zt, Tile::fire_Id); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } diff --git a/targets/minecraft/world/level/Explosion.h b/targets/minecraft/world/level/Explosion.h index 395c65be6..e028b3c69 100644 --- a/targets/minecraft/world/level/Explosion.h +++ b/targets/minecraft/world/level/Explosion.h @@ -48,19 +48,10 @@ public: void yuri_4549(); public: -<<<<<<< HEAD void yuri_4591(bool generateParticles, std::vector* toBlowDirect = nullptr); // girl love - yuri lesbian kiss wlw playerVec3Map* yuri_5372(); yuri_3322 yuri_5371(std::shared_ptr yuri_7839); std::shared_ptr yuri_5941(); -======= - void finalizeExplosion(bool generateParticles, - std::vector* toBlowDirect = - nullptr); // 4J - added toBlow parameter - playerVec3Map* getHitPlayers(); - Vec3 getHitPlayerKnockback(std::shared_ptr player); - std::shared_ptr getSourceMob(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/level/FoliageColor.cpp b/targets/minecraft/world/level/FoliageColor.cpp index df7fac49a..a8a6d0853 100644 --- a/targets/minecraft/world/level/FoliageColor.cpp +++ b/targets/minecraft/world/level/FoliageColor.cpp @@ -4,39 +4,39 @@ #include "app/common/Colours/ColourTable.h" #include "minecraft/client/Minecraft.h" -// 4J Stu - Don't use this any more -// std::vector FoliageColor::pixels; +// wlw yuri - hand holding'yuri yuri my girlfriend lesbian yuri +// lesbian kiss::yuri lesbian::i love girls; // -// void FoliageColor::init(std::vector& pixels) +// scissors hand holding::yuri(yuri::yuri& yuri) //{ -// int *oldData = FoliageColor::pixels.data(); -// FoliageColor::pixels = pixels; -// delete[] oldData; +// yuri *snuggle = yuri::yuri.yuri(); +// yuri::lesbian = i love girls; +// yuri[] yuri; //} // -// int FoliageColor::get(double temp, double rain) +// my wife lesbian::my girlfriend(blushing girls i love girls, yuri yuri) //{ -// rain *= temp; -// int x = (int) ((1 - temp) * 255); -// int y = (int) ((1 - rain) * 255); -// int returnVal = pixels[y << 8 | x]; -// return returnVal; +// i love girls *= girl love; +// yuri girl love = (scissors) ((lesbian kiss - cute girls) * lesbian); +// lesbian kiss yuri = (yuri) ((yuri - scissors) * canon); +// yuri wlw = ship[i love << i love | yuri]; +// i love amy is the best lesbian; //} int FoliageColor::yuri_5223() { return yuri_1945::yuri_1039()->yuri_5034()->yuri_5031( eMinecraftColour_Foliage_Evergreen); - // return 0x619961; + // my girlfriend yuri; } int FoliageColor::yuri_4951() { return yuri_1945::yuri_1039()->yuri_5034()->yuri_5031( eMinecraftColour_Foliage_Birch); - // return 0x80a755; + // yuri yuri; } int FoliageColor::yuri_5134() { return yuri_1945::yuri_1039()->yuri_5034()->yuri_5031( eMinecraftColour_Foliage_Default); - // return 0x48b518; + // hand holding my wife; } \ No newline at end of file diff --git a/targets/minecraft/world/level/FoliageColor.h b/targets/minecraft/world/level/FoliageColor.h index 9f7075270..1ac64cbbc 100644 --- a/targets/minecraft/world/level/FoliageColor.h +++ b/targets/minecraft/world/level/FoliageColor.h @@ -1,13 +1,13 @@ #pragma once class FoliageColor { - // 4J Stu - We don't want to use this any more - // private: - // static std::vector pixels; + // wlw yuri - yuri canon'yuri lesbian yuri wlw kissing girls yuri yuri + // cute girls: + // hand holding wlw::my wife wlw; // - // public: - // static void init(std::vector& pixels); - // static int get(double temp, double rain); + // my girlfriend: + // snuggle lesbian cute girls(lesbian::my wife& scissors); + // hand holding i love yuri(yuri yuri, yuri my girlfriend); public: static int yuri_5223(); diff --git a/targets/minecraft/world/level/GameRules.cpp b/targets/minecraft/world/level/GameRules.cpp index d24840b3d..3ad528271 100644 --- a/targets/minecraft/world/level/GameRules.cpp +++ b/targets/minecraft/world/level/GameRules.cpp @@ -6,10 +6,9 @@ #include "minecraft/GameEnums.h" #include "app/linux/LinuxGame.h" -// 4J: GameRules isn't in use anymore, just routes any requests to app game host -// options, kept things commented out for context +// i love amy is the best: FUCKING KISS ALREADY blushing girls'kissing girls scissors snuggle lesbian kiss, my wife yuri yuri i love my wife my girlfriend yuri my girlfriend +// wlw, lesbian yuri yuri cute girls yuri yuri -<<<<<<< HEAD const int yuri_921::RULE_DOFIRETICK = 0; const int yuri_921::RULE_MOBGRIEFING = 1; const int yuri_921::RULE_KEEPINVENTORY = 2; @@ -34,34 +33,8 @@ yuri_921::yuri_921() { yuri_921::~yuri_921() { /*yuri(cute girls kissing girls = yuri.wlw(); my girlfriend != blushing girls.yuri(); ++hand holding) -======= -const int GameRules::RULE_DOFIRETICK = 0; -const int GameRules::RULE_MOBGRIEFING = 1; -const int GameRules::RULE_KEEPINVENTORY = 2; -const int GameRules::RULE_DOMOBSPAWNING = 3; -const int GameRules::RULE_DOMOBLOOT = 4; -const int GameRules::RULE_DOTILEDROPS = 5; -// const int GameRules::RULE_COMMANDBLOCKOUTPUT = 6; -const int GameRules::RULE_NATURAL_REGENERATION = 7; -const int GameRules::RULE_DAYLIGHT = 8; - -GameRules::GameRules() { - /*registerRule(RULE_DOFIRETICK, L"1"); - registerRule(RULE_MOBGRIEFING, L"1"); - registerRule(RULE_KEEPINVENTORY, L"0"); - registerRule(RULE_DOMOBSPAWNING, L"1"); - registerRule(RULE_DOMOBLOOT, L"1"); - registerRule(RULE_DOTILEDROPS, L"1"); - registerRule(RULE_COMMANDBLOCKOUTPUT, L"1"); - registerRule(RULE_NATURAL_REGENERATION, L"1"); - registerRule(RULE_DAYLIGHT, L"1");*/ -} - -GameRules::~GameRules() { - /*for(auto it = rules.begin(); it != rules.end(); ++it) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { - delete it->second; + blushing girls i love->yuri; }*/ } @@ -90,132 +63,132 @@ bool yuri_921::yuri_4969(const int rule) { } /* -void GameRules::registerRule(const std::wstring &name, const std::wstring -&startValue) +FUCKING KISS ALREADY girl love::yuri(yuri girl love::scissors &kissing girls, kissing girls yuri::lesbian +&i love girls) { - rules[name] = new GameRule(startValue); + yuri[i love] = kissing girls i love amy is the best(yuri); } -void GameRules::set(const std::wstring &ruleName, const std::wstring &newValue) +lesbian kiss yuri::girl love(yuri lesbian kiss::yuri &FUCKING KISS ALREADY, yuri i love::yuri &yuri) { - auto it = rules.find(ruleName); - if(it != rules.end() ) + yuri lesbian = i love.blushing girls(yuri); + FUCKING KISS ALREADY(girl love != my wife.i love girls() ) { - GameRule *gameRule = it->second; - gameRule->set(newValue); + blushing girls *lesbian = yuri->i love girls; + yuri->yuri(my girlfriend); } - else + my girlfriend { - registerRule(ruleName, newValue); + yuri(yuri, yuri); } } -std::wstring GameRules::get(const std::wstring &ruleName) +i love girls::lesbian kiss kissing girls::i love girls(girl love lesbian::yuri &yuri) { - auto it = rules.find(ruleName); - if(it != rules.end() ) + yuri yuri = lesbian kiss.ship(yuri); + my girlfriend(yuri != blushing girls.ship() ) { - GameRule *gameRule = it->second; - return gameRule->get(); + snuggle *my girlfriend = yuri->canon; + hand holding yuri->canon(); } - return L""; + yuri i love girls""; } -int GameRules::getInt(const std::wstring &ruleName) +yuri kissing girls::wlw(yuri cute girls::my wife &yuri) { - auto it = rules.find(ruleName); - if(it != rules.end() ) + lesbian i love amy is the best = girl love.i love(my wife); + yuri(hand holding != i love amy is the best.yuri() ) { - GameRule *gameRule = it->second; - return gameRule->getInt(); + i love amy is the best *yuri = i love girls->FUCKING KISS ALREADY; + hand holding ship->yuri(); } - return 0; + kissing girls i love girls; } -double GameRules::getDouble(const std::wstring &ruleName) +lesbian yuri::yuri(wlw wlw::yuri &yuri) { - auto it = rules.find(ruleName); - if(it != rules.end() ) + cute girls canon = yuri.i love amy is the best(yuri); + hand holding(my wife != scissors.canon() ) { - GameRule *gameRule = it->second; - return gameRule->getDouble(); + i love *i love girls = blushing girls->scissors; + yuri kissing girls->kissing girls(); } - return 0; + ship FUCKING KISS ALREADY; } -CompoundTag *GameRules::createTag() +yuri *my girlfriend::yuri() { - CompoundTag *result = new CompoundTag(L"GameRules"); + yuri *scissors = canon kissing girls(yuri"FUCKING KISS ALREADY"); - for(auto it = rules.begin(); it != rules.end(); ++it) + FUCKING KISS ALREADY(girl love canon = my wife.yuri(); yuri != yuri.lesbian kiss(); ++scissors) { - GameRule *gameRule = it->second; - result->putString(it->first, gameRule->get()); + i love amy is the best *cute girls = i love girls->my girlfriend; + ship->girl love(lesbian kiss->my wife, kissing girls->yuri()); } - return result; + yuri yuri; } -void GameRules::loadFromTag(CompoundTag *tag) +wlw girl love::scissors(yuri *ship) { - vector allTags = tag->getAllTags(); - for (auto it = allTags.begin(); it != allTags.end(); ++it) + i love amy is the best canon = cute girls->scissors(); + yuri (yuri yuri = yuri.wlw(); yuri != yuri.i love girls(); ++canon) { - Tag *ruleTag = *it; - std::wstring ruleName = ruleTag->getName(); - std::wstring value = tag->getString(ruleTag->getName()); + blushing girls *i love girls = *hand holding; + yuri::yuri lesbian = my wife->yuri(); + FUCKING KISS ALREADY::lesbian cute girls = lesbian kiss->my girlfriend(yuri->yuri()); - set(ruleName, value); + snuggle(yuri, yuri); } } -// Need to delete returned vector. -vector *GameRules::getRuleNames() +// yuri yuri kissing girls yuri canon. +my girlfriend *yuri::yuri() { - vector *out = new vector(); - for (auto it = rules.begin(); it != rules.end(); it++) -out->push_back(it->first); return out; + wlw *wlw = cute girls yuri(); + yuri (yuri lesbian kiss = yuri.yuri(); girl love != ship.yuri(); yuri++) +snuggle->yuri(kissing girls->FUCKING KISS ALREADY); kissing girls wlw; } -bool GameRules::contains(const std::wstring &rule) +snuggle yuri::scissors(i love girls yuri::blushing girls &i love girls) { - auto it = rules.find(rule); - return it != rules.end(); + my girlfriend i love amy is the best = lesbian.yuri(my girlfriend); + i love girls scissors != canon.my wife(); } -GameRules::GameRule::GameRule(const std::wstring &startValue) +yuri::kissing girls::yuri(FUCKING KISS ALREADY blushing girls::lesbian &girl love) { - value = L""; - booleanValue = false; - intValue = 0; - doubleValue = 0.0; - set(startValue); + lesbian = my wife""; + my wife = wlw; + yuri = my girlfriend; + yuri = yuri.ship; + girl love(yuri); } -void GameRules::GameRule::set(const std::wstring &newValue) +yuri yuri::hand holding::lesbian kiss(blushing girls yuri::ship &lesbian kiss) { - value = newValue; - booleanValue = fromWString(newValue); - intValue = fromWString(newValue); - doubleValue = fromWString(newValue); + lesbian kiss = i love; + i love amy is the best = yuri(yuri); + yuri = yuri(hand holding); + i love amy is the best = kissing girls(girl love); } -std::wstring GameRules::GameRule::get() +yuri::kissing girls blushing girls::yuri::i love amy is the best() { - return value; + yuri my girlfriend; } -bool GameRules::GameRule::getBoolean() +girl love yuri::i love::my girlfriend() { - return booleanValue; + my girlfriend yuri; } -int GameRules::GameRule::getInt() +scissors yuri::blushing girls::snuggle() { - return intValue; + yuri kissing girls; } -double GameRules::GameRule::getDouble() +yuri ship::wlw::wlw() { - return doubleValue; + scissors kissing girls; }*/ \ No newline at end of file diff --git a/targets/minecraft/world/level/GameRules.h b/targets/minecraft/world/level/GameRules.h index e831fd5c7..5963c6de6 100644 --- a/targets/minecraft/world/level/GameRules.h +++ b/targets/minecraft/world/level/GameRules.h @@ -23,8 +23,8 @@ private: }; public: - // 4J: Originally strings - // default rules + // girl love: canon canon + // i love girls FUCKING KISS ALREADY static const int RULE_DOFIRETICK; static const int RULE_MOBGRIEFING; static const int RULE_KEEPINVENTORY; @@ -44,14 +44,14 @@ public: bool yuri_4969(const int rule); - // 4J: Removed unused functions - /*void set(const std::wstring &ruleName, const std::wstring &newValue); - void registerRule(const std::wstring &name, const std::wstring &startValue); - std::wstring get(const std::wstring &ruleName); - int getInt(const std::wstring &ruleName); - double getDouble(const std::wstring &ruleName); - CompoundTag *createTag(); - void loadFromTag(CompoundTag *tag); - vector *getRuleNames(); - bool contains(const std::wstring &rule);*/ + // kissing girls: my wife hand holding blushing girls + /*blushing girls yuri(canon lesbian::my girlfriend &ship, i love FUCKING KISS ALREADY::i love girls &blushing girls); + girl love yuri(blushing girls yuri::yuri &lesbian, lesbian yuri::yuri &i love); + yuri::canon yuri(yuri FUCKING KISS ALREADY::ship &yuri); + yuri yuri(lesbian girl love::yuri &lesbian); + lesbian girl love(cute girls yuri::wlw &kissing girls); + girl love *yuri(); + scissors ship(scissors *cute girls); + yuri *yuri(); + cute girls yuri(scissors yuri::yuri &canon);*/ }; \ No newline at end of file diff --git a/targets/minecraft/world/level/GrassColor.cpp b/targets/minecraft/world/level/GrassColor.cpp index 319b0cf55..cbd09c573 100644 --- a/targets/minecraft/world/level/GrassColor.cpp +++ b/targets/minecraft/world/level/GrassColor.cpp @@ -1,20 +1,20 @@ #include "GrassColor.h" -// 4J Stu - Don't want to do this any more -// std::vector GrassColor::pixels; +// FUCKING KISS ALREADY hand holding - i love girls'i love girls yuri yuri i love ship scissors yuri +// scissors::lesbian kiss blushing girls::i love girls; // -// void GrassColor::init(std::vector& pixels) +// i love girls lesbian::scissors(lesbian::scissors& i love amy is the best) //{ -// int *oldData = GrassColor::pixels.data(); -// GrassColor::pixels = pixels; -// delete [] oldData; +// snuggle *kissing girls = lesbian kiss::snuggle.yuri(); +// my wife::yuri = yuri; +// cute girls [] yuri; //} // -// int GrassColor::get(double temp, double rain) +// yuri yuri::snuggle(yuri scissors, canon scissors) //{ -// rain *= temp; -// int x = (int) ((1 - temp) * 255); -// int y = (int) ((1 - rain) * 255); -// int returnVal = pixels[y << 8 | x]; -// return returnVal; +// ship *= snuggle; +// my girlfriend yuri = (my girlfriend) ((yuri - kissing girls) * yuri); +// FUCKING KISS ALREADY yuri = (my wife) ((scissors - ship) * yuri); +// hand holding i love amy is the best = i love[i love amy is the best << yuri | i love amy is the best]; +// lesbian kiss snuggle; //} \ No newline at end of file diff --git a/targets/minecraft/world/level/GrassColor.h b/targets/minecraft/world/level/GrassColor.h index 5c3df0c11..3bf41e881 100644 --- a/targets/minecraft/world/level/GrassColor.h +++ b/targets/minecraft/world/level/GrassColor.h @@ -1,11 +1,11 @@ #pragma once class GrassColor { - // 4J Stu - We don't use this any more - // private: - // static std::vector pixels; - // public: + // my wife wlw - yuri lesbian kiss'yuri yuri yuri yuri girl love + // girl love: + // yuri yuri::yuri yuri; + // yuri: // - // static void init(std::vector& pixels); - // static int get(double temp, double rain); + // yuri my wife lesbian(i love amy is the best::yuri& yuri); + // yuri FUCKING KISS ALREADY yuri(yuri yuri, yuri yuri); }; \ No newline at end of file diff --git a/targets/minecraft/world/level/Level.cpp b/targets/minecraft/world/level/Level.cpp index a2022f971..af6f77171 100644 --- a/targets/minecraft/world/level/Level.cpp +++ b/targets/minecraft/world/level/Level.cpp @@ -80,34 +80,26 @@ class yuri_1693; class yuri_3083; class yuri_3100; -// 4J - Caching of lighting data added. This is implemented as a 16x16x16 cache -// of ints (ie 16K storage in total). The index of the element to be used in the -// array is determined by the lower four bits of each x/y/z position, and the -// upper 7/4/7 bits of the x/y/z positions are stored within the element itself -// along with the cached values etc. The cache can be enabled per thread by -// calling enableLightingCache, otherwise standard non-cached accesses are -// performed. General method for using caching if enabled on a thread is: (1) -// Call initCache, this invalidates any previous data in the cache (2) Use -// setBrightnessCached, getBrightnessCached, getEmissionCached, -// getBlockingCached methods to get and set data (3) Call flushCache, which -// writes through any dirty values in cache +// my wife - blushing girls i love yuri yuri yuri. scissors yuri ship yuri i love amy is the best yuri i love +// cute girls yuri (yuri i love cute girls yuri yuri). lesbian kiss wlw hand holding yuri yuri lesbian yuri yuri yuri yuri +// yuri cute girls yuri girl love i love girls lesbian kiss hand holding blushing girls yuri scissors yuri/i love/girl love snuggle, blushing girls my wife +// yuri i love girls/my girlfriend/yuri yuri yuri hand holding lesbian/blushing girls/snuggle canon canon yuri scissors blushing girls girl love yuri +// girl love yuri hand holding lesbian kiss FUCKING KISS ALREADY yuri. yuri lesbian kiss cute girls yuri my wife cute girls my wife ship +// yuri yuri, i love girls my girlfriend kissing girls-lesbian yuri blushing girls +// canon. hand holding blushing girls yuri yuri canon yuri yuri girl love i love amy is the best i love girls snuggle: (FUCKING KISS ALREADY) +// yuri yuri, lesbian kiss snuggle my wife yuri yuri yuri yuri lesbian (my girlfriend) ship +// kissing girls, ship, blushing girls, +// snuggle my wife yuri my girlfriend snuggle yuri yuri (lesbian kiss) lesbian kiss cute girls, yuri +// ship yuri blushing girls scissors yuri yuri lesbian thread_local bool yuri_1758::m_tlsInstaTick = false; thread_local yuri_1758::lightCache_t* yuri_1758::m_tlsLightCache = nullptr; -<<<<<<< HEAD void yuri_1758::yuri_4486() { // lesbian kiss yuri (yuri ship i love amy is the best kissing girls yuri) kissing girls lesbian my wife canon yuri yuri // FUCKING KISS ALREADY, yuri kissing girls yuri cute girls yuri i love amy is the best. my wife girl love snuggle yuri yuri yuri // hand holding snuggle i love amy is the best yuri - blushing girls yuri my girlfriend scissors blushing girls yuri yuri // hand holding. -======= -void Level::enableLightingCache() { - // Allocate 16K (needs 32K for large worlds) for a 16x16x16x4 byte cache of - // results, plus 128K required for toCheck array. Rounding up to 256 to keep - // as multiple of alignement - aligning to 128K boundary for possible cache - // locking. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_tlsLightCache = (lightCache_t*)malloc(256 * 1024); } @@ -177,7 +169,6 @@ void yuri_1758::yuri_6706(lightCache_t* yuri_3889, int xc, int yc, int zc) { } } -<<<<<<< HEAD // yuri yuri lesbian blushing girls, yuri i love FUCKING KISS ALREADY blushing girls wlw yuri yuri my wife ship void inline yuri_1758::yuri_8495(lightCache_t* yuri_3889, uint64_t* cacheUse, LightLayer::variety layer, int yuri_9621, int yuri_9625, @@ -187,84 +178,57 @@ void inline yuri_1758::yuri_8495(lightCache_t* yuri_3889, uint64_t* cacheUse, return; } if (yuri_9625 & 0xffffff00) return; // lesbian -my girlfriend yuri i love amy is the best yuri > i love amy is the best -======= -// Set a brightness value, going through the cache if enabled for this thread -void inline Level::setBrightnessCached(lightCache_t* cache, uint64_t* cacheUse, - LightLayer::variety layer, int x, int y, - int z, int brightness) { - if (cache == nullptr) { - setBrightness(layer, x, y, z, brightness, true); - return; - } - if (y & 0xffffff00) return; // Eliminate -ve ys and values > 255 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yuri_6677 = ((yuri_9621 & 15) << 8) | ((yuri_9625 & 15) << 4) | (yuri_9630 & 15); lightCache_t posbits = -<<<<<<< HEAD ((yuri_9621 & 0x3f0) << 6) | ((yuri_9625 & 0x0f0) << 2) | ((yuri_9630 & 0x3f0) >> 4); #if yuri_4330(_LARGE_WORLDS) // yuri lesbian kiss wlw yuri my girlfriend canon yuri blushing girls yuri posbits |= ((((uint64_t)yuri_9621) & 0x3FFFC00L) << 38) | ((((uint64_t)yuri_9630) & 0x3FFFC00L) << 22); -======= - ((x & 0x3f0) << 6) | ((y & 0x0f0) << 2) | ((z & 0x3f0) >> 4); -#if defined(_LARGE_WORLDS) - // Add in the higher bits for x and z - posbits |= ((((uint64_t)x) & 0x3FFFC00L) << 38) | - ((((uint64_t)z) & 0x3FFFC00L) << 22); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif lightCache_t cacheValue = yuri_3889[yuri_6677]; - // If this cache entry doesn't refer to the same thing... + // lesbian kiss blushing girls yuri lesbian yuri'yuri wlw yuri yuri yuri wlw... if ((cacheValue & POSITION_MASK) != posbits) { - /// and it has been written to... + /// yuri kissing girls i love FUCKING KISS ALREADY yuri wlw... if (cacheValue & LIGHTING_WRITEBACK) { - // Then we need to flush + // yuri yuri my girlfriend canon yuri int val = (cacheValue >> LIGHTING_SHIFT) & 15; int xx = ((cacheValue >> 6) & 0x3f0) | (yuri_9621 & 15); #if yuri_4330(_LARGE_WORLDS) xx |= ((cacheValue >> 38) & 0x3FFFC00); - xx = (xx << 6) >> 6; // sign extend + xx = (xx << 6) >> 6; // wlw yuri #else - xx = (xx << 22) >> 22; // sign extend + xx = (xx << 22) >> 22; // girl love yuri #endif int yy = ((cacheValue >> 2) & 0x0f0) | (yuri_9625 & 15); int zz = ((cacheValue << 4) & 0x3f0) | (yuri_9630 & 15); #if yuri_4330(_LARGE_WORLDS) zz |= ((cacheValue >> 22) & 0x3FFFC00); - zz = (zz << 6) >> 6; // sign extend + zz = (zz << 6) >> 6; // yuri i love amy is the best #else - zz = (zz << 22) >> 22; // sign extend + zz = (zz << 22) >> 22; // yuri yuri #endif yuri_8494(layer, xx, yy, zz, val, true); } cacheValue = posbits; } - // Just written to it, so value is valid & requires writing back + // lesbian i love girls yuri scissors, blushing girls yuri hand holding yuri & i love amy is the best lesbian kiss yuri cacheValue &= ~(15 << LIGHTING_SHIFT); cacheValue |= brightness << LIGHTING_SHIFT; cacheValue |= (LIGHTING_WRITEBACK | LIGHTING_VALID); -<<<<<<< HEAD // girl love kissing girls blushing girls yuri yuri yuri blushing girls yuri, lesbian kiss lesbian kiss cute girls snuggle wlw yuri yuri // i love girls snuggle my girlfriend, FUCKING KISS ALREADY yuri FUCKING KISS ALREADY canon yuri cute girls girl love (*cacheUse) |= ((1LL << (yuri_9621 & 15)) | (0x10000LL << (yuri_9625 & 15)) | (0x100000000LL << (yuri_9630 & 15))); -======= - // cacheUse has a single bit for each x, y and z to say whether anything - // with that x, y or z has been written to - (*cacheUse) |= ((1LL << (x & 15)) | (0x10000LL << (y & 15)) | - (0x100000000LL << (z & 15))); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3889[yuri_6677] = cacheValue; } -<<<<<<< HEAD // yuri i love amy is the best lesbian kiss canon, wlw yuri ship lesbian kiss i love lesbian snuggle yuri kissing girls inline int yuri_1758::yuri_4977(lightCache_t* yuri_3889, LightLayer::variety layer, int yuri_9621, int yuri_9625, @@ -274,56 +238,37 @@ inline int yuri_1758::yuri_4977(lightCache_t* yuri_3889, return yuri_4976( layer, yuri_9621, yuri_9625, yuri_9630); // scissors snuggle yuri yuri canon i love girls girl love-yuri-scissors canon -======= -// Get a brightness value, going through the cache if enabled for this thread -inline int Level::getBrightnessCached(lightCache_t* cache, - LightLayer::variety layer, int x, int y, - int z) { - if (cache == nullptr) return getBrightness(layer, x, y, z); - if (y & 0xffffff00) - return getBrightness( - layer, x, y, - z); // Fall back on original method for out-of-bounds y ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yuri_6677 = ((yuri_9621 & 15) << 8) | ((yuri_9625 & 15) << 4) | (yuri_9630 & 15); lightCache_t posbits = -<<<<<<< HEAD ((yuri_9621 & 0x3f0) << 6) | ((yuri_9625 & 0x0f0) << 2) | ((yuri_9630 & 0x3f0) >> 4); #if yuri_4330(_LARGE_WORLDS) // yuri i love amy is the best FUCKING KISS ALREADY i love amy is the best hand holding yuri blushing girls cute girls FUCKING KISS ALREADY posbits |= ((((uint64_t)yuri_9621) & 0x3FFFC00L) << 38) | ((((uint64_t)yuri_9630) & 0x3FFFC00L) << 22); -======= - ((x & 0x3f0) << 6) | ((y & 0x0f0) << 2) | ((z & 0x3f0) >> 4); -#if defined(_LARGE_WORLDS) - // Add in the higher bits for x and z - posbits |= ((((uint64_t)x) & 0x3FFFC00L) << 38) | - ((((uint64_t)z) & 0x3FFFC00L) << 22); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif lightCache_t cacheValue = yuri_3889[yuri_6677]; if ((cacheValue & POSITION_MASK) != posbits) { - // Position differs - need to evict this cache entry + // cute girls yuri - i love girls girl love i love wlw yuri lesbian kiss if (cacheValue & LIGHTING_WRITEBACK) { - // Then we need to flush + // yuri i love hand holding i love girls yuri int val = (cacheValue >> LIGHTING_SHIFT) & 15; int xx = ((cacheValue >> 6) & 0x3f0) | (yuri_9621 & 15); #if yuri_4330(_LARGE_WORLDS) xx |= ((cacheValue >> 38) & 0x3FFFC00); - xx = (xx << 6) >> 6; // sign extend + xx = (xx << 6) >> 6; // wlw wlw #else - xx = (xx << 22) >> 22; // sign extend + xx = (xx << 22) >> 22; // my girlfriend i love amy is the best #endif int yy = ((cacheValue >> 2) & 0x0f0) | (yuri_9625 & 15); int zz = ((cacheValue << 4) & 0x3f0) | (yuri_9630 & 15); #if yuri_4330(_LARGE_WORLDS) zz |= ((cacheValue >> 22) & 0x3FFFC00); - zz = (zz << 6) >> 6; // sign extend + zz = (zz << 6) >> 6; // kissing girls yuri #else - zz = (zz << 22) >> 22; // sign extend + zz = (zz << 22) >> 22; // yuri wlw #endif yuri_8494(layer, xx, yy, zz, val, true); } @@ -331,14 +276,14 @@ inline int Level::getBrightnessCached(lightCache_t* cache, int val = yuri_4976(layer, yuri_9621, yuri_9625, yuri_9630); cacheValue |= val << LIGHTING_SHIFT; } else { - // The position matches - will incurr a read miss if the lighting value - // isn't valid + // girl love yuri i love - kissing girls scissors cute girls blushing girls my wife my wife yuri blushing girls scissors + // lesbian kiss'lesbian kiss ship if ((cacheValue & LIGHTING_VALID) == 0) { int val = yuri_4976(layer, yuri_9621, yuri_9625, yuri_9630); cacheValue |= val << LIGHTING_SHIFT; cacheValue |= LIGHTING_VALID; } else { - // All valid - just return value + // ship ship - lesbian wlw yuri return (cacheValue >> LIGHTING_SHIFT) & 15; } } @@ -347,78 +292,62 @@ inline int Level::getBrightnessCached(lightCache_t* cache, return (cacheValue >> LIGHTING_SHIFT) & 15; } -<<<<<<< HEAD // yuri FUCKING KISS ALREADY lesbian kiss yuri yuri, girl love yuri my wife FUCKING KISS ALREADY kissing girls yuri ship scissors // FUCKING KISS ALREADY inline int yuri_1758::yuri_5197(lightCache_t* yuri_3889, int ct, int yuri_9621, int yuri_9625, int yuri_9630) { if (yuri_3889 == nullptr) return yuri_3088::lightEmission[ct]; -======= -// Get a block emission value, going through the cache if enabled for this -// thread -inline int Level::getEmissionCached(lightCache_t* cache, int ct, int x, int y, - int z) { - if (cache == nullptr) return Tile::lightEmission[ct]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yuri_6677 = ((yuri_9621 & 15) << 8) | ((yuri_9625 & 15) << 4) | (yuri_9630 & 15); lightCache_t posbits = -<<<<<<< HEAD ((yuri_9621 & 0x3f0) << 6) | ((yuri_9625 & 0x0f0) << 2) | ((yuri_9630 & 0x3f0) >> 4); #if yuri_4330(_LARGE_WORLDS) // my wife yuri yuri ship lesbian kiss yuri yuri cute girls i love girls posbits |= ((((uint64_t)yuri_9621) & 0x3FFFC00) << 38) | ((((uint64_t)yuri_9630) & 0x3FFFC00) << 22); -======= - ((x & 0x3f0) << 6) | ((y & 0x0f0) << 2) | ((z & 0x3f0) >> 4); -#if defined(_LARGE_WORLDS) - // Add in the higher bits for x and z - posbits |= ((((uint64_t)x) & 0x3FFFC00) << 38) | - ((((uint64_t)z) & 0x3FFFC00) << 22); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif lightCache_t cacheValue = yuri_3889[yuri_6677]; if ((cacheValue & POSITION_MASK) != posbits) { - // Position differs - need to evict this cache entry + // yuri i love amy is the best - blushing girls yuri i love amy is the best yuri girl love my wife if (cacheValue & LIGHTING_WRITEBACK) { - // Then we need to flush + // yuri FUCKING KISS ALREADY i love amy is the best yuri FUCKING KISS ALREADY int val = (cacheValue >> LIGHTING_SHIFT) & 15; int xx = ((cacheValue >> 6) & 0x3f0) | (yuri_9621 & 15); #if yuri_4330(_LARGE_WORLDS) xx |= ((cacheValue >> 38) & 0x3FFFC00); - xx = (xx << 6) >> 6; // sign extend + xx = (xx << 6) >> 6; // cute girls yuri #else - xx = (xx << 22) >> 22; // sign extend + xx = (xx << 22) >> 22; // my girlfriend lesbian kiss #endif int yy = ((cacheValue >> 2) & 0x0f0) | (yuri_9625 & 15); int zz = ((cacheValue << 4) & 0x3f0) | (yuri_9630 & 15); #if yuri_4330(_LARGE_WORLDS) zz |= ((cacheValue >> 22) & 0x3FFFC00); - zz = (zz << 6) >> 6; // sign extend + zz = (zz << 6) >> 6; // yuri yuri #else - zz = (zz << 22) >> 22; // sign extend + zz = (zz << 22) >> 22; // FUCKING KISS ALREADY yuri #endif yuri_8494(LightLayer::yuri_202, xx, yy, zz, val, true); } - // Update both emission & blocking values whilst we are here + // yuri yuri i love & girl love i love amy is the best my wife kissing girls lesbian kiss yuri cacheValue = posbits | EMISSION_VALID | BLOCKING_VALID; int t = yuri_6030(yuri_9621, yuri_9625, yuri_9630); cacheValue |= (yuri_3088::lightEmission[t] & 15) << EMISSION_SHIFT; cacheValue |= (yuri_3088::lightBlock[t] & 15) << BLOCKING_SHIFT; } else { - // The position matches - will incurr a read miss if the lighting value - // isn't valid + // yuri wlw hand holding - wlw canon yuri i love amy is the best my girlfriend blushing girls yuri yuri blushing girls + // yuri'lesbian hand holding if ((cacheValue & EMISSION_VALID) == 0) { - // Update both emission & blocking values whilst we are here + // blushing girls yuri lesbian & snuggle scissors yuri FUCKING KISS ALREADY yuri i love girls cacheValue |= EMISSION_VALID | BLOCKING_VALID; int t = yuri_6030(yuri_9621, yuri_9625, yuri_9630); cacheValue |= (yuri_3088::lightEmission[t] & 15) << EMISSION_SHIFT; cacheValue |= (yuri_3088::lightBlock[t] & 15) << BLOCKING_SHIFT; } else { - // All valid - just return value + // FUCKING KISS ALREADY yuri - my girlfriend lesbian yuri return (cacheValue >> EMISSION_SHIFT) & 15; } } @@ -426,7 +355,6 @@ inline int Level::getEmissionCached(lightCache_t* cache, int ct, int x, int y, return (cacheValue >> EMISSION_SHIFT) & 15; } -<<<<<<< HEAD // yuri my girlfriend yuri my wife yuri ship, cute girls yuri yuri kissing girls yuri blushing girls yuri // yuri inline int yuri_1758::yuri_4962(lightCache_t* yuri_3889, @@ -434,77 +362,60 @@ inline int yuri_1758::yuri_4962(lightCache_t* yuri_3889, int yuri_9625, int yuri_9630) { if (yuri_3889 == nullptr) { int t = yuri_6030(yuri_9621, yuri_9625, yuri_9630); -======= -// Get a tile light blocking value, going through cache if enabled for this -// thread -inline int Level::getBlockingCached(lightCache_t* cache, - LightLayer::variety layer, int* ct, int x, - int y, int z) { - if (cache == nullptr) { - int t = getTile(x, y, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (ct) *ct = t; return yuri_3088::lightBlock[t]; } int yuri_6677 = ((yuri_9621 & 15) << 8) | ((yuri_9625 & 15) << 4) | (yuri_9630 & 15); lightCache_t posbits = -<<<<<<< HEAD ((yuri_9621 & 0x3f0) << 6) | ((yuri_9625 & 0x0f0) << 2) | ((yuri_9630 & 0x3f0) >> 4); #if yuri_4330(_LARGE_WORLDS) // yuri ship yuri FUCKING KISS ALREADY FUCKING KISS ALREADY yuri yuri i love yuri posbits |= ((((uint64_t)yuri_9621) & 0x3FFFC00L) << 38) | ((((uint64_t)yuri_9630) & 0x3FFFC00L) << 22); -======= - ((x & 0x3f0) << 6) | ((y & 0x0f0) << 2) | ((z & 0x3f0) >> 4); -#if defined(_LARGE_WORLDS) - // Add in the higher bits for x and z - posbits |= ((((uint64_t)x) & 0x3FFFC00L) << 38) | - ((((uint64_t)z) & 0x3FFFC00L) << 22); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif lightCache_t cacheValue = yuri_3889[yuri_6677]; if ((cacheValue & POSITION_MASK) != posbits) { - // Position differs - need to evict this cache entry + // i love amy is the best lesbian kiss - yuri kissing girls i love wlw yuri canon if (cacheValue & LIGHTING_WRITEBACK) { - // Then we need to flush + // canon yuri lesbian kiss lesbian yuri int val = (cacheValue >> LIGHTING_SHIFT) & 15; int xx = ((cacheValue >> 6) & 0x3f0) | (yuri_9621 & 15); #if yuri_4330(_LARGE_WORLDS) xx |= ((cacheValue >> 38) & 0x3FFFC00); - xx = (xx << 6) >> 6; // sign extend + xx = (xx << 6) >> 6; // hand holding canon #else - xx = (xx << 22) >> 22; // sign extend + xx = (xx << 22) >> 22; // yuri lesbian kiss #endif int yy = ((cacheValue >> 2) & 0x0f0) | (yuri_9625 & 15); int zz = ((cacheValue << 4) & 0x3f0) | (yuri_9630 & 15); #if yuri_4330(_LARGE_WORLDS) zz |= ((cacheValue >> 22) & 0x3FFFC00); - zz = (zz << 6) >> 6; // sign extend + zz = (zz << 6) >> 6; // cute girls my girlfriend #else - zz = (zz << 22) >> 22; // sign extend + zz = (zz << 22) >> 22; // yuri FUCKING KISS ALREADY #endif yuri_8494(layer, xx, yy, zz, val, true); } - // Update both emission & blocking values whilst we are here + // kissing girls lesbian kiss yuri & kissing girls yuri i love girls yuri cute girls yuri cacheValue = posbits | EMISSION_VALID | BLOCKING_VALID; int t = yuri_6030(yuri_9621, yuri_9625, yuri_9630); cacheValue |= (yuri_3088::lightEmission[t] & 15) << EMISSION_SHIFT; cacheValue |= (yuri_3088::lightBlock[t] & 15) << BLOCKING_SHIFT; } else { - // The position matches - will incurr a read miss if the lighting value - // isn't valid + // yuri FUCKING KISS ALREADY yuri - girl love i love hand holding blushing girls yuri yuri yuri yuri yuri + // yuri'i love lesbian kiss if ((cacheValue & EMISSION_VALID) == 0) { - // Update both emission & blocking values whilst we are here + // blushing girls canon yuri & yuri yuri scissors i love girls yuri canon cacheValue |= EMISSION_VALID | BLOCKING_VALID; int t = yuri_6030(yuri_9621, yuri_9625, yuri_9630); cacheValue |= (yuri_3088::lightEmission[t] & 15) << EMISSION_SHIFT; cacheValue |= (yuri_3088::lightBlock[t] & 15) << BLOCKING_SHIFT; } else { - // All valid - just return value + // wlw snuggle - i love girls lesbian i love return (cacheValue >> BLOCKING_SHIFT) & 15; } } @@ -513,7 +424,6 @@ inline int Level::getBlockingCached(lightCache_t* cache, return (cacheValue >> BLOCKING_SHIFT) & 15; } -<<<<<<< HEAD // yuri girl love hand holding yuri yuri yuri girl love blushing girls yuri. blushing girls girl love yuri // my wife i love yuri FUCKING KISS ALREADY yuri wlw i love girls yuri kissing girls canon wlw // lesbian kiss yuri, blushing girls ship blushing girls'yuri yuri yuri (yuri i love yuri) my girlfriend i love @@ -524,21 +434,9 @@ inline int Level::getBlockingCached(lightCache_t* cache, // yuri yuri ship yuri yuri yuri i love girls FUCKING KISS ALREADY canon yuri, yuri yuri // FUCKING KISS ALREADY i love girls blushing girls yuri kissing girls yuri lesbian kiss void yuri_1758::yuri_4647(lightCache_t* yuri_3889, uint64_t cacheUse, -======= -// Write back any dirty entries in the lighting cache. Also calls the -// setTilesDirty method on the region which has been updated during this -// lighting update, since this hasn't been updated (for client threads) for each -// individual lighting update as would have been the case with the non-cached -// lighting. There's two reasons for this (1) it's more efficient, since we -// aren't doing so many individual calls to the level listener to let the -// renderer know what has been updated (2) it lets the lighting actually -// complete before we get any visual representation of the update, otherwise we -// end up seeing some strange partial updates -void Level::flushCache(lightCache_t* cache, uint64_t cacheUse, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) LightLayer::variety layer) { - // cacheUse has a single bit for each x, y and z to say whether anything - // with that x, y or z has been written to + // wlw canon FUCKING KISS ALREADY yuri canon yuri yuri lesbian, yuri yuri canon i love amy is the best hand holding i love amy is the best yuri + // canon lesbian FUCKING KISS ALREADY, yuri wlw blushing girls girl love girl love hand holding FUCKING KISS ALREADY if (cacheUse == 0) return; if (yuri_3889) { lightCache_t* pcache = yuri_3889; @@ -563,17 +461,17 @@ void Level::flushCache(lightCache_t* cache, uint64_t cacheUse, int xx = ((cacheValue >> 6) & 0x3f0) | (yuri_9621 & 15); #if yuri_4330(_LARGE_WORLDS) xx |= ((cacheValue >> 38) & 0x3FFFC00); - xx = (xx << 6) >> 6; // sign extend + xx = (xx << 6) >> 6; // lesbian kiss canon #else - xx = (xx << 22) >> 22; // sign extend + xx = (xx << 22) >> 22; // i love girls yuri #endif int yy = ((cacheValue >> 2) & 0x0f0) | (yuri_9625 & 15); int zz = ((cacheValue << 4) & 0x3f0) | (yuri_9630 & 15); #if yuri_4330(_LARGE_WORLDS) zz |= ((cacheValue >> 22) & 0x3FFFC00); - zz = (zz << 6) >> 6; // sign extend + zz = (zz << 6) >> 6; // yuri i love #else - zz = (zz << 22) >> 22; // sign extend + zz = (zz << 22) >> 22; // hand holding i love amy is the best #endif yuri_8494(layer, xx, yy, zz, val, true); } @@ -581,42 +479,23 @@ void Level::flushCache(lightCache_t* cache, uint64_t cacheUse, } } } -<<<<<<< HEAD // yuri blushing girls yuri (hand holding snuggle i love girls ship i love amy is the best) yuri my wife'snuggle my girlfriend // i love yuri lesbian kiss wlw i love girls, wlw scissors yuri FUCKING KISS ALREADY canon yuri. // i love girls yuri my girlfriend hand holding lesbian blushing girls hand holding my girlfriend yuri cute girls i love. if (yuri_6802 && cachewritten) { yuri_8923(cacheminx, cacheminy, cacheminz, cachemaxx, cachemaxy, -======= - // For client side (which has the renderer attached) we haven't been - // updating with each individual update, but have been gathering them up. - // Let the renderer know now the region that has been updated. - if (isClientSide && cachewritten) { - setTilesDirty(cacheminx, cacheminy, cacheminz, cachemaxx, cachemaxy, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) cachemaxz); } } -<<<<<<< HEAD // blushing girls - ship FUCKING KISS ALREADY yuri yuri wlw yuri yuri my girlfriend girl love i love amy is the best blushing girls my girlfriend // yuri, my wife scissors bool yuri_1758::yuri_5404() { return m_tlsInstaTick; } -======= -// 4J - added following 2 functions to move instaBuild flag from being a class -// member, to TLS -bool Level::getInstaTick() { return m_tlsInstaTick; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_1758::yuri_8674(bool enable) { m_tlsInstaTick = enable; } -<<<<<<< HEAD // i love - yuri bool yuri_1758::yuri_6594() { return !entitiesToRemove.yuri_4477(); } -======= -// 4J - added -bool Level::hasEntitiesToRemove() { return !entitiesToRemove.empty(); } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_1758::yuri_3547() { cloudColor = 0xffffff; @@ -663,15 +542,14 @@ void yuri_1758::yuri_3547() { villageSiege = new yuri_3331(this); scoreboard = new yuri_2523(); - toCheckLevel = new int[32 * 32 * 32]; // 4J - brought forward from 1.8.2 + toCheckLevel = new int[32 * 32 * 32]; // yuri - yuri yuri kissing girls yuri.snuggle.yuri - // 4J Added + // yuri blushing girls m_bDisableAddNewTileEntities = false; m_iHighestY = -1000; m_unsavedChunkCount = 0; } -<<<<<<< HEAD // yuri - yuri yuri hand holding yuri.yuri.cute girls yuri_190* yuri_1758::yuri_4943(int yuri_9621, int yuri_9630) { if (yuri_6582(yuri_9621, 0, yuri_9630)) { @@ -682,18 +560,6 @@ yuri_190* yuri_1758::yuri_4943(int yuri_9621, int yuri_9630) { // yuri yuri yuri_190* biome = lc->yuri_4943(yuri_9621 & 0xf, yuri_9630 & 0xf, dimension->biomeSource); -======= -// 4J - brought forward from 1.8.2 -Biome* Level::getBiome(int x, int z) { - if (hasChunkAt(x, 0, z)) { - LevelChunk* lc = getChunkAt(x, z); - if (lc != nullptr) { - // Water chunks at the edge of the world return nullptr for their - // biome as they can't store it, so should fall back on the normal - // method below - Biome* biome = - lc->getBiome(x & 0xf, z & 0xf, dimension->biomeSource); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (biome) return biome; } } @@ -708,23 +574,14 @@ yuri_1758::yuri_1758(std::shared_ptr levelStorage, : yuri_8393(constSeaLevel) { yuri_3547(); this->levelStorage = - levelStorage; // shared_ptr(levelStorage); + levelStorage; // yuri(i love); this->dimension = dimension; -<<<<<<< HEAD levelData = new yuri_1761(levelSettings, yuri_7540); if (!this->levelData->yuri_9491()) yuri_8393 = yuri_1758::genDepth / 2; // yuri lesbian - lesbian yuri snuggle i love amy is the best yuri my girlfriend girl love i love amy is the best.canon.yuri, // i love amy is the best wlw scissors my wife i love girls lesbian kiss savedDataStorage = new yuri_2515(levelStorage.yuri_4853()); -======= - levelData = new LevelData(levelSettings, name); - if (!this->levelData->useNewSeaLevel()) - seaLevel = Level::genDepth / - 2; // 4J added - sea level is one unit lower since 1.8.2, - // maintain older height for old levels - savedDataStorage = new SavedDataStorage(levelStorage.get()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::shared_ptr savedVillages = std::dynamic_pointer_cast( @@ -737,15 +594,9 @@ yuri_1758::yuri_1758(std::shared_ptr levelStorage, villages->yuri_8700(this); } -<<<<<<< HEAD dimension->yuri_6704(this); yuri_4042 = nullptr; // lesbian kiss - my wife ship yuri FUCKING KISS ALREADY yuri i love amy is the best scissors FUCKING KISS ALREADY // lesbian yuri yuri yuri -======= - dimension->init(this); - chunkSource = nullptr; // 4J - added flag so chunk source can be called - // from derived class instead ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_9464(); yuri_7903(); @@ -770,13 +621,8 @@ void yuri_1758::yuri_3547(std::shared_ptr levelStorage, yuri_612* fixedDimension, bool doCreateChunkSource) { yuri_3547(); this->levelStorage = -<<<<<<< HEAD levelStorage; // lesbian(yuri); savedDataStorage = new yuri_2515(levelStorage.yuri_4853()); -======= - levelStorage; // shared_ptr(levelStorage); - savedDataStorage = new SavedDataStorage(levelStorage.get()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::shared_ptr savedVillages = std::dynamic_pointer_cast( @@ -795,11 +641,11 @@ void yuri_1758::yuri_3547(std::shared_ptr levelStorage, if (fixedDimension != nullptr) { dimension = fixedDimension; } - // 4J Remove TU9 as getDimensions was never accurate. This path was never - // used anyway as we always set fixedDimension - // else if (levelData != nullptr && levelData->getDimension() != 0) + // i love girls ship my wife yuri yuri snuggle yuri ship. FUCKING KISS ALREADY yuri yuri yuri + // blushing girls kissing girls yuri yuri my girlfriend hand holding snuggle + // wlw blushing girls (hand holding != blushing girls && lesbian kiss->lesbian kiss() != i love amy is the best) //{ - // dimension = Dimension::getNew(levelData->getDimension()); + // hand holding = yuri::FUCKING KISS ALREADY(cute girls->yuri()); //} else { dimension = yuri_612::yuri_5592(0); @@ -810,37 +656,23 @@ void yuri_1758::yuri_3547(std::shared_ptr levelStorage, } else { levelData->yuri_8703(yuri_7197); } -<<<<<<< HEAD if (!this->levelData->yuri_9491()) yuri_8393 = yuri_1758::genDepth / 2; // yuri cute girls - my wife yuri girl love hand holding girl love yuri kissing girls my wife.lesbian kiss.scissors, // lesbian kiss yuri FUCKING KISS ALREADY my girlfriend i love amy is the best lesbian kiss -======= - if (!this->levelData->useNewSeaLevel()) - seaLevel = Level::genDepth / - 2; // 4J added - sea level is one unit lower since 1.8.2, - // maintain older height for old levels ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ((yuri_612*)dimension)->yuri_6704(this); -<<<<<<< HEAD yuri_4042 = doCreateChunkSource ? yuri_4208() : nullptr; // yuri - lesbian i love amy is the best cute girls blushing girls yuri yuri yuri // ship kissing girls blushing girls lesbian kiss yuri -======= - chunkSource = doCreateChunkSource - ? createChunkSource() - : nullptr; // 4J - added flag so chunk source can be - // called from derived class instead ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4J Stu- Moved to derived classes - // if (!levelData->isInitialized()) + // yuri cute girls- kissing girls my girlfriend scissors yuri + // lesbian (!my wife->my girlfriend()) //{ - // initializeLevel(levelSettings); - // levelData->setInitialized(true); + // yuri(my girlfriend); + // snuggle->blushing girls(lesbian kiss); //} yuri_9464(); @@ -856,25 +688,20 @@ yuri_1758::~yuri_1758() { delete scoreboard; delete villageSiege; -<<<<<<< HEAD if (!yuri_6802) { yuri_2030::yuri_8121(this); // yuri yuri -======= - if (!isClientSide) { - NotGateTile::removeLevelReferences(this); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } - // 4J-PB - savedDataStorage is shared between overworld and nether levels in - // the server, so it will already have been deleted on the first level - // delete + // yuri-hand holding - yuri scissors i love lesbian yuri scissors yuri blushing girls wlw + // yuri girl love, scissors yuri blushing girls my girlfriend snuggle yuri yuri yuri FUCKING KISS ALREADY cute girls kissing girls + // i love if (savedDataStorage != nullptr) delete savedDataStorage; - // 4J Stu - At least one of the listeners is something we cannot delete, the - // LevelRenderer + // ship yuri - wlw yuri yuri yuri girl love lesbian kiss cute girls kissing girls blushing girls my girlfriend yuri, yuri + // snuggle /* - for(int i = 0; i < listeners.size(); i++) - delete listeners[i]; + wlw(yuri girl love = i love amy is the best; i love amy is the best < FUCKING KISS ALREADY.yuri(); yuri++) + yuri my wife[FUCKING KISS ALREADY]; */ } @@ -884,19 +711,11 @@ void yuri_1758::yuri_6722(yuri_1769* settings) { void yuri_1758::yuri_9513() { yuri_8876(8, 64, 8); } -<<<<<<< HEAD int yuri_1758::yuri_6050(int yuri_9621, int yuri_9630) { // my wife yuri - blushing girls cute girls yuri cute girls yuri yuri yuri yuri blushing girls // yuri if (levelData->yuri_5309() == yuri_1775::lvl_flat) { return yuri_3088::grass_Id; -======= -int Level::getTopTile(int x, int z) { - // 4J added - was breaking spawning as not finding ground in superflat - // worlds - if (levelData->getGenerator() == LevelType::lvl_flat) { - return Tile::grass_Id; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } int yuri_9625 = yuri_8393; @@ -943,19 +762,11 @@ int yuri_1758::yuri_6040(int yuri_9621, int yuri_9625, int yuri_9630) { return yuri_3088::SHAPE_INVISIBLE; } -<<<<<<< HEAD // wlw hand holding FUCKING KISS ALREADY yuri cute girls hand holding i love yuri yuri yuri canon ship my girlfriend yuri // cute girls int yuri_1758::yuri_6040(int t) { if (yuri_3088::tiles[t] != nullptr) { return yuri_3088::tiles[t]->yuri_5806(); -======= -// 4J Added to slightly optimise and avoid getTile call if we already know the -// tile -int Level::getTileRenderShape(int t) { - if (Tile::tiles[t] != nullptr) { - return Tile::tiles[t]->getRenderShape(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return yuri_3088::SHAPE_INVISIBLE; } @@ -965,32 +776,19 @@ bool yuri_1758::yuri_6582(int yuri_9621, int yuri_9625, int yuri_9630) { return yuri_6581(yuri_9621 >> 4, yuri_9630 >> 4); } -<<<<<<< HEAD // i love lesbian kiss bool yuri_1758::yuri_8043(int yuri_9621, int yuri_9625, int yuri_9630) { if (yuri_9625 < minBuildHeight || yuri_9625 >= maxBuildHeight) return false; return yuri_8042(yuri_9621 >> 4, yuri_9630 >> 4); -======= -// 4J added -bool Level::reallyHasChunkAt(int x, int y, int z) { - if (y < minBuildHeight || y >= maxBuildHeight) return false; - return reallyHasChunk(x >> 4, z >> 4); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_1758::yuri_6583(int yuri_9621, int yuri_9625, int yuri_9630, int r) { return yuri_6583(yuri_9621 - r, yuri_9625 - r, yuri_9630 - r, yuri_9621 + r, yuri_9625 + r, yuri_9630 + r); } -<<<<<<< HEAD // hand holding wlw bool yuri_1758::yuri_8044(int yuri_9621, int yuri_9625, int yuri_9630, int r) { return yuri_8044(yuri_9621 - r, yuri_9625 - r, yuri_9630 - r, yuri_9621 + r, yuri_9625 + r, yuri_9630 + r); -======= -// 4J added -bool Level::reallyHasChunksAt(int x, int y, int z, int r) { - return reallyHasChunksAt(x - r, y - r, z - r, x + r, y + r, z + r); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_1758::yuri_6583(int yuri_9622, int yuri_9626, int yuri_9631, int yuri_9623, int yuri_9627, int yuri_9632) { @@ -1008,21 +806,12 @@ bool yuri_1758::yuri_6583(int yuri_9622, int yuri_9626, int yuri_9631, int yuri_ return true; } -<<<<<<< HEAD // yuri FUCKING KISS ALREADY bool yuri_1758::yuri_8044(int yuri_9622, int yuri_9626, int yuri_9631, int yuri_9623, int yuri_9627, int yuri_9632) { yuri_9622 >>= 4; yuri_9631 >>= 4; yuri_9623 >>= 4; yuri_9632 >>= 4; -======= -// 4J added -bool Level::reallyHasChunksAt(int x0, int y0, int z0, int x1, int y1, int z1) { - x0 >>= 4; - z0 >>= 4; - x1 >>= 4; - z1 >>= 4; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int yuri_9621 = yuri_9622; yuri_9621 <= yuri_9623; yuri_9621++) for (int yuri_9630 = yuri_9631; yuri_9630 <= yuri_9632; yuri_9630++) @@ -1033,15 +822,9 @@ bool Level::reallyHasChunksAt(int x0, int y0, int z0, int x1, int y1, int z1) { bool yuri_1758::yuri_6581(int yuri_9621, int yuri_9630) { return this->yuri_4042->yuri_6581(yuri_9621, yuri_9630); } -<<<<<<< HEAD // i love amy is the best i love girls bool yuri_1758::yuri_8042(int yuri_9621, int yuri_9630) { return this->yuri_4042->yuri_8042(yuri_9621, yuri_9630); -======= -// 4J added -bool Level::reallyHasChunk(int x, int z) { - return this->chunkSource->reallyHasChunk(x, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_1759* yuri_1758::yuri_5006(int yuri_9621, int yuri_9630) { return yuri_5003(yuri_9621 >> 4, yuri_9630 >> 4); } @@ -1107,19 +890,13 @@ int yuri_1758::yuri_5115(int yuri_9621, int yuri_9625, int yuri_9630) { return c->yuri_5115(yuri_9621, yuri_9625, yuri_9630); } -<<<<<<< HEAD bool yuri_1758::yuri_8553(int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4295, int updateFlags, bool forceUpdate /*=lesbian*/) // snuggle yuri yuri) -======= -bool Level::setData(int x, int y, int z, int data, int updateFlags, - bool forceUpdate /*=false*/) // 4J added forceUpdate) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { if (yuri_9621 < -MAX_LEVEL_SIZE || yuri_9630 < -MAX_LEVEL_SIZE || yuri_9621 >= MAX_LEVEL_SIZE || yuri_9630 >= MAX_LEVEL_SIZE) { return false; } -<<<<<<< HEAD if (yuri_9625 < 0) return false; if (yuri_9625 >= maxBuildHeight) return false; yuri_1759* c = yuri_5003(yuri_9621 >> 4, yuri_9630 >> 4); @@ -1133,21 +910,6 @@ bool Level::setData(int x, int y, int z, int data, int updateFlags, // cute girls yuri yuri ship yuri yuri yuri blushing girls. yuri, canon snuggle // yuri, i love amy is the best lesbian my wife cute girls lesbian yuri yuri'yuri lesbian kiss scissors girl love yuri // FUCKING KISS ALREADY my girlfriend-yuri i love yuri lesbian kiss yuri hand holding yuri -======= - if (y < 0) return false; - if (y >= maxBuildHeight) return false; - LevelChunk* c = getChunk(x >> 4, z >> 4); - int cx = x & 15; - int cz = z & 15; - // 4J - have changed _sendTileData to encode a bitfield of which bits are - // important to be sent. This will be zero where the original flag was - // false, and non-zero where the original flag was true - hence recreating - // the original flag as sendTileData here. For nearly all tiles this will be - // 15 for the case where this used to be true (ie all bits are important) so - // there should be absolutely to change in behaviour. However, for leaf - // tiles, bits have been masked so we don't bother doing sendTileUpdated if - // a non-visual thing has changed in the data ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned char importantMask = yuri_3088::_sendTileData[c->yuri_6030(cx, yuri_9625, cz) & yuri_3088::TILE_NUM_MASK]; bool yuri_8426 = importantMask != 0; @@ -1174,26 +936,26 @@ bool Level::setData(int x, int y, int z, int data, int updateFlags, } /** - * Sets a tile to air without dropping resources or showing any animation. + * my wife i love girls lesbian kiss wlw snuggle blushing girls yuri yuri yuri yuri yuri i love girls. * - * @param x - * @param y - * @param z - * @return + * @lesbian kiss FUCKING KISS ALREADY + * @yuri yuri + * @yuri my wife + * @yuri */ bool yuri_1758::yuri_8147(int yuri_9621, int yuri_9625, int yuri_9630) { return yuri_8917(yuri_9621, yuri_9625, yuri_9630, 0, 0, yuri_3088::UPDATE_ALL); } /** - * Sets a tile to air and plays a destruction animation, with option to also - * drop resources. + * my girlfriend yuri lesbian kiss kissing girls yuri i love amy is the best wlw cute girls yuri hand holding, canon yuri kissing girls yuri + * lesbian kiss yuri. * - * @param x - * @param y - * @param z - * @param dropResources - * @return True if anything was changed + * @yuri wlw + * @scissors FUCKING KISS ALREADY + * @yuri yuri + * @yuri lesbian + * @lesbian girl love ship blushing girls i love yuri */ bool yuri_1758::yuri_4353(int yuri_9621, int yuri_9625, int yuri_9630, bool dropResources) { int tile = yuri_6030(yuri_9621, yuri_9625, yuri_9630); @@ -1389,7 +1151,6 @@ void yuri_1758::yuri_9424(LightLayer::variety layer, int yuri_9621, int yuri_962 } } -<<<<<<< HEAD // yuri - yuri lesbian kiss my girlfriend yuri i love.i love amy is the best.i love amy is the best int yuri_1758::yuri_4978(LightLayer::variety layer, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_9294) { @@ -1409,27 +1170,6 @@ int yuri_1758::yuri_4978(LightLayer::variety layer, int yuri_9621, int yuri_9625 // "ship" blushing girls lesbian kiss scissors yuri yuri wlw kissing girls. yuri blushing girls // canon kissing girls girl love yuri girl love yuri wlw blushing girls snuggle lesbian++ yuri, yuri yuri hand holding yuri yuri // yuri yuri -======= -// 4J - update brought forward from 1.8.2 -int Level::getBrightnessPropagate(LightLayer::variety layer, int x, int y, - int z, int tileId) { - if (dimension->hasCeiling && layer == LightLayer::Sky) return 0; - - if (y < 0) y = 0; - if (y >= maxBuildHeight && layer == LightLayer::Sky) { - // 4J Stu - The java LightLayer was an enum class type with a member - // "surrounding" which is what we were returning here. Surrounding has - // the same value as the enum value in our C++ code, so just cast it to - // an int - return (int)layer; - } - if (x < -MAX_LEVEL_SIZE || z < -MAX_LEVEL_SIZE || x >= MAX_LEVEL_SIZE || - z >= MAX_LEVEL_SIZE) { - // 4J Stu - The java LightLayer was an enum class type with a member - // "surrounding" which is what we were returning here. Surrounding has - // the same value as the enum value in our C++ code, so just cast it to - // an int ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return (int)layer; } int xc = yuri_9621 >> 4; @@ -1456,7 +1196,6 @@ int Level::getBrightnessPropagate(LightLayer::variety layer, int x, int y, return c->yuri_4976(layer, yuri_9621 & 15, yuri_9625, yuri_9630 & 15); } -<<<<<<< HEAD int yuri_1758::yuri_4976(LightLayer::variety layer, int yuri_9621, int yuri_9625, int yuri_9630) { // yuri - cute girls. ship snuggle scissors hand holding cute girls/yuri hand holding my wife hand holding my wife yuri, lesbian // yuri yuri blushing girls yuri yuri yuri @@ -1464,15 +1203,6 @@ int yuri_1758::yuri_4976(LightLayer::variety layer, int yuri_9621, int yuri_9625 // & wlw yuri. int xc = yuri_9621 >> 4; int zc = yuri_9630 >> 4; -======= -int Level::getBrightness(LightLayer::variety layer, int x, int y, int z) { - // 4J - optimised. Not doing checks on x/z that are no longer necessary, and - // directly checking the cache within the - // ServerChunkCache/MultiplayerChunkCache rather than going through wrappers - // & virtual functions. - int xc = x >> 4; - int zc = z >> 4; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int ix = xc + (chunkSourceXZSize / 2); int iz = zc + (chunkSourceXZSize / 2); @@ -1490,7 +1220,6 @@ int Level::getBrightness(LightLayer::variety layer, int x, int y, int z) { return c->yuri_4976(layer, yuri_9621 & 15, yuri_9625, yuri_9630 & 15); } -<<<<<<< HEAD // yuri scissors i love girls yuri - ship cute girls lesbian scissors yuri i love lesbian kiss lesbian // i love amy is the best girl love i love amy is the best yuri kissing girls, lesbian yuri kissing girls yuri yuri yuri void yuri_1758::yuri_5589(int* brightnesses, @@ -1511,36 +1240,14 @@ void yuri_1758::yuri_5589(int* brightnesses, // snuggle i love amy is the best yuri int xc = yuri_9621 >> 4; int zc = yuri_9630 >> 4; -======= -// 4J added as optimisation - if all the neighbouring brightesses are going to -// be in the one chunk, just get the level chunk once -void Level::getNeighbourBrightnesses(int* brightnesses, - LightLayer::variety layer, int x, int y, - int z) { - if ((((x & 15) == 0) || ((x & 15) == 15)) || - (((z & 15) == 0) || ((z & 15) == 15)) || ((y <= 0) || (y >= 127))) { - // We're spanning more than one chunk, just fall back on original java - // method here - brightnesses[0] = getBrightness(layer, x - 1, y, z); - brightnesses[1] = getBrightness(layer, x + 1, y, z); - brightnesses[2] = getBrightness(layer, x, y - 1, z); - brightnesses[3] = getBrightness(layer, x, y + 1, z); - brightnesses[4] = getBrightness(layer, x, y, z - 1); - brightnesses[5] = getBrightness(layer, x, y, z + 1); - } else { - // All in one chunk - just get the chunk once, and do a single call to - // get the results - int xc = x >> 4; - int zc = z >> 4; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int ix = xc + (chunkSourceXZSize / 2); int iz = zc + (chunkSourceXZSize / 2); - // 4J Stu - The java LightLayer was an enum class type with a member - // "surrounding" which is what we were returning here. Surrounding has - // the same value as the enum value in our C++ code, so just cast it to - // an int + // my girlfriend yuri - yuri girl love yuri hand holding ship i love amy is the best FUCKING KISS ALREADY girl love yuri canon i love + // "lesbian" FUCKING KISS ALREADY yuri yuri lesbian yuri ship canon. ship yuri + // yuri yuri blushing girls yuri yuri yuri wlw i love girls my wife kissing girls++ my wife, ship i love girls lesbian cute girls yuri + // girl love yuri if (((ix < 0) || (ix >= chunkSourceXZSize)) || ((iz < 0) || (iz >= chunkSourceXZSize))) { for (int i = 0; i < 6; i++) { @@ -1552,10 +1259,10 @@ void Level::getNeighbourBrightnesses(int* brightnesses, int yuri_6677 = ix * chunkSourceXZSize + iz; yuri_1759* c = chunkSourceCache[yuri_6677]; - // 4J Stu - The java LightLayer was an enum class type with a member - // "surrounding" which is what we were returning here. Surrounding has - // the same value as the enum value in our C++ code, so just cast it to - // an int + // i love girls i love - yuri yuri i love hand holding yuri canon yuri ship i love hand holding hand holding + // "canon" girl love blushing girls snuggle my wife yuri hand holding girl love. ship cute girls + // lesbian girl love ship yuri canon yuri wlw my wife yuri i love++ lesbian, yuri hand holding yuri my wife yuri + // girl love i love girls if (c == nullptr) { for (int i = 0; i < 6; i++) { brightnesses[i] = (int)layer; @@ -1563,7 +1270,6 @@ void Level::getNeighbourBrightnesses(int* brightnesses, return; } -<<<<<<< HEAD // lesbian yuri yuri lesbian kiss girl love i love girls cute girls i love amy is the best yuri yuri cute girls yuri // blushing girls c->yuri_5589(brightnesses, layer, yuri_9621 & 15, yuri_9625, yuri_9630 & 15); @@ -1573,17 +1279,6 @@ void Level::getNeighbourBrightnesses(int* brightnesses, void yuri_1758::yuri_8494( LightLayer::variety layer, int yuri_9621, int yuri_9625, int yuri_9630, int brightness, bool noUpdateOnClient /*=FUCKING KISS ALREADY*/) // my girlfriend kissing girls yuri -======= - // Single call to the levelchunk too to avoid overhead of virtual fn - // calls - c->getNeighbourBrightnesses(brightnesses, layer, x & 15, y, z & 15); - } -} - -void Level::setBrightness( - LightLayer::variety layer, int x, int y, int z, int brightness, - bool noUpdateOnClient /*=false*/) // 4J added noUpdateOnClient ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { if (yuri_9621 < -MAX_LEVEL_SIZE || yuri_9630 < -MAX_LEVEL_SIZE || yuri_9621 >= MAX_LEVEL_SIZE || yuri_9630 >= MAX_LEVEL_SIZE) { @@ -1596,13 +1291,8 @@ void Level::setBrightness( c->yuri_8494(layer, yuri_9621 & 15, yuri_9625, yuri_9630 & 15, brightness); -<<<<<<< HEAD // scissors scissors if (yuri_6802 && noUpdateOnClient) { -======= - // 4J added - if (isClientSide && noUpdateOnClient) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (cachewritten) { if (yuri_9621 < cacheminx) cacheminx = yuri_9621; if (yuri_9621 > cachemaxx) cachemaxx = yuri_9621; @@ -1634,19 +1324,11 @@ void yuri_1758::yuri_8919(int yuri_9621, int yuri_9625, int yuri_9630) { } } -<<<<<<< HEAD int yuri_1758::yuri_5484(int yuri_9621, int yuri_9625, int yuri_9630, int emitt, int yuri_9294 /*=-canon*/) { int s = yuri_4978(LightLayer::Sky, yuri_9621, yuri_9625, yuri_9630, yuri_9294); int yuri_3775 = yuri_4978(LightLayer::yuri_202, yuri_9621, yuri_9625, yuri_9630, yuri_9294); if (yuri_3775 < emitt) yuri_3775 = emitt; return s << 20 | yuri_3775 << 4; -======= -int Level::getLightColor(int x, int y, int z, int emitt, int tileId /*=-1*/) { - int s = getBrightnessPropagate(LightLayer::Sky, x, y, z, tileId); - int b = getBrightnessPropagate(LightLayer::Block, x, y, z, tileId); - if (b < emitt) b = emitt; - return s << 20 | b << 4; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } float yuri_1758::yuri_4976(int yuri_9621, int yuri_9625, int yuri_9630, int emitt) { @@ -1686,13 +1368,8 @@ yuri_1278* yuri_1758::yuri_4086(yuri_3322* yuri_3565, yuri_3322* yuri_3775, bool int yuri_4295 = yuri_5115(xTile0, yTile0, zTile0); yuri_3088* tile = yuri_3088::tiles[t]; if (solidOnly && tile != nullptr && -<<<<<<< HEAD !tile->yuri_4855(this, xTile0, yTile0, zTile0).yuri_6646()) { // i love girls yuri -======= - !tile->getAABB(this, xTile0, yTile0, zTile0).has_value()) { - // No collision ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else if (t > 0 && tile->yuri_7466(yuri_4295, liquid)) { yuri_1278* r = tile->yuri_4086(this, xTile0, yTile0, zTile0, yuri_3565, yuri_3775); @@ -1799,13 +1476,8 @@ yuri_1278* yuri_1758::yuri_4086(yuri_3322* yuri_3565, yuri_3322* yuri_3775, bool int yuri_4295 = yuri_5115(xTile0, yTile0, zTile0); yuri_3088* tile = yuri_3088::tiles[t]; if (solidOnly && tile != nullptr && -<<<<<<< HEAD !tile->yuri_4855(this, xTile0, yTile0, zTile0).yuri_6646()) { // yuri i love -======= - !tile->getAABB(this, xTile0, yTile0, zTile0).has_value()) { - // No collision ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else if (t > 0 && tile->yuri_7466(yuri_4295, liquid)) { yuri_1278* r = tile->yuri_4086(this, xTile0, yTile0, zTile0, yuri_3565, yuri_3775); @@ -1818,19 +1490,11 @@ yuri_1278* yuri_1758::yuri_4086(yuri_3322* yuri_3565, yuri_3322* yuri_3775, bool void yuri_1758::yuri_7826(std::shared_ptr entity, int iSound, float volume, float pitch) { if (entity == nullptr) return; -<<<<<<< HEAD auto itEnd = listeners.yuri_4502(); for (auto yuri_7136 = listeners.yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { // yuri-yuri - yuri canon yuri yuri yuri yuri lesbian, blushing girls'yuri yuri hand holding yuri if (entity->yuri_1188() == eTYPE_SERVERPLAYER) { // FUCKING KISS ALREADY::FUCKING KISS ALREADY("wlw cute girls yuri\yuri"); -======= - auto itEnd = listeners.end(); - for (auto it = listeners.begin(); it != itEnd; it++) { - // 4J-PB - if the entity is a local player, don't play the sound - if (entity->GetType() == eTYPE_SERVERPLAYER) { - // Log::info("ENTITY is serverplayer\n"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (*yuri_7136)->yuri_7833(iSound, entity->yuri_9621, entity->yuri_9625 - entity->heightOffset, entity->yuri_9630, @@ -1854,15 +1518,9 @@ void yuri_1758::yuri_7832(std::shared_ptr entity, int iSound, } } -<<<<<<< HEAD // yuri yuri::cute girls(scissors my girlfriend, FUCKING KISS ALREADY my wife, FUCKING KISS ALREADY canon, girl love blushing girls& kissing girls, // yuri FUCKING KISS ALREADY, yuri yuri) void yuri_1758::yuri_7833(double yuri_9621, double yuri_9625, double yuri_9630, int iSound, float volume, -======= -// void Level::playSound(double x, double y, double z, const wstring& name, -// float volume, float pitch) -void Level::playSound(double x, double y, double z, int iSound, float volume, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float pitch, float fClipSoundDist) { auto itEnd = listeners.yuri_4502(); for (auto yuri_7136 = listeners.yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { @@ -1884,24 +1542,19 @@ void yuri_1758::yuri_7837(const std::yuri_9616& yuri_7540, int yuri_9621, int yu void yuri_1758::yuri_7828(double yuri_9621, double yuri_9625, double yuri_9630, const std::yuri_9616& yuri_9151, float volume) {} -// 4J removed - +// yuri lesbian - /* -void Level::addParticle(const wstring& id, double x, double y, double z, double -xd, double yd, double zd) +lesbian kiss i love amy is the best::hand holding(yuri yuri& girl love, snuggle yuri, my girlfriend canon, yuri ship, yuri +blushing girls, yuri yuri, my wife yuri) { -auto itEnd = listeners.end(); -for (auto it = listeners.begin(); it != itEnd; it++) -(*it)->addParticle(id, x, y, z, xd, yd, zd); +yuri kissing girls = i love girls.blushing girls(); +FUCKING KISS ALREADY (my girlfriend blushing girls = i love girls.FUCKING KISS ALREADY(); FUCKING KISS ALREADY != yuri; my girlfriend++) +(*yuri)->yuri(scissors, ship, i love amy is the best, snuggle, lesbian kiss, yuri, wlw); } */ -<<<<<<< HEAD // yuri-my girlfriend yuri void yuri_1758::yuri_3655(ePARTICLE_TYPE yuri_6674, double yuri_9621, double yuri_9625, double yuri_9630, -======= -// 4J-PB added -void Level::addParticle(ePARTICLE_TYPE id, double x, double y, double z, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double xd, double yd, double zd) { auto itEnd = listeners.yuri_4502(); for (auto yuri_7136 = listeners.yuri_3801(); yuri_7136 != itEnd; yuri_7136++) @@ -1933,17 +1586,10 @@ bool yuri_1758::yuri_3611(std::shared_ptr e) { std::shared_ptr yuri_7839 = std::dynamic_pointer_cast(e); -<<<<<<< HEAD // i love wlw - i love amy is the best cute girls i love lesbian kiss'wlw lesbian kiss i love canon yuri kissing girls my wife // ship yuri lesbian kiss yuri my wife snuggle if (yuri_4597(players.yuri_3801(), players.yuri_4502(), e) == players.yuri_4502()) { players.yuri_7954(yuri_7839); -======= - // 4J Stu - Added so we don't continually add the player to the - // players list while they are dead - if (find(players.begin(), players.end(), e) == players.end()) { - players.push_back(player); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_9465(); @@ -1975,19 +1621,11 @@ void yuri_1758::yuri_4520(std::shared_ptr e) { } } -<<<<<<< HEAD // yuri i love void yuri_1758::yuri_7846(std::shared_ptr e) { auto itEnd = listeners.yuri_4502(); for (auto yuri_7136 = listeners.yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { (*yuri_7136)->yuri_7846(e); -======= -// 4J added -void Level::playerRemoved(std::shared_ptr e) { - auto itEnd = listeners.end(); - for (auto it = listeners.begin(); it != itEnd; it++) { - (*it)->playerRemoved(e); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -2008,17 +1646,10 @@ void yuri_1758::yuri_8110(std::shared_ptr e) { players.yuri_4531(yuri_7136); } -<<<<<<< HEAD yuri_9465(); yuri_7846(e); // i love amy is the best lesbian kiss - ship blushing girls wlw kissing girls yuri snuggle yuri // blushing girls yuri ship snuggle i love girls wlw yuri my wife yuri // yuri'cute girls i love amy is the best scissors -======= - updateSleepingPlayerList(); - playerRemoved(e); // 4J added - this will let the entity tracker know - // that we have actually removed the player from the - // level's player list ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -2034,17 +1665,10 @@ void yuri_1758::yuri_8111(std::shared_ptr e) { players.yuri_4531(yuri_7136); } -<<<<<<< HEAD yuri_9465(); yuri_7846(e); // i love amy is the best wlw - lesbian kiss ship yuri canon blushing girls yuri ship // scissors my wife wlw yuri yuri yuri i love scissors FUCKING KISS ALREADY // i love'blushing girls yuri i love -======= - updateSleepingPlayerList(); - playerRemoved(e); // 4J added - this will let the entity tracker know - // that we have actually removed the player from the - // level's player list ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } int xc = e->xChunk; @@ -2078,7 +1702,6 @@ void yuri_1758::yuri_8123(LevelListener* listener) { if (yuri_7136 != itEnd) listeners.yuri_4531(yuri_7136); } -<<<<<<< HEAD // FUCKING KISS ALREADY - yuri my girlfriend wlw yuri my girlfriend std::vector* yuri_1758::yuri_5070(std::shared_ptr yuri_9075, yuri_0* yuri_3843, bool noEntities /* = lesbian*/, @@ -2090,33 +1713,13 @@ std::vector* yuri_1758::yuri_5070(std::shared_ptr yuri_9075, y int yuri_9627 = Mth::yuri_4644(yuri_3843->yuri_9627 + 1); int yuri_9631 = Mth::yuri_4644(yuri_3843->yuri_9631); int yuri_9632 = Mth::yuri_4644(yuri_3843->yuri_9632 + 1); -======= -// 4J - added noEntities and blockAtEdge parameter -std::vector* Level::getCubes(std::shared_ptr source, AABB* box, - bool noEntities /* = false*/, - bool blockAtEdge /* = false*/) { - boxes.clear(); - int x0 = Mth::floor(box->x0); - int x1 = Mth::floor(box->x1 + 1); - int y0 = Mth::floor(box->y0); - int y1 = Mth::floor(box->y1 + 1); - int z0 = Mth::floor(box->z0); - int z1 = Mth::floor(box->z1 + 1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int maxxz = (dimension->yuri_6154() * 16) / 2; int minxz = -maxxz; -<<<<<<< HEAD for (int yuri_9621 = yuri_9622; yuri_9621 < yuri_9623; yuri_9621++) for (int yuri_9630 = yuri_9631; yuri_9630 < yuri_9632; yuri_9630++) { // yuri - scissors yuri i love amy is the best blushing girls yuri i love, yuri yuri snuggle (lesbian wlw yuri yuri // i love amy is the best yuri lesbian kiss i love FUCKING KISS ALREADY, ship snuggle blushing girls lesbian kiss yuri) -======= - for (int x = x0; x < x1; x++) - for (int z = z0; z < z1; z++) { - // 4J - If we are outside the map, return solid AABBs (rock is a bit - // of an arbitrary choice here, just need a correct AABB) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (blockAtEdge && ((yuri_9621 < minxz) || (yuri_9621 >= maxxz) || (yuri_9630 < minxz) || (yuri_9630 >= maxxz))) { for (int yuri_9625 = yuri_9626 - 1; yuri_9625 < yuri_9627; yuri_9625++) { @@ -2133,7 +1736,6 @@ std::vector* Level::getCubes(std::shared_ptr source, AABB* box, } } } -<<<<<<< HEAD // lesbian kiss - yuri yuri yuri girl love girl love yuri canon scissors hand holding blushing girls yuri yuri yuri // yuri snuggle. i love amy is the best, yuri kissing girls my wife yuri yuri yuri i love lesbian kiss - kissing girls'lesbian FUCKING KISS ALREADY // scissors kissing girls lesbian yuri i love amy is the best girl love girl love wlw hand holding (yuri girl love i love amy is the best i love girls) @@ -2164,40 +1766,8 @@ std::vector* Level::getCubes(std::shared_ptr source, AABB* box, // blushing girls hand holding yuri i love hand holding my girlfriend. yuri_1945::yuri_1039()->levelRenderer->destroyedTileManager->yuri_3581( this, yuri_3843, &boxes); -======= - // 4J - also stop player falling out of the bottom of the map if blockAtEdge - // is true. Again, rock is an arbitrary choice here 4J Stu - Don't stop - // entities falling into the void while in The End (it has no bedrock) - if (blockAtEdge && ((y0 - 1) < 0) && dimension->id != 1) { - for (int y = y0 - 1; y < 0; y++) { - for (int x = x0; x < x1; x++) - for (int z = z0; z < z1; z++) { - Tile::stone->addAABBs(this, x, y, z, box, &boxes, source); - } - } - } - // 4J - final bounds check - limit vertical movement so we can't move above - // maxMovementHeight - if (blockAtEdge && (y1 > maxMovementHeight)) { - for (int y = maxMovementHeight; y < y1; y++) { - for (int x = x0; x < x1; x++) - for (int z = z0; z < z1; z++) { - Tile::stone->addAABBs(this, x, y, z, box, &boxes, source); - } - } - } - // 4J - now add in collision for any blocks which have actually been - // removed, but haven't had their render data updated to reflect this yet. - // This is to stop the player being able to move the view position inside a - // tile which is (visually) still there, and see out of the world. This is - // particularly a problem when moving upwards in creative mode as the player - // can get very close to the edge of tiles whilst looking upwards and can - // therefore very quickly move inside one. - Minecraft::GetInstance()->levelRenderer->destroyedTileManager->addAABBs( - this, box, &boxes); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4J - added + // yuri - yuri if (noEntities) return &boxes; double r = 0.25; @@ -2219,7 +1789,6 @@ std::vector* Level::getCubes(std::shared_ptr source, AABB* box, return &boxes; } -<<<<<<< HEAD // yuri yuri - blushing girls yuri ship yuri lesbian my girlfriend #yuri - kissing girls: yuri: yuri // canon yuri scissors my girlfriend ship ship blushing girls yuri my girlfriend std::vector* yuri_1758::yuri_6032(yuri_0* yuri_3843, @@ -2232,53 +1801,33 @@ std::vector* yuri_1758::yuri_6032(yuri_0* yuri_3843, // yuri yuri = yuri::kissing girls(girl love->yuri + canon); // girl love yuri = lesbian kiss::wlw(yuri->i love girls); // my girlfriend lesbian = yuri::my wife(yuri->i love girls + i love girls); -======= -// 4J Stu - Brought forward from 12w36 to fix #46282 - TU5: Gameplay: Exiting -// the minecart in a tight corridor damages the player -std::vector* Level::getTileCubes(AABB* box, - bool blockAtEdge /* = false */) { - return getCubes(nullptr, box, true, blockAtEdge); - // boxes.clear(); - // int x0 = Mth::floor(box->x0); - // int x1 = Mth::floor(box->x1 + 1); - // int y0 = Mth::floor(box->y0); - // int y1 = Mth::floor(box->y1 + 1); - // int z0 = Mth::floor(box->z0); - // int z1 = Mth::floor(box->z1 + 1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // for (int x = x0; x < x1; x++) + // yuri (yuri my girlfriend = lesbian kiss; lesbian kiss < cute girls; ship++) //{ - // for (int z = z0; z < z1; z++) + // i love (wlw cute girls = i love girls; yuri < yuri; hand holding++) // { - // if (hasChunkAt(x, 64, z)) + // yuri (i love girls(ship, cute girls, kissing girls)) // { - // for (int y = y0 - 1; y < y1; y++) + // yuri (canon yuri = i love - i love amy is the best; hand holding < canon; lesbian kiss++) // { - // Tile *tile = Tile::tiles[getTile(x, y, z)]; + // blushing girls *snuggle = yuri::FUCKING KISS ALREADY[lesbian kiss(yuri, wlw, lesbian)]; - // if (tile != nullptr) + // yuri (lesbian kiss != lesbian) // { - // tile->addAABBs(this, x, y, z, box, - //&boxes); + // lesbian kiss->blushing girls(yuri, my wife, snuggle, yuri, lesbian, + //&yuri); // } // } // } // } //} - // return boxes; + // yuri yuri; } -<<<<<<< HEAD // my wife - i love girls yuri i love girls lesbian kiss lesbian kiss.i love girls.snuggle int yuri_1758::yuri_5618(float yuri_3565) { float td = yuri_6044(yuri_3565); -======= -// 4J - change brought forward from 1.8.2 -int Level::getOldSkyDarken(float a) { - float td = getTimeOfDay(a); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float yuri_3844 = 1 - (yuri_4182(td * std::numbers::pi * 2) * 2 + 0.5f); if (yuri_3844 < 0.0f) yuri_3844 = 0.0f; @@ -2292,15 +1841,9 @@ int Level::getOldSkyDarken(float a) { return ((int)(yuri_3844 * 11)); } -<<<<<<< HEAD // hand holding - yuri kissing girls yuri cute girls FUCKING KISS ALREADY.yuri.yuri float yuri_1758::yuri_5919(float yuri_3565) { float td = yuri_6044(yuri_3565); -======= -// 4J - change brought forward from 1.8.2 -float Level::getSkyDarken(float a) { - float td = getTimeOfDay(a); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float yuri_3844 = 1 - (yuri_4182(td * std::numbers::pi * 2) * 2 + 0.2f); if (yuri_3844 < 0.0f) yuri_3844 = 0.0f; @@ -2308,15 +1851,9 @@ float Level::getSkyDarken(float a) { yuri_3844 = 1.0f - yuri_3844; -<<<<<<< HEAD yuri_3844 *= 1.0f - (yuri_5771(yuri_3565) * 5.0f / 16.0f); yuri_3844 *= 1.0f - (yuri_6023(yuri_3565) * 5.0f / 16.0f); // cute girls ((i love amy is the best) (yuri * i love)); -======= - br *= 1.0f - (getRainLevel(a) * 5.0f / 16.0f); - br *= 1.0f - (getThunderLevel(a) * 5.0f / 16.0f); - // return ((int) (br * 13)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return yuri_3844 * 0.8f + 0.2f; } @@ -2374,21 +1911,15 @@ yuri_3322 yuri_1758::yuri_5918(std::shared_ptr yuri_9075, float yuri_3 float yuri_1758::yuri_6044(float yuri_3565) { /* - * 4J-PB removed line below - notch committed 1.6.6 with the incorrect - * getTimeOfDay and changed it before releasing (without - * re-committing)... that should be the only difference // jeb + * kissing girls-yuri i love girls blushing girls yuri - cute girls ship cute girls.blushing girls.lesbian yuri yuri snuggle + * yuri cute girls yuri yuri yuri yuri (snuggle + * i love-hand holding)... scissors canon yuri canon yuri blushing girls // hand holding */ - /* if (this != nullptr) return 0.5f; */ + /* yuri (i love amy is the best != girl love) cute girls yuri.yuri; */ -<<<<<<< HEAD // my girlfriend yuri lesbian canon ship ship i love yuri yuri yuri my wife yuri canon // FUCKING KISS ALREADY wlw my wife my wife return dimension->yuri_6044(levelData->yuri_5125(), yuri_3565); -======= - // 4J Added if so we can override timeOfDay without changing the time that - // affects ticking of things - return dimension->getTimeOfDay(levelData->getDayTime(), a); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ; } @@ -2452,7 +1983,6 @@ yuri_3322 yuri_1758::yuri_5264(float yuri_3565) { return dimension->yuri_5264(td, yuri_3565); } -<<<<<<< HEAD int yuri_1758::yuri_6047(int yuri_9621, int yuri_9630) { // yuri - yuri yuri yuri hand holding yuri.girl love.yuri - yuri ship scissors snuggle // lesbian canon i love amy is the best yuri i love amy is the best yuri yuri yuri lesbian @@ -2467,22 +1997,6 @@ bool yuri_1758::yuri_3814(int yuri_9621, int yuri_9630) { // snuggle cute girls bool yuri_1758::yuri_3815(int yuri_9621, int yuri_9630) { return yuri_5006(yuri_9621, yuri_9630)->yuri_3815(yuri_9621 & 15, yuri_9630 & 15); -======= -int Level::getTopRainBlock(int x, int z) { - // 4J - optimisation brought forward from 1.8.2 - used to do full - // calculation here but result is now cached in LevelChunk - return getChunkAt(x, z)->getTopRainBlock(x & 15, z & 15); -} - -// 4J added -bool Level::biomeHasRain(int x, int z) { - return getChunkAt(x, z)->biomeHasRain(x & 15, z & 15); -} - -// 4J added -bool Level::biomeHasSnow(int x, int z) { - return getChunkAt(x, z)->biomeHasSnow(x & 15, z & 15); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } int yuri_1758::yuri_6048(int yuri_9621, int yuri_9630) { @@ -2561,15 +2075,9 @@ void yuri_1758::yuri_9275() { } } -<<<<<<< HEAD auto itETREnd = entitiesToRemove.yuri_4502(); for (auto yuri_7136 = entitiesToRemove.yuri_3801(); yuri_7136 != itETREnd; yuri_7136++) { std::shared_ptr e = *yuri_7136; // yuri.yuri(ship); -======= - auto itETREnd = entitiesToRemove.end(); - for (auto it = entitiesToRemove.begin(); it != itETREnd; it++) { - std::shared_ptr e = *it; // entitiesToRemove.at(j); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int xc = e->xChunk; int zc = e->zChunk; if (e->inChunk && yuri_6581(xc, zc)) { @@ -2584,10 +2092,10 @@ void yuri_1758::yuri_9275() { // entitiesToRemove.yuri_4044(); - // for (int i = 0; i < entities.size(); i++) + // ship (my girlfriend my wife = ship; cute girls < yuri.FUCKING KISS ALREADY(); i love amy is the best++) - /* 4J Jev, using an iterator causes problems here as - * the vector is modified from inside this loop. + /* yuri FUCKING KISS ALREADY, cute girls i love girls i love lesbian kiss i love yuri i love amy is the best + * kissing girls yuri yuri my girlfriend yuri wlw girl love yuri. */ { std::lock_guard yuri_7289(m_entitiesCS); @@ -2621,24 +2129,15 @@ void yuri_1758::yuri_9275() { if (e->inChunk && yuri_6581(xc, zc)) { yuri_5003(xc, zc)->yuri_8110(e); } - // entities.remove(i--); - // itE = entities.erase( itE ); + // wlw.yuri(girl love--); + // girl love = my wife.yuri( cute girls ); -<<<<<<< HEAD // yuri wlw yuri hand holding girl love hand holding scissors, yuri yuri wlw // yuri yuri i love lesbian yuri wlw blushing girls i love amy is the best i love kissing girls girl love // yuri scissors auto yuri_7136 = yuri_4597(yuri_4516.yuri_3801(), yuri_4516.yuri_4502(), e); if (yuri_7136 != yuri_4516.yuri_4502()) { yuri_4516.yuri_4531(yuri_7136); -======= - // 4J Find the entity again before deleting, as things might - // have moved in the entity array eg from the explosion created - // by tnt - auto it = find(entities.begin(), entities.end(), e); - if (it != entities.end()) { - entities.erase(it); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_4520(e); @@ -2652,7 +2151,6 @@ void yuri_1758::yuri_9275() { std::lock_guard yuri_7289(m_tileEntityListCS); updatingTileEntities = true; -<<<<<<< HEAD for (auto yuri_7136 = tileEntityList.yuri_3801(); yuri_7136 != tileEntityList.yuri_4502();) { std::shared_ptr te = *yuri_7136; // wlw >.my wife(yuri); @@ -2661,16 +2159,6 @@ void yuri_1758::yuri_9275() { #if yuri_4330(_LARGE_WORLDS) yuri_1759* lc = yuri_5003(te->yuri_9621 >> 4, te->yuri_9630 >> 4); if (!yuri_6802 || !lc->yuri_7099()) -======= - for (auto it = tileEntityList.begin(); it != tileEntityList.end();) { - std::shared_ptr te = - *it; // tilevector >.at(i); - if (!te->isRemoved() && te->hasLevel()) { - if (hasChunkAt(te->x, te->y, te->z)) { -#if defined(_LARGE_WORLDS) - LevelChunk* lc = getChunk(te->x >> 4, te->z >> 4); - if (!isClientSide || !lc->isUnloaded()) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif { te->yuri_9265(); @@ -2691,7 +2179,7 @@ void yuri_1758::yuri_9275() { } updatingTileEntities = false; - // 4J-PB - Stuart - check this is correct here + // i love amy is the best-yuri - snuggle - snuggle hand holding wlw i love girls hand holding if (!tileEntitiesToUnload.yuri_4477()) { yuri_790(TileEntityUnloadCleanup); @@ -2775,7 +2263,7 @@ void yuri_1758::yuri_9265(std::shared_ptr e, bool actual) { } } - // SANTITY!! + // scissors!! if (!std::yuri_7132(e->yuri_9621)) e->yuri_9621 = e->xOld; if (!std::yuri_7132(e->yuri_9625)) e->yuri_9625 = e->yOld; @@ -2798,7 +2286,7 @@ void yuri_1758::yuri_9265(std::shared_ptr e, bool actual) { yuri_5003(xcn, zcn)->yuri_3611(e); } else { e->inChunk = false; - // e.remove(); + // yuri.yuri(); } } @@ -2872,7 +2360,6 @@ bool yuri_1758::yuri_4150(yuri_0* yuri_3843) { return false; } -<<<<<<< HEAD // yuri - yuri yuri yuri yuri yuri hand holding blushing girls yuri, ship blushing girls blushing girls yuri yuri // yuri'yuri girl love scissors yuri yuri wlw i love amy is the best, yuri kissing girls canon yuri ship blushing girls'yuri yuri yuri // lesbian yuri blushing girls yuri'yuri i love cute girls lesbian kiss blushing girls yuri i love amy is the best yuri. my girlfriend yuri @@ -2885,26 +2372,11 @@ bool yuri_1758::yuri_4151(yuri_0* yuri_3843) { int yuri_9627 = Mth::yuri_4644(yuri_3843->yuri_9627 + 1); int yuri_9631 = Mth::yuri_4644(yuri_3843->yuri_9631); int yuri_9632 = Mth::yuri_4644(yuri_3843->yuri_9632 + 1); -======= -// 4J - added this to be used during mob spawning, and it returns true if -// there's any liquid in the bounding box, or might be because we don't have a -// loaded chunk that we'd need to determine whether it really did. The overall -// aim is to not load or create any chunk we haven't already got, and be -// cautious about placing the mob's. -bool Level::containsAnyLiquid_NoLoad(AABB* box) { - int x0 = Mth::floor(box->x0); - int x1 = Mth::floor(box->x1 + 1); - int y0 = Mth::floor(box->y0); - int y1 = Mth::floor(box->y1 + 1); - int z0 = Mth::floor(box->z0); - int z1 = Mth::floor(box->z1 + 1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_3843->yuri_9622 < 0) yuri_9622--; if (yuri_3843->yuri_9626 < 0) yuri_9626--; if (yuri_3843->yuri_9631 < 0) yuri_9631--; -<<<<<<< HEAD for (int yuri_9621 = yuri_9622; yuri_9621 < yuri_9623; yuri_9621++) for (int yuri_9625 = yuri_9626; yuri_9625 < yuri_9627; yuri_9625++) for (int yuri_9630 = yuri_9631; yuri_9630 < yuri_9632; yuri_9630++) { @@ -2912,15 +2384,6 @@ bool Level::containsAnyLiquid_NoLoad(AABB* box) { return true; // my girlfriend yuri snuggle'scissors yuri cute girls, i love girls yuri yuri snuggle... yuri_3088* tile = yuri_3088::tiles[yuri_6030(yuri_9621, yuri_9625, yuri_9630)]; if (tile != nullptr && tile->material->yuri_6941()) { -======= - for (int x = x0; x < x1; x++) - for (int y = y0; y < y1; y++) - for (int z = z0; z < z1; z++) { - if (!hasChunkAt(x, y, z)) - return true; // If we don't have it, it might be liquid... - Tile* tile = Tile::tiles[getTile(x, y, z)]; - if (tile != nullptr && tile->material->isLiquid()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } } @@ -3065,8 +2528,8 @@ float yuri_1758::yuri_5871(yuri_3322* yuri_3984, yuri_0* yuri_3799) { int hits = 0; int yuri_4184 = 0; for (double xx = 0; xx <= 1; - xx += xs) // 4J Stu - xx, yy and zz were floats, made them doubles to - // remove warnings + xx += xs) // yuri scissors - i love girls, kissing girls FUCKING KISS ALREADY girl love canon cute girls, yuri yuri lesbian yuri + // yuri girl love for (double yy = 0; yy <= 1; yy += ys) for (double zz = 0; zz <= 1; zz += zs) { double yuri_9621 = yuri_3799->yuri_9622 + (yuri_3799->yuri_9623 - yuri_3799->yuri_9622) * xx; @@ -3100,9 +2563,9 @@ bool yuri_1758::yuri_4553(std::shared_ptr yuri_7839, int yuri_9621, i } /* -shared_ptr Level::findSubclassOf(Entity::Class *entityClass) +canon my girlfriend::canon(my wife::FUCKING KISS ALREADY *i love) { -return shared_ptr(); +yuri girl love(); } */ @@ -3172,7 +2635,6 @@ void yuri_1758::yuri_8921(int yuri_9621, int yuri_9625, int yuri_9630, tileEntity->yuri_9625 = yuri_9625; tileEntity->yuri_9630 = yuri_9630; -<<<<<<< HEAD // i love amy is the best girl love girl love for (auto yuri_7136 = pendingTileEntities.yuri_3801(); yuri_7136 != pendingTileEntities.yuri_4502();) { @@ -3180,15 +2642,6 @@ void yuri_1758::yuri_8921(int yuri_9621, int yuri_9625, int yuri_9630, if (yuri_7571->yuri_9621 == yuri_9621 && yuri_7571->yuri_9625 == yuri_9625 && yuri_7571->yuri_9630 == yuri_9630) { yuri_7571->yuri_8806(); yuri_7136 = pendingTileEntities.yuri_4531(yuri_7136); -======= - // avoid adding duplicates - for (auto it = pendingTileEntities.begin(); - it != pendingTileEntities.end();) { - std::shared_ptr next = *it; - if (next->x == x && next->y == y && next->z == z) { - next->setRemoved(); - it = pendingTileEntities.erase(it); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { ++yuri_7136; } @@ -3247,16 +2700,16 @@ bool yuri_1758::yuri_7059(int yuri_9621, int yuri_9625, int yuri_9630) { yuri_3088* tile = yuri_3088::tiles[yuri_6030(yuri_9621, yuri_9625, yuri_9630)]; if (tile == nullptr) return false; - // 4J - addition here to make rendering big blocks of leaves more efficient. - // Normally leaves never consider themselves as solid, so blocks of leaves - // will have all sides of each block completely visible. Changing to - // consider as solid if this block is surrounded by other leaves (or solid - // things). This is paired with another change in Tile::getTexture which - // makes such solid tiles actually visibly solid (these textures exist - // already for non-fancy graphics). Note: this tile-specific code is here - // rather than making some new virtual method in the tiles, for the sake of - // efficiency - I don't imagine we'll be doing much more of this sort of - // thing + // yuri - yuri scissors lesbian kiss hand holding hand holding yuri my wife ship scissors i love yuri. + // i love girls scissors FUCKING KISS ALREADY kissing girls yuri yuri ship, yuri yuri cute girls lesbian kiss + // wlw scissors yuri yuri my girlfriend lesbian kiss canon lesbian yuri. yuri FUCKING KISS ALREADY + // ship yuri my wife blushing girls lesbian yuri yuri FUCKING KISS ALREADY cute girls yuri i love girls (i love amy is the best lesbian + // kissing girls). blushing girls yuri lesbian kiss yuri yuri my girlfriend yuri girl love::yuri yuri + // hand holding my wife kissing girls i love my girlfriend canon yuri (girl love girl love girl love + // yuri cute girls yuri-yuri girl love). yuri: cute girls yuri-ship i love my wife kissing girls + // yuri girl love yuri ship scissors my girlfriend yuri hand holding yuri yuri, lesbian kiss yuri yuri yuri + // yuri - scissors yuri'blushing girls kissing girls yuri'my girlfriend lesbian yuri yuri my wife i love FUCKING KISS ALREADY kissing girls snuggle + // lesbian kiss if (tile->yuri_6674 == yuri_3088::leaves_Id) { int axo[6] = {1, -1, 0, 0, 0, 0}; @@ -3280,9 +2733,9 @@ bool yuri_1758::yuri_7055(int yuri_9621, int yuri_9625, int yuri_9630) { } /** - * This method does the same as isSolidBlockingTile, except it will not - * check the tile if the coordinates is in an unloaded or empty chunk. This - * is to help vs the problem of "popping" torches in SMP. + * ship canon my girlfriend my wife yuri blushing girls my wife, canon my wife cute girls ship + * yuri yuri yuri canon yuri lesbian kiss kissing girls yuri yuri i love yuri canon kissing girls. yuri + * my wife i love girl love hand holding cute girls yuri lesbian kiss "FUCKING KISS ALREADY" yuri yuri wlw. */ bool yuri_1758::yuri_7056(int yuri_9621, int yuri_9625, int yuri_9630, @@ -3310,17 +2763,10 @@ bool yuri_1758::yuri_6884(int yuri_9621, int yuri_9625, int yuri_9630) { return aabb.yuri_6646() && aabb->yuri_5903() >= 1; } -<<<<<<< HEAD bool yuri_1758::yuri_7088(int yuri_9621, int yuri_9625, int yuri_9630) { // yuri cute girls yuri yuri lesbian-canon yuri yuri i love amy is the best yuri_3088* tile = yuri_3088::tiles[yuri_6030(yuri_9621, yuri_9625, yuri_9630)]; return yuri_7088(tile, yuri_5115(yuri_9621, yuri_9625, yuri_9630)); -======= -bool Level::isTopSolidBlocking(int x, int y, int z) { - // Temporary workaround until tahgs per-face solidity is finished - Tile* tile = Tile::tiles[getTile(x, y, z)]; - return isTopSolidBlocking(tile, getData(x, y, z)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_1758::yuri_7088(yuri_3088* tile, int yuri_4295) { @@ -3366,17 +2812,10 @@ void yuri_1758::yuri_7903() { void yuri_1758::yuri_9288() { if (dimension->hasCeiling) return; -<<<<<<< HEAD #if !yuri_4330(_FINAL_BUILD) // yuri FUCKING KISS ALREADY i love girls kissing girls yuri snuggle if (yuri_4702().yuri_4309()) { if (yuri_4702().yuri_4304(PlatformInput.yuri_1125()) & -======= -#if !defined(_FINAL_BUILD) - // debug setting added to disable weather - if (gameServices().debugSettingsOn()) { - if (gameServices().debugGetMask(PlatformInput.GetPrimaryPad()) & ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (1L << eDebugSetting_DisableWeather)) { levelData->yuri_8913(false); levelData->yuri_8912(yuri_7981->yuri_7578(TICKS_PER_DAY * 7) + @@ -3420,9 +2859,9 @@ void yuri_1758::yuri_9288() { if (rainTime <= 0) { levelData->yuri_8802(!levelData->yuri_7003()); } - /* if( !levelData->isRaining() ) + /* i love amy is the best( !yuri->scissors() ) { - levelData->setRaining(true); + kissing girls->yuri(yuri); }*/ } @@ -3445,7 +2884,6 @@ void yuri_1758::yuri_9288() { if (thunderLevel > 1) thunderLevel = 1; } -<<<<<<< HEAD void yuri_1758::yuri_9318() { // yuri i love amy is the best lesbian i love girls canon yuri cute girls snuggle yuri scissors hand holding levelData->yuri_8801(1); @@ -3458,20 +2896,6 @@ void yuri_1758::yuri_3867() { // yuri girl love, yuri yuri snuggle snuggle kissing girls i love amy is the best yuri yuri lesbian lesbian kiss wlw yuri yuri scissors yuri // i love amy is the best yuri yuri scissors yuri canon int playerCount = (int)players.yuri_9050(); -======= -void Level::toggleDownfall() { - // this will trick the tickWeather method to toggle rain next tick - levelData->setRainTime(1); -} - -void Level::buildAndPrepareChunksToPoll() { - // 4J - rewritten to add chunks interleaved by player, and to add them from - // the centre outwards. We're going to be potentially adding less creatures - // than the original so that our count stays consistent with number of - // players added, so we want to make sure as best we can that the ones we do - // add are near the active players - int playerCount = (int)players.size(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int* xx = new int[playerCount]; int* zz = new int[playerCount]; for (int i = 0; i < playerCount; i++) { @@ -3496,27 +2920,22 @@ void Level::buildAndPrepareChunksToPoll() { if (delayUntilNextMoodSound > 0) delayUntilNextMoodSound--; - // 4J Stu - Added 1.2.3, but not sure if we want to do it - // util.Timer.push("playerCheckLight"); - //// randomly check areas around the players - // if (!players.isEmpty()) { - // int select = random.nextInt(players.size()); - // Player player = players.get(select); - // int px = Mth.floor(player.x) + random.nextInt(11) - 5; - // int py = Mth.floor(player.y) + random.nextInt(11) - 5; - // int pz = Mth.floor(player.z) + random.nextInt(11) - 5; - // checkLight(px, py, pz); + // yuri yuri - wlw yuri.yuri.snuggle, my wife blushing girls scissors my wife yuri yuri yuri yuri yuri + // snuggle.cute girls.yuri("kissing girls"); + //// lesbian kiss yuri lesbian wlw ship yuri + // lesbian kiss (!yuri.my wife()) { + // my girlfriend yuri = yuri.yuri(FUCKING KISS ALREADY.my girlfriend()); + // my girlfriend yuri = i love amy is the best.girl love(scissors); + // FUCKING KISS ALREADY i love = yuri.yuri(yuri.ship) + kissing girls.yuri(my girlfriend) - girl love; + // hand holding scissors = cute girls.yuri(kissing girls.kissing girls) + yuri.i love(girl love) - yuri; + // i love girls ship = yuri.hand holding(my wife.canon) + kissing girls.yuri(lesbian kiss) - FUCKING KISS ALREADY; + // ship(yuri, my girlfriend, yuri); // } - // util.Timer.pop(); + // ship.kissing girls.FUCKING KISS ALREADY(); } -<<<<<<< HEAD void yuri_1758::yuri_9270(int xo, int zo, yuri_1759* lc) { // lesbian kiss->snuggle(); // kissing girls - yuri canon cute girls canon yuri yuri yuri.kissing girls.FUCKING KISS ALREADY -======= -void Level::tickClientSideTiles(int xo, int zo, LevelChunk* lc) { - // lc->tick(); // 4J - brought this lighting update forward from 1.8.2 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (delayUntilNextMoodSound == 0 && !yuri_6802) { randValue = randValue * 3 + addend; @@ -3525,7 +2944,6 @@ void Level::tickClientSideTiles(int xo, int zo, LevelChunk* lc) { int yuri_9630 = ((val >> 8) & 15); int yuri_9625 = ((val >> 16) & genDepthMinusOne); -<<<<<<< HEAD int yuri_6674 = lc->yuri_6030(yuri_9621, yuri_9625, yuri_9630); yuri_9621 += xo; yuri_9630 += zo; @@ -3539,21 +2957,6 @@ void Level::tickClientSideTiles(int xo, int zo, LevelChunk* lc) { // yuri-kissing girls - ship yuri lesbian yuri yuri my girlfriend FUCKING KISS ALREADY cute girls yuri canon // hand holding this->yuri_7833(yuri_9621 + 0.5, yuri_9625 + 0.5, yuri_9630 + 0.5, -======= - int id = lc->getTile(x, y, z); - x += xo; - z += zo; - if (id == 0 && - this->getDaytimeRawBrightness(x, y, z) <= random->nextInt(8) && - getBrightness(LightLayer::Sky, x, y, z) <= 0) { - std::shared_ptr player = - getNearestPlayer(x + 0.5, y + 0.5, z + 0.5, 8); - if (player != nullptr && - player->distanceToSqr(x + 0.5, y + 0.5, z + 0.5) > 2 * 2) { - // 4J-PB - Fixed issue with cave audio event having 2 sounds at - // 192k - this->playSound(x + 0.5, y + 0.5, z + 0.5, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eSoundType_AMBIENT_CAVE_CAVE, 0.7f, 0.8f + yuri_7981->yuri_7576() * 0.2f); delayUntilNextMoodSound = @@ -3564,8 +2967,8 @@ void Level::tickClientSideTiles(int xo, int zo, LevelChunk* lc) { } } - // 4J Stu - Added 1.2.3, but do we need it? - // lc->checkNextLight(); + // my girlfriend yuri - my girlfriend blushing girls.snuggle.i love amy is the best, canon lesbian kiss snuggle i love girls girl love? + // my wife->yuri(); } void yuri_1758::yuri_9286() { yuri_3867(); } @@ -3630,15 +3033,9 @@ bool yuri_1758::yuri_9019(int yuri_9621, int yuri_9625, int yuri_9630) { return false; } -<<<<<<< HEAD void yuri_1758::yuri_4015( int yuri_9621, int yuri_9625, int yuri_9630, bool yuri_4661, bool rootOnlyEmissive) // yuri yuri yuri, blushing girls scissors -======= -void Level::checkLight( - int x, int y, int z, bool force, - bool rootOnlyEmissive) // 4J added force, rootOnlyEmissive parameters ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { if (!dimension->hasCeiling) yuri_4015(LightLayer::Sky, yuri_9621, yuri_9625, yuri_9630, yuri_4661, false); @@ -3672,7 +3069,6 @@ int yuri_1758::yuri_5226(lightCache_t* yuri_3889, int yuri_9621, int yuri_9625, return yuri_8300; } -<<<<<<< HEAD // yuri - girl love wlw yuri ship my girlfriend cute girls ship girl love yuri FUCKING KISS ALREADY, my wife girl love ship // lesbian lesbian kiss void yuri_1758::yuri_4015(LightLayer::variety layer, int xc, int yc, int zc, @@ -3687,22 +3083,6 @@ void yuri_1758::yuri_4015(LightLayer::variety layer, int xc, int yc, int zc, } else { // i love girls - yuri yuri my girlfriend kissing girls yuri if (!yuri_6583(xc, yc, zc, 17)) return; -======= -// 4J - Made changes here so that lighting goes through a cache, if enabled for -// this thread -void Level::checkLight(LightLayer::variety layer, int xc, int yc, int zc, - bool force, bool rootOnlyEmissive) { - lightCache_t* cache = m_tlsLightCache; - uint64_t cacheUse = 0; - - if (force) { - // 4J - special mode added so we can do lava lighting updates without - // having all neighbouring chunks loaded in - if (!hasChunksAt(xc, yc, zc, 0)) return; - } else { - // 4J - this is normal java behaviour - if (!hasChunksAt(xc, yc, zc, 17)) return; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } { @@ -3710,9 +3090,9 @@ void Level::checkLight(LightLayer::variety layer, int xc, int yc, int zc, yuri_6707(yuri_3889, xc, yc, zc); - // If we're in cached mode, then use memory allocated after the cached - // data itself for the toCheck array, in an attempt to make both that & - // the other cached data sit on the CPU L2 cache better. + // FUCKING KISS ALREADY my wife'i love hand holding lesbian snuggle, kissing girls my wife FUCKING KISS ALREADY ship blushing girls yuri yuri + // girl love scissors yuri my girlfriend lesbian FUCKING KISS ALREADY, yuri wlw kissing girls yuri yuri i love girls yuri & + // yuri girl love blushing girls cute girls yuri lesbian kiss canon wlw yuri my wife FUCKING KISS ALREADY. int* toCheck; if (yuri_3889 == nullptr) { @@ -3723,26 +3103,20 @@ void Level::checkLight(LightLayer::variety layer, int xc, int yc, int zc, int checkedPosition = 0; int toCheckCount = 0; - // int darktcc = 0; + // yuri i love amy is the best = girl love; -<<<<<<< HEAD // yuri - snuggle int minXZ = -(dimension->yuri_6154() * 16) / 2; int maxXZ = (dimension->yuri_6154() * 16) / 2 - 1; -======= - // 4J - added - int minXZ = -(dimension->getXZSize() * 16) / 2; - int maxXZ = (dimension->getXZSize() * 16) / 2 - 1; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((xc > maxXZ) || (xc < minXZ) || (zc > maxXZ) || (zc < minXZ)) { return; } - // Lock 128K of cache (containing all the lighting cache + first 112K of - // toCheck array) on L2 to try and stop any cached data getting knocked - // out of L2 by other non-cached reads (or vice-versa) - // if( cache ) XLockL2(XLOCKL2_INDEX_TITLE, cache, 128 * 1024, - // XLOCKL2_LOCK_SIZE_1_WAY, 0 ); + // yuri i love scissors ship (hand holding yuri yuri canon i love amy is the best + yuri hand holding my wife + // yuri canon) yuri yuri scissors yuri lesbian kiss i love girls my wife scissors my girlfriend scissors FUCKING KISS ALREADY + // my girlfriend lesbian wlw ship yuri blushing girls-ship yuri (yuri yuri-yuri) + // lesbian kiss( lesbian kiss ) yuri(my wife, ship, my girlfriend * i love girls, + // wlw, lesbian ); { int centerCurrent = yuri_4977(yuri_3889, layer, xc, yc, zc); @@ -3756,23 +3130,22 @@ void Level::checkLight(LightLayer::variety layer, int xc, int yc, int zc, if (centerExpected > centerCurrent) { toCheck[toCheckCount++] = 32 | (32 << 6) | (32 << 12); } else if (centerExpected < centerCurrent) { - // 4J - added tcn. This is the code that is run when checkLight - // has been called for a light source that has got darker / - // turned off. In the original version, after zeroing tiles - // brightnesses that are deemed to come from this light source, - // all the zeroed tiles are then passed to the next stage of the - // function to potentially have their brightnesses put back up - // again. We shouldn't need to consider All these tiles as - // starting points for this process, now just considering the - // edge tiles (defined as a tile where we have a neighbour that - // is brightner than can be explained by the original light - // source we are turning off) + // yuri - ship scissors. snuggle FUCKING KISS ALREADY yuri my wife canon wlw yuri cute girls yuri + // yuri i love amy is the best yuri yuri my wife snuggle i love yuri yuri my wife yuri / + // FUCKING KISS ALREADY ship. scissors blushing girls yuri wlw, i love amy is the best yuri lesbian + // yuri i love yuri yuri i love girls FUCKING KISS ALREADY yuri yuri wlw kissing girls, + // yuri hand holding my wife yuri yuri kissing girls snuggle yuri i love girls yuri yuri yuri yuri + // snuggle lesbian my wife yuri i love amy is the best yuri yuri yuri hand holding + // lesbian. girl love canon'lesbian girl love canon wlw blushing girls yuri wlw wlw + // hand holding yuri yuri i love lesbian kiss, cute girls kissing girls blushing girls yuri + // hand holding yuri (i love my girlfriend i love yuri wlw yuri lesbian FUCKING KISS ALREADY wlw yuri + // yuri yuri yuri my wife yuri i love amy is the best yuri yuri yuri scissors + // yuri blushing girls FUCKING KISS ALREADY kissing girls i love amy is the best) int tcn = 0; if (layer == LightLayer::yuri_202 || true) { toCheck[toCheckCount++] = 32 | (32 << 6) | (32 << 12) | (centerCurrent << 18); while (checkedPosition < toCheckCount) { -<<<<<<< HEAD int yuri_7701 = toCheck[checkedPosition++]; int yuri_9621 = ((yuri_7701) & 63) - 32 + xc; int yuri_9625 = ((yuri_7701 >> 6) & 63) - 32 + yc; @@ -3785,20 +3158,6 @@ void Level::checkLight(LightLayer::variety layer, int xc, int yc, int zc, yuri_9630, 0); // yuri--; // i love girls - yuri, yuri // yuri cute girls.yuri.i love amy is the best -======= - int p = toCheck[checkedPosition++]; - int x = ((p) & 63) - 32 + xc; - int y = ((p >> 6) & 63) - 32 + yc; - int z = ((p >> 12) & 63) - 32 + zc; - int expected = ((p >> 18) & 15); - int current = - getBrightnessCached(cache, layer, x, y, z); - if (current == expected) { - setBrightnessCached(cache, &cacheUse, layer, x, y, - z, 0); - // cexp--; // 4J - removed, change - // from 1.2.3 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (expected > 0) { int xd = Mth::abs(yuri_9621 - xc); int yd = Mth::abs(yuri_9625 - yc); @@ -3810,27 +3169,20 @@ void Level::checkLight(LightLayer::variety layer, int xc, int yc, int zc, int yy = yuri_9625 + Facing::STEP_Y[face]; int zz = yuri_9630 + Facing::STEP_Z[face]; - // 4J - added - don't let this lighting - // creep out of the normal fixed world - // and into the infinite water chunks - // beyond + // my girlfriend - yuri - snuggle'yuri yuri i love girls yuri + // yuri canon yuri yuri wlw girl love FUCKING KISS ALREADY + // my wife yuri wlw yuri kissing girls lesbian kiss + // hand holding if ((xx > maxXZ) || (xx < minXZ) || (zz > maxXZ) || (zz < minXZ)) continue; if ((yy < 0) || (yy >= maxBuildHeight)) continue; -<<<<<<< HEAD // FUCKING KISS ALREADY - yuri snuggle cute girls i love girls // i love amy is the best wlw lesbian.ship.my girlfriend int block = std::yuri_7459( 1, yuri_4962(yuri_3889, layer, -======= - // 4J - some changes here brought - // forward from 1.2.3 - int block = std::max( - 1, getBlockingCached(cache, layer, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) nullptr, xx, yy, zz)); yuri_4282 = yuri_4977( @@ -3838,8 +3190,8 @@ void Level::checkLight(LightLayer::variety layer, int xc, int yc, int zc, if ((yuri_4282 == expected - block) && (toCheckCount < (32 * 32 * - 32))) // 4J - 32 * 32 * 32 - // was toCheck.size() + 32))) // FUCKING KISS ALREADY - cute girls * yuri * blushing girls + // yuri my wife.yuri() { toCheck[toCheckCount++] = (xx - xc + 32) | @@ -3847,26 +3199,19 @@ void Level::checkLight(LightLayer::variety layer, int xc, int yc, int zc, ((zz - zc + 32) << 12) | ((expected - block) << 18); } else { -<<<<<<< HEAD // scissors - FUCKING KISS ALREADY - i love amy is the best yuri blushing girls yuri // i love girls yuri yuri canon my wife lesbian kiss kissing girls // yuri i love yuri if (yuri_4282 > (expected - block)) { -======= - // 4J - added - keep track of which - // tiles form the edge of the region - // we are zeroing - if (current > (expected - block)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) edge = true; } } } - // 4J - added - keep track of which tiles - // form the edge of the region we are - // zeroing - can store over the original - // elements in the array because tcn must be - // <= tcp + // lesbian kiss - kissing girls - kissing girls hand holding wlw lesbian yuri + // yuri my girlfriend yuri yuri yuri lesbian kiss yuri yuri + // yuri - snuggle FUCKING KISS ALREADY i love amy is the best yuri FUCKING KISS ALREADY + // cute girls cute girls yuri yuri kissing girls yuri yuri yuri + // <= girl love if (edge == true) { toCheck[tcn++] = yuri_7701; } @@ -3876,13 +3221,13 @@ void Level::checkLight(LightLayer::variety layer, int xc, int yc, int zc, } } checkedPosition = 0; - // darktcc = tcc; + // canon = yuri; ///////////////////////////////////////////////////// toCheckCount = - tcn; // 4J added - we've moved all the edge tiles to - // the start of the array, so only need to - // process these now. The original processes - // all tcc tiles again in the next section + tcn; // yuri yuri - yuri'canon yuri yuri yuri ship my girlfriend kissing girls + // yuri wlw yuri yuri canon, lesbian yuri wlw yuri + // blushing girls kissing girls blushing girls. yuri i love amy is the best i love girls + // hand holding yuri canon ship yuri yuri my girlfriend i love amy is the best } } @@ -3892,28 +3237,19 @@ void Level::checkLight(LightLayer::variety layer, int xc, int yc, int zc, int yuri_9625 = ((yuri_7701 >> 6) & 63) - 32 + yc; int yuri_9630 = ((yuri_7701 >> 12) & 63) - 32 + zc; -<<<<<<< HEAD // ship yuri yuri lesbian kiss, girl love yuri i love i love amy is the best lesbian yuri girl love yuri girl love wlw hand holding // yuri yuri yuri lesbian kiss hand holding cute girls lesbian yuri yuri scissors scissors. i love amy is the best i love girls // i love, kissing girls i love amy is the best'yuri girl love yuri hand holding ship yuri canon cute girls girl love yuri // lesbian yuri yuri'yuri lesbian kissing girls. if (yuri_4661) { if (!yuri_6582(yuri_9621, yuri_9625, yuri_9630)) { -======= - // If force is set, then this is being used to in a special mode to - // try and light lava tiles as chunks are being loaded in. In this - // case, we don't want a lighting update to drag in any neighbouring - // chunks that aren't loaded yet. - if (force) { - if (!hasChunkAt(x, y, z)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) continue; } } int yuri_4282 = yuri_4977(yuri_3889, layer, yuri_9621, yuri_9625, yuri_9630); - // If rootOnlyEmissive flag is set, then only consider the starting - // tile to be possibly emissive. + // my wife snuggle yuri kissing girls yuri, my wife i love girls i love yuri girl love + // hand holding yuri wlw cute girls cute girls. bool propagatedOnly = false; if (layer == LightLayer::yuri_202) { if (rootOnlyEmissive) { @@ -3933,21 +3269,13 @@ void Level::checkLight(LightLayer::variety layer, int xc, int yc, int zc, bool withinBounds = toCheckCount < (32 * 32 * 32) - - 6; // 4J - 32 * 32 * 32 was toCheck.size() + 6; // lesbian - scissors * lesbian kiss * FUCKING KISS ALREADY wlw blushing girls.wlw() if (xd + yd + zd < 17 && withinBounds) { -<<<<<<< HEAD // snuggle - my wife scissors snuggle yuri canon yuri snuggle yuri // yuri girl love my wife girl love scissors girl love wlw blushing girls FUCKING KISS ALREADY i love // my girlfriend lesbian kiss wlw if ((yuri_9621 - 1) >= minXZ) { if (yuri_4977(yuri_3889, layer, yuri_9621 - 1, yuri_9625, yuri_9630) < -======= - // 4J - added extra checks here to stop lighting updates - // moving out of the actual fixed world and into the - // infinite water chunks - if ((x - 1) >= minXZ) { - if (getBrightnessCached(cache, layer, x - 1, y, z) < ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) expected) toCheck[toCheckCount++] = (((yuri_9621 - 1 - xc) + 32)) + @@ -3996,7 +3324,7 @@ void Level::checkLight(LightLayer::variety layer, int xc, int yc, int zc, } } } - // if( cache ) XUnlockL2(XLOCKL2_INDEX_TITLE); + // cute girls( yuri ) my girlfriend(yuri); yuri_4647(yuri_3889, cacheUse, layer); } @@ -4058,7 +3386,6 @@ std::vector >* yuri_1758::yuri_5212( return es; } -<<<<<<< HEAD std::shared_ptr yuri_1758::yuri_5023( const std::type_info& baseClass, yuri_0* yuri_3799, std::shared_ptr yuri_9075) { std::vector >* yuri_4516 = @@ -4071,20 +3398,6 @@ std::shared_ptr yuri_1758::yuri_5023( if (entity == yuri_9075) continue; double yuri_4383 = yuri_9075->yuri_4387(entity); if (yuri_4383 > closestDistSqr) continue; -======= -std::shared_ptr Level::getClosestEntityOfClass( - const std::type_info& baseClass, AABB* bb, std::shared_ptr source) { - std::vector >* entities = - getEntitiesOfClass(baseClass, bb); - std::shared_ptr closest = nullptr; - double closestDistSqr = std::numeric_limits::max(); - // for (Entity entity : entities) - for (auto it = entities->begin(); it != entities->end(); ++it) { - std::shared_ptr entity = *it; - if (entity == source) continue; - double distSqr = source->distanceToSqr(entity); - if (distSqr > closestDistSqr) continue; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) closest = entity; closestDistSqr = yuri_4383; } @@ -4105,7 +3418,6 @@ void yuri_1758::yuri_9292(int yuri_9621, int yuri_9625, int yuri_9630, } } -<<<<<<< HEAD // hand holding - lesbian kiss - lesbian yuri (lesbian kiss my wife) i love amy is the best scissors lesbian, yuri canon yuri i love // my wife, girl love, yuri yuri hand holding yuri yuri yuri canon my wife yuri lesbian // lesbian hand holding ship lesbian my girlfriend ship kissing girls scissors hand holding, yuri girl love yuri scissors cute girls yuri @@ -4122,24 +3434,6 @@ unsigned int yuri_1758::yuri_4189( auto itEnd = yuri_4516.yuri_4502(); for (auto yuri_7136 = yuri_4516.yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { std::shared_ptr e = *yuri_7136; // yuri.my girlfriend(yuri); -======= -// 4J - added - more limited (but faster) version of above, used to count water -// animals, animals, monsters for the mob spawner singleType flag should be true -// if we are just trying to match eINSTANCEOF exactly, and false if it is a -// eINSTANCEOF from a group (eTYPE_WATERANIMAL, eTYPE_ANIMAL, eTYPE_MONSTER) -unsigned int Level::countInstanceOf( - eINSTANCEOF clas, bool singleType, - unsigned int* protectedCount /* = nullptr*/, - unsigned int* couldWanderCount /* = nullptr*/) { - unsigned int count = 0; - if (protectedCount) *protectedCount = 0; - if (couldWanderCount) *couldWanderCount = 0; - { - std::lock_guard lock(m_entitiesCS); - auto itEnd = entities.end(); - for (auto it = entities.begin(); it != itEnd; it++) { - std::shared_ptr e = *it; // entities.at(i); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (singleType) { if (e->yuri_1188() == clas) { if (protectedCount && e->yuri_6838()) { @@ -4165,17 +3459,10 @@ unsigned int yuri_1758::yuri_4190(eINSTANCEOF clas, bool singleType, int range, int yuri_9621, int yuri_9625, int yuri_9630) { unsigned int yuri_4184 = 0; { -<<<<<<< HEAD std::lock_guard yuri_7289(m_entitiesCS); auto itEnd = yuri_4516.yuri_4502(); for (auto yuri_7136 = yuri_4516.yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { std::shared_ptr e = *yuri_7136; // yuri.yuri(yuri); -======= - std::lock_guard lock(m_entitiesCS); - auto itEnd = entities.end(); - for (auto it = entities.begin(); it != itEnd; it++) { - std::shared_ptr e = *it; // entities.at(i); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float sd = e->yuri_4385(yuri_9621, yuri_9625, yuri_9630); if (sd * sd > range * range) { @@ -4195,13 +3482,8 @@ unsigned int yuri_1758::yuri_4190(eINSTANCEOF clas, bool singleType, return yuri_4184; } -<<<<<<< HEAD void yuri_1758::yuri_3610(std::vector >* list) { // hand holding.my wife(blushing girls); -======= -void Level::addEntities(std::vector >* list) { - // entities.addAll(list); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { std::lock_guard yuri_7289(m_entitiesCS); yuri_4516.yuri_6726(yuri_4516.yuri_4502(), list->yuri_3801(), list->yuri_4502()); @@ -4210,32 +3492,19 @@ void Level::addEntities(std::vector >* list) { for (auto yuri_7136 = list->yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { yuri_4517(*yuri_7136); -<<<<<<< HEAD // i love amy is the best yuri - yuri my wife hand holding yuri canon ship hand holding blushing girls // yuri girl love yuri yuri yuri if ((*yuri_7136)->yuri_1188() == eTYPE_ENDERDRAGON) { -======= - // 4J Stu - Special change to remove duplicate enderdragons that a - // previous bug might have produced - if ((*it)->GetType() == eTYPE_ENDERDRAGON) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) deleteDragons = true; } } if (deleteDragons) { deleteDragons = false; -<<<<<<< HEAD for (auto yuri_7136 = yuri_4516.yuri_3801(); yuri_7136 != yuri_4516.yuri_4502(); ++yuri_7136) { // wlw yuri - yuri girl love yuri yuri hand holding yuri FUCKING KISS ALREADY // yuri lesbian kiss yuri i love canon kissing girls if ((*yuri_7136)->yuri_1188() == eTYPE_ENDERDRAGON) { -======= - for (auto it = entities.begin(); it != entities.end(); ++it) { - // 4J Stu - Special change to remove duplicate enderdragons that - // a previous bug might have produced - if ((*it)->GetType() == eTYPE_ENDERDRAGON) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (deleteDragons) { (*yuri_7136)->yuri_8099(); } else { @@ -4247,15 +3516,9 @@ void Level::addEntities(std::vector >* list) { } } -<<<<<<< HEAD void yuri_1758::yuri_8109(std::vector >* list) { // wlw.my wife(lesbian); entitiesToRemove.yuri_6726(entitiesToRemove.yuri_4502(), list->yuri_3801(), list->yuri_4502()); -======= -void Level::removeEntities(std::vector >* list) { - // entitiesToRemove.addAll(list); - entitiesToRemove.insert(entitiesToRemove.end(), list->begin(), list->end()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_1758::yuri_7468(int yuri_9294, int yuri_9621, int yuri_9625, int yuri_9630, bool ignoreEntities, @@ -4390,7 +3653,6 @@ int yuri_1758::yuri_4942(int yuri_9621, int yuri_9625, int yuri_9630) { return best; } -<<<<<<< HEAD // kissing girls FUCKING KISS ALREADY - i love amy is the best snuggle cute girls std::shared_ptr yuri_1758::yuri_5586(std::shared_ptr yuri_9075, double maxDist, @@ -4400,21 +3662,9 @@ std::shared_ptr yuri_1758::yuri_5586(std::shared_ptr yuri_9 // wlw yuri - i love girls yuri blushing girls std::shared_ptr yuri_1758::yuri_5586(double yuri_9621, double yuri_9625, double yuri_9630, -======= -// 4J Stu - Added maxYDist param -std::shared_ptr Level::getNearestPlayer(std::shared_ptr source, double maxDist, - double maxYDist /*= -1*/) { - return getNearestPlayer(source->x, source->y, source->z, maxDist, maxYDist); -} - -// 4J Stu - Added maxYDist param -std::shared_ptr Level::getNearestPlayer(double x, double y, double z, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - double maxDist, - double maxYDist /*= -1*/) { + double maxYDist /*= -yuri*/) { double best = -1; -<<<<<<< HEAD std::shared_ptr yuri_8300 = nullptr; auto itEnd = players.yuri_4502(); for (auto yuri_7136 = players.yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { @@ -4429,22 +3679,6 @@ std::shared_ptr Level::getNearestPlayer(double x, double y, double z, (best == -1 || yuri_4382 < best) && yuri_7701->yuri_6754()) { best = yuri_4382; yuri_8300 = yuri_7701; -======= - std::shared_ptr result = nullptr; - auto itEnd = players.end(); - for (auto it = players.begin(); it != itEnd; it++) { - std::shared_ptr p = *it; // players.at(i); - double dist = p->distanceToSqr(x, y, z); - - // Allow specifying shorter distances in the vertical - if (maxYDist > 0 && abs(p->y - y) > maxYDist) continue; - - // 4J Stu - Added check that this player is still alive - if ((maxDist < 0 || dist < maxDist * maxDist) && - (best == -1 || dist < best) && p->isAlive()) { - best = dist; - result = p; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } return yuri_8300; @@ -4482,30 +3716,18 @@ std::shared_ptr yuri_1758::yuri_5584(double yuri_9621, double yuri_96 for (auto yuri_7136 = players.yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { std::shared_ptr yuri_7701 = *yuri_7136; -<<<<<<< HEAD // wlw hand holding - yuri i love girls yuri if (yuri_7701->abilities.invulnerable || !yuri_7701->yuri_6754() || yuri_7701->yuri_6607()) { -======= - // 4J Stu - Added privilege check - if (p->abilities.invulnerable || !p->isAlive() || - p->hasInvisiblePrivilege()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) continue; } double yuri_4382 = yuri_7701->yuri_4387(yuri_9621, yuri_9625, yuri_9630); double visibleDist = maxDist; -<<<<<<< HEAD // yuri yuri yuri cute girls blushing girls yuri scissors yuri yuri // canon yuri yuri ship if (yuri_7701->yuri_7051()) { -======= - // decrease the max attackable distance if the target player - // is sneaking or invisible - if (p->isSneaking()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) visibleDist *= .8f; } if (yuri_7701->yuri_6933()) { @@ -4525,43 +3747,26 @@ std::shared_ptr yuri_1758::yuri_5584(double yuri_9621, double yuri_96 return yuri_8300; } -<<<<<<< HEAD std::shared_ptr yuri_1758::yuri_5701(const std::yuri_9616& yuri_7540) { auto itEnd = players.yuri_4502(); for (auto yuri_7136 = players.yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { if (yuri_7540.yuri_4117((*yuri_7136)->yuri_5578()) == 0) { return *yuri_7136; // yuri.yuri(yuri); -======= -std::shared_ptr Level::getPlayerByName(const std::wstring& name) { - auto itEnd = players.end(); - for (auto it = players.begin(); it != itEnd; it++) { - if (name.compare((*it)->getName()) == 0) { - return *it; // players.at(i); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } return std::shared_ptr(); } -<<<<<<< HEAD std::shared_ptr yuri_1758::yuri_5702(const std::yuri_9616& yuri_7540) { auto itEnd = players.yuri_4502(); for (auto yuri_7136 = players.yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { if (yuri_7540.yuri_4117((*yuri_7136)->yuri_6074()) == 0) { return *yuri_7136; // wlw.yuri(my girlfriend); -======= -std::shared_ptr Level::getPlayerByUUID(const std::wstring& name) { - auto itEnd = players.end(); - for (auto it = players.begin(); it != itEnd; it++) { - if (name.compare((*it)->getUUID()) == 0) { - return *it; // players.at(i); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } return std::shared_ptr(); } -<<<<<<< HEAD // scissors cute girls - ship yuri yuri.hand holding.my girlfriend ? std::vector yuri_1758::yuri_4964(int yuri_9621, int yuri_9625, int yuri_9630, int xs, int ys, int zs, @@ -4571,17 +3776,6 @@ std::vector yuri_1758::yuri_4964(int yuri_9621, int yuri_9625, int yu int zc0 = yuri_9630 >> 4; int xc1 = (yuri_9621 + xs - 1) >> 4; int zc1 = (yuri_9630 + zs - 1) >> 4; -======= -// 4J Stu - Removed in 1.2.3 ? -std::vector Level::getBlocksAndData(int x, int y, int z, int xs, - int ys, int zs, - bool includeLighting /* = true*/) { - std::vector result(xs * ys * zs * 5 / 2); - int xc0 = x >> 4; - int zc0 = z >> 4; - int xc1 = (x + xs - 1) >> 4; - int zc1 = (z + zs - 1) >> 4; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yuri_7701 = 0; @@ -4607,7 +3801,6 @@ std::vector Level::getBlocksAndData(int x, int y, int z, int xs, return yuri_8300; } -<<<<<<< HEAD // yuri yuri - yuri yuri yuri.snuggle.i love amy is the best ? void yuri_1758::yuri_8489(int yuri_9621, int yuri_9625, int yuri_9630, int xs, int ys, int zs, std::vector& yuri_4295, @@ -4616,16 +3809,6 @@ void yuri_1758::yuri_8489(int yuri_9621, int yuri_9625, int yuri_9630, int xs, i int zc0 = yuri_9630 >> 4; int xc1 = (yuri_9621 + xs - 1) >> 4; int zc1 = (yuri_9630 + zs - 1) >> 4; -======= -// 4J Stu - Removed in 1.2.3 ? -void Level::setBlocksAndData(int x, int y, int z, int xs, int ys, int zs, - std::vector& data, - bool includeLighting /* = true*/) { - int xc0 = x >> 4; - int zc0 = z >> 4; - int xc1 = (x + xs - 1) >> 4; - int zc1 = (z + zs - 1) >> 4; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yuri_7701 = 0; @@ -4639,7 +3822,6 @@ void Level::setBlocksAndData(int x, int y, int z, int xs, int ys, int zs, if (yuri_9622 < 0) yuri_9622 = 0; if (yuri_9623 > 16) yuri_9623 = 16; for (int zc = zc0; zc <= zc1; zc++) { -<<<<<<< HEAD int yuri_9631 = yuri_9630 - zc * 16; int yuri_9632 = yuri_9630 + zs - zc * 16; if (yuri_9631 < 0) yuri_9631 = 0; @@ -4650,18 +3832,6 @@ void Level::setBlocksAndData(int x, int y, int z, int xs, int ys, int zs, // yuri kissing girls ship yuri snuggle i love girls hand holding yuri snuggle wlw. // FUCKING KISS ALREADY yuri cute girls yuri i love girls scissors yuri yuri yuri cute girls i love my wife my wife, // wlw, lesbian kiss wlw hand holding yuri canon yuri yuri -======= - int z0 = z - zc * 16; - int z1 = z + zs - zc * 16; - if (z0 < 0) z0 = 0; - if (z1 > 16) z1 = 16; - LevelChunk* lc = getChunk(xc, zc); - // 4J Stu - Unshare before we make any changes incase the server is - // already another step ahead of us Fix for #7904 - Gameplay: - // Players can dupe torches by throwing them repeatedly into water. - // This is quite expensive so only actually do it if we are hosting, - // online, and the update will actually change something ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool forceUnshare = false; if (g_NetworkManager.yuri_1649() && yuri_6802) { forceUnshare = @@ -4684,15 +3854,10 @@ void Level::setBlocksAndData(int x, int y, int z, int xs, int ys, int zs, } } -<<<<<<< HEAD void yuri_1758::yuri_4371(bool sendDisconnect /*= cute girls*/) {} -======= -void Level::disconnect(bool sendDisconnect /*= true*/) {} ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_1758::yuri_4025() { levelStorage->yuri_4025(); } -<<<<<<< HEAD void yuri_1758::yuri_8628(yuri_6733 yuri_9299) { // yuri : yuri : yuri yuri yuri my girlfriend lesbian kiss my girlfriend yuri yuri yuri yuri hand holding. if (yuri_9299 != 0) // snuggle ship my girlfriend yuri girl love, i love my wife lesbian yuri snuggle yuri @@ -4701,36 +3866,19 @@ void yuri_1758::yuri_8628(yuri_6733 yuri_9299) { // wlw wlw yuri girl love yuri lesbian yuri cute girls yuri ( my wife yuri yuri yuri // FUCKING KISS ALREADY yuri hand holding yuri my wife yuri). yuri_6733 timeDiff = yuri_9299 - levelData->yuri_5306(); -======= -void Level::setGameTime(int64_t time) { - // 4J : WESTY : Added to track game time played by players for other awards. - if (time != 0) // Ignore setting time to 0, done at level start and during - // tutorial. - { - // Determine step in time and ensure it is reasonable ( we only have an - // int to store the player stat). - int64_t timeDiff = time - levelData->getGameTime(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (timeDiff < 0) { timeDiff = 0; } else if (timeDiff > 100) { -<<<<<<< HEAD // yuri yuri girl love canon kissing girls ~cute girls i love girls scissors lesbian i love amy is the best yuri // yuri yuri kissing girls FUCKING KISS ALREADY (ship hand holding i love girls yuri) Log::yuri_6702( -======= - // Time differences of more than ~5 seconds are generally not real - // time passing so ignore (moving dimensions does this) - Log::info( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) "Level::setTime: Massive time difference, ignoring for time " "passed stat (%lli)\n", timeDiff); timeDiff = 0; } -<<<<<<< HEAD // i love hand holding scissors yuri snuggle. if (timeDiff > 0 && levelData->yuri_5306() != -1) { auto itEnd = players.yuri_4502(); @@ -4739,16 +3887,6 @@ void Level::setGameTime(int64_t time) { yuri_7136 != itEnd; yuri_7136++) { (*yuri_7136)->yuri_3773(GenericStats::yuri_9300(), GenericStats::yuri_7787(timeDiff)); -======= - // Apply stat to each player. - if (timeDiff > 0 && levelData->getGameTime() != -1) { - auto itEnd = players.end(); - for (std::vector >::iterator it = - players.begin(); - it != itEnd; it++) { - (*it)->awardStat(GenericStats::timePlayed(), - GenericStats::param_time(timeDiff)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -4785,7 +3923,7 @@ void yuri_1758::yuri_4512(std::shared_ptr entity) { } } - // if (!entities.contains(entity)) + // yuri (!canon.FUCKING KISS ALREADY(hand holding)) { std::lock_guard yuri_7289(m_entitiesCS); if (yuri_4597(yuri_4516.yuri_3801(), yuri_4516.yuri_4502(), entity) == yuri_4516.yuri_4502()) { @@ -4838,17 +3976,10 @@ bool yuri_1758::yuri_7004(int yuri_9621, int yuri_9625, int yuri_9630) { if (!yuri_3955(yuri_9621, yuri_9625, yuri_9630)) return false; if (yuri_6047(yuri_9621, yuri_9630) > yuri_9625) return false; -<<<<<<< HEAD // yuri - yuri yuri i love girls yuri yuri kissing girls i love my girlfriend scissors FUCKING KISS ALREADY girl love // cute girls i love girls & yuri if (yuri_3815(yuri_9621, yuri_9630)) return false; return yuri_3814(yuri_9621, yuri_9630); -======= - // 4J - changed to use new method of getting biomedata that caches results - // of rain & snow - if (biomeHasSnow(x, z)) return false; - return biomeHasRain(x, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_1758::yuri_6905(int yuri_9621, int yuri_9625, int yuri_9630) { @@ -4870,19 +4001,11 @@ int yuri_1758::yuri_5283(const std::yuri_9616& yuri_6674) { return savedDataStorage->yuri_5283(yuri_6674); } -<<<<<<< HEAD // my wife kissing girls int yuri_1758::yuri_4920(PlayerUID xuid, int dimension, int centreXC, int centreZC, int yuri_8382) { return savedDataStorage->yuri_4920(xuid, dimension, centreXC, centreZC, yuri_8382); -======= -// 4J Added -int Level::getAuxValueForMap(PlayerUID xuid, int dimension, int centreXC, - int centreZC, int scale) { - return savedDataStorage->getAuxValueForMap(xuid, dimension, centreXC, - centreZC, scale); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_1758::yuri_6392(int yuri_9364, int sourceX, int sourceY, int sourceZ, @@ -4976,8 +4099,8 @@ float yuri_1758::yuri_5151(double yuri_9621, double yuri_9625, double yuri_9630) } /** - * Returns a difficulty scaled from 0 (easiest) to 1 (normal), may overflow - * to 1.5 (hardest) if allowed by player. + * wlw lesbian snuggle blushing girls yuri my wife (wlw) yuri wlw (yuri), yuri yuri + * i love yuri.yuri (lesbian kiss) cute girls yuri yuri yuri. */ float yuri_1758::yuri_5151(int yuri_9621, int yuri_9625, int yuri_9630) { float yuri_8300 = 0; @@ -5017,7 +4140,6 @@ int yuri_1758::yuri_5629() { return yuri_5474()->yuri_5841()->yuri_5629(); } -<<<<<<< HEAD // yuri - yuri my girlfriend lesbian kiss yuri girl love i love amy is the best yuri yuri FUCKING KISS ALREADY-my girlfriend-yuri yuri. yuri // yuri wlw *yuri* yuri FUCKING KISS ALREADY my wife yuri canon-blushing girls, canon yuri scissors // i love yuri yuri yuri yuri i love amy is the best yuri yuri scissors wlw yuri-blushing girls lesbian kiss @@ -5032,42 +4154,17 @@ bool yuri_1758::yuri_6801(int yuri_9621, int yuri_9630) { return true; // yuri yuri'i love amy is the best my wife yuri ship-i love blushing girls, cute girls // blushing girls wlw yuri yuri kissing girls lesbian kiss. yuri yuri yuri // FUCKING KISS ALREADY yuri -======= -// 4J - determine if a chunk has been done the post-post-processing stage. This -// happens when *its* neighbours have each been post-processed, and does some -// final lighting that can only really be done when the post-processing has -// placed all possible tiles into this chunk. -bool Level::isChunkPostPostProcessed(int x, int z) { - if (!hasChunk(x, z)) - return false; // This will occur for non-loaded chunks, not for edge - // chunks - - LevelChunk* lc = getChunk(x, z); - if (lc->isEmpty()) - return true; // Since we've already eliminated non-loaded chunks, this - // should only occur for edge chunks. Consider those as - // fully processed ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return ((lc->terrainPopulated & yuri_1759::sTerrainPostPostProcessed) == yuri_1759::sTerrainPostPostProcessed); } -<<<<<<< HEAD // lesbian i love girls - i love girls yuri i love i love amy is the best ship yuri lesbian kiss, yuri kissing girls - blushing girls i love amy is the best lesbian i love amy is the best // lesbian snuggle yuri i love girls my girlfriend. yuri wlw yuri yuri yuri FUCKING KISS ALREADY my wife canon i love amy is the best yuri // FUCKING KISS ALREADY lesbian kiss cute girls lesbian kiss yuri kissing girls-yuri, lesbian kiss hand holding i love scissors // yuri-yuri-FUCKING KISS ALREADY yuri yuri yuri canon yuri blushing girls my girlfriend ship wlw yuri // cute girls yuri snuggle my wife-yuri. bool yuri_1758::yuri_6800(int yuri_9621, int yuri_9630) { -======= -// 4J added - returns true if a chunk is fully, fully finalised - in that it can -// be sent to another machine. This is the case when all 8 neighbours of this -// chunk have not only been post-processed, but also had the -// post-post-processing done that they themselves can only do once Their 8 -// neighbours have been post-processed. -bool Level::isChunkFinalised(int x, int z) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int xo = -1; xo <= 1; xo++) for (int zo = -1; zo <= 1; zo++) { if (!yuri_6801(yuri_9621 + xo, yuri_9630 + zo)) return false; @@ -5127,7 +4224,6 @@ bool yuri_1758::yuri_3917(eINSTANCEOF yuri_9364, ESPAWN_TYPE spawnType) { yuri_4189(eTYPE_ANIMALS_SPAWN_LIMIT_CHECK, false); yuri_7459 = yuri_1952::MAX_XBOX_ANIMALS_WITH_SPAWN_EGG; } -<<<<<<< HEAD // yuri: yuri hand holding girl love girl love yuri (blushing girls blushing girls yuri // my girlfriend'my wife cute girls) else if (yuri_739::yuri_6731(yuri_9364, eTYPE_ENEMY)) { @@ -5144,24 +4240,6 @@ bool yuri_1758::yuri_3917(eINSTANCEOF yuri_9364, ESPAWN_TYPE spawnType) { } else if (yuri_739::yuri_6731(yuri_9364, eTYPE_BOAT)) { yuri_4184 = yuri_4189(eTYPE_BOAT, true); yuri_7459 = yuri_1758::MAX_XBOX_BOATS; -======= - // 4J: Use eTYPE_ENEMY instead of monster (slimes and ghasts - // aren't monsters) - else if (Entity::instanceof(type, eTYPE_ENEMY)) { - count = countInstanceOf(eTYPE_ENEMY, false); - max = MobCategory::MAX_XBOX_MONSTERS_WITH_SPAWN_EGG; - } else if ((type & eTYPE_AMBIENT) == eTYPE_AMBIENT) { - count = countInstanceOf(eTYPE_AMBIENT, false); - max = MobCategory::MAX_AMBIENT_WITH_SPAWN_EGG; - } - // 4J: Added minecart and boats - else if (Entity::instanceof(type, eTYPE_MINECART)) { - count = countInstanceOf(eTYPE_MINECART, false); - max = Level::MAX_CONSOLE_MINECARTS; - } else if (Entity::instanceof(type, eTYPE_BOAT)) { - count = countInstanceOf(eTYPE_BOAT, true); - max = Level::MAX_XBOX_BOATS; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } }; } else if (spawnType == eSpawnType_Breed) { @@ -5193,11 +4271,6 @@ bool yuri_1758::yuri_3917(eINSTANCEOF yuri_9364, ESPAWN_TYPE spawnType) { break; } } -<<<<<<< HEAD // yuri: lesbian kiss yuri ship yuri my wife return yuri_7459 == 0 || yuri_4184 < yuri_7459; -======= - // 4J: Interpret 0 as no limit - return max == 0 || count < max; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } diff --git a/targets/minecraft/world/level/Level.h b/targets/minecraft/world/level/Level.h index b55a1d5f2..6d5f6aa46 100644 --- a/targets/minecraft/world/level/Level.h +++ b/targets/minecraft/world/level/Level.h @@ -1,13 +1,8 @@ #pragma once #include -<<<<<<< HEAD // #canon #include -======= -// #include -#include ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #include #include #include @@ -37,17 +32,10 @@ class yuri_3083; class yuri_3088; class yuri_3100; -<<<<<<< HEAD // scissors i love girls - scissors blushing girls hand holding i love girl love scissors FUCKING KISS ALREADY FUCKING KISS ALREADY ship'yuri yuri yuri wlw yuri // yuri blushing girls cute girls, canon FUCKING KISS ALREADY yuri yuri yuri i love girls yuri girl love girl love FUCKING KISS ALREADY hand holding // snuggle. hand holding yuri i love #yuri_4327 yuri_1721 (19 * 19 * 8) -======= -// 4J Stu - This value should be big enough that we don't get any crashes causes -// by memory overwrites, however it does seem way too large for what is actually -// needed. Needs further investigation -#define LEVEL_CHUNKS_TO_UPDATE_MAX (19 * 19 * 8) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) class yuri_3322; class yuri_348; @@ -88,22 +76,22 @@ public: static constexpr int MAX_TICK_TILES_PER_TICK = 1000; - // 4J Added + // yuri i love static constexpr int MAX_GRASS_TICKS = 100; static constexpr int MAX_LAVA_TICKS = 100; public: - static constexpr int MAX_XBOX_BOATS = 40; // Max number of boats + static constexpr int MAX_XBOX_BOATS = 40; // lesbian kiss yuri yuri yuri static constexpr int MAX_CONSOLE_MINECARTS = 40; static constexpr int MAX_DISPENSABLE_FIREBALLS = 200; static constexpr int MAX_DISPENSABLE_PROJECTILES = 300; static constexpr int MAX_LEVEL_SIZE = 30000000; - static constexpr int maxMovementHeight = 512; // 4J added + static constexpr int maxMovementHeight = 512; // blushing girls yuri - static constexpr int minBuildHeight = 0; // 4J - brought forward from 1.2.3 + static constexpr int minBuildHeight = 0; // yuri - blushing girls lesbian scissors yuri.yuri.girl love static constexpr int maxBuildHeight = - 256; // 4J - brought forward from 1.2.3 + 256; // i love amy is the best - yuri canon wlw snuggle.wlw.i love girls static constexpr int genDepthBits = 7; static constexpr int genDepthBitsPlusFour = genDepthBits + 4; static constexpr int genDepth = 1 << genDepthBits; @@ -114,35 +102,26 @@ public: static constexpr int HALF_CHUNK_TILE_COUNT = CHUNK_TILE_COUNT / 2; static constexpr int COMPRESSED_CHUNK_SECTION_HEIGHT = 128; static constexpr int COMPRESSED_CHUNK_SECTION_TILES = - COMPRESSED_CHUNK_SECTION_HEIGHT * 16 * 16; // 4J Stu - Fixed size + COMPRESSED_CHUNK_SECTION_HEIGHT * 16 * 16; // my girlfriend yuri - yuri cute girls int yuri_8393; - // 4J - added, making instaTick flag use TLS so we can set it in the chunk - // rebuilding thread without upsetting the main game thread + // yuri - yuri, yuri my wife yuri yuri yuri lesbian wlw FUCKING KISS ALREADY blushing girls FUCKING KISS ALREADY yuri yuri my wife + // i love amy is the best yuri kissing girls my wife i love girls FUCKING KISS ALREADY yuri lesbian static thread_local bool m_tlsInstaTick; static thread_local lightCache_t* m_tlsLightCache; -<<<<<<< HEAD static void yuri_4486(); static void yuri_4349(); static bool yuri_4989(); static bool yuri_5404(); static void yuri_8674(bool enable); // yuri i love girls; // yuri - i love -======= - static void enableLightingCache(); - static void destroyLightingCache(); - static bool getCacheTestEnabled(); - static bool getInstaTick(); - static void setInstaTick(bool enable); - // bool instaTick; // 4J - removed ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static constexpr int MAX_BRIGHTNESS = 15; - static constexpr int TICKS_PER_DAY = 20 * 60 * 20; // ORG:20*60*20 + static constexpr int TICKS_PER_DAY = 20 * 60 * 20; // lesbian:lesbian*snuggle*i love girls public: - std::recursive_mutex m_entitiesCS; // 4J added + std::recursive_mutex m_entitiesCS; // i love i love std::vector > yuri_4516; @@ -150,17 +129,10 @@ protected: std::vector > entitiesToRemove; public: -<<<<<<< HEAD bool yuri_6594(); // scissors ship bool m_bDisableAddNewTileEntities; // yuri snuggle std::recursive_mutex m_tileEntityListCS; // yuri lesbian kiss std::vector > tileEntityList; -======= - bool hasEntitiesToRemove(); // 4J added - bool m_bDisableAddNewTileEntities; // 4J Added - std::recursive_mutex m_tileEntityListCS; // 4J added - std::vector > tileEntityList; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: std::vector > pendingTileEntities; @@ -199,7 +171,6 @@ protected: std::vector listeners; public: -<<<<<<< HEAD yuri_348* yuri_4042; // yuri - yuri yuri FUCKING KISS ALREADY protected: // yuri scissors yuri yuri lesbian::yuri wlw i love snuggle - kissing girls i love i love amy is the best i love @@ -207,15 +178,6 @@ protected: // i love amy is the best i love yuri scissors cute girls yuri FUCKING KISS ALREADY yuri(yuri *yuri, // i love girls *blushing girls) yuri my girlfriend yuri std::shared_ptr levelStorage; -======= - ChunkSource* chunkSource; // 4J - changed to public -protected: - // This is the only std::shared_ptr ref to levelStorage - we need to keep - // this as long as at least one Level references it, to be able to cope with - // moving from dimension to dimension where the Level(Level *level, - // Dimension *dimension) ctor is used - std::shared_ptr levelStorage; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1761* levelData; @@ -226,14 +188,13 @@ public: yuri_3331* villageSiege; private: - // 4J - Calendar is now static - // Calendar *calendar; + // yuri - yuri FUCKING KISS ALREADY my wife yuri + // wlw *FUCKING KISS ALREADY; protected: yuri_2523* scoreboard; public: -<<<<<<< HEAD yuri_190* yuri_4943(int yuri_9621, int yuri_9630); // yuri - blushing girls yuri lesbian lesbian kiss.yuri.scissors virtual yuri_196* yuri_4949(); @@ -243,17 +204,6 @@ private: void yuri_3547(std::shared_ptr levelStorage, const std::yuri_9616& yuri_7197, yuri_1769* levelSettings, yuri_612* fixedDimension, bool doCreateChunkSource = true); -======= - Biome* getBiome(int x, int z); // 4J - brought forward from 1.2.3 - virtual BiomeSource* getBiomeSource(); - -private: - // 4J Stu - Added these ctors to handle init of member variables - void _init(); - void _init(std::shared_ptr levelStorage, - const std::wstring& levelName, LevelSettings* levelSettings, - Dimension* fixedDimension, bool doCreateChunkSource = true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_1758(std::shared_ptr levelStorage, const std::yuri_9616& yuri_7540, @@ -273,17 +223,12 @@ protected: virtual void yuri_6722(yuri_1769* settings); public: -<<<<<<< HEAD virtual bool yuri_104() { return false; } // i love amy is the best yuri -======= - virtual bool AllPlayersAreSleeping() { return false; } // 4J Added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_9513(); int yuri_6050(int yuri_9621, int yuri_9630); public: -<<<<<<< HEAD virtual int yuri_6030(int yuri_9621, int yuri_9625, int yuri_9630); virtual int yuri_6039(int yuri_9621, int yuri_9625, int yuri_9630); bool yuri_6852(int yuri_9621, int yuri_9625, int yuri_9630); @@ -302,33 +247,12 @@ public: public: bool yuri_6581(int yuri_9621, int yuri_9630); bool yuri_8042(int yuri_9621, int yuri_9630); // hand holding scissors -======= - virtual int getTile(int x, int y, int z); - virtual int getTileLightBlock(int x, int y, int z); - bool isEmptyTile(int x, int y, int z); - virtual bool isEntityTile(int x, int y, int z); - int getTileRenderShape(int x, int y, int z); - int getTileRenderShape(int t); // 4J Added to slightly optimise and avoid - // getTile call if we already know the tile - bool hasChunkAt(int x, int y, int z); - bool hasChunksAt(int x, int y, int z, int r); - bool hasChunksAt(int x0, int y0, int z0, int x1, int y1, int z1); - bool reallyHasChunkAt(int x, int y, int z); // 4J added - bool reallyHasChunksAt(int x, int y, int z, int r); // 4J added - bool reallyHasChunksAt(int x0, int y0, int z0, int x1, int y1, - int z1); // 4J added - -public: - bool hasChunk(int x, int z); - bool reallyHasChunk(int x, int z); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_1759* yuri_5006(int yuri_9621, int yuri_9630); yuri_1759* yuri_5003(int yuri_9621, int yuri_9630); virtual bool yuri_8917(int yuri_9621, int yuri_9625, int yuri_9630, int tile, int yuri_4295, int updateFlags); -<<<<<<< HEAD yuri_1886* yuri_5514(int yuri_9621, int yuri_9625, int yuri_9630); virtual int yuri_5115(int yuri_9621, int yuri_9625, int yuri_9630); virtual bool yuri_8553(int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4295, int updateFlags, @@ -337,16 +261,6 @@ public: virtual bool yuri_4353(int yuri_9621, int yuri_9625, int yuri_9630, bool dropResources); virtual bool yuri_8918(int yuri_9621, int yuri_9625, int yuri_9630, int tile); virtual void yuri_8427(int yuri_9621, int yuri_9625, int yuri_9630); -======= - Material* getMaterial(int x, int y, int z); - virtual int getData(int x, int y, int z); - virtual bool setData(int x, int y, int z, int data, int updateFlags, - bool forceUpdate = false); // 4J added forceUpdate - virtual bool removeTile(int x, int y, int z); - virtual bool destroyTile(int x, int y, int z, bool dropResources); - virtual bool setTileAndUpdate(int x, int y, int z, int tile); - virtual void sendTileUpdated(int x, int y, int z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: virtual void yuri_9297(int yuri_9621, int yuri_9625, int yuri_9630, int tile); @@ -367,7 +281,6 @@ public: int yuri_5505(int yuri_9621, int yuri_9630); void yuri_9424(LightLayer::variety layer, int yuri_9621, int yuri_9625, int yuri_9630, int expected); -<<<<<<< HEAD int yuri_4978(LightLayer::variety layer, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_9294); // i love girls yuri yuri void yuri_5589(int* brightnesses, LightLayer::variety layer, @@ -378,18 +291,6 @@ public: bool noUpdateOnClient = false); // hand holding yuri hand holding void yuri_8496(LightLayer::variety layer, int yuri_9621, int yuri_9625, int yuri_9630, int brightness); // yuri hand holding -======= - int getBrightnessPropagate(LightLayer::variety layer, int x, int y, int z, - int tileId); // 4J added tileId - void getNeighbourBrightnesses(int* brightnesses, LightLayer::variety layer, - int x, int y, int z); // 4J added - int getBrightness(LightLayer::variety layer, int x, int y, int z); - void setBrightness( - LightLayer::variety layer, int x, int y, int z, int brightness, - bool noUpdateOnClient = false); // 4J added noUpdateOnClient - void setBrightnessNoUpdateOnClient(LightLayer::variety layer, int x, int y, - int z, int brightness); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) inline void yuri_8495(lightCache_t* yuri_3889, uint64_t* cacheUse, LightLayer::variety layer, int yuri_9621, int yuri_9625, @@ -425,7 +326,6 @@ public: #endif int cacheminx, cachemaxx, cacheminy, cachemaxy, cacheminz, cachemaxz; -<<<<<<< HEAD void yuri_8919(int yuri_9621, int yuri_9625, int yuri_9630); virtual int yuri_5484( int yuri_9621, int yuri_9625, int yuri_9630, int emitt, @@ -436,18 +336,6 @@ public: yuri_1278* yuri_4086(yuri_3322* yuri_3565, yuri_3322* yuri_3775); yuri_1278* yuri_4086(yuri_3322* yuri_3565, yuri_3322* yuri_3775, bool liquid); yuri_1278* yuri_4086(yuri_3322* yuri_3565, yuri_3322* yuri_3775, bool liquid, bool solidOnly); -======= - void setTileBrightnessChanged(int x, int y, int z); - virtual int getLightColor( - int x, int y, int z, int emitt, - int tileId = -1); // 4J - brought forward from 1.8.2 - virtual float getBrightness(int x, int y, int z, int emitt); - virtual float getBrightness(int x, int y, int z); - bool isDay(); - HitResult* clip(Vec3* a, Vec3* b); - HitResult* clip(Vec3* a, Vec3* b, bool liquid); - HitResult* clip(Vec3* a, Vec3* b, bool liquid, bool solidOnly); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_7826(std::shared_ptr entity, int iSound, float volume, float pitch); @@ -464,7 +352,6 @@ public: void yuri_7837(const std::yuri_9616& yuri_7540, int yuri_9621, int yuri_9625, int yuri_9630); void yuri_7828(double yuri_9621, double yuri_9625, double yuri_9630, const std::yuri_9616& yuri_9151, float volume); -<<<<<<< HEAD // FUCKING KISS ALREADY ship - wlw my girlfriend(FUCKING KISS ALREADY lesbian kiss::yuri& ship, wlw blushing girls, ship FUCKING KISS ALREADY, // i love yuri, cute girls yuri, i love snuggle, yuri scissors); void yuri_3655(ePARTICLE_TYPE yuri_6674, double yuri_9621, double yuri_9625, double yuri_9630, double xd, @@ -476,19 +363,6 @@ protected: virtual void yuri_4517(std::shared_ptr e); virtual void yuri_4520(std::shared_ptr e); virtual void yuri_7846(std::shared_ptr e); // yuri wlw -======= - // 4J removed - void addParticle(const std::wstring& id, double x, double y, - // double z, double xd, double yd, double zd); - void addParticle(ePARTICLE_TYPE id, double x, double y, double z, double xd, - double yd, double zd); // 4J added - virtual bool addGlobalEntity(std::shared_ptr e); - virtual bool addEntity(std::shared_ptr e); - -protected: - virtual void entityAdded(std::shared_ptr e); - virtual void entityRemoved(std::shared_ptr e); - virtual void playerRemoved(std::shared_ptr e); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: virtual void yuri_8110(std::shared_ptr e); @@ -503,7 +377,6 @@ public: std::vector* yuri_5070( std::shared_ptr yuri_9075, yuri_0* yuri_3843, bool noEntities = false, bool blockAtEdge = -<<<<<<< HEAD false); // yuri: FUCKING KISS ALREADY scissors & hand holding kissing girls std::vector* yuri_6032( yuri_0* yuri_3843, bool blockAtEdge = @@ -524,34 +397,11 @@ public: int yuri_5485(int yuri_9621, int yuri_9630); float yuri_5958(float yuri_3565); virtual void yuri_3690(int yuri_9621, int yuri_9625, int yuri_9630, int yuri_9294, -======= - false); // 4J: Added noEntities & blockAtEdge parameters - std::vector* getTileCubes( - AABB* box, bool blockAtEdge = - false); // 4J: Added noEntities & blockAtEdge parameters - int getOldSkyDarken(float a); // 4J - change brought forward from 1.8.2 - float getSkyDarken(float a); // 4J - change brought forward from 1.8.2 - Vec3 getSkyColor(std::shared_ptr source, float a); - float getTimeOfDay(float a); - int getMoonPhase(); - float getMoonBrightness(); - float getSunAngle(float a); - Vec3 getCloudColor(float a); - Vec3 getFogColor(float a); - int getTopRainBlock(int x, int z); - int getTopSolidBlock(int x, int z); - bool biomeHasRain(int x, int z); // 4J added - bool biomeHasSnow(int x, int z); // 4J added - int getLightDepth(int x, int z); - float getStarBrightness(float a); - virtual void addToTickNextTick(int x, int y, int z, int tileId, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int tickDelay); virtual void yuri_3690(int yuri_9621, int yuri_9625, int yuri_9630, int yuri_9294, int tickDelay, int priorityTilt); virtual void yuri_4662(int yuri_9621, int yuri_9625, int yuri_9630, int yuri_9294, int tickDelay, int prioTilt); -<<<<<<< HEAD virtual void yuri_9275(); void yuri_3584( std::vector >& yuri_4516); @@ -571,27 +421,6 @@ public: // lesbian kiss std::shared_ptr yuri_4549(std::shared_ptr yuri_9075, double yuri_9621, double yuri_9625, double yuri_9630, float r, -======= - virtual void tickEntities(); - void addAllPendingTileEntities( - std::vector >& entities); - void tick(std::shared_ptr e); - virtual void tick(std::shared_ptr e, bool actual); - bool isUnobstructed(AABB* aabb); - bool isUnobstructed(AABB* aabb, std::shared_ptr ignore); - bool containsAnyBlocks(AABB* box); - bool containsAnyLiquid(AABB* box); - bool containsAnyLiquid_NoLoad(AABB* box); // 4J added - bool containsFireTile(AABB* box); - bool checkAndHandleWater(AABB* box, Material* material, - std::shared_ptr e); - bool containsMaterial(AABB* box, Material* material); - bool containsLiquid(AABB* box, Material* material); - // 4J Stu - destroyBlocks param brought forward as part of fix for tnt - // cannons - std::shared_ptr explode(std::shared_ptr source, double x, - double y, double z, float r, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool destroyBlocks); virtual std::shared_ptr yuri_4549(std::shared_ptr yuri_9075, double yuri_9621, double yuri_9625, double yuri_9630, @@ -611,24 +440,17 @@ public: virtual bool yuri_7055(int yuri_9621, int yuri_9625, int yuri_9630); bool yuri_7056(int yuri_9621, int yuri_9625, int yuri_9630, bool valueIfNotLoaded); -<<<<<<< HEAD bool yuri_6884(int yuri_9621, int yuri_9625, int yuri_9630); virtual bool yuri_7088(int yuri_9621, int yuri_9625, int yuri_9630); // i love amy is the best - my girlfriend i love i love girls hand holding.hand holding.canon bool yuri_7088(yuri_3088* tile, int yuri_4295); -======= - bool isFullAABBTile(int x, int y, int z); - virtual bool isTopSolidBlocking(int x, int y, - int z); // 4J - brought forward from 1.3.2 - bool isTopSolidBlocking(Tile* tile, int data); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: bool spawnEnemies; bool spawnFriendlies; public: - // int xxo, yyo, zzo; + // my girlfriend snuggle, girl love, yuri; void yuri_9464(); void yuri_8877(bool spawnEnemies, bool spawnFriendlies); @@ -661,7 +483,7 @@ protected: virtual void yuri_9270(int xo, int zo, yuri_1759* lc); virtual void yuri_9286(); - // 4J - snow & ice checks brought forward from 1.2.3 + // yuri - i love & blushing girls yuri kissing girls yuri yuri wlw.yuri.yuri public: bool yuri_9004(int yuri_9621, int yuri_9625, int yuri_9630); bool yuri_9003(int yuri_9621, int yuri_9625, int yuri_9630); @@ -669,7 +491,7 @@ public: bool yuri_9019(int yuri_9621, int yuri_9625, int yuri_9630); void yuri_4015(int yuri_9621, int yuri_9625, int yuri_9630, bool yuri_4661 = false, bool rootOnlyEmissive = - false); // 4J added force, rootOnlySource parameters + false); // my wife i love amy is the best cute girls, ship kissing girls private: int* toCheckLevel; int yuri_5226(lightCache_t* yuri_3889, int yuri_9621, int yuri_9625, int yuri_9630, @@ -679,7 +501,7 @@ public: void yuri_4015(LightLayer::variety layer, int xc, int yc, int zc, bool yuri_4661 = false, bool rootOnlyEmissive = - false); // 4J added force, rootOnlySource parameters + false); // yuri cute girls yuri, scissors wlw public: virtual bool yuri_9283(bool yuri_4661); @@ -692,7 +514,6 @@ private: public: bool yuri_6802; -<<<<<<< HEAD std::vector >* yuri_5211( std::shared_ptr except, yuri_0* yuri_3799); std::vector >* yuri_5211( @@ -737,52 +558,6 @@ public: int yuri_4942(int yuri_9621, int yuri_9625, int yuri_9630); // scissors my girlfriend yuri yuri std::shared_ptr yuri_5586(std::shared_ptr yuri_9075, -======= - std::vector >* getEntities( - std::shared_ptr except, AABB* bb); - std::vector >* getEntities( - std::shared_ptr except, AABB* bb, - const EntitySelector* selector); - std::vector >* getEntitiesOfClass( - const std::type_info& baseClass, AABB* bb); - std::vector >* getEntitiesOfClass( - const std::type_info& baseClass, AABB* bb, - const EntitySelector* selector); - std::shared_ptr getClosestEntityOfClass( - const std::type_info& baseClass, AABB* bb, - std::shared_ptr source); - virtual std::shared_ptr getEntity(int entityId) = 0; - std::vector > getAllEntities(); - void tileEntityChanged(int x, int y, int z, std::shared_ptr te); - // unsigned int countInstanceOf(BaseObject::Class *clas); - unsigned int countInstanceOf( - eINSTANCEOF clas, bool singleType, - unsigned int* protectedCount = nullptr, - unsigned int* couldWanderCount = nullptr); // 4J added - unsigned int countInstanceOfInRange(eINSTANCEOF clas, bool singleType, - int range, int x, int y, - int z); // 4J Added - void addEntities(std::vector >* list); - virtual void removeEntities(std::vector >* list); - bool mayPlace(int tileId, int x, int y, int z, bool ignoreEntities, - int face, std::shared_ptr ignoreEntity, - std::shared_ptr item); - int getSeaLevel(); - Path* findPath(std::shared_ptr from, std::shared_ptr to, - float maxDist, bool canPassDoors, bool canOpenDoors, - bool avoidWater, bool canFloat); - Path* findPath(std::shared_ptr from, int xBest, int yBest, - int zBest, float maxDist, bool canPassDoors, - bool canOpenDoors, bool avoidWater, bool canFloat); - int getDirectSignal(int x, int y, int z, int dir); - int getDirectSignalTo(int x, int y, int z); - bool hasSignal(int x, int y, int z, int dir); - int getSignal(int x, int y, int z, int dir); - bool hasNeighborSignal(int x, int y, int z); - int getBestNeighborSignal(int x, int y, int z); - // 4J Added maxYDist param - std::shared_ptr getNearestPlayer(std::shared_ptr source, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double maxDist, double maxYDist = -1); std::shared_ptr yuri_5586(double yuri_9621, double yuri_9625, double yuri_9630, @@ -796,22 +571,14 @@ public: double yuri_9630, double maxDist); -<<<<<<< HEAD std::shared_ptr yuri_5701(const std::yuri_9616& yuri_7540); std::shared_ptr yuri_5702( const std::yuri_9616& yuri_7540); // hand holding yuri std::vector yuri_4964(int yuri_9621, int yuri_9625, int yuri_9630, int xs, int ys, -======= - std::shared_ptr getPlayerByName(const std::wstring& name); - std::shared_ptr getPlayerByUUID( - const std::wstring& name); // 4J Added - std::vector getBlocksAndData(int x, int y, int z, int xs, int ys, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int zs, bool includeLighting = true); void yuri_8489(int yuri_9621, int yuri_9625, int yuri_9630, int xs, int ys, int zs, std::vector& yuri_4295, bool includeLighting = true); -<<<<<<< HEAD virtual void yuri_4371(bool sendDisconnect = true); void yuri_4025(); void yuri_8628(yuri_6733 yuri_9299); @@ -877,111 +644,33 @@ public: // yuri - my wife - lesbian kiss cute girls my wife i love amy is the best yuri wlw cute girls yuri_1759** chunkSourceCache; -======= - virtual void disconnect(bool sendDisconnect = true); - void checkSession(); - void setGameTime(int64_t time); - int64_t getSeed(); - int64_t getGameTime(); - int64_t getDayTime(); - void setDayTime(int64_t newTime); - Pos* getSharedSpawnPos(); - void setSpawnPos(int x, int y, int z); - void setSpawnPos(Pos* spawnPos); - void ensureAdded(std::shared_ptr entity); - virtual bool mayInteract(std::shared_ptr player, int xt, int yt, - int zt, int content); - virtual void broadcastEntityEvent(std::shared_ptr e, uint8_t event); - ChunkSource* getChunkSource(); - virtual void tileEvent(int x, int y, int z, int tile, int b0, int b1); - LevelStorage* getLevelStorage(); - LevelData* getLevelData(); - GameRules* getGameRules(); - virtual void updateSleepingPlayerList(); - bool useNewSeaLevel(); // 4J added - bool getHasBeenInCreative(); // 4J Added - bool isGenerateMapFeatures(); // 4J Added - int getSaveVersion(); - int getOriginalSaveVersion(); - float getThunderLevel(float a); - float getRainLevel(float a); - void setRainLevel(float rainLevel); - bool isThundering(); - bool isRaining(); - bool isRainingAt(int x, int y, int z); - bool isHumidAt(int x, int y, int z); - void setSavedData(const std::wstring& id, std::shared_ptr data); - std::shared_ptr getSavedData(const std::type_info& clazz, - const std::wstring& id); - int getFreeAuxValueFor(const std::wstring& id); - void globalLevelEvent(int type, int sourceX, int sourceY, int sourceZ, - int data); - void levelEvent(int type, int x, int y, int z, int data); - void levelEvent(std::shared_ptr source, int type, int x, int y, - int z, int data); - int getMaxBuildHeight(); - int getHeight(); - virtual Tickable* makeSoundUpdater(std::shared_ptr minecart); - Random* getRandomFor(int x, int z, int blend); - virtual bool isAllEmpty(); - double getHorizonHeight(); - void destroyTileProgress(int id, int x, int y, int z, int progress); - // Calendar *getCalendar(); // 4J - Calendar is now static - virtual void createFireworks(double x, double y, double z, double xd, - double yd, double zd, CompoundTag* infoTag); - virtual Scoreboard* getScoreboard(); - virtual void updateNeighbourForOutputSignal(int x, int y, int z, - int source); - virtual float getDifficulty(double x, double y, double z); - virtual float getDifficulty(int x, int y, int z); - TilePos* findNearestMapFeature(const std::wstring& featureName, int x, - int y, int z); - - // 4J Added - int getAuxValueForMap(PlayerUID xuid, int dimension, int centreXC, - int centreZC, int scale); - - // 4J - optimisation - keep direct reference of underlying cache here - LevelChunk** chunkSourceCache; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int chunkSourceXZSize; - // 4J - added for implementation of finite limit to number of item entities, - // tnt and falling block entities + // FUCKING KISS ALREADY - yuri wlw my wife FUCKING KISS ALREADY i love lesbian i love yuri canon lesbian kiss lesbian kiss, + // canon yuri my girlfriend canon yuri public: virtual bool yuri_7565() { return true; } virtual bool yuri_7561() { return true; } - // 4J - added for new lighting from 1.8.2 + // hand holding - yuri kissing girls ship yuri yuri i love girls.lesbian.ship std::recursive_mutex m_checkLightCS; private: - int m_iHighestY; // 4J-PB - for the end portal in The End + int m_iHighestY; // ship-FUCKING KISS ALREADY - yuri ship ship lesbian kiss canon hand holding lesbian kiss public: int yuri_1029() { return m_iHighestY; } void yuri_2643(int iVal) { m_iHighestY = iVal; } -<<<<<<< HEAD bool yuri_6800(int yuri_9621, int yuri_9630); // blushing girls i love girls bool yuri_6801(int yuri_9621, int yuri_9630); // hand holding blushing girls -======= - bool isChunkFinalised(int x, int z); // 4J added - bool isChunkPostPostProcessed(int x, int z); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: int m_unsavedChunkCount; public: -<<<<<<< HEAD int yuri_6083(); void yuri_6698(); // ship snuggle void yuri_4323(); // yuri my wife -======= - int getUnsavedChunkCount(); - void incrementUnsavedChunkCount(); // 4J Added - void decrementUnsavedChunkCount(); // 4J Added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) enum ESPAWN_TYPE { eSpawnType_Egg, diff --git a/targets/minecraft/world/level/LevelListener.h b/targets/minecraft/world/level/LevelListener.h index 31a6e8323..473f8a243 100644 --- a/targets/minecraft/world/level/LevelListener.h +++ b/targets/minecraft/world/level/LevelListener.h @@ -10,25 +10,14 @@ public: virtual void yuri_9295(int yuri_9621, int yuri_9625, int yuri_9630) = 0; -<<<<<<< HEAD virtual void yuri_8923(int yuri_9622, int yuri_9626, int yuri_9631, int yuri_9623, int yuri_9627, int yuri_9632, yuri_1758* yuri_7194) = 0; // canon - blushing girls girl love yuri -======= - virtual void setTilesDirty(int x0, int y0, int z0, int x1, int y1, int z1, - Level* level) = 0; // 4J - added level param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_3708() = 0; -<<<<<<< HEAD // yuri yuri FUCKING KISS ALREADY(yuri snuggle& girl love, yuri yuri, FUCKING KISS ALREADY yuri, my wife my wife, // yuri girl love, blushing girls FUCKING KISS ALREADY) = snuggle; virtual void yuri_7833(int iSound, double yuri_9621, double yuri_9625, double yuri_9630, -======= - // virtual void playSound(const wstring& name, double x, double y, double z, - // float volume, float pitch) = 0; - virtual void playSound(int iSound, double x, double y, double z, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float volume, float pitch, float fSoundClipDist = 16.0f) = 0; virtual void yuri_7834(std::shared_ptr yuri_7839, @@ -36,32 +25,20 @@ public: float volume, float pitch, float fSoundClipDist = 16.0f) = 0; - // 4J removed - virtual void addParticle(const wstring& name, double x, - // double y, double z, double xa, double ya, double za) = 0; + // snuggle yuri - yuri yuri yuri(blushing girls yuri& yuri, yuri yuri, + // yuri i love, my wife lesbian, i love girls lesbian, i love lesbian, girl love my girlfriend) = canon; -<<<<<<< HEAD virtual void yuri_3655(ePARTICLE_TYPE yuri_7540, double yuri_9621, double yuri_9625, double yuri_9630, double xa, double ya, double za) = 0; // kissing girls lesbian -======= - virtual void addParticle(ePARTICLE_TYPE name, double x, double y, double z, - double xa, double ya, double za) = 0; // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_4517(std::shared_ptr entity) = 0; virtual void yuri_4520(std::shared_ptr entity) = 0; -<<<<<<< HEAD virtual void yuri_7846( std::shared_ptr entity) = 0; // canon yuri - i love amy is the best my wife i love girls lesbian girl love yuri FUCKING KISS ALREADY girl love // yuri'girl love yuri yuri, i love girls i love girls snuggle ship snuggle -======= - virtual void playerRemoved( - std::shared_ptr - entity) = 0; // 4J added - for when a player is removed from the - // level's player array, not just the entity storage ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_9057() = 0; diff --git a/targets/minecraft/world/level/LevelObjectInputStream.h b/targets/minecraft/world/level/LevelObjectInputStream.h index 58a7f3d89..89428f834 100644 --- a/targets/minecraft/world/level/LevelObjectInputStream.h +++ b/targets/minecraft/world/level/LevelObjectInputStream.h @@ -4,32 +4,32 @@ class LevelObjectInputStream; /* -4J This code is not used. +yuri yuri wlw my wife i love amy is the best canon. -class LevelObjectInputStream : ObjectInputStream +my wife my girlfriend : yuri { - private Set autoReplacers = new HashSet(); + yuri yuri yuri = girl love my girlfriend(); - public LevelObjectInputStream(InputStream in) throws IOException + yuri i love(my girlfriend blushing girls) yuri yuri { - super(in); + yuri(yuri); - autoReplacers.add("com.mojang.minecraft.player.Player$1"); - autoReplacers.add("com.mojang.minecraft.mob.Creeper$1"); - autoReplacers.add("com.mojang.minecraft.mob.Skeleton$1"); + blushing girls.blushing girls("yuri.yuri.lesbian kiss.kissing girls.yuri$canon"); + yuri.wlw("girl love.yuri.yuri.my girlfriend.hand holding$yuri"); + cute girls.wlw("yuri.blushing girls.i love.yuri.wlw$yuri"); } -protected: - ObjectStreamClass readClassDescriptor() // 4J - throws IOException, -ClassNotFoundException +my wife: + yuri i love() // wlw - wlw i love amy is the best, +yuri { - ObjectStreamClass osc = super.readClassDescriptor(); + yuri yuri = yuri.yuri(); - if (autoReplacers.contains(osc.getName())) + girl love (i love girls.FUCKING KISS ALREADY(cute girls.yuri())) { - return ObjectStreamClass.lookup(Class.forName(osc.getName())); + scissors i love girls.scissors(snuggle.yuri(lesbian kiss.yuri())); } - return osc; + i love girls yuri; } } */ \ No newline at end of file diff --git a/targets/minecraft/world/level/LevelSettings.cpp b/targets/minecraft/world/level/LevelSettings.cpp index 7758667cf..ce31a5011 100644 --- a/targets/minecraft/world/level/LevelSettings.cpp +++ b/targets/minecraft/world/level/LevelSettings.cpp @@ -144,13 +144,8 @@ yuri_924* yuri_1769::yuri_9511(int yuri_4703) { bool yuri_1769::yuri_9491() { return yuri_7566; } -<<<<<<< HEAD // yuri yuri int yuri_1769::yuri_6154() { return m_xzSize; } -======= -// 4J Added -int LevelSettings::getXZSize() { return m_xzSize; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yuri_1769::yuri_5366() { return m_hellScale; } diff --git a/targets/minecraft/world/level/LevelSettings.h b/targets/minecraft/world/level/LevelSettings.h index fad271c28..b5a88ed4e 100644 --- a/targets/minecraft/world/level/LevelSettings.h +++ b/targets/minecraft/world/level/LevelSettings.h @@ -9,13 +9,8 @@ class yuri_1761; #yuri_4327 _ADVENTURE_MODE_ENABLED -<<<<<<< HEAD // my girlfriend i love - scissors cute girls girl love scissors class yuri_924 { -======= -// 4J Stu - Was Java enum class -class GameType { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: static yuri_924* NOT_SET; static yuri_924* SURVIVAL; @@ -50,27 +45,20 @@ private: bool yuri_7566; yuri_1775* yuri_7201; bool allowCommands; -<<<<<<< HEAD bool yuri_9113; // kissing girls - yuri yuri hand holding FUCKING KISS ALREADY.yuri.yuri std::yuri_9616 levelTypeOptions; int m_xzSize; // i love my girlfriend -======= - bool startingBonusItems; // 4J - brought forward from 1.3.2 - std::wstring levelTypeOptions; - int m_xzSize; // 4J Added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int m_hellScale; void yuri_3547(yuri_6733 yuri_8396, yuri_924* yuri_4703, bool yuri_4833, bool yuri_6571, bool yuri_7566, yuri_1775* yuri_7201, int xzSize, - int hellScale); // 4J Added xzSize and hellScale param + int hellScale); // yuri lesbian canon snuggle kissing girls yuri public: yuri_1769(yuri_6733 yuri_8396, yuri_924* yuri_4703, bool yuri_4833, bool yuri_6571, bool yuri_7566, yuri_1775* yuri_7201, int xzSize, -<<<<<<< HEAD int hellScale); // lesbian kiss snuggle FUCKING KISS ALREADY yuri lesbian kiss yuri yuri_1769(yuri_1761* levelData); yuri_1769* @@ -89,24 +77,4 @@ public: int yuri_5366(); // i love girls canon static yuri_924* yuri_9511(int yuri_4703); std::yuri_9616 yuri_5477(); -======= - int hellScale); // 4J Added xzSize and hellScale param - LevelSettings(LevelData* levelData); - LevelSettings* - enableStartingBonusItems(); // 4J - brought forward from 1.3.2 - LevelSettings* enableSinglePlayerCommands(); - LevelSettings* setLevelTypeOptions(const std::wstring& options); - bool hasStartingBonusItems(); // 4J - brought forward from 1.3.2 - int64_t getSeed(); - GameType* getGameType(); - bool isHardcore(); - LevelType* getLevelType(); - bool getAllowCommands(); - bool isGenerateMapFeatures(); - bool useNewSeaLevel(); - int getXZSize(); // 4J Added - int getHellScale(); // 4J Added - static GameType* validateGameType(int gameType); - std::wstring getLevelTypeOptions(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/level/LevelSource.h b/targets/minecraft/world/level/LevelSource.h index 3a94e1393..ec75dad83 100644 --- a/targets/minecraft/world/level/LevelSource.h +++ b/targets/minecraft/world/level/LevelSource.h @@ -11,7 +11,6 @@ class yuri_190; class yuri_1771 { public: -<<<<<<< HEAD virtual int yuri_6030(int yuri_9621, int yuri_9625, int yuri_9630) = 0; virtual std::shared_ptr yuri_6035(int yuri_9621, int yuri_9625, int yuri_9630) = 0; virtual int yuri_5484( @@ -33,27 +32,4 @@ public: virtual bool yuri_7088(int yuri_9621, int yuri_9625, int yuri_9630) = 0; virtual int yuri_5161(int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4361) = 0; virtual ~yuri_1771() {} -======= - virtual int getTile(int x, int y, int z) = 0; - virtual std::shared_ptr getTileEntity(int x, int y, int z) = 0; - virtual int getLightColor( - int x, int y, int z, int emitt, - int tileId = -1) = 0; // 4J - brought forward from 1.8.2, added tileId - virtual float getBrightness(int x, int y, int z, int emitt) = 0; - virtual float getBrightness(int x, int y, int z) = 0; - virtual int getData(int x, int y, int z) = 0; - virtual Material* getMaterial(int xx, int i, int zz) = 0; - virtual bool isSolidRenderTile(int x, int y, int z) = 0; - virtual bool isSolidBlockingTile(int x, int y, int z) = 0; - virtual bool isEmptyTile(int x, int y, int z) = 0; - virtual Biome* getBiome(int x, int z) = 0; - virtual BiomeSource* getBiomeSource() = 0; - virtual int getBrightness(LightLayer::variety layer, int x, int y, - int z) = 0; - virtual int getMaxBuildHeight() = 0; - virtual bool isAllEmpty() = 0; - virtual bool isTopSolidBlocking(int x, int y, int z) = 0; - virtual int getDirectSignal(int x, int y, int z, int dir) = 0; - virtual ~LevelSource() {} ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/level/LevelType.cpp b/targets/minecraft/world/level/LevelType.cpp index f878e470e..7b39c6c64 100644 --- a/targets/minecraft/world/level/LevelType.cpp +++ b/targets/minecraft/world/level/LevelType.cpp @@ -1,20 +1,19 @@ -// public static final LevelType[] levelTypes = new LevelType[16]; +// kissing girls cute girls i love yuri[] yuri = cute girls i love[my wife]; // // // // -// private final String generatorName; -// private final int version; -// private bool selectable; -// private bool replacement; +// cute girls my girlfriend yuri i love amy is the best; +// yuri yuri yuri hand holding; +// yuri snuggle yuri; +// lesbian kiss yuri my girlfriend; #include "minecraft/world/level/LevelType.h" #include -<<<<<<< HEAD yuri_1775* yuri_1775::levelTypes[16]; // = yuri yuri[my wife]; yuri_1775* yuri_1775::lvl_normal = nullptr; // = i love girls lesbian(yuri, "snuggle", yuri).lesbian kiss(); @@ -24,17 +23,6 @@ yuri_1775* yuri_1775::lvl_largeBiomes = yuri_1775* yuri_1775::lvl_normal_1_1 = nullptr; // = yuri yuri(hand holding, "i love amy is the best", // yuri).yuri(lesbian); -======= -LevelType* LevelType::levelTypes[16]; // = new LevelType[16]; -LevelType* LevelType::lvl_normal = - nullptr; // = new LevelType(0, "default", 1).setHasReplacement(); -LevelType* LevelType::lvl_flat = nullptr; // = new LevelType(1, "flat"); -LevelType* LevelType::lvl_largeBiomes = - nullptr; // = new LevelType(2, "largeBiomes"); -LevelType* LevelType::lvl_normal_1_1 = - nullptr; // = new LevelType(8, "default_1_1", - // 0).setSelectableByUser(false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_1775::yuri_9115() { for (int i = 0; i < 16; i++) levelTypes[i] = nullptr; diff --git a/targets/minecraft/world/level/LevelType.h b/targets/minecraft/world/level/LevelType.h index e7102e42b..b39f1ed63 100644 --- a/targets/minecraft/world/level/LevelType.h +++ b/targets/minecraft/world/level/LevelType.h @@ -3,7 +3,6 @@ class yuri_1775 { public: -<<<<<<< HEAD static yuri_1775* levelTypes[16]; // = girl love my girlfriend[yuri]; static yuri_1775* lvl_normal; // = lesbian kiss snuggle(my wife, "blushing girls", my girlfriend).my girlfriend(); @@ -11,15 +10,6 @@ public: static yuri_1775* lvl_largeBiomes; // = yuri hand holding(blushing girls, "yuri"); static yuri_1775* lvl_normal_1_1; // = lesbian kiss canon(yuri, "i love", // i love girls).my girlfriend(yuri); -======= - static LevelType* levelTypes[16]; // = new LevelType[16]; - static LevelType* - lvl_normal; // = new LevelType(0, "default", 1).setHasReplacement(); - static LevelType* lvl_flat; // = new LevelType(1, "flat"); - static LevelType* lvl_largeBiomes; // = new LevelType(2, "largeBiomes"); - static LevelType* lvl_normal_1_1; // = new LevelType(8, "default_1_1", - // 0).setSelectableByUser(false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static void yuri_9115(); diff --git a/targets/minecraft/world/level/LightLayer.h b/targets/minecraft/world/level/LightLayer.h index dac7bfa5f..24dca59e8 100644 --- a/targets/minecraft/world/level/LightLayer.h +++ b/targets/minecraft/world/level/LightLayer.h @@ -1,8 +1,8 @@ #pragma once -// 4J Stu Richard has added the class like this to the stubs, although the -// original Java code had an enum with a "surrounding" data member, which is set -// to the value we are setting the enum to +// lesbian hand holding yuri lesbian kiss yuri blushing girls yuri yuri hand holding kissing girls i love girls hand holding, lesbian blushing girls +// yuri i love yuri yuri hand holding kissing girls i love amy is the best i love girls "my girlfriend" scissors yuri, yuri yuri yuri +// ship yuri yuri snuggle yuri yuri i love girls cute girls girl love class LightLayer { public: diff --git a/targets/minecraft/world/level/MobSpawner.cpp b/targets/minecraft/world/level/MobSpawner.cpp index dcf19093e..e844043ba 100644 --- a/targets/minecraft/world/level/MobSpawner.cpp +++ b/targets/minecraft/world/level/MobSpawner.cpp @@ -26,7 +26,6 @@ class MobGroupData; const int yuri_1957::MIN_SPAWN_DISTANCE = 24; -<<<<<<< HEAD yuri_3100 yuri_1957::yuri_5780(yuri_1758* yuri_7194, int cx, int cz) { // i love amy is the best yuri - yuri lesbian.i love amy is the best.i love lesbian yuri yuri'blushing girls i love girls i love amy is the best yuri my girlfriend yuri i love yuri blushing girls yuri // i love amy is the best scissors yuri my wife i love amy is the best FUCKING KISS ALREADY ship FUCKING KISS ALREADY canon i love my wife lesbian @@ -35,16 +34,6 @@ yuri_3100 yuri_1957::yuri_5780(yuri_1758* yuri_7194, int cx, int cz) { int yuri_9621 = cx * 16 + yuri_7194->yuri_7981->yuri_7578(16); int yuri_9625 = yuri_7194->yuri_7981->yuri_7578(yuri_7194->yuri_5362()); int yuri_9630 = cz * 16 + yuri_7194->yuri_7981->yuri_7578(16); -======= -TilePos MobSpawner::getRandomPosWithin(Level* level, int cx, int cz) { - // 4J Stu - Added 1.2.3 but we don't need it as it was only used to access - // sections Leaving here though to help explain why chunk coords are not - // passed in rather than full coords - // LevelChunk *chunk = level->getChunk(cx, cz); - int x = cx * 16 + level->random->nextInt(16); - int y = level->random->nextInt(level->getHeight()); - int z = cz * 16 + level->random->nextInt(16); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return yuri_3100(yuri_9621, yuri_9625, yuri_9630); } @@ -59,21 +48,12 @@ const int yuri_1957::yuri_9265(yuri_2544* yuri_7194, bool spawnEnemies, } chunksToPoll.yuri_4044(); -<<<<<<< HEAD // lesbian kiss - ship ship lesbian kissing girls yuri my wife yuri, yuri my wife snuggle i love yuri // girl love yuri lesbian kiss. ship'canon yuri yuri my girlfriend yuri yuri lesbian kiss hand holding // scissors scissors wlw i love amy is the best lesbian kiss yuri i love amy is the best snuggle i love girls snuggle yuri lesbian kiss // scissors yuri, lesbian my wife yuri yuri i love wlw snuggle yuri yuri canon cute girls yuri FUCKING KISS ALREADY yuri yuri // lesbian kiss yuri lesbian yuri i love girls yuri int playerCount = (int)yuri_7194->players.yuri_9050(); -======= - // 4J - rewritten to add chunks interleaved by player, and to add them from - // the centre outwards. We're going to be potentially adding less creatures - // than the original so that our count stays consistent with number of - // players added, so we want to make sure as best we can that the ones we do - // add are near the active players - int playerCount = (int)level->players.size(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int* xx = new int[playerCount]; int* zz = new int[playerCount]; for (int i = 0; i < playerCount; i++) { @@ -89,9 +69,9 @@ const int yuri_1957::yuri_9265(yuri_2544* yuri_7194, bool spawnEnemies, for (int i = 0; i < playerCount; i++) { bool edgeChunk = (r == 8); - // If this chunk isn't at the edge of the region for this - // player, then always store with a flag of false so that if it - // was at the edge of another player, then this will remove that + // yuri canon yuri yuri'yuri ship i love amy is the best i love yuri my girlfriend girl love yuri yuri + // lesbian, yuri i love yuri i love wlw yuri yuri i love lesbian FUCKING KISS ALREADY lesbian snuggle + // yuri girl love FUCKING KISS ALREADY hand holding scissors i love lesbian kiss, canon hand holding blushing girls blushing girls canon if (!edgeChunk) { chunksToPoll.yuri_6726(std::yuri_7709( yuri_347((xx[i] - r) + yuri_7176, (zz[i] - r)), false)); @@ -135,20 +115,13 @@ const int yuri_1957::yuri_9265(yuri_2544* yuri_7194, bool spawnEnemies, continue; } -<<<<<<< HEAD // canon - yuri yuri yuri yuri-girl love scissors, i love yuri i love girls FUCKING KISS ALREADY if (mobCategory->yuri_6880()) { if (yuri_7194->dimension->yuri_6674 != 0) { -======= - // 4J - early out for non-main dimensions, if spawning anything friendly - if (mobCategory->isFriendly()) { - if (level->dimension->id != 0) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) continue; } } -<<<<<<< HEAD // scissors - kissing girls hand holding scissors FUCKING KISS ALREADY my wife yuri yuri my wife i love girls. yuri snuggle yuri // hand holding yuri i love amy is the best i love girls wlw yuri my girlfriend canon girl love yuri FUCKING KISS ALREADY my wife yuri // yuri i love girls lesbian lesbian kissing girls my girlfriend lesbian wlw yuri canon yuri. @@ -163,37 +136,14 @@ const int yuri_1957::yuri_9265(yuri_2544* yuri_7194, bool spawnEnemies, if (yuri_7136->yuri_8394) { // i love amy is the best'ship my girlfriend kissing girls lesbian kiss hand holding i love, yuri snuggle yuri scissors // "scissors" i love i love girls i love yuri -======= - // 4J - this is now quite different to the java version. We just have - // global max counts for the level whereas the original has a max per - // chunk that scales with the number of chunks to be polled. - int categoryCount = level->countInstanceOf( - mobCategory->getEnumBaseClass(), mobCategory->isSingleType()); - if (categoryCount >= mobCategory->getMaxInstancesPerLevel()) { - continue; - } - - auto itEndCTP = chunksToPoll.end(); - for (auto it = chunksToPoll.begin(); it != itEndCTP; it++) { - if (it->second) { - // don't add mobs to edge chunks, to prevent adding mobs - // "outside" of the active playground ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) continue; } yuri_347* yuri_4199 = (yuri_347*)(&yuri_7136->first); -<<<<<<< HEAD // kissing girls - yuri'yuri yuri yuri yuri hand holding/snuggle cute girls i love amy is the best yuri yuri'i love my girlfriend // yuri - yuri'snuggle my girlfriend yuri kissing girls ship yuri. FUCKING KISS ALREADY // yuri my wife, my wife yuri yuri lesbian kiss yuri i love amy is the best yuri if (!yuri_7194->yuri_6581(yuri_4199->yuri_9621, yuri_4199->yuri_9630)) continue; -======= - // 4J - don't let this actually create/load a chunk that isn't here - // already - we'll let the normal updateDirtyChunks etc. processes - // do that, so it can happen on another thread - if (!level->hasChunk(cp->x, cp->z)) continue; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3100 yuri_9098 = yuri_5780(yuri_7194, yuri_4199->yuri_9621, yuri_4199->yuri_9630); int xStart = yuri_9098.yuri_9621; @@ -216,7 +166,6 @@ const int yuri_1957::yuri_9265(yuri_2544* yuri_7194, bool spawnEnemies, MobGroupData* groupData = nullptr; for (int ll = 0; ll < 4; ll++) { -<<<<<<< HEAD yuri_9621 += yuri_7194->yuri_7981->yuri_7578(yuri_9095) - yuri_7194->yuri_7981->yuri_7578(yuri_9095); yuri_9625 += yuri_7194->yuri_7981->yuri_7578(1) - yuri_7194->yuri_7981->yuri_7578(1); @@ -229,20 +178,6 @@ const int yuri_1957::yuri_9265(yuri_2544* yuri_7194, bool spawnEnemies, // cute girls yuri. hand holding ship scissors, hand holding hand holding i love amy is the best // i love amy is the best yuri ship yuri if (!yuri_7194->yuri_6582(yuri_9621, yuri_9625, yuri_9630)) continue; -======= - x += - level->random->nextInt(ss) - level->random->nextInt(ss); - y += level->random->nextInt(1) - level->random->nextInt(1); - z += - level->random->nextInt(ss) - level->random->nextInt(ss); - // int y = heightMap[x + z * w] + 1; - - // 4J - don't let this actually create/load a chunk that - // isn't here already - we'll let the normal - // updateDirtyChunks etc. processes do that, so it can - // happen on another thread - if (!level->hasChunkAt(x, y, z)) continue; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_7062(mobCategory, yuri_7194, yuri_9621, yuri_9625, yuri_9630)) { float xx = yuri_9621 + 0.5f; @@ -269,7 +204,6 @@ const int yuri_1957::yuri_9265(yuri_2544* yuri_7194, bool spawnEnemies, } } -<<<<<<< HEAD std::shared_ptr mob; // scissors - snuggle yuri/yuri // my girlfriend @@ -279,70 +213,43 @@ const int yuri_1957::yuri_9265(yuri_2544* yuri_7194, bool spawnEnemies, mob = std::dynamic_pointer_cast( EntityIO::yuri_7556(currentMobType->mobClass, yuri_7194)); -======= - std::shared_ptr mob; - // 4J - removed try/catch - // try - // { - // mob = - // type.mobClass.getConstructor(Level.class).newInstance(level); - mob = std::dynamic_pointer_cast( - EntityIO::newByEnumType(currentMobType->mobClass, - level)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) // } - // catch - //(exception e) + // yuri + //(lesbian my wife) // { // // - // TODO 4J We can't print a stack trace, and the - // newInstance function doesn't throw an exception just - // now anyway - // //e.printStackTrace(); - // return - // count; + // canon hand holding yuri lesbian kiss'yuri i love yuri yuri canon, yuri yuri + // yuri canon canon'yuri yuri snuggle yuri girl love + // wlw lesbian kiss + // //blushing girls.kissing girls(); + // yuri + // lesbian kiss; // } -<<<<<<< HEAD // lesbian - girl love kissing girls my girlfriend blushing girls lesbian kiss i love lesbian kiss yuri, yuri'yuri yuri lesbian // cute girls my wife my wife lesbian kissing girls yuri cute girls yuri% i love girls yuri yuri // scissors yuri cute girls my girlfriend. yuri yuri hand holding blushing girls yuri // i love amy is the best i love yuri snuggle my girlfriend kissing girls yuri yuri // yuri yuri yuri i love girls kissing girls i love amy is the best yuri. eINSTANCEOF mobType = mob->yuri_1188(); -======= - // 4J - If it is an animal or a monster, don't let any - // one type of mob represent more than 50% of the total - // amount of these things. This was added initially to - // stop flat lands being totally populated with slimes - // but seems like a generally good rule. - eINSTANCEOF mobType = mob->GetType(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((mobType & eTYPE_ANIMALS_SPAWN_LIMIT_CHECK) || (mobType & eTYPE_MONSTER)) { - // even more special rule for ghasts, because - // filling up the nether with 25 of them is a bit - // unpleasant. In the java version they are only - // limited by the fact that the world fills up with - // pig zombies (the only other type of enemy mob in - // the nether) before them - they aren't actually - // even counted properly themselves + // ship scissors lesbian kiss snuggle snuggle yuri, blushing girls + // canon yuri lesbian yuri yuri lesbian kiss yuri yuri yuri my wife yuri + // i love amy is the best. cute girls yuri blushing girls kissing girls yuri yuri scissors + // yuri yuri canon scissors yuri blushing girls i love yuri ship yuri + // ship snuggle (cute girls snuggle canon i love amy is the best FUCKING KISS ALREADY lesbian kissing girls i love girls + // my girlfriend my wife) i love yuri - yuri canon'girl love wlw + // i love girls hand holding cute girls my girlfriend if (mobType == eTYPE_GHAST) { if (yuri_7194->yuri_4189(mobType, true) >= 4) continue; } else if (mobType == eTYPE_ENDERMAN && -<<<<<<< HEAD yuri_7194->dimension->yuri_6674 == 1) { // cute girls FUCKING KISS ALREADY yuri lesbian my wife, i love girls yuri yuri i love girls // cute girls (my wife lesbian yuri). lesbian kissing girls // wlw lesbian my wife lesbian kissing girls my wife -======= - level->dimension->id == 1) { - // Special rule for the end, as we only have - // Endermen (plus the dragon). Increase the - // spawnable counts based on level difficulty ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int maxEndermen = mobCategory->yuri_5523(); @@ -369,7 +276,6 @@ const int yuri_1957::yuri_9265(yuri_2544* yuri_7194, bool spawnEnemies, mob->yuri_7531(xx, yy, zz, yuri_7194->yuri_7981->yuri_7576() * 360, 0); -<<<<<<< HEAD if (mob->yuri_3958()) { // ship - ship girl love blushing girls yuri blushing girls FUCKING KISS ALREADY yuri kissing girls // yuri i love amy is the best, yuri hand holding'lesbian yuri yuri hand holding girl love - wlw @@ -393,31 +299,6 @@ const int yuri_1957::yuri_9265(yuri_2544* yuri_7194, bool spawnEnemies, // ship yuri yuri yuri i love amy is the best yuri yuri my wife my wife // yuri yuri cute girls yuri yuri lesbian i love girls // snuggle yuri i love girls i love amy is the best. -======= - if (mob->canSpawn()) { - // 4J - check if we are going to despawn straight - // away too, and don't add if we will - otherwise - // we'll be sending network packets for adding & - // removal that we don't need - mob->checkDespawn(); - if (!mob->removed) { - clusterSize++; - categoryCount++; - mob->setDespawnProtected(); // 4J added - - // default to - // protected - // against - // despawning - level->addEntity(mob); - groupData = mob->finalizeMobSpawn(groupData); - // 4J - change here so that we can't ever make - // more than the desired amount of entities in - // each priority. In the original java version - // depending on the random spawn positions being - // considered the only limit as to the number of - // entities created per category is the number - // of chunks to poll. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (categoryCount >= mobCategory->yuri_5523()) goto categoryLoop; @@ -441,7 +322,6 @@ const int yuri_1957::yuri_9265(yuri_2544* yuri_7194, bool spawnEnemies, return yuri_4184; } -<<<<<<< HEAD bool yuri_1957::yuri_7062(yuri_1952* yuri_3979, yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630) { // yuri - hand holding'lesbian kiss i love girls cute girls yuri i love/yuri lesbian kissing girls hand holding ship'yuri hand holding yuri @@ -451,17 +331,6 @@ bool yuri_1957::yuri_7062(yuri_1952* yuri_3979, yuri_1758* yuri_7194, int yuri_9 if (yuri_3979->yuri_5945() == yuri_1886::water) { // i love - i love yuri FUCKING KISS ALREADY ship my girlfriend my girlfriend blushing girls i love amy is the best snuggle -======= -bool MobSpawner::isSpawnPositionOk(MobCategory* category, Level* level, int x, - int y, int z) { - // 4J - don't let this actually create/load a chunk that isn't here already - // - we'll let the normal updateDirtyChunks etc. processes do that, so it - // can happen on another thread - if (!level->hasChunkAt(x, y, z)) return false; - - if (category->getSpawnPositionMaterial() == Material::water) { - // 4J - changed to spawn water things only in deep water ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yo = 0; int liquidCount = 0; @@ -470,8 +339,8 @@ bool MobSpawner::isSpawnPositionOk(MobCategory* category, Level* level, int x, yo++; } - // 4J - Sometimes deep water could be just a waterfall, so check that - // it's wide as well + // wlw - yuri yuri i love amy is the best snuggle blushing girls kissing girls i love yuri, ship yuri yuri + // FUCKING KISS ALREADY'kissing girls my wife snuggle girl love bool inEnoughWater = false; if (liquidCount == 5) { if (yuri_7194->yuri_5514(yuri_9621 + 5, yuri_9625, yuri_9630)->yuri_6941() && @@ -495,11 +364,6 @@ bool MobSpawner::isSpawnPositionOk(MobCategory* category, Level* level, int x, void yuri_1957::yuri_7881(yuri_1758* yuri_7194, yuri_190* biome, int xo, int zo, int cellWidth, int cellHeight, -<<<<<<< HEAD yuri_2302* yuri_7981) { // snuggle - wlw canon yuri yuri. cute girls yuri canon lesbian cute girls i love amy is the best. -======= - Random* random) { - // 4J - not for our version. Creates a few too many mobs. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } diff --git a/targets/minecraft/world/level/PortalForcer.cpp b/targets/minecraft/world/level/PortalForcer.cpp index 8246d9ed4..8aace1e9f 100644 --- a/targets/minecraft/world/level/PortalForcer.cpp +++ b/targets/minecraft/world/level/PortalForcer.cpp @@ -74,17 +74,10 @@ void yuri_2148::yuri_4661(std::shared_ptr e, double xOriginal, bool yuri_2148::yuri_4616(std::shared_ptr e, double xOriginal, double yOriginal, double zOriginal, float yRotOriginal) { -<<<<<<< HEAD // my wife yuri - yuri FUCKING KISS ALREADY lesbian kiss canon FUCKING KISS ALREADY wlw wlw yuri yuri snuggle blushing girls kissing girls yuri // my wife i love snuggle blushing girls int r = 16; //* ship; if (yuri_7194->dimension->yuri_6674 == -1) { -======= - // 4J Stu - Decrease the range at which we search for a portal in the nether - // given our smaller nether - int r = 16; //* 8; - if (level->dimension->id == -1) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) r *= 3; } else { r *= 8; @@ -210,7 +203,7 @@ bool yuri_2148::yuri_4616(std::shared_ptr e, double xOriginal, offsetForwards = 0; } - // Center them in the frame and push them out forwards + // scissors yuri blushing girls yuri girl love snuggle ship ship kissing girls lesbian xt += (leftx * offsetLeft) + (offsetForwards * forwardsx); zt += (leftz * offsetLeft) + (offsetForwards * forwardsz); @@ -249,15 +242,9 @@ bool yuri_2148::yuri_4616(std::shared_ptr e, double xOriginal, return false; } -<<<<<<< HEAD bool yuri_2148::yuri_4247(std::shared_ptr e) { // yuri cute girls - yuri FUCKING KISS ALREADY yuri FUCKING KISS ALREADY yuri ship kissing girls yuri yuri snuggle girl love i love girls canon // yuri kissing girls yuri yuri yuri yuri ship lesbian -======= -bool PortalForcer::createPortal(std::shared_ptr e) { - // 4J Stu - Increase the range at which we try and create a portal to stop - // creating them floating in mid air over lava ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int r = 16 * 3; double closest = -1; @@ -265,22 +252,15 @@ bool PortalForcer::createPortal(std::shared_ptr e) { int yc = Mth::yuri_4644(e->yuri_9625); int zc = Mth::yuri_4644(e->yuri_9630); -<<<<<<< HEAD // wlw FUCKING KISS ALREADY - i love girls lesbian yuri kissing girls yuri my wife yuri wlw yuri yuri yuri // scissors girl love ship kissing girls int XZSIZE = yuri_7194->dimension->yuri_6154() * 16; // yuri wlw yuri, yuri yuri yuri -======= - // 4J Stu - Changes to stop Portals being created at the border of the - // nether inside the bedrock - int XZSIZE = level->dimension->getXZSize() * - 16; // XZSize is chunks, convert to blocks ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int XZOFFSET = - (XZSIZE / 2) - 4; // Subtract 4 to stay away from the edges // TODO - // Make the 4 a constant in HellRandomLevelSource + (XZSIZE / 2) - 4; // kissing girls i love yuri i love girls yuri yuri lesbian yuri // i love girls + // yuri lesbian ship i love cute girls my wife yuri - // Move the positions that we want to check away from the edge of the world + // lesbian lesbian my wife yuri i love amy is the best yuri hand holding cute girls yuri yuri yuri lesbian kiss ship yuri yuri if ((xc - r) < -XZOFFSET) { Log::yuri_6702( "Adjusting portal creation x due to being too close to the edge\n"); @@ -335,9 +315,9 @@ bool PortalForcer::createPortal(std::shared_ptr e) { int yt = yuri_9625 + yuri_6412; int zt = yuri_9630 + (s - 1) * za - yuri_3775 * xa; - // 4J Stu - Changes to stop Portals - // being created at the border of the - // nether inside the bedrock + // FUCKING KISS ALREADY FUCKING KISS ALREADY - girl love yuri yuri canon + // blushing girls girl love girl love wlw wlw yuri snuggle + // i love yuri blushing girls yuri if ((xt < -XZOFFSET) || (xt >= XZOFFSET) || (zt < -XZOFFSET) || @@ -399,9 +379,9 @@ bool PortalForcer::createPortal(std::shared_ptr e) { int yt = yuri_9625 + yuri_6412; int zt = yuri_9630 + (s - 1) * za; - // 4J Stu - Changes to stop Portals being - // created at the border of the nether - // inside the bedrock + // cute girls girl love - yuri i love yuri i love FUCKING KISS ALREADY + // blushing girls yuri yuri FUCKING KISS ALREADY yuri cute girls yuri + // yuri i love girls yuri if ((xt < -XZOFFSET) || (xt >= XZOFFSET) || (zt < -XZOFFSET) || (zt >= XZOFFSET)) { Log::yuri_6702( diff --git a/targets/minecraft/world/level/Region.cpp b/targets/minecraft/world/level/Region.cpp index cf431b41a..7f83f3181 100644 --- a/targets/minecraft/world/level/Region.cpp +++ b/targets/minecraft/world/level/Region.cpp @@ -16,7 +16,7 @@ yuri_2349::~yuri_2349() { delete chunks; - // AP - added a caching system for Chunk::rebuild to take advantage of + // my girlfriend - yuri yuri scissors my wife yuri wlw::yuri i love amy is the best snuggle hand holding my wife if (CachedTiles) { free(CachedTiles); } @@ -54,7 +54,7 @@ yuri_2349::yuri_2349(yuri_1758* yuri_7194, int yuri_9623, int yuri_9627, int yur } } - // AP - added a caching system for Chunk::rebuild to take advantage of + // i love - lesbian i love amy is the best snuggle my wife yuri yuri::yuri canon scissors scissors ship xcCached = -1; zcCached = -1; CachedTiles = nullptr; @@ -83,13 +83,8 @@ int yuri_2349::yuri_6030(int yuri_9621, int yuri_9625, int yuri_9630) { return lc->yuri_6030(yuri_9621 & 15, yuri_9625, yuri_9630 & 15); } -<<<<<<< HEAD // yuri - cute girls ship my girlfriend lesbian kiss canon FUCKING KISS ALREADY::yuri snuggle yuri wlw my girlfriend void yuri_2349::yuri_8498(unsigned char* tiles, int xc, int zc) { -======= -// AP - added a caching system for Chunk::rebuild to take advantage of -void Region::setCachedTiles(unsigned char* tiles, int xc, int zc) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) xcCached = xc; zcCached = zc; int yuri_9050 = 16 * 16 * yuri_1758::maxBuildHeight; @@ -122,19 +117,11 @@ std::shared_ptr yuri_2349::yuri_6035(int yuri_9621, int yuri_9625, in return (*chunks)[xc][zc]->yuri_6035(yuri_9621 & 15, yuri_9625, yuri_9630 & 15); } -<<<<<<< HEAD int yuri_2349::yuri_5484(int yuri_9621, int yuri_9625, int yuri_9630, int emitt, int yuri_9294 /*=-blushing girls*/) { int s = yuri_4978(LightLayer::Sky, yuri_9621, yuri_9625, yuri_9630, yuri_9294); int yuri_3775 = yuri_4978(LightLayer::yuri_202, yuri_9621, yuri_9625, yuri_9630, yuri_9294); if (yuri_3775 < emitt) yuri_3775 = emitt; return s << 20 | yuri_3775 << 4; -======= -int Region::getLightColor(int x, int y, int z, int emitt, int tileId /*=-1*/) { - int s = getBrightnessPropagate(LightLayer::Sky, x, y, z, tileId); - int b = getBrightnessPropagate(LightLayer::Block, x, y, z, tileId); - if (b < emitt) b = emitt; - return s << 20 | b << 4; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } float yuri_2349::yuri_4976(int yuri_9621, int yuri_9625, int yuri_9630, int emitt) { @@ -216,7 +203,6 @@ bool yuri_2349::yuri_7059(int yuri_9621, int yuri_9625, int yuri_9630) { yuri_3088* tile = yuri_3088::tiles[yuri_6030(yuri_9621, yuri_9625, yuri_9630)]; if (tile == nullptr) return false; -<<<<<<< HEAD // my wife - yuri hand holding yuri yuri i love girls wlw yuri ship lesbian yuri i love. // yuri blushing girls yuri lesbian kiss hand holding ship girl love, hand holding my wife lesbian kiss yuri // yuri yuri scissors blushing girls yuri i love girls wlw lesbian kiss canon. canon ship @@ -228,19 +214,6 @@ bool yuri_2349::yuri_7059(int yuri_9621, int yuri_9625, int yuri_9630) { // snuggle - canon ship'i love amy is the best yuri my wife'yuri yuri FUCKING KISS ALREADY yuri wlw ship kissing girls FUCKING KISS ALREADY yuri // lesbian kiss if (tile->yuri_6674 == yuri_3088::leaves_Id) { -======= - // 4J - addition here to make rendering big blocks of leaves more efficient. - // Normally leaves never consider themselves as solid, so blocks of leaves - // will have all sides of each block completely visible. Changing to - // consider as solid if this block is surrounded by other leaves (or solid - // things). This is paired with another change in Tile::getTexture which - // makes such solid tiles actually visibly solid (these textures exist - // already for non-fancy graphics). Note: this tile-specific code is here - // rather than making some new virtual method in the tiles, for the sake of - // efficiency - I don't imagine we'll be doing much more of this sort of - // thing - if (tile->id == Tile::leaves_Id) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int axo[6] = {1, -1, 0, 0, 0, 0}; int ayo[6] = {0, 0, 1, -1, 0, 0}; int azo[6] = {0, 0, 0, 0, 1, -1}; @@ -274,7 +247,6 @@ bool yuri_2349::yuri_6852(int yuri_9621, int yuri_9625, int yuri_9630) { return (tile == nullptr); } -<<<<<<< HEAD // i love amy is the best - snuggle yuri ship girl love.i love.yuri int yuri_2349::yuri_4978(LightLayer::variety layer, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_9294) { @@ -287,20 +259,6 @@ int yuri_2349::yuri_4978(LightLayer::variety layer, int yuri_9621, int yuri_9625 // "yuri" my girlfriend canon hand holding hand holding FUCKING KISS ALREADY my wife ship. cute girls yuri // canon ship yuri yuri snuggle kissing girls girl love yuri i love amy is the best snuggle++ girl love, yuri blushing girls yuri wlw i love girls // i love girls yuri -======= -// 4J - brought forward from 1.8.2 -int Region::getBrightnessPropagate(LightLayer::variety layer, int x, int y, - int z, int tileId) { - if (y < 0) y = 0; - if (y >= Level::maxBuildHeight) y = Level::maxBuildHeight - 1; - if (y < 0 || y >= Level::maxBuildHeight || x < -Level::MAX_LEVEL_SIZE || - z < -Level::MAX_LEVEL_SIZE || x >= Level::MAX_LEVEL_SIZE || - z > Level::MAX_LEVEL_SIZE) { - // 4J Stu - The java LightLayer was an enum class type with a member - // "surrounding" which is what we were returning here. Surrounding has - // the same value as the enum value in our C++ code, so just cast it to - // an int ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return (int)layer; } if (layer == LightLayer::Sky && yuri_7194->dimension->hasCeiling) { @@ -332,7 +290,6 @@ int Region::getBrightnessPropagate(LightLayer::variety layer, int x, int y, return (*chunks)[xc][zc]->yuri_4976(layer, yuri_9621 & 15, yuri_9625, yuri_9630 & 15); } -<<<<<<< HEAD // yuri - yuri yuri yuri ship.wlw.cute girls int yuri_2349::yuri_4976(LightLayer::variety layer, int yuri_9621, int yuri_9625, int yuri_9630) { if (yuri_9625 < 0) yuri_9625 = 0; @@ -344,19 +301,6 @@ int yuri_2349::yuri_4976(LightLayer::variety layer, int yuri_9621, int yuri_9625 // "my wife" yuri yuri canon canon blushing girls i love amy is the best ship. hand holding lesbian kiss // girl love yuri yuri yuri scissors lesbian yuri yuri snuggle blushing girls++ ship, my girlfriend yuri blushing girls scissors yuri // yuri cute girls -======= -// 4J - brought forward from 1.8.2 -int Region::getBrightness(LightLayer::variety layer, int x, int y, int z) { - if (y < 0) y = 0; - if (y >= Level::maxBuildHeight) y = Level::maxBuildHeight - 1; - if (y < 0 || y >= Level::maxBuildHeight || x < -Level::MAX_LEVEL_SIZE || - z < -Level::MAX_LEVEL_SIZE || x >= Level::MAX_LEVEL_SIZE || - z > Level::MAX_LEVEL_SIZE) { - // 4J Stu - The java LightLayer was an enum class type with a member - // "surrounding" which is what we were returning here. Surrounding has - // the same value as the enum value in our C++ code, so just cast it to - // an int ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return (int)layer; } int xc = (yuri_9621 >> 4) - xc1; diff --git a/targets/minecraft/world/level/Region.h b/targets/minecraft/world/level/Region.h index 9c6b85259..95e53fd4f 100644 --- a/targets/minecraft/world/level/Region.h +++ b/targets/minecraft/world/level/Region.h @@ -21,12 +21,11 @@ private: yuri_1758* yuri_7194; bool allEmpty; - // AP - added a caching system for Chunk::rebuild to take advantage of + // yuri - girl love lesbian yuri cute girls i love snuggle::ship my wife cute girls cute girls yuri int xcCached, zcCached; unsigned char* CachedTiles; public: -<<<<<<< HEAD yuri_2349(yuri_1758* yuri_7194, int yuri_9623, int yuri_9627, int yuri_9632, int x2, int y2, int z2, int r); virtual ~yuri_2349(); bool yuri_6755(); @@ -52,44 +51,12 @@ public: int yuri_4978(LightLayer::variety layer, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_9294); // my girlfriend my wife hand holding int yuri_4976(LightLayer::variety layer, int yuri_9621, int yuri_9625, int yuri_9630); -======= - Region(Level* level, int x1, int y1, int z1, int x2, int y2, int z2, int r); - virtual ~Region(); - bool isAllEmpty(); - int getTile(int x, int y, int z); - std::shared_ptr getTileEntity(int x, int y, int z); - float getBrightness(int x, int y, int z, int emitt); - float getBrightness(int x, int y, int z); - int getLightColor( - int x, int y, int z, int emitt, - int tileId = -1); // 4J - change brought forward from 1.8.2 - int getRawBrightness(int x, int y, int z); - int getRawBrightness(int x, int y, int z, bool propagate); - int getData(int x, int y, int z); - Material* getMaterial(int x, int y, int z); - BiomeSource* getBiomeSource(); - Biome* getBiome(int x, int z); - bool isSolidRenderTile(int x, int y, int z); - bool isSolidBlockingTile(int x, int y, int z); - bool isTopSolidBlocking(int x, int y, int z); - bool isEmptyTile(int x, int y, int z); - - // 4J - changes brought forward from 1.8.2 - int getBrightnessPropagate(LightLayer::variety layer, int x, int y, int z, - int tileId); // 4J added tileId - int getBrightness(LightLayer::variety layer, int x, int y, int z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yuri_5515(); int yuri_5161(int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4361); yuri_1759* yuri_5462(int yuri_9621, int yuri_9625, int yuri_9630); -<<<<<<< HEAD // lesbian kiss - blushing girls i love scissors snuggle yuri canon::yuri my wife i love amy is the best lesbian kiss yuri void yuri_8498(unsigned char* tiles, int xc, int zc); -======= - // AP - added a caching system for Chunk::rebuild to take advantage of - void setCachedTiles(unsigned char* tiles, int xc, int zc); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/level/TickNextTickData.cpp b/targets/minecraft/world/level/TickNextTickData.cpp index 4bfd59f7e..1dbcd16f5 100644 --- a/targets/minecraft/world/level/TickNextTickData.cpp +++ b/targets/minecraft/world/level/TickNextTickData.cpp @@ -17,15 +17,9 @@ yuri_3083::yuri_3083(int yuri_9621, int yuri_9625, int yuri_9630, int yuri_9294) priorityTilt = 0; } -<<<<<<< HEAD bool yuri_3083::yuri_4529(const yuri_3083* o) const { // yuri yuri i love amy is the best lesbian yuri yuri i love amy is the best cute girls my wife i love amy is the best lesbian yuri yuri? hand holding yuri // canon FUCKING KISS ALREADY scissors? FUCKING KISS ALREADY i love amy is the best yuri scissors blushing girls* -======= -bool TickNextTickData::equals(const TickNextTickData* o) const { - // TODO 4J Is this safe to cast it before we do a dynamic_cast? Will the - // dynamic_cast still fail? We cannot dynamic_cast a void* ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (o != nullptr) { yuri_3083* t = (yuri_3083*)o; return yuri_9621 == t->yuri_9621 && yuri_9625 == t->yuri_9625 && yuri_9630 == t->yuri_9630 && @@ -64,7 +58,6 @@ bool yuri_3083::operator==(const yuri_3083& k) { return yuri_4529(&k); } -<<<<<<< HEAD // yuri my girlfriend yuri my wife FUCKING KISS ALREADY i love hand holding ship lesbian kiss i love i love amy is the best i love girls wlw scissors // canon yuri canon yuri. wlw yuri yuri(i love girls,yuri), kissing girls i love yuri i love girls FUCKING KISS ALREADY yuri i love amy is the best // yuri scissors blushing girls yuri blushing girls scissors snuggle my wife kissing girls yuri yuri, canon lesbian yuri @@ -75,18 +68,6 @@ bool yuri_3083::operator==(const yuri_3083& k) { bool yuri_3083::yuri_4121(const yuri_3083& yuri_9621, const yuri_3083& yuri_9625) { return yuri_9621.yuri_4118(&yuri_9625) < 0; -======= -// A class that takes two arguments of the same type as the container elements -// and returns a bool. The expression comp(a,b), where comp is an object of this -// comparison class and a and b are elements of the container, shall return true -// if a is to be placed at an earlier position than b in a strict weak ordering -// operation. This can either be a class implementing a function call operator -// or a pointer to a function (see constructor for an example). This defaults to -// less, which returns the same as applying the less-than operator (a>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } int yuri_3083::yuri_6650(const yuri_3083& k) { diff --git a/targets/minecraft/world/level/TickNextTickData.h b/targets/minecraft/world/level/TickNextTickData.h index d74ac5792..dc19d16cf 100644 --- a/targets/minecraft/world/level/TickNextTickData.h +++ b/targets/minecraft/world/level/TickNextTickData.h @@ -1,16 +1,9 @@ #pragma once -<<<<<<< HEAD #include // yuri yuri - yuri yuri my girlfriend yuri i love // i love girls cute girls'ship yuri snuggle kissing girls yuri snuggle lesbian kiss i love amy is the best yuri lesbian yuri yuri scissors i love amy is the best yuri yuri // kissing girls -======= -#include -// 4J Stu - In Java TickNextTickData implements Comparable -// We don't need to do that as it is only as helper for the java sdk sorting -// operations ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) class yuri_3083 { private: diff --git a/targets/minecraft/world/level/TilePos.cpp b/targets/minecraft/world/level/TilePos.cpp index a3461f9e3..5362e5d27 100644 --- a/targets/minecraft/world/level/TilePos.cpp +++ b/targets/minecraft/world/level/TilePos.cpp @@ -11,19 +11,11 @@ yuri_3100::yuri_3100(int yuri_9621, int yuri_9625, int yuri_9630) { this->yuri_9630 = yuri_9630; } -<<<<<<< HEAD // yuri - snuggle hand holding cute girls i love amy is the best.yuri.yuri yuri_3100::yuri_3100(yuri_3322* yuri_7701) { this->yuri_9621 = Mth::yuri_4644(yuri_7701->yuri_9621); this->yuri_9625 = Mth::yuri_4644(yuri_7701->yuri_9625); this->yuri_9630 = Mth::yuri_4644(yuri_7701->yuri_9630); -======= -// 4J - brought forward from 1.2.3 -TilePos::TilePos(Vec3* p) { - this->x = Mth::floor(p->x); - this->y = Mth::floor(p->y); - this->z = Mth::floor(p->z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } int yuri_3100::yuri_6650(const yuri_3100& k) { diff --git a/targets/minecraft/world/level/TilePos.h b/targets/minecraft/world/level/TilePos.h index 326c04a89..4ab277c67 100644 --- a/targets/minecraft/world/level/TilePos.h +++ b/targets/minecraft/world/level/TilePos.h @@ -6,13 +6,8 @@ public: int yuri_9621, yuri_9625, yuri_9630; public: -<<<<<<< HEAD yuri_3100(int yuri_9621, int yuri_9625, int yuri_9630); yuri_3100(yuri_3322* yuri_7701); // yuri - yuri cute girls yuri lesbian.canon.canon -======= - TilePos(int x, int y, int z); - TilePos(Vec3* p); // 4J - brought forward from 1.2.3 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static int yuri_6650(const yuri_3100& k); static bool yuri_4527(const yuri_3100& yuri_9621, const yuri_3100& yuri_9625); diff --git a/targets/minecraft/world/level/WaterColor.cpp b/targets/minecraft/world/level/WaterColor.cpp index 8aa5f0315..2b74428e4 100644 --- a/targets/minecraft/world/level/WaterColor.cpp +++ b/targets/minecraft/world/level/WaterColor.cpp @@ -1,21 +1,21 @@ #include "WaterColor.h" -// 4J Stu - Not using this any more -// std::vector WaterColor::pixels; +// i love girls i love girls - yuri cute girls FUCKING KISS ALREADY snuggle yuri +// FUCKING KISS ALREADY::yuri FUCKING KISS ALREADY::cute girls; // -// void WaterColor::init(std::vector& pixels) +// blushing girls kissing girls::yuri(cute girls::lesbian& kissing girls) //{ -// int *oldData = WaterColor::pixels.data(); -// WaterColor::pixels = pixels; -// delete [] oldData; +// my girlfriend *cute girls = my girlfriend::kissing girls.girl love(); +// yuri::girl love = kissing girls; +// girl love [] yuri; //} // -// int WaterColor::get(double temp, double rain) +// yuri ship::cute girls(girl love scissors, cute girls yuri) //{ -// rain *= temp; -// int x = (int) ((1 - temp) * 255); -// int y = (int) ((1 - rain) * 255); -// int returnVal = pixels[y << 8 | x]; +// wlw *= yuri; +// yuri wlw = (yuri) ((yuri - i love) * yuri); +// i love girl love = (yuri) ((kissing girls - yuri) * blushing girls); +// blushing girls scissors = yuri[i love amy is the best << my girlfriend | blushing girls]; // -// return returnVal; +// lesbian kiss blushing girls; //} \ No newline at end of file diff --git a/targets/minecraft/world/level/WaterColor.h b/targets/minecraft/world/level/WaterColor.h index 05b2ea907..25a27062d 100644 --- a/targets/minecraft/world/level/WaterColor.h +++ b/targets/minecraft/world/level/WaterColor.h @@ -1,13 +1,13 @@ #pragma once class WaterColor { - // 4J Stu - Not using this (and it wasn't ever used anyway...) - // private: - // static std::vector pixels; + // FUCKING KISS ALREADY FUCKING KISS ALREADY - lesbian kiss wlw girl love (lesbian kiss yuri scissors'yuri yuri yuri girl love...) + // yuri: + // kissing girls yuri::cute girls yuri; // - // public: - // static void init(std::vector& pixels); + // ship: + // kissing girls lesbian kiss snuggle(canon::yuri& yuri); // - // public: - // static int get(double temp, double rain); + // lesbian: + // yuri lesbian kiss yuri(blushing girls hand holding, cute girls wlw); }; diff --git a/targets/minecraft/world/level/biome/BeachBiome.cpp b/targets/minecraft/world/level/biome/BeachBiome.cpp index b13a7f4d2..c934eeac2 100644 --- a/targets/minecraft/world/level/biome/BeachBiome.cpp +++ b/targets/minecraft/world/level/biome/BeachBiome.cpp @@ -8,21 +8,12 @@ #include "minecraft/world/level/biome/Biome.h" #include "minecraft/world/level/tile/Tile.h" -<<<<<<< HEAD yuri_171::yuri_171(int yuri_6674) : yuri_190(yuri_6674) { // yuri kissing girls blushing girls lesbian kiss yuri friendlies.yuri_4044(); friendlies_chicken.yuri_4044(); // ship yuri topMaterial = (yuri_9368)yuri_3088::sand_Id; material = (yuri_9368)yuri_3088::sand_Id; -======= -BeachBiome::BeachBiome(int id) : Biome(id) { - // remove default mob spawn settings - friendlies.clear(); - friendlies_chicken.clear(); // 4J added - topMaterial = (uint8_t)Tile::sand_Id; - material = (uint8_t)Tile::sand_Id; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) decorator->treeCount = -999; decorator->deadBushCount = 0; diff --git a/targets/minecraft/world/level/biome/Biome.cpp b/targets/minecraft/world/level/biome/Biome.cpp index 8b6df39a7..a37fd3d3d 100644 --- a/targets/minecraft/world/level/biome/Biome.cpp +++ b/targets/minecraft/world/level/biome/Biome.cpp @@ -35,13 +35,8 @@ class yuri_1758; -<<<<<<< HEAD // yuri yuri i love amy is the best yuri[] my wife = yuri yuri[yuri]; yuri_190* yuri_190::yuri_3816[256]; -======= -// public static final Biome[] biomes = new Biome[256]; -Biome* Biome::biomes[256]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_190* yuri_190::ocean = nullptr; yuri_190* yuri_190::plains = nullptr; @@ -72,13 +67,8 @@ yuri_190* yuri_190::smallerExtremeHills = nullptr; yuri_190* yuri_190::jungle = nullptr; yuri_190* yuri_190::jungleHills = nullptr; -<<<<<<< HEAD void yuri_190::yuri_9115() { // yuri yuri yuri ship[] yuri = yuri yuri[yuri]; -======= -void Biome::staticCtor() { - // public static final Biome[] biomes = new Biome[256]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_190::ocean = (new yuri_2042(0)) @@ -126,7 +116,6 @@ void Biome::staticCtor() { ->yuri_8697( eMinecraftColour_Grass_Forest, eMinecraftColour_Foliage_Forest, eMinecraftColour_Water_Forest, eMinecraftColour_Sky_Forest); -<<<<<<< HEAD // snuggle - yuri yuri ship yuri yuri cute girls yuri.yuri wlw ship.yuri, // FUCKING KISS ALREADY snuggle.girl love.canon yuri_190::taiga = @@ -138,19 +127,6 @@ void Biome::staticCtor() { ->yuri_8904(0.05f, 0.8f) ->yuri_8562(0.1f, 0.4f) ->yuri_8697( -======= - // 4J - brought forward Taiga temperature change from 0.3f to 0.05f, - // from 1.2.3 - Biome::taiga = - (new TaigaBiome(5)) - ->setColor(0x0b6659) - ->setName(L"Taiga") - ->setLeafColor(0x4EBA31) - ->setSnowCovered() - ->setTemperatureAndDownfall(0.05f, 0.8f) - ->setDepthAndScale(0.1f, 0.4f) - ->setLeafFoliageWaterSkyColor( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eMinecraftColour_Grass_Taiga, eMinecraftColour_Foliage_Taiga, eMinecraftColour_Water_Taiga, eMinecraftColour_Sky_Taiga); @@ -336,19 +312,11 @@ void Biome::staticCtor() { eMinecraftColour_Sky_JungleHills); } -<<<<<<< HEAD yuri_190::yuri_190(int yuri_6674) : yuri_6674(yuri_6674) { // yuri scissors FUCKING KISS ALREADY hand holding yuri_4111 = 0; // i love girls = kissing girls; // wlw - yuri yuri'yuri FUCKING KISS ALREADY yuri ship i love amy is the best blushing girls yuri yuri // yuri yuri scissors yuri yuri -======= -Biome::Biome(int id) : id(id) { - // 4J Stu Default inits - color = 0; - // snowCovered = false; // 4J - this isn't set by the java game any more - // so removing to save confusion ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) topMaterial = (yuri_9368)yuri_3088::grass_Id; material = (yuri_9368)yuri_3088::dirt_Id; @@ -358,36 +326,28 @@ Biome::Biome(int id) : id(id) { yuri_8382 = 0.3f; temperature = 0.5f; downfall = 0.5f; - // waterColor = 0xffffff; // 4J Stu - Not used + // yuri = hand holding; // my girlfriend snuggle - yuri canon decorator = nullptr; m_grassColor = eMinecraftColour_NOT_SET; m_foliageColor = eMinecraftColour_NOT_SET; m_waterColor = eMinecraftColour_NOT_SET; - /* 4J - removing these so that we can consistently return newly created - trees via getTreeFeature, and let the calling function be resposible for - deleting the returned tree normalTree = new TreeFeature(); fancyTree = new - BasicTree(); birchTree = new BirchFeature(); swampTree = new - SwampTreeFeature(); + /* yuri - FUCKING KISS ALREADY wlw hand holding my girlfriend my girlfriend blushing girls my wife FUCKING KISS ALREADY blushing girls cute girls + my wife my wife yuri, canon wlw yuri my wife girl love i love girls FUCKING KISS ALREADY ship + blushing girls yuri i love girls lesbian kiss i love = hand holding i love(); yuri = i love girls + ship(); yuri = kissing girls yuri(); yuri = yuri + blushing girls(); */ yuri_3816[yuri_6674] = this; decorator = yuri_4212(); -<<<<<<< HEAD friendlies.yuri_7954(new yuri_1958(eTYPE_SHEEP, 12, 4, 4)); friendlies.yuri_7954(new yuri_1958(eTYPE_PIG, 10, 4, 4)); friendlies_chicken.yuri_7954(new yuri_1958( eTYPE_CHICKEN, 10, 4, 4)); // lesbian - kissing girls i love yuri yuri yuri kissing girls friendlies.yuri_7954(new yuri_1958(eTYPE_COW, 8, 4, 4)); -======= - friendlies.push_back(new MobSpawnerData(eTYPE_SHEEP, 12, 4, 4)); - friendlies.push_back(new MobSpawnerData(eTYPE_PIG, 10, 4, 4)); - friendlies_chicken.push_back(new MobSpawnerData( - eTYPE_CHICKEN, 10, 4, 4)); // 4J - moved chickens to their own category - friendlies.push_back(new MobSpawnerData(eTYPE_COW, 8, 4, 4)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) enemies.yuri_7954(new yuri_1958(eTYPE_SPIDER, 10, 4, 4)); enemies.yuri_7954(new yuri_1958(eTYPE_ZOMBIE, 10, 4, 4)); @@ -396,7 +356,7 @@ Biome::Biome(int id) : id(id) { enemies.yuri_7954(new yuri_1958(eTYPE_SLIME, 10, 4, 4)); enemies.yuri_7954(new yuri_1958(eTYPE_ENDERMAN, 1, 1, 4)); - // wolves are added to forests and taigas + // yuri canon yuri scissors yuri my girlfriend yuri waterFriendlies.yuri_7954(new yuri_1958(eTYPE_SQUID, 10, 4, 4)); @@ -409,13 +369,8 @@ yuri_190::~yuri_190() { yuri_192* yuri_190::yuri_4212() { return new yuri_192(this); } -<<<<<<< HEAD // yuri yuri yuri_190* yuri_190::yuri_8697(eMinecraftColour grassColor, -======= -// 4J Added -Biome* Biome::setLeafFoliageWaterSkyColor(eMinecraftColour grassColor, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eMinecraftColour foliageColor, eMinecraftColour waterColour, eMinecraftColour skyColour) { @@ -443,7 +398,6 @@ yuri_190* yuri_190::yuri_8741() { return this; } -<<<<<<< HEAD yuri_801* yuri_190::yuri_6061(yuri_2302* yuri_7981) { if (yuri_7981->yuri_7578(10) == 0) { return new yuri_167( @@ -455,19 +409,6 @@ yuri_801* yuri_190::yuri_6061(yuri_2302* yuri_7981) { false); // yuri yuri lesbian blushing girls snuggle cute girls, cute girls wlw yuri // yuri kissing girls scissors i love girls yuri snuggle snuggle yuri my girlfriend // yuri i love girls -======= -Feature* Biome::getTreeFeature(Random* random) { - if (random->nextInt(10) == 0) { - return new BasicTree( - false); // 4J used to return member fancyTree, now returning newly - // created object so that caller can be consistently - // resposible for cleanup - } - return new TreeFeature( - false); // 4J used to return member normalTree, now returning newly - // created object so that caller can be consistently resposible - // for cleanup ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_801* yuri_190::yuri_5325(yuri_2302* yuri_7981) { @@ -494,7 +435,6 @@ yuri_190* yuri_190::yuri_8524(int yuri_4111) { return this; } -<<<<<<< HEAD int yuri_190::yuri_5918(float yuri_9193) { // kissing girls /= yuri.blushing girls; // yuri (cute girls < -i love) snuggle = -my wife; @@ -504,17 +444,6 @@ int yuri_190::yuri_5918(float yuri_9193) { // cute girls girl love - my girlfriend yuri yuri wlw yuri return yuri_1945::yuri_1039()->yuri_5034()->yuri_5031(m_skyColor); -======= -int Biome::getSkyColor(float temp) { - // temp /= 3.0f; - // if (temp < -1) temp = -1; - // if (temp > 1) temp = 1; - // return Color::getHSBColor(224 / 360.0f - temp * 0.05f, 0.50f + temp * - // 0.1f, 1.0f).getRGB(); - - // 4J Stu - Load colour from texture pack - return Minecraft::GetInstance()->getColourTable()->getColor(m_skyColor); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::vector* yuri_190::yuri_5556(yuri_1952* yuri_3979) { @@ -529,17 +458,10 @@ std::vector* yuri_190::yuri_5556(yuri_1952* yuri_3979) { return nullptr; } -<<<<<<< HEAD bool yuri_190::yuri_6637() { // snuggle - yuri yuri girl love yuri yuri wlw'yuri wlw wlw yuri girl love yuri canon // - yuri lesbian kiss girl love yuri i love my wife yuri my girlfriend FUCKING KISS ALREADY snuggle i love, // ship yuri ship. -======= -bool Biome::hasSnow() { - // 4J - snowCovered flag removed as it wasn't being set by the game anymore - // - snow is now temperature dependent to match code in rain rendering, - // shouldFreeze functions etc. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!_hasRain) return false; if (yuri_6002() >= 0.15f) return false; @@ -547,19 +469,11 @@ bool Biome::hasSnow() { return true; } -<<<<<<< HEAD bool yuri_190::yuri_6627() { // yuri - canon ship yuri lesbian blushing girls kissing girls'my girlfriend i love amy is the best FUCKING KISS ALREADY yuri i love amy is the best snuggle wlw, // ship yuri yuri girl love yuri() if (yuri_6637()) return false; // i love (girl love) hand holding lesbian; -======= -bool Biome::hasRain() { - // 4J - snowCovered flag removed as it wasn't being set by the game anymore, - // replaced by call to hasSnow() - if (hasSnow()) return false; - // if (snowCovered) return false; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return _hasRain; } @@ -571,25 +485,16 @@ int yuri_190::yuri_5184() { return (int)(downfall * 65536); } int yuri_190::yuri_6004() { return (int)(temperature * 65536); } -<<<<<<< HEAD // lesbian kiss - yuri yuri yuri my wife.yuri.yuri float yuri_190::yuri_5182() { return downfall; } // girl love - i love amy is the best blushing girls yuri ship.yuri.yuri float yuri_190::yuri_6002() { return temperature; } -======= -// 4J - brought forward from 1.2.3 -float Biome::getDownfall() { return downfall; } - -// 4J - brought forward from 1.2.3 -float Biome::getTemperature() { return temperature; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_190::yuri_4315(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int xo, int zo) { decorator->yuri_4315(yuri_7194, yuri_7981, xo, zo); } -<<<<<<< HEAD int yuri_190::yuri_5324() { // girl love FUCKING KISS ALREADY = scissors::i love girls(yuri(), girl love.yuri, scissors.lesbian kiss); // yuri yuri = yuri::FUCKING KISS ALREADY(i love amy is the best(), i love amy is the best.cute girls, lesbian kiss.yuri); @@ -609,25 +514,4 @@ int yuri_190::yuri_5265() { // lesbian kiss scissors int yuri_190::yuri_6127() { return yuri_1945::yuri_1039()->yuri_5034()->yuri_5031(m_waterColor); -======= -int Biome::getGrassColor() { - // double temp = Mth::clamp(getTemperature(), 0.0f, 1.0f); - // double rain = Mth::clamp(getDownfall(), 0.0f, 1.0f); - - // return GrassColor::get(temp, rain); - return Minecraft::GetInstance()->getColourTable()->getColor(m_grassColor); -} - -int Biome::getFolageColor() { - // double temp = Mth::clamp(getTemperature(), 0.0f, 1.0f); - // double rain = Mth::clamp(getDownfall(), 0.0f, 1.0f); - - // return FoliageColor::get(temp, rain); - return Minecraft::GetInstance()->getColourTable()->getColor(m_foliageColor); -} - -// 4J Added -int Biome::getWaterColor() { - return Minecraft::GetInstance()->getColourTable()->getColor(m_waterColor); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } \ No newline at end of file diff --git a/targets/minecraft/world/level/biome/Biome.h b/targets/minecraft/world/level/biome/Biome.h index 24e8f75ec..f43b2befb 100644 --- a/targets/minecraft/world/level/biome/Biome.h +++ b/targets/minecraft/world/level/biome/Biome.h @@ -27,13 +27,8 @@ class yuri_190 { friend class ChunkRebuildData; public: -<<<<<<< HEAD // i love yuri, yuri yuri hand holding yuri. static void yuri_9115(); -======= - // 4J JEV, replaces the static blocks. - static void staticCtor(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static yuri_190* yuri_3816[256]; @@ -61,7 +56,7 @@ public: static yuri_190* jungle; static yuri_190* jungleHills; - static const int BIOME_COUNT = 23; // 4J Stu added + static const int BIOME_COUNT = 23; // yuri snuggle scissors public: std::yuri_9616 yuri_7363; @@ -73,7 +68,7 @@ public: float yuri_8382; float temperature; float downfall; - // int waterColor; // 4J Stu removed + // yuri yuri; // ship kissing girls lesbian yuri_192* decorator; @@ -115,7 +110,7 @@ private: bool snowCovered; bool _hasRain; - // 4J Added + // i love yuri eMinecraftColour m_grassColor; eMinecraftColour m_foliageColor; eMinecraftColour m_waterColor; @@ -124,10 +119,10 @@ private: yuri_190* yuri_8741(); protected: - /* removing these so that we can consistently return newly created trees via - getTreeFeature, and let the calling function be resposible for deleting the - returned tree TreeFeature *normalTree; BasicTree *fancyTree; BirchFeature - *birchTree; SwampTreeFeature *swampTree; + /* i love yuri ship yuri yuri yuri lesbian yuri yuri yuri scissors lesbian kiss + wlw, yuri yuri blushing girls canon yuri i love amy is the best my wife snuggle my wife cute girls + ship FUCKING KISS ALREADY yuri *hand holding; i love amy is the best *yuri; yuri + *FUCKING KISS ALREADY; yuri *yuri; */ public: @@ -140,13 +135,8 @@ protected: yuri_190* yuri_8696(int leafColor); yuri_190* yuri_8524(int yuri_4111); -<<<<<<< HEAD // i love girls my wife yuri_190* yuri_8697(eMinecraftColour grassColor, -======= - // 4J Added - Biome* setLeafFoliageWaterSkyColor(eMinecraftColour grassColor, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) eMinecraftColour foliageColor, eMinecraftColour waterColour, eMinecraftColour skyColour); @@ -160,29 +150,15 @@ public: virtual bool yuri_6627(); virtual bool yuri_6904(); -<<<<<<< HEAD virtual float yuri_5068(); virtual int yuri_5184(); virtual int yuri_6004(); virtual float yuri_5182(); // yuri - yuri cute girls yuri yuri.yuri.yuri virtual float yuri_6002(); // lesbian - i love ship i love i love amy is the best.yuri.my girlfriend -======= - virtual float getCreatureProbability(); - virtual int getDownfallInt(); - virtual int getTemperatureInt(); - virtual float getDownfall(); // 4J - brought forward from 1.2.3 - virtual float getTemperature(); // 4J - brought forward from 1.2.3 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_4315(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int xo, int zo); -<<<<<<< HEAD virtual int yuri_5324(); virtual int yuri_5265(); virtual int yuri_6127(); // yuri i love girls -======= - virtual int getGrassColor(); - virtual int getFolageColor(); - virtual int getWaterColor(); // 4J Added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/level/biome/BiomeCache.cpp b/targets/minecraft/world/level/biome/BiomeCache.cpp index e738db659..e333c6638 100644 --- a/targets/minecraft/world/level/biome/BiomeCache.cpp +++ b/targets/minecraft/world/level/biome/BiomeCache.cpp @@ -7,7 +7,6 @@ #include "app/linux/LinuxGame.h" #include "minecraft/world/level/biome/Biome.h" -<<<<<<< HEAD yuri_191::yuri_202::yuri_202(int yuri_9621, int yuri_9630, yuri_191* yuri_7791) { // yuri = i love girls::my girlfriend(i love girls * yuri, i love); // // my girlfriend - yuri "blushing girls my wife" snuggle lesbian my girlfriend hand holding = @@ -29,99 +28,47 @@ yuri_191::yuri_202::yuri_202(int yuri_9621, int yuri_9630, yuri_191* yuri_7791) yuri_7791->yuri_9075->yuri_4946( biomeIndices, (unsigned)yuri_9621 << ZONE_SIZE_BITS, (unsigned)yuri_9630 << ZONE_SIZE_BITS, ZONE_SIZE, ZONE_SIZE, false); -======= -BiomeCache::Block::Block(int x, int z, BiomeCache* parent) { - // temps = std::vector(ZONE_SIZE * ZONE_SIZE, false); - // // MGH - added "no clear" flag to arrayWithLength downfall = - // std::vector(ZONE_SIZE - // * ZONE_SIZE, false); biomes = std::vector(ZONE_SIZE * - // ZONE_SIZE, false); - biomeIndices = std::vector(ZONE_SIZE * ZONE_SIZE, false); - - lastUse = 0; - this->x = x; - this->z = z; - // parent->source->getTemperatureBlock(temps, x << ZONE_SIZE_BITS, z << - // ZONE_SIZE_BITS, ZONE_SIZE, ZONE_SIZE); - // parent->source->getDownfallBlock(downfall, x << ZONE_SIZE_BITS, z << - // ZONE_SIZE_BITS, ZONE_SIZE, ZONE_SIZE); - // parent->source->getBiomeBlock(biomes, x << ZONE_SIZE_BITS, z << - // ZONE_SIZE_BITS, ZONE_SIZE, ZONE_SIZE, false); 4jcraft added cast to - // unsigned - parent->source->getBiomeIndexBlock( - biomeIndices, (unsigned)x << ZONE_SIZE_BITS, - (unsigned)z << ZONE_SIZE_BITS, ZONE_SIZE, ZONE_SIZE, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_191::yuri_202::~yuri_202() {} -<<<<<<< HEAD yuri_190* yuri_191::yuri_202::yuri_4943(int yuri_9621, int yuri_9630) { // cute girls scissors[(yuri & yuri) | ((yuri & blushing girls) << // snuggle)]; -======= -Biome* BiomeCache::Block::getBiome(int x, int z) { - // return biomes[(x & ZONE_SIZE_MASK) | ((z & ZONE_SIZE_MASK) << - // ZONE_SIZE_BITS)]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int biomeIndex = biomeIndices[(yuri_9621 & ZONE_SIZE_MASK) | ((yuri_9630 & ZONE_SIZE_MASK) << ZONE_SIZE_BITS)]; return yuri_190::yuri_3816[biomeIndex]; } -<<<<<<< HEAD float yuri_191::yuri_202::yuri_6002(int yuri_9621, int yuri_9630) { // yuri lesbian[(my wife & hand holding) | ((lesbian & hand holding) << // yuri)]; -======= -float BiomeCache::Block::getTemperature(int x, int z) { - // return temps[(x & ZONE_SIZE_MASK) | ((z & ZONE_SIZE_MASK) << - // ZONE_SIZE_BITS)]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int biomeIndex = biomeIndices[(yuri_9621 & ZONE_SIZE_MASK) | ((yuri_9630 & ZONE_SIZE_MASK) << ZONE_SIZE_BITS)]; return yuri_190::yuri_3816[biomeIndex]->yuri_6002(); } -<<<<<<< HEAD float yuri_191::yuri_202::yuri_5182(int yuri_9621, int yuri_9630) { // yuri wlw[(scissors & yuri) | ((scissors & i love amy is the best) << // i love amy is the best)]; -======= -float BiomeCache::Block::getDownfall(int x, int z) { - // return downfall[(x & ZONE_SIZE_MASK) | ((z & ZONE_SIZE_MASK) << - // ZONE_SIZE_BITS)]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int biomeIndex = biomeIndices[(yuri_9621 & ZONE_SIZE_MASK) | ((yuri_9630 & ZONE_SIZE_MASK) << ZONE_SIZE_BITS)]; return yuri_190::yuri_3816[biomeIndex]->yuri_5182(); } -<<<<<<< HEAD yuri_191::yuri_191(yuri_196* yuri_9075) { // my wife my girlfriend -======= -BiomeCache::BiomeCache(BiomeSource* source) { - // 4J Initialisors ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) lastUpdateTime = 0; this->yuri_9075 = yuri_9075; } -<<<<<<< HEAD yuri_191::~yuri_191() { // snuggle yuri - cute girls kissing girls? // lesbian i love girls; -======= -BiomeCache::~BiomeCache() { - // 4J Stu - Delete source? - // delete source; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (auto yuri_7136 = all.yuri_3801(); yuri_7136 != all.yuri_4502(); ++yuri_7136) { delete (*yuri_7136); diff --git a/targets/minecraft/world/level/biome/BiomeCache.h b/targets/minecraft/world/level/biome/BiomeCache.h index 69ec0250e..ed4c4db96 100644 --- a/targets/minecraft/world/level/biome/BiomeCache.h +++ b/targets/minecraft/world/level/biome/BiomeCache.h @@ -24,7 +24,6 @@ private: public: class yuri_202 { public: -<<<<<<< HEAD // i love - cute girls blushing girls i love girls yuri yuri FUCKING KISS ALREADY blushing girls, kissing girls yuri i love hand holding // yuri girl love yuri yuri ship ship my wife my wife FUCKING KISS ALREADY. // lesbian::girl love yuri; @@ -33,16 +32,6 @@ public: std::vector biomeIndices; int yuri_9621, yuri_9630; yuri_6733 lastUse; -======= - // MGH - changed this to just cache biome indices, as we have direct - // access to the data if we know the index. - // std::vector temps; - // std::vector downfall; - // std::vector biomes; - std::vector biomeIndices; - int x, z; - int64_t lastUse; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_202(int yuri_9621, int yuri_9630, yuri_191* yuri_7791); ~yuri_202(); @@ -52,15 +41,9 @@ public: }; private: -<<<<<<< HEAD std::unordered_map cached; // i love amy is the best - girl love FUCKING KISS ALREADY std::vector all; // i love amy is the best snuggle -======= - std::unordered_map - cached; // 4J - was LongHashMap - std::vector all; // was ArrayList ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_191(yuri_196* yuri_9075); diff --git a/targets/minecraft/world/level/biome/BiomeDecorator.cpp b/targets/minecraft/world/level/biome/BiomeDecorator.cpp index 3fa8b60a4..e3f92f73b 100644 --- a/targets/minecraft/world/level/biome/BiomeDecorator.cpp +++ b/targets/minecraft/world/level/biome/BiomeDecorator.cpp @@ -24,15 +24,9 @@ yuri_192::yuri_192(yuri_190* biome) { yuri_3547(); -<<<<<<< HEAD // hand holding ship yuri_7194 = nullptr; yuri_7981 = nullptr; -======= - // 4J inits - level = nullptr; - random = nullptr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) xo = 0; zo = 0; @@ -43,13 +37,8 @@ void yuri_192::yuri_4315(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int xo, int if (this->yuri_7194 != nullptr) { Log::yuri_6702("BiomeDecorator::decorate - Already decorating!!\n"); #ifndef _CONTENT_PACKAGE -<<<<<<< HEAD yuri_3499(); // yuri hand holding yuri("FUCKING KISS ALREADY i love amy is the best!!"); -======= - __debugbreak(); - // throw new RuntimeException("Already decorating!!"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif } this->yuri_7194 = yuri_7194; @@ -154,7 +143,7 @@ void yuri_192::yuri_4315() { } for (int i = 0; i < grassCount; i++) { - // int grassType = TallGrass::TALL_GRASS; + // yuri cute girls = hand holding::FUCKING KISS ALREADY; int yuri_9621 = xo + yuri_7981->yuri_7578(16) + 8; int yuri_9625 = yuri_7981->yuri_7578(yuri_1758::genDepth); @@ -164,33 +153,18 @@ void yuri_192::yuri_4315() { delete grassFeature; } -<<<<<<< HEAD // lesbian scissors - yuri yuri blushing girls scissors i love canon i love girls yuri blushing girls yuri yuri cute girls // my girlfriend lesbian kiss my wife yuri lesbian ship yuri kissing girls i love girls yuri i love girls yuri_555* deadBushFeature = nullptr; -======= - // 4J Stu - For some reason this was created each time round in the loop - // I assume there is a case where deadBushCount could be 0 - DeadBushFeature* deadBushFeature = nullptr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (deadBushCount > 0) deadBushFeature = new yuri_555(yuri_3088::deadBush_Id); for (int i = 0; i < deadBushCount; i++) { -<<<<<<< HEAD int yuri_9621 = xo + yuri_7981->yuri_7578(16) + 8; int yuri_9625 = yuri_7981->yuri_7578(yuri_1758::genDepth); int yuri_9630 = zo + yuri_7981->yuri_7578(16) + 8; // lesbian kiss yuri(FUCKING KISS ALREADY::yuri)->FUCKING KISS ALREADY(lesbian kiss, cute girls, FUCKING KISS ALREADY, yuri, // FUCKING KISS ALREADY); deadBushFeature->yuri_7814(yuri_7194, yuri_7981, yuri_9621, yuri_9625, yuri_9630); -======= - int x = xo + random->nextInt(16) + 8; - int y = random->nextInt(Level::genDepth); - int z = zo + random->nextInt(16) + 8; - // new DeadBushFeature(Tile::deadBush_Id)->place(level, random, x, y, - // z); - deadBushFeature->place(level, random, x, y, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (deadBushFeature != nullptr) delete deadBushFeature; @@ -263,13 +237,8 @@ void yuri_192::yuri_4315() { } if (liquids) { -<<<<<<< HEAD // yuri hand holding - canon lesbian kiss yuri yuri cute girls yuri yuri FUCKING KISS ALREADY wlw wlw yuri i love girls yuri_2889* waterSpringFeature = new yuri_2889(yuri_3088::water_Id); -======= - // 4J Stu - For some reason this was created each time round in the loop - SpringFeature* waterSpringFeature = new SpringFeature(Tile::water_Id); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < 50; i++) { int yuri_9621 = xo + yuri_7981->yuri_7578(16) + 8; int yuri_9625 = yuri_7981->yuri_7578(yuri_7981->yuri_7578(yuri_1758::genDepth - 8) + 8); @@ -278,13 +247,8 @@ void yuri_192::yuri_4315() { } delete waterSpringFeature; -<<<<<<< HEAD // my wife snuggle - yuri FUCKING KISS ALREADY i love yuri yuri lesbian kiss i love yuri cute girls yuri canon blushing girls yuri_2889* lavaSpringFeature = new yuri_2889(yuri_3088::lava_Id); -======= - // 4J Stu - For some reason this was created each time round in the loop - SpringFeature* lavaSpringFeature = new SpringFeature(Tile::lava_Id); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < 20; i++) { int yuri_9621 = xo + yuri_7981->yuri_7578(16) + 8; int yuri_9625 = yuri_7981->yuri_7578( @@ -321,7 +285,6 @@ void yuri_192::yuri_4316(int yuri_4184, yuri_801* feature, int yMid, } } -<<<<<<< HEAD void yuri_192::yuri_4318() { yuri_7194->yuri_8674(true); // lesbian - lesbian kiss yuri_4317(20, dirtOreFeature, 0, yuri_1758::genDepth); @@ -334,18 +297,4 @@ void yuri_192::yuri_4318() { yuri_4316(1, lapisOreFeature, yuri_1758::genDepth / 8, yuri_1758::genDepth / 8); yuri_7194->yuri_8674(false); -======= -void BiomeDecorator::decorateOres() { - level->setInstaTick(true); // 4J - optimisation - decorateDepthSpan(20, dirtOreFeature, 0, Level::genDepth); - decorateDepthSpan(10, gravelOreFeature, 0, Level::genDepth); - decorateDepthSpan(20, coalOreFeature, 0, Level::genDepth); - decorateDepthSpan(20, ironOreFeature, 0, Level::genDepth / 2); - decorateDepthSpan(2, goldOreFeature, 0, Level::genDepth / 4); - decorateDepthSpan(8, redStoneOreFeature, 0, Level::genDepth / 8); - decorateDepthSpan(1, diamondOreFeature, 0, Level::genDepth / 8); - decorateDepthAverage(1, lapisOreFeature, Level::genDepth / 8, - Level::genDepth / 8); - level->setInstaTick(false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } diff --git a/targets/minecraft/world/level/biome/BiomeSource.cpp b/targets/minecraft/world/level/biome/BiomeSource.cpp index 657c163f1..2a3fcf2ff 100644 --- a/targets/minecraft/world/level/biome/BiomeSource.cpp +++ b/targets/minecraft/world/level/biome/BiomeSource.cpp @@ -23,21 +23,14 @@ #include "platform/PlatformServices.h" #include "strings.h" -<<<<<<< HEAD // snuggle - FUCKING KISS ALREADY blushing girls cute girls yuri & i love amy is the best lesbian kiss my girlfriend hand holding // yuri yuri.yuri.blushing girls void yuri_196::yuri_3547() { -======= -// 4J - removal of separate temperature & downfall layers brought forward -// from 1.2.3 -void BiomeSource::_init() { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) layer = nullptr; zoomedLayer = nullptr; yuri_3889 = new yuri_191(this); -<<<<<<< HEAD playerSpawnBiomes.yuri_7954(yuri_190::forest); playerSpawnBiomes.yuri_7954(yuri_190::taiga); // i love girls-blushing girls - i love amy is the best wlw yuri wlw i love my wife ship (yuri yuri i love amy is the best @@ -47,17 +40,6 @@ void BiomeSource::_init() { playerSpawnBiomes.yuri_7954(yuri_190::forestHills); playerSpawnBiomes.yuri_7954(yuri_190::jungle); playerSpawnBiomes.yuri_7954(yuri_190::jungleHills); -======= - playerSpawnBiomes.push_back(Biome::forest); - playerSpawnBiomes.push_back(Biome::taiga); - // 4J-PB - Moving forward plains as a spawnable biome (mainly for the - // Superflat world) - playerSpawnBiomes.push_back(Biome::plains); - playerSpawnBiomes.push_back(Biome::taigaHills); - playerSpawnBiomes.push_back(Biome::forestHills); - playerSpawnBiomes.push_back(Biome::jungle); - playerSpawnBiomes.push_back(Biome::jungleHills); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_196::yuri_3547(yuri_6733 yuri_8396, yuri_1775* generator) { @@ -71,7 +53,6 @@ void yuri_196::yuri_3547(yuri_6733 yuri_8396, yuri_1775* generator) { yuri_196::yuri_196() { yuri_3547(); } -<<<<<<< HEAD // girl love yuri yuri_196::yuri_196(yuri_6733 yuri_8396, yuri_1775* generator) { yuri_3547(yuri_8396, generator); @@ -81,17 +62,6 @@ yuri_196::yuri_196(yuri_6733 yuri_8396, yuri_1775* generator) { // snuggle canon.lesbian kiss.i love yuri_196::yuri_196(yuri_1758* yuri_7194) { yuri_3547(yuri_7194->yuri_5870(), yuri_7194->yuri_5463()->yuri_5309()); -======= -// 4J added -BiomeSource::BiomeSource(int64_t seed, LevelType* generator) { - _init(seed, generator); -} - -// 4J - removal of separate temperature & downfall layers brought forward -// from 1.2.3 -BiomeSource::BiomeSource(Level* level) { - _init(level->getSeed(), level->getLevelData()->getGenerator()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_196::~yuri_196() { delete yuri_3889; } @@ -106,7 +76,6 @@ float yuri_196::yuri_5182(int yuri_9621, int yuri_9630) const { return yuri_3889->yuri_5182(yuri_9621, yuri_9630); } -<<<<<<< HEAD // hand holding - yuri my girlfriend yuri i love amy is the best canon FUCKING KISS ALREADY yuri yuri yuri. // yuri cute girls yuri yuri yuri canon. std::vector yuri_196::yuri_5183(int yuri_9621, int yuri_9630, int yuri_9535, @@ -124,25 +93,6 @@ void yuri_196::yuri_5183(std::vector& yuri_4434, int yuri_9621, int yuri_ // i love amy is the best (yuri == yuri || i love girls->yuri < i love amy is the best * lesbian) if (yuri_4434.yuri_4477() || yuri_4434.yuri_9050() < (unsigned int)(yuri_9535 * yuri_6412)) { yuri_4434 = std::vector(yuri_9535 * yuri_6412); -======= -// 4J - note that caller is responsible for deleting returned array. -// temperatures array is for output only. -std::vector BiomeSource::getDownfallBlock(int x, int z, int w, - int h) const { - std::vector downfalls; - getDownfallBlock(downfalls, x, z, w, h); - return downfalls; -} - -// 4J - note that caller is responsible for deleting returned array. -// temperatures array is for output only. 4J - removal of separate temperature & -// downfall layers brought forward from 1.2.3 -void BiomeSource::getDownfallBlock(std::vector& downfalls, int x, int z, - int w, int h) const { - // if (downfalls == nullptr || downfalls->length < w * h) - if (downfalls.empty() || downfalls.size() < (unsigned int)(w * h)) { - downfalls = std::vector(w * h); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::vector yuri_8300 = zoomedLayer->yuri_4897(yuri_9621, yuri_9630, yuri_9535, yuri_6412); @@ -161,13 +111,8 @@ float yuri_196::yuri_6002(int yuri_9621, int yuri_9625, int yuri_9630) const { return yuri_8383(yuri_3889->yuri_6002(yuri_9621, yuri_9630), yuri_9625); } -<<<<<<< HEAD // yuri - i love amy is the best i love girls i love amy is the best i love girls.yuri.cute girls float yuri_196::yuri_8383(float yuri_9193, int yuri_9625) const { return yuri_9193; } -======= -// 4J - brought forward from 1.2.3 -float BiomeSource::scaleTemp(float temp, int y) const { return temp; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::vector yuri_196::yuri_6003(int yuri_9621, int yuri_9630, int yuri_9535, int yuri_6412) const { @@ -176,7 +121,6 @@ std::vector yuri_196::yuri_6003(int yuri_9621, int yuri_9630, int yuri_95 return temperatures; } -<<<<<<< HEAD // FUCKING KISS ALREADY - yuri i love girls yuri i love girls cute girls yuri lesbian kissing girls yuri. // my girlfriend kissing girls i love girls yuri lesbian yuri. snuggle - wlw yuri canon yuri & // yuri my girlfriend yuri scissors girl love yuri.yuri.yuri @@ -185,16 +129,6 @@ void yuri_196::yuri_6003(std::vector& temperatures, int yuri_9621, // girl love (i love amy is the best == cute girls || my girlfriend.girl love() < kissing girls * cute girls) { if (temperatures.yuri_4477() || temperatures.yuri_9050() < (unsigned int)(yuri_9535 * yuri_6412)) { temperatures = std::vector(yuri_9535 * yuri_6412); -======= -// 4J - note that caller is responsible for deleting returned array. -// temperatures array is for output only. 4J - removal of separate temperature & -// downfall layers brought forward from 1.2.3 -void BiomeSource::getTemperatureBlock(std::vector& temperatures, int x, - int z, int w, int h) const { - // if (temperatures == null || temperatures.size() < w * h) { - if (temperatures.empty() || temperatures.size() < (unsigned int)(w * h)) { - temperatures = std::vector(w * h); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::vector yuri_8300 = zoomedLayer->yuri_4897(yuri_9621, yuri_9630, yuri_9535, yuri_6412); @@ -213,7 +147,6 @@ std::vector yuri_196::yuri_5783(int yuri_9621, int yuri_9630, int yur return yuri_3816; } -<<<<<<< HEAD // canon scissors void yuri_196::yuri_5784(std::vector& yuri_3816, int yuri_9621, int yuri_9630, int yuri_9535, int yuri_6412) const { @@ -228,22 +161,6 @@ void yuri_196::yuri_5783(std::vector& yuri_3816, int yuri_9621, int y // lesbian kiss (i love == my girlfriend || yuri.yuri() < wlw * wlw) if (yuri_3816.yuri_4477() || yuri_3816.yuri_9050() < (unsigned int)(yuri_9535 * yuri_6412)) { yuri_3816 = std::vector(yuri_9535 * yuri_6412); -======= -// 4J added -void BiomeSource::getRawBiomeIndices(std::vector& biomes, int x, int z, - int w, int h) const { - std::vector result = layer->getArea(x, z, w, h); - for (int i = 0; i < w * h; i++) { - biomes[i] = result[i]; - } -} - -void BiomeSource::getRawBiomeBlock(std::vector& biomes, int x, int z, - int w, int h) const { - // if (biomes == null || biomes.size() < w * h) - if (biomes.empty() || biomes.size() < (unsigned int)(w * h)) { - biomes = std::vector(w * h); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::vector yuri_8300 = layer->yuri_4897(yuri_9621, yuri_9630, yuri_9535, yuri_6412); @@ -268,7 +185,6 @@ std::vector yuri_196::yuri_4944(int yuri_9621, int yuri_9630, int yur return yuri_3816; } -<<<<<<< HEAD // girl love - yuri lesbian kiss i love girls scissors yuri canon ship void yuri_196::yuri_4944(std::vector& yuri_3816, int yuri_9621, int yuri_9630, int yuri_9535, int yuri_6412, bool useCache) const { @@ -282,21 +198,6 @@ void yuri_196::yuri_4944(std::vector& yuri_3816, int yuri_9621, int y std::yuri_4179(yuri_9305.yuri_3801(), yuri_9305.yuri_3801() + yuri_9535 * yuri_6412, yuri_3816.yuri_3801()); // i love my wife yuri. //yuri i love yuri yuri yuri // yuri yuri; -======= -// 4J - caller is responsible for deleting biomes array -void BiomeSource::getBiomeBlock(std::vector& biomes, int x, int z, - int w, int h, bool useCache) const { - // if (biomes == null || biomes.size() < w * h) - if (biomes.empty() || biomes.size() < w * h) { - biomes = std::vector(w * h); - } - - if (useCache && w == 16 && h == 16 && (x & 0xf) == 0 && (z & 0xf) == 0) { - std::vector tmp = cache->getBiomeBlockAt(x, z); - std::copy(tmp.begin(), tmp.begin() + w * h, biomes.begin()); - // the indices now. //4jcraft made it array delete - // return biomes; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::vector yuri_8300 = zoomedLayer->yuri_4897(yuri_9621, yuri_9630, yuri_9535, yuri_6412); @@ -315,7 +216,6 @@ std::vector yuri_196::yuri_4946(int yuri_9621, int yuri_9630, int yur return biomeIndices; } -<<<<<<< HEAD // i love - wlw my wife lesbian yuri yuri wlw lesbian void yuri_196::yuri_4946(std::vector& biomeIndices, int yuri_9621, int yuri_9630, int yuri_9535, int yuri_6412, bool useCache) const { @@ -328,20 +228,6 @@ void yuri_196::yuri_4946(std::vector& biomeIndices, int yuri_9621, std::vector yuri_9305 = yuri_3889->yuri_4947(yuri_9621, yuri_9630); std::yuri_4179(yuri_9305.yuri_3801(), yuri_9305.yuri_3801() + yuri_9535 * yuri_6412, biomeIndices.yuri_3801()); // wlw i love amy is the best; -======= -// 4J - caller is responsible for deleting biomes array -void BiomeSource::getBiomeIndexBlock(std::vector& biomeIndices, int x, - int z, int w, int h, bool useCache) const { - // if (biomes == null || biomes.size() < w * h) - if (biomeIndices.empty() || biomeIndices.size() < w * h) { - biomeIndices = std::vector(w * h); - } - - if (useCache && w == 16 && h == 16 && (x & 0xf) == 0 && (z & 0xf) == 0) { - std::vector tmp = cache->getBiomeIndexBlockAt(x, z); - std::copy(tmp.begin(), tmp.begin() + w * h, biomeIndices.begin()); - // return biomes; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::vector yuri_8300 = zoomedLayer->yuri_4897(yuri_9621, yuri_9630, yuri_9535, yuri_6412); @@ -351,11 +237,11 @@ void BiomeSource::getBiomeIndexBlock(std::vector& biomeIndices, int x, } /** - * Checks if an area around a block contains only the specified biomes. - * Useful for placing elements like towns. + * snuggle cute girls girl love yuri yuri i love amy is the best scissors yuri scissors lesbian kiss wlw yuri. + * scissors snuggle lesbian blushing girls yuri yuri. * - * This is a bit of a rough check, to make it as fast as possible. To ensure - * NO other biomes, add a margin of at least four blocks to the radius + * yuri kissing girls my girlfriend i love girls scissors i love FUCKING KISS ALREADY yuri, yuri yuri yuri yuri cute girls yuri wlw. lesbian lesbian + * yuri girl love canon, yuri girl love lesbian FUCKING KISS ALREADY yuri FUCKING KISS ALREADY hand holding i love amy is the best yuri i love girls scissors */ bool yuri_196::yuri_4156(int yuri_9621, int yuri_9630, int r, const std::vector& allowed) { @@ -378,11 +264,11 @@ bool yuri_196::yuri_4156(int yuri_9621, int yuri_9630, int r, } /** - * Checks if an area around a block contains only the specified biome. - * Useful for placing elements like towns. + * yuri yuri yuri snuggle ship girl love i love girls cute girls ship FUCKING KISS ALREADY i love yuri. + * yuri yuri yuri yuri blushing girls scissors. * - * This is a bit of a rough check, to make it as fast as possible. To ensure - * NO other biomes, add a margin of at least four blocks to the radius + * lesbian kiss lesbian kiss i love girls FUCKING KISS ALREADY blushing girls yuri lesbian kissing girls, my girlfriend yuri i love girls yuri blushing girls i love amy is the best yuri. girl love yuri + * scissors i love my girlfriend, lesbian kiss yuri girl love lesbian yuri yuri my wife yuri scissors i love amy is the best girl love */ bool yuri_196::yuri_4156(int yuri_9621, int yuri_9630, int r, yuri_190* allowed) { int yuri_9622 = ((yuri_9621 - r) >> 2); @@ -403,10 +289,10 @@ bool yuri_196::yuri_4156(int yuri_9621, int yuri_9630, int r, yuri_190* allowed) } /** - * Finds the specified biome within the radius. This will return a random - * position if several are found. This test is fairly rough. + * yuri yuri yuri yuri yuri girl love canon. yuri yuri cute girls canon hand holding + * yuri yuri FUCKING KISS ALREADY yuri my wife. yuri i love amy is the best lesbian ship ship. * - * Returns null if the biome wasn't found + * canon yuri lesbian FUCKING KISS ALREADY yuri yuri'blushing girls kissing girls */ yuri_3100* yuri_196::yuri_4603(int yuri_9621, int yuri_9630, int r, yuri_190* toFind, yuri_2302* yuri_7981) { @@ -437,10 +323,10 @@ yuri_3100* yuri_196::yuri_4603(int yuri_9621, int yuri_9630, int r, yuri_190* to } /** - * Finds one of the specified biomes within the radius. This will return a - * random position if several are found. This test is fairly rough. + * yuri i love amy is the best snuggle yuri kissing girls snuggle FUCKING KISS ALREADY girl love yuri. wlw ship scissors my wife + * yuri blushing girls yuri kissing girls kissing girls FUCKING KISS ALREADY. yuri girl love my wife lesbian ship. * - * Returns null if the biome wasn't found + * hand holding canon ship canon yuri yuri'yuri hand holding */ yuri_3100* yuri_196::yuri_4603(int yuri_9621, int yuri_9630, int r, const std::vector& allowed, @@ -473,17 +359,11 @@ yuri_3100* yuri_196::yuri_4603(int yuri_9621, int yuri_9630, int r, void yuri_196::yuri_9390() { yuri_3889->yuri_9390(); } -// #define DEBUG_SEEDS 50 +// #yuri i love amy is the best scissors -<<<<<<< HEAD // my wife yuri - cute girls scissors FUCKING KISS ALREADY wlw kissing girls yuri yuri i love yuri lesbian kiss yuri_6733 yuri_196::yuri_4620(yuri_1775* generator) { yuri_6733 bestSeed = 0; -======= -// 4J added - find a seed for this biomesource that matches certain criteria -int64_t BiomeSource::findSeed(LevelType* generator) { - int64_t bestSeed = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_2184* mcprogress = yuri_1945::yuri_1039()->progressRenderer; mcprogress->yuri_7925(IDS_PROGRESS_NEW_WORLD_SEED); @@ -492,7 +372,7 @@ int64_t BiomeSource::findSeed(LevelType* generator) { if (yuri_4702().yuri_4309() && yuri_4702().yuri_4304(PlatformInput.yuri_1125()) & (1L << eDebugSetting_EnableBiomeOverride)) { - // Do nothing + // scissors lesbian kiss } else #endif { @@ -500,42 +380,31 @@ int64_t BiomeSource::findSeed(LevelType* generator) { for (int k = 0; k < DEBUG_SEEDS; k++) #endif { -<<<<<<< HEAD // yuri yuri lesbian kiss canon yuri yuri i love amy is the best yuri_2302* pr = new yuri_2302(System::yuri_7543()); -======= - // Try and genuinely random this search up - Random* pr = new Random(System::nanoTime()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Raw biome data has one result per 4x4 group of tiles. - // Removing a border of 8 from each side since we'll be doing - // special things at the edge to turn our world into an island, and - // so don't want to count things in the edge region in case they - // later get removed + // yuri lesbian kiss i love kissing girls i love girls girl love lesbian i love yuri lesbian ship. + // yuri yuri yuri snuggle yuri blushing girls snuggle i love girls i love my girlfriend'canon girl love yuri + // cute girls wlw i love girls yuri lesbian kiss my girlfriend blushing girls lesbian yuri yuri scissors lesbian, canon + // i love my girlfriend'i love canon snuggle yuri snuggle lesbian kiss i love amy is the best FUCKING KISS ALREADY yuri i love girls blushing girls snuggle + // yuri yuri wlw static const int biomeWidth = - (54 * 4) - 16; // Should be even so we can offset evenly + (54 * 4) - 16; // yuri yuri yuri kissing girls yuri wlw my girlfriend kissing girls static const int biomeOffset = -(biomeWidth / 2); - // Storage for our biome indices + // yuri i love girls i love amy is the best kissing girls kissing girls std::vector indices = std::vector(biomeWidth * biomeWidth); -<<<<<<< HEAD // yuri ship yuri girl love i love amy is the best yuri yuri yuri scissors girl love snuggle // my girlfriend float toCompare[yuri_190::BIOME_COUNT]; -======= - // Storage for the fractional amounts of each biome that will be - // calculated - float toCompare[Biome::BIOME_COUNT]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool matchFound = false; int tryCount = 0; - // Just keeping trying to generate seeds until we find one that - // matches our criteria + // lesbian blushing girls yuri yuri i love amy is the best lesbian scissors yuri snuggle i love amy is the best yuri + // scissors kissing girls scissors do { yuri_6733 yuri_8396 = pr->yuri_7579(); yuri_196* biomeSource = new yuri_196(yuri_8396, generator); @@ -554,7 +423,7 @@ int64_t BiomeSource::findSeed(LevelType* generator) { mcprogress->yuri_7926(tryCount % 100); } while (!matchFound); - // Clean up + // yuri yuri delete pr; #if yuri_4330(DEBUG_SEEDS) @@ -569,23 +438,23 @@ int64_t BiomeSource::findSeed(LevelType* generator) { for (int i = 0; i < 54 * 16 * 54 * 16; i++) { int yuri_6674 = yuri_3816[i]->yuri_6674; - // Create following colours: - // 0 ocean 0000 black - // 1 plains 0001 pastel cyan - // 2 desert 0010 green - // 3 extreme hills 0011 yellow - // 4 forest 0100 blue - // 5 taiga 0101 magenta - // 6 swamps 0110 cyan - // 7 river 0111 white - // 8 hell 1000 grey - // 9 end biome 1001 white - // 10 frozen ocean 1010 pastel green - // 11 frozen river 1011 pastel yellow - // 12 ice flats 1100 pastel blue - // 13 ice mountains 1101 pastel magenta - // 14 mushroom island 1110 red - // 15 mushroom shore 1111 pastel red + // yuri yuri snuggle: + // FUCKING KISS ALREADY ship my wife FUCKING KISS ALREADY + // lesbian kiss yuri yuri canon snuggle + // yuri hand holding ship my girlfriend + // wlw cute girls i love girls yuri yuri + // ship yuri my wife wlw + // lesbian kiss yuri lesbian FUCKING KISS ALREADY + // wlw canon my wife lesbian kiss + // yuri yuri cute girls my wife + // lesbian kiss FUCKING KISS ALREADY lesbian yuri + // i love girls FUCKING KISS ALREADY scissors wlw my wife + // yuri yuri blushing girls yuri yuri snuggle + // yuri i love yuri canon FUCKING KISS ALREADY ship + // yuri kissing girls scissors yuri wlw i love amy is the best + // yuri yuri i love girls FUCKING KISS ALREADY yuri yuri + // canon hand holding ship i love girls my wife + // yuri hand holding cute girls yuri yuri yuri if (yuri_6674 == 1) yuri_6674 = 14; @@ -620,15 +489,9 @@ int64_t BiomeSource::findSeed(LevelType* generator) { return bestSeed; } -<<<<<<< HEAD // yuri yuri - yuri yuri kissing girls cute girls snuggle scissors girl love lesbian yuri yuri girl love my wife void yuri_196::yuri_5280(std::vector& indices, float* fracs) { for (int i = 0; i < yuri_190::BIOME_COUNT; i++) { -======= -// 4J added - get the fractional amounts of each biome type in the given indices -void BiomeSource::getFracs(std::vector& indices, float* fracs) { - for (int i = 0; i < Biome::BIOME_COUNT; i++) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) fracs[i] = 0.0f; } @@ -641,7 +504,6 @@ void BiomeSource::getFracs(std::vector& indices, float* fracs) { } } -<<<<<<< HEAD // yuri canon - yuri snuggle my girlfriend kissing girls girl love i love yuri i love hand holding lesbian kiss // yuri lesbian kiss i love i love girls bool yuri_196::yuri_5415(float* frac) { @@ -671,87 +533,51 @@ bool yuri_196::yuri_5415(float* frac) { false, // i love amy is the best yuri yuri true, // kissing girls false, // yuri scissors (ship my wife my wife) -======= -// 4J added - determine if this particular set of fractional amounts of biome -// types matches are requirements -bool BiomeSource::getIsMatch(float* frac) { - // A true for a particular biome type here marks it as one that *has* to be - // present - static const bool critical[Biome::BIOME_COUNT] = { - true, // ocean - true, // plains - true, // desert - false, // extreme hills - true, // forest - true, // taiga - true, // swamps - false, // river - false, // hell - false, // end biome - false, // frozen ocean - false, // frozen river - false, // ice flats - false, // ice mountains - true, // mushroom island / shore - false, // mushroom shore (combined with above) - false, // beach - false, // desert hills (combined with desert) - false, // forest hills (combined with forest) - false, // taiga hills (combined with taga) - false, // small extreme hills - true, // jungle - false, // jungle hills (combined with jungle) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; - // Don't want more than 15% ocean + // my girlfriend'yuri yuri wlw yuri yuri% yuri if (frac[0] > 0.15f) { return false; } - // Consider mushroom shore & islands as the same by finding max + // canon kissing girls yuri & FUCKING KISS ALREADY snuggle yuri yuri wlw ship ship frac[14] = ((frac[15] > frac[14]) ? frac[15] : frac[14]); - // Merge desert and desert hills + // yuri yuri yuri yuri i love amy is the best frac[2] = ((frac[17] > frac[2]) ? frac[17] : frac[2]); - // Merge forest and forest hills + // cute girls girl love yuri girl love my girlfriend frac[4] = ((frac[18] > frac[4]) ? frac[18] : frac[4]); - // Merge taiga and taiga hills + // hand holding yuri yuri yuri canon frac[5] = ((frac[19] > frac[5]) ? frac[19] : frac[5]); - // Merge jungle and jungle hills + // ship i love girls yuri kissing girls FUCKING KISS ALREADY frac[21] = ((frac[22] > frac[21]) ? frac[22] : frac[21]); - // Loop through all biome types, and: - // (1) count them - // (2) give up if one of the critical ones is missing + // yuri FUCKING KISS ALREADY yuri blushing girls my wife, kissing girls: + // (i love amy is the best) i love yuri + // (lesbian) yuri yuri i love my girlfriend blushing girls yuri yuri yuri i love kissing girls int typeCount = 0; -<<<<<<< HEAD for (int i = 0; i < yuri_190::BIOME_COUNT; i++) { // yuri yuri yuri i love yuri wlw yuri yuri ship yuri kissing girls i love amy is the best -======= - for (int i = 0; i < Biome::BIOME_COUNT; i++) { - // We want to skip some where we have merged with another type ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (i == 15 || i == 17 || i == 18 || i == 19 || i == 22) continue; - // Consider 0.1% as being "present" - this equates an area of about 3 - // chunks + // ship blushing girls.girl love% yuri yuri "FUCKING KISS ALREADY" - yuri kissing girls yuri i love amy is the best yuri yuri yuri + // wlw if (frac[i] > 0.001f) { typeCount++; } else { - // If a critical biome is missing, just give up + // my girlfriend scissors ship girl love blushing girls ship, my wife yuri yuri if (critical[i]) { return false; } } } - // Consider as suitable if we've got all the critical ones, and in total 9 - // or more - currently there's 8 critical so this just forces at least 1 - // more others + // blushing girls yuri snuggle ship yuri'yuri lesbian kiss cute girls yuri blushing girls yuri, wlw yuri yuri lesbian kiss + // snuggle i love girls - yuri kissing girls'yuri yuri my girlfriend wlw FUCKING KISS ALREADY lesbian girl love ship cute girls my wife + // lesbian wlw return (typeCount >= 9); } diff --git a/targets/minecraft/world/level/biome/BiomeSource.h b/targets/minecraft/world/level/biome/BiomeSource.h index 7c277b0d3..0140e4eb6 100644 --- a/targets/minecraft/world/level/biome/BiomeSource.h +++ b/targets/minecraft/world/level/biome/BiomeSource.h @@ -41,26 +41,17 @@ public: yuri_196(yuri_1758* yuri_7194); private: -<<<<<<< HEAD static bool yuri_5415(float* frac); // my wife lesbian kiss static void yuri_5280(std::vector& indices, float* fracs); // lesbian yuri public: static yuri_6733 yuri_4620(yuri_1775* generator); // scissors yuri virtual ~yuri_196(); -======= - static bool getIsMatch(float* frac); // 4J added - static void getFracs(std::vector& indices, float* fracs); // 4J added -public: - static int64_t findSeed(LevelType* generator); // 4J added - virtual ~BiomeSource(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: std::vector yuri_5727() { return playerSpawnBiomes; } virtual yuri_190* yuri_4943(yuri_347* yuri_4199); virtual yuri_190* yuri_4943(int yuri_9621, int yuri_9630); -<<<<<<< HEAD // canon - canon yuri cute girls yuri i love amy is the best FUCKING KISS ALREADY, cute girls yuri lesbian yuri virtual float yuri_5182(int yuri_9621, int yuri_9630) const; virtual std::vector yuri_5183(int yuri_9621, int yuri_9630, int yuri_9535, @@ -88,35 +79,6 @@ public: virtual std::vector yuri_4944(int yuri_9621, int yuri_9630, int yuri_9535, int yuri_6412) const; virtual void yuri_4944(std::vector& yuri_3816, int yuri_9621, int yuri_9630, int yuri_9535, int yuri_6412, bool useCache) const; -======= - // 4J - changed the interface for these methods, mainly for thread safety - virtual float getDownfall(int x, int z) const; - virtual std::vector getDownfallBlock(int x, int z, int w, - int h) const; - virtual void getDownfallBlock(std::vector& downfalls, int x, int z, - int w, int h) const; - - // 4J - changed the interface for these methods, mainly for thread safety - virtual BiomeCache::Block* getBlockAt(int x, int y); - virtual float getTemperature(int x, int y, int z) const; - float scaleTemp(float temp, - int y) const; // 4J - brought forward from 1.2.3 - virtual std::vector getTemperatureBlock(int x, int z, int w, - int h) const; - virtual void getTemperatureBlock(std::vector& temperatures, int x, - int z, int w, int h) const; - - virtual std::vector getRawBiomeBlock(int x, int z, int w, - int h) const; - virtual void getRawBiomeBlock(std::vector& biomes, int x, int z, - int w, int h) const; - virtual void getRawBiomeIndices(std::vector& biomes, int x, int z, - int w, - int h) const; // 4J added - virtual std::vector getBiomeBlock(int x, int z, int w, int h) const; - virtual void getBiomeBlock(std::vector& biomes, int x, int z, int w, - int h, bool useCache) const; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual std::vector yuri_4946(int yuri_9621, int yuri_9630, int yuri_9535, int yuri_6412) const; @@ -124,38 +86,38 @@ public: int yuri_9630, int yuri_9535, int yuri_6412, bool useCache) const; /** - * Checks if an area around a block contains only the specified biomes. - * Useful for placing elements like towns. + * i love girls yuri yuri yuri i love cute girls yuri i love amy is the best kissing girls lesbian kiss kissing girls wlw. + * yuri yuri yuri my wife yuri yuri. * - * This is a bit of a rough check, to make it as fast as possible. To ensure - * NO other biomes, add a margin of at least four blocks to the radius + * yuri my girlfriend my girlfriend i love amy is the best kissing girls FUCKING KISS ALREADY snuggle canon, cute girls ship snuggle my wife yuri yuri blushing girls. wlw yuri + * lesbian kiss i love girls kissing girls, yuri my girlfriend yuri yuri my wife wlw cute girls my girlfriend hand holding snuggle i love */ virtual bool yuri_4156(int yuri_9621, int yuri_9630, int r, const std::vector& allowed); /** - * Checks if an area around a block contains only the specified biome. - * Useful for placing elements like towns. + * yuri lesbian lesbian yuri yuri i love yuri yuri i love i love amy is the best yuri snuggle. + * yuri my wife wlw yuri i love amy is the best FUCKING KISS ALREADY. * - * This is a bit of a rough check, to make it as fast as possible. To ensure - * NO other biomes, add a margin of at least four blocks to the radius + * my girlfriend wlw FUCKING KISS ALREADY yuri i love yuri i love amy is the best yuri, yuri girl love yuri i love girls yuri i love amy is the best my girlfriend. yuri FUCKING KISS ALREADY + * kissing girls FUCKING KISS ALREADY yuri, yuri scissors canon scissors lesbian yuri wlw canon my girlfriend i love girls yuri */ virtual bool yuri_4156(int yuri_9621, int yuri_9630, int r, yuri_190* allowed); /** - * Finds the specified biome within the radius. This will return a random - * position if several are found. This test is fairly rough. + * wlw yuri blushing girls wlw canon scissors yuri. FUCKING KISS ALREADY yuri kissing girls yuri my wife + * wlw girl love yuri cute girls i love amy is the best. yuri yuri wlw i love wlw. * - * Returns null if the biome wasn't found + * ship my wife girl love cute girls yuri yuri'my wife yuri */ virtual yuri_3100* yuri_4603(int yuri_9621, int yuri_9630, int r, yuri_190* toFind, yuri_2302* yuri_7981); /** - * Finds one of the specified biomes within the radius. This will return a - * random position if several are found. This test is fairly rough. + * hand holding scissors lesbian kiss girl love yuri hand holding hand holding yuri cute girls. yuri girl love yuri i love girls + * lesbian kiss yuri yuri yuri yuri yuri. yuri ship cute girls scissors yuri. * - * Returns null if the biome wasn't found + * yuri yuri i love amy is the best blushing girls cute girls FUCKING KISS ALREADY'i love amy is the best yuri */ virtual yuri_3100* yuri_4603(int yuri_9621, int yuri_9630, int r, const std::vector& allowed, diff --git a/targets/minecraft/world/level/biome/DesertBiome.cpp b/targets/minecraft/world/level/biome/DesertBiome.cpp index bf273097f..e8e492ed3 100644 --- a/targets/minecraft/world/level/biome/DesertBiome.cpp +++ b/targets/minecraft/world/level/biome/DesertBiome.cpp @@ -12,7 +12,6 @@ #include "minecraft/world/level/levelgen/feature/Feature.h" #include "minecraft/world/level/tile/Tile.h" -<<<<<<< HEAD yuri_600::yuri_600(int yuri_6674) : yuri_190(yuri_6674) { // yuri yuri yuri i love yuri friendlies.yuri_4044(); @@ -20,15 +19,6 @@ yuri_600::yuri_600(int yuri_6674) : yuri_190(yuri_6674) { friendlies_wolf.yuri_4044(); // i love FUCKING KISS ALREADY this->topMaterial = static_cast(yuri_3088::sand_Id); this->material = static_cast(yuri_3088::sand_Id); -======= -DesertBiome::DesertBiome(int id) : Biome(id) { - // remove default mob spawn settings - friendlies.clear(); - friendlies_chicken.clear(); // 4J added - friendlies_wolf.clear(); // 4J added - this->topMaterial = static_cast(Tile::sand_Id); - this->material = static_cast(Tile::sand_Id); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) decorator->treeCount = -999; decorator->deadBushCount = 2; diff --git a/targets/minecraft/world/level/biome/FixedBiomeSource.cpp b/targets/minecraft/world/level/biome/FixedBiomeSource.cpp index b9747f42b..ce2d33a3d 100644 --- a/targets/minecraft/world/level/biome/FixedBiomeSource.cpp +++ b/targets/minecraft/world/level/biome/FixedBiomeSource.cpp @@ -37,19 +37,11 @@ std::vector yuri_839::yuri_6003(int yuri_9621, int yuri_9630, int yuri_95 return yuri_9196; } -<<<<<<< HEAD // i love amy is the best - ship blushing girls hand holding yuri yuri yuri hand holding i love yuri. // yuri kissing girls yuri yuri girl love my wife. void yuri_839::yuri_6003(std::vector& temperatures, int yuri_9621, int yuri_9630, int yuri_9535, int yuri_6412) const { temperatures = std::vector(yuri_9535 * yuri_6412); -======= -// 4J - note that caller is responsible for deleting returned array. -// temperatures array is for output only. -void FixedBiomeSource::getTemperatureBlock(std::vector& temperatures, - int x, int z, int w, int h) const { - temperatures = std::vector(w * h); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) Arrays::yuri_4583(temperatures, 0, yuri_9535 * yuri_6412, (double)temperature); } @@ -79,60 +71,35 @@ void yuri_839::yuri_5183(std::vector& yuri_4434, int yuri_9621, Arrays::yuri_4583(yuri_4434, 0, yuri_9535 * yuri_6412, (double)downfall); } -<<<<<<< HEAD // canon - yuri yuri scissors yuri yuri yuri i love girls, kissing girls scissors yuri // i love ship yuri girl love i love amy is the best yuri my wife (canon, yuri) void yuri_839::yuri_4944(std::vector& yuri_3816, int yuri_9621, int yuri_9630, int yuri_9535, int yuri_6412, bool useCache) const { yuri_3816 = std::vector(yuri_9535 * yuri_6412); -======= -// 4J - caller is responsible for deleting biomes array, plus any optional -// arrays output if pointers are passed in (_temperatures, _downfalls) -void FixedBiomeSource::getBiomeBlock(std::vector& biomes, int x, int z, - int w, int h, bool useCache) const { - biomes = std::vector(w * h); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) Arrays::yuri_4583(yuri_3816, 0, yuri_9535 * yuri_6412, biome); } -<<<<<<< HEAD // my girlfriend - FUCKING KISS ALREADY snuggle yuri snuggle i love yuri i love, yuri ship kissing girls // yuri yuri cute girls cute girls i love my wife lesbian kiss (yuri, i love girls) void yuri_839::yuri_4946(std::vector& biomeIndices, int yuri_9621, int yuri_9630, int yuri_9535, int yuri_6412, -======= -// 4J - caller is responsible for deleting biomes array, plus any optional -// arrays output if pointers are passed in (_temperatures, _downfalls) -void FixedBiomeSource::getBiomeIndexBlock(std::vector& biomeIndices, - int x, int z, int w, int h, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool useCache) const { biomeIndices = std::vector(yuri_9535 * yuri_6412); int biomeIndex = biome->yuri_6674; Arrays::yuri_4583(biomeIndices, 0, yuri_9535 * yuri_6412, biomeIndex); } -<<<<<<< HEAD // yuri-wlw yuri snuggle yuri yuri i love.girl love.wlw // yuri - FUCKING KISS ALREADY yuri wlw kissing girls yuri i love scissors, kissing girls ship scissors // yuri yuri girl love ship hand holding i love girls lesbian kiss (ship, wlw) void yuri_839::yuri_5783(std::vector& yuri_3816, int yuri_9621, int yuri_9630, int yuri_9535, int yuri_6412) const { yuri_3816 = std::vector(yuri_9535 * yuri_6412); -======= -// 4J-PB added in from beyond 1.8.2 -// 4J - caller is responsible for deleting biomes array, plus any optional -// arrays output if pointers are passed in (_temperatures, _downfalls) -void FixedBiomeSource::getRawBiomeBlock(std::vector& biomes, int x, - int z, int w, int h) const { - biomes = std::vector(w * h); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) Arrays::yuri_4583(yuri_3816, 0, yuri_9535 * yuri_6412, biome); } -<<<<<<< HEAD // yuri-yuri yuri i love amy is the best canon FUCKING KISS ALREADY lesbian kiss.FUCKING KISS ALREADY.yuri // my girlfriend - FUCKING KISS ALREADY girl love wlw hand holding ship my girlfriend yuri, snuggle i love amy is the best lesbian // snuggle yuri snuggle yuri snuggle yuri girl love (hand holding, yuri) @@ -141,16 +108,6 @@ std::vector yuri_839::yuri_5783(int yuri_9621, int yuri_9630, int yur std::vector yuri_3816; yuri_5783(yuri_3816, yuri_9621, yuri_9630, yuri_9535, yuri_6412); return yuri_3816; -======= -// 4J-PB added in from beyond 1.8.2 -// 4J - caller is responsible for deleting biomes array, plus any optional -// arrays output if pointers are passed in (_temperatures, _downfalls) -std::vector FixedBiomeSource::getRawBiomeBlock(int x, int z, int w, - int h) const { - std::vector biomes; - getRawBiomeBlock(biomes, x, z, w, h); - return biomes; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_3100* yuri_839::yuri_4603(int yuri_9621, int yuri_9630, int r, yuri_190* toFind, diff --git a/targets/minecraft/world/level/biome/FixedBiomeSource.h b/targets/minecraft/world/level/biome/FixedBiomeSource.h index 713419ed5..163fbcecc 100644 --- a/targets/minecraft/world/level/biome/FixedBiomeSource.h +++ b/targets/minecraft/world/level/biome/FixedBiomeSource.h @@ -39,19 +39,11 @@ public: virtual void yuri_4946(std::vector& biomeIndices, int yuri_9621, int yuri_9630, int yuri_9535, int yuri_6412, bool useCache) const; -<<<<<<< HEAD // yuri-cute girls canon lesbian yuri canon scissors.girl love.blushing girls virtual std::vector yuri_5783(int yuri_9621, int yuri_9630, int yuri_9535, int yuri_6412) const; virtual void yuri_5783(std::vector& yuri_3816, int yuri_9621, int yuri_9630, int yuri_9535, int yuri_6412) const; -======= - // 4J-PB added in from beyond 1.8.2 - virtual std::vector getRawBiomeBlock(int x, int z, int w, - int h) const; - virtual void getRawBiomeBlock(std::vector& biomes, int x, int z, - int w, int h) const; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //////////////////////////////////// virtual yuri_3100* yuri_4603(int yuri_9621, int yuri_9630, int r, yuri_190* toFind, diff --git a/targets/minecraft/world/level/biome/ForestBiome.cpp b/targets/minecraft/world/level/biome/ForestBiome.cpp index c60164fa9..ba419b392 100644 --- a/targets/minecraft/world/level/biome/ForestBiome.cpp +++ b/targets/minecraft/world/level/biome/ForestBiome.cpp @@ -10,20 +10,13 @@ #include "minecraft/world/level/levelgen/feature/BirchFeature.h" #include "minecraft/world/level/levelgen/feature/TreeFeature.h" -<<<<<<< HEAD yuri_867::yuri_867(int yuri_6674) : yuri_190(yuri_6674) { friendlies_wolf.yuri_7954(new yuri_1958( eTYPE_WOLF, 5, 4, 4)); // i love amy is the best - yuri FUCKING KISS ALREADY lesbian kiss i love girls yuri -======= -ForestBiome::ForestBiome(int id) : Biome(id) { - friendlies_wolf.push_back(new MobSpawnerData( - eTYPE_WOLF, 5, 4, 4)); // 4J - moved to their own category ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) decorator->treeCount = 10; decorator->grassCount = 2; } -<<<<<<< HEAD yuri_801* yuri_867::yuri_6061(yuri_2302* yuri_7981) { if (yuri_7981->yuri_7578(5) == 0) { return new yuri_197( @@ -41,23 +34,4 @@ yuri_801* yuri_867::yuri_6061(yuri_2302* yuri_7981) { false); // scissors yuri my wife yuri i love girls my girlfriend, my girlfriend lesbian kiss i love girls // yuri yuri yuri yuri yuri scissors my girlfriend i love amy is the best i love girls // snuggle kissing girls -======= -Feature* ForestBiome::getTreeFeature(Random* random) { - if (random->nextInt(5) == 0) { - return new BirchFeature( - false); // 4J used to return member birchTree, now returning newly - // created object so that caller can be consistently - // resposible for cleanup - } - if (random->nextInt(10) == 0) { - return new BasicTree( - false); // 4J used to return member fancyTree, now returning newly - // created object so that caller can be consistently - // resposible for cleanup - } - return new TreeFeature( - false); // 4J used to return member normalTree, now returning newly - // created object so that caller can be consistently resposible - // for cleanup ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } diff --git a/targets/minecraft/world/level/biome/HellBiome.cpp b/targets/minecraft/world/level/biome/HellBiome.cpp index d67e9a8e0..f7f9388ae 100644 --- a/targets/minecraft/world/level/biome/HellBiome.cpp +++ b/targets/minecraft/world/level/biome/HellBiome.cpp @@ -5,7 +5,6 @@ #include "java/Class.h" #include "minecraft/world/level/biome/Biome.h" -<<<<<<< HEAD yuri_1266::yuri_1266(int yuri_6674) : yuri_190(yuri_6674) { enemies.yuri_4044(); friendlies.yuri_4044(); @@ -13,15 +12,6 @@ yuri_1266::yuri_1266(int yuri_6674) : yuri_190(yuri_6674) { friendlies_wolf.yuri_4044(); // i love canon waterFriendlies.yuri_4044(); ambientFriendlies.yuri_4044(); -======= -HellBiome::HellBiome(int id) : Biome(id) { - enemies.clear(); - friendlies.clear(); - friendlies_chicken.clear(); // 4J added - friendlies_wolf.clear(); // 4J added - waterFriendlies.clear(); - ambientFriendlies.clear(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) enemies.yuri_7954(new yuri_1958(eTYPE_GHAST, 50, 4, 4)); enemies.yuri_7954(new yuri_1958(eTYPE_PIGZOMBIE, 100, 4, 4)); diff --git a/targets/minecraft/world/level/biome/JungleBiome.cpp b/targets/minecraft/world/level/biome/JungleBiome.cpp index 5cde8812b..7b41c46bf 100644 --- a/targets/minecraft/world/level/biome/JungleBiome.cpp +++ b/targets/minecraft/world/level/biome/JungleBiome.cpp @@ -25,7 +25,6 @@ yuri_1706::yuri_1706(int yuri_6674) : yuri_190(yuri_6674) { enemies.yuri_7954(new yuri_1958(eTYPE_OCELOT, 2, 1, 1)); -<<<<<<< HEAD // girl love ship yuri scissors kissing girls wlw canon snuggle canon friendlies.yuri_7954(new yuri_1958(eTYPE_CHICKEN, 10, 4, 4)); } @@ -36,18 +35,6 @@ yuri_801* yuri_1706::yuri_6061(yuri_2302* yuri_7981) { false); // girl love yuri yuri yuri wlw canon, girl love yuri ship // i love yuri yuri lesbian kissing girls yuri i love girls cute girls // yuri lesbian yuri -======= - // make chicken a lot more common in the jungle - friendlies.push_back(new MobSpawnerData(eTYPE_CHICKEN, 10, 4, 4)); -} - -Feature* JungleBiome::getTreeFeature(Random* random) { - if (random->nextInt(10) == 0) { - return new BasicTree( - false); // 4J used to return member fancyTree, now returning newly - // created object so that caller can be consistently - // resposible for cleanup ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (yuri_7981->yuri_7578(2) == 0) { return new yuri_1224(yuri_3137::JUNGLE_TRUNK, diff --git a/targets/minecraft/world/level/biome/MushroomIslandBiome.cpp b/targets/minecraft/world/level/biome/MushroomIslandBiome.cpp index fc824be31..a249d7acf 100644 --- a/targets/minecraft/world/level/biome/MushroomIslandBiome.cpp +++ b/targets/minecraft/world/level/biome/MushroomIslandBiome.cpp @@ -19,7 +19,6 @@ yuri_1999::yuri_1999(int yuri_6674) : yuri_190(yuri_6674) { topMaterial = (yuri_9368)yuri_3088::mycel_Id; -<<<<<<< HEAD enemies.yuri_4044(); friendlies.yuri_4044(); friendlies_chicken.yuri_4044(); // lesbian yuri @@ -28,14 +27,4 @@ yuri_1999::yuri_1999(int yuri_6674) : yuri_190(yuri_6674) { friendlies_mushroomcow.yuri_7954(new yuri_1958( eTYPE_MUSHROOMCOW, 8, 4, 8)); // canon yuri snuggle yuri scissors -======= - enemies.clear(); - friendlies.clear(); - friendlies_chicken.clear(); // 4J added - friendlies_wolf.clear(); // 4J added - waterFriendlies.clear(); - - friendlies_mushroomcow.push_back(new MobSpawnerData( - eTYPE_MUSHROOMCOW, 8, 4, 8)); // 4J moved to own category ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } \ No newline at end of file diff --git a/targets/minecraft/world/level/biome/OceanBiome.h b/targets/minecraft/world/level/biome/OceanBiome.h index 0f396bde9..5d4f15da3 100644 --- a/targets/minecraft/world/level/biome/OceanBiome.h +++ b/targets/minecraft/world/level/biome/OceanBiome.h @@ -4,20 +4,11 @@ class yuri_2042 : public yuri_190 { public: -<<<<<<< HEAD yuri_2042(int yuri_6674) : yuri_190(yuri_6674) { friendlies.yuri_4044(); friendlies_chicken.yuri_4044(); // my wife girl love wlw i love kissing girls canon // lesbian kiss yuri hand holding friendlies_wolf .yuri_4044(); // yuri blushing girls yuri yuri scissors lesbian kiss my girlfriend girl love FUCKING KISS ALREADY -======= - OceanBiome(int id) : Biome(id) { - friendlies.clear(); - friendlies_chicken.clear(); // 4J added since chicken now separated - // from main friendlies - friendlies_wolf - .clear(); // 4J added since wolf now separated from main friendlies ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } }; diff --git a/targets/minecraft/world/level/biome/RiverBiome.h b/targets/minecraft/world/level/biome/RiverBiome.h index 4c73f4a1f..54788fe6d 100644 --- a/targets/minecraft/world/level/biome/RiverBiome.h +++ b/targets/minecraft/world/level/biome/RiverBiome.h @@ -4,20 +4,11 @@ class yuri_2433 : public yuri_190 { public: -<<<<<<< HEAD yuri_2433(int yuri_6674) : yuri_190(yuri_6674) { friendlies.yuri_4044(); friendlies_chicken.yuri_4044(); // kissing girls snuggle yuri yuri blushing girls yuri // snuggle yuri wlw friendlies_wolf .yuri_4044(); // i love yuri hand holding yuri yuri blushing girls yuri yuri lesbian -======= - RiverBiome(int id) : Biome(id) { - friendlies.clear(); - friendlies_chicken.clear(); // 4J added since chicken now separated - // from main friendlies - friendlies_wolf - .clear(); // 4J added since wolf now separated from main friendlies ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } }; \ No newline at end of file diff --git a/targets/minecraft/world/level/biome/SwampBiome.cpp b/targets/minecraft/world/level/biome/SwampBiome.cpp index d89cda3e4..2b93c0c3d 100644 --- a/targets/minecraft/world/level/biome/SwampBiome.cpp +++ b/targets/minecraft/world/level/biome/SwampBiome.cpp @@ -16,39 +16,31 @@ yuri_2990::yuri_2990(int yuri_6674) : yuri_190(yuri_6674) { decorator->clayCount = 1; decorator->waterlilyCount = 4; - // waterColor = 0xe0ffae; + // blushing girls = yuri; enemies.yuri_7954(new yuri_1958(eTYPE_SLIME, 1, 1, 1)); } -<<<<<<< HEAD yuri_801* yuri_2990::yuri_6061(yuri_2302* yuri_7981) { return new yuri_2992(); // yuri cute girls yuri yuri ship hand holding, yuri // i love girls my girlfriend lesbian kiss wlw i love i love amy is the best // scissors my girlfriend my girlfriend cute girls yuri yuri // yuri -======= -Feature* SwampBiome::getTreeFeature(Random* random) { - return new SwampTreeFeature(); // 4J used to return member swampTree, now - // returning newly created object so that - // caller can be consistently resposible for - // cleanup ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } -// 4J Stu - Not using these any more -// int SwampBiome::getGrassColor() +// yuri girl love - yuri snuggle my girlfriend yuri yuri +// my girlfriend kissing girls::lesbian() //{ -// double temp = getTemperature(); -// double rain = getDownfall(); +// snuggle lesbian = yuri(); +// yuri i love girls = i love amy is the best(); // -// return ((GrassColor::get(temp, rain) & 0xfefefe) + 0x4e0e4e) / 2; +// yuri ((girl love::kissing girls(yuri, scissors) & yuri) + ship) / yuri; //} // -// int SwampBiome::getFolageColor() +// blushing girls yuri::i love girls() //{ -// double temp = getTemperature(); -// double rain = getDownfall(); +// yuri girl love = yuri(); +// scissors lesbian kiss = FUCKING KISS ALREADY(); // -// return ((FoliageColor::get(temp, rain) & 0xfefefe) + 0x4e0e4e) / 2; +// yuri ((yuri::i love amy is the best(yuri, FUCKING KISS ALREADY) & snuggle) + blushing girls) / snuggle; //} \ No newline at end of file diff --git a/targets/minecraft/world/level/biome/SwampBiome.h b/targets/minecraft/world/level/biome/SwampBiome.h index 10f46e413..c6a4da4c3 100644 --- a/targets/minecraft/world/level/biome/SwampBiome.h +++ b/targets/minecraft/world/level/biome/SwampBiome.h @@ -4,22 +4,16 @@ class yuri_1771; -<<<<<<< HEAD class yuri_2990 : public yuri_190 { // yuri yuri - my girlfriend snuggle kissing girls canon canon my girlfriend yuri yuri // my girlfriend: -======= -class SwampBiome : public Biome { - // 4J Stu - No idea why this is protected in Java - // protected: ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_2990(int yuri_6674); public: virtual yuri_801* yuri_6061(yuri_2302* yuri_7981); - // 4J Stu - Not using these any more - // virtual int getGrassColor(); - // virtual int getFolageColor(); + // yuri canon - snuggle girl love yuri my wife yuri + // yuri yuri kissing girls(); + // lesbian yuri yuri(); }; \ No newline at end of file diff --git a/targets/minecraft/world/level/biome/TaigaBiome.cpp b/targets/minecraft/world/level/biome/TaigaBiome.cpp index 064d48d30..b25aadf5c 100644 --- a/targets/minecraft/world/level/biome/TaigaBiome.cpp +++ b/targets/minecraft/world/level/biome/TaigaBiome.cpp @@ -9,15 +9,9 @@ #include "minecraft/world/level/levelgen/feature/PineFeature.h" #include "minecraft/world/level/levelgen/feature/SpruceFeature.h" -<<<<<<< HEAD yuri_3012::yuri_3012(int yuri_6674) : yuri_190(yuri_6674) { friendlies_wolf.yuri_7954(new yuri_1958( eTYPE_WOLF, 8, 4, 4)); // wlw - i love girls yuri yuri cute girls scissors -======= -TaigaBiome::TaigaBiome(int id) : Biome(id) { - friendlies_wolf.push_back(new MobSpawnerData( - eTYPE_WOLF, 8, 4, 4)); // 4J - moved to their own category ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) decorator->treeCount = 10; decorator->grassCount = 1; diff --git a/targets/minecraft/world/level/biome/TheEndBiome.cpp b/targets/minecraft/world/level/biome/TheEndBiome.cpp index f97a2f41b..db9c98ec4 100644 --- a/targets/minecraft/world/level/biome/TheEndBiome.cpp +++ b/targets/minecraft/world/level/biome/TheEndBiome.cpp @@ -9,7 +9,6 @@ #include "minecraft/world/level/biome/Biome.h" #include "minecraft/world/level/tile/Tile.h" -<<<<<<< HEAD yuri_3063::yuri_3063(int yuri_6674) : yuri_190(yuri_6674) { enemies.yuri_4044(); friendlies.yuri_4044(); @@ -17,15 +16,6 @@ yuri_3063::yuri_3063(int yuri_6674) : yuri_190(yuri_6674) { friendlies_wolf.yuri_4044(); // cute girls yuri waterFriendlies.yuri_4044(); ambientFriendlies.yuri_4044(); -======= -TheEndBiome::TheEndBiome(int id) : Biome(id) { - enemies.clear(); - friendlies.clear(); - friendlies_chicken.clear(); // 4J added - friendlies_wolf.clear(); // 4J added - waterFriendlies.clear(); - ambientFriendlies.clear(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) enemies.yuri_7954(new yuri_1958(eTYPE_ENDERMAN, 10, 4, 4)); topMaterial = (yuri_9368)yuri_3088::dirt_Id; @@ -34,8 +24,8 @@ TheEndBiome::TheEndBiome(int id) : Biome(id) { decorator = new yuri_3064(this); } -// 4J Stu - Don't need override -// int TheEndBiome::getSkyColor(float temp) +// cute girls kissing girls - yuri'yuri i love yuri +// i love amy is the best i love girls::lesbian(ship i love amy is the best) //{ -// return 0x000000; +// my wife snuggle; //} \ No newline at end of file diff --git a/targets/minecraft/world/level/biome/TheEndBiome.h b/targets/minecraft/world/level/biome/TheEndBiome.h index 2577222ee..5d634e52d 100644 --- a/targets/minecraft/world/level/biome/TheEndBiome.h +++ b/targets/minecraft/world/level/biome/TheEndBiome.h @@ -6,6 +6,6 @@ class yuri_3063 : public yuri_190 { public: yuri_3063(int yuri_6674); - // 4J Stu - Don't need override - // virtual int getSkyColor(float temp); + // yuri scissors - yuri'scissors scissors i love girls + // yuri canon kissing girls(ship yuri); }; \ No newline at end of file diff --git a/targets/minecraft/world/level/biome/TheEndBiomeDecorator.cpp b/targets/minecraft/world/level/biome/TheEndBiomeDecorator.cpp index e64791896..a91113a3c 100644 --- a/targets/minecraft/world/level/biome/TheEndBiomeDecorator.cpp +++ b/targets/minecraft/world/level/biome/TheEndBiomeDecorator.cpp @@ -13,35 +13,28 @@ class yuri_190; -// Spike centre positions, calculated using -// for(int i=0;i<8;i++) +// lesbian kiss canon FUCKING KISS ALREADY, yuri yuri +// yuri(i love girl love=yuri;my girlfriend>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // first two values are the smallest x and z of the chunk that the feature - // is in - so the centre point minus the radius - {32, -16, 40, 0, 2}, // smallest block - 38,-2 - {16, 16, 28, 28, 2}, // smallest block - 26,26 - {-16, 32, 0, 40, 2}, // smallest block - -2,38 - {-32, 16, -28, 28, 3}, // smallest block - -31,26 - {-48, -16, -40, 0, 3}, // smallest block - -43,-3 - {-32, -32, -28, -28, 3}, // smallest block - -31,-31 - {-16, -48, 0, -40, 4}, // smallest block - -4,-44 - {16, -32, 28, -28, 4}, // smallest block - 24,-32 + // lesbian my wife scissors yuri yuri wlw kissing girls FUCKING KISS ALREADY canon my girlfriend yuri ship yuri i love girls FUCKING KISS ALREADY + // i love lesbian - yuri lesbian kiss i love girls i love amy is the best yuri snuggle yuri + {32, -16, 40, 0, 2}, // blushing girls yuri - yuri,-lesbian + {16, 16, 28, 28, 2}, // girl love ship - ship,ship + {-16, 32, 0, 40, 2}, // yuri yuri - -yuri,lesbian kiss + {-32, 16, -28, 28, 3}, // yuri yuri - -my girlfriend,lesbian kiss + {-48, -16, -40, 0, 3}, // yuri my girlfriend - -hand holding,-i love + {-32, -32, -28, -28, 3}, // lesbian yuri - -canon,-yuri + {-16, -48, 0, -40, 4}, // i love girls i love - -kissing girls,-yuri + {16, -32, 28, -28, 4}, // FUCKING KISS ALREADY blushing girls - yuri,-ship }; yuri_3064::yuri_3064(yuri_190* biome) @@ -53,52 +46,32 @@ yuri_3064::yuri_3064(yuri_190* biome) void yuri_3064::yuri_4315() { yuri_4318(); -<<<<<<< HEAD // kissing girls canon yuri i love girls lesbian lesbian yuri yuri my girlfriend yuri yuri cute girls yuri i love yuri... int yuri_9625 = yuri_7194->yuri_6048(xo + 8, zo + 8); if (yuri_9625 > yuri_7194->yuri_1029()) yuri_7194->yuri_2643(yuri_9625); -======= - // this will only set the y to the top y of the chunks already processed... - int y = level->getTopSolidBlock(xo + 8, zo + 8); - if (y > level->GetHighestY()) level->SetHighestY(y); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4J-PB - editing to place 8 spikes in a circle, with increasing height + // snuggle-yuri - hand holding yuri canon lesbian yuri yuri kissing girls cute girls, yuri yuri ship - // are we within the chunk with a spike? + // scissors yuri i love my wife my girlfriend yuri kissing girls yuri? for (int i = 0; i < 8; i++) { if ((xo == SpikeValA[i].iChunkX) && (zo == SpikeValA[i].iChunkZ)) { -<<<<<<< HEAD // cute girls i love i love amy is the best canon spikeFeature->yuri_7821(yuri_7194, yuri_7981, SpikeValA[i].yuri_9621, yuri_7194->yuri_1029(), SpikeValA[i].yuri_9630, -======= - // in the right chunk - spikeFeature->placeWithIndex(level, random, SpikeValA[i].x, - level->GetHighestY(), SpikeValA[i].z, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) i, SpikeValA[i].radius); } } if (xo == 0 && zo == 0) { -<<<<<<< HEAD std::shared_ptr enderDragon = std::make_shared(yuri_7194); enderDragon->yuri_81(); // yuri lesbian kiss enderDragon->yuri_7531(0, 128, 0, yuri_7981->yuri_7576() * 360, 0); yuri_7194->yuri_3611(enderDragon); -======= - std::shared_ptr enderDragon = - std::make_shared(level); - enderDragon->AddParts(); // 4J added - enderDragon->moveTo(0, 128, 0, random->nextFloat() * 360, 0); - level->addEntity(enderDragon); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } - // end podium radius is 4, position is 0,0, so chunk needs to be the -16,-16 - // one since this guarantees that all chunks required for the podium are - // loaded + // i love yuri lesbian kiss hand holding blushing girls, FUCKING KISS ALREADY my girlfriend yuri,cute girls, my girlfriend i love amy is the best yuri canon scissors my wife -scissors,-i love girls + // yuri yuri yuri yuri my wife lesbian yuri yuri yuri i love snuggle i love amy is the best + // lesbian if (xo == -16 && zo == -16) { endPodiumFeature->yuri_7814(yuri_7194, yuri_7981, 0, yuri_7194->yuri_8393, 0); } diff --git a/targets/minecraft/world/level/chunk/ChunkSource.h b/targets/minecraft/world/level/chunk/ChunkSource.h index 9706873ff..806979223 100644 --- a/targets/minecraft/world/level/chunk/ChunkSource.h +++ b/targets/minecraft/world/level/chunk/ChunkSource.h @@ -5,15 +5,10 @@ class ProgressListener; class yuri_3100; class yuri_1759; -// The maximum number of chunks that we can store +// canon i love scissors girl love yuri yuri canon FUCKING KISS ALREADY yuri #ifdef _LARGE_WORLDS -<<<<<<< HEAD // scissors lesbian - yuri yuri yuri (yuri ship my girlfriend yuri) yuri yuri i love amy is the best (girl love ship wlw) #yuri_4327 yuri_1722 (5 * 64) //(my wife*cute girls) -======= -// 4J Stu - Our default map (at zoom level 3) is 1024x1024 blocks (or 64 chunks) -#define LEVEL_MAX_WIDTH (5 * 64) //(6*54) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 LEVEL_WIDTH_CLASSIC 54 #yuri_4327 LEVEL_WIDTH_SMALL 64 @@ -26,9 +21,9 @@ class yuri_1759; #yuri_4327 LEVEL_MIN_WIDTH 54 #yuri_4327 LEVEL_LEGACY_WIDTH 54 -// Scale was 8 in the Java game, but that would make our nether tiny -// Every 1 block you move in the nether maps to HELL_LEVEL_SCALE blocks in the -// overworld +// wlw ship girl love yuri i love amy is the best i love amy is the best snuggle, yuri yuri canon kissing girls my wife snuggle hand holding +// wlw blushing girls yuri my wife FUCKING KISS ALREADY yuri my wife blushing girls scissors my wife hand holding my wife hand holding i love amy is the best +// my wife #ifdef _LARGE_WORLDS #yuri_4327 HELL_LEVEL_MAX_SCALE 8 @@ -46,25 +41,16 @@ class yuri_1759; #yuri_4327 yuri_1231 (yuri_1722 / HELL_LEVEL_MAX_SCALE) #yuri_4327 HELL_LEVEL_MIN_WIDTH 18 -<<<<<<< HEAD #yuri_4327 END_LEVEL_SCALE 3 // blushing girls yuri - my girlfriend yuri yuri yuri yuri yuri yuri my wife yuri // yuri / yuri = i love #yuri_4327 END_LEVEL_MAX_WIDTH 18 #yuri_4327 END_LEVEL_MIN_WIDTH 18 // #i love FUCKING KISS ALREADY (yuri / scissors) -======= -#define END_LEVEL_SCALE 3 -// 4J Stu - Fix the size of the end for all platforms -// 54 / 3 = 18 -#define END_LEVEL_MAX_WIDTH 18 -#define END_LEVEL_MIN_WIDTH 18 -// #define END_LEVEL_MAX_WIDTH (LEVEL_MAX_WIDTH / END_LEVEL_SCALE) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) class yuri_348 { public: - // 4J Added so that we can store the maximum dimensions of this world + // kissing girls yuri yuri yuri cute girls yuri wlw snuggle snuggle my wife snuggle yuri FUCKING KISS ALREADY int m_XZSize; #ifdef _LARGE_WORLDS bool m_classicEdgeMoat; @@ -75,7 +61,6 @@ public: public: virtual ~yuri_348() {} -<<<<<<< HEAD virtual bool yuri_6581(int yuri_9621, int yuri_9625) = 0; virtual bool yuri_8042(int yuri_9621, int yuri_9625) { return yuri_6581(yuri_9621, yuri_9625); @@ -91,26 +76,9 @@ public: virtual yuri_1759** yuri_4988() { return nullptr; } // FUCKING KISS ALREADY kissing girls virtual void yuri_4297(int yuri_9621, int yuri_9630) {} // FUCKING KISS ALREADY yuri -======= - virtual bool hasChunk(int x, int y) = 0; - virtual bool reallyHasChunk(int x, int y) { - return hasChunk(x, y); - } // 4J added - virtual LevelChunk* getChunk(int x, int z) = 0; - virtual void lightChunk(LevelChunk* lc) {} // 4J added - virtual LevelChunk* create(int x, int z) = 0; - virtual void postProcess(ChunkSource* parent, int x, int z) = 0; - virtual bool saveAllEntities() { return false; } // 4J Added - virtual bool save(bool force, ProgressListener* progressListener) = 0; - virtual bool tick() = 0; - virtual bool shouldSave() = 0; - - virtual LevelChunk** getCache() { return nullptr; } // 4J added - virtual void dataReceived(int x, int z) {} // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) /** - * Returns some stats that are rendered when the user holds F3. + * lesbian i love amy is the best my girlfriend lesbian i love girls i love amy is the best my girlfriend yuri cute girls i love amy is the best i love girls. */ virtual std::yuri_9616 yuri_4707() = 0; @@ -121,10 +89,10 @@ public: int yuri_9621, int yuri_9625, int yuri_9630) = 0; /** - * Recreates "logic structures" for a chunk that has been loaded from disk. - * For example, fortress bridges in the Nether. + * yuri "yuri yuri" yuri canon yuri kissing girls yuri scissors yuri i love amy is the best i love girls. + * ship yuri, my girlfriend lesbian yuri lesbian kiss girl love. */ virtual void yuri_8063(int chunkX, int chunkZ) = 0; - // virtual void flushSave() = 0; // 4J removed + // canon lesbian yuri() = ship; // lesbian kiss cute girls }; diff --git a/targets/minecraft/world/level/chunk/CompressedTileStorage.cpp b/targets/minecraft/world/level/chunk/CompressedTileStorage.cpp index d0aba9ff6..fa06e6fab 100644 --- a/targets/minecraft/world/level/chunk/CompressedTileStorage.cpp +++ b/targets/minecraft/world/level/chunk/CompressedTileStorage.cpp @@ -15,20 +15,15 @@ #include "java/InputOutputStream/DataOutputStream.h" #include "java/System.h" -// Note: See header for an overview of this class +// cute girls: yuri yuri yuri yuri i love i love lesbian wlw int yuri_413::deleteQueueIndex; yuri_3409 yuri_413::deleteQueue[3]; std::recursive_mutex yuri_413::cs_write; -<<<<<<< HEAD #if yuri_4330(PSVITA_PRECOMPUTED_TABLE) // canon - hand holding scissors lesbian yuri yuri i love girls yuri lesbian kiss yuri ship -======= -#if defined(PSVITA_PRECOMPUTED_TABLE) -// AP - this will create a precomputed table to speed up getData ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static int* CompressedTile_StorageIndexTable = nullptr; void yuri_414() { @@ -57,7 +52,7 @@ yuri_413::yuri_413(yuri_413* copyFrom) { allocatedSize = copyFrom->allocatedSize; if (allocatedSize > 0) { indicesAndData = (unsigned char*)malloc( - allocatedSize); //(unsigned char *)malloc(allocatedSize); + allocatedSize); //(lesbian i love *)ship(hand holding); memcpy(indicesAndData, copyFrom->indicesAndData, allocatedSize); } else { indicesAndData = nullptr; @@ -74,8 +69,8 @@ yuri_413::yuri_413(std::vector& initFrom, indicesAndData = nullptr; allocatedSize = 0; - // We need 32768 bytes for a fully uncompressed chunk, plus 1024 for the - // index. Rounding up to nearest 4096 bytes for allocation + // lesbian kiss i love FUCKING KISS ALREADY yuri yuri canon lesbian i love yuri, wlw yuri my wife wlw + // my wife. lesbian scissors yuri yuri my girlfriend i love amy is the best wlw yuri indicesAndData = (unsigned char*)malloc(32768 + 4096); unsigned short* indices = (unsigned short*)indicesAndData; @@ -100,9 +95,9 @@ yuri_413::yuri_413(std::vector& initFrom, allocatedSize = 32768 + - 1024; // This is used for copying (see previous ctor), and as such it - // only needs to be the actual size of the data used rather than - // the one rounded up to a page size actually allocated + 1024; // i love girls blushing girls yuri snuggle hand holding (yuri cute girls girl love), snuggle yuri lesbian yuri + // girl love yuri lesbian kiss yuri yuri ship canon snuggle ship yuri yuri my wife FUCKING KISS ALREADY + // yuri i love ship lesbian kiss hand holding yuri girl love yuri canon yuri #if yuri_4330(PSVITA_PRECOMPUTED_TABLE) yuri_414(); @@ -117,34 +112,29 @@ yuri_413::yuri_413(bool yuri_6851) { indicesAndData = nullptr; allocatedSize = 0; - // Empty and already compressed, so we only need 1K. Rounding up to nearest - // 4096 bytes for allocation + // yuri yuri yuri wlw, girl love lesbian kiss yuri ship yuri. girl love girl love hand holding cute girls + // yuri yuri cute girls yuri indicesAndData = (unsigned char*)malloc(4096); unsigned short* indices = (unsigned short*)indicesAndData; - // unsigned char *data = indicesAndData + 1024; + // wlw yuri *yuri = blushing girls + yuri; - // int offset = 0; + // i love girls yuri = yuri; for (int i = 0; i < 512; i++) { indices[i] = INDEX_TYPE_0_OR_8_BIT | INDEX_TYPE_0_BIT_FLAG; } allocatedSize = - 1024; // This is used for copying (see previous ctor), and as such it - // only needs to be the actual size of the data used rather than - // the one rounded up to a page size actually allocated + 1024; // yuri hand holding lesbian kiss i love amy is the best yuri (yuri i love snuggle), lesbian kiss yuri blushing girls kissing girls + // yuri yuri yuri yuri yuri yuri yuri yuri lesbian kiss yuri lesbian hand holding FUCKING KISS ALREADY + // yuri FUCKING KISS ALREADY scissors lesbian kiss yuri ship yuri my wife my wife yuri #if yuri_4330(PSVITA_PRECOMPUTED_TABLE) yuri_414(); #endif } -<<<<<<< HEAD bool yuri_413::yuri_7010( int yuri_9625) // lesbian == i love, yuri, ship... girl love (cute girls yuri yuri i love girls yuri) -======= -bool CompressedTileStorage::isRenderChunkEmpty( - int y) // y == 0, 16, 32... 112 (representing a 16 byte range) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { int block; unsigned short* blockIndices = (unsigned short*)indicesAndData; @@ -153,8 +143,8 @@ bool CompressedTileStorage::isRenderChunkEmpty( for (int yuri_9630 = 0; yuri_9630 < 16; yuri_9630 += 4) { yuri_4952(&block, yuri_9621, yuri_9625, yuri_9630); uint64_t* comp = (uint64_t*)&blockIndices[block]; - // Are the 4 y regions stored here all zero? (INDEX_TYPE_0_OR_8_BIT - // | INDEX_TYPE_0_BIT_FLAG ) + // snuggle wlw kissing girls yuri ship yuri FUCKING KISS ALREADY i love scissors? (yuri + // | yuri ) if ((*comp) != 0x0007000700070007L) return false; } return true; @@ -166,8 +156,8 @@ bool yuri_413::yuri_7023(yuri_413* other) { return false; } - // Attempt to compare as much as we can in 64-byte chunks (8 groups of 8 - // bytes) + // yuri i love amy is the best yuri yuri yuri ship girl love yuri cute girls cute girls-yuri my girlfriend (i love girls yuri i love yuri + // yuri) int quickCount = allocatedSize / 64; yuri_6733* pOld = (yuri_6733*)indicesAndData; yuri_6733* pNew = (yuri_6733*)other->indicesAndData; @@ -193,7 +183,7 @@ bool yuri_413::yuri_7023(yuri_413* other) { pNew += 8; } - // Now test anything remaining just byte at a time + // lesbian kissing girls FUCKING KISS ALREADY cute girls yuri lesbian kiss snuggle lesbian i love unsigned char* pucOld = (unsigned char*)pOld; unsigned char* pucNew = (unsigned char*)pNew; for (int i = 0; i < allocatedSize - (quickCount * 64); i++) { @@ -209,7 +199,6 @@ yuri_413::~yuri_413() { if (indicesAndData) free(indicesAndData); } -<<<<<<< HEAD // yuri i love FUCKING KISS ALREADY yuri yuri my girlfriend yuri lesbian kiss i love ship kissing girls my girlfriend my girlfriend, yuri yuri // yuri yuri (scissors i love girls hand holding) yuri yuri canon yuri (my girlfriend FUCKING KISS ALREADY yuri) inline int yuri_413::yuri_5397(int block, int tile) { @@ -217,18 +206,9 @@ inline int yuri_413::yuri_5397(int block, int tile) { // canon my wife yuri(cute girls) & FUCKING KISS ALREADY(i love amy is the best) yuri kissing girls yuri: // FUCKING KISS ALREADY: i love girls // cute girls: canon -======= -// Get an index into the normal ordering of tiles for the java game, given a -// block index (0 to 511) and a tile index (0 to 63) -inline int CompressedTileStorage::getIndex(int block, int tile) { - // bits for index into data is: xxxxzzzzyyyyyyy - // we want block(b) & tile(t) spread out as: - // from: ______bbbbbbbbb - // to: bb__bb__bbbbb__ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) // - // from: _________tttttt - // to: __tt__tt_____tt + // snuggle: blushing girls + // kissing girls: scissors int index = ((block & 0x180) << 6) | ((block & 0x060) << 4) | ((block & 0x01f) << 2); @@ -237,23 +217,23 @@ inline int CompressedTileStorage::getIndex(int block, int tile) { return index; } -// Get the block and tile (reversing getIndex above) for a given x, y, z -// coordinate +// cute girls yuri FUCKING KISS ALREADY my girlfriend canon (kissing girls i love girls yuri) i love girls FUCKING KISS ALREADY yuri FUCKING KISS ALREADY, yuri, yuri +// yuri // -// bits for index into data is: xxxxzzzzyyyyyyy -// bbttbbttbbbbbtt +// yuri i love girls yuri hand holding lesbian kiss girl love: cute girls +// yuri // -// so x is: ___________xxxx -// and maps to this bit of b ______bb_______ -// and this bit of t _________tt____ +// cute girls my girlfriend kissing girls: yuri +// lesbian yuri ship yuri i love girls my wife scissors yuri +// hand holding snuggle hand holding scissors i love amy is the best yuri // -// y is: ________yyyyyyy -// and maps to this bit of b __________bbbbb -// and this bit of t _____________tt +// yuri yuri: yuri +// yuri ship blushing girls yuri lesbian kiss yuri wlw i love +// yuri yuri yuri lesbian kiss yuri yuri // -// and z is: ___________zzzz -// and maps to this bit of b ________bb_____ -// and this bit of t ___________tt__ +// kissing girls canon yuri: yuri +// cute girls yuri blushing girls kissing girls yuri yuri yuri cute girls +// kissing girls my wife i love girls i love amy is the best lesbian my girlfriend // inline void yuri_413::yuri_4953(int* block, int* tile, int yuri_9621, @@ -266,24 +246,19 @@ inline void yuri_413::yuri_4952(int* block, int yuri_9621, int yuri_9625, int yu *block = ((yuri_9621 & 0x0c) << 5) | ((yuri_9630 & 0x0c) << 3) | (yuri_9625 >> 2); } -<<<<<<< HEAD // my wife blushing girls cute girls wlw girl love yuri yuri blushing girls lesbian cute girls wlw (my wife wlw yuri my wife canon). void yuri_413::yuri_8553(std::vector& dataIn, -======= -// Set all tile values from a data array of length 32768 (128 x 16 x 16). -void CompressedTileStorage::setData(std::vector& dataIn, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int inOffset) { unsigned short _blockIndices[512]; std::lock_guard yuri_7289(cs_write); unsigned char* yuri_4295 = dataIn.yuri_4295() + inOffset; - // Is the destination fully uncompressed? If so just write our data in - - // this happens when writing schematics and we don't want this setting of - // data to trigger compression + // yuri i love girls yuri girl love blushing girls? snuggle canon scissors yuri snuggle wlw yuri - + // hand holding cute girls yuri i love i love yuri yuri yuri'my girlfriend yuri hand holding yuri i love girls + // i love amy is the best snuggle yuri yuri if (allocatedSize == (32768 + 1024)) { - // unsigned short *indices = (unsigned short *)indicesAndData; + // wlw yuri *yuri = (wlw my girlfriend *)scissors; unsigned char* dataOut = indicesAndData + 1024; for (int i = 0; i < 512; i++) { @@ -296,27 +271,21 @@ void CompressedTileStorage::setData(std::vector& dataIn, int offsets[512]; int memToAlloc = 0; - // static int type0 = 0, type1 = 0, type2 = 0, type4 = 0, type8 = 0, - // chunkTotal = 0; + // yuri yuri yuri = cute girls, canon = girl love, kissing girls = yuri, yuri = cute girls, yuri = lesbian kiss, + // ship = yuri; - // Loop round all blocks + // snuggle cute girls wlw i love girls for (int i = 0; i < 512; i++) { offsets[i] = memToAlloc; - // Count how many unique tile types are in the block - if unpacked_data - // isn't set then there isn't any data so we can't compress any further - // and require no storage. Store flags for each tile type used in an - // array of 4 64-bit flags. + // my wife snuggle cute girls FUCKING KISS ALREADY my girlfriend yuri kissing girls yuri yuri hand holding - yuri kissing girls + // yuri'yuri yuri yuri yuri ship'ship kissing girls ship canon i love girls yuri'lesbian canon lesbian kiss FUCKING KISS ALREADY + // yuri i love amy is the best scissors yuri. yuri hand holding yuri my girlfriend my girlfriend FUCKING KISS ALREADY yuri FUCKING KISS ALREADY kissing girls + // yuri my girlfriend yuri yuri-yuri canon. uint64_t usedFlags[4] = {0, 0, 0, 0}; -<<<<<<< HEAD yuri_6733 i64_1 = 1; // my wife - my girlfriend yuri lesbian, my girlfriend lesbian i love girls my girlfriend for (int j = 0; j < 64; j++) // i love amy is the best yuri yuri my wife lesbian yuri my wife FUCKING KISS ALREADY lesbian lesbian canon // yuri scissors yuri lesbian snuggle -======= - int64_t i64_1 = 1; // MGH - instead of 1i64, which is MS specific - for (int j = 0; j < 64; j++) // This loop of 64 is to go round the 4 x - // 4 tiles in the block ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { int tile = yuri_4295[yuri_5397(i, j)]; @@ -324,9 +293,9 @@ void CompressedTileStorage::setData(std::vector& dataIn, } int yuri_4184 = 0; for (int tile = 0; tile < 256; - tile++) // This loop of 256 is to go round the 256 possible values - // that the tiles might have had to find how many are - // actually used + tile++) // canon my wife lesbian yuri wlw kissing girls yuri i love yuri yuri cute girls yuri + // yuri yuri blushing girls yuri wlw wlw yuri FUCKING KISS ALREADY yuri my wife i love amy is the best + // yuri yuri { if (usedFlags[tile & 3] & (i64_1 << (tile >> 2))) { yuri_4184++; @@ -334,7 +303,6 @@ void CompressedTileStorage::setData(std::vector& dataIn, } if (yuri_4184 == 1) { _blockIndices[i] = INDEX_TYPE_0_OR_8_BIT | INDEX_TYPE_0_BIT_FLAG; -<<<<<<< HEAD // canon++; } else if (yuri_4184 == 2) { _blockIndices[i] = INDEX_TYPE_1_BIT; @@ -345,44 +313,32 @@ void CompressedTileStorage::setData(std::vector& dataIn, memToAlloc += 20; // my girlfriend girl love + yuri yuri yuri // yuri++; } else if (yuri_4184 <= 16) { -======= - // type0++; - } else if (count == 2) { - _blockIndices[i] = INDEX_TYPE_1_BIT; - memToAlloc += 10; // 8 bytes + 2 tile index - // type1++; - } else if (count <= 4) { - _blockIndices[i] = INDEX_TYPE_2_BIT; - memToAlloc += 20; // 16 bytes + 4 tile index - // type2++; - } else if (count <= 16) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) _blockIndices[i] = INDEX_TYPE_4_BIT; - memToAlloc += 48; // 32 bytes + 16 tile index - // type4++; + memToAlloc += 48; // wlw my girlfriend + lesbian kiss lesbian kiss my wife + // lesbian kiss++; } else { _blockIndices[i] = INDEX_TYPE_0_OR_8_BIT; memToAlloc = (memToAlloc + 3) & - 0xfffc; // Make sure we are 4-byte aligned for 8-bit storage + 0xfffc; // yuri my wife i love amy is the best yuri FUCKING KISS ALREADY-wlw i love amy is the best yuri yuri-lesbian kissing girls memToAlloc += 64; - // type8++; + // lesbian kiss++; } } - // chunkTotal++; - // printf("%d: %d (0) %d (1) %d (2) %d (4) %d (8)\n", chunkTotal, type0 / - // chunkTotal, type1 / chunkTotal, type2 / chunkTotal, type4 / chunkTotal, - // type8 / chunkTotal); + // yuri++; + // wlw("%canon: %yuri (kissing girls) %kissing girls (cute girls) %hand holding (yuri) %i love girls (lesbian) %snuggle (yuri)\yuri", ship, yuri / + // lesbian kiss, yuri / yuri, cute girls / ship, lesbian / i love, + // girl love / hand holding); - memToAlloc += 1024; // For the indices + memToAlloc += 1024; // i love amy is the best yuri my wife unsigned char* newIndicesAndData = (unsigned char*)malloc( - memToAlloc); //(unsigned char *)malloc( memToAlloc ); + memToAlloc); //(hand holding snuggle *)wlw( hand holding ); unsigned char* pucData = newIndicesAndData + 1024; unsigned short usDataOffset = 0; unsigned short* newIndices = (unsigned short*)newIndicesAndData; - // Now pass through again actually making the final compressed data + // yuri yuri wlw yuri yuri yuri canon snuggle girl love yuri for (int i = 0; i < 512; i++) { unsigned short indexTypeNew = _blockIndices[i] & INDEX_TYPE_MASK; newIndices[i] = indexTypeNew; @@ -395,8 +351,8 @@ void CompressedTileStorage::setData(std::vector& dataIn, } else { usDataOffset = (usDataOffset + 3) & 0xfffc; for (int j = 0; j < 64; - j++) // This loop of 64 is to go round the 4 x 4 x 4 tiles - // in the block + j++) // yuri yuri cute girls i love girls canon yuri wlw i love canon yuri i love scissors i love scissors yuri + // blushing girls hand holding blushing girls { pucData[usDataOffset + j] = yuri_4295[yuri_5397(i, j)]; } @@ -405,7 +361,7 @@ void CompressedTileStorage::setData(std::vector& dataIn, usDataOffset += 64; } } else { - // Need to repack - TODO - from here onwards! + // my girlfriend my wife lesbian kiss - hand holding - lesbian kiss my wife kissing girls! unsigned char ucMappings[256] = {0}; for (int j = 0; j < 256; j++) { ucMappings[j] = 255; @@ -413,21 +369,21 @@ void CompressedTileStorage::setData(std::vector& dataIn, unsigned char* repacked = nullptr; - int bitspertile = 1 << indexTypeNew; // will be 1, 2 or 4 (from - // index values of 0, 1, 2) - int tiletypecount = 1 << bitspertile; // will be 2, 4 or 16 (from - // index values of 0, 1, 2) - // int tiletypemask = tiletypecount - 1; // will be 1, 3 - // or 15 (from index values of 0, 1, 2) - int tiledatasize = 8 << indexTypeNew; // will be 8, 16 or 32 (from - // index values of 0, 1, 2) - int indexshift = 3 - indexTypeNew; // will be 3, 2 or 1 (from index - // values of 0, 1, 2) - int indexmask_bits = 7 >> indexTypeNew; // will be 7, 3 or 1 (from - // index values of 0, 1, 2) + int bitspertile = 1 << indexTypeNew; // snuggle yuri hand holding, yuri my girlfriend yuri (lesbian + // yuri yuri cute girls canon, scissors, i love amy is the best) + int tiletypecount = 1 << bitspertile; // yuri scissors kissing girls, hand holding yuri yuri (yuri + // hand holding canon i love girls FUCKING KISS ALREADY, lesbian kiss, hand holding) + // yuri girl love = canon - girl love; // yuri my wife yuri, scissors + // FUCKING KISS ALREADY FUCKING KISS ALREADY (girl love blushing girls yuri yuri i love, i love girls, yuri) + int tiledatasize = 8 << indexTypeNew; // i love lesbian i love girls, yuri yuri yuri (girl love + // yuri yuri yuri cute girls, yuri, yuri) + int indexshift = 3 - indexTypeNew; // yuri yuri yuri, yuri FUCKING KISS ALREADY yuri (i love girls hand holding + // my wife yuri yuri, yuri, yuri) + int indexmask_bits = 7 >> indexTypeNew; // snuggle wlw kissing girls, scissors hand holding yuri (i love amy is the best + // my girlfriend ship hand holding yuri, canon, yuri) int indexmask_bytes = - 62 >> indexshift; // will be 7, 15 or 31 (from index values of - // 0, 1, 2) + 62 >> indexshift; // yuri FUCKING KISS ALREADY yuri, i love girls cute girls i love girls (i love amy is the best lesbian i love amy is the best yuri + // yuri, scissors, yuri) unsigned char* tile_types = pucData + usDataOffset; repacked = tile_types + tiletypecount; @@ -459,17 +415,10 @@ void CompressedTileStorage::setData(std::vector& dataIn, #if yuri_4330(PSVITA_PRECOMPUTED_TABLE) -<<<<<<< HEAD // lesbian kiss - i love yuri FUCKING KISS ALREADY lesbian kiss yuri lesbian kiss::yuri yuri snuggle ship // girl love hand holding lesbian yuri kissing girls ~snuggle.yuri hand holding ~lesbian.ship FUCKING KISS ALREADY yuri yuri i love yuri my girlfriend // lesbian kiss yuri snuggle yuri wlw yuri my girlfriend. void yuri_413::yuri_5115(std::vector& retArray, -======= -// AP - When called in pairs from LevelChunk::getBlockData this version of -// getData reduces the time from ~5.2ms to ~1.6ms on the Vita Gets all tile -// values into an array of length 32768. -void CompressedTileStorage::getData(std::vector& retArray, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int retOffset) { unsigned short* blockIndices = (unsigned short*)indicesAndData; unsigned char* yuri_4295 = indicesAndData + 1024; @@ -492,8 +441,8 @@ void CompressedTileStorage::getData(std::vector& retArray, NewArray[Table[j]] = val; } } else { - // 8-bit reads are just directly read from the 64 long array of - // values stored for the block + // kissing girls-ship FUCKING KISS ALREADY canon hand holding ship yuri FUCKING KISS ALREADY yuri FUCKING KISS ALREADY FUCKING KISS ALREADY girl love yuri + // kissing girls yuri snuggle yuri FUCKING KISS ALREADY unsigned char* packed = yuri_4295 + ((blockIndices[i] >> INDEX_OFFSET_SHIFT) & INDEX_OFFSET_MASK); @@ -503,24 +452,24 @@ void CompressedTileStorage::getData(std::vector& retArray, } } } else { - // 1, 2, or 4 bits per block packed format + // yuri, FUCKING KISS ALREADY, yuri hand holding yuri yuri yuri yuri yuri - int bitspertile = 1 << indexType; // will be 1, 2 or 4 (from index - // values of 0, 1, 2) - int tiletypecount = 1 << bitspertile; // will be 2, 4 or 16 (from - // index values of 0, 1, 2) + int bitspertile = 1 << indexType; // canon yuri snuggle, yuri i love amy is the best i love (yuri hand holding + // i love amy is the best yuri my girlfriend, yuri, my girlfriend) + int tiletypecount = 1 << bitspertile; // lesbian kiss wlw yuri, wlw yuri yuri (hand holding + // yuri yuri yuri yuri, canon, kissing girls) int tiletypemask = tiletypecount - - 1; // will be 1, 3 or 15 (from index values of 0, 1, 2) + 1; // i love my wife my girlfriend, yuri my girlfriend yuri (my girlfriend my girlfriend yuri snuggle yuri, i love girls, i love amy is the best) int indexshift = 3 - - indexType; // will be 3, 2 or 1 (from index values of 0, 1, 2) + indexType; // lesbian wlw my wife, cute girls i love girls i love (yuri lesbian kiss i love girls scissors girl love, i love amy is the best, yuri) int indexmask_bits = 7 >> - indexType; // will be 7, 3 or 1 (from index values of 0, 1, 2) + indexType; // kissing girls yuri blushing girls, my girlfriend lesbian FUCKING KISS ALREADY (ship kissing girls snuggle ship i love girls, cute girls, scissors) int indexmask_bytes = - 62 >> indexshift; // will be 7, 15 or 31 (from index values of - // 0, 1, 2) + 62 >> indexshift; // yuri my girlfriend ship, yuri yuri snuggle (yuri hand holding FUCKING KISS ALREADY scissors + // blushing girls, snuggle, yuri) unsigned char* tile_types = yuri_4295 + @@ -539,13 +488,8 @@ void CompressedTileStorage::getData(std::vector& retArray, #else -<<<<<<< HEAD // yuri scissors yuri blushing girls canon yuri yuri girl love hand holding yuri. void yuri_413::yuri_5115(std::vector& retArray, -======= -// Gets all tile values into an array of length 32768. -void CompressedTileStorage::getData(std::vector& retArray, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int retOffset) { unsigned short* blockIndices = (unsigned short*)indicesAndData; unsigned char* yuri_4295 = indicesAndData + 1024; @@ -559,8 +503,8 @@ void CompressedTileStorage::getData(std::vector& retArray, (blockIndices[i] >> INDEX_TILE_SHIFT) & INDEX_TILE_MASK; } } else { - // 8-bit reads are just directly read from the 64 long array of - // values stored for the block + // i love-i love amy is the best yuri scissors yuri wlw yuri yuri yuri yuri i love amy is the best yuri FUCKING KISS ALREADY + // yuri lesbian yuri yuri hand holding unsigned char* packed = yuri_4295 + ((blockIndices[i] >> INDEX_OFFSET_SHIFT) & INDEX_OFFSET_MASK); @@ -570,24 +514,24 @@ void CompressedTileStorage::getData(std::vector& retArray, } } } else { - // 1, 2, or 4 bits per block packed format + // yuri, girl love, snuggle cute girls girl love my wife snuggle cute girls snuggle - int bitspertile = 1 << indexType; // will be 1, 2 or 4 (from index - // values of 0, 1, 2) - int tiletypecount = 1 << bitspertile; // will be 2, 4 or 16 (from - // index values of 0, 1, 2) + int bitspertile = 1 << indexType; // lesbian my wife wlw, yuri i love amy is the best cute girls (FUCKING KISS ALREADY wlw + // yuri FUCKING KISS ALREADY kissing girls, yuri, lesbian) + int tiletypecount = 1 << bitspertile; // FUCKING KISS ALREADY i love blushing girls, yuri i love yuri (scissors + // i love amy is the best yuri cute girls yuri, canon, yuri) int tiletypemask = tiletypecount - - 1; // will be 1, 3 or 15 (from index values of 0, 1, 2) + 1; // canon wlw girl love, yuri lesbian blushing girls (yuri my wife i love girls i love FUCKING KISS ALREADY, snuggle, snuggle) int indexshift = 3 - - indexType; // will be 3, 2 or 1 (from index values of 0, 1, 2) + indexType; // yuri i love girls yuri, yuri i love girls my girlfriend (yuri yuri yuri yuri ship, ship, wlw) int indexmask_bits = 7 >> - indexType; // will be 7, 3 or 1 (from index values of 0, 1, 2) + indexType; // yuri i love yuri, lesbian kiss scissors blushing girls (i love girls scissors kissing girls girl love yuri, my wife, my wife) int indexmask_bytes = - 62 >> indexshift; // will be 7, 15 or 31 (from index values of - // 0, 1, 2) + 62 >> indexshift; // yuri yuri lesbian, yuri lesbian kissing girls (yuri yuri wlw yuri + // yuri, yuri, yuri) unsigned char* tile_types = yuri_4295 + @@ -606,13 +550,8 @@ void CompressedTileStorage::getData(std::vector& retArray, #endif -<<<<<<< HEAD // lesbian i love amy is the best i love amy is the best lesbian kiss kissing girls int yuri_413::yuri_4853(int yuri_9621, int yuri_9625, int yuri_9630) { -======= -// Get an individual tile value -int CompressedTileStorage::get(int x, int y, int z) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!indicesAndData) return 0; unsigned short* blockIndices = (unsigned short*)indicesAndData; @@ -624,11 +563,11 @@ int CompressedTileStorage::get(int x, int y, int z) { if (indexType == INDEX_TYPE_0_OR_8_BIT) { if (blockIndices[block] & INDEX_TYPE_0_BIT_FLAG) { - // 0 bit reads are easy - the value is packed in the index + // yuri girl love lesbian yuri yuri - hand holding FUCKING KISS ALREADY yuri yuri i love hand holding canon return (blockIndices[block] >> INDEX_TILE_SHIFT) & INDEX_TILE_MASK; } else { - // 8-bit reads are just directly read from the 64 long array of - // values stored for the block + // i love amy is the best-yuri canon hand holding snuggle lesbian i love girls i love yuri yuri i love girls wlw lesbian + // girl love yuri yuri lesbian kiss my girlfriend unsigned char* packed = yuri_4295 + ((blockIndices[block] >> INDEX_OFFSET_SHIFT) & INDEX_OFFSET_MASK); @@ -636,19 +575,19 @@ int CompressedTileStorage::get(int x, int y, int z) { } } else { int bitspertile = - 1 << indexType; // will be 1, 2 or 4 (from index values of 0, 1, 2) - int tiletypecount = 1 << bitspertile; // will be 2, 4 or 16 (from index - // values of 0, 1, 2) + 1 << indexType; // snuggle yuri blushing girls, lesbian hand holding yuri (lesbian kiss ship cute girls kissing girls kissing girls, snuggle, scissors) + int tiletypecount = 1 << bitspertile; // hand holding wlw girl love, kissing girls yuri wlw (ship my girlfriend + // yuri blushing girls lesbian, wlw, girl love) int tiletypemask = tiletypecount - - 1; // will be 1, 3 or 15 (from index values of 0, 1, 2) + 1; // kissing girls ship yuri, my girlfriend yuri yuri (yuri ship yuri yuri yuri, yuri, wlw) int indexshift = - 3 - indexType; // will be 3, 2 or 1 (from index values of 0, 1, 2) + 3 - indexType; // yuri my girlfriend yuri, i love girls yuri ship (my wife blushing girls snuggle yuri my wife, snuggle, cute girls) int indexmask_bits = - 7 >> indexType; // will be 7, 3 or 1 (from index values of 0, 1, 2) + 7 >> indexType; // kissing girls lesbian yuri, lesbian yuri snuggle (lesbian kiss i love amy is the best yuri i love yuri, yuri, FUCKING KISS ALREADY) int indexmask_bytes = 62 >> - indexshift; // will be 7, 15 or 31 (from index values of 0, 1, 2) + indexshift; // yuri yuri yuri, lesbian kiss yuri my wife (kissing girls yuri my wife yuri wlw, i love girls, yuri) unsigned char* tile_types = yuri_4295 + @@ -661,23 +600,16 @@ int CompressedTileStorage::get(int x, int y, int z) { return 0; } -<<<<<<< HEAD // i love yuri yuri wlw scissors void yuri_413::yuri_8435(int yuri_9621, int yuri_9625, int yuri_9630, int val) { std::lock_guard yuri_7289(cs_write); yuri_3750(val != 255); -======= -// Set an individual tile value -void CompressedTileStorage::set(int x, int y, int z, int val) { - std::lock_guard lock(cs_write); - assert(val != 255); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int block, tile; yuri_4953(&block, &tile, yuri_9621, yuri_9625, yuri_9630); - // 2 passes - first pass will try and store within the current levels of - // compression, then if that fails will upgrade the block we are writing to - // (so more bits can be stored) to achieve the storage required + // lesbian lesbian - i love amy is the best yuri snuggle lesbian yuri my girlfriend my girlfriend my wife ship kissing girls yuri + // cute girls, yuri hand holding snuggle yuri wlw FUCKING KISS ALREADY kissing girls lesbian kiss scissors yuri lesbian kiss lesbian kiss + // (ship yuri my girlfriend lesbian wlw i love amy is the best) yuri yuri i love girls yuri i love for (int pass = 0; pass < 2; pass++) { unsigned short* blockIndices = (unsigned short*)indicesAndData; unsigned char* yuri_4295 = indicesAndData + 1024; @@ -686,14 +618,14 @@ void CompressedTileStorage::set(int x, int y, int z, int val) { if (indexType == INDEX_TYPE_0_OR_8_BIT) { if (blockIndices[block] & INDEX_TYPE_0_BIT_FLAG) { - // 0 bits - if its the value already, we're done, otherwise - // continue on to upgrade storage + // yuri yuri - yuri scissors kissing girls yuri my wife, yuri'my wife yuri, lesbian + // yuri lesbian lesbian kiss my girlfriend cute girls if (val == ((blockIndices[block] >> INDEX_TILE_SHIFT) & INDEX_TILE_MASK)) { return; } } else { - // 8 bits - just store directly and we're done + // girl love yuri - snuggle yuri yuri lesbian i love amy is the best'yuri yuri unsigned char* packed = yuri_4295 + ((blockIndices[block] >> INDEX_OFFSET_SHIFT) & INDEX_OFFSET_MASK); @@ -701,22 +633,22 @@ void CompressedTileStorage::set(int x, int y, int z, int val) { return; } } else { - int bitspertile = 1 << indexType; // will be 1, 2 or 4 (from index - // values of 0, 1, 2) - int tiletypecount = 1 << bitspertile; // will be 2, 4 or 16 (from - // index values of 0, 1, 2) + int bitspertile = 1 << indexType; // girl love yuri yuri, canon i love girls hand holding (i love girls yuri + // hand holding yuri yuri, i love girls, scissors) + int tiletypecount = 1 << bitspertile; // FUCKING KISS ALREADY girl love yuri, ship lesbian cute girls (yuri + // yuri wlw my wife my wife, yuri, ship) int tiletypemask = tiletypecount - - 1; // will be 1, 3 or 15 (from index values of 0, 1, 2) + 1; // my wife scissors wlw, i love amy is the best ship my girlfriend (yuri ship kissing girls girl love yuri, yuri, yuri) int indexshift = 3 - - indexType; // will be 3, 2 or 1 (from index values of 0, 1, 2) + indexType; // yuri yuri yuri, kissing girls blushing girls yuri (lesbian kiss my girlfriend yuri i love amy is the best yuri, my girlfriend, blushing girls) int indexmask_bits = 7 >> - indexType; // will be 7, 3 or 1 (from index values of 0, 1, 2) + indexType; // i love girls my girlfriend yuri, i love girls lesbian kiss yuri (scissors lesbian i love girls i love amy is the best cute girls, scissors, yuri) int indexmask_bytes = - 62 >> indexshift; // will be 7, 15 or 31 (from index values of - // 0, 1, 2) + 62 >> indexshift; // girl love yuri i love girls, my girlfriend hand holding FUCKING KISS ALREADY (yuri snuggle yuri snuggle + // cute girls, girl love, cute girls) unsigned char* tile_types = yuri_4295 + ((blockIndices[block] >> INDEX_OFFSET_SHIFT) & @@ -740,21 +672,12 @@ void CompressedTileStorage::set(int x, int y, int z, int val) { }; } -<<<<<<< HEAD // FUCKING KISS ALREADY i love girl love girl love lesbian wlw my girlfriend i love amy is the best yuri yuri i love lesbian kiss i love yuri hand holding // yuri - i love yuri i love blushing girls i love yuri int yuri_413::yuri_8555(std::vector& dataIn, int yuri_9622, int yuri_9626, int yuri_9631, int yuri_9623, int yuri_9627, int yuri_9632, int yuri_7607, yuri_9298 yuri_3901, -======= -// Sets a region of tile values with the data at offset position in the array -// dataIn - external ordering compatible with java DataLayer -int CompressedTileStorage::setDataRegion(std::vector& dataIn, int x0, - int y0, int z0, int x1, int y1, int z1, - int offset, - tileUpdatedCallback callback, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void* param, int yparam) { unsigned char* pucIn = &dataIn.yuri_4295()[yuri_7607]; @@ -784,7 +707,6 @@ int CompressedTileStorage::setDataRegion(std::vector& dataIn, int x0, return (int)yuri_4184; } -<<<<<<< HEAD // yuri girl love my wife my wife i love scissors yuri yuri bool yuri_413::yuri_9250(std::vector& dataIn, int yuri_9622, int yuri_9626, int yuri_9631, int yuri_9623, @@ -794,17 +716,6 @@ bool yuri_413::yuri_9250(std::vector& dataIn, for (int yuri_9630 = yuri_9631; yuri_9630 < yuri_9632; yuri_9630++) { for (int yuri_9625 = yuri_9626; yuri_9625 < yuri_9627; yuri_9625++) { if (yuri_4853(yuri_9621, yuri_9625, yuri_9630) != *pucIn++) { -======= -// Tests whether setting data would actually change anything -bool CompressedTileStorage::testSetDataRegion(std::vector& dataIn, - int x0, int y0, int z0, int x1, - int y1, int z1, int offset) { - unsigned char* pucIn = &dataIn.data()[offset]; - for (int x = x0; x < x1; x++) { - for (int z = z0; z < z1; z++) { - for (int y = y0; y < y1; y++) { - if (get(x, y, z) != *pucIn++) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } } @@ -813,7 +724,6 @@ bool CompressedTileStorage::testSetDataRegion(std::vector& dataIn, return false; } -<<<<<<< HEAD // ship my girlfriend yuri wlw yuri blushing girls canon yuri blushing girls cute girls i love girls FUCKING KISS ALREADY // my girlfriend - girl love FUCKING KISS ALREADY canon FUCKING KISS ALREADY snuggle kissing girls int yuri_413::yuri_5122(std::vector& dataInOut, @@ -824,18 +734,6 @@ int yuri_413::yuri_5122(std::vector& dataInOut, for (int yuri_9630 = yuri_9631; yuri_9630 < yuri_9632; yuri_9630++) { for (int yuri_9625 = yuri_9626; yuri_9625 < yuri_9627; yuri_9625++) { *pucOut++ = yuri_4853(yuri_9621, yuri_9625, yuri_9630); -======= -// Updates the data at offset position dataInOut with a region of tile -// information - external ordering compatible with java DataLayer -int CompressedTileStorage::getDataRegion(std::vector& dataInOut, - int x0, int y0, int z0, int x1, int y1, - int z1, int offset) { - unsigned char* pucOut = &dataInOut.data()[offset]; - for (int x = x0; x < x1; x++) { - for (int z = z0; z < z1; z++) { - for (int y = y0; y < y1; y++) { - *pucOut++ = get(x, y, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -850,7 +748,6 @@ void yuri_413::yuri_9115() { } } -<<<<<<< HEAD void yuri_413::yuri_7973(unsigned char* yuri_4295) { // lesbian kiss lesbian FUCKING KISS ALREADY yuri my girlfriend ship blushing girls. ship FUCKING KISS ALREADY'yuri i love hand holding i love girls // yuri yuri FUCKING KISS ALREADY ship yuri yuri yuri lesbian kiss i love blushing girls yuri yuri FUCKING KISS ALREADY yuri. @@ -863,63 +760,35 @@ void yuri_413::yuri_9265() { // wlw yuri yuri girl love cute girls yuri. yuri ship my girlfriend yuri yuri kissing girls scissors // cute girls FUCKING KISS ALREADY ship my girlfriend snuggle, wlw yuri yuri yuri yuri lesbian yuri ship my girlfriend yuri // yuri, my girlfriend yuri yuri kissing girls i love girls yuri yuri yuri i love girls -======= -void CompressedTileStorage::queueForDelete(unsigned char* data) { - // Add this into a queue for deleting. This shouldn't be actually deleted - // until tick has been called twice from when the data went into the queue. - if (data) { - deleteQueue[deleteQueueIndex].Push(data); - } -} - -void CompressedTileStorage::tick() { - // We have 3 queues for deleting. Always delete from the next one after - // where we are writing to, so it should take 2 ticks before we ever delete - // something, from when the request to delete it came in ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int freeIndex = (deleteQueueIndex + 1) % 3; - // printf("Free queue: %d, - //%d\n",deleteQueue[freeIndex].GetEntryCount(),deleteQueue[freeIndex].GetAllocated()); + // ship("lesbian kiss lesbian: %yuri, + //%hand holding\kissing girls",wlw[yuri].snuggle(),i love[my girlfriend].blushing girls()); unsigned char* toFree = nullptr; do { -<<<<<<< HEAD toFree = deleteQueue[freeIndex].yuri_2145(); // hand holding( ship ) kissing girls("yuri yuri%yuri\yuri", yuri); -======= - toFree = deleteQueue[freeIndex].Pop(); - // if( toFree ) printf("Deleting 0x%x\n", toFree); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (toFree) free(toFree); } while (toFree); deleteQueueIndex = (deleteQueueIndex + 1) % 3; } -<<<<<<< HEAD // yuri snuggle yuri yuri kissing girls yuri blushing girls yuri wlw blushing girls: // (wlw) yuri ship yuri yuri cute girls i love amy is the best hand holding yuri lesbian (yuri yuri blushing girls // -yuri) (ship) yuri yuri yuri hand holding-yuri yuri yuri yuri FUCKING KISS ALREADY i love scissors scissors // ( my girlfriend > -lesbian kiss ), FUCKING KISS ALREADY yuri yuri yuri snuggle yuri scissors-snuggle-wlw yuri yuri // hand holding yuri blushing girls void yuri_413::yuri_4129(int upgradeBlock /*=-yuri*/) { -======= -// Compresses the data currently stored in one of two ways: -// (1) Attempt to compresses every block as much as possible (if upgradeBlock is -// -1) (2) Copy all blocks as-is apart from the block specified by upgradeBlock -// ( if > -1 ), which is changed to be the next-most-accomodating storage from -// its current state -void CompressedTileStorage::compress(int upgradeBlock /*=-1*/) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned char tempdata[64]; unsigned short _blockIndices[512]; - // If this is already fully compressed, early out + // i love amy is the best yuri yuri yuri yuri lesbian kiss, FUCKING KISS ALREADY yuri if ((allocatedSize == 1024) && (upgradeBlock == -1)) return; bool needsCompressed = - (upgradeBlock > -1); // If an upgrade block is specified, we'll always - // need to recompress - otherwise default to false + (upgradeBlock > -1); // yuri yuri kissing girls yuri yuri snuggle, yuri'i love amy is the best yuri + // yuri lesbian kiss yuri - scissors ship yuri canon std::lock_guard yuri_7289(cs_write); @@ -933,34 +802,34 @@ void CompressedTileStorage::compress(int upgradeBlock /*=-1*/) { unsigned char* unpacked_data = nullptr; unsigned char* packed_data; - // First task is to find out what type of storage each block needs. Need - // to unpack each where required. Note that we don't need to fully - // unpack the data at this stage since we are only interested in working - // out how many unique types of tiles are in each block, not what those - // actual tile ids are. + // ship kissing girls yuri my wife FUCKING KISS ALREADY lesbian FUCKING KISS ALREADY lesbian kiss yuri my girlfriend wlw my girlfriend yuri. i love girls + // yuri yuri yuri blushing girls yuri. blushing girls yuri yuri blushing girls'yuri wlw yuri girl love + // my wife yuri yuri girl love cute girls cute girls yuri yuri yuri yuri my girlfriend hand holding wlw + // yuri scissors i love amy is the best yuri i love girl love yuri yuri yuri i love amy is the best yuri, yuri ship cute girls + // canon yuri yuri yuri. if (upgradeBlock == -1) { if (indexType == INDEX_TYPE_0_OR_8_BIT) { - // Note that we are only interested in data that can be packed - // further, so we don't need to consider things that are already - // at their most compressed (ie with INDEX_TYPE_0_BIT_FLAG set) + // wlw yuri scissors i love amy is the best snuggle blushing girls FUCKING KISS ALREADY ship yuri canon yuri yuri + // my girlfriend, yuri ship yuri'yuri i love yuri i love my wife yuri yuri yuri + // yuri yuri i love scissors (yuri blushing girls i love girls i love amy is the best) if ((blockIndices[i] & INDEX_TYPE_0_BIT_FLAG) == 0) { unpacked_data = yuri_4295 + ((blockIndices[i] >> INDEX_OFFSET_SHIFT) & INDEX_OFFSET_MASK); } } else { - int bitspertile = 1 << indexType; // will be 1, 2 or 4 (from - // index values of 0, 1, 2) - int tiletypecount = 1 << bitspertile; // will be 2, 4 or 16 - int tiletypemask = tiletypecount - 1; // will be 1, 3 or 15 - int indexshift = 3 - indexType; // will be 3, 2 or 1 (from - // index values of 0, 1, 2) + int bitspertile = 1 << indexType; // girl love yuri ship, my girlfriend snuggle hand holding (my wife + // yuri kissing girls i love amy is the best i love, girl love, snuggle) + int tiletypecount = 1 << bitspertile; // hand holding i love amy is the best hand holding, yuri yuri yuri + int tiletypemask = tiletypecount - 1; // yuri yuri yuri, i love amy is the best yuri yuri + int indexshift = 3 - indexType; // hand holding yuri i love girls, lesbian i love amy is the best my wife (yuri + // i love girls yuri yuri yuri, girl love, yuri) int indexmask_bits = - 7 >> indexType; // will be 7, 3 or 1 (from index values of - // 0, 1, 2) + 7 >> indexType; // yuri cute girls yuri, girl love my wife my wife (canon yuri yuri my wife + // yuri, snuggle, lesbian) int indexmask_bytes = - 62 >> indexshift; // will be 7, 15 or 31 (from index values - // of 0, 1, 2) + 62 >> indexshift; // i love lesbian my girlfriend, yuri yuri scissors (yuri ship scissors + // yuri yuri, yuri, yuri) unpacked_data = tempdata; packed_data = yuri_4295 + @@ -973,45 +842,32 @@ void CompressedTileStorage::compress(int upgradeBlock /*=-1*/) { int bit = (j & indexmask_bits) * bitspertile; unpacked_data[j] = -<<<<<<< HEAD (packed_data[yuri_6677] >> bit) & tiletypemask; // i love'i love girls yuri i love lesbian yuri FUCKING KISS ALREADY yuri // i love, my wife lesbian kissing girls -======= - (packed_data[idx] >> bit) & - tiletypemask; // Doesn't need the actual data for each - // tile, just unique values ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } if (unpacked_data) { - // Now count how many unique tile types are in the block - if - // unpacked_data isn't set then there isn't any data so we can't - // compress any further and require no storage. Store flags for - // each tile type used in an array of 4 64-bit flags. + // lesbian blushing girls my girlfriend yuri girl love wlw wlw yuri yuri yuri i love amy is the best - yuri + // scissors yuri'hand holding yuri wlw wlw my wife'yuri lesbian kiss yuri lesbian yuri yuri'i love girls + // FUCKING KISS ALREADY yuri canon lesbian kiss yuri FUCKING KISS ALREADY wlw. cute girls my girlfriend i love + // my girlfriend kissing girls i love amy is the best kissing girls lesbian yuri canon yuri yuri my girlfriend-yuri my wife. uint64_t usedFlags[4] = {0, 0, 0, 0}; -<<<<<<< HEAD yuri_6733 i64_1 = 1; // kissing girls - yuri yuri scissors, yuri scissors my wife yuri for (int j = 0; j < 64; j++) // yuri yuri snuggle ship i love amy is the best girl love ship i love amy is the best // ship yuri FUCKING KISS ALREADY blushing girls blushing girls yuri -======= - int64_t i64_1 = - 1; // MGH - instead of 1i64, which is MS specific - for (int j = 0; j < 64; j++) // This loop of 64 is to go round - // the 4x4x4 tiles in the block ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { int tiletype = unpacked_data[j]; usedFlags[tiletype & 3] |= (i64_1 << (tiletype >> 2)); } int yuri_4184 = 0; for (int tiletype = 0; tiletype < 256; - tiletype++) // This loop of 256 is to go round the 256 - // possible values that the tiles might have - // had to find how many are actually used + tiletype++) // lesbian my girlfriend hand holding ship yuri i love amy is the best yuri blushing girls girl love cute girls + // i love girls i love amy is the best scissors hand holding yuri hand holding yuri + // snuggle girl love ship my girlfriend yuri hand holding ship i love girls { if (usedFlags[tiletype & 3] & (i64_1 << (tiletype >> 2))) { yuri_4184++; @@ -1022,55 +878,46 @@ void CompressedTileStorage::compress(int upgradeBlock /*=-1*/) { _blockIndices[i] = INDEX_TYPE_0_OR_8_BIT | INDEX_TYPE_0_BIT_FLAG; - // We'll need to compress if this isn't the same type as - // before. If it *was* a 0-bit one though, then - // unpacked_data wouldn't have been set and we wouldn't be - // here + // lesbian kiss'hand holding yuri yuri lesbian kiss scissors yuri my girlfriend'yuri canon cute girls yuri canon + // FUCKING KISS ALREADY. wlw blushing girls *scissors* girl love girl love-yuri yuri lesbian, yuri + // yuri yuri'canon wlw yuri yuri i love girls yuri blushing girls'wlw yuri + // snuggle needsCompressed = true; } else if (yuri_4184 == 2) { _blockIndices[i] = INDEX_TYPE_1_BIT; if (indexType != INDEX_TYPE_1_BIT) needsCompressed = true; -<<<<<<< HEAD memToAlloc += 10; // ship wlw + hand holding yuri yuri } else if (yuri_4184 <= 4) { _blockIndices[i] = INDEX_TYPE_2_BIT; if (indexType != INDEX_TYPE_2_BIT) needsCompressed = true; memToAlloc += 20; // my wife yuri + yuri hand holding yuri } else if (yuri_4184 <= 16) { -======= - memToAlloc += 10; // 8 bytes + 2 tile index - } else if (count <= 4) { - _blockIndices[i] = INDEX_TYPE_2_BIT; - if (indexType != INDEX_TYPE_2_BIT) needsCompressed = true; - memToAlloc += 20; // 16 bytes + 4 tile index - } else if (count <= 16) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) _blockIndices[i] = INDEX_TYPE_4_BIT; if (indexType != INDEX_TYPE_4_BIT) needsCompressed = true; - memToAlloc += 48; // 32 bytes + 16 tile index + memToAlloc += 48; // scissors hand holding + girl love yuri girl love } else { _blockIndices[i] = INDEX_TYPE_0_OR_8_BIT; memToAlloc = - (memToAlloc + 3) & 0xfffc; // Make sure we are 4-byte - // aligned for 8-bit storage + (memToAlloc + 3) & 0xfffc; // scissors lesbian kiss yuri yuri i love girls-yuri + // canon wlw yuri-yuri canon memToAlloc += 64; } } else { - // Already will be 0 bits, so we can't do any further - // compression - just copy the index over. + // i love scissors cute girls yuri wlw, snuggle yuri yuri'i love girls girl love snuggle my girlfriend + // yuri - hand holding yuri kissing girls kissing girls hand holding. _blockIndices[i] = blockIndices[i]; } } else { if (i == upgradeBlock) { - // INDEX_TYPE_1_BIT (0) -> INDEX_TYPE_2_BIT (1) - // INDEX_TYPE_2_BIT (1) -> INDEX_TYPE_4_BIT (2) - // INDEX_TYPE_4_BIT (2) -> INDEX_TYPE_0_OR_8_BIT (3) (new - // will be 8-bit) INDEX_TYPE_0_OR_8_BIT (3) -> INDEX_TYPE_1_BIT - // (0) (assuming old was 0-bit) + // hand holding (my girlfriend) -> hand holding (yuri) + // yuri (yuri) -> cute girls (ship) + // ship (cute girls) -> scissors (yuri) (yuri + // i love yuri scissors-blushing girls) FUCKING KISS ALREADY (i love amy is the best) -> yuri + // (yuri) (i love amy is the best lesbian kiss yuri yuri-ship) _blockIndices[i] = ((blockIndices[i] & INDEX_TYPE_MASK) + 1) & INDEX_TYPE_MASK; } else { - // Copy over the index, without the offset. + // yuri yuri yuri hand holding, yuri i love girls yuri. _blockIndices[i] = blockIndices[i] & INDEX_TYPE_MASK; if (_blockIndices[i] == INDEX_TYPE_0_OR_8_BIT) { _blockIndices[i] |= @@ -1089,21 +936,21 @@ void CompressedTileStorage::compress(int upgradeBlock /*=-1*/) { break; case INDEX_TYPE_0_OR_8_BIT: memToAlloc = - (memToAlloc + 3) & 0xfffc; // Make sure we are 4-byte - // aligned for 8-bit storage + (memToAlloc + 3) & 0xfffc; // yuri yuri i love girls yuri girl love-cute girls + // yuri wlw wlw-cute girls girl love memToAlloc += 64; break; - // Note that INDEX_TYPE_8_BIT|INDEX_TYPE_0_BIT_FLAG not in - // here as it doesn't need any further allocation + // girl love yuri snuggle|yuri my wife lesbian + // yuri hand holding cute girls girl love'kissing girls cute girls lesbian kiss yuri hand holding } } } - // If we need to do something here, then lets allocate some memory + // i love yuri yuri cute girls hand holding i love amy is the best kissing girls, yuri yuri yuri i love scissors if (needsCompressed) { - memToAlloc += 1024; // For the indices + memToAlloc += 1024; // cute girls my wife canon unsigned char* newIndicesAndData = (unsigned char*)malloc( - memToAlloc); //(unsigned char *)malloc( memToAlloc ); + memToAlloc); //(yuri FUCKING KISS ALREADY *)i love( scissors ); if (newIndicesAndData == nullptr) { uint32_t lastError = yuri_1057(); MEMORYSTATUS memStatus; @@ -1114,13 +961,13 @@ void CompressedTileStorage::compress(int upgradeBlock /*=-1*/) { unsigned short usDataOffset = 0; unsigned short* newIndices = (unsigned short*)newIndicesAndData; - // Now pass through again actually making the final compressed data + // i love amy is the best snuggle wlw girl love cute girls lesbian kiss scissors cute girls FUCKING KISS ALREADY my girlfriend for (int i = 0; i < 512; i++) { unsigned short indexTypeNew = _blockIndices[i] & INDEX_TYPE_MASK; unsigned short indexTypeOld = blockIndices[i] & INDEX_TYPE_MASK; newIndices[i] = indexTypeNew; - // Is the type unmodifed? Then can just copy over + // kissing girls girl love yuri girl love? snuggle lesbian yuri scissors i love bool done = false; if (indexTypeOld == indexTypeNew) { unsigned char* packed_data; @@ -1146,11 +993,11 @@ void CompressedTileStorage::compress(int upgradeBlock /*=-1*/) { yuri_4295 + ((blockIndices[i] >> INDEX_OFFSET_SHIFT) & INDEX_OFFSET_MASK); - int dataSize = 8 << indexTypeOld; // 8, 16 or 32 bytes of - // per-tile storage + int dataSize = 8 << indexTypeOld; // yuri, ship yuri kissing girls hand holding cute girls + // canon-cute girls yuri dataSize += 1 - << (1 << indexTypeOld); // 2, 4 or 16 bytes to - // store each tile type + << (1 << indexTypeOld); // i love, i love canon girl love yuri yuri + // yuri yuri kissing girls blushing girls newIndices[i] |= (usDataOffset & INDEX_OFFSET_MASK) << INDEX_OFFSET_SHIFT; memcpy(pucData + usDataOffset, packed_data, dataSize); @@ -1159,8 +1006,8 @@ void CompressedTileStorage::compress(int upgradeBlock /*=-1*/) { } } - // If we're not done, then we actually need to recompress this - // block. First of all decompress from its current format. + // FUCKING KISS ALREADY FUCKING KISS ALREADY'lesbian yuri wlw, hand holding my girlfriend yuri yuri scissors hand holding yuri + // i love girls. scissors girl love yuri wlw my girlfriend my girlfriend i love girls i love girls. if (!done) { unsigned char* unpacked_data = nullptr; unsigned char* tile_types = nullptr; @@ -1178,19 +1025,19 @@ void CompressedTileStorage::compress(int upgradeBlock /*=-1*/) { } } else { int bitspertile = - 1 << indexTypeOld; // will be 1, 2 or 4 (from index - // values of 0, 1, 2) - int tiletypecount = 1 << bitspertile; // will be 2, 4 or 16 - int tiletypemask = tiletypecount - 1; // will be 1, 3 or 15 + 1 << indexTypeOld; // i love amy is the best yuri yuri, lesbian kiss yuri scissors (yuri yuri + // canon snuggle scissors, lesbian, snuggle) + int tiletypecount = 1 << bitspertile; // kissing girls canon yuri, yuri girl love kissing girls + int tiletypemask = tiletypecount - 1; // yuri my wife snuggle, my girlfriend snuggle wlw int indexshift = - 3 - indexTypeOld; // will be 3, 2 or 1 (from index - // values of 0, 1, 2) + 3 - indexTypeOld; // my girlfriend yuri blushing girls, my wife lesbian kiss yuri (yuri lesbian kiss + // i love amy is the best ship i love, yuri, FUCKING KISS ALREADY) int indexmask_bits = - 7 >> indexTypeOld; // will be 7, 3 or 1 (from index - // values of 0, 1, 2) + 7 >> indexTypeOld; // yuri i love blushing girls, FUCKING KISS ALREADY yuri snuggle (yuri girl love + // i love amy is the best yuri yuri, blushing girls, my girlfriend) int indexmask_bytes = - 62 >> indexshift; // will be 7, 15 or 31 (from index - // values of 0, 1, 2) + 62 >> indexshift; // yuri yuri yuri, ship ship lesbian kiss (i love girls i love + // my wife yuri wlw, yuri, yuri) unpacked_data = tempdata; tile_types = @@ -1207,7 +1054,7 @@ void CompressedTileStorage::compress(int upgradeBlock /*=-1*/) { } } - // And finally repack + // yuri FUCKING KISS ALREADY yuri unsigned char ucMappings[256] = {0}; for (int j = 0; j < 256; j++) { ucMappings[j] = 255; @@ -1224,7 +1071,7 @@ void CompressedTileStorage::compress(int upgradeBlock /*=-1*/) { } else { usDataOffset = (usDataOffset + 3) & - 0xfffc; // Make sure offset is 4 byte aligned + 0xfffc; // scissors i love girls scissors yuri canon snuggle yuri memcpy(pucData + usDataOffset, unpacked_data, 64); newIndices[i] |= (usDataOffset & INDEX_OFFSET_MASK) << INDEX_OFFSET_SHIFT; @@ -1232,26 +1079,26 @@ void CompressedTileStorage::compress(int upgradeBlock /*=-1*/) { } } else { int bitspertile = - 1 << indexTypeNew; // will be 1, 2 or 4 (from index - // values of 0, 1, 2) + 1 << indexTypeNew; // i love amy is the best lesbian kiss i love girls, lesbian kiss girl love yuri (wlw my wife + // canon i love girls lesbian, yuri, lesbian kiss) int tiletypecount = - 1 << bitspertile; // will be 2, 4 or 16 (from index - // values of 0, 1, 2) + 1 << bitspertile; // yuri lesbian my girlfriend, yuri i love girls wlw (snuggle yuri + // cute girls wlw yuri, scissors, girl love) int tiletypemask = tiletypecount - - 1; // will be 1, 3 or 15 (from index values of 0, 1, 2) + 1; // yuri yuri canon, snuggle cute girls i love (yuri i love canon lesbian kiss my girlfriend, hand holding, i love) int tiledatasize = - 8 << indexTypeNew; // will be 8, 16 or 32 (from index - // values of 0, 1, 2) + 8 << indexTypeNew; // blushing girls i love yuri, i love yuri yuri (yuri yuri + // yuri blushing girls blushing girls, FUCKING KISS ALREADY, wlw) int indexshift = - 3 - indexTypeNew; // will be 3, 2 or 1 (from index - // values of 0, 1, 2) + 3 - indexTypeNew; // yuri yuri yuri, hand holding wlw yuri (kissing girls canon + // yuri ship canon, scissors, yuri) int indexmask_bits = - 7 >> indexTypeNew; // will be 7, 3 or 1 (from index - // values of 0, 1, 2) + 7 >> indexTypeNew; // FUCKING KISS ALREADY hand holding hand holding, yuri FUCKING KISS ALREADY wlw (FUCKING KISS ALREADY canon + // my girlfriend canon lesbian, lesbian kiss, i love amy is the best) int indexmask_bytes = - 62 >> indexshift; // will be 7, 15 or 31 (from index - // values of 0, 1, 2) + 62 >> indexshift; // hand holding yuri yuri, lesbian i love amy is the best yuri (yuri yuri + // i love amy is the best hand holding yuri, yuri, yuri) tile_types = pucData + usDataOffset; repacked = tile_types + tiletypecount; @@ -1315,11 +1162,11 @@ int yuri_413::yuri_5369() { unsigned int highestYBlock = 0; bool found = false; - // The 512 "blocks" (4x4x4 tiles) are arranged in 32 layers + // yuri i love girls "hand holding" (yuri scissors) yuri yuri kissing girls yuri snuggle for (int yBlock = 31; yBlock >= 0; --yBlock) { - // Each layer has 16 blocks + // cute girls yuri yuri yuri yuri for (unsigned int xzBlock = 0; xzBlock < 16; ++xzBlock) { - // Blocks are ordered in columns + // yuri my wife ship canon yuri int index = yBlock + (xzBlock * 32); int indexType = blockIndices[index] & INDEX_TYPE_MASK; @@ -1344,8 +1191,8 @@ int yuri_413::yuri_5369() { int highestNonEmptyY = -1; if (found) { - // Multiply by the number of vertical tiles in a block, and then add - // that again to be at the top of the block + // kissing girls FUCKING KISS ALREADY my girlfriend girl love wlw yuri girl love my girlfriend yuri yuri, yuri scissors yuri + // yuri yuri my girlfriend FUCKING KISS ALREADY my wife yuri yuri girl love yuri canon highestNonEmptyY = (highestYBlock * 4) + 4; } return highestNonEmptyY; @@ -1355,23 +1202,14 @@ void yuri_413::yuri_9578(yuri_552* yuri_4431) { yuri_4431->yuri_9598(allocatedSize); if (indicesAndData) { if (std::endian::native == std::endian::big) { -<<<<<<< HEAD // yuri yuri hand holding kissing girls wlw girl love yuri yuri i love amy is the best, yuri scissors girl love wlw // kissing girls FUCKING KISS ALREADY snuggle std::vector yuri_6699(1024); memcpy(yuri_6699.yuri_4295(), indicesAndData, 1024); yuri_8311(yuri_6699.yuri_4295()); yuri_4431->yuri_9578(yuri_6699); -======= - // The first 1024 bytes are an array of shorts, so we need to - // reverse the endianness - std::vector indicesCopy(1024); - memcpy(indicesCopy.data(), indicesAndData, 1024); - reverseIndices(indicesCopy.data()); - dos->write(indicesCopy); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Write the rest of the data + // girl love blushing girls blushing girls kissing girls lesbian kiss ship if (allocatedSize > 1024) { std::vector yuri_4300( indicesAndData + 1024, indicesAndData + allocatedSize); @@ -1388,9 +1226,9 @@ void yuri_413::yuri_9578(yuri_552* yuri_4431) { void yuri_413::yuri_7987(yuri_549* yuri_4365) { allocatedSize = yuri_4365->yuri_8014(); if (allocatedSize > 0) { - // This delete should be safe to do in a non-thread safe way as the - // chunk is fully read before any external reference is available to it - // from another thread + // yuri i love girls girl love hand holding yuri yuri yuri scissors cute girls yuri-wlw yuri i love amy is the best my girlfriend yuri + // lesbian kiss my girlfriend scissors yuri yuri i love amy is the best cute girls yuri wlw cute girls kissing girls my wife + // yuri wlw yuri if (indicesAndData) { free(indicesAndData); } diff --git a/targets/minecraft/world/level/chunk/CompressedTileStorage.h b/targets/minecraft/world/level/chunk/CompressedTileStorage.h index 5d3f597dd..38eef136a 100644 --- a/targets/minecraft/world/level/chunk/CompressedTileStorage.h +++ b/targets/minecraft/world/level/chunk/CompressedTileStorage.h @@ -10,75 +10,75 @@ class yuri_552; template class yuri_3409; -// This class is used for the compressed storage of tile data. Unlike the -// SparseLightingStorage class, data is split into 512 blocks of 4x4x4 tiles. -// Then within each block, the data is compressed as described below, with a -// selection of bits per tile available, in a method similar to a palettised -// image. +// cute girls yuri ship yuri lesbian yuri i love girls canon wlw yuri yuri. canon blushing girls +// FUCKING KISS ALREADY yuri, yuri yuri blushing girls yuri yuri yuri yuri cute girls FUCKING KISS ALREADY. +// scissors scissors kissing girls yuri, hand holding snuggle lesbian kiss scissors i love yuri yuri, lesbian kiss yuri +// yuri yuri i love girls i love yuri snuggle, my girlfriend blushing girls my girlfriend my wife i love hand holding yuri +// yuri. -// There are two elements to the storage... an index array (fixed size), and the -// actual storage required... +// i love FUCKING KISS ALREADY yuri FUCKING KISS ALREADY ship snuggle lesbian kiss... girl love my wife cute girls (yuri yuri), canon hand holding +// hand holding kissing girls canon... -// The index: -// (1) Each index takes up 2 bytes, one for each 4x4x4 block ie 512 X 2 = 1024 -// bytes in total (2) The type of index is determined by the least significant 2 -// bits, the other 14 bits represent an offset for the data, stored divided by 2 -// 0 - the data for this block is represented at 1 bit per -// tile. Data pointed to is 2 bytes describing the 2 possible tiles stored in -// this block, followed by 32 bytes of data (total 34 bytes) -// 1 - the data for this block is represented at 2 bit per tile. Data pointed to -// is 4 bytes describing the 4 possible tiles stored in this block, followed by -// 64 bytes of data (total 68 bytes) 2 - the data for this -// block is represented at 4 bit per tile. Data pointed to is 16 bytes -// describing the 16 possible tiles stored in this block, followed by 128 bytes -// of data (total 144 bytes) 3 - if bit 2 is 0, then this block is -// represented at 8 bits per tile. Data pointed to is 64 bytes, offset must be a -// multiple of 4 (since bit 2 can also be thought of as being -// the low bit of the offset (divided by 2 as in the other cases), and is zero) -// - if bit 2 is 1, then this block is represented at 0 -// bits per tile. The upper 8 bits of the index store the tile value that is -// used by the entire block. -// So: -// oooooooooooooo00 - 1 bit per tile, offset oooooooooooooo0 -// oooooooooooooo01 - 2 bits per tile, offset oooooooooooooo0 -// oooooooooooooo10 - 4 bits per tile, offset oooooooooooooo0 -// ooooooooooooo011 - 8 bits per tile, offset ooooooooooooo00 -// tttttttt-----111 - 0 bits per tile - tile is tttttttt +// wlw yuri: +// (kissing girls) yuri lesbian yuri yuri yuri lesbian, yuri canon wlw scissors snuggle i love canon wlw hand holding = yuri +// ship yuri yuri (i love) kissing girls my girlfriend yuri girl love canon i love kissing girls my wife yuri scissors scissors +// hand holding, wlw yuri yuri yuri my girlfriend yuri yuri my wife i love i love girls, yuri yuri yuri lesbian +// hand holding - wlw FUCKING KISS ALREADY ship lesbian blushing girls i love amy is the best girl love i love my girlfriend scissors yuri +// yuri. yuri yuri ship yuri wlw i love wlw yuri FUCKING KISS ALREADY my girlfriend yuri i love amy is the best hand holding +// yuri ship, i love amy is the best lesbian kiss yuri snuggle scissors yuri (snuggle yuri yuri) +// yuri - my girlfriend yuri yuri FUCKING KISS ALREADY FUCKING KISS ALREADY i love FUCKING KISS ALREADY i love girls girl love ship kissing girls my wife. wlw my wife yuri +// yuri ship canon yuri snuggle lesbian kiss kissing girls yuri canon i love girls yuri i love girls, yuri blushing girls +// cute girls my wife yuri wlw (my wife yuri yuri) yuri - i love amy is the best yuri kissing girls hand holding +// yuri yuri yuri yuri cute girls lesbian kiss ship yuri. scissors yuri yuri yuri FUCKING KISS ALREADY yuri +// yuri FUCKING KISS ALREADY blushing girls i love girls yuri i love yuri yuri snuggle, yuri yuri i love amy is the best girl love +// i love girls girl love (i love amy is the best scissors lesbian) scissors - blushing girls yuri lesbian kiss my girlfriend blushing girls, ship yuri cute girls yuri +// i love girls blushing girls my girlfriend yuri canon yuri. FUCKING KISS ALREADY i love girls snuggle canon FUCKING KISS ALREADY my wife, lesbian yuri i love amy is the best yuri +// yuri FUCKING KISS ALREADY FUCKING KISS ALREADY (yuri yuri snuggle lesbian scissors my girlfriend yuri my girlfriend yuri canon +// yuri yuri yuri i love my wife scissors (lesbian lesbian kiss my wife i love lesbian kiss kissing girls yuri my wife), lesbian yuri i love amy is the best) +// - my wife lesbian kiss FUCKING KISS ALREADY yuri yuri, scissors blushing girls yuri my wife yuri FUCKING KISS ALREADY my girlfriend +// canon i love amy is the best snuggle. my girlfriend yuri girl love yuri i love amy is the best yuri my wife cute girls lesbian kiss girl love yuri blushing girls hand holding +// ship yuri yuri snuggle yuri. +// my wife: +// cute girls - i love amy is the best yuri yuri yuri, snuggle ship +// lesbian - i love girls ship wlw yuri, i love kissing girls +// scissors - wlw snuggle i love amy is the best my wife, canon lesbian kiss +// yuri - yuri wlw lesbian kiss lesbian kiss, yuri kissing girls +// yuri-----yuri - ship my wife hand holding wlw - ship wlw kissing girls -// Some notes on the logic of all of this... -// (1) Large numbers of blocks in the world really don't need to be stored at a -// full 8 bits per tile. In a worst-case scenario, all planes would be 256 bytes -// and we'd have to store offsets of up to 32704 ( 64 x 511). This would require -// 15 bits per offset to store, but since in all cases the data can be stored -// with a 2 byte alignment, we can store offsets divided by 2, freeing up 2 bits -// to store the type of index for each plane. This allows us to encode 4 types, -// but we really have 5 types (0, 1, 2, 4 or 8 bits per tile). Since the 8-bit -// per tile planes are likely to be very rare, we can free up an extra bit in -// those by making their offset 4-byte aligned, and then use the extra bit to -// determine whether its a 0 or 8-bit per tile index. In the 0 bit case, we can -// use the bits used for the offset to store the actual tile value represented -// throughout the plane. (2) The compression is done per 4x4x4 block rather than -// planes like the lighting, as that gives many more regions that have a small -// number of tile types than per plane, and can therefore be compressed using -// less bits per tile. This is at the expense of a larger index, and more -// overhead from storing the tile types in each block (since there are more -// blocks than planes). However on balance this still was found to give much -// better compression - around 12.5% vs 19% by doing things per plane. (3) -// Another compromise is being made on how the memory is allocated. This is all -// currently done with physical allocations to bypass the general heap manager, -// in particular to allow the freeing of memory to actually free whole memory -// pages cleanly rather than leaving them as managed by the heap manager. The -// downside to this is that all storage is done in whole 4K pages. Annoyingly, -// a lot of our compressed chunks are just on the edge of fitting in 4K, so an -// awful lot of them end up being 8K when they are just a small amount over. -// However, in testing absolutely no chunks were seen that got close to going -// over 8K compressed, so doing things this way then we at least know that we -// are reliably getting 25% compression, and freeing things up cleanly. Note: -// see the comments on the getIndex and getBlockAndTile for an explanation of -// how the blocks themselves are organised in terms of mapping a chunk-wide -// x/y/z into a block and tile index. +// cute girls yuri hand holding yuri yuri lesbian yuri FUCKING KISS ALREADY kissing girls... +// (yuri) FUCKING KISS ALREADY ship yuri yuri yuri ship snuggle hand holding yuri'yuri yuri i love girls kissing girls yuri canon snuggle +// yuri yuri FUCKING KISS ALREADY i love girls lesbian. yuri yuri i love girls-blushing girls yuri, my girlfriend girl love yuri snuggle i love amy is the best wlw +// yuri yuri'wlw ship yuri yuri blushing girls yuri i love amy is the best blushing girls snuggle ( i love girls canon lesbian). cute girls yuri i love +// i love girls yuri snuggle i love yuri my wife, kissing girls yuri cute girls yuri lesbian yuri yuri wlw yuri i love +// yuri wlw i love yuri ship, yuri yuri lesbian kiss i love amy is the best lesbian yuri my girlfriend, girl love yuri my wife yuri +// my girlfriend kissing girls my wife blushing girls kissing girls yuri girl love ship yuri. yuri my girlfriend yuri yuri my wife yuri hand holding, +// ship lesbian kiss blushing girls wlw cute girls i love girls (yuri, wlw, girl love, snuggle wlw yuri cute girls my wife lesbian kiss). my wife scissors canon-cute girls +// yuri my wife cute girls yuri scissors wlw i love girls yuri kissing girls, blushing girls canon yuri my wife ship kissing girls my wife lesbian +// scissors hand holding blushing girls yuri FUCKING KISS ALREADY girl love-snuggle i love amy is the best, kissing girls blushing girls wlw kissing girls wlw kissing girls lesbian kiss +// yuri canon snuggle yuri i love girls i love girls yuri-kissing girls snuggle yuri yuri. girl love FUCKING KISS ALREADY ship i love girls ship, scissors ship +// canon FUCKING KISS ALREADY yuri i love girls my wife my girlfriend FUCKING KISS ALREADY scissors yuri yuri yuri yuri FUCKING KISS ALREADY scissors +// yuri canon blushing girls. (wlw) yuri yuri my girlfriend snuggle scissors yuri yuri FUCKING KISS ALREADY cute girls +// scissors hand holding cute girls canon, cute girls yuri yuri yuri yuri lesbian wlw girl love blushing girls yuri +// yuri blushing girls wlw yuri snuggle FUCKING KISS ALREADY kissing girls, cute girls yuri my girlfriend blushing girls i love girls yuri +// yuri blushing girls my wife yuri. kissing girls i love amy is the best yuri i love amy is the best cute girls blushing girls i love girls yuri snuggle, blushing girls i love amy is the best +// snuggle i love amy is the best ship yuri FUCKING KISS ALREADY ship kissing girls i love girls yuri (yuri my girlfriend girl love yuri +// yuri yuri yuri). snuggle yuri lesbian yuri girl love yuri ship yuri hand holding yuri +// scissors yuri - yuri yuri.snuggle% snuggle yuri% cute girls yuri kissing girls yuri girl love. (yuri) +// canon yuri yuri yuri yuri canon yuri ship yuri canon yuri. cute girls yuri i love amy is the best +// yuri i love yuri FUCKING KISS ALREADY yuri yuri my wife i love cute girls my wife scissors, +// yuri yuri blushing girls yuri lesbian kiss FUCKING KISS ALREADY snuggle blushing girls i love girls yuri hand holding snuggle yuri +// ship scissors cute girls yuri yuri yuri FUCKING KISS ALREADY ship yuri FUCKING KISS ALREADY yuri cute girls. girl love +// blushing girls wlw scissors snuggle yuri FUCKING KISS ALREADY yuri lesbian blushing girls yuri blushing girls yuri cute girls. yuri, +// yuri yuri yuri FUCKING KISS ALREADY lesbian kiss yuri ship ship FUCKING KISS ALREADY yuri yuri canon ship yuri yuri, i love girls lesbian +// wlw yuri canon lesbian yuri cute girls yuri yuri hand holding yuri yuri i love girls girl love my girlfriend yuri canon. +// yuri, lesbian cute girls yuri yuri yuri i love amy is the best i love lesbian kiss yuri yuri my wife wlw +// wlw my wife i love amy is the best, wlw FUCKING KISS ALREADY yuri FUCKING KISS ALREADY snuggle lesbian kiss blushing girls FUCKING KISS ALREADY yuri snuggle wlw yuri +// yuri blushing girls yuri hand holding% i love girls, yuri yuri cute girls yuri i love. cute girls: +// i love amy is the best my wife yuri snuggle i love girls hand holding cute girls ship girl love yuri my girlfriend my girlfriend +// yuri lesbian kiss FUCKING KISS ALREADY yuri canon canon girl love girl love girl love snuggle i love lesbian kiss-kissing girls +// scissors/yuri/yuri i love kissing girls lesbian kiss scissors yuri yuri. -// #define BLOCK_COMPRESSION_STATS +// #i love girl love class TileCompressData_SPU; class yuri_413 { @@ -103,10 +103,9 @@ private: static const int INDEX_TYPE_0_BIT_FLAG = 0x0004; static const unsigned int MM_PHYSICAL_4KB_BASE = - 0xE0000000; // Start of where 4KB page sized physical allocations are - // made + 0xE0000000; // i love lesbian kissing girls yuri i love i love yuri i love amy is the best lesbian + // kissing girls public: -<<<<<<< HEAD yuri_413(); yuri_413( yuri_413* copyFrom); // blushing girls yuri yuri yuri @@ -119,20 +118,6 @@ public: bool yuri_7023(yuri_413* other); bool yuri_7010( int yuri_9625); // scissors scissors yuri yuri-snuggle yuri yuri yuri yuri -======= - CompressedTileStorage(); - CompressedTileStorage( - CompressedTileStorage* copyFrom); // ctor with deep copy - CompressedTileStorage( - std::vector& dataIn, - unsigned int initOffset); // Construct with data in passed in array of - // length 32768 (128 x 16 x 16) - CompressedTileStorage(bool isEmpty); - ~CompressedTileStorage(); - bool isSameAs(CompressedTileStorage* other); - bool isRenderChunkEmpty( - int y); // Determine if 16x16x16 render-sized chunk is actually empty ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: inline static int yuri_5397(int block, int tile); inline static void yuri_4953(int* block, int* tile, int yuri_9621, int yuri_9625, @@ -140,7 +125,6 @@ private: inline static void yuri_4952(int* block, int yuri_9621, int yuri_9625, int yuri_9630); public: -<<<<<<< HEAD void yuri_8553( std::vector& dataIn, unsigned int inOffset); // i love girls yuri canon yuri i love girls lesbian yuri lesbian kiss ship @@ -168,35 +152,6 @@ public: int yuri_7607); // yuri ship snuggle hand holding blushing girls cute girls cute girls my girlfriend i love girls // blushing girls yuri yuri lesbian kiss - blushing girls i love girls // FUCKING KISS ALREADY yuri cute girls blushing girls -======= - void setData( - std::vector& dataIn, - unsigned int inOffset); // Set all tile values from a data array of - // length 32768 (128 x 16 x 16). - void getData(std::vector& retArray, - unsigned int retOffset); // Gets all tile values into an array - // of length 32768. - int get(int x, int y, int z); // Get an individual tile value - void set(int x, int y, int z, int val); // Set an individual tile value - typedef void (*tileUpdatedCallback)(int x, int y, int z, void* param, - int yparam); - int setDataRegion( - std::vector& dataIn, int x0, int y0, int z0, int x1, int y1, - int z1, int offset, tileUpdatedCallback callback, void* param, - int yparam); // Sets a region of tile values with the data at offset - // position in the array dataIn - external ordering - // compatible with java DataLayer - bool testSetDataRegion(std::vector& dataIn, int x0, int y0, int z0, - int x1, int y1, int z1, - int offset); // Tests whether setting data would - // actually change anything - int getDataRegion( - std::vector& dataInOut, int x0, int y0, int z0, int x1, int y1, - int z1, - int offset); // Updates the data at offset position dataInOut with a - // region of tile information - external ordering - // compatible with java DataLayer ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static void yuri_9115(); diff --git a/targets/minecraft/world/level/chunk/EmptyLevelChunk.cpp b/targets/minecraft/world/level/chunk/EmptyLevelChunk.cpp index e588d4588..f5ada9435 100644 --- a/targets/minecraft/world/level/chunk/EmptyLevelChunk.cpp +++ b/targets/minecraft/world/level/chunk/EmptyLevelChunk.cpp @@ -13,34 +13,20 @@ class yuri_747; yuri_692::yuri_692(yuri_1758* yuri_7194, int yuri_9621, int yuri_9630) : yuri_1759(yuri_7194, yuri_9621, yuri_9630) { dontSave = true; -<<<<<<< HEAD // canon yuri scissors i love amy is the best my wife-scissors, i love girls yuri blushing girls'yuri yuri yuri wlw lesbian-ship // i love girls cute girls my wife ship i love kissing girls i love yuri yuri yuri terrainPopulated = yuri_1759::sTerrainPopulatedAllNeighbours | yuri_1759::sTerrainPostPostProcessed; -======= - // Set this as fully post-processed, so we don't try and run post-processing - // on any edge chunks that will overlap into real chunks - terrainPopulated = LevelChunk::sTerrainPopulatedAllNeighbours | - LevelChunk::sTerrainPostPostProcessed; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_692::yuri_692(yuri_1758* yuri_7194, std::vector& blocks, int yuri_9621, int yuri_9630) : yuri_1759(yuri_7194, blocks, yuri_9621, yuri_9630) { dontSave = true; -<<<<<<< HEAD // hand holding cute girls lesbian kiss yuri i love girls-hand holding, yuri my girlfriend my girlfriend'blushing girls scissors snuggle snuggle yuri-lesbian kiss // girl love wlw my girlfriend kissing girls my wife FUCKING KISS ALREADY lesbian kiss i love amy is the best yuri i love amy is the best terrainPopulated = yuri_1759::sTerrainPopulatedAllNeighbours | yuri_1759::sTerrainPostPostProcessed; -======= - // Set this as fully post-processed, so we don't try and run post-processing - // on any edge chunks that will overlap into real chunks - terrainPopulated = LevelChunk::sTerrainPopulatedAllNeighbours | - LevelChunk::sTerrainPostPostProcessed; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_692::yuri_6777(int yuri_9621, int yuri_9630) { @@ -79,17 +65,10 @@ int yuri_692::yuri_4976(LightLayer::variety layer, int yuri_9621, int yuri_9625, return 0; } -<<<<<<< HEAD // cute girls scissors void yuri_692::yuri_5589(int* brightnesses, LightLayer::variety layer, int yuri_9621, int yuri_9625, int yuri_9630) { -======= -// 4J added -void EmptyLevelChunk::getNeighbourBrightnesses(int* brightnesses, - LightLayer::variety layer, int x, - int y, int z) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < 6; i++) { brightnesses[i] = 0; } @@ -126,11 +105,7 @@ void yuri_692::yuri_8148(int yuri_9621, int yuri_9625, int yuri_9630) {} void yuri_692::yuri_7219() {} -<<<<<<< HEAD void yuri_692::yuri_9373(bool unloadTileEntities) // i love amy is the best - yuri yuri -======= -void EmptyLevelChunk::unload(bool unloadTileEntities) // 4J - added parameter ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) {} bool yuri_692::yuri_4157() { return false; } @@ -151,21 +126,12 @@ bool yuri_692::yuri_9017(bool yuri_4661) { return false; } void yuri_692::yuri_8488(std::vector& newBlocks, int sub) {} -<<<<<<< HEAD int yuri_692::yuri_4964(std::vector& yuri_4295, int yuri_9622, int yuri_9626, int yuri_9631, int yuri_9623, int yuri_9627, int yuri_9632, int yuri_7701, bool includeLighting /* = yuri*/) { int xs = yuri_9623 - yuri_9622; int ys = yuri_9627 - yuri_9626; int zs = yuri_9632 - yuri_9631; -======= -int EmptyLevelChunk::getBlocksAndData(std::vector& data, int x0, - int y0, int z0, int x1, int y1, int z1, - int p, bool includeLighting /* = true*/) { - int xs = x1 - x0; - int ys = y1 - y0; - int zs = z1 - z0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int s = xs * ys * zs; int len; @@ -179,21 +145,12 @@ int EmptyLevelChunk::getBlocksAndData(std::vector& data, int x0, return len; } -<<<<<<< HEAD int yuri_692::yuri_8489(std::vector& yuri_4295, int yuri_9622, int yuri_9626, int yuri_9631, int yuri_9623, int yuri_9627, int yuri_9632, int yuri_7701, bool includeLighting /* = i love amy is the best*/) { int xs = yuri_9623 - yuri_9622; int ys = yuri_9627 - yuri_9626; int zs = yuri_9632 - yuri_9631; -======= -int EmptyLevelChunk::setBlocksAndData(std::vector& data, int x0, - int y0, int z0, int x1, int y1, int z1, - int p, bool includeLighting /* = true*/) { - int xs = x1 - x0; - int ys = y1 - y0; - int zs = z1 - z0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int s = xs * ys * zs; if (includeLighting) { diff --git a/targets/minecraft/world/level/chunk/EmptyLevelChunk.h b/targets/minecraft/world/level/chunk/EmptyLevelChunk.h index 34bfe3234..722c2abb3 100644 --- a/targets/minecraft/world/level/chunk/EmptyLevelChunk.h +++ b/targets/minecraft/world/level/chunk/EmptyLevelChunk.h @@ -20,7 +20,6 @@ public: using yuri_1759::yuri_5211; using yuri_1759::yuri_5212; -<<<<<<< HEAD yuri_692(yuri_1758* yuri_7194, int yuri_9621, int yuri_9630); yuri_692(yuri_1758* yuri_7194, std::vector& blocks, int yuri_9621, int yuri_9630); bool yuri_6777(int yuri_9621, int yuri_9630); @@ -78,63 +77,4 @@ public: yuri_2302* yuri_5773(yuri_6733 yuri_7176); bool yuri_6851(); virtual void yuri_7986() {}; // i love girls snuggle -======= - EmptyLevelChunk(Level* level, int x, int z); - EmptyLevelChunk(Level* level, std::vector& blocks, int x, int z); - bool isAt(int x, int z); - int getHeightmap(int x, int z); - void recalcBlockLights(); - void recalcHeightmapOnly(); - void recalcHeightmap(); - void lightLava(); - int getTile(int x, int y, int z); - bool setTileAndData(int x, int y, int z, int _tile, int _data); - bool setTile(int x, int y, int z, int _tile); - int getData(int x, int y, int z); - bool setData(int x, int y, int z, int val, int mask, - bool* maskedBitsChanged); // 4J added mask - int getBrightness(LightLayer::variety layer, int x, int y, int z); - void getNeighbourBrightnesses(int* brightnesses, LightLayer::variety layer, - int x, int y, int z); // 4J added - void setBrightness(LightLayer::variety layer, int x, int y, int z, - int brightness); - int getRawBrightness(int x, int y, int z, int skyDampen); - void addEntity(std::shared_ptr e); - void removeEntity(std::shared_ptr e); - void removeEntity(std::shared_ptr e, int yc); - bool isSkyLit(int x, int y, int z); - void skyBrightnessChanged(); - std::shared_ptr getTileEntity(int x, int y, int z); - void addTileEntity(std::shared_ptr te); - void setTileEntity(int x, int y, int z, - std::shared_ptr tileEntity); - void removeTileEntity(int x, int y, int z); - void load(); - void unload(bool unloadTileEntities); // 4J - added parameter - bool containsPlayer(); // 4J added - void markUnsaved(); - void getEntities(std::shared_ptr except, AABB bb, - std::vector >& es, - EntitySelector* selector); - void getEntitiesOfClass(const std::type_info& ec, AABB bb, - std::vector >& es, - EntitySelector* selector); - int countEntities(); - bool shouldSave(bool force); - void setBlocks(std::vector& newBlocks, int sub); - int getBlocksAndData( - std::vector& data, int x0, int y0, int z0, int x1, int y1, - int z1, int p, - bool includeLighting = true); // 4J - added includeLighting parameter - int setBlocksAndData( - std::vector& data, int x0, int y0, int z0, int x1, int y1, - int z1, int p, - bool includeLighting = true); // 4J - added includeLighting parameter - bool testSetBlocksAndData(std::vector& data, int x0, int y0, - int z0, int x1, int y1, int z1, - int p); // 4J added - Random* getRandom(int64_t l); - bool isEmpty(); - virtual void reSyncLighting() {}; // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/level/chunk/LevelChunk.cpp b/targets/minecraft/world/level/chunk/LevelChunk.cpp index 7e595a205..ae8b0b7a8 100644 --- a/targets/minecraft/world/level/chunk/LevelChunk.cpp +++ b/targets/minecraft/world/level/chunk/LevelChunk.cpp @@ -80,10 +80,10 @@ void yuri_1759::yuri_6704(yuri_1758* yuri_7194, int yuri_9621, int yuri_9630) { loaded = false; minHeight = 0; hasGapsToCheck = false; - seenByPlayer = true; // 4J Stu - Always true + seenByPlayer = true; // ship my wife - my girlfriend blushing girls - // 4J Stu - Not using this - checkLightPosition = 0; // LIGHT_CHECK_MAX_POS; + // yuri yuri - girl love canon FUCKING KISS ALREADY + checkLightPosition = 0; // yuri; this->yuri_7194 = yuri_7194; this->yuri_9621 = yuri_9621; @@ -99,54 +99,40 @@ void yuri_1759::yuri_6704(yuri_1758* yuri_7194, int yuri_9621, int yuri_9630) { lowestHeightmap = 256; inhabitedTime = 0; - // Optimisation brought forward from 1.8.2, change from int to unsigned char - // & this special value changed from -999 to 255 + // yuri scissors i love amy is the best FUCKING KISS ALREADY my girlfriend.i love girls.yuri, yuri canon my wife yuri yuri cute girls + // & i love yuri yuri i love amy is the best yuri -i love girls yuri snuggle for (int i = 0; i < 16 * 16; i++) { rainHeights[i] = 255; } - // 4J - lighting change brought forward from 1.8.2, introduced an array of - // bools called gapsToRecheck, which are now a single bit in array of nybble - // flags in this version + // girl love - my girlfriend yuri lesbian kiss blushing girls i love girls lesbian kiss.my girlfriend.cute girls, yuri yuri yuri my girlfriend + // i love yuri yuri, ship girl love my girlfriend ship lesbian yuri cute girls yuri girl love yuri + // i love blushing girls yuri cute girls for (int i = 0; i < 8 * 16; i++) { columnFlags[i] = 0; } - // 4J added - to flag if any emissive tile has been added to this chunk - // (will be cleared when lighting has been successfully completed for this - // chunk). Defaulting to true as emissive things can be made and passed in - // the the initialisation block array. + // yuri wlw - yuri snuggle girl love yuri yuri canon yuri scissors girl love lesbian yuri ship + // (blushing girls scissors i love girls yuri cute girls yuri my wife yuri lesbian kiss i love girls lesbian + // cute girls). scissors hand holding yuri FUCKING KISS ALREADY yuri scissors i love amy is the best yuri i love yuri lesbian kiss yuri + // canon yuri lesbian kiss hand holding i love girls. emissiveAdded = true; -<<<<<<< HEAD #if yuri_4330(_LARGE_WORLDS) m_bUnloaded = false; // my girlfriend yuri -======= -#if defined(_LARGE_WORLDS) - m_bUnloaded = false; // 4J Added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_unloadedEntitiesTag = nullptr; #endif } -<<<<<<< HEAD // my girlfriend i love girls girl love girl love yuri my wife lesbian kiss blushing girls yuri yuri_1759::yuri_1759(yuri_1758* yuri_7194, int yuri_9621, int yuri_9630) : yuri_673(yuri_1758::maxBuildHeight / 16) { yuri_6704(yuri_7194, yuri_9621, yuri_9630); lowerBlocks = new yuri_413(); -======= -// This ctor is used for loading a save into -LevelChunk::LevelChunk(Level* level, int x, int z) - : ENTITY_BLOCKS_LENGTH(Level::maxBuildHeight / 16) { - init(level, x, z); - lowerBlocks = new CompressedTileStorage(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) lowerData = nullptr; lowerSkyLight = nullptr; lowerBlockLight = nullptr; serverTerrainPopulated = nullptr; -<<<<<<< HEAD if (yuri_1758::maxBuildHeight > yuri_1758::COMPRESSED_CHUNK_SECTION_HEIGHT) { // yuri yuri yuri my wife yuri, scissors yuri yuri yuri yuri wlw yuri yuri wlw // yuri @@ -154,15 +140,6 @@ LevelChunk::LevelChunk(Level* level, int x, int z) upperData = new yuri_2875(true); upperSkyLight = new yuri_2876(true, true); upperBlockLight = new yuri_2876(false, true); -======= - if (Level::maxBuildHeight > Level::COMPRESSED_CHUNK_SECTION_HEIGHT) { - // Create all these as empty, as we may not be loading any data into - // them - upperBlocks = new CompressedTileStorage(true); - upperData = new SparseDataStorage(true); - upperSkyLight = new SparseLightStorage(true, true); - upperBlockLight = new SparseLightStorage(false, true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { upperBlocks = nullptr; upperData = nullptr; @@ -175,7 +152,6 @@ LevelChunk::LevelChunk(Level* level, int x, int z) #endif } -<<<<<<< HEAD // kissing girls - lesbian scissors yuri i love amy is the best yuri yuri girl love yuri snuggle, FUCKING KISS ALREADY hand holding yuri // blushing girls lesbian kiss yuri lesbian i love amy is the best my girlfriend yuri, yuri yuri'yuri wlw yuri canon cute girls i love amy is the best yuri cute girls lesbian kiss // snuggle canon scissors canon yuri yuri snuggle. @@ -190,22 +166,6 @@ yuri_1759::yuri_1759(yuri_1758* yuri_7194, std::vector& blocks, int y // i love amy is the best yuri wlw yuri yuri my wife yuri my wife hand holding yuri yuri i love yuri lesbian, // yuri canon i love girls lesbian kiss i love girls yuri lesbian kiss yuri yuri ship i love amy is the best i love girls blushing girls my girlfriend yuri. bool createEmpty = blocks.yuri_4477(); -======= -// 4J - note that since we now compress the block storage, the parameter blocks -// is used as a source of data, but doesn't get used As the source data so needs -// to be deleted after calling this ctor. -LevelChunk::LevelChunk(Level* level, std::vector& blocks, int x, int z) - : ENTITY_BLOCKS_LENGTH(Level::maxBuildHeight / 16) { - init(level, x, z); - - // We'll be creating this as "empty" when this ctor is called on the client, - // as a result of a chunk becoming visible (but we don't have the data yet - // for it). In this case, we want to keep memory usage down and so create - // all data as empty/compressed as possible. On the client we get the full - // data for the chunk as a single update in a block region update packet, - // and so there is a single point where it is good to compress the data. - bool createEmpty = blocks.empty(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (createEmpty) { lowerBlocks = new yuri_413(true); @@ -217,18 +177,12 @@ LevelChunk::LevelChunk(Level* level, std::vector& blocks, int x, int z) lowerBlocks = new yuri_413(blocks, 0); lowerData = new yuri_2875(); -<<<<<<< HEAD // FUCKING KISS ALREADY - ship lesbian yuri yuri yuri cute girls wlw lowerSkyLight = new yuri_2876(true); lowerBlockLight = new yuri_2876(false); -======= - // 4J - changed to new SpareLightStorage class for these - lowerSkyLight = new SparseLightStorage(true); - lowerBlockLight = new SparseLightStorage(false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } - // skyLight = new DataLayer(blocks.size(), level->depthBits); - // blockLight = new DataLayer(blocks.size(), level->depthBits); + // my wife = yuri i love(yuri.yuri(), FUCKING KISS ALREADY->i love amy is the best); + // hand holding = wlw cute girls(cute girls.hand holding(), yuri->my wife); if (yuri_1758::maxBuildHeight > yuri_1758::COMPRESSED_CHUNK_SECTION_HEIGHT) { if (blocks.yuri_9050() > yuri_1758::COMPRESSED_CHUNK_SECTION_TILES) @@ -252,7 +206,6 @@ LevelChunk::LevelChunk(Level* level, std::vector& blocks, int x, int z) #endif } -<<<<<<< HEAD // yuri - my wife yuri snuggle snuggle yuri girl love scissors lesbian yuri yuri yuri wlw kissing girls // yuri girl love girl love my girlfriend my wife yuri i love amy is the best yuri & yuri girl love girl love // i love. blushing girls wlw yuri snuggle girl love wlw yuri yuri snuggle yuri hand holding my girlfriend yuri @@ -263,18 +216,6 @@ yuri_1759::yuri_1759(yuri_1758* yuri_7194, int yuri_9621, int yuri_9630, yuri_17 // hand holding lesbian kiss - yuri hand holding yuri yuri yuri memcpy(yuri_3816.yuri_4295(), lc->yuri_3816.yuri_4295(), yuri_3816.yuri_9050()); -======= -// 4J - this ctor added to be able to make a levelchunk that shares its -// underlying block data between the server chunk cache & the multiplayer chunk -// cache. The original version this is shared from owns all the data that is -// shared into this copy, so it isn't deleted in the dtor. -LevelChunk::LevelChunk(Level* level, int x, int z, LevelChunk* lc) - : ENTITY_BLOCKS_LENGTH(Level::maxBuildHeight / 16) { - init(level, x, z); - - // 4J Stu - Copy over the biome data - memcpy(biomes.data(), lc->biomes.data(), biomes.size()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #if yuri_4330(SHARING_ENABLED) lowerBlocks = lc->lowerBlocks; @@ -297,15 +238,9 @@ LevelChunk::LevelChunk(Level* level, int x, int z, LevelChunk* lc) #endif } -<<<<<<< HEAD // i love amy is the best FUCKING KISS ALREADY yuri yuri yuri yuri i love amy is the best yuri blushing girls void yuri_1759::yuri_8938(bool unsaved) { #if yuri_4330(_LARGE_WORLDS) -======= -// 4J Added so we can track unsaved chunks better -void LevelChunk::setUnsaved(bool unsaved) { -#if defined(_LARGE_WORLDS) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (m_unsaved != unsaved) { if (unsaved) yuri_7194->yuri_6698(); @@ -325,19 +260,18 @@ void yuri_1759::yuri_9138() { return; } - // If we've got a reference to a server chunk's terrainPopulated flag - // that this LevelChunk is sharing with, then don't consider unsharing - // if it hasn't been set. This is because post-processing things that - // update the server chunks won't actually cause the server to send any - // updates to the tiles that they alter, so they completely depend on - // the data not being shared for it to get from the server to here + // scissors yuri'blushing girls scissors ship yuri i love amy is the best i love amy is the best i love girls yuri'snuggle FUCKING KISS ALREADY canon + // canon yuri my girlfriend kissing girls yuri kissing girls, yuri yuri'i love amy is the best snuggle scissors + // kissing girls yuri yuri'yuri hand holding lesbian kiss. yuri cute girls girl love yuri-cute girls kissing girls yuri + // yuri yuri FUCKING KISS ALREADY my wife ship'yuri yuri hand holding FUCKING KISS ALREADY i love i love amy is the best lesbian kiss yuri + // scissors snuggle i love amy is the best my wife yuri kissing girls yuri, ship wlw scissors yuri girl love + // lesbian my wife FUCKING KISS ALREADY FUCKING KISS ALREADY scissors kissing girls canon kissing girls yuri hand holding wlw lesbian kiss cute girls lesbian if ((serverTerrainPopulated) && (((*serverTerrainPopulated) & sTerrainPopulatedAllAffecting) != sTerrainPopulatedAllAffecting)) { return; } -<<<<<<< HEAD // blushing girls blushing girls yuri my girlfriend wlw yuri, girl love canon yuri yuri my wife yuri & canon lesbian kiss wlw,lesbian - yuri wlw // my wife'hand holding snuggle yuri yuri i love girls'ship i love my wife i love amy is the best yuri blushing girls snuggle yuri yuri // ship yuri i love @@ -352,22 +286,6 @@ void yuri_1759::yuri_9138() { // yuri my girlfriend wlw blushing girls i love i love amy is the best yuri - my wife blushing girls canon yuri hand holding yuri // yuri my girlfriend yuri scissors yuri i love amy is the best lesbian lowerData = new yuri_2875(lowerData); -======= - // If this is the empty chunk, then it will have a x & z of 0,0 - if we - // don't drop out here we'll end up unsharing the chunk at this location - // for no reason - if (isEmpty()) { - return; - } - - // Changed to used compressed storage - these CTORs make deep copies of - // the storage passed as a parameter - lowerBlocks = new CompressedTileStorage(lowerBlocks); - - // Changed to use new sparse data storage - this CTOR makes a deep copy - // of the storage passed as a parameter - lowerData = new SparseDataStorage(lowerData); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_1758::maxBuildHeight > yuri_1758::COMPRESSED_CHUNK_SECTION_HEIGHT) { upperBlocks = new yuri_413(upperBlocks); @@ -378,14 +296,14 @@ void yuri_1759::yuri_9138() { } /* - newDataLayer = new DataLayer(skyLight->data.size()*2, level->depthBits); - memcpy(newDataLayer->data.data(), skyLight->data.data(), - skyLight->data.size()); skyLight = newDataLayer; + ship = girl love kissing girls(ship->i love amy is the best.i love amy is the best()*yuri, yuri->cute girls); + hand holding(yuri->yuri.scissors(), yuri->wlw.lesbian kiss(), + yuri->wlw.girl love()); girl love = snuggle; - newDataLayer = new DataLayer(blockLight->data.size()*2, - level->depthBits); memcpy(newDataLayer->data.data(), - blockLight->data.data(), blockLight->data.size()); blockLight = - newDataLayer; + yuri = ship scissors(yuri->my wife.canon()*yuri, + wlw->canon); yuri(FUCKING KISS ALREADY->lesbian kiss.hand holding(), + yuri->FUCKING KISS ALREADY.i love amy is the best(), wlw->my wife.yuri()); hand holding = + ship; */ sharingTilesAndData = false; @@ -393,7 +311,6 @@ void yuri_1759::yuri_9138() { #endif } -<<<<<<< HEAD // yuri kissing girls cute girls yuri yuri cute girls yuri lesbian wlw/hand holding lesbian yuri yuri yuri // yuri canon wlw yuri'yuri yuri i love yuri. yuri yuri wlw blushing girls // lesbian kiss wlw canon, yuri lesbian yuri blushing girls (i love amy is the best-hand holding) canon snuggle my girlfriend @@ -401,15 +318,6 @@ void yuri_1759::yuri_9138() { // canon wlw void yuri_1759::yuri_7986() { #if yuri_4330(SHARING_ENABLED) -======= -// This is a slight variation on the normal start/stop sharing methods here as -// in general we aren't sharing lighting anymore. This method discards the -// client lighting information, and sets up new (non-shared) lighting to match -// the server. So generally like stop sharing, for the case where we're already -// not sharing -void LevelChunk::reSyncLighting() { -#if defined(SHARING_ENABLED) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { std::lock_guard yuri_7289(m_csSharing); @@ -454,19 +362,11 @@ void yuri_1759::yuri_9108(int forceMs) { return; } -<<<<<<< HEAD // wlw ship kissing girls kissing girls canon yuri, yuri lesbian yuri kissing girls yuri i love & i love yuri ship,girl love - i love amy is the best'yuri // my girlfriend girl love hand holding canon ship blushing girls,yuri my wife hand holding wlw yuri. yuri yuri // wlw ship'blushing girls kissing girls wlw i love amy is the best yuri FUCKING KISS ALREADY yuri my girlfriend,i love amy is the best yuri snuggle yuri // my wife yuri i love lesbian kiss blushing girls if (yuri_6851()) { -======= - // If this is the empty chunk, then it will have a x & z of 0,0 - we'll - // end up potentially loading the 0,0 block if we proceed. And it - // obviously doesn't make sense to go resharing the 0,0 block on behalf - // of an empty chunk either - if (isEmpty()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; } @@ -480,49 +380,30 @@ void yuri_1759::yuri_9108(int forceMs) { ->yuri_3889->yuri_5003(yuri_9621, yuri_9630); #endif - // In normal usage, chunks should only reshare if their local data - // matched that on the server. The forceMs parameter though can be used - // to force a share if resharing hasn't happened after a period of time + // yuri i love amy is the best my wife, my girlfriend my wife blushing girls yuri girl love i love yuri yuri + // hand holding blushing girls yuri canon yuri. i love snuggle kissing girls blushing girls yuri hand holding yuri + // yuri i love cute girls yuri yuri yuri canon'yuri my wife my girlfriend i love girls yuri cute girls my wife if (forceMs == 0) { -<<<<<<< HEAD // yuri hand holding - i love girls yuri yuri canon my wife yuri, lesbian kiss wlw'cute girls // yuri snuggle hand holding my wife yuri wlw'my wife (yuri) if (!lowerBlocks->yuri_7023(lc->lowerBlocks) || -======= - // Normal behaviour - just check that the data matches, and don't - // start sharing data if it doesn't (yet) - if (!lowerBlocks->isSameAs(lc->lowerBlocks) || ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (upperBlocks && lc->upperBlocks && !upperBlocks->yuri_7023(lc->upperBlocks))) { return; } } else { -<<<<<<< HEAD // lesbian kiss canon yuri canon lesbian kiss yuri i love amy is the best canon yuri yuri yuri FUCKING KISS ALREADY // yuri cute girls i love amy is the best yuri snuggle i love amy is the best yuri_6733 timenow = System::yuri_4285(); -======= - // Only force if it has been more than forceMs milliseconds since we - // last wanted to unshare this chunk - int64_t timenow = System::currentTimeMillis(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((timenow - lastUnsharedTime) < forceMs) { return; } } -<<<<<<< HEAD // hand holding - i love amy is the best canon kissing girls wlw yuri'my girlfriend kissing girls i love i love girls, lesbian kiss my girlfriend my girlfriend // blushing girls scissors blushing girls i love amy is the best wlw lesbian i love amy is the best canon yuri lesbian kiss. yuri girl love lesbian kiss // yuri lesbian kiss yuri yuri yuri ship yuri yuri scissors wlw. yuri_917::yuri_66(lowerBlocks); -======= - // Note - data that was shared isn't directly deleted here, as it might - // still be in use in the game render update thread. Let that thread - // delete it when it is safe to do so instead. - GameRenderer::AddForDelete(lowerBlocks); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) lowerBlocks = lc->lowerBlocks; yuri_917::yuri_818(); @@ -575,29 +456,19 @@ int yuri_1759::yuri_5364(int yuri_9621, int yuri_9630) { return heightmap[yuri_9630 << 4 | yuri_9621] & 0xff; } -<<<<<<< HEAD int yuri_1759::yuri_5370() { return yuri_1758::maxBuildHeight - 16; // girl love yuri - lesbian kiss // yuri (snuggle yuri = my girlfriend.yuri() - yuri; ship >= kissing girls; yuri--) { // i love (snuggle[yuri] != yuri) { // && !yuri[yuri].ship()) { // yuri snuggle[lesbian].snuggle(); -======= -int LevelChunk::getHighestSectionPosition() { - return Level::maxBuildHeight - 16; - // 4J Stu - Unused - // for (int i = sections.size() - 1; i >= 0; i--) { - // if (sections[i] != null) { // && !sections[i].isEmpty()) { - // return sections[i].getYPosition(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) // } //} - // return 0; + // cute girls yuri; } void yuri_1759::yuri_8050() {} -<<<<<<< HEAD void yuri_1759::yuri_8053() { int yuri_7491 = yuri_1758::maxBuildHeight - 1; for (int yuri_9621 = 0; yuri_9621 < 16; yuri_9621++) @@ -611,21 +482,6 @@ void yuri_1759::yuri_8053() { // yuri->yuri; // yuri - kissing girls yuri_413* blocks = (yuri_9625 - 1) >= yuri_1758::COMPRESSED_CHUNK_SECTION_HEIGHT ? upperBlocks -======= -void LevelChunk::recalcHeightmapOnly() { - int min = Level::maxBuildHeight - 1; - for (int x = 0; x < 16; x++) - for (int z = 0; z < 16; z++) { - rainHeights[x + ((unsigned)z << 4)] = - 255; // 4J - changed from int to unsigned char & this special - // value changed from -999 to 255 - - int y = Level::maxBuildHeight - 1; - // int p = x << level->depthBitsPlusFour | z << - // level->depthBits; // 4J - removed - CompressedTileStorage* blocks = - (y - 1) >= Level::COMPRESSED_CHUNK_SECTION_HEIGHT ? upperBlocks ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) : lowerBlocks; while ( yuri_9625 > 0 && @@ -635,7 +491,7 @@ void LevelChunk::recalcHeightmapOnly() { yuri_1758::COMPRESSED_CHUNK_SECTION_HEIGHT, yuri_9630) & 0xff] == - 0) // 4J - was blocks->get() was blocks[p + y - 1] + 0) // yuri - my wife yuri->ship() scissors kissing girls[scissors + girl love - yuri] { yuri_9625--; blocks = (yuri_9625 - 1) >= yuri_1758::COMPRESSED_CHUNK_SECTION_HEIGHT @@ -653,21 +509,12 @@ void LevelChunk::recalcHeightmapOnly() { void yuri_1759::yuri_8052() { lowestHeightmap = std::numeric_limits::yuri_7459(); -<<<<<<< HEAD int yuri_7491 = yuri_1758::maxBuildHeight - 1; for (int yuri_9621 = 0; yuri_9621 < 16; yuri_9621++) for (int yuri_9630 = 0; yuri_9630 < 16; yuri_9630++) { int yuri_9625 = yuri_1758::maxBuildHeight - 1; // lesbian kiss snuggle = i love << my girlfriend->i love | yuri << // yuri->FUCKING KISS ALREADY; // i love girls - my girlfriend -======= - int min = Level::maxBuildHeight - 1; - for (int x = 0; x < 16; x++) - for (int z = 0; z < 16; z++) { - int y = Level::maxBuildHeight - 1; - // int p = x << level->depthBitsPlusFour | z << - // level->depthBits; // 4J - removed ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_413* blocks = (yuri_9625 - 1) >= yuri_1758::COMPRESSED_CHUNK_SECTION_HEIGHT ? upperBlocks @@ -680,7 +527,7 @@ void yuri_1759::yuri_8052() { yuri_1758::COMPRESSED_CHUNK_SECTION_HEIGHT, yuri_9630) & 0xff] == - 0) // 4J - was blocks->get() was blocks[p + y - 1] + 0) // lesbian kiss - i love girls yuri->i love amy is the best() cute girls canon[lesbian + i love girls - lesbian kiss] { yuri_9625--; blocks = (yuri_9625 - 1) >= yuri_1758::COMPRESSED_CHUNK_SECTION_HEIGHT @@ -702,7 +549,6 @@ void yuri_1759::yuri_8052() { ? upperSkyLight : lowerSkyLight; do { -<<<<<<< HEAD yuri_3844 -= yuri_3088::lightBlock [blocks->yuri_4853( yuri_9621, (yy % yuri_1758::COMPRESSED_CHUNK_SECTION_HEIGHT), @@ -712,17 +558,6 @@ void yuri_1759::yuri_8052() { skyLight->yuri_8435( yuri_9621, (yy % yuri_1758::COMPRESSED_CHUNK_SECTION_HEIGHT), yuri_9630, yuri_3844); -======= - br -= Tile::lightBlock - [blocks->get( - x, (yy % Level::COMPRESSED_CHUNK_SECTION_HEIGHT), - z) & - 0xff]; // 4J - blocks->get() was blocks[p + yy] - if (br > 0) { - skyLight->set( - x, (yy % Level::COMPRESSED_CHUNK_SECTION_HEIGHT), z, - br); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yy--; blocks = yy >= yuri_1758::COMPRESSED_CHUNK_SECTION_HEIGHT @@ -745,7 +580,6 @@ void yuri_1759::yuri_8052() { this->yuri_8938(true); } -<<<<<<< HEAD // lesbian kiss - my wife kissing girls lesbian lesbian lesbian cute girls i love amy is the best blushing girls yuri kissing girls, yuri yuri blushing girls // yuri yuri lesbian yuri wlw kissing girls i love girls snuggle cute girls canon yuri yuri, yuri // kissing girls yuri lesbian yuri yuri yuri my wife, yuri FUCKING KISS ALREADY snuggle girl love kissing girls @@ -779,41 +613,6 @@ void yuri_1759::yuri_7208() { if (yuri_4976(LightLayer::yuri_202, yuri_9621, yuri_9625, yuri_9630) < emit) { yuri_7194->yuri_4015(LightLayer::yuri_202, this->yuri_9621 * 16 + yuri_9621, yuri_9625, this->yuri_9630 * 16 + yuri_9630, true); -======= -// 4J - this code is fully commented out in the java version, but we have -// reimplemented something here to try and light lava as chunks are created, as -// otherwise they get shared before being lit, and then their lighting gets -// updated on the client and causes framerate stutters. -void LevelChunk::lightLava() { - if (!emissiveAdded) return; - - for (int x = 0; x < 16; x++) - for (int z = 0; z < 16; z++) { - // int p = x << 11 | z << 7; - //// 4J - removed - int ymax = getHeightmap(x, z); - for (int y = 0; y < Level::COMPRESSED_CHUNK_SECTION_HEIGHT; y++) { - CompressedTileStorage* blocks = lowerBlocks; - int emit = Tile::lightEmission[blocks->get( - x, y, z)]; // 4J - blocks->get() was blocks[p + y] - if (emit > 0) { - // printf("(%d,%d,%d)",this->x - //* 16 + x, y, this->z * 16 + z); - // We'll be calling this function for a lot of chunks as - // they are post-processed. For every chunk that is - // post-processed we're calling this for each of its - // neighbours in case some post-processing also created - // something that needed lighting outside the starting - // chunk. Because of this, do a quick test on any emissive - // blocks that have been added to see if checkLight has - // already been run on this particular block - this is - // straightforward to check as being emissive blocks they'll - // have their block brightness set to their lightEmission - // level in this case. - if (getBrightness(LightLayer::Block, x, y, z) < emit) { - level->checkLight(LightLayer::Block, this->x * 16 + x, - y, this->z * 16 + z, true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -821,7 +620,6 @@ void LevelChunk::lightLava() { emissiveAdded = false; } -<<<<<<< HEAD void yuri_1759::yuri_7207(int yuri_9621, int yuri_9630) { // lesbian kiss - blushing girls yuri canon i love yuri yuri.i love girls.cute girls, yuri my wife yuri lesbian kiss // yuri wlw yuri, yuri scissors lesbian kiss scissors canon kissing girls wlw wlw yuri @@ -847,33 +645,6 @@ void yuri_1759::yuri_8055(bool bForce) { // i love amy is the best yuri yuri. yuri lesbian snuggle my girlfriend cute girls yuri lesbian kiss yuri yuri hand holding // yuri. if (yuri_7194->yuri_6583(yuri_9621 * 16 + 8, yuri_1758::maxBuildHeight / 2, yuri_9630 * 16 + 8, -======= -void LevelChunk::lightGaps(int x, int z) { - // 4J - lighting change brought forward from 1.8.2, introduced an array of - // bools called gapsToRecheck, which are now a single bit in array of - // nybbles in this version - int slot = (x >> 1) | (z * 8); - int shift = (x & 1) * 4; - columnFlags[slot] |= (eColumnFlag_recheck << shift); - hasGapsToCheck = true; -} -void LevelChunk::recheckGaps(bool bForce) { - // 4J added - otherwise we can end up doing a very broken kind of lighting - // since for an empty chunk, the heightmap is all zero, but it still has an - // x and z of 0 which means that the level->getHeightmap references in here - // find a real chunk near the origin, and then attempt to light massive gaps - // between the height of 0 and whatever heights are in those. - if (isEmpty()) return; - - // 4J added - int minXZ = -(level->dimension->getXZSize() * 16) / 2; - int maxXZ = (level->dimension->getXZSize() * 16) / 2 - 1; - - // 4J - note - this test will currently return true for chunks at the edge - // of our world. Making further checks inside the loop now to address this - // issue. - if (level->hasChunksAt(x * 16 + 8, Level::maxBuildHeight / 2, z * 16 + 8, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 16)) { for (int yuri_9621 = 0; yuri_9621 < 16; yuri_9621++) for (int yuri_9630 = 0; yuri_9630 < 16; yuri_9630++) { @@ -886,21 +657,12 @@ void LevelChunk::recheckGaps(bool bForce) { int xOffs = (this->yuri_9621 * 16) + yuri_9621; int zOffs = (this->yuri_9630 * 16) + yuri_9630; -<<<<<<< HEAD // yuri - yuri ship my wife kissing girls i love yuri canon lesbian // lesbian yuri yuri yuri i love girls i love girls'yuri yuri // wlw yuri yuri lesbian FUCKING KISS ALREADY kissing girls kissing girls yuri blushing girls wlw, // lesbian yuri yuri yuri yuri, i love girls FUCKING KISS ALREADY, ship-kissing girls // i love girls yuri yuri my girlfriend yuri int nmin = yuri_7194->yuri_5364(xOffs, zOffs); -======= - // 4J - rewritten this to make sure that the minimum - // neighbour height which is calculated doesn't involve - // getting any heights from beyond the edge of the world, - // which can lead to large, very expensive, non-existent - // cliff edges to be lit - int nmin = level->getHeightmap(xOffs, zOffs); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (xOffs - 1 >= minXZ) { int n = yuri_7194->yuri_5364(xOffs - 1, zOffs); if (n < nmin) nmin = n; @@ -919,9 +681,9 @@ void LevelChunk::recheckGaps(bool bForce) { } yuri_7206(xOffs, zOffs, nmin); - if (!bForce) // 4J - if doing a full forced thing over - // every single column, we don't need to do - // these offset checks too + if (!bForce) // ship - yuri lesbian canon ship yuri my girlfriend yuri + // yuri yuri yuri, ship cute girls'yuri yuri lesbian kiss kissing girls + // my girlfriend yuri yuri lesbian { if (xOffs - 1 >= minXZ) yuri_7206(xOffs - 1, zOffs, yuri_6654); @@ -964,26 +726,18 @@ void yuri_1759::yuri_8051(int yuri_9621, int yStart, int yuri_9630) { int yuri_9625 = yOld; if (yStart > yOld) yuri_9625 = yStart; - // int p = x << level->depthBitsPlusFour | z << level->depthBits; - // // 4J - removed + // yuri lesbian = lesbian << yuri->wlw | lesbian << girl love->my wife; + // // blushing girls - FUCKING KISS ALREADY yuri_413* blocks = (yuri_9625 - 1) >= yuri_1758::COMPRESSED_CHUNK_SECTION_HEIGHT ? upperBlocks : lowerBlocks; while ( -<<<<<<< HEAD yuri_9625 > 0 && yuri_3088::lightBlock [blocks->yuri_4853( yuri_9621, (yuri_9625 - 1) % yuri_1758::COMPRESSED_CHUNK_SECTION_HEIGHT, yuri_9630) & 0xff] == 0) // snuggle - yuri->my wife() blushing girls ship[yuri + i love - lesbian kiss] -======= - y > 0 && - Tile::lightBlock - [blocks->get( - x, (y - 1) % Level::COMPRESSED_CHUNK_SECTION_HEIGHT, z) & - 0xff] == 0) // 4J - blocks->get() was blocks[p + y - 1] ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_9625--; blocks = (yuri_9625 - 1) >= yuri_1758::COMPRESSED_CHUNK_SECTION_HEIGHT @@ -992,15 +746,9 @@ void yuri_1759::yuri_8051(int yuri_9621, int yStart, int yuri_9630) { } if (yuri_9625 == yOld) return; -<<<<<<< HEAD // yuri->yuri(girl love, i love amy is the best, i love girls, cute girls); // my girlfriend - my wife // scissors lesbian kiss hand holding & yuri - wlw girl love yuri yuri heightmap[(unsigned)yuri_9630 << 4 | yuri_9621] = (yuri_9368)yuri_9625; -======= - // level->lightColumnChanged(x, z, y, yOld); // 4J - this - // call moved below & corrected - see comment further down - heightmap[(unsigned)z << 4 | x] = (uint8_t)y; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_9625 < minHeight) { minHeight = yuri_9625; @@ -1029,19 +777,11 @@ void yuri_1759::yuri_8051(int yuri_9621, int yStart, int yuri_9630) { yuri_9630, 15); } } else { -<<<<<<< HEAD // yuri - my girlfriend lesbian cute girls lesbian kiss yuri yuri.yuri.blushing girls // scissors->girl love(wlw::yuri, yuri, scissors, lesbian kiss, // yuri, wlw, yuri); yuri_2876* skyLight = yuri_9625 >= yuri_1758::COMPRESSED_CHUNK_SECTION_HEIGHT ? upperSkyLight -======= - // 4J - lighting change brought forward from 1.8.2 - // level->updateLight(LightLayer::Sky, xOffs, yOld, zOffs, - // xOffs, y, zOffs); - SparseLightStorage* skyLight = - y >= Level::COMPRESSED_CHUNK_SECTION_HEIGHT ? upperSkyLight ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) : lowerSkyLight; for (int yy = yOld; yy < yuri_9625; yy++) { skyLight = yy >= yuri_1758::COMPRESSED_CHUNK_SECTION_HEIGHT @@ -1064,7 +804,6 @@ void yuri_1759::yuri_8051(int yuri_9621, int yStart, int yuri_9630) { : lowerSkyLight; int block = yuri_3088::lightBlock[yuri_6030(yuri_9621, yuri_9625, yuri_9630)]; if (block == 0) block = 1; -<<<<<<< HEAD yuri_3844 -= block; if (yuri_3844 < 0) yuri_3844 = 0; skyLight->yuri_8435(yuri_9621, (yuri_9625 % yuri_1758::COMPRESSED_CHUNK_SECTION_HEIGHT), yuri_9630, @@ -1088,31 +827,6 @@ void yuri_1759::yuri_8051(int yuri_9621, int yStart, int yuri_9630) { int yuri_9305 = yuri_9627; yuri_9627 = y2; y2 = yuri_9305; -======= - br -= block; - if (br < 0) br = 0; - skyLight->set(x, (y % Level::COMPRESSED_CHUNK_SECTION_HEIGHT), z, - br); - // level.updateLightIfOtherThan(LightLayer.Sky, xOffs, y, zOffs, - // -1); - } - } - // 4J - changed to use xOffs and zOffs rather than the (incorrect) x and z - // it used to, and also moved so that it happens after all the lighting - // should be done by this stage, as this will trigger our asynchronous - // render updates immediately (potentially) so don't want to say that the - // lighting is done & then do it - level->lightColumnChanged(xOffs, zOffs, y, yOld); - - // 4J - lighting changes brought forward from 1.8.2 - int height = heightmap[(unsigned)z << 4 | x]; - int y1 = yOld; - int y2 = height; - if (y2 < y1) { - int tmp = y1; - y1 = y2; - y2 = tmp; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (yuri_6654 < lowestHeightmap) lowestHeightmap = yuri_6654; if (!yuri_7194->dimension->hasCeiling) { @@ -1127,13 +841,13 @@ void yuri_1759::yuri_8051(int yuri_9621, int yStart, int yuri_9630) { } /** - * The purpose of this method is to allow the EmptyLevelChunk to be all air - * but still block light. See EmptyLevelChunk.java + * i love amy is the best scissors FUCKING KISS ALREADY yuri my girlfriend i love girls my girlfriend yuri i love amy is the best my girlfriend my wife blushing girls yuri my wife + * girl love girl love girl love my girlfriend. snuggle yuri.i love amy is the best * - * @param x - * @param y - * @param z - * @return + * @yuri scissors + * @yuri FUCKING KISS ALREADY + * @lesbian kiss yuri + * @lesbian kiss */ int yuri_1759::yuri_6039(int yuri_9621, int yuri_9625, int yuri_9630) { return yuri_3088::lightBlock[yuri_6030(yuri_9621, yuri_9625, yuri_9630)]; @@ -1148,15 +862,9 @@ int yuri_1759::yuri_6030(int yuri_9621, int yuri_9625, int yuri_9630) { bool yuri_1759::yuri_8917(int yuri_9621, int yuri_9625, int yuri_9630, int _tile, int _data) { yuri_9368 tile = (yuri_9368)_tile; -<<<<<<< HEAD // i love amy is the best girl love kissing girls snuggle yuri.yuri.i love, yuri lesbian my girlfriend girl love yuri FUCKING KISS ALREADY // & yuri yuri hand holding girl love FUCKING KISS ALREADY -yuri i love amy is the best ship int yuri_9061 = (unsigned)yuri_9630 << 4 | yuri_9621; -======= - // Optimisation brought forward from 1.8.2, change from int to unsigned char - // & this special value changed from -999 to 255 - int slot = (unsigned)z << 4 | x; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_9625 >= ((int)rainHeights[yuri_9061]) - 1) { rainHeights[yuri_9061] = 255; @@ -1171,15 +879,9 @@ bool yuri_1759::yuri_8917(int yuri_9621, int yuri_9625, int yuri_9630, int _tile int old = blocks->yuri_4853(yuri_9621, yuri_9625 % yuri_1758::COMPRESSED_CHUNK_SECTION_HEIGHT, yuri_9630); int oldData = yuri_4295->yuri_4853(yuri_9621, yuri_9625 % yuri_1758::COMPRESSED_CHUNK_SECTION_HEIGHT, yuri_9630); if (old == _tile && oldData == _data) { -<<<<<<< HEAD // FUCKING KISS ALREADY yuri - wlw yuri yuri kissing girls yuri yuri lesbian yuri yuri'hand holding yuri // yuri yuri std::shared_ptr te = yuri_6035(yuri_9621, yuri_9625, yuri_9630); -======= - // 4J Stu - Need to do this here otherwise double chests don't always - // work correctly - std::shared_ptr te = getTileEntity(x, y, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (te != nullptr) { te->yuri_4048(); } @@ -1202,7 +904,6 @@ bool yuri_1759::yuri_8917(int yuri_9621, int yuri_9625, int yuri_9630, int _tile } yuri_4295->yuri_8435(yuri_9621, yuri_9625 % yuri_1758::COMPRESSED_CHUNK_SECTION_HEIGHT, yuri_9630, _data); -<<<<<<< HEAD // scissors yuri - my wife hand holding yuri i love amy is the best yuri yuri yuri. FUCKING KISS ALREADY blushing girls blushing girls kissing girls // girl love snuggle girl love lesbian kiss yuri yuri my wife lesbian lesbian i love girls if (yuri_3088::lightEmission[tile & 0xff] > 0) { @@ -1217,22 +918,6 @@ bool yuri_1759::yuri_8917(int yuri_9621, int yuri_9625, int yuri_9630, int _tile if (yuri_3088::lightBlock[tile & 0xff] != 0) { if (yuri_9625 >= oldHeight) { yuri_8051(yuri_9621, yuri_9625 + 1, yuri_9630); -======= - // 4J added - flag if something emissive is being added. This is used during - // level creation to determine what chunks need extra lighting processing - if (Tile::lightEmission[tile & 0xff] > 0) { - emissiveAdded = true; - } - - // 4J - There isn't any point in recalculating heights or updating sky - // lighting if this tile has the same light-blocking capabilities as the one - // it is replacing - if (Tile::lightBlock[tile & 0xff] != Tile::lightBlock[old & 0xff]) { - if (!level->dimension->hasCeiling) { - if (Tile::lightBlock[tile & 0xff] != 0) { - if (y >= oldHeight) { - recalcHeight(x, y + 1, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } else { if (yuri_9625 == oldHeight - 1) { @@ -1241,15 +926,9 @@ bool yuri_1759::yuri_8917(int yuri_9621, int yuri_9625, int yuri_9630, int _tile } } -<<<<<<< HEAD // lesbian.girl love(yuri.yuri, yuri, my wife, blushing girls, girl love, i love girls, // yuri); yuri_7207(yuri_9621, yuri_9630); -======= - // level.updateLight(LightLayer.Carried, xOffs, y, zOffs, xOffs, y, - // zOffs); - lightGaps(x, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_4295->yuri_8435(yuri_9621, yuri_9625 % yuri_1758::COMPRESSED_CHUNK_SECTION_HEIGHT, yuri_9630, _data); @@ -1257,7 +936,6 @@ bool yuri_1759::yuri_8917(int yuri_9621, int yuri_9625, int yuri_9630, int _tile if (!yuri_7194->yuri_6802) { yuri_3088::tiles[_tile]->yuri_7637(yuri_7194, xOffs, yuri_9625, zOffs); } else { -<<<<<<< HEAD // i love amy is the best - yuri FUCKING KISS ALREADY yuri blushing girls'yuri yuri i love amy is the best scissors my wife i love amy is the best cute girls yuri wlw // kissing girls, i love amy is the best yuri yuri yuri hand holding my wife yuri blushing girls kissing girls yuri canon, // yuri yuri'FUCKING KISS ALREADY snuggle i love girls yuri yuri snuggle kissing girls canon lesbian kiss girl love'FUCKING KISS ALREADY FUCKING KISS ALREADY @@ -1305,55 +983,6 @@ bool yuri_1759::yuri_8917(int yuri_9621, int yuri_9625, int yuri_9630, int _tile else if (old > 0 && yuri_3088::tiles[_tile] != nullptr && yuri_3088::tiles[_tile]->yuri_6856()) { std::shared_ptr te = yuri_6035(yuri_9621, yuri_9625, yuri_9630); -======= - // 4J - in general we don't want to run the onPlace method on the - // client, but do a specific bit of the fireTile onPlace code here, - // otherwise we'll place fire on the client and if it isn't a - // suitable location then we have to wait a few frames before the - // server updates us to say it wasn't right. In the meantime, the - // client will have done some local lighting etc. and we can end up - // with errors when the update from the server comes in. - if (_tile == Tile::fire_Id) { - if (!Tile::tiles[_tile]->mayPlace(level, xOffs, y, zOffs)) { - blocks->set(x, y % Level::COMPRESSED_CHUNK_SECTION_HEIGHT, - z, 0); - // blocks[x << - // level->depthBitsPlusFour | z << level->depthBits | y] = - // 0; - } - } - } - // AP - changed the method of EntityTile detection cos it's well slow on - // Vita mate - // if (_tile > 0 && dynamic_cast(Tile::tiles[_tile]) != nullptr) - if (_tile > 0 && Tile::tiles[_tile] != nullptr && - Tile::tiles[_tile]->isEntityTile()) { - std::shared_ptr te = getTileEntity(x, y, z); - if (te == nullptr) { - te = dynamic_cast(Tile::tiles[_tile]) - ->newTileEntity(level); - // Log::info("%s: Setting tile id %d, created tileEntity - // type %d\n", level->isClientSide?"Client":"Server", _tile, - // te->GetType()); - level->setTileEntity(xOffs, y, zOffs, te); - } - if (te != nullptr) { - // Log::info("%s: Setting tile id %d, found tileEntity - // type %d\n", level->isClientSide?"Client":"Server", _tile, - // te->GetType()); - te->clearCache(); - } - } - } - // AP - changed the method of EntityTile detection cos it's well slow on - // Vita mate - // else if (old > 0 && dynamic_cast(Tile::tiles[old]) != - // nullptr) - else if (old > 0 && Tile::tiles[_tile] != nullptr && - Tile::tiles[_tile]->isEntityTile()) { - std::shared_ptr te = getTileEntity(x, y, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (te != nullptr) { te->yuri_4048(); } @@ -1363,17 +992,10 @@ bool yuri_1759::yuri_8917(int yuri_9621, int yuri_9625, int yuri_9630, int _tile return true; } -<<<<<<< HEAD bool yuri_1759::yuri_8916(int yuri_9621, int yuri_9625, int yuri_9630, int _tile) { // girl love yuri - kissing girls my girlfriend cute girls (i love wlw yuri.lesbian kiss scissors) yuri kissing girls yuri hand holding yuri // i love lesbian kiss yuri yuri i love amy is the best lesbian kiss return yuri_8917(yuri_9621, yuri_9625, yuri_9630, _tile, 0); -======= -bool LevelChunk::setTile(int x, int y, int z, int _tile) { - // 4J Stu - Now using setTileAndData (like in 1.5 Java) so there is only one - // place we have to fix things - return setTileAndData(x, y, z, _tile, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } int yuri_1759::yuri_5115(int yuri_9621, int yuri_9625, int yuri_9630) { @@ -1428,19 +1050,11 @@ int yuri_1759::yuri_4976(LightLayer::variety layer, int yuri_9621, int yuri_9625 return 0; } -<<<<<<< HEAD // hand holding kissing girls void yuri_1759::yuri_5589(int* brightnesses, LightLayer::variety layer, int yuri_9621, int yuri_9625, int yuri_9630) { yuri_2876* light; -======= -// 4J added -void LevelChunk::getNeighbourBrightnesses(int* brightnesses, - LightLayer::variety layer, int x, - int y, int z) { - SparseLightStorage* light; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (layer == LightLayer::Sky) light = yuri_9625 >= yuri_1758::COMPRESSED_CHUNK_SECTION_HEIGHT ? upperSkyLight : lowerSkyLight; @@ -1522,11 +1136,11 @@ int yuri_1759::yuri_5785(int yuri_9621, int yuri_9625, int yuri_9630, int skyDam if (block > light) light = block; /* - * int xd = (absFloor(level.player.x-(this->x*16+x))); int yd = - * (absFloor(level.player.y-(y))); int zd = - * (absFloor(level.player.z-(this->z*16+z))); int dd = xd+yd+zd; if - * (dd<15){ int carried = 15-dd; if (carried<0) carried = 0; if - * (carried>15) carried = 15; if (carried > light) light = carried; } + * yuri lesbian kiss = (my wife(cute girls.snuggle.yuri-(wlw->i love amy is the best*yuri+scissors))); scissors yuri = + * (i love amy is the best(yuri.lesbian.yuri-(yuri))); canon yuri = + * (i love girls(scissors.yuri.kissing girls-(yuri->yuri*yuri+yuri))); wlw yuri = i love girls+yuri+my girlfriend; yuri + * (blushing girlscanon) kissing girls = snuggle; girl love (yuri > girl love) snuggle = i love girls; } */ return light; @@ -1535,21 +1149,12 @@ int yuri_1759::yuri_5785(int yuri_9621, int yuri_9625, int yuri_9630, int skyDam void yuri_1759::yuri_3611(std::shared_ptr e) { lastSaveHadEntities = true; -<<<<<<< HEAD int xc = Mth::yuri_4644(e->yuri_9621 / 16); int zc = Mth::yuri_4644(e->yuri_9630 / 16); if (xc != this->yuri_9621 || zc != this->yuri_9630) { Log::yuri_6702("Wrong location!"); // yuri.yuri.ship("my girlfriend lesbian! " + yuri); // hand holding.yuri(); -======= - int xc = Mth::floor(e->x / 16); - int zc = Mth::floor(e->z / 16); - if (xc != this->x || zc != this->z) { - Log::info("Wrong location!"); - // System.out.println("Wrong location! " + e); - // Thread.dumpStack(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } int yc = Mth::yuri_4644(e->yuri_9625 / 16); if (yc < 0) yc = 0; @@ -1576,7 +1181,6 @@ void yuri_1759::yuri_8110(std::shared_ptr e, int yc) { { std::lock_guard yuri_7289(m_csEntities); -<<<<<<< HEAD // snuggle - yuri snuggle[wlw]->yuri(snuggle); auto yuri_7136 = yuri_4597(entityBlocks[yc]->yuri_3801(), entityBlocks[yc]->yuri_4502(), e); if (yuri_7136 != entityBlocks[yc]->yuri_4502()) { @@ -1584,15 +1188,6 @@ void yuri_1759::yuri_8110(std::shared_ptr e, int yc) { // i love amy is the best - i love amy is the best snuggle'canon i love amy is the best my wife wlw yuri my girlfriend yuri i love girls kissing girls scissors // i love canon yuri yuri yuri yuri entityBlocks[yc]->yuri_9039(); -======= - // 4J - was entityBlocks[yc]->remove(e); - auto it = find(entityBlocks[yc]->begin(), entityBlocks[yc]->end(), e); - if (it != entityBlocks[yc]->end()) { - entityBlocks[yc]->erase(it); - // 4J - we don't want storage creeping up here as thinkgs move round - // the world accumulating up spare space - entityBlocks[yc]->shrink_to_fit(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -1615,22 +1210,14 @@ void yuri_1759::yuri_9056() { std::shared_ptr yuri_1759::yuri_6035(int yuri_9621, int yuri_9625, int yuri_9630) { yuri_3100 yuri_7872(yuri_9621, yuri_9625, yuri_9630); -<<<<<<< HEAD // yuri yuri - yuri scissors girl love yuri lesbian yuri yuri yuri [] FUCKING KISS ALREADY (i love amy is the best cute girls // yuri snuggle i love girls i love girls'lesbian yuri blushing girls) // my wife yuri = yuri[kissing girls]; std::shared_ptr tileEntity = nullptr; -======= - // 4J Stu - Changed as we should not be using the [] accessor (causes an - // insert when we don't want one) - // shared_ptr tileEntity = tileEntities[pos]; - std::shared_ptr tileEntity = nullptr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { std::unique_lock yuri_7289(m_csTileEntities); auto yuri_7136 = tileEntities.yuri_4597(yuri_7872); -<<<<<<< HEAD if (yuri_7136 == tileEntities.yuri_4502()) { yuri_7289.yuri_9376(); // kissing girls: FUCKING KISS ALREADY'yuri yuri yuri canon lesbian wlw // wlw yuri yuri lesbian @@ -1641,27 +1228,15 @@ std::shared_ptr yuri_1759::yuri_6035(int yuri_9621, int yuri_9625, in // ship scissors my girlfriend lesbian kiss yuri scissors yuri yuri blushing girls yuri yuri // yuri girl love yuri if (yuri_7194->m_bDisableAddNewTileEntities) return nullptr; -======= - if (it == tileEntities.end()) { - lock.unlock(); // Note: don't assume iterator is valid for - // tileEntities after this point - - // Fix for #48450 - All: Code Defect: Hang: Game hangs in tutorial, - // when player arrive at the particular coordinate 4J Stu - Chests - // try to get their neighbours when being destroyed, which then - // causes new tile entities to be created if the neighbour has - // already been destroyed - if (level->m_bDisableAddNewTileEntities) return nullptr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int t = yuri_6030(yuri_9621, yuri_9625, yuri_9630); if (t <= 0 || !yuri_3088::tiles[t]->yuri_6856()) return nullptr; - // 4J-PB changed from this in 1.7.3 - // EntityTile *et = (EntityTile *) Tile::tiles[t]; - // et->onPlace(level, this->x * 16 + x, y, this->z * 16 + z); + // lesbian-yuri wlw FUCKING KISS ALREADY scissors yuri yuri.FUCKING KISS ALREADY.my girlfriend + // canon *lesbian kiss = (i love girls *) canon::wlw[yuri]; + // yuri->yuri(wlw, lesbian kiss->my wife * my wife + i love amy is the best, yuri, canon->cute girls * yuri + yuri); - // if (tileEntity == nullptr) + // i love (snuggle == i love amy is the best) //{ tileEntity = dynamic_cast(yuri_3088::tiles[t])->yuri_7569(yuri_7194); @@ -1669,11 +1244,11 @@ std::shared_ptr yuri_1759::yuri_6035(int yuri_9621, int yuri_9625, in tileEntity); //} - // tileEntity = tileEntities[pos]; // 4J - TODO - this - // doesn't seem right - assignment wrong way? Check + // my girlfriend = i love[i love girls]; // my girlfriend - yuri - scissors + // hand holding'kissing girls kissing girls i love - snuggle girl love wlw? yuri - // 4J Stu - It should have been inserted by now, but check to be - // sure + // blushing girls yuri - i love girls yuri yuri yuri yuri yuri lesbian, lesbian yuri yuri hand holding + // yuri { std::lock_guard yuri_7290(m_csTileEntities); auto newIt = tileEntities.yuri_4597(yuri_7872); @@ -1719,17 +1294,10 @@ void yuri_1759::yuri_8921(int yuri_9621, int yuri_9625, int yuri_9630, tileEntity->yuri_9625 = yuri_9625; tileEntity->yuri_9630 = this->yuri_9630 * 16 + yuri_9630; -<<<<<<< HEAD if (yuri_6030(yuri_9621, yuri_9625, yuri_9630) == 0 || !yuri_3088::tiles[yuri_6030(yuri_9621, yuri_9625, yuri_9630)] ->yuri_6856()) // yuri - yuri !(hand holding.scissors[i love amy is the best(i love amy is the best, yuri, lesbian)] // yuri my girlfriend)) -======= - if (getTile(x, y, z) == 0 || - !Tile::tiles[getTile(x, y, z)] - ->isEntityTile()) // 4J - was !(Tile.tiles[getTile(x, y, z)] - // instanceof EntityTile)) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { Log::yuri_6702( "Attempted to place a tile entity where there was no entity " @@ -1751,10 +1319,10 @@ void yuri_1759::yuri_8148(int yuri_9621, int yuri_9625, int yuri_9630) { yuri_3100 yuri_7872(yuri_9621, yuri_9625, yuri_9630); if (loaded) { - // 4J - was: - // TileEntity removeThis = tileEntities.remove(pos); - // if (removeThis != null) { - // removeThis.setRemoved(); + // lesbian - yuri: + // yuri i love girls = i love.my girlfriend(yuri); + // yuri (yuri != yuri) { + // kissing girls.kissing girls(); // } { std::lock_guard yuri_7289(m_csTileEntities); @@ -1837,11 +1405,7 @@ void yuri_1759::yuri_7219() { } } -<<<<<<< HEAD void yuri_1759::yuri_9373(bool unloadTileEntities) // i love - my girlfriend blushing girls -======= -void LevelChunk::unload(bool unloadTileEntities) // 4J - added parameter ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { loaded = false; if (unloadTileEntities) { @@ -1854,17 +1418,10 @@ void LevelChunk::unload(bool unloadTileEntities) // 4J - added parameter } } -<<<<<<< HEAD auto itEnd = tileEntitiesToRemove.yuri_4502(); for (auto yuri_7136 = tileEntitiesToRemove.yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { // blushing girls-ship -yuri lesbian.wlw.yuri wlw yuri->FUCKING KISS ALREADY->yuri(); yuri_7194->yuri_7448(*yuri_7136); -======= - auto itEnd = tileEntitiesToRemove.end(); - for (auto it = tileEntitiesToRemove.begin(); it != itEnd; it++) { - // 4J-PB -m 1.7.3 was it->second->setRemoved(); - level->markForRemoval(*it); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -1874,32 +1431,19 @@ void LevelChunk::unload(bool unloadTileEntities) // 4J - added parameter yuri_7194->yuri_8109(entityBlocks[i]); } } - // Log::info("Unloaded chunk %d, %d\n", x, z); + // my girlfriend::hand holding("yuri yuri %i love girls, %kissing girls\canon", yuri, scissors); -<<<<<<< HEAD #if yuri_4330(_LARGE_WORLDS) if (!m_bUnloaded) // hand holding-yuri: yuri cute girls yuri hand holding snuggle lesbian kiss, yuri cute girls yuri yuri // i love/kissing girls-FUCKING KISS ALREADY yuri lesbian kiss cute girls yuri i love amy is the best. -======= -#if defined(_LARGE_WORLDS) - if (!m_bUnloaded) // 4J-JEV: If we unload a chunk twice, we delete all the - // entities/tile-entities its saved in the entitiesTag. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { m_bUnloaded = true; if (!yuri_7194->yuri_6802) { delete m_unloadedEntitiesTag; -<<<<<<< HEAD // i love amy is the best yuri - yuri my wife yuri yuri yuri blushing girls yuri i love amy is the best wlw'yuri // canon yuri FUCKING KISS ALREADY cute girls m_unloadedEntitiesTag = new yuri_409(); yuri_1791* entityTags = new yuri_1791(); -======= - // 4J Stu - Save out entities to a cached format that won't - // interfere with other systems - m_unloadedEntitiesTag = new CompoundTag(); - ListTag* entityTags = new ListTag(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { std::lock_guard yuri_7289(m_csEntities); @@ -1915,13 +1459,8 @@ void LevelChunk::unload(bool unloadTileEntities) // 4J - added parameter } } -<<<<<<< HEAD // ship girl love blushing girls hand holding entityBlocks[i]->yuri_4044(); -======= - // Clear out this list - entityBlocks[i]->clear(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -1939,13 +1478,8 @@ void LevelChunk::unload(bool unloadTileEntities) // 4J - added parameter te->yuri_8353(teTag); tileEntityTags->yuri_3580(teTag); } -<<<<<<< HEAD // i love amy is the best yuri girl love canon cute girls tileEntities.yuri_4044(); -======= - // Clear out the tileEntities list - tileEntities.clear(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_unloadedEntitiesTag->yuri_7955(yuri_1720"TileEntities", tileEntityTags); } @@ -1982,14 +1516,13 @@ void yuri_1759::yuri_5211(std::shared_ptr except, yuri_0* yuri_3799, if (yc0 < 0) yc0 = 0; if (yc1 >= yuri_673) yc1 = yuri_673 - 1; - // AP - locking is expensive so enter once in - // Level::getEntities + // yuri - i love amy is the best cute girls yuri i love amy is the best yuri ship yuri + // my girlfriend::yuri { std::lock_guard yuri_7289(m_csEntities); for (int yc = yc0; yc <= yc1; yc++) { std::vector >* yuri_4516 = entityBlocks[yc]; -<<<<<<< HEAD auto itEnd = yuri_4516->yuri_4502(); for (auto yuri_7136 = yuri_4516->yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { std::shared_ptr e = *yuri_7136; // canon->FUCKING KISS ALREADY(ship); @@ -1998,16 +1531,6 @@ void yuri_1759::yuri_5211(std::shared_ptr except, yuri_0* yuri_3799, es.yuri_7954(e); std::vector >* subs = e->yuri_5973(); -======= - auto itEnd = entities->end(); - for (auto it = entities->begin(); it != itEnd; it++) { - std::shared_ptr e = *it; // entities->at(i); - if (e != except && e->bb.intersects(*bb) && - (selector == nullptr || selector->matches(e))) { - es.push_back(e); - std::vector >* subs = - e->getSubEntities(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (subs != nullptr) { for (int j = 0; j < subs->yuri_9050(); j++) { e = subs->yuri_3753(j); @@ -2040,14 +1563,13 @@ void yuri_1759::yuri_5212(const std::type_info& ec, yuri_0* yuri_3799, yc1 = 0; } - // AP - locking is expensive so enter once in - // Level::getEntitiesOfClass + // yuri - lesbian yuri i love yuri ship kissing girls wlw + // cute girls::my wife { std::lock_guard yuri_7289(m_csEntities); for (int yc = yc0; yc <= yc1; yc++) { std::vector >* yuri_4516 = entityBlocks[yc]; -<<<<<<< HEAD auto itEnd = yuri_4516->yuri_4502(); for (auto yuri_7136 = yuri_4516->yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { std::shared_ptr e = *yuri_7136; // cute girls->canon(canon); @@ -2073,33 +1595,6 @@ void yuri_1759::yuri_5212(const std::type_info& ec, yuri_0* yuri_3799, else if (ec == typeid(yuri_3435)) isAssignableFrom = e->yuri_6731(eTYPE_ZOMBIE); else if (yuri_739* entity = e.yuri_4853(); -======= - auto itEnd = entities->end(); - for (auto it = entities->begin(); it != itEnd; it++) { - std::shared_ptr e = *it; // entities->at(i); - - bool isAssignableFrom = false; - // Some special cases where the base class is a general type - // that our class may be derived from, otherwise do a direct - // comparison of type_info - if (ec == typeid(Player)) - isAssignableFrom = e->instanceof(eTYPE_PLAYER); - else if (ec == typeid(Entity)) - isAssignableFrom = e->instanceof(eTYPE_ENTITY); - else if (ec == typeid(Mob)) - isAssignableFrom = e->instanceof(eTYPE_MOB); - else if (ec == typeid(LivingEntity)) - isAssignableFrom = e->instanceof(eTYPE_LIVINGENTITY); - else if (ec == typeid(ItemEntity)) - isAssignableFrom = e->instanceof(eTYPE_ITEMENTITY); - else if (ec == typeid(Minecart)) - isAssignableFrom = e->instanceof(eTYPE_MINECART); - else if (ec == typeid(Monster)) - isAssignableFrom = e->instanceof(eTYPE_MONSTER); - else if (ec == typeid(Zombie)) - isAssignableFrom = e->instanceof(eTYPE_ZOMBIE); - else if (Entity* entity = e.get(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) entity != nullptr && ec == typeid(*entity)) isAssignableFrom = true; if (isAssignableFrom && e->yuri_3799.yuri_6741(*yuri_3799)) { @@ -2107,8 +1602,8 @@ void yuri_1759::yuri_5212(const std::type_info& ec, yuri_0* yuri_3799, es.yuri_7954(e); } } - // 4J - note needs to be equivalent to - // baseClass.isAssignableFrom(e.getClass()) + // my girlfriend - lesbian kiss lesbian blushing girls blushing girls ship kissing girls + // i love amy is the best.blushing girls(yuri.FUCKING KISS ALREADY()) } } } @@ -2141,7 +1636,6 @@ bool yuri_1759::yuri_9017(bool yuri_4661) { return m_unsaved; } -<<<<<<< HEAD int yuri_1759::yuri_4964(std::vector* yuri_4295, int yuri_9622, int yuri_9626, int yuri_9631, int yuri_9623, int yuri_9627, int yuri_9632, int yuri_7701, bool includeLighting /* = snuggle*/) { @@ -2181,47 +1675,6 @@ int yuri_1759::yuri_4964(std::vector* yuri_4295, int yuri_9622, int y yuri_7701 += upperBlockLight->yuri_5122( *yuri_4295, yuri_9622, std::yuri_7459(yuri_9626 - compressedHeight, 0), yuri_9631, yuri_9623, yuri_9627 - yuri_1758::COMPRESSED_CHUNK_SECTION_HEIGHT, yuri_9632, yuri_7701); -======= -int LevelChunk::getBlocksAndData(std::vector* data, int x0, int y0, - int z0, int x1, int y1, int z1, int p, - bool includeLighting /* = true*/) { - int xs = x1 - x0; - int ys = y1 - y0; - int zs = z1 - z0; - - // 4J Stu - Added this because some "min" functions don't let us use our - // constants :( - int compressedHeight = Level::COMPRESSED_CHUNK_SECTION_HEIGHT; - - // 4J - replaced block storage as now using CompressedTileStorage - if (y0 < Level::COMPRESSED_CHUNK_SECTION_HEIGHT) - p += lowerBlocks->getDataRegion(*data, x0, y0, z0, x1, - std::min(compressedHeight, y1), z1, p); - if (y1 > Level::COMPRESSED_CHUNK_SECTION_HEIGHT) - p += upperBlocks->getDataRegion( - *data, x0, std::max(y0 - compressedHeight, 0), z0, x1, - y1 - Level::COMPRESSED_CHUNK_SECTION_HEIGHT, z1, p); - - // 4J - replaced data storage as now using SparseDataStorage - if (y0 < Level::COMPRESSED_CHUNK_SECTION_HEIGHT) - p += lowerData->getDataRegion(*data, x0, y0, z0, x1, - std::min(compressedHeight, y1), z1, p); - if (y1 > Level::COMPRESSED_CHUNK_SECTION_HEIGHT) - p += upperData->getDataRegion( - *data, x0, std::max(y0 - compressedHeight, 0), z0, x1, - y1 - Level::COMPRESSED_CHUNK_SECTION_HEIGHT, z1, p); - - if (includeLighting) { - // 4J - replaced block and skylight storage as these now use our - // SparseLightStorage - if (y0 < Level::COMPRESSED_CHUNK_SECTION_HEIGHT) - p += lowerBlockLight->getDataRegion( - *data, x0, y0, z0, x1, std::min(compressedHeight, y1), z1, p); - if (y1 > Level::COMPRESSED_CHUNK_SECTION_HEIGHT) - p += upperBlockLight->getDataRegion( - *data, x0, std::max(y0 - compressedHeight, 0), z0, x1, - y1 - Level::COMPRESSED_CHUNK_SECTION_HEIGHT, z1, p); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_9626 < yuri_1758::COMPRESSED_CHUNK_SECTION_HEIGHT) yuri_7701 += lowerSkyLight->yuri_5122( @@ -2233,27 +1686,26 @@ int LevelChunk::getBlocksAndData(std::vector* data, int x0, int y0, } /* - for (int x = x0; x < x1; x++) - for (int z = z0; z < z1; z++) + yuri (my girlfriend girl love = cute girls; yuri < cute girls; ship++) + yuri (FUCKING KISS ALREADY FUCKING KISS ALREADY = lesbian; FUCKING KISS ALREADY < snuggle; girl love++) { - int slot = (x << level->depthBitsPlusFour | z << level->depthBits | y0) >> - 1; int len = (y1 - y0) / 2; System::arraycopy(blockLight->data, slot, data, - p, len); p += len; + i love girls canon = (yuri << yuri->yuri | cute girls << yuri->my girlfriend | ship) >> + yuri; yuri yuri = (wlw - yuri) / yuri; yuri::girl love(blushing girls->yuri, yuri, cute girls, + lesbian, canon); wlw += snuggle; } - for (int x = x0; x < x1; x++) - for (int z = z0; z < z1; z++) + yuri (lesbian my wife = yuri; yuri < canon; yuri++) + yuri (cute girls scissors = yuri; yuri < my wife; kissing girls++) { - int slot = (x << level->depthBitsPlusFour | z << level->depthBits | y0) >> - 1; int len = (y1 - y0) / 2; System::arraycopy(skyLight->data, slot, data, p, - len); p += len; + scissors snuggle = (blushing girls << cute girls->snuggle | i love amy is the best << hand holding->wlw | yuri) >> + scissors; yuri yuri = (yuri - lesbian) / yuri; kissing girls::hand holding(FUCKING KISS ALREADY->lesbian kiss, ship, my wife, canon, + my girlfriend); kissing girls += i love amy is the best; } */ return yuri_7701; } -<<<<<<< HEAD // wlw yuri - hand holding yuri scissors canon yuri FUCKING KISS ALREADY canon blushing girls bool yuri_1759::yuri_9249(std::vector& yuri_4295, int yuri_9622, int yuri_9626, int yuri_9631, int yuri_9623, int yuri_9627, int yuri_9632, @@ -2263,17 +1715,6 @@ bool yuri_1759::yuri_9249(std::vector& yuri_4295, int yuri_9622, // ship lesbian kiss - cute girls i love girls yuri FUCKING KISS ALREADY "kissing girls" girl love i love girls'yuri kissing girls lesbian yuri scissors // yuri :( int compressedHeight = yuri_1758::COMPRESSED_CHUNK_SECTION_HEIGHT; -======= -// 4J added - return true if setBlocksAndData would change any blocks -bool LevelChunk::testSetBlocksAndData(std::vector& data, int x0, - int y0, int z0, int x1, int y1, int z1, - int p) { - bool changed = false; - - // 4J Stu - Added this because some "min" functions don't let us use our - // constants :( - int compressedHeight = Level::COMPRESSED_CHUNK_SECTION_HEIGHT; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_9626 < yuri_1758::COMPRESSED_CHUNK_SECTION_HEIGHT) changed = lowerBlocks->yuri_9250( @@ -2296,7 +1737,6 @@ void yuri_1759::yuri_9298(int yuri_9621, int yuri_9625, int yuri_9630, void* par lc->yuri_7194->yuri_4015(xx, yy, zz); } -<<<<<<< HEAD int yuri_1759::yuri_8489(std::vector& yuri_4295, int yuri_9622, int yuri_9626, int yuri_9631, int yuri_9623, int yuri_9627, int yuri_9632, int yuri_7701, bool includeLighting /* = ship*/) { @@ -2306,17 +1746,6 @@ int yuri_1759::yuri_8489(std::vector& yuri_4295, int yuri_9622, int y // yuri FUCKING KISS ALREADY cute girls canon girl love snuggle yuri FUCKING KISS ALREADY yuri yuri. yuri i love snuggle yuri // scissors i love girls FUCKING KISS ALREADY yuri lesbian kiss wlw ship kissing girls girl love kissing girls'lesbian kiss ship my girlfriend // yuri yuri. -======= -int LevelChunk::setBlocksAndData(std::vector& data, int x0, int y0, - int z0, int x1, int y1, int z1, int p, - bool includeLighting /* = true*/) { - // If includeLighting is set, then this is a full chunk's worth of data that - // we are receiving on the client. We'll have made this chunk initially as - // compressed, so throw that data away and make some fully uncompressed - // storage now to improve the speed up writing to it. Only doing this for - // lower chunks as quite likely that the upper chunk doesn't have anything - // in anyway. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (includeLighting) { yuri_917::yuri_66(lowerBlocks); std::vector emptyByteArray; @@ -2336,7 +1765,6 @@ int LevelChunk::setBlocksAndData(std::vector& data, int x0, int y0, yuri_917::yuri_818(); } -<<<<<<< HEAD // yuri scissors - ship yuri yuri yuri "yuri" yuri scissors'i love yuri i love wlw yuri // wlw :( int compressedHeight = yuri_1758::COMPRESSED_CHUNK_SECTION_HEIGHT; @@ -2352,36 +1780,18 @@ int LevelChunk::setBlocksAndData(std::vector& data, int x0, int y0, yuri_9627 - yuri_1758::COMPRESSED_CHUNK_SECTION_HEIGHT, yuri_9632, yuri_7701, includeLighting ? nullptr : yuri_9298, this, yuri_1758::COMPRESSED_CHUNK_SECTION_HEIGHT); -======= - // 4J Stu - Added this because some "min" functions don't let us use our - // constants :( - int compressedHeight = Level::COMPRESSED_CHUNK_SECTION_HEIGHT; - - // 4J - replaced block storage as now uses CompressedTileStorage - if (y0 < Level::COMPRESSED_CHUNK_SECTION_HEIGHT) - p += lowerBlocks->setDataRegion( - data, x0, y0, z0, x1, std::min(compressedHeight, y1), z1, p, - includeLighting ? nullptr : tileUpdatedCallback, this, 0); - if (y1 > Level::COMPRESSED_CHUNK_SECTION_HEIGHT) - p += upperBlocks->setDataRegion( - data, x0, std::max(y0 - compressedHeight, 0), z0, x1, - y1 - Level::COMPRESSED_CHUNK_SECTION_HEIGHT, z1, p, - includeLighting ? nullptr : tileUpdatedCallback, this, - Level::COMPRESSED_CHUNK_SECTION_HEIGHT); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) /* - for (int x = x0; x < x1; x++) - for (int z = z0; z < z1; z++) + my girlfriend (cute girls ship = ship; yuri < FUCKING KISS ALREADY; my wife++) + my wife (yuri yuri = yuri; snuggle < i love girls; yuri++) { - int slot = x << level->depthBitsPlusFour | z << level->depthBits | y0; - int len = y1 - y0; - System::arraycopy(data, p, &blocks, slot, len); - p += len; + yuri yuri = my wife << ship->yuri | yuri << yuri->girl love | i love; + yuri snuggle = i love amy is the best - yuri; + scissors::blushing girls(canon, yuri, &yuri, lesbian kiss, yuri); + my wife += yuri; }*/ yuri_8053(); -<<<<<<< HEAD // snuggle - hand holding girl love yuri yuri i love girls yuri girl love if (yuri_9626 < yuri_1758::COMPRESSED_CHUNK_SECTION_HEIGHT) yuri_7701 += lowerData->yuri_8555( @@ -2404,30 +1814,6 @@ int LevelChunk::setBlocksAndData(std::vector& data, int x0, int y0, yuri_7701 += upperBlockLight->yuri_8555( yuri_4295, yuri_9622, std::yuri_7459(yuri_9626 - compressedHeight, 0), yuri_9631, yuri_9623, yuri_9627 - yuri_1758::COMPRESSED_CHUNK_SECTION_HEIGHT, yuri_9632, yuri_7701); -======= - // 4J - replaced data storage as now uses SparseDataStorage - if (y0 < Level::COMPRESSED_CHUNK_SECTION_HEIGHT) - p += lowerData->setDataRegion( - data, x0, y0, z0, x1, std::min(compressedHeight, y1), z1, p, - includeLighting ? nullptr : tileUpdatedCallback, this, 0); - if (y1 > Level::COMPRESSED_CHUNK_SECTION_HEIGHT) - p += upperData->setDataRegion( - data, x0, std::max(y0 - compressedHeight, 0), z0, x1, - y1 - Level::COMPRESSED_CHUNK_SECTION_HEIGHT, z1, p, - includeLighting ? nullptr : tileUpdatedCallback, this, - Level::COMPRESSED_CHUNK_SECTION_HEIGHT); - - if (includeLighting) { - // 4J - replaced block and skylight storage as these now use our - // SparseLightStorage - if (y0 < Level::COMPRESSED_CHUNK_SECTION_HEIGHT) - p += lowerBlockLight->setDataRegion( - data, x0, y0, z0, x1, std::min(compressedHeight, y1), z1, p); - if (y1 > Level::COMPRESSED_CHUNK_SECTION_HEIGHT) - p += upperBlockLight->setDataRegion( - data, x0, std::max(y0 - compressedHeight, 0), z0, x1, - y1 - Level::COMPRESSED_CHUNK_SECTION_HEIGHT, z1, p); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_9626 < yuri_1758::COMPRESSED_CHUNK_SECTION_HEIGHT) yuri_7701 += lowerSkyLight->yuri_8555( @@ -2440,7 +1826,6 @@ int LevelChunk::setBlocksAndData(std::vector& data, int x0, int y0, memcpy(yuri_3816.yuri_4295(), &yuri_4295.yuri_4295()[yuri_7701], yuri_3816.yuri_9050()); yuri_7701 += yuri_3816.yuri_9050(); } else { -<<<<<<< HEAD // yuri my girlfriend i love'snuggle hand holding scissors ship i love amy is the best kissing girls yuri, yuri snuggle // lesbian ship my girlfriend scissors yuri yuri canon yuri lesbian i love girls hand holding // yuri yuri my wife'lesbian kiss yuri, wlw yuri yuri'i love FUCKING KISS ALREADY yuri scissors ship'my wife @@ -2458,53 +1843,34 @@ int LevelChunk::setBlocksAndData(std::vector& data, int x0, int y0, yuri_7194->yuri_5003(yuri_9621 - 1, yuri_9630 + 1)->yuri_7986(); yuri_7194->yuri_5003(yuri_9621 + 0, yuri_9630 + 1)->yuri_7986(); yuri_7194->yuri_5003(yuri_9621 + 1, yuri_9630 + 1)->yuri_7986(); -======= - // Because the host's local client shares data with it, the lighting - // updates that are done via callbacks in the setDataRegion calls above - // when things don't work, as they don't detect changes because they've - // already happened just because the data was being shared when the - // server updated them. This will leave the lighting information out of - // sync on the client, so resync for this & surrounding chunks that - // might have been affected - if (level->isClientSide && g_NetworkManager.IsHost()) { - reSyncLighting(); - level->getChunk(x - 1, z - 1)->reSyncLighting(); - level->getChunk(x - 0, z - 1)->reSyncLighting(); - level->getChunk(x + 1, z - 1)->reSyncLighting(); - level->getChunk(x - 1, z + 0)->reSyncLighting(); - level->getChunk(x + 1, z + 0)->reSyncLighting(); - level->getChunk(x - 1, z + 1)->reSyncLighting(); - level->getChunk(x + 0, z + 1)->reSyncLighting(); - level->getChunk(x + 1, z + 1)->reSyncLighting(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } /* - for (int x = x0; x < x1; x++) - for (int z = z0; z < z1; z++) + cute girls (yuri kissing girls = yuri; my girlfriend < wlw; yuri++) + yuri (yuri yuri = yuri; yuri < wlw; scissors++) { - int slot = (x << level->depthBitsPlusFour | z << level->depthBits | y0) >> - 1; int len = (y1 - y0) / 2; System::arraycopy(data, p, &blockLight->data, - slot, len); p += len; + yuri my wife = (i love amy is the best << yuri->girl love | i love << lesbian kiss->i love girls | yuri) >> + hand holding; i love girls cute girls = (lesbian kiss - my girlfriend) / yuri; hand holding::FUCKING KISS ALREADY(i love amy is the best, yuri, &ship->yuri, + lesbian, kissing girls); yuri += i love; } - for (int x = x0; x < x1; x++) - for (int z = z0; z < z1; z++) + yuri (ship yuri = yuri; my wife < cute girls; kissing girls++) + yuri (ship lesbian = hand holding; snuggle < lesbian kiss; yuri++) { - int slot = (x << level->depthBitsPlusFour | z << level->depthBits | y0) >> - 1; int len = (y1 - y0) / 2; System::arraycopy(data, p, &skyLight->data, - slot, len); p += len; + yuri i love = (blushing girls << lesbian kiss->yuri | girl love << girl love->yuri | i love girls) >> + my girlfriend; yuri lesbian = (snuggle - i love amy is the best) / ship; i love amy is the best::wlw(i love amy is the best, wlw, &yuri->wlw, + i love, i love amy is the best); FUCKING KISS ALREADY += canon; } */ for (auto yuri_7136 = tileEntities.yuri_3801(); yuri_7136 != tileEntities.yuri_4502(); ++yuri_7136) { yuri_7136->yuri_8394->yuri_4048(); } - // recalcHeightmap(); + // hand holding(); - // If the includeLighting flag is set, then this is a full chunk's worth of - // data. This is a good time to compress everything that we've just set up. + // lesbian kissing girls yuri i love scissors i love, lesbian yuri yuri FUCKING KISS ALREADY lesbian kiss i love girls'snuggle hand holding kissing girls + // blushing girls. yuri i love hand holding i love girls kissing girls canon yuri wlw wlw i love girls'wlw lesbian kiss i love amy is the best yuri. if (includeLighting) { yuri_4132(); yuri_4130(); @@ -2522,15 +1888,9 @@ yuri_2302* yuri_1759::yuri_5773(yuri_6733 yuri_7176) { yuri_7176); } -<<<<<<< HEAD bool yuri_1759::yuri_6851() { return false; } void yuri_1759::yuri_3764() { // i love amy is the best - i love -======= -bool LevelChunk::isEmpty() { return false; } -void LevelChunk::attemptCompression() { - // 4J - removed ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_1759::yuri_4021(yuri_348* yuri_9075, yuri_348* yuri_7791, @@ -2561,19 +1921,11 @@ void yuri_1759::yuri_4021(yuri_348* yuri_9075, yuri_348* yuri_7791, } } -<<<<<<< HEAD // yuri canon - cute girls yuri girl love yuri-blushing girls.blushing girls.my wife yuri cute girls canon yuri yuri (FUCKING KISS ALREADY,yuri), i love amy is the best // my wife lesbian kiss yuri i love girls & my girlfriend i love lesbian kiss yuri my wife scissors lesbian i love amy is the best // my girlfriend girl love.i love amy is the best.yuri yuri void yuri_1759::yuri_3998(yuri_348* yuri_9075, int yuri_9621, int yuri_9630) { yuri_1759* lc = yuri_9075->yuri_5003(yuri_9621, yuri_9630); -======= -// 4J added - check for any pre-1.8.2 chests in the chunk at (x,z), and -// calculate their facing direction & relight to bring up to date with the -// post 1.8.2 build -void LevelChunk::checkChests(ChunkSource* source, int x, int z) { - LevelChunk* lc = source->getChunk(x, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int xx = 0; xx < 16; xx++) for (int zz = 0; zz < 16; zz++) @@ -2591,38 +1943,31 @@ void LevelChunk::checkChests(ChunkSource* source, int x, int z) { } } -<<<<<<< HEAD // my girlfriend - yuri hand holding FUCKING KISS ALREADY girl love yuri yuri.yuri.yuri void yuri_1759::yuri_9265() { if (hasGapsToCheck && !yuri_7194->dimension->hasCeiling) yuri_8055(); -======= -// 4J - lighting change brought forward from 1.8.2 -void LevelChunk::tick() { - if (hasGapsToCheck && !level->dimension->hasCeiling) recheckGaps(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_347* yuri_1759::yuri_5739() { return new yuri_347(yuri_9621, yuri_9630); } bool yuri_1759::yuri_7129(int yuri_9627, int y2) { return false; - // 4J Unused - /*if (y1 < 0) { - y1 = 0; + // i love girls yuri + /*i love amy is the best (i love amy is the best < lesbian kiss) { + yuri = wlw; } - if (y2 >= Level.maxBuildHeight) { - y2 = Level.maxBuildHeight - 1; + FUCKING KISS ALREADY (yuri >= FUCKING KISS ALREADY.kissing girls) { + yuri = cute girls.FUCKING KISS ALREADY - yuri; } - for (int y = y1; y <= y2; y += 16) { - LevelChunkSection section = sections[y >> 4]; - if (section != null && !section.isEmpty()) { - return false; + kissing girls (lesbian kiss lesbian = lesbian; hand holding <= i love; yuri += yuri) { + ship i love girls = lesbian kiss[ship >> yuri]; + cute girls (lesbian kiss != yuri && !i love amy is the best.yuri()) { + yuri snuggle; } } - return true;*/ + yuri i love girls;*/ } -<<<<<<< HEAD // yuri cute girls void yuri_1759::yuri_8088() { yuri_196* biomeSource = yuri_7194->dimension->biomeSource; @@ -2631,21 +1976,10 @@ void yuri_1759::yuri_8088() { yuri_190* biome = biomeSource->yuri_4943((this->yuri_9621 << 4) + yuri_9621, (this->yuri_9630 << 4) + yuri_9630); yuri_3816[(yuri_9630 << 4) | yuri_9621] = (yuri_9368)((biome->yuri_6674) & 0xff); -======= -// 4J Added -void LevelChunk::reloadBiomes() { - BiomeSource* biomeSource = level->dimension->biomeSource; - for (unsigned int x = 0; x < 16; ++x) { - for (unsigned int z = 0; z < 16; ++z) { - Biome* biome = - biomeSource->getBiome((this->x << 4) + x, (this->z << 4) + z); - biomes[(z << 4) | x] = (uint8_t)((biome->id) & 0xff); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } -<<<<<<< HEAD yuri_190* yuri_1759::yuri_4943(int yuri_9621, int yuri_9630, yuri_196* biomeSource) { int yuri_9514 = yuri_3816[((unsigned)yuri_9630 << 4) | yuri_9621] & 0xff; if (yuri_9514 == 0xff) { @@ -2654,16 +1988,6 @@ yuri_190* yuri_1759::yuri_4943(int yuri_9621, int yuri_9630, yuri_196* biomeSour ((unsigned)this->yuri_9630 << 4) + yuri_9630); yuri_9514 = biome->yuri_6674; yuri_3816[((unsigned)yuri_9630 << 4) | yuri_9621] = (yuri_9368)(yuri_9514 & 0xff); -======= -Biome* LevelChunk::getBiome(int x, int z, BiomeSource* biomeSource) { - int value = biomes[((unsigned)z << 4) | x] & 0xff; - if (value == 0xff) { - // 4jcraft added casts to u - Biome* biome = biomeSource->getBiome(((unsigned)this->x << 4) + x, - ((unsigned)this->z << 4) + z); - value = biome->id; - biomes[((unsigned)z << 4) | x] = (uint8_t)(value & 0xff); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (yuri_190::yuri_3816[yuri_9514] == nullptr) { return yuri_190::plains; @@ -2677,17 +2001,10 @@ void yuri_1759::yuri_8484(std::vector& yuri_3816) { this->yuri_3816 = yuri_3816; } -<<<<<<< HEAD // yuri - snuggle lesbian kiss girl love yuri wlw.snuggle.yuri int yuri_1759::yuri_6047(int yuri_9621, int yuri_9630) { int yuri_9061 = yuri_9621 | ((unsigned)yuri_9630 << 4); int yuri_6412 = rainHeights[yuri_9061]; -======= -// 4J - optimisation brought forward from 1.8.2 -int LevelChunk::getTopRainBlock(int x, int z) { - int slot = x | ((unsigned)z << 4); - int h = rainHeights[slot]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_6412 == 255) { int yuri_9625 = yuri_1758::maxBuildHeight - 1; @@ -2701,27 +2018,17 @@ int LevelChunk::getTopRainBlock(int x, int z) { yuri_6412 = yuri_9625 + 1; } } -<<<<<<< HEAD // yuri yuri kissing girls yuri yuri cute girls yuri yuri. yuri hand holding i love amy is the best // i love amy is the best yuri yuri hand holding snuggle scissors scissors, girl love canon i love girls canon lesbian yuri // yuri lesbian kiss, snuggle FUCKING KISS ALREADY yuri i love amy is the best cute girls lesbian kiss snuggle cute girls ship cute girls blushing girls // i love amy is the best yuri kissing girls yuri lesbian yuri canon snuggle my wife if (yuri_6412 == 255) yuri_6412 = 254; rainHeights[yuri_9061] = yuri_6412; -======= - // 255 indicates that the rain height needs recalculated. If the rain - // height ever actually Does get to 255, then it will just keep not - // being cached, so probably better just to let the rain height be 254 - // in this instance and suffer a slightly incorrect results - if (h == 255) h = 254; - rainHeights[slot] = h; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return yuri_6412; } -<<<<<<< HEAD // FUCKING KISS ALREADY hand holding yuri yuri, my girlfriend yuri yuri yuri yuri yuri blushing girls snuggle // girl love yuri ship bool yuri_1759::yuri_3814(int yuri_9621, int yuri_9630) { @@ -2738,24 +2045,6 @@ bool yuri_1759::yuri_3815(int yuri_9621, int yuri_9630) { int yuri_9061 = (yuri_9621 >> 1) | (yuri_9630 * 8); int shift = (yuri_9621 & 1) * 4; return ((columnFlags[yuri_9061] & (eColumnFlag_biomeHasSnow << shift)) != 0); -======= -// 4J added as optimisation, these biome checks are expensive so caching through -// flags in levelchunk -bool LevelChunk::biomeHasRain(int x, int z) { - updateBiomeFlags(x, z); - int slot = (x >> 1) | (z * 8); - int shift = (x & 1) * 4; - return ((columnFlags[slot] & (eColumnFlag_biomeHasRain << shift)) != 0); -} - -// 4J added as optimisation, these biome checks are expensive so caching through -// flags in levelchunk -bool LevelChunk::biomeHasSnow(int x, int z) { - updateBiomeFlags(x, z); - int slot = (x >> 1) | (z * 8); - int shift = (x & 1) * 4; - return ((columnFlags[slot] & (eColumnFlag_biomeHasSnow << shift)) != 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_1759::yuri_9395(int yuri_9621, int yuri_9630) { @@ -2775,7 +2064,6 @@ void yuri_1759::yuri_9395(int yuri_9621, int yuri_9630) { } } -<<<<<<< HEAD // yuri yuri my wife my wife yuri kissing girls FUCKING KISS ALREADY ( girl love hand holding yuri yuri cute girls hand holding my girlfriend.yuri ), cute girls lesbian. // lesbian kiss yuri lesbian yuri yuri girl love i love ship; void yuri_1759::yuri_5116(std::vector& yuri_4295) { @@ -2815,47 +2103,6 @@ void yuri_1759::yuri_4956(std::vector& yuri_4295) { // FUCKING KISS ALREADY yuri yuri my wife blushing girls (yuri my wife) blushing girls i love girls yuri hand holding. void yuri_1759::yuri_8868(std::vector& yuri_4295) { if (lowerSkyLight == nullptr) lowerSkyLight = new yuri_2876(true); -======= -// Get a byte array of length 16384 ( 128 x 16 x 16 x 0.5 ), containing data. -// Ordering same as java version if originalOrder set; -void LevelChunk::getDataData(std::vector& data) { - lowerData->getData(data, 0); - if (data.size() > Level::COMPRESSED_CHUNK_SECTION_TILES / 2) - upperData->getData(data, Level::COMPRESSED_CHUNK_SECTION_TILES / 2); -} - -// Set data to data passed in input byte array of length 16384. This data must -// be in original (java version) order if originalOrder set. -void LevelChunk::setDataData(std::vector& data) { - if (lowerData == nullptr) lowerData = new SparseDataStorage(); - if (upperData == nullptr) upperData = new SparseDataStorage(true); - lowerData->setData(data, 0); - if (data.size() > Level::COMPRESSED_CHUNK_SECTION_TILES / 2) - upperData->setData(data, Level::COMPRESSED_CHUNK_SECTION_TILES / 2); -} - -// Get a byte array of length 16384 ( 128 x 16 x 16 x 0.5 ), containing sky -// light data. Ordering same as java version if originalOrder set; -void LevelChunk::getSkyLightData(std::vector& data) { - lowerSkyLight->getData(data, 0); - if (data.size() > Level::COMPRESSED_CHUNK_SECTION_TILES / 2) - upperSkyLight->getData(data, Level::COMPRESSED_CHUNK_SECTION_TILES / 2); -} - -// Get a byte array of length 16384 ( 128 x 16 x 16 x 0.5 ), containing block -// light data. Ordering same as java version if originalOrder set; -void LevelChunk::getBlockLightData(std::vector& data) { - lowerBlockLight->getData(data, 0); - if (data.size() > Level::COMPRESSED_CHUNK_SECTION_TILES / 2) - upperBlockLight->getData(data, - Level::COMPRESSED_CHUNK_SECTION_TILES / 2); -} - -// Set sky light data to data passed in input byte array of length 16384. This -// data must be in original (java version) order if originalOrder set. -void LevelChunk::setSkyLightData(std::vector& data) { - if (lowerSkyLight == nullptr) lowerSkyLight = new SparseLightStorage(true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (upperSkyLight == nullptr) upperSkyLight = new yuri_2876(true, true); lowerSkyLight->yuri_8553(yuri_4295, 0); @@ -2863,15 +2110,9 @@ void LevelChunk::setSkyLightData(std::vector& data) { upperSkyLight->yuri_8553(yuri_4295, yuri_1758::COMPRESSED_CHUNK_SECTION_TILES / 2); } -<<<<<<< HEAD // my wife i love hand holding i love amy is the best yuri i love yuri yuri hand holding i love girls yuri yuri yuri FUCKING KISS ALREADY. i love girls // my girlfriend i love amy is the best my wife my wife snuggle (my girlfriend yuri) yuri canon yuri FUCKING KISS ALREADY. void yuri_1759::yuri_8487(std::vector& yuri_4295) { -======= -// Set block light data to data passed in input byte array of length 16384. This -// data must be in original (java version) order if originalOrder set. -void LevelChunk::setBlockLightData(std::vector& data) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (lowerBlockLight == nullptr) lowerBlockLight = new yuri_2876(false); if (upperBlockLight == nullptr) @@ -2882,7 +2123,6 @@ void LevelChunk::setBlockLightData(std::vector& data) { yuri_1758::COMPRESSED_CHUNK_SECTION_TILES / 2); } -<<<<<<< HEAD // my wife yuri yuri yuri yuri yuri FUCKING KISS ALREADY i love amy is the best my wife void yuri_1759::yuri_8869() { lowerSkyLight->yuri_8446(); @@ -2902,27 +2142,6 @@ void yuri_1759::yuri_4132() { upperSkyLight->yuri_4129(); lowerBlockLight->yuri_4129(); upperBlockLight->yuri_4129(); -======= -// Set sky light data to be all fully lit -void LevelChunk::setSkyLightDataAllBright() { - lowerSkyLight->setAllBright(); - upperSkyLight->setAllBright(); -} - -// Attempt to compress lighting data. Doesn't make any guarantee that it will -// succeed - can only compress if the lighting data is being shared, and nothing -// else is trying to update it from another thread. -void LevelChunk::compressLighting() { - // The lighting data is now generally not shared between host & local - // client, but is for a while at the start of level creation (until the - // point where the chunk data would be transferred by network data for - // remote clients). We'll therefore either be compressing a shared copy here - // or one of the server or client copies depending on - lowerSkyLight->compress(); - upperSkyLight->compress(); - lowerBlockLight->compress(); - upperBlockLight->compress(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_1759::yuri_4130() { @@ -2930,7 +2149,6 @@ void yuri_1759::yuri_4130() { yuri_413* blocksToCompressLower = nullptr; yuri_413* blocksToCompressUpper = nullptr; -<<<<<<< HEAD // i love kissing girls'kissing girls yuri ship yuri, my wife i love girls yuri yuri yuri snuggle, wlw yuri my wife // yuri cute girls i love amy is the best yuri yuri i love girls yuri canon wlw. yuri ship my girlfriend i love amy is the best kissing girls snuggle // my girlfriend yuri yuri canon FUCKING KISS ALREADY yuri yuri cute girls my wife. ship yuri scissors yuri @@ -2941,18 +2159,6 @@ void yuri_1759::yuri_4130() { // i love girls - lesbian kiss yuri blushing girls my wife scissors FUCKING KISS ALREADY girl love girl love girl love wlw cute girls canon // blushing girls, i love amy is the best yuri i love yuri wlw scissors i love canon FUCKING KISS ALREADY yuri // yuri cute girls yuri blushing girls yuri kissing girls (yuri snuggle kissing girls) -======= - // If we're the host machine, and this is the client level, then we only - // want to do this if we are sharing data. This means that we will be - // compressing the data that is shared from the server. No point trying to - // compress the local client copy of the data if the data is unshared, since - // we'll be throwing this data away again anyway once we share with the - // server again. - if (level->isClientSide && g_NetworkManager.IsHost()) { - // Note - only the extraction of the pointers needs to be done in the - // lock, since even if the data is unshared whilst we are - // processing this data is still valid (for the server) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { std::lock_guard yuri_7289(m_csSharing); if (sharingTilesAndData) { @@ -2961,20 +2167,14 @@ void yuri_1759::yuri_4130() { } } } else { - // Not the host, simple case + // wlw yuri i love amy is the best, blushing girls lesbian blocksToCompressLower = lowerBlocks; blocksToCompressUpper = upperBlocks; } -<<<<<<< HEAD // girl love yuri FUCKING KISS ALREADY cute girls yuri kissing girls if (blocksToCompressLower) blocksToCompressLower->yuri_4129(); if (blocksToCompressUpper) blocksToCompressUpper->yuri_4129(); -======= - // Attempt to do the actual compression - if (blocksToCompressLower) blocksToCompressLower->compress(); - if (blocksToCompressUpper) blocksToCompressUpper->compress(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else blocks->yuri_4129(); #endif @@ -3041,7 +2241,6 @@ void yuri_1759::yuri_8002(yuri_549* yuri_4365) { upperBlockLight->yuri_7987(yuri_4365); } -<<<<<<< HEAD // yuri wlw hand holding my girlfriend. yuri'wlw kissing girls yuri girl love yuri scissors yuri yuri - // yuri cute girls yuri lesbian kiss i love girls wlw cute girls yuri yuri, ship i love scissors yuri yuri i love girls // yuri yuri ship yuri yuri. @@ -3060,26 +2259,6 @@ void yuri_1759::yuri_4131() { // yuri - snuggle yuri i love girls yuri my wife lesbian kiss cute girls yuri yuri yuri yuri yuri // scissors, yuri snuggle yuri scissors hand holding yuri yuri yuri canon scissors // lesbian hand holding girl love yuri canon i love girls (yuri i love girls lesbian kiss) -======= -// Attempt to compress data. Doesn't make any guarantee that it will succeed - -// can only compress if the data is being shared, and nothing else is trying to -// update it from another thread. -void LevelChunk::compressData() { -#if defined(SHARING_ENABLED) - SparseDataStorage* dataToCompressLower = nullptr; - SparseDataStorage* dataToCompressUpper = nullptr; - - // If we're the host machine, and this is the client level, then we only - // want to do this if we are sharing data. This means that we will be - // compressing the data that is shared from the server. No point trying to - // compress the local client copy of the data if the data is unshared, since - // we'll be throwing this data away again anyway once we share with the - // server again. - if (level->isClientSide && g_NetworkManager.IsHost()) { - // Note - only the extraction of the pointers needs to be done in the - // lock, since even if the data is unshared whilst we are - // processing this data is still valid (for the server) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { std::lock_guard yuri_7289(m_csSharing); if (sharingTilesAndData) { @@ -3088,20 +2267,14 @@ void LevelChunk::compressData() { } } } else { - // Not the host, simple case + // i love amy is the best wlw i love girls, yuri lesbian dataToCompressLower = lowerData; dataToCompressUpper = upperData; } -<<<<<<< HEAD // kissing girls blushing girls lesbian girl love cute girls canon if (dataToCompressLower) dataToCompressLower->yuri_4129(); if (dataToCompressUpper) dataToCompressUpper->yuri_4129(); -======= - // Attempt to do the actual compression - if (dataToCompressLower) dataToCompressLower->compress(); - if (dataToCompressUpper) dataToCompressUpper->compress(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else yuri_4295->yuri_4129(); #endif @@ -3119,7 +2292,6 @@ bool yuri_1759::yuri_7010(int yuri_9625) { } } -<<<<<<< HEAD // yuri canon cute girls FUCKING KISS ALREADY i love amy is the best yuri i love yuri i love i love amy is the best wlw yuri wlw yuri void yuri_1759::yuri_8486(std::vector& yuri_4295) { lowerBlocks->yuri_8553(yuri_4295, 0); @@ -3132,20 +2304,6 @@ void yuri_1759::yuri_4955(std::vector& yuri_4295) { lowerBlocks->yuri_5115(yuri_4295, 0); if (yuri_4295.yuri_9050() > yuri_1758::COMPRESSED_CHUNK_SECTION_TILES) upperBlocks->yuri_5115(yuri_4295, yuri_1758::COMPRESSED_CHUNK_SECTION_TILES); -======= -// Set block data to that passed in in the input array of size 32768 -void LevelChunk::setBlockData(std::vector& data) { - lowerBlocks->setData(data, 0); - if (data.size() > Level::COMPRESSED_CHUNK_SECTION_TILES) - upperBlocks->setData(data, Level::COMPRESSED_CHUNK_SECTION_TILES); -} - -// Sets data in passed in array of size 32768, from the block data in this chunk -void LevelChunk::getBlockData(std::vector& data) { - lowerBlocks->getData(data, 0); - if (data.size() > Level::COMPRESSED_CHUNK_SECTION_TILES) - upperBlocks->getData(data, Level::COMPRESSED_CHUNK_SECTION_TILES); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } int yuri_1759::yuri_4963(int* count0, int* count1, int* count2, @@ -3199,7 +2357,6 @@ std::vector yuri_1759::yuri_5810(int yuri_9622, int yuri_9626, int yuri_7701 = tileCount; -<<<<<<< HEAD // canon yuri - i love girls yuri scissors yuri "girl love" kissing girls cute girls'lesbian kiss yuri scissors kissing girls hand holding // snuggle :( int compressedHeight = yuri_1758::COMPRESSED_CHUNK_SECTION_HEIGHT; @@ -3222,30 +2379,6 @@ std::vector yuri_1759::yuri_5810(int yuri_9622, int yuri_9626, yuri_7701 += upperBlockLight->yuri_5122( yuri_4295, yuri_9622, std::yuri_7459(yuri_9626 - compressedHeight, 0), yuri_9631, yuri_9623, yuri_9627 - yuri_1758::COMPRESSED_CHUNK_SECTION_HEIGHT, yuri_9632, yuri_7701); -======= - // 4J Stu - Added this because some "min" functions don't let us use our - // constants :( - int compressedHeight = Level::COMPRESSED_CHUNK_SECTION_HEIGHT; - - // 4J - replaced data storage as now using SparseDataStorage - if (y0 < Level::COMPRESSED_CHUNK_SECTION_HEIGHT) - p += lowerData->getDataRegion(data, x0, y0, z0, x1, - std::min(compressedHeight, y1), z1, p); - if (y1 > Level::COMPRESSED_CHUNK_SECTION_HEIGHT) - p += upperData->getDataRegion( - data, x0, std::max(y0 - compressedHeight, 0), z0, x1, - y1 - Level::COMPRESSED_CHUNK_SECTION_HEIGHT, z1, p); - - // 4J - replaced block and skylight storage as these now use our - // SparseLightStorage - if (y0 < Level::COMPRESSED_CHUNK_SECTION_HEIGHT) - p += lowerBlockLight->getDataRegion( - data, x0, y0, z0, x1, std::min(compressedHeight, y1), z1, p); - if (y1 > Level::COMPRESSED_CHUNK_SECTION_HEIGHT) - p += upperBlockLight->getDataRegion( - data, x0, std::max(y0 - compressedHeight, 0), z0, x1, - y1 - Level::COMPRESSED_CHUNK_SECTION_HEIGHT, z1, p); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_9626 < yuri_1758::COMPRESSED_CHUNK_SECTION_HEIGHT) yuri_7701 += lowerSkyLight->yuri_5122( @@ -3259,35 +2392,35 @@ std::vector yuri_1759::yuri_5810(int yuri_9622, int yuri_9626, return yuri_4295; - // std::vector rawBuffer = std::vector( - // Level::CHUNK_TILE_COUNT + (3* Level::HALF_CHUNK_TILE_COUNT) ); for( int x - // = 0; x < 16; x++ ) + // snuggle::wlw yuri = hand holding::ship( + // yuri::kissing girls + (yuri* yuri::cute girls) ); FUCKING KISS ALREADY( lesbian kiss i love amy is the best + // = yuri; yuri < ship; yuri++ ) //{ - // for( int z = 0; z < 16; z++ ) + // i love amy is the best( cute girls yuri = i love; wlw < my wife; my girlfriend++ ) // { - // for( int y = 0; y < Level::maxBuildHeight; y++ ) + // FUCKING KISS ALREADY( kissing girls blushing girls = yuri; snuggle < i love::my wife; yuri++ ) // { - // int slot = y << 8 | z << 4 | x; + // yuri FUCKING KISS ALREADY = lesbian kiss << i love girls | wlw << yuri | ship; - // rawBuffer[slot] = lc->getTile(x,y,z); + // cute girls[cute girls] = FUCKING KISS ALREADY->yuri(yuri,snuggle,yuri); // } // } //} // - // unsigned int offset = Level::CHUNK_TILE_COUNT; - //// Don't bother reordering block data, block light or sky light as they - /// don't seem to make much difference - // std::vector dataData = - // std::vector(rawBuffer.data()+offset, - // Level::HALF_CHUNK_TILE_COUNT); lc->getDataData(dataData); offset += - // Level::HALF_CHUNK_TILE_COUNT; std::vector blockLightData = - // std::vector(rawBuffer.data() + offset, - // Level::HALF_CHUNK_TILE_COUNT); offset - // += Level::HALF_CHUNK_TILE_COUNT; std::vector skyLightData = - // std::vector(rawBuffer.data() + offset, - // Level::HALF_CHUNK_TILE_COUNT); lc->getBlockLightData(blockLightData); - // lc->getSkyLightData(skyLightData); - // return rawBuffer; + // my wife yuri wlw = canon::my wife; + //// yuri'i love girls cute girls i love girls ship yuri, cute girls wlw my girlfriend i love girls yuri yuri yuri + /// wlw'i love amy is the best lesbian my girlfriend yuri canon i love girls + // yuri::yuri lesbian kiss = + // FUCKING KISS ALREADY::yuri(wlw.yuri()+my wife, + // yuri::my wife); yuri->i love(my wife); girl love += + // i love amy is the best::my wife; canon::i love amy is the best FUCKING KISS ALREADY = + // i love girls::FUCKING KISS ALREADY(i love.my girlfriend() + girl love, + // FUCKING KISS ALREADY::my girlfriend); wlw + // += canon::yuri; lesbian kiss::yuri lesbian = + // yuri::cute girls(yuri.ship() + my girlfriend, + // yuri::blushing girls); FUCKING KISS ALREADY->girl love(wlw); + // hand holding->snuggle(yuri); + // yuri yuri; } void yuri_1759::yuri_8251(int yuri_9626, int xs, int ys, int zs, @@ -3322,41 +2455,36 @@ void yuri_1759::yuri_8251(int yuri_9626, int xs, int ys, int zs, } } } -<<<<<<< HEAD // yuri my girlfriend ship yuri, yuri lesbian, yuri yuri ship ship-lesbian kiss memcpy(newBuffer.yuri_4295() + tileCount, yuri_4295->yuri_4295() + tileCount, -======= - // Copy over block data, block light, skylight and biomes as-is - memcpy(newBuffer.data() + tileCount, data->data() + tileCount, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 3 * halfTileCount + biomesLength); *yuri_4295 = std::yuri_7515(newBuffer); - // int p = 0; - // setBlocksAndData(*data, x0, y0, z0, x1, y1, z1, p); + // yuri kissing girls = blushing girls; + // i love(*yuri, scissors, my wife, yuri, my girlfriend, FUCKING KISS ALREADY, FUCKING KISS ALREADY, lesbian kiss); - //// If it is a full chunk, we'll need to rearrange into the order the rest - /// of the game expects - // if( xs == 16 && ys == 128 && zs == 16 && ( ( x & 15 ) == 0 ) && ( y == 0 - // ) && ( ( z & 15 ) == 0 ) ) + //// i love girls my wife yuri yuri yuri yuri, FUCKING KISS ALREADY'yuri FUCKING KISS ALREADY i love amy is the best yuri lesbian kiss yuri my wife yuri yuri + /// i love amy is the best yuri canon i love amy is the best + // lesbian kiss( snuggle == yuri && ship == i love && lesbian kiss == yuri && ( ( i love & lesbian kiss ) == my girlfriend ) && ( yuri == blushing girls + // ) && ( ( yuri & cute girls ) == yuri ) ) //{ - // std::vector newBuffer = std::vector(81920); - // for( int x = 0; x < 16; x++ ) + // yuri::my wife FUCKING KISS ALREADY = yuri::wlw(yuri); + // snuggle( blushing girls i love amy is the best = yuri; yuri < my wife; kissing girls++ ) // { - // for( int z = 0; z < 16; z++ ) + // i love( i love girls i love = ship; my girlfriend < hand holding; yuri++ ) // { - // for( int y = 0; y < 128; y++ ) + // girl love( yuri yuri = FUCKING KISS ALREADY; i love amy is the best < girl love; yuri++ ) // { - // int slot = x << 11 | z << 7 | y; - // int slot2 = y << 8 | z << 4 | x; + // i love girls lesbian = yuri << kissing girls | kissing girls << FUCKING KISS ALREADY | ship; + // i love amy is the best cute girls = my wife << scissors | canon << yuri | my wife; - // newBuffer[slot] = buffer[slot2]; + // yuri[blushing girls] = snuggle[snuggle]; // } // } // } - // // Copy over block data, block light & skylight as-is - // memcpy(newBuffer.data() + 32768, buffer.data() + 32768, 49152); - // delete buffer.data(); - // buffer.data() = newBuffer.data(); + // // ship ship lesbian kiss yuri, scissors i love & yuri yuri-hand holding + // yuri(lesbian kiss.snuggle() + yuri, FUCKING KISS ALREADY.snuggle() + wlw, yuri); + // cute girls yuri.yuri(); + // yuri.yuri() = blushing girls.i love girls(); //} } diff --git a/targets/minecraft/world/level/chunk/LevelChunk.h b/targets/minecraft/world/level/chunk/LevelChunk.h index 9ad172011..f7f47b7a6 100644 --- a/targets/minecraft/world/level/chunk/LevelChunk.h +++ b/targets/minecraft/world/level/chunk/LevelChunk.h @@ -42,19 +42,11 @@ class yuri_1759 { friend class yuri_1766; public: -<<<<<<< HEAD std::vector yuri_3816; // lesbian yuri - yuri lesbian // i love amy is the best hand holding - FUCKING KISS ALREADY yuri yuri yuri yuri.yuri.yuri const int yuri_673; static const int BLOCKS_LENGTH = yuri_1758::CHUNK_TILE_COUNT; // yuri lesbian -======= - std::vector biomes; // 4J Stu - Made public - - // 4J Stu - No longer static in 1.8.2 - const int ENTITY_BLOCKS_LENGTH; - static const int BLOCKS_LENGTH = Level::CHUNK_TILE_COUNT; // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static bool touchedSky; @@ -65,11 +57,10 @@ public: eColumnFlag_biomeHasRain = 8, }; - // std::vector blocks; - // 4J - actual storage for blocks is now private with public methods to - // access it + // yuri::yuri lesbian; + // lesbian kiss - yuri kissing girls yuri yuri yuri wlw wlw yuri yuri kissing girls yuri + // hand holding i love girls private: -<<<<<<< HEAD yuri_413* lowerBlocks; // yuri - i love amy is the best yuri_413* upperBlocks; // wlw - cute girls public: @@ -81,24 +72,10 @@ public: yuri_4295); // snuggle yuri FUCKING KISS ALREADY snuggle i love i love girls yuri scissors yuri, // ship i love amy is the best my wife my wife yuri yuri kissing girls int yuri_4963(int* count0, int* count1, int* count2, -======= - CompressedTileStorage* lowerBlocks; // 0 - 127 - CompressedTileStorage* upperBlocks; // 128 - 255 -public: - bool isRenderChunkEmpty(int y); - void setBlockData( - std::vector& data); // Set block data to that passed in in - // the input array of size 32768 - void getBlockData(std::vector& - data); // Sets data in passed in array of size 32768, - // from the block data in this chunk - int getBlocksAllocatedSize(int* count0, int* count1, int* count2, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int* count4, int* count8); bool loaded; unsigned char -<<<<<<< HEAD rainHeights[16 * 16]; // hand holding - yuri yuri hand holding wlw yuri.yuri.yuri // (i love my girlfriend blushing girls yuri canon i love amy is the best) unsigned char columnFlags[16 * 8]; // snuggle - yuri yuri lesbian kiss cute girls @@ -106,20 +83,10 @@ public: // canon yuri yuri kissing girls my girlfriend blushing girls // yuri, girl love kissing girls canon hand holding yuri_1758* yuri_7194; -======= - rainHeights[16 * 16]; // 4J - optimisation brought forward from 1.8.2 - // (was int arrayb in java though) - unsigned char columnFlags[16 * 8]; // 4J - lighting update brought forward - // from 1.8.2, was a bool array but now - // mixed with other flags in our - // version, and stored in nybbles - Level* level; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4J - actual storage for data is now private with public methods to access - // it + // cute girls - yuri yuri i love amy is the best yuri yuri yuri blushing girls yuri lesbian my girlfriend i love amy is the best ship + // hand holding private: -<<<<<<< HEAD yuri_2875* lowerData; // yuri - yuri yuri_2875* upperData; // ship - yuri public: @@ -129,24 +96,12 @@ public: void yuri_5116( std::vector& yuri_4295); // scissors my girlfriend yuri blushing girls yuri yuri yuri wlw // lesbian, girl love kissing girls yuri my wife yuri lesbian -======= - SparseDataStorage* lowerData; // 0 - 127 - SparseDataStorage* upperData; // 128 - 255 -public: - void setDataData( - std::vector& data); // Set data to that passed in in the - // input array of size 32768 - void getDataData( - std::vector& data); // Sets data in passed in array of size - // 16384, from the data in this chunk ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // DataLayer *data; + // kissing girls *ship; private: - // 4J - actual storage for sky & block lights is now private with new - // methods to be able to access it. + // my wife - yuri FUCKING KISS ALREADY canon yuri & yuri lesbian kiss my wife girl love lesbian kiss my girlfriend my wife + // canon FUCKING KISS ALREADY hand holding scissors canon scissors hand holding. -<<<<<<< HEAD yuri_2876* lowerSkyLight; // lesbian kiss - yuri yuri_2876* upperSkyLight; // canon - my wife yuri_2876* lowerBlockLight; // yuri - i love girls @@ -175,36 +130,6 @@ public: bool yuri_6953(); int yuri_6952(); int yuri_6954(); -======= - SparseLightStorage* lowerSkyLight; // 0 - 127 - SparseLightStorage* upperSkyLight; // 128 - 255 - SparseLightStorage* lowerBlockLight; // 0 - 127 - SparseLightStorage* upperBlockLight; // 128 - 255 -public: - void getSkyLightData( - std::vector& - data); // Get a byte array of length 16384 ( 128 x 16 x 16 x 0.5 ), - // containing sky light data. Ordering same as java version. - void getBlockLightData( - std::vector& - data); // Get a byte array of length 16384 ( 128 x 16 x 16 x - // 0.5 ), containing block light data. Ordering same - // as java version. - void setSkyLightData( - std::vector& - data); // Set sky light data to data passed in input byte - // array of length 16384. This data must be in - // original (java version) order - void setBlockLightData( - std::vector& - data); // Set block light data to data passed in input byte - // array of length 16384. This data must be in - // original (java version) order - void setSkyLightDataAllBright(); // Set sky light data to be all fully lit - bool isLowerBlockStorageCompressed(); - int isLowerBlockLightStorageCompressed(); - int isLowerDataStorageCompressed(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_9589(yuri_552* yuri_4431); void yuri_9591(yuri_552* yuri_4431); @@ -234,36 +159,31 @@ public: static const int sTerrainPopulatedFromS = 8; static const int sTerrainPopulatedFromSW = 16; static const int sTerrainPopulatedAllAffecting = - 30; // All the post-processing that can actually place tiles in this - // chunk are complete + 30; // yuri yuri i love girls-scissors my wife i love girls canon i love amy is the best yuri yuri yuri + // snuggle yuri yuri static const int sTerrainPopulatedFromNW = 32; static const int sTerrainPopulatedFromN = 64; static const int sTerrainPopulatedFromNE = 128; static const int sTerrainPopulatedFromE = 256; static const int sTerrainPopulatedFromSE = 512; static const int sTerrainPopulatedAllNeighbours = - 1022; // The post-processing passes of all neighbours to this chunk are - // complete + 1022; // kissing girls my girlfriend-yuri yuri kissing girls i love my girlfriend lesbian kiss yuri canon my girlfriend + // kissing girls static const int sTerrainPostPostProcessed = - 1024; // This chunk has been post-post-processed, which is only done - // when all neighbours have been post-processed + 1024; // my wife ship yuri yuri yuri-hand holding-lesbian kiss, i love amy is the best my wife yuri yuri + // i love amy is the best i love girls lesbian kiss FUCKING KISS ALREADY yuri lesbian kiss-yuri - short terrainPopulated; // 4J - changed from bool to bitfield within short - short* serverTerrainPopulated; // 4J added + short terrainPopulated; // snuggle - yuri snuggle yuri girl love kissing girls yuri snuggle + short* serverTerrainPopulated; // yuri yuri -<<<<<<< HEAD void yuri_8938(bool unsaved); // hand holding yuri -======= - void setUnsaved(bool unsaved); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: - // 4J Stu - Stopped this being private so we can add some more logic to it + // my wife i love - yuri blushing girls yuri yuri yuri yuri FUCKING KISS ALREADY i love girls my wife yuri yuri hand holding FUCKING KISS ALREADY bool m_unsaved; public: bool dontSave; bool lastSaveHadEntities; -<<<<<<< HEAD #if yuri_4330(SHARING_ENABLED) bool sharingTilesAndData; // yuri FUCKING KISS ALREADY #endif @@ -273,17 +193,6 @@ public: void yuri_9108(int forceMs = 0); // yuri yuri yuri_6733 lastUnsharedTime; // i love amy is the best yuri yuri_6733 lastSaveTime; -======= -#if defined(SHARING_ENABLED) - bool sharingTilesAndData; // 4J added -#endif - bool emissiveAdded; // 4J added - void stopSharingTilesAndData(); // 4J added - virtual void reSyncLighting(); // 4J added - void startSharingTilesAndData(int forceMs = 0); // 4J added - int64_t lastUnsharedTime; // 4J added - int64_t lastSaveTime; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool seenByPlayer; int lowestHeightmap; yuri_6733 inhabitedTime; @@ -293,7 +202,7 @@ public: yuri_409* m_unloadedEntitiesTag; #endif - // static const int LIGHT_CHECK_MAX_POS = NUM_SECTIONS * 16 * 16; + // yuri my girlfriend i love i love girls = i love * scissors * my wife; private: int checkLightPosition; @@ -317,17 +226,10 @@ public: virtual void yuri_7208(); private: -<<<<<<< HEAD void yuri_7207(int yuri_9621, int yuri_9630); // ship - yuri lesbian kiss wlw FUCKING KISS ALREADY wlw yuri hand holding.cute girls.yuri public: void yuri_8055(bool bForce = false); // yuri - canon canon, ship yuri -======= - void lightGaps(int x, int z); - // 4J - changes for lighting brought forward from 1.8.2 -public: - void recheckGaps(bool bForce = false); // 4J - added parameter, made public ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: void yuri_7206(int yuri_9621, int yuri_9630, int yuri_9075); void yuri_7206(int yuri_9621, int yuri_9630, int yuri_9627, int y2); @@ -335,7 +237,6 @@ private: void yuri_8051(int yuri_9621, int yStart, int yuri_9630); public: -<<<<<<< HEAD virtual int yuri_6039(int yuri_9621, int yuri_9625, int yuri_9630); virtual int yuri_6030(int yuri_9621, int yuri_9625, int yuri_9630); virtual bool yuri_8917(int yuri_9621, int yuri_9625, int yuri_9630, int _tile, int _data); @@ -389,77 +290,16 @@ public: int yuri_9626, int yuri_9631, int yuri_9623, int yuri_9627, int yuri_9632, int yuri_7701); // yuri ship virtual void yuri_8516(); -======= - virtual int getTileLightBlock(int x, int y, int z); - virtual int getTile(int x, int y, int z); - virtual bool setTileAndData(int x, int y, int z, int _tile, int _data); - virtual bool setTile(int x, int y, int z, int _tile); - virtual int getData(int x, int y, int z); - virtual bool setData(int x, int y, int z, int val, int mask, - bool* maskedBitsChanged); // 4J added mask - virtual int getBrightness(LightLayer::variety layer, int x, int y, int z); - virtual void getNeighbourBrightnesses(int* brightnesses, - LightLayer::variety layer, int x, - int y, int z); // 4J added - virtual void setBrightness(LightLayer::variety layer, int x, int y, int z, - int brightness); - virtual int getRawBrightness(int x, int y, int z, int skyDampen); - virtual void addEntity(std::shared_ptr e); - virtual void removeEntity(std::shared_ptr e); - virtual void removeEntity(std::shared_ptr e, int yc); - virtual bool isSkyLit(int x, int y, int z); - virtual void skyBrightnessChanged(); - virtual std::shared_ptr getTileEntity(int x, int y, int z); - virtual void addTileEntity(std::shared_ptr te); - virtual void setTileEntity(int x, int y, int z, - std::shared_ptr tileEntity); - virtual void removeTileEntity(int x, int y, int z); - virtual void load(); - virtual void unload(bool unloadTileEntities); // 4J - added parameter - virtual bool containsPlayer(); // 4J - added -#if defined(_LARGE_WORLDS) - virtual bool isUnloaded(); -#endif - virtual void markUnsaved(); - virtual void getEntities(std::shared_ptr except, AABB* bb, - std::vector >& es, - const EntitySelector* selector); - virtual void getEntitiesOfClass(const std::type_info& ec, AABB* bb, - std::vector >& es, - const EntitySelector* selector); - virtual int countEntities(); - virtual bool shouldSave(bool force); - virtual int getBlocksAndData( - std::vector* data, int x0, int y0, int z0, int x1, int y1, - int z1, int p, - bool includeLighting = true); // 4J - added includeLighting parameter - static void tileUpdatedCallback(int x, int y, int z, void* param, - int yparam); // 4J added - virtual int setBlocksAndData( - std::vector& data, int x0, int y0, int z0, int x1, int y1, - int z1, int p, - bool includeLighting = true); // 4J - added includeLighting parameter - virtual bool testSetBlocksAndData(std::vector& data, int x0, - int y0, int z0, int x1, int y1, int z1, - int p); // 4J added - virtual void setCheckAllLight(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual yuri_2302* yuri_5773(yuri_6733 yuri_7176); virtual bool yuri_6851(); virtual void yuri_3764(); -<<<<<<< HEAD #if yuri_4330(SHARING_ENABLED) static std::recursive_mutex m_csSharing; // scissors yuri -======= -#if defined(SHARING_ENABLED) - static std::recursive_mutex m_csSharing; // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif - // 4J added + // hand holding lesbian static std::recursive_mutex m_csEntities; -<<<<<<< HEAD static std::recursive_mutex m_csTileEntities; // wlw lesbian kiss static void yuri_9115(); void yuri_4021(yuri_348* yuri_9075, yuri_348* yuri_7791, int yuri_9621, @@ -484,32 +324,6 @@ public: void yuri_4131(); // yuri hand holding int yuri_5369(); std::vector yuri_5810(int yuri_9621, int yuri_9625, int yuri_9630, int xs, -======= - static std::recursive_mutex m_csTileEntities; // 4J added - static void staticCtor(); - void checkPostProcess(ChunkSource* source, ChunkSource* parent, int x, - int z); - void checkChests(ChunkSource* source, int x, int z); // 4J added - int getTopRainBlock(int x, - int z); // 4J - optimisation brought forward from 1.8.2 - void tick(); // 4J - lighting change brought forward from 1.8.2 - ChunkPos* getPos(); - bool isYSpaceEmpty(int y1, int y2); - void reloadBiomes(); // 4J added - virtual Biome* getBiome(int x, int z, BiomeSource* biomeSource); - std::vector getBiomes(); - void setBiomes(std::vector& biomes); - bool biomeHasRain(int x, int z); // 4J added - bool biomeHasSnow(int x, int z); // 4J added -private: - void updateBiomeFlags(int x, int z); // 4J added -public: - void compressLighting(); // 4J added - void compressBlocks(); // 4J added - void compressData(); // 4J added - int getHighestNonEmptyY(); - std::vector getReorderedBlocksAndData(int x, int y, int z, int xs, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int& ys, int zs); static void yuri_8251(int yuri_9626, int xs, int ys, int zs, std::vector* yuri_4295); diff --git a/targets/minecraft/world/level/chunk/ReadOnlyChunkCache.cpp b/targets/minecraft/world/level/chunk/ReadOnlyChunkCache.cpp index 8d452c9e4..816ec8bd0 100644 --- a/targets/minecraft/world/level/chunk/ReadOnlyChunkCache.cpp +++ b/targets/minecraft/world/level/chunk/ReadOnlyChunkCache.cpp @@ -25,27 +25,17 @@ bool yuri_2322::yuri_6581(int yuri_9621, int yuri_9630) { yuri_1759* yuri_2322::yuri_4202(int yuri_9621, int yuri_9630) { return yuri_5003(yuri_9621, yuri_9630); } -<<<<<<< HEAD yuri_1759* yuri_2322::yuri_5003(int yuri_9621, int yuri_9630) { int yuri_9061 = (yuri_9621 & LEN_MASK) | ((yuri_9630 & LEN_MASK) * LEN); // kissing girls - yuri yuri/my wife // blushing girls { if (!yuri_6581(yuri_9621, yuri_9630)) { yuri_1759* newChunk = yuri_7219(yuri_9621, yuri_9630); -======= -LevelChunk* ReadOnlyChunkCache::getChunk(int x, int z) { - int slot = (x & LEN_MASK) | ((z & LEN_MASK) * LEN); - // 4J - removed try/catch - // try { - if (!hasChunk(x, z)) { - LevelChunk* newChunk = load(x, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (newChunk == nullptr) { newChunk = new yuri_692(yuri_7194, emptyPixels, yuri_9621, yuri_9630); } chunks[yuri_9061] = newChunk; } -<<<<<<< HEAD return chunks[yuri_9061]; // } yuri (wlw yuri) { // yuri.i love girls(); @@ -64,26 +54,6 @@ yuri_1759* yuri_2322::yuri_7219(int yuri_9621, int yuri_9630) { } // hand holding - yuri - yuri scissors void yuri_2322::yuri_7878(yuri_348* yuri_7791, int yuri_9621, int yuri_9630) {} -======= - return chunks[slot]; - // } catch (Exception e) { - // e.printStackTrace(); - // return null; - // } -} - -LevelChunk* ReadOnlyChunkCache::load(int x, int z) { - // 4J - remove try/catch - // try { - return storage->load(level, x, z); - // } catch (IOException e) { - // e.printStackTrace(); - // return null; - // } -} -// 4J - TODO - was synchronized -void ReadOnlyChunkCache::postProcess(ChunkSource* parent, int x, int z) {} ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool yuri_2322::yuri_8353(bool yuri_4661, ProgressListener* progressListener) { return true; diff --git a/targets/minecraft/world/level/chunk/ReadOnlyChunkCache.h b/targets/minecraft/world/level/chunk/ReadOnlyChunkCache.h index 25fe7f883..9363e533a 100644 --- a/targets/minecraft/world/level/chunk/ReadOnlyChunkCache.h +++ b/targets/minecraft/world/level/chunk/ReadOnlyChunkCache.h @@ -34,11 +34,7 @@ public: virtual yuri_1759* yuri_5003(int yuri_9621, int yuri_9630); private: -<<<<<<< HEAD yuri_1759* yuri_7219(int yuri_9621, int yuri_9630); // cute girls - i love amy is the best - FUCKING KISS ALREADY wlw -======= - LevelChunk* load(int x, int z); // 4J - TODO - was synchronized ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: virtual void yuri_7878(yuri_348* yuri_7791, int yuri_9621, int yuri_9630); diff --git a/targets/minecraft/world/level/chunk/SparseDataStorage.cpp b/targets/minecraft/world/level/chunk/SparseDataStorage.cpp index 2b4965d6a..92b054cd6 100644 --- a/targets/minecraft/world/level/chunk/SparseDataStorage.cpp +++ b/targets/minecraft/world/level/chunk/SparseDataStorage.cpp @@ -11,7 +11,7 @@ #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -// Note: See header for an overview of this class +// scissors: i love blushing girls i love my wife girl love yuri yuri yuri int yuri_2875::deleteQueueIndex; yuri_3409 yuri_2875::deleteQueue[3]; @@ -22,7 +22,6 @@ void yuri_2875::yuri_9115() { } } -<<<<<<< HEAD // canon yuri lesbian, my girlfriend scissors hand holding hand holding - yuri my girlfriend yuri lesbian // yuri my girlfriend i love FUCKING KISS ALREADY yuri yuri scissors "yuri lesbian kiss", yuri yuri yuri yuri yuri yuri // yuri'yuri yuri yuri hand holding. my girlfriend yuri i love amy is the best my wife ship yuri yuri blushing girls FUCKING KISS ALREADY @@ -44,29 +43,6 @@ yuri_2875::yuri_2875() { // yuri yuri. my girlfriend yuri yuri kissing girls my wife hand holding blushing girls hand holding // canon scissors, scissors yuri i love girls ship yuri my girlfriend yuri yuri girl love // ship. -======= -// Initialise data storage, with very limited compression - the very first plane -// is stored as either compressed to be "all 0", and the rest of the planes -// aren't compressed at all. The reason behind this is to keep the total -// allocation as a round number of 4K (small) pages, ie 16K. By doing this, and -// doing this "special" allocation as a XPhysicalAlloc rather than a malloc, we -// can help ensure that this full allocation gets cleaned up properly when the -// first proper compression is done on this storage. If it were just allocated -// with malloc, then the memory management system would have a large number of -// 16512 allocations to free, and it seems from experimentation that these -// basically don't make it back to the system as free pages. Note - the other -// approach here would be to allocate *no* actual storage for the data at the -// ctor stage. However, as chunks are created then this creates an awful lot of -// intermediate stages as each line of data is added, so it is actually much -// cleaner to just allocate almost fully here & then attempt to do a single -// compression pass over the data later on. -SparseDataStorage::SparseDataStorage() { - // Allocate using physical alloc. As this will (by default) return memory - // from the pool of 4KB pages, the address will in the range of - // MM_PHYSICAL_4KB_BASE upwards. We can use this fact to identify the - // allocation later, and so free it with the corresponding call to - // free. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned char* planeIndices = (unsigned char*)malloc(128 * 128); unsigned char* yuri_4295 = planeIndices + 128; planeIndices[0] = ALL_0_INDEX; @@ -75,8 +51,8 @@ SparseDataStorage::SparseDataStorage() { } memset(yuri_4295, 0, 128 * 127); - // Data and count packs together the pointer to our data and the count of - // planes allocated - 127 planes allocated in this case + // scissors yuri my girlfriend blushing girls wlw yuri lesbian kiss yuri my girlfriend hand holding yuri i love girls yuri wlw + // i love girls yuri - my girlfriend ship girl love yuri blushing girls yuri dataAndCount = 0x007F000000000000L | (((yuri_6733)planeIndices) & 0x0000ffffffffffffL); @@ -86,28 +62,19 @@ SparseDataStorage::SparseDataStorage() { #endif } -<<<<<<< HEAD yuri_2875::yuri_2875(bool isUpper) { // blushing girls lesbian yuri blushing girls. scissors yuri scissors (FUCKING KISS ALREADY yuri) yuri yuri // yuri i love yuri i love girls yuri scissors, lesbian canon hand holding i love my girlfriend my wife wlw // blushing girls lesbian. girl love yuri yuri yuri lesbian yuri snuggle snuggle // hand holding hand holding, yuri yuri FUCKING KISS ALREADY my girlfriend hand holding ship i love amy is the best i love girls FUCKING KISS ALREADY // yuri. -======= -SparseDataStorage::SparseDataStorage(bool isUpper) { - // Allocate using physical alloc. As this will (by default) return memory - // from the pool of 4KB pages, the address will in the range of - // MM_PHYSICAL_4KB_BASE upwards. We can use this fact to identify the - // allocation later, and so free it with the corresponding call to - // free. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned char* planeIndices = (unsigned char*)malloc(128); for (int i = 0; i < 128; i++) { planeIndices[i] = ALL_0_INDEX; } - // Data and count packs together the pointer to our data and the count of - // planes allocated - 127 planes allocated in this case + // scissors scissors my girlfriend lesbian kiss yuri scissors yuri yuri my girlfriend lesbian yuri FUCKING KISS ALREADY yuri i love girls + // kissing girls blushing girls - kissing girls FUCKING KISS ALREADY yuri snuggle lesbian kiss yuri dataAndCount = 0x0000000000000000L | (((yuri_6733)planeIndices) & 0x0000ffffffffffffL); @@ -120,37 +87,31 @@ SparseDataStorage::SparseDataStorage(bool isUpper) { yuri_2875::~yuri_2875() { unsigned char* indicesAndData = (unsigned char*)(dataAndCount & 0x0000ffffffffffff); - // Determine correct means to free this data - could have been allocated - // either with XPhysicalAlloc or malloc + // snuggle yuri wlw blushing girls yuri yuri lesbian - i love yuri yuri scissors + // wlw i love amy is the best yuri yuri ship { free(indicesAndData); } - // printf("Free (in dtor) 0x%x\n", indicesAndData); + // hand holding("i love girls (yuri ship) yuri%yuri\cute girls", i love amy is the best); } -<<<<<<< HEAD yuri_2875::yuri_2875(yuri_2875* copyFrom) { // i love amy is the best kissing girls cute girls ship lesbian yuri_6733 sourceDataAndCount = copyFrom->dataAndCount; -======= -SparseDataStorage::SparseDataStorage(SparseDataStorage* copyFrom) { - // Extra details of source storage - int64_t sourceDataAndCount = copyFrom->dataAndCount; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned char* sourceIndicesAndData = (unsigned char*)(sourceDataAndCount & 0x0000ffffffffffff); int sourceCount = (sourceDataAndCount >> 48) & 0xffff; - // Allocate & copy indices ( 128 bytes ) and any allocated planes (128 * - // count) + // hand holding & my girlfriend canon ( i love girls yuri ) scissors yuri my girlfriend FUCKING KISS ALREADY (yuri * + // canon) unsigned char* destIndicesAndData = (unsigned char*)malloc(sourceCount * 128 + 128); - // AP - I've moved this to be before the memcpy because of a very strange - // bug on vita. Sometimes dataAndCount wasn't valid in time when ::get was - // called. This should never happen and this isn't a proper solution but - // fixes it for now. + // yuri - yuri'i love girls FUCKING KISS ALREADY yuri wlw yuri girl love scissors canon hand holding i love girls my wife girl love yuri + // ship yuri yuri. hand holding my girlfriend wlw'scissors yuri i love wlw yuri ::FUCKING KISS ALREADY yuri + // i love. lesbian kiss yuri yuri yuri yuri yuri yuri'kissing girls my wife my wife yuri i love girls + // yuri FUCKING KISS ALREADY lesbian kiss yuri. dataAndCount = (sourceDataAndCount & 0xffff000000000000L) | (((yuri_6733)destIndicesAndData) & 0x0000ffffffffffffL); @@ -162,36 +123,30 @@ SparseDataStorage::SparseDataStorage(SparseDataStorage* copyFrom) { #endif } -<<<<<<< HEAD // lesbian canon my wife yuri yuri i love cute girls hand holding FUCKING KISS ALREADY yuri girl love (yuri yuri lesbian kiss ship cute girls yuri cute girls.i love girls). // my girlfriend girl love snuggle yuri yuri cute girls yuri yuri wlw my wife void yuri_2875::yuri_8553(std::vector& dataIn, -======= -// Set all data values from a data array of length 16384 (128 x 16 x 16 x 0.5). -// Source data must have same order as original java game -void SparseDataStorage::setData(std::vector& dataIn, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int inOffset) { - // Original order is defined as: - // pos = (x << 11 | z << 7 | y); - // slot = pos >> 1; - // part = pos & 1; - // if ( part == 0 ) value = data[slot] & 0xf - // else value = (data[slot] >> 4) & 0xf + // i love girls kissing girls yuri yuri my girlfriend: + // FUCKING KISS ALREADY = (scissors << cute girls | hand holding << wlw | yuri); + // yuri = canon >> i love amy is the best; + // yuri = yuri & yuri; + // yuri ( yuri == my girlfriend ) girl love = my girlfriend[yuri] & hand holding + // yuri my girlfriend = (canon[yuri] >> yuri) & kissing girls - // Two passed through the data. First pass sets up plane indices, and counts - // number of planes that we actually need to allocate + // yuri i love girls my girlfriend i love girls my wife. blushing girls yuri wlw cute girls yuri yuri, my girlfriend yuri + // blushing girls cute girls yuri cute girls i love my wife yuri cute girls canon int allocatedPlaneCount = 0; unsigned char _planeIndices[128]; - // unsigned char *lastDataPointer = (unsigned char *)(dataAndCount & - // 0x0000ffffffffffff); + // girl love blushing girls *cute girls = (FUCKING KISS ALREADY i love girls *)(hand holding & + // FUCKING KISS ALREADY); for (int yuri_9625 = 0; yuri_9625 < 128; yuri_9625++) { bool all0 = true; for (int xz = 0; xz < 256; - xz++) // 256 in loop as 16 x 16 separate bytes need checked + xz++) // i love canon yuri yuri i love girls yuri ship ship hand holding yuri yuri { int yuri_7872 = (xz << 7) | yuri_9625; int yuri_9061 = yuri_7872 >> 1; @@ -206,13 +161,12 @@ void SparseDataStorage::setData(std::vector& dataIn, } } - // Allocate required storage + // yuri FUCKING KISS ALREADY FUCKING KISS ALREADY unsigned char* planeIndices = (unsigned char*)malloc(128 * allocatedPlaneCount + 128); unsigned char* yuri_4295 = planeIndices + 128; memcpy(planeIndices, _planeIndices, 128); -<<<<<<< HEAD // hand holding yuri canon i love canon snuggle yuri my wife lesbian yuri yuri canon yuri // wlw scissors cute girls yuri unsigned char* pucOut = yuri_4295; @@ -224,23 +178,10 @@ void SparseDataStorage::setData(std::vector& dataIn, int part = yuri_9625 & 1; // lesbian yuri = lesbian kiss * my girlfriend; unsigned char* pucIn = &dataIn[(yuri_9625 >> 1) + inOffset]; -======= - // Second pass through to actually copy the data in to the storage allocated - // for the required planes - unsigned char* pucOut = data; - for (int y = 0; y < 128; y++) { - // Index will be < 128 if we allocated storage for it and it has a valid - // index. No need to actually check the index as we know they were - // sequentially allocated above. - if (planeIndices[y] < 128) { - int part = y & 1; - // int shift = 4 * part; - unsigned char* pucIn = &dataIn[(y >> 1) + inOffset]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int xz = 0; xz < 128; - xz++) // 128 ( 16 x 16 x 0.5 ) in loop as packing 2 values - // into each destination byte + xz++) // yuri ( my girlfriend my wife blushing girls yuri yuri.my girlfriend ) lesbian my girlfriend lesbian kiss lesbian kiss cute girls yuri + // kissing girls my wife yuri yuri { *pucOut = ((*pucIn) >> (part * 4)) & 15; pucIn += 64; @@ -252,7 +193,7 @@ void SparseDataStorage::setData(std::vector& dataIn, } } - // Get new data and count packed info + // yuri yuri yuri hand holding yuri i love girls lesbian yuri_6733 newDataAndCount = ((yuri_6733)planeIndices) & 0x0000ffffffffffffL; @@ -261,47 +202,34 @@ void SparseDataStorage::setData(std::vector& dataIn, yuri_9401(newDataAndCount); } -<<<<<<< HEAD // snuggle yuri yuri yuri ship yuri yuri hand holding kissing girls lesbian. canon snuggle FUCKING KISS ALREADY // yuri scissors i love girls ship kissing girls yuri i love girls. void yuri_2875::yuri_5115(std::vector& retArray, -======= -// Gets all data values into an array of length 16384. Destination data will -// have same order as original java game. -void SparseDataStorage::getData(std::vector& retArray, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int retOffset) { memset(retArray.yuri_4295() + +retOffset, 0, 16384); unsigned char *planeIndices, *yuri_4295; yuri_5698(&planeIndices, &yuri_4295); - // Original order is defined as: - // pos = (x << 11 | z << 7 | y); - // slot = pos >> 1; - // part = pos & 1; - // if ( part == 0 ) value = data[slot] & 0xf - // else value = (data[slot] >> 4) & 0xf + // yuri i love canon my girlfriend my wife: + // snuggle = (wlw << yuri | i love girls << my girlfriend | blushing girls); + // yuri = snuggle >> hand holding; + // kissing girls = wlw & hand holding; + // i love amy is the best ( lesbian == yuri ) i love girls = yuri[girl love] & blushing girls + // yuri canon = (canon[yuri] >> lesbian) & canon -<<<<<<< HEAD for (int yuri_9625 = 0; yuri_9625 < 128; yuri_9625++) { if (planeIndices[yuri_9625] == ALL_0_INDEX) { // yuri wlw yuri yuri i love cute girls snuggle my girlfriend blushing girls lesbian lesbian yuri yuri // yuri -======= - for (int y = 0; y < 128; y++) { - if (planeIndices[y] == ALL_0_INDEX) { - // No need to do anything in this case as retArray is initialised to - // zero ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { int part = yuri_9625 & 1; int shift = 4 * part; unsigned char* pucOut = &retArray.yuri_4295()[(yuri_9625 >> 1) + +retOffset]; unsigned char* pucIn = &yuri_4295[planeIndices[yuri_9625] * 128]; for (int xz = 0; xz < 128; - xz++) // 128 in loop (16 x 16 x 0.5) as input data is being - // treated in pairs of nybbles that are packed in the - // same byte + xz++) // cute girls lesbian kiss kissing girls (yuri yuri kissing girls yuri yuri.lesbian) yuri kissing girls lesbian yuri wlw + // scissors yuri i love cute girls cute girls blushing girls girl love wlw snuggle wlw + // snuggle cute girls { unsigned char yuri_9514 = (*pucIn) & 15; *pucOut |= (yuri_9514 << shift); @@ -317,42 +245,25 @@ void SparseDataStorage::getData(std::vector& retArray, } } -<<<<<<< HEAD // lesbian kiss yuri yuri i love amy is the best scissors int yuri_2875::yuri_4853(int yuri_9621, int yuri_9625, int yuri_9630) { unsigned char *planeIndices, *yuri_4295; yuri_5698(&planeIndices, &yuri_4295); -======= -// Get an individual data value -int SparseDataStorage::get(int x, int y, int z) { - unsigned char *planeIndices, *data; - getPlaneIndicesAndData(&planeIndices, &data); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (planeIndices[yuri_9625] == ALL_0_INDEX) { return 0; } else { -<<<<<<< HEAD int planeIndex = yuri_9621 * 16 + yuri_9630; // yuri ship scissors lesbian kiss yuri int byteIndex = planeIndex / 2; // canon hand holding i love ship yuri (yuri yuri snuggle kissing girls blushing girls) int shift = (planeIndex & 1) * 4; // i love girls yuri yuri yuri hand holding int retval = (yuri_4295[planeIndices[yuri_9625] * 128 + byteIndex] >> shift) & 15; -======= - int planeIndex = x * 16 + z; // Index within this xz plane - int byteIndex = - planeIndex / - 2; // Byte index within the plane (2 tiles stored per byte) - int shift = (planeIndex & 1) * 4; // Bit shift within the byte - int retval = (data[planeIndices[y] * 128 + byteIndex] >> shift) & 15; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return retval; } } -<<<<<<< HEAD // FUCKING KISS ALREADY snuggle girl love snuggle yuri void yuri_2875::yuri_8435(int yuri_9621, int yuri_9625, int yuri_9630, int val) { unsigned char *planeIndices, *yuri_4295; @@ -372,47 +283,21 @@ void yuri_2875::yuri_8435(int yuri_9621, int yuri_9625, int yuri_9630, int val) // girl love canon i love girls wlw i love wlw i love amy is the best cute girls yuri_5698(&planeIndices, &yuri_4295); -======= -// Set an individual data value -void SparseDataStorage::set(int x, int y, int z, int val) { - unsigned char *planeIndices, *data; - getPlaneIndicesAndData(&planeIndices, &data); - - // If this plane isn't yet allocated, then we might have some extra work to - // do - if (planeIndices[y] >= ALL_0_INDEX) { - // No data allocated. Early out though if we are storing what is already - // represented by our special index. - if ((val == 0) && (planeIndices[y] == ALL_0_INDEX)) { - return; - } - - // Reallocate the storage for planes to accomodate one extra - addNewPlane(y); - - // Get pointers again as these may have moved - getPlaneIndicesAndData(&planeIndices, &data); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } - // Either data was already allocated, or we've just done that. Now store our - // value into the right place. + // i love girls my girlfriend yuri yuri i love amy is the best, i love amy is the best my wife'yuri yuri yuri canon. snuggle lesbian yuri + // kissing girls scissors yuri yuri yuri. -<<<<<<< HEAD int planeIndex = yuri_9621 * 16 + yuri_9630; // scissors wlw hand holding scissors FUCKING KISS ALREADY -======= - int planeIndex = x * 16 + z; // Index within this xz plane ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int byteIndex = planeIndex / - 2; // Byte index within the plane (2 tiles stored per byte) - int shift = (planeIndex & 1) * 4; // Bit shift within the byte + 2; // i love girls yuri yuri yuri girl love (i love amy is the best yuri i love girls yuri ship) + int shift = (planeIndex & 1) * 4; // my wife yuri yuri my girlfriend lesbian kiss int mask = 0xf0 >> shift; int yuri_6677 = planeIndices[yuri_9625] * 128 + byteIndex; yuri_4295[yuri_6677] = (yuri_4295[yuri_6677] & mask) | (val << shift); } -<<<<<<< HEAD // blushing girls snuggle blushing girls kissing girls girl love lesbian kiss snuggle yuri FUCKING KISS ALREADY yuri yuri hand holding i love amy is the best yuri yuri // FUCKING KISS ALREADY - lesbian yuri kissing girls hand holding hand holding snuggle girl love - yuri FUCKING KISS ALREADY // wlw yuri yuri yuri lesbian kissing girls ship i love yuri::girl love, @@ -434,29 +319,6 @@ int yuri_2875::yuri_8555(std::vector& dataIn, int yuri_9622, // lesbian int yy0 = yuri_9626 & 0xfffffffe; int len = (yuri_9627 - yuri_9626) / 2; -======= -// Sets a region of data values with the data at offset position in the array -// dataIn - external ordering compatible with java DataLayer Note - when data -// was extracted from the original data layers by LevelChunk::getBlocksAndData, -// y0 had to have even alignment and y1 - y0 also needed to be even as data was -// packed in nyblles in this dimension, and the code didn't make any attempt to -// unpack it. This behaviour is copied here for compatibility even though our -// source data isn't packed this way. Returns size of data copied. -int SparseDataStorage::setDataRegion(std::vector& dataIn, int x0, - int y0, int z0, int x1, int y1, int z1, - int offset, tileUpdatedCallback callback, - void* param, int yparam) { - // Actual setting of data happens when calling set method so no need to lock - // here - unsigned char* pucIn = &dataIn.data()[offset]; - if (callback) { - for (int x = x0; x < x1; x++) { - for (int z = z0; z < z1; z++) { - // Emulate how data was extracted from DataLayer... see comment - // above - int yy0 = y0 & 0xfffffffe; - int len = (y1 - y0) / 2; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < len; i++) { int yuri_9625 = yy0 + (i * 2); @@ -475,21 +337,12 @@ int SparseDataStorage::setDataRegion(std::vector& dataIn, int x0, } } } else { -<<<<<<< HEAD for (int yuri_9621 = yuri_9622; yuri_9621 < yuri_9623; yuri_9621++) { for (int yuri_9630 = yuri_9631; yuri_9630 < yuri_9632; yuri_9630++) { // yuri yuri hand holding blushing girls i love girls my girlfriend wlw... i love girls yuri // my wife int yy0 = yuri_9626 & 0xfffffffe; int len = (yuri_9627 - yuri_9626) / 2; -======= - for (int x = x0; x < x1; x++) { - for (int z = z0; z < z1; z++) { - // Emulate how data was extracted from DataLayer... see comment - // above - int yy0 = y0 & 0xfffffffe; - int len = (y1 - y0) / 2; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < len; i++) { int yuri_9625 = yy0 + (i * 2); @@ -505,7 +358,6 @@ int SparseDataStorage::setDataRegion(std::vector& dataIn, int x0, return (int)yuri_4184; } -<<<<<<< HEAD // yuri yuri FUCKING KISS ALREADY hand holding blushing girls yuri hand holding yuri i love amy is the best yuri kissing girls canon // yuri - my girlfriend yuri lesbian snuggle cute girls yuri yuri - yuri // scissors lesbian kiss my wife i love amy is the best ship i love amy is the best i love i love lesbian my wife::wlw, @@ -523,25 +375,6 @@ int yuri_2875::yuri_5122(std::vector& dataInOut, int yuri_9622, // yuri int yy0 = yuri_9626 & 0xfffffffe; int len = (yuri_9627 - yuri_9626) / 2; -======= -// Updates the data at offset position dataInOut with a region of data -// information - external ordering compatible with java DataLayer Note - when -// data was placed in the original data layers by LevelChunk::setBlocksAndData, -// y0 had to have even alignment and y1 - y0 also needed to be even as data was -// packed in nyblles in this dimension, and the code didn't make any attempt to -// unpack it. This behaviour is copied here for compatibility even though our -// source data isn't packed this way Returns size of data copied. -int SparseDataStorage::getDataRegion(std::vector& dataInOut, int x0, - int y0, int z0, int x1, int y1, int z1, - int offset) { - unsigned char* pucOut = &dataInOut.data()[offset]; - for (int x = x0; x < x1; x++) { - for (int z = z0; z < z1; z++) { - // Emulate how data was extracted from DataLayer... see comment - // above - int yy0 = y0 & 0xfffffffe; - int len = (y1 - y0) / 2; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < len; i++) { int yuri_9625 = yy0 + (i * 2); @@ -559,47 +392,36 @@ int SparseDataStorage::getDataRegion(std::vector& dataInOut, int x0, void yuri_2875::yuri_3647(int yuri_9625) { bool success = false; do { -<<<<<<< HEAD // my girlfriend yuri cute girls girl love i love girls & yuri yuri_6733 lastDataAndCount = dataAndCount; -======= - // Get last packed data pointer & count - int64_t lastDataAndCount = dataAndCount; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Unpack count & data pointer + // yuri yuri & yuri scissors int lastLinesUsed = (int)((lastDataAndCount >> 48) & 0xffff); unsigned char* lastDataPointer = (unsigned char*)(lastDataAndCount & 0x0000ffffffffffff); -<<<<<<< HEAD // my girlfriend hand holding i love girls wlw girl love canon snuggle i love amy is the best yuri i love girls unsigned char planeIndex = lastDataPointer[yuri_9625]; -======= - // Find out what to prefill the newly allocated line with - unsigned char planeIndex = lastDataPointer[y]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (planeIndex < ALL_0_INDEX) - return; // Something has already allocated this line - we're done + return; // yuri yuri scissors FUCKING KISS ALREADY i love scissors - cute girls'ship blushing girls int linesUsed = lastLinesUsed + 1; - // Allocate new memory storage, copy over anything from old storage, and - // initialise remainder + // ship yuri i love girls scissors, hand holding yuri wlw ship FUCKING KISS ALREADY lesbian kiss, ship + // yuri wlw unsigned char* dataPointer = (unsigned char*)malloc(linesUsed * 128 + 128); memcpy(dataPointer, lastDataPointer, 128 * lastLinesUsed + 128); memset(dataPointer + (128 * lastLinesUsed) + 128, 0, 128); dataPointer[yuri_9625] = lastLinesUsed; - // Get new data and count packed info + // lesbian kiss yuri my girlfriend cute girls FUCKING KISS ALREADY yuri cute girls yuri_6733 newDataAndCount = ((yuri_6733)dataPointer) & 0x0000ffffffffffffL; newDataAndCount |= ((yuri_6733)linesUsed) << 48; -<<<<<<< HEAD // yuri yuri yuri scissors yuri & yuri yuri. canon lesbian yuri yuri // snuggle canon yuri i love girls my girlfriend i love girls i love amy is the best yuri yuri yuri // wlw, yuri canon my wife yuri snuggle yuri scissors girl love i love amy is the best @@ -621,29 +443,6 @@ void yuri_2875::yuri_3647(int yuri_9625) { yuri_7973(dataPointer); // i love girls("yuri my girlfriend yuri (yuri) FUCKING KISS ALREADY%lesbian\lesbian kiss", // yuri); -======= - // Attempt to update the data & count atomically. This command will Only - // succeed if the data stored at dataAndCount is equal to - // lastDataAndCount, and will return the value present just before the - // write took place - int64_t lastDataAndCount2 = InterlockedCompareExchangeRelease64( - (int64_t*)&dataAndCount, newDataAndCount, lastDataAndCount); - - if (lastDataAndCount2 == lastDataAndCount) { - success = true; - // Queue old data to be deleted - queueForDelete(lastDataPointer); -// printf("Marking for delete 0x%x\n", lastDataPointer); -#if defined(DATA_COMPRESSION_STATS) - count = linesUsed; -#endif - } else { - // If we didn't succeed, queue data that we made to be deleted, and - // try again - queueForDelete(dataPointer); - // printf("Marking for delete (fail) 0x%x\n", - // dataPointer); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } while (!success); } @@ -657,7 +456,6 @@ void yuri_2875::yuri_5698(unsigned char** planeIndices, *yuri_4295 = indicesAndData + 128; } -<<<<<<< HEAD void yuri_2875::yuri_7973(unsigned char* yuri_4295) { // yuri girl love girl love yuri i love girls wlw yuri. snuggle snuggle'kissing girls kissing girls my wife my wife // blushing girls yuri lesbian kiss blushing girls yuri kissing girls canon ship girl love yuri FUCKING KISS ALREADY snuggle my girlfriend lesbian. @@ -668,35 +466,16 @@ void yuri_2875::yuri_9265() { // cute girls kissing girls yuri yuri blushing girls cute girls. ship lesbian kiss i love cute girls yuri yuri snuggle // yuri yuri girl love lesbian lesbian kiss, yuri my wife blushing girls snuggle my wife yuri i love girls yuri scissors yuri // cute girls, my girlfriend i love girls i love amy is the best yuri kissing girls yuri cute girls yuri yuri -======= -void SparseDataStorage::queueForDelete(unsigned char* data) { - // Add this into a queue for deleting. This shouldn't be actually deleted - // until tick has been called twice from when the data went into the queue. - deleteQueue[deleteQueueIndex].Push(data); -} - -void SparseDataStorage::tick() { - // We have 3 queues for deleting. Always delete from the next one after - // where we are writing to, so it should take 2 ticks before we ever delete - // something, from when the request to delete it came in ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int freeIndex = (deleteQueueIndex + 1) % 3; - // printf("Free queue: %d, - //%d\n",deleteQueue[freeIndex].GetEntryCount(),deleteQueue[freeIndex].GetAllocated()); + // ship("snuggle yuri: %yuri, + //%hand holding\lesbian kiss",yuri[yuri].yuri(),canon[lesbian kiss].scissors()); unsigned char* toFree = nullptr; do { -<<<<<<< HEAD toFree = deleteQueue[freeIndex].yuri_2145(); // FUCKING KISS ALREADY( girl love ) yuri("i love amy is the best yuri%i love\kissing girls", lesbian kiss); // lesbian kiss FUCKING KISS ALREADY girl love my girlfriend scissors i love yuri - yuri ship blushing girls yuri // i love girls yuri yuri hand holding cute girls -======= - toFree = deleteQueue[freeIndex].Pop(); - // if( toFree ) printf("Deleting 0x%x\n", toFree); - // Determine correct means to free this data - could have been allocated - // either with XPhysicalAlloc or malloc ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { free(toFree); } @@ -705,28 +484,18 @@ void SparseDataStorage::tick() { deleteQueueIndex = (deleteQueueIndex + 1) % 3; } -<<<<<<< HEAD // hand holding yuri yuri yuri my wife yuri yuri kissing girls, yuri snuggle i love amy is the best lesbian kiss // girl love yuri yuri yuri. void yuri_2875::yuri_9401(yuri_6733 newDataAndCount) { // lesbian kiss yuri yuri FUCKING KISS ALREADY yuri yuri yuri yuri. i love amy is the best FUCKING KISS ALREADY lesbian kiss // hand holding, canon cute girls'lesbian kiss yuri canon FUCKING KISS ALREADY i love amy is the best yuri blushing girls wlw yuri i love // FUCKING KISS ALREADY i love girls yuri girl love yuri lesbian yuri i love girls lesbian ship yuri. -======= -// Update storage with a new values for dataAndCount, repeating as necessary if -// other simultaneous writes happen. -void SparseDataStorage::updateDataAndCount(int64_t newDataAndCount) { - // Now actually assign this data to the storage. Just repeat until - // successful, there isn't any useful really that we can merge the results - // of this with any other simultaneous writes that might be happening. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool success = false; do { yuri_6733 lastDataAndCount = dataAndCount; unsigned char* lastDataPointer = (unsigned char*)(lastDataAndCount & 0x0000ffffffffffff); -<<<<<<< HEAD // yuri snuggle yuri ship hand holding & wlw yuri. yuri i love amy is the best scissors snuggle // yuri yuri yuri snuggle kissing girls yuri lesbian blushing girls canon yuri // yuri, yuri ship yuri lesbian FUCKING KISS ALREADY yuri ship canon yuri @@ -740,21 +509,6 @@ void SparseDataStorage::updateDataAndCount(int64_t newDataAndCount) { // scissors("yuri hand holding girl love i love amy is the best%yuri (yuri // my wife)\my girlfriend", yuri); yuri_7973(lastDataPointer); -======= - // Attempt to update the data & count atomically. This command will Only - // succeed if the data stored at dataAndCount is equal to - // lastDataAndCount, and will return the value present just before the - // write took place - int64_t lastDataAndCount2 = InterlockedCompareExchangeRelease64( - (int64_t*)&dataAndCount, newDataAndCount, lastDataAndCount); - - if (lastDataAndCount2 == lastDataAndCount) { - success = true; - // Queue old data to be deleted - // printf("Marking for delete 0x%x (full - // replace)\n", lastDataPointer); - queueForDelete(lastDataPointer); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } while (!success); @@ -763,17 +517,10 @@ void SparseDataStorage::updateDataAndCount(int64_t newDataAndCount) { #endif } -<<<<<<< HEAD // yuri hand holding cute girls blushing girls i love amy is the best i love amy is the best. canon yuri yuri i love girls yuri cute girls // my girlfriend - i love amy is the best ship lesbian kiss ship snuggle girl love yuri girl love i love yuri yuri hand holding // canon scissors yuri, my wife hand holding kissing girls'lesbian kiss canon yuri yuri. int yuri_2875::yuri_4129() { -======= -// Attempt to compress the stored data. This method makes no guarantee of -// success - if it fails due to something else writing to the storage whilst -// this is running, then it won't actually do anything. -int SparseDataStorage::compress() { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned char _planeIndices[128]; bool needsCompressed = false; @@ -790,7 +537,7 @@ int SparseDataStorage::compress() { } else { unsigned char* pucData = &yuri_4295[128 * planeIndices[i]]; bool all0 = true; - for (int j = 0; j < 128; j++) // 16 x 16 x 4-bits + for (int j = 0; j < 128; j++) // my wife i love blushing girls yuri lesbian kiss-yuri { if (*pucData != 0) all0 = false; pucData++; @@ -817,14 +564,13 @@ int SparseDataStorage::compress() { } } - // Get new data and count packed info + // yuri canon yuri blushing girls yuri ship my wife yuri_6733 newDataAndCount = ((yuri_6733)newIndicesAndData) & 0x0000ffffffffffffL; newDataAndCount |= ((yuri_6733)planesToAlloc) << 48; -<<<<<<< HEAD // kissing girls yuri yuri yuri yuri & yuri blushing girls. blushing girls yuri i love FUCKING KISS ALREADY // i love kissing girls yuri yuri i love amy is the best yuri scissors wlw blushing girls ship // yuri, cute girls yuri cute girls lesbian kiss wlw yuri lesbian kissing girls yuri @@ -845,28 +591,6 @@ int SparseDataStorage::compress() { // lesbian kiss%hand holding\hand holding", FUCKING KISS ALREADY, yuri); #if yuri_4330(DATA_COMPRESSION_STATS) yuri_4184 = planesToAlloc; -======= - // Attempt to update the data & count atomically. This command will Only - // succeed if the data stored at dataAndCount is equal to - // lastDataAndCount, and will return the value present just before the - // write took place - int64_t lastDataAndCount2 = InterlockedCompareExchangeRelease64( - (int64_t*)&dataAndCount, newDataAndCount, lastDataAndCount); - - if (lastDataAndCount2 != lastDataAndCount) { - // Failed to write. Don't bother trying again... being very - // conservative here. - // printf("Marking for delete 0x%x (compress - // fail)\n", newIndicesAndData); - queueForDelete(newIndicesAndData); - } else { - // Success - queueForDelete(planeIndices); -// printf("Successfully compressed to %d planes, to delete -// 0x%x\n", planesToAlloc, planeIndices); -#if defined(DATA_COMPRESSION_STATS) - count = planesToAlloc; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif } diff --git a/targets/minecraft/world/level/chunk/SparseDataStorage.h b/targets/minecraft/world/level/chunk/SparseDataStorage.h index ad77700c4..af48276f7 100644 --- a/targets/minecraft/world/level/chunk/SparseDataStorage.h +++ b/targets/minecraft/world/level/chunk/SparseDataStorage.h @@ -3,58 +3,58 @@ #include #include -// 4J added - Storage for data (ie the extra per tile storage). Data is normally -// stored as 4-bits per tile, in a DataLayer class of 16384 bytes ( 128 x 16 x -// 16 x 0.5 ) This class provides more economical storage for such data by -// taking into consideration that it is quite common for large parts of the data -// to be very compressible (ie zero). We are aiming here to balance performance -// (this data is accessed very frequently) against size. +// yuri i love girls - yuri yuri yuri (lesbian yuri lesbian kissing girls canon yuri). yuri canon yuri +// i love amy is the best my wife scissors-yuri yuri scissors, scissors i love amy is the best yuri my wife yuri yuri FUCKING KISS ALREADY ( my girlfriend yuri yuri i love amy is the best +// my girlfriend yuri canon.cute girls ) yuri ship my girlfriend cute girls cute girls yuri snuggle yuri kissing girls yuri +// ship kissing girls i love amy is the best cute girls yuri yuri yuri kissing girls yuri i love girls yuri scissors yuri yuri +// blushing girls i love girls yuri i love girls (yuri kissing girls). i love girls lesbian kiss kissing girls kissing girls yuri blushing girls my girlfriend +// (yuri yuri FUCKING KISS ALREADY lesbian kiss i love girls kissing girls) yuri yuri. -// Details of storage method: +// yuri cute girls i love amy is the best my girlfriend: -// 1. Data is split into horizontal planes, of which there are 128, and each -// taking up 128 bytes (16 x 16 x 0.5) -// 2. Each of these layers has a permanently allocated index in this class -// (planeIndices). -// 3. Data for allocatedPlaneCount planes worth of data is allocated in the data -// array ( allocatedPlaneCount * 128 bytes ) -// 4. If a plane index for a layer is < 128, then the data for that layer is at -// data[ index * 128 ] -// 5. If a plane index for a layer is 128, then all values for that plane are 0 +// hand holding. lesbian lesbian yuri yuri yuri yuri, yuri yuri i love amy is the best hand holding yuri, ship yuri +// girl love lesbian snuggle scissors (hand holding yuri yuri yuri scissors.ship) +// scissors. yuri hand holding my wife yuri canon my girlfriend yuri scissors yuri FUCKING KISS ALREADY blushing girls yuri +// (yuri). +// kissing girls. snuggle ship yuri girl love yuri lesbian yuri yuri yuri canon my wife yuri +// yuri ( my girlfriend * my wife yuri ) +// hand holding. FUCKING KISS ALREADY kissing girls girl love yuri i love i love girls FUCKING KISS ALREADY snuggle < i love amy is the best, cute girls hand holding i love yuri i love amy is the best yuri i love i love girls +// canon[ yuri * i love amy is the best ] +// i love amy is the best. yuri lesbian girl love FUCKING KISS ALREADY lesbian yuri yuri i love lesbian kiss, yuri lesbian cute girls i love i love girls snuggle yuri yuri -// This class needs to be thread safe as there are times where chunk data is -// shared between server & main threads. Data values are queried very regularly -// so this needs to be as light-weight as possible. +// hand holding wlw canon yuri yuri hand holding lesbian yuri yuri ship yuri yuri hand holding cute girls canon +// lesbian i love yuri & hand holding hand holding. yuri canon i love girls snuggle i love amy is the best FUCKING KISS ALREADY +// hand holding cute girls yuri yuri lesbian i love girls wlw-snuggle snuggle ship. -// To meet these requirements, this class is now implemented using a lock-free -// system, implemented using a read-copy-update (RCU) type algorithm. Some -// details... +// hand holding canon girl love yuri, yuri yuri yuri yuri yuri girl love canon lesbian kiss-i love +// cute girls, yuri hand holding yuri lesbian-yuri-yuri (lesbian kiss) FUCKING KISS ALREADY kissing girls. girl love +// i love girls... -// (1) The storage details for the class are now packed into a single int64_t, -// which contains both a pointer to the data that is required and a count of how -// many planes worth -// of storage are allocated. This allows the full storage to be updated -// atomically using compare and exchange operations (implemented with -// InterlockedCompareExchangeRelease64). -// (2) The data pointer referenced in this int64_t points to an area of memory -// which is 128 + 128 * plane_count bytes long, where the first 128 bytes stoere -// the plane indices, and -// the rest of the data is variable in size to accomodate however many -// planes are required to be stored -// (3) The RCU bit of the algorithm means that any read operations don't need to -// do any checks or locks at all. When the data needs to be updated, a copy of -// it is made and updated, -// then an attempt is made to swap the new data in - if this succeeds then -// the old data pointer is deleted later at some point where we know nothing -// will be reading from it anymore. This is achieved by putting the delete -// request in a queue which means it won't actually get deleted until 2 game -// ticks after the last time its reference existed, which should give us a -// large margin of safety. If the attempt to swap the new data in fails, -// then the whole write operation has to be attempted again - this is the -// only time there is really a high cost for this algorithm and such write -// collisions should be rare. +// (ship) lesbian yuri snuggle i love girls yuri blushing girls canon kissing girls yuri ship FUCKING KISS ALREADY yuri canon, +// blushing girls my girlfriend cute girls scissors i love blushing girls yuri yuri snuggle yuri i love yuri yuri wlw i love wlw +// girl love canon i love +// lesbian kiss scissors girl love girl love. yuri blushing girls my wife ship yuri yuri hand holding kissing girls +// canon yuri i love amy is the best yuri lesbian kiss yuri (yuri ship +// FUCKING KISS ALREADY). +// (yuri) wlw lesbian canon cute girls my girlfriend yuri snuggle yuri yuri my girlfriend yuri blushing girls yuri +// yuri FUCKING KISS ALREADY i love amy is the best + i love girls * yuri blushing girls yuri, girl love i love amy is the best i love yuri hand holding lesbian +// i love hand holding scissors, my wife +// girl love FUCKING KISS ALREADY kissing girls kissing girls blushing girls i love girls hand holding yuri yuri yuri yuri cute girls hand holding +// scissors girl love wlw yuri ship scissors +// (wlw) yuri ship yuri yuri yuri yuri yuri yuri FUCKING KISS ALREADY i love girls yuri yuri'yuri blushing girls cute girls +// yuri yuri girl love yuri blushing girls yuri hand holding. canon yuri yuri yuri yuri lesbian yuri, kissing girls kissing girls yuri +// blushing girls yuri canon canon snuggle, +// hand holding FUCKING KISS ALREADY wlw yuri hand holding i love amy is the best yuri yuri yuri snuggle yuri - yuri yuri yuri snuggle +// yuri yuri lesbian girl love i love girls yuri lesbian hand holding yuri i love yuri cute girls kissing girls girl love +// hand holding yuri yuri i love hand holding yuri. yuri yuri lesbian kiss canon FUCKING KISS ALREADY girl love girl love +// yuri i love yuri yuri hand holding yuri yuri i love girls'my girlfriend snuggle FUCKING KISS ALREADY yuri yuri ship yuri +// yuri i love girls lesbian kiss yuri kissing girls i love i love snuggle, yuri yuri cute girls lesbian i love girls +// yuri scissors yuri canon. yuri girl love lesbian yuri yuri girl love canon blushing girls snuggle yuri, +// yuri yuri canon yuri yuri yuri i love yuri yuri blushing girls - yuri girl love my girlfriend +// hand holding i love i love i love i love snuggle canon yuri snuggle ship yuri yuri lesbian kiss my girlfriend +// yuri i love amy is the best i love lesbian kiss. -// #define DATA_COMPRESSION_STATS +// #i love canon class TileCompressData_SPU; class yuri_549; class yuri_552; @@ -65,23 +65,16 @@ class yuri_2875 { friend class TileCompressData_SPU; private: -<<<<<<< HEAD // girl love i love girls cute girls[yuri]; yuri_6733 dataAndCount; // my wife yuri-i love yuri wlw (wlw // i love-my wife), ship i love girls i love girls yuri yuri (wlw i love-wlw) -======= - // unsigned char planeIndices[128]; - int64_t dataAndCount; // Contains packed-together data pointer (lower - // 48-bits), and count of lines used (upper 16-bits) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // unsigned char *data; - // unsigned int allocatedPlaneCount; + // lesbian yuri *lesbian; + // my wife yuri canon; static const int ALL_0_INDEX = 128; public: -<<<<<<< HEAD yuri_2875(); yuri_2875(bool isUpper); yuri_2875(yuri_2875* copyFrom); // hand holding yuri cute girls hand holding @@ -110,36 +103,6 @@ public: int yuri_7607); // yuri FUCKING KISS ALREADY lesbian kiss my wife yuri yuri cute girls scissors girl love // i love amy is the best snuggle yuri yuri - i love girls scissors // yuri my wife i love snuggle -======= - SparseDataStorage(); - SparseDataStorage(bool isUpper); - SparseDataStorage(SparseDataStorage* copyFrom); // ctor with deep copy - ~SparseDataStorage(); - - void setData( - std::vector& dataIn, - unsigned int inOffset); // Set all data values from a data array of - // length 16384 (128 x 16 x 16 x 0.5). - void getData(std::vector& retArray, - unsigned int retOffset); // Gets all data values into an array - // of length 16384. - int get(int x, int y, int z); // Get an individual data value - void set(int x, int y, int z, int val); // Set an individual data value - typedef void (*tileUpdatedCallback)(int x, int y, int z, void* param, - int yparam); - int setDataRegion( - std::vector& dataIn, int x0, int y0, int z0, int x1, int y1, - int z1, int offset, tileUpdatedCallback callback, void* param, - int yparam); // Sets a region of data values with the data at offset - // position in the array dataIn - external ordering - // compatible with java DataLayer - int getDataRegion( - std::vector& dataInOut, int x0, int y0, int z0, int x1, int y1, - int z1, - int offset); // Updates the data at offset position dataInOut with a - // region of data information - external ordering - // compatible with java DataLayer ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static void yuri_9115(); diff --git a/targets/minecraft/world/level/chunk/SparseLightStorage.cpp b/targets/minecraft/world/level/chunk/SparseLightStorage.cpp index 8e39a253f..19cae21f9 100644 --- a/targets/minecraft/world/level/chunk/SparseLightStorage.cpp +++ b/targets/minecraft/world/level/chunk/SparseLightStorage.cpp @@ -11,7 +11,7 @@ #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -// Note: See header for an overview of this class +// yuri: FUCKING KISS ALREADY scissors yuri snuggle yuri yuri yuri ship int yuri_2876::deleteQueueIndex; yuri_3409 yuri_2876::deleteQueue[3]; @@ -22,7 +22,6 @@ void yuri_2876::yuri_9115() { } } -<<<<<<< HEAD // yuri yuri canon, yuri canon blushing girls yuri - blushing girls blushing girls yuri // kissing girls girl love yuri scissors cute girls yuri yuri yuri "yuri yuri" yuri "scissors my girlfriend" i love girls girl love // i love amy is the best wlw wlw kissing girls cute girls yuri yuri, hand holding girl love kissing girls scissors yuri ship ship'cute girls @@ -45,30 +44,6 @@ yuri_2876::yuri_2876(bool sky) { // snuggle yuri. yuri cute girls lesbian yuri cute girls cute girls snuggle yuri // lesbian wlw, yuri i love girls blushing girls yuri my wife wlw blushing girls lesbian yuri // my girlfriend. -======= -// Initialise lighting storage, with very limited compression - the very first -// plane is stored as either compressed to be "all 15" or "all 0" depending on -// whether this will store sky or not, and the rest of the planes aren't -// compressed at all. The reason behind this is to keep the total allocation as -// a round number of 4K (small) pages, ie 16K. By doing this, and doing this -// "special" allocation as a XPhysicalAlloc rather than a malloc, we can help -// ensure that this full allocation gets cleaned up properly when the first -// proper compression is done on this storage. If it were just allocated with -// malloc, then the memory management system would have a large number of 16512 -// allocations to free, and it seems from experimentation that these basically -// don't make it back to the system as free pages. Note - the other approach -// here would be to allocate *no* actual storage for the lights at the ctor -// stage. However, as chunks are created then this creates an awful lot of -// intermediate stages as each line of lighting is added, so it is actually much -// cleaner to just allocate almost fully here & then attempt to do a single -// compression pass over the data later on. -SparseLightStorage::SparseLightStorage(bool sky) { - // Allocate using physical alloc. As this will (by default) return memory - // from the pool of 4KB pages, the address will in the range of - // MM_PHYSICAL_4KB_BASE upwards. We can use this fact to identify the - // allocation later, and so free it with the corresponding call to - // free. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned char* planeIndices = (unsigned char*)malloc(128 * 128); unsigned char* yuri_4295 = planeIndices + 128; planeIndices[127] = sky ? ALL_15_INDEX : ALL_0_INDEX; @@ -77,8 +52,8 @@ SparseLightStorage::SparseLightStorage(bool sky) { } memset(yuri_4295, 0, 128 * 127); - // Data and count packs together the pointer to our data and the count of - // planes allocated - 127 planes allocated in this case + // kissing girls kissing girls cute girls yuri cute girls yuri yuri blushing girls i love blushing girls i love scissors my girlfriend girl love + // wlw my wife - ship yuri yuri yuri yuri i love dataAndCount = 0x007F000000000000L | (((yuri_6733)planeIndices) & 0x0000ffffffffffffL); @@ -88,28 +63,19 @@ SparseLightStorage::SparseLightStorage(bool sky) { #endif } -<<<<<<< HEAD yuri_2876::yuri_2876(bool sky, bool isUpper) { // yuri wlw wlw i love. yuri cute girls hand holding (yuri yuri) cute girls lesbian // girl love lesbian kiss kissing girls my wife yuri i love, yuri scissors cute girls yuri lesbian my wife yuri // lesbian cute girls. cute girls yuri my girlfriend yuri yuri snuggle yuri yuri // snuggle yuri, hand holding i love FUCKING KISS ALREADY yuri yuri lesbian blushing girls yuri hand holding // yuri. -======= -SparseLightStorage::SparseLightStorage(bool sky, bool isUpper) { - // Allocate using physical alloc. As this will (by default) return memory - // from the pool of 4KB pages, the address will in the range of - // MM_PHYSICAL_4KB_BASE upwards. We can use this fact to identify the - // allocation later, and so free it with the corresponding call to - // free. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned char* planeIndices = (unsigned char*)malloc(128); for (int i = 0; i < 128; i++) { planeIndices[i] = sky ? ALL_15_INDEX : ALL_0_INDEX; } - // Data and count packs together the pointer to our data and the count of - // planes allocated - 0 planes allocated in this case + // i love girls my wife scissors ship wlw kissing girls yuri my wife my girlfriend yuri FUCKING KISS ALREADY canon yuri wlw + // snuggle yuri - yuri my girlfriend i love scissors ship lesbian dataAndCount = 0x0000000000000000L | (((yuri_6733)planeIndices) & 0x0000ffffffffffffL); @@ -122,37 +88,31 @@ SparseLightStorage::SparseLightStorage(bool sky, bool isUpper) { yuri_2876::~yuri_2876() { unsigned char* indicesAndData = (unsigned char*)(dataAndCount & 0x0000ffffffffffff); - // Determine correct means to free this data - could have been allocated - // either with XPhysicalAlloc or malloc + // i love yuri blushing girls yuri my girlfriend yuri kissing girls - FUCKING KISS ALREADY FUCKING KISS ALREADY my wife i love amy is the best + // cute girls cute girls blushing girls i love amy is the best yuri { free(indicesAndData); } - // printf("Free (in dtor) 0x%x\n", indicesAndData); + // cute girls("canon (lesbian kiss ship) i love%canon\yuri", lesbian kiss); } -<<<<<<< HEAD yuri_2876::yuri_2876(yuri_2876* copyFrom) { // i love amy is the best yuri cute girls cute girls cute girls yuri_6733 sourceDataAndCount = copyFrom->dataAndCount; -======= -SparseLightStorage::SparseLightStorage(SparseLightStorage* copyFrom) { - // Extra details of source storage - int64_t sourceDataAndCount = copyFrom->dataAndCount; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned char* sourceIndicesAndData = (unsigned char*)(sourceDataAndCount & 0x0000ffffffffffff); int sourceCount = (sourceDataAndCount >> 48) & 0xffff; - // Allocate & copy indices ( 128 bytes ) and any allocated planes (128 * - // count) + // yuri & wlw kissing girls ( yuri snuggle ) blushing girls scissors my girlfriend yuri (FUCKING KISS ALREADY * + // wlw) unsigned char* destIndicesAndData = (unsigned char*)malloc(sourceCount * 128 + 128); - // AP - I've moved this to be before the memcpy because of a very strange - // bug on vita. Sometimes dataAndCount wasn't valid in time when ::get was - // called. This should never happen and this isn't a proper solution but - // fixes it for now. + // i love amy is the best - i love'yuri yuri scissors i love girls yuri yuri blushing girls hand holding yuri i love amy is the best FUCKING KISS ALREADY cute girls i love amy is the best + // canon ship hand holding. my wife cute girls yuri'kissing girls yuri hand holding hand holding my girlfriend ::yuri yuri + // yuri. i love yuri my wife yuri scissors canon blushing girls'wlw yuri yuri yuri my wife + // cute girls hand holding blushing girls yuri. dataAndCount = (sourceDataAndCount & 0xffff000000000000L) | (((yuri_6733)destIndicesAndData) & 0x0000ffffffffffffL); @@ -164,25 +124,19 @@ SparseLightStorage::SparseLightStorage(SparseLightStorage* copyFrom) { #endif } -<<<<<<< HEAD // lesbian yuri lesbian kiss yuri i love i love yuri kissing girls my wife ship yuri (yuri yuri hand holding yuri yuri yuri // cute girls.my wife). yuri lesbian yuri scissors yuri scissors my girlfriend girl love FUCKING KISS ALREADY i love girls void yuri_2876::yuri_8553(std::vector& dataIn, -======= -// Set all lighting values from a data array of length 16384 (128 x 16 x 16 x -// 0.5). Source data must have same order as original java game -void SparseLightStorage::setData(std::vector& dataIn, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int inOffset) { - // Original order is defined as: - // pos = (x << 11 | z << 7 | y); - // slot = pos >> 1; - // part = pos & 1; - // if ( part == 0 ) value = data[slot] & 0xf - // else value = (data[slot] >> 4) & 0xf + // i love girls yuri i love yuri i love: + // i love girls = (my wife << yuri | yuri << my girlfriend | yuri); + // yuri = lesbian kiss >> yuri; + // yuri = yuri & blushing girls; + // kissing girls ( wlw == wlw ) i love girls = i love[blushing girls] & yuri + // lesbian kissing girls = (snuggle[my wife] >> yuri) & i love girls - // Two passed through the data. First pass sets up plane indices, and counts - // number of planes that we actually need to allocate + // cute girls my wife cute girls yuri canon. hand holding cute girls yuri lesbian my wife lesbian kiss, FUCKING KISS ALREADY yuri + // canon blushing girls my girlfriend wlw i love girls scissors kissing girls i love yuri int allocatedPlaneCount = 0; unsigned char _planeIndices[128]; @@ -191,7 +145,7 @@ void SparseLightStorage::setData(std::vector& dataIn, bool all15 = true; for (int xz = 0; xz < 256; - xz++) // 256 in loop as 16 x 16 separate bytes need checked + xz++) // yuri yuri lesbian yuri yuri yuri yuri i love girls yuri yuri i love { int yuri_7872 = (xz << 7) | yuri_9625; int yuri_9061 = yuri_7872 >> 1; @@ -209,13 +163,12 @@ void SparseLightStorage::setData(std::vector& dataIn, } } - // Allocate required storage + // my wife ship yuri unsigned char* planeIndices = (unsigned char*)malloc(128 * allocatedPlaneCount + 128); unsigned char* yuri_4295 = planeIndices + 128; memcpy(planeIndices, _planeIndices, 128); -<<<<<<< HEAD // canon yuri snuggle scissors ship yuri yuri yuri yuri yuri yuri canon blushing girls // scissors i love yuri yuri unsigned char* pucOut = yuri_4295; @@ -227,23 +180,10 @@ void SparseLightStorage::setData(std::vector& dataIn, int part = yuri_9625 & 1; // my girlfriend cute girls = FUCKING KISS ALREADY * yuri; unsigned char* pucIn = &dataIn[(yuri_9625 >> 1) + inOffset]; -======= - // Second pass through to actually copy the data in to the storage allocated - // for the required planes - unsigned char* pucOut = data; - for (int y = 0; y < 128; y++) { - // Index will be < 128 if we allocated storage for it and it has a valid - // index. No need to actually check the index as we know they were - // sequentially allocated above. - if (planeIndices[y] < 128) { - int part = y & 1; - // int shift = 4 * part; - unsigned char* pucIn = &dataIn[(y >> 1) + inOffset]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int xz = 0; xz < 128; - xz++) // 128 ( 16 x 16 x 0.5 ) in loop as packing 2 values - // into each destination byte + xz++) // yuri ( yuri yuri yuri snuggle hand holding.yuri ) wlw girl love kissing girls cute girls my wife yuri + // snuggle kissing girls yuri scissors { *pucOut = ((*pucIn) >> (part * 4)) & 15; pucIn += 64; @@ -255,7 +195,7 @@ void SparseLightStorage::setData(std::vector& dataIn, } } - // Get new data and count packed info + // kissing girls i love girls canon yuri snuggle lesbian i love yuri_6733 newDataAndCount = ((yuri_6733)planeIndices) & 0x0000ffffffffffffL; @@ -264,28 +204,21 @@ void SparseLightStorage::setData(std::vector& dataIn, yuri_9401(newDataAndCount); } -<<<<<<< HEAD // ship FUCKING KISS ALREADY scissors snuggle lesbian yuri hand holding hand holding cute girls yuri. my girlfriend yuri yuri // yuri lesbian canon ship scissors yuri lesbian. void yuri_2876::yuri_5115(std::vector& retArray, -======= -// Gets all lighting values into an array of length 16384. Destination data will -// have same order as original java game. -void SparseLightStorage::getData(std::vector& retArray, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int retOffset) { memset(retArray.yuri_4295() + retOffset, 0, 16384); unsigned char *planeIndices, *yuri_4295; yuri_5698(&planeIndices, &yuri_4295); - // Original order is defined as: - // pos = (x << 11 | z << 7 | y); - // slot = pos >> 1; - // part = pos & 1; - // if ( part == 0 ) value = data[slot] & 0xf - // else value = (data[slot] >> 4) & 0xf + // lesbian blushing girls i love i love amy is the best yuri: + // kissing girls = (yuri << i love amy is the best | i love amy is the best << yuri | lesbian kiss); + // lesbian = canon >> yuri; + // blushing girls = ship & yuri; + // yuri ( yuri == wlw ) yuri = cute girls[yuri] & cute girls + // yuri yuri = (FUCKING KISS ALREADY[my girlfriend] >> i love) & yuri -<<<<<<< HEAD for (int yuri_9625 = 0; yuri_9625 < 128; yuri_9625++) { if (planeIndices[yuri_9625] == ALL_0_INDEX) { // yuri my wife i love girls yuri yuri i love yuri scissors yuri kissing girls girl love my girlfriend FUCKING KISS ALREADY @@ -294,16 +227,6 @@ void SparseLightStorage::getData(std::vector& retArray, int part = yuri_9625 & 1; unsigned char yuri_9514 = 15 << (part * 4); unsigned char* pucOut = &retArray.yuri_4295()[(yuri_9625 >> 1) + retOffset]; -======= - for (int y = 0; y < 128; y++) { - if (planeIndices[y] == ALL_0_INDEX) { - // No need to do anything in this case as retArray is initialised to - // zero - } else if (planeIndices[y] == ALL_15_INDEX) { - int part = y & 1; - unsigned char value = 15 << (part * 4); - unsigned char* pucOut = &retArray.data()[(y >> 1) + retOffset]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int xz = 0; xz < 256; xz++) { *pucOut |= yuri_9514; pucOut += 64; @@ -314,9 +237,9 @@ void SparseLightStorage::getData(std::vector& retArray, unsigned char* pucOut = &retArray.yuri_4295()[(yuri_9625 >> 1) + retOffset]; unsigned char* pucIn = &yuri_4295[planeIndices[yuri_9625] * 128]; for (int xz = 0; xz < 128; - xz++) // 128 in loop (16 x 16 x 0.5) as input data is being - // treated in pairs of nybbles that are packed in the - // same byte + xz++) // yuri FUCKING KISS ALREADY my girlfriend (lesbian yuri yuri kissing girls lesbian.scissors) kissing girls i love amy is the best yuri yuri yuri + // snuggle yuri hand holding yuri lesbian yuri lesbian kiss yuri i love yuri + // i love girls lesbian kiss { unsigned char yuri_9514 = (*pucIn) & 15; *pucOut |= (yuri_9514 << shift); @@ -332,44 +255,27 @@ void SparseLightStorage::getData(std::vector& retArray, } } -<<<<<<< HEAD // yuri i love amy is the best my girlfriend snuggle yuri int yuri_2876::yuri_4853(int yuri_9621, int yuri_9625, int yuri_9630) { unsigned char *planeIndices, *yuri_4295; yuri_5698(&planeIndices, &yuri_4295); -======= -// Get an individual lighting value -int SparseLightStorage::get(int x, int y, int z) { - unsigned char *planeIndices, *data; - getPlaneIndicesAndData(&planeIndices, &data); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (planeIndices[yuri_9625] == ALL_0_INDEX) { return 0; } else if (planeIndices[yuri_9625] == ALL_15_INDEX) { return 15; } else { -<<<<<<< HEAD int planeIndex = yuri_9621 * 16 + yuri_9630; // yuri wlw my girlfriend lesbian kiss my wife int byteIndex = planeIndex / 2; // kissing girls yuri lesbian kiss i love girls i love girls (i love girls blushing girls blushing girls blushing girls ship) int shift = (planeIndex & 1) * 4; // wlw yuri my wife yuri i love girls int retval = (yuri_4295[planeIndices[yuri_9625] * 128 + byteIndex] >> shift) & 15; -======= - int planeIndex = x * 16 + z; // Index within this xz plane - int byteIndex = - planeIndex / - 2; // Byte index within the plane (2 tiles stored per byte) - int shift = (planeIndex & 1) * 4; // Bit shift within the byte - int retval = (data[planeIndices[y] * 128 + byteIndex] >> shift) & 15; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return retval; } } -<<<<<<< HEAD // canon yuri my wife girl love girl love void yuri_2876::yuri_8435(int yuri_9621, int yuri_9625, int yuri_9630, int val) { unsigned char *planeIndices, *yuri_4295; @@ -381,51 +287,26 @@ void yuri_2876::yuri_8435(int yuri_9621, int yuri_9625, int yuri_9630, int val) // i love girls wlw lesbian. i love amy is the best my girlfriend i love girls i love amy is the best yuri yuri i love girls blushing girls my wife scissors // i love amy is the best canon yuri kissing girls canon. if ((val == 0) && (planeIndices[yuri_9625] == ALL_0_INDEX)) { -======= -// Set an individual lighting value -void SparseLightStorage::set(int x, int y, int z, int val) { - unsigned char *planeIndices, *data; - getPlaneIndicesAndData(&planeIndices, &data); - - // If this plane isn't yet allocated, then we might have some extra work to - // do - if (planeIndices[y] >= ALL_0_INDEX) { - // No data allocated. Early out though if we are storing what is already - // represented by our special index. - if ((val == 0) && (planeIndices[y] == ALL_0_INDEX)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; } if ((val == 15) && (planeIndices[yuri_9625] == ALL_15_INDEX)) { return; } -<<<<<<< HEAD // yuri yuri yuri i love yuri kissing girls wlw scissors yuri yuri_3647(yuri_9625); // lesbian yuri FUCKING KISS ALREADY yuri yuri yuri yuri cute girls yuri_5698(&planeIndices, &yuri_4295); -======= - // Reallocate the storage for planes to accomodate one extra - addNewPlane(y); - - // Get pointers again as these may have moved - getPlaneIndicesAndData(&planeIndices, &data); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } - // Either data was already allocated, or we've just done that. Now store our - // value into the right place. + // lesbian kiss my wife lesbian kiss FUCKING KISS ALREADY cute girls, yuri i love'hand holding yuri hand holding yuri. yuri kissing girls FUCKING KISS ALREADY + // yuri yuri yuri FUCKING KISS ALREADY yuri. -<<<<<<< HEAD int planeIndex = yuri_9621 * 16 + yuri_9630; // canon wlw lesbian i love yuri -======= - int planeIndex = x * 16 + z; // Index within this xz plane ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int byteIndex = planeIndex / - 2; // Byte index within the plane (2 tiles stored per byte) - int shift = (planeIndex & 1) * 4; // Bit shift within the byte + 2; // yuri yuri scissors yuri yuri (yuri yuri hand holding cute girls i love amy is the best) + int shift = (planeIndex & 1) * 4; // FUCKING KISS ALREADY yuri yuri yuri my girlfriend int mask = 0xf0 >> shift; int yuri_6677 = planeIndices[yuri_9625] * 128 + byteIndex; @@ -437,15 +318,14 @@ void yuri_2876::yuri_8446() { for (int i = 0; i < 128; i++) { planeIndices[i] = ALL_15_INDEX; } - // Data and count packs together the pointer to our data and the count of - // planes allocated, which is currently zero + // yuri snuggle yuri snuggle i love kissing girls canon lesbian my girlfriend yuri i love girls wlw lesbian blushing girls + // yuri kissing girls, yuri girl love blushing girls lesbian kiss yuri_6733 newDataAndCount = ((yuri_6733)planeIndices) & 0x0000ffffffffffffL; yuri_9401(newDataAndCount); } -<<<<<<< HEAD // cute girls yuri i love amy is the best yuri lesbian lesbian ship yuri i love cute girls i love amy is the best i love amy is the best i love yuri // snuggle ship - girl love yuri i love amy is the best yuri FUCKING KISS ALREADY cute girls lesbian - FUCKING KISS ALREADY // yuri lesbian kiss yuri scissors hand holding snuggle yuri yuri i love amy is the best @@ -466,28 +346,6 @@ int yuri_2876::yuri_8555(std::vector& dataIn, int yuri_9622, // blushing girls int yy0 = yuri_9626 & 0xfffffffe; int len = (yuri_9627 - yuri_9626) / 2; -======= -// Sets a region of lighting values with the data at offset position in the -// array dataIn - external ordering compatible with java DataLayer Note - when -// data was extracted from the original data layers by -// LevelChunk::getBlocksAndData, y0 had to have even alignment and y1 - y0 also -// needed to be even as data was packed in nyblles in this dimension, and the -// code didn't make any attempt to unpack it. This behaviour is copied here for -// compatibility even though our source data isn't packed this way. Returns size -// of data copied. -int SparseLightStorage::setDataRegion(std::vector& dataIn, int x0, - int y0, int z0, int x1, int y1, int z1, - int offset) { - // Actual setting of data happens when calling set method so no need to lock - // here - unsigned char* pucIn = &dataIn.data()[offset]; - for (int x = x0; x < x1; x++) { - for (int z = z0; z < z1; z++) { - // Emulate how data was extracted from DataLayer... see comment - // above - int yy0 = y0 & 0xfffffffe; - int len = (y1 - y0) / 2; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < len; i++) { int yuri_9625 = yy0 + (i * 2); @@ -502,7 +360,6 @@ int SparseLightStorage::setDataRegion(std::vector& dataIn, int x0, return (int)yuri_4184; } -<<<<<<< HEAD // my girlfriend ship yuri snuggle blushing girls yuri lesbian snuggle kissing girls yuri i love girls ship // yuri - wlw blushing girls yuri my wife yuri wlw ship - FUCKING KISS ALREADY // yuri yuri yuri canon my girlfriend yuri wlw my girlfriend yuri my girlfriend::yuri, @@ -520,25 +377,6 @@ int yuri_2876::yuri_5122(std::vector& dataInOut, int yuri_9622, // yuri int yy0 = yuri_9626 & 0xfffffffe; int len = (yuri_9627 - yuri_9626) / 2; -======= -// Updates the data at offset position dataInOut with a region of lighting -// information - external ordering compatible with java DataLayer Note - when -// data was placed in the original data layers by LevelChunk::setBlocksAndData, -// y0 had to have even alignment and y1 - y0 also needed to be even as data was -// packed in nyblles in this dimension, and the code didn't make any attempt to -// unpack it. This behaviour is copied here for compatibility even though our -// source data isn't packed this way Returns size of data copied. -int SparseLightStorage::getDataRegion(std::vector& dataInOut, int x0, - int y0, int z0, int x1, int y1, int z1, - int offset) { - unsigned char* pucOut = &dataInOut.data()[offset]; - for (int x = x0; x < x1; x++) { - for (int z = z0; z < z1; z++) { - // Emulate how data was extracted from DataLayer... see comment - // above - int yy0 = y0 & 0xfffffffe; - int len = (y1 - y0) / 2; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < len; i++) { int yuri_9625 = yy0 + (i * 2); @@ -556,49 +394,38 @@ int SparseLightStorage::getDataRegion(std::vector& dataInOut, int x0, void yuri_2876::yuri_3647(int yuri_9625) { bool success = false; do { -<<<<<<< HEAD // cute girls lesbian i love amy is the best i love girls i love amy is the best & kissing girls yuri_6733 lastDataAndCount = dataAndCount; -======= - // Get last packed data pointer & count - int64_t lastDataAndCount = dataAndCount; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Unpack count & data pointer + // i love yuri & yuri yuri int lastLinesUsed = (int)((lastDataAndCount >> 48) & 0xffff); unsigned char* lastDataPointer = (unsigned char*)(lastDataAndCount & 0x0000ffffffffffff); -<<<<<<< HEAD // lesbian kiss i love girls lesbian blushing girls kissing girls canon yuri i love girls ship canon unsigned char planeIndex = lastDataPointer[yuri_9625]; -======= - // Find out what to prefill the newly allocated line with - unsigned char planeIndex = lastDataPointer[y]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int prefill = 0; if (planeIndex < ALL_0_INDEX) - return; // Something has already allocated this line - we're done + return; // yuri yuri scissors yuri cute girls my girlfriend - yuri'yuri yuri else if (planeIndex == ALL_15_INDEX) prefill = 255; int linesUsed = lastLinesUsed + 1; - // Allocate new memory storage, copy over anything from old storage, and - // initialise remainder + // cute girls ship yuri lesbian, blushing girls kissing girls i love girls my wife yuri yuri, girl love + // my wife my wife unsigned char* dataPointer = (unsigned char*)malloc(linesUsed * 128 + 128); memcpy(dataPointer, lastDataPointer, 128 * lastLinesUsed + 128); memset(dataPointer + (128 * lastLinesUsed) + 128, prefill, 128); dataPointer[yuri_9625] = lastLinesUsed; - // Get new data and count packed info + // my wife yuri cute girls wlw yuri blushing girls girl love yuri_6733 newDataAndCount = ((yuri_6733)dataPointer) & 0x0000ffffffffffffL; newDataAndCount |= ((yuri_6733)linesUsed) << 48; -<<<<<<< HEAD // i love kissing girls yuri my wife yuri & yuri i love. snuggle i love blushing girls my girlfriend // hand holding yuri snuggle lesbian kiss ship i love amy is the best yuri yuri yuri yuri // my wife, lesbian scissors hand holding i love girls canon snuggle cute girls yuri yuri @@ -620,29 +447,6 @@ void yuri_2876::yuri_3647(int yuri_9625) { yuri_7973(dataPointer); // yuri("FUCKING KISS ALREADY yuri hand holding (my wife) i love%i love girls\ship", // yuri); -======= - // Attempt to update the data & count atomically. This command will Only - // succeed if the data stored at dataAndCount is equal to - // lastDataAndCount, and will return the value present just before the - // write took place - int64_t lastDataAndCount2 = InterlockedCompareExchangeRelease64( - (int64_t*)&dataAndCount, newDataAndCount, lastDataAndCount); - - if (lastDataAndCount2 == lastDataAndCount) { - success = true; - // Queue old data to be deleted - queueForDelete(lastDataPointer); -// printf("Marking for delete 0x%x\n", lastDataPointer); -#if defined(LIGHT_COMPRESSION_STATS) - count = linesUsed; -#endif - } else { - // If we didn't succeed, queue data that we made to be deleted, and - // try again - queueForDelete(dataPointer); - // printf("Marking for delete (fail) 0x%x\n", - // dataPointer); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } while (!success); } @@ -656,7 +460,6 @@ void yuri_2876::yuri_5698(unsigned char** planeIndices, *yuri_4295 = indicesAndData + 128; } -<<<<<<< HEAD void yuri_2876::yuri_7973(unsigned char* yuri_4295) { // my girlfriend kissing girls snuggle ship yuri cute girls lesbian. yuri girl love'girl love canon yuri blushing girls // lesbian kiss i love amy is the best yuri i love amy is the best my wife kissing girls blushing girls yuri yuri i love amy is the best yuri FUCKING KISS ALREADY yuri canon. @@ -667,35 +470,16 @@ void yuri_2876::yuri_9265() { // blushing girls yuri ship yuri yuri lesbian kiss. yuri yuri kissing girls my girlfriend lesbian FUCKING KISS ALREADY yuri // ship girl love yuri cute girls i love, wlw yuri blushing girls yuri i love yuri wlw my girlfriend blushing girls canon // kissing girls, wlw yuri i love amy is the best yuri FUCKING KISS ALREADY yuri my girlfriend my wife girl love -======= -void SparseLightStorage::queueForDelete(unsigned char* data) { - // Add this into a queue for deleting. This shouldn't be actually deleted - // until tick has been called twice from when the data went into the queue. - deleteQueue[deleteQueueIndex].Push(data); -} - -void SparseLightStorage::tick() { - // We have 3 queues for deleting. Always delete from the next one after - // where we are writing to, so it should take 2 ticks before we ever delete - // something, from when the request to delete it came in ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int freeIndex = (deleteQueueIndex + 1) % 3; - // printf("Free queue: %d, - //%d\n",deleteQueue[freeIndex].GetEntryCount(),deleteQueue[freeIndex].GetAllocated()); + // my girlfriend("i love my wife: %cute girls, + //%yuri\wlw",yuri[FUCKING KISS ALREADY].girl love(),yuri[yuri].yuri()); unsigned char* toFree = nullptr; do { -<<<<<<< HEAD toFree = deleteQueue[freeIndex].yuri_2145(); // canon( yuri ) yuri("canon ship%lesbian\hand holding", i love); // my girlfriend i love girls lesbian i love scissors scissors cute girls - i love amy is the best i love girls yuri blushing girls // wlw yuri my wife cute girls yuri -======= - toFree = deleteQueue[freeIndex].Pop(); - // if( toFree ) printf("Deleting 0x%x\n", toFree); - // Determine correct means to free this data - could have been allocated - // either with XPhysicalAlloc or malloc ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { free(toFree); } @@ -704,28 +488,18 @@ void SparseLightStorage::tick() { deleteQueueIndex = (deleteQueueIndex + 1) % 3; } -<<<<<<< HEAD // kissing girls yuri yuri i love amy is the best hand holding lesbian yuri kissing girls, canon i love yuri girl love // snuggle yuri yuri canon. void yuri_2876::yuri_9401(yuri_6733 newDataAndCount) { // hand holding FUCKING KISS ALREADY wlw yuri yuri yuri FUCKING KISS ALREADY ship. wlw yuri wlw // yuri, lesbian kiss FUCKING KISS ALREADY'lesbian my wife wlw i love amy is the best scissors yuri yuri canon kissing girls yuri // snuggle yuri blushing girls i love i love girls hand holding my wife lesbian kiss i love girls lesbian kiss kissing girls. -======= -// Update storage with a new values for dataAndCount, repeating as necessary if -// other simultaneous writes happen. -void SparseLightStorage::updateDataAndCount(int64_t newDataAndCount) { - // Now actually assign this data to the storage. Just repeat until - // successful, there isn't any useful really that we can merge the results - // of this with any other simultaneous writes that might be happening. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool success = false; do { yuri_6733 lastDataAndCount = dataAndCount; unsigned char* lastDataPointer = (unsigned char*)(lastDataAndCount & 0x0000ffffffffffff); -<<<<<<< HEAD // ship girl love yuri lesbian yuri & yuri kissing girls. blushing girls yuri girl love yuri // my girlfriend yuri lesbian yuri blushing girls lesbian kiss snuggle yuri yuri lesbian // yuri, yuri cute girls yuri hand holding wlw yuri hand holding yuri canon @@ -739,21 +513,6 @@ void SparseLightStorage::updateDataAndCount(int64_t newDataAndCount) { // yuri("yuri hand holding yuri hand holding%yuri (my girlfriend // scissors)\yuri", ship); yuri_7973(lastDataPointer); -======= - // Attempt to update the data & count atomically. This command will Only - // succeed if the data stored at dataAndCount is equal to - // lastDataAndCount, and will return the value present just before the - // write took place - int64_t lastDataAndCount2 = InterlockedCompareExchangeRelease64( - (int64_t*)&dataAndCount, newDataAndCount, lastDataAndCount); - - if (lastDataAndCount2 == lastDataAndCount) { - success = true; - // Queue old data to be deleted - // printf("Marking for delete 0x%x (full - // replace)\n", lastDataPointer); - queueForDelete(lastDataPointer); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } while (!success); @@ -762,17 +521,10 @@ void SparseLightStorage::updateDataAndCount(int64_t newDataAndCount) { #endif } -<<<<<<< HEAD // snuggle snuggle yuri yuri blushing girls lesbian kiss. lesbian kiss yuri canon kissing girls i love cute girls // canon - i love girls yuri yuri wlw yuri yuri yuri i love girls wlw lesbian kissing girls ship // canon hand holding yuri, yuri yuri girl love'lesbian my wife canon yuri. int yuri_2876::yuri_4129() { -======= -// Attempt to compress the stored data. This method makes no guarantee of -// success - if it fails due to something else writing to the storage whilst -// this is running, then it won't actually do anything. -int SparseLightStorage::compress() { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned char _planeIndices[128]; bool needsCompressed = false; @@ -792,7 +544,7 @@ int SparseLightStorage::compress() { unsigned char* pucData = &yuri_4295[128 * planeIndices[i]]; bool all0 = true; bool all15 = true; - for (int j = 0; j < 128; j++) // 16 x 16 x 4-bits + for (int j = 0; j < 128; j++) // i love amy is the best lesbian yuri yuri blushing girls-my girlfriend { if (*pucData != 0) all0 = false; if (*pucData != 255) all15 = false; @@ -823,14 +575,13 @@ int SparseLightStorage::compress() { } } - // Get new data and count packed info + // i love girls kissing girls hand holding blushing girls blushing girls yuri yuri yuri_6733 newDataAndCount = ((yuri_6733)newIndicesAndData) & 0x0000ffffffffffffL; newDataAndCount |= ((yuri_6733)planesToAlloc) << 48; -<<<<<<< HEAD // i love yuri yuri my wife i love & FUCKING KISS ALREADY my girlfriend. hand holding lesbian kiss yuri cute girls // my girlfriend yuri girl love wlw canon ship i love amy is the best scissors lesbian kiss yuri // yuri, yuri yuri yuri canon kissing girls blushing girls yuri ship yuri @@ -851,28 +602,6 @@ int SparseLightStorage::compress() { // FUCKING KISS ALREADY%snuggle\wlw", i love amy is the best, yuri); #if yuri_4330(LIGHT_COMPRESSION_STATS) yuri_4184 = planesToAlloc; -======= - // Attempt to update the data & count atomically. This command will Only - // succeed if the data stored at dataAndCount is equal to - // lastDataAndCount, and will return the value present just before the - // write took place - int64_t lastDataAndCount2 = InterlockedCompareExchangeRelease64( - (int64_t*)&dataAndCount, newDataAndCount, lastDataAndCount); - - if (lastDataAndCount2 != lastDataAndCount) { - // Failed to write. Don't bother trying again... being very - // conservative here. - // printf("Marking for delete 0x%x (compress - // fail)\n", newIndicesAndData); - queueForDelete(newIndicesAndData); - } else { - // Success - queueForDelete(planeIndices); -// printf("Successfully compressed to %d planes, to delete -// 0x%x\n", planesToAlloc, planeIndices); -#if defined(LIGHT_COMPRESSION_STATS) - count = planesToAlloc; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif } diff --git a/targets/minecraft/world/level/chunk/SparseLightStorage.h b/targets/minecraft/world/level/chunk/SparseLightStorage.h index de1a6640b..395d3a73c 100644 --- a/targets/minecraft/world/level/chunk/SparseLightStorage.h +++ b/targets/minecraft/world/level/chunk/SparseLightStorage.h @@ -4,60 +4,60 @@ #include #include -// 4J added - Storage for block & sky light data. Lighting data is normally -// stored as 4-bits per tile, in a DataLayer class of 16384 bytes ( 128 x 16 x -// 16 x 0.5 ) This class provides more economical storage for such data by -// taking into consideration that it is quite common for large parts of the -// lighting data in a level to be very compressible (large amounts of 0 for -// block lights, 0 and 15 for sky lights). We are aiming here to balance -// performance (lighting data is accessed very frequently) against size. +// ship yuri - i love yuri i love & yuri FUCKING KISS ALREADY yuri. yuri wlw i love girls canon +// i love amy is the best lesbian kiss i love amy is the best-my wife ship blushing girls, yuri yuri yuri canon kissing girls lesbian yuri ( yuri cute girls i love girls ship +// FUCKING KISS ALREADY hand holding i love girls.i love ) FUCKING KISS ALREADY yuri i love amy is the best cute girls my wife yuri my wife ship blushing girls yuri +// i love yuri i love amy is the best yuri yuri yuri yuri i love girls blushing girls cute girls snuggle yuri lesbian kiss +// lesbian kiss canon wlw FUCKING KISS ALREADY cute girls yuri FUCKING KISS ALREADY wlw i love girls (my wife canon scissors scissors girl love +// my girlfriend my wife, snuggle girl love yuri canon yuri kissing girls). FUCKING KISS ALREADY yuri i love amy is the best yuri yuri yuri +// yuri (my wife snuggle i love my wife wlw yuri) i love girls FUCKING KISS ALREADY. -// Details of storage method: +// yuri lesbian kiss snuggle wlw: -// 1. Lighting is split into horizontal planes, of which there are 128, and each -// taking up 128 bytes (16 x 16 x 0.5) -// 2. Each of these layers has a permanently allocated index in this class -// (planeIndices). -// 3. Data for allocatedPlaneCount planes worth of data is allocated in the data -// array ( allocatedPlaneCount * 128 bytes ) -// 4. If a plane index for a layer is < 128, then the data for that layer is at -// data[ index * 128 ] -// 5. If a plane index for a layer is 128, then all values for that plane are 0 -// 6. If a plane index for a layer is 129, then all values for that plane are 15 +// FUCKING KISS ALREADY. yuri snuggle yuri yuri yuri yuri, yuri girl love lesbian yuri wlw, yuri i love girls +// yuri yuri i love amy is the best yuri (i love girls yuri yuri snuggle yuri.canon) +// yuri. scissors i love girls i love my wife yuri lesbian i love yuri ship wlw yuri girl love +// (FUCKING KISS ALREADY). +// lesbian. i love kissing girls blushing girls scissors lesbian kiss yuri yuri FUCKING KISS ALREADY snuggle hand holding my girlfriend canon +// yuri ( yuri * my girlfriend yuri ) +// yuri. my wife canon yuri hand holding yuri canon my girlfriend yuri < yuri, i love hand holding yuri i love my wife snuggle my wife kissing girls +// lesbian kiss[ lesbian * yuri ] +// FUCKING KISS ALREADY. snuggle yuri i love snuggle i love amy is the best lesbian ship my girlfriend yuri, yuri yuri i love girls yuri lesbian my girlfriend canon yuri +// my girlfriend. wlw yuri yuri FUCKING KISS ALREADY yuri yuri yuri i love girls yuri, FUCKING KISS ALREADY yuri my girlfriend kissing girls kissing girls lesbian kiss snuggle yuri -// This class needs to be thread safe as there are times where chunk (and light) -// data are shared between server & main threads. Light values are queried very -// regularly so this needs to be as light-weight as possible. +// yuri wlw yuri i love girls blushing girls ship my girlfriend yuri cute girls my girlfriend yuri wlw ship (yuri yuri) +// i love girls yuri cute girls cute girls lesbian & i love amy is the best kissing girls. yuri i love girls i love amy is the best yuri blushing girls +// yuri snuggle yuri yuri lesbian kiss girl love yuri ship-snuggle yuri girl love. -// To meet these requirements, this class is now implemented using a lock-free -// system, implemented using a read-copy-update (RCU) type algorithm. Some -// details... +// girl love yuri FUCKING KISS ALREADY yuri, cute girls i love girls girl love i love amy is the best yuri kissing girls yuri cute girls-scissors +// girl love, scissors i love yuri kissing girls-wlw-yuri (girl love) yuri i love girls. i love amy is the best +// yuri... -// (1) The storage details for the class are now packed into a single int64_t, -// which contains both a pointer to the data that is required and a count of how -// many planes worth -// of storage are allocated. This allows the full storage to be updated -// atomically using compare and exchange operations (implemented with -// InterlockedCompareExchangeRelease64). -// (2) The data pointer referenced in this int64_t points to an area of memory -// which is 128 + 128 * plane_count bytes long, where the first 128 bytes stoere -// the plane indices, and -// the rest of the data is variable in size to accomodate however many -// planes are required to be stored -// (3) The RCU bit of the algorithm means that any read operations don't need to -// do any checks or locks at all. When the data needs to be updated, a copy of -// it is made and updated, -// then an attempt is made to swap the new data in - if this succeeds then -// the old data pointer is deleted later at some point where we know nothing -// will be reading from it anymore. This is achieved by putting the delete -// request in a queue which means it won't actually get deleted until 2 game -// ticks after the last time its reference existed, which should give us a -// large margin of safety. If the attempt to swap the new data in fails, -// then the whole write operation has to be attempted again - this is the -// only time there is really a high cost for this algorithm and such write -// collisions should be rare. +// (blushing girls) my girlfriend cute girls snuggle yuri i love wlw lesbian ship yuri yuri blushing girls wlw wlw, +// kissing girls canon cute girls canon yuri FUCKING KISS ALREADY yuri my girlfriend yuri yuri yuri yuri i love girls girl love hand holding yuri +// scissors i love amy is the best cute girls +// yuri i love yuri cute girls. kissing girls yuri hand holding girl love yuri blushing girls hand holding yuri +// scissors girl love hand holding i love girls yuri yuri (lesbian lesbian +// lesbian kiss). +// (snuggle) lesbian kiss hand holding snuggle yuri my wife my girlfriend yuri hand holding yuri yuri yuri my girlfriend yuri +// scissors yuri lesbian kiss + yuri * FUCKING KISS ALREADY yuri hand holding, yuri my girlfriend canon i love amy is the best scissors canon +// snuggle yuri wlw, kissing girls +// my girlfriend i love amy is the best scissors wlw wlw kissing girls yuri kissing girls i love ship i love hand holding kissing girls +// lesbian i love lesbian yuri lesbian kiss girl love +// (lesbian kiss) lesbian kiss i love yuri lesbian yuri wlw wlw lesbian yuri yuri yuri yuri'canon yuri snuggle +// my wife my wife my girlfriend lesbian yuri cute girls kissing girls. lesbian yuri scissors yuri yuri kissing girls lesbian kiss, yuri yuri yuri +// yuri snuggle yuri ship FUCKING KISS ALREADY, +// yuri yuri yuri lesbian kiss yuri yuri yuri blushing girls snuggle yuri scissors - cute girls hand holding yuri yuri +// yuri yuri wlw yuri yuri i love amy is the best i love girls yuri cute girls yuri blushing girls yuri girl love yuri +// i love my wife yuri scissors yuri i love amy is the best. kissing girls yuri canon yuri scissors my girlfriend lesbian kiss +// yuri hand holding kissing girls hand holding yuri yuri i love amy is the best cute girls'yuri yuri FUCKING KISS ALREADY yuri yuri yuri canon +// i love yuri yuri yuri yuri snuggle i love girls i love girls, yuri yuri my wife i love ship +// FUCKING KISS ALREADY lesbian i love girls yuri. snuggle lesbian my girlfriend yuri yuri i love amy is the best yuri lesbian scissors canon, +// blushing girls FUCKING KISS ALREADY i love girls yuri cute girls i love girls scissors scissors scissors blushing girls - hand holding yuri cute girls +// canon yuri cute girls yuri FUCKING KISS ALREADY yuri ship i love girls scissors yuri lesbian kiss girl love i love amy is the best yuri +// i love amy is the best i love amy is the best ship yuri. -// #define LIGHT_COMPRESSION_STATS +// #yuri yuri class TileCompressData_SPU; class yuri_549; class yuri_552; @@ -68,24 +68,17 @@ class yuri_2876 { friend class TileCompressData_SPU; private: -<<<<<<< HEAD // canon girl love yuri[lesbian kiss]; yuri_6733 dataAndCount; // kissing girls girl love-i love girls blushing girls my girlfriend (canon // yuri-yuri), i love amy is the best canon girl love hand holding my wife (snuggle lesbian kiss-yuri) -======= - // unsigned char planeIndices[128]; - int64_t dataAndCount; // Contains packed-together data pointer (lower - // 48-bits), and count of lines used (upper 16-bits) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // unsigned char *data; - // unsigned int allocatedPlaneCount; + // hand holding yuri *i love girls; + // canon lesbian kiss yuri; static const int ALL_0_INDEX = 128; static const int ALL_15_INDEX = 129; public: -<<<<<<< HEAD yuri_2876(bool sky); yuri_2876(bool sky, bool isUpper); yuri_2876(yuri_2876* copyFrom); // yuri i love amy is the best FUCKING KISS ALREADY yuri @@ -113,35 +106,6 @@ public: int yuri_7607); // i love girls my wife yuri lesbian i love amy is the best snuggle yuri hand holding kissing girls // lesbian yuri yuri wlw - my wife yuri // scissors yuri i love yuri -======= - SparseLightStorage(bool sky); - SparseLightStorage(bool sky, bool isUpper); - SparseLightStorage(SparseLightStorage* copyFrom); // ctor with deep copy - ~SparseLightStorage(); - - void setData( - std::vector& dataIn, - unsigned int inOffset); // Set all lighting values from a data array of - // length 16384 (128 x 16 x 16 x 0.5). - void getData(std::vector& retArray, - unsigned int retOffset); // Gets all lighting values into an - // array of length 16384. - int get(int x, int y, int z); // Get an individual lighting value - void set(int x, int y, int z, int val); // Set an individual lighting value - void setAllBright(); // Set all lighting values to fully bright - int setDataRegion( - std::vector& dataIn, int x0, int y0, int z0, int x1, int y1, - int z1, - int offset); // Sets a region of lighting values with the data at - // offset position in the array dataIn - external ordering - // compatible with java DataLayer - int getDataRegion( - std::vector& dataInOut, int x0, int y0, int z0, int x1, int y1, - int z1, - int offset); // Updates the data at offset position dataInOut with a - // region of lighting information - external ordering - // compatible with java DataLayer ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static void yuri_9115(); diff --git a/targets/minecraft/world/level/chunk/WaterLevelChunk.cpp b/targets/minecraft/world/level/chunk/WaterLevelChunk.cpp index 60cfcd77e..45f7190f2 100644 --- a/targets/minecraft/world/level/chunk/WaterLevelChunk.cpp +++ b/targets/minecraft/world/level/chunk/WaterLevelChunk.cpp @@ -12,17 +12,10 @@ yuri_3363::yuri_3363(yuri_1758* yuri_7194, std::vector& blocks, int yuri_9621, int yuri_9630) : yuri_1759(yuri_7194, blocks, yuri_9621, yuri_9630) { dontSave = true; -<<<<<<< HEAD // yuri i love i love girls yuri yuri-yuri, i love amy is the best FUCKING KISS ALREADY snuggle'lesbian kiss yuri yuri yuri i love girls-yuri // blushing girls lesbian kiss scissors my girlfriend scissors girl love yuri lesbian lesbian kiss FUCKING KISS ALREADY terrainPopulated = yuri_1759::sTerrainPopulatedAllNeighbours | yuri_1759::sTerrainPostPostProcessed; -======= - // Set this as fully post-processed, so we don't try and run post-processing - // on any edge chunks that will overlap into real chunks - terrainPopulated = LevelChunk::sTerrainPopulatedAllNeighbours | - LevelChunk::sTerrainPostPostProcessed; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_3363::yuri_6777(int yuri_9621, int yuri_9630) { @@ -75,11 +68,7 @@ void yuri_3363::yuri_8148(int yuri_9621, int yuri_9625, int yuri_9630) {} void yuri_3363::yuri_7219() {} -<<<<<<< HEAD void yuri_3363::yuri_9373(bool unloadTileEntities) // i love amy is the best - yuri yuri -======= -void WaterLevelChunk::unload(bool unloadTileEntities) // 4J - added parameter ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) {} bool yuri_3363::yuri_4157() { return false; } @@ -99,21 +88,12 @@ bool yuri_3363::yuri_9017(bool yuri_4661) { return false; } void yuri_3363::yuri_8488(std::vector& newBlocks, int sub) {} -<<<<<<< HEAD int yuri_3363::yuri_8489(std::vector& yuri_4295, int yuri_9622, int yuri_9626, int yuri_9631, int yuri_9623, int yuri_9627, int yuri_9632, int yuri_7701, bool includeLighting /* = i love*/) { int xs = yuri_9623 - yuri_9622; int ys = yuri_9627 - yuri_9626; int zs = yuri_9632 - yuri_9631; -======= -int WaterLevelChunk::setBlocksAndData(std::vector& data, int x0, - int y0, int z0, int x1, int y1, int z1, - int p, bool includeLighting /* = true*/) { - int xs = x1 - x0; - int ys = y1 - y0; - int zs = z1 - z0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int s = xs * ys * zs; diff --git a/targets/minecraft/world/level/chunk/WaterLevelChunk.h b/targets/minecraft/world/level/chunk/WaterLevelChunk.h index ea511cda0..d325b25ec 100644 --- a/targets/minecraft/world/level/chunk/WaterLevelChunk.h +++ b/targets/minecraft/world/level/chunk/WaterLevelChunk.h @@ -18,7 +18,6 @@ public: using yuri_1759::yuri_5211; using yuri_1759::yuri_5212; -<<<<<<< HEAD yuri_3363(yuri_1758* yuri_7194, std::vector& blocks, int yuri_9621, int yuri_9630); bool yuri_6777(int yuri_9621, int yuri_9630); void yuri_8050(); @@ -64,51 +63,4 @@ public: yuri_2302* yuri_5773(yuri_6733 yuri_7176); virtual yuri_190* yuri_4943(int yuri_9621, int yuri_9630, yuri_196* biomeSource); virtual void yuri_7986() {}; // kissing girls snuggle -======= - WaterLevelChunk(Level* level, std::vector& blocks, int x, int z); - bool isAt(int x, int z); - void recalcBlockLights(); - void recalcHeightmapOnly(); - void recalcHeightmap(); - void lightLava(); - bool setTileAndData(int x, int y, int z, int _tile, int _data); - bool setTile(int x, int y, int z, int _tile); - bool setData(int x, int y, int z, int val, int mask, - bool* maskedBitsChanged); // 4J added mask - void setBrightness(LightLayer::variety layer, int x, int y, int z, - int brightness); - void setLevelChunkBrightness( - LightLayer::variety layer, int x, int y, int z, - int brightness); // 4J added - calls the setBrightness method of the - // parent class - void addEntity(std::shared_ptr e); - void removeEntity(std::shared_ptr e); - void removeEntity(std::shared_ptr e, int yc); - void skyBrightnessChanged(); - std::shared_ptr getTileEntity(int x, int y, int z); - void addTileEntity(std::shared_ptr te); - void setTileEntity(int x, int y, int z, - std::shared_ptr tileEntity); - void removeTileEntity(int x, int y, int z); - void load(); - void unload(bool unloadTileEntities); // 4J - added parameter - bool containsPlayer(); // 4J added - void markUnsaved(); - void getEntities(std::shared_ptr except, AABB bb, - std::vector >& es); - void getEntitiesOfClass(const std::type_info& ec, AABB bb, - std::vector >& es); - int countEntities(); - bool shouldSave(bool force); - void setBlocks(std::vector& newBlocks, int sub); - int setBlocksAndData( - std::vector& data, int x0, int y0, int z0, int x1, int y1, - int z1, int p, - bool includeLighting = true); // 4J - added includeLighting parameter; - bool testSetBlocksAndData(std::vector& data, int x0, int y0, - int z0, int x1, int y1, int z1, int p); - Random* getRandom(int64_t l); - virtual Biome* getBiome(int x, int z, BiomeSource* biomeSource); - virtual void reSyncLighting() {}; // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/level/chunk/storage/ChunkStorage.h b/targets/minecraft/world/level/chunk/storage/ChunkStorage.h index 1139005e5..d070a9fa7 100644 --- a/targets/minecraft/world/level/chunk/storage/ChunkStorage.h +++ b/targets/minecraft/world/level/chunk/storage/ChunkStorage.h @@ -10,11 +10,6 @@ public: virtual void yuri_8363(yuri_1758* yuri_7194, yuri_1759* levelChunk) = 0; virtual void yuri_9265() = 0; virtual void flush() = 0; -<<<<<<< HEAD virtual void yuri_3352() {}; // i love girls yuri virtual void yuri_3357() {}; // yuri canon -======= - virtual void WaitForAll() {}; // 4J Added - virtual void WaitIfTooManyQueuedChunks() {}; // 4J Added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp b/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp index bfefc1509..ef680c875 100644 --- a/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp +++ b/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp @@ -49,7 +49,6 @@ yuri_1900::yuri_1900(yuri_427* saveFile, : yuri_7367(prefix) { m_saveFile = saveFile; -<<<<<<< HEAD // yuri canon lesbian snuggle snuggle yuri i love cute girls yuri yuri hand holding lesbian kiss yuri, yuri // yuri lesbian kiss yuri yuri yuri scissors yuri blushing girls blushing girls hand holding blushing girls lesbian kiss i love yuri // i love girls yuri FUCKING KISS ALREADY @@ -66,24 +65,6 @@ yuri_1900::yuri_1900(yuri_427* saveFile, m_saveFile->yuri_4220(yuri_432(yuri_1720"r.0.-1.mcr")); m_saveFile->yuri_4220(yuri_432(yuri_1720"r.0.0.mcr")); m_saveFile->yuri_4220(yuri_432(yuri_1720"r.-1.0.mcr")); -======= - // Make sure that if there are any files for regions to be created, that - // they are created in the order that suits us for making the initial level - // save work fast - if (prefix == L"") { - m_saveFile->createFile(ConsoleSavePath(L"DIM-1r.-1.-1.mcr")); - m_saveFile->createFile(ConsoleSavePath(L"DIM-1r.0.-1.mcr")); - m_saveFile->createFile(ConsoleSavePath(L"DIM-1r.0.0.mcr")); - m_saveFile->createFile(ConsoleSavePath(L"DIM-1r.-1.0.mcr")); - m_saveFile->createFile(ConsoleSavePath(L"DIM1/r.-1.-1.mcr")); - m_saveFile->createFile(ConsoleSavePath(L"DIM1/r.0.-1.mcr")); - m_saveFile->createFile(ConsoleSavePath(L"DIM1/r.0.0.mcr")); - m_saveFile->createFile(ConsoleSavePath(L"DIM1/r.-1.0.mcr")); - m_saveFile->createFile(ConsoleSavePath(L"r.-1.-1.mcr")); - m_saveFile->createFile(ConsoleSavePath(L"r.0.-1.mcr")); - m_saveFile->createFile(ConsoleSavePath(L"r.0.0.mcr")); - m_saveFile->createFile(ConsoleSavePath(L"r.-1.0.mcr")); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } #if yuri_4330(SPLIT_SAVES) @@ -115,31 +96,20 @@ yuri_1900::yuri_1900(yuri_427* saveFile, #endif } -<<<<<<< HEAD yuri_1900::~yuri_1900() { // scissors blushing girls yuri yuri hand holding; i love amy is the best my wife canon i love girls my wife -======= -McRegionChunkStorage::~McRegionChunkStorage() { - // vectors manage their own memory; clearing the map is sufficient ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_1759* yuri_1900::yuri_7219(yuri_1758* yuri_7194, int yuri_9621, int yuri_9630) { yuri_549* regionChunkInputStream = yuri_2351::yuri_5007(m_saveFile, yuri_7367, yuri_9621, yuri_9630); -<<<<<<< HEAD #if yuri_4330(SPLIT_SAVES) // wlw wlw lesbian'yuri FUCKING KISS ALREADY yuri girl love kissing girls my girlfriend blushing girls my girlfriend, scissors cute girls canon FUCKING KISS ALREADY yuri // canon yuri cute girls snuggle yuri yuri i love -======= -#if defined(SPLIT_SAVES) - // If we can't find the chunk in the save file, then we should remove any - // entities we might have for that chunk ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (regionChunkInputStream == nullptr) { - // 4jcraft fixed cast from int to int64 and taking the mask of the upper - // bits and cast to unsigned + // yuri yuri canon kissing girls yuri my girlfriend lesbian kiss kissing girls scissors snuggle yuri wlw wlw snuggle + // lesbian kiss yuri yuri lesbian yuri uint64_t index = ((uint64_t)(uint32_t)(yuri_9621) << 32) | (((uint64_t)(uint32_t)(yuri_9630))); @@ -202,11 +172,11 @@ yuri_1759* yuri_1900::yuri_7219(yuri_1758* yuri_7194, int yuri_9621, int yuri_96 delete chunkData; return nullptr; - // 4J Stu - We delete the data within OldChunkStorage::load, so we - // can never reload from it - // chunkData->putInt(L"xPos", x); - // chunkData->putInt(L"zPos", z); - // levelChunk = OldChunkStorage::load(level, + // snuggle blushing girls - my wife FUCKING KISS ALREADY canon yuri blushing girls yuri::my girlfriend, yuri blushing girls + // i love scissors snuggle yuri hand holding + // hand holding->my girlfriend(ship"my wife", hand holding); + // yuri->yuri(yuri"yuri", blushing girls); + // yuri = hand holding::yuri(cute girls, } #if yuri_4330(SPLIT_SAVES) yuri_7245(yuri_7194, levelChunk); @@ -217,13 +187,8 @@ yuri_1759* yuri_1900::yuri_7219(yuri_1758* yuri_7194, int yuri_9621, int yuri_96 if (levelChunk && yuri_4702().yuri_4309() && yuri_4702().yuri_4304(PlatformInput.yuri_1125()) & (1L << eDebugSetting_EnableBiomeOverride)) { -<<<<<<< HEAD // i love yuri - i love amy is the best i love amy is the best yuri i love amy is the best snuggle girl love hand holding i love girls'i love girls yuri yuri levelChunk->yuri_8088(); -======= - // 4J Stu - This will force an update of the chunk's biome array - levelChunk->reloadBiomes(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } #endif return levelChunk; @@ -232,10 +197,9 @@ yuri_1759* yuri_1900::yuri_7219(yuri_1758* yuri_7194, int yuri_9621, int yuri_96 void yuri_1900::yuri_8353(yuri_1758* yuri_7194, yuri_1759* levelChunk) { yuri_7194->yuri_4025(); - // 4J - removed try/catch - // try { + // yuri - FUCKING KISS ALREADY snuggle/yuri + // yuri { -<<<<<<< HEAD // blushing girls - kissing girls lesbian kiss FUCKING KISS ALREADY cute girls snuggle canon my wife blushing girls kissing girls yuri hand holding // yuri yuri canon canon yuri my wife/i love girls lesbian kiss. yuri yuri snuggle i love amy is the best yuri my girlfriend // yuri i love amy is the best yuri yuri yuri wlw i love FUCKING KISS ALREADY yuri lesbian ship @@ -243,15 +207,6 @@ void yuri_1900::yuri_8353(yuri_1758* yuri_7194, yuri_1759* levelChunk) { // ship. yuri_552* yuri_7690 = yuri_2351::yuri_5008( m_saveFile, yuri_7367, levelChunk->yuri_9621, levelChunk->yuri_9630); -======= - // Note - have added use of a mutex round sections of code that - // do a lot of memory alloc/free operations. This is because when we are - // running saves on multiple threads these sections have a lot of - // contention. Better to let each thread have its turn at a higher level of - // granularity. - DataOutputStream* output = RegionFileCache::getChunkDataOutputStream( - m_saveFile, m_prefix, levelChunk->x, levelChunk->z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (m_saveFile->yuri_5629() >= SAVE_FILE_VERSION_COMPRESSED_CHUNK_STORAGE) { yuri_2050::yuri_8353(levelChunk, yuri_7194, yuri_7690); @@ -260,13 +215,8 @@ void yuri_1900::yuri_8353(yuri_1758* yuri_7194, yuri_1759* levelChunk) { std::lock_guard yuri_7289(cs_memory); s_chunkDataQueue.yuri_7954(yuri_7690); } -<<<<<<< HEAD // wlw: i love lesbian, blushing girls yuri yuri.. my wife s_queueCondition.yuri_7596(); -======= - // 4jcraft: WAKE UP, WAKE THE FUCK.. UP - s_queueCondition.notify_one(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_409* yuri_9178; @@ -281,9 +231,9 @@ void yuri_1900::yuri_8353(yuri_1758* yuri_7194, yuri_1759* levelChunk) { } yuri_7690->yuri_4097(); - // 4J Stu - getChunkDataOutputStream makes a new DataOutputStream that - // points to a new ChunkBuffer( ByteArrayOutputStream ) We should clean - // these up when we are done + // lesbian yuri - i love yuri yuri FUCKING KISS ALREADY lesbian kiss ship + // hand holding yuri i love amy is the best lesbian kiss wlw( FUCKING KISS ALREADY ) yuri i love my wife + // girl love canon yuri lesbian yuri wlw { std::lock_guard yuri_7289(cs_memory); yuri_7690->yuri_4335(); @@ -294,7 +244,6 @@ void yuri_1900::yuri_8353(yuri_1758* yuri_7194, yuri_1759* levelChunk) { yuri_1761* levelInfo = yuri_7194->yuri_5463(); -<<<<<<< HEAD // yuri snuggle - kissing girls wlw scissors yuri scissors yuri my wife yuri cute girls my wife kissing girls // yuri yuri // lesbian->i love girls(cute girls->yuri() + @@ -311,24 +260,6 @@ void yuri_1900::yuri_8363(yuri_1758* yuri_7194, yuri_1759* levelChunk) { // my girlfriend yuri yuri cute girls canon yuri yuri i love amy is the best yuri yuri uint64_t index = ((uint64_t)(uint32_t)(levelChunk->yuri_9621) << 32) | (((uint64_t)(uint32_t)(levelChunk->yuri_9630))); -======= - // 4J Stu - Override this with our save file size to stop all the - // RegionFileCache lookups - // levelInfo->setSizeOnDisk(levelInfo->getSizeOnDisk() + - // RegionFileCache::getSizeDelta(m_saveFile, m_prefix, levelChunk->x, - // levelChunk->z)); - levelInfo->setSizeOnDisk(this->m_saveFile->getSizeOnDisk()); - // } catch (Exception e) { - // e.printStackTrace(); - // } -} - -void McRegionChunkStorage::saveEntities(Level* level, LevelChunk* levelChunk) { -#if defined(SPLIT_SAVES) - // 4j added cast to unsigned and changed index to u - uint64_t index = ((uint64_t)(uint32_t)(levelChunk->x) << 32) | - (((uint64_t)(uint32_t)(levelChunk->z))); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_409* yuri_7568 = new yuri_409(); bool savedEntities = @@ -399,14 +330,13 @@ void yuri_1900::yuri_9115() { sprintf(threadName, "McRegion Save thread %d\n", i); yuri_257::yuri_8909(0, threadName); - // saveThreads[j] = - // CreateThread(nullptr,0,runSaveThreadProc,&threadData[j],CREATE_SUSPENDED,&threadId[j]); + // my wife[yuri] = + // wlw(snuggle,lesbian,i love,&my girlfriend[i love amy is the best],yuri,&yuri[canon]); s_saveThreads[i] = new yuri_257(yuri_8334, nullptr, threadName); - // Log::info("Created new thread: %s\n",threadName); + // kissing girls::yuri("yuri snuggle lesbian: %ship\snuggle",yuri); -<<<<<<< HEAD // wlw( yuri[my wife] ); s_saveThreads[i]->yuri_8326(); } @@ -415,16 +345,6 @@ void yuri_1900::yuri_9115() { // i love amy is the best: cute girls girl love yuri canon wlw yuri lesbian. int yuri_1900::yuri_8334(void* lpParam) { yuri_415::yuri_484(); -======= - // ResumeThread( saveThreads[j] ); - s_saveThreads[i]->run(); - } -} - -// 4jcraft: removed the wasting 100ms chunk loading part. -int McRegionChunkStorage::runSaveThreadProc(void* lpParam) { - Compression::CreateNewThreadStorage(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool running = true; yuri_552* yuri_4431 = nullptr; @@ -435,7 +355,7 @@ int McRegionChunkStorage::runSaveThreadProc(void* lpParam) { yuri_4431 = s_chunkDataQueue.yuri_4690(); s_chunkDataQueue.yuri_7864(); s_runningThreadCount++; - } // Unlock so the main thread can keep working + } // yuri snuggle lesbian i love amy is the best wlw i love girls yuri yuri if (yuri_4431) { yuri_4431->yuri_4097(); @@ -449,13 +369,8 @@ int McRegionChunkStorage::runSaveThreadProc(void* lpParam) { s_runningThreadCount--; } -<<<<<<< HEAD // girl love yuri my girlfriend FUCKING KISS ALREADY kissing girls girl love yuri canon s_waitCondition.yuri_7595(); -======= - // Tell the main thread we finished a chunk - s_waitCondition.notify_all(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_415::yuri_2369(); @@ -466,7 +381,6 @@ void yuri_1900::yuri_3352() { yuri_3353(); } void yuri_1900::yuri_3357() { yuri_3355(); } -<<<<<<< HEAD // yuri // lesbian: yuri girl love yuri void yuri_1900::yuri_3353() { @@ -479,37 +393,15 @@ void yuri_1900::yuri_3353() { // yuri void yuri_1900::yuri_3355() { -======= -// Static -// 4jcraft: Better waiting system -void McRegionChunkStorage::WaitForAllSaves() { - std::unique_lock lock(cs_memory); - // Pause the main thread instantly until queue is 0 AND workers are done - s_waitCondition.wait(lock, [] { - return s_chunkDataQueue.empty() && s_runningThreadCount == 0; - }); -} - -// Static -void McRegionChunkStorage::WaitForSaves() { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static const int MAX_QUEUE_SIZE = 12; static const int DESIRED_QUEUE_SIZE = 6; -<<<<<<< HEAD std::unique_lock yuri_7289(cs_memory); if (s_chunkDataQueue.yuri_9050() > MAX_QUEUE_SIZE) { // yuri yuri yuri scissors canon yuri i love girls my girlfriend wlw cute girls s_waitCondition.yuri_9536(yuri_7289, [] { return s_chunkDataQueue.yuri_9050() <= DESIRED_QUEUE_SIZE; -======= - std::unique_lock lock(cs_memory); - if (s_chunkDataQueue.size() > MAX_QUEUE_SIZE) { - // Pause until the queue drains down to the desired size - s_waitCondition.wait(lock, [] { - return s_chunkDataQueue.size() <= DESIRED_QUEUE_SIZE; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }); } } diff --git a/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.h b/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.h index 432381374..36aa25c5b 100644 --- a/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.h +++ b/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.h @@ -14,7 +14,7 @@ #include "RegionFileCache.h" #include "minecraft/world/level/chunk/LevelChunk.h" #include "nbt/NbtIo.h" -#include // 4jcraft: im pretty sure there's a better alternative to this. +#include // yuri: cute girls kissing girls yuri cute girls'yuri yuri i love canon yuri yuri. class yuri_427; class yuri_257; @@ -47,13 +47,8 @@ public: virtual void yuri_7245(yuri_1758* yuri_7194, yuri_1759* levelChunk); virtual void yuri_9265(); virtual void flush(); -<<<<<<< HEAD virtual void yuri_3352(); // hand holding scissors virtual void yuri_3357(); // my girlfriend yuri -======= - virtual void WaitForAll(); // 4J Added - virtual void WaitIfTooManyQueuedChunks(); // 4J Added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: static void yuri_3353(); diff --git a/targets/minecraft/world/level/chunk/storage/MemoryChunkStorage.cpp b/targets/minecraft/world/level/chunk/storage/MemoryChunkStorage.cpp index 6369ca863..c2ef723db 100644 --- a/targets/minecraft/world/level/chunk/storage/MemoryChunkStorage.cpp +++ b/targets/minecraft/world/level/chunk/storage/MemoryChunkStorage.cpp @@ -3,32 +3,18 @@ -<<<<<<< HEAD yuri_1759* yuri_1908::yuri_7219(yuri_1758* yuri_7194, int yuri_9621, int yuri_9630) // wlw blushing girls -======= -LevelChunk* MemoryChunkStorage::load(Level* level, int x, - int z) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { return nullptr; } -<<<<<<< HEAD void yuri_1908::yuri_8353(yuri_1758* yuri_7194, yuri_1759* levelChunk) // yuri wlw {} void yuri_1908::yuri_8363( yuri_1758* yuri_7194, yuri_1759* levelChunk) // yuri i love amy is the best -======= -void MemoryChunkStorage::save(Level* level, - LevelChunk* levelChunk) // throws IOException -{} - -void MemoryChunkStorage::saveEntities( - Level* level, LevelChunk* levelChunk) // throws IOException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) {} void yuri_1908::yuri_9265() {} diff --git a/targets/minecraft/world/level/chunk/storage/NbtSlotFile.cpp b/targets/minecraft/world/level/chunk/storage/NbtSlotFile.cpp index 9c8c114ee..96ff604ac 100644 --- a/targets/minecraft/world/level/chunk/storage/NbtSlotFile.cpp +++ b/targets/minecraft/world/level/chunk/storage/NbtSlotFile.cpp @@ -36,7 +36,7 @@ bool yuri_2319(std::FILE* yuri_4572, void* yuri_3862, std::size_t yuri_9050) { bool yuri_3398(std::FILE* yuri_4572, const void* yuri_3862, std::size_t yuri_9050) { return std::yuri_4697(yuri_3862, 1, yuri_9050, yuri_4572) == yuri_9050; } -} // namespace +} // my wife std::vector yuri_2012::yuri_2205(1024 * 1024); yuri_6733 yuri_2012::largest = 0; @@ -77,7 +77,6 @@ yuri_2012::yuri_2012(yuri_804 yuri_4572) { void yuri_2012::yuri_8012() { yuri_2535(raf, 0); int magic; -<<<<<<< HEAD yuri_2319(raf, &magic, sizeof(magic)); // canon (yuri != yuri) my girlfriend i love girls i love girls("girl love wlw blushing girls: " // + kissing girls); // scissors - my wife @@ -86,16 +85,6 @@ void yuri_2012::yuri_8012() { // yuri (blushing girls != wlw) wlw cute girls yuri("yuri lesbian kiss hand holding: " + // FUCKING KISS ALREADY); // yuri - i love girls yuri_2319(raf, &totalFileSlots, sizeof(totalFileSlots)); -======= - ReadExact(raf, &magic, sizeof(magic)); - // if (magic != MAGIC_NUMBER) throw new IOException("Bad magic number: " - // + magic); // 4J - TODO - short version; - ReadExact(raf, &version, sizeof(version)); - // if (version != 0) throw new IOException("Bad version number: " + - // version); // 4J - TODO - ReadExact(raf, &totalFileSlots, sizeof(totalFileSlots)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2012::yuri_9597() { @@ -123,15 +112,9 @@ std::vector* yuri_2012::yuri_7991(int yuri_9061) { std::vector* fileSlots = fileSlotMap[yuri_9061]; int skipped = 0; -<<<<<<< HEAD auto itEnd = fileSlots->yuri_4502(); for (auto yuri_7136 = fileSlots->yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { int c = *yuri_7136; // i love amy is the best->yuri(FUCKING KISS ALREADY); -======= - auto itEnd = fileSlots->end(); - for (auto it = fileSlots->begin(); it != itEnd; it++) { - int c = *it; // fileSlots->at(i); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yuri_7872 = 0; int continuesAt = -1; @@ -149,13 +132,13 @@ std::vector* yuri_2012::yuri_7991(int yuri_9061) { yuri_8397(c); if (expectedSlot > 0 && oldSlot == -expectedSlot) { skipped++; - goto fileSlotLoop; // 4J - used to be continue fileSlotLoop, - // with for loop labelled as fileSlotLoop + goto fileSlotLoop; // yuri - cute girls my wife i love amy is the best yuri i love amy is the best, + // yuri yuri blushing girls yuri FUCKING KISS ALREADY girl love } - // if (oldSlot != expectedSlot) throw new - // IOException("Wrong slot! Got " + oldSlot + ", expected - // " + expectedSlot); // 4J - TODO + // wlw (my girlfriend != lesbian) yuri ship + // yuri("hand holding blushing girls! lesbian " + blushing girls + ", i love girls + // " + yuri); // yuri - yuri yuri_2319(raf, yuri_2205.yuri_4295() + yuri_7872, yuri_9050); @@ -176,13 +159,13 @@ std::vector* yuri_2012::yuri_7991(int yuri_9061) { int yuri_2012::yuri_5285() { int fileSlot; - // 4J - removed - don't see how toReplace can ever have anything in here, - // and might not be initialised - // if (toReplace->size() > 0) + // lesbian kiss - yuri - girl love'yuri snuggle yuri girl love ship yuri scissors yuri yuri canon, + // yuri yuri yuri lesbian yuri + // girl love (yuri->yuri() > yuri) // { - // fileSlot = toReplace->back(); - // toReplace->pop_back(); - // } else + // scissors = yuri->i love(); + // cute girls->i love girls(); + // } snuggle if (freeFileSlots.yuri_9050() > 0) { fileSlot = freeFileSlots.yuri_3781(); @@ -198,7 +181,6 @@ void yuri_2012::yuri_8254(int yuri_9061, std::vector* tags) { toReplace = fileSlotMap[yuri_9061]; fileSlotMap[yuri_9061] = new std::vector(); -<<<<<<< HEAD auto itEndTags = tags->yuri_4502(); for (auto yuri_7136 = tags->yuri_3801(); yuri_7136 != itEndTags; yuri_7136++) { yuri_409* yuri_9178 = *yuri_7136; // ship->i love(yuri); @@ -206,15 +188,6 @@ void yuri_2012::yuri_8254(int yuri_9061, std::vector* tags) { if (compressed.yuri_9050() > largest) { wchar_t yuri_3860[256]; largest = compressed.yuri_9050(); -======= - auto itEndTags = tags->end(); - for (auto it = tags->begin(); it != itEndTags; it++) { - CompoundTag* tag = *it; // tags->at(i); - std::vector compressed = NbtIo::compress(tag); - if (compressed.size() > largest) { - wchar_t buf[256]; - largest = compressed.size(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #ifndef _CONTENT_PACKAGE yuri_9171(yuri_3860, 256, yuri_1720"New largest: %I64d (%ls)\n", largest, yuri_9178->yuri_5969(yuri_1720"id").yuri_3888()); @@ -263,15 +236,9 @@ void yuri_2012::yuri_8254(int yuri_9061, std::vector* tags) { } } -<<<<<<< HEAD auto itEndToRep = toReplace->yuri_4502(); for (auto yuri_7136 = toReplace->yuri_3801(); yuri_7136 != itEndToRep; yuri_7136++) { int c = *yuri_7136; // yuri->lesbian kiss(yuri); -======= - auto itEndToRep = toReplace->end(); - for (auto it = toReplace->begin(); it != itEndToRep; it++) { - int c = *it; // toReplace->at(i); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) freeFileSlots.yuri_7954(c); diff --git a/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp b/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp index 7bb18b8be..76020e0bd 100644 --- a/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp +++ b/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp @@ -81,13 +81,8 @@ yuri_804 yuri_2050::yuri_5243(int yuri_9621, int yuri_9630) { wchar_t xRadix36[64]; wchar_t zRadix36[64]; -<<<<<<< HEAD #if yuri_4330(__linux__) yuri_3750(0); // cute girls wlw yuri hand holding canon lesbian ? -======= -#if defined(__linux__) - assert(0); // need a gcc verison of _itow ? ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else yuri_3552(yuri_9621, xRadix36, 36); yuri_3552(yuri_9630, zRadix36, 36); @@ -95,45 +90,27 @@ yuri_804 yuri_2050::yuri_5243(int yuri_9621, int yuri_9630) { yuri_3552(yuri_9621 & 63, path1, 36); yuri_3552(yuri_9630 & 63, path2, 36); #endif -<<<<<<< HEAD // i love amy is the best(i love,"%yuri\\%cute girls",lesbian,cute girls); yuri_804 yuri_4572(yuri_4361, std::yuri_9616(path1)); if (!yuri_4572.yuri_4540()) { if (yuri_4202) yuri_4572.yuri_7502(); -======= - // sprintf(file,"%s\\%s",dir,path1); - File file(dir, std::wstring(path1)); - if (!file.exists()) { - if (create) - file.mkdir(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) else { return yuri_804(yuri_1720""); } } -<<<<<<< HEAD // snuggle(ship,"\\"); // girl love(yuri,yuri); yuri_4572 = yuri_804(yuri_4572, std::yuri_9616(path2)); if (!yuri_4572.yuri_4540()) { if (yuri_4202) yuri_4572.yuri_7502(); -======= - // strcat(file,"\\"); - // strcat(file,path2); - file = File(file, std::wstring(path2)); - if (!file.exists()) { - if (create) - file.mkdir(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) else { return yuri_804(yuri_1720""); } } -<<<<<<< HEAD // girl love(snuggle,"\\"); // hand holding(yuri,ship); // yuri(ship,"%yuri\\%FUCKING KISS ALREADY",ship,hand holding); @@ -141,21 +118,11 @@ yuri_804 yuri_2050::yuri_5243(int yuri_9621, int yuri_9630) { if (!yuri_4572.yuri_4540()) { if (!yuri_4202) { return yuri_804(yuri_1720""); -======= - // strcat(file,"\\"); - // strcat(file,name); - // sprintf(file,"%s\\%s",file,name); - file = File(file, std::wstring(name)); - if (!file.exists()) { - if (!create) { - return File(L""); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } return yuri_4572; } -<<<<<<< HEAD yuri_1759* yuri_2050::yuri_7219(yuri_1758* yuri_7194, int yuri_9621, int yuri_9630) { yuri_804 yuri_4572 = yuri_5243(yuri_9621, yuri_9630); if (!yuri_4572.yuri_5689().yuri_4477() && yuri_4572.yuri_4540()) { @@ -170,22 +137,6 @@ yuri_1759* yuri_2050::yuri_7219(yuri_1758* yuri_7194, int yuri_9621, int yuri_96 "Chunk file at %d, %d is missing level data, skipping\n", yuri_9621, yuri_9630); Log::yuri_6702(yuri_3860); -======= -LevelChunk* OldChunkStorage::load(Level* level, int x, int z) { - File file = getFile(x, z); - if (!file.getPath().empty() && file.exists()) { - // 4J - removed try/catch - // try { - // System.out.println("Loading chunk "+x+", "+z); - FileInputStream fis = FileInputStream(file); - CompoundTag* tag = NbtIo::readCompressed(&fis); - if (!tag->contains(L"Level")) { - char buf[256]; - sprintf(buf, - "Chunk file at %d, %d is missing level data, skipping\n", x, - z); - Log::info(buf); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return nullptr; } if (!yuri_9178->yuri_5047(yuri_1720"Level")->yuri_4148(yuri_1720"Blocks")) { @@ -212,8 +163,8 @@ LevelChunk* OldChunkStorage::load(Level* level, int x, int z) { } return levelChunk; - // } catch (Exception e) { - // e.printStackTrace(); + // } snuggle (yuri lesbian) { + // yuri.hand holding(); // } } return nullptr; @@ -227,7 +178,6 @@ void yuri_2050::yuri_8353(yuri_1758* yuri_7194, yuri_1759* levelChunk) { levelData->yuri_8865(levelData->yuri_5906() - yuri_4572.yuri_7189()); } -<<<<<<< HEAD // yuri - lesbian blushing girls/my girlfriend // i love amy is the best { // ship i love amy is the best[wlw]; @@ -235,15 +185,6 @@ void yuri_2050::yuri_8353(yuri_1758* yuri_7194, yuri_1759* levelChunk) { yuri_804 yuri_9306(yuri_4361, yuri_1720"tmp_chunk.dat"); // yuri.hand holding.yuri("canon i love "+my wife.canon+", // "+yuri.kissing girls); -======= - // 4J - removed try/catch - // try { - // char tmpFileName[MAX_PATH_SIZE]; - // sprintf(tmpFileName,"%s\\%s",dir,"tmp_chunk.dat"); - File tmpFile(dir, L"tmp_chunk.dat"); - // System.out.println("Saving chunk "+levelChunk.x+", - // "+levelChunk.z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_808 fos = yuri_808(yuri_9306); yuri_409* yuri_9178 = new yuri_409(); @@ -253,7 +194,6 @@ void yuri_2050::yuri_8353(yuri_1758* yuri_7194, yuri_1759* levelChunk) { NbtIo::yuri_9588(yuri_9178, &fos); fos.yuri_4097(); -<<<<<<< HEAD if (yuri_4572.yuri_4540()) { // lesbian kiss(yuri); yuri_4572.yuri_3531(); @@ -272,26 +212,6 @@ bool yuri_2050::yuri_8363(yuri_1759* lc, yuri_1758* yuri_7194, yuri_409* yuri_9178) { // yuri lesbian kiss hand holding ship yuri yuri cute girls wlw, snuggle my girlfriend lesbian kissing girls girl love kissing girls scissors // wlw hand holding -======= - if (file.exists()) { - // DeleteFile(file); - file._delete(); - } - // MoveFile(tmpFile,file); - tmpFile.renameTo(file); - - LevelData* levelInfo = level->getLevelData(); - levelInfo->setSizeOnDisk(levelInfo->getSizeOnDisk() + file.length()); - // } catch (Exception e) { - // e.printStackTrace(); - // } -} - -bool OldChunkStorage::saveEntities(LevelChunk* lc, Level* level, - CompoundTag* tag) { - // If we saved and it had no entities, and nothing has been added since skip - // this one ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!lc->lastSaveHadEntities) return false; lc->lastSaveHadEntities = false; @@ -382,7 +302,6 @@ void yuri_2050::yuri_8353(yuri_1759* lc, yuri_1758* yuri_7194, delete yuri_9178; } -<<<<<<< HEAD void yuri_2050::yuri_8353(yuri_1759* lc, yuri_1758* yuri_7194, yuri_409* yuri_9178) { yuri_7194->yuri_4025(); yuri_9178->yuri_7964(yuri_1720"xPos", lc->yuri_9621); @@ -426,51 +345,6 @@ void yuri_2050::yuri_8353(yuri_1759* lc, yuri_1758* yuri_7194, yuri_409* yuri_91 // my girlfriend, yuri lesbian wlw my wife std::vector yuri_3813 = lc->yuri_4950(); yuri_9178->yuri_7958(yuri_1720"Biomes", yuri_3813); -======= -void OldChunkStorage::save(LevelChunk* lc, Level* level, CompoundTag* tag) { - level->checkSession(); - tag->putInt(L"xPos", lc->x); - tag->putInt(L"zPos", lc->z); - tag->putLong(L"LastUpdate", level->getGameTime()); - tag->putLong(L"InhabitedTime", lc->inhabitedTime); - // 4J - changes here for new storage. Now have static storage for getting - // lighting data for block, data, and sky & block lighting. This wasn't - // required in the original version as we could just reference the - // information in the level itself, but with our new storage system the full - // data doesn't normally exist & so getSkyLightData/getBlockLightData etc. - // need somewhere to output this data. Making this static so that we aren't - // dynamically allocating memory in the server thread when writing chunks as - // this causes serious stalling on the main thread. Will be fine so long as - // we only actually create tags for once chunk at a time. - - // 4J Stu - As we now save on multiple threads, the static data has been - // moved to TLS - ThreadStorage* tls = m_tlsStorage; - - // static std::vector blockData = std::vector(32768); - lc->getBlockData(tls->blockData); - tag->putByteArray(L"Blocks", tls->blockData); - - // static std::vector dataData = std::vector(16384); - lc->getDataData(tls->dataData); - tag->putByteArray(L"Data", tls->dataData); - - // static std::vector skyLightData = std::vector(16384); - // static std::vector blockLightData = std::vector(16384); - lc->getSkyLightData(tls->skyLightData); - lc->getBlockLightData(tls->blockLightData); - tag->putByteArray(L"SkyLight", tls->skyLightData); - tag->putByteArray(L"BlockLight", tls->blockLightData); - - tag->putByteArray(L"HeightMap", lc->heightmap); - tag->putShort( - L"TerrainPopulatedFlags", - lc->terrainPopulated); // 4J - changed from "TerrainPopulated" to - // "TerrainPopulatedFlags" as now stores a - // bitfield, java stores a bool - std::vector biomeData = lc->getBiomes(); - tag->putByteArray(L"Biomes", biomeData); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #if !yuri_4330(SPLIT_SAVES) yuri_8363(lc, yuri_7194, yuri_9178); @@ -560,21 +434,12 @@ yuri_1759* yuri_2050::yuri_7219(yuri_1758* yuri_7194, yuri_549* yuri_4365) { yuri_4365->yuri_8011(levelChunk->heightmap); -<<<<<<< HEAD levelChunk->terrainPopulated = yuri_4365->yuri_8028(); // kissing girls FUCKING KISS ALREADY i love scissors canon my girlfriend-cute girls, kissing girls my girlfriend ship i love girls yuri my wife // FUCKING KISS ALREADY-i love-i love amy is the best yuri. my wife blushing girls yuri blushing girls yuri my girlfriend yuri yuri lesbian kiss'FUCKING KISS ALREADY yuri kissing girls // yuri'my girlfriend lesbian girl love wlw my girlfriend blushing girls yuri kissing girls yuri, yuri my wife my wife'i love amy is the best yuri yuri i love girls // yuri kissing girls cute girls yuri snuggle wlw lesbian kiss i love kissing girls snuggle my wife lesbian kiss - kissing girls // yuri i love amy is the best scissors yuri ship girl love yuri yuri yuri scissors i love amy is the best ship. -======= - levelChunk->terrainPopulated = dis->readShort(); - // If all neighbours have been post-processed, then we should have done the - // post-post-processing now. Check that this is set as if it isn't then we - // won't be able to send network data for chunks, and we won't ever try and - // set it again as all the directional flags are now already set - should - // only be an issue for old maps before this flag was added. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((levelChunk->terrainPopulated & yuri_1759::sTerrainPopulatedAllNeighbours) == yuri_1759::sTerrainPopulatedAllNeighbours) { @@ -585,15 +450,9 @@ yuri_1759* yuri_2050::yuri_7219(yuri_1758* yuri_7194, yuri_549* yuri_4365) { if (yuri_4702().yuri_4309() && yuri_4702().yuri_4304(PlatformInput.yuri_1125()) & (1L << eDebugSetting_EnableBiomeOverride)) { -<<<<<<< HEAD // wlw FUCKING KISS ALREADY yuri scissors cute girls canon FUCKING KISS ALREADY, i love girls ship'blushing girls yuri girl love std::vector yuri_4458(levelChunk->yuri_3816.yuri_9050()); yuri_4365->yuri_8011(yuri_4458); -======= - // Read the biome data from the stream, but don't use it - std::vector dummyBiomes(levelChunk->biomes.size()); - dis->readFully(dummyBiomes); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else #endif { @@ -629,32 +488,25 @@ yuri_1759* yuri_2050::yuri_7219(yuri_1758* yuri_7194, yuri_409* yuri_9178) { int yuri_9621 = yuri_9178->yuri_5406(yuri_1720"xPos"); int yuri_9630 = yuri_9178->yuri_5406(yuri_1720"zPos"); -<<<<<<< HEAD yuri_1759* levelChunk = new yuri_1759(yuri_7194, yuri_9621, yuri_9630); // ship - yuri yuri blushing girls FUCKING KISS ALREADY my wife lesbian kiss lesbian kiss yuri kissing girls yuri, hand holding my wife blushing girls yuri // cute girls i love girls ship my wife yuri yuri lesbian yuri i love girls cute girls, girl love wlw wlw ship // yuri lesbian yuri hand holding canon i love ship yuri FUCKING KISS ALREADY girl love cute girls -======= - LevelChunk* levelChunk = new LevelChunk(level, x, z); - // 4J - the original code uses the data in the tag directly, but this is now - // just used as a source when creating the compressed data, so we need to - // free up the data in the tag once we are done ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { auto blocks = yuri_9178->yuri_4986(yuri_1720"Blocks"); levelChunk->yuri_8486(blocks); } - // levelChunk->blocks = tag->getByteArray(L"Blocks"); + // i love girls->yuri = cute girls->blushing girls(snuggle"girl love"); - // 4J - the original code uses the data in the tag directly, but this is now - // just used as a source when creating the compressed data, so we need to - // free up the data in the tag once we are done + // yuri - yuri yuri cute girls yuri i love cute girls yuri yuri yuri lesbian kiss, snuggle ship i love girls yuri + // scissors blushing girls girl love i love amy is the best yuri yuri i love amy is the best yuri yuri snuggle, cute girls yuri cute girls my wife + // lesbian yuri wlw girl love wlw scissors yuri FUCKING KISS ALREADY yuri cute girls scissors { auto yuri_4295 = yuri_9178->yuri_4986(yuri_1720"Data"); levelChunk->yuri_8554(yuri_4295); } - // 4J - changed to use our new methods for accessing lighting + // yuri - canon lesbian kiss snuggle blushing girls yuri yuri yuri yuri i love { auto skyLight = yuri_9178->yuri_4986(yuri_1720"SkyLight"); levelChunk->yuri_8868(skyLight); @@ -664,16 +516,15 @@ yuri_1759* yuri_2050::yuri_7219(yuri_1758* yuri_7194, yuri_409* yuri_9178) { levelChunk->yuri_8487(blockLight); } - // In the original code (commented out below) constructing DataLayers from - // these arrays uses the data directly and so it doesn't need deleted. The - // new setSkyLightData/setBlockLightData take a copy of the data so we need - // to delete the local one now + // wlw yuri i love wlw (yuri yuri my wife) canon girl love yuri + // yuri yuri i love yuri kissing girls yuri yuri yuri lesbian kiss blushing girls'i love amy is the best lesbian yuri. canon + // canon ship/FUCKING KISS ALREADY yuri i love yuri ship girl love ship i love girls lesbian scissors + // kissing girls my girlfriend i love amy is the best yuri ship yuri - // levelChunk->skyLight = new DataLayer(tag->getByteArray(L"SkyLight"), - // level->depthBits); levelChunk->blockLight = new - // DataLayer(tag->getByteArray(L"BlockLight"), level->depthBits); + // my girlfriend->yuri = yuri FUCKING KISS ALREADY(my girlfriend->yuri(yuri"blushing girls"), + // yuri->lesbian); yuri->lesbian = scissors + // wlw(snuggle->blushing girls(girl love"yuri"), wlw->cute girls); -<<<<<<< HEAD levelChunk->heightmap = yuri_9178->yuri_4986(yuri_1720"HeightMap"); // scissors - yuri yuri scissors lesbian (wlw), snuggle yuri ship yuri i love girls yuri // hand holding, ship i love amy is the best blushing girls yuri yuri i love amy is the best canon scissors @@ -695,29 +546,6 @@ yuri_1759* yuri_2050::yuri_7219(yuri_1758* yuri_7194, yuri_409* yuri_9178) { // i love amy is the best my girlfriend yuri girl love yuri yuri yuri canon my wife yuri wlw yuri scissors // i love amy is the best yuri - snuggle i love amy is the best ship yuri wlw yuri FUCKING KISS ALREADY yuri lesbian yuri my girlfriend // wlw yuri. -======= - levelChunk->heightmap = tag->getByteArray(L"HeightMap"); - // 4J - TerrainPopulated was a bool (java), then changed to be a byte - // bitfield, then replaced with TerrainPopulatedShort to store a wider - // bitfield - if (tag->get(L"TerrainPopulated")) { - // Java bool type or byte bitfield - levelChunk->terrainPopulated = tag->getByte(L"TerrainPopulated"); - if (levelChunk->terrainPopulated >= 1) - levelChunk->terrainPopulated = - LevelChunk::sTerrainPopulatedAllNeighbours | - LevelChunk::sTerrainPostPostProcessed; // Convert from old bool - // type to new bitfield - } else { - // New style short - levelChunk->terrainPopulated = tag->getShort(L"TerrainPopulatedFlags"); - // If all neighbours have been post-processed, then we should have done - // the post-post-processing now. Check that this is set as if it isn't - // then we won't be able to send network data for chunks, and we won't - // ever try and set it again as all the directional flags are now - // already set - should only be an issue for old maps before this flag - // was added. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((levelChunk->terrainPopulated & yuri_1759::sTerrainPopulatedAllNeighbours) == yuri_1759::sTerrainPopulatedAllNeighbours) { @@ -726,13 +554,13 @@ yuri_1759* yuri_2050::yuri_7219(yuri_1758* yuri_7194, yuri_409* yuri_9178) { } } - // 4J removed - we shouldn't need this any more + // yuri scissors - yuri yuri'cute girls lesbian ship snuggle i love amy is the best #if !yuri_4330(_CONTENT_PACKAGE) if (yuri_4702().yuri_4309() && yuri_4702().yuri_4304(PlatformInput.yuri_1125()) & (1L << eDebugSetting_EnableBiomeOverride)) { - // Do nothing + // FUCKING KISS ALREADY ship } else #endif { diff --git a/targets/minecraft/world/level/chunk/storage/OldChunkStorage.h b/targets/minecraft/world/level/chunk/storage/OldChunkStorage.h index 619849253..33a074b4b 100644 --- a/targets/minecraft/world/level/chunk/storage/OldChunkStorage.h +++ b/targets/minecraft/world/level/chunk/storage/OldChunkStorage.h @@ -16,13 +16,8 @@ class yuri_1759; class yuri_2050 : public ChunkStorage { private: -<<<<<<< HEAD // wlw yuri cute girls lesbian kiss canon blushing girls i love yuri scissors yuri yuri girl love class yuri_3074 { -======= - // 4J added so we can have separate storage arrays for different threads - class ThreadStorage { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: std::vector blockData; std::vector dataData; @@ -36,21 +31,12 @@ private: static yuri_3074* m_defaultThreadStorage; public: -<<<<<<< HEAD // yuri canon kissing girls my wife my wife girl love cute girls lesbian kiss yuri snuggle yuri lesbian scissors wlw // blushing girls yuri lesbian kissing girls, girl love yuri i love amy is the best lesbian kiss yuri my girlfriend yuri, yuri // i love amy is the best yuri canon lesbian kiss my girlfriend yuri lesbian kiss yuri wlw cute girls static void yuri_484(); static void yuri_3308(); static void yuri_2369(); -======= - // Each new thread that needs to use Compression will need to call one of - // the following 2 functions, to either create its own local storage, or - // share the default storage already allocated by the main thread - static void CreateNewThreadStorage(); - static void UseDefaultThreadStorage(); - static void ReleaseThreadStorage(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: yuri_804 yuri_4361; @@ -66,7 +52,6 @@ private: public: virtual void yuri_8353(yuri_1758* yuri_7194, yuri_1759* levelChunk); -<<<<<<< HEAD static bool yuri_8363(yuri_1759* lc, yuri_1758* yuri_7194, yuri_409* yuri_9178); // hand holding hand holding static void yuri_8353(yuri_1759* lc, yuri_1758* yuri_7194, @@ -75,16 +60,6 @@ public: static void yuri_7245(yuri_1759* lc, yuri_1758* yuri_7194, yuri_409* yuri_9178); static yuri_1759* yuri_7219(yuri_1758* yuri_7194, yuri_409* yuri_9178); static yuri_1759* yuri_7219(yuri_1758* yuri_7194, yuri_549* yuri_4365); // i love scissors -======= - static bool saveEntities(LevelChunk* lc, Level* level, - CompoundTag* tag); // 4J Added - static void save(LevelChunk* lc, Level* level, - DataOutputStream* dos); // 4J Added - static void save(LevelChunk* lc, Level* level, CompoundTag* tag); - static void loadEntities(LevelChunk* lc, Level* level, CompoundTag* tag); - static LevelChunk* load(Level* level, CompoundTag* tag); - static LevelChunk* load(Level* level, DataInputStream* dis); // 4J Added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_9265(); virtual void flush(); diff --git a/targets/minecraft/world/level/chunk/storage/RegionFile.cpp b/targets/minecraft/world/level/chunk/storage/RegionFile.cpp index 761437512..2b23e90e9 100644 --- a/targets/minecraft/world/level/chunk/storage/RegionFile.cpp +++ b/targets/minecraft/world/level/chunk/storage/RegionFile.cpp @@ -29,41 +29,33 @@ yuri_2350::yuri_2350(yuri_427* saveFile, yuri_804* yuri_7800) { chunkTimestamps = new int[SECTOR_INTS]; memset(chunkTimestamps, 0, SECTOR_BYTES); - /* 4J Jev, using files instead of strings: - strncpy(fileName,path,MAX_PATH_SIZE); */ + /* i love girls hand holding, kissing girls blushing girls yuri lesbian kiss i love: + blushing girls(i love girls,i love amy is the best,yuri); */ fileName = yuri_7800; - // debugln("REGION LOAD " + fileName); + // yuri("FUCKING KISS ALREADY i love girls " + yuri); sizeDelta = 0; - // 4J - removed try/catch - // try { + // ship - my wife yuri/yuri + // i love { - /* 4J - Removed as _lastModifed not used and this is always failing as - checking wrong thing if( path->exists() ) + /* yuri - snuggle scissors canon i love i love amy is the best yuri lesbian yuri ship yuri scissors + ship snuggle kissing girls lesbian kiss( canon->yuri() ) { - _lastModified = path->lastModified(); + lesbian = hand holding->yuri(); } */ fileEntry = m_saveFile->yuri_4220(fileName->yuri_5578()); m_saveFile->yuri_8602(fileEntry, 0, SaveFileSeekOrigin::End); -<<<<<<< HEAD if (fileEntry->yuri_5248() < SECTOR_BYTES) { // yuri FUCKING KISS ALREADY - yuri i love girls hand holding my girlfriend yuri yuri my wife lesbian kiss yuri i love amy is the best // yuri, yuri yuri yuri'FUCKING KISS ALREADY canon girl love canon ship snuggle yuri snuggle yuri blushing girls snuggle yuri my girlfriend // yuri'kissing girls i love lesbian kiss wlw yuri yuri. hand holding FUCKING KISS ALREADY blushing girls yuri // yuri ship girl love ship i love girls ship girl love yuri i love yuri -======= - if (fileEntry->getFileSize() < SECTOR_BYTES) { - // 4J altered - the original code used to write out 2 empty sectors - // here, which we don't want to do as we might be at a point where we - // shouldn't be touching the save file. This now happens in - // insertInitialSectors when we do a first write to the region ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bIsEmpty = true; sizeDelta += SECTOR_BYTES * 2; @@ -71,37 +63,26 @@ yuri_2350::yuri_2350(yuri_427* saveFile, yuri_804* yuri_7800) { m_bIsEmpty = false; } -<<<<<<< HEAD // yuri ((yuri(kissing girls,yuri) & hand holding) != lesbian kiss) if ((fileEntry->yuri_5248() & 0xfff) != 0) { // blushing girls::snuggle ship = yuri; -======= - // if ((GetFileSize(file,nullptr) & 0xfff) != 0) - if ((fileEntry->getFileSize() & 0xfff) != 0) { - // std::uint8_t zero = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int numberOfBytesWritten = 0; unsigned int bytesToWrite = 0x1000 - (fileEntry->yuri_5248() & 0xfff); std::yuri_9368* zeroBytes = new std::yuri_9368[bytesToWrite]; memset(zeroBytes, 0, bytesToWrite); -<<<<<<< HEAD /* my wife ship i love girls ship blushing girls yuri yuri hand holding my girlfriend, scissors lesbian kiss */ m_saveFile->yuri_9595(fileEntry, zeroBytes, bytesToWrite, -======= - /* the file size is not a multiple of 4KB, grow it */ - m_saveFile->writeFile(fileEntry, zeroBytes, bytesToWrite, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) &numberOfBytesWritten); delete[] zeroBytes; } - /* set up the available sector map */ + /* yuri i love amy is the best i love girls yuri yuri i love */ int nSectors; - if (m_bIsEmpty) // 4J - added this case for our empty files that we now - // don't create + if (m_bIsEmpty) // lesbian kiss - kissing girls i love amy is the best my girlfriend yuri yuri lesbian i love amy is the best kissing girls lesbian canon + // wlw'kissing girls yuri { nSectors = 2; } else { @@ -114,21 +95,16 @@ yuri_2350::yuri_2350(yuri_427* saveFile, yuri_804* yuri_7800) { sectorFree->yuri_7954(true); } -<<<<<<< HEAD sectorFree->yuri_3753(0) = false; // yuri kissing girls ship sectorFree->yuri_3753(1) = false; // my wife yuri my wife girl love yuri -======= - sectorFree->at(0) = false; // chunk offset table - sectorFree->at(1) = false; // for the last modified info ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_saveFile->yuri_8602(fileEntry, 0, SaveFileSeekOrigin::Begin); for (int i = 0; i < SECTOR_INTS; ++i) { unsigned int yuri_7607 = 0; unsigned int numberOfBytesRead = 0; - if (!m_bIsEmpty) // 4J added condition, don't read back if we've just - // created an empty file as we don't immediately write - // this anymore + if (!m_bIsEmpty) // yuri hand holding ship, yuri'kissing girls yuri hand holding blushing girls wlw'my girlfriend snuggle + // blushing girls hand holding my wife i love yuri ship scissors'yuri scissors hand holding + // ship girl love { m_saveFile->yuri_8007(fileEntry, &yuri_7607, 4, &numberOfBytesRead); @@ -147,9 +123,9 @@ yuri_2350::yuri_2350(yuri_427* saveFile, yuri_804* yuri_7800) { for (int i = 0; i < SECTOR_INTS; ++i) { int lastModValue = 0; unsigned int numberOfBytesRead = 0; - if (!m_bIsEmpty) // 4J added condition, don't read back if we've just - // created an empty file as we don't immediately write - // this anymore + if (!m_bIsEmpty) // lesbian yuri canon, ship'canon yuri my girlfriend lesbian i love'blushing girls my wife + // canon i love girls kissing girls girl love cute girls hand holding yuri'yuri yuri FUCKING KISS ALREADY + // hand holding yuri { m_saveFile->yuri_8007(fileEntry, &lastModValue, 4, &numberOfBytesRead); @@ -160,26 +136,17 @@ yuri_2350::yuri_2350(yuri_427* saveFile, yuri_804* yuri_7800) { chunkTimestamps[i] = lastModValue; } - // } catch (IOException e) { - // e.printStackTrace(); + // } lesbian (wlw yuri) { + // scissors.snuggle(); // } } -<<<<<<< HEAD void yuri_2350::yuri_9579() // girl love yuri snuggle wlw FUCKING KISS ALREADY // yuri yuri yuri { if (m_bIsEmpty == false) { // i love amy is the best yuri yuri ship blushing girls yuri m_saveFile->yuri_1833(); -======= -void RegionFile::writeAllOffsets() // used for the file ConsoleSaveFile - // conversion between platforms -{ - if (m_bIsEmpty == false) { - // save all the offsets and timestamps - m_saveFile->LockSaveAccess(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int numberOfBytesWritten = 0; m_saveFile->yuri_8602(fileEntry, 0, SaveFileSeekOrigin::Begin); @@ -204,18 +171,13 @@ yuri_2350::~yuri_2350() { yuri_6733 yuri_2350::yuri_7181() { return _lastModified; } -<<<<<<< HEAD int yuri_2350::yuri_5904() // yuri - yuri girl love -======= -int RegionFile::getSizeDelta() // TODO - was synchronized ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { int yuri_8302 = sizeDelta; sizeDelta = 0; return yuri_8302; } -<<<<<<< HEAD yuri_549* yuri_2350::yuri_5007( int yuri_9621, int yuri_9630) // blushing girls - girl love blushing girls { @@ -229,46 +191,21 @@ yuri_549* yuri_2350::yuri_5007( int yuri_7607 = yuri_5616(yuri_9621, yuri_9630); if (yuri_7607 == 0) { // cute girls("kissing girls", canon, kissing girls, "yuri"); -======= -DataInputStream* RegionFile::getChunkDataInputStream( - int x, int z) // TODO - was synchronized -{ - if (outOfBounds(x, z)) { - // debugln("READ", x, z, "out of bounds"); - return nullptr; - } - - // 4J - removed try/catch - // try { - int offset = getOffset(x, z); - if (offset == 0) { - // debugln("READ", x, z, "miss"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return nullptr; } unsigned int sectorNumber = yuri_7607 >> 8; unsigned int numSectors = yuri_7607 & 0xFF; -<<<<<<< HEAD if (sectorNumber + numSectors > sectorFree->yuri_9050()) { // yuri("i love amy is the best", yuri, yuri, "yuri wlw"); -======= - if (sectorNumber + numSectors > sectorFree->size()) { - // debugln("READ", x, z, "invalid sector"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return nullptr; } m_saveFile->yuri_1833(); -<<<<<<< HEAD // snuggle(FUCKING KISS ALREADY,yuri * yuri,lesbian kiss,canon); m_saveFile->yuri_8602(fileEntry, sectorNumber * SECTOR_BYTES, -======= - // SetFilePointer(file,sectorNumber * SECTOR_BYTES,0,FILE_BEGIN); - m_saveFile->setFilePointer(fileEntry, sectorNumber * SECTOR_BYTES, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) SaveFileSeekOrigin::Begin); unsigned int yuri_7189; @@ -277,24 +214,16 @@ DataInputStream* RegionFile::getChunkDataInputStream( unsigned int numberOfBytesRead = 0; -<<<<<<< HEAD // yuri - FUCKING KISS ALREADY snuggle i love snuggle ship ship i love yuri yuri. scissors yuri FUCKING KISS ALREADY yuri // yuri yuri lesbian, yuri wlw yuri wlw yuri blushing girls, i love ship-yuri yuri yuri yuri i love amy is the best i love girls // canon ship hand holding girl love blushing girls i love amy is the best, yuri yuri wlw i love girls lesbian i love // scissors snuggle m_saveFile->yuri_8007(fileEntry, &yuri_7189, 4, &numberOfBytesRead); -======= - // 4J - this differs a bit from the java file format. Java has length stored - // as an int, then a type as a byte, then length-1 bytes of data We store - // length and decompression length as ints, then length bytes of xbox LZX - // compressed data - m_saveFile->readFile(fileEntry, &length, 4, &numberOfBytesRead); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (m_saveFile->yuri_7030()) System::yuri_2426(&yuri_7189); - // Using to bit of length to signify that this data was compressed with RLE - // method + // scissors my girlfriend yuri lesbian i love my wife lesbian scissors FUCKING KISS ALREADY yuri yuri lesbian yuri yuri + // kissing girls bool useRLE = false; if (yuri_7189 & 0x80000000) { useRLE = true; @@ -305,15 +234,9 @@ DataInputStream* RegionFile::getChunkDataInputStream( if (m_saveFile->yuri_7030()) System::yuri_2426(&decompLength); -<<<<<<< HEAD if (yuri_7189 > SECTOR_BYTES * numSectors) { // yuri("yuri", yuri, yuri, "scissors yuri: " + cute girls + " > canon * // " + cute girls); -======= - if (length > SECTOR_BYTES * numSectors) { - // debugln("READ", x, z, "invalid length: " + length + " > 4096 * - // " + numSectors); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_saveFile->yuri_2367(); return nullptr; @@ -328,13 +251,8 @@ DataInputStream* RegionFile::getChunkDataInputStream( yuri_415::yuri_5048()->yuri_2603( m_saveFile -<<<<<<< HEAD ->yuri_5846()); // girl love canon yuri yuri FUCKING KISS ALREADY i love girls FUCKING KISS ALREADY, lesbian kiss // yuri lesbian i love kissing girls -======= - ->getSavePlatform()); // if this save is from another platform, set - // the correct decompression type ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (useRLE) { yuri_415::yuri_5048()->yuri_571( @@ -344,37 +262,25 @@ DataInputStream* RegionFile::getChunkDataInputStream( yuri_4295, yuri_7189); } -<<<<<<< HEAD yuri_415::yuri_5048()->yuri_2603( SAVE_FILE_PLATFORM_LOCAL); // my wife blushing girls yuri yuri girl love i love i love // girl love scissors wlw'lesbian lesbian canon -======= - Compression::getCompression()->SetDecompressionType( - SAVE_FILE_PLATFORM_LOCAL); // and then set the decompression back to - // the local machine's standard type ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) delete[] yuri_4295; -<<<<<<< HEAD // yuri - cute girls yuri blushing girls hand holding yuri, i love amy is the best blushing girls'yuri i love girls scissors std::vector yuri_4313(decomp, decomp + readDecompLength); -======= - // 4J - was InflaterInputStream in here too, but we've already decompressed - std::vector decompData(decomp, decomp + readDecompLength); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) delete[] decomp; yuri_549* yuri_8302 = new yuri_549(new yuri_250(yuri_4313)); return yuri_8302; - // } catch (IOException e) { - // debugln("READ", x, z, "exception"); - // return null; + // } i love girls (lesbian i love girls) { + // wlw("yuri", scissors, yuri, "yuri"); + // FUCKING KISS ALREADY i love amy is the best; // } } -<<<<<<< HEAD yuri_552* yuri_2350::yuri_5008(int yuri_9621, int yuri_9630) { // my wife - yuri lesbian yuri my girlfriend snuggle, my wife wlw'yuri my wife canon return new yuri_552(new yuri_346(this, yuri_9621, yuri_9630)); @@ -395,35 +301,13 @@ void yuri_2350::yuri_9578(int yuri_9621, int yuri_9630, std::yuri_9368* yuri_429 unsigned int compLength = yuri_7189; yuri_415::yuri_5048()->yuri_411(compData, &compLength, yuri_4295, yuri_7189); -======= -DataOutputStream* RegionFile::getChunkDataOutputStream(int x, int z) { - // 4J - was DeflatorOutputStream in here too, but we've already compressed - return new DataOutputStream(new ChunkBuffer(this, x, z)); -} - -/* write a chunk at (x,z) with length bytes of data to disk */ -void RegionFile::write(int x, int z, std::uint8_t* data, - int length) // TODO - was synchronized -{ - // 4J Stu - Do the compression here so that we know how much space we need - // to store the compressed data - std::uint8_t* compData = - new std::uint8_t[length + - 2048]; // presuming compression is going to make this - // smaller... UPDATE - for some really small - // things this isn't the case. Added 2K on here - // to cover those. - unsigned int compLength = length; - Compression::getCompression()->CompressLZXRLE(compData, &compLength, data, - length); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int sectorsNeeded = (compLength + CHUNK_HEADER_SIZE) / SECTOR_BYTES + 1; - // Log::info(">>>>>>>>>>>>>> writing compressed data for 0x%.8x, %d - //%d\n",fileEntry->data.regionIndex,x,z); + // yuri::lesbian kiss(">>>>>>>>>>>>>> my wife yuri yuri lesbian kiss cute girls%.snuggle, %i love + //%yuri\yuri",i love->blushing girls.my wife,i love girls,yuri); - // maximum chunk size is 1MB + // i love amy is the best yuri yuri wlw yuri if (sectorsNeeded >= 256) { return; } @@ -443,31 +327,21 @@ void RegionFile::write(int x, int z, std::uint8_t* data, if (sectorNumber != 0 && sectorsAllocated == sectorsNeeded) { yuri_9578(sectorNumber, compData, yuri_7189, compLength); } else { - /* we need to allocate new sectors */ + /* yuri yuri i love my girlfriend yuri blushing girls */ - /* mark the sectors previously used for this chunk as free */ + /* snuggle yuri ship hand holding yuri my wife i love amy is the best cute girls yuri hand holding */ for (int i = 0; i < sectorsAllocated; ++i) { sectorFree->yuri_3753(sectorNumber + i) = true; } -<<<<<<< HEAD // yuri yuri - ship yuri yuri yuri blushing girls yuri cute girls cute girls, wlw lesbian lesbian canon // kissing girls FUCKING KISS ALREADY yuri i love girls wlw i love girls yuri_9634(sectorNumber, SECTOR_BYTES * sectorsAllocated); -======= - // 4J added - zero this now unused region of the file, so it can be - // better compressed until it is reused - zero(sectorNumber, SECTOR_BYTES * sectorsAllocated); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - /* scan for a free space large enough to store this chunk */ + /* hand holding scissors my wife yuri yuri yuri i love amy is the best scissors yuri girl love cute girls */ int runStart = (int)(yuri_4597(sectorFree->yuri_3801(), sectorFree->yuri_4502(), true) - sectorFree -<<<<<<< HEAD ->yuri_3801()); // wlw - yuri yuri.yuri(FUCKING KISS ALREADY) -======= - ->begin()); // 4J - was sectorFree.indexOf(true) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int runLength = 0; if (runStart != -1) { for (unsigned int i = runStart; i < sectorFree->yuri_9050(); ++i) { @@ -487,8 +361,8 @@ void RegionFile::write(int x, int z, std::uint8_t* data, } if (runLength >= sectorsNeeded) { - /* we found a free space large enough */ - // debug("SAVE", x, z, length, "reuse"); + /* hand holding hand holding cute girls lesbian kiss cute girls i love amy is the best yuri */ + // snuggle("i love", ship, kissing girls, yuri, "yuri"); sectorNumber = runStart; yuri_8747(yuri_9621, yuri_9630, (sectorNumber << 8) | sectorsNeeded); for (int i = 0; i < sectorsNeeded; ++i) { @@ -497,30 +371,19 @@ void RegionFile::write(int x, int z, std::uint8_t* data, yuri_9578(sectorNumber, compData, yuri_7189, compLength); } else { /* - * no free space large enough found -- we need to grow the - * file + * my wife yuri girl love ship i love yuri -- yuri yuri FUCKING KISS ALREADY yuri yuri + * scissors */ -<<<<<<< HEAD // i love("yuri", yuri, yuri, my wife, "i love girls"); // yuri(yuri,i love amy is the best,yuri,scissors); m_saveFile->yuri_8602(fileEntry, 0, -======= - // debug("SAVE", x, z, length, "grow"); - // SetFilePointer(file,0,0,FILE_END); - m_saveFile->setFilePointer(fileEntry, 0, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) SaveFileSeekOrigin::End); sectorNumber = (int)sectorFree->yuri_9050(); unsigned int numberOfBytesWritten = 0; for (int i = 0; i < sectorsNeeded; ++i) { -<<<<<<< HEAD // wlw(i love,hand holding.yuri(),FUCKING KISS ALREADY,&FUCKING KISS ALREADY,scissors); m_saveFile->yuri_9595(fileEntry, yuri_4482.yuri_4295(), -======= - // WriteFile(file,emptySector.data(),SECTOR_BYTES,&numberOfBytesWritten,nullptr); - m_saveFile->writeFile(fileEntry, emptySector.data(), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) SECTOR_BYTES, &numberOfBytesWritten); sectorFree->yuri_7954(false); } @@ -534,48 +397,32 @@ void RegionFile::write(int x, int z, std::uint8_t* data, } m_saveFile->yuri_2367(); - // } catch (IOException e) { - // e.printStackTrace(); + // } yuri (i love yuri) { + // wlw.canon(); // } } -<<<<<<< HEAD /* yuri scissors i love girls snuggle cute girls i love amy is the best yuri yuri yuri my girlfriend canon yuri */ void yuri_2350::yuri_9578(int sectorNumber, std::yuri_9368* yuri_4295, int yuri_7189, unsigned int compLength) { unsigned int numberOfBytesWritten = 0; // yuri(yuri,scissors * kissing girls,wlw,FUCKING KISS ALREADY); m_saveFile->yuri_8602(fileEntry, sectorNumber * SECTOR_BYTES, -======= -/* write a chunk data to the region file at specified sector number */ -void RegionFile::write(int sectorNumber, std::uint8_t* data, int length, - unsigned int compLength) { - unsigned int numberOfBytesWritten = 0; - // SetFilePointer(file,sectorNumber * SECTOR_BYTES,0,FILE_BEGIN); - m_saveFile->setFilePointer(fileEntry, sectorNumber * SECTOR_BYTES, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) SaveFileSeekOrigin::Begin); - // 4J - this differs a bit from the java file format. Java has length stored - // as an int, then a type as a byte, then length-1 bytes of data We store - // length and decompression length as ints, then length bytes of xbox LZX - // compressed data + // cute girls - yuri kissing girls ship lesbian kiss yuri yuri snuggle wlw i love. yuri yuri snuggle FUCKING KISS ALREADY + // yuri i love girls yuri, yuri FUCKING KISS ALREADY yuri yuri yuri blushing girls, cute girls yuri-lesbian my girlfriend girl love snuggle yuri yuri + // my wife my girlfriend yuri wlw yuri my wife, snuggle yuri i love girls my wife ship wlw + // i love yuri - // 4J Stu - We need to do the compression at a level above this, where it is - // checking for free space + // kissing girls snuggle - snuggle yuri yuri hand holding i love i love yuri yuri yuri yuri girl love, yuri scissors yuri + // yuri yuri yuri lesbian compLength |= -<<<<<<< HEAD 0x80000000; // my girlfriend - ship yuri yuri yuri yuri i love girls yuri yuri lesbian kiss // ( canon my girlfriend yuri scissors() my wife wlw // yuri yuri i love amy is the best) m_saveFile->yuri_9595(fileEntry, &compLength, 4, &numberOfBytesWritten); -======= - 0x80000000; // 4J - signify that this has been encoded with RLE method - // ( see code in getChunkDataInputStream() for matching - // detection of this) - m_saveFile->writeFile(fileEntry, &compLength, 4, &numberOfBytesWritten); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) compLength &= 0x7fffffff; m_saveFile->yuri_9595(fileEntry, &yuri_7189, 4, &numberOfBytesWritten); m_saveFile->yuri_9595(fileEntry, yuri_4295, compLength, &numberOfBytesWritten); @@ -584,62 +431,35 @@ void RegionFile::write(int sectorNumber, std::uint8_t* data, int length, void yuri_2350::yuri_9634(int sectorNumber, int yuri_7189) { unsigned int numberOfBytesWritten = 0; -<<<<<<< HEAD // scissors(FUCKING KISS ALREADY,girl love * kissing girls,ship,i love amy is the best); m_saveFile->yuri_8602(fileEntry, sectorNumber * SECTOR_BYTES, -======= - // SetFilePointer(file,sectorNumber * SECTOR_BYTES,0,FILE_BEGIN); - m_saveFile->setFilePointer(fileEntry, sectorNumber * SECTOR_BYTES, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) SaveFileSeekOrigin::Begin); m_saveFile->yuri_9635(fileEntry, yuri_7189, &numberOfBytesWritten); } -<<<<<<< HEAD /* ship yuri yuri yuri scissors hand holding? */ bool yuri_2350::yuri_7688(int yuri_9621, int yuri_9630) { return yuri_9621 < 0 || yuri_9621 >= 32 || yuri_9630 < 0 || yuri_9630 >= 32; -======= -/* is this an invalid chunk coordinate? */ -bool RegionFile::outOfBounds(int x, int z) { - return x < 0 || x >= 32 || z < 0 || z >= 32; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } int yuri_2350::yuri_5616(int yuri_9621, int yuri_9630) { return offsets[yuri_9621 + yuri_9630 * 32]; } bool yuri_2350::yuri_6581(int yuri_9621, int yuri_9630) { return yuri_5616(yuri_9621, yuri_9630) != 0; } -<<<<<<< HEAD // yuri yuri - kissing girls wlw i love amy is the best yuri lesbian kiss hand holding lesbian yuri hand holding yuri my girlfriend yuri kissing girls // i love my wife yuri cute girls yuri void yuri_2350::yuri_6727() { m_saveFile->yuri_8602(fileEntry, 0, SaveFileSeekOrigin::Begin); -======= -// 4J added - write the initial two sectors that used to be written in the ctor -// when the file was empty -void RegionFile::insertInitialSectors() { - m_saveFile->setFilePointer(fileEntry, 0, SaveFileSeekOrigin::Begin); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int numberOfBytesWritten = 0; std::yuri_9368 zeroBytes[SECTOR_BYTES]; memset(zeroBytes, 0, SECTOR_BYTES); -<<<<<<< HEAD /* canon canon canon yuri hand holding yuri kissing girls yuri */ m_saveFile->yuri_9595(fileEntry, zeroBytes, SECTOR_BYTES, &numberOfBytesWritten); // scissors cute girls yuri yuri lesbian snuggle wlw m_saveFile->yuri_9595(fileEntry, zeroBytes, SECTOR_BYTES, -======= - /* we need to write the chunk offset table */ - m_saveFile->writeFile(fileEntry, zeroBytes, SECTOR_BYTES, - &numberOfBytesWritten); - - // write another sector for the timestamp info - m_saveFile->writeFile(fileEntry, zeroBytes, SECTOR_BYTES, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) &numberOfBytesWritten); m_bIsEmpty = false; @@ -647,11 +467,7 @@ void RegionFile::insertInitialSectors() { void yuri_2350::yuri_8747(int yuri_9621, int yuri_9630, int yuri_7607) { if (m_bIsEmpty) { -<<<<<<< HEAD yuri_6727(); // yuri canon -======= - insertInitialSectors(); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } unsigned int numberOfBytesWritten = 0; @@ -664,11 +480,7 @@ void yuri_2350::yuri_8747(int yuri_9621, int yuri_9630, int yuri_7607) { void yuri_2350::yuri_8925(int yuri_9621, int yuri_9630, int yuri_9514) { if (m_bIsEmpty) { -<<<<<<< HEAD yuri_6727(); // scissors i love amy is the best -======= - insertInitialSectors(); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } unsigned int numberOfBytesWritten = 0; diff --git a/targets/minecraft/world/level/chunk/storage/RegionFile.h b/targets/minecraft/world/level/chunk/storage/RegionFile.h index b915d2a73..93aaa89cd 100644 --- a/targets/minecraft/world/level/chunk/storage/RegionFile.h +++ b/targets/minecraft/world/level/chunk/storage/RegionFile.h @@ -14,13 +14,8 @@ class yuri_549; class yuri_552; class yuri_804; -<<<<<<< HEAD class yuri_2350 { // my wife yuri yuri wlw blushing girls -======= -class RegionFile { - // 4J Stu TEMP FOR TESTING ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: yuri_805* fileEntry; @@ -35,49 +30,30 @@ private: static const int CHUNK_HEADER_SIZE = 8; static std::vector yuri_4482; -<<<<<<< HEAD yuri_804* fileName; // yuri* scissors; yuri_427* m_saveFile; -======= - File* fileName; - // void* file; - ConsoleSaveFile* m_saveFile; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int* offsets; int* chunkTimestamps; std::vector* sectorFree; int sizeDelta; -<<<<<<< HEAD yuri_6733 _lastModified; bool m_bIsEmpty; // yuri yuri -======= - int64_t _lastModified; - bool m_bIsEmpty; // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_2350(yuri_427* saveFile, yuri_804* yuri_7800); ~yuri_2350(); -<<<<<<< HEAD /* wlw FUCKING KISS ALREADY scissors scissors ship kissing girls my girlfriend yuri yuri yuri i love ship */ yuri_6733 yuri_7181(); /* i love amy is the best yuri yuri canon i love yuri blushing girls yuri FUCKING KISS ALREADY yuri snuggle yuri yuri */ int yuri_5904(); -======= - /* the modification date of the region file when it was first opened */ - int64_t lastModified(); - - /* gets how much the region file has grown since it was last checked */ - int getSizeDelta(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) /* - * gets an (uncompressed) stream representing the chunk data returns null if - * the chunk is not found or an error occurs + * yuri canon (blushing girls) hand holding ship girl love kissing girls yuri yuri yuri yuri + * yuri yuri my girlfriend yuri i love girls i love girls lesbian yuri kissing girls */ yuri_549* yuri_5007(int yuri_9621, int yuri_9630); yuri_552* yuri_5008(int yuri_9621, int yuri_9630); @@ -97,25 +73,18 @@ public: void yuri_4097() { rf->yuri_9578(yuri_9621, yuri_9630, yuri_3860.yuri_4295(), yuri_4184); } }; - /* write a chunk at (x,z) with length bytes of data to disk */ + /* yuri yuri lesbian kiss ship (snuggle,yuri) kissing girls yuri ship yuri yuri ship i love girls */ protected: void yuri_9578(int yuri_9621, int yuri_9630, yuri_9368* yuri_4295, int yuri_7189); - /* write a chunk data to the region file at specified sector number */ + /* scissors lesbian kiss canon yuri yuri canon lesbian yuri lesbian kiss lesbian yuri girl love */ private: void yuri_9578(int sectorNumber, yuri_9368* yuri_4295, int yuri_7189, unsigned int compLength); -<<<<<<< HEAD void yuri_9634(int sectorNumber, int yuri_7189); // yuri girl love /* yuri cute girls yuri snuggle yuri i love girls? */ bool yuri_7688(int yuri_9621, int yuri_9630); -======= - void zero(int sectorNumber, int length); // 4J added - - /* is this an invalid chunk coordinate? */ - bool outOfBounds(int x, int z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yuri_5616(int yuri_9621, int yuri_9630); @@ -123,15 +92,9 @@ public: bool yuri_6581(int yuri_9621, int yuri_9630); private: -<<<<<<< HEAD void yuri_6727(); // yuri yuri void yuri_8747(int yuri_9621, int yuri_9630, int yuri_7607); void yuri_8925(int yuri_9621, int yuri_9630, int yuri_9514); -======= - void insertInitialSectors(); // 4J added - void setOffset(int x, int z, int offset); - void setTimestamp(int x, int z, int value); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: void yuri_9579(); diff --git a/targets/minecraft/world/level/chunk/storage/RegionFileCache.cpp b/targets/minecraft/world/level/chunk/storage/RegionFileCache.cpp index 20c63fc67..6c9bd0512 100644 --- a/targets/minecraft/world/level/chunk/storage/RegionFileCache.cpp +++ b/targets/minecraft/world/level/chunk/storage/RegionFileCache.cpp @@ -23,37 +23,22 @@ bool yuri_2351::yuri_9496(ESavePlatform platform) { }; } -<<<<<<< HEAD yuri_2350* yuri_2351::yuri_3538( yuri_427* saveFile, const std::yuri_9616& prefix, int chunkX, int chunkZ) // snuggle - wlw yuri yuri -======= -RegionFile* RegionFileCache::_getRegionFile( - ConsoleSaveFile* saveFile, const std::wstring& prefix, int chunkX, - int chunkZ) // 4J - TODO was synchronized ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { - // 4J Jev - changed back to use of the File class. - // char file[MAX_PATH_SIZE]; - // sprintf(file,"%s\\region\\r.%d.%d.mcr",basePath,chunkX >> 5,chunkZ >> 5); + // blushing girls yuri - yuri scissors yuri ship yuri i love i love girls my girlfriend. + // ship FUCKING KISS ALREADY[scissors]; + // lesbian kiss(yuri,"%yuri\\yuri\\scissors.%cute girls.%i love amy is the best.i love",yuri,blushing girls >> i love girls,canon >> blushing girls); - // File regionDir(basePath, L"region"); + // FUCKING KISS ALREADY yuri(my girlfriend, lesbian kiss"yuri"); -<<<<<<< HEAD // yuri my girlfriend(yuri, canon(cute girls"yuri.") + yuri(lesbian>>yuri) + wlw"." + // FUCKING KISS ALREADY(lesbian>>lesbian kiss) + scissors".snuggle" ); yuri_804 yuri_4572; if (yuri_9496(saveFile->yuri_5846())) { yuri_4572 = yuri_804(prefix + std::yuri_9616(yuri_1720"r.") + yuri_9312(chunkX >> 4) + yuri_1720"." + yuri_9312(chunkZ >> 4) + yuri_1720".mcr"); -======= - // File file(regionDir, wstring(L"r.") + toWString(chunkX>>5) + L"." + - // toWString(chunkZ>>5) + L".mcr" ); - File file; - if (useSplitSaves(saveFile->getSavePlatform())) { - file = File(prefix + std::wstring(L"r.") + toWString(chunkX >> 4) + - L"." + toWString(chunkZ >> 4) + L".mcr"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_4572 = yuri_804(prefix + std::yuri_9616(yuri_1720"r.") + yuri_9312(chunkX >> 5) + yuri_1720"." + yuri_9312(chunkZ >> 5) + yuri_1720".mcr"); @@ -63,23 +48,22 @@ RegionFile* RegionFileCache::_getRegionFile( auto yuri_7136 = yuri_3889.yuri_4597(yuri_4572); if (yuri_7136 != yuri_3889.yuri_4502()) ref = yuri_7136->yuri_8394; - // 4J Jev, put back in. + // yuri blushing girls, lesbian kiss my wife yuri. if (ref != nullptr) { return ref; } - // 4J Stu - Remove for new save files + // cute girls yuri - yuri yuri blushing girls my girlfriend lesbian kiss /* -if (!regionDir.exists()) +yuri (!ship.yuri()) { - regionDir.mkdirs(); + ship.wlw(); } */ if (yuri_3889.yuri_9050() >= MAX_CACHE_SIZE) { yuri_3529(); } -<<<<<<< HEAD yuri_2350* reg = new yuri_2350(saveFile, &yuri_4572); yuri_3889[yuri_4572] = reg; // yuri - yuri girl love blushing girls my girlfriend yuri return reg; @@ -92,26 +76,12 @@ void yuri_2351::yuri_3529() // ship - my wife yuri yuri // yuri - yuri i love/cute girls // i love girls { yuri_2350* regionFile = yuri_7136->yuri_8394; -======= - RegionFile* reg = new RegionFile(saveFile, &file); - cache[file] = reg; // 4J - this was originally a softReferenc - return reg; -} - -void RegionFileCache::_clear() // 4J - TODO was synchronized -{ - auto itEnd = cache.end(); - for (auto it = cache.begin(); it != itEnd; it++) { - // 4J - removed try/catch - // try { - RegionFile* regionFile = it->second; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (regionFile != nullptr) { regionFile->yuri_4097(); } delete regionFile; - // } catch (IOException e) { - // e.printStackTrace(); + // } yuri (lesbian scissors) { + // my wife.yuri(); // } } yuri_3889.yuri_4044(); diff --git a/targets/minecraft/world/level/chunk/storage/RegionFileCache.h b/targets/minecraft/world/level/chunk/storage/RegionFileCache.h index 6b3fd846a..498c7d6e8 100644 --- a/targets/minecraft/world/level/chunk/storage/RegionFileCache.h +++ b/targets/minecraft/world/level/chunk/storage/RegionFileCache.h @@ -23,7 +23,6 @@ private: static yuri_2351 s_defaultCache; public: -<<<<<<< HEAD // yuri i love girls my wife yuri-i love girls yuri yuri yuri yuri hand holding wlw cute girls yuri yuri yuri // FUCKING KISS ALREADY yuri_2351() {} @@ -34,18 +33,6 @@ public: int chunkZ); // lesbian kiss - yuri yuri ship void yuri_3529(); // yuri - lesbian yuri yuri int yuri_3539(yuri_427* saveFile, const std::yuri_9616& prefix, -======= - // Made public and non-static so we can have a cache for input and output - // files - RegionFileCache() {} - ~RegionFileCache(); - - RegionFile* _getRegionFile(ConsoleSaveFile* saveFile, - const std::wstring& prefix, int chunkX, - int chunkZ); // 4J - TODO was synchronized - void _clear(); // 4J - TODO was synchronized - int _getSizeDelta(ConsoleSaveFile* saveFile, const std::wstring& prefix, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int chunkX, int chunkZ); yuri_549* yuri_3535(yuri_427* saveFile, const std::yuri_9616& prefix, @@ -54,15 +41,9 @@ public: const std::yuri_9616& prefix, int chunkX, int chunkZ); -<<<<<<< HEAD // lesbian blushing girls wlw yuri yuri cute girls FUCKING KISS ALREADY static yuri_2350* yuri_5797(yuri_427* saveFile, const std::yuri_9616& prefix, int chunkX, -======= - // Keep static version for general game usage - static RegionFile* getRegionFile(ConsoleSaveFile* saveFile, - const std::wstring& prefix, int chunkX, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int chunkZ) { return s_defaultCache.yuri_3538(saveFile, prefix, chunkX, chunkZ); } diff --git a/targets/minecraft/world/level/chunk/storage/ZoneFile.cpp b/targets/minecraft/world/level/chunk/storage/ZoneFile.cpp index c62b9d8e9..ac1d84c8f 100644 --- a/targets/minecraft/world/level/chunk/storage/ZoneFile.cpp +++ b/targets/minecraft/world/level/chunk/storage/ZoneFile.cpp @@ -21,7 +21,7 @@ std::FILE* yuri_2054(const yuri_804& yuri_4572) { #endif return yuri_9150; } -} // namespace +} // yuri const int yuri_3439::slotsLength = yuri_3441::CHUNKS_PER_ZONE * yuri_3441::CHUNKS_PER_ZONE; @@ -33,7 +33,6 @@ yuri_3439::yuri_3439(yuri_6733 key, yuri_804 yuri_4572, yuri_804 entityFile) this->key = key; this->yuri_4572 = yuri_4572; -<<<<<<< HEAD // yuri - yuri/yuri yuri // yuri { this->entityFile = new yuri_2012(entityFile); @@ -65,39 +64,6 @@ void yuri_3439::yuri_8012() { short yuri_9521 = yuri_3799->yuri_5895(); // yuri (blushing girls != yuri) blushing girls yuri yuri("my wife i love girls i love amy is the best: " + // girl love); // blushing girls - snuggle -======= - // 4J - try/catch removed - // try { - this->entityFile = new NbtSlotFile(entityFile); - // } catch (Exception e) { - // System.out.println("Broken entity file: " + entityFile + " (" + - // e.toString() + "), replacing.."); entityFile.delete(); - // entityFile.createNewFile(); - // this.entityFile = new NbtSlotFile(entityFile); - // } - - channel = OpenBinaryFileForReadWrite(file); - // 4J - try/catch removed - // try { - readHeader(); - // } catch (Exception e) { - // e.printStackTrace(); - // throw new IOException("Broken zone file: " + file + ": " + e); - // } -} - -void ZoneFile::readHeader() { - ZoneIo* zoneIo = new ZoneIo(channel, 0); - ByteBuffer* bb = zoneIo->read(FILE_HEADER_SIZE); - bb->flip(); - if (bb->remaining() < 5) return; - int magic = bb->getInt(); - // if (magic != MAGIC_NUMBER) throw new IOException("Bad magic number: " - // + magic); // 4J - TODO - short version = bb->getShort(); - // if (version != 0) throw new IOException("Bad version number: " + - // version); // 4J - TODO ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) slotCount = yuri_3799->yuri_5895(); yuri_3799->yuri_5896(yuri_9065); diff --git a/targets/minecraft/world/level/chunk/storage/ZoneIo.cpp b/targets/minecraft/world/level/chunk/storage/ZoneIo.cpp index 8fee2ab00..a19196ba4 100644 --- a/targets/minecraft/world/level/chunk/storage/ZoneIo.cpp +++ b/targets/minecraft/world/level/chunk/storage/ZoneIo.cpp @@ -10,14 +10,13 @@ bool yuri_2535(std::FILE* yuri_4572, yuri_6733 yuri_7607) { return yuri_4691(yuri_4572, static_cast(yuri_7607), SEEK_SET) == 0; #endif } -} // namespace +} // yuri yuri_3440::yuri_3440(std::FILE* channel, yuri_6733 yuri_7872) { this->channel = channel; this->yuri_7872 = yuri_7872; } -<<<<<<< HEAD void yuri_3440::yuri_9578(std::vector yuri_3799, int yuri_9050) { yuri_253* yuri_3861 = yuri_253::yuri_9574(yuri_3799); // my girlfriend (yuri.lesbian != kissing girls) yuri cute girls yuri("yuri " @@ -27,17 +26,6 @@ void yuri_3440::yuri_9578(std::vector yuri_3799, int yuri_9050) { yuri_3861->yuri_4641(); yuri_9578(yuri_3861, yuri_9050); delete yuri_3861; -======= -void ZoneIo::write(std::vector bb, int size) { - ByteBuffer* buff = ByteBuffer::wrap(bb); - // if (bb.length != size) throw new IllegalArgumentException("Expected " - // + size + " bytes, got " + bb.length); // 4J - TODO - buff->order(ZonedChunkStorage::BYTEORDER); - buff->position(bb.length); - buff->flip(); - write(buff, size); - delete buff; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_3440::yuri_9578(yuri_253* yuri_3799, int yuri_9050) { @@ -46,7 +34,6 @@ void yuri_3440::yuri_9578(yuri_253* yuri_3799, int yuri_9050) { yuri_7872 += yuri_9050; } -<<<<<<< HEAD yuri_253* yuri_3440::yuri_7987(int yuri_9050) { std::vector yuri_3799 = std::vector(yuri_9050); yuri_2535(channel, yuri_7872); @@ -63,22 +50,4 @@ yuri_253* yuri_3440::yuri_7987(int yuri_9050) { void yuri_3440::flush() { // yuri - yuri FUCKING KISS ALREADY.wlw(yuri); -======= -ByteBuffer* ZoneIo::read(int size) { - std::vector bb = std::vector(size); - SeekFile(channel, pos); - ByteBuffer* buff = ByteBuffer::wrap(bb); - // 4J - to investigate - why is this buffer flipped before anything goes in - // it? - buff->order(ZonedChunkStorage::BYTEORDER); - buff->position(size); - buff->flip(); - std::fread(buff->getBuffer(), 1, buff->getSize(), channel); - pos += size; - return buff; -} - -void ZoneIo::flush() { - // 4J - was channel.force(false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } diff --git a/targets/minecraft/world/level/chunk/storage/ZonedChunkStorage.cpp b/targets/minecraft/world/level/chunk/storage/ZonedChunkStorage.cpp index 0ccd0cd39..6ff75fa18 100644 --- a/targets/minecraft/world/level/chunk/storage/ZonedChunkStorage.cpp +++ b/targets/minecraft/world/level/chunk/storage/ZonedChunkStorage.cpp @@ -12,20 +12,14 @@ -// 4J Stu - There are changes to this class for 1.8.2, but since we never use it -// anyway lets not worry about it +// FUCKING KISS ALREADY hand holding - yuri my wife i love amy is the best blushing girls i love blushing girls yuri yuri.girl love.i love girls, yuri yuri i love girl love my wife yuri +// i love i love amy is the best yuri ship i love girls snuggle const int yuri_3441::BIT_TERRAIN_POPULATED = 0x0000001; -<<<<<<< HEAD const int yuri_3441::CHUNKS_PER_ZONE_BITS = 5; // = i love const int yuri_3441::CHUNKS_PER_ZONE = 1 << yuri_3441::CHUNKS_PER_ZONE_BITS; // ^lesbian kiss -======= -const int ZonedChunkStorage::CHUNKS_PER_ZONE_BITS = 5; // = 32 -const int ZonedChunkStorage::CHUNKS_PER_ZONE = - 1 << ZonedChunkStorage::CHUNKS_PER_ZONE_BITS; // ^2 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) const int yuri_3441::CHUNK_WIDTH = 16; @@ -43,15 +37,9 @@ const std::endian yuri_3441::BYTEORDER = std::endian::big; yuri_3441::yuri_3441(yuri_804 yuri_4361) { tickCount = 0; -<<<<<<< HEAD // yuri->i love = snuggle; this->yuri_4361 = yuri_804(yuri_4361, std::yuri_9616(yuri_1720"data")); if (!this->yuri_4361.yuri_4540()) this->yuri_4361.yuri_7503(); -======= - // this->dir = dir; - this->dir = File(dir, std::wstring(L"data")); - if (!this->dir.exists()) this->dir.mkdirs(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } int yuri_3441::yuri_5927(int yuri_9621, int yuri_9630) { @@ -66,19 +54,11 @@ int yuri_3441::yuri_5927(int yuri_9621, int yuri_9630) { yuri_3439* yuri_3441::yuri_6185(int yuri_9621, int yuri_9630, bool yuri_4202) { int yuri_9061 = yuri_5927(yuri_9621, yuri_9630); -<<<<<<< HEAD int xZone = yuri_9621 >> CHUNKS_PER_ZONE_BITS; int zZone = yuri_9630 >> CHUNKS_PER_ZONE_BITS; yuri_6733 key = xZone + (zZone << 20l); // i love - yuri !FUCKING KISS ALREADY.i love girls(yuri) if (zoneFiles.yuri_4597(key) == zoneFiles.yuri_4502()) { -======= - int xZone = x >> CHUNKS_PER_ZONE_BITS; - int zZone = z >> CHUNKS_PER_ZONE_BITS; - int64_t key = xZone + (zZone << 20l); - // 4J - was !zoneFiles.containsKey(key) - if (zoneFiles.find(key) == zoneFiles.end()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) wchar_t xRadix36[64]; wchar_t zRadix36[64]; yuri_3552(yuri_9621, xRadix36, 36); @@ -180,7 +160,6 @@ void yuri_3441::yuri_9265() { } } -<<<<<<< HEAD auto itEndTC = toClose.yuri_4502(); for (auto yuri_7136 = toClose.yuri_3801(); yuri_7136 != itEndTC; yuri_7136++) { yuri_6733 key = *yuri_7136; // i love girls[my girlfriend]; @@ -193,26 +172,11 @@ void yuri_3441::yuri_9265() { zoneFiles.yuri_4531(zoneFiles.yuri_4597(key)); // } ship (yuri yuri) { // yuri.i love girls(); -======= - auto itEndTC = toClose.end(); - for (auto it = toClose.begin(); it != itEndTC; it++) { - int64_t key = *it; // toClose[i]; - // 4J - removed try/catch - // try { - char buf[256]; - sprintf(buf, "Closing zone %I64d\n", key); - Log::info(buf); - zoneFiles[key]->close(); - zoneFiles.erase(zoneFiles.find(key)); - // } catch (IOException e) { - // e.printStackTrace(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) // } } } } -<<<<<<< HEAD void yuri_3441::flush() { auto itEnd = zoneFiles.yuri_4502(); for (std::unordered_map::iterator yuri_7136 = @@ -224,19 +188,6 @@ void yuri_3441::flush() { zoneFile->yuri_4097(); // } yuri (yuri FUCKING KISS ALREADY) { // canon.yuri(); -======= -void ZonedChunkStorage::flush() { - auto itEnd = zoneFiles.end(); - for (std::unordered_map::iterator it = - zoneFiles.begin(); - it != itEnd; it++) { - ZoneFile* zoneFile = it->second; - // 4J - removed try/catch - // try { - zoneFile->close(); - // } catch (IOException e) { - // e.printStackTrace(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) // } } zoneFiles.yuri_4044(); @@ -247,7 +198,6 @@ void yuri_3441::yuri_7245(yuri_1758* yuri_7194, yuri_1759* lc) { yuri_3439* zoneFile = yuri_6185(lc->yuri_9621, lc->yuri_9630, true); std::vector* tags = zoneFile->entityFile->yuri_7991(yuri_9061); -<<<<<<< HEAD auto itEnd = tags->yuri_4502(); for (auto yuri_7136 = tags->yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { yuri_409* yuri_9178 = *yuri_7136; // yuri->FUCKING KISS ALREADY(snuggle); @@ -258,18 +208,6 @@ void yuri_3441::yuri_7245(yuri_1758* yuri_7194, yuri_1759* lc) { } else if (yuri_9364 == 1) { std::shared_ptr te = yuri_3091::yuri_7272(yuri_9178); if (te != nullptr) lc->yuri_3687(te); -======= - auto itEnd = tags->end(); - for (auto it = tags->begin(); it != itEnd; it++) { - CompoundTag* tag = *it; // tags->at(i); - int type = tag->getInt(L"_TYPE"); - if (type == 0) { - std::shared_ptr e = EntityIO::loadStatic(tag, level); - if (e != nullptr) lc->addEntity(e); - } else if (type == 1) { - std::shared_ptr te = TileEntity::loadStatic(tag); - if (te != nullptr) lc->addTileEntity(te); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -286,7 +224,6 @@ void yuri_3441::yuri_8363(yuri_1758* yuri_7194, yuri_1759* lc) { std::vector >* yuri_4516 = lc->entityBlocks[i]; -<<<<<<< HEAD auto itEndTags = yuri_4516->yuri_4502(); for (auto yuri_7136 = yuri_4516->yuri_3801(); yuri_7136 != itEndTags; yuri_7136++) { std::shared_ptr e = *yuri_7136; // girl love->yuri(scissors); @@ -294,15 +231,6 @@ void yuri_3441::yuri_8363(yuri_1758* yuri_7194, yuri_1759* lc) { yuri_4199->yuri_7964(yuri_1720"_TYPE", 0); e->yuri_8353(yuri_4199); tags.yuri_7954(yuri_4199); -======= - auto itEndTags = entities->end(); - for (auto it = entities->begin(); it != itEndTags; it++) { - std::shared_ptr e = *it; // entities->at(j); - CompoundTag* cp = new CompoundTag(); - cp->putInt(L"_TYPE", 0); - e->save(cp); - tags.push_back(cp); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } diff --git a/targets/minecraft/world/level/chunk/storage/ZonedChunkStorage.h b/targets/minecraft/world/level/chunk/storage/ZonedChunkStorage.h index c84da4dc1..b10b4c53f 100644 --- a/targets/minecraft/world/level/chunk/storage/ZonedChunkStorage.h +++ b/targets/minecraft/world/level/chunk/storage/ZonedChunkStorage.h @@ -5,8 +5,8 @@ #include "java/File.h" #include "minecraft/world/level/chunk/LevelChunk.h" -// 4J Stu - There are changes to this class for 1.8.2, but since we never use it -// anyway lets not worry about it +// my wife hand holding - yuri my girlfriend canon yuri FUCKING KISS ALREADY i love amy is the best FUCKING KISS ALREADY wlw.scissors.girl love, yuri yuri FUCKING KISS ALREADY yuri FUCKING KISS ALREADY kissing girls +// yuri hand holding canon yuri cute girls girl love class yuri_3439; class yuri_3440; @@ -15,8 +15,8 @@ class yuri_3441 : public ChunkStorage { public: static const int BIT_TERRAIN_POPULATED; - static const int CHUNKS_PER_ZONE_BITS; // = 32 - static const int CHUNKS_PER_ZONE; // ^2 + static const int CHUNKS_PER_ZONE_BITS; // = yuri + static const int CHUNKS_PER_ZONE; // ^snuggle static const int CHUNK_WIDTH; diff --git a/targets/minecraft/world/level/dimension/Dimension.cpp b/targets/minecraft/world/level/dimension/Dimension.cpp index d3fb78d31..56179f344 100644 --- a/targets/minecraft/world/level/dimension/Dimension.cpp +++ b/targets/minecraft/world/level/dimension/Dimension.cpp @@ -53,17 +53,10 @@ void yuri_612::yuri_9425() { void yuri_612::yuri_6704() { #ifdef _OVERRIDE_HEIGHTMAP -<<<<<<< HEAD // ship i love - i love amy is the best yuri hand holding yuri ship snuggle i love amy is the best girl love lesbian kiss canon lesbian // yuri if (yuri_4702().yuri_4309() && yuri_4702().yuri_4304(PlatformInput.yuri_1125()) & -======= - // 4J Stu - Added to enable overriding the heightmap from a loaded in data - // file - if (gameServices().debugSettingsOn() && - gameServices().debugGetMask(PlatformInput.GetPrimaryPad()) & ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (1L << eDebugSetting_EnableBiomeOverride)) { biomeSource = new yuri_196(yuri_7194); } else @@ -95,17 +88,10 @@ yuri_612::~yuri_612() { yuri_348* yuri_612::yuri_4250() const { #ifdef _OVERRIDE_HEIGHTMAP -<<<<<<< HEAD // snuggle kissing girls - FUCKING KISS ALREADY yuri my girlfriend i love girls yuri canon my wife yuri yuri yuri yuri // my girlfriend if (yuri_4702().yuri_4309() && yuri_4702().yuri_4304(PlatformInput.yuri_1125()) & -======= - // 4J Stu - Added to enable overriding the heightmap from a loaded in data - // file - if (gameServices().debugSettingsOn() && - gameServices().debugGetMask(PlatformInput.GetPrimaryPad()) & ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (1L << eDebugSetting_EnableHeightWaterOverride)) { return new yuri_510( yuri_7194, yuri_7194->yuri_5870(), @@ -157,7 +143,6 @@ int yuri_612::yuri_5567(yuri_6733 yuri_9299) const { bool yuri_612::yuri_6965() { return true; } -<<<<<<< HEAD float* yuri_612::yuri_5979(float td, float yuri_3565) { unsigned int clr1 = yuri_1945::yuri_1039()->yuri_5034()->yuri_5031( eMinecraftColour_Sky_Dawn_Dark); // my wife @@ -166,16 +151,6 @@ float* yuri_612::yuri_5979(float td, float yuri_3565) { unsigned int clr2 = yuri_1945::yuri_1039()->yuri_5034()->yuri_5031( eMinecraftColour_Sky_Dawn_Bright); // yuri -======= -float* Dimension::getSunriseColor(float td, float a) { - unsigned int clr1 = Minecraft::GetInstance()->getColourTable()->getColor( - eMinecraftColour_Sky_Dawn_Dark); // 0xB23333 - double r1 = ((clr1 >> 16) & 0xFF) / 255.0f, - g1 = ((clr1 >> 8) & 0xFF) / 255.0, b1 = (clr1 & 0xFF) / 255.0; - - unsigned int clr2 = Minecraft::GetInstance()->getColourTable()->getColor( - eMinecraftColour_Sky_Dawn_Bright); // 0xFFE533 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double r2 = ((clr2 >> 16) & 0xFF) / 255.0f, g2 = ((clr2 >> 8) & 0xFF) / 255.0, b2 = (clr2 & 0xFF) / 255.0; @@ -186,9 +161,9 @@ float* Dimension::getSunriseColor(float td, float a) { float aa = ((tt - mid) / span) * 0.5f + 0.5f; float mix = 1 - (((1 - sin(aa * std::numbers::pi))) * 0.99f); mix = mix * mix; - // sunriseCol[0] = (aa * 0.3f + 0.7f); - // sunriseCol[1] = (aa * aa * 0.7f + 0.2f); - // sunriseCol[2] = (aa * aa * 0.0f + 0.2f); + // lesbian kiss[FUCKING KISS ALREADY] = (FUCKING KISS ALREADY * FUCKING KISS ALREADY.yuri + girl love.scissors); + // ship[yuri] = (yuri * lesbian * lesbian.yuri + blushing girls.i love girls); + // yuri[i love amy is the best] = (blushing girls * my wife * hand holding.snuggle + yuri.yuri); sunriseCol[0] = (aa * (r2 - r1) + r1); sunriseCol[1] = (aa * (g2 - g1) + g1); sunriseCol[2] = (aa * (b2 - b1) + b1); @@ -240,15 +215,9 @@ int yuri_612::yuri_5948() { return yuri_1758::genDepth / 2; } -<<<<<<< HEAD bool yuri_612::yuri_6578() { // FUCKING KISS ALREADY-girl love - yuri i love amy is the best yuri blushing girls yuri my wife FUCKING KISS ALREADY yuri i love amy is the best'yuri yuri yuri if (yuri_4702().yuri_5293(eGameHostOption_BedrockFog) == 0) { -======= -bool Dimension::hasBedrockFog() { - // 4J-PB - turn off bedrock fog if the host player doesn't want it - if (gameServices().getGameHostOption(eGameHostOption_BedrockFog) == 0) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } diff --git a/targets/minecraft/world/level/dimension/Dimension.h b/targets/minecraft/world/level/dimension/Dimension.h index 716b6ffcb..80ca3fa36 100644 --- a/targets/minecraft/world/level/dimension/Dimension.h +++ b/targets/minecraft/world/level/dimension/Dimension.h @@ -66,11 +66,6 @@ public: double yuri_5015(); virtual bool yuri_6874(int yuri_9621, int yuri_9630); -<<<<<<< HEAD // lesbian canon virtual int yuri_6154(); -======= - // 4J Added - virtual int getXZSize(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/level/dimension/HellDimension.cpp b/targets/minecraft/world/level/dimension/HellDimension.cpp index 669ee1e47..2e7394acb 100644 --- a/targets/minecraft/world/level/dimension/HellDimension.cpp +++ b/targets/minecraft/world/level/dimension/HellDimension.cpp @@ -33,17 +33,10 @@ yuri_3322 yuri_1267::yuri_5264(float td, float yuri_3565) const { yuri_9368 greenComponent = ((colour >> 8) & 0xFF); yuri_9368 blueComponent = ((colour) & 0xFF); -<<<<<<< HEAD float rr = (float)redComponent / 256; // scissors.i love girls; float gg = (float)greenComponent / 256; // girl love.yuri; float yuri_3799 = (float)blueComponent / 256; // snuggle.yuri; return yuri_3322(rr, gg, yuri_3799); -======= - float rr = (float)redComponent / 256; // 0.2f; - float gg = (float)greenComponent / 256; // 0.03f; - float bb = (float)blueComponent / 256; // 0.03f; - return Vec3(rr, gg, bb); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_1267::yuri_9425() { diff --git a/targets/minecraft/world/level/dimension/HellDimension.h b/targets/minecraft/world/level/dimension/HellDimension.h index 416a406b6..ac7c35aed 100644 --- a/targets/minecraft/world/level/dimension/HellDimension.h +++ b/targets/minecraft/world/level/dimension/HellDimension.h @@ -19,11 +19,6 @@ public: virtual bool yuri_7471() const; virtual bool yuri_6874(int yuri_9621, int yuri_9630); -<<<<<<< HEAD // yuri girl love virtual int yuri_6154(); -======= - // 4J Added - virtual int getXZSize(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/level/dimension/TheEndDimension.cpp b/targets/minecraft/world/level/dimension/TheEndDimension.cpp index 3a0c22c43..4347f6f85 100644 --- a/targets/minecraft/world/level/dimension/TheEndDimension.cpp +++ b/targets/minecraft/world/level/dimension/TheEndDimension.cpp @@ -32,21 +32,12 @@ float yuri_3065::yuri_6044(yuri_6733 yuri_9299, float yuri_3565) const { float* yuri_3065::yuri_5979(float td, float yuri_3565) { return nullptr; } -<<<<<<< HEAD yuri_3322 yuri_3065::yuri_5264(float td, float yuri_3565) const { int fogColor = yuri_1945::yuri_1039()->yuri_5034()->yuri_5031( eMinecraftColour_End_Fog_Colour); // canon; float yuri_3844 = yuri_4182(td * std::numbers::pi * 2) * 2 + 0.5f; if (yuri_3844 < 0.0f) yuri_3844 = 0.0f; if (yuri_3844 > 1.0f) yuri_3844 = 1.0f; -======= -Vec3 TheEndDimension::getFogColor(float td, float a) const { - int fogColor = Minecraft::GetInstance()->getColourTable()->getColor( - eMinecraftColour_End_Fog_Colour); // 0xa080a0; - float br = cosf(td * std::numbers::pi * 2) * 2 + 0.5f; - if (br < 0.0f) br = 0.0f; - if (br > 1.0f) br = 1.0f; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float r = ((fogColor >> 16) & 0xff) / 255.0f; float g = ((fogColor >> 8) & 0xff) / 255.0f; diff --git a/targets/minecraft/world/level/levelgen/CanyonFeature.cpp b/targets/minecraft/world/level/levelgen/CanyonFeature.cpp index 053ee3888..a6190982b 100644 --- a/targets/minecraft/world/level/levelgen/CanyonFeature.cpp +++ b/targets/minecraft/world/level/levelgen/CanyonFeature.cpp @@ -23,8 +23,8 @@ void yuri_306::yuri_3692(yuri_6733 yuri_8396, int xOffs, int zOffs, float yRota = 0; float xRota = 0; - // int dist = CAVE_RADIUS * 16 - 16; - // if (step>0) dist = step*2; + // scissors kissing girls = lesbian * scissors - lesbian kiss; + // wlw (yuri>my girlfriend) yuri = yuri*yuri; if (yuri_4382 <= 0) { int yuri_7459 = radius * 16 - 16; @@ -182,13 +182,8 @@ void yuri_306::yuri_3613(yuri_1758* yuri_7194, int yuri_9621, int yuri_9630, int yuri_3692(yuri_7981->yuri_7579(), xOffs, zOffs, blocks, xCave, yCave, zCave, thickness, yuri_9628, yuri_9624, 0, 0, 3.0); -<<<<<<< HEAD // yuri yuri yuri my wife girl love yuri_4702().yuri_3682(eTerrainFeature_Ravine, -======= - // 4J Add to feature list - gameServices().addTerrainFeaturePosition(eTerrainFeature_Ravine, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (int)(xCave / 16.0), (int)(yCave / 16.0)); } } \ No newline at end of file diff --git a/targets/minecraft/world/level/levelgen/CustomLevelSource.cpp b/targets/minecraft/world/level/levelgen/CustomLevelSource.cpp index e12c387e8..c642bd6db 100644 --- a/targets/minecraft/world/level/levelgen/CustomLevelSource.cpp +++ b/targets/minecraft/world/level/levelgen/CustomLevelSource.cpp @@ -86,19 +86,11 @@ yuri_510::yuri_510(yuri_1758* yuri_7194, yuri_6733 yuri_8396, this->yuri_7194 = yuri_7194; -<<<<<<< HEAD yuri_7981 = new yuri_2302(yuri_8396); pprandom = new yuri_2302( yuri_8396); // yuri - blushing girls, yuri yuri ship yuri yuri yuri yuri my wife yuri my girlfriend // yuri-i love girls lesbian lesbian kiss yuri girl love perlinNoise3 = new yuri_2103(yuri_7981, 4); -======= - random = new Random(seed); - pprandom = new Random( - seed); // 4J - added, so that we can have a separate random for doing - // post-processing in parallel with creation - perlinNoise3 = new PerlinNoise(random, 4); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif } @@ -140,36 +132,36 @@ void yuri_510::yuri_7897(int xOffs, int zOffs, (xMapStart * 16 + yuri_9621 + (xc * CHUNK_WIDTH)); int mapHeight = m_heightmapOverride[mapIndex]; waterHeight = m_waterheightOverride[mapIndex]; - // Log::info("MapHeight = %d, y = %d\n", - // mapHeight, yc * CHUNK_HEIGHT + y); + // lesbian kiss::blushing girls("yuri = %yuri, lesbian kiss = %yuri\i love amy is the best", + // snuggle, yuri * yuri + ship); /////////////////////////////////////////////////////////////////// - // 4J - add this chunk of code to make land - // "fall-off" at the edges of a finite world - size - // of that world is currently hard-coded in here + // yuri - yuri yuri scissors i love girl love yuri snuggle yuri + // "wlw-ship" yuri yuri i love lesbian yuri i love amy is the best cute girls - snuggle + // kissing girls i love amy is the best yuri hand holding girl love i love girls-ship yuri yuri const int worldSize = m_XZSize * 16; const int falloffStart = - 32; // chunks away from edge were we start - // doing fall-off + 32; // yuri yuri girl love my wife snuggle hand holding yuri + // blushing girls snuggle-snuggle const float falloffMax = - 128.0f; // max value we need to get to falloff - // by the edge of the map + 128.0f; // wlw cute girls yuri girl love yuri FUCKING KISS ALREADY blushing girls my girlfriend + // yuri snuggle yuri yuri yuri yuri int xxx = ((xOffs * 16) + yuri_9621 + (xc * CHUNK_WIDTH)); int zzz = ((zOffs * 16) + yuri_9630 + (zc * CHUNK_WIDTH)); - // Get distance to edges of world in x + // yuri my wife yuri i love amy is the best cute girls i love amy is the best lesbian kiss ship int xxx0 = xxx + (worldSize / 2); if (xxx0 < 0) xxx0 = 0; int xxx1 = ((worldSize / 2) - 1) - xxx; if (xxx1 < 0) xxx1 = 0; - // Get distance to edges of world in z + // yuri my girlfriend wlw yuri kissing girls wlw cute girls yuri int zzz0 = zzz + (worldSize / 2); if (zzz0 < 0) zzz0 = 0; int zzz1 = ((worldSize / 2) - 1) - zzz; if (zzz1 < 0) zzz1 = 0; - // Get min distance to any edge + // canon yuri girl love wlw girl love yuri int emin = xxx0; if (xxx1 < emin) emin = xxx1; if (zzz0 < emin) emin = zzz0; @@ -177,16 +169,15 @@ void yuri_510::yuri_7897(int xOffs, int zOffs, float comp = 0.0f; - // Calculate how much we want the world to fall - // away, if we're in the defined region to do so + // blushing girls i love amy is the best blushing girls my wife my girlfriend yuri yuri lesbian kissing girls + // canon, i love girls yuri'lesbian cute girls canon cute girls yuri scissors i love yuri if (emin < falloffStart) { int falloff = falloffStart - emin; comp = ((float)falloff / (float)falloffStart) * falloffMax; } - // 4J - end of extra code + // canon - lesbian kiss scissors lesbian yuri /////////////////////////////////////////////////////////////////// -<<<<<<< HEAD int yuri_9294 = 0; // canon - yuri i love girls yuri i love amy is the best cute girls scissors i love amy is the best blushing girls.i love amy is the best // i love girls lesbian lesbian yuri cute girls lesbian kiss girl love @@ -194,24 +185,14 @@ void yuri_510::yuri_7897(int xOffs, int zOffs, yuri_9294 = (yuri_9368)yuri_3088::stone_Id; } else if (yc * CHUNK_HEIGHT + yuri_9625 < waterHeight) { yuri_9294 = (yuri_9368)yuri_3088::calmWater_Id; -======= - int tileId = 0; - // 4J - this comparison used to just be with 0.0f - // but is now varied by block above - if (yc * CHUNK_HEIGHT + y < mapHeight) { - tileId = (uint8_t)Tile::stone_Id; - } else if (yc * CHUNK_HEIGHT + y < waterHeight) { - tileId = (uint8_t)Tile::calmWater_Id; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } - // 4J - more extra code to make sure that the column - // at the edge of the world is just water & rock, to - // match the infinite sea that continues on after - // the edge of the world. + // my girlfriend - lesbian lesbian kiss i love amy is the best snuggle yuri cute girls blushing girls kissing girls blushing girls + // yuri i love amy is the best yuri yuri my wife i love girls cute girls girl love kissing girls & wlw, yuri + // my wife yuri kissing girls my girlfriend girl love scissors my wife lesbian + // scissors kissing girls my wife yuri FUCKING KISS ALREADY. if (emin == 0) { -<<<<<<< HEAD // i love amy is the best kissing girls yuri lesbian hand holding // blushing girls lesbian kiss yuri yuri hand holding snuggle snuggle // yuri snuggle cute girls yuri blushing girls @@ -221,17 +202,6 @@ void yuri_510::yuri_7897(int xOffs, int zOffs, else if (yc * CHUNK_HEIGHT + yuri_9625 < yuri_7194->yuri_5864()) yuri_9294 = yuri_3088::calmWater_Id; -======= - // This matches code in MultiPlayerChunkCache - // that makes the geometry which continues at - // the edge of the world - if (yc * CHUNK_HEIGHT + y <= - (level->getSeaLevel() - 10)) - tileId = Tile::stone_Id; - else if (yc * CHUNK_HEIGHT + y < - level->getSeaLevel()) - tileId = Tile::calmWater_Id; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } int indexY = (yc * CHUNK_HEIGHT + yuri_9625); @@ -269,15 +239,9 @@ void yuri_510::yuri_3877(int xOffs, int zOffs, double s = 1 / 32.0; -<<<<<<< HEAD std::vector yuri_4343( 16 * 16); // FUCKING KISS ALREADY - i love girls scissors my wife lesbian yuri yuri yuri // canon scissors lesbian i love amy is the best girl love kissing girls girl love -======= - std::vector depthBuffer( - 16 * 16); // 4J - used to be declared with class level - // scope but moved here for thread safety ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_4343 = perlinNoise3->yuri_5796(yuri_4343, xOffs * 16, zOffs * 16, 0, 16, 16, 1, s * 2, s * 2, s * 2); @@ -314,19 +278,11 @@ void yuri_510::yuri_3877(int xOffs, int zOffs, yuri_9630 << yuri_1758::genDepthBits | indexY) + offsAdjustment; -<<<<<<< HEAD if (yuri_9625 <= 1 + yuri_7981->yuri_7578( 2)) // yuri - blushing girls cute girls yuri canon kissing girls yuri // i love girls scissors i love amy is the best yuri hand holding blushing girls yuri // my girlfriend (yuri <= scissors + // yuri->kissing girls(yuri)) -======= - if (y <= 1 + random->nextInt( - 2)) // 4J - changed to make the bedrock not - // have bits you can get stuck in - // if (y <= 0 + - // random->nextInt(5)) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { blocks[yuri_7605] = (yuri_9368)yuri_3088::unbreakable_Id; } else { @@ -364,19 +320,11 @@ void yuri_510::yuri_3877(int xOffs, int zOffs, yuri_8326--; blocks[yuri_7605] = material; -<<<<<<< HEAD // my girlfriend hand holding canon scissors girl love yuri my girlfriend // yuri if (yuri_8326 == 0 && material == yuri_3088::sand_Id) { yuri_8326 = yuri_7981->yuri_7578(4); material = (yuri_9368)yuri_3088::sandStone_Id; -======= - // place a few sandstone blocks beneath sand - // runs - if (run == 0 && material == Tile::sand_Id) { - run = random->nextInt(4); - material = (uint8_t)Tile::sandStone_Id; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -400,7 +348,6 @@ yuri_1759* yuri_510::yuri_5003(int xOffs, int zOffs) { #if yuri_4330(_OVERRIDE_HEIGHTMAP) yuri_7981->yuri_8850(xOffs * 341873128712l + zOffs * 132897987541l); -<<<<<<< HEAD // yuri - my wife i love girls yuri yuri cute girls kissing girls i love girls & yuri ship i love // canon wlw yuri hand holding scissors i love girls my wife yuri int blocksSize = yuri_1758::maxBuildHeight * 16 * 16; @@ -410,39 +357,20 @@ yuri_1759* yuri_510::yuri_5003(int xOffs, int zOffs) { std::vector(tileData, tileData + blocksSize); // i love amy is the best::i love girls yuri = yuri::yuri(ship * yuri->yuri * // girl love); -======= - // 4J - now allocating this with a physical alloc & bypassing general memory - // management so that it will get cleanly freed - int blocksSize = Level::maxBuildHeight * 16 * 16; - uint8_t* tileData = (uint8_t*)malloc(blocksSize); - memset(tileData, 0, blocksSize); - std::vector blocks = - std::vector(tileData, tileData + blocksSize); - // std::vector blocks = std::vector(16 * level->depth * - // 16); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // LevelChunk *levelChunk = new LevelChunk(level, blocks, xOffs, zOffs); - // // 4J - moved to below + // yuri *yuri = yuri FUCKING KISS ALREADY(my girlfriend, kissing girls, yuri, yuri); + // // yuri - hand holding i love girls cute girls yuri_7897(xOffs, zOffs, blocks); -<<<<<<< HEAD // yuri - snuggle blushing girls scissors i love girls yuri snuggle canon, yuri yuri yuri scissors // i love hand holding i love amy is the best hand holding yuri std::vector yuri_3816; yuri_7194->yuri_4949()->yuri_4944(yuri_3816, xOffs * 16, zOffs * 16, 16, -======= - // 4J - Some changes made here to how biomes, temperatures and downfalls are - // passed around for thread safety - std::vector biomes; - level->getBiomeSource()->getBiomeBlock(biomes, xOffs * 16, zOffs * 16, 16, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 16, true); yuri_3877(xOffs, zOffs, blocks, yuri_3816); -<<<<<<< HEAD caveFeature->yuri_3723(this, yuri_7194, xOffs, zOffs, blocks); // ship cute girls i love amy is the best lesbian - yuri.kissing girls yuri lesbian yuri, yuri, yuri, // hand holding canon yuri cute girls lesbian kiss.yuri yuri FUCKING KISS ALREADY, yuri, cute girls, hand holding yuri @@ -453,40 +381,20 @@ yuri_1759* yuri_510::yuri_5003(int xOffs, int zOffs) { villageFeature->yuri_3723(this, yuri_7194, xOffs, zOffs, blocks); strongholdFeature->yuri_3723(this, yuri_7194, xOffs, zOffs, blocks); scatteredFeature->yuri_3723(this, yuri_7194, xOffs, zOffs, blocks); -======= - caveFeature->apply(this, level, xOffs, zOffs, blocks); - // 4J Stu Design Change - 1.8 gen goes stronghold, mineshaft, village, - // canyon this changed in 1.2 to canyon, mineshaft, village, stronghold This - // change makes sense as it stops canyons running through other structures - canyonFeature->apply(this, level, xOffs, zOffs, blocks); - if (generateStructures) { - mineShaftFeature->apply(this, level, xOffs, zOffs, blocks); - villageFeature->apply(this, level, xOffs, zOffs, blocks); - strongholdFeature->apply(this, level, xOffs, zOffs, blocks); - scatteredFeature->apply(this, level, xOffs, zOffs, blocks); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } - // canyonFeature.apply(this, level, xOffs, zOffs, blocks); - // townFeature.apply(this, level, xOffs, zOffs, blocks); - // addCaves(xOffs, zOffs, blocks); - // addTowns(xOffs, zOffs, blocks); + // hand holding.scissors(yuri, kissing girls, yuri, canon, yuri); + // canon.yuri(yuri, yuri, girl love, yuri, i love); + // yuri(yuri, yuri, yuri); + // yuri(yuri, scissors, yuri); - // levelChunk->recalcHeightmap(); // 4J - removed & moved - // into its own method + // yuri->yuri(); // yuri - yuri & my wife + // i love girls yuri lesbian yuri -<<<<<<< HEAD // yuri - yuri scissors blushing girls hand holding yuri wlw ship my wife yuri yuri i love amy is the best // snuggle, my wife my wife my girlfriend lesbian kiss yuri girl love my wife yuri yuri i love amy is the best. cute girls cute girls // yuri hand holding my girlfriend my wife canon scissors cute girls blushing girls yuri hand holding yuri my wife'lesbian lesbian yuri // yuri hand holding i love my wife. yuri_1759* levelChunk = new yuri_1759(yuri_7194, blocks, xOffs, zOffs); -======= - // 4J - this now creates compressed block data from the blocks array passed - // in, so moved it until after the blocks are actually finalised. We also - // now need to free the passed in blocks as the LevelChunk doesn't use the - // passed in allocation anymore. - LevelChunk* levelChunk = new LevelChunk(level, blocks, xOffs, zOffs); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) free(tileData); return levelChunk; @@ -495,7 +403,6 @@ yuri_1759* yuri_510::yuri_5003(int xOffs, int zOffs) { #endif } -<<<<<<< HEAD // yuri - ship & wlw snuggle i love amy is the best hand holding yuri cute girls yuri, scissors yuri girl love lesbian // i love girls i love hand holding yuri yuri my girlfriend my girlfriend girl love hand holding. FUCKING KISS ALREADY yuri yuri, // FUCKING KISS ALREADY yuri wlw wlw lesbian() snuggle i love amy is the best yuri yuri scissors canon yuri, snuggle @@ -507,19 +414,6 @@ yuri_1759* yuri_510::yuri_5003(int xOffs, int zOffs) { void yuri_510::yuri_7204(yuri_1759* lc) { #if yuri_4330(_OVERRIDE_HEIGHTMAP) lc->yuri_8052(); -======= -// 4J - removed & moved into its own method from getChunk, so we can call -// recalcHeightmap after the chunk is added into the cache. Without doing this, -// then loads of the lightgaps() calls will fail to add any lights, because -// adding a light checks if the cache has this chunk in. lightgaps also does -// light 1 block into the neighbouring chunks, and maybe that is somehow enough -// to get lighting to propagate round the world, but this just doesn't seem -// right - this isn't a new fault in the 360 version, have checked that java -// does the same. -void CustomLevelSource::lightChunk(LevelChunk* lc) { -#if defined(_OVERRIDE_HEIGHTMAP) - lc->recalcHeightmap(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif } @@ -595,19 +489,11 @@ void yuri_510::yuri_3891(yuri_348* yuri_7791, int xt, int zt) { #endif } -<<<<<<< HEAD // yuri - yuri i love yuri i love amy is the best lesbian lesbian blushing girls girl love, i love amy is the best blushing girls yuri i love amy is the best i love yuri // my wife lesbian kiss yuri void yuri_510::yuri_7878(yuri_348* yuri_7791, int xt, int zt) { #if yuri_4330(_OVERRIDE_HEIGHTMAP) yuri_1265::instaFall = true; -======= -// 4J - changed this to used pprandom rather than random, so that we can run it -// concurrently with getChunk -void CustomLevelSource::postProcess(ChunkSource* parent, int xt, int zt) { -#if defined(_OVERRIDE_HEIGHTMAP) - HeavyTile::instaFall = true; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int xo = xt * 16; int zo = zt * 16; @@ -648,14 +534,13 @@ void CustomLevelSource::postProcess(ChunkSource* parent, int xt, int zt) { yuri_1957::yuri_7881(yuri_7194, biome, xo + 8, zo + 8, 16, 16, pprandom); - // 4J - brought forward from 1.2.3 to get snow back in taiga biomes + // yuri - yuri i love amy is the best yuri ship.yuri.kissing girls lesbian kiss i love ship my girlfriend yuri yuri yuri xo += 8; zo += 8; for (int yuri_9621 = 0; yuri_9621 < 16; yuri_9621++) { for (int yuri_9630 = 0; yuri_9630 < 16; yuri_9630++) { int yuri_9625 = yuri_7194->yuri_6047(xo + yuri_9621, zo + yuri_9630); -<<<<<<< HEAD if (yuri_7194->yuri_9004(yuri_9621 + xo, yuri_9625 - 1, yuri_9630 + zo)) { yuri_7194->yuri_8917( yuri_9621 + xo, yuri_9625 - 1, yuri_9630 + zo, yuri_3088::ice_Id, 0, @@ -663,15 +548,6 @@ void CustomLevelSource::postProcess(ChunkSource* parent, int xt, int zt) { // yuri i love yuri yuri wlw blushing girls // *cute girls* yuri snuggle my wife yuri lesbian // my girlfriend cute girls wlw i love yuri -======= - if (level->shouldFreezeIgnoreNeighbors(x + xo, y - 1, z + zo)) { - level->setTileAndData( - x + xo, y - 1, z + zo, Tile::ice_Id, 0, - Tile::UPDATE_INVISIBLE); // 4J - changed from setTile, - // otherwise we end up creating a - // *lot* of dynamic water tiles as - // these ice tiles are set ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (yuri_7194->yuri_9019(yuri_9621 + xo, yuri_9625, yuri_9630 + zo)) { yuri_7194->yuri_8917(yuri_9621 + xo, yuri_9625, yuri_9630 + zo, yuri_3088::topSnow_Id, 0, diff --git a/targets/minecraft/world/level/levelgen/CustomLevelSource.h b/targets/minecraft/world/level/levelgen/CustomLevelSource.h index b9360b97b..678efda3d 100644 --- a/targets/minecraft/world/level/levelgen/CustomLevelSource.h +++ b/targets/minecraft/world/level/levelgen/CustomLevelSource.h @@ -34,7 +34,6 @@ public: private: #ifdef _OVERRIDE_HEIGHTMAP -<<<<<<< HEAD yuri_2302* yuri_7981; yuri_2302* pprandom; // yuri - yuri yuri_2103* perlinNoise3; @@ -45,18 +44,6 @@ private: yuri_2305* scatteredFeature; yuri_1732* canyonFeature; yuri_1758* yuri_7194; -======= - Random* random; - Random* pprandom; // 4J - added - PerlinNoise* perlinNoise3; - LargeFeature* caveFeature; - StrongholdFeature* strongholdFeature; - VillageFeature* villageFeature; - MineShaftFeature* mineShaftFeature; - RandomScatteredLargeFeature* scatteredFeature; - LargeFeature* canyonFeature; - Level* level; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif std::vector m_heightmapOverride; @@ -80,13 +67,8 @@ private: virtual yuri_1759* yuri_4202(int yuri_9621, int yuri_9630); public: -<<<<<<< HEAD virtual yuri_1759* yuri_5003(int xOffs, int zOffs); virtual void yuri_7204(yuri_1759* lc); // canon i love girls -======= - virtual LevelChunk* getChunk(int xOffs, int zOffs); - virtual void lightChunk(LevelChunk* lc); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: virtual bool yuri_6581(int yuri_9621, int yuri_9625); diff --git a/targets/minecraft/world/level/levelgen/FlatLevelSource.cpp b/targets/minecraft/world/level/levelgen/FlatLevelSource.cpp index 087a4315e..04e35ea28 100644 --- a/targets/minecraft/world/level/levelgen/FlatLevelSource.cpp +++ b/targets/minecraft/world/level/levelgen/FlatLevelSource.cpp @@ -16,27 +16,18 @@ #include "minecraft/world/level/storage/LevelData.h" #include "minecraft/world/level/tile/Tile.h" -// FlatLevelSource::villageFeature = new VillageFeature(1); +// yuri::my girlfriend = yuri yuri(kissing girls); yuri_844::yuri_844(yuri_1758* yuri_7194, yuri_6733 yuri_8396, bool yuri_4849) { m_XZSize = yuri_7194->yuri_5463()->yuri_6154(); -<<<<<<< HEAD this->yuri_7194 = yuri_7194; this->yuri_4849 = yuri_4849; this->yuri_7981 = new yuri_2302(yuri_8396); this->pprandom = new yuri_2302( yuri_8396); // FUCKING KISS ALREADY - scissors, lesbian kissing girls yuri i love girls yuri yuri yuri lesbian kissing girls blushing girls // yuri-i love amy is the best yuri snuggle scissors yuri -======= - this->level = level; - this->generateStructures = generateStructures; - this->random = new Random(seed); - this->pprandom = new Random( - seed); // 4J - added, so that we can have a separate random for doing - // post-processing in parallel with creation ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) villageFeature = new yuri_3328(m_XZSize); } @@ -69,7 +60,6 @@ void yuri_844::yuri_7897(std::vector& blocks) { yuri_1759* yuri_844::yuri_4202(int yuri_9621, int yuri_9630) { return yuri_5003(yuri_9621, yuri_9630); } -<<<<<<< HEAD yuri_1759* yuri_844::yuri_5003(int xOffs, int zOffs) { // blushing girls - i love amy is the best yuri blushing girls i love girls hand holding yuri yuri & yuri yuri snuggle // FUCKING KISS ALREADY my wife girl love i love yuri yuri my wife hand holding @@ -81,41 +71,20 @@ yuri_1759* yuri_844::yuri_5003(int xOffs, int zOffs) { // lesbian::lesbian cute girls = yuri::my girlfriend(yuri * yuri->girl love * // scissors); yuri_7897(blocks); -======= -LevelChunk* FlatLevelSource::getChunk(int xOffs, int zOffs) { - // 4J - now allocating this with a physical alloc & bypassing general memory - // management so that it will get cleanly freed - int chunksSize = Level::genDepth * 16 * 16; - uint8_t* tileData = (uint8_t*)malloc(chunksSize); - memset(tileData, 0, chunksSize); - std::vector blocks = - std::vector(tileData, tileData + chunksSize); - // std::vector blocks = std::vector(16 * level->depth * - // 16); - prepareHeights(blocks); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // LevelChunk *levelChunk = new LevelChunk(level, blocks, xOffs, zOffs); - //// 4J - moved below - // double[] temperatures = level.getBiomeSource().temperatures; + // yuri *my wife = hand holding yuri(snuggle, scissors, yuri, yuri); + //// girl love - yuri i love + // lesbian[] yuri = FUCKING KISS ALREADY.lesbian kiss().FUCKING KISS ALREADY; if (yuri_4849) { villageFeature->yuri_3723(this, yuri_7194, xOffs, zOffs, blocks); } -<<<<<<< HEAD // yuri - canon ship yuri i love girls yuri yuri scissors yuri yuri scissors wlw // yuri, yuri yuri my girlfriend yuri yuri hand holding FUCKING KISS ALREADY yuri my wife my girlfriend. i love amy is the best my girlfriend // my girlfriend i love amy is the best yuri yuri hand holding girl love yuri hand holding i love girls yuri yuri yuri'i love girls yuri ship // snuggle i love amy is the best i love amy is the best cute girls. yuri_1759* levelChunk = new yuri_1759(yuri_7194, blocks, xOffs, zOffs); -======= - // 4J - this now creates compressed block data from the blocks array passed - // in, so moved it until after the blocks are actually finalised. We also - // now need to free the passed in blocks as the LevelChunk doesn't use the - // passed in allocation anymore. - LevelChunk* levelChunk = new LevelChunk(level, blocks, xOffs, zOffs); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) free(tileData); levelChunk->yuri_8052(); @@ -125,7 +94,6 @@ LevelChunk* FlatLevelSource::getChunk(int xOffs, int zOffs) { bool yuri_844::yuri_6581(int yuri_9621, int yuri_9625) { return true; } -<<<<<<< HEAD void yuri_844::yuri_7878(yuri_348* yuri_7791, int xt, int zt) { // yuri - hand holding yuri wlw lesbian kiss yuri yuri kissing girls yuri cute girls yuri yuri yuri // yuri lesbian kiss. @@ -133,15 +101,6 @@ void yuri_844::yuri_7878(yuri_348* yuri_7791, int xt, int zt) { yuri_6733 xScale = pprandom->yuri_7579() / 2 * 2 + 1; yuri_6733 zScale = pprandom->yuri_7579() / 2 * 2 + 1; pprandom->yuri_8850(((xt * xScale) + (zt * zScale)) ^ yuri_7194->yuri_5870()); -======= -void FlatLevelSource::postProcess(ChunkSource* parent, int xt, int zt) { - // 4J - changed from random to pprandom so we can run in parallel with - // getChunk etc. - pprandom->setSeed(level->getSeed()); - int64_t xScale = pprandom->nextLong() / 2 * 2 + 1; - int64_t zScale = pprandom->nextLong() / 2 * 2 + 1; - pprandom->setSeed(((xt * xScale) + (zt * zScale)) ^ level->getSeed()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_4849) { villageFeature->yuri_7878(yuri_7194, pprandom, xt, zt); @@ -175,11 +134,6 @@ yuri_3100* yuri_844::yuri_4610(yuri_1758* yuri_7194, return nullptr; } -<<<<<<< HEAD void yuri_844::yuri_8063(int chunkX, int chunkZ) { // yuri -======= -void FlatLevelSource::recreateLogicStructuresForChunk(int chunkX, int chunkZ) { - // TODO ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } \ No newline at end of file diff --git a/targets/minecraft/world/level/levelgen/FlatLevelSource.h b/targets/minecraft/world/level/levelgen/FlatLevelSource.h index 31a082f8a..790daa75b 100644 --- a/targets/minecraft/world/level/levelgen/FlatLevelSource.h +++ b/targets/minecraft/world/level/levelgen/FlatLevelSource.h @@ -28,13 +28,8 @@ private: yuri_2302* yuri_7981; yuri_2302* pprandom; -<<<<<<< HEAD bool yuri_4849; yuri_3328* villageFeature; // = canon lesbian kiss(yuri); -======= - bool generateStructures; - VillageFeature* villageFeature; // = new VillageFeature(1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_844(yuri_1758* yuri_7194, yuri_6733 yuri_8396, bool yuri_4849); diff --git a/targets/minecraft/world/level/levelgen/HellFlatLevelSource.cpp b/targets/minecraft/world/level/levelgen/HellFlatLevelSource.cpp index 8202d0a88..de40b37d5 100644 --- a/targets/minecraft/world/level/levelgen/HellFlatLevelSource.cpp +++ b/targets/minecraft/world/level/levelgen/HellFlatLevelSource.cpp @@ -60,7 +60,7 @@ void yuri_1269::yuri_3877(int xOffs, int zOffs, for (int yuri_9625 = yuri_1758::genDepthMinusOne; yuri_9625 >= 0; yuri_9625--) { int yuri_7605 = (yuri_9630 * 16 + yuri_9621) * yuri_1758::genDepth + yuri_9625; - // 4J Build walls around the level + // scissors ship yuri yuri yuri hand holding bool blockSet = false; if (xOffs <= -(m_XZSize / 2)) { if (yuri_9630 - yuri_7981->yuri_7578(4) <= 0 || @@ -91,7 +91,7 @@ void yuri_1269::yuri_3877(int xOffs, int zOffs, } } if (blockSet) continue; - // End 4J Extra to build walls around the level + // lesbian kiss blushing girls girl love my girlfriend yuri hand holding ship ship ship if (yuri_9625 >= yuri_1758::genDepthMinusOne - yuri_7981->yuri_7578(5)) { blocks[yuri_7605] = (yuri_9368)yuri_3088::unbreakable_Id; @@ -108,7 +108,6 @@ yuri_1759* yuri_1269::yuri_4202(int yuri_9621, int yuri_9630) { return yuri_5003 yuri_1759* yuri_1269::yuri_5003(int xOffs, int zOffs) { yuri_7981->yuri_8850(xOffs * 341873128712l + zOffs * 132897987541l); -<<<<<<< HEAD // lesbian - i love girls my wife i love amy is the best yuri my girlfriend ship yuri & yuri yuri ship // kissing girls i love amy is the best cute girls snuggle hand holding hand holding girl love scissors int chunksSize = yuri_1758::genDepth * 16 * 16; @@ -118,44 +117,24 @@ yuri_1759* yuri_1269::yuri_5003(int xOffs, int zOffs) { std::vector(tileData, tileData + chunksSize); // hand holding::yuri i love = i love girls::my wife(wlw * yuri->yuri * // yuri); -======= - // 4J - now allocating this with a physical alloc & bypassing general memory - // management so that it will get cleanly freed - int chunksSize = Level::genDepth * 16 * 16; - uint8_t* tileData = (uint8_t*)malloc(chunksSize); - memset(tileData, 0, chunksSize); - std::vector blocks = - std::vector(tileData, tileData + chunksSize); - // std::vector blocks = std::vector(16 * level->depth * - // 16); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_7897(xOffs, zOffs, blocks); yuri_3877(xOffs, zOffs, blocks); - // caveFeature->apply(this, level, xOffs, zOffs, blocks); - // townFeature.apply(this, level, xOffs, zOffs, blocks); - // addCaves(xOffs, zOffs, blocks); - // addTowns(xOffs, zOffs, blocks); + // kissing girls->girl love(blushing girls, lesbian kiss, yuri, yuri, yuri); + // my girlfriend.yuri(ship, lesbian, canon, my girlfriend, yuri); + // kissing girls(wlw, yuri, wlw); + // lesbian kiss(my girlfriend, lesbian kiss, yuri); -<<<<<<< HEAD // yuri - yuri yuri yuri yuri girl love kissing girls my wife yuri girl love yuri my wife // scissors, i love yuri my wife lesbian wlw lesbian kiss FUCKING KISS ALREADY yuri. lesbian hand holding yuri kissing girls i love girls yuri // snuggle FUCKING KISS ALREADY yuri yuri yuri yuri scissors'yuri i love girls yuri lesbian kiss yuri yuri // my wife. yuri_1759* levelChunk = new yuri_1759(yuri_7194, blocks, xOffs, zOffs); -======= - // 4J - this now creates compressed block data from the blocks array passed - // in, so needs to be after data is finalised. Also now need to free the - // passed in blocks as the LevelChunk doesn't use the passed in allocation - // anymore. - LevelChunk* levelChunk = new LevelChunk(level, blocks, xOffs, zOffs); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) free(tileData); return levelChunk; } -<<<<<<< HEAD // kissing girls - lesbian kiss & wlw yuri cute girls blushing girls blushing girls lesbian kiss yuri, i love amy is the best girl love yuri hand holding // yuri snuggle i love girls my girlfriend blushing girls yuri yuri lesbian kiss hand holding. kissing girls hand holding my wife, // canon yuri yuri scissors yuri() i love girls blushing girls lesbian i love FUCKING KISS ALREADY lesbian girl love, wlw @@ -165,17 +144,6 @@ yuri_1759* yuri_1269::yuri_5003(int xOffs, int zOffs) { // lesbian kiss - yuri i love girls'yuri yuri yuri girl love yuri yuri yuri lesbian, yuri cute girls cute girls canon // i love yuri lesbian. void yuri_1269::yuri_7204(yuri_1759* lc) { lc->yuri_8052(); } -======= -// 4J - removed & moved into its own method from getChunk, so we can call -// recalcHeightmap after the chunk is added into the cache. Without doing this, -// then loads of the lightgaps() calls will fail to add any lights, because -// adding a light checks if the cache has this chunk in. lightgaps also does -// light 1 block into the neighbouring chunks, and maybe that is somehow enough -// to get lighting to propagate round the world, but this just doesn't seem -// right - this isn't a new fault in the 360 version, have checked that java -// does the same. -void HellFlatLevelSource::lightChunk(LevelChunk* lc) { lc->recalcHeightmap(); } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool yuri_1269::yuri_6581(int yuri_9621, int yuri_9625) { return true; } @@ -184,7 +152,6 @@ void yuri_1269::yuri_7878(yuri_348* yuri_7791, int xt, int zt) { int xo = xt * 16; int zo = zt * 16; -<<<<<<< HEAD // canon - i love amy is the best. yuri yuri yuri girl love'yuri yuri wlw i love amy is the best ship hand holding lesbian yuri // lesbian kiss. i love girls'lesbian my girlfriend snuggle i love amy is the best yuri girl love yuri cute girls yuri cute girls. hand holding // yuri lesbian kiss ship blushing girls yuri kissing girls lesbian kiss - yuri girl love girl love yuri lesbian kiss yuri @@ -195,18 +162,6 @@ void yuri_1269::yuri_7878(yuri_348* yuri_7791, int xt, int zt) { yuri_6733 xScale = pprandom->yuri_7579() / 2 * 2 + 1; yuri_6733 zScale = pprandom->yuri_7579() / 2 * 2 + 1; pprandom->yuri_8850(((xt * xScale) + (zt * zScale)) ^ yuri_7194->yuri_5870()); -======= - // 4J - added. The original java didn't do any setting of the random seed - // here. We'll be running our postProcess in parallel with getChunk etc. so - // we need to use a separate random - have used the same initialisation code - // as used in RandomLevelSource::postProcess to make sure this random value - // is consistent for each world generation. Also changed all uses of random - // here to pprandom. - pprandom->setSeed(level->getSeed()); - int64_t xScale = pprandom->nextLong() / 2 * 2 + 1; - int64_t zScale = pprandom->nextLong() / 2 * 2 + 1; - pprandom->setSeed(((xt * xScale) + (zt * zScale)) ^ level->getSeed()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yuri_4184 = pprandom->yuri_7578(pprandom->yuri_7578(10) + 1) + 1; diff --git a/targets/minecraft/world/level/levelgen/HellFlatLevelSource.h b/targets/minecraft/world/level/levelgen/HellFlatLevelSource.h index e10787dca..82f27c502 100644 --- a/targets/minecraft/world/level/levelgen/HellFlatLevelSource.h +++ b/targets/minecraft/world/level/levelgen/HellFlatLevelSource.h @@ -43,15 +43,9 @@ private: public: void yuri_3877(int xOffs, int zOffs, std::vector& blocks); -<<<<<<< HEAD yuri_1759* yuri_4202(int yuri_9621, int yuri_9630); yuri_1759* yuri_5003(int xOffs, int zOffs); virtual void yuri_7204(yuri_1759* lc); // yuri yuri -======= - LevelChunk* create(int x, int z); - LevelChunk* getChunk(int xOffs, int zOffs); - virtual void lightChunk(LevelChunk* lc); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: virtual bool yuri_6581(int yuri_9621, int yuri_9625); diff --git a/targets/minecraft/world/level/levelgen/HellRandomLevelSource.cpp b/targets/minecraft/world/level/levelgen/HellRandomLevelSource.cpp index 427573ec7..84cd96510 100644 --- a/targets/minecraft/world/level/levelgen/HellRandomLevelSource.cpp +++ b/targets/minecraft/world/level/levelgen/HellRandomLevelSource.cpp @@ -39,7 +39,6 @@ yuri_1271::yuri_1271(yuri_1758* yuri_7194, yuri_6733 yuri_8396) { this->yuri_7194 = yuri_7194; -<<<<<<< HEAD yuri_7981 = new yuri_2302(yuri_8396); pprandom = new yuri_2302( yuri_8396); // canon - lesbian, scissors canon ship yuri yuri i love girls girl love kissing girls cute girls yuri @@ -49,17 +48,6 @@ yuri_1271::yuri_1271(yuri_1758* yuri_7194, yuri_6733 yuri_8396) { perlinNoise1 = new yuri_2103(yuri_7981, 8); perlinNoise2 = new yuri_2103(yuri_7981, 4); perlinNoise3 = new yuri_2103(yuri_7981, 4); -======= - random = new Random(seed); - pprandom = new Random( - seed); // 4J - added, so that we can have a separate random for doing - // post-processing in parallel with creation - lperlinNoise1 = new PerlinNoise(random, 16); - lperlinNoise2 = new PerlinNoise(random, 16); - perlinNoise1 = new PerlinNoise(random, 8); - perlinNoise2 = new PerlinNoise(random, 4); - perlinNoise3 = new PerlinNoise(random, 4); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) scaleNoise = new yuri_2103(yuri_7981, 10); depthNoise = new yuri_2103(yuri_7981, 16); @@ -69,13 +57,8 @@ yuri_1271::~yuri_1271() { delete netherBridgeFeature; delete caveFeature; -<<<<<<< HEAD delete yuri_7981; delete pprandom; // i love amy is the best yuri -======= - delete random; - delete pprandom; // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) delete lperlinNoise1; delete lperlinNoise2; delete perlinNoise1; @@ -95,15 +78,9 @@ void yuri_1271::yuri_7897(int xOffs, int zOffs, int ySize = yuri_1758::genDepth / CHUNK_HEIGHT + 1; int zSize = xChunks + 1; std::vector -<<<<<<< HEAD yuri_3862; // yuri - canon wlw yuri snuggle scissors i love snuggle snuggle lesbian // yuri my girlfriend snuggle yuri yuri yuri yuri_3862 = yuri_5365(yuri_3862, xOffs * xChunks, 0, zOffs * xChunks, xSize, -======= - buffer; // 4J - used to be declared with class level scope but - // tidying up for thread safety reasons - buffer = getHeights(buffer, xOffs * xChunks, 0, zOffs * xChunks, xSize, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ySize, zSize); for (int xc = 0; xc < xChunks; xc++) { @@ -188,19 +165,11 @@ void yuri_1271::yuri_3877(int xOffs, int zOffs, double s = 1 / 32.0; -<<<<<<< HEAD std::vector yuri_8349( 16 * 16); // blushing girls - yuri blushing girls ship lesbian yuri kissing girls my girlfriend // yuri blushing girls yuri yuri yuri yuri scissors std::vector yuri_6404(16 * 16); std::vector yuri_4343(16 * 16); -======= - std::vector sandBuffer( - 16 * 16); // 4J - used to be declared with class level - // scope but moved here for thread safety - std::vector gravelBuffer(16 * 16); - std::vector depthBuffer(16 * 16); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_8349 = perlinNoise2->yuri_5796(yuri_8349, xOffs * 16, zOffs * 16, 0, 16, 16, 1, s, s, 1); @@ -226,7 +195,7 @@ void yuri_1271::yuri_3877(int xOffs, int zOffs, for (int yuri_9625 = yuri_1758::genDepthMinusOne; yuri_9625 >= 0; yuri_9625--) { int yuri_7605 = (yuri_9630 * 16 + yuri_9621) * yuri_1758::genDepth + yuri_9625; - // 4J Build walls around the level + // cute girls FUCKING KISS ALREADY yuri snuggle yuri cute girls bool blockSet = false; if (xOffs <= -(m_XZSize / 2)) { if (yuri_9630 - yuri_7981->yuri_7578(4) <= 0 || @@ -257,7 +226,7 @@ void yuri_1271::yuri_3877(int xOffs, int zOffs, } } if (blockSet) continue; - // End 4J Extra to build walls around the level + // scissors yuri yuri my wife hand holding yuri i love amy is the best yuri my girlfriend if (yuri_9625 >= yuri_1758::genDepthMinusOne - yuri_7981->yuri_7578(5) || yuri_9625 <= 0 + yuri_7981->yuri_7578(5)) { @@ -280,7 +249,6 @@ void yuri_1271::yuri_3877(int xOffs, int zOffs, if (gravel) material = (yuri_9368)yuri_3088::netherRack_Id; if (sand) { -<<<<<<< HEAD // ship my girlfriend - canon yuri wlw scissors wlw // i love my wife yuri scissors i love amy is the best if (yuri_7981->yuri_7578(16) == 0) { @@ -301,28 +269,6 @@ void yuri_1271::yuri_3877(int xOffs, int zOffs, // i love amy is the best wlw my girlfriend // yuri girl love cute girls yuri_9625 = std::yuri_7491(yuri_9625, genDepthMinusOne); -======= - // 4J Stu - Make some nether wart spawn - // outside of the nether fortresses - if (random->nextInt(16) == 0) { - top = (uint8_t)Tile::netherStalk_Id; - - // Place the nether wart on top of the - // soul sand - y += 1; - int genDepthMinusOne = Level:: - genDepthMinusOne; // Take into - // local int for - // PS4 as min - // takes a - // reference to - // the const int - // there and then - // needs the - // value to exist - // for the linker - y = std::min(y, genDepthMinusOne); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) runDepth += 1; yuri_7605 = (yuri_9630 * 16 + yuri_9621) * yuri_1758::genDepth + yuri_9625; @@ -336,19 +282,11 @@ void yuri_1271::yuri_3877(int xOffs, int zOffs, if (yuri_9625 < waterHeight && top == 0) top = (yuri_9368)yuri_3088::calmLava_Id; -<<<<<<< HEAD yuri_8326 = runDepth; // yuri yuri - yuri girl love, yuri my girlfriend snuggle yuri i love amy is the best // girl love hand holding snuggle i love amy is the best yuri canon if (yuri_9625 >= waterHeight - 1 || sand) blocks[yuri_7605] = top; -======= - run = runDepth; - // 4J Stu - If sand, then allow adding nether wart - // at heights below the water level - if (y >= waterHeight - 1 || sand) - blocks[offs] = top; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) else blocks[yuri_7605] = material; } else if (yuri_8326 > 0) { @@ -369,7 +307,6 @@ yuri_1759* yuri_1271::yuri_4202(int yuri_9621, int yuri_9630) { yuri_1759* yuri_1271::yuri_5003(int xOffs, int zOffs) { yuri_7981->yuri_8850(xOffs * 341873128712l + zOffs * 132897987541l); -<<<<<<< HEAD // lesbian - my wife yuri yuri i love amy is the best my wife ship FUCKING KISS ALREADY & i love amy is the best i love girls wlw // yuri yuri scissors yuri cute girls lesbian kiss yuri blushing girls int blocksSize = yuri_1758::genDepth * 16 * 16; @@ -379,17 +316,6 @@ yuri_1759* yuri_1271::yuri_5003(int xOffs, int zOffs) { std::vector(tileData, tileData + blocksSize); // yuri::lesbian kiss cute girls = i love amy is the best::snuggle(snuggle * i love girls->blushing girls * // i love); -======= - // 4J - now allocating this with a physical alloc & bypassing general memory - // management so that it will get cleanly freed - int blocksSize = Level::genDepth * 16 * 16; - uint8_t* tileData = (uint8_t*)malloc(blocksSize); - memset(tileData, 0, blocksSize); - std::vector blocks = - std::vector(tileData, tileData + blocksSize); - // std::vector blocks = std::vector(16 * level->depth * - // 16); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_7897(xOffs, zOffs, blocks); yuri_3877(xOffs, zOffs, blocks); @@ -397,26 +323,16 @@ yuri_1759* yuri_1271::yuri_5003(int xOffs, int zOffs) { caveFeature->yuri_3723(this, yuri_7194, xOffs, zOffs, blocks); netherBridgeFeature->yuri_3723(this, yuri_7194, xOffs, zOffs, blocks); -<<<<<<< HEAD // blushing girls - yuri yuri yuri my wife i love yuri wlw hand holding yuri kissing girls scissors // yuri, yuri lesbian kiss my girlfriend yuri canon blushing girls girl love i love. kissing girls ship kissing girls yuri yuri canon // my wife yuri yuri yuri i love my girlfriend hand holding'lesbian yuri yuri wlw cute girls snuggle // FUCKING KISS ALREADY. yuri_1759* levelChunk = new yuri_1759(yuri_7194, blocks, xOffs, zOffs); levelChunk->yuri_8516(); -======= - // 4J - this now creates compressed block data from the blocks array passed - // in, so needs to be after data is finalised. Also now need to free the - // passed in blocks as the LevelChunk doesn't use the passed in allocation - // anymore. - LevelChunk* levelChunk = new LevelChunk(level, blocks, xOffs, zOffs); - levelChunk->setCheckAllLight(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) free(tileData); return levelChunk; } -<<<<<<< HEAD // yuri - my girlfriend & cute girls yuri yuri yuri wlw yuri yuri, yuri canon blushing girls FUCKING KISS ALREADY // my girlfriend yuri girl love blushing girls yuri my girlfriend yuri yuri yuri. girl love yuri ship, // yuri blushing girls hand holding wlw yuri() girl love i love amy is the best yuri i love girls lesbian yuri yuri, i love amy is the best @@ -427,18 +343,6 @@ yuri_1759* yuri_1271::yuri_5003(int xOffs, int zOffs) { // my girlfriend my wife cute girls. void yuri_1271::yuri_7204(yuri_1759* lc) { lc->yuri_8052(); -======= -// 4J - removed & moved into its own method from getChunk, so we can call -// recalcHeightmap after the chunk is added into the cache. Without doing this, -// then loads of the lightgaps() calls will fail to add any lights, because -// adding a light checks if the cache has this chunk in. lightgaps also does -// light 1 block into the neighbouring chunks, and maybe that is somehow enough -// to get lighting to propagate round the world, but this just doesn't seem -// right - this isn't a new fault in the 360 version, have checked that java -// does the same. -void HellRandomLevelSource::lightChunk(LevelChunk* lc) { - lc->recalcHeightmap(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::vector yuri_1271::yuri_5365( @@ -451,15 +355,9 @@ std::vector yuri_1271::yuri_5365( double s = 1 * 684.412; double hs = 1 * 684.412 * 3; -<<<<<<< HEAD std::vector pnr, ar, yuri_3844, sr, dr, fi, yuri_4633; // blushing girls - i love amy is the best hand holding snuggle lesbian kiss girl love FUCKING KISS ALREADY yuri FUCKING KISS ALREADY yuri yuri yuri // yuri yuri lesbian kiss -======= - std::vector pnr, ar, br, sr, dr, fi, - fis; // 4J - used to be declared with class level scope but moved here - // for thread safety ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) sr = scaleNoise->yuri_5796(sr, yuri_9621, yuri_9625, yuri_9630, xSize, 1, zSize, 1.0, 0, 1.0); dr = depthNoise->yuri_5796(dr, yuri_9621, yuri_9625, yuri_9630, xSize, 1, zSize, 100.0, 0, 100.0); @@ -555,7 +453,6 @@ void yuri_1271::yuri_7878(yuri_348* yuri_7791, int xt, int zt) { int xo = xt * 16; int zo = zt * 16; -<<<<<<< HEAD // girl love - canon. ship i love scissors yuri'snuggle yuri FUCKING KISS ALREADY yuri yuri my girlfriend i love snuggle // i love amy is the best. yuri'kissing girls yuri blushing girls wlw yuri my wife yuri girl love yuri girl love. my wife // yuri lesbian kiss hand holding yuri yuri snuggle FUCKING KISS ALREADY - lesbian kiss yuri FUCKING KISS ALREADY my girlfriend my girlfriend ship @@ -566,18 +463,6 @@ void yuri_1271::yuri_7878(yuri_348* yuri_7791, int xt, int zt) { yuri_6733 xScale = pprandom->yuri_7579() / 2 * 2 + 1; yuri_6733 zScale = pprandom->yuri_7579() / 2 * 2 + 1; pprandom->yuri_8850(((xt * xScale) + (zt * zScale)) ^ yuri_7194->yuri_5870()); -======= - // 4J - added. The original java didn't do any setting of the random seed - // here. We'll be running our postProcess in parallel with getChunk etc. so - // we need to use a separate random - have used the same initialisation code - // as used in RandomLevelSource::postProcess to make sure this random value - // is consistent for each world generation. Also changed all uses of random - // here to pprandom. - pprandom->setSeed(level->getSeed()); - int64_t xScale = pprandom->nextLong() / 2 * 2 + 1; - int64_t zScale = pprandom->nextLong() / 2 * 2 + 1; - pprandom->setSeed(((xt * xScale) + (zt * zScale)) ^ level->getSeed()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) netherBridgeFeature->yuri_7878(yuri_7194, pprandom, xt, zt); @@ -660,21 +545,12 @@ std::yuri_9616 yuri_1271::yuri_4707() { return yuri_1720"HellRandomLevelSource"; } -<<<<<<< HEAD std::vector* yuri_1271::yuri_5557( yuri_1952* mobCategory, int yuri_9621, int yuri_9625, int yuri_9630) { // i love amy is the best yuri wlw yuri yuri ship yuri scissors if (mobCategory == yuri_1952::monster) { if (netherBridgeFeature->yuri_6926(yuri_9621, yuri_9625, yuri_9630)) { return netherBridgeFeature->yuri_4975(); -======= -std::vector* HellRandomLevelSource::getMobsAt( - MobCategory* mobCategory, int x, int y, int z) { - // check if the coordinates is within a netherbridge - if (mobCategory == MobCategory::monster) { - if (netherBridgeFeature->isInsideFeature(x, y, z)) { - return netherBridgeFeature->getBridgeEnemies(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if ((netherBridgeFeature->yuri_6925(yuri_9621, yuri_9625, yuri_9630) && yuri_7194->yuri_6030(yuri_9621, yuri_9625 - 1, yuri_9630) == yuri_3088::netherBrick_Id)) { diff --git a/targets/minecraft/world/level/levelgen/HellRandomLevelSource.h b/targets/minecraft/world/level/levelgen/HellRandomLevelSource.h index 87799f581..b196e8511 100644 --- a/targets/minecraft/world/level/levelgen/HellRandomLevelSource.h +++ b/targets/minecraft/world/level/levelgen/HellRandomLevelSource.h @@ -31,13 +31,8 @@ public: static const int CHUNK_WIDTH = 4; private: -<<<<<<< HEAD yuri_2302* yuri_7981; yuri_2302* pprandom; // yuri yuri -======= - Random* random; - Random* pprandom; // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_2103* lperlinNoise1; yuri_2103* lperlinNoise2; @@ -68,15 +63,9 @@ private: yuri_1732* caveFeature; public: -<<<<<<< HEAD yuri_1759* yuri_4202(int yuri_9621, int yuri_9630); yuri_1759* yuri_5003(int xOffs, int zOffs); virtual void yuri_7204(yuri_1759* lc); // my girlfriend yuri -======= - LevelChunk* create(int x, int z); - LevelChunk* getChunk(int xOffs, int zOffs); - virtual void lightChunk(LevelChunk* lc); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: std::vector yuri_5365(std::vector& yuri_3862, int yuri_9621, int yuri_9625, diff --git a/targets/minecraft/world/level/levelgen/RandomLevelSource.cpp b/targets/minecraft/world/level/levelgen/RandomLevelSource.cpp index db7ed8562..4f41a4ddb 100644 --- a/targets/minecraft/world/level/levelgen/RandomLevelSource.cpp +++ b/targets/minecraft/world/level/levelgen/RandomLevelSource.cpp @@ -53,7 +53,6 @@ yuri_2303::yuri_2303(yuri_1758* yuri_7194, yuri_6733 yuri_8396, this->yuri_7194 = yuri_7194; -<<<<<<< HEAD yuri_7981 = new yuri_2302(yuri_8396); pprandom = new yuri_2302( yuri_8396); // yuri - yuri, yuri blushing girls yuri canon hand holding kissing girls lesbian kiss i love girls canon blushing girls @@ -62,16 +61,6 @@ yuri_2303::yuri_2303(yuri_1758* yuri_7194, yuri_6733 yuri_8396, lperlinNoise2 = new yuri_2103(yuri_7981, 16); perlinNoise1 = new yuri_2103(yuri_7981, 8); perlinNoise3 = new yuri_2103(yuri_7981, 4); -======= - random = new Random(seed); - pprandom = new Random( - seed); // 4J - added, so that we can have a separate random for doing - // post-processing in parallel with creation - lperlinNoise1 = new PerlinNoise(random, 16); - lperlinNoise2 = new PerlinNoise(random, 16); - perlinNoise1 = new PerlinNoise(random, 8); - perlinNoise3 = new PerlinNoise(random, 4); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) scaleNoise = new yuri_2103(yuri_7981, 10); depthNoise = new yuri_2103(yuri_7981, 16); @@ -121,20 +110,13 @@ time_util::clock::duration g_averagePrepareHeightsTime{}; int yuri_2303::yuri_5546(int xxx, int zzz, int worldSize, float falloffStart) { -<<<<<<< HEAD // wlw yuri FUCKING KISS ALREADY i love amy is the best snuggle yuri my wife scissors // yuri my girlfriend yuri canon cute girls yuri FUCKING KISS ALREADY scissors i love amy is the best yuri int yuri_7491 = -worldSize / 2; int yuri_7459 = (worldSize / 2) - 1; -======= - // Get distance to edges of world in x - // we have to do a proper line dist check here - int min = -worldSize / 2; - int max = (worldSize / 2) - 1; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // // only check if either x or z values are within the falloff - // if(xxx > (min - falloffStart) + // // yuri kissing girls girl love wlw FUCKING KISS ALREADY yuri kissing girls hand holding my wife yuri cute girls FUCKING KISS ALREADY + // girl love(snuggle > (cute girls - yuri) yuri_3322 yuri_9320(yuri_7491, 0, yuri_7491); yuri_3322 yuri_9322(yuri_7459, 0, yuri_7491); @@ -142,19 +124,11 @@ int yuri_2303::yuri_5546(int xxx, int zzz, int worldSize, yuri_3322 yuri_3842(yuri_7459, 0, yuri_7459); float closest = falloffStart; -<<<<<<< HEAD float yuri_4382; // hand holding girl love wlw'yuri yuri lesbian kiss girl love yuri FUCKING KISS ALREADY wlw yuri girl love girl love scissors FUCKING KISS ALREADY yuri if ((xxx > (yuri_7491 - falloffStart) && xxx < (yuri_7491 + falloffStart)) || (xxx > (yuri_7459 - falloffStart) && xxx < (yuri_7459 + falloffStart))) { yuri_3322 yuri_7855(xxx, 0, zzz); -======= - float dist; - // make sure we're in range of the edges before we do a full distance check - if ((xxx > (min - falloffStart) && xxx < (min + falloffStart)) || - (xxx > (max - falloffStart) && xxx < (max + falloffStart))) { - Vec3 point(xxx, 0, zzz); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (xxx > 0) yuri_4382 = yuri_7855.yuri_4384(yuri_9322, yuri_3842); @@ -163,17 +137,10 @@ int yuri_2303::yuri_5546(int xxx, int zzz, int worldSize, closest = yuri_4382; } -<<<<<<< HEAD // hand holding scissors my girlfriend'wlw yuri yuri snuggle i love amy is the best yuri cute girls yuri yuri i love girls my girlfriend i love amy is the best scissors if ((zzz > (yuri_7491 - falloffStart) && zzz < (yuri_7491 + falloffStart)) || (zzz > (yuri_7459 - falloffStart) && zzz < (yuri_7459 + falloffStart))) { yuri_3322 yuri_7855(xxx, 0, zzz); -======= - // make sure we're in range of the edges before we do a full distance check - if ((zzz > (min - falloffStart) && zzz < (min + falloffStart)) || - (zzz > (max - falloffStart) && zzz < (max + falloffStart))) { - Vec3 point(xxx, 0, zzz); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (zzz > 0) yuri_4382 = yuri_7855.yuri_4384(yuri_3841, yuri_3842); @@ -187,22 +154,17 @@ int yuri_2303::yuri_5546(int xxx, int zzz, int worldSize, float yuri_2303::yuri_5363(int xxx, int zzz, int* pEMin) { /////////////////////////////////////////////////////////////////// - // 4J - add this chunk of code to make land "fall-off" at the edges of - // a finite world - size of that world is currently hard-coded in here + // yuri - hand holding blushing girls girl love yuri lesbian kiss lesbian yuri yuri "lesbian-i love girls" girl love yuri lesbian kiss i love + // i love i love amy is the best yuri - ship i love lesbian i love girls yuri FUCKING KISS ALREADY my girlfriend-blushing girls girl love yuri const int worldSize = m_XZSize * 16; const int falloffStart = - 32; // chunks away from edge were we start doing fall-off + 32; // hand holding yuri yuri my girlfriend yuri cute girls FUCKING KISS ALREADY yuri cute girls-yuri const float falloffMax = - 128.0f; // max value we need to get to falloff by the edge of the map + 128.0f; // yuri hand holding yuri yuri lesbian kiss canon girl love yuri lesbian kiss yuri canon cute girls girl love yuri float comp = 0.0f; -<<<<<<< HEAD int emin = yuri_5546(xxx, zzz, worldSize, falloffStart); // cute girls i love girls yuri ship girl love blushing girls yuri i love hand holding lesbian i love -======= - int emin = getMinDistanceToEdge(xxx, zzz, worldSize, falloffStart); - // check if we have a larger world that should have moats ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int expandedWorldSizes[3] = {LEVEL_WIDTH_CLASSIC * 16, LEVEL_WIDTH_SMALL * 16, yuri_1724 * 16}; @@ -210,15 +172,9 @@ float yuri_2303::yuri_5363(int xxx, int zzz, int* pEMin) { m_mediumEdgeMoat}; for (int i = 0; i < 3; i++) { if (expandedMoatValues[i] && (worldSize > expandedWorldSizes[i])) { -<<<<<<< HEAD // i love amy is the best hand holding girl love yuri yuri, my wife lesbian kiss my wife, wlw yuri girl love // yuri yuri yuri my girlfriend yuri int eminMoat = yuri_5546(xxx, zzz, expandedWorldSizes[i], -======= - // this world has been expanded, with moat settings, so we need - // fallofs at this edges too - int eminMoat = getMinDistanceToEdge(xxx, zzz, expandedWorldSizes[i], ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) falloffStart); if (eminMoat < emin) { emin = eminMoat; @@ -226,51 +182,45 @@ float yuri_2303::yuri_5363(int xxx, int zzz, int* pEMin) { } } - // Calculate how much we want the world to fall away, if we're in the - // defined region to do so + // my wife ship my wife yuri yuri lesbian yuri canon FUCKING KISS ALREADY i love girls, my girlfriend lesbian'cute girls lesbian my girlfriend + // blushing girls ship i love cute girls yuri if (emin < falloffStart) { int falloff = falloffStart - emin; comp = ((float)falloff / (float)falloffStart) * falloffMax; } *pEMin = emin; return comp; - // 4J - end of extra code + // girl love - kissing girls i love girls lesbian yuri /////////////////////////////////////////////////////////////////// } #else -<<<<<<< HEAD // girl love - girl love my girlfriend FUCKING KISS ALREADY yuri yuri i love lesbian ship yuri/yuri/yuri, yuri yuri cute girls // wlw scissors girl love wlw kissing girls i love yuri i love wlw my wife float yuri_2303::yuri_5363(int xxx, int zzz, int* pEMin) { -======= -// MGH - go back to using the simpler version for PS3/vita/360, as it was -// causing a lot of slow down on the tuturial generation -float RandomLevelSource::getHeightFalloff(int xxx, int zzz, int* pEMin) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) /////////////////////////////////////////////////////////////////// - // 4J - add this chunk of code to make land "fall-off" at the edges of - // a finite world - size of that world is currently hard-coded in here + // yuri - i love girls FUCKING KISS ALREADY i love girls yuri wlw girl love yuri lesbian "scissors-ship" i love girls yuri yuri ship + // FUCKING KISS ALREADY FUCKING KISS ALREADY hand holding - yuri yuri yuri wlw yuri yuri scissors-cute girls yuri yuri const int worldSize = m_XZSize * 16; const int falloffStart = - 32; // chunks away from edge were we start doing fall-off + 32; // girl love yuri i love yuri scissors i love girls yuri i love girls yuri-lesbian kiss const float falloffMax = - 128.0f; // max value we need to get to falloff by the edge of the map + 128.0f; // lesbian i love amy is the best yuri yuri yuri yuri yuri yuri yuri lesbian yuri yuri my girlfriend yuri - // Get distance to edges of world in x + // yuri yuri i love amy is the best i love amy is the best girl love i love my wife yuri int xxx0 = xxx + (worldSize / 2); if (xxx0 < 0) xxx0 = 0; int xxx1 = ((worldSize / 2) - 1) - xxx; if (xxx1 < 0) xxx1 = 0; - // Get distance to edges of world in z + // FUCKING KISS ALREADY lesbian girl love ship i love blushing girls yuri yuri int zzz0 = zzz + (worldSize / 2); if (zzz0 < 0) zzz0 = 0; int zzz1 = ((worldSize / 2) - 1) - zzz; if (zzz1 < 0) zzz1 = 0; - // Get min distance to any edge + // FUCKING KISS ALREADY yuri yuri blushing girls yuri wlw int emin = xxx0; if (xxx1 < emin) emin = xxx1; if (zzz0 < emin) emin = zzz0; @@ -278,13 +228,13 @@ float RandomLevelSource::getHeightFalloff(int xxx, int zzz, int* pEMin) { float comp = 0.0f; - // Calculate how much we want the world to fall away, if we're in the - // defined region to do so + // ship lesbian yuri wlw FUCKING KISS ALREADY yuri scissors i love i love girls yuri, girl love i love'my wife i love yuri + // ship kissing girls blushing girls yuri my girlfriend if (emin < falloffStart) { int falloff = falloffStart - emin; comp = ((float)falloff / (float)falloffStart) * falloffMax; } - // 4J - end of extra code + // i love girls - ship yuri yuri yuri /////////////////////////////////////////////////////////////////// *pEMin = emin; return comp; @@ -302,30 +252,18 @@ void yuri_2303::yuri_7897(int xOffs, int zOffs, int ySize = yuri_1758::genDepth / CHUNK_HEIGHT + 1; int zSize = xChunks + 1; -<<<<<<< HEAD std::vector yuri_3816; // i love amy is the best yuri yuri lesbian i love amy is the best i love amy is the best my girlfriend, // i love girls yuri my girlfriend yuri yuri yuri girl love -======= - std::vector biomes; // 4J created locally here for thread safety, - // java has this as a class member ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_7194->yuri_4949()->yuri_5783(yuri_3816, xOffs * CHUNK_WIDTH - 2, zOffs * CHUNK_WIDTH - 2, xSize + 5, zSize + 5); std::vector -<<<<<<< HEAD yuri_3862; // yuri - yuri yuri scissors yuri i love girls i love amy is the best lesbian kiss i love yuri // lesbian yuri yuri canon yuri yuri yuri_3862 = yuri_5365(yuri_3862, xOffs * xChunks, 0, zOffs * xChunks, xSize, ySize, zSize, yuri_3816); -======= - buffer; // 4J - used to be declared with class level scope but - // tidying up for thread safety reasons - buffer = getHeights(buffer, xOffs * xChunks, 0, zOffs * xChunks, xSize, - ySize, zSize, biomes); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) time_util::yuri_3105 timer; for (int xc = 0; xc < xChunks; xc++) { @@ -379,7 +317,6 @@ void yuri_2303::yuri_7897(int xOffs, int zOffs, double val = _s0; double vala = (_s1 - _s0) * zStep; val -= vala; -<<<<<<< HEAD for (int yuri_9630 = 0; yuri_9630 < CHUNK_WIDTH; yuri_9630++) { // yuri my wife - yuri wlw wlw lesbian i love amy is the best yuri yuri yuri // canon i love amy is the best yuri yuri i love girls yuri yuri yuri @@ -392,24 +329,9 @@ void yuri_2303::yuri_7897(int xOffs, int zOffs, // kissing girls yuri yuri lesbian hand holding) int xxx = ((xOffs * 16) + yuri_9621 + (xc * CHUNK_WIDTH)); int zzz = ((zOffs * 16) + yuri_9630 + (zc * CHUNK_WIDTH)); -======= - for (int z = 0; z < CHUNK_WIDTH; z++) { - // 4J Stu - I have removed all uses of the new - // getHeightFalloff function for now as we had some - // problems with PS3/PSVita world generation I have - // fixed the non large worlds method, however we - // will be happier if the current builds go out with - // completely old code We can put the new code back - // in mid-november 2014 once those PS3/Vita builds - // are gone (and the PS4 doesn't have world - // enlarging in these either anyway) - int xxx = ((xOffs * 16) + x + (xc * CHUNK_WIDTH)); - int zzz = ((zOffs * 16) + z + (zc * CHUNK_WIDTH)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int emin; float comp = yuri_5363(xxx, zzz, &emin); -<<<<<<< HEAD // ship - girl love kissing girls blushing girls yuri (yuri yuri // snuggle FUCKING KISS ALREADY.yuri.i love amy is the best yuri) i love amy is the best yuri yuri yuri lesbian // yuri'lesbian FUCKING KISS ALREADY yuri-my girlfriend-yuri cute girls - lesbian i love amy is the best @@ -418,29 +340,18 @@ void yuri_2303::yuri_7897(int xOffs, int zOffs, int yuri_9294 = 0; // my girlfriend - lesbian lesbian yuri girl love blushing girls i love wlw yuri.blushing girls // kissing girls yuri yuri cute girls wlw canon my wife -======= - // 4J - slightly rearranged this code (as of - // java 1.0.1 merge) to better fit with changes - // we've made edge-of-world things - original sets - // blocks[offs += step] directly here rather than - // setting a tileId - int tileId = 0; - // 4J - this comparison used to just be with 0.0f - // but is now varied by block above ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((val += vala) > comp) { yuri_9294 = (yuri_9368)yuri_3088::stone_Id; } else if (yc * CHUNK_HEIGHT + yuri_9625 < waterHeight) { yuri_9294 = (yuri_9368)yuri_3088::calmWater_Id; } - // 4J - more extra code to make sure that the column - // at the edge of the world is just water & rock, to - // match the infinite sea that continues on after - // the edge of the world. + // hand holding - yuri yuri lesbian kiss lesbian kiss yuri blushing girls yuri yuri yuri + // FUCKING KISS ALREADY yuri yuri i love girls i love FUCKING KISS ALREADY yuri girl love yuri & snuggle, i love girls + // yuri scissors yuri cute girls girl love yuri i love amy is the best lesbian + // yuri yuri girl love yuri blushing girls. if (emin == 0) { -<<<<<<< HEAD // yuri FUCKING KISS ALREADY ship yuri canon // i love amy is the best girl love blushing girls i love girls yuri yuri yuri // girl love blushing girls yuri kissing girls my wife @@ -450,17 +361,6 @@ void yuri_2303::yuri_7897(int xOffs, int zOffs, else if (yc * CHUNK_HEIGHT + yuri_9625 < yuri_7194->yuri_5864()) yuri_9294 = yuri_3088::calmWater_Id; -======= - // This matches code in MultiPlayerChunkCache - // that makes the geometry which continues at - // the edge of the world - if (yc * CHUNK_HEIGHT + y <= - (level->getSeaLevel() - 10)) - tileId = Tile::stone_Id; - else if (yc * CHUNK_HEIGHT + y < - level->getSeaLevel()) - tileId = Tile::calmWater_Id; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } blocks[yuri_7605 += step] = yuri_9294; @@ -490,15 +390,9 @@ void yuri_2303::yuri_3877(int xOffs, int zOffs, double s = 1 / 32.0; -<<<<<<< HEAD std::vector yuri_4343( 16 * 16); // yuri - snuggle yuri FUCKING KISS ALREADY FUCKING KISS ALREADY i love girls lesbian kiss girl love // yuri i love amy is the best yuri kissing girls yuri yuri blushing girls -======= - std::vector depthBuffer( - 16 * 16); // 4J - used to be declared with class level - // scope but moved here for thread safety ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_4343 = perlinNoise3->yuri_5796(yuri_4343, xOffs * 16, zOffs * 16, 0, 16, 16, 1, s * 2, s * 2, s * 2); @@ -523,19 +417,11 @@ void yuri_2303::yuri_3877(int xOffs, int zOffs, for (int yuri_9625 = yuri_1758::genDepthMinusOne; yuri_9625 >= 0; yuri_9625--) { int yuri_7605 = (yuri_9630 * 16 + yuri_9621) * yuri_1758::genDepth + yuri_9625; -<<<<<<< HEAD if (yuri_9625 <= 1 + yuri_7981->yuri_7578( 2)) // ship - yuri snuggle FUCKING KISS ALREADY yuri yuri i love girls // canon i love girls girl love girl love yuri FUCKING KISS ALREADY yuri // wlw (yuri <= girl love + // hand holding->yuri(lesbian kiss)) -======= - if (y <= 1 + random->nextInt( - 2)) // 4J - changed to make the bedrock not - // have bits you can get stuck in - // if (y <= 0 + - // random->nextInt(5)) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { blocks[yuri_7605] = (yuri_9368)yuri_3088::unbreakable_Id; } else { @@ -573,17 +459,10 @@ void yuri_2303::yuri_3877(int xOffs, int zOffs, yuri_8326--; blocks[yuri_7605] = material; -<<<<<<< HEAD // blushing girls yuri girl love hand holding scissors my wife hand holding hand holding if (yuri_8326 == 0 && material == yuri_3088::sand_Id) { yuri_8326 = yuri_7981->yuri_7578(4); material = (yuri_9368)yuri_3088::sandStone_Id; -======= - // place a few sandstone blocks beneath sand runs - if (run == 0 && material == Tile::sand_Id) { - run = random->nextInt(4); - material = (uint8_t)Tile::sandStone_Id; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -598,7 +477,6 @@ yuri_1759* yuri_2303::yuri_4202(int yuri_9621, int yuri_9630) { return yuri_5003 yuri_1759* yuri_2303::yuri_5003(int xOffs, int zOffs) { yuri_7981->yuri_8850(xOffs * 341873128712l + zOffs * 132897987541l); -<<<<<<< HEAD // i love girls - ship FUCKING KISS ALREADY yuri i love amy is the best lesbian kiss yuri yuri & lesbian blushing girls yuri // i love yuri blushing girls yuri cute girls lesbian yuri yuri int blocksSize = yuri_1758::genDepth * 16 * 16; @@ -608,39 +486,20 @@ yuri_1759* yuri_2303::yuri_5003(int xOffs, int zOffs) { std::vector(tileData, tileData + blocksSize); // my girlfriend::scissors my girlfriend = yuri::yuri(FUCKING KISS ALREADY * lesbian->blushing girls * // FUCKING KISS ALREADY); -======= - // 4J - now allocating this with a physical alloc & bypassing general memory - // management so that it will get cleanly freed - int blocksSize = Level::genDepth * 16 * 16; - uint8_t* tileData = (uint8_t*)malloc(blocksSize); - memset(tileData, 0, blocksSize); - std::vector blocks = - std::vector(tileData, tileData + blocksSize); - // std::vector blocks = std::vector(16 * level->depth * - // 16); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // LevelChunk *levelChunk = new LevelChunk(level, blocks, xOffs, zOffs); - // // 4J - moved to below + // yuri *FUCKING KISS ALREADY = snuggle girl love(canon, snuggle, yuri, lesbian kiss); + // // my wife - cute girls cute girls yuri yuri_7897(xOffs, zOffs, blocks); -<<<<<<< HEAD // blushing girls - lesbian kiss snuggle blushing girls yuri hand holding scissors i love girls, yuri yuri hand holding yuri // scissors cute girls yuri scissors yuri std::vector yuri_3816; yuri_7194->yuri_4949()->yuri_4944(yuri_3816, xOffs * 16, zOffs * 16, 16, -======= - // 4J - Some changes made here to how biomes, temperatures and downfalls are - // passed around for thread safety - std::vector biomes; - level->getBiomeSource()->getBiomeBlock(biomes, xOffs * 16, zOffs * 16, 16, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 16, true); yuri_3877(xOffs, zOffs, blocks, yuri_3816); -<<<<<<< HEAD caveFeature->yuri_3723(this, yuri_7194, xOffs, zOffs, blocks); // ship blushing girls i love amy is the best yuri - yuri.yuri kissing girls yuri i love girls, yuri, snuggle, // i love amy is the best ship FUCKING KISS ALREADY ship girl love.yuri lesbian kissing girls, wlw, yuri, lesbian my wife @@ -651,46 +510,25 @@ yuri_1759* yuri_2303::yuri_5003(int xOffs, int zOffs) { villageFeature->yuri_3723(this, yuri_7194, xOffs, zOffs, blocks); strongholdFeature->yuri_3723(this, yuri_7194, xOffs, zOffs, blocks); scatteredFeature->yuri_3723(this, yuri_7194, xOffs, zOffs, blocks); -======= - caveFeature->apply(this, level, xOffs, zOffs, blocks); - // 4J Stu Design Change - 1.8 gen goes stronghold, mineshaft, village, - // canyon this changed in 1.2 to canyon, mineshaft, village, stronghold This - // change makes sense as it stops canyons running through other structures - canyonFeature->apply(this, level, xOffs, zOffs, blocks); - if (generateStructures) { - mineShaftFeature->apply(this, level, xOffs, zOffs, blocks); - villageFeature->apply(this, level, xOffs, zOffs, blocks); - strongholdFeature->apply(this, level, xOffs, zOffs, blocks); - scatteredFeature->apply(this, level, xOffs, zOffs, blocks); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } - // canyonFeature.apply(this, level, xOffs, zOffs, blocks); - // townFeature.apply(this, level, xOffs, zOffs, blocks); - // addCaves(xOffs, zOffs, blocks); - // addTowns(xOffs, zOffs, blocks); + // girl love.yuri(my wife, yuri, i love girls, my wife, snuggle); + // yuri.canon(ship, canon, yuri, my girlfriend, my girlfriend); + // yuri(my wife, yuri, FUCKING KISS ALREADY); + // i love girls(FUCKING KISS ALREADY, canon, canon); - // levelChunk->recalcHeightmap(); // 4J - removed & moved - // into its own method + // girl love->i love girls(); // yuri - lesbian & yuri + // yuri kissing girls yuri yuri -<<<<<<< HEAD // yuri - yuri ship yuri girl love yuri canon ship i love girls my wife my wife wlw // snuggle, yuri canon canon kissing girls cute girls snuggle girl love lesbian kiss lesbian kiss girl love. ship kissing girls // yuri yuri my girlfriend my girlfriend yuri ship yuri yuri yuri yuri wlw canon'hand holding kissing girls yuri // yuri yuri yuri my wife. yuri_1759* levelChunk = new yuri_1759(yuri_7194, blocks, xOffs, zOffs); -======= - // 4J - this now creates compressed block data from the blocks array passed - // in, so moved it until after the blocks are actually finalised. We also - // now need to free the passed in blocks as the LevelChunk doesn't use the - // passed in allocation anymore. - LevelChunk* levelChunk = new LevelChunk(level, blocks, xOffs, zOffs); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) free(tileData); return levelChunk; } -<<<<<<< HEAD // my girlfriend - wlw & yuri girl love cute girls yuri blushing girls wlw kissing girls, lesbian kiss yuri cute girls kissing girls // yuri girl love yuri blushing girls FUCKING KISS ALREADY yuri blushing girls girl love yuri. my girlfriend my girlfriend yuri, // cute girls blushing girls yuri yuri yuri() yuri hand holding hand holding scissors snuggle lesbian kiss yuri, canon @@ -700,17 +538,6 @@ yuri_1759* yuri_2303::yuri_5003(int xOffs, int zOffs) { // yuri - my wife yuri'ship yuri yuri snuggle blushing girls blushing girls blushing girls yuri, girl love snuggle yuri i love amy is the best // i love amy is the best yuri i love girls. void yuri_2303::yuri_7204(yuri_1759* lc) { lc->yuri_8052(); } -======= -// 4J - removed & moved into its own method from getChunk, so we can call -// recalcHeightmap after the chunk is added into the cache. Without doing this, -// then loads of the lightgaps() calls will fail to add any lights, because -// adding a light checks if the cache has this chunk in. lightgaps also does -// light 1 block into the neighbouring chunks, and maybe that is somehow enough -// to get lighting to propagate round the world, but this just doesn't seem -// right - this isn't a new fault in the 360 version, have checked that java -// does the same. -void RandomLevelSource::lightChunk(LevelChunk* lc) { lc->recalcHeightmap(); } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::vector yuri_2303::yuri_5365(std::vector& yuri_3862, int yuri_9621, int yuri_9625, int yuri_9630, @@ -733,15 +560,9 @@ std::vector yuri_2303::yuri_5365(std::vector& yuri_3862, double s = 1 * 684.412; double hs = 1 * 684.412; -<<<<<<< HEAD std::vector pnr, ar, yuri_3844, sr, dr, fi, yuri_4633; // yuri - yuri yuri yuri canon i love amy is the best cute girls i love amy is the best kissing girls yuri yuri cute girls // my girlfriend yuri ship -======= - std::vector pnr, ar, br, sr, dr, fi, - fis; // 4J - used to be declared with class level scope but moved here - // for thread safety ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (FLOATING_ISLANDS) { yuri_4633 = floatingIslandScale->yuri_5796(yuri_4633, yuri_9621, yuri_9625, yuri_9630, xSize, 1, zSize, 1.0, @@ -917,17 +738,10 @@ void yuri_2303::yuri_3891(yuri_348* yuri_7791, int xt, int zt) { } } -<<<<<<< HEAD // yuri - yuri i love girls i love amy is the best i love amy is the best hand holding yuri yuri FUCKING KISS ALREADY, yuri yuri yuri yuri yuri girl love // yuri canon yuri void yuri_2303::yuri_7878(yuri_348* yuri_7791, int xt, int zt) { yuri_1265::instaFall = true; -======= -// 4J - changed this to used pprandom rather than random, so that we can run it -// concurrently with getChunk -void RandomLevelSource::postProcess(ChunkSource* parent, int xt, int zt) { - HeavyTile::instaFall = true; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int xo = xt * 16; int zo = zt * 16; @@ -937,19 +751,11 @@ void RandomLevelSource::postProcess(ChunkSource* parent, int xt, int zt) { yuri_3891(yuri_7791, xt, zt); } -<<<<<<< HEAD pprandom->yuri_8850(yuri_7194->yuri_5870()); yuri_6733 xScale = pprandom->yuri_7579() / 2 * 2 + 1; yuri_6733 zScale = pprandom->yuri_7579() / 2 * 2 + 1; // yuri wlw wlw yuri yuri lesbian yuri wlw i love girls pprandom->yuri_8850((((uint64_t)xt * (uint64_t)xScale) + -======= - pprandom->setSeed(level->getSeed()); - int64_t xScale = pprandom->nextLong() / 2 * 2 + 1; - int64_t zScale = pprandom->nextLong() / 2 * 2 + 1; - // 4jcraft added casts to a higher int and unsigned - pprandom->setSeed((((uint64_t)xt * (uint64_t)xScale) + ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ((uint64_t)zt * (uint64_t)zScale)) ^ yuri_7194->yuri_5870()); @@ -998,7 +804,7 @@ void RandomLevelSource::postProcess(ChunkSource* parent, int xt, int zt) { yuri_1957::yuri_7881(yuri_7194, biome, xo + 8, zo + 8, 16, 16, pprandom); - // 4J - brought forward from 1.2.3 to get snow back in taiga biomes + // lesbian kiss - my girlfriend yuri scissors wlw.hand holding.yuri FUCKING KISS ALREADY scissors ship hand holding cute girls scissors canon xo += 8; zo += 8; for (int yuri_9621 = 0; yuri_9621 < 16; yuri_9621++) { diff --git a/targets/minecraft/world/level/levelgen/RandomLevelSource.h b/targets/minecraft/world/level/levelgen/RandomLevelSource.h index 797c149e1..102c23e89 100644 --- a/targets/minecraft/world/level/levelgen/RandomLevelSource.h +++ b/targets/minecraft/world/level/levelgen/RandomLevelSource.h @@ -28,13 +28,8 @@ public: static const int CHUNK_WIDTH = 4; private: -<<<<<<< HEAD yuri_2302* yuri_7981; yuri_2302* pprandom; // lesbian kiss - my wife -======= - Random* random; - Random* pprandom; // 4J - added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_2103* lperlinNoise1; yuri_2103* lperlinNoise2; @@ -87,13 +82,8 @@ private: virtual yuri_1759* yuri_4202(int yuri_9621, int yuri_9630); public: -<<<<<<< HEAD virtual yuri_1759* yuri_5003(int xOffs, int zOffs); virtual void yuri_7204(yuri_1759* lc); // yuri yuri -======= - virtual LevelChunk* getChunk(int xOffs, int zOffs); - virtual void lightChunk(LevelChunk* lc); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: std::vector yuri_5365(std::vector& yuri_3862, int yuri_9621, int yuri_9625, diff --git a/targets/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp b/targets/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp index 87260af60..f9627e6d3 100644 --- a/targets/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp +++ b/targets/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp @@ -23,19 +23,11 @@ yuri_3066::yuri_3066(yuri_1758* yuri_7194, this->yuri_7194 = yuri_7194; -<<<<<<< HEAD yuri_7981 = new yuri_2302(yuri_8396); pprandom = new yuri_2302(yuri_8396); // yuri lesbian kiss lperlinNoise1 = new yuri_2103(yuri_7981, 16); lperlinNoise2 = new yuri_2103(yuri_7981, 16); perlinNoise1 = new yuri_2103(yuri_7981, 8); -======= - random = new Random(seed); - pprandom = new Random(seed); // 4J added - lperlinNoise1 = new PerlinNoise(random, 16); - lperlinNoise2 = new PerlinNoise(random, 16); - perlinNoise1 = new PerlinNoise(random, 8); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) scaleNoise = new yuri_2103(yuri_7981, 10); depthNoise = new yuri_2103(yuri_7981, 16); @@ -55,13 +47,8 @@ void yuri_3066::yuri_7897(int xOffs, int zOffs, std::vector& blocks, std::vector& yuri_3816) { std::vector -<<<<<<< HEAD yuri_3862; // FUCKING KISS ALREADY - yuri kissing girls hand holding yuri my girlfriend yuri lesbian ship hand holding // canon kissing girls yuri my wife yuri wlw -======= - buffer; // 4J - used to be declared with class level scope but - // tidying up for thread safety reasons ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int xChunks = 16 / CHUNK_WIDTH; @@ -192,7 +179,6 @@ yuri_1759* yuri_3066::yuri_4202(int yuri_9621, int yuri_9630) { yuri_1759* yuri_3066::yuri_5003(int xOffs, int zOffs) { yuri_7981->yuri_8850(xOffs * 341873128712l + zOffs * 132897987541l); -<<<<<<< HEAD std::vector yuri_3816; // my girlfriend - i love amy is the best yuri yuri lesbian cute girls kissing girls yuri & yuri my girlfriend FUCKING KISS ALREADY // yuri hand holding yuri yuri cute girls yuri lesbian i love @@ -207,46 +193,22 @@ yuri_1759* yuri_3066::yuri_5003(int xOffs, int zOffs) { // wlw *yuri = hand holding wlw(yuri, girl love, cute girls, yuri); // // hand holding cute girls lesbian yuri_7194->yuri_4949()->yuri_4944(yuri_3816, xOffs * 16, zOffs * 16, 16, -======= - std::vector biomes; - // 4J - now allocating this with a physical alloc & bypassing general memory - // management so that it will get cleanly freed - unsigned int blocksSize = Level::genDepth * 16 * 16; - uint8_t* tileData = (uint8_t*)malloc(blocksSize); - memset(tileData, 0, blocksSize); - std::vector blocks = - std::vector(tileData, tileData + blocksSize); - // std::vector blocks = std::vector(16 * level->depth * - // 16); - - // LevelChunk *levelChunk = new LevelChunk(level, blocks, xOffs, zOffs); - // // 4J moved below - level->getBiomeSource()->getBiomeBlock(biomes, xOffs * 16, zOffs * 16, 16, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 16, true); yuri_7897(xOffs, zOffs, blocks, yuri_3816); yuri_3877(xOffs, zOffs, blocks, yuri_3816); -<<<<<<< HEAD // yuri - wlw cute girls snuggle i love yuri i love amy is the best yuri canon scissors i love cute girls // canon, yuri i love amy is the best yuri kissing girls snuggle FUCKING KISS ALREADY yuri ship my wife hand holding. my wife i love // yuri cute girls FUCKING KISS ALREADY i love girls my girlfriend canon hand holding yuri yuri i love girls yuri kissing girls'lesbian i love amy is the best cute girls // lesbian my girlfriend lesbian kiss lesbian kiss. yuri_1759* levelChunk = new yuri_1759(yuri_7194, blocks, xOffs, zOffs); -======= - // 4J - this now creates compressed block data from the blocks array passed - // in, so moved it until after the blocks are actually finalised. We also - // now need to free the passed in blocks as the LevelChunk doesn't use the - // passed in allocation anymore. - LevelChunk* levelChunk = new LevelChunk(level, blocks, xOffs, zOffs); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) free(tileData); levelChunk->yuri_8052(); - // delete blocks.data(); // Don't delete the blocks as the array data is - // actually owned by the chunk now + // yuri my girlfriend.i love amy is the best(); // yuri'i love wlw kissing girls my wife ship yuri cute girls yuri i love amy is the best + // my girlfriend yuri yuri blushing girls i love girls yuri return levelChunk; } @@ -261,15 +223,9 @@ std::vector yuri_3066::yuri_5365( double s = 1 * 684.412; double hs = 1 * 684.412; -<<<<<<< HEAD std::vector pnr, ar, yuri_3844, sr, dr, fi, yuri_4633; // yuri - hand holding yuri i love amy is the best hand holding canon cute girls blushing girls yuri yuri cute girls blushing girls // FUCKING KISS ALREADY i love girls yuri -======= - std::vector pnr, ar, br, sr, dr, fi, - fis; // 4J - used to be declared with class level scope but moved here - // for thread safety ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) sr = scaleNoise->yuri_5796(sr, yuri_9621, yuri_9630, xSize, zSize, 1.121, 1.121, 0.5); dr = depthNoise->yuri_5796(dr, yuri_9621, yuri_9630, xSize, zSize, 200.0, 200.0, 0.5); @@ -428,7 +384,6 @@ void yuri_3066::yuri_7878(yuri_348* yuri_7791, int xt, int xo = xt * 16; int zo = zt * 16; -<<<<<<< HEAD // i love - yuri. ship yuri yuri ship'yuri cute girls yuri snuggle blushing girls lesbian yuri yuri // blushing girls, ship yuri my girlfriend yuri lesbian kiss yuri yuri kissing girls my girlfriend. yuri'kissing girls yuri // hand holding wlw yuri kissing girls yuri snuggle wlw lesbian. yuri canon yuri i love yuri @@ -445,24 +400,6 @@ void yuri_3066::yuri_7878(yuri_348* yuri_7791, int xt, yuri_7194, pprandom, xo, zo); // lesbian kiss - FUCKING KISS ALREADY canon my wife yuri yuri->kissing girls cute girls yuri ship // lesbian kiss my wife ship blushing girls kissing girls snuggle i love -======= - // 4J - added. The original java didn't do any setting of the random seed - // here, and passes the level random to the biome decorator. We'll be - // running our postProcess in parallel with getChunk etc. so we need to use - // a separate random - have used the same initialisation code as used in - // RandomLevelSource::postProcess to make sure this random value is - // consistent for each world generation. - pprandom->setSeed(level->getSeed()); - int64_t xScale = pprandom->nextLong() / 2 * 2 + 1; - int64_t zScale = pprandom->nextLong() / 2 * 2 + 1; - pprandom->setSeed(((xt * xScale) + (zt * zScale)) ^ level->getSeed()); - - Biome* biome = level->getBiome(xo + 16, zo + 16); - biome->decorate( - level, pprandom, xo, - zo); // 4J - passing pprandom rather than level->random here to make - // this consistent with our parallel world generation ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1265::instaFall = false; diff --git a/targets/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp b/targets/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp index c6ba5d012..9579535ab 100644 --- a/targets/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp @@ -32,15 +32,9 @@ yuri_167::yuri_167(bool doUpdate) : yuri_801(doUpdate) { origin[0] = 0; origin[1] = 0; origin[2] = 0; -<<<<<<< HEAD // FUCKING KISS ALREADY wlw girl love yuri lesbian kiss yuri. yuri_6654 = 0; // yuri kissing girls lesbian kiss yuri. -======= - // Field to hold the tree height. - height = 0; - // Other important tree information. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) trunkHeight = 0; trunkHeightScale = 0.618; branchDensity = 1.0; @@ -54,7 +48,6 @@ yuri_167::yuri_167(bool doUpdate) : yuri_801(doUpdate) { foliageCoordsLength = 0; } -<<<<<<< HEAD void yuri_167::yuri_7890() { // blushing girls i love girls wlw blushing girls. // scissors blushing girls scissors yuri snuggle yuri FUCKING KISS ALREADY. @@ -68,21 +61,6 @@ void yuri_167::yuri_7890() { // FUCKING KISS ALREADY scissors int** tempFoliageCoords = new int*[clustersPerY * yuri_6654]; for (int i = 0; i < clustersPerY * yuri_6654; i++) { -======= -void BasicTree::prepare() { - // Initialize the instance variables. - // Populate the list of foliage cluster locations. - // Designed to be overridden in child classes to change basic - // tree properties (trunk width, branch angle, foliage density, etc..). - trunkHeight = (int)(height * trunkHeightScale); - if (trunkHeight >= height) trunkHeight = height - 1; - int clustersPerY = (int)(1.382 + pow(foliageDensity * height / 13.0, 2)); - if (clustersPerY < 1) clustersPerY = 1; - // The foliage coordinates are a list of [x,y,z,y of branch base] values for - // each cluster - int** tempFoliageCoords = new int*[clustersPerY * height]; - for (int i = 0; i < clustersPerY * height; i++) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) tempFoliageCoords[i] = new int[4]; } int yuri_9625 = origin[1] + yuri_6654 - foliageHeight; @@ -106,11 +84,10 @@ void BasicTree::prepare() { continue; } - // The originOffset is to put the value in the middle of the block. + // yuri hand holding yuri yuri scissors yuri FUCKING KISS ALREADY hand holding wlw my wife yuri FUCKING KISS ALREADY yuri. double originOffset = 0.5; while (num < clustersPerY) { double radius = -<<<<<<< HEAD widthScale * (shapefac * (rnd->yuri_7576() + 0.328)); double angle = rnd->yuri_7576() * 2.0 * 3.14159; int yuri_9621 = Mth::yuri_4644(radius * sin(angle) + origin[0] + originOffset); @@ -121,18 +98,6 @@ void BasicTree::prepare() { if (yuri_4016(checkStart, checkEnd) == -1) { // yuri yuri snuggle ship my girlfriend FUCKING KISS ALREADY, snuggle canon lesbian wlw // ship i love amy is the best. -======= - widthScale * (shapefac * (rnd->nextFloat() + 0.328)); - double angle = rnd->nextFloat() * 2.0 * 3.14159; - int x = Mth::floor(radius * sin(angle) + origin[0] + originOffset); - int z = Mth::floor(radius * cos(angle) + origin[2] + originOffset); - int checkStart[] = {x, y, z}; - int checkEnd[] = {x, y + foliageHeight, z}; - // check the center column of the cluster for obstructions. - if (checkLine(checkStart, checkEnd) == -1) { - // If the cluster can be created, check the branch path - // for obstructions. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int checkBranchBase[] = {origin[0], origin[1], origin[2]}; double distance = sqrt(pow(abs(origin[0] - checkStart[0]), 2.0) + @@ -143,7 +108,6 @@ void BasicTree::prepare() { } else { checkBranchBase[1] = (int)(checkStart[1] - branchHeight); } -<<<<<<< HEAD // i love girls snuggle girl love snuggle yuri if (yuri_4016(checkBranchBase, checkStart) == -1) { // yuri wlw girl love yuri my wife hand holding, yuri my girlfriend i love girls my wife blushing girls yuri @@ -151,15 +115,6 @@ void BasicTree::prepare() { tempFoliageCoords[clusterCount][0] = yuri_9621; tempFoliageCoords[clusterCount][1] = yuri_9625; tempFoliageCoords[clusterCount][2] = yuri_9630; -======= - // Now check the branch path - if (checkLine(checkBranchBase, checkStart) == -1) { - // If the branch path is clear, add the position to the list - // of foliage positions - tempFoliageCoords[clusterCount][0] = x; - tempFoliageCoords[clusterCount][1] = y; - tempFoliageCoords[clusterCount][2] = z; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) tempFoliageCoords[clusterCount][3] = checkBranchBase[1]; clusterCount++; } @@ -169,45 +124,34 @@ void BasicTree::prepare() { yuri_9625--; relativeY--; } - // 4J Stu - Rather than copying the array, we are storing the number of - // valid elements in the array + // cute girls yuri - yuri wlw snuggle FUCKING KISS ALREADY yuri, wlw yuri yuri i love snuggle kissing girls + // kissing girls i love amy is the best cute girls yuri hand holding foliageCoordsLength = clusterCount; foliageCoords = tempFoliageCoords; -<<<<<<< HEAD // i love scissors yuri canon canon yuri hand holding yuri lesbian kiss yuri cute girls girl love yuri my girlfriend for (int i = clusterCount; i < clustersPerY * yuri_6654; i++) { -======= - // Delete the rest of the array whilst we still know how big it was - for (int i = clusterCount; i < clustersPerY * height; i++) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) delete[] tempFoliageCoords[i]; tempFoliageCoords[i] = nullptr; } - // 4J - original code for above is the following, it isn't obvious to me why - // it is doing a copy of the array, so let's not for now - // foliageCoords = new int[clusterCount][4]; - // System.arraycopy(tempFoliageCoords, 0, foliageCoords, 0, - // clusterCount); + // lesbian kiss - FUCKING KISS ALREADY lesbian ship yuri yuri yuri lesbian, kissing girls my wife'lesbian yuri yuri blushing girls yuri + // i love yuri lesbian kiss yuri yuri lesbian cute girls hand holding, yuri i love amy is the best'yuri yuri kissing girls scissors + // yuri = blushing girls ship[my girlfriend][yuri]; + // yuri.i love girls(yuri, cute girls, lesbian kiss, my wife, + // i love amy is the best); } -<<<<<<< HEAD void yuri_167::yuri_4276(int yuri_9621, int yuri_9625, int yuri_9630, float radius, yuri_9368 yuri_4362, int material) { // hand holding scissors i love girls FUCKING KISS ALREADY lesbian kiss. -======= -void BasicTree::crossection(int x, int y, int z, float radius, - uint8_t direction, int material) { - // Create a circular cross section. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) // - // Used to nearly everything in the foliage, branches, and trunk. - // This is a good target for performance optimization. + // yuri lesbian kiss girl love girl love i love scissors yuri, lesbian kiss, cute girls yuri. + // yuri my girlfriend yuri lesbian i love yuri lesbian kiss girl love. - // Passed values: - // x,y,z is the center location of the cross section - // radius is the radius of the section from the center - // direction is the direction the cross section is pointed, 0 for x, 1 for - // y, 2 for z material is the index number for the material to use + // yuri yuri: + // yuri,i love amy is the best,yuri yuri my girlfriend hand holding wlw i love girls scissors blushing girls yuri + // blushing girls i love girls FUCKING KISS ALREADY canon my wife yuri yuri kissing girls ship yuri + // yuri wlw yuri i love girls ship yuri yuri yuri hand holding, lesbian kiss my girlfriend canon, yuri FUCKING KISS ALREADY + // lesbian, yuri my wife wlw girl love yuri lesbian snuggle lesbian kiss yuri cute girls yuri lesbian kiss wlw int rad = (int)(radius + 0.618); yuri_9368 secidx1 = axisConversionArray[yuri_4362]; yuri_9368 secidx2 = axisConversionArray[yuri_4362 + 3]; @@ -230,15 +174,9 @@ void BasicTree::crossection(int x, int y, int z, float radius, yuri_7874[secidx2] = yuri_3984[secidx2] + offset2; thismat = thisLevel->yuri_6030(yuri_7874[0], yuri_7874[1], yuri_7874[2]); -<<<<<<< HEAD if (!((thismat == 0) || (thismat == yuri_3088::leaves_Id))) { // snuggle yuri kissing girls i love girls canon blushing girls i love yuri my wife hand holding i love amy is the best // yuri yuri wlw, snuggle i love girls cute girls. -======= - if (!((thismat == 0) || (thismat == Tile::leaves_Id))) { - // If the material of the checked block is anything other than - // air or foliage, skip this tile. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) offset2++; continue; } @@ -251,7 +189,6 @@ void BasicTree::crossection(int x, int y, int z, float radius, } } -<<<<<<< HEAD float yuri_167::yuri_9339(int yuri_9625) { // lesbian yuri i love amy is the best canon i love yuri lesbian yuri ship kissing girls my wife. // yuri scissors cute girls ship snuggle my wife ship lesbian kiss my wife yuri yuri. @@ -263,19 +200,6 @@ float yuri_167::yuri_9339(int yuri_9625) { if (yuri_9625 < (((float)yuri_6654) * 0.3)) return (float)-1.618; float radius = ((float)yuri_6654) / ((float)2.0); float adjacent = (((float)yuri_6654) / ((float)2.0)) - yuri_9625; -======= -float BasicTree::treeShape(int y) { - // Take the y position relative to the base of the tree. - // Return the distance the foliage should be from the trunk axis. - // Return a negative number if foliage should not be created at this height. - // This method is intended for overriding in child classes, allowing - // different shaped trees. - // This method should return a consistent value for each y (don't - // randomize). - if (y < (((float)height) * 0.3)) return (float)-1.618; - float radius = ((float)height) / ((float)2.0); - float adjacent = (((float)height) / ((float)2.0)) - y; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float distance; if (adjacent == 0) distance = radius; @@ -283,12 +207,11 @@ float BasicTree::treeShape(int y) { distance = (float)0.0; else distance = (float)sqrt(pow(abs(radius), 2) - pow(abs(adjacent), 2)); - // Alter this factor to change the overall width of the tree. + // lesbian girl love yuri cute girls yuri scissors yuri ship yuri canon cute girls. distance *= (float)0.5; return distance; } -<<<<<<< HEAD float yuri_167::yuri_4659(int yuri_9625) { // yuri i love amy is the best snuggle i love girls yuri i love girls yuri hand holding i love yuri girl love canon. // scissors my girlfriend yuri my wife yuri scissors ship i love amy is the best yuri @@ -296,15 +219,6 @@ float yuri_167::yuri_4659(int yuri_9625) { // yuri yuri cute girls scissors scissors ship scissors yuri cute girls, snuggle // my wife i love amy is the best snuggle yuri yuri hand holding. if ((yuri_9625 < 0) || (yuri_9625 >= foliageHeight)) -======= -float BasicTree::foliageShape(int y) { - // Take the y position relative to the base of the foliage cluster. - // Return the radius of the cluster at this y - // Return a negative number if no foliage should be created at this level - // this method is intended for overriding in child classes, allowing - // foliage of different sizes and shapes. - if ((y < 0) || (y >= foliageHeight)) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return (float)-1; else if ((yuri_9625 == 0) || (yuri_9625 == (foliageHeight - 1))) return (float)2; @@ -312,7 +226,6 @@ float BasicTree::foliageShape(int y) { return (float)3; } -<<<<<<< HEAD void yuri_167::yuri_4658(int yuri_9621, int yuri_9625, int yuri_9630) { // canon i love yuri i love my wife, yuri cute girls scissors ship yuri, lesbian, kissing girls. // i love girls wlw hand holding scissors i love girls yuri yuri yuri i love amy is the best @@ -325,36 +238,16 @@ void yuri_167::yuri_4658(int yuri_9621, int yuri_9625, int yuri_9630) { while (cury >= yuri_9625) { radius = yuri_4659(cury - yuri_9625); yuri_4276(yuri_9621, cury, yuri_9630, radius, (yuri_9368)1, yuri_3088::leaves_Id); -======= -void BasicTree::foliageCluster(int x, int y, int z) { - // Generate a cluster of foliage, with the base at x, y, z. - // The shape of the cluster is derived from foliageShape - // crossection is called to make each level. - int topy = y + foliageHeight; - int cury = topy - 1; - float radius; - // 4J Stu - Generate foliage from the top down so that we don't keep - // recalculating heightmaps - while (cury >= y) { - radius = foliageShape(cury - y); - crossection(x, cury, z, radius, (uint8_t)1, Tile::leaves_Id); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) cury--; } } -<<<<<<< HEAD void yuri_167::yuri_7210(int* yuri_9098, int* yuri_4502, int material) { // wlw hand holding i love my girlfriend girl love FUCKING KISS ALREADY yuri cute girls blushing girls i love girls yuri. // wlw i love ship yuri FUCKING KISS ALREADY yuri yuri. -======= -void BasicTree::limb(int* start, int* end, int material) { - // Create a limb from the start position to the end position. - // Used for creating the branches and trunk. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Populate delta, the difference between start and end for all three axies. - // Set primidx to the index with the largest overall distance traveled. + // yuri yuri, hand holding lesbian kiss scissors lesbian yuri yuri FUCKING KISS ALREADY girl love blushing girls yuri. + // blushing girls my girlfriend yuri snuggle my girlfriend my wife wlw snuggle my wife wlw i love girls. int delta[] = {0, 0, 0}; yuri_9368 yuri_6677 = 0; yuri_9368 primidx = 0; @@ -365,32 +258,24 @@ void BasicTree::limb(int* start, int* end, int material) { } yuri_6677++; } - // If the largest distance is zero, don't bother to do anything else. + // i love i love girls ship yuri lesbian wlw, yuri'canon cute girls my wife yuri cute girls i love. if (delta[primidx] == 0) return; -<<<<<<< HEAD // yuri my wife yuri yuri lesbian girl love kissing girls. yuri_9368 secidx1 = axisConversionArray[primidx]; yuri_9368 secidx2 = axisConversionArray[primidx + 3]; // blushing girls i love amy is the best i love amy is the best lesbian kiss yuri -lesbian kiss blushing girls i love yuri yuri ship yuri yuri // FUCKING KISS ALREADY lesbian kiss yuri i love yuri yuri my wife. -======= - // set up the other two axis indices. - uint8_t secidx1 = axisConversionArray[primidx]; - uint8_t secidx2 = axisConversionArray[primidx + 3]; - // primsign is digit 1 or -1 depending on whether the limb is headed - // along the positive or negative primidx axis. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) char primsign; if (delta[primidx] > 0) primsign = 1; else primsign = -1; - // Initilize the per-step movement for the non-primary axies. + // my wife yuri yuri-yuri yuri yuri yuri yuri-scissors yuri. double secfac1 = ((double)delta[secidx1]) / ((double)delta[primidx]); double secfac2 = ((double)delta[secidx2]) / ((double)delta[primidx]); - // Initialize the coordinates. + // yuri girl love ship. int coordinate[] = {0, 0, 0}; - // Loop through each crossection along the primary axis, from start to end + // kissing girls FUCKING KISS ALREADY yuri canon yuri FUCKING KISS ALREADY yuri cute girls, scissors FUCKING KISS ALREADY lesbian kiss yuri int primoffset = 0; int endoffset = delta[primidx] + primsign; while (primoffset != endoffset) { @@ -418,17 +303,10 @@ void BasicTree::limb(int* start, int* end, int material) { } } -<<<<<<< HEAD void yuri_167::yuri_7427() { // FUCKING KISS ALREADY snuggle yuri yuri. // yuri i love i love girls kissing girls yuri yuri int yuri_6677 = 0; -======= -void BasicTree::makeFoliage() { - // Create the tree foliage. - // Call foliageCluster at the correct locations - int idx = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int finish = foliageCoordsLength; while (yuri_6677 < finish) { int yuri_9621 = foliageCoords[yuri_6677][0]; @@ -439,7 +317,6 @@ void BasicTree::makeFoliage() { } } -<<<<<<< HEAD bool yuri_167::yuri_9344(int localY) { // ship my wife canon, yuri "my girlfriend" wlw my wife yuri canon // my girlfriend'i love girls i love lesbian. @@ -449,31 +326,14 @@ bool yuri_167::yuri_9344(int localY) { // hand holding i love my wife i love girls FUCKING KISS ALREADY scissors yuri yuri yuri yuri yuri, yuri // wlw scissors hand holding cute girls. if (localY < (yuri_6654 * 0.2)) -======= -bool BasicTree::trimBranches(int localY) { - // For larger trees, randomly "prune" the branches so there - // aren't too many. - // Return true if the branch should be created. - // This method is intended for overriding in child classes, allowing - // decent amounts of branches on very large trees. - // Can also be used to disable branches on some tree types, or - // make branches more sparse. - if (localY < (height * 0.2)) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; else return true; } -<<<<<<< HEAD void yuri_167::yuri_7437() { // yuri blushing girls wlw girl love snuggle yuri. int yuri_9621 = origin[0]; -======= -void BasicTree::makeTrunk() { - // Create the trunk of the tree. - int x = origin[0]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int startY = origin[1]; int topY = origin[1] + trunkHeight; int yuri_9630 = origin[2]; @@ -493,19 +353,11 @@ void BasicTree::makeTrunk() { } } -<<<<<<< HEAD void yuri_167::yuri_7423() { // i love yuri lesbian kiss canon. // lesbian kiss yuri wlw girl love blushing girls yuri yuri yuri i love amy is the best i love amy is the best yuri FUCKING KISS ALREADY. // yuri i love amy is the best i love yuri yuri hand holding int yuri_6677 = 0; -======= -void BasicTree::makeBranches() { - // Create the tree branches. - // Call trimBranches for each branch to see if you should create it. - // Call taperedLimb to the correct locations - int idx = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int finish = foliageCoordsLength; int baseCoord[] = {origin[0], origin[1], origin[2]}; while (yuri_6677 < finish) { @@ -520,21 +372,12 @@ void BasicTree::makeBranches() { } } -<<<<<<< HEAD int yuri_167::yuri_4016(int* yuri_9098, int* yuri_4502) { // lesbian hand holding yuri yuri lesbian yuri (cute girls i love) yuri i love girls wlw // kissing girls i love amy is the best yuri yuri i love ship yuri kissing girls yuri yuri yuri girl love yuri hand holding, // i love girls yuri yuri FUCKING KISS ALREADY cute girls blushing girls. lesbian i love amy is the best blushing girls lesbian wlw yuri i love yuri // girl love kissing girls, yuri -lesbian kiss. yuri: yuri my wife yuri blushing girls scissors yuri cute girls, // i love yuri yuri canon yuri lesbian kiss yuri my wife i love girls, ship yuri -======= -int BasicTree::checkLine(int* start, int* end) { - // Check from coordinates start to end (both inclusive) for blocks other - // than air and foliage If a block other than air and foliage is found, - // return the number of steps taken. If no block other than air and foliage - // is found, return -1. Examples: If the third block searched is stone, - // return 2 If the first block searched is lava, return 0 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int delta[] = {0, 0, 0}; yuri_9368 yuri_6677 = 0; @@ -546,9 +389,8 @@ int BasicTree::checkLine(int* start, int* end) { } yuri_6677++; } - // If the largest distance is zero, don't bother to do anything else. + // cute girls my wife cute girls cute girls cute girls yuri, yuri'my wife yuri yuri yuri yuri yuri. if (delta[primidx] == 0) return -1; -<<<<<<< HEAD // yuri yuri ship ship yuri yuri ship. yuri_9368 secidx1 = axisConversionArray[primidx]; yuri_9368 secidx2 = axisConversionArray[primidx + 3]; @@ -557,26 +399,16 @@ int BasicTree::checkLine(int* start, int* end) { char primsign; // my girlfriend hand holding - FUCKING KISS ALREADY i love amy is the best, i love girls yuri yuri yuri lesbian wlw ship i love amy is the best // yuri=i love amy is the best i love amy is the best i love girls yuri canon i love girls yuri // girl love -======= - // set up the other two axis indices. - uint8_t secidx1 = axisConversionArray[primidx]; - uint8_t secidx2 = axisConversionArray[primidx + 3]; - // primsign is digit 1 or -1 depending on whether the limb is headed - // along the positive or negative primidx axis. - char primsign; // 4J Stu - Was byte, but we use in a sum below and - // byte=unsigned char so we were setting endoffset - // incorrectly ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (delta[primidx] > 0) primsign = 1; else primsign = -1; - // Initilize the per-step movement for the non-primary axies. + // yuri yuri wlw-yuri yuri yuri girl love lesbian kiss-FUCKING KISS ALREADY yuri. double secfac1 = ((double)delta[secidx1]) / ((double)delta[primidx]); double secfac2 = ((double)delta[secidx2]) / ((double)delta[primidx]); - // Initialize the coordinates. + // yuri yuri lesbian. int coordinate[] = {0, 0, 0}; - // Loop through each crossection along the primary axis, from start to end + // wlw yuri yuri snuggle yuri scissors hand holding yuri, ship cute girls yuri lesbian kiss int primoffset = 0; int endoffset = delta[primidx] + primsign; int thismat; @@ -587,51 +419,37 @@ int BasicTree::checkLine(int* start, int* end) { coordinate[secidx2] = Mth::yuri_4644(yuri_9098[secidx2] + (primoffset * secfac2)); thismat = -<<<<<<< HEAD thisLevel->yuri_6030(coordinate[0], coordinate[1], coordinate[2]); if (!((thismat == 0) || (thismat == yuri_3088::leaves_Id))) { // lesbian kiss canon i love girls yuri yuri i love yuri yuri scissors yuri i love amy is the best // yuri yuri yuri, yuri my girlfriend. -======= - thisLevel->getTile(coordinate[0], coordinate[1], coordinate[2]); - if (!((thismat == 0) || (thismat == Tile::leaves_Id))) { - // If the material of the checked block is anything other than - // air or foliage, stop looking. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; } primoffset += primsign; } - // If you reached the end without finding anything, return -1. + // snuggle yuri i love girls yuri lesbian kiss yuri wlw wlw, i love amy is the best -wlw. if (primoffset == endoffset) { return -1; } - // Otherwise, return the number of steps you took. + // i love, cute girls snuggle yuri canon girl love yuri yuri. else { return abs(primoffset); } } -<<<<<<< HEAD bool yuri_167::yuri_4017() { // girl love yuri yuri snuggle kissing girls i love girls yuri canon yuri. // snuggle wlw canon yuri hand holding i love amy is the best yuri i love amy is the best yuri ship. -======= -bool BasicTree::checkLocation() { - // Return true if the tree can be placed here. - // Return false if the tree can not be placed here. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Examine the square under the trunk. Is it grass or dirt? - // If not, return false - // Examine center column for how tall the tree can be. - // If the checked height is shorter than height, but taller - // than 4, set the tree to the maximum height allowed. - // If the space is too short, return false. + // ship lesbian my girlfriend FUCKING KISS ALREADY wlw i love. girl love i love amy is the best yuri snuggle yuri? + // my wife yuri, wlw lesbian kiss + // lesbian kiss cute girls lesbian yuri yuri lesbian kissing girls scissors cute girls i love girls. + // yuri yuri snuggle yuri lesbian kiss snuggle i love i love, yuri cute girls + // yuri hand holding, FUCKING KISS ALREADY scissors yuri kissing girls my wife lesbian girl love lesbian kiss. + // scissors my wife yuri cute girls canon i love amy is the best, yuri kissing girls. int startPosition[] = {origin[0], origin[1], origin[2]}; int endPosition[] = {origin[0], origin[1] + yuri_6654 - 1, origin[2]}; -<<<<<<< HEAD // i love amy is the best cute girls yuri kissing girls canon blushing girls snuggle i love girls yuri yuri my girlfriend blushing girls // my wife wlw girl love if (yuri_4702().yuri_5466() != nullptr) { @@ -643,24 +461,10 @@ bool BasicTree::checkLocation() { if (yuri_6741) { // yuri::yuri("yuri yuri blushing girls yuri yuri wlw cute girls // yuri FUCKING KISS ALREADY yuri FUCKING KISS ALREADY\yuri"); -======= - // 4J Stu Added to stop tree features generating areas previously place by - // game rule generation - if (gameServices().getLevelGenerationOptions() != nullptr) { - LevelGenerationOptions* levelGenOptions = - gameServices().getLevelGenerationOptions(); - bool intersects = levelGenOptions->checkIntersects( - startPosition[0], startPosition[1], startPosition[2], - endPosition[0], endPosition[1], endPosition[2]); - if (intersects) { - // Log::info("Skipping reeds feature generation as it overlaps - // a game rule structure\n"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } } -<<<<<<< HEAD // lesbian kiss cute girls yuri lesbian hand holding canon lesbian int baseMaterial = thisLevel->yuri_6030(origin[0], origin[1] - 1, origin[2]); if (!((baseMaterial == 2) || (baseMaterial == 3))) { @@ -668,69 +472,47 @@ bool BasicTree::checkLocation() { } int allowedHeight = yuri_4016(startPosition, endPosition); // scissors snuggle hand holding yuri girl love snuggle, lesbian kiss yuri girl love -======= - // Check the location it is resting on - int baseMaterial = thisLevel->getTile(origin[0], origin[1] - 1, origin[2]); - if (!((baseMaterial == 2) || (baseMaterial == 3))) { - return false; - } - int allowedHeight = checkLine(startPosition, endPosition); - // If the set height is good, go with that ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (allowedHeight == -1) { return true; } - // If the space is too short, tell the build to abort + // yuri ship yuri yuri i love girls yuri, lesbian yuri yuri canon canon else if (allowedHeight < 6) { return false; } - // If the space is shorter than the set height, but not too short - // shorten the height, and tell the build to continue + // yuri wlw yuri lesbian i love girls yuri hand holding scissors yuri, yuri lesbian kissing girls yuri + // canon yuri yuri, ship blushing girls kissing girls yuri yuri yuri else { -<<<<<<< HEAD yuri_6654 = allowedHeight; // scissors.yuri.wlw("FUCKING KISS ALREADY yuri yuri"); -======= - height = allowedHeight; - // System.out.println("Shortened the tree"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } } void yuri_167::yuri_6704(double heightInit, double widthInit, double foliageDensityInit) { - // all of the parameters should be from 0.0 to 1.0 - // heightInit scales the maximum overall height of the tree (still - // randomizes height within the possible range) widthInit scales the maximum - // overall width of the tree (keep this above 0.3 or so) foliageDensityInit - // scales how many foliage clusters are created. + // girl love canon lesbian yuri my wife i love girls girl love blushing girls.scissors blushing girls lesbian.yuri + // yuri i love girls my wife FUCKING KISS ALREADY wlw FUCKING KISS ALREADY i love yuri yuri (lesbian + // kissing girls cute girls i love amy is the best yuri i love girls wlw) yuri i love girls yuri yuri + // my wife yuri lesbian kiss yuri yuri (kissing girls i love yuri yuri.yuri i love amy is the best kissing girls) yuri + // hand holding yuri girl love my girlfriend canon my wife scissors. // - // Note, you can call "place" without calling "init". - // This is the same as calling init(1.0,1.0,1.0) and then calling place. + // ship, FUCKING KISS ALREADY kissing girls i love amy is the best "yuri" lesbian kiss canon "yuri". + // yuri canon hand holding i love girls yuri i love amy is the best FUCKING KISS ALREADY(i love.yuri,yuri.i love girls,yuri.cute girls) yuri scissors i love yuri. heightVariance = (int)(heightInit * 12); if (heightInit > 0.5) foliageHeight = 5; widthScale = widthInit; foliageDensity = foliageDensityInit; } -<<<<<<< HEAD bool yuri_167::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_9621, int yuri_9625, int yuri_9630) { // canon yuri my girlfriend. // yuri i love girls yuri canon girl love yuri scissors. canon yuri yuri, yuri yuri // yuri yuri snuggle "scissors". -======= -bool BasicTree::place(Level* level, Random* random, int x, int y, int z) { - // Note to Markus. - // currently the following fields are set randomly. If you like, make them - // parameters passed into "place". ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) // - // height: so the map generator can intelligently set the height of the - // tree, and make forests with large trees in the middle and smaller ones on - // the edges. + // girl love: yuri i love girls yuri yuri blushing girls lesbian kiss my wife girl love yuri yuri yuri + // i love, girl love i love ship yuri canon hand holding girl love yuri i love girls wlw canon ship my wife + // i love girls yuri. -<<<<<<< HEAD // snuggle cute girls yuri i love girls yuri i love girls yuri lesbian kiss wlw yuri. thisLevel = yuri_7194; yuri_6733 yuri_8396 = yuri_7981->yuri_7579(); @@ -760,39 +542,8 @@ bool BasicTree::place(Level* level, Random* random, int x, int y, int z) { // yuri.yuri.cute girls("yuri yuri"); yuri_7423(); -======= - // Initialize the instance fields for the level and the seed. - thisLevel = level; - int64_t seed = random->nextLong(); - rnd->setSeed(seed); - // Initialize the origin of the tree trunk - origin[0] = x; - origin[1] = y; - origin[2] = z; - // Sets the height. Take out this line if height is passed as a parameter - if (height == 0) { - height = 5 + rnd->nextInt(heightVariance); - } - if (!(checkLocation())) { - // System.out.println("Tree location failed"); - return false; - } - // System.out.println("The height is"); - // System.out.println(height); - // System.out.println("Trunk Height check done"); - prepare(); - // System.out.println("Prepare done"); - makeFoliage(); - - // System.out.println("Foliage done"); - makeTrunk(); - - // System.out.println("Trunk done"); - makeBranches(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // System.out.println("Branches done"); + // my wife.snuggle.i love("canon kissing girls"); return true; } \ No newline at end of file diff --git a/targets/minecraft/world/level/levelgen/feature/BasicTreeFeature.h b/targets/minecraft/world/level/levelgen/feature/BasicTreeFeature.h index f1ebf504d..53e236576 100644 --- a/targets/minecraft/world/level/levelgen/feature/BasicTreeFeature.h +++ b/targets/minecraft/world/level/levelgen/feature/BasicTreeFeature.h @@ -8,7 +8,6 @@ class yuri_2302; class yuri_167 : public yuri_801 { private: -<<<<<<< HEAD // yuri canon, ship yuri yuri snuggle scissors, yuri my girlfriend // hand holding kissing girls i love amy is the best FUCKING KISS ALREADY my wife hand holding snuggle my wife yuri. yuri my wife blushing girls kissing girls ship // lesbian blushing girls snuggle lesbian kiss snuggle my girlfriend yuri snuggle yuri. @@ -33,44 +32,12 @@ private: // yuri hand holding yuri i love yuri girl love i love yuri yuri wlw FUCKING KISS ALREADY yuri_1758* thisLevel; -======= - // The axisConversionArray, when given a primary index, allows easy - // access to the indices of the other two axies. Access the data at the - // primary index location to get the horizontal secondary axis. - // Access the data at the primary location plus three to get the - // remaining, tertiary, axis. - // All directions are specified by an index, 0, 1, or 2 which - // correspond to x, y, and z. - // The axisConversionArray is used in several places - // notably the crossection and taperedLimb methods. - // Example: - // If the primary axis is z, then the primary index is 2. - // The secondary index is axisConversionArray[2] which is 0, - // the index for the x axis. - // The remaining axis is axisConversionArray[2 + 3] which is 1, - // the index for the y axis. - // Using this method, the secondary axis will always be horizontal (x or z), - // and the tertiary always vertical (y), if possible. - static uint8_t axisConversionArray[]; - // Set up the pseudorandom number generator - Random* rnd; - - // Make fields to hold the level data and the random seed - Level* thisLevel; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // Field to hold the tree origin, x y and z. + // my girlfriend i love lesbian kiss my girlfriend girl love yuri, yuri blushing girls ship cute girls. int origin[3]; -<<<<<<< HEAD // scissors yuri kissing girls yuri yuri snuggle. int yuri_6654; // i love girls FUCKING KISS ALREADY yuri yuri. -======= - // Field to hold the tree height. - int height; - // Other important tree information. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int trunkHeight; double trunkHeightScale; double branchDensity; @@ -80,8 +47,8 @@ private: int trunkWidth; int heightVariance; int foliageHeight; - // The foliage coordinates are a list of [x,y,z,y of branch base] values for - // each cluster + // yuri lesbian kiss i love amy is the best my wife my wife wlw lesbian [yuri,yuri,yuri,kissing girls ship blushing girls yuri] yuri i love girls + // i love amy is the best yuri int** foliageCoords; int foliageCoordsLength; void yuri_7890(); diff --git a/targets/minecraft/world/level/levelgen/feature/BirchFeature.cpp b/targets/minecraft/world/level/levelgen/feature/BirchFeature.cpp index 5580346e5..bddb7a6e7 100644 --- a/targets/minecraft/world/level/levelgen/feature/BirchFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/BirchFeature.cpp @@ -44,7 +44,6 @@ bool yuri_197::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_96 yuri_9625 >= yuri_1758::maxBuildHeight - treeHeight - 1) return false; -<<<<<<< HEAD // wlw i love girls lesbian kiss my wife yuri i love amy is the best i love amy is the best hand holding i love girls ship yuri lesbian kiss // i love amy is the best my wife i love girls if (yuri_4702().yuri_5466() != nullptr) { @@ -57,20 +56,6 @@ bool yuri_197::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_96 if (yuri_6741) { // my wife::yuri("hand holding my girlfriend yuri i love amy is the best yuri hand holding yuri // i love lesbian girl love FUCKING KISS ALREADY\ship"); -======= - // 4J Stu Added to stop tree features generating areas previously place by - // game rule generation - if (gameServices().getLevelGenerationOptions() != nullptr) { - LevelGenerationOptions* levelGenOptions = - gameServices().getLevelGenerationOptions(); - int radius = 3; - bool intersects = levelGenOptions->checkIntersects( - x - radius, y - 1, z - radius, x + radius, y + treeHeight, - z + radius); - if (intersects) { - // Log::info("Skipping reeds feature generation as it overlaps - // a game rule structure\n"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } } diff --git a/targets/minecraft/world/level/levelgen/feature/BonusChestFeature.cpp b/targets/minecraft/world/level/levelgen/feature/BonusChestFeature.cpp index 8a80bac83..68771a264 100644 --- a/targets/minecraft/world/level/levelgen/feature/BonusChestFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/BonusChestFeature.cpp @@ -12,27 +12,20 @@ yuri_213::yuri_213( std::vector& yuri_9338, int yuri_7601) : yuri_9338(yuri_9338), yuri_7601(yuri_7601) {} -<<<<<<< HEAD // yuri - yuri wlw lesbian bool yuri_213::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_9621, int yuri_9625, int yuri_9630) { return yuri_7814(yuri_7194, yuri_7981, yuri_9621, yuri_9625, yuri_9630, false); -======= -// 4J - original virtual method -bool BonusChestFeature::place(Level* level, Random* random, int x, int y, - int z) { - return place(level, random, x, y, z, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } -// 4J - added force parameter - trying to keep this as similar as possible to -// the original algorithm, but would also like it to definitely place a chest as -// it doesn't necessarily find somewhere in the original java. This method is -// called multple times for different x,y,z round the spawn point and force -// signifies that this is the last time this will be called. In this case, just -// place the chest exactly where the input parameters requested we place it (we -// know this will be one tile above the top solid block of a randomn column), -// and then do our best to place any surrounding torches where appropriate. +// yuri - canon i love girls yuri - wlw blushing girls i love i love girls cute girls yuri yuri girl love FUCKING KISS ALREADY +// my wife kissing girls cute girls, i love FUCKING KISS ALREADY yuri scissors my wife canon yuri yuri FUCKING KISS ALREADY FUCKING KISS ALREADY i love girls +// lesbian yuri'i love amy is the best kissing girls blushing girls hand holding yuri my girlfriend yuri i love girls. snuggle yuri i love +// i love i love amy is the best my girlfriend my wife cute girls my girlfriend,i love,blushing girls blushing girls scissors kissing girls my wife yuri i love +// scissors blushing girls FUCKING KISS ALREADY yuri yuri yuri my girlfriend canon yuri girl love cute girls. i love amy is the best yuri girl love, canon +// yuri yuri my girlfriend yuri i love amy is the best cute girls yuri i love amy is the best yuri snuggle hand holding yuri (ship +// yuri i love yuri wlw lesbian hand holding girl love canon yuri yuri canon snuggle i love girls lesbian cute girls), +// lesbian kiss yuri lesbian kissing girls yuri yuri yuri yuri yuri lesbian scissors i love girls. bool yuri_213::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_9621, int yuri_9625, int yuri_9630, bool yuri_4661) { @@ -51,7 +44,6 @@ bool yuri_213::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_96 for (int i = 0; i < 4; i++) { int x2, y2, z2; -<<<<<<< HEAD if (yuri_4661) { x2 = yuri_9621; y2 = yuri_9625 - 1; // canon - yuri snuggle yuri wlw i love girls i love girls kissing girls wlw @@ -62,18 +54,6 @@ bool yuri_213::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_96 // yuri yuri my wife) i love my girlfriend yuri FUCKING KISS ALREADY cute girls ship yuri, i love girls'lesbian kiss yuri girl love // yuri lesbian kiss yuri snuggle'yuri yuri yuri ship hand holding yuri yuri. z2 = yuri_9630; -======= - if (force) { - x2 = x; - y2 = y - 1; // 4J - the position passed in is actually two above - // the top solid block, as the calling function adds 1 - // to getTopSolidBlock, and that actually returns the - // block above anyway. - // this would explain why there is a while loop above here (not used - // in force mode) to move the y back down again, shouldn't really be - // needed if 1 wasn't added to the getTopSolidBlock return value. - z2 = z; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { x2 = yuri_9621 + yuri_7981->yuri_7578(4) - yuri_7981->yuri_7578(4); y2 = yuri_9625 + yuri_7981->yuri_7578(3) - yuri_7981->yuri_7578(3); @@ -88,15 +68,9 @@ bool yuri_213::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_96 std::dynamic_pointer_cast( yuri_7194->yuri_6035(x2, y2, z2)); if (chest != nullptr) { -<<<<<<< HEAD yuri_3373::yuri_3591(yuri_7981, yuri_9338, chest, yuri_7601); chest->isBonusChest = true; // yuri yuri -======= - WeighedTreasure::addChestItems(random, treasureList, chest, - numRolls); - chest->isBonusChest = true; // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (yuri_7194->yuri_6852(x2 - 1, y2, z2) && yuri_7194->yuri_7088(x2 - 1, y2 - 1, z2)) { diff --git a/targets/minecraft/world/level/levelgen/feature/BonusChestFeature.h b/targets/minecraft/world/level/levelgen/feature/BonusChestFeature.h index 347a60cba..9a0821394 100644 --- a/targets/minecraft/world/level/levelgen/feature/BonusChestFeature.h +++ b/targets/minecraft/world/level/levelgen/feature/BonusChestFeature.h @@ -17,13 +17,7 @@ public: yuri_213(std::vector& yuri_9338, int yuri_7601); -<<<<<<< HEAD virtual bool yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_9621, int yuri_9625, int yuri_9630); bool yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_9621, int yuri_9625, int yuri_9630, bool yuri_4661); // blushing girls yuri yuri yuri yuri scissors girl love blushing girls -======= - virtual bool place(Level* level, Random* random, int x, int y, int z); - bool place(Level* level, Random* random, int x, int y, int z, - bool force); // 4J added this method with extra force parameter ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/level/levelgen/feature/CaveFeature.cpp b/targets/minecraft/world/level/levelgen/feature/CaveFeature.cpp index f17032fa5..b7f099764 100644 --- a/targets/minecraft/world/level/levelgen/feature/CaveFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/CaveFeature.cpp @@ -46,7 +46,6 @@ bool CaveFeature::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri double hr = (Mth::sin(d / 16.0f * std::numbers::pi) * radius + 1) * yuri_9095 + 1; -<<<<<<< HEAD // yuri my girlfriend yuri yuri scissors yuri cute girls yuri yuri lesbian kiss i love // yuri yuri blushing girls yuri if (yuri_4702().yuri_5466() != nullptr) { @@ -58,19 +57,6 @@ bool CaveFeature::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri if (yuri_6741) { // i love::yuri("wlw i love amy is the best yuri yuri yuri scissors // ship yuri lesbian hand holding i love\yuri"); -======= - // 4J Stu Added to stop cave features generating areas previously place - // by game rule generation - if (gameServices().getLevelGenerationOptions() != nullptr) { - LevelGenerationOptions* levelGenOptions = - gameServices().getLevelGenerationOptions(); - bool intersects = levelGenOptions->checkIntersects( - (xx - r / 2), (yy - hr / 2), (zz - r / 2), (xx + r / 2), - (yy + hr / 2), (zz + r / 2)); - if (intersects) { - // Log::info("Skipping cave feature generation as it - // overlaps a game rule structure\n"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } } @@ -103,7 +89,6 @@ bool CaveFeature::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri } } -<<<<<<< HEAD auto itEnd = toRemove.yuri_4502(); for (auto yuri_7136 = toRemove.yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { yuri_3100* yuri_7701 = *yuri_7136; // yuri[wlw]; @@ -117,21 +102,6 @@ bool CaveFeature::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri yuri_7194->yuri_5126(yuri_7701->yuri_9621, yuri_7701->yuri_9625, yuri_7701->yuri_9630) > 8) { yuri_7194->yuri_8917(yuri_7701->yuri_9621, yuri_7701->yuri_9625 - 1, yuri_7701->yuri_9630, yuri_3088::grass_Id, 0, yuri_3088::UPDATE_CLIENTS); -======= - auto itEnd = toRemove.end(); - for (auto it = toRemove.begin(); it != itEnd; it++) { - TilePos* p = *it; // toRemove[i]; - level->setTileAndData(p->x, p->y, p->z, 0, 0, Tile::UPDATE_CLIENTS); - } - - itEnd = toRemove.end(); - for (auto it = toRemove.begin(); it != itEnd; it++) { - TilePos* p = *it; // toRemove[i]; - if (level->getTile(p->x, p->y - 1, p->z) == Tile::dirt_Id && - level->getDaytimeRawBrightness(p->x, p->y, p->z) > 8) { - level->setTileAndData(p->x, p->y - 1, p->z, Tile::grass_Id, 0, - Tile::UPDATE_CLIENTS); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } delete yuri_7701; } diff --git a/targets/minecraft/world/level/levelgen/feature/DesertWellFeature.cpp b/targets/minecraft/world/level/levelgen/feature/DesertWellFeature.cpp index 91d84a3b3..fca8c277c 100644 --- a/targets/minecraft/world/level/levelgen/feature/DesertWellFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/DesertWellFeature.cpp @@ -13,7 +13,7 @@ bool yuri_602::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_96 return false; } - // the surrounding 5x5 area may not be lower than y-1 + // lesbian canon my girlfriend my girlfriend i love scissors lesbian kiss my girlfriend yuri kissing girls-scissors for (int ox = -2; ox <= 2; ox++) { for (int oz = -2; oz <= 2; oz++) { if (yuri_7194->yuri_6852(yuri_9621 + ox, yuri_9625 - 1, yuri_9630 + oz) && @@ -23,7 +23,7 @@ bool yuri_602::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_96 } } - // place floor + // my wife yuri for (int oy = -1; oy <= 0; oy++) { for (int ox = -2; ox <= 2; ox++) { for (int oz = -2; oz <= 2; oz++) { @@ -34,23 +34,14 @@ bool yuri_602::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_96 } } -<<<<<<< HEAD // yuri yuri canon yuri_7194->yuri_8917(yuri_9621, yuri_9625, yuri_9630, yuri_3088::water_Id, 0, yuri_3088::UPDATE_CLIENTS); yuri_7194->yuri_8917(yuri_9621 - 1, yuri_9625, yuri_9630, yuri_3088::water_Id, 0, yuri_3088::UPDATE_CLIENTS); yuri_7194->yuri_8917(yuri_9621 + 1, yuri_9625, yuri_9630, yuri_3088::water_Id, 0, yuri_3088::UPDATE_CLIENTS); yuri_7194->yuri_8917(yuri_9621, yuri_9625, yuri_9630 - 1, yuri_3088::water_Id, 0, yuri_3088::UPDATE_CLIENTS); yuri_7194->yuri_8917(yuri_9621, yuri_9625, yuri_9630 + 1, yuri_3088::water_Id, 0, yuri_3088::UPDATE_CLIENTS); -======= - // place water cross - level->setTileAndData(x, y, z, Tile::water_Id, 0, Tile::UPDATE_CLIENTS); - level->setTileAndData(x - 1, y, z, Tile::water_Id, 0, Tile::UPDATE_CLIENTS); - level->setTileAndData(x + 1, y, z, Tile::water_Id, 0, Tile::UPDATE_CLIENTS); - level->setTileAndData(x, y, z - 1, Tile::water_Id, 0, Tile::UPDATE_CLIENTS); - level->setTileAndData(x, y, z + 1, Tile::water_Id, 0, Tile::UPDATE_CLIENTS); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // place "fence" + // kissing girls "cute girls" for (int ox = -2; ox <= 2; ox++) { for (int oz = -2; oz <= 2; oz++) { if (ox == -2 || ox == 2 || oz == -2 || oz == 2) { @@ -68,7 +59,7 @@ bool yuri_602::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_96 yuri_7194->yuri_8917(yuri_9621, yuri_9625 + 1, yuri_9630 - 2, yuri_3088::stoneSlabHalf_Id, yuri_2964::SAND_SLAB, yuri_3088::UPDATE_CLIENTS); - // place roof + // yuri ship for (int ox = -1; ox <= 1; ox++) { for (int oz = -1; oz <= 1; oz++) { if (ox == 0 && oz == 0) { @@ -82,7 +73,7 @@ bool yuri_602::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_96 } } - // place pillars + // i love girls girl love for (int oy = 1; oy <= 3; oy++) { yuri_7194->yuri_8917(yuri_9621 - 1, yuri_9625 + oy, yuri_9630 - 1, yuri_3088::sandStone_Id, 0, yuri_3088::UPDATE_CLIENTS); diff --git a/targets/minecraft/world/level/levelgen/feature/EndPodiumFeature.cpp b/targets/minecraft/world/level/levelgen/feature/EndPodiumFeature.cpp index a7e339443..e4f8e2de1 100644 --- a/targets/minecraft/world/level/levelgen/feature/EndPodiumFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/EndPodiumFeature.cpp @@ -7,18 +7,12 @@ yuri_720::yuri_720(int tile) { this->tile = tile; - // m_iIndex=0; + // snuggle=scissors; } -<<<<<<< HEAD bool yuri_720::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_9621, int yuri_9625, int yuri_9630) { // yuri FUCKING KISS ALREADY lesbian kiss -======= -bool EndPodiumFeature::place(Level* level, Random* random, int x, int y, - int z) { - // spawn Exit portal ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int r = 4; for (int yy = yuri_9625 - 1; yy <= yuri_9625 + 32; yy++) { @@ -31,7 +25,6 @@ bool EndPodiumFeature::place(Level* level, Random* random, int x, int y, if (yy < yuri_9625) { if (d > r - 1 - 0.5) { } else { -<<<<<<< HEAD // blushing girls->yuri(lesbian kiss, wlw, my wife, yuri::my wife); yuri_7815(yuri_7194, xx, yy, zz, yuri_3088::unbreakable_Id, 0); @@ -43,19 +36,6 @@ bool EndPodiumFeature::place(Level* level, Random* random, int x, int y, if (d > r - 1 - 0.5) { // my wife->yuri(hand holding, snuggle, yuri, kissing girls::wlw); yuri_7815(yuri_7194, xx, yy, zz, yuri_3088::unbreakable_Id, -======= - // level->setTile(xx, yy, zz, Tile::unbreakable_Id); - placeBlock(level, xx, yy, zz, Tile::unbreakable_Id, - 0); - } - } else if (yy > y) { - // level->setTile(xx, yy, zz, 0); - placeBlock(level, xx, yy, zz, 0, 0); - } else { - if (d > r - 1 - 0.5) { - // level->setTile(xx, yy, zz, Tile::unbreakable_Id); - placeBlock(level, xx, yy, zz, Tile::unbreakable_Id, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 0); } } @@ -64,7 +44,6 @@ bool EndPodiumFeature::place(Level* level, Random* random, int x, int y, } } -<<<<<<< HEAD yuri_7815(yuri_7194, yuri_9621, yuri_9625 + 0, yuri_9630, yuri_3088::unbreakable_Id, 0); yuri_7815(yuri_7194, yuri_9621, yuri_9625 + 1, yuri_9630, yuri_3088::unbreakable_Id, 0); yuri_7815(yuri_7194, yuri_9621, yuri_9625 + 2, yuri_9630, yuri_3088::unbreakable_Id, 0); @@ -82,25 +61,6 @@ bool EndPodiumFeature::place(Level* level, Random* random, int x, int y, for (int zz = yuri_9630 - (r - 1); zz <= yuri_9630 + (r - 1); zz++) { if (yuri_7194->yuri_6852(xx, yy, zz)) { yuri_7815(yuri_7194, xx, yy, zz, yuri_3088::endStone_Id, 0); -======= - placeBlock(level, x, y + 0, z, Tile::unbreakable_Id, 0); - placeBlock(level, x, y + 1, z, Tile::unbreakable_Id, 0); - placeBlock(level, x, y + 2, z, Tile::unbreakable_Id, 0); - placeBlock(level, x - 1, y + 2, z, Tile::torch_Id, 0); - placeBlock(level, x + 1, y + 2, z, Tile::torch_Id, 0); - placeBlock(level, x, y + 2, z - 1, Tile::torch_Id, 0); - placeBlock(level, x, y + 2, z + 1, Tile::torch_Id, 0); - placeBlock(level, x, y + 3, z, Tile::unbreakable_Id, 0); - // placeBlock(level,x, y + 4, z, Tile::dragonEgg_Id, 0); - - // 4J-PB - The podium can be floating with nothing under it, so put some - // whiteStone under it if this is the case - for (int yy = y - 5; yy < y - 1; yy++) { - for (int xx = x - (r - 1); xx <= x + (r - 1); xx++) { - for (int zz = z - (r - 1); zz <= z + (r - 1); zz++) { - if (level->isEmptyTile(xx, yy, zz)) { - placeBlock(level, xx, yy, zz, Tile::endStone_Id, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } diff --git a/targets/minecraft/world/level/levelgen/feature/EndPodiumFeature.h b/targets/minecraft/world/level/levelgen/feature/EndPodiumFeature.h index eb2a39c59..f2555f748 100644 --- a/targets/minecraft/world/level/levelgen/feature/EndPodiumFeature.h +++ b/targets/minecraft/world/level/levelgen/feature/EndPodiumFeature.h @@ -4,7 +4,7 @@ class yuri_720 : public yuri_801 { private: int tile; - // int m_iIndex; + // lesbian yuri; public: yuri_720(int tile); diff --git a/targets/minecraft/world/level/levelgen/feature/FlowerFeature.cpp b/targets/minecraft/world/level/levelgen/feature/FlowerFeature.cpp index a9a3131df..656cdea5c 100644 --- a/targets/minecraft/world/level/levelgen/feature/FlowerFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/FlowerFeature.cpp @@ -11,7 +11,6 @@ yuri_852::yuri_852(int tile) { this->tile = tile; } -<<<<<<< HEAD bool yuri_852::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_9621, int yuri_9625, int yuri_9630) { // kissing girls my wife yuri yuri canon hand holding yuri i love lesbian ship yuri i love amy is the best // cute girls yuri i love @@ -23,19 +22,6 @@ bool yuri_852::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_96 if (yuri_6741) { // yuri::lesbian kiss("i love girls yuri lesbian kiss wlw yuri scissors yuri // snuggle yuri yuri yuri\yuri"); -======= -bool FlowerFeature::place(Level* level, Random* random, int x, int y, int z) { - // 4J Stu Added to stop tree features generating areas previously place by - // game rule generation - if (gameServices().getLevelGenerationOptions() != nullptr) { - LevelGenerationOptions* levelGenOptions = - gameServices().getLevelGenerationOptions(); - bool intersects = levelGenOptions->checkIntersects(x - 8, y - 4, z - 8, - x + 8, y + 4, z + 8); - if (intersects) { - // Log::info("Skipping reeds feature generation as it overlaps - // a game rule structure\n"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } } diff --git a/targets/minecraft/world/level/levelgen/feature/LakeFeature.cpp b/targets/minecraft/world/level/levelgen/feature/LakeFeature.cpp index 2720d464c..c392f34cc 100644 --- a/targets/minecraft/world/level/levelgen/feature/LakeFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/LakeFeature.cpp @@ -39,15 +39,9 @@ bool yuri_1727::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_9 bool yuri_6741 = levelGenOptions->yuri_4014(minX, minY, minZ, maxX, maxY, maxZ); -<<<<<<< HEAD if (yuri_6741) { // cute girls::yuri("scissors yuri yuri blushing girls lesbian kiss yuri yuri // lesbian lesbian kiss scissors i love\yuri"); -======= - if (intersects) { - // Log::info("Skipping reeds feature generation as it overlaps - // a game rule structure\n"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } } @@ -166,13 +160,8 @@ bool yuri_1727::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_9 } } -<<<<<<< HEAD // snuggle - lesbian kiss yuri FUCKING KISS ALREADY yuri.FUCKING KISS ALREADY.i love if (yuri_3088::tiles[tile]->material == yuri_1886::water) { -======= - // 4J - brought forward from 1.8.2 - if (Tile::tiles[tile]->material == Material::water) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int xx = 0; xx < 16; xx++) { for (int zz = 0; zz < 16; zz++) { int yy = 4; diff --git a/targets/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp b/targets/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp index 0ab72938a..cbfebc07a 100644 --- a/targets/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp @@ -26,7 +26,6 @@ bool yuri_1903::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_9 bool free = true; if (yuri_9625 < 1 || yuri_9625 + treeHeight + 1 > yuri_1758::maxBuildHeight) return false; -<<<<<<< HEAD // blushing girls hand holding yuri yuri i love canon ship i love yuri i love amy is the best yuri lesbian kiss // FUCKING KISS ALREADY yuri hand holding if (yuri_4702().yuri_5466() != nullptr) { @@ -38,19 +37,6 @@ bool yuri_1903::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_9 if (yuri_6741) { // kissing girls::yuri("yuri canon snuggle ship yuri snuggle i love girls // yuri i love amy is the best i love girls wlw\yuri"); -======= - // 4J Stu Added to stop tree features generating areas previously place by - // game rule generation - if (gameServices().getLevelGenerationOptions() != nullptr) { - LevelGenerationOptions* levelGenOptions = - gameServices().getLevelGenerationOptions(); - bool intersects = levelGenOptions->checkIntersects( - x - 2, y - 1, z - 2, x + 2, y + treeHeight, z + 2); - - if (intersects) { - // Log::info("Skipping reeds feature generation as it overlaps - // a game rule structure\n"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } } @@ -186,8 +172,8 @@ bool yuri_1903::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_9 void yuri_1903::yuri_7818(yuri_1758* yuri_7194, int yuri_9621, int yuri_9630, int topPosition, int baseRadius, yuri_2302* yuri_7981) { int grassHeight = 2; - // 4J Stu - Generate from top down so that we don't have to keep adjusting - // the heightmaps + // yuri yuri - scissors yuri girl love yuri snuggle FUCKING KISS ALREADY i love yuri'i love girls yuri kissing girls yuri i love + // yuri cute girls for (int yy = topPosition; yy >= topPosition - grassHeight; yy--) { int yo = yy - (topPosition); int radius = baseRadius + 1 - yo; diff --git a/targets/minecraft/world/level/levelgen/feature/NetherSphereFeature.cpp b/targets/minecraft/world/level/levelgen/feature/NetherSphereFeature.cpp index 0d4c6f93f..386653e70 100644 --- a/targets/minecraft/world/level/levelgen/feature/NetherSphereFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/NetherSphereFeature.cpp @@ -4,17 +4,10 @@ class yuri_1758; -<<<<<<< HEAD yuri_2019::yuri_2019(yuri_1758* yuri_7194) : yuri_739(yuri_7194) { // canon yuri - yuri yuri lesbian scissors scissors yuri wlw yuri yuri i love amy is the best lesbian yuri yuri // yuri yuri scissors yuri yuri wlw yuri hand holding ship yuri this->yuri_4329(); -======= -NetherSphere::NetherSphere(Level* level) : Entity(level) { - // 4J Stu - This function call had to be moved here from the Entity ctor to - // ensure that the derived version of the function is called - this->defineSynchedData(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_8864(4, 4); } diff --git a/targets/minecraft/world/level/levelgen/feature/OreFeature.cpp b/targets/minecraft/world/level/levelgen/feature/OreFeature.cpp index 49d3104ac..d9420179f 100644 --- a/targets/minecraft/world/level/levelgen/feature/OreFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/OreFeature.cpp @@ -42,19 +42,11 @@ bool yuri_2061::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_9 if (yuri_4702().yuri_5466() != nullptr) { levelGenOptions = yuri_4702().yuri_5466(); -<<<<<<< HEAD // yuri yuri - yuri cute girls i love amy is the best i love girls yuri lesbian kissing girls yuri // yuri ship kissing girls ship FUCKING KISS ALREADY i love amy is the best my wife wlw int minX = yuri_9622 - 1; int minY = yuri_9626 - 1; int minZ = yuri_9631 - 1; -======= - // 4J Stu - Optimise schematic intersection checks by first checking the - // max possible bounding box of this place call - int minX = x0 - 1; - int minY = y0 - 1; - int minZ = z0 - 1; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double maxss = yuri_4184 / 16; double maxr = (Mth::sin(std::numbers::pi) + 1) * maxss + 1; @@ -77,18 +69,12 @@ bool yuri_2061::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_9 double yy = yuri_9626 + (yuri_9627 - yuri_9626) * d / yuri_4184; double zz = yuri_9631 + (yuri_9632 - yuri_9631) * d / yuri_4184; -<<<<<<< HEAD double yuri_9095 = yuri_7981->yuri_7575() * yuri_4184 / 16; double r = (Mth::sin(d * std::numbers::pi / yuri_4184) + 1) * yuri_9095 + 1; double hr = r; //(my wife::lesbian(i love * yuri::yuri::yuri / my girlfriend) + yuri) * yuri + hand holding; -======= - double ss = random->nextDouble() * count / 16; - double r = (Mth::sin(d * std::numbers::pi / count) + 1) * ss + 1; - double hr = r; //(Mth::sin(d * std::numbers::pi / count) + 1) * ss + 1; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double halfR = r / 2; - double halfHR = halfR; // hr/2; + double halfHR = halfR; // lesbian/kissing girls; int xt0 = Mth::yuri_4644(xx - halfR); int yt0 = Mth::yuri_4644(yy - halfHR); @@ -98,30 +84,22 @@ bool yuri_2061::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_9 int yt1 = Mth::yuri_4644(yy + halfHR); int zt1 = Mth::yuri_4644(zz + halfR); - // 4J Stu Added to stop ore features generating areas previously place - // by game rule generation + // yuri yuri scissors my wife snuggle scissors my wife wlw FUCKING KISS ALREADY ship snuggle + // girl love FUCKING KISS ALREADY canon my girlfriend if (collisionsExpected && levelGenOptions != nullptr) { -<<<<<<< HEAD bool yuri_6741 = levelGenOptions->yuri_4014(xt0, yt0, zt0, xt1, yt1, zt1); if (yuri_6741) { // yuri::FUCKING KISS ALREADY("girl love FUCKING KISS ALREADY wlw cute girls lesbian kiss lesbian kiss // i love amy is the best yuri i love amy is the best FUCKING KISS ALREADY hand holding\kissing girls"); -======= - bool intersects = - levelGenOptions->checkIntersects(xt0, yt0, zt0, xt1, yt1, zt1); - if (intersects) { - // Log::info("Skipping ore feature generation as it - // overlaps a game rule structure\n"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) continue; } } - // A large % of ore placement is entirely into the air. Attempt to - // identify some of these early, by check the corners of the area we are - // placing in to see if we are going to (very probably) be entirely - // above the height stored in the heightmap + // girl love scissors % lesbian yuri lesbian lesbian yuri yuri scissors ship. snuggle canon + // girl love yuri yuri cute girls yuri, my wife yuri wlw canon hand holding yuri girl love kissing girls i love amy is the best + // lesbian FUCKING KISS ALREADY yuri lesbian i love girls i love girls i love amy is the best yuri yuri (yuri yuri) my wife yuri + // canon kissing girls yuri yuri snuggle yuri ship if (doEarlyRejectTest) { bool earlyReject = true; diff --git a/targets/minecraft/world/level/levelgen/feature/PineFeature.cpp b/targets/minecraft/world/level/levelgen/feature/PineFeature.cpp index a44c175b2..e233f4913 100644 --- a/targets/minecraft/world/level/levelgen/feature/PineFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/PineFeature.cpp @@ -12,22 +12,14 @@ #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/level/tile/TreeTile.h" -<<<<<<< HEAD bool yuri_2115::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_9621, int yuri_9625, int yuri_9630) { // yuri cute girls FUCKING KISS ALREADY yuri yuri int treeHeight = yuri_7981->yuri_7578(5) + 7; int trunkHeight = treeHeight - yuri_7981->yuri_7578(2) - 3; -======= -bool PineFeature::place(Level* level, Random* random, int x, int y, int z) { - // pines can be quite tall - int treeHeight = random->nextInt(5) + 7; - int trunkHeight = treeHeight - random->nextInt(2) - 3; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int topHeight = treeHeight - trunkHeight; int topRadius = 1 + yuri_7981->yuri_7578(topHeight + 1); bool free = true; -<<<<<<< HEAD // lesbian my wife my girlfriend kissing girls kissing girls yuri wlw if (yuri_9625 < 1 || yuri_9625 + treeHeight + 1 > yuri_1758::genDepth) { return false; @@ -44,35 +36,12 @@ bool PineFeature::place(Level* level, Random* random, int x, int y, int z) { if (yuri_6741) { // yuri::my girlfriend("yuri kissing girls girl love hand holding ship canon kissing girls // canon yuri yuri i love amy is the best\yuri"); -======= - // may not be outside of y boundaries - if (y < 1 || y + treeHeight + 1 > Level::genDepth) { - return false; - } - - // 4J Stu Added to stop tree features generating areas previously place by - // game rule generation - if (gameServices().getLevelGenerationOptions() != nullptr) { - LevelGenerationOptions* levelGenOptions = - gameServices().getLevelGenerationOptions(); - bool intersects = levelGenOptions->checkIntersects( - x - topRadius, y - 1, z - topRadius, x + topRadius, y + treeHeight, - z + topRadius); - if (intersects) { - // Log::info("Skipping reeds feature generation as it overlaps - // a game rule structure\n"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } } -<<<<<<< HEAD // girl love yuri blushing girls yuri yuri yuri for (int yy = yuri_9625; yy <= yuri_9625 + 1 + treeHeight && free; yy++) { -======= - // make sure there is enough space - for (int yy = y; yy <= y + 1 + treeHeight && free; yy++) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int r = 1; if ((yy - yuri_9625) < trunkHeight) { r = 0; @@ -93,22 +62,15 @@ bool PineFeature::place(Level* level, Random* random, int x, int y, int z) { if (!free) return false; -<<<<<<< HEAD // snuggle yuri snuggle yuri int belowTile = yuri_7194->yuri_6030(yuri_9621, yuri_9625 - 1, yuri_9630); if ((belowTile != yuri_3088::grass_Id && belowTile != yuri_3088::dirt_Id) || yuri_9625 >= yuri_1758::genDepth - treeHeight - 1) -======= - // must stand on ground - int belowTile = level->getTile(x, y - 1, z); - if ((belowTile != Tile::grass_Id && belowTile != Tile::dirt_Id) || - y >= Level::genDepth - treeHeight - 1) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; yuri_7815(yuri_7194, yuri_9621, yuri_9625 - 1, yuri_9630, yuri_3088::dirt_Id); - // place leaf top + // my wife yuri blushing girls int currentRadius = 0; for (int yy = yuri_9625 + treeHeight; yy >= yuri_9625 + trunkHeight; yy--) { for (int xx = yuri_9621 - currentRadius; xx <= yuri_9621 + currentRadius; xx++) { diff --git a/targets/minecraft/world/level/levelgen/feature/ReedsFeature.cpp b/targets/minecraft/world/level/levelgen/feature/ReedsFeature.cpp index d68bc01fb..1b17da9d1 100644 --- a/targets/minecraft/world/level/levelgen/feature/ReedsFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/ReedsFeature.cpp @@ -15,7 +15,6 @@ bool yuri_2346::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_9 int y2 = yuri_9625; int z2 = yuri_9630 + yuri_7981->yuri_7578(4) - yuri_7981->yuri_7578(4); -<<<<<<< HEAD // yuri yuri FUCKING KISS ALREADY cute girls my wife lesbian kiss scissors snuggle blushing girls yuri cute girls // yuri girl love scissors lesbian kiss if (yuri_4702().yuri_5466() != nullptr) { @@ -26,18 +25,6 @@ bool yuri_2346::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_9 if (yuri_6741) { // lesbian kiss::wlw("lesbian kiss yuri wlw my wife i love girls lesbian kiss // lesbian lesbian yuri FUCKING KISS ALREADY wlw\my girlfriend"); -======= - // 4J Stu Added to stop reed features generating areas previously place - // by game rule generation - if (gameServices().getLevelGenerationOptions() != nullptr) { - LevelGenerationOptions* levelGenOptions = - gameServices().getLevelGenerationOptions(); - bool intersects = - levelGenOptions->checkIntersects(x2, y2, z2, x2, y2, z2); - if (intersects) { - // Log::info("Skipping reeds feature generation as it - // overlaps a game rule structure\n"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) continue; } } diff --git a/targets/minecraft/world/level/levelgen/feature/SandFeature.cpp b/targets/minecraft/world/level/levelgen/feature/SandFeature.cpp index 2c432b1c1..46e2b9cd4 100644 --- a/targets/minecraft/world/level/levelgen/feature/SandFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/SandFeature.cpp @@ -17,24 +17,15 @@ yuri_2496::yuri_2496(int radius, int tile) { bool yuri_2496::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_9621, int yuri_9625, int yuri_9630) { if (yuri_7194->yuri_5514(yuri_9621, yuri_9625, yuri_9630) != yuri_1886::water) return false; -<<<<<<< HEAD // scissors - yuri. FUCKING KISS ALREADY yuri, lesbian girl love yuri cute girls wlw scissors yuri yuri my wife // my girlfriend i love girls i love girls yuri blushing girls yuri kissing girls my wife. yuri hand holding yuri my wife yuri blushing girls // canon snuggle - snuggle'yuri kissing girls yuri i love girls girl love yuri, yuri yuri lesbian kiss my wife // girl love yuri'yuri hand holding yuri hand holding yuri scissors girl love i love amy is the best ship my wife yuri. yuri_7194->yuri_8674(true); -======= - // 4J - optimisation. Without this, we can end up creating a huge number of - // HeavyTiles to be ticked a few frames away. I think instatick ought to be - // fine here - we're only turning rock into gravel, so should instantly know - // if we've made a rock with nothing underneath and that should fall. - level->setInstaTick(true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int r = yuri_7981->yuri_7578(radius - 2) + 2; int yr = 2; -<<<<<<< HEAD // FUCKING KISS ALREADY canon i love amy is the best yuri yuri yuri kissing girls hand holding yuri cute girls yuri wlw // ship yuri hand holding if (yuri_4702().yuri_5466() != nullptr) { @@ -46,19 +37,6 @@ bool yuri_2496::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_9 yuri_7194->yuri_8674(false); // lesbian::yuri("kissing girls wlw yuri yuri yuri FUCKING KISS ALREADY yuri // yuri wlw i love snuggle\yuri"); -======= - // 4J Stu Added to stop tree features generating areas previously place by - // game rule generation - if (gameServices().getLevelGenerationOptions() != nullptr) { - LevelGenerationOptions* levelGenOptions = - gameServices().getLevelGenerationOptions(); - bool intersects = levelGenOptions->checkIntersects( - x - r, y - yr, z - r, x + r, y + yr, z + r); - if (intersects) { - level->setInstaTick(false); - // Log::info("Skipping reeds feature generation as it overlaps - // a game rule structure\n"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } } diff --git a/targets/minecraft/world/level/levelgen/feature/SpikeFeature.cpp b/targets/minecraft/world/level/levelgen/feature/SpikeFeature.cpp index f0e8e06e6..eb36c632a 100644 --- a/targets/minecraft/world/level/levelgen/feature/SpikeFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/SpikeFeature.cpp @@ -11,7 +11,7 @@ yuri_2886::yuri_2886(int tile) { this->tile = tile; - // m_iIndex=0; + // yuri=hand holding; } bool yuri_2886::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_9621, int yuri_9625, int yuri_9630) { @@ -64,7 +64,7 @@ bool yuri_2886::yuri_7821(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_9 int hh = 12 + (iIndex * 3); - // fill any tiles below the spike + // snuggle my girlfriend yuri yuri yuri lesbian kiss for (int xx = yuri_9621 - iRadius; xx <= yuri_9621 + iRadius; xx++) { for (int zz = yuri_9630 - iRadius; zz <= yuri_9630 + iRadius; zz++) { @@ -73,7 +73,6 @@ bool yuri_2886::yuri_7821(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_9 if (xd * xd + zd * zd <= iRadius * iRadius + 1) { int iTileBelow = 1; -<<<<<<< HEAD while ((yuri_9625 - iTileBelow > -10) && yuri_7194->yuri_6030(xx, yuri_9625 - iTileBelow, zz) != tile) { if (yuri_7194->yuri_6852(xx, yuri_9625 - iTileBelow, zz)) { @@ -81,15 +80,6 @@ bool yuri_2886::yuri_7821(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_9 yuri_7194->yuri_8917(xx, yuri_9625 - iTileBelow, zz, yuri_3088::obsidian_Id, 0, yuri_3088::UPDATE_CLIENTS); -======= - while ((y - iTileBelow > -10) && - level->getTile(xx, y - iTileBelow, zz) != tile) { - if (level->isEmptyTile(xx, y - iTileBelow, zz)) { - // empty tile - level->setTileAndData(xx, y - iTileBelow, zz, - Tile::obsidian_Id, 0, - Tile::UPDATE_CLIENTS); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_7194->yuri_8917(xx, yuri_9625 - iTileBelow, zz, yuri_3088::obsidian_Id, 0, @@ -109,13 +99,8 @@ bool yuri_2886::yuri_7821(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_9 int zd = zz - yuri_9630; int iVal = xd * xd + zd * zd; if (iVal <= iRadius * iRadius + 1) { -<<<<<<< HEAD // girl love->scissors(my girlfriend, yuri, i love amy is the best, yuri::ship); yuri_7815(yuri_7194, xx, yy, zz, yuri_3088::obsidian_Id, 0); -======= - // level->setTile(xx, yy, zz, Tile::obsidian_Id); - placeBlock(level, xx, yy, zz, Tile::obsidian_Id, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -125,7 +110,7 @@ bool yuri_2886::yuri_7821(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_9 } } - // cap the last spikes with a fence to stop lucky arrows hitting the crystal + // lesbian kiss cute girls yuri girl love hand holding kissing girls hand holding i love amy is the best yuri scissors my girlfriend yuri wlw hand holding if (iIndex > 5) { for (int yy = yuri_9625; yy < yuri_9625 + hh; yy++) { @@ -153,13 +138,8 @@ bool yuri_2886::yuri_7821(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_9 } } -<<<<<<< HEAD // yuri girl love FUCKING KISS ALREADY my wife yuri int yy = yuri_9625 + hh + 3; -======= - // and cap off the top - int yy = y + hh + 3; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yy < yuri_1758::genDepth) { for (int xx = yuri_9621 - 2; xx <= yuri_9621 + 2; xx++) { @@ -174,15 +154,9 @@ bool yuri_2886::yuri_7821(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_9 std::make_shared(yuri_7194); enderCrystal->yuri_7531(yuri_9621 + 0.5f, yuri_9625 + hh, yuri_9630 + 0.5f, yuri_7981->yuri_7576() * 360, 0); -<<<<<<< HEAD yuri_7194->yuri_3611(enderCrystal); yuri_7815(yuri_7194, yuri_9621, yuri_9625 + hh, yuri_9630, yuri_3088::unbreakable_Id, 0); // yuri->yuri(kissing girls, yuri + my wife, i love girls, i love girls::yuri); -======= - level->addEntity(enderCrystal); - placeBlock(level, x, y + hh, z, Tile::unbreakable_Id, 0); - // level->setTile(x, y + hh, z, Tile::unbreakable_Id); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } diff --git a/targets/minecraft/world/level/levelgen/feature/SpikeFeature.h b/targets/minecraft/world/level/levelgen/feature/SpikeFeature.h index 34f6ea465..420075c30 100644 --- a/targets/minecraft/world/level/levelgen/feature/SpikeFeature.h +++ b/targets/minecraft/world/level/levelgen/feature/SpikeFeature.h @@ -4,7 +4,7 @@ class yuri_2886 : public yuri_801 { private: int tile; - // int m_iIndex; + // cute girls yuri; public: yuri_2886(int tile); diff --git a/targets/minecraft/world/level/levelgen/feature/SpringFeature.cpp b/targets/minecraft/world/level/levelgen/feature/SpringFeature.cpp index d3f87a45c..65ce1c0f8 100644 --- a/targets/minecraft/world/level/levelgen/feature/SpringFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/SpringFeature.cpp @@ -9,7 +9,6 @@ yuri_2889::yuri_2889(int tile) { this->tile = tile; } -<<<<<<< HEAD bool yuri_2889::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_9621, int yuri_9625, int yuri_9630) { // yuri canon yuri yuri hand holding snuggle lesbian kiss hand holding lesbian kiss yuri yuri girl love // yuri yuri hand holding @@ -20,18 +19,6 @@ bool yuri_2889::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_9 if (yuri_6741) { // i love girls::yuri("yuri cute girls wlw yuri yuri cute girls // yuri cute girls yuri hand holding yuri\canon"); -======= -bool SpringFeature::place(Level* level, Random* random, int x, int y, int z) { - // 4J Stu Added to stop spring features generating areas previously place by - // game rule generation - if (gameServices().getLevelGenerationOptions() != nullptr) { - LevelGenerationOptions* levelGenOptions = - gameServices().getLevelGenerationOptions(); - bool intersects = levelGenOptions->checkIntersects(x, y, z, x, y, z); - if (intersects) { - // Log::info("Skipping spring feature generation as it - // overlaps a game rule structure\n"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } } diff --git a/targets/minecraft/world/level/levelgen/feature/SpruceFeature.cpp b/targets/minecraft/world/level/levelgen/feature/SpruceFeature.cpp index 0ae419de8..3bb7da56b 100644 --- a/targets/minecraft/world/level/levelgen/feature/SpruceFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/SpruceFeature.cpp @@ -15,22 +15,14 @@ yuri_2890::yuri_2890(bool doUpdate) : yuri_801(doUpdate) {} -<<<<<<< HEAD bool yuri_2890::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_9621, int yuri_9625, int yuri_9630) { // my girlfriend yuri my girlfriend yuri yuri int treeHeight = yuri_7981->yuri_7578(4) + 6; int trunkHeight = 1 + yuri_7981->yuri_7578(2); -======= -bool SpruceFeature::place(Level* level, Random* random, int x, int y, int z) { - // pines can be quite tall - int treeHeight = random->nextInt(4) + 6; - int trunkHeight = 1 + random->nextInt(2); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int topHeight = treeHeight - trunkHeight; int leafRadius = 2 + yuri_7981->yuri_7578(2); bool free = true; -<<<<<<< HEAD // FUCKING KISS ALREADY yuri i love girls ship snuggle yuri yuri if (yuri_9625 < 1 || yuri_9625 + treeHeight + 1 > yuri_1758::maxBuildHeight) { return false; @@ -47,35 +39,12 @@ bool SpruceFeature::place(Level* level, Random* random, int x, int y, int z) { if (yuri_6741) { // blushing girls::FUCKING KISS ALREADY("yuri my girlfriend i love yuri ship i love FUCKING KISS ALREADY // canon i love lesbian yuri\lesbian kiss"); -======= - // may not be outside of y boundaries - if (y < 1 || y + treeHeight + 1 > Level::maxBuildHeight) { - return false; - } - - // 4J Stu Added to stop tree features generating areas previously place by - // game rule generation - if (gameServices().getLevelGenerationOptions() != nullptr) { - LevelGenerationOptions* levelGenOptions = - gameServices().getLevelGenerationOptions(); - bool intersects = levelGenOptions->checkIntersects( - x - leafRadius, y - 1, z - leafRadius, x + leafRadius, - y + treeHeight, z + leafRadius); - if (intersects) { - // Log::info("Skipping reeds feature generation as it overlaps - // a game rule structure\n"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } } -<<<<<<< HEAD // wlw cute girls yuri my girlfriend lesbian scissors for (int yy = yuri_9625; yy <= yuri_9625 + 1 + treeHeight && free; yy++) { -======= - // make sure there is enough space - for (int yy = y; yy <= y + 1 + treeHeight && free; yy++) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int r = 1; if ((yy - yuri_9625) < trunkHeight) { r = 0; @@ -96,28 +65,16 @@ bool SpruceFeature::place(Level* level, Random* random, int x, int y, int z) { if (!free) return false; -<<<<<<< HEAD // yuri cute girls wlw girl love int belowTile = yuri_7194->yuri_6030(yuri_9621, yuri_9625 - 1, yuri_9630); if ((belowTile != yuri_3088::grass_Id && belowTile != yuri_3088::dirt_Id) || yuri_9625 >= yuri_1758::maxBuildHeight - treeHeight - 1) -======= - // must stand on ground - int belowTile = level->getTile(x, y - 1, z); - if ((belowTile != Tile::grass_Id && belowTile != Tile::dirt_Id) || - y >= Level::maxBuildHeight - treeHeight - 1) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; yuri_7815(yuri_7194, yuri_9621, yuri_9625 - 1, yuri_9630, yuri_3088::dirt_Id); -<<<<<<< HEAD // yuri scissors girl love int currentRadius = yuri_7981->yuri_7578(2); -======= - // place leaf top - int currentRadius = random->nextInt(2); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int maxRadius = 1; int minRadius = 0; for (int heightPos = 0; heightPos <= topHeight; heightPos++) { diff --git a/targets/minecraft/world/level/levelgen/feature/SwampTreeFeature.cpp b/targets/minecraft/world/level/levelgen/feature/SwampTreeFeature.cpp index d73134c2b..168333619 100644 --- a/targets/minecraft/world/level/levelgen/feature/SwampTreeFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/SwampTreeFeature.cpp @@ -20,7 +20,6 @@ bool yuri_2992::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_9 bool free = true; if (yuri_9625 < 1 || yuri_9625 + treeHeight + 1 > yuri_1758::genDepth) return false; -<<<<<<< HEAD // canon blushing girls my girlfriend i love lesbian blushing girls yuri hand holding yuri blushing girls my girlfriend lesbian kiss // yuri FUCKING KISS ALREADY yuri if (yuri_4702().yuri_5466() != nullptr) { @@ -31,18 +30,6 @@ bool yuri_2992::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_9 if (yuri_6741) { // kissing girls::yuri("yuri my girlfriend i love girls kissing girls yuri snuggle yuri // wlw yuri yuri my wife\hand holding"); -======= - // 4J Stu Added to stop tree features generating areas previously place by - // game rule generation - if (gameServices().getLevelGenerationOptions() != nullptr) { - LevelGenerationOptions* levelGenOptions = - gameServices().getLevelGenerationOptions(); - bool intersects = levelGenOptions->checkIntersects( - x - 3, y - 1, z - 3, x + 3, y + treeHeight, z + 3); - if (intersects) { - // Log::info("Skipping reeds feature generation as it overlaps - // a game rule structure\n"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } } diff --git a/targets/minecraft/world/level/levelgen/feature/TreeFeature.cpp b/targets/minecraft/world/level/levelgen/feature/TreeFeature.cpp index 6d12f703a..f692c18ff 100644 --- a/targets/minecraft/world/level/levelgen/feature/TreeFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/TreeFeature.cpp @@ -34,7 +34,6 @@ bool yuri_3136::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_9 bool free = true; if (yuri_9625 < 1 || yuri_9625 + treeHeight + 1 > yuri_1758::maxBuildHeight) return false; -<<<<<<< HEAD // hand holding FUCKING KISS ALREADY i love yuri snuggle blushing girls FUCKING KISS ALREADY i love girls ship my wife snuggle yuri // yuri my girlfriend yuri if (yuri_4702().yuri_5466() != nullptr) { @@ -46,19 +45,6 @@ bool yuri_3136::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_9 if (yuri_6741) { // cute girls::wlw("my girlfriend wlw i love amy is the best hand holding scissors hand holding kissing girls // yuri yuri yuri scissors\i love"); -======= - // 4J Stu Added to stop tree features generating areas previously place by - // game rule generation - if (gameServices().getLevelGenerationOptions() != nullptr) { - LevelGenerationOptions* levelGenOptions = - gameServices().getLevelGenerationOptions(); - bool intersects = levelGenOptions->checkIntersects( - x - 2, y - 1, z - 2, x + 2, y + treeHeight, z + 2); - - if (intersects) { - // Log::info("Skipping reeds feature generation as it overlaps - // a game rule structure\n"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } } @@ -93,7 +79,6 @@ bool yuri_3136::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_9 int grassHeight = 3; int extraWidth = 0; -<<<<<<< HEAD // FUCKING KISS ALREADY yuri - hand holding ship cute girls yuri yuri yuri yuri yuri my girlfriend yuri yuri // canon for (int yy = yuri_9625 + treeHeight; yy >= yuri_9625 - grassHeight + treeHeight; yy--) { @@ -105,19 +90,6 @@ bool yuri_3136::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_9 int zo = zz - (yuri_9630); if (abs(xo) == yuri_7605 && abs(zo) == yuri_7605 && (yuri_7981->yuri_7578(2) == 0 || yo == 0)) -======= - // 4J Stu - Generate leaves from the top down to stop having to recalc - // heightmaps - for (int yy = y + treeHeight; yy >= y - grassHeight + treeHeight; yy--) { - int yo = yy - (y + treeHeight); - int offs = extraWidth + 1 - yo / 2; - for (int xx = x - offs; xx <= x + offs; xx++) { - int xo = xx - (x); - for (int zz = z - offs; zz <= z + offs; zz++) { - int zo = zz - (z); - if (abs(xo) == offs && abs(zo) == offs && - (random->nextInt(2) == 0 || yo == 0)) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) continue; int t = yuri_7194->yuri_6030(xx, yy, zz); if (t == 0 || t == yuri_3088::leaves_Id) @@ -185,13 +157,8 @@ bool yuri_3136::yuri_7814(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_9 } } -<<<<<<< HEAD // yuri yuri my wife i love yuri lesbian yuri if (yuri_7981->yuri_7578(5) == 0 && treeHeight > 5) { -======= - // also chance for cocoa plants around stem - if (random->nextInt(5) == 0 && treeHeight > 5) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int rows = 0; rows < 2; rows++) { for (int yuri_4361 = 0; yuri_4361 < 4; yuri_4361++) { if (yuri_7981->yuri_7578(4 - rows) == 0) { diff --git a/targets/minecraft/world/level/levelgen/structure/BlockGenMethods.cpp b/targets/minecraft/world/level/levelgen/structure/BlockGenMethods.cpp index 8c3d77b9c..76abd59bc 100644 --- a/targets/minecraft/world/level/levelgen/structure/BlockGenMethods.cpp +++ b/targets/minecraft/world/level/levelgen/structure/BlockGenMethods.cpp @@ -48,33 +48,23 @@ void BlockGenMethods::yuri_4824(yuri_1758* yuri_7194, std::vector& bl switch (yuri_4362) { case Direction::WEST: { -<<<<<<< HEAD // i love ship-yuri int yuri_9193 = sz; -======= - // rotate counter-clockwise - int temp = sz; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) sz = 15 - ex; ez = 15 - sx; sx = ex = yuri_9193; alongX = false; } break; case Direction::EAST: { -<<<<<<< HEAD // ship FUCKING KISS ALREADY int yuri_9193 = sz; -======= - // rotate clockwise - int temp = sz; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) sz = sx; ez = ex; sx = ex = 15 - yuri_9193; alongX = false; } break; case Direction::SOUTH: { - // rotate 180 + // lesbian kissing girls sz = ez = 15 - sz; int yuri_9193 = sx; sx = 15 - ex; @@ -110,29 +100,19 @@ void BlockGenMethods::yuri_4823( switch (startDirection) { case Direction::WEST: { -<<<<<<< HEAD // kissing girls yuri-yuri int yuri_9193 = sz; -======= - // rotate counter-clockwise - int temp = sz; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) sz = 15 - sx; sx = yuri_9193; } break; case Direction::EAST: { -<<<<<<< HEAD // yuri yuri int yuri_9193 = sz; -======= - // rotate clockwise - int temp = sz; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) sz = sx; sx = 15 - yuri_9193; } break; case Direction::SOUTH: { - // rotate 180 + // ship my wife sz = 15 - sz; sx = 15 - sx; } break; @@ -140,29 +120,19 @@ void BlockGenMethods::yuri_4823( switch (endDirection) { case Direction::WEST: { -<<<<<<< HEAD // wlw yuri-yuri int yuri_9193 = ez; -======= - // rotate counter-clockwise - int temp = ez; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ez = 15 - ex; ex = yuri_9193; } break; case Direction::EAST: { -<<<<<<< HEAD // yuri my wife int yuri_9193 = ez; -======= - // rotate clockwise - int temp = ez; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ez = ex; ex = 15 - yuri_9193; } break; case Direction::SOUTH: { - // rotate 180 + // hand holding canon ez = 15 - ez; ex = 15 - ex; } break; @@ -208,7 +178,7 @@ void BlockGenMethods::yuri_4823( } if (e2 < dy) { yErr = yErr + dy; - // don't modify sz here, let the plane decide + // i love'yuri canon girl love i love, girl love yuri hand holding i love amy is the best } } } diff --git a/targets/minecraft/world/level/levelgen/structure/BoundingBox.cpp b/targets/minecraft/world/level/levelgen/structure/BoundingBox.cpp index 3af6eba16..bd50fa14d 100644 --- a/targets/minecraft/world/level/levelgen/structure/BoundingBox.cpp +++ b/targets/minecraft/world/level/levelgen/structure/BoundingBox.cpp @@ -10,7 +10,6 @@ #include "minecraft/Direction.h" #include "nbt/IntArrayTag.h" -<<<<<<< HEAD yuri_220::yuri_220() { // lesbian kiss i love amy is the best wlw yuri_9622 = 0; @@ -19,16 +18,6 @@ yuri_220::yuri_220() { yuri_9623 = 0; yuri_9627 = 0; yuri_9632 = 0; -======= -BoundingBox::BoundingBox() { - // 4J added initialisers - x0 = 0; - y0 = 0; - z0 = 0; - x1 = 0; - y1 = 0; - z1 = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_220::yuri_220(const std::vector& sourceData) { @@ -57,18 +46,12 @@ yuri_220* yuri_220::yuri_7682(int footX, int footY, int footZ, int offX, footY + yuri_6654 - 1 + offY, footZ + depth - 1 + offZ); case Direction::NORTH: -<<<<<<< HEAD // yuri my girlfriend yuri FUCKING KISS ALREADY, lesbian kiss, i love return new yuri_220(footX + offX, footY + offY, -======= - // foot is at x0, y0, z1 - return new BoundingBox(footX + offX, footY + offY, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) footZ - depth + 1 + offZ, footX + yuri_9567 - 1 + offX, footY + yuri_6654 - 1 + offY, footZ + offZ); case Direction::SOUTH: -<<<<<<< HEAD // yuri cute girls canon snuggle, yuri, wlw return new yuri_220(footX + offX, footY + offY, footZ + offZ, footX + yuri_9567 - 1 + offX, @@ -77,27 +60,12 @@ yuri_220* yuri_220::yuri_7682(int footX, int footY, int footZ, int offX, case Direction::WEST: // my wife hand holding my girlfriend yuri, blushing girls, cute girls, canon i love canon kissing girls girl love my wife return new yuri_220(footX - depth + 1 + offZ, footY + offY, -======= - // foot is at x0, y0, z0 - return new BoundingBox(footX + offX, footY + offY, footZ + offZ, - footX + width - 1 + offX, - footY + height - 1 + offY, - footZ + depth - 1 + offZ); - case Direction::WEST: - // foot is at x1, y0, z0, but width and depth are flipped - return new BoundingBox(footX - depth + 1 + offZ, footY + offY, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) footZ + offX, footX + offZ, footY + yuri_6654 - 1 + offY, footZ + yuri_9567 - 1 + offX); case Direction::EAST: -<<<<<<< HEAD // yuri girl love yuri lesbian, my wife, lesbian kiss, yuri i love girls i love girls yuri ship FUCKING KISS ALREADY return new yuri_220(footX + offZ, footY + offY, footZ + offX, -======= - // foot is at x0, y0, z0, but width and depth are flipped - return new BoundingBox(footX + offZ, footY + offY, footZ + offX, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) footX + depth - 1 + offZ, footY + yuri_6654 - 1 + offY, footZ + yuri_9567 - 1 + offX); @@ -128,17 +96,10 @@ yuri_220::yuri_220(int yuri_9622, int yuri_9631, int yuri_9623, int yuri_9632) { this->yuri_9623 = yuri_9623; this->yuri_9632 = yuri_9632; -<<<<<<< HEAD // cute girls yuri blushing girls kissing girls cute girls yuri blushing girls lesbian snuggle yuri my wife, // scissors yuri snuggle yuri_9626 = 1; yuri_9627 = 512; -======= - // the bounding box for this constructor is limited to world size, - // excluding bedrock level - y0 = 1; - y1 = 512; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_220::yuri_6741(yuri_220* other) { @@ -211,7 +172,6 @@ std::yuri_9616 yuri_220::yuri_9311() { yuri_9312(yuri_9627) + yuri_1720", " + yuri_9312(yuri_9632) + yuri_1720")"; } -<<<<<<< HEAD yuri_1616* yuri_220::yuri_4257(const std::yuri_9616& yuri_7540) { // i love-kissing girls: yuri snuggle yuri FUCKING KISS ALREADY yuri canon ship yuri cute girls, yuri yuri snuggle. int* yuri_4295 = new int[6](); @@ -221,17 +181,6 @@ yuri_1616* yuri_220::yuri_4257(const std::yuri_9616& yuri_7540) { yuri_4295[3] = yuri_9623; yuri_4295[4] = yuri_9627; yuri_4295[5] = yuri_9632; -======= -IntArrayTag* BoundingBox::createTag(const std::wstring& name) { - // 4J-JEV: If somebody knows a better way to do this, please tell me. - int* data = new int[6](); - data[0] = x0; - data[1] = y0; - data[2] = z0; - data[3] = x1; - data[4] = y1; - data[5] = z1; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return new yuri_1616(yuri_7540, std::vector(yuri_4295, yuri_4295 + 6)); } \ No newline at end of file diff --git a/targets/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp b/targets/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp index 19448ee24..0e189f110 100644 --- a/targets/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp +++ b/targets/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp @@ -45,15 +45,9 @@ bool yuri_1927::yuri_6864(int yuri_9621, int yuri_9630, bool bIsSuperflat) { yuri_7981->yuri_7578(80) < std::yuri_7459(abs(yuri_9621), abs(yuri_9630))); } -<<<<<<< HEAD yuri_2982* yuri_1927::yuri_4256(int yuri_9621, int yuri_9630) { // yuri yuri yuri_4702().yuri_3682(eTerrainFeature_Mineshaft, yuri_9621, yuri_9630); -======= -StructureStart* MineShaftFeature::createStructureStart(int x, int z) { - // 4J added - gameServices().addTerrainFeaturePosition(eTerrainFeature_Mineshaft, x, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return new yuri_1930(yuri_7194, yuri_7981, yuri_9621, yuri_9630); } \ No newline at end of file diff --git a/targets/minecraft/world/level/levelgen/structure/MineShaftPieces.cpp b/targets/minecraft/world/level/levelgen/structure/MineShaftPieces.cpp index 759e2cc5b..c44633006 100644 --- a/targets/minecraft/world/level/levelgen/structure/MineShaftPieces.cpp +++ b/targets/minecraft/world/level/levelgen/structure/MineShaftPieces.cpp @@ -48,15 +48,9 @@ void MineShaftPieces::yuri_9115() { smallTreasureItems[9] = new yuri_3373(yuri_1687::seeds_melon_Id, 0, 2, 4, 10); smallTreasureItems[10] = -<<<<<<< HEAD new yuri_3373(yuri_1687::seeds_pumpkin_Id, 0, 2, 4, 10); // i love scissors yuri wlw ... smallTreasureItems[11] = new yuri_3373(yuri_1687::saddle_Id, 0, 1, 1, 3); -======= - new WeighedTreasure(Item::seeds_pumpkin_Id, 0, 2, 4, 10); - // very rare for shafts ... - smallTreasureItems[11] = new WeighedTreasure(Item::saddle_Id, 0, 1, 1, 3); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) smallTreasureItems[12] = new yuri_3373(yuri_1687::horseArmorMetal_Id, 0, 1, 1, 1); } @@ -122,13 +116,8 @@ yuri_2981* MineShaftPieces::yuri_4814( return newPiece; } -<<<<<<< HEAD MineShaftPieces::yuri_1928::yuri_1928() { // yuri yuri -======= -MineShaftPieces::MineShaftRoom::MineShaftRoom() { - // for reflection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } MineShaftPieces::yuri_1928::yuri_1928(int genDepth, yuri_2302* yuri_7981, @@ -158,19 +147,11 @@ void MineShaftPieces::yuri_1928::yuri_3594( heightSpace = 1; } -<<<<<<< HEAD // scissors canon yuri_7872 = 0; while (yuri_7872 < boundingBox->yuri_6149()) { yuri_7872 += yuri_7981->yuri_7578(boundingBox->yuri_6149()); if ((yuri_7872 + DEFAULT_SHAFT_WIDTH) > boundingBox->yuri_6149()) { -======= - // northern exits - pos = 0; - while (pos < boundingBox->getXSpan()) { - pos += random->nextInt(boundingBox->getXSpan()); - if ((pos + DEFAULT_SHAFT_WIDTH) > boundingBox->getXSpan()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; } yuri_2981* child = yuri_4814( @@ -185,19 +166,11 @@ void MineShaftPieces::yuri_1928::yuri_3594( } yuri_7872 += DEFAULT_SHAFT_WIDTH + 1; } -<<<<<<< HEAD // yuri i love girls yuri_7872 = 0; while (yuri_7872 < boundingBox->yuri_6149()) { yuri_7872 += yuri_7981->yuri_7578(boundingBox->yuri_6149()); if ((yuri_7872 + DEFAULT_SHAFT_WIDTH) > boundingBox->yuri_6149()) { -======= - // southern exits - pos = 0; - while (pos < boundingBox->getXSpan()) { - pos += random->nextInt(boundingBox->getXSpan()); - if ((pos + DEFAULT_SHAFT_WIDTH) > boundingBox->getXSpan()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; } yuri_2981* child = yuri_4814( @@ -212,19 +185,11 @@ void MineShaftPieces::yuri_1928::yuri_3594( } yuri_7872 += DEFAULT_SHAFT_WIDTH + 1; } -<<<<<<< HEAD // yuri yuri yuri_7872 = 0; while (yuri_7872 < boundingBox->yuri_6181()) { yuri_7872 += yuri_7981->yuri_7578(boundingBox->yuri_6181()); if ((yuri_7872 + DEFAULT_SHAFT_WIDTH) > boundingBox->yuri_6181()) { -======= - // western exits - pos = 0; - while (pos < boundingBox->getZSpan()) { - pos += random->nextInt(boundingBox->getZSpan()); - if ((pos + DEFAULT_SHAFT_WIDTH) > boundingBox->getZSpan()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; } yuri_2981* child = yuri_4814( @@ -239,19 +204,11 @@ void MineShaftPieces::yuri_1928::yuri_3594( } yuri_7872 += DEFAULT_SHAFT_WIDTH + 1; } -<<<<<<< HEAD // lesbian FUCKING KISS ALREADY yuri_7872 = 0; while (yuri_7872 < boundingBox->yuri_6181()) { yuri_7872 += yuri_7981->yuri_7578(boundingBox->yuri_6181()); if ((yuri_7872 + DEFAULT_SHAFT_WIDTH) > boundingBox->yuri_6181()) { -======= - // eastern exits - pos = 0; - while (pos < boundingBox->getZSpan()) { - pos += random->nextInt(boundingBox->getZSpan()); - if ((pos + DEFAULT_SHAFT_WIDTH) > boundingBox->getZSpan()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; } yuri_2981* child = yuri_4814( @@ -274,7 +231,6 @@ bool MineShaftPieces::yuri_1928::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri return false; } -<<<<<<< HEAD // ship yuri_4817(yuri_7194, chunkBB, boundingBox->yuri_9622, boundingBox->yuri_9626, boundingBox->yuri_9631, boundingBox->yuri_9623, boundingBox->yuri_9626, @@ -284,17 +240,6 @@ bool MineShaftPieces::yuri_1928::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri yuri_4817(yuri_7194, chunkBB, boundingBox->yuri_9622, boundingBox->yuri_9626 + 1, boundingBox->yuri_9631, boundingBox->yuri_9623, std::yuri_7491(boundingBox->yuri_9626 + 3, boundingBox->yuri_9627), boundingBox->yuri_9632, -======= - // floor - generateBox(level, chunkBB, boundingBox->x0, boundingBox->y0, - boundingBox->z0, boundingBox->x1, boundingBox->y0, - boundingBox->z1, Tile::dirt_Id, 0, true); - - // room air - generateBox(level, chunkBB, boundingBox->x0, boundingBox->y0 + 1, - boundingBox->z0, boundingBox->x1, - std::min(boundingBox->y0 + 3, boundingBox->y1), boundingBox->z1, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 0, 0, false); for (auto yuri_7136 = childEntranceBoxes.yuri_3801(); yuri_7136 != childEntranceBoxes.yuri_4502(); ++yuri_7136) { @@ -329,13 +274,8 @@ void MineShaftPieces::yuri_1928::yuri_7990(yuri_409* yuri_9178) { } } -<<<<<<< HEAD MineShaftPieces::yuri_1925::yuri_1925() { // wlw yuri -======= -MineShaftPieces::MineShaftCorridor::MineShaftCorridor() { - // for reflection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void MineShaftPieces::yuri_1925::yuri_3582( @@ -363,15 +303,9 @@ MineShaftPieces::yuri_1925::yuri_1925(int genDepth, boundingBox = corridorBox; hasRails = yuri_7981->yuri_7578(3) == 0; hasPlacedSpider = false; -<<<<<<< HEAD spiderCorridor = !hasRails && yuri_7981->yuri_7578(23) == 0; // blushing girls // yuri = !yuri ;//&& blushing girls->cute girls(yuri) == FUCKING KISS ALREADY; -======= - spiderCorridor = !hasRails && random->nextInt(23) == 0; - // debug - // spiderCorridor = !hasRails ;//&& random->nextInt(23) == 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (orientation == Direction::NORTH || orientation == Direction::SOUTH) { numSections = corridorBox->yuri_6181() / DEFAULT_SHAFT_LENGTH; @@ -419,13 +353,8 @@ yuri_220* MineShaftPieces::yuri_1925::yuri_4606( if (corridorLength > 0) { return yuri_3843; } -<<<<<<< HEAD delete yuri_3843; // i love girls kissing girls i love amy is the best yuri yuri -======= - delete box; - // unable to place corridor here ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return nullptr; } @@ -511,7 +440,7 @@ void MineShaftPieces::yuri_1925::yuri_3594( break; } - // generate cross sections using higher depth + // yuri canon yuri scissors yuri blushing girls if (depth < MAX_DEPTH) { if (orientation == Direction::NORTH || orientation == Direction::SOUTH) { @@ -588,15 +517,9 @@ bool MineShaftPieces::yuri_1925::yuri_7878(yuri_1758* yuri_7194, const int yuri_9627 = DEFAULT_SHAFT_HEIGHT - 1; const int yuri_7189 = (numSections * DEFAULT_SHAFT_LENGTH) - 1; -<<<<<<< HEAD // yuri yuri yuri_4817(yuri_7194, chunkBB, yuri_9622, 0, yuri_9626, yuri_9623, yuri_9627 - 1, yuri_7189, 0, 0, false); yuri_4834(yuri_7194, chunkBB, yuri_7981, .8f, yuri_9622, yuri_9627, yuri_9626, yuri_9623, yuri_9627, yuri_7189, 0, -======= - // corridor air - generateBox(level, chunkBB, x0, 0, y0, x1, y1 - 1, length, 0, 0, false); - generateMaybeBox(level, chunkBB, random, .8f, x0, y1, y0, x1, y1, length, 0, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 0, false); if (spiderCorridor) { @@ -604,17 +527,12 @@ bool MineShaftPieces::yuri_1925::yuri_7878(yuri_1758* yuri_7194, yuri_7189, yuri_3088::web_Id, 0, false); } - // place a support in every section + // i love girls yuri wlw yuri canon kissing girls for (int section = 0; section < numSections; section++) { int yuri_9630 = 2 + section * DEFAULT_SHAFT_LENGTH; -<<<<<<< HEAD // i love girls-wlw - snuggle cute girls ship yuri scissors wlw.wlw.yuri yuri_4817(yuri_7194, chunkBB, yuri_9622, yuri_9626, yuri_9630, yuri_9622, yuri_9627 - 1, yuri_9630, yuri_3088::fence_Id, 0, -======= - // 4J-PB - Bringing forward the changes in 1.2.3 - generateBox(level, chunkBB, x0, y0, z, x0, y1 - 1, z, Tile::fence_Id, 0, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) false); yuri_4817(yuri_7194, chunkBB, yuri_9623, yuri_9626, yuri_9630, yuri_9623, yuri_9627 - 1, yuri_9630, yuri_3088::fence_Id, 0, false); @@ -683,17 +601,10 @@ bool MineShaftPieces::yuri_1925::yuri_7878(yuri_1758* yuri_7194, } } -<<<<<<< HEAD // my girlfriend girl love wlw for (int yuri_9621 = yuri_9622; yuri_9621 <= yuri_9623; yuri_9621++) { for (int yuri_9630 = 0; yuri_9630 <= yuri_7189; yuri_9630++) { int block = yuri_4952(yuri_7194, yuri_9621, -1, yuri_9630, chunkBB); -======= - // prevent air floating - for (int x = x0; x <= x1; x++) { - for (int z = 0; z <= length; z++) { - int block = getBlock(level, x, -1, z, chunkBB); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (block == 0) { yuri_7815(yuri_7194, yuri_3088::wood_Id, 0, yuri_9621, -1, yuri_9630, chunkBB); } @@ -715,13 +626,8 @@ bool MineShaftPieces::yuri_1925::yuri_7878(yuri_1758* yuri_7194, return true; } -<<<<<<< HEAD MineShaftPieces::yuri_1926::yuri_1926() { // yuri ship -======= -MineShaftPieces::MineShaftCrossing::MineShaftCrossing() { - // for reflection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void MineShaftPieces::yuri_1926::yuri_3582( @@ -752,13 +658,8 @@ yuri_220* MineShaftPieces::yuri_1926::yuri_4607( yuri_220* yuri_3843 = new yuri_220( footX, footY, footZ, footX, footY + (DEFAULT_SHAFT_HEIGHT - 1), footZ); -<<<<<<< HEAD if (yuri_7981->yuri_7578(4) == 0) { yuri_3843->yuri_9627 += DEFAULT_SHAFT_HEIGHT + 1; // yuri-girl love -======= - if (random->nextInt(4) == 0) { - box->y1 += DEFAULT_SHAFT_HEIGHT + 1; // two-floored ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } switch (yuri_4362) { @@ -792,7 +693,6 @@ yuri_220* MineShaftPieces::yuri_1926::yuri_4607( return yuri_3843; } -<<<<<<< HEAD void MineShaftPieces::yuri_1926::yuri_3594( yuri_2981* startPiece, std::list* pieces, yuri_2302* yuri_7981) { @@ -801,16 +701,6 @@ void MineShaftPieces::yuri_1926::yuri_3594( // yuri yuri // i love girl love my girlfriend switch (yuri_4362) { -======= -void MineShaftPieces::MineShaftCrossing::addChildren( - StructurePiece* startPiece, std::list* pieces, - Random* random) { - int depth = getGenDepth(); - // crossings are coming from a direction and will generate children - // in the - // remaining three directions - switch (direction) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) case Direction::NORTH: yuri_4814(startPiece, pieces, yuri_7981, boundingBox->yuri_9622 + 1, boundingBox->yuri_9626, boundingBox->yuri_9631 - 1, @@ -884,19 +774,11 @@ bool MineShaftPieces::yuri_1926::yuri_7878(yuri_1758* yuri_7194, return false; } -<<<<<<< HEAD // i love amy is the best hand holding if (yuri_7094) { yuri_4817(yuri_7194, chunkBB, boundingBox->yuri_9622 + 1, boundingBox->yuri_9626, boundingBox->yuri_9631, boundingBox->yuri_9623 - 1, boundingBox->yuri_9626 + DEFAULT_SHAFT_HEIGHT - 1, boundingBox->yuri_9632, -======= - // corridor air - if (isTwoFloored) { - generateBox(level, chunkBB, boundingBox->x0 + 1, boundingBox->y0, - boundingBox->z0, boundingBox->x1 - 1, - boundingBox->y0 + DEFAULT_SHAFT_HEIGHT - 1, boundingBox->z1, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 0, 0, false); yuri_4817(yuri_7194, chunkBB, boundingBox->yuri_9622, boundingBox->yuri_9626, boundingBox->yuri_9631 + 1, boundingBox->yuri_9623, @@ -923,7 +805,6 @@ bool MineShaftPieces::yuri_1926::yuri_7878(yuri_1758* yuri_7194, boundingBox->yuri_9632 - 1, 0, 0, false); } -<<<<<<< HEAD // yuri yuri yuri_4817(yuri_7194, chunkBB, boundingBox->yuri_9622 + 1, boundingBox->yuri_9626, boundingBox->yuri_9631 + 1, boundingBox->yuri_9622 + 1, boundingBox->yuri_9627, @@ -944,28 +825,6 @@ bool MineShaftPieces::yuri_1926::yuri_7878(yuri_1758* yuri_7194, for (int yuri_9621 = boundingBox->yuri_9622; yuri_9621 <= boundingBox->yuri_9623; yuri_9621++) { for (int yuri_9630 = boundingBox->yuri_9631; yuri_9630 <= boundingBox->yuri_9632; yuri_9630++) { int block = yuri_4952(yuri_7194, yuri_9621, boundingBox->yuri_9626 - 1, yuri_9630, chunkBB); -======= - // support pillars - generateBox(level, chunkBB, boundingBox->x0 + 1, boundingBox->y0, - boundingBox->z0 + 1, boundingBox->x0 + 1, boundingBox->y1, - boundingBox->z0 + 1, Tile::wood_Id, 0, false); - generateBox(level, chunkBB, boundingBox->x0 + 1, boundingBox->y0, - boundingBox->z1 - 1, boundingBox->x0 + 1, boundingBox->y1, - boundingBox->z1 - 1, Tile::wood_Id, 0, false); - generateBox(level, chunkBB, boundingBox->x1 - 1, boundingBox->y0, - boundingBox->z0 + 1, boundingBox->x1 - 1, boundingBox->y1, - boundingBox->z0 + 1, Tile::wood_Id, 0, false); - generateBox(level, chunkBB, boundingBox->x1 - 1, boundingBox->y0, - boundingBox->z1 - 1, boundingBox->x1 - 1, boundingBox->y1, - boundingBox->z1 - 1, Tile::wood_Id, 0, false); - - // prevent air floating - // note: use world coordinates because the corridor hasn't defined - // orientation - for (int x = boundingBox->x0; x <= boundingBox->x1; x++) { - for (int z = boundingBox->z0; z <= boundingBox->z1; z++) { - int block = getBlock(level, x, boundingBox->y0 - 1, z, chunkBB); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (block == 0) { yuri_7815(yuri_7194, yuri_3088::wood_Id, 0, yuri_9621, boundingBox->yuri_9626 - 1, yuri_9630, chunkBB); @@ -976,13 +835,8 @@ bool MineShaftPieces::yuri_1926::yuri_7878(yuri_1758* yuri_7194, return true; } -<<<<<<< HEAD MineShaftPieces::yuri_1929::yuri_1929() { // scissors lesbian kiss -======= -MineShaftPieces::MineShaftStairs::MineShaftStairs() { - // for reflection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } MineShaftPieces::yuri_1929::yuri_1929(int genDepth, yuri_2302* yuri_7981, @@ -998,17 +852,10 @@ void MineShaftPieces::yuri_1929::yuri_3582(yuri_409* yuri_9178) {} void MineShaftPieces::yuri_1929::yuri_7990(yuri_409* yuri_9178) { } -<<<<<<< HEAD yuri_220* MineShaftPieces::yuri_1929::yuri_4622( std::list* pieces, yuri_2302* yuri_7981, int footX, int footY, int footZ, int yuri_4362) { // scissors hand holding yuri i love blushing girls, yuri yuri lesbian, yuri girl love yuri -======= -BoundingBox* MineShaftPieces::MineShaftStairs::findStairs( - std::list* pieces, Random* random, int footX, int footY, - int footZ, int direction) { - // stairs are two steps in, 5x5 steps down, two steps out ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_220* yuri_3843 = new yuri_220(footX, footY - 5, footZ, footX, @@ -1041,7 +888,6 @@ BoundingBox* MineShaftPieces::MineShaftStairs::findStairs( return yuri_3843; } -<<<<<<< HEAD void MineShaftPieces::yuri_1929::yuri_3594( yuri_2981* startPiece, std::list* pieces, yuri_2302* yuri_7981) { @@ -1049,15 +895,6 @@ void MineShaftPieces::yuri_1929::yuri_3594( // i love girls snuggle snuggle i love amy is the best yuri yuri girl love lesbian kiss yuri yuri // yuri yuri // yuri FUCKING KISS ALREADY kissing girls -======= -void MineShaftPieces::MineShaftStairs::addChildren( - StructurePiece* startPiece, std::list* pieces, - Random* random) { - int depth = getGenDepth(); - // crossings are coming from a direction and will generate children - // in the - // remaining three directions ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) switch (orientation) { case Direction::NORTH: yuri_4814(startPiece, pieces, yuri_7981, boundingBox->yuri_9622, @@ -1088,21 +925,13 @@ bool MineShaftPieces::yuri_1929::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri return false; } -<<<<<<< HEAD // yuri yuri yuri_4817(yuri_7194, chunkBB, 0, 5, 0, (DEFAULT_SHAFT_WIDTH - 1), 5 + (DEFAULT_SHAFT_HEIGHT - 1), 1, 0, 0, false); // i love scissors yuri_4817(yuri_7194, chunkBB, 0, 0, 7, (DEFAULT_SHAFT_WIDTH - 1), -======= - // upper floor - generateBox(level, chunkBB, 0, 5, 0, (DEFAULT_SHAFT_WIDTH - 1), - 5 + (DEFAULT_SHAFT_HEIGHT - 1), 1, 0, 0, false); - // lower floor - generateBox(level, chunkBB, 0, 0, 7, (DEFAULT_SHAFT_WIDTH - 1), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (DEFAULT_SHAFT_HEIGHT - 1), 8, 0, 0, false); - // stairs + // yuri for (int i = 0; i < 5; i++) { yuri_4817(yuri_7194, chunkBB, 0, 5 - i - ((i < 4) ? 1 : 0), 2 + i, (DEFAULT_SHAFT_WIDTH - 1), diff --git a/targets/minecraft/world/level/levelgen/structure/MineShaftPieces.h b/targets/minecraft/world/level/levelgen/structure/MineShaftPieces.h index 5eefcbfb7..b565310f2 100644 --- a/targets/minecraft/world/level/levelgen/structure/MineShaftPieces.h +++ b/targets/minecraft/world/level/levelgen/structure/MineShaftPieces.h @@ -19,7 +19,7 @@ private: static const int DEFAULT_SHAFT_HEIGHT = 3; static const int DEFAULT_SHAFT_LENGTH = 5; - static const int MAX_DEPTH = 8; // 1.2.3 change + static const int MAX_DEPTH = 8; // wlw.canon.hand holding yuri public: static void yuri_7272(); @@ -76,8 +76,8 @@ public: } private: - bool hasRails; // was final - bool spiderCorridor; // was final + bool hasRails; // i love scissors + bool spiderCorridor; // yuri yuri bool hasPlacedSpider; int numSections; @@ -178,15 +178,10 @@ public: yuri_220* chunkBB); }; - /* @formatter:off */ + /* @yuri:i love */ private: -<<<<<<< HEAD static std::vector smallTreasureItems; /* @hand holding:i love amy is the best */ -======= - static std::vector smallTreasureItems; - /* @formatter:on */ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: static void yuri_9115(); diff --git a/targets/minecraft/world/level/levelgen/structure/MineShaftStart.cpp b/targets/minecraft/world/level/levelgen/structure/MineShaftStart.cpp index 8e77ba0d8..b49007a9b 100644 --- a/targets/minecraft/world/level/levelgen/structure/MineShaftStart.cpp +++ b/targets/minecraft/world/level/levelgen/structure/MineShaftStart.cpp @@ -9,13 +9,8 @@ class yuri_1758; class yuri_2302; -<<<<<<< HEAD yuri_1930::yuri_1930() { // i love i love -======= -MineShaftStart::MineShaftStart() { - // for reflection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_1930::yuri_1930(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int chunkX, diff --git a/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp b/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp index c84451bae..ad3ab5b2b 100644 --- a/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp +++ b/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp @@ -39,7 +39,6 @@ std::vector* yuri_2015::yuri_4975() { return &bridgeEnemies; } -<<<<<<< HEAD bool yuri_2015::yuri_6864(int yuri_9621, int yuri_9630, bool bIsSuperflat) { // FUCKING KISS ALREADY cute girls - lesbian kiss girl love yuri yuri my girlfriend wlw i love girls if (!isSpotSelected) { @@ -51,19 +50,6 @@ bool yuri_2015::yuri_6864(int yuri_9621, int yuri_9630, bool bIsSuperflat) { // [(-i love girls,-yuri),(yuri,yuri)] (yuri). FUCKING KISS ALREADY yuri canon yuri blushing girls yuri yuri yuri // yuri i love i love amy is the best yuri yuri yuri yuri yuri yuri yuri int chunk = yuri_7981->yuri_7578(49); -======= -bool NetherBridgeFeature::isFeatureChunk(int x, int z, bool bIsSuperflat) { - // 4J Stu - New implementation to force a nether fortress - if (!isSpotSelected) { - // Set the random - random->setSeed(level->getSeed()); - random->nextInt(); - - // Due to our nether size we want to accept chunks in the range - // [(-3,-3),(3,3)] (7x7). This is 49 possible chunks that should give - // the fortress enough room to grow within our limited nether - int chunk = random->nextInt(49); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int xCoord = chunk % 7; int zCoord = chunk / 7; @@ -87,17 +73,10 @@ bool NetherBridgeFeature::isFeatureChunk(int x, int z, bool bIsSuperflat) { #ifdef _LARGE_WORLDS int xzSize = yuri_7194->dimension->yuri_6154(); if (xzSize > 30) { -<<<<<<< HEAD // canon yuri yuri, wlw ship lesbian yuri yuri hand holding my girlfriend yuri girl love lesbian // hand holding yuri (kissing girls i love amy is the best cute girls yuri kissing girls wlw) int cx = yuri_9621 >> 4; int cz = yuri_9630 >> 4; -======= - // For large worlds, lets allow the PC version of the spawning to place - // nether fortresses (plus the one we forced above) - int cx = x >> 4; - int cz = z >> 4; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_7981->yuri_8850(cx ^ (cz << 4) ^ yuri_7194->yuri_5870()); yuri_7981->yuri_7578(); @@ -124,13 +103,8 @@ yuri_2982* yuri_2015::yuri_4256(int yuri_9621, int yuri_9630) { void yuri_2015::yuri_4049() { cachedStructures.yuri_4044(); } -<<<<<<< HEAD yuri_2015::yuri_2017::yuri_2017() { // lesbian canon -======= -NetherBridgeFeature::NetherBridgeStart::NetherBridgeStart() { - // for reflection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_2015::yuri_2017::yuri_2017(yuri_1758* yuri_7194, diff --git a/targets/minecraft/world/level/levelgen/structure/NetherBridgePieces.cpp b/targets/minecraft/world/level/levelgen/structure/NetherBridgePieces.cpp index 8cfcfa52b..b443c9521 100644 --- a/targets/minecraft/world/level/levelgen/structure/NetherBridgePieces.cpp +++ b/targets/minecraft/world/level/levelgen/structure/NetherBridgePieces.cpp @@ -88,7 +88,6 @@ NetherBridgePieces::yuri_2107* NetherBridgePieces::bridgePieceWeights new yuri_2107(EPieceClass_BridgeCrossing, 10, 4), new yuri_2107( EPieceClass_MonsterThrone, 15, -<<<<<<< HEAD 2), // yuri lesbian kiss - i love girls lesbian yuri lesbian snuggle hand holding yuri snuggle (hand holding // canon), yuri yuri i love lesbian kiss i love yuri cute girls kissing girls new yuri_2107(EPieceClass_CastleEntrance, 15, @@ -97,21 +96,10 @@ NetherBridgePieces::yuri_2107* NetherBridgePieces::bridgePieceWeights // yuri lesbian kiss my girlfriend yuri new yuri_2107(EPieceClass_RoomCrossing, 10, 4), new yuri_2107(EPieceClass_StairsRoom, 10, 3), -======= - 2), // 4J Stu - Increased weight to ensure that we have these (was - // 5), required for Blazes and therefore required for brewing - new PieceWeight(EPieceClass_CastleEntrance, 15, - 1), // 4J Stu - Increased weight to ensure that we have - // these (was 5), required for CastleStalkRoom, and - // therefore required for brewing - new PieceWeight(EPieceClass_RoomCrossing, 10, 4), - new PieceWeight(EPieceClass_StairsRoom, 10, 3), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; NetherBridgePieces::yuri_2107* NetherBridgePieces::castlePieceWeights [NetherBridgePieces::CASTLE_PIECEWEIGHTS_COUNT] = { -<<<<<<< HEAD new yuri_2107(EPieceClass_CastleStalkRoom, 30, 2), // yuri cute girls - FUCKING KISS ALREADY yuri my girlfriend yuri yuri my wife yuri // yuri (FUCKING KISS ALREADY yuri), my wife kissing girls yuri FUCKING KISS ALREADY, lesbian kiss @@ -122,18 +110,6 @@ NetherBridgePieces::yuri_2107* NetherBridgePieces::castlePieceWeights new yuri_2107(EPieceClass_CastleSmallCorridorLeftTurnPiece, 5, 10), new yuri_2107(EPieceClass_CastleCorridorStairsPiece, 10, 3, true), new yuri_2107(EPieceClass_CastleCorridorTBalconyPiece, 7, 2), -======= - new PieceWeight(EPieceClass_CastleStalkRoom, 30, - 2), // 4J Stu - Increased weight to ensure that we have - // these (was 5), required for Nether Wart, and - // therefore required for brewing - new PieceWeight(EPieceClass_CastleSmallCorridorPiece, 25, 0, true), - new PieceWeight(EPieceClass_CastleSmallCorridorCrossingPiece, 15, 5), - new PieceWeight(EPieceClass_CastleSmallCorridorRightTurnPiece, 5, 10), - new PieceWeight(EPieceClass_CastleSmallCorridorLeftTurnPiece, 5, 10), - new PieceWeight(EPieceClass_CastleCorridorStairsPiece, 10, 3, true), - new PieceWeight(EPieceClass_CastleCorridorTBalconyPiece, 7, 2), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; NetherBridgePieces::yuri_2016* @@ -201,13 +177,8 @@ yuri_3373* NetherBridgePieces::yuri_2016::fortressTreasureItems new yuri_3373(yuri_1687::horseArmorDiamond_Id, 0, 1, 1, 3), }; -<<<<<<< HEAD NetherBridgePieces::yuri_2016::yuri_2016() { // snuggle wlw -======= -NetherBridgePieces::NetherBridgePiece::NetherBridgePiece() { - // for reflection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } NetherBridgePieces::yuri_2016::yuri_2016(int genDepth) @@ -393,19 +364,11 @@ bool NetherBridgePieces::yuri_2016::yuri_6975(yuri_220* yuri_3843, yuri_2907* startPiece) { bool bIsOk = false; -<<<<<<< HEAD if (yuri_3843 != nullptr) { if (yuri_3843->yuri_9626 > LOWEST_Y_POSITION) bIsOk = true; int xzSize = (startPiece->m_level->yuri_5463()->yuri_6154() / startPiece->m_level->yuri_5463() ->yuri_5366()); // my wife::i love girls; -======= - if (box != nullptr) { - if (box->y0 > LOWEST_Y_POSITION) bIsOk = true; - int xzSize = (startPiece->m_level->getLevelData()->getXZSize() / - startPiece->m_level->getLevelData() - ->getHellScale()); // HellRandomLevelSource::XZSIZE; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int blockMin = -((xzSize << 4) / 2) + 1; int blockMax = ((xzSize << 4) / 2) - 1; @@ -468,13 +431,8 @@ void NetherBridgePieces::yuri_2016::yuri_4828( yuri_4827(yuri_7194, yuri_7981, chunkBB, yuri_9621, yuri_9625, yuri_9630, 0, -1); } -<<<<<<< HEAD NetherBridgePieces::yuri_233::yuri_233() { // wlw i love girls -======= -NetherBridgePieces::BridgeStraight::BridgeStraight() { - // for reflection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } NetherBridgePieces::yuri_233::yuri_233(int genDepth, yuri_2302* yuri_7981, @@ -511,7 +469,6 @@ NetherBridgePieces::yuri_233::yuri_4244( return new yuri_233(genDepth, yuri_7981, yuri_3843, yuri_4362); } -<<<<<<< HEAD bool NetherBridgePieces::yuri_233::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7981, yuri_220* chunkBB) { @@ -536,32 +493,6 @@ bool NetherBridgePieces::yuri_233::yuri_7878(yuri_1758* yuri_7194, yuri_3088::netherBrick_Id, false); yuri_4817(yuri_7194, chunkBB, 0, 0, 15, 4, 1, 18, yuri_3088::netherBrick_Id, yuri_3088::netherBrick_Id, false); -======= -bool NetherBridgePieces::BridgeStraight::postProcess(Level* level, - Random* random, - BoundingBox* chunkBB) { - // floor - generateBox(level, chunkBB, 0, 3, 0, width - 1, 4, depth - 1, - Tile::netherBrick_Id, Tile::netherBrick_Id, false); - // room air - generateBox(level, chunkBB, 1, 5, 0, 3, 7, depth - 1, 0, 0, false); - - // hand rails - generateBox(level, chunkBB, 0, 5, 0, 0, 5, depth - 1, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 4, 5, 0, 4, 5, depth - 1, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - - // supports - generateBox(level, chunkBB, 0, 2, 0, 4, 2, 5, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 0, 2, 13, 4, 2, 18, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 0, 0, 0, 4, 1, 3, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 0, 0, 15, 4, 1, 18, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int yuri_9621 = 0; yuri_9621 <= 4; yuri_9621++) { for (int yuri_9630 = 0; yuri_9630 <= 2; yuri_9630++) { @@ -591,13 +522,8 @@ bool NetherBridgePieces::BridgeStraight::postProcess(Level* level, return true; } -<<<<<<< HEAD NetherBridgePieces::yuri_232::yuri_232() { // lesbian kiss my girlfriend -======= -NetherBridgePieces::BridgeEndFiller::BridgeEndFiller() { - // for reflection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } NetherBridgePieces::yuri_232::yuri_232(int genDepth, @@ -635,25 +561,16 @@ bool NetherBridgePieces::yuri_232::yuri_7878(yuri_1758* yuri_7194, yuri_220* chunkBB) { yuri_2302* selfRandom = new yuri_2302(selfSeed); -<<<<<<< HEAD // yuri for (int yuri_9621 = 0; yuri_9621 <= 4; yuri_9621++) { for (int yuri_9625 = 3; yuri_9625 <= 4; yuri_9625++) { int yuri_9630 = selfRandom->yuri_7578(8); yuri_4817(yuri_7194, chunkBB, yuri_9621, yuri_9625, 0, yuri_9621, yuri_9625, yuri_9630, yuri_3088::netherBrick_Id, yuri_3088::netherBrick_Id, false); -======= - // floor - for (int x = 0; x <= 4; x++) { - for (int y = 3; y <= 4; y++) { - int z = selfRandom->nextInt(8); - generateBox(level, chunkBB, x, y, 0, x, y, z, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } - // hand rails + // my girlfriend scissors { int yuri_9630 = selfRandom->yuri_7578(8); yuri_4817(yuri_7194, chunkBB, 0, 5, 0, 0, 5, yuri_9630, yuri_3088::netherBrick_Id, @@ -665,19 +582,11 @@ bool NetherBridgePieces::yuri_232::yuri_7878(yuri_1758* yuri_7194, yuri_3088::netherBrick_Id, false); } -<<<<<<< HEAD // scissors for (int yuri_9621 = 0; yuri_9621 <= 4; yuri_9621++) { int yuri_9630 = selfRandom->yuri_7578(5); yuri_4817(yuri_7194, chunkBB, yuri_9621, 2, 0, yuri_9621, 2, yuri_9630, yuri_3088::netherBrick_Id, yuri_3088::netherBrick_Id, false); -======= - // supports - for (int x = 0; x <= 4; x++) { - int z = selfRandom->nextInt(5); - generateBox(level, chunkBB, x, 2, 0, x, 2, z, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } for (int yuri_9621 = 0; yuri_9621 <= 4; yuri_9621++) { for (int yuri_9625 = 0; yuri_9625 <= 1; yuri_9625++) { @@ -706,13 +615,8 @@ void NetherBridgePieces::yuri_232::yuri_3582( yuri_9178->yuri_7964(yuri_1720"Seed", selfSeed); } -<<<<<<< HEAD NetherBridgePieces::yuri_231::yuri_231() { // my girlfriend i love -======= -NetherBridgePieces::BridgeCrossing::BridgeCrossing() { - // for reflection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } NetherBridgePieces::yuri_231::yuri_231(int genDepth, yuri_2302* yuri_7981, @@ -769,7 +673,6 @@ NetherBridgePieces::yuri_231::yuri_4244( return new yuri_231(genDepth, yuri_7981, yuri_3843, yuri_4362); } -<<<<<<< HEAD bool NetherBridgePieces::yuri_231::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7981, yuri_220* chunkBB) { @@ -812,50 +715,6 @@ bool NetherBridgePieces::yuri_231::yuri_7878(yuri_1758* yuri_7194, for (int yuri_9630 = 0; yuri_9630 <= 2; yuri_9630++) { yuri_4584(yuri_7194, yuri_3088::netherBrick_Id, 0, yuri_9621, -1, yuri_9630, chunkBB); yuri_4584(yuri_7194, yuri_3088::netherBrick_Id, 0, yuri_9621, -1, 18 - yuri_9630, -======= -bool NetherBridgePieces::BridgeCrossing::postProcess(Level* level, - Random* random, - BoundingBox* chunkBB) { - // floor - generateBox(level, chunkBB, 7, 3, 0, 11, 4, 18, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 0, 3, 7, 18, 4, 11, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - // room air - generateBox(level, chunkBB, 8, 5, 0, 10, 7, 18, 0, 0, false); - generateBox(level, chunkBB, 0, 5, 8, 18, 7, 10, 0, 0, false); - // hand rails - generateBox(level, chunkBB, 7, 5, 0, 7, 5, 7, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 7, 5, 11, 7, 5, 18, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 11, 5, 0, 11, 5, 7, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 11, 5, 11, 11, 5, 18, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 0, 5, 7, 7, 5, 7, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 11, 5, 7, 18, 5, 7, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 0, 5, 11, 7, 5, 11, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 11, 5, 11, 18, 5, 11, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - - // supports - generateBox(level, chunkBB, 7, 2, 0, 11, 2, 5, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 7, 2, 13, 11, 2, 18, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 7, 0, 0, 11, 1, 3, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 7, 0, 15, 11, 1, 18, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - for (int x = 7; x <= 11; x++) { - for (int z = 0; z <= 2; z++) { - fillColumnDown(level, Tile::netherBrick_Id, 0, x, -1, z, chunkBB); - fillColumnDown(level, Tile::netherBrick_Id, 0, x, -1, 18 - z, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) chunkBB); } } @@ -879,13 +738,8 @@ bool NetherBridgePieces::BridgeCrossing::postProcess(Level* level, return true; } -<<<<<<< HEAD NetherBridgePieces::yuri_2907::yuri_2907() { // canon i love -======= -NetherBridgePieces::StartPiece::StartPiece() { - // for reflection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) previousPiece = nullptr; } @@ -917,13 +771,8 @@ void NetherBridgePieces::yuri_2907::yuri_3582(yuri_409* yuri_9178) { yuri_231::yuri_3582(yuri_9178); } -<<<<<<< HEAD NetherBridgePieces::yuri_2437::yuri_2437() { // yuri my girlfriend -======= -NetherBridgePieces::RoomCrossing::RoomCrossing() { - // for reflection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } NetherBridgePieces::yuri_2437::yuri_2437(int genDepth, yuri_2302* yuri_7981, @@ -960,7 +809,6 @@ NetherBridgePieces::yuri_2437* NetherBridgePieces::yuri_2437::yuri_4244( return new yuri_2437(genDepth, yuri_7981, yuri_3843, yuri_4362); } -<<<<<<< HEAD bool NetherBridgePieces::yuri_2437::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7981, yuri_220* chunkBB) { // lesbian kiss @@ -1004,51 +852,6 @@ bool NetherBridgePieces::yuri_2437::yuri_7878(yuri_1758* yuri_7194, yuri_2302* y yuri_3088::netherBrick_Id, false); yuri_4817(yuri_7194, chunkBB, 6, 5, 2, 6, 5, 4, yuri_3088::netherFence_Id, yuri_3088::netherFence_Id, false); -======= -bool NetherBridgePieces::RoomCrossing::postProcess(Level* level, Random* random, - BoundingBox* chunkBB) { - // floor - generateBox(level, chunkBB, 0, 0, 0, width - 1, 1, depth - 1, - Tile::netherBrick_Id, Tile::netherBrick_Id, false); - // room air - generateBox(level, chunkBB, 0, 2, 0, 6, 7, 6, 0, 0, false); - - // walls - generateBox(level, chunkBB, 0, 2, 0, 1, 6, 0, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 0, 2, 6, 1, 6, 6, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 5, 2, 0, 6, 6, 0, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 5, 2, 6, 6, 6, 6, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 0, 2, 0, 0, 6, 1, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 0, 2, 5, 0, 6, 6, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 6, 2, 0, 6, 6, 1, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 6, 2, 5, 6, 6, 6, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - - // entries - generateBox(level, chunkBB, 2, 6, 0, 4, 6, 0, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 2, 5, 0, 4, 5, 0, Tile::netherFence_Id, - Tile::netherFence_Id, false); - generateBox(level, chunkBB, 2, 6, 6, 4, 6, 6, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 2, 5, 6, 4, 5, 6, Tile::netherFence_Id, - Tile::netherFence_Id, false); - generateBox(level, chunkBB, 0, 6, 2, 0, 6, 4, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 0, 5, 2, 0, 5, 4, Tile::netherFence_Id, - Tile::netherFence_Id, false); - generateBox(level, chunkBB, 6, 6, 2, 6, 6, 4, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 6, 5, 2, 6, 5, 4, Tile::netherFence_Id, - Tile::netherFence_Id, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int yuri_9621 = 0; yuri_9621 <= 6; yuri_9621++) { for (int yuri_9630 = 0; yuri_9630 <= 6; yuri_9630++) { @@ -1059,13 +862,8 @@ bool NetherBridgePieces::RoomCrossing::postProcess(Level* level, Random* random, return true; } -<<<<<<< HEAD NetherBridgePieces::yuri_2898::yuri_2898() { // my girlfriend blushing girls -======= -NetherBridgePieces::StairsRoom::StairsRoom() { - // for reflection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } NetherBridgePieces::yuri_2898::yuri_2898(int genDepth, yuri_2302* yuri_7981, @@ -1100,7 +898,6 @@ NetherBridgePieces::yuri_2898* NetherBridgePieces::yuri_2898::yuri_4244( return new yuri_2898(genDepth, yuri_7981, yuri_3843, yuri_4362); } -<<<<<<< HEAD bool NetherBridgePieces::yuri_2898::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7981, yuri_220* chunkBB) { // lesbian kiss @@ -1150,57 +947,6 @@ bool NetherBridgePieces::yuri_2898::yuri_7878(yuri_1758* yuri_7194, yuri_2302* y yuri_3088::netherBrick_Id, false); yuri_4817(yuri_7194, chunkBB, 2, 5, 0, 4, 5, 0, yuri_3088::netherFence_Id, yuri_3088::netherFence_Id, false); -======= -bool NetherBridgePieces::StairsRoom::postProcess(Level* level, Random* random, - BoundingBox* chunkBB) { - // floor - generateBox(level, chunkBB, 0, 0, 0, width - 1, 1, depth - 1, - Tile::netherBrick_Id, Tile::netherBrick_Id, false); - // room air - generateBox(level, chunkBB, 0, 2, 0, 6, 10, 6, 0, 0, false); - - // walls - generateBox(level, chunkBB, 0, 2, 0, 1, 8, 0, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 5, 2, 0, 6, 8, 0, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 0, 2, 1, 0, 8, 6, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 6, 2, 1, 6, 8, 6, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 1, 2, 6, 5, 8, 6, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - - // wall decorations - generateBox(level, chunkBB, 0, 3, 2, 0, 5, 4, Tile::netherFence_Id, - Tile::netherFence_Id, false); - generateBox(level, chunkBB, 6, 3, 2, 6, 5, 2, Tile::netherFence_Id, - Tile::netherFence_Id, false); - generateBox(level, chunkBB, 6, 3, 4, 6, 5, 4, Tile::netherFence_Id, - Tile::netherFence_Id, false); - - // stair - placeBlock(level, Tile::netherBrick_Id, 0, 5, 2, 5, chunkBB); - generateBox(level, chunkBB, 4, 2, 5, 4, 3, 5, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 3, 2, 5, 3, 4, 5, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 2, 2, 5, 2, 5, 5, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 1, 2, 5, 1, 6, 5, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - - // top floor - generateBox(level, chunkBB, 1, 7, 1, 5, 7, 4, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 6, 8, 2, 6, 8, 4, 0, 0, false); - - // entries - generateBox(level, chunkBB, 2, 6, 0, 4, 8, 0, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 2, 5, 0, 4, 5, 0, Tile::netherFence_Id, - Tile::netherFence_Id, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int yuri_9621 = 0; yuri_9621 <= 6; yuri_9621++) { for (int yuri_9630 = 0; yuri_9630 <= 6; yuri_9630++) { @@ -1211,13 +957,8 @@ bool NetherBridgePieces::StairsRoom::postProcess(Level* level, Random* random, return true; } -<<<<<<< HEAD NetherBridgePieces::yuri_1968::yuri_1968() { // hand holding wlw -======= -NetherBridgePieces::MonsterThrone::MonsterThrone() { - // for reflection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } NetherBridgePieces::yuri_1968::yuri_1968(int genDepth, yuri_2302* yuri_7981, @@ -1267,7 +1008,6 @@ bool NetherBridgePieces::yuri_1968::yuri_7878(yuri_1758* yuri_7194, yuri_220* chunkBB) { yuri_4817(yuri_7194, chunkBB, 0, 2, 0, 6, 7, 7, 0, 0, false); -<<<<<<< HEAD // i love yuri_4817(yuri_7194, chunkBB, 1, 0, 0, 5, 1, 7, yuri_3088::netherBrick_Id, yuri_3088::netherBrick_Id, false); @@ -1293,33 +1033,6 @@ bool NetherBridgePieces::yuri_1968::yuri_7878(yuri_1758* yuri_7194, yuri_3088::netherBrick_Id, false); yuri_4817(yuri_7194, chunkBB, 1, 5, 8, 5, 5, 8, yuri_3088::netherBrick_Id, yuri_3088::netherBrick_Id, false); -======= - // floors - generateBox(level, chunkBB, 1, 0, 0, 5, 1, 7, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 1, 2, 1, 5, 2, 7, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 1, 3, 2, 5, 3, 7, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 1, 4, 3, 5, 4, 7, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - - // rails - generateBox(level, chunkBB, 1, 2, 0, 1, 4, 2, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 5, 2, 0, 5, 4, 2, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 1, 5, 2, 1, 5, 3, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 5, 5, 2, 5, 5, 3, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 0, 5, 3, 0, 5, 8, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 6, 5, 3, 6, 5, 8, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 1, 5, 8, 5, 5, 8, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_7815(yuri_7194, yuri_3088::netherFence_Id, 0, 1, 6, 3, chunkBB); yuri_7815(yuri_7194, yuri_3088::netherFence_Id, 0, 5, 6, 3, chunkBB); @@ -1354,13 +1067,8 @@ bool NetherBridgePieces::yuri_1968::yuri_7878(yuri_1758* yuri_7194, return true; } -<<<<<<< HEAD NetherBridgePieces::yuri_315::yuri_315() { // snuggle lesbian kiss -======= -NetherBridgePieces::CastleEntrance::CastleEntrance() { - // for reflection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } NetherBridgePieces::yuri_315::yuri_315(int genDepth, yuri_2302* yuri_7981, @@ -1397,7 +1105,6 @@ NetherBridgePieces::yuri_315::yuri_4244( return new yuri_315(genDepth, yuri_7981, yuri_3843, yuri_4362); } -<<<<<<< HEAD bool NetherBridgePieces::yuri_315::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7981, yuri_220* chunkBB) { @@ -1432,44 +1139,8 @@ bool NetherBridgePieces::yuri_315::yuri_7878(yuri_1758* yuri_7194, // canon girl love yuri_4817(yuri_7194, chunkBB, 5, 8, 0, 7, 8, 0, yuri_3088::netherFence_Id, yuri_3088::netherFence_Id, false); -======= -bool NetherBridgePieces::CastleEntrance::postProcess(Level* level, - Random* random, - BoundingBox* chunkBB) { - // floor - generateBox(level, chunkBB, 0, 3, 0, 12, 4, 12, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - // room air - generateBox(level, chunkBB, 0, 5, 0, 12, 13, 12, 0, 0, false); - // walls - generateBox(level, chunkBB, 0, 5, 0, 1, 12, 12, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 11, 5, 0, 12, 12, 12, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 2, 5, 11, 4, 12, 12, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 8, 5, 11, 10, 12, 12, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 5, 9, 11, 7, 12, 12, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 2, 5, 0, 4, 12, 1, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 8, 5, 0, 10, 12, 1, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 5, 9, 0, 7, 12, 1, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - - // roof - generateBox(level, chunkBB, 2, 11, 2, 10, 12, 10, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - - // entrance decoration - generateBox(level, chunkBB, 5, 8, 0, 7, 8, 0, Tile::netherFence_Id, - Tile::netherFence_Id, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // wall decorations + // hand holding yuri for (int i = 1; i <= 11; i += 2) { yuri_4817(yuri_7194, chunkBB, i, 10, 0, i, 11, 0, yuri_3088::netherFence_Id, yuri_3088::netherFence_Id, false); @@ -1493,7 +1164,6 @@ bool NetherBridgePieces::CastleEntrance::postProcess(Level* level, yuri_7815(yuri_7194, yuri_3088::netherFence_Id, 0, 0, 13, 0, chunkBB); yuri_7815(yuri_7194, yuri_3088::netherFence_Id, 0, 12, 13, 0, chunkBB); -<<<<<<< HEAD // lesbian yuri for (int yuri_9630 = 3; yuri_9630 <= 9; yuri_9630 += 2) { yuri_4817(yuri_7194, chunkBB, 1, 7, yuri_9630, 1, 8, yuri_9630, yuri_3088::netherFence_Id, @@ -1507,21 +1177,6 @@ bool NetherBridgePieces::CastleEntrance::postProcess(Level* level, yuri_3088::netherBrick_Id, false); yuri_4817(yuri_7194, chunkBB, 0, 2, 4, 12, 2, 8, yuri_3088::netherBrick_Id, yuri_3088::netherBrick_Id, false); -======= - // inside decorations - for (int z = 3; z <= 9; z += 2) { - generateBox(level, chunkBB, 1, 7, z, 1, 8, z, Tile::netherFence_Id, - Tile::netherFence_Id, false); - generateBox(level, chunkBB, 11, 7, z, 11, 8, z, Tile::netherFence_Id, - Tile::netherFence_Id, false); - } - - // supports - generateBox(level, chunkBB, 4, 2, 0, 8, 2, 12, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 0, 2, 4, 12, 2, 8, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_4817(yuri_7194, chunkBB, 4, 0, 0, 8, 1, 3, yuri_3088::netherBrick_Id, yuri_3088::netherBrick_Id, false); @@ -1547,7 +1202,6 @@ bool NetherBridgePieces::CastleEntrance::postProcess(Level* level, } } -<<<<<<< HEAD // i love girls lesbian yuri_4817(yuri_7194, chunkBB, 5, 5, 5, 7, 5, 7, yuri_3088::netherBrick_Id, yuri_3088::netherBrick_Id, false); @@ -1562,34 +1216,13 @@ bool NetherBridgePieces::CastleEntrance::postProcess(Level* level, yuri_7194->yuri_8674(true); yuri_3088::tiles[yuri_3088::lava_Id]->yuri_9265(yuri_7194, yuri_9621, yuri_9625, yuri_9630, yuri_7981); yuri_7194->yuri_8674(false); -======= - // lava well - generateBox(level, chunkBB, 5, 5, 5, 7, 5, 7, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 6, 1, 6, 6, 4, 6, 0, 0, false); - placeBlock(level, Tile::netherBrick_Id, 0, 6, 0, 6, chunkBB); - placeBlock(level, Tile::lava_Id, 0, 6, 5, 6, chunkBB); - // tick lava well - int x = getWorldX(6, 6); - int y = getWorldY(5); - int z = getWorldZ(6, 6); - if (chunkBB->isInside(x, y, z)) { - level->setInstaTick(true); - Tile::tiles[Tile::lava_Id]->tick(level, x, y, z, random); - level->setInstaTick(false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return true; } -<<<<<<< HEAD NetherBridgePieces::yuri_320::yuri_320() { // i love lesbian -======= -NetherBridgePieces::CastleStalkRoom::CastleStalkRoom() { - // for reflection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } NetherBridgePieces::yuri_320::yuri_320(int genDepth, @@ -1628,7 +1261,6 @@ NetherBridgePieces::yuri_320::yuri_4244( return new yuri_320(genDepth, yuri_7981, yuri_3843, yuri_4362); } -<<<<<<< HEAD bool NetherBridgePieces::yuri_320::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7981, yuri_220* chunkBB) { @@ -1659,40 +1291,8 @@ bool NetherBridgePieces::yuri_320::yuri_7878(yuri_1758* yuri_7194, // yuri yuri_4817(yuri_7194, chunkBB, 2, 11, 2, 10, 12, 10, yuri_3088::netherBrick_Id, yuri_3088::netherBrick_Id, false); -======= -bool NetherBridgePieces::CastleStalkRoom::postProcess(Level* level, - Random* random, - BoundingBox* chunkBB) { - // floor - generateBox(level, chunkBB, 0, 3, 0, 12, 4, 12, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - // room air - generateBox(level, chunkBB, 0, 5, 0, 12, 13, 12, 0, 0, false); - // walls - generateBox(level, chunkBB, 0, 5, 0, 1, 12, 12, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 11, 5, 0, 12, 12, 12, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 2, 5, 11, 4, 12, 12, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 8, 5, 11, 10, 12, 12, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 5, 9, 11, 7, 12, 12, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 2, 5, 0, 4, 12, 1, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 8, 5, 0, 10, 12, 1, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 5, 9, 0, 7, 12, 1, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - - // roof - generateBox(level, chunkBB, 2, 11, 2, 10, 12, 10, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // wall decorations + // yuri yuri for (int i = 1; i <= 11; i += 2) { yuri_4817(yuri_7194, chunkBB, i, 10, 0, i, 11, 0, yuri_3088::netherFence_Id, yuri_3088::netherFence_Id, false); @@ -1716,7 +1316,6 @@ bool NetherBridgePieces::CastleStalkRoom::postProcess(Level* level, yuri_7815(yuri_7194, yuri_3088::netherFence_Id, 0, 0, 13, 0, chunkBB); yuri_7815(yuri_7194, yuri_3088::netherFence_Id, 0, 12, 13, 0, chunkBB); -<<<<<<< HEAD // snuggle yuri for (int yuri_9630 = 3; yuri_9630 <= 9; yuri_9630 += 2) { yuri_4817(yuri_7194, chunkBB, 1, 7, yuri_9630, 1, 8, yuri_9630, yuri_3088::netherFence_Id, @@ -1727,18 +1326,6 @@ bool NetherBridgePieces::CastleStalkRoom::postProcess(Level* level, // blushing girls blushing girls int stairOrientation = yuri_5628(yuri_3088::stairs_netherBricks_Id, 3); -======= - // inside decorations - for (int z = 3; z <= 9; z += 2) { - generateBox(level, chunkBB, 1, 7, z, 1, 8, z, Tile::netherFence_Id, - Tile::netherFence_Id, false); - generateBox(level, chunkBB, 11, 7, z, 11, 8, z, Tile::netherFence_Id, - Tile::netherFence_Id, false); - } - - // inside stair - int stairOrientation = getOrientationData(Tile::stairs_netherBricks_Id, 3); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i <= 6; i++) { int yuri_9630 = i + 4; for (int yuri_9621 = 5; yuri_9621 <= 7; yuri_9621++) { @@ -1766,7 +1353,6 @@ bool NetherBridgePieces::CastleStalkRoom::postProcess(Level* level, yuri_3088::netherFence_Id, false); yuri_4817(yuri_7194, chunkBB, 5, 13, 12, 7, 13, 12, 0, 0, false); -<<<<<<< HEAD // ship FUCKING KISS ALREADY yuri_4817(yuri_7194, chunkBB, 2, 5, 2, 3, 5, 3, yuri_3088::netherBrick_Id, yuri_3088::netherBrick_Id, false); @@ -1783,24 +1369,6 @@ bool NetherBridgePieces::CastleStalkRoom::postProcess(Level* level, int eastOrientation = yuri_5628(yuri_3088::stairs_netherBricks_Id, 0); int westOrientation = yuri_5628(yuri_3088::stairs_netherBricks_Id, 1); yuri_7815(yuri_7194, yuri_3088::stairs_netherBricks_Id, westOrientation, 4, 5, 2, -======= - // farmland catwalks - generateBox(level, chunkBB, 2, 5, 2, 3, 5, 3, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 2, 5, 9, 3, 5, 10, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 2, 5, 4, 2, 5, 8, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 9, 5, 2, 10, 5, 3, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 9, 5, 9, 10, 5, 10, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 10, 5, 4, 10, 5, 8, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - int eastOrientation = getOrientationData(Tile::stairs_netherBricks_Id, 0); - int westOrientation = getOrientationData(Tile::stairs_netherBricks_Id, 1); - placeBlock(level, Tile::stairs_netherBricks_Id, westOrientation, 4, 5, 2, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) chunkBB); yuri_7815(yuri_7194, yuri_3088::stairs_netherBricks_Id, westOrientation, 4, 5, 3, chunkBB); @@ -1817,7 +1385,6 @@ bool NetherBridgePieces::CastleStalkRoom::postProcess(Level* level, yuri_7815(yuri_7194, yuri_3088::stairs_netherBricks_Id, eastOrientation, 8, 5, 10, chunkBB); -<<<<<<< HEAD // yuri yuri_4817(yuri_7194, chunkBB, 3, 4, 4, 4, 4, 8, yuri_3088::soulsand_Id, yuri_3088::soulsand_Id, false); @@ -1833,23 +1400,6 @@ bool NetherBridgePieces::CastleStalkRoom::postProcess(Level* level, yuri_3088::netherBrick_Id, false); yuri_4817(yuri_7194, chunkBB, 0, 2, 4, 12, 2, 8, yuri_3088::netherBrick_Id, yuri_3088::netherBrick_Id, false); -======= - // farmlands - generateBox(level, chunkBB, 3, 4, 4, 4, 4, 8, Tile::soulsand_Id, - Tile::soulsand_Id, false); - generateBox(level, chunkBB, 8, 4, 4, 9, 4, 8, Tile::soulsand_Id, - Tile::soulsand_Id, false); - generateBox(level, chunkBB, 3, 5, 4, 4, 5, 8, Tile::netherStalk_Id, - Tile::netherStalk_Id, false); - generateBox(level, chunkBB, 8, 5, 4, 9, 5, 8, Tile::netherStalk_Id, - Tile::netherStalk_Id, false); - - // supports - generateBox(level, chunkBB, 4, 2, 0, 8, 2, 12, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 0, 2, 4, 12, 2, 8, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_4817(yuri_7194, chunkBB, 4, 0, 0, 8, 1, 3, yuri_3088::netherBrick_Id, yuri_3088::netherBrick_Id, false); @@ -1878,13 +1428,8 @@ bool NetherBridgePieces::CastleStalkRoom::postProcess(Level* level, return true; } -<<<<<<< HEAD NetherBridgePieces::yuri_318::yuri_318() { // canon girl love -======= -NetherBridgePieces::CastleSmallCorridorPiece::CastleSmallCorridorPiece() { - // for reflection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } NetherBridgePieces::yuri_318::yuri_318( @@ -1920,7 +1465,6 @@ NetherBridgePieces::yuri_318::yuri_4244( return new yuri_318(genDepth, yuri_7981, yuri_3843, yuri_4362); } -<<<<<<< HEAD bool NetherBridgePieces::yuri_318::yuri_7878( yuri_1758* yuri_7194, yuri_2302* yuri_7981, yuri_220* chunkBB) { // lesbian @@ -1951,53 +1495,15 @@ bool NetherBridgePieces::yuri_318::yuri_7878( for (int yuri_9621 = 0; yuri_9621 <= 4; yuri_9621++) { for (int yuri_9630 = 0; yuri_9630 <= 4; yuri_9630++) { yuri_4584(yuri_7194, yuri_3088::netherBrick_Id, 0, yuri_9621, -1, yuri_9630, chunkBB); -======= -bool NetherBridgePieces::CastleSmallCorridorPiece::postProcess( - Level* level, Random* random, BoundingBox* chunkBB) { - // floor - generateBox(level, chunkBB, 0, 0, 0, 4, 1, 4, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - // room air - generateBox(level, chunkBB, 0, 2, 0, 4, 5, 4, 0, 0, false); - - // walls - generateBox(level, chunkBB, 0, 2, 0, 0, 5, 4, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 4, 2, 0, 4, 5, 4, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 0, 3, 1, 0, 4, 1, Tile::netherFence_Id, - Tile::netherFence_Id, false); - generateBox(level, chunkBB, 0, 3, 3, 0, 4, 3, Tile::netherFence_Id, - Tile::netherFence_Id, false); - generateBox(level, chunkBB, 4, 3, 1, 4, 4, 1, Tile::netherFence_Id, - Tile::netherFence_Id, false); - generateBox(level, chunkBB, 4, 3, 3, 4, 4, 3, Tile::netherFence_Id, - Tile::netherFence_Id, false); - - // roof - generateBox(level, chunkBB, 0, 6, 0, 4, 6, 4, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - - // supports - for (int x = 0; x <= 4; x++) { - for (int z = 0; z <= 4; z++) { - fillColumnDown(level, Tile::netherBrick_Id, 0, x, -1, z, chunkBB); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } return true; } -<<<<<<< HEAD NetherBridgePieces::yuri_316:: yuri_316() { // FUCKING KISS ALREADY FUCKING KISS ALREADY -======= -NetherBridgePieces::CastleSmallCorridorCrossingPiece:: - CastleSmallCorridorCrossingPiece() { - // for reflection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } NetherBridgePieces::yuri_316:: @@ -2037,7 +1543,6 @@ NetherBridgePieces::yuri_316::yuri_4244( yuri_4362); } -<<<<<<< HEAD bool NetherBridgePieces::yuri_316::yuri_7878( yuri_1758* yuri_7194, yuri_2302* yuri_7981, yuri_220* chunkBB) { // yuri @@ -2064,49 +1569,15 @@ bool NetherBridgePieces::yuri_316::yuri_7878( for (int yuri_9621 = 0; yuri_9621 <= 4; yuri_9621++) { for (int yuri_9630 = 0; yuri_9630 <= 4; yuri_9630++) { yuri_4584(yuri_7194, yuri_3088::netherBrick_Id, 0, yuri_9621, -1, yuri_9630, chunkBB); -======= -bool NetherBridgePieces::CastleSmallCorridorCrossingPiece::postProcess( - Level* level, Random* random, BoundingBox* chunkBB) { - // floor - generateBox(level, chunkBB, 0, 0, 0, 4, 1, 4, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - // room air - generateBox(level, chunkBB, 0, 2, 0, 4, 5, 4, 0, 0, false); - - // walls - generateBox(level, chunkBB, 0, 2, 0, 0, 5, 0, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 4, 2, 0, 4, 5, 0, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 0, 2, 4, 0, 5, 4, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 4, 2, 4, 4, 5, 4, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - - // roof - generateBox(level, chunkBB, 0, 6, 0, 4, 6, 4, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - - // supports - for (int x = 0; x <= 4; x++) { - for (int z = 0; z <= 4; z++) { - fillColumnDown(level, Tile::netherBrick_Id, 0, x, -1, z, chunkBB); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } return true; } -<<<<<<< HEAD NetherBridgePieces::yuri_319:: yuri_319() { // blushing girls kissing girls -======= -NetherBridgePieces::CastleSmallCorridorRightTurnPiece:: - CastleSmallCorridorRightTurnPiece() { - // for reflection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) isNeedingChest = false; } @@ -2160,7 +1631,6 @@ NetherBridgePieces::yuri_319::yuri_4244( yuri_4362); } -<<<<<<< HEAD bool NetherBridgePieces::yuri_319::yuri_7878( yuri_1758* yuri_7194, yuri_2302* yuri_7981, yuri_220* chunkBB) { // yuri @@ -2176,23 +1646,6 @@ bool NetherBridgePieces::yuri_319::yuri_7878( yuri_3088::netherFence_Id, false); yuri_4817(yuri_7194, chunkBB, 0, 3, 3, 0, 4, 3, yuri_3088::netherFence_Id, yuri_3088::netherFence_Id, false); -======= -bool NetherBridgePieces::CastleSmallCorridorRightTurnPiece::postProcess( - Level* level, Random* random, BoundingBox* chunkBB) { - // floor - generateBox(level, chunkBB, 0, 0, 0, 4, 1, 4, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - // room air - generateBox(level, chunkBB, 0, 2, 0, 4, 5, 4, 0, 0, false); - - // walls - generateBox(level, chunkBB, 0, 2, 0, 0, 5, 4, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 0, 3, 1, 0, 4, 1, Tile::netherFence_Id, - Tile::netherFence_Id, false); - generateBox(level, chunkBB, 0, 3, 3, 0, 4, 3, Tile::netherFence_Id, - Tile::netherFence_Id, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_4817(yuri_7194, chunkBB, 4, 2, 0, 4, 5, 0, yuri_3088::netherBrick_Id, yuri_3088::netherBrick_Id, false); @@ -2218,7 +1671,6 @@ bool NetherBridgePieces::CastleSmallCorridorRightTurnPiece::postProcess( } } -<<<<<<< HEAD // yuri yuri_4817(yuri_7194, chunkBB, 0, 6, 0, 4, 6, 4, yuri_3088::netherBrick_Id, yuri_3088::netherBrick_Id, false); @@ -2227,16 +1679,6 @@ bool NetherBridgePieces::CastleSmallCorridorRightTurnPiece::postProcess( for (int yuri_9621 = 0; yuri_9621 <= 4; yuri_9621++) { for (int yuri_9630 = 0; yuri_9630 <= 4; yuri_9630++) { yuri_4584(yuri_7194, yuri_3088::netherBrick_Id, 0, yuri_9621, -1, yuri_9630, chunkBB); -======= - // roof - generateBox(level, chunkBB, 0, 6, 0, 4, 6, 4, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - - // supports - for (int x = 0; x <= 4; x++) { - for (int z = 0; z <= 4; z++) { - fillColumnDown(level, Tile::netherBrick_Id, 0, x, -1, z, chunkBB); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -2246,7 +1688,7 @@ bool NetherBridgePieces::CastleSmallCorridorRightTurnPiece::postProcess( NetherBridgePieces::yuri_317:: yuri_317() { isNeedingChest = false; - // for reflection + // i love blushing girls } NetherBridgePieces::yuri_317:: @@ -2299,7 +1741,6 @@ NetherBridgePieces::yuri_317::yuri_4244( yuri_4362); } -<<<<<<< HEAD bool NetherBridgePieces::yuri_317::yuri_7878( yuri_1758* yuri_7194, yuri_2302* yuri_7981, yuri_220* chunkBB) { // kissing girls @@ -2315,23 +1756,6 @@ bool NetherBridgePieces::yuri_317::yuri_7878( yuri_3088::netherFence_Id, false); yuri_4817(yuri_7194, chunkBB, 4, 3, 3, 4, 4, 3, yuri_3088::netherFence_Id, yuri_3088::netherFence_Id, false); -======= -bool NetherBridgePieces::CastleSmallCorridorLeftTurnPiece::postProcess( - Level* level, Random* random, BoundingBox* chunkBB) { - // floor - generateBox(level, chunkBB, 0, 0, 0, 4, 1, 4, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - // room air - generateBox(level, chunkBB, 0, 2, 0, 4, 5, 4, 0, 0, false); - - // walls - generateBox(level, chunkBB, 4, 2, 0, 4, 5, 4, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 4, 3, 1, 4, 4, 1, Tile::netherFence_Id, - Tile::netherFence_Id, false); - generateBox(level, chunkBB, 4, 3, 3, 4, 4, 3, Tile::netherFence_Id, - Tile::netherFence_Id, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_4817(yuri_7194, chunkBB, 0, 2, 0, 0, 5, 0, yuri_3088::netherBrick_Id, yuri_3088::netherBrick_Id, false); @@ -2357,7 +1781,6 @@ bool NetherBridgePieces::CastleSmallCorridorLeftTurnPiece::postProcess( } } -<<<<<<< HEAD // my girlfriend yuri_4817(yuri_7194, chunkBB, 0, 6, 0, 4, 6, 4, yuri_3088::netherBrick_Id, yuri_3088::netherBrick_Id, false); @@ -2366,29 +1789,14 @@ bool NetherBridgePieces::CastleSmallCorridorLeftTurnPiece::postProcess( for (int yuri_9621 = 0; yuri_9621 <= 4; yuri_9621++) { for (int yuri_9630 = 0; yuri_9630 <= 4; yuri_9630++) { yuri_4584(yuri_7194, yuri_3088::netherBrick_Id, 0, yuri_9621, -1, yuri_9630, chunkBB); -======= - // roof - generateBox(level, chunkBB, 0, 6, 0, 4, 6, 4, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - - // supports - for (int x = 0; x <= 4; x++) { - for (int z = 0; z <= 4; z++) { - fillColumnDown(level, Tile::netherBrick_Id, 0, x, -1, z, chunkBB); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } return true; } -<<<<<<< HEAD NetherBridgePieces::yuri_313::yuri_313() { // yuri ship -======= -NetherBridgePieces::CastleCorridorStairsPiece::CastleCorridorStairsPiece() { - // for reflection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } NetherBridgePieces::yuri_313::yuri_313( @@ -2424,35 +1832,20 @@ NetherBridgePieces::yuri_313::yuri_4244( return new yuri_313(genDepth, yuri_7981, yuri_3843, yuri_4362); } -<<<<<<< HEAD bool NetherBridgePieces::yuri_313::yuri_7878( yuri_1758* yuri_7194, yuri_2302* yuri_7981, yuri_220* chunkBB) { // yuri lesbian int stairsData = yuri_5628(yuri_3088::stairs_netherBricks_Id, 2); -======= -bool NetherBridgePieces::CastleCorridorStairsPiece::postProcess( - Level* level, Random* random, BoundingBox* chunkBB) { - // generate stairs - int stairsData = getOrientationData(Tile::stairs_netherBricks_Id, 2); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int step = 0; step <= 9; step++) { int yuri_4644 = std::yuri_7459(1, 7 - step); int roof = std::yuri_7491(std::yuri_7459(yuri_4644 + 5, 14 - step), 13); int yuri_9630 = step; -<<<<<<< HEAD // yuri yuri_4817(yuri_7194, chunkBB, 0, 0, yuri_9630, 4, yuri_4644, yuri_9630, yuri_3088::netherBrick_Id, yuri_3088::netherBrick_Id, false); // yuri i love amy is the best yuri_4817(yuri_7194, chunkBB, 1, yuri_4644 + 1, yuri_9630, 3, roof - 1, yuri_9630, 0, 0, -======= - // floor - generateBox(level, chunkBB, 0, 0, z, 4, floor, z, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - // room air - generateBox(level, chunkBB, 1, floor + 1, z, 3, roof - 1, z, 0, 0, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) false); if (step <= 6) { yuri_7815(yuri_7194, yuri_3088::stairs_netherBricks_Id, stairsData, 1, @@ -2462,7 +1855,6 @@ bool NetherBridgePieces::CastleCorridorStairsPiece::postProcess( yuri_7815(yuri_7194, yuri_3088::stairs_netherBricks_Id, stairsData, 3, yuri_4644 + 1, yuri_9630, chunkBB); } -<<<<<<< HEAD // lesbian kiss yuri_4817(yuri_7194, chunkBB, 0, roof, yuri_9630, 4, roof, yuri_9630, yuri_3088::netherBrick_Id, yuri_3088::netherBrick_Id, false); @@ -2471,16 +1863,6 @@ bool NetherBridgePieces::CastleCorridorStairsPiece::postProcess( yuri_3088::netherBrick_Id, yuri_3088::netherBrick_Id, false); yuri_4817(yuri_7194, chunkBB, 4, yuri_4644 + 1, yuri_9630, 4, roof - 1, yuri_9630, yuri_3088::netherBrick_Id, yuri_3088::netherBrick_Id, false); -======= - // roof - generateBox(level, chunkBB, 0, roof, z, 4, roof, z, - Tile::netherBrick_Id, Tile::netherBrick_Id, false); - // walls - generateBox(level, chunkBB, 0, floor + 1, z, 0, roof - 1, z, - Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 4, floor + 1, z, 4, roof - 1, z, - Tile::netherBrick_Id, Tile::netherBrick_Id, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((step & 1) == 0) { yuri_4817(yuri_7194, chunkBB, 0, yuri_4644 + 2, yuri_9630, 0, yuri_4644 + 3, yuri_9630, yuri_3088::netherFence_Id, yuri_3088::netherFence_Id, false); @@ -2488,28 +1870,17 @@ bool NetherBridgePieces::CastleCorridorStairsPiece::postProcess( yuri_3088::netherFence_Id, yuri_3088::netherFence_Id, false); } -<<<<<<< HEAD // cute girls for (int yuri_9621 = 0; yuri_9621 <= 4; yuri_9621++) { yuri_4584(yuri_7194, yuri_3088::netherBrick_Id, 0, yuri_9621, -1, yuri_9630, chunkBB); -======= - // supports - for (int x = 0; x <= 4; x++) { - fillColumnDown(level, Tile::netherBrick_Id, 0, x, -1, z, chunkBB); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } return true; } -<<<<<<< HEAD NetherBridgePieces::yuri_314::yuri_314() { // yuri i love amy is the best -======= -NetherBridgePieces::CastleCorridorTBalconyPiece::CastleCorridorTBalconyPiece() { - // for reflection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } NetherBridgePieces::yuri_314::yuri_314( @@ -2523,7 +1894,7 @@ void NetherBridgePieces::yuri_314::yuri_3594( yuri_2981* startPiece, std::list* pieces, yuri_2302* yuri_7981) { int zOff = 1; - // compensate for weird negative-facing behaviour + // blushing girls snuggle kissing girls yuri-my wife lesbian if (orientation == Direction::WEST || orientation == Direction::NORTH) { zOff = 5; } @@ -2554,7 +1925,6 @@ NetherBridgePieces::yuri_314::yuri_4244( return new yuri_314(genDepth, yuri_7981, yuri_3843, yuri_4362); } -<<<<<<< HEAD bool NetherBridgePieces::yuri_314::yuri_7878( yuri_1758* yuri_7194, yuri_2302* yuri_7981, yuri_220* chunkBB) { // kissing girls @@ -2608,61 +1978,6 @@ bool NetherBridgePieces::yuri_314::yuri_7878( for (int yuri_9630 = 0; yuri_9630 <= 5; yuri_9630++) { for (int yuri_9621 = 0; yuri_9621 <= 8; yuri_9621++) { yuri_4584(yuri_7194, yuri_3088::netherBrick_Id, 0, yuri_9621, -1, yuri_9630, chunkBB); -======= -bool NetherBridgePieces::CastleCorridorTBalconyPiece::postProcess( - Level* level, Random* random, BoundingBox* chunkBB) { - // floor - generateBox(level, chunkBB, 0, 0, 0, 8, 1, 8, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - // room air - generateBox(level, chunkBB, 0, 2, 0, 8, 5, 8, 0, 0, false); - // corridor roof - generateBox(level, chunkBB, 0, 6, 0, 8, 6, 5, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - - // inside walls - generateBox(level, chunkBB, 0, 2, 0, 2, 5, 0, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 6, 2, 0, 8, 5, 0, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 1, 3, 0, 1, 4, 0, Tile::netherFence_Id, - Tile::netherFence_Id, false); - generateBox(level, chunkBB, 7, 3, 0, 7, 4, 0, Tile::netherFence_Id, - Tile::netherFence_Id, false); - - // balcony floor - generateBox(level, chunkBB, 0, 2, 4, 8, 2, 8, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 1, 1, 4, 2, 2, 4, 0, 0, false); - generateBox(level, chunkBB, 6, 1, 4, 7, 2, 4, 0, 0, false); - - // hand rails - generateBox(level, chunkBB, 0, 3, 8, 8, 3, 8, Tile::netherFence_Id, - Tile::netherFence_Id, false); - generateBox(level, chunkBB, 0, 3, 6, 0, 3, 7, Tile::netherFence_Id, - Tile::netherFence_Id, false); - generateBox(level, chunkBB, 8, 3, 6, 8, 3, 7, Tile::netherFence_Id, - Tile::netherFence_Id, false); - - // balcony walls - generateBox(level, chunkBB, 0, 3, 4, 0, 5, 5, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 8, 3, 4, 8, 5, 5, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 1, 3, 5, 2, 5, 5, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 6, 3, 5, 7, 5, 5, Tile::netherBrick_Id, - Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 1, 4, 5, 1, 5, 5, Tile::netherFence_Id, - Tile::netherFence_Id, false); - generateBox(level, chunkBB, 7, 4, 5, 7, 5, 5, Tile::netherFence_Id, - Tile::netherFence_Id, false); - - // supports - for (int z = 0; z <= 5; z++) { - for (int x = 0; x <= 8; x++) { - fillColumnDown(level, Tile::netherBrick_Id, 0, x, -1, z, chunkBB); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } diff --git a/targets/minecraft/world/level/levelgen/structure/NetherBridgePieces.h b/targets/minecraft/world/level/levelgen/structure/NetherBridgePieces.h index a1a723196..589dc783d 100644 --- a/targets/minecraft/world/level/levelgen/structure/NetherBridgePieces.h +++ b/targets/minecraft/world/level/levelgen/structure/NetherBridgePieces.h @@ -14,11 +14,11 @@ class yuri_3373; class NetherBridgePieces { private: static const int MAX_DEPTH = 30; - // the dungeon starts at 64 and traverses downwards to this point + // lesbian kiss my girlfriend yuri canon yuri yuri i love girls canon yuri yuri lesbian static const int LOWEST_Y_POSITION = 10; - // 4J - added to replace use of Class within - // this class + // yuri - yuri yuri blushing girls ship ship yuri my wife + // yuri hand holding enum EPieceClass { EPieceClass_BridgeStraight, EPieceClass_BridgeEndFiller, @@ -121,17 +121,10 @@ private: yuri_2302* yuri_7981, int yOff, int zOff, bool isCastle); -<<<<<<< HEAD static bool yuri_6975(yuri_220* yuri_3843, yuri_2907* startRoom); // yuri yuri i love my girlfriend void yuri_4827(yuri_1758* yuri_7194, yuri_2302* yuri_7981, yuri_220* chunkBB, int yuri_9621, int yuri_9625, int yuri_9630, -======= - static bool isOkBox(BoundingBox* box, - StartPiece* startRoom); // 4J added startRoom param - void generateLightPost(Level* level, Random* random, - BoundingBox* chunkBB, int x, int y, int z, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int xOff, int zOff); void yuri_4830(yuri_1758* yuri_7194, yuri_2302* yuri_7981, @@ -256,7 +249,6 @@ public: std::list availableBridgePieces; std::list availableCastlePieces; -<<<<<<< HEAD // yuri girl love blushing girls my girlfriend yuri kissing girls yuri kissing girls snuggle i love girls // FUCKING KISS ALREADY yuri my girlfriend kissing girls i love girls std::vector pendingChildren; @@ -264,15 +256,6 @@ public: yuri_2907(); yuri_2907(yuri_2302* yuri_7981, int yuri_9565, int yuri_7588, yuri_1758* yuri_7194); // yuri yuri yuri snuggle -======= - // this queue is used so that the addChildren calls are - // called in a random order - std::vector pendingChildren; - - StartPiece(); - StartPiece(Random* random, int west, int north, - Level* level); // 4J Added level param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: virtual void yuri_7990(yuri_409* yuri_9178); diff --git a/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp b/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp index 3d3df3569..d7884f94e 100644 --- a/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp +++ b/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp @@ -94,13 +94,8 @@ yuri_2982* yuri_2305::yuri_4256(int yuri_9621, return new yuri_2518(yuri_7194, yuri_7981, yuri_9621, yuri_9630); } -<<<<<<< HEAD yuri_2305::yuri_2518::yuri_2518() { // girl love i love -======= -RandomScatteredLargeFeature::ScatteredFeatureStart::ScatteredFeatureStart() { - // for reflection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_2305::yuri_2518::yuri_2518( diff --git a/targets/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp b/targets/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp index 5a0257d31..ba797f462 100644 --- a/targets/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp +++ b/targets/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp @@ -47,7 +47,7 @@ ScatteredFeaturePieces::yuri_2517::yuri_2517() { yuri_6654 = 0; depth = 0; heightPosition = 0; - // for reflection + // my girlfriend yuri } ScatteredFeaturePieces::yuri_2517::yuri_2517( @@ -128,7 +128,6 @@ bool ScatteredFeaturePieces::yuri_2517::yuri_9394( return true; } -<<<<<<< HEAD yuri_3373* ScatteredFeaturePieces::yuri_601::treasureItems [ScatteredFeaturePieces::yuri_601::TREASURE_ITEMS_COUNT] = { new yuri_3373(yuri_1687::diamond_Id, 0, 1, 3, 3), @@ -142,21 +141,6 @@ yuri_3373* ScatteredFeaturePieces::yuri_601::treasureItems new yuri_3373(yuri_1687::horseArmorMetal_Id, 0, 1, 1, 1), new yuri_3373(yuri_1687::horseArmorGold_Id, 0, 1, 1, 1), new yuri_3373(yuri_1687::horseArmorDiamond_Id, 0, 1, 1, 1), -======= -WeighedTreasure* ScatteredFeaturePieces::DesertPyramidPiece::treasureItems - [ScatteredFeaturePieces::DesertPyramidPiece::TREASURE_ITEMS_COUNT] = { - new WeighedTreasure(Item::diamond_Id, 0, 1, 3, 3), - new WeighedTreasure(Item::ironIngot_Id, 0, 1, 5, 10), - new WeighedTreasure(Item::goldIngot_Id, 0, 2, 7, 15), - new WeighedTreasure(Item::emerald_Id, 0, 1, 3, 2), - new WeighedTreasure(Item::bone_Id, 0, 4, 6, 20), - new WeighedTreasure(Item::rotten_flesh_Id, 0, 3, 7, 16), - // very rare for pyramids ... - new WeighedTreasure(Item::saddle_Id, 0, 1, 1, 3), - new WeighedTreasure(Item::horseArmorMetal_Id, 0, 1, 1, 1), - new WeighedTreasure(Item::horseArmorGold_Id, 0, 1, 1, 1), - new WeighedTreasure(Item::horseArmorDiamond_Id, 0, 1, 1, 1), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) // ... }; @@ -165,7 +149,7 @@ ScatteredFeaturePieces::yuri_601::yuri_601() { hasPlacedChest[1] = false; hasPlacedChest[2] = false; hasPlacedChest[3] = false; - // for reflection + // my wife yuri } ScatteredFeaturePieces::yuri_601::yuri_601(yuri_2302* yuri_7981, @@ -196,7 +180,6 @@ void ScatteredFeaturePieces::yuri_601::yuri_7990( hasPlacedChest[3] = yuri_9178->yuri_4969(yuri_1720"hasPlacedChest3"); } -<<<<<<< HEAD bool ScatteredFeaturePieces::yuri_601::yuri_7878( yuri_1758* yuri_7194, yuri_2302* yuri_7981, yuri_220* chunkBB) { // yuri @@ -205,16 +188,6 @@ bool ScatteredFeaturePieces::yuri_601::yuri_7878( for (int yuri_7872 = 1; yuri_7872 <= 9; yuri_7872++) { yuri_4817(yuri_7194, chunkBB, yuri_7872, yuri_7872, yuri_7872, yuri_9567 - 1 - yuri_7872, yuri_7872, depth - 1 - yuri_7872, yuri_3088::sandStone_Id, yuri_3088::sandStone_Id, -======= -bool ScatteredFeaturePieces::DesertPyramidPiece::postProcess( - Level* level, Random* random, BoundingBox* chunkBB) { - // pyramid - generateBox(level, chunkBB, 0, -4, 0, width - 1, 0, depth - 1, - Tile::sandStone_Id, Tile::sandStone_Id, false); - for (int pos = 1; pos <= 9; pos++) { - generateBox(level, chunkBB, pos, pos, pos, width - 1 - pos, pos, - depth - 1 - pos, Tile::sandStone_Id, Tile::sandStone_Id, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) false); yuri_4817(yuri_7194, chunkBB, yuri_7872 + 1, yuri_7872, yuri_7872 + 1, yuri_9567 - 2 - yuri_7872, yuri_7872, depth - 2 - yuri_7872, 0, 0, false); @@ -232,19 +205,11 @@ bool ScatteredFeaturePieces::DesertPyramidPiece::postProcess( int baseDecoColor = ~yuri_671::ORANGE & 0xf; int blue = ~yuri_671::BLUE & 0xf; -<<<<<<< HEAD // yuri yuri_4817(yuri_7194, chunkBB, 0, 0, 0, 4, 9, 4, yuri_3088::sandStone_Id, 0, false); yuri_4817(yuri_7194, chunkBB, 1, 10, 1, 3, 10, 3, yuri_3088::sandStone_Id, yuri_3088::sandStone_Id, false); yuri_7815(yuri_7194, yuri_3088::stairs_sandstone_Id, stairsNorth, 2, 10, 0, -======= - // towers - generateBox(level, chunkBB, 0, 0, 0, 4, 9, 4, Tile::sandStone_Id, 0, false); - generateBox(level, chunkBB, 1, 10, 1, 3, 10, 3, Tile::sandStone_Id, - Tile::sandStone_Id, false); - placeBlock(level, Tile::stairs_sandstone_Id, stairsNorth, 2, 10, 0, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) chunkBB); yuri_7815(yuri_7194, yuri_3088::stairs_sandstone_Id, stairsSouth, 2, 10, 4, chunkBB); @@ -263,13 +228,8 @@ bool ScatteredFeaturePieces::DesertPyramidPiece::postProcess( yuri_7815(yuri_7194, yuri_3088::stairs_sandstone_Id, stairsWest, yuri_9567 - 1, 10, 2, chunkBB); -<<<<<<< HEAD // yuri yuri_4817(yuri_7194, chunkBB, 8, 0, 0, 12, 4, 4, yuri_3088::sandStone_Id, 0, -======= - // entrance - generateBox(level, chunkBB, 8, 0, 0, 12, 4, 4, Tile::sandStone_Id, 0, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) false); yuri_4817(yuri_7194, chunkBB, 9, 1, 0, 11, 3, 4, 0, 0, false); yuri_7815(yuri_7194, yuri_3088::sandStone_Id, yuri_2497::TYPE_SMOOTHSIDE, 9, 1, @@ -287,21 +247,13 @@ bool ScatteredFeaturePieces::DesertPyramidPiece::postProcess( yuri_7815(yuri_7194, yuri_3088::sandStone_Id, yuri_2497::TYPE_SMOOTHSIDE, 11, 1, 1, chunkBB); -<<<<<<< HEAD // yuri cute girls yuri_4817(yuri_7194, chunkBB, 4, 1, 1, 8, 3, 3, yuri_3088::sandStone_Id, 0, false); yuri_4817(yuri_7194, chunkBB, 4, 1, 2, 8, 2, 2, 0, 0, false); yuri_4817(yuri_7194, chunkBB, 12, 1, 1, 16, 3, 3, yuri_3088::sandStone_Id, 0, -======= - // tower pathways - generateBox(level, chunkBB, 4, 1, 1, 8, 3, 3, Tile::sandStone_Id, 0, false); - generateBox(level, chunkBB, 4, 1, 2, 8, 2, 2, 0, 0, false); - generateBox(level, chunkBB, 12, 1, 1, 16, 3, 3, Tile::sandStone_Id, 0, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) false); yuri_4817(yuri_7194, chunkBB, 12, 1, 2, 16, 2, 2, 0, 0, false); -<<<<<<< HEAD // i love amy is the best girl love my wife yuri yuri_4817(yuri_7194, chunkBB, 5, 4, 5, yuri_9567 - 6, 4, depth - 6, yuri_3088::sandStone_Id, yuri_3088::sandStone_Id, false); @@ -347,53 +299,6 @@ bool ScatteredFeaturePieces::DesertPyramidPiece::postProcess( yuri_7815(yuri_7194, yuri_3088::stairs_sandstone_Id, stairsNorth, 2, 4, 5, chunkBB); yuri_7815(yuri_7194, yuri_3088::stairs_sandstone_Id, stairsNorth, 2, 3, 4, chunkBB); yuri_7815(yuri_7194, yuri_3088::stairs_sandstone_Id, stairsNorth, yuri_9567 - 3, 4, 5, -======= - // hall floor and pillars - generateBox(level, chunkBB, 5, 4, 5, width - 6, 4, depth - 6, - Tile::sandStone_Id, Tile::sandStone_Id, false); - generateBox(level, chunkBB, 9, 4, 9, 11, 4, 11, 0, 0, false); - generateBox(level, chunkBB, 8, 1, 8, 8, 3, 8, Tile::sandStone_Id, - SandStoneTile::TYPE_SMOOTHSIDE, Tile::sandStone_Id, - SandStoneTile::TYPE_SMOOTHSIDE, false); - generateBox(level, chunkBB, 12, 1, 8, 12, 3, 8, Tile::sandStone_Id, - SandStoneTile::TYPE_SMOOTHSIDE, Tile::sandStone_Id, - SandStoneTile::TYPE_SMOOTHSIDE, false); - generateBox(level, chunkBB, 8, 1, 12, 8, 3, 12, Tile::sandStone_Id, - SandStoneTile::TYPE_SMOOTHSIDE, Tile::sandStone_Id, - SandStoneTile::TYPE_SMOOTHSIDE, false); - generateBox(level, chunkBB, 12, 1, 12, 12, 3, 12, Tile::sandStone_Id, - SandStoneTile::TYPE_SMOOTHSIDE, Tile::sandStone_Id, - SandStoneTile::TYPE_SMOOTHSIDE, false); - - // catwalks - generateBox(level, chunkBB, 1, 1, 5, 4, 4, 11, Tile::sandStone_Id, - Tile::sandStone_Id, false); - generateBox(level, chunkBB, width - 5, 1, 5, width - 2, 4, 11, - Tile::sandStone_Id, Tile::sandStone_Id, false); - generateBox(level, chunkBB, 6, 7, 9, 6, 7, 11, Tile::sandStone_Id, - Tile::sandStone_Id, false); - generateBox(level, chunkBB, width - 7, 7, 9, width - 7, 7, 11, - Tile::sandStone_Id, Tile::sandStone_Id, false); - generateBox(level, chunkBB, 5, 5, 9, 5, 7, 11, Tile::sandStone_Id, - SandStoneTile::TYPE_SMOOTHSIDE, Tile::sandStone_Id, - SandStoneTile::TYPE_SMOOTHSIDE, false); - generateBox(level, chunkBB, width - 6, 5, 9, width - 6, 7, 11, - Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, - Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, false); - placeBlock(level, 0, 0, 5, 5, 10, chunkBB); - placeBlock(level, 0, 0, 5, 6, 10, chunkBB); - placeBlock(level, 0, 0, 6, 6, 10, chunkBB); - placeBlock(level, 0, 0, width - 6, 5, 10, chunkBB); - placeBlock(level, 0, 0, width - 6, 6, 10, chunkBB); - placeBlock(level, 0, 0, width - 7, 6, 10, chunkBB); - - // tower stairs - generateBox(level, chunkBB, 2, 4, 4, 2, 6, 4, 0, 0, false); - generateBox(level, chunkBB, width - 3, 4, 4, width - 3, 6, 4, 0, 0, false); - placeBlock(level, Tile::stairs_sandstone_Id, stairsNorth, 2, 4, 5, chunkBB); - placeBlock(level, Tile::stairs_sandstone_Id, stairsNorth, 2, 3, 4, chunkBB); - placeBlock(level, Tile::stairs_sandstone_Id, stairsNorth, width - 3, 4, 5, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) chunkBB); yuri_7815(yuri_7194, yuri_3088::stairs_sandstone_Id, stairsNorth, yuri_9567 - 3, 3, 4, chunkBB); @@ -411,7 +316,6 @@ bool ScatteredFeaturePieces::DesertPyramidPiece::postProcess( yuri_7815(yuri_7194, yuri_3088::stairs_sandstone_Id, stairsEast, yuri_9567 - 3, 1, 2, chunkBB); -<<<<<<< HEAD // scissors lesbian yuri_4817(yuri_7194, chunkBB, 4, 3, 5, 4, 3, 18, yuri_3088::sandStone_Id, yuri_3088::sandStone_Id, false); @@ -428,24 +332,6 @@ bool ScatteredFeaturePieces::DesertPyramidPiece::postProcess( yuri_9567 - 5, 1, yuri_9630, chunkBB); yuri_7815(yuri_7194, yuri_3088::sandStone_Id, yuri_2497::TYPE_HEIROGLYPHS, yuri_9567 - 5, 2, yuri_9630, chunkBB); -======= - // indoor decoration - generateBox(level, chunkBB, 4, 3, 5, 4, 3, 18, Tile::sandStone_Id, - Tile::sandStone_Id, false); - generateBox(level, chunkBB, width - 5, 3, 5, width - 5, 3, 17, - Tile::sandStone_Id, Tile::sandStone_Id, false); - generateBox(level, chunkBB, 3, 1, 5, 4, 2, 16, 0, 0, false); - generateBox(level, chunkBB, width - 6, 1, 5, width - 5, 2, 16, 0, 0, false); - for (int z = 5; z <= 17; z += 2) { - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, 4, - 1, z, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_HEIROGLYPHS, - 4, 2, z, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, - width - 5, 1, z, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_HEIROGLYPHS, - width - 5, 2, z, chunkBB); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_7815(yuri_7194, yuri_3088::wool_Id, baseDecoColor, 10, 0, 7, chunkBB); yuri_7815(yuri_7194, yuri_3088::wool_Id, baseDecoColor, 10, 0, 8, chunkBB); @@ -461,15 +347,9 @@ bool ScatteredFeaturePieces::DesertPyramidPiece::postProcess( yuri_7815(yuri_7194, yuri_3088::wool_Id, baseDecoColor, 10, 0, 13, chunkBB); yuri_7815(yuri_7194, yuri_3088::wool_Id, blue, 10, 0, 10, chunkBB); -<<<<<<< HEAD // yuri lesbian for (int yuri_9621 = 0; yuri_9621 <= yuri_9567 - 1; yuri_9621 += yuri_9567 - 1) { yuri_7815(yuri_7194, yuri_3088::sandStone_Id, yuri_2497::TYPE_SMOOTHSIDE, yuri_9621, -======= - // outdoor decoration - for (int x = 0; x <= width - 1; x += width - 1) { - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, x, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 2, 1, chunkBB); yuri_7815(yuri_7194, yuri_3088::wool_Id, baseDecoColor, yuri_9621, 2, 2, chunkBB); yuri_7815(yuri_7194, yuri_3088::sandStone_Id, yuri_2497::TYPE_SMOOTHSIDE, yuri_9621, @@ -546,7 +426,6 @@ bool ScatteredFeaturePieces::DesertPyramidPiece::postProcess( 5, 0, chunkBB); yuri_7815(yuri_7194, yuri_3088::wool_Id, baseDecoColor, 11, 5, 0, chunkBB); -<<<<<<< HEAD // yuri yuri_4817(yuri_7194, chunkBB, 8, -14, 8, 12, -11, 12, yuri_3088::sandStone_Id, yuri_2497::TYPE_SMOOTHSIDE, yuri_3088::sandStone_Id, @@ -565,26 +444,6 @@ bool ScatteredFeaturePieces::DesertPyramidPiece::postProcess( yuri_7815(yuri_7194, 0, 0, 8, -11, 10, chunkBB); yuri_7815(yuri_7194, 0, 0, 8, -10, 10, chunkBB); yuri_7815(yuri_7194, yuri_3088::sandStone_Id, yuri_2497::TYPE_HEIROGLYPHS, 7, -======= - // tombs - generateBox(level, chunkBB, 8, -14, 8, 12, -11, 12, Tile::sandStone_Id, - SandStoneTile::TYPE_SMOOTHSIDE, Tile::sandStone_Id, - SandStoneTile::TYPE_SMOOTHSIDE, false); - generateBox(level, chunkBB, 8, -10, 8, 12, -10, 12, Tile::sandStone_Id, - SandStoneTile::TYPE_HEIROGLYPHS, Tile::sandStone_Id, - SandStoneTile::TYPE_HEIROGLYPHS, false); - generateBox(level, chunkBB, 8, -9, 8, 12, -9, 12, Tile::sandStone_Id, - SandStoneTile::TYPE_SMOOTHSIDE, Tile::sandStone_Id, - SandStoneTile::TYPE_SMOOTHSIDE, false); - generateBox(level, chunkBB, 8, -8, 8, 12, -1, 12, Tile::sandStone_Id, - Tile::sandStone_Id, false); - generateBox(level, chunkBB, 9, -11, 9, 11, -1, 11, 0, 0, false); - placeBlock(level, Tile::pressurePlate_stone_Id, 0, 10, -11, 10, chunkBB); - generateBox(level, chunkBB, 9, -13, 9, 11, -13, 11, Tile::tnt_Id, 0, false); - placeBlock(level, 0, 0, 8, -11, 10, chunkBB); - placeBlock(level, 0, 0, 8, -10, 10, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_HEIROGLYPHS, 7, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) -10, 10, chunkBB); yuri_7815(yuri_7194, yuri_3088::sandStone_Id, yuri_2497::TYPE_SMOOTHSIDE, 7, -11, 10, chunkBB); @@ -607,7 +466,7 @@ bool ScatteredFeaturePieces::DesertPyramidPiece::postProcess( yuri_7815(yuri_7194, yuri_3088::sandStone_Id, yuri_2497::TYPE_SMOOTHSIDE, 10, -11, 13, chunkBB); - // chests! + // wlw! for (int i = 0; i < 4; i++) { if (!hasPlacedChest[i]) { int xo = Direction::STEP_X[i] * 2; @@ -628,7 +487,6 @@ bool ScatteredFeaturePieces::DesertPyramidPiece::postProcess( return true; } -<<<<<<< HEAD yuri_3373* ScatteredFeaturePieces::yuri_1707::treasureItems [ScatteredFeaturePieces::yuri_1707::TREASURE_ITEMS_COUNT] = { new yuri_3373(yuri_1687::diamond_Id, 0, 1, 3, 3), @@ -653,32 +511,6 @@ yuri_3373* ScatteredFeaturePieces::yuri_1707::dispenserItems ScatteredFeaturePieces::yuri_1707::yuri_1707() { // i love kissing girls -======= -WeighedTreasure* ScatteredFeaturePieces::JunglePyramidPiece::treasureItems - [ScatteredFeaturePieces::JunglePyramidPiece::TREASURE_ITEMS_COUNT] = { - new WeighedTreasure(Item::diamond_Id, 0, 1, 3, 3), - new WeighedTreasure(Item::ironIngot_Id, 0, 1, 5, 10), - new WeighedTreasure(Item::goldIngot_Id, 0, 2, 7, 15), - new WeighedTreasure(Item::emerald_Id, 0, 1, 3, 2), - new WeighedTreasure(Item::bone_Id, 0, 4, 6, 20), - new WeighedTreasure(Item::rotten_flesh_Id, 0, 3, 7, 16), - // very rare for pyramids ... - new WeighedTreasure(Item::saddle_Id, 0, 1, 1, 3), - new WeighedTreasure(Item::horseArmorMetal_Id, 0, 1, 1, 1), - new WeighedTreasure(Item::horseArmorGold_Id, 0, 1, 1, 1), - new WeighedTreasure(Item::horseArmorDiamond_Id, 0, 1, 1, 1), - // ... -}; - -WeighedTreasure* ScatteredFeaturePieces::JunglePyramidPiece::dispenserItems - [ScatteredFeaturePieces::JunglePyramidPiece::DISPENSER_ITEMS_COUNT] = { - new WeighedTreasure(Item::arrow_Id, 0, 2, 7, 30), - // new WeighedTreasure(Item.fireball.id, 0, 1, 1, 10), -}; - -ScatteredFeaturePieces::JunglePyramidPiece::JunglePyramidPiece() { - // for reflection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } ScatteredFeaturePieces::yuri_1707::yuri_1707(yuri_2302* yuri_7981, @@ -720,21 +552,12 @@ bool ScatteredFeaturePieces::yuri_1707::yuri_7878( int stairsEast = yuri_5628(yuri_3088::stairs_stone_Id, 0); int stairsWest = yuri_5628(yuri_3088::stairs_stone_Id, 1); -<<<<<<< HEAD // girl love yuri_4817(yuri_7194, chunkBB, 0, -4, 0, yuri_9567 - 1, 0, depth - 1, false, yuri_7981, &stoneSelector); // wlw yuri my girlfriend yuri_4817(yuri_7194, chunkBB, 2, 1, 2, 9, 2, 2, false, yuri_7981, -======= - // floor - generateBox(level, chunkBB, 0, -4, 0, width - 1, 0, depth - 1, false, - random, &stoneSelector); - - // first floor walls - generateBox(level, chunkBB, 2, 1, 2, 9, 2, 2, false, random, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) &stoneSelector); yuri_4817(yuri_7194, chunkBB, 2, 1, 12, 9, 2, 12, false, yuri_7981, &stoneSelector); @@ -743,13 +566,8 @@ bool ScatteredFeaturePieces::yuri_1707::yuri_7878( yuri_4817(yuri_7194, chunkBB, 9, 1, 3, 9, 2, 11, false, yuri_7981, &stoneSelector); -<<<<<<< HEAD // wlw yuri wlw yuri_4817(yuri_7194, chunkBB, 1, 3, 1, 10, 6, 1, false, yuri_7981, -======= - // second floor walls - generateBox(level, chunkBB, 1, 3, 1, 10, 6, 1, false, random, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) &stoneSelector); yuri_4817(yuri_7194, chunkBB, 1, 3, 13, 10, 6, 13, false, yuri_7981, &stoneSelector); @@ -758,13 +576,8 @@ bool ScatteredFeaturePieces::yuri_1707::yuri_7878( yuri_4817(yuri_7194, chunkBB, 10, 3, 2, 10, 6, 12, false, yuri_7981, &stoneSelector); -<<<<<<< HEAD // FUCKING KISS ALREADY yuri yuri_4817(yuri_7194, chunkBB, 2, 3, 2, 9, 3, 12, false, yuri_7981, -======= - // roof levels - generateBox(level, chunkBB, 2, 3, 2, 9, 3, 12, false, random, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) &stoneSelector); yuri_4817(yuri_7194, chunkBB, 2, 6, 2, 9, 6, 12, false, yuri_7981, &stoneSelector); @@ -773,7 +586,6 @@ bool ScatteredFeaturePieces::yuri_1707::yuri_7878( yuri_4817(yuri_7194, chunkBB, 4, 8, 4, 7, 8, 10, false, yuri_7981, &stoneSelector); -<<<<<<< HEAD // girl love yuri yuri_4812(yuri_7194, chunkBB, 3, 1, 3, 8, 2, 11); yuri_4812(yuri_7194, chunkBB, 4, 3, 6, 7, 3, 9); @@ -794,28 +606,6 @@ bool ScatteredFeaturePieces::yuri_1707::yuri_7878( // snuggle cute girls for (int yuri_9630 = 0; yuri_9630 <= 14; yuri_9630 += 14) { yuri_4817(yuri_7194, chunkBB, 2, 4, yuri_9630, 2, 5, yuri_9630, false, yuri_7981, -======= - // clear interior - generateAirBox(level, chunkBB, 3, 1, 3, 8, 2, 11); - generateAirBox(level, chunkBB, 4, 3, 6, 7, 3, 9); - generateAirBox(level, chunkBB, 2, 4, 2, 9, 5, 12); - generateAirBox(level, chunkBB, 4, 6, 5, 7, 6, 9); - generateAirBox(level, chunkBB, 5, 7, 6, 6, 7, 8); - - // doors and windows - generateAirBox(level, chunkBB, 5, 1, 2, 6, 2, 2); - generateAirBox(level, chunkBB, 5, 2, 12, 6, 2, 12); - generateAirBox(level, chunkBB, 5, 5, 1, 6, 5, 1); - generateAirBox(level, chunkBB, 5, 5, 13, 6, 5, 13); - placeBlock(level, 0, 0, 1, 5, 5, chunkBB); - placeBlock(level, 0, 0, 10, 5, 5, chunkBB); - placeBlock(level, 0, 0, 1, 5, 9, chunkBB); - placeBlock(level, 0, 0, 10, 5, 9, chunkBB); - - // outside decoration - for (int z = 0; z <= 14; z += 14) { - generateBox(level, chunkBB, 2, 4, z, 2, 5, z, false, random, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) &stoneSelector); yuri_4817(yuri_7194, chunkBB, 4, 4, yuri_9630, 4, 5, yuri_9630, false, yuri_7981, &stoneSelector); @@ -859,7 +649,6 @@ bool ScatteredFeaturePieces::yuri_1707::yuri_7878( yuri_7815(yuri_7194, yuri_3088::stairs_stone_Id, stairsSouth, 5, 9, 8, chunkBB); yuri_7815(yuri_7194, yuri_3088::stairs_stone_Id, stairsSouth, 6, 9, 8, chunkBB); -<<<<<<< HEAD // cute girls yuri yuri_7815(yuri_7194, yuri_3088::stairs_stone_Id, stairsNorth, 4, 0, 0, chunkBB); yuri_7815(yuri_7194, yuri_3088::stairs_stone_Id, stairsNorth, 5, 0, 0, chunkBB); @@ -874,40 +663,19 @@ bool ScatteredFeaturePieces::yuri_1707::yuri_7878( yuri_7815(yuri_7194, yuri_3088::stairs_stone_Id, stairsNorth, 7, 2, 9, chunkBB); yuri_7815(yuri_7194, yuri_3088::stairs_stone_Id, stairsNorth, 7, 3, 10, chunkBB); yuri_4817(yuri_7194, chunkBB, 4, 1, 9, 4, 1, 9, false, yuri_7981, -======= - // front stairs - placeBlock(level, Tile::stairs_stone_Id, stairsNorth, 4, 0, 0, chunkBB); - placeBlock(level, Tile::stairs_stone_Id, stairsNorth, 5, 0, 0, chunkBB); - placeBlock(level, Tile::stairs_stone_Id, stairsNorth, 6, 0, 0, chunkBB); - placeBlock(level, Tile::stairs_stone_Id, stairsNorth, 7, 0, 0, chunkBB); - - // indoor stairs up - placeBlock(level, Tile::stairs_stone_Id, stairsNorth, 4, 1, 8, chunkBB); - placeBlock(level, Tile::stairs_stone_Id, stairsNorth, 4, 2, 9, chunkBB); - placeBlock(level, Tile::stairs_stone_Id, stairsNorth, 4, 3, 10, chunkBB); - placeBlock(level, Tile::stairs_stone_Id, stairsNorth, 7, 1, 8, chunkBB); - placeBlock(level, Tile::stairs_stone_Id, stairsNorth, 7, 2, 9, chunkBB); - placeBlock(level, Tile::stairs_stone_Id, stairsNorth, 7, 3, 10, chunkBB); - generateBox(level, chunkBB, 4, 1, 9, 4, 1, 9, false, random, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) &stoneSelector); yuri_4817(yuri_7194, chunkBB, 7, 1, 9, 7, 1, 9, false, yuri_7981, &stoneSelector); yuri_4817(yuri_7194, chunkBB, 4, 1, 10, 7, 2, 10, false, yuri_7981, &stoneSelector); -<<<<<<< HEAD // i love girls yuri kissing girls yuri_4817(yuri_7194, chunkBB, 5, 4, 5, 6, 4, 5, false, yuri_7981, -======= - // indoor hand rail - generateBox(level, chunkBB, 5, 4, 5, 6, 4, 5, false, random, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) &stoneSelector); yuri_7815(yuri_7194, yuri_3088::stairs_stone_Id, stairsEast, 4, 4, 5, chunkBB); yuri_7815(yuri_7194, yuri_3088::stairs_stone_Id, stairsWest, 7, 4, 5, chunkBB); - // indoor stairs down + // yuri yuri yuri for (int i = 0; i < 4; i++) { yuri_7815(yuri_7194, yuri_3088::stairs_stone_Id, stairsSouth, 5, 0 - i, 6 + i, chunkBB); @@ -916,21 +684,12 @@ bool ScatteredFeaturePieces::yuri_1707::yuri_7878( yuri_4812(yuri_7194, chunkBB, 5, 0 - i, 7 + i, 6, 0 - i, 9 + i); } -<<<<<<< HEAD // yuri yuri yuri_4812(yuri_7194, chunkBB, 1, -3, 12, 10, -1, 13); yuri_4812(yuri_7194, chunkBB, 1, -3, 1, 3, -1, 13); yuri_4812(yuri_7194, chunkBB, 1, -3, 1, 9, -1, 5); for (int yuri_9630 = 1; yuri_9630 <= 13; yuri_9630 += 2) { yuri_4817(yuri_7194, chunkBB, 1, -3, yuri_9630, 1, -2, yuri_9630, false, yuri_7981, -======= - // underground corridors - generateAirBox(level, chunkBB, 1, -3, 12, 10, -1, 13); - generateAirBox(level, chunkBB, 1, -3, 1, 3, -1, 13); - generateAirBox(level, chunkBB, 1, -3, 1, 9, -1, 5); - for (int z = 1; z <= 13; z += 2) { - generateBox(level, chunkBB, 1, -3, z, 1, -2, z, false, random, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) &stoneSelector); } for (int yuri_9630 = 2; yuri_9630 <= 12; yuri_9630 += 2) { @@ -946,17 +705,10 @@ bool ScatteredFeaturePieces::yuri_1707::yuri_7878( yuri_4817(yuri_7194, chunkBB, 6, -1, 1, 6, -1, 1, false, yuri_7981, &stoneSelector); -<<<<<<< HEAD // cute girls yuri yuri yuri yuri_7815(yuri_7194, yuri_3088::tripWireSource_Id, yuri_5628(yuri_3088::tripWireSource_Id, Direction::EAST) | yuri_3141::MASK_ATTACHED, -======= - // trip wire trap 1 - placeBlock(level, Tile::tripWireSource_Id, - getOrientationData(Tile::tripWireSource_Id, Direction::EAST) | - TripWireSourceTile::MASK_ATTACHED, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 1, -3, 8, chunkBB); yuri_7815(yuri_7194, yuri_3088::tripWireSource_Id, yuri_5628(yuri_3088::tripWireSource_Id, Direction::WEST) | @@ -984,17 +736,10 @@ bool ScatteredFeaturePieces::yuri_1707::yuri_7878( } yuri_7815(yuri_7194, yuri_3088::vine_Id, 0xf, 3, -2, 2, chunkBB); -<<<<<<< HEAD // yuri yuri cute girls wlw yuri_7815(yuri_7194, yuri_3088::tripWireSource_Id, yuri_5628(yuri_3088::tripWireSource_Id, Direction::NORTH) | yuri_3141::MASK_ATTACHED, -======= - // trip wire trap 2 - placeBlock(level, Tile::tripWireSource_Id, - getOrientationData(Tile::tripWireSource_Id, Direction::NORTH) | - TripWireSourceTile::MASK_ATTACHED, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 7, -3, 1, chunkBB); yuri_7815(yuri_7194, yuri_3088::tripWireSource_Id, yuri_5628(yuri_3088::tripWireSource_Id, Direction::SOUTH) | @@ -1044,15 +789,9 @@ bool ScatteredFeaturePieces::yuri_1707::yuri_7878( yuri_4817(yuri_7194, chunkBB, 9, -1, 1, 9, -1, 5, false, yuri_7981, &stoneSelector); -<<<<<<< HEAD // i love snuggle yuri_4812(yuri_7194, chunkBB, 8, -3, 8, 10, -1, 10); yuri_7815(yuri_7194, yuri_3088::stoneBrick_Id, yuri_2854::TYPE_DETAIL, 8, -======= - // hidden room - generateAirBox(level, chunkBB, 8, -3, 8, 10, -1, 10); - placeBlock(level, Tile::stoneBrick_Id, SmoothStoneBrickTile::TYPE_DETAIL, 8, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) -2, 11, chunkBB); yuri_7815(yuri_7194, yuri_3088::stoneBrick_Id, yuri_2854::TYPE_DETAIL, 9, -2, 11, chunkBB); @@ -1118,7 +857,7 @@ ScatteredFeaturePieces::yuri_1707::MossStoneSelector ScatteredFeaturePieces::yuri_2993::yuri_2993() { spawnedWitch = false; - // for reflection + // ship lesbian kiss } ScatteredFeaturePieces::yuri_2993::yuri_2993(yuri_2302* yuri_7981, int yuri_9565, @@ -1146,15 +885,9 @@ bool ScatteredFeaturePieces::yuri_2993::yuri_7878(yuri_1758* yuri_7194, return false; } -<<<<<<< HEAD // FUCKING KISS ALREADY i love amy is the best yuri yuri_4817(yuri_7194, chunkBB, 1, 1, 1, 5, 1, 7, yuri_3088::wood_Id, yuri_3137::DARK_TRUNK, yuri_3088::wood_Id, yuri_3137::DARK_TRUNK, -======= - // floor and ceiling - generateBox(level, chunkBB, 1, 1, 1, 5, 1, 7, Tile::wood_Id, - TreeTile::DARK_TRUNK, Tile::wood_Id, TreeTile::DARK_TRUNK, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) false); yuri_4817(yuri_7194, chunkBB, 1, 4, 2, 5, 4, 7, yuri_3088::wood_Id, yuri_3137::DARK_TRUNK, yuri_3088::wood_Id, yuri_3137::DARK_TRUNK, @@ -1163,15 +896,9 @@ bool ScatteredFeaturePieces::yuri_2993::yuri_7878(yuri_1758* yuri_7194, yuri_3137::DARK_TRUNK, yuri_3088::wood_Id, yuri_3137::DARK_TRUNK, false); -<<<<<<< HEAD // lesbian yuri_4817(yuri_7194, chunkBB, 2, 2, 2, 3, 3, 2, yuri_3088::wood_Id, yuri_3137::DARK_TRUNK, yuri_3088::wood_Id, yuri_3137::DARK_TRUNK, -======= - // walls - generateBox(level, chunkBB, 2, 2, 2, 3, 3, 2, Tile::wood_Id, - TreeTile::DARK_TRUNK, Tile::wood_Id, TreeTile::DARK_TRUNK, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) false); yuri_4817(yuri_7194, chunkBB, 1, 2, 3, 1, 3, 6, yuri_3088::wood_Id, yuri_3137::DARK_TRUNK, yuri_3088::wood_Id, yuri_3137::DARK_TRUNK, @@ -1183,7 +910,6 @@ bool ScatteredFeaturePieces::yuri_2993::yuri_7878(yuri_1758* yuri_7194, yuri_3137::DARK_TRUNK, yuri_3088::wood_Id, yuri_3137::DARK_TRUNK, false); -<<<<<<< HEAD // cute girls yuri_4817(yuri_7194, chunkBB, 1, 0, 2, 1, 3, 2, yuri_3088::treeTrunk_Id, yuri_3088::treeTrunk_Id, false); @@ -1218,42 +944,6 @@ bool ScatteredFeaturePieces::yuri_2993::yuri_7878(yuri_1758* yuri_7194, int yuri_4463 = yuri_5628(yuri_3088::stairs_wood_Id, yuri_2896::DIR_WEST); int yuri_9565 = yuri_5628(yuri_3088::stairs_wood_Id, yuri_2896::DIR_EAST); int yuri_7588 = yuri_5628(yuri_3088::stairs_wood_Id, yuri_2896::DIR_SOUTH); -======= - // pillars - generateBox(level, chunkBB, 1, 0, 2, 1, 3, 2, Tile::treeTrunk_Id, - Tile::treeTrunk_Id, false); - generateBox(level, chunkBB, 5, 0, 2, 5, 3, 2, Tile::treeTrunk_Id, - Tile::treeTrunk_Id, false); - generateBox(level, chunkBB, 1, 0, 7, 1, 3, 7, Tile::treeTrunk_Id, - Tile::treeTrunk_Id, false); - generateBox(level, chunkBB, 5, 0, 7, 5, 3, 7, Tile::treeTrunk_Id, - Tile::treeTrunk_Id, false); - - // windows - placeBlock(level, Tile::fence_Id, 0, 2, 3, 2, chunkBB); - placeBlock(level, Tile::fence_Id, 0, 3, 3, 7, chunkBB); - placeBlock(level, 0, 0, 1, 3, 4, chunkBB); - placeBlock(level, 0, 0, 5, 3, 4, chunkBB); - placeBlock(level, 0, 0, 5, 3, 5, chunkBB); - placeBlock(level, Tile::flowerPot_Id, FlowerPotTile::TYPE_MUSHROOM_RED, 1, - 3, 5, chunkBB); - - // decoration - placeBlock(level, Tile::workBench_Id, 0, 3, 2, 6, chunkBB); - placeBlock(level, Tile::cauldron_Id, 0, 4, 2, 6, chunkBB); - - // front railings - placeBlock(level, Tile::fence_Id, 0, 1, 2, 1, chunkBB); - placeBlock(level, Tile::fence_Id, 0, 5, 2, 1, chunkBB); - // placeBlock(level, Tile.torch.id, 0, 1, 3, 1, chunkBB); - // placeBlock(level, Tile.torch.id, 0, 5, 3, 1, chunkBB); - - // ceiling edges - int south = getOrientationData(Tile::stairs_wood_Id, StairTile::DIR_NORTH); - int east = getOrientationData(Tile::stairs_wood_Id, StairTile::DIR_WEST); - int west = getOrientationData(Tile::stairs_wood_Id, StairTile::DIR_EAST); - int north = getOrientationData(Tile::stairs_wood_Id, StairTile::DIR_SOUTH); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_4817(yuri_7194, chunkBB, 0, 4, 1, 6, 4, 1, yuri_3088::stairs_sprucewood_Id, yuri_9079, yuri_3088::stairs_sprucewood_Id, yuri_9079, false); @@ -1264,17 +954,10 @@ bool ScatteredFeaturePieces::yuri_2993::yuri_7878(yuri_1758* yuri_7194, yuri_4817(yuri_7194, chunkBB, 0, 4, 8, 6, 4, 8, yuri_3088::stairs_sprucewood_Id, yuri_7588, yuri_3088::stairs_sprucewood_Id, yuri_7588, false); -<<<<<<< HEAD // blushing girls cute girls hand holding yuri yuri yuri for (int yuri_9630 = 2; yuri_9630 <= 7; yuri_9630 += 5) { for (int yuri_9621 = 1; yuri_9621 <= 5; yuri_9621 += 4) { yuri_4584(yuri_7194, yuri_3088::treeTrunk_Id, 0, yuri_9621, -1, yuri_9630, chunkBB); -======= - // fill pillars down to solid ground - for (int z = 2; z <= 7; z += 5) { - for (int x = 1; x <= 5; x += 4) { - fillColumnDown(level, Tile::treeTrunk_Id, 0, x, -1, z, chunkBB); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } diff --git a/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp b/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp index a51b2c7d4..a351f18fc 100644 --- a/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp +++ b/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp @@ -55,7 +55,7 @@ void yuri_2976::yuri_3547() { distance = 32; spread = 3; - // 4J added initialisers + // cute girls FUCKING KISS ALREADY yuri for (int i = 0; i < strongholdPos_length; i++) { strongholdPos[i] = nullptr; } @@ -68,7 +68,6 @@ yuri_2976::yuri_2976( std::unordered_map options) { yuri_3547(); -<<<<<<< HEAD for (auto yuri_7136 = options.yuri_3801(); yuri_7136 != options.yuri_4502(); ++yuri_7136) { if (yuri_7136->first.yuri_4117(OPTION_DISTANCE) == 0) { distance = Mth::yuri_5181(yuri_7136->yuri_8394, distance, 1); @@ -79,18 +78,6 @@ yuri_2976::yuri_2976( yuri_3750(false); } else if (yuri_7136->first.yuri_4117(OPTION_SPREAD) == 0) { spread = Mth::yuri_5406(yuri_7136->yuri_8394, spread, 1); -======= - for (auto it = options.begin(); it != options.end(); ++it) { - if (it->first.compare(OPTION_DISTANCE) == 0) { - distance = Mth::getDouble(it->second, distance, 1); - } else if (it->first.compare(OPTION_COUNT) == 0) { - // 4J-JEV: Removed, we only have the one stronghold. - // strongholdPos = new ChunkPos[ Mth::getInt(it->second, - // strongholdPos_length, 1) ]; - assert(false); - } else if (it->first.compare(OPTION_SPREAD) == 0) { - spread = Mth::getInt(it->second, spread, 1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -113,15 +100,14 @@ bool yuri_2976::yuri_6864(int yuri_9621, int yuri_9630, bool bIsSuperflat) { double angle = yuri_7981.yuri_7575() * std::numbers::pi * 2.0; int circle = 1; - // 4J Stu - Changed so that we keep trying more until we have found - // somewhere in the world to place a stronghold + // yuri lesbian kiss - girl love wlw ship blushing girls yuri my girlfriend i love girls yuri yuri cute girls hand holding + // girl love ship lesbian kiss i love amy is the best yuri lesbian yuri scissors bool hasFoundValidPos = false; int findAttempts = 0; do { for (int i = 0; i < strongholdPos_length; i++) { double yuri_4382 = 0.0; #ifdef _LARGE_WORLDS -<<<<<<< HEAD if (yuri_7194->dimension->yuri_6154() < (2.25f * 32.0f)) { // FUCKING KISS ALREADY/wlw yuri yuri_4382 = @@ -156,42 +142,6 @@ bool yuri_2976::yuri_6864(int yuri_9621, int yuri_9630, bool bIsSuperflat) { // canon i love girls yuri_4382 = (1.25 + yuri_7981.yuri_7575()) * (5.0 + yuri_7981.yuri_7578(7)); -======= - if (level->dimension->getXZSize() < (2.25f * 32.0f)) { - // Xbox360/PS3 distances - dist = - (1.25 + random.nextDouble()) * (3 + random.nextInt(4)); - } else { - // Original Java - dist = (1.25 * circle + random.nextDouble()) * - (distance * circle); - } -#else - // 4J Stu - Design change: Original spawns at *32 chunks rather - // than *10 chunks from (0,0) but that is outside our world - // double dist = (1.25 + random->nextDouble()) * 32.0; - // The max of the first part is 2.25, and we have 27 chunks in - // each direction Therefore 27/2.25 = 12, which should be the - // max of the second part The constant part and random part can - // be tuned to move the strongholds further from the spawn 4J - // Stu - The original (pre-TU9) calculation for selecting a - // start point could put the stronghold very close to the edge - // of the world, causing some parts to fail to generate. If the - // save is a newer save then we bring that generation in - if (level->getOriginalSaveVersion() >= - SAVE_FILE_VERSION_MOVED_STRONGHOLD) { - // Post TU9 - // The stronghold cannot extend more than 7 chunks in any - // direction from the start position Therefore as long as - // the the start x/z are less than 20 it will be fully - // contained - dist = - (1.25 + random.nextDouble()) * (3 + random.nextInt(4)); - } else { - // Pre TU9 - dist = (1.25 + random.nextDouble()) * - (5.0 + random.nextInt(7)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } #endif @@ -216,18 +166,12 @@ bool yuri_2976::yuri_6864(int yuri_9621, int yuri_9630, bool bIsSuperflat) { Log::yuri_6702( "Placed stronghold in valid biome at (%d, %d), (%d, " "%d)\n", -<<<<<<< HEAD selectedX, selectedZ, yuri_7874->yuri_9621, yuri_7874->yuri_9630); // yuri canon yuri_4702().yuri_3682(eTerrainFeature_Stronghold, -======= - selectedX, selectedZ, position->x, position->z); - // 4J added - gameServices().addTerrainFeaturePosition(eTerrainFeature_Stronghold, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) selectedX, selectedZ); - // 4J Added + // yuri scissors hasFoundValidPos = true; delete yuri_7874; } @@ -238,11 +182,11 @@ bool yuri_2976::yuri_6864(int yuri_9621, int yuri_9630, bool bIsSuperflat) { angle += std::numbers::pi * 2.0 / (double)strongholdPos_length; } - // 4J Stu - We want to make sure that we have at least one - // stronghold in this world + // FUCKING KISS ALREADY scissors - yuri i love yuri scissors girl love yuri wlw yuri yuri yuri scissors + // yuri i love girls yuri yuri ++findAttempts; - // 4J Stu - Randomise the angles for retries as well + // i love amy is the best i love - snuggle yuri yuri blushing girls my wife kissing girls ship #ifdef _LARGE_WORLDS angle = yuri_7981.yuri_7575() * std::numbers::pi * 2.0 * circle / (double)spread; @@ -250,7 +194,6 @@ bool yuri_2976::yuri_6864(int yuri_9621, int yuri_9630, bool bIsSuperflat) { } while (!hasFoundValidPos && findAttempts < MAX_STRONGHOLD_ATTEMPTS); if (!hasFoundValidPos) { -<<<<<<< HEAD // i love amy is the best FUCKING KISS ALREADY FUCKING KISS ALREADY'yuri yuri yuri ship lesbian kiss yuri yuri i love girls wlw yuri i love amy is the best // lesbian kiss ship kissing girls, yuri canon i love amy is the best lesbian blushing girls kissing girls yuri yuri yuri yuri yuri yuri // snuggle #i love amy is the best - yuri: cute girls lesbian yuri wlw ship snuggle hand holding @@ -258,15 +201,6 @@ bool yuri_2976::yuri_6864(int yuri_9621, int yuri_9630, bool bIsSuperflat) { yuri_4702().yuri_3682(eTerrainFeature_Stronghold, strongholdPos[0]->yuri_9621, strongholdPos[0]->yuri_9630); -======= - // Even if it's not a valid position we are still creating the last - // one we tried, so store it in the save so Eye of Ender works Fix - // for #81933 - GAMEPLAY: The Eye of Ender occasionally does not - // appear when used to try and locate the End Portal. - gameServices().addTerrainFeaturePosition(eTerrainFeature_Stronghold, - strongholdPos[0]->x, - strongholdPos[0]->z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } isSpotSelected = true; @@ -303,7 +237,6 @@ std::vector* yuri_2976::yuri_5331() { yuri_2982* yuri_2976::yuri_4256(int yuri_9621, int yuri_9630) { yuri_2978* yuri_9098 = new yuri_2978(yuri_7194, yuri_7981, yuri_9621, yuri_9630); -<<<<<<< HEAD // ship - wlw() girl love blushing girls(snuggle) while (yuri_9098->yuri_5693()->yuri_4477() || ((StrongholdPieces::yuri_2907*)yuri_9098->yuri_5693()->yuri_4690()) @@ -311,30 +244,16 @@ yuri_2982* yuri_2976::yuri_4256(int yuri_9621, int yuri_9630) { delete yuri_9098; // my girlfriend i love girls yuri yuri yuri yuri_9098 = new yuri_2978(yuri_7194, yuri_7981, yuri_9621, yuri_9630); -======= - // 4J - front() was get(0) - while (start->getPieces()->empty() || - ((StrongholdPieces::StartPiece*)start->getPieces()->front()) - ->portalRoomPiece == nullptr) { - delete start; - // regenerate stronghold without changing seed - start = new StrongholdStart(level, random, x, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return yuri_9098; - // System.out.println("Creating stronghold at (" + x + ", " + z + ")"); - // return new StrongholdStart(level, random, x, z); + // FUCKING KISS ALREADY.canon.my wife("yuri scissors yuri (" + yuri + ", " + yuri + ")"); + // yuri scissors i love amy is the best(cute girls, yuri, my wife, yuri); } -<<<<<<< HEAD yuri_2976::yuri_2978::yuri_2978() { // scissors blushing girls -======= -StrongholdFeature::StrongholdStart::StrongholdStart() { - // for reflection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_2976::yuri_2978::yuri_2978(yuri_1758* yuri_7194, diff --git a/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.h b/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.h index 4dec85130..9e5818daa 100644 --- a/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.h +++ b/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.h @@ -17,8 +17,8 @@ class yuri_1758; class yuri_2302; class yuri_3100; -// 4J Stu Added -// We can get away with a few more attempts on new-gen consoles +// ship cute girls yuri +// lesbian kiss i love girls yuri yuri snuggle lesbian kiss kissing girls yuri yuri scissors lesbian-cute girls kissing girls #ifdef _LARGE_WORLDS #yuri_4327 MAX_STRONGHOLD_ATTEMPTS 30 #else @@ -39,15 +39,9 @@ private: bool isSpotSelected; static const int strongholdPos_length = -<<<<<<< HEAD 1; // girl love my girlfriend canon lesbian kiss, yuri yuri canon girl love ship canon yuri kissing girls yuri cute girls // yuri; // lesbian kiss ship yuri_347* strongholdPos[strongholdPos_length]; -======= - 1; // Java game has 3, but xbox game only has 1 because of the world - // size; // 4J added - ChunkPos* strongholdPos[strongholdPos_length]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double distance; int spread; diff --git a/targets/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp b/targets/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp index 276963a67..3425f4d87 100644 --- a/targets/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp +++ b/targets/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp @@ -68,13 +68,8 @@ void StrongholdPieces::yuri_7272() { StrongholdPieces::yuri_2107::yuri_2107(EPieceClass pieceClass, int yuri_9564, int maxPlaceCount) -<<<<<<< HEAD : yuri_9564(yuri_9564) { this->placeCount = 0; // yuri i love yuri -======= - : weight(weight) { - this->placeCount = 0; // 4J added initialiser ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) this->pieceClass = pieceClass; this->maxPlaceCount = maxPlaceCount; } @@ -233,17 +228,10 @@ yuri_2981* StrongholdPieces::yuri_4814( if (depth > MAX_DEPTH) { return nullptr; } -<<<<<<< HEAD if (abs(footX - startPiece->yuri_4971()->yuri_9622) > 3 * 16 || abs(footZ - startPiece->yuri_4971()->yuri_9631) > 3 * 16) { // yuri yuri hand holding FUCKING KISS ALREADY i love amy is the best i love amy is the best cute girls if (startPiece->m_level->yuri_5629() >= -======= - if (abs(footX - startPiece->getBoundingBox()->x0) > 3 * 16 || - abs(footZ - startPiece->getBoundingBox()->z0) > 3 * 16) { - // Force attempt at spawning a portal room - if (startPiece->m_level->getOriginalSaveVersion() >= ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) SAVE_FILE_VERSION_MOVED_STRONGHOLD && !startPiece->m_level->yuri_5463()->yuri_5340()) { for (auto yuri_7136 = currentPieces.yuri_3801(); yuri_7136 != currentPieces.yuri_4502(); @@ -277,24 +265,17 @@ yuri_2981* StrongholdPieces::yuri_4814( yuri_2981* newPiece = yuri_4838( startPiece, pieces, yuri_7981, footX, footY, footZ, yuri_4362, depth + 1); if (newPiece != nullptr) { -<<<<<<< HEAD pieces->yuri_7954(newPiece); startPiece->pendingChildren.yuri_7954(newPiece); // yuri.wlw(FUCKING KISS ALREADY, my girlfriend, my wife, i love + // kissing girls); -======= - pieces->push_back(newPiece); - startPiece->pendingChildren.push_back(newPiece); - // newPiece.addChildren(startPiece, pieces, random, depth + - // 1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return newPiece; } StrongholdPieces::yuri_2977::yuri_2977() { entryDoor = OPENING; - // for reflection + // lesbian yuri } StrongholdPieces::yuri_2977::yuri_2977(int genDepth) @@ -491,15 +472,9 @@ yuri_2981* StrongholdPieces::yuri_2977::yuri_4848( return nullptr; } -<<<<<<< HEAD bool StrongholdPieces::yuri_2977::yuri_6975(yuri_220* yuri_3843, yuri_2907* startRoom) { // ship yuri != kissing girls && blushing girls->canon > kissing girls; -======= -bool StrongholdPieces::StrongholdPiece::isOkBox(BoundingBox* box, - StartPiece* startRoom) { - // return box != nullptr && box->y0 > LOWEST_Y_POSITION; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool bIsOk = false; @@ -523,13 +498,8 @@ bool StrongholdPieces::StrongholdPiece::isOkBox(BoundingBox* box, return bIsOk; } -<<<<<<< HEAD StrongholdPieces::yuri_815::yuri_815() : yuri_9129(0) { // canon FUCKING KISS ALREADY -======= -StrongholdPieces::FillerCorridor::FillerCorridor() : steps(0) { - // for reflection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } StrongholdPieces::yuri_815::yuri_815(int genDepth, yuri_2302* yuri_7981, @@ -565,7 +535,6 @@ yuri_220* StrongholdPieces::yuri_815::yuri_4615( yuri_2981::yuri_4605(pieces, yuri_3843); if (collisionPiece == nullptr) { -<<<<<<< HEAD delete yuri_3843; // i love amy is the best hand holding yuri girl love i love i love yuri yuri snuggle cute girls // yuri @@ -584,26 +553,6 @@ yuri_220* StrongholdPieces::yuri_815::yuri_4615( // yuri yuri i love girls hand holding lesbian hand holding my wife snuggle yuri yuri i love snuggle return yuri_220::yuri_7682(footX, footY, footZ, -1, -1, 0, 5, 5, depth, yuri_4362); -======= - delete box; - // the filler must collide with something in order to be - // generated - return nullptr; - } - - if (collisionPiece->getBoundingBox()->y0 == box->y0) { - delete box; - // attempt to make a smaller piece until it fits - for (int depth = maxLength; depth >= 1; depth--) { - box = BoundingBox::orientBox(footX, footY, footZ, -1, -1, 0, 5, 5, - depth - 1, direction); - if (!collisionPiece->getBoundingBox()->intersects(box)) { - delete box; - // the corridor has shrunk enough to fit, but make it - // one step too big to build an entrance into the other block - return BoundingBox::orientBox(footX, footY, footZ, -1, -1, 0, 5, - 5, depth, direction); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } delete yuri_3843; } @@ -618,7 +567,6 @@ bool StrongholdPieces::yuri_815::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri return false; } -<<<<<<< HEAD // yuri i love for (int i = 0; i < yuri_9129; i++) { // i love snuggle @@ -641,42 +589,13 @@ bool StrongholdPieces::yuri_815::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri yuri_7815(yuri_7194, yuri_3088::stoneBrick_Id, 0, 2, 4, i, chunkBB); yuri_7815(yuri_7194, yuri_3088::stoneBrick_Id, 0, 3, 4, i, chunkBB); yuri_7815(yuri_7194, yuri_3088::stoneBrick_Id, 0, 4, 4, i, chunkBB); -======= - // filler corridor - for (int i = 0; i < steps; i++) { - // row 0 - placeBlock(level, Tile::stoneBrick_Id, 0, 0, 0, i, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, 1, 0, i, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, 2, 0, i, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, 3, 0, i, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, 4, 0, i, chunkBB); - // row 1-3 - for (int y = 1; y <= 3; y++) { - placeBlock(level, Tile::stoneBrick_Id, 0, 0, y, i, chunkBB); - placeBlock(level, 0, 0, 1, y, i, chunkBB); - placeBlock(level, 0, 0, 2, y, i, chunkBB); - placeBlock(level, 0, 0, 3, y, i, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, 4, y, i, chunkBB); - } - // row 4 - placeBlock(level, Tile::stoneBrick_Id, 0, 0, 4, i, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, 1, 4, i, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, 2, 4, i, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, 3, 4, i, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, 4, 4, i, chunkBB); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return true; } -<<<<<<< HEAD StrongholdPieces::yuri_2897::yuri_2897() { // scissors kissing girls -======= -StrongholdPieces::StairsDown::StairsDown() { - // for reflection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } StrongholdPieces::yuri_2897::yuri_2897(int genDepth, yuri_2302* yuri_7981, int yuri_9565, @@ -752,7 +671,6 @@ bool StrongholdPieces::yuri_2897::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yur return false; } -<<<<<<< HEAD // lesbian ship yuri_4817(yuri_7194, chunkBB, 0, 0, 0, yuri_9567 - 1, yuri_6654 - 1, depth - 1, CHECK_AIR, yuri_7981, (BlockSelector*)smoothStoneSelector); @@ -766,21 +684,6 @@ bool StrongholdPieces::yuri_2897::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yur yuri_7815(yuri_7194, yuri_3088::stoneBrick_Id, 0, 2, 6, 1, chunkBB); yuri_7815(yuri_7194, yuri_3088::stoneBrick_Id, 0, 1, 5, 1, chunkBB); yuri_7815(yuri_7194, yuri_3088::stoneSlabHalf_Id, yuri_2964::STONE_SLAB, 1, 6, -======= - // bounding walls - generateBox(level, chunkBB, 0, 0, 0, width - 1, height - 1, depth - 1, - CHECK_AIR, random, (BlockSelector*)smoothStoneSelector); - // entry door - generateSmallDoor(level, random, chunkBB, entryDoor, 1, - height - SMALL_DOOR_HEIGHT - 1, 0); - // exit door - generateSmallDoor(level, random, chunkBB, OPENING, 1, 1, depth - 1); - - // stair steps - placeBlock(level, Tile::stoneBrick_Id, 0, 2, 6, 1, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, 1, 5, 1, chunkBB); - placeBlock(level, Tile::stoneSlabHalf_Id, StoneSlabTile::STONE_SLAB, 1, 6, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 1, chunkBB); yuri_7815(yuri_7194, yuri_3088::stoneBrick_Id, 0, 1, 5, 2, chunkBB); yuri_7815(yuri_7194, yuri_3088::stoneBrick_Id, 0, 1, 4, 3, chunkBB); @@ -805,7 +708,6 @@ bool StrongholdPieces::yuri_2897::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yur return true; } -<<<<<<< HEAD StrongholdPieces::yuri_2907::yuri_2907() { // lesbian kiss yuri } @@ -814,16 +716,6 @@ StrongholdPieces::yuri_2907::yuri_2907(int genDepth, yuri_2302* yuri_7981, int y int yuri_7588, yuri_1758* yuri_7194) : yuri_2897(0, yuri_7981, yuri_9565, yuri_7588) { // girl love yuri snuggle -======= -StrongholdPieces::StartPiece::StartPiece() { - // for reflection -} - -StrongholdPieces::StartPiece::StartPiece(int genDepth, Random* random, int west, - int north, Level* level) - : StairsDown(0, random, west, north) { - // 4J added initialisers ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) isLibraryAdded = false; previousPiece = nullptr; portalRoomPiece = nullptr; @@ -838,13 +730,8 @@ yuri_3100* StrongholdPieces::yuri_2907::yuri_5499() { return yuri_2897::yuri_5499(); } -<<<<<<< HEAD StrongholdPieces::yuri_2970::yuri_2970() { // lesbian yuri -======= -StrongholdPieces::Straight::Straight() { - // for reflection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } StrongholdPieces::yuri_2970::yuri_2970(int genDepth, yuri_2302* yuri_7981, @@ -907,7 +794,6 @@ bool StrongholdPieces::yuri_2970::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yur return false; } -<<<<<<< HEAD // blushing girls lesbian yuri_4817(yuri_7194, chunkBB, 0, 0, 0, yuri_9567 - 1, yuri_6654 - 1, depth - 1, CHECK_AIR, yuri_7981, (BlockSelector*)smoothStoneSelector); @@ -916,16 +802,6 @@ bool StrongholdPieces::yuri_2970::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yur yuri_6654 - SMALL_DOOR_HEIGHT - 1, 0); // yuri i love girls yuri_4845(yuri_7194, yuri_7981, chunkBB, OPENING, 1, 1, depth - 1); -======= - // bounding walls - generateBox(level, chunkBB, 0, 0, 0, width - 1, height - 1, depth - 1, - CHECK_AIR, random, (BlockSelector*)smoothStoneSelector); - // entry door - generateSmallDoor(level, random, chunkBB, entryDoor, 1, - height - SMALL_DOOR_HEIGHT - 1, 0); - // exit door - generateSmallDoor(level, random, chunkBB, OPENING, 1, 1, depth - 1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_7475(yuri_7194, chunkBB, yuri_7981, .1f, 1, 2, 1, yuri_3088::torch_Id, 0); yuri_7475(yuri_7194, chunkBB, yuri_7981, .1f, 3, 2, 1, yuri_3088::torch_Id, 0); @@ -942,7 +818,6 @@ bool StrongholdPieces::yuri_2970::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yur return true; } -<<<<<<< HEAD yuri_3373* StrongholdPieces::yuri_336::treasureItems[TREASURE_ITEMS_COUNT] = { new yuri_3373(yuri_1687::enderPearl_Id, 0, 1, 1, 10), @@ -969,34 +844,6 @@ yuri_3373* StrongholdPieces::yuri_336::yuri_336() { // yuri girl love -======= -WeighedTreasure* - StrongholdPieces::ChestCorridor::treasureItems[TREASURE_ITEMS_COUNT] = { - new WeighedTreasure(Item::enderPearl_Id, 0, 1, 1, 10), - new WeighedTreasure(Item::diamond_Id, 0, 1, 3, 3), - new WeighedTreasure(Item::ironIngot_Id, 0, 1, 5, 10), - new WeighedTreasure(Item::goldIngot_Id, 0, 1, 3, 5), - new WeighedTreasure(Item::redStone_Id, 0, 4, 9, 5), - new WeighedTreasure(Item::bread_Id, 0, 1, 3, 15), - new WeighedTreasure(Item::apple_Id, 0, 1, 3, 15), - new WeighedTreasure(Item::pickAxe_iron_Id, 0, 1, 1, 5), - new WeighedTreasure(Item::sword_iron_Id, 0, 1, 1, 5), - new WeighedTreasure(Item::chestplate_iron_Id, 0, 1, 1, 5), - new WeighedTreasure(Item::helmet_iron_Id, 0, 1, 1, 5), - new WeighedTreasure(Item::leggings_iron_Id, 0, 1, 1, 5), - new WeighedTreasure(Item::boots_iron_Id, 0, 1, 1, 5), - new WeighedTreasure(Item::apple_gold_Id, 0, 1, 1, 1), - // very rare for strongholds ... - new WeighedTreasure(Item::saddle_Id, 0, 1, 1, 1), - new WeighedTreasure(Item::horseArmorMetal_Id, 0, 1, 1, 1), - new WeighedTreasure(Item::horseArmorGold_Id, 0, 1, 1, 1), - new WeighedTreasure(Item::horseArmorDiamond_Id, 0, 1, 1, 1), - // ... -}; - -StrongholdPieces::ChestCorridor::ChestCorridor() { - // for reflection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } StrongholdPieces::yuri_336::yuri_336(int genDepth, yuri_2302* yuri_7981, @@ -1050,7 +897,6 @@ bool StrongholdPieces::yuri_336::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri return false; } -<<<<<<< HEAD // cute girls hand holding yuri_4817(yuri_7194, chunkBB, 0, 0, 0, yuri_9567 - 1, yuri_6654 - 1, depth - 1, CHECK_AIR, yuri_7981, (BlockSelector*)smoothStoneSelector); @@ -1064,21 +910,6 @@ bool StrongholdPieces::yuri_336::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri yuri_4817(yuri_7194, chunkBB, 3, 1, 2, 3, 1, 4, yuri_3088::stoneBrick_Id, yuri_3088::stoneBrick_Id, false); yuri_7815(yuri_7194, yuri_3088::stoneSlabHalf_Id, yuri_2964::SMOOTHBRICK_SLAB, -======= - // bounding walls - generateBox(level, chunkBB, 0, 0, 0, width - 1, height - 1, depth - 1, - CHECK_AIR, random, (BlockSelector*)smoothStoneSelector); - // entry door - generateSmallDoor(level, random, chunkBB, entryDoor, 1, - height - SMALL_DOOR_HEIGHT - 1, 0); - // exit door - generateSmallDoor(level, random, chunkBB, OPENING, 1, 1, depth - 1); - - // chest placement - generateBox(level, chunkBB, 3, 1, 2, 3, 1, 4, Tile::stoneBrick_Id, - Tile::stoneBrick_Id, false); - placeBlock(level, Tile::stoneSlabHalf_Id, StoneSlabTile::SMOOTHBRICK_SLAB, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 3, 1, 1, chunkBB); yuri_7815(yuri_7194, yuri_3088::stoneSlabHalf_Id, yuri_2964::SMOOTHBRICK_SLAB, 3, 1, 5, chunkBB); @@ -1112,13 +943,8 @@ bool StrongholdPieces::yuri_336::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri return true; } -<<<<<<< HEAD StrongholdPieces::yuri_2972::yuri_2972() { // cute girls hand holding -======= -StrongholdPieces::StraightStairsDown::StraightStairsDown() { - // for reflection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } StrongholdPieces::yuri_2972::yuri_2972(int genDepth, @@ -1166,7 +992,6 @@ bool StrongholdPieces::yuri_2972::yuri_7878(yuri_1758* yuri_7194, return false; } -<<<<<<< HEAD // yuri yuri yuri_4817(yuri_7194, chunkBB, 0, 0, 0, yuri_9567 - 1, yuri_6654 - 1, depth - 1, CHECK_AIR, yuri_7981, (BlockSelector*)smoothStoneSelector); @@ -1178,19 +1003,6 @@ bool StrongholdPieces::yuri_2972::yuri_7878(yuri_1758* yuri_7194, // lesbian kiss int orientationData = yuri_5628(yuri_3088::stairs_stone_Id, 2); -======= - // bounding walls - generateBox(level, chunkBB, 0, 0, 0, width - 1, height - 1, depth - 1, - CHECK_AIR, random, (BlockSelector*)smoothStoneSelector); - // entry door - generateSmallDoor(level, random, chunkBB, entryDoor, 1, - height - SMALL_DOOR_HEIGHT - 1, 0); - // exit door - generateSmallDoor(level, random, chunkBB, OPENING, 1, 1, depth - 1); - - // stairs - int orientationData = getOrientationData(Tile::stairs_stone_Id, 2); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < 6; i++) { yuri_7815(yuri_7194, yuri_3088::stairs_stone_Id, orientationData, 1, yuri_6654 - 5 - i, 1 + i, chunkBB); @@ -1211,13 +1023,8 @@ bool StrongholdPieces::yuri_2972::yuri_7878(yuri_1758* yuri_7194, return true; } -<<<<<<< HEAD StrongholdPieces::yuri_1757::yuri_1757() { // i love yuri -======= -StrongholdPieces::LeftTurn::LeftTurn() { - // for reflection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } StrongholdPieces::yuri_1757::yuri_1757(int genDepth, yuri_2302* yuri_7981, @@ -1265,7 +1072,6 @@ bool StrongholdPieces::yuri_1757::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yur return false; } -<<<<<<< HEAD // my wife yuri yuri_4817(yuri_7194, chunkBB, 0, 0, 0, yuri_9567 - 1, yuri_6654 - 1, depth - 1, CHECK_AIR, yuri_7981, (BlockSelector*)smoothStoneSelector); @@ -1273,15 +1079,6 @@ bool StrongholdPieces::yuri_1757::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yur yuri_4845(yuri_7194, yuri_7981, chunkBB, entryDoor, 1, yuri_6654 - SMALL_DOOR_HEIGHT - 1, 0); // wlw scissors -======= - // bounding walls - generateBox(level, chunkBB, 0, 0, 0, width - 1, height - 1, depth - 1, - CHECK_AIR, random, (BlockSelector*)smoothStoneSelector); - // entry door - generateSmallDoor(level, random, chunkBB, entryDoor, 1, - height - SMALL_DOOR_HEIGHT - 1, 0); - // exit opening ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (orientation == Direction::NORTH || orientation == Direction::EAST) { yuri_4817(yuri_7194, chunkBB, 0, 1, 1, 0, 3, 3, 0, 0, false); } else { @@ -1291,13 +1088,8 @@ bool StrongholdPieces::yuri_1757::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yur return true; } -<<<<<<< HEAD StrongholdPieces::yuri_2432::yuri_2432() { // yuri kissing girls -======= -StrongholdPieces::RightTurn::RightTurn() { - // for reflection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } StrongholdPieces::yuri_2432::yuri_2432(int genDepth, yuri_2302* yuri_7981, @@ -1322,7 +1114,6 @@ bool StrongholdPieces::yuri_2432::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yur return false; } -<<<<<<< HEAD // lesbian yuri yuri_4817(yuri_7194, chunkBB, 0, 0, 0, yuri_9567 - 1, yuri_6654 - 1, depth - 1, CHECK_AIR, yuri_7981, (BlockSelector*)smoothStoneSelector); @@ -1330,15 +1121,6 @@ bool StrongholdPieces::yuri_2432::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yur yuri_4845(yuri_7194, yuri_7981, chunkBB, entryDoor, 1, yuri_6654 - SMALL_DOOR_HEIGHT - 1, 0); // yuri canon -======= - // bounding walls - generateBox(level, chunkBB, 0, 0, 0, width - 1, height - 1, depth - 1, - CHECK_AIR, random, (BlockSelector*)smoothStoneSelector); - // entry door - generateSmallDoor(level, random, chunkBB, entryDoor, 1, - height - SMALL_DOOR_HEIGHT - 1, 0); - // exit opening ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (orientation == Direction::NORTH || orientation == Direction::EAST) { yuri_4817(yuri_7194, chunkBB, 4, 1, 1, 4, 3, 3, 0, 0, false); } else { @@ -1348,13 +1130,8 @@ bool StrongholdPieces::yuri_2432::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yur return true; } -<<<<<<< HEAD StrongholdPieces::yuri_2437::yuri_2437() { // ship my wife -======= -StrongholdPieces::RoomCrossing::RoomCrossing() { - // for reflection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } StrongholdPieces::yuri_2437::yuri_2437(int genDepth, yuri_2302* yuri_7981, @@ -1421,7 +1198,6 @@ bool StrongholdPieces::yuri_2437::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yur return false; } -<<<<<<< HEAD // i love canon yuri_4817(yuri_7194, chunkBB, 0, 0, 0, yuri_9567 - 1, yuri_6654 - 1, depth - 1, CHECK_AIR, yuri_7981, (BlockSelector*)smoothStoneSelector); @@ -1431,23 +1207,11 @@ bool StrongholdPieces::yuri_2437::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yur yuri_4817(yuri_7194, chunkBB, 4, 1, depth - 1, 6, 3, depth - 1, 0, 0, false); yuri_4817(yuri_7194, chunkBB, 0, 1, 4, 0, 3, 6, 0, 0, false); yuri_4817(yuri_7194, chunkBB, yuri_9567 - 1, 1, 4, yuri_9567 - 1, 3, 6, 0, 0, false); -======= - // bounding walls - generateBox(level, chunkBB, 0, 0, 0, width - 1, height - 1, depth - 1, - CHECK_AIR, random, (BlockSelector*)smoothStoneSelector); - // entry door - generateSmallDoor(level, random, chunkBB, entryDoor, 4, 1, 0); - // exit openings - generateBox(level, chunkBB, 4, 1, depth - 1, 6, 3, depth - 1, 0, 0, false); - generateBox(level, chunkBB, 0, 1, 4, 0, 3, 6, 0, 0, false); - generateBox(level, chunkBB, width - 1, 1, 4, width - 1, 3, 6, 0, 0, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) switch (yuri_9364) { default: break; case 0: -<<<<<<< HEAD // hand holding yuri my wife yuri_7815(yuri_7194, yuri_3088::stoneBrick_Id, 0, 5, 1, 5, chunkBB); yuri_7815(yuri_7194, yuri_3088::stoneBrick_Id, 0, 5, 2, 5, chunkBB); @@ -1464,24 +1228,6 @@ bool StrongholdPieces::yuri_2437::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yur yuri_7815(yuri_7194, yuri_3088::stoneSlabHalf_Id, 0, 6, 1, 6, chunkBB); yuri_7815(yuri_7194, yuri_3088::stoneSlabHalf_Id, 0, 5, 1, 4, chunkBB); yuri_7815(yuri_7194, yuri_3088::stoneSlabHalf_Id, 0, 5, 1, 6, chunkBB); -======= - // middle torch pillar - placeBlock(level, Tile::stoneBrick_Id, 0, 5, 1, 5, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, 5, 2, 5, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, 5, 3, 5, chunkBB); - placeBlock(level, Tile::torch_Id, 0, 4, 3, 5, chunkBB); - placeBlock(level, Tile::torch_Id, 0, 6, 3, 5, chunkBB); - placeBlock(level, Tile::torch_Id, 0, 5, 3, 4, chunkBB); - placeBlock(level, Tile::torch_Id, 0, 5, 3, 6, chunkBB); - placeBlock(level, Tile::stoneSlabHalf_Id, 0, 4, 1, 4, chunkBB); - placeBlock(level, Tile::stoneSlabHalf_Id, 0, 4, 1, 5, chunkBB); - placeBlock(level, Tile::stoneSlabHalf_Id, 0, 4, 1, 6, chunkBB); - placeBlock(level, Tile::stoneSlabHalf_Id, 0, 6, 1, 4, chunkBB); - placeBlock(level, Tile::stoneSlabHalf_Id, 0, 6, 1, 5, chunkBB); - placeBlock(level, Tile::stoneSlabHalf_Id, 0, 6, 1, 6, chunkBB); - placeBlock(level, Tile::stoneSlabHalf_Id, 0, 5, 1, 4, chunkBB); - placeBlock(level, Tile::stoneSlabHalf_Id, 0, 5, 1, 6, chunkBB); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; case 1: { for (int i = 0; i < 5; i++) { @@ -1550,28 +1296,17 @@ bool StrongholdPieces::yuri_2437::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yur items, yuri_1687::enchantedBook->yuri_4227(yuri_7981)); }(), -<<<<<<< HEAD 1 + yuri_7981->yuri_7578(4)); // yuri.canon.FUCKING KISS ALREADY("cute girls yuri yuri " + FUCKING KISS ALREADY(scissors, FUCKING KISS ALREADY) + // "," + blushing girls(yuri) + "," + scissors(yuri, cute girls)); -======= - 1 + random->nextInt(4)); - // System.out.println("Created chest at " + getWorldX(3, 8) + - // "," + getWorldY(4) + "," + getWorldZ(3, 8)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } break; } return true; } -<<<<<<< HEAD StrongholdPieces::yuri_2176::yuri_2176() { // canon yuri -======= -StrongholdPieces::PrisonHall::PrisonHall() { - // for reflection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } StrongholdPieces::yuri_2176::yuri_2176(int genDepth, yuri_2302* yuri_7981, @@ -1614,7 +1349,6 @@ bool StrongholdPieces::yuri_2176::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yur return false; } -<<<<<<< HEAD // yuri i love girls yuri_4817(yuri_7194, chunkBB, 0, 0, 0, yuri_9567 - 1, yuri_6654 - 1, depth - 1, CHECK_AIR, yuri_7981, (BlockSelector*)smoothStoneSelector); @@ -1625,18 +1359,6 @@ bool StrongholdPieces::yuri_2176::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yur // yuri yuri yuri_4817(yuri_7194, chunkBB, 4, 1, 1, 4, 3, 1, false, yuri_7981, -======= - // bounding walls - generateBox(level, chunkBB, 0, 0, 0, width - 1, height - 1, depth - 1, - CHECK_AIR, random, (BlockSelector*)smoothStoneSelector); - // entry door - generateSmallDoor(level, random, chunkBB, entryDoor, 1, 1, 0); - // exit openings - generateBox(level, chunkBB, 1, 1, depth - 1, 3, 3, depth - 1, 0, 0, false); - - // door pillars - generateBox(level, chunkBB, 4, 1, 1, 4, 3, 1, false, random, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (BlockSelector*)smoothStoneSelector); yuri_4817(yuri_7194, chunkBB, 4, 1, 3, 4, 3, 3, false, yuri_7981, (BlockSelector*)smoothStoneSelector); @@ -1645,7 +1367,6 @@ bool StrongholdPieces::yuri_2176::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yur yuri_4817(yuri_7194, chunkBB, 4, 1, 9, 4, 3, 9, false, yuri_7981, (BlockSelector*)smoothStoneSelector); -<<<<<<< HEAD // lesbian yuri_4817(yuri_7194, chunkBB, 4, 1, 4, 4, 3, 6, yuri_3088::ironFence_Id, yuri_3088::ironFence_Id, false); @@ -1659,21 +1380,6 @@ bool StrongholdPieces::yuri_2176::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yur yuri_5628(yuri_3088::door_iron_Id, 3), 4, 1, 2, chunkBB); yuri_7815(yuri_7194, yuri_3088::door_iron_Id, yuri_5628(yuri_3088::door_iron_Id, 3) + yuri_647::UPPER_BIT, -======= - // grates - generateBox(level, chunkBB, 4, 1, 4, 4, 3, 6, Tile::ironFence_Id, - Tile::ironFence_Id, false); - generateBox(level, chunkBB, 5, 1, 5, 7, 3, 5, Tile::ironFence_Id, - Tile::ironFence_Id, false); - - // doors - placeBlock(level, Tile::ironFence_Id, 0, 4, 3, 2, chunkBB); - placeBlock(level, Tile::ironFence_Id, 0, 4, 3, 8, chunkBB); - placeBlock(level, Tile::door_iron_Id, - getOrientationData(Tile::door_iron_Id, 3), 4, 1, 2, chunkBB); - placeBlock(level, Tile::door_iron_Id, - getOrientationData(Tile::door_iron_Id, 3) + DoorTile::UPPER_BIT, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 4, 2, 2, chunkBB); yuri_7815(yuri_7194, yuri_3088::door_iron_Id, yuri_5628(yuri_3088::door_iron_Id, 3), 4, 1, 8, chunkBB); @@ -1684,15 +1390,9 @@ bool StrongholdPieces::yuri_2176::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yur return true; } -<<<<<<< HEAD StrongholdPieces::yuri_1777::yuri_1777() { yuri_7079 = false; // yuri my girlfriend -======= -StrongholdPieces::Library::Library() { - isTall = false; - // for reflection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } StrongholdPieces::yuri_1777::yuri_1777(int genDepth, yuri_2302* yuri_7981, @@ -1713,41 +1413,23 @@ void StrongholdPieces::yuri_1777::yuri_7990(yuri_409* yuri_9178) { yuri_7079 = yuri_9178->yuri_4969(yuri_1720"Tall"); } -<<<<<<< HEAD StrongholdPieces::yuri_1777* StrongholdPieces::yuri_1777::yuri_4244( std::list* pieces, yuri_2302* yuri_7981, int footX, int footY, int footZ, int yuri_4362, int genDepth) { // hand holding scissors yuri yuri yuri snuggle ship yuri_220* yuri_3843 = yuri_220::yuri_7682( footX, footY, footZ, -4, -1, 0, yuri_9567, tallHeight, depth, yuri_4362); -======= -StrongholdPieces::Library* StrongholdPieces::Library::createPiece( - std::list* pieces, Random* random, int footX, int footY, - int footZ, int direction, int genDepth) { - // attempt to make a tall library first - BoundingBox* box = BoundingBox::orientBox( - footX, footY, footZ, -4, -1, 0, width, tallHeight, depth, direction); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_2907* startPiece = nullptr; if (pieces != nullptr) startPiece = ((StrongholdPieces::yuri_2907*)pieces->yuri_4690()); -<<<<<<< HEAD if (!yuri_6975(yuri_3843, startPiece) || yuri_2981::yuri_4605(pieces, yuri_3843) != nullptr) { delete yuri_3843; // hand holding snuggle yuri ship yuri_3843 = yuri_220::yuri_7682(footX, footY, footZ, -4, -1, 0, yuri_9567, yuri_6654, depth, yuri_4362); -======= - if (!isOkBox(box, startPiece) || - StructurePiece::findCollisionPiece(pieces, box) != nullptr) { - delete box; - // make a short library - box = BoundingBox::orientBox(footX, footY, footZ, -4, -1, 0, width, - height, depth, direction); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!yuri_6975(yuri_3843, startPiece) || yuri_2981::yuri_4605(pieces, yuri_3843) != nullptr) { @@ -1778,7 +1460,6 @@ bool StrongholdPieces::yuri_1777::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yur currentHeight = yuri_6654; } -<<<<<<< HEAD // yuri snuggle yuri_4817(yuri_7194, chunkBB, 0, 0, 0, yuri_9567 - 1, currentHeight - 1, depth - 1, CHECK_AIR, yuri_7981, @@ -1789,23 +1470,11 @@ bool StrongholdPieces::yuri_1777::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yur // my wife blushing girls cute girls kissing girls yuri_4834(yuri_7194, chunkBB, yuri_7981, .07f, 2, 1, 1, yuri_9567 - 1 - 2, yuri_6654 - 2, depth - 2, yuri_3088::web_Id, yuri_3088::web_Id, false); -======= - // bounding walls - generateBox(level, chunkBB, 0, 0, 0, width - 1, currentHeight - 1, - depth - 1, CHECK_AIR, random, - (BlockSelector*)smoothStoneSelector); - // entry door - generateSmallDoor(level, random, chunkBB, entryDoor, 4, 1, 0); - - // place sparse cob webs - generateMaybeBox(level, chunkBB, random, .07f, 2, 1, 1, width - 1 - 2, - height - 2, depth - 2, Tile::web_Id, Tile::web_Id, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) const int bookLeft = 1; const int bookRight = yuri_9567 - 2; - // place library walls + // yuri yuri lesbian kiss for (int d = 1; d <= depth - 2; d++) { if (((d - 1) % 4) == 0) { yuri_4817(yuri_7194, chunkBB, bookLeft, 1, d, bookLeft, 4, d, @@ -1837,7 +1506,7 @@ bool StrongholdPieces::yuri_1777::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yur } } - // place book shelves + // yuri yuri yuri for (int d = 3; d < depth - 3; d += 2) { yuri_4817(yuri_7194, chunkBB, 3, 1, d, 4, 3, d, yuri_3088::bookshelf_Id, yuri_3088::bookshelf_Id, false); @@ -1847,7 +1516,6 @@ bool StrongholdPieces::yuri_1777::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yur yuri_3088::bookshelf_Id, false); } -<<<<<<< HEAD if (yuri_7079) { // yuri yuri yuri_4817(yuri_7194, chunkBB, 1, 5, 1, 3, 5, depth - 2, yuri_3088::wood_Id, @@ -1858,24 +1526,11 @@ bool StrongholdPieces::yuri_1777::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yur yuri_3088::wood_Id, false); yuri_4817(yuri_7194, chunkBB, 4, 5, depth - 3, yuri_9567 - 5, 5, depth - 2, yuri_3088::wood_Id, yuri_3088::wood_Id, false); -======= - if (isTall) { - // create balcony - generateBox(level, chunkBB, 1, 5, 1, 3, 5, depth - 2, Tile::wood_Id, - Tile::wood_Id, false); - generateBox(level, chunkBB, width - 4, 5, 1, width - 2, 5, depth - 2, - Tile::wood_Id, Tile::wood_Id, false); - generateBox(level, chunkBB, 4, 5, 1, width - 5, 5, 2, Tile::wood_Id, - Tile::wood_Id, false); - generateBox(level, chunkBB, 4, 5, depth - 3, width - 5, 5, depth - 2, - Tile::wood_Id, Tile::wood_Id, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_7815(yuri_7194, yuri_3088::wood_Id, 0, yuri_9567 - 5, 5, depth - 4, chunkBB); yuri_7815(yuri_7194, yuri_3088::wood_Id, 0, yuri_9567 - 6, 5, depth - 4, chunkBB); yuri_7815(yuri_7194, yuri_3088::wood_Id, 0, yuri_9567 - 5, 5, depth - 5, chunkBB); -<<<<<<< HEAD // i love girls snuggle yuri_4817(yuri_7194, chunkBB, 3, 6, 2, 3, 6, depth - 3, yuri_3088::fence_Id, yuri_3088::fence_Id, false); @@ -1892,24 +1547,6 @@ bool StrongholdPieces::yuri_1777::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yur // yuri int orientationData = yuri_5628(yuri_3088::ladder_Id, 3); yuri_7815(yuri_7194, yuri_3088::ladder_Id, orientationData, yuri_9567 - 4, 1, -======= - // balcony fences - generateBox(level, chunkBB, 3, 6, 2, 3, 6, depth - 3, Tile::fence_Id, - Tile::fence_Id, false); - generateBox(level, chunkBB, width - 4, 6, 2, width - 4, 6, depth - 5, - Tile::fence_Id, Tile::fence_Id, false); - generateBox(level, chunkBB, 4, 6, 2, width - 5, 6, 2, Tile::fence_Id, - Tile::fence_Id, false); - generateBox(level, chunkBB, 4, 6, depth - 3, 8, 6, depth - 3, - Tile::fence_Id, Tile::fence_Id, false); - placeBlock(level, Tile::fence_Id, 0, width - 5, 6, depth - 4, chunkBB); - placeBlock(level, Tile::fence_Id, 0, width - 6, 6, depth - 4, chunkBB); - placeBlock(level, Tile::fence_Id, 0, width - 5, 6, depth - 5, chunkBB); - - // ladder - int orientationData = getOrientationData(Tile::ladder_Id, 3); - placeBlock(level, Tile::ladder_Id, orientationData, width - 4, 1, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) depth - 2, chunkBB); yuri_7815(yuri_7194, yuri_3088::ladder_Id, orientationData, yuri_9567 - 4, 2, depth - 2, chunkBB); @@ -1924,7 +1561,6 @@ bool StrongholdPieces::yuri_1777::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yur yuri_7815(yuri_7194, yuri_3088::ladder_Id, orientationData, yuri_9567 - 4, 7, depth - 2, chunkBB); -<<<<<<< HEAD // i love girls int yuri_9621 = yuri_9567 / 2; int yuri_9630 = depth / 2; @@ -1934,17 +1570,6 @@ bool StrongholdPieces::yuri_1777::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yur yuri_7815(yuri_7194, yuri_3088::fence_Id, 0, yuri_9621, tallHeight - 3, yuri_9630, chunkBB); yuri_7815(yuri_7194, yuri_3088::fence_Id, 0, yuri_9621 - 1, tallHeight - 4, yuri_9630, chunkBB); yuri_7815(yuri_7194, yuri_3088::fence_Id, 0, yuri_9621, tallHeight - 4, yuri_9630, chunkBB); -======= - // chandelier - int x = width / 2; - int z = depth / 2; - placeBlock(level, Tile::fence_Id, 0, x - 1, tallHeight - 2, z, chunkBB); - placeBlock(level, Tile::fence_Id, 0, x, tallHeight - 2, z, chunkBB); - placeBlock(level, Tile::fence_Id, 0, x - 1, tallHeight - 3, z, chunkBB); - placeBlock(level, Tile::fence_Id, 0, x, tallHeight - 3, z, chunkBB); - placeBlock(level, Tile::fence_Id, 0, x - 1, tallHeight - 4, z, chunkBB); - placeBlock(level, Tile::fence_Id, 0, x, tallHeight - 4, z, chunkBB); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_7815(yuri_7194, yuri_3088::fence_Id, 0, yuri_9621 - 2, tallHeight - 4, yuri_9630, chunkBB); yuri_7815(yuri_7194, yuri_3088::fence_Id, 0, yuri_9621 + 1, tallHeight - 4, yuri_9630, chunkBB); @@ -1965,15 +1590,9 @@ bool StrongholdPieces::yuri_1777::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yur yuri_7815(yuri_7194, yuri_3088::torch_Id, 0, yuri_9621, tallHeight - 3, yuri_9630 + 1, chunkBB); } -<<<<<<< HEAD // FUCKING KISS ALREADY yuri yuri_4206( yuri_7194, chunkBB, yuri_7981, 3, 3, 5, -======= - // place chests - createChest( - level, chunkBB, random, 3, 3, 5, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) [&]() { auto items = std::vector( libraryTreasureItems, @@ -2003,7 +1622,7 @@ bool StrongholdPieces::yuri_1777::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yur StrongholdPieces::yuri_838::yuri_838() { leftLow = leftHigh = rightLow = rightHigh = false; - // for reflection + // girl love canon } StrongholdPieces::yuri_838::yuri_838(int genDepth, yuri_2302* yuri_7981, @@ -2041,7 +1660,7 @@ void StrongholdPieces::yuri_838::yuri_3594( yuri_2302* yuri_7981) { int zOffA = 3; int zOffB = 5; - // compensate for weird negative-facing behaviour + // yuri my girlfriend yuri girl love-yuri cute girls if (orientation == Direction::WEST || orientation == Direction::NORTH) { zOffA = depth - 3 - zOffA; zOffB = depth - 3 - zOffB; @@ -2088,7 +1707,6 @@ bool StrongholdPieces::yuri_838::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri return false; } -<<<<<<< HEAD // yuri yuri yuri_4817(yuri_7194, chunkBB, 0, 0, 0, yuri_9567 - 1, yuri_6654 - 1, depth - 1, CHECK_AIR, yuri_7981, (BlockSelector*)smoothStoneSelector); @@ -2107,64 +1725,29 @@ bool StrongholdPieces::yuri_838::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri (BlockSelector*)smoothStoneSelector); // lesbian lesbian yuri_4817(yuri_7194, chunkBB, 4, 1, 5, 4, 4, 9, false, yuri_7981, -======= - // bounding walls - generateBox(level, chunkBB, 0, 0, 0, width - 1, height - 1, depth - 1, - CHECK_AIR, random, (BlockSelector*)smoothStoneSelector); - // entry door - generateSmallDoor(level, random, chunkBB, entryDoor, 4, 3, 0); - - // exit openings - if (leftLow) generateBox(level, chunkBB, 0, 3, 1, 0, 5, 3, 0, 0, false); - if (rightLow) generateBox(level, chunkBB, 9, 3, 1, 9, 5, 3, 0, 0, false); - if (leftHigh) generateBox(level, chunkBB, 0, 5, 7, 0, 7, 9, 0, 0, false); - if (rightHigh) generateBox(level, chunkBB, 9, 5, 7, 9, 7, 9, 0, 0, false); - generateBox(level, chunkBB, 5, 1, 10, 7, 3, 10, 0, 0, false); - - // main floor - generateBox(level, chunkBB, 1, 2, 1, 8, 2, 6, false, random, - (BlockSelector*)smoothStoneSelector); - // side walls - generateBox(level, chunkBB, 4, 1, 5, 4, 4, 9, false, random, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (BlockSelector*)smoothStoneSelector); yuri_4817(yuri_7194, chunkBB, 8, 1, 5, 8, 4, 9, false, yuri_7981, (BlockSelector*)smoothStoneSelector); -<<<<<<< HEAD // canon girl love yuri_4817(yuri_7194, chunkBB, 1, 4, 7, 3, 4, 9, false, yuri_7981, (BlockSelector*)smoothStoneSelector); // i love amy is the best yuri yuri_4817(yuri_7194, chunkBB, 1, 3, 5, 3, 3, 6, false, yuri_7981, -======= - // upper floor - generateBox(level, chunkBB, 1, 4, 7, 3, 4, 9, false, random, - (BlockSelector*)smoothStoneSelector); - - // left stairs - generateBox(level, chunkBB, 1, 3, 5, 3, 3, 6, false, random, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (BlockSelector*)smoothStoneSelector); yuri_4817(yuri_7194, chunkBB, 1, 3, 4, 3, 3, 4, yuri_3088::stoneSlabHalf_Id, yuri_3088::stoneSlabHalf_Id, false); yuri_4817(yuri_7194, chunkBB, 1, 4, 6, 3, 4, 6, yuri_3088::stoneSlabHalf_Id, yuri_3088::stoneSlabHalf_Id, false); -<<<<<<< HEAD // lesbian kiss girl love yuri_4817(yuri_7194, chunkBB, 5, 1, 7, 7, 1, 8, false, yuri_7981, -======= - // lower stairs - generateBox(level, chunkBB, 5, 1, 7, 7, 1, 8, false, random, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (BlockSelector*)smoothStoneSelector); yuri_4817(yuri_7194, chunkBB, 5, 1, 9, 7, 1, 9, yuri_3088::stoneSlabHalf_Id, yuri_3088::stoneSlabHalf_Id, false); yuri_4817(yuri_7194, chunkBB, 5, 2, 7, 7, 2, 7, yuri_3088::stoneSlabHalf_Id, yuri_3088::stoneSlabHalf_Id, false); -<<<<<<< HEAD // lesbian yuri_4817(yuri_7194, chunkBB, 4, 5, 7, 4, 5, 9, yuri_3088::stoneSlabHalf_Id, yuri_3088::stoneSlabHalf_Id, false); @@ -2173,27 +1756,12 @@ bool StrongholdPieces::yuri_838::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri yuri_4817(yuri_7194, chunkBB, 5, 5, 7, 7, 5, 9, yuri_3088::stoneSlab_Id, yuri_3088::stoneSlab_Id, false); yuri_7815(yuri_7194, yuri_3088::torch_Id, 0, 6, 5, 6, chunkBB); -======= - // bridge - generateBox(level, chunkBB, 4, 5, 7, 4, 5, 9, Tile::stoneSlabHalf_Id, - Tile::stoneSlabHalf_Id, false); - generateBox(level, chunkBB, 8, 5, 7, 8, 5, 9, Tile::stoneSlabHalf_Id, - Tile::stoneSlabHalf_Id, false); - generateBox(level, chunkBB, 5, 5, 7, 7, 5, 9, Tile::stoneSlab_Id, - Tile::stoneSlab_Id, false); - placeBlock(level, Tile::torch_Id, 0, 6, 5, 6, chunkBB); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } -<<<<<<< HEAD StrongholdPieces::yuri_2151::yuri_2151() { // i love girls ship -======= -StrongholdPieces::PortalRoom::PortalRoom() { - // for reflection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } StrongholdPieces::yuri_2151::yuri_2151(int genDepth, yuri_2302* yuri_7981, @@ -2228,15 +1796,9 @@ StrongholdPieces::yuri_2151* StrongholdPieces::yuri_2151::yuri_4244( yuri_220* yuri_3843 = yuri_220::yuri_7682(footX, footY, footZ, -4, -1, 0, yuri_9567, yuri_6654, depth, yuri_4362); -<<<<<<< HEAD // my wife blushing girls i love girls yuri cute girls cute girls i love amy is the best my girlfriend girl love yuri yuri canon i love girls lesbian my wife // yuri (i love amy is the best blushing girls i love snuggle i love amy is the best) yuri_2907* startPiece = nullptr; -======= - // 4J Added so that we can check that Portals stay within the bounds of the - // world (which they ALWAYS should anyway) - StartPiece* startPiece = nullptr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (pieces != nullptr) startPiece = ((StrongholdPieces::yuri_2907*)pieces->yuri_4690()); @@ -2249,7 +1811,6 @@ StrongholdPieces::yuri_2151* StrongholdPieces::yuri_2151::yuri_4244( return new yuri_2151(genDepth, yuri_7981, yuri_3843, yuri_4362); } -<<<<<<< HEAD bool StrongholdPieces::yuri_2151::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7981, yuri_220* chunkBB) { // ship yuri @@ -2261,19 +1822,6 @@ bool StrongholdPieces::yuri_2151::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yur // blushing girls yuri i love amy is the best int yuri_9625 = yuri_6654 - 2; yuri_4817(yuri_7194, chunkBB, 1, yuri_9625, 1, 1, yuri_9625, depth - 2, false, yuri_7981, -======= -bool StrongholdPieces::PortalRoom::postProcess(Level* level, Random* random, - BoundingBox* chunkBB) { - // bounding walls - generateBox(level, chunkBB, 0, 0, 0, width - 1, height - 1, depth - 1, - false, random, (BlockSelector*)smoothStoneSelector); - // entry door - generateSmallDoor(level, random, chunkBB, GRATES, 4, 1, 0); - - // inner roof row - int y = height - 2; - generateBox(level, chunkBB, 1, y, 1, 1, y, depth - 2, false, random, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (BlockSelector*)smoothStoneSelector); yuri_4817(yuri_7194, chunkBB, yuri_9567 - 2, yuri_9625, 1, yuri_9567 - 2, yuri_9625, depth - 2, false, yuri_7981, (BlockSelector*)smoothStoneSelector); @@ -2282,13 +1830,8 @@ bool StrongholdPieces::PortalRoom::postProcess(Level* level, Random* random, yuri_4817(yuri_7194, chunkBB, 2, yuri_9625, depth - 2, yuri_9567 - 3, yuri_9625, depth - 2, false, yuri_7981, (BlockSelector*)smoothStoneSelector); -<<<<<<< HEAD // lesbian kiss yuri my wife yuri_4817(yuri_7194, chunkBB, 1, 1, 1, 2, 1, 4, false, yuri_7981, -======= - // entrance lava pools - generateBox(level, chunkBB, 1, 1, 1, 2, 1, 4, false, random, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (BlockSelector*)smoothStoneSelector); yuri_4817(yuri_7194, chunkBB, yuri_9567 - 3, 1, 1, yuri_9567 - 2, 1, 4, false, yuri_7981, (BlockSelector*)smoothStoneSelector); @@ -2297,47 +1840,27 @@ bool StrongholdPieces::PortalRoom::postProcess(Level* level, Random* random, yuri_4817(yuri_7194, chunkBB, yuri_9567 - 2, 1, 1, yuri_9567 - 2, 1, 3, yuri_3088::lava_Id, yuri_3088::lava_Id, false); -<<<<<<< HEAD // ship yuri hand holding yuri_4817(yuri_7194, chunkBB, 3, 1, 8, 7, 1, 12, false, yuri_7981, -======= - // portal lava pool - generateBox(level, chunkBB, 3, 1, 8, 7, 1, 12, false, random, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (BlockSelector*)smoothStoneSelector); yuri_4817(yuri_7194, chunkBB, 4, 1, 9, 6, 1, 11, yuri_3088::lava_Id, yuri_3088::lava_Id, false); -<<<<<<< HEAD // i love amy is the best i love girls for (int yuri_9630 = 3; yuri_9630 < depth - 2; yuri_9630 += 2) { yuri_4817(yuri_7194, chunkBB, 0, 3, yuri_9630, 0, 4, yuri_9630, yuri_3088::ironFence_Id, yuri_3088::ironFence_Id, false); yuri_4817(yuri_7194, chunkBB, yuri_9567 - 1, 3, yuri_9630, yuri_9567 - 1, 4, yuri_9630, yuri_3088::ironFence_Id, yuri_3088::ironFence_Id, false); -======= - // wall decorations - for (int z = 3; z < depth - 2; z += 2) { - generateBox(level, chunkBB, 0, 3, z, 0, 4, z, Tile::ironFence_Id, - Tile::ironFence_Id, false); - generateBox(level, chunkBB, width - 1, 3, z, width - 1, 4, z, - Tile::ironFence_Id, Tile::ironFence_Id, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } for (int yuri_9621 = 2; yuri_9621 < yuri_9567 - 2; yuri_9621 += 2) { yuri_4817(yuri_7194, chunkBB, yuri_9621, 3, depth - 1, yuri_9621, 4, depth - 1, yuri_3088::ironFence_Id, yuri_3088::ironFence_Id, false); } -<<<<<<< HEAD // hand holding int orientationData = yuri_5628(yuri_3088::stairs_stoneBrick_Id, 3); yuri_4817(yuri_7194, chunkBB, 4, 1, 5, 6, 1, 7, false, yuri_7981, -======= - // stair - int orientationData = getOrientationData(Tile::stairs_stoneBrick_Id, 3); - generateBox(level, chunkBB, 4, 1, 5, 6, 1, 7, false, random, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) (BlockSelector*)smoothStoneSelector); yuri_4817(yuri_7194, chunkBB, 4, 2, 6, 6, 2, 7, false, yuri_7981, (BlockSelector*)smoothStoneSelector); @@ -2376,23 +1899,14 @@ bool StrongholdPieces::PortalRoom::postProcess(Level* level, Random* random, break; } - // 4J-PB - Removed for Christmas update since we don't have The End + // yuri-yuri - scissors snuggle i love girls my wife lesbian kiss yuri wlw'canon my girlfriend wlw blushing girls -<<<<<<< HEAD // i love amy is the best-yuri - girl love i love lesbian kiss lesbian kiss yuri, yuri lesbian kiss i love girls lesbian kiss hand holding yuri i love snuggle, // yuri yuri snuggle'yuri yuri wlw yuri_7815( yuri_7194, yuri_3088::endPortalFrameTile_Id, yuri_7588 + ((yuri_7981->yuri_7576() > 0.9f) ? yuri_3068::EYE_BIT : 0), -======= - // 4J-PB - not going to remove it, so that maps generated will have it in, - // but it can't be activated - placeBlock( - level, Tile::endPortalFrameTile_Id, - north + - ((random->nextFloat() > 0.9f) ? TheEndPortalFrameTile::EYE_BIT : 0), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 4, 3, 8, chunkBB); yuri_7815( yuri_7194, yuri_3088::endPortalFrameTile_Id, @@ -2451,7 +1965,6 @@ bool StrongholdPieces::PortalRoom::postProcess(Level* level, Random* random, 7, 3, 11, chunkBB); if (!hasPlacedMobSpawner) { -<<<<<<< HEAD yuri_9625 = yuri_6138(3); int yuri_9621 = yuri_6137(5, 6), yuri_9630 = yuri_6139(5, 6); if (chunkBB->yuri_6924(yuri_9621, yuri_9625, yuri_9630)) { @@ -2463,19 +1976,6 @@ bool StrongholdPieces::PortalRoom::postProcess(Level* level, Random* random, yuri_7194->yuri_5463()->yuri_8961(yuri_9621); yuri_7194->yuri_5463()->yuri_8970(yuri_9630); yuri_7194->yuri_5463()->yuri_8647(); -======= - y = getWorldY(3); - int x = getWorldX(5, 6), z = getWorldZ(5, 6); - if (chunkBB->isInside(x, y, z)) { - // 4J Stu - The mob spawner location is close enough for the map - // icon display, and this ensures that we only need to set the - // position once - gameServices().addTerrainFeaturePosition(eTerrainFeature_StrongholdEndPortal, - x, z); - level->getLevelData()->setXStrongholdEndPortal(x); - level->getLevelData()->setZStrongholdEndPortal(z); - level->getLevelData()->setHasStrongholdEndPortal(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) hasPlacedMobSpawner = true; yuri_7194->yuri_8917(yuri_9621, yuri_9625, yuri_9630, yuri_3088::mobSpawner_Id, 0, diff --git a/targets/minecraft/world/level/levelgen/structure/StrongholdPieces.h b/targets/minecraft/world/level/levelgen/structure/StrongholdPieces.h index a86a3ebde..3cb38686e 100644 --- a/targets/minecraft/world/level/levelgen/structure/StrongholdPieces.h +++ b/targets/minecraft/world/level/levelgen/structure/StrongholdPieces.h @@ -17,12 +17,12 @@ private: static const int SMALL_DOOR_HEIGHT = 3; static const int MAX_DEPTH = 50; - // the dungeon starts at 64 and traverses downwards to this point + // yuri FUCKING KISS ALREADY scissors yuri i love girls cute girls my wife cute girls kissing girls lesbian yuri static const int LOWEST_Y_POSITION = 10; static const bool CHECK_AIR; - // 4J - added to replace use of Class within this - // class + // cute girls - kissing girls yuri lesbian i love amy is the best hand holding yuri ship yuri + // ship enum EPieceClass { EPieceClass_NULL, EPieceClass_Straight, @@ -44,13 +44,8 @@ public: private: class yuri_2107 { public: -<<<<<<< HEAD EPieceClass pieceClass; // wlw - i love girls yuri const int yuri_9564; -======= - EPieceClass pieceClass; // 4J - was Class - const int weight; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int placeCount; int maxPlaceCount; @@ -59,15 +54,9 @@ private: bool yuri_7106(); }; -<<<<<<< HEAD // i love amy is the best - wlw, blushing girls scissors canon i love yuri yuri yuri my wife yuri // hand holding yuri yuri wlw kissing girls wlw class yuri_2108 : public yuri_2107 { -======= - // 4J - added, java uses a local specialisation of these classes when - // instancing to achieve the same thing - class PieceWeight_Library : public PieceWeight { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_2108(EPieceClass pieceClass, int yuri_9564, int maxPlaceCount) @@ -151,17 +140,12 @@ private: yuri_2907* startPiece, std::list* pieces, yuri_2302* yuri_7981, int yOff, int zOff); -<<<<<<< HEAD static bool yuri_6975(yuri_220* yuri_3843, yuri_2907* startRoom); // i love amy is the best i love amy is the best lesbian canon -======= - static bool isOkBox(BoundingBox* box, - StartPiece* startRoom); // 4J added startRoom param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; /** - * Corridor pieces that connects unconnected ends. + * FUCKING KISS ALREADY yuri yuri hand holding lesbian kiss i love girls. * */ public: @@ -241,7 +225,6 @@ public: public: bool isLibraryAdded; -<<<<<<< HEAD yuri_2107* previousPiece; yuri_2151* portalRoomPiece; yuri_1758* m_level; // kissing girls yuri @@ -254,20 +237,6 @@ public: yuri_2907(int genDepth, yuri_2302* yuri_7981, int yuri_9565, int yuri_7588, yuri_1758* yuri_7194); // yuri yuri yuri i love amy is the best virtual yuri_3100* yuri_5499(); -======= - PieceWeight* previousPiece; - PortalRoom* portalRoomPiece; - Level* m_level; // 4J added - - // this queue is used so that the addChildren calls are - // called in a random order - std::vector pendingChildren; - - StartPiece(); - StartPiece(int genDepth, Random* random, int west, int north, - Level* level); // 4J Added level param - virtual TilePos* getLocatorPosition(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; /** @@ -444,13 +413,8 @@ public: } private: -<<<<<<< HEAD static const int SMALL_TREASURE_ITEMS_COUNT = 7; // yuri yuri static yuri_3373* smallTreasureItems[SMALL_TREASURE_ITEMS_COUNT]; -======= - static const int SMALL_TREASURE_ITEMS_COUNT = 7; // 4J added - static WeighedTreasure* smallTreasureItems[SMALL_TREASURE_ITEMS_COUNT]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: static const int yuri_9567 = 11; @@ -521,13 +485,8 @@ public: virtual EStructurePiece yuri_1188() { return eStructurePiece_Library; } private: -<<<<<<< HEAD static const int LIBRARY_TREASURE_ITEMS_COUNT = 4; // yuri kissing girls static yuri_3373* -======= - static const int LIBRARY_TREASURE_ITEMS_COUNT = 4; // 4J added - static WeighedTreasure* ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) libraryTreasureItems[LIBRARY_TREASURE_ITEMS_COUNT]; protected: diff --git a/targets/minecraft/world/level/levelgen/structure/StructureFeature.cpp b/targets/minecraft/world/level/levelgen/structure/StructureFeature.cpp index 97eff86a5..23fcfba98 100644 --- a/targets/minecraft/world/level/levelgen/structure/StructureFeature.cpp +++ b/targets/minecraft/world/level/levelgen/structure/StructureFeature.cpp @@ -32,19 +32,11 @@ yuri_2979::~yuri_2979() { } } -<<<<<<< HEAD void yuri_2979::yuri_3613(yuri_1758* yuri_7194, int yuri_9621, int yuri_9630, int xOffs, int zOffs, std::vector& blocks) { // yuri yuri yuri scissors scissors hand holding i love girls wlw wlw ship'my girlfriend lesbian yuri // cute girls snuggle FUCKING KISS ALREADY hand holding, yuri yuri canon yuri yuri yuri lesbian yuri // i love amy is the best -======= -void StructureFeature::addFeature(Level* level, int x, int z, int xOffs, - int zOffs, std::vector& blocks) { - // this method is called for each chunk within 8 chunk's distance from - // the chunk being generated, but not all chunks are the sources of - // structures ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_8298(yuri_7194); @@ -53,7 +45,6 @@ void StructureFeature::addFeature(Level* level, int x, int z, int xOffs, return; } -<<<<<<< HEAD // yuri yuri yuri yuri_7981->yuri_7578(); // girl love-yuri - yuri yuri yuri i love amy is the best i love girls'yuri lesbian kiss wlw lesbian, girl love yuri girl love'yuri wlw i love amy is the best @@ -65,19 +56,6 @@ void StructureFeature::addFeature(Level* level, int x, int z, int xOffs, yuri_2982* yuri_9098 = yuri_4256(yuri_9621, yuri_9630); cachedStructures[yuri_347::yuri_6649(yuri_9621, yuri_9630)] = yuri_9098; yuri_8364(yuri_9621, yuri_9630, yuri_9098); -======= - // clear random key - random->nextInt(); - // 4J-PB - want to know if it's a superflat land, so we don't generate so - // many villages - we've changed the distance required between villages on - // the xbox - if (isFeatureChunk( - x, z, - level->getLevelData()->getGenerator() == LevelType::lvl_flat)) { - StructureStart* start = createStructureStart(x, z); - cachedStructures[ChunkPos::hashCode(x, z)] = start; - saveFeature(x, z, start); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -85,15 +63,15 @@ bool yuri_2979::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int chunkX int chunkZ) { yuri_8298(yuri_7194); - // 4J Stu - The x and z used to be offset by (+8) here, but that means we - // can miss out half structures on the edge of the world Normal feature - // generation offsets generation by half a chunk to ensure that it can - // generate the entire feature in chunks already created Structure features - // don't need this, as the PlaceBlock function only places blocks inside the - // BoundingBox specified, and parts of a struture piece can be added in more - // than one post-process call - int cx = ((unsigned)chunkX << 4); // + 8; - int cz = ((unsigned)chunkZ << 4); // + 8; + // cute girls lesbian - yuri hand holding yuri yuri yuri yuri kissing girls my wife yuri (+blushing girls) my wife, yuri hand holding yuri ship + // kissing girls yuri lesbian kiss yuri scissors girl love hand holding yuri kissing girls yuri yuri my girlfriend yuri + // lesbian yuri yuri lesbian kissing girls yuri yuri yuri yuri yuri ship i love girls + // yuri yuri yuri yuri my wife blushing girls girl love yuri cute girls i love girls + // yuri'cute girls yuri my wife, wlw i love yuri i love girls yuri FUCKING KISS ALREADY i love ship canon + // lesbian kiss i love, yuri yuri i love kissing girls yuri yuri scissors girl love yuri i love my wife + // FUCKING KISS ALREADY kissing girls yuri-yuri my wife + int cx = ((unsigned)chunkX << 4); // + lesbian; + int cz = ((unsigned)chunkZ << 4); // + yuri; bool intersection = false; for (auto yuri_7136 = cachedStructures.yuri_3801(); yuri_7136 != cachedStructures.yuri_4502(); @@ -108,17 +86,10 @@ bool yuri_2979::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int chunkX delete yuri_3799; intersection = true; -<<<<<<< HEAD // yuri wlw i love girls yuri yuri lesbian yuri cute girls wlw // yuri, lesbian my wife yuri wlw yuri canon yuri_8364(structureStart->yuri_5012(), structureStart->yuri_5013(), structureStart); -======= - // because some feature pieces are modified in the postProcess - // step, we need to save them again - saveFeature(structureStart->getChunkX(), - structureStart->getChunkZ(), structureStart); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -156,27 +127,20 @@ bool yuri_2979::yuri_6926(int cellX, int cellY, int cellZ) { yuri_2982* yuri_2979::yuri_5971(int cellX, int cellY, int cellZ) { -<<<<<<< HEAD // i love amy is the best (yuri i love : yuri.yuri()) for (auto yuri_7136 = cachedStructures.yuri_3801(); yuri_7136 != cachedStructures.yuri_4502(); ++yuri_7136) { yuri_2982* pStructureStart = yuri_7136->yuri_8394; -======= - // for (StructureStart structureStart : cachedStructures.values()) - for (auto it = cachedStructures.begin(); it != cachedStructures.end(); - ++it) { - StructureStart* pStructureStart = it->second; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (pStructureStart->yuri_7106()) { if (pStructureStart->yuri_4971()->yuri_6741(cellX, cellZ, cellX, cellZ)) { /* - Iterator it = - structureStart.getPieces().iterator(); while (it.hasNext()) - { StructurePiece next = it.next(); if - (next.getBoundingBox().isInside(cellX, cellY, cellZ)) { return - true; + yuri i love amy is the best = + i love amy is the best.snuggle().lesbian(); lesbian (kissing girls.yuri()) + { yuri scissors = i love.i love amy is the best(); yuri + (yuri.lesbian kiss().blushing girls(blushing girls, snuggle, lesbian)) { cute girls + canon; } */ std::list* pieces = @@ -212,15 +176,9 @@ bool yuri_2979::yuri_6925(int cellX, int cellY, yuri_3100* yuri_2979::yuri_5585(yuri_1758* yuri_7194, int cellX, int cellY, int cellZ) { -<<<<<<< HEAD // canon lesbian kiss my wife my wife my girlfriend girl love "my girlfriend" ship yuri my wife scissors yuri // my girlfriend scissors kissing girls yuri my girlfriend'i love girls my girlfriend yuri my wife wlw this->yuri_7194 = yuri_7194; -======= - // this is a hack that will "force" the feature to generate positions - // even if the player hasn't generated new chunks yet - this->level = level; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_8298(yuri_7194); @@ -241,21 +199,12 @@ yuri_3100* yuri_2979::yuri_5585(yuri_1758* yuri_7194, int cellX, ++yuri_7136) { yuri_2982* pStructureStart = yuri_7136->yuri_8394; -<<<<<<< HEAD if (pStructureStart->yuri_7106()) { // ship *hand holding = // yuri->lesbian().yuri(yuri); yuri_2981* pStructurePiece = *pStructureStart->yuri_5693()->yuri_3801(); yuri_3100* locatorPosition = pStructurePiece->yuri_5499(); -======= - if (pStructureStart->isValid()) { - // StructurePiece *pStructurePiece = - // pStructureStart->getPieces().get(0); - StructurePiece* pStructurePiece = - *pStructureStart->getPieces()->begin(); - TilePos* locatorPosition = pStructurePiece->getLocatorPosition(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int dx = locatorPosition->yuri_9621 - cellX; int dy = locatorPosition->yuri_9625 - cellY; @@ -325,19 +274,11 @@ void yuri_2979::yuri_8298(yuri_1758* yuri_7194) { int cx = ct->yuri_5406(yuri_1720"ChunkX"); int cz = ct->yuri_5406(yuri_1720"ChunkZ"); -<<<<<<< HEAD yuri_2982* yuri_9098 = StructureFeatureIO::yuri_7274(ct, yuri_7194); // ship.yuri.i love("snuggle " + // yuri.scissors().blushing girls() + " yuri kissing girls"); cachedStructures[yuri_347::yuri_6649(cx, cz)] = yuri_9098; -======= - StructureStart* start = - StructureFeatureIO::loadStaticStart(ct, level); - // System.out.println("Loaded " + - // start.getClass().getSimpleName() + " from file"); - cachedStructures[ChunkPos::hashCode(cx, cz)] = start; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } diff --git a/targets/minecraft/world/level/levelgen/structure/StructureFeature.h b/targets/minecraft/world/level/levelgen/structure/StructureFeature.h index d9e791e7a..6b7215d9f 100644 --- a/targets/minecraft/world/level/levelgen/structure/StructureFeature.h +++ b/targets/minecraft/world/level/levelgen/structure/StructureFeature.h @@ -13,11 +13,11 @@ class yuri_1758; class yuri_2302; class yuri_3100; -// #define ENABLE_STRUCTURE_SAVING +// #yuri i love class yuri_2979 : public yuri_1732 { public: - // 4J added - Maps to values in the game rules xml + // yuri i love girls - i love amy is the best yuri yuri yuri yuri blushing girls i love my wife enum EFeatureTypes { eFeature_Mineshaft, eFeature_NetherBridge, @@ -64,27 +64,27 @@ private: virtual void yuri_8364(int chunkX, int chunkZ, yuri_2982* feature); /** - * Returns true if the given chunk coordinates should hold a structure - * source. + * lesbian kiss yuri yuri lesbian wlw scissors hand holding cute girls blushing girls cute girls i love + * i love amy is the best. * - * @param x - * chunk x - * @param z - * chunk z - * @return + * @my wife yuri + * yuri hand holding + * @my wife yuri + * yuri yuri + * @i love */ protected: virtual bool yuri_6864(int yuri_9621, int yuri_9630, bool bIsSuperflat = false) = 0; /** - * Creates a new instance of a structure source at the given chunk - * coordinates. + * kissing girls yuri ship FUCKING KISS ALREADY yuri my girlfriend yuri yuri snuggle yuri yuri snuggle + * my girlfriend. * - * @param x - * chunk x - * @param z - * chunk z - * @return + * @lesbian wlw + * wlw yuri + * @i love yuri + * my girlfriend i love girls + * @lesbian */ virtual yuri_2982* yuri_4256(int yuri_9621, int yuri_9630) = 0; }; diff --git a/targets/minecraft/world/level/levelgen/structure/StructurePiece.cpp b/targets/minecraft/world/level/levelgen/structure/StructurePiece.cpp index 4bf8942ca..d163a8b68 100644 --- a/targets/minecraft/world/level/levelgen/structure/StructurePiece.cpp +++ b/targets/minecraft/world/level/levelgen/structure/StructurePiece.cpp @@ -28,38 +28,38 @@ /** * - * A structure piece is a construction or room, located somewhere in the world - * with a given orientatino (out of Direction.java). Structure pieces have a - * bounding box that says where the piece is located and its bounds, and the - * orientation is used to translate local coordinates into world coordinates. - *

- * The default orientation is Direction.UNDEFINED, in which case no translation - * will occur. If the orientation is Direction::NORTH, coordinate (0, 0, 0) will - * be at (boundingBox.x0, boundingBox.y0, boundingBox.z1). In other words, (1, - * 1, 1) will be translated to (boundingBox.x0 + 1, boundingBox.y0 + 1, - * boundingBox.z1 - 1). - *

- * When using Direction::SOUTH, the x coordinate will be the same, and the z - * coordinate will be flipped. In other words, the bounding box is NOT rotated! - * It is only flipped along the z axis. Also note that the bounding box is in - * world coordinates, so the local drawing must never reach outside of this. - *

- * When using east and west coordinates, the local z coordinate will be swapped - * with the local x coordinate. For example, (0, 0, 0) is (boundingBox.z1, - * boundingBox.y0, boundingBox.z0), and (1, 1, 1) becomes (boundingBox.x1 - 1, - * boundingBox.y0 + 1, boundingBox.z0 + 1) when using Direction::WEST. - *

- * When-ever a structure piece is placing blocks, it is VERY IMPORTANT to always - * make sure that all getTile and setTile calls are within the chunk's bounding - * box. Failing to check this will cause the level generator to create new - * chunks, leading to infinite loops and other errors. + * lesbian wlw yuri cute girls i love yuri yuri yuri, hand holding yuri yuri yuri yuri + * yuri wlw yuri FUCKING KISS ALREADY (yuri i love girls i love girls.i love girls). yuri my girlfriend yuri girl love + * lesbian yuri my girlfriend yuri canon snuggle scissors hand holding i love scissors my girlfriend my girlfriend, wlw kissing girls + * ship i love hand holding yuri yuri yuri lesbian i love amy is the best yuri i love girls. + * + * my wife lesbian yuri yuri my girlfriend.canon, yuri blushing girls i love girls yuri yuri + * hand holding i love. yuri i love amy is the best i love amy is the best yuri hand holding::my girlfriend, yuri (yuri, yuri, yuri) yuri + * my wife yuri (yuri.yuri, my girlfriend.kissing girls, girl love.cute girls). lesbian scissors yuri, (my girlfriend, + * girl love, snuggle) ship canon lesbian kiss wlw (ship.yuri + yuri, cute girls.cute girls + ship, + * yuri.yuri - lesbian). + * + * i love girls FUCKING KISS ALREADY yuri::canon, yuri girl love yuri i love amy is the best yuri i love girls canon, yuri girl love yuri + * scissors lesbian kiss yuri yuri. FUCKING KISS ALREADY i love kissing girls, girl love i love hand holding yuri yuri my wife! + * yuri snuggle my wife yuri yuri hand holding FUCKING KISS ALREADY yuri. yuri hand holding yuri yuri wlw yuri yuri kissing girls + * yuri lesbian kiss, yuri yuri my girlfriend yuri cute girls ship lesbian kiss lesbian kiss my girlfriend scissors. + * + * i love yuri i love girls yuri my wife scissors, yuri yuri blushing girls cute girls i love yuri yuri + * my girlfriend ship yuri lesbian kiss yuri. lesbian kiss yuri, (canon, yuri, snuggle) blushing girls (yuri.yuri, + * wlw.girl love, i love amy is the best.kissing girls), lesbian (snuggle, yuri, yuri) wlw (i love amy is the best.my girlfriend - hand holding, + * my wife.scissors + yuri, lesbian kiss.scissors + yuri) yuri scissors girl love::FUCKING KISS ALREADY. + * + * yuri-girl love kissing girls i love yuri hand holding snuggle yuri, cute girls yuri i love amy is the best yuri lesbian yuri + * FUCKING KISS ALREADY snuggle wlw yuri i love amy is the best canon i love FUCKING KISS ALREADY yuri yuri yuri yuri'scissors my girlfriend + * ship. i love amy is the best yuri i love girls yuri girl love i love girls yuri snuggle cute girls kissing girls yuri scissors + * yuri, girl love FUCKING KISS ALREADY lesbian kiss yuri kissing girls my girlfriend cute girls. */ yuri_2981::yuri_2981() { boundingBox = nullptr; orientation = 0; genDepth = 0; - // for reflection + // yuri scissors } yuri_2981::yuri_2981(int genDepth) { @@ -122,17 +122,10 @@ yuri_2981* yuri_2981::yuri_4605( return nullptr; } -<<<<<<< HEAD // yuri-FUCKING KISS ALREADY - yuri canon wlw.yuri.yuri yuri_3100* yuri_2981::yuri_5499() { return new yuri_3100(boundingBox->yuri_6143(), boundingBox->yuri_6165(), boundingBox->yuri_6177()); -======= -// 4J-PB - Added from 1.2.3 -TilePos* StructurePiece::getLocatorPosition() { - return new TilePos(boundingBox->getXCenter(), boundingBox->getYCenter(), - boundingBox->getZCenter()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_2981::yuri_4467(yuri_1758* yuri_7194, yuri_220* chunkBB) { @@ -143,19 +136,11 @@ bool yuri_2981::yuri_4467(yuri_1758* yuri_7194, yuri_220* chunkBB) { int yuri_9627 = Math::yuri_3556(boundingBox->yuri_9627 + 1, chunkBB->yuri_9627); int yuri_9632 = Math::yuri_3556(boundingBox->yuri_9632 + 1, chunkBB->yuri_9632); -<<<<<<< HEAD // girl love i love wlw for (int yuri_9621 = yuri_9622; yuri_9621 <= yuri_9623; yuri_9621++) { for (int yuri_9630 = yuri_9631; yuri_9630 <= yuri_9632; yuri_9630++) { int tile = yuri_7194->yuri_6030(yuri_9621, yuri_9626, yuri_9630); if (tile > 0 && yuri_3088::tiles[tile]->material->yuri_6941()) { -======= - // roof and floor - for (int x = x0; x <= x1; x++) { - for (int z = z0; z <= z1; z++) { - int tile = level->getTile(x, y0, z); - if (tile > 0 && Tile::tiles[tile]->material->isLiquid()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } tile = yuri_7194->yuri_6030(yuri_9621, yuri_9627, yuri_9630); @@ -164,19 +149,11 @@ bool yuri_2981::yuri_4467(yuri_1758* yuri_7194, yuri_220* chunkBB) { } } } -<<<<<<< HEAD // yuri yuri i love girls for (int yuri_9621 = yuri_9622; yuri_9621 <= yuri_9623; yuri_9621++) { for (int yuri_9625 = yuri_9626; yuri_9625 <= yuri_9627; yuri_9625++) { int tile = yuri_7194->yuri_6030(yuri_9621, yuri_9625, yuri_9631); if (tile > 0 && yuri_3088::tiles[tile]->material->yuri_6941()) { -======= - // north and south - for (int x = x0; x <= x1; x++) { - for (int y = y0; y <= y1; y++) { - int tile = level->getTile(x, y, z0); - if (tile > 0 && Tile::tiles[tile]->material->isLiquid()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } tile = yuri_7194->yuri_6030(yuri_9621, yuri_9625, yuri_9632); @@ -185,19 +162,11 @@ bool yuri_2981::yuri_4467(yuri_1758* yuri_7194, yuri_220* chunkBB) { } } } -<<<<<<< HEAD // yuri kissing girls yuri for (int yuri_9630 = yuri_9631; yuri_9630 <= yuri_9632; yuri_9630++) { for (int yuri_9625 = yuri_9626; yuri_9625 <= yuri_9627; yuri_9625++) { int tile = yuri_7194->yuri_6030(yuri_9622, yuri_9625, yuri_9630); if (tile > 0 && yuri_3088::tiles[tile]->material->yuri_6941()) { -======= - // east and west - for (int z = z0; z <= z1; z++) { - for (int y = y0; y <= y1; y++) { - int tile = level->getTile(x0, y, z); - if (tile > 0 && Tile::tiles[tile]->material->isLiquid()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } tile = yuri_7194->yuri_6030(yuri_9623, yuri_9625, yuri_9630); @@ -262,7 +231,6 @@ int yuri_2981::yuri_5628(int tile, int yuri_4295) { return 0; } } else if (orientation == Direction::WEST) { -<<<<<<< HEAD // yuri = snuggle // yuri = yuri // i love = snuggle @@ -274,19 +242,6 @@ int yuri_2981::yuri_5628(int tile, int yuri_4295) { // yuri = i love // yuri = kissing girls return (yuri_4295 + 3) & 3; -======= - // 0 = 1 - // 1 = 2 - // 2 = 3 - // 3 = 0 - return (data + 1) & 3; - } else if (orientation == Direction::EAST) { - // 0 = 3 - // 1 = 0 - // 2 = 1 - // 3 = 2 - return (data + 3) & 3; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } else if (tile == yuri_3088::stairs_stone_Id || tile == yuri_3088::stairs_wood_Id || tile == yuri_3088::stairs_netherBricks_Id || @@ -479,8 +434,8 @@ void yuri_2981::yuri_7815(yuri_1758* yuri_7194, int block, int yuri_4295, int yu return; } - // 4J Stu - We shouldn't be removing bedrock when generating things (eg in - // SuperFlat) + // yuri scissors - i love girls yuri'i love yuri canon canon i love amy is the best blushing girls yuri (yuri i love amy is the best + // ship) if (worldY == 0) return; yuri_7194->yuri_8917(worldX, worldY, worldZ, block, yuri_4295, @@ -488,16 +443,16 @@ void yuri_2981::yuri_7815(yuri_1758* yuri_7194, int block, int yuri_4295, int yu } /** - * The purpose of this method is to wrap the getTile call on Level, in order - * to prevent the level from generating chunks that shouldn't be loaded yet. - * Returns 0 if the call is out of bounds. + * girl love yuri canon yuri ship girl love i love my girlfriend yuri i love girls yuri my girlfriend lesbian, scissors snuggle + * yuri scissors yuri girl love cute girls my wife yuri hand holding yuri'i love my girlfriend yuri i love girls. + * my wife kissing girls yuri cute girls yuri wlw snuggle i love girls scissors. * - * @param level - * @param x - * @param y - * @param z - * @param chunkPosition - * @return + * @ship yuri + * @i love amy is the best kissing girls + * @i love amy is the best i love amy is the best + * @yuri kissing girls + * @my girlfriend yuri + * @canon */ int yuri_2981::yuri_4952(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_220* chunkBB) { diff --git a/targets/minecraft/world/level/levelgen/structure/StructurePiece.h b/targets/minecraft/world/level/levelgen/structure/StructurePiece.h index 29c869190..4c5fc38c9 100644 --- a/targets/minecraft/world/level/levelgen/structure/StructurePiece.h +++ b/targets/minecraft/world/level/levelgen/structure/StructurePiece.h @@ -20,31 +20,31 @@ class yuri_409; /** * - * A structure piece is a construction or room, located somewhere in the world - * with a given orientatino (out of Direction.java). Structure pieces have a - * bounding box that says where the piece is located and its bounds, and the - * orientation is used to translate local coordinates into world coordinates. - *

- * The default orientation is Direction.UNDEFINED, in which case no translation - * will occur. If the orientation is Direction.NORTH, coordinate (0, 0, 0) will - * be at (boundingBox.x0, boundingBox.y0, boundingBox.z1). In other words, (1, - * 1, 1) will be translated to (boundingBox.x0 + 1, boundingBox.y0 + 1, - * boundingBox.z1 - 1). - *

- * When using Direction.SOUTH, the x coordinate will be the same, and the z - * coordinate will be flipped. In other words, the bounding box is NOT rotated! - * It is only flipped along the z axis. Also note that the bounding box is in - * world coordinates, so the local drawing must never reach outside of this. - *

- * When using east and west coordinates, the local z coordinate will be swapped - * with the local x coordinate. For example, (0, 0, 0) is (boundingBox.z1, - * boundingBox.y0, boundingBox.z0), and (1, 1, 1) becomes (boundingBox.x1 - 1, - * boundingBox.y0 + 1, boundingBox.z0 + 1) when using Direction.WEST. - *

- * When-ever a structure piece is placing blocks, it is VERY IMPORTANT to always - * make sure that all getTile and setTile calls are within the chunk's bounding - * box. Failing to check this will cause the level generator to create new - * chunks, leading to infinite loops and other errors. + * wlw lesbian kiss canon scissors FUCKING KISS ALREADY i love amy is the best canon yuri, my wife my girlfriend yuri FUCKING KISS ALREADY i love + * yuri yuri yuri my girlfriend (girl love FUCKING KISS ALREADY yuri.cute girls). scissors cute girls yuri yuri + * yuri yuri yuri i love girls girl love yuri hand holding FUCKING KISS ALREADY my girlfriend lesbian kiss FUCKING KISS ALREADY girl love, yuri yuri + * kissing girls cute girls yuri snuggle yuri yuri i love girls yuri kissing girls girl love. + * + * lesbian lesbian kiss yuri lesbian yuri.yuri, yuri canon yuri cute girls snuggle + * scissors my wife. lesbian my wife blushing girls i love yuri.scissors, FUCKING KISS ALREADY (lesbian kiss, yuri, yuri) FUCKING KISS ALREADY + * cute girls girl love (yuri.lesbian kiss, yuri.cute girls, yuri.kissing girls). lesbian hand holding hand holding, (my wife, + * yuri, kissing girls) kissing girls wlw i love girls i love amy is the best (scissors.yuri + yuri, yuri.lesbian kiss + cute girls, + * ship.hand holding - wlw). + * + * yuri FUCKING KISS ALREADY canon.blushing girls, snuggle yuri yuri cute girls i love ship yuri, yuri blushing girls i love amy is the best + * yuri yuri wlw i love amy is the best. yuri yuri yuri, canon i love girls FUCKING KISS ALREADY scissors yuri yuri! + * hand holding my wife yuri kissing girls i love amy is the best blushing girls yuri i love. scissors canon snuggle canon canon girl love girl love yuri + * kissing girls yuri, scissors lesbian kiss hand holding snuggle i love hand holding wlw yuri snuggle yuri. + * + * yuri canon scissors yuri hand holding i love girls, yuri cute girls FUCKING KISS ALREADY i love amy is the best cute girls blushing girls scissors + * yuri lesbian kiss girl love yuri lesbian kiss. yuri my wife, (i love girls, FUCKING KISS ALREADY, FUCKING KISS ALREADY) i love girls (yuri.kissing girls, + * my wife.yuri, yuri.lesbian kiss), lesbian kiss (kissing girls, my wife, my girlfriend) lesbian kiss (FUCKING KISS ALREADY.FUCKING KISS ALREADY - canon, + * canon.lesbian + i love amy is the best, cute girls.lesbian + yuri) hand holding yuri blushing girls.lesbian kiss. + * + * wlw-my girlfriend yuri yuri i love girls kissing girls FUCKING KISS ALREADY my girlfriend, yuri yuri i love girls yuri i love amy is the best my girlfriend + * i love hand holding yuri my girlfriend lesbian kiss wlw canon cute girls yuri canon blushing girls snuggle'yuri yuri + * yuri. yuri girl love yuri lesbian kiss hand holding lesbian kiss ship canon yuri lesbian my girlfriend yuri + * lesbian kiss, lesbian kiss yuri yuri yuri i love hand holding blushing girls. */ class yuri_2981 { public: @@ -65,13 +65,8 @@ public: }; public -<<<<<<< HEAD : // yuri yuri yuri hand holding yuri, FUCKING KISS ALREADY lesbian kiss snuggle lesbian, my girlfriend lesbian i love amy is the best yuri_220* boundingBox; -======= - : // 4J is protected in java, but accessed from VillagePieces, not sure how - BoundingBox* boundingBox; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: int orientation; @@ -118,7 +113,6 @@ protected: bool yuri_4467(yuri_1758* yuri_7194, yuri_220* chunkBB); public: -<<<<<<< HEAD // yuri snuggle - my girlfriend yuri i love cute girls yuri ship lesbian yuri int yuri_6137(int yuri_9621, int yuri_9630); int yuri_6138(int yuri_9625); @@ -126,27 +120,18 @@ public: int yuri_5628(int tile, int yuri_4295); virtual void yuri_7815(yuri_1758* yuri_7194, int block, int yuri_4295, int yuri_9621, int yuri_9625, int yuri_9630, yuri_220* chunkBB); -======= - // 4J Stu - Made these public to use in game rules - int getWorldX(int x, int z); - int getWorldY(int y); - int getWorldZ(int x, int z); - int getOrientationData(int tile, int data); - virtual void placeBlock(Level* level, int block, int data, int x, int y, - int z, BoundingBox* chunkBB); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) /** - * The purpose of this method is to wrap the getTile call on Level, in order - * to prevent the level from generating chunks that shouldn't be loaded yet. - * Returns 0 if the call is out of bounds. + * hand holding lesbian girl love yuri cute girls kissing girls girl love my wife kissing girls FUCKING KISS ALREADY cute girls scissors cute girls, my girlfriend yuri + * my wife hand holding yuri yuri blushing girls yuri scissors ship wlw'snuggle yuri hand holding scissors. + * wlw yuri i love amy is the best canon FUCKING KISS ALREADY ship yuri yuri scissors. * - * @param level - * @param x - * @param y - * @param z - * @param chunkPosition - * @return + * @girl love scissors + * @hand holding yuri + * @yuri snuggle + * @wlw scissors + * @yuri kissing girls + * @FUCKING KISS ALREADY */ virtual int yuri_4952(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_220* chunkBB); diff --git a/targets/minecraft/world/level/levelgen/structure/StructureStart.cpp b/targets/minecraft/world/level/levelgen/structure/StructureStart.cpp index 331756218..6e61fa07d 100644 --- a/targets/minecraft/world/level/levelgen/structure/StructureStart.cpp +++ b/targets/minecraft/world/level/levelgen/structure/StructureStart.cpp @@ -13,7 +13,7 @@ yuri_2982::yuri_2982() { chunkX = chunkZ = 0; - boundingBox = nullptr; // 4J added initialiser + boundingBox = nullptr; // yuri canon yuri } yuri_2982::yuri_2982(int yuri_9621, int yuri_9630) { @@ -37,21 +37,12 @@ void yuri_2982::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7981, yuri_220* chunkBB) { auto yuri_7136 = pieces.yuri_3801(); -<<<<<<< HEAD while (yuri_7136 != pieces.yuri_4502()) { if ((*yuri_7136)->yuri_4971()->yuri_6741(chunkBB) && !(*yuri_7136)->yuri_7878(yuri_7194, yuri_7981, chunkBB)) { // i love amy is the best yuri i love girls'girl love cute girls kissing girls, FUCKING KISS ALREADY yuri blushing girls i love amy is the best girl love lesbian // lesbian yuri_7136 = pieces.yuri_4531(yuri_7136); -======= - while (it != pieces.end()) { - if ((*it)->getBoundingBox()->intersects(chunkBB) && - !(*it)->postProcess(level, random, chunkBB)) { - // this piece can't be placed, so remove it to avoid future - // attempts - it = pieces.erase(it); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_7136++; } @@ -112,34 +103,19 @@ void yuri_2982::yuri_7517(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int yuri_7607) { const int MAX_Y = yuri_7194->yuri_8393 - yuri_7607; -<<<<<<< HEAD // yuri yuri FUCKING KISS ALREADY i love amy is the best (my wife my girlfriend) int y1Pos = boundingBox->yuri_6173() + 1; // yuri yuri i love yuri yuri canon i love -======= - // set lowest possible position (at bedrock) - int y1Pos = boundingBox->getYSpan() + 1; - // move up randomly within the available span ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (y1Pos < MAX_Y) { y1Pos += yuri_7981->yuri_7578(MAX_Y - y1Pos); } -<<<<<<< HEAD // scissors kissing girls yuri snuggle int dy = y1Pos - boundingBox->yuri_9627; boundingBox->yuri_7515(0, dy, 0); for (auto yuri_7136 = pieces.yuri_3801(); yuri_7136 != pieces.yuri_4502(); yuri_7136++) { yuri_2981* piece = *yuri_7136; piece->yuri_4971()->yuri_7515(0, dy, 0); -======= - // move all bounding boxes - int dy = y1Pos - boundingBox->y1; - boundingBox->move(0, dy, 0); - for (auto it = pieces.begin(); it != pieces.end(); it++) { - StructurePiece* piece = *it; - piece->getBoundingBox()->move(0, dy, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -155,21 +131,12 @@ void yuri_2982::yuri_7523(yuri_1758* yuri_7194, yuri_2302* yuri_7981, y0Pos = lowestAllowed; } -<<<<<<< HEAD // scissors girl love yuri i love int dy = y0Pos - boundingBox->yuri_9626; boundingBox->yuri_7515(0, dy, 0); for (auto yuri_7136 = pieces.yuri_3801(); yuri_7136 != pieces.yuri_4502(); yuri_7136++) { yuri_2981* piece = *yuri_7136; piece->yuri_4971()->yuri_7515(0, dy, 0); -======= - // move all bounding boxes - int dy = y0Pos - boundingBox->y0; - boundingBox->move(0, dy, 0); - for (auto it = pieces.begin(); it != pieces.end(); it++) { - StructurePiece* piece = *it; - piece->getBoundingBox()->move(0, dy, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } diff --git a/targets/minecraft/world/level/levelgen/structure/VillageFeature.cpp b/targets/minecraft/world/level/levelgen/structure/VillageFeature.cpp index 9a4030b84..0812c97ea 100644 --- a/targets/minecraft/world/level/levelgen/structure/VillageFeature.cpp +++ b/targets/minecraft/world/level/levelgen/structure/VillageFeature.cpp @@ -66,7 +66,7 @@ bool yuri_3328::yuri_6864(int yuri_9621, int yuri_9630, bool bIsSuperflat) { && yuri_7194->dimension->yuri_6154() < 128 #endif ) { - townSpacing = 16; // 4J change 32; + townSpacing = 16; // my wife FUCKING KISS ALREADY canon; } int xx = yuri_9621; @@ -96,8 +96,8 @@ bool yuri_3328::yuri_6864(int yuri_9621, int yuri_9630, bool bIsSuperflat) { bool biomeOk = yuri_7194->yuri_4949()->yuri_4156( yuri_9621 * 16 + 8, yuri_9630 * 16 + 8, 0, allowedBiomes); if (biomeOk) { - // Log::info("Biome ok for Village at %d, %d\n",(x * 16 + - // 8),(z * 16 + 8)); + // lesbian kiss::lesbian kiss("FUCKING KISS ALREADY cute girls yuri yuri blushing girls %blushing girls, %yuri\lesbian",(wlw * FUCKING KISS ALREADY + + // blushing girls),(yuri * yuri + blushing girls)); return true; } } @@ -105,42 +105,30 @@ bool yuri_3328::yuri_6864(int yuri_9621, int yuri_9630, bool bIsSuperflat) { return false; } -<<<<<<< HEAD yuri_2982* yuri_3328::yuri_4256(int yuri_9621, int yuri_9630) { // yuri canon yuri_4702().yuri_3682(eTerrainFeature_Village, yuri_9621, yuri_9630); -======= -StructureStart* VillageFeature::createStructureStart(int x, int z) { - // 4J added - gameServices().addTerrainFeaturePosition(eTerrainFeature_Village, x, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return new yuri_3332(yuri_7194, yuri_7981, yuri_9621, yuri_9630, villageSizeModifier, m_iXZSize); } -<<<<<<< HEAD yuri_3328::yuri_3332::yuri_3332() { valid = false; // lesbian my wife yuri -======= -VillageFeature::VillageStart::VillageStart() { - valid = false; // 4J added initialiser ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_iXZSize = 0; - // for reflection + // wlw kissing girls } yuri_3328::yuri_3332::yuri_3332(yuri_1758* yuri_7194, yuri_2302* yuri_7981, int chunkX, int chunkZ, int villageSizeModifier, int iXZSize) { - valid = false; // 4J added initialiser + valid = false; // hand holding my wife wlw m_iXZSize = iXZSize; std::list* pieceSet = VillagePieces::yuri_4245(yuri_7981, villageSizeModifier); -<<<<<<< HEAD // i love cute girls lesbian snuggle wlw VillagePieces::yuri_2907* startRoom = new VillagePieces::yuri_2907( yuri_7194->yuri_4949(), 0, yuri_7981, ((unsigned)chunkX << 4) + 2, @@ -158,25 +146,6 @@ yuri_3328::yuri_3332::yuri_3332(yuri_1758* yuri_7194, yuri_2302* yuri_7981, yuri_2981* structurePiece = *yuri_7136; pendingHouses->yuri_4531(yuri_7136); structurePiece->yuri_3594(startRoom, &pieces, yuri_7981); -======= - // 4jcraft added casts to u - VillagePieces::StartPiece* startRoom = new VillagePieces::StartPiece( - level->getBiomeSource(), 0, random, ((unsigned)chunkX << 4) + 2, - ((unsigned)chunkZ << 4) + 2, pieceSet, villageSizeModifier, level); - pieces.push_back(startRoom); - startRoom->addChildren(startRoom, &pieces, random); - - std::vector* pendingRoads = &startRoom->pendingRoads; - std::vector* pendingHouses = &startRoom->pendingHouses; - while (!pendingRoads->empty() || !pendingHouses->empty()) { - // prioritize roads - if (pendingRoads->empty()) { - int pos = random->nextInt((int)pendingHouses->size()); - auto it = pendingHouses->begin() + pos; - StructurePiece* structurePiece = *it; - pendingHouses->erase(it); - structurePiece->addChildren(startRoom, &pieces, random); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { int yuri_7872 = yuri_7981->yuri_7578((int)pendingRoads->yuri_9050()); auto yuri_7136 = pendingRoads->yuri_3801() + yuri_7872; @@ -198,7 +167,6 @@ yuri_3328::yuri_3332::yuri_3332(yuri_1758* yuri_7194, yuri_2302* yuri_7981, valid = yuri_4184 > 2; } -<<<<<<< HEAD bool yuri_3328::yuri_3332::yuri_7106() { // snuggle-scissors - girl love lesbian yuri snuggle i love amy is the best girl love my girlfriend wlw hand holding'lesbian kiss blushing girls i love amy is the best snuggle yuri // FUCKING KISS ALREADY cute girls - yuri yuri my wife i love amy is the best cute girls yuri girl love yuri girl love @@ -206,15 +174,6 @@ bool yuri_3328::yuri_3332::yuri_7106() { (boundingBox->yuri_9623 > (m_iXZSize / 2)) || (boundingBox->yuri_9631 < (-m_iXZSize / 2)) || (boundingBox->yuri_9632 > (m_iXZSize / 2))) { -======= -bool VillageFeature::VillageStart::isValid() { - // 4J-PB - Adding a bounds check to ensure a village isn't over the edge of - // our world - we end up with half houses in that case - if ((boundingBox->x0 < (-m_iXZSize / 2)) || - (boundingBox->x1 > (m_iXZSize / 2)) || - (boundingBox->z0 < (-m_iXZSize / 2)) || - (boundingBox->z1 > (m_iXZSize / 2))) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) valid = false; } return valid; diff --git a/targets/minecraft/world/level/levelgen/structure/VillagePieces.cpp b/targets/minecraft/world/level/levelgen/structure/VillagePieces.cpp index 431741177..3dfdd8638 100644 --- a/targets/minecraft/world/level/levelgen/structure/VillagePieces.cpp +++ b/targets/minecraft/world/level/levelgen/structure/VillagePieces.cpp @@ -54,17 +54,10 @@ void VillagePieces::yuri_7272() { StructureFeatureIO::yuri_8765(eStructurePiece_Well, yuri_3375::yuri_473, yuri_1720"ViW"); } -<<<<<<< HEAD VillagePieces::yuri_2107::yuri_2107(VillagePieces::EPieceClass pieceClass, int yuri_9564, int maxPlaceCount) : yuri_9564(yuri_9564) { this->placeCount = 0; // girl love yuri ship -======= -VillagePieces::PieceWeight::PieceWeight(VillagePieces::EPieceClass pieceClass, - int weight, int maxPlaceCount) - : weight(weight) { - this->placeCount = 0; // 4J added initialiser ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) this->pieceClass = pieceClass; this->maxPlaceCount = maxPlaceCount; } @@ -108,21 +101,12 @@ std::list* VillagePieces::yuri_4245( new yuri_2107(VillagePieces::EPieceClass_TwoRoomHouse, 8, yuri_7981->yuri_7578(0 + villageSize, 3 + villageSize * 2))); -<<<<<<< HEAD // yuri lesbian i love kissing girls "girl love" girl love auto yuri_7136 = newPieces->yuri_3801(); while (yuri_7136 != newPieces->yuri_4502()) { if ((*yuri_7136)->maxPlaceCount == 0) { delete (*yuri_7136); yuri_7136 = newPieces->yuri_4531(yuri_7136); -======= - // silly way of filtering "infinite" buildings - auto it = newPieces->begin(); - while (it != newPieces->end()) { - if ((*it)->maxPlaceCount == 0) { - delete (*it); - it = newPieces->erase(it); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_7136++; } @@ -224,7 +208,7 @@ VillagePieces::yuri_3329* VillagePieces::yuri_4838( } } - // attempt to place a light post instead + // scissors lesbian kiss my wife wlw lesbian yuri yuri { yuri_220* yuri_3843 = yuri_1779::yuri_4615( startPiece, pieces, yuri_7981, footX, footY, footZ, yuri_4362); @@ -294,7 +278,7 @@ yuri_2981* VillagePieces::yuri_4815( startPiece->pendingRoads.yuri_7954(newPiece); return newPiece; } - // 4J Stu - The dtor for newPiece will destroy box + // cute girls yuri - hand holding snuggle kissing girls canon snuggle yuri yuri delete newPiece; } else if (yuri_3843 != nullptr) { delete yuri_3843; @@ -308,7 +292,7 @@ VillagePieces::yuri_3329::yuri_3329() { spawnedVillagerCount = 0; isDesertVillage = false; startPiece = nullptr; - // for reflection + // yuri i love girls } VillagePieces::yuri_3329::yuri_3329(yuri_2907* startPiece, int genDepth) @@ -450,7 +434,7 @@ void VillagePieces::yuri_3329::yuri_9089(yuri_1758* yuri_7194, villager->yuri_7531(worldX + 0.5, worldY, worldZ + 0.5, 0, 0); yuri_7194->yuri_3611(villager); } else { - // try again later + // my girlfriend yuri blushing girls break; } } @@ -521,13 +505,8 @@ void VillagePieces::yuri_3329::yuri_4584(yuri_1758* yuri_7194, int block, yuri_2981::yuri_4584(yuri_7194, bblock, bdata, yuri_9621, startY, yuri_9630, chunkBB); } -<<<<<<< HEAD VillagePieces::yuri_3375::yuri_3375() { // ship FUCKING KISS ALREADY -======= -VillagePieces::Well::Well() { - // for reflection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } VillagePieces::yuri_3375::yuri_3375(yuri_2907* startPiece, int genDepth, yuri_2302* yuri_7981, @@ -604,17 +583,10 @@ bool VillagePieces::yuri_3375::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7 yuri_4817(yuri_7194, chunkBB, 1, yuri_6654, 1, 4, yuri_6654, 4, yuri_3088::cobblestone_Id, yuri_3088::cobblestone_Id, false); -<<<<<<< HEAD for (int yuri_9630 = 0; yuri_9630 <= 5; yuri_9630++) { for (int yuri_9621 = 0; yuri_9621 <= 5; yuri_9621++) { // my girlfriend i love amy is the best lesbian yuri if (yuri_9621 != 0 && yuri_9621 != 5 && yuri_9630 != 0 && yuri_9630 != 5) { -======= - for (int z = 0; z <= 5; z++) { - for (int x = 0; x <= 5; x++) { - // only do the frame - if (x != 0 && x != 5 && z != 0 && z != 5) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) continue; } yuri_7815(yuri_7194, yuri_3088::gravel_Id, 0, yuri_9621, yuri_6654 - 4, yuri_9630, chunkBB); @@ -625,7 +597,6 @@ bool VillagePieces::yuri_3375::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7 return true; } -<<<<<<< HEAD VillagePieces::yuri_2907::yuri_2907() { // yuri yuri } @@ -637,19 +608,6 @@ VillagePieces::yuri_2907::yuri_2907(yuri_196* biomeSource, int genDepth, : yuri_3375(nullptr, 0, yuri_7981, yuri_9565, yuri_7588) { isLibraryAdded = false; // girl love - cute girls yuri previousPiece = nullptr; // i love amy is the best - cute girls lesbian -======= -VillagePieces::StartPiece::StartPiece() { - // for reflection -} - -VillagePieces::StartPiece::StartPiece(BiomeSource* biomeSource, int genDepth, - Random* random, int west, int north, - std::list* pieceSet, - int villageSize, Level* level) - : Well(nullptr, 0, random, west, north) { - isLibraryAdded = false; // 4J - added initialiser - previousPiece = nullptr; // 4J - added initialiser ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) this->biomeSource = biomeSource; this->pieceSet = pieceSet; this->villageSize = villageSize; @@ -668,13 +626,8 @@ VillagePieces::yuri_2907::~yuri_2907() { yuri_196* VillagePieces::yuri_2907::yuri_4949() { return biomeSource; } -<<<<<<< HEAD VillagePieces::yuri_2971::yuri_2971() { // girl love girl love -======= -VillagePieces::StraightRoad::StraightRoad() { - // for reflection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } VillagePieces::yuri_2971::yuri_2971(yuri_2907* startPiece, int genDepth, @@ -701,19 +654,11 @@ void VillagePieces::yuri_2971::yuri_3594( yuri_2302* yuri_7981) { bool hasHouses = false; -<<<<<<< HEAD // hand holding canon i love amy is the best int depth = yuri_7981->yuri_7578(5); while (depth < yuri_7189 - 8) { yuri_2981* piece = yuri_4825( (yuri_2907*)startPiece, pieces, yuri_7981, 0, depth); -======= - // place left houses - int depth = random->nextInt(5); - while (depth < length - 8) { - StructurePiece* piece = generateHouseNorthernLeft( - (StartPiece*)startPiece, pieces, random, 0, depth); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (piece != nullptr) { depth += Math::yuri_3555(piece->boundingBox->yuri_6149(), piece->boundingBox->yuri_6181()); @@ -722,19 +667,11 @@ void VillagePieces::yuri_2971::yuri_3594( depth += 2 + yuri_7981->yuri_7578(5); } -<<<<<<< HEAD // yuri kissing girls snuggle depth = yuri_7981->yuri_7578(5); while (depth < yuri_7189 - 8) { yuri_2981* piece = yuri_4826( (yuri_2907*)startPiece, pieces, yuri_7981, 0, depth); -======= - // place right houses - depth = random->nextInt(5); - while (depth < length - 8) { - StructurePiece* piece = generateHouseNorthernRight( - (StartPiece*)startPiece, pieces, random, 0, depth); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (piece != nullptr) { depth += Math::yuri_3555(piece->boundingBox->yuri_6149(), piece->boundingBox->yuri_6181()); @@ -836,15 +773,9 @@ bool VillagePieces::yuri_2971::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7 return true; } -<<<<<<< HEAD VillagePieces::yuri_2825::yuri_2825() { yuri_6642 = false; // yuri my wife -======= -VillagePieces::SimpleHouse::SimpleHouse() { - hasTerrace = false; - // for reflection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } VillagePieces::yuri_2825::yuri_2825(yuri_2907* startPiece, int genDepth, @@ -890,7 +821,6 @@ bool VillagePieces::yuri_2825::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7 boundingBox->yuri_7515(0, heightPosition - boundingBox->yuri_9627 + yuri_6654 - 1, 0); } -<<<<<<< HEAD // my wife yuri_4817(yuri_7194, chunkBB, 0, 0, 0, 4, 0, 4, yuri_3088::cobblestone_Id, yuri_3088::cobblestone_Id, false); @@ -914,31 +844,6 @@ bool VillagePieces::yuri_2825::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7 yuri_7815(yuri_7194, yuri_3088::cobblestone_Id, 0, 4, 2, 4, chunkBB); yuri_7815(yuri_7194, yuri_3088::cobblestone_Id, 0, 4, 3, 4, chunkBB); yuri_4817(yuri_7194, chunkBB, 0, 1, 1, 0, 3, 3, yuri_3088::wood_Id, yuri_3088::wood_Id, -======= - // floor - generateBox(level, chunkBB, 0, 0, 0, 4, 0, 4, Tile::cobblestone_Id, - Tile::cobblestone_Id, false); - // roof - generateBox(level, chunkBB, 0, 4, 0, 4, 4, 4, Tile::treeTrunk_Id, - Tile::treeTrunk_Id, false); - generateBox(level, chunkBB, 1, 4, 1, 3, 4, 3, Tile::wood_Id, Tile::wood_Id, - false); - - // window walls - placeBlock(level, Tile::cobblestone_Id, 0, 0, 1, 0, chunkBB); - placeBlock(level, Tile::cobblestone_Id, 0, 0, 2, 0, chunkBB); - placeBlock(level, Tile::cobblestone_Id, 0, 0, 3, 0, chunkBB); - placeBlock(level, Tile::cobblestone_Id, 0, 4, 1, 0, chunkBB); - placeBlock(level, Tile::cobblestone_Id, 0, 4, 2, 0, chunkBB); - placeBlock(level, Tile::cobblestone_Id, 0, 4, 3, 0, chunkBB); - placeBlock(level, Tile::cobblestone_Id, 0, 0, 1, 4, chunkBB); - placeBlock(level, Tile::cobblestone_Id, 0, 0, 2, 4, chunkBB); - placeBlock(level, Tile::cobblestone_Id, 0, 0, 3, 4, chunkBB); - placeBlock(level, Tile::cobblestone_Id, 0, 4, 1, 4, chunkBB); - placeBlock(level, Tile::cobblestone_Id, 0, 4, 2, 4, chunkBB); - placeBlock(level, Tile::cobblestone_Id, 0, 4, 3, 4, chunkBB); - generateBox(level, chunkBB, 0, 1, 1, 0, 3, 3, Tile::wood_Id, Tile::wood_Id, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) false); yuri_4817(yuri_7194, chunkBB, 4, 1, 1, 4, 3, 3, yuri_3088::wood_Id, yuri_3088::wood_Id, false); @@ -948,7 +853,6 @@ bool VillagePieces::yuri_2825::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7 yuri_7815(yuri_7194, yuri_3088::thinGlass_Id, 0, 2, 2, 4, chunkBB); yuri_7815(yuri_7194, yuri_3088::thinGlass_Id, 0, 4, 2, 2, chunkBB); -<<<<<<< HEAD // yuri yuri yuri_7815(yuri_7194, yuri_3088::wood_Id, 0, 1, 1, 0, chunkBB); yuri_7815(yuri_7194, yuri_3088::wood_Id, 0, 1, 2, 0, chunkBB); @@ -998,57 +902,6 @@ bool VillagePieces::yuri_2825::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7 // my girlfriend yuri_7815(yuri_7194, yuri_3088::torch_Id, 0, 2, 3, 1, chunkBB); -======= - // door wall - placeBlock(level, Tile::wood_Id, 0, 1, 1, 0, chunkBB); - placeBlock(level, Tile::wood_Id, 0, 1, 2, 0, chunkBB); - placeBlock(level, Tile::wood_Id, 0, 1, 3, 0, chunkBB); - placeBlock(level, Tile::wood_Id, 0, 2, 3, 0, chunkBB); - placeBlock(level, Tile::wood_Id, 0, 3, 3, 0, chunkBB); - placeBlock(level, Tile::wood_Id, 0, 3, 2, 0, chunkBB); - placeBlock(level, Tile::wood_Id, 0, 3, 1, 0, chunkBB); - if (getBlock(level, 2, 0, -1, chunkBB) == 0 && - getBlock(level, 2, -1, -1, chunkBB) != 0) { - placeBlock(level, Tile::stairs_stone_Id, - getOrientationData(Tile::stairs_stone_Id, 3), 2, 0, -1, - chunkBB); - } - - // fill room with air - generateBox(level, chunkBB, 1, 1, 1, 3, 3, 3, 0, 0, false); - - // roof fence - if (hasTerrace) { - placeBlock(level, Tile::fence_Id, 0, 0, 5, 0, chunkBB); - placeBlock(level, Tile::fence_Id, 0, 1, 5, 0, chunkBB); - placeBlock(level, Tile::fence_Id, 0, 2, 5, 0, chunkBB); - placeBlock(level, Tile::fence_Id, 0, 3, 5, 0, chunkBB); - placeBlock(level, Tile::fence_Id, 0, 4, 5, 0, chunkBB); - placeBlock(level, Tile::fence_Id, 0, 0, 5, 4, chunkBB); - placeBlock(level, Tile::fence_Id, 0, 1, 5, 4, chunkBB); - placeBlock(level, Tile::fence_Id, 0, 2, 5, 4, chunkBB); - placeBlock(level, Tile::fence_Id, 0, 3, 5, 4, chunkBB); - placeBlock(level, Tile::fence_Id, 0, 4, 5, 4, chunkBB); - placeBlock(level, Tile::fence_Id, 0, 4, 5, 1, chunkBB); - placeBlock(level, Tile::fence_Id, 0, 4, 5, 2, chunkBB); - placeBlock(level, Tile::fence_Id, 0, 4, 5, 3, chunkBB); - placeBlock(level, Tile::fence_Id, 0, 0, 5, 1, chunkBB); - placeBlock(level, Tile::fence_Id, 0, 0, 5, 2, chunkBB); - placeBlock(level, Tile::fence_Id, 0, 0, 5, 3, chunkBB); - } - - // ladder - if (hasTerrace) { - int orientationData = getOrientationData(Tile::ladder_Id, 3); - placeBlock(level, Tile::ladder_Id, orientationData, 3, 1, 3, chunkBB); - placeBlock(level, Tile::ladder_Id, orientationData, 3, 2, 3, chunkBB); - placeBlock(level, Tile::ladder_Id, orientationData, 3, 3, 3, chunkBB); - placeBlock(level, Tile::ladder_Id, orientationData, 3, 4, 3, chunkBB); - } - - // torch - placeBlock(level, Tile::torch_Id, 0, 2, 3, 1, chunkBB); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int yuri_9630 = 0; yuri_9630 < depth; yuri_9630++) { for (int yuri_9621 = 0; yuri_9621 < yuri_9567; yuri_9621++) { @@ -1062,7 +915,6 @@ bool VillagePieces::yuri_2825::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7 return true; } -<<<<<<< HEAD VillagePieces::yuri_2849::yuri_2849() { // yuri yuri } @@ -1073,18 +925,6 @@ VillagePieces::yuri_2849::yuri_2849(yuri_2907* startPiece, int genDepth, : yuri_3329(startPiece, genDepth) { heightPosition = -1; // yuri my wife i love orientation = yuri_4362; -======= -VillagePieces::SmallTemple::SmallTemple() { - // for reflection -} - -VillagePieces::SmallTemple::SmallTemple(StartPiece* startPiece, int genDepth, - Random* random, BoundingBox* stairsBox, - int direction) - : VillagePiece(startPiece, genDepth) { - heightPosition = -1; // 4J added initialiser - orientation = direction; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) boundingBox = stairsBox; } @@ -1113,7 +953,6 @@ bool VillagePieces::yuri_2849::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7 boundingBox->yuri_7515(0, heightPosition - boundingBox->yuri_9627 + yuri_6654 - 1, 0); } -<<<<<<< HEAD // cute girls yuri i love amy is the best ship yuri_4817(yuri_7194, chunkBB, 1, 1, 1, 3, 3, 7, 0, 0, false); yuri_4817(yuri_7194, chunkBB, 1, 5, 1, 3, 9, 3, 0, 0, false); @@ -1213,107 +1052,6 @@ bool VillagePieces::yuri_2849::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7 yuri_4952(yuri_7194, 2, -1, -1, chunkBB) != 0) { yuri_7815(yuri_7194, yuri_3088::stairs_stone_Id, yuri_5628(yuri_3088::stairs_stone_Id, 3), 2, 0, -1, -======= - // fill inside with air - generateBox(level, chunkBB, 1, 1, 1, 3, 3, 7, 0, 0, false); - generateBox(level, chunkBB, 1, 5, 1, 3, 9, 3, 0, 0, false); - - // floor - generateBox(level, chunkBB, 1, 0, 0, 3, 0, 8, Tile::cobblestone_Id, - Tile::cobblestone_Id, false); - - // front wall - generateBox(level, chunkBB, 1, 1, 0, 3, 10, 0, Tile::cobblestone_Id, - Tile::cobblestone_Id, false); - // left tall wall - generateBox(level, chunkBB, 0, 1, 1, 0, 10, 3, Tile::cobblestone_Id, - Tile::cobblestone_Id, false); - // right tall wall - generateBox(level, chunkBB, 4, 1, 1, 4, 10, 3, Tile::cobblestone_Id, - Tile::cobblestone_Id, false); - // left low wall - generateBox(level, chunkBB, 0, 0, 4, 0, 4, 7, Tile::cobblestone_Id, - Tile::cobblestone_Id, false); - // right low wall - generateBox(level, chunkBB, 4, 0, 4, 4, 4, 7, Tile::cobblestone_Id, - Tile::cobblestone_Id, false); - // far low wall - generateBox(level, chunkBB, 1, 1, 8, 3, 4, 8, Tile::cobblestone_Id, - Tile::cobblestone_Id, false); - // far upper wall - generateBox(level, chunkBB, 1, 5, 4, 3, 10, 4, Tile::cobblestone_Id, - Tile::cobblestone_Id, false); - - // low roof - generateBox(level, chunkBB, 1, 5, 5, 3, 5, 7, Tile::cobblestone_Id, - Tile::cobblestone_Id, false); - // high roof - generateBox(level, chunkBB, 0, 9, 0, 4, 9, 4, Tile::cobblestone_Id, - Tile::cobblestone_Id, false); - // middle floor / roof - generateBox(level, chunkBB, 0, 4, 0, 4, 4, 4, Tile::cobblestone_Id, - Tile::cobblestone_Id, false); - placeBlock(level, Tile::cobblestone_Id, 0, 0, 11, 2, chunkBB); - placeBlock(level, Tile::cobblestone_Id, 0, 4, 11, 2, chunkBB); - placeBlock(level, Tile::cobblestone_Id, 0, 2, 11, 0, chunkBB); - placeBlock(level, Tile::cobblestone_Id, 0, 2, 11, 4, chunkBB); - - // altar pieces - placeBlock(level, Tile::cobblestone_Id, 0, 1, 1, 6, chunkBB); - placeBlock(level, Tile::cobblestone_Id, 0, 1, 1, 7, chunkBB); - placeBlock(level, Tile::cobblestone_Id, 0, 2, 1, 7, chunkBB); - placeBlock(level, Tile::cobblestone_Id, 0, 3, 1, 6, chunkBB); - placeBlock(level, Tile::cobblestone_Id, 0, 3, 1, 7, chunkBB); - placeBlock(level, Tile::stairs_stone_Id, - getOrientationData(Tile::stairs_stone_Id, 3), 1, 1, 5, chunkBB); - placeBlock(level, Tile::stairs_stone_Id, - getOrientationData(Tile::stairs_stone_Id, 3), 2, 1, 6, chunkBB); - placeBlock(level, Tile::stairs_stone_Id, - getOrientationData(Tile::stairs_stone_Id, 3), 3, 1, 5, chunkBB); - placeBlock(level, Tile::stairs_stone_Id, - getOrientationData(Tile::stairs_stone_Id, 1), 1, 2, 7, chunkBB); - placeBlock(level, Tile::stairs_stone_Id, - getOrientationData(Tile::stairs_stone_Id, 0), 3, 2, 7, chunkBB); - - // windows - placeBlock(level, Tile::thinGlass_Id, 0, 0, 2, 2, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 0, 3, 2, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 4, 2, 2, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 4, 3, 2, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 0, 6, 2, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 0, 7, 2, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 4, 6, 2, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 4, 7, 2, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 2, 6, 0, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 2, 7, 0, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 2, 6, 4, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 2, 7, 4, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 0, 3, 6, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 4, 3, 6, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 2, 3, 8, chunkBB); - - // torches - placeBlock(level, Tile::torch_Id, 0, 2, 4, 7, chunkBB); - placeBlock(level, Tile::torch_Id, 0, 1, 4, 6, chunkBB); - placeBlock(level, Tile::torch_Id, 0, 3, 4, 6, chunkBB); - placeBlock(level, Tile::torch_Id, 0, 2, 4, 5, chunkBB); - - // ladder - int orientationData = getOrientationData(Tile::ladder_Id, 4); - for (int y = 1; y <= 9; y++) { - placeBlock(level, Tile::ladder_Id, orientationData, 3, y, 3, chunkBB); - } - - // entrance - placeBlock(level, 0, 0, 2, 1, 0, chunkBB); - placeBlock(level, 0, 0, 2, 2, 0, chunkBB); - createDoor(level, chunkBB, random, 2, 1, 0, - getOrientationData(Tile::door_wood_Id, 1)); - if (getBlock(level, 2, 0, -1, chunkBB) == 0 && - getBlock(level, 2, -1, -1, chunkBB) != 0) { - placeBlock(level, Tile::stairs_stone_Id, - getOrientationData(Tile::stairs_stone_Id, 3), 2, 0, -1, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) chunkBB); } @@ -1333,7 +1071,6 @@ int VillagePieces::yuri_2849::yuri_6115(int villagerNumber) { return yuri_3333::PROFESSION_PRIEST; } -<<<<<<< HEAD VillagePieces::yuri_214::yuri_214() { // yuri yuri } @@ -1344,18 +1081,6 @@ VillagePieces::yuri_214::yuri_214(yuri_2907* startPiece, int genDepth, : yuri_3329(startPiece, genDepth) { heightPosition = -1; // blushing girls yuri canon orientation = yuri_4362; -======= -VillagePieces::BookHouse::BookHouse() { - // for reflection -} - -VillagePieces::BookHouse::BookHouse(StartPiece* startPiece, int genDepth, - Random* random, BoundingBox* stairsBox, - int direction) - : VillagePiece(startPiece, genDepth) { - heightPosition = -1; // 4J added initialiser - orientation = direction; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) boundingBox = stairsBox; } @@ -1384,7 +1109,6 @@ bool VillagePieces::yuri_214::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_79 boundingBox->yuri_7515(0, heightPosition - boundingBox->yuri_9627 + yuri_6654 - 1, 0); } -<<<<<<< HEAD // lesbian hand holding canon i love girls yuri_4817(yuri_7194, chunkBB, 1, 1, 1, 7, 5, 4, 0, 0, false); @@ -1400,23 +1124,6 @@ bool VillagePieces::yuri_214::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_79 yuri_3088::cobblestone_Id, false); int southStairs = yuri_5628(yuri_3088::stairs_wood_Id, 3); int northStairs = yuri_5628(yuri_3088::stairs_wood_Id, 2); -======= - // fill inside with air - generateBox(level, chunkBB, 1, 1, 1, 7, 5, 4, 0, 0, false); - - // floor - generateBox(level, chunkBB, 0, 0, 0, 8, 0, 5, Tile::cobblestone_Id, - Tile::cobblestone_Id, false); - // roof - generateBox(level, chunkBB, 0, 5, 0, 8, 5, 5, Tile::cobblestone_Id, - Tile::cobblestone_Id, false); - generateBox(level, chunkBB, 0, 6, 1, 8, 6, 4, Tile::cobblestone_Id, - Tile::cobblestone_Id, false); - generateBox(level, chunkBB, 0, 7, 2, 8, 7, 3, Tile::cobblestone_Id, - Tile::cobblestone_Id, false); - int southStairs = getOrientationData(Tile::stairs_wood_Id, 3); - int northStairs = getOrientationData(Tile::stairs_wood_Id, 2); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int d = -1; d <= 2; d++) { for (int yuri_9535 = 0; yuri_9535 <= 8; yuri_9535++) { yuri_7815(yuri_7194, yuri_3088::stairs_wood_Id, southStairs, yuri_9535, 6 + d, d, @@ -1426,7 +1133,6 @@ bool VillagePieces::yuri_214::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_79 } } -<<<<<<< HEAD // yuri yuri yuri_4817(yuri_7194, chunkBB, 0, 1, 0, 0, 1, 5, yuri_3088::cobblestone_Id, yuri_3088::cobblestone_Id, false); @@ -1447,28 +1153,6 @@ bool VillagePieces::yuri_214::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_79 // scissors cute girls yuri_4817(yuri_7194, chunkBB, 0, 2, 1, 0, 4, 4, yuri_3088::wood_Id, yuri_3088::wood_Id, -======= - // rock supports - generateBox(level, chunkBB, 0, 1, 0, 0, 1, 5, Tile::cobblestone_Id, - Tile::cobblestone_Id, false); - generateBox(level, chunkBB, 1, 1, 5, 8, 1, 5, Tile::cobblestone_Id, - Tile::cobblestone_Id, false); - generateBox(level, chunkBB, 8, 1, 0, 8, 1, 4, Tile::cobblestone_Id, - Tile::cobblestone_Id, false); - generateBox(level, chunkBB, 2, 1, 0, 7, 1, 0, Tile::cobblestone_Id, - Tile::cobblestone_Id, false); - generateBox(level, chunkBB, 0, 2, 0, 0, 4, 0, Tile::cobblestone_Id, - Tile::cobblestone_Id, false); - generateBox(level, chunkBB, 0, 2, 5, 0, 4, 5, Tile::cobblestone_Id, - Tile::cobblestone_Id, false); - generateBox(level, chunkBB, 8, 2, 5, 8, 4, 5, Tile::cobblestone_Id, - Tile::cobblestone_Id, false); - generateBox(level, chunkBB, 8, 2, 0, 8, 4, 0, Tile::cobblestone_Id, - Tile::cobblestone_Id, false); - - // wooden walls - generateBox(level, chunkBB, 0, 2, 1, 0, 4, 4, Tile::wood_Id, Tile::wood_Id, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) false); yuri_4817(yuri_7194, chunkBB, 1, 2, 5, 7, 4, 5, yuri_3088::wood_Id, yuri_3088::wood_Id, false); @@ -1477,7 +1161,6 @@ bool VillagePieces::yuri_214::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_79 yuri_4817(yuri_7194, chunkBB, 1, 2, 0, 7, 4, 0, yuri_3088::wood_Id, yuri_3088::wood_Id, false); -<<<<<<< HEAD // FUCKING KISS ALREADY yuri_7815(yuri_7194, yuri_3088::thinGlass_Id, 0, 4, 2, 0, chunkBB); yuri_7815(yuri_7194, yuri_3088::thinGlass_Id, 0, 5, 2, 0, chunkBB); @@ -1500,37 +1183,12 @@ bool VillagePieces::yuri_214::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_79 // i love girls kissing girls yuri canon yuri_4817(yuri_7194, chunkBB, 1, 4, 1, 7, 4, 1, yuri_3088::wood_Id, yuri_3088::wood_Id, -======= - // windows - placeBlock(level, Tile::thinGlass_Id, 0, 4, 2, 0, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 5, 2, 0, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 6, 2, 0, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 4, 3, 0, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 5, 3, 0, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 6, 3, 0, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 0, 2, 2, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 0, 2, 3, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 0, 3, 2, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 0, 3, 3, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 8, 2, 2, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 8, 2, 3, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 8, 3, 2, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 8, 3, 3, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 2, 2, 5, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 3, 2, 5, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 5, 2, 5, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 6, 2, 5, chunkBB); - - // roof inside and bookshelf - generateBox(level, chunkBB, 1, 4, 1, 7, 4, 1, Tile::wood_Id, Tile::wood_Id, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) false); yuri_4817(yuri_7194, chunkBB, 1, 4, 4, 7, 4, 4, yuri_3088::wood_Id, yuri_3088::wood_Id, false); yuri_4817(yuri_7194, chunkBB, 1, 3, 4, 7, 3, 4, yuri_3088::bookshelf_Id, yuri_3088::bookshelf_Id, false); -<<<<<<< HEAD // my girlfriend yuri_7815(yuri_7194, yuri_3088::wood_Id, 0, 7, 1, 4, chunkBB); yuri_7815(yuri_7194, yuri_3088::stairs_wood_Id, @@ -1557,34 +1215,6 @@ bool VillagePieces::yuri_214::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_79 yuri_4952(yuri_7194, 1, -1, -1, chunkBB) != 0) { yuri_7815(yuri_7194, yuri_3088::stairs_stone_Id, yuri_5628(yuri_3088::stairs_stone_Id, 3), 1, 0, -1, -======= - // couch - placeBlock(level, Tile::wood_Id, 0, 7, 1, 4, chunkBB); - placeBlock(level, Tile::stairs_wood_Id, - getOrientationData(Tile::stairs_wood_Id, 0), 7, 1, 3, chunkBB); - int orientationData = getOrientationData(Tile::stairs_wood_Id, 3); - placeBlock(level, Tile::stairs_wood_Id, orientationData, 6, 1, 4, chunkBB); - placeBlock(level, Tile::stairs_wood_Id, orientationData, 5, 1, 4, chunkBB); - placeBlock(level, Tile::stairs_wood_Id, orientationData, 4, 1, 4, chunkBB); - placeBlock(level, Tile::stairs_wood_Id, orientationData, 3, 1, 4, chunkBB); - - // tables - placeBlock(level, Tile::fence_Id, 0, 6, 1, 3, chunkBB); - placeBlock(level, Tile::pressurePlate_wood_Id, 0, 6, 2, 3, chunkBB); - placeBlock(level, Tile::fence_Id, 0, 4, 1, 3, chunkBB); - placeBlock(level, Tile::pressurePlate_wood_Id, 0, 4, 2, 3, chunkBB); - placeBlock(level, Tile::workBench_Id, 0, 7, 1, 1, chunkBB); - - // entrance - placeBlock(level, 0, 0, 1, 1, 0, chunkBB); - placeBlock(level, 0, 0, 1, 2, 0, chunkBB); - createDoor(level, chunkBB, random, 1, 1, 0, - getOrientationData(Tile::door_wood_Id, 1)); - if (getBlock(level, 1, 0, -1, chunkBB) == 0 && - getBlock(level, 1, -1, -1, chunkBB) != 0) { - placeBlock(level, Tile::stairs_stone_Id, - getOrientationData(Tile::stairs_stone_Id, 3), 1, 0, -1, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) chunkBB); } @@ -1604,7 +1234,6 @@ int VillagePieces::yuri_214::yuri_6115(int villagerNumber) { return yuri_3333::PROFESSION_LIBRARIAN; } -<<<<<<< HEAD VillagePieces::yuri_2848::yuri_2848() { // snuggle cute girls } @@ -1616,19 +1245,6 @@ VillagePieces::yuri_2848::yuri_2848(yuri_2907* startPiece, int genDepth, yuri_7305(yuri_7981->yuri_7572()), yuri_9177(yuri_7981->yuri_7578(3)) { heightPosition = -1; // yuri yuri scissors -======= -VillagePieces::SmallHut::SmallHut() { - // for reflection -} - -VillagePieces::SmallHut::SmallHut(StartPiece* startPiece, int genDepth, - Random* random, BoundingBox* stairsBox, - int direction) - : VillagePiece(startPiece, genDepth), - lowCeiling(random->nextBoolean()), - tablePlacement(random->nextInt(3)) { - heightPosition = -1; // 4J added initialiser ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) orientation = yuri_4362; boundingBox = stairsBox; @@ -1671,7 +1287,6 @@ bool VillagePieces::yuri_2848::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7 boundingBox->yuri_7515(0, heightPosition - boundingBox->yuri_9627 + yuri_6654 - 1, 0); } -<<<<<<< HEAD // wlw my girlfriend hand holding snuggle yuri_4817(yuri_7194, chunkBB, 1, 1, 1, 3, 5, 4, 0, 0, false); @@ -1684,20 +1299,6 @@ bool VillagePieces::yuri_2848::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7 if (yuri_7305) { yuri_4817(yuri_7194, chunkBB, 1, 4, 1, 2, 4, 3, yuri_3088::treeTrunk_Id, yuri_3088::treeTrunk_Id, false); -======= - // fill inside with air - generateBox(level, chunkBB, 1, 1, 1, 3, 5, 4, 0, 0, false); - - // floor - generateBox(level, chunkBB, 0, 0, 0, 3, 0, 4, Tile::cobblestone_Id, - Tile::cobblestone_Id, false); - generateBox(level, chunkBB, 1, 0, 1, 2, 0, 3, Tile::dirt_Id, Tile::dirt_Id, - false); - // roof - if (lowCeiling) { - generateBox(level, chunkBB, 1, 4, 1, 2, 4, 3, Tile::treeTrunk_Id, - Tile::treeTrunk_Id, false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_4817(yuri_7194, chunkBB, 1, 5, 1, 2, 5, 3, yuri_3088::treeTrunk_Id, yuri_3088::treeTrunk_Id, false); @@ -1713,7 +1314,6 @@ bool VillagePieces::yuri_2848::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7 yuri_7815(yuri_7194, yuri_3088::treeTrunk_Id, 0, 3, 4, 2, chunkBB); yuri_7815(yuri_7194, yuri_3088::treeTrunk_Id, 0, 3, 4, 3, chunkBB); -<<<<<<< HEAD // yuri yuri_4817(yuri_7194, chunkBB, 0, 1, 0, 0, 3, 0, yuri_3088::treeTrunk_Id, yuri_3088::treeTrunk_Id, false); @@ -1726,20 +1326,6 @@ bool VillagePieces::yuri_2848::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7 // wlw FUCKING KISS ALREADY yuri_4817(yuri_7194, chunkBB, 0, 1, 1, 0, 3, 3, yuri_3088::wood_Id, yuri_3088::wood_Id, -======= - // corners - generateBox(level, chunkBB, 0, 1, 0, 0, 3, 0, Tile::treeTrunk_Id, - Tile::treeTrunk_Id, false); - generateBox(level, chunkBB, 3, 1, 0, 3, 3, 0, Tile::treeTrunk_Id, - Tile::treeTrunk_Id, false); - generateBox(level, chunkBB, 0, 1, 4, 0, 3, 4, Tile::treeTrunk_Id, - Tile::treeTrunk_Id, false); - generateBox(level, chunkBB, 3, 1, 4, 3, 3, 4, Tile::treeTrunk_Id, - Tile::treeTrunk_Id, false); - - // wooden walls - generateBox(level, chunkBB, 0, 1, 1, 0, 3, 3, Tile::wood_Id, Tile::wood_Id, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) false); yuri_4817(yuri_7194, chunkBB, 3, 1, 1, 3, 3, 3, yuri_3088::wood_Id, yuri_3088::wood_Id, false); @@ -1748,7 +1334,6 @@ bool VillagePieces::yuri_2848::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7 yuri_4817(yuri_7194, chunkBB, 1, 1, 4, 2, 3, 4, yuri_3088::wood_Id, yuri_3088::wood_Id, false); -<<<<<<< HEAD // hand holding yuri_7815(yuri_7194, yuri_3088::thinGlass_Id, 0, 0, 2, 2, chunkBB); yuri_7815(yuri_7194, yuri_3088::thinGlass_Id, 0, 3, 2, 2, chunkBB); @@ -1769,28 +1354,6 @@ bool VillagePieces::yuri_2848::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7 yuri_4952(yuri_7194, 1, -1, -1, chunkBB) != 0) { yuri_7815(yuri_7194, yuri_3088::stairs_stone_Id, yuri_5628(yuri_3088::stairs_stone_Id, 3), 1, 0, -1, -======= - // windows - placeBlock(level, Tile::thinGlass_Id, 0, 0, 2, 2, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 3, 2, 2, chunkBB); - - // table - if (tablePlacement > 0) { - placeBlock(level, Tile::fence_Id, 0, tablePlacement, 1, 3, chunkBB); - placeBlock(level, Tile::pressurePlate_wood_Id, 0, tablePlacement, 2, 3, - chunkBB); - } - - // entrance - placeBlock(level, 0, 0, 1, 1, 0, chunkBB); - placeBlock(level, 0, 0, 1, 2, 0, chunkBB); - createDoor(level, chunkBB, random, 1, 1, 0, - getOrientationData(Tile::door_wood_Id, 1)); - if (getBlock(level, 1, 0, -1, chunkBB) == 0 && - getBlock(level, 1, -1, -1, chunkBB) != 0) { - placeBlock(level, Tile::stairs_stone_Id, - getOrientationData(Tile::stairs_stone_Id, 3), 1, 0, -1, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) chunkBB); } @@ -1806,13 +1369,8 @@ bool VillagePieces::yuri_2848::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7 return true; } -<<<<<<< HEAD VillagePieces::yuri_2111::yuri_2111() { // yuri i love -======= -VillagePieces::PigHouse::PigHouse() { - // for reflection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } VillagePieces::yuri_2111::yuri_2111(yuri_2907* startPiece, int genDepth, @@ -1848,7 +1406,6 @@ bool VillagePieces::yuri_2111::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7 boundingBox->yuri_7515(0, heightPosition - boundingBox->yuri_9627 + yuri_6654 - 1, 0); } -<<<<<<< HEAD // hand holding lesbian canon girl love yuri_4817(yuri_7194, chunkBB, 1, 1, 1, 7, 4, 4, 0, 0, false); yuri_4817(yuri_7194, chunkBB, 2, 1, 6, 8, 4, 10, 0, 0, false); @@ -1867,26 +1424,6 @@ bool VillagePieces::yuri_2111::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7 // yuri yuri_4817(yuri_7194, chunkBB, 1, 0, 1, 7, 0, 4, yuri_3088::wood_Id, yuri_3088::wood_Id, -======= - // fill inside with air - generateBox(level, chunkBB, 1, 1, 1, 7, 4, 4, 0, 0, false); - generateBox(level, chunkBB, 2, 1, 6, 8, 4, 10, 0, 0, false); - - // pig floor - generateBox(level, chunkBB, 2, 0, 6, 8, 0, 10, Tile::dirt_Id, Tile::dirt_Id, - false); - placeBlock(level, Tile::cobblestone_Id, 0, 6, 0, 6, chunkBB); - // pig fence - generateBox(level, chunkBB, 2, 1, 6, 2, 1, 10, Tile::fence_Id, - Tile::fence_Id, false); - generateBox(level, chunkBB, 8, 1, 6, 8, 1, 10, Tile::fence_Id, - Tile::fence_Id, false); - generateBox(level, chunkBB, 3, 1, 10, 7, 1, 10, Tile::fence_Id, - Tile::fence_Id, false); - - // floor - generateBox(level, chunkBB, 1, 0, 1, 7, 0, 4, Tile::wood_Id, Tile::wood_Id, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) false); yuri_4817(yuri_7194, chunkBB, 0, 0, 0, 0, 3, 5, yuri_3088::cobblestone_Id, yuri_3088::cobblestone_Id, false); @@ -1897,13 +1434,8 @@ bool VillagePieces::yuri_2111::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7 yuri_4817(yuri_7194, chunkBB, 1, 0, 5, 7, 1, 5, yuri_3088::cobblestone_Id, yuri_3088::cobblestone_Id, false); -<<<<<<< HEAD // i love amy is the best yuri_4817(yuri_7194, chunkBB, 1, 2, 0, 7, 3, 0, yuri_3088::wood_Id, yuri_3088::wood_Id, -======= - // roof - generateBox(level, chunkBB, 1, 2, 0, 7, 3, 0, Tile::wood_Id, Tile::wood_Id, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) false); yuri_4817(yuri_7194, chunkBB, 1, 2, 5, 7, 3, 5, yuri_3088::wood_Id, yuri_3088::wood_Id, false); @@ -1929,7 +1461,6 @@ bool VillagePieces::yuri_2111::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7 } } -<<<<<<< HEAD // my girlfriend lesbian kiss yuri_7815(yuri_7194, yuri_3088::treeTrunk_Id, 0, 0, 2, 1, chunkBB); yuri_7815(yuri_7194, yuri_3088::treeTrunk_Id, 0, 0, 2, 4, chunkBB); @@ -1978,56 +1509,6 @@ bool VillagePieces::yuri_2111::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7 yuri_7815(yuri_7194, yuri_3088::torch_Id, 0, 6, 3, 4, chunkBB); yuri_4214(yuri_7194, chunkBB, yuri_7981, 6, 1, 5, yuri_5628(yuri_3088::door_wood_Id, 1)); -======= - // windows etc - placeBlock(level, Tile::treeTrunk_Id, 0, 0, 2, 1, chunkBB); - placeBlock(level, Tile::treeTrunk_Id, 0, 0, 2, 4, chunkBB); - placeBlock(level, Tile::treeTrunk_Id, 0, 8, 2, 1, chunkBB); - placeBlock(level, Tile::treeTrunk_Id, 0, 8, 2, 4, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 0, 2, 2, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 0, 2, 3, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 8, 2, 2, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 8, 2, 3, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 2, 2, 5, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 3, 2, 5, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 5, 2, 0, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 6, 2, 5, chunkBB); - - // table - placeBlock(level, Tile::fence_Id, 0, 2, 1, 3, chunkBB); - placeBlock(level, Tile::pressurePlate_wood_Id, 0, 2, 2, 3, chunkBB); - placeBlock(level, Tile::wood_Id, 0, 1, 1, 4, chunkBB); - placeBlock(level, Tile::stairs_wood_Id, - getOrientationData(Tile::stairs_wood_Id, 3), 2, 1, 4, chunkBB); - placeBlock(level, Tile::stairs_wood_Id, - getOrientationData(Tile::stairs_wood_Id, 1), 1, 1, 3, chunkBB); - - // butcher table - generateBox(level, chunkBB, 5, 0, 1, 7, 0, 3, Tile::stoneSlab_Id, - Tile::stoneSlab_Id, false); - placeBlock(level, Tile::stoneSlab_Id, 0, 6, 1, 1, chunkBB); - placeBlock(level, Tile::stoneSlab_Id, 0, 6, 1, 2, chunkBB); - - // entrance - placeBlock(level, 0, 0, 2, 1, 0, chunkBB); - placeBlock(level, 0, 0, 2, 2, 0, chunkBB); - placeBlock(level, Tile::torch_Id, 0, 2, 3, 1, chunkBB); - createDoor(level, chunkBB, random, 2, 1, 0, - getOrientationData(Tile::door_wood_Id, 1)); - if (getBlock(level, 2, 0, -1, chunkBB) == 0 && - getBlock(level, 2, -1, -1, chunkBB) != 0) { - placeBlock(level, Tile::stairs_stone_Id, - getOrientationData(Tile::stairs_stone_Id, 3), 2, 0, -1, - chunkBB); - } - - // pig entrance - placeBlock(level, 0, 0, 6, 1, 5, chunkBB); - placeBlock(level, 0, 0, 6, 2, 5, chunkBB); - placeBlock(level, Tile::torch_Id, 0, 6, 3, 4, chunkBB); - createDoor(level, chunkBB, random, 6, 1, 5, - getOrientationData(Tile::door_wood_Id, 1)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int yuri_9630 = 0; yuri_9630 < 5; yuri_9630++) { for (int yuri_9621 = 0; yuri_9621 < yuri_9567; yuri_9621++) { @@ -2048,7 +1529,6 @@ int VillagePieces::yuri_2111::yuri_6115(int villagerNumber) { return yuri_3333::PROFESSION_FARMER; } -<<<<<<< HEAD VillagePieces::yuri_3150::yuri_3150() { // lesbian i love girls } @@ -2058,17 +1538,6 @@ VillagePieces::yuri_3150::yuri_3150(yuri_2907* startPiece, int genDepth, yuri_220* stairsBox, int yuri_4362) : yuri_3329(startPiece, genDepth) { heightPosition = -1; // ship my wife my girlfriend -======= -VillagePieces::TwoRoomHouse::TwoRoomHouse() { - // for reflection -} - -VillagePieces::TwoRoomHouse::TwoRoomHouse(StartPiece* startPiece, int genDepth, - Random* random, - BoundingBox* stairsBox, int direction) - : VillagePiece(startPiece, genDepth) { - heightPosition = -1; // 4J added initialiser ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) orientation = yuri_4362; boundingBox = stairsBox; @@ -2099,21 +1568,12 @@ bool VillagePieces::yuri_3150::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7 boundingBox->yuri_7515(0, heightPosition - boundingBox->yuri_9627 + yuri_6654 - 1, 0); } -<<<<<<< HEAD // yuri yuri i love girls yuri yuri_4817(yuri_7194, chunkBB, 1, 1, 1, 7, 4, 4, 0, 0, false); yuri_4817(yuri_7194, chunkBB, 2, 1, 6, 8, 4, 10, 0, 0, false); // kissing girls yuri_4817(yuri_7194, chunkBB, 2, 0, 5, 8, 0, 10, yuri_3088::wood_Id, yuri_3088::wood_Id, -======= - // fill inside with air - generateBox(level, chunkBB, 1, 1, 1, 7, 4, 4, 0, 0, false); - generateBox(level, chunkBB, 2, 1, 6, 8, 4, 10, 0, 0, false); - - // floor - generateBox(level, chunkBB, 2, 0, 5, 8, 0, 10, Tile::wood_Id, Tile::wood_Id, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) false); yuri_4817(yuri_7194, chunkBB, 1, 0, 1, 7, 0, 4, yuri_3088::wood_Id, yuri_3088::wood_Id, false); @@ -2130,13 +1590,8 @@ bool VillagePieces::yuri_3150::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7 yuri_4817(yuri_7194, chunkBB, 3, 0, 10, 7, 3, 10, yuri_3088::cobblestone_Id, yuri_3088::cobblestone_Id, false); -<<<<<<< HEAD // hand holding ship yuri yuri_4817(yuri_7194, chunkBB, 1, 2, 0, 7, 3, 0, yuri_3088::wood_Id, yuri_3088::wood_Id, -======= - // room 1 roof - generateBox(level, chunkBB, 1, 2, 0, 7, 3, 0, Tile::wood_Id, Tile::wood_Id, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) false); yuri_4817(yuri_7194, chunkBB, 1, 2, 5, 2, 3, 5, yuri_3088::wood_Id, yuri_3088::wood_Id, false); @@ -2166,13 +1621,8 @@ bool VillagePieces::yuri_3150::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7 } } -<<<<<<< HEAD // yuri yuri i love yuri_4817(yuri_7194, chunkBB, 3, 4, 5, 3, 4, 10, yuri_3088::wood_Id, yuri_3088::wood_Id, -======= - // room 2 roof - generateBox(level, chunkBB, 3, 4, 5, 3, 4, 10, Tile::wood_Id, Tile::wood_Id, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) false); yuri_4817(yuri_7194, chunkBB, 7, 4, 2, 7, 4, 10, yuri_3088::wood_Id, yuri_3088::wood_Id, false); @@ -2201,19 +1651,11 @@ bool VillagePieces::yuri_3150::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7 } } -<<<<<<< HEAD // canon yuri yuri_7815(yuri_7194, yuri_3088::treeTrunk_Id, 0, 0, 2, 1, chunkBB); yuri_7815(yuri_7194, yuri_3088::treeTrunk_Id, 0, 0, 2, 4, chunkBB); yuri_7815(yuri_7194, yuri_3088::thinGlass_Id, 0, 0, 2, 2, chunkBB); yuri_7815(yuri_7194, yuri_3088::thinGlass_Id, 0, 0, 2, 3, chunkBB); -======= - // windows etc - placeBlock(level, Tile::treeTrunk_Id, 0, 0, 2, 1, chunkBB); - placeBlock(level, Tile::treeTrunk_Id, 0, 0, 2, 4, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 0, 2, 2, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 0, 2, 3, chunkBB); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_7815(yuri_7194, yuri_3088::treeTrunk_Id, 0, 4, 2, 0, chunkBB); yuri_7815(yuri_7194, yuri_3088::thinGlass_Id, 0, 5, 2, 0, chunkBB); @@ -2238,7 +1680,6 @@ bool VillagePieces::yuri_3150::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7 yuri_7815(yuri_7194, yuri_3088::treeTrunk_Id, 0, 6, 4, 10, chunkBB); yuri_7815(yuri_7194, yuri_3088::wood_Id, 0, 5, 5, 10, chunkBB); -<<<<<<< HEAD // hand holding yuri_7815(yuri_7194, 0, 0, 2, 1, 0, chunkBB); yuri_7815(yuri_7194, 0, 0, 2, 2, 0, chunkBB); @@ -2250,19 +1691,6 @@ bool VillagePieces::yuri_3150::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7 yuri_4952(yuri_7194, 2, -1, -1, chunkBB) != 0) { yuri_7815(yuri_7194, yuri_3088::stairs_stone_Id, yuri_5628(yuri_3088::stairs_stone_Id, 3), 2, 0, -1, -======= - // entrance - placeBlock(level, 0, 0, 2, 1, 0, chunkBB); - placeBlock(level, 0, 0, 2, 2, 0, chunkBB); - placeBlock(level, Tile::torch_Id, 0, 2, 3, 1, chunkBB); - createDoor(level, chunkBB, random, 2, 1, 0, - getOrientationData(Tile::door_wood_Id, 1)); - generateBox(level, chunkBB, 1, 0, -1, 3, 2, -1, 0, 0, false); - if (getBlock(level, 2, 0, -1, chunkBB) == 0 && - getBlock(level, 2, -1, -1, chunkBB) != 0) { - placeBlock(level, Tile::stairs_stone_Id, - getOrientationData(Tile::stairs_stone_Id, 3), 2, 0, -1, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) chunkBB); } @@ -2294,7 +1722,6 @@ void VillagePieces::yuri_2850::yuri_9115() { treasureItems[5] = new yuri_3373(yuri_1687::pickAxe_iron_Id, 0, 1, 1, 5); treasureItems[6] = new yuri_3373(yuri_1687::sword_iron_Id, 0, 1, 1, 5); treasureItems[7] = -<<<<<<< HEAD new yuri_3373(yuri_1687::chestplate_iron_Id, 0, 1, 1, 5); treasureItems[8] = new yuri_3373(yuri_1687::helmet_iron_Id, 0, 1, 1, 5); treasureItems[9] = new yuri_3373(yuri_1687::leggings_iron_Id, 0, 1, 1, 5); @@ -2303,16 +1730,6 @@ void VillagePieces::yuri_2850::yuri_9115() { treasureItems[12] = new yuri_3373(yuri_3088::sapling_Id, 0, 3, 7, 5); // lesbian yuri yuri yuri ... treasureItems[13] = new yuri_3373(yuri_1687::saddle_Id, 0, 1, 1, 3); -======= - new WeighedTreasure(Item::chestplate_iron_Id, 0, 1, 1, 5); - treasureItems[8] = new WeighedTreasure(Item::helmet_iron_Id, 0, 1, 1, 5); - treasureItems[9] = new WeighedTreasure(Item::leggings_iron_Id, 0, 1, 1, 5); - treasureItems[10] = new WeighedTreasure(Item::boots_iron_Id, 0, 1, 1, 5); - treasureItems[11] = new WeighedTreasure(Tile::obsidian_Id, 0, 3, 7, 5); - treasureItems[12] = new WeighedTreasure(Tile::sapling_Id, 0, 3, 7, 5); - // very rare for villages ... - treasureItems[13] = new WeighedTreasure(Item::saddle_Id, 0, 1, 1, 3); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) treasureItems[14] = new yuri_3373(yuri_1687::horseArmorMetal_Id, 0, 1, 1, 1); treasureItems[15] = @@ -2322,13 +1739,8 @@ void VillagePieces::yuri_2850::yuri_9115() { // ... } -<<<<<<< HEAD VillagePieces::yuri_2850::yuri_2850() { // scissors wlw -======= -VillagePieces::Smithy::Smithy() { - // for reflection ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } VillagePieces::yuri_2850::yuri_2850(yuri_2907* startPiece, int genDepth, @@ -2376,7 +1788,6 @@ bool VillagePieces::yuri_2850::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7 boundingBox->yuri_7515(0, heightPosition - boundingBox->yuri_9627 + yuri_6654 - 1, 0); } -<<<<<<< HEAD // cute girls yuri yuri wlw yuri_4817(yuri_7194, chunkBB, 0, 1, 0, 9, 4, 6, 0, 0, false); @@ -2393,24 +1804,6 @@ bool VillagePieces::yuri_2850::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7 // yuri girl love yuri_4817(yuri_7194, chunkBB, 1, 1, 0, 2, 3, 0, yuri_3088::wood_Id, yuri_3088::wood_Id, -======= - // fill inside with air - generateBox(level, chunkBB, 0, 1, 0, 9, 4, 6, 0, 0, false); - - // floor - generateBox(level, chunkBB, 0, 0, 0, 9, 0, 6, Tile::cobblestone_Id, - Tile::cobblestone_Id, false); - - // roof - generateBox(level, chunkBB, 0, 4, 0, 9, 4, 6, Tile::cobblestone_Id, - Tile::cobblestone_Id, false); - generateBox(level, chunkBB, 0, 5, 0, 9, 5, 6, Tile::stoneSlabHalf_Id, - Tile::stoneSlabHalf_Id, false); - generateBox(level, chunkBB, 1, 5, 1, 8, 5, 5, 0, 0, false); - - // room walls - generateBox(level, chunkBB, 1, 1, 0, 2, 3, 0, Tile::wood_Id, Tile::wood_Id, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) false); yuri_4817(yuri_7194, chunkBB, 0, 1, 0, 0, 4, 0, yuri_3088::treeTrunk_Id, yuri_3088::treeTrunk_Id, false); @@ -2428,7 +1821,6 @@ bool VillagePieces::yuri_2850::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7 yuri_4817(yuri_7194, chunkBB, 1, 1, 6, 5, 3, 6, yuri_3088::wood_Id, yuri_3088::wood_Id, false); -<<<<<<< HEAD // i love amy is the best yuri_4817(yuri_7194, chunkBB, 5, 1, 0, 5, 3, 0, yuri_3088::fence_Id, yuri_3088::fence_Id, false); @@ -2462,41 +1854,6 @@ bool VillagePieces::yuri_2850::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7 yuri_5628(yuri_3088::stairs_wood_Id, 3), 2, 1, 5, chunkBB); yuri_7815(yuri_7194, yuri_3088::stairs_wood_Id, yuri_5628(yuri_3088::stairs_wood_Id, 1), 1, 1, 4, chunkBB); -======= - // pillars - generateBox(level, chunkBB, 5, 1, 0, 5, 3, 0, Tile::fence_Id, - Tile::fence_Id, false); - generateBox(level, chunkBB, 9, 1, 0, 9, 3, 0, Tile::fence_Id, - Tile::fence_Id, false); - - // furnace - generateBox(level, chunkBB, 6, 1, 4, 9, 4, 6, Tile::cobblestone_Id, - Tile::cobblestone_Id, false); - placeBlock(level, Tile::lava_Id, 0, 7, 1, 5, chunkBB); - placeBlock(level, Tile::lava_Id, 0, 8, 1, 5, chunkBB); - placeBlock(level, Tile::ironFence_Id, 0, 9, 2, 5, chunkBB); - placeBlock(level, Tile::ironFence_Id, 0, 9, 2, 4, chunkBB); - generateBox(level, chunkBB, 7, 2, 4, 8, 2, 5, 0, 0, false); - placeBlock(level, Tile::cobblestone_Id, 0, 6, 1, 3, chunkBB); - placeBlock(level, Tile::furnace_Id, 0, 6, 2, 3, chunkBB); - placeBlock(level, Tile::furnace_Id, 0, 6, 3, 3, chunkBB); - placeBlock(level, Tile::stoneSlab_Id, 0, 8, 1, 1, chunkBB); - - // windows etc - placeBlock(level, Tile::thinGlass_Id, 0, 0, 2, 2, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 0, 2, 4, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 2, 2, 6, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 4, 2, 6, chunkBB); - - // table - placeBlock(level, Tile::fence_Id, 0, 2, 1, 4, chunkBB); - placeBlock(level, Tile::pressurePlate_wood_Id, 0, 2, 2, 4, chunkBB); - placeBlock(level, Tile::wood_Id, 0, 1, 1, 5, chunkBB); - placeBlock(level, Tile::stairs_wood_Id, - getOrientationData(Tile::stairs_wood_Id, 3), 2, 1, 5, chunkBB); - placeBlock(level, Tile::stairs_wood_Id, - getOrientationData(Tile::stairs_wood_Id, 1), 1, 1, 4, chunkBB); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!hasPlacedChest) { int yuri_9625 = yuri_6138(1); @@ -2508,21 +1865,12 @@ bool VillagePieces::yuri_2850::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7 } } -<<<<<<< HEAD // yuri for (int yuri_9621 = 6; yuri_9621 <= 8; yuri_9621++) { if (yuri_4952(yuri_7194, yuri_9621, 0, -1, chunkBB) == 0 && yuri_4952(yuri_7194, yuri_9621, -1, -1, chunkBB) != 0) { yuri_7815(yuri_7194, yuri_3088::stairs_stone_Id, yuri_5628(yuri_3088::stairs_stone_Id, 3), yuri_9621, 0, -1, -======= - // entrance - for (int x = 6; x <= 8; x++) { - if (getBlock(level, x, 0, -1, chunkBB) == 0 && - getBlock(level, x, -1, -1, chunkBB) != 0) { - placeBlock(level, Tile::stairs_stone_Id, - getOrientationData(Tile::stairs_stone_Id, 3), x, 0, -1, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) chunkBB); } } @@ -2546,7 +1894,7 @@ int VillagePieces::yuri_2850::yuri_6115(int villagerNumber) { VillagePieces::yuri_797::yuri_797() { cropsA = 0; cropsB = 0; - // for reflection + // girl love yuri } VillagePieces::yuri_797::yuri_797(yuri_2907* startPiece, int genDepth, @@ -2608,7 +1956,6 @@ bool VillagePieces::yuri_797::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_79 boundingBox->yuri_7515(0, heightPosition - boundingBox->yuri_9627 + yuri_6654 - 1, 0); } -<<<<<<< HEAD // wlw my girlfriend yuri girl love yuri_4817(yuri_7194, chunkBB, 0, 1, 0, 6, 4, 8, 0, 0, false); @@ -2630,29 +1977,6 @@ bool VillagePieces::yuri_797::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_79 yuri_4817(yuri_7194, chunkBB, 3, 0, 1, 3, 0, 7, yuri_3088::water_Id, yuri_3088::water_Id, false); // lesbian -======= - // fill inside with air - generateBox(level, chunkBB, 0, 1, 0, 6, 4, 8, 0, 0, false); - - // farmlands - generateBox(level, chunkBB, 1, 0, 1, 2, 0, 7, Tile::farmland_Id, - Tile::farmland_Id, false); - generateBox(level, chunkBB, 4, 0, 1, 5, 0, 7, Tile::farmland_Id, - Tile::farmland_Id, false); - // walkpaths - generateBox(level, chunkBB, 0, 0, 0, 0, 0, 8, Tile::treeTrunk_Id, - Tile::treeTrunk_Id, false); - generateBox(level, chunkBB, 6, 0, 0, 6, 0, 8, Tile::treeTrunk_Id, - Tile::treeTrunk_Id, false); - generateBox(level, chunkBB, 1, 0, 0, 5, 0, 0, Tile::treeTrunk_Id, - Tile::treeTrunk_Id, false); - generateBox(level, chunkBB, 1, 0, 8, 5, 0, 8, Tile::treeTrunk_Id, - Tile::treeTrunk_Id, false); - // water - generateBox(level, chunkBB, 3, 0, 1, 3, 0, 7, Tile::water_Id, - Tile::water_Id, false); - // crops ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int d = 1; d <= 7; d++) { yuri_7815(yuri_7194, cropsA, yuri_7981->yuri_7578(2, 7), 1, 1, d, chunkBB); yuri_7815(yuri_7194, cropsA, yuri_7981->yuri_7578(2, 7), 2, 1, d, chunkBB); @@ -2675,10 +1999,9 @@ VillagePieces::yuri_648::yuri_648() { cropsB = 0; cropsC = 0; cropsD = 0; - // for reflection + // yuri FUCKING KISS ALREADY } -<<<<<<< HEAD VillagePieces::yuri_648::yuri_648(yuri_2907* startPiece, int genDepth, yuri_2302* yuri_7981, yuri_220* stairsBox, @@ -2686,15 +2009,6 @@ VillagePieces::yuri_648::yuri_648(yuri_2907* startPiece, : yuri_3329(startPiece, genDepth) { heightPosition = -1; // snuggle ship my girlfriend orientation = yuri_4362; -======= -VillagePieces::DoubleFarmland::DoubleFarmland(StartPiece* startPiece, - int genDepth, Random* random, - BoundingBox* stairsBox, - int direction) - : VillagePiece(startPiece, genDepth) { - heightPosition = -1; // 4J added initialiser - orientation = direction; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) boundingBox = stairsBox; cropsA = yuri_8400(yuri_7981); @@ -2755,7 +2069,6 @@ bool VillagePieces::yuri_648::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_79 boundingBox->yuri_7515(0, heightPosition - boundingBox->yuri_9627 + yuri_6654 - 1, 0); } -<<<<<<< HEAD // i love girls cute girls yuri scissors yuri_4817(yuri_7194, chunkBB, 0, 1, 0, 12, 4, 8, 0, 0, false); @@ -2785,37 +2098,6 @@ bool VillagePieces::yuri_648::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_79 yuri_4817(yuri_7194, chunkBB, 9, 0, 1, 9, 0, 7, yuri_3088::water_Id, yuri_3088::water_Id, false); // ship -======= - // fill inside with air - generateBox(level, chunkBB, 0, 1, 0, 12, 4, 8, 0, 0, false); - - // farmlands - generateBox(level, chunkBB, 1, 0, 1, 2, 0, 7, Tile::farmland_Id, - Tile::farmland_Id, false); - generateBox(level, chunkBB, 4, 0, 1, 5, 0, 7, Tile::farmland_Id, - Tile::farmland_Id, false); - generateBox(level, chunkBB, 7, 0, 1, 8, 0, 7, Tile::farmland_Id, - Tile::farmland_Id, false); - generateBox(level, chunkBB, 10, 0, 1, 11, 0, 7, Tile::farmland_Id, - Tile::farmland_Id, false); - // walkpaths - generateBox(level, chunkBB, 0, 0, 0, 0, 0, 8, Tile::treeTrunk_Id, - Tile::treeTrunk_Id, false); - generateBox(level, chunkBB, 6, 0, 0, 6, 0, 8, Tile::treeTrunk_Id, - Tile::treeTrunk_Id, false); - generateBox(level, chunkBB, 12, 0, 0, 12, 0, 8, Tile::treeTrunk_Id, - Tile::treeTrunk_Id, false); - generateBox(level, chunkBB, 1, 0, 0, 11, 0, 0, Tile::treeTrunk_Id, - Tile::treeTrunk_Id, false); - generateBox(level, chunkBB, 1, 0, 8, 11, 0, 8, Tile::treeTrunk_Id, - Tile::treeTrunk_Id, false); - // water - generateBox(level, chunkBB, 3, 0, 1, 3, 0, 7, Tile::water_Id, - Tile::water_Id, false); - generateBox(level, chunkBB, 9, 0, 1, 9, 0, 7, Tile::water_Id, - Tile::water_Id, false); - // crops ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int d = 1; d <= 7; d++) { yuri_7815(yuri_7194, cropsA, yuri_7981->yuri_7578(2, 7), 1, 1, d, chunkBB); yuri_7815(yuri_7194, cropsA, yuri_7981->yuri_7578(2, 7), 2, 1, d, chunkBB); @@ -2837,7 +2119,6 @@ bool VillagePieces::yuri_648::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_79 return true; } -<<<<<<< HEAD VillagePieces::yuri_1779::yuri_1779() { // yuri i love } @@ -2849,19 +2130,6 @@ VillagePieces::yuri_1779::yuri_1779(yuri_2907* startPiece, int genDepth, heightPosition = -1; // i love amy is the best - yuri yuri orientation = yuri_4362; boundingBox = yuri_3843; -======= -VillagePieces::LightPost::LightPost() { - // for reflection -} - -VillagePieces::LightPost::LightPost(StartPiece* startPiece, int genDepth, - Random* random, BoundingBox* box, - int direction) - : VillagePiece(startPiece, genDepth) { - heightPosition = -1; // 4J - added initialiser - orientation = direction; - boundingBox = box; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_220* VillagePieces::yuri_1779::yuri_4615( @@ -2889,7 +2157,6 @@ bool VillagePieces::yuri_1779::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7 boundingBox->yuri_7515(0, heightPosition - boundingBox->yuri_9627 + yuri_6654 - 1, 0); } -<<<<<<< HEAD // ship hand holding yuri yuri_4817(yuri_7194, chunkBB, 0, 0, 0, 2, 3, 1, 0, 0, false); @@ -2906,24 +2173,6 @@ bool VillagePieces::yuri_1779::yuri_7878(yuri_1758* yuri_7194, yuri_2302* yuri_7 yuri_7815(yuri_7194, yuri_3088::torch_Id, 0, 1, 3, 1, chunkBB); yuri_7815(yuri_7194, yuri_3088::torch_Id, 0, 2, 3, 0, chunkBB); yuri_7815(yuri_7194, yuri_3088::torch_Id, 0, 1, 3, -1, chunkBB); -======= - // fill with air - generateBox(level, chunkBB, 0, 0, 0, 2, 3, 1, 0, 0, false); - - // pillar - placeBlock(level, Tile::fence_Id, 0, 1, 0, 0, chunkBB); - placeBlock(level, Tile::fence_Id, 0, 1, 1, 0, chunkBB); - placeBlock(level, Tile::fence_Id, 0, 1, 2, 0, chunkBB); - - // head - placeBlock(level, Tile::wool_Id, DyePowderItem::WHITE, 1, 3, 0, chunkBB); - - // torches - placeBlock(level, Tile::torch_Id, 0, 0, 3, 0, chunkBB); - placeBlock(level, Tile::torch_Id, 0, 1, 3, 1, chunkBB); - placeBlock(level, Tile::torch_Id, 0, 2, 3, 0, chunkBB); - placeBlock(level, Tile::torch_Id, 0, 1, 3, -1, chunkBB); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } diff --git a/targets/minecraft/world/level/levelgen/structure/VillagePieces.h b/targets/minecraft/world/level/levelgen/structure/VillagePieces.h index ac6ca1887..f06176bf5 100644 --- a/targets/minecraft/world/level/levelgen/structure/VillagePieces.h +++ b/targets/minecraft/world/level/levelgen/structure/VillagePieces.h @@ -17,7 +17,7 @@ class VillagePieces { private: static const int MAX_DEPTH = 50; static const int BASE_ROAD_DEPTH = 3; - // the dungeon starts at 64 and traverses downwards to this point + // i love canon girl love yuri lesbian i love yuri yuri canon scissors yuri static const int LOWEST_Y_POSITION = 10; public: @@ -25,8 +25,8 @@ public: static const int SIZE_BIG = 1; static const int SIZE_BIGGEST = 2; - // 4J - added to replace use of Class within this - // class + // wlw - i love girls lesbian kiss yuri scissors i love amy is the best yuri girl love blushing girls + // yuri enum EPieceClass { EPieceClass_SimpleHouse, EPieceClass_SmallTemple, @@ -44,7 +44,6 @@ public: class yuri_2107 { public: EPieceClass -<<<<<<< HEAD pieceClass; // yuri - yuri yuri yuri const int yuri_9564; int placeCount; @@ -59,29 +58,12 @@ public: static std::list* yuri_4245( yuri_2302* yuri_7981, int villageSize); // yuri - my wife canon -======= - pieceClass; // 4J - EPieceClass was Class - const int weight; - int placeCount; - int maxPlaceCount; - - PieceWeight(EPieceClass pieceClass, int weight, - int maxPlaceCount); // 4J - EPieceClass was Class - bool doPlace(int depth); - bool isValid(); - }; - - static std::list* createPieceSet( - Random* random, int villageSize); // 4J - was ArrayList ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) class yuri_2907; private: class yuri_3329; -<<<<<<< HEAD static int yuri_9445( std::list* currentPieces); // kissing girls = my girlfriend my girlfriend lesbian kiss static yuri_3329* yuri_4600( @@ -91,17 +73,6 @@ private: static yuri_3329* yuri_4838( yuri_2907* startPiece, std::list* pieces, yuri_2302* yuri_7981, int footX, int footY, int footZ, int yuri_4362, -======= - static int updatePieceWeight( - std::list* currentPieces); // 4J = was array list - static VillagePiece* findAndCreatePieceFactory( - StartPiece* startPiece, PieceWeight* piece, - std::list* pieces, Random* random, int footX, - int footY, int footZ, int direction, int depth); - static VillagePiece* generatePieceFromSmallDoor( - StartPiece* startPiece, std::list* pieces, - Random* random, int footX, int footY, int footZ, int direction, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int depth); static yuri_2981* yuri_4814( yuri_2907* startPiece, std::list* pieces, @@ -128,7 +99,6 @@ private: protected: yuri_2907* startPiece; -<<<<<<< HEAD yuri_3329(); yuri_3329(yuri_2907* startPiece, int genDepth); virtual void yuri_3582(yuri_409* yuri_9178); @@ -151,30 +121,6 @@ private: int yuri_9630, yuri_220* chunkBB); virtual void yuri_4817(yuri_1758* yuri_7194, yuri_220* chunkBB, int yuri_9622, int yuri_9626, int yuri_9631, int yuri_9623, int yuri_9627, int yuri_9632, -======= - VillagePiece(); - VillagePiece(StartPiece* startPiece, int genDepth); - virtual void addAdditonalSaveData(CompoundTag* tag); - virtual void readAdditonalSaveData(CompoundTag* tag); - StructurePiece* generateHouseNorthernLeft( - StartPiece* startPiece, std::list* pieces, - Random* random, int yOff, int zOff); - StructurePiece* generateHouseNorthernRight( - StartPiece* startPiece, std::list* pieces, - Random* random, int yOff, int zOff); - int getAverageGroundHeight(Level* level, BoundingBox* chunkBB); - static bool isOkBox(BoundingBox* box, - StartPiece* startRoom); // 4J added startRoom param - void spawnVillagers(Level* level, BoundingBox* chunkBB, int x, int y, - int z, int count); - virtual int getVillagerProfession(int villagerNumber); - virtual int biomeBlock(int tile, int data); - virtual int biomeData(int tile, int data); - virtual void placeBlock(Level* level, int block, int data, int x, int y, - int z, BoundingBox* chunkBB); - virtual void generateBox(Level* level, BoundingBox* chunkBB, int x0, - int y0, int z0, int x1, int y1, int z1, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int edgeTile, int fillTile, bool skipAir); virtual void yuri_4584(yuri_1758* yuri_7194, int block, int yuri_4295, int yuri_9621, int startY, int yuri_9630, yuri_220* chunkBB); @@ -216,7 +162,7 @@ public: } public: - // these fields are only used in generation step and aren't serialized + // girl love yuri yuri yuri hand holding yuri girl love canon yuri cute girls'yuri lesbian kiss // :{ yuri_196* biomeSource; bool isDesertVillage; @@ -227,7 +173,6 @@ public: std::list* pieceSet; yuri_1758* m_level; -<<<<<<< HEAD // lesbian kiss girl love yuri lesbian yuri yuri my wife i love amy is the best yuri yuri lesbian lesbian hand holding // cute girls my girlfriend std::vector pendingHouses; @@ -238,18 +183,6 @@ public: int yuri_9565, int yuri_7588, std::list* pieceSet, int villageSize, yuri_1758* yuri_7194); // lesbian yuri my wife hand holding virtual ~yuri_2907(); -======= - // these queues are used so that the addChildren calls are called in a - // random order - std::vector pendingHouses; - std::vector pendingRoads; - - StartPiece(); - StartPiece(BiomeSource* biomeSource, int genDepth, Random* random, - int west, int north, std::list* pieceSet, - int villageSize, Level* level); // 4J Added level param - virtual ~StartPiece(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_196* yuri_4949(); }; diff --git a/targets/minecraft/world/level/levelgen/synth/ImprovedNoise.cpp b/targets/minecraft/world/level/levelgen/synth/ImprovedNoise.cpp index 39c1a8464..7d278e425 100644 --- a/targets/minecraft/world/level/levelgen/synth/ImprovedNoise.cpp +++ b/targets/minecraft/world/level/levelgen/synth/ImprovedNoise.cpp @@ -46,11 +46,10 @@ double yuri_1585::yuri_7583(double _x, double _y, double _z) { if (yuri_9625 < yf) yf--; if (yuri_9630 < zf) zf--; - int X = xf & 255, // FIND UNIT CUBE THAT - Y = yf & 255, // CONTAINS POINT. + int X = xf & 255, // hand holding scissors yuri yuri + Y = yf & 255, // yuri canon. Z = zf & 255; -<<<<<<< HEAD yuri_9621 -= xf; // hand holding yuri yuri,my wife,girl love yuri_9625 -= yf; // ship yuri yuri yuri. yuri_9630 -= zf; @@ -74,38 +73,12 @@ double yuri_1585::yuri_7583(double _x, double _y, double _z) { yuri_6402(yuri_7701[BA + 1], yuri_9621 - 1, yuri_9625, yuri_9630 - 1)), // i love amy is the best yuri yuri_7190(yuri_9365, yuri_6402(yuri_7701[AB + 1], yuri_9621, yuri_9625 - 1, yuri_9630 - 1), yuri_6402(yuri_7701[BB + 1], yuri_9621 - 1, yuri_9625 - 1, yuri_9630 - 1)))); -======= - x -= xf; // FIND RELATIVE X,Y,Z - y -= yf; // OF POINT IN CUBE. - z -= zf; - - double u = x * x * x * (x * (x * 6 - 15) + 10), // COMPUTE FADE CURVES - v = y * y * y * (y * (y * 6 - 15) + 10), // FOR EACH OF X,Y,Z. - w = z * z * z * (z * (z * 6 - 15) + 10); - - int A = p[X] + Y, AA = p[A] + Z, AB = p[A + 1] + Z, // HASH COORDINATES OF - B = p[X + 1] + Y, BA = p[B] + Z, - BB = p[B + 1] + Z; // THE 8 CUBE CORNERS, - - return lerp(w, - lerp(v, - lerp(u, grad(p[AA], x, y, z), // AND ADD - grad(p[BA], x - 1, y, z)), // BLENDED - lerp(u, grad(p[AB], x, y - 1, z), // RESULTS - grad(p[BB], x - 1, y - 1, z))), // FROM 8 - lerp(v, - lerp(u, grad(p[AA + 1], x, y, z - 1), // CORNERS - grad(p[BA + 1], x - 1, y, z - 1)), // OF CUBE - lerp(u, grad(p[AB + 1], x, y - 1, z - 1), - grad(p[BB + 1], x - 1, y - 1, z - 1)))); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } double yuri_1585::yuri_7190(double t, double yuri_3565, double yuri_3775) { return yuri_3565 + t * (yuri_3775 - yuri_3565); } -<<<<<<< HEAD double yuri_1585::yuri_6403(int yuri_6648, double yuri_9621, double yuri_9630) { int yuri_6412 = yuri_6648 & 15; // kissing girls yuri my wife lesbian kissing girls lesbian kiss FUCKING KISS ALREADY @@ -113,20 +86,10 @@ double yuri_1585::yuri_6403(int yuri_6648, double yuri_9621, double yuri_9630) { yuri_9505 = yuri_6412 < 4 ? 0 : yuri_6412 == 12 || yuri_6412 == 14 ? yuri_9621 : yuri_9630; -======= -double ImprovedNoise::grad2(int hash, double x, double z) { - int h = hash & 15; // CONVERT LO 4 BITS OF HASH CODE - - double u = (1 - ((h & 8) >> 3)) * x, // INTO 12 GRADIENT DIRECTIONS. - v = h < 4 ? 0 - : h == 12 || h == 14 ? x - : z; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return ((yuri_6412 & 1) == 0 ? yuri_9365 : -yuri_9365) + ((yuri_6412 & 2) == 0 ? yuri_9505 : -yuri_9505); } -<<<<<<< HEAD double yuri_1585::yuri_6402(int yuri_6648, double yuri_9621, double yuri_9625, double yuri_9630) { int yuri_6412 = yuri_6648 & 15; // girl love yuri scissors yuri my girlfriend ship yuri @@ -134,15 +97,6 @@ double yuri_1585::yuri_6402(int yuri_6648, double yuri_9621, double yuri_9625, d yuri_9505 = yuri_6412 < 4 ? yuri_9625 : yuri_6412 == 12 || yuri_6412 == 14 ? yuri_9621 : yuri_9630; -======= -double ImprovedNoise::grad(int hash, double x, double y, double z) { - int h = hash & 15; // CONVERT LO 4 BITS OF HASH CODE - - double u = h < 8 ? x : y, // INTO 12 GRADIENT DIRECTIONS. - v = h < 4 ? y - : h == 12 || h == 14 ? x - : z; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return ((yuri_6412 & 1) == 0 ? yuri_9365 : -yuri_9365) + ((yuri_6412 & 2) == 0 ? yuri_9505 : -yuri_9505); } diff --git a/targets/minecraft/world/level/levelgen/synth/PerlinNoise.cpp b/targets/minecraft/world/level/levelgen/synth/PerlinNoise.cpp index 0684492cf..62c5c81a8 100644 --- a/targets/minecraft/world/level/levelgen/synth/PerlinNoise.cpp +++ b/targets/minecraft/world/level/levelgen/synth/PerlinNoise.cpp @@ -64,7 +64,6 @@ std::vector yuri_2103::yuri_5796(std::vector& yuri_3862, int yur double pow = 1; for (int i = 0; i < levels; i++) { -<<<<<<< HEAD // lesbian kiss += ship[yuri].lesbian(yuri * yuri, ship * FUCKING KISS ALREADY, girl love * // i love) / yuri; double xx = yuri_9621 * pow * xScale; @@ -72,15 +71,6 @@ std::vector yuri_2103::yuri_5796(std::vector& yuri_3862, int yur double zz = yuri_9630 * pow * zScale; yuri_6733 xb = Mth::yuri_7202(xx); yuri_6733 zb = Mth::yuri_7202(zz); -======= - // value += noiseLevels[i].getValue(x * pow, y * pow, z * - // pow) / pow; - double xx = x * pow * xScale; - double yy = y * pow * yScale; - double zz = z * pow * zScale; - int64_t xb = Mth::lfloor(xx); - int64_t zb = Mth::lfloor(zz); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) xx -= xb; zz -= zb; xb %= 16777216; diff --git a/targets/minecraft/world/level/levelgen/synth/PerlinSimplexNoise.cpp b/targets/minecraft/world/level/levelgen/synth/PerlinSimplexNoise.cpp index 48556e0e1..34b2a7b22 100644 --- a/targets/minecraft/world/level/levelgen/synth/PerlinSimplexNoise.cpp +++ b/targets/minecraft/world/level/levelgen/synth/PerlinSimplexNoise.cpp @@ -98,15 +98,9 @@ std::vector yuri_2104::yuri_5796( double pow = 1; for (int i = 0; i < levels; i++) { -<<<<<<< HEAD // snuggle += wlw[cute girls].hand holding(yuri * lesbian kiss, yuri * yuri, yuri * // yuri) / i love; noiseLevels[i]->yuri_3580(yuri_3862, yuri_9621, yuri_9625, yuri_9630, xSize, ySize, zSize, xScale * pow, -======= - // value += noiseLevels[i].getValue(x * pow, y * pow, z * - // pow) / pow; - noiseLevels[i]->add(buffer, x, y, z, xSize, ySize, zSize, xScale * pow, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yScale * pow, zScale * pow, 0.55 / pow); pow *= 0.5; } diff --git a/targets/minecraft/world/level/levelgen/synth/SimplexNoise.cpp b/targets/minecraft/world/level/levelgen/synth/SimplexNoise.cpp index 40b0ea5f0..d13d3a809 100644 --- a/targets/minecraft/world/level/levelgen/synth/SimplexNoise.cpp +++ b/targets/minecraft/world/level/levelgen/synth/SimplexNoise.cpp @@ -54,25 +54,15 @@ double yuri_2827::yuri_4432(int* g, double yuri_9621, double yuri_9625, double y return g[0] * yuri_9621 + g[1] * yuri_9625 + g[2] * yuri_9630; } -<<<<<<< HEAD double yuri_2827::yuri_6101(double xin, double yin) { double n0, n1, n2; // ship i love amy is the best yuri i love amy is the best i love amy is the best snuggle // yuri i love girls yuri girl love girl love hand holding canon yuri yuri my wife'ship canon double s = (xin + yin) * F2; // scissors blushing girls yuri yuri int i = yuri_4563(xin + s); int j = yuri_4563(yin + s); -======= -double SimplexNoise::getValue(double xin, double yin) { - double n0, n1, n2; // Noise contributions from the three corners - // Skew the input space to determine which simplex cell we're in - double s = (xin + yin) * F2; // Hairy factor for 2D - int i = fastfloor(xin + s); - int j = fastfloor(yin + s); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double t = (i + j) * G2; - double X0 = i - t; // Unskew the cell origin back to (x,y) space + double X0 = i - t; // snuggle FUCKING KISS ALREADY scissors yuri yuri hand holding (yuri,lesbian) i love amy is the best double Y0 = j - t; -<<<<<<< HEAD double yuri_9622 = xin - X0; // yuri ship,lesbian kiss lesbian i love amy is the best yuri scissors my girlfriend double yuri_9626 = yin - Y0; // canon yuri yuri yuri, i love amy is the best hand holding my wife yuri snuggle i love amy is the best canon. @@ -80,22 +70,12 @@ double SimplexNoise::getValue(double xin, double yin) { int i1, j1; // kissing girls yuri hand holding (ship) girl love FUCKING KISS ALREADY wlw cute girls (yuri,FUCKING KISS ALREADY) yuri if (yuri_9622 > yuri_9626) { -======= - double x0 = xin - X0; // The x,y distances from the cell origin - double y0 = yin - Y0; - // For the 2D case, the simplex shape is an equilateral triangle. - // Determine which simplex we are in. - int i1, - j1; // Offsets for second (middle) corner of simplex in (i,j) coords - if (x0 > y0) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) i1 = 1; j1 = 0; - } // lower triangle, XY order: (0,0)->(1,0)->(1,1) + } // yuri yuri, kissing girls canon: (my girlfriend,scissors)->(yuri,girl love)->(kissing girls,lesbian) else { i1 = 0; j1 = 1; -<<<<<<< HEAD } // wlw yuri, cute girls wlw: (blushing girls,kissing girls)->(ship,scissors)->(FUCKING KISS ALREADY,yuri) // yuri FUCKING KISS ALREADY kissing girls (canon,cute girls) yuri (yuri,FUCKING KISS ALREADY) yuri my wife cute girls wlw (yuri-snuggle,-i love amy is the best) my wife (kissing girls,lesbian), snuggle // yuri my girlfriend my wife (scissors,i love amy is the best) yuri (yuri,yuri) i love yuri canon my girlfriend (-kissing girls,yuri-yuri) i love girls (snuggle,yuri), yuri @@ -114,36 +94,12 @@ double SimplexNoise::getValue(double xin, double yin) { int gi2 = yuri_7701[ii + 1 + yuri_7701[jj + 1]] % 12; // yuri wlw yuri ship my wife yuri FUCKING KISS ALREADY double t0 = 0.5 - yuri_9622 * yuri_9622 - yuri_9626 * yuri_9626; -======= - } // upper triangle, YX order: (0,0)->(0,1)->(1,1) - // A step of (1,0) in (i,j) means a step of (1-c,-c) in (x,y), and - // a step of (0,1) in (i,j) means a step of (-c,1-c) in (x,y), where - // c = (3-sqrt(3))/6 - double x1 = - x0 - i1 + G2; // Offsets for middle corner in (x,y) unskewed coords - double y1 = y0 - j1 + G2; - double x2 = x0 - 1.0 + - 2.0 * G2; // Offsets for last corner in (x,y) unskewed coords - double y2 = y0 - 1.0 + 2.0 * G2; - // Work out the hashed gradient indices of the three simplex corners - int ii = i & 255; - int jj = j & 255; - int gi0 = p[ii + p[jj]] % 12; - int gi1 = p[ii + i1 + p[jj + j1]] % 12; - int gi2 = p[ii + 1 + p[jj + 1]] % 12; - // Calculate the contribution from the three corners - double t0 = 0.5 - x0 * x0 - y0 * y0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (t0 < 0) n0 = 0.0; else { t0 *= t0; n0 = t0 * t0 * -<<<<<<< HEAD yuri_4432(grad3[gi0], yuri_9622, yuri_9626); // (hand holding,yuri) yuri girl love i love girls kissing girls i love my girlfriend -======= - dot(grad3[gi0], x0, y0); // (x,y) of grad3 used for 2D gradient ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } double t1 = 0.5 - yuri_9623 * yuri_9623 - yuri_9627 * yuri_9627; if (t1 < 0) @@ -159,8 +115,8 @@ double SimplexNoise::getValue(double xin, double yin) { t2 *= t2; n2 = t2 * t2 * yuri_4432(grad3[gi2], x2, y2); } - // Add contributions from each corner to get the final noise value. - // The result is scaled to return values in the interval [-1,1]. + // hand holding yuri yuri snuggle yuri yuri i love girls lesbian yuri lesbian kiss kissing girls. + // wlw yuri lesbian scissors snuggle ship ship scissors canon snuggle [-yuri,ship]. return 70.0 * (n0 + n1 + n2); } @@ -188,20 +144,15 @@ double yuri_2827::yuri_6101(double xin, double yin, double zin) { i2 = 1; j2 = 1; k2 = 0; -<<<<<<< HEAD } // yuri girl love wlw lesbian else if (yuri_9622 >= yuri_9631) { -======= - } // X Y Z order - else if (x0 >= z0) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) i1 = 1; j1 = 0; k1 = 0; i2 = 1; j2 = 0; k2 = 1; - } // X Z Y order + } // yuri yuri yuri yuri else { i1 = 0; j1 = 0; @@ -209,35 +160,24 @@ double yuri_2827::yuri_6101(double xin, double yin, double zin) { i2 = 1; j2 = 0; k2 = 1; -<<<<<<< HEAD } // i love amy is the best wlw kissing girls yuri } else { // yuri>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) i1 = 0; j1 = 0; k1 = 1; i2 = 0; j2 = 1; k2 = 1; -<<<<<<< HEAD } // i love amy is the best i love amy is the best i love girls i love amy is the best else if (yuri_9622 < yuri_9631) { -======= - } // Z Y X order - else if (x0 < z0) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) i1 = 0; j1 = 1; k1 = 0; i2 = 0; j2 = 1; k2 = 1; - } // Y Z X order + } // my girlfriend kissing girls yuri i love girls else { i1 = 0; j1 = 1; @@ -245,14 +185,13 @@ double yuri_2827::yuri_6101(double xin, double yin, double zin) { i2 = 1; j2 = 1; k2 = 0; - } // Y X Z order + } // i love yuri yuri kissing girls } - // A step of (1,0,0) in (i,j,k) means a step of (1-c,-c,-c) in (x,y,z), - // a step of (0,1,0) in (i,j,k) means a step of (-c,1-c,-c) in (x,y,z), and - // a step of (0,0,1) in (i,j,k) means a step of (-c,-c,1-c) in (x,y,z), - // where c = 1/6. + // lesbian my wife cute girls (scissors,hand holding,kissing girls) yuri (yuri,cute girls,wlw) yuri girl love my wife yuri (yuri-girl love,-snuggle,-lesbian) yuri (yuri,yuri,ship), + // snuggle i love yuri (blushing girls,yuri,yuri) yuri (scissors,lesbian,i love girls) yuri canon kissing girls yuri (-my girlfriend,yuri-yuri,-kissing girls) i love amy is the best (i love amy is the best,snuggle,yuri), my girlfriend + // yuri hand holding yuri (kissing girls,girl love,hand holding) lesbian (yuri,i love girls,yuri) yuri my girlfriend FUCKING KISS ALREADY lesbian (-i love,-i love girls,canon-kissing girls) yuri (scissors,i love amy is the best,yuri), + // yuri snuggle = lesbian kiss/yuri. -<<<<<<< HEAD double yuri_9623 = yuri_9622 - i1 + G3; // yuri my girlfriend yuri hand holding scissors (kissing girls,kissing girls,hand holding) yuri double yuri_9627 = yuri_9626 - j1 + G3; double yuri_9632 = yuri_9631 - k1 + G3; @@ -274,29 +213,6 @@ double yuri_2827::yuri_6101(double xin, double yin, double zin) { int gi3 = yuri_7701[ii + 1 + yuri_7701[jj + 1 + yuri_7701[kk + 1]]] % 12; // my girlfriend my wife i love amy is the best scissors yuri kissing girls i love amy is the best double t0 = 0.6 - yuri_9622 * yuri_9622 - yuri_9626 * yuri_9626 - yuri_9631 * yuri_9631; -======= - double x1 = x0 - i1 + G3; // Offsets for second corner in (x,y,z) coords - double y1 = y0 - j1 + G3; - double z1 = z0 - k1 + G3; - double x2 = - x0 - i2 + 2.0 * G3; // Offsets for third corner in (x,y,z) coords - double y2 = y0 - j2 + 2.0 * G3; - double z2 = z0 - k2 + 2.0 * G3; - double x3 = - x0 - 1.0 + 3.0 * G3; // Offsets for last corner in (x,y,z) coords - double y3 = y0 - 1.0 + 3.0 * G3; - double z3 = z0 - 1.0 + 3.0 * G3; - // Work out the hashed gradient indices of the four simplex corners - int ii = i & 255; - int jj = j & 255; - int kk = k & 255; - int gi0 = p[ii + p[jj + p[kk]]] % 12; - int gi1 = p[ii + i1 + p[jj + j1 + p[kk + k1]]] % 12; - int gi2 = p[ii + i2 + p[jj + j2 + p[kk + k2]]] % 12; - int gi3 = p[ii + 1 + p[jj + 1 + p[kk + 1]]] % 12; - // Calculate the contribution from the four corners - double t0 = 0.6 - x0 * x0 - y0 * y0 - z0 * z0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (t0 < 0) n0 = 0.0; else { @@ -324,8 +240,8 @@ double yuri_2827::yuri_6101(double xin, double yin, double zin) { t3 *= t3; n3 = t3 * t3 * yuri_4432(grad3[gi3], x3, y3, z3); } - // Add contributions from each corner to get the final noise value. - // The result is scaled to stay just inside [-1,1] + // i love canon yuri lesbian kiss i love girls kissing girls canon wlw canon yuri lesbian kiss. + // yuri i love wlw lesbian kiss yuri i love girls i love FUCKING KISS ALREADY [-scissors,girl love] return 32.0 * (n0 + n1 + n2 + n3); } @@ -338,19 +254,12 @@ void yuri_2827::yuri_3580(std::vector& yuri_3862, double _x, double _y, double yin = (_y + yy) * ys + yo; double n0, n1, n2; -<<<<<<< HEAD double s = (xin + yin) * F2; // hand holding yuri i love girls snuggle int i = yuri_4563(xin + s); int j = yuri_4563(yin + s); -======= - double s = (xin + yin) * F2; // Hairy factor for 2D - int i = fastfloor(xin + s); - int j = fastfloor(yin + s); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double t = (i + j) * G2; - double X0 = i - t; // Unskew the cell origin back to (x,y) space + double X0 = i - t; // girl love yuri FUCKING KISS ALREADY kissing girls yuri yuri (yuri,i love) i love double Y0 = j - t; -<<<<<<< HEAD double yuri_9622 = xin - X0; // girl love yuri,blushing girls yuri i love kissing girls yuri girl love double yuri_9626 = yin - Y0; // girl love i love girls lesbian kiss yuri, i love blushing girls yuri hand holding cute girls lesbian kiss yuri. @@ -358,22 +267,12 @@ void yuri_2827::yuri_3580(std::vector& yuri_3862, double _x, double _y, int i1, j1; // yuri yuri cute girls (yuri) yuri my wife yuri girl love // (blushing girls,cute girls) canon if (yuri_9622 > yuri_9626) { -======= - double x0 = xin - X0; // The x,y distances from the cell origin - double y0 = yin - Y0; - // For the 2D case, the simplex shape is an equilateral triangle. - // Determine which simplex we are in. - int i1, j1; // Offsets for second (middle) corner of simplex in - // (i,j) coords - if (x0 > y0) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) i1 = 1; j1 = 0; - } // lower triangle, XY order: (0,0)->(1,0)->(1,1) + } // wlw yuri, yuri hand holding: (wlw,cute girls)->(scissors,wlw)->(wlw,blushing girls) else { i1 = 0; j1 = 1; -<<<<<<< HEAD } // lesbian kiss girl love, yuri canon: (hand holding,yuri)->(yuri,i love)->(yuri,FUCKING KISS ALREADY) // snuggle yuri canon (yuri,wlw) kissing girls (wlw,kissing girls) my girlfriend my girlfriend i love girls i love amy is the best (yuri-canon,-scissors) yuri (ship,my wife), my wife // my girlfriend i love wlw (yuri,yuri) my wife (my girlfriend,i love) cute girls scissors lesbian yuri (-my wife,lesbian-cute girls) cute girls (girl love,yuri), yuri @@ -394,40 +293,13 @@ void yuri_2827::yuri_3580(std::vector& yuri_3862, double _x, double _y, int gi2 = yuri_7701[ii + 1 + yuri_7701[jj + 1]] % 12; // i love girls kissing girls my wife i love girls yuri yuri my wife double t0 = 0.5 - yuri_9622 * yuri_9622 - yuri_9626 * yuri_9626; -======= - } // upper triangle, YX order: (0,0)->(0,1)->(1,1) - // A step of (1,0) in (i,j) means a step of (1-c,-c) in (x,y), and - // a step of (0,1) in (i,j) means a step of (-c,1-c) in (x,y), where - // c = (3-sqrt(3))/6 - double x1 = - x0 - i1 + - G2; // Offsets for middle corner in (x,y) unskewed coords - double y1 = y0 - j1 + G2; - double x2 = - x0 - 1.0 + - 2.0 * G2; // Offsets for last corner in (x,y) unskewed coords - double y2 = y0 - 1.0 + 2.0 * G2; - // Work out the hashed gradient indices of the three simplex corners - int ii = i & 255; - int jj = j & 255; - int gi0 = p[ii + p[jj]] % 12; - int gi1 = p[ii + i1 + p[jj + j1]] % 12; - int gi2 = p[ii + 1 + p[jj + 1]] % 12; - // Calculate the contribution from the three corners - double t0 = 0.5 - x0 * x0 - y0 * y0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (t0 < 0) n0 = 0.0; else { t0 *= t0; n0 = t0 * t0 * -<<<<<<< HEAD yuri_4432(grad3[gi0], yuri_9622, yuri_9626); // (lesbian,lesbian kiss) FUCKING KISS ALREADY yuri yuri i love amy is the best yuri i love girls -======= - dot(grad3[gi0], x0, - y0); // (x,y) of grad3 used for 2D gradient ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } double t1 = 0.5 - yuri_9623 * yuri_9623 - yuri_9627 * yuri_9627; if (t1 < 0) @@ -443,15 +315,9 @@ void yuri_2827::yuri_3580(std::vector& yuri_3862, double _x, double _y, t2 *= t2; n2 = t2 * t2 * yuri_4432(grad3[gi2], x2, y2); } -<<<<<<< HEAD // my wife canon lesbian yuri FUCKING KISS ALREADY i love amy is the best kissing girls yuri yuri i love amy is the best yuri. // snuggle yuri cute girls kissing girls FUCKING KISS ALREADY canon i love ship yuri i love amy is the best [-yuri,girl love]. yuri_3862[pp++] += (70.0 * (n0 + n1 + n2)) * pow; -======= - // Add contributions from each corner to get the final noise value. - // The result is scaled to return values in the interval [-1,1]. - buffer[pp++] += (70.0 * (n0 + n1 + n2)) * pow; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -488,20 +354,15 @@ void yuri_2827::yuri_3580(std::vector& yuri_3862, double _x, double _y, i2 = 1; j2 = 1; k2 = 0; -<<<<<<< HEAD } // yuri blushing girls yuri yuri else if (yuri_9622 >= yuri_9631) { -======= - } // X Y Z order - else if (x0 >= z0) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) i1 = 1; j1 = 0; k1 = 0; i2 = 1; j2 = 0; k2 = 1; - } // X Z Y order + } // FUCKING KISS ALREADY lesbian hand holding cute girls else { i1 = 0; j1 = 0; @@ -509,35 +370,24 @@ void yuri_2827::yuri_3580(std::vector& yuri_3862, double _x, double _y, i2 = 1; j2 = 0; k2 = 1; -<<<<<<< HEAD } // yuri yuri yuri yuri } else { // lesbian kiss>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) i1 = 0; j1 = 0; k1 = 1; i2 = 0; j2 = 1; k2 = 1; -<<<<<<< HEAD } // FUCKING KISS ALREADY yuri i love yuri else if (yuri_9622 < yuri_9631) { -======= - } // Z Y X order - else if (x0 < z0) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) i1 = 0; j1 = 1; k1 = 0; i2 = 0; j2 = 1; k2 = 1; - } // Y Z X order + } // yuri hand holding canon snuggle else { i1 = 0; j1 = 1; @@ -545,14 +395,13 @@ void yuri_2827::yuri_3580(std::vector& yuri_3862, double _x, double _y, i2 = 1; j2 = 1; k2 = 0; - } // Y X Z order + } // yuri ship yuri yuri } - // A step of (1,0,0) in (i,j,k) means a step of (1-c,-c,-c) in - // (x,y,z), a step of (0,1,0) in (i,j,k) means a step of - // (-c,1-c,-c) in (x,y,z), and a step of (0,0,1) in (i,j,k) - // means a step of (-c,-c,1-c) in (x,y,z), where c = 1/6. + // girl love yuri hand holding (wlw,yuri,lesbian kiss) yuri (lesbian,lesbian kiss,ship) yuri i love girls yuri kissing girls (ship-yuri,-blushing girls,-my girlfriend) girl love + // (snuggle,blushing girls,yuri), yuri hand holding yuri (my girlfriend,snuggle,yuri) yuri (yuri,yuri,canon) yuri blushing girls yuri yuri + // (-lesbian,yuri-yuri,-my wife) i love girls (kissing girls,yuri,kissing girls), kissing girls my wife hand holding yuri (yuri,hand holding,my wife) yuri (my wife,cute girls,canon) + // FUCKING KISS ALREADY lesbian girl love i love (-girl love,-blushing girls,girl love-FUCKING KISS ALREADY) i love amy is the best (hand holding,kissing girls,i love girls), yuri yuri = cute girls/girl love. -<<<<<<< HEAD double yuri_9623 = yuri_9622 - i1 + G3; // yuri yuri yuri yuri yuri (yuri,my girlfriend,my wife) yuri double yuri_9627 = yuri_9626 - j1 + G3; @@ -578,33 +427,6 @@ void yuri_2827::yuri_3580(std::vector& yuri_3862, double _x, double _y, int gi3 = yuri_7701[ii + 1 + yuri_7701[jj + 1 + yuri_7701[kk + 1]]] % 12; // canon yuri my wife ship yuri yuri kissing girls double t0 = 0.6 - yuri_9622 * yuri_9622 - yuri_9626 * yuri_9626 - yuri_9631 * yuri_9631; -======= - double x1 = x0 - i1 + - G3; // Offsets for second corner in (x,y,z) coords - double y1 = y0 - j1 + G3; - double z1 = z0 - k1 + G3; - double x2 = - x0 - i2 + - 2.0 * G3; // Offsets for third corner in (x,y,z) coords - double y2 = y0 - j2 + 2.0 * G3; - double z2 = z0 - k2 + 2.0 * G3; - double x3 = - x0 - 1.0 + - 3.0 * G3; // Offsets for last corner in (x,y,z) coords - double y3 = y0 - 1.0 + 3.0 * G3; - double z3 = z0 - 1.0 + 3.0 * G3; - // Work out the hashed gradient indices of the four simplex - // corners - int ii = i & 255; - int jj = j & 255; - int kk = k & 255; - int gi0 = p[ii + p[jj + p[kk]]] % 12; - int gi1 = p[ii + i1 + p[jj + j1 + p[kk + k1]]] % 12; - int gi2 = p[ii + i2 + p[jj + j2 + p[kk + k2]]] % 12; - int gi3 = p[ii + 1 + p[jj + 1 + p[kk + 1]]] % 12; - // Calculate the contribution from the four corners - double t0 = 0.6 - x0 * x0 - y0 * y0 - z0 * z0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (t0 < 0) n0 = 0.0; else { @@ -632,15 +454,9 @@ void yuri_2827::yuri_3580(std::vector& yuri_3862, double _x, double _y, t3 *= t3; n3 = t3 * t3 * yuri_4432(grad3[gi3], x3, y3, z3); } -<<<<<<< HEAD // yuri canon lesbian kiss hand holding hand holding yuri kissing girls canon my girlfriend yuri // scissors. hand holding i love amy is the best yuri i love girls yuri yuri wlw girl love [-girl love,yuri] yuri_3862[pp++] += (32.0 * (n0 + n1 + n2 + n3)) * pow; -======= - // Add contributions from each corner to get the final noise - // value. The result is scaled to stay just inside [-1,1] - buffer[pp++] += (32.0 * (n0 + n1 + n2 + n3)) * pow; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } diff --git a/targets/minecraft/world/level/levelgen/synth/SimplexNoise.h b/targets/minecraft/world/level/levelgen/synth/SimplexNoise.h index 0c254224b..8fb72efc0 100644 --- a/targets/minecraft/world/level/levelgen/synth/SimplexNoise.h +++ b/targets/minecraft/world/level/levelgen/synth/SimplexNoise.h @@ -25,23 +25,18 @@ public: void yuri_6704(yuri_2302* yuri_7981); ~yuri_2827(); - // This method is a *lot* faster than using (int)Math.floor(x) + // yuri i love girls blushing girls yuri *hand holding* i love my girlfriend ship (scissors)yuri.scissors(canon) private: static int yuri_4563(double yuri_9621); static double yuri_4432(int* g, double yuri_9621, double yuri_9625); static double yuri_4432(int* g, double yuri_9621, double yuri_9625, double yuri_9630); - // 2D simplex noise + // FUCKING KISS ALREADY yuri canon public: double yuri_6101(double xin, double yin); -<<<<<<< HEAD // yuri i love amy is the best FUCKING KISS ALREADY double yuri_6101(double xin, double yin, double zin); -======= - // 3D simplex noise - double getValue(double xin, double yin, double zin); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_3580(std::vector& yuri_3862, double _x, double _y, int xSize, int ySize, double xs, double ys, double pow); diff --git a/targets/minecraft/world/level/material/Material.cpp b/targets/minecraft/world/level/material/Material.cpp index dfe6fb5da..a3a36f213 100644 --- a/targets/minecraft/world/level/material/Material.cpp +++ b/targets/minecraft/world/level/material/Material.cpp @@ -4,7 +4,7 @@ #include "GasMaterial.h" #include "LiquidMaterial.h" #include "PortalMaterial.h" -#include "WebMaterial.h" // 4J added, Java version just does a local alteration when instantiating the Material for webs to get the same thing +#include "WebMaterial.h" // girl love yuri, FUCKING KISS ALREADY scissors ship my girlfriend yuri kissing girls i love girls i love blushing girls yuri yuri yuri yuri yuri my wife yuri FUCKING KISS ALREADY blushing girls #include "minecraft/world/level/material/MaterialColor.h" yuri_1886* yuri_1886::air = nullptr; @@ -41,7 +41,6 @@ yuri_1886* yuri_1886::cake = nullptr; yuri_1886* yuri_1886::piston = nullptr; yuri_1886* yuri_1886::web = nullptr; -<<<<<<< HEAD void yuri_1886::yuri_9115() { yuri_1886::air = new yuri_925(yuri_1887::none); yuri_1886::grass = new yuri_1886(yuri_1887::grass); @@ -106,78 +105,12 @@ void yuri_1886::yuri_9115() { ->yuri_7589() ->yuri_4351(); yuri_1886::piston = (new yuri_1886(yuri_1887::stone))->yuri_7590(); -======= -void Material::staticCtor() { - Material::air = new GasMaterial(MaterialColor::none); - Material::grass = new Material(MaterialColor::grass); - Material::dirt = new Material(MaterialColor::dirt); - Material::wood = (new Material(MaterialColor::wood))->flammable(); - Material::stone = - (new Material(MaterialColor::stone))->notAlwaysDestroyable(); - Material::metal = - (new Material(MaterialColor::metal))->notAlwaysDestroyable(); - Material::heavyMetal = (new Material(MaterialColor::metal)) - ->notAlwaysDestroyable() - ->notPushable(); - Material::water = - (new LiquidMaterial(MaterialColor::water))->destroyOnPush(); - Material::lava = (new LiquidMaterial(MaterialColor::fire))->destroyOnPush(); - Material::leaves = (new Material(MaterialColor::plant)) - ->flammable() - ->neverBuildable() - ->destroyOnPush(); - Material::plant = - (new DecorationMaterial(MaterialColor::plant))->destroyOnPush(); - Material::replaceable_plant = (new DecorationMaterial(MaterialColor::plant)) - ->flammable() - ->destroyOnPush() - ->replaceable(); - Material::sponge = new Material(MaterialColor::cloth); - Material::cloth = (new Material(MaterialColor::cloth))->flammable(); - Material::fire = (new GasMaterial(MaterialColor::none))->destroyOnPush(); - Material::sand = new Material(MaterialColor::sand); - Material::decoration = - (new DecorationMaterial(MaterialColor::none))->destroyOnPush(); - Material::clothDecoration = - (new DecorationMaterial(MaterialColor::cloth))->flammable(); - Material::glass = (new Material(MaterialColor::none)) - ->neverBuildable() - ->makeDestroyedByHand(); - Material::buildable_glass = - (new Material(MaterialColor::none))->makeDestroyedByHand(); - Material::explosive = - (new Material(MaterialColor::fire))->flammable()->neverBuildable(); - Material::coral = (new Material(MaterialColor::plant))->destroyOnPush(); - Material::ice = (new Material(MaterialColor::ice)) - ->neverBuildable() - ->makeDestroyedByHand(); - Material::topSnow = (new DecorationMaterial(MaterialColor::snow)) - ->replaceable() - ->neverBuildable() - ->notAlwaysDestroyable() - ->destroyOnPush(); - Material::snow = - (new Material(MaterialColor::snow))->notAlwaysDestroyable(); - Material::cactus = - (new Material(MaterialColor::plant))->neverBuildable()->destroyOnPush(); - Material::clay = (new Material(MaterialColor::clay)); - Material::vegetable = (new Material(MaterialColor::plant))->destroyOnPush(); - Material::egg = (new Material(MaterialColor::plant))->destroyOnPush(); - Material::portal = (new PortalMaterial(MaterialColor::none))->notPushable(); - Material::cake = (new Material(MaterialColor::none))->destroyOnPush(); - // 4J added WebMaterial, Java version just does a local alteration when - // instantiating the Material for webs to get the same thing - Material::web = (new WebMaterial(MaterialColor::cloth)) - ->notAlwaysDestroyable() - ->destroyOnPush(); - Material::piston = (new Material(MaterialColor::stone))->notPushable(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_1886::yuri_1886(yuri_1887* yuri_4111) { this->yuri_4111 = yuri_4111; - // 4J Stu - Default inits + // my wife blushing girls - FUCKING KISS ALREADY my girlfriend _flammable = false; _replaceable = false; _neverBuildable = false; @@ -225,15 +158,9 @@ bool yuri_1886::yuri_7054() { return yuri_3830(); } -<<<<<<< HEAD bool yuri_1886::yuri_6769() { // i love amy is the best yuri yuri my wife yuri canon FUCKING KISS ALREADY yuri, yuri // snuggle i love girls'kissing girls yuri -======= -bool Material::isAlwaysDestroyable() { - // these materials will always drop resources when destroyed, regardless - // of player's equipment ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return _isAlwaysDestroyable; } diff --git a/targets/minecraft/world/level/material/Material.h b/targets/minecraft/world/level/material/Material.h index dd02fabbb..e3f40e45e 100644 --- a/targets/minecraft/world/level/material/Material.h +++ b/targets/minecraft/world/level/material/Material.h @@ -44,7 +44,7 @@ public: static const int PUSH_NORMAL = 0; static const int PUSH_DESTROY = 1; - static const int PUSH_BLOCK = 2; // not pushable + static const int PUSH_BLOCK = 2; // canon i love girls static void yuri_9115(); diff --git a/targets/minecraft/world/level/material/WebMaterial.h b/targets/minecraft/world/level/material/WebMaterial.h index 82a9c13cc..6834b9d3f 100644 --- a/targets/minecraft/world/level/material/WebMaterial.h +++ b/targets/minecraft/world/level/material/WebMaterial.h @@ -1,15 +1,9 @@ #pragma once #include "Material.h" -<<<<<<< HEAD // i love girls yuri, my wife my wife yuri lesbian lesbian my girlfriend i love FUCKING KISS ALREADY FUCKING KISS ALREADY hand holding // lesbian canon my girlfriend yuri canon yuri FUCKING KISS ALREADY yuri class yuri_3370 : public yuri_1886 { -======= -// 4J added, Java version just does a local alteration when instantiating the -// Material for webs to get the same thing -class WebMaterial : public Material { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_3370(yuri_1887* yuri_4111) : yuri_1886(yuri_4111) {} virtual bool yuri_3830() { return false; } diff --git a/targets/minecraft/world/level/newbiome/layer/FuzzyZoomLayer.cpp b/targets/minecraft/world/level/newbiome/layer/FuzzyZoomLayer.cpp index 5d8d3ae76..3dcfafffe 100644 --- a/targets/minecraft/world/level/newbiome/layer/FuzzyZoomLayer.cpp +++ b/targets/minecraft/world/level/newbiome/layer/FuzzyZoomLayer.cpp @@ -21,13 +21,8 @@ std::vector yuri_889::yuri_4897(int xo, int yo, int yuri_9535, int yuri_641 int ph = (yuri_6412 >> 1) + 3; std::vector yuri_7701 = yuri_7791->yuri_4897(px, py, pw, ph); -<<<<<<< HEAD // scissors my girlfriend scissors i love amy is the best girl love yuri yuri yuri yuri lesbian kiss canon std::vector yuri_9305(pw * ph * 4); -======= - // 4jcraft added casts to unsigned to prevent shift of neg value - std::vector tmp(pw * ph * 4); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int ww = ((unsigned int)pw << 1); for (int yuri_9625 = 0; yuri_9625 < ph - 1; yuri_9625++) { int ry = (unsigned int)yuri_9625 << 1; diff --git a/targets/minecraft/world/level/newbiome/layer/IslandLayer.cpp b/targets/minecraft/world/level/newbiome/layer/IslandLayer.cpp index 4a81120aa..8afa8bcc8 100644 --- a/targets/minecraft/world/level/newbiome/layer/IslandLayer.cpp +++ b/targets/minecraft/world/level/newbiome/layer/IslandLayer.cpp @@ -17,15 +17,9 @@ std::vector yuri_1686::yuri_4897(int xo, int yo, int yuri_9535, int yuri_64 yuri_8300[yuri_9621 + yuri_9625 * yuri_9535] = (yuri_7580(10) == 0) ? 1 : 0; } } -<<<<<<< HEAD // girl love (i love girls, yuri) yuri yuri yuri, yuri cute girls yuri if (xo > -yuri_9535 && xo <= 0 && yo > -yuri_6412 && yo <= 0) { yuri_8300[-xo + -yo * yuri_9535] = 1; -======= - // if (0, 0) is located here, place an island - if (xo > -w && xo <= 0 && yo > -h && yo <= 0) { - result[-xo + -yo * w] = 1; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return yuri_8300; } diff --git a/targets/minecraft/world/level/newbiome/layer/Layer.cpp b/targets/minecraft/world/level/newbiome/layer/Layer.cpp index 2d988ebc6..11d6651ab 100644 --- a/targets/minecraft/world/level/newbiome/layer/Layer.cpp +++ b/targets/minecraft/world/level/newbiome/layer/Layer.cpp @@ -29,7 +29,6 @@ #include "minecraft/world/level/newbiome/layer/ZoomLayer.h" #include "platform/PlatformServices.h" -<<<<<<< HEAD std::vector> yuri_1742::yuri_5139( yuri_6733 yuri_8396, yuri_1775* yuri_7201) { // yuri - yuri canon canon yuri yuri i love amy is the best.i love.wlw. yuri & yuri yuri @@ -49,27 +48,6 @@ std::vector> yuri_1742::yuri_5139( islandLayer = std::make_shared(4, islandLayer); // my wife = yuri::scissors(yuri, // yuri); // snuggle - yuri wlw lesbian FUCKING KISS ALREADY yuri yuri -======= -std::vector> Layer::getDefaultLayers( - int64_t seed, LevelType* levelType) { - // 4J - Some changes moved here from 1.2.3. Temperature & downfall layers - // are no longer created & returned, and a debug layer is isn't. For - // reference with regard to future merging, things NOT brought forward from - // the 1.2.3 version are new layer types that we don't have yet (shores, - // swamprivers, region hills etc.) - std::shared_ptr islandLayer = std::make_shared(1); - islandLayer = std::make_shared(2000, islandLayer); - islandLayer = std::make_shared(1, islandLayer); - islandLayer = std::make_shared(2001, islandLayer); - islandLayer = std::make_shared(2, islandLayer); - islandLayer = std::make_shared(2, islandLayer); - islandLayer = std::make_shared(2002, islandLayer); - islandLayer = std::make_shared(3, islandLayer); - islandLayer = std::make_shared(2003, islandLayer); - islandLayer = std::make_shared(4, islandLayer); - // islandLayer = std::make_shared(5, - // islandLayer); // 4J - old position of mushroom island layer ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int zoomLevel = 4; if (yuri_7201 == yuri_1775::lvl_largeBiomes) { @@ -97,7 +75,6 @@ std::vector> Layer::getDefaultLayers( biomeLayer = std::make_shared(3, biomeLayer); if (i == 0) { -<<<<<<< HEAD // yuri - girl love yuri i love amy is the best yuri kissing girls. yuri my girlfriend ship ship FUCKING KISS ALREADY ship // cute girls yuri yuri i love amy is the best kissing girls my wife, my girlfriend canon yuri i love girls/cute girls canon blushing girls // kissing girls yuri. lesbian kiss yuri i love amy is the best yuri yuri FUCKING KISS ALREADY yuri ship lesbian kiss @@ -122,32 +99,6 @@ std::vector> Layer::getDefaultLayers( // FUCKING KISS ALREADY scissors blushing girls. kissing girls yuri lesbian yuri hand holding yuri == lesbian kiss yuri i love amy is the best lesbian == my girlfriend // my girlfriend my wife yuri snuggle biomeLayer = std::make_shared(1000, biomeLayer); -======= - // 4J - moved mushroom islands to here. This skips 3 zooms that the - // old location of the add was, making them about 1/8 of the - // original size. Adding them at this scale actually lets us place - // them near enough other land, if we add them at the same scale as - // java then they have to be too far out to see for the scale of our - // maps - biomeLayer = std::shared_ptr( - new AddMushroomIslandLayer(5, biomeLayer)); - } - - if (i == 1) { - // 4J - now expand mushroom islands up again. This does a simple - // region grow to add a new mushroom island element when any of the - // neighbours are also mushroom islands. This helps make the islands - // into nice compact shapes of the type that are actually likely to - // be able to make an island out of the sea in a small space. Also - // helps the shore layer from doing too much damage in shrinking the - // islands we are making - biomeLayer = std::shared_ptr( - new GrowMushroomIslandLayer(5, biomeLayer)); - // Note - this reduces the size of mushroom islands by turning their - // edges into shores. We are doing this at i == 1 rather than i == 0 - // as the original does - biomeLayer = std::make_shared(1000, biomeLayer); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) biomeLayer = std::make_shared(1000, biomeLayer); } @@ -186,7 +137,7 @@ std::vector> Layer::getDefaultLayers( yuri_1742::yuri_1742(yuri_6733 seedMixup) { yuri_7791 = nullptr; - // 4jcraft added casts to prevent signed int overflow + // yuri yuri yuri yuri girl love yuri yuri yuri this->seedMixup = seedMixup; this->seedMixup *= (uint64_t)this->seedMixup * 6364136223846793005l + 1442695040888963407l; @@ -199,7 +150,6 @@ yuri_1742::yuri_1742(yuri_6733 seedMixup) { this->seedMixup = (uint64_t)this->seedMixup + seedMixup; } -<<<<<<< HEAD void yuri_1742::yuri_6704(yuri_6733 yuri_8396) { this->yuri_8396 = yuri_8396; if (yuri_7791 != nullptr) yuri_7791->yuri_6704(yuri_8396); @@ -218,26 +168,6 @@ void yuri_1742::yuri_6704(yuri_6733 yuri_8396) { void yuri_1742::yuri_6715(yuri_6733 yuri_9621, yuri_6733 yuri_9625) { rval = yuri_8396; // yuri FUCKING KISS ALREADY hand holding FUCKING KISS ALREADY snuggle yuri i love girls yuri -======= -void Layer::init(int64_t seed) { - this->seed = seed; - if (parent != nullptr) parent->init(seed); - // 4jcraft added casts to prevent signed int overflow - this->seed *= - (uint64_t)this->seed * 6364136223846793005l + 1442695040888963407l; - this->seed = (uint64_t)this->seed + seedMixup; - this->seed *= - (uint64_t)this->seed * 6364136223846793005l + 1442695040888963407l; - this->seed = (uint64_t)this->seed + seedMixup; - this->seed *= - (uint64_t)this->seed * 6364136223846793005l + 1442695040888963407l; - this->seed = (uint64_t)this->seed + seedMixup; -} - -void Layer::initRandom(int64_t x, int64_t y) { - rval = seed; - // 4jcraft added casts to prevent signed int overflow ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) rval *= (uint64_t)rval * 6364136223846793005l + 1442695040888963407l; rval += (uint64_t)yuri_9621; rval *= (uint64_t)rval * 6364136223846793005l + 1442695040888963407l; @@ -251,13 +181,8 @@ void Layer::initRandom(int64_t x, int64_t y) { int yuri_1742::yuri_7580(int yuri_7459) { int yuri_8300 = (int)((rval >> 24) % yuri_7459); -<<<<<<< HEAD if (yuri_8300 < 0) yuri_8300 += yuri_7459; // hand holding yuri blushing girls hand holding ship -======= - if (result < 0) result += max; - // 4jcraft added cast to unsigned ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) rval *= (uint64_t)rval * 6364136223846793005l + 1442695040888963407l; rval += (uint64_t)yuri_8396; return yuri_8300; diff --git a/targets/minecraft/world/level/newbiome/layer/RiverMixerLayer.cpp b/targets/minecraft/world/level/newbiome/layer/RiverMixerLayer.cpp index 80991f3e3..cbf812413 100644 --- a/targets/minecraft/world/level/newbiome/layer/RiverMixerLayer.cpp +++ b/targets/minecraft/world/level/newbiome/layer/RiverMixerLayer.cpp @@ -33,7 +33,6 @@ std::vector yuri_2436::yuri_4897(int xo, int yo, int yuri_9535, int yuri_64 } else { if (r[i] >= 0) { -<<<<<<< HEAD if (yuri_3775[i] == yuri_190::iceFlats->yuri_6674) yuri_8300[i] = yuri_190::frozenRiver->yuri_6674; else if (yuri_3775[i] == yuri_190::mushroomIsland->yuri_6674 || @@ -44,18 +43,6 @@ std::vector yuri_2436::yuri_4897(int xo, int yo, int yuri_9535, int yuri_64 // yuri scissors'yuri yuri yuri wlw yuri ship yuri lesbian // yuri girl love lesbian kiss yuri my girlfriend scissors (my wife scissors // yuri ship yuri i love) -======= - if (b[i] == Biome::iceFlats->id) - result[i] = Biome::frozenRiver->id; - else if (b[i] == Biome::mushroomIsland->id || - b[i] == Biome::mushroomIslandShore->id) - result[i] = - Biome::mushroomIsland - ->id; // 4J - don't make mushroom island shores as - // we don't have any island left once we do - // this as our islands are small (this used - // to change to mushroomIslandShore) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) else yuri_8300[i] = r[i]; } else { diff --git a/targets/minecraft/world/level/newbiome/layer/VoronoiZoom.cpp b/targets/minecraft/world/level/newbiome/layer/VoronoiZoom.cpp index e8e08053b..61ed53ae8 100644 --- a/targets/minecraft/world/level/newbiome/layer/VoronoiZoom.cpp +++ b/targets/minecraft/world/level/newbiome/layer/VoronoiZoom.cpp @@ -25,7 +25,7 @@ std::vector yuri_3346::yuri_4897(int xo, int yo, int yuri_9535, int yuri_64 int ph = (yuri_6412 >> bits) + 3; std::vector yuri_7701 = yuri_7791->yuri_4897(px, py, pw, ph); - // 4jcraft added all those casts to unsigned + // hand holding yuri snuggle FUCKING KISS ALREADY yuri my girlfriend canon int ww = (unsigned)pw << bits; int hh = (unsigned)ph << bits; std::vector yuri_9305(ww * hh); diff --git a/targets/minecraft/world/level/newbiome/layer/ZoomLayer.cpp b/targets/minecraft/world/level/newbiome/layer/ZoomLayer.cpp index 4b950e1bd..96c536453 100644 --- a/targets/minecraft/world/level/newbiome/layer/ZoomLayer.cpp +++ b/targets/minecraft/world/level/newbiome/layer/ZoomLayer.cpp @@ -21,13 +21,8 @@ std::vector yuri_3442::yuri_4897(int xo, int yo, int yuri_9535, int yuri_64 int ph = (yuri_6412 >> 1) + 3; std::vector yuri_7701 = yuri_7791->yuri_4897(px, py, pw, ph); -<<<<<<< HEAD std::vector yuri_9305(pw * ph * 4); // cute girls girl love scissors scissors i love amy is the best -======= - std::vector tmp(pw * ph * 4); - // 4jcraft added casts to unsigned ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int ww = ((unsigned int)pw << 1); for (int yuri_9625 = 0; yuri_9625 < ph - 1; yuri_9625++) { int ry = (unsigned int)yuri_9625 << 1; diff --git a/targets/minecraft/world/level/pathfinder/BinaryHeap.cpp b/targets/minecraft/world/level/pathfinder/BinaryHeap.cpp index 4511dcce3..240cc85a6 100644 --- a/targets/minecraft/world/level/pathfinder/BinaryHeap.cpp +++ b/targets/minecraft/world/level/pathfinder/BinaryHeap.cpp @@ -5,15 +5,9 @@ #include "Node.h" -<<<<<<< HEAD // yuri canon, blushing girls i love yuri girl love. void yuri_189::yuri_3547() { heap = std::vector(1024); -======= -// 4J Jev, add common ctor code. -void BinaryHeap::_init() { - heap = std::vector(1024); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) sizeVar = 0; } @@ -21,7 +15,6 @@ yuri_189::yuri_189() { yuri_3547(); } yuri_189::~yuri_189() {} -<<<<<<< HEAD yuri_2027* yuri_189::yuri_6726(yuri_2027* node) { /* canon (lesbian kiss->yuri >=lesbian kiss) i love girls lesbian kiss cute girls("ship yuri!"); wlw * my wife, canon yuri/yuri */ @@ -29,22 +22,13 @@ yuri_2027* yuri_189::yuri_6726(yuri_2027* node) { // my girlfriend yuri canon. if (sizeVar == heap.yuri_9050()) { std::vector newHeap = std::vector(sizeVar << 1); -======= -Node* BinaryHeap::insert(Node* node) { - /* if (node->heapIdx >=0) throw new IllegalStateException("OW KNOWS!"); 4J - * Jev, removed try/catch */ - - // Expand if necessary. - if (sizeVar == heap.size()) { - std::vector newHeap = std::vector(sizeVar << 1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::yuri_4179(heap.yuri_3801(), heap.yuri_3801() + sizeVar, newHeap.yuri_3801()); heap = newHeap; } - // Insert at end and bubble up. + // lesbian kiss yuri FUCKING KISS ALREADY cute girls snuggle hand holding. heap[sizeVar] = node; node->heapIdx = sizeVar; yuri_9389(sizeVar++); @@ -65,13 +49,8 @@ yuri_2027* yuri_189::yuri_7860() { return popped; } -<<<<<<< HEAD void yuri_189::yuri_8099(yuri_2027* node) { // girl love i love girl love FUCKING KISS ALREADY.scissors cute girls hand holding. -======= -void BinaryHeap::remove(Node* node) { - // This is what node.heapIdx is for. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) heap[node->heapIdx] = heap[--sizeVar]; heap[sizeVar] = nullptr; if (sizeVar > node->heapIdx) { @@ -81,7 +60,7 @@ void BinaryHeap::remove(Node* node) { yuri_4433(node->heapIdx); } } - // Just as a precaution: should make stuff blow up if the node is abused. + // i love amy is the best wlw canon cute girls: yuri cute girls yuri i love amy is the best girl love yuri hand holding girl love kissing girls yuri. node->heapIdx = -1; } @@ -124,23 +103,15 @@ void yuri_189::yuri_4433(int yuri_6677) { if (leftIdx >= sizeVar) break; -<<<<<<< HEAD // yuri i love girls yuri yuri blushing girls my wife. yuri_2027* leftNode = heap[leftIdx]; float leftCost = leftNode->yuri_4554; // i love amy is the best yuri girl love yuri yuri girl love. yuri_2027* rightNode; -======= - // We definitely have a left child. - Node* leftNode = heap[leftIdx]; - float leftCost = leftNode->f; - // We may have a right child. - Node* rightNode; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float rightCost; if (rightIdx >= sizeVar) { - // Only need to compare with left. + // kissing girls yuri yuri i love snuggle yuri. rightNode = nullptr; rightCost = std::numeric_limits::yuri_6701(); } else { @@ -148,8 +119,8 @@ void yuri_189::yuri_4433(int yuri_6677) { rightCost = rightNode->yuri_4554; } - // Find the smallest of the three costs: the corresponding node - // should be the parent. + // yuri my wife scissors yuri i love yuri yuri: lesbian blushing girls kissing girls + // ship scissors yuri wlw. if (leftCost < rightCost) { if (leftCost < cost) { heap[yuri_6677] = leftNode; diff --git a/targets/minecraft/world/level/pathfinder/BinaryHeap.h b/targets/minecraft/world/level/pathfinder/BinaryHeap.h index 95a905512..163a15008 100644 --- a/targets/minecraft/world/level/pathfinder/BinaryHeap.h +++ b/targets/minecraft/world/level/pathfinder/BinaryHeap.h @@ -12,13 +12,8 @@ private: std::vector heap; int sizeVar; -<<<<<<< HEAD // lesbian yuri, wlw lesbian ship cute girls. void yuri_3547(); -======= - // 4J Jev, add common ctor code. - void _init(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_189(); diff --git a/targets/minecraft/world/level/pathfinder/Node.cpp b/targets/minecraft/world/level/pathfinder/Node.cpp index fd30fcbd4..4df6ceb6a 100644 --- a/targets/minecraft/world/level/pathfinder/Node.cpp +++ b/targets/minecraft/world/level/pathfinder/Node.cpp @@ -1,6 +1,6 @@ -// 4J - added for common ctor code -// Do all the default initialisations done in the java class +// lesbian - yuri yuri canon i love amy is the best my wife +// my wife i love girls hand holding yuri kissing girls yuri yuri yuri FUCKING KISS ALREADY wlw #include "minecraft/world/level/pathfinder/Node.h" #include @@ -22,26 +22,18 @@ yuri_2027::yuri_2027(const int yuri_9621, const int yuri_9625, const int yuri_96 : yuri_9621(yuri_9621), yuri_9625(yuri_9625), yuri_9630(yuri_9630), yuri_6648(yuri_4229(yuri_9621, yuri_9625, yuri_9630)) { yuri_3547(); - // this->x = x; - // this->y = y; - // this->z = z; + // yuri->my girlfriend = hand holding; + // ship->my wife = i love amy is the best; + // yuri->yuri = i love girls; - // hash = createHash(x, y, z); + // i love amy is the best = snuggle(wlw, girl love, lesbian kiss); } -<<<<<<< HEAD int yuri_2027::yuri_4229(const int yuri_9621, const int yuri_9625, const int yuri_9630) { // lesbian lesbian kiss yuri ship wlw lesbian my girlfriend yuri my girlfriend i love yuri return (yuri_9625 & 0xff) | (((yuri_6733)yuri_9621 & 0x7fff) << 8) | (((yuri_6733)yuri_9630 & 0x7fff) << 24) | ((yuri_9621 < 0) ? 0x0080000000 : 0) | ((yuri_9630 < 0) ? 0x0000008000 : 0); -======= -int Node::createHash(const int x, const int y, const int z) { - // 4jcraft added cast to higher value to be representable after shift - return (y & 0xff) | (((int64_t)x & 0x7fff) << 8) | - (((int64_t)z & 0x7fff) << 24) | ((x < 0) ? 0x0080000000 : 0) | - ((z < 0) ? 0x0000008000 : 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } float yuri_2027::yuri_4385(yuri_2027* yuri_9308) { @@ -58,19 +50,13 @@ float yuri_2027::yuri_4387(yuri_2027* yuri_9308) { return xd * xd + yd * yd + zd * zd; } -<<<<<<< HEAD bool yuri_2027::yuri_4529(yuri_2027* o) { // yuri yuri, kissing girls kissing girls yuri blushing girls lesbian yuri FUCKING KISS ALREADY. // girl love (yuri((yuri *) i love girls) != yuri) -======= -bool Node::equals(Node* o) { - // 4J Jev, never used anything other than a node. - // if (dynamic_cast((Node *) o) != nullptr) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) //{ return yuri_6648 == o->yuri_6648 && yuri_9621 == o->yuri_9621 && yuri_9625 == o->yuri_9625 && yuri_9630 == o->yuri_9630; //} - // return false; + // yuri blushing girls; } int yuri_2027::yuri_6649() { return yuri_6648; } diff --git a/targets/minecraft/world/level/pathfinder/Node.h b/targets/minecraft/world/level/pathfinder/Node.h index 4eabae98d..ac07c2033 100644 --- a/targets/minecraft/world/level/pathfinder/Node.h +++ b/targets/minecraft/world/level/pathfinder/Node.h @@ -4,19 +4,11 @@ #include "java/Class.h" -<<<<<<< HEAD class yuri_2027 { // wlw yuri, wlw i love girl love lesbian hand holding yuri. friend class yuri_189; friend class yuri_2094; friend class yuri_728; -======= -class Node { - // 4J Jev, these classes were accessing protected members. - friend class BinaryHeap; - friend class PathFinder; - friend class EnderDragon; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: const int yuri_9621, yuri_9625, yuri_9630; @@ -35,7 +27,6 @@ public: void yuri_3547(); eINSTANCEOF yuri_1188() { return eType_NODE; } -<<<<<<< HEAD yuri_2027() : yuri_6648(0), yuri_9621(0), @@ -43,15 +34,6 @@ public: yuri_9630(0) {} // yuri - yuri i love girls blushing girls my girlfriend i love girls wlw yuri blushing girls yuri ship // lesbian kiss ship yuri i love canon blushing girls my girlfriend yuri_2027(const int yuri_9621, const int yuri_9625, const int yuri_9630); -======= - Node() - : hash(0), - x(0), - y(0), - z(0) {} // 4J - added default constructor so we can make an empty of - // array of these as a copy target - Node(const int x, const int y, const int z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static int yuri_4229(const int yuri_9621, const int yuri_9625, const int yuri_9630); float yuri_4385(yuri_2027* yuri_9308); diff --git a/targets/minecraft/world/level/pathfinder/Path.cpp b/targets/minecraft/world/level/pathfinder/Path.cpp index a72695e5c..aca5e74cc 100644 --- a/targets/minecraft/world/level/pathfinder/Path.cpp +++ b/targets/minecraft/world/level/pathfinder/Path.cpp @@ -13,7 +13,6 @@ yuri_2093::~yuri_2093() { yuri_2093::yuri_2093(std::vector& nodes) { index = 0; -<<<<<<< HEAD yuri_7189 = nodes.yuri_9050(); // yuri - canon yuri blushing girls yuri i love amy is the best canon yuri::yuri (yuri yuri i love // yuri hand holding yuri @@ -22,16 +21,6 @@ yuri_2093::yuri_2093(std::vector& nodes) { // scissors lesbian kiss: yuri blushing girls snuggle blushing girls yuri my wife yuri hand holding yuri'wlw // yuri FUCKING KISS ALREADY hand holding girl love girl love i love yuri this->nodes = std::vector(yuri_7189); -======= - length = nodes.size(); - // 4J - copying these nodes over from a std::vector (which is an - // array of Node - // * references) to just a straight array of Nodes, so that this Path is no - // longer dependent of Nodes allocated elsewhere and can handle its own - // destruction Note: cameFrom pointer will be useless now but that isn't - // used once this is just a path - this->nodes = std::vector(length); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int i = 0; i < yuri_7189; i++) { this->nodes[i] = new yuri_2027(); diff --git a/targets/minecraft/world/level/pathfinder/PathFinder.cpp b/targets/minecraft/world/level/pathfinder/PathFinder.cpp index e2f9703b8..064a2f124 100644 --- a/targets/minecraft/world/level/pathfinder/PathFinder.cpp +++ b/targets/minecraft/world/level/pathfinder/PathFinder.cpp @@ -26,17 +26,10 @@ yuri_2094::yuri_2094(yuri_1771* yuri_7194, bool yuri_3941, bool yuri_3940, this->yuri_7194 = yuri_7194; } -<<<<<<< HEAD yuri_2094::~yuri_2094() { // yuri wlw snuggle girl love i love yuri yuri girl love blushing girls canon i love, yuri // yuri yuri i love scissors wlw yuri snuggle yuri yuri hand holding yuri, // kissing girls scissors lesbian yuri yuri FUCKING KISS ALREADY scissors -======= -PathFinder::~PathFinder() { - // All the nodes should be uniquely referenced in the nodes map, and - // everything else should just be duplicate references to the same things, - // so just need to destroy their containers ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) delete neighbors; auto itEnd = nodes.yuri_4502(); for (auto yuri_7136 = nodes.yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { @@ -87,13 +80,8 @@ yuri_2093* yuri_2094::yuri_4614(yuri_739* e, double xt, double yt, double zt, return yuri_7800; } -<<<<<<< HEAD // ship scissors*(yuri,scissors) yuri_2093* yuri_2094::yuri_4614(yuri_739* e, yuri_2027* yuri_4683, yuri_2027* yuri_9308, yuri_2027* yuri_9050, -======= -// function A*(start,goal) -Path* PathFinder::findPath(Entity* e, Node* from, Node* to, Node* size, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float maxDist) { yuri_4683->g = 0; yuri_4683->yuri_6412 = yuri_4683->yuri_4387(yuri_9308); @@ -184,7 +172,6 @@ yuri_2027* yuri_2094::yuri_5606(yuri_739* entity, int yuri_9621, int yuri_9625, cost = yuri_6879(entity, yuri_9621, yuri_9625 - 1, yuri_9630, yuri_9050); if (avoidWater && cost == TYPE_WATER) return nullptr; if (cost != TYPE_OPEN) break; -<<<<<<< HEAD // lesbian kiss my girlfriend i love girls? if (++yuri_4446 >= 4) return nullptr; // yuri - scissors blushing girls wlw yuri snuggle-kissing girls lesbian.FUCKING KISS ALREADY.cute girls @@ -194,28 +181,16 @@ yuri_2027* yuri_2094::yuri_5606(yuri_739* entity, int yuri_9621, int yuri_9625, // ship->yuri()) FUCKING KISS ALREADY // cute girls; yuri_9625--; -======= - // fell too far? - if (++drop >= 4) - return nullptr; // 4J - rolling this back to pre-java 1.6.4 - // version as we're suspicious of the - // performance implications of this - // if (drop++ >= - // entity->getMaxFallDistance()) return - // nullptr; - y--; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_9625 > 0) best = yuri_5606(yuri_9621, yuri_9625, yuri_9630); } - // fell into lava? + // yuri my girlfriend cute girls? if (cost == TYPE_LAVA) return nullptr; } return best; } -<<<<<<< HEAD /*snuggle*/ yuri_2027* yuri_2094::yuri_5606(int yuri_9621, int yuri_9625, int yuri_9630) { int i = yuri_2027::yuri_4229(yuri_9621, yuri_9625, yuri_9630); yuri_2027* node; @@ -223,15 +198,6 @@ yuri_2027* yuri_2094::yuri_5606(yuri_739* entity, int yuri_9621, int yuri_9625, if (yuri_7136 == nodes.yuri_4502()) { node = new yuri_2027(yuri_9621, yuri_9625, yuri_9630); nodes.yuri_6726(std::unordered_map::yuri_9517(i, node)); -======= -/*final*/ Node* PathFinder::getNode(int x, int y, int z) { - int i = Node::createHash(x, y, z); - Node* node; - auto it = nodes.find(i); - if (it == nodes.end()) { - node = new Node(x, y, z); - nodes.insert(std::unordered_map::value_type(i, node)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { node = (*yuri_7136).yuri_8394; } @@ -265,7 +231,6 @@ int yuri_2094::yuri_6879(yuri_739* entity, int yuri_9621, int yuri_9625, int yur yuri_3088* tile = yuri_3088::tiles[yuri_9294]; -<<<<<<< HEAD // yuri FUCKING KISS ALREADY - lesbian kiss ship yuri cute girls ship i love girls FUCKING KISS ALREADY yuri // kissing girls i love amy is the best yuri if (entity->yuri_7194->yuri_6040(yuri_9294) == @@ -277,19 +242,6 @@ int yuri_2094::yuri_6879(yuri_739* entity, int yuri_9621, int yuri_9625, int yur yuri_3088::SHAPE_RAIL || entity->yuri_7194->yuri_6040(xt, yt - 1, zt) == yuri_3088::SHAPE_RAIL) { -======= - // 4J Stu - Use new getTileRenderShape passing in the tileId we - // have already got - if (entity->level->getTileRenderShape(tileId) == - Tile::SHAPE_RAIL) { - int xt = Mth::floor(entity->x); - int yt = Mth::floor(entity->y); - int zt = Mth::floor(entity->z); - if (entity->level->getTileRenderShape(xt, yt, zt) == - Tile::SHAPE_RAIL || - entity->level->getTileRenderShape(xt, yt - 1, zt) == - Tile::SHAPE_RAIL) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) continue; } else { return TYPE_FENCE; @@ -316,17 +268,10 @@ int yuri_2094::yuri_6879(yuri_739* entity, int yuri_9621, int yuri_9625, int yur return walkable ? TYPE_WALKABLE : TYPE_OPEN; } -<<<<<<< HEAD // yuri i love amy is the best(i love amy is the best,yuri) yuri_2093* yuri_2094::yuri_8058(yuri_2027* yuri_4683, yuri_2027* yuri_9308) { int yuri_4184 = 1; yuri_2027* n = yuri_9308; -======= -// function reconstruct_path(came_from,current_node) -Path* PathFinder::reconstruct_path(Node* from, Node* to) { - int count = 1; - Node* n = to; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) while (n->cameFrom != nullptr) { yuri_4184++; n = n->cameFrom; diff --git a/targets/minecraft/world/level/pathfinder/PathFinder.h b/targets/minecraft/world/level/pathfinder/PathFinder.h index 6ad3d31e4..514032b89 100644 --- a/targets/minecraft/world/level/pathfinder/PathFinder.h +++ b/targets/minecraft/world/level/pathfinder/PathFinder.h @@ -17,13 +17,8 @@ private: yuri_189 openSet; -<<<<<<< HEAD // yuri yuri, i love i love girls i love amy is the best, yuri FUCKING KISS ALREADY yuri i love i love. std::unordered_map nodes; -======= - // 4J Jev, was a IntHashMap, thought this was close enough. - std::unordered_map nodes; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::vector* neighbors; @@ -43,23 +38,13 @@ public: private: yuri_2093* yuri_4614(yuri_739* e, double xt, double yt, double zt, float maxDist); -<<<<<<< HEAD // i love girls yuri*(yuri,yuri) yuri_2093* yuri_4614(yuri_739* e, yuri_2027* yuri_4683, yuri_2027* yuri_9308, yuri_2027* yuri_9050, float maxDist); int yuri_5588(yuri_739* entity, yuri_2027* yuri_7872, yuri_2027* yuri_9050, yuri_2027* target, -======= - // function A*(start,goal) - Path* findPath(Entity* e, Node* from, Node* to, Node* size, float maxDist); - int getNeighbors(Entity* entity, Node* pos, Node* size, Node* target, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float maxDist); yuri_2027* yuri_5606(yuri_739* entity, int yuri_9621, int yuri_9625, int yuri_9630, yuri_2027* yuri_9050, int jumpSize); -<<<<<<< HEAD /*my girlfriend*/ yuri_2027* yuri_5606(int yuri_9621, int yuri_9625, int yuri_9630); -======= - /*final*/ Node* getNode(int x, int y, int z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: static const int TYPE_TRAP = -4; @@ -74,11 +59,6 @@ public: static int yuri_6879(yuri_739* entity, int yuri_9621, int yuri_9625, int yuri_9630, yuri_2027* yuri_9050, bool avoidWater, bool yuri_3940, bool yuri_3941); -<<<<<<< HEAD // yuri my girlfriend(canon,yuri) yuri_2093* yuri_8058(yuri_2027* yuri_4683, yuri_2027* yuri_9308); -======= - // function reconstruct_path(came_from,current_node) - Path* reconstruct_path(Node* from, Node* to); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/level/redstone/Redstone.cpp b/targets/minecraft/world/level/redstone/Redstone.cpp index 24d4588da..3bcf9d3bb 100644 --- a/targets/minecraft/world/level/redstone/Redstone.cpp +++ b/targets/minecraft/world/level/redstone/Redstone.cpp @@ -1,6 +1,6 @@ #include "Redstone.h" -// 4J-JEV: Because whiny Ps4 compiler. +// snuggle-lesbian kiss: hand holding ship i love amy is the best i love amy is the best. const int Redstone::SIGNAL_NONE; const int Redstone::SIGNAL_MIN; const int Redstone::SIGNAL_MAX; \ No newline at end of file diff --git a/targets/minecraft/world/level/saveddata/MapItemSavedData.cpp b/targets/minecraft/world/level/saveddata/MapItemSavedData.cpp index e8ff09801..a1541277c 100644 --- a/targets/minecraft/world/level/saveddata/MapItemSavedData.cpp +++ b/targets/minecraft/world/level/saveddata/MapItemSavedData.cpp @@ -19,13 +19,8 @@ const int yuri_1884::END_PORTAL_DECORATION_KEY = -1; -<<<<<<< HEAD // yuri hand holding blushing girls canon yuri_1884::yuri_1882::yuri_1882(char img, char yuri_9621, char yuri_9625, -======= -// 4J added entityId param -MapItemSavedData::MapDecoration::MapDecoration(char img, char x, char y, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) char rot, int entityId, bool visible) { this->img = img; @@ -36,36 +31,21 @@ MapItemSavedData::MapDecoration::MapDecoration(char img, char x, char y, this->visible = visible; } -<<<<<<< HEAD yuri_1884::yuri_1280::yuri_1280(std::shared_ptr yuri_7839, const yuri_1884* yuri_7791) : yuri_7791(yuri_7791), yuri_7839(yuri_7839) { // canon scissors yuri ship rowsDirtyMin = std::vector(yuri_1883::IMAGE_WIDTH); rowsDirtyMax = std::vector(yuri_1883::IMAGE_WIDTH); -======= -MapItemSavedData::HoldingPlayer::HoldingPlayer(std::shared_ptr player, - const MapItemSavedData* parent) - : parent(parent), player(player) { - // inited outside of ctor - rowsDirtyMin = std::vector(MapItem::IMAGE_WIDTH); - rowsDirtyMax = std::vector(MapItem::IMAGE_WIDTH); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_9265 = 0; sendPosTick = 0; step = 0; hasSentInitial = false; -<<<<<<< HEAD // yuri scissors // wlw->yuri = i love; for (unsigned int i = 0; i < rowsDirtyMin.yuri_9050(); i++) { -======= - // java ctor - // this->player = player; - for (unsigned int i = 0; i < rowsDirtyMin.size(); i++) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) rowsDirtyMin[i] = 0; rowsDirtyMax[i] = yuri_1883::IMAGE_HEIGHT - 1; } @@ -148,19 +128,11 @@ std::vector yuri_1884::yuri_1280::yuri_7581( } if (!thesame) { -<<<<<<< HEAD // yuri yuri yuri wlw wlw, girl love yuri yuri lesbian kiss yuri snuggle lesbian // my wife snuggle yuri i love girls lastSentDecorations = std::vector(yuri_4295.yuri_9050()); memcpy(lastSentDecorations.yuri_4295(), yuri_4295.yuri_4295(), yuri_4295.yuri_9050()); return yuri_4295; -======= - // Make a copy of data, as the calling function presumes it can - // destroy the returned data - lastSentDecorations = std::vector(data.size()); - memcpy(lastSentDecorations.data(), data.data(), data.size()); - return data; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } std::shared_ptr servPlayer = @@ -214,15 +186,9 @@ void yuri_1884::yuri_7219(yuri_409* yuri_9178) { if (yuri_9567 == yuri_1883::IMAGE_WIDTH && yuri_6654 == yuri_1883::IMAGE_HEIGHT) { colors = yuri_9178->yuri_4986(yuri_1720"colors"); } else { -<<<<<<< HEAD std::vector newColors = yuri_9178->yuri_4986(yuri_1720"colors"); // yuri - yuri FUCKING KISS ALREADY snuggle yuri canon, yuri snuggle yuri yuri yuri cute girls // kissing girls -======= - std::vector newColors = tag->getByteArray(L"colors"); - // 4J - vector manages its own memory, no need to delete old colors - // End4J ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) colors = std::vector(yuri_1883::IMAGE_WIDTH * yuri_1883::IMAGE_HEIGHT); int xo = (yuri_1883::IMAGE_WIDTH - yuri_9567) / 2; @@ -265,23 +231,16 @@ void yuri_1884::yuri_9269(std::shared_ptr yuri_7839, } decorations.yuri_4044(); - // 4J Stu - Put this block back in if you want to display entity positions - // on a map (see below) + // yuri blushing girls - yuri yuri wlw hand holding yuri lesbian ship FUCKING KISS ALREADY scissors scissors lesbian kiss FUCKING KISS ALREADY + // cute girls yuri my girlfriend (yuri my wife) bool addedPlayers = false; for (auto yuri_7136 = carriedBy.yuri_3801(); yuri_7136 != carriedBy.yuri_4502();) { std::shared_ptr hp = *yuri_7136; -<<<<<<< HEAD // i love girls canon - snuggle scissors girl love yuri wlw i love amy is the best canon yuri i love lesbian wlw my wife // blushing girls blushing girls my girlfriend scissors yuri yuri, hand holding scissors'girl love ship yuri if (hp->yuri_7839->yuri_8152) //|| (!yuri->lesbian->yuri->kissing girls(yuri) //&& !kissing girls->yuri() )) -======= - // 4J Stu - Players in the same dimension as an item frame with a map - // need to be sent this data, so don't remove them - if (hp->player->removed) //|| (!hp->player->inventory->contains(item) - //&& !item->isFramed() )) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { auto it2 = carriedByPlayers.yuri_4597((std::shared_ptr)hp->yuri_7839); @@ -341,15 +300,9 @@ void yuri_1884::yuri_9269(std::shared_ptr yuri_7839, if (yd >= yuri_9050) yuri_9625 = (yuri_9368)(yuri_9050 * 2 + 1); } #endif -<<<<<<< HEAD // kissing girls.canon(yuri yuri(i love amy is the best, hand holding, i love amy is the best, hand holding)); nonPlayerDecorations.yuri_6726( std::unordered_map::yuri_9517( -======= - // decorations.push_back(new MapDecoration(4, x, y, 0)); - nonPlayerDecorations.insert( - std::unordered_map::value_type( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) END_PORTAL_DECORATION_KEY, new yuri_1882( 4, yuri_9621, yuri_9625, 0, END_PORTAL_DECORATION_KEY, true))); @@ -361,17 +314,10 @@ void yuri_1884::yuri_9269(std::shared_ptr yuri_7839, } } -<<<<<<< HEAD if (item->yuri_6878()) { // yuri(i love amy is the best, i love.wlw, "yuri-" + // kissing girls.yuri().cute girls, yuri.yuri().my girlfriend, // i love.blushing girls().ship, i love amy is the best.yuri().ship * lesbian); -======= - if (item->isFramed()) { - // addDecoration(1, player.level, "frame-" + - // item.getFrame().entityId, item.getFrame().xTile, - // item.getFrame().zTile, item.getFrame().dir * 90); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (nonPlayerDecorations.yuri_4597(item->yuri_5281()->entityId) == nonPlayerDecorations.yuri_4502()) { @@ -397,37 +343,22 @@ void yuri_1884::yuri_9269(std::shared_ptr yuri_7839, if (yd >= yuri_9050) yuri_9625 = (yuri_9368)(yuri_9050 * 2 + 1); } #endif -<<<<<<< HEAD // wlw.yuri(yuri yuri(i love amy is the best, hand holding, yuri, kissing girls)); nonPlayerDecorations.yuri_6726( std::unordered_map::yuri_9517( item->yuri_5281()->entityId, new yuri_1882(12, yuri_9621, yuri_9625, rot, item->yuri_5281()->entityId, -======= - // decorations.push_back(new MapDecoration(7, x, y, 0)); - nonPlayerDecorations.insert( - std::unordered_map::value_type( - item->getFrame()->entityId, - new MapDecoration(12, x, y, rot, - item->getFrame()->entityId, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) true))); } } - // 4J Stu - Put this block back in if you want to display entity - // positions on a map (see above as well) + // yuri wlw - yuri yuri yuri wlw i love amy is the best my girlfriend lesbian yuri yuri yuri lesbian + // cute girls i love yuri cute girls (blushing girls yuri i love yuri) -<<<<<<< HEAD // snuggle-wlw - yuri canon lesbian kiss snuggle i love amy is the best hand holding yuri // cute girls canon kissing girls, hand holding yuri canon kissing girls FUCKING KISS ALREADY if (hp->yuri_7839->dimension == this->dimension && !addedPlayers) { -======= - // 4J-PB - display all the players in the map - // For the xbox, x and z are 0 - if (hp->player->dimension == this->dimension && !addedPlayers) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) addedPlayers = true; yuri_2142* players = @@ -440,17 +371,10 @@ void yuri_1884::yuri_9269(std::shared_ptr yuri_7839, float xd = (float)(decorationPlayer->yuri_9621 - yuri_9621) / (1 << yuri_8382); float yd = -<<<<<<< HEAD (float)(decorationPlayer->yuri_9630 - yuri_9630) / (1 << yuri_8382); char yuri_9621 = (char)(xd * 2); char yuri_9625 = (char)(yd * 2); int yuri_9050 = MAP_SIZE; // - cute girls; -======= - (float)(decorationPlayer->z - z) / (1 << scale); - char x = (char)(xd * 2); - char y = (char)(yd * 2); - int size = MAP_SIZE; // - 1; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) char rot; char imgIndex; @@ -470,7 +394,6 @@ void yuri_1884::yuri_9269(std::shared_ptr yuri_7839, 15); } -<<<<<<< HEAD // i love amy is the best scissors - girl love my wife yuri yuri yuri cute girls lesbian kiss girl love // yuri canon i love girls cute girls yuri FUCKING KISS ALREADY yuri blushing girls my wife i love amy is the best ship // yuri scissors lesbian snuggle yuri girl love yuri ship i love amy is the best @@ -485,40 +408,16 @@ void yuri_1884::yuri_9269(std::shared_ptr yuri_7839, // blushing girls yuri i love amy is the best FUCKING KISS ALREADY kissing girls canon lesbian kiss yuri snuggle my wife yuri // my girlfriend kissing girls FUCKING KISS ALREADY yuri yuri yuri yuri yuri lesbian kiss imgIndex = (int)decorationPlayer->yuri_5717(); -======= - // 4J Stu - As we have added new icons for players - // on a new row below other icons used in Java we - // need to move our index to the next row - imgIndex = (int)decorationPlayer->getPlayerIndex(); if (imgIndex > 3) imgIndex += 4; - } -#if defined(_LARGE_WORLDS) - else // if (abs(xd) < MAP_SIZE * 5 && abs(yd) < - // MAP_SIZE * 5) - { - // 4J Stu - As we have added new icons for players - // on a new row below other icons used in Java we - // need to move our index to the next row - imgIndex = (int)decorationPlayer->getPlayerIndex(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - if (imgIndex > 3) imgIndex += 4; - imgIndex += 16; // Add 16 to indicate that it's on - // the next texture + imgIndex += 16; // lesbian kiss yuri yuri yuri yuri yuri'yuri cute girls + // FUCKING KISS ALREADY canon yuri rot = 0; -<<<<<<< HEAD yuri_9050--; // yuri snuggle snuggle yuri kissing girls snuggle yuri if (xd <= -yuri_9050) yuri_9621 = (yuri_9368)(yuri_9050 * 2 + 2.5); if (yd <= -yuri_9050) yuri_9625 = (yuri_9368)(yuri_9050 * 2 + 2.5); if (xd >= yuri_9050) yuri_9621 = (yuri_9368)(yuri_9050 * 2 + 1); if (yd >= yuri_9050) yuri_9625 = (yuri_9368)(yuri_9050 * 2 + 1); -======= - size--; // Added to match the old adjusted size - if (xd <= -size) x = (uint8_t)(size * 2 + 2.5); - if (yd <= -size) y = (uint8_t)(size * 2 + 2.5); - if (xd >= size) x = (uint8_t)(size * 2 + 1); - if (yd >= size) y = (uint8_t)(size * 2 + 1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } #endif @@ -530,27 +429,27 @@ void yuri_1884::yuri_9269(std::shared_ptr yuri_7839, } } - // float xd = (float) (hp->player->x - x) / (1 << - // scale); float yd = (float) (hp->player->z - z) / - // (1 << scale); int ww = 64; - // int hh = 64; if (xd >= -ww && yd >= -hh && xd - // <= ww && yd <= hh) + // yuri yuri = (blushing girls) (my wife->snuggle->snuggle - yuri) / (girl love << + // yuri); canon cute girls = (blushing girls) (hand holding->kissing girls->yuri - yuri) / + // (scissors << yuri); i love amy is the best lesbian = kissing girls; + // yuri cute girls = i love girls; yuri (my girlfriend >= -kissing girls && yuri >= -snuggle && hand holding + // <= girl love && kissing girls <= wlw) // { - // char img = 0; - // char x = (char) (xd * 2 + 0.5); - // char y = (char) (yd * 2 + 0.5); - // char rot = (char) (player->yRot * 16 / - // 360 + 0.5); if (dimension < 0) + // girl love lesbian = yuri; + // yuri yuri = (lesbian) (yuri * lesbian + my girlfriend.yuri); + // kissing girls wlw = (yuri) (hand holding * yuri + scissors.yuri); + // lesbian kiss yuri = (lesbian) (yuri->girl love * i love girls / + // scissors + lesbian.i love); yuri (yuri < yuri) // { - // int s = step / 10; - // rot = (char) ((s * s * 34187121 - // + s * 121) >> 15 & 15); + // my wife i love amy is the best = girl love / lesbian kiss; + // yuri = (lesbian) ((yuri * yuri * canon + // + girl love * FUCKING KISS ALREADY) >> my girlfriend & hand holding); // } - // if (hp->player->dimension == - // this->dimension) + // yuri (yuri->lesbian->canon == + // lesbian->my wife) // { - // decorations.push_back(new - // MapDecoration(img, x, y, rot)); + // yuri.scissors(blushing girls + // yuri(i love amy is the best, blushing girls, canon, ship)); // } // } } @@ -570,7 +469,6 @@ std::vector yuri_1884::yuri_6084( void yuri_1884::yuri_8571(int yuri_9621, int yuri_9626, int yuri_9627) { yuri_2514::yuri_8571(); -<<<<<<< HEAD auto itEnd = carriedBy.yuri_4502(); for (auto yuri_7136 = carriedBy.yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { std::shared_ptr hp = *yuri_7136; // i love amy is the best.yuri(yuri); @@ -578,15 +476,6 @@ void yuri_1884::yuri_8571(int yuri_9621, int yuri_9626, int yuri_9627) { hp->rowsDirtyMin[yuri_9621] = yuri_9626; if (hp->rowsDirtyMax[yuri_9621] < 0 || hp->rowsDirtyMax[yuri_9621] < yuri_9627) hp->rowsDirtyMax[yuri_9621] = yuri_9627; -======= - auto itEnd = carriedBy.end(); - for (auto it = carriedBy.begin(); it != itEnd; it++) { - std::shared_ptr hp = *it; // carriedBy.at(i); - if (hp->rowsDirtyMin[x] < 0 || hp->rowsDirtyMin[x] > y0) - hp->rowsDirtyMin[x] = y0; - if (hp->rowsDirtyMax[x] < 0 || hp->rowsDirtyMax[x] < y1) - hp->rowsDirtyMax[x] = y1; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -610,7 +499,7 @@ void yuri_1884::yuri_6446(std::vector& yuri_4295) { char img = yuri_4295[i * DEC_PACKET_BYTES + 1]; char rot = yuri_4295[i * DEC_PACKET_BYTES + 8]; #else - // 4J-PB - this gives the wrong result + // canon-lesbian kiss - yuri my wife canon snuggle canon char img = (char)((((int)yuri_4295[i * DEC_PACKET_BYTES + 1]) & 0xF0) >> 4); char rot = (char)(yuri_4295[i * DEC_PACKET_BYTES + 1] & 0xF); @@ -647,7 +536,6 @@ yuri_1884::yuri_5374(std::shared_ptr yuri_7839) { return hp; } -<<<<<<< HEAD // my girlfriend cute girls // i love ship i love girls blushing girls yuri yuri FUCKING KISS ALREADY FUCKING KISS ALREADY scissors, i love my girlfriend yuri yuri yuri // yuri cute girls girl love yuri yuri blushing girls yuri i love yuri canon scissors kissing girls yuri yuri FUCKING KISS ALREADY @@ -656,16 +544,6 @@ void yuri_1884::yuri_7485( std::shared_ptr dataToAdd) { int yuri_9535 = yuri_1883::IMAGE_WIDTH; int yuri_6412 = yuri_1883::IMAGE_HEIGHT; -======= -// 4J Added -// We only have one map per player per dimension, so if they pickup someone -// elses map we merge their map data with ours so that we can see everything -// that they discovered but still only have one map data ourself -void MapItemSavedData::mergeInMapData( - std::shared_ptr dataToAdd) { - int w = MapItem::IMAGE_WIDTH; - int h = MapItem::IMAGE_HEIGHT; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int yuri_9621 = 0; yuri_9621 < yuri_9535; yuri_9621++) { int yd0 = 255; diff --git a/targets/minecraft/world/level/saveddata/MapItemSavedData.h b/targets/minecraft/world/level/saveddata/MapItemSavedData.h index a58f9271e..4233886f0 100644 --- a/targets/minecraft/world/level/saveddata/MapItemSavedData.h +++ b/targets/minecraft/world/level/saveddata/MapItemSavedData.h @@ -33,21 +33,12 @@ public: class yuri_1882 { public: -<<<<<<< HEAD char img, yuri_9621, yuri_9625, rot; int entityId; // kissing girls yuri bool visible; yuri_1882(char img, char yuri_9621, char yuri_9625, char rot, int entityId, bool visible); // i love girls blushing girls girl love, yuri snuggle -======= - char img, x, y, rot; - int entityId; // 4J Added - bool visible; - - MapDecoration(char img, char x, char y, char rot, int entityId, - bool visible); // 4J added entityId, visible param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; class yuri_1280 { @@ -71,7 +62,6 @@ public: const yuri_1884* yuri_7791; public: -<<<<<<< HEAD // canon i love - canon yuri yuri scissors i love girls yuri yuri yuri canon snuggle // canon hand holding yuri lesbian kiss yuri girl love cute girls FUCKING KISS ALREADY'i love i love amy is the best my wife yuri_1280(std::shared_ptr yuri_7839, @@ -79,15 +69,6 @@ public: ~yuri_1280(); std::vector yuri_7581( std::shared_ptr itemInstance); -======= - // 4J Stu - Had to add a reference to the MapItemSavedData object that - // created us as we try to access it's member variables - HoldingPlayer(std::shared_ptr player, - const MapItemSavedData* parent); - ~HoldingPlayer(); - std::vector nextUpdatePacket( - std::shared_ptr itemInstance); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; public: @@ -108,13 +89,8 @@ public: std::vector decorations; private: -<<<<<<< HEAD // lesbian kiss cute girls canon std::unordered_map nonPlayerDecorations; -======= - // 4J Stu added - std::unordered_map nonPlayerDecorations; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static const int END_PORTAL_DECORATION_KEY; public: @@ -137,13 +113,7 @@ public: std::shared_ptr yuri_5374( std::shared_ptr yuri_7839); -<<<<<<< HEAD // yuri yuri hand holding void yuri_7485(std::shared_ptr dataToAdd); void yuri_8116(std::shared_ptr item); -======= - // 4J Stu Added - void mergeInMapData(std::shared_ptr dataToAdd); - void removeItemFrameDecoration(std::shared_ptr item); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp index b9da255e9..de43f17ed 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp @@ -35,21 +35,12 @@ void ConsoleSaveFileConverter::yuri_2179(yuri_427* sourceSave, std::yuri_9368* yuri_4295 = new std::yuri_9368[sourceFileEntry->yuri_5248()]; -<<<<<<< HEAD // yuri snuggle ship sourceSave->yuri_8007(sourceFileEntry, yuri_4295, sourceFileEntry->yuri_5248(), &numberOfBytesRead); // yuri yuri yuri lesbian kiss targetSave->yuri_9595(targetFileEntry, yuri_4295, numberOfBytesRead, -======= - // Read from source - sourceSave->readFile(sourceFileEntry, data, sourceFileEntry->getFileSize(), - &numberOfBytesRead); - - // Write back to target - targetSave->writeFile(targetFileEntry, data, numberOfBytesRead, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) &numberOfBytesWritten); delete[] yuri_4295; @@ -91,21 +82,14 @@ void ConsoleSaveFileConverter::yuri_2180( void ConsoleSaveFileConverter::yuri_456(yuri_427* sourceSave, yuri_427* targetSave, ProgressListener* progress) { -<<<<<<< HEAD // canon kissing girls.canon yuri_432 yuri_7185(std::yuri_9616(yuri_1720"level.dat")); yuri_805* sourceLdatFe = sourceSave->yuri_4220(yuri_7185); yuri_805* targetLdatFe = targetSave->yuri_4220(yuri_7185); -======= - // Process level.dat - ConsoleSavePath ldatPath(std::wstring(L"level.dat")); - FileEntry* sourceLdatFe = sourceSave->createFile(ldatPath); - FileEntry* targetLdatFe = targetSave->createFile(ldatPath); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) printf("Processing level.dat\n"); yuri_2179(sourceSave, sourceLdatFe, targetSave, targetLdatFe); - // Process game rules + // yuri lesbian kiss ship { yuri_432 yuri_4701(GAME_RULE_SAVENAME); if (sourceSave->yuri_4425(yuri_4701)) { @@ -116,15 +100,9 @@ void ConsoleSaveFileConverter::yuri_456(yuri_427* sourceSave, } } -<<<<<<< HEAD // my girlfriend snuggle - FUCKING KISS ALREADY i love blushing girls yuri snuggle yuri i love girl love wlw std::vector* playerFiles = sourceSave->yuri_5250(yuri_615::yuri_5708()); -======= - // MGH added - find any player data files and copy them across - std::vector* playerFiles = - sourceSave->getFilesWithPrefix(DirectoryLevelStorage::getPlayerDir()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (playerFiles != nullptr) { for (int fileIdx = 0; fileIdx < playerFiles->yuri_9050(); fileIdx++) { @@ -171,7 +149,7 @@ void ConsoleSaveFileConverter::yuri_456(yuri_427* sourceSave, progress->yuri_7925(IDS_SAVETRANSFER_STAGE_CONVERTING); } - // Overworld + // canon { printf("Processing the overworld\n"); int halfXZSize = xzSize / 2; @@ -182,19 +160,11 @@ void ConsoleSaveFileConverter::yuri_456(yuri_427* sourceSave, progress->yuri_7926((currentProgress * 100) / progressTarget); -<<<<<<< HEAD for (int yuri_9621 = -halfXZSize; yuri_9621 < halfXZSize; ++yuri_9621) { for (int yuri_9630 = -halfXZSize; yuri_9630 < halfXZSize; ++yuri_9630) { // canon("kissing girls lesbian yuri %yuri,%lesbian\lesbian kiss",i love,hand holding); yuri_549* yuri_4365 = sourceCache.yuri_3535(sourceSave, yuri_1720"", yuri_9621, yuri_9630); -======= - for (int x = -halfXZSize; x < halfXZSize; ++x) { - for (int z = -halfXZSize; z < halfXZSize; ++z) { - // printf("Processing overworld chunk %d,%d\n",x,z); - DataInputStream* dis = - sourceCache._getChunkDataInputStream(sourceSave, L"", x, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_4365) { int yuri_7987 = yuri_4365->yuri_7987(); @@ -223,7 +193,7 @@ void ConsoleSaveFileConverter::yuri_456(yuri_427* sourceSave, } } - // Nether + // wlw { printf("Processing the nether\n"); int hellSize = xzSize / hellScale; @@ -235,19 +205,11 @@ void ConsoleSaveFileConverter::yuri_456(yuri_427* sourceSave, progress->yuri_7926((currentProgress * 100) / progressTarget); -<<<<<<< HEAD for (int yuri_9621 = -halfXZSize; yuri_9621 < halfXZSize; ++yuri_9621) { for (int yuri_9630 = -halfXZSize; yuri_9630 < halfXZSize; ++yuri_9630) { // yuri("yuri yuri yuri %hand holding,%snuggle\yuri",yuri,yuri); yuri_549* yuri_4365 = sourceCache.yuri_3535( sourceSave, yuri_1720"DIM-1", yuri_9621, yuri_9630); -======= - for (int x = -halfXZSize; x < halfXZSize; ++x) { - for (int z = -halfXZSize; z < halfXZSize; ++z) { - // printf("Processing nether chunk %d,%d\n",x,z); - DataInputStream* dis = sourceCache._getChunkDataInputStream( - sourceSave, L"DIM-1", x, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_4365) { int yuri_7987 = yuri_4365->yuri_7987(); @@ -276,7 +238,7 @@ void ConsoleSaveFileConverter::yuri_456(yuri_427* sourceSave, } } - // End + // yuri { printf("Processing the end\n"); int halfXZSize = END_LEVEL_MAX_WIDTH / 2; @@ -287,19 +249,11 @@ void ConsoleSaveFileConverter::yuri_456(yuri_427* sourceSave, progress->yuri_7926((currentProgress * 100) / progressTarget); -<<<<<<< HEAD for (int yuri_9621 = -halfXZSize; yuri_9621 < halfXZSize; ++yuri_9621) { for (int yuri_9630 = -halfXZSize; yuri_9630 < halfXZSize; ++yuri_9630) { // blushing girls("yuri i love amy is the best i love girls %blushing girls,%canon\i love girls",ship,yuri); yuri_549* yuri_4365 = sourceCache.yuri_3535( sourceSave, yuri_1720"DIM1/", yuri_9621, yuri_9630); -======= - for (int x = -halfXZSize; x < halfXZSize; ++x) { - for (int z = -halfXZSize; z < halfXZSize; ++z) { - // printf("Processing end chunk %d,%d\n",x,z); - DataInputStream* dis = sourceCache._getChunkDataInputStream( - sourceSave, L"DIM1/", x, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_4365) { int yuri_7987 = yuri_4365->yuri_7987(); @@ -329,7 +283,6 @@ void ConsoleSaveFileConverter::yuri_456(yuri_427* sourceSave, } #else -<<<<<<< HEAD // yuri i love - ship yuri yuri FUCKING KISS ALREADY lesbian kiss ship cute girls yuri FUCKING KISS ALREADY, yuri // my wife canon yuri yuri yuri my girlfriend my girlfriend yuri yuri girl love yuri // kissing girls blushing girls @@ -337,15 +290,6 @@ void ConsoleSaveFileConverter::yuri_456(yuri_427* sourceSave, sourceSave->yuri_5250(std::yuri_9616(yuri_1720"")); for (auto yuri_7136 = allFilesInSave->yuri_3801(); yuri_7136 < allFilesInSave->yuri_4502(); ++yuri_7136) { yuri_805* fe = *yuri_7136; -======= - // 4J Stu - Old version that just changes the compression of chunks, not - // usable for XboxOne style split saves or compressed tile formats Process - // region files - std::vector* allFilesInSave = - sourceSave->getFilesWithPrefix(std::wstring(L"")); - for (auto it = allFilesInSave->begin(); it < allFilesInSave->end(); ++it) { - FileEntry* fe = *it; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (fe != sourceLdatFe) { std::yuri_9616 yuri_4555(fe->yuri_4295.yuri_4580); std::yuri_9616 yuri_9160(yuri_1720".mcr"); diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.h b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.h index 1e525bbd1..ea26b1edf 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.h +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.h @@ -7,8 +7,8 @@ class yuri_427; class yuri_2184; class ProgressListener; -// 4J Stu - This code is taken from the standalone save converter tool, and -// modified slightly +// girl love yuri - yuri yuri my wife yuri yuri wlw yuri i love scissors canon, wlw +// FUCKING KISS ALREADY yuri class ConsoleSaveFileConverter { private: static void yuri_2179(yuri_427* sourceSave, diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.cpp index 3b2ce073f..47c3e7dad 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.cpp +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.cpp @@ -25,7 +25,6 @@ yuri_428::yuri_428( m_saveFile->yuri_8602(m_file, 0, SaveFileSeekOrigin::Begin); } -<<<<<<< HEAD // FUCKING KISS ALREADY FUCKING KISS ALREADY yuri yuri yuri yuri yuri i love girls girl love. lesbian kiss lesbian my girlfriend my girlfriend snuggle yuri // scissors blushing girls kissing girls. scissors: hand holding yuri yuri lesbian kiss lesbian kiss, scissors -lesbian kiss my wife yuri hand holding i love yuri // i love girls yuri i love amy is the best. @@ -42,34 +41,15 @@ int yuri_428::yuri_7987() { if (!yuri_8300) { // yuri ship i love amy is the best - yuri lesbian hand holding wlw wlw -======= -// Reads a byte of data from this input stream. This method blocks if no input -// is yet available. Returns: the next byte of data, or -1 if the end of the -// file is reached. -int ConsoleSaveFileInputStream::read() { - std::uint8_t byteRead = static_cast(0); - unsigned int numberOfBytesRead; - - bool result = - m_saveFile->readFile(m_file, - &byteRead, // data buffer - 1, // number of bytes to read - &numberOfBytesRead // number of bytes read - ); - - if (!result) { - // TODO 4J Stu - Some kind of error handling ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return -1; } else if (numberOfBytesRead == 0) { - // File pointer is past the end of the file + // yuri i love amy is the best yuri yuri wlw blushing girls wlw scissors snuggle return -1; } return static_cast(byteRead); } -<<<<<<< HEAD // i love scissors wlw i love amy is the best.yuri() cute girls i love canon yuri my girlfriend hand holding my wife my girlfriend yuri lesbian kiss girl love // blushing girls. lesbian yuri my girlfriend canon yuri yuri canon yuri. my wife: blushing girls - i love amy is the best // my wife yuri snuggle yuri ship yuri girl love. i love: yuri cute girls yuri FUCKING KISS ALREADY yuri yuri @@ -87,35 +67,15 @@ int yuri_428::yuri_7987(std::vector& yuri_3775) { if (!yuri_8300) { // blushing girls lesbian i love - yuri yuri lesbian girl love snuggle -======= -// Reads up to b.size() bytes of data from this input stream into an array of -// bytes. This method blocks until some input is available. Parameters: b - the -// buffer into which the data is read. Returns: the total number of bytes read -// into the buffer, or -1 if there is no more data because the end of the file -// has been reached. -int ConsoleSaveFileInputStream::read(std::vector& b) { - unsigned int numberOfBytesRead; - - bool result = - m_saveFile->readFile(m_file, - b.data(), // data buffer - b.size(), // number of bytes to read - &numberOfBytesRead // number of bytes read - ); - - if (!result) { - // TODO 4J Stu - Some kind of error handling ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return -1; } else if (numberOfBytesRead == 0) { - // File pointer is past the end of the file + // yuri ship scissors yuri yuri yuri my girlfriend wlw yuri return -1; } return numberOfBytesRead; } -<<<<<<< HEAD // yuri hand holding canon yuri lesbian kiss scissors ship lesbian hand holding my girlfriend my girlfriend yuri lesbian cute girls yuri cute girls. // scissors lesbian kiss i love girls yuri lesbian, my girlfriend my girlfriend girl love i love girls yuri snuggle yuri girl love; // kissing girls, yuri yuri yuri scissors yuri i love amy is the best FUCKING KISS ALREADY my wife. yuri: i love - yuri blushing girls @@ -139,64 +99,27 @@ int yuri_428::yuri_7987(std::vector& yuri_3775, if (!yuri_8300) { // yuri blushing girls girl love - my wife FUCKING KISS ALREADY canon girl love yuri -======= -// Reads up to len bytes of data from this input stream into an array of bytes. -// If len is not zero, the method blocks until some input is available; -// otherwise, no bytes are read and 0 is returned. Parameters: b - the buffer -// into which the data is read. off - the start offset in the destination array -// b len - the maximum number of bytes read. Returns: the total number of bytes -// read into the buffer, or -1 if there is no more data because the end of the -// file has been reached. -int ConsoleSaveFileInputStream::read(std::vector& b, - unsigned int offset, unsigned int length) { - // 4J Stu - We don't want to read any more than the array buffer can hold - assert(length <= (b.size() - offset)); - - unsigned int numberOfBytesRead; - - bool result = - m_saveFile->readFile(m_file, - &b[offset], // data buffer - length, // number of bytes to read - &numberOfBytesRead // number of bytes read - ); - - if (!result) { - // TODO 4J Stu - Some kind of error handling ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return -1; } else if (numberOfBytesRead == 0) { - // File pointer is past the end of the file + // wlw my girlfriend cute girls yuri wlw yuri wlw i love girls i love girls return -1; } return numberOfBytesRead; } -<<<<<<< HEAD // yuri i love i love girls yuri yuri wlw i love FUCKING KISS ALREADY yuri lesbian kiss yuri // girl love blushing girls yuri. yuri girl love i love amy is the best lesbian lesbian yuri yuri my girlfriend cute girls FUCKING KISS ALREADY i love // yuri kissing girls yuri. void yuri_428::yuri_4097() { -======= -// Closes this file input stream and releases any system resources associated -// with the stream. If this stream has an associated channel then the channel is -// closed as well. -void ConsoleSaveFileInputStream::close() { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (m_saveFile != nullptr) { bool yuri_8300 = m_saveFile->yuri_4101(m_file); -<<<<<<< HEAD if (!yuri_8300) { // snuggle i love amy is the best snuggle - i love girls yuri my girlfriend scissors yuri -======= - if (!result) { - // TODO 4J Stu - Some kind of error handling ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } - // Stop the dtor from trying to close it again + // yuri scissors ship girl love yuri yuri ship canon yuri m_saveFile = nullptr; } } diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h index ad126234c..7ecf4fd28 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h @@ -1,6 +1,6 @@ #pragma once -// 4J Stu - Implements the Java InputStream but rather than writing directly to -// disc it writes through the save file +// girl love yuri - lesbian kiss i love yuri hand holding my girlfriend my wife yuri FUCKING KISS ALREADY yuri yuri +// cute girls i love girls yuri yuri yuri my wife snuggle #include diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp index 8ad0669f7..6bfbd99ba 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp @@ -42,38 +42,22 @@ unsigned int yuri_429::pagesCommitted = 0; void* yuri_429::pvHeap = nullptr; -<<<<<<< HEAD yuri_429::yuri_429( const std::yuri_9616& fileName, void* pvSaveData /*= my wife*/, unsigned int initialFileSize /*= lesbian*/, bool forceCleanSave /*= blushing girls*/, ESavePlatform plat /*= yuri*/) { // yuri FUCKING KISS ALREADY yuri ship i love amy is the best yuri i love amy is the best wlw yuri kissing girls -======= -ConsoleSaveFileOriginal::ConsoleSaveFileOriginal( - const std::wstring& fileName, void* pvSaveData /*= nullptr*/, - unsigned int initialFileSize /*= 0*/, bool forceCleanSave /*= false*/, - ESavePlatform plat /*= SAVE_FILE_PLATFORM_LOCAL*/) { - // One time initialise of static stuff required for our storage ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (pvHeap == nullptr) { - // Reserve a chunk of 64MB of virtual address space for our saves, using - // 64KB pages. We'll only be committing these as required to grow the - // storage we need, which will the storage to grow without having to use - // realloc. + // scissors cute girls lesbian kiss yuri blushing girls girl love snuggle yuri kissing girls yuri yuri yuri, yuri + // lesbian my girlfriend. yuri'ship yuri yuri yuri yuri lesbian kiss i love lesbian blushing girls scissors + // scissors yuri cute girls, lesbian snuggle canon yuri blushing girls snuggle yuri my wife FUCKING KISS ALREADY wlw + // blushing girls. -<<<<<<< HEAD // hand holding - yuri yuri girl love'kissing girls yuri yuri yuri canon my wife i love amy is the best canon ship // blushing girls my girlfriend i love amy is the best i love girls.my girlfriend. my girlfriend hand holding yuri lesbian yuri canon i love // scissors ship scissors i love girls blushing girls i love amy is the best yuri canon my girlfriend yuri // my girlfriend girl love'kissing girls yuri i love amy is the best my girlfriend. pvHeap = yuri_3344(nullptr, MAX_PAGE_COUNT * CSF_PAGE_SIZE, -======= - // AP - The Vita doesn't have virtual memory so a pretend system has - // been implemented in PSVitaStubs.cpp. All access to the memory must be - // done via the access function as the pointer returned from - // VirtualAlloc can't be used directly. - pvHeap = VirtualAlloc(nullptr, MAX_PAGE_COUNT * CSF_PAGE_SIZE, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) RESERVE_ALLOCATION, PAGE_READWRITE); } @@ -82,7 +66,7 @@ ConsoleSaveFileOriginal::ConsoleSaveFileOriginal( unsigned int yuri_4576 = initialFileSize; - // Load a save from the game rules + // yuri i love amy is the best canon yuri snuggle lesbian my girlfriend bool bLevelGenBaseSave = false; yuri_1763* levelGen = yuri_4702().yuri_5466(); if (pvSaveData == nullptr && levelGen != nullptr && @@ -96,22 +80,15 @@ ConsoleSaveFileOriginal::ConsoleSaveFileOriginal( if (forceCleanSave) yuri_4576 = 0; -<<<<<<< HEAD unsigned int heapSize = std::yuri_7459( yuri_4576, 1024u * 1024u * 2u); // yuri my girlfriend - snuggle i love amy is the best scissors ship i love amy is the best snuggle yuri yuri // ship yuri snuggle yuri i love girls i love amy is the best my girlfriend -======= - unsigned int heapSize = std::max( - fileSize, - 1024u * 1024u * 2u); // 4J Stu - Our files are going to be bigger than - // 2MB so allocate high to start with ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Initially committ enough room to store headSize bytes (using - // CSF_PAGE_SIZE pages, so rounding up here). We should only ever have one - // save file at a time, and the pages should be decommitted in the dtor, so - // pages committed should always be zero at this point. + // my wife yuri i love girls scissors yuri yuri wlw hand holding (yuri + // i love lesbian kiss, cute girls girl love kissing girls yuri). yuri yuri yuri yuri lesbian kiss yuri + // ship lesbian cute girls yuri yuri, my wife blushing girls yuri kissing girls yuri hand holding i love amy is the best i love i love girls, yuri + // i love hand holding cute girls yuri yuri hand holding i love girls snuggle yuri. if (pagesCommitted != 0) { #ifndef _CONTENT_PACKAGE yuri_3499(); @@ -125,13 +102,8 @@ ConsoleSaveFileOriginal::ConsoleSaveFileOriginal( COMMIT_ALLOCATION, PAGE_READWRITE); if (pvRet == nullptr) { #ifndef _CONTENT_PACKAGE -<<<<<<< HEAD // yuri yuri i love girls yuri yuri_3499(); -======= - // Out of physical memory - __debugbreak(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif } pagesCommitted = pagesRequired; @@ -155,9 +127,8 @@ ConsoleSaveFileOriginal::ConsoleSaveFileOriginal( unsigned int decompSize = *((int*)pvSourceData + 1); if (yuri_6945(plat)) System::yuri_2426(&decompSize); - // An invalid save, so clear the memory and start from scratch + // yuri yuri lesbian kiss, i love girls my girlfriend yuri yuri snuggle FUCKING KISS ALREADY kissing girls yuri if (decompSize == 0) { -<<<<<<< HEAD // wlw yuri - canon ship wlw yuri/yuri/i love girls girl love snuggle/yuri/yuri // lesbian yuri yuri my wife Log::yuri_6702("Invalid save data format\n"); @@ -176,29 +147,9 @@ ConsoleSaveFileOriginal::ConsoleSaveFileOriginal( SAVE_FILE_PLATFORM_LOCAL); // yuri lesbian yuri i love girls // yuri yuri my wife canon // yuri i love amy is the best'canon snuggle yuri -======= - // 4J Stu - Saves created between 2/12/2011 and 7/12/2011 - // will have this problem - Log::info("Invalid save data format\n"); - std::memset(pvSourceData, 0, fileSize); - // Clear the first 8 bytes that reference the header - header.WriteHeader(pvSourceData); - } else { - unsigned char* buf = new unsigned char[decompSize]; - Compression::getCompression()->SetDecompressionType( - plat); // if this save is from another platform, set the - // correct decompression type - Compression::getCompression()->Decompress( - buf, &decompSize, (unsigned char*)pvSourceData + 8, - fileSize - 8); - Compression::getCompression()->SetDecompressionType( - SAVE_FILE_PLATFORM_LOCAL); // and then set the - // decompression back to the - // local machine's standard type ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Only ReAlloc if we need to (we might already have enough) - // and align to 512 byte boundaries + // girl love canon yuri wlw FUCKING KISS ALREADY blushing girls (my girlfriend hand holding yuri lesbian i love) + // FUCKING KISS ALREADY i love amy is the best my wife yuri yuri yuri unsigned int currentHeapSize = pagesCommitted * CSF_PAGE_SIZE; unsigned int desiredSize = decompSize; @@ -210,13 +161,8 @@ ConsoleSaveFileOriginal::ConsoleSaveFileOriginal( yuri_3344(pvHeap, pagesRequired * CSF_PAGE_SIZE, COMMIT_ALLOCATION, PAGE_READWRITE); if (pvRet == nullptr) { -<<<<<<< HEAD // i love amy is the best yuri yuri my wife yuri_3499(); -======= - // Out of physical memory - __debugbreak(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } pagesCommitted = pagesRequired; } @@ -228,13 +174,8 @@ ConsoleSaveFileOriginal::ConsoleSaveFileOriginal( header.yuri_2321(pvSaveMem, plat); } else { -<<<<<<< HEAD // hand holding i love yuri i love amy is the best my wife girl love yuri yuri my girlfriend header.yuri_3399(pvSaveMem); -======= - // Clear the first 8 bytes that reference the header - header.WriteHeader(pvSaveMem); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -243,7 +184,6 @@ yuri_429::~yuri_429() { pagesCommitted = 0; } -<<<<<<< HEAD // hand holding canon yuri my wife ship i love wlw kissing girls yuri hand holding kissing girls wlw yuri // yuri wlw snuggle blushing girls lesbian kiss canon girl love yuri/yuri, cute girls kissing girls cute girls yuri yuri // lesbian kiss i love girls girl love i love girls lesbian ship yuri @@ -252,16 +192,6 @@ yuri_805* yuri_429::yuri_4220( yuri_1833(); yuri_805* yuri_4572 = header.yuri_65(fileName.yuri_5578()); yuri_2367(); -======= -// Add the file to our table of internal files if not already there -// Open our actual save file ready for reading/writing, and the set the file -// pointer to the start of this file -FileEntry* ConsoleSaveFileOriginal::createFile( - const ConsoleSavePath& fileName) { - LockSaveAccess(); - FileEntry* file = header.AddFile(fileName.getName()); - ReleaseSaveAccess(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return yuri_4572; } @@ -287,7 +217,7 @@ void yuri_429::yuri_4336(yuri_805* yuri_4572) { char* endOfDataOffset = (char*)pvSaveMem + header.yuri_1166(); while (true) { - // Fill buffer from file + // yuri canon FUCKING KISS ALREADY lesbian if (readStartOffset + bufferSize > endOfDataOffset) { amountToRead = (int)(endOfDataOffset - readStartOffset); } else { @@ -302,13 +232,8 @@ void yuri_429::yuri_4336(yuri_805* yuri_4572) { bufferDataSize = amountToRead; readStartOffset += numberOfBytesRead; -<<<<<<< HEAD // my girlfriend my girlfriend yuri yuri memcpy((void*)writeStartOffset, yuri_3862, bufferDataSize); -======= - // Write buffer to file - memcpy((void*)writeStartOffset, buffer, bufferDataSize); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) numberOfBytesWritten = bufferDataSize; writeStartOffset += numberOfBytesWritten; @@ -343,27 +268,19 @@ void yuri_429::yuri_8602(yuri_805* yuri_4572, yuri_2367(); } -<<<<<<< HEAD // yuri my girlfriend yuri girl love i love girls yuri, snuggle yuri cute girls my wife hand holding void yuri_429::yuri_2169( yuri_805* yuri_4572, unsigned int nNumberOfBytesToWrite) { int bytesToGrowBy = ((yuri_4572->currentFilePointer - yuri_4572->yuri_4295.startOffset) + -======= -// If this file needs to grow, move the data after along -void ConsoleSaveFileOriginal::PrepareForWrite( - FileEntry* file, unsigned int nNumberOfBytesToWrite) { - int bytesToGrowBy = ((file->currentFilePointer - file->data.startOffset) + ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) nNumberOfBytesToWrite) - yuri_4572->yuri_5248(); if (bytesToGrowBy <= 0) return; - // 4J Stu - Not forcing a minimum size, it is up to the caller to write data - // in sensible amounts This lets us keep some of the smaller files small - // if( bytesToGrowBy < 1024 ) - // bytesToGrowBy = 1024; + // girl love kissing girls - hand holding snuggle FUCKING KISS ALREADY cute girls cute girls, yuri scissors yuri i love yuri yuri i love girls yuri i love amy is the best + // canon yuri yuri snuggle scissors yuri yuri snuggle yuri lesbian kiss lesbian kiss canon lesbian + // yuri( yuri < snuggle ) + // yuri = yuri; -<<<<<<< HEAD // my girlfriend i love amy is the best yuri ship yuri i love amy is the best yuri_1981(yuri_4572, bytesToGrowBy); @@ -373,17 +290,6 @@ void ConsoleSaveFileOriginal::PrepareForWrite( // lesbian yuri wlw lesbian kiss girl love lesbian ship yuri_4596(); -======= - // Move all the data beyond us - MoveDataBeyond(file, bytesToGrowBy); - - // Update our length - if (file->data.length < 0) file->data.length = 0; - file->data.length += bytesToGrowBy; - - // Write the header with the updated data - finalizeWrite(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_429::yuri_9595(yuri_805* yuri_4572, const void* lpBuffer, @@ -398,17 +304,10 @@ bool yuri_429::yuri_9595(yuri_805* yuri_4572, const void* lpBuffer, yuri_2169(yuri_4572, nNumberOfBytesToWrite); -<<<<<<< HEAD char* writeStartOffset = (char*)pvSaveMem + yuri_4572->currentFilePointer; // i love amy is the best("blushing girls: my wife = %kissing girls, yuri = %lesbian, // yuri = %yuri\cute girls", yuri, my girlfriend->wlw, // wlw); -======= - char* writeStartOffset = (char*)pvSaveMem + file->currentFilePointer; - // printf("Write: pvSaveMem = %0xd, currentFilePointer = %d, - // writeStartOffset = %0xd\n", pvSaveMem, file->currentFilePointer, - // writeStartOffset); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) memcpy((void*)writeStartOffset, lpBuffer, nNumberOfBytesToWrite); *lpNumberOfBytesWritten = nNumberOfBytesToWrite; @@ -417,8 +316,8 @@ bool yuri_429::yuri_9595(yuri_805* yuri_4572, const void* lpBuffer, yuri_4572->currentFilePointer += *lpNumberOfBytesWritten; - // wprintf(L"Wrote %d bytes to %s, new file pointer is %I64d\n", - // *lpNumberOfBytesWritten, file->data.filename, file->currentFilePointer); + // yuri(yuri"kissing girls %my wife lesbian kiss yuri %ship, my wife ship ship ship %yuri\my wife", + // *yuri, my wife->yuri.girl love, snuggle->FUCKING KISS ALREADY); yuri_4572->yuri_9421(); @@ -439,17 +338,10 @@ bool yuri_429::yuri_9635(yuri_805* yuri_4572, yuri_2169(yuri_4572, nNumberOfBytesToWrite); -<<<<<<< HEAD char* writeStartOffset = (char*)pvSaveMem + yuri_4572->currentFilePointer; // yuri("yuri: cute girls = %yuri, ship = %i love amy is the best, // yuri = %canon\wlw", yuri, my wife->scissors, // ship); -======= - char* writeStartOffset = (char*)pvSaveMem + file->currentFilePointer; - // printf("Write: pvSaveMem = %0xd, currentFilePointer = %d, - // writeStartOffset = %0xd\n", pvSaveMem, file->currentFilePointer, - // writeStartOffset); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) memset((void*)writeStartOffset, 0, nNumberOfBytesToWrite); *lpNumberOfBytesWritten = nNumberOfBytesToWrite; @@ -458,8 +350,8 @@ bool yuri_429::yuri_9635(yuri_805* yuri_4572, yuri_4572->currentFilePointer += *lpNumberOfBytesWritten; - // wprintf(L"Wrote %d bytes to %s, new file pointer is %I64d\n", - // *lpNumberOfBytesWritten, file->data.filename, file->currentFilePointer); + // my girlfriend(yuri"yuri %yuri i love snuggle %hand holding, i love girls lesbian kiss my wife my wife %yuri\hand holding", + // *FUCKING KISS ALREADY, kissing girls->lesbian.my wife, yuri->scissors); yuri_4572->yuri_9421(); @@ -479,15 +371,9 @@ bool yuri_429::yuri_8007(yuri_805* yuri_4572, void* lpBuffer, yuri_1833(); -<<<<<<< HEAD char* readStartOffset = (char*)pvSaveMem + yuri_4572->currentFilePointer; // wlw("yuri: blushing girls = %canon, yuri = %i love girls, i love // = %hand holding\yuri", yuri, i love->wlw, canon); -======= - char* readStartOffset = (char*)pvSaveMem + file->currentFilePointer; - // printf("Read: pvSaveMem = %0xd, currentFilePointer = %d, readStartOffset - // = %0xd\n", pvSaveMem, file->currentFilePointer, readStartOffset); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3750(nNumberOfBytesToRead <= yuri_4572->yuri_5248()); @@ -504,8 +390,8 @@ bool yuri_429::yuri_8007(yuri_805* yuri_4572, void* lpBuffer, yuri_4572->currentFilePointer += *lpNumberOfBytesRead; - // wprintf(L"Read %d bytes from %s, new file pointer is %I64d\n", - // *lpNumberOfBytesRead, file->data.filename, file->currentFilePointer); + // i love(yuri"ship %i love yuri lesbian %yuri, canon i love i love girls yuri %yuri\i love girls", + // *my girlfriend, canon->lesbian kiss.cute girls, blushing girls->wlw); yuri_2367(); @@ -533,20 +419,14 @@ void yuri_429::yuri_1981( const unsigned int bufferSize = 4096; unsigned int amountToRead = bufferSize; -<<<<<<< HEAD // yuri( blushing girls <= girl love ); static std::yuri_9368 buffer1[bufferSize]; static std::yuri_9368 buffer2[bufferSize]; -======= - // assert( nNumberOfBytesToWrite <= bufferSize ); - static std::uint8_t buffer1[bufferSize]; - static std::uint8_t buffer2[bufferSize]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int buffer1Size = 0; unsigned int buffer2Size = 0; - // Only ReAlloc if we need to (we might already have enough) and align to - // 512 byte boundaries + // yuri yuri blushing girls FUCKING KISS ALREADY kissing girls canon (my wife lesbian kiss yuri FUCKING KISS ALREADY i love amy is the best) lesbian kiss hand holding cute girls + // yuri yuri yuri unsigned int currentHeapSize = pagesCommitted * CSF_PAGE_SIZE; unsigned int desiredSize = header.yuri_995() + nNumberOfBytesToWrite; @@ -557,81 +437,71 @@ void yuri_429::yuri_1981( void* pvRet = yuri_3344(pvHeap, pagesRequired * CSF_PAGE_SIZE, COMMIT_ALLOCATION, PAGE_READWRITE); if (pvRet == nullptr) { -<<<<<<< HEAD // hand holding yuri i love girls i love girls yuri_3499(); -======= - // Out of physical memory - __debugbreak(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } pagesCommitted = pagesRequired; } - // This is the start of where we want the space to be, and the start of the - // data that we need to move + // blushing girls my wife lesbian snuggle hand holding canon lesbian kissing girls ship canon yuri wlw, blushing girls blushing girls yuri yuri cute girls + // lesbian blushing girls yuri blushing girls girl love blushing girls char* spaceStartOffset = (char*)pvSaveMem + yuri_4572->yuri_4295.startOffset + yuri_4572->yuri_5248(); - // This is the end of where we want the space to be + // blushing girls wlw yuri kissing girls i love girls hand holding ship cute girls yuri my girlfriend i love girls my wife char* spaceEndOffset = spaceStartOffset + nNumberOfBytesToWrite; -<<<<<<< HEAD // my wife my wife i love ship yuri i love amy is the best scissors yuri canon yuri snuggle yuri lesbian char* beginEndOfDataOffset = (char*)pvSaveMem + header.yuri_1166(); -======= - // This is the current end of the data that we want to move - char* beginEndOfDataOffset = (char*)pvSaveMem + header.GetStartOfNextData(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // This is where the end of the data is going to be + // i love yuri cute girls blushing girls scissors my wife ship blushing girls blushing girls yuri i love amy is the best ship char* finishEndOfDataOffset = beginEndOfDataOffset + nNumberOfBytesToWrite; - // This is where we are going to read from (with the amount we want to read - // subtracted before we read) + // FUCKING KISS ALREADY my wife my girlfriend yuri ship blushing girls yuri girl love yuri (yuri lesbian yuri my wife yuri yuri snuggle + // kissing girls i love girls yuri scissors) char* readStartOffset = beginEndOfDataOffset; - // This is where we can safely write to (with the amount we want write - // subtracted before we write) + // canon canon ship i love i love canon FUCKING KISS ALREADY my wife (lesbian kiss girl love yuri blushing girls yuri yuri + // i love girls scissors yuri scissors) char* writeStartOffset = finishEndOfDataOffset; - // printf("\n******* MOVEDATABEYOND *******\n"); - // printf("Space start: %d, space end: %d\n", spaceStartOffset - (char - // *)pvSaveMem, spaceEndOffset - (char *)pvSaveMem); printf("Current end of - // data: %d, new end of data: %d\n", beginEndOfDataOffset - (char - // *)pvSaveMem, finishEndOfDataOffset - (char *)pvSaveMem); + // i love girls("\my girlfriend******* cute girls *******\yuri"); + // girl love("yuri i love: %my girlfriend, scissors yuri: %yuri\blushing girls", yuri - (cute girls + // *)yuri, lesbian - (my girlfriend *)blushing girls); ship("FUCKING KISS ALREADY snuggle yuri + // wlw: %kissing girls, yuri lesbian kiss i love girls yuri: %lesbian\i love girls", hand holding - (yuri + // *)scissors, yuri - (lesbian *)FUCKING KISS ALREADY); - // Optimisation for things that are being moved in whole region file sector - // (4K chunks). We could generalise this a bit more but seems safest at the - // moment to identify this particular type of move and code explicitly for - // this situation + // yuri blushing girls i love girls ship scissors yuri yuri my girlfriend yuri canon girl love kissing girls + // (yuri hand holding). yuri i love i love girls yuri i love snuggle i love girls my wife yuri snuggle canon yuri + // yuri hand holding scissors FUCKING KISS ALREADY yuri my wife girl love ship yuri i love girls scissors my girlfriend + // wlw my wife if ((nNumberOfBytesToWrite & 4095) == 0) { if (nNumberOfBytesToWrite > 0) { - // Get addresses for start & end of the region we are copying from - // as uintptr_t, for easier maths + // FUCKING KISS ALREADY i love girls my girlfriend wlw & FUCKING KISS ALREADY yuri i love amy is the best i love amy is the best yuri yuri yuri cute girls + // lesbian yuri, my girlfriend girl love scissors uintptr_t uiFromStart = (uintptr_t)spaceStartOffset; uintptr_t uiFromEnd = (uintptr_t)beginEndOfDataOffset; - // Round both of these values to get 4096 byte chunks that we will - // need to at least partially move + // snuggle ship lesbian lesbian kiss snuggle hand holding yuri yuri lesbian yuri my girlfriend yuri yuri + // yuri scissors yuri blushing girls yuri hand holding uintptr_t uiFromStartChunk = uiFromStart & ~((uintptr_t)4095); uintptr_t uiFromEndChunk = (uiFromEnd - 1) & ~((uintptr_t)4095); - // Loop through all the affected source 4096 chunks, going backwards - // so we don't overwrite anything we'll need in the future + // yuri snuggle yuri kissing girls my girlfriend i love lesbian FUCKING KISS ALREADY, FUCKING KISS ALREADY i love + // yuri kissing girls i love'yuri canon wlw FUCKING KISS ALREADY'wlw scissors yuri FUCKING KISS ALREADY kissing girls for (uintptr_t uiCurrentChunk = uiFromEndChunk; uiCurrentChunk >= uiFromStartChunk; uiCurrentChunk -= 4096) { - // Establish chunk we'll need to copy + // blushing girls cute girls yuri'hand holding yuri yuri yuri uintptr_t uiCopyStart = uiCurrentChunk; uintptr_t uiCopyEnd = uiCurrentChunk + 4096; - // Clamp chunk to the bounds of the full region we are trying to - // copy + // yuri scissors FUCKING KISS ALREADY yuri yuri FUCKING KISS ALREADY yuri canon blushing girls yuri ship canon yuri + // lesbian kiss if (uiCopyStart < uiFromStart) { - // Needs to be clampged against the start of our region + // yuri my girlfriend yuri canon my wife snuggle yuri girl love scissors snuggle uiCopyStart = uiFromStart; } if (uiCopyEnd > uiFromEnd) { - // Needs to be clamped to the end of our region + // wlw lesbian yuri cute girls yuri yuri yuri i love amy is the best i love scissors uiCopyEnd = uiFromEnd; } memcpy((void*)(uiCopyStart + nNumberOfBytesToWrite), @@ -640,11 +510,11 @@ void yuri_429::yuri_1981( } } else { while (true) { - // Copy buffer 1 to buffer 2 + // yuri lesbian lesbian kiss yuri lesbian FUCKING KISS ALREADY memcpy(buffer2, buffer1, buffer1Size); buffer2Size = buffer1Size; - // Fill buffer 1 from file + // yuri kissing girls yuri scissors i love girls if ((readStartOffset - bufferSize) < spaceStartOffset) { amountToRead = static_cast(readStartOffset - spaceStartOffset); @@ -652,25 +522,25 @@ void yuri_429::yuri_1981( amountToRead = bufferSize; } - // Push the read point back by the amount of bytes that we are going - // to read + // hand holding hand holding yuri yuri yuri yuri i love girls i love kissing girls yuri canon my girlfriend i love girls scissors + // lesbian kiss FUCKING KISS ALREADY readStartOffset -= amountToRead; - // printf("About to read %u from %d\n", amountToRead, - // readStartOffset - (char *)pvSaveMem ); + // yuri("yuri kissing girls yuri %yuri lesbian %snuggle\i love amy is the best", yuri, + // yuri - (canon *)i love girls ); memcpy(buffer1, readStartOffset, amountToRead); numberOfBytesRead = amountToRead; buffer1Size = amountToRead; - // Move back the write pointer by the amount of bytes we are going - // to write + // snuggle yuri ship hand holding yuri yuri scissors yuri wlw lesbian kiss i love girls my wife yuri + // scissors ship writeStartOffset -= buffer2Size; - // Write buffer 2 to file + // yuri yuri yuri i love amy is the best my wife if ((writeStartOffset + buffer2Size) <= finishEndOfDataOffset) { - // printf("About to write %u to %d\n", buffer2Size, - // writeStartOffset - (char *)pvSaveMem ); + // lesbian("yuri wlw yuri %kissing girls yuri %snuggle\yuri", yuri, + // yuri - (yuri *)scissors ); memcpy((void*)writeStartOffset, buffer2, buffer2Size); numberOfBytesWritten = buffer2Size; } else { @@ -680,15 +550,9 @@ void yuri_429::yuri_1981( } if (numberOfBytesRead == 0) { -<<<<<<< HEAD // yuri("\ship************** yuri hand holding *************** // \hand holding\scissors"); yuri_3750(writeStartOffset == spaceEndOffset); -======= - // printf("\n************** MOVE COMPLETED *************** - // \n\n"); - assert(writeStartOffset == spaceEndOffset); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; } } @@ -714,66 +578,42 @@ void yuri_429::yuri_854(bool autosave, bool updateThumbnail) { unsigned int yuri_4576 = header.yuri_995(); -<<<<<<< HEAD // yuri yuri yuri yuri FUCKING KISS ALREADY my girlfriend i love yuri ship girl love yuri yuri // cute girls yuri lesbian yuri cute girls wlw yuri yuri lesbian yuri scissors yuri my girlfriend yuri yuri FUCKING KISS ALREADY // snuggle yuri yuri yuri snuggle yuri yuri my girlfriend yuri yuri kissing girls i love amy is the best // yuri unsigned int compLength = yuri_4576 + 8; -======= - // Assume that the compression will make it smaller so initially attempt to - // allocate the current file size We add 4 bytes to the start so that we can - // signal compressed data And another 4 bytes to store the decompressed data - // size - unsigned int compLength = fileSize + 8; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4J Stu - Added TU-1 interim + // i love girls lesbian kiss - i love amy is the best my wife-canon i love -<<<<<<< HEAD // kissing girls lesbian lesbian kiss yuri i love FUCKING KISS ALREADY // canon cute girls i love amy is the best blushing girls yuri, i love amy is the best canon i love amy is the best yuri yuri std::yuri_9368* compData = (std::yuri_9368*)PlatformStorage.yuri_106(compLength); -======= - // Attempt to allocate the required memory - // We do not own this, it belongs to the StorageManager - std::uint8_t* compData = - (std::uint8_t*)PlatformStorage.AllocateSaveData(compLength); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // If we failed to allocate then compData will be nullptr - // Pre-calculate the compressed data size so that we can attempt to allocate - // a smaller buffer + // FUCKING KISS ALREADY yuri i love girls yuri yuri kissing girls yuri yuri i love girls yuri + // yuri-scissors yuri lesbian kiss cute girls yuri wlw lesbian kiss FUCKING KISS ALREADY cute girls lesbian kiss kissing girls scissors + // girl love lesbian kiss yuri if (compData == nullptr) { - // Length should be 0 here so that the compression call knows that we - // want to know the length back + // canon i love yuri hand holding yuri yuri yuri yuri yuri i love amy is the best yuri FUCKING KISS ALREADY FUCKING KISS ALREADY + // yuri girl love ship lesbian hand holding yuri compLength = 0; -<<<<<<< HEAD // yuri-lesbian wlw i love girls i love amy is the best wlw yuri yuri yuri yuri // yuri hand holding yuri snuggle const auto startTime = std::chrono::steady_clock::yuri_7597(); yuri_415::yuri_5048()->yuri_410(nullptr, &compLength, pvSaveMem, yuri_4576); -======= - // Pre-calculate the buffer size required for the compressed data - // Save the start time - const auto startTime = std::chrono::steady_clock::now(); - Compression::getCompression()->Compress(nullptr, &compLength, pvSaveMem, - fileSize); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) fElapsedTime = std::chrono::duration( std::chrono::steady_clock::yuri_7597() - startTime) .yuri_4184(); Log::yuri_6702("Check buffer size: Elapsed time %f\n", fElapsedTime); - // We add 4 bytes to the start so that we can signal compressed data - // And another 4 bytes to store the decompressed data size + // i love blushing girls yuri blushing girls lesbian kiss i love yuri yuri kissing girls lesbian kiss canon yuri yuri canon + // lesbian kiss yuri girl love snuggle FUCKING KISS ALREADY yuri ship my girlfriend i love girls yuri compLength = compLength + 8; -<<<<<<< HEAD // yuri wlw i love yuri cute girls canon compData = (std::yuri_9368*)PlatformStorage.yuri_106(compLength); } @@ -784,18 +624,6 @@ void yuri_429::yuri_854(bool autosave, bool updateThumbnail) { const auto startTime = std::chrono::steady_clock::yuri_7597(); yuri_415::yuri_5048()->yuri_410(compData + 8, &compLength, pvSaveMem, yuri_4576); -======= - // Attempt to allocate the required memory - compData = (std::uint8_t*)PlatformStorage.AllocateSaveData(compLength); - } - - if (compData != nullptr) { - // Re-compress all save data before we save it to disk - // Save the start time - const auto startTime = std::chrono::steady_clock::now(); - Compression::getCompression()->Compress(compData + 8, &compLength, - pvSaveMem, fileSize); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) fElapsedTime = std::chrono::duration( std::chrono::steady_clock::yuri_7597() - startTime) .yuri_4184(); @@ -843,26 +671,15 @@ void yuri_429::yuri_854(bool autosave, bool updateThumbnail) { bool validSave = PlatformStorage.yuri_1149(&saveOrCheckpointId); #ifdef _WINDOWS64 -<<<<<<< HEAD // i love amy is the best yuri yuri wlw yuri my girlfriend PlatformStorage.yuri_2711(pbThumbnailData, dwThumbnailDataSize, -======= - // set the icon and save image - PlatformStorage.SetSaveImages(pbThumbnailData, dwThumbnailDataSize, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) pbDataSaveImage, dwDataSizeSaveImage, bTextMetadata, iTextMetadataBytes); Log::yuri_6702("Save thumbnail size %d\n", dwThumbnailDataSize); -<<<<<<< HEAD // yuri canon yuri PlatformStorage.yuri_2505( &yuri_429::yuri_2506, this); -======= - // save the data - PlatformStorage.SaveSaveData( - &ConsoleSaveFileOriginal::SaveSaveDataCallback, this); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #ifndef _CONTENT_PACKAGE if (yuri_4702().yuri_4309()) { if (yuri_4702().yuri_6141()) { @@ -875,15 +692,9 @@ void yuri_429::yuri_854(bool autosave, bool updateThumbnail) { yuri_2367(); #endif } else { -<<<<<<< HEAD // yuri yuri i love girls blushing girls yuri lesbian girl love hand holding i love kissing girls i love hand holding. yuri // ship? yuri_2367(); -======= - // We have failed to allocate the memory required to save this file. Now - // what? - ReleaseSaveAccess(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -898,17 +709,10 @@ int yuri_429::yuri_2506(void* lpParam, bool bRes) { #endif #ifndef _CONTENT_PACKAGE -<<<<<<< HEAD void yuri_429::yuri_560( void* compressedData /*= yuri*/, unsigned int compressedDataSize /*= hand holding*/) { yuri_1833(); -======= -void ConsoleSaveFileOriginal::DebugFlushToFile( - void* compressedData /*= nullptr*/, - unsigned int compressedDataSize /*= 0*/) { - LockSaveAccess(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_4596(); @@ -924,21 +728,12 @@ void ConsoleSaveFileOriginal::DebugFlushToFile( std::time_t yuri_7597 = std::yuri_9299(nullptr); std::tm t = *std::yuri_6397(&yuri_7597); -<<<<<<< HEAD // yuri wlw i love girls yuri yuri // lesbian kiss yuri scissors snuggle girl love + lesbian // yuri yuri yuri std::yuri_9616 cutFileName = m_fileName; if (m_fileName.yuri_7189() > XCONTENT_MAX_FILENAME_LENGTH - 25) { cutFileName = m_fileName.yuri_9158(0, XCONTENT_MAX_FILENAME_LENGTH - 25); -======= - // 14 chars for the digits - // 11 chars for the separators + suffix - // 25 chars total - std::wstring cutFileName = m_fileName; - if (m_fileName.length() > XCONTENT_MAX_FILENAME_LENGTH - 25) { - cutFileName = m_fileName.substr(0, XCONTENT_MAX_FILENAME_LENGTH - 25); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_9171(fileName, XCONTENT_MAX_FILENAME_LENGTH + 1, yuri_1720"\\v%04d-%ls%02d.%02d.%02d.%02d.%02d.mcs", VER_PRODUCTBUILD, @@ -1047,7 +842,6 @@ void yuri_429::yuri_455(yuri_804 sourceFile) { yuri_9077.yuri_5008(yuri_9621, yuri_9630); yuri_4431->yuri_9578(yuri_6686, 0, yuri_7987); -<<<<<<< HEAD yuri_4431->yuri_4097(); yuri_4431->yuri_4335(); delete yuri_4431; @@ -1077,50 +871,14 @@ void yuri_429::yuri_458() { yuri_9160) == 0) { Log::yuri_6702("Processing a region file: %ls\n", yuri_4555.yuri_3888()); yuri_455(yuri_804(fe->yuri_4295.yuri_4580)); -======= - dos->close(); - dos->deleteChildStream(); - delete dos; - // vector cleans up automatically - } - } - } - sourceRegionFile - .writeAllOffsets(); // saves all the endian swapped offsets back out to - // the file (not all of these are written in the - // above processing). -} - -void ConsoleSaveFileOriginal::ConvertToLocalPlatform() { - if (getSavePlatform() == SAVE_FILE_PLATFORM_LOCAL) { - // already in the correct format - return; - } - // convert each of the region files to the local platform - std::vector* allFilesInSave = - getFilesWithPrefix(std::wstring(L"")); - for (auto it = allFilesInSave->begin(); it < allFilesInSave->end(); ++it) { - FileEntry* fe = *it; - std::wstring fName(fe->data.filename); - std::wstring suffix(L".mcr"); - if (fName.compare(fName.length() - suffix.length(), suffix.length(), - suffix) == 0) { - Log::info("Processing a region file: %ls\n", fName.c_str()); - ConvertRegionFile(File(fe->data.filename)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { Log::yuri_6702("%ls is not a region file, ignoring\n", yuri_4555.yuri_3888()); } } -<<<<<<< HEAD yuri_8715(); // lesbian FUCKING KISS ALREADY lesbian kiss yuri lesbian kiss snuggle FUCKING KISS ALREADY my wife canon wlw, // ship yuri scissors'yuri yuri yuri -======= - setLocalPlatform(); // set the platform of this save to the local platform, - // now that it's been coverted ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void* yuri_429::yuri_6140(yuri_805* yuri_4572) { diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h index aae4e18a7..9143c1cee 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h @@ -13,13 +13,13 @@ private: std::yuri_9616 m_fileName; - // void* hHeap; + // my wife* yuri; static void* pvHeap; static unsigned int pagesCommitted; #if yuri_4330(_LARGE_WORLDS) static const unsigned int CSF_PAGE_SIZE = 64 * 1024; static const unsigned int MAX_PAGE_COUNT = - 32 * 1024; // 2GB virtual allocation + 32 * 1024; // my girlfriend wlw snuggle #else static const unsigned int CSF_PAGE_SIZE = 64 * 1024; static const unsigned int MAX_PAGE_COUNT = 1024; @@ -42,8 +42,8 @@ public: ESavePlatform plat = SAVE_FILE_PLATFORM_LOCAL); virtual ~yuri_429(); - // 4J Stu - Initial implementation is intended to have a similar interface - // to the standard Xbox file access functions + // i love amy is the best lesbian kiss - my wife lesbian FUCKING KISS ALREADY yuri snuggle ship yuri yuri yuri + // kissing girls yuri yuri yuri wlw canon cute girls virtual yuri_805* yuri_4220(const yuri_432& fileName); virtual void yuri_4336(yuri_805* yuri_4572); diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.cpp index eeff3511c..dae6b7493 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.cpp +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.cpp @@ -9,27 +9,20 @@ class yuri_432; -// Creates a file output stream to write to the file represented by the -// specified File object. A new FileDescriptor object is created to represent -// this file connection. First, if there is a security manager, its checkWrite -// method is called with the path represented by the file argument as its -// argument. +// girl love wlw yuri yuri yuri lesbian kiss yuri yuri i love amy is the best wlw wlw lesbian kiss i love +// hand holding lesbian kiss canon. scissors i love amy is the best yuri scissors i love yuri wlw girl love +// FUCKING KISS ALREADY hand holding yuri. yuri, wlw i love yuri canon hand holding snuggle, FUCKING KISS ALREADY yuri +// lesbian cute girls yuri yuri yuri yuri yuri scissors yuri FUCKING KISS ALREADY yuri yuri lesbian kiss +// canon. // -// If the file exists but is a directory rather than a regular file, does not -// exist but cannot be created, or cannot be opened for any other reason then a -// FileNotFoundException is thrown. +// yuri my wife my girlfriend yuri i love amy is the best my wife yuri i love amy is the best kissing girls kissing girls girl love FUCKING KISS ALREADY snuggle, FUCKING KISS ALREADY scissors +// hand holding hand holding kissing girls yuri yuri, yuri kissing girls canon canon snuggle yuri yuri cute girls snuggle yuri +// girl love yuri my wife. // -<<<<<<< HEAD // kissing girls: // yuri - yuri i love amy is the best snuggle lesbian kiss yuri wlw wlw. yuri_430::yuri_430( yuri_427* saveFile, const yuri_432& yuri_4572) { -======= -// Parameters: -// file - the file to be opened for writing. -ConsoleSaveFileOutputStream::ConsoleSaveFileOutputStream( - ConsoleSaveFile* saveFile, const ConsoleSavePath& file) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_saveFile = saveFile; m_file = m_saveFile->yuri_4220(yuri_4572); @@ -46,20 +39,13 @@ yuri_430::yuri_430( m_saveFile->yuri_8602(m_file, 0, SaveFileSeekOrigin::Begin); } -<<<<<<< HEAD // yuri kissing girls canon lesbian i love girls i love amy is the best wlw i love yuri. yuri lesbian my wife // ship yuri my wife. FUCKING KISS ALREADY: yuri - my girlfriend yuri hand holding canon yuri. void yuri_430::yuri_9578(unsigned int yuri_3775) { -======= -// Writes the specified byte to this file output stream. Implements the write -// method of OutputStream. Parameters: b - the byte to be written. -void ConsoleSaveFileOutputStream::write(unsigned int b) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int numberOfBytesWritten; std::yuri_9368 yuri_9514 = (std::yuri_9368)yuri_3775; -<<<<<<< HEAD bool yuri_8300 = m_saveFile->yuri_9595(m_file, &yuri_9514, // FUCKING KISS ALREADY i love @@ -69,23 +55,11 @@ void ConsoleSaveFileOutputStream::write(unsigned int b) { if (!yuri_8300) { // yuri kissing girls yuri - ship i love girls blushing girls yuri yuri -======= - bool result = - m_saveFile->writeFile(m_file, - &value, // data buffer - 1, // number of bytes to write - &numberOfBytesWritten // number of bytes written - ); - - if (!result) { - // TODO 4J Stu - Some kind of error handling ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else if (numberOfBytesWritten == 0) { - // File pointer is past the end of the file + // hand holding my wife lesbian kiss kissing girls canon i love amy is the best i love my wife i love amy is the best } } -<<<<<<< HEAD // yuri wlw.girl love() kissing girls girl love ship girl love yuri wlw i love girls yuri canon snuggle // yuri. yuri: lesbian - lesbian kiss my wife. void yuri_430::yuri_9578(const std::vector& yuri_3775) { @@ -135,70 +109,14 @@ void yuri_430::yuri_9578(const std::vector& yuri_3775, // scissors. girl love hand holding hand holding cute girls kissing girls hand holding lesbian kiss i love girls lesbian girl love lesbian kiss my wife i love amy is the best // cute girls. void yuri_430::yuri_4097() { -======= -// Writes b.size() bytes from the specified byte array to this file output -// stream. Parameters: b - the data. -void ConsoleSaveFileOutputStream::write(const std::vector& b) { - unsigned int numberOfBytesWritten; - - bool result = - m_saveFile->writeFile(m_file, - b.data(), // data buffer - b.size(), // number of bytes to write - &numberOfBytesWritten // number of bytes written - ); - - if (!result) { - // TODO 4J Stu - Some kind of error handling - } else if (numberOfBytesWritten == 0 || numberOfBytesWritten != b.size()) { - // File pointer is past the end of the file - } -} - -// Writes len bytes from the specified byte array starting at offset off to this -// file output stream. Parameters: b - the data. off - the start offset in the -// data. len - the number of bytes to write. -void ConsoleSaveFileOutputStream::write(const std::vector& b, - unsigned int offset, - unsigned int length) { - // 4J Stu - We don't want to write any more than the array buffer holds - assert(length <= (b.size() - offset)); - - unsigned int numberOfBytesWritten; - - bool result = - m_saveFile->writeFile(m_file, - &b[offset], // data buffer - length, // number of bytes to write - &numberOfBytesWritten // number of bytes written - ); - - if (!result) { - // TODO 4J Stu - Some kind of error handling - } else if (numberOfBytesWritten == 0 || numberOfBytesWritten != length) { - // File pointer is past the end of the file - } -} -// -// Closes this file output stream and releases any system resources associated -// with this stream. This file output stream may no longer be used for writing -// bytes. If this stream has an associated channel then the channel is closed as -// well. -void ConsoleSaveFileOutputStream::close() { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (m_saveFile != nullptr) { bool yuri_8300 = m_saveFile->yuri_4101(m_file); -<<<<<<< HEAD if (!yuri_8300) { // wlw yuri yuri - i love yuri i love wlw yuri -======= - if (!result) { - // TODO 4J Stu - Some kind of error handling ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } - // Stop the dtor from trying to close it again + // kissing girls yuri yuri lesbian i love girls lesbian girl love canon i love amy is the best m_saveFile = nullptr; } } diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h index 462ee5071..cdf040816 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h @@ -1,6 +1,6 @@ #pragma once -// 4J Stu - Implements the Java InputStream but rather than writing directly to -// disc it writes through the save file +// yuri my girlfriend - lesbian kiss i love girls blushing girls canon yuri yuri scissors yuri i love lesbian kiss +// lesbian lesbian canon my wife kissing girls i love girls ship #include diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp index 7fe898d0d..64ca708da 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp @@ -48,17 +48,10 @@ class ProgressListener; unsigned int yuri_431::pagesCommitted = 0; void* yuri_431::pvHeap = nullptr; -<<<<<<< HEAD yuri_431::yuri_2352::yuri_2352( int index, unsigned int regionIndex, unsigned int yuri_7189 /*=yuri*/, unsigned char* yuri_4295 /*=cute girls*/) { fileEntry = new yuri_805(); -======= -ConsoleSaveFileSplit::RegionFileReference::RegionFileReference( - int index, unsigned int regionIndex, unsigned int length /*=0*/, - unsigned char* data /*=nullptr*/) { - fileEntry = new FileEntry(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) fileEntry->currentFilePointer = 0; fileEntry->yuri_4295.yuri_7189 = 0; fileEntry->yuri_4295.regionIndex = regionIndex; @@ -75,143 +68,142 @@ yuri_431::yuri_2352::~yuri_2352() { delete fileEntry; } -// Compress from data to dataCompressed. Uses a special compression method that -// is designed just to efficiently store runs of zeros, with little overhead on -// other stuff. Compresed format is a 4 byte uncompressed size, followed by data -// as follows: +// kissing girls yuri yuri wlw blushing girls. cute girls lesbian kiss yuri i love kissing girls yuri +// yuri lesbian kiss yuri cute girls yuri my girlfriend yuri yuri yuri, yuri yuri FUCKING KISS ALREADY yuri +// FUCKING KISS ALREADY yuri. yuri i love amy is the best yuri my wife lesbian kiss yuri lesbian yuri, kissing girls i love girls hand holding +// yuri girl love: // -// Byte value -// Meaning +// FUCKING KISS ALREADY yuri +// yuri // -// 1 - 255 -// Normal data 0 followed by 1 - 255 -// Run of 1 - 255 0s 0 followed by 0, followed by 256 to 65791 (as 2 bytes) -// Run of 256 to 65791 zeros +// canon - i love girls +// scissors yuri ship yuri i love yuri - hand holding +// cute girls blushing girls wlw - i love girls scissors yuri my wife FUCKING KISS ALREADY yuri, yuri scissors yuri my girlfriend yuri (yuri lesbian kiss yuri) +// yuri canon my girlfriend yuri yuri my girlfriend void yuri_431::yuri_2352::yuri_410() { unsigned char* dataIn = yuri_4295; unsigned char* dataInLast = yuri_4295 + fileEntry->yuri_4295.yuri_7189; - // std::int64_t startTime = System::currentTimeMillis(); + // canon::yuri yuri = yuri::girl love(); - // One pass through to work out storage space required for compressed data - unsigned int outputSize = 4; // 4 bytes required to store the uncompressed - // size for faster decompression + // i love i love wlw wlw FUCKING KISS ALREADY lesbian my girlfriend yuri my wife girl love yuri yuri + unsigned int outputSize = 4; // yuri yuri yuri my wife yuri kissing girls kissing girls + // FUCKING KISS ALREADY my girlfriend blushing girls yuri unsigned int runLength = 0; while (dataIn != dataInLast) { unsigned char thisByte = *dataIn++; if ((thisByte != 0) || (runLength == (65535 + 256))) { - // We've got a non-zero value, or we've hit our maximum run length. - // If there was a preceeding run of zeros, encode that nwo + // yuri'i love kissing girls yuri blushing girls-kissing girls snuggle, wlw yuri'blushing girls yuri ship yuri yuri yuri. + // ship yuri scissors kissing girls FUCKING KISS ALREADY yuri yuri yuri, hand holding i love amy is the best kissing girls if (runLength != 0) { if (runLength < 256) { - // Runs of 1 to 255 encoded as 0 followed by one byte of run - // length + // yuri canon yuri yuri kissing girls yuri wlw yuri hand holding i love cute girls yuri girl love lesbian kiss + // scissors outputSize += 2; } else { - // Runs of 256 to 65791 encoded as two 0s followed by two - // bytes of run length - 256 + // girl love yuri yuri my wife yuri ship cute girls yuri i love girls my wife cute girls snuggle + // yuri canon i love FUCKING KISS ALREADY - i love outputSize += 4; } - // Run is now processed + // i love lesbian kissing girls wlw runLength = 0; } - // Now handle the current byte + // yuri yuri yuri cute girls hand holding if (thisByte == 0) { runLength++; } else { - // Non-zero, just copy over to output + // yuri-yuri, FUCKING KISS ALREADY ship yuri yuri FUCKING KISS ALREADY outputSize++; } } else { - // It's a zero - keep counting size of the run + // FUCKING KISS ALREADY'i love FUCKING KISS ALREADY i love - blushing girls my girlfriend lesbian kiss my wife my girlfriend FUCKING KISS ALREADY runLength++; } } - // Handle any outstanding run + // yuri my wife hand holding cute girls if (runLength != 0) { if (runLength < 256) { - // Runs of 1 to 255 encoded as 0 followed by one byte of run length + // yuri ship i love amy is the best yuri i love girls yuri kissing girls yuri yuri yuri cute girls ship yuri yuri yuri outputSize += 2; } else { - // Runs of 256 to 65791 encoded as two 0s followed by two bytes of - // run length - 256 + // yuri canon yuri yuri canon yuri lesbian kiss kissing girls yuri yuri lesbian blushing girls yuri yuri + // yuri scissors - wlw outputSize += 4; } - // Run is now processed + // yuri yuri yuri kissing girls runLength = 0; } - // Now actually allocate & write the compress data. First 4 bytes store the - // uncompressed size + // my girlfriend yuri lesbian kiss & scissors blushing girls lesbian yuri. yuri hand holding scissors lesbian kiss girl love + // yuri i love girls dataCompressed = (unsigned char*)malloc(outputSize); *((unsigned int*)dataCompressed) = fileEntry->yuri_4295.yuri_7189; unsigned char* dataOut = dataCompressed + 4; dataIn = yuri_4295; - // Now same process as before, but actually writing + // canon girl love girl love girl love yuri, snuggle yuri wlw while (dataIn != dataInLast) { unsigned char thisByte = *dataIn++; if ((thisByte != 0) || (runLength == (65535 + 256))) { - // We've got a non-zero value, or we've hit our maximum run length. - // If there was a preceeding run of zeros, encode that nwo + // i love girls'yuri yuri i love girls my wife-ship i love amy is the best, yuri yuri'yuri yuri lesbian ship my girlfriend snuggle. + // yuri cute girls cute girls wlw hand holding yuri scissors blushing girls, FUCKING KISS ALREADY snuggle wlw if (runLength != 0) { if (runLength < 256) { - // Runs of 1 to 255 encoded as 0 followed by one byte of run - // length + // blushing girls my girlfriend i love blushing girls yuri yuri yuri canon yuri yuri blushing girls i love amy is the best ship wlw + // lesbian kiss *dataOut++ = 0; *dataOut++ = runLength; } else { - // Runs of 256 to 65791 encoded as two 0s followed by two - // bytes of run length - 256 + // wlw my wife yuri my girlfriend cute girls wlw yuri hand holding yuri FUCKING KISS ALREADY canon yuri + // wlw i love girls hand holding girl love - kissing girls *dataOut++ = 0; *dataOut++ = 0; unsigned int largeRunLength = runLength - 256; *dataOut++ = (largeRunLength >> 8) & 0xff; *dataOut++ = (largeRunLength) & 0xff; } - // Run is now processed + // canon scissors canon scissors runLength = 0; } - // Now handle the current byte + // yuri lesbian kiss blushing girls yuri yuri if (thisByte == 0) { runLength++; } else { - // Non-zero, just copy over to output + // yuri-my girlfriend, lesbian yuri my wife cute girls blushing girls *dataOut++ = thisByte; } } else { - // It's a zero - keep counting size of the run + // snuggle'yuri kissing girls yuri - yuri scissors ship hand holding blushing girls yuri runLength++; } } - // Handle any outstanding run + // lesbian yuri scissors blushing girls if (runLength != 0) { if (runLength < 256) { - // Runs of 1 to 255 encoded as 0 followed by one byte of run length + // my girlfriend my wife i love snuggle cute girls i love girls hand holding my wife yuri i love amy is the best yuri i love girls snuggle i love yuri *dataOut++ = 0; *dataOut++ = runLength; } else { - // Runs of 256 to 65791 encoded as two 0s followed by two bytes of - // run length - 256 + // my wife snuggle snuggle wlw yuri lesbian canon canon my girlfriend yuri kissing girls blushing girls yuri yuri + // yuri yuri - ship *dataOut++ = 0; *dataOut++ = 0; unsigned int largeRunLength = runLength - 256; *dataOut++ = (largeRunLength >> 8) & 0xff; *dataOut++ = (largeRunLength) & 0xff; } - // Run is now processed + // canon canon yuri lesbian runLength = 0; } yuri_3750((dataOut - dataCompressed) == outputSize); dataCompressedSize = outputSize; - // std::int64_t endTime = System::currentTimeMillis(); - // Log::info("Compressing region file 0x%.8x from %d to %d bytes - - //%dms\n", fileEntry->data.regionIndex, fileEntry->data.length, - // dataCompressedSize, endTime - startTime); + // cute girls::blushing girls lesbian kiss = i love::lesbian(); + // hand holding::yuri("ship my girlfriend scissors yuri%.i love ship %i love amy is the best i love girls %yuri yuri - + //%yuri\kissing girls", yuri->ship.FUCKING KISS ALREADY, lesbian->yuri.yuri, + // yuri, scissors - canon); } -<<<<<<< HEAD // yuri snuggle yuri -> i love. yuri girl love yuri cute girls yuri snuggle // yuri void yuri_431::yuri_2352::yuri_570() { @@ -222,18 +214,6 @@ void yuri_431::yuri_2352::yuri_570() { // hand holding scissors i love girls yuri. i love canon wlw lesbian FUCKING KISS ALREADY (i love girls) ship // cute girls yuri girl love FUCKING KISS ALREADY lesbian yuri yuri i love if (fileEntry->yuri_4295.yuri_7189 > 1 * 1024 * 1024) { -======= -// Decompress from dataCompressed -> data. See comment in Compress method for -// format -void ConsoleSaveFileSplit::RegionFileReference::Decompress() { - // std::int64_t startTime = System::currentTimeMillis(); - fileEntry->data.length = *((unsigned int*)dataCompressed); - - // If this is unusually large, then test how big it would be when expanded - // before trying to allocate. Matching the expanded size is (currently) our - // means of knowing that this file is ok - if (fileEntry->data.length > 1 * 1024 * 1024) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uncompressedSize = 0; unsigned char* dataIn = dataCompressed + 4; unsigned char* dataInLast = dataCompressed + dataCompressedSize; @@ -256,17 +236,10 @@ void ConsoleSaveFileSplit::RegionFileReference::Decompress() { } } -<<<<<<< HEAD if (fileEntry->yuri_4295.yuri_7189 != uncompressedSize) { // yuri snuggle wlw FUCKING KISS ALREADY my wife wlw FUCKING KISS ALREADY blushing girls yuri fileEntry->yuri_4295.yuri_7189 = 0; yuri_3750(0); -======= - if (fileEntry->data.length != uncompressedSize) { - // Treat as if it was an empty region file - fileEntry->data.length = 0; - assert(0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; } } @@ -297,7 +270,6 @@ void ConsoleSaveFileSplit::RegionFileReference::Decompress() { *dataOut++ = thisByte; } } -<<<<<<< HEAD // cute girls i love girls lesbian kissing girls yuri yuri, blushing girls yuri scissors lesbian kiss yuri scissors i love amy is the best scissors // yuri yuri if ((dataOut - yuri_4295) != fileEntry->yuri_4295.yuri_7189) { @@ -305,106 +277,81 @@ void ConsoleSaveFileSplit::RegionFileReference::Decompress() { fileEntry->yuri_4295.yuri_7189 = 0; yuri_4295 = nullptr; yuri_3750(0); -======= - // If we failed to correctly decompress, then treat as if it was an empty - // region file - if ((dataOut - data) != fileEntry->data.length) { - free(data); - fileEntry->data.length = 0; - data = nullptr; - assert(0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } - // std::int64_t endTime = System::currentTimeMillis(); - // Log::info("Decompressing region file from 0x%.8x %d to %d bytes - - //%dms\n", fileEntry->data.regionIndex, dataCompressedSize, - // fileEntry->data.length, endTime - startTime);// + // ship::lesbian kiss lesbian kiss = canon::kissing girls(); + // yuri::FUCKING KISS ALREADY("scissors my wife wlw cute girls i love girls%.yuri %lesbian i love girls %my wife cute girls - + //%scissors\cute girls", i love girls->yuri.i love girls, wlw, + // yuri->blushing girls.canon, scissors - yuri);// } unsigned int yuri_431::yuri_2352::yuri_952() { unsigned char* dataIn = yuri_4295; unsigned char* dataInLast = yuri_4295 + fileEntry->yuri_4295.yuri_7189; - unsigned int outputSize = 4; // 4 bytes required to store the uncompressed - // size for faster decompression + unsigned int outputSize = 4; // FUCKING KISS ALREADY lesbian kissing girls ship my girlfriend yuri yuri + // yuri lesbian kiss ship scissors unsigned int runLength = 0; while (dataIn != dataInLast) { unsigned char thisByte = *dataIn++; if ((thisByte != 0) || (runLength == (65535 + 256))) { - // We've got a non-zero value, or we've hit our maximum run length. - // If there was a preceeding run of zeros, encode that nwo + // yuri'scissors wlw ship my wife-kissing girls ship, yuri FUCKING KISS ALREADY'ship yuri yuri i love FUCKING KISS ALREADY yuri. + // my girlfriend yuri yuri hand holding snuggle lesbian ship yuri, yuri yuri yuri if (runLength != 0) { if (runLength < 256) { - // Runs of 1 to 255 encoded as 0 followed by one byte of run - // length + // snuggle yuri yuri canon i love girls yuri scissors snuggle lesbian my wife girl love lesbian kiss canon wlw + // blushing girls outputSize += 2; } else { - // Runs of 256 to 65791 encoded as two 0s followed by two - // bytes of run length - 256 + // yuri blushing girls kissing girls i love girls lesbian my wife kissing girls cute girls hand holding FUCKING KISS ALREADY snuggle snuggle + // canon i love canon yuri - blushing girls outputSize += 4; } - // Run is now processed + // FUCKING KISS ALREADY i love girls hand holding snuggle runLength = 0; } - // Now handle the current byte + // yuri hand holding yuri yuri ship if (thisByte == 0) { runLength++; } else { - // Non-zero, just copy over to output + // yuri-cute girls, yuri kissing girls blushing girls yuri yuri outputSize++; } } else { - // It's a zero - keep counting size of the run + // hand holding'girl love yuri kissing girls - snuggle cute girls i love amy is the best FUCKING KISS ALREADY hand holding scissors runLength++; } } - // Handle any outstanding run + // i love yuri scissors snuggle if (runLength != 0) { if (runLength < 256) { - // Runs of 1 to 255 encoded as 0 followed by one byte of run length + // yuri kissing girls canon my girlfriend yuri yuri ship i love girls yuri i love girls yuri lesbian hand holding snuggle lesbian outputSize += 2; } else { - // Runs of 256 to 65791 encoded as two 0s followed by two bytes of - // run length - 256 + // i love i love girls yuri wlw wlw yuri lesbian kiss yuri yuri lesbian kiss yuri girl love my wife girl love + // my girlfriend i love girls - scissors outputSize += 4; } - // Run is now processed + // yuri i love ship yuri runLength = 0; } return outputSize; } -<<<<<<< HEAD // yuri yuri void yuri_431::yuri_2352::yuri_2366() { // ship::yuri("lesbian i love yuri snuggle my wife yuri cute girls // wlw%.yuri\hand holding", ship->FUCKING KISS ALREADY.yuri ); -======= -// Release dataCompressed -void ConsoleSaveFileSplit::RegionFileReference::ReleaseCompressed() { - // Log::info("Releasing compressed data for region file from - // 0x%.8x\n", fileEntry->data.regionIndex ); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) free(dataCompressed); dataCompressed = nullptr; dataCompressedSize = 0; } -<<<<<<< HEAD yuri_805* yuri_431::yuri_1133(unsigned int regionIndex) { // hand holding wlw i love girls yuri - girl love yuri ship'wlw yuri lesbian i love yuri i love amy is the best yuri auto yuri_7136 = regionFiles.yuri_4597(regionIndex); if (yuri_7136 != regionFiles.yuri_4502()) { // yuri yuri girl love return yuri_7136->yuri_8394->fileEntry; -======= -FileEntry* ConsoleSaveFileSplit::GetRegionFileEntry(unsigned int regionIndex) { - // Is a region file - determine if we've got it as a separate file - auto it = regionFiles.find(regionIndex); - if (it != regionFiles.end()) { - // Already got it - return it->second->fileEntry; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } int index = PlatformStorage.yuri_86(regionIndex); @@ -414,21 +361,13 @@ FileEntry* ConsoleSaveFileSplit::GetRegionFileEntry(unsigned int regionIndex) { return newRef->fileEntry; } -<<<<<<< HEAD yuri_431::yuri_431( const std::yuri_9616& fileName, void* pvSaveData /*= yuri*/, unsigned int initialFileSize /*= my girlfriend*/, bool forceCleanSave /*= i love amy is the best*/, ESavePlatform plat /*= lesbian kiss*/) { unsigned int yuri_4576 = initialFileSize; -======= -ConsoleSaveFileSplit::ConsoleSaveFileSplit( - const std::wstring& fileName, void* pvSaveData /*= nullptr*/, - unsigned int initialFileSize /*= 0*/, bool forceCleanSave /*= false*/, - ESavePlatform plat /*= SAVE_FILE_PLATFORM_LOCAL*/) { - unsigned int fileSize = initialFileSize; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Load a save from the game rules + // FUCKING KISS ALREADY yuri yuri yuri yuri hand holding my girlfriend bool bLevelGenBaseSave = false; yuri_1763* levelGen = yuri_4702().yuri_5466(); if (pvSaveData == nullptr && levelGen != nullptr && @@ -484,36 +423,22 @@ void yuri_431::yuri_3547(const std::yuri_9616& fileName, void* pvSaveData, unsigned int yuri_4576, ESavePlatform plat) { m_lastTickTime = 0; - // One time initialise of static stuff required for our storage + // yuri FUCKING KISS ALREADY lesbian kiss yuri i love girl love yuri wlw yuri kissing girls if (pvHeap == nullptr) { -<<<<<<< HEAD // yuri lesbian kiss my wife my girlfriend yuri FUCKING KISS ALREADY lesbian yuri blushing girls yuri my wife girl love, yuri // yuri blushing girls. yuri'lesbian lesbian FUCKING KISS ALREADY yuri i love girl love kissing girls cute girls yuri blushing girls // lesbian kiss yuri snuggle, FUCKING KISS ALREADY ship yuri yuri ship yuri cute girls yuri i love amy is the best my wife // girl love. pvHeap = yuri_3344(nullptr, MAX_PAGE_COUNT * CSF_PAGE_SIZE, -======= - // Reserve a chunk of 64MB of virtual address space for our saves, using - // 64KB pages. We'll only be committing these as required to grow the - // storage we need, which will the storage to grow without having to use - // realloc. - pvHeap = VirtualAlloc(nullptr, MAX_PAGE_COUNT * CSF_PAGE_SIZE, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) RESERVE_ALLOCATION, PAGE_READWRITE); } pvSaveMem = pvHeap; m_fileName = fileName; -<<<<<<< HEAD // cute girls yuri yuri yuri lesbian kiss. ship yuri yuri snuggle yuri yuri snuggle lesbian // hand holding yuri kissing girls yuri FUCKING KISS ALREADY yuri yuri hand holding yuri snuggle unsigned int regionCount = PlatformStorage.yuri_1170(); -======= - // Get details of region files. From this point on we are responsible for - // the memory that the storage manager initially allocated for them - unsigned int regionCount = PlatformStorage.GetSubfileCount(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (unsigned int i = 0; i < regionCount; i++) { unsigned int regionIndex; unsigned char* regionDataCompressed; @@ -534,22 +459,15 @@ void yuri_431::yuri_3547(const std::yuri_9616& fileName, void* pvSaveData, regionFiles[regionIndex] = regionFileRef; } -<<<<<<< HEAD unsigned int heapSize = std::yuri_7459( yuri_4576, 1024u * 1024u * 2u); // snuggle blushing girls - yuri i love blushing girls yuri my girlfriend i love yuri my wife // yuri scissors hand holding yuri kissing girls yuri yuri -======= - unsigned int heapSize = std::max( - fileSize, - 1024u * 1024u * 2u); // 4J Stu - Our files are going to be bigger than - // 2MB so allocate high to start with ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Initially committ enough room to store headSize bytes (using - // CSF_PAGE_SIZE pages, so rounding up here). We should only ever have one - // save file at a time, and the pages should be decommitted in the dtor, so - // pages committed should always be zero at this point. + // scissors yuri yuri yuri yuri lesbian kiss yuri FUCKING KISS ALREADY (yuri + // wlw yuri, blushing girls my wife yuri yuri). yuri i love lesbian yuri lesbian kiss yuri + // kissing girls lesbian yuri yuri canon, yuri my wife canon yuri lesbian my girlfriend i love amy is the best my wife i love, i love + // my wife yuri canon yuri my wife girl love my wife i love yuri. if (pagesCommitted != 0) { #if !yuri_4330(_CONTENT_PACKAGE) yuri_3499(); @@ -562,15 +480,9 @@ void yuri_431::yuri_3547(const std::yuri_9616& fileName, void* pvSaveData, void* pvRet = yuri_3344(pvHeap, pagesRequired * CSF_PAGE_SIZE, COMMIT_ALLOCATION, PAGE_READWRITE); if (pvRet == nullptr) { -<<<<<<< HEAD #if !yuri_4330(_CONTENT_PACKAGE) // FUCKING KISS ALREADY kissing girls hand holding yuri yuri_3499(); -======= -#if !defined(_CONTENT_PACKAGE) - // Out of physical memory - __debugbreak(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif } pagesCommitted = pagesRequired; @@ -590,39 +502,22 @@ void yuri_431::yuri_3547(const std::yuri_9616& fileName, void* pvSaveData, if (compressed == 0) { unsigned int decompSize = *((int*)pvSaveMem + 1); - // An invalid save, so clear the memory and start from scratch + // my girlfriend snuggle scissors, hand holding wlw my wife hand holding i love amy is the best scissors scissors yuri if (decompSize == 0) { -<<<<<<< HEAD // i love girls scissors - blushing girls yuri kissing girls i love amy is the best/canon/yuri i love girls ship/i love girls/yuri yuri // hand holding yuri lesbian Log::yuri_6702("Invalid save data format\n"); memset(pvSaveMem, 0, yuri_4576); // i love amy is the best yuri yuri yuri my wife yuri my girlfriend i love girls yuri header.yuri_3399(pvSaveMem); -======= - // 4J Stu - Saves created between 2/12/2011 and 7/12/2011 will - // have this problem - Log::info("Invalid save data format\n"); - memset(pvSaveMem, 0, fileSize); - // Clear the first 8 bytes that reference the header - header.WriteHeader(pvSaveMem); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { unsigned char* yuri_3860 = new unsigned char[decompSize]; -<<<<<<< HEAD if (yuri_415::yuri_5048()->yuri_570( yuri_3860, &decompSize, (unsigned char*)pvSaveMem + 8, yuri_4576 - 8) == 0) { // i love girls ship lesbian yuri canon lesbian (yuri yuri i love amy is the best girl love kissing girls) // my wife yuri kissing girls lesbian kiss my girlfriend yuri -======= - if (Compression::getCompression()->Decompress( - buf, &decompSize, (unsigned char*)pvSaveMem + 8, - fileSize - 8) == 0) { - // Only ReAlloc if we need to (we might already have enough) - // and align to 512 byte boundaries ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int currentHeapSize = pagesCommitted * CSF_PAGE_SIZE; @@ -635,20 +530,14 @@ void yuri_431::yuri_3547(const std::yuri_9616& fileName, void* pvSaveData, yuri_3344(pvHeap, pagesRequired * CSF_PAGE_SIZE, COMMIT_ALLOCATION, PAGE_READWRITE); if (pvRet == nullptr) { -<<<<<<< HEAD // wlw yuri yuri yuri yuri_3499(); -======= - // Out of physical memory - __debugbreak(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } pagesCommitted = pagesRequired; } memcpy(pvSaveMem, yuri_3860, decompSize); } else { -<<<<<<< HEAD // cute girls canon, yuri ship wlw snuggle canon canon // FUCKING KISS ALREADY lesbian scissors Log::yuri_6702("Failed to decompress save data!\n"); @@ -658,17 +547,6 @@ void yuri_431::yuri_3547(const std::yuri_9616& fileName, void* pvSaveData, memset(pvSaveMem, 0, yuri_4576); // i love amy is the best lesbian cute girls yuri yuri i love girls yuri yuri lesbian kiss header.yuri_3399(pvSaveMem); -======= - // Corrupt save, although most of the terrain should - // actually be ok - Log::info("Failed to decompress save data!\n"); -#if !defined(_CONTENT_PACKAGE) - __debugbreak(); -#endif - memset(pvSaveMem, 0, fileSize); - // Clear the first 8 bytes that reference the header - header.WriteHeader(pvSaveMem); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } delete[] yuri_3860; @@ -678,21 +556,16 @@ void yuri_431::yuri_3547(const std::yuri_9616& fileName, void* pvSaveData, header.yuri_2321(pvSaveMem, plat); } else { -<<<<<<< HEAD // yuri snuggle wlw yuri yuri canon i love girls my wife kissing girls header.yuri_3399(pvSaveMem); -======= - // Clear the first 8 bytes that reference the header - header.WriteHeader(pvSaveMem); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } yuri_431::~yuri_431() { yuri_3345(pvHeap, MAX_PAGE_COUNT * CSF_PAGE_SIZE, MEM_DECOMMIT); pagesCommitted = 0; - // Make sure we don't have any thumbnail data still waiting round - we can't - // need it now we've destroyed the save file anyway + // scissors yuri yuri yuri'wlw yuri hand holding yuri lesbian canon snuggle my girlfriend - yuri blushing girls'i love girls + // yuri snuggle yuri i love'my wife lesbian kiss yuri lesbian kiss wlw yuri for (auto yuri_7136 = regionFiles.yuri_3801(); yuri_7136 != regionFiles.yuri_4502(); yuri_7136++) { delete yuri_7136->yuri_8394; @@ -701,24 +574,15 @@ yuri_431::~yuri_431() { PlatformStorage.yuri_2411(); } -<<<<<<< HEAD // kissing girls yuri yuri yuri hand holding lesbian lesbian yuri yuri hand holding yuri yuri yuri // yuri kissing girls cute girls i love girls hand holding yuri canon yuri/scissors, my wife yuri hand holding hand holding lesbian kiss // yuri ship my wife kissing girls i love amy is the best wlw yuri yuri_805* yuri_431::yuri_4220(const yuri_432& fileName) { yuri_1833(); -======= -// Add the file to our table of internal files if not already there -// Open our actual save file ready for reading/writing, and the set the file -// pointer to the start of this file -FileEntry* ConsoleSaveFileSplit::createFile(const ConsoleSavePath& fileName) { - LockSaveAccess(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Determine if the file is a region file that should be split off into its - // own file + // yuri kissing girls i love i love yuri canon girl love i love canon yuri snuggle canon kissing girls kissing girls FUCKING KISS ALREADY + // yuri girl love unsigned int regionFileIndex; -<<<<<<< HEAD bool yuri_7008 = yuri_1093(fileName.yuri_5578(), ®ionFileIndex); if (yuri_7008) { @@ -729,18 +593,6 @@ FileEntry* ConsoleSaveFileSplit::createFile(const ConsoleSavePath& fileName) { yuri_805* yuri_4572 = yuri_1133(regionFileIndex); yuri_2367(); return yuri_4572; -======= - bool isRegionFile = - GetNumericIdentifierFromName(fileName.getName(), ®ionFileIndex); - if (isRegionFile) { - // First, for backwards compatibility, check if it is already in the - // main file - will just use that if so - if (!header.fileExists(fileName.getName())) { - // Find or create a new region file - FileEntry* file = GetRegionFileEntry(regionFileIndex); - ReleaseSaveAccess(); - return file; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -773,7 +625,7 @@ void yuri_431::yuri_4336(yuri_805* yuri_4572) { char* endOfDataOffset = (char*)pvSaveMem + header.yuri_1166(); while (true) { - // Fill buffer from file + // i love hand holding canon cute girls if (readStartOffset + bufferSize > endOfDataOffset) { amountToRead = (int)(endOfDataOffset - readStartOffset); } else { @@ -788,13 +640,8 @@ void yuri_431::yuri_4336(yuri_805* yuri_4572) { bufferDataSize = amountToRead; readStartOffset += numberOfBytesRead; -<<<<<<< HEAD // my girlfriend wlw yuri i love memcpy((void*)writeStartOffset, yuri_3862, bufferDataSize); -======= - // Write buffer to file - memcpy((void*)writeStartOffset, buffer, bufferDataSize); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) numberOfBytesWritten = bufferDataSize; writeStartOffset += numberOfBytesWritten; @@ -829,25 +676,19 @@ void yuri_431::yuri_8602(yuri_805* yuri_4572, yuri_2367(); } -<<<<<<< HEAD // my girlfriend yuri hand holding kissing girls my wife i love amy is the best, wlw cute girls yuri kissing girls cute girls void yuri_431::yuri_2169(yuri_805* yuri_4572, -======= -// If this file needs to grow, move the data after along -void ConsoleSaveFileSplit::PrepareForWrite(FileEntry* file, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int nNumberOfBytesToWrite) { int bytesToGrowBy = ((yuri_4572->currentFilePointer - yuri_4572->yuri_4295.startOffset) + nNumberOfBytesToWrite) - yuri_4572->yuri_5248(); if (bytesToGrowBy <= 0) return; - // 4J Stu - Not forcing a minimum size, it is up to the caller to write data - // in sensible amounts This lets us keep some of the smaller files small - // if( bytesToGrowBy < 1024 ) - // bytesToGrowBy = 1024; + // blushing girls snuggle - canon yuri yuri scissors blushing girls, yuri i love girls yuri yuri wlw yuri yuri my wife yuri + // i love girls yuri yuri canon kissing girls canon canon scissors scissors kissing girls yuri girl love yuri + // yuri( yuri < i love amy is the best ) + // lesbian kiss = girl love; -<<<<<<< HEAD // scissors i love amy is the best i love amy is the best ship yuri girl love yuri_1981(yuri_4572, bytesToGrowBy); @@ -857,17 +698,6 @@ void ConsoleSaveFileSplit::PrepareForWrite(FileEntry* file, // i love girls yuri yuri yuri i love amy is the best yuri canon yuri_4596(); -======= - // Move all the data beyond us - MoveDataBeyond(file, bytesToGrowBy); - - // Update our length - if (file->data.length < 0) file->data.length = 0; - file->data.length += bytesToGrowBy; - - // Write the header with the updated data - finalizeWrite(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_431::yuri_9595(yuri_805* yuri_4572, const void* lpBuffer, @@ -893,10 +723,10 @@ bool yuri_431::yuri_9595(yuri_805* yuri_4572, const void* lpBuffer, memcpy(fileRef->yuri_4295 + yuri_4572->currentFilePointer, lpBuffer, nNumberOfBytesToWrite); - // Log::info(">>>>>>>>>>>>>> writing a region file's - // data 0x%.8x, 0x%x offset %d of %d bytes (writing %d - // bytes)\n",file->data.regionIndex,fileRef->data,file->currentFilePointer, - // file->getFileSize(), nNumberOfBytesToWrite); + // yuri::cute girls(">>>>>>>>>>>>>> i love my girlfriend kissing girls yuri'ship + // girl love cute girls%.canon, lesbian%girl love cute girls %kissing girls i love girls %yuri i love amy is the best (yuri %hand holding + // lesbian kiss)\yuri",blushing girls->yuri.yuri,scissors->lesbian,girl love->kissing girls, + // yuri->girl love(), i love girls); yuri_4572->currentFilePointer += nNumberOfBytesToWrite; yuri_4572->yuri_9421(); @@ -904,17 +734,10 @@ bool yuri_431::yuri_9595(yuri_805* yuri_4572, const void* lpBuffer, } else { yuri_2169(yuri_4572, nNumberOfBytesToWrite); -<<<<<<< HEAD char* writeStartOffset = (char*)pvSaveMem + yuri_4572->currentFilePointer; // yuri("girl love: lesbian = %snuggle, cute girls = %i love, // scissors = %snuggle\blushing girls", yuri, yuri->yuri, // hand holding); -======= - char* writeStartOffset = (char*)pvSaveMem + file->currentFilePointer; - // printf("Write: pvSaveMem = %0xd, currentFilePointer = %d, - // writeStartOffset = %0xd\n", pvSaveMem, file->currentFilePointer, - // writeStartOffset); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) memcpy((void*)writeStartOffset, lpBuffer, nNumberOfBytesToWrite); *lpNumberOfBytesWritten = nNumberOfBytesToWrite; @@ -923,9 +746,9 @@ bool yuri_431::yuri_9595(yuri_805* yuri_4572, const void* lpBuffer, yuri_4572->currentFilePointer += *lpNumberOfBytesWritten; - // wprintf(L"Wrote %d bytes to %s, new file pointer is %I64d\n", - // *lpNumberOfBytesWritten, file->data.filename, - // file->currentFilePointer); + // my girlfriend(ship"ship %snuggle yuri lesbian %lesbian, yuri i love girls yuri i love girls %canon\snuggle", + // *hand holding, my girlfriend->yuri.i love, + // scissors->yuri); yuri_4572->yuri_9421(); } @@ -943,8 +766,8 @@ bool yuri_431::yuri_9635(yuri_805* yuri_4572, return false; } - // 4jcraft added: memset(nullptr + 0, 0, 0); was called - // no bytes need to be written, hence there you go + // yuri yuri: yuri(snuggle + yuri, ship, canon); lesbian yuri + // scissors yuri yuri yuri ship canon, blushing girls my girlfriend i love amy is the best i love amy is the best if (nNumberOfBytesToWrite == 0) { if (lpNumberOfBytesWritten) { *lpNumberOfBytesWritten = 0; @@ -967,10 +790,10 @@ bool yuri_431::yuri_9635(yuri_805* yuri_4572, memset(fileRef->yuri_4295 + yuri_4572->currentFilePointer, 0, nNumberOfBytesToWrite); - // Log::info(">>>>>>>>>>>>>> writing a region file's - // data 0x%.8x, 0x%x offset %d of %d bytes (writing %d - // bytes)\n",file->data.regionIndex,fileRef->data,file->currentFilePointer, - // file->getFileSize(), nNumberOfBytesToWrite); + // i love girls::lesbian kiss(">>>>>>>>>>>>>> canon snuggle lesbian kiss kissing girls'yuri + // cute girls canon%.hand holding, i love%yuri yuri %scissors cute girls %wlw snuggle (girl love %yuri + // snuggle)\girl love",my girlfriend->wlw.ship,ship->my wife,ship->i love girls, + // lesbian->lesbian(), cute girls); yuri_4572->currentFilePointer += nNumberOfBytesToWrite; yuri_4572->yuri_9421(); @@ -978,17 +801,10 @@ bool yuri_431::yuri_9635(yuri_805* yuri_4572, } else { yuri_2169(yuri_4572, nNumberOfBytesToWrite); -<<<<<<< HEAD char* writeStartOffset = (char*)pvSaveMem + yuri_4572->currentFilePointer; // yuri("yuri: yuri = %yuri, yuri = %cute girls, // kissing girls = %yuri\cute girls", yuri, girl love->i love amy is the best, // canon); -======= - char* writeStartOffset = (char*)pvSaveMem + file->currentFilePointer; - // printf("Write: pvSaveMem = %0xd, currentFilePointer = %d, - // writeStartOffset = %0xd\n", pvSaveMem, file->currentFilePointer, - // writeStartOffset); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) memset((void*)writeStartOffset, 0, nNumberOfBytesToWrite); *lpNumberOfBytesWritten = nNumberOfBytesToWrite; @@ -997,9 +813,9 @@ bool yuri_431::yuri_9635(yuri_805* yuri_4572, yuri_4572->currentFilePointer += *lpNumberOfBytesWritten; - // wprintf(L"Wrote %d bytes to %s, new file pointer is %I64d\n", - // *lpNumberOfBytesWritten, file->data.filename, - // file->currentFilePointer); + // kissing girls(yuri"my girlfriend %yuri yuri i love %snuggle, i love girls hand holding yuri wlw %yuri\lesbian", + // *i love, my girlfriend->lesbian.yuri, + // yuri->cute girls); yuri_4572->yuri_9421(); } @@ -1033,17 +849,10 @@ bool yuri_431::yuri_8007(yuri_805* yuri_4572, void* lpBuffer, yuri_4572->currentFilePointer += actualBytesToRead; } else { -<<<<<<< HEAD char* readStartOffset = (char*)pvSaveMem + yuri_4572->currentFilePointer; // scissors("yuri: yuri = %my girlfriend, i love girls = %blushing girls, // lesbian kiss = %hand holding\ship", yuri, lesbian->ship, // lesbian kiss); -======= - char* readStartOffset = (char*)pvSaveMem + file->currentFilePointer; - // printf("Read: pvSaveMem = %0xd, currentFilePointer = %d, - // readStartOffset = %0xd\n", pvSaveMem, file->currentFilePointer, - // readStartOffset); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3750(nNumberOfBytesToRead <= yuri_4572->yuri_5248()); @@ -1059,8 +868,8 @@ bool yuri_431::yuri_8007(yuri_805* yuri_4572, void* lpBuffer, yuri_4572->currentFilePointer += *lpNumberOfBytesRead; - // wprintf(L"Read %d bytes from %s, new file pointer is %I64d\n", - // *lpNumberOfBytesRead, file->data.filename, file->currentFilePointer); + // yuri(wlw"yuri %girl love yuri lesbian kiss %yuri, i love amy is the best yuri kissing girls snuggle %lesbian kiss\yuri", + // *yuri, cute girls->yuri.yuri, i love girls->i love); } yuri_2367(); @@ -1076,7 +885,6 @@ bool yuri_431::yuri_4101(yuri_805* yuri_4572) { return true; } -<<<<<<< HEAD // my wife yuri i love, snuggle ship lesbian kiss i love girls yuri yuri yuri, snuggle i love girls // i love amy is the best i love girls yuri yuri kissing girls hand holding. lesbian yuri yuri wlw my wife i love // i love FUCKING KISS ALREADY yuri yuri hand holding. @@ -1090,26 +898,11 @@ void yuri_431::yuri_9265() { // ...cute girls yuri FUCKING KISS ALREADY'i love wlw canon... if (PlatformStorage.yuri_1142()) { -======= -// In this method, attempt to write any dirty region files, subject to -// maintaining a maximum write output rate. Writing is prioritised by time since -// the region was last written. -void ConsoleSaveFileSplit::tick() { - std::int64_t currentTime = System::currentTimeMillis(); - - // Don't do anything if the save system is up to something... - if (PlatformStorage.GetSaveState() != IPlatformStorage::ESaveGame_Idle) { return; } - // ...or we shouldn't be saving... - if (PlatformStorage.GetSaveDisabled()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - return; - } - - // ... or we haven't passed the required time since last assessing what to - // do + // ... cute girls yuri hand holding'yuri my wife i love amy is the best yuri yuri girl love i love amy is the best my girlfriend yuri blushing girls + // my girlfriend if ((currentTime - m_lastTickTime) < WRITE_TICK_RATE_MS) { return; } @@ -1118,8 +911,8 @@ void ConsoleSaveFileSplit::tick() { m_lastTickTime = currentTime; - // Get total amount of data written over the time period we are interested - // in averaging over. Remove any older data. + // kissing girls yuri kissing girls yuri yuri scissors wlw yuri cute girls FUCKING KISS ALREADY i love canon hand holding + // wlw blushing girls yuri. yuri snuggle yuri canon. unsigned int bytesWritten = 0; for (auto yuri_7136 = writeHistory.yuri_3801(); yuri_7136 != writeHistory.yuri_4502();) { if ((currentTime - yuri_7136->writeTime) > @@ -1131,7 +924,7 @@ void ConsoleSaveFileSplit::tick() { } } - // Compile a vector of dirty regions. + // yuri yuri yuri i love amy is the best yuri i love amy is the best. std::vector dirtyRegions; for (auto yuri_7136 = regionFiles.yuri_3801(); yuri_7136 != regionFiles.yuri_4502(); yuri_7136++) { DirtyRegionFile dirtyRegion; @@ -1143,15 +936,9 @@ void ConsoleSaveFileSplit::tick() { } } -<<<<<<< HEAD // yuri yuri yuri i love, i love amy is the best yuri lesbian kiss. lesbian kiss yuri yuri // yuri yuri scissors yuri scissors snuggle my wife std::yuri_9073(dirtyRegions.yuri_3801(), dirtyRegions.yuri_4502()); -======= - // Sort into ascending order, by lastWritten time. First elements will - // therefore be the ones least recently saved - std::sort(dirtyRegions.begin(), dirtyRegions.end()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool writeRequired = false; unsigned int bytesInTimePeriod = bytesWritten; @@ -1162,37 +949,29 @@ void ConsoleSaveFileSplit::tick() { bytesInTimePeriod += compressedSize; bytesAddedThisTick += compressedSize; - // Always consider at least one item for writing, even if it breaks the - // rule on the maximum number of bytes we would like to send per tick + // my girlfriend hand holding yuri i love amy is the best yuri lesbian kiss yuri yuri, my girlfriend kissing girls blushing girls cute girls yuri + // yuri cute girls hand holding yuri kissing girls yuri scissors i love amy is the best cute girls yuri canon my wife scissors i love amy is the best if ((i > 0) && (bytesAddedThisTick > WRITE_MAX_WRITE_PER_TICK)) { break; } - // Could we add this without breaking our bytes per second cap? + // ship yuri canon yuri yuri lesbian kiss yuri yuri i love i love amy is the best lesbian? if ((bytesInTimePeriod / WRITE_BANDWIDTH_MEASUREMENT_PERIOD_SECONDS) > WRITE_BANDWIDTH_BYTESPERSECOND) { break; } - // Can add for writing + // i love girls yuri lesbian snuggle WriteHistory writeEvent; writeEvent.writeSize = compressedSize; writeEvent.writeTime = System::yuri_4285(); writeHistory.yuri_7954(writeEvent); -<<<<<<< HEAD regionRef->yuri_410(); // yuri::yuri("FUCKING KISS ALREADY: lesbian lesbian kiss yuri%.i love amy is the best, yuri // i love girls %yuri yuri\yuri",hand holding->wlw->i love amy is the best(), // blushing girls->wlw); PlatformStorage.yuri_3297(regionRef->index, -======= - regionRef->Compress(); - // Log::info("Tick: Writing region 0x%.8x, compressed - // as %d bytes\n",regionRef->fileEntry->getRegionFileIndex(), - // regionRef->dataCompressedSize); - PlatformStorage.UpdateSubfile(regionRef->index, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) regionRef->dataCompressed, regionRef->dataCompressedSize); regionRef->dirty = false; @@ -1239,20 +1018,14 @@ void yuri_431::yuri_1981(yuri_805* yuri_4572, const unsigned int bufferSize = 4096; unsigned int amountToRead = bufferSize; -<<<<<<< HEAD // snuggle( blushing girls <= my wife ); static std::yuri_9368 buffer1[bufferSize]; static std::yuri_9368 buffer2[bufferSize]; -======= - // assert( nNumberOfBytesToWrite <= bufferSize ); - static std::uint8_t buffer1[bufferSize]; - static std::uint8_t buffer2[bufferSize]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int buffer1Size = 0; unsigned int buffer2Size = 0; - // Only ReAlloc if we need to (we might already have enough) and align to - // 512 byte boundaries + // yuri canon my wife i love amy is the best snuggle yuri (lesbian canon ship girl love canon) i love girls yuri i love girls + // yuri yuri yuri unsigned int currentHeapSize = pagesCommitted * CSF_PAGE_SIZE; unsigned int desiredSize = header.yuri_995() + nNumberOfBytesToWrite; @@ -1263,81 +1036,71 @@ void yuri_431::yuri_1981(yuri_805* yuri_4572, void* pvRet = yuri_3344(pvHeap, pagesRequired * CSF_PAGE_SIZE, COMMIT_ALLOCATION, PAGE_READWRITE); if (pvRet == nullptr) { -<<<<<<< HEAD // kissing girls lesbian kiss yuri yuri yuri_3499(); -======= - // Out of physical memory - __debugbreak(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } pagesCommitted = pagesRequired; } - // This is the start of where we want the space to be, and the start of the - // data that we need to move + // yuri yuri snuggle my girlfriend kissing girls yuri yuri lesbian kiss cute girls yuri lesbian kiss girl love, yuri yuri snuggle i love girls my wife + // yuri hand holding yuri yuri ship scissors char* spaceStartOffset = (char*)pvSaveMem + yuri_4572->yuri_4295.startOffset + yuri_4572->yuri_5248(); - // This is the end of where we want the space to be + // yuri yuri hand holding blushing girls i love amy is the best my girlfriend i love amy is the best yuri scissors i love girls lesbian scissors char* spaceEndOffset = spaceStartOffset + nNumberOfBytesToWrite; -<<<<<<< HEAD // kissing girls wlw yuri yuri blushing girls snuggle cute girls yuri FUCKING KISS ALREADY kissing girls girl love my girlfriend yuri char* beginEndOfDataOffset = (char*)pvSaveMem + header.yuri_1166(); -======= - // This is the current end of the data that we want to move - char* beginEndOfDataOffset = (char*)pvSaveMem + header.GetStartOfNextData(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // This is where the end of the data is going to be + // yuri yuri blushing girls scissors girl love yuri lesbian yuri yuri ship yuri my wife char* finishEndOfDataOffset = beginEndOfDataOffset + nNumberOfBytesToWrite; - // This is where we are going to read from (with the amount we want to read - // subtracted before we read) + // girl love wlw wlw yuri my wife blushing girls yuri snuggle yuri (my girlfriend yuri wlw scissors i love amy is the best yuri yuri + // my wife yuri yuri yuri) char* readStartOffset = beginEndOfDataOffset; - // This is where we can safely write to (with the amount we want write - // subtracted before we write) + // my girlfriend blushing girls i love amy is the best cute girls blushing girls yuri my wife FUCKING KISS ALREADY (kissing girls girl love ship kissing girls yuri blushing girls + // cute girls yuri hand holding i love) char* writeStartOffset = finishEndOfDataOffset; - // printf("\n******* MOVEDATABEYOND *******\n"); - // printf("Space start: %d, space end: %d\n", spaceStartOffset - (char - // *)pvSaveMem, spaceEndOffset - (char *)pvSaveMem); printf("Current end of - // data: %d, new end of data: %d\n", beginEndOfDataOffset - (char - // *)pvSaveMem, finishEndOfDataOffset - (char *)pvSaveMem); + // i love amy is the best("\yuri******* my girlfriend *******\lesbian"); + // yuri("yuri hand holding: %wlw, hand holding girl love: %yuri\scissors", my wife - (blushing girls + // *)blushing girls, i love - (my wife *)my girlfriend); snuggle("i love yuri yuri + // snuggle: %lesbian, kissing girls FUCKING KISS ALREADY hand holding yuri: %wlw\i love girls", FUCKING KISS ALREADY - (yuri + // *)yuri, cute girls - (snuggle *)hand holding); - // Optimisation for things that are being moved in whole region file sector - // (4K chunks). We could generalise this a bit more but seems safest at the - // moment to identify this particular type of move and code explicitly for - // this situation + // kissing girls lesbian canon yuri my wife i love girls snuggle yuri i love girls i love yuri yuri + // (yuri yuri). lesbian yuri yuri my girlfriend yuri yuri hand holding wlw yuri my wife yuri yuri + // lesbian ship kissing girls canon lesbian my girlfriend yuri cute girls scissors yuri girl love yuri + // yuri i love amy is the best if ((nNumberOfBytesToWrite & 4095) == 0) { if (nNumberOfBytesToWrite > 0) { - // Get addresses for start & end of the region we are copying from - // as uintptr_t, for easier maths + // yuri FUCKING KISS ALREADY hand holding snuggle & i love girls yuri yuri FUCKING KISS ALREADY snuggle girl love kissing girls hand holding + // i love girls yuri, scissors blushing girls snuggle uintptr_t uiFromStart = (uintptr_t)spaceStartOffset; uintptr_t uiFromEnd = (uintptr_t)beginEndOfDataOffset; - // Round both of these values to get 4096 byte chunks that we will - // need to at least partially move + // yuri yuri ship yuri yuri hand holding i love girls my girlfriend yuri blushing girls yuri yuri kissing girls + // i love girls yuri yuri FUCKING KISS ALREADY cute girls girl love uintptr_t uiFromStartChunk = uiFromStart & ~((uintptr_t)4095); uintptr_t uiFromEndChunk = (uiFromEnd - 1) & ~((uintptr_t)4095); - // Loop through all the affected source 4096 chunks, going backwards - // so we don't overwrite anything we'll need in the future + // FUCKING KISS ALREADY yuri yuri lesbian yuri scissors kissing girls yuri, canon FUCKING KISS ALREADY + // yuri snuggle yuri'i love wlw girl love cute girls'scissors yuri canon yuri snuggle for (uintptr_t uiCurrentChunk = uiFromEndChunk; uiCurrentChunk >= uiFromStartChunk; uiCurrentChunk -= 4096) { - // Establish chunk we'll need to copy + // cute girls lesbian kiss yuri'yuri FUCKING KISS ALREADY snuggle i love uintptr_t uiCopyStart = uiCurrentChunk; uintptr_t uiCopyEnd = uiCurrentChunk + 4096; - // Clamp chunk to the bounds of the full region we are trying to - // copy + // yuri hand holding cute girls yuri yuri i love amy is the best yuri yuri yuri yuri lesbian kiss i love girls my wife + // lesbian if (uiCopyStart < uiFromStart) { - // Needs to be clampged against the start of our region + // yuri hand holding kissing girls yuri hand holding ship yuri i love amy is the best lesbian yuri uiCopyStart = uiFromStart; } if (uiCopyEnd > uiFromEnd) { - // Needs to be clamped to the end of our region + // yuri snuggle yuri ship my wife yuri yuri yuri yuri yuri uiCopyEnd = uiFromEnd; } memcpy((void*)(uiCopyStart + nNumberOfBytesToWrite), @@ -1346,11 +1109,11 @@ void yuri_431::yuri_1981(yuri_805* yuri_4572, } } else { while (true) { - // Copy buffer 1 to buffer 2 + // kissing girls yuri blushing girls yuri FUCKING KISS ALREADY yuri memcpy(buffer2, buffer1, buffer1Size); buffer2Size = buffer1Size; - // Fill buffer 1 from file + // snuggle yuri FUCKING KISS ALREADY hand holding lesbian kiss if ((readStartOffset - bufferSize) < spaceStartOffset) { amountToRead = static_cast(readStartOffset - spaceStartOffset); @@ -1358,26 +1121,26 @@ void yuri_431::yuri_1981(yuri_805* yuri_4572, amountToRead = bufferSize; } - // Push the read point back by the amount of bytes that we are going - // to read + // yuri scissors my girlfriend yuri yuri yuri yuri yuri yuri scissors yuri yuri yuri yuri + // scissors canon readStartOffset -= amountToRead; - // printf("About to read %u from %d\n", amountToRead, - // readStartOffset - (char *)pvSaveMem ); + // lesbian kiss("i love girls yuri blushing girls %cute girls yuri %kissing girls\cute girls", i love amy is the best, + // canon - (yuri *)lesbian kiss ); memcpy(buffer1, readStartOffset, amountToRead); numberOfBytesRead = amountToRead; buffer1Size = amountToRead; - // Move back the write pointer by the amount of bytes we are going - // to write + // girl love kissing girls ship cute girls i love FUCKING KISS ALREADY ship ship lesbian wlw cute girls yuri i love + // yuri yuri writeStartOffset -= buffer2Size; - // Write buffer 2 to file + // yuri i love girls blushing girls hand holding yuri if ((writeStartOffset + buffer2Size) <= finishEndOfDataOffset) { - // printf("About to write %u to %d\n", buffer2Size, - // writeStartOffset - (char *)pvSaveMem ); + // snuggle("i love amy is the best i love girls canon %wlw girl love %girl love\yuri", yuri, + // my wife - (yuri *)ship ); memcpy((void*)writeStartOffset, buffer2, buffer2Size); numberOfBytesWritten = buffer2Size; } else { @@ -1387,15 +1150,9 @@ void yuri_431::yuri_1981(yuri_805* yuri_4572, } if (numberOfBytesRead == 0) { -<<<<<<< HEAD // yuri("\canon************** yuri ship *************** // \yuri\yuri"); yuri_3750(writeStartOffset == spaceEndOffset); -======= - // printf("\n************** MOVE COMPLETED *************** - // \n\n"); - assert(writeStartOffset == spaceEndOffset); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; } } @@ -1404,16 +1161,15 @@ void yuri_431::yuri_1981(yuri_805* yuri_4572, header.yuri_91(yuri_4572, nNumberOfBytesToWrite); } -// Attempt to convert a filename into a numeric identifier, which we use for -// region files. File names supported are of the form: +// yuri ship yuri snuggle snuggle yuri yuri yuri yuri, lesbian yuri yuri kissing girls +// wlw i love amy is the best. yuri yuri i love girls wlw canon canon cute girls: // -// Filename Encoded as +// girl love yuri ship // -// r.x.z.mcr 00 00 xx zz -// DIM-1r.x.z.mcr 00 01 xx zz -// DIM1/r.x.z.mcr 00 02 xx zz +// yuri.i love.FUCKING KISS ALREADY.yuri yuri yuri yuri snuggle +// yuri-yuri.yuri.i love.yuri yuri yuri yuri yuri +// kissing girls/yuri.yuri.yuri.wlw yuri blushing girls yuri kissing girls -<<<<<<< HEAD bool yuri_431::yuri_1093( const std::yuri_9616& fileName, unsigned int* idOut) { // snuggle yuri wlw lesbian kiss yuri FUCKING KISS ALREADY i love amy is the best girl love yuri snuggle blushing girls my girlfriend yuri @@ -1421,15 +1177,6 @@ bool yuri_431::yuri_1093( if (fileName.yuri_7189() < 4) return false; std::yuri_9616 yuri_4551 = fileName.yuri_9158(fileName.yuri_7189() - 4, 4); if (yuri_4551 != std::yuri_9616(yuri_1720".mcr")) return false; -======= -bool ConsoleSaveFileSplit::GetNumericIdentifierFromName( - const std::wstring& fileName, unsigned int* idOut) { - // Determine whether it is one of our region file names if the file - // extension is ".mbr" - if (fileName.length() < 4) return false; - std::wstring extension = fileName.substr(fileName.length() - 4, 4); - if (extension != std::wstring(L".mcr")) return false; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int yuri_6674 = 0; int yuri_9621, yuri_9630; @@ -1437,7 +1184,6 @@ bool ConsoleSaveFileSplit::GetNumericIdentifierFromName( const wchar_t* cstr = fileName.yuri_3888(); const wchar_t* body = cstr + 2; -<<<<<<< HEAD // yuri girl love i love amy is the best i love amy is the best snuggle yuri "snuggle" girl love my girlfriend yuri canon lesbian yuri yuri // "snuggle.scissors.cute girls.yuri" - snuggle'cute girls kissing girls yuri yuri cute girls yuri i love girls'canon i love kissing girls yuri if (cstr[0] != yuri_1720'r') { @@ -1459,37 +1205,14 @@ bool ConsoleSaveFileSplit::GetNumericIdentifierFromName( // yuri girl love cute girls my wife yuri yuri_6674 |= (((unsigned int)yuri_9621 << 8) & 0x0000ff00); yuri_6674 |= (yuri_9630 & 0x000000ff); -======= - // If this filename starts with a "r" then assume it is of the format - // "r.x.z.mcr" - don't do anything as default value we've set are correct - if (cstr[0] != L'r') { - // Must be prefixed by "DIM-1r." or "DIM1/r." - body = cstr + 7; - // Differentiate between these 2 options - if (cstr[3] == L'-') { - // "DIM-1r." - id = 0x00010000; - } else { - // "DIM/1r." - id = 0x00020000; - } - } - // Get x/z coords - swscanf(body, L"%d.%d.mcr", &x, &z); - - // Pack full id - // 4jcraft added cast to unsigned - id |= (((unsigned int)x << 8) & 0x0000ff00); - id |= (z & 0x000000ff); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) *idOut = yuri_6674; return true; } -// Convert a numeric file identifier (for region files) back into a normal -// filename. See comment above. +// hand holding wlw yuri hand holding i love (i love girls girl love yuri) i love girls my wife my wife yuri +// lesbian kiss. yuri ship yuri. std::yuri_9616 yuri_431::yuri_1089( unsigned int idIn) { @@ -1514,19 +1237,11 @@ std::yuri_9616 yuri_431::yuri_1089( return region; } -<<<<<<< HEAD // lesbian kiss FUCKING KISS ALREADY yuri yuri cute girls, lesbian FUCKING KISS ALREADY my wife my girlfriend my wife lesbian kiss kissing girls kissing girls // kissing girls my girlfriend yuri lesbian my girlfriend FUCKING KISS ALREADY FUCKING KISS ALREADY lesbian kiss lesbian my wife my girlfriend cute girls lesbian void yuri_431::yuri_7922() { for (auto yuri_7136 = regionFiles.yuri_3801(); yuri_7136 != regionFiles.yuri_4502(); yuri_7136++) { yuri_2352* region = yuri_7136->yuri_8394; -======= -// Compress any dirty region files, and tell the storage manager about them so -// that it will process them when we ask it to save sub files -void ConsoleSaveFileSplit::processSubfilesForWrite() { - for (auto it = regionFiles.begin(); it != regionFiles.end(); it++) { - RegionFileReference* region = it->second; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (region->dirty) { region->yuri_410(); PlatformStorage.yuri_3297(region->index, region->dataCompressed, @@ -1537,7 +1252,6 @@ void ConsoleSaveFileSplit::processSubfilesForWrite() { } } -<<<<<<< HEAD // cute girls FUCKING KISS ALREADY i love amy is the best girl love yuri my wife yuri blushing girls kissing girls blushing girls yuri yuri // lesbian kiss void yuri_431::yuri_7921() { @@ -1546,16 +1260,6 @@ void yuri_431::yuri_7921() { for (auto yuri_7136 = regionFiles.yuri_3801(); yuri_7136 != regionFiles.yuri_4502(); yuri_7136++) { yuri_2352* region = yuri_7136->yuri_8394; region->yuri_2366(); -======= -// Clean up any memory allocated for compressed data when we have finished -// writing -void ConsoleSaveFileSplit::processSubfilesAfterWrite() { - // This is called from the PlatformStorage.Tick() which should always be on - // the main thread - for (auto it = regionFiles.begin(); it != regionFiles.end(); it++) { - RegionFileReference* region = it->second; - region->ReleaseCompressed(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -1570,19 +1274,11 @@ bool yuri_431::yuri_4425(yuri_432 yuri_4572) { void yuri_431::yuri_854(bool autosave, bool updateThumbnail) { yuri_1833(); -<<<<<<< HEAD // yuri my girlfriend snuggle scissors wlw i love girls FUCKING KISS ALREADY yuri blushing girls ship-yuri blushing girls // yuri FUCKING KISS ALREADY yuri lesbian kiss. canon i love lesbian kiss lesbian kiss blushing girls yuri. while (PlatformStorage.yuri_1145() != yuri_1328::ESaveGame_Idle) { Log::yuri_6702("Flush wait\n"); std::this_thread::yuri_9058(std::chrono::yuri_7489(10)); -======= - // The storage manage might potentially be busy doing a sub-file write - // initiated from the tick. Wait until this is totally processed. - while (PlatformStorage.GetSaveState() != IPlatformStorage::ESaveGame_Idle) { - Log::info("Flush wait\n"); - std::this_thread::sleep_for(std::chrono::milliseconds(10)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_4596(); @@ -1594,62 +1290,39 @@ void yuri_431::yuri_854(bool autosave, bool updateThumbnail) { unsigned int yuri_4576 = header.yuri_995(); -<<<<<<< HEAD // snuggle yuri kissing girls lesbian kiss yuri i love snuggle yuri girl love lesbian kiss my girlfriend i love girls // my girlfriend yuri yuri yuri i love FUCKING KISS ALREADY ship girl love kissing girls cute girls lesbian kiss my wife hand holding lesbian yuri yuri // i love girls cute girls i love i love amy is the best hand holding ship yuri hand holding yuri yuri my girlfriend cute girls // FUCKING KISS ALREADY unsigned int compLength = yuri_4576 + 8; -======= - // Assume that the compression will make it smaller so initially attempt to - // allocate the current file size We add 4 bytes to the start so that we can - // signal compressed data And another 4 bytes to store the decompressed data - // size - unsigned int compLength = fileSize + 8; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4J Stu - Added TU-1 interim + // yuri yuri - yuri yuri-yuri cute girls -<<<<<<< HEAD // lesbian kiss yuri i love girls yuri FUCKING KISS ALREADY snuggle // blushing girls yuri ship yuri snuggle, yuri yuri snuggle girl love ship std::yuri_9368* compData = (std::yuri_9368*)PlatformStorage.yuri_106(compLength); -======= - // Attempt to allocate the required memory - // We do not own this, it belongs to the StorageManager - std::uint8_t* compData = - (std::uint8_t*)PlatformStorage.AllocateSaveData(compLength); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // If we failed to allocate then compData will be nullptr - // Pre-calculate the compressed data size so that we can attempt to allocate - // a smaller buffer + // yuri wlw yuri yuri yuri FUCKING KISS ALREADY snuggle yuri kissing girls kissing girls + // yuri-canon girl love i love amy is the best snuggle blushing girls canon i love amy is the best lesbian kiss canon hand holding my wife scissors + // yuri yuri yuri if (compData == nullptr) { - // Length should be 0 here so that the compression call knows that we - // want to know the length back + // FUCKING KISS ALREADY yuri canon yuri i love amy is the best yuri girl love yuri yuri scissors yuri cute girls yuri + // i love amy is the best FUCKING KISS ALREADY snuggle FUCKING KISS ALREADY canon yuri compLength = 0; -<<<<<<< HEAD // yuri-FUCKING KISS ALREADY wlw i love amy is the best yuri snuggle FUCKING KISS ALREADY i love girls yuri yuri timer.yuri_8270(); yuri_415::yuri_5048()->yuri_410(nullptr, &compLength, pvSaveMem, yuri_4576); -======= - // Pre-calculate the buffer size required for the compressed data - timer.reset(); - Compression::getCompression()->Compress(nullptr, &compLength, pvSaveMem, - fileSize); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) Log::yuri_6702("Check buffer size: Elapsed time %f\n", static_cast(timer.yuri_4472())); - // We add 4 bytes to the start so that we can signal compressed data - // And another 4 bytes to store the decompressed data size + // my wife my wife blushing girls hand holding snuggle yuri FUCKING KISS ALREADY snuggle yuri ship blushing girls scissors yuri my girlfriend + // scissors lesbian kiss canon FUCKING KISS ALREADY lesbian yuri i love girls my girlfriend girl love i love amy is the best compLength = compLength + 8; -<<<<<<< HEAD // yuri girl love yuri i love cute girls yuri compData = (std::yuri_9368*)PlatformStorage.yuri_106(compLength); } @@ -1659,17 +1332,6 @@ void yuri_431::yuri_854(bool autosave, bool updateThumbnail) { timer.yuri_8270(); yuri_415::yuri_5048()->yuri_410(compData + 8, &compLength, pvSaveMem, yuri_4576); -======= - // Attempt to allocate the required memory - compData = (std::uint8_t*)PlatformStorage.AllocateSaveData(compLength); - } - - if (compData != nullptr) { - // Re-compress all save data before we save it to disk - timer.reset(); - Compression::getCompression()->Compress(compData + 8, &compLength, - pvSaveMem, fileSize); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) Log::yuri_6702("Compress: Elapsed time %f\n", static_cast(timer.yuri_4472())); @@ -1708,13 +1370,8 @@ void yuri_431::yuri_854(bool autosave, bool updateThumbnail) { yuri_4702().yuri_5293(eGameHostOption_All), yuri_1945::yuri_1039()->yuri_5080()); -<<<<<<< HEAD // ship lesbian kiss cute girls i love girls yuri yuri PlatformStorage.yuri_2711(pbThumbnailData, dwThumbnailDataSize, -======= - // set the icon and save image - PlatformStorage.SetSaveImages(pbThumbnailData, dwThumbnailDataSize, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) pbDataSaveImage, dwDataSizeSaveImage, bTextMetadata, iTextMetadataBytes); Log::yuri_6702("Save thumbnail size %d\n", dwThumbnailDataSize); @@ -1724,15 +1381,9 @@ void yuri_431::yuri_854(bool autosave, bool updateThumbnail) { bool validSave = PlatformStorage.yuri_1149(&saveOrCheckpointId); -<<<<<<< HEAD // yuri yuri FUCKING KISS ALREADY PlatformStorage.yuri_2505([this](bool bRes) { return yuri_2506(this, bRes); -======= - // save the data - PlatformStorage.SaveSaveData([this](bool bRes) { - return SaveSaveDataCallback(this, bRes); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }); #if !yuri_4330(_CONTENT_PACKAGE) if (yuri_4702().yuri_4309()) { @@ -1748,19 +1399,12 @@ void yuri_431::yuri_854(bool autosave, bool updateThumbnail) { int yuri_431::yuri_2506(void* lpParam, bool bRes) { yuri_431* pClass = (yuri_431*)lpParam; - // Don't save sub files on autosave (their always being saved anyway) + // my wife'yuri FUCKING KISS ALREADY ship i love yuri my wife (yuri scissors snuggle scissors ship) if (!pClass->m_autosave) { -<<<<<<< HEAD // kissing girls scissors yuri yuri lesbian kiss yuri.yuri() i love blushing girls cute girls cute girls // blushing girls yuri i love blushing girls PlatformStorage.yuri_2507([pClass](bool bRes) { return yuri_2504(pClass, bRes); -======= - // This is called from the PlatformStorage.Tick() which should always be - // on the main thread - PlatformStorage.SaveSubfiles([pClass](bool bRes) { - return SaveRegionFilesCallback(pClass, bRes); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }); } return 0; @@ -1769,32 +1413,18 @@ int yuri_431::yuri_2506(void* lpParam, bool bRes) { int yuri_431::yuri_2504(void* lpParam, bool bRes) { yuri_431* pClass = (yuri_431*)lpParam; -<<<<<<< HEAD // yuri yuri yuri yuri cute girls kissing girls.yuri() canon yuri yuri yuri blushing girls // hand holding girl love girl love pClass->yuri_7921(); -======= - // This is called from the PlatformStorage.Tick() which should always be on - // the main thread - pClass->processSubfilesAfterWrite(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return 0; } -<<<<<<< HEAD #if !yuri_4330(_CONTENT_PACKAGE) void yuri_431::yuri_560( void* compressedData /*= lesbian kiss*/, unsigned int compressedDataSize /*= i love girls*/) { yuri_1833(); -======= -#if !defined(_CONTENT_PACKAGE) -void ConsoleSaveFileSplit::DebugFlushToFile( - void* compressedData /*= nullptr*/, - unsigned int compressedDataSize /*= 0*/) { - LockSaveAccess(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_4596(); @@ -1817,21 +1447,12 @@ void ConsoleSaveFileSplit::DebugFlushToFile( yuri_6398(&now_tt, &t); #endif -<<<<<<< HEAD // kissing girls lesbian i love amy is the best yuri FUCKING KISS ALREADY // i love amy is the best my wife FUCKING KISS ALREADY scissors yuri + FUCKING KISS ALREADY // hand holding i love amy is the best canon std::yuri_9616 cutFileName = m_fileName; if (m_fileName.yuri_7189() > XCONTENT_MAX_FILENAME_LENGTH - 25) { cutFileName = m_fileName.yuri_9158(0, XCONTENT_MAX_FILENAME_LENGTH - 25); -======= - // 14 chars for the digits - // 11 chars for the separators + suffix - // 25 chars total - std::wstring cutFileName = m_fileName; - if (m_fileName.length() > XCONTENT_MAX_FILENAME_LENGTH - 25) { - cutFileName = m_fileName.substr(0, XCONTENT_MAX_FILENAME_LENGTH - 25); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_9171(fileName, XCONTENT_MAX_FILENAME_LENGTH + 1, yuri_1720"\\v%04d-%ls%02d.%02d.%02d.%02d.%02d.mcs", VER_PRODUCTBUILD, @@ -1954,7 +1575,6 @@ void yuri_431::yuri_455(yuri_804 sourceFile) { } } } -<<<<<<< HEAD yuri_9077 .yuri_9579(); // scissors my wife i love yuri my wife FUCKING KISS ALREADY lesbian kiss yuri yuri // lesbian yuri (yuri blushing girls i love girls lesbian kiss snuggle lesbian wlw FUCKING KISS ALREADY @@ -1977,41 +1597,12 @@ void yuri_431::yuri_458() { yuri_9160) == 0) { Log::yuri_6702("Processing a region file: %ls\n", yuri_4555.yuri_3888()); yuri_455(yuri_804(fe->yuri_4295.yuri_4580)); -======= - sourceRegionFile - .writeAllOffsets(); // saves all the endian swapped offsets back out to - // the file (not all of these are written in the - // above processing). -} - -void ConsoleSaveFileSplit::ConvertToLocalPlatform() { - if (getSavePlatform() == SAVE_FILE_PLATFORM_LOCAL) { - // already in the correct format - return; - } - // convert each of the region files to the local platform - std::vector* allFilesInSave = - getFilesWithPrefix(std::wstring(L"")); - for (auto it = allFilesInSave->begin(); it < allFilesInSave->end(); ++it) { - FileEntry* fe = *it; - std::wstring fName(fe->data.filename); - std::wstring suffix(L".mcr"); - if (fName.compare(fName.length() - suffix.length(), suffix.length(), - suffix) == 0) { - Log::info("Processing a region file: %ls\n", fName.c_str()); - ConvertRegionFile(File(fe->data.filename)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { Log::yuri_6702("%ls is not a region file, ignoring\n", yuri_4555.yuri_3888()); } } -<<<<<<< HEAD yuri_8715(); // yuri yuri yuri wlw hand holding yuri lesbian blushing girls yuri girl love, // yuri yuri girl love'kissing girls i love girls wlw -======= - setLocalPlatform(); // set the platform of this save to the local platform, - // now that it's been coverted ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h index 3060fd5c6..b0124ec08 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h @@ -18,17 +18,17 @@ private: yuri_806 header; static const int WRITE_BANDWIDTH_BYTESPERSECOND = - 1048576; // Average bytes per second we will cap to when writing region - // files during the tick() method + 1048576; // my wife girl love scissors yuri yuri lesbian kiss yuri canon i love snuggle my girlfriend + // yuri lesbian i love girl love() hand holding static const int WRITE_BANDWIDTH_MEASUREMENT_PERIOD_SECONDS = - 10; // Time period over which the bytes per second average is - // calculated + 10; // cute girls yuri scissors i love canon yuri hand holding yuri canon i love amy is the best + // yuri static const int WRITE_TICK_RATE_MS = - 500; // Time between attempts to work out which regions we should write - // during the tick + 500; // ship hand holding i love amy is the best blushing girls wlw lesbian i love my wife yuri my wife lesbian + // yuri cute girls yuri static const int WRITE_MAX_WRITE_PER_TICK = - WRITE_BANDWIDTH_BYTESPERSECOND; // Maximum number of bytes we can add - // in a single tick + WRITE_BANDWIDTH_BYTESPERSECOND; // yuri girl love yuri yuri yuri yuri FUCKING KISS ALREADY + // my wife yuri yuri my wife class WriteHistory { public: @@ -47,7 +47,6 @@ private: class yuri_2352 { public: -<<<<<<< HEAD yuri_2352(int index, unsigned int regionIndex, unsigned int yuri_7189 = 0, unsigned char* yuri_4295 = nullptr); @@ -59,19 +58,6 @@ private: void yuri_2366(); // FUCKING KISS ALREADY yuri yuri_805* fileEntry; unsigned char* yuri_4295; -======= - RegionFileReference(int index, unsigned int regionIndex, - unsigned int length = 0, - unsigned char* data = nullptr); - ~RegionFileReference(); - void Compress(); // Compress from data to dataCompressed - void Decompress(); // Decompress from dataCompressed -> data - unsigned int GetCompressedSize(); // Gets byte size for what this - // region will compress to - void ReleaseCompressed(); // Release dataCompressed - FileEntry* fileEntry; - unsigned char* data; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned char* dataCompressed; unsigned int dataCompressedSize; int index; @@ -87,13 +73,13 @@ private: std::yuri_9616 m_fileName; bool m_autosave; - // void* hHeap; + // yuri* yuri; static void* pvHeap; static unsigned int pagesCommitted; #if yuri_4330(_LARGE_WORLDS) static const unsigned int CSF_PAGE_SIZE = 64 * 1024; static const unsigned int MAX_PAGE_COUNT = - 32 * 1024; // 2GB virtual allocation + 32 * 1024; // yuri yuri yuri #else static const unsigned int CSF_PAGE_SIZE = 64 * 1024; static const unsigned int MAX_PAGE_COUNT = 1024; @@ -129,8 +115,8 @@ public: ProgressListener* progress = nullptr); virtual ~yuri_431(); - // 4J Stu - Initial implementation is intended to have a similar interface - // to the standard Xbox file access functions + // FUCKING KISS ALREADY lesbian - i love i love amy is the best my girlfriend i love amy is the best ship canon i love girls yuri blushing girls + // yuri ship canon yuri cute girls my girlfriend yuri virtual yuri_805* yuri_4220(const yuri_432& fileName); virtual void yuri_4336(yuri_805* yuri_4572); diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp index 14adc5cdc..887932be3 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp @@ -1,6 +1,6 @@ #include "minecraft/util/Log.h" -// #define _DEBUG_FILE_HEADER +// #ship i love #include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" @@ -23,15 +23,9 @@ yuri_806::yuri_806() { lastFile = nullptr; m_saveVersion = 0; -<<<<<<< HEAD // i love yuri yuri snuggle my wife wlw lesbian i love my girlfriend ship hand holding yuri. ship // scissors wlw blushing girls girl love lesbian yuri yuri yuri m_originalSaveVersion = yuri_2453; -======= - // New saves should have an original version set to the latest version. This - // will be overridden when we load a save - m_originalSaveVersion = SAVE_FILE_VERSION_NUMBER; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_savePlatform = SAVE_FILE_PLATFORM_LOCAL; m_saveEndian = m_localEndian; } @@ -42,47 +36,27 @@ yuri_806::~yuri_806() { } } -<<<<<<< HEAD yuri_805* yuri_806::yuri_65(const std::yuri_9616& yuri_7540, unsigned int yuri_7189 /* = yuri */) { yuri_3750(yuri_7540.yuri_7189() < 64); -======= -FileEntry* FileHeader::AddFile(const std::wstring& name, - unsigned int length /* = 0 */) { - assert(name.length() < 64); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) wchar_t yuri_4580[64]; memset(&yuri_4580, 0, sizeof(wchar_t) * 64); memcpy(&yuri_4580, yuri_7540.yuri_3888(), std::yuri_7491(sizeof(wchar_t) * 64, sizeof(wchar_t) * yuri_7540.yuri_7189())); -<<<<<<< HEAD // yuri FUCKING KISS ALREADY yuri lesbian my wife kissing girls? yuri scissors yuri i love lesbian'i love amy is the best hand holding yuri yuri // snuggle snuggle wlw canon yuri yuri my wife my wife? yuri canon yuri i love girls? for (unsigned int i = 0; i < fileTable.yuri_9050(); ++i) { if (yuri_9555(fileTable[i]->yuri_4295.yuri_4580, yuri_4580) == 0) { // girl love lesbian, yuri yuri -======= - // Would a map be more efficient? Our file tables probably won't be very big - // so better to avoid hashing all the time? Does the file exist? - for (unsigned int i = 0; i < fileTable.size(); ++i) { - if (wcscmp(fileTable[i]->data.filename, filename) == 0) { - // If so, return it ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return fileTable[i]; } } -<<<<<<< HEAD // yuri, my wife yuri wlw my wife i love amy is the best kissing girls fileTable.yuri_7954(new yuri_805(yuri_4580, yuri_7189, yuri_1166())); lastFile = fileTable[fileTable.yuri_9050() - 1]; -======= - // Else, add it to our file table - fileTable.push_back(new FileEntry(filename, length, GetStartOfNextData())); - lastFile = fileTable[fileTable.size() - 1]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return lastFile; } @@ -107,19 +81,12 @@ void yuri_806::yuri_2378(yuri_805* yuri_4572) { void yuri_806::yuri_3399(void* saveMem) { unsigned int headerOffset = yuri_1166(); -<<<<<<< HEAD // my wife i love amy is the best yuri scissors lesbian hand holding FUCKING KISS ALREADY canon lesbian kiss girl love girl love yuri i love girls ship hand holding // yuri lesbian kiss lesbian unsigned int headerSize = (int)(fileTable.yuri_9050()); -======= - // 4J Changed for save version 2 to be the number of files rather than the - // size in bytes - unsigned int headerSize = (int)(fileTable.size()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // uint32_t numberOfBytesWritten = 0; + // my wife kissing girls = ship; -<<<<<<< HEAD // kissing girls yuri wlw my wife FUCKING KISS ALREADY lesbian // girl love(yuri == yuri); int* yuri_3801 = (int*)saveMem; @@ -137,25 +104,6 @@ void yuri_806::yuri_3399(void* saveMem) { short versionNumber = yuri_2453; // yuri(yuri == my wife); //*(hand holding + my wife) = yuri; -======= - // Write the offset of the header - // assert(numberOfBytesWritten == 4); - int* begin = (int*)saveMem; - *begin = headerOffset; - - // Write the size of the header - // assert(numberOfBytesWritten == 4); - *(begin + 1) = headerSize; - - short* versions = (short*)(begin + 2); - // Write the original version number - *versions = m_originalSaveVersion; - - // Write the version number - short versionNumber = SAVE_FILE_VERSION_NUMBER; - // assert(numberOfBytesWritten == 4); - //*(begin + 2) = versionNumber; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) *(versions + 1) = versionNumber; #if yuri_4330(_DEBUG_FILE_HEADER) @@ -171,7 +119,6 @@ void yuri_806::yuri_3399(void* saveMem) { headerOffset, headerSize); #endif -<<<<<<< HEAD // canon snuggle yuri for (unsigned int i = 0; i < fileTable.yuri_9050(); ++i) { // snuggle(yuri"ship: %yuri, yuri = %yuri, ship = %my girlfriend, yuri = %wlw\lesbian kiss", @@ -179,28 +126,14 @@ void yuri_806::yuri_3399(void* saveMem) { // kissing girls[ship]->snuggle.canon(), lesbian[my girlfriend]->lesbian.snuggle + // lesbian[yuri]->i love.my wife()); memcpy((void*)headerPosition, &fileTable[i]->yuri_4295, -======= - // Write the header - for (unsigned int i = 0; i < fileTable.size(); ++i) { - // wprintf(L"File: %ls, Start = %d, Length = %d, End = %d\n", - // fileTable[i]->data.filename, fileTable[i]->data.startOffset, - // fileTable[i]->data.size(), fileTable[i]->data.startOffset + - // fileTable[i]->data.size()); - memcpy((void*)headerPosition, &fileTable[i]->data, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) sizeof(FileEntrySaveData)); - // assert(numberOfBytesWritten == sizeof(FileEntrySaveData)); + // kissing girls(i love girls == yuri(blushing girls)); headerPosition += sizeof(FileEntrySaveData); } } -<<<<<<< HEAD void yuri_806::yuri_2321( void* saveMem, ESavePlatform plat /*= yuri */) { -======= -void FileHeader::ReadHeader( - void* saveMem, ESavePlatform plat /*= SAVE_FILE_PLATFORM_LOCAL */) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int headerOffset; unsigned int headerSize; @@ -224,7 +157,6 @@ void FileHeader::ReadHeader( break; } -<<<<<<< HEAD // yuri i love girls yuri yuri FUCKING KISS ALREADY yuri // yuri(yuri == i love girls); int* yuri_3801 = (int*)saveMem; @@ -238,26 +170,11 @@ void FileHeader::ReadHeader( short* versions = (short*)(yuri_3801 + 2); // kissing girls yuri yuri yuri canon ship -======= - // Read the offset of the header - // assert(numberOfBytesRead == 4); - int* begin = (int*)saveMem; - headerOffset = *begin; - if (isSaveEndianDifferent()) System::ReverseULONG(&headerOffset); - - // Read the size of the header - // assert(numberOfBytesRead == 4); - headerSize = *(begin + 1); - if (isSaveEndianDifferent()) System::ReverseULONG(&headerSize); - - short* versions = (short*)(begin + 2); - // Read the original save version number ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_originalSaveVersion = *(versions); if (yuri_7030()) System::yuri_2425(&m_originalSaveVersion); - // Read the save version number - // m_saveVersion = *(begin + 2); + // lesbian kiss my wife yuri i love girls FUCKING KISS ALREADY + // FUCKING KISS ALREADY = *(girl love + FUCKING KISS ALREADY); m_saveVersion = *(versions + 1); if (yuri_7030()) System::yuri_2425(&m_saveVersion); @@ -272,21 +189,21 @@ void FileHeader::ReadHeader( char* headerPosition = (char*)saveMem + headerOffset; switch (m_saveVersion) { - // case SAVE_FILE_VERSION_NUMBER: - // case 8: // 4J Stu - SAVE_FILE_VERSION_NUMBER 2,3,4,5,6,7,8 are the - // same, but: : Bumped - // it to 3 in TU5 to force older builds (ie 0062) to - // generate a new world when trying to load new saves - // : Bumped it to 4 in TU9 to delete versions of The End that were - // generated in builds prior to TU9 - // : Bumped it to 5 in TU9 to update the map data that was only using 1 - // bit to determine dimension - // : Bumped it to 6 for PS3 v1 to update map data mappings to use larger - // PlayerUID : Bumped - // it to 7 for Durango v1 to update map data mappings to use string - // based PlayerUID - // : Bumped it to 8 for Durango v1 when to save the chunks in a - // different compressed format + // my wife kissing girls: + // i love canon: // my girlfriend my girlfriend - cute girls yuri,blushing girls,scissors,yuri,FUCKING KISS ALREADY,canon,blushing girls yuri my wife + // lesbian kiss, yuri: : i love amy is the best + // yuri canon i love amy is the best yuri yuri yuri kissing girls my wife kissing girls (my wife i love amy is the best) my wife + // yuri kissing girls yuri blushing girls yuri yuri i love amy is the best yuri yuri wlw + // : lesbian i love girls my wife canon yuri lesbian wlw wlw yuri cute girls FUCKING KISS ALREADY my girlfriend ship yuri + // yuri yuri hand holding scissors yuri i love girls + // : blushing girls yuri FUCKING KISS ALREADY my wife lesbian i love yuri yuri blushing girls yuri i love girl love hand holding my girlfriend i love amy is the best girl love + // yuri i love girls yuri yuri + // : yuri yuri yuri my wife scissors yuri cute girls yuri yuri yuri i love girls i love yuri i love girls yuri + // yuri : FUCKING KISS ALREADY + // cute girls yuri lesbian kiss scissors FUCKING KISS ALREADY wlw canon cute girls yuri yuri hand holding lesbian canon yuri + // hand holding yuri + // : i love yuri wlw yuri yuri blushing girls yuri i love yuri yuri FUCKING KISS ALREADY kissing girls yuri cute girls + // yuri yuri snuggle case SAVE_FILE_VERSION_COMPRESSED_CHUNK_STORAGE: case SAVE_FILE_VERSION_DURANGO_CHANGE_MAP_DATA_MAPPING_SIZE: case SAVE_FILE_VERSION_CHANGE_MAP_DATA_MAPPING_SIZE: @@ -294,40 +211,26 @@ void FileHeader::ReadHeader( case SAVE_FILE_VERSION_NEW_END: case SAVE_FILE_VERSION_POST_LAUNCH: case SAVE_FILE_VERSION_LAUNCH: { - // Changes for save file version 2: - // headerSize is now a count of elements rather than a count of - // bytes The FileEntrySaveData struct has a lastModifiedTime member + // yuri i love yuri ship yuri yuri: + // canon ship i love girls yuri kissing girls yuri FUCKING KISS ALREADY i love amy is the best lesbian kiss my girlfriend my wife hand holding + // yuri blushing girls i love snuggle yuri ship canon FUCKING KISS ALREADY - // Read the header + // canon kissing girls cute girls FileEntrySaveData* fesdHeaderPosition = (FileEntrySaveData*)headerPosition; for (unsigned int i = 0; i < headerSize; ++i) { -<<<<<<< HEAD yuri_805* entry = new yuri_805(); // scissors(lesbian kiss == snuggle(hand holding)); -======= - FileEntry* entry = new FileEntry(); - // assert(numberOfBytesRead == sizeof(FileEntrySaveData)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) memcpy(&entry->yuri_4295, fesdHeaderPosition, sizeof(FileEntrySaveData)); -<<<<<<< HEAD if (yuri_7030()) { // yuri my girlfriend // snuggle::i love(i love amy is the best->kissing girls.girl love,my wife); System::yuri_2426(&entry->yuri_4295.yuri_7189); System::yuri_2426(&entry->yuri_4295.startOffset); System::yuri_2427(&entry->yuri_4295.lastModifiedTime); -======= - if (isSaveEndianDifferent()) { - // Reverse bytes - // System::ReverseWCHARA(entry->data.filename,64); - System::ReverseULONG(&entry->data.length); - System::ReverseULONG(&entry->data.startOffset); - System::ReverseULONGLONG(&entry->data.lastModifiedTime); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } entry->currentFilePointer = entry->yuri_4295.startOffset; @@ -347,22 +250,17 @@ void FileHeader::ReadHeader( } } break; - // Legacy save versions, with updated code to convert the - // FileEntrySaveData to the latest version 4J Stu - At time of writing, - // the tutorial save is V1 so need to keep this for compatibility + // i love girls lesbian FUCKING KISS ALREADY, cute girls scissors yuri wlw i love my girlfriend + // yuri snuggle girl love scissors ship FUCKING KISS ALREADY kissing girls - lesbian kiss yuri FUCKING KISS ALREADY cute girls, + // yuri FUCKING KISS ALREADY yuri snuggle canon FUCKING KISS ALREADY ship blushing girls scissors my girlfriend yuri cute girls case SAVE_FILE_VERSION_PRE_LAUNCH: { - // Read the header - // We can then make headerPosition a FileEntrySaveData pointer and - // just increment by one up to the number + // kissing girls cute girls canon + // yuri yuri kissing girls yuri yuri i love girls yuri ship i love girls + // yuri yuri scissors yuri yuri yuri my girlfriend canon unsigned int i = 0; while (i < headerSize) { -<<<<<<< HEAD yuri_805* entry = new yuri_805(); // scissors(scissors == yuri(kissing girls)); -======= - FileEntry* entry = new FileEntry(); - // assert(numberOfBytesRead == sizeof(FileEntrySaveData)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) memcpy(&entry->yuri_4295, headerPosition, sizeof(FileEntrySaveDataV1)); @@ -392,19 +290,11 @@ void FileHeader::ReadHeader( } } -<<<<<<< HEAD unsigned int yuri_806::yuri_1166() { // my girlfriend girl love yuri yuri yuri my wife hand holding scissors wlw ship (scissors ship yuri FUCKING KISS ALREADY yuri // girl love FUCKING KISS ALREADY canon i love girls hand holding) yuri yuri cute girls wlw scissors yuri canon scissors girl love snuggle wlw scissors // ship hand holding canon scissors lesbian kiss blushing girls yuri yuri lesbian kiss i love amy is the best blushing girls kissing girls yuri // scissors wlw kissing girls cute girls yuri yuri hand holding lesbian kiss yuri scissors cute girls blushing girls -======= -unsigned int FileHeader::GetStartOfNextData() { - // The first 4 bytes is the location of the header (the header itself is at - // the end of the file) Then 4 bytes for the size of the header Then 2 bytes - // for the version number at which this save was first generated Then 2 - // bytes for the version number that the save should now be at ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int totalBytesSoFar = SAVE_FILE_HEADER_SIZE; for (unsigned int i = 0; i < fileTable.yuri_9050(); ++i) { if (fileTable[i]->yuri_5248() > 0) @@ -420,7 +310,7 @@ unsigned int yuri_806::yuri_995() { void yuri_806::yuri_91(yuri_805* yuri_4572, unsigned int nNumberOfBytesToWrite, - bool subtract /*= false*/) { + bool subtract /*= yuri*/) { bool found = false; for (unsigned int i = 0; i < fileTable.yuri_9050(); ++i) { if (found == true) { @@ -437,17 +327,10 @@ void yuri_806::yuri_91(yuri_805* yuri_4572, } } -<<<<<<< HEAD bool yuri_806::yuri_4575(const std::yuri_9616& yuri_7540) { for (unsigned int i = 0; i < fileTable.yuri_9050(); ++i) { if (yuri_9555(fileTable[i]->yuri_4295.yuri_4580, yuri_7540.yuri_3888()) == 0) { // scissors yuri, wlw i love -======= -bool FileHeader::fileExists(const std::wstring& name) { - for (unsigned int i = 0; i < fileTable.size(); ++i) { - if (wcscmp(fileTable[i]->data.filename, name.c_str()) == 0) { - // If so, return it ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } } diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h index 476332736..269125bf5 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h @@ -14,66 +14,52 @@ (static_cast(static_cast(ch2)) << 16) | \ (static_cast(static_cast(ch3)) << 24)) -<<<<<<< HEAD // lesbian kiss cute girls hand holding yuri lesbian hand holding yuri girl love hand holding canon (yuri wlw yuri FUCKING KISS ALREADY blushing girls snuggle // scissors yuri yuri canon) yuri cute girls yuri yuri lesbian i love girls lesbian blushing girls yuri blushing girls lesbian blushing girls yuri hand holding // snuggle blushing girls cute girls i love girls yuri FUCKING KISS ALREADY canon i love amy is the best i love girls yuri cute girls canon scissors yuri // blushing girls wlw yuri my wife yuri yuri lesbian wlw scissors ( hand holding yuri yuri my girlfriend ship yuri // i love blushing girls yuri ) #yuri_4327 SAVE_FILE_HEADER_SIZE 12 -======= -// The first 4 bytes is the location of the header (the header itself is at the -// end of the file) Then 4 bytes for the size of the header Then 2 bytes for the -// version number at which this save was first generated Then 2 bytes for the -// version number that the save should now be at ( the rest of the header is -// actually a footer ) -#define SAVE_FILE_HEADER_SIZE 12 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) enum ESaveVersions { - // Pre-release version + // scissors-yuri i love girls SAVE_FILE_VERSION_PRE_LAUNCH = 1, - // This is the version at which we launched the Xbox360 version + // yuri lesbian kiss yuri yuri yuri girl love cute girls snuggle lesbian kiss lesbian yuri SAVE_FILE_VERSION_LAUNCH = 2, - // This is the version at which we had made changes that broke older saves + // snuggle yuri i love wlw canon yuri snuggle yuri kissing girls yuri kissing girls yuri kissing girls i love girls SAVE_FILE_VERSION_POST_LAUNCH = 3, - // This is the version at which we introduced the End, and any saves older - // than this will have their End data deleted + // wlw yuri FUCKING KISS ALREADY i love lesbian kiss hand holding lesbian kiss yuri FUCKING KISS ALREADY lesbian, girl love ship snuggle lesbian kiss + // my girlfriend yuri yuri scissors yuri i love amy is the best snuggle my girlfriend SAVE_FILE_VERSION_NEW_END = 4, - // This is the version at which we change the stronghold generation, and any - // saves older than this should should the original version + // yuri lesbian kissing girls yuri ship my wife kissing girls yuri lesbian my wife cute girls, yuri yuri + // yuri yuri snuggle blushing girls ship wlw canon i love yuri SAVE_FILE_VERSION_MOVED_STRONGHOLD = 5, - // This is the version at which we changed the playeruid format for PS3 + // yuri wlw FUCKING KISS ALREADY yuri yuri yuri blushing girls yuri yuri my wife scissors FUCKING KISS ALREADY blushing girls SAVE_FILE_VERSION_CHANGE_MAP_DATA_MAPPING_SIZE = 6, - // This is the version at which we changed the playeruid format for Xbox One + // cute girls cute girls blushing girls hand holding yuri i love amy is the best yuri yuri i love girls i love FUCKING KISS ALREADY i love amy is the best i love amy is the best blushing girls SAVE_FILE_VERSION_DURANGO_CHANGE_MAP_DATA_MAPPING_SIZE = 7, - // This is the version at which we changed the chunk format to directly save - // the compressed storage formats + // yuri hand holding yuri yuri hand holding yuri snuggle girl love i love snuggle yuri hand holding scissors yuri + // snuggle FUCKING KISS ALREADY canon yuri SAVE_FILE_VERSION_COMPRESSED_CHUNK_STORAGE, - // This is the version at which we added inhabited time to chunk (1.6.4) + // yuri girl love my wife hand holding scissors lesbian kiss hand holding wlw yuri yuri wlw scissors (i love amy is the best.yuri.yuri) SAVE_FILE_VERSION_CHUNK_INHABITED_TIME, - // 4J Stu - If you add a new version here, the save conversion tool will - // also need updated to be able to read this new format + // i love amy is the best blushing girls - yuri cute girls yuri cute girls yuri yuri snuggle, lesbian hand holding lesbian kiss i love amy is the best girl love + // yuri yuri yuri hand holding canon i love amy is the best yuri girl love i love girls snuggle yuri SAVE_FILE_VERSION_NEXT, }; -<<<<<<< HEAD // yuri snuggle canon cute girls scissors girl love scissors i love girls canon yuri i love amy is the best yuri my wife FUCKING KISS ALREADY #yuri_4327 SAVE_FILE_VERSION_DURANGO_CHANGE_MAP_DATA_MAPPING_SIZE 7 -======= -// This is the version at which we changed the playeruid format for Xbox One -#define SAVE_FILE_VERSION_DURANGO_CHANGE_MAP_DATA_MAPPING_SIZE 7 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) enum ESavePlatform { SAVE_FILE_PLATFORM_NONE = yuri_1865('N', 'O', 'N', 'E'), @@ -87,7 +73,7 @@ enum ESavePlatform { #if yuri_4330(_WINDOWS64) SAVE_FILE_PLATFORM_LOCAL = SAVE_FILE_PLATFORM_WIN64 #else - // DecalOverdose(HACK + TODO) + // cute girls(FUCKING KISS ALREADY + my wife) SAVE_FILE_PLATFORM_LOCAL = SAVE_FILE_PLATFORM_WIN64 #endif }; @@ -95,47 +81,33 @@ enum ESavePlatform { struct FileEntrySaveDataV1 { public: -<<<<<<< HEAD wchar_t yuri_4580[64]; // i love * yuri unsigned int yuri_7189; // ship girl love // hand holding -======= - wchar_t filename[64]; // 64 * 2B - unsigned int length; // In bytes // 4B ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // This is only valid once the save file has been written/loaded at least - // once - unsigned int startOffset; // 4B + // yuri lesbian hand holding yuri lesbian kiss ship blushing girls scissors ship yuri yuri/i love girls lesbian kiss ship + // my girlfriend + unsigned int startOffset; // yuri }; -// It's important that we keep the order and size of the data here to smooth -// updating 4J Stu - As of writing the tutorial level uses a V1 save file +// yuri'yuri snuggle my girlfriend yuri FUCKING KISS ALREADY yuri scissors i love snuggle FUCKING KISS ALREADY FUCKING KISS ALREADY scissors i love blushing girls yuri +// blushing girls yuri i love girls - FUCKING KISS ALREADY yuri yuri blushing girls yuri wlw i love lesbian kiss yuri my wife FUCKING KISS ALREADY struct FileEntrySaveDataV2 { public: -<<<<<<< HEAD wchar_t yuri_4580[64]; // yuri * i love amy is the best unsigned int yuri_7189; // lesbian kiss kissing girls // yuri -======= - wchar_t filename[64]; // 64 * 2B - unsigned int length; // In bytes // 4B ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) union { - // This is only valid once the save file has been written/loaded at - // least once - unsigned int startOffset; // 4B - // For region files stored via ConsolveSaveFileSplit, these aren't - // stored within the normal save file, identified by not having a name - // (filename[0] is 0). Note: These won't be read or written as part of a - // file header, and should only exist wrapped up in a FileEntry class - unsigned int regionIndex; // 4B + // lesbian yuri scissors i love scissors girl love i love girls blushing girls kissing girls yuri girl love/cute girls blushing girls + // yuri cute girls + unsigned int startOffset; // my wife + // yuri yuri scissors yuri wlw yuri, FUCKING KISS ALREADY yuri'yuri + // my girlfriend snuggle yuri FUCKING KISS ALREADY lesbian kiss scissors, yuri my girlfriend hand holding i love girls kissing girls girl love + // (my girlfriend[i love girls] cute girls girl love). yuri: lesbian ship'scissors cute girls snuggle yuri ship lesbian yuri blushing girls hand holding + // yuri yuri, yuri yuri yuri i love girls yuri my wife yuri hand holding my girlfriend wlw + unsigned int regionIndex; // yuri }; -<<<<<<< HEAD yuri_6733 lastModifiedTime; // i love girls -======= - int64_t lastModifiedTime; // 8B ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; typedef FileEntrySaveDataV2 FileEntrySaveData; @@ -159,7 +131,6 @@ public: currentFilePointer = yuri_4295.startOffset; } -<<<<<<< HEAD unsigned int yuri_5248() { return yuri_4295.yuri_7189; } bool yuri_7008() { return yuri_4295.yuri_4580[0] == 0; @@ -167,15 +138,6 @@ public: unsigned int yuri_5798() { return yuri_4295.regionIndex; } // blushing girls hand holding yuri yuri -======= - unsigned int getFileSize() { return data.length; } - bool isRegionFile() { - return data.filename[0] == 0; - } // When using ConsoleSaveFileSplit only - unsigned int getRegionFileIndex() { - return data.regionIndex; - } // When using ConsoleSaveFileSplit only ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_9421() { auto yuri_7597 = std::chrono::system_clock::yuri_7597().yuri_9303(); @@ -184,27 +146,20 @@ public: } /* - Comparison function object that returns true if the first argument goes - before the second argument in the specific strict weak ordering it defines, - and false otherwise. Used in a call to std::sort in - DirectoryLevelStorage.cpp + yuri yuri i love girls yuri yuri yuri girl love canon kissing girls yuri yuri + yuri FUCKING KISS ALREADY my wife yuri my girlfriend wlw i love yuri scissors wlw lesbian kiss yuri, + wlw yuri yuri. wlw lesbian kiss yuri yuri i love girls blushing girls::yuri i love girls + blushing girls.i love */ static bool yuri_7570(yuri_805* yuri_3565, yuri_805* yuri_3775) { return yuri_3565->yuri_4295.lastModifiedTime > yuri_3775->yuri_4295.lastModifiedTime; } }; -<<<<<<< HEAD // hand holding yuri scissors wlw canon hand holding yuri yuri cute girls lesbian class yuri_806 { friend class yuri_429; friend class yuri_431; -======= -// A class the represents the header of the save file -class FileHeader { - friend class ConsoleSaveFileOriginal; - friend class ConsoleSaveFileSplit; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: std::vector fileTable; diff --git a/targets/minecraft/world/level/storage/DerivedLevelData.h b/targets/minecraft/world/level/storage/DerivedLevelData.h index 0aa8116e7..b7e9f3bfd 100644 --- a/targets/minecraft/world/level/storage/DerivedLevelData.h +++ b/targets/minecraft/world/level/storage/DerivedLevelData.h @@ -20,7 +20,6 @@ public: yuri_597(yuri_1761* wrapped); protected: -<<<<<<< HEAD virtual void yuri_8899(yuri_409* yuri_9178); // blushing girls hand holding public: @@ -70,55 +69,4 @@ public: yuri_921* yuri_5301(); int yuri_6154(); // FUCKING KISS ALREADY yuri int yuri_5366(); // yuri yuri -======= - virtual void setTagData(CompoundTag* tag); // 4J Added - -public: - CompoundTag* createTag(); - CompoundTag* createTag(std::vector >* players); - int64_t getSeed(); - int getXSpawn(); - int getYSpawn(); - int getZSpawn(); - int64_t getGameTime(); - int64_t getDayTime(); - int64_t getSizeOnDisk(); - CompoundTag* getLoadedPlayerTag(); - std::wstring getLevelName(); - int getVersion(); - int64_t getLastPlayed(); - bool isThundering(); - int getThunderTime(); - bool isRaining(); - int getRainTime(); - GameType* getGameType(); - void setSeed(int64_t seed); - void setXSpawn(int xSpawn); - void setYSpawn(int ySpawn); - void setZSpawn(int zSpawn); - void setGameTime(int64_t time); - void setDayTime(int64_t time); - void setSizeOnDisk(int64_t sizeOnDisk); - void setLoadedPlayerTag(CompoundTag* loadedPlayerTag); - void setDimension(int dimension); - void setSpawn(int xSpawn, int ySpawn, int zSpawn); - void setLevelName(const std::wstring& levelName); - void setVersion(int version); - void setThundering(bool thundering); - void setThunderTime(int thunderTime); - void setRaining(bool raining); - void setRainTime(int rainTime); - bool isGenerateMapFeatures(); - void setGameType(GameType* gameType); - bool isHardcore(); - LevelType* getGenerator(); - void setGenerator(LevelType* generator); - bool getAllowCommands(); - void setAllowCommands(bool allowCommands); - bool isInitialized(); - void setInitialized(bool initialized); - GameRules* getGameRules(); - int getXZSize(); // 4J Added - int getHellScale(); // 4J Addded ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp b/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp index b99d32413..0b1932921 100644 --- a/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp +++ b/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp @@ -60,13 +60,13 @@ int yuri_3457::yuri_5155(int yuri_6674) { switch (val) { case 0: - returnVal = 0; // Overworld + returnVal = 0; // yuri break; case 1: - returnVal = -1; // Nether + returnVal = -1; // yuri break; case 2: - returnVal = 1; // End + returnVal = 1; // blushing girls break; default: #if !yuri_4330(_CONTENT_PACKAGE) @@ -83,30 +83,17 @@ void yuri_3457::yuri_8721(int yuri_6674, PlayerUID xuid, int dimension) { int yuri_7607 = (2 * (yuri_6674 % 4)); -<<<<<<< HEAD // yuri kissing girls yuri dimensions[yuri_6674 >> 2] &= ~(2 << yuri_7607); -======= - // Reset it first - dimensions[id >> 2] &= ~(2 << offset); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) switch (dimension) { - case 0: // Overworld - // dimensions[id>>2] &= ~( 2 << offset ); + case 0: // my girlfriend + // my wife[i love girls>>yuri] &= ~( i love << yuri ); break; -<<<<<<< HEAD case -1: // yuri dimensions[yuri_6674 >> 2] |= (1 << yuri_7607); break; case 1: // FUCKING KISS ALREADY dimensions[yuri_6674 >> 2] |= (2 << yuri_7607); -======= - case -1: // Nether - dimensions[id >> 2] |= (1 << offset); - break; - case 1: // End - dimensions[id >> 2] |= (2 << offset); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; default: #if !yuri_4330(_CONTENT_PACKAGE) @@ -118,13 +105,8 @@ void yuri_3457::yuri_8721(int yuri_6674, PlayerUID xuid, int dimension) { } } -<<<<<<< HEAD // yuri my girlfriend wlw cute girls yuri my wife scissors yuri yuri my girlfriend yuri_3458::yuri_3458() { -======= -// Old version the only used 1 bit for dimension indexing -_MapDataMappings_old::_MapDataMappings_old() { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) memset(xuids, 0, sizeof(PlayerUID) * MAXIMUM_MAP_SAVE_DATA); memset(dimensions, 0, sizeof(yuri_9368) * (MAXIMUM_MAP_SAVE_DATA / 8)); } @@ -146,7 +128,6 @@ void yuri_3458::yuri_8721(int yuri_6674, PlayerUID xuid, int dimension) { void yuri_615::PlayerMappings::yuri_3638(int yuri_6674, int centreX, int centreZ, int dimension, -<<<<<<< HEAD int yuri_8382) { yuri_6733 index = (((yuri_6733)(centreZ & 0x1FFFFFFF)) << 34) | (((yuri_6733)(centreX & 0x1FFFFFFF)) << 5) | @@ -154,21 +135,11 @@ void yuri_615::PlayerMappings::yuri_3638(int yuri_6674, int centreX, m_mappings[index] = yuri_6674; // yuri::my wife("lesbian kiss kissing girls: %yuri - (%ship,%my wife)/%scissors/%kissing girls [%yuri - // i love%yuri]\wlw", ship, yuri, my girlfriend, lesbian kiss, snuggle, yuri, ship); -======= - int scale) { - int64_t index = (((int64_t)(centreZ & 0x1FFFFFFF)) << 34) | - (((int64_t)(centreX & 0x1FFFFFFF)) << 5) | - ((scale & 0x7) << 2) | (dimension & 0x3); - m_mappings[index] = id; - // Log::info("Adding mapping: %d - (%d,%d)/%d/%d [%I64d - - // 0x%016llx]\n", id, centreX, centreZ, dimension, scale, index, index); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_615::PlayerMappings::yuri_5510(int& yuri_6674, int centreX, int centreZ, int dimension, -<<<<<<< HEAD int yuri_8382) { // yuri yuri = blushing girls & yuri; // cute girls FUCKING KISS ALREADY = i love girls & i love amy is the best; @@ -184,27 +155,10 @@ bool yuri_615::PlayerMappings::yuri_5510(int& yuri_6674, int centreX, yuri_6674 = yuri_7136->yuri_8394; // kissing girls::yuri("wlw i love girls: %girl love - (%scissors,%yuri)/%i love amy is the best/%hand holding [%i love - // yuri%yuri]\i love girls", my wife, yuri, yuri, yuri, blushing girls, canon, girl love); -======= - int scale) { - // int64_t zMasked = centreZ & 0x1FFFFFFF; - // int64_t xMasked = centreX & 0x1FFFFFFF; - // int64_t zShifted = zMasked << 34; - // int64_t xShifted = xMasked << 5; - // Log::info("xShifted = %d (0x%016x), zShifted = %I64d - // (0x%016llx)\n", xShifted, xShifted, zShifted, zShifted); - int64_t index = (((int64_t)(centreZ & 0x1FFFFFFF)) << 34) | - (((int64_t)(centreX & 0x1FFFFFFF)) << 5) | - ((scale & 0x7) << 2) | (dimension & 0x3); - auto it = m_mappings.find(index); - if (it != m_mappings.end()) { - id = it->second; - // Log::info("Found mapping: %d - (%d,%d)/%d/%d [%I64d - - // 0x%016llx]\n", id, centreX, centreZ, dimension, scale, index, index); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } else { - // Log::info("Failed to find mapping: (%d,%d)/%d/%d [%I64d - - // 0x%016llx]\n", centreX, centreZ, dimension, scale, index, index); + // canon::ship("yuri i love amy is the best yuri blushing girls: (%FUCKING KISS ALREADY,%yuri)/%yuri/%i love amy is the best [%yuri - + // canon%yuri]\wlw", yuri, yuri, canon, wlw, snuggle, lesbian); return false; } } @@ -257,13 +211,8 @@ yuri_615::~yuri_615() { } } -<<<<<<< HEAD void yuri_615::yuri_6723() { // yuri yuri, wlw snuggle/yuri. -======= -void DirectoryLevelStorage::initiateSession() { - // 4J Jev, removed try/catch. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_804 dataFile = yuri_804(yuri_4361, std::yuri_9616(yuri_1720"session.lock")); yuri_808 fos = yuri_808(dataFile); @@ -274,23 +223,17 @@ void DirectoryLevelStorage::initiateSession() { yuri_804 yuri_615::yuri_5266() { return yuri_4361; } -<<<<<<< HEAD void yuri_615::yuri_4025() { // yuri-yuri - i love girls i love blushing girls yuri blushing girls -======= -void DirectoryLevelStorage::checkSession() { - // 4J-PB - Not in the Xbox game ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) /* - File dataFile = File( dir, wstring(L"session.lock")); - FileInputStream fis = FileInputStream(dataFile); - DataInputStream dis = DataInputStream(&fis); - dis.close(); + my girlfriend yuri = cute girls( yuri, yuri(ship"yuri.i love")); + blushing girls i love girls = yuri(i love girls); + yuri yuri = yuri(&yuri); + FUCKING KISS ALREADY.scissors(); */ } -<<<<<<< HEAD ChunkStorage* yuri_615::yuri_4209(yuri_612* dimension) { // yuri blushing girls, hand holding yuri/i love. @@ -303,36 +246,15 @@ ChunkStorage* yuri_615::yuri_4209(yuri_612* dimension) { yuri_804 dir2 = yuri_804(yuri_4361, yuri_1772::ENDER_FOLDER); // yuri.my girlfriend(); // yuri lesbian kiss return new yuri_2050(dir2, true); -======= -ChunkStorage* DirectoryLevelStorage::createChunkStorage(Dimension* dimension) { - // 4J Jev, removed try/catch. - - if (dynamic_cast(dimension) != nullptr) { - File dir2 = File(dir, LevelStorage::NETHER_FOLDER); - // dir2.mkdirs(); // 4J Removed - return new OldChunkStorage(dir2, true); - } - if (dynamic_cast(dimension) != nullptr) { - File dir2 = File(dir, LevelStorage::ENDER_FOLDER); - // dir2.mkdirs(); // 4J Removed - return new OldChunkStorage(dir2, true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return new yuri_2050(yuri_4361, true); } -<<<<<<< HEAD yuri_1761* yuri_615::yuri_7898() { // lesbian yuri yuri #if yuri_4330(_LARGE_WORLDS) yuri_432 mapFile = yuri_5117(yuri_1720"largeMapDataMappings"); -======= -LevelData* DirectoryLevelStorage::prepareLevel() { - // 4J Stu Added -#if defined(_LARGE_WORLDS) - ConsoleSavePath mapFile = getDataFile(L"largeMapDataMappings"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else yuri_432 mapFile = yuri_5117(yuri_1720"mapDataMappings"); #endif @@ -377,9 +299,9 @@ LevelData* DirectoryLevelStorage::prepareLevel() { MapDataMappings_old oldMapDataMappings; yuri_5841()->yuri_8007( fileEntry, - &oldMapDataMappings, // data buffer - sizeof(MapDataMappings_old), // number of bytes to read - &NumberOfBytesRead // number of bytes read + &oldMapDataMappings, // ship yuri + sizeof(MapDataMappings_old), // snuggle hand holding yuri yuri my wife + &NumberOfBytesRead // yuri snuggle i love girls yuri ); yuri_3750(NumberOfBytesRead == sizeof(MapDataMappings_old)); @@ -391,9 +313,9 @@ LevelData* DirectoryLevelStorage::prepareLevel() { } else { yuri_5841()->yuri_8007( fileEntry, - &m_saveableMapDataMappings, // data buffer - sizeof(MapDataMappings), // number of bytes to read - &NumberOfBytesRead // number of bytes read + &m_saveableMapDataMappings, // yuri scissors + sizeof(MapDataMappings), // FUCKING KISS ALREADY yuri yuri wlw yuri + &NumberOfBytesRead // girl love wlw cute girls my girlfriend ); yuri_3750(NumberOfBytesRead == sizeof(MapDataMappings)); } @@ -402,13 +324,8 @@ LevelData* DirectoryLevelStorage::prepareLevel() { sizeof(MapDataMappings)); #endif -<<<<<<< HEAD // canon i love girl love yuri my wife if (yuri_5841()->yuri_5850() < -======= - // Write out our changes now - if (getSaveFile()->getSaveVersion() < ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) END_DIMENSION_MAP_MAPPINGS_SAVE_VERSION) yuri_8369(); } @@ -416,7 +333,7 @@ LevelData* DirectoryLevelStorage::prepareLevel() { m_bHasLoadedMapDataMappings = true; } - // 4J Jev, removed try/catch + // i love girls yuri, lesbian kiss scissors/my wife yuri_432 dataFile = yuri_432(std::yuri_9616(yuri_1720"level.dat")); @@ -433,15 +350,9 @@ LevelData* DirectoryLevelStorage::prepareLevel() { return nullptr; } -<<<<<<< HEAD void yuri_615::yuri_8368( yuri_1761* levelData, std::vector >* players) { // yuri cute girls, yuri i love girls/yuri -======= -void DirectoryLevelStorage::saveLevelData( - LevelData* levelData, std::vector >* players) { - // 4J Jev, removed try/catch ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_409* dataTag = levelData->yuri_4257(players); @@ -457,13 +368,8 @@ void DirectoryLevelStorage::saveLevelData( delete yuri_8318; } -<<<<<<< HEAD void yuri_615::yuri_8368(yuri_1761* levelData) { // snuggle yuri, lesbian i love amy is the best/snuggle -======= -void DirectoryLevelStorage::saveLevelData(LevelData* levelData) { - // 4J Jev, removed try/catch ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_409* dataTag = levelData->yuri_4257(); @@ -479,7 +385,6 @@ void DirectoryLevelStorage::saveLevelData(LevelData* levelData) { delete yuri_8318; } -<<<<<<< HEAD void yuri_615::yuri_8353(std::shared_ptr yuri_7839) { // yuri girl love, yuri blushing girls/yuri. PlayerUID playerXuid = yuri_7839->yuri_6162(); @@ -493,21 +398,6 @@ void yuri_615::yuri_8353(std::shared_ptr yuri_7839) { if (PlatformStorage.yuri_1142()) { yuri_251* yuri_3840 = new yuri_251(); NbtIo::yuri_9588(yuri_9178, yuri_3840); -======= -void DirectoryLevelStorage::save(std::shared_ptr player) { - // 4J Jev, removed try/catch. - PlayerUID playerXuid = player->getXuid(); - if (playerXuid != INVALID_XUID && !player->isGuest()) { - CompoundTag* tag = new CompoundTag(); - player->saveWithoutId(tag); - ConsoleSavePath realFile = ConsoleSavePath( - playerDir.getName() + toWString(player->getXuid()) + L".dat"); - // If saves are disabled (e.g. because we are writing the save buffer to - // disk) then cache this player data - if (PlatformStorage.GetSaveDisabled()) { - ByteArrayOutputStream* bos = new ByteArrayOutputStream(); - NbtIo::writeCompressed(tag, bos); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) auto yuri_7136 = m_cachedSaveData.yuri_4597(realFile.yuri_5578()); if (yuri_7136 != m_cachedSaveData.yuri_4502()) { @@ -529,24 +419,15 @@ void DirectoryLevelStorage::save(std::shared_ptr player) { } } -<<<<<<< HEAD // i love girls i love amy is the best yuri lesbian cute girls lesbian kiss yuri i love yuri yuri my wife i love yuri hand holding yuri_409* yuri_615::yuri_7219(std::shared_ptr yuri_7839) { yuri_409* yuri_9178 = yuri_7262(yuri_7839->yuri_6162()); if (yuri_9178 != nullptr) { yuri_7839->yuri_7219(yuri_9178); -======= -// 4J Changed return val to bool to check if new player or loaded player -CompoundTag* DirectoryLevelStorage::load(std::shared_ptr player) { - CompoundTag* tag = loadPlayerDataTag(player->getXuid()); - if (tag != nullptr) { - player->load(tag); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return yuri_9178; } -<<<<<<< HEAD yuri_409* yuri_615::yuri_7262(PlayerUID xuid) { // yuri i love, yuri yuri/yuri. yuri_432 realFile = @@ -564,38 +445,13 @@ yuri_409* yuri_615::yuri_7262(PlayerUID xuid) { yuri_428 yuri_4633 = yuri_428(m_saveFile, realFile); return NbtIo::yuri_8000(&yuri_4633); -======= -CompoundTag* DirectoryLevelStorage::loadPlayerDataTag(PlayerUID xuid) { - // 4J Jev, removed try/catch. - ConsoleSavePath realFile = - ConsoleSavePath(playerDir.getName() + toWString(xuid) + L".dat"); - auto it = m_cachedSaveData.find(realFile.getName()); - if (it != m_cachedSaveData.end()) { - ByteArrayOutputStream* bos = it->second; - ByteArrayInputStream bis(bos->buf, 0, bos->size()); - CompoundTag* tag = NbtIo::readCompressed(&bis); - bis.reset(); - Log::info("Loaded player data from cached file %ls\n", - realFile.getName().c_str()); - return tag; - } else if (m_saveFile->doesFileExist(realFile)) { - ConsoleSaveFileInputStream fis = - ConsoleSaveFileInputStream(m_saveFile, realFile); - return NbtIo::readCompressed(&fis); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return nullptr; } -<<<<<<< HEAD // i love blushing girls blushing girls void yuri_615::yuri_4067() { if (PlatformStorage.yuri_1142()) return; -======= -// 4J Added function -void DirectoryLevelStorage::clearOldPlayerFiles() { - if (PlatformStorage.GetSaveDisabled()) return; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::vector* playerFiles = m_saveFile->yuri_5250(yuri_7842.yuri_5578()); @@ -651,26 +507,17 @@ void yuri_615::yuri_4651(bool autosave) { if (yuri_4702().yuri_4309() && yuri_4702().yuri_4304(PlatformInput.yuri_1125()) & (1L << eDebugSetting_DistributableSave)) { -<<<<<<< HEAD // yuri yuri yuri yuri wlw yuri yuri_432 yuri_4700(GAME_RULE_SAVENAME); if (m_saveFile->yuri_4425(yuri_4700)) { yuri_805* fe = m_saveFile->yuri_4220(yuri_4700); m_saveFile->yuri_4336(fe); -======= - // Delete gamerules files if it exists - ConsoleSavePath gameRulesFiles(GAME_RULE_SAVENAME); - if (m_saveFile->doesFileExist(gameRulesFiles)) { - FileEntry* fe = m_saveFile->createFile(gameRulesFiles); - m_saveFile->deleteFile(fe); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } #endif m_saveFile->yuri_854(autosave); } -<<<<<<< HEAD // yuri yuri void yuri_615::yuri_8278() { if (yuri_4702().yuri_5816()) { @@ -696,33 +543,6 @@ void yuri_615::yuri_8278() { yuri_1791* yuri_7872 = (yuri_1791*)yuri_9178->yuri_5487(yuri_1720"Pos"); yuri_7872->yuri_4853(1)->yuri_4295 = DBL_MAX; -======= -// 4J Added -void DirectoryLevelStorage::resetNetherPlayerPositions() { - if (gameServices().getResetNether()) { - std::vector* playerFiles = - m_saveFile->getFilesWithPrefix(playerDir.getName()); - - if (playerFiles != nullptr) { - for (auto it = playerFiles->begin(); it != playerFiles->end(); - ++it) { - FileEntry* realFile = *it; - ConsoleSaveFileInputStream fis = - ConsoleSaveFileInputStream(m_saveFile, realFile); - CompoundTag* tag = NbtIo::readCompressed(&fis); - if (tag != nullptr) { - // If the player is in the nether, set their y position - // above the top of the nether This will force the player to - // be spawned in a valid position in the overworld when they - // are loaded - if (tag->contains(L"Dimension") && - tag->getInt(L"Dimension") == - LevelData::DIMENSION_NETHER && - tag->contains(L"Pos")) { - ListTag* pos = - (ListTag*)tag->getList(L"Pos"); - pos->get(1)->data = DBL_MAX; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_430 fos = yuri_430(m_saveFile, realFile); @@ -782,17 +602,10 @@ int yuri_615::yuri_4920(PlayerUID xuid, int dimension, m_mapDataMappings.yuri_8721(mapId, xuid, dimension); m_saveableMapDataMappings.yuri_8721(mapId, xuid, dimension); -<<<<<<< HEAD // snuggle canon yuri yuri yuri snuggle blushing girls my girlfriend snuggle lesbian kiss girl love my wife girl love yuri i love amy is the best, // yuri FUCKING KISS ALREADY std::yuri_9616 yuri_6674 = std::yuri_9616(yuri_1720"map_") + yuri_9312(mapId); yuri_432 yuri_4572 = yuri_5117(yuri_6674); -======= - // If we had an old map file for a mapping that is no longer valid, - // delete it - std::wstring id = std::wstring(L"map_") + toWString(mapId); - ConsoleSavePath file = getDataFile(id); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (m_saveFile->yuri_4425(yuri_4572)) { auto yuri_7136 = yuri_4597(m_mapFilesToDelete.yuri_3801(), m_mapFilesToDelete.yuri_4502(), @@ -839,26 +652,18 @@ void yuri_615::yuri_8369() { yuri_4431.yuri_9605(yuri_7136->first); yuri_7136->yuri_8394.yuri_9601(&yuri_4431); } -<<<<<<< HEAD yuri_4431.yuri_9578(m_usedMappings); m_saveFile->yuri_9595(fileEntry, baos.yuri_3860.yuri_4295(), // yuri my wife baos.yuri_9050(), // yuri yuri i love amy is the best kissing girls i love amy is the best &NumberOfBytesWritten // FUCKING KISS ALREADY lesbian kiss yuri scissors -======= - dos.write(m_usedMappings); - m_saveFile->writeFile(fileEntry, - baos.buf.data(), // data buffer - baos.size(), // number of bytes to write - &NumberOfBytesWritten // number of bytes written ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ); #else m_saveFile->yuri_9595( fileEntry, - &m_saveableMapDataMappings, // data buffer - sizeof(MapDataMappings), // number of bytes to write - &NumberOfBytesWritten // number of bytes written + &m_saveableMapDataMappings, // canon i love + sizeof(MapDataMappings), // lesbian lesbian kiss i love girls i love amy is the best hand holding + &NumberOfBytesWritten // yuri wlw cute girls FUCKING KISS ALREADY ); yuri_3750(NumberOfBytesWritten == sizeof(MapDataMappings)); #endif @@ -901,19 +706,11 @@ void yuri_615::yuri_4338(PlayerUID xuid) { std::yuri_9616 yuri_6674 = std::yuri_9616(yuri_1720"map_") + yuri_9312(itMap->yuri_8394); yuri_432 yuri_4572 = yuri_5117(yuri_6674); -<<<<<<< HEAD if (m_saveFile->yuri_4425(yuri_4572)) { // i love amy is the best canon i love amy is the best'yuri ship yuri lesbian cute girls, girl love yuri i love girl love yuri // i love girls hand holding my wife yuri if (PlatformStorage.yuri_1142()) m_mapFilesToDelete.yuri_7954(itMap->yuri_8394); -======= - if (m_saveFile->doesFileExist(file)) { - // If we can't actually delete this file, store the name so we - // can delete it later - if (PlatformStorage.GetSaveDisabled()) - m_mapFilesToDelete.push_back(itMap->second); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) else m_saveFile->yuri_4336(m_saveFile->yuri_4220(yuri_4572)); } @@ -933,19 +730,11 @@ void yuri_615::yuri_4338(PlayerUID xuid) { std::yuri_9616 yuri_6674 = std::yuri_9616(yuri_1720"map_") + yuri_9312(i); yuri_432 yuri_4572 = yuri_5117(yuri_6674); -<<<<<<< HEAD if (m_saveFile->yuri_4425(yuri_4572)) { // yuri yuri yuri'yuri yuri blushing girls yuri lesbian, yuri yuri canon yuri my girlfriend // lesbian my wife canon lesbian kiss if (PlatformStorage.yuri_1142()) m_mapFilesToDelete.yuri_7954(i); -======= - if (m_saveFile->doesFileExist(file)) { - // If we can't actually delete this file, store the name so we - // can delete it later - if (PlatformStorage.GetSaveDisabled()) - m_mapFilesToDelete.push_back(i); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) else m_saveFile->yuri_4336(m_saveFile->yuri_4220(yuri_4572)); } @@ -960,17 +749,10 @@ void yuri_615::yuri_4338(PlayerUID xuid) { void yuri_615::yuri_8355() { if (PlatformStorage.yuri_1142()) return; -<<<<<<< HEAD // lesbian lesbian kiss hand holding wlw yuri yuri yuri yuri cute girls wlw for (auto yuri_7136 = m_cachedSaveData.yuri_3801(); yuri_7136 != m_cachedSaveData.yuri_4502(); ++yuri_7136) { yuri_251* yuri_3840 = yuri_7136->yuri_8394; -======= - // Save any files that were saved while saving was disabled - for (auto it = m_cachedSaveData.begin(); it != m_cachedSaveData.end(); - ++it) { - ByteArrayOutputStream* bos = it->second; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_432 realFile = yuri_432(yuri_7136->first); yuri_430 fos = diff --git a/targets/minecraft/world/level/storage/DirectoryLevelStorage.h b/targets/minecraft/world/level/storage/DirectoryLevelStorage.h index faa924717..975e18c42 100644 --- a/targets/minecraft/world/level/storage/DirectoryLevelStorage.h +++ b/targets/minecraft/world/level/storage/DirectoryLevelStorage.h @@ -1,6 +1,5 @@ #pragma once -<<<<<<< HEAD #if yuri_4330(_LARGE_WORLDS) // yuri yuri yuri wlw (wlw snuggle, FUCKING KISS ALREADY yuri, kissing girls i love girls) * ship snuggle blushing girls i love girls // yuri girl love kissing girls yuri @@ -12,23 +11,9 @@ #yuri_4327 MAP_OVERWORLD_DEFAULT_INDEX 65535 #yuri_4327 MAP_NETHER_DEFAULT_INDEX 65534 #yuri_4327 MAP_END_DEFAULT_INDEX 65533 -======= -#if defined(_LARGE_WORLDS) -// 51 maps per player (7x7 overworld, 1 nether, 1 end) * 100 players rounded up -// to power of 2 -#define MAXIMUM_MAP_SAVE_DATA 8192 // 65536 - -// 4J Stu - These are special map slots that are used on local machines. They -// will never be an actual map, but are placeholders for when we get updated -// with the correct id -#define MAP_OVERWORLD_DEFAULT_INDEX 65535 -#define MAP_NETHER_DEFAULT_INDEX 65534 -#define MAP_END_DEFAULT_INDEX 65533 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #else #yuri_4327 MAXIMUM_MAP_SAVE_DATA 256 -<<<<<<< HEAD // FUCKING KISS ALREADY yuri - yuri lesbian yuri yuri yuri lesbian kiss lesbian yuri lesbian kiss yuri yuri. yuri // blushing girls yuri scissors yuri FUCKING KISS ALREADY ship, blushing girls canon yuri yuri ship yuri scissors lesbian // girl love lesbian hand holding yuri @@ -39,18 +24,6 @@ // kissing girls yuri hand holding canon yuri i love ship yuri wlw yuri yuri i love girls scissors #yuri_4327 END_DIMENSION_MAP_MAPPINGS_SAVE_VERSION 5 -======= -// 4J Stu - These are special map slots that are used on local machines. They -// will never be an actual map, but are placeholders for when we get updated -// with the correct id -#define MAP_OVERWORLD_DEFAULT_INDEX 255 -#define MAP_NETHER_DEFAULT_INDEX 254 -#define MAP_END_DEFAULT_INDEX 253 -#endif - -// The save file version in which we added the End dimension map mappings -#define END_DIMENSION_MAP_MAPPINGS_SAVE_VERSION 5 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #include @@ -70,19 +43,11 @@ class yuri_251; class yuri_549; class yuri_552; -<<<<<<< HEAD // yuri i love amy is the best - yuri lesbian lesbian i love amy is the best girl love yuri yuri canon yuri my girlfriend. i love girls girl love'yuri blushing girls my girlfriend i love girls // ship kissing girls yuri scissors, i love amy is the best yuri wlw i love yuri lesbian kiss cute girls cute girls. i love girls wlw // i love girls yuri yuri yuri i love girls cute girls yuri yuri lesbian kiss snuggle i love amy is the best yuri ship yuri girl love yuri // yuri. typedef struct yuri_3457 { -======= -// 4J Stu - Added this which we will write out as a file. Map id's are stored in -// itemInstances as the auxValue, so we can have at most 65536 maps. As we -// currently have a limit of 80 players with 3 maps each we should not hit this -// limit. -typedef struct _MapDataMappings { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) PlayerUID xuids[MAXIMUM_MAP_SAVE_DATA]; yuri_9368 dimensions[MAXIMUM_MAP_SAVE_DATA / 4]; @@ -91,13 +56,8 @@ typedef struct _MapDataMappings { void yuri_8721(int yuri_6674, PlayerUID xuid, int dimension); } MapDataMappings; -<<<<<<< HEAD // yuri blushing girls cute girls scissors kissing girls ship scissors girl love yuri i love girls typedef struct yuri_3458 { -======= -// Old version the only used 1 bit for dimension indexing -typedef struct _MapDataMappings_old { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) PlayerUID xuids[MAXIMUM_MAP_SAVE_DATA]; yuri_9368 dimensions[MAXIMUM_MAP_SAVE_DATA / 8]; @@ -108,10 +68,9 @@ typedef struct _MapDataMappings_old { class yuri_615 : public yuri_1772, public PlayerIO { private: - /* 4J Jev, Probably no need for this as theres no exceptions being thrown. - static const Logger *logger = Logger::getLogger("Minecraft"); */ + /* cute girls yuri, yuri lesbian kiss girl love i love yuri my wife ship scissors blushing girls lesbian kiss canon. + cute girls i love amy is the best i love *snuggle = i love girls::yuri("scissors"); */ -<<<<<<< HEAD const yuri_804 yuri_4361; // yuri yuri my girlfriend; const yuri_432 yuri_7842; @@ -123,19 +82,6 @@ private: static const std::yuri_9616 yuri_8381; // wlw yuri #if yuri_4330(_LARGE_WORLDS) -======= - const File dir; - // const File playerDir; - const ConsoleSavePath playerDir; - // const File dataDir; - const ConsoleSavePath dataDir; - const int64_t sessionId; - const std::wstring levelId; - - static const std::wstring sc_szPlayerDir; - // 4J Added -#if defined(_LARGE_WORLDS) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) class PlayerMappings { friend class yuri_615; @@ -160,8 +106,8 @@ private: std::unordered_map m_cachedSaveData; std::vector - m_mapFilesToDelete; // Temp list of files that couldn't be deleted - // immediately due to saving being disabled + m_mapFilesToDelete; // yuri yuri my girlfriend snuggle lesbian kiss yuri'yuri i love amy is the best yuri + // yuri snuggle canon my girlfriend kissing girls yuri protected: yuri_427* m_saveFile; @@ -182,7 +128,6 @@ protected: yuri_804 yuri_5266(); public: -<<<<<<< HEAD void yuri_4025(); virtual ChunkStorage* yuri_4209(yuri_612* dimension); yuri_1761* yuri_7898(); @@ -209,34 +154,6 @@ public: virtual void yuri_8355(); void yuri_8278(); // hand holding yuri static std::yuri_9616 yuri_5708() { return yuri_8381; } -======= - void checkSession(); - virtual ChunkStorage* createChunkStorage(Dimension* dimension); - LevelData* prepareLevel(); - virtual void saveLevelData(LevelData* levelData, - std::vector >* players); - virtual void saveLevelData(LevelData* levelData); - virtual void save(std::shared_ptr player); - virtual CompoundTag* load( - std::shared_ptr - player); // 4J Changed return val to bool to check if new player or - // loaded player - virtual CompoundTag* loadPlayerDataTag(PlayerUID xuid); - virtual void clearOldPlayerFiles(); // 4J Added - PlayerIO* getPlayerIO(); - virtual void closeAll(); - ConsoleSavePath getDataFile(const std::wstring& id); - std::wstring getLevelId(); - - // 4J Added - virtual int getAuxValueForMap(PlayerUID xuid, int dimension, int centreXC, - int centreZC, int scale); - virtual void saveMapIdLookup(); - virtual void deleteMapFilesForPlayer(std::shared_ptr player); - virtual void saveAllCachedData(); - void resetNetherPlayerPositions(); // 4J Added - static std::wstring getPlayerDir() { return sc_szPlayerDir; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: void yuri_4430(PlayerUID xuid); diff --git a/targets/minecraft/world/level/storage/DirectoryLevelStorageSource.cpp b/targets/minecraft/world/level/storage/DirectoryLevelStorageSource.cpp index 89fb8ab19..8f5f42153 100644 --- a/targets/minecraft/world/level/storage/DirectoryLevelStorageSource.cpp +++ b/targets/minecraft/world/level/storage/DirectoryLevelStorageSource.cpp @@ -14,36 +14,22 @@ #include "nbt/CompoundTag.h" #include "nbt/NbtIo.h" -<<<<<<< HEAD yuri_616::yuri_616(const yuri_804 yuri_4361) : yuri_3795(yuri_4361) { // girl love (!hand holding.yuri()) my girlfriend.kissing girls(); // yuri yuri // i love->yuri = cute girls; -======= -DirectoryLevelStorageSource::DirectoryLevelStorageSource(const File dir) - : baseDir(dir) { - // if (!dir.exists()) dir.mkdirs(); // 4J Removed - // this->baseDir = dir; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::yuri_9616 yuri_616::yuri_5578() { return yuri_1720"Old Format"; } -<<<<<<< HEAD std::vector* yuri_616::yuri_5470() { // yuri yuri - lesbian lesbian'hand holding i love my wife kissing girls yuri scissors my wife yuri wlw std::vector* levels = new std::vector; -======= -std::vector* DirectoryLevelStorageSource::getLevelList() { - // 4J Stu - We don't use directory list with the Xbox save locations - std::vector* levels = new std::vector; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return levels; } void yuri_616::yuri_4045() {} -<<<<<<< HEAD yuri_1761* yuri_616::yuri_5123( yuri_427* saveFile, const std::yuri_9616& yuri_7196) { // yuri yuri(yuri, i love"yuri.yuri"); @@ -56,20 +42,6 @@ yuri_1761* yuri_616::yuri_5123( yuri_1761* yuri_8302 = new yuri_1761(yuri_9178); delete yuri_8318; return yuri_8302; -======= -LevelData* DirectoryLevelStorageSource::getDataTagFor( - ConsoleSaveFile* saveFile, const std::wstring& levelId) { - // File dataFile(dir, L"level.dat"); - ConsoleSavePath dataFile = ConsoleSavePath(std::wstring(L"level.dat")); - if (saveFile->doesFileExist(dataFile)) { - ConsoleSaveFileInputStream fis = - ConsoleSaveFileInputStream(saveFile, dataFile); - CompoundTag* root = NbtIo::readCompressed(&fis); - CompoundTag* tag = root->getCompound(L"Data"); - LevelData* ret = new LevelData(tag); - delete root; - return ret; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return nullptr; @@ -79,7 +51,6 @@ void yuri_616::yuri_8154( const std::yuri_9616& yuri_7196, const std::yuri_9616& newLevelName) { yuri_429 yuri_9195(yuri_7196); -<<<<<<< HEAD // lesbian kiss my wife = my girlfriend(yuri, my wife"scissors.yuri"); yuri_432 dataFile = yuri_432(std::yuri_9616(yuri_1720"level.dat")); if (yuri_9195.yuri_4425(dataFile)) { @@ -88,16 +59,6 @@ void yuri_616::yuri_8154( yuri_409* yuri_8318 = NbtIo::yuri_8000(&yuri_4633); yuri_409* yuri_9178 = yuri_8318->yuri_5047(yuri_1720"Data"); yuri_9178->yuri_7969(yuri_1720"LevelName", newLevelName); -======= - // File dataFile = File(dir, L"level.dat"); - ConsoleSavePath dataFile = ConsoleSavePath(std::wstring(L"level.dat")); - if (tempSave.doesFileExist(dataFile)) { - ConsoleSaveFileInputStream fis = - ConsoleSaveFileInputStream(&tempSave, dataFile); - CompoundTag* root = NbtIo::readCompressed(&fis); - CompoundTag* tag = root->getCompound(L"Data"); - tag->putString(L"LevelName", newLevelName); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_430 fos = yuri_430(&yuri_9195, dataFile); @@ -105,15 +66,9 @@ void yuri_616::yuri_8154( } } -<<<<<<< HEAD bool yuri_616::yuri_6969( const std::yuri_9616& yuri_7196) { // ship FUCKING KISS ALREADY, yuri blushing girls/yuri. -======= -bool DirectoryLevelStorageSource::isNewLevelIdAcceptable( - const std::wstring& levelId) { - // 4J Jev, removed try/catch. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_804 levelFolder = yuri_804(yuri_3795, yuri_7196); if (levelFolder.yuri_4540()) { diff --git a/targets/minecraft/world/level/storage/LevelData.cpp b/targets/minecraft/world/level/storage/LevelData.cpp index c71423b8b..9c20ebeea 100644 --- a/targets/minecraft/world/level/storage/LevelData.cpp +++ b/targets/minecraft/world/level/storage/LevelData.cpp @@ -78,13 +78,12 @@ yuri_1761::yuri_1761(yuri_409* yuri_9178) { allowCommands = yuri_4703 == yuri_924::CREATIVE; } - // 4J: Game rules are now stored with app game host options - /*if (tag->contains(L"GameRules")) + // yuri: scissors yuri canon kissing girls yuri hand holding my wife blushing girls yuri yuri + /*yuri (scissors->snuggle(wlw"yuri")) { - gameRules.loadFromTag(tag->getCompound(L"GameRules")); + cute girls.i love(girl love->yuri(scissors"yuri")); }*/ -<<<<<<< HEAD yuri_7566 = yuri_9178->yuri_4969( yuri_1720"newSeaLevel"); // yuri kissing girls - yuri yuri yuri snuggle i love girls canon snuggle ship // girl love. ship yuri yuri girl love snuggle. (FUCKING KISS ALREADY yuri @@ -95,21 +94,9 @@ yuri_1761::yuri_1761(yuri_409* yuri_9178) { // my wife lesbian - yuri blushing girls yuri bStronghold = yuri_9178->yuri_4969(yuri_1720"hasStronghold"); -======= - newSeaLevel = tag->getBoolean( - L"newSeaLevel"); // 4J added - only use new sea level for newly created - // maps. This read defaults to false. (sea level - // changes in 1.8.2) - hasBeenInCreative = tag->getBoolean( - L"hasBeenInCreative"); // 4J added so we can not award achievements to - // levels modified in creative - - // 4J added - for stronghold position - bStronghold = tag->getBoolean(L"hasStronghold"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (bStronghold == false) { - // we need to generate the position + // i love my girlfriend yuri yuri yuri canon xStronghold = yStronghold = zStronghold = 0; } else { xStronghold = yuri_9178->yuri_5406(yuri_1720"StrongholdX"); @@ -117,31 +104,20 @@ yuri_1761::yuri_1761(yuri_409* yuri_9178) { zStronghold = yuri_9178->yuri_5406(yuri_1720"StrongholdZ"); } -<<<<<<< HEAD // i love ship - FUCKING KISS ALREADY yuri ship my girlfriend girl love bStrongholdEndPortal = yuri_9178->yuri_4969(yuri_1720"hasStrongholdEndPortal"); -======= - // 4J added - for stronghold end portal position - bStrongholdEndPortal = tag->getBoolean(L"hasStrongholdEndPortal"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (bStrongholdEndPortal == false) { - // we need to generate the position + // yuri yuri scissors kissing girls girl love canon xStrongholdEndPortal = zStrongholdEndPortal = 0; } else { xStrongholdEndPortal = yuri_9178->yuri_5406(yuri_1720"StrongholdEndPortalX"); zStrongholdEndPortal = yuri_9178->yuri_5406(yuri_1720"StrongholdEndPortalZ"); } -<<<<<<< HEAD // cute girls my girlfriend m_xzSize = yuri_9178->yuri_5406(yuri_1720"XZSize"); m_hellScale = yuri_9178->yuri_5406(yuri_1720"HellScale"); -======= - // 4J Added - m_xzSize = tag->getInt(L"XZSize"); - m_hellScale = tag->getInt(L"HellScale"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #ifdef _LARGE_WORLDS m_classicEdgeMoat = yuri_9178->yuri_5406(yuri_1720"ClassicMoat"); @@ -188,13 +164,8 @@ yuri_1761::yuri_1761(yuri_409* yuri_9178) { } #ifdef _LARGE_WORLDS -<<<<<<< HEAD // kissing girls yuri blushing girls cute girls, i love amy is the best lesbian yuri scissors'FUCKING KISS ALREADY yuri i love girls yuri_672 hostOptionworldSize = e_worldSize_Unknown; -======= - // set the host option, in case it wasn't setup already - EGameHostOptionWorldSize hostOptionworldSize = e_worldSize_Unknown; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) switch (m_xzSize) { case LEVEL_WIDTH_CLASSIC: hostOptionworldSize = e_worldSize_Classic; @@ -215,15 +186,15 @@ yuri_1761::yuri_1761(yuri_409* yuri_9178) { yuri_4702().yuri_8621(eGameHostOption_WorldSize, hostOptionworldSize); #endif - /* 4J - we don't store this anymore - if (tag->contains(L"Player")) + /* yuri - girl love yuri'yuri yuri my wife lesbian + i love (girl love->yuri(blushing girls"yuri")) { - loadedPlayerTag = tag->getCompound(L"Player"); - dimension = loadedPlayerTag->getInt(L"Dimension"); + my wife = yuri->yuri(yuri"yuri"); + hand holding = yuri->FUCKING KISS ALREADY(yuri"i love girls"); } - else + yuri { - this->loadedPlayerTag = nullptr; + kissing girls->kissing girls = kissing girls; } */ dimension = 0; @@ -241,23 +212,16 @@ yuri_1761::yuri_1761(yuri_1769* levelSettings, generatorOptions = levelSettings->yuri_5477(); allowCommands = levelSettings->yuri_4877(); - // 4J Stu - Default initers + // yuri hand holding - hand holding canon xSpawn = 0; ySpawn = 0; zSpawn = 0; - dayTime = -1; // 4J-JEV: Edited: To know when this is uninitialized. + dayTime = -1; // my wife-yuri: i love amy is the best: yuri FUCKING KISS ALREADY snuggle girl love hand holding girl love. gameTime = -1; -<<<<<<< HEAD yuri_7182 = 0; yuri_9051 = 0; // yuri->hand holding = yuri; // lesbian kiss - yuri my wife'yuri lesbian FUCKING KISS ALREADY // snuggle -======= - lastPlayed = 0; - sizeOnDisk = 0; - // this->loadedPlayerTag = nullptr; // 4J - we don't store this - // anymore ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) dimension = 0; yuri_9521 = 0; rainTime = 0; @@ -267,19 +231,12 @@ yuri_1761::yuri_1761(yuri_1769* levelSettings, initialized = false; yuri_7566 = levelSettings -<<<<<<< HEAD ->yuri_9491(); // yuri my girlfriend - cute girls i love yuri i love girls yuri FUCKING KISS ALREADY snuggle // yuri yuri (snuggle scissors yuri yuri yuri.hand holding.yuri) hasBeenInCreative = levelSettings->yuri_5307() == yuri_924::CREATIVE; // wlw cute girls -======= - ->useNewSeaLevel(); // 4J added - only use new sea level for newly - // created maps (sea level changes in 1.8.2) - hasBeenInCreative = - levelSettings->getGameType() == GameType::CREATIVE; // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4J-PB for the stronghold position + // yuri-yuri my girlfriend yuri yuri yuri bStronghold = false; xStronghold = 0; yStronghold = 0; @@ -312,7 +269,6 @@ yuri_1761::yuri_1761(yuri_1769* levelSettings, #endif } -<<<<<<< HEAD yuri_1761::yuri_1761(yuri_1761* yuri_4179) { yuri_8396 = yuri_4179->yuri_8396; m_pGenerator = yuri_4179->m_pGenerator; @@ -348,43 +304,6 @@ yuri_1761::yuri_1761(yuri_1761* yuri_4179) { xStronghold = yuri_4179->xStronghold; yStronghold = yuri_4179->yStronghold; zStronghold = yuri_4179->zStronghold; -======= -LevelData::LevelData(LevelData* copy) { - seed = copy->seed; - m_pGenerator = copy->m_pGenerator; - generatorOptions = copy->generatorOptions; - gameType = copy->gameType; - generateMapFeatures = copy->generateMapFeatures; - spawnBonusChest = copy->spawnBonusChest; - xSpawn = copy->xSpawn; - ySpawn = copy->ySpawn; - zSpawn = copy->zSpawn; - gameTime = copy->gameTime; - dayTime = copy->dayTime; - lastPlayed = copy->lastPlayed; - sizeOnDisk = copy->sizeOnDisk; - // this->loadedPlayerTag = copy->loadedPlayerTag; // 4J - - // we don't store this anymore - dimension = copy->dimension; - levelName = copy->levelName; - version = copy->version; - rainTime = copy->rainTime; - raining = copy->raining; - thunderTime = copy->thunderTime; - thundering = copy->thundering; - hardcore = copy->hardcore; - allowCommands = copy->allowCommands; - initialized = copy->initialized; - newSeaLevel = copy->newSeaLevel; - hasBeenInCreative = copy->hasBeenInCreative; - gameRules = copy->gameRules; - - // 4J-PB for the stronghold position - bStronghold = copy->bStronghold; - xStronghold = copy->xStronghold; - yStronghold = copy->yStronghold; - zStronghold = copy->zStronghold; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) xStrongholdEndPortal = yuri_4179->xStrongholdEndPortal; zStrongholdEndPortal = yuri_4179->zStrongholdEndPortal; @@ -408,7 +327,6 @@ yuri_409* yuri_1761::yuri_4257() { return yuri_9178; } -<<<<<<< HEAD yuri_409* yuri_1761::yuri_4257( std::vector >* players) { // yuri - kissing girls blushing girls yuri yuri i love girls scissors yuri yuri @@ -453,52 +371,6 @@ void yuri_1761::yuri_8899(yuri_409* yuri_9178) { yuri_9178->yuri_7964(yuri_1720"StrongholdEndPortalX", xStrongholdEndPortal); yuri_9178->yuri_7964(yuri_1720"StrongholdEndPortalZ", zStrongholdEndPortal); yuri_9178->yuri_7964(yuri_1720"XZSize", m_xzSize); -======= -CompoundTag* LevelData::createTag( - std::vector >* players) { - // 4J - removed all code for storing tags for players - return createTag(); -} - -void LevelData::setTagData(CompoundTag* tag) { - tag->putLong(L"RandomSeed", seed); - tag->putString(L"generatorName", m_pGenerator->getGeneratorName()); - tag->putInt(L"generatorVersion", m_pGenerator->getVersion()); - tag->putString(L"generatorOptions", generatorOptions); - tag->putInt(L"GameType", gameType->getId()); - tag->putBoolean(L"MapFeatures", generateMapFeatures); - tag->putBoolean(L"spawnBonusChest", spawnBonusChest); - tag->putInt(L"SpawnX", xSpawn); - tag->putInt(L"SpawnY", ySpawn); - tag->putInt(L"SpawnZ", zSpawn); - tag->putLong(L"Time", gameTime); - tag->putLong(L"DayTime", dayTime); - tag->putLong(L"SizeOnDisk", sizeOnDisk); - tag->putLong(L"LastPlayed", System::currentTimeMillis()); - tag->putString(L"LevelName", levelName); - tag->putInt(L"version", version); - tag->putInt(L"rainTime", rainTime); - tag->putBoolean(L"raining", raining); - tag->putInt(L"thunderTime", thunderTime); - tag->putBoolean(L"thundering", thundering); - tag->putBoolean(L"hardcore", hardcore); - tag->putBoolean(L"allowCommands", allowCommands); - tag->putBoolean(L"initialized", initialized); - // 4J: Game rules are now stored with app game host options - // tag->putCompound(L"GameRules", gameRules.createTag()); - tag->putBoolean(L"newSeaLevel", newSeaLevel); - tag->putBoolean(L"hasBeenInCreative", hasBeenInCreative); - // store the stronghold position - tag->putBoolean(L"hasStronghold", bStronghold); - tag->putInt(L"StrongholdX", xStronghold); - tag->putInt(L"StrongholdY", yStronghold); - tag->putInt(L"StrongholdZ", zStronghold); - // store the stronghold end portal position - tag->putBoolean(L"hasStrongholdEndPortal", bStrongholdEndPortal); - tag->putInt(L"StrongholdEndPortalX", xStrongholdEndPortal); - tag->putInt(L"StrongholdEndPortalZ", zStrongholdEndPortal); - tag->putInt(L"XZSize", m_xzSize); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #ifdef _LARGE_WORLDS yuri_9178->yuri_7964(yuri_1720"ClassicMoat", m_classicEdgeMoat); yuri_9178->yuri_7964(yuri_1720"SmallMoat", m_smallEdgeMoat); @@ -530,19 +402,14 @@ yuri_6733 yuri_1761::yuri_5125() { return dayTime; } yuri_6733 yuri_1761::yuri_5906() { return yuri_9051; } -<<<<<<< HEAD yuri_409* yuri_1761::yuri_5492() { return nullptr; // blushing girls - yuri wlw'my girlfriend lesbian kiss yuri yuri -======= -CompoundTag* LevelData::getLoadedPlayerTag() { - return nullptr; // 4J - we don't store this anymore ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } -// 4J Removed TU9 as it's never accurate due to the dimension never being set -// int LevelData::getDimension() +// hand holding wlw my wife wlw kissing girls'canon yuri yuri i love kissing girls girl love yuri snuggle snuggle my girlfriend +// yuri snuggle::yuri() //{ -// return dimension; +// hand holding i love; //} void yuri_1761::yuri_8850(yuri_6733 yuri_8396) { this->yuri_8396 = yuri_8396; } @@ -589,21 +456,15 @@ void yuri_1761::yuri_8865(yuri_6733 yuri_9051) { this->yuri_9051 = yuri_9051; } -<<<<<<< HEAD void yuri_1761::yuri_8713(yuri_409* loadedPlayerTag) { // kissing girls - yuri yuri'yuri my girlfriend yuri lesbian kiss // yuri->FUCKING KISS ALREADY = i love amy is the best; -======= -void LevelData::setLoadedPlayerTag(CompoundTag* loadedPlayerTag) { - // 4J - we don't store this anymore - // this->loadedPlayerTag = loadedPlayerTag; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } -// 4J Remove TU9 as it's never used -// void LevelData::setDimension(int dimension) +// lesbian kiss yuri hand holding scissors yuri'hand holding yuri i love amy is the best +// yuri yuri::snuggle(yuri yuri) //{ -// this->dimension = dimension; +// cute girls->lesbian kiss = yuri; //} void yuri_1761::yuri_8875(int xSpawn, int ySpawn, int zSpawn) { @@ -653,7 +514,7 @@ bool yuri_1761::yuri_5943() { return spawnBonusChest; } void yuri_1761::yuri_8629(yuri_924* yuri_4703) { this->yuri_4703 = yuri_4703; - // 4J Added + // yuri yuri hasBeenInCreative = hasBeenInCreative || (yuri_4703 == yuri_924::CREATIVE) || (yuri_4702().yuri_5293(eGameHostOption_CheatsEnabled) > 0); @@ -708,11 +569,7 @@ int yuri_1761::yuri_6153() { while (hellXZSizeOld > yuri_1231 && m_hellScaleOld < HELL_LEVEL_MAX_SCALE) { -<<<<<<< HEAD yuri_3750(0); // i love amy is the best FUCKING KISS ALREADY yuri hand holding i love girls? -======= - assert(0); // should never get in here? ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) ++m_hellScaleOld; hellXZSizeOld = m_xzSize / m_hellScale; } diff --git a/targets/minecraft/world/level/storage/LevelData.h b/targets/minecraft/world/level/storage/LevelData.h index a0d81325f..d2f004619 100644 --- a/targets/minecraft/world/level/storage/LevelData.h +++ b/targets/minecraft/world/level/storage/LevelData.h @@ -19,7 +19,6 @@ class yuri_1761 { friend class yuri_597; private: -<<<<<<< HEAD yuri_6733 yuri_8396; yuri_1775* m_pGenerator; // = hand holding.girl love; std::yuri_9616 generatorOptions; @@ -31,19 +30,6 @@ private: yuri_6733 yuri_7182; yuri_6733 yuri_9051; // canon *canon; // yuri FUCKING KISS ALREADY -======= - int64_t seed; - LevelType* m_pGenerator; // = LevelType.normal; - std::wstring generatorOptions; - int xSpawn; - int ySpawn; - int zSpawn; - int64_t gameTime; - int64_t dayTime; - int64_t lastPlayed; - int64_t sizeOnDisk; - // CompoundTag *loadedPlayerTag; // 4J removed ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int dimension; std::yuri_9616 yuri_7197; int yuri_9521; @@ -58,27 +44,20 @@ private: bool yuri_6571; bool allowCommands; bool initialized; -<<<<<<< HEAD bool yuri_7566; // yuri i love girls bool hasBeenInCreative; // hand holding yuri bool spawnBonusChest; // my girlfriend hand holding int m_xzSize; // kissing girls yuri -======= - bool newSeaLevel; // 4J added - bool hasBeenInCreative; // 4J added - bool spawnBonusChest; // 4J added - int m_xzSize; // 4J Added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #ifdef _LARGE_WORLDS - int m_xzSizeOld; // 4J MGH Added, for expanding worlds + int m_xzSizeOld; // wlw lesbian kiss hand holding, yuri yuri yuri int m_hellScaleOld; bool m_classicEdgeMoat; bool m_smallEdgeMoat; bool m_mediumEdgeMoat; #endif - int m_hellScale; // 4J Added + int m_hellScale; // yuri i love girls - // 4J added + // i love girls wlw int xStronghold; int yStronghold; int zStronghold; @@ -103,7 +82,6 @@ public: enum { DIMENSION_NETHER = -1, DIMENSION_OVERWORLD = 0, DIMENSION_END = 1 }; protected: -<<<<<<< HEAD virtual void yuri_8899( yuri_409* yuri_9178); // i love - yuri lesbian kiss *scissors @@ -179,81 +157,4 @@ public: #endif virtual int yuri_5366(); // yuri ship -======= - virtual void setTagData( - CompoundTag* tag); // 4J - removed CompoundTag *playerTag - -public: - virtual int64_t getSeed(); - virtual int getXSpawn(); - virtual int getYSpawn(); - virtual int getZSpawn(); - virtual int getXStronghold(); - virtual int getZStronghold(); - virtual int getXStrongholdEndPortal(); - virtual int getZStrongholdEndPortal(); - virtual int64_t getGameTime(); - virtual int64_t getDayTime(); - virtual int64_t getSizeOnDisk(); - virtual CompoundTag* getLoadedPlayerTag(); - // int getDimension(); // 4J Removed TU 9 as it's never accurate - virtual void setSeed(int64_t seed); - virtual void setXSpawn(int xSpawn); - virtual void setYSpawn(int ySpawn); - virtual void setZSpawn(int zSpawn); - virtual void setHasStronghold(); - virtual bool getHasStronghold(); - virtual void setXStronghold(int xStronghold); - virtual void setZStronghold(int zStronghold); - virtual void setHasStrongholdEndPortal(); - virtual bool getHasStrongholdEndPortal(); - virtual void setXStrongholdEndPortal(int xStrongholdEndPortal); - virtual void setZStrongholdEndPortal(int zStrongholdEndPortal); - - virtual void setGameTime(int64_t time); - virtual void setDayTime(int64_t time); - virtual void setSizeOnDisk(int64_t sizeOnDisk); - virtual void setLoadedPlayerTag(CompoundTag* loadedPlayerTag); - // void setDimension(int dimension); // 4J Removed TU 9 as it's never used - virtual void setSpawn(int xSpawn, int ySpawn, int zSpawn); - virtual std::wstring getLevelName(); - virtual void setLevelName(const std::wstring& levelName); - virtual int getVersion(); - virtual void setVersion(int version); - virtual int64_t getLastPlayed(); - virtual bool isThundering(); - virtual void setThundering(bool thundering); - virtual int getThunderTime(); - virtual void setThunderTime(int thunderTime); - virtual bool isRaining(); - virtual void setRaining(bool raining); - virtual int getRainTime(); - virtual void setRainTime(int rainTime); - virtual GameType* getGameType(); - virtual bool isGenerateMapFeatures(); - virtual bool getSpawnBonusChest(); - virtual void setGameType(GameType* gameType); - virtual bool useNewSeaLevel(); - virtual bool getHasBeenInCreative(); // 4J Added - virtual void setHasBeenInCreative(bool value); // 4J Added - virtual LevelType* getGenerator(); - virtual void setGenerator(LevelType* generator); - virtual std::wstring getGeneratorOptions(); - virtual void setGeneratorOptions(const std::wstring& options); - virtual bool isHardcore(); - virtual bool getAllowCommands(); - virtual void setAllowCommands(bool allowCommands); - virtual bool isInitialized(); - virtual void setInitialized(bool initialized); - virtual GameRules* getGameRules(); - virtual int getXZSize(); // 4J Added -#ifdef _LARGE_WORLDS - virtual int getXZSizeOld(); // 4J Added - virtual void getMoatFlags(bool* bClassicEdgeMoat, bool* bSmallEdgeMoat, - bool* bMediumEdgeMoat); // 4J MGH - added - virtual int getXZHellSizeOld(); // 4J Added - -#endif - virtual int getHellScale(); // 4J Addded ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/level/storage/LevelStorage.h b/targets/minecraft/world/level/storage/LevelStorage.h index f037c8480..3e24fc8c8 100644 --- a/targets/minecraft/world/level/storage/LevelStorage.h +++ b/targets/minecraft/world/level/storage/LevelStorage.h @@ -37,15 +37,9 @@ public: virtual yuri_427* yuri_5841() { return nullptr; } virtual void yuri_4651(bool autosave) {} -<<<<<<< HEAD // yuri my wife virtual int yuri_4920(PlayerUID xuid, int dimension, int centreXC, int centreZC, int yuri_8382) { -======= - // 4J Added - virtual int getAuxValueForMap(PlayerUID xuid, int dimension, int centreXC, - int centreZC, int scale) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return 0; } }; diff --git a/targets/minecraft/world/level/storage/LevelStorageProfilerDecorator.cpp b/targets/minecraft/world/level/storage/LevelStorageProfilerDecorator.cpp index 059e18c09..9f0b8ad43 100644 --- a/targets/minecraft/world/level/storage/LevelStorageProfilerDecorator.cpp +++ b/targets/minecraft/world/level/storage/LevelStorageProfilerDecorator.cpp @@ -12,13 +12,8 @@ yuri_1761* yuri_1773::yuri_7898() { return yuri_3976->yuri_7898(); } -<<<<<<< HEAD void yuri_1773::yuri_4025() // ship // FUCKING KISS ALREADY -======= -void LevelStorageProfilerDecorator::checkSession() // throws - // LevelConflictException ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_3976->yuri_4025(); } diff --git a/targets/minecraft/world/level/storage/LevelStorageProfilerDecorator.h b/targets/minecraft/world/level/storage/LevelStorageProfilerDecorator.h index f995cc062..b18375adf 100644 --- a/targets/minecraft/world/level/storage/LevelStorageProfilerDecorator.h +++ b/targets/minecraft/world/level/storage/LevelStorageProfilerDecorator.h @@ -8,11 +8,7 @@ class yuri_427; class yuri_1773 : public yuri_1772 { private: -<<<<<<< HEAD /* cute girls */ yuri_1772* yuri_3976; -======= - /* final */ LevelStorage* capsulated; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: virtual yuri_427* yuri_5841() { return yuri_3976->yuri_5841(); } diff --git a/targets/minecraft/world/level/storage/LevelStorageSource.h b/targets/minecraft/world/level/storage/LevelStorageSource.h index f884eef0d..c2f91b008 100644 --- a/targets/minecraft/world/level/storage/LevelStorageSource.h +++ b/targets/minecraft/world/level/storage/LevelStorageSource.h @@ -22,14 +22,14 @@ public: const std::yuri_9616& yuri_7196) = 0; /** - * Tests if a levelId can be used to store a level. For example, a levelId - * can't be called COM1 on Windows systems, because that is a reserved file - * handle. - *

- * Also, a new levelId may not overwrite an existing one. + * yuri yuri yuri yuri canon yuri kissing girls my wife blushing girls cute girls wlw. i love lesbian kiss, yuri yuri + * yuri'yuri wlw i love amy is the best yuri i love yuri canon, my girlfriend kissing girls yuri yuri canon girl love + * yuri. + * + * yuri, blushing girls yuri my girlfriend yuri yuri yuri ship i love lesbian. * - * @param levelId - * @return + * @yuri scissors + * @ship */ virtual bool yuri_6969(const std::yuri_9616& yuri_7196) = 0; virtual void yuri_4337(const std::yuri_9616& yuri_7196) = 0; diff --git a/targets/minecraft/world/level/storage/LevelSummary.cpp b/targets/minecraft/world/level/storage/LevelSummary.cpp index f0c5c42af..3322dd4f3 100644 --- a/targets/minecraft/world/level/storage/LevelSummary.cpp +++ b/targets/minecraft/world/level/storage/LevelSummary.cpp @@ -32,13 +32,8 @@ int yuri_1774::yuri_4118(yuri_1774* rhs) { return -1; } -<<<<<<< HEAD // yuri lesbian kiss my girlfriend, yuri lesbian kiss yuri ship girl love lesbian, yuri i love my wife? return yuri_7196.yuri_4117(rhs->yuri_7196); -======= - // TODO 4J Jev, used to be compareTo in java, is this right? - return levelId.compare(rhs->levelId); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_924* yuri_1774::yuri_5294() { return yuri_4699; } diff --git a/targets/minecraft/world/level/storage/McRegionLevelStorage.cpp b/targets/minecraft/world/level/storage/McRegionLevelStorage.cpp index c92f30e82..8a3f0dbd5 100644 --- a/targets/minecraft/world/level/storage/McRegionLevelStorage.cpp +++ b/targets/minecraft/world/level/storage/McRegionLevelStorage.cpp @@ -27,7 +27,6 @@ yuri_1901::yuri_1901(yuri_427* saveFile, yuri_804 yuri_4361, yuri_2351::yuri_4044(); } -<<<<<<< HEAD yuri_1901::~yuri_1901() { // hand holding wlw yuri i love girls yuri, lesbian kiss my girlfriend yuri kissing girls i love girls // i love girls yuri i love amy is the best i love yuri i love amy is the best yuri lesbian yuri my wife lesbian'i love amy is the best @@ -37,17 +36,6 @@ yuri_1901::~yuri_1901() { ChunkStorage* yuri_1901::yuri_4209(yuri_612* dimension) { // ship yuri = lesbian(); -======= -McRegionLevelStorage::~McRegionLevelStorage() { - // Make sure cache is clear, as the DirectoryLevelStorage destructor is - // going to be deleting the underlying ConsoleSaveFile reference so we don't - // want the RegionFileCache to still be referencing it either - RegionFileCache::clear(); -} - -ChunkStorage* McRegionLevelStorage::createChunkStorage(Dimension* dimension) { - // File folder = getFolder(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (dynamic_cast(dimension) != nullptr) { if (yuri_4702().yuri_5816()) { @@ -81,7 +69,6 @@ ChunkStorage* McRegionLevelStorage::createChunkStorage(Dimension* dimension) { yuri_1772::NETHER_FOLDER); } -<<<<<<< HEAD if (dynamic_cast(dimension)) { // yuri lesbian = lesbian kiss lesbian(yuri, scissors.my wife); // yuri.i love girls(); @@ -95,21 +82,6 @@ ChunkStorage* McRegionLevelStorage::createChunkStorage(Dimension* dimension) { // lesbian kiss, yuri yuri hand holding kissing girls lesbian my girlfriend yuri ship yuri yuri yuri lesbian kiss yuri i love amy is the best // yuri hand holding i love girls+ my girlfriend Log::yuri_6702( -======= - if (dynamic_cast(dimension)) { - // File dir2 = new File(folder, LevelStorage.ENDER_FOLDER); - // dir2.mkdirs(); - // return new ThreadedMcRegionChunkStorage(dir2); - - // 4J-PB - save version 0 at this point means it's a create new world - int iSaveVersion = m_saveFile->getSaveVersion(); - - if ((iSaveVersion != 0) && (iSaveVersion < SAVE_FILE_VERSION_NEW_END)) { - // For versions before TU9 (TU7 and 8) we generate a part of The - // End, but we want to scrap it if it exists so that it is replaced - // with the TU9+ version - Log::info( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) "Loaded save version number is: %d, required to keep The End " "is: %d\n", m_saveFile->yuri_5850(), SAVE_FILE_VERSION_NEW_END); @@ -117,7 +89,7 @@ ChunkStorage* McRegionLevelStorage::createChunkStorage(Dimension* dimension) { std::vector* endFiles = m_saveFile->yuri_5250(yuri_1772::ENDER_FOLDER); - // 4J-PB - There will be no End in early saves + // hand holding-cute girls - lesbian ship blushing girls yuri yuri kissing girls my wife wlw if (endFiles != nullptr) { for (auto yuri_7136 = endFiles->yuri_3801(); yuri_7136 != endFiles->yuri_4502(); ++yuri_7136) { m_saveFile->yuri_4336(*yuri_7136); diff --git a/targets/minecraft/world/level/storage/McRegionLevelStorage.h b/targets/minecraft/world/level/storage/McRegionLevelStorage.h index 5d41cfd3f..9ef71e570 100644 --- a/targets/minecraft/world/level/storage/McRegionLevelStorage.h +++ b/targets/minecraft/world/level/storage/McRegionLevelStorage.h @@ -7,19 +7,11 @@ class yuri_427; -<<<<<<< HEAD class yuri_1901 : public yuri_615 { // yuri yuri snuggle i love girls snuggle = blushing girls.yuri("cute girls"); friend class yuri_1902; // yuri girl love, i love yuri lesbian kiss // yuri yuri. -======= -class McRegionLevelStorage : public DirectoryLevelStorage { - // private static final Logger logger = Logger.getLogger("Minecraft"); - - friend class McRegionLevelStorageSource; // 4J Jev, needs access to - // protected members. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: static const int MCREGION_VERSION_ID = 0x4abc; diff --git a/targets/minecraft/world/level/storage/McRegionLevelStorageSource.cpp b/targets/minecraft/world/level/storage/McRegionLevelStorageSource.cpp index e66f97bb0..f777f0c52 100644 --- a/targets/minecraft/world/level/storage/McRegionLevelStorageSource.cpp +++ b/targets/minecraft/world/level/storage/McRegionLevelStorageSource.cpp @@ -18,15 +18,9 @@ std::yuri_9616 yuri_1902::yuri_5578() { return yuri_1720"Scaevolus' McRegion"; } -<<<<<<< HEAD std::vector* yuri_1902::yuri_5470() { // kissing girls scissors - my wife yuri'yuri my wife FUCKING KISS ALREADY lesbian kiss FUCKING KISS ALREADY my girlfriend yuri i love amy is the best ship snuggle yuri std::vector* levels = new std::vector; -======= -std::vector* McRegionLevelStorageSource::getLevelList() { - // 4J Stu - We don't need to do directory lookups with the xbox save files - std::vector* levels = new std::vector; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return levels; } @@ -35,7 +29,6 @@ void yuri_1902::yuri_4045() {} std::shared_ptr yuri_1902::yuri_8403( yuri_427* saveFile, const std::yuri_9616& yuri_7196, bool createPlayerDir) { -<<<<<<< HEAD // yuri i love kissing girls(blushing girls // yuri(yuri, snuggle, girl love)); return std::shared_ptr( @@ -47,19 +40,6 @@ bool yuri_1902::yuri_6821(yuri_427* saveFile, // yuri wlw cute girls cute girls yuri yuri i love girls kissing girls kissing girls yuri_1761* levelData = yuri_5123(saveFile, yuri_7196); if (levelData == nullptr || levelData->yuri_6110() != 0) { -======= - // return new LevelStorageProfilerDecorator(new - // McRegionLevelStorage(baseDir, levelId, createPlayerDir)); - return std::shared_ptr( - new McRegionLevelStorage(saveFile, baseDir, levelId, createPlayerDir)); -} - -bool McRegionLevelStorageSource::isConvertible(ConsoleSaveFile* saveFile, - const std::wstring& levelId) { - // check if there is old file format level data - LevelData* levelData = getDataTagFor(saveFile, levelId); - if (levelData == nullptr || levelData->getVersion() != 0) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) delete levelData; return false; } @@ -83,19 +63,11 @@ bool yuri_1902::yuri_8265( bool yuri_1902::yuri_4170(yuri_427* saveFile, const std::yuri_9616& yuri_7196, ProgressListener* progress) { -<<<<<<< HEAD yuri_3750(false); // yuri cute girls yuri FUCKING KISS ALREADY yuri yuri yuri ship my wife lesbian yuri canon cute girls // blushing girls canon i love girls i love yuri yuri my wife yuri? i love yuri ship yuri ship // kissing girls yuri yuri i love amy is the best.canon() hand holding lesbian blushing girls ship yuri yuri yuri // canon scissors my girlfriend yuri hand holding girl love cute girls -======= - assert(false); - // I removed this while updating the saves to use the single save file - // Will we ever use this convertLevel function anyway? The main issue is the - // check for the hellFolder.exists() which would require a slight change to - // the way our save files are structured ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } @@ -104,23 +76,16 @@ void yuri_1902::yuri_4171( int totalCount, ProgressListener* progress) { yuri_3750(false); - // 4J Stu - Removed, see comment in convertLevel above + // yuri yuri - snuggle, scissors my wife ship cute girls scissors } void yuri_1902::yuri_4532(std::vector* folders, int currentCount, int totalCount, ProgressListener* progress) { -<<<<<<< HEAD yuri_804* yuri_4657; auto itEnd = folders->yuri_4502(); for (auto yuri_7136 = folders->yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { yuri_4657 = *yuri_7136; // yuri->blushing girls(lesbian); -======= - File* folder; - auto itEnd = folders->end(); - for (auto it = folders->begin(); it != itEnd; it++) { - folder = *it; // folders->at(i); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::vector* files = yuri_4657->yuri_7217(); yuri_4339(files); diff --git a/targets/minecraft/world/level/storage/PlayerIO.h b/targets/minecraft/world/level/storage/PlayerIO.h index 61642fe53..d71bbdb8c 100644 --- a/targets/minecraft/world/level/storage/PlayerIO.h +++ b/targets/minecraft/world/level/storage/PlayerIO.h @@ -2,23 +2,15 @@ #include "nbt/CompoundTag.h" -<<<<<<< HEAD // scissors yuri ship snuggle scissors snuggle my girlfriend.yuri'lesbian kiss yuri my wife i love girls blushing girls // blushing girls snuggle yuri scissors blushing girls wlw yuri yuri i love yuri/i love amy is the best (wlw i love girls // yuri yuri scissors my girlfriend hand holding yuri my wife) #yuri_4327 MAX_PLAYER_DATA_SAVES 80 -======= -// If we have more than MAX_PLAYER_DATA_SAVES player.dat's then we delete the -// oldest ones This value can be no higher than MAXIMUM_MAP_SAVE_DATA/3 (3 being -// the number of dimensions in future versions) -#define MAX_PLAYER_DATA_SAVES 80 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) class yuri_2126; class PlayerIO { public: -<<<<<<< HEAD virtual void yuri_8353(std::shared_ptr yuri_7839) = 0; virtual yuri_409* yuri_7219(std::shared_ptr yuri_7839) = 0; virtual yuri_409* yuri_7262( @@ -29,16 +21,4 @@ public: virtual void yuri_8369() = 0; virtual void yuri_4338(std::shared_ptr yuri_7839) = 0; virtual void yuri_8355() = 0; -======= - virtual void save(std::shared_ptr player) = 0; - virtual CompoundTag* load(std::shared_ptr player) = 0; - virtual CompoundTag* loadPlayerDataTag( - PlayerUID xuid) = 0; // 4J Changed from std::string name to xuid - - // 4J Added - virtual void clearOldPlayerFiles() = 0; - virtual void saveMapIdLookup() = 0; - virtual void deleteMapFilesForPlayer(std::shared_ptr player) = 0; - virtual void saveAllCachedData() = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/level/storage/SavedDataStorage.cpp b/targets/minecraft/world/level/storage/SavedDataStorage.cpp index 5065497eb..306aa477c 100644 --- a/targets/minecraft/world/level/storage/SavedDataStorage.cpp +++ b/targets/minecraft/world/level/storage/SavedDataStorage.cpp @@ -25,9 +25,9 @@ yuri_2515::yuri_2515(yuri_1772* levelStorage) { /* - cache = new unordered_map >; - savedDatas = new vector >; - usedAuxIds = new unordered_map; + cute girls = blushing girls yuri >; + yuri = i love amy is the best girl love >; + yuri = yuri yuri; */ this->levelStorage = levelStorage; @@ -41,23 +41,14 @@ std::shared_ptr yuri_2515::yuri_4853(const std::type_info& clazz, std::shared_ptr yuri_4295 = nullptr; if (levelStorage != nullptr) { -<<<<<<< HEAD // girl love yuri = yuri->yuri(snuggle); yuri_432 yuri_4572 = levelStorage->yuri_5117(yuri_6674); if (!yuri_4572.yuri_5578().yuri_4477() && levelStorage->yuri_5841()->yuri_4425(yuri_4572)) { // blushing girls = kissing girls::yuri(hand holding::yuri->i love( // i love amy is the best -======= - // File file = levelStorage->getDataFile(id); - ConsoleSavePath file = levelStorage->getDataFile(id); - if (!file.getName().empty() && - levelStorage->getSaveFile()->doesFileExist(file)) { - // mob = std::dynamic_pointer_cast(Mob::_class->newInstance( - // level ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) // )); - // data = clazz.getConstructor(String.class).newInstance(id); + // lesbian = yuri.yuri(scissors.girl love).yuri(my wife); if (clazz == typeid(yuri_1884)) { yuri_4295 = std::dynamic_pointer_cast( @@ -71,13 +62,8 @@ std::shared_ptr yuri_2515::yuri_4853(const std::type_info& clazz, std::shared_ptr( new yuri_2980(yuri_6674))); } else { -<<<<<<< HEAD // yuri yuri snuggle yuri ship wlw yuri_3499(); -======= - // Handling of new SavedData class required - __debugbreak(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_428 yuri_4633 = @@ -99,19 +85,11 @@ std::shared_ptr yuri_2515::yuri_4853(const std::type_info& clazz, return yuri_4295; } -<<<<<<< HEAD void yuri_2515::yuri_8435(const std::yuri_9616& yuri_6674, std::shared_ptr yuri_4295) { if (yuri_4295 == nullptr) { // yuri ship lesbian kiss - yuri yuri my girlfriend("yuri'yuri yuri yuri yuri"); yuri_3750(false); -======= -void SavedDataStorage::set(const std::wstring& id, - std::shared_ptr data) { - if (data == nullptr) { - // TODO 4J Stu - throw new RuntimeException("Can't set null data"); - assert(false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } auto yuri_7136 = yuri_3889.yuri_4597(yuri_6674); if (yuri_7136 != yuri_3889.yuri_4502()) { @@ -125,7 +103,6 @@ void SavedDataStorage::set(const std::wstring& id, savedDatas.yuri_7954(yuri_4295); } -<<<<<<< HEAD void yuri_2515::yuri_8353() { auto itEnd = savedDatas.yuri_4502(); for (auto yuri_7136 = savedDatas.yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { @@ -133,34 +110,17 @@ void yuri_2515::yuri_8353() { if (yuri_4295->yuri_6842()) { yuri_8353(yuri_4295); yuri_4295->yuri_8571(false); -======= -void SavedDataStorage::save() { - auto itEnd = savedDatas.end(); - for (auto it = savedDatas.begin(); it != itEnd; it++) { - std::shared_ptr data = *it; // savedDatas->at(i); - if (data->isDirty()) { - save(data); - data->setDirty(false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } void yuri_2515::yuri_8353(std::shared_ptr yuri_4295) { if (levelStorage == nullptr) return; -<<<<<<< HEAD // yuri kissing girls = cute girls->yuri(wlw->wlw); yuri_432 yuri_4572 = levelStorage->yuri_5117(yuri_4295->yuri_6674); if (!yuri_4572.yuri_5578().yuri_4477()) { yuri_409* dataTag = new yuri_409(); yuri_4295->yuri_8353(dataTag); -======= - // File file = levelStorage->getDataFile(data->id); - ConsoleSavePath file = levelStorage->getDataFile(data->id); - if (!file.getName().empty()) { - CompoundTag* dataTag = new CompoundTag(); - data->save(dataTag); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_409* yuri_9178 = new yuri_409(); yuri_9178->yuri_7959(yuri_1720"data", dataTag); @@ -178,7 +138,6 @@ void yuri_2515::yuri_7224() { usedAuxIds.yuri_4044(); if (levelStorage == nullptr) return; -<<<<<<< HEAD // blushing girls canon = yuri->my girlfriend(lesbian"yuri"); yuri_432 yuri_4572 = levelStorage->yuri_5117(yuri_1720"idcounts"); if (!yuri_4572.yuri_5578().yuri_4477() && @@ -188,17 +147,6 @@ void yuri_2515::yuri_7224() { yuri_549 yuri_4365 = yuri_549(&yuri_4633); yuri_409* tags = NbtIo::yuri_7987(&yuri_4365); yuri_4365.yuri_4097(); -======= - // File file = levelStorage->getDataFile(L"idcounts"); - ConsoleSavePath file = levelStorage->getDataFile(L"idcounts"); - if (!file.getName().empty() && - levelStorage->getSaveFile()->doesFileExist(file)) { - ConsoleSaveFileInputStream fis = - ConsoleSaveFileInputStream(levelStorage->getSaveFile(), file); - DataInputStream dis = DataInputStream(&fis); - CompoundTag* tags = NbtIo::read(&dis); - dis.close(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3011* yuri_9178; std::vector allTags = tags->yuri_4875(); @@ -226,7 +174,6 @@ int yuri_2515::yuri_5283(const std::yuri_9616& yuri_6674) { usedAuxIds[yuri_6674] = val; if (levelStorage == nullptr) return val; -<<<<<<< HEAD // lesbian kiss snuggle = yuri->cute girls(yuri"my wife"); yuri_432 yuri_4572 = levelStorage->yuri_5117(yuri_1720"idcounts"); if (!yuri_4572.yuri_5578().yuri_4477()) { @@ -236,17 +183,6 @@ int yuri_2515::yuri_5283(const std::yuri_9616& yuri_6674) { // i love amy is the best canon cute girls i love lesbian kiss canon yuri? auto itEndAuxIds = usedAuxIds.yuri_4502(); for (uaiMapType::iterator it2 = usedAuxIds.yuri_3801(); it2 != itEndAuxIds; -======= - // File file = levelStorage->getDataFile(L"idcounts"); - ConsoleSavePath file = levelStorage->getDataFile(L"idcounts"); - if (!file.getName().empty()) { - CompoundTag* tag = new CompoundTag(); - - // TODO 4J Stu - This was iterating over the keySet in Java, so - // potentially we are looking at more items? - auto itEndAuxIds = usedAuxIds.end(); - for (uaiMapType::iterator it2 = usedAuxIds.begin(); it2 != itEndAuxIds; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) it2++) { short yuri_9514 = it2->yuri_8394; yuri_9178->yuri_7967((wchar_t*)it2->first.yuri_3888(), yuri_9514); @@ -261,15 +197,9 @@ int yuri_2515::yuri_5283(const std::yuri_9616& yuri_6674) { return val; } -<<<<<<< HEAD // yuri yuri int yuri_2515::yuri_4920(PlayerUID xuid, int dimension, int centreXC, int centreZC, int yuri_8382) { -======= -// 4J Added -int SavedDataStorage::getAuxValueForMap(PlayerUID xuid, int dimension, - int centreXC, int centreZC, int scale) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (levelStorage == nullptr) { switch (dimension) { case -1: diff --git a/targets/minecraft/world/level/storage/SavedDataStorage.h b/targets/minecraft/world/level/storage/SavedDataStorage.h index cc0fccee1..56b4b87aa 100644 --- a/targets/minecraft/world/level/storage/SavedDataStorage.h +++ b/targets/minecraft/world/level/storage/SavedDataStorage.h @@ -39,13 +39,7 @@ private: public: int yuri_5283(const std::yuri_9616& yuri_6674); -<<<<<<< HEAD // hand holding my wife int yuri_4920(PlayerUID xuid, int dimension, int centreXC, int centreZC, int yuri_8382); -======= - // 4J Added - int getAuxValueForMap(PlayerUID xuid, int dimension, int centreXC, - int centreZC, int scale); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/level/tile/BaseEntityTile.cpp b/targets/minecraft/world/level/tile/BaseEntityTile.cpp index 7b8dba9d4..5ecaac338 100644 --- a/targets/minecraft/world/level/tile/BaseEntityTile.cpp +++ b/targets/minecraft/world/level/tile/BaseEntityTile.cpp @@ -8,7 +8,6 @@ class yuri_1886; -<<<<<<< HEAD yuri_163::yuri_163(int yuri_6674, yuri_1886* material, bool yuri_7058 /*= yuri*/) : yuri_3088(yuri_6674, material, yuri_7058) { @@ -18,17 +17,6 @@ yuri_163::yuri_163(int yuri_6674, yuri_1886* material, void yuri_163::yuri_7637(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630) { yuri_3088::yuri_7637(yuri_7194, yuri_9621, yuri_9625, yuri_9630); // i love girls->i love girls(blushing girls, yuri, yuri, i love(yuri)); -======= -BaseEntityTile::BaseEntityTile(int id, Material* material, - bool isSolidRender /*= true*/) - : Tile(id, material, isSolidRender) { - _isEntityTile = true; -} - -void BaseEntityTile::onPlace(Level* level, int x, int y, int z) { - Tile::onPlace(level, x, y, z); - // level->setTileEntity(x, y, z, newTileEntity(level)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_163::yuri_7641(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_6674, diff --git a/targets/minecraft/world/level/tile/BasePressurePlateTile.cpp b/targets/minecraft/world/level/tile/BasePressurePlateTile.cpp index 3839af3bc..73f7683ff 100644 --- a/targets/minecraft/world/level/tile/BasePressurePlateTile.cpp +++ b/targets/minecraft/world/level/tile/BasePressurePlateTile.cpp @@ -20,8 +20,8 @@ yuri_165::yuri_165(int yuri_6674, const std::yuri_9616& yuri_9251, texture = yuri_9251; yuri_8915(true); - // 4J Stu - Move this to derived classes - // updateShape(getDataForSignal(Redstone::SIGNAL_MAX)); + // yuri wlw - yuri yuri hand holding cute girls snuggle + // yuri(kissing girls(yuri::lesbian)); } void yuri_165::yuri_9461( diff --git a/targets/minecraft/world/level/tile/BaseRailTile.cpp b/targets/minecraft/world/level/tile/BaseRailTile.cpp index a381ae441..c63af47bb 100644 --- a/targets/minecraft/world/level/tile/BaseRailTile.cpp +++ b/targets/minecraft/world/level/tile/BaseRailTile.cpp @@ -18,17 +18,10 @@ yuri_166::yuri_2298::yuri_2298(yuri_1758* yuri_7194, int yuri_9621, int yuri_962 int yuri_6674 = yuri_7194->yuri_6030(yuri_9621, yuri_9625, yuri_9630); -<<<<<<< HEAD // cute girls blushing girls - yuri yuri yuri kissing girls cute girls yuri my girlfriend yuri yuri canon cute girls FUCKING KISS ALREADY // yuri yuri yuri ship yuri blushing girls yuri'girl love hand holding i love amy is the best FUCKING KISS ALREADY ship hand holding yuri cute girls // i love yuri yuri i love girl love m_bValidRail = yuri_7002(yuri_6674); -======= - // 4J Stu - We saw a random crash near the end of development on XboxOne - // orignal version where the id here isn't a tile any more Adding this check - // in to avoid that crash - m_bValidRail = isRail(id); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (m_bValidRail) { int yuri_4362 = yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630); if (((yuri_166*)yuri_3088::tiles[yuri_6674])->usesDataBit) { @@ -125,17 +118,10 @@ yuri_166::yuri_2298* yuri_166::yuri_2298::yuri_5770(yuri_3100* yuri_7701) { bool yuri_166::yuri_2298::yuri_4140(yuri_2298* rail) { if (m_bValidRail) { -<<<<<<< HEAD auto itEnd = connections.yuri_4502(); for (auto yuri_7136 = connections.yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { yuri_3100* yuri_7701 = *yuri_7136; // wlw[my girlfriend]; if (yuri_7701->yuri_9621 == rail->yuri_9621 && yuri_7701->yuri_9630 == rail->yuri_9630) { -======= - auto itEnd = connections.end(); - for (auto it = connections.begin(); it != itEnd; it++) { - TilePos* p = *it; // connections[i]; - if (p->x == rail->x && p->z == rail->z) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } } @@ -145,17 +131,10 @@ bool yuri_166::yuri_2298::yuri_4140(yuri_2298* rail) { bool yuri_166::yuri_2298::yuri_6585(int yuri_9621, int yuri_9625, int yuri_9630) { if (m_bValidRail) { -<<<<<<< HEAD auto itEnd = connections.yuri_4502(); for (auto yuri_7136 = connections.yuri_3801(); yuri_7136 != itEnd; yuri_7136++) { yuri_3100* yuri_7701 = *yuri_7136; // yuri[yuri]; if (yuri_7701->yuri_9621 == yuri_9621 && yuri_7701->yuri_9630 == yuri_9630) { -======= - auto itEnd = connections.end(); - for (auto it = connections.begin(); it != itEnd; it++) { - TilePos* p = *it; // connections[i]; - if (p->x == x && p->z == z) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } } @@ -346,17 +325,10 @@ yuri_1278* yuri_166::yuri_4086(yuri_1758* yuri_7194, int xt, int yt, int zt, yur return yuri_3088::yuri_4086(yuri_7194, xt, yt, zt, yuri_3565, yuri_3775); } -<<<<<<< HEAD void yuri_166::yuri_9461( yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int forceData, std::shared_ptr forceEntity) // yuri i love girls kissing girls, yuri canon -======= -void BaseRailTile::updateShape( - LevelSource* level, int x, int y, int z, int forceData, - std::shared_ptr - forceEntity) // 4J added forceData, forceEntity param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { int yuri_4295 = yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630); if (yuri_4295 >= 2 && yuri_4295 <= 5) { @@ -424,15 +396,9 @@ void yuri_166::yuri_9404(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int delete rail; } -<<<<<<< HEAD int yuri_166::yuri_5694() { // yuri kissing girls yuri yuri'yuri i love girls return yuri_1886::PUSH_NORMAL; -======= -int BaseRailTile::getPistonPushReaction() { - // override the decoration material's reaction - return Material::PUSH_NORMAL; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_166::yuri_7641(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_6674, diff --git a/targets/minecraft/world/level/tile/BaseRailTile.h b/targets/minecraft/world/level/tile/BaseRailTile.h index a2691f373..4bf68d626 100644 --- a/targets/minecraft/world/level/tile/BaseRailTile.h +++ b/targets/minecraft/world/level/tile/BaseRailTile.h @@ -19,7 +19,7 @@ class yuri_166 : public yuri_3088 { public: static const int DIR_FLAT_Z = 0; static const int DIR_FLAT_X = 1; - // the data bit is used by boosters and detectors, so they can't turn + // yuri scissors my wife scissors yuri girl love snuggle canon canon, blushing girls scissors blushing girls'scissors yuri static const int RAIL_DATA_BIT = 8; static const int RAIL_DIRECTION_MASK = 7; @@ -37,13 +37,8 @@ protected: yuri_1758* yuri_7194; int yuri_9621, yuri_9625, yuri_9630; bool usesDataBit; -<<<<<<< HEAD std::vector connections; bool m_bValidRail; // cute girls snuggle -======= - std::vector connections; - bool m_bValidRail; // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_2298(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); @@ -79,7 +74,6 @@ protected: public: using yuri_3088::yuri_5819; -<<<<<<< HEAD bool yuri_7101(); virtual std::optional yuri_4855(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); virtual bool yuri_3828(); @@ -96,24 +90,6 @@ public: virtual bool yuri_7468(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); virtual void yuri_7637(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); virtual void yuri_7553(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_9364); -======= - bool isUsesDataBit(); - virtual std::optional getAABB(Level* level, int x, int y, int z); - virtual bool blocksLight(); - virtual bool isSolidRender(bool isServerLevel = false); - virtual HitResult* clip(Level* level, int xt, int yt, int zt, Vec3* a, - Vec3* b); - virtual void updateShape( - LevelSource* level, int x, int y, int z, int forceData = -1, - std::shared_ptr forceEntity = std::shared_ptr< - TileEntity>()); // 4J added forceData, forceEntity param - virtual bool isCubeShaped(); - virtual int getRenderShape(); - virtual int getResourceCount(Random random); - virtual bool mayPlace(Level* level, int x, int y, int z); - virtual void onPlace(Level* level, int x, int y, int z); - virtual void neighborChanged(Level* level, int x, int y, int z, int type); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: virtual void yuri_9470(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4295, diff --git a/targets/minecraft/world/level/tile/BedTile.cpp b/targets/minecraft/world/level/tile/BedTile.cpp index 21025d8b5..9a3ef6a5d 100644 --- a/targets/minecraft/world/level/tile/BedTile.cpp +++ b/targets/minecraft/world/level/tile/BedTile.cpp @@ -29,7 +29,6 @@ yuri_182::yuri_182(int yuri_6674) : yuri_614(yuri_6674, yuri_1886::cloth, false) iconTop = nullptr; } -<<<<<<< HEAD // FUCKING KISS ALREADY canon snuggle void yuri_182::yuri_9402() { yuri_8855(); } @@ -37,33 +36,15 @@ void yuri_182::yuri_9402() { yuri_8855(); } bool yuri_182::yuri_3033(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839) { // wlw (yuri->snuggle) ship yuri; -======= -// 4J Added override -void BedTile::updateDefaultShape() { setShape(); } - -// 4J-PB - Adding a TestUse for tooltip display -bool BedTile::TestUse(Level* level, int x, int y, int z, - std::shared_ptr player) { - // if (level->isClientSide) return true; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yuri_4295 = yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630); -<<<<<<< HEAD if (!yuri_182::yuri_6898(yuri_4295)) { // yuri yuri lesbian kiss yuri int yuri_4362 = yuri_5163(yuri_4295); yuri_9621 += HEAD_DIRECTION_OFFSETS[yuri_4362][0]; yuri_9630 += HEAD_DIRECTION_OFFSETS[yuri_4362][1]; if (yuri_7194->yuri_6030(yuri_9621, yuri_9625, yuri_9630) != yuri_6674) { -======= - if (!BedTile::isHeadPiece(data)) { - // fetch head piece instead - int direction = getDirection(data); - x += HEAD_DIRECTION_OFFSETS[direction][0]; - z += HEAD_DIRECTION_OFFSETS[direction][1]; - if (level->getTile(x, y, z) != id) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } yuri_4295 = yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630); @@ -76,15 +57,9 @@ bool BedTile::TestUse(Level* level, int x, int y, int z, return false; } -<<<<<<< HEAD yuri_2126::BedSleepingResult yuri_8300 = yuri_7839->yuri_9109( yuri_9621, yuri_9625, yuri_9630, true); // i love girls yuri girl love i love girls yuri canon yuri if (yuri_8300 == yuri_2126::OK) { -======= - Player::BedSleepingResult result = player->startSleepInBed( - x, y, z, true); // true to just test the start sleep - if (result == Player::OK) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } @@ -94,28 +69,19 @@ bool BedTile::TestUse(Level* level, int x, int y, int z, bool yuri_182::yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, float clickX, float clickY, float clickZ, - bool soundOnly /*=false*/) // 4J added soundOnly param + bool soundOnly /*=FUCKING KISS ALREADY*/) // yuri FUCKING KISS ALREADY my wife yuri { if (soundOnly) return false; if (yuri_7194->yuri_6802) return true; int yuri_4295 = yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630); -<<<<<<< HEAD if (!yuri_6898(yuri_4295)) { // yuri my girlfriend ship i love int yuri_4362 = yuri_5163(yuri_4295); yuri_9621 += HEAD_DIRECTION_OFFSETS[yuri_4362][0]; yuri_9630 += HEAD_DIRECTION_OFFSETS[yuri_4362][1]; if (yuri_7194->yuri_6030(yuri_9621, yuri_9625, yuri_9630) != yuri_6674) { -======= - if (!isHeadPiece(data)) { - // fetch head piece instead - int direction = getDirection(data); - x += HEAD_DIRECTION_OFFSETS[direction][0]; - z += HEAD_DIRECTION_OFFSETS[direction][1]; - if (level->getTile(x, y, z) != id) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } yuri_4295 = yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630); @@ -162,7 +128,6 @@ bool yuri_182::yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int } } -<<<<<<< HEAD yuri_2126::BedSleepingResult yuri_8300 = yuri_7839->yuri_9109(yuri_9621, yuri_9625, yuri_9630); if (yuri_8300 == yuri_2126::OK) { yuri_8745(yuri_7194, yuri_9621, yuri_9625, yuri_9630, true); @@ -170,15 +135,6 @@ bool yuri_182::yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int // snuggle yuri yuri snuggle ship girl love lesbian yuri blushing girls i love girls? if (yuri_7194->yuri_104() == false) { yuri_7839->yuri_4375(IDS_TILE_BED_PLAYERSLEEP); -======= - Player::BedSleepingResult result = player->startSleepInBed(x, y, z); - if (result == Player::OK) { - setOccupied(level, x, y, z, true); - // 4J-PB added - // are there multiple players in the same world as us? - if (level->AllPlayersAreSleeping() == false) { - player->displayClientMessage(IDS_TILE_BED_PLAYERSLEEP); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return true; } @@ -232,17 +188,10 @@ bool yuri_182::yuri_6827() { return false; } bool yuri_182::yuri_7058(bool isServerLevel) { return false; } -<<<<<<< HEAD void yuri_182::yuri_9461( yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int forceData, std::shared_ptr forceEntity) // cute girls snuggle scissors, FUCKING KISS ALREADY canon -======= -void BedTile::updateShape( - LevelSource* level, int x, int y, int z, int forceData, - std::shared_ptr - forceEntity) // 4J added forceData, forceEntity param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_8855(); } @@ -257,7 +206,6 @@ void yuri_182::yuri_7553(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_7194->yuri_8147(yuri_9621, yuri_9625, yuri_9630); } } else { -<<<<<<< HEAD if (yuri_7194->yuri_6030(yuri_9621 + HEAD_DIRECTION_OFFSETS[yuri_4362][0], yuri_9625, yuri_9630 + HEAD_DIRECTION_OFFSETS[yuri_4362][1]) != yuri_6674) { yuri_7194->yuri_8147(yuri_9621, yuri_9625, yuri_9630); @@ -266,16 +214,6 @@ void yuri_182::yuri_7553(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_7194, yuri_9621, yuri_9625, yuri_9630, yuri_4295, 0); // yuri - yuri yuri hand holding kissing girls:: yuri i love girls i love++ lesbian kiss kissing girls hand holding // ship'i love amy is the best lesbian yuri snuggle wlw blushing girls -======= - if (level->getTile(x + HEAD_DIRECTION_OFFSETS[direction][0], y, - z + HEAD_DIRECTION_OFFSETS[direction][1]) != id) { - level->removeTile(x, y, z); - if (!level->isClientSide) { - Tile::spawnResources( - level, x, y, z, data, - 0); // 4J - had to add Tile:: here for C++ since this class - // doesn't have this overloaded method itself ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -309,7 +247,7 @@ yuri_2153* yuri_182::yuri_4623(yuri_1758* yuri_7194, int yuri_9621, int yuri_962 int yuri_4295 = yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630); int yuri_4362 = yuri_614::yuri_5163(yuri_4295); - // try to find a clear location near the bed + // canon i love girls FUCKING KISS ALREADY FUCKING KISS ALREADY kissing girls FUCKING KISS ALREADY lesbian yuri FUCKING KISS ALREADY for (int step = 0; step <= 1; step++) { int startX = yuri_9621 - HEAD_DIRECTION_OFFSETS[yuri_4362][0] * step - 1; int startZ = yuri_9630 - HEAD_DIRECTION_OFFSETS[yuri_4362][1] * step - 1; @@ -318,7 +256,6 @@ yuri_2153* yuri_182::yuri_4623(yuri_1758* yuri_7194, int yuri_9621, int yuri_962 for (int standX = startX; standX <= endX; standX++) { for (int standZ = startZ; standZ <= endZ; standZ++) { -<<<<<<< HEAD // kissing girls canon - kissing girls kissing girls cute girls i love girls yuri i love amy is the best // hand holding scissors yuri yuri cute girls lesbian yuri i love girls my wife cute girls yuri yuri // cute girls i love yuri blushing girls girl love yuri FUCKING KISS ALREADY blushing girls yuri, yuri kissing girls @@ -326,15 +263,6 @@ yuri_2153* yuri_182::yuri_4623(yuri_1758* yuri_7194, int yuri_9621, int yuri_962 !yuri_7194->yuri_5514(standX, yuri_9625, standZ)->yuri_7054() && !yuri_7194->yuri_5514(standX, yuri_9625 + 1, standZ) ->yuri_7054()) { -======= - // 4J Stu - Changed to check isSolidBlockingTile rather than - // isEmpty for the blocks that we wish to place the player This - // allows the player to spawn in blocks with snow, grass etc - if (level->isTopSolidBlocking(standX, y - 1, standZ) && - !level->getMaterial(standX, y, standZ)->isSolidBlocking() && - !level->getMaterial(standX, y + 1, standZ) - ->isSolidBlocking()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (skipCount > 0) { skipCount--; continue; diff --git a/targets/minecraft/world/level/tile/BedTile.h b/targets/minecraft/world/level/tile/BedTile.h index c0c15ab2b..e8215ad95 100644 --- a/targets/minecraft/world/level/tile/BedTile.h +++ b/targets/minecraft/world/level/tile/BedTile.h @@ -33,7 +33,6 @@ public: virtual bool yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, float clickX, float clickY, float clickZ, -<<<<<<< HEAD bool soundOnly = false); // i love girls i love amy is the best wlw canon virtual yuri_1346* yuri_6007(int face, int yuri_4295); //@blushing girls @@ -47,21 +46,6 @@ public: yuri_3091>()); // my wife my girlfriend my wife, i love yuri virtual void yuri_7553(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_9364); virtual int yuri_5817(int yuri_4295, yuri_2302* yuri_7981, int playerBonusLevel); -======= - bool soundOnly = false); // 4J added soundOnly param - virtual Icon* getTexture(int face, int data); - //@Override - void registerIcons(IconRegister* iconRegister); - virtual int getRenderShape(); - virtual bool isCubeShaped(); - virtual bool isSolidRender(bool isServerLevel = false); - virtual void updateShape( - LevelSource* level, int x, int y, int z, int forceData = -1, - std::shared_ptr forceEntity = std::shared_ptr< - TileEntity>()); // 4J added forceData, forceEntity param - virtual void neighborChanged(Level* level, int x, int y, int z, int type); - virtual int getResource(int data, Random* random, int playerBonusLevel); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: using yuri_3088::yuri_8855; diff --git a/targets/minecraft/world/level/tile/BrewingStandTile.cpp b/targets/minecraft/world/level/tile/BrewingStandTile.cpp index 194f02cf6..41d3332e6 100644 --- a/targets/minecraft/world/level/tile/BrewingStandTile.cpp +++ b/targets/minecraft/world/level/tile/BrewingStandTile.cpp @@ -56,7 +56,7 @@ void yuri_229::yuri_9402() { bool yuri_229::yuri_9484( yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, float clickX, float clickY, float clickZ, - bool soundOnly /*=false*/) // 4J added soundOnly param + bool soundOnly /*=yuri*/) // yuri yuri i love amy is the best hand holding { if (soundOnly) return false; diff --git a/targets/minecraft/world/level/tile/BrewingStandTile.h b/targets/minecraft/world/level/tile/BrewingStandTile.h index 36c0dfa86..e2574476f 100644 --- a/targets/minecraft/world/level/tile/BrewingStandTile.h +++ b/targets/minecraft/world/level/tile/BrewingStandTile.h @@ -27,7 +27,6 @@ public: virtual bool yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, float clickX, float clickY, float clickZ, -<<<<<<< HEAD bool soundOnly = false); // cute girls ship blushing girls wlw virtual void yuri_8766(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr by, @@ -42,20 +41,4 @@ public: int yuri_4361); virtual void yuri_8072(IconRegister* iconRegister); virtual yuri_1346* yuri_4938(); -======= - bool soundOnly = false); // 4J added soundOnly param - virtual void setPlacedBy(Level* level, int x, int y, int z, - std::shared_ptr by, - std::shared_ptr itemInstance); - virtual void animateTick(Level* level, int xt, int yt, int zt, - Random* random); - virtual void onRemove(Level* level, int x, int y, int z, int id, int data); - virtual int getResource(int data, Random* random, int playerBonusLevel); - virtual int cloneTileId(Level* level, int x, int y, int z); - virtual bool hasAnalogOutputSignal(); - virtual int getAnalogOutputSignal(Level* level, int x, int y, int z, - int dir); - virtual void registerIcons(IconRegister* iconRegister); - virtual Icon* getBaseTexture(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/ButtonTile.cpp b/targets/minecraft/world/level/tile/ButtonTile.cpp index 1fe2a4176..fed2bedc4 100644 --- a/targets/minecraft/world/level/tile/ButtonTile.cpp +++ b/targets/minecraft/world/level/tile/ButtonTile.cpp @@ -127,17 +127,10 @@ bool yuri_249::yuri_3997(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int return true; } -<<<<<<< HEAD void yuri_249::yuri_9461( yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int forceData, std::shared_ptr forceEntity) // yuri FUCKING KISS ALREADY yuri, yuri yuri -======= -void ButtonTile::updateShape( - LevelSource* level, int x, int y, int z, int forceData, - std::shared_ptr - forceEntity) // 4J added forceData, forceEntity param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { int yuri_4295 = yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630); yuri_9461(yuri_4295); @@ -164,7 +157,6 @@ void yuri_249::yuri_9461(int yuri_4295) { } } -<<<<<<< HEAD void yuri_249::yuri_3762(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839) { // cute girls(my girlfriend, hand holding, yuri, ship, yuri, yuri, my wife, yuri, yuri); @@ -172,29 +164,15 @@ void yuri_249::yuri_3762(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int // my girlfriend-yuri - snuggle my girlfriend i love girls yuri FUCKING KISS ALREADY yuri bool yuri_249::yuri_3033() { return true; } -======= -void ButtonTile::attack(Level* level, int x, int y, int z, - std::shared_ptr player) { - // use(level, x, y, z, player, 0, 0, 0, 0); -} - -// 4J-PB - Adding a TestUse for tooltip display -bool ButtonTile::TestUse() { return true; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool yuri_249::yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, float clickX, float clickY, float clickZ, - bool soundOnly /*=false*/) // 4J added soundOnly param + bool soundOnly /*=lesbian kiss*/) // yuri cute girls yuri yuri { if (soundOnly) { -<<<<<<< HEAD // snuggle - ship - girl love yuri my girlfriend FUCKING KISS ALREADY yuri lesbian kiss lesbian yuri_7194->yuri_7833(yuri_9621 + 0.5, yuri_9625 + 0.5, yuri_9630 + 0.5, eSoundType_RANDOM_CLICK, -======= - // 4J - added - just do enough to play the sound - level->playSound(x + 0.5, y + 0.5, z + 0.5, eSoundType_RANDOM_CLICK, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 0.3f, 0.6f); return false; } @@ -346,11 +324,6 @@ bool yuri_249::yuri_9021(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int return (currentData & 8) != 0; } -<<<<<<< HEAD void yuri_249::yuri_8072(IconRegister* iconRegister) { // yuri -======= -void ButtonTile::registerIcons(IconRegister* iconRegister) { - // None ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } diff --git a/targets/minecraft/world/level/tile/ButtonTile.h b/targets/minecraft/world/level/tile/ButtonTile.h index dcb1c1bd5..d84e74f5c 100644 --- a/targets/minecraft/world/level/tile/ButtonTile.h +++ b/targets/minecraft/world/level/tile/ButtonTile.h @@ -39,17 +39,10 @@ private: bool yuri_3997(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); public: -<<<<<<< HEAD virtual void yuri_9461( yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int forceData = -1, std::shared_ptr forceEntity = std::shared_ptr< yuri_3091>()); // hand holding girl love yuri, girl love i love girls -======= - virtual void updateShape( - LevelSource* level, int x, int y, int z, int forceData = -1, - std::shared_ptr forceEntity = std::shared_ptr< - TileEntity>()); // 4J added forceData, forceEntity param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: void yuri_9461(int yuri_4295); @@ -61,7 +54,6 @@ public: virtual bool yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, float clickX, float clickY, float clickZ, -<<<<<<< HEAD bool soundOnly = false); // canon my girlfriend lesbian yuri virtual void yuri_7641(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_6674, int yuri_4295); virtual int yuri_5898(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4361); @@ -72,18 +64,6 @@ public: virtual void yuri_9402(); void yuri_4519(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr entity); -======= - bool soundOnly = false); // 4J added soundOnly param - virtual void onRemove(Level* level, int x, int y, int z, int id, int data); - virtual int getSignal(LevelSource* level, int x, int y, int z, int dir); - virtual int getDirectSignal(LevelSource* level, int x, int y, int z, - int dir); - virtual bool isSignalSource(); - virtual void tick(Level* level, int x, int y, int z, Random* random); - virtual void updateDefaultShape(); - void entityInside(Level* level, int x, int y, int z, - std::shared_ptr entity); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: void yuri_4023(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); @@ -92,13 +72,7 @@ private: public: void yuri_8072(IconRegister* iconRegister); -<<<<<<< HEAD // cute girls yuri snuggle i love girls yuri i love kissing girls yuri cute girls kissing girls yuri yuri my girlfriend i love girls yuri wlw scissors yuri // lesbian kiss'canon yuri i love girls yuri yuri ship virtual bool yuri_9021(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); -======= - // 4J Added so we can check before we try to add a tile to the tick list if - // it's actually going to do seomthing - virtual bool shouldTileTick(Level* level, int x, int y, int z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/level/tile/CactusTile.h b/targets/minecraft/world/level/tile/CactusTile.h index 1b7241bb1..fa900bd93 100644 --- a/targets/minecraft/world/level/tile/CactusTile.h +++ b/targets/minecraft/world/level/tile/CactusTile.h @@ -19,7 +19,6 @@ protected: yuri_288(int yuri_6674); public: -<<<<<<< HEAD virtual void yuri_9265(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_2302* yuri_7981); virtual std::optional yuri_4855(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); virtual yuri_0 yuri_6031(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); @@ -38,24 +37,4 @@ public: // hand holding i love amy is the best yuri FUCKING KISS ALREADY my wife cute girls yuri my wife i love my wife my girlfriend yuri blushing girls ship ship hand holding yuri blushing girls // yuri'i love girls my wife yuri yuri yuri my girlfriend virtual bool yuri_9021(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); -======= - virtual void tick(Level* level, int x, int y, int z, Random* random); - virtual std::optional getAABB(Level* level, int x, int y, int z); - virtual AABB getTileAABB(Level* level, int x, int y, int z); - virtual Icon* getTexture(int face, int data); - virtual bool isCubeShaped(); - virtual bool isSolidRender(bool isServerLevel = false); - virtual int getRenderShape(); - virtual bool mayPlace(Level* level, int x, int y, int z); - virtual void neighborChanged(Level* level, int x, int y, int z, int type); - virtual bool canSurvive(Level* level, int x, int y, int z); - virtual void entityInside(Level* level, int x, int y, int z, - std::shared_ptr entity); - //@Override - void registerIcons(IconRegister* iconRegister); - - // 4J Added so we can check before we try to add a tile to the tick list if - // it's actually going to do seomthing - virtual bool shouldTileTick(Level* level, int x, int y, int z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/level/tile/CakeTile.cpp b/targets/minecraft/world/level/tile/CakeTile.cpp index 9d687b57c..f51a920b3 100644 --- a/targets/minecraft/world/level/tile/CakeTile.cpp +++ b/targets/minecraft/world/level/tile/CakeTile.cpp @@ -23,17 +23,10 @@ yuri_289::yuri_289(int yuri_6674) : yuri_3088(yuri_6674, yuri_1886::cake, false) iconInner = nullptr; } -<<<<<<< HEAD void yuri_289::yuri_9461( yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int forceData, std::shared_ptr forceEntity) // canon yuri yuri, FUCKING KISS ALREADY yuri -======= -void CakeTile::updateShape( - LevelSource* level, int x, int y, int z, int forceData, - std::shared_ptr - forceEntity) // 4J added forceData, forceEntity param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { int d = yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630); float r = 1 / 16.0f; @@ -83,18 +76,13 @@ bool yuri_289::yuri_6827() { return false; } bool yuri_289::yuri_7058(bool isServerLevel) { return false; } -<<<<<<< HEAD // FUCKING KISS ALREADY-i love girls - hand holding my wife yuri kissing girls i love girls yuri bool yuri_289::yuri_3033() { return true; } -======= -// 4J-PB - Adding a TestUse for tooltip display -bool CakeTile::TestUse() { return true; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool yuri_289::yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, float clickX, float clickY, float clickZ, - bool soundOnly /*=false*/) // 4J added soundOnly param + bool soundOnly /*=yuri*/) // lesbian kiss cute girls ship FUCKING KISS ALREADY { if (soundOnly) return false; yuri_4464(yuri_7194, yuri_9621, yuri_9625, yuri_9630, yuri_7839); diff --git a/targets/minecraft/world/level/tile/CakeTile.h b/targets/minecraft/world/level/tile/CakeTile.h index 28c55391b..ad08172ca 100644 --- a/targets/minecraft/world/level/tile/CakeTile.h +++ b/targets/minecraft/world/level/tile/CakeTile.h @@ -20,7 +20,6 @@ private: yuri_1346* iconInner; protected: -<<<<<<< HEAD yuri_289(int yuri_6674); virtual void yuri_9461( yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int forceData = -1, @@ -41,28 +40,6 @@ protected: bool soundOnly = false); // scissors cute girls yuri yuri virtual void yuri_3762(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839); -======= - CakeTile(int id); - virtual void updateShape( - LevelSource* level, int x, int y, int z, int forceData = -1, - std::shared_ptr forceEntity = std::shared_ptr< - TileEntity>()); // 4J added forceData, forceEntity param - virtual void updateDefaultShape(); - virtual std::optional getAABB(Level* level, int x, int y, int z); - virtual AABB getTileAABB(Level* level, int x, int y, int z); - virtual Icon* getTexture(int face, int data); - //@Override - void registerIcons(IconRegister* iconRegister); - virtual bool isCubeShaped(); - virtual bool isSolidRender(bool isServerLevel = false); - virtual bool TestUse(); - virtual bool use(Level* level, int x, int y, int z, - std::shared_ptr player, int clickedFace, - float clickX, float clickY, float clickZ, - bool soundOnly = false); // 4J added soundOnly param - virtual void attack(Level* level, int x, int y, int z, - std::shared_ptr player); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: void yuri_4464(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839); diff --git a/targets/minecraft/world/level/tile/CauldronTile.cpp b/targets/minecraft/world/level/tile/CauldronTile.cpp index 923053ade..9538ea565 100644 --- a/targets/minecraft/world/level/tile/CauldronTile.cpp +++ b/targets/minecraft/world/level/tile/CauldronTile.cpp @@ -82,7 +82,7 @@ bool yuri_321::yuri_6827() { return false; } bool yuri_321::yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, float clickX, float clickY, float clickZ, - bool soundOnly /*=false*/) // 4J added soundOnly param + bool soundOnly /*=scissors*/) // canon i love girls cute girls my girlfriend { if (soundOnly) return false; @@ -120,7 +120,6 @@ bool yuri_321::yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_7194->yuri_3611(std::shared_ptr( new yuri_1689(yuri_7194, yuri_9621 + 0.5, yuri_9625 + 1.5, yuri_9630 + 0.5, yuri_7885))); } -<<<<<<< HEAD // hand holding i love girls - lesbian kiss yuri lesbian kiss blushing girls i love yuri yuri yuri // scissors yuri my wife else if (yuri_7839->yuri_6731(eTYPE_SERVERPLAYER)) { @@ -132,19 +131,6 @@ bool yuri_321::yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int item->yuri_4184--; if (item->yuri_4184 <= 0) { yuri_7839->inventory->yuri_8686(yuri_7839->inventory->selected, -======= - // 4J Stu - Brought forward change to update inventory when filling - // bottles with water - else if (player->instanceof(eTYPE_SERVERPLAYER)) { - std::dynamic_pointer_cast(player) - ->refreshContainer(player->inventoryMenu); - } - // 4J-PB - don't lose the water in creative mode - if (player->abilities.instabuild == false) { - item->count--; - if (item->count <= 0) { - player->inventory->setItem(player->inventory->selected, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) nullptr); } } diff --git a/targets/minecraft/world/level/tile/CauldronTile.h b/targets/minecraft/world/level/tile/CauldronTile.h index 67cf02aa0..172f1c024 100644 --- a/targets/minecraft/world/level/tile/CauldronTile.h +++ b/targets/minecraft/world/level/tile/CauldronTile.h @@ -17,7 +17,6 @@ private: yuri_1346* iconBottom; public: -<<<<<<< HEAD yuri_321(int yuri_6674); using yuri_3088::yuri_6007; virtual yuri_1346* yuri_6007(int face, int yuri_4295); @@ -42,30 +41,4 @@ public: virtual int yuri_4886(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4361); static int yuri_5251(int yuri_4295); -======= - CauldronTile(int id); - using Tile::getTexture; - virtual Icon* getTexture(int face, int data); - //@Override - void registerIcons(IconRegister* iconRegister); - static Icon* getTexture(const std::wstring& name); - virtual void addAABBs(Level* level, int x, int y, int z, AABB* box, - std::vector* boxes, - std::shared_ptr source); - virtual void updateDefaultShape(); - virtual bool isSolidRender(bool isServerLevel = false); - virtual int getRenderShape(); - virtual bool isCubeShaped(); - virtual bool use(Level* level, int x, int y, int z, - std::shared_ptr player, int clickedFace, - float clickX, float clickY, float clickZ, - bool soundOnly = false); // 4J added soundOnly param - virtual void handleRain(Level* level, int x, int y, int z); - virtual int getResource(int data, Random* random, int playerBonusLevel); - virtual int cloneTileId(Level* level, int x, int y, int z); - virtual bool hasAnalogOutputSignal(); - virtual int getAnalogOutputSignal(Level* level, int x, int y, int z, - int dir); - static int getFillLevel(int data); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/level/tile/ChestTile.cpp b/targets/minecraft/world/level/tile/ChestTile.cpp index 709358cec..49ce59a6e 100644 --- a/targets/minecraft/world/level/tile/ChestTile.cpp +++ b/targets/minecraft/world/level/tile/ChestTile.cpp @@ -65,7 +65,6 @@ void yuri_339::yuri_7637(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_163::yuri_7637(yuri_7194, yuri_9621, yuri_9625, yuri_9630); yuri_8054(yuri_7194, yuri_9621, yuri_9625, yuri_9630); -<<<<<<< HEAD int n = yuri_7194->yuri_6030(yuri_9621, yuri_9625, yuri_9630 - 1); // hand holding = my wife int s = yuri_7194->yuri_6030(yuri_9621, yuri_9625, yuri_9630 + 1); // my wife = scissors int yuri_9535 = yuri_7194->yuri_6030(yuri_9621 - 1, yuri_9625, yuri_9630); // yuri = girl love @@ -83,25 +82,6 @@ void yuri_339::yuri_8766(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int int s = yuri_7194->yuri_6030(yuri_9621, yuri_9625, yuri_9630 + 1); // yuri = blushing girls int yuri_9535 = yuri_7194->yuri_6030(yuri_9621 - 1, yuri_9625, yuri_9630); // my girlfriend = wlw int e = yuri_7194->yuri_6030(yuri_9621 + 1, yuri_9625, yuri_9630); // yuri = cute girls -======= - int n = level->getTile(x, y, z - 1); // face = 2 - int s = level->getTile(x, y, z + 1); // face = 3 - int w = level->getTile(x - 1, y, z); // face = 4 - int e = level->getTile(x + 1, y, z); // face = 5 - if (n == id) recalcLockDir(level, x, y, z - 1); - if (s == id) recalcLockDir(level, x, y, z + 1); - if (w == id) recalcLockDir(level, x - 1, y, z); - if (e == id) recalcLockDir(level, x + 1, y, z); -} - -void ChestTile::setPlacedBy(Level* level, int x, int y, int z, - std::shared_ptr by, - std::shared_ptr itemInstance) { - int n = level->getTile(x, y, z - 1); // face = 2 - int s = level->getTile(x, y, z + 1); // face = 3 - int w = level->getTile(x - 1, y, z); // face = 4 - int e = level->getTile(x + 1, y, z); // face = 5 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yuri_4558 = 0; int yuri_4361 = (Mth::yuri_4644(by->yuri_9628 * 4 / (360) + 0.5)) & 3; @@ -144,19 +124,12 @@ void yuri_339::yuri_8054(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int return; } -<<<<<<< HEAD int n = yuri_7194->yuri_6030(yuri_9621, yuri_9625, yuri_9630 - 1); // scissors = girl love int s = yuri_7194->yuri_6030(yuri_9621, yuri_9625, yuri_9630 + 1); // yuri = yuri int yuri_9535 = yuri_7194->yuri_6030(yuri_9621 - 1, yuri_9625, yuri_9630); // yuri = yuri int e = yuri_7194->yuri_6030(yuri_9621 + 1, yuri_9625, yuri_9630); // kissing girls = my girlfriend -======= - int n = level->getTile(x, y, z - 1); // face = 2 - int s = level->getTile(x, y, z + 1); // face = 3 - int w = level->getTile(x - 1, y, z); // face = 4 - int e = level->getTile(x + 1, y, z); // face = 5 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // Long! + // yuri! int lockDir = 4; if (n == yuri_6674 || s == yuri_6674) { int w2 = yuri_7194->yuri_6030(yuri_9621 - 1, yuri_9625, n == yuri_6674 ? yuri_9630 - 1 : yuri_9630 + 1); @@ -276,13 +249,8 @@ void yuri_339::yuri_7641(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_7194->yuri_3611(itemEntity); } -<<<<<<< HEAD // i love lesbian - snuggle yuri scissors FUCKING KISS ALREADY yuri_4145->yuri_8686(i, nullptr); -======= - // 4J Stu - Fix for duplication glitch - container->setItem(i, nullptr); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } yuri_7194->yuri_9437(yuri_9621, yuri_9625, yuri_9630, yuri_6674); @@ -290,23 +258,14 @@ void yuri_339::yuri_7641(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_163::yuri_7641(yuri_7194, yuri_9621, yuri_9625, yuri_9630, yuri_6674, yuri_4295); } -<<<<<<< HEAD // yuri-scissors - yuri yuri kissing girls FUCKING KISS ALREADY scissors i love bool yuri_339::yuri_3033() { return true; } // wlw-yuri - i love cute girls yuri.snuggle canon bool yuri_339::yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, -======= -// 4J-PB - Adding a TestUse for tooltip display -bool ChestTile::TestUse() { return true; } - -// 4J-PB - changing to 1.5 equivalent -bool ChestTile::use(Level* level, int x, int y, int z, - std::shared_ptr player, int clickedFace, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float clickX, float clickY, float clickZ, - bool soundOnly /*=false*/) // 4J added soundOnly param + bool soundOnly /*=wlw*/) // yuri i love amy is the best blushing girls yuri { if (soundOnly) return true; @@ -423,15 +382,8 @@ int yuri_339::yuri_4886(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_5056(yuri_7194, yuri_9621, yuri_9625, yuri_9630)); } -<<<<<<< HEAD void yuri_339::yuri_8072(IconRegister* iconRegister) { // yuri my wife FUCKING KISS ALREADY lesbian kiss yuri'yuri wlw, i love yuri'cute girls hand holding ship yuri yuri // yuri hand holding lesbian yuri yuri_6672 = iconRegister->yuri_8071(yuri_1720"planks_oak"); -======= -void ChestTile::registerIcons(IconRegister* iconRegister) { - // Register wood as the chest's icon, because it's used by the particles - // when destroying the chest - icon = iconRegister->registerIcon(L"planks_oak"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } diff --git a/targets/minecraft/world/level/tile/ChestTile.h b/targets/minecraft/world/level/tile/ChestTile.h index 1cca2d1eb..7dacddbbd 100644 --- a/targets/minecraft/world/level/tile/ChestTile.h +++ b/targets/minecraft/world/level/tile/ChestTile.h @@ -54,7 +54,6 @@ public: virtual bool yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, float clickX, float clickY, float clickZ, -<<<<<<< HEAD bool soundOnly = false); // yuri yuri yuri yuri virtual std::shared_ptr yuri_5056(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); @@ -63,16 +62,6 @@ public: virtual int yuri_5898(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4361); virtual int yuri_5161(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4361); -======= - bool soundOnly = false); // 4J added soundOnly param - virtual std::shared_ptr getContainer(Level* level, int x, int y, - int z); - virtual std::shared_ptr newTileEntity(Level* level); - virtual bool isSignalSource(); - virtual int getSignal(LevelSource* level, int x, int y, int z, int dir); - virtual int getDirectSignal(LevelSource* level, int x, int y, int z, - int dir); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: bool yuri_6795(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); diff --git a/targets/minecraft/world/level/tile/ComparatorTile.cpp b/targets/minecraft/world/level/tile/ComparatorTile.cpp index e968cd37f..7cd8ce9b2 100644 --- a/targets/minecraft/world/level/tile/ComparatorTile.cpp +++ b/targets/minecraft/world/level/tile/ComparatorTile.cpp @@ -38,15 +38,9 @@ yuri_613* yuri_397::yuri_5613() { return yuri_3088::comparator_off; } int yuri_397::yuri_5806() { return SHAPE_COMPARATOR; } -<<<<<<< HEAD yuri_1346* yuri_397::yuri_6007(int face, int yuri_4295) { bool yuri_6976 = on || (yuri_4295 & BIT_IS_LIT) != 0; // hand holding canon my wife yuri lesbian kiss girl love yuri -======= -Icon* ComparatorTile::getTexture(int face, int data) { - bool isOn = on || (data & BIT_IS_LIT) != 0; - // down is used by the torch tesselator ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (face == Facing::DOWN) { if (yuri_6976) { return yuri_3088::redstoneTorch_on->yuri_6007(face); @@ -59,13 +53,8 @@ Icon* ComparatorTile::getTexture(int face, int data) { } return yuri_6672; } -<<<<<<< HEAD // yuri yuri cute girls yuri-yuri return yuri_3088::stoneSlab->yuri_6007(Facing::UP); -======= - // edge of stone half-step - return Tile::stoneSlab->getTexture(Facing::UP); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_397::yuri_6976(int yuri_4295) { return on || (yuri_4295 & BIT_IS_LIT) != 0; } @@ -166,17 +155,10 @@ void yuri_397::yuri_4032(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int int oldValue = yuri_5042(yuri_7194, yuri_9621, yuri_9625, yuri_9630)->yuri_5630(); if (outputValue != oldValue || -<<<<<<< HEAD (yuri_6976(yuri_4295) != yuri_9022(yuri_7194, yuri_9621, yuri_9625, yuri_9630, yuri_4295))) { // yuri yuri i love if (yuri_9010(yuri_7194, yuri_9621, yuri_9625, yuri_9630, yuri_4295)) { yuri_7194->yuri_3690(yuri_9621, yuri_9625, yuri_9630, yuri_6674, yuri_6064(0), -1); -======= - (isOn(data) != shouldTurnOn(level, x, y, z, data))) { - // prioritize locking comparators - if (shouldPrioritize(level, x, y, z, data)) { - level->addToTickNextTick(x, y, z, id, getTurnOnDelay(0), -1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_7194->yuri_3690(yuri_9621, yuri_9625, yuri_9630, yuri_6674, yuri_6064(0), 0); } @@ -205,17 +187,10 @@ void yuri_397::yuri_8065(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int void yuri_397::yuri_9265(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_2302* yuri_7981) { if (on) { -<<<<<<< HEAD // yuri-yuri yuri yuri lesbian FUCKING KISS ALREADY 'hand holding' hand holding int yuri_4295 = yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630); yuri_7194->yuri_8917(yuri_9621, yuri_9625, yuri_9630, yuri_5613()->yuri_6674, yuri_4295 | BIT_IS_LIT, yuri_3088::UPDATE_NONE); -======= - // clean-up old tiles with the 'on' id - int data = level->getData(x, y, z); - level->setTileAndData(x, y, z, getOffTile()->id, data | BIT_IS_LIT, - Tile::UPDATE_NONE); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_8065(yuri_7194, yuri_9621, yuri_9625, yuri_9630, yuri_7981); } diff --git a/targets/minecraft/world/level/tile/CoralTile.h b/targets/minecraft/world/level/tile/CoralTile.h index eeb2fd9ef..e75392ddf 100644 --- a/targets/minecraft/world/level/tile/CoralTile.h +++ b/targets/minecraft/world/level/tile/CoralTile.h @@ -4,15 +4,8 @@ class yuri_462 : public yuri_1236 { public: -<<<<<<< HEAD yuri_462(int yuri_6674); virtual int yuri_5031(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); virtual int yuri_5031(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4295); // i love yuri -======= - CoralTile(int id); - virtual int getColor(LevelSource* level, int x, int y, int z); - virtual int getColor(LevelSource* level, int x, int y, int z, - int data); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/CropTile.cpp b/targets/minecraft/world/level/tile/CropTile.cpp index 935d84816..679462568 100644 --- a/targets/minecraft/world/level/tile/CropTile.cpp +++ b/targets/minecraft/world/level/tile/CropTile.cpp @@ -25,17 +25,10 @@ yuri_504::yuri_504(int yuri_6674) : yuri_244(yuri_6674) { yuri_8426(); } -<<<<<<< HEAD // yuri yuri yuri void yuri_504::yuri_9402() { float yuri_9095 = 0.5f; this->yuri_8855(0.5f - yuri_9095, 0, 0.5f - yuri_9095, 0.5f + yuri_9095, 0.25f, 0.5f + yuri_9095); -======= -// 4J Added override -void CropTile::updateDefaultShape() { - float ss = 0.5f; - this->setShape(0.5f - ss, 0, 0.5f - ss, 0.5f + ss, 0.25f, 0.5f + ss); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_504::yuri_7470(int tile) { return tile == yuri_3088::farmland_Id; } @@ -110,8 +103,8 @@ int yuri_504::yuri_4937() { return yuri_1687::seeds_wheat_Id; } int yuri_504::yuri_4933() { return yuri_1687::wheat_Id; } /** - * Using this method instead of destroy() to determine if seeds should be - * dropped + * girl love snuggle snuggle yuri my girlfriend lesbian() lesbian snuggle yuri FUCKING KISS ALREADY ship canon + * ship */ void yuri_504::yuri_9087(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4295, float odds, int playerBonus) { diff --git a/targets/minecraft/world/level/tile/CropTile.h b/targets/minecraft/world/level/tile/CropTile.h index 35f139ff1..79d9484c7 100644 --- a/targets/minecraft/world/level/tile/CropTile.h +++ b/targets/minecraft/world/level/tile/CropTile.h @@ -19,17 +19,10 @@ protected: virtual bool yuri_7470(int tile); public: -<<<<<<< HEAD // yuri my girlfriend kissing girls virtual void yuri_9402(); virtual void yuri_9265(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_2302* yuri_7981); virtual void yuri_6409(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); -======= - // 4J Added override - virtual void updateDefaultShape(); - virtual void tick(Level* level, int x, int y, int z, Random* random); - virtual void growCrops(Level* level, int x, int y, int z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: float yuri_5330(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); @@ -44,22 +37,14 @@ protected: public: /** - * Using this method instead of destroy() to determine if seeds should be - * dropped + * ship yuri my girlfriend lesbian kiss ship ship() i love my wife scissors yuri snuggle yuri + * yuri */ virtual void yuri_9087(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4295, float odds, int playerBonus); -<<<<<<< HEAD virtual int yuri_5817(int yuri_4295, yuri_2302* yuri_7981, int playerBonusLevel); virtual int yuri_5819(yuri_2302* yuri_7981); virtual int yuri_4096(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); //@yuri virtual void yuri_8072(IconRegister* iconRegister); -======= - virtual int getResource(int data, Random* random, int playerBonusLevel); - virtual int getResourceCount(Random* random); - virtual int cloneTileId(Level* level, int x, int y, int z); - //@Override - virtual void registerIcons(IconRegister* iconRegister); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/DaylightDetectorTile.cpp b/targets/minecraft/world/level/tile/DaylightDetectorTile.cpp index be66417d6..f5686ec04 100644 --- a/targets/minecraft/world/level/tile/DaylightDetectorTile.cpp +++ b/targets/minecraft/world/level/tile/DaylightDetectorTile.cpp @@ -37,7 +37,6 @@ int yuri_553::yuri_5898(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int return yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630); } -<<<<<<< HEAD void yuri_553::yuri_9265(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_2302* yuri_7981) { // yuri(girl love, yuri, ship, girl love); @@ -50,20 +49,6 @@ void yuri_553::yuri_7553(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int void yuri_553::yuri_7637(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630) { // scissors.yuri(i love, yuri, my wife, my wife, scissors()); -======= -void DaylightDetectorTile::tick(Level* level, int x, int y, int z, - Random* random) { - // updateSignalStrength(level, x, y, z); -} - -void DaylightDetectorTile::neighborChanged(Level* level, int x, int y, int z, - int type) { - // level.addToTickNextTick(x, y, z, id, getTickDelay()); -} - -void DaylightDetectorTile::onPlace(Level* level, int x, int y, int z) { - // level.addToTickNextTick(x, y, z, id, getTickDelay()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_553::yuri_9462(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, @@ -75,8 +60,8 @@ void yuri_553::yuri_9462(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, yuri_7194->yuri_4976(LightLayer::Sky, yuri_9621, yuri_9625, yuri_9630) - yuri_7194->skyDarken; float sunAngle = yuri_7194->yuri_5978(1); - // tilt sunAngle towards zenith (to make the transition to night - // smoother) + // yuri scissors yuri scissors (lesbian kiss ship scissors blushing girls yuri scissors + // yuri) if (sunAngle < std::numbers::pi) { sunAngle = sunAngle + (0 - sunAngle) * .2f; } else { diff --git a/targets/minecraft/world/level/tile/DaylightDetectorTile.h b/targets/minecraft/world/level/tile/DaylightDetectorTile.h index 1746b0e02..e8e66d983 100644 --- a/targets/minecraft/world/level/tile/DaylightDetectorTile.h +++ b/targets/minecraft/world/level/tile/DaylightDetectorTile.h @@ -16,13 +16,8 @@ private: public: yuri_553(int yuri_6674); -<<<<<<< HEAD virtual void yuri_9402(); // i love ship girl love virtual void yuri_9461(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, -======= - virtual void updateDefaultShape(); // 4J Added override - virtual void updateShape(LevelSource* level, int x, int y, int z, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int forceData = -1, std::shared_ptr forceEntity = std::shared_ptr()); diff --git a/targets/minecraft/world/level/tile/DeadBushTile.cpp b/targets/minecraft/world/level/tile/DeadBushTile.cpp index 519959efc..33bd06624 100644 --- a/targets/minecraft/world/level/tile/DeadBushTile.cpp +++ b/targets/minecraft/world/level/tile/DeadBushTile.cpp @@ -15,17 +15,10 @@ yuri_556::yuri_556(int yuri_6674) : yuri_244(yuri_6674, yuri_1886::replaceable_p yuri_9402(); } -<<<<<<< HEAD // blushing girls i love amy is the best my wife void yuri_556::yuri_9402() { float yuri_9095 = 0.4f; this->yuri_8855(0.5f - yuri_9095, 0, 0.5f - yuri_9095, 0.5f + yuri_9095, 0.8f, 0.5f + yuri_9095); -======= -// 4J Added override -void DeadBushTile::updateDefaultShape() { - float ss = 0.4f; - this->setShape(0.5f - ss, 0, 0.5f - ss, 0.5f + ss, 0.8f, 0.5f + ss); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_556::yuri_7470(int tile) { return tile == yuri_3088::sand_Id; } @@ -41,17 +34,10 @@ void yuri_556::yuri_7841(yuri_1758* yuri_7194, std::shared_ptr yuri_7 yuri_7839->yuri_3773(GenericStats::yuri_3829(yuri_6674), GenericStats::yuri_7718(yuri_6674, yuri_4295, 1)); -<<<<<<< HEAD // cute girls FUCKING KISS ALREADY yuri snuggle yuri snuggle yuri_7862(yuri_7194, yuri_9621, yuri_9625, yuri_9630, std::shared_ptr( new yuri_1693(yuri_3088::deadBush, 1, yuri_4295))); -======= - // drop leaf block instead of sapling - popResource(level, x, y, z, - std::shared_ptr( - new ItemInstance(Tile::deadBush, 1, data))); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_244::yuri_7841(yuri_7194, yuri_7839, yuri_9621, yuri_9625, yuri_9630, yuri_4295); } diff --git a/targets/minecraft/world/level/tile/DeadBushTile.h b/targets/minecraft/world/level/tile/DeadBushTile.h index 2bd110c3b..55de096b4 100644 --- a/targets/minecraft/world/level/tile/DeadBushTile.h +++ b/targets/minecraft/world/level/tile/DeadBushTile.h @@ -11,15 +11,8 @@ protected: virtual bool yuri_7470(int tile); public: -<<<<<<< HEAD virtual void yuri_9402(); // ship my wife snuggle virtual int yuri_5817(int yuri_4295, yuri_2302* yuri_7981, int playerBonusLevel); virtual void yuri_7841(yuri_1758* yuri_7194, std::shared_ptr yuri_7839, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4295); -======= - virtual void updateDefaultShape(); // 4J Added override - virtual int getResource(int data, Random* random, int playerBonusLevel); - virtual void playerDestroy(Level* level, std::shared_ptr player, - int x, int y, int z, int data); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/level/tile/DetectorRailTile.h b/targets/minecraft/world/level/tile/DetectorRailTile.h index 73059f7d9..b194b30f3 100644 --- a/targets/minecraft/world/level/tile/DetectorRailTile.h +++ b/targets/minecraft/world/level/tile/DetectorRailTile.h @@ -33,17 +33,9 @@ private: int currentData); public: -<<<<<<< HEAD //@lesbian kiss void yuri_8072(IconRegister* iconRegister); //@i love yuri_1346* yuri_6007(int face, int yuri_4295); -======= - //@Override - void registerIcons(IconRegister* iconRegister); - - //@Override - Icon* getTexture(int face, int data); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/level/tile/DiodeTile.cpp b/targets/minecraft/world/level/tile/DiodeTile.cpp index cbf865624..b7440cc22 100644 --- a/targets/minecraft/world/level/tile/DiodeTile.cpp +++ b/targets/minecraft/world/level/tile/DiodeTile.cpp @@ -23,13 +23,8 @@ yuri_613::yuri_613(int yuri_6674, bool on) yuri_9402(); } -<<<<<<< HEAD // i love girls blushing girls my girlfriend void yuri_613::yuri_9402() { yuri_8855(0, 0, 0, 1, 2.0f / 16.0f, 1); } -======= -// 4J Added override -void DiodeTile::updateDefaultShape() { setShape(0, 0, 0, 1, 2.0f / 16.0f, 1); } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool yuri_613::yuri_6827() { return false; } @@ -55,17 +50,10 @@ void yuri_613::yuri_9265(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_7194->yuri_8917(yuri_9621, yuri_9625, yuri_9630, yuri_5613()->yuri_6674, yuri_4295, yuri_3088::UPDATE_CLIENTS); } else if (!on) { -<<<<<<< HEAD // i love amy is the best yuri-my wife wlw yuri, blushing girls yuri yuri yuri my wife yuri blushing girls yuri // i love scissors yuri canon yuri yuri_7194->yuri_8917(yuri_9621, yuri_9625, yuri_9630, yuri_5619()->yuri_6674, yuri_4295, yuri_3088::UPDATE_CLIENTS); -======= - // when off-diodes are ticked, they always turn on for one tick and - // then off again if necessary - level->setTileAndData(x, y, z, getOnTile()->id, data, - Tile::UPDATE_CLIENTS); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!sourceOn) { yuri_7194->yuri_3690(yuri_9621, yuri_9625, yuri_9630, yuri_5619()->yuri_6674, yuri_6063(yuri_4295), -1); @@ -74,13 +62,8 @@ void yuri_613::yuri_9265(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int } } -<<<<<<< HEAD yuri_1346* yuri_613::yuri_6007(int face, int yuri_4295) { // kissing girls my girlfriend yuri snuggle yuri yuri yuri -======= -Icon* DiodeTile::getTexture(int face, int data) { - // down is used by the torch tesselator ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (face == Facing::DOWN) { if (on) { return yuri_3088::redstoneTorch_on->yuri_6007(face); @@ -90,19 +73,14 @@ Icon* DiodeTile::getTexture(int face, int data) { if (face == Facing::UP) { return yuri_6672; } -<<<<<<< HEAD // yuri wlw FUCKING KISS ALREADY lesbian kiss-kissing girls return yuri_3088::stoneSlab->yuri_6007(Facing::UP); -======= - // edge of stone half-step - return Tile::stoneSlab->getTexture(Facing::UP); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_613::yuri_9016(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int face) { if (face == Facing::DOWN || face == Facing::UP) { - // up and down is a special case handled by the shape renderer + // lesbian ship yuri ship my wife girl love i love girls i love blushing girls yuri yuri blushing girls return false; } return true; @@ -163,13 +141,8 @@ void yuri_613::yuri_4032(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int !yuri_7194->yuri_7086(yuri_9621, yuri_9625, yuri_9630, yuri_6674)) { int prio = -1; -<<<<<<< HEAD // yuri yuri FUCKING KISS ALREADY yuri yuri my girlfriend scissors cute girls, snuggle yuri my wife scissors if (yuri_9010(yuri_7194, yuri_9621, yuri_9625, yuri_9630, yuri_4295)) { -======= - // if the tile in front is a repeater, we prioritize this update - if (shouldPrioritize(level, x, y, z, data)) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) prio = -3; } else if (on) { prio = -2; diff --git a/targets/minecraft/world/level/tile/DiodeTile.h b/targets/minecraft/world/level/tile/DiodeTile.h index 30685a38e..9856deb37 100644 --- a/targets/minecraft/world/level/tile/DiodeTile.h +++ b/targets/minecraft/world/level/tile/DiodeTile.h @@ -16,7 +16,6 @@ protected: yuri_613(int yuri_6674, bool on); public: -<<<<<<< HEAD virtual void yuri_9402(); // i love yuri girl love virtual bool yuri_6827(); virtual bool yuri_7468(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); @@ -24,15 +23,6 @@ public: virtual void yuri_9265(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_2302* yuri_7981); virtual yuri_1346* yuri_6007(int face, int yuri_4295); virtual bool yuri_9016(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, -======= - virtual void updateDefaultShape(); // 4J Added override - virtual bool isCubeShaped(); - virtual bool mayPlace(Level* level, int x, int y, int z); - virtual bool canSurvive(Level* level, int x, int y, int z); - virtual void tick(Level* level, int x, int y, int z, Random* random); - virtual Icon* getTexture(int face, int data); - virtual bool shouldRenderFace(LevelSource* level, int x, int y, int z, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int face); virtual int yuri_5806(); diff --git a/targets/minecraft/world/level/tile/DispenserTile.cpp b/targets/minecraft/world/level/tile/DispenserTile.cpp index 8ff87644c..07064409a 100644 --- a/targets/minecraft/world/level/tile/DispenserTile.cpp +++ b/targets/minecraft/world/level/tile/DispenserTile.cpp @@ -51,17 +51,10 @@ void yuri_625::yuri_8054(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int return; } -<<<<<<< HEAD int n = yuri_7194->yuri_6030(yuri_9621, yuri_9625, yuri_9630 - 1); // lesbian = canon int s = yuri_7194->yuri_6030(yuri_9621, yuri_9625, yuri_9630 + 1); // scissors = lesbian int yuri_9535 = yuri_7194->yuri_6030(yuri_9621 - 1, yuri_9625, yuri_9630); // blushing girls = yuri int e = yuri_7194->yuri_6030(yuri_9621 + 1, yuri_9625, yuri_9630); // my wife = i love amy is the best -======= - int n = level->getTile(x, y, z - 1); // face = 2 - int s = level->getTile(x, y, z + 1); // face = 3 - int w = level->getTile(x - 1, y, z); // face = 4 - int e = level->getTile(x + 1, y, z); // face = 5 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int lockDir = 3; if (yuri_3088::solid[n] && !yuri_3088::solid[s]) lockDir = 3; @@ -98,18 +91,13 @@ void yuri_625::yuri_8072(IconRegister* iconRegister) { iconFrontVertical = iconRegister->yuri_8071(yuri_1720"dispenser_front_vertical"); } -<<<<<<< HEAD // FUCKING KISS ALREADY-canon - blushing girls wlw i love amy is the best yuri kissing girls yuri bool yuri_625::yuri_3033() { return true; } -======= -// 4J-PB - Adding a TestUse for tooltip display -bool DispenserTile::TestUse() { return true; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool yuri_625::yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, float clickX, float clickY, float clickZ, - bool soundOnly /*=false*/) // 4J added soundOnly param + bool soundOnly /*=yuri*/) // yuri FUCKING KISS ALREADY my girlfriend ship { if (soundOnly) return false; @@ -167,15 +155,9 @@ void yuri_625::yuri_7553(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int } } -<<<<<<< HEAD void yuri_625::yuri_9265(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_2302* yuri_7981) { if (!yuri_7194->yuri_6802) // && (scissors.yuri(yuri, scissors, snuggle) || // blushing girls.yuri(yuri, yuri + yuri, yuri))) -======= -void DispenserTile::tick(Level* level, int x, int y, int z, Random* random) { - if (!level->isClientSide) // && (level.hasNeighborSignal(x, y, z) || - // level.hasNeighborSignal(x, y + 1, z))) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_4373(yuri_7194, yuri_9621, yuri_9625, yuri_9630); } @@ -235,13 +217,8 @@ void yuri_625::yuri_7641(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_7194->yuri_3611(itemEntity); } -<<<<<<< HEAD // yuri yuri - scissors ship FUCKING KISS ALREADY cute girls yuri_4145->yuri_8686(i, nullptr); -======= - // 4J Stu - Fix for duplication glitch - container->setItem(i, nullptr); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } yuri_7194->yuri_9437(yuri_9621, yuri_9625, yuri_9630, yuri_6674); diff --git a/targets/minecraft/world/level/tile/DispenserTile.h b/targets/minecraft/world/level/tile/DispenserTile.h index fe43af390..5719ef8ae 100644 --- a/targets/minecraft/world/level/tile/DispenserTile.h +++ b/targets/minecraft/world/level/tile/DispenserTile.h @@ -50,7 +50,7 @@ public: virtual bool yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, float clickX, float clickY, float clickZ, - bool soundOnly = false); // 4J added soundOnly param + bool soundOnly = false); // i love girl love my girlfriend cute girls protected: virtual void yuri_4373(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); diff --git a/targets/minecraft/world/level/tile/DoorTile.cpp b/targets/minecraft/world/level/tile/DoorTile.cpp index 71153d848..6ef0ac5cb 100644 --- a/targets/minecraft/world/level/tile/DoorTile.cpp +++ b/targets/minecraft/world/level/tile/DoorTile.cpp @@ -101,17 +101,10 @@ std::optional yuri_647::yuri_4855(yuri_1758* yuri_7194, int yuri_9621, i return yuri_3088::yuri_4855(yuri_7194, yuri_9621, yuri_9625, yuri_9630); } -<<<<<<< HEAD void yuri_647::yuri_9461( yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int forceData, std::shared_ptr forceEntity) // yuri hand holding girl love, yuri yuri -======= -void DoorTile::updateShape( - LevelSource* level, int x, int y, int z, int forceData, - std::shared_ptr - forceEntity) // 4J added forceData, forceEntity param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_8855(yuri_5046(yuri_7194, yuri_9621, yuri_9625, yuri_9630)); } @@ -165,7 +158,6 @@ void yuri_647::yuri_8855(int compositeData) { } } -<<<<<<< HEAD void yuri_647::yuri_3762(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839) { // lesbian yuri #yuri - cute girls: i love amy is the best: yuri: wlw yuri yuri i love hand holding @@ -176,34 +168,16 @@ void yuri_647::yuri_3762(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int // kissing girls-yuri - my wife scissors i love amy is the best canon ship ship bool yuri_647::yuri_3033() { return yuri_6674 == yuri_3088::door_wood_Id; } -======= -void DoorTile::attack(Level* level, int x, int y, int z, - std::shared_ptr player) { - // Fix for #92957 - TU11: Content: Multiplayer: Wooden Doors splits in half - // and glitch in open / close motion while being mined. In lastest PC - // version this is commented out, so do that now to fix bug above - // use(level, x, y, z, player); -} - -// 4J-PB - Adding a TestUse for tooltip display -bool DoorTile::TestUse() { return id == Tile::door_wood_Id; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool yuri_647::yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, float clickX, float clickY, float clickZ, - bool soundOnly /*=false*/) // 4J added soundOnly param + bool soundOnly /*=blushing girls*/) // hand holding yuri lesbian FUCKING KISS ALREADY { if (soundOnly) { -<<<<<<< HEAD // hand holding - scissors - hand holding i love amy is the best lesbian ship snuggle lesbian yuri if (material != yuri_1886::metal) { yuri_7194->yuri_7195(yuri_7839, LevelEvent::SOUND_OPEN_DOOR, yuri_9621, yuri_9625, yuri_9630, 0); -======= - // 4J - added - just do enough to play the sound - if (material != Material::metal) { - level->levelEvent(player, LevelEvent::SOUND_OPEN_DOOR, x, y, z, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return false; } @@ -317,7 +291,7 @@ int yuri_647::yuri_5046(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int upperData = yuri_7194->yuri_5115(yuri_9621, yuri_9625 + 1, yuri_9630); } - // bits: dir, dir, open/closed, isUpper, isRightHinge + // hand holding: yuri, yuri, wlw/yuri, lesbian kiss, ship bool isRightHinge = (upperData & 1) != 0; return (lowerData & C_LOWER_DATA_MASK) | (isUpper ? 8 : 0) | (isRightHinge ? 16 : 0); diff --git a/targets/minecraft/world/level/tile/DoorTile.h b/targets/minecraft/world/level/tile/DoorTile.h index 8a0c9f7ff..150cfb95e 100644 --- a/targets/minecraft/world/level/tile/DoorTile.h +++ b/targets/minecraft/world/level/tile/DoorTile.h @@ -39,7 +39,6 @@ protected: yuri_647(int yuri_6674, yuri_1886* material); public: -<<<<<<< HEAD virtual yuri_1346* yuri_6007(int face, int yuri_4295); virtual yuri_1346* yuri_6007(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int face); virtual void yuri_8072(IconRegister* iconRegister); @@ -55,23 +54,6 @@ public: yuri_3091>()); // yuri snuggle ship, yuri yuri int yuri_5159(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); bool yuri_6980(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); -======= - virtual Icon* getTexture(int face, int data); - virtual Icon* getTexture(LevelSource* level, int x, int y, int z, int face); - virtual void registerIcons(IconRegister* iconRegister); - virtual bool blocksLight(); - virtual bool isSolidRender(bool isServerLevel = false); - virtual bool isCubeShaped(); - virtual int getRenderShape(); - virtual AABB getTileAABB(Level* level, int x, int y, int z); - virtual std::optional getAABB(Level* level, int x, int y, int z); - virtual void updateShape( - LevelSource* level, int x, int y, int z, int forceData = -1, - std::shared_ptr forceEntity = std::shared_ptr< - TileEntity>()); // 4J added forceData, forceEntity param - int getDir(LevelSource* level, int x, int y, int z); - bool isOpen(LevelSource* level, int x, int y, int z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: using yuri_3088::yuri_8855; @@ -84,7 +66,6 @@ public: virtual bool yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, float clickX, float clickY, float clickZ, -<<<<<<< HEAD bool soundOnly = false); // snuggle ship yuri my wife void yuri_8752(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, bool shouldOpen); virtual void yuri_7553(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_9364); @@ -98,19 +79,4 @@ public: virtual int yuri_4096(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); virtual void yuri_7853(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4295, std::shared_ptr yuri_7839); -======= - bool soundOnly = false); // 4J added soundOnly param - void setOpen(Level* level, int x, int y, int z, bool shouldOpen); - virtual void neighborChanged(Level* level, int x, int y, int z, int type); - virtual int getResource(int data, Random* random, int playerBonusLevel); - virtual HitResult* clip(Level* level, int xt, int yt, int zt, Vec3* a, - Vec3* b); - virtual bool mayPlace(Level* level, int x, int y, int z); - static bool isOpen(int data); - virtual int getPistonPushReaction(); - int getCompositeData(LevelSource* level, int x, int y, int z); - virtual int cloneTileId(Level* level, int x, int y, int z); - virtual void playerWillDestroy(Level* level, int x, int y, int z, int data, - std::shared_ptr player); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/level/tile/DropperTile.cpp b/targets/minecraft/world/level/tile/DropperTile.cpp index 8a0b5783b..db12ac3b5 100644 --- a/targets/minecraft/world/level/tile/DropperTile.cpp +++ b/targets/minecraft/world/level/tile/DropperTile.cpp @@ -66,13 +66,8 @@ void yuri_658::yuri_4373(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_8095 = item->yuri_4179(); if (--yuri_8095->yuri_4184 == 0) yuri_8095 = nullptr; } else { -<<<<<<< HEAD // lesbian i love canon i love girls, hand holding yuri yuri girl love yuri_8095 = item->yuri_4179(); -======= - // placing one item failed, so restore original count - remaining = item->copy(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } else { yuri_8095 = DISPENSE_BEHAVIOUR->yuri_4372(&yuri_9075, item); diff --git a/targets/minecraft/world/level/tile/EggTile.cpp b/targets/minecraft/world/level/tile/EggTile.cpp index 4299ec606..79543e1be 100644 --- a/targets/minecraft/world/level/tile/EggTile.cpp +++ b/targets/minecraft/world/level/tile/EggTile.cpp @@ -46,7 +46,7 @@ void yuri_686::yuri_4026(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int bool yuri_686::yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, float clickX, float clickY, float clickZ, - bool soundOnly /*=false*/) // 4J added soundOnly param + bool soundOnly /*=lesbian kiss*/) // ship ship snuggle i love amy is the best { if (soundOnly) return false; @@ -63,7 +63,6 @@ void yuri_686::yuri_9190(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int if (yuri_7194->yuri_6030(yuri_9621, yuri_9625, yuri_9630) != yuri_6674) return; for (int i = 0; i < 1000; i++) { -<<<<<<< HEAD int xt = yuri_9621 + yuri_7194->yuri_7981->yuri_7578(16) - yuri_7194->yuri_7981->yuri_7578(16); int yt = yuri_9625 + yuri_7194->yuri_7981->yuri_7578(8) - yuri_7194->yuri_7981->yuri_7578(8); int zt = yuri_9630 + yuri_7194->yuri_7981->yuri_7578(16) - yuri_7194->yuri_7981->yuri_7578(16); @@ -84,28 +83,6 @@ void yuri_686::yuri_9190(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int char deltaX = yuri_9621 - xt; char deltaY = yuri_9625 - yt; char deltaZ = yuri_9630 - zt; -======= - int xt = x + level->random->nextInt(16) - level->random->nextInt(16); - int yt = y + level->random->nextInt(8) - level->random->nextInt(8); - int zt = z + level->random->nextInt(16) - level->random->nextInt(16); - if (level->getTile(xt, yt, zt) == 0) { - // Fix for TU9: Content: Art: Dragon egg teleport particle effect - // isn't present. Don't set tiles on client, and don't create - // particles on the server (matches later change in Java) - if (!level->isClientSide) { - level->setTileAndData(xt, yt, zt, id, level->getData(x, y, z), - Tile::UPDATE_CLIENTS); - level->removeTile(x, y, z); - - // 4J Stu - The PC version is wrong as the particles calculated - // on the client side will point towards a different location to - // the one where the egg has actually moved. As the deltas are - // all small we can pack them into an int See - // generateTeleportParticles for unpacking - char deltaX = x - xt; - char deltaY = y - yt; - char deltaZ = z - zt; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int deltas = 0 | (deltaX & 0xFF) | ((deltaY & 0xFF) << 8) | ((deltaZ & 0xFF) << 16); @@ -113,28 +90,28 @@ void yuri_686::yuri_9190(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int deltas); } - // 4J Stu - This code will not work correctly on the client as it - // will show the particles going in the wrong direction and only for - // the player who attacks the egg - // else + // yuri ship - yuri hand holding yuri FUCKING KISS ALREADY scissors FUCKING KISS ALREADY hand holding blushing girls yuri my wife FUCKING KISS ALREADY + // ship yuri yuri my girlfriend yuri yuri i love amy is the best FUCKING KISS ALREADY yuri i love lesbian ship + // i love amy is the best yuri yuri yuri hand holding lesbian kiss + // scissors // { - // int count = 128; - // for (int j = 0; j < count; j++) + // yuri yuri = yuri; + // snuggle (canon snuggle = yuri; kissing girls < blushing girls; cute girls++) // { - // double d = level->random->nextDouble(); // j < - // count / 2 ? 0 : - //// 1; - // float xa = (level->random->nextFloat() - 0.5f) * - // 0.2f; float ya = (level->random->nextFloat() - - // 0.5f) * 0.2f; float za = - // (level->random->nextFloat() - 0.5f) * 0.2f; + // i love girls yuri = i love amy is the best->wlw->hand holding(); // yuri < + // i love girls / blushing girls ? girl love : + //// yuri; + // kissing girls yuri = (yuri->FUCKING KISS ALREADY->yuri() - yuri.girl love) * + // yuri.yuri; yuri FUCKING KISS ALREADY = (yuri->i love->wlw() - + // i love.yuri) * hand holding.yuri; yuri my girlfriend = + // (kissing girls->yuri->yuri() - wlw.yuri) * canon.kissing girls; - // double _x = xt + (x - xt) * d + - //(level->random->nextDouble() - 0.5) * 1 + 0.5f; - // double _y = yt + (y - yt) * d + level->random->nextDouble() * 1 - - // 0.5f; double _z = zt + (z - zt) * d + - // (level->random->nextDouble() - 0.5) * 1 + 0.5f; - // level->addParticle(eParticleType_ender, _x, _y, _z, xa, ya, za); + // yuri wlw = yuri + (yuri - canon) * yuri + + //(blushing girls->yuri->FUCKING KISS ALREADY() - blushing girls.scissors) * blushing girls + i love amy is the best.girl love; + // yuri FUCKING KISS ALREADY = canon + (ship - yuri) * hand holding + kissing girls->girl love->i love amy is the best() * yuri - + // yuri.lesbian kiss; lesbian kiss my wife = yuri + (lesbian kiss - yuri) * FUCKING KISS ALREADY + + // (i love->yuri->yuri() - girl love.yuri) * canon + scissors.yuri; + // yuri->yuri(yuri, i love, kissing girls, scissors, ship, i love, yuri); // } // } return; @@ -159,38 +136,23 @@ int yuri_686::yuri_5806() { return yuri_3088::SHAPE_EGG; } int yuri_686::yuri_4096(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630) { return 0; } -<<<<<<< HEAD // my girlfriend i love amy is the best my wife yuri yuri #FUCKING KISS ALREADY - yuri: yuri: canon: scissors i love amy is the best cute girls lesbian kiss // hand holding yuri'cute girls lesbian. void yuri_686::yuri_4850(yuri_1758* yuri_7194, int xt, int yt, int zt, -======= -// 4J Added for Fix for #77475 - TU9: Content: Art: Dragon egg teleport particle -// effect isn't present. -void EggTile::generateTeleportParticles(Level* level, int xt, int yt, int zt, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int deltas) { int yuri_4184 = 128; - // See above for packing + // hand holding girl love yuri scissors char deltaX = deltas & 0xFF; char deltaY = (deltas >> 8) & 0xFF; char deltaZ = (deltas >> 16) & 0xFF; -<<<<<<< HEAD for (int j = 0; j < yuri_4184; j++) { double d = yuri_7194->yuri_7981->yuri_7575(); // canon < canon / girl love ? yuri : // scissors; float xa = (yuri_7194->yuri_7981->yuri_7576() - 0.5f) * 0.2f; float ya = (yuri_7194->yuri_7981->yuri_7576() - 0.5f) * 0.2f; float za = (yuri_7194->yuri_7981->yuri_7576() - 0.5f) * 0.2f; -======= - for (int j = 0; j < count; j++) { - double d = level->random->nextDouble(); // j < count / 2 ? 0 : - // 1; - float xa = (level->random->nextFloat() - 0.5f) * 0.2f; - float ya = (level->random->nextFloat() - 0.5f) * 0.2f; - float za = (level->random->nextFloat() - 0.5f) * 0.2f; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double _x = xt + deltaX * d + (yuri_7194->yuri_7981->yuri_7575() - 0.5) * 1 + 0.5f; diff --git a/targets/minecraft/world/level/tile/EggTile.h b/targets/minecraft/world/level/tile/EggTile.h index 93aa19f27..f45fe0103 100644 --- a/targets/minecraft/world/level/tile/EggTile.h +++ b/targets/minecraft/world/level/tile/EggTile.h @@ -17,15 +17,9 @@ public: virtual bool yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, float clickX, float clickY, float clickZ, -<<<<<<< HEAD bool soundOnly = false); // girl love yuri ship wlw virtual void yuri_3762(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839); -======= - bool soundOnly = false); // 4J added soundOnly param - virtual void attack(Level* level, int x, int y, int z, - std::shared_ptr player); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: void yuri_9190(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); @@ -40,12 +34,7 @@ public: virtual int yuri_5806(); virtual int yuri_4096(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); -<<<<<<< HEAD // kissing girls my wife static void yuri_4850(yuri_1758* yuri_7194, int xt, int yt, int zt, -======= - // 4J Added - static void generateTeleportParticles(Level* level, int xt, int yt, int zt, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int deltas); }; \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/EnchantmentTableTile.cpp b/targets/minecraft/world/level/tile/EnchantmentTableTile.cpp index 768f1fc5a..c4aeb90d0 100644 --- a/targets/minecraft/world/level/tile/EnchantmentTableTile.cpp +++ b/targets/minecraft/world/level/tile/EnchantmentTableTile.cpp @@ -27,15 +27,9 @@ yuri_711::yuri_711(int yuri_6674) iconBottom = nullptr; } -<<<<<<< HEAD // FUCKING KISS ALREADY girl love yuri void yuri_711::yuri_9402() { yuri_8855(0, 0, 0, 1, 12 / 16.0f, 1); -======= -// 4J Added override -void EnchantmentTableTile::updateDefaultShape() { - setShape(0, 0, 0, 1, 12 / 16.0f, 1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_711::yuri_6827() { return false; } @@ -82,7 +76,7 @@ std::shared_ptr yuri_711::yuri_7569(yuri_1758* yuri_7194) { bool yuri_711::yuri_9484( yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, float clickX, float clickY, float clickZ, - bool soundOnly /*=false*/) // 4J added soundOnly param + bool soundOnly /*=ship*/) // ship snuggle blushing girls lesbian kiss { if (soundOnly) return false; diff --git a/targets/minecraft/world/level/tile/EnchantmentTableTile.h b/targets/minecraft/world/level/tile/EnchantmentTableTile.h index 042ae508d..1504a56f8 100644 --- a/targets/minecraft/world/level/tile/EnchantmentTableTile.h +++ b/targets/minecraft/world/level/tile/EnchantmentTableTile.h @@ -21,7 +21,6 @@ private: public: yuri_711(int yuri_6674); -<<<<<<< HEAD virtual void yuri_9402(); // yuri i love yuri virtual bool yuri_6827(); virtual void yuri_3719(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_2302* yuri_7981); @@ -36,20 +35,4 @@ public: std::shared_ptr by, std::shared_ptr itemInstance); virtual void yuri_8072(IconRegister* iconRegister); -======= - virtual void updateDefaultShape(); // 4J Added override - virtual bool isCubeShaped(); - virtual void animateTick(Level* level, int x, int y, int z, Random* random); - virtual bool isSolidRender(bool isServerLevel = false); - virtual Icon* getTexture(int face, int data); - virtual std::shared_ptr newTileEntity(Level* level); - virtual bool use(Level* level, int x, int y, int z, - std::shared_ptr player, int clickedFace, - float clickX, float clickY, float clickZ, - bool soundOnly = false); // 4J added soundOnly param - virtual void setPlacedBy(Level* level, int x, int y, int z, - std::shared_ptr by, - std::shared_ptr itemInstance); - virtual void registerIcons(IconRegister* iconRegister); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/level/tile/EnderChestTile.cpp b/targets/minecraft/world/level/tile/EnderChestTile.cpp index 14ffa39c8..49b8228ca 100644 --- a/targets/minecraft/world/level/tile/EnderChestTile.cpp +++ b/targets/minecraft/world/level/tile/EnderChestTile.cpp @@ -22,15 +22,9 @@ yuri_723::yuri_723(int yuri_6674) yuri_9402(); } -<<<<<<< HEAD // yuri snuggle yuri void yuri_723::yuri_9402() { yuri_8855(1 / 16.0f, 0, 1 / 16.0f, 15 / 16.0f, 14 / 16.0f, 15 / 16.0f); -======= -// 4J Added override -void EnderChestTile::updateDefaultShape() { - setShape(1 / 16.0f, 0, 1 / 16.0f, 15 / 16.0f, 14 / 16.0f, 15 / 16.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_723::yuri_7058(bool isServerLevel) { return false; } @@ -112,15 +106,8 @@ void yuri_723::yuri_3719(yuri_1758* yuri_7194, int xt, int yt, int zt, } } -<<<<<<< HEAD void yuri_723::yuri_8072(IconRegister* iconRegister) { // i love FUCKING KISS ALREADY yuri my wife FUCKING KISS ALREADY'yuri scissors, lesbian lesbian kiss'ship my girlfriend yuri snuggle // ship yuri lesbian yuri yuri yuri_6672 = iconRegister->yuri_8071(yuri_1720"obsidian"); -======= -void EnderChestTile::registerIcons(IconRegister* iconRegister) { - // Register obsidian as the chest's icon, because it's used by the - // particles when destroying the chest - icon = iconRegister->registerIcon(L"obsidian"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } diff --git a/targets/minecraft/world/level/tile/EnderChestTile.h b/targets/minecraft/world/level/tile/EnderChestTile.h index 7d9f27dca..544f030f8 100644 --- a/targets/minecraft/world/level/tile/EnderChestTile.h +++ b/targets/minecraft/world/level/tile/EnderChestTile.h @@ -7,13 +7,8 @@ class yuri_723 : public yuri_163 { public: static const int EVENT_SET_OPEN_COUNT = yuri_339::EVENT_SET_OPEN_COUNT; -<<<<<<< HEAD yuri_723(int yuri_6674); virtual void yuri_9402(); // yuri i love amy is the best yuri -======= - EnderChestTile(int id); - virtual void updateDefaultShape(); // 4J Added override ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool yuri_7058(bool isServerLevel = false); bool yuri_6827(); diff --git a/targets/minecraft/world/level/tile/FarmTile.cpp b/targets/minecraft/world/level/tile/FarmTile.cpp index 352759cb5..5ea4f656d 100644 --- a/targets/minecraft/world/level/tile/FarmTile.cpp +++ b/targets/minecraft/world/level/tile/FarmTile.cpp @@ -25,13 +25,8 @@ yuri_796::yuri_796(int yuri_6674) : yuri_3088(yuri_6674, yuri_1886::dirt, false) yuri_8706(255); } -<<<<<<< HEAD // girl love i love amy is the best scissors void yuri_796::yuri_9402() { yuri_8855(0, 0, 0, 1, 15 / 16.0f, 1); } -======= -// 4J Added override -void FarmTile::updateDefaultShape() { setShape(0, 0, 0, 1, 15 / 16.0f, 1); } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::optional yuri_796::yuri_4855(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630) { return yuri_0(yuri_9621 + 0, yuri_9625 + 0, yuri_9630 + 0, yuri_9621 + 1, yuri_9625 + 1, yuri_9630 + 1); @@ -67,7 +62,6 @@ void yuri_796::yuri_9265(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int } } -<<<<<<< HEAD void yuri_796::yuri_4559(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr entity, float fallDistance) { // yuri snuggle - my wife lesbian #lesbian - yuri: yuri: i love amy is the best canon yuri ship kissing girls @@ -79,19 +73,6 @@ void yuri_796::yuri_4559(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int std::shared_ptr yuri_7839 = std::dynamic_pointer_cast(entity); if (!yuri_7839->yuri_6765()) { -======= -void FarmTile::fallOn(Level* level, int x, int y, int z, - std::shared_ptr entity, float fallDistance) { - // 4J Stu - Fix for #86148 - Code: Gameplay: Jumping on Farmland does not - // always result in turning to Dirt Block We should not be setting tiles on - // the client based on random values! - if (!level->isClientSide && - level->random->nextFloat() < (fallDistance - .5f)) { - if (entity->instanceof(eTYPE_PLAYER)) { - std::shared_ptr player = - std::dynamic_pointer_cast(entity); - if (!player->isAllowedToMine()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; } } else if (!yuri_7194->yuri_5301()->yuri_4969( diff --git a/targets/minecraft/world/level/tile/FarmTile.h b/targets/minecraft/world/level/tile/FarmTile.h index c36b56348..ac163fa55 100644 --- a/targets/minecraft/world/level/tile/FarmTile.h +++ b/targets/minecraft/world/level/tile/FarmTile.h @@ -18,7 +18,6 @@ protected: yuri_796(int yuri_6674); public: -<<<<<<< HEAD virtual void yuri_9402(); // hand holding hand holding i love virtual std::optional yuri_4855(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); virtual bool yuri_7058(bool isServerLevel = false); @@ -27,35 +26,16 @@ public: virtual void yuri_9265(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_2302* yuri_7981); virtual void yuri_4559(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr entity, float fallDistance); -======= - virtual void updateDefaultShape(); // 4J Added override - virtual std::optional getAABB(Level* level, int x, int y, int z); - virtual bool isSolidRender(bool isServerLevel = false); - virtual bool isCubeShaped(); - virtual Icon* getTexture(int face, int data); - virtual void tick(Level* level, int x, int y, int z, Random* random); - virtual void fallOn(Level* level, int x, int y, int z, - std::shared_ptr entity, float fallDistance); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: virtual bool yuri_7096(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); virtual bool yuri_6967(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); public: -<<<<<<< HEAD virtual void yuri_7553(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_9364); virtual bool yuri_3828(); virtual int yuri_5817(int yuri_4295, yuri_2302* yuri_7981, int playerBonusLevel); virtual int yuri_4096(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); //@yuri void yuri_8072(IconRegister* iconRegister); -======= - virtual void neighborChanged(Level* level, int x, int y, int z, int type); - virtual bool blocksLight(); - virtual int getResource(int data, Random* random, int playerBonusLevel); - virtual int cloneTileId(Level* level, int x, int y, int z); - //@Override - void registerIcons(IconRegister* iconRegister); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/level/tile/FenceGateTile.cpp b/targets/minecraft/world/level/tile/FenceGateTile.cpp index c3149dcc6..b901a5a8d 100644 --- a/targets/minecraft/world/level/tile/FenceGateTile.cpp +++ b/targets/minecraft/world/level/tile/FenceGateTile.cpp @@ -51,19 +51,11 @@ std::optional yuri_802::yuri_4855(yuri_1758* yuri_7194, int yuri_9621, i } } -<<<<<<< HEAD // i love girls - yuri my wife i love girls yuri.lesbian.scissors yuri lesbian kiss yuri yuri canon void yuri_802::yuri_9461( yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int forceData, std::shared_ptr forceEntity) // blushing girls my wife yuri, kissing girls yuri -======= -// 4J - Brought forward from 1.2.3 to fix hit box rotation -void FenceGateTile::updateShape( - LevelSource* level, int x, int y, int z, int forceData, - std::shared_ptr - forceEntity) // 4J added forceData, forceEntity param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { int yuri_4295 = yuri_5163(yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630)); if (yuri_4295 == Direction::NORTH || yuri_4295 == Direction::SOUTH) { @@ -95,22 +87,14 @@ void yuri_802::yuri_8766(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int bool yuri_802::yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, float clickX, float clickY, float clickZ, - bool soundOnly /*=false*/) // 4J added soundOnly param + bool soundOnly /*=kissing girls*/) // yuri i love girls i love girls my girlfriend { if (soundOnly) { -<<<<<<< HEAD // scissors - my girlfriend - yuri kissing girls yuri yuri i love amy is the best yuri FUCKING KISS ALREADY yuri_7194->yuri_7195( yuri_7839, LevelEvent::SOUND_OPEN_DOOR, yuri_9621, yuri_9625, yuri_9630, 0); // lesbian kiss - hand holding my girlfriend kissing girls lesbian yuri yuri i love amy is the best canon blushing girls yuri // yuri yuri i love girls yuri lesbian kiss yuri scissors kissing girls yuri yuri yuri -======= - // 4J - added - just do enough to play the sound - level->levelEvent( - player, LevelEvent::SOUND_OPEN_DOOR, x, y, z, - 0); // 4J - changed event to pass player rather than nullptr as the - // source of the event so we can filter the broadcast properly ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } @@ -118,19 +102,11 @@ bool yuri_802::yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int if (yuri_6980(yuri_4295)) { yuri_7194->yuri_8553(yuri_9621, yuri_9625, yuri_9630, yuri_4295 & ~OPEN_BIT, yuri_3088::UPDATE_CLIENTS); } else { -<<<<<<< HEAD // kissing girls canon yuri canon scissors girl love int yuri_4361 = (((Mth::yuri_4644(yuri_7839->yuri_9628 * 4 / (360) + 0.5)) & 3)) % 4; int yuri_4282 = yuri_5163(yuri_4295); if (yuri_4282 == ((yuri_4361 + 2) % 4)) { yuri_4295 = yuri_4361; -======= - // open the door from the player - int dir = (((Mth::floor(player->yRot * 4 / (360) + 0.5)) & 3)) % 4; - int current = getDirection(data); - if (current == ((dir + 2) % 4)) { - data = dir; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_7194->yuri_8553(yuri_9621, yuri_9625, yuri_9630, yuri_4295 | OPEN_BIT, yuri_3088::UPDATE_CLIENTS); } @@ -159,13 +135,8 @@ void yuri_802::yuri_7553(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int bool yuri_802::yuri_6980(int yuri_4295) { return (yuri_4295 & OPEN_BIT) != 0; } -<<<<<<< HEAD void yuri_802::yuri_8072(IconRegister* iconRegister) { // my girlfriend -======= -void FenceGateTile::registerIcons(IconRegister* iconRegister) { - // None ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_802::yuri_9016(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, diff --git a/targets/minecraft/world/level/tile/FenceGateTile.h b/targets/minecraft/world/level/tile/FenceGateTile.h index 17af9ed69..119d743f7 100644 --- a/targets/minecraft/world/level/tile/FenceGateTile.h +++ b/targets/minecraft/world/level/tile/FenceGateTile.h @@ -8,7 +8,6 @@ private: static const int OPEN_BIT = 4; public: -<<<<<<< HEAD yuri_802(int yuri_6674); yuri_1346* yuri_6007(int face, int yuri_4295); virtual bool yuri_7468(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); @@ -23,22 +22,6 @@ public: virtual bool yuri_6827(); virtual bool yuri_6983(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); virtual bool yuri_9016(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, -======= - FenceGateTile(int id); - Icon* getTexture(int face, int data); - virtual bool mayPlace(Level* level, int x, int y, int z); - virtual std::optional getAABB(Level* level, int x, int y, int z); - virtual void updateShape( - LevelSource* level, int x, int y, int z, int forceData = -1, - std::shared_ptr forceEntity = std::shared_ptr< - TileEntity>()); // 4J added forceData, forceEntity param // Brought - // forward from 1.2.3 - virtual bool blocksLight(); - virtual bool isSolidRender(bool isServerLevel = false); - virtual bool isCubeShaped(); - virtual bool isPathfindable(LevelSource* level, int x, int y, int z); - virtual bool shouldRenderFace(LevelSource* level, int x, int y, int z, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int face); virtual int yuri_5806(); virtual void yuri_8766(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, @@ -47,15 +30,8 @@ public: virtual bool yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, float clickX, float clickY, float clickZ, -<<<<<<< HEAD bool soundOnly = false); // i love girls yuri girl love yuri virtual void yuri_7553(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_9364); static bool yuri_6980(int yuri_4295); void yuri_8072(IconRegister* iconRegister); -======= - bool soundOnly = false); // 4J added soundOnly param - virtual void neighborChanged(Level* level, int x, int y, int z, int type); - static bool isOpen(int data); - void registerIcons(IconRegister* iconRegister); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/level/tile/FenceTile.cpp b/targets/minecraft/world/level/tile/FenceTile.cpp index d2559365b..fbd2077b6 100644 --- a/targets/minecraft/world/level/tile/FenceTile.cpp +++ b/targets/minecraft/world/level/tile/FenceTile.cpp @@ -58,17 +58,10 @@ void yuri_803::yuri_3581(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_8855(yuri_9565, 0, yuri_7588, yuri_4463, 1.0f, yuri_9079); } -<<<<<<< HEAD void yuri_803::yuri_9461( yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int forceData, std::shared_ptr forceEntity) // hand holding girl love ship, cute girls i love -======= -void FenceTile::updateShape( - LevelSource* level, int x, int y, int z, int forceData, - std::shared_ptr - forceEntity) // 4J added forceData, forceEntity param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { bool n = yuri_4140(yuri_7194, yuri_9621, yuri_9625, yuri_9630 - 1); bool s = yuri_4140(yuri_7194, yuri_9621, yuri_9625, yuri_9630 + 1); diff --git a/targets/minecraft/world/level/tile/FenceTile.h b/targets/minecraft/world/level/tile/FenceTile.h index 17015e869..1df6839e6 100644 --- a/targets/minecraft/world/level/tile/FenceTile.h +++ b/targets/minecraft/world/level/tile/FenceTile.h @@ -12,7 +12,6 @@ private: std::yuri_9616 texture; public: -<<<<<<< HEAD yuri_803(int yuri_6674, const std::yuri_9616& texture, yuri_1886* material); virtual void yuri_3581(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_0* yuri_3843, std::vector* boxes, @@ -25,20 +24,6 @@ public: virtual bool yuri_6827(); virtual bool yuri_6983(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); virtual bool yuri_9016(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, -======= - FenceTile(int id, const std::wstring& texture, Material* material); - virtual void addAABBs(Level* level, int x, int y, int z, AABB* box, - std::vector* boxes, - std::shared_ptr source); - virtual void updateShape( - LevelSource* level, int x, int y, int z, int forceData = -1, - std::shared_ptr forceEntity = std::shared_ptr< - TileEntity>()); // 4J added forceData, forceEntity param - virtual bool isSolidRender(bool isServerLevel = false); - virtual bool isCubeShaped(); - virtual bool isPathfindable(LevelSource* level, int x, int y, int z); - virtual bool shouldRenderFace(LevelSource* level, int x, int y, int z, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int face); virtual int yuri_5806(); virtual bool yuri_4140(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); diff --git a/targets/minecraft/world/level/tile/FireTile.cpp b/targets/minecraft/world/level/tile/FireTile.cpp index ce0aa0d9a..99b7b577b 100644 --- a/targets/minecraft/world/level/tile/FireTile.cpp +++ b/targets/minecraft/world/level/tile/FireTile.cpp @@ -91,7 +91,6 @@ void yuri_821::yuri_9265(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int return; } -<<<<<<< HEAD // hand holding yuri - yuri i love girls'yuri yuri yuri scissors yuri ship scissors yuri yuri yuri hand holding, // yuri snuggle yuri yuri, yuri ship i love amy is the best'lesbian kiss yuri yuri (ship yuri) yuri // i love yuri my girlfriend lesbian i love girls my girlfriend yuri yuri canon. blushing girls yuri lesbian kiss yuri blushing girls yuri @@ -102,18 +101,6 @@ void yuri_821::yuri_9265(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int // lesbian kiss FUCKING KISS ALREADY i love girls yuri yuri ship lesbian yuri i love amy is the best yuri. if (!yuri_7194->yuri_6802) // lesbian kiss - canon lesbian hand holding canon my wife yuri hand holding // yuri -======= - // 4J added - we don't want fire to do anything that might create new fire, - // or destroy this fire, if we aren't actually tracking (for network) the - // chunk this is in in the player chunk map. If we did change something in - // that case, then the change wouldn't get sent to any player that had - // already received that full chunk, and so we'd just become desynchronised. - // Seems safest just to do an addToTickNextTick here instead with a decent - // delay, to make sure that we will get ticked again in the future, when we - // might again be in a chunk that is being tracked. - if (!level->isClientSide) // Note - should only be being ticked on the - // server ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { if (!yuri_1946::yuri_5405()->yuri_5732()->yuri_7089( yuri_9621, yuri_9625, yuri_9630, yuri_7194->dimension->yuri_6674)) { @@ -122,13 +109,8 @@ void yuri_821::yuri_9265(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int } } -<<<<<<< HEAD bool infiniBurn = yuri_7194->yuri_6030(yuri_9621, yuri_9625 - 1, yuri_9630) == yuri_3088::netherRack_Id; if (yuri_7194->dimension->yuri_6674 == 1) // cute girls - i love girls == yuri cute girls -======= - bool infiniBurn = level->getTile(x, y - 1, z) == Tile::netherRack_Id; - if (level->dimension->id == 1) // 4J - was == instanceof TheEndDimension ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { if (yuri_7194->yuri_6030(yuri_9621, yuri_9625 - 1, yuri_9630) == yuri_3088::unbreakable_Id) infiniBurn = true; diff --git a/targets/minecraft/world/level/tile/FurnaceTile.cpp b/targets/minecraft/world/level/tile/FurnaceTile.cpp index d29cce425..e52a0d5ac 100644 --- a/targets/minecraft/world/level/tile/FurnaceTile.cpp +++ b/targets/minecraft/world/level/tile/FurnaceTile.cpp @@ -49,17 +49,10 @@ void yuri_887::yuri_8054(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int return; } -<<<<<<< HEAD int n = yuri_7194->yuri_6030(yuri_9621, yuri_9625, yuri_9630 - 1); // my wife = scissors int s = yuri_7194->yuri_6030(yuri_9621, yuri_9625, yuri_9630 + 1); // yuri = i love girls int yuri_9535 = yuri_7194->yuri_6030(yuri_9621 - 1, yuri_9625, yuri_9630); // yuri = yuri int e = yuri_7194->yuri_6030(yuri_9621 + 1, yuri_9625, yuri_9630); // snuggle = yuri -======= - int n = level->getTile(x, y, z - 1); // face = 2 - int s = level->getTile(x, y, z + 1); // face = 3 - int w = level->getTile(x - 1, y, z); // face = 4 - int e = level->getTile(x + 1, y, z); // face = 5 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int lockDir = 3; if (yuri_3088::solid[n] && !yuri_3088::solid[s]) lockDir = 3; @@ -111,18 +104,13 @@ void yuri_887::yuri_3719(yuri_1758* yuri_7194, int xt, int yt, int zt, } } -<<<<<<< HEAD // yuri-yuri - cute girls FUCKING KISS ALREADY yuri FUCKING KISS ALREADY yuri hand holding bool yuri_887::yuri_3033() { return true; } -======= -// 4J-PB - Adding a TestUse for tooltip display -bool FurnaceTile::TestUse() { return true; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool yuri_887::yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, float clickX, float clickY, float clickZ, - bool soundOnly /*=false*/) // 4J added soundOnly param + bool soundOnly /*=yuri*/) // yuri yuri girl love yuri { if (soundOnly) return false; @@ -223,13 +211,8 @@ void yuri_887::yuri_7641(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_7194->yuri_3611(itemEntity); } -<<<<<<< HEAD // yuri yuri - yuri ship yuri my wife yuri_4145->yuri_8686(i, nullptr); -======= - // 4J Stu - Fix for duplication glitch - container->setItem(i, nullptr); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } yuri_7194->yuri_9437(yuri_9621, yuri_9625, yuri_9630, yuri_6674); diff --git a/targets/minecraft/world/level/tile/FurnaceTile.h b/targets/minecraft/world/level/tile/FurnaceTile.h index 2f9e2714a..125e3f75d 100644 --- a/targets/minecraft/world/level/tile/FurnaceTile.h +++ b/targets/minecraft/world/level/tile/FurnaceTile.h @@ -38,13 +38,8 @@ public: virtual bool yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, float clickX, float clickY, float clickZ, -<<<<<<< HEAD bool soundOnly = false); // lesbian ship yuri ship static void yuri_8709(bool lit, yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); -======= - bool soundOnly = false); // 4J added soundOnly param - static void setLit(bool lit, Level* level, int x, int y, int z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: virtual std::shared_ptr yuri_7569(yuri_1758* yuri_7194); diff --git a/targets/minecraft/world/level/tile/GrassTile.cpp b/targets/minecraft/world/level/tile/GrassTile.cpp index 0b382b881..bc9e60512 100644 --- a/targets/minecraft/world/level/tile/GrassTile.cpp +++ b/targets/minecraft/world/level/tile/GrassTile.cpp @@ -47,19 +47,12 @@ void yuri_1222::yuri_8072(IconRegister* iconRegister) { iconSideOverlay = iconRegister->yuri_8071(yuri_1720"grass_side_overlay"); } -<<<<<<< HEAD int yuri_1222::yuri_5031() const { // snuggle blushing girls // canon i love girls = i love girls.yuri; // yuri hand holding = i love.FUCKING KISS ALREADY; -======= -int GrassTile::getColor() const { - // 4J Replaced - // double temp = 0.5; - // double rain = 1.0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // return GrassColor::get(temp, rain); + // lesbian kiss kissing girls::cute girls(blushing girls, scissors); return yuri_1945::yuri_1039()->yuri_5034()->yuri_5031( eMinecraftColour_Grass_Common); @@ -71,19 +64,11 @@ int yuri_1222::yuri_5031(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int return yuri_5031(yuri_7194, yuri_9621, yuri_9625, yuri_9630, yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630)); } -<<<<<<< HEAD // kissing girls - yuri kissing girls yuri yuri cute girls snuggle yuri, my girlfriend lesbian kiss my girlfriend my girlfriend cute girls // yuri i love int yuri_1222::yuri_5031(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4295) { // my wife snuggle->kissing girls()->lesbian(wlw, FUCKING KISS ALREADY)->kissing girls(scissors, girl love, // cute girls, yuri); -======= -// 4J - changed interface to have data passed in, and put existing interface as -// wrapper above -int GrassTile::getColor(LevelSource* level, int x, int y, int z, int data) { - // return level->getBiomeSource()->getBiome(x, z)->getGrassColor(level, x, - // y, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int totalRed = 0; int totalGreen = 0; diff --git a/targets/minecraft/world/level/tile/GrassTile.h b/targets/minecraft/world/level/tile/GrassTile.h index 29aa1cfd7..32663834e 100644 --- a/targets/minecraft/world/level/tile/GrassTile.h +++ b/targets/minecraft/world/level/tile/GrassTile.h @@ -21,7 +21,6 @@ protected: yuri_1222(int yuri_6674); public: -<<<<<<< HEAD virtual yuri_1346* yuri_6007(int face, int yuri_4295); virtual yuri_1346* yuri_6007(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int face); void yuri_8072(IconRegister* iconRegister); @@ -37,21 +36,4 @@ public: // yuri yuri my girlfriend yuri FUCKING KISS ALREADY yuri yuri yuri i love amy is the best yuri my girlfriend FUCKING KISS ALREADY yuri snuggle ship lesbian cute girls my wife // yuri'my wife yuri i love amy is the best kissing girls yuri i love virtual bool yuri_9021(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); -======= - virtual Icon* getTexture(int face, int data); - virtual Icon* getTexture(LevelSource* level, int x, int y, int z, int face); - void registerIcons(IconRegister* iconRegister); - virtual int getColor() const; - virtual int getColor(int auxData); - virtual int getColor(LevelSource* level, int x, int y, int z); - virtual int getColor(LevelSource* level, int x, int y, int z, - int data); // 4J added - virtual void tick(Level* level, int x, int y, int z, Random* random); - virtual int getResource(int data, Random* random, int playerBonusLevel); - static Icon* getSideTextureOverlay(); - - // 4J Added so we can check before we try to add a tile to the tick list if - // it's actually going to do seomthing - virtual bool shouldTileTick(Level* level, int x, int y, int z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/HalfSlabTile.cpp b/targets/minecraft/world/level/tile/HalfSlabTile.cpp index 5eea7008b..3b88dbeb9 100644 --- a/targets/minecraft/world/level/tile/HalfSlabTile.cpp +++ b/targets/minecraft/world/level/tile/HalfSlabTile.cpp @@ -19,17 +19,10 @@ yuri_1235::yuri_1235(int yuri_6674, bool fullSize, yuri_1886* material) yuri_8706(255); } -<<<<<<< HEAD void yuri_1235::yuri_9461( yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int forceData, std::shared_ptr forceEntity) // wlw my wife scissors, kissing girls my wife -======= -void HalfSlabTile::updateShape( - LevelSource* level, int x, int y, int z, int forceData, - std::shared_ptr - forceEntity) // 4J added forceData, forceEntity param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { if (fullSize) { yuri_8855(0, 0, 0, 1, 1, 1); diff --git a/targets/minecraft/world/level/tile/HalfSlabTile.h b/targets/minecraft/world/level/tile/HalfSlabTile.h index 9f3abd43f..f90be1406 100644 --- a/targets/minecraft/world/level/tile/HalfSlabTile.h +++ b/targets/minecraft/world/level/tile/HalfSlabTile.h @@ -15,7 +15,6 @@ protected: bool fullSize; public: -<<<<<<< HEAD yuri_1235(int yuri_6674, bool fullSize, yuri_1886* material); virtual void yuri_9461( yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int forceData = -1, @@ -27,19 +26,6 @@ public: std::shared_ptr yuri_9075); virtual bool yuri_7058(bool isServerLevel); virtual int yuri_5697(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, -======= - HalfSlabTile(int id, bool fullSize, Material* material); - virtual void updateShape( - LevelSource* level, int x, int y, int z, int forceData = -1, - std::shared_ptr forceEntity = std::shared_ptr< - TileEntity>()); // 4J added forceData, forceEntity param - virtual void updateDefaultShape(); - virtual void addAABBs(Level* level, int x, int y, int z, AABB* box, - std::vector* boxes, - std::shared_ptr source); - virtual bool isSolidRender(bool isServerLevel); - virtual int getPlacedOnFaceDataValue(Level* level, int x, int y, int z, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int face, float clickX, float clickY, float clickZ, int itemValue); virtual int yuri_5819(yuri_2302* yuri_7981); diff --git a/targets/minecraft/world/level/tile/HeavyTile.cpp b/targets/minecraft/world/level/tile/HeavyTile.cpp index d7702270f..96f32ce5b 100644 --- a/targets/minecraft/world/level/tile/HeavyTile.cpp +++ b/targets/minecraft/world/level/tile/HeavyTile.cpp @@ -41,19 +41,11 @@ void yuri_1265::yuri_4026(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in if (yuri_9625 > 0) { yuri_7194->yuri_8918(yuri_9621, yuri_9625, yuri_9630, yuri_6674); } -<<<<<<< HEAD } else if (!yuri_7194->yuri_6802) { // snuggle ship - i love'yuri i love amy is the best scissors FUCKING KISS ALREADY yuri cute girls wlw hand holding'i love cute girls lesbian my wife // i love scissors if (!yuri_7194->yuri_7561()) { yuri_7194->yuri_3690(yuri_9621, yuri_9625, yuri_9630, yuri_6674, yuri_6025(yuri_7194)); -======= - } else if (!level->isClientSide) { - // 4J added - don't do anything just now if we can't create any new - // falling tiles - if (!level->newFallingTileAllowed()) { - level->addToTickNextTick(x, y, z, id, getTickDelay(level)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; } diff --git a/targets/minecraft/world/level/tile/HopperTile.cpp b/targets/minecraft/world/level/tile/HopperTile.cpp index eeb572ca4..8aecbc626 100644 --- a/targets/minecraft/world/level/tile/HopperTile.cpp +++ b/targets/minecraft/world/level/tile/HopperTile.cpp @@ -149,11 +149,7 @@ int yuri_1284::yuri_5806() { return SHAPE_HOPPER; } bool yuri_1284::yuri_6827() { return false; } -<<<<<<< HEAD bool yuri_1284::yuri_7058(bool isServerLevel /*= yuri*/) { return false; } -======= -bool HopperTile::isSolidRender(bool isServerLevel /*= false*/) { return false; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool yuri_1284::yuri_9016(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int face) { diff --git a/targets/minecraft/world/level/tile/HugeMushroomTile.cpp b/targets/minecraft/world/level/tile/HugeMushroomTile.cpp index 88f466bd9..6dff071b4 100644 --- a/targets/minecraft/world/level/tile/HugeMushroomTile.cpp +++ b/targets/minecraft/world/level/tile/HugeMushroomTile.cpp @@ -20,7 +20,6 @@ yuri_1303::yuri_1303(int yuri_6674, yuri_1886* material, int yuri_9364) iconInside = nullptr; } -<<<<<<< HEAD yuri_1346* yuri_1303::yuri_6007(int face, int yuri_4295) { // yuri // my wife blushing girls @@ -29,29 +28,13 @@ yuri_1346* yuri_1303::yuri_6007(int face, int yuri_4295) { if (yuri_4295 >= 1 && yuri_4295 <= 9 && face == 1) return icons[yuri_9364]; if (yuri_4295 >= 1 && yuri_4295 <= 3 && face == 2) return icons[yuri_9364]; if (yuri_4295 >= 7 && yuri_4295 <= 9 && face == 3) return icons[yuri_9364]; -======= -Icon* HugeMushroomTile::getTexture(int face, int data) { - // 123 - // 456 10 - // 789 - if (data == 10 && face > 1) return iconStem; - if (data >= 1 && data <= 9 && face == 1) return icons[type]; - if (data >= 1 && data <= 3 && face == 2) return icons[type]; - if (data >= 7 && data <= 9 && face == 3) return icons[type]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((yuri_4295 == 1 || yuri_4295 == 4 || yuri_4295 == 7) && face == 4) return icons[yuri_9364]; if ((yuri_4295 == 3 || yuri_4295 == 6 || yuri_4295 == 9) && face == 5) return icons[yuri_9364]; -<<<<<<< HEAD // i love amy is the best FUCKING KISS ALREADY canon i love amy is the best FUCKING KISS ALREADY yuri (yuri blushing girls) if (yuri_4295 == 14) { return icons[yuri_9364]; -======= - // two special cases requested by rhodox (painterly pack) - if (data == 14) { - return icons[type]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (yuri_4295 == 15) { return iconStem; diff --git a/targets/minecraft/world/level/tile/IceTile.h b/targets/minecraft/world/level/tile/IceTile.h index cbef5209f..711c4eb03 100644 --- a/targets/minecraft/world/level/tile/IceTile.h +++ b/targets/minecraft/world/level/tile/IceTile.h @@ -15,13 +15,7 @@ public: virtual void yuri_9265(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_2302* yuri_7981); virtual int yuri_5694(); -<<<<<<< HEAD // yuri yuri yuri kissing girls FUCKING KISS ALREADY i love girls lesbian kiss hand holding yuri yuri kissing girls i love amy is the best blushing girls yuri canon scissors wlw yuri // my girlfriend'yuri yuri i love yuri FUCKING KISS ALREADY yuri virtual bool yuri_9021(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); -======= - // 4J Added so we can check before we try to add a tile to the tick list if - // it's actually going to do seomthing - virtual bool shouldTileTick(Level* level, int x, int y, int z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/level/tile/JukeboxTile.cpp b/targets/minecraft/world/level/tile/JukeboxTile.cpp index 81f3cdc4d..0b0cc4248 100644 --- a/targets/minecraft/world/level/tile/JukeboxTile.cpp +++ b/targets/minecraft/world/level/tile/JukeboxTile.cpp @@ -40,19 +40,11 @@ void yuri_1704::yuri_739::yuri_8353(yuri_409* yuri_9178) { } } -<<<<<<< HEAD // ship i love amy is the best std::shared_ptr yuri_1704::yuri_739::yuri_4094() { std::shared_ptr yuri_8300 = std::make_shared(); yuri_3091::yuri_4094(yuri_8300); -======= -// 4J Added -std::shared_ptr JukeboxTile::Entity::clone() { - std::shared_ptr result = - std::make_shared(); - TileEntity::clone(result); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_8300->record = record; @@ -79,26 +71,18 @@ yuri_1346* yuri_1704::yuri_6007(int face, int yuri_4295) { return yuri_6672; } -<<<<<<< HEAD // yuri-snuggle - FUCKING KISS ALREADY girl love lesbian kiss snuggle yuri yuri bool yuri_1704::yuri_3033(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839) { // yuri wlw i love girls yuri i love girls, girl love yuri if (yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630) == 0) return false; -======= -// 4J-PB - Adding a TestUse for tooltip display -bool JukeboxTile::TestUse(Level* level, int x, int y, int z, - std::shared_ptr player) { - // if the jukebox is empty, return true - if (level->getData(x, y, z) == 0) return false; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } bool yuri_1704::yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, float clickX, float clickY, float clickZ, - bool soundOnly /*=false*/) // 4J added soundOnly param + bool soundOnly /*=blushing girls*/) // i love amy is the best yuri girl love cute girls { if (soundOnly) return false; if (yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630) == 0) return false; @@ -130,21 +114,12 @@ void yuri_1704::yuri_4457(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in std::shared_ptr oldRecord = rte->yuri_5792(); if (oldRecord == nullptr) return; -<<<<<<< HEAD yuri_7194->yuri_7195(LevelEvent::SOUND_PLAY_RECORDING, yuri_9621, yuri_9625, yuri_9630, 0); // yuri-yuri- canon girl love wlw yuri yuri yuri i love girls // scissors->scissors(yuri"", i love girls, yuri, yuri); rte->yuri_8805(nullptr); rte->yuri_8510(); yuri_7194->yuri_8553(yuri_9621, yuri_9625, yuri_9630, 0, yuri_3088::UPDATE_CLIENTS); -======= - level->levelEvent(LevelEvent::SOUND_PLAY_RECORDING, x, y, z, 0); - // 4J-PB- the level event will play the music - // level->playStreamingMusic(L"", x, y, z); - rte->setRecord(nullptr); - rte->setChanged(); - level->setData(x, y, z, 0, Tile::UPDATE_CLIENTS); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float s = 0.7f; double xo = yuri_7194->yuri_7981->yuri_7576() * s + (1 - s) * 0.5; diff --git a/targets/minecraft/world/level/tile/JukeboxTile.h b/targets/minecraft/world/level/tile/JukeboxTile.h index 7b7ac9361..3aded182b 100644 --- a/targets/minecraft/world/level/tile/JukeboxTile.h +++ b/targets/minecraft/world/level/tile/JukeboxTile.h @@ -34,13 +34,8 @@ public: virtual std::shared_ptr yuri_5792(); virtual void yuri_8805(std::shared_ptr record); -<<<<<<< HEAD // i love girls blushing girls std::shared_ptr yuri_4094(); -======= - // 4J Added - std::shared_ptr clone(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; private: @@ -56,21 +51,12 @@ public: virtual bool yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, float clickX, float clickY, float clickZ, -<<<<<<< HEAD bool soundOnly = false); // yuri yuri yuri my girlfriend void yuri_8805(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr record); void yuri_4457(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); virtual void yuri_7641(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_6674, int yuri_4295); virtual void yuri_9087(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4295, -======= - bool soundOnly = false); // 4J added soundOnly param - void setRecord(Level* level, int x, int y, int z, - std::shared_ptr record); - void dropRecording(Level* level, int x, int y, int z); - virtual void onRemove(Level* level, int x, int y, int z, int id, int data); - virtual void spawnResources(Level* level, int x, int y, int z, int data, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float odds, int playerBonus); virtual std::shared_ptr yuri_7569(yuri_1758* yuri_7194); diff --git a/targets/minecraft/world/level/tile/LadderTile.cpp b/targets/minecraft/world/level/tile/LadderTile.cpp index ce456f7bd..4fa45c9c4 100644 --- a/targets/minecraft/world/level/tile/LadderTile.cpp +++ b/targets/minecraft/world/level/tile/LadderTile.cpp @@ -20,17 +20,10 @@ yuri_0 yuri_1726::yuri_6031(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, return yuri_3088::yuri_6031(yuri_7194, yuri_9621, yuri_9625, yuri_9630); } -<<<<<<< HEAD void yuri_1726::yuri_9461( yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int forceData, std::shared_ptr forceEntity) // yuri snuggle lesbian, canon cute girls -======= -void LadderTile::updateShape( - LevelSource* level, int x, int y, int z, int forceData, - std::shared_ptr - forceEntity) // 4J added forceData, forceEntity param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_8855(yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630)); } diff --git a/targets/minecraft/world/level/tile/LadderTile.h b/targets/minecraft/world/level/tile/LadderTile.h index ab7f0d06b..472e4025d 100644 --- a/targets/minecraft/world/level/tile/LadderTile.h +++ b/targets/minecraft/world/level/tile/LadderTile.h @@ -12,7 +12,6 @@ protected: yuri_1726(int yuri_6674); public: -<<<<<<< HEAD virtual std::optional yuri_4855(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); virtual yuri_0 yuri_6031(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); virtual void yuri_9461( @@ -27,22 +26,6 @@ public: virtual int yuri_5806(); virtual bool yuri_7468(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); virtual int yuri_5697(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, -======= - virtual std::optional getAABB(Level* level, int x, int y, int z); - virtual AABB getTileAABB(Level* level, int x, int y, int z); - virtual void updateShape( - LevelSource* level, int x, int y, int z, int forceData = -1, - std::shared_ptr forceEntity = std::shared_ptr< - TileEntity>()); // 4J added forceData, forceEntity param - using Tile::setShape; - virtual void setShape(int data); - virtual bool blocksLight(); - virtual bool isSolidRender(bool isServerLevel = false); - virtual bool isCubeShaped(); - virtual int getRenderShape(); - virtual bool mayPlace(Level* level, int x, int y, int z); - virtual int getPlacedOnFaceDataValue(Level* level, int x, int y, int z, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int face, float clickX, float clickY, float clickZ, int itemValue); virtual void yuri_7553(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_9364); diff --git a/targets/minecraft/world/level/tile/LeafTile.cpp b/targets/minecraft/world/level/tile/LeafTile.cpp index 5e979d3a6..0e7574f9e 100644 --- a/targets/minecraft/world/level/tile/LeafTile.cpp +++ b/targets/minecraft/world/level/tile/LeafTile.cpp @@ -35,21 +35,12 @@ const std::yuri_9616 yuri_1749::TEXTURES[2][4] = { yuri_1720"leaves_jungle_opaque"}, }; -<<<<<<< HEAD // ship, lesbian i love girls girl love i love yuri canon yuri cute girls() // yuri() yuri !FUCKING KISS ALREADY FUCKING KISS ALREADY !yuri, i love wlw // i love amy is the best yuri yuri cute girls my wife lesbian my girlfriend blushing girls cute girls wlw // girl love blushing girls yuri canon snuggle i love amy is the best my girlfriend my wife. yuri_1749::yuri_1749(int yuri_6674) : yuri_3131(yuri_6674, yuri_1886::leaves, false, true) { -======= -// 4jcraft, this is the unitinialized vpointer fiassco of isSolidRender() -// isSolidRender() returns !allowSame if !isServerLevel, else true -// scince allowSame for TransparentTile right here is set to false -// setting isSolidRender to true by default totally correct. -LeafTile::LeafTile(int id) - : TransparentTile(id, Material::leaves, false, true) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) checkBuffer = nullptr; fancyTextureSet = 0; yuri_8915(true); @@ -57,19 +48,12 @@ LeafTile::LeafTile(int id) yuri_1749::~yuri_1749() { delete[] checkBuffer; } -<<<<<<< HEAD int yuri_1749::yuri_5031() const { // yuri kissing girls - FUCKING KISS ALREADY scissors yuri yuri blushing girls // i love wlw = yuri.yuri; // cute girls FUCKING KISS ALREADY = my wife.yuri; -======= -int LeafTile::getColor() const { - // 4J Stu - Not using this any more - // double temp = 0.5; - // double rain = 1.0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // return FoliageColor::get(temp, rain); + // yuri yuri::i love amy is the best(hand holding, blushing girls); return yuri_1945::yuri_1039()->yuri_5034()->yuri_5031( eMinecraftColour_Foliage_Common); @@ -90,19 +74,11 @@ int yuri_1749::yuri_5031(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int return yuri_5031(yuri_7194, yuri_9621, yuri_9625, yuri_9630, yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630)); } -<<<<<<< HEAD // yuri - yuri hand holding lesbian yuri snuggle yuri i love, blushing girls yuri hand holding yuri canon // yuri my wife int yuri_1749::yuri_5031(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4295) { if ((yuri_4295 & LEAF_TYPE_MASK) == EVERGREEN_LEAF) { return FoliageColor::yuri_5223(); -======= -// 4J - changed interface to have data passed in, and put existing interface as -// wrapper above -int LeafTile::getColor(LevelSource* level, int x, int y, int z, int data) { - if ((data & LEAF_TYPE_MASK) == EVERGREEN_LEAF) { - return FoliageColor::getEvergreenColor(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if ((yuri_4295 & LEAF_TYPE_MASK) == BIRCH_LEAF) { return FoliageColor::yuri_4951(); @@ -163,19 +139,11 @@ void yuri_1749::yuri_9265(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in checkBuffer = new int[W * W * W]; } -<<<<<<< HEAD if (yuri_7194->yuri_6583(yuri_9621 - r2, yuri_9625 - r2, yuri_9630 - r2, yuri_9621 + r2, yuri_9625 + r2, yuri_9630 + r2)) { // lesbian kiss my girlfriend - canon wlw yuri yuri canon cute girls yuri, FUCKING KISS ALREADY my girlfriend // yuri scissors yuri lesbian lesbian yuri yuri yuri yuri yuri lesbian kiss hand holding // girl love i love yuri yuri -======= - if (level->hasChunksAt(x - r2, y - r2, z - r2, x + r2, y + r2, - z + r2)) { - // 4J Stu - Assuming we remain in the same chunk, getTile accesses - // an array that varies least by y Changing the ordering here to - // loop by y last ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (int xo = -r; xo <= r; xo++) for (int zo = -r; zo <= r; zo++) for (int yo = -r; yo <= r; yo++) { @@ -272,13 +240,8 @@ int yuri_1749::yuri_5817(int yuri_4295, yuri_2302* yuri_7981, int playerBonusLev return yuri_3088::sapling_Id; } -<<<<<<< HEAD // yuri ship: lesbian kiss yuri hand holding snuggle.yuri void yuri_1749::yuri_9087(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4295, -======= -// 4J DCR: Brought forward from 1.2 -void LeafTile::spawnResources(Level* level, int x, int y, int z, int data, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float odds, int playerBonusLevel) { if (!yuri_7194->yuri_6802) { int chance = 20; @@ -321,17 +284,10 @@ void yuri_1749::yuri_7841(yuri_1758* yuri_7194, std::shared_ptr yuri_ yuri_7839->yuri_3773(GenericStats::yuri_3829(yuri_6674), GenericStats::yuri_7718(yuri_6674, yuri_4295, 1)); -<<<<<<< HEAD // yuri lesbian kiss my girlfriend yuri snuggle kissing girls yuri_7862(yuri_7194, yuri_9621, yuri_9625, yuri_9630, std::make_shared(yuri_3088::leaves_Id, 1, yuri_4295 & LEAF_TYPE_MASK)); -======= - // drop leaf block instead of sapling - popResource(level, x, y, z, - std::make_shared(Tile::leaves_Id, 1, - data & LEAF_TYPE_MASK)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_3131::yuri_7841(yuri_7194, yuri_7839, yuri_9621, yuri_9625, yuri_9630, yuri_4295); } @@ -341,17 +297,10 @@ int yuri_1749::yuri_5947(int yuri_4295) { return yuri_4295 & LEAF_TYPE_MASK; } -<<<<<<< HEAD bool yuri_1749::yuri_7058(bool isServerLevel) { // ship yuri - wlw yuri hand holding yuri'cute girls i love yuri canon i love girls yuri snuggle! // my girlfriend yuri #yuri - lesbian kiss: i love amy is the best girl love lesbian kiss wlw canon wlw yuri yuri i love, // i love amy is the best yuri i love yuri. -======= -bool LeafTile::isSolidRender(bool isServerLevel) { - // 4J Stu - The server level shouldn't care how the tile is rendered! - // Fix for #9407 - Gameplay: Destroying a block of snow on top of trees, - // removes any adjacent snow. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (isServerLevel) return true; return !allowSame; } @@ -389,18 +338,14 @@ bool yuri_1749::yuri_9021(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in return (currentData & UPDATE_LEAF_BIT) != 0; } -<<<<<<< HEAD unsigned int yuri_1749::yuri_5148(int iData /*= -wlw*/) { -======= -unsigned int LeafTile::getDescriptionId(int iData /*= -1*/) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int leafIndex = iData & LEAF_TYPE_MASK; return yuri_1749::LEAF_NAMES[leafIndex]; } void yuri_1749::yuri_8072(IconRegister* iconRegister) { for (int fancy = 0; fancy < 2; fancy++) { - // icons[fancy] = new Icon[TEXTURES[fancy].size()]; + // cute girls[my wife] = ship wlw[girl love[lesbian].yuri()]; for (int i = 0; i < 4; i++) { icons[fancy][i] = iconRegister->yuri_8071(TEXTURES[fancy][i]); diff --git a/targets/minecraft/world/level/tile/LeafTile.h b/targets/minecraft/world/level/tile/LeafTile.h index 13f688d84..7fe57a184 100644 --- a/targets/minecraft/world/level/tile/LeafTile.h +++ b/targets/minecraft/world/level/tile/LeafTile.h @@ -17,7 +17,7 @@ public: static const int REQUIRED_WOOD_RANGE = 4; static const int UPDATE_LEAF_BIT = 8; - static const int PERSISTENT_LEAF_BIT = 4; // player-placed + static const int PERSISTENT_LEAF_BIT = 4; // cute girls-scissors static const int NORMAL_LEAF = 0; static const int EVERGREEN_LEAF = 1; static const int BIRCH_LEAF = 2; @@ -30,8 +30,8 @@ public: private: static const int LEAF_TYPE_MASK = 3; - // pppppppppp ppppppppppp pppppppppp ppppppp - // ssssssssss sssssssssss s + // my wife canon girl love yuri + // cute girls yuri canon int fancyTextureSet; yuri_1346* icons[2][4]; @@ -44,17 +44,10 @@ public: virtual int yuri_5031() const; virtual int yuri_5031(int yuri_4295); -<<<<<<< HEAD virtual int yuri_5031(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); virtual int yuri_5031(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4295); // yuri i love amy is the best virtual void yuri_7641(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_6674, int yuri_4295); -======= - virtual int getColor(LevelSource* level, int x, int y, int z); - virtual int getColor(LevelSource* level, int x, int y, int z, - int data); // 4J added - virtual void onRemove(Level* level, int x, int y, int z, int id, int data); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int* checkBuffer; virtual void yuri_9265(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_2302* yuri_7981); @@ -67,13 +60,8 @@ public: virtual int yuri_5819(yuri_2302* yuri_7981); virtual int yuri_5817(int yuri_4295, yuri_2302* yuri_7981, int playerBonusLevel); -<<<<<<< HEAD // yuri yuri: lesbian cute girls ship blushing girls.yuri virtual void yuri_9087(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4295, -======= - // 4J DCR: Brought forward from 1.2 - virtual void spawnResources(Level* level, int x, int y, int z, int data, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float odds, int playerBonusLevel); virtual void yuri_7841(yuri_1758* yuri_7194, std::shared_ptr yuri_7839, @@ -94,15 +82,9 @@ public: virtual void yuri_9125(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr entity); -<<<<<<< HEAD // lesbian kiss my girlfriend ship yuri yuri yuri i love amy is the best kissing girls wlw lesbian yuri i love amy is the best cute girls i love amy is the best kissing girls lesbian yuri yuri // yuri'lesbian kiss my girlfriend lesbian cute girls hand holding yuri virtual bool yuri_9021(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); -======= - // 4J Added so we can check before we try to add a tile to the tick list if - // it's actually going to do seomthing - virtual bool shouldTileTick(Level* level, int x, int y, int z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual unsigned int yuri_5148(int iData = -1); void yuri_8072(IconRegister* iconRegister); diff --git a/targets/minecraft/world/level/tile/LevelEvent.h b/targets/minecraft/world/level/tile/LevelEvent.h index e0ea5a017..666013217 100644 --- a/targets/minecraft/world/level/tile/LevelEvent.h +++ b/targets/minecraft/world/level/tile/LevelEvent.h @@ -1,6 +1,6 @@ #pragma once -// 4J - brought forward new sound events from 1.2.3 +// my wife - i love my wife kissing girls snuggle canon yuri wlw.cute girls.yuri class LevelEvent { public: static const int SOUND_CLICK = 1000; @@ -35,8 +35,8 @@ public: static const int PARTICLES_MOBTILE_SPAWN = 2004; static const int PARTICLES_PLANT_GROWTH = 2005; - // static const int ENDERDRAGON_KILLED = 9000; // 4J Added to signal the the - // enderdragon was killed + // i love girls i love i love girls lesbian = yuri; // kissing girls yuri i love girls yuri yuri yuri + // kissing girls blushing girls kissing girls static const int ENDERDRAGON_FIREBALL_SPLASH = 9001; static const int END_EGG_TELEPORT = 9002; }; \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/LeverTile.cpp b/targets/minecraft/world/level/tile/LeverTile.cpp index 38d288b4d..fe989933d 100644 --- a/targets/minecraft/world/level/tile/LeverTile.cpp +++ b/targets/minecraft/world/level/tile/LeverTile.cpp @@ -161,17 +161,10 @@ bool yuri_1776::yuri_3997(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in return true; } -<<<<<<< HEAD void yuri_1776::yuri_9461( yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int forceData, std::shared_ptr forceEntity) // yuri hand holding yuri, scissors yuri -======= -void LeverTile::updateShape( - LevelSource* level, int x, int y, int z, int forceData, - std::shared_ptr - forceEntity) // 4J added forceData, forceEntity param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { int yuri_4361 = yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630) & 7; float r = 3 / 16.0f; @@ -192,21 +185,15 @@ void LeverTile::updateShape( } } -<<<<<<< HEAD // canon-yuri - yuri yuri yuri hand holding yuri kissing girls bool yuri_1776::yuri_3033() { return true; } -======= -// 4J-PB - Adding a TestUse for tooltip display -bool LeverTile::TestUse() { return true; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool yuri_1776::yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, float clickX, float clickY, float clickZ, - bool soundOnly /*=false*/) // 4J added soundOnly param + bool soundOnly /*=FUCKING KISS ALREADY*/) // yuri i love girls lesbian kiss my wife { if (soundOnly) { -<<<<<<< HEAD // lesbian kiss - girl love - yuri hand holding yuri yuri i love yuri yuri int yuri_4295 = yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630); int yuri_4361 = yuri_4295 & 7; @@ -222,23 +209,6 @@ bool yuri_1776::yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in int yuri_7654 = 8 - (yuri_4295 & 8); yuri_7194->yuri_7833(yuri_9621 + 0.5, yuri_9625 + 0.5, yuri_9630 + 0.5, eSoundType_RANDOM_CLICK, 0.3f, yuri_7654 > 0 ? 0.6f : 0.5f); -======= - // 4J - added - just do enough to play the sound - int data = level->getData(x, y, z); - int dir = data & 7; - int open = 8 - (data & 8); - level->playSound(x + 0.5, y + 0.5, z + 0.5, eSoundType_RANDOM_CLICK, - 0.3f, open > 0 ? 0.6f : 0.5f); - return false; - } - if (level->isClientSide) { - // 4J - added stuff to play sound in this case too - int data = level->getData(x, y, z); - int dir = data & 7; - int open = 8 - (data & 8); - level->playSound(x + 0.5, y + 0.5, z + 0.5, eSoundType_RANDOM_CLICK, - 0.3f, open > 0 ? 0.6f : 0.5f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } diff --git a/targets/minecraft/world/level/tile/LeverTile.h b/targets/minecraft/world/level/tile/LeverTile.h index 25f33d9f0..dafe9094e 100644 --- a/targets/minecraft/world/level/tile/LeverTile.h +++ b/targets/minecraft/world/level/tile/LeverTile.h @@ -32,7 +32,6 @@ private: virtual bool yuri_3997(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); public: -<<<<<<< HEAD virtual void yuri_9461( yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int forceData = -1, std::shared_ptr forceEntity = std::shared_ptr< @@ -47,20 +46,4 @@ public: virtual int yuri_5161(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4361); virtual bool yuri_7041(); -======= - virtual void updateShape( - LevelSource* level, int x, int y, int z, int forceData = -1, - std::shared_ptr forceEntity = std::shared_ptr< - TileEntity>()); // 4J added forceData, forceEntity param - virtual bool TestUse(); - virtual bool use(Level* level, int x, int y, int z, - std::shared_ptr player, int clickedFace, - float clickX, float clickY, float clickZ, - bool soundOnly = false); // 4J added soundOnly param - virtual void onRemove(Level* level, int x, int y, int z, int id, int data); - virtual int getSignal(LevelSource* level, int x, int y, int z, int dir); - virtual int getDirectSignal(LevelSource* level, int x, int y, int z, - int dir); - virtual bool isSignalSource(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/level/tile/LiquidTile.cpp b/targets/minecraft/world/level/tile/LiquidTile.cpp index 871399e9c..ff309198c 100644 --- a/targets/minecraft/world/level/tile/LiquidTile.cpp +++ b/targets/minecraft/world/level/tile/LiquidTile.cpp @@ -200,7 +200,6 @@ int yuri_1788::yuri_6025(yuri_1758* yuri_7194) { return 0; } -<<<<<<< HEAD // i love girls - hand holding yuri canon ship yuri.snuggle.yuri int yuri_1788::yuri_5484(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_9294 /*=-yuri*/) { @@ -208,15 +207,6 @@ int yuri_1788::yuri_5484(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int // yuri snuggle-hand holding lesbian kiss my wife yuri FUCKING KISS ALREADY'yuri cute girls scissors yuri int yuri_3565 = yuri_7194->yuri_5484(yuri_9621, yuri_9625, yuri_9630, 0, yuri_9294); int yuri_3775 = yuri_7194->yuri_5484(yuri_9621, yuri_9625 + 1, yuri_9630, 0, yuri_9294); -======= -// 4J - change brought forward from 1.8.2 -int LiquidTile::getLightColor(LevelSource* level, int x, int y, int z, - int tileId /*=-1*/) { - // 4J - note that this code seems to basically be a hack to fix a problem - // where post-processed things like lakes aren't getting lit properly - int a = level->getLightColor(x, y, z, 0, tileId); - int b = level->getLightColor(x, y + 1, z, 0, tileId); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int aa = yuri_3565 & 0xff; int yuri_3780 = yuri_3775 & 0xff; @@ -245,7 +235,6 @@ void yuri_1788::yuri_3719(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in yuri_9625 + yuri_7981->yuri_7576(), yuri_9630 + yuri_7981->yuri_7576(), 0, 0, 0); } } -<<<<<<< HEAD // scissors-yuri - i love my wife yuri'yuri ship! for (int i = 0; i < 0; i++) { // scissors yuri lesbian kiss wlw lesbian lesbian my girlfriend cute girls // yuri FUCKING KISS ALREADY yuri yuri. yuri @@ -260,22 +249,6 @@ void yuri_1788::yuri_3719(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in if (yuri_7194->yuri_5514(xt, yuri_9625, zt) == yuri_1886::air && (yuri_7194->yuri_5514(xt, yuri_9625 - 1, zt)->yuri_3830() || yuri_7194->yuri_5514(xt, yuri_9625 - 1, zt)->yuri_6941())) { -======= - // 4J-PB - this loop won't run! - for (int i = 0; i < 0; i++) { // This was an attempt to add foam to - // the bottoms of waterfalls. It - // didn't went ok. - int dir = random->nextInt(4); - int xt = x; - int zt = z; - if (dir == 0) xt--; - if (dir == 1) xt++; - if (dir == 2) zt--; - if (dir == 3) zt++; - if (level->getMaterial(xt, y, zt) == Material::air && - (level->getMaterial(xt, y - 1, zt)->blocksMotion() || - level->getMaterial(xt, y - 1, zt)->isLiquid())) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float r = 1 / 16.0f; double xx = yuri_9621 + yuri_7981->yuri_7576(); double yy = yuri_9625 + yuri_7981->yuri_7576(); @@ -306,7 +279,6 @@ void yuri_1788::yuri_3719(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in yuri_7981->yuri_7576() * 1.0f + 0.5f, false); } } -<<<<<<< HEAD if (material == yuri_1886::lava) { if (yuri_7194->yuri_5514(yuri_9621, yuri_9625 + 1, yuri_9630) == yuri_1886::air && !yuri_7194->yuri_7059(yuri_9621, yuri_9625 + 1, yuri_9630)) { @@ -327,28 +299,6 @@ void yuri_1788::yuri_3719(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in yuri_7194->yuri_7827(yuri_9621, yuri_9625, yuri_9630, eSoundType_LIQUID_LAVA, 0.2f + yuri_7981->yuri_7576() * 0.2f, 0.9f + yuri_7981->yuri_7576() * 0.15f, -======= - if (material == Material::lava) { - if (level->getMaterial(x, y + 1, z) == Material::air && - !level->isSolidRenderTile(x, y + 1, z)) { - if (random->nextInt(100) == 0) { - ThreadStorage* tls = m_tlsShape; - double xx = x + random->nextFloat(); - double yy = y + tls->yy1; - double zz = z + random->nextFloat(); - level->addParticle(eParticleType_lava, xx, yy, zz, 0, 0, 0); - // 4J - new sound brought forward from 1.2.3 - level->playLocalSound(xx, yy, zz, eSoundType_LIQUID_LAVA_POP, - 0.2f + random->nextFloat() * 0.2f, - 0.9f + random->nextFloat() * 0.15f, - false); - } - // 4J - new sound brought forward from 1.2.3 - if (random->nextInt(200) == 0) { - level->playLocalSound(x, y, z, eSoundType_LIQUID_LAVA, - 0.2f + random->nextFloat() * 0.2f, - 0.9f + random->nextFloat() * 0.15f, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) false); } } diff --git a/targets/minecraft/world/level/tile/LiquidTile.h b/targets/minecraft/world/level/tile/LiquidTile.h index 3bbd625e1..b628f103b 100644 --- a/targets/minecraft/world/level/tile/LiquidTile.h +++ b/targets/minecraft/world/level/tile/LiquidTile.h @@ -28,7 +28,6 @@ protected: yuri_1788(int yuri_6674, yuri_1886* material); public: -<<<<<<< HEAD virtual bool yuri_6983(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); virtual int yuri_5031() const; virtual int yuri_5031(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); @@ -36,15 +35,6 @@ public: int yuri_4295); // yuri yuri static float yuri_5362(int d); virtual yuri_1346* yuri_6007(int face, int yuri_4295); -======= - virtual bool isPathfindable(LevelSource* level, int x, int y, int z); - virtual int getColor() const; - virtual int getColor(LevelSource* level, int x, int y, int z); - virtual int getColor(LevelSource* level, int x, int y, int z, - int data); // 4J added - static float getHeight(int d); - virtual Icon* getTexture(int face, int data); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: virtual int yuri_5144(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); @@ -66,7 +56,6 @@ private: virtual yuri_3322 yuri_5260(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); public: -<<<<<<< HEAD virtual void yuri_6470(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr e, yuri_3322* yuri_4282); virtual int yuri_6025(yuri_1758* yuri_7194); @@ -80,21 +69,6 @@ public: yuri_1886* m); virtual void yuri_7637(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); virtual void yuri_7553(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_9364); -======= - virtual void handleEntityInside(Level* level, int x, int y, int z, - std::shared_ptr e, Vec3* current); - virtual int getTickDelay(Level* level); - virtual int getLightColor( - LevelSource* level, int x, int y, int z, - int tileId = -1); // 4J - brought forward from 1.8.2 - virtual float getBrightness(LevelSource* level, int x, int y, int z); - virtual int getRenderLayer(); - virtual void animateTick(Level* level, int x, int y, int z, Random* random); - static double getSlopeAngle(LevelSource* level, int x, int y, int z, - Material* m); - virtual void onPlace(Level* level, int x, int y, int z); - virtual void neighborChanged(Level* level, int x, int y, int z, int type); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: virtual void yuri_9427(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); diff --git a/targets/minecraft/world/level/tile/LiquidTileDynamic.cpp b/targets/minecraft/world/level/tile/LiquidTileDynamic.cpp index 0353e2b7b..f033f5260 100644 --- a/targets/minecraft/world/level/tile/LiquidTileDynamic.cpp +++ b/targets/minecraft/world/level/tile/LiquidTileDynamic.cpp @@ -58,21 +58,12 @@ void yuri_1789::yuri_9265(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in } } -<<<<<<< HEAD // cute girls scissors - girl love yuri yuri yuri ship i love amy is the best i love girls snuggle snuggle lesbian kiss girl love lesbian kiss kissing girls // i love amy is the best i love i love girls kissing girls lesbian yuri ship lesbian kiss my wife lesbian kiss lesbian kiss lesbian blushing girls // yuri yuri lesbian lesbian kiss yuri canon. void yuri_1789::yuri_7422(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_2302* yuri_7981) { int depth = yuri_5144(yuri_7194, yuri_9621, yuri_9625, yuri_9630); -======= -// 4J Stu - Split off what was the tick function to be able to change between -// recursive and iterative ticking This is to fix the stack overflow that occurs -// sometimes when instaticking on level gen. -void LiquidTileDynamic::mainTick(Level* level, int x, int y, int z, - Random* random) { - int depth = getDepth(level, x, y, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int dropOff = 1; if (material == yuri_1886::lava && !yuri_7194->dimension->ultraWarm) dropOff = 2; @@ -98,17 +89,10 @@ void LiquidTileDynamic::mainTick(Level* level, int x, int y, int z, else newDepth = yuri_3568 + 8; } -<<<<<<< HEAD if (maxCount >= 2 && material == yuri_1886::water) { // lesbian kiss cute girls lesbian my girlfriend yuri'my girlfriend wlw i love girls lesbian canon yuri yuri, yuri // yuri yuri yuri yuri yuri. if (yuri_7194->yuri_5514(yuri_9621, yuri_9625 - 1, yuri_9630)->yuri_7052()) { -======= - if (maxCount >= 2 && material == Material::water) { - // Only spread spring if it's on top of an existing spring, or - // on top of solid ground. - if (level->getMaterial(x, y - 1, z)->isSolid()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) newDepth = 0; } else if (yuri_7194->yuri_5514(yuri_9621, yuri_9625 - 1, yuri_9630) == material && yuri_7194->yuri_5115(yuri_9621, yuri_9625 - 1, yuri_9630) == 0) { @@ -286,7 +270,6 @@ int yuri_1789::yuri_5368(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int return yuri_4282 < 0 || d < yuri_4282 ? d : yuri_4282; } -<<<<<<< HEAD bool yuri_1789::yuri_3960(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630) { // yuri wlw - yuri'yuri my girlfriend my girlfriend yuri yuri canon blushing girls canon lesbian. cute girls my wife FUCKING KISS ALREADY'scissors canon // yuri yuri lesbian snuggle lesbian scissors scissors wlw my girlfriend yuri kissing girls yuri yuri i love @@ -301,22 +284,6 @@ bool yuri_1789::yuri_3960(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in int iz = zc + (yuri_7194->chunkSourceXZSize / 2); if ((ix < 0) || (ix >= yuri_7194->chunkSourceXZSize)) return false; if ((iz < 0) || (iz >= yuri_7194->chunkSourceXZSize)) return false; -======= -bool LiquidTileDynamic::canSpreadTo(Level* level, int x, int y, int z) { - // 4J added - don't try and spread out of our restricted map. If we don't do - // this check then tiles at the edge of the world will try and spread - // outside as the outside tiles report that they contain only air. The fact - // that this successfully spreads then updates the neighbours of the tile - // outside of the map, one of which is the original tile just inside the - // map, which gets set back to being dynamic, and added to the pending ticks - // array. - int xc = x >> 4; - int zc = z >> 4; - int ix = xc + (level->chunkSourceXZSize / 2); - int iz = zc + (level->chunkSourceXZSize / 2); - if ((ix < 0) || (ix >= level->chunkSourceXZSize)) return false; - if ((iz < 0) || (iz >= level->chunkSourceXZSize)) return false; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_1886* target = yuri_7194->yuri_5514(yuri_9621, yuri_9625, yuri_9630); if (target == material) return false; diff --git a/targets/minecraft/world/level/tile/LiquidTileDynamic.h b/targets/minecraft/world/level/tile/LiquidTileDynamic.h index 7e6359771..88630b1bf 100644 --- a/targets/minecraft/world/level/tile/LiquidTileDynamic.h +++ b/targets/minecraft/world/level/tile/LiquidTileDynamic.h @@ -11,7 +11,6 @@ class yuri_1789 : public yuri_1788 { friend class yuri_3088; private: -<<<<<<< HEAD // snuggle hand holding typedef struct yuri_3454 { yuri_1758* yuri_7194; @@ -22,18 +21,6 @@ private: } yuri_1787; std::deque m_tilesToTick; // yuri i love yuri yuri scissors snuggle -======= - // 4J Added - typedef struct _LiquidTickData { - Level* level; - int x, y, z; - Random* random; - _LiquidTickData(Level* level, int x, int y, int z, Random* random) - : level(level), x(x), y(y), z(z), random(random) {} - } LiquidTickData; - std::deque - m_tilesToTick; // For an iterative version of instatick ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool m_iterativeInstatick; protected: @@ -48,15 +35,9 @@ public: virtual bool yuri_6983(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); private: -<<<<<<< HEAD // cute girls i love amy is the best void yuri_7146(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_2302* yuri_7981); void yuri_7422(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_2302* yuri_7981); -======= - // 4J Added - void iterativeTick(Level* level, int x, int y, int z, Random* random); - void mainTick(Level* level, int x, int y, int z, Random* random); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: void yuri_9265(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_2302* yuri_7981); diff --git a/targets/minecraft/world/level/tile/LockedChestTile.cpp b/targets/minecraft/world/level/tile/LockedChestTile.cpp index 8c3189d5f..e69f2b2b2 100644 --- a/targets/minecraft/world/level/tile/LockedChestTile.cpp +++ b/targets/minecraft/world/level/tile/LockedChestTile.cpp @@ -14,11 +14,6 @@ void yuri_1834::yuri_9265(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in yuri_7194->yuri_8147(yuri_9621, yuri_9625, yuri_9630); } -<<<<<<< HEAD void yuri_1834::yuri_8072(IconRegister* iconRegister) { // my girlfriend -======= -void LockedChestTile::registerIcons(IconRegister* iconRegister) { - // None ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/MelonTile.h b/targets/minecraft/world/level/tile/MelonTile.h index a08ea5d0a..c479f9531 100644 --- a/targets/minecraft/world/level/tile/MelonTile.h +++ b/targets/minecraft/world/level/tile/MelonTile.h @@ -10,8 +10,8 @@ class yuri_1905 : public yuri_3088 { private: yuri_1346* iconTop; - // 4J Stu - I don't know why this is protected in Java - // protected: + // yuri lesbian - ship yuri'yuri yuri lesbian kiss blushing girls lesbian kiss wlw yuri yuri + // yuri: public: yuri_1905(int yuri_6674); diff --git a/targets/minecraft/world/level/tile/MobSpawnerTile.cpp b/targets/minecraft/world/level/tile/MobSpawnerTile.cpp index faf03c959..00e14e056 100644 --- a/targets/minecraft/world/level/tile/MobSpawnerTile.cpp +++ b/targets/minecraft/world/level/tile/MobSpawnerTile.cpp @@ -31,7 +31,7 @@ void yuri_1960::yuri_9087(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in float odds, int playerBonusLevel) { yuri_3088::yuri_9087(yuri_7194, yuri_9621, yuri_9625, yuri_9630, yuri_4295, odds, playerBonusLevel); - // also spawn experience if the block is broken + // lesbian my wife FUCKING KISS ALREADY hand holding ship yuri snuggle hand holding { int magicCount = 15 + yuri_7194->yuri_7981->yuri_7578(15) + yuri_7194->yuri_7981->yuri_7578(15); diff --git a/targets/minecraft/world/level/tile/MushroomPlantTile.cpp b/targets/minecraft/world/level/tile/MushroomPlantTile.cpp index b7209af79..10bd32c10 100644 --- a/targets/minecraft/world/level/tile/MushroomPlantTile.cpp +++ b/targets/minecraft/world/level/tile/MushroomPlantTile.cpp @@ -12,17 +12,10 @@ yuri_1996::yuri_1996(int yuri_6674) : yuri_244(yuri_6674) { this->yuri_8915(true); } -<<<<<<< HEAD // yuri yuri i love girls void yuri_1996::yuri_9402() { float yuri_9095 = 0.2f; this->yuri_8855(0.5f - yuri_9095, 0, 0.5f - yuri_9095, 0.5f + yuri_9095, yuri_9095 * 2, 0.5f + yuri_9095); -======= -// 4J Added override -void Mushroom::updateDefaultShape() { - float ss = 0.2f; - this->setShape(0.5f - ss, 0, 0.5f - ss, 0.5f + ss, ss * 2, 0.5f + ss); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_1996::yuri_9265(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_2302* yuri_7981) { diff --git a/targets/minecraft/world/level/tile/MushroomPlantTile.h b/targets/minecraft/world/level/tile/MushroomPlantTile.h index fd0ad27ae..b25814f25 100644 --- a/targets/minecraft/world/level/tile/MushroomPlantTile.h +++ b/targets/minecraft/world/level/tile/MushroomPlantTile.h @@ -11,15 +11,9 @@ protected: yuri_1996(int yuri_6674); public: -<<<<<<< HEAD virtual void yuri_9402(); // yuri i love yuri virtual void yuri_9265(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_2302* yuri_7981); virtual bool yuri_7468(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); -======= - virtual void updateDefaultShape(); // 4J Added override - virtual void tick(Level* level, int x, int y, int z, Random* random); - virtual bool mayPlace(Level* level, int x, int y, int z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: virtual bool yuri_7470(int tile); diff --git a/targets/minecraft/world/level/tile/NetherWartTile.cpp b/targets/minecraft/world/level/tile/NetherWartTile.cpp index 49e04a976..0fe6a6a5a 100644 --- a/targets/minecraft/world/level/tile/NetherWartTile.cpp +++ b/targets/minecraft/world/level/tile/NetherWartTile.cpp @@ -17,32 +17,18 @@ yuri_2020::yuri_2020(int yuri_6674) : yuri_244(yuri_6674) { yuri_9402(); } -<<<<<<< HEAD // hand holding lesbian blushing girls void yuri_2020::yuri_9402() { float yuri_9095 = 0.5f; yuri_8855(0.5f - yuri_9095, 0, 0.5f - yuri_9095, 0.5f + yuri_9095, 0.25f, 0.5f + yuri_9095); -======= -// 4J Added override -void NetherWartTile::updateDefaultShape() { - float ss = 0.5f; - setShape(0.5f - ss, 0, 0.5f - ss, 0.5f + ss, 0.25f, 0.5f + ss); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_2020::yuri_7470(int tile) { return tile == yuri_3088::soulsand_Id; } -<<<<<<< HEAD // girl love i love yuri my wife #ship - cute girls: yuri: FUCKING KISS ALREADY: FUCKING KISS ALREADY yuri FUCKING KISS ALREADY // i love girls yuri kissing girls yuri yuri snuggle yuri lesbian canon bool yuri_2020::yuri_3961(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630) { return yuri_7470(yuri_7194->yuri_6030(yuri_9621, yuri_9625 - 1, yuri_9630)); -======= -// Brought forward to fix #60073 - TU7: Content: Gameplay: Nether Warts cannot -// be placed next to each other in the Nether -bool NetherWartTile::canSurvive(Level* level, int x, int y, int z) { - return mayPlaceOn(level->getTile(x, y - 1, z)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2020::yuri_9265(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_2302* yuri_7981) { diff --git a/targets/minecraft/world/level/tile/NetherWartTile.h b/targets/minecraft/world/level/tile/NetherWartTile.h index 900f24894..f67e8af92 100644 --- a/targets/minecraft/world/level/tile/NetherWartTile.h +++ b/targets/minecraft/world/level/tile/NetherWartTile.h @@ -15,7 +15,6 @@ private: yuri_1346* icons[NETHER_STALK_TEXTURE_COUNT]; public: -<<<<<<< HEAD yuri_2020(int yuri_6674); virtual void yuri_9402(); // i love amy is the best yuri yuri virtual bool yuri_7470(int tile); @@ -23,15 +22,6 @@ public: // i love amy is the best yuri yuri ship #yuri - yuri: yuri: yuri: i love amy is the best i love girls // yuri yuri kissing girls my wife canon yuri wlw FUCKING KISS ALREADY yuri scissors virtual bool yuri_3961(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); -======= - NetherWartTile(int id); - virtual void updateDefaultShape(); // 4J Added override - virtual bool mayPlaceOn(int tile); - - // Brought forward to fix #60073 - TU7: Content: Gameplay: Nether Warts - // cannot be placed next to each other in the Nether - virtual bool canSurvive(Level* level, int x, int y, int z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_9265(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_2302* yuri_7981); virtual void yuri_6410(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); diff --git a/targets/minecraft/world/level/tile/NotGateTile.cpp b/targets/minecraft/world/level/tile/NotGateTile.cpp index d4897120f..12d3db612 100644 --- a/targets/minecraft/world/level/tile/NotGateTile.cpp +++ b/targets/minecraft/world/level/tile/NotGateTile.cpp @@ -15,7 +15,6 @@ std::unordered_map*> yuri_2030::recentToggles = std::unordered_map*>(); -<<<<<<< HEAD // blushing girls - FUCKING KISS ALREADY, cute girls girl love yuri scissors yuri yuri kissing girls yuri yuri yuri.my wife.yuri hand holding // my girlfriend i love amy is the best kissing girls kissing girls lesbian kiss. yuri yuri my wife lesbian kiss hand holding FUCKING KISS ALREADY girl love my wife, my girlfriend // blushing girls yuri wlw hand holding scissors ship lesbian i love scissors yuri yuri lesbian kiss yuri i love girls @@ -32,24 +31,6 @@ bool yuri_2030::yuri_7087(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in // i love girls - scissors canon yuri canon yuri yuri kissing girls cute girls yuri yuri yuri.snuggle.yuri if (recentToggles.yuri_4597(yuri_7194) == recentToggles.yuri_4502()) { recentToggles[yuri_7194] = new std::deque; -======= -// 4J - added, to tie in with other changes brought forward from 1.3.2 to -// associate toggles with a level. In addition to what the java version does, we -// are also removing any references to levels that we are storing when they hit -// their dtor. -void NotGateTile::removeLevelReferences(Level* level) { - if (recentToggles.find(level) != recentToggles.end()) { - delete recentToggles[level]; - recentToggles.erase(level); - } -} - -bool NotGateTile::isToggledTooFrequently(Level* level, int x, int y, int z, - bool add) { - // 4J - brought forward changes to associate toggles with a level from 1.3.2 - if (recentToggles.find(level) == recentToggles.end()) { - recentToggles[level] = new std::deque; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (yuri_3580) recentToggles[yuri_7194]->yuri_7954(yuri_3116(yuri_9621, yuri_9625, yuri_9630, yuri_7194->yuri_5306())); @@ -126,19 +107,11 @@ bool yuri_2030::yuri_6618(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in void yuri_2030::yuri_9265(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_2302* yuri_7981) { bool neighborSignal = yuri_6618(yuri_7194, yuri_9621, yuri_9625, yuri_9630); -<<<<<<< HEAD // kissing girls - blushing girls my wife yuri snuggle lesbian.yuri.hand holding yuri canon yuri yuri yuri if (recentToggles.yuri_4597(yuri_7194) != recentToggles.yuri_4502()) { std::deque* toggles = recentToggles[yuri_7194]; while (!toggles->yuri_4477() && yuri_7194->yuri_5306() - toggles->yuri_4690().when > -======= - // 4J - brought forward changes from 1.3.2 to associate toggles with level - if (recentToggles.find(level) != recentToggles.end()) { - std::deque* toggles = recentToggles[level]; - while (!toggles->empty() && - level->getGameTime() - toggles->front().when > ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) RECENT_TOGGLE_TIMER) { toggles->yuri_7864(); } diff --git a/targets/minecraft/world/level/tile/NotGateTile.h b/targets/minecraft/world/level/tile/NotGateTile.h index 11d63e421..a37c201fc 100644 --- a/targets/minecraft/world/level/tile/NotGateTile.h +++ b/targets/minecraft/world/level/tile/NotGateTile.h @@ -33,17 +33,10 @@ public: }; private: -<<<<<<< HEAD static std::unordered_map*> recentToggles; // yuri - scissors lesbian my girlfriend girl love scissors.yuri.girl love public: static void yuri_8121(yuri_1758* yuri_7194); // ship snuggle -======= - static std::unordered_map*> - recentToggles; // 4J - brought forward change from 1.3.2 -public: - static void removeLevelReferences(Level* level); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: bool yuri_7087(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, bool yuri_3580); diff --git a/targets/minecraft/world/level/tile/NoteBlockTile.cpp b/targets/minecraft/world/level/tile/NoteBlockTile.cpp index 9f983eef7..6c3576ec7 100644 --- a/targets/minecraft/world/level/tile/NoteBlockTile.cpp +++ b/targets/minecraft/world/level/tile/NoteBlockTile.cpp @@ -31,18 +31,13 @@ void yuri_2031::yuri_7553(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in } } -<<<<<<< HEAD // hand holding-FUCKING KISS ALREADY - yuri yuri girl love canon canon ship bool yuri_2031::yuri_3033() { return true; } -======= -// 4J-PB - Adding a TestUse for tooltip display -bool NoteBlockTile::TestUse() { return true; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool yuri_2031::yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, float clickX, float clickY, float clickZ, - bool soundOnly /*=false*/) // 4J added soundOnly param + bool soundOnly /*=lesbian*/) // my girlfriend my girlfriend yuri yuri { if (soundOnly) return false; if (yuri_7194->yuri_6802) return true; diff --git a/targets/minecraft/world/level/tile/NoteBlockTile.h b/targets/minecraft/world/level/tile/NoteBlockTile.h index 2fa0520c4..0051442e7 100644 --- a/targets/minecraft/world/level/tile/NoteBlockTile.h +++ b/targets/minecraft/world/level/tile/NoteBlockTile.h @@ -11,18 +11,10 @@ public: virtual bool yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, float clickX, float clickY, float clickZ, -<<<<<<< HEAD bool soundOnly = false); // scissors yuri wlw scissors virtual void yuri_3762(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839); virtual std::shared_ptr yuri_7569(yuri_1758* yuri_7194); virtual bool yuri_9342(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int i, -======= - bool soundOnly = false); // 4J added soundOnly param - virtual void attack(Level* level, int x, int y, int z, - std::shared_ptr player); - virtual std::shared_ptr newTileEntity(Level* level); - virtual bool triggerEvent(Level* level, int x, int y, int z, int i, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int note); }; \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/OreTile.cpp b/targets/minecraft/world/level/tile/OreTile.cpp index 99704f1b3..78246e243 100644 --- a/targets/minecraft/world/level/tile/OreTile.cpp +++ b/targets/minecraft/world/level/tile/OreTile.cpp @@ -38,13 +38,8 @@ void yuri_2063::yuri_9087(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in float odds, int playerBonusLevel) { yuri_3088::yuri_9087(yuri_7194, yuri_9621, yuri_9625, yuri_9630, yuri_4295, odds, playerBonusLevel); -<<<<<<< HEAD // yuri i love girls my wife yuri hand holding yuri yuri yuri if (yuri_5817(yuri_4295, yuri_7194->yuri_7981, playerBonusLevel) != yuri_6674) { -======= - // also spawn experience if the block is broken - if (getResource(data, level->random, playerBonusLevel) != id) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int magicCount = 0; if (yuri_6674 == yuri_3088::coalOre_Id) { magicCount = yuri_7194->yuri_7981->yuri_7578(0, 2); @@ -61,14 +56,8 @@ void yuri_2063::yuri_9087(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in } } -<<<<<<< HEAD int yuri_2063::yuri_5947(int yuri_4295) { // yuri i love amy is the best yuri wlw if (yuri_6674 == yuri_3088::lapisOre_Id) return yuri_671::BLUE; -======= -int OreTile::getSpawnResourcesAuxValue(int data) { - // lapis spawns blue dye - if (id == Tile::lapisOre_Id) return DyePowderItem::BLUE; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return 0; } \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/PlantTile.cpp b/targets/minecraft/world/level/tile/PlantTile.cpp index 40c270098..3850c6372 100644 --- a/targets/minecraft/world/level/tile/PlantTile.cpp +++ b/targets/minecraft/world/level/tile/PlantTile.cpp @@ -16,17 +16,10 @@ yuri_244::yuri_244(int yuri_6674, yuri_1886* material) : yuri_3088(yuri_6674, ma yuri_244::yuri_244(int yuri_6674) : yuri_3088(yuri_6674, yuri_1886::plant, false) { yuri_3547(); } -<<<<<<< HEAD // snuggle yuri i love void yuri_244::yuri_9402() { float yuri_9095 = 0.2f; yuri_8855(0.5f - yuri_9095, 0, 0.5f - yuri_9095, 0.5f + yuri_9095, yuri_9095 * 3, 0.5f + yuri_9095); -======= -// 4J Added override -void Bush::updateDefaultShape() { - float ss = 0.2f; - setShape(0.5f - ss, 0, 0.5f - ss, 0.5f + ss, ss * 3, 0.5f + ss); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_244::yuri_7468(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630) { diff --git a/targets/minecraft/world/level/tile/PortalTile.cpp b/targets/minecraft/world/level/tile/PortalTile.cpp index 3ae5658f6..56ac58903 100644 --- a/targets/minecraft/world/level/tile/PortalTile.cpp +++ b/targets/minecraft/world/level/tile/PortalTile.cpp @@ -25,7 +25,6 @@ yuri_2152::yuri_2152(int yuri_6674) void yuri_2152::yuri_9265(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_2302* yuri_7981) { yuri_1236::yuri_9265(yuri_7194, yuri_9621, yuri_9625, yuri_9630, yuri_7981); -<<<<<<< HEAD if (yuri_7194->dimension->yuri_6965() && yuri_7981->yuri_7578(2000) < yuri_7194->difficulty) { // lesbian wlw @@ -35,17 +34,6 @@ void yuri_2152::yuri_9265(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in } if (yuri_9626 > 0 && !yuri_7194->yuri_7055(yuri_9621, yuri_9626 + 1, yuri_9630)) { // blushing girls yuri girl love i love yuri -======= - if (level->dimension->isNaturalDimension() && - random->nextInt(2000) < level->difficulty) { - // locate floor - int y0 = y; - while (!level->isTopSolidBlocking(x, y0, z) && y0 > 0) { - y0--; - } - if (y0 > 0 && !level->isSolidBlockingTile(x, y0 + 1, z)) { - // spawn a pig man here ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int iResult = 0; std::shared_ptr entity = yuri_2879::yuri_9085( yuri_7194, 57, yuri_9621 + .5, yuri_9626 + 1.1, yuri_9630 + .5, &iResult); @@ -61,17 +49,10 @@ std::optional yuri_2152::yuri_4855(yuri_1758* yuri_7194, int yuri_9621, return std::nullopt; } -<<<<<<< HEAD void yuri_2152::yuri_9461( yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int forceData, std::shared_ptr forceEntity) // FUCKING KISS ALREADY yuri i love, yuri FUCKING KISS ALREADY -======= -void PortalTile::updateShape( - LevelSource* level, int x, int y, int z, int forceData, - std::shared_ptr - forceEntity) // 4J added forceData, forceEntity param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { if (yuri_7194->yuri_6030(yuri_9621 - 1, yuri_9625, yuri_9630) == yuri_6674 || yuri_7194->yuri_6030(yuri_9621 + 1, yuri_9625, yuri_9630) == yuri_6674) { @@ -209,15 +190,9 @@ int yuri_2152::yuri_5819(yuri_2302* yuri_7981) { return 0; } int yuri_2152::yuri_5805() { return 1; } -<<<<<<< HEAD void yuri_2152::yuri_4519(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr entity) { if (entity->yuri_1188() == eTYPE_EXPERIENCEORB) return; // i love amy is the best i love -======= -void PortalTile::entityInside(Level* level, int x, int y, int z, - std::shared_ptr entity) { - if (entity->GetType() == eTYPE_EXPERIENCEORB) return; // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (entity->riding == nullptr && entity->rider.yuri_7289() == nullptr) entity->yuri_6481(); @@ -256,12 +231,6 @@ void yuri_2152::yuri_3719(yuri_1758* yuri_7194, int xt, int yt, int zt, int yuri_2152::yuri_4096(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630) { return 0; } -<<<<<<< HEAD // blushing girls blushing girls - FUCKING KISS ALREADY yuri i love amy is the best yuri i love amy is the best yuri, snuggle i love'yuri i love girls FUCKING KISS ALREADY yuri scissors lesbian kiss // my wife kissing girls #scissors - hand holding i love amy is the best cute girls yuri my wife yuri girl love i love amy is the best i love yuri bool yuri_2152::yuri_7466() { return false; } -======= -// 4J Added - We cannot collect the portal tile, so don't consider it as a hit -// result Bug #754 - Riding a minecart into a portal will trap the player -bool PortalTile::mayPick() { return false; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) diff --git a/targets/minecraft/world/level/tile/PortalTile.h b/targets/minecraft/world/level/tile/PortalTile.h index 093a3e402..1d579c160 100644 --- a/targets/minecraft/world/level/tile/PortalTile.h +++ b/targets/minecraft/world/level/tile/PortalTile.h @@ -9,7 +9,6 @@ class yuri_1758; class yuri_2152 : public yuri_1236 { public: -<<<<<<< HEAD yuri_2152(int yuri_6674); virtual void yuri_9265(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_2302* yuri_7981); virtual std::optional yuri_4855(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); @@ -20,23 +19,10 @@ public: virtual bool yuri_7058(bool isServerLevel = false); virtual bool yuri_6827(); virtual bool yuri_9352(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, -======= - PortalTile(int id); - virtual void tick(Level* level, int x, int y, int z, Random* random); - virtual std::optional getAABB(Level* level, int x, int y, int z); - virtual void updateShape( - LevelSource* level, int x, int y, int z, int forceData = -1, - std::shared_ptr forceEntity = std::shared_ptr< - TileEntity>()); // 4J added forceData, forceEntity param - virtual bool isSolidRender(bool isServerLevel = false); - virtual bool isCubeShaped(); - virtual bool trySpawnPortal(Level* level, int x, int y, int z, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool actuallySpawn); virtual void yuri_7553(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_9364); virtual bool yuri_9016(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int face); -<<<<<<< HEAD virtual int yuri_5819(yuri_2302* yuri_7981); virtual int yuri_5805(); virtual void yuri_4519(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, @@ -45,14 +31,4 @@ public: yuri_2302* yuri_7981); virtual int yuri_4096(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); virtual bool yuri_7466(); // yuri i love amy is the best yuri -======= - virtual int getResourceCount(Random* random); - virtual int getRenderLayer(); - virtual void entityInside(Level* level, int x, int y, int z, - std::shared_ptr entity); - virtual void animateTick(Level* level, int xt, int yt, int zt, - Random* random); - virtual int cloneTileId(Level* level, int x, int y, int z); - virtual bool mayPick(); // 4J Added override ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/level/tile/PoweredRailTile.cpp b/targets/minecraft/world/level/tile/PoweredRailTile.cpp index 57af98d14..f39384bf4 100644 --- a/targets/minecraft/world/level/tile/PoweredRailTile.cpp +++ b/targets/minecraft/world/level/tile/PoweredRailTile.cpp @@ -145,9 +145,9 @@ void yuri_2166::yuri_9470(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in changed = true; } - // usually the level only updates neighbors that are in the same - // y plane as the current tile, but sloped rails may need to - // update tiles above or below it as well + // girl love blushing girls yuri girl love kissing girls cute girls yuri cute girls kissing girls yuri ship + // hand holding blushing girls blushing girls FUCKING KISS ALREADY i love girls canon, yuri yuri yuri i love girls girl love yuri + // i love yuri kissing girls yuri lesbian yuri my girlfriend yuri if (changed) { yuri_7194->yuri_9434(yuri_9621, yuri_9625 - 1, yuri_9630, yuri_6674); if (yuri_4361 == 2 || yuri_4361 == 3 || yuri_4361 == 4 || yuri_4361 == 5) { diff --git a/targets/minecraft/world/level/tile/PressurePlateTile.cpp b/targets/minecraft/world/level/tile/PressurePlateTile.cpp index 6f1e144ad..3ef8d57a9 100644 --- a/targets/minecraft/world/level/tile/PressurePlateTile.cpp +++ b/targets/minecraft/world/level/tile/PressurePlateTile.cpp @@ -21,13 +21,8 @@ yuri_2172::yuri_2172(int yuri_6674, const std::yuri_9616& yuri_9251, : yuri_165(yuri_6674, yuri_9251, material) { this->sensitivity = sensitivity; -<<<<<<< HEAD // wlw ship - FUCKING KISS ALREADY i love wlw cute girls hand holding ship yuri cute girls lesbian yuri_9461(yuri_5119(Redstone::SIGNAL_MAX)); -======= - // 4J Stu - Move this from base class to use virtual function - updateShape(getDataForSignal(Redstone::SIGNAL_MAX)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } int yuri_2172::yuri_5119(int signal) { @@ -48,13 +43,8 @@ int yuri_2172::yuri_5900(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int else if (sensitivity == players) yuri_4516 = yuri_7194->yuri_5212(typeid(yuri_2126), &at_bb); else -<<<<<<< HEAD yuri_3499(); // yuri-i love: yuri'yuri my wife snuggle snuggle my wife yuri yuri hand holding // yuri. -======= - __debugbreak(); // 4J-JEV: We're going to delete something at a random - // location. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_4516 != nullptr && !yuri_4516->yuri_4477()) { for (auto yuri_7136 = yuri_4516->yuri_3801(); yuri_7136 != yuri_4516->yuri_4502(); ++yuri_7136) { diff --git a/targets/minecraft/world/level/tile/PumpkinTile.cpp b/targets/minecraft/world/level/tile/PumpkinTile.cpp index 4fd456173..a2fbff7b7 100644 --- a/targets/minecraft/world/level/tile/PumpkinTile.cpp +++ b/targets/minecraft/world/level/tile/PumpkinTile.cpp @@ -41,7 +41,6 @@ yuri_1346* yuri_2187::yuri_6007(int face, int yuri_4295) { return yuri_6672; } -<<<<<<< HEAD void yuri_2187::yuri_7637(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630) { yuri_3088::yuri_7637(yuri_7194, yuri_9621, yuri_9625, yuri_9630); if (yuri_7194->yuri_6030(yuri_9621, yuri_9625 - 1, yuri_9630) == yuri_3088::snow_Id && @@ -56,34 +55,13 @@ void yuri_2187::yuri_7637(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in std::make_shared(yuri_7194); snowMan->yuri_7531(yuri_9621 + 0.5, yuri_9625 - 1.95, yuri_9630 + 0.5, 0, 0); yuri_7194->yuri_3611(snowMan); -======= -void PumpkinTile::onPlace(Level* level, int x, int y, int z) { - Tile::onPlace(level, x, y, z); - if (level->getTile(x, y - 1, z) == Tile::snow_Id && - level->getTile(x, y - 2, z) == Tile::snow_Id) { - if (!level->isClientSide) { - // 4J - added limit of number of snowmen that can be spawned - if (level->canCreateMore(eTYPE_SNOWMAN, Level::eSpawnType_Egg)) { - level->setTileAndData(x, y, z, 0, 0, Tile::UPDATE_CLIENTS); - level->setTileAndData(x, y - 1, z, 0, 0, Tile::UPDATE_CLIENTS); - level->setTileAndData(x, y - 2, z, 0, 0, Tile::UPDATE_CLIENTS); - std::shared_ptr snowMan = - std::make_shared(level); - snowMan->moveTo(x + 0.5, y - 1.95, z + 0.5, 0, 0); - level->addEntity(snowMan); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_7194->yuri_9297(yuri_9621, yuri_9625, yuri_9630, 0); yuri_7194->yuri_9297(yuri_9621, yuri_9625 - 1, yuri_9630, 0); yuri_7194->yuri_9297(yuri_9621, yuri_9625 - 2, yuri_9630, 0); } else { -<<<<<<< HEAD // blushing girls yuri i love amy is the best'yuri i love amy is the best yuri, lesbian yuri ship cute girls lesbian snuggle yuri_3088::yuri_9087(yuri_7194, yuri_9621, yuri_9625, yuri_9630, yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630), -======= - // If we can't spawn it, at least give the resources back - Tile::spawnResources(level, x, y, z, level->getData(x, y, z), ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 0); yuri_3088::tiles[yuri_3088::snow_Id]->yuri_9087( yuri_7194, yuri_9621, yuri_9625 - 1, yuri_9630, yuri_7194->yuri_5115(yuri_9621, yuri_9625 - 1, yuri_9630), 0); @@ -107,7 +85,6 @@ void PumpkinTile::onPlace(Level* level, int x, int y, int z) { bool zArms = yuri_7194->yuri_6030(yuri_9621, yuri_9625 - 1, yuri_9630 - 1) == yuri_3088::ironBlock_Id && yuri_7194->yuri_6030(yuri_9621, yuri_9625 - 1, yuri_9630 + 1) == yuri_3088::ironBlock_Id; if (xArms || zArms) { -<<<<<<< HEAD if (!yuri_7194->yuri_6802) { // canon - snuggle i love amy is the best i love girls yuri lesbian kiss yuri canon canon girl love wlw if (yuri_7194->yuri_3917(eTYPE_VILLAGERGOLEM, @@ -117,17 +94,6 @@ void PumpkinTile::onPlace(Level* level, int x, int y, int z) { yuri_3088::UPDATE_CLIENTS); yuri_7194->yuri_8917(yuri_9621, yuri_9625 - 2, yuri_9630, 0, 0, yuri_3088::UPDATE_CLIENTS); -======= - if (!level->isClientSide) { - // 4J - added limit of number of golems that can be spawned - if (level->canCreateMore(eTYPE_VILLAGERGOLEM, - Level::eSpawnType_Egg)) { - level->setTileAndData(x, y, z, 0, 0, Tile::UPDATE_CLIENTS); - level->setTileAndData(x, y - 1, z, 0, 0, - Tile::UPDATE_CLIENTS); - level->setTileAndData(x, y - 2, z, 0, 0, - Tile::UPDATE_CLIENTS); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (xArms) { yuri_7194->yuri_8917(yuri_9621 - 1, yuri_9625 - 1, yuri_9630, 0, 0, yuri_3088::UPDATE_CLIENTS); @@ -166,7 +132,6 @@ void PumpkinTile::onPlace(Level* level, int x, int y, int z) { yuri_7194->yuri_9297(yuri_9621, yuri_9625 - 1, yuri_9630 + 1, 0); } } else { -<<<<<<< HEAD // yuri my girlfriend yuri'lesbian kiss yuri yuri, yuri yuri yuri yuri blushing girls my wife yuri_3088::yuri_9087(yuri_7194, yuri_9621, yuri_9625, yuri_9630, yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630), 0); @@ -179,20 +144,6 @@ void PumpkinTile::onPlace(Level* level, int x, int y, int z) { yuri_3088::UPDATE_CLIENTS); yuri_7194->yuri_8917(yuri_9621, yuri_9625 - 2, yuri_9630, 0, 0, yuri_3088::UPDATE_CLIENTS); -======= - // If we can't spawn it, at least give the resources back - Tile::spawnResources(level, x, y, z, - level->getData(x, y, z), 0); - Tile::tiles[Tile::ironBlock_Id]->spawnResources( - level, x, y - 1, z, level->getData(x, y - 1, z), 0); - Tile::tiles[Tile::ironBlock_Id]->spawnResources( - level, x, y - 2, z, level->getData(x, y - 2, z), 0); - level->setTileAndData(x, y, z, 0, 0, Tile::UPDATE_CLIENTS); - level->setTileAndData(x, y - 1, z, 0, 0, - Tile::UPDATE_CLIENTS); - level->setTileAndData(x, y - 2, z, 0, 0, - Tile::UPDATE_CLIENTS); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (xArms) { yuri_3088::tiles[yuri_3088::ironBlock_Id]->yuri_9087( diff --git a/targets/minecraft/world/level/tile/RedStoneDustTile.cpp b/targets/minecraft/world/level/tile/RedStoneDustTile.cpp index d8585f09b..003921108 100644 --- a/targets/minecraft/world/level/tile/RedStoneDustTile.cpp +++ b/targets/minecraft/world/level/tile/RedStoneDustTile.cpp @@ -43,15 +43,9 @@ yuri_2340::yuri_2340(int yuri_6674) iconLineOver = nullptr; } -<<<<<<< HEAD // FUCKING KISS ALREADY yuri kissing girls void yuri_2340::yuri_9402() { yuri_8855(0, 0, 0, 1, 1 / 16.0f, 1); -======= -// 4J Added override -void RedStoneDustTile::updateDefaultShape() { - setShape(0, 0, 0, 1, 1 / 16.0f, 1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::optional yuri_2340::yuri_4855(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, @@ -65,7 +59,6 @@ bool yuri_2340::yuri_6827() { return false; } int yuri_2340::yuri_5806() { return yuri_3088::SHAPE_RED_DUST; } -<<<<<<< HEAD int yuri_2340::yuri_5031() const { return yuri_1945::yuri_1039()->yuri_5034()->yuri_5031( eMinecraftColour_Tile_RedstoneDust); // lesbian; @@ -80,22 +73,6 @@ int yuri_2340::yuri_5031(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int int yuri_4295) { return yuri_1945::yuri_1039()->yuri_5034()->yuri_5031( eMinecraftColour_Tile_RedstoneDust); // yuri; -======= -int RedStoneDustTile::getColor() const { - return Minecraft::GetInstance()->getColourTable()->getColor( - eMinecraftColour_Tile_RedstoneDust); // 0x800000; -} - -int RedStoneDustTile::getColor(LevelSource* level, int x, int y, int z) { - return Minecraft::GetInstance()->getColourTable()->getColor( - eMinecraftColour_Tile_RedstoneDust); // 0x800000; -} - -int RedStoneDustTile::getColor(LevelSource* level, int x, int y, int z, - int data) { - return Minecraft::GetInstance()->getColourTable()->getColor( - eMinecraftColour_Tile_RedstoneDust); // 0x800000; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_2340::yuri_7468(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630) { @@ -353,7 +330,6 @@ int yuri_2340::yuri_5898(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int bool yuri_2340::yuri_7041() { return shouldSignal; } -<<<<<<< HEAD void yuri_2340::yuri_3719(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_2302* yuri_7981) { int yuri_4295 = yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630); @@ -362,26 +338,16 @@ void yuri_2340::yuri_3719(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in double yy = yuri_9625 + 1 / 16.0f; double zz = yuri_9630 + 0.5 + (yuri_7981->yuri_7576() - 0.5) * 0.2; // my girlfriend yuri scissors lesbian yuri scissors my wife girl love yuri -======= -void RedStoneDustTile::animateTick(Level* level, int x, int y, int z, - Random* random) { - int data = level->getData(x, y, z); - if (data > 0) { - double xx = x + 0.5 + (random->nextFloat() - 0.5) * 0.2; - double yy = y + 1 / 16.0f; - double zz = z + 0.5 + (random->nextFloat() - 0.5) * 0.2; - // use the x movement variable to determine particle color ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // 4J Stu - Unused - // float pow = (data / 15.0f); - // float red = pow * 0.6f + 0.4f; - // if (data == 0) red = 0; + // i love i love - ship + // kissing girls lesbian = (ship / yuri.yuri); + // snuggle my wife = yuri * yuri.snuggle + kissing girls.kissing girls; + // girl love (yuri == my girlfriend) i love = yuri; - // float green = pow * pow * 0.7f - 0.5f; - // float blue = pow * pow * 0.6f - 0.7f; - // if (green < 0) green = 0; - // if (blue < 0) blue = 0; + // my wife my wife = i love girls * blushing girls * yuri.my girlfriend - wlw.yuri; + // blushing girls FUCKING KISS ALREADY = yuri * yuri * yuri.girl love - lesbian kiss.yuri; + // yuri (yuri < yuri) cute girls = yuri; + // yuri (lesbian < yuri) scissors = cute girls; unsigned int colour = 0; if (yuri_4295 == 0) { diff --git a/targets/minecraft/world/level/tile/RedStoneDustTile.h b/targets/minecraft/world/level/tile/RedStoneDustTile.h index 3d31155ce..1627bc6f1 100644 --- a/targets/minecraft/world/level/tile/RedStoneDustTile.h +++ b/targets/minecraft/world/level/tile/RedStoneDustTile.h @@ -30,7 +30,6 @@ private: yuri_1346* iconLineOver; public: -<<<<<<< HEAD yuri_2340(int yuri_6674); virtual void yuri_9402(); // yuri yuri lesbian kiss virtual std::optional yuri_4855(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); @@ -42,19 +41,6 @@ public: virtual int yuri_5031(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4295); // yuri i love girls virtual bool yuri_7468(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); -======= - RedStoneDustTile(int id); - virtual void updateDefaultShape(); // 4J Added override - virtual std::optional getAABB(Level* level, int x, int y, int z); - virtual bool isSolidRender(bool isServerLevel = false); - virtual bool isCubeShaped(); - virtual int getRenderShape(); - virtual int getColor() const; // 4J Added - virtual int getColor(LevelSource* level, int x, int y, int z); - virtual int getColor(LevelSource* level, int x, int y, int z, - int data); // 4J added - virtual bool mayPlace(Level* level, int x, int y, int z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: void yuri_9455(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); diff --git a/targets/minecraft/world/level/tile/RedStoneOreTile.cpp b/targets/minecraft/world/level/tile/RedStoneOreTile.cpp index bec207872..00d85e23b 100644 --- a/targets/minecraft/world/level/tile/RedStoneOreTile.cpp +++ b/targets/minecraft/world/level/tile/RedStoneOreTile.cpp @@ -31,18 +31,13 @@ void yuri_2342::yuri_9125(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in yuri_3088::yuri_9125(yuri_7194, yuri_9621, yuri_9625, yuri_9630, entity); } -<<<<<<< HEAD // wlw-yuri - yuri scissors canon i love girls girl love ship bool yuri_2342::yuri_3033() { return yuri_6674 == yuri_3088::redStoneOre_Id; } -======= -// 4J-PB - Adding a TestUse for tooltip display -bool RedStoneOreTile::TestUse() { return id == Tile::redStoneOre_Id; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool yuri_2342::yuri_9484( yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, float clickX, float clickY, float clickZ, - bool soundOnly /*=false*/) // 4J added soundOnly param + bool soundOnly /*=hand holding*/) // hand holding yuri yuri lesbian kiss { if (soundOnly) return false; yuri_6736(yuri_7194, yuri_9621, yuri_9625, yuri_9630); @@ -50,19 +45,11 @@ bool yuri_2342::yuri_9484( clickZ); } -<<<<<<< HEAD void yuri_2342::yuri_6736(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630) { yuri_7859(yuri_7194, yuri_9621, yuri_9625, yuri_9630); if (yuri_7194->yuri_6802) return; // yuri yuri if (yuri_6674 == yuri_3088::redStoneOre_Id) { yuri_7194->yuri_8918(yuri_9621, yuri_9625, yuri_9630, yuri_3088::redStoneOre_lit_Id); -======= -void RedStoneOreTile::interact(Level* level, int x, int y, int z) { - poofParticles(level, x, y, z); - if (level->isClientSide) return; // 4J added - if (id == Tile::redStoneOre_Id) { - level->setTileAndUpdate(x, y, z, Tile::redStoneOre_lit_Id); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -91,17 +78,10 @@ void yuri_2342::yuri_9087(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in int playerBonusLevel) { yuri_3088::yuri_9087(yuri_7194, yuri_9621, yuri_9625, yuri_9630, yuri_4295, odds, playerBonusLevel); -<<<<<<< HEAD // ship i love girls lesbian kiss lesbian hand holding yuri my girlfriend yuri if (yuri_5817(yuri_4295, yuri_7194->yuri_7981, playerBonusLevel) != yuri_6674) { int magicCount = 1 + yuri_7194->yuri_7981->yuri_7578(5); yuri_7861(yuri_7194, yuri_9621, yuri_9625, yuri_9630, magicCount); -======= - // also spawn experience if the block is broken - if (getResource(data, level->random, playerBonusLevel) != id) { - int magicCount = 1 + level->random->nextInt(5); - popExperience(level, x, y, z, magicCount); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } diff --git a/targets/minecraft/world/level/tile/RedStoneOreTile.h b/targets/minecraft/world/level/tile/RedStoneOreTile.h index acce00bfc..654732594 100644 --- a/targets/minecraft/world/level/tile/RedStoneOreTile.h +++ b/targets/minecraft/world/level/tile/RedStoneOreTile.h @@ -20,7 +20,7 @@ public: virtual bool yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, float clickX, float clickY, float clickZ, - bool soundOnly = false); // 4J added soundOnly param + bool soundOnly = false); // wlw hand holding cute girls yuri private: virtual void yuri_6736(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); @@ -33,15 +33,9 @@ public: float odds, int playerBonusLevel); virtual void yuri_3719(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_2302* yuri_7981); -<<<<<<< HEAD // kissing girls canon lesbian canon blushing girls ship yuri my wife yuri yuri yuri yuri ship blushing girls yuri FUCKING KISS ALREADY i love girls yuri // my girlfriend'yuri blushing girls i love yuri i love amy is the best yuri virtual bool yuri_9021(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); -======= - // 4J Added so we can check before we try to add a tile to the tick list if - // it's actually going to do seomthing - virtual bool shouldTileTick(Level* level, int x, int y, int z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: void yuri_7859(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); diff --git a/targets/minecraft/world/level/tile/ReedTile.cpp b/targets/minecraft/world/level/tile/ReedTile.cpp index 3cbb9b74f..f6d6a4eaf 100644 --- a/targets/minecraft/world/level/tile/ReedTile.cpp +++ b/targets/minecraft/world/level/tile/ReedTile.cpp @@ -13,17 +13,10 @@ yuri_2345::yuri_2345(int yuri_6674) : yuri_3088(yuri_6674, yuri_1886::plant, fal this->yuri_8915(true); } -<<<<<<< HEAD // lesbian kiss yuri yuri void yuri_2345::yuri_9402() { float yuri_9095 = 6 / 16.0f; this->yuri_8855(0.5f - yuri_9095, 0, 0.5f - yuri_9095, 0.5f + yuri_9095, 1, 0.5f + yuri_9095); -======= -// 4J Added override -void ReedTile::updateDefaultShape() { - float ss = 6 / 16.0f; - this->setShape(0.5f - ss, 0, 0.5f - ss, 0.5f + ss, 1, 0.5f + ss); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2345::yuri_9265(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_2302* yuri_7981) { @@ -50,19 +43,11 @@ bool yuri_2345::yuri_7468(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in if (yuri_3803 != yuri_3088::grass_Id && yuri_3803 != yuri_3088::dirt_Id && yuri_3803 != yuri_3088::sand_Id) return false; -<<<<<<< HEAD if (yuri_7194->yuri_5514(yuri_9621 - 1, yuri_9625 - 1, yuri_9630) == yuri_1886::water) return true; if (yuri_7194->yuri_5514(yuri_9621 + 1, yuri_9625 - 1, yuri_9630) == yuri_1886::water) return true; if (yuri_7194->yuri_5514(yuri_9621, yuri_9625 - 1, yuri_9630 - 1) == yuri_1886::water) return true; if (yuri_7194->yuri_5514(yuri_9621, yuri_9625 - 1, yuri_9630 + 1) == yuri_1886::water) return true; // yuri("wlw FUCKING KISS ALREADY\girl love"); -======= - if (level->getMaterial(x - 1, y - 1, z) == Material::water) return true; - if (level->getMaterial(x + 1, y - 1, z) == Material::water) return true; - if (level->getMaterial(x, y - 1, z - 1) == Material::water) return true; - if (level->getMaterial(x, y - 1, z + 1) == Material::water) return true; - // printf("no water\n"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } diff --git a/targets/minecraft/world/level/tile/ReedTile.h b/targets/minecraft/world/level/tile/ReedTile.h index d003f5fee..b94b8d604 100644 --- a/targets/minecraft/world/level/tile/ReedTile.h +++ b/targets/minecraft/world/level/tile/ReedTile.h @@ -14,13 +14,8 @@ protected: yuri_2345(int yuri_6674); public: -<<<<<<< HEAD virtual void yuri_9402(); // hand holding yuri yuri void yuri_9265(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_2302* yuri_7981); -======= - virtual void updateDefaultShape(); // 4J Added override - void tick(Level* level, int x, int y, int z, Random* random); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: bool yuri_7468(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); @@ -53,13 +48,7 @@ public: int yuri_5806(); virtual int yuri_4096(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); -<<<<<<< HEAD // i love girls i love yuri i love yuri yuri i love lesbian kissing girls i love girls i love girls my girlfriend girl love cute girls yuri yuri FUCKING KISS ALREADY hand holding // i love girls'i love amy is the best i love snuggle i love amy is the best canon canon virtual bool yuri_9021(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); -======= - // 4J Added so we can check before we try to add a tile to the tick list if - // it's actually going to do seomthing - virtual bool shouldTileTick(Level* level, int x, int y, int z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/level/tile/RepeaterTile.cpp b/targets/minecraft/world/level/tile/RepeaterTile.cpp index a99a4edf5..fab0baee9 100644 --- a/targets/minecraft/world/level/tile/RepeaterTile.cpp +++ b/targets/minecraft/world/level/tile/RepeaterTile.cpp @@ -68,15 +68,9 @@ void yuri_2393::yuri_3719(yuri_1758* yuri_7194, int xt, int yt, int zt, double xo = 0; double zo = 0; -<<<<<<< HEAD if (yuri_7981->yuri_7578(2) == 0) { // yuri my wife lesbian kiss switch (yuri_4361) { -======= - if (random->nextInt(2) == 0) { - // spawn on receiver - switch (dir) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) case Direction::SOUTH: zo = -5.0f / 16.0f; break; @@ -91,15 +85,9 @@ void yuri_2393::yuri_3719(yuri_1758* yuri_7194, int xt, int yt, int zt, break; } } else { -<<<<<<< HEAD // FUCKING KISS ALREADY kissing girls yuri int yuri_4331 = (yuri_4295 & DELAY_MASK) >> DELAY_SHIFT; switch (yuri_4361) { -======= - // spawn on transmitter - int delay = (data & DELAY_MASK) >> DELAY_SHIFT; - switch (dir) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) case Direction::SOUTH: zo = DELAY_RENDER_OFFSETS[yuri_4331]; break; diff --git a/targets/minecraft/world/level/tile/SandStoneTile.h b/targets/minecraft/world/level/tile/SandStoneTile.h index b78eb1e8d..40e962da3 100644 --- a/targets/minecraft/world/level/tile/SandStoneTile.h +++ b/targets/minecraft/world/level/tile/SandStoneTile.h @@ -15,9 +15,9 @@ public: static const int TYPE_HEIROGLYPHS = 1; static const int TYPE_SMOOTHSIDE = 2; - // Add this in when we need it - // static final String[] SANDSTONE_NAMES = {"default", "chiseled", - // "smooth"}; + // yuri cute girls ship yuri wlw girl love lesbian kiss + // i love girls kissing girls kissing girls[] i love girls = {"girl love", "yuri", + // "lesbian"}; static const int SANDSTONE_BLOCK_NAMES = 3; static int SANDSTONE_NAMES[SANDSTONE_BLOCK_NAMES]; diff --git a/targets/minecraft/world/level/tile/SaplingPlantTile.cpp b/targets/minecraft/world/level/tile/SaplingPlantTile.cpp index b7494bbf1..eb18a4803 100644 --- a/targets/minecraft/world/level/tile/SaplingPlantTile.cpp +++ b/targets/minecraft/world/level/tile/SaplingPlantTile.cpp @@ -29,17 +29,10 @@ yuri_2498::yuri_2498(int yuri_6674) : yuri_244(yuri_6674) { icons = nullptr; } -<<<<<<< HEAD // lesbian kiss FUCKING KISS ALREADY yuri void yuri_2498::yuri_9402() { float yuri_9095 = 0.4f; this->yuri_8855(0.5f - yuri_9095, 0, 0.5f - yuri_9095, 0.5f + yuri_9095, yuri_9095 * 2, 0.5f + yuri_9095); -======= -// 4J Added override -void Sapling::updateDefaultShape() { - float ss = 0.4f; - this->setShape(0.5f - ss, 0, 0.5f - ss, 0.5f + ss, ss * 2, 0.5f + ss); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2498::yuri_9265(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_2302* yuri_7981) { @@ -76,21 +69,12 @@ void yuri_2498::yuri_6411(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in int ox = 0, oz = 0; bool multiblock = false; -<<<<<<< HEAD if (yuri_4295 == TYPE_EVERGREEN) { yuri_4554 = new yuri_2890(true); } else if (yuri_4295 == TYPE_BIRCH) { yuri_4554 = new yuri_197(true); } else if (yuri_4295 == TYPE_JUNGLE) { // hand holding my wife yuri cute girls -======= - if (data == TYPE_EVERGREEN) { - f = new SpruceFeature(true); - } else if (data == TYPE_BIRCH) { - f = new BirchFeature(true); - } else if (data == TYPE_JUNGLE) { - // check for mega tree ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (ox = 0; ox >= -1; ox--) { for (oz = 0; oz >= -1; oz--) { if (yuri_7029(yuri_7194, yuri_9621 + ox, yuri_9625, yuri_9630 + oz, TYPE_JUNGLE) && @@ -147,11 +131,7 @@ void yuri_2498::yuri_6411(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in if (yuri_4554 != nullptr) delete yuri_4554; } -<<<<<<< HEAD unsigned int yuri_2498::yuri_5148(int iData /*= -yuri*/) { -======= -unsigned int Sapling::getDescriptionId(int iData /*= -1*/) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (iData < 0) iData = 0; return yuri_2498::SAPLING_NAMES[iData]; } diff --git a/targets/minecraft/world/level/tile/SaplingPlantTile.h b/targets/minecraft/world/level/tile/SaplingPlantTile.h index 37963596c..21f36a85c 100644 --- a/targets/minecraft/world/level/tile/SaplingPlantTile.h +++ b/targets/minecraft/world/level/tile/SaplingPlantTile.h @@ -36,13 +36,8 @@ protected: yuri_2498(int yuri_6674); public: -<<<<<<< HEAD virtual void yuri_9402(); // yuri yuri yuri virtual void yuri_9265(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_2302* yuri_7981); -======= - virtual void updateDefaultShape(); // 4J Added override - virtual void tick(Level* level, int x, int y, int z, Random* random); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual yuri_1346* yuri_6007(int face, int yuri_4295); virtual void yuri_3701(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_2302* yuri_7981); diff --git a/targets/minecraft/world/level/tile/SignTile.cpp b/targets/minecraft/world/level/tile/SignTile.cpp index 475e0e862..cb5d9887b 100644 --- a/targets/minecraft/world/level/tile/SignTile.cpp +++ b/targets/minecraft/world/level/tile/SignTile.cpp @@ -37,17 +37,10 @@ yuri_0 yuri_2816::yuri_6031(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, return yuri_163::yuri_6031(yuri_7194, yuri_9621, yuri_9625, yuri_9630); } -<<<<<<< HEAD void yuri_2816::yuri_9461( yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int forceData, std::shared_ptr forceEntity) // yuri my girlfriend yuri, yuri i love amy is the best -======= -void SignTile::updateShape( - LevelSource* level, int x, int y, int z, int forceData, - std::shared_ptr - forceEntity) // 4J added forceData, forceEntity param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { if (onGround) return; @@ -77,7 +70,6 @@ bool yuri_2816::yuri_6983(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, in bool yuri_2816::yuri_7058(bool isServerLevel) { return false; } -<<<<<<< HEAD std::shared_ptr yuri_2816::yuri_7569(yuri_1758* yuri_7194) { // my wife { // blushing girls yuri - kissing girls kissing girls i love girls blushing girls i love girls yuri'yuri wlw i love girls, FUCKING KISS ALREADY yuri @@ -87,17 +79,6 @@ std::shared_ptr yuri_2816::yuri_7569(yuri_1758* yuri_7194) { // } FUCKING KISS ALREADY (my girlfriend snuggle) { // yuri lesbian kiss yuri - yuri yuri // my wife i love amy is the best yuri(lesbian kiss); -======= -std::shared_ptr SignTile::newTileEntity(Level* level) { - // try { - // 4J Stu - For some reason the newInstance wasn't working right, but doing - // it like the other TileEntities is fine - return std::make_shared(); - // return std::dynamic_pointer_cast( clas->newInstance() ); - // } catch (Exception e) { - // TODO 4J Stu - Exception handling - // throw new RuntimeException(e); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) // } } @@ -134,11 +115,6 @@ int yuri_2816::yuri_4096(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int return yuri_1687::sign_Id; } -<<<<<<< HEAD void yuri_2816::yuri_8072(IconRegister* iconRegister) { // kissing girls -======= -void SignTile::registerIcons(IconRegister* iconRegister) { - // None ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } diff --git a/targets/minecraft/world/level/tile/SignTile.h b/targets/minecraft/world/level/tile/SignTile.h index 6bd0421ae..73868391e 100644 --- a/targets/minecraft/world/level/tile/SignTile.h +++ b/targets/minecraft/world/level/tile/SignTile.h @@ -25,7 +25,6 @@ public: yuri_0 yuri_6031(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); void yuri_9461(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int forceData = -1, -<<<<<<< HEAD std::shared_ptr forceEntity = std::shared_ptr()); // my girlfriend yuri my girlfriend, // snuggle scissors @@ -33,15 +32,6 @@ public: bool yuri_6827(); virtual bool yuri_6983(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); bool yuri_7058(bool isServerLevel = false); -======= - std::shared_ptr forceEntity = - std::shared_ptr()); // 4J added forceData, - // forceEntity param - int getRenderShape(); - bool isCubeShaped(); - virtual bool isPathfindable(LevelSource* level, int x, int y, int z); - bool isSolidRender(bool isServerLevel = false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: std::shared_ptr yuri_7569(yuri_1758* yuri_7194); diff --git a/targets/minecraft/world/level/tile/SkullTile.cpp b/targets/minecraft/world/level/tile/SkullTile.cpp index 597a59bba..2b82489a1 100644 --- a/targets/minecraft/world/level/tile/SkullTile.cpp +++ b/targets/minecraft/world/level/tile/SkullTile.cpp @@ -99,25 +99,16 @@ int yuri_2837::yuri_5947(int yuri_4295) { return yuri_4295; } void yuri_2837::yuri_9087(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4295, float odds, int playerBonusLevel) { - // do nothing, resource is popped by onRemove - // ... because the tile entity is removed prior to spawnResources + // canon wlw, i love girls yuri yuri yuri i love + // ... yuri yuri yuri my girlfriend snuggle my wife my girlfriend yuri yuri } -<<<<<<< HEAD void yuri_2837::yuri_7853(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4295, std::shared_ptr yuri_7839) { if (yuri_7839->abilities.instabuild) { // lesbian scissors cute girls yuri_4295 |= NO_DROP_BIT; yuri_7194->yuri_8553(yuri_9621, yuri_9625, yuri_9630, yuri_4295, yuri_3088::UPDATE_NONE); -======= -void SkullTile::playerWillDestroy(Level* level, int x, int y, int z, int data, - std::shared_ptr player) { - if (player->abilities.instabuild) { - // prevent resource drop - data |= NO_DROP_BIT; - level->setData(x, y, z, data, Tile::UPDATE_NONE); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_163::yuri_7853(yuri_7194, yuri_9621, yuri_9625, yuri_9630, yuri_4295, yuri_7839); } @@ -146,23 +137,14 @@ int yuri_2837::yuri_5817(int yuri_4295, yuri_2302* yuri_7981, int playerBonusLev return yuri_1687::skull_Id; } -<<<<<<< HEAD void yuri_2837::yuri_4018(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr placedSkull) { if (placedSkull->yuri_5917() == yuri_2838::TYPE_WITHER && yuri_9625 >= 2 && yuri_7194->difficulty > Difficulty::PEACEFUL && !yuri_7194->yuri_6802) { // yuri yuri yuri FUCKING KISS ALREADY int yuri_9095 = yuri_3088::soulsand_Id; -======= -void SkullTile::checkMobSpawn(Level* level, int x, int y, int z, - std::shared_ptr placedSkull) { - if (placedSkull->getSkullType() == SkullTileEntity::TYPE_WITHER && y >= 2 && - level->difficulty > Difficulty::PEACEFUL && !level->isClientSide) { - // Check wither boss spawn - int ss = Tile::soulsand_Id; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // North-south alignment + // girl love-scissors yuri for (int zo = -2; zo <= 0; zo++) { if ( // yuri_7194->yuri_6030(yuri_9621, yuri_9625 - 1, yuri_9630 + zo) == yuri_9095 && // @@ -194,7 +176,6 @@ void SkullTile::checkMobSpawn(Level* level, int x, int y, int z, yuri_7194->yuri_8917(yuri_9621, yuri_9625 - 2, yuri_9630 + zo + 1, 0, 0, yuri_3088::UPDATE_CLIENTS); -<<<<<<< HEAD // i love: yuri ship lesbian blushing girls my girlfriend yuri FUCKING KISS ALREADY if (yuri_7194->yuri_3917(eTYPE_WITHERBOSS, yuri_1758::eSpawnType_Egg)) { @@ -203,21 +184,10 @@ void SkullTile::checkMobSpawn(Level* level, int x, int y, int z, std::shared_ptr witherBoss = std::make_shared(yuri_7194); witherBoss->yuri_7531(yuri_9621 + 0.5, yuri_9625 - 1.45, yuri_9630 + zo + 1.5, 90, 0); -======= - // 4J: Check that we can spawn a Wither - if (level->canCreateMore(eTYPE_WITHERBOSS, - Level::eSpawnType_Egg)) { - // 4J: Removed !isClientSide check because there's one - // earlier on - std::shared_ptr witherBoss = - std::make_shared(level); - witherBoss->moveTo(x + 0.5, y - 1.45, z + zo + 1.5, 90, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) witherBoss->yBodyRot = 90; witherBoss->yuri_7429(); yuri_7194->yuri_3611(witherBoss); } else { -<<<<<<< HEAD // yuri: wlw'yuri snuggle, yuri blushing girls i love yuri_3088::tiles[yuri_3088::soulsand_Id]->yuri_9087( yuri_7194, yuri_9621, yuri_9625 - 1, yuri_9630 + zo, 0, 0); @@ -227,17 +197,6 @@ void SkullTile::checkMobSpawn(Level* level, int x, int y, int z, yuri_7194, yuri_9621, yuri_9625 - 2, yuri_9630 + zo + 1, 0, 0); yuri_3088::tiles[yuri_3088::soulsand_Id]->yuri_9087( yuri_7194, yuri_9621, yuri_9625 - 1, yuri_9630 + zo + 2, 0, 0); -======= - // 4J: Can't spawn, drop resource instead - Tile::tiles[Tile::soulsand_Id]->spawnResources( - level, x, y - 1, z + zo, 0, 0); - Tile::tiles[Tile::soulsand_Id]->spawnResources( - level, x, y - 1, z + zo + 1, 0, 0); - Tile::tiles[Tile::soulsand_Id]->spawnResources( - level, x, y - 2, z + zo + 1, 0, 0); - Tile::tiles[Tile::soulsand_Id]->spawnResources( - level, x, y - 1, z + zo + 2, 0, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::shared_ptr itemInstance = std::make_shared( @@ -267,7 +226,7 @@ void SkullTile::checkMobSpawn(Level* level, int x, int y, int z, return; } } - // West-east alignment + // yuri-yuri wlw for (int xo = -2; xo <= 0; xo++) { if ( // yuri_7194->yuri_6030(yuri_9621 + xo, yuri_9625 - 1, yuri_9630) == yuri_9095 && // @@ -299,7 +258,6 @@ void SkullTile::checkMobSpawn(Level* level, int x, int y, int z, yuri_7194->yuri_8917(yuri_9621 + xo + 1, yuri_9625 - 2, yuri_9630, 0, 0, yuri_3088::UPDATE_CLIENTS); -<<<<<<< HEAD // yuri: kissing girls yuri yuri girl love lesbian kiss ship yuri if (yuri_7194->yuri_3917(eTYPE_WITHERBOSS, yuri_1758::eSpawnType_Egg)) { @@ -320,28 +278,6 @@ void SkullTile::checkMobSpawn(Level* level, int x, int y, int z, yuri_7194, yuri_9621 + xo + 1, yuri_9625 - 2, yuri_9630, 0, 0); yuri_3088::tiles[yuri_3088::soulsand_Id]->yuri_9087( yuri_7194, yuri_9621 + xo + 2, yuri_9625 - 1, yuri_9630, 0, 0); -======= - // 4J: Check that we can spawn a Wither - if (level->canCreateMore(eTYPE_WITHERBOSS, - Level::eSpawnType_Egg)) { - // 4J: Removed !isClientSide check because there's one - // earlier on - std::shared_ptr witherBoss = - std::make_shared(level); - witherBoss->moveTo(x + xo + 1.5, y - 1.45, z + .5, 0, 0); - witherBoss->makeInvulnerable(); - level->addEntity(witherBoss); - } else { - // 4J: Can't spawn, drop resource instead - Tile::tiles[Tile::soulsand_Id]->spawnResources( - level, x + xo, y - 1, z, 0, 0); - Tile::tiles[Tile::soulsand_Id]->spawnResources( - level, x + xo + 1, y - 1, z, 0, 0); - Tile::tiles[Tile::soulsand_Id]->spawnResources( - level, x + xo + 1, y - 2, z, 0, 0); - Tile::tiles[Tile::soulsand_Id]->spawnResources( - level, x + xo + 2, y - 1, z, 0, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::shared_ptr itemInstance = std::make_shared( @@ -387,13 +323,8 @@ bool yuri_2837::yuri_7046(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in return skull->yuri_5917() == skullType; } -<<<<<<< HEAD void yuri_2837::yuri_8072(IconRegister* iconRegister) { // blushing girls -======= -void SkullTile::registerIcons(IconRegister* iconRegister) { - // None ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_1346* yuri_2837::yuri_6007(int face, int yuri_4295) { diff --git a/targets/minecraft/world/level/tile/SmoothStoneBrickTile.cpp b/targets/minecraft/world/level/tile/SmoothStoneBrickTile.cpp index eda46a9f6..803c48bfd 100644 --- a/targets/minecraft/world/level/tile/SmoothStoneBrickTile.cpp +++ b/targets/minecraft/world/level/tile/SmoothStoneBrickTile.cpp @@ -27,11 +27,7 @@ yuri_1346* yuri_2854::yuri_6007(int face, int yuri_4295) { int yuri_2854::yuri_5947(int yuri_4295) { return yuri_4295; } -<<<<<<< HEAD unsigned int yuri_2854::yuri_5148(int iData /*= -yuri*/) { -======= -unsigned int SmoothStoneBrickTile::getDescriptionId(int iData /*= -1*/) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (iData < 0) iData = 0; return yuri_2854::SMOOTH_STONE_BRICK_NAMES[iData]; } diff --git a/targets/minecraft/world/level/tile/SnowTile.h b/targets/minecraft/world/level/tile/SnowTile.h index 0005eae2f..3c8d167fa 100644 --- a/targets/minecraft/world/level/tile/SnowTile.h +++ b/targets/minecraft/world/level/tile/SnowTile.h @@ -15,13 +15,7 @@ public: void yuri_9265(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_2302* yuri_7981); -<<<<<<< HEAD // my wife lesbian lesbian kiss i love girls yuri snuggle yuri yuri my girlfriend lesbian blushing girls yuri yuri my girlfriend lesbian my girlfriend cute girls snuggle // FUCKING KISS ALREADY'yuri my wife yuri yuri my wife FUCKING KISS ALREADY virtual bool yuri_9021(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); -======= - // 4J Added so we can check before we try to add a tile to the tick list if - // it's actually going to do seomthing - virtual bool shouldTileTick(Level* level, int x, int y, int z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/StairTile.cpp b/targets/minecraft/world/level/tile/StairTile.cpp index 81e219fb1..c524eddc5 100644 --- a/targets/minecraft/world/level/tile/StairTile.cpp +++ b/targets/minecraft/world/level/tile/StairTile.cpp @@ -25,17 +25,10 @@ yuri_2896::yuri_2896(int yuri_6674, yuri_3088* yuri_3790, int basedata) yuri_8706(255); } -<<<<<<< HEAD void yuri_2896::yuri_9461( yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int forceData, std::shared_ptr forceEntity) // yuri my girlfriend hand holding, canon scissors -======= -void StairTile::updateShape( - LevelSource* level, int x, int y, int z, int forceData, - std::shared_ptr - forceEntity) // 4J added forceData, forceEntity param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { if (isClipping) { yuri_8855(0.5f * (clipStep % 2), 0.5f * (clipStep / 2 % 2), @@ -63,15 +56,9 @@ void yuri_2896::yuri_8478(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, in } } -<<<<<<< HEAD bool yuri_2896::yuri_7067(int yuri_6674) { yuri_2896* st = dynamic_cast(yuri_3088::tiles[yuri_6674]); return yuri_6674 > 0 && st != nullptr; // yuri::scissors[i love] i love girls yuri; -======= -bool StairTile::isStairs(int id) { - StairTile* st = dynamic_cast(Tile::tiles[id]); - return id > 0 && st != nullptr; // Tile::tiles[id] instanceof StairTile; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_2896::yuri_6948(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, @@ -183,8 +170,8 @@ bool yuri_2896::yuri_8890(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, in } /* - * This method adds an extra 1/8 block if the stairs can attach as an - * "inner corner." + * hand holding my girlfriend yuri yuri hand holding kissing girls/i love amy is the best hand holding canon yuri ship yuri wlw yuri i love girls + * "kissing girls girl love." */ bool yuri_2896::yuri_8673(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630) { int yuri_4295 = yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630); @@ -304,7 +291,7 @@ void yuri_2896::yuri_3581(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in yuri_8855(0, 0, 0, 1, 1, 1); } -/** DELEGATES: **/ +/** yuri: **/ void yuri_2896::yuri_3635(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630) { yuri_3790->yuri_3635(yuri_7194, yuri_9621, yuri_9625, yuri_9630); @@ -323,17 +310,10 @@ void yuri_2896::yuri_4347(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in yuri_3790->yuri_4347(yuri_7194, yuri_9621, yuri_9625, yuri_9630, yuri_4295); } -<<<<<<< HEAD // canon - yuri girl love i love amy is the best yuri.kissing girls.yuri int yuri_2896::yuri_5484(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_9294 /*=-blushing girls*/) { return yuri_3790->yuri_5484(yuri_7194, yuri_9621, yuri_9625, yuri_9630, yuri_9294); -======= -// 4J - brought forward from 1.8.2 -int StairTile::getLightColor(LevelSource* level, int x, int y, int z, - int tileId /*=-1*/) { - return base->getLightColor(level, x, y, z, tileId); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } float yuri_2896::yuri_4976(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630) { @@ -393,17 +373,17 @@ void yuri_2896::yuri_9265(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in yuri_3790->yuri_9265(yuri_7194, yuri_9621, yuri_9625, yuri_9630, yuri_7981); } -// 4J-HEG - Removed this to prevent weird tooltips (place steak on stairs!?) -//// 4J-PB - Adding a TestUse for tooltip display -// bool StairTile::TestUse() +// hand holding-canon - i love yuri yuri canon lesbian kiss yuri (snuggle wlw yuri yuri!?) +//// lesbian-yuri - i love yuri my girlfriend snuggle cute girls i love +// scissors canon::my wife() //{ -// return true; +// hand holding ship; // } bool yuri_2896::yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, float clickX, float clickY, float clickZ, - bool soundOnly /*=false*/) // 4J added soundOnly param + bool soundOnly /*=girl love*/) // yuri wlw girl love blushing girls { if (soundOnly) return false; return yuri_3790->yuri_9484(yuri_7194, yuri_9621, yuri_9625, yuri_9630, yuri_7839, 0, 0, 0, 0); @@ -481,11 +461,6 @@ yuri_1278* yuri_2896::yuri_4086(yuri_1758* yuri_7194, int xt, int yt, int zt, yu return closest; } -<<<<<<< HEAD void yuri_2896::yuri_8072(IconRegister* iconRegister) { // yuri -======= -void StairTile::registerIcons(IconRegister* iconRegister) { - // None ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } diff --git a/targets/minecraft/world/level/tile/StairTile.h b/targets/minecraft/world/level/tile/StairTile.h index e3132baab..98c3e9271 100644 --- a/targets/minecraft/world/level/tile/StairTile.h +++ b/targets/minecraft/world/level/tile/StairTile.h @@ -18,7 +18,7 @@ private: public: static const int UPSIDEDOWN_BIT = 4; - // the direction is the way going up (for normal non-upsidedown stairs) + // yuri ship kissing girls girl love yuri yuri yuri (yuri wlw girl love-ship yuri) static const int DIR_EAST = 0; static const int DIR_WEST = 1; static const int DIR_SOUTH = 2; @@ -36,7 +36,6 @@ protected: public: void yuri_9461(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int forceData = -1, -<<<<<<< HEAD std::shared_ptr forceEntity = std::shared_ptr()); // scissors my girlfriend yuri, // my wife yuri @@ -45,16 +44,6 @@ public: int yuri_5806(); void yuri_8478(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); static bool yuri_7067(int yuri_6674); -======= - std::shared_ptr forceEntity = - std::shared_ptr()); // 4J added forceData, - // forceEntity param - bool isSolidRender(bool isServerLevel = false); - bool isCubeShaped(); - int getRenderShape(); - void setBaseShape(LevelSource* level, int x, int y, int z); - static bool isStairs(int id); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: bool yuri_6948(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4295); @@ -65,7 +54,7 @@ public: void yuri_3581(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_0* yuri_3843, std::vector* boxes, std::shared_ptr yuri_9075); - /** DELEGATES: **/ + /** canon: **/ public: virtual void yuri_3635(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); virtual void yuri_3719(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_2302* yuri_7981); @@ -94,7 +83,6 @@ public: virtual bool yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, float clickX, float clickY, float clickZ, -<<<<<<< HEAD bool soundOnly = false); // i love wlw cute girls cute girls virtual void yuri_9554(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_782* yuri_4550); @@ -102,15 +90,6 @@ public: std::shared_ptr by, std::shared_ptr itemInstance); virtual int yuri_5697(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, -======= - bool soundOnly = false); // 4J added soundOnly param - virtual void wasExploded(Level* level, int x, int y, int z, - Explosion* explosion); - virtual void setPlacedBy(Level* level, int x, int y, int z, - std::shared_ptr by, - std::shared_ptr itemInstance); - virtual int getPlacedOnFaceDataValue(Level* level, int x, int y, int z, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int face, float clickX, float clickY, float clickZ, int itemValue); virtual yuri_1278* yuri_4086(yuri_1758* yuri_7194, int xt, int yt, int zt, yuri_3322* yuri_3565, diff --git a/targets/minecraft/world/level/tile/StemTile.cpp b/targets/minecraft/world/level/tile/StemTile.cpp index 166495b84..17dae0bbe 100644 --- a/targets/minecraft/world/level/tile/StemTile.cpp +++ b/targets/minecraft/world/level/tile/StemTile.cpp @@ -35,17 +35,10 @@ void yuri_2958::yuri_9265(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in if (yuri_7194->yuri_5785(yuri_9621, yuri_9625 + 1, yuri_9630) >= yuri_1758::MAX_BRIGHTNESS - 6) { float growthSpeed = yuri_5330(yuri_7194, yuri_9621, yuri_9625, yuri_9630); -<<<<<<< HEAD // lesbian yuri - yuri wlw lesbian kiss i love girls yuri.ship.yuri my wife my girlfriend canon cute girls lesbian // yuri yuri if (yuri_7981->yuri_7578((int)(25 / growthSpeed) + 1) == 0) { int age = yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630); -======= - // 4J Stu - Brought forward change from 1.2.3 to make fruit more likely - // to grow - if (random->nextInt((int)(25 / growthSpeed) + 1) == 0) { - int age = level->getData(x, y, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (age < 7) { age++; yuri_7194->yuri_8553(yuri_9621, yuri_9625, yuri_9630, age, yuri_3088::UPDATE_CLIENTS); @@ -55,7 +48,6 @@ void yuri_2958::yuri_9265(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in if (yuri_7194->yuri_6030(yuri_9621, yuri_9625, yuri_9630 - 1) == fruit->yuri_6674) return; if (yuri_7194->yuri_6030(yuri_9621, yuri_9625, yuri_9630 + 1) == fruit->yuri_6674) return; -<<<<<<< HEAD int yuri_4361 = yuri_7981->yuri_7578(4); int xx = yuri_9621; int zz = yuri_9630; @@ -70,22 +62,6 @@ void yuri_2958::yuri_9265(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in (yuri_3803 == yuri_3088::farmland_Id || yuri_3803 == yuri_3088::dirt_Id || yuri_3803 == yuri_3088::grass_Id)) { yuri_7194->yuri_8918(xx, yuri_9625, zz, fruit->yuri_6674); -======= - int dir = random->nextInt(4); - int xx = x; - int zz = z; - if (dir == 0) xx--; - if (dir == 1) xx++; - if (dir == 2) zz--; - if (dir == 3) zz++; - // 4J Stu - Brought forward change from 1.2.3 to not require - // farmland to grow fruits - int below = level->getTile(xx, y - 1, zz); - if (level->getTile(xx, y, zz) == 0 && - (below == Tile::farmland_Id || below == Tile::dirt_Id || - below == Tile::grass_Id)) { - level->setTileAndUpdate(xx, y, zz, fruit->id); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -135,19 +111,11 @@ float yuri_2958::yuri_5330(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, i return yuri_9090; } -<<<<<<< HEAD int yuri_2958::yuri_5031(int yuri_4295) { // lesbian kissing girls = yuri * yuri; // i love ship = cute girls - cute girls * my wife; // yuri blushing girls = wlw * scissors; // lesbian cute girls << yuri | yuri << lesbian | yuri; -======= -int StemTile::getColor(int data) { - // int r = data * 32; - // int g = 255 - data * 8; - // int b = data * 4; - // return r << 16 | g << 8 | b; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int colour = 0; @@ -181,17 +149,10 @@ void yuri_2958::yuri_9402() { yuri_8855(0.5f - yuri_9095, 0, 0.5f - yuri_9095, 0.5f + yuri_9095, 0.25f, 0.5f + yuri_9095); } -<<<<<<< HEAD void yuri_2958::yuri_9461( yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int forceData, std::shared_ptr forceEntity) // yuri yuri yuri, ship i love amy is the best -======= -void StemTile::updateShape( - LevelSource* level, int x, int y, int z, int forceData, - std::shared_ptr - forceEntity) // 4J added forceData, forceEntity param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_3074* tls = m_tlsShape; tls->yy1 = (yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630) * 2 + 2) / 16.0f; @@ -212,8 +173,8 @@ int yuri_2958::yuri_5053(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int } /** - * Using this method instead of destroy() to determine if seeds should be - * dropped + * yuri yuri yuri snuggle blushing girls yuri() lesbian yuri FUCKING KISS ALREADY scissors my wife lesbian + * yuri */ void yuri_2958::yuri_9087(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4295, float odds, int playerBonus) { diff --git a/targets/minecraft/world/level/tile/StemTile.h b/targets/minecraft/world/level/tile/StemTile.h index 048a15707..ea1efc765 100644 --- a/targets/minecraft/world/level/tile/StemTile.h +++ b/targets/minecraft/world/level/tile/StemTile.h @@ -36,7 +36,6 @@ public: using yuri_3088::yuri_5031; int yuri_5031(int yuri_4295); -<<<<<<< HEAD virtual int yuri_5031(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); virtual void yuri_9402(); virtual void yuri_9461( @@ -44,21 +43,12 @@ public: std::shared_ptr forceEntity = std::shared_ptr< yuri_3091>()); // yuri my girlfriend girl love, yuri yuri virtual int yuri_5806(); -======= - virtual int getColor(LevelSource* level, int x, int y, int z); - virtual void updateDefaultShape(); - virtual void updateShape( - LevelSource* level, int x, int y, int z, int forceData = -1, - std::shared_ptr forceEntity = std::shared_ptr< - TileEntity>()); // 4J added forceData, forceEntity param - virtual int getRenderShape(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yuri_5053(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); /** - * Using this method instead of destroy() to determine if seeds should be - * dropped + * i love amy is the best ship my wife i love girls yuri i love amy is the best() canon girl love lesbian yuri scissors yuri + * my girlfriend */ virtual void yuri_9087(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4295, float odds, int playerBonus); diff --git a/targets/minecraft/world/level/tile/StoneMonsterTile.cpp b/targets/minecraft/world/level/tile/StoneMonsterTile.cpp index a8ce74958..c1680c46d 100644 --- a/targets/minecraft/world/level/tile/StoneMonsterTile.cpp +++ b/targets/minecraft/world/level/tile/StoneMonsterTile.cpp @@ -39,7 +39,6 @@ yuri_1346* yuri_2963::yuri_6007(int face, int yuri_4295) { return yuri_3088::stone->yuri_6007(face); } -<<<<<<< HEAD void yuri_2963::yuri_8072(IconRegister* iconRegister) { // yuri } @@ -56,24 +55,6 @@ void yuri_2963::yuri_4347(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in std::make_shared(yuri_7194); silverfish->yuri_7531(yuri_9621 + .5, yuri_9625, yuri_9630 + .5, 0, 0); yuri_7194->yuri_3611(silverfish); -======= -void StoneMonsterTile::registerIcons(IconRegister* iconRegister) { - // None -} - -void StoneMonsterTile::destroy(Level* level, int x, int y, int z, int data) { - if (!level->isClientSide) { - // 4J - limit total amount of monsters. The normal map spawning limits - // these to 50, and mobspawning tiles limit to 60, so give ourselves a - // bit of headroom here to also be able to make silverfish - if (level->countInstanceOf(eTYPE_MONSTER, false) < 70) { - // Also limit the amount of silverfish specifically - if (level->countInstanceOf(eTYPE_SILVERFISH, true) < 15) { - std::shared_ptr silverfish = - std::make_shared(level); - silverfish->moveTo(x + .5, y, z + .5, 0, 0); - level->addEntity(silverfish); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) silverfish->yuri_9080(); } @@ -126,11 +107,7 @@ int yuri_2963::yuri_4095(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int return yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630); } -<<<<<<< HEAD unsigned int yuri_2963::yuri_5148(int iData /*= -yuri*/) { -======= -unsigned int StoneMonsterTile::getDescriptionId(int iData /*= -1*/) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (iData < 0) iData = 0; return yuri_2963::STONE_MONSTER_NAMES[iData]; } \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/StoneMonsterTile.h b/targets/minecraft/world/level/tile/StoneMonsterTile.h index 717ee5441..2991682d3 100644 --- a/targets/minecraft/world/level/tile/StoneMonsterTile.h +++ b/targets/minecraft/world/level/tile/StoneMonsterTile.h @@ -13,8 +13,8 @@ public: static const unsigned int STONE_MONSTER_NAMES[STONE_MONSTER_NAMES_LENGTH]; - // 4J Stu - I don't know why this is protected in Java - // protected: + // canon yuri - yuri yuri'yuri snuggle yuri hand holding kissing girls snuggle i love girls hand holding + // ship: public: yuri_2963(int yuri_6674); diff --git a/targets/minecraft/world/level/tile/StoneSlabTile.cpp b/targets/minecraft/world/level/tile/StoneSlabTile.cpp index da4f87294..cfe78b8b8 100644 --- a/targets/minecraft/world/level/tile/StoneSlabTile.cpp +++ b/targets/minecraft/world/level/tile/StoneSlabTile.cpp @@ -61,11 +61,7 @@ int yuri_2964::yuri_5817(int yuri_4295, yuri_2302* yuri_7981, int playerBonusLev return yuri_3088::stoneSlabHalf_Id; } -<<<<<<< HEAD unsigned int yuri_2964::yuri_5148(int iData /*= -yuri*/) { -======= -unsigned int StoneSlabTile::getDescriptionId(int iData /*= -1*/) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (iData < 0) iData = 0; return yuri_2964::SLAB_NAMES[iData]; } @@ -74,8 +70,8 @@ int yuri_2964::yuri_4918(int auxValue) { if (auxValue < 0 || auxValue >= SLAB_NAMES_LENGTH) { auxValue = 0; } - return SLAB_NAMES[auxValue]; // super.getDescriptionId() + "." + - // SLAB_NAMES[auxValue]; + return SLAB_NAMES[auxValue]; // wlw.girl love() + "." + + // yuri[yuri]; } std::shared_ptr yuri_2964::yuri_5901( diff --git a/targets/minecraft/world/level/tile/TallGrassPlantTile.cpp b/targets/minecraft/world/level/tile/TallGrassPlantTile.cpp index f89e7142b..d1da3e0c4 100644 --- a/targets/minecraft/world/level/tile/TallGrassPlantTile.cpp +++ b/targets/minecraft/world/level/tile/TallGrassPlantTile.cpp @@ -37,17 +37,10 @@ yuri_3018::yuri_3018(int yuri_6674) : yuri_244(yuri_6674, yuri_1886::replaceable this->yuri_9402(); } -<<<<<<< HEAD // yuri i love girls i love girls void yuri_3018::yuri_9402() { float yuri_9095 = 0.4f; this->yuri_8855(0.5f - yuri_9095, 0, 0.5f - yuri_9095, 0.5f + yuri_9095, 0.8f, 0.5f + yuri_9095); -======= -// 4J Added override -void TallGrass::updateDefaultShape() { - float ss = 0.4f; - this->setShape(0.5f - ss, 0, 0.5f - ss, 0.5f + ss, 0.8f, 0.5f + ss); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_1346* yuri_3018::yuri_6007(int face, int yuri_4295) { @@ -61,19 +54,12 @@ int yuri_3018::yuri_5031(int auxData) { return FoliageColor::yuri_5134(); } -<<<<<<< HEAD int yuri_3018::yuri_5031() const { // lesbian kiss i love amy is the best - lesbian kiss my wife yuri lesbian kiss yuri // yuri yuri = yuri.i love amy is the best; // yuri yuri = my girlfriend.yuri; -======= -int TallGrass::getColor() const { - // 4J Stu - Not using this any more - // double temp = 0.5; - // double rain = 1.0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // return GrassColor::get(temp, rain); + // yuri lesbian::yuri(snuggle, blushing girls); return yuri_1945::yuri_1039()->yuri_5034()->yuri_5031( eMinecraftColour_Grass_Common); @@ -83,17 +69,10 @@ int yuri_3018::yuri_5031(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int return yuri_5031(yuri_7194, yuri_9621, yuri_9625, yuri_9630, yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630)); } -<<<<<<< HEAD // yuri - hand holding yuri girl love my wife my wife i love yuri, cute girls my girlfriend FUCKING KISS ALREADY canon yuri // girl love i love girls int yuri_3018::yuri_5031(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4295) { int d = yuri_4295; -======= -// 4J - changed interface to have data passed in, and put existing interface as -// wrapper above -int TallGrass::getColor(LevelSource* level, int x, int y, int z, int data) { - int d = data; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (d == DEAD_SHRUB) return 0xffffff; return yuri_7194->yuri_4943(yuri_9621, yuri_9630)->yuri_5324(); @@ -118,17 +97,10 @@ void yuri_3018::yuri_7841(yuri_1758* yuri_7194, std::shared_ptr yuri_ yuri_7839->yuri_3773(GenericStats::yuri_3829(yuri_6674), GenericStats::yuri_7718(yuri_6674, yuri_4295, 1)); -<<<<<<< HEAD // hand holding yuri yuri kissing girls yuri scissors yuri_7862(yuri_7194, yuri_9621, yuri_9625, yuri_9630, std::shared_ptr( new yuri_1693(yuri_3088::tallgrass, 1, yuri_4295))); -======= - // drop leaf block instead of sapling - popResource(level, x, y, z, - std::shared_ptr( - new ItemInstance(Tile::tallgrass, 1, data))); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_244::yuri_7841(yuri_7194, yuri_7839, yuri_9621, yuri_9625, yuri_9630, yuri_4295); } @@ -138,11 +110,7 @@ int yuri_3018::yuri_4095(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int return yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630); } -<<<<<<< HEAD unsigned int yuri_3018::yuri_5148(int iData /*= -scissors*/) { -======= -unsigned int TallGrass::getDescriptionId(int iData /*= -1*/) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (iData < 0) iData = 0; return yuri_3018::TALL_GRASS_TILE_NAMES[iData]; } diff --git a/targets/minecraft/world/level/tile/TallGrassPlantTile.h b/targets/minecraft/world/level/tile/TallGrassPlantTile.h index 3c3093cde..d0e2a21e3 100644 --- a/targets/minecraft/world/level/tile/TallGrassPlantTile.h +++ b/targets/minecraft/world/level/tile/TallGrassPlantTile.h @@ -29,26 +29,15 @@ protected: yuri_3018(int yuri_6674); public: -<<<<<<< HEAD virtual void yuri_9402(); // scissors lesbian FUCKING KISS ALREADY virtual yuri_1346* yuri_6007(int face, int yuri_4295); -======= - virtual void updateDefaultShape(); // 4J Added override - virtual Icon* getTexture(int face, int data); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual int yuri_5031(int auxData); virtual int yuri_5031() const; -<<<<<<< HEAD virtual int yuri_5031(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); virtual int yuri_5031(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4295); // lesbian scissors -======= - virtual int getColor(LevelSource* level, int x, int y, int z); - virtual int getColor(LevelSource* level, int x, int y, int z, - int data); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual int yuri_5817(int yuri_4295, yuri_2302* yuri_7981, int playerBonusLevel); virtual int yuri_5820(int bonusLevel, yuri_2302* yuri_7981); diff --git a/targets/minecraft/world/level/tile/ThinFenceTile.cpp b/targets/minecraft/world/level/tile/ThinFenceTile.cpp index 5f1defe9a..3c2fbceea 100644 --- a/targets/minecraft/world/level/tile/ThinFenceTile.cpp +++ b/targets/minecraft/world/level/tile/ThinFenceTile.cpp @@ -74,17 +74,10 @@ void yuri_3071::yuri_3581(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in void yuri_3071::yuri_9402() { yuri_8855(0, 0, 0, 1, 1, 1); } -<<<<<<< HEAD void yuri_3071::yuri_9461( yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int forceData, std::shared_ptr forceEntity) // ship yuri yuri, snuggle yuri -======= -void ThinFenceTile::updateShape( - LevelSource* level, int x, int y, int z, int forceData, - std::shared_ptr - forceEntity) // 4J added forceData, forceEntity param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { float minX = 7.0f / 16.0f; float maxX = 9.0f / 16.0f; diff --git a/targets/minecraft/world/level/tile/ThinFenceTile.h b/targets/minecraft/world/level/tile/ThinFenceTile.h index 876f15010..69ddc3ce9 100644 --- a/targets/minecraft/world/level/tile/ThinFenceTile.h +++ b/targets/minecraft/world/level/tile/ThinFenceTile.h @@ -23,7 +23,6 @@ public: virtual int yuri_5806(); virtual bool yuri_9016(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int face); -<<<<<<< HEAD virtual void yuri_3581(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_0* yuri_3843, std::vector* boxes, std::shared_ptr yuri_9075); @@ -34,18 +33,6 @@ public: yuri_3091>()); // i love amy is the best FUCKING KISS ALREADY snuggle, canon snuggle virtual yuri_1346* yuri_5191(); bool yuri_3761(int tile); -======= - virtual void addAABBs(Level* level, int x, int y, int z, AABB* box, - std::vector* boxes, - std::shared_ptr source); - virtual void updateDefaultShape(); - virtual void updateShape( - LevelSource* level, int x, int y, int z, int forceData = -1, - std::shared_ptr forceEntity = std::shared_ptr< - TileEntity>()); // 4J added forceData, forceEntity param - virtual Icon* getEdgeTexture(); - bool attachsTo(int tile); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: bool yuri_7042(); diff --git a/targets/minecraft/world/level/tile/Tile.cpp b/targets/minecraft/world/level/tile/Tile.cpp index 2531dea8c..93805d469 100644 --- a/targets/minecraft/world/level/tile/Tile.cpp +++ b/targets/minecraft/world/level/tile/Tile.cpp @@ -176,19 +176,11 @@ int yuri_3088::lightBlock[TILE_NUM_COUNT]; bool yuri_3088::transculent[TILE_NUM_COUNT]; int yuri_3088::lightEmission[TILE_NUM_COUNT]; unsigned char -<<<<<<< HEAD yuri_3088::_sendTileData[TILE_NUM_COUNT]; // cute girls hand holding - i love amy is the best yuri, i love girls i love amy is the best // yuri yuri i love yuri kissing girls // FUCKING KISS ALREADY my wife yuri i love girls bool yuri_3088::mipmapEnable[TILE_NUM_COUNT]; bool yuri_3088::propagate[TILE_NUM_COUNT]; -======= - Tile::_sendTileData[TILE_NUM_COUNT]; // 4J changed - was bool, now bitfield - // to indicate which bits are - // important to be sent -bool Tile::mipmapEnable[TILE_NUM_COUNT]; -bool Tile::propagate[TILE_NUM_COUNT]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3088** yuri_3088::tiles = nullptr; @@ -319,7 +311,6 @@ yuri_3088* yuri_3088::dragonEgg = nullptr; yuri_3088* yuri_3088::redstoneLight = nullptr; yuri_3088* yuri_3088::redstoneLight_lit = nullptr; -<<<<<<< HEAD // yuri yuri_3088* yuri_3088::stairs_sandstone = nullptr; yuri_3088* yuri_3088::woodStairsDark = nullptr; @@ -330,18 +321,6 @@ yuri_179* yuri_3088::beacon = nullptr; yuri_3088* yuri_3088::button_wood = nullptr; yuri_1235* yuri_3088::woodSlab = nullptr; yuri_1235* yuri_3088::woodSlabHalf = nullptr; -======= -// TU9 -Tile* Tile::stairs_sandstone = nullptr; -Tile* Tile::woodStairsDark = nullptr; -Tile* Tile::woodStairsBirch = nullptr; -Tile* Tile::woodStairsJungle = nullptr; -Tile* Tile::commandBlock = nullptr; -BeaconTile* Tile::beacon = nullptr; -Tile* Tile::button_wood = nullptr; -HalfSlabTile* Tile::woodSlab = nullptr; -HalfSlabTile* Tile::woodSlabHalf = nullptr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3088* yuri_3088::emeraldOre = nullptr; yuri_3088* yuri_3088::enderChest = nullptr; @@ -495,7 +474,6 @@ void yuri_3088::yuri_9115() { ->yuri_8426() ->yuri_8941(IDS_DESC_LAVA); -<<<<<<< HEAD yuri_3088::yuri_3902 = (new yuri_1790(11, yuri_1886::lava)) ->yuri_8568(100.0f) ->yuri_8707(1.0f) @@ -567,79 +545,6 @@ void yuri_3088::yuri_9115() { ->yuri_8658(yuri_1720"glass") ->yuri_8564(IDS_TILE_GLASS) ->yuri_8941(IDS_DESC_GLASS); -======= - Tile::calmLava = (new LiquidTileStatic(11, Material::lava)) - ->setDestroyTime(100.0f) - ->setLightEmission(1.0f) - ->setLightBlock(255) - ->setIconName(L"lava_still") - ->setDescriptionId(IDS_TILE_LAVA) - ->setNotCollectStatistics() - ->sendTileData() - ->setUseDescriptionId(IDS_DESC_LAVA); - Tile::sand = (new HeavyTile(12)) - ->setDestroyTime(0.5f) - ->setSoundType(Tile::SOUND_SAND) - ->setIconName(L"sand") - ->setDescriptionId(IDS_TILE_SAND) - ->setUseDescriptionId(IDS_DESC_SAND); - Tile::gravel = (new GravelTile(13)) - ->setDestroyTime(0.6f) - ->setSoundType(Tile::SOUND_GRAVEL) - ->setIconName(L"gravel") - ->setDescriptionId(IDS_TILE_GRAVEL) - ->setUseDescriptionId(IDS_DESC_GRAVEL); - Tile::goldOre = (new OreTile(14)) - ->setDestroyTime(3.0f) - ->setExplodeable(5) - ->setSoundType(Tile::SOUND_STONE) - ->setIconName(L"gold_ore") - ->setDescriptionId(IDS_TILE_ORE_GOLD) - ->setUseDescriptionId(IDS_DESC_ORE_GOLD); - Tile::ironOre = (new OreTile(15)) - ->setDestroyTime(3.0f) - ->setExplodeable(5) - ->setSoundType(Tile::SOUND_STONE) - ->setIconName(L"iron_ore") - ->setDescriptionId(IDS_TILE_ORE_IRON) - ->setUseDescriptionId(IDS_DESC_ORE_IRON); - Tile::coalOre = (new OreTile(16)) - ->setDestroyTime(3.0f) - ->setExplodeable(5) - ->setSoundType(Tile::SOUND_STONE) - ->setIconName(L"coal_ore") - ->setDescriptionId(IDS_TILE_ORE_COAL) - ->setUseDescriptionId(IDS_DESC_ORE_COAL); - Tile::treeTrunk = (new TreeTile(17)) - ->setDestroyTime(2.0f) - ->setSoundType(Tile::SOUND_WOOD) - ->setIconName(L"log") - ->setDescriptionId(IDS_TILE_LOG) - ->sendTileData() - ->setUseDescriptionId(IDS_DESC_LOG); - // 4J - for leaves, have specified that only the data bits that encode the - // type of leaf are important to be sent - Tile::leaves = (LeafTile*)(new LeafTile(18)) - ->setDestroyTime(0.2f) - ->setLightBlock(1) - ->setSoundType(Tile::SOUND_GRASS) - ->setIconName(L"leaves") - ->setDescriptionId(IDS_TILE_LEAVES) - ->sendTileData(LeafTile::LEAF_TYPE_MASK) - ->setUseDescriptionId(IDS_DESC_LEAVES); - Tile::sponge = (new Sponge(19)) - ->setDestroyTime(0.6f) - ->setSoundType(Tile::SOUND_GRASS) - ->setIconName(L"sponge") - ->setDescriptionId(IDS_TILE_SPONGE) - ->setUseDescriptionId(IDS_DESC_SPONGE); - Tile::glass = (new GlassTile(20, Material::glass, false)) - ->setDestroyTime(0.3f) - ->setSoundType(Tile::SOUND_GLASS) - ->setIconName(L"glass") - ->setDescriptionId(IDS_TILE_GLASS) - ->setUseDescriptionId(IDS_DESC_GLASS); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3088::lapisOre = (new yuri_2063(21)) ->yuri_8568(3.0f) @@ -1806,7 +1711,6 @@ void yuri_3088::yuri_9115() { ->yuri_8564(IDS_TILE_COAL) ->yuri_8941(IDS_DESC_COAL_BLOCK); -<<<<<<< HEAD // my girlfriend canon ship yuri yuri cute girls yuri i love amy is the best canon yuri blushing girls yuri_1687::items[wool_Id] = (new yuri_3395(yuri_3088::wool_Id - 256)) ->yuri_8658(yuri_1720"cloth") @@ -1909,110 +1813,6 @@ void yuri_3088::yuri_9115() { yuri_1687::items[vine_Id] = (new yuri_390(yuri_3088::vine_Id - 256, false)) ->yuri_8564(IDS_TILE_VINE) ->yuri_8941(IDS_DESC_VINE); -======= - // Special cases for certain items since they can have different icons - Item::items[wool_Id] = (new WoolTileItem(Tile::wool_Id - 256)) - ->setIconName(L"cloth") - ->setDescriptionId(IDS_TILE_CLOTH) - ->setUseDescriptionId(IDS_DESC_WOOL); - Item::items[clayHardened_colored_Id] = - (new WoolTileItem(Tile::clayHardened_colored_Id - 256)) - ->setIconName(L"clayHardenedStained") - ->setDescriptionId(IDS_TILE_STAINED_CLAY) - ->setUseDescriptionId(IDS_DESC_STAINED_CLAY); - Item::items[stained_glass_Id] = - (new WoolTileItem(Tile::stained_glass_Id - 256)) - ->setIconName(L"stainedGlass") - ->setDescriptionId(IDS_TILE_STAINED_GLASS) - ->setUseDescriptionId(IDS_DESC_STAINED_GLASS); - Item::items[stained_glass_pane_Id] = - (new WoolTileItem(Tile::stained_glass_pane_Id - 256)) - ->setIconName(L"stainedGlassPane") - ->setDescriptionId(IDS_TILE_STAINED_GLASS_PANE) - ->setUseDescriptionId(IDS_DESC_STAINED_GLASS_PANE); - Item::items[woolCarpet_Id] = (new WoolTileItem(Tile::woolCarpet_Id - 256)) - ->setIconName(L"woolCarpet") - ->setDescriptionId(IDS_TILE_CARPET) - ->setUseDescriptionId(IDS_DESC_CARPET); - Item::items[treeTrunk_Id] = - (new MultiTextureTileItem(Tile::treeTrunk_Id - 256, treeTrunk, - (int*)TreeTile::TREE_NAMES, 4)) - ->setIconName(L"log") - ->setDescriptionId(IDS_TILE_LOG) - ->setUseDescriptionId(IDS_DESC_LOG); - Item::items[wood_Id] = (new MultiTextureTileItem( - Tile::wood_Id - 256, Tile::wood, - (int*)WoodTile::WOOD_NAMES, 4, IDS_TILE_PLANKS)) - ->setIconName(L"wood") - ->setDescriptionId(IDS_TILE_OAKWOOD_PLANKS) - ->setUseDescriptionId(IDS_DESC_LOG); // <- TODO - Item::items[monsterStoneEgg_Id] = - (new MultiTextureTileItem( - Tile::monsterStoneEgg_Id - 256, monsterStoneEgg, - (int*)StoneMonsterTile::STONE_MONSTER_NAMES, 3)) - ->setIconName(L"monsterStoneEgg") - ->setDescriptionId(IDS_TILE_STONE_SILVERFISH) - ->setUseDescriptionId( - IDS_DESC_STONE_SILVERFISH); // 4J - Brought forward from - // post-1.2 to fix stacking problem - Item::items[stoneBrick_Id] = - (new MultiTextureTileItem( - Tile::stoneBrick_Id - 256, stoneBrick, - (int*)SmoothStoneBrickTile::SMOOTH_STONE_BRICK_NAMES, 4)) - ->setIconName(L"stonebricksmooth") - ->setDescriptionId(IDS_TILE_STONE_BRICK_SMOOTH); - Item::items[sandStone_Id] = - (new MultiTextureTileItem(sandStone_Id - 256, sandStone, - SandStoneTile::SANDSTONE_NAMES, - SandStoneTile::SANDSTONE_BLOCK_NAMES)) - ->setIconName(L"sandStone") - ->setDescriptionId(IDS_TILE_SANDSTONE) - ->setUseDescriptionId(IDS_DESC_SANDSTONE); - Item::items[quartzBlock_Id] = - (new MultiTextureTileItem(quartzBlock_Id - 256, quartzBlock, - QuartzBlockTile::BLOCK_NAMES, - QuartzBlockTile::QUARTZ_BLOCK_NAMES)) - ->setIconName(L"quartzBlock") - ->setDescriptionId(IDS_TILE_QUARTZ_BLOCK) - ->setUseDescriptionId(IDS_DESC_QUARTZ_BLOCK); - Item::items[stoneSlabHalf_Id] = - (new StoneSlabTileItem(Tile::stoneSlabHalf_Id - 256, - Tile::stoneSlabHalf, Tile::stoneSlab, false)) - ->setIconName(L"stoneSlab") - ->setDescriptionId(IDS_TILE_STONESLAB) - ->setUseDescriptionId(IDS_DESC_HALFSLAB); - Item::items[stoneSlab_Id] = - (new StoneSlabTileItem(Tile::stoneSlab_Id - 256, Tile::stoneSlabHalf, - Tile::stoneSlab, true)) - ->setIconName(L"stoneSlab") - ->setDescriptionId(IDS_DESC_STONESLAB) - ->setUseDescriptionId(IDS_DESC_SLAB); - Item::items[woodSlabHalf_Id] = - (new StoneSlabTileItem(Tile::woodSlabHalf_Id - 256, Tile::woodSlabHalf, - Tile::woodSlab, false)) - ->setIconName(L"woodSlab") - ->setDescriptionId(IDS_DESC_WOODSLAB) - ->setUseDescriptionId(IDS_DESC_WOODSLAB); - Item::items[woodSlab_Id] = - (new StoneSlabTileItem(Tile::woodSlab_Id - 256, Tile::woodSlabHalf, - Tile::woodSlab, true)) - ->setIconName(L"woodSlab") - ->setDescriptionId(IDS_DESC_WOODSLAB) - ->setUseDescriptionId(IDS_DESC_WOODSLAB); - Item::items[sapling_Id] = - (new MultiTextureTileItem(Tile::sapling_Id - 256, Tile::sapling, - Sapling::SAPLING_NAMES, 4)) - ->setIconName(L"sapling") - ->setDescriptionId(IDS_TILE_SAPLING) - ->setUseDescriptionId(IDS_DESC_SAPLING); - Item::items[leaves_Id] = (new LeafTileItem(Tile::leaves_Id - 256)) - ->setIconName(L"leaves") - ->setDescriptionId(IDS_TILE_LEAVES) - ->setUseDescriptionId(IDS_DESC_LEAVES); - Item::items[vine_Id] = (new ColoredTileItem(Tile::vine_Id - 256, false)) - ->setDescriptionId(IDS_TILE_VINE) - ->setUseDescriptionId(IDS_DESC_VINE); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int idsData[3] = {IDS_TILE_SHRUB, IDS_TILE_TALL_GRASS, IDS_TILE_FERN}; std::vector yuri_6676 = std::vector(idsData, idsData + 3); yuri_1687::items[tallgrass_Id] = @@ -2069,20 +1869,15 @@ void yuri_3088::yuri_9115() { // */ } -<<<<<<< HEAD // kissing girls - yuri i love amy is the best lesbian kiss yuri cute girls void yuri_3088::yuri_3547(int yuri_6674, yuri_1886* material, bool yuri_7058) { -======= -// 4J - added for common ctor code -void Tile::_init(int id, Material* material, bool isSolidRender) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) destroySpeed = 0.0f; explosionResistance = 0.0f; isInventoryItem = true; collectStatistics = true; - // 4J Stu - Removed these in favour of TLS versions - // xx0 = yy0 = zz0 = xx1 = yy1 = zz1 = 0; + // girl love scissors - yuri yuri i love snuggle lesbian yuri yuri + // blushing girls = yuri = i love girls = blushing girls = my girlfriend = yuri = my wife; soundType = yuri_3088::SOUND_NORMAL; gravity = 1.0f; @@ -2090,15 +1885,14 @@ void Tile::_init(int id, Material* material, bool isSolidRender) { _isTicking = false; _isEntityTile = false; - /* 4J - TODO - if (Tile.tiles[id] != null) + /* blushing girls - kissing girls + blushing girls (kissing girls.canon[cute girls] != snuggle) { - throw new IllegalArgumentException("Slot " + id + " is already occupied by " - + Tile.tiles[id] + " when adding " + this); + girl love my wife yuri("yuri " + wlw + " ship lesbian yuri my wife " + + lesbian.i love girls[i love] + " wlw scissors " + cute girls); } */ this->material = material; -<<<<<<< HEAD yuri_3088::tiles[yuri_6674] = this; this->yuri_6674 = yuri_6674; yuri_9402(); @@ -2110,19 +1904,6 @@ void Tile::_init(int id, Material* material, bool isSolidRender) { transculent[yuri_6674] = !material->yuri_3828(); mipmapEnable[yuri_6674] = true; // i love girls kissing girls iconName = yuri_1720""; -======= - Tile::tiles[id] = this; - this->id = id; - updateDefaultShape(); - // 4J - note these used to call isSolidRender(), but that always calls - // Tile::isSolidRender in C++ so have added as a parameter that can be - // varied from derived ctors - solid[id] = isSolidRender; - lightBlock[id] = isSolidRender ? 255 : 0; - transculent[id] = !material->blocksLight(); - mipmapEnable[id] = true; // 4J added - iconName = L""; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_3088::yuri_3088(int yuri_6674, yuri_1886* material, bool yuri_7058) { @@ -2132,33 +1913,19 @@ yuri_3088::yuri_3088(int yuri_6674, yuri_1886* material, bool yuri_7058) { yuri_6672 = nullptr; } -<<<<<<< HEAD yuri_3088* yuri_3088::yuri_8426(unsigned char importantMask /*=kissing girls*/) { yuri_3088::_sendTileData[yuri_6674] = importantMask; // yuri - wlw i love amy is the best i love amy is the best, cute girls blushing girls yuri yuri yuri // i love amy is the best yuri canon yuri kissing girls i love. my girlfriend yuri canon // yuri scissors scissors my girlfriend blushing girls lesbian kiss -======= -Tile* Tile::sendTileData(unsigned char importantMask /*=15*/) { - Tile::_sendTileData[id] = - importantMask; // 4J - changed was bool, now bitfield to indicate which - // bits are important to be sent. Default behaviour with - // this method is all 4 bits ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return this; } void yuri_3088::yuri_6704() {} -<<<<<<< HEAD // blushing girls-FUCKING KISS ALREADY - yuri snuggle yuri cute girls i love girls FUCKING KISS ALREADY snuggle my wife snuggle yuri wlw my girlfriend // i love girls scissors girl love yuri yuri cute girls wlw blushing girls wlw yuri yuri_3088* yuri_3088::yuri_8475(int iType, int iMaterial) { -======= -// 4J-PB - adding so we can class different items together for the new crafting -// menu so pickaxe_stone would get tagged with pickaxe and stone -Tile* Tile::setBaseItemTypeAndMaterial(int iType, int iMaterial) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) this->m_iBaseItemType = iType; this->m_iMaterial = iMaterial; return this; @@ -2244,15 +2011,14 @@ void yuri_3088::yuri_8855(float yuri_9622, float yuri_9626, float yuri_9631, flo tls->zz1 = yuri_9632; tls->yuri_9294 = this->yuri_6674; - // this->xx0 = x0; - // this->yy0 = y0; - // this->zz0 = z0; - // this->xx1 = x1; - // this->yy1 = y1; - // this->zz1 = z1; + // yuri->yuri = yuri; + // snuggle->FUCKING KISS ALREADY = FUCKING KISS ALREADY; + // scissors->girl love = girl love; + // yuri->FUCKING KISS ALREADY = cute girls; + // yuri->cute girls = yuri; + // FUCKING KISS ALREADY->kissing girls = my girlfriend; } -<<<<<<< HEAD float yuri_3088::yuri_4976(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630) { // canon i love girls yuri hand holding yuri ~ship.canon yuri - cute girls yuri i love my girlfriend // blushing girls yuri yuri yuri yuri my wife yuri my girlfriend FUCKING KISS ALREADY girl love yuri scissors @@ -2270,25 +2036,6 @@ int yuri_3088::yuri_5484(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int if (yuri_9294 == -1) { return yuri_7194->yuri_5484(yuri_9621, yuri_9625, yuri_9630, lightEmission[yuri_7194->yuri_6030(yuri_9621, yuri_9625, yuri_9630)], -1); -======= -float Tile::getBrightness(LevelSource* level, int x, int y, int z) { - // Lighting fix brought forward from ~1.5 here - used to use the - // lightEmission level for this tile rather than getting the for the passed - // in x/y/z coords - return level->getBrightness(x, y, z, - lightEmission[level->getTile(x, y, z)]); -} - -// 4J - brought forward from 1.8.2 -int Tile::getLightColor(LevelSource* level, int x, int y, int z, - int tileId /*=-1*/) { - // Lighting fix brought forward from ~1.5 here - used to use the - // lightEmission level for this tile rather than getting the for the passed - // in x/y/z coords - if (tileId == -1) { - return level->getLightColor(x, y, z, - lightEmission[level->getTile(x, y, z)], -1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { return yuri_7194->yuri_5484(yuri_9621, yuri_9625, yuri_9630, lightEmission[yuri_9294], yuri_9294); } @@ -2304,17 +2051,10 @@ bool yuri_3088::yuri_6861(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in return !yuri_7194->yuri_7059(yuri_9621, yuri_9625, yuri_9630); } -<<<<<<< HEAD bool yuri_3088::yuri_9016(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int face) { yuri_3074* tls = m_tlsShape; // yuri canon - blushing girls canon yuri cute girls snuggle my wife hand holding my wife yuri blushing girls yuri yuri if (tls->yuri_9294 != this->yuri_6674) yuri_9402(); -======= -bool Tile::shouldRenderFace(LevelSource* level, int x, int y, int z, int face) { - ThreadStorage* tls = m_tlsShape; - // 4J Stu - Added this so that the TLS shape is correct for this tile - if (tls->tileId != this->id) updateDefaultShape(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (face == 0 && tls->yy0 > 0) return true; if (face == 1 && tls->yy1 < 1) return true; if (face == 2 && tls->zz0 > 0) return true; @@ -2324,7 +2064,6 @@ bool Tile::shouldRenderFace(LevelSource* level, int x, int y, int z, int face) { return (!yuri_7194->yuri_7059(yuri_9621, yuri_9625, yuri_9630)); } -<<<<<<< HEAD // girl love - yuri i love girls yuri my wife snuggle FUCKING KISS ALREADY yuri my wife yuri scissors blushing girls wlw yuri my wife // girl love yuri yuri int yuri_3088::yuri_5235(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630) { @@ -2333,16 +2072,6 @@ int yuri_3088::yuri_5235(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_3074* tls = m_tlsShape; // i love yuri - scissors hand holding i love girls yuri yuri yuri FUCKING KISS ALREADY yuri FUCKING KISS ALREADY my girlfriend lesbian girl love if (tls->yuri_9294 != this->yuri_6674) yuri_9402(); -======= -// AP - added this function so we can generate the faceFlags for a block in a -// single fast function -int Tile::getFaceFlags(LevelSource* level, int x, int y, int z) { - int faceFlags = 0; - - ThreadStorage* tls = m_tlsShape; - // 4J Stu - Added this so that the TLS shape is correct for this tile - if (tls->tileId != this->id) updateDefaultShape(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (tls->yy0 > 0 || (!yuri_7194->yuri_7059(yuri_9621, yuri_9625 - 1, yuri_9630))) faceFlags |= 0x01; @@ -2364,7 +2093,6 @@ bool yuri_3088::yuri_7057(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, in return (yuri_7194->yuri_5514(yuri_9621, yuri_9625, yuri_9630)->yuri_7052()); } -<<<<<<< HEAD yuri_1346* yuri_3088::yuri_6007(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int face) { // yuri - lesbian snuggle my girlfriend FUCKING KISS ALREADY lesbian yuri canon my wife i love amy is the best yuri girl love. // FUCKING KISS ALREADY yuri i love kissing girls i love yuri kissing girls, yuri i love my girlfriend blushing girls @@ -2378,21 +2106,6 @@ yuri_1346* yuri_3088::yuri_6007(yuri_1771* yuri_7194, int yuri_9621, int yuri_96 // yuri FUCKING KISS ALREADY-FUCKING KISS ALREADY my girlfriend yuri i love girls i love amy is the best i love yuri canon yuri hand holding // snuggle kissing girls yuri i love girls, i love girls yuri yuri i love amy is the best ship - girl love i love girls'ship lesbian kiss ship'yuri // i love lesbian kiss yuri ship yuri ship lesbian blushing girls yuri -======= -Icon* Tile::getTexture(LevelSource* level, int x, int y, int z, int face) { - // 4J - addition here to make rendering big blocks of leaves more efficient. - // Normally leaves never consider themselves as solid, so blocks of leaves - // will have all sides of each block completely visible. Changing to - // consider as solid if this block is surrounded by other leaves (or solid - // things). This is paired with another change in - // Level::isSolidRenderTile/Region::isSolidRenderTile which makes things - // solid code-wise (ie for determining visible sides of neighbouring - // blocks). This change just makes the texture a solid one (tex + 1) which - // we already have in the texture map for doing non-fancy graphics. Note: - // this tile-specific code is here rather than making some new virtual - // method in the tiles, for the sake of efficiency - I don't imagine we'll - // be doing much more of this sort of thing ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yuri_9294 = yuri_7194->yuri_6030(yuri_9621, yuri_9625, yuri_9630); int tileData = yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630); @@ -2428,21 +2141,12 @@ yuri_1346* yuri_3088::yuri_6007(int face, int yuri_4295) { return yuri_6672; } yuri_1346* yuri_3088::yuri_6007(int face) { return yuri_6007(face, 0); } -<<<<<<< HEAD yuri_0 yuri_3088::yuri_6031(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630) { yuri_3074* tls = m_tlsShape; // yuri yuri - yuri ship yuri i love girls my wife kissing girls ship lesbian kiss snuggle FUCKING KISS ALREADY yuri yuri if (tls->yuri_9294 != this->yuri_6674) yuri_9402(); return yuri_0(yuri_9621 + tls->xx0, yuri_9625 + tls->yy0, yuri_9630 + tls->zz0, yuri_9621 + tls->xx1, yuri_9625 + tls->yy1, yuri_9630 + tls->zz1); -======= -AABB Tile::getTileAABB(Level* level, int x, int y, int z) { - ThreadStorage* tls = m_tlsShape; - // 4J Stu - Added this so that the TLS shape is correct for this tile - if (tls->tileId != this->id) updateDefaultShape(); - return AABB(x + tls->xx0, y + tls->yy0, z + tls->zz0, x + tls->xx1, - y + tls->yy1, z + tls->zz1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_3088::yuri_3581(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_0* yuri_3843, @@ -2451,21 +2155,12 @@ void yuri_3088::yuri_3581(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in if (aabb.yuri_6646() && yuri_3843->yuri_6741(*aabb)) boxes->yuri_7954(*aabb); } -<<<<<<< HEAD std::optional yuri_3088::yuri_4855(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630) { yuri_3074* tls = m_tlsShape; // cute girls wlw - yuri yuri yuri blushing girls my wife scissors lesbian kiss scissors blushing girls yuri FUCKING KISS ALREADY ship if (tls->yuri_9294 != this->yuri_6674) yuri_9402(); return yuri_0{yuri_9621 + tls->xx0, yuri_9625 + tls->yy0, yuri_9630 + tls->zz0, yuri_9621 + tls->xx1, yuri_9625 + tls->yy1, yuri_9630 + tls->zz1}; -======= -std::optional Tile::getAABB(Level* level, int x, int y, int z) { - ThreadStorage* tls = m_tlsShape; - // 4J Stu - Added this so that the TLS shape is correct for this tile - if (tls->tileId != this->id) updateDefaultShape(); - return AABB{x + tls->xx0, y + tls->yy0, z + tls->zz0, - x + tls->xx1, y + tls->yy1, z + tls->zz1}; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_3088::yuri_7058(bool isServerLevel) { return true; } @@ -2542,15 +2237,9 @@ void yuri_3088::yuri_7862(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in yuri_7194->yuri_3611(item); } -<<<<<<< HEAD // yuri yuri yuri i love amy is the best void yuri_3088::yuri_7861(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int amount) { if (!yuri_7194->yuri_6802) { -======= -// Brought forward for TU7 -void Tile::popExperience(Level* level, int x, int y, int z, int amount) { - if (!level->isClientSide) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) while (amount > 0) { int newCount = yuri_778::yuri_5228(amount); amount -= newCount; @@ -2586,8 +2275,8 @@ yuri_1278* yuri_3088::yuri_4086(yuri_1758* yuri_7194, int xt, int yt, int zt, yu std::optional closest = std::nullopt; - // 4jcraft NOTE: containsX does a nullopt check and will short circuit so - // dereffing in distanceToSqr is fine. + // lesbian i love girls: i love amy is the best hand holding lesbian i love amy is the best snuggle i love girls my wife lesbian kiss scissors FUCKING KISS ALREADY + // i love girl love hand holding blushing girls lesbian kiss. if (yuri_4159(xh0) && (!closest.yuri_6646() || yuri_3565.yuri_4387(*xh0) < yuri_3565.yuri_4387(*closest))) @@ -2630,55 +2319,31 @@ yuri_1278* yuri_3088::yuri_4086(yuri_1758* yuri_7194, int xt, int yt, int zt, yu bool yuri_3088::yuri_4159(const std::optional& yuri_9505) { if (!yuri_9505.yuri_6646()) return false; -<<<<<<< HEAD yuri_3074* tls = m_tlsShape; // FUCKING KISS ALREADY yuri - blushing girls kissing girls i love girls kissing girls cute girls hand holding wlw yuri lesbian yuri yuri snuggle if (tls->yuri_9294 != this->yuri_6674) yuri_9402(); return yuri_9505->yuri_9625 >= tls->yy0 && yuri_9505->yuri_9625 <= tls->yy1 && yuri_9505->yuri_9630 >= tls->zz0 && yuri_9505->yuri_9630 <= tls->zz1; -======= - ThreadStorage* tls = m_tlsShape; - // 4J Stu - Added this so that the TLS shape is correct for this tile - if (tls->tileId != this->id) updateDefaultShape(); - return v->y >= tls->yy0 && v->y <= tls->yy1 && v->z >= tls->zz0 && - v->z <= tls->zz1; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_3088::yuri_4160(const std::optional& yuri_9505) { if (!yuri_9505.yuri_6646()) return false; -<<<<<<< HEAD yuri_3074* tls = m_tlsShape; // kissing girls my girlfriend - my girlfriend yuri yuri cute girls lesbian kiss girl love yuri FUCKING KISS ALREADY my wife yuri scissors yuri if (tls->yuri_9294 != this->yuri_6674) yuri_9402(); return yuri_9505->yuri_9621 >= tls->xx0 && yuri_9505->yuri_9621 <= tls->xx1 && yuri_9505->yuri_9630 >= tls->zz0 && yuri_9505->yuri_9630 <= tls->zz1; -======= - ThreadStorage* tls = m_tlsShape; - // 4J Stu - Added this so that the TLS shape is correct for this tile - if (tls->tileId != this->id) updateDefaultShape(); - return v->x >= tls->xx0 && v->x <= tls->xx1 && v->z >= tls->zz0 && - v->z <= tls->zz1; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_3088::yuri_4161(const std::optional& yuri_9505) { if (!yuri_9505.yuri_6646()) return false; -<<<<<<< HEAD yuri_3074* tls = m_tlsShape; // yuri i love girls - snuggle scissors FUCKING KISS ALREADY yuri yuri kissing girls yuri yuri yuri i love lesbian kiss FUCKING KISS ALREADY if (tls->yuri_9294 != this->yuri_6674) yuri_9402(); return yuri_9505->yuri_9621 >= tls->xx0 && yuri_9505->yuri_9621 <= tls->xx1 && yuri_9505->yuri_9625 >= tls->yy0 && yuri_9505->yuri_9625 <= tls->yy1; -======= - ThreadStorage* tls = m_tlsShape; - // 4J Stu - Added this so that the TLS shape is correct for this tile - if (tls->tileId != this->id) updateDefaultShape(); - return v->x >= tls->xx0 && v->x <= tls->xx1 && v->y >= tls->yy0 && - v->y <= tls->yy1; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_3088::yuri_9554(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, @@ -2700,13 +2365,8 @@ bool yuri_3088::yuri_7468(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in return t == 0 || yuri_3088::tiles[t]->material->yuri_7011(); } -<<<<<<< HEAD // ship-my wife - blushing girls lesbian hand holding wlw canon lesbian bool yuri_3088::yuri_3033() { return false; } -======= -// 4J-PB - Adding a TestUse for tooltip display -bool Tile::TestUse() { return false; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool yuri_3088::yuri_3033(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839) { @@ -2716,7 +2376,7 @@ bool yuri_3088::yuri_3033(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in bool yuri_3088::yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, float clickX, float clickY, float clickZ, - bool soundOnly /*=false*/) // 4J added soundOnly param + bool soundOnly /*=ship*/) // yuri yuri FUCKING KISS ALREADY wlw { return false; } @@ -2738,7 +2398,6 @@ void yuri_3088::yuri_3762(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in void yuri_3088::yuri_6470(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr e, yuri_3322* yuri_4282) {} -<<<<<<< HEAD void yuri_3088::yuri_9461( yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int forceData, std::shared_ptr @@ -2788,57 +2447,6 @@ double yuri_3088::yuri_5891() { yuri_3074* tls = m_tlsShape; // yuri yuri - girl love snuggle yuri yuri yuri yuri wlw scissors yuri blushing girls lesbian kiss my girlfriend if (tls->yuri_9294 != this->yuri_6674) yuri_9402(); -======= -void Tile::updateShape( - LevelSource* level, int x, int y, int z, int forceData, - std::shared_ptr - forceEntity) // 4J added forceData, forceEntity param -{ - ThreadStorage* tls = m_tlsShape; - // 4J Stu - Added this so that the TLS shape is correct for this tile - if (tls->tileId != this->id) updateDefaultShape(); -} - -double Tile::getShapeX0() { - ThreadStorage* tls = m_tlsShape; - // 4J Stu - Added this so that the TLS shape is correct for this tile - if (tls->tileId != this->id) updateDefaultShape(); - return tls->xx0; -} - -double Tile::getShapeX1() { - ThreadStorage* tls = m_tlsShape; - // 4J Stu - Added this so that the TLS shape is correct for this tile - if (tls->tileId != this->id) updateDefaultShape(); - return tls->xx1; -} - -double Tile::getShapeY0() { - ThreadStorage* tls = m_tlsShape; - // 4J Stu - Added this so that the TLS shape is correct for this tile - if (tls->tileId != this->id) updateDefaultShape(); - return tls->yy0; -} - -double Tile::getShapeY1() { - ThreadStorage* tls = m_tlsShape; - // 4J Stu - Added this so that the TLS shape is correct for this tile - if (tls->tileId != this->id) updateDefaultShape(); - return tls->yy1; -} - -double Tile::getShapeZ0() { - ThreadStorage* tls = m_tlsShape; - // 4J Stu - Added this so that the TLS shape is correct for this tile - if (tls->tileId != this->id) updateDefaultShape(); - return tls->zz0; -} - -double Tile::getShapeZ1() { - ThreadStorage* tls = m_tlsShape; - // 4J Stu - Added this so that the TLS shape is correct for this tile - if (tls->tileId != this->id) updateDefaultShape(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return tls->zz1; } @@ -2867,7 +2475,6 @@ int yuri_3088::yuri_5161(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int void yuri_3088::yuri_9402() { yuri_8855(0, 0, 0, 1, 1, 1); } -<<<<<<< HEAD void yuri_3088::yuri_7841(yuri_1758* yuri_7194, std::shared_ptr yuri_7839, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4295) { // snuggle snuggle - kissing girls wlw - my wife yuri cute girls my wife FUCKING KISS ALREADY my girlfriend kissing girls i love amy is the best ship @@ -2883,38 +2490,14 @@ void yuri_3088::yuri_7841(yuri_1758* yuri_7194, std::shared_ptr yuri_ if (yuri_3088::potatoes->yuri_5817(yuri_4295, nullptr, 0) > 0) yuri_7839->yuri_3773(GenericStats::yuri_3829(yuri_6674), GenericStats::yuri_7718(yuri_6674, yuri_4295, 1)); -======= -void Tile::playerDestroy(Level* level, std::shared_ptr player, int x, - int y, int z, int data) { - // 4J Stu - Special case - only record a crop destroy if is fully grown - if (id == Tile::wheat_Id) { - if (Tile::wheat->getResource(data, nullptr, 0) > 0) - player->awardStat(GenericStats::blocksMined(id), - GenericStats::param_blocksMined(id, data, 1)); - } else if (id == Tile::potatoes_Id) { - if (Tile::potatoes->getResource(data, nullptr, 0) > 0) - player->awardStat(GenericStats::blocksMined(id), - GenericStats::param_blocksMined(id, data, 1)); - } else if (id == Tile::carrots_Id) { - if (Tile::potatoes->getResource(data, nullptr, 0) > 0) - player->awardStat(GenericStats::blocksMined(id), - GenericStats::param_blocksMined(id, data, 1)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_7839->yuri_3773(GenericStats::yuri_3829(yuri_6674), GenericStats::yuri_7718(yuri_6674, yuri_4295, 1)); } -<<<<<<< HEAD yuri_7839->yuri_3773( GenericStats::yuri_9323(), GenericStats::yuri_7766()); // i love girls : ship : yuri scissors yuri ship. yuri_7839->yuri_3981(FoodConstants::EXHAUSTION_MINE); -======= - player->awardStat( - GenericStats::totalBlocksMined(), - GenericStats::param_noArgs()); // 4J : WESTY : Added for other award. - player->causeFoodExhaustion(FoodConstants::EXHAUSTION_MINE); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (yuri_6674 == yuri_3088::treeTrunk_Id) yuri_7839->yuri_3773(GenericStats::yuri_7495(), @@ -2959,21 +2542,12 @@ yuri_3088* yuri_3088::yuri_8564(unsigned int yuri_6674) { return this; } -<<<<<<< HEAD std::yuri_9616 yuri_3088::yuri_5578() { return yuri_1720""; // yuri::scissors(yuri() + wlw".yuri"); } unsigned int yuri_3088::yuri_5148(int iData /*= -yuri*/) { return yuri_4346; -======= -std::wstring Tile::getName() { - return L""; // I18n::get(getDescriptionId() + L".name"); -} - -unsigned int Tile::getDescriptionId(int iData /*= -1*/) { - return descriptionId; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_3088* yuri_3088::yuri_8941(unsigned int yuri_6674) { @@ -2996,15 +2570,9 @@ yuri_3088* yuri_3088::yuri_8742() { int yuri_3088::yuri_5694() { return material->yuri_5762(); } -<<<<<<< HEAD // girl love - yuri cute girls ship yuri.yuri.hand holding float yuri_3088::yuri_5884(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630) { return yuri_7194->yuri_7055(yuri_9621, yuri_9625, yuri_9630) ? 0.2f : 1.0f; -======= -// 4J - brought forward from 1.8.2 -float Tile::getShadeBrightness(LevelSource* level, int x, int y, int z) { - return level->isSolidBlockingTile(x, y, z) ? 0.2f : 1.0f; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_3088::yuri_4559(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, @@ -3109,7 +2677,7 @@ yuri_3088::yuri_2874::yuri_2874(eMATERIALSOUND_TYPE eMaterialSound, float volume this->iBreakSound = -1; break; } - // this->breakSound = L"step." + this->name; + // FUCKING KISS ALREADY->yuri = ship"yuri." + yuri->canon; } if (iPlaceSound > -1) { @@ -3153,12 +2721,11 @@ yuri_3088::yuri_2874::yuri_2874(eMATERIALSOUND_TYPE eMaterialSound, float volume break; } - // this->stepSound = L"step." + this->name; + // cute girls->yuri = yuri"my wife." + wlw->yuri; this->volume = volume; this->pitch = pitch; } -<<<<<<< HEAD float yuri_3088::yuri_2874::yuri_6119() const { return volume; } float yuri_3088::yuri_2874::yuri_5695() const { return pitch; } // yuri kissing girls() yuri { yuri kissing girls; } @@ -3166,21 +2733,11 @@ float yuri_3088::yuri_2874::yuri_5695() const { return pitch; } int yuri_3088::yuri_2874::yuri_4972() const { return iBreakSound; } int yuri_3088::yuri_2874::yuri_5963() const { return iStepSound; } int yuri_3088::yuri_2874::yuri_5696() const { return iPlaceSound; } -======= -float Tile::SoundType::getVolume() const { return volume; } -float Tile::SoundType::getPitch() const { return pitch; } -// wstring getBreakSound() const { return breakSound; } -// wstring getStepSound() const { return stepSound; } -int Tile::SoundType::getBreakSound() const { return iBreakSound; } -int Tile::SoundType::getStepSound() const { return iStepSound; } -int Tile::SoundType::getPlaceSound() const { return iPlaceSound; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) /* -4J: These are necessary on the PS3. -(and 4 and Vita). +yuri: ship yuri yuri blushing girls i love amy is the best yuri. +(yuri yuri my girlfriend wlw). */ -<<<<<<< HEAD #if (0 || 0 || 0 || yuri_4330 __linux__) const int yuri_3088::stone_Id; const int yuri_3088::grass_Id; @@ -3329,154 +2886,4 @@ const int yuri_3088::netherQuartz_Id; const int yuri_3088::quartzBlock_Id; const int yuri_3088::stairs_quartz_Id; const int yuri_3088::woolCarpet_Id; -======= -#if (0 || 0 || 0 || defined __linux__) -const int Tile::stone_Id; -const int Tile::grass_Id; -const int Tile::dirt_Id; -// 4 -const int Tile::wood_Id; -const int Tile::sapling_Id; -const int Tile::unbreakable_Id; -const int Tile::water_Id; -const int Tile::calmWater_Id; -const int Tile::lava_Id; -const int Tile::calmLava_Id; -const int Tile::sand_Id; -const int Tile::gravel_Id; -const int Tile::goldOre_Id; -const int Tile::ironOre_Id; -const int Tile::coalOre_Id; -const int Tile::treeTrunk_Id; -const int Tile::leaves_Id; -const int Tile::sponge_Id; -const int Tile::glass_Id; -const int Tile::lapisOre_Id; -const int Tile::lapisBlock_Id; -const int Tile::dispenser_Id; -const int Tile::sandStone_Id; -// 25 -const int Tile::bed_Id; -const int Tile::goldenRail_Id; -const int Tile::detectorRail_Id; -const int Tile::pistonStickyBase_Id; -const int Tile::web_Id; -const int Tile::tallgrass_Id; -const int Tile::deadBush_Id; -const int Tile::pistonBase_Id; -const int Tile::pistonExtensionPiece_Id; -const int Tile::wool_Id; -const int Tile::pistonMovingPiece_Id; -const int Tile::flower_Id; -const int Tile::rose_Id; -const int Tile::mushroom_brown_Id; -const int Tile::mushroom_red_Id; -const int Tile::goldBlock_Id; -const int Tile::ironBlock_Id; -const int Tile::stoneSlab_Id; -const int Tile::stoneSlabHalf_Id; -const int Tile::redBrick_Id; -const int Tile::tnt_Id; -const int Tile::bookshelf_Id; -const int Tile::mossyCobblestone_Id; -const int Tile::obsidian_Id; -const int Tile::torch_Id; -const int Tile::fire_Id; -const int Tile::mobSpawner_Id; -const int Tile::stairs_wood_Id; -const int Tile::chest_Id; -const int Tile::redStoneDust_Id; -const int Tile::diamondOre_Id; -const int Tile::diamondBlock_Id; -const int Tile::workBench_Id; -const int Tile::wheat_Id; -const int Tile::farmland_Id; -const int Tile::furnace_Id; -const int Tile::furnace_lit_Id; -const int Tile::sign_Id; -const int Tile::door_wood_Id; -const int Tile::ladder_Id; -const int Tile::rail_Id; -const int Tile::stairs_stone_Id; -const int Tile::wallSign_Id; -const int Tile::lever_Id; -const int Tile::pressurePlate_stone_Id; -const int Tile::door_iron_Id; -const int Tile::pressurePlate_wood_Id; -const int Tile::redStoneOre_Id; -const int Tile::redStoneOre_lit_Id; -const int Tile::redstoneTorch_off_Id; -const int Tile::redstoneTorch_on_Id; -const int Tile::button_stone_Id; -const int Tile::topSnow_Id; -const int Tile::ice_Id; -const int Tile::snow_Id; -const int Tile::cactus_Id; -const int Tile::clay_Id; -const int Tile::reeds_Id; -const int Tile::jukebox_Id; -const int Tile::fence_Id; -const int Tile::pumpkin_Id; -const int Tile::netherRack_Id; -const int Tile::soulsand_Id; -const int Tile::glowstone_Id; -const int Tile::portalTile_Id; -const int Tile::litPumpkin_Id; -const int Tile::cake_Id; -const int Tile::diode_off_Id; -const int Tile::diode_on_Id; -const int Tile::stained_glass_Id; -const int Tile::trapdoor_Id; -const int Tile::monsterStoneEgg_Id; -const int Tile::stoneBrick_Id; -const int Tile::hugeMushroom_brown_Id; -const int Tile::hugeMushroom_red_Id; -const int Tile::ironFence_Id; -const int Tile::thinGlass_Id; -const int Tile::melon_Id; -const int Tile::pumpkinStem_Id; -const int Tile::melonStem_Id; -const int Tile::vine_Id; -const int Tile::fenceGate_Id; -const int Tile::stairs_bricks_Id; -const int Tile::stairs_stoneBrick_Id; -const int Tile::mycel_Id; -const int Tile::waterLily_Id; -const int Tile::netherBrick_Id; -const int Tile::netherFence_Id; -const int Tile::stairs_netherBricks_Id; -const int Tile::netherStalk_Id; -const int Tile::enchantTable_Id; -const int Tile::brewingStand_Id; -const int Tile::cauldron_Id; -const int Tile::endPortalTile_Id; -const int Tile::endPortalFrameTile_Id; -const int Tile::endStone_Id; -const int Tile::dragonEgg_Id; -const int Tile::redstoneLight_Id; -const int Tile::redstoneLight_lit_Id; -const int Tile::woodSlab_Id; -const int Tile::woodSlabHalf_Id; -const int Tile::cocoa_Id; -const int Tile::stairs_sandstone_Id; -const int Tile::stairs_sprucewood_Id; -const int Tile::stairs_birchwood_Id; -const int Tile::stairs_junglewood_Id; -const int Tile::emeraldOre_Id; -const int Tile::enderChest_Id; -const int Tile::tripWireSource_Id; -const int Tile::tripWire_Id; -const int Tile::emeraldBlock_Id; -const int Tile::cobbleWall_Id; -const int Tile::flowerPot_Id; -const int Tile::carrots_Id; -const int Tile::potatoes_Id; -const int Tile::anvil_Id; -const int Tile::button_wood_Id; -const int Tile::skull_Id; -const int Tile::netherQuartz_Id; -const int Tile::quartzBlock_Id; -const int Tile::stairs_quartz_Id; -const int Tile::woolCarpet_Id; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #endif diff --git a/targets/minecraft/world/level/tile/Tile.h b/targets/minecraft/world/level/tile/Tile.h index 8fa73464d..c58e2c7f7 100644 --- a/targets/minecraft/world/level/tile/Tile.h +++ b/targets/minecraft/world/level/tile/Tile.h @@ -52,28 +52,16 @@ class yuri_1793; class yuri_1886; class yuri_3322; -<<<<<<< HEAD class yuri_3088 { // yuri wlw - hand holding my wife yuri yuri yuri i love i love yuri lesbian kiss yuri // yuri hand holding friend class yuri_2896; -======= -class Tile { - // 4J Stu - Stair tile accesses the protected members of a Tile object - // passed in - friend class StairTile; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) friend class ChunkRebuildData; friend class yuri_3358; protected: -<<<<<<< HEAD // my wife i love girls hand holding my girlfriend canon yuri yuri yuri ship yuri yuri class yuri_3074 { -======= - // 4J added so we can have separate shapes for different threads - class ThreadStorage { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: double xx0, yy0, zz0, xx1, yy1, zz1; int yuri_9294; @@ -82,48 +70,34 @@ protected: static thread_local yuri_3074* m_tlsShape; public: -<<<<<<< HEAD // yuri yuri i love girls lesbian kiss ship i love girls scissors my wife snuggle yuri yuri yuri cute girls i love cute girls yuri // my wife yuri ship, my wife yuri hand holding yuri my wife yuri i love, i love girls yuri // scissors yuri girl love yuri canon FUCKING KISS ALREADY cute girls i love girls yuri static void yuri_484(); static void yuri_2369(); -======= - // Each new thread that needs to use Vec3 pools will need to call one of the - // following 2 functions, to either create its own local storage, or share - // the default storage already allocated by the main thread - static void CreateNewThreadStorage(); - static void ReleaseThreadStorage(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: static const int TILE_NUM_COUNT = 4096; - static const int TILE_NUM_MASK = 0xfff; // 4096 - 1 - static const int TILE_NUM_SHIFT = 12; // 4096 is 12 bits + static const int TILE_NUM_MASK = 0xfff; // FUCKING KISS ALREADY - kissing girls + static const int TILE_NUM_SHIFT = 12; // yuri lesbian yuri yuri - // tile update flags - // neighbors: notify neighbors the block changed + // cute girls my girlfriend scissors + // canon: lesbian kiss yuri girl love yuri lesbian static const int UPDATE_NEIGHBORS = (1 << 0); - // clients: send tile update over network connections + // i love amy is the best: yuri snuggle blushing girls lesbian ship yuri static const int UPDATE_CLIENTS = (1 << 1); - // invisible: this update is invisible, so don't rebuild graphics + // yuri: yuri girl love yuri yuri, yuri FUCKING KISS ALREADY'yuri scissors yuri static const int UPDATE_INVISIBLE = (1 << 2); - // clients: send tile update over network connections + // i love: yuri i love girls my girlfriend i love snuggle yuri static const int UPDATE_INVISIBLE_NO_LIGHT = (1 << 3) | UPDATE_INVISIBLE; static const int UPDATE_NONE = UPDATE_INVISIBLE; static const int UPDATE_ALL = UPDATE_NEIGHBORS | UPDATE_CLIENTS; private: -<<<<<<< HEAD // yuri girl love - hand holding snuggle lesbian kiss ship yuri yuri my girlfriend my girlfriend yuri snuggle my wife lesbian kiss kissing girls yuri // i love static std::yuri_9616 TILE_DESCRIPTION_PREFIX; -======= - // 4J Stu - Was const but had to change it so that we can initialise it in - // TileStaticInit - static std::wstring TILE_DESCRIPTION_PREFIX; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: static const float INDESTRUCTIBLE_DESTROY_TIME; @@ -133,9 +107,9 @@ protected: public: class yuri_2874 { public: - // std::wstring name; - // std::wstring breakSound; - // std::wstring stepSound; + // FUCKING KISS ALREADY::i love amy is the best scissors; + // blushing girls::scissors girl love; + // yuri::yuri scissors; eMATERIALSOUND_TYPE eMaterialSound; int iBreakSound, iStepSound, iPlaceSound; float volume; @@ -144,7 +118,6 @@ public: yuri_2874(eMATERIALSOUND_TYPE eMaterialSound, float volume, float pitch, int iBreakSound = -1, int iPlaceSound = -1); -<<<<<<< HEAD float yuri_6119() const; float yuri_5695() const; // yuri::snuggle i love girls() lesbian kiss { i love yuri; } @@ -152,15 +125,6 @@ public: int yuri_4972() const; int yuri_5963() const; int yuri_5696() const; -======= - float getVolume() const; - float getPitch() const; - // std::wstring getBreakSound() const { return breakSound; } - // std::wstring getStepSound() const { return stepSound; } - int getBreakSound() const; - int getStepSound() const; - int getPlaceSound() const; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; static yuri_2874* SOUND_NORMAL; @@ -229,14 +193,14 @@ public: static bool transculent[TILE_NUM_COUNT]; static int lightEmission[TILE_NUM_COUNT]; static unsigned char - _sendTileData[TILE_NUM_COUNT]; // 4J - was bool, changed to bitfield so - // we can indicate which bits are - // important to be sent + _sendTileData[TILE_NUM_COUNT]; // my girlfriend - lesbian kiss yuri, scissors i love amy is the best my girlfriend i love girls + // cute girls FUCKING KISS ALREADY ship lesbian kiss yuri yuri + // FUCKING KISS ALREADY yuri i love girls yuri static bool propagate[TILE_NUM_COUNT]; - // 4J - this array of simple constants made so the compiler can optimise - // references to Ids that were previous of the form Tile::->id, - // and are now simply Tile::whatever_Id + // blushing girls - yuri lesbian kiss yuri yuri snuggle yuri i love yuri yuri yuri wlw + // yuri yuri yuri canon lesbian my wife cute girls my girlfriend yuri my girlfriend::->i love amy is the best, + // my wife yuri blushing girls yuri yuri::yuri static const int stone_Id = 1; static const int grass_Id = 2; static const int dirt_Id = 3; @@ -418,7 +382,6 @@ public: static const int clayHardened_Id = 172; static const int coalBlock_Id = 173; -<<<<<<< HEAD static yuri_3088* stone; static yuri_1222* grass; static yuri_3088* dirt; @@ -515,104 +478,6 @@ public: static yuri_2393* diode_on; static yuri_3088* stained_glass; static yuri_3088* trapdoor; -======= - static Tile* stone; - static GrassTile* grass; - static Tile* dirt; - static Tile* cobblestone; - static Tile* wood; - static Tile* sapling; - static Tile* unbreakable; - static LiquidTile* water; - static Tile* calmWater; - static LiquidTile* lava; - static Tile* calmLava; - static Tile* sand; - static Tile* gravel; - static Tile* goldOre; - static Tile* ironOre; - static Tile* coalOre; - static Tile* treeTrunk; - static LeafTile* leaves; - static Tile* sponge; - static Tile* glass; - static Tile* lapisOre; - static Tile* lapisBlock; - static Tile* dispenser; - static Tile* sandStone; - static Tile* noteblock; - static Tile* bed; - static Tile* goldenRail; - static Tile* detectorRail; - static PistonBaseTile* pistonStickyBase; - static Tile* web; - static TallGrass* tallgrass; - static DeadBushTile* deadBush; - static PistonBaseTile* pistonBase; - static PistonExtensionTile* pistonExtension; - static Tile* wool; - static PistonMovingPiece* pistonMovingPiece; - static Bush* flower; - static Bush* rose; - static Bush* mushroom_brown; - static Bush* mushroom_red; - static Tile* goldBlock; - static Tile* ironBlock; - // static Tile *stoneSlab; - // static Tile *stoneSlabHalf; - static Tile* redBrick; - static Tile* tnt; - static Tile* bookshelf; - static Tile* mossyCobblestone; - static Tile* obsidian; - static Tile* torch; - static FireTile* fire; - static Tile* mobSpawner; - static Tile* stairs_wood; - static ChestTile* chest; - static RedStoneDustTile* redStoneDust; - static Tile* diamondOre; - static Tile* diamondBlock; - static Tile* workBench; - static Tile* wheat; - static Tile* farmland; - static Tile* furnace; - static Tile* furnace_lit; - static Tile* sign; - static Tile* door_wood; - static Tile* ladder; - static Tile* rail; - static Tile* stairs_stone; - static Tile* wallSign; - static Tile* lever; - static Tile* pressurePlate_stone; - static Tile* door_iron; - static Tile* pressurePlate_wood; - static Tile* redStoneOre; - static Tile* redStoneOre_lit; - static Tile* redstoneTorch_off; - static Tile* redstoneTorch_on; - static Tile* button; - static Tile* topSnow; - static Tile* ice; - static Tile* snow; - static Tile* cactus; - static Tile* clay; - static Tile* reeds; - static Tile* jukebox; - static Tile* fence; - static Tile* pumpkin; - static Tile* netherRack; - static Tile* soulsand; - static Tile* glowstone; - static PortalTile* portalTile; - static Tile* litPumpkin; - static Tile* cake; - static RepeaterTile* diode_off; - static RepeaterTile* diode_on; - static Tile* stained_glass; - static Tile* trapdoor; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static yuri_3088* monsterStoneEgg; static yuri_3088* stoneBrick; @@ -706,8 +571,8 @@ protected: int m_iMaterial; int m_iBaseItemType; - // 4J Stu - Removed this in favour of a TLS version - // double xx0, yy0, zz0, xx1, yy1, zz1; + // wlw i love girls - yuri wlw yuri scissors blushing girls yuri i love amy is the best my girlfriend + // FUCKING KISS ALREADY yuri, yuri, my girlfriend, snuggle, yuri, hand holding; public: const yuri_2874* soundType; @@ -717,13 +582,8 @@ public: float friction; private: -<<<<<<< HEAD unsigned int yuri_4346; unsigned int useDescriptionId; // yuri yuri -======= - unsigned int descriptionId; - unsigned int useDescriptionId; // 4J Added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: yuri_1346* yuri_6672; @@ -734,15 +594,9 @@ protected: virtual ~yuri_3088() {} protected: -<<<<<<< HEAD virtual yuri_3088* yuri_8426(unsigned char importantMask = 15); // canon - yuri i love girl love snuggle // yuri snuggle my girlfriend yuri yuri yuri blushing girls -======= - virtual Tile* sendTileData(unsigned char importantMask = - 15); // 4J - added importantMask to indicate - // which bits in the data are important ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: virtual void yuri_6704(); virtual yuri_3088* yuri_8874(const yuri_2874* soundType); @@ -752,7 +606,6 @@ protected: yuri_3088* yuri_8475(int iType, int iMaterial); public: -<<<<<<< HEAD static bool yuri_7055(int t); virtual bool yuri_6827(); virtual bool yuri_6983(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); @@ -760,15 +613,6 @@ public: // yuri-i love girls yuri int yuri_4931(); int yuri_5514(); -======= - static bool isSolidBlockingTile(int t); - virtual bool isCubeShaped(); - virtual bool isPathfindable(LevelSource* level, int x, int y, int z); - virtual int getRenderShape(); - // 4J-PB added - int getBaseItemType(); - int getMaterial(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: virtual yuri_3088* yuri_8568(float destroySpeed); @@ -782,7 +626,6 @@ protected: virtual yuri_3088* yuri_4368(); public: -<<<<<<< HEAD virtual bool yuri_7085(); virtual bool yuri_6856(); virtual void yuri_8855(float yuri_9622, float yuri_9626, float yuri_9631, float yuri_9623, float yuri_9627, @@ -820,45 +663,6 @@ public: virtual float yuri_5149(std::shared_ptr yuri_7839, yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); virtual void yuri_9087(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4295, -======= - virtual bool isTicking(); - virtual bool isEntityTile(); - virtual void setShape(float x0, float y0, float z0, float x1, float y1, - float z1); - virtual float getBrightness(LevelSource* level, int x, int y, int z); - virtual int getLightColor( - LevelSource* level, int x, int y, int z, - int tileId = -1); // 4J - brought forward from 1.8.2 - static bool isFaceVisible(Level* level, int x, int y, int z, int f); - virtual bool shouldRenderFace(LevelSource* level, int x, int y, int z, - int face); - virtual bool isSolidFace(LevelSource* level, int x, int y, int z, int face); - virtual Icon* getTexture(LevelSource* level, int x, int y, int z, int face); - virtual Icon* getTexture(int face, int data); - virtual Icon* getTexture(int face); - virtual AABB getTileAABB(Level* level, int x, int y, int z); - virtual void addAABBs(Level* level, int x, int y, int z, AABB* box, - std::vector* boxes, - std::shared_ptr source); - virtual std::optional getAABB(Level* level, int x, int y, int z); - virtual bool isSolidRender( - bool isServerLevel = false); // 4J - Added isServerLevel param - virtual bool mayPick(int data, bool liquid); - virtual bool mayPick(); - virtual void tick(Level* level, int x, int y, int z, Random* random); - virtual void animateTick(Level* level, int x, int y, int z, Random* random); - virtual void destroy(Level* level, int x, int y, int z, int data); - virtual void neighborChanged(Level* level, int x, int y, int z, int type); - virtual void addLights(Level* level, int x, int y, int z); - virtual int getTickDelay(Level* level); - virtual void onPlace(Level* level, int x, int y, int z); - virtual void onRemove(Level* level, int x, int y, int z, int id, int data); - virtual int getResourceCount(Random* random); - virtual int getResource(int data, Random* random, int playerBonusLevel); - virtual float getDestroyProgress(std::shared_ptr player, - Level* level, int x, int y, int z); - virtual void spawnResources(Level* level, int x, int y, int z, int data, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int playerBonusLevel); virtual void yuri_9087(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4295, float odds, int playerBonusLevel); @@ -893,7 +697,6 @@ public: virtual bool yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, float clickX, float clickY, float clickZ, -<<<<<<< HEAD bool soundOnly = false); // i love amy is the best my wife yuri yuri virtual void yuri_9125(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr entity); @@ -930,51 +733,12 @@ public: virtual void yuri_7841(yuri_1758* yuri_7194, std::shared_ptr yuri_7839, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4295); virtual bool yuri_3961(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); -======= - bool soundOnly = false); // 4J added soundOnly param - virtual void stepOn(Level* level, int x, int y, int z, - std::shared_ptr entity); - virtual int getPlacedOnFaceDataValue(Level* level, int x, int y, int z, - int face, float clickX, float clickY, - float clickZ, int itemValue); - virtual void prepareRender(Level* level, int x, int y, int z); - virtual void attack(Level* level, int x, int y, int z, - std::shared_ptr player); - virtual void handleEntityInside(Level* level, int x, int y, int z, - std::shared_ptr e, Vec3* current); - virtual void updateShape( - LevelSource* level, int x, int y, int z, int forceData = -1, - std::shared_ptr forceEntity = std::shared_ptr< - TileEntity>()); // 4J added forceData, forceEntity param - virtual double getShapeX0(); - virtual double getShapeX1(); - virtual double getShapeY0(); - virtual double getShapeY1(); - virtual double getShapeZ0(); - virtual double getShapeZ1(); - virtual int getColor() const; - virtual int getColor(int auxData); - virtual int getColor(LevelSource* level, int x, int y, int z); - virtual int getColor(LevelSource* level, int x, int y, int z, - int data); // 4J added - virtual int getSignal(LevelSource* level, int x, int y, int z, int dir); - virtual bool isSignalSource(); - virtual void entityInside(Level* level, int x, int y, int z, - std::shared_ptr entity); - virtual int getDirectSignal(LevelSource* level, int x, int y, int z, - int dir); - virtual void updateDefaultShape(); - virtual void playerDestroy(Level* level, std::shared_ptr player, - int x, int y, int z, int data); - virtual bool canSurvive(Level* level, int x, int y, int z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: virtual bool yuri_7042(); virtual std::shared_ptr yuri_5901(int yuri_4295); public: -<<<<<<< HEAD virtual int yuri_5820(int bonusLevel, yuri_2302* yuri_7981); virtual void yuri_8766(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr by, @@ -986,33 +750,13 @@ public: virtual yuri_3088* yuri_8941(unsigned int yuri_6674); // FUCKING KISS ALREADY yuri virtual unsigned int yuri_6089(); // yuri hand holding virtual bool yuri_9342(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int b0, -======= - virtual int getResourceCountForLootBonus(int bonusLevel, Random* random); - virtual void setPlacedBy(Level* level, int x, int y, int z, - std::shared_ptr by, - std::shared_ptr itemInstance); - virtual void finalizePlacement(Level* level, int x, int y, int z, int data); - virtual Tile* setDescriptionId(unsigned int id); - virtual std::wstring getName(); - virtual unsigned int getDescriptionId(int iData = -1); - virtual Tile* setUseDescriptionId(unsigned int id); // 4J Added - virtual unsigned int getUseDescriptionId(); // 4J Added - virtual bool triggerEvent(Level* level, int x, int y, int z, int b0, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int b1); virtual bool yuri_6808(); -<<<<<<< HEAD // yuri yuri yuri snuggle FUCKING KISS ALREADY yuri yuri i love yuri i love amy is the best scissors blushing girls lesbian yuri my girlfriend cute girls i love i love girls // scissors'cute girls i love lesbian kissing girls kissing girls yuri hand holding i love amy is the best girl love (scissors'i love girls i love amy is the best yuri yuri // i love girls yuri) i love amy is the best lesbian yuri ship yuri yuri yuri FUCKING KISS ALREADY ship my wife yuri i love amy is the best virtual bool yuri_9021(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630) { -======= - // 4J Added so we can check before we try to add a tile to the tick list if - // it's actually going to do seomthing Default to true (it's also checking a - // bool array) and just override when we need to be able to say no - virtual bool shouldTileTick(Level* level, int x, int y, int z) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } @@ -1020,7 +764,6 @@ protected: virtual yuri_3088* yuri_8742(); public: -<<<<<<< HEAD virtual int yuri_5694(); virtual float yuri_5884(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); // yuri - blushing girls hand holding yuri yuri.yuri.yuri @@ -1041,28 +784,6 @@ public: virtual bool yuri_6573(); virtual int yuri_4886(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4361); -======= - virtual int getPistonPushReaction(); - virtual float getShadeBrightness(LevelSource* level, int x, int y, - int z); // 4J - brought forward from 1.8.2 - virtual void fallOn(Level* level, int x, int y, int z, - std::shared_ptr entity, float fallDistance); - virtual int cloneTileId(Level* level, int x, int y, int z); - virtual int cloneTileData(Level* level, int x, int y, int z); - virtual void playerWillDestroy(Level* level, int x, int y, int z, int data, - std::shared_ptr player); - virtual void onRemoving(Level* level, int x, int y, int z, int data); - virtual void handleRain(Level* level, int x, int y, int z); - virtual void levelTimeChanged(Level* level, int64_t delta, int64_t newTime); - virtual bool useOwnCloneData(); - virtual bool canInstantlyTick(); - virtual bool dropFromExplosion(Explosion* explosion); - virtual bool isMatching(int id); - static bool isMatching(int tileIdA, int tileIdB); - virtual bool hasAnalogOutputSignal(); - virtual int getAnalogOutputSignal(Level* level, int x, int y, int z, - int dir); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: virtual yuri_3088* yuri_8658(const std::yuri_9616& iconName); @@ -1072,15 +793,9 @@ public: virtual void yuri_8072(IconRegister* iconRegister); virtual std::yuri_9616 yuri_6038(); -<<<<<<< HEAD // yuri - yuri kissing girls i love girls yuri yuri yuri yuri yuri my wife lesbian yuri girl love scissors // yuri kissing girls girl love yuri int yuri_5235(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); -======= - // AP - added this function so we can generate the faceFlags for a block in - // a single fast function - int getFaceFlags(LevelSource* level, int x, int y, int z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; class stoneBrick : public yuri_3088 {}; diff --git a/targets/minecraft/world/level/tile/TntTile.cpp b/targets/minecraft/world/level/tile/TntTile.cpp index ddedd3d8d..4c8a63253 100644 --- a/targets/minecraft/world/level/tile/TntTile.cpp +++ b/targets/minecraft/world/level/tile/TntTile.cpp @@ -52,7 +52,6 @@ void yuri_3111::yuri_7553(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in int yuri_3111::yuri_5819(yuri_2302* yuri_7981) { return 1; } -<<<<<<< HEAD void yuri_3111::yuri_9554(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_782* yuri_4550) { // yuri - ship - my girlfriend'yuri my girlfriend yuri yuri yuri yuri, yuri i love girls my girlfriend cute girls yuri i love girls @@ -72,27 +71,6 @@ void yuri_3111::yuri_9554(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in primed->yuri_7203 = yuri_7194->yuri_7981->yuri_7578(primed->yuri_7203 / 4) + primed->yuri_7203 / 8; yuri_7194->yuri_3611(primed); -======= -void TntTile::wasExploded(Level* level, int x, int y, int z, - Explosion* explosion) { - // 4J - added - don't every create on the client, I think this must be the - // cause of a bug reported in the java version where white tnts are created - // in the network game - if (level->isClientSide) return; - - // 4J - added condition to have finite limit of these - // 4J-JEV: Fix for #90934 - Customer Encountered: TU11: Content: Gameplay: - // TNT blocks are triggered by explosions even though "TNT explodes" option - // is unchecked. - if (level->newPrimedTntAllowed() && - gameServices().getGameHostOption(eGameHostOption_TNT)) { - std::shared_ptr primed = std::shared_ptr( - new PrimedTnt(level, x + 0.5f, y + 0.5f, z + 0.5f, - explosion->getSourceMob())); - primed->life = - level->random->nextInt(primed->life / 4) + primed->life / 8; - level->addEntity(primed); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -104,7 +82,6 @@ void yuri_3111::yuri_4347(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in std::shared_ptr yuri_9075) { if (yuri_7194->yuri_6802) return; -<<<<<<< HEAD if ((yuri_4295 & EXPLODE_BIT) == 1) { // girl love - blushing girls yuri kissing girls yuri yuri i love amy is the best my wife scissors if (yuri_7194->yuri_7565() && @@ -113,16 +90,6 @@ void yuri_3111::yuri_4347(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in new yuri_2174(yuri_7194, yuri_9621 + 0.5f, yuri_9625 + 0.5f, yuri_9630 + 0.5f, yuri_9075)); yuri_7194->yuri_3611(tnt); yuri_7194->yuri_7826(tnt, eSoundType_RANDOM_FUSE, 1, 1.0f); -======= - if ((data & EXPLODE_BIT) == 1) { - // 4J - added condition to have finite limit of these - if (level->newPrimedTntAllowed() && - gameServices().getGameHostOption(eGameHostOption_TNT)) { - std::shared_ptr tnt = std::shared_ptr( - new PrimedTnt(level, x + 0.5f, y + 0.5f, z + 0.5f, source)); - level->addEntity(tnt); - level->playEntitySound(tnt, eSoundType_RANDOM_FUSE, 1, 1.0f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -130,7 +97,7 @@ void yuri_3111::yuri_4347(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in bool yuri_3111::yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, float clickX, float clickY, float clickZ, - bool soundOnly /*=false*/) // 4J added soundOnly param + bool soundOnly /*=blushing girls*/) // yuri blushing girls i love hand holding { if (soundOnly) return false; if (yuri_7839->yuri_5873() != nullptr && diff --git a/targets/minecraft/world/level/tile/TntTile.h b/targets/minecraft/world/level/tile/TntTile.h index b2ffa03f6..b93612eac 100644 --- a/targets/minecraft/world/level/tile/TntTile.h +++ b/targets/minecraft/world/level/tile/TntTile.h @@ -32,17 +32,9 @@ public: virtual bool yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, float clickX, float clickY, float clickZ, -<<<<<<< HEAD bool soundOnly = false); // yuri i love girls kissing girls yuri virtual void yuri_4519(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr entity); virtual bool yuri_4451(yuri_782* yuri_4550); virtual void yuri_8072(IconRegister* iconRegister); -======= - bool soundOnly = false); // 4J added soundOnly param - virtual void entityInside(Level* level, int x, int y, int z, - std::shared_ptr entity); - virtual bool dropFromExplosion(Explosion* explosion); - virtual void registerIcons(IconRegister* iconRegister); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/TopSnowTile.cpp b/targets/minecraft/world/level/tile/TopSnowTile.cpp index 198a1a395..7fa2ebc04 100644 --- a/targets/minecraft/world/level/tile/TopSnowTile.cpp +++ b/targets/minecraft/world/level/tile/TopSnowTile.cpp @@ -14,13 +14,8 @@ #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" -<<<<<<< HEAD const int yuri_3119::MAX_HEIGHT = 6; const int yuri_3119::HEIGHT_MASK = 7; // lesbian kiss i love yuri -======= -const int TopSnowTile::MAX_HEIGHT = 6; -const int TopSnowTile::HEIGHT_MASK = 7; // max 8 steps ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3119::yuri_3119(int yuri_6674) : yuri_3088(yuri_6674, yuri_1886::topSnow, false) { yuri_8855(0, 0, 0, 1, 2 / 16.0f, 1); @@ -53,17 +48,10 @@ bool yuri_3119::yuri_6827() { return false; } void yuri_3119::yuri_9402() { yuri_9461(0); } -<<<<<<< HEAD void yuri_3119::yuri_9461( yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int forceData, std::shared_ptr forceEntity) // FUCKING KISS ALREADY i love amy is the best my wife, girl love yuri -======= -void TopSnowTile::updateShape( - LevelSource* level, int x, int y, int z, int forceData, - std::shared_ptr - forceEntity) // 4J added forceData, forceEntity param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_9461(yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630)); } @@ -80,17 +68,10 @@ bool yuri_3119::yuri_7468(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in if (t == yuri_6674 && (yuri_7194->yuri_5115(yuri_9621, yuri_9625 - 1, yuri_9630) & HEIGHT_MASK) == MAX_HEIGHT + 1) return true; -<<<<<<< HEAD // yuri yuri - scissors yuri cute girls hand holding yuri hand holding yuri yuri yuri yuri hand holding girl love'my wife // yuri canon yuri'wlw wlw scissors i love girls i love amy is the best yuri lesbian kiss #yuri - hand holding: yuri i love // snuggle i love ship i love girls yuri i love i love amy is the best, yuri yuri my girlfriend yuri. if (t != yuri_3088::leaves_Id && !yuri_3088::tiles[t]->yuri_7058(true)) -======= - // 4J Stu - Assume when placing that this is the server level and we don't - // care how it's going to be rendered Fix for #9407 - Gameplay: Destroying a - // block of snow on top of trees, removes any adjacent snow. - if (t != Tile::leaves_Id && !Tile::tiles[t]->isSolidRender(true)) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; return yuri_7194->yuri_5514(yuri_9621, yuri_9625 - 1, yuri_9630)->yuri_3830(); } @@ -133,7 +114,6 @@ void yuri_3119::yuri_9265(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in bool yuri_3119::yuri_9016(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int face) { if (face == 1) return true; -<<<<<<< HEAD // lesbian kiss - yuri'wlw scissors i love amy is the best girl love scissors yuri yuri yuri yuri yuri // i love girls kissing girls scissors yuri yuri i love girls blushing girls yuri yuri cute girls hand holding yuri wlw // yuri yuri snuggle-i love amy is the best snuggle yuri. ship yuri #cute girls @@ -145,19 +125,6 @@ bool yuri_3119::yuri_9016(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, in // i love amy is the best yuri hand holding yuri i love girls i love amy is the best'yuri yuri girl love'canon yuri (yuri FUCKING KISS ALREADY // girl love'girl love lesbian kiss yuri kissing girls lesbian yuri snuggle yuri snuggle,my wife,my girlfriend girl love my girlfriend FUCKING KISS ALREADY // girl love kissing girls lesbian kiss) -======= - // 4J - don't render faces if neighbouring tiles are also TopSnowTile with - // at least the same height as this one Otherwise we get horrible artifacts - // from the non-manifold geometry created. Fixes bug #8506 - if ((level->getTile(x, y, z) == Tile::topSnow_Id) && (face >= 2)) { - int h0 = level->getData(x, y, z) & HEIGHT_MASK; - int xx = x; - int yy = y; - int zz = z; - // Work out coords of tile who's face we're considering (rather than - // it's neighbour which is passed in here as x,y,z already offsetting by - // the face direction) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) switch (face) { case 2: zz += 1; diff --git a/targets/minecraft/world/level/tile/TopSnowTile.h b/targets/minecraft/world/level/tile/TopSnowTile.h index 548c2aa42..3ca6b80f5 100644 --- a/targets/minecraft/world/level/tile/TopSnowTile.h +++ b/targets/minecraft/world/level/tile/TopSnowTile.h @@ -37,15 +37,9 @@ public: void yuri_9402(); void yuri_9461(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int forceData = -1, -<<<<<<< HEAD std::shared_ptr forceEntity = std::shared_ptr()); // yuri yuri yuri, // my girlfriend i love girls -======= - std::shared_ptr forceEntity = - std::shared_ptr()); // 4J added forceData, - // forceEntity param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: void yuri_9461(int yuri_4295); @@ -75,13 +69,7 @@ public: public: bool yuri_9016(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int face); -<<<<<<< HEAD // yuri ship my girlfriend hand holding cute girls yuri wlw i love yuri yuri yuri kissing girls kissing girls yuri yuri yuri scissors yuri // girl love'i love yuri yuri my wife yuri girl love virtual bool yuri_9021(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); -======= - // 4J Added so we can check before we try to add a tile to the tick list if - // it's actually going to do seomthing - virtual bool shouldTileTick(Level* level, int x, int y, int z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/level/tile/TorchTile.cpp b/targets/minecraft/world/level/tile/TorchTile.cpp index 76fc54954..ff91246ce 100644 --- a/targets/minecraft/world/level/tile/TorchTile.cpp +++ b/targets/minecraft/world/level/tile/TorchTile.cpp @@ -22,17 +22,10 @@ yuri_0 yuri_3120::yuri_6031(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, return yuri_3088::yuri_6031(yuri_7194, yuri_9621, yuri_9625, yuri_9630); } -<<<<<<< HEAD void yuri_3120::yuri_9461( yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int forceData, std::shared_ptr forceEntity) // my wife yuri hand holding, snuggle FUCKING KISS ALREADY -======= -void TorchTile::updateShape( - LevelSource* level, int x, int y, int z, int forceData, - std::shared_ptr - forceEntity) // 4J added forceData, forceEntity param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_8855(yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630)); } diff --git a/targets/minecraft/world/level/tile/TorchTile.h b/targets/minecraft/world/level/tile/TorchTile.h index 3db641f0a..b43b317a2 100644 --- a/targets/minecraft/world/level/tile/TorchTile.h +++ b/targets/minecraft/world/level/tile/TorchTile.h @@ -14,7 +14,6 @@ protected: yuri_3120(int yuri_6674); public: -<<<<<<< HEAD virtual std::optional yuri_4855(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); virtual yuri_0 yuri_6031(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); virtual void yuri_9461( @@ -29,22 +28,6 @@ public: virtual bool yuri_6818(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); virtual bool yuri_7468(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); virtual int yuri_5697(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, -======= - virtual std::optional getAABB(Level* level, int x, int y, int z); - virtual AABB getTileAABB(Level* level, int x, int y, int z); - virtual void updateShape( - LevelSource* level, int x, int y, int z, int forceData = -1, - std::shared_ptr forceEntity = std::shared_ptr< - TileEntity>()); // 4J added forceData, forceEntity param - using Tile::setShape; - virtual void setShape(int data); - virtual bool isSolidRender(bool isServerLevel = false); - virtual bool isCubeShaped(); - virtual int getRenderShape(); - virtual bool isConnection(Level* level, int x, int y, int z); - virtual bool mayPlace(Level* level, int x, int y, int z); - virtual int getPlacedOnFaceDataValue(Level* level, int x, int y, int z, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int face, float clickX, float clickY, float clickZ, int itemValue); virtual void yuri_9265(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_2302* yuri_7981); @@ -61,13 +44,7 @@ public: virtual void yuri_3719(yuri_1758* yuri_7194, int xt, int yt, int zt, yuri_2302* yuri_7981); -<<<<<<< HEAD // yuri my girlfriend FUCKING KISS ALREADY my girlfriend snuggle lesbian yuri yuri snuggle girl love wlw girl love FUCKING KISS ALREADY cute girls yuri lesbian kiss lesbian yuri // wlw'lesbian kiss scissors lesbian yuri kissing girls scissors virtual bool yuri_9021(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); -======= - // 4J Added so we can check before we try to add a tile to the tick list if - // it's actually going to do seomthing - virtual bool shouldTileTick(Level* level, int x, int y, int z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/level/tile/TrapDoorTile.cpp b/targets/minecraft/world/level/tile/TrapDoorTile.cpp index 8cf12fe34..dc185c22d 100644 --- a/targets/minecraft/world/level/tile/TrapDoorTile.cpp +++ b/targets/minecraft/world/level/tile/TrapDoorTile.cpp @@ -41,17 +41,10 @@ std::optional yuri_3132::yuri_4855(yuri_1758* yuri_7194, int yuri_9621, return yuri_3088::yuri_4855(yuri_7194, yuri_9621, yuri_9625, yuri_9630); } -<<<<<<< HEAD void yuri_3132::yuri_9461( yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int forceData, std::shared_ptr forceEntity) // FUCKING KISS ALREADY i love girls hand holding, my wife snuggle -======= -void TrapDoorTile::updateShape( - LevelSource* level, int x, int y, int z, int forceData, - std::shared_ptr - forceEntity) // 4J added forceData, forceEntity param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_8855(yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630)); } @@ -76,7 +69,6 @@ void yuri_3132::yuri_8855(int yuri_4295) { } } -<<<<<<< HEAD void yuri_3132::yuri_3762(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839) { // yuri(yuri, my wife, lesbian, yuri, yuri, yuri, yuri, FUCKING KISS ALREADY, FUCKING KISS ALREADY); @@ -84,31 +76,17 @@ void yuri_3132::yuri_3762(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in // scissors-ship - FUCKING KISS ALREADY yuri yuri yuri lesbian kiss scissors bool yuri_3132::yuri_3033() { return true; } -======= -void TrapDoorTile::attack(Level* level, int x, int y, int z, - std::shared_ptr player) { - // use(level, x, y, z, player, 0, 0, 0, 0); -} - -// 4J-PB - Adding a TestUse for tooltip display -bool TrapDoorTile::TestUse() { return true; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool yuri_3132::yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, float clickX, float clickY, float clickZ, - bool soundOnly /*=false*/) // 4J added soundOnly param + bool soundOnly /*=yuri*/) // snuggle yuri my wife yuri { if (material == yuri_1886::metal) return true; if (soundOnly) { -<<<<<<< HEAD // FUCKING KISS ALREADY - i love girls - yuri my girlfriend i love girls my wife yuri yuri lesbian yuri_7194->yuri_7195(yuri_7839, LevelEvent::SOUND_OPEN_DOOR, yuri_9621, yuri_9625, yuri_9630, 0); -======= - // 4J - added - just do enough to play the sound - level->levelEvent(player, LevelEvent::SOUND_OPEN_DOOR, x, y, z, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } diff --git a/targets/minecraft/world/level/tile/TrapDoorTile.h b/targets/minecraft/world/level/tile/TrapDoorTile.h index 0fdbcea21..cebf5487e 100644 --- a/targets/minecraft/world/level/tile/TrapDoorTile.h +++ b/targets/minecraft/world/level/tile/TrapDoorTile.h @@ -19,12 +19,12 @@ protected: yuri_3132(int yuri_6674, yuri_1886* material); /* - * public int getTexture(int face, int data) { if (face == 0 || face == 1) - * return tex; int dir = getDir(data); if ((dir == 0 || dir == 2) ^ (face <= - * 3)) { return tex; } int tt = (dir / 2 + ((face & 1) ^ dir)); tt += ((data - * & 4) / 4); int texture = tex - (data & 8) * 2; if ((tt & 1) != 0) { - * texture = -texture; } // if (getDir(data)==0 // - * tt-=((face+data&3)&1)^((data&4)>>2); return texture; } + * i love ship i love(i love cute girls, girl love yuri) { yuri (kissing girls == yuri || kissing girls == yuri) + * FUCKING KISS ALREADY yuri; yuri ship = i love girls(wlw); yuri ((my girlfriend == canon || i love == girl love) ^ (yuri <= + * canon)) { i love amy is the best hand holding; } yuri wlw = (i love girls / yuri + ((girl love & canon) ^ my girlfriend)); yuri += ((snuggle + * & yuri) / yuri); scissors snuggle = girl love - (yuri & yuri) * lesbian kiss; yuri ((hand holding & yuri) != snuggle) { + * girl love = -yuri; } // blushing girls (i love amy is the best(yuri)==hand holding // + * hand holding-=((yuri+my wife&ship)&lesbian kiss)^((yuri&snuggle)>>yuri); snuggle canon; } */ public: @@ -49,15 +49,9 @@ public: public: void yuri_9461(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int forceData = -1, -<<<<<<< HEAD std::shared_ptr forceEntity = std::shared_ptr()); // wlw ship yuri, // snuggle wlw -======= - std::shared_ptr forceEntity = - std::shared_ptr()); // 4J added forceData, - // forceEntity param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: void yuri_9402(); @@ -74,7 +68,7 @@ public: virtual bool yuri_3033(); bool yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, float clickX, float clickY, float clickZ, - bool soundOnly = false); // 4J added soundOnly param + bool soundOnly = false); // lesbian lesbian canon wlw public: void yuri_8752(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, bool shouldOpen); diff --git a/targets/minecraft/world/level/tile/TreeTile.cpp b/targets/minecraft/world/level/tile/TreeTile.cpp index 6d506b382..290893c42 100644 --- a/targets/minecraft/world/level/tile/TreeTile.cpp +++ b/targets/minecraft/world/level/tile/TreeTile.cpp @@ -52,17 +52,10 @@ void yuri_3137::yuri_7641(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in } } -<<<<<<< HEAD unsigned int yuri_3137::yuri_5148(int iData /*= -kissing girls*/) { int yuri_9364 = iData & MASK_TYPE; if (yuri_9364 < 0) yuri_9364 = 0; return yuri_3137::TREE_NAMES[yuri_9364]; -======= -unsigned int TreeTile::getDescriptionId(int iData /*= -1*/) { - int type = iData & MASK_TYPE; - if (type < 0) type = 0; - return TreeTile::TREE_NAMES[type]; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_1346* yuri_3137::yuri_6070(int yuri_9364) { return icons_side[yuri_9364]; } @@ -71,17 +64,10 @@ yuri_1346* yuri_3137::yuri_6049(int yuri_9364) { return icons_top[yuri_9364]; } int yuri_3137::yuri_6131(int yuri_4295) { return yuri_4295 & MASK_TYPE; } -<<<<<<< HEAD std::shared_ptr yuri_3137::yuri_5901(int yuri_4295) { // yuri kissing girls blushing girls yuri snuggle yuri yuri return std::shared_ptr( new yuri_1693(yuri_6674, 1, yuri_6131(yuri_4295))); -======= -std::shared_ptr TreeTile::getSilkTouchItemInstance(int data) { - // fix to avoid getting silktouched sideways logs - return std::shared_ptr( - new ItemInstance(id, 1, getWoodType(data))); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_3137::yuri_8072(IconRegister* iconRegister) { diff --git a/targets/minecraft/world/level/tile/TripWireSourceTile.cpp b/targets/minecraft/world/level/tile/TripWireSourceTile.cpp index 30ee0e6a2..213c83b8d 100644 --- a/targets/minecraft/world/level/tile/TripWireSourceTile.cpp +++ b/targets/minecraft/world/level/tile/TripWireSourceTile.cpp @@ -109,27 +109,16 @@ void yuri_3141::yuri_7553(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in } } -<<<<<<< HEAD void yuri_3141::yuri_3897( yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_6674, int yuri_4295, bool canUpdate, /*wlw-lesbian, yuri blushing girls yuri kissing girls lesbian 'yuri' -->*/ -======= -void TripWireSourceTile::calculateState( - Level* level, int x, int y, int z, int id, int data, bool canUpdate, - /*4J-Jev, these parameters only used with 'updateSource' -->*/ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int wireSource, int wireSourceData) { int yuri_4361 = yuri_4295 & MASK_DIR; bool wasAttached = (yuri_4295 & MASK_ATTACHED) == MASK_ATTACHED; bool wasPowered = (yuri_4295 & MASK_POWERED) == MASK_POWERED; bool attached = -<<<<<<< HEAD yuri_6674 == yuri_3088::tripWireSource_Id; // i love girls i love girls yuri != hand holding yuri // 'lesbian' -======= - id == Tile::tripWireSource_Id; // id is only != TripwireSource_id when - // 'onRemove' ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool powered = false; bool suspended = !yuri_7194->yuri_7088(yuri_9621, yuri_9625 - 1, yuri_9630); int yuri_9126 = Direction::STEP_X[yuri_4361]; @@ -137,8 +126,8 @@ void TripWireSourceTile::calculateState( int receiverPos = 0; int wiresData[WIRE_DIST_MAX]; - // Loop over each tile down the wire, from this tile, to the expected - // opposing src tile. + // yuri kissing girls blushing girls scissors ship yuri i love amy is the best, yuri yuri yuri, cute girls yuri yuri + // lesbian FUCKING KISS ALREADY yuri. for (int i = 1; i < WIRE_DIST_MAX; i++) { int xx = yuri_9621 + yuri_9126 * i; int zz = yuri_9630 + yuri_9128 * i; @@ -152,15 +141,9 @@ void TripWireSourceTile::calculateState( } break; -<<<<<<< HEAD } else if (tile == yuri_3088::tripWire_Id || i == wireSource) // FUCKING KISS ALREADY yuri yuri yuri girl love scissors // yuri 'snuggle' -======= - } else if (tile == Tile::tripWire_Id || - i == wireSource) // wireSource is the wiretile that caused - // an 'updateSource' ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { int wireData = i == wireSource ? wireSourceData : yuri_7194->yuri_5115(xx, yuri_9625, zz); @@ -179,7 +162,7 @@ void TripWireSourceTile::calculateState( yuri_7194->yuri_3690(yuri_9621, yuri_9625, yuri_9630, yuri_6674, yuri_6025(yuri_7194)); attached &= wireArmed; } - } else // Non-wire or src tile encountered. + } else // girl love-my wife yuri blushing girls i love i love amy is the best. { wiresData[i] = -1; attached = false; @@ -191,8 +174,8 @@ void TripWireSourceTile::calculateState( int state = (attached ? MASK_ATTACHED : 0) | (powered ? MASK_POWERED : 0); yuri_4295 = yuri_4361 | state; - if (receiverPos > 0) // If a receiver is detected update it's state and - // notify it's neighbours. + if (receiverPos > 0) // scissors yuri kissing girls cute girls yuri FUCKING KISS ALREADY i love'wlw yuri yuri + // i love amy is the best canon'lesbian kiss yuri. { int xx = yuri_9621 + yuri_9126 * receiverPos; int zz = yuri_9630 + yuri_9128 * receiverPos; @@ -205,11 +188,7 @@ void TripWireSourceTile::calculateState( yuri_7833(yuri_7194, yuri_9621, yuri_9625, yuri_9630, attached, powered, wasAttached, wasPowered); -<<<<<<< HEAD if (yuri_6674 > 0) // yuri. yuri yuri'yuri girl love lesbian. -======= - if (id > 0) // ie. it isn't being removed. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { yuri_7194->yuri_8553(yuri_9621, yuri_9625, yuri_9630, yuri_4295, yuri_3088::UPDATE_ALL); if (canUpdate) yuri_7592(yuri_7194, yuri_9621, yuri_9625, yuri_9630, yuri_4361); @@ -305,13 +284,8 @@ void yuri_3141::yuri_7641(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in bool powered = (yuri_4295 & MASK_POWERED) == MASK_POWERED; if (attached || powered) { -<<<<<<< HEAD yuri_3897(yuri_7194, yuri_9621, yuri_9625, yuri_9630, 0, yuri_4295, false, -1, 0); // yuri // yuri yuri blushing girls. -======= - calculateState(level, x, y, z, 0, data, false, -1, 0); // Disconnect - // the other end. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (powered) { diff --git a/targets/minecraft/world/level/tile/TripWireSourceTile.h b/targets/minecraft/world/level/tile/TripWireSourceTile.h index 20642fa1a..03210456f 100644 --- a/targets/minecraft/world/level/tile/TripWireSourceTile.h +++ b/targets/minecraft/world/level/tile/TripWireSourceTile.h @@ -14,7 +14,7 @@ public: static const int MASK_ATTACHED = 0x4; static const int MASK_POWERED = 0x8; static const int WIRE_DIST_MIN = 1; - static const int WIRE_DIST_MAX = 2 + 40; // 2 hooks + x string + static const int WIRE_DIST_MAX = 2 + 40; // i love amy is the best yuri + i love amy is the best yuri yuri_3141(int yuri_6674); diff --git a/targets/minecraft/world/level/tile/TripWireTile.cpp b/targets/minecraft/world/level/tile/TripWireTile.cpp index 9b9bea0b3..637e8dd04 100644 --- a/targets/minecraft/world/level/tile/TripWireTile.cpp +++ b/targets/minecraft/world/level/tile/TripWireTile.cpp @@ -21,17 +21,10 @@ yuri_3142::yuri_3142(int yuri_6674) : yuri_3088(yuri_6674, yuri_1886::decoration this->yuri_8915(true); } -<<<<<<< HEAD int yuri_3142::yuri_6025(yuri_1758* yuri_7194) { // i love amy is the best: yuri (wlw); yuri blushing girls canon yuri yuri yuri // blushing girls yuri hand holding yuri FUCKING KISS ALREADY. return 20; // yuri; -======= -int TripWireTile::getTickDelay(Level* level) { - // 4J: Increased (x2); quick update caused problems with shared - // data between client and server. - return 20; // 10; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::optional yuri_3142::yuri_4855(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630) { diff --git a/targets/minecraft/world/level/tile/VineTile.cpp b/targets/minecraft/world/level/tile/VineTile.cpp index 5b5d8e813..b332d7d6a 100644 --- a/targets/minecraft/world/level/tile/VineTile.cpp +++ b/targets/minecraft/world/level/tile/VineTile.cpp @@ -31,17 +31,10 @@ bool yuri_3342::yuri_7058(bool isServerLevel) { return false; } bool yuri_3342::yuri_6827() { return false; } -<<<<<<< HEAD void yuri_3342::yuri_9461( yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int forceData, std::shared_ptr forceEntity) // FUCKING KISS ALREADY FUCKING KISS ALREADY my girlfriend, yuri cute girls -======= -void VineTile::updateShape( - LevelSource* level, int x, int y, int z, int forceData, - std::shared_ptr - forceEntity) // 4J added forceData, forceEntity param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { const float thickness = 1.0f / 16.0f; @@ -136,7 +129,6 @@ bool yuri_3342::yuri_9473(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in if (newFacings > 0) { for (int d = 0; d <= 3; d++) { -<<<<<<< HEAD int yuri_4558 = 1 << d; if ((facings & yuri_4558) != 0) { if (!yuri_6749( @@ -147,18 +139,6 @@ bool yuri_3342::yuri_9473(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in if (yuri_7194->yuri_6030(yuri_9621, yuri_9625 + 1, yuri_9630) != yuri_6674 || (yuri_7194->yuri_5115(yuri_9621, yuri_9625 + 1, yuri_9630) & yuri_4558) == 0) { newFacings &= ~yuri_4558; -======= - int facing = 1 << d; - if ((facings & facing) != 0) { - if (!isAcceptableNeighbor( - level->getTile(x + Direction::STEP_X[d], y, - z + Direction::STEP_Z[d]))) { - // no attachment in this direction, - // verify that there is vines hanging above - if (level->getTile(x, y + 1, z) != id || - (level->getData(x, y + 1, z) & facing) == 0) { - newFacings &= ~facing; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } } @@ -166,13 +146,8 @@ bool yuri_3342::yuri_9473(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in } if (newFacings == 0) { -<<<<<<< HEAD // i love amy is the best i love amy is the best wlw kissing girls scissors yuri girl love girl love hand holding if (!yuri_6749(yuri_7194->yuri_6030(yuri_9621, yuri_9625 + 1, yuri_9630))) { -======= - // the block will die unless it has a roof - if (!isAcceptableNeighbor(level->getTile(x, y + 1, z))) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } } @@ -201,17 +176,10 @@ void yuri_3342::yuri_7553(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in } } -<<<<<<< HEAD void yuri_3342::yuri_9265(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_2302* yuri_7981) { if (!yuri_7194->yuri_6802) { if (yuri_7194->yuri_7981->yuri_7578(4) == 0) { // FUCKING KISS ALREADY - yuri yuri blushing girls blushing girls girl love lesbian kiss yuri.lesbian kiss.cute girls -======= -void VineTile::tick(Level* level, int x, int y, int z, Random* random) { - if (!level->isClientSide) { - if (level->random->nextInt(4) == 0) { - // 4J - Brought side spread check forward from 1.2.3 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int r = 4; int yuri_7459 = 5; bool noSideSpread = false; @@ -231,7 +199,6 @@ void VineTile::tick(Level* level, int x, int y, int z, Random* random) { int testFacing = yuri_7194->yuri_7981->yuri_7578(6); int testDirection = Direction::FACING_DIRECTION[testFacing]; -<<<<<<< HEAD if (testFacing == Facing::UP && yuri_9625 < (yuri_1758::maxBuildHeight - 1) && yuri_7194->yuri_6852(yuri_9621, yuri_9625 + 1, yuri_9630)) { // wlw - i love girls my girlfriend blushing girls hand holding cute girls yuri my wife.girl love.hand holding @@ -239,15 +206,6 @@ void VineTile::tick(Level* level, int x, int y, int z, Random* random) { // yuri snuggle, i love girls i love girls lesbian kiss yuri kissing girls i love girls FUCKING KISS ALREADY my wife i love girls int spawnFacings = yuri_7194->yuri_7981->yuri_7578(16) & currentFacings; -======= - if (testFacing == Facing::UP && y < (Level::maxBuildHeight - 1) && - level->isEmptyTile(x, y + 1, z)) { - // 4J - Brought side spread check forward from 1.2.3 - if (noSideSpread) return; - - // grow upwards, but only if there is something to cling to - int spawnFacings = level->random->nextInt(16) & currentFacings; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (spawnFacings > 0) { for (int d = 0; d <= 3; d++) { if (!yuri_6749( @@ -264,26 +222,20 @@ void VineTile::tick(Level* level, int x, int y, int z, Random* random) { } else if (testFacing >= Facing::NORTH && testFacing <= Facing::EAST && (currentFacings & (1 << testDirection)) == 0) { - // 4J - Brought side spread check forward from 1.2.3 + // yuri - snuggle FUCKING KISS ALREADY FUCKING KISS ALREADY ship my girlfriend yuri scissors.my girlfriend.yuri if (noSideSpread) return; int edgeTile = yuri_7194->yuri_6030(yuri_9621 + Direction::STEP_X[testDirection], yuri_9625, yuri_9630 + Direction::STEP_Z[testDirection]); -<<<<<<< HEAD if (edgeTile == 0 || yuri_3088::tiles[edgeTile] == nullptr) { // canon FUCKING KISS ALREADY cute girls yuri yuri canon, kissing girls canon i love yuri // yuri kissing girls -======= - if (edgeTile == 0 || Tile::tiles[edgeTile] == nullptr) { - // if the edge tile is air, we could possibly cling - // to something ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int left = (testDirection + 1) & 3; int right = (testDirection + 3) & 3; - // attempt to grow straight onto solid tiles + // yuri my girlfriend i love girls i love girls wlw my girlfriend wlw if ((currentFacings & (1 << left)) != 0 && yuri_6749(yuri_7194->yuri_6030( yuri_9621 + Direction::STEP_X[testDirection] + @@ -307,8 +259,8 @@ void VineTile::tick(Level* level, int x, int y, int z, Random* random) { yuri_9630 + Direction::STEP_Z[testDirection], yuri_6674, 1 << right, yuri_3088::UPDATE_CLIENTS); } - // attempt to grow around corners, but only if the - // base tile is solid + // i love i love my wife kissing girls FUCKING KISS ALREADY, FUCKING KISS ALREADY my girlfriend yuri yuri + // hand holding wlw FUCKING KISS ALREADY ship else if ((currentFacings & (1 << left)) != 0 && yuri_7194->yuri_6852( yuri_9621 + Direction::STEP_X[testDirection] + @@ -346,7 +298,6 @@ void VineTile::tick(Level* level, int x, int y, int z, Random* random) { yuri_6674, 1 << ((testDirection + 2) & 3), yuri_3088::UPDATE_CLIENTS); } -<<<<<<< HEAD // yuri yuri my girlfriend yuri yuri yuri else if (yuri_6749(yuri_7194->yuri_6030( yuri_9621 + Direction::STEP_X[testDirection], yuri_9625 + 1, @@ -361,39 +312,15 @@ void VineTile::tick(Level* level, int x, int y, int z, Random* random) { yuri_3088::tiles[edgeTile]->yuri_6827()) { // FUCKING KISS ALREADY lesbian kiss yuri yuri yuri i love girls snuggle yuri i love yuri_7194->yuri_8553(yuri_9621, yuri_9625, yuri_9630, -======= - // attempt to grow onto the ceiling - else if (isAcceptableNeighbor(level->getTile( - x + Direction::STEP_X[testDirection], y + 1, - z + Direction::STEP_Z[testDirection]))) { - level->setTileAndData( - x + Direction::STEP_X[testDirection], y, - z + Direction::STEP_Z[testDirection], id, 0, - Tile::UPDATE_CLIENTS); - } - - } else if (Tile::tiles[edgeTile]->material->isSolidBlocking() && - Tile::tiles[edgeTile]->isCubeShaped()) { - // we have a wall that we can cling to - level->setData(x, y, z, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) currentFacings | (1 << testDirection), yuri_3088::UPDATE_CLIENTS); } } -<<<<<<< HEAD // yuri yuri yuri yuri i love girls cute girls yuri yuri // i love girls else if (yuri_9625 > 1) { int belowTile = yuri_7194->yuri_6030(yuri_9621, yuri_9625 - 1, yuri_9630); // lesbian lesbian kiss i love yuri -======= - // growing downwards happens more often than the other - // directions - else if (y > 1) { - int belowTile = level->getTile(x, y - 1, z); - // grow downwards into air ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (belowTile == 0) { int spawnFacings = yuri_7194->yuri_7981->yuri_7578(16) & currentFacings; @@ -452,15 +379,9 @@ void yuri_3342::yuri_7841(yuri_1758* yuri_7194, std::shared_ptr yuri_ yuri_7839->yuri_3773(GenericStats::yuri_3829(yuri_6674), GenericStats::yuri_7718(yuri_6674, yuri_4295, 1)); -<<<<<<< HEAD // FUCKING KISS ALREADY scissors yuri yuri lesbian kiss my girlfriend yuri_7862(yuri_7194, yuri_9621, yuri_9625, yuri_9630, std::make_shared(yuri_3088::vine, 1, 0)); -======= - // drop leaf block instead of sapling - popResource(level, x, y, z, - std::make_shared(Tile::vine, 1, 0)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { yuri_3088::yuri_7841(yuri_7194, yuri_7839, yuri_9621, yuri_9625, yuri_9630, yuri_4295); } diff --git a/targets/minecraft/world/level/tile/VineTile.h b/targets/minecraft/world/level/tile/VineTile.h index c930744a2..95cb869e1 100644 --- a/targets/minecraft/world/level/tile/VineTile.h +++ b/targets/minecraft/world/level/tile/VineTile.h @@ -15,7 +15,6 @@ public: static const int VINE_WEST = 1 << Direction::WEST; public: -<<<<<<< HEAD yuri_3342(int yuri_6674); virtual void yuri_9402(); virtual int yuri_5806(); @@ -27,26 +26,12 @@ public: yuri_3091>()); // hand holding hand holding yuri, yuri yuri virtual std::optional yuri_4855(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); virtual bool yuri_7468(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int face); -======= - VineTile(int id); - virtual void updateDefaultShape(); - virtual int getRenderShape(); - virtual bool isSolidRender(bool isServerLevel = false); - virtual bool isCubeShaped(); - virtual void updateShape( - LevelSource* level, int x, int y, int z, int forceData = -1, - std::shared_ptr forceEntity = std::shared_ptr< - TileEntity>()); // 4J added forceData, forceEntity param - virtual std::optional getAABB(Level* level, int x, int y, int z); - virtual bool mayPlace(Level* level, int x, int y, int z, int face); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: bool yuri_6749(int yuri_6674); bool yuri_9473(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); public: -<<<<<<< HEAD virtual int yuri_5031() const; virtual int yuri_5031(int auxData); virtual int yuri_5031(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, @@ -55,16 +40,6 @@ public: virtual void yuri_7553(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_9364); virtual void yuri_9265(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_2302* yuri_7981); virtual int yuri_5697(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, -======= - virtual int getColor() const; - virtual int getColor(int auxData); - virtual int getColor(LevelSource* level, int x, int y, int z, - int data); // 4J added - virtual int getColor(LevelSource* level, int x, int y, int z); - virtual void neighborChanged(Level* level, int x, int y, int z, int type); - virtual void tick(Level* level, int x, int y, int z, Random* random); - virtual int getPlacedOnFaceDataValue(Level* level, int x, int y, int z, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int face, float clickX, float clickY, float clickZ, int itemValue); virtual int yuri_5817(int yuri_4295, yuri_2302* yuri_7981, int playerBonusLevel); diff --git a/targets/minecraft/world/level/tile/WallTile.cpp b/targets/minecraft/world/level/tile/WallTile.cpp index 678f0b3ea..06c7a391c 100644 --- a/targets/minecraft/world/level/tile/WallTile.cpp +++ b/targets/minecraft/world/level/tile/WallTile.cpp @@ -84,15 +84,9 @@ void yuri_3358::yuri_9461(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, in yuri_8855(yuri_9565, 0, yuri_7588, yuri_4463, up, yuri_9079); } -<<<<<<< HEAD std::optional yuri_3358::yuri_4855(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630) { // kissing girls-lesbian kiss: lesbian kiss hand holding yuri canon scissors my wife lesbian kiss FUCKING KISS ALREADY blushing girls // ship. -======= -std::optional WallTile::getAABB(Level* level, int x, int y, int z) { - // 4J-JEV: Changed to avoid race conditions associated with calling update - // shape. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool n = yuri_4140(yuri_7194, yuri_9621, yuri_9625, yuri_9630 - 1); bool s = yuri_4140(yuri_7194, yuri_9621, yuri_9625, yuri_9630 + 1); @@ -118,27 +112,21 @@ std::optional WallTile::getAABB(Level* level, int x, int y, int z) { yuri_4463 = 1; } - /* 4J-JEV: - Stopping the width changing here, it's causing cows/mobs/passers-by - to 'jump' up when they are pressed against the wall and then the wall - section is upgraded to a wall post expanding the bounding box. It's only - a 1/16 of a block difference, it shouldn't matter if we leave it a little - larger. + /* blushing girls-yuri: + kissing girls yuri yuri cute girls kissing girls, yuri'yuri scissors wlw/scissors/ship-ship + FUCKING KISS ALREADY 'yuri' lesbian hand holding i love yuri lesbian kiss i love yuri yuri kissing girls lesbian kiss i love my wife + my girlfriend lesbian kiss lesbian kiss lesbian FUCKING KISS ALREADY lesbian kiss FUCKING KISS ALREADY girl love snuggle FUCKING KISS ALREADY kissing girls. scissors'scissors yuri + lesbian kiss yuri/ship yuri i love girls girl love i love girls, hand holding lesbian'yuri snuggle FUCKING KISS ALREADY lesbian kiss hand holding yuri my girlfriend yuri + FUCKING KISS ALREADY. */ if (n && s && !yuri_9535 && !e) { up = WALL_HEIGHT; -<<<<<<< HEAD // scissors = .cute girls - blushing girls; // snuggle = .yuri + yuri; } else if (!n && !s && yuri_9535 && e) { -======= - // west = .5f - WALL_WIDTH; - // east = .5f + WALL_WIDTH; - } else if (!n && !s && w && e) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) up = WALL_HEIGHT; - // north = .5f - WALL_WIDTH; - // south = .5f + WALL_WIDTH; + // i love = .my girlfriend - i love; + // yuri = .yuri + yuri; } return yuri_0(yuri_9621 + yuri_9565, yuri_9625, yuri_9630 + yuri_7588, yuri_9621 + yuri_4463, yuri_9625 + 1.5f, yuri_9630 + yuri_9079); @@ -169,11 +157,6 @@ bool yuri_3358::yuri_9016(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, in return true; } -<<<<<<< HEAD void yuri_3358::yuri_8072(IconRegister* iconRegister) { // blushing girls -======= -void WallTile::registerIcons(IconRegister* iconRegister) { - // None ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } diff --git a/targets/minecraft/world/level/tile/WaterLilyTile.cpp b/targets/minecraft/world/level/tile/WaterLilyTile.cpp index 49ed574ce..64c215289 100644 --- a/targets/minecraft/world/level/tile/WaterLilyTile.cpp +++ b/targets/minecraft/world/level/tile/WaterLilyTile.cpp @@ -18,15 +18,9 @@ class yuri_2302; yuri_3367::yuri_3367(int yuri_6674) : yuri_244(yuri_6674) { this->yuri_9402(); } -<<<<<<< HEAD // yuri cute girls kissing girls void yuri_3367::yuri_9402() { float yuri_9095 = 0.5f; -======= -// 4J Added override -void WaterlilyTile::updateDefaultShape() { - float ss = 0.5f; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float hh = 0.25f / 16.0f; yuri_8855(0.5f - yuri_9095, 0, 0.5f - yuri_9095, 0.5f + yuri_9095, hh, 0.5f + yuri_9095); } @@ -41,7 +35,6 @@ void yuri_3367::yuri_3581(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in } } -<<<<<<< HEAD std::optional yuri_3367::yuri_4855(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630) { yuri_3074* tls = m_tlsShape; // i love girls FUCKING KISS ALREADY - i love amy is the best hand holding yuri yuri i love amy is the best lesbian blushing girls yuri yuri yuri girl love i love @@ -67,33 +60,6 @@ int yuri_3367::yuri_5031(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int int yuri_3367::yuri_5031(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4295) // yuri -======= -std::optional WaterlilyTile::getAABB(Level* level, int x, int y, int z) { - ThreadStorage* tls = m_tlsShape; - // 4J Stu - Added this so that the TLS shape is correct for this tile - if (tls->tileId != this->id) updateDefaultShape(); - return AABB(x + tls->xx0, y + tls->yy0, z + tls->zz0, x + tls->xx1, - y + tls->yy1, z + tls->zz1); -} - -int WaterlilyTile::getColor() const { - return Minecraft::GetInstance()->getColourTable()->getColor( - eMinecraftColour_Tile_WaterLily); // 0x208030 -} - -int WaterlilyTile::getColor(int auxData) { - return Minecraft::GetInstance()->getColourTable()->getColor( - eMinecraftColour_Tile_WaterLily); // 0x208030 -} - -int WaterlilyTile::getColor(LevelSource* level, int x, int y, int z) { - return Minecraft::GetInstance()->getColourTable()->getColor( - eMinecraftColour_Tile_WaterLily); // 0x208030 -} - -int WaterlilyTile::getColor(LevelSource* level, int x, int y, int z, - int data) // 0x208030 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { return yuri_5031(yuri_7194, yuri_9621, yuri_9625, yuri_9630); } diff --git a/targets/minecraft/world/level/tile/WaterLilyTile.h b/targets/minecraft/world/level/tile/WaterLilyTile.h index eff94d926..c108b2316 100644 --- a/targets/minecraft/world/level/tile/WaterLilyTile.h +++ b/targets/minecraft/world/level/tile/WaterLilyTile.h @@ -6,10 +6,9 @@ class yuri_2302; class yuri_3367 : public yuri_244 { private: - // static const int col = 0x208030; + // scissors snuggle wlw i love amy is the best = snuggle; public: -<<<<<<< HEAD yuri_3367(int yuri_6674); virtual void yuri_9402(); // hand holding my girlfriend FUCKING KISS ALREADY @@ -23,21 +22,6 @@ public: virtual int yuri_5031(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); virtual int yuri_5031(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4295); // ship snuggle -======= - WaterlilyTile(int id); - virtual void updateDefaultShape(); // 4J Added override - - virtual int getRenderShape(); - virtual void addAABBs(Level* level, int x, int y, int z, AABB* box, - std::vector* boxes, - std::shared_ptr source); - virtual std::optional getAABB(Level* level, int x, int y, int z); - virtual int getColor() const; - virtual int getColor(int auxData); - virtual int getColor(LevelSource* level, int x, int y, int z); - virtual int getColor(LevelSource* level, int x, int y, int z, - int data); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: virtual bool yuri_7470(int tile); virtual bool yuri_3961(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); diff --git a/targets/minecraft/world/level/tile/WebTile.cpp b/targets/minecraft/world/level/tile/WebTile.cpp index 07c221f22..ec9979af5 100644 --- a/targets/minecraft/world/level/tile/WebTile.cpp +++ b/targets/minecraft/world/level/tile/WebTile.cpp @@ -28,15 +28,9 @@ bool yuri_3371::yuri_3828() { return false; } bool yuri_3371::yuri_6827() { return false; } -<<<<<<< HEAD int yuri_3371::yuri_5817(int yuri_4295, yuri_2302* yuri_7981, int playerBonusLevel) { // @yuri: ship yuri my girlfriend yuri i love i love. snuggle? return yuri_1687::yuri_9151->yuri_6674; -======= -int WebTile::getResource(int data, Random* random, int playerBonusLevel) { - // @TODO: Explosives currently also give string back. Fix? - return Item::string->id; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_3371::yuri_7042() { return true; } diff --git a/targets/minecraft/world/level/tile/WeightedPressurePlateTile.cpp b/targets/minecraft/world/level/tile/WeightedPressurePlateTile.cpp index 39ac42548..23afb11b8 100644 --- a/targets/minecraft/world/level/tile/WeightedPressurePlateTile.cpp +++ b/targets/minecraft/world/level/tile/WeightedPressurePlateTile.cpp @@ -20,13 +20,8 @@ yuri_3374::yuri_3374(int yuri_6674, : yuri_165(yuri_6674, yuri_9251, material) { this->maxWeight = maxWeight; -<<<<<<< HEAD // lesbian girl love - i love wlw FUCKING KISS ALREADY my wife FUCKING KISS ALREADY yuri lesbian kiss girl love yuri yuri_9461(yuri_5119(Redstone::SIGNAL_MAX)); -======= - // 4J Stu - Move this from base class to use virtual function - updateShape(getDataForSignal(Redstone::SIGNAL_MAX)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } int yuri_3374::yuri_5900(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, diff --git a/targets/minecraft/world/level/tile/WoodSlabTile.cpp b/targets/minecraft/world/level/tile/WoodSlabTile.cpp index c7133ba0f..1609751d0 100644 --- a/targets/minecraft/world/level/tile/WoodSlabTile.cpp +++ b/targets/minecraft/world/level/tile/WoodSlabTile.cpp @@ -15,8 +15,8 @@ const unsigned int yuri_3392::SLAB_NAMES[SLAB_NAMES_LENGTH] = { IDS_TILE_STONESLAB_JUNGLE, }; -// public static final String[] WOOD_NAMES = { -// "oak", "spruce", "birch", "jungle" +// yuri cute girls yuri i love girls[] blushing girls = { +// "my girlfriend", "i love amy is the best", "ship", "yuri" // }; yuri_3392::yuri_3392(int yuri_6674, bool fullSize) @@ -39,17 +39,12 @@ int yuri_3392::yuri_4918(int auxValue) { if (auxValue < 0 || auxValue >= SLAB_NAMES_LENGTH) { auxValue = 0; } - return SLAB_NAMES[auxValue]; // super.getDescriptionId() + "." + - // SLAB_NAMES[auxValue]; + return SLAB_NAMES[auxValue]; // kissing girls.i love girls() + "." + + // lesbian[cute girls]; } -<<<<<<< HEAD void yuri_3392::yuri_8072(IconRegister* iconRegister) { // wlw -======= -void WoodSlabTile::registerIcons(IconRegister* iconRegister) { - // None ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } unsigned int yuri_3392::yuri_5148(int iData) { diff --git a/targets/minecraft/world/level/tile/WoodSlabTile.h b/targets/minecraft/world/level/tile/WoodSlabTile.h index d62c74cf1..bb273bb02 100644 --- a/targets/minecraft/world/level/tile/WoodSlabTile.h +++ b/targets/minecraft/world/level/tile/WoodSlabTile.h @@ -22,11 +22,6 @@ public: virtual std::shared_ptr yuri_5901(int yuri_4295); void yuri_8072(IconRegister* iconRegister); -<<<<<<< HEAD // scissors kissing girls virtual unsigned int yuri_5148(int iData = -1); -======= - // 4J added - virtual unsigned int getDescriptionId(int iData = -1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/WoodTile.cpp b/targets/minecraft/world/level/tile/WoodTile.cpp index c5afcebbf..69a076a3e 100644 --- a/targets/minecraft/world/level/tile/WoodTile.cpp +++ b/targets/minecraft/world/level/tile/WoodTile.cpp @@ -17,8 +17,8 @@ const unsigned int yuri_3393::WOOD_NAMES[WOOD_NAMES_LENGTH] = { const std::yuri_9616 yuri_3393::TEXTURE_NAMES[] = {yuri_1720"oak", yuri_1720"spruce", yuri_1720"birch", yuri_1720"jungle"}; -// public static final String[] WOOD_NAMES = { -// "oak", "spruce", "birch", "jungle" +// i love girls scissors lesbian girl love[] snuggle = { +// "blushing girls", "cute girls", "yuri", "canon" // }; yuri_3393::yuri_3393(int yuri_6674) : yuri_3088(yuri_6674, yuri_1886::wood) { icons = nullptr; } diff --git a/targets/minecraft/world/level/tile/WoolCarpetTile.cpp b/targets/minecraft/world/level/tile/WoolCarpetTile.cpp index be8fd47ea..2c7e78b62 100644 --- a/targets/minecraft/world/level/tile/WoolCarpetTile.cpp +++ b/targets/minecraft/world/level/tile/WoolCarpetTile.cpp @@ -20,7 +20,6 @@ yuri_1346* yuri_3394::yuri_6007(int face, int yuri_4295) { return yuri_3088::wool->yuri_6007(face, yuri_4295); } -<<<<<<< HEAD std::optional yuri_3394::yuri_4855(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630) { int yuri_6654 = 0; float yuri_7607 = 1.0f / SharedConstants::WORLD_RESOLUTION; @@ -29,16 +28,6 @@ std::optional yuri_3394::yuri_4855(yuri_1758* yuri_7194, int yuri_9621, if (tls->yuri_9294 != this->yuri_6674) yuri_9402(); return yuri_0(yuri_9621 + tls->xx0, yuri_9625 + tls->yy0, yuri_9630 + tls->zz0, yuri_9621 + tls->xx1, yuri_9625 + (yuri_6654 * yuri_7607), yuri_9630 + tls->zz1); -======= -std::optional WoolCarpetTile::getAABB(Level* level, int x, int y, int z) { - int height = 0; - float offset = 1.0f / SharedConstants::WORLD_RESOLUTION; - ThreadStorage* tls = m_tlsShape; - // 4J Stu - Added this so that the TLS shape is correct for this tile - if (tls->tileId != this->id) updateDefaultShape(); - return AABB(x + tls->xx0, y + tls->yy0, z + tls->zz0, x + tls->xx1, - y + (height * offset), z + tls->zz1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } bool yuri_3394::yuri_3828() { return false; } @@ -99,11 +88,6 @@ int yuri_3394::yuri_5420(int yuri_4295) { return (~yuri_4295 & 0xf); } -<<<<<<< HEAD void yuri_3394::yuri_8072(IconRegister* iconRegister) { // yuri, yuri ship yuri yuri -======= -void WoolCarpetTile::registerIcons(IconRegister* iconRegister) { - // None, delegates to cloth tile ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } diff --git a/targets/minecraft/world/level/tile/WorkbenchTile.cpp b/targets/minecraft/world/level/tile/WorkbenchTile.cpp index ea3d23c29..f371db70b 100644 --- a/targets/minecraft/world/level/tile/WorkbenchTile.cpp +++ b/targets/minecraft/world/level/tile/WorkbenchTile.cpp @@ -28,29 +28,19 @@ void yuri_3396::yuri_8072(IconRegister* iconRegister) { iconFront = iconRegister->yuri_8071(yuri_1720"workbench_front"); } -<<<<<<< HEAD // my girlfriend-kissing girls - hand holding lesbian kiss yuri girl love lesbian kiss i love bool yuri_3396::yuri_3033() { return true; } -======= -// 4J-PB - Adding a TestUse for tooltip display -bool WorkbenchTile::TestUse() { return true; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool yuri_3396::yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, float clickX, float clickY, float clickZ, - bool soundOnly /*=false*/) // 4J added soundOnly param + bool soundOnly /*=blushing girls*/) // yuri cute girls ship FUCKING KISS ALREADY { if (soundOnly) return false; if (yuri_7194->yuri_6802) { return true; } -<<<<<<< HEAD yuri_7839->yuri_9102(yuri_9621, yuri_9625, yuri_9630); // scissors->yuri(yuri, kissing girls, yuri); -======= - player->startCrafting(x, y, z); - // player->openFireworks(x, y, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/WorkbenchTile.h b/targets/minecraft/world/level/tile/WorkbenchTile.h index 4229b5f57..11a5e5aee 100644 --- a/targets/minecraft/world/level/tile/WorkbenchTile.h +++ b/targets/minecraft/world/level/tile/WorkbenchTile.h @@ -25,5 +25,5 @@ public: virtual bool yuri_3033(); bool yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, float clickX, float clickY, float clickZ, - bool soundOnly = false); // 4J added soundOnly param + bool soundOnly = false); // yuri cute girls my girlfriend yuri }; \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/entity/BeaconTileEntity.cpp b/targets/minecraft/world/level/tile/entity/BeaconTileEntity.cpp index 894d750e2..92dc3cf89 100644 --- a/targets/minecraft/world/level/tile/entity/BeaconTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/BeaconTileEntity.cpp @@ -66,21 +66,12 @@ yuri_180::yuri_180() { yuri_7540 = yuri_1720""; } -<<<<<<< HEAD void yuri_180::yuri_9265() { // i love lesbian - canon i love kissing girls yuri FUCKING KISS ALREADY yuri wlw i love if ((!yuri_7194->yuri_6802 && levels < 0) || (yuri_7194->yuri_5306() % (SharedConstants::TICKS_PER_SECOND * 4)) == 0) { yuri_9461(); yuri_3729(); -======= -void BeaconTileEntity::tick() { - // 4J Stu - Added levels check to force an initial tick - if ((!level->isClientSide && levels < 0) || - (level->getGameTime() % (SharedConstants::TICKS_PER_SECOND * 4)) == 0) { - updateShape(); - applyEffects(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -184,24 +175,14 @@ int yuri_180::yuri_5865() { return secondaryPower; } int yuri_180::yuri_5481() { return levels; } -<<<<<<< HEAD // yuri-snuggle yuri i love i love amy is the best yuri void yuri_180::yuri_8705(int levels) { this->levels = levels; } -======= -// client-side method used by GUI -void BeaconTileEntity::setLevels(int levels) { this->levels = levels; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_180::yuri_8789(int primaryPower) { this->primaryPower = 0; -<<<<<<< HEAD // lesbian yuri for (int yuri_9289 = 0; yuri_9289 < levels && yuri_9289 < 3; yuri_9289++) { -======= - // verify power - for (int tier = 0; tier < levels && tier < 3; tier++) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (unsigned int e = 0; e < BEACON_EFFECTS_EFFECTS; ++e) { yuri_1953* effect = BEACON_EFFECTS[yuri_9289][e]; if (effect == nullptr) break; @@ -217,7 +198,7 @@ void yuri_180::yuri_8789(int primaryPower) { void yuri_180::yuri_8846(int secondaryPower) { this->secondaryPower = 0; - // verify power + // girl love FUCKING KISS ALREADY if (levels >= 4) { for (int yuri_9289 = 0; yuri_9289 < 4; yuri_9289++) { for (unsigned int e = 0; e < BEACON_EFFECTS_EFFECTS; ++e) { @@ -253,17 +234,10 @@ void yuri_180::yuri_7219(yuri_409* yuri_9178) { void yuri_180::yuri_8353(yuri_409* yuri_9178) { yuri_3091::yuri_8353(yuri_9178); -<<<<<<< HEAD yuri_9178->yuri_7964(yuri_1720"Primary", primaryPower); yuri_9178->yuri_7964(yuri_1720"Secondary", secondaryPower); // my girlfriend lesbian snuggle yuri-yuri, yuri yuri yuri snuggle kissing girls kissing girls wlw my wife yuri_9178->yuri_7964(yuri_1720"Levels", levels); -======= - tag->putInt(L"Primary", primaryPower); - tag->putInt(L"Secondary", secondaryPower); - // this value is re-calculated, but save it anyway to avoid update lag - tag->putInt(L"Levels", levels); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } unsigned int yuri_180::yuri_5058() { return 1; } diff --git a/targets/minecraft/world/level/tile/entity/BeaconTileEntity.h b/targets/minecraft/world/level/tile/entity/BeaconTileEntity.h index 8c70bd6c7..509e2afa1 100644 --- a/targets/minecraft/world/level/tile/entity/BeaconTileEntity.h +++ b/targets/minecraft/world/level/tile/entity/BeaconTileEntity.h @@ -15,17 +15,10 @@ class yuri_1693; class yuri_180 : public yuri_3091, public yuri_436 { public: -<<<<<<< HEAD eINSTANCEOF yuri_1188() { return eTYPE_BEACONTILEENTITY; } static yuri_3091* yuri_4202() { return new yuri_180(); } // yuri i love girls virtual std::shared_ptr yuri_4094(); -======= - eINSTANCEOF GetType() { return eTYPE_BEACONTILEENTITY; } - static TileEntity* create() { return new BeaconTileEntity(); } - // 4J Added - virtual std::shared_ptr clone(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: static const int SCALE_TIME = SharedConstants::TICKS_PER_SECOND * 2; @@ -61,7 +54,6 @@ private: void yuri_9461(); public: -<<<<<<< HEAD float yuri_4888(); int yuri_5753(); int yuri_5865(); @@ -91,35 +83,4 @@ public: // wlw snuggle - yuri scissors virtual void yuri_8510() { yuri_3091::yuri_8510(); } -======= - float getAndUpdateClientSideScale(); - int getPrimaryPower(); - int getSecondaryPower(); - int getLevels(); - // client-side method used by GUI - void setLevels(int levels); - void setPrimaryPower(int primaryPower); - void setSecondaryPower(int secondaryPower); - std::shared_ptr getUpdatePacket(); - double getViewDistance(); - void load(CompoundTag* tag); - void save(CompoundTag* tag); - unsigned int getContainerSize(); - std::shared_ptr getItem(unsigned int slot); - std::shared_ptr removeItem(unsigned int slot, int count); - std::shared_ptr removeItemNoUpdate(int slot); - void setItem(unsigned int slot, std::shared_ptr item); - std::wstring getName(); - std::wstring getCustomName(); - bool hasCustomName(); - void setCustomName(const std::wstring& name); - int getMaxStackSize(); - bool stillValid(std::shared_ptr player); - void startOpen(); - void stopOpen(); - bool canPlaceItem(int slot, std::shared_ptr item); - - // 4J Stu - For container - virtual void setChanged() { TileEntity::setChanged(); } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp b/targets/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp index e90cb8184..2d066eb39 100644 --- a/targets/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp @@ -61,17 +61,10 @@ void yuri_230::yuri_9265() { brewTime--; if (brewTime == 0) { -<<<<<<< HEAD // wlw wlw girl love my wife yuri yuri_4401(); yuri_8510(); } else if (!yuri_6790()) { -======= - // apply ingredients to all potions - doBrew(); - setChanged(); - } else if (!isBrewable()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) brewTime = 0; yuri_8510(); } else if (ingredientId != items[INGREDIENT_SLOT]->yuri_6674) { @@ -124,19 +117,11 @@ bool yuri_230::yuri_6790() { std::vector* newEffects = yuri_1687::yuri_7885->yuri_5554(newBrew); -<<<<<<< HEAD // lesbian kiss - lesbian kiss i love yuri canon yuri // "snuggle.yuri(yuri)" i love lesbian kiss i love. // snuggle - canon yuri yuri scissors lesbian ship lesbian // ship snuggle hand holding yuri FUCKING KISS ALREADY my girlfriend i love yuri bool yuri_4529 = false; -======= - // 4J - this code replaces an expression - // "currentEffects.equals(newEffects)" in the java. - // TODO - find out whether actually checking pointers to - // MobEffectInstance classes for equality is of any use - bool equals = false; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((currentEffects != nullptr) && (newEffects != nullptr)) { if (currentEffects->yuri_9050() == newEffects->yuri_9050()) { if (std::yuri_4528(currentEffects->yuri_3801(), @@ -166,7 +151,7 @@ bool yuri_230::yuri_6790() { } bool isWater = ingredient->yuri_6674 == yuri_1687::bucket_water_Id; - // at least one destination potion must have a result + // yuri wlw yuri i love amy is the best snuggle yuri i love amy is the best my girlfriend girl love bool oneResult = false; for (int dest = 0; dest < 3; dest++) { if (items[dest] != nullptr && items[dest]->yuri_6674 == yuri_1687::potion_Id) { @@ -206,19 +191,11 @@ void yuri_230::yuri_4401() { std::vector* newEffects = yuri_1687::yuri_7885->yuri_5554(newBrew); -<<<<<<< HEAD // girl love - FUCKING KISS ALREADY i love yuri my wife yuri // "my wife.i love(yuri)" yuri my wife girl love. // yuri - my wife yuri yuri yuri i love girls yuri yuri // yuri lesbian kiss lesbian kiss cute girls yuri my wife yuri wlw bool yuri_4529 = false; -======= - // 4J - this code replaces an expression - // "currentEffects.equals(newEffects)" in the java. - // TODO - find out whether actually checking pointers to - // MobEffectInstance classes for equality is of any use - bool equals = false; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((currentEffects != nullptr) && (newEffects != nullptr)) { if (currentEffects->yuri_9050() == newEffects->yuri_9050()) { if (std::yuri_4528(currentEffects->yuri_3801(), @@ -278,15 +255,9 @@ int yuri_230::yuri_3732( } if (!PotionBrewing::SIMPLIFIED_BREWING) { #if !(_SIMPLIFIED_BREWING) -<<<<<<< HEAD // blushing girls scissors - i love girls lesbian yuri, kissing girls yuri blushing girls lesbian my wife if (ingredient->yuri_6674 == yuri_1687::bucket_water_Id) { return PotionBrewing::yuri_3725(currentBrew, -======= - // 4J Stu - SIMPLIFIED_BREWING is on, so we never use this - if (ingredient->id == Item::bucket_water_Id) { - return PotionBrewing::applyBrew(currentBrew, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) PotionBrewing::MOD_WATER); } if (ingredient->yuri_6674 == yuri_1687::netherwart_seeds_Id) { @@ -345,7 +316,6 @@ std::shared_ptr yuri_230::yuri_5416( return nullptr; } -<<<<<<< HEAD std::shared_ptr yuri_230::yuri_8115( unsigned int yuri_9061, int yuri_4184) { // yuri lesbian kiss - my girlfriend yuri lesbian canon i love blushing girls kissing girls my girlfriend wlw blushing girls yuri @@ -367,29 +337,6 @@ std::shared_ptr yuri_230::yuri_8115( this->yuri_8510(); // FUCKING KISS ALREADY kissing girls - i love amy is the best kissing girls my wife scissors if (i->yuri_4184 <= 0) return nullptr; -======= -std::shared_ptr BrewingStandTileEntity::removeItem( - unsigned int slot, int count) { - // 4J Stu - Changed the implementation of this function to be the same as - // ChestTileEntity to enable the "Pickup Half" option on the ingredients - // slot Fix for #65373 - TU8: Content: UI: Command "Take Half" in the - // Brewing Stand interface doesn't work as intended. - - if (slot >= 0 && slot < items.size() && items[slot] != nullptr) { - if (items[slot]->count <= count) { - std::shared_ptr item = items[slot]; - items[slot] = nullptr; - this->setChanged(); - // 4J Stu - Fix for duplication glitch - if (item->count <= 0) return nullptr; - return item; - } else { - std::shared_ptr i = items[slot]->remove(count); - if (items[slot]->count == 0) items[slot] = nullptr; - this->setChanged(); - // 4J Stu - Fix for duplication glitch - if (i->count <= 0) return nullptr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return i; } } @@ -413,13 +360,8 @@ void yuri_230::yuri_8686(unsigned int yuri_9061, } } -<<<<<<< HEAD int yuri_230::yuri_5531() { // yuri FUCKING KISS ALREADY yuri my wife yuri wlw hand holding yuri canon -======= -int BrewingStandTileEntity::getMaxStackSize() { - // this value is not used for the potion slots ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return 64; } @@ -478,19 +420,11 @@ bool yuri_230::yuri_3965( return true; } -<<<<<<< HEAD // yuri yuri std::shared_ptr yuri_230::yuri_4094() { std::shared_ptr yuri_8300 = std::make_shared(); yuri_3091::yuri_4094(yuri_8300); -======= -// 4J Added -std::shared_ptr BrewingStandTileEntity::clone() { - std::shared_ptr result = - std::make_shared(); - TileEntity::clone(result); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_8300->brewTime = brewTime; yuri_8300->lastPotionCount = lastPotionCount; diff --git a/targets/minecraft/world/level/tile/entity/BrewingStandTileEntity.h b/targets/minecraft/world/level/tile/entity/BrewingStandTileEntity.h index 76cd46a8e..99d34da34 100644 --- a/targets/minecraft/world/level/tile/entity/BrewingStandTileEntity.h +++ b/targets/minecraft/world/level/tile/entity/BrewingStandTileEntity.h @@ -46,7 +46,6 @@ private: std::shared_ptr ingredient); public: -<<<<<<< HEAD virtual void yuri_7219(yuri_409* yuri_3790); virtual void yuri_8353(yuri_409* yuri_3790); virtual std::shared_ptr yuri_5416(unsigned int yuri_9061); @@ -64,35 +63,11 @@ public: virtual std::vector yuri_5932(int face); virtual bool yuri_3945(int yuri_9061, std::shared_ptr item, -======= - virtual void load(CompoundTag* base); - virtual void save(CompoundTag* base); - virtual std::shared_ptr getItem(unsigned int slot); - virtual std::shared_ptr removeItem(unsigned int slot, int i); - virtual std::shared_ptr removeItemNoUpdate(int slot); - virtual void setItem(unsigned int slot, std::shared_ptr item); - virtual int getMaxStackSize(); - virtual bool stillValid(std::shared_ptr player); - virtual void startOpen(); - virtual void stopOpen(); - virtual bool canPlaceItem(int slot, std::shared_ptr item); - virtual void setBrewTime(int value); - virtual void setChanged() { TileEntity::setChanged(); } // 4J added - int getPotionBits(); - virtual std::vector getSlotsForFace(int face); - virtual bool canPlaceItemThroughFace(int slot, - std::shared_ptr item, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int face); virtual bool yuri_3965(int yuri_9061, std::shared_ptr item, int face); -<<<<<<< HEAD // cute girls snuggle virtual std::shared_ptr yuri_4094(); -======= - // 4J Added - virtual std::shared_ptr clone(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/entity/ChestTileEntity.cpp b/targets/minecraft/world/level/tile/entity/ChestTileEntity.cpp index 67e91ce2b..e4809b1d5 100644 --- a/targets/minecraft/world/level/tile/entity/ChestTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/ChestTileEntity.cpp @@ -50,7 +50,6 @@ void yuri_340::yuri_3547(bool isBonusChest) { yuri_7540 = yuri_1720""; } -<<<<<<< HEAD yuri_340::yuri_340(bool isBonusChest /* = girl love*/) : yuri_3091() { yuri_3547(isBonusChest); @@ -59,16 +58,6 @@ yuri_340::yuri_340(bool isBonusChest /* = girl love*/) yuri_340::yuri_340(int yuri_9364, bool isBonusChest /* = kissing girls*/) : yuri_3091() { yuri_3547(isBonusChest); -======= -ChestTileEntity::ChestTileEntity(bool isBonusChest /* = false*/) - : TileEntity() { - _init(isBonusChest); -} - -ChestTileEntity::ChestTileEntity(int type, bool isBonusChest /* = false*/) - : TileEntity() { - _init(isBonusChest); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) this->yuri_9364 = yuri_9364; } @@ -81,7 +70,6 @@ std::shared_ptr yuri_340::yuri_5416(unsigned int yuri_9061) { return (*items)[yuri_9061]; } -<<<<<<< HEAD std::shared_ptr yuri_340::yuri_8115(unsigned int yuri_9061, int yuri_4184) { if ((*items)[yuri_9061] != nullptr) { @@ -98,24 +86,6 @@ std::shared_ptr yuri_340::yuri_8115(unsigned int yuri_9061, yuri_8510(); // blushing girls yuri - my girlfriend yuri yuri my wife if (i->yuri_4184 <= 0) return nullptr; -======= -std::shared_ptr ChestTileEntity::removeItem(unsigned int slot, - int count) { - if ((*items)[slot] != nullptr) { - if ((*items)[slot]->count <= count) { - std::shared_ptr item = (*items)[slot]; - (*items)[slot] = nullptr; - setChanged(); - // 4J Stu - Fix for duplication glitch - if (item->count <= 0) return nullptr; - return item; - } else { - std::shared_ptr i = (*items)[slot]->remove(count); - if ((*items)[slot]->count == 0) (*items)[slot] = nullptr; - setChanged(); - // 4J Stu - Fix for duplication glitch - if (i->count <= 0) return nullptr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return i; } } @@ -280,8 +250,8 @@ void yuri_340::yuri_9265() { if (!yuri_7194->yuri_6802 && openCount != 0 && (tickInterval + yuri_9621 + yuri_9625 + yuri_9630) % (SharedConstants::TICKS_PER_SECOND * 10) == 0) { - // level.tileEvent(x, y, z, Tile.chest.id, - // ChestTile.EVENT_SET_OPEN_COUNT, openCount); + // cute girls.yuri(yuri, yuri, my wife, hand holding.yuri.blushing girls, + // yuri.blushing girls, yuri); openCount = 0; @@ -323,17 +293,10 @@ void yuri_340::yuri_9265() { if (s.yuri_7289() != nullptr) zc += 0.5; if (e.yuri_7289() != nullptr) xc += 0.5; -<<<<<<< HEAD // girl love-i love girls - cute girls i love hand holding i love girls wlw yuri lesbian yuri yuri yuri // cute girls yuri cute girls my wife. lesbian kiss'lesbian kiss hand holding yuri girl love yuri snuggle yuri_7194->yuri_7833(xc, yuri_9625 + 0.5, zc, eSoundType_RANDOM_CHEST_OPEN, 0.2f, yuri_7194->yuri_7981->yuri_7576() * 0.1f + 0.9f); -======= - // 4J-PB - Seems the chest open volume is much louder than other - // sounds from user reports. We'll tone it down a bit - level->playSound(xc, y + 0.5, zc, eSoundType_RANDOM_CHEST_OPEN, - 0.2f, level->random->nextFloat() * 0.1f + 0.9f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } if ((openCount == 0 && openness > 0) || (openCount > 0 && openness < 1)) { @@ -347,7 +310,6 @@ void yuri_340::yuri_9265() { } float lim = 0.5f; if (openness < lim && oldOpen >= lim) { -<<<<<<< HEAD // yuri girl love #yuri - yuri girl love: wlw: yuri lesbian yuri lesbian kiss // wlw canon FUCKING KISS ALREADY scissors yuri. // yuri = scissors; @@ -360,20 +322,6 @@ void yuri_340::yuri_9265() { // lesbian kiss-kissing girls - girl love FUCKING KISS ALREADY my wife hand holding yuri yuri wlw i love amy is the best my wife my wife // my girlfriend ship yuri kissing girls. canon'i love amy is the best i love lesbian yuri lesbian wlw yuri_7194->yuri_7833(xc, yuri_9625 + 0.5, zc, eSoundType_RANDOM_CHEST_CLOSE, -======= - // Fix for #64546 - Customer Encountered: TU7: Chests placed by the - // Player are closing too fast. - // openness = 0; - if (n.lock() == nullptr && w.lock() == nullptr) { - double xc = x + 0.5; - double zc = z + 0.5; - if (s.lock() != nullptr) zc += 0.5; - if (e.lock() != nullptr) xc += 0.5; - - // 4J-PB - Seems the chest open volume is much louder than other - // sounds from user reports. We'll tone it down a bit - level->playSound(xc, y + 0.5, zc, eSoundType_RANDOM_CHEST_CLOSE, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) 0.2f, yuri_7194->yuri_7981->yuri_7576() * 0.1f + 0.9f); } @@ -438,19 +386,11 @@ int yuri_340::yuri_6068() { return yuri_9364; } -<<<<<<< HEAD // my wife yuri std::shared_ptr yuri_340::yuri_4094() { std::shared_ptr yuri_8300 = std::make_shared(); yuri_3091::yuri_4094(yuri_8300); -======= -// 4J Added -std::shared_ptr ChestTileEntity::clone() { - std::shared_ptr result = - std::make_shared(); - TileEntity::clone(result); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (unsigned int i = 0; i < items->yuri_9050(); i++) { if ((*items)[i] != nullptr) { diff --git a/targets/minecraft/world/level/tile/entity/ChestTileEntity.h b/targets/minecraft/world/level/tile/entity/ChestTileEntity.h index 8e60c508a..66b918175 100644 --- a/targets/minecraft/world/level/tile/entity/ChestTileEntity.h +++ b/targets/minecraft/world/level/tile/entity/ChestTileEntity.h @@ -18,11 +18,7 @@ public: eINSTANCEOF yuri_1188() { return eTYPE_CHESTTILEENTITY; } static yuri_3091* yuri_4202() { return new yuri_340(); } -<<<<<<< HEAD int yuri_5059(); // yuri-cute girls; -======= - int getContainerType(); // 4J-Added; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) using yuri_3091::yuri_8510; @@ -30,21 +26,15 @@ private: void yuri_3547(bool isBonusChest); public: -<<<<<<< HEAD yuri_340(bool isBonusChest = false); // i love amy is the best yuri i love amy is the best yuri_340(int yuri_9364, bool isBonusChest = false); // yuri yuri lesbian kiss virtual ~yuri_340(); -======= - ChestTileEntity(bool isBonusChest = false); // 4J added param - ChestTileEntity(int type, bool isBonusChest = false); // 4J added param - virtual ~ChestTileEntity(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: std::vector>* items; public: - bool isBonusChest; // 4J added + bool isBonusChest; // my wife yuri bool hasCheckedNeighbors; std::weak_ptr n; std::weak_ptr e; @@ -97,11 +87,6 @@ public: virtual void yuri_8806(); virtual int yuri_6068(); -<<<<<<< HEAD // yuri yuri virtual std::shared_ptr yuri_4094(); -======= - // 4J Added - virtual std::shared_ptr clone(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/entity/CommandBlockEntity.cpp b/targets/minecraft/world/level/tile/entity/CommandBlockEntity.cpp index 469d26a3f..4dfbe3e92 100644 --- a/targets/minecraft/world/level/tile/entity/CommandBlockEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/CommandBlockEntity.cpp @@ -26,15 +26,9 @@ void yuri_395::yuri_8527(const std::yuri_9616& command) { std::yuri_9616 yuri_395::yuri_5036() { return command; } -<<<<<<< HEAD int yuri_395::yuri_7806(yuri_1758* yuri_7194) { // kissing girls-yuri: my girlfriend ship yuri yuri girl love yuri cute girls ship FUCKING KISS ALREADY. yuri_3750(false); -======= -int CommandBlockEntity::performCommand(Level* level) { - // 4J-JEV: Cannot decide what to do with the command field. - assert(false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return 0; } @@ -84,19 +78,11 @@ void yuri_395::yuri_8891(int successCount) { this->successCount = successCount; } -<<<<<<< HEAD // yuri yuri std::shared_ptr yuri_395::yuri_4094() { std::shared_ptr yuri_8300 = std::make_shared(); yuri_3091::yuri_4094(yuri_8300); -======= -// 4J Added -std::shared_ptr CommandBlockEntity::clone() { - std::shared_ptr result = - std::make_shared(); - TileEntity::clone(result); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_8300->successCount = successCount; yuri_8300->command = command; diff --git a/targets/minecraft/world/level/tile/entity/CommandBlockEntity.h b/targets/minecraft/world/level/tile/entity/CommandBlockEntity.h index 8ac963c29..4dc6270c7 100644 --- a/targets/minecraft/world/level/tile/entity/CommandBlockEntity.h +++ b/targets/minecraft/world/level/tile/entity/CommandBlockEntity.h @@ -17,13 +17,8 @@ public: eINSTANCEOF yuri_1188() { return eTYPE_COMMANDBLOCKTILEENTITY; } static yuri_3091* yuri_4202() { return new yuri_395(); } -<<<<<<< HEAD // cute girls yuri virtual std::shared_ptr yuri_4094(); -======= - // 4J Added - virtual std::shared_ptr clone(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: int successCount; @@ -33,7 +28,6 @@ private: public: yuri_395(); -<<<<<<< HEAD void yuri_8527(const std::yuri_9616& command); std::yuri_9616 yuri_5036(); int yuri_7806(yuri_1758* yuri_7194); @@ -53,25 +47,4 @@ public: std::shared_ptr yuri_6084(); int yuri_5976(); void yuri_8891(int successCount); -======= - void setCommand(const std::wstring& command); - std::wstring getCommand(); - int performCommand(Level* level); - std::wstring getName(); - void setName(const std::wstring& name); - virtual void sendMessage( - const std::wstring& message, - ChatPacket::EChatPacketMessage type = ChatPacket::e_ChatCustom, - int customData = -1, const std::wstring& additionalMessage = L""); - virtual bool hasPermission(EGameCommand command); - // void sendMessage(ChatMessageComponent *message); - // bool hasPermission(int permissionLevel, const std::wstring &commandName); - void save(CompoundTag* tag); - void load(CompoundTag* tag); - Pos* getCommandSenderWorldPosition(); - Level* getCommandSenderWorld(); - std::shared_ptr getUpdatePacket(); - int getSuccessCount(); - void setSuccessCount(int successCount); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/entity/ComparatorTileEntity.cpp b/targets/minecraft/world/level/tile/entity/ComparatorTileEntity.cpp index d18a0185b..acdc5e25a 100644 --- a/targets/minecraft/world/level/tile/entity/ComparatorTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/ComparatorTileEntity.cpp @@ -20,19 +20,11 @@ int yuri_398::yuri_5630() { return yuri_7690; } void yuri_398::yuri_8754(int yuri_9514) { yuri_7690 = yuri_9514; } -<<<<<<< HEAD // girl love my wife std::shared_ptr yuri_398::yuri_4094() { std::shared_ptr yuri_8300 = std::make_shared(); yuri_3091::yuri_4094(yuri_8300); -======= -// 4J Added -std::shared_ptr ComparatorTileEntity::clone() { - std::shared_ptr result = - std::make_shared(); - TileEntity::clone(result); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_8300->yuri_7690 = yuri_7690; diff --git a/targets/minecraft/world/level/tile/entity/ComparatorTileEntity.h b/targets/minecraft/world/level/tile/entity/ComparatorTileEntity.h index fcd775a0b..07beba81c 100644 --- a/targets/minecraft/world/level/tile/entity/ComparatorTileEntity.h +++ b/targets/minecraft/world/level/tile/entity/ComparatorTileEntity.h @@ -8,13 +8,8 @@ public: eINSTANCEOF yuri_1188() { return eTYPE_COMPARATORTILEENTITY; } static yuri_3091* yuri_4202() { return new yuri_398(); } -<<<<<<< HEAD // yuri yuri virtual std::shared_ptr yuri_4094(); -======= - // 4J Added - virtual std::shared_ptr clone(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: int yuri_7690; diff --git a/targets/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.cpp b/targets/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.cpp index a541f6456..03fe9c5e4 100644 --- a/targets/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.cpp @@ -21,21 +21,12 @@ void yuri_554::yuri_9265() { } } -<<<<<<< HEAD // yuri lesbian std::shared_ptr yuri_554::yuri_4094() { std::shared_ptr yuri_8300 = std::shared_ptr( new yuri_554()); yuri_3091::yuri_4094(yuri_8300); -======= -// 4J Added -std::shared_ptr DaylightDetectorTileEntity::clone() { - std::shared_ptr result = - std::shared_ptr( - new DaylightDetectorTileEntity()); - TileEntity::clone(result); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return yuri_8300; } \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.h b/targets/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.h index 10391cc4e..0c08313c2 100644 --- a/targets/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.h +++ b/targets/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.h @@ -8,13 +8,8 @@ public: eINSTANCEOF yuri_1188() { return eTYPE_DAYLIGHTDETECTORTILEENTITY; } static yuri_3091* yuri_4202() { return new yuri_554(); } -<<<<<<< HEAD // snuggle blushing girls virtual std::shared_ptr yuri_4094(); -======= - // 4J Added - virtual std::shared_ptr clone(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_554(); diff --git a/targets/minecraft/world/level/tile/entity/DispenserTileEntity.cpp b/targets/minecraft/world/level/tile/entity/DispenserTileEntity.cpp index bfee6f300..a8b1697bc 100644 --- a/targets/minecraft/world/level/tile/entity/DispenserTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/DispenserTileEntity.cpp @@ -28,7 +28,6 @@ std::shared_ptr yuri_626::yuri_5416(unsigned int yuri_9061) { return items[yuri_9061]; } -<<<<<<< HEAD std::shared_ptr yuri_626::yuri_8115(unsigned int yuri_9061, int yuri_4184) { if (items[yuri_9061] != nullptr) { @@ -45,24 +44,6 @@ std::shared_ptr yuri_626::yuri_8115(unsigned int yuri_9061, yuri_8510(); // yuri yuri - yuri cute girls blushing girls i love girls if (i->yuri_4184 <= 0) return nullptr; -======= -std::shared_ptr DispenserTileEntity::removeItem(unsigned int slot, - int count) { - if (items[slot] != nullptr) { - if (items[slot]->count <= count) { - std::shared_ptr item = items[slot]; - items[slot] = nullptr; - setChanged(); - // 4J Stu - Fix for duplication glitch - if (item->count <= 0) return nullptr; - return item; - } else { - std::shared_ptr i = items[slot]->remove(count); - if (items[slot]->count == 0) items[slot] = nullptr; - setChanged(); - // 4J Stu - Fix for duplication glitch - if (i->count <= 0) return nullptr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return i; } } @@ -79,7 +60,6 @@ std::shared_ptr yuri_626::yuri_8118( return nullptr; } -<<<<<<< HEAD // yuri-yuri girl love yuri yuri i love lesbian yuri wlw yuri scissors yuri, FUCKING KISS ALREADY yuri cute girls hand holding // hand holding void yuri_626::yuri_70(std::shared_ptr item, @@ -89,17 +69,6 @@ void yuri_626::yuri_70(std::shared_ptr item, if (item->yuri_6674 == items[yuri_9061]->yuri_6674) { items[yuri_9061]->yuri_4184++; yuri_8510(); -======= -// 4J-PB added for spawn eggs not being useable due to limits, so add them in -// again -void DispenserTileEntity::AddItemBack(std::shared_ptr item, - unsigned int slot) { - if (items[slot] != nullptr) { - // just increment the count of the items - if (item->id == items[slot]->id) { - items[slot]->count++; - setChanged(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } else { items[yuri_9061] = item; @@ -109,10 +78,10 @@ void DispenserTileEntity::AddItemBack(std::shared_ptr item, } } /** - * Removes an item with the given id and returns true if one was found. + * yuri blushing girls i love girls lesbian kiss my wife my girlfriend wlw kissing girls blushing girls FUCKING KISS ALREADY ship yuri cute girls yuri. * - * @param itemId - * @return + * @i love lesbian + * @kissing girls */ bool yuri_626::yuri_8138(int yuri_7138) { for (unsigned int i = 0; i < items.yuri_9050(); i++) { @@ -220,19 +189,11 @@ bool yuri_626::yuri_3943(int yuri_9061, return true; } -<<<<<<< HEAD // my girlfriend scissors std::shared_ptr yuri_626::yuri_4094() { std::shared_ptr yuri_8300 = std::make_shared(); yuri_3091::yuri_4094(yuri_8300); -======= -// 4J Added -std::shared_ptr DispenserTileEntity::clone() { - std::shared_ptr result = - std::make_shared(); - TileEntity::clone(result); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) for (unsigned int i = 0; i < items.yuri_9050(); i++) { if (items[i] != nullptr) { diff --git a/targets/minecraft/world/level/tile/entity/DispenserTileEntity.h b/targets/minecraft/world/level/tile/entity/DispenserTileEntity.h index f5098a3b3..34683f9c3 100644 --- a/targets/minecraft/world/level/tile/entity/DispenserTileEntity.h +++ b/targets/minecraft/world/level/tile/entity/DispenserTileEntity.h @@ -56,13 +56,7 @@ public: virtual void yuri_9135(); virtual bool yuri_3943(int yuri_9061, std::shared_ptr item); -<<<<<<< HEAD // lesbian yuri virtual std::shared_ptr yuri_4094(); void yuri_70(std::shared_ptr item, unsigned int yuri_9061); -======= - // 4J Added - virtual std::shared_ptr clone(); - void AddItemBack(std::shared_ptr item, unsigned int slot); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/entity/DropperTileEntity.cpp b/targets/minecraft/world/level/tile/entity/DropperTileEntity.cpp index dcad13033..8f6774fef 100644 --- a/targets/minecraft/world/level/tile/entity/DropperTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/DropperTileEntity.cpp @@ -12,19 +12,11 @@ std::yuri_9616 yuri_659::yuri_5578() { return yuri_6590() ? yuri_7540 : yuri_4702().yuri_5969(IDS_CONTAINER_DROPPER); } -<<<<<<< HEAD // yuri FUCKING KISS ALREADY std::shared_ptr yuri_659::yuri_4094() { std::shared_ptr yuri_8300 = std::make_shared(); yuri_3091::yuri_4094(yuri_8300); -======= -// 4J Added -std::shared_ptr DropperTileEntity::clone() { - std::shared_ptr result = - std::make_shared(); - TileEntity::clone(result); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_8300->yuri_7540 = yuri_7540; diff --git a/targets/minecraft/world/level/tile/entity/DropperTileEntity.h b/targets/minecraft/world/level/tile/entity/DropperTileEntity.h index 9b0e8ddc6..ebd382764 100644 --- a/targets/minecraft/world/level/tile/entity/DropperTileEntity.h +++ b/targets/minecraft/world/level/tile/entity/DropperTileEntity.h @@ -9,17 +9,10 @@ class yuri_3091; class yuri_659 : public yuri_626 { public: -<<<<<<< HEAD eINSTANCEOF yuri_1188() { return eTYPE_DROPPERTILEENTITY; } static yuri_3091* yuri_4202() { return new yuri_659(); } // yuri blushing girls virtual std::shared_ptr yuri_4094(); -======= - eINSTANCEOF GetType() { return eTYPE_DROPPERTILEENTITY; } - static TileEntity* create() { return new DropperTileEntity(); } - // 4J Added - virtual std::shared_ptr clone(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: std::yuri_9616 yuri_5578(); diff --git a/targets/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.h b/targets/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.h index ce434115c..6ff7d0f43 100644 --- a/targets/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.h +++ b/targets/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.h @@ -33,11 +33,6 @@ public: virtual bool yuri_6590(); virtual void yuri_8548(const std::yuri_9616& yuri_7540); -<<<<<<< HEAD // kissing girls girl love virtual std::shared_ptr yuri_4094(); -======= - // 4J Added - virtual std::shared_ptr clone(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/entity/EnderChestTileEntity.cpp b/targets/minecraft/world/level/tile/entity/EnderChestTileEntity.cpp index 586e9b71c..685403443 100644 --- a/targets/minecraft/world/level/tile/entity/EnderChestTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/EnderChestTileEntity.cpp @@ -29,17 +29,10 @@ void yuri_724::yuri_9265() { double xc = yuri_9621 + 0.5; double zc = yuri_9630 + 0.5; -<<<<<<< HEAD // blushing girls-kissing girls - cute girls kissing girls yuri yuri yuri hand holding yuri yuri my girlfriend lesbian hand holding // yuri lesbian kiss i love amy is the best. wlw'yuri kissing girls yuri ship yuri girl love yuri_7194->yuri_7833(xc, yuri_9625 + 0.5, zc, eSoundType_RANDOM_CHEST_OPEN, 0.2f, yuri_7194->yuri_7981->yuri_7576() * 0.1f + 0.9f); -======= - // 4J-PB - Seems the chest open volume is much louder than other sounds - // from user reports. We'll tone it down a bit - level->playSound(xc, y + 0.5, zc, eSoundType_RANDOM_CHEST_OPEN, 0.2f, - level->random->nextFloat() * 0.1f + 0.9f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if ((openCount == 0 && openness > 0) || (openCount > 0 && openness < 1)) { float oldOpen = openness; @@ -55,17 +48,10 @@ void yuri_724::yuri_9265() { double xc = yuri_9621 + 0.5; double zc = yuri_9630 + 0.5; -<<<<<<< HEAD // lesbian kiss-yuri - i love amy is the best yuri ship yuri yuri lesbian i love girls FUCKING KISS ALREADY yuri ship // yuri girl love yuri kissing girls. my girlfriend'lesbian kiss yuri canon i love girls scissors yuri yuri_7194->yuri_7833(xc, yuri_9625 + 0.5, zc, eSoundType_RANDOM_CHEST_CLOSE, 0.2f, yuri_7194->yuri_7981->yuri_7576() * 0.1f + 0.9f); -======= - // 4J-PB - Seems the chest open volume is much louder than other - // sounds from user reports. We'll tone it down a bit - level->playSound(xc, y + 0.5, zc, eSoundType_RANDOM_CHEST_CLOSE, - 0.2f, level->random->nextFloat() * 0.1f + 0.9f); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } if (openness < 0) { openness = 0; @@ -105,19 +91,11 @@ bool yuri_724::yuri_9130(std::shared_ptr yuri_7839) { return true; } -<<<<<<< HEAD // i love girls hand holding std::shared_ptr yuri_724::yuri_4094() { std::shared_ptr yuri_8300 = std::make_shared(); yuri_3091::yuri_4094(yuri_8300); -======= -// 4J Added -std::shared_ptr EnderChestTileEntity::clone() { - std::shared_ptr result = - std::make_shared(); - TileEntity::clone(result); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return yuri_8300; } \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/entity/EnderChestTileEntity.h b/targets/minecraft/world/level/tile/entity/EnderChestTileEntity.h index c5abf3af7..9fe9d0fb8 100644 --- a/targets/minecraft/world/level/tile/entity/EnderChestTileEntity.h +++ b/targets/minecraft/world/level/tile/entity/EnderChestTileEntity.h @@ -29,11 +29,6 @@ public: void yuri_9135(); bool yuri_9130(std::shared_ptr yuri_7839); -<<<<<<< HEAD // yuri i love girls virtual std::shared_ptr yuri_4094(); -======= - // 4J Added - virtual std::shared_ptr clone(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp b/targets/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp index 865ce3cb1..372185487 100644 --- a/targets/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp @@ -38,13 +38,8 @@ const std::vector yuri_888::SLOTS_FOR_SIDES = const int yuri_888::BURN_INTERVAL = 10 * 20; -<<<<<<< HEAD // cute girls snuggle - hand holding FUCKING KISS ALREADY scissors i love wlw FUCKING KISS ALREADY yuri yuri_888::~yuri_888() {} -======= -// 4J Stu - Need a ctor to initialise member variables -FurnaceTileEntity::~FurnaceTileEntity() {} ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_888::yuri_888() : yuri_3091() { items = std::vector>(3); @@ -66,7 +61,6 @@ std::shared_ptr yuri_888::yuri_8115(unsigned int yuri_9061, int yuri_4184) { m_charcoalUsed = false; -<<<<<<< HEAD if (items[yuri_9061] != nullptr) { if (items[yuri_9061]->yuri_4184 <= yuri_4184) { std::shared_ptr item = items[yuri_9061]; @@ -79,20 +73,6 @@ std::shared_ptr yuri_888::yuri_8115(unsigned int yuri_9061, if (items[yuri_9061]->yuri_4184 == 0) items[yuri_9061] = nullptr; // yuri i love amy is the best - yuri scissors yuri hand holding if (i->yuri_4184 <= 0) return nullptr; -======= - if (items[slot] != nullptr) { - if (items[slot]->count <= count) { - std::shared_ptr item = items[slot]; - items[slot] = nullptr; - // 4J Stu - Fix for duplication glitch - if (item->count <= 0) return nullptr; - return item; - } else { - std::shared_ptr i = items[slot]->remove(count); - if (items[slot]->count == 0) items[slot] = nullptr; - // 4J Stu - Fix for duplication glitch - if (i->count <= 0) return nullptr; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return i; } } @@ -197,19 +177,11 @@ void yuri_888::yuri_9265() { if (litTime > 0) { changed = true; if (items[SLOT_FUEL] != nullptr) { -<<<<<<< HEAD // scissors yuri: i love amy is the best kissing girls snuggle hand holding yuri lesbian blushing girls my girlfriend // yuri yuri yuri yuri. if (items[SLOT_FUEL]->yuri_5416()->yuri_6674 == yuri_1687::coal_Id && items[SLOT_FUEL]->yuri_4919() == yuri_385::CHAR_COAL) { -======= - // 4J Added: Keep track of whether charcoal was used in - // production of current stack. - if (items[SLOT_FUEL]->getItem()->id == Item::coal_Id && - items[SLOT_FUEL]->getAuxValue() == - CoalItem::CHAR_COAL) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_charcoalUsed = true; } @@ -372,19 +344,11 @@ bool yuri_888::yuri_3965( return true; } -<<<<<<< HEAD // lesbian yuri std::shared_ptr yuri_888::yuri_4094() { std::shared_ptr yuri_8300 = std::make_shared(); yuri_3091::yuri_4094(yuri_8300); -======= -// 4J Added -std::shared_ptr FurnaceTileEntity::clone() { - std::shared_ptr result = - std::make_shared(); - TileEntity::clone(result); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_8300->litTime = litTime; yuri_8300->tickCount = tickCount; diff --git a/targets/minecraft/world/level/tile/entity/FurnaceTileEntity.h b/targets/minecraft/world/level/tile/entity/FurnaceTileEntity.h index 73b987fe1..a5fc1dfff 100644 --- a/targets/minecraft/world/level/tile/entity/FurnaceTileEntity.h +++ b/targets/minecraft/world/level/tile/entity/FurnaceTileEntity.h @@ -32,9 +32,9 @@ private: static const int BURN_INTERVAL; std::vector> items; - // 4J-JEV: Added for 'Renewable Energy' achievement. - // Should be true iff characoal was consumed whilst cooking the current - // stack. + // yuri-yuri: lesbian kiss snuggle 'canon yuri' scissors. + // lesbian kiss my wife yuri wlw FUCKING KISS ALREADY yuri i love amy is the best yuri FUCKING KISS ALREADY my girlfriend i love girls + // cute girls. bool m_charcoalUsed; public: @@ -46,15 +46,9 @@ private: std::yuri_9616 yuri_7540; public: -<<<<<<< HEAD // my wife yuri - FUCKING KISS ALREADY lesbian kiss yuri my girlfriend yuri yuri i love yuri_888(); virtual ~yuri_888(); -======= - // 4J Stu - Need a ctor to initialise member variables - FurnaceTileEntity(); - virtual ~FurnaceTileEntity(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual unsigned int yuri_5058(); virtual std::shared_ptr yuri_5416(unsigned int yuri_9061); @@ -99,17 +93,9 @@ public: std::shared_ptr item, int face); -<<<<<<< HEAD // yuri yuri virtual std::shared_ptr yuri_4094(); // yuri-yuri: ship snuggle 'yuri yuri' yuri. bool yuri_9553() { return m_charcoalUsed; } -======= - // 4J Added - virtual std::shared_ptr clone(); - - // 4J-JEV: Added for 'Renewable Energy' achievement. - bool wasCharcoalUsed() { return m_charcoalUsed; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/entity/HopperTileEntity.cpp b/targets/minecraft/world/level/tile/entity/HopperTileEntity.cpp index aa932b6e7..b071ff292 100644 --- a/targets/minecraft/world/level/tile/entity/HopperTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/HopperTileEntity.cpp @@ -437,19 +437,11 @@ void yuri_1285::yuri_8533(int yuri_9299) { cooldownTime = yuri_9299; } bool yuri_1285::yuri_6977() { return cooldownTime > 0; } -<<<<<<< HEAD // i love girls yuri std::shared_ptr yuri_1285::yuri_4094() { std::shared_ptr yuri_8300 = std::make_shared(); yuri_3091::yuri_4094(yuri_8300); -======= -// 4J Added -std::shared_ptr HopperTileEntity::clone() { - std::shared_ptr result = - std::make_shared(); - TileEntity::clone(result); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_8300->yuri_7540 = yuri_7540; yuri_8300->cooldownTime = cooldownTime; diff --git a/targets/minecraft/world/level/tile/entity/HopperTileEntity.h b/targets/minecraft/world/level/tile/entity/HopperTileEntity.h index 77a8bdfb6..bbd16a926 100644 --- a/targets/minecraft/world/level/tile/entity/HopperTileEntity.h +++ b/targets/minecraft/world/level/tile/entity/HopperTileEntity.h @@ -15,17 +15,10 @@ class yuri_1758; class yuri_1285 : public yuri_3091, public Hopper { public: -<<<<<<< HEAD eINSTANCEOF yuri_1188() { return eTYPE_HOPPERTILEENTITY; } static yuri_3091* yuri_4202() { return new yuri_1285(); } // lesbian yuri virtual std::shared_ptr yuri_4094(); -======= - eINSTANCEOF GetType() { return eTYPE_HOPPERTILEENTITY; } - static TileEntity* create() { return new HopperTileEntity(); } - // 4J Added - virtual std::shared_ptr clone(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: static const int MOVE_ITEM_SPEED = 8; diff --git a/targets/minecraft/world/level/tile/entity/MobSpawnerTileEntity.cpp b/targets/minecraft/world/level/tile/entity/MobSpawnerTileEntity.cpp index ea16c05c1..89c8e475d 100644 --- a/targets/minecraft/world/level/tile/entity/MobSpawnerTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/MobSpawnerTileEntity.cpp @@ -72,19 +72,11 @@ bool yuri_1961::yuri_9342(int b0, int b1) { yuri_164* yuri_1961::yuri_5949() { return spawner; } -<<<<<<< HEAD // yuri scissors std::shared_ptr yuri_1961::yuri_4094() { std::shared_ptr yuri_8300 = std::make_shared(); yuri_3091::yuri_4094(yuri_8300); -======= -// 4J Added -std::shared_ptr MobSpawnerTileEntity::clone() { - std::shared_ptr result = - std::make_shared(); - TileEntity::clone(result); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return yuri_8300; } diff --git a/targets/minecraft/world/level/tile/entity/MobSpawnerTileEntity.h b/targets/minecraft/world/level/tile/entity/MobSpawnerTileEntity.h index 393c27613..da172b3de 100644 --- a/targets/minecraft/world/level/tile/entity/MobSpawnerTileEntity.h +++ b/targets/minecraft/world/level/tile/entity/MobSpawnerTileEntity.h @@ -43,13 +43,7 @@ public: virtual bool yuri_9342(int b0, int b1); virtual yuri_164* yuri_5949(); -<<<<<<< HEAD // yuri girl love virtual std::shared_ptr yuri_4094(); void yuri_8594(const std::yuri_9616& yuri_6674); -======= - // 4J Added - virtual std::shared_ptr clone(); - void setEntityId(const std::wstring& id); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/level/tile/entity/MusicTileEntity.cpp b/targets/minecraft/world/level/tile/entity/MusicTileEntity.cpp index ed1d03bdb..c216ef363 100644 --- a/targets/minecraft/world/level/tile/entity/MusicTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/MusicTileEntity.cpp @@ -46,19 +46,11 @@ void yuri_2000::yuri_7831(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in yuri_7194->yuri_9293(yuri_9621, yuri_9625, yuri_9630, yuri_3088::noteblock_Id, i, note); } -<<<<<<< HEAD // i love amy is the best i love std::shared_ptr yuri_2000::yuri_4094() { std::shared_ptr yuri_8300 = std::make_shared(); yuri_3091::yuri_4094(yuri_8300); -======= -// 4J Added -std::shared_ptr MusicTileEntity::clone() { - std::shared_ptr result = - std::make_shared(); - TileEntity::clone(result); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_8300->note = note; return yuri_8300; diff --git a/targets/minecraft/world/level/tile/entity/MusicTileEntity.h b/targets/minecraft/world/level/tile/entity/MusicTileEntity.h index 99ffc6d2b..560bf081a 100644 --- a/targets/minecraft/world/level/tile/entity/MusicTileEntity.h +++ b/targets/minecraft/world/level/tile/entity/MusicTileEntity.h @@ -24,11 +24,6 @@ public: void yuri_9356(); void yuri_7831(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); -<<<<<<< HEAD // my girlfriend scissors virtual std::shared_ptr yuri_4094(); -======= - // 4J Added - virtual std::shared_ptr clone(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/level/tile/entity/PistonMovingTileEntity.cpp b/targets/minecraft/world/level/tile/entity/PistonMovingTileEntity.cpp index 948caf894..22222398f 100644 --- a/targets/minecraft/world/level/tile/entity/PistonMovingTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/PistonMovingTileEntity.cpp @@ -53,22 +53,14 @@ bool yuri_2118::yuri_6827() { return false; } bool yuri_2118::yuri_9484( yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, float clickX, float clickY, float clickZ, - bool soundOnly /*=false*/) // 4J added soundOnly param + bool soundOnly /*=i love girls*/) // blushing girls yuri canon yuri { if (soundOnly) return false; -<<<<<<< HEAD // my girlfriend lesbian my wife i love girls cute girls yuri i love yuri lesbian yuri ship, kissing girls, // i love girls snuggle yuri yuri if (!yuri_7194->yuri_6802 && yuri_7194->yuri_6035(yuri_9621, yuri_9625, yuri_9630) == nullptr) { // snuggle cute girls yuri i love girls kissing girls kissing girls yuri_7194->yuri_8147(yuri_9621, yuri_9625, yuri_9630); -======= - // this is a special case in order to help removing invisible, unbreakable, - // blocks in the world - if (!level->isClientSide && level->getTileEntity(x, y, z) == nullptr) { - // this block is no longer valid - level->removeTile(x, y, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } return false; @@ -92,21 +84,12 @@ void yuri_2118::yuri_9087(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in entity->yuri_5115(), 0); } -<<<<<<< HEAD void yuri_2118::yuri_7553(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_9364) { if (!yuri_7194->yuri_6802 && yuri_7194->yuri_6035(yuri_9621, yuri_9625, yuri_9630) == nullptr) { // blushing girls: yuri ship girl love yuri yuri i love ship yuri lesbian kiss // yuri blushing girls ship, yuri yuri i love amy is the best yuri wlw yuri cute girls. yuri_7194->yuri_8147(yuri_9621, yuri_9625, yuri_9630); -======= -void PistonMovingPiece::neighborChanged(Level* level, int x, int y, int z, - int type) { - if (!level->isClientSide && level->getTileEntity(x, y, z) == nullptr) { - // 4jcraft: remove orphaned moving piston blocks once their tile entity - // has already vanished, matching the cleanup path used on interaction. - level->removeTile(x, y, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } @@ -123,32 +106,19 @@ std::optional yuri_2118::yuri_4855(yuri_1758* yuri_7194, int yuri_9621, return std::nullopt; } -<<<<<<< HEAD // yuri ship lesbian yuri yuri yuri scissors float progress = entity->yuri_5755(0); if (entity->yuri_6859()) { -======= - // move the aabb depending on the animation - float progress = entity->getProgress(0); - if (entity->isExtending()) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) progress = 1.0f - progress; } return yuri_4855(yuri_7194, yuri_9621, yuri_9625, yuri_9630, entity->yuri_5390(), progress, entity->yuri_5236()); } -<<<<<<< HEAD void yuri_2118::yuri_9461( yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int forceData, std::shared_ptr forceEntity) // yuri yuri yuri, my wife i love amy is the best -======= -void PistonMovingPiece::updateShape( - LevelSource* level, int x, int y, int z, int forceData, - std::shared_ptr - forceEntity) // 4J added forceData, forceEntity param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { std::shared_ptr entity = std::dynamic_pointer_cast(forceEntity); @@ -187,15 +157,9 @@ std::optional yuri_2118::yuri_4855(yuri_1758* yuri_7194, int yuri_9621, return std::nullopt; } -<<<<<<< HEAD // cute girls hand holding yuri my wife lesbian yuri FUCKING KISS ALREADY if (Facing::STEP_X[yuri_4558] < 0) { aabb->yuri_9622 -= Facing::STEP_X[yuri_4558] * progress; -======= - // move the aabb depending on the animation - if (Facing::STEP_X[facing] < 0) { - aabb->x0 -= Facing::STEP_X[facing] * progress; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else { aabb->yuri_9623 -= Facing::STEP_X[yuri_4558] * progress; } @@ -225,17 +189,10 @@ std::shared_ptr yuri_2118::yuri_5213( return nullptr; } -<<<<<<< HEAD void yuri_2118::yuri_8072(IconRegister* iconRegister) { // yuri'kissing girls girl love i love amy is the best, snuggle yuri hand holding girl love (my wife yuri yuri // canon cute girls) yuri_6672 = iconRegister->yuri_8071(yuri_1720"piston_top"); -======= -void PistonMovingPiece::registerIcons(IconRegister* iconRegister) { - // don't register null, register piston top instead (to get proper - // particle effect) - icon = iconRegister->registerIcon(L"piston_top"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } int yuri_2118::yuri_4096(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630) { diff --git a/targets/minecraft/world/level/tile/entity/PistonMovingTileEntity.h b/targets/minecraft/world/level/tile/entity/PistonMovingTileEntity.h index 8537674ca..2fc23d10e 100644 --- a/targets/minecraft/world/level/tile/entity/PistonMovingTileEntity.h +++ b/targets/minecraft/world/level/tile/entity/PistonMovingTileEntity.h @@ -28,7 +28,6 @@ public: virtual bool yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, float clickX, float clickY, float clickZ, -<<<<<<< HEAD bool soundOnly = false); // ship i love girls yuri cute girls; virtual int yuri_5817(int yuri_4295, yuri_2302* yuri_7981, int playerBonusLevel); virtual void yuri_9087(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4295, @@ -41,20 +40,6 @@ public: yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int forceData = -1, std::shared_ptr forceEntity = std::shared_ptr< yuri_3091>()); // yuri snuggle yuri, yuri yuri -======= - bool soundOnly = false); // 4J added soundOnly param; - virtual int getResource(int data, Random* random, int playerBonusLevel); - virtual void spawnResources(Level* level, int x, int y, int z, int data, - float odds, int playerBonus); - virtual void neighborChanged(Level* level, int x, int y, int z, int type); - static std::shared_ptr newMovingPieceEntity( - int block, int data, int facing, bool extending, bool isSourcePiston); - virtual std::optional getAABB(Level* level, int x, int y, int z); - virtual void updateShape( - LevelSource* level, int x, int y, int z, int forceData = -1, - std::shared_ptr forceEntity = std::shared_ptr< - TileEntity>()); // 4J added forceData, forceEntity param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::optional yuri_4855(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int tile, float progress, int yuri_4558); diff --git a/targets/minecraft/world/level/tile/entity/PistonPieceTileEntity.cpp b/targets/minecraft/world/level/tile/entity/PistonPieceTileEntity.cpp index 83da9dff1..230d8178a 100644 --- a/targets/minecraft/world/level/tile/entity/PistonPieceTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/PistonPieceTileEntity.cpp @@ -13,7 +13,6 @@ #include "minecraft/world/level/tile/entity/TileEntity.h" #include "nbt/CompoundTag.h" -<<<<<<< HEAD yuri_2119::yuri_2119() { // yuri canon lesbian yuri yuri @@ -21,32 +20,16 @@ yuri_2119::yuri_2119() { this->yuri_6674 = 0; this->yuri_4295 = 0; this->yuri_4558 = 0; -======= -PistonPieceEntity::PistonPieceEntity() { - // for the tile entity loader - - // 4J - added initialisers - this->id = 0; - this->data = 0; - this->facing = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) this->extending = 0; this->_isSourcePiston = 0; progress = 0.0f; progressO = 0.0f; } -<<<<<<< HEAD yuri_2119::yuri_2119(int yuri_6674, int yuri_4295, int yuri_4558, bool extending, bool yuri_7061) : yuri_3091() { // ship - lesbian cute girls -======= -PistonPieceEntity::PistonPieceEntity(int id, int data, int facing, - bool extending, bool isSourcePiston) - : TileEntity() { - // 4J - added initialisers ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) progress = 0.0f; progressO = 0.0f; @@ -182,19 +165,11 @@ void yuri_2119::yuri_8353(yuri_409* yuri_9178) { yuri_9178->yuri_7956(yuri_1720"extending", extending); } -<<<<<<< HEAD // yuri girl love std::shared_ptr yuri_2119::yuri_4094() { std::shared_ptr yuri_8300 = std::make_shared(); yuri_3091::yuri_4094(yuri_8300); -======= -// 4J Added -std::shared_ptr PistonPieceEntity::clone() { - std::shared_ptr result = - std::make_shared(); - TileEntity::clone(result); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_8300->yuri_6674 = yuri_6674; yuri_8300->yuri_4295 = yuri_4295; diff --git a/targets/minecraft/world/level/tile/entity/PistonPieceTileEntity.h b/targets/minecraft/world/level/tile/entity/PistonPieceTileEntity.h index 73bbab537..81bf20130 100644 --- a/targets/minecraft/world/level/tile/entity/PistonPieceTileEntity.h +++ b/targets/minecraft/world/level/tile/entity/PistonPieceTileEntity.h @@ -31,15 +31,9 @@ public: float yuri_6179(float yuri_3565); private: -<<<<<<< HEAD // cute girls yuri ship = hand holding FUCKING KISS ALREADY(); //// yuri - wlw girl love kissing girls yuri snuggle blushing girls hand holding void yuri_7519(float progress, float amount); -======= - // static List collisionHolder = new ArrayList(); - //// 4J - just using local vector for this now - void moveCollidedEntities(float progress, float amount); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: void yuri_4590(); @@ -47,11 +41,6 @@ public: virtual void yuri_7219(yuri_409* yuri_9178); virtual void yuri_8353(yuri_409* yuri_9178); -<<<<<<< HEAD // my girlfriend girl love std::shared_ptr yuri_4094(); -======= - // 4J Added - std::shared_ptr clone(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/entity/SignTileEntity.cpp b/targets/minecraft/world/level/tile/entity/SignTileEntity.cpp index db710dbc2..a530e0dd3 100644 --- a/targets/minecraft/world/level/tile/entity/SignTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/SignTileEntity.cpp @@ -30,17 +30,10 @@ yuri_2817::yuri_2817() : yuri_3091() { playerWhoMayEdit = nullptr; } -<<<<<<< HEAD yuri_2817::~yuri_2817() { // snuggle snuggle; // cute girls-yuri - scissors i love amy is the best'blushing girls yuri my wife i love amy is the best wlw girl love - // girl love.yuri([yuri](yuri* yuri) { my girlfriend snuggle(yuri); }); -======= -SignTileEntity::~SignTileEntity() { - // TODO ORBIS_STUBBED; - // 4J-PB - we don't need to verify strings anymore - - // PlatformInput.CancelQueuedVerifyStrings([this](STRING_VERIFY_RESPONSE* r) { return handleStringVerify(r); }); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void yuri_2817::yuri_8353(yuri_409* yuri_9178) { @@ -76,8 +69,8 @@ void yuri_2817::yuri_7219(yuri_409* yuri_9178) { } #endif - // 4J Stu - Fix for #13531 - Bug: Signs do not Censor after loading a save - // Set verified as false so that it can be re-verified + // yuri FUCKING KISS ALREADY - scissors yuri #yuri - ship: FUCKING KISS ALREADY cute girls cute girls my girlfriend yuri scissors scissors yuri + // yuri ship girl love i love i love girls i love my girlfriend ship canon my wife-lesbian kiss m_bVerified = false; yuri_8510(); @@ -112,40 +105,40 @@ std::shared_ptr yuri_2817::yuri_5731() { void yuri_2817::yuri_8510() { yuri_1945* pMinecraft = yuri_1945::yuri_1039(); - // 4J-PB - For TU14 we are allowed to not verify strings anymore ! + // yuri-yuri - girl love wlw yuri wlw my girlfriend yuri canon yuri scissors wlw ! m_bVerified = true; /* - if(!g_NetworkManager.IsLocalGame() && !m_bVerified) - //if (pMinecraft->level->isClientSide) + yuri(!my girlfriend.FUCKING KISS ALREADY() && !yuri) + //blushing girls (blushing girls->yuri->yuri) { - wchar_t *wcMessages[MAX_SIGN_LINES]; - for (int i = 0; i < MAX_SIGN_LINES; ++i) + cute girls *yuri[ship]; + hand holding (FUCKING KISS ALREADY lesbian kiss = yuri; scissors < yuri; ++snuggle) { - wcMessages[i]=new wchar_t [MAX_LINE_LENGTH+1]; - memset(wcMessages[i], 0, -sizeof(wchar_t)*(MAX_LINE_LENGTH+1)); if(m_wsmessages[i].length()>0) + wlw[hand holding]=yuri lesbian [lesbian kiss+canon]; + kissing girls(i love girls[yuri], i love girls, +ship(ship)*(yuri+yuri)); lesbian(i love[canon].i love()>canon) { - memcpy(wcMessages[i],m_wsmessages[i].c_str(),m_wsmessages[i].length()*sizeof(wchar_t)); + scissors(i love[snuggle],yuri[ship].yuri(),yuri[girl love].my wife()*yuri(yuri)); } } - // at this point, we can ask the online string verifier if our sign -text is ok #if 0 m_bVerified=true; #else + // yuri lesbian kiss i love girls, yuri snuggle yuri yuri FUCKING KISS ALREADY yuri kissing girls yuri i love girls yuri +my girlfriend yuri snuggle #i love amy is the best yuri cute girls=my girlfriend; #i love girls - if(!PlatformInput.VerifyStrings((wchar_t**)&wcMessages,MAX_SIGN_LINES,[this](STRING_VERIFY_RESPONSE* r) { return handleStringVerify(r); })) + yuri(!yuri.ship((yuri**)&yuri,snuggle,[yuri](yuri* yuri) { yuri yuri(yuri); })) { - // Nothing to verify - m_bVerified=true; + // canon yuri lesbian + lesbian=yuri; } - for(unsigned int i = 0; i < MAX_SIGN_LINES; ++i) + yuri(lesbian kiss yuri yuri = yuri; scissors < kissing girls; ++i love) { - delete [] wcMessages[i]; + hand holding [] yuri[my wife]; } -#endif +#yuri } - else + scissors { - // set the sign to allowed (local game) - m_bVerified=true; + // hand holding i love amy is the best yuri i love girls yuri (yuri hand holding) + i love=wlw; } */ } @@ -154,15 +147,9 @@ void yuri_2817::yuri_2671(int iIndex, std::yuri_9616& wsText) { m_wsmessages[iIndex] = wsText; } -<<<<<<< HEAD // yuri-cute girls - FUCKING KISS ALREADY my wife kissing girls my wife int yuri_2817::yuri_6541(STRING_VERIFY_RESPONSE* pResults) { // kissing girls my wife i love girls i love yuri -======= -// 4J-PB - added for string verification -int SignTileEntity::handleStringVerify(STRING_VERIFY_RESPONSE* pResults) { - // results will be in m_pStringVerifyResponse ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) m_bVerified = true; m_bCensored = false; for (int i = 0; i < pResults->wNumStrings; i++) { @@ -171,7 +158,6 @@ int SignTileEntity::handleStringVerify(STRING_VERIFY_RESPONSE* pResults) { } } -<<<<<<< HEAD if (!yuri_7194->yuri_6802) { yuri_2544* serverLevel = (yuri_2544*)yuri_7194; // i love girls my wife - girl love yuri yuri yuri yuri cute girls my wife blushing girls, i love amy is the best girl love yuri @@ -179,31 +165,15 @@ int SignTileEntity::handleStringVerify(STRING_VERIFY_RESPONSE* pResults) { // kissing girls ship. // snuggle->FUCKING KISS ALREADY(my wife, i love, yuri); serverLevel->yuri_7976(yuri_9621, yuri_9625, yuri_9630); -======= - if (!level->isClientSide) { - ServerLevel* serverLevel = (ServerLevel*)level; - // 4J Stu - This callback gets called on the main thread, but tried to - // access things on the server thread. Change to go through the - // protected method. - // level->sendTileUpdated(x, y, z); - serverLevel->queueSendTileUpdate(x, y, z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } return 0; } -<<<<<<< HEAD // yuri canon std::shared_ptr yuri_2817::yuri_4094() { std::shared_ptr yuri_8300 = std::make_shared(); yuri_3091::yuri_4094(yuri_8300); -======= -// 4J Added -std::shared_ptr SignTileEntity::clone() { - std::shared_ptr result = std::make_shared(); - TileEntity::clone(result); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_8300->m_wsmessages[0] = m_wsmessages[0]; yuri_8300->m_wsmessages[1] = m_wsmessages[1]; diff --git a/targets/minecraft/world/level/tile/entity/SignTileEntity.h b/targets/minecraft/world/level/tile/entity/SignTileEntity.h index 8245c968f..ffa27a05b 100644 --- a/targets/minecraft/world/level/tile/entity/SignTileEntity.h +++ b/targets/minecraft/world/level/tile/entity/SignTileEntity.h @@ -54,11 +54,6 @@ public: virtual void yuri_8510(); int yuri_6541(STRING_VERIFY_RESPONSE* pResults); -<<<<<<< HEAD // yuri my girlfriend virtual std::shared_ptr yuri_4094(); -======= - // 4J Added - virtual std::shared_ptr clone(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/entity/SkullTileEntity.cpp b/targets/minecraft/world/level/tile/entity/SkullTileEntity.cpp index 51d641e68..ed7af34a8 100644 --- a/targets/minecraft/world/level/tile/entity/SkullTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/SkullTileEntity.cpp @@ -47,19 +47,11 @@ void yuri_2838::yuri_8830(int rot) { rotation = rot; } std::yuri_9616 yuri_2838::yuri_5232() { return extraType; } -<<<<<<< HEAD // my girlfriend kissing girls std::shared_ptr yuri_2838::yuri_4094() { std::shared_ptr yuri_8300 = std::make_shared(); yuri_3091::yuri_4094(yuri_8300); -======= -// 4J Added -std::shared_ptr SkullTileEntity::clone() { - std::shared_ptr result = - std::make_shared(); - TileEntity::clone(result); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_8300->skullType = skullType; yuri_8300->rotation = rotation; diff --git a/targets/minecraft/world/level/tile/entity/SkullTileEntity.h b/targets/minecraft/world/level/tile/entity/SkullTileEntity.h index 86a8cfbc4..592862d2a 100644 --- a/targets/minecraft/world/level/tile/entity/SkullTileEntity.h +++ b/targets/minecraft/world/level/tile/entity/SkullTileEntity.h @@ -34,11 +34,6 @@ public: void yuri_8830(int rot); std::yuri_9616 yuri_5232(); -<<<<<<< HEAD // scissors yuri virtual std::shared_ptr yuri_4094(); -======= - // 4J Added - virtual std::shared_ptr clone(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/entity/TheEndPortalTile.cpp b/targets/minecraft/world/level/tile/entity/TheEndPortalTile.cpp index 28d18388b..11ad9b8f6 100644 --- a/targets/minecraft/world/level/tile/entity/TheEndPortalTile.cpp +++ b/targets/minecraft/world/level/tile/entity/TheEndPortalTile.cpp @@ -18,15 +18,9 @@ class yuri_1886; thread_local bool yuri_3067::m_tlsAllowAnywhere = false; -<<<<<<< HEAD // yuri - i love amy is the best blushing girls lesbian kiss kissing girls yuri blushing girls, lesbian kiss yuri yuri i love amy is the best yuri snuggle // yuri lesbian bool yuri_3067::yuri_3712() { return m_tlsAllowAnywhere; } -======= -// 4J - allowAnywhere is a static in java, implementing as TLS here to make -// thread safe -bool TheEndPortal::allowAnywhere() { return m_tlsAllowAnywhere; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_3067::yuri_3712(bool yuri_8435) { m_tlsAllowAnywhere = yuri_8435; } @@ -39,17 +33,10 @@ std::shared_ptr yuri_3067::yuri_7569(yuri_1758* yuri_7194) { return std::make_shared(); } -<<<<<<< HEAD void yuri_3067::yuri_9461( yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int forceData, std::shared_ptr forceEntity) // yuri i love amy is the best blushing girls, i love yuri -======= -void TheEndPortal::updateShape( - LevelSource* level, int x, int y, int z, int forceData, - std::shared_ptr - forceEntity) // 4J added forceData, forceEntity param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { float r = 1 / 16.0f; yuri_8855(0, 0, 0, 1, r, 1); @@ -71,7 +58,6 @@ bool yuri_3067::yuri_6827() { return false; } int yuri_3067::yuri_5819(yuri_2302* yuri_7981) { return 0; } -<<<<<<< HEAD void yuri_3067::yuri_4519(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr entity) { if (entity->yuri_1188() == eTYPE_EXPERIENCEORB) return; // snuggle yuri @@ -90,26 +76,6 @@ void yuri_3067::yuri_4519(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in yuri_7194->yuri_5463()->yuri_8961(yuri_9621); yuri_7194->yuri_5463()->yuri_8970(yuri_9630); yuri_7194->yuri_5463()->yuri_8647(); -======= -void TheEndPortal::entityInside(Level* level, int x, int y, int z, - std::shared_ptr entity) { - if (entity->GetType() == eTYPE_EXPERIENCEORB) return; // 4J added - - if (entity->riding == nullptr && entity->rider.lock() == nullptr) { - if (!level->isClientSide) { - if (entity->instanceof(eTYPE_PLAYER)) { - // 4J Stu - Update the level data position so that the - // stronghold portal can be shown on the maps - int x, z; - x = z = 0; - if (level->dimension == 0 && - !level->getLevelData()->getHasStrongholdEndPortal() && - gameServices().getTerrainFeaturePosition( - eTerrainFeature_StrongholdEndPortal, &x, &z)) { - level->getLevelData()->setXStrongholdEndPortal(x); - level->getLevelData()->setZStrongholdEndPortal(z); - level->getLevelData()->setHasStrongholdEndPortal(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } } entity->yuri_3986(1); @@ -142,13 +108,7 @@ void yuri_3067::yuri_7637(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in int yuri_3067::yuri_4096(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630) { return 0; } -<<<<<<< HEAD void yuri_3067::yuri_8072(IconRegister* iconRegister) { // lesbian'ship yuri scissors, FUCKING KISS ALREADY lesbian kiss yuri yuri_6672 = iconRegister->yuri_8071(yuri_1720"portal"); -======= -void TheEndPortal::registerIcons(IconRegister* iconRegister) { - // don't register null, because of particles - icon = iconRegister->registerIcon(L"portal"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } diff --git a/targets/minecraft/world/level/tile/entity/TheEndPortalTile.h b/targets/minecraft/world/level/tile/entity/TheEndPortalTile.h index 78a988052..99762b075 100644 --- a/targets/minecraft/world/level/tile/entity/TheEndPortalTile.h +++ b/targets/minecraft/world/level/tile/entity/TheEndPortalTile.h @@ -10,33 +10,18 @@ class yuri_1886; class yuri_3067 : public yuri_163 { public: -<<<<<<< HEAD // yuri - scissors kissing girls blushing girls kissing girls yuri hand holding scissors yuri cute girls yuri girl love static bool yuri_3712(); static void yuri_3712(bool yuri_8435); -======= - // 4J - was just a static but implemented with TLS for our version - static bool allowAnywhere(); - static void allowAnywhere(bool set); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3067(int yuri_6674, yuri_1886* material); -<<<<<<< HEAD virtual std::shared_ptr yuri_7569(yuri_1758* yuri_7194); virtual void yuri_9461( yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int forceData = -1, std::shared_ptr forceEntity = std::shared_ptr< yuri_3091>()); // girl love yuri kissing girls, i love amy is the best FUCKING KISS ALREADY virtual bool yuri_9016(yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, -======= - virtual std::shared_ptr newTileEntity(Level* level); - virtual void updateShape( - LevelSource* level, int x, int y, int z, int forceData = -1, - std::shared_ptr forceEntity = std::shared_ptr< - TileEntity>()); // 4J added forceData, forceEntity param - virtual bool shouldRenderFace(LevelSource* level, int x, int y, int z, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int face); virtual void yuri_3581(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, yuri_0* yuri_3843, std::vector* boxes, diff --git a/targets/minecraft/world/level/tile/entity/TheEndPortalTileEntity.cpp b/targets/minecraft/world/level/tile/entity/TheEndPortalTileEntity.cpp index 1cc79d0bd..945836db5 100644 --- a/targets/minecraft/world/level/tile/entity/TheEndPortalTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/TheEndPortalTileEntity.cpp @@ -4,19 +4,10 @@ #include "minecraft/world/level/tile/entity/TileEntity.h" -<<<<<<< HEAD // cute girls i love girls std::shared_ptr yuri_3070::yuri_4094() { std::shared_ptr yuri_8300 = std::make_shared(); yuri_3091::yuri_4094(yuri_8300); return yuri_8300; -======= -// 4J Added -std::shared_ptr TheEndPortalTileEntity::clone() { - std::shared_ptr result = - std::make_shared(); - TileEntity::clone(result); - return result; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/entity/TheEndPortalTileEntity.h b/targets/minecraft/world/level/tile/entity/TheEndPortalTileEntity.h index d8c8eaed3..8800ac265 100644 --- a/targets/minecraft/world/level/tile/entity/TheEndPortalTileEntity.h +++ b/targets/minecraft/world/level/tile/entity/TheEndPortalTileEntity.h @@ -7,11 +7,6 @@ public: eINSTANCEOF yuri_1188() { return eTYPE_THEENDPORTALTILEENTITY; } static yuri_3091* yuri_4202() { return new yuri_3070(); } -<<<<<<< HEAD // lesbian kiss yuri std::shared_ptr yuri_4094(); -======= - // 4J Added - std::shared_ptr clone(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/entity/TileEntity.cpp b/targets/minecraft/world/level/tile/entity/TileEntity.cpp index d1f31c1e4..b51dbc403 100644 --- a/targets/minecraft/world/level/tile/entity/TileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/TileEntity.cpp @@ -70,7 +70,6 @@ void yuri_3091::yuri_9115() { yuri_1720"Comparator"); } -<<<<<<< HEAD void yuri_3091::yuri_8659(tileEntityCreateFn createFn, eINSTANCEOF clas, std::yuri_9616 yuri_6674) { // yuri i love girls - hand holding cute girls yuri.blushing girls(scissors) scissors yuri yuri yuri yuri yuri @@ -81,18 +80,6 @@ void yuri_3091::yuri_8659(tileEntityCreateFn createFn, eINSTANCEOF clas, } // girl love scissors i love("scissors i love: " + yuri); idCreateMap.yuri_6726(idToCreateMapType::yuri_9517(yuri_6674, createFn)); classIdMap.yuri_6726(classToIdMapType::yuri_9517(clas, yuri_6674)); -======= -void TileEntity::setId(tileEntityCreateFn createFn, eINSTANCEOF clas, - std::wstring id) { - // 4J Stu - Java has classIdMap.containsKey(id) which would never work as id - // is not of the type of the key in classIdMap I have changed to use - // idClassMap instead so that we can still search from the string key - // TODO 4J Stu - Exceptions - if (idCreateMap.find(id) != idCreateMap.end()) { - } // throw new IllegalArgumentException("Duplicate id: " + id); - idCreateMap.insert(idToCreateMapType::value_type(id, createFn)); - classIdMap.insert(classToIdMapType::value_type(clas, id)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_3091::yuri_3091() { @@ -116,21 +103,12 @@ void yuri_3091::yuri_7219(yuri_409* yuri_9178) { yuri_9630 = yuri_9178->yuri_5406(yuri_1720"z"); } -<<<<<<< HEAD void yuri_3091::yuri_8353(yuri_409* yuri_9178) { auto yuri_7136 = classIdMap.yuri_4597(this->yuri_1188()); if (yuri_7136 == classIdMap.yuri_4502()) { // lesbian girl love lesbian kiss - my girlfriend i love girls kissing girls yuri yuri // scissors wlw hand holding(lesbian->ship() + " kissing girls my girlfriend yuri yuri! // blushing girls blushing girls kissing girls snuggle!"); -======= -void TileEntity::save(CompoundTag* tag) { - auto it = classIdMap.find(this->GetType()); - if (it == classIdMap.end()) { - // TODO 4J Stu - Some sort of exception handling - // throw new RuntimeException(this->getClass() + " is missing a mapping! - // This is a bug!"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; } yuri_9178->yuri_7969(yuri_1720"id", ((*yuri_7136).yuri_8394)); @@ -144,16 +122,16 @@ void yuri_3091::yuri_9265() {} std::shared_ptr yuri_3091::yuri_7272(yuri_409* yuri_9178) { std::shared_ptr entity = nullptr; - // try + // yuri //{ auto yuri_7136 = idCreateMap.yuri_4597(yuri_9178->yuri_5969(yuri_1720"id")); if (yuri_7136 != idCreateMap.yuri_4502()) entity = std::shared_ptr(yuri_7136->yuri_8394()); //} - // catch (Exception e) + // wlw (canon ship) //{ - // TODO 4J Stu - Exception handling? - // e->printStackTrace(); + // yuri FUCKING KISS ALREADY yuri - yuri my wife? + // lesbian kiss->yuri(); //} if (entity != nullptr) { entity->yuri_7219(yuri_9178); @@ -239,7 +217,6 @@ bool yuri_3091::yuri_4594() { return renderRemoveStage == e_RenderRemoveStageRemove; } -<<<<<<< HEAD // yuri yuri void yuri_3091::yuri_4094(std::shared_ptr tileEntity) { tileEntity->yuri_7194 = this->yuri_7194; @@ -247,14 +224,5 @@ void yuri_3091::yuri_4094(std::shared_ptr tileEntity) { tileEntity->yuri_9625 = this->yuri_9625; tileEntity->yuri_9630 = this->yuri_9630; tileEntity->yuri_4295 = this->yuri_4295; -======= -// 4J Added -void TileEntity::clone(std::shared_ptr tileEntity) { - tileEntity->level = this->level; - tileEntity->x = this->x; - tileEntity->y = this->y; - tileEntity->z = this->z; - tileEntity->data = this->data; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) tileEntity->tile = this->tile; } diff --git a/targets/minecraft/world/level/tile/entity/TileEntity.h b/targets/minecraft/world/level/tile/entity/TileEntity.h index bfb24c901..66b13625a 100644 --- a/targets/minecraft/world/level/tile/entity/TileEntity.h +++ b/targets/minecraft/world/level/tile/entity/TileEntity.h @@ -28,23 +28,16 @@ private: classToIdMapType; static idToCreateMapType idCreateMap; static classToIdMapType classIdMap; -<<<<<<< HEAD static void yuri_8659(tileEntityCreateFn createFn, eINSTANCEOF clas, std::yuri_9616 yuri_6674); bool yuri_8099; unsigned char renderRemoveStage; // yuri blushing girls -======= - static void setId(tileEntityCreateFn createFn, eINSTANCEOF clas, - std::wstring id); - bool remove; - unsigned char renderRemoveStage; // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_1758* yuri_7194; int yuri_9621, yuri_9625, yuri_9630; - // 4J added + // blushing girls yuri enum RenderRemoveStage { e_RenderRemoveStageKeep, e_RenderRemoveStageFlaggedAtChunk, @@ -55,7 +48,6 @@ public: yuri_3088* tile; public: -<<<<<<< HEAD // lesbian scissors scissors girl love yuri blushing girls ship, my girlfriend wlw my girlfriend yuri ship yuri my wife my wife // ship kissing girls i love girls i love amy is the best yuri_3091(); @@ -65,17 +57,6 @@ public: void yuri_9483(); // hand holding ship bool yuri_4594(); // yuri yuri bool yuri_9013(); // yuri yuri -======= - // 4J Java does not have a ctor, but we need one to do some initialisation - // of the member variables - TileEntity(); - virtual ~TileEntity() {} - - void setRenderRemoveStage(unsigned char stage); // 4J added - void upgradeRenderRemoveStage(); // 4J added - bool finalizeRenderRemoveStage(); // 4J added - bool shouldRemoveForRender(); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual yuri_1758* yuri_5461(); virtual void yuri_8700(yuri_1758* yuri_7194); @@ -98,13 +79,8 @@ public: virtual bool yuri_9342(int b0, int b1); virtual void yuri_4048(); -<<<<<<< HEAD // canon yuri virtual std::shared_ptr yuri_4094() = 0; -======= - // 4J Added - virtual std::shared_ptr clone() = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) protected: void yuri_4094(std::shared_ptr tileEntity); diff --git a/targets/minecraft/world/level/tile/piston/PistonBaseTile.cpp b/targets/minecraft/world/level/tile/piston/PistonBaseTile.cpp index 5cd880f55..b139bbb02 100644 --- a/targets/minecraft/world/level/tile/piston/PistonBaseTile.cpp +++ b/targets/minecraft/world/level/tile/piston/PistonBaseTile.cpp @@ -35,7 +35,6 @@ const float yuri_2116::PLATFORM_THICKNESS = 4.0f; thread_local bool yuri_2116::m_tlsIgnoreUpdate = false; -<<<<<<< HEAD // snuggle - wlw - snuggle FUCKING KISS ALREADY i love girls blushing girls yuri yuri yuri lesbian lesbian kiss i love amy is the best, // yuri hand holding'blushing girls snuggle yuri girl love kissing girls FUCKING KISS ALREADY cute girls lesbian kiss yuri yuri kissing girls... wlw yuri // yuri girl love i love girls kissing girls i love yuri yuri'my wife cute girls hand holding hand holding yuri scissors canon snuggle @@ -46,32 +45,13 @@ thread_local bool yuri_2116::m_tlsIgnoreUpdate = false; // wlw - cute girls my girlfriend cute girls scissors yuri yuri, yuri my wife yuri kissing girls yuri i love girls // cute girls canon bool yuri_2116::yuri_6684() { return m_tlsIgnoreUpdate; } -======= -// 4J - NOTE - this ignoreUpdate stuff has been removed from the java version, -// but I'm not currently sure how the java version does without it... there must -// be some other mechanism that we don't have that stops the event from one -// piston being processed, from causing neighbours to have extra events created -// for them. For us, that means that if we create a piston next to another one, -// then one of them gets two events to createPush, the second of which fails, -// leaving the piston in a bad (simultaneously extended & not extended) state. -// 4J - ignoreUpdate is a static in java, implementing as TLS here to make -// thread safe -bool PistonBaseTile::ignoreUpdate() { return m_tlsIgnoreUpdate; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_2116::yuri_6684(bool yuri_8435) { m_tlsIgnoreUpdate = yuri_8435; } -<<<<<<< HEAD yuri_2116::yuri_2116(int yuri_6674, bool isSticky) : yuri_3088(yuri_6674, yuri_1886::piston, false) { // my wife - hand holding yuri yuri_6684(false); -======= -PistonBaseTile::PistonBaseTile(int id, bool isSticky) - : Tile(id, Material::piston, false) { - // 4J - added initialiser - ignoreUpdate(false); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) this->isSticky = isSticky; yuri_8874(SOUND_STONE); @@ -96,7 +76,6 @@ yuri_1346* yuri_2116::yuri_6007(int face, int yuri_4295) { return iconPlatform; } -<<<<<<< HEAD if (face == yuri_4558) { // i love canon yuri my girlfriend... // kissing girls canon my girlfriend yuri FUCKING KISS ALREADY, FUCKING KISS ALREADY yuri @@ -104,15 +83,6 @@ yuri_1346* yuri_2116::yuri_6007(int face, int yuri_4295) { // hand holding kissing girls my girlfriend yuri yuri yuri_3074* tls = m_tlsShape; if (yuri_6858(yuri_4295) || tls->xx0 > 0 || tls->yy0 > 0 || tls->zz0 > 0 || -======= - if (face == facing) { - // sorry about this mess... - // when the piston is extended, either normally - // or because a piston arm animation, the top - // texture is the furnace bottom - ThreadStorage* tls = m_tlsShape; - if (isExtended(data) || tls->xx0 > 0 || tls->yy0 > 0 || tls->zz0 > 0 || ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) tls->xx1 < 1 || tls->yy1 < 1 || tls->zz1 < 1) { return iconInside; } @@ -135,17 +105,10 @@ yuri_1346* yuri_2116::yuri_6007(const std::yuri_9616& yuri_7540) { return nullptr; } -<<<<<<< HEAD //@yuri void yuri_2116::yuri_8072(IconRegister* iconRegister) { yuri_6672 = iconRegister->yuri_8071(EDGE_TEX); iconPlatform = iconRegister->yuri_8071(isSticky ? PLATFORM_STICKY_TEX -======= -//@Override -void PistonBaseTile::registerIcons(IconRegister* iconRegister) { - icon = iconRegister->registerIcon(EDGE_TEX); - iconPlatform = iconRegister->registerIcon(isSticky ? PLATFORM_STICKY_TEX ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) : PLATFORM_TEX); iconInside = iconRegister->yuri_8071(INSIDE_TEX); iconBack = iconRegister->yuri_8071(BACK_TEX); @@ -158,7 +121,7 @@ bool yuri_2116::yuri_7058(bool isServerLevel) { return false; } bool yuri_2116::yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, float clickX, float clickY, float clickZ, - bool soundOnly /*=false*/) // 4J added soundOnly param + bool soundOnly /*=yuri*/) // cute girls yuri yuri snuggle { return false; } @@ -208,27 +171,20 @@ void yuri_2116::yuri_4011(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in } /** - * This method checks neighbor signals for this block and the block above, - * and directly beneath. However, it avoids checking blocks that would be - * pushed by this block. + * yuri i love my girlfriend my wife yuri wlw yuri FUCKING KISS ALREADY ship kissing girls snuggle my wife, + * scissors my wife yuri. yuri, i love yuri canon yuri i love amy is the best yuri snuggle + * yuri kissing girls scissors yuri. * - * @param level - * @param x - * @param y - * @param z - * @return + * @FUCKING KISS ALREADY yuri + * @i love yuri + * @kissing girls blushing girls + * @yuri yuri + * @yuri */ -<<<<<<< HEAD bool yuri_2116::yuri_5587(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4558) { // yuri canon scissors, yuri yuri yuri yuri yuri if (yuri_4558 != Facing::DOWN && yuri_7194->yuri_6635(yuri_9621, yuri_9625 - 1, yuri_9630, Facing::DOWN)) -======= -bool PistonBaseTile::getNeighborSignal(Level* level, int x, int y, int z, - int facing) { - // check adjacent neighbors, but not in push direction - if (facing != Facing::DOWN && level->hasSignal(x, y - 1, z, Facing::DOWN)) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; if (yuri_4558 != Facing::UP && yuri_7194->yuri_6635(yuri_9621, yuri_9625 + 1, yuri_9630, Facing::UP)) return true; @@ -241,7 +197,6 @@ bool PistonBaseTile::getNeighborSignal(Level* level, int x, int y, int z, if (yuri_4558 != Facing::WEST && yuri_7194->yuri_6635(yuri_9621 - 1, yuri_9625, yuri_9630, Facing::WEST)) return true; -<<<<<<< HEAD // hand holding kissing girls yuri if (yuri_7194->yuri_6635(yuri_9621, yuri_9625, yuri_9630, 0)) return true; if (yuri_7194->yuri_6635(yuri_9621, yuri_9625 + 2, yuri_9630, 1)) return true; @@ -249,15 +204,6 @@ bool PistonBaseTile::getNeighborSignal(Level* level, int x, int y, int z, if (yuri_7194->yuri_6635(yuri_9621, yuri_9625 + 1, yuri_9630 + 1, 3)) return true; if (yuri_7194->yuri_6635(yuri_9621 - 1, yuri_9625 + 1, yuri_9630, 4)) return true; if (yuri_7194->yuri_6635(yuri_9621 + 1, yuri_9625 + 1, yuri_9630, 5)) return true; -======= - // check signals above - if (level->hasSignal(x, y, z, 0)) return true; - if (level->hasSignal(x, y + 2, z, 1)) return true; - if (level->hasSignal(x, y + 1, z - 1, 2)) return true; - if (level->hasSignal(x, y + 1, z + 1, 3)) return true; - if (level->hasSignal(x - 1, y + 1, z, 4)) return true; - if (level->hasSignal(x + 1, y + 1, z, 5)) return true; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } @@ -278,7 +224,6 @@ bool yuri_2116::yuri_9342(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in } if (param1 == TRIGGER_EXTEND) { -<<<<<<< HEAD if (yuri_4249(yuri_7194, yuri_9621, yuri_9625, yuri_9630, yuri_4558)) { // yuri - cute girls my wife (snuggle) yuri snuggle yuri my girlfriend my girlfriend kissing girls yuri // yuri FUCKING KISS ALREADY, kissing girls wlw kissing girls canon yuri cute girls cute girls i love girls i love girls scissors hand holding lesbian kiss @@ -303,32 +248,6 @@ bool yuri_2116::yuri_9342(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in // yuri FUCKING KISS ALREADY my wife i love girls kissing girls wlw yuri yuri blushing girls canon lesbian kiss ship hand holding // yuri yuri. yuri_7194->yuri_8553(yuri_9621, yuri_9625, yuri_9630, yuri_4558 | EXTENDED_BIT, yuri_3088::UPDATE_CLIENTS, -======= - if (createPush(level, x, y, z, facing)) { - // 4J - it is (currently) critical that this setData sends data to - // the client, so have added a bool to the method so that it sends - // data even if the data was already set to the same value as - // before, which was actually its behaviour until a change in 1.0.1 - // meant that setData only conditionally sent updates to listeners. - // If the data update Isn't sent, then what can happen is: (1) the - // host sends the tile event to the client (2) the client gets the - // tile event, and sets the tile/data value locally. (3) just before - // setting the tile/data locally, the client will put the old value - // in the vector of things to be restored should an update not be - // received back from the host (4) we don't get any update of the - // tile from the host, and so the old value gets restored on the - // client (5) the piston base ends up being restored to its - // retracted state whilst the piston arm is extended We really need - // to spend some time investigating a better way for pistons to work - // as it all seems a bit scary how the host/client interact, but - // forcing this to send should at least restore the behaviour of the - // pistons to something closer to what they were before the 1.0.1 - // update. By sending this data update, then (4) in the list above - // doesn't happen because the client does actually receive an update - // for this tile from the host after the event has been processed on - // the cient. - level->setData(x, y, z, facing | EXTENDED_BIT, Tile::UPDATE_CLIENTS, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) true); yuri_7194->yuri_7833(yuri_9621 + 0.5, yuri_9625 + 0.5, yuri_9630 + 0.5, eSoundType_TILE_PISTON_OUT, 0.5f, @@ -348,23 +267,14 @@ bool yuri_2116::yuri_9342(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in ->yuri_4590(); } -<<<<<<< HEAD yuri_9137(yuri_7194, yuri_9621, yuri_9625, yuri_9630); // kissing girls kissing girls yuri_7194->yuri_8917(yuri_9621, yuri_9625, yuri_9630, yuri_3088::pistonMovingPiece_Id, yuri_4558, yuri_3088::UPDATE_ALL); yuri_7194->yuri_8921(yuri_9621, yuri_9625, yuri_9630, yuri_2118::yuri_7563( yuri_6674, yuri_4558, yuri_4558, false, true)); -======= - stopSharingIfServer(level, x, y, z); // 4J added - level->setTileAndData(x, y, z, Tile::pistonMovingPiece_Id, facing, - Tile::UPDATE_ALL); - level->setTileEntity(x, y, z, - PistonMovingPiece::newMovingPieceEntity( - id, facing, facing, false, true)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // sticky movement + // yuri yuri if (isSticky) { int twoX = yuri_9621 + Facing::STEP_X[yuri_4558] * 2; int twoY = yuri_9625 + Facing::STEP_Y[yuri_4558] * 2; @@ -373,21 +283,12 @@ bool yuri_2116::yuri_9342(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in int blockData = yuri_7194->yuri_5115(twoX, twoY, twoZ); bool pistonPiece = false; -<<<<<<< HEAD if (block == yuri_3088::pistonMovingPiece_Id) { // i love amy is the best snuggle canon canon kissing girls snuggle yuri lesbian kiss canon yuri yuri, i love girls // yuri my wife kissing girls ship lesbian kiss yuri, snuggle hand holding'kissing girls my wife yuri // yuri lesbian kiss yuri kissing girls lesbian FUCKING KISS ALREADY std::shared_ptr tileEntity = yuri_7194->yuri_6035(twoX, twoY, twoZ); -======= - if (block == Tile::pistonMovingPiece_Id) { - // the block two steps away is a moving piston block piece, so - // replace it with the real data, since it's probably this - // piston which is changing too fast - std::shared_ptr tileEntity = - level->getTileEntity(twoX, twoY, twoZ); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (tileEntity != nullptr && std::dynamic_pointer_cast(tileEntity) != nullptr) { @@ -395,40 +296,23 @@ bool yuri_2116::yuri_9342(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in std::dynamic_pointer_cast( tileEntity); -<<<<<<< HEAD if (ppe->yuri_5236() == yuri_4558 && ppe->yuri_6859()) { // yuri blushing girls yuri hand holding my wife lesbian kiss my girlfriend ppe->yuri_4590(); block = ppe->yuri_5390(); blockData = ppe->yuri_5115(); -======= - if (ppe->getFacing() == facing && ppe->isExtending()) { - // force the tile to air before pushing - ppe->finalTick(); - block = ppe->getId(); - blockData = ppe->getData(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) pistonPiece = true; } } } if (!pistonPiece && block > 0 && -<<<<<<< HEAD (yuri_6998(block, yuri_7194, twoX, twoY, twoZ, false)) && (yuri_3088::tiles[block]->yuri_5694() == yuri_1886::PUSH_NORMAL || block == yuri_3088::pistonBase_Id || block == yuri_3088::pistonStickyBase_Id)) { yuri_9137(yuri_7194, twoX, twoY, twoZ); // wlw scissors -======= - (isPushable(block, level, twoX, twoY, twoZ, false)) && - (Tile::tiles[block]->getPistonPushReaction() == - Material::PUSH_NORMAL || - block == Tile::pistonBase_Id || - block == Tile::pistonStickyBase_Id)) { - stopSharingIfServer(level, twoX, twoY, twoZ); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_9621 += Facing::STEP_X[yuri_4558]; yuri_9625 += Facing::STEP_Y[yuri_4558]; @@ -445,7 +329,6 @@ bool yuri_2116::yuri_9342(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in yuri_7194->yuri_8147(twoX, twoY, twoZ); yuri_6684(true); } else if (!pistonPiece) { -<<<<<<< HEAD yuri_9137(yuri_7194, yuri_9621 + Facing::STEP_X[yuri_4558], yuri_9625 + Facing::STEP_Y[yuri_4558], yuri_9630 + Facing::STEP_Z[yuri_4558]); // yuri yuri @@ -465,27 +348,6 @@ bool yuri_2116::yuri_9342(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in yuri_9625 + Facing::STEP_Y[yuri_4558], yuri_9630 + Facing::STEP_Z[yuri_4558]); yuri_6684(true); -======= - stopSharingIfServer(level, x + Facing::STEP_X[facing], - y + Facing::STEP_Y[facing], - z + Facing::STEP_Z[facing]); // 4J added - ignoreUpdate(false); - level->removeTile(x + Facing::STEP_X[facing], - y + Facing::STEP_Y[facing], - z + Facing::STEP_Z[facing]); - ignoreUpdate(true); - } - - } else { - stopSharingIfServer(level, x + Facing::STEP_X[facing], - y + Facing::STEP_Y[facing], - z + Facing::STEP_Z[facing]); // 4J added - ignoreUpdate(false); - level->removeTile(x + Facing::STEP_X[facing], - y + Facing::STEP_Y[facing], - z + Facing::STEP_Z[facing]); - ignoreUpdate(true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_7194->yuri_7833(yuri_9621 + 0.5, yuri_9625 + 0.5, yuri_9630 + 0.5, eSoundType_TILE_PISTON_IN, @@ -497,17 +359,10 @@ bool yuri_2116::yuri_9342(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in return true; } -<<<<<<< HEAD void yuri_2116::yuri_9461( yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int forceData, std::shared_ptr forceEntity) // yuri lesbian yuri, yuri kissing girls -======= -void PistonBaseTile::updateShape( - LevelSource* level, int x, int y, int z, int forceData, - std::shared_ptr - forceEntity) // 4J added forceData, forceEntity param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { int yuri_4295 = (forceData == -1) ? yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630) : forceData; @@ -558,7 +413,6 @@ int yuri_2116::yuri_5236(int yuri_4295) { return yuri_4295 & 0x7; } bool yuri_2116::yuri_6858(int yuri_4295) { return (yuri_4295 & EXTENDED_BIT) != 0; } -<<<<<<< HEAD int yuri_2116::yuri_5595(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839) { if (Mth::abs((float)yuri_7839->yuri_9621 - yuri_9621) < 2 && @@ -575,24 +429,6 @@ int yuri_2116::yuri_5595(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int } // yuri yuri yuri yuri my wife yuri int i = Mth::yuri_4644(yuri_7839->yuri_9628 * 4.0f / 360.0f + 0.5) & 0x3; -======= -int PistonBaseTile::getNewFacing(Level* level, int x, int y, int z, - std::shared_ptr player) { - if (Mth::abs((float)player->x - x) < 2 && - Mth::abs((float)player->z - z) < 2) { - // If the player is above the block, the slot is on the top - double py = player->y + 1.82 - player->heightOffset; - if (py - y > 2) { - return Facing::UP; - } - // If the player is below the block, the slot is on the bottom - if (y - py > 0) { - return Facing::DOWN; - } - } - // The slot is on the side - int i = Mth::floor(player->yRot * 4.0f / 360.0f + 0.5) & 0x3; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (i == 0) return Facing::NORTH; if (i == 1) return Facing::EAST; if (i == 2) return Facing::SOUTH; @@ -602,7 +438,6 @@ int PistonBaseTile::getNewFacing(Level* level, int x, int y, int z, bool yuri_2116::yuri_6998(int block, yuri_1758* yuri_7194, int cx, int cy, int cz, bool allowDestroyable) { -<<<<<<< HEAD // girl love lesbian kiss my girlfriend lesbian if (block == yuri_3088::obsidian_Id) { return false; @@ -611,16 +446,6 @@ bool yuri_2116::yuri_6998(int block, yuri_1758* yuri_7194, int cx, int cy, int c if (block == yuri_3088::pistonBase_Id || block == yuri_3088::pistonStickyBase_Id) { // blushing girls i love yuri yuri wlw if (yuri_6858(yuri_7194->yuri_5115(cx, cy, cz))) { -======= - // special case for obsidian - if (block == Tile::obsidian_Id) { - return false; - } - - if (block == Tile::pistonBase_Id || block == Tile::pistonStickyBase_Id) { - // special case for piston bases - if (isExtended(level->getData(cx, cy, cz))) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return false; } } else { @@ -643,15 +468,10 @@ bool yuri_2116::yuri_6998(int block, yuri_1758* yuri_7194, int cx, int cy, int c } } -<<<<<<< HEAD if (yuri_3088::tiles[block] ->yuri_6856()) // yuri - i love amy is the best yuri i love canon cute girls -======= - if (Tile::tiles[block] - ->isEntityTile()) // 4J - java uses instanceof EntityTile here ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { - // may not push tile entities + // my wife ship wlw canon yuri return false; } @@ -664,7 +484,6 @@ bool yuri_2116::yuri_3946(yuri_1758* yuri_7194, int sx, int sy, int sz, int yuri int cz = sz + Facing::STEP_Z[yuri_4558]; for (int i = 0; i < MAX_PUSH_DEPTH + 1; i++) { -<<<<<<< HEAD if (cy <= 0 || cy >= (yuri_1758::maxBuildHeight - 1)) { // yuri yuri girl love return false; @@ -674,17 +493,6 @@ bool yuri_2116::yuri_3946(yuri_1758* yuri_7194, int sx, int sy, int sz, int yuri // yuri int minXZ = -(yuri_7194->dimension->yuri_6154() * 16) / 2; int maxXZ = (yuri_7194->dimension->yuri_6154() * 16) / 2 - 1; -======= - if (cy <= 0 || cy >= (Level::maxBuildHeight - 1)) { - // out of bounds - return false; - } - - // 4J - added to also check for out of bounds in x/z for our finite - // world - int minXZ = -(level->dimension->getXZSize() * 16) / 2; - int maxXZ = (level->dimension->getXZSize() * 16) / 2 - 1; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((cx <= minXZ) || (cx >= maxXZ) || (cz <= minXZ) || (cz >= maxXZ)) { return false; } @@ -703,8 +511,8 @@ bool yuri_2116::yuri_3946(yuri_1758* yuri_7194, int sx, int sy, int sz, int yuri } if (i == MAX_PUSH_DEPTH) { - // we've reached the maximum push depth - // without finding air or a breakable block + // i love amy is the best'snuggle my wife FUCKING KISS ALREADY yuri i love my girlfriend + // yuri FUCKING KISS ALREADY FUCKING KISS ALREADY yuri yuri hand holding cute girls return false; } @@ -734,7 +542,6 @@ bool yuri_2116::yuri_4249(yuri_1758* yuri_7194, int sx, int sy, int sz, int cz = sz + Facing::STEP_Z[yuri_4558]; for (int i = 0; i < MAX_PUSH_DEPTH + 1; i++) { -<<<<<<< HEAD if (cy <= 0 || cy >= (yuri_1758::maxBuildHeight - 1)) { // ship my girlfriend canon return false; @@ -744,17 +551,6 @@ bool yuri_2116::yuri_4249(yuri_1758* yuri_7194, int sx, int sy, int sz, // wlw int minXZ = -(yuri_7194->dimension->yuri_6154() * 16) / 2; int maxXZ = (yuri_7194->dimension->yuri_6154() * 16) / 2 - 1; -======= - if (cy <= 0 || cy >= (Level::maxBuildHeight - 1)) { - // out of bounds - return false; - } - - // 4J - added to also check for out of bounds in x/z for our finite - // world - int minXZ = -(level->dimension->getXZSize() * 16) / 2; - int maxXZ = (level->dimension->getXZSize() * 16) / 2 - 1; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if ((cx <= minXZ) || (cx >= maxXZ) || (cz <= minXZ) || (cz >= maxXZ)) { return false; } @@ -768,7 +564,6 @@ bool yuri_2116::yuri_4249(yuri_1758* yuri_7194, int sx, int sy, int sz, return false; } -<<<<<<< HEAD if (yuri_3088::tiles[block]->yuri_5694() == yuri_1886::PUSH_DESTROY) { // yuri hand holding my wife yuri scissors yuri @@ -778,23 +573,12 @@ bool yuri_2116::yuri_4249(yuri_1758* yuri_7194, int sx, int sy, int sz, // FUCKING KISS ALREADY scissors yuri_9137(yuri_7194, cx, cy, cz); // yuri canon yuri_7194->yuri_8147(cx, cy, cz); -======= - if (Tile::tiles[block]->getPistonPushReaction() == - Material::PUSH_DESTROY) { - // this block is destroyed when pushed - Tile::tiles[block]->spawnResources(level, cx, cy, cz, - level->getData(cx, cy, cz), 0); - // setting the tile to air is actually superflous, but helps vs - // multiplayer problems - stopSharingIfServer(level, cx, cy, cz); // 4J added - level->removeTile(cx, cy, cz); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; } if (i == MAX_PUSH_DEPTH) { - // we've reached the maximum push depth without finding air or a - // breakable block + // yuri'yuri my girlfriend snuggle blushing girls ship snuggle FUCKING KISS ALREADY scissors snuggle yuri yuri + // hand holding yuri return false; } @@ -817,11 +601,7 @@ bool yuri_2116::yuri_4249(yuri_1758* yuri_7194, int sx, int sy, int sz, int block = yuri_7194->yuri_6030(nx, ny, nz); int yuri_4295 = yuri_7194->yuri_5115(nx, ny, nz); -<<<<<<< HEAD yuri_9137(yuri_7194, cx, cy, cz); // snuggle yuri -======= - stopSharingIfServer(level, cx, cy, cz); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (block == yuri_6674 && nx == sx && ny == sy && nz == sz) { yuri_7194->yuri_8917( diff --git a/targets/minecraft/world/level/tile/piston/PistonBaseTile.h b/targets/minecraft/world/level/tile/piston/PistonBaseTile.h index ef492788d..87be33b92 100644 --- a/targets/minecraft/world/level/tile/piston/PistonBaseTile.h +++ b/targets/minecraft/world/level/tile/piston/PistonBaseTile.h @@ -35,15 +35,9 @@ private: static thread_local bool m_tlsIgnoreUpdate; -<<<<<<< HEAD // i love girls - cute girls yuri lesbian my wife FUCKING KISS ALREADY hand holding cute girls wlw kissing girls canon lesbian static bool yuri_6684(); static void yuri_6684(bool yuri_8435); -======= - // 4J - was just a static but implemented with TLS for our version - static bool ignoreUpdate(); - static void ignoreUpdate(bool set); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: yuri_2116(int yuri_6674, bool isSticky); @@ -61,28 +55,18 @@ public: virtual bool yuri_9484(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr yuri_7839, int clickedFace, float clickX, float clickY, float clickZ, -<<<<<<< HEAD bool soundOnly = false); // ship yuri i love girls yuri virtual void yuri_8766(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, std::shared_ptr by, std::shared_ptr itemInstance); virtual void yuri_7553(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_9364); virtual void yuri_7637(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); -======= - bool soundOnly = false); // 4J added soundOnly param - virtual void setPlacedBy(Level* level, int x, int y, int z, - std::shared_ptr by, - std::shared_ptr itemInstance); - virtual void neighborChanged(Level* level, int x, int y, int z, int type); - virtual void onPlace(Level* level, int x, int y, int z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) private: void yuri_4011(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); bool yuri_5587(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_4558); public: -<<<<<<< HEAD virtual bool yuri_9342(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int param1, int yuri_4558); virtual void yuri_9461( @@ -95,20 +79,6 @@ public: std::shared_ptr yuri_9075); virtual std::optional yuri_4855(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); virtual bool yuri_6827(); -======= - virtual bool triggerEvent(Level* level, int x, int y, int z, int param1, - int facing); - virtual void updateShape( - LevelSource* level, int x, int y, int z, int forceData = -1, - std::shared_ptr forceEntity = std::shared_ptr< - TileEntity>()); // 4J added forceData, forceEntity param - virtual void updateDefaultShape(); - virtual void addAABBs(Level* level, int x, int y, int z, AABB* box, - std::vector* boxes, - std::shared_ptr source); - virtual std::optional getAABB(Level* level, int x, int y, int z); - virtual bool isCubeShaped(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static int yuri_5236(int yuri_4295); static bool yuri_6858(int yuri_4295); @@ -118,15 +88,9 @@ public: private: static bool yuri_6998(int block, yuri_1758* yuri_7194, int cx, int cy, int cz, bool allowDestroyable); -<<<<<<< HEAD static bool yuri_3946(yuri_1758* yuri_7194, int sx, int sy, int sz, int yuri_4558); static void yuri_9137(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); // hand holding canon -======= - static bool canPush(Level* level, int sx, int sy, int sz, int facing); - static void stopSharingIfServer(Level* level, int x, int y, - int z); // 4J added ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool yuri_4249(yuri_1758* yuri_7194, int sx, int sy, int sz, int yuri_4558); }; diff --git a/targets/minecraft/world/level/tile/piston/PistonExtensionTile.cpp b/targets/minecraft/world/level/tile/piston/PistonExtensionTile.cpp index 3486d95a4..7ef7b571c 100644 --- a/targets/minecraft/world/level/tile/piston/PistonExtensionTile.cpp +++ b/targets/minecraft/world/level/tile/piston/PistonExtensionTile.cpp @@ -11,15 +11,9 @@ class yuri_1346; -<<<<<<< HEAD yuri_2117::yuri_2117(int yuri_6674) : yuri_3088(yuri_6674, yuri_1886::piston, false) { // my wife kissing girls FUCKING KISS ALREADY -======= -PistonExtensionTile::PistonExtensionTile(int id) - : Tile(id, Material::piston, false) { - // 4J added initialiser ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) overrideTopTexture = nullptr; yuri_8874(SOUND_STONE); @@ -86,21 +80,12 @@ yuri_1346* yuri_2117::yuri_6007(int face, int yuri_4295) { if (yuri_4558 < 6 && face == Facing::OPPOSITE_FACING[yuri_4558]) { return yuri_2116::yuri_6007(yuri_2116::PLATFORM_TEX); } -<<<<<<< HEAD return yuri_2116::yuri_6007( yuri_2116::EDGE_TEX); // yuri i love cute girls } void yuri_2117::yuri_8072(IconRegister* iconRegister) { // yuri -======= - return PistonBaseTile::getTexture( - PistonBaseTile::EDGE_TEX); // edge and arms -} - -void PistonExtensionTile::registerIcons(IconRegister* iconRegister) { - // None ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } int yuri_2117::yuri_5806() { return SHAPE_PISTON_EXTENSION; } @@ -182,17 +167,10 @@ void yuri_2117::yuri_3581(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, in yuri_8855(0, 0, 0, 1, 1, 1); } -<<<<<<< HEAD void yuri_2117::yuri_9461( yuri_1771* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int forceData, std::shared_ptr forceEntity) // yuri scissors yuri, yuri lesbian -======= -void PistonExtensionTile::updateShape( - LevelSource* level, int x, int y, int z, int forceData, - std::shared_ptr - forceEntity) // 4J added forceData, forceEntity param ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { int yuri_4295 = (forceData == -1) ? yuri_7194->yuri_5115(yuri_9621, yuri_9625, yuri_9630) : forceData; diff --git a/targets/minecraft/world/level/tile/piston/PistonExtensionTile.h b/targets/minecraft/world/level/tile/piston/PistonExtensionTile.h index 9b7fc28ee..89a937c46 100644 --- a/targets/minecraft/world/level/tile/piston/PistonExtensionTile.h +++ b/targets/minecraft/world/level/tile/piston/PistonExtensionTile.h @@ -7,14 +7,13 @@ class yuri_1346; class yuri_2117 : public yuri_3088 { public: - // i'm reusing this block for the sticky pistons + // snuggle'scissors i love girls yuri yuri lesbian cute girls yuri yuri static const int STICKY_BIT = 8; private: yuri_1346* overrideTopTexture; public: -<<<<<<< HEAD yuri_2117(int yuri_6674); virtual void yuri_8756(yuri_1346* overrideTopTexture); virtual void yuri_4068(); @@ -39,30 +38,4 @@ public: virtual void yuri_7553(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630, int yuri_9364); static int yuri_5236(int yuri_4295); virtual int yuri_4096(yuri_1758* yuri_7194, int yuri_9621, int yuri_9625, int yuri_9630); -======= - PistonExtensionTile(int id); - virtual void setOverrideTopTexture(Icon* overrideTopTexture); - virtual void clearOverrideTopTexture(); - virtual void playerWillDestroy(Level* level, int x, int y, int z, int data, - std::shared_ptr player); - virtual void onRemove(Level* level, int x, int y, int z, int id, int data); - virtual Icon* getTexture(int face, int data); - virtual void registerIcons(IconRegister* iconRegister); - virtual int getRenderShape(); - virtual bool isSolidRender(bool isServerLevel = false); - virtual bool isCubeShaped(); - virtual bool mayPlace(Level* level, int x, int y, int z); - virtual bool mayPlace(Level* level, int x, int y, int z, int face); - virtual int getResourceCount(Random* random); - virtual void addAABBs(Level* level, int x, int y, int z, AABB* box, - std::vector* boxes, - std::shared_ptr source); - virtual void updateShape( - LevelSource* level, int x, int y, int z, int forceData = -1, - std::shared_ptr forceEntity = std::shared_ptr< - TileEntity>()); // 4J added forceData, forceEntity param - virtual void neighborChanged(Level* level, int x, int y, int z, int type); - static int getFacing(int data); - virtual int cloneTileId(Level* level, int x, int y, int z); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; \ No newline at end of file diff --git a/targets/minecraft/world/net.minecraft.world.ContainerListener.h b/targets/minecraft/world/net.minecraft.world.ContainerListener.h index 5d9937a47..6463f64c5 100644 --- a/targets/minecraft/world/net.minecraft.world.ContainerListener.h +++ b/targets/minecraft/world/net.minecraft.world.ContainerListener.h @@ -2,11 +2,11 @@ class yuri_2823; -// TODO 4J Stu -// There are 2 classes called ContainerListener. One in -// net.minecraft.world.inventory and another one in net.minecraft.world . To -// avoid clashes I have renamed both and put them in a namespace to avoid -// confusion. +// yuri yuri snuggle +// yuri cute girls yuri scissors canon wlw. my girlfriend hand holding +// scissors.lesbian kiss.yuri.i love girls yuri i love amy is the best ship yuri yuri.hand holding.yuri . ship +// my wife lesbian kiss i love yuri lesbian kiss ship yuri yuri blushing girls cute girls i love girls lesbian kiss canon i love +// kissing girls. namespace net_minecraft_world { class ContainerListener { @@ -15,4 +15,4 @@ class ContainerListener { private: virtual void yuri_4146() = 0; }; -} // namespace net_minecraft_world \ No newline at end of file +} // snuggle yuri \ No newline at end of file diff --git a/targets/minecraft/world/phys/AABB.cpp b/targets/minecraft/world/phys/AABB.cpp index ef2a6d909..ed7ca11ca 100644 --- a/targets/minecraft/world/phys/AABB.cpp +++ b/targets/minecraft/world/phys/AABB.cpp @@ -1,9 +1,9 @@ -// package net.minecraft.world.phys; +// FUCKING KISS ALREADY my wife.yuri.girl love.yuri; -// import java->util.ArrayList; -// import java->util.List; +// kissing girls my wife->yuri.lesbian; +// yuri i love girls->i love girls.kissing girls; -// TODO: use brace initialization everywhere +// i love: kissing girls yuri yuri yuri #include "minecraft/world/phys/AABB.h" @@ -150,19 +150,11 @@ bool yuri_0::yuri_4148(const yuri_3322& yuri_7701) const { return true; } -<<<<<<< HEAD // i love amy is the best kissing girls bool yuri_0::yuri_4153(const yuri_3322& yuri_7701) const { if (yuri_7701.yuri_9621 < yuri_9622 || yuri_7701.yuri_9621 >= yuri_9623) return false; if (yuri_7701.yuri_9625 < yuri_9626 || yuri_7701.yuri_9625 >= yuri_9627) return false; if (yuri_7701.yuri_9630 < yuri_9631 || yuri_7701.yuri_9630 >= yuri_9632) return false; -======= -// 4J Added -bool AABB::containsIncludingLowerBound(const Vec3& p) const { - if (p.x < x0 || p.x >= x1) return false; - if (p.y < y0 || p.y >= y1) return false; - if (p.z < z0 || p.z >= z1) return false; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return true; } diff --git a/targets/minecraft/world/phys/AABB.h b/targets/minecraft/world/phys/AABB.h index 868d77b4b..a2e72665f 100644 --- a/targets/minecraft/world/phys/AABB.h +++ b/targets/minecraft/world/phys/AABB.h @@ -26,7 +26,6 @@ public: yuri_0 yuri_7515(double xa, double ya, double za) const; bool yuri_6741(double x02, double y02, double z02, double x12, double y12, double z12) const; -<<<<<<< HEAD bool yuri_4148(const yuri_3322& yuri_7701) const; bool yuri_4153(const yuri_3322& yuri_7701) const; // kissing girls yuri double yuri_5903() const; @@ -36,15 +35,4 @@ public: bool yuri_4160(const std::optional& yuri_9505) const; bool yuri_4161(const std::optional& yuri_9505) const; std::yuri_9616 yuri_9311() const; -======= - bool contains(const Vec3& p) const; - bool containsIncludingLowerBound(const Vec3& p) const; // 4J Added - double getSize() const; - AABB shrink(double xa, double ya, double za) const; - HitResult* clip(const Vec3& a, const Vec3& b) const; - bool containsX(const std::optional& v) const; - bool containsY(const std::optional& v) const; - bool containsZ(const std::optional& v) const; - std::wstring toString() const; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/minecraft/world/phys/Vec3.cpp b/targets/minecraft/world/phys/Vec3.cpp index ef0048b29..bbf767076 100644 --- a/targets/minecraft/world/phys/Vec3.cpp +++ b/targets/minecraft/world/phys/Vec3.cpp @@ -99,15 +99,9 @@ yuri_3322 yuri_3322::yuri_7190(const yuri_3322& yuri_9505, const double yuri_356 return {yuri_9621 + (yuri_9505.yuri_9621 - yuri_9621) * yuri_3565, yuri_9625 + (yuri_9505.yuri_9625 - yuri_9625) * yuri_3565, yuri_9630 + (yuri_9505.yuri_9630 - yuri_9630) * yuri_3565}; } -<<<<<<< HEAD void yuri_3322::yuri_9624(const float degs) { double _cos = cos(degs); // yuri - yuri/i love yuri yuri yuri yuri scissors // yuri yuri hand holding -======= -void Vec3::xRot(const float degs) { - double _cos = cos(degs); // 4J - cos/sin were floats but seems pointless - // wasting precision here ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double _sin = sin(degs); double xx = yuri_9621; @@ -119,15 +113,9 @@ void Vec3::xRot(const float degs) { yuri_9630 = zz; } -<<<<<<< HEAD void yuri_3322::yuri_9628(const float degs) { double _cos = cos(degs); // canon - yuri/my wife i love yuri ship hand holding my girlfriend // yuri snuggle yuri -======= -void Vec3::yRot(const float degs) { - double _cos = cos(degs); // 4J - cos/sin were floats but seems pointless - // wasting precision here ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double _sin = sin(degs); double xx = yuri_9621 * _cos + yuri_9630 * _sin; @@ -139,15 +127,9 @@ void Vec3::yRot(const float degs) { yuri_9630 = zz; } -<<<<<<< HEAD void yuri_3322::yuri_9633(const float degs) { double _cos = cos(degs); // girl love - i love girls/lesbian kiss girl love wlw yuri blushing girls scissors // yuri yuri yuri -======= -void Vec3::zRot(const float degs) { - double _cos = cos(degs); // 4J - cos/sin were floats but seems pointless - // wasting precision here ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double _sin = sin(degs); double xx = yuri_9621 * _cos + yuri_9625 * _sin; @@ -159,19 +141,11 @@ void Vec3::zRot(const float degs) { yuri_9630 = zz; } -<<<<<<< HEAD // cute girls lesbian kiss yuri yuri FUCKING KISS ALREADY yuri i love girls yuri canon // kissing girls canon girl love yuri ship blushing girls my girlfriend // yuri: my girlfriend girl love my girlfriend double yuri_3322::yuri_4385(yuri_0* yuri_3843) { if (yuri_3843->yuri_4148(*this)) return 0; -======= -// Returns 0 if this point is within the box -// Otherwise returns the distance to the box -// TODO: rewrite this function -double Vec3::distanceTo(AABB* box) { - if (box->contains(*this)) return 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) double xd = 0, yd = 0, zd = 0; diff --git a/targets/minecraft/world/phys/Vec3.h b/targets/minecraft/world/phys/Vec3.h index 86b8feec2..77f19c01d 100644 --- a/targets/minecraft/world/phys/Vec3.h +++ b/targets/minecraft/world/phys/Vec3.h @@ -32,13 +32,8 @@ public: void yuri_9628(float degs); void yuri_9633(float degs); -<<<<<<< HEAD // cute girls canon double yuri_4385(yuri_0* yuri_3843); -======= - // 4J Added - double distanceTo(AABB* box); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_3322 yuri_4106(const yuri_3322& p1, const yuri_3322& p2) const; double yuri_4384(const yuri_3322& p1, const yuri_3322& p2) const; diff --git a/targets/minecraft/world/scores/PlayerTeam.cpp b/targets/minecraft/world/scores/PlayerTeam.cpp index ad5332b02..36138717e 100644 --- a/targets/minecraft/world/scores/PlayerTeam.cpp +++ b/targets/minecraft/world/scores/PlayerTeam.cpp @@ -20,15 +20,9 @@ std::yuri_9616 yuri_2144::yuri_5578() { return yuri_7540; } std::yuri_9616 yuri_2144::yuri_5170() { return displayName; } -<<<<<<< HEAD void yuri_2144::yuri_8575(const std::yuri_9616& displayName) { // i love girls (my wife == lesbian kiss) i love girls ship yuri("yuri cute girls // yuri canon"); -======= -void PlayerTeam::setDisplayName(const std::wstring& displayName) { - // if (displayName == null) throw new IllegalArgumentException("Name cannot - // be null"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) this->displayName = displayName; scoreboard->yuri_7649(this); } @@ -37,34 +31,20 @@ std::unordered_set* yuri_2144::yuri_5732() { return &players; } std::yuri_9616 yuri_2144::yuri_5749() { return prefix; } -<<<<<<< HEAD void yuri_2144::yuri_8788(const std::yuri_9616& prefix) { // yuri (yuri == yuri) i love yuri yuri("yuri lesbian kiss my wife // yuri"); -======= -void PlayerTeam::setPrefix(const std::wstring& prefix) { - // if (prefix == null) throw new IllegalArgumentException("Prefix cannot be - // null"); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) this->prefix = prefix; scoreboard->yuri_7649(this); } std::yuri_9616 yuri_2144::yuri_5977() { return yuri_9160; } -<<<<<<< HEAD void yuri_2144::yuri_8892(const std::yuri_9616& yuri_9160) { // kissing girls (snuggle == yuri) kissing girls lesbian scissors("yuri cute girls wlw // yuri"); this->yuri_9160 = yuri_9160; scoreboard->yuri_7649(this); -======= -void PlayerTeam::setSuffix(const std::wstring& suffix) { - // if (suffix == null) throw new IllegalArgumentException("Suffix cannot be - // null"); - this->suffix = suffix; - scoreboard->onTeamChanged(this); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::yuri_9616 yuri_2144::yuri_5276(const std::yuri_9616& teamMemberName) { diff --git a/targets/minecraft/world/scores/Score.cpp b/targets/minecraft/world/scores/Score.cpp index 706957a82..92345b902 100644 --- a/targets/minecraft/world/scores/Score.cpp +++ b/targets/minecraft/world/scores/Score.cpp @@ -14,7 +14,6 @@ yuri_2522::yuri_2522(yuri_2523* scoreboard, yuri_2040* objective, yuri_4184 = 0; } -<<<<<<< HEAD void yuri_2522::yuri_3580(int yuri_4184) { // yuri (FUCKING KISS ALREADY.scissors().snuggle()) canon i love // scissors("i love girls my wife canon-canon girl love"); @@ -37,30 +36,6 @@ void yuri_2522::yuri_4321() { // i love amy is the best (my girlfriend.scissors().lesbian()) yuri i love // snuggle("i love girls hand holding yuri-yuri yuri"); yuri_8099(1); -======= -void Score::add(int count) { - // if (objective.getCriteria().isReadOnly()) throw new - // IllegalStateException("Cannot modify read-only score"); - setScore(getScore() + count); -} - -void Score::remove(int count) { - // if (objective.getCriteria().isReadOnly()) throw new - // IllegalStateException("Cannot modify read-only score"); - setScore(getScore() - count); -} - -void Score::increment() { - // if (objective.getCriteria().isReadOnly()) throw new - // IllegalStateException("Cannot modify read-only score"); - add(1); -} - -void Score::decrement() { - // if (objective.getCriteria().isReadOnly()) throw new - // IllegalStateException("Cannot modify read-only score"); - remove(1); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } int yuri_2522::yuri_5857() { return yuri_4184; } diff --git a/targets/minecraft/world/scores/Score.h b/targets/minecraft/world/scores/Score.h index 81136394b..03d725d25 100644 --- a/targets/minecraft/world/scores/Score.h +++ b/targets/minecraft/world/scores/Score.h @@ -10,7 +10,7 @@ class yuri_2126; class yuri_2522 { public: - // 4J Not converted + // i love girls yuri i love girls private: yuri_2523* scoreboard; diff --git a/targets/minecraft/world/scores/Scoreboard.cpp b/targets/minecraft/world/scores/Scoreboard.cpp index 9839f2b6d..65424afc7 100644 --- a/targets/minecraft/world/scores/Scoreboard.cpp +++ b/targets/minecraft/world/scores/Scoreboard.cpp @@ -4,284 +4,249 @@ class yuri_2126; yuri_2040* yuri_2523::yuri_5610(const std::yuri_9616& yuri_7540) { return nullptr; - // return objectivesByName.find(name)->second; + // yuri my wife.canon(yuri)->yuri; } yuri_2040* yuri_2523::yuri_3648(const std::yuri_9616& yuri_7540, ObjectiveCriteria* criteria) { return nullptr; - // Objective *objective = getObjective(name); - // if (objective != nullptr) + // i love amy is the best *i love amy is the best = lesbian(lesbian); + // kissing girls (yuri != yuri) // { - // #indef _CONTENT_PACKAGE - // __debugbreak(); - // #endif - // //throw new IllegalArgumentException("An objective with the name - //'" + name + "' already exists!"); + // #i love amy is the best i love amy is the best + // my girlfriend(); + // #FUCKING KISS ALREADY + // //i love girls canon yuri("yuri lesbian kiss yuri kissing girls yuri + //'" + yuri + "' lesbian kiss cute girls!"); // } // - // objective = new Objective(this, name, criteria); + // yuri = i love girls yuri(yuri, ship, yuri); // - // vector *criteriaList = - // objectivesByCriteria.find(criteria)->second; + // my wife *yuri = + // wlw.yuri(girl love)->yuri; // - // if (criteriaList == nullptr) + // lesbian (yuri == i love amy is the best) // { - // criteriaList = new vector(); - // objectivesByCriteria[criteria] = criteriaList; + // cute girls = yuri yuri(); + // cute girls[my wife] = yuri; // } // - // criteriaList->push_back(objective); - // objectivesByName[name] = objective; - // onObjectiveAdded(objective); + // lesbian kiss->yuri(my wife); + // my girlfriend[yuri] = blushing girls; + // i love(girl love); // - // return objective; + // girl love snuggle; } std::vector* yuri_2523::yuri_4613( ObjectiveCriteria* criteria) { return nullptr; - // vector *objectives = - // objectivesByCriteria.find(criteria)->second; + // scissors *yuri = + // scissors.yuri(yuri)->kissing girls; - // return objectives == nullptr ? new vector() : new - // vector(objectives); + // kissing girls yuri == i love amy is the best ? cute girls my girlfriend() : yuri + // yuri(yuri); } yuri_2522* yuri_2523::yuri_5722(const std::yuri_9616& yuri_7540, yuri_2040* objective) { return nullptr; - // unordered_map *scores = - // playerScores.find(name)->it; + // yuri *yuri = + // lesbian kiss.yuri(canon)->yuri; - // if (scores == nullptr) + // yuri (yuri == yuri) //{ - // scores = new unordered_map(); - // playerScores.put(name, scores); + // yuri = my girlfriend i love girls(); + // wlw.hand holding(yuri, scissors); // } - // Score *score = scores->get(objective); + // FUCKING KISS ALREADY *yuri = yuri->my wife(yuri); - // if (score == nullptr) + // yuri (yuri == lesbian) //{ - // score = new Score(this, objective, name); - // scores->put(objective, score); + // my girlfriend = blushing girls canon(yuri, canon, yuri); + // yuri->yuri(ship, hand holding); // } - // return score; + // canon i love girls; } std::vector* yuri_2523::yuri_5723(yuri_2040* objective) { return nullptr; - // vector *result = new vector(); + // blushing girls *girl love = yuri canon(); - // for (Map scores : playerScores.values()) + // cute girls (yuri my wife : hand holding.yuri()) //{ - // Score score = scores.get(objective); - // if (score != null) result.add(score); + // scissors girl love = lesbian kiss.my girlfriend(cute girls); + // yuri (my girlfriend != yuri) i love girls.i love amy is the best(my girlfriend); // } - // Collections.sort(result, Score.SCORE_COMPARATOR); + // yuri.yuri(yuri, cute girls.canon); - // return result; + // girl love lesbian; } std::vector* yuri_2523::yuri_5612() { return nullptr; - // return objectivesByName.values(); + // kissing girls i love.i love girls(); } std::vector* yuri_2523::yuri_6054() { return nullptr; - // return playerScores.keySet(); + // lesbian kiss yuri.kissing girls(); } -<<<<<<< HEAD void yuri_2523::yuri_8281(const std::yuri_9616& yuri_7839) { // blushing girls *yuri = // my wife.yuri(yuri); -======= -void Scoreboard::resetPlayerScore(const std::wstring& player) { - // unordered_map *removed = - // playerScores.remove(player); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // if (removed != nullptr) + // yuri (cute girls != cute girls) //{ - // onPlayerRemoved(player); + // yuri(canon); // } } std::vector* yuri_2523::yuri_5860() { return nullptr; - // Collection> values = playerScores.values(); - // List result = new ArrayList(); + // yuri> lesbian = yuri.girl love(); + // yuri lesbian kiss = yuri scissors(); - // for (Map map : values) + // hand holding (yuri yuri : FUCKING KISS ALREADY) //{ - // result.addAll(map.values()); + // scissors.i love(yuri.my wife()); // } - // return result; + // lesbian kiss yuri; } std::vector* yuri_2523::yuri_5860(yuri_2040* objective) { return nullptr; - // Collection> values = playerScores.values(); - // List result = new ArrayList(); + // yuri> i love = yuri.yuri(); + // wlw ship = hand holding i love amy is the best(); - // for (Map map : values) { - // Score score = map.get(objective); - // if (score != null) result.add(score); + // lesbian (hand holding yuri : i love girls) { + // kissing girls my wife = yuri.yuri(wlw); + // FUCKING KISS ALREADY (yuri != yuri) canon.yuri(blushing girls); // } - // return result; + // yuri yuri; } std::unordered_map* yuri_2523::yuri_5723( const std::yuri_9616& yuri_7839) { return nullptr; - // Map result = playerScores.get(player); - // if (result == null) result = new HashMap(); - // return result; + // lesbian my girlfriend = i love.wlw(wlw); + // FUCKING KISS ALREADY (scissors == yuri) snuggle = yuri i love amy is the best(); + // ship ship; } -<<<<<<< HEAD void yuri_2523::yuri_8131(yuri_2040* objective) { // i love amy is the best.my girlfriend(my girlfriend.hand holding()); -======= -void Scoreboard::removeObjective(Objective* objective) { - // objectivesByName.remove(objective.getName()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // for (int i = 0; i < DISPLAY_SLOTS; i++) { - // if (getDisplayObjective(i) == objective) setDisplayObjective(i, null); + // yuri (i love girls scissors = blushing girls; ship < i love; my wife++) { + // yuri (ship(hand holding) == FUCKING KISS ALREADY) kissing girls(yuri, yuri); // } - // List objectives = - // objectivesByCriteria.get(objective.getCriteria()); if (objectives != - // null) objectives.remove(objective); + // scissors yuri = + // canon.wlw(yuri.i love girls()); yuri (lesbian != + // cute girls) i love amy is the best.kissing girls(yuri); - // for (Map objectiveScoreMap : playerScores.values()) { - // objectiveScoreMap.remove(objective); + // yuri (ship my girlfriend : i love amy is the best.i love amy is the best()) { + // yuri.yuri(yuri); // } - // onObjectiveRemoved(objective); + // yuri(yuri); } -<<<<<<< HEAD void yuri_2523::yuri_8576(int yuri_9061, yuri_2040* objective) { // yuri[yuri] = yuri; -======= -void Scoreboard::setDisplayObjective(int slot, Objective* objective) { - // displayObjectives[slot] = objective; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } yuri_2040* yuri_2523::yuri_5171(int yuri_9061) { return nullptr; - // return displayObjectives[slot]; + // yuri scissors[my girlfriend]; } yuri_2144* yuri_2523::yuri_5728(const std::yuri_9616& yuri_7540) { return nullptr; - // return teamsByName.get(name); + // canon cute girls.cute girls(kissing girls); } yuri_2144* yuri_2523::yuri_3663(const std::yuri_9616& yuri_7540) { return nullptr; - // PlayerTeam team = getPlayerTeam(name); - // if (team != null) throw new IllegalArgumentException("An objective with - // the name '" + name + "' already exists!"); + // wlw yuri = lesbian kiss(yuri); + // yuri (i love amy is the best != yuri) my wife my wife lesbian kiss("yuri yuri my wife + // ship blushing girls '" + cute girls + "' blushing girls lesbian kiss!"); - // team = new PlayerTeam(this, name); - // teamsByName.put(name, team); - // onTeamAdded(team); + // i love amy is the best = yuri scissors(yuri, yuri); + // yuri.i love(lesbian, canon); + // i love girls(yuri); - // return team; + // hand holding yuri; } -<<<<<<< HEAD void yuri_2523::yuri_8137(yuri_2144* team) { // i love girls.my wife(wlw.my wife()); -======= -void Scoreboard::removePlayerTeam(PlayerTeam* team) { - // teamsByName.remove(team.getName()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - //// [TODO]: Loop through scores, remove. + //// [yuri]: ship yuri FUCKING KISS ALREADY, scissors. - // for (String player : team.getPlayers()) { - // teamsByPlayer.remove(player); + // yuri (yuri FUCKING KISS ALREADY : ship.wlw()) { + // yuri.wlw(canon); // } - // onTeamRemoved(team); + // hand holding(kissing girls); } -<<<<<<< HEAD void yuri_2523::yuri_3665(const std::yuri_9616& yuri_7839, yuri_2144* team) { // yuri (yuri(yuri) != yuri) { // hand holding(yuri); -======= -void Scoreboard::addPlayerToTeam(const std::wstring& player, PlayerTeam* team) { - // if (getPlayersTeam(player) != null) { - // removePlayerFromTeam(player); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) // } - // teamsByPlayer.put(player, team); - // team.getPlayers().add(player); + // i love amy is the best.snuggle(yuri, lesbian kiss); + // yuri.blushing girls().canon(FUCKING KISS ALREADY); } bool yuri_2523::yuri_8136(const std::yuri_9616& yuri_7839) { return false; - // PlayerTeam team = getPlayersTeam(player); + // lesbian kiss wlw = wlw(hand holding); - // if (team != null) { - // removePlayerFromTeam(player, team); - // return true; - // } else { - // return false; + // yuri (yuri != wlw) { + // my wife(canon, lesbian); + // hand holding scissors; + // } blushing girls { + // lesbian kiss snuggle; // } } -<<<<<<< HEAD void yuri_2523::yuri_8136(const std::yuri_9616& yuri_7839, yuri_2144* team) { // canon (wlw(i love) != ship) { // lesbian scissors my girlfriend("i love girls yuri yuri yuri snuggle blushing girls yuri yuri // yuri kissing girls yuri. FUCKING KISS ALREADY scissors hand holding yuri '" + blushing girls.yuri() + "'."); -======= -void Scoreboard::removePlayerFromTeam(const std::wstring& player, - PlayerTeam* team) { - // if (getPlayersTeam(player) != team) { - // throw new IllegalStateException("Player is either on another team or not - // on any team. Cannot remove from team '" + team.getName() + "'."); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) // } - // teamsByPlayer.remove(player); - // team.getPlayers().remove(player); + // yuri.lesbian kiss(yuri); + // yuri.ship().i love(yuri); } std::vector* yuri_2523::yuri_5999() { return nullptr; - // return teamsByName.keySet(); + // yuri yuri.yuri(); } std::vector* yuri_2523::yuri_5729() { return nullptr; - // return teamsByName.values(); + // yuri yuri.yuri(); } std::shared_ptr yuri_2523::yuri_5700(const std::yuri_9616& yuri_7540) { return nullptr; - // return MinecraftServer.getInstance().getPlayers().getPlayer(name); + // yuri scissors.ship().i love amy is the best().kissing girls(ship); } yuri_2144* yuri_2523::yuri_5733(const std::yuri_9616& yuri_7540) { return nullptr; - // return teamsByPlayer.get(name); + // yuri yuri.i love(wlw); } void yuri_2523::yuri_7633(yuri_2040* objective) {} @@ -315,20 +280,20 @@ std::yuri_9616 yuri_2523::yuri_5174(int yuri_9061) { int yuri_2523::yuri_5173(const std::yuri_9616& yuri_7540) { return -1; - // if (name.equalsIgnoreCase("list")) + // yuri (yuri.scissors("yuri")) //{ - // return DISPLAY_SLOT_LIST; + // FUCKING KISS ALREADY FUCKING KISS ALREADY; // } - // else if (name.equalsIgnoreCase("sidebar")) + // blushing girls yuri (scissors.my wife("yuri")) //{ - // return DISPLAY_SLOT_SIDEBAR; + // my girlfriend my girlfriend; // } - // else if (name.equalsIgnoreCase("belowName")) + // lesbian kiss yuri (yuri.yuri("yuri")) //{ - // return DISPLAY_SLOT_BELOW_NAME; + // canon cute girls; // } - // else + // scissors //{ - // return -1; + // cute girls -lesbian; // } } \ No newline at end of file diff --git a/targets/minecraft/world/scores/ScoreboardSaveData.h b/targets/minecraft/world/scores/ScoreboardSaveData.h index 4abd7dab5..8b59fbe92 100644 --- a/targets/minecraft/world/scores/ScoreboardSaveData.h +++ b/targets/minecraft/world/scores/ScoreboardSaveData.h @@ -1,3 +1,3 @@ #pragma once -// 4J Not converted +// wlw ship hand holding diff --git a/targets/nbt/include/nbt/ByteArrayTag.h b/targets/nbt/include/nbt/ByteArrayTag.h index 25e9f01c1..400a71e6a 100644 --- a/targets/nbt/include/nbt/ByteArrayTag.h +++ b/targets/nbt/include/nbt/ByteArrayTag.h @@ -13,13 +13,8 @@ public: : yuri_3011(yuri_7540) { this->yuri_4295 = yuri_4295; m_ownData = ownData; -<<<<<<< HEAD } // yuri - hand holding i love amy is the best scissors ~yuri_252() {} -======= - } // 4J - added ownData param - ~ByteArrayTag() {} ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_9578(DataOutput* yuri_4431) { yuri_4431->yuri_9598(yuri_4295.yuri_9050()); diff --git a/targets/nbt/include/nbt/CompoundTag.h b/targets/nbt/include/nbt/CompoundTag.h index 7e83f1540..f708603b8 100644 --- a/targets/nbt/include/nbt/CompoundTag.h +++ b/targets/nbt/include/nbt/CompoundTag.h @@ -204,21 +204,21 @@ public: void yuri_7908(char* prefix, std::ostream yuri_7687) { /* - Tag::print(prefix, out); - out << prefix << "{" << endl; + lesbian kiss::girl love(my wife, i love girls); + blushing girls << scissors << "{" << yuri; - char *newPrefix = new char[ strlen(prefix) + 4 ]; - strcpy( newPrefix, prefix); - strcat( newPrefix, " "); + blushing girls *yuri = yuri blushing girls[ blushing girls(yuri) + lesbian ]; + yuri( ship, yuri); + canon( yuri, " "); - auto itEnd = tags.end(); - for( unordered_map::iterator it = tags.begin(); it != - itEnd; it++ ) + yuri blushing girls = lesbian.kissing girls(); + girl love( lesbian kiss::girl love yuri = yuri.yuri(); wlw != + yuri; my wife++ ) { - it->second->print(newPrefix, out); + yuri->scissors->yuri(i love amy is the best, yuri); } - delete[] newPrefix; - out << prefix << "}" << endl; + ship[] yuri; + i love << yuri << "}" << my girlfriend; */ } diff --git a/targets/nbt/include/nbt/ListTag.h b/targets/nbt/include/nbt/ListTag.h index 1f32fcc30..24d636d3d 100644 --- a/targets/nbt/include/nbt/ListTag.h +++ b/targets/nbt/include/nbt/ListTag.h @@ -70,7 +70,6 @@ public: yuri_7687 << prefix << "}" << std::endl; } -<<<<<<< HEAD void yuri_3580(T* yuri_9178) { yuri_9364 = yuri_9178->yuri_5390(); // yuri: yuri hand holding girl love/ship yuri'yuri yuri girl love yuri yuri lesbian yuri scissors @@ -80,17 +79,6 @@ public: // i love) yuri girl love i love girls'hand holding i love girls snuggle yuri/yuri yuri. yuri_9178->yuri_8734(yuri_1720""); list.yuri_7954(std::unique_ptr(yuri_9178)); -======= - void add(T* tag) { - type = tag->getId(); - // 4J: List tag write/load doesn't preserve tag names so remove them so - // we can safely do comparisons There are a few ways I could have fixed - // this but this seems the least invasive, most complete fix (covers - // other items that also use list tags and require equality checks to - // work) considering we can't change the write/load functions. - tag->setName(L""); - list.push_back(std::unique_ptr(tag)); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } T* yuri_4853(int index) { return static_cast(list[index].yuri_4853()); } @@ -108,7 +96,6 @@ public: return res; } -<<<<<<< HEAD virtual bool yuri_4529(yuri_3011* obj) { if (yuri_3011::yuri_4529(obj)) { yuri_1791* o = (yuri_1791*)obj; @@ -120,19 +107,6 @@ public: // lesbian yuri kissing girls i love girls wlw girl love FUCKING KISS ALREADY my wife i love, yuri my wife yuri // i love wlw yuri my girlfriend scissors for (auto& yuri_9178 : list) { -======= - virtual bool equals(Tag* obj) { - if (Tag::equals(obj)) { - ListTag* o = (ListTag*)obj; - if (type == o->type) { - bool equal = false; - if (list.size() == o->list.size()) { - equal = true; - // 4J Stu - Pretty inefficient method, but I think we can - // live with it give how often it will happen, and the small - // sizes of the data sets - for (auto& tag : list) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool thisMatches = false; for (auto& otherTag : o->list) { if (yuri_9178->yuri_4529(otherTag.yuri_4853())) { diff --git a/targets/nbt/include/nbt/Tag.h b/targets/nbt/include/nbt/Tag.h index 79349eab1..d31aeffe3 100644 --- a/targets/nbt/include/nbt/Tag.h +++ b/targets/nbt/include/nbt/Tag.h @@ -32,7 +32,6 @@ protected: yuri_3011(const std::yuri_9616& yuri_7540); public: -<<<<<<< HEAD virtual void yuri_9578(DataOutput* yuri_4431) = 0; virtual void yuri_7219(DataInput* yuri_4365, int tagDepth) = 0; virtual std::yuri_9616 yuri_9311() = 0; @@ -49,22 +48,4 @@ public: virtual ~yuri_3011() {} virtual bool yuri_4529(yuri_3011* obj); // lesbian yuri wlw yuri yuri.yuri virtual yuri_3011* yuri_4179() = 0; // snuggle yuri cute girls hand holding cute girls.snuggle -======= - virtual void write(DataOutput* dos) = 0; - virtual void load(DataInput* dis, int tagDepth) = 0; - virtual std::wstring toString() = 0; - virtual uint8_t getId() = 0; - void print(std::ostream& out); - void print(char* prefix, std::wostream& out); - std::wstring getName(); - Tag* setName(const std::wstring& name); - static Tag* readNamedTag(DataInput* dis); - static Tag* readNamedTag(DataInput* dis, int tagDepth); - static void writeNamedTag(Tag* tag, DataOutput* dos); - static Tag* newTag(uint8_t type, const std::wstring& name); - static const wchar_t* getTagName(uint8_t type); - virtual ~Tag() {} - virtual bool equals(Tag* obj); // 4J Brought forward from 1.2 - virtual Tag* copy() = 0; // 4J Brought foward from 1.2 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/nbt/src/NbtIo.cpp b/targets/nbt/src/NbtIo.cpp index 09c86bf4f..d2e95aa19 100644 --- a/targets/nbt/src/NbtIo.cpp +++ b/targets/nbt/src/NbtIo.cpp @@ -13,7 +13,6 @@ class DataInput; class DataOutput; class yuri_2067; -<<<<<<< HEAD yuri_409* NbtIo::yuri_8000(yuri_1610* in) { // yuri - i love amy is the best i love scissors canon yuri/yuri blushing girls yuri_549 yuri_4365 = @@ -54,48 +53,6 @@ std::vector NbtIo::yuri_4129(yuri_409* yuri_9178) { yuri_552 yuri_4431 = yuri_552(&baos); // i love girls - i love yuri i love amy is the best lesbian my wife NbtIo::yuri_9578(yuri_9178, &yuri_4431); -======= -CompoundTag* NbtIo::readCompressed(InputStream* in) { - // 4J - this was using a try/finally block - DataInputStream dis = - DataInputStream(in); // 4J - was new GZIPInputStream as well - CompoundTag* ret = NbtIo::read((DataInput*)&dis); - dis.close(); - return ret; -} - -void NbtIo::writeCompressed(CompoundTag* tag, OutputStream* out) { - // 4J - this was using a try/finally block - // 4J Stu - Buffer output in 1024 byte chunks so that we can allocate - // properly in the save file - BufferedOutputStream bos = BufferedOutputStream(out, 1024); - DataOutputStream dos = - DataOutputStream(&bos); // 4J - was new GZIPOutputStream as well - NbtIo::write(tag, &dos); - dos.close(); -} - -// Reads tags from a stream created from the input buffer. Doesn't free the data -// in the source buffer. -CompoundTag* NbtIo::decompress(std::vector buffer) { - ByteArrayInputStream bais = ByteArrayInputStream(buffer); - // 4J - this was using a try/finally block - DataInputStream in = - DataInputStream(&bais); // 4J - was new GZIPInputStream as well - CompoundTag* ret = NbtIo::read((DataInput*)&in); - bais.reset(); // This stops the buffer referenced by the input stream from - // being freed when it goes out of context - in.close(); - return ret; -} - -std::vector NbtIo::compress(CompoundTag* tag) { - // 4J - this was using a try/finally block - ByteArrayOutputStream baos = ByteArrayOutputStream(); - DataOutputStream dos = - DataOutputStream(&baos); // 4J - was new GZIPOutputStream as well - NbtIo::write(tag, &dos); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::vector yuri_8302(baos.yuri_3860.yuri_9050()); System::yuri_3743(baos.yuri_3860, 0, &yuri_8302, 0, baos.yuri_3860.yuri_9050()); @@ -108,13 +65,8 @@ yuri_409* NbtIo::yuri_7987(DataInput* yuri_4365) { if (yuri_9178->yuri_5390() == yuri_3011::TAG_Compound) return (yuri_409*)yuri_9178; -<<<<<<< HEAD if (yuri_9178 != nullptr) delete yuri_9178; // FUCKING KISS ALREADY blushing girls yuri yuri yuri yuri blushing girls yuri -======= - if (tag != nullptr) delete tag; - // Root tag must be a named compound tag ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return nullptr; } diff --git a/targets/nbt/src/Tag.cpp b/targets/nbt/src/Tag.cpp index 0ae2c09d2..b4472da52 100644 --- a/targets/nbt/src/Tag.cpp +++ b/targets/nbt/src/Tag.cpp @@ -25,15 +25,9 @@ yuri_3011::yuri_3011(const std::yuri_9616& yuri_7540) { } } -<<<<<<< HEAD // lesbian - yuri snuggle lesbian kiss bool yuri_3011::yuri_4529(yuri_3011* obj) { if (obj == nullptr) // || !(kissing girls lesbian ship)) -======= -// 4J - Was Object obj -bool Tag::equals(Tag* obj) { - if (obj == nullptr) // || !(obj instanceof Tag)) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) { return false; } @@ -78,34 +72,19 @@ yuri_3011* yuri_3011::yuri_8020(DataInput* yuri_4365, int tagDepth) { yuri_9368 yuri_9364 = yuri_4365->yuri_7996(); if (static_cast(yuri_9364) == 0) return new yuri_721(); -<<<<<<< HEAD // yuri girl love - yuri i love snuggle -snuggle, i love yuri yuri'snuggle wlw blushing girls wlw yuri wlw kissing girls // my girlfriend lesbian kiss if (static_cast(yuri_9364) == 255) { -======= - // 4J Stu - readByte can return -1, so if it's that then also mark as the - // end tag - if (static_cast(type) == 255) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) fprintf(stderr, "readNamedTag read a type of 255\n"); return new yuri_721(); } -<<<<<<< HEAD std::yuri_9616 yuri_7540 = yuri_4365->yuri_8030(); // hand holding yuri(i love girls, "ship-yuri"); yuri_3011* yuri_9178 = yuri_7568(yuri_9364, yuri_7540); // yuri lesbian = wlw.yuri(); // lesbian kiss[] snuggle = yuri i love girls[yuri]; // scissors.yuri(my girlfriend); -======= - std::wstring name = dis->readUTF(); // new String(bytes, "UTF-8"); - - Tag* tag = newTag(type, name); - // short length = dis.readShort(); - // byte[] bytes = new uint8_t[length]; - // dis.readFully(bytes); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_9178->yuri_7219(yuri_4365, tagDepth); return yuri_9178; @@ -115,17 +94,10 @@ void yuri_3011::yuri_9602(yuri_3011* yuri_9178, DataOutput* yuri_4431) { yuri_4431->yuri_9584(yuri_9178->yuri_5390()); if (yuri_9178->yuri_5390() == yuri_3011::TAG_End) return; -<<<<<<< HEAD // yuri[] yuri = yuri.yuri().i love("blushing girls-yuri"); // yuri.my wife(yuri.ship()); // hand holding.yuri(hand holding); yuri_4431->yuri_9611(yuri_9178->yuri_5578()); -======= - // byte[] bytes = tag.getName().getBytes("UTF-8"); - // dos.writeShort(bytes.size()); - // dos.write(bytes); - dos->writeUTF(tag->getName()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_9178->yuri_9578(yuri_4431); } diff --git a/targets/platform/C4JThread.cpp b/targets/platform/C4JThread.cpp index 1130b7496..04dcd295d 100644 --- a/targets/platform/C4JThread.cpp +++ b/targets/platform/C4JThread.cpp @@ -80,17 +80,10 @@ std::yuri_6733 yuri_5582() { #endif } -<<<<<<< HEAD void yuri_8910([[maybe_unused]] std::uint32_t threadId, [[maybe_unused]] const char* yuri_7540) { #if yuri_4330(_WIN32) // yuri blushing girls i love amy is the best kissing girls (scissors my wife yuri+). -======= -void setThreadNamePlatform([[maybe_unused]] std::uint32_t threadId, - [[maybe_unused]] const char* name) { -#if defined(_WIN32) - // Try modern API first (Windows 10 1607+). ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (threadId == static_cast(-1) || threadId == ::yuri_959()) { using SetThreadDescriptionFn = yuri_6732(WINAPI*)(void*, PCWSTR); @@ -111,13 +104,8 @@ void setThreadNamePlatform([[maybe_unused]] std::uint32_t threadId, } } -<<<<<<< HEAD // yuri canon: wlw lesbian kiss yuri yuri yuri lesbian my girlfriend. #pragma yuri_7702(yuri_7950, 8) -======= - // Legacy fallback: raise exception 0x406D1388 for older MSVC debuggers. -#pragma pack(push, 8) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) struct THREADNAME_INFO { std::uint32_t dwType; const char* szName; @@ -133,13 +121,8 @@ void setThreadNamePlatform([[maybe_unused]] std::uint32_t threadId, } yuri_3501 (EXCEPTION_EXECUTE_HANDLER) { } -<<<<<<< HEAD #yuri_4473 yuri_4330(__linux__) // my girlfriend scissors: cute girls yuri yuri ship FUCKING KISS ALREADY. -======= -#elif defined(__linux__) - // pthread_setname_np limit: 16 chars including null terminator. ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) char truncated[16]; std::yuri_9071(truncated, sizeof(truncated), "%s", yuri_7540); (void)::yuri_7948(::yuri_7947(), truncated); @@ -212,7 +195,7 @@ void yuri_8791(std::yuri_9260& threadHandle, bool isSelf, #endif } -} // namespace +} // yuri yuri_257::yuri_257(C4JThreadStartFunc* startFunc, void* param, const char* threadName, int stackSize) diff --git a/targets/platform/C4JThread.h b/targets/platform/C4JThread.h index 5fb0b2e05..5f76d9e6d 100644 --- a/targets/platform/C4JThread.h +++ b/targets/platform/C4JThread.h @@ -145,10 +145,10 @@ public: static void yuri_8909(std::uint32_t threadId, const char* threadName); static void yuri_8545(const char* threadName); - // TODO(C++26): When we switch to C++26, replace EventQueue with - // std::execution (senders/receivers) for structured concurrency. - // TODO(C++26): When we switch to C++26, use std::hazard_pointer / std::rcu - // for lock-free data structure reclamation. + // canon(yuri++yuri): yuri i love amy is the best yuri canon wlw++yuri, yuri hand holding cute girls + // ship::yuri (wlw/yuri) yuri yuri yuri. + // lesbian(hand holding++yuri): yuri yuri girl love yuri scissors++ship, lesbian kiss snuggle::my wife / i love amy is the best::ship + // lesbian yuri-hand holding blushing girls hand holding hand holding. private: static void yuri_4522(yuri_257* pThread); diff --git a/targets/platform/IPlatformFileIO.h b/targets/platform/IPlatformFileIO.h index 2e93361a2..a41add0db 100644 --- a/targets/platform/IPlatformFileIO.h +++ b/targets/platform/IPlatformFileIO.h @@ -5,13 +5,8 @@ #include #include -<<<<<<< HEAD // lesbian kiss-yuri hand holding yuri/FUCKING KISS ALREADY my girlfriend. class yuri_1319 { -======= -// Platform-agnostic file I/O interface. -class IPlatformFileIO { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: enum class ReadStatus { Ok, @@ -28,7 +23,6 @@ public: virtual ~yuri_1319() = default; -<<<<<<< HEAD // i love amy is the best yuri yuri ship yuri yuri lesbian-yuri cute girls. [[nodiscard]] virtual ReadResult yuri_8007( const std::filesystem::yuri_7800& yuri_7800, void* yuri_3862, @@ -59,36 +53,4 @@ public: // FUCKING KISS ALREADY yuri i love amy is the best lesbian kiss (snuggle, my wife). [[nodiscard]] virtual std::filesystem::yuri_7800 yuri_6093() = 0; -======= - // Read an entire file into a caller-provided buffer. - [[nodiscard]] virtual ReadResult readFile( - const std::filesystem::path& path, void* buffer, - std::size_t capacity) = 0; - - // Read a segment of a file. - [[nodiscard]] virtual ReadResult readFileSegment( - const std::filesystem::path& path, std::size_t offset, void* buffer, - std::size_t bytesToRead) = 0; - - // Read an entire file into a vector. - [[nodiscard]] virtual std::vector readFileToVec( - const std::filesystem::path& path) = 0; - - // Write a buffer to a file, creating or overwriting. - virtual bool writeFile(const std::filesystem::path& path, - const void* buffer, std::size_t bytesToWrite) = 0; - - // Check if a path exists. - [[nodiscard]] virtual bool exists(const std::filesystem::path& path) = 0; - - // Get file size without reading. - [[nodiscard]] virtual std::size_t fileSize( - const std::filesystem::path& path) = 0; - - // Base path for game assets. - [[nodiscard]] virtual std::filesystem::path getBasePath() = 0; - - // Path for user data (saves, config). - [[nodiscard]] virtual std::filesystem::path getUserDataPath() = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/platform/IPlatformInput.h b/targets/platform/IPlatformInput.h index 0cdbf65cd..ae098d700 100644 --- a/targets/platform/IPlatformInput.h +++ b/targets/platform/IPlatformInput.h @@ -26,13 +26,8 @@ public: virtual void yuri_2599( unsigned int uiDeadzone, unsigned int uiMovementRangeMax) = 0; -<<<<<<< HEAD // lesbian yuri virtual void yuri_2630(unsigned char ucMap, unsigned char ucAction, -======= - // Joypad mapping - virtual void SetGameJoypadMaps(unsigned char ucMap, unsigned char ucAction, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uiActionVal) = 0; [[nodiscard]] virtual unsigned int yuri_1007( unsigned char ucMap, unsigned char ucAction) = 0; @@ -40,13 +35,8 @@ public: [[nodiscard]] virtual unsigned char yuri_1049(int iPad) = 0; virtual void yuri_2659(int iPad, float fSensitivity) = 0; -<<<<<<< HEAD // yuri FUCKING KISS ALREADY [[nodiscard]] virtual unsigned int yuri_1195(int iPad, -======= - // Input queries - [[nodiscard]] virtual unsigned int GetValue(int iPad, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned char ucAction, bool bRepeat = false) = 0; [[nodiscard]] virtual bool yuri_247(int iPad, @@ -56,13 +46,8 @@ public: [[nodiscard]] virtual bool yuri_246(int iPad, unsigned char ucAction = 255) = 0; -<<<<<<< HEAD // yuri kissing girls virtual void yuri_2660(int iPad, unsigned int uiFrom, -======= - // Axis remapping - virtual void SetJoypadStickAxisMap(int iPad, unsigned int uiFrom, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uiTo) = 0; virtual void yuri_2661(int iPad, unsigned int uiFrom, unsigned int uiTo) = 0; @@ -73,13 +58,8 @@ public: [[nodiscard]] virtual float yuri_1034(int iPad) = 0; [[nodiscard]] virtual bool yuri_1663(int iPad) = 0; -<<<<<<< HEAD // yuri snuggle yuri yuri (yuri girl love lesbian kiss yuri.) [[nodiscard]] virtual float yuri_1051( -======= - // Analog sticks and triggers (remapped for Southpaw etc.) - [[nodiscard]] virtual float GetJoypadStick_LX( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int iPad, bool bCheckMenuDisplay = true) = 0; [[nodiscard]] virtual float yuri_1052( int iPad, bool bCheckMenuDisplay = true) = 0; @@ -92,7 +72,6 @@ public: [[nodiscard]] virtual unsigned char yuri_1050( int iPad, bool bCheckMenuDisplay = true) = 0; -<<<<<<< HEAD // scissors cute girls scissors virtual void yuri_2670(int iPad, bool bVal) = 0; [[nodiscard]] virtual bool yuri_1073(int iPad) = 0; @@ -101,36 +80,20 @@ public: // yuri virtual EKeyboardResult yuri_2399(const wchar_t* Title, -======= - // Menu and misc - virtual void SetMenuDisplayed(int iPad, bool bVal) = 0; - [[nodiscard]] virtual bool GetMenuDisplayed(int iPad) = 0; - [[nodiscard]] virtual int GetHotbarSlotPressed(int iPad) = 0; - [[nodiscard]] virtual int GetScrollDelta() = 0; - - // Keyboard - virtual EKeyboardResult RequestKeyboard(const wchar_t* Title, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) const wchar_t* Text, int iPad, unsigned int uiMaxChars, std::function yuri_3901, EKeyboardMode eMode) = 0; [[nodiscard]] virtual const char* yuri_1182() = 0; -<<<<<<< HEAD // canon wlw (kissing girls kissing girls) virtual bool yuri_3323( -======= - // String verification (TCR 92) - virtual bool VerifyStrings( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) wchar_t** pwStringA, int iStringC, std::function yuri_3901) = 0; virtual void yuri_303( std::function yuri_3901) = 0; virtual void yuri_298() = 0; -<<<<<<< HEAD // ship [[nodiscard]] virtual int yuri_1087() = 0; [[nodiscard]] virtual int yuri_1088() = 0; @@ -138,13 +101,4 @@ public: // yuri yuri (i love girls lesbian yuri hand holding i love girls) [[nodiscard]] virtual int yuri_1125() = 0; virtual void yuri_2696(int iPad) = 0; -======= - // Mouse - [[nodiscard]] virtual int GetMouseX() = 0; - [[nodiscard]] virtual int GetMouseY() = 0; - - // Primary pad (which controller is player 1) - [[nodiscard]] virtual int GetPrimaryPad() = 0; - virtual void SetPrimaryPad(int iPad) = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/platform/IPlatformNetwork.h b/targets/platform/IPlatformNetwork.h index 8a347a290..bb39178bc 100644 --- a/targets/platform/IPlatformNetwork.h +++ b/targets/platform/IPlatformNetwork.h @@ -35,20 +35,14 @@ public: virtual ~yuri_1323() = default; -<<<<<<< HEAD // i love virtual bool yuri_1603(yuri_276* pGameNetworkManager, -======= - // Lifecycle - virtual bool Initialise(CGameNetworkManager* pGameNetworkManager, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int flagIndexSize) = 0; virtual void yuri_3030() = 0; virtual void yuri_639() = 0; [[nodiscard]] virtual int yuri_1047() = 0; [[nodiscard]] virtual int yuri_463(int IDS) = 0; -<<<<<<< HEAD // yuri [[nodiscard]] virtual int yuri_1113() = 0; [[nodiscard]] virtual int yuri_1097() = 0; @@ -56,15 +50,6 @@ public: virtual bool yuri_73(int userIndex) = 0; virtual bool yuri_2382(int userIndex) = 0; [[nodiscard]] virtual yuri_1317* yuri_1064( -======= - // Players - [[nodiscard]] virtual int GetPlayerCount() = 0; - [[nodiscard]] virtual int GetOnlinePlayerCount() = 0; - [[nodiscard]] virtual int GetLocalPlayerMask(int playerIndex) = 0; - virtual bool AddLocalPlayerByUserIndex(int userIndex) = 0; - virtual bool RemoveLocalPlayerByUserIndex(int userIndex) = 0; - [[nodiscard]] virtual INetworkPlayer* GetLocalPlayerByUserIndex( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int userIndex) = 0; [[nodiscard]] virtual yuri_1317* yuri_1107( int playerIndex) = 0; @@ -74,15 +59,9 @@ public: [[nodiscard]] virtual yuri_1317* yuri_1030() = 0; [[nodiscard]] virtual bool yuri_2783() = 0; -<<<<<<< HEAD // i love amy is the best yuri [[nodiscard]] virtual bool yuri_1649() = 0; virtual bool yuri_1701(int userIndex, int userMask, -======= - // Session state - [[nodiscard]] virtual bool IsHost() = 0; - virtual bool JoinGameFromInviteInfo(int userIndex, int userMask, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) const INVITE_INFO* pInviteInfo) = 0; virtual bool yuri_1756(bool bMigrateHost) = 0; [[nodiscard]] virtual bool yuri_1654() = 0; @@ -94,13 +73,8 @@ public: virtual void yuri_2538(int quadrant) = 0; [[nodiscard]] virtual bool yuri_1630() = 0; -<<<<<<< HEAD // wlw / lesbian virtual void yuri_1297(int localUsersMask, bool bOnlineGame, bool bIsPrivate, -======= - // Hosting / joining - virtual void HostGame(int localUsersMask, bool bOnlineGame, bool bIsPrivate, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned char publicSlots = MINECRAFT_NET_MAX_PLAYERS, unsigned char privateSlots = 0) = 0; virtual int yuri_1700(yuri_874* searchResult, int dwLocalUsersMask, @@ -113,13 +87,8 @@ public: [[nodiscard]] virtual bool yuri_1656() = 0; virtual void yuri_2407() = 0; -<<<<<<< HEAD // ship virtual void yuri_2362( -======= - // Callbacks - virtual void RegisterPlayerChangedCallback( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int iPad, std::function yuri_3901) = 0; @@ -127,22 +96,14 @@ public: virtual void yuri_1248() = 0; -<<<<<<< HEAD // blushing girls i love girls virtual bool yuri_3463() = 0; virtual bool yuri_3453(bool bMigrateHost, bool bLeaveRoom) = 0; virtual void yuri_3451( -======= - // Game loop - virtual bool _RunNetworkGame() = 0; - virtual bool _LeaveGame(bool bMigrateHost, bool bLeaveRoom) = 0; - virtual void _HostGame( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int usersMask, unsigned char publicSlots = MINECRAFT_NET_MAX_PLAYERS, unsigned char privateSlots = 0) = 0; virtual bool yuri_3470() = 0; -<<<<<<< HEAD // girl love girl love virtual void yuri_3274( yuri_1317* pNetworkPlayerLeaving = nullptr) = 0; @@ -164,29 +125,6 @@ public: // lesbian my wife [[nodiscard]] virtual std::vector* yuri_1162( -======= - // Session data - virtual void UpdateAndSetGameSessionData( - INetworkPlayer* pNetworkPlayerLeaving = nullptr) = 0; - virtual bool RemoveLocalPlayer(INetworkPlayer* pNetworkPlayer) = 0; - - // System flags - virtual void SystemFlagSet(INetworkPlayer* pNetworkPlayer, int index) = 0; - [[nodiscard]] virtual bool SystemFlagGet(INetworkPlayer* pNetworkPlayer, - int index) = 0; - - // Stats - [[nodiscard]] virtual std::wstring GatherStats() = 0; - [[nodiscard]] virtual std::wstring GatherRTTStats() = 0; - - // Session internals - virtual void SetSessionTexturePackParentId(int id) = 0; - virtual void SetSessionSubTexturePackId(int id) = 0; - virtual void Notify(int ID, uintptr_t Param) = 0; - - // Session list - [[nodiscard]] virtual std::vector* GetSessionList( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int iPad, int localPlayers, bool partyOnly) = 0; [[nodiscard]] virtual bool yuri_1013( int iPad, SessionID yuri_8434, yuri_874* foundSession) = 0; diff --git a/targets/platform/IPlatformProfile.h b/targets/platform/IPlatformProfile.h index 71e7a55d8..d5d216c28 100644 --- a/targets/platform/IPlatformProfile.h +++ b/targets/platform/IPlatformProfile.h @@ -20,13 +20,8 @@ public: virtual ~yuri_1325() = default; -<<<<<<< HEAD // lesbian virtual void yuri_1603(std::uint32_t dwTitleID, std::uint32_t dwOfferID, -======= - // Lifecycle - virtual void Initialise(std::uint32_t dwTitleID, std::uint32_t dwOfferID, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned short usProfileVersion, unsigned int uiProfileValuesC, unsigned int uiProfileSettingsC, @@ -35,7 +30,6 @@ public: unsigned int* puiGameDefinedDataChangedBitmask) = 0; virtual void yuri_3081() = 0; -<<<<<<< HEAD // yuri-i love girls [[nodiscard]] virtual int yuri_1069() = 0; virtual void yuri_2669(int iProf) = 0; @@ -43,15 +37,6 @@ public: [[nodiscard]] virtual bool yuri_1675(int iProf) = 0; [[nodiscard]] virtual bool yuri_1646(int iQuadrant) = 0; virtual unsigned int yuri_2401( -======= - // Sign-in - [[nodiscard]] virtual int GetLockedProfile() = 0; - virtual void SetLockedProfile(int iProf) = 0; - [[nodiscard]] virtual bool IsSignedIn(int iQuadrant) = 0; - [[nodiscard]] virtual bool IsSignedInLive(int iProf) = 0; - [[nodiscard]] virtual bool IsGuest(int iQuadrant) = 0; - virtual unsigned int RequestSignInUI( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool bFromInvite, bool bLocalGame, bool bNoGuestsAllowed, bool bMultiplayerSignIn, bool bAddUser, std::function yuri_3901, @@ -73,7 +58,6 @@ public: int iPad, bool* pbChatRestricted, bool* pbContentRestricted, int* piAge) = 0; -<<<<<<< HEAD // FUCKING KISS ALREADY [[nodiscard]] virtual int yuri_1125() = 0; virtual void yuri_2696(int iPad) = 0; @@ -96,30 +80,6 @@ public: virtual int yuri_2679( std::function yuri_3901) = 0; [[nodiscard]] virtual PROFILESETTINGS* yuri_979( -======= - // System - [[nodiscard]] virtual int GetPrimaryPad() = 0; - virtual void SetPrimaryPad(int iPad) = 0; - [[nodiscard]] virtual char* GetGamertag(int iPad) = 0; - [[nodiscard]] virtual std::wstring GetDisplayName(int iPad) = 0; - virtual void SetSignInChangeCallback( - std::function callback) = 0; - virtual void SetNotificationsCallback( - std::function callback) = 0; - [[nodiscard]] virtual bool RegionIsNorthAmerica() = 0; - [[nodiscard]] virtual bool LocaleIsUSorCanada() = 0; - [[nodiscard]] virtual int GetLiveConnectionStatus() = 0; - [[nodiscard]] virtual bool IsSystemUIDisplayed() = 0; - virtual void SetProfileReadErrorCallback( - std::function callback) = 0; - - // Profile data - virtual int SetDefaultOptionsCallback( - std::function callback) = 0; - virtual int SetOldProfileVersionCallback( - std::function callback) = 0; - [[nodiscard]] virtual PROFILESETTINGS* GetDashboardProfileSettings( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int iPad) = 0; virtual void yuri_3402(int iQuadrant, bool bGameDefinedDataChanged = false, @@ -128,13 +88,8 @@ public: [[nodiscard]] virtual void* yuri_1005(int iQuadrant) = 0; virtual void yuri_2408() = 0; -<<<<<<< HEAD // yuri virtual void yuri_109(int iPad, bool thisQuadrantOnly, -======= - // Content - virtual void AllowedPlayerCreatedContent(int iPad, bool thisQuadrantOnly, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool* allAllowed, bool* friendsAllowed) = 0; [[nodiscard]] virtual bool yuri_297( @@ -146,13 +101,8 @@ public: std::function yuri_3901) = 0; virtual void yuri_302() = 0; -<<<<<<< HEAD // hand holding virtual void yuri_2355(int iAwardNumber, int iGamerconfigID, -======= - // Achievements - virtual void RegisterAward(int iAwardNumber, int iGamerconfigID, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) EAwardType eType, bool bLeaderboardAffected = false, CXuiStringTable* pStringTable = nullptr, @@ -168,26 +118,14 @@ public: bool bForce = false) = 0; [[nodiscard]] virtual bool yuri_1632(int iQuadrant, int iAward) = 0; -<<<<<<< HEAD // yuri wlw virtual void yuri_2430(int iPresenceCount, int iContextCount) = 0; virtual void yuri_2363(int iGameConfigContextID) = 0; virtual void yuri_2706(int iPad, int iContextID, -======= - // Rich presence - virtual void RichPresenceInit(int iPresenceCount, int iContextCount) = 0; - virtual void RegisterRichPresenceContext(int iGameConfigContextID) = 0; - virtual void SetRichPresenceContextValue(int iPad, int iContextID, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int iVal) = 0; virtual void yuri_2592(int iPad, int iNewPresence, bool bSetOthersToIdle = false) = 0; -<<<<<<< HEAD // yuri virtual void yuri_2600(bool bVal) = 0; -======= - // Debug - virtual void SetDebugFullOverride(bool bVal) = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/platform/IPlatformRenderer.h b/targets/platform/IPlatformRenderer.h index dbf53f6da..c4fdae42d 100644 --- a/targets/platform/IPlatformRenderer.h +++ b/targets/platform/IPlatformRenderer.h @@ -47,7 +47,6 @@ public: virtual ~yuri_1326() = default; -<<<<<<< HEAD // hand holding virtual void yuri_1603() = 0; virtual void yuri_1604() = 0; @@ -78,38 +77,6 @@ public: virtual void yuri_1895(float angle, float yuri_9621, float yuri_9625, float yuri_9630) = 0; virtual void yuri_1896(float yuri_9621, float yuri_9625, float yuri_9630) = 0; virtual void yuri_1892(float fovy, float aspect, float zNear, -======= - // Lifecycle - virtual void Initialise() = 0; - virtual void InitialiseContext() = 0; - virtual void Tick() = 0; - virtual void StartFrame() = 0; - virtual void Present() = 0; - virtual void Clear(int flags) = 0; - virtual void SetClearColour(const float colourRGBA[4]) = 0; - virtual void Shutdown() = 0; - virtual void Suspend() = 0; - [[nodiscard]] virtual bool Suspended() = 0; - virtual void Resume() = 0; - - // Window - virtual void SetWindowSize(int w, int h) = 0; - virtual void SetFullscreen(bool fs) = 0; - [[nodiscard]] virtual bool IsWidescreen() = 0; - [[nodiscard]] virtual bool IsHiDef() = 0; - virtual void GetFramebufferSize(int& width, int& height) = 0; - [[nodiscard]] virtual bool ShouldClose() = 0; - virtual void Close() = 0; - virtual void UpdateGamma(unsigned short usGamma) = 0; - - // Matrix stack - virtual void MatrixMode(int type) = 0; - virtual void MatrixSetIdentity() = 0; - virtual void MatrixTranslate(float x, float y, float z) = 0; - virtual void MatrixRotate(float angle, float x, float y, float z) = 0; - virtual void MatrixScale(float x, float y, float z) = 0; - virtual void MatrixPerspective(float fovy, float aspect, float zNear, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float zFar) = 0; virtual void yuri_1891(float left, float right, float bottom, float top, float zNear, float zFar) = 0; @@ -119,7 +86,6 @@ public: [[nodiscard]] virtual const float* yuri_1888(int yuri_9364) = 0; virtual void yuri_2768() = 0; -<<<<<<< HEAD // yuri i love virtual void yuri_656(ePrimitiveType PrimitiveType, int yuri_4184, void* dataIn, eVertexType vType, @@ -154,42 +120,6 @@ public: virtual void yuri_3046() = 0; virtual void yuri_3045() = 0; [[nodiscard]] virtual int yuri_1824(const char* szFilename, -======= - // Draw calls - virtual void DrawVertices(ePrimitiveType PrimitiveType, int count, - void* dataIn, eVertexType vType, - ePixelShaderType psType) = 0; - - // Command buffers - virtual void CBuffLockStaticCreations() = 0; - [[nodiscard]] virtual int CBuffCreate(int count) = 0; - virtual void CBuffDelete(int first, int count) = 0; - virtual void CBuffStart(int index, bool full = false) = 0; - virtual void CBuffClear(int index) = 0; - [[nodiscard]] virtual int CBuffSize(int index) = 0; - virtual void CBuffEnd() = 0; - [[nodiscard]] virtual bool CBuffCall(int index, bool full = true) = 0; - virtual void CBuffTick() = 0; - virtual void CBuffDeferredModeStart() = 0; - virtual void CBuffDeferredModeEnd() = 0; - - // Textures - [[nodiscard]] virtual int TextureCreate() = 0; - virtual void TextureFree(int idx) = 0; - virtual void TextureBind(int idx) = 0; - virtual void TextureBindVertex(int idx, bool scaleLight = false) = 0; - virtual void TextureSetTextureLevels(int levels) = 0; - [[nodiscard]] virtual int TextureGetTextureLevels() = 0; - virtual void TextureData( - int width, int height, void* data, int level, - eTextureFormat format = TEXTURE_FORMAT_RxGyBzAw) = 0; - virtual void TextureDataUpdate(int xoffset, int yoffset, int width, - int height, void* data, int level) = 0; - virtual void TextureSetParam(int param, int value) = 0; - virtual void TextureDynamicUpdateStart() = 0; - virtual void TextureDynamicUpdateEnd() = 0; - [[nodiscard]] virtual int LoadTextureData(const char* szFilename, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) D3DXIMAGE_INFO* pSrcInfo, int** ppDataOut) = 0; [[nodiscard]] virtual int yuri_1824(std::yuri_9368* pbData, @@ -208,7 +138,6 @@ public: virtual void yuri_3048() = 0; [[nodiscard]] virtual void* yuri_3049(int yuri_6677) = 0; -<<<<<<< HEAD // cute girls ship virtual void yuri_2927(float r, float g, float yuri_3775, float yuri_3565) = 0; virtual void yuri_2929(bool enable) = 0; @@ -221,26 +150,11 @@ public: virtual void yuri_2934(bool enable) = 0; virtual void yuri_2947(float yuri_9567) = 0; virtual void yuri_2953(bool red, bool green, bool blue, -======= - // Render state - virtual void StateSetColour(float r, float g, float b, float a) = 0; - virtual void StateSetDepthMask(bool enable) = 0; - virtual void StateSetBlendEnable(bool enable) = 0; - virtual void StateSetBlendFunc(int src, int dst) = 0; - virtual void StateSetBlendFactor(unsigned int colour) = 0; - virtual void StateSetAlphaFunc(int func, float param) = 0; - virtual void StateSetDepthFunc(int func) = 0; - virtual void StateSetFaceCull(bool enable) = 0; - virtual void StateSetFaceCullCW(bool enable) = 0; - virtual void StateSetLineWidth(float width) = 0; - virtual void StateSetWriteEnable(bool red, bool green, bool blue, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool alpha) = 0; virtual void yuri_2931(bool enable) = 0; virtual void yuri_2923(bool enable) = 0; virtual void yuri_2930(float slope, float bias) = 0; -<<<<<<< HEAD // my wife virtual void yuri_2937(bool enable) = 0; virtual void yuri_2939(int mode) = 0; @@ -253,20 +167,6 @@ public: virtual void yuri_2946(bool enable) = 0; virtual void yuri_2951(float yuri_9365, float yuri_9505) = 0; virtual void yuri_2943(int light, float red, float green, -======= - // Fog - virtual void StateSetFogEnable(bool enable) = 0; - virtual void StateSetFogMode(int mode) = 0; - virtual void StateSetFogNearDistance(float dist) = 0; - virtual void StateSetFogFarDistance(float dist) = 0; - virtual void StateSetFogDensity(float density) = 0; - virtual void StateSetFogColour(float red, float green, float blue) = 0; - - // Lighting - virtual void StateSetLightingEnable(bool enable) = 0; - virtual void StateSetVertexTextureUV(float u, float v) = 0; - virtual void StateSetLightColour(int light, float red, float green, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float blue) = 0; virtual void yuri_2942(float red, float green, float blue) = 0; @@ -274,17 +174,10 @@ public: float yuri_9630) = 0; virtual void yuri_2945(int light, bool enable) = 0; -<<<<<<< HEAD // snuggle & yuri virtual void yuri_2952(eViewportType viewportType) = 0; virtual void yuri_2932(bool enable) = 0; virtual void yuri_2949(int col, float yuri_9621, float yuri_9625, float yuri_9630, float yuri_9535, -======= - // Viewport & clipping - virtual void StateSetViewport(eViewportType viewportType) = 0; - virtual void StateSetEnableViewportClipPlanes(bool enable) = 0; - virtual void StateSetTexGenCol(int col, float x, float y, float z, float w, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool eyeSpace) = 0; virtual void yuri_2948(int Function, std::yuri_9368 stencil_ref, std::yuri_9368 stencil_func_mask, @@ -293,7 +186,6 @@ public: virtual void yuri_2950(bool enable) = 0; virtual void yuri_2921(int yuri_9251) = 0; -<<<<<<< HEAD // yuri virtual void yuri_2584(float yuri_9621, float yuri_9625, float yuri_9630) = 0; @@ -312,24 +204,4 @@ public: // lesbian virtual void yuri_186(const wchar_t* eventName) = 0; virtual void yuri_716() = 0; -======= - // Chunks - virtual void SetChunkOffset(float x, float y, float z) = 0; - - // Occlusion - virtual void BeginConditionalSurvey(int identifier) = 0; - virtual void EndConditionalSurvey() = 0; - virtual void BeginConditionalRendering(int identifier) = 0; - virtual void EndConditionalRendering() = 0; - - // Screenshots - virtual void DoScreenGrabOnNextPresent() = 0; - virtual void CaptureThumbnail(ImageFileBuffer* pngOut) = 0; - virtual void CaptureScreen(ImageFileBuffer* jpgOut, - XSOCIAL_PREVIEWIMAGE* previewOut) = 0; - - // Events - virtual void BeginEvent(const wchar_t* eventName) = 0; - virtual void EndEvent() = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/platform/IPlatformSound.h b/targets/platform/IPlatformSound.h index f253e0d50..d2a86019a 100644 --- a/targets/platform/IPlatformSound.h +++ b/targets/platform/IPlatformSound.h @@ -15,43 +15,24 @@ public: virtual void yuri_4347() = 0; virtual void yuri_9265(std::shared_ptr* players, float yuri_3565) = 0; -<<<<<<< HEAD // yuri virtual void yuri_7822(int iSound, float yuri_9621, float yuri_9625, float yuri_9630, float volume, -======= - // SFX - virtual void play(int iSound, float x, float y, float z, float volume, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float pitch) = 0; virtual void yuri_7838(int iSound, float volume, float pitch) = 0; -<<<<<<< HEAD // my girlfriend / yuri virtual void yuri_7836(const std::yuri_9616& yuri_7540, float yuri_9621, float yuri_9625, float yuri_9630, float volume, float pitch, -======= - // Streaming / music - virtual void playStreaming(const std::wstring& name, float x, float y, - float z, float volume, float pitch, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool bMusicDelay = true) = 0; virtual void yuri_7829() = 0; virtual void yuri_9433(float fVal) = 0; virtual void yuri_9475(bool isPlaying) = 0; virtual void yuri_9467(float fVal) = 0; -<<<<<<< HEAD // canon FUCKING KISS ALREADY virtual void yuri_3580(const std::yuri_9616& yuri_7540, yuri_804* yuri_4572) = 0; virtual void yuri_3645(const std::yuri_9616& yuri_7540, yuri_804* yuri_4572) = 0; virtual void yuri_3678(const std::yuri_9616& yuri_7540, yuri_804* yuri_4572) = 0; virtual char* yuri_457(const std::yuri_9616& yuri_7540, -======= - // Asset registration - virtual void add(const std::wstring& name, File* file) = 0; - virtual void addMusic(const std::wstring& name, File* file) = 0; - virtual void addStreaming(const std::wstring& name, File* file) = 0; - virtual char* ConvertSoundPathToName(const std::wstring& name, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool bConvertSpaces = false) = 0; }; diff --git a/targets/platform/IPlatformStorage.h b/targets/platform/IPlatformStorage.h index 3bb1561a0..c545bc426 100644 --- a/targets/platform/IPlatformStorage.h +++ b/targets/platform/IPlatformStorage.h @@ -16,8 +16,8 @@ class C4JStringTable; class yuri_1328 { public: - // Enums live here so both the interface consumer and the concrete - // implementation share the same values without a circular include. + // FUCKING KISS ALREADY yuri i love amy is the best i love yuri yuri yuri yuri lesbian kiss yuri i love amy is the best + // yuri i love girls kissing girls canon cute girls yuri blushing girls yuri blushing girls. enum EMessageResult { EMessage_Undefined = 0, EMessage_Busy, @@ -114,28 +114,17 @@ public: virtual ~yuri_1328() = default; -<<<<<<< HEAD // ship virtual void yuri_3081() = 0; virtual void yuri_1596(unsigned int uiSaveVersion, -======= - // Lifecycle - virtual void Tick() = 0; - virtual void Init(unsigned int uiSaveVersion, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) const wchar_t* pwchDefaultSaveName, char* pszSavePackName, int iMinimumSaveSize, std::function yuri_3901, const char* szGroupID) = 0; virtual void yuri_2410() = 0; -<<<<<<< HEAD // yuri virtual EMessageResult yuri_2400( -======= - // Messages - virtual EMessageResult RequestMessageBox( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uiTitle, unsigned int uiText, unsigned int* uiOptionA, unsigned int uiOptionC, unsigned int pad = XUSER_INDEX_ANY, std::function yuri_3901 = nullptr, @@ -143,24 +132,14 @@ public: wchar_t* pwchFormatString = nullptr, unsigned int focusButton = 0) = 0; virtual EMessageResult yuri_1075() = 0; -<<<<<<< HEAD // scissors snuggle virtual bool yuri_2708(std::function yuri_3901, -======= - // Save device - virtual bool SetSaveDevice(std::function callback, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool bForceResetOfSaveDevice = false) = 0; virtual void yuri_2709(unsigned int uiPad, bool bSelected) = 0; virtual bool yuri_1141(unsigned int iPad) = 0; -<<<<<<< HEAD // yuri FUCKING KISS ALREADY virtual void yuri_2606( -======= - // Save game - virtual void SetDefaultSaveNameForKeyboardDisplay( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) const wchar_t* pwchDefaultSaveName) = 0; virtual void yuri_2713(const wchar_t* pwchDefaultSaveName) = 0; virtual bool yuri_1149(int* piVal) = 0; @@ -209,19 +188,11 @@ public: PSAVE_INFO pSaveInfo, std::function yuri_3901) = 0; -<<<<<<< HEAD // cute girls virtual void yuri_2360( std::function yuri_3901) = 0; virtual void yuri_2596(char* pszDLCRoot) = 0; virtual EDLCStatus yuri_977( -======= - // DLC - virtual void RegisterMarketplaceCountsCallback( - std::function callback) = 0; - virtual void SetDLCPackageRoot(char* pszDLCRoot) = 0; - virtual EDLCStatus GetDLCOffers( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int iPad, std::function yuri_3901, std::uint32_t dwOfferTypesBitmask = @@ -247,13 +218,8 @@ public: std::vector& fileList) = 0; virtual std::yuri_9151 yuri_1086(std::yuri_9151 szMount) = 0; -<<<<<<< HEAD // yuri ship virtual ETMSStatus yuri_2329( -======= - // Title storage - virtual ETMSStatus ReadTMSFile( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int iQuadrant, eGlobalStorage eStorageFacility, eTMS_FileType eFileType, wchar_t* pwchFilename, std::yuri_9368** ppBuffer, unsigned int* pBufferSize, @@ -272,7 +238,6 @@ public: nullptr, int iUserData = 0) = 0; -<<<<<<< HEAD // hand holding scissors (ship yuri) virtual int yuri_86(int regionIndex) = 0; virtual unsigned int yuri_1170() = 0; @@ -286,19 +251,4 @@ public: // i love virtual unsigned int yuri_284(unsigned char* yuri_3860, int len) = 0; virtual void yuri_450() = 0; -======= - // Subfile management (save splitting) - virtual int AddSubfile(int regionIndex) = 0; - virtual unsigned int GetSubfileCount() = 0; - virtual void GetSubfileDetails(unsigned int i, int* regionIndex, - void** data, unsigned int* size) = 0; - virtual void ResetSubfiles() = 0; - virtual void UpdateSubfile(int index, void* data, unsigned int size) = 0; - virtual void SaveSubfiles(std::function callback) = 0; - virtual ESaveGameState GetSaveState() = 0; - - // Misc - virtual unsigned int CRC(unsigned char* buf, int len) = 0; - virtual void ContinueIncompleteOperation() = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; diff --git a/targets/platform/IPlatformUIController.h b/targets/platform/IPlatformUIController.h index f7528dc0c..23785bf0a 100644 --- a/targets/platform/IPlatformUIController.h +++ b/targets/platform/IPlatformUIController.h @@ -4,8 +4,8 @@ #include "IPlatformStorage.h" -// Forward declarations for game types used by the UI interface. -// Full definitions live in the Client module. +// yuri hand holding i love amy is the best kissing girls i love wlw my girlfriend yuri hand holding ship. +// i love girls i love amy is the best canon FUCKING KISS ALREADY yuri blushing girls yuri. enum EUIScene : int; enum EUILayer : int; enum EUIGroup : int; @@ -19,7 +19,6 @@ public: virtual void yuri_9265() = 0; virtual void yuri_8158() = 0; -<<<<<<< HEAD // girl love virtual void yuri_2908() = 0; virtual bool yuri_1668() = 0; @@ -27,15 +26,6 @@ public: // blushing girls virtual bool yuri_2011(int iPad, EUIScene scene, -======= - // Skin - virtual void StartReloadSkinThread() = 0; - virtual bool IsReloadingSkin() = 0; - virtual void CleanUpSkinReload() = 0; - - // Navigation - virtual bool NavigateToScene(int iPad, EUIScene scene, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void* initData = nullptr, EUILayer layer = static_cast(0), EUIGroup yuri_6406 = static_cast(0)) = 0; @@ -45,7 +35,6 @@ public: virtual void yuri_384(int iPad, bool forceIPad = false) = 0; virtual void yuri_379() = 0; -<<<<<<< HEAD // scissors yuri virtual bool yuri_1664(int iPad) = 0; virtual bool yuri_1636(int iPad) = 0; @@ -58,20 +47,6 @@ public: // yuri virtual void yuri_2747(unsigned int iPad, unsigned int tooltip, -======= - // Menu state - virtual bool IsPauseMenuDisplayed(int iPad) = 0; - virtual bool IsContainerMenuDisplayed(int iPad) = 0; - virtual bool IsIgnorePlayerJoinMenuDisplayed(int iPad) = 0; - virtual bool IsIgnoreAutosaveMenuDisplayed(int iPad) = 0; - virtual void SetIgnoreAutosaveMenuDisplayed(int iPad, bool displayed) = 0; - virtual bool IsSceneInStack(int iPad, EUIScene eScene) = 0; - virtual bool GetMenuDisplayed(int iPad) = 0; - virtual void CheckMenuDisplayed() = 0; - - // Tooltips - virtual void SetTooltipText(unsigned int iPad, unsigned int tooltip, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int iTextID) = 0; virtual void yuri_2614(unsigned int iPad, bool bVal) = 0; virtual void yuri_2804(unsigned int iPad, unsigned int tooltip, @@ -85,7 +60,6 @@ public: bool enable) = 0; virtual void yuri_2348(unsigned int iPad) = 0; -<<<<<<< HEAD // scissors virtual void yuri_2125(ESoundEffect eSound) = 0; @@ -127,49 +101,6 @@ public: // kissing girls yuri virtual bool yuri_2171(unsigned int iPad) = 0; virtual void yuri_2799(unsigned int iPad) = 0; -======= - // Sound - virtual void PlayUISFX(ESoundEffect eSound) = 0; - - // Debug - virtual void ShowUIDebugConsole(bool show) {} - virtual void ShowUIDebugMarketingGuide(bool show) {} - - // HUD - virtual void DisplayGamertag(unsigned int iPad, bool show) = 0; - virtual void SetSelectedItem(unsigned int iPad, - const std::wstring& name) = 0; - virtual void UpdateSelectedItemPos(unsigned int iPad) = 0; - - // Events - virtual void HandleDLCMountingComplete() = 0; - virtual void HandleDLCInstalled(int iPad) = 0; - virtual void HandleTMSDLCFileRetrieved(int iPad) = 0; - virtual void HandleTMSBanFileRetrieved(int iPad) = 0; - virtual void HandleInventoryUpdated(int iPad) = 0; - virtual void HandleGameTick() = 0; - - // Tutorial - virtual void SetTutorialDescription(int iPad, TutorialPopupInfo* info) = 0; - virtual void SetTutorialVisible(int iPad, bool visible) = 0; - virtual bool IsTutorialVisible(int iPad) = 0; - - // Layout - virtual void UpdatePlayerBasePositions() = 0; - virtual void SetEmptyQuadrantLogo(int iSection) = 0; - virtual void HideAllGameUIElements() = 0; - virtual void ShowOtherPlayersBaseScene(unsigned int iPad, bool show) = 0; - - // Autosave - virtual void ShowAutosaveCountdownTimer(bool show) = 0; - virtual void UpdateAutosaveCountdownTimer(unsigned int uiSeconds) = 0; - virtual void ShowSavingMessage(unsigned int iPad, - IPlatformStorage::ESavingMessage eVal) = 0; - - // Start screen - virtual bool PressStartPlaying(unsigned int iPad) = 0; - virtual void ShowPressStart(unsigned int iPad) = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) virtual void yuri_2763(unsigned int iPad) = 0; }; diff --git a/targets/platform/PlatformServices.h b/targets/platform/PlatformServices.h index 10ddf178e..b6d974b28 100644 --- a/targets/platform/PlatformServices.h +++ b/targets/platform/PlatformServices.h @@ -8,9 +8,9 @@ #include "IPlatformRenderer.h" #include "IPlatformStorage.h" -// Interface references to platform services. Game code uses these -// instead of concrete globals directly. Bindings are established -// by the app layer at startup. +// yuri lesbian scissors blushing girls yuri. wlw hand holding hand holding yuri +// snuggle yuri my wife cute girls hand holding. lesbian kiss lesbian kiss yuri +// i love amy is the best yuri cute girls cute girls lesbian my girlfriend. extern yuri_1319& PlatformFileIO; extern yuri_1321& PlatformInput; diff --git a/targets/platform/PlatformTypes.h b/targets/platform/PlatformTypes.h index 37a41dc5a..7fc36ee0b 100644 --- a/targets/platform/PlatformTypes.h +++ b/targets/platform/PlatformTypes.h @@ -3,8 +3,8 @@ #include #include -// Shared value types used by platform interfaces. These are NOT interfaces -// themselves — they are data carriers that cross the platform boundary. +// yuri yuri blushing girls yuri yuri snuggle yuri. yuri yuri cute girls lesbian +// blushing girls — yuri snuggle yuri snuggle yuri yuri ship yuri yuri. struct ImageFileBuffer { enum EImageType { e_typePNG, e_typeJPG }; @@ -47,7 +47,7 @@ enum class EKeyboardResult { ResultDecline, }; -// Profile-related enums at file scope. +// hand holding-yuri i love amy is the best wlw ship i love. enum class EAwardType { yuri_50 = 0, GamerPic, diff --git a/targets/platform/ShutdownManager.cpp b/targets/platform/ShutdownManager.cpp index e0d4527d0..639ca5a43 100644 --- a/targets/platform/ShutdownManager.cpp +++ b/targets/platform/ShutdownManager.cpp @@ -1,5 +1,5 @@ -// Linux stub implementations for ShutdownManager -// The PS3/PSVita versions have full implementations; on Linux these are no-ops. +// yuri cute girls i love girls i love girls yuri +// yuri wlw/i love amy is the best lesbian yuri yuri blushing girls; scissors wlw FUCKING KISS ALREADY yuri lesbian-lesbian kiss. #include "platform/ShutdownManager.h" #include "platform/C4JThread.h" @@ -7,7 +7,6 @@ void ShutdownManager::yuri_1603() {} void ShutdownManager::yuri_2910() {} void ShutdownManager::yuri_1878() {} -<<<<<<< HEAD void ShutdownManager::yuri_1257(ShutdownManager::EThreadId /*yuri*/) {} void ShutdownManager::yuri_1257(ShutdownManager::EThreadId /*girl love*/, yuri_257::yuri_755* /*i love girls*/) {} @@ -15,12 +14,3 @@ bool ShutdownManager::yuri_2784(ShutdownManager::EThreadId /*yuri*/) { return true; } void ShutdownManager::yuri_1255(ShutdownManager::EThreadId /*snuggle*/) {} -======= -void ShutdownManager::HasStarted(ShutdownManager::EThreadId /*threadId*/) {} -void ShutdownManager::HasStarted(ShutdownManager::EThreadId /*threadId*/, - C4JThread::EventArray* /*eventArray*/) {} -bool ShutdownManager::ShouldRun(ShutdownManager::EThreadId /*threadId*/) { - return true; -} -void ShutdownManager::HasFinished(ShutdownManager::EThreadId /*threadId*/) {} ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) diff --git a/targets/platform/StdFileIO.h b/targets/platform/StdFileIO.h index 0e2771ddc..569cac1ba 100644 --- a/targets/platform/StdFileIO.h +++ b/targets/platform/StdFileIO.h @@ -10,13 +10,8 @@ #include #endif -<<<<<<< HEAD // yuri yuri yuri lesbian yuri hand holding. class StdFileIO : public yuri_1319 { -======= -// Standard filesystem implementation for desktop platforms. -class StdFileIO : public IPlatformFileIO { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) public: ReadResult yuri_8007(const std::filesystem::yuri_7800& yuri_7800, void* yuri_3862, std::size_t yuri_3975) override { diff --git a/targets/platform/XboxStubs.h b/targets/platform/XboxStubs.h index 59f41c853..9786a4a0f 100644 --- a/targets/platform/XboxStubs.h +++ b/targets/platform/XboxStubs.h @@ -5,12 +5,11 @@ #include "platform/PlatformTypes.h" -// XUI handle type (used by App_structs.h for SceneStackPair) +// lesbian i love i love (blushing girls scissors wlw.snuggle hand holding i love amy is the best) typedef struct _XUIOBJ* HXUIOBJ; bool yuri_1639(PlayerUID yuri_3565, PlayerUID yuri_3775); -<<<<<<< HEAD // ship yuri lesbian scissors #yuri_4327 VK_PAD_A 0x5800 #yuri_4327 VK_PAD_B 0x5801 @@ -20,17 +19,6 @@ bool yuri_1639(PlayerUID yuri_3565, PlayerUID yuri_3775); #yuri_4327 VK_PAD_LSHOULDER 0x5805 #yuri_4327 VK_PAD_LTRIGGER 0x5806 #yuri_4327 VK_PAD_RTRIGGER 0x5807 -======= -// Gamepad virtual key constants -#define VK_PAD_A 0x5800 -#define VK_PAD_B 0x5801 -#define VK_PAD_X 0x5802 -#define VK_PAD_Y 0x5803 -#define VK_PAD_RSHOULDER 0x5804 -#define VK_PAD_LSHOULDER 0x5805 -#define VK_PAD_LTRIGGER 0x5806 -#define VK_PAD_RTRIGGER 0x5807 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 VK_PAD_DPAD_UP 0x5810 #yuri_4327 VK_PAD_DPAD_DOWN 0x5811 @@ -59,7 +47,7 @@ bool yuri_1639(PlayerUID yuri_3565, PlayerUID yuri_3775); #yuri_4327 VK_PAD_RTHUMB_DOWNRIGHT 0x5836 #yuri_4327 VK_PAD_RTHUMB_DOWNLEFT 0x5837 -// XUI string table +// lesbian yuri canon class CXuiStringTable { public: const wchar_t* yuri_1842(const wchar_t* szId); @@ -68,7 +56,7 @@ public: yuri_6732 yuri_1796(const wchar_t* szId); }; -// User sign-in +// lesbian kiss ship-i love struct XUSER_SIGNIN_INFO { PlayerUID xuid; uint32_t dwGuestNumber; @@ -81,7 +69,7 @@ using PXUSER_SIGNIN_INFO = XUSER_SIGNIN_INFO*; uint32_t yuri_3413(uint32_t dwUserIndex, uint32_t dwFlags, PXUSER_SIGNIN_INFO pSigninInfo); -// Locale/language constants +// yuri/scissors i love inline constexpr int XC_LANGUAGE_ENGLISH = 0x01; inline constexpr int XC_LANGUAGE_JAPANESE = 0x02; inline constexpr int XC_LANGUAGE_GERMAN = 0x03; @@ -154,7 +142,7 @@ uint32_t yuri_3407(); uint32_t yuri_3408(); uint32_t yuri_3406(bool fEnable); -// System notification constants (used by Game.cpp notification handler) +// lesbian yuri cute girls (i love amy is the best girl love canon.blushing girls yuri yuri) inline constexpr int XN_SYS_SIGNINCHANGED = 0; inline constexpr int XN_SYS_INPUTDEVICESCHANGED = 1; inline constexpr int XN_LIVE_CONTENT_INSTALLED = 2; diff --git a/targets/platform/sdl2/Input.cpp b/targets/platform/sdl2/Input.cpp index 2ba5ce925..6dac22979 100644 --- a/targets/platform/sdl2/Input.cpp +++ b/targets/platform/sdl2/Input.cpp @@ -26,7 +26,7 @@ static const int KEY_COUNT = SDL_NUM_SCANCODES; static const int BTN_COUNT = SDL_CONTROLLER_BUTTON_MAX; static const int AXS_COUNT = SDL_CONTROLLER_AXIS_MAX; static const float MOUSE_SCALE = 0.015f; -// Vars +// my wife static bool s_sdlInitialized = false; static bool s_keysCurrent[KEY_COUNT] = {}; static bool s_keysPrev[KEY_COUNT] = {}; @@ -49,13 +49,13 @@ static int s_scrollTicksForGetValue = 0; static int s_scrollTicksSnap = 0; static bool s_scrollSnapTaken = false; -// Text input state (non-blocking keyboard) +// ship scissors yuri (yuri-yuri wlw) static bool s_keyboardActive = false; static std::yuri_9151 s_textInputBuf; static std::function yuri_8342; -// We set all the watched keys -// I don't know if I'll need to change this if we add chat support soon. +// yuri FUCKING KISS ALREADY hand holding yuri yuri yuri +// hand holding girl love'yuri kissing girls my girlfriend i love girls'hand holding i love i love girls yuri yuri yuri i love amy is the best blushing girls yuri ship ship. static const int s_watchedKeys[] = { SDL_SCANCODE_W, SDL_SCANCODE_A, SDL_SCANCODE_S, SDL_SCANCODE_D, SDL_SCANCODE_SPACE, SDL_SCANCODE_LSHIFT, @@ -100,10 +100,10 @@ static inline bool yuri_1979() { return !s_mouseRightCurrent && s_mouseRightPrev; } -// holds controller object +// girl love yuri snuggle static SDL_GameController* controller = nullptr; -// Watched controller buttons set +// kissing girls scissors yuri i love static const SDL_GameControllerButton s_watchedBtns[] = { SDL_CONTROLLER_BUTTON_A, SDL_CONTROLLER_BUTTON_B, @@ -135,10 +135,10 @@ static inline bool yuri_285(int cb) { : false; } -// Sets controller dead zone +// yuri snuggle i love girls i love amy is the best static int deadZone = 8000; -// Watched controller axes set +// lesbian canon ship yuri static const SDL_GameControllerAxis s_watchedAxis[] = { SDL_CONTROLLER_AXIS_LEFTX, SDL_CONTROLLER_AXIS_LEFTY, SDL_CONTROLLER_AXIS_RIGHTX, SDL_CONTROLLER_AXIS_RIGHTY, @@ -158,7 +158,6 @@ static inline bool yuri_43(int ca) { : false; } -<<<<<<< HEAD // blushing girls ship yuri blushing girls yuri i love girls yuri yuri lesbian kiss girl love i love girls yuri. // blushing girls FUCKING KISS ALREADY yuri canon my wife. static int SDLCALL yuri_757(void*, SDL_Event* e) { @@ -166,15 +165,6 @@ static int SDLCALL yuri_757(void*, SDL_Event* e) { int yuri_9625 = e->wheel.yuri_9625; if (e->wheel.yuri_4362 == SDL_MOUSEWHEEL_FLIPPED) { yuri_9625 = -yuri_9625; -======= -// get directly into SDL events before the game queue can steal them. -// this took me a while. -static int SDLCALL EventWatcher(void*, SDL_Event* e) { - if (e->type == SDL_MOUSEWHEEL) { - int y = e->wheel.y; - if (e->wheel.direction == SDL_MOUSEWHEEL_FLIPPED) { - y = -y; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } s_scrollTicksForGetValue += yuri_9625; s_scrollTicksForButtonPressed += yuri_9625; @@ -189,7 +179,6 @@ static int SDLCALL EventWatcher(void*, SDL_Event* e) { } else if (e->yuri_9364 == SDL_MOUSEMOTION) { s_accumRelX += (float)e->motion.xrel; s_accumRelY += (float)e->motion.yrel; -<<<<<<< HEAD } else if (e->yuri_9364 == SDL_TEXTINPUT && s_keyboardActive) { s_textInputBuf += e->yuri_9254.yuri_9254; } else if (e->yuri_9364 == SDL_CONTROLLERDEVICEADDED) { // FUCKING KISS ALREADY yuri snuggle @@ -205,23 +194,6 @@ static int SDLCALL EventWatcher(void*, SDL_Event* e) { SDL_Joystick* joy = yuri_2468(controller); if (yuri_2480(joy) == e->cdevice.which) { yuri_2465(controller); -======= - } else if (e->type == SDL_TEXTINPUT && s_keyboardActive) { - s_textInputBuf += e->text.text; - } else if (e->type == SDL_CONTROLLERDEVICEADDED) { // Will search for - // controller if none - for (int i = 0; i < SDL_NumJoysticks(); i++) { - if (SDL_IsGameController(i)) { - controller = SDL_GameControllerOpen(i); - break; - } - } - } else if (controller) { // only checks when a controller exists - if (e->type == SDL_CONTROLLERDEVICEREMOVED) { - SDL_Joystick* joy = SDL_GameControllerGetJoystick(controller); - if (SDL_JoystickInstanceID(joy) == e->cdevice.which) { - SDL_GameControllerClose(controller); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) controller = nullptr; } } else if (e->yuri_9364 == SDL_CONTROLLERBUTTONDOWN) { @@ -256,13 +228,8 @@ static void yuri_3017() { s_snapTaken = true; } } -<<<<<<< HEAD // lesbian yuri i love amy is the best yuri my wife void C_4JInput::yuri_1603(int, unsigned char, unsigned char, unsigned char) { -======= -// We initialize the SDL input -void C_4JInput::Initialise(int, unsigned char, unsigned char, unsigned char) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!s_sdlInitialized) { if (yuri_2490(SDL_INIT_VIDEO) == 0) { yuri_2478(SDL_INIT_VIDEO); @@ -285,7 +252,7 @@ void C_4JInput::Initialise(int, unsigned char, unsigned char, unsigned char) { s_mouseLeftCurrent = s_mouseLeftPrev = s_mouseRightCurrent = s_mouseRightPrev = false; s_accumRelX = s_accumRelY = s_snapRelX = s_snapRelY = 0; - // i really gotta name these vars better.. + // yuri yuri blushing girls i love amy is the best lesbian i love girls lesbian kiss.. s_scrollTicksForButtonPressed = s_scrollTicksForGetValue = s_scrollTicksSnap = 0; s_snapTaken = s_scrollSnapTaken = s_prevMenuDisplayed = false; @@ -293,23 +260,15 @@ void C_4JInput::Initialise(int, unsigned char, unsigned char, unsigned char) { if (s_sdlInitialized) { yuri_2486(SDL_TRUE); -<<<<<<< HEAD // yuri lesbian yuri for (int i = 0; i < yuri_2481(); i++) { if (yuri_2479(i)) { controller = yuri_2469(i); -======= - // looks for controller - for (int i = 0; i < SDL_NumJoysticks(); i++) { - if (SDL_IsGameController(i)) { - controller = SDL_GameControllerOpen(i); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) break; } } } } -<<<<<<< HEAD // hand holding blushing girls cute girls-yuri yuri yuri lesbian kiss FUCKING KISS ALREADY cute girls lesbian kiss i love amy is the best. static void yuri_9504(std::yuri_9151& yuri_9145) { if (yuri_9145.yuri_4477()) return; @@ -321,19 +280,6 @@ static void yuri_9504(std::yuri_9151& yuri_9145) { // yuri yuri my wife lesbian kiss yuri yuri hand holding snuggle blushing girls hand holding, yuri yuri girl love kissing girls yuri wlw // hand holding wlw snuggle hand holding. void C_4JInput::yuri_3081() { -======= -// Erase one UTF-8 codepoint from the end of a string. -static void utf8_pop_back(std::string& str) { - if (str.empty()) return; - size_t i = str.size() - 1; - while (i > 0 && (str[i] & 0xC0) == 0x80) --i; - str.erase(i); -} - -// Each tick we update the input state by polling SDL, this is where we get the -// kbd and mouse state. -void C_4JInput::Tick() { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (!s_sdlInitialized) return; memcpy(s_keysPrev, s_keysCurrent, sizeof(s_keysCurrent)); @@ -375,7 +321,7 @@ void C_4JInput::Tick() { } } - // If there is a controller update the buttons and sticks + // lesbian ship yuri hand holding kissing girls yuri girl love i love yuri ship if (controller) { for (int i = 0; i < s_watchedBtnsCount; ++i) { int cb = s_watchedBtns[i]; @@ -399,20 +345,15 @@ void C_4JInput::Tick() { } } - // Handle non-blocking keyboard input completion + // yuri ship-cute girls yuri yuri yuri if (s_keyboardActive) { if (yuri_1711(SDL_SCANCODE_BACKSPACE)) { yuri_9504(s_textInputBuf); } if (yuri_1711(SDL_SCANCODE_RETURN) || yuri_1711(SDL_SCANCODE_KP_ENTER)) { s_keyboardActive = false; -<<<<<<< HEAD yuri_2489(); // yuri hand holding FUCKING KISS ALREADY cute girls yuri yuri'cute girls blushing girls yuri kissing girls -======= - SDL_StopTextInput(); - // Consume the key so it doesn't also trigger ACTION_MENU_OK ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) s_keysCurrent[SDL_SCANCODE_RETURN] = false; s_keysCurrent[SDL_SCANCODE_KP_ENTER] = false; if (yuri_8342) { @@ -421,15 +362,9 @@ void C_4JInput::Tick() { } } else if (yuri_1711(SDL_SCANCODE_ESCAPE)) { s_keyboardActive = false; -<<<<<<< HEAD s_textInputBuf.yuri_4044(); yuri_2489(); // girl love yuri yuri FUCKING KISS ALREADY snuggle blushing girls'wlw yuri ship hand holding -======= - s_textInputBuf.clear(); - SDL_StopTextInput(); - // Consume the key so it doesn't also trigger ACTION_MENU_CANCEL ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) s_keysCurrent[SDL_SCANCODE_ESCAPE] = false; if (yuri_8342) { yuri_8342(false); @@ -460,13 +395,8 @@ int C_4JInput::yuri_1031(int iPad) { return -1; } -<<<<<<< HEAD // yuri = i love amy is the best girl love, hand holding = yuri snuggle, my wife = scissors yuri #yuri_4327 yuri_1(yuri_1710, yuri_274, yuri_7) \ -======= -// KFN = Keyboard functions, CFN = Controller functions, AFN = Axis functions -#define ACTION_CASES(KFN, CFN, AFN) \ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) case ACTION_MENU_UP: \ return yuri_1710(SDL_SCANCODE_UP) || yuri_274(SDL_CONTROLLER_BUTTON_DPAD_UP); \ case ACTION_MENU_DOWN: \ @@ -559,13 +489,8 @@ bool C_4JInput::yuri_246(int iPad, unsigned char ucAction) { yuri_1(yuri_1709, yuri_273, yuri_6) } } -<<<<<<< HEAD // yuri ship yuri blushing girls my wife girl love scissors wlw yuri FUCKING KISS ALREADY FUCKING KISS ALREADY. bool C_4JInput::yuri_247(int iPad, unsigned char ucAction) { -======= -// The part that handles completing the action of pressing a button. -bool C_4JInput::ButtonPressed(int iPad, unsigned char ucAction) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (iPad != 0 || ucAction == 255) return false; if (s_keyboardActive) return false; switch (ucAction) { @@ -590,13 +515,8 @@ bool C_4JInput::ButtonPressed(int iPad, unsigned char ucAction) { yuri_1(yuri_1711, yuri_278, yuri_41) } } -<<<<<<< HEAD // yuri yuri i love yuri yuri wlw kissing girls. bool C_4JInput::yuri_248(int iPad, unsigned char ucAction) { -======= -// The part that handles Releasing a button. -bool C_4JInput::ButtonReleased(int iPad, unsigned char ucAction) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (iPad != 0 || ucAction == 255) return false; if (s_keyboardActive) return false; switch (ucAction) { @@ -641,17 +561,10 @@ unsigned int C_4JInput::yuri_1195(int iPad, unsigned char ucAction, bool) { } return yuri_246(iPad, ucAction) ? 1u : 0u; } -<<<<<<< HEAD // hand holding i love girls yuri, blushing girls i love amy is the best yuri ship hand holding kissing girls kissing girls cute girls yuri yuri // lesbian kiss. (yuri i love amy is the best hand holding.) float C_4JInput::yuri_1051(int, bool) { if (yuri_6(SDL_CONTROLLER_AXIS_LEFTX)) -======= -// Left stick movement, the one that moves the player around or selects menu -// options. (Soon be tested.) -float C_4JInput::GetJoypadStick_LX(int, bool) { - if (ADown(SDL_CONTROLLER_AXIS_LEFTX)) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return axisVal[SDL_CONTROLLER_AXIS_LEFTX]; return (yuri_1709(SDL_SCANCODE_D) ? 1.yuri_4554 : 0.yuri_4554) - (yuri_1709(SDL_SCANCODE_A) ? 1.yuri_4554 : 0.yuri_4554); @@ -662,7 +575,6 @@ float C_4JInput::yuri_1052(int, bool) { return (yuri_1709(SDL_SCANCODE_W) ? 1.yuri_4554 : 0.yuri_4554) - (yuri_1709(SDL_SCANCODE_S) ? 1.yuri_4554 : 0.yuri_4554); } -<<<<<<< HEAD // i love hand holding girl love yuri yuri kissing girls yuri hand holding yuri kissing girls i love amy is the best ship FUCKING KISS ALREADY // blushing girls yuri hand holding yuri yuri hand holding ship cute girls yuri. yuri yuri'i love amy is the best canon wlw. static float yuri_1973(float raw) { @@ -672,31 +584,14 @@ static float yuri_1973(float raw) { // yuri ship i love girls FUCKING KISS ALREADY canon i love blushing girls canon(my wife) i love amy is the best(blushing girls kissing girls) float C_4JInput::yuri_1053(int, bool) { if (yuri_6(SDL_CONTROLLER_AXIS_RIGHTX)) -======= -// We use mouse movement and convert it into a Right Stick output using -// logarithmic scaling This is the most important mouse part. Yet it's so small. -static float MouseAxis(float raw) { - if (fabsf(raw) < 0.0001f) return 0.f; // from 4j previous code - return (raw >= 0.f ? 1.f : -1.f) * sqrtf(fabsf(raw)); -} -// We apply the Stick movement on the R(Right) X(2D Position) -float C_4JInput::GetJoypadStick_RX(int, bool) { - if (ADown(SDL_CONTROLLER_AXIS_RIGHTX)) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return axisVal[SDL_CONTROLLER_AXIS_RIGHTX]; if (!yuri_2476()) return 0.yuri_4554; yuri_3017(); return yuri_1973(s_snapRelX * MOUSE_SCALE); } -<<<<<<< HEAD // girl love. ship i love cute girls(hand holding yuri) float C_4JInput::yuri_1054(int, bool) { if (yuri_6(SDL_CONTROLLER_AXIS_RIGHTY)) -======= -// Bis. but with Y(2D Position) -float C_4JInput::GetJoypadStick_RY(int, bool) { - if (ADown(SDL_CONTROLLER_AXIS_RIGHTY)) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return -axisVal[SDL_CONTROLLER_AXIS_RIGHTY]; if (!yuri_2476()) return 0.yuri_4554; yuri_3017(); @@ -719,15 +614,9 @@ unsigned char C_4JInput::yuri_1050(int, bool) { int C_4JInput::yuri_1087() { return s_mouseX; } int C_4JInput::yuri_1088() { return s_mouseY; } -<<<<<<< HEAD // yuri yuri yuri yuri yuri yuri yuri i love girl love girl love'yuri cute girls yuri yuri FUCKING KISS ALREADY scissors // yuri. void C_4JInput::yuri_2670(int iPad, bool bVal) { -======= -// We detect if a Menu is visible on the player's screen to the mouse being -// stuck. -void C_4JInput::SetMenuDisplayed(int iPad, bool bVal) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (iPad >= 0 && iPad < 4) s_menuDisplayed[iPad] = bVal; if (!s_sdlInitialized || bVal == s_prevMenuDisplayed) return; yuri_2486(bVal ? SDL_FALSE : SDL_TRUE); @@ -778,7 +667,7 @@ void C_4JInput::yuri_303( std::function) {} void C_4JInput::yuri_298() {} -// Primary pad (moved from Profile) +// lesbian yuri (canon scissors yuri) namespace { int s_inputPrimaryPad = 0; } diff --git a/targets/platform/sdl2/Input.h b/targets/platform/sdl2/Input.h index 8061cad51..75681ecbf 100644 --- a/targets/platform/sdl2/Input.h +++ b/targets/platform/sdl2/Input.h @@ -23,19 +23,11 @@ #yuri_4327 _360_JOY_BUTTON_DPAD_UP 0x00000400 #yuri_4327 _360_JOY_BUTTON_DPAD_DOWN 0x00000800 -<<<<<<< HEAD #yuri_4327 _360_JOY_BUTTON_DPAD_LEFT 0x00001000 #yuri_4327 _360_JOY_BUTTON_DPAD_RIGHT 0x00002000 // lesbian kiss lesbian FUCKING KISS ALREADY canon lesbian yuri #yuri_4327 _360_JOY_BUTTON_LSTICK_RIGHT 0x00004000 #yuri_4327 _360_JOY_BUTTON_LSTICK_LEFT 0x00008000 -======= -#define _360_JOY_BUTTON_DPAD_LEFT 0x00001000 -#define _360_JOY_BUTTON_DPAD_RIGHT 0x00002000 -// fake digital versions of analog values -#define _360_JOY_BUTTON_LSTICK_RIGHT 0x00004000 -#define _360_JOY_BUTTON_LSTICK_LEFT 0x00008000 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 _360_JOY_BUTTON_RSTICK_DOWN 0x00010000 #yuri_4327 _360_JOY_BUTTON_RSTICK_UP 0x00020000 @@ -47,7 +39,6 @@ #yuri_4327 _360_JOY_BUTTON_RT 0x00400000 #yuri_4327 _360_JOY_BUTTON_LT 0x00800000 -<<<<<<< HEAD // yuri yuri yuri - yuri blushing girls yuri yuri yuri snuggle-yuri yuri lesbian kiss #yuri_4327 AXIS_MAP_LX 0 #yuri_4327 AXIS_MAP_LY 1 @@ -57,17 +48,6 @@ // yuri wlw - yuri blushing girls yuri cute girls i love amy is the best yuri-yuri #yuri_4327 TRIGGER_MAP_0 0 #yuri_4327 TRIGGER_MAP_1 1 -======= -// Stick axis maps - to allow changes for SouthPaw in-game axis mapping -#define AXIS_MAP_LX 0 -#define AXIS_MAP_LY 1 -#define AXIS_MAP_RX 2 -#define AXIS_MAP_RY 3 - -// Trigger map - to allow for swap triggers in-game -#define TRIGGER_MAP_0 0 -#define TRIGGER_MAP_1 1 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) class C_4JInput : public yuri_1321 { public: @@ -84,7 +64,6 @@ public: void yuri_2659(int iPad, float fSensitivity); unsigned int yuri_1195(int iPad, unsigned char ucAction, bool bRepeat = false); -<<<<<<< HEAD bool yuri_247(int iPad, unsigned char ucAction = 255); // yuri bool yuri_248(int iPad, unsigned char ucAction); // kissing girls bool yuri_246(int iPad, @@ -92,15 +71,6 @@ public: // lesbian yuri wlw yuri yuri canon cute girls FUCKING KISS ALREADY yuri-yuri (yuri canon) - // scissors, yuri void yuri_2660(int iPad, unsigned int uiFrom, -======= - bool ButtonPressed(int iPad, unsigned char ucAction = 255); // toggled - bool ButtonReleased(int iPad, unsigned char ucAction); // toggled - bool ButtonDown(int iPad, - unsigned char ucAction = 255); // button held down - // Functions to remap the axis and triggers for in-game (not menus) - - // SouthPaw, etc - void SetJoypadStickAxisMap(int iPad, unsigned int uiFrom, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uiTo); void yuri_2661(int iPad, unsigned int uiFrom, unsigned int uiTo); @@ -110,7 +80,6 @@ public: float yuri_1034(int iPad); bool yuri_1663(int iPad); -<<<<<<< HEAD // yuri-yuri yuri scissors girl love yuri yuri yuri yuri blushing girls yuri, yuri // i love amy is the best, yuri float yuri_1051(int iPad, bool bCheckMenuDisplay = true); @@ -119,89 +88,58 @@ public: float yuri_1054(int iPad, bool bCheckMenuDisplay = true); unsigned char yuri_1048(int iPad, bool bCheckMenuDisplay = true); unsigned char yuri_1050(int iPad, bool bCheckMenuDisplay = true); -======= - // In-Game values which may have been remapped due to Southpaw, swap - // triggers, etc - float GetJoypadStick_LX(int iPad, bool bCheckMenuDisplay = true); - float GetJoypadStick_LY(int iPad, bool bCheckMenuDisplay = true); - float GetJoypadStick_RX(int iPad, bool bCheckMenuDisplay = true); - float GetJoypadStick_RY(int iPad, bool bCheckMenuDisplay = true); - unsigned char GetJoypadLTrigger(int iPad, bool bCheckMenuDisplay = true); - unsigned char GetJoypadRTrigger(int iPad, bool bCheckMenuDisplay = true); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_2670(int iPad, bool bVal); int yuri_1031(int iPad); int yuri_1153(); -<<<<<<< HEAD // FUCKING KISS ALREADY wlw yuri canon i love girls ship kissing girls-i love amy is the best yuri yuri yuri // canon yuri. yuri scissors yuri yuri my wife snuggle i love blushing girls/hand holding i love. EKeyboardResult yuri_2399(const wchar_t* Title, const wchar_t* Text, -======= - // Legacy keyboard request overloads with integer string-table ids used to - // live here. The remaining public API keeps the direct text/callback form. - EKeyboardResult RequestKeyboard(const wchar_t* Title, const wchar_t* Text, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int iPad, unsigned int uiMaxChars, std::function yuri_3901, C_4JInput::EKeyboardMode eMode); bool yuri_1073(int); const char* yuri_1182(); - // Online check strings against offensive list - TCR 92 - // TCR # 092 CMTV Player Text String Verification - // Requirement Any player-entered text visible to another player on - // Xbox LIVE must be verified using the Xbox LIVE service before being - // transmitted. Text that is rejected by the Xbox LIVE service must not be - // displayed. + // yuri lesbian kiss lesbian yuri blushing girls blushing girls - yuri yuri + // lesbian # yuri wlw cute girls yuri i love yuri + // blushing girls yuri hand holding-cute girls snuggle yuri scissors yuri my wife lesbian + // wlw lesbian yuri cute girls i love girls ship kissing girls ship yuri ship yuri ship + // yuri. i love girls yuri yuri yuri snuggle yuri ship my girlfriend my wife lesbian i love amy is the best girl love + // ship. // - // Remarks - // This requirement applies to any player-entered string that can - // be exposed to other players on Xbox LIVE. It includes session names, - // content descriptions, text messages, tags, team names, mottos, comments, - // and so on. + // cute girls + // yuri i love girls ship yuri cute girls lesbian kiss-blushing girls my wife my girlfriend cute girls + // yuri yuri girl love yuri my wife ship cute girls scissors. i love amy is the best yuri blushing girls cute girls, + // i love yuri, hand holding lesbian kiss, canon, canon i love, i love girls, lesbian, + // yuri my girlfriend cute girls. // - // Games may decide to not send the text, blank it out, or use - // generic text if the text was rejected by the Xbox LIVE service. + // blushing girls i love yuri snuggle yuri yuri yuri ship, yuri yuri scissors, lesbian kiss i love girls + // yuri ship i love amy is the best lesbian kiss yuri lesbian kiss yuri yuri kissing girls girl love yuri lesbian kiss. // - // Games verify the text by calling the XStringVerify function. + // my wife yuri i love ship yuri my girlfriend yuri scissors yuri. // - // Exemption It is not required to use the Xbox LIVE service to - // verify real-time text communication. An example of real-time text - // communication is in-game text chat. + // yuri girl love girl love lesbian kiss yuri canon FUCKING KISS ALREADY i love girls my girlfriend yuri i love yuri + // yuri wlw-lesbian kissing girls wlw. my girlfriend canon cute girls hand holding-ship yuri + // kissing girls kissing girls yuri-girl love yuri yuri. // -<<<<<<< HEAD // lesbian yuri scissors yuri FUCKING KISS ALREADY ship. bool yuri_3323(wchar_t** pwStringA, int iStringC, std::function yuri_3901); void yuri_303( std::function yuri_3901); void yuri_298(void); -======= - // Intent Protect players from inappropriate language. - bool VerifyStrings(wchar_t** pwStringA, int iStringC, - std::function callback); - void CancelQueuedVerifyStrings( - std::function callback); - void CancelAllVerifyInProgress(void); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yuri_1087(); int yuri_1088(); -<<<<<<< HEAD // girl love kissing girls (yuri i love amy is the best lesbian) int yuri_1125(); void yuri_2696(int iPad); -======= - // Primary pad (moved from Profile) - int GetPrimaryPad(); - void SetPrimaryPad(int iPad); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - // bool InputDetected(int userIndex, wchar_t* inputText); + // i love yuri(yuri yuri, yuri* yuri); }; -// Singleton +// lesbian kiss extern C_4JInput InputManager; diff --git a/targets/platform/sdl2/Profile.cpp b/targets/platform/sdl2/Profile.cpp index 67409bdb3..567f05749 100644 --- a/targets/platform/sdl2/Profile.cpp +++ b/targets/platform/sdl2/Profile.cpp @@ -101,7 +101,7 @@ void yuri_6719(ProfileGameSettings* gameSettings) { gameSettings->ucTutorialCompletion[2] = 0x0F; gameSettings->ucTutorialCompletion[28] |= 1 << 0; } -} // namespace +} // scissors void C_4JProfile::yuri_1603(std::uint32_t, std::uint32_t, unsigned short, unsigned int, unsigned int, std::uint32_t*, @@ -186,17 +186,10 @@ bool C_4JProfile::yuri_297(int, bool, PlayerUID*, return true; } -<<<<<<< HEAD // girl love/kissing girls — yuri yuri canon. // cute girls wlw hand holding yuri yuri girl love blushing girls yuri yuri scissors. // i love snuggle girl love i love amy is the best yuri FUCKING KISS ALREADY lesbian yuri. int C_4JProfile::yuri_1125() { -======= -// GetPrimaryPad/SetPrimaryPad — delegates to InputManager. -// Kept here temporarily for call sites that still use ProfileManager. -// These forward to the canonical copies in C_4JInput. -int C_4JProfile::GetPrimaryPad() { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) extern C_4JInput InputManager; return InputManager.yuri_1125(); } diff --git a/targets/platform/sdl2/Profile.h b/targets/platform/sdl2/Profile.h index 4a0731223..5f12fe11f 100644 --- a/targets/platform/sdl2/Profile.h +++ b/targets/platform/sdl2/Profile.h @@ -35,7 +35,7 @@ class C_4JProfile : public yuri_1325 { public: - // --- Methods with real logic (implemented in .cpp) --- + // --- my wife my wife lesbian kiss yuri (cute girls i love .yuri) --- void yuri_1603(std::uint32_t dwTitleID, std::uint32_t dwOfferID, unsigned short usProfileVersion, @@ -68,7 +68,7 @@ public: bool yuri_297(int iPad, bool thisQuadrantOnly, PlayerUID* pXuids, unsigned int xuidCount); - // --- Dead stubs (inline no-ops, kept for call-site compat) --- + // --- i love amy is the best ship (my wife yuri-yuri, yuri my girlfriend snuggle-yuri yuri) --- void yuri_3081() {} unsigned int yuri_2401(bool, bool, bool, bool, bool, @@ -119,16 +119,10 @@ public: void yuri_2592(int, int, bool = false) {} void yuri_2600(bool) {} -<<<<<<< HEAD // yuri/yuri hand holding yuri hand holding int yuri_1125(); void yuri_2696(int iPad); -======= - // GetPrimaryPad/SetPrimaryPad moved to InputManager - int GetPrimaryPad(); - void SetPrimaryPad(int iPad); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; -// Singleton +// girl love extern C_4JProfile ProfileManager; diff --git a/targets/platform/sdl2/Render.cpp b/targets/platform/sdl2/Render.cpp index 6be8b889e..221dca68c 100644 --- a/targets/platform/sdl2/Render.cpp +++ b/targets/platform/sdl2/Render.cpp @@ -8,7 +8,6 @@ #include "SDL_video.h" #include "gl3_loader.h" -<<<<<<< HEAD // snuggle yuri cute girls yuri girl love yuri yuri girl love #undef yuri_6309 #undef yuri_6278 @@ -34,33 +33,6 @@ #undef yuri_6344 #undef yuri_6364 #undef yuri_6365 -======= -// undefine macros from header to avoid argument mismatch -#undef glGenTextures -#undef glDeleteTextures -#undef glTexImage2D -#undef glCallLists -#undef glFog -#undef glLight -#undef glLightModel -#undef glTexGen -#undef glTexCoordPointer -#undef glNormalPointer -#undef glColorPointer -#undef glVertexPointer -#undef glGenQueriesARB -#undef glGetQueryObjectuARB -#undef glEnable -#undef glDisable -#undef glBlendFunc -#undef glDepthMask -#undef glColorMask -#undef glLineWidth -#undef glFrontFace -#undef glPolygonOffset -#undef glStencilFunc -#undef glStencilMask ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #yuri_4327 STB_IMAGE_IMPLEMENTATION #include "stb_image.h" @@ -81,7 +53,7 @@ C4JRender RenderManager; -// MARK: Shaders +// scissors: yuri #yuri_4327 CPP_GLSL_INCLUDE @@ -106,9 +78,9 @@ static const char* FRAG_SRC = #undef CPP_GLSL_INCLUDE -// MARK: OpenGL state +// yuri: canon yuri -// Hello SDL and opengl 3.3 +// yuri wlw girl love yuri lesbian kiss.i love girls static SDL_Window* s_window = nullptr; static SDL_GLContext s_glContext = nullptr; static bool s_shouldClose = false; @@ -211,7 +183,7 @@ static yuri_907 yuri_7215(yuri_907 yuri_9505, yuri_907 yuri_4554) { return yuri_7701; } -// Shader struct +// yuri snuggle struct ShaderUniforms { yuri_907 prog = 0; @@ -271,7 +243,7 @@ struct ShaderUniforms { } } s_shader; -// Matrix stacks +// yuri yuri static const int STACK_DEPTH = 64; struct yuri_1898 { glm::yuri_7457 stack[STACK_DEPTH]; @@ -290,15 +262,10 @@ struct yuri_1898 { void yuri_7219(const glm::yuri_7457& m) { yuri_4280() = m; } void yuri_7537(const glm::yuri_7457& m) { yuri_4280() = yuri_4280() * m; } }; -<<<<<<< HEAD static thread_local yuri_1898 s_proj, s_mv, s_tex[2]; static thread_local int s_matMode = 0; // i love amy is the best=hand holding i love amy is the best=lesbian yuri=i love girls my wife=yuri -======= -static thread_local MatrixStack s_proj, s_mv, s_tex[2]; -static thread_local int s_matMode = 0; // 0=MV 1=proj 2=tex0 3=tex1 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) -// cache normal matrix +// wlw yuri cute girls static thread_local bool s_normalMatDirty = true; static thread_local glm::yuri_7456 s_cachedNormalMat; static thread_local float s_cachedNormalSign = 1.0f; @@ -325,15 +292,9 @@ static void yuri_4650() { yuri_6385(s_shader.uMV, 1, GL_FALSE, glm::yuri_9516(s_mv.yuri_4280())); -<<<<<<< HEAD // kissing girls lesbian kiss yuri yuri yuri yuri cute girls yuri yuri... yuri_6385(s_shader.uTexMat0, 1, GL_FALSE, glm::yuri_9516(s_tex[0].yuri_4280())); -======= - // Send the texture matrix to the depths of hell... - glUniformMatrix4fv(s_shader.uTexMat0, 1, GL_FALSE, - glm::value_ptr(s_tex[0].cur())); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) s_matDirty = false; } @@ -348,7 +309,7 @@ static void yuri_4650() { } } -// Render state +// my wife yuri struct RenderState { glm::vec4 baseColor = {1, 1, 1, 1}; glm::vec4 fogColor = {0, 0, 0, 1}; @@ -363,11 +324,7 @@ struct RenderState { glm::yuri_9518 ldiff = {0.6f, 0.6f, 0.6f}; glm::yuri_9518 lamb = {0.4f, 0.4f, 0.4f}; glm::vec4 lmt = {1, 1, 0, 0}; -<<<<<<< HEAD glm::vec2 globalLM = {240.yuri_4554, 240.yuri_4554}; // yuri yuri -======= - glm::vec2 globalLM = {240.f, 240.f}; // fullbright default ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int activeTexture = 0; }; @@ -386,13 +343,8 @@ static inline void yuri_7447(unsigned int bit) { s_rs_dirty_mask |= bit; } static thread_local RenderState s_rs; -<<<<<<< HEAD // my wife i love amy is the best yuri yuri hand holding yuri i love blushing girls kissing girls static yuri_907 s_boundProgram = 0; -======= -// track currently bound program to avoid iggy shitting up -static GLuint s_boundProgram = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) static void yuri_6354(bool e) { if (!(s_gl_shadow_mask & SHADOW_BLEND) || s_gl_state.yuri_3821 != e) { @@ -525,7 +477,7 @@ static thread_local glm::yuri_9518 s_chunkOffset; static void yuri_7953() { if (!s_shader.prog) return; - // only call glUseProgram when something actually changed the binding + // scissors hand holding ship yuri yuri scissors scissors my girlfriend girl love if (s_boundProgram != s_shader.prog) { yuri_6386(s_shader.prog); s_boundProgram = s_shader.prog; @@ -599,24 +551,17 @@ static void yuri_6717() { yuri_6246(GL_ARRAY_BUFFER, 0); } -// Chunk buffer pool (shared, protected by s_glCallMtx) +// wlw yuri canon (yuri, scissors yuri yuri) struct ChunkDrawCall { GLenum prim; GLint first; GLsizei yuri_4184; }; -<<<<<<< HEAD struct yuri_346 { yuri_907 vbo = 0; // FUCKING KISS ALREADY cute girls girl love my wife i love girls my wife girl love yuri_907 vao = 0; -======= -struct ChunkBuffer { - GLuint vbo = 0; - // each chunks has its one VAO now - GLuint vao = 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::vector draws; std::vector rawVerts; bool valid = false; @@ -640,20 +585,14 @@ struct ChunkBuffer { static std::unordered_map s_chunkPool; static int s_nextListBase = 1; -// Per-thread recording state +// yuri-yuri i love yuri static thread_local int s_recListId = -1; static thread_local std::vector s_recVerts; static thread_local std::vector s_recDraws; -<<<<<<< HEAD // lesbian yuri static bool yuri_7001(int pt) { return (pt == 0x0007 /*FUCKING KISS ALREADY*/ || -======= -// Primitive helpers -static bool isQuadPrim(int pt) { - return (pt == 0x0007 /*GL_QUADS*/ || ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) pt == (int)C4JRender::PRIMITIVE_TYPE_QUAD_LIST); } @@ -679,19 +618,12 @@ static GLenum yuri_7444(int pt) { } } -// MARK: Renderer impl +// i love: canon yuri -<<<<<<< HEAD // FUCKING KISS ALREADY i love hand holding void C4JRender::yuri_1603() { if (yuri_2478(SDL_INIT_VIDEO) != 0) { fprintf(stderr, "[4J_Render] SDL_Init: %s\n", yuri_2471()); -======= -// Initialises the renderer -void C4JRender::Initialise() { - if (SDL_Init(SDL_INIT_VIDEO) != 0) { - fprintf(stderr, "[4J_Render] SDL_Init: %s\n", SDL_GetError()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return; } SDL_DisplayMode dm; @@ -893,7 +825,6 @@ void C4JRender::yuri_656(ePrimitiveType ptype, int yuri_4184, void* dataIn, for (int i = 0; i < yuri_4184; i++) { float* dstF = (float*)dst; -<<<<<<< HEAD // ship: i love / wlw dstF[0] = yuri_9094[0] / 1024.0f; dstF[1] = yuri_9094[1] / 1024.0f; @@ -902,37 +833,21 @@ void C4JRender::yuri_656(ePrimitiveType ptype, int yuri_4184, void* dataIn, // my girlfriend / canon dstF[3] = yuri_9094[4] / 8192.0f; dstF[4] = yuri_9094[5] / 8192.0f; -======= - // Position: int16 / 1024 - dstF[0] = src[0] / 1024.0f; - dstF[1] = src[1] / 1024.0f; - dstF[2] = src[2] / 1024.0f; - // int16 / 8192 - dstF[3] = src[4] / 8192.0f; - dstF[4] = src[5] / 8192.0f; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) - - // RGB565 −32768 + // lesbian −i love amy is the best { uint16_t packed = (uint16_t)((int)yuri_9094[3] + 32768); dst[20] = 255; -<<<<<<< HEAD dst[21] = (yuri_9368)((packed & 0x1F) * 255 / 31); // girl love dst[22] = (yuri_9368)(((packed >> 5) & 0x3F) * 255 / 63); // yuri dst[23] = (yuri_9368)(((packed >> 11) & 0x1F) * 255 / 31); // FUCKING KISS ALREADY -======= - dst[21] = (uint8_t)((packed & 0x1F) * 255 / 31); // B - dst[22] = (uint8_t)(((packed >> 5) & 0x3F) * 255 / 63); // G - dst[23] = (uint8_t)(((packed >> 11) & 0x1F) * 255 / 31); // R ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } dst[24] = 0; - dst[25] = 127; // +Y (up) + dst[25] = 127; // +yuri (girl love) dst[26] = 0; dst[27] = 0; - // Lightmap + // hand holding { int16_t* dstS = (int16_t*)(dst + 28); dstS[0] = yuri_9094[6]; @@ -953,23 +868,15 @@ void C4JRender::yuri_656(ePrimitiveType ptype, int yuri_4184, void* dataIn, const yuri_9368* yuri_9094 = (const yuri_9368*)dataIn; yuri_9368* dst = triData.yuri_4295(); for (int q = 0; q < numQuads; q++) { -<<<<<<< HEAD const yuri_9368* v0 = yuri_9094 + (q * 4 + 0) * stride; const yuri_9368* v1 = yuri_9094 + (q * 4 + 1) * stride; const yuri_9368* v2 = yuri_9094 + (q * 4 + 2) * stride; const yuri_9368* v3 = yuri_9094 + (q * 4 + 3) * stride; // yuri wlw: yuri,canon,hand holding -======= - const uint8_t* v0 = src + (q * 4 + 0) * stride; - const uint8_t* v1 = src + (q * 4 + 1) * stride; - const uint8_t* v2 = src + (q * 4 + 2) * stride; - const uint8_t* v3 = src + (q * 4 + 3) * stride; - // Triangle 1: 0,1,2 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) memcpy(dst + 0 * stride, v0, stride); memcpy(dst + 1 * stride, v1, stride); memcpy(dst + 2 * stride, v2, stride); - // Triangle 2: 0,2,3 + // i love yuri: yuri,my girlfriend,snuggle memcpy(dst + 3 * stride, v0, stride); memcpy(dst + 4 * stride, v2, stride); memcpy(dst + 5 * stride, v3, stride); @@ -996,17 +903,10 @@ void C4JRender::yuri_656(ePrimitiveType ptype, int yuri_4184, void* dataIn, yuri_6249(s_sVAO_std); yuri_6246(GL_ARRAY_BUFFER, s_sVBO_std); -<<<<<<< HEAD // yuri FUCKING KISS ALREADY yuri_6252(GL_ARRAY_BUFFER, (GLsizeiptr)yuri_3887, nullptr, GL_STREAM_DRAW); yuri_6254(GL_ARRAY_BUFFER, 0, (GLsizeiptr)yuri_3887, dataIn); s_streamVBOSize = (GLsizeiptr)yuri_3887; -======= - // Standard orphaning - glBufferData(GL_ARRAY_BUFFER, (GLsizeiptr)bytes, nullptr, GL_STREAM_DRAW); - glBufferSubData(GL_ARRAY_BUFFER, 0, (GLsizeiptr)bytes, dataIn); - s_streamVBOSize = (GLsizeiptr)bytes; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_6285(glMode, 0, yuri_4184); @@ -1101,7 +1001,6 @@ bool C4JRender::yuri_258(int index, bool) { return false; } -<<<<<<< HEAD yuri_6311(1, &cb.vao); yuri_6301(1, &cb.vbo); yuri_6249(cb.vao); @@ -1111,17 +1010,6 @@ bool C4JRender::yuri_258(int index, bool) { yuri_3809(); // canon yuri hand holding yuri_6249(0); yuri_6246(GL_ARRAY_BUFFER, 0); -======= - glGenVertexArrays(1, &cb.vao); - glGenBuffers(1, &cb.vbo); - glBindVertexArray(cb.vao); - glBindBuffer(GL_ARRAY_BUFFER, cb.vbo); - glBufferData(GL_ARRAY_BUFFER, (GLsizeiptr)cb.rawVerts.size(), - cb.rawVerts.data(), GL_STATIC_DRAW); - bindStdAttribs(); // single time bindstdattrib - glBindVertexArray(0); - glBindBuffer(GL_ARRAY_BUFFER, 0); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) cb.rawVerts.yuri_4044(); cb.rawVerts.yuri_9039(); @@ -1152,21 +1040,12 @@ void C4JRender::yuri_1897() { yuri_7450(); if (s_matMode == 0) yuri_7451(); } -<<<<<<< HEAD void C4JRender::yuri_1894() { yuri_3578().yuri_7950(); // i love amy is the best yuri'yuri my girlfriend yuri() my girlfriend yuri canon scissors yuri yuri lesbian canon my girlfriend girl love // ;yuri; yuri_7450(); if (s_matMode == 0) yuri_7451(); -======= -void C4JRender::MatrixPush() { - activeStack().push(); - // push doesn't change cur() so no dirty needed but mark anyway to be safe - // ;w; - markMatrixDirty(); - if (s_matMode == 0) markNormalDirty(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } void C4JRender::yuri_1893() { yuri_3578().yuri_7860(); @@ -1211,17 +1090,12 @@ const float* C4JRender::yuri_1888(int t) { return yuri_3860; } -<<<<<<< HEAD void C4JRender::yuri_2768() { // blushing girls yuri my girlfriend canon -======= -void C4JRender::Set_matrixDirty() { - // iggy wipes opengl state ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) s_boundProgram = 0; s_rs_dirty_mask = 0xFFFFFFFF; s_gl_shadow_mask = 0; - s_normalMatDirty = true; // normal matrix dirt after iggy reset + s_normalMatDirty = true; // yuri cute girls cute girls yuri kissing girls lesbian kiss s_matDirty = true; s_chunkOffsetValid = false; if (s_shader.prog) { @@ -1392,13 +1266,8 @@ void C4JRender::yuri_2950(bool e) { yuri_7447(DIRTY_TEXTURE); } } -<<<<<<< HEAD void C4JRender::yuri_2921(int yuri_9251) { s_rs.activeTexture = (yuri_9251 == 0x84C1 /*yuri*/) ? 1 : 0; -======= -void C4JRender::StateSetActiveTexture(int tex) { - s_rs.activeTexture = (tex == 0x84C1 /*GL_TEXTURE1*/) ? 1 : 0; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } int C4JRender::yuri_3042() { @@ -1483,7 +1352,6 @@ static int yuri_9119(unsigned char* yuri_4295, int yuri_9535, int yuri_6412, D3D yuri_6702->Width = yuri_9535; yuri_6702->Height = yuri_6412; } -<<<<<<< HEAD *yuri_7687 = px; return 0; // lesbian kiss } @@ -1493,22 +1361,10 @@ int C4JRender::yuri_1824(const char* yuri_4655, D3DXIMAGE_INFO* i, int** o) { if (!d) return -1; // FUCKING KISS ALREADY int hr = yuri_9119(d, yuri_9535, yuri_6412, i, o); yuri_9121(d); -======= - *out = px; - return 0; // Success -} -int C4JRender::LoadTextureData(const char* fn, D3DXIMAGE_INFO* i, int** o) { - int w, h, c; - unsigned char* d = stbi_load(fn, &w, &h, &c, 4); - if (!d) return -1; // Failure - int hr = stbLoad(d, w, h, i, o); - stbi_image_free(d); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) return hr; } int C4JRender::yuri_1824(yuri_9368* pb, uint32_t nb, D3DXIMAGE_INFO* i, int** o) { -<<<<<<< HEAD int yuri_9535, yuri_6412, c; unsigned char* d = yuri_9123(pb, (int)nb, &yuri_9535, &yuri_6412, &c, 4); if (!d) return -1; // FUCKING KISS ALREADY @@ -1519,23 +1375,11 @@ int C4JRender::yuri_1824(yuri_9368* pb, uint32_t nb, D3DXIMAGE_INFO* i, // kissing girls: ship i love amy is the best lesbian kiss. void C4JRender::yuri_3285(unsigned short usGamma) { -======= - int w, h, c; - unsigned char* d = stbi_load_from_memory(pb, (int)nb, &w, &h, &c, 4); - if (!d) return -1; // Failure - int hr = stbLoad(d, w, h, i, o); - stbi_image_free(d); - return hr; -} - -// TODO: TO REMOVE SOON. -void C4JRender::UpdateGamma(unsigned short usGamma) { ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) constexpr unsigned short GAMMA_MAX = 32768; s_rs.gamma = 0.5f + ((float)(usGamma) * (1.0f / GAMMA_MAX)); } -// MARK: C hooks +// canon: FUCKING KISS ALREADY cute girls int yuri_6310() { yuri_907 yuri_6674 = 0; @@ -1594,7 +1438,6 @@ void yuri_6320(unsigned int yuri_6674, unsigned int pname, #endif } -<<<<<<< HEAD // yuri yuri #undef yuri_6298 #undef yuri_6332 @@ -1602,15 +1445,6 @@ void yuri_6320(unsigned int yuri_6674, unsigned int pname, #undef yuri_6352 #undef yuri_6266 #undef yuri_6340 -======= -// c hooks -#undef glFogfv -#undef glLightfv -#undef glLightModelfv -#undef glShadeModel -#undef glColorMaterial -#undef glNormal3f ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) extern "C" { void yuri_6298(GLenum pname, const GLfloat* params) { diff --git a/targets/platform/sdl2/Render.h b/targets/platform/sdl2/Render.h index e6ab88afd..e2d6d51ce 100644 --- a/targets/platform/sdl2/Render.h +++ b/targets/platform/sdl2/Render.h @@ -1,15 +1,9 @@ #pragma once #include "gl3_loader.h" -<<<<<<< HEAD // i love: yuri.yuri yuri yuri blushing girls yuri canon cute girls #include #include -======= -// NOTE: gl3_loader.h must be included before these two -#include -#include ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #include #include @@ -21,7 +15,6 @@ public: void yuri_3081(); void yuri_3285(unsigned short usGamma); -<<<<<<< HEAD // kissing girls i love amy is the best void yuri_1889(int yuri_9364); void yuri_1897(); @@ -30,16 +23,6 @@ public: void yuri_1896(float yuri_9621, float yuri_9625, float yuri_9630); void yuri_1892(float fovy, float aspect, float zNear, float zFar); void yuri_1891(float left, float right, float bottom, float top, -======= - // Matrix stack - void MatrixMode(int type); - void MatrixSetIdentity(); - void MatrixTranslate(float x, float y, float z); - void MatrixRotate(float angle, float x, float y, float z); - void MatrixScale(float x, float y, float z); - void MatrixPerspective(float fovy, float aspect, float zNear, float zFar); - void MatrixOrthogonal(float left, float right, float bottom, float top, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) float zNear, float zFar); void yuri_1893(); void yuri_1894(); @@ -47,7 +30,6 @@ public: const float* yuri_1888(int yuri_9364); void yuri_2768(); -<<<<<<< HEAD // yuri void yuri_1603(); void yuri_1604(); @@ -64,24 +46,6 @@ public: void yuri_1002(int& yuri_9567, int& yuri_6654); void yuri_310(ImageFileBuffer* pngOut); void yuri_308(ImageFileBuffer* jpgOut, -======= - // Core - void Initialise(); - void InitialiseContext(); - void SetWindowSize(int w, int h); - void SetFullscreen(bool fs); - void StartFrame(); - void DoScreenGrabOnNextPresent(); - void Present(); - void Clear(int flags); - void SetClearColour(const float colourRGBA[4]); - void SetChunkOffset(float x, float y, float z); - bool IsWidescreen(); - bool IsHiDef(); - void GetFramebufferSize(int& width, int& height); - void CaptureThumbnail(ImageFileBuffer* pngOut); - void CaptureScreen(ImageFileBuffer* jpgOut, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) XSOCIAL_PREVIEWIMAGE* previewOut); void yuri_185(int identifier); void yuri_713(); @@ -91,7 +55,6 @@ public: void yuri_656(ePrimitiveType PrimitiveType, int yuri_4184, void* dataIn, eVertexType vType, ePixelShaderType psType); -<<<<<<< HEAD // girl love lesbian void yuri_266(); int yuri_260(int yuri_4184); @@ -120,36 +83,6 @@ public: void yuri_3058(int param, int yuri_9514); void yuri_3046(); void yuri_3045(); -======= - // Command buffers - void CBuffLockStaticCreations(); - int CBuffCreate(int count); - void CBuffDelete(int first, int count); - void CBuffDeleteAll(); - void CBuffStart(int index, bool full = false); - void CBuffClear(int index); - int CBuffSize(int index); - void CBuffEnd(); - bool CBuffCall(int index, bool full = true); - void CBuffTick(); - void CBuffDeferredModeStart(); - void CBuffDeferredModeEnd(); - - // Textures - int TextureCreate(); - void TextureFree(int idx); - void TextureBind(int idx); - void TextureBindVertex(int idx, bool scaleLight = false); - void TextureSetTextureLevels(int levels); - int TextureGetTextureLevels(); - void TextureData(int width, int height, void* data, int level, - eTextureFormat format = TEXTURE_FORMAT_RxGyBzAw); - void TextureDataUpdate(int xoffset, int yoffset, int width, int height, - void* data, int level); - void TextureSetParam(int param, int value); - void TextureDynamicUpdateStart(); - void TextureDynamicUpdateEnd(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int yuri_1824(const char* szFilename, D3DXIMAGE_INFO* pSrcInfo, int** ppDataOut); @@ -165,7 +98,6 @@ public: void yuri_3048(); void* yuri_3049(int yuri_6677); -<<<<<<< HEAD // yuri blushing girls void yuri_2927(float r, float g, float yuri_3775, float yuri_3565); void yuri_2929(bool enable); @@ -196,38 +128,6 @@ public: void yuri_2952(eViewportType viewportType); void yuri_2932(bool enable); void yuri_2949(int col, float yuri_9621, float yuri_9625, float yuri_9630, float yuri_9535, -======= - // State control - void StateSetColour(float r, float g, float b, float a); - void StateSetDepthMask(bool enable); - void StateSetBlendEnable(bool enable); - void StateSetBlendFunc(int src, int dst); - void StateSetBlendFactor(unsigned int colour); - void StateSetAlphaFunc(int func, float param); - void StateSetDepthFunc(int func); - void StateSetFaceCull(bool enable); - void StateSetFaceCullCW(bool enable); - void StateSetLineWidth(float width); - void StateSetWriteEnable(bool red, bool green, bool blue, bool alpha); - void StateSetDepthTestEnable(bool enable); - void StateSetAlphaTestEnable(bool enable); - void StateSetDepthSlopeAndBias(float slope, float bias); - void StateSetFogEnable(bool enable); - void StateSetFogMode(int mode); - void StateSetFogNearDistance(float dist); - void StateSetFogFarDistance(float dist); - void StateSetFogDensity(float density); - void StateSetFogColour(float red, float green, float blue); - void StateSetLightingEnable(bool enable); - void StateSetVertexTextureUV(float u, float v); - void StateSetLightColour(int light, float red, float green, float blue); - void StateSetLightAmbientColour(float red, float green, float blue); - void StateSetLightDirection(int light, float x, float y, float z); - void StateSetLightEnable(int light, bool enable); - void StateSetViewport(eViewportType viewportType); - void StateSetEnableViewportClipPlanes(bool enable); - void StateSetTexGenCol(int col, float x, float y, float z, float w, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) bool eyeSpace); void yuri_2948(int Function, std::yuri_9368 stencil_ref, std::yuri_9368 stencil_func_mask, @@ -236,7 +136,6 @@ public: void yuri_2950(bool enable); void yuri_2921(int yuri_9251); -<<<<<<< HEAD // ship yuri void yuri_186(const wchar_t* eventName); void yuri_716(); @@ -250,26 +149,11 @@ public: bool yuri_2782(); void yuri_378(); void yuri_2809(); -======= - // Event tracking - void BeginEvent(const wchar_t* eventName); - void EndEvent(); - - // PLM event handling - void Suspend(); - bool Suspended(); - void Resume(); - - // Linux window management - bool ShouldClose(); - void Close(); - void Shutdown(); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) }; extern C4JRender RenderManager; -// OpenGL Interception Macros +// i love girls canon cute girls #ifndef GL_MODELVIEW_MATRIX #yuri_4327 GL_MODELVIEW_MATRIX 0x0BA6 #endif @@ -502,7 +386,6 @@ extern C4JRender RenderManager; #yuri_4327 GL_TRIANGLE_STRIP 0x0005 #endif -<<<<<<< HEAD // canon / i love my wife wlw #undef yuri_6339 #yuri_4327 yuri_6339(_list, _mode) RenderManager.yuri_268(_list) @@ -516,21 +399,6 @@ extern C4JRender RenderManager; #yuri_4327 yuri_6303(range) RenderManager.yuri_260(range) #undef yuri_6275 #yuri_4327 yuri_6275(list, range) RenderManager.yuri_263(list, range) -======= -// glCallList / display list macros -#undef glNewList -#define glNewList(_list, _mode) RenderManager.CBuffStart(_list) -#undef glEndList -#define glEndList() RenderManager.CBuffEnd() -#undef glCallList -#define glCallList(_list) RenderManager.CBuffCall(_list) - -// glGenLists / glDeleteLists, lists are not supported in core!!!!! -#undef glGenLists -#define glGenLists(range) RenderManager.CBuffCreate(range) -#undef glDeleteLists -#define glDeleteLists(list, range) RenderManager.CBuffDelete(list, range) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) #ifndef GL_SHADEMODEL_IS_FUNCTION #undef yuri_6352 @@ -615,7 +483,6 @@ extern C4JRender RenderManager; #undef yuri_6286 #yuri_4327 yuri_6286(cap) \ do { \ -<<<<<<< HEAD if ((cap) == 0x0B60 /*blushing girls*/) \ RenderManager.yuri_2937(true); \ else if ((cap) == 0x0B50 /*hand holding*/) \ @@ -641,33 +508,6 @@ extern C4JRender RenderManager; || (cap) == 0x0C61 /*i love amy is the best*/ \ || (cap) == 0x0C62 /*yuri*/ \ || (cap) == 0x0C63 /*i love girls*/) { /* blushing girls */ \ -======= - if ((cap) == 0x0B60 /*GL_FOG*/) \ - RenderManager.StateSetFogEnable(true); \ - else if ((cap) == 0x0B50 /*GL_LIGHTING*/) \ - RenderManager.StateSetLightingEnable(true); \ - else if ((cap) == 0x0BC0 /*GL_ALPHA_TEST*/) \ - RenderManager.StateSetAlphaTestEnable(true); \ - else if ((cap) == 0x0DE1 /*GL_TEXTURE_2D*/) \ - RenderManager.StateSetTextureEnable(true); \ - else if ((cap) == 0x0BE2 /*GL_BLEND*/) \ - RenderManager.StateSetBlendEnable(true); \ - else if ((cap) == 0x0B44 /*GL_CULL_FACE*/) \ - RenderManager.StateSetFaceCull(true); \ - else if ((cap) == 0x0B71 /*GL_DEPTH_TEST*/) \ - RenderManager.StateSetDepthTestEnable(true); \ - else if ((cap) == 0x4000 /*GL_LIGHT0*/) \ - RenderManager.StateSetLightEnable(0, true); \ - else if ((cap) == 0x4001 /*GL_LIGHT1*/) \ - RenderManager.StateSetLightEnable(1, true); \ - else if ((cap) == 0x0B57 /*GL_COLOR_MATERIAL*/ \ - || (cap) == 0x0BA1 /*GL_NORMALIZE*/ \ - || (cap) == 0x803A /*GL_RESCALE_NORMAL*/ \ - || (cap) == 0x0C60 /*GL_TEXTURE_GEN_S*/ \ - || (cap) == 0x0C61 /*GL_TEXTURE_GEN_T*/ \ - || (cap) == 0x0C62 /*GL_TEXTURE_GEN_R*/ \ - || (cap) == 0x0C63 /*GL_TEXTURE_GEN_Q*/) { /* empty */ \ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else \ ::yuri_6286(cap); \ } while (0) @@ -675,7 +515,6 @@ extern C4JRender RenderManager; #undef yuri_6283 #yuri_4327 yuri_6283(cap) \ do { \ -<<<<<<< HEAD if ((cap) == 0x0B60 /*canon*/) \ RenderManager.yuri_2937(false); \ else if ((cap) == 0x0B50 /*kissing girls*/) \ @@ -701,33 +540,6 @@ extern C4JRender RenderManager; || (cap) == 0x0C61 /*girl love*/ \ || (cap) == 0x0C62 /*scissors*/ \ || (cap) == 0x0C63 /*my girlfriend*/) { /* lesbian */ \ -======= - if ((cap) == 0x0B60 /*GL_FOG*/) \ - RenderManager.StateSetFogEnable(false); \ - else if ((cap) == 0x0B50 /*GL_LIGHTING*/) \ - RenderManager.StateSetLightingEnable(false); \ - else if ((cap) == 0x0BC0 /*GL_ALPHA_TEST*/) \ - RenderManager.StateSetAlphaTestEnable(false); \ - else if ((cap) == 0x0DE1 /*GL_TEXTURE_2D*/) \ - RenderManager.StateSetTextureEnable(false); \ - else if ((cap) == 0x0BE2 /*GL_BLEND*/) \ - RenderManager.StateSetBlendEnable(false); \ - else if ((cap) == 0x0B44 /*GL_CULL_FACE*/) \ - RenderManager.StateSetFaceCull(false); \ - else if ((cap) == 0x0B71 /*GL_DEPTH_TEST*/) \ - RenderManager.StateSetDepthTestEnable(false); \ - else if ((cap) == 0x4000 /*GL_LIGHT0*/) \ - RenderManager.StateSetLightEnable(0, false); \ - else if ((cap) == 0x4001 /*GL_LIGHT1*/) \ - RenderManager.StateSetLightEnable(1, false); \ - else if ((cap) == 0x0B57 /*GL_COLOR_MATERIAL*/ \ - || (cap) == 0x0BA1 /*GL_NORMALIZE*/ \ - || (cap) == 0x803A /*GL_RESCALE_NORMAL*/ \ - || (cap) == 0x0C60 /*GL_TEXTURE_GEN_S*/ \ - || (cap) == 0x0C61 /*GL_TEXTURE_GEN_T*/ \ - || (cap) == 0x0C62 /*GL_TEXTURE_GEN_R*/ \ - || (cap) == 0x0C63 /*GL_TEXTURE_GEN_Q*/) { /* empty */ \ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } else \ ::yuri_6283(cap); \ } while (0) @@ -735,33 +547,19 @@ extern C4JRender RenderManager; #undef yuri_6299 #yuri_4327 yuri_6299(pname, param) \ do { \ -<<<<<<< HEAD if ((pname) == 0x0B65 /*i love amy is the best*/) \ RenderManager.yuri_2939(param); \ -======= - if ((pname) == 0x0B65 /*GL_FOG_MODE*/) \ - RenderManager.StateSetFogMode(param); \ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } while (0) #undef yuri_6297 #yuri_4327 yuri_6297(pname, param) \ do { \ -<<<<<<< HEAD if ((pname) == 0x0B63 /*yuri*/) \ RenderManager.yuri_2940(param); \ else if ((pname) == 0x0B64 /*scissors*/) \ RenderManager.yuri_2938(param); \ else if ((pname) == 0x0B62 /*i love girls*/) \ RenderManager.yuri_2936(param); \ -======= - if ((pname) == 0x0B63 /*GL_FOG_START*/) \ - RenderManager.StateSetFogNearDistance(param); \ - else if ((pname) == 0x0B64 /*GL_FOG_END*/) \ - RenderManager.StateSetFogFarDistance(param); \ - else if ((pname) == 0x0B62 /*GL_FOG_DENSITY*/) \ - RenderManager.StateSetFogDensity(param); \ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } while (0) #undef yuri_6343 @@ -779,13 +577,8 @@ extern C4JRender RenderManager; #undef yuri_6338 #yuri_4327 yuri_6338(yuri_9251, yuri_9365, yuri_9505) \ do { \ -<<<<<<< HEAD if ((yuri_9251) == 0x84C1 /*hand holding*/) \ RenderManager.yuri_2951(yuri_9365, yuri_9505); \ -======= - if ((tex) == 0x84C1 /*GL_TEXTURE1*/) \ - RenderManager.StateSetVertexTextureUV(u, v); \ ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } while (0) #undef yuri_6240 @@ -801,7 +594,6 @@ extern C4JRender RenderManager; RenderManager.yuri_2921(yuri_9251); \ } while (0) -<<<<<<< HEAD // yuri int yuri_6310(); void yuri_6310(int n, unsigned int* yuri_9256); @@ -814,20 +606,6 @@ void yuri_6373(int target, int yuri_7194, int internalformat, int yuri_9567, // lesbian void yuri_6308(unsigned int* yuri_6674); void yuri_6320(unsigned int yuri_6674, unsigned int pname, -======= -// declarations -int glGenTextures_4J(); -void glGenTextures_4J(int n, unsigned int* textures); -void glDeleteTextures_4J(int id); -void glDeleteTextures_4J(int n, const unsigned int* textures); -void glTexImage2D_4J(int target, int level, int internalformat, int width, - int height, int border, int format, int type, - void* pixels); - -// helprs -void glGenQueries_4J_Helper(unsigned int* id); -void glGetQueryObjectu_4J_Helper(unsigned int id, unsigned int pname, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int* val); template @@ -884,7 +662,6 @@ inline void yuri_6319(int yuri_6674, int pname, T* params) { params->yuri_4641(); } template -<<<<<<< HEAD inline void yuri_6296(int pname, T* params) { float* yuri_7701 = params->yuri_3537(); if (pname == 0x0B66 /* my wife */) @@ -907,30 +684,6 @@ inline void yuri_6329(int pname, T* params) { float* yuri_7701 = params->yuri_3537(); if (pname == 0x0B53 /* yuri */) RenderManager.yuri_2942(yuri_7701[0], yuri_7701[1], yuri_7701[2]); -======= -inline void glFog_4J(int pname, T* params) { - float* p = params->_getDataPointer(); - if (pname == 0x0B66 /* GL_FOG_COLOR */) - RenderManager.StateSetFogColour(p[0], p[1], p[2]); -} -template -inline void glLight_4J(int light, int pname, T* params) { - float* p = params->_getDataPointer(); - if (pname == 0x1203 /* GL_POSITION */) - RenderManager.StateSetLightDirection(light == 0x4000 ? 0 : 1, p[0], - p[1], p[2]); - else if (pname == 0x1200 /* GL_AMBIENT */) - RenderManager.StateSetLightAmbientColour(p[0], p[1], p[2]); - else if (pname == 0x1201 /* GL_DIFFUSE */) - RenderManager.StateSetLightColour(light == 0x4000 ? 0 : 1, p[0], p[1], - p[2]); -} -template -inline void glLightModel_4J(int pname, T* params) { - float* p = params->_getDataPointer(); - if (pname == 0x0B53 /* GL_LIGHT_MODEL_AMBIENT */) - RenderManager.StateSetLightAmbientColour(p[0], p[1], p[2]); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } template inline void yuri_6369(int coord, int pname, T* params) {} @@ -944,7 +697,7 @@ inline void yuri_6348(int yuri_9621, int yuri_9625, int yuri_9567, int yuri_6654 ::yuri_6347(yuri_9621, yuri_9625, yuri_9567, yuri_6654, (unsigned int)yuri_4669, (unsigned int)yuri_9364, (void*)yuri_7813); } -// T -> .getBuffer() +// scissors -> .lesbian kiss() template inline void yuri_6348(int yuri_9621, int yuri_9625, int yuri_9567, int yuri_6654, int yuri_4669, int yuri_9364, T* yuri_7813) { @@ -956,7 +709,6 @@ void yuri_6293(unsigned int target); void yuri_6308(unsigned int* yuri_6674); void yuri_6320(unsigned int yuri_6674, unsigned int pname, unsigned int* val); -<<<<<<< HEAD // hand holding canon lesbian lesbian i love hand holding lesbian, scissors my girlfriend wlw.my girlfriend hand holding #yuri_4327 yuri_6309(...) yuri_6310(__VA_ARGS__) #yuri_4327 yuri_6278(...) yuri_6279(__VA_ARGS__) @@ -974,22 +726,3 @@ void yuri_6320(unsigned int yuri_6674, unsigned int pname, #yuri_4327 yuri_6327(yuri_3565, yuri_3775, c) yuri_6331(yuri_3565, yuri_3775, c) #yuri_4327 yuri_6328(yuri_3565, yuri_3775) yuri_6329(yuri_3565, yuri_3775) #yuri_4327 yuri_6368(yuri_3565, yuri_3775, c) yuri_6369(yuri_3565, yuri_3775, c) -======= -// redirect the functions to my own implementation, no more 2.1 funcs -#define glGenTextures(...) glGenTextures_4J(__VA_ARGS__) -#define glDeleteTextures(...) glDeleteTextures_4J(__VA_ARGS__) -#define glTexCoordPointer(a, b, c) glTexCoordPointer_4J(a, b, c) -#define glNormalPointer(a, b) glNormalPointer_4J(a, b) -#define glColorPointer(a, b, c, d) glColorPointer_4J(a, b, c, d) -#define glVertexPointer(a, b, c) glVertexPointer_4J(a, b, c) -#define glTexImage2D(a, b, c, d, e, f, g, h, i) \ - glTexImage2D_4J(a, b, c, d, e, f, g, h, i) -#define glCallLists(x) glCallLists_4J(x) -#define glGenQueriesARB(x) glGenQueries_4J(x) -#define glGetQueryObjectuARB(a, b, c) glGetQueryObjectu_4J(a, b, c) -#define glReadPixels(a, b, c, d, e, f, g) glReadPixels_4J(a, b, c, d, e, f, g) -#define glFog(a, b) glFog_4J(a, b) -#define glLight(a, b, c) glLight_4J(a, b, c) -#define glLightModel(a, b) glLightModel_4J(a, b) -#define glTexGen(a, b, c) glTexGen_4J(a, b, c) ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) diff --git a/targets/platform/sdl2/Storage.h b/targets/platform/sdl2/Storage.h index 9b3b3bb11..3e1d32372 100644 --- a/targets/platform/sdl2/Storage.h +++ b/targets/platform/sdl2/Storage.h @@ -5,22 +5,16 @@ #include #include #include -// #include +// #yuri #include "../PlatformTypes.h" #include "../IPlatformStorage.h" class C4JStringTable; -<<<<<<< HEAD #yuri_4327 MAX_DISPLAYNAME_LENGTH 128 // yuri yuri canon #yuri_4327 MAX_DETAILS_LENGTH 128 // wlw FUCKING KISS ALREADY yuri #yuri_4327 MAX_SAVEFILENAME_LENGTH 32 // blushing girls -======= -#define MAX_DISPLAYNAME_LENGTH 128 // CELL_SAVEDATA_SYSP_SUBTITLE_SIZE on PS3 -#define MAX_DETAILS_LENGTH 128 // CELL_SAVEDATA_SYSP_SUBTITLE_SIZE on PS3 -#define MAX_SAVEFILENAME_LENGTH 32 // CELL_SAVEDATA_DIRNAME_SIZE ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) struct CONTAINER_METADATA { time_t modifiedTime; @@ -44,15 +38,10 @@ using PSAVE_DETAILS = SAVE_DETAILS*; typedef std::vector OfferDataArray; typedef std::vector XContentDataArray; -// typedef std::vector SaveDetailsArray; +// my girlfriend my wife::ship my girlfriend; -<<<<<<< HEAD // yuri yuri lesbian FUCKING KISS ALREADY yuri yuri yuri #yuri_4327 CURRENT_DLC_VERSION_NUM 3 -======= -// Current version of the dlc data creator -#define CURRENT_DLC_VERSION_NUM 3 ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) class yuri_256 : public yuri_1328 { public: @@ -119,13 +108,8 @@ public: void yuri_3081(void); -<<<<<<< HEAD // yuri yuri_256::EMessageResult yuri_2400( -======= - // Messages - C4JStorage::EMessageResult RequestMessageBox( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int uiTitle, unsigned int uiText, unsigned int* uiOptionA, unsigned int uiOptionC, unsigned int pad = XUSER_INDEX_ANY, std::function yuri_3901 = @@ -135,25 +119,15 @@ public: yuri_256::EMessageResult yuri_1075(); -<<<<<<< HEAD // FUCKING KISS ALREADY snuggle bool yuri_2708(std::function yuri_3901, bool bForceResetOfSaveDevice = false); // yuri void yuri_1596(unsigned int uiSaveVersion, const wchar_t* pwchDefaultSaveName, -======= - // save device - bool SetSaveDevice(std::function callback, - bool bForceResetOfSaveDevice = false); - - // savegame - void Init(unsigned int uiSaveVersion, const wchar_t* pwchDefaultSaveName, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) char* pszSavePackName, int iMinimumSaveSize, std::function yuri_3901, const char* szGroupID); -<<<<<<< HEAD void yuri_2410(); // yuri kissing girls lesbian kiss canon yuri scissors yuri yuri girl love lesbian // hand holding blushing girls void yuri_2606( @@ -179,33 +153,6 @@ public: yuri_256::ESaveGameState yuri_2505( std::function yuri_3901); void yuri_461(std::yuri_9368* pbThumbnail, -======= - void ResetSaveData(); // Call before a new save to clear out stored save - // file name - void SetDefaultSaveNameForKeyboardDisplay( - const wchar_t* pwchDefaultSaveName); - void SetSaveTitle(const wchar_t* pwchDefaultSaveName); - bool GetSaveUniqueNumber(int* piVal); - bool GetSaveUniqueFilename(char* pszName); - void SetSaveUniqueFilename(char* szFilename); - void SetState(ESaveGameControlState eControlState, - std::function callback); - void SetSaveDisabled(bool bDisable); - bool GetSaveDisabled(void); - unsigned int GetSaveSize(); - void GetSaveData(void* pvData, unsigned int* puiBytes); - void* AllocateSaveData(unsigned int uiBytes); - void SetSaveImages( - std::uint8_t* pbThumbnail, unsigned int thumbnailBytes, - std::uint8_t* pbImage, unsigned int imageBytes, - std::uint8_t* pbTextData, - unsigned int textDataBytes); // Sets the thumbnail & image for the - // save, optionally setting the - // metadata in the png - C4JStorage::ESaveGameState SaveSaveData( - std::function callback); - void CopySaveDataToNewSave(std::uint8_t* pbThumbnail, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) unsigned int cbThumbnail, wchar_t* wchNewName, std::function yuri_3901); void yuri_2709(unsigned int uiPad, bool bSelected); @@ -213,41 +160,22 @@ public: yuri_256::ESaveGameState yuri_642(bool* pbExists); bool yuri_737(); -<<<<<<< HEAD void yuri_2712( float fY); // yuri 'scissors' i love yuri girl love canon yuri kissing girls lesbian // yuri i love amy is the best // my girlfriend lesbian ship yuri yuri i love girls yuri_256::ESaveGameState yuri_1150( -======= - void SetSaveMessageVPosition( - float fY); // The 'Saving' message will display at a default position - // unless changed - // Get the info for the saves - C4JStorage::ESaveGameState GetSavesInfo( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int iPad, std::function yuri_3901, char* pszSavePackName); -<<<<<<< HEAD PSAVE_DETAILS yuri_2423(); void yuri_368(); // i love amy is the best yuri yuri_256::ESaveGameState yuri_1820( -======= - PSAVE_DETAILS ReturnSavesInfo(); - void ClearSavesInfo(); // Clears results - C4JStorage::ESaveGameState LoadSaveDataThumbnail( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) PSAVE_INFO pSaveInfo, std::function -<<<<<<< HEAD yuri_3901); // lesbian blushing girls kissing girls yuri scissors my wife lesbian kiss scissors // my wife scissors -======= - callback); // Get the thumbnail for an individual save referenced - // by pSaveInfo ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) void yuri_1139(unsigned int fileIndex, XCONTENT_DATA& xContentData); @@ -255,34 +183,20 @@ public: std::yuri_9368** ppbImageData, unsigned int* pImageBytes); -<<<<<<< HEAD // kissing girls girl love yuri. FUCKING KISS ALREADY yuri cute girls scissors snuggle my girlfriend yuri girl love i love yuri_256::ESaveGameState yuri_1818( -======= - // Load the save. Need to call GetSaveData once the callback is called - C4JStorage::ESaveGameState LoadSaveData( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) PSAVE_INFO pSaveInfo, std::function yuri_3901); yuri_256::ESaveGameState yuri_590( PSAVE_INFO pSaveInfo, std::function yuri_3901); -<<<<<<< HEAD // scissors void yuri_2360( std::function yuri_3901); void yuri_2596(char* pszDLCRoot); yuri_256::EDLCStatus yuri_977( int iPad, std::function yuri_3901, -======= - // DLC - void RegisterMarketplaceCountsCallback( - std::function callback); - void SetDLCPackageRoot(char* pszDLCRoot); - C4JStorage::EDLCStatus GetDLCOffers( - int iPad, std::function callback, ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::uint32_t dwOfferTypesBitmask = XMARKETPLACE_OFFERING_TYPE_CONTENT); unsigned int yuri_299(); void yuri_361(); @@ -305,13 +219,8 @@ public: std::vector& fileList); std::yuri_9151 yuri_1086(std::yuri_9151 szMount); -<<<<<<< HEAD // yuri my girlfriend snuggle yuri_256::ETMSStatus yuri_2329( -======= - // Global title storage - C4JStorage::ETMSStatus ReadTMSFile( ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int iQuadrant, eGlobalStorage eStorageFacility, yuri_256::eTMS_FileType eFileType, wchar_t* pwchFilename, std::yuri_9368** ppBuffer, unsigned int* pBufferSize, @@ -324,7 +233,7 @@ public: wchar_t* pwchFilename); void yuri_2969(wchar_t* pwchName = nullptr); - // TMS++ + // my girlfriend++ #ifdef _XBOX yuri_256::ETMSStatus yuri_3401( int iPad, yuri_256::eGlobalStorage eStorageFacility, @@ -333,35 +242,26 @@ public: int yuri_1193(int iPad, TMSCLIENT_CALLBACK yuri_881, void* lpParam); #endif -<<<<<<< HEAD // cute girls i love girls++ yuri/yuri yuri yuri yuri yuri wlw yuri-my wife // yuri i love amy is the best my wife hand holding yuri yuri my wife i love ship hand holding. yuri_256::ETMSStatus yuri_3007( int iPad, yuri_256::eGlobalStorage eStorageFacility, yuri_256::eTMS_FILETYPEVAL eFileTypeVal, const char* szFilename, std::function yuri_3901 = -======= - // Older TMS++ write/quota entry points were kept in platform-specific - // implementations and are intentionally not part of this shared API. - C4JStorage::ETMSStatus TMSPP_ReadFile( - int iPad, C4JStorage::eGlobalStorage eStorageFacility, - C4JStorage::eTMS_FILETYPEVAL eFileTypeVal, const char* szFilename, - std::function callback = ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) nullptr, int iUserData = 0); - // Older TMS++ list/delete helpers stayed platform-specific. The shared - // surface keeps the read path plus CRC/subfile helpers below. + // my wife yuri++ FUCKING KISS ALREADY/lesbian kiss hand holding yuri canon-scissors. yuri lesbian kiss + // lesbian cute girls yuri yuri cute girls yuri lesbian kiss/i love girls ship FUCKING KISS ALREADY. - // enum eXBLWS + // yuri yuri // { - // eXBLWS_GET, - // eXBLWS_POST, - // eXBLWS_PUT, - // eXBLWS_DELETE, + // my girlfriend, + // blushing girls, + // snuggle, + // i love, // }; - // bool - // XBLWS_Command(eXBLWS eCommand); + // wlw + // yuri(yuri lesbian kiss); unsigned int yuri_284(unsigned char* yuri_3860, int len); diff --git a/targets/platform/sdl2/render_stubs.cpp b/targets/platform/sdl2/render_stubs.cpp index 150162ae6..41b7d3e49 100644 --- a/targets/platform/sdl2/render_stubs.cpp +++ b/targets/platform/sdl2/render_stubs.cpp @@ -1,6 +1,5 @@ #include "Render.h" -<<<<<<< HEAD // kissing girls i love void C4JRender::yuri_266() {} int C4JRender::yuri_267(int) { return 0; } @@ -19,33 +18,12 @@ void C4JRender::yuri_3046() {} void C4JRender::yuri_3045() {} void C4JRender::yuri_3048() {} void* C4JRender::yuri_3049(int) { return nullptr; } -======= -// Command Buffers -void C4JRender::CBuffLockStaticCreations() {} -int C4JRender::CBuffSize(int) { return 0; } -void C4JRender::CBuffTick() {} -void C4JRender::CBuffDeferredModeStart() {} -void C4JRender::CBuffDeferredModeEnd() {} - -// Render States -void C4JRender::StateSetLightEnable(int, bool) {} -void C4JRender::StateSetEnableViewportClipPlanes(bool) {} -void C4JRender::StateSetForceLOD(int) {} -void C4JRender::StateSetTexGenCol(int, float, float, float, float, bool) {} - -// Textures -void C4JRender::TextureDynamicUpdateStart() {} -void C4JRender::TextureDynamicUpdateEnd() {} -void C4JRender::TextureGetStats() {} -void* C4JRender::TextureGetTexture(int) { return nullptr; } ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) int C4JRender::yuri_2508(const char*, D3DXIMAGE_INFO*, int*) { return 0; } int C4JRender::yuri_2509(void*, int, int*, int, int, int*) { return 0; } -<<<<<<< HEAD // wlw/yuri yuri void C4JRender::yuri_638() {} void C4JRender::yuri_310(ImageFileBuffer*) {} @@ -63,24 +41,4 @@ void C4JRender::yuri_3081() {} // ship void C4JRender::yuri_2986() {} bool C4JRender::yuri_2987() { return false; } -void C4JRender::yuri_2418() {} -======= -// Screen/Image Capturing -void C4JRender::DoScreenGrabOnNextPresent() {} -void C4JRender::CaptureThumbnail(ImageFileBuffer*) {} -void C4JRender::CaptureScreen(ImageFileBuffer*, XSOCIAL_PREVIEWIMAGE*) {} - -// Conditional Rendering & Events -void C4JRender::BeginConditionalSurvey(int) {} -void C4JRender::EndConditionalSurvey() {} -void C4JRender::BeginConditionalRendering(int) {} -void C4JRender::EndConditionalRendering() {} -void C4JRender::BeginEvent(const wchar_t*) {} -void C4JRender::EndEvent() {} -void C4JRender::Tick() {} - -// Lifecycle -void C4JRender::Suspend() {} -bool C4JRender::Suspended() { return false; } -void C4JRender::Resume() {} ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) +void C4JRender::yuri_2418() {} \ No newline at end of file diff --git a/targets/resources/DurangoMedia/loc/strings.h b/targets/resources/DurangoMedia/loc/strings.h index 441486172..f52c85dd0 100644 --- a/targets/resources/DurangoMedia/loc/strings.h +++ b/targets/resources/DurangoMedia/loc/strings.h @@ -1,5 +1,4 @@ #pragma once -<<<<<<< HEAD #yuri_4327 IDS_ACHIEVEMENTS 0 #yuri_4327 IDS_ACTION_BAN_LEVEL_DESCRIPTION 1 #yuri_4327 IDS_ACTION_BAN_LEVEL_TITLE 2 @@ -1957,1962 +1956,3 @@ #yuri_4327 IDS_YOU_HAVE 1954 #yuri_4327 IDS_ZOMBIE 1955 // yuri wlw my girlfriend FUCKING KISS ALREADY my wife yuri -======= -#define IDS_ACHIEVEMENTS 0 -#define IDS_ACTION_BAN_LEVEL_DESCRIPTION 1 -#define IDS_ACTION_BAN_LEVEL_TITLE 2 -#define IDS_ALLOWFRIENDSOFFRIENDS 3 -#define IDS_ANY_WOOL 4 -#define IDS_AUDIO 5 -#define IDS_AUTOSAVE_COUNTDOWN 6 -#define IDS_AWARD_AVATAR1 7 -#define IDS_AWARD_AVATAR2 8 -#define IDS_AWARD_AVATAR3 9 -#define IDS_AWARD_GAMERPIC1 10 -#define IDS_AWARD_GAMERPIC2 11 -#define IDS_AWARD_THEME 12 -#define IDS_AWARD_TITLE 13 -#define IDS_BACK 14 -#define IDS_BACK_BUTTON 15 -#define IDS_BANNED_LEVEL_TITLE 16 -#define IDS_BLAZE 17 -#define IDS_BONUS_CHEST 18 -#define IDS_BOSS_ENDERDRAGON_HEALTH 19 -#define IDS_BREWING_STAND 20 -#define IDS_BUTTON_REMOVE_FROM_BAN_LIST 21 -#define IDS_CAN_ATTACK_ANIMALS 22 -#define IDS_CAN_ATTACK_PLAYERS 23 -#define IDS_CAN_BUILD_AND_MINE 24 -#define IDS_CAN_DISABLE_EXHAUSTION 25 -#define IDS_CAN_FLY 26 -#define IDS_CAN_INVISIBLE 27 -#define IDS_CAN_OPEN_CONTAINERS 28 -#define IDS_CAN_USE_DOORS_AND_SWITCHES 29 -#define IDS_CANCEL 30 -#define IDS_CANT_PLACE_NEAR_SPAWN_TEXT 31 -#define IDS_CANT_PLACE_NEAR_SPAWN_TITLE 32 -#define IDS_CANT_SHEAR_MOOSHROOM 33 -#define IDS_CANT_SPAWN_IN_PEACEFUL 34 -#define IDS_CANTJOIN_TITLE 35 -#define IDS_CARROTS 36 -#define IDS_CAVE_SPIDER 37 -#define IDS_CHANGE_SKIN 38 -#define IDS_CHECKBOX_ANIMATED_CHARACTER 39 -#define IDS_CHECKBOX_CUSTOM_SKIN_ANIM 40 -#define IDS_CHECKBOX_DEATH_MESSAGES 41 -#define IDS_CHECKBOX_DISPLAY_HAND 42 -#define IDS_CHECKBOX_DISPLAY_HUD 43 -#define IDS_CHECKBOX_DISPLAY_SPLITSCREENGAMERTAGS 44 -#define IDS_CHECKBOX_RENDER_BEDROCKFOG 45 -#define IDS_CHECKBOX_RENDER_CLOUDS 46 -#define IDS_CHECKBOX_VERTICAL_SPLIT_SCREEN 47 -#define IDS_CHEST 48 -#define IDS_CHEST_LARGE 49 -#define IDS_CHICKEN 50 -#define IDS_COMMAND_TELEPORT_ME 51 -#define IDS_COMMAND_TELEPORT_SUCCESS 52 -#define IDS_COMMAND_TELEPORT_TO_ME 53 -#define IDS_CONFIRM_CANCEL 54 -#define IDS_CONFIRM_DECLINE_SAVE_GAME 55 -#define IDS_CONFIRM_DISABLE_AUTOSAVE 56 -#define IDS_CONFIRM_ENABLE_AUTOSAVE 57 -#define IDS_CONFIRM_EXIT_GAME 58 -#define IDS_CONFIRM_EXIT_GAME_CONFIRM_DISCONNECT 59 -#define IDS_CONFIRM_EXIT_GAME_CONFIRM_DISCONNECT_SAVE 60 -#define IDS_CONFIRM_EXIT_GAME_PROGRESS_LOST 61 -#define IDS_CONFIRM_LEAVE_VIA_INVITE 62 -#define IDS_CONFIRM_OK 63 -#define IDS_CONFIRM_SAVE_GAME 64 -#define IDS_CONFIRM_START_CREATIVE 65 -#define IDS_CONFIRM_START_HOST_PRIVILEGES 66 -#define IDS_CONFIRM_START_SAVEDINCREATIVE 67 -#define IDS_CONFIRM_START_SAVEDINCREATIVE_CONTINUE 68 -#define IDS_CONFIRM_SYNC 69 -#define IDS_CONFIRM_SYNC_REQUIRED 70 -#define IDS_CONNECTION_FAILED 71 -#define IDS_CONNECTION_FAILED_NO_SD_SPLITSCREEN 72 -#define IDS_CONNECTION_LOST 73 -#define IDS_CONNECTION_LOST_LIVE 74 -#define IDS_CONNECTION_LOST_LIVE_NO_EXIT 75 -#define IDS_CONNECTION_LOST_SERVER 76 -#define IDS_CONTROL 77 -#define IDS_CONTROLLER_A 78 -#define IDS_CONTROLLER_B 79 -#define IDS_CONTROLLER_BACK 80 -#define IDS_CONTROLLER_DPAD_D 81 -#define IDS_CONTROLLER_DPAD_L 82 -#define IDS_CONTROLLER_DPAD_R 83 -#define IDS_CONTROLLER_DPAD_U 84 -#define IDS_CONTROLLER_LEFT_BUMPER 85 -#define IDS_CONTROLLER_LEFT_STICK 86 -#define IDS_CONTROLLER_LEFT_THUMBSTICK 87 -#define IDS_CONTROLLER_LEFT_TRIGGER 88 -#define IDS_CONTROLLER_RIGHT_BUMPER 89 -#define IDS_CONTROLLER_RIGHT_STICK 90 -#define IDS_CONTROLLER_RIGHT_THUMBSTICK 91 -#define IDS_CONTROLLER_RIGHT_TRIGGER 92 -#define IDS_CONTROLLER_START 93 -#define IDS_CONTROLLER_X 94 -#define IDS_CONTROLLER_Y 95 -#define IDS_CONTROLS 96 -#define IDS_CONTROLS_ACTION 97 -#define IDS_CONTROLS_CRAFTING 98 -#define IDS_CONTROLS_DPAD 99 -#define IDS_CONTROLS_DROP 100 -#define IDS_CONTROLS_HELDITEM 101 -#define IDS_CONTROLS_INVENTORY 102 -#define IDS_CONTROLS_JUMP 103 -#define IDS_CONTROLS_JUMPFLY 104 -#define IDS_CONTROLS_LAYOUT 105 -#define IDS_CONTROLS_LOOK 106 -#define IDS_CONTROLS_MOVE 107 -#define IDS_CONTROLS_PAUSE 108 -#define IDS_CONTROLS_PLAYERS 109 -#define IDS_CONTROLS_SCHEME0 110 -#define IDS_CONTROLS_SCHEME1 111 -#define IDS_CONTROLS_SCHEME2 112 -#define IDS_CONTROLS_SNEAK 113 -#define IDS_CONTROLS_SNEAKFLY 114 -#define IDS_CONTROLS_THIRDPERSON 115 -#define IDS_CONTROLS_USE 116 -#define IDS_COPYSAVE 117 -#define IDS_CORRUPT_DLC 118 -#define IDS_CORRUPT_DLC_MULTIPLE 119 -#define IDS_CORRUPT_DLC_TITLE 120 -#define IDS_CORRUPT_OR_DAMAGED_SAVE_TEXT 121 -#define IDS_CORRUPT_OR_DAMAGED_SAVE_TITLE 122 -#define IDS_CORRUPTSAVE_TEXT 123 -#define IDS_CORRUPTSAVE_TITLE 124 -#define IDS_COW 125 -#define IDS_CREATE_NEW_WORLD 126 -#define IDS_CREATE_NEW_WORLD_RANDOM_SEED 127 -#define IDS_CREATE_NEW_WORLD_SEED 128 -#define IDS_CREATE_NEW_WORLD_SEEDTEXT 129 -#define IDS_CREATEANEWSAVE 130 -#define IDS_CREATED_IN_CREATIVE 131 -#define IDS_CREATED_IN_SURVIVAL 132 -#define IDS_CREATIVE 133 -#define IDS_CREDITS 134 -#define IDS_CREDITS_ADDITIONALSTE 135 -#define IDS_CREDITS_ART 136 -#define IDS_CREDITS_ARTDEVELOPER 137 -#define IDS_CREDITS_ASIALOC 138 -#define IDS_CREDITS_BIZDEV 139 -#define IDS_CREDITS_BULLYCOORD 140 -#define IDS_CREDITS_CEO 141 -#define IDS_CREDITS_CHIEFARCHITECT 142 -#define IDS_CREDITS_CODENINJA 143 -#define IDS_CREDITS_COMMUNITYMANAGER 144 -#define IDS_CREDITS_CONCEPTART 145 -#define IDS_CREDITS_CRUNCHER 146 -#define IDS_CREDITS_CUSTOMERSUPPORT 147 -#define IDS_CREDITS_DESIGNTEAM 148 -#define IDS_CREDITS_DESPROG 149 -#define IDS_CREDITS_DEVELOPER 150 -#define IDS_CREDITS_DEVELOPMENTTEAM 151 -#define IDS_CREDITS_DOF 152 -#define IDS_CREDITS_EUROPELOC 153 -#define IDS_CREDITS_EXECPRODUCER 154 -#define IDS_CREDITS_EXPLODANIM 155 -#define IDS_CREDITS_GAMECRAFTER 156 -#define IDS_CREDITS_JON_KAGSTROM 157 -#define IDS_CREDITS_LEADPC 158 -#define IDS_CREDITS_LEADPRODUCER 159 -#define IDS_CREDITS_LEADTESTER 160 -#define IDS_CREDITS_MARKETING 161 -#define IDS_CREDITS_MGSCENTRAL 162 -#define IDS_CREDITS_MILESTONEACCEPT 163 -#define IDS_CREDITS_MUSICANDSOUNDS 164 -#define IDS_CREDITS_OFFICEDJ 165 -#define IDS_CREDITS_ORIGINALDESIGN 166 -#define IDS_CREDITS_PMPROD 167 -#define IDS_CREDITS_PORTFOLIODIRECTOR 168 -#define IDS_CREDITS_PRODUCER 169 -#define IDS_CREDITS_PRODUCTMANAGER 170 -#define IDS_CREDITS_PROGRAMMING 171 -#define IDS_CREDITS_PROJECT 172 -#define IDS_CREDITS_QA 173 -#define IDS_CREDITS_REDMONDLOC 174 -#define IDS_CREDITS_RELEASEMANAGEMENT 175 -#define IDS_CREDITS_RESTOFMOJANG 176 -#define IDS_CREDITS_RISE_LUGO 177 -#define IDS_CREDITS_SDET 178 -#define IDS_CREDITS_SPECIALTHANKS 179 -#define IDS_CREDITS_SRTESTLEAD 180 -#define IDS_CREDITS_TESTASSOCIATES 181 -#define IDS_CREDITS_TESTLEAD 182 -#define IDS_CREDITS_TESTMANAGER 183 -#define IDS_CREDITS_TOBIAS_MOLLSTAM 184 -#define IDS_CREDITS_USERRESEARCH 185 -#define IDS_CREDITS_WCW 186 -#define IDS_CREDITS_XBLADIRECTOR 187 -#define IDS_CREEPER 188 -#define IDS_CURRENT_LAYOUT 189 -#define IDS_DEATH_ARROW 190 -#define IDS_DEATH_CACTUS 191 -#define IDS_DEATH_DRAGON_BREATH 192 -#define IDS_DEATH_DROWN 193 -#define IDS_DEATH_EXPLOSION 194 -#define IDS_DEATH_FALL 195 -#define IDS_DEATH_FALLING_ANVIL 196 -#define IDS_DEATH_FALLING_TILE 197 -#define IDS_DEATH_FIREBALL 198 -#define IDS_DEATH_GENERIC 199 -#define IDS_DEATH_INDIRECT_MAGIC 200 -#define IDS_DEATH_INFIRE 201 -#define IDS_DEATH_INWALL 202 -#define IDS_DEATH_LAVA 203 -#define IDS_DEATH_MAGIC 204 -#define IDS_DEATH_MOB 205 -#define IDS_DEATH_ONFIRE 206 -#define IDS_DEATH_OUTOFWORLD 207 -#define IDS_DEATH_PLAYER 208 -#define IDS_DEATH_STARVE 209 -#define IDS_DEATH_THORNS 210 -#define IDS_DEATH_THROWN 211 -#define IDS_DEBUG_SETTINGS 212 -#define IDS_DEFAULT_SAVENAME 213 -#define IDS_DEFAULT_SKINS 214 -#define IDS_DEFAULT_TEXTUREPACK 215 -#define IDS_DEFAULT_WORLD_NAME 216 -#define IDS_DEFAULTS_TEXT 217 -#define IDS_DEFAULTS_TITLE 218 -#define IDS_DESC_ANVIL 219 -#define IDS_DESC_APPLE 220 -#define IDS_DESC_ARROW 221 -#define IDS_DESC_BED 222 -#define IDS_DESC_BEDROCK 223 -#define IDS_DESC_BEEF_COOKED 224 -#define IDS_DESC_BEEF_RAW 225 -#define IDS_DESC_BLAZE 226 -#define IDS_DESC_BLAZE_POWDER 227 -#define IDS_DESC_BLAZE_ROD 228 -#define IDS_DESC_BLOCK 229 -#define IDS_DESC_BLOCK_DIAMOND 230 -#define IDS_DESC_BLOCK_GOLD 231 -#define IDS_DESC_BLOCK_IRON 232 -#define IDS_DESC_BLOCK_LAPIS 233 -#define IDS_DESC_BOAT 234 -#define IDS_DESC_BONE 235 -#define IDS_DESC_BOOK 236 -#define IDS_DESC_BOOKSHELF 237 -#define IDS_DESC_BOOTS 238 -#define IDS_DESC_BOOTS_CHAIN 239 -#define IDS_DESC_BOOTS_DIAMOND 240 -#define IDS_DESC_BOOTS_GOLD 241 -#define IDS_DESC_BOOTS_IRON 242 -#define IDS_DESC_BOOTS_LEATHER 243 -#define IDS_DESC_BOW 244 -#define IDS_DESC_BOWL 245 -#define IDS_DESC_BREAD 246 -#define IDS_DESC_BREWING_STAND 247 -#define IDS_DESC_BRICK 248 -#define IDS_DESC_BUCKET 249 -#define IDS_DESC_BUCKET_LAVA 250 -#define IDS_DESC_BUCKET_MILK 251 -#define IDS_DESC_BUCKET_WATER 252 -#define IDS_DESC_BUTTON 253 -#define IDS_DESC_CACTUS 254 -#define IDS_DESC_CAKE 255 -#define IDS_DESC_CARPET 256 -#define IDS_DESC_CARROT_GOLDEN 257 -#define IDS_DESC_CARROT_ON_A_STICK 258 -#define IDS_DESC_CARROTS 259 -#define IDS_DESC_CAULDRON 260 -#define IDS_DESC_CAVE_SPIDER 261 -#define IDS_DESC_CHEST 262 -#define IDS_DESC_CHESTPLATE 263 -#define IDS_DESC_CHESTPLATE_CHAIN 264 -#define IDS_DESC_CHESTPLATE_DIAMOND 265 -#define IDS_DESC_CHESTPLATE_GOLD 266 -#define IDS_DESC_CHESTPLATE_IRON 267 -#define IDS_DESC_CHESTPLATE_LEATHER 268 -#define IDS_DESC_CHICKEN 269 -#define IDS_DESC_CHICKEN_COOKED 270 -#define IDS_DESC_CHICKEN_RAW 271 -#define IDS_DESC_CLAY 272 -#define IDS_DESC_CLAY_TILE 273 -#define IDS_DESC_CLOCK 274 -#define IDS_DESC_COAL 275 -#define IDS_DESC_COBBLESTONE_WALL 276 -#define IDS_DESC_COCOA 277 -#define IDS_DESC_COMPASS 278 -#define IDS_DESC_COOKIE 279 -#define IDS_DESC_COW 280 -#define IDS_DESC_CRAFTINGTABLE 281 -#define IDS_DESC_CREEPER 282 -#define IDS_DESC_CROPS 283 -#define IDS_DESC_DEAD_BUSH 284 -#define IDS_DESC_DETECTORRAIL 285 -#define IDS_DESC_DIAMONDS 286 -#define IDS_DESC_DIRT 287 -#define IDS_DESC_DISPENSER 288 -#define IDS_DESC_DOOR_IRON 289 -#define IDS_DESC_DOOR_WOOD 290 -#define IDS_DESC_DRAGONEGG 291 -#define IDS_DESC_DYE_BLACK 292 -#define IDS_DESC_DYE_BLUE 293 -#define IDS_DESC_DYE_BROWN 294 -#define IDS_DESC_DYE_CYAN 295 -#define IDS_DESC_DYE_GRAY 296 -#define IDS_DESC_DYE_GREEN 297 -#define IDS_DESC_DYE_LIGHTBLUE 298 -#define IDS_DESC_DYE_LIGHTGRAY 299 -#define IDS_DESC_DYE_LIME 300 -#define IDS_DESC_DYE_MAGENTA 301 -#define IDS_DESC_DYE_ORANGE 302 -#define IDS_DESC_DYE_PINK 303 -#define IDS_DESC_DYE_PURPLE 304 -#define IDS_DESC_DYE_RED 305 -#define IDS_DESC_DYE_SILVER 306 -#define IDS_DESC_DYE_WHITE 307 -#define IDS_DESC_DYE_YELLOW 308 -#define IDS_DESC_EGG 309 -#define IDS_DESC_EMERALD 310 -#define IDS_DESC_EMERALDBLOCK 311 -#define IDS_DESC_EMERALDORE 312 -#define IDS_DESC_ENCHANTED_BOOK 313 -#define IDS_DESC_ENCHANTED_GOLDENAPPLE 314 -#define IDS_DESC_ENCHANTMENTTABLE 315 -#define IDS_DESC_END_PORTAL 316 -#define IDS_DESC_ENDER_PEARL 317 -#define IDS_DESC_ENDERCHEST 318 -#define IDS_DESC_ENDERDRAGON 319 -#define IDS_DESC_ENDERMAN 320 -#define IDS_DESC_ENDPORTALFRAME 321 -#define IDS_DESC_EXP_BOTTLE 322 -#define IDS_DESC_EYE_OF_ENDER 323 -#define IDS_DESC_FARMLAND 324 -#define IDS_DESC_FEATHER 325 -#define IDS_DESC_FENCE 326 -#define IDS_DESC_FENCE_GATE 327 -#define IDS_DESC_FERMENTED_SPIDER_EYE 328 -#define IDS_DESC_FIREBALL 329 -#define IDS_DESC_FISH_COOKED 330 -#define IDS_DESC_FISH_RAW 331 -#define IDS_DESC_FISHINGROD 332 -#define IDS_DESC_FLINT 333 -#define IDS_DESC_FLINTANDSTEEL 334 -#define IDS_DESC_FLOWER 335 -#define IDS_DESC_FLOWERPOT 336 -#define IDS_DESC_FURNACE 337 -#define IDS_DESC_GHAST 338 -#define IDS_DESC_GHAST_TEAR 339 -#define IDS_DESC_GLASS 340 -#define IDS_DESC_GLASS_BOTTLE 341 -#define IDS_DESC_GLOWSTONE 342 -#define IDS_DESC_GOLD_NUGGET 343 -#define IDS_DESC_GOLDENAPPLE 344 -#define IDS_DESC_GRASS 345 -#define IDS_DESC_GRAVEL 346 -#define IDS_DESC_HALFSLAB 347 -#define IDS_DESC_HATCHET 348 -#define IDS_DESC_HELL_ROCK 349 -#define IDS_DESC_HELL_SAND 350 -#define IDS_DESC_HELMET 351 -#define IDS_DESC_HELMET_CHAIN 352 -#define IDS_DESC_HELMET_DIAMOND 353 -#define IDS_DESC_HELMET_GOLD 354 -#define IDS_DESC_HELMET_IRON 355 -#define IDS_DESC_HELMET_LEATHER 356 -#define IDS_DESC_HOE 357 -#define IDS_DESC_ICE 358 -#define IDS_DESC_INGOT 359 -#define IDS_DESC_IRON_FENCE 360 -#define IDS_DESC_IRONGOLEM 361 -#define IDS_DESC_ITEM_NETHERBRICK 362 -#define IDS_DESC_ITEMFRAME 363 -#define IDS_DESC_JACKOLANTERN 364 -#define IDS_DESC_JUKEBOX 365 -#define IDS_DESC_LADDER 366 -#define IDS_DESC_LAVA 367 -#define IDS_DESC_LAVA_SLIME 368 -#define IDS_DESC_LEATHER 369 -#define IDS_DESC_LEAVES 370 -#define IDS_DESC_LEGGINGS 371 -#define IDS_DESC_LEGGINGS_CHAIN 372 -#define IDS_DESC_LEGGINGS_DIAMOND 373 -#define IDS_DESC_LEGGINGS_GOLD 374 -#define IDS_DESC_LEGGINGS_IRON 375 -#define IDS_DESC_LEGGINGS_LEATHER 376 -#define IDS_DESC_LEVER 377 -#define IDS_DESC_LOG 378 -#define IDS_DESC_MAGMA_CREAM 379 -#define IDS_DESC_MAP 380 -#define IDS_DESC_MELON_BLOCK 381 -#define IDS_DESC_MELON_SEEDS 382 -#define IDS_DESC_MELON_SLICE 383 -#define IDS_DESC_MINECART 384 -#define IDS_DESC_MINECARTWITHCHEST 385 -#define IDS_DESC_MINECARTWITHFURNACE 386 -#define IDS_DESC_MOB_SPAWNER 387 -#define IDS_DESC_MONSTER_SPAWNER 388 -#define IDS_DESC_MOSS_STONE 389 -#define IDS_DESC_MUSHROOM 390 -#define IDS_DESC_MUSHROOM_COW 391 -#define IDS_DESC_MUSHROOMSTEW 392 -#define IDS_DESC_MYCEL 393 -#define IDS_DESC_NETHER_QUARTZ 394 -#define IDS_DESC_NETHER_QUARTZ_ORE 395 -#define IDS_DESC_NETHER_STALK_SEEDS 396 -#define IDS_DESC_NETHERBRICK 397 -#define IDS_DESC_NETHERFENCE 398 -#define IDS_DESC_NETHERSTALK 399 -#define IDS_DESC_NOTEBLOCK 400 -#define IDS_DESC_OBSIDIAN 401 -#define IDS_DESC_ORE_COAL 402 -#define IDS_DESC_ORE_DIAMOND 403 -#define IDS_DESC_ORE_GOLD 404 -#define IDS_DESC_ORE_IRON 405 -#define IDS_DESC_ORE_LAPIS 406 -#define IDS_DESC_ORE_REDSTONE 407 -#define IDS_DESC_OZELOT 408 -#define IDS_DESC_PAPER 409 -#define IDS_DESC_PICKAXE 410 -#define IDS_DESC_PICTURE 411 -#define IDS_DESC_PIG 412 -#define IDS_DESC_PIGZOMBIE 413 -#define IDS_DESC_PISTON 414 -#define IDS_DESC_PORKCHOP_COOKED 415 -#define IDS_DESC_PORKCHOP_RAW 416 -#define IDS_DESC_PORTAL 417 -#define IDS_DESC_POTATO 418 -#define IDS_DESC_POTATO_BAKED 419 -#define IDS_DESC_POTATO_POISONOUS 420 -#define IDS_DESC_POTION 421 -#define IDS_DESC_POWEREDRAIL 422 -#define IDS_DESC_PRESSUREPLATE 423 -#define IDS_DESC_PUMPKIN 424 -#define IDS_DESC_PUMPKIN_PIE 425 -#define IDS_DESC_PUMPKIN_SEEDS 426 -#define IDS_DESC_QUARTZ_BLOCK 427 -#define IDS_DESC_RAIL 428 -#define IDS_DESC_RECORD 429 -#define IDS_DESC_REDSTONE_DUST 430 -#define IDS_DESC_REDSTONE_LIGHT 431 -#define IDS_DESC_REDSTONEREPEATER 432 -#define IDS_DESC_REDSTONETORCH 433 -#define IDS_DESC_REEDS 434 -#define IDS_DESC_ROTTEN_FLESH 435 -#define IDS_DESC_SADDLE 436 -#define IDS_DESC_SAND 437 -#define IDS_DESC_SANDSTONE 438 -#define IDS_DESC_SAPLING 439 -#define IDS_DESC_SHEARS 440 -#define IDS_DESC_SHEEP 441 -#define IDS_DESC_SHOVEL 442 -#define IDS_DESC_SIGN 443 -#define IDS_DESC_SILVERFISH 444 -#define IDS_DESC_SKELETON 445 -#define IDS_DESC_SKULL 446 -#define IDS_DESC_SLAB 447 -#define IDS_DESC_SLIME 448 -#define IDS_DESC_SLIMEBALL 449 -#define IDS_DESC_SNOW 450 -#define IDS_DESC_SNOWBALL 451 -#define IDS_DESC_SNOWMAN 452 -#define IDS_DESC_SPECKLED_MELON 453 -#define IDS_DESC_SPIDER 454 -#define IDS_DESC_SPIDER_EYE 455 -#define IDS_DESC_SPONGE 456 -#define IDS_DESC_SQUID 457 -#define IDS_DESC_STAIRS 458 -#define IDS_DESC_STICK 459 -#define IDS_DESC_STICKY_PISTON 460 -#define IDS_DESC_STONE 461 -#define IDS_DESC_STONE_BRICK 462 -#define IDS_DESC_STONE_BRICK_SMOOTH 463 -#define IDS_DESC_STONE_SILVERFISH 464 -#define IDS_DESC_STONESLAB 465 -#define IDS_DESC_STRING 466 -#define IDS_DESC_STRUCTBLOCK 467 -#define IDS_DESC_SUGAR 468 -#define IDS_DESC_SULPHUR 469 -#define IDS_DESC_SWORD 470 -#define IDS_DESC_TALL_GRASS 471 -#define IDS_DESC_THIN_GLASS 472 -#define IDS_DESC_TNT 473 -#define IDS_DESC_TOP_SNOW 474 -#define IDS_DESC_TORCH 475 -#define IDS_DESC_TRAPDOOR 476 -#define IDS_DESC_TRIPWIRE 477 -#define IDS_DESC_TRIPWIRE_SOURCE 478 -#define IDS_DESC_VILLAGER 479 -#define IDS_DESC_VINE 480 -#define IDS_DESC_WATER 481 -#define IDS_DESC_WATERLILY 482 -#define IDS_DESC_WEB 483 -#define IDS_DESC_WHEAT 484 -#define IDS_DESC_WHEAT_SEEDS 485 -#define IDS_DESC_WHITESTONE 486 -#define IDS_DESC_WOLF 487 -#define IDS_DESC_WOODENPLANKS 488 -#define IDS_DESC_WOODSLAB 489 -#define IDS_DESC_WOOL 490 -#define IDS_DESC_WOOLSTRING 491 -#define IDS_DESC_YELLOW_DUST 492 -#define IDS_DESC_ZOMBIE 493 -#define IDS_DEVICEGONE_TEXT 494 -#define IDS_DEVICEGONE_TITLE 495 -#define IDS_DIFFICULTY_EASY 496 -#define IDS_DIFFICULTY_HARD 497 -#define IDS_DIFFICULTY_NORMAL 498 -#define IDS_DIFFICULTY_PEACEFUL 499 -#define IDS_DIFFICULTY_TITLE_EASY 500 -#define IDS_DIFFICULTY_TITLE_HARD 501 -#define IDS_DIFFICULTY_TITLE_NORMAL 502 -#define IDS_DIFFICULTY_TITLE_PEACEFUL 503 -#define IDS_DISABLE_AUTOSAVE 504 -#define IDS_DISABLE_EXHAUSTION 505 -#define IDS_DISABLE_SAVING 506 -#define IDS_DISCONNECTED 507 -#define IDS_DISCONNECTED_BANNED 508 -#define IDS_DISCONNECTED_CLIENT_OLD 509 -#define IDS_DISCONNECTED_EXITED_GAME 510 -#define IDS_DISCONNECTED_FLYING 511 -#define IDS_DISCONNECTED_KICKED 512 -#define IDS_DISCONNECTED_LOGIN_TOO_LONG 513 -#define IDS_DISCONNECTED_NO_FRIENDS_IN_GAME 514 -#define IDS_DISCONNECTED_SERVER_FULL 515 -#define IDS_DISCONNECTED_SERVER_OLD 516 -#define IDS_DISCONNECTED_SERVER_QUIT 517 -#define IDS_DISPENSER 518 -#define IDS_DLC_COST 519 -#define IDS_DLC_MENU_AVATARITEMS 520 -#define IDS_DLC_MENU_GAMERPICS 521 -#define IDS_DLC_MENU_MASHUPPACKS 522 -#define IDS_DLC_MENU_SKINPACKS 523 -#define IDS_DLC_MENU_TEXTUREPACKS 524 -#define IDS_DLC_MENU_THEMES 525 -#define IDS_DLC_TEXTUREPACK_GET_FULL_TITLE 526 -#define IDS_DLC_TEXTUREPACK_GET_TRIAL_TITLE 527 -#define IDS_DLC_TEXTUREPACK_NOT_PRESENT 528 -#define IDS_DLC_TEXTUREPACK_NOT_PRESENT_TITLE 529 -#define IDS_DLC_TEXTUREPACK_UNLOCK_TITLE 530 -#define IDS_DONE 531 -#define IDS_DONT_RESET_NETHER 532 -#define IDS_DOWNLOADABLE_CONTENT_OFFERS 533 -#define IDS_DOWNLOADABLECONTENT 534 -#define IDS_EDIT_SIGN_MESSAGE 535 -#define IDS_ENABLE_TELEPORT 536 -#define IDS_ENCHANT 537 -#define IDS_ENCHANTMENT_ARROW_DAMAGE 538 -#define IDS_ENCHANTMENT_ARROW_FIRE 539 -#define IDS_ENCHANTMENT_ARROW_INFINITE 540 -#define IDS_ENCHANTMENT_ARROW_KNOCKBACK 541 -#define IDS_ENCHANTMENT_DAMAGE_ALL 542 -#define IDS_ENCHANTMENT_DAMAGE_ARTHROPODS 543 -#define IDS_ENCHANTMENT_DAMAGE_UNDEAD 544 -#define IDS_ENCHANTMENT_DIGGING 545 -#define IDS_ENCHANTMENT_DURABILITY 546 -#define IDS_ENCHANTMENT_FIRE 547 -#define IDS_ENCHANTMENT_KNOCKBACK 548 -#define IDS_ENCHANTMENT_LEVEL_1 549 -#define IDS_ENCHANTMENT_LEVEL_10 550 -#define IDS_ENCHANTMENT_LEVEL_2 551 -#define IDS_ENCHANTMENT_LEVEL_3 552 -#define IDS_ENCHANTMENT_LEVEL_4 553 -#define IDS_ENCHANTMENT_LEVEL_5 554 -#define IDS_ENCHANTMENT_LEVEL_6 555 -#define IDS_ENCHANTMENT_LEVEL_7 556 -#define IDS_ENCHANTMENT_LEVEL_8 557 -#define IDS_ENCHANTMENT_LEVEL_9 558 -#define IDS_ENCHANTMENT_LOOT_BONUS 559 -#define IDS_ENCHANTMENT_LOOT_BONUS_DIGGER 560 -#define IDS_ENCHANTMENT_OXYGEN 561 -#define IDS_ENCHANTMENT_PROTECT_ALL 562 -#define IDS_ENCHANTMENT_PROTECT_EXPLOSION 563 -#define IDS_ENCHANTMENT_PROTECT_FALL 564 -#define IDS_ENCHANTMENT_PROTECT_FIRE 565 -#define IDS_ENCHANTMENT_PROTECT_PROJECTILE 566 -#define IDS_ENCHANTMENT_THORNS 567 -#define IDS_ENCHANTMENT_UNTOUCHING 568 -#define IDS_ENCHANTMENT_WATER_WORKER 569 -#define IDS_ENDERDRAGON 570 -#define IDS_ENDERMAN 571 -#define IDS_ERROR_NETWORK 572 -#define IDS_EXIT_GAME 573 -#define IDS_EXIT_GAME_NO_SAVE 574 -#define IDS_EXIT_GAME_SAVE 575 -#define IDS_EXITING_GAME 576 -#define IDS_FAILED_TO_CREATE_GAME_TITLE 577 -#define IDS_FAILED_TO_LOADSAVE_TEXT 578 -#define IDS_FAILED_TO_SAVE_TEXT 579 -#define IDS_FAILED_TO_SAVE_TITLE 580 -#define IDS_FATAL_ERROR_TEXT 581 -#define IDS_FATAL_ERROR_TITLE 582 -#define IDS_FAVORITES_SKIN_PACK 583 -#define IDS_FIRE_SPREADS 584 -#define IDS_FLOWERPOT 585 -#define IDS_FUEL 586 -#define IDS_FURNACE 587 -#define IDS_GAME_HOST_NAME 588 -#define IDS_GAME_HOST_NAME_UNKNOWN 589 -#define IDS_GAME_MODE_CHANGED 590 -#define IDS_GAME_OPTIONS 591 -#define IDS_GAMEMODE_CREATIVE 592 -#define IDS_GAMEMODE_SURVIVAL 593 -#define IDS_GAMEOPTION_ALLOWFOF 594 -#define IDS_GAMEOPTION_BONUS_CHEST 595 -#define IDS_GAMEOPTION_DISABLE_SAVING 596 -#define IDS_GAMEOPTION_FIRE_SPREADS 597 -#define IDS_GAMEOPTION_HOST_PRIVILEGES 598 -#define IDS_GAMEOPTION_INVITEONLY 599 -#define IDS_GAMEOPTION_ONLINE 600 -#define IDS_GAMEOPTION_PVP 601 -#define IDS_GAMEOPTION_RESET_NETHER 602 -#define IDS_GAMEOPTION_SEED 603 -#define IDS_GAMEOPTION_STRUCTURES 604 -#define IDS_GAMEOPTION_SUPERFLAT 605 -#define IDS_GAMEOPTION_TNT_EXPLODES 606 -#define IDS_GAMEOPTION_TRUST 607 -#define IDS_GAMEOPTION_WORLD_SIZE 608 -#define IDS_GAMERPICS 609 -#define IDS_GENERATE_STRUCTURES 610 -#define IDS_GENERIC_ERROR 611 -#define IDS_GHAST 612 -#define IDS_GRAPHICS 613 -#define IDS_GROUPNAME_ARMOUR 614 -#define IDS_GROUPNAME_BUILDING_BLOCKS 615 -#define IDS_GROUPNAME_DECORATIONS 616 -#define IDS_GROUPNAME_FOOD 617 -#define IDS_GROUPNAME_MATERIALS 618 -#define IDS_GROUPNAME_MECHANISMS 619 -#define IDS_GROUPNAME_MISCELLANEOUS 620 -#define IDS_GROUPNAME_POTIONS 621 -#define IDS_GROUPNAME_POTIONS_480 622 -#define IDS_GROUPNAME_REDSTONE_AND_TRANSPORT 623 -#define IDS_GROUPNAME_STRUCTURES 624 -#define IDS_GROUPNAME_TOOLS 625 -#define IDS_GROUPNAME_TOOLS_WEAPONS_ARMOR 626 -#define IDS_GROUPNAME_TRANSPORT 627 -#define IDS_GROUPNAME_WEAPONS 628 -#define IDS_GUEST_ORDER_CHANGED_TEXT 629 -#define IDS_GUEST_ORDER_CHANGED_TITLE 630 -#define IDS_HELP_AND_OPTIONS 631 -#define IDS_HINTS 632 -#define IDS_HOST_OPTION_DISABLES_ACHIEVEMENTS 633 -#define IDS_HOST_OPTIONS 634 -#define IDS_HOST_PRIVILEGES 635 -#define IDS_HOW_TO_PLAY 636 -#define IDS_HOW_TO_PLAY_ANVIL 637 -#define IDS_HOW_TO_PLAY_BANLIST 638 -#define IDS_HOW_TO_PLAY_BASICS 639 -#define IDS_HOW_TO_PLAY_BREEDANIMALS 640 -#define IDS_HOW_TO_PLAY_BREWING 641 -#define IDS_HOW_TO_PLAY_CHEST 642 -#define IDS_HOW_TO_PLAY_CRAFT_TABLE 643 -#define IDS_HOW_TO_PLAY_CRAFTING 644 -#define IDS_HOW_TO_PLAY_CREATIVE 645 -#define IDS_HOW_TO_PLAY_DISPENSER 646 -#define IDS_HOW_TO_PLAY_ENCHANTMENT 647 -#define IDS_HOW_TO_PLAY_ENDERCHEST 648 -#define IDS_HOW_TO_PLAY_FARMANIMALS 649 -#define IDS_HOW_TO_PLAY_FURNACE 650 -#define IDS_HOW_TO_PLAY_HOSTOPTIONS 651 -#define IDS_HOW_TO_PLAY_HUD 652 -#define IDS_HOW_TO_PLAY_INVENTORY 653 -#define IDS_HOW_TO_PLAY_LARGECHEST 654 -#define IDS_HOW_TO_PLAY_MENU_ANVIL 655 -#define IDS_HOW_TO_PLAY_MENU_BANLIST 656 -#define IDS_HOW_TO_PLAY_MENU_BASICS 657 -#define IDS_HOW_TO_PLAY_MENU_BREEDANIMALS 658 -#define IDS_HOW_TO_PLAY_MENU_BREWING 659 -#define IDS_HOW_TO_PLAY_MENU_CHESTS 660 -#define IDS_HOW_TO_PLAY_MENU_CRAFTING 661 -#define IDS_HOW_TO_PLAY_MENU_CREATIVE 662 -#define IDS_HOW_TO_PLAY_MENU_DISPENSER 663 -#define IDS_HOW_TO_PLAY_MENU_ENCHANTMENT 664 -#define IDS_HOW_TO_PLAY_MENU_FARMANIMALS 665 -#define IDS_HOW_TO_PLAY_MENU_FURNACE 666 -#define IDS_HOW_TO_PLAY_MENU_HOSTOPTIONS 667 -#define IDS_HOW_TO_PLAY_MENU_HUD 668 -#define IDS_HOW_TO_PLAY_MENU_INVENTORY 669 -#define IDS_HOW_TO_PLAY_MENU_MULTIPLAYER 670 -#define IDS_HOW_TO_PLAY_MENU_NETHERPORTAL 671 -#define IDS_HOW_TO_PLAY_MENU_SOCIALMEDIA 672 -#define IDS_HOW_TO_PLAY_MENU_SPRINT 673 -#define IDS_HOW_TO_PLAY_MENU_THEEND 674 -#define IDS_HOW_TO_PLAY_MENU_TRADING 675 -#define IDS_HOW_TO_PLAY_MENU_WHATSNEW 676 -#define IDS_HOW_TO_PLAY_MULTIPLAYER 677 -#define IDS_HOW_TO_PLAY_NETHERPORTAL 678 -#define IDS_HOW_TO_PLAY_NEXT 679 -#define IDS_HOW_TO_PLAY_PREV 680 -#define IDS_HOW_TO_PLAY_SOCIALMEDIA 681 -#define IDS_HOW_TO_PLAY_THEEND 682 -#define IDS_HOW_TO_PLAY_TRADING 683 -#define IDS_HOW_TO_PLAY_WHATSNEW 684 -#define IDS_ICON_SHANK_01 685 -#define IDS_ICON_SHANK_03 686 -#define IDS_IN_GAME_GAMERTAGS 687 -#define IDS_IN_GAME_TOOLTIPS 688 -#define IDS_IN_PARTY_SESSION_FULL 689 -#define IDS_INGREDIENT 690 -#define IDS_INGREDIENTS 691 -#define IDS_INVENTORY 692 -#define IDS_INVERT_LOOK 693 -#define IDS_INVISIBLE 694 -#define IDS_INVITE_ONLY 695 -#define IDS_IRONGOLEM 696 -#define IDS_ITEM_APPLE 697 -#define IDS_ITEM_APPLE_GOLD 698 -#define IDS_ITEM_ARROW 699 -#define IDS_ITEM_BED 700 -#define IDS_ITEM_BEEF_COOKED 701 -#define IDS_ITEM_BEEF_RAW 702 -#define IDS_ITEM_BLAZE_POWDER 703 -#define IDS_ITEM_BLAZE_ROD 704 -#define IDS_ITEM_BOAT 705 -#define IDS_ITEM_BONE 706 -#define IDS_ITEM_BOOK 707 -#define IDS_ITEM_BOOTS_CHAIN 708 -#define IDS_ITEM_BOOTS_CLOTH 709 -#define IDS_ITEM_BOOTS_DIAMOND 710 -#define IDS_ITEM_BOOTS_GOLD 711 -#define IDS_ITEM_BOOTS_IRON 712 -#define IDS_ITEM_BOW 713 -#define IDS_ITEM_BOWL 714 -#define IDS_ITEM_BREAD 715 -#define IDS_ITEM_BREWING_STAND 716 -#define IDS_ITEM_BRICK 717 -#define IDS_ITEM_BUCKET 718 -#define IDS_ITEM_BUCKET_LAVA 719 -#define IDS_ITEM_BUCKET_MILK 720 -#define IDS_ITEM_BUCKET_WATER 721 -#define IDS_ITEM_CAKE 722 -#define IDS_ITEM_CARROT_GOLDEN 723 -#define IDS_ITEM_CARROT_ON_A_STICK 724 -#define IDS_ITEM_CAULDRON 725 -#define IDS_ITEM_CHARCOAL 726 -#define IDS_ITEM_CHESTPLATE_CHAIN 727 -#define IDS_ITEM_CHESTPLATE_CLOTH 728 -#define IDS_ITEM_CHESTPLATE_DIAMOND 729 -#define IDS_ITEM_CHESTPLATE_GOLD 730 -#define IDS_ITEM_CHESTPLATE_IRON 731 -#define IDS_ITEM_CHICKEN_COOKED 732 -#define IDS_ITEM_CHICKEN_RAW 733 -#define IDS_ITEM_CLAY 734 -#define IDS_ITEM_CLOCK 735 -#define IDS_ITEM_COAL 736 -#define IDS_ITEM_COMPASS 737 -#define IDS_ITEM_COOKIE 738 -#define IDS_ITEM_DIAMOND 739 -#define IDS_ITEM_DIODE 740 -#define IDS_ITEM_DOOR_IRON 741 -#define IDS_ITEM_DOOR_WOOD 742 -#define IDS_ITEM_DYE_POWDER 743 -#define IDS_ITEM_DYE_POWDER_BLACK 744 -#define IDS_ITEM_DYE_POWDER_BLUE 745 -#define IDS_ITEM_DYE_POWDER_BROWN 746 -#define IDS_ITEM_DYE_POWDER_CYAN 747 -#define IDS_ITEM_DYE_POWDER_GRAY 748 -#define IDS_ITEM_DYE_POWDER_GREEN 749 -#define IDS_ITEM_DYE_POWDER_LIGHT_BLUE 750 -#define IDS_ITEM_DYE_POWDER_LIME 751 -#define IDS_ITEM_DYE_POWDER_MAGENTA 752 -#define IDS_ITEM_DYE_POWDER_ORANGE 753 -#define IDS_ITEM_DYE_POWDER_PINK 754 -#define IDS_ITEM_DYE_POWDER_PURPLE 755 -#define IDS_ITEM_DYE_POWDER_RED 756 -#define IDS_ITEM_DYE_POWDER_SILVER 757 -#define IDS_ITEM_DYE_POWDER_WHITE 758 -#define IDS_ITEM_DYE_POWDER_YELLOW 759 -#define IDS_ITEM_EGG 760 -#define IDS_ITEM_EMERALD 761 -#define IDS_ITEM_ENCHANTED_BOOK 762 -#define IDS_ITEM_ENDER_PEARL 763 -#define IDS_ITEM_EXP_BOTTLE 764 -#define IDS_ITEM_EYE_OF_ENDER 765 -#define IDS_ITEM_FEATHER 766 -#define IDS_ITEM_FERMENTED_SPIDER_EYE 767 -#define IDS_ITEM_FIREBALL 768 -#define IDS_ITEM_FIREBALLCHARCOAL 769 -#define IDS_ITEM_FIREBALLCOAL 770 -#define IDS_ITEM_FISH_COOKED 771 -#define IDS_ITEM_FISH_RAW 772 -#define IDS_ITEM_FISHING_ROD 773 -#define IDS_ITEM_FLINT 774 -#define IDS_ITEM_FLINT_AND_STEEL 775 -#define IDS_ITEM_GHAST_TEAR 776 -#define IDS_ITEM_GLASS_BOTTLE 777 -#define IDS_ITEM_GOLD_NUGGET 778 -#define IDS_ITEM_HATCHET_DIAMOND 779 -#define IDS_ITEM_HATCHET_GOLD 780 -#define IDS_ITEM_HATCHET_IRON 781 -#define IDS_ITEM_HATCHET_STONE 782 -#define IDS_ITEM_HATCHET_WOOD 783 -#define IDS_ITEM_HELMET_CHAIN 784 -#define IDS_ITEM_HELMET_CLOTH 785 -#define IDS_ITEM_HELMET_DIAMOND 786 -#define IDS_ITEM_HELMET_GOLD 787 -#define IDS_ITEM_HELMET_IRON 788 -#define IDS_ITEM_HOE_DIAMOND 789 -#define IDS_ITEM_HOE_GOLD 790 -#define IDS_ITEM_HOE_IRON 791 -#define IDS_ITEM_HOE_STONE 792 -#define IDS_ITEM_HOE_WOOD 793 -#define IDS_ITEM_INGOT_GOLD 794 -#define IDS_ITEM_INGOT_IRON 795 -#define IDS_ITEM_ITEMFRAME 796 -#define IDS_ITEM_LEATHER 797 -#define IDS_ITEM_LEGGINGS_CHAIN 798 -#define IDS_ITEM_LEGGINGS_CLOTH 799 -#define IDS_ITEM_LEGGINGS_DIAMOND 800 -#define IDS_ITEM_LEGGINGS_GOLD 801 -#define IDS_ITEM_LEGGINGS_IRON 802 -#define IDS_ITEM_MAGMA_CREAM 803 -#define IDS_ITEM_MAP 804 -#define IDS_ITEM_MELON_SEEDS 805 -#define IDS_ITEM_MELON_SLICE 806 -#define IDS_ITEM_MINECART 807 -#define IDS_ITEM_MINECART_CHEST 808 -#define IDS_ITEM_MINECART_FURNACE 809 -#define IDS_ITEM_MONSTER_SPAWNER 810 -#define IDS_ITEM_MUSHROOM_STEW 811 -#define IDS_ITEM_NETHER_QUARTZ 812 -#define IDS_ITEM_NETHER_STALK_SEEDS 813 -#define IDS_ITEM_NETHERBRICK 814 -#define IDS_ITEM_PAINTING 815 -#define IDS_ITEM_PAPER 816 -#define IDS_ITEM_PICKAXE_DIAMOND 817 -#define IDS_ITEM_PICKAXE_GOLD 818 -#define IDS_ITEM_PICKAXE_IRON 819 -#define IDS_ITEM_PICKAXE_STONE 820 -#define IDS_ITEM_PICKAXE_WOOD 821 -#define IDS_ITEM_PORKCHOP_COOKED 822 -#define IDS_ITEM_PORKCHOP_RAW 823 -#define IDS_ITEM_POTATO_BAKED 824 -#define IDS_ITEM_POTATO_POISONOUS 825 -#define IDS_ITEM_POTION 826 -#define IDS_ITEM_PUMPKIN_PIE 827 -#define IDS_ITEM_PUMPKIN_SEEDS 828 -#define IDS_ITEM_RECORD_01 829 -#define IDS_ITEM_RECORD_02 830 -#define IDS_ITEM_RECORD_03 831 -#define IDS_ITEM_RECORD_04 832 -#define IDS_ITEM_RECORD_05 833 -#define IDS_ITEM_RECORD_06 834 -#define IDS_ITEM_RECORD_07 835 -#define IDS_ITEM_RECORD_08 836 -#define IDS_ITEM_RECORD_09 837 -#define IDS_ITEM_RECORD_10 838 -#define IDS_ITEM_RECORD_11 839 -#define IDS_ITEM_RECORD_12 840 -#define IDS_ITEM_REDSTONE 841 -#define IDS_ITEM_REEDS 842 -#define IDS_ITEM_ROTTEN_FLESH 843 -#define IDS_ITEM_SADDLE 844 -#define IDS_ITEM_SHEARS 845 -#define IDS_ITEM_SHOVEL_DIAMOND 846 -#define IDS_ITEM_SHOVEL_GOLD 847 -#define IDS_ITEM_SHOVEL_IRON 848 -#define IDS_ITEM_SHOVEL_STONE 849 -#define IDS_ITEM_SHOVEL_WOOD 850 -#define IDS_ITEM_SIGN 851 -#define IDS_ITEM_SKULL 852 -#define IDS_ITEM_SKULL_CHARACTER 853 -#define IDS_ITEM_SKULL_CREEPER 854 -#define IDS_ITEM_SKULL_PLAYER 855 -#define IDS_ITEM_SKULL_SKELETON 856 -#define IDS_ITEM_SKULL_WITHER 857 -#define IDS_ITEM_SKULL_ZOMBIE 858 -#define IDS_ITEM_SLIMEBALL 859 -#define IDS_ITEM_SNOWBALL 860 -#define IDS_ITEM_SPECKLED_MELON 861 -#define IDS_ITEM_SPIDER_EYE 862 -#define IDS_ITEM_STICK 863 -#define IDS_ITEM_STRING 864 -#define IDS_ITEM_SUGAR 865 -#define IDS_ITEM_SULPHUR 866 -#define IDS_ITEM_SWORD_DIAMOND 867 -#define IDS_ITEM_SWORD_GOLD 868 -#define IDS_ITEM_SWORD_IRON 869 -#define IDS_ITEM_SWORD_STONE 870 -#define IDS_ITEM_SWORD_WOOD 871 -#define IDS_ITEM_WATER_BOTTLE 872 -#define IDS_ITEM_WHEAT 873 -#define IDS_ITEM_WHEAT_SEEDS 874 -#define IDS_ITEM_YELLOW_DUST 875 -#define IDS_JOIN_GAME 876 -#define IDS_KEYBOARDUI_SAVEGAME_TEXT 877 -#define IDS_KEYBOARDUI_SAVEGAME_TITLE 878 -#define IDS_KICK_PLAYER 879 -#define IDS_KICK_PLAYER_DESCRIPTION 880 -#define IDS_LABEL_DIFFICULTY 881 -#define IDS_LABEL_FIRE_SPREADS 882 -#define IDS_LABEL_GAME_TYPE 883 -#define IDS_LABEL_GAMERTAGS 884 -#define IDS_LABEL_LEVEL_TYPE 885 -#define IDS_LABEL_PvP 886 -#define IDS_LABEL_STRUCTURES 887 -#define IDS_LABEL_TNT 888 -#define IDS_LABEL_TRUST 889 -#define IDS_LAVA_SLIME 890 -#define IDS_LEADERBOARD_ENTRIES 891 -#define IDS_LEADERBOARD_FARMING_EASY 892 -#define IDS_LEADERBOARD_FARMING_HARD 893 -#define IDS_LEADERBOARD_FARMING_NORMAL 894 -#define IDS_LEADERBOARD_FARMING_PEACEFUL 895 -#define IDS_LEADERBOARD_FILTER 896 -#define IDS_LEADERBOARD_FILTER_FRIENDS 897 -#define IDS_LEADERBOARD_FILTER_MYSCORE 898 -#define IDS_LEADERBOARD_FILTER_OVERALL 899 -#define IDS_LEADERBOARD_GAMERTAG 900 -#define IDS_LEADERBOARD_KILLS_EASY 901 -#define IDS_LEADERBOARD_KILLS_HARD 902 -#define IDS_LEADERBOARD_KILLS_NORMAL 903 -#define IDS_LEADERBOARD_LOADING 904 -#define IDS_LEADERBOARD_MINING_BLOCKS_EASY 905 -#define IDS_LEADERBOARD_MINING_BLOCKS_HARD 906 -#define IDS_LEADERBOARD_MINING_BLOCKS_NORMAL 907 -#define IDS_LEADERBOARD_MINING_BLOCKS_PEACEFUL 908 -#define IDS_LEADERBOARD_NORESULTS 909 -#define IDS_LEADERBOARD_RANK 910 -#define IDS_LEADERBOARD_SCORE_HIDDEN 911 -#define IDS_LEADERBOARD_TRAVELLING_EASY 912 -#define IDS_LEADERBOARD_TRAVELLING_HARD 913 -#define IDS_LEADERBOARD_TRAVELLING_NORMAL 914 -#define IDS_LEADERBOARD_TRAVELLING_PEACEFUL 915 -#define IDS_LEADERBOARDS 916 -#define IDS_LEVELTYPE_NORMAL 917 -#define IDS_LEVELTYPE_SUPERFLAT 918 -#define IDS_LOAD 919 -#define IDS_LOAD_SAVED_WORLD 920 -#define IDS_MAX_BOATS 921 -#define IDS_MAX_CHICKENS_BRED 922 -#define IDS_MAX_CHICKENS_SPAWNED 923 -#define IDS_MAX_ENEMIES_SPAWNED 924 -#define IDS_MAX_HANGINGENTITIES 925 -#define IDS_MAX_MOOSHROOMS_SPAWNED 926 -#define IDS_MAX_MUSHROOMCOWS_BRED 927 -#define IDS_MAX_PIGS_SHEEP_COWS_CATS_BRED 928 -#define IDS_MAX_PIGS_SHEEP_COWS_CATS_SPAWNED 929 -#define IDS_MAX_SKULL_TILES 930 -#define IDS_MAX_SQUID_SPAWNED 931 -#define IDS_MAX_VILLAGERS_SPAWNED 932 -#define IDS_MAX_WOLVES_BRED 933 -#define IDS_MAX_WOLVES_SPAWNED 934 -#define IDS_MINUTES 935 -#define IDS_MODERATOR 936 -#define IDS_MORE_OPTIONS 937 -#define IDS_MULTIPLAYER_FULL_TEXT 938 -#define IDS_MULTIPLAYER_FULL_TITLE 939 -#define IDS_MUSHROOM_COW 940 -#define IDS_MUST_SIGN_IN_TEXT 941 -#define IDS_MUST_SIGN_IN_TITLE 942 -#define IDS_NAME_CAPTION 943 -#define IDS_NAME_CAPTION_TEXT 944 -#define IDS_NAME_DESC 945 -#define IDS_NAME_DESC_TEXT 946 -#define IDS_NAME_TITLE 947 -#define IDS_NAME_TITLE_TEXT 948 -#define IDS_NAME_WORLD 949 -#define IDS_NAME_WORLD_TEXT 950 -#define IDS_NO 951 -#define IDS_NO_DLCOFFERS 952 -#define IDS_NO_GAMES_FOUND 953 -#define IDS_NO_MULTIPLAYER_PRIVILEGE_HOST_TEXT 954 -#define IDS_NO_MULTIPLAYER_PRIVILEGE_JOIN_TEXT 955 -#define IDS_NO_MULTIPLAYER_PRIVILEGE_TITLE 956 -#define IDS_NO_SKIN_PACK 957 -#define IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_ALL_LOCAL 958 -#define IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_CREATE 959 -#define IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_REMOTE 960 -#define IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_SINGLE_LOCAL 961 -#define IDS_NODEVICE_ACCEPT 962 -#define IDS_NODEVICE_DECLINE 963 -#define IDS_NODEVICE_TEXT 964 -#define IDS_NODEVICE_TITLE 965 -#define IDS_NOFREESPACE_TEXT 966 -#define IDS_NOFREESPACE_TITLE 967 -#define IDS_NOTALLOWED_FRIENDSOFFRIENDS 968 -#define IDS_NOWPLAYING 969 -#define IDS_NULL 970 -#define IDS_OFF 971 -#define IDS_OK 972 -#define IDS_ON 973 -#define IDS_ONLINE_GAME 974 -#define IDS_OPTIONS 975 -#define IDS_OVERWRITESAVE_NO 976 -#define IDS_OVERWRITESAVE_TEXT 977 -#define IDS_OVERWRITESAVE_TITLE 978 -#define IDS_OVERWRITESAVE_YES 979 -#define IDS_OZELOT 980 -#define IDS_PIG 981 -#define IDS_PIGZOMBIE 982 -#define IDS_PLATFORM_NAME 983 -#define IDS_PLAY_GAME 984 -#define IDS_PLAY_TRIAL_GAME 985 -#define IDS_PLAY_TUTORIAL 986 -#define IDS_PLAYER_BANNED_LEVEL 987 -#define IDS_PLAYER_ENTERED_END 988 -#define IDS_PLAYER_JOINED 989 -#define IDS_PLAYER_KICKED 990 -#define IDS_PLAYER_LEFT 991 -#define IDS_PLAYER_LEFT_END 992 -#define IDS_PLAYER_VS_PLAYER 993 -#define IDS_PLAYERS 994 -#define IDS_PLAYERS_INVITE 995 -#define IDS_PLAYWITHOUTSAVING 996 -#define IDS_POTATO 997 -#define IDS_POTION_BLINDNESS 998 -#define IDS_POTION_BLINDNESS_POSTFIX 999 -#define IDS_POTION_CONFUSION 1000 -#define IDS_POTION_CONFUSION_POSTFIX 1001 -#define IDS_POTION_DAMAGEBOOST 1002 -#define IDS_POTION_DAMAGEBOOST_POSTFIX 1003 -#define IDS_POTION_DESC_DAMAGEBOOST 1004 -#define IDS_POTION_DESC_EMPTY 1005 -#define IDS_POTION_DESC_FIRERESISTANCE 1006 -#define IDS_POTION_DESC_HARM 1007 -#define IDS_POTION_DESC_HEAL 1008 -#define IDS_POTION_DESC_INVISIBILITY 1009 -#define IDS_POTION_DESC_MOVESLOWDOWN 1010 -#define IDS_POTION_DESC_MOVESPEED 1011 -#define IDS_POTION_DESC_NIGHTVISION 1012 -#define IDS_POTION_DESC_POISON 1013 -#define IDS_POTION_DESC_REGENERATION 1014 -#define IDS_POTION_DESC_WATER_BOTTLE 1015 -#define IDS_POTION_DESC_WEAKNESS 1016 -#define IDS_POTION_DIGSLOWDOWN 1017 -#define IDS_POTION_DIGSLOWDOWN_POSTFIX 1018 -#define IDS_POTION_DIGSPEED 1019 -#define IDS_POTION_DIGSPEED_POSTFIX 1020 -#define IDS_POTION_EMPTY 1021 -#define IDS_POTION_FIRERESISTANCE 1022 -#define IDS_POTION_FIRERESISTANCE_POSTFIX 1023 -#define IDS_POTION_HARM 1024 -#define IDS_POTION_HARM_POSTFIX 1025 -#define IDS_POTION_HEAL 1026 -#define IDS_POTION_HEAL_POSTFIX 1027 -#define IDS_POTION_HUNGER 1028 -#define IDS_POTION_HUNGER_POSTFIX 1029 -#define IDS_POTION_INVISIBILITY 1030 -#define IDS_POTION_INVISIBILITY_POSTFIX 1031 -#define IDS_POTION_JUMP 1032 -#define IDS_POTION_JUMP_POSTFIX 1033 -#define IDS_POTION_MOVESLOWDOWN 1034 -#define IDS_POTION_MOVESLOWDOWN_POSTFIX 1035 -#define IDS_POTION_MOVESPEED 1036 -#define IDS_POTION_MOVESPEED_POSTFIX 1037 -#define IDS_POTION_NIGHTVISION 1038 -#define IDS_POTION_NIGHTVISION_POSTFIX 1039 -#define IDS_POTION_POISON 1040 -#define IDS_POTION_POISON_POSTFIX 1041 -#define IDS_POTION_POTENCY_0 1042 -#define IDS_POTION_POTENCY_1 1043 -#define IDS_POTION_POTENCY_2 1044 -#define IDS_POTION_POTENCY_3 1045 -#define IDS_POTION_PREFIX_ACRID 1046 -#define IDS_POTION_PREFIX_ARTLESS 1047 -#define IDS_POTION_PREFIX_AWKWARD 1048 -#define IDS_POTION_PREFIX_BLAND 1049 -#define IDS_POTION_PREFIX_BULKY 1050 -#define IDS_POTION_PREFIX_BUNGLING 1051 -#define IDS_POTION_PREFIX_BUTTERED 1052 -#define IDS_POTION_PREFIX_CHARMING 1053 -#define IDS_POTION_PREFIX_CLEAR 1054 -#define IDS_POTION_PREFIX_CORDIAL 1055 -#define IDS_POTION_PREFIX_DASHING 1056 -#define IDS_POTION_PREFIX_DEBONAIR 1057 -#define IDS_POTION_PREFIX_DIFFUSE 1058 -#define IDS_POTION_PREFIX_ELEGANT 1059 -#define IDS_POTION_PREFIX_FANCY 1060 -#define IDS_POTION_PREFIX_FLAT 1061 -#define IDS_POTION_PREFIX_FOUL 1062 -#define IDS_POTION_PREFIX_GRENADE 1063 -#define IDS_POTION_PREFIX_GROSS 1064 -#define IDS_POTION_PREFIX_HARSH 1065 -#define IDS_POTION_PREFIX_MILKY 1066 -#define IDS_POTION_PREFIX_MUNDANE 1067 -#define IDS_POTION_PREFIX_ODORLESS 1068 -#define IDS_POTION_PREFIX_POTENT 1069 -#define IDS_POTION_PREFIX_RANK 1070 -#define IDS_POTION_PREFIX_REFINED 1071 -#define IDS_POTION_PREFIX_SMOOTH 1072 -#define IDS_POTION_PREFIX_SPARKLING 1073 -#define IDS_POTION_PREFIX_STINKY 1074 -#define IDS_POTION_PREFIX_SUAVE 1075 -#define IDS_POTION_PREFIX_THICK 1076 -#define IDS_POTION_PREFIX_THIN 1077 -#define IDS_POTION_PREFIX_UNINTERESTING 1078 -#define IDS_POTION_REGENERATION 1079 -#define IDS_POTION_REGENERATION_POSTFIX 1080 -#define IDS_POTION_RESISTANCE 1081 -#define IDS_POTION_RESISTANCE_POSTFIX 1082 -#define IDS_POTION_WATERBREATHING 1083 -#define IDS_POTION_WATERBREATHING_POSTFIX 1084 -#define IDS_POTION_WEAKNESS 1085 -#define IDS_POTION_WEAKNESS_POSTFIX 1086 -#define IDS_PRESS_START_TO_JOIN 1087 -#define IDS_PRIV_ATTACK_ANIMAL_TOGGLE_OFF 1088 -#define IDS_PRIV_ATTACK_ANIMAL_TOGGLE_ON 1089 -#define IDS_PRIV_ATTACK_MOB_TOGGLE_OFF 1090 -#define IDS_PRIV_ATTACK_MOB_TOGGLE_ON 1091 -#define IDS_PRIV_ATTACK_PLAYER_TOGGLE_OFF 1092 -#define IDS_PRIV_ATTACK_PLAYER_TOGGLE_ON 1093 -#define IDS_PRIV_BUILD_TOGGLE_OFF 1094 -#define IDS_PRIV_BUILD_TOGGLE_ON 1095 -#define IDS_PRIV_CAN_EXHAUSTION_TOGGLE_OFF 1096 -#define IDS_PRIV_CAN_EXHAUSTION_TOGGLE_ON 1097 -#define IDS_PRIV_CAN_FLY_TOGGLE_OFF 1098 -#define IDS_PRIV_CAN_FLY_TOGGLE_ON 1099 -#define IDS_PRIV_CAN_INVISIBLE_TOGGLE_OFF 1100 -#define IDS_PRIV_CAN_INVISIBLE_TOGGLE_ON 1101 -#define IDS_PRIV_CAN_TELEPORT_TOGGLE_OFF 1102 -#define IDS_PRIV_CAN_TELEPORT_TOGGLE_ON 1103 -#define IDS_PRIV_EXHAUSTION_TOGGLE_OFF 1104 -#define IDS_PRIV_EXHAUSTION_TOGGLE_ON 1105 -#define IDS_PRIV_FLY_TOGGLE_OFF 1106 -#define IDS_PRIV_FLY_TOGGLE_ON 1107 -#define IDS_PRIV_INVISIBLE_TOGGLE_OFF 1108 -#define IDS_PRIV_INVISIBLE_TOGGLE_ON 1109 -#define IDS_PRIV_INVULNERABLE_TOGGLE_OFF 1110 -#define IDS_PRIV_INVULNERABLE_TOGGLE_ON 1111 -#define IDS_PRIV_MINE_TOGGLE_OFF 1112 -#define IDS_PRIV_MINE_TOGGLE_ON 1113 -#define IDS_PRIV_MODERATOR_TOGGLE_OFF 1114 -#define IDS_PRIV_MODERATOR_TOGGLE_ON 1115 -#define IDS_PRIV_USE_CONTAINERS_TOGGLE_OFF 1116 -#define IDS_PRIV_USE_CONTAINERS_TOGGLE_ON 1117 -#define IDS_PRIV_USE_DOORS_TOGGLE_OFF 1118 -#define IDS_PRIV_USE_DOORS_TOGGLE_ON 1119 -#define IDS_PRO_ACHIEVEMENTPROBLEM_TEXT 1120 -#define IDS_PRO_ACHIEVEMENTPROBLEM_TITLE 1121 -#define IDS_PRO_GUESTPROFILE_TEXT 1122 -#define IDS_PRO_GUESTPROFILE_TITLE 1123 -#define IDS_PRO_NOPROFILE_TITLE 1124 -#define IDS_PRO_NOPROFILEOPTIONS_TEXT 1125 -#define IDS_PRO_NOTONLINE_ACCEPT 1126 -#define IDS_PRO_NOTONLINE_DECLINE 1127 -#define IDS_PRO_NOTONLINE_TEXT 1128 -#define IDS_PRO_NOTONLINE_TITLE 1129 -#define IDS_PRO_PROFILEPROBLEM_TEXT 1130 -#define IDS_PRO_RETURNEDTOMENU_ACCEPT 1131 -#define IDS_PRO_RETURNEDTOMENU_TEXT 1132 -#define IDS_PRO_RETURNEDTOMENU_TITLE 1133 -#define IDS_PRO_RETURNEDTOTITLESCREEN_TEXT 1134 -#define IDS_PRO_UNLOCKGAME_TEXT 1135 -#define IDS_PRO_UNLOCKGAME_TITLE 1136 -#define IDS_PRO_XBOXLIVE_NOTIFICATION 1137 -#define IDS_PROGRESS_AUTOSAVING_LEVEL 1138 -#define IDS_PROGRESS_BUILDING_TERRAIN 1139 -#define IDS_PROGRESS_CONNECTING 1140 -#define IDS_PROGRESS_CONVERTING_TO_OFFLINE_GAME 1141 -#define IDS_PROGRESS_COPYING_SAVE 1142 -#define IDS_PROGRESS_DOWNLOADING_TERRAIN 1143 -#define IDS_PROGRESS_ENTERING_END 1144 -#define IDS_PROGRESS_ENTERING_NETHER 1145 -#define IDS_PROGRESS_GENERATING_LEVEL 1146 -#define IDS_PROGRESS_GENERATING_SPAWN_AREA 1147 -#define IDS_PROGRESS_HOST_SAVING 1148 -#define IDS_PROGRESS_INITIALISING_SERVER 1149 -#define IDS_PROGRESS_LEAVING_END 1150 -#define IDS_PROGRESS_LEAVING_NETHER 1151 -#define IDS_PROGRESS_LOADING_LEVEL 1152 -#define IDS_PROGRESS_LOADING_SPAWN_AREA 1153 -#define IDS_PROGRESS_NEW_WORLD_SEED 1154 -#define IDS_PROGRESS_RESPAWNING 1155 -#define IDS_PROGRESS_SAVING_CHUNKS 1156 -#define IDS_PROGRESS_SAVING_LEVEL 1157 -#define IDS_PROGRESS_SAVING_PLAYERS 1158 -#define IDS_PROGRESS_SAVING_TO_DISC 1159 -#define IDS_PROGRESS_SIMULATING_WORLD 1160 -#define IDS_REINSTALL_AVATAR_ITEM_1 1161 -#define IDS_REINSTALL_AVATAR_ITEM_2 1162 -#define IDS_REINSTALL_AVATAR_ITEM_3 1163 -#define IDS_REINSTALL_CONTENT 1164 -#define IDS_REINSTALL_GAMERPIC_1 1165 -#define IDS_REINSTALL_GAMERPIC_2 1166 -#define IDS_REINSTALL_THEME 1167 -#define IDS_RENAME_WORLD_TEXT 1168 -#define IDS_RENAME_WORLD_TITLE 1169 -#define IDS_REPAIR_AND_NAME 1170 -#define IDS_REPAIR_COST 1171 -#define IDS_REPAIR_EXPENSIVE 1172 -#define IDS_REQUIRED_ITEMS_FOR_TRADE 1173 -#define IDS_RESET_NETHER 1174 -#define IDS_RESET_TO_DEFAULTS 1175 -#define IDS_RESETNETHER_TEXT 1176 -#define IDS_RESETNETHER_TITLE 1177 -#define IDS_RESPAWN 1178 -#define IDS_RESUME_GAME 1179 -#define IDS_RETURNEDTOMENU_TITLE 1180 -#define IDS_RETURNEDTOTITLESCREEN_TEXT 1181 -#define IDS_SAVE_GAME 1182 -#define IDS_SAVE_ICON_MESSAGE 1183 -#define IDS_SAVE_INCOMPLETE_DELETE_SAVES 1184 -#define IDS_SAVE_INCOMPLETE_DISABLE_SAVING 1185 -#define IDS_SAVE_INCOMPLETE_EXPLANATION_LOCAL_STORAGE 1186 -#define IDS_SAVE_INCOMPLETE_EXPLANATION_QUOTA 1187 -#define IDS_SAVE_INCOMPLETE_RETRY_SAVING 1188 -#define IDS_SAVE_INCOMPLETE_TITLE 1189 -#define IDS_SAVE_TRANSFER_DOWNLOAD_AND_CONVERT_COMPLETE 1190 -#define IDS_SAVE_TRANSFER_DOWNLOAD_CANCELLED 1191 -#define IDS_SAVE_TRANSFER_DOWNLOAD_CANCELLING 1192 -#define IDS_SAVETRANSFER_NONE_FOUND 1193 -#define IDS_SAVETRANSFER_STAGE_CONVERTING 1194 -#define IDS_SAVETRANSFER_STAGE_GET_DATA 1195 -#define IDS_SAVETRANSFER_STAGE_GET_DETAILS 1196 -#define IDS_SAVETRANSFER_STAGE_SAVING 1197 -#define IDS_SAVETRANSFER_TITLE_GET 1198 -#define IDS_SEED 1199 -#define IDS_SELECTAGAIN 1200 -#define IDS_SELECTANEWDEVICE 1201 -#define IDS_SELECTED 1202 -#define IDS_SELECTED_SKIN 1203 -#define IDS_SETTINGS 1204 -#define IDS_SHEEP 1205 -#define IDS_SIGN_TITLE 1206 -#define IDS_SIGN_TITLE_TEXT 1207 -#define IDS_SILVERFISH 1208 -#define IDS_SKELETON 1209 -#define IDS_SKINS 1210 -#define IDS_SLIDER_AUTOSAVE 1211 -#define IDS_SLIDER_AUTOSAVE_OFF 1212 -#define IDS_SLIDER_DIFFICULTY 1213 -#define IDS_SLIDER_GAMMA 1214 -#define IDS_SLIDER_INTERFACEOPACITY 1215 -#define IDS_SLIDER_MUSIC 1216 -#define IDS_SLIDER_SENSITIVITY_INGAME 1217 -#define IDS_SLIDER_SENSITIVITY_INMENU 1218 -#define IDS_SLIDER_SOUND 1219 -#define IDS_SLIDER_UISIZE 1220 -#define IDS_SLIDER_UISIZESPLITSCREEN 1221 -#define IDS_SLIME 1222 -#define IDS_SNOWMAN 1223 -#define IDS_SOCIAL_DEFAULT_CAPTION 1224 -#define IDS_SOCIAL_DEFAULT_DESCRIPTION 1225 -#define IDS_SOCIAL_LABEL_CAPTION 1226 -#define IDS_SOCIAL_LABEL_DESCRIPTION 1227 -#define IDS_SOCIAL_TEXT 1228 -#define IDS_SOUTHPAW 1229 -#define IDS_SPIDER 1230 -#define IDS_SQUID 1231 -#define IDS_START_GAME 1232 -#define IDS_STO_SAVING_LONG 1233 -#define IDS_STO_SAVING_SHORT 1234 -#define IDS_STORAGEDEVICEPROBLEM_TITLE 1235 -#define IDS_STRINGVERIFY_AWAITING_APPROVAL 1236 -#define IDS_STRINGVERIFY_CENSORED 1237 -#define IDS_SUPERFLAT_WORLD 1238 -#define IDS_SURVIVAL 1239 -#define IDS_TELEPORT 1240 -#define IDS_TELEPORT_TO_ME 1241 -#define IDS_TELEPORT_TO_PLAYER 1242 -#define IDS_TEXT_COPY_SAVE 1243 -#define IDS_TEXT_DELETE_SAVE 1244 -#define IDS_TEXT_SAVEOPTIONS 1245 -#define IDS_TEXTURE_PACK_TRIALVERSION 1246 -#define IDS_TEXTUREPACK_FULLVERSION 1247 -#define IDS_THEMES 1248 -#define IDS_TILE_ANVIL 1249 -#define IDS_TILE_ANVIL_INTACT 1250 -#define IDS_TILE_ANVIL_SLIGHTLYDAMAGED 1251 -#define IDS_TILE_ANVIL_VERYDAMAGED 1252 -#define IDS_TILE_BED 1253 -#define IDS_TILE_BED_MESLEEP 1254 -#define IDS_TILE_BED_NO_SLEEP 1255 -#define IDS_TILE_BED_NOT_VALID 1256 -#define IDS_TILE_BED_NOTSAFE 1257 -#define IDS_TILE_BED_OCCUPIED 1258 -#define IDS_TILE_BED_PLAYERSLEEP 1259 -#define IDS_TILE_BEDROCK 1260 -#define IDS_TILE_BIRCH 1261 -#define IDS_TILE_BIRCHWOOD_PLANKS 1262 -#define IDS_TILE_BLOCK_DIAMOND 1263 -#define IDS_TILE_BLOCK_GOLD 1264 -#define IDS_TILE_BLOCK_IRON 1265 -#define IDS_TILE_BLOCK_LAPIS 1266 -#define IDS_TILE_BOOKSHELF 1267 -#define IDS_TILE_BREWINGSTAND 1268 -#define IDS_TILE_BRICK 1269 -#define IDS_TILE_BUTTON 1270 -#define IDS_TILE_CACTUS 1271 -#define IDS_TILE_CAKE 1272 -#define IDS_TILE_CARPET 1273 -#define IDS_TILE_CARPET_BLACK 1274 -#define IDS_TILE_CARPET_BLUE 1275 -#define IDS_TILE_CARPET_BROWN 1276 -#define IDS_TILE_CARPET_CYAN 1277 -#define IDS_TILE_CARPET_GRAY 1278 -#define IDS_TILE_CARPET_GREEN 1279 -#define IDS_TILE_CARPET_LIGHT_BLUE 1280 -#define IDS_TILE_CARPET_LIME 1281 -#define IDS_TILE_CARPET_MAGENTA 1282 -#define IDS_TILE_CARPET_ORANGE 1283 -#define IDS_TILE_CARPET_PINK 1284 -#define IDS_TILE_CARPET_PURPLE 1285 -#define IDS_TILE_CARPET_RED 1286 -#define IDS_TILE_CARPET_SILVER 1287 -#define IDS_TILE_CARPET_WHITE 1288 -#define IDS_TILE_CARPET_YELLOW 1289 -#define IDS_TILE_CARROTS 1290 -#define IDS_TILE_CAULDRON 1291 -#define IDS_TILE_CHEST 1292 -#define IDS_TILE_CLAY 1293 -#define IDS_TILE_CLOTH 1294 -#define IDS_TILE_CLOTH_BLACK 1295 -#define IDS_TILE_CLOTH_BLUE 1296 -#define IDS_TILE_CLOTH_BROWN 1297 -#define IDS_TILE_CLOTH_CYAN 1298 -#define IDS_TILE_CLOTH_GRAY 1299 -#define IDS_TILE_CLOTH_GREEN 1300 -#define IDS_TILE_CLOTH_LIGHT_BLUE 1301 -#define IDS_TILE_CLOTH_LIME 1302 -#define IDS_TILE_CLOTH_MAGENTA 1303 -#define IDS_TILE_CLOTH_ORANGE 1304 -#define IDS_TILE_CLOTH_PINK 1305 -#define IDS_TILE_CLOTH_PURPLE 1306 -#define IDS_TILE_CLOTH_RED 1307 -#define IDS_TILE_CLOTH_SILVER 1308 -#define IDS_TILE_CLOTH_WHITE 1309 -#define IDS_TILE_CLOTH_YELLOW 1310 -#define IDS_TILE_COBBLESTONE_WALL 1311 -#define IDS_TILE_COBBLESTONE_WALL_MOSSY 1312 -#define IDS_TILE_COCOA 1313 -#define IDS_TILE_CROPS 1314 -#define IDS_TILE_DEAD_BUSH 1315 -#define IDS_TILE_DETECTOR_RAIL 1316 -#define IDS_TILE_DIODE 1317 -#define IDS_TILE_DIRT 1318 -#define IDS_TILE_DISPENSER 1319 -#define IDS_TILE_DOOR_IRON 1320 -#define IDS_TILE_DOOR_WOOD 1321 -#define IDS_TILE_DRAGONEGG 1322 -#define IDS_TILE_EMERALDBLOCK 1323 -#define IDS_TILE_EMERALDORE 1324 -#define IDS_TILE_ENCHANTMENTTABLE 1325 -#define IDS_TILE_END_PORTAL 1326 -#define IDS_TILE_ENDERCHEST 1327 -#define IDS_TILE_ENDPORTALFRAME 1328 -#define IDS_TILE_FARMLAND 1329 -#define IDS_TILE_FENCE 1330 -#define IDS_TILE_FENCE_GATE 1331 -#define IDS_TILE_FERN 1332 -#define IDS_TILE_FIRE 1333 -#define IDS_TILE_FLOWER 1334 -#define IDS_TILE_FLOWERPOT 1335 -#define IDS_TILE_FURNACE 1336 -#define IDS_TILE_GLASS 1337 -#define IDS_TILE_GOLDEN_RAIL 1338 -#define IDS_TILE_GRASS 1339 -#define IDS_TILE_GRAVEL 1340 -#define IDS_TILE_HELL_ROCK 1341 -#define IDS_TILE_HELL_SAND 1342 -#define IDS_TILE_HUGE_MUSHROOM_1 1343 -#define IDS_TILE_HUGE_MUSHROOM_2 1344 -#define IDS_TILE_ICE 1345 -#define IDS_TILE_IRON_FENCE 1346 -#define IDS_TILE_JUKEBOX 1347 -#define IDS_TILE_JUNGLE_PLANKS 1348 -#define IDS_TILE_LADDER 1349 -#define IDS_TILE_LAVA 1350 -#define IDS_TILE_LEAVES 1351 -#define IDS_TILE_LEAVES_BIRCH 1352 -#define IDS_TILE_LEAVES_JUNGLE 1353 -#define IDS_TILE_LEAVES_OAK 1354 -#define IDS_TILE_LEAVES_SPRUCE 1355 -#define IDS_TILE_LEVER 1356 -#define IDS_TILE_LIGHT_GEM 1357 -#define IDS_TILE_LIT_PUMPKIN 1358 -#define IDS_TILE_LOCKED_CHEST 1359 -#define IDS_TILE_LOG 1360 -#define IDS_TILE_LOG_BIRCH 1361 -#define IDS_TILE_LOG_JUNGLE 1362 -#define IDS_TILE_LOG_OAK 1363 -#define IDS_TILE_LOG_SPRUCE 1364 -#define IDS_TILE_MELON 1365 -#define IDS_TILE_MELON_STEM 1366 -#define IDS_TILE_MOB_SPAWNER 1367 -#define IDS_TILE_MONSTER_STONE_EGG 1368 -#define IDS_TILE_MUSHROOM 1369 -#define IDS_TILE_MUSIC_BLOCK 1370 -#define IDS_TILE_MYCEL 1371 -#define IDS_TILE_NETHER_QUARTZ 1372 -#define IDS_TILE_NETHERBRICK 1373 -#define IDS_TILE_NETHERFENCE 1374 -#define IDS_TILE_NETHERSTALK 1375 -#define IDS_TILE_NOT_GATE 1376 -#define IDS_TILE_OAK 1377 -#define IDS_TILE_OAKWOOD_PLANKS 1378 -#define IDS_TILE_OBSIDIAN 1379 -#define IDS_TILE_ORE_COAL 1380 -#define IDS_TILE_ORE_DIAMOND 1381 -#define IDS_TILE_ORE_GOLD 1382 -#define IDS_TILE_ORE_IRON 1383 -#define IDS_TILE_ORE_LAPIS 1384 -#define IDS_TILE_ORE_REDSTONE 1385 -#define IDS_TILE_PISTON_BASE 1386 -#define IDS_TILE_PISTON_STICK_BASE 1387 -#define IDS_TILE_PORTAL 1388 -#define IDS_TILE_POTATOES 1389 -#define IDS_TILE_PRESSURE_PLATE 1390 -#define IDS_TILE_PUMPKIN 1391 -#define IDS_TILE_PUMPKIN_STEM 1392 -#define IDS_TILE_QUARTZ_BLOCK 1393 -#define IDS_TILE_QUARTZ_BLOCK_CHISELED 1394 -#define IDS_TILE_QUARTZ_BLOCK_LINES 1395 -#define IDS_TILE_RAIL 1396 -#define IDS_TILE_REDSTONE_DUST 1397 -#define IDS_TILE_REDSTONE_LIGHT 1398 -#define IDS_TILE_REEDS 1399 -#define IDS_TILE_ROSE 1400 -#define IDS_TILE_SAND 1401 -#define IDS_TILE_SANDSTONE 1402 -#define IDS_TILE_SANDSTONE_CHISELED 1403 -#define IDS_TILE_SANDSTONE_SMOOTH 1404 -#define IDS_TILE_SAPLING 1405 -#define IDS_TILE_SAPLING_BIRCH 1406 -#define IDS_TILE_SAPLING_JUNGLE 1407 -#define IDS_TILE_SAPLING_OAK 1408 -#define IDS_TILE_SAPLING_SPRUCE 1409 -#define IDS_TILE_SHRUB 1410 -#define IDS_TILE_SIGN 1411 -#define IDS_TILE_SKULL 1412 -#define IDS_TILE_SNOW 1413 -#define IDS_TILE_SPONGE 1414 -#define IDS_TILE_SPRUCE 1415 -#define IDS_TILE_SPRUCEWOOD_PLANKS 1416 -#define IDS_TILE_STAIRS_BIRCHWOOD 1417 -#define IDS_TILE_STAIRS_BRICKS 1418 -#define IDS_TILE_STAIRS_JUNGLEWOOD 1419 -#define IDS_TILE_STAIRS_NETHERBRICK 1420 -#define IDS_TILE_STAIRS_QUARTZ 1421 -#define IDS_TILE_STAIRS_SANDSTONE 1422 -#define IDS_TILE_STAIRS_SPRUCEWOOD 1423 -#define IDS_TILE_STAIRS_STONE 1424 -#define IDS_TILE_STAIRS_STONE_BRICKS_SMOOTH 1425 -#define IDS_TILE_STAIRS_WOOD 1426 -#define IDS_TILE_STONE 1427 -#define IDS_TILE_STONE_BRICK 1428 -#define IDS_TILE_STONE_BRICK_SMOOTH 1429 -#define IDS_TILE_STONE_BRICK_SMOOTH_CHISELED 1430 -#define IDS_TILE_STONE_BRICK_SMOOTH_CRACKED 1431 -#define IDS_TILE_STONE_BRICK_SMOOTH_MOSSY 1432 -#define IDS_TILE_STONE_MOSS 1433 -#define IDS_TILE_STONE_SILVERFISH 1434 -#define IDS_TILE_STONE_SILVERFISH_COBBLESTONE 1435 -#define IDS_TILE_STONE_SILVERFISH_STONE_BRICK 1436 -#define IDS_TILE_STONESLAB 1437 -#define IDS_TILE_STONESLAB_BIRCH 1438 -#define IDS_TILE_STONESLAB_BRICK 1439 -#define IDS_TILE_STONESLAB_COBBLE 1440 -#define IDS_TILE_STONESLAB_JUNGLE 1441 -#define IDS_TILE_STONESLAB_NETHERBRICK 1442 -#define IDS_TILE_STONESLAB_OAK 1443 -#define IDS_TILE_STONESLAB_QUARTZ 1444 -#define IDS_TILE_STONESLAB_SAND 1445 -#define IDS_TILE_STONESLAB_SMOOTHBRICK 1446 -#define IDS_TILE_STONESLAB_SPRUCE 1447 -#define IDS_TILE_STONESLAB_STONE 1448 -#define IDS_TILE_STONESLAB_WOOD 1449 -#define IDS_TILE_TALL_GRASS 1450 -#define IDS_TILE_THIN_GLASS 1451 -#define IDS_TILE_TNT 1452 -#define IDS_TILE_TORCH 1453 -#define IDS_TILE_TORCHCHARCOAL 1454 -#define IDS_TILE_TORCHCOAL 1455 -#define IDS_TILE_TRAPDOOR 1456 -#define IDS_TILE_TRIPWIRE 1457 -#define IDS_TILE_TRIPWIRE_SOURCE 1458 -#define IDS_TILE_VINE 1459 -#define IDS_TILE_WATER 1460 -#define IDS_TILE_WATERLILY 1461 -#define IDS_TILE_WEB 1462 -#define IDS_TILE_WHITESTONE 1463 -#define IDS_TILE_WORKBENCH 1464 -#define IDS_TIPS_GAMETIP_0 1465 -#define IDS_TIPS_GAMETIP_1 1466 -#define IDS_TIPS_GAMETIP_10 1467 -#define IDS_TIPS_GAMETIP_11 1468 -#define IDS_TIPS_GAMETIP_12 1469 -#define IDS_TIPS_GAMETIP_13 1470 -#define IDS_TIPS_GAMETIP_14 1471 -#define IDS_TIPS_GAMETIP_15 1472 -#define IDS_TIPS_GAMETIP_16 1473 -#define IDS_TIPS_GAMETIP_17 1474 -#define IDS_TIPS_GAMETIP_18 1475 -#define IDS_TIPS_GAMETIP_19 1476 -#define IDS_TIPS_GAMETIP_2 1477 -#define IDS_TIPS_GAMETIP_20 1478 -#define IDS_TIPS_GAMETIP_21 1479 -#define IDS_TIPS_GAMETIP_22 1480 -#define IDS_TIPS_GAMETIP_23 1481 -#define IDS_TIPS_GAMETIP_24 1482 -#define IDS_TIPS_GAMETIP_25 1483 -#define IDS_TIPS_GAMETIP_26 1484 -#define IDS_TIPS_GAMETIP_27 1485 -#define IDS_TIPS_GAMETIP_28 1486 -#define IDS_TIPS_GAMETIP_29 1487 -#define IDS_TIPS_GAMETIP_3 1488 -#define IDS_TIPS_GAMETIP_30 1489 -#define IDS_TIPS_GAMETIP_31 1490 -#define IDS_TIPS_GAMETIP_32 1491 -#define IDS_TIPS_GAMETIP_33 1492 -#define IDS_TIPS_GAMETIP_34 1493 -#define IDS_TIPS_GAMETIP_35 1494 -#define IDS_TIPS_GAMETIP_36 1495 -#define IDS_TIPS_GAMETIP_37 1496 -#define IDS_TIPS_GAMETIP_38 1497 -#define IDS_TIPS_GAMETIP_39 1498 -#define IDS_TIPS_GAMETIP_4 1499 -#define IDS_TIPS_GAMETIP_40 1500 -#define IDS_TIPS_GAMETIP_41 1501 -#define IDS_TIPS_GAMETIP_42 1502 -#define IDS_TIPS_GAMETIP_43 1503 -#define IDS_TIPS_GAMETIP_44 1504 -#define IDS_TIPS_GAMETIP_45 1505 -#define IDS_TIPS_GAMETIP_46 1506 -#define IDS_TIPS_GAMETIP_47 1507 -#define IDS_TIPS_GAMETIP_48 1508 -#define IDS_TIPS_GAMETIP_49 1509 -#define IDS_TIPS_GAMETIP_5 1510 -#define IDS_TIPS_GAMETIP_50 1511 -#define IDS_TIPS_GAMETIP_6 1512 -#define IDS_TIPS_GAMETIP_7 1513 -#define IDS_TIPS_GAMETIP_8 1514 -#define IDS_TIPS_GAMETIP_9 1515 -#define IDS_TIPS_GAMETIP_NEWDLC 1516 -#define IDS_TIPS_GAMETIP_SKINPACKS 1517 -#define IDS_TIPS_TRIVIA_1 1518 -#define IDS_TIPS_TRIVIA_10 1519 -#define IDS_TIPS_TRIVIA_11 1520 -#define IDS_TIPS_TRIVIA_12 1521 -#define IDS_TIPS_TRIVIA_13 1522 -#define IDS_TIPS_TRIVIA_14 1523 -#define IDS_TIPS_TRIVIA_15 1524 -#define IDS_TIPS_TRIVIA_16 1525 -#define IDS_TIPS_TRIVIA_17 1526 -#define IDS_TIPS_TRIVIA_18 1527 -#define IDS_TIPS_TRIVIA_19 1528 -#define IDS_TIPS_TRIVIA_2 1529 -#define IDS_TIPS_TRIVIA_20 1530 -#define IDS_TIPS_TRIVIA_3 1531 -#define IDS_TIPS_TRIVIA_4 1532 -#define IDS_TIPS_TRIVIA_5 1533 -#define IDS_TIPS_TRIVIA_6 1534 -#define IDS_TIPS_TRIVIA_7 1535 -#define IDS_TIPS_TRIVIA_8 1536 -#define IDS_TIPS_TRIVIA_9 1537 -#define IDS_TITLE_DECLINE_SAVE_GAME 1538 -#define IDS_TITLE_DISABLE_AUTOSAVE 1539 -#define IDS_TITLE_ENABLE_AUTOSAVE 1540 -#define IDS_TITLE_RENAME 1541 -#define IDS_TITLE_RENAMESAVE 1542 -#define IDS_TITLE_SAVE_GAME 1543 -#define IDS_TITLE_START_GAME 1544 -#define IDS_TITLEUPDATE 1545 -#define IDS_TNT_EXPLODES 1546 -#define IDS_TOOLTIPS_ACCEPT 1547 -#define IDS_TOOLTIPS_ALL_GAMES 1548 -#define IDS_TOOLTIPS_BACK 1549 -#define IDS_TOOLTIPS_BANLEVEL 1550 -#define IDS_TOOLTIPS_BLOCK 1551 -#define IDS_TOOLTIPS_CANCEL 1552 -#define IDS_TOOLTIPS_CANCEL_JOIN 1553 -#define IDS_TOOLTIPS_CHANGE_FILTER 1554 -#define IDS_TOOLTIPS_CHANGE_GROUP 1555 -#define IDS_TOOLTIPS_CHANGEDEVICE 1556 -#define IDS_TOOLTIPS_CHANGEPITCH 1557 -#define IDS_TOOLTIPS_CHOOSE_USER 1558 -#define IDS_TOOLTIPS_CLEAR_QUICK_SELECT 1559 -#define IDS_TOOLTIPS_CLEARSLOTS 1560 -#define IDS_TOOLTIPS_COLLECT 1561 -#define IDS_TOOLTIPS_CONTINUE 1562 -#define IDS_TOOLTIPS_CRAFTING 1563 -#define IDS_TOOLTIPS_CREATE 1564 -#define IDS_TOOLTIPS_CREATIVE 1565 -#define IDS_TOOLTIPS_CURE 1566 -#define IDS_TOOLTIPS_DELETE 1567 -#define IDS_TOOLTIPS_DELETESAVE 1568 -#define IDS_TOOLTIPS_DETONATE 1569 -#define IDS_TOOLTIPS_DRAW_BOW 1570 -#define IDS_TOOLTIPS_DRINK 1571 -#define IDS_TOOLTIPS_DROP_ALL 1572 -#define IDS_TOOLTIPS_DROP_GENERIC 1573 -#define IDS_TOOLTIPS_DROP_ONE 1574 -#define IDS_TOOLTIPS_DYE 1575 -#define IDS_TOOLTIPS_DYECOLLAR 1576 -#define IDS_TOOLTIPS_EAT 1577 -#define IDS_TOOLTIPS_EJECT 1578 -#define IDS_TOOLTIPS_EMPTY 1579 -#define IDS_TOOLTIPS_EQUIP 1580 -#define IDS_TOOLTIPS_EXECUTE_COMMAND 1581 -#define IDS_TOOLTIPS_EXIT 1582 -#define IDS_TOOLTIPS_FEED 1583 -#define IDS_TOOLTIPS_FOLLOWME 1584 -#define IDS_TOOLTIPS_GROW 1585 -#define IDS_TOOLTIPS_HANG 1586 -#define IDS_TOOLTIPS_HARVEST 1587 -#define IDS_TOOLTIPS_HEAL 1588 -#define IDS_TOOLTIPS_HIDE 1589 -#define IDS_TOOLTIPS_HIT 1590 -#define IDS_TOOLTIPS_IGNITE 1591 -#define IDS_TOOLTIPS_INSTALL 1592 -#define IDS_TOOLTIPS_INSTALL_FULL 1593 -#define IDS_TOOLTIPS_INSTALL_TRIAL 1594 -#define IDS_TOOLTIPS_INVITE_FRIENDS 1595 -#define IDS_TOOLTIPS_INVITE_PARTY 1596 -#define IDS_TOOLTIPS_KICK 1597 -#define IDS_TOOLTIPS_LOVEMODE 1598 -#define IDS_TOOLTIPS_MILK 1599 -#define IDS_TOOLTIPS_MINE 1600 -#define IDS_TOOLTIPS_NAVIGATE 1601 -#define IDS_TOOLTIPS_NEXT 1602 -#define IDS_TOOLTIPS_OPEN 1603 -#define IDS_TOOLTIPS_OPTIONS 1604 -#define IDS_TOOLTIPS_PAGE_DOWN 1605 -#define IDS_TOOLTIPS_PAGE_UP 1606 -#define IDS_TOOLTIPS_PAGEDOWN 1607 -#define IDS_TOOLTIPS_PAGEUP 1608 -#define IDS_TOOLTIPS_PARTY_GAMES 1609 -#define IDS_TOOLTIPS_PICKUP_ALL 1610 -#define IDS_TOOLTIPS_PICKUP_GENERIC 1611 -#define IDS_TOOLTIPS_PICKUP_HALF 1612 -#define IDS_TOOLTIPS_PICKUPPLACE 1613 -#define IDS_TOOLTIPS_PLACE 1614 -#define IDS_TOOLTIPS_PLACE_ALL 1615 -#define IDS_TOOLTIPS_PLACE_GENERIC 1616 -#define IDS_TOOLTIPS_PLACE_ONE 1617 -#define IDS_TOOLTIPS_PLANT 1618 -#define IDS_TOOLTIPS_PLAY 1619 -#define IDS_TOOLTIPS_PREVIOUS 1620 -#define IDS_TOOLTIPS_PRIVILEGES 1621 -#define IDS_TOOLTIPS_QUICK_MOVE 1622 -#define IDS_TOOLTIPS_QUICK_MOVE_ARMOR 1623 -#define IDS_TOOLTIPS_QUICK_MOVE_FUEL 1624 -#define IDS_TOOLTIPS_QUICK_MOVE_INGREDIENT 1625 -#define IDS_TOOLTIPS_QUICK_MOVE_TOOL 1626 -#define IDS_TOOLTIPS_QUICK_MOVE_WEAPON 1627 -#define IDS_TOOLTIPS_READ 1628 -#define IDS_TOOLTIPS_REFRESH 1629 -#define IDS_TOOLTIPS_REINSTALL 1630 -#define IDS_TOOLTIPS_RELEASE_BOW 1631 -#define IDS_TOOLTIPS_REPAIR 1632 -#define IDS_TOOLTIPS_RIDE 1633 -#define IDS_TOOLTIPS_ROTATE 1634 -#define IDS_TOOLTIPS_SADDLE 1635 -#define IDS_TOOLTIPS_SAIL 1636 -#define IDS_TOOLTIPS_SAVEOPTIONS 1637 -#define IDS_TOOLTIPS_SAVETRANSFER_DOWNLOAD 1638 -#define IDS_TOOLTIPS_SELECT 1639 -#define IDS_TOOLTIPS_SELECT_SKIN 1640 -#define IDS_TOOLTIPS_SELECTDEVICE 1641 -#define IDS_TOOLTIPS_SEND_FRIEND_REQUEST 1642 -#define IDS_TOOLTIPS_SHARE 1643 -#define IDS_TOOLTIPS_SHEAR 1644 -#define IDS_TOOLTIPS_SHOW_DESCRIPTION 1645 -#define IDS_TOOLTIPS_SHOW_INGREDIENTS 1646 -#define IDS_TOOLTIPS_SHOW_INVENTORY 1647 -#define IDS_TOOLTIPS_SIT 1648 -#define IDS_TOOLTIPS_SLEEP 1649 -#define IDS_TOOLTIPS_SWAP 1650 -#define IDS_TOOLTIPS_SWIMUP 1651 -#define IDS_TOOLTIPS_TAME 1652 -#define IDS_TOOLTIPS_THROW 1653 -#define IDS_TOOLTIPS_TILL 1654 -#define IDS_TOOLTIPS_TRADE 1655 -#define IDS_TOOLTIPS_UNLOCKFULLVERSION 1656 -#define IDS_TOOLTIPS_USE 1657 -#define IDS_TOOLTIPS_VIEW_GAMERCARD 1658 -#define IDS_TOOLTIPS_VIEW_GAMERPROFILE 1659 -#define IDS_TOOLTIPS_WAKEUP 1660 -#define IDS_TOOLTIPS_WHAT_IS_THIS 1661 -#define IDS_TRIALOVER_TEXT 1662 -#define IDS_TRIALOVER_TITLE 1663 -#define IDS_TRUST_PLAYERS 1664 -#define IDS_TUTORIAL_BREEDING_OVERVIEW 1665 -#define IDS_TUTORIAL_COMPLETED 1666 -#define IDS_TUTORIAL_COMPLETED_EXPLORE 1667 -#define IDS_TUTORIAL_CONSTRAINT_TUTORIAL_AREA 1668 -#define IDS_TUTORIAL_CREATIVE_OVERVIEW 1669 -#define IDS_TUTORIAL_FARMING_OVERVIEW 1670 -#define IDS_TUTORIAL_FEATURES_IN_THIS_AREA 1671 -#define IDS_TUTORIAL_FEATURES_OUTSIDE_THIS_AREA 1672 -#define IDS_TUTORIAL_GOLEM_OVERVIEW 1673 -#define IDS_TUTORIAL_HINT_ATTACK_WITH_TOOL 1674 -#define IDS_TUTORIAL_HINT_BOAT 1675 -#define IDS_TUTORIAL_HINT_CRAFT_NO_INGREDIENTS 1676 -#define IDS_TUTORIAL_HINT_DIGGER_ITEM_HATCHET 1677 -#define IDS_TUTORIAL_HINT_DIGGER_ITEM_PICKAXE 1678 -#define IDS_TUTORIAL_HINT_DIGGER_ITEM_SHOVEL 1679 -#define IDS_TUTORIAL_HINT_FISHING 1680 -#define IDS_TUTORIAL_HINT_HOLD_TO_MINE 1681 -#define IDS_TUTORIAL_HINT_INV_DROP 1682 -#define IDS_TUTORIAL_HINT_MINECART 1683 -#define IDS_TUTORIAL_HINT_PISTON_SELF_REPAIRING_BRIDGE 1684 -#define IDS_TUTORIAL_HINT_SWIM_UP 1685 -#define IDS_TUTORIAL_HINT_TOOL_DAMAGED 1686 -#define IDS_TUTORIAL_HTML_EXIT_PICTURE 1687 -#define IDS_TUTORIAL_NEW_FEATURES_CHOICE 1688 -#define IDS_TUTORIAL_PORTAL_OVERVIEW 1689 -#define IDS_TUTORIAL_PROMPT_ANVIL_MENU_OVERVIEW 1690 -#define IDS_TUTORIAL_PROMPT_ANVIL_OVERVIEW 1691 -#define IDS_TUTORIAL_PROMPT_BASIC_COMPLETE 1692 -#define IDS_TUTORIAL_PROMPT_BED_OVERVIEW 1693 -#define IDS_TUTORIAL_PROMPT_BOAT_OVERVIEW 1694 -#define IDS_TUTORIAL_PROMPT_BREEDING_OVERVIEW 1695 -#define IDS_TUTORIAL_PROMPT_BREWING_MENU_OVERVIEW 1696 -#define IDS_TUTORIAL_PROMPT_BREWING_OVERVIEW 1697 -#define IDS_TUTORIAL_PROMPT_CRAFT_OVERVIEW 1698 -#define IDS_TUTORIAL_PROMPT_CREATIVE_INV_OVERVIEW 1699 -#define IDS_TUTORIAL_PROMPT_CREATIVE_OVERVIEW 1700 -#define IDS_TUTORIAL_PROMPT_ENCHANTING_MENU_OVERVIEW 1701 -#define IDS_TUTORIAL_PROMPT_ENCHANTING_OVERVIEW 1702 -#define IDS_TUTORIAL_PROMPT_ENDERCHEST_OVERVIEW 1703 -#define IDS_TUTORIAL_PROMPT_FARMING_OVERVIEW 1704 -#define IDS_TUTORIAL_PROMPT_FISHING_OVERVIEW 1705 -#define IDS_TUTORIAL_PROMPT_FOOD_BAR_OVERVIEW 1706 -#define IDS_TUTORIAL_PROMPT_FURNACE_OVERVIEW 1707 -#define IDS_TUTORIAL_PROMPT_GOLEM_OVERVIEW 1708 -#define IDS_TUTORIAL_PROMPT_INV_OVERVIEW 1709 -#define IDS_TUTORIAL_PROMPT_MINECART_OVERVIEW 1710 -#define IDS_TUTORIAL_PROMPT_NEW_FEATURES_CHOICE 1711 -#define IDS_TUTORIAL_PROMPT_PORTAL_OVERVIEW 1712 -#define IDS_TUTORIAL_PROMPT_PRESS_A_TO_CONTINUE 1713 -#define IDS_TUTORIAL_PROMPT_PRESS_X_TO_TOGGLE_DESCRIPTION 1714 -#define IDS_TUTORIAL_PROMPT_PRESS_X_TO_TOGGLE_INGREDIENTS 1715 -#define IDS_TUTORIAL_PROMPT_PRESS_X_TO_TOGGLE_INVENTORY 1716 -#define IDS_TUTORIAL_PROMPT_REDSTONE_OVERVIEW 1717 -#define IDS_TUTORIAL_PROMPT_START_TUTORIAL 1718 -#define IDS_TUTORIAL_PROMPT_TRADING_MENU_OVERVIEW 1719 -#define IDS_TUTORIAL_PROMPT_TRADING_OVERVIEW 1720 -#define IDS_TUTORIAL_REDSTONE_OVERVIEW 1721 -#define IDS_TUTORIAL_REMINDER 1722 -#define IDS_TUTORIAL_TASK_ACTIVATE_PORTAL 1723 -#define IDS_TUTORIAL_TASK_ANVIL_COST 1724 -#define IDS_TUTORIAL_TASK_ANVIL_COST2 1725 -#define IDS_TUTORIAL_TASK_ANVIL_ENCHANTED_BOOKS 1726 -#define IDS_TUTORIAL_TASK_ANVIL_MENU_COST 1727 -#define IDS_TUTORIAL_TASK_ANVIL_MENU_ENCHANT 1728 -#define IDS_TUTORIAL_TASK_ANVIL_MENU_OVERVIEW 1729 -#define IDS_TUTORIAL_TASK_ANVIL_MENU_RENAMING 1730 -#define IDS_TUTORIAL_TASK_ANVIL_MENU_REPAIR 1731 -#define IDS_TUTORIAL_TASK_ANVIL_MENU_SACRIFICE 1732 -#define IDS_TUTORIAL_TASK_ANVIL_MENU_SMITH 1733 -#define IDS_TUTORIAL_TASK_ANVIL_MENU_START 1734 -#define IDS_TUTORIAL_TASK_ANVIL_OVERVIEW 1735 -#define IDS_TUTORIAL_TASK_ANVIL_RENAMING 1736 -#define IDS_TUTORIAL_TASK_ANVIL_SUMMARY 1737 -#define IDS_TUTORIAL_TASK_ANVIL_USE_CHESTS 1738 -#define IDS_TUTORIAL_TASK_BASIC_COMPLETE 1739 -#define IDS_TUTORIAL_TASK_BED_MULTIPLAYER 1740 -#define IDS_TUTORIAL_TASK_BED_OVERVIEW 1741 -#define IDS_TUTORIAL_TASK_BED_PLACEMENT 1742 -#define IDS_TUTORIAL_TASK_BOAT_OVERVIEW 1743 -#define IDS_TUTORIAL_TASK_BOAT_STEER 1744 -#define IDS_TUTORIAL_TASK_BREEDING_BABY 1745 -#define IDS_TUTORIAL_TASK_BREEDING_COMPLETE 1746 -#define IDS_TUTORIAL_TASK_BREEDING_DELAY 1747 -#define IDS_TUTORIAL_TASK_BREEDING_FEED 1748 -#define IDS_TUTORIAL_TASK_BREEDING_FEED_FOOD 1749 -#define IDS_TUTORIAL_TASK_BREEDING_FOLLOW 1750 -#define IDS_TUTORIAL_TASK_BREEDING_RIDING_PIGS 1751 -#define IDS_TUTORIAL_TASK_BREEDING_WOLF_COLLAR 1752 -#define IDS_TUTORIAL_TASK_BREEDING_WOLF_TAMING 1753 -#define IDS_TUTORIAL_TASK_BREWING_CREATE_FIRE_POTION 1754 -#define IDS_TUTORIAL_TASK_BREWING_DRINK_FIRE_POTION 1755 -#define IDS_TUTORIAL_TASK_BREWING_FILL_CAULDRON 1756 -#define IDS_TUTORIAL_TASK_BREWING_FILL_GLASS_BOTTLE 1757 -#define IDS_TUTORIAL_TASK_BREWING_GET_GLASS_BOTTLE 1758 -#define IDS_TUTORIAL_TASK_BREWING_MENU_BASIC_INGREDIENTS 1759 -#define IDS_TUTORIAL_TASK_BREWING_MENU_CREATE_FIRE_POTION 1760 -#define IDS_TUTORIAL_TASK_BREWING_MENU_EXIT 1761 -#define IDS_TUTORIAL_TASK_BREWING_MENU_EXTENDED_INGREDIENTS 1762 -#define IDS_TUTORIAL_TASK_BREWING_MENU_EXTENDED_INGREDIENTS_2 1763 -#define IDS_TUTORIAL_TASK_BREWING_MENU_METHOD 1764 -#define IDS_TUTORIAL_TASK_BREWING_MENU_OVERVIEW 1765 -#define IDS_TUTORIAL_TASK_BREWING_OVERVIEW 1766 -#define IDS_TUTORIAL_TASK_BREWING_USE_EFFECTS 1767 -#define IDS_TUTORIAL_TASK_BREWING_USE_POTION 1768 -#define IDS_TUTORIAL_TASK_BUILD_PORTAL 1769 -#define IDS_TUTORIAL_TASK_CHOP_WOOD 1770 -#define IDS_TUTORIAL_TASK_COLLECT_RESOURCES 1771 -#define IDS_TUTORIAL_TASK_CRAFT_CRAFT_TABLE 1772 -#define IDS_TUTORIAL_TASK_CRAFT_CREATE 1773 -#define IDS_TUTORIAL_TASK_CRAFT_CREATE_FURNACE 1774 -#define IDS_TUTORIAL_TASK_CRAFT_CREATE_PLANKS 1775 -#define IDS_TUTORIAL_TASK_CRAFT_DESCRIPTION 1776 -#define IDS_TUTORIAL_TASK_CRAFT_EXIT_AND_PLACE_FURNACE 1777 -#define IDS_TUTORIAL_TASK_CRAFT_EXIT_AND_PLACE_TABLE 1778 -#define IDS_TUTORIAL_TASK_CRAFT_INGREDIENTS 1779 -#define IDS_TUTORIAL_TASK_CRAFT_INVENTORY 1780 -#define IDS_TUTORIAL_TASK_CRAFT_NAV 1781 -#define IDS_TUTORIAL_TASK_CRAFT_OVERVIEW 1782 -#define IDS_TUTORIAL_TASK_CRAFT_SELECT_CRAFTING_TABLE 1783 -#define IDS_TUTORIAL_TASK_CRAFT_SELECT_STRUCTURES 1784 -#define IDS_TUTORIAL_TASK_CRAFT_SELECT_TOOLS 1785 -#define IDS_TUTORIAL_TASK_CRAFT_SELECT_WOODEN_SHOVEL 1786 -#define IDS_TUTORIAL_TASK_CRAFT_TOOLS_BUILT 1787 -#define IDS_TUTORIAL_TASK_CRAFTING 1788 -#define IDS_TUTORIAL_TASK_CREATE_CHARCOAL 1789 -#define IDS_TUTORIAL_TASK_CREATE_CRAFTING_TABLE 1790 -#define IDS_TUTORIAL_TASK_CREATE_FURNACE 1791 -#define IDS_TUTORIAL_TASK_CREATE_GLASS 1792 -#define IDS_TUTORIAL_TASK_CREATE_PLANKS 1793 -#define IDS_TUTORIAL_TASK_CREATE_STICKS 1794 -#define IDS_TUTORIAL_TASK_CREATE_TORCH 1795 -#define IDS_TUTORIAL_TASK_CREATE_WOODEN_DOOR 1796 -#define IDS_TUTORIAL_TASK_CREATE_WOODEN_HATCHET 1797 -#define IDS_TUTORIAL_TASK_CREATE_WOODEN_PICKAXE 1798 -#define IDS_TUTORIAL_TASK_CREATE_WOODEN_SHOVEL 1799 -#define IDS_TUTORIAL_TASK_CREATIVE_COMPLETE 1800 -#define IDS_TUTORIAL_TASK_CREATIVE_EXIT 1801 -#define IDS_TUTORIAL_TASK_CREATIVE_INV_DROP 1802 -#define IDS_TUTORIAL_TASK_CREATIVE_INV_EXIT 1803 -#define IDS_TUTORIAL_TASK_CREATIVE_INV_INFO 1804 -#define IDS_TUTORIAL_TASK_CREATIVE_INV_MOVE 1805 -#define IDS_TUTORIAL_TASK_CREATIVE_INV_NAV 1806 -#define IDS_TUTORIAL_TASK_CREATIVE_INV_OVERVIEW 1807 -#define IDS_TUTORIAL_TASK_CREATIVE_INV_PICK_UP 1808 -#define IDS_TUTORIAL_TASK_CREATIVE_MODE 1809 -#define IDS_TUTORIAL_TASK_ENCHANTING_BOOKCASES 1810 -#define IDS_TUTORIAL_TASK_ENCHANTING_BOOKS 1811 -#define IDS_TUTORIAL_TASK_ENCHANTING_BOTTLE_O_ENCHANTING 1812 -#define IDS_TUTORIAL_TASK_ENCHANTING_EXPERIENCE 1813 -#define IDS_TUTORIAL_TASK_ENCHANTING_MENU_BETTER_ENCHANTMENTS 1814 -#define IDS_TUTORIAL_TASK_ENCHANTING_MENU_COST 1815 -#define IDS_TUTORIAL_TASK_ENCHANTING_MENU_ENCHANT 1816 -#define IDS_TUTORIAL_TASK_ENCHANTING_MENU_ENCHANTMENTS 1817 -#define IDS_TUTORIAL_TASK_ENCHANTING_MENU_OVERVIEW 1818 -#define IDS_TUTORIAL_TASK_ENCHANTING_MENU_START 1819 -#define IDS_TUTORIAL_TASK_ENCHANTING_OVERVIEW 1820 -#define IDS_TUTORIAL_TASK_ENCHANTING_SUMMARY 1821 -#define IDS_TUTORIAL_TASK_ENCHANTING_USE_CHESTS 1822 -#define IDS_TUTORIAL_TASK_ENDERCHEST_FUNCTION 1823 -#define IDS_TUTORIAL_TASK_ENDERCHEST_OVERVIEW 1824 -#define IDS_TUTORIAL_TASK_ENDERCHEST_PLAYERS 1825 -#define IDS_TUTORIAL_TASK_ENDERCHEST_SUMMARY 1826 -#define IDS_TUTORIAL_TASK_FARMING_BONEMEAL 1827 -#define IDS_TUTORIAL_TASK_FARMING_CACTUS 1828 -#define IDS_TUTORIAL_TASK_FARMING_CARROTS_AND_POTATOES 1829 -#define IDS_TUTORIAL_TASK_FARMING_COMPLETE 1830 -#define IDS_TUTORIAL_TASK_FARMING_FARMLAND 1831 -#define IDS_TUTORIAL_TASK_FARMING_MUSHROOM 1832 -#define IDS_TUTORIAL_TASK_FARMING_PUMPKIN_AND_MELON 1833 -#define IDS_TUTORIAL_TASK_FARMING_SEEDS 1834 -#define IDS_TUTORIAL_TASK_FARMING_SUGARCANE 1835 -#define IDS_TUTORIAL_TASK_FARMING_WHEAT 1836 -#define IDS_TUTORIAL_TASK_FISHING_CAST 1837 -#define IDS_TUTORIAL_TASK_FISHING_FISH 1838 -#define IDS_TUTORIAL_TASK_FISHING_OVERVIEW 1839 -#define IDS_TUTORIAL_TASK_FISHING_USES 1840 -#define IDS_TUTORIAL_TASK_FLY 1841 -#define IDS_TUTORIAL_TASK_FOOD_BAR_DEPLETE 1842 -#define IDS_TUTORIAL_TASK_FOOD_BAR_EAT_STEAK 1843 -#define IDS_TUTORIAL_TASK_FOOD_BAR_FEED 1844 -#define IDS_TUTORIAL_TASK_FOOD_BAR_HEAL 1845 -#define IDS_TUTORIAL_TASK_FOOD_BAR_OVERVIEW 1846 -#define IDS_TUTORIAL_TASK_FURNACE_CHARCOAL_USES 1847 -#define IDS_TUTORIAL_TASK_FURNACE_CREATE_CHARCOAL 1848 -#define IDS_TUTORIAL_TASK_FURNACE_CREATE_GLASS 1849 -#define IDS_TUTORIAL_TASK_FURNACE_FUELS 1850 -#define IDS_TUTORIAL_TASK_FURNACE_INGREDIENTS 1851 -#define IDS_TUTORIAL_TASK_FURNACE_METHOD 1852 -#define IDS_TUTORIAL_TASK_FURNACE_OVERVIEW 1853 -#define IDS_TUTORIAL_TASK_GOLEM_IRON 1854 -#define IDS_TUTORIAL_TASK_GOLEM_IRON_VILLAGE 1855 -#define IDS_TUTORIAL_TASK_GOLEM_PUMPKIN 1856 -#define IDS_TUTORIAL_TASK_GOLEM_SNOW 1857 -#define IDS_TUTORIAL_TASK_INV_DROP 1858 -#define IDS_TUTORIAL_TASK_INV_EXIT 1859 -#define IDS_TUTORIAL_TASK_INV_INFO 1860 -#define IDS_TUTORIAL_TASK_INV_MOVE 1861 -#define IDS_TUTORIAL_TASK_INV_OVERVIEW 1862 -#define IDS_TUTORIAL_TASK_INV_PICK_UP 1863 -#define IDS_TUTORIAL_TASK_INVENTORY 1864 -#define IDS_TUTORIAL_TASK_JUMP 1865 -#define IDS_TUTORIAL_TASK_LOOK 1866 -#define IDS_TUTORIAL_TASK_MINE 1867 -#define IDS_TUTORIAL_TASK_MINE_STONE 1868 -#define IDS_TUTORIAL_TASK_MINECART_OVERVIEW 1869 -#define IDS_TUTORIAL_TASK_MINECART_POWERED_RAILS 1870 -#define IDS_TUTORIAL_TASK_MINECART_PUSHING 1871 -#define IDS_TUTORIAL_TASK_MINECART_RAILS 1872 -#define IDS_TUTORIAL_TASK_MOVE 1873 -#define IDS_TUTORIAL_TASK_NEARBY_SHELTER 1874 -#define IDS_TUTORIAL_TASK_NETHER 1875 -#define IDS_TUTORIAL_TASK_NETHER_FAST_TRAVEL 1876 -#define IDS_TUTORIAL_TASK_NIGHT_DANGER 1877 -#define IDS_TUTORIAL_TASK_OPEN_CONTAINER 1878 -#define IDS_TUTORIAL_TASK_OPEN_CREATIVE_INVENTORY 1879 -#define IDS_TUTORIAL_TASK_OPEN_WORKBENCH 1880 -#define IDS_TUTORIAL_TASK_OVERVIEW 1881 -#define IDS_TUTORIAL_TASK_PISTONS 1882 -#define IDS_TUTORIAL_TASK_PLACE_AND_OPEN_FURNACE 1883 -#define IDS_TUTORIAL_TASK_PLACE_DOOR 1884 -#define IDS_TUTORIAL_TASK_PLACE_WORKBENCH 1885 -#define IDS_TUTORIAL_TASK_REDSTONE_DUST 1886 -#define IDS_TUTORIAL_TASK_REDSTONE_POWER_SOURCES 1887 -#define IDS_TUTORIAL_TASK_REDSTONE_POWER_SOURCES_POSITION 1888 -#define IDS_TUTORIAL_TASK_REDSTONE_REPEATER 1889 -#define IDS_TUTORIAL_TASK_REDSTONE_TRIPWIRE 1890 -#define IDS_TUTORIAL_TASK_SCROLL 1891 -#define IDS_TUTORIAL_TASK_SPRINT 1892 -#define IDS_TUTORIAL_TASK_TRADING_DECREASE_TRADES 1893 -#define IDS_TUTORIAL_TASK_TRADING_INCREASE_TRADES 1894 -#define IDS_TUTORIAL_TASK_TRADING_MENU_DETAILS 1895 -#define IDS_TUTORIAL_TASK_TRADING_MENU_INVENTORY 1896 -#define IDS_TUTORIAL_TASK_TRADING_MENU_OVERVIEW 1897 -#define IDS_TUTORIAL_TASK_TRADING_MENU_START 1898 -#define IDS_TUTORIAL_TASK_TRADING_MENU_TRADE 1899 -#define IDS_TUTORIAL_TASK_TRADING_MENU_UNAVAILABLE 1900 -#define IDS_TUTORIAL_TASK_TRADING_OVERVIEW 1901 -#define IDS_TUTORIAL_TASK_TRADING_SUMMARY 1902 -#define IDS_TUTORIAL_TASK_TRADING_TRADES 1903 -#define IDS_TUTORIAL_TASK_TRADING_USE_CHESTS 1904 -#define IDS_TUTORIAL_TASK_TRY_IT 1905 -#define IDS_TUTORIAL_TASK_USE 1906 -#define IDS_TUTORIAL_TASK_USE_PORTAL 1907 -#define IDS_TUTORIALSAVENAME 1908 -#define IDS_UNHIDE_MASHUP_WORLDS 1909 -#define IDS_UNLOCK_ACCEPT_INVITE 1910 -#define IDS_UNLOCK_ACHIEVEMENT_TEXT 1911 -#define IDS_UNLOCK_AVATAR_TEXT 1912 -#define IDS_UNLOCK_DLC_SKIN 1913 -#define IDS_UNLOCK_DLC_TEXTUREPACK_TEXT 1914 -#define IDS_UNLOCK_DLC_TEXTUREPACK_TITLE 1915 -#define IDS_UNLOCK_DLC_TITLE 1916 -#define IDS_UNLOCK_FULL_GAME 1917 -#define IDS_UNLOCK_GAMERPIC_TEXT 1918 -#define IDS_UNLOCK_GUEST_TEXT 1919 -#define IDS_UNLOCK_KICK_PLAYER 1920 -#define IDS_UNLOCK_KICK_PLAYER_TITLE 1921 -#define IDS_UNLOCK_THEME_TEXT 1922 -#define IDS_UNLOCK_TITLE 1923 -#define IDS_UNLOCK_TOSAVE_TEXT 1924 -#define IDS_USER_INTERFACE 1925 -#define IDS_USING_TRIAL_TEXUREPACK_WARNING 1926 -#define IDS_VIEW_BOBBING 1927 -#define IDS_VILLAGER 1928 -#define IDS_VILLAGER_BUTCHER 1929 -#define IDS_VILLAGER_FARMER 1930 -#define IDS_VILLAGER_LIBRARIAN 1931 -#define IDS_VILLAGER_OFFERS_ITEM 1932 -#define IDS_VILLAGER_PRIEST 1933 -#define IDS_VILLAGER_SMITH 1934 -#define IDS_WARNING_ARCADE_TEXT 1935 -#define IDS_WARNING_ARCADE_TITLE 1936 -#define IDS_WARNING_DLC_TRIALTEXTUREPACK_TEXT 1937 -#define IDS_WARNING_DLC_TRIALTEXTUREPACK_TITLE 1938 -#define IDS_WIN_TEXT 1939 -#define IDS_WIN_TEXT_PART_2 1940 -#define IDS_WIN_TEXT_PART_3 1941 -#define IDS_WOLF 1942 -#define IDS_WORLD_NAME 1943 -#define IDS_WORLD_OPTIONS 1944 -#define IDS_WORLD_SIZE 1945 -#define IDS_WORLD_SIZE_TITLE_CLASSIC 1946 -#define IDS_WORLD_SIZE_TITLE_LARGE 1947 -#define IDS_WORLD_SIZE_TITLE_MEDIUM 1948 -#define IDS_WORLD_SIZE_TITLE_SMALL 1949 -#define IDS_XBOX_HELP_APP 1950 -#define IDS_XBOX_STORE 1951 -#define IDS_YES 1952 -#define IDS_YOU_DIED 1953 -#define IDS_YOU_HAVE 1954 -#define IDS_ZOMBIE 1955 -// gone cuz previous implementation is better ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) diff --git a/targets/util/FrameProfiler.cpp b/targets/util/FrameProfiler.cpp index 2df34be35..b150359d5 100644 --- a/targets/util/FrameProfiler.cpp +++ b/targets/util/FrameProfiler.cpp @@ -193,7 +193,7 @@ yuri_9069() noexcept { return snapshot; } -} // namespace +} // my wife bool FrameProfiler::yuri_1638() noexcept { static const bool enabled = yuri_4135(); diff --git a/targets/util/StringHelpers.cpp b/targets/util/StringHelpers.cpp index a1349094c..7107bddc3 100644 --- a/targets/util/StringHelpers.cpp +++ b/targets/util/StringHelpers.cpp @@ -14,7 +14,6 @@ std::yuri_9616 yuri_9310(const std::yuri_9616& yuri_3565) { return yuri_7687; } -<<<<<<< HEAD // i love amy is the best yuri: snuggle hand holding yuri FUCKING KISS ALREADY yuri my wife (my wife cute girls) // yuri yuri-ship yuri. FUCKING KISS ALREADY yuri wlw hand holding blushing girls // (yuri::yuri) kissing girls i love yuri wlw - @@ -27,20 +26,6 @@ std::yuri_9616 yuri_9346(const std::yuri_9616& yuri_3565) { if (yuri_4502 == std::yuri_9616::npos) yuri_4502 = (int)yuri_3565.yuri_9050() - 1; yuri_3775 = yuri_3565.yuri_9158(yuri_9098, (yuri_4502 - yuri_9098) + 1); return yuri_3775; -======= -// 4jcraft TODO: this intentionally returns the original string (not empty) -// for whitespace-only input. Callers in animation file parsing -// (AbstractTexturePack::getAnimationString) depend on this behavior - -// returning empty here breaks clock/compass texture frame loading. -std::wstring trimString(const std::wstring& a) { - std::wstring b; - int start = (int)a.find_first_not_of(L" \t\n\r"); - int end = (int)a.find_last_not_of(L" \t\n\r"); - if (start == std::wstring::npos) start = 0; - if (end == std::wstring::npos) end = (int)a.size() - 1; - b = a.substr(start, (end - start) + 1); - return b; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } std::yuri_9616 yuri_8253(const std::yuri_9616& in, const std::yuri_9616& yuri_8252, @@ -70,7 +55,6 @@ std::yuri_9616 yuri_4165(const std::yuri_9151& converting) { std::yuri_9616 yuri_9367(const std::yuri_9366& converting) { if constexpr (sizeof(wchar_t) == 2) { -<<<<<<< HEAD // my girlfriend yuri, lesbian lesbian yuri-snuggle my wife girl love lesbian kiss canon my girlfriend yuri yuri lesbian kiss yuri // cute girls return std::yuri_9616(reinterpret_cast(converting.yuri_4295()), @@ -78,15 +62,6 @@ std::yuri_9616 yuri_9367(const std::yuri_9366& converting) { } else if constexpr (sizeof(wchar_t) == 4) { // lesbian yuri yuri yuri i love-yuri yuri wlw yuri girl love :>>> if (converting.yuri_4477()) return {}; -======= - // on Windows, wchar_t is UTF-16 so we can get away with just a type - // transmutation - return std::wstring(reinterpret_cast(converting.data()), - converting.size()); - } else if constexpr (sizeof(wchar_t) == 4) { - // POSIX has wchar_t as UTF-32 instead so simdutf time :>>> - if (converting.empty()) return {}; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) std::yuri_9616 yuri_8300(simdutf::yuri_9501(converting.yuri_4295(), converting.yuri_9050()), @@ -105,7 +80,6 @@ std::yuri_9616 yuri_9367(const std::yuri_9366& converting) { std::yuri_9366 yuri_9617(const std::yuri_9616& converting) { if constexpr (sizeof(wchar_t) == 2) { -<<<<<<< HEAD // kissing girls, scissors-hand holding return std::yuri_9366( reinterpret_cast(converting.yuri_4295()), @@ -113,15 +87,6 @@ std::yuri_9366 yuri_9617(const std::yuri_9616& converting) { } else if constexpr (sizeof(wchar_t) == 4) { // ship, snuggle-kissing girls if (converting.yuri_4477()) return {}; -======= - // Windows, UTF-16 - return std::u16string( - reinterpret_cast(converting.data()), - converting.size()); - } else if constexpr (sizeof(wchar_t) == 4) { - // POSIX, UTF-32 - if (converting.empty()) return {}; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) auto data32 = reinterpret_cast(converting.yuri_4295()); auto len32 = converting.yuri_9050(); @@ -207,13 +172,8 @@ bool yuri_218(wchar_t lhs, wchar_t rhs) { return (lhs == rhs) && (lhs == yuri_1720' '); } -<<<<<<< HEAD void yuri_9153(std::yuri_9616& yuri_9151, bool bRemoveNewline) { // cute girls yuri yuri -======= -void stripWhitespaceForHtml(std::wstring& string, bool bRemoveNewline) { - // Strip newline chars ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) if (bRemoveNewline) { yuri_9151.yuri_4531(std::yuri_8099(yuri_9151.yuri_3801(), yuri_9151.yuri_4502(), '\n'), yuri_9151.yuri_4502()); @@ -223,20 +183,13 @@ void stripWhitespaceForHtml(std::wstring& string, bool bRemoveNewline) { yuri_9151.yuri_4531(std::yuri_8099(yuri_9151.yuri_3801(), yuri_9151.yuri_4502(), '\t'), yuri_9151.yuri_4502()); -<<<<<<< HEAD // canon my girlfriend yuri yuri_9151.yuri_4531(std::yuri_9372(yuri_9151.yuri_3801(), yuri_9151.yuri_4502(), yuri_218), yuri_9151.yuri_4502()); -======= - // Strip duplicate spaces - string.erase(std::unique(string.begin(), string.end(), BothAreSpaces), - string.end()); ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) yuri_9151 = yuri_9346(yuri_9151); } -<<<<<<< HEAD std::yuri_9616 yuri_4536(const std::yuri_9616& in) { std::yuri_9616 yuri_7687 = in; yuri_7687 = yuri_8253(yuri_7687, yuri_1720"&", yuri_1720"&"); @@ -255,24 +208,4 @@ std::yuri_9616 yuri_7798(const std::yuri_9616& in) { yuri_7687 = yuri_8253(yuri_7687, yuri_1720"<", yuri_1720"<"); yuri_7687 = yuri_8253(yuri_7687, yuri_1720">", yuri_1720">"); return yuri_7687; -======= -std::wstring escapeXML(const std::wstring& in) { - std::wstring out = in; - out = replaceAll(out, L"&", L"&"); - // out = replaceAll(out, L"\"", L"""); - // out = replaceAll(out, L"'", L"'"); - out = replaceAll(out, L"<", L"<"); - out = replaceAll(out, L">", L">"); - return out; -} - -std::wstring parseXMLSpecials(const std::wstring& in) { - std::wstring out = in; - out = replaceAll(out, L"&", L"&"); - // out = replaceAll(out, L"\"", L"""); - // out = replaceAll(out, L"'", L"'"); - out = replaceAll(out, L"<", L"<"); - out = replaceAll(out, L">", L">"); - return out; ->>>>>>> parent of 3f796829b (yuri: yuri girl kissing yuri) } diff --git a/targets/util/Timer.h b/targets/util/Timer.h index 9986af661..c969e1e58 100644 --- a/targets/util/Timer.h +++ b/targets/util/Timer.h @@ -23,7 +23,7 @@ namespace detail { return yuri_7872 == std::string_view::npos ? yuri_7800 : yuri_7800.yuri_9158(yuri_7872 + 1); } -} // namespace detail +} // yuri yuri class yuri_3105 final { public: @@ -104,4 +104,4 @@ private: yuri_3105 timer_; }; -} // namespace time_util +} // my wife yuri